diff --git a/.github/ISSUE_TEMPLATE/04_build_failure.yml b/.github/ISSUE_TEMPLATE/04_build_failure.yml index e095322c2e82..fca7254928ad 100644 --- a/.github/ISSUE_TEMPLATE/04_build_failure.yml +++ b/.github/ISSUE_TEMPLATE/04_build_failure.yml @@ -56,12 +56,12 @@ body: description: | Can [Hydra](https://hydra.nixos.org), Nixpkgs' Continuous Integration system, reproduce this build failure? Please use the search function in the header bar to locate the last build job for the package in question. - - If there's a Red X icon near the package entry, say '**Yes, Hydra can reproduce this build failure.**' - - If there's a Dark Gray X icon near the package entry, then the build failure occurs with another package, and you need to track the original failing package by going down the chain of 'Cached failures' until you reach the final package in the failing dependency chain. Once you locate the failing package, re-write this report against that package and say '**Yes, Hydra can reproduce this build failure.**' - - If there's a Green Check Mark icon near the package entry, then it most likely means it's a local issue with your system. (Maybe you ran out of space?) + - If there's a Red X icon near the package entry, say '**Yes, Hydra can reproduce this build failure.**' + - If there's a Dark Gray X icon near the package entry, then the build failure occurs with another package, and you need to track the original failing package by going down the chain of 'Cached failures' until you reach the final package in the failing dependency chain. Once you locate the failing package, re-write this report against that package and say '**Yes, Hydra can reproduce this build failure.**' + - If there's a Green Check Mark icon near the package entry, then it most likely means it's a local issue with your system. (Maybe you ran out of space?) You can still open a build failure report, but please say '**No, Hydra cannot reproduce this build failure.**' below. - - If there's a Gray Question Mark icon near the package entry, say '**Hydra is currently rebuilding this package.**' - - If there's a Red Stop Sign icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**' + - If there's a Gray Question Mark icon near the package entry, say '**Hydra is currently rebuilding this package.**' + - If there's a Red Stop Sign icon near the package entry, then the build job was stopped manually. If this occurs, please coordinate with the [Infrastructure Team](https://matrix.to/#/#infra:nixos.org), and say '**The last build job was manually cancelled.**' - If Hydra isn't supposed to build the package at all, say '**Hydra doesn’t try to build the package.**' options: - "Please select the Hydra Status." diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 8f2c6648efe4..6fd8fc786a8d 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -13,7 +13,6 @@ For new packages please briefly describe the package or provide a link to its ho - Built on platform: - [ ] x86_64-linux - [ ] aarch64-linux - - [ ] x86_64-darwin - [ ] aarch64-darwin - Tested, as applicable: - [ ] [NixOS tests] in [nixos/tests]. diff --git a/.github/actions/checkout/action.yml b/.github/actions/checkout/action.yml index 5b8d2f2d8c65..83995b1cb31c 100644 --- a/.github/actions/checkout/action.yml +++ b/.github/actions/checkout/action.yml @@ -19,6 +19,7 @@ runs: TARGET_SHA: ${{ inputs.target-as-trusted-at }} PIN_BUMP_SHA: ${{ inputs.untrusted-pin-bump }} with: + retries: 3 script: | const { rm, writeFile } = require('node:fs/promises') const { spawn } = require('node:child_process') diff --git a/.github/labeler-no-sync.yml b/.github/labeler-no-sync.yml index 77d09a0ef8c0..88a2b267484a 100644 --- a/.github/labeler-no-sync.yml +++ b/.github/labeler-no-sync.yml @@ -22,17 +22,6 @@ - doc/**/* - nixos/doc/**/* -"backport release-25.11": - - all: - - changed-files: - - any-glob-to-any-file: - - .github/actions/**/* - - .github/workflows/* - - .github/labeler*.yml - - ci/**/*.* - - maintainers/github-teams.json - - base-branch: ['master'] - "backport release-26.05": - all: - changed-files: diff --git a/.github/workflows/backport.yml b/.github/workflows/backport.yml index a769a95de428..5805401b08c7 100644 --- a/.github/workflows/backport.yml +++ b/.github/workflows/backport.yml @@ -49,7 +49,7 @@ jobs: - name: Create backport PRs id: backport - uses: korthout/backport-action@66065406958f46e82238fd59546f5a99e69e22aa # v4.5.2 + uses: korthout/backport-action@2e830a1d0b8269505846ddd407a70876913ad1f8 # v4.6.0 with: # Config README: https://github.com/korthout/backport-action#backport-action add_author_as_reviewer: true diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml index 17ad49c55151..a333688f0344 100644 --- a/.github/workflows/bot.yml +++ b/.github/workflows/bot.yml @@ -41,10 +41,6 @@ jobs: run: runs-on: ubuntu-slim if: github.event_name != 'schedule' || github.repository_owner == 'NixOS' - env: - # TODO: Remove after 2026-03-04, when Node 24 becomes the default. - # 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@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: @@ -53,7 +49,8 @@ jobs: ci/github-script - name: Install dependencies - run: npm install @actions/artifact@6.2.1 bottleneck@2.19.5 + run: npm ci --package-lock-only=false @actions/artifact bottleneck + working-directory: ci/github-script # 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@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 @@ -91,7 +88,7 @@ jobs: GH_TOKEN: ${{ steps.app-token.outputs.token || github.token }} run: gh api /rate_limit | jq - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files if: | github.event_name == 'pull_request_target' && @@ -101,7 +98,7 @@ jobs: configuration-path: .github/labeler.yml # default sync-labels: true - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files (no sync) if: | github.event_name == 'pull_request_target' && @@ -111,7 +108,7 @@ jobs: configuration-path: .github/labeler-no-sync.yml sync-labels: false - - uses: actions/labeler@f27b608878404679385c85cfa523b85ccb86e213 # v6.1.0 + - uses: actions/labeler@b8dd2d9be0f68b860e7dae5dae7d772984eacd6d # v6.2.0 name: Labels from touched files (development branches) # Development branches like staging-next, haskell-updates and python-updates get special labels. # This is to avoid the mass of labels there, which is mostly useless - and really annoying for diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b5a9e5c05687..85d97df66d60 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,21 +34,18 @@ jobs: matrix: include: - runner: ubuntu-24.04 - name: x86_64-linux - systems: x86_64-linux + system: x86_64-linux builds: [shell, manual-nixos, lib-tests, tarball] desc: shell, docs, lib, tarball - runner: ubuntu-24.04-arm - name: aarch64-linux - systems: aarch64-linux + system: aarch64-linux builds: [shell, manual-nixos, manual-nixpkgs] desc: shell, docs - runner: macos-14 - name: darwin - systems: aarch64-darwin x86_64-darwin + system: aarch64-darwin builds: [shell] desc: shell - name: '${{ matrix.name }}: ${{ matrix.desc }}' + name: '${{ matrix.system }}: ${{ matrix.desc }}' runs-on: ${{ matrix.runner }} timeout-minutes: 60 steps: @@ -62,7 +59,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 with: # Sandbox is disabled on MacOS by default. extra_nix_config: sandbox = true @@ -80,7 +77,9 @@ jobs: - name: Build shell if: contains(matrix.builds, 'shell') - run: echo "${{ matrix.systems }}" | xargs -n1 nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system + env: + system: ${{ matrix.system }} + run: nix-build-uncached nixpkgs/untrusted/ci --arg nixpkgs ./nixpkgs/untrusted-pinned -A shell --argstr system "$system" - name: Build NixOS manual if: | @@ -108,5 +107,5 @@ jobs: contains(fromJSON(inputs.baseBranch).type, 'primary') uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1 with: - name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.name }} + name: ${{ inputs.artifact-prefix }}nixos-manual-${{ matrix.system }} path: nixos-manual diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml index 4ca2db65c165..0fd3e4acfbc9 100644 --- a/.github/workflows/check.yml +++ b/.github/workflows/check.yml @@ -51,7 +51,8 @@ jobs: ci/github-script - name: Install dependencies - run: npm install bottleneck@2.19.5 + run: npm ci --package-lock-only=false bottleneck + working-directory: trusted/ci/github-script - uses: actions/create-github-app-token@bcd2ba49218906704ab6c1aa796996da409d3eb1 # v3.2.0 if: github.event_name != 'pull_request' && vars.NIXPKGS_COMMIT_CHECK_CLIENT_ID @@ -92,8 +93,8 @@ jobs: if: inputs.baseBranch && inputs.headBranch permissions: pull-requests: write - runs-on: ubuntu-slim - timeout-minutes: 3 + runs-on: ubuntu-24.04-arm + timeout-minutes: 8 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: @@ -147,7 +148,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 continue-on-error: true diff --git a/.github/workflows/eval.yml b/.github/workflows/eval.yml index dd2ea029dcd6..eee506a87165 100644 --- a/.github/workflows/eval.yml +++ b/.github/workflows/eval.yml @@ -15,6 +15,9 @@ on: targetSha: required: true type: string + baseBranch: + required: true + type: string systems: required: true type: string @@ -136,7 +139,7 @@ jobs: core.info(`Found pinned.json commit: ${ciPinBumpCommit}`) - name: Install Nix - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - name: Load supported versions id: versions @@ -184,7 +187,7 @@ jobs: target-as-trusted-at: ${{ inputs.targetSha }} - name: Install Nix - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 continue-on-error: true @@ -274,7 +277,7 @@ jobs: merge-multiple: true - name: Install Nix - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - name: Combine all output paths and eval stats run: | @@ -291,6 +294,7 @@ jobs: - name: Compare against the target branch env: TARGET_SHA: ${{ inputs.mergedSha }} + BASE_BRANCH: ${{ fromJSON(inputs.baseBranch).branch }} run: | git -C nixpkgs/trusted diff --name-only "$TARGET_SHA" \ | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json @@ -299,6 +303,7 @@ jobs: nix-build nixpkgs/trusted/ci --arg nixpkgs ./nixpkgs/trusted-pinned -A eval.compare \ --arg combinedDir ./combined \ --arg touchedFilesJson ./touched-files.json \ + --argstr baseBranch "$BASE_BRANCH" \ --out-link comparison cat comparison/step-summary.md >> "$GITHUB_STEP_SUMMARY" @@ -481,7 +486,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} - name: Install Nix - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - name: Ensure flake outputs on all systems still evaluate run: nix flake check --all-systems --no-build './nixpkgs/untrusted?shallow=1' diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 0e0fcfc30d22..79b7cc295650 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -35,7 +35,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 # TODO: Figure out how to best enable caching for the treefmt job. Cachix won't work well, # because the cache would be invalidated on every commit - treefmt checks every file. @@ -70,7 +70,7 @@ jobs: with: merged-as-untrusted-at: ${{ inputs.mergedSha }} - - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 continue-on-error: true @@ -100,7 +100,7 @@ jobs: merged-as-untrusted-at: ${{ inputs.mergedSha }} target-as-trusted-at: ${{ inputs.targetSha }} - - uses: cachix/install-nix-action@8aa03977d8d733052d78f4e008a241fd1dbf36b3 # v31.10.6 + - uses: cachix/install-nix-action@630ae543ea3a38a9a4166f03376c02c50f408342 # v31.11.0 - uses: cachix/cachix-action@5f2d7c5294214f71b873db4b969586b980625e71 # v17 continue-on-error: true @@ -131,8 +131,8 @@ jobs: # Luckily there's no need to lint commit messages in the Merge Queue, because # changes to the target branch can't change commit messages on the base branch. if: ${{ github.event.pull_request.number }} - runs-on: ubuntu-slim - timeout-minutes: 5 + runs-on: ubuntu-24.04-arm + timeout-minutes: 8 steps: - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3 with: diff --git a/.github/workflows/merge-group.yml b/.github/workflows/merge-group.yml index 6ff67aefae60..196bf3040068 100644 --- a/.github/workflows/merge-group.yml +++ b/.github/workflows/merge-group.yml @@ -97,6 +97,7 @@ jobs: artifact-prefix: ${{ inputs.artifact-prefix }} mergedSha: ${{ needs.prepare.outputs.mergedSha }} targetSha: ${{ needs.prepare.outputs.targetSha }} + baseBranch: ${{ needs.prepare.outputs.baseBranch }} systems: ${{ needs.prepare.outputs.systems }} build: diff --git a/.github/workflows/periodic-merge-24h.yml b/.github/workflows/periodic-merge-24h.yml index 3aac3ccf8b73..d14c482df755 100644 --- a/.github/workflows/periodic-merge-24h.yml +++ b/.github/workflows/periodic-merge-24h.yml @@ -31,12 +31,6 @@ jobs: max-parallel: 1 matrix: pairs: - - from: release-25.11 - into: staging-next-25.11 - - from: staging-next-25.11 - into: staging-25.11 - - from: release-25.11 - into: staging-nixos-25.11 - from: release-26.05 into: staging-next-26.05 - from: staging-next-26.05 diff --git a/.github/workflows/pull-request-target.yml b/.github/workflows/pull-request-target.yml index 8edde367c13b..d4fda08d2e01 100644 --- a/.github/workflows/pull-request-target.yml +++ b/.github/workflows/pull-request-target.yml @@ -110,6 +110,7 @@ jobs: mergedSha: ${{ needs.prepare.outputs.mergedSha }} headSha: ${{ github.event.pull_request.head.sha }} targetSha: ${{ needs.prepare.outputs.targetSha }} + baseBranch: ${{ needs.prepare.outputs.baseBranch }} systems: ${{ needs.prepare.outputs.systems }} testVersions: ${{ contains(fromJSON(needs.prepare.outputs.touched), 'pinned') && !contains(fromJSON(needs.prepare.outputs.headBranch).type, 'development') }} diff --git a/.github/workflows/teams.yml b/.github/workflows/teams.yml index 09657b8049db..93c6d89e0a5d 100644 --- a/.github/workflows/teams.yml +++ b/.github/workflows/teams.yml @@ -38,7 +38,8 @@ jobs: maintainers/github-teams.json - name: Install dependencies - run: npm install bottleneck@2.19.5 + run: npm ci --package-lock-only=false bottleneck + working-directory: ci/github-script - name: Synchronise teams uses: actions/github-script@3a2844b7e9c422d3c10d287c895573f7108da1b3 # v9.0.0 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 2aeebf59968e..46a399cb7752 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -64,6 +64,7 @@ jobs: 'ci/github-script/supportedSystems.js', 'ci/pinned.json', 'ci/supportedBranches.js', + 'pkgs/top-level/release-supported-systems.json', ].includes(file))) core.setOutput('merge-group', true) if (files.some(file => [ @@ -88,6 +89,7 @@ jobs: 'ci/github-script/withRateLimit.js', 'ci/pinned.json', 'ci/supportedBranches.js', + 'pkgs/top-level/release-supported-systems.json', ].includes(file))) core.setOutput('pr', true) merge-group: diff --git a/.gitignore b/.gitignore index 4327aeb119e5..4792063f47d8 100644 --- a/.gitignore +++ b/.gitignore @@ -27,6 +27,9 @@ tags .mypy_cache __pycache__ +/AGENTS.md +/CLAUDE.md + /pkgs/development/libraries/qt-5/*/tmp/ /pkgs/desktops/kde-5/*/tmp/ /pkgs/development/mobile/androidenv/xml/* diff --git a/ci/OWNERS b/ci/OWNERS index e08961b38210..2d1a46e2ccff 100644 --- a/ci/OWNERS +++ b/ci/OWNERS @@ -25,26 +25,27 @@ /shell.nix @infinisil @NixOS/Security # Libraries -/lib @infinisil @hsjobeki -/lib/generators.nix @infinisil @hsjobeki -/lib/cli.nix @infinisil @hsjobeki -/lib/debug.nix @infinisil @hsjobeki -/lib/asserts.nix @infinisil @hsjobeki -/lib/path/* @infinisil @hsjobeki -/lib/fileset @infinisil @hsjobeki -/maintainers/github-teams.json @infinisil -/maintainers/computed-team-list.nix @infinisil +/lib @infinisil @hsjobeki @llakala +/lib/generators.nix @infinisil @hsjobeki @llakala +/lib/cli.nix @infinisil @hsjobeki @llakala +/lib/debug.nix @infinisil @hsjobeki @llakala +/lib/asserts.nix @infinisil @hsjobeki @llakala +/lib/path/* @infinisil @hsjobeki @llakala +/lib/fileset @infinisil @hsjobeki @llakala +/maintainers/github-teams.json @infinisil @llakala +/maintainers/computed-team-list.nix @infinisil @llakala ## Standard environment–related libraries -/lib/customisation.nix @alyssais @NixOS/stdenv -/lib/derivations.nix @NixOS/stdenv -/lib/fetchers.nix @alyssais @NixOS/stdenv -/lib/meta.nix @alyssais @NixOS/stdenv -/lib/source-types.nix @alyssais @NixOS/stdenv +/lib/customisation.nix @alyssais @NixOS/stdenv @llakala +/lib/derivations.nix @NixOS/stdenv @llakala +/lib/fetchers.nix @alyssais @NixOS/stdenv @llakala +/lib/meta.nix @alyssais @NixOS/stdenv @llakala +/lib/meta-types.nix @infinisil @adisbladis @NixOS/stdenv @llakala +/lib/source-types.nix @alyssais @NixOS/stdenv @llakala /lib/systems @alyssais @NixOS/stdenv ## Libraries / Module system -/lib/modules.nix @infinisil @roberth @hsjobeki -/lib/types.nix @infinisil @roberth @hsjobeki -/lib/options.nix @infinisil @roberth @hsjobeki +/lib/modules.nix @infinisil @roberth @hsjobeki @llakala +/lib/types.nix @infinisil @roberth @hsjobeki @llakala +/lib/options.nix @infinisil @roberth @hsjobeki @llakala /lib/tests/modules.sh @infinisil @roberth @hsjobeki /lib/tests/modules @infinisil @roberth @hsjobeki @@ -62,20 +63,17 @@ /pkgs/top-level/packages-info.nix @jopejoe1 /pkgs/top-level/release-lib.nix @jopejoe1 /pkgs/top-level/release.nix @jopejoe1 -/pkgs/stdenv @philiptaron @NixOS/stdenv -/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv -/pkgs/stdenv/generic/problems.nix @infinisil +/pkgs/stdenv @philiptaron @NixOS/stdenv @llakala +/pkgs/stdenv/generic @Ericson2314 @NixOS/stdenv @llakala +/pkgs/stdenv/generic/problems.nix @infinisil @llakala /pkgs/test/problems @infinisil -/pkgs/stdenv/generic/check-meta.nix @infinisil @Ericson2314 @adisbladis @NixOS/stdenv -/pkgs/stdenv/generic/meta-types.nix @infinisil @adisbladis @NixOS/stdenv +/pkgs/stdenv/generic/check-meta.nix @infinisil @Ericson2314 @adisbladis @NixOS/stdenv @llakala /pkgs/stdenv/cross @Ericson2314 @NixOS/stdenv /pkgs/build-support @philiptaron /pkgs/build-support/cc-wrapper @Ericson2314 /pkgs/build-support/bintools-wrapper @Ericson2314 /pkgs/build-support/setup-hooks @Ericson2314 /pkgs/build-support/setup-hooks/arrayUtilities @ConnorBaker -/pkgs/build-support/setup-hooks/auto-patchelf.sh @layus -/pkgs/by-name/au/auto-patchelf @layus ## Format generators/serializers /pkgs/pkgs-lib @Stunkymonkey @h7x4 @@ -84,10 +82,6 @@ # Nixpkgs build-support /pkgs/build-support/writers @lassulus -# Nixpkgs make-disk-image -/doc/build-helpers/images/makediskimage.section.md @raitobezarius -/nixos/lib/make-disk-image.nix @raitobezarius - # Nix, the package manager # @raitobezarius is not "code owner", but is listed here to be notified of changes # pertaining to the Nix package manager. @@ -101,16 +95,16 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /maintainers/scripts/doc @jtojnar @ryantm # Contributor documentation -/CONTRIBUTING.md @infinisil -/.github/PULL_REQUEST_TEMPLATE.md @infinisil -/doc/contributing/ @infinisil -/doc/contributing/contributing-to-documentation.chapter.md @jtojnar @infinisil -/lib/README.md @infinisil -/doc/README.md @infinisil -/nixos/README.md @infinisil -/pkgs/README.md @infinisil -/pkgs/by-name/README.md @infinisil -/maintainers/README.md @infinisil +/CONTRIBUTING.md +/.github/PULL_REQUEST_TEMPLATE.md +/doc/contributing/ +/doc/contributing/contributing-to-documentation.chapter.md @jtojnar +/lib/README.md +/doc/README.md +/nixos/README.md +/pkgs/README.md +/pkgs/by-name/README.md +/maintainers/README.md # User-facing development documentation /doc/development.md @infinisil @@ -129,10 +123,6 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /doc/redirects.json @GetPsyched /nixos/doc/manual/redirects.json @GetPsyched -# NixOS integration test driver -/nixos/lib/test-driver @tfc -/nixos/lib/testing @tfc - # NixOS QEMU virtualisation /nixos/modules/virtualisation/qemu-vm.nix @raitobezarius /nixos/modules/services/backup/libvirtd-autosnapshot.nix @6543 @@ -192,10 +182,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /pkgs/by-name/an/android* @NixOS/android # Python-related code and docs -/doc/languages-frameworks/python.section.md @mweinelt @natsukium -/maintainers/scripts/update-python-libraries @mweinelt @natsukium -/pkgs/by-name/up/update-python-libraries @mweinelt @natsukium -/pkgs/development/interpreters/python @mweinelt @natsukium +/doc/languages-frameworks/python.section.md @mweinelt +/maintainers/scripts/update-python-libraries @mweinelt +/pkgs/by-name/up/update-python-libraries @mweinelt +/pkgs/development/interpreters/python @mweinelt # CUDA /pkgs/top-level/cuda-packages.nix @NixOS/cuda-maintainers @@ -225,10 +215,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo /pkgs/development/r-modules @jbedo # Rust -/pkgs/development/compilers/rust @alyssais @Mic92 @winterqt -/pkgs/build-support/rust @winterqt +/pkgs/development/compilers/rust @NixOS/rust @alyssais +/pkgs/build-support/rust @NixOS/rust /pkgs/build-support/rust/fetch-cargo-vendor* @TomaSajt -/doc/languages-frameworks/rust.section.md @winterqt +/doc/languages-frameworks/rust.section.md @NixOS/rust # Tcl /pkgs/development/interpreters/tcl @fgaz @@ -240,14 +230,10 @@ nixos/modules/installer/tools/nix-fallback-paths.nix @Artturin @Ericson2314 @lo # C compilers /pkgs/development/compilers/gcc /pkgs/development/compilers/llvm @NixOS/llvm -/pkgs/development/compilers/emscripten @raitobezarius /doc/toolchains/llvm.chapter.md @NixOS/llvm -/doc/languages-frameworks/emscripten.section.md @raitobezarius # Audio -/nixos/modules/services/audio/botamusique.nix @mweinelt /nixos/modules/services/audio/snapserver.nix @mweinelt -/nixos/tests/botamusique.nix @mweinelt /nixos/tests/snapcast.nix @mweinelt # Browsers @@ -336,9 +322,9 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /nixos/tests/knot.nix @mweinelt # Web servers -/doc/packages/nginx.section.md @raitobezarius -/pkgs/servers/http/nginx/ @raitobezarius -/nixos/modules/services/web-servers/nginx/ @raitobezarius +/doc/packages/nginx.section.md @leona-ya @Ma27 +/pkgs/servers/http/nginx/ @helsinki-Jo @leona-ya @Ma27 +/nixos/modules/services/web-servers/nginx/ @leona-ya @Ma27 # D /pkgs/build-support/dlang @jtbx @TomaSajt @@ -378,7 +364,8 @@ pkgs/development/python-modules/buildcatrust/ @ajs124 @lukegb @mweinelt /pkgs/development/lua-modules @NixOS/lua # Neovim -/pkgs/applications/editors/neovim @NixOS/neovim +/pkgs/applications/editors/neovim @NixOS/neovim +/doc/languages-frameworks/neovim.section.md @NixOS/neovim # VimPlugins /pkgs/applications/editors/vim/plugins @NixOS/neovim @@ -519,7 +506,7 @@ pkgs/by-name/oc/octodns/ @anthonyroussel pkgs/by-name/te/teleport* @arianvp @justinas @sigma @tomberek @techknowlogick @JuliusFreudenberger # Warp-terminal -pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor +pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @4evy @johnrtitor # Nim /doc/languages-frameworks/nim.section.md @NixOS/nim @@ -533,3 +520,9 @@ pkgs/by-name/wa/warp-terminal/ @emilytrau @imadnyc @FlameFlag @johnrtitor # Zellij plugins /pkgs/by-name/ze/zellij/plugins/ @PerchunPak + +# Test-driver +/nixos/lib/test-driver @NixOS/test-driver +/nixos/lib/testing @NixOS/test-driver +/nixos/tests/nixos-test-driver @NixOS/test-driver +/nixos/modules/virtualisation/nspawn-container/run-nspawn @NixOS/test-driver diff --git a/ci/README.md b/ci/README.md index be0e8e4c4fca..6fbdca39800c 100644 --- a/ci/README.md +++ b/ci/README.md @@ -51,6 +51,16 @@ To ensure security and a focused utility, the bot adheres to specific limitation - opened by [@r-ryantm](https://nix-community.github.io/nixpkgs-update/r-ryantm/). - The user attempting to merge is a member of [@NixOS/nixpkgs-maintainers]. - The user attempting to merge is a maintainer of all packages touched by the PR. +- No [committer][@NixOS/nixpkgs-committers] has an outstanding "changes requested" review. + These block both the merge queue and auto-merge, so the bot refuses to merge until the review is addressed or dismissed. + +Once these constraints are met, the bot picks a merge strategy based on the `no PR failures` commit status: + +- CI passing: the PR is added to the merge queue. +- CI unfinished (pending or missing status): the bot enables [Auto Merge], which queues the PR once required checks succeed. + Note that if CI later fails, nothing happens until it is fixed and passes. +- CI already failing (`error`/`failure` status): the bot does not enable Auto Merge, because it would never trigger, and fixing CI requires a new push that invalidates the merge command. + A fresh `@NixOS/nixpkgs-merge-bot merge` comment is needed once CI is green again. ### Approving merge bot changes @@ -104,3 +114,4 @@ This script can also be run locally to print basic test cases. [@NixOS/nixpkgs-ci]: https://github.com/orgs/NixOS/teams/nixpkgs-ci [@NixOS/nixpkgs-core]: https://github.com/orgs/NixOS/teams/nixpkgs-core [RFC 172]: https://github.com/NixOS/rfcs/pull/172 +[Auto Merge]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request diff --git a/ci/default.nix b/ci/default.nix index c91c82867e8e..06fa75bbc38f 100644 --- a/ci/default.nix +++ b/ci/default.nix @@ -26,11 +26,7 @@ let fmt = let - treefmtNixSrc = fetchTarball { - inherit (pinned.treefmt-nix) url; - sha256 = pinned.treefmt-nix.hash; - }; - treefmtEval = (import treefmtNixSrc).evalModule pkgs ./treefmt.nix; + treefmt = pkgs.treefmt.withConfig ./treefmt.nix; fs = pkgs.lib.fileset; nixFilesSrc = fs.toSource { root = ../.; @@ -38,14 +34,24 @@ let }; in { - shell = treefmtEval.config.build.devShell; - pkg = treefmtEval.config.build.wrapper; - check = treefmtEval.config.build.check nixFilesSrc; + pkg = treefmt; + check = treefmt.check nixFilesSrc; }; + # nixos-render-docs and nixos-render-docs-redirects + # Should be used from tree to build the matching in-tree documentation + docPkgs = pkgs.extend ( + final: prev: { + nixos-render-docs = final.callPackage ../pkgs/by-name/ni/nixos-render-docs/package.nix { }; + nixos-render-docs-redirects = + final.callPackage ../pkgs/by-name/ni/nixos-render-docs-redirects/package.nix + { }; + } + ); + in rec { - inherit pkgs fmt; + inherit pkgs docPkgs fmt; codeownersValidator = pkgs.callPackage ./codeowners-validator { }; # FIXME(lf-): it might be useful to test other Nix implementations @@ -58,13 +64,13 @@ rec { # CI jobs lib-tests = import ../lib/tests/release.nix { inherit pkgs; }; manual-nixos = (import ../nixos/release.nix { }).manual.${system} or null; - manual-nixpkgs = (import ../doc { inherit pkgs; }); + manual-nixpkgs = (import ../doc { pkgs = docPkgs; }); nixpkgs-vet = pkgs.callPackage ./nixpkgs-vet.nix { nix = pkgs.nixVersions.latest; }; parse = pkgs.lib.recurseIntoAttrs { nix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.latest; }; - nix_2_28 = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.nix_2_28; }; + stable = pkgs.callPackage ./parse.nix { nix = pkgs.nixVersions.stable; }; lix = pkgs.callPackage ./parse.nix { nix = pkgs.lix; }; lix_latest = pkgs.callPackage ./parse.nix { nix = pkgs.lixPackageSets.latest.lix; }; }; diff --git a/ci/eval/attrpaths.nix b/ci/eval/attrpaths.nix deleted file mode 100644 index ff1bdabbb350..000000000000 --- a/ci/eval/attrpaths.nix +++ /dev/null @@ -1,85 +0,0 @@ -# This expression will, as efficiently as possible, dump a -# *superset* of all attrpaths of derivations which might be -# part of a release on *any* platform. -# -# This expression runs single-threaded under all current Nix -# implementations, but much faster and with much less memory -# used than ./outpaths.nix itself. -# -# Once you have the list of attrnames you can split it up into -# $NUM_CORES batches and evaluate the outpaths separately for each -# batch, in parallel. -# -# To dump the attrnames: -# -# nix-instantiate --eval --strict --json ci/eval/attrpaths.nix -A names -# -{ - lib ? import (path + "/lib"), - trace ? false, - path ? ./../.., - extraNixpkgsConfigJson ? "{}", -}: -let - - # TODO: Use mapAttrsToListRecursiveCond when this PR lands: - # https://github.com/NixOS/nixpkgs/pull/395160 - justAttrNames = - path: value: - let - result = - if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then - [ ] - else if lib.isDerivation value then - [ path ] - else - lib.pipe value [ - (lib.mapAttrsToList ( - name: value: - lib.addErrorContext "while evaluating package set attribute path '${ - lib.showAttrPath (path ++ [ name ]) - }'" (justAttrNames (path ++ [ name ]) value) - )) - lib.concatLists - ]; - in - lib.traceIf trace "** ${lib.showAttrPath path}" result; - - outpaths = import ./outpaths.nix { - inherit path; - extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson; - attrNamesOnly = true; - }; - - paths = [ - # Some of the following are based on variants, which are disabled with `attrNamesOnly = true`. - # Until these have been removed from release.nix / hydra, we manually add them to the list. - [ - "pkgsLLVM" - "stdenv" - ] - [ - "pkgsArocc" - "stdenv" - ] - [ - "pkgsZig" - "stdenv" - ] - [ - "pkgsStatic" - "stdenv" - ] - [ - "pkgsMusl" - "stdenv" - ] - ] - ++ justAttrNames [ ] outpaths; - - names = map lib.showAttrPath paths; - -in -{ - inherit paths names; -} diff --git a/ci/eval/chunk.nix b/ci/eval/chunk.nix index e1759c2c6615..9bea26ce3180 100644 --- a/ci/eval/chunk.nix +++ b/ci/eval/chunk.nix @@ -2,8 +2,8 @@ { lib ? import ../../lib, path ? ../.., - # The file containing all available attribute paths, which are split into chunks here - attrpathFile, + # The file containing the preEval result + preEvalFile, chunkSize, myChunk, includeBroken, @@ -12,12 +12,13 @@ }: let - attrpaths = lib.importJSON attrpathFile; - myAttrpaths = lib.sublist (chunkSize * myChunk) chunkSize attrpaths; + preEvalResult = lib.importJSON preEvalFile; + myAttrpaths = lib.sublist (chunkSize * myChunk) chunkSize preEvalResult.paths; unfiltered = import ./outpaths.nix { inherit path; inherit includeBroken systems; + inherit (preEvalResult) attrPathsDisallowedForInternalUse; extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson; }; diff --git a/ci/eval/compare/default.nix b/ci/eval/compare/default.nix index 856969ee8695..183e3bab8d41 100644 --- a/ci/eval/compare/default.nix +++ b/ci/eval/compare/default.nix @@ -49,6 +49,7 @@ in { combinedDir, touchedFilesJson, + baseBranch, ownersFile ? ../../OWNERS, }: let @@ -242,7 +243,7 @@ runCommand "compare" echo echo "# Performance comparison" echo - echo "This compares the performance of this branch against its pull request base branch (e.g., 'master')" + echo "This compares the performance of this branch against the \`${baseBranch}\` branch." echo } >> $out/step-summary.md diff --git a/ci/eval/default.nix b/ci/eval/default.nix index 7c0a2e9f3139..2c3ea0ff0732 100644 --- a/ci/eval/default.nix +++ b/ci/eval/default.nix @@ -17,6 +17,7 @@ busybox, jq, nix, + perf, }: { @@ -38,7 +39,7 @@ let fileset = unions ( map (lib.path.append ../..) [ ".version" - "ci/eval/attrpaths.nix" + "ci/eval/pre-eval.nix" "ci/eval/chunk.nix" "ci/eval/outpaths.nix" "default.nix" @@ -56,11 +57,11 @@ let builtins.readFile ../../pkgs/top-level/release-supported-systems.json ); - attrpathsSuperset = + preEval = { evalSystem, }: - runCommand "attrpaths-superset.json" + runCommand "pre-eval" { src = nixpkgs; # Don't depend on -dev outputs to reduce closure size for CI. @@ -73,15 +74,15 @@ let export NIX_STATE_DIR=$(mktemp -d) mkdir $out export GC_INITIAL_HEAP_SIZE=4g - command time -f "Attribute eval done [%MKB max resident, %Es elapsed] %C" \ + command time -f "Pre-eval done [%MKB max resident, %Es elapsed] %C" \ nix-instantiate --eval --strict --json --show-trace \ - "$src/ci/eval/attrpaths.nix" \ - -A paths \ + "$src/ci/eval/pre-eval.nix" \ + -A result \ -I "$src" \ --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \ --option restrict-eval true \ --option allow-import-from-derivation false \ - --option eval-system "${evalSystem}" > $out/paths.json + --option eval-system "${evalSystem}" > $out/result.json ''; singleSystem = @@ -90,8 +91,10 @@ let # Note that this is intentionally not called `system`, # because `--argstr system` would only be passed to the ci/default.nix file! evalSystem ? builtins.currentSystem, - # The path to the `paths.json` file from `attrpathsSuperset` - attrpathFile ? "${attrpathsSuperset { inherit evalSystem; }}/paths.json", + # The path to the `result.json` file from `preEval` + preEvalFile ? "${preEval { inherit evalSystem; }}/result.json", + # Output the number of assembly instructions executed during evaluation + countInstructions ? false, }: let singleChunk = writeShellScript "single-chunk" '' @@ -100,6 +103,7 @@ let myChunk=$2 system=$3 outputDir=$4 + preEvalFile=$5 # Default is 5, higher values effectively disable the warning. # This randomly breaks Eval. @@ -121,12 +125,12 @@ let --show-trace \ --arg chunkSize "$chunkSize" \ --arg myChunk "$myChunk" \ - --arg attrpathFile "${attrpathFile}" \ + --arg preEvalFile "$preEvalFile" \ --arg systems "[ \"$system\" ]" \ --arg includeBroken ${lib.boolToString includeBroken} \ --argstr extraNixpkgsConfigJson ${lib.escapeShellArg (builtins.toJSON extraNixpkgsConfig)} \ -I ${nixpkgs} \ - -I ${attrpathFile} \ + -I "$preEvalFile" \ > "$outputDir/result/$myChunk" \ 2> "$outputDir/stderr/$myChunk" exitCode=$? @@ -146,13 +150,16 @@ let runCommand "nixpkgs-eval-${evalSystem}" { # Don't depend on -dev outputs to reduce closure size for CI. - nativeBuildInputs = map lib.getBin [ - busybox - jq - nix - ]; + nativeBuildInputs = map lib.getBin ( + [ + busybox + jq + nix + ] + ++ lib.optionals countInstructions [ perf ] + ); env = { - inherit evalSystem chunkSize; + inherit evalSystem chunkSize countInstructions; }; __structuredAttrs = true; unsafeDiscardReferences.out = true; @@ -164,12 +171,6 @@ let echo "System: $evalSystem" cores=$NIX_BUILD_CORES echo "Cores: $cores" - attrCount=$(jq length "${attrpathFile}") - echo "Attribute count: $attrCount" - echo "Chunk size: $chunkSize" - # Same as `attrCount / chunkSize` but rounded up - chunkCount=$(( (attrCount - 1) / chunkSize + 1 )) - echo "Chunk count: $chunkCount" mkdir -p $out/${evalSystem} @@ -190,29 +191,78 @@ let done ) & - seq_end=$(( chunkCount - 1 )) + chunkedEval() { + local chunkOutputDir=$1 + local preEvalFile=$2 - ${lib.optionalString quickTest '' - seq_end=0 - ''} + local attrCount=$(jq '.paths | length' "$preEvalFile") + echo "Attribute count: $attrCount" + echo "Chunk size: $chunkSize" + # Same as `attrCount / chunkSize` but rounded up + local chunkCount=$(( (attrCount - 1) / chunkSize + 1 )) + echo "Chunk count: $chunkCount" - chunkOutputDir=$(mktemp -d) - mkdir "$chunkOutputDir"/{result,stats,timestats,stderr} + local seq_end=$(( chunkCount - 1 )) + ${lib.optionalString quickTest '' + seq_end=0 + ''} - seq -w 0 "$seq_end" | - command time -f "%e" -o "$out/${evalSystem}/total-time" \ - xargs -I{} -P"$cores" \ - ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir" + mkdir -p "$chunkOutputDir"/{result,stats,timestats,stderr} - cp -r "$chunkOutputDir"/stats $out/${evalSystem}/stats-by-chunk + runAllChunks() { + seq -w 0 "$seq_end" | + xargs -I{} -P"$cores" \ + ${singleChunk} "$chunkSize" {} "$evalSystem" "$chunkOutputDir" "$preEvalFile" + } - if (( chunkSize * chunkCount != attrCount )); then - # A final incomplete chunk would mess up the stats, don't include it - rm "$chunkOutputDir"/stats/"$seq_end" + if [[ -n "$countInstructions" ]]; then + export seq_end cores chunkSize evalSystem chunkOutputDir preEvalFile + export -f runAllChunks + perf stat \ + --event instructions:u --field-separator , --output "$chunkOutputDir"/perf-output-file \ + bash -c runAllChunks + cat "$chunkOutputDir"/perf-output-file | tail -n 1 | cut -d, -f1 > "$chunkOutputDir"/instructions + rm "$chunkOutputDir"/perf-output-file + else + runAllChunks + fi + + if (( chunkSize * chunkCount != attrCount )); then + # A final incomplete chunk would mess up the stats, don't include it + rm "$chunkOutputDir"/stats/"$seq_end" + fi + } + + chunkOutputDirs=$(mktemp -d) + + # Preparation for the second eval + disallowedAttributesPreEvalFile=$(mktemp) + jq '{ + paths: (.attrPathsDisallowedForInternalUse | map(.attrPath)), + attrPathsDisallowedForInternalUse: [] + }' ${preEvalFile} > "$disallowedAttributesPreEvalFile" + + startEpoch=$(date +%s) + + # The first eval evaluates only attributes that are not disallowed for internal Nixpkgs use, ensuring that they don't depend on disallowed attributes + # Because the first eval doesn't evaluate the disallowed attributes themselves, but we still want to check that they don't fail evaluation, we evaluate them separately in a second eval + # The reason we need two evals is because we want disallowed attributes to be able to depend on other disallowed attributes, which inherently needs a separate Nixpkgs instantiation + # And while we could interleave that instantiation into a single eval, that would ~double memory usage for all chunks, while doing it separately doesn't + echo "Evaluating the internally allowed attributes" + chunkedEval "$chunkOutputDirs"/allowed ${preEvalFile} + echo "Evaluating the internally disallowed attributes" + chunkedEval "$chunkOutputDirs"/disallowed "$disallowedAttributesPreEvalFile" + + echo $(( $(date +%s) - startEpoch )) > "$out/${evalSystem}/total-time" + + # We only use the stats from the allowed attrs eval, because the disallowed attrs are generally not even a full chunk + cp -r "$chunkOutputDirs"/allowed/stats $out/${evalSystem}/stats-by-chunk + if [[ -f "$chunkOutputDirs"/allowed/instructions ]]; then + cp "$chunkOutputDirs"/allowed/instructions $out/${evalSystem}/instructions fi - cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json - cat "$chunkOutputDir"/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json + cat "$chunkOutputDirs"/*/result/* | jq -s 'add | map_values(.outputs)' > $out/${evalSystem}/paths.json + cat "$chunkOutputDirs"/*/result/* | jq -s 'add | map_values(.meta)' > $out/${evalSystem}/meta.json ''; diff = callPackage ./diff.nix { }; @@ -249,14 +299,20 @@ let }) | from_entries ' > $out/maintainers.json - mkdir -p $out/before/stats + mkdir -p $out/before/stats $out/before/instructions for d in ${diffDir}/before/*; do cp -r "$d"/stats-by-chunk $out/before/stats/$(basename "$d") + if [[ -f "$d"/instructions ]]; then + cp "$d"/instructions $out/before/instructions/$(basename "$d") + fi done - mkdir -p $out/after/stats + mkdir -p $out/after/stats $out/after/instructions for d in ${diffDir}/after/*; do cp -r "$d"/stats-by-chunk $out/after/stats/$(basename "$d") + if [[ -f "$d"/instructions ]]; then + cp "$d"/instructions $out/after/instructions/$(basename "$d") + fi done ''; @@ -266,13 +322,16 @@ let { # Whether to evaluate on a specific set of systems, by default all are evaluated evalSystems ? if quickTest then [ "x86_64-linux" ] else supportedSystems, + # Output the number of assembly instructions executed during evaluation on + # each system + countInstructions ? false, }: symlinkJoin { name = "nixpkgs-eval-baseline"; paths = map ( evalSystem: singleSystem { - inherit evalSystem; + inherit evalSystem countInstructions; } ) evalSystems; }; @@ -288,6 +347,12 @@ let # | jq --raw-input --slurp 'split("\n")[:-1]' > touched-files.json # ``` touchedFilesJson ? builtins.toFile "touched-files.json" "[ ]", + # The branch the local comparison is made against; matches the `master` + # used in the touched-files expression above. + baseBranch ? "master", + # Output the number of assembly instructions executed during evaluation on + # each system + countInstructions ? false, }: let diffs = symlinkJoin { @@ -298,14 +363,14 @@ let inherit evalSystem; beforeDir = baseline; afterDir = singleSystem { - inherit evalSystem; + inherit evalSystem countInstructions; }; } ) evalSystems; }; comparisonReport = compare { combinedDir = combine { diffDir = diffs; }; - inherit touchedFilesJson; + inherit touchedFilesJson baseBranch; }; in comparisonReport; @@ -313,7 +378,7 @@ let in { inherit - attrpathsSuperset + preEval singleSystem diff combine diff --git a/ci/eval/outpaths.nix b/ci/eval/outpaths.nix index afbce48f3321..512290ce450a 100755 --- a/ci/eval/outpaths.nix +++ b/ci/eval/outpaths.nix @@ -6,7 +6,7 @@ includeBroken ? true, # set this to false to exclude meta.broken packages from the output path ? ./../.., - # used by ./attrpaths.nix + # used by ./pre-eval.nix attrNamesOnly ? false, # Set this to `null` to build for builtins.currentSystem only @@ -14,6 +14,8 @@ builtins.readFile (path + "/pkgs/top-level/release-supported-systems.json") ), + attrPathsDisallowedForInternalUse ? [ ], + # Customize the config used to evaluate nixpkgs extraNixpkgsConfig ? { }, }: @@ -35,6 +37,22 @@ let allowVariants = !attrNamesOnly; checkMeta = true; + # We don't need to care about problems being caught using the + # standard mechanism, because any problems whose kind is not + # nixpkgsInternalUseAllowed cause the corresponding attributes to + # be disallowed entirely for internal use with + # attrPathsDisallowedForInternalUse, see also ./pre-eval.nix + problems.matchers = lib.mkForce [ + # We only need to set the broken handler to error, so that CI + # doesn't evaluate those. No reason it couldn't evaluate them + # afaik, but this is how it's been before. + { + kind = "broken"; + handler = "error"; + } + ]; + inherit attrPathsDisallowedForInternalUse; + # Silence the `x86_64-darwin` deprecation warning. allowDeprecatedx86_64Darwin = true; diff --git a/ci/eval/pre-eval.nix b/ci/eval/pre-eval.nix new file mode 100644 index 000000000000..eff8204a7bd5 --- /dev/null +++ b/ci/eval/pre-eval.nix @@ -0,0 +1,128 @@ +# This file does a fast pre-evaluation of Nixpkgs to determine: +# - paths: A *superset* of all attrpaths of derivations which might be part of a release on *any* platform. +# - attrPathsDisallowedForInternalUse: Attribute paths whose meta.problems has problems whose kinds should not be used internally in Nixpkgs +# +# This expression runs single-threaded under all current Nix +# implementations, but much faster and with much less memory +# used than ./outpaths.nix itself. +# +# Once you have the list of attrnames you can split it up into +# $NUM_CORES batches and evaluate the outpaths separately for each +# batch, in parallel. +# +# To dump the result: +# +# nix-instantiate --eval --strict --json ci/eval/pre-eval.nix -A result +# +{ + lib ? import (path + "/lib"), + trace ? false, + path ? ./../.., + extraNixpkgsConfigJson ? "{}", +}: +let + + # TODO: Use mapAttrsToListRecursiveCond when this PR lands: + # https://github.com/NixOS/nixpkgs/pull/395160 + listAttrs = + path: value: + let + result = + if path == [ "AAAAAASomeThingsFailToEvaluate" ] || !(lib.isAttrs value) then + [ ] + else if lib.isDerivation value then + [ + { + inherit path value; + } + ] + else + lib.pipe value [ + (lib.mapAttrsToList ( + name: value: + lib.addErrorContext "while evaluating package set attribute path '${ + lib.showAttrPath (path ++ [ name ]) + }'" (listAttrs (path ++ [ name ]) value) + )) + lib.concatLists + ]; + in + lib.traceIf trace "** ${lib.showAttrPath path}" result; + + outpaths = import ./outpaths.nix { + inherit path; + extraNixpkgsConfig = builtins.fromJSON extraNixpkgsConfigJson; + attrNamesOnly = true; + }; + + list = + map + (path: { + inherit path; + # This looks a bit weird, but the only reason we care about this value + # is for the meta.problems check below, and stdenv's certainly don't + # have any problems, so this is fine :) + value = { }; + }) + [ + # Some of the following are based on variants, which are disabled with `attrNamesOnly = true`. + # Until these have been removed from release.nix / hydra, we manually add them to the list. + [ + "pkgsLLVM" + "stdenv" + ] + [ + "pkgsArocc" + "stdenv" + ] + [ + "pkgsZig" + "stdenv" + ] + [ + "pkgsStatic" + "stdenv" + ] + [ + "pkgsMusl" + "stdenv" + ] + ] + ++ listAttrs [ ] outpaths; + paths = map (attrs: attrs.path) list; + names = map lib.showAttrPath paths; + + inherit (import ../../pkgs/stdenv/generic/problems.nix { inherit lib; }) + disallowNixpkgsInternalUseKinds + ; + + # Determine the list of attributes whose packages have any meta.problems + # with a kind that's disallowed from internal Nixpkgs use + attrPathsDisallowedForInternalUse = lib.pipe list [ + (lib.map ( + attrs: + attrs + // { + problematicProblems = builtins.tryEval ( + lib.filterAttrs (name: problem: disallowNixpkgsInternalUseKinds ? ${problem.kind}) ( + attrs.value.meta.problems or { } + ) + ); + } + )) + (lib.filter (attrs: attrs.problematicProblems.success && attrs.problematicProblems.value != { })) + (lib.map (attrs: { + attrPath = attrs.path; + reason = "it has certain meta.problems whose kinds are disallowed: ${ + lib.generators.toPretty { } attrs.problematicProblems.value + }"; + })) + ]; +in +{ + # TODO: Do we still need these? Probably not + inherit paths names; + result = { + inherit paths attrPathsDisallowedForInternalUse; + }; +} diff --git a/ci/github-script/bot.js b/ci/github-script/bot.js index c952499cec54..684e3e33179a 100644 --- a/ci/github-script/bot.js +++ b/ci/github-script/bot.js @@ -206,20 +206,8 @@ module.exports = async ({ github, context, core, dry }) => { const maintainers = await getMaintainerMap(pull_request.base.ref) - const merge_bot_eligible = await handleMerge({ - github, - context, - core, - log, - dry, - pull_request, - events, - maintainers, - getTeamMembers, - getUser, - }) - // Check for any human reviews other than the PR author, GitHub actions and other GitHub apps. + // `commit { oid }` is needed by handleMerge to verify approvals are against the current head. const reviews = ( await github.graphql( `query($owner: String!, $repo: String!, $pr: Int!) { @@ -231,6 +219,7 @@ module.exports = async ({ github, context, core, dry }) => { reviews(first: 100) { nodes { state + commit { oid } user: author { # Only get users, no bots ... on User { @@ -266,6 +255,20 @@ module.exports = async ({ github, context, core, dry }) => { r.user.id !== pull_request.user?.id, ) + const merge_bot_eligible = await handleMerge({ + github, + context, + core, + log, + dry, + pull_request, + events, + reviews, + maintainers, + getTeamMembers, + getUser, + }) + const approvals = new Set( reviews .filter((review) => review.state === 'APPROVED') @@ -392,6 +395,13 @@ module.exports = async ({ github, context, core, dry }) => { pull_number, per_page: 100, }) + + // label llm-assisted PRs accordingly + const assistedByPattern = /Assisted-by: (?!nix-init)/i + evalLabels['llm-assisted'] = prCommits.some((c) => + assistedByPattern.test(c.commit.message), + ) + const commitSubjects = prCommits.map( (c) => c.commit.message.split('\n')[0], ) diff --git a/ci/github-script/lint-commits.js b/ci/github-script/lint-commits.js index 0828db23a2bc..51c81332490d 100644 --- a/ci/github-script/lint-commits.js +++ b/ci/github-script/lint-commits.js @@ -74,8 +74,10 @@ async function checkCommitMessages({ commits, core }) { 'fix', 'perf', 'refactor', + 'services', 'style', 'test', + 'update', ] /** diff --git a/ci/github-script/merge.js b/ci/github-script/merge.js index ee861e21187d..180a12b0fe4a 100644 --- a/ci/github-script/merge.js +++ b/ci/github-script/merge.js @@ -2,11 +2,11 @@ const { classify } = require('../supportedBranches.js') function runChecklist({ committers, - events, files, pull_request, log, maintainers, + reviews, user, userIsMaintainer, }) { @@ -27,18 +27,35 @@ function runChecklist({ .reduce((acc, cur) => acc?.intersection(cur) ?? cur) const approvals = new Set( - events + reviews .filter( - ({ event, state, commit_id }) => - event === 'reviewed' && - state === 'approved' && + ({ state, commit }) => + state === 'APPROVED' && // Only approvals for the current head SHA count, otherwise authors could push // bad code between the approval and the merge. - commit_id === pull_request.head.sha, + commit?.oid === pull_request.head.sha, ) - .map(({ user }) => user?.id) - // Some users have been deleted, so filter these out. - .filter(Boolean), + .map(({ user }) => user.id), + ) + + // A "changes requested" review from a committer blocks both the merge queue and + // auto-merge, even if it was made on an older commit (unlike approvals, GitHub does + // not auto-dismiss changes-requested reviews on push). For each committer, take their + // latest actionable review; if it's CHANGES_REQUESTED, they're blocking the PR. + // Dismissed reviews surface as DISMISSED and comment-only follow-ups as COMMENTED, so + // both are skipped naturally — the prior actionable review still stands until the + // committer explicitly approves or requests changes again. + const committerReviewState = new Map() + for (const { user, state } of reviews) { + if ( + committers.has(user.id) && + ['APPROVED', 'CHANGES_REQUESTED'].includes(state) + ) { + committerReviewState.set(user.id, state) + } + } + const noBlockingReviews = !Array.from(committerReviewState.values()).includes( + 'CHANGES_REQUESTED', ) const checklist = { @@ -57,6 +74,11 @@ function runChecklist({ pull_request.user.login === 'r-ryantm', }, 'PR is not a draft': !pull_request.draft, + // CI state is intentionally *not* a checklist item: auto-merge exists precisely to + // cover unfinished CI, and an already-failed CI is reported via the merge message + // (see merge() below) rather than a blanket refusal. + 'PR is not blocked by a "changes requested" review from a [committer](https://github.com/orgs/NixOS/teams/nixpkgs-committers).': + noBlockingReviews, } if (user) { @@ -123,6 +145,7 @@ async function handleMerge({ dry, pull_request, events, + reviews, maintainers, getTeamMembers, getUser, @@ -148,6 +171,14 @@ async function handleMerge({ // including an early exit when the first non-by-name file is found. if (files.length >= 100) return false + const noPrFailuresState = ( + await github.rest.repos.listCommitStatusesForRef({ + ...context.repo, + ref: pull_request.head.sha, + per_page: 100, + }) + ).data.find(({ context }) => context === 'no PR failures')?.state + // Only look through comments *after* the latest (force) push. const lastPush = events.findLastIndex( ({ event, sha, commit_id }) => @@ -173,10 +204,12 @@ async function handleMerge({ )), ) + // Returns `{ reaction, messages }`: the reaction to leave on the merge comment and the + // lines to append to the bot's reply. Throws only on an unexpected API error. async function merge() { if (dry) { core.info(`Merging #${pull_number}... (dry)`) - return ['Merge completed (dry)'] + return { reaction: 'ROCKET', messages: ['Merge completed (dry)'] } } // Using GraphQL mutations instead of the REST /merge endpoint, because the latter @@ -197,16 +230,37 @@ async function handleMerge({ { node_id: pull_request.node_id, sha: pull_request.head.sha }, ) log('merge', 'Queued for merge') - return [ - `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`, - ] + return { + reaction: 'ROCKET', + messages: [ + `:heavy_check_mark: [Queued](${resp.enqueuePullRequest.mergeQueueEntry.mergeQueue.url}) for merge (#306934)`, + ], + } } catch (e) { log('Enqueuing failed', e.response.errors[0].message) } - // If required status checks are not satisfied, yet, the above will fail. In this case - // we can enable auto-merge. We could also only use auto-merge, but this often gets - // stuck for no apparent reason. + // Enqueuing fails when the required status checks are not satisfied, yet. If CI has + // already failed, enabling auto-merge would be pointless: it would never fire, and + // fixing CI requires a new push, which invalidates this merge command anyway (we only + // act on comments after the latest push). So we don't enable auto-merge and instead + // ask for a fresh command once CI is green again. + if (['error', 'failure'].includes(noPrFailuresState)) { + log('merge', 'CI has failed, not enabling auto-merge') + return { + reaction: 'THUMBS_DOWN', + messages: [ + ':x: Pull Request could not be merged: CI has failed (#305350).', + '', + '> [!TIP]', + '> PRs cannot be merged while CI is failing.', + '> Once CI is passing, comment `@NixOS/nixpkgs-merge-bot merge` again.', + ], + } + } + + // CI has not finished yet, so we enable auto-merge. We could also only use auto-merge, + // but this often gets stuck for no apparent reason. try { await github.graphql( `mutation($node_id: ID!, $sha: GitObjectID) { @@ -219,12 +273,17 @@ async function handleMerge({ { node_id: pull_request.node_id, sha: pull_request.head.sha }, ) log('merge', 'Auto-merge enabled') - return [ - `:heavy_check_mark: Enabled Auto Merge (#306934)`, - '', - '> [!TIP]', - '> Sometimes GitHub gets stuck after enabling Auto Merge. In this case, leaving another approval should trigger the merge.', - ] + return { + reaction: 'ROCKET', + messages: [ + `:heavy_check_mark: Enabled Auto Merge (#306934)`, + '', + '> [!TIP]', + '> [Auto Merge](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/incorporating-changes-from-a-pull-request/automatically-merging-a-pull-request) will queue this PR once required CI checks succeed.', + '> If CI fails instead, fixing it needs a new push, which disables Auto Merge and invalidates this command — comment `@NixOS/nixpkgs-merge-bot merge` again once CI is green.', + '> If GitHub gets stuck even though CI passed (it sometimes does), leaving another approval should kick off the merge.', + ], + } } catch (e) { log('Auto Merge failed', e.response.errors[0].message) throw new Error(e.response.errors[0].message) @@ -267,11 +326,11 @@ async function handleMerge({ const { result, eligible, checklist } = runChecklist({ committers, - events, files, pull_request, log, maintainers, + reviews, user: comment.user, userIsMaintainer: await isMaintainer(comment.user.login), }) @@ -308,10 +367,12 @@ async function handleMerge({ } if (result) { - await react('ROCKET') try { - body.push(...(await merge())) + const { reaction, messages } = await merge() + await react(reaction) + body.push(...messages) } catch (e) { + await react('THUMBS_DOWN') // Remove the HTML comment with node_id reference to allow retrying this merge on the next run. body.shift() body.push(`:x: Merge failed with: ${e} (#371492)`) @@ -336,11 +397,11 @@ async function handleMerge({ const { result } = runChecklist({ committers, - events, files, pull_request, log, maintainers, + reviews, }) // Returns a boolean, which indicates whether the PR is merge-bot eligible in principle. diff --git a/ci/github-script/package-lock.json b/ci/github-script/package-lock.json index 9e354e74ae46..a557931231b6 100644 --- a/ci/github-script/package-lock.json +++ b/ci/github-script/package-lock.json @@ -4,7 +4,6 @@ "requires": true, "packages": { "": { - "name": "github-script", "dependencies": { "@actions/artifact": "6.2.1", "@actions/core": "1.10.1", diff --git a/ci/github-script/package.json b/ci/github-script/package.json index 290ef068e90b..b5fb5e4a586a 100644 --- a/ci/github-script/package.json +++ b/ci/github-script/package.json @@ -2,9 +2,7 @@ "private": true, "//": [ "Keep `@actions/core` and `@actions/github` in sync with", - "https://github.com/actions/github-script/blob/main/package.json.", - "Keep `@actions/artifact` and `bottleneck` in sync with", - "`.github/workflows/bot.yml`." + "https://github.com/actions/github-script/blob/main/package.json." ], "dependencies": { "@actions/artifact": "6.2.1", diff --git a/ci/pinned.json b/ci/pinned.json index 0e8f2b8ff61c..6f50e7e09f51 100644 --- a/ci/pinned.json +++ b/ci/pinned.json @@ -9,22 +9,9 @@ }, "branch": "nixpkgs-unstable", "submodules": false, - "revision": "8c91a71d13451abc40eb9dae8910f972f979852f", - "url": "https://github.com/NixOS/nixpkgs/archive/8c91a71d13451abc40eb9dae8910f972f979852f.tar.gz", - "hash": "sha256-fnzKKPvS+oieI/pTzotA5tkoM47EB1NpaBcgk4R97hE=" - }, - "treefmt-nix": { - "type": "Git", - "repository": { - "type": "GitHub", - "owner": "numtide", - "repo": "treefmt-nix" - }, - "branch": "main", - "submodules": false, - "revision": "db947814a175b7ca6ded66e21383d938df01c227", - "url": "https://github.com/numtide/treefmt-nix/archive/db947814a175b7ca6ded66e21383d938df01c227.tar.gz", - "hash": "sha256-eynAfOmbmxJnkp7YewvCEbShNnnYJ9gLLqkzsYtBPeM=" + "revision": "421eebfd0ec7bccd4abe826ce62d7e6e83129493", + "url": "https://github.com/NixOS/nixpkgs/archive/421eebfd0ec7bccd4abe826ce62d7e6e83129493.tar.gz", + "hash": "sha256:1lxfhfgiv1sz2v7fg43gny57sa6wf59n98q7ldsyb2p06f4sal7w" } }, "version": 8 diff --git a/ci/treefmt.nix b/ci/treefmt.nix index 9575e99d8680..a0d4ffbc1ef2 100644 --- a/ci/treefmt.nix +++ b/ci/treefmt.nix @@ -1,122 +1,175 @@ -{ pkgs, ... }: { - # Important: The auto-rebase script uses `git filter-branch --tree-filter`, - # which creates trees within the Git repository under `.git-rewrite/t`, - # notably without having a `.git` themselves. - # So if this projectRootFile were the default `.git/config`, - # having the auto-rebase script use treefmt on such a tree would make it - # format all files in the _parent_ Git tree as well. - projectRootFile = ".git-blame-ignore-revs"; - - # Be a bit more verbose by default, so we can see progress happening - settings.verbose = 1; - - # By default it's info, which is too noisy since we have many unmatched files - settings.on-unmatched = "debug"; - - programs.actionlint.enable = true; - - programs.biome = { - enable = true; - # Disable settings validation because its inputs are liable to hash mismatch - validate.enable = false; - settings.formatter = { - useEditorconfig = true; - }; - settings.javascript.formatter = { - quoteStyle = "single"; - semicolons = "asNeeded"; - }; - settings.json.formatter.enabled = false; - }; - settings.formatter.biome.excludes = [ - "*.min.js" - "pkgs/*" +{ + lib, + pkgs, + ... +}: +{ + runtimeInputs = [ + # tree-root uses `git rev-parse --show-toplevel` + pkgs.gitMinimal ]; - programs.keep-sorted.enable = true; - - # This uses nixfmt underneath, the default formatter for Nix code. - # See https://github.com/NixOS/nixfmt - programs.nixfmt = { - enable = true; - package = pkgs.nixfmt; - }; - - programs.yamlfmt = { - enable = true; - settings.formatter = { - retain_line_breaks = true; - }; - }; - settings.formatter.yamlfmt.excludes = [ - # Aligns comments with whitespace - "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml" - # TODO: Fix formatting for auto-generated file - "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" - ]; - - programs.nixf-diagnose = { - enable = true; - ignore = [ - # Rule names can currently be looked up here: - # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py - # TODO: Remove the following and fix things. - "sema-unused-def-lambda-noarg-formal" - "sema-unused-def-lambda-witharg-arg" - "sema-unused-def-lambda-witharg-formal" - "sema-unused-def-let" - # Keep this rule, because we have `lib.or`. - "or-identifier" - # TODO: remove after outstanding prelude diagnostics issues are fixed: - # https://github.com/nix-community/nixd/issues/761 - # https://github.com/nix-community/nixd/issues/762 - "sema-primop-removed-prefix" - "sema-primop-overridden" - "sema-constant-overridden" - "sema-primop-unknown" - ]; - }; - settings.formatter.nixf-diagnose = { - # Ensure nixfmt cleans up after nixf-diagnose. - priority = -1; + settings = { + # numtide/treefmt-nix defaults excludes = [ - # Auto-generated; violates sema-extra-with - # Can only sensibly be removed when --auto-fix supports multiple fixes at once: - # https://github.com/inclyc/nixf-diagnose/issues/13 - "pkgs/servers/home-assistant/component-packages.nix" - # https://github.com/nix-community/nixd/issues/708 - "nixos/maintainers/scripts/azure-new/examples/basic/system.nix" + "*.lock" + "*.patch" + "*.diff" + "package-lock.json" + "go.mod" + "go.sum" + ".gitattributes" + ".gitignore" + ".gitmodules" + "COPYING" + "LICENSE" ]; - }; - settings.formatter.editorconfig-checker = { - command = "${pkgs.lib.getExe pkgs.editorconfig-checker}"; - options = [ - "-disable-indent-size" - # TODO: Remove this once this upstream issue is fixed: - # https://github.com/editorconfig-checker/editorconfig-checker/issues/505 - "-disable-charset" - ]; - includes = [ "*" ]; - priority = 1; - }; + # Be a bit more verbose by default, so we can see progress happening + verbose = 1; - # TODO: Upstream this into treefmt-nix eventually: - # https://github.com/numtide/treefmt-nix/issues/387 - settings.formatter.markdown-code-runner = { - command = pkgs.lib.getExe pkgs.markdown-code-runner; - options = - let - config = pkgs.writers.writeTOML "markdown-code-runner-config" { - presets.nixfmt = { - language = "nix"; - command = [ (pkgs.lib.getExe pkgs.nixfmt) ]; - }; - }; - in - [ "--config=${config}" ]; - includes = [ "*.md" ]; - }; + # By default it's info, which is too noisy since we have many unmatched files + on-unmatched = "debug"; - programs.zizmor.enable = true; + formatter = { + # keep-sorted start block=yes newline_separated=yes + actionlint = { + command = lib.getExe pkgs.actionlint; + includes = [ + ".github/workflows/*.yml" + ".github/workflows/*.yaml" + ]; + }; + + biome = { + command = lib.getExe pkgs.biome; + excludes = [ + "*.min.js" + "pkgs/*" + ]; + includes = [ + "*.js" + "*.ts" + "*.mjs" + "*.mts" + "*.cjs" + "*.cts" + "*.jsx" + "*.tsx" + "*.d.ts" + "*.d.cts" + "*.d.mts" + "*.css" + ]; + options = [ + "check" + "--write" + "--no-errors-on-unmatched" + "--use-editorconfig=true" + "--javascript-formatter-quote-style=single" + "--semicolons=as-needed" + ]; + }; + + editorconfig-checker = { + command = lib.getExe pkgs.editorconfig-checker; + options = [ + "-disable-indent-size" + # TODO: Remove this once this upstream issue is fixed: + # https://github.com/editorconfig-checker/editorconfig-checker/issues/505 + "-disable-charset" + ]; + includes = [ "*" ]; + priority = 1; + }; + + keep-sorted = { + command = lib.getExe pkgs.keep-sorted; + includes = [ "*" ]; + }; + + markdown-code-runner = { + command = lib.getExe pkgs.markdown-code-runner; + options = + let + config = pkgs.writers.writeTOML "markdown-code-runner-config" { + presets.nixfmt = { + language = "nix"; + command = [ (lib.getExe pkgs.nixfmt) ]; + }; + }; + in + [ "--config=${config}" ]; + includes = [ "*.md" ]; + }; + + nixf-diagnose = { + command = lib.getExe pkgs.nixf-diagnose; + excludes = [ + # Auto-generated; violates sema-extra-with + # Can only sensibly be removed when --auto-fix supports multiple fixes at once: + # https://github.com/inclyc/nixf-diagnose/issues/13 + "pkgs/servers/home-assistant/component-packages.nix" + # https://github.com/nix-community/nixd/issues/708 + "nixos/maintainers/scripts/azure-new/examples/basic/system.nix" + ]; + includes = [ "*.nix" ]; + options = [ + "--auto-fix" + # Rule names can currently be looked up here: + # https://github.com/nix-community/nixd/blob/main/libnixf/src/Basic/diagnostic.py + # TODO: Remove the following and fix things. + "--ignore=sema-unused-def-lambda-noarg-formal" + "--ignore=sema-unused-def-lambda-witharg-arg" + "--ignore=sema-unused-def-lambda-witharg-formal" + "--ignore=sema-unused-def-let" + # TODO: remove after outstanding prelude diagnostics issues are fixed: + # https://github.com/nix-community/nixd/issues/761 + # https://github.com/nix-community/nixd/issues/762 + "--ignore=sema-primop-removed-prefix" + "--ignore=sema-primop-overridden" + "--ignore=sema-constant-overridden" + "--ignore=sema-primop-unknown" + ]; + # Ensure nixfmt cleans up after nixf-diagnose. + priority = -1; + }; + + # This uses nixfmt underneath, the default formatter for Nix code. + # See https://github.com/NixOS/nixfmt + nixfmt = { + command = lib.getExe pkgs.nixfmt; + includes = [ "*.nix" ]; + }; + + yamlfmt = { + command = lib.getExe pkgs.yamlfmt; + excludes = [ + # Aligns comments with whitespace + "pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml" + # TODO: Fix formatting for auto-generated file + "pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml" + ]; + includes = [ + "*.yaml" + "*.yml" + ]; + options = [ + "-formatter" + "retain_line_breaks=true" + ]; + }; + + zizmor = { + command = lib.getExe pkgs.zizmor; + includes = [ + ".github/workflows/*.yml" + ".github/workflows/*.yaml" + ".github/actions/**/*.yml" + ".github/actions/**/*.yaml" + ]; + }; + # keep-sorted end + }; + }; } diff --git a/ci/update-pinned.sh b/ci/update-pinned.sh index 69ba7df9131d..51c99b0da98d 100755 --- a/ci/update-pinned.sh +++ b/ci/update-pinned.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p npins -I nixpkgs=../ +#!nix-shell -i bash -E 'with import ../. {}; mkShell { packages = [ npins ]; }' set -euo pipefail diff --git a/doc/README.md b/doc/README.md index 4fafb9f575b8..4b124deaa3ce 100644 --- a/doc/README.md +++ b/doc/README.md @@ -1,21 +1,32 @@ -# Contributing to the Nixpkgs reference manual +# Contributing to the Nixpkgs manual -This directory houses the source files for the Nixpkgs reference manual. +This directory houses the source files for the Nixpkgs manual. -> [!IMPORTANT] -> We are actively restructuring our documentation to follow the [Diátaxis framework](https://diataxis.fr/) +> [!NOTE] > -> Going forward, this directory should **only** contain [reference documentation](https://nix.dev/contributing/documentation/diataxis#reference). -> For tutorials, guides and explanations, contribute to instead. +> We are actively restructuring our documentation to be more beginner friendly. > -> We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code. -> This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly. -For documentation only relevant for contributors, use Markdown files next to the source and regular code comments. +When writing new docs use **Progressive Disclosure** -> [!TIP] -> Feedback for improving support for parsing and rendering doc-comments is highly appreciated. -> [Open an issue](https://github.com/NixOS/nixpkgs/issues/new?labels=6.topic%3A+documentation&title=Doc%3A+) to request bugfixes or new features. +Start simple, pick up beginners. +Use **examples** first to show how to get something done. Keep **Explanation** lean. + +Use our [styleguide](./styleguide.md) for more in depth guidance on writing good documentation. + +This directory contains **guides** and **reference** documentation for Nixpkgs. + +Borrowing from [Diátaxis framework](https://diataxis.fr/) what suits our needs: + +**Guides** are task-oriented. They can be tutorial-style walkthroughs or how-to sections. +Explanations appear as prose after examples. + +**Reference** documentation is the specification of functions and attributes. + +We are actively working to generate **all** reference documentation from the [doc-comments](https://github.com/NixOS/rfcs/blob/master/rfcs/0145-doc-strings.md) present in code. +This also provides the benefit of using `:doc` in the `nix repl` to view reference documentation locally on the fly. + +See [Document structure](#document-structure) for a structural template. Rendered documentation: - [Unstable (from master)](https://nixos.org/manual/nixpkgs/unstable/) @@ -36,7 +47,7 @@ If the build succeeds, the manual will be in `./result/share/doc/nixpkgs/manual. ### Development environment -In order to reduce repetition, consider using tools from the provided development environment: +To reduce repetition, consider using tools from the provided development environment: Load it from the Nixpkgs documentation directory with @@ -54,9 +65,11 @@ Make sure that your local files aren't added to Git history by adding the follow /**/.direnv ``` -#### `devmode` +#### Live preview -Use [`devmode`](../pkgs/by-name/de/devmode/README.md) for a live preview when editing the manual. +Run [`devmode`](../pkgs/by-name/de/devmode/README.md) for a live preview while editing the manual: it rebuilds on every change and reloads the page in your browser automatically. + +Changes to the renderer 'pkgs/by-name/ni/nixos-render-docs' need a manual restart. Run: `devmode` again. ### Testing redirects @@ -209,6 +222,62 @@ You, as the writer of documentation, are still in charge of its content. **For prose style, see the [documentation styleguide](./styleguide.md).** +### Document structure + +Organize each chapter as guide sections first, then a single `## Reference` section. + +A well-structured chapter looks like this: + +````markdown +# Foo {#foo} + +`foo` builds Foo projects from a `foo.toml`. + +## Package a Foo application {#foo-packaging} + +:::{.example #ex-foo-packaging} + +# Package the hello app + +```nix +{ foo }: +buildFooPackage { + pname = "hello"; + version = "1.0"; +} +``` + +::: + +`buildFooPackage` needs `pname` and `version`. +Keep explanation short, and place it after the example. + +## Reference {#foo-reference} + +### `buildFooPackage` {#foo-buildFooPackage} + +Builds a Foo application from source. + +#### Inputs {#foo-buildFooPackage-inputs} + +`pname` (String) +: The program name. + +#### Examples {#foo-buildFooPackage-examples} + +See [](#ex-foo-packaging). +```` + +Examples live in one place: the guide owns them and the reference links to them. + +Guides introduce minimal working examples that are goal-oriented (typical usage). + +Reference may introduce additional examples that are unit-oriented. (minimal usage, edge-cases). +If the guide example is already sufficient, just link to it from the reference. + +Follow this structure strictly; to deviate, ping @NixOS/documentation-team. + + ### One sentence per line Put each sentence in its own line. @@ -284,7 +353,15 @@ Use the [admonition syntax](#admonitions) for callouts and examples. ### `callPackage`-compatible examples -Provide at least one example per function. +Provide at least one example per function, in its doc-comment. + +Keep each example at the level it documents: + +- A **reference example** might sometimes live in a doc-comment and show function call shape. +- A **guide example** lives in a guide section and shows a complete task that may compose several functions. + +When the task is nothing more than the call itself, the guide example is enough. +The reference example links to the guide example. Example code should be such that it can be passed to `pkgs.callPackage`. Instead of something like: diff --git a/doc/build-helpers.md b/doc/build-helpers.md index f11deafdc24d..8b38a79ceff4 100644 --- a/doc/build-helpers.md +++ b/doc/build-helpers.md @@ -25,6 +25,5 @@ build-helpers/dev-shell-tools.chapter.md build-helpers/special.md build-helpers/images.md hooks/index.md -languages-frameworks/index.md packages/index.md ``` diff --git a/doc/build-helpers/dev-shell-tools.chapter.md b/doc/build-helpers/dev-shell-tools.chapter.md index 2571380a3e06..9de64474d218 100644 --- a/doc/build-helpers/dev-shell-tools.chapter.md +++ b/doc/build-helpers/dev-shell-tools.chapter.md @@ -2,7 +2,7 @@ The `nix-shell` command has popularized the concept of transient shell environments for development or testing purposes. -- Create the first release note entry in this section! +- The {file}`nixexprs.tar.xz` tarball will be discontinued together with Nixpkgs + 27.05 after 2027-12-31. Migrate to the {file}`nixexprs.tar.zst` tarball + instead. + + This affects for example users who pull Nixpkgs as a flake input from + https://channels.nixos.org: + + ```diff + -nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz"; + +nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst"; + ``` ## Backward Incompatibilities {#sec-nixpkgs-release-26.11-incompatibilities} +- []{#x86_64-darwin-26.11} + + Support for `x86_64-darwin` has been dropped, due to Apple’s deprecation of the platform and limited build infrastructure and developer time. + We will no longer build packages for the platform or support building them from source. + + The Nixpkgs 26.05 stable branch will still maintain platform support and binaries will be built until it goes out of support at the end of 2026. + Users of `x86_64-darwin` will receive an error message explaining how to switch to 26.05. + + By the time of this release, Homebrew will offer only limited [Tier 3](https://docs.brew.sh/Support-Tiers#tier-3) support for the platform, but MacPorts will likely continue to support it for a long time. + We also recommend users consider installing NixOS, which should continue to run on essentially all Intel Macs, especially after Apple stops security support for macOS 26 in 2028. + +- `bundlerApp` now sets `__structuredAttrs = true` for its result package. + Out-of-tree packages passing `postBuild` to `bundlerApp` should examine if their `postBuild` commands are compatible with structured attributes. + - `databricks-cli` has been updated from `0.290.2` to `1.x.x`, the first major release. OAuth tokens for interactive logins (`auth_type = databricks-cli`) are now stored in the OS-native secure store by default (Secret Service on Linux) instead of `~/.databricks/token-cache.json`; cached tokens from older versions are not migrated, so run `databricks auth login` once per profile after upgrading. To keep the previous file-backed storage, set `DATABRICKS_AUTH_STORAGE=plaintext` or add `auth_storage = plaintext` under `[__settings__]` in `~/.databrickscfg`. Additionally, the `vector_search_endpoints` DABs resource renamed `min_qps` to `target_qps` (and the `vector-search-endpoints` command renamed `--min-qps` to `--target-qps`). See the [upstream changelog](https://github.com/databricks/cli/blob/main/CHANGELOG.md) for details. - `hurl` has been updated to `8.x.x` which has some breaking changes. See [upstream changelog](https://github.com/Orange-OpenSource/hurl/releases/tag/8.0.0) for details. + +- `gotosocial` has been updated to 0.22.0. This release contains a very long database migration, which should not be cancelled or interrupted under any circumstances. + - Postgres users: Following the migration, if you encounter slowdown on Postgres specifically (ie., timing out while loading timelines) you may need to run some manual database maintenance steps. Please check https://docs.gotosocial.org/en/stable/admin/database_maintenance/#postgres. + +- `xsecurelock` no longer supports authentication via htaccess files (`~/.xsecurelock.pw`) or via the `pamtester` program by default. Only the recommended PAM module is supported unless rebuilt with `withHtaccess` or `withPamtester`. + - `python3Packages.django-health-check` has been updated to major version 4. See its [migration guide](https://codingjoe.dev/django-health-check/migrate-to-v4/) and [changelog](https://github.com/codingjoe/django-health-check/releases/tag/4.0.0) for breaking changes. +- `jmtpfs` has been removed due to lack of maintenance and fuse3 support. + - `libgdata` has been removed, as it was archived upstream and relied on the insecure libsoup 2.4. +- `mcphost` has been removed, as it was archived upstream and declared unmaintained. + +- `fflogs` has been removed because it was no longer functional. Users should switch to `archon-lite`. + +- `services.mysql` now sets `root@localhost` authentication to `auth_socket` when used with `mysql` or `percona-server`. + Existing deployments will also be adjusted if possible. See the [security advisory GHSA-6qxx-6rg8-c4p8](https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8) for more information. + +- `zerofs` has been updated from `1.x` to `2.x` which is a breaking change. Volumes created by earlier releases are refused at open with a clear error. There is no migration tool; older volumes remain readable and writable by the release that created them. + +- `keycloak.plugins.keycloak-metrics-spi` has been removed. Keycloak exposes Prometheus metrics natively on its management interface; enable them with the `metrics-enabled` setting (and `event-metrics-user-enabled` for login and event counters). See [Gaining insights with metrics](https://www.keycloak.org/observability/configuration-metrics). + +- `alps` has been rewritten upstream, see [upstream repository](https://github.com/migadu/alps) for documentation. + - `uhttpmock` providing 0.0 ABI was removed. `uhttpmock_1_0` providing 1.0 ABI was renamed to `uhttpmock` and `uhttpmock_1_0` was kept as an alias. +- `nix-serve-ng` (and `haskellPackages.nix-serve-ng`) is now built against Lix instead of CppNix, following upstream which has switched to Lix as its supported Nix implementation. + - Linux kernel configuration has been moved out of the `linux-kernel` field of the platform structure into the kernel builders: - `linux-kernel.name` has been removed. - `linux-kernel.target` is available as the `target` parameter and passthru attribute on the kernel builders. @@ -34,12 +81,32 @@ `lib.systems.{examples,platforms}.{sheevaplug,pogoplug4}` have been unified into `lib.systems.examples.armv5tel-multiplatform`. Note that there is no official support for ARMv5 and it is not possible to build even a simple NixOS configuration out of the box. +- `pdns` has been updated from `5.0.x` to `5.1.x`. Please be sure to review the [Upgrade Notes](https://doc.powerdns.com/authoritative/upgrading.html#to-5-1-0) before upgrading. Namely LUA record updates are no longer allowed by default, and the embedded webserver no longer includes a `access-control-allow-origin: *` header by default. + - Support for the legacy U‐Boot image format has been removed from the Linux kernel builders, as it is deprecated upstream and no longer used by any platform in Nixpkgs. +- `etcd_3_4` package was dropped, as it's gone EOL. Please upgrade to either 3.5 or 3.6. See [migration notes](https://etcd.io/docs/v3.6/upgrades/upgrade_3_6/) for incompatibilities and upgrade procedure. + +- `rke2` retires ingress-nginx and transitions to Traefik starting in `rke2_1_36`. Because ingress-nginx was retired upstream as of March 2026, Traefik is now the default + for new clusters starting in v1.36 (existing clusters will keep their current ingress upon upgrade to avoid breakage). This transition brings the following structural changes: + - Airgapped Environments: The rke2-images-core tarball now contains Traefik images instead of ingress-nginx. The standalone rke2-images-traefik tarball has been removed. + Users who must continue using ingress-nginx will now need to manually provide the rke2-images-ingress-nginx tarball. + - Future Removal: The ingress-nginx chart will not receive any additional updates and will be completely removed in v1.37 for community users. + +- `buildFHSEnvChroot` has been removed after deprecation in 23.05. + +- `gh-actions-cache` has been removed since its functionality has been integrated directly into `gh` (`gh cache`). See [upstream readme](https://github.com/actions/gh-actions-cache). + - `requireFile` now sets `meta.license = lib.licenses.unfree` by default. Users of `requireFile`-based derivations that preserve this default will need to explicitly allow their evaluation as described in [](#sec-allow-unfree). +- `texlive.combine` is deprecated and scheduled for removal in 27.05. Please migrate to `texliveSmall.withPackages` (see [](#sec-language-texlive-user-guide)). + +- `keycloak` was updated to >= 26.7.0 and includes some breaking internal (API) changes. See the [upstream migration guide](https://www.keycloak.org/docs/latest/upgrading/#migrating-to-26-7-0) for more information. + - `librest` providing 0.7 ABI was removed. `librest_1_0` providing 1.0 ABI was renamed to `librest` and `librest_1_0` was kept as an alias. +- `pnpm_10` was upgraded to version 10.34.1+, which introduced stricter integrity checks. If you encounter `ERR_PNPM_MISSING_TARBALL_INTEGRITY`, you can fall back to the older `pnpm_10_34_0`. + - `fetchPnpmDeps`' `fetcherVersion = 1` and `fetcherVersion = 2` have been removed, as announced in the 26.05 release. Packages still using them now throw an evaluation error and must migrate to `fetcherVersion = 3` (or later) @@ -47,31 +114,52 @@ [pnpm `fetcherVersion` section](#javascript-pnpm-fetcherVersion) of the manual for details. +- `rebuilderd` has been updated to 0.27.0 introducing breaking changes. See upstream changelog for details: [0.26.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.26.0), [0.27.0](https://github.com/kpcyrd/rebuilderd/releases/tag/v0.27.0) + +- Starting with v14, `flameshot` will primarily utilise xdg-desktop-portal calls for screenshotting. This will directly affect users on X11 window managers due to the lack of a compatible portal with Screenshot feature. See [upstream changelog](https://github.com/flameshot-org/flameshot/releases/tag/v14.0.0) or [NixOS Flameshot](https://wiki.nixos.org/wiki/Flameshot) wiki page for workarounds. +- `nim1` and respective aliases have been removed due to entering EOL; please migrate to `nim` or `nim-unwrapped` (nim 2). +- `nim-2_0` & `nim-2_2` and respective aliases have been removed; please migrate to `nim` or `nim-unwrapped` (nim 2.2.10). +- `domoticz` has been updated from `2024.7` to `2026.x`, breaking third party applications and scripts using the old RType calls. Review the [release notes](https://github.com/domoticz/domoticz/blob/2026.2/History.txt#L398) for more information. + +- `vimacs` has been removed, as it has not been maintained in 10 years and was built for an old version of vim (6.0). + ## Other Notable Changes {#sec-nixpkgs-release-26.11-notable-changes} +- `super-productivity` has been updated. The binary has been renamed from `super-productivity` to `superproductivity`. A symlink from the old name is provided for backward compatibility. + - Package-URL (PURL, https://github.com/package-url/purl-spec) metadata identifier has been added for `fetchgit`, `fetchpypi` and `fetchFromGithub` fetchers. `mkDerivation` has been adjusted to reuse this information. Package-URLs allow reliably identifying and locating software packages. Maintainers of derivations using the adapted fetchers should rely on the `drv.src.meta.identifiers.v1.purl` default identifier and can enhance their `drv.meta.identifiers.v1.purls` list once they would like to have additional identifiers. Maintainers using `fetchurl` for `drv.src` are urged to adapt their `drv.meta.identifiers.purlParts` for proper identification. +- Emacs loads the `early-default` library after `early-init.el`. + Users can add `early-init.el` via `emacs.pkgs.withPackages` + by packaging `early-init.el` into a library named `early-default`. + To prevent loading the `early-default` library, + set `inhibit-early-default-init` in `early-init.el`. + +- `services.ceph` enabled the generation of Ceph log files at `/var/log/ceph/`. + They were missing before because Ceph omitted logs when this directory was missing. + Ceph logs can grow large, so you may want to configure rotation of these logs. + ## Nixpkgs Library {#sec-nixpkgs-release-26.11-lib} ### Breaking changes {#sec-nixpkgs-release-26.11-lib-breaking} -- Create the first release note entry in this section! - +- `fittrackee` 1.0.0 now requires postgres with postgis. The [upgrade guide](https://docs.fittrackee.org/en/upgrading-to-1.0.0.html) has steps to prepare for this upgrade. ### Deprecations {#sec-nixpkgs-release-26.11-lib-deprecations} -- Create the first release note entry in this section! +- Setting `config.allowBrokenPredicate` is deprecated in favor of + using `config.problems.handlers.PackageName.broken = "warn"` (or `= + "ignore"`). For more information see [](#sec-allow-broken). ### Additions and Improvements {#sec-nixpkgs-release-26.11-lib-additions-improvements} - Create the first release note entry in this section! - diff --git a/doc/stdenv/cross-compilation.chapter.md b/doc/stdenv/cross-compilation.chapter.md index 18f3b2344607..ea707ceba677 100644 --- a/doc/stdenv/cross-compilation.chapter.md +++ b/doc/stdenv/cross-compilation.chapter.md @@ -50,7 +50,7 @@ The exact schema these fields follow is a bit ill-defined due to a long and conv `system` -: This is a two-component shorthand for the platform. Examples of this would be "x86_64-darwin" and "i686-linux"; see `lib.systems.doubles` for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform (`[cpu]-[os]`). This format has built-in support in Nix, such as the `builtins.currentSystem` impure string. +: This is a two-component shorthand for the platform. Examples of this would be "aarch64-darwin" and "i686-linux"; see `lib.systems.doubles` for more. The first component corresponds to the CPU architecture of the platform and the second to the operating system of the platform (`[cpu]-[os]`). This format has built-in support in Nix, such as the `builtins.currentSystem` impure string. `config` diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index afcc6cf807c1..d470f69d033d 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -776,7 +776,7 @@ By default, the flag `--disable-dependency-tracking` is added to the configure f ##### `dontFixLibtool` {#var-stdenv-dontFixLibtool} -By default, the configure phase applies some special hackery to all files called `ltmain.sh` before running the configure script in order to improve the purity of Libtool-based packages [^footnote-stdenv-sys-lib-search-path] . If this is undesirable, set this variable to true. +By default, the configure phase applies some special hackery to all files called `ltmain.sh` before running the configure script to improve the purity of Libtool-based packages [^footnote-stdenv-sys-lib-search-path] . If this is undesirable, set this variable to true. ##### `dontDisableStatic` {#var-stdenv-dontDisableStatic} @@ -939,7 +939,7 @@ The fixup phase performs (Nix-specific) post-processing actions on the files ins - It moves the `man/`, `doc/` and `info/` subdirectories of `$out` to `share/`. - It strips libraries and executables of debug information. -- On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` in order to prevent unnecessary runtime dependencies. +- On Linux, it applies the `patchelf` command to ELF executables and libraries to remove unused directories from the `RPATH` to prevent unnecessary runtime dependencies. - It rewrites the interpreter paths of shell scripts to paths found in `PATH`. E.g., `/usr/bin/perl` will be rewritten to `/nix/store/some-perl/bin/perl` found in `PATH`. See [](#patch-shebangs.sh) for details. #### Variables controlling the fixup phase {#variables-controlling-the-fixup-phase} @@ -1345,7 +1345,7 @@ $ echo $configureFlags Nix itself considers a build-time dependency as merely something that should previously be built and accessible at build time—packages themselves are on their own to perform any additional setup. In most cases, that is fine, and the downstream derivation can deal with its own dependencies. But for a few common tasks, that would result in almost every package doing the same sort of setup work—depending not on the package itself, but entirely on which dependencies were used. -In order to alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. +To alleviate this burden, the setup hook mechanism was written, where any package can include a shell script that \[by convention rather than enforcement by Nix\], any downstream reverse-dependency will source as part of its build process. That allows the downstream dependency to merely specify its dependencies, and lets those dependencies effectively initialize themselves. No boilerplate mirroring the list of dependencies is needed. The setup hook mechanism is a bit of a sledgehammer though: a powerful feature with a broad and indiscriminate area of effect. The combination of its power and implicit use may be expedient, but isn’t without costs. Nix itself is unchanged, but the spirit of added dependencies being effect-free is violated even if the latter isn’t. For example, if a derivation path is mentioned more than once, Nix itself doesn’t care and makes sure the dependency derivation is already built just the same—depending is just needing something to exist, and needing is idempotent. However, a dependency specified twice will have its setup hook run twice, and that could easily change the build environment (though a well-written setup hook will therefore strive to be idempotent so this is in fact not observable). More broadly, setup hooks are anti-modular in that multiple dependencies, whether the same or different, should not interfere and yet their setup hooks may well do so. diff --git a/doc/style.css b/doc/style.css index 96b6979474db..5ca664ed61f7 100644 --- a/doc/style.css +++ b/doc/style.css @@ -23,21 +23,17 @@ body { @media screen and (min-width: 992px) { .book, .appendix { - max-width: 60rem; + max-width: 55rem; } } @media screen and (min-width: 1200px) { .book, .appendix { - max-width: 73rem; + max-width: 55rem; } } -.book .list-of-examples { - display: none; -} - h1 { font-size: 2em; margin: 0.67em 0; @@ -118,7 +114,7 @@ html { body { font-size: 1rem; font-family: "Roboto", sans-serif; - font-weight: 300; + font-weight: 400; color: var(--main-text-color); background-color: var(--background); min-height: 100vh; @@ -131,11 +127,36 @@ body { padding-left: 1rem; padding-right: 1rem; } + + /* + See: https://developer.mozilla.org/en-US/docs/Web/API/Popover_API + + - :popover-open pseudo-class matches a popover element when it is in the showing state + - ::backdrop full-screen element placed directly behind popover + */ + nav.toc-sidebar:popover-open { + position: fixed; + inset: 0 auto 0 0; + width: min(20rem, 85vw); + height: 100dvh; + max-height: none; + margin: 0; + padding: 1rem; + overflow-y: auto; + overscroll-behavior: contain; + background: var(--background); + border: 0; + border-right: 0.0625rem solid #d8d8d8; + box-shadow: 0 0 1.5rem rgb(0 0 0 / 0.35); + } + + nav.toc-sidebar::backdrop { + background: rgb(0 0 0 / 0.5); + } } a { - text-decoration: none; - border-bottom: 1px solid; + text-decoration: underline; color: var(--link-color); } @@ -162,63 +183,52 @@ hr { margin-bottom: 1rem; } -h1 { +h1, +h2, +h3, +h4, +h5, +h6 { font-weight: 800; - line-height: 110%; - font-size: 200%; - margin-bottom: 1rem; + line-height: 1.1; + margin: 1.5rem 0 0.5rem; +} + +/* + Major-second scale see: https://typescale.com/ + rounded to .025rem (0.4px) +*/ +h1 { + font-size: 2rem; color: var(--heading-color); } h2 { - font-weight: 800; - line-height: 110%; - font-size: 170%; - margin-bottom: 0.625rem; + font-size: 1.8rem; color: var(--heading-color); } -h2:not(:first-child) { - margin-top: 1rem; -} - h3 { - font-weight: 800; - line-height: 110%; - margin-bottom: 1rem; - font-size: 150%; + font-size: 1.6rem; color: var(--heading-color); } -.note h3, -.tip h3, -.warning h3, -.caution h3, -.important h3 { - font-size: 120%; -} - h4 { - font-weight: 800; - line-height: 110%; - margin-bottom: 1rem; - font-size: 140%; + font-size: 1.425rem; color: var(--heading-color); } h5 { - font-weight: 800; - line-height: 110%; - margin-bottom: 1rem; - font-size: 130%; + font-size: 1.275rem; color: var(--small-heading-color); } h6 { - font-weight: 800; - line-height: 110%; - margin-bottom: 1rem; - font-size: 120%; + font-size: 1.125rem; +} + +:is(.note, .tip, .warning, .caution, .important) h3 { + font-size: 1.425rem; } strong { @@ -246,13 +256,9 @@ code { } code { - color: #ff8657; - background: #f4f4f4; - display: inline-block; - padding: 0 0.5rem; - border: 1px solid #d8d8d8; - border-radius: 0.5rem; - line-height: 1.57777778; + padding: 0.2em 0.4em; + background: var(--inline-code-background); + border-radius: 0.375rem; } div.book .programlisting, @@ -264,16 +270,7 @@ div.appendix .programlisting { color: var(--codeblock-text-color); } -div.book .note, -div.book .tip, -div.book .warning, -div.book .caution, -div.book .important, -div.appendix .note, -div.appendix .tip, -div.appendix .warning, -div.appendix .caution, -div.appendix .important { +:is(.note, .tip, .warning, .caution, .important) { margin-bottom: 1rem; border-radius: 0.5rem; padding: 1.5rem; @@ -281,69 +278,44 @@ div.appendix .important { background: #f4f4f4; } -div.book .note > .title, -div.book .tip > .title, -div.book .warning > .title, -div.book .caution > .title, -div.book .important > .title, -div.appendix .note > .title, -div.appendix .tip > .title, -div.appendix .warning > .title, -div.appendix .caution > .title, -div.appendix .important > .title { +:is(.note, .tip, .warning, .caution, .important) > .title { font-weight: 800; line-height: 110%; color: inherit; margin-bottom: 0; } -div.book .note > :first-child, -div.book .tip > :first-child, -div.book .warning > :first-child, -div.book .caution > :first-child, -div.book .important > :first-child, -div.appendix .note > :first-child, -div.appendix .tip > :first-child, -div.appendix .warning > :first-child, -div.appendix .caution > :first-child, -div.appendix .important > :first-child { +:is(.note, .tip, .warning, .caution, .important) > :first-child { margin-top: 0; } -div.book .note > :last-child, -div.book .tip > :last-child, -div.book .warning > :last-child, -div.book .caution > :last-child, -div.book .important > :last-child, -div.appendix .note > :last-child, -div.appendix .tip > :last-child, -div.appendix .warning > :last-child, -div.appendix .caution > :last-child, -div.appendix .important > :last-child { +:is(.note, .tip, .warning, .caution, .important) > :last-child { margin-bottom: 0; } -div.book .note, -div.book .tip, -div.book .important, -div.appendix .note, -div.appendix .tip, -div.appendix .important { +.note { color: var(--note-text-color); background: var(--note-background); } -div.book .warning, -div.book .caution, -div.appendix .warning, -div.appendix .caution { - color: var(--warning-text-color); - background-color: var(--warning-background); +.tip { + color: var(--tip-text-color); + background: var(--tip-background); } -div.book .section, -div.appendix .section { - margin-top: 2em; +.important { + color: var(--important-text-color); + background: var(--important-background); +} + +.warning { + color: var(--warning-text-color); + background: var(--warning-background); +} + +.caution { + color: var(--caution-text-color); + background: var(--caution-background); } div.book div.example, @@ -387,39 +359,13 @@ div.appendix dt { margin-top: 1em; } -div.book .toc dt, -div.appendix .toc dt { - margin-top: 0; -} - -div.book .list-of-examples dt, -div.appendix .list-of-examples dt { - margin-top: 0; -} - div.book code, div.appendix code { - padding: 0; - border: 0; - background-color: inherit; - color: inherit; - font-size: 100%; -webkit-hyphens: none; -moz-hyphens: none; hyphens: none; } -div.book div.toc, -div.appendix div.toc { - margin-bottom: 3em; - border-bottom: 0.0625rem solid #d8d8d8; -} - -div.book div.toc dd, -div.appendix div.toc dd { - margin-left: 2em; -} - div.book span.command, div.appendix span.command { font-family: monospace; @@ -450,17 +396,31 @@ div.appendix .variablelist .term { } :root { + --sidebar-width: 20rem; + --header-height: 3rem; --background: #fff; --main-text-color: #000; --link-color: #405d99; --heading-color: #6586c8; --small-heading-color: #6a6a6a; - --note-text-color: #5277c3; - --note-background: #f2f8fd; - --warning-text-color: #cc3900; - --warning-background: #fff5e1; + /* NOTE */ + --note-text-color: #0065d2; + --note-background: #e4f5ff; + /* TIP */ + --tip-text-color: #188000; + --tip-background: #e8fae3; + /* IMPORTANT */ + --important-text-color: #8a3db8; + --important-background: #fbedff; + /* WARNING */ + --warning-text-color: #aa4a00; + --warning-background: #fff0db; + /* CAUTION */ + --caution-text-color: #be222a; + --caution-background: #ffebe8; --codeblock-background: #f2f8fd; --codeblock-text-color: #000; + --inline-code-background: #818b981f; } @media (prefers-color-scheme: dark) { @@ -469,20 +429,27 @@ div.appendix .variablelist .term { --main-text-color: #fff; --link-color: #6586c8; --small-heading-color: #fff; - --note-background: none; - --warning-background: none; + /* NOTE */ + --note-text-color: #66c6ff; + --note-background: #1e2f44; + /* TIP */ + --tip-text-color: #80e05f; + --tip-background: #22331d; + /* IMPORTANT */ + --important-text-color: #ea9dff; + --important-background: #35273f; + /* WARNING */ + --warning-text-color: #ffaa00; + --warning-background: #3c2a13; + /* CAUTION */ + --caution-text-color: #ff8c84; + --caution-background: #422522; --codeblock-background: #393939; --codeblock-text-color: #fff; + --inline-code-background: #656c7633; } - div.book .note, - div.book .tip, - div.appendix .note, - div.appendix .tip, - div.book .warning, - div.book .caution, - div.appendix .warning, - div.appendix .caution { + :is(.note, .tip, .warning, .caution, .important) { border: 2px solid; font-weight: 400; } @@ -490,9 +457,241 @@ div.appendix .variablelist .term { @font-face { font-family: Roboto; - src: url(Roboto.ttf); + src: + url(Roboto.ttf) format("truetype") tech(variations), + url(Roboto.ttf) format("truetype-variations"); + font-weight: 100 900; + font-style: normal; + font-display: swap; } .chapter { content-visibility: auto; } + +.navheader { + position: sticky; + top: 0; + z-index: 1; + background-color: var(--background); +} + +nav.toc-sidebar { + height: 100%; + padding: 0 1rem 2rem; + background-color: var(--background); + color: var(--main-text-color); +} + +/* menu button, shown on mobile, hidden on desktop */ +.toc-toggle { + display: inline-flex; + align-items: center; + margin: 0.75rem 0 0; + padding: 0.4rem 0.8rem; + border: 0.0625rem solid #d8d8d8; + border-radius: 0.25rem; + background: var(--background); + color: var(--main-text-color); + font: inherit; + cursor: pointer; + position: fixed; + top: 0.5rem; + left: 0.8rem; + z-index: 2; +} + +nav.toc-sidebar .toc { + margin-bottom: 0; +} + +nav.toc-sidebar ol.toc, +nav.toc-sidebar ol.toc ol { + list-style: none; + margin: 0; + padding-left: 0; +} + +nav.toc-sidebar ol.toc ol { + padding-left: 1em; +} + +nav.toc-sidebar li { + margin: 0; +} + +nav.toc-sidebar summary { + cursor: pointer; + display: flex; + align-items: center; + list-style: none; +} + +nav.toc-sidebar summary::before { + content: "▸"; + flex: none; + font-size: 0.75em; +} +nav.toc-sidebar details[open] > summary::before { + content: "▾"; +} + +nav.toc-sidebar a { + display: block; + width: 100%; + padding: 3px 8px; + border-left: 3px solid transparent; + border-radius: 3px; + color: inherit; + transition: + background-color 120ms ease, + border-color 120ms ease; +} +nav.toc-sidebar a:hover { + background-color: #f2f2f2 !important; +} + +nav.toc-sidebar a.active { + background-color: #d8d8d8; + border-left-color: #444; + font-weight: 600; +} +nav.toc-sidebar a.active-trail { + border-left-color: #bbb; + background-color: #e8e8e8; +} + +@media (prefers-color-scheme: dark) { + nav.toc-sidebar a:hover { + /* hover should win over scroll selectors despite beeing less specific */ + background-color: #606060 !important; + } + nav.toc-sidebar a.active { + background-color: #373737; + border-left-color: #eee; + font-weight: 600; + } + nav.toc-sidebar a.active-trail { + border-left-color: #eee; + background-color: #323232; + } +} + +@media screen and (min-width: 768px) { + body { + height: 100vh; + min-height: 0; + display: grid; + grid-template-columns: minmax(0, 1fr); + grid-template-rows: var(--header-height) auto minmax(0, 1fr); + } + + body:has(> nav.toc-sidebar) { + grid-template-columns: var(--sidebar-width) minmax(0, 1fr); + } + + .navheader { + grid-column: 1 / -1; + grid-row: 2; + } + + nav.toc-sidebar { + /* un-pop the drawer */ + display: block; + position: static; + inset: auto; + /* */ + margin: 0; + grid-column: 1; + grid-row: 3; + max-height: none; + overflow-y: auto; + border: none; + } + + /* Hide the toggle button on desktop */ + .toc-toggle { + display: none; + } + + main.content { + grid-column: 1 / -1; + grid-row: 3; + overflow-y: auto; + padding: 0 1rem; + } + + body:has(> nav.toc-sidebar) main.content { + grid-column: 2; + } +} + +.manual-header { + background-color: var(--background); + border-bottom: 0.0625rem solid #d8d8d8; + display: flex; + flex-direction: column; +} + +.manual-header--title { + order: -1; + padding: 0.5rem 1rem 0; + font-size: 0.875rem; + font-weight: 500; + color: var(--small-heading-color); + text-align: center; +} + +.manual-header--tabs { + display: flex; + align-items: stretch; + justify-content: space-around; + margin: 0; + padding: 0; +} + +.manual-header--tab { + display: flex; + align-items: center; + padding: 0 1rem; + font-size: 0.875rem; + font-weight: 500; + color: var(--main-text-color); + text-decoration: none; + border-bottom: 0.1875rem solid transparent; + border-top: 0.1875rem solid transparent; + transition: border-bottom-color 0.15s ease; +} + +.manual-header--tab:hover { + border-bottom-color: var(--heading-color); + color: var(--main-text-color); +} + +.manual-header--tab-active { + border-bottom-color: var(--heading-color); + color: var(--heading-color); + font-weight: 700; +} + +@media screen and (min-width: 768px) { + .manual-header { + height: var(--header-height); + flex-direction: row; + align-items: stretch; + grid-column: 1 / -1; + grid-row: 1; + } + + .manual-header--title { + order: 0; + margin-left: auto; + padding: 0 1rem; + align-self: center; + } + + .manual-header--tabs { + justify-content: flex-start; + padding: 0 1rem; + } +} diff --git a/doc/using-nixpkgs.md b/doc/using-nixpkgs.md index f850b2e83c28..a8546d0cc0f1 100644 --- a/doc/using-nixpkgs.md +++ b/doc/using-nixpkgs.md @@ -1,6 +1,7 @@ # Using Nixpkgs {#part-using} ```{=include=} chapters +channels.chapter.md using/platform-support.chapter.md using/configuration.chapter.md using/overlays.chapter.md diff --git a/doc/using/platform-support.chapter.md b/doc/using/platform-support.chapter.md index d5a985c90d35..4422694e6288 100644 --- a/doc/using/platform-support.chapter.md +++ b/doc/using/platform-support.chapter.md @@ -1,16 +1,16 @@ # Platform Support {#chap-platform-support} -Packages receive varying degrees of support, both in terms of maintainer attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is. +Packages receive varying degrees of support, both in terms of maintainer and security team attention and available computation resources for continuous integration (CI). We have 7 defined tiers denoting how well supported each platform is. ## Tiers {#sec-platform-tiers} ### Tier 1 {#sec-platform-tier1} -[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, platform-specific patches are freely applied, and most packages are expected to work. +[Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) platforms receive the highest level of support where problems can block updates, security fixes are treated with urgency, platform-specific patches are freely applied, and most packages are expected to work. ### Tier 2 {#sec-platform-tier2} -[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support. +[Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) platforms are expected to remain functional and secure with updates, receive platform-specific patches as needed, and have many packages built by Hydra with full ofBorg support. ### Tier 3 {#sec-platform-tier3} @@ -22,28 +22,25 @@ Platform Tiers [4 through 7](https://github.com/NixOS/rfcs/blob/master/rfcs/0046 ## Breakdown {#sec-platform-breakdown} -| Triple | Support Tier | Channel Blockers | Hydra Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support | -| ------------------------------------- | ------------ | ---------------- | ------------- | -------------- | ------------------ | ----------------------- | -| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ | -| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | -| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* | -| `x86_64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ❌\* | -| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ✔️ | ✔️ | -| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ✔️ | -| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | -| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ✔️ | ✔️ | - -\* - Cross compiling is only supported on Darwin hosts. +| Triple | Support Tier | Channel Blockers | Hydra Support | Security Support | Ofborg Support | Bootstrap Tarballs | Cross Compiling Support | +|---------------------------------------|------------------------------------------------------------------------------------------------|------------------|---------------|------------------|----------------|--------------------|-------------------------| +| `x86_64-unknown-linux-gnu` | [Tier 1](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-1) | Many | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `aarch64-unknown-linux-gnu` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | ✔️ | +| `x86_64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `aarch64-unknown-linux-musl` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `x86_64-unknown-unknown-freebsd` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `arm64-apple-darwin` | [Tier 2](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-2) | Some | ✔️ | ✔️ | ✔️ | ✔️ | ❌ | +| `i686-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | Limited | ❌ | ❌ | ✔️ | ✔️ | +| `riscv32-unknown-linux-gnu` | [Tier 4](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-4) | None | ❌ | ❌ | ❌ | ❌ | ✔️ | +| `riscv64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `loongarch64-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv6l-unknown-linux-musleabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv7l-unknown-linux-gnueabihf` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `armv5tel-unknown-linux-gnueabi` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabi64` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mips64el-unknown-linux-gnuabin32` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `mipsel-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64-unknown-linux-gnuabielfv2` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `powerpc64le-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | +| `s390x-unknown-linux-gnu` | [Tier 3](https://github.com/NixOS/rfcs/blob/master/rfcs/0046-platform-support-tiers.md#tier-3) | None | ❌ | ❌ | ❌ | ✔️ | ✔️ | diff --git a/flake.nix b/flake.nix index b8e348845bc8..6c3321e8c7fe 100644 --- a/flake.nix +++ b/flake.nix @@ -220,17 +220,25 @@ evaluation. Evaluating the attribute value tends to require a significant amount of computation, even considering lazy evaluation. */ - legacyPackages = forAllSystems ( - system: - (import ./. { - inherit system; - overlays = import ./pkgs/top-level/impure-overlays.nix ++ [ - (final: prev: { - lib = prev.lib.extend libVersionInfoOverlay; - }) - ]; - }) - ); + legacyPackages = + let + # We include `x86_64-darwin` here to ensure that users get a + # good error message for the 26.11 deprecation of the platform, + # while excluding it from `lib.systems.flakeExposed` so that we + # don’t break `nix flake check` for downstream users. + forAllSystems' = lib.genAttrs (lib.systems.flakeExposed ++ [ "x86_64-darwin" ]); + in + forAllSystems' ( + system: + (import ./. { + inherit system; + overlays = import ./pkgs/top-level/impure-overlays.nix ++ [ + (final: prev: { + lib = prev.lib.extend libVersionInfoOverlay; + }) + ]; + }) + ); /** Optional modules that can be imported into a NixOS configuration. diff --git a/lib/attrsets.nix b/lib/attrsets.nix index 7dae595c9e39..d006ed79a2ae 100644 --- a/lib/attrsets.nix +++ b/lib/attrsets.nix @@ -5,7 +5,6 @@ let inherit (builtins) head length; - inherit (lib.trivial) mergeAttrs; inherit (lib.strings) concatStringsSep concatMapStringsSep @@ -13,16 +12,18 @@ let sanitizeDerivationName ; inherit (lib.lists) - filter - foldr - foldl' + all + concatLists concatMap elemAt - all - partition - groupBy - take + filter foldl + foldl' + foldr + groupBy + partition + reverseList + take ; in @@ -370,7 +371,11 @@ rec { ::: */ - concatMapAttrs = f: v: foldl' mergeAttrs { } (attrValues (mapAttrs f v)); + concatMapAttrs = + f: v: + listToAttrs ( + concatLists (reverseList (mapAttrsToList (name: value: attrsToList (f name value)) v)) + ); /** Update or set specific paths of an attribute set. @@ -1135,7 +1140,7 @@ rec { For a function that gives you control over what counts as a leaf, see `mapAttrsRecursiveCond`. - :::{#map-attrs-recursive-example .example} + ::: {.example #map-attrs-recursive-example} # Map over leaf attributes ```nix @@ -1160,7 +1165,7 @@ rec { If the predicate returns false, `mapAttrsRecursiveCond` does not recurse, but instead applies the mapping function. If the predicate returns true, it does recurse, and does not apply the mapping function. - :::{#map-attrs-recursive-cond-example .example} + ::: {.example #map-attrs-recursive-cond-example} # Map over an leaf attributes defined by a condition Map derivations to their `name` attribute. @@ -1800,22 +1805,28 @@ rec { ::: */ matchAttrs = - pattern: attrs: + let + recurse = + pattern: attrs: + all ( + # Compare equality between `pattern` & `attrs`. + attr: + # Missing attr, not equal. + attrs ? ${attr} + && ( + let + lhs = pattern.${attr}; + rhs = attrs.${attr}; + in + # Simple equality check is primarily for non-attrsets, but we run it + # on attrsets too, since it may let us avoid recursing + lhs == rhs || isAttrs lhs && isAttrs rhs && recurse lhs rhs + ) + ) (attrNames pattern); + in + pattern: assert isAttrs pattern; - all ( - # Compare equality between `pattern` & `attrs`. - attr: - # Missing attr, not equal. - attrs ? ${attr} - && ( - let - lhs = pattern.${attr}; - rhs = attrs.${attr}; - in - # If attrset check recursively - if isAttrs lhs then isAttrs rhs && matchAttrs lhs rhs else lhs == rhs - ) - ) (attrNames pattern); + recurse pattern; /** Override only the attributes that are already present in the old set diff --git a/lib/cli.nix b/lib/cli.nix index 37f9e270a313..fe2a03a7beef 100644 --- a/lib/cli.nix +++ b/lib/cli.nix @@ -1,6 +1,22 @@ { lib }: -{ +let + inherit (lib) + concatLists + concatMap + escapeShellArgs + isBool + isList + mapAttrsToList + oldestSupportedReleaseIsAtLeast + optional + stringLength + warnIf + ; + inherit (lib.generators) mkValueStringDefault; + mkValueString = mkValueStringDefault { }; +in +rec { /** Automatically convert an attribute set to command-line options. @@ -40,9 +56,9 @@ ::: */ toGNUCommandLineShell = - lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) + warnIf (oldestSupportedReleaseIsAtLeast 2511) "lib.cli.toGNUCommandLineShell is deprecated, please use lib.cli.toCommandLineShell or lib.cli.toCommandLineShellGNU instead." - (options: attrs: lib.escapeShellArgs (lib.cli.toGNUCommandLine options attrs)); + (options: attrs: escapeShellArgs (toGNUCommandLine options attrs)); /** Automatically convert an attribute set to a list of command-line options. @@ -116,15 +132,15 @@ ::: */ toGNUCommandLine = - lib.warnIf (lib.oldestSupportedReleaseIsAtLeast 2511) + warnIf (oldestSupportedReleaseIsAtLeast 2511) "lib.cli.toGNUCommandLine is deprecated, please use lib.cli.toCommandLine or lib.cli.toCommandLineShellGNU instead." ( { - mkOptionName ? k: if builtins.stringLength k == 1 then "-${k}" else "--${k}", + mkOptionName ? k: if stringLength k == 1 then "-${k}" else "--${k}", - mkBool ? k: v: lib.optional v (mkOptionName k), + mkBool ? k: v: optional v (mkOptionName k), - mkList ? k: v: lib.concatMap (mkOption k) v, + mkList ? k: concatMap (mkOption k), mkOption ? k: v: @@ -133,26 +149,24 @@ else if optionValueSeparator == null then [ (mkOptionName k) - (lib.generators.mkValueStringDefault { } v) + (mkValueString v) ] else - [ "${mkOptionName k}${optionValueSeparator}${lib.generators.mkValueStringDefault { } v}" ], + [ "${mkOptionName k}${optionValueSeparator}${mkValueString v}" ], optionValueSeparator ? null, }: - options: let render = k: v: - if builtins.isBool v then + if isBool v then mkBool k v - else if builtins.isList v then + else if isList v then mkList k v else mkOption k v; - in - builtins.concatLists (lib.mapAttrsToList render options) + options: concatLists (mapAttrsToList render options) ); /** @@ -163,8 +177,7 @@ For further reference see: [`lib.cli.toCommandLineGNU`](#function-library-lib.cli.toCommandLineGNU) */ - toCommandLineShellGNU = - options: attrs: lib.escapeShellArgs (lib.cli.toCommandLineGNU options attrs); + toCommandLineShellGNU = options: attrs: escapeShellArgs (toCommandLineGNU options attrs); /** Converts an attribute set into a list of GNU-style command-line arguments. @@ -227,9 +240,9 @@ */ toCommandLineGNU = { - isLong ? optionName: builtins.stringLength optionName > 1, + isLong ? optionName: stringLength optionName > 1, explicitBool ? false, - formatArg ? lib.generators.mkValueStringDefault { }, + formatArg ? mkValueString, }: let optionFormat = optionName: { @@ -238,7 +251,7 @@ inherit explicitBool formatArg; }; in - lib.cli.toCommandLine optionFormat; + toCommandLine optionFormat; /** Converts the given attributes into a single shell-escaped command-line @@ -248,8 +261,7 @@ For further reference see: [`lib.cli.toCommandLine`](#function-library-lib.cli.toCommandLine) */ - toCommandLineShell = - optionFormat: attrs: lib.escapeShellArgs (lib.cli.toCommandLine optionFormat attrs); + toCommandLineShell = optionFormat: attrs: escapeShellArgs (toCommandLine optionFormat attrs); /** Converts an attribute set into a list of command-line arguments. @@ -421,14 +433,14 @@ - `lib.cli.toCommandLineShellGNU` */ toCommandLine = - optionFormat: attrs: + optionFormat: let handlePair = k: v: if k == "" then - lib.throw "lib.cli.toCommandLine only accepts non-empty option names." - else if builtins.isList v then - builtins.concatMap (handleOption k) v + throw "lib.cli.toCommandLine only accepts non-empty option names." + else if isList v then + concatMap (handleOption k) v else handleOption k v; @@ -439,7 +451,7 @@ option, sep, explicitBool, - formatArg ? lib.generators.mkValueStringDefault { }, + formatArg ? mkValueString, }: k: v: if v == null || (!explicitBool && v == false) then @@ -458,5 +470,5 @@ arg ]; in - builtins.concatLists (lib.mapAttrsToList handlePair attrs); + attrs: concatLists (mapAttrsToList handlePair attrs); } diff --git a/lib/customisation.nix b/lib/customisation.nix index 9bb7e01d8f13..883f99928a49 100644 --- a/lib/customisation.nix +++ b/lib/customisation.nix @@ -564,7 +564,7 @@ rec { # Examples - :::{#ex-makeScope .example} + :::{.example #ex-makeScope} # Create an interdependent package set on top of `pkgs` The functions in `foo.nix` and `bar.nix` can depend on each other, in the sense that `foo.nix` can contain a function that expects `bar` as an attribute in its argument. @@ -593,7 +593,7 @@ rec { ``` ::: - :::{#ex-makeScope-callPackage .example} + :::{.example #ex-makeScope-callPackage} # Using `callPackage` from a scope ```nix diff --git a/lib/derivations.nix b/lib/derivations.nix index 053625a2be0e..15c3495163a8 100644 --- a/lib/derivations.nix +++ b/lib/derivations.nix @@ -6,7 +6,6 @@ let isString mapAttrs removeAttrs - throwIfNot ; showMaybeAttrPosPre = @@ -108,18 +107,18 @@ in # attrset spine returned by lazyDerivation does not depend on it. # Instead, the individual derivation attributes do depend on it. checked = - throwIfNot (derivation.type or null == "derivation") "lazyDerivation: input must be a derivation." - throwIfNot - # NOTE: Technically we could require our outputs to be a subset of the - # actual ones, or even leave them unchecked and fail on a lazy basis. - # However, consider the case where an output is added in the underlying - # derivation, such as dev. lazyDerivation would remove it and cause it - # to fail as a buildInputs item, without any indication as to what - # happened. Hence the more stringent condition. We could consider - # adding a flag to control this behavior if there's a valid case for it, - # but the documentation must have a note like this. - (derivation.outputs == outputs) - '' + if derivation.type or null != "derivation" then + throw "lazyDerivation: input must be a derivation." + # NOTE: Technically we could require our outputs to be a subset of the + # actual ones, or even leave them unchecked and fail on a lazy basis. + # However, consider the case where an output is added in the underlying + # derivation, such as dev. lazyDerivation would remove it and cause it + # to fail as a buildInputs item, without any indication as to what + # happened. Hence the more stringent condition. We could consider + # adding a flag to control this behavior if there's a valid case for it, + # but the documentation must have a note like this. + else if derivation.outputs != outputs then + throw '' lib.lazyDerivation: The derivation ${derivation.name or ""} has outputs that don't match the assumed outputs. Assumed outputs passed to lazyDerivation${showMaybeAttrPosPre ",\n at " "outputs" args}: @@ -142,6 +141,7 @@ in If none of the above works for you, replace the lib.lazyDerivation call by the expression in the derivation argument. '' + else derivation; in { diff --git a/lib/fetchers.nix b/lib/fetchers.nix index 0f4192cc6822..24f257a1f883 100644 --- a/lib/fetchers.nix +++ b/lib/fetchers.nix @@ -22,7 +22,6 @@ let concatMapStringsSep head length - throwIf ; inherit (lib.attrsets) attrsToList @@ -130,7 +129,7 @@ rec { hashesAsNVPairs = attrsToList (intersectAttrs hashSet args); in if hashesAsNVPairs == [ ] then - throwIf required "fetcher called without `hash`" null + if required then throw "fetcher called without `hash`" else null else if length hashesAsNVPairs != 1 then throw "fetcher called with mutually-incompatible arguments: ${ concatMapStringsSep ", " (a: a.name) hashesAsNVPairs diff --git a/lib/generators.nix b/lib/generators.nix index 0e15a56db312..d20abb6264ab 100644 --- a/lib/generators.nix +++ b/lib/generators.nix @@ -24,7 +24,6 @@ let inherit (lib) addErrorContext any - assertMsg attrNames attrValues concatLists @@ -64,7 +63,6 @@ let reverseList splitString tail - toList ; inherit (lib.strings) @@ -849,7 +847,7 @@ rec { _type == "lua-inline"; generatedBindings = - assert assertMsg (badVarNames == [ ]) "Bad Lua var names: ${toPretty { } badVarNames}"; + assert badVarNames == [ ] || throw "Bad Lua var names: ${toPretty { } badVarNames}"; concatStrings (mapAttrsToList (key: value: "${indent}${key} = ${toLua innerArgs value}\n") v); # https://en.wikibooks.org/wiki/Lua_Programming/variable#Variable_names diff --git a/lib/gvariant.nix b/lib/gvariant.nix index f64808347ee8..d47d5120ef9a 100644 --- a/lib/gvariant.nix +++ b/lib/gvariant.nix @@ -191,10 +191,15 @@ rec { mkArray = elems: let - vs = map mkValue (lib.throwIf (elems == [ ]) "Please create empty array with mkEmptyArray." elems); - elemType = lib.throwIfNot (lib.all (t: (head vs).type == t) ( - map (v: v.type) vs - )) "Elements in a list should have same type." (head vs).type; + vs = map mkValue ( + if elems == [ ] then throw "Please create empty array with mkEmptyArray." else elems + ); + firstType = (head vs).type; + elemType = + if lib.any (v: v.type != firstType) vs then + throw "Elements in a list should have same type." + else + firstType; in mkPrimitive (type.arrayOf elemType) vs // { diff --git a/lib/licenses/licenses.nix b/lib/licenses/licenses.nix index 282b41b6f3b4..01f530fa8044 100644 --- a/lib/licenses/licenses.nix +++ b/lib/licenses/licenses.nix @@ -310,6 +310,11 @@ lib.mapAttrs mkLicense ( redistributable = true; }; + buddy = { + spdxId = "Buddy"; + fullName = "Buddy License"; + }; + bzip2 = { spdxId = "bzip2-1.0.6"; fullName = "bzip2 and libbzip2 License v1.0.6"; @@ -382,6 +387,13 @@ lib.mapAttrs mkLicense ( free = false; }; + cc-by-nc-30-igo = { + # Currently does not have a spdxID will get one in the future https://github.com/spdx/license-list-XML/issues/2845 + # spdxId = "CC-BY-NC-3.0-IGO"; + fullName = "Creative Commons Attribution Non Commercial 3.0 IGO"; + free = false; + }; + cc-by-nc-40 = { spdxId = "CC-BY-NC-4.0"; fullName = "Creative Commons Attribution Non Commercial 4.0 International"; @@ -926,6 +938,11 @@ lib.mapAttrs mkLicense ( free = false; }; + jpl-image = { + fullName = "JPL Image Use Policy"; + spdxId = "JPL-image"; + }; + knuth = { fullName = "Knuth CTAN License"; spdxId = "Knuth-CTAN"; @@ -1052,6 +1069,11 @@ lib.mapAttrs mkLicense ( fullName = "MIT License"; }; + mit-click = { + spdxId = "MIT-Click"; + fullName = "MIT Click License"; + }; + mit-cmu = { spdxId = "MIT-CMU"; fullName = "CMU License"; @@ -1168,6 +1190,11 @@ lib.mapAttrs mkLicense ( fullName = "Nethack General Public License"; }; + ngrep = { + spdxId = "ngrep"; + fullName = "ngrep License"; + }; + nistSoftware = { spdxId = "NIST-Software"; fullName = "NIST Software License"; @@ -1323,6 +1350,17 @@ lib.mapAttrs mkLicense ( fullName = "Qwt exception 1.0"; }; + reticulum = { + # The Reticulum License restricts certain fields of use, notably systems + # intended to harm human beings and AI/ML training datasets. Such usage + # restrictions are incompatible with the Open Source Definition + # (https://opensource.org/osd), in particular "No Discrimination Against + # Fields of Endeavor". + free = false; + fullName = "Reticulum License"; + url = "https://reticulum.network/license"; + }; + ruby = { spdxId = "Ruby"; fullName = "Ruby License"; @@ -1590,6 +1628,11 @@ lib.mapAttrs mkLicense ( url = "https://fedoraproject.org/wiki/Licensing:Wadalab?rd=Licensing/Wadalab"; }; + wordnet = { + spdxId = "WordNet"; + fullName = "WordNet License"; + }; + wtfpl = { spdxId = "WTFPL"; fullName = "Do What The F*ck You Want To Public License"; diff --git a/lib/lists.nix b/lib/lists.nix index abd9aceed0e3..e2e24244ff28 100644 --- a/lib/lists.nix +++ b/lib/lists.nix @@ -6,12 +6,12 @@ let inherit (lib.strings) toInt; inherit (lib.trivial) compare - min id + min + seq warn ; inherit (lib.attrsets) mapAttrs attrNames attrValues; - inherit (lib) max; in rec { @@ -276,11 +276,14 @@ rec { ::: */ foldl' = + let + inherit (builtins) foldl'; + in op: acc: # The builtin `foldl'` is a bit lazier than one might expect. # See https://github.com/NixOS/nix/pull/7158. # In particular, the initial accumulator value is not forced before the first iteration starts. - builtins.seq acc (builtins.foldl' op acc); + seq acc (foldl' op acc); /** Map with index starting from 0 @@ -442,7 +445,7 @@ rec { ::: */ - flatten = x: if isList x then concatMap (y: flatten y) x else [ x ]; + flatten = x: if isList x then concatMap flatten x else [ x ]; /** Remove elements equal to `e` from a list. Useful for `buildInputs`. @@ -1122,9 +1125,10 @@ rec { reverseList = xs: let - l = length xs; + # subtract one to save an __sub call on every element + lastIndex = length xs - 1; in - genList (n: elemAt xs (l - n - 1)) l; + genList (n: elemAt xs (lastIndex - n)) (lastIndex + 1); /** Depth-First Search (DFS) for lists `list != []`. @@ -1181,13 +1185,13 @@ rec { c = filter (x: before x us) visited; b = partition (x: before x us) rest; in - if stopOnCycles && (length c > 0) then + if stopOnCycles && c != [ ] then { cycle = us; loops = c; inherit visited rest; } - else if length b.right == 0 then + else if b.right == [ ] then # nothing is before us { minimal = us; @@ -1244,27 +1248,33 @@ rec { ::: */ toposort = - before: list: + before: let - dfsthis = listDfs true before list; - toporest = toposort before (dfsthis.visited ++ dfsthis.rest); + dfs = listDfs true before; + recurse = + list: + let + dfsthis = dfs list; + toporest = recurse (dfsthis.visited ++ dfsthis.rest); + in + if length list < 2 then + # finish + { result = list; } + else if dfsthis ? cycle then + # there's a cycle, starting from the current vertex, return it + { + cycle = reverseList dfsthis.visited ++ [ dfsthis.cycle ]; + inherit (dfsthis) loops; + } + else if toporest ? cycle then + # there's a cycle somewhere else in the graph, return it + toporest + # Slow, but short. Can be made a bit faster with an explicit stack. + else + # there are no cycles + { result = [ dfsthis.minimal ] ++ toporest.result; }; in - if length list < 2 then - # finish - { result = list; } - else if dfsthis ? cycle then - # there's a cycle, starting from the current vertex, return it - { - cycle = reverseList ([ dfsthis.cycle ] ++ dfsthis.visited); - inherit (dfsthis) loops; - } - else if toporest ? cycle then - # there's a cycle somewhere else in the graph, return it - toporest - # Slow, but short. Can be made a bit faster with an explicit stack. - else - # there are no cycles - { result = [ dfsthis.minimal ] ++ toporest.result; }; + recurse; /** Sort a list based on a comparator function which compares two @@ -1504,7 +1514,12 @@ rec { ::: */ - take = count: sublist 0 count; + take = + count: list: + let + len = length list; + in + genList (elemAt list) (if count > len then len else count); /** Returns the last (at most) N elements of a list. @@ -1538,7 +1553,13 @@ rec { ::: */ - takeEnd = n: xs: drop (max 0 (length xs - n)) xs; + takeEnd = + count: list: + let + len = length list; + start = if count > len then 0 else len - count; + in + genList (i: elemAt list (start + i)) (if start > len then 0 else len - start); /** Remove the first (at most) N elements of a list. @@ -1572,7 +1593,12 @@ rec { ::: */ - drop = count: list: sublist count (length list) list; + drop = + count: list: + let + len = length list; + in + genList (n: elemAt list (n + count)) (if count > len then 0 else len - count); /** Remove the last (at most) N elements of a list. @@ -1606,7 +1632,19 @@ rec { ``` ::: */ - dropEnd = n: xs: take (max 0 (length xs - n)) xs; + dropEnd = + n: list: + let + len = length list; + in + genList (elemAt list) ( + if n > len then + 0 + else if n < 0 then + len + else + len - n + ); /** Whether the first list is a prefix of the second list. @@ -1810,7 +1848,7 @@ rec { */ last = list: - assert lib.assertMsg (list != [ ]) "lists.last: list must not be empty!"; + assert list != [ ] || throw "lists.last: list must not be empty!"; elemAt list (length list - 1); /** @@ -1843,8 +1881,8 @@ rec { */ init = list: - assert lib.assertMsg (list != [ ]) "lists.init: list must not be empty!"; - take (length list - 1) list; + assert list != [ ] || throw "lists.init: list must not be empty!"; + genList (elemAt list) (length list - 1); /** Returns the image of the cross product of some lists by a function. @@ -2119,7 +2157,8 @@ rec { */ replaceElemAt = list: idx: newElem: - assert lib.assertMsg (idx >= 0 && idx < length list) - "'lists.replaceElemAt' called with index ${toString idx} on a list of size ${toString (length list)}"; + assert + idx >= 0 && idx < length list + || throw "'lists.replaceElemAt' called with index ${toString idx} on a list of size ${toString (length list)}"; genList (i: if i == idx then newElem else elemAt list i) (length list); } diff --git a/pkgs/stdenv/generic/meta-types.nix b/lib/meta-types.nix similarity index 84% rename from pkgs/stdenv/generic/meta-types.nix rename to lib/meta-types.nix index 1396243e3002..264c921eb54e 100644 --- a/pkgs/stdenv/generic/meta-types.nix +++ b/lib/meta-types.nix @@ -1,6 +1,7 @@ { lib }: # Simple internal type checks for meta. -# This file is not a stable interface and may be changed arbitrarily. +# This file is only intended for internal nixpkgs use. +# It is not a stable interface and may be changed arbitrarily. # # TODO: add a method to the module system types # see https://github.com/NixOS/nixpkgs/pull/273935#issuecomment-1854173100 @@ -159,6 +160,32 @@ lib.fix (self: { verify = v: all (func: func v) funcs; }; + either = + t1: t2: + assert isTypeDef t1 && isTypeDef t2; + let + # Store the functions directly so we don't have to pay the cost of attrset lookups at runtime. + v1 = t1.verify; + v2 = t2.verify; + in + { + name = "either<${t1.name},${t2.name}>"; + verify = v: v1 v || v2 v; + }; + + both = + t1: t2: + assert isTypeDef t1 && isTypeDef t2; + let + # Store the functions directly so we don't have to pay the cost of attrset lookups at runtime. + v1 = t1.verify; + v2 = t2.verify; + in + { + name = "both<${t1.name},${t2.name}>"; + verify = v: v1 v && v2 v; + }; + not = t: assert isTypeDef t; @@ -172,10 +199,10 @@ lib.fix (self: { enum = values: - assert isList values && all isString values; + assert isList values; { - name = "enum<${concatStringsSep "," values}>"; - verify = v: isString v && elem v values; + name = if all isString values then "enum<${concatStringsSep "," values}>" else "enum"; + verify = v: elem v values; }; record = diff --git a/lib/meta.nix b/lib/meta.nix index 5697b915061c..1defd305abc0 100644 --- a/lib/meta.nix +++ b/lib/meta.nix @@ -12,7 +12,6 @@ let all isDerivation getBin - assertMsg ; inherit (lib.attrsets) mapAttrs' filterAttrs; inherit (builtins) @@ -571,12 +570,15 @@ rec { */ getExe' = x: y: - assert assertMsg (isDerivation x) - "lib.meta.getExe': The first argument is of type ${typeOf x}, but it should be a derivation instead."; - assert assertMsg (isString y) - "lib.meta.getExe': The second argument is of type ${typeOf y}, but it should be a string instead."; - assert assertMsg (match ".*/.*" y == null) - "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; + assert + isDerivation x + || throw "lib.meta.getExe': The first argument is of type ${typeOf x}, but it should be a derivation instead."; + assert + isString y + || throw "lib.meta.getExe': The second argument is of type ${typeOf y}, but it should be a string instead."; + assert + match ".*/.*" y == null + || throw "lib.meta.getExe': The second argument \"${y}\" is a nested path with a \"/\" character, but it should just be the name of the executable instead."; "${getBin x}/bin/${y}"; /** diff --git a/lib/modules.nix b/lib/modules.nix index c5c935144ea6..a206ed6ed8e2 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -46,7 +46,6 @@ let setAttrByPath substring take - throwIfNot trace typeOf types @@ -680,8 +679,11 @@ let config = addFreeformType (addMeta (m.config or { })); } else - # shorthand syntax - throwIfNot (isAttrs m) "module ${file} (${key}) does not look like a module." { + # shorthand syntax + if !isAttrs m then + throw "module ${file} (${key}) does not look like a module." + else + { _file = toString m._file or file; _class = m._class or null; key = toString m.key or key; diff --git a/lib/network/internal.nix b/lib/network/internal.nix index adda711444fd..d22b2739c3f4 100644 --- a/lib/network/internal.nix +++ b/lib/network/internal.nix @@ -104,9 +104,9 @@ let */ parseExpandedIpv6 = addr: - assert lib.assertMsg ( + assert length addr == ipv6Pieces - ) "parseExpandedIpv6: expected list of integers with ${ipv6Pieces} elements"; + || throw "parseExpandedIpv6: expected list of integers with ${ipv6Pieces} elements"; let u16FromHexStr = hex: diff --git a/lib/options.nix b/lib/options.nix index accbb56ff34a..6e5383fab455 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -90,12 +90,12 @@ rec { `defaultText` : Substitute for documenting the `default`, if evaluating the default value during documentation rendering is not possible. : Can be any nix value that evaluates. - : Usage with `lib.literalMD` or `lib.literalExpression` is supported + : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported `example` : Optional example value used in the manual. : Can be any nix value that evaluates. - : Usage with `lib.literalMD` or `lib.literalExpression` is supported + : Usage with `lib.literalMD`, `lib.literalExpression`, or `lib.literalCode` is supported `description` : Optional string describing the option. This is required if option documentation is generated. diff --git a/lib/path/default.nix b/lib/path/default.nix index 60c56948d68e..9cefcaa07314 100644 --- a/lib/path/default.nix +++ b/lib/path/default.nix @@ -32,10 +32,6 @@ let substring ; - inherit (lib.asserts) - assertMsg - ; - inherit (lib.path.subpath) isValid ; @@ -238,11 +234,14 @@ in path: # The subpath string to append subpath: - assert assertMsg (isPath path) - "lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected"; - assert assertMsg (isValid subpath) '' - lib.path.append: Second argument is not a valid subpath string: - ${subpathInvalidReason subpath}''; + assert + isPath path + || throw "lib.path.append: The first argument is of type ${builtins.typeOf path}, but a path was expected"; + assert + isValid subpath + || throw '' + lib.path.append: Second argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; path + ("/" + subpath); /** @@ -285,21 +284,25 @@ in */ hasPrefix = path1: - assert assertMsg (isPath path1) - "lib.path.hasPrefix: First argument is of type ${typeOf path1}, but a path was expected"; + assert + isPath path1 + || throw "lib.path.hasPrefix: First argument is of type ${typeOf path1}, but a path was expected"; let path1Deconstructed = deconstructPath path1; in path2: - assert assertMsg (isPath path2) - "lib.path.hasPrefix: Second argument is of type ${typeOf path2}, but a path was expected"; + assert + isPath path2 + || throw "lib.path.hasPrefix: Second argument is of type ${typeOf path2}, but a path was expected"; let path2Deconstructed = deconstructPath path2; in - assert assertMsg (path1Deconstructed.root == path2Deconstructed.root) '' - lib.path.hasPrefix: Filesystem roots must be the same for both paths, but paths with different roots were given: - first argument: "${toString path1}" with root "${toString path1Deconstructed.root}" - second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; + assert + path1Deconstructed.root == path2Deconstructed.root + || throw '' + lib.path.hasPrefix: Filesystem roots must be the same for both paths, but paths with different roots were given: + first argument: "${toString path1}" with root "${toString path1Deconstructed.root}" + second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; take (length path1Deconstructed.components) path2Deconstructed.components == path1Deconstructed.components; @@ -344,15 +347,17 @@ in */ removePrefix = path1: - assert assertMsg (isPath path1) - "lib.path.removePrefix: First argument is of type ${typeOf path1}, but a path was expected."; + assert + isPath path1 + || throw "lib.path.removePrefix: First argument is of type ${typeOf path1}, but a path was expected."; let path1Deconstructed = deconstructPath path1; path1Length = length path1Deconstructed.components; in path2: - assert assertMsg (isPath path2) - "lib.path.removePrefix: Second argument is of type ${typeOf path2}, but a path was expected."; + assert + isPath path2 + || throw "lib.path.removePrefix: Second argument is of type ${typeOf path2}, but a path was expected."; let path2Deconstructed = deconstructPath path2; success = take path1Length path2Deconstructed.components == path1Deconstructed.components; @@ -362,10 +367,12 @@ in else throw ''lib.path.removePrefix: The first path argument "${toString path1}" is not a component-wise prefix of the second path argument "${toString path2}".''; in - assert assertMsg (path1Deconstructed.root == path2Deconstructed.root) '' - lib.path.removePrefix: Filesystem roots must be the same for both paths, but paths with different roots were given: - first argument: "${toString path1}" with root "${toString path1Deconstructed.root}" - second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; + assert + path1Deconstructed.root == path2Deconstructed.root + || throw '' + lib.path.removePrefix: Filesystem roots must be the same for both paths, but paths with different roots were given: + first argument: "${toString path1}" with root "${toString path1Deconstructed.root}" + second argument: "${toString path2}" with root "${toString path2Deconstructed.root}"''; joinRelPath components; /** @@ -422,8 +429,9 @@ in splitRoot = # The path to split the root off of path: - assert assertMsg (isPath path) - "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected"; + assert + isPath path + || throw "lib.path.splitRoot: Argument is of type ${typeOf path}, but a path was expected"; let deconstructed = deconstructPath path; in @@ -494,14 +502,15 @@ in let deconstructed = deconstructPath path; in - assert assertMsg (isPath path) - "lib.path.hasStorePathPrefix: Argument is of type ${typeOf path}, but a path was expected"; - assert assertMsg + assert + isPath path + || throw "lib.path.hasStorePathPrefix: Argument is of type ${typeOf path}, but a path was expected"; + assert # This function likely breaks or needs adjustment if used with other filesystem roots, if they ever get implemented. # Let's try to error nicely in such a case, though it's unclear how an implementation would work even and whether this could be detected. # See also https://github.com/NixOS/nix/pull/6530#discussion_r1422843117 - (deconstructed.root == /. && toString deconstructed.root == "/") - "lib.path.hasStorePathPrefix: Argument has a filesystem root (${toString deconstructed.root}) that's not /, which is currently not supported."; + deconstructed.root == /. && toString deconstructed.root == "/" + || throw "lib.path.hasStorePathPrefix: Argument has a filesystem root (${toString deconstructed.root}) that's not /, which is currently not supported."; componentsHaveStorePathPrefix deconstructed.components; /** @@ -702,9 +711,11 @@ in subpath.components = # The subpath string to split into components subpath: - assert assertMsg (isValid subpath) '' - lib.path.subpath.components: Argument is not a valid subpath string: - ${subpathInvalidReason subpath}''; + assert + isValid subpath + || throw '' + lib.path.subpath.components: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; splitRelPath subpath; /** @@ -799,9 +810,11 @@ in subpath.normalise = # The subpath string to normalise subpath: - assert assertMsg (isValid subpath) '' - lib.path.subpath.normalise: Argument is not a valid subpath string: - ${subpathInvalidReason subpath}''; + assert + isValid subpath + || throw '' + lib.path.subpath.normalise: Argument is not a valid subpath string: + ${subpathInvalidReason subpath}''; joinRelPath (splitRelPath subpath); } diff --git a/lib/services/service.nix b/lib/services/service.nix index 1bcf0845f0d7..5911202547fe 100644 --- a/lib/services/service.nix +++ b/lib/services/service.nix @@ -6,10 +6,12 @@ # The module { lib, + config, + options, ... }: let - inherit (lib) mkOption types; + inherit (lib) mkEnableOption mkOption types; pathOrStr = types.coercedTo types.path (x: "${x}") types.str; in { @@ -39,7 +41,7 @@ in visible = "shallow"; }; process = { - argv = lib.mkOption { + argv = mkOption { type = types.listOf pathOrStr; example = lib.literalExpression ''[ (lib.getExe config.package) "--nobackground" ]''; description = '' @@ -49,6 +51,57 @@ in a shell script or `importas` from `pkgs.execline`. ''; }; + + reloadSignal = mkOption { + type = types.nullOr types.str; + default = null; + example = "HUP"; + description = '' + Configures the reload signal to send to the service manager. + ''; + }; + + reloadCommand = mkOption { + type = types.nullOr types.str; + default = null; + example = lib.literalExpression ''"''${pkgs.coreutils}/bin/kill -HUP $MAINPID"''; + + description = '' + Command used for reloading in the underlying service manager to reload. + ''; + }; + }; + + notificationProtocol = mkOption { + type = types.submodule { + options = { + systemd = mkEnableOption "Whether the service supports systemd-notify."; + s6 = mkEnableOption "Whether the service supports s6-notify."; + }; + }; + description = '' + Notification protocol that this service supports with the underlying service manager. + ''; }; }; + + config = { + assertions = [ + { + # `reloadSignal` derives `reloadCommand` at `mkDefault` priority below, so a + # conflict only exists when the user *also* set `reloadCommand` explicitly. + # An explicit (non-`mkDefault`) definition has `defaultOverridePriority`. + assertion = + !( + config.process.reloadSignal != null + && options.process.reloadCommand.highestPrio <= lib.modules.defaultOverridePriority + ); + message = "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand."; + } + ]; + + process.reloadCommand = lib.mkIf (config.process.reloadSignal != null) ( + lib.mkDefault "${pkgs.coreutils}/bin/kill -${config.process.reloadSignal} $MAINPID" + ); + }; } diff --git a/lib/sources.nix b/lib/sources.nix index 81b8a8c77178..9846e9c586f7 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -4,22 +4,31 @@ # Tested in lib/tests/sources.sh let inherit (lib.strings) - match - split - storeDir escapeRegex + hasPrefix + hasSuffix + match removePrefix + removeSuffix + split + splitString + storeDir + stringLength + substring ; inherit (lib) - boolToString - filter - isString - readFile - concatStrings - length - elemAt - isList any + boolToString + concatStrings + elemAt + fileContents + filter + head + isList + isString + last + length + readFile ; inherit (lib.filesystem) pathIsRegularFile @@ -41,6 +50,12 @@ let : 2\. Function argument */ cleanSourceFilter = + let + hasEmacsBackupFileSuffix = hasSuffix "~"; + hasObjectSuffix = hasSuffix ".o"; + hasSharedObjectSuffix = hasSuffix ".so"; + hasResultPrefix = hasPrefix "result"; + in name: type: let baseName = baseNameOf name; @@ -62,17 +77,15 @@ let ) || # Filter out editor backup / swap files. - lib.hasSuffix "~" baseName + hasEmacsBackupFileSuffix baseName || match "^\\.sw[a-z]$" baseName != null || match "^\\..*\\.sw[a-z]$" baseName != null - || - - # Filter out generates files. - lib.hasSuffix ".o" baseName - || lib.hasSuffix ".so" baseName + # Filter out generated files. + || hasObjectSuffix baseName + || hasSharedObjectSuffix baseName || # Filter out nix-build result symlinks - (type == "symlink" && lib.hasPrefix "result" baseName) + (type == "symlink" && hasResultPrefix baseName) || # Filter out sockets and other types of files we can't have in the store. (type == "unknown") @@ -133,13 +146,13 @@ let { # A path or cleanSourceWith result to filter and/or rename. src, - # Optional with default value: constant true (include everything) + # Optional with default value of null (include everything) # The function will be combined with the && operator such # that src.filter is called lazily. # For implementing a filter, see # https://nixos.org/nix/manual/#builtin-filterSource # Type: A function (Path -> Type -> Bool) - filter ? _path: _type: true, + filter ? null, # Optional name to use as part of the store path. # This defaults to `src.name` or otherwise `"source"`. name ? null, @@ -149,7 +162,13 @@ let in fromSourceAttributes { inherit (orig) origSrc; - filter = path: type: filter path type && orig.filter path type; + filter = + if orig.filter == null then + filter + else if filter == null then + orig.filter + else + path: type: filter path type && orig.filter path type; name = if name != null then name else orig.name; }; @@ -178,11 +197,14 @@ let attrs // { filter = - path: type: - let - r = attrs.filter path type; - in - builtins.trace "${attrs.name}.filter ${path} = ${boolToString r}" r; + if attrs.filter == null then + path: type: builtins.trace "${attrs.name}.filter ${path} = true" true + else + path: type: + let + r = attrs.filter path type; + in + builtins.trace "${attrs.name}.filter ${path} = ${boolToString r}" r; } ) // { @@ -218,13 +240,13 @@ let isFiltered = src ? _isLibCleanSourceWith; origSrc = if isFiltered then src.origSrc else src; in - lib.cleanSourceWith { + cleanSourceWith { filter = ( path: type: let - relPath = lib.removePrefix (toString origSrc + "/") (toString path); + relPath = removePrefix (toString origSrc + "/") (toString path); in - lib.any (re: match re relPath != null) regexes + any (re: match re relPath != null) regexes ); inherit src; }; @@ -272,7 +294,7 @@ let let base = baseNameOf name; in - type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; + type == "directory" || any (ext: hasSuffix ext base) exts; in cleanSourceWith { inherit filter src; }; @@ -319,9 +341,9 @@ let packedRefsName = path + "/packed-refs"; absolutePath = base: path: - if lib.hasPrefix "/" path then + if hasPrefix "/" path then path - else if lib.hasPrefix "/" base then + else if hasPrefix "/" base then "${base}/${path}" else "/${base}/${path}"; @@ -337,12 +359,12 @@ let { error = "File contains no gitdir reference: " + path; } else let - gitDir = absolutePath (dirOf path) (lib.head m); + gitDir = absolutePath (dirOf path) (head m); commonDir'' = - if pathIsRegularFile "${gitDir}/commondir" then lib.fileContents "${gitDir}/commondir" else gitDir; - commonDir' = lib.removeSuffix "/" commonDir''; + if pathIsRegularFile "${gitDir}/commondir" then fileContents "${gitDir}/commondir" else gitDir; + commonDir' = removeSuffix "/" commonDir''; commonDir = absolutePath gitDir commonDir'; - refFile = lib.removePrefix "${commonDir}/" "${gitDir}/${file}"; + refFile = removePrefix "${commonDir}/" "${gitDir}/${file}"; in readCommitFromFile refFile commonDir @@ -352,10 +374,10 @@ let # sometimes it stores something like: «ref: refs/heads/branch-name» then let - fileContent = lib.fileContents fileName; + fileContent = fileContents fileName; matchRef = match "^ref: (.*)$" fileContent; in - if matchRef == null then { value = fileContent; } else readCommitFromFile (lib.head matchRef) path + if matchRef == null then { value = fileContent; } else readCommitFromFile (head matchRef) path else if pathIsRegularFile packedRefsName @@ -373,14 +395,14 @@ let if refs == [ ] then { error = "Could not find " + file + " in " + packedRefsName; } else - { value = lib.head (matchRef (lib.head refs)); } + { value = head (matchRef (head refs)); } else { error = "Not a .git directory: " + toString path; }; in readCommitFromFile "HEAD"; - pathHasContext = builtins.hasContext or (lib.hasPrefix storeDir); + pathHasContext = builtins.hasContext or (hasPrefix storeDir); canCleanSource = src: src ? _isLibCleanSourceWith || !(pathHasContext (toString src)); @@ -403,7 +425,7 @@ let { # The original path origSrc = if isFiltered then src.origSrc else src; - filter = if isFiltered then src.filter else _: _: true; + filter = if isFiltered then src.filter else null; # make sure to handle this! name = if isFiltered then src.name else "source"; }; @@ -411,6 +433,9 @@ let # # Inverse of toSourceAttributes for Source objects. fromSourceAttributes = + let + inherit (builtins) path; + in { origSrc, filter, @@ -418,9 +443,13 @@ let }: { _isLibCleanSourceWith = true; - inherit origSrc filter name; - outPath = builtins.path { - inherit filter name; + inherit origSrc name; + # preserve outside checks, since a filter of null looks odd for + # comparisons + filter = if filter == null then _: _: true else filter; + outPath = path { + inherit name; + ${if filter != null then "filter" else null} = filter; path = origSrc; }; }; @@ -431,15 +460,14 @@ let urlToName = url: let - inherit (lib.strings) stringLength; - base = baseNameOf (lib.removeSuffix "/" (lib.last (lib.splitString ":" (toString url)))); + base = baseNameOf (removeSuffix "/" (last (splitString ":" (toString url)))); # chop away one git or archive-related extension removeExt = name: let matchExt = match "(.*)\\.(git|tar|zip|gz|tgz|bz|tbz|bz2|tbz2|lzma|txz|xz|zstd)$" name; in - if matchExt != null then lib.head matchExt else name; + if matchExt != null then head matchExt else name; # apply function f to string x while the result shrinks shrink = f: x: @@ -461,9 +489,9 @@ let matchVer = match "([A-Za-z]+[-_. ]?)*(v)?([0-9.]+.*)" baseRev; in if matchHash != null then - builtins.substring 0 7 baseRev + substring 0 7 baseRev else if matchVer != null then - lib.last matchVer + last matchVer else baseRev; @@ -623,7 +651,7 @@ let in src: patterns: - lib.cleanSourceWith { + cleanSourceWith { filter = mkSourceFilter src patterns; inherit src; }; diff --git a/lib/strings.nix b/lib/strings.nix index 4c78c909b4be..59a458aecf80 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -6,8 +6,6 @@ let inherit (builtins) length; - inherit (lib.trivial) warnIf; - asciiTable = import ./ascii-table.nix; in @@ -16,6 +14,7 @@ rec { inherit (builtins) compareVersions + concatMap elem elemAt filter @@ -564,7 +563,10 @@ rec { ::: */ makeSearchPath = - subDir: paths: concatStringsSep ":" (map (path: path + "/" + subDir) (filter (x: x != null) paths)); + subDir: paths: + concatStringsSep ":" ( + concatMap (path: if path != null then [ (path + "/" + subDir) ] else [ ]) paths + ); /** Construct a Unix-style search path by appending the given @@ -602,8 +604,14 @@ rec { ::: */ makeSearchPathOutput = - output: subDir: pkgs: - makeSearchPath subDir (map (lib.getOutput output) pkgs); + output: + let + getOutput' = lib.getOutput output; + in + subDir: pkgs: + concatStringsSep ":" ( + concatMap (path: if path != null then [ (getOutput' path + "/" + subDir) ] else [ ]) pkgs + ); /** Construct a library search path (such as RPATH) containing the @@ -721,15 +729,17 @@ rec { ::: */ normalizePath = + let + startsWithSlash = hasSuffix "/"; + in s: - warnIf (isPath s) - '' + if isPath s then + throw '' lib.strings.normalizePath: The argument (${toString s}) is a path value, but only strings are supported. - Path values are always normalised in Nix, so there's no need to call this function on them. - This function also copies the path to the Nix store and returns the store path, the same as "''${path}" will, which may not be what you want. - This behavior is deprecated and will throw an error in the future.'' - ( - builtins.foldl' (x: y: if y == "/" && hasSuffix "/" x then x else x + y) "" (stringToCharacters s) + Path values are always normalised in Nix, so there's no need to call this function on them.'' + else + builtins.foldl' (x: y: if y == "/" && startsWithSlash x then x else x + y) "" ( + stringToCharacters s ); /** @@ -796,17 +806,18 @@ rec { ::: */ hasPrefix = - pref: str: - # Before 23.05, paths would be copied to the store before converting them - # to strings and comparing. This was surprising and confusing. - warnIf (isPath pref) - '' + pref: + let + lenPrefix = stringLength pref; + in + if isPath pref then + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + throw '' lib.strings.hasPrefix: The first argument (${toString pref}) is a path value, but only strings are supported. - There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. - This function also copies the path to the Nix store, which may not be what you want. - This behavior is deprecated and will throw an error in the future. You might want to use `lib.path.hasPrefix` instead, which correctly supports paths.'' - (substring 0 (stringLength pref) str == pref); + else + str: substring 0 lenPrefix str == pref; /** Determine whether a string has given suffix. @@ -839,20 +850,23 @@ rec { ::: */ hasSuffix = - suffix: content: + suffix: let - lenContent = stringLength content; lenSuffix = stringLength suffix; in - # Before 23.05, paths would be copied to the store before converting them - # to strings and comparing. This was surprising and confusing. - warnIf (isPath suffix) - '' + if isPath suffix then + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + throw '' lib.strings.hasSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported. - There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. - This function also copies the path to the Nix store, which may not be what you want. - This behavior is deprecated and will throw an error in the future.'' - (lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix); + There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. + This function also copies the path to the Nix store, which may not be what you want.'' + else + content: + let + lenContent = stringLength content; + in + lenContent >= lenSuffix && substring (lenContent - lenSuffix) lenContent content == suffix; /** Determine whether a string contains the given infix @@ -889,16 +903,19 @@ rec { ::: */ hasInfix = - infix: content: - # Before 23.05, paths would be copied to the store before converting them - # to strings and comparing. This was surprising and confusing. - warnIf (isPath infix) - '' + infix: + let + escapedInfix = escapeRegex infix; + in + if isPath infix then + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + throw '' lib.strings.hasInfix: The first argument (${toString infix}) is a path value, but only strings are supported. There is almost certainly a bug in the calling code, since this function always returns `false` in such a case. - This function also copies the path to the Nix store, which may not be what you want. - This behavior is deprecated and will throw an error in the future.'' - (builtins.match ".*${escapeRegex infix}.*" "${content}" != null); + This function also copies the path to the Nix store, which may not be what you want.'' + else + content: builtins.match ".*${escapedInfix}.*" "${content}" != null; /** Convert a string `s` to a list of characters (i.e. singleton strings). @@ -1303,8 +1320,11 @@ rec { ::: */ toShellVar = - name: value: - lib.throwIfNot (isValidPosixName name) "toShellVar: ${name} is not a valid shell variable name" ( + name: + if (!isValidPosixName name) then + throw "toShellVar: ${name} is not a valid shell variable name" + else + value: if isAttrs value && !isStringLike value then "declare -A ${name}=(${ concatStringsSep " " (lib.mapAttrsToList (n: v: "[${escapeShellArg n}]=${escapeShellArg v}") value) @@ -1312,8 +1332,7 @@ rec { else if isList value then "declare -a ${name}=(${escapeShellArgs value})" else - "${name}=${escapeShellArg value}" - ); + "${name}=${escapeShellArg value}"; /** Translate an attribute set `vars` into corresponding shell variable declarations @@ -1570,15 +1589,14 @@ rec { */ toSentenceCase = str: - lib.throwIfNot (isString str) - "toSentenceCase does only accepts string values, but got ${typeOf str}" - ( - let - firstChar = substring 0 1 str; - rest = substring 1 (stringLength str) str; - in - addContextFrom str (toUpper firstChar + toLower rest) - ); + if !isString str then + throw "toSentenceCase does only accepts string values, but got ${typeOf str}" + else + let + firstChar = substring 0 1 str; + rest = substring 1 (-1) str; # -1 takes till the end of the string + in + toUpper firstChar + toLower rest; /** Converts a string to camelCase. Handles snake_case, PascalCase, @@ -1614,7 +1632,9 @@ rec { */ toCamelCase = str: - lib.throwIfNot (isString str) "toCamelCase does only accepts string values, but got ${typeOf str}" ( + if !isString str then + throw "toCamelCase does only accepts string values, but got ${typeOf str}" + else let separators = splitStringBy ( prev: curr: @@ -1634,8 +1654,7 @@ rec { first = if length parts > 0 then toLower (head parts) else ""; rest = if length parts > 1 then map toSentenceCase (tail parts) else [ ]; in - concatStrings (map (addContextFrom str) ([ first ] ++ rest)) - ); + concatStrings ([ first ] ++ rest); /** Appends string context from string like object `src` to `target`. @@ -1721,13 +1740,11 @@ rec { ::: */ splitString = - sep: s: + sep: let - splits = builtins.filter builtins.isString ( - builtins.split (escapeRegex (toString sep)) (toString s) - ); + escapedSep = escapeRegex (toString sep); in - map (addContextFrom s) splits; + s: map (addContextFrom s) (filter isString (split escapedSep (toString s))); /** Splits a string into substrings based on a predicate that examines adjacent characters. @@ -1794,31 +1811,27 @@ rec { predicate: keepSplit: str: let len = stringLength str; + withContext = addContextFrom str; # Helper function that processes the string character by character go = pos: currentPart: result: # Base case: reached end of string if pos == len then - result ++ [ currentPart ] + result ++ [ (withContext currentPart) ] else let currChar = substring pos 1 str; prevChar = if pos > 0 then substring (pos - 1) 1 str else ""; - isSplit = predicate prevChar currChar; in - if isSplit then + if predicate prevChar currChar then # Split here - add current part to results and start a new one - let - newResult = result ++ [ currentPart ]; - newCurrentPart = if keepSplit then currChar else ""; - in - go (pos + 1) newCurrentPart newResult + go (pos + 1) (if keepSplit then currChar else "") (result ++ [ (withContext currentPart) ]) else # Keep building current part go (pos + 1) (currentPart + currChar) result; in - if len == 0 then [ (addContextFrom str "") ] else map (addContextFrom str) (go 0 "" [ ]); + if len == 0 then [ (withContext "") ] else go 0 "" [ ]; /** Returns a string without the specified prefix, if the prefix matches. @@ -1851,25 +1864,24 @@ rec { ::: */ removePrefix = - prefix: str: - # Before 23.05, paths would be copied to the store before converting them - # to strings and comparing. This was surprising and confusing. - warnIf (isPath prefix) - '' + prefix: + let + preLen = stringLength prefix; + in + if isPath prefix then + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + throw '' lib.strings.removePrefix: The first argument (${toString prefix}) is a path value, but only strings are supported. There is almost certainly a bug in the calling code, since this function never removes any prefix in such a case. - This function also copies the path to the Nix store, which may not be what you want. - This behavior is deprecated and will throw an error in the future.'' - ( - let - preLen = stringLength prefix; - in - if substring 0 preLen str == prefix then - # -1 will take the string until the end - substring preLen (-1) str - else - str - ); + This function also copies the path to the Nix store, which may not be what you want.'' + else + str: + if substring 0 preLen str == prefix then + # -1 will take the string until the end + substring preLen (-1) str + else + str; /** Returns a string without the specified suffix, if the suffix matches. @@ -1902,25 +1914,26 @@ rec { ::: */ removeSuffix = - suffix: str: - # Before 23.05, paths would be copied to the store before converting them - # to strings and comparing. This was surprising and confusing. - warnIf (isPath suffix) - '' + suffix: + let + sufLen = stringLength suffix; + in + if isPath suffix then + # Before 23.05, paths would be copied to the store before converting them + # to strings and comparing. This was surprising and confusing. + throw '' lib.strings.removeSuffix: The first argument (${toString suffix}) is a path value, but only strings are supported. There is almost certainly a bug in the calling code, since this function never removes any suffix in such a case. - This function also copies the path to the Nix store, which may not be what you want. - This behavior is deprecated and will throw an error in the future.'' - ( - let - sufLen = stringLength suffix; - sLen = stringLength str; - in - if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then - substring 0 (sLen - sufLen) str - else - str - ); + This function also copies the path to the Nix store, which may not be what you want.'' + else + str: + let + sLen = stringLength str; + in + if sufLen <= sLen && suffix == substring (sLen - sufLen) sufLen str then + substring 0 (sLen - sufLen) str + else + str; /** Returns true if string `v1` denotes a version older than `v2`. @@ -1986,7 +1999,7 @@ rec { ::: */ - versionAtLeast = v1: v2: !versionOlder v1 v2; + versionAtLeast = v1: v2: compareVersions v2 v1 != 1; /** This function takes an argument `x` that's either a derivation or a @@ -2149,8 +2162,9 @@ rec { "LIST" ]; in - type: feature: value: + type: assert (elem (toUpper type) types); + feature: value: assert (isString feature); assert (isString value); "-D${feature}:${toUpper type}=${value}"; @@ -2186,9 +2200,8 @@ rec { */ cmakeBool = condition: flag: - assert (lib.isString condition); assert (lib.isBool flag); - cmakeOptionType "bool" condition (lib.toUpper (lib.boolToString flag)); + cmakeOptionType "bool" condition (if flag then "TRUE" else "FALSE"); /** Create a `"-D:STRING="` string that can be passed to typical @@ -2220,11 +2233,7 @@ rec { ::: */ - cmakeFeature = - feature: value: - assert (lib.isString feature); - assert (lib.isString value); - cmakeOptionType "string" feature value; + cmakeFeature = cmakeOptionType "string"; /** Create a `"-D="` string that can be passed to typical Meson @@ -2294,7 +2303,6 @@ rec { */ mesonBool = condition: flag: - assert (lib.isString condition); assert (lib.isBool flag); mesonOption condition (lib.boolToString flag); @@ -2331,7 +2339,6 @@ rec { */ mesonEnable = feature: flag: - assert (lib.isString feature); assert (lib.isBool flag); mesonOption feature (if flag then "enabled" else "disabled"); @@ -2525,8 +2532,9 @@ rec { strw = lib.stringLength str; reqWidth = width - (lib.stringLength filler); in - assert lib.assertMsg (strw <= width) - "fixedWidthString: requested string length (${toString width}) must not be shorter than actual length (${toString strw})"; + assert + strw <= width + || throw "fixedWidthString: requested string length (${toString width}) must not be shorter than actual length (${toString strw})"; if strw == width then str else filler + fixedWidthString reqWidth filler str; /** diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 53c095711aef..05da6815ceba 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -17,12 +17,17 @@ let inherit (lib.strings) toJSON; + inherit (lib.trivial) + oldestSupportedReleaseIsAtLeast + ; + doubles = import ./doubles.nix { inherit lib; }; parse = import ./parse.nix { inherit lib; }; inspect = import ./inspect.nix { inherit lib; }; platforms = import ./platforms.nix { inherit lib; }; examples = import ./examples.nix { inherit lib; }; architectures = import ./architectures.nix { inherit lib; }; + rustc-target-env = import ./rustc-target-env.nix; /** Elaborated systems contain functions, which means that they don't satisfy @@ -449,6 +454,16 @@ let else final.parsed.cpu.name; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_env + # Accomodate system definitions written before Nixpkgs learned about target_env. + env = + if rust ? platform.env then + rust.platform.env + else if rustc-target-env ? ${final.rust.rustcTargetSpec} then + rustc-target-env.${final.rust.rustcTargetSpec} + else + ""; + # https://doc.rust-lang.org/reference/conditional-compilation.html#target_os os = if rust ? platform then @@ -690,9 +705,12 @@ let }; }; in - # TODO: Remove in 27.05. + # Platforms elaborated by pre-26.11 Nixpkgs will include the `linux-kernel` attr, + # so we can't assert its absence until 26.11 is the oldest supported release. + # Assertion will activate during the 27.05 cycle, when 26.05 support ends. + # TODO: Remove assertion in the 27.11 cycle. assert - args ? linux-kernel + oldestSupportedReleaseIsAtLeast 2611 && args ? linux-kernel -> throw "lib.systems.elaborate: linux-kernel has been removed; see the 26.11 release notes"; assert final.useAndroidPrebuilt -> final.isAndroid; diff --git a/lib/systems/doubles.nix b/lib/systems/doubles.nix index e9fa908dfc88..3970b69735a9 100644 --- a/lib/systems/doubles.nix +++ b/lib/systems/doubles.nix @@ -1,19 +1,29 @@ { lib }: let - inherit (lib) lists; + inherit (lib) + lists + splitString + ; inherit (lib.systems) parse; + inherit (parse) + mkSystemFromSkeleton + mkSkeletonFromList + doubleFromSystem + ; inherit (lib.systems.inspect) predicates; inherit (lib.attrsets) matchAttrs; all = [ + # our primary systems. at the top of the list for fastest matching + # inside check-meta + "x86_64-linux" + "aarch64-darwin" + "aarch64-linux" + # Cygwin "i686-cygwin" "x86_64-cygwin" - # Darwin - "x86_64-darwin" - "aarch64-darwin" - # FreeBSD "i686-freebsd" "x86_64-freebsd" @@ -30,8 +40,7 @@ let # JS "javascript-ghcjs" - # Linux - "aarch64-linux" + # Linux (excluding the primary two at the top) "arc-linux" "armv5tel-linux" "armv6l-linux" @@ -54,7 +63,6 @@ let "riscv64-linux" "s390-linux" "s390x-linux" - "x86_64-linux" # MMIXware "mmix-mmixware" @@ -117,9 +125,17 @@ let "x86_64-uefi" ]; - allParsed = map parse.mkSystemFromString all; + uncheckedSystemFromString = + let + systemType = { + _type = "system"; + }; + in + s: mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s)) // systemType; - filterDoubles = f: map parse.doubleFromSystem (lists.filter f allParsed); + allParsed = map uncheckedSystemFromString all; + + filterDoubles = f: map doubleFromSystem (lists.filter f allParsed); in { diff --git a/lib/systems/examples.nix b/lib/systems/examples.nix index 055f727d53c9..ab062f82bce3 100644 --- a/lib/systems/examples.nix +++ b/lib/systems/examples.nix @@ -332,12 +332,6 @@ rec { platform = { }; }; - x86_64-darwin = { - config = "x86_64-apple-darwin"; - xcodePlatform = "MacOSX"; - platform = { }; - }; - # # UEFI # diff --git a/lib/systems/flake-systems.nix b/lib/systems/flake-systems.nix index 851dc1af7181..1589ff23baa4 100644 --- a/lib/systems/flake-systems.nix +++ b/lib/systems/flake-systems.nix @@ -11,7 +11,6 @@ "x86_64-linux" # Tier 2 "aarch64-linux" - "x86_64-darwin" # Tier 3 "armv6l-linux" "armv7l-linux" diff --git a/lib/systems/inspect.nix b/lib/systems/inspect.nix index 36a4036f210a..98b3fc050bc1 100644 --- a/lib/systems/inspect.nix +++ b/lib/systems/inspect.nix @@ -2,14 +2,17 @@ let inherit (lib) + all any + attrNames attrValues concatMap filter + flip hasPrefix + isAttrs isList mapAttrs - matchAttrs recursiveUpdateUntil toList ; @@ -24,19 +27,49 @@ let execFormats ; - abis = mapAttrs (_: abi: removeAttrs abi [ "assertions" ]) lib.systems.parse.abis; + # Based on lib.attrsets.matchAttrs, but with: + # - the initial isAttrs assertion removed, since this function is only ever + # called with attrsets + # - isAttrs only performed on one side when recursing, since our input data + # will always share a structure + matchAttrsUnchecked = + pattern: attrs: + all ( + # Compare equality between `pattern` & `attrs`. + attr: + # Missing attr, not equal. + attrs ? ${attr} + && ( + let + lhs = pattern.${attr}; + rhs = attrs.${attr}; + in + # Simple equality check is primarily for non-attrsets, but we run it + # on attrsets too, since it may let us avoid recursing + lhs == rhs || isAttrs lhs && matchAttrsUnchecked lhs rhs + ) + ) (attrNames pattern); + + removeAssertions = flip removeAttrs [ "assertions" ]; + abis = mapAttrs ( + _: abi: if abi ? assertions then removeAssertions abi else abi + ) lib.systems.parse.abis; in rec { # these patterns are to be matched against {host,build,target}Platform.parsed + # + # Note: All toplevel attributes within a pattern are expected to be attrsets. + # matchAttrsUnchecked should be changed if a pattern is ever added that + # doesn't follow this axiom patterns = rec { # The patterns below are lists in sum-of-products form. # # Each attribute is list of product conditions; non-list values are treated # as a singleton list. If *any* product condition in the list matches then # the predicate matches. Each product condition is tested by - # `lib.attrsets.matchAttrs`, which requires a match on *all* attributes of - # the product. + # `matchAttrsUnchecked`, which requires a match on *all* attributes of the + # product. isi686 = { cpu = cpuTypes.i686; @@ -489,14 +522,40 @@ rec { ) pat2 ) pat1; - matchAnyAttrs = - patterns: - if isList patterns then - attrs: any (pattern: matchAttrs pattern attrs) patterns - else - matchAttrs patterns; + matchAnyPattern = + let + # same as matchAttrsUnchecked definition at the top of the file, but: + # - pattern names are cached and reused for multiple attrset calls + # - avoid running isAttrs since all patterns are nested attrsets + matchPattern = + pattern: + let + names = attrNames pattern; + in + attrs: + all ( + attr: + attrs ? ${attr} + && ( + let + lhs = pattern.${attr}; + rhs = attrs.${attr}; + in + lhs == rhs || matchAttrsUnchecked lhs rhs + ) + ) names; - predicates = mapAttrs (_: matchAnyAttrs) patterns; + in + pattern: + if isList pattern then + let + cachedPatterns = map matchPattern pattern; + in + attrs: any (pattern: pattern attrs) cachedPatterns + else + matchPattern pattern; + + predicates = mapAttrs (_: matchAnyPattern) patterns; # these patterns are to be matched against the entire # {host,build,target}Platform structure; they include a `parsed={}` marker so diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 98db2595235f..cdfeafe7c18d 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -17,6 +17,9 @@ { lib }: let + inherit (import ../meta-types.nix { inherit lib; }) + enum + ; inherit (lib) all any @@ -28,7 +31,6 @@ let id length mapAttrs - mergeOneOption optionalString splitString versionAtLeast @@ -46,20 +48,19 @@ let isCygwin ; - inherit (lib.types) - enum - isType - mkOptionType - setType - ; - setTypes = type: - mapAttrs ( - name: value: - assert type.check value; - setType type.name ({ inherit name; } // value) - ); + if type ? verify then + let + inherit (type) verify; + in + mapAttrs ( + name: value: + assert verify value; + { inherit name; } // value + ) + else + mapAttrs (name: value: { inherit name; } // value); # gnu-config will ignore the portion of a triple matching the # regex `e?abi.*$` when determining the validity of a triple. In @@ -76,11 +77,9 @@ in rec { ################################################################################ - - types.openSignificantByte = mkOptionType { + types.openSignificantByte = { name = "significant-byte"; description = "Endianness"; - merge = mergeOneOption; }; types.significantByte = enum (attrValues significantBytes); @@ -103,21 +102,24 @@ rec { ################################################################################ - types.openCpuType = mkOptionType { + types.openCpuType = { name = "cpu-type"; description = "instruction set architecture name and information"; - merge = mergeOneOption; - check = - x: - types.bitWidth.check x.bits - && (if 8 < x.bits then types.significantByte.check x.significantByte else !(x ? significantByte)); + verify = + let + verifyBitWidth = types.bitWidth.verify; + verifySignificantByte = types.significantByte.verify; + in + v: + verifyBitWidth v.bits + && (if 8 < v.bits then verifySignificantByte v.significantByte else !(v ? significantByte)); }; types.cpuType = enum (attrValues cpuTypes); cpuTypes = let - inherit (significantBytes) bigEndian littleEndian; + inherit (significantBytes) littleEndian bigEndian; in setTypes types.openCpuType { arm = { @@ -487,10 +489,9 @@ rec { ################################################################################ - types.openVendor = mkOptionType { + types.openVendor = { name = "vendor"; description = "vendor for the platform"; - merge = mergeOneOption; }; types.vendor = enum (attrValues vendors); @@ -499,23 +500,19 @@ rec { apple = { }; pc = { }; knuth = { }; - # Actually matters, unlocking some MinGW-w64-specific options in GCC. See # bottom of https://sourceforge.net/p/mingw-w64/wiki2/Unicode%20apps/ w64 = { }; - none = { }; unknown = { }; }; ################################################################################ - types.openExecFormat = mkOptionType { + types.openExecFormat = { name = "exec-format"; description = "executable container used by the kernel"; - merge = mergeOneOption; }; - types.execFormat = enum (attrValues execFormats); execFormats = setTypes types.openExecFormat { @@ -524,16 +521,14 @@ rec { macho = { }; pe = { }; wasm = { }; - unknown = { }; }; ################################################################################ - types.openKernelFamily = mkOptionType { + types.openKernelFamily = { name = "exec-format"; description = "executable container used by the kernel"; - merge = mergeOneOption; }; types.kernelFamily = enum (attrValues kernelFamilies); @@ -545,12 +540,15 @@ rec { ################################################################################ - types.openKernel = mkOptionType { - name = "kernel"; + types.openKernel = { + name = "open-kernel"; description = "kernel name and information"; - merge = mergeOneOption; - check = - x: types.execFormat.check x.execFormat && all types.kernelFamily.check (attrValues x.families); + verify = + let + verifyExecFormat = types.execFormat.verify; + verifyKernelFamily = types.kernelFamily.verify; + in + v: verifyExecFormat v.execFormat && all verifyKernelFamily (attrValues v.families); }; types.kernel = enum (attrValues kernels); @@ -647,10 +645,9 @@ rec { ################################################################################ - types.openAbi = mkOptionType { + types.openAbi = { name = "abi"; description = "binary interface for compiled code and syscalls"; - merge = mergeOneOption; }; types.abi = enum (attrValues abis); @@ -760,119 +757,138 @@ rec { ################################################################################ - types.parsedPlatform = mkOptionType { + types.parsedPlatform = { name = "system"; description = "fully parsed representation of llvm- or nix-style platform tuple"; - merge = mergeOneOption; - check = + verify = + let + verifyCpu = types.cpuType.verify; + verifyVendor = types.vendor.verify; + verifyKernel = types.kernel.verify; + verifyAbi = types.abi.verify; + in { cpu, vendor, kernel, abi, }: - types.cpuType.check cpu - && types.vendor.check vendor - && types.kernel.check kernel - && types.abi.check abi; + verifyCpu cpu && verifyVendor vendor && verifyKernel kernel && verifyAbi abi; }; - isSystem = isType "system"; + isSystem = v: v._type or null == "system"; mkSystem = + let + inherit (types.parsedPlatform) verify; + in components: - assert types.parsedPlatform.check components; - setType "system" components; + assert verify components; + components + // { + _type = "system"; + }; mkSkeletonFromList = + let + linuxComponents = [ + "eabi" + "eabihf" + "elf" + "gnu" + ]; + appleComponents = [ + "redox" + "mmixware" + "ghcjs" + "mingw32" + "uefi" + ]; + in l: { "1" = - if head l == "avr" then + let + firstComponent = head l; + in + if firstComponent == "avr" then { - cpu = head l; + cpu = firstComponent; kernel = "none"; abi = "unknown"; } else throw "system string '${lib.concatStringsSep "-" l}' with 1 component is ambiguous"; "2" = # We only do 2-part hacks for things Nix already supports - if elemAt l 1 == "cygwin" then + let + secondComponent = elemAt l 1; + in + if secondComponent == "cygwin" then mkSkeletonFromList [ (head l) "pc" - "cygwin" + secondComponent ] # MSVC ought to be the default ABI so this case isn't needed. But then it # becomes difficult to handle the gnu* variants for Aarch32 correctly for # minGW. So it's easier to make gnu* the default for the MinGW, but # hack-in MSVC for the non-MinGW case right here. - else if elemAt l 1 == "windows" then + else if secondComponent == "windows" then { cpu = head l; - kernel = "windows"; + kernel = secondComponent; abi = "msvc"; } - else if (elemAt l 1) == "elf" then + else if secondComponent == "elf" then { cpu = head l; vendor = "unknown"; kernel = "none"; - abi = elemAt l 1; + abi = secondComponent; } else { cpu = head l; - kernel = elemAt l 1; + kernel = secondComponent; }; "3" = + let + secondComponent = elemAt l 1; + thirdComponent = elemAt l 2; + in # cpu-kernel-environment - if - elemAt l 1 == "linux" - || elem (elemAt l 2) [ - "eabi" - "eabihf" - "elf" - "gnu" - ] - then + if secondComponent == "linux" || elem thirdComponent linuxComponents then { cpu = head l; - kernel = elemAt l 1; - abi = elemAt l 2; + kernel = secondComponent; + abi = thirdComponent; vendor = "unknown"; } # cpu-vendor-os else if - elemAt l 1 == "apple" - || elem (elemAt l 2) [ - "redox" - "mmixware" - "ghcjs" - "mingw32" - "uefi" - ] - || hasPrefix "freebsd" (elemAt l 2) - || hasPrefix "netbsd" (elemAt l 2) - || hasPrefix "openbsd" (elemAt l 2) - || hasPrefix "genode" (elemAt l 2) - || hasPrefix "wasm32" (elemAt l 0) + secondComponent == "apple" + || elem thirdComponent appleComponents + || hasPrefix "freebsd" thirdComponent + || hasPrefix "netbsd" thirdComponent + || hasPrefix "openbsd" thirdComponent + || hasPrefix "genode" thirdComponent + || hasPrefix "wasm32" (head l) then { cpu = head l; - vendor = elemAt l 1; + vendor = secondComponent; kernel = - if elemAt l 2 == "mingw32" then + if thirdComponent == "mingw32" then "windows" # autotools breaks on -gnu for window else - elemAt l 2; + thirdComponent; } # lots of tools expect a triplet for Cygwin, even though the vendor is just "pc" - else if elemAt l 2 == "cygwin" then + else if thirdComponent == "cygwin" then { cpu = head l; - vendor = elemAt l 1; - kernel = "cygwin"; + vendor = secondComponent; + kernel = thirdComponent; } else throw "system string '${lib.concatStringsSep "-" l}' with 3 components is ambiguous"; @@ -887,7 +903,17 @@ rec { or (throw "system string '${lib.concatStringsSep "-" l}' has invalid number of hyphen-separated components"); # This should revert the job done by config.guess from the gcc compiler. + # Note: this does _not_ verify that the system is valid + # `mkSystemFromString` is recommended for external use mkSystemFromSkeleton = + let + getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}"); + getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}"); + getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}"); + getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}"); + hasDarwinPrefix = hasPrefix "darwin"; + hasBsdPrefix = hasPrefix "netbsd"; + in { cpu, # Optional, but fallback too complex for here. @@ -902,11 +928,6 @@ rec { null, }@args: let - getCpu = name: cpuTypes.${name} or (throw "Unknown CPU type: ${name}"); - getVendor = name: vendors.${name} or (throw "Unknown vendor: ${name}"); - getKernel = name: kernels.${name} or (throw "Unknown kernel: ${name}"); - getAbi = name: abis.${name} or (throw "Unknown ABI: ${name}"); - parsed = { cpu = getCpu args.cpu; vendor = @@ -919,10 +940,10 @@ rec { else vendors.unknown; kernel = - if hasPrefix "darwin" args.kernel then - getKernel "darwin" - else if hasPrefix "netbsd" args.kernel then - getKernel "netbsd" + if hasDarwinPrefix args.kernel then + kernels.darwin + else if hasBsdPrefix args.kernel then + kernels.netbsd else getKernel (removeAbiSuffix args.kernel); abi = @@ -941,11 +962,12 @@ rec { }; in - mkSystem parsed; + parsed; - mkSystemFromString = s: mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s)); + mkSystemFromString = s: mkSystem (mkSystemFromSkeleton (mkSkeletonFromList (splitString "-" s))); - kernelName = kernel: kernel.name + toString (kernel.version or ""); + kernelName = + kernel: if kernel ? version then kernel.name + toString kernel.version else kernel.name; darwinArch = cpu: if cpu.name == "aarch64" then "arm64" else cpu.name; diff --git a/lib/systems/rustc-target-env.nix b/lib/systems/rustc-target-env.nix new file mode 100644 index 000000000000..a0bb0b66dc9c --- /dev/null +++ b/lib/systems/rustc-target-env.nix @@ -0,0 +1,160 @@ +# As of rustc 1.96.0. Empty `target_env` values are omitted. +# +# Generation script: +# #!/bin/bash +# rustc --print target-list | while read -r target ; do +# env=$(rustc --print cfg --target "$target" | grep '^target_env=' | sed 's/# ^target_env="//;s/"$//') +# [[ -z "$env" ]] && continue +# printf ' %s = "%s";\n' "$target" "$env" +# done +{ + aarch64-apple-ios-macabi = "macabi"; + aarch64-apple-ios-sim = "sim"; + aarch64-apple-tvos-sim = "sim"; + aarch64-apple-visionos-sim = "sim"; + aarch64-apple-watchos-sim = "sim"; + aarch64-pc-windows-gnullvm = "gnu"; + aarch64-pc-windows-msvc = "msvc"; + aarch64-unknown-linux-gnu = "gnu"; + aarch64-unknown-linux-gnu_ilp32 = "gnu"; + aarch64-unknown-linux-musl = "musl"; + aarch64-unknown-linux-ohos = "ohos"; + aarch64-unknown-managarm-mlibc = "mlibc"; + aarch64-unknown-nto-qnx700 = "nto70"; + aarch64-unknown-nto-qnx710 = "nto71"; + aarch64-unknown-nto-qnx710_iosock = "nto71_iosock"; + aarch64-unknown-nto-qnx800 = "nto80"; + aarch64-unknown-redox = "relibc"; + aarch64-uwp-windows-msvc = "msvc"; + aarch64-wrs-vxworks = "gnu"; + aarch64_be-unknown-linux-gnu = "gnu"; + aarch64_be-unknown-linux-gnu_ilp32 = "gnu"; + aarch64_be-unknown-linux-musl = "musl"; + arm-unknown-linux-gnueabi = "gnu"; + arm-unknown-linux-gnueabihf = "gnu"; + arm-unknown-linux-musleabi = "musl"; + arm-unknown-linux-musleabihf = "musl"; + arm64ec-pc-windows-msvc = "msvc"; + armeb-unknown-linux-gnueabi = "gnu"; + armv4t-unknown-linux-gnueabi = "gnu"; + armv5te-unknown-linux-gnueabi = "gnu"; + armv5te-unknown-linux-musleabi = "musl"; + armv5te-unknown-linux-uclibceabi = "uclibc"; + armv6k-nintendo-3ds = "newlib"; + armv7-rtems-eabihf = "newlib"; + armv7-sony-vita-newlibeabihf = "newlib"; + armv7-unknown-linux-gnueabi = "gnu"; + armv7-unknown-linux-gnueabihf = "gnu"; + armv7-unknown-linux-musleabi = "musl"; + armv7-unknown-linux-musleabihf = "musl"; + armv7-unknown-linux-ohos = "ohos"; + armv7-unknown-linux-uclibceabi = "uclibc"; + armv7-unknown-linux-uclibceabihf = "uclibc"; + armv7-wrs-vxworks-eabihf = "gnu"; + armv7a-vex-v5 = "v5"; + csky-unknown-linux-gnuabiv2 = "gnu"; + csky-unknown-linux-gnuabiv2hf = "gnu"; + hexagon-unknown-linux-musl = "musl"; + i386-apple-ios = "sim"; + i586-unknown-linux-gnu = "gnu"; + i586-unknown-linux-musl = "musl"; + i586-unknown-redox = "relibc"; + i686-pc-nto-qnx700 = "nto70"; + i686-pc-windows-gnu = "gnu"; + i686-pc-windows-gnullvm = "gnu"; + i686-pc-windows-msvc = "msvc"; + i686-unknown-hurd-gnu = "gnu"; + i686-unknown-linux-gnu = "gnu"; + i686-unknown-linux-musl = "musl"; + i686-uwp-windows-gnu = "gnu"; + i686-uwp-windows-msvc = "msvc"; + i686-win7-windows-gnu = "gnu"; + i686-win7-windows-msvc = "msvc"; + i686-wrs-vxworks = "gnu"; + loongarch64-unknown-linux-gnu = "gnu"; + loongarch64-unknown-linux-musl = "musl"; + loongarch64-unknown-linux-ohos = "ohos"; + m68k-unknown-linux-gnu = "gnu"; + mips-unknown-linux-gnu = "gnu"; + mips-unknown-linux-musl = "musl"; + mips-unknown-linux-uclibc = "uclibc"; + mips64-openwrt-linux-musl = "musl"; + mips64-unknown-linux-gnuabi64 = "gnu"; + mips64-unknown-linux-muslabi64 = "musl"; + mips64el-unknown-linux-gnuabi64 = "gnu"; + mips64el-unknown-linux-muslabi64 = "musl"; + mipsel-unknown-linux-gnu = "gnu"; + mipsel-unknown-linux-musl = "musl"; + mipsel-unknown-linux-uclibc = "uclibc"; + mipsisa32r6-unknown-linux-gnu = "gnu"; + mipsisa32r6el-unknown-linux-gnu = "gnu"; + mipsisa64r6-unknown-linux-gnuabi64 = "gnu"; + mipsisa64r6el-unknown-linux-gnuabi64 = "gnu"; + powerpc-unknown-linux-gnu = "gnu"; + powerpc-unknown-linux-gnuspe = "gnu"; + powerpc-unknown-linux-musl = "musl"; + powerpc-unknown-linux-muslspe = "musl"; + powerpc-wrs-vxworks = "gnu"; + powerpc-wrs-vxworks-spe = "gnu"; + powerpc64-unknown-linux-gnu = "gnu"; + powerpc64-unknown-linux-musl = "musl"; + powerpc64-wrs-vxworks = "gnu"; + powerpc64le-unknown-linux-gnu = "gnu"; + powerpc64le-unknown-linux-musl = "musl"; + riscv32-wrs-vxworks = "gnu"; + riscv32gc-unknown-linux-gnu = "gnu"; + riscv32gc-unknown-linux-musl = "musl"; + riscv32imac-esp-espidf = "newlib"; + riscv32imafc-esp-espidf = "newlib"; + riscv32imc-esp-espidf = "newlib"; + riscv64-wrs-vxworks = "gnu"; + riscv64a23-unknown-linux-gnu = "gnu"; + riscv64gc-unknown-linux-gnu = "gnu"; + riscv64gc-unknown-linux-musl = "musl"; + riscv64gc-unknown-managarm-mlibc = "mlibc"; + riscv64gc-unknown-redox = "relibc"; + s390x-unknown-linux-gnu = "gnu"; + s390x-unknown-linux-musl = "musl"; + sparc-unknown-linux-gnu = "gnu"; + sparc64-unknown-linux-gnu = "gnu"; + thumbv7a-pc-windows-msvc = "msvc"; + thumbv7a-uwp-windows-msvc = "msvc"; + thumbv7neon-unknown-linux-gnueabihf = "gnu"; + thumbv7neon-unknown-linux-musleabihf = "musl"; + wasm32-wali-linux-musl = "musl"; + wasm32-wasip1 = "p1"; + wasm32-wasip1-threads = "p1"; + wasm32-wasip2 = "p2"; + wasm32-wasip3 = "p3"; + x86_64-apple-ios = "sim"; + x86_64-apple-ios-macabi = "macabi"; + x86_64-apple-tvos = "sim"; + x86_64-apple-watchos-sim = "sim"; + x86_64-fortanix-unknown-sgx = "sgx"; + x86_64-pc-nto-qnx710 = "nto71"; + x86_64-pc-nto-qnx710_iosock = "nto71_iosock"; + x86_64-pc-nto-qnx800 = "nto80"; + x86_64-pc-windows-gnu = "gnu"; + x86_64-pc-windows-gnullvm = "gnu"; + x86_64-pc-windows-msvc = "msvc"; + x86_64-unikraft-linux-musl = "musl"; + x86_64-unknown-hurd-gnu = "gnu"; + x86_64-unknown-l4re-uclibc = "uclibc"; + x86_64-unknown-linux-gnu = "gnu"; + x86_64-unknown-linux-gnuasan = "gnu"; + x86_64-unknown-linux-gnumsan = "gnu"; + x86_64-unknown-linux-gnutsan = "gnu"; + x86_64-unknown-linux-gnux32 = "gnu"; + x86_64-unknown-linux-musl = "musl"; + x86_64-unknown-linux-ohos = "ohos"; + x86_64-unknown-managarm-mlibc = "mlibc"; + x86_64-unknown-redox = "relibc"; + x86_64-uwp-windows-gnu = "gnu"; + x86_64-uwp-windows-msvc = "msvc"; + x86_64-win7-windows-gnu = "gnu"; + x86_64-win7-windows-msvc = "msvc"; + x86_64-wrs-vxworks = "gnu"; + xtensa-esp32-espidf = "newlib"; + xtensa-esp32s2-espidf = "newlib"; + xtensa-esp32s3-espidf = "newlib"; +} diff --git a/lib/tests/misc.nix b/lib/tests/misc.nix index 021a7eca25b8..4223f517b839 100644 --- a/lib/tests/misc.nix +++ b/lib/tests/misc.nix @@ -2164,6 +2164,21 @@ runTests { }; }; + testConcatMapAttrsDuplicates = { + expr = + concatMapAttrs + (name: value: { + final = value; + }) + { + a = 1; + b = 2; + }; + expected = { + final = 2; + }; + }; + testFilterAttrs = { expr = filterAttrs (n: v: n != "a" && (v.hello or false) == true) { a.hello = true; @@ -4672,7 +4687,7 @@ runTests { }; testPlatformMatchNoMatch = { - expr = meta.platformMatch { system = "x86_64-darwin"; } "x86_64-linux"; + expr = meta.platformMatch { system = "x86_64-freebsd"; } "x86_64-linux"; expected = false; }; diff --git a/lib/tests/modules/types-attrTag.nix b/lib/tests/modules/types-attrTag.nix index d48badae391f..167f839c027c 100644 --- a/lib/tests/modules/types-attrTag.nix +++ b/lib/tests/modules/types-attrTag.nix @@ -120,7 +120,17 @@ in assert config.merged.positive == { yay = 100; }; assert config.merged.extensi-foo == { extensible = "foo"; }; assert config.merged.extensi-bar == { extensible = "bar"; }; + assert config.docs."submodules..foo.bar".declarations == [ __curPos.file ]; assert config.docs."submodules..foo.bar".type == "signed integer"; + assert + lib.length + (options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ]) + .bar.declarationPositions == 1; + assert + (lib.head + (options.submodules.type.nestedTypes.elemType.nestedTypes.foo.type.getSubOptions [ ]) + .bar.declarationPositions + ).file == __curPos.file; assert config.docs."submodules..qux".type == "string"; assert config.docs."submodules..qux".declarations == [ __curPos.file ]; assert @@ -133,8 +143,11 @@ in assert config.docs."submodules..qux".description == "A qux for when you don't want a foo"; assert config.docs."submodules..qux".readOnly == false; assert config.docs."submodules..qux".visible == true; - # Not available (yet?) - # assert config.docs."submodules..qux".declarationsWithPositions == [ ... ]; + assert + lib.length options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions == 1; + assert + (lib.head options.submodules.type.nestedTypes.elemType.nestedTypes.qux.declarationPositions).file + == __curPos.file; assert options.submodules.declarations == [ __curPos.file ]; assert lib.length options.submodules.declarationPositions == 1; assert (lib.head options.submodules.declarationPositions).file == __curPos.file; diff --git a/lib/tests/release.nix b/lib/tests/release.nix index 54d62f87b3d5..280c88cee66b 100644 --- a/lib/tests/release.nix +++ b/lib/tests/release.nix @@ -9,7 +9,6 @@ pkgsBB ? pkgs.pkgsBuildBuild, nix ? pkgs-nixVersions.stable, nixVersions ? [ - pkgs-nixVersions.nix_2_28 nix pkgs-nixVersions.latest ], diff --git a/lib/tests/systems.nix b/lib/tests/systems.nix index 3feef87d97c0..a27861b09253 100644 --- a/lib/tests/systems.nix +++ b/lib/tests/systems.nix @@ -127,7 +127,6 @@ lib.runTests ( ]; testx86_64 = mseteq x86_64 [ "x86_64-linux" - "x86_64-darwin" "x86_64-freebsd" "x86_64-genode" "x86_64-redox" @@ -145,7 +144,6 @@ lib.runTests ( "x86_64-cygwin" ]; testdarwin = mseteq darwin [ - "x86_64-darwin" "aarch64-darwin" ]; testfreebsd = mseteq freebsd [ @@ -215,6 +213,22 @@ lib.runTests ( }) // { + test_platforms_pass_typecheck = { + # To improve performance, the result of parsing all 70+ systems in + # `lib.platforms` into their attrset representations aren't typechecked. + # The results are expected to be constant, and avoiding the slow + # validation gives a meaningful improvement to evaluation speed. We ensure + # that all systems pass validation here + expr = builtins.filter ( + system: + let + evalResult = builtins.tryEval (lib.systems.parse.mkSystemFromString system); + in + evalResult.success == false + ) lib.platforms.all; + + expected = [ ]; + }; test_equals_example_x86_64-linux = { expr = lib.systems.equals (lib.systems.elaborate "x86_64-linux") ( lib.systems.elaborate "x86_64-linux" diff --git a/lib/trivial.nix b/lib/trivial.nix index 9f0f5daf1332..9288a9e1b1db 100644 --- a/lib/trivial.nix +++ b/lib/trivial.nix @@ -474,7 +474,7 @@ in */ oldestSupportedRelease = # Update on master only. Do not backport. - 2511; + 2605; /** Whether a feature is supported in all supported releases (at the time of diff --git a/lib/types.nix b/lib/types.nix index f9ae3c82a172..8ed7bec21713 100644 --- a/lib/types.nix +++ b/lib/types.nix @@ -21,7 +21,6 @@ let isString substring sort - throwIf toDerivation toList types @@ -408,7 +407,7 @@ rec { betweenDesc = lowest: highest: "${toString lowest} and ${toString highest} (both inclusive)"; between = lowest: highest: - assert lib.assertMsg (lowest <= highest) "ints.between: lowest must be smaller than highest"; + assert lowest <= highest || throw "ints.between: lowest must be smaller than highest"; addCheck int (x: x >= lowest && x <= highest) // { name = "intBetween"; @@ -495,7 +494,7 @@ rec { { between = lowest: highest: - assert lib.assertMsg (lowest <= highest) "numbers.between: lowest must be smaller than highest"; + assert lowest <= highest || throw "numbers.between: lowest must be smaller than highest"; addCheck number (x: x >= lowest && x <= highest) // { name = "numberBetween"; @@ -660,10 +659,10 @@ rec { inStore ? null, absolute ? null, }: - throwIf (inStore != null && absolute != null && inStore && !absolute) - "In pathWith, inStore means the path must be absolute" - mkOptionType - { + if inStore != null && absolute != null && inStore && !absolute then + throw "In pathWith, inStore means the path must be absolute" + else + mkOptionType { name = "path"; description = ( (if absolute == null then "" else (if absolute then "absolute " else "relative ")) @@ -1079,8 +1078,8 @@ rec { builtins.addErrorContext "while checking that attrTag tag ${lib.strings.escapeNixIdentifier n} is an option with a type${inAttrPosSuffix tags_ n}" ( - throwIf (opt._type or null != "option") - "In attrTag, each tag value must be an option, but tag ${lib.strings.escapeNixIdentifier n} ${ + if opt._type or null != "option" then + throw "In attrTag, each tag value must be an option, but tag ${lib.strings.escapeNixIdentifier n} ${ if opt ? _type then if opt._type == "option-type" then "was a bare type, not wrapped in mkOption." @@ -1089,23 +1088,24 @@ rec { else "was not." }" + else opt - // { - declarations = - opt.declarations or ( - let - pos = builtins.unsafeGetAttrPos n tags_; - in - if pos == null then [ ] else [ pos.file ] - ); - declarationPositions = - opt.declarationPositions or ( - let - pos = builtins.unsafeGetAttrPos n tags_; - in - if pos == null then [ ] else [ pos ] - ); - } + // { + declarations = + opt.declarations or ( + let + pos = builtins.unsafeGetAttrPos n tags_; + in + if pos == null then [ ] else [ pos.file ] + ); + declarationPositions = + opt.declarationPositions or ( + let + pos = builtins.unsafeGetAttrPos n tags_; + in + if pos == null then [ ] else [ pos ] + ); + } ) ) tags_; choicesStr = concatMapStringsSep ", " lib.strings.escapeNixIdentifier (attrNames tags); @@ -1140,6 +1140,27 @@ rec { else throw "The option `${showOption loc}` is defined as ${lib.strings.escapeNixIdentifier choice}, but ${lib.strings.escapeNixIdentifier choice} is not among the valid choices (${choicesStr}). Value ${choice} was defined in ${showFiles (getFiles defs)}."; nestedTypes = tags; + getSubModules = + let + tagsWithSubModules = filterAttrs (_: mods: mods != null) ( + mapAttrs (_: opt: opt.type.getSubModules) tags + ); + in + if tagsWithSubModules == { } then null else [ tagsWithSubModules ]; + substSubModules = + allWrappedModules: + let + tagsWithNewTypes = zipAttrsWith (tag: tags.${tag}.type.substSubModules) ( + concatMap ( + { _file, imports }: map (mapAttrs (_: imports: { inherit _file imports; })) imports + ) allWrappedModules + ); + in + attrTag ( + mapAttrs ( + tag: opt: opt // (optionalAttrs (tagsWithNewTypes ? ${tag}) { type = tagsWithNewTypes.${tag}; }) + ) tags + ); functor = defaultFunctor "attrTag" // { type = { tags, ... }: lib.types.attrTag tags; payload = { inherit tags; }; @@ -1728,9 +1749,9 @@ rec { # converted to `finalType` using `coerceFunc`. coercedTo = coercedType: coerceFunc: finalType: - assert lib.assertMsg ( + assert coercedType.getSubModules == null - ) "coercedTo: coercedType must not have submodules (it’s a ${coercedType.description})"; + || throw "coercedTo: coercedType must not have submodules (it’s a ${coercedType.description})"; mkOptionType rec { name = "coercedTo"; description = "${optionDescriptionPhrase (class: class == "noun") finalType} or ${ diff --git a/maintainers/README.md b/maintainers/README.md index 4c3e5cff9c2a..4959e6aa5892 100644 --- a/maintainers/README.md +++ b/maintainers/README.md @@ -160,7 +160,7 @@ Once approved, the team will have the right privileges to be pinged and requeste > [!TIP] > The team name should be as short as possible; because it is nested under the maintainers group, no -maintainers suffix is needed. -After the first [weekly team sync](../.github/workflows/team-sync.yml) with the new team, it's then also possible to link it to the entry in `team-list.nix` by setting its `github` field to the GitHub team name. +After the first [weekly team sync](../.github/workflows/teams.yml) with the new team, it's then also possible to link it to the entry in `team-list.nix` by setting its `github` field to the GitHub team name. # Maintainer scripts diff --git a/maintainers/github-teams.json b/maintainers/github-teams.json index 9a9fc155a52c..8c1abf72ed9e 100644 --- a/maintainers/github-teams.json +++ b/maintainers/github-teams.json @@ -43,12 +43,9 @@ "id": 5468470, "maintainers": {}, "members": { - "aherrmann": 732652, "avdv": 3471749, - "ethercrow": 222467, "groodt": 343415, - "kalbasit": 87115, - "mboes": 51356 + "kalbasit": 87115 }, "name": "Bazel" }, @@ -128,7 +125,6 @@ "Pandapip1": 45835846, "a-kenji": 65275785, "drakon64": 6444703, - "michaelBelsanti": 62124625, "thefossguy": 44400303 }, "name": "COSMIC" @@ -155,6 +151,7 @@ "samuela": 226872 }, "members": { + "ethancedwards8": 60861925, "prusnak": 42201 }, "name": "cuda-maintainers" @@ -182,11 +179,12 @@ "members": { "0xMRTT": 105598867, "21CSM": 81891917, + "4evy": 57304299, "Aleksanaa": 42209822, + "Br1ght0ne": 12615679, "CorbanR": 1918683, "Emin017": 99674037, "Et7f3": 29592775, - "FlameFlag": 57304299, "Guanran928": 68757440, "LnL7": 689294, "Mastermindaxe": 33257997, @@ -368,10 +366,10 @@ "freedesktop": { "description": "Maintain Freedesktop.org packages for graphical desktop.", "id": 3806136, - "maintainers": {}, - "members": { + "maintainers": { "jtojnar": 705123 }, + "members": {}, "name": "Freedesktop" }, "geospatial": { @@ -414,6 +412,18 @@ }, "name": "GNOME" }, + "gnome-circle": { + "description": "Maintain GNOME Circle applications.", + "id": 18234720, + "maintainers": { + "Aleksanaa": 42209822, + "Hythera": 87016780, + "getchoo": 48872998, + "michaelgrahamevans": 5932424 + }, + "members": {}, + "name": "GNOME Circle" + }, "golang": { "description": "Maintain Golang compilers", "id": 4020424, @@ -560,8 +570,7 @@ "members": { "Ericson2314": 1055245, "peterwaller-arm": 52030119, - "rrbutani": 7833358, - "sternenseemann": 3154475 + "rrbutani": 7833358 }, "name": "LLVM" }, @@ -847,6 +856,18 @@ }, "name": "Radicle" }, + "redis": { + "description": "Maintain Redis, related packages, module, and tests.", + "id": 17932473, + "maintainers": { + "Hythera": 87016780, + "MiniHarinn": 52773156, + "debtquity": 225436867, + "kybe236": 118068228 + }, + "members": {}, + "name": "Redis" + }, "reproducible": { "description": "Team that is interested in reproducible builds", "id": 7625643, @@ -930,11 +951,11 @@ "description": "Reviews changes to core packages for Nixpkgs security vulnerabilities: https://github.com/NixOS/nixpkgs/issues/494349", "id": 16430758, "maintainers": { - "balsoft": 18467667, - "infinisil": 20525370 + "balsoft": 18467667 }, "members": { "andir": 638836, + "leona-ya": 11006031, "pyrox0": 35778371 }, "name": "Security review" @@ -989,6 +1010,17 @@ }, "name": "systemd" }, + "test-driver": { + "description": "Maintain the NixOS integration test driver.", + "id": 18201265, + "maintainers": { + "Ma27": 6025220, + "kmein": 10352507, + "tfc": 29044 + }, + "members": {}, + "name": "test-driver" + }, "xen-project": { "description": "Maintain the Xen Project Hypervisor and the related tooling ecosystem. Members listed as \"Maintainers\" are recipients of Xen Security Advisories sent to xsa@nixos.org.", "id": 11127725, diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 98a3cbacd816..c82bed9ae9a0 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -93,6 +93,11 @@ github = "0x120581f"; githubId = 130835755; }; + _0x2B = { + name = "0x2B"; + github = "0x2B-bin"; + githubId = 49249957; + }; _0x3f = { name = "0x3f"; github = "0x3fiona"; @@ -157,17 +162,18 @@ githubId = 105598867; matrix = "@0xmrtt:envs.net"; }; + _0xSA7 = { + name = "Saleh Diaa Ahmed"; + github = "0xSA7"; + githubId = 109046494; + email = "salehdiaaahmed@gmail.com"; + }; _1000101 = { email = "b1000101@pm.me"; github = "1000101"; githubId = 791309; name = "Jan Hrnko"; }; - _1000teslas = { - name = "Kevin Tran"; - github = "sledgehammervampire"; - githubId = 47207223; - }; _13621 = { name = "13621"; github = "13621"; @@ -208,6 +214,17 @@ github = "2hexed"; githubId = 54501296; }; + _2zqa = { + name = "Marijn Kok"; + email = "hkju4b4ds@mozmail.com"; + github = "2zqa"; + githubId = 25235249; + }; + _30350n = { + name = "Max Schlecht"; + github = "30350n"; + githubId = 34186858; + }; _360ied = { name = "Brian Zhu"; email = "therealbarryplayer@gmail.com"; @@ -250,6 +267,12 @@ githubId = 3417013; name = "Eske Nielsen"; }; + _4evy = { + name = "4evy"; + email = "git@evy.pink"; + github = "4evy"; + githubId = 57304299; + }; _4r7if3x = { email = "the.artifex@proton.me"; matrix = "@4r7if3x:matrix.org"; @@ -283,6 +306,14 @@ githubId = 92977828; name = "Mori Zen"; }; + _74k1 = { + email = "git.t@betsumei.com"; + github = "74k1"; + githubId = 49000471; + keys = [ { fingerprint = "46F3 422F 63A3 1369 7EAB 83D5 1CF1 55F7 6F21 3503"; } ]; + matrix = "@74k1:matrix.org"; + name = "Tim"; + }; _7591yj = { email = "yeongjin.kim@proton.me"; github = "7591yj"; @@ -329,12 +360,6 @@ githubId = 381298; name = "9R"; }; - _9yokuro = { - email = "xzstd099@protonmail.com"; - github = "9yokuro"; - githubId = 119095935; - name = "9yokuro"; - }; a-camarillo = { name = "Anthony Camarillo"; email = "anthony.camarillo.96@gmail.com"; @@ -398,8 +423,8 @@ }; aaravrav = { name = "aaravrav"; - github = "Aarav"; - githubId = 3279912; + github = "aaravrav"; + githubId = 37036762; }; aarnphm = { email = "contact@aarnphm.xyz"; @@ -591,6 +616,12 @@ { fingerprint = "CE85 54F7 B9BC AC0D D648 5661 AB5F C04C 3C94 443F"; } ]; }; + ad030 = { + name = "Alex Dam"; + github = "ad030"; + githubId = 68517956; + email = "work.a.dam.030@proton.me"; + }; adam-tj = { github = "adam-tj"; githubId = 9314405; @@ -764,12 +795,6 @@ githubId = 168; name = "Alexander Flatter"; }; - afldcr = { - email = "alex@fldcr.com"; - github = "afldcr"; - githubId = 335271; - name = "James Alexander Feldman-Crough"; - }; afontain = { email = "afontain@posteo.net"; github = "necessarily-equal"; @@ -807,6 +832,12 @@ github = "aftix"; githubId = 4008299; }; + agarmu = { + name = "Mukul Agarwal"; + email = "vcs@agarmu.com"; + github = "agarmu"; + githubId = 55563106; + }; agbrooks = { email = "andrewgrantbrooks@gmail.com"; github = "agbrooks"; @@ -838,12 +869,6 @@ githubId = 207841739; name = "Savchenko Dmitriy"; }; - aherrmann = { - email = "andreash87@gmx.ch"; - github = "aherrmann"; - githubId = 732652; - name = "Andreas Herrmann"; - }; ahirner = { email = "a.hirner+nixpkgs@gmail.com"; github = "ahirner"; @@ -875,6 +900,12 @@ matrix = "aiya:catgirl.cloud"; name = "aiya"; }; + aietes = { + email = "stefan@standa.de"; + github = "Aietes"; + githubId = 5823770; + name = "Stefan Krüger"; + }; aij = { email = "aij+git@mrph.org"; github = "aij"; @@ -1263,6 +1294,12 @@ name = "Alexandru Tocar"; keys = [ { fingerprint = "B617 DD24 3AB0 2E3F 2E67 DBFD 1305 2A85 D7A4 2AA4"; } ]; }; + AlexAntonik = { + email = "antonikavv@gmail.com"; + github = "AlexAntonik"; + githubId = 55547934; + name = "Alex Antonik"; + }; alexarice = { email = "alexrice999@hotmail.co.uk"; github = "alexarice"; @@ -1463,6 +1500,12 @@ githubId = 60479013; name = "Alma Cemerlic"; }; + aln730 = { + email = "arnsg730@proton.me"; + github = "aln730"; + githubId = 94751172; + name = "AGawas"; + }; Alper-Celik = { email = "alper@alper-celik.dev"; name = "Alper Çelik"; @@ -1560,6 +1603,12 @@ githubId = 153175; name = "Andrew Marshall"; }; + ambiso = { + email = "ambisotopy@gmail.com"; + github = "ambiso"; + githubId = 3750466; + name = "Robin Leander Schröder"; + }; ambossmann = { email = "timogottszky+git@gmail.com"; github = "Ambossmann"; @@ -1603,12 +1652,6 @@ githubId = 382798; name = "amfl"; }; - amiddelk = { - email = "amiddelk@gmail.com"; - github = "amiddelk"; - githubId = 1358320; - name = "Arie Middelkoop"; - }; aminechikhaoui = { email = "amine.chikhaoui91@gmail.com"; github = "AmineChikhaoui"; @@ -1893,12 +1936,6 @@ githubId = 750786; name = "Justin Wood"; }; - anmonteiro = { - email = "anmonteiro@gmail.com"; - github = "anmonteiro"; - githubId = 661909; - name = "Antonio Nuno Monteiro"; - }; anna328p = { email = "anna328p@gmail.com"; github = "anna328p"; @@ -1912,11 +1949,28 @@ githubId = 81317317; name = "Anna Aurora"; }; + anned20 = { + email = "annedouwe@bouma.tech"; + github = "anned20"; + githubId = 6921250; + name = "Anne Douwe Bouma"; + }; anninzy = { github = "anninzy"; githubId = 143312793; name = "Annin"; }; + anntnzrb = { + github = "anntnzrb"; + githubId = 51257127; + name = "anntnzrb"; + }; + anntoin = { + email = "anntoin@gmail.com"; + github = "Anntoin"; + githubId = 3289027; + name = "Anntóin Wilkinson"; + }; anoa = { matrix = "@andrewm:amorgan.xyz"; email = "andrew@amorgan.xyz"; @@ -1976,6 +2030,12 @@ githubId = 14838767; name = "Jacopo Scannella"; }; + antoineco = { + email = "hello@acotten.com"; + github = "antoineco"; + githubId = 3299086; + name = "Antoine Cotten"; + }; anton-4 = { name = "Anton"; github = "Anton-4"; @@ -2674,6 +2734,11 @@ githubId = 574938; name = "Jonathan Glines"; }; + auscaster = { + github = "auscaster"; + githubId = 100876; + name = "Kam Low"; + }; auscyber = { email = "ivyp@outlook.com.au"; github = "auscyber"; @@ -2867,7 +2932,7 @@ azahi = { name = "Azat Bahawi"; email = "azat@bahawi.net"; - matrix = "@azahi:azahi.cc"; + matrix = "@azahi:matrix.org"; github = "azahi"; githubId = 22211000; keys = [ { fingerprint = "2688 0377 C31D 9E81 9BDF 83A8 C8C6 BDDB 3847 F72B"; } ]; @@ -3099,6 +3164,12 @@ githubId = 75235; name = "Michael Walker"; }; + barsikus007 = { + name = "barsikus007"; + email = "barsikus07@gmail.com"; + github = "barsikus007"; + githubId = 37113583; + }; bartoostveen = { name = "Bart Oostveen"; github = "bartoostveen"; @@ -3133,7 +3204,10 @@ email = "bastian@asmussen.tech"; github = "BastianAsmussen"; githubId = 76102128; - keys = [ { fingerprint = "3B11 7469 0893 85E7 16C2 7CD9 0FE5 A355 DBC9 2568"; } ]; + keys = [ + { fingerprint = "3B11 7469 0893 85E7 16C2 7CD9 0FE5 A355 DBC9 2568"; } + { fingerprint = "220D 68EC DF94 20EE 1E6C B215 D92D 668B 77A2 9897"; } + ]; }; basvandijk = { email = "v.dijk.bas@gmail.com"; @@ -3362,6 +3436,13 @@ githubId = 4313548; name = "Ben Sparks"; }; + benhaskins = { + name = "Ben Haskins"; + email = "ben.haskins@spang.co.uk"; + github = "benhaskins"; + githubId = 179679961; + keys = [ { fingerprint = "bnYZE0VGodlVwh/eUlqGQsAHeSE0hBPbo2EN2LrGu0M"; } ]; + }; benhiemer = { name = "Benedikt Hiemer"; email = "ben.email@posteo.de"; @@ -3444,12 +3525,6 @@ githubId = 20448408; keys = [ { fingerprint = "D446 E58D 87A0 31C7 EC15 88D7 B461 2924 45C6 E696"; } ]; }; - berce = { - email = "bert.moens@gmail.com"; - github = "berce"; - githubId = 10439709; - name = "Bert Moens"; - }; bergey = { email = "bergey@teallabs.org"; github = "bergey"; @@ -3947,6 +4022,19 @@ githubId = 140968250; keys = [ { fingerprint = "8321 ED3A 8DB9 99A5 1F3B F80F F268 2914 EA42 DE26"; } ]; }; + bpmct = { + name = "Ben Potter"; + email = "ben@coder.com"; + github = "bpmct"; + githubId = 22407953; + }; + Br1ght0ne = { + name = "Oleksii Filonenko"; + email = "nixpkgs@brightone.cloud"; + matrix = "@br1ght0ne:matrix.org"; + github = "Br1ght0ne"; + githubId = 12615679; + }; br337 = { email = "brian.porumb@proton.me"; github = "br337"; @@ -4103,6 +4191,12 @@ github = "brittonr"; githubId = 4730485; }; + BrockoliniMorgan = { + name = "Brock Morgan"; + email = "brockjamesmorgan@gmail.com"; + github = "BrockoliniMorgan"; + githubId = 166275321; + }; brodes = { email = "me@brod.es"; github = "brhoades"; @@ -4197,6 +4291,13 @@ githubId = 18356186; name = "Gabriela Moreira"; }; + buggymcbugfix = { + email = "nix@vilem.net"; + github = "buggymcbugfix"; + matrix = "@buggymcbugfix:matrix.org"; + githubId = 17603372; + name = "Vilem Liepelt"; + }; bugworm = { email = "bugworm@zoho.com"; github = "bugworm"; @@ -4371,6 +4472,12 @@ { fingerprint = "8916 F727 734E 77AB 437F A33A 19AB 76F5 CEE1 1392"; } ]; }; + caguiclajmg = { + email = "jmg.caguicla@guarandoo.me"; + github = "caguiclajmg"; + githubId = 32662060; + name = "John Mark Gabriel Caguicla"; + }; CaiqueFigueiredo = { email = "public@caiquefigueiredo.me"; github = "caiquefigueiredo"; @@ -4383,6 +4490,13 @@ githubId = 48105979; name = "Caitlin Davitt"; }; + cakeforcat = { + email = "julia@cakeforcat.dev"; + github = "cakeforcat"; + githubId = 37912991; + name = "Julia Czarny"; + matrix = "@cakeforcat:matrix.org"; + }; calavera = { email = "david.calavera@gmail.com"; github = "calavera"; @@ -4445,12 +4559,6 @@ githubId = 54632731; name = "Cameron Dugan"; }; - cameronfyfe = { - email = "cameron.j.fyfe@gmail.com"; - github = "cameronfyfe"; - githubId = 21013281; - name = "Cameron Fyfe"; - }; cameronnemo = { email = "cnemo@tutanota.com"; github = "CameronNemo"; @@ -4583,6 +4691,19 @@ githubId = 53847249; name = "Casey Avila"; }; + caspersonn = { + email = "lucakasper8@gmail.com"; + github = "Caspersonn"; + githubId = 96787412; + name = "Luca Kasper"; + }; + cassandracomar = { + name = "Cassandra Comar"; + github = "cassandracomar"; + githubId = 320772; + email = "cass@mountclare.net"; + keys = [ { fingerprint = "104E E74E 24A0 372B EAF5 5533 B019 18F7 7E04 AC99"; } ]; + }; castorNova2 = { email = "solemnsquire@gmail.com"; github = "castorNova2"; @@ -4662,12 +4783,6 @@ githubId = 52760912; name = "Cameron Brown"; }; - ccellado = { - email = "annplague@gmail.com"; - github = "ccellado"; - githubId = 44584960; - name = "Denis Khalmatov"; - }; ccicnce113424 = { email = "ccicnce113424@gmail.com"; matrix = "@ccicnce113424:matrix.org"; @@ -4744,12 +4859,6 @@ githubId = 32384814; name = "Nikita Mitasov"; }; - chaduffy = { - email = "charles@dyfis.net"; - github = "charles-dyfis-net"; - githubId = 22370; - name = "Charles Duffy"; - }; changlinli = { email = "mail@changlinli.com"; github = "changlinli"; @@ -5157,6 +5266,12 @@ githubId = 1448923; name = "Christian Kauhaus"; }; + ckgxrg = { + email = "ckgxrg@ckgxrg.io"; + github = "ckgxrg-salt"; + githubId = 165614491; + name = "ckgxrg"; + }; cko = { email = "christine.koppelt@gmail.com"; github = "cko"; @@ -5273,13 +5388,6 @@ githubId = 3392199; name = "Calum MacRae"; }; - cmars = { - email = "nix@cmars.tech"; - github = "cmars"; - githubId = 23741; - name = "Casey Marshall"; - keys = [ { fingerprint = "6B78 7E5F B493 FA4F D009 5D10 6DEC 2758 ACD5 A973"; } ]; - }; cmcdragonkai = { email = "roger.qiu@matrix.ai"; github = "CMCDragonkai"; @@ -5551,6 +5659,11 @@ githubId = 5953003; name = "Connor Nelson"; }; + conny = { + github = "ConstantConstantin"; + githubId = 162139822; + name = "Constantin-Paul Hertel"; + }; conradmearns = { email = "conradmearns+github@pm.me"; github = "ConradMearns"; @@ -5728,6 +5841,12 @@ githubId = 6821729; github = "criyle"; }; + crmne = { + email = "carmine@paolino.me"; + github = "crmne"; + githubId = 106617; + name = "Carmine Paolino"; + }; croissong = { email = "jan.moeller0@pm.me"; name = "Jan Möller"; @@ -5735,6 +5854,18 @@ githubId = 4162215; keys = [ { fingerprint = "CE97 9DEE 904C 26AA 3716 78C2 96A4 38F9 EE72 572F"; } ]; }; + croots = { + name = "Cameron Roots"; + github = "croots"; + githubId = 38054423; + keys = [ { fingerprint = "8496 ECF3 0961 115C A6DE 919F A01D C430 0605 1618"; } ]; + }; + crop = { + email = "crop_tech@proton.me"; + name = "crop"; + github = "crop2000"; + githubId = 176233921; + }; crschnick = { email = "crschnick@xpipe.io"; name = "Christopher Schnick"; @@ -6178,6 +6309,12 @@ github = "darkyzhou"; githubId = 7220778; }; + darshancode2005 = { + name = "Darshan Thakare"; + email = "darshanthakaregsoc2023@gmail.com"; + github = "DarshanCode2005"; + githubId = 143271270; + }; daru-san = { name = "Daru"; email = "zadarumaka@proton.me"; @@ -6217,7 +6354,7 @@ name = "Daniel Șerbănescu"; }; daskladas = { - email = "xvzrsm@tutanota.de"; + email = "mail@daskladas.de"; github = "daskladas"; githubId = 155686186; name = "Eric Heinemann"; @@ -6283,6 +6420,12 @@ github = "David-Kopczynski"; githubId = 53194670; }; + David-Moody = { + name = "David Moody"; + email = "david.moody@scot.me.uk"; + github = "David-Moody"; + githubId = 63956662; + }; david-sawatzke = { email = "d-nix@sawatzke.dev"; github = "david-sawatzke"; @@ -6549,12 +6692,6 @@ githubId = 48378098; name = "Danila Danko"; }; - deepfire = { - email = "_deepfire@feelingofgreen.ru"; - github = "deepfire"; - githubId = 452652; - name = "Kosyrev Serge"; - }; DeeUnderscore = { email = "d.anzorge@gmail.com"; github = "DeeUnderscore"; @@ -6645,6 +6782,12 @@ githubId = 8864716; name = "Duarte David"; }; + demic-dev = { + email = "git@demic.dev"; + github = "demic-dev"; + githubId = 59309595; + name = "Michele De Cillis"; + }; demin-dmitriy = { email = "demindf@gmail.com"; github = "demin-dmitriy"; @@ -6717,6 +6860,13 @@ githubId = 77843198; name = "Vasilis Manetas"; }; + Deric-W = { + email = "robo-eric@gmx.de"; + github = "Deric-W"; + githubId = 42873573; + name = "Eric Wolf"; + keys = [ { fingerprint = "ADAA B6F3 A955 5589 D66C CE61 80D2 DA42 8A4A 537F"; } ]; + }; DerickEddington = { email = "derick.eddington@pm.me"; github = "DerickEddington"; @@ -6795,6 +6945,12 @@ github = "developer-guy"; githubId = 16693043; }; + developmentcats = { + name = "Christofer"; + email = "christofer@coder.com"; + github = "DevelopmentCats"; + githubId = 176868952; + }; devhell = { email = ''"^"@regexmail.net''; github = "devhell"; @@ -6837,6 +6993,12 @@ github = "dfithian"; githubId = 8409320; }; + dfjay = { + email = "github@dfjay.com"; + name = "Pavel Yozhikov"; + github = "dfjay"; + githubId = 41841630; + }; dflores = { email = "dflores.country455@passinbox.com"; name = "David Flores"; @@ -6938,6 +7100,11 @@ githubId = 2096594; email = "Dietrich@Daroch.me"; }; + different-error = { + name = "Sanfer D'souza"; + github = "different-error"; + githubId = 9338001; + }; different-name = { name = "different-name"; email = "hello@different-name.dev"; @@ -6957,12 +7124,6 @@ github = "DimitarNestorov"; githubId = 8790386; }; - diniamo = { - name = "diniamo"; - email = "diniamo53@gmail.com"; - github = "diniamo"; - githubId = 55629891; - }; diogomdp = { email = "me@diogodp.dev"; github = "diogomdp"; @@ -7395,6 +7556,13 @@ github = "DSeeLP"; githubId = 46624152; }; + dshatz = { + email = "dev@dshatz.com"; + github = "dshatz"; + githubId = 23437798; + name = "Daniels Šatcs"; + keys = [ { fingerprint = "7452B4B47EA8F6635AB545CA4B974CC26375BB06"; } ]; + }; dsluijk = { name = "Dany Sluijk"; email = "nix@dany.dev"; @@ -7661,6 +7829,7 @@ name = "EarthGman"; github = "EarthGman"; githubId = 117403037; + keys = [ { fingerprint = "A06C 1E72 4626 7B4C EE16 CC2E 4862 31CD BCE3 AA32"; } ]; }; EBADBEEF = { name = "EBADBEEF"; @@ -7840,6 +8009,12 @@ name = "Edward Kimber"; githubId = 99987; }; + ekisu = { + email = "dts.ramon@gmail.com"; + github = "ekisu"; + name = "Ramon Dantas"; + githubId = 5082637; + }; eklairs = { name = "Eklairs"; email = "eklairs@proton.me"; @@ -7859,12 +8034,6 @@ githubId = 27162016; name = "Ramdip Gill"; }; - elasticdog = { - email = "aaron@elasticdog.com"; - github = "elasticdog"; - githubId = 4742; - name = "Aaron Bull Schaefer"; - }; elatov = { email = "elatov@gmail.com"; github = "elatov"; @@ -7909,6 +8078,11 @@ githubId = 183738665; name = "Marcell Tóth"; }; + ELHart05 = { + name = "Okba Allaoua"; + github = "ELHart05"; + githubId = 96151694; + }; eliandoran = { email = "contact@eliandoran.me"; name = "Elian Doran"; @@ -8255,6 +8429,12 @@ githubId = 7820865; name = "Eric Dallo"; }; + erics118 = { + name = "Eric Shen"; + github = "erics118"; + githubId = 52634785; + email = "ericshen118@gmail.com"; + }; ericson2314 = { email = "John.Ericson@Obsidian.Systems"; matrix = "@Ericson2314:matrix.org"; @@ -8387,11 +8567,6 @@ githubId = 16175276; keys = [ { fingerprint = "E4CE B0F0 B2EC 09A3 9678 F294 CC7A 7E3C 6CF3 1343"; } ]; }; - EstebanMacanek = { - name = "Esteban Macanek"; - github = "EstebanMacanek"; - githubId = 75503218; - }; esteve = { name = "Esteve Fernandez"; email = "nixpkgs@nara.ac"; @@ -8409,12 +8584,6 @@ { fingerprint = "2E51 F618 39D1 FA94 7A73 00C2 34C0 4305 D581 DBFE"; } ]; }; - ethercrow = { - email = "ethercrow@gmail.com"; - github = "ethercrow"; - githubId = 222467; - name = "Dmitry Ivanov"; - }; ethindp = { name = "Ethin Probst"; email = "harlydavidsen@gmail.com"; @@ -8579,6 +8748,13 @@ githubId = 63652646; name = "Xaver Oswald"; }; + examosa = { + email = "examosa@fastmail.com"; + github = "examosa"; + githubId = 23395221; + matrix = "@jamonith:matrix.org"; + name = "Jules Amonith"; + }; exarkun = { email = "exarkun@twistedmatrix.com"; github = "exarkun"; @@ -8664,12 +8840,6 @@ github = "f2k1de"; githubId = 11199213; }; - f4814n = { - email = "me@f4814n.de"; - github = "f4814"; - githubId = 11909469; - name = "Fabian Geiselhart"; - }; f4z3r = { email = "f4z3r-github@pm.me"; name = "Jakob Beckmann"; @@ -8721,6 +8891,12 @@ name = "Fábio Batista"; keys = [ { fingerprint = "D2D8 69D8 5EEC 30AD D327 B4A5 6CD5 5257 DB01 8B72"; } ]; }; + FabricSoul = { + name = "FabricSoul"; + github = "FabricSoul"; + githubId = 114606360; + email = "fabric.soul7@gmail.com"; + }; fallenbagel = { name = "fallenbagel"; github = "fallenbagel"; @@ -8753,6 +8929,13 @@ githubId = 345808; name = "Jakub Okoński"; }; + FatBoyXPC = { + name = "FatBoyXPC"; + email = "fatboyxpc@gmail.com"; + github = "FatBoyXPC"; + githubId = 744962; + keys = [ { fingerprint = "0E08 1B81 CBCA 1CF7 9568 A13F C4ED 3CA2 3211 8969"; } ]; + }; faukah = { github = "faukah"; name = "faukah"; @@ -8933,6 +9116,11 @@ githubId = 5198058; name = "Udo Sauer"; }; + fernvenue = { + github = "fernvenue"; + githubId = 84565547; + name = "fernvenue"; + }; feyorsh = { email = "george@feyor.sh"; github = "Feyorsh"; @@ -8989,6 +9177,12 @@ githubId = 41450706; name = "fin-w"; }; + fiona = { + email = "mail@fiona.hamburg"; + github = "Fiona42069"; + githubId = 260108682; + name = "fiona"; + }; fionera = { email = "nix@fionera.de"; github = "fionera"; @@ -9071,13 +9265,6 @@ name = "Sebastian Neubauer"; keys = [ { fingerprint = "2F93 661D AC17 EA98 A104 F780 ECC7 55EE 583C 1672"; } ]; }; - FlameFlag = { - name = "FlameFlag"; - email = "github@flameflag.dev"; - github = "FlameFlag"; - githubId = 57304299; - matrix = "@donteatoreo:matrix.org"; - }; Flameopathic = { email = "flameopathic@gmail.com"; github = "Flameopathic"; @@ -9296,7 +9483,7 @@ fraioveio = { email = "francesco@vecchia.lol"; github = "FraioVeio"; - githubId = 181361445; + githubId = 44584365; name = "Francesco Vecchia"; }; franciscod = { @@ -9333,6 +9520,12 @@ github = "frectonz"; githubId = 53809656; }; + fred441a = { + email = "frederik@altofte.dk"; + github = "fred441a"; + githubId = 10808098; + name = "Frederik Hansen"; + }; fredeb = { email = "frederikbraendstrup@gmail.com"; github = "FredeHoey"; @@ -9455,11 +9648,12 @@ githubId = 2881922; name = "Francis St-Amour"; }; - ftrvxmtrx = { - email = "ftrvxmtrx@gmail.com"; - github = "ftrvxmtrx"; - githubId = 248148; - name = "Sigrid Solveig Haflínudóttir"; + fstracke = { + email = "fritz.stracke@rwth-aachen.de"; + github = "fstracke"; + githubId = 31512703; + name = "Fritz Stracke"; + keys = [ { fingerprint = "7A9D 6DB2 0C5A AA55 7838 EEE6 B8CA 2D9A D8F0 506F"; } ]; }; ftsimas = { name = "Filippos Tsimas"; @@ -9645,6 +9839,12 @@ githubId = 45048741; name = "Alwanga Oyango"; }; + galder = { + email = "galder@ibm.com"; + github = "galderz"; + githubId = 50187; + name = "Galder Zamarreño"; + }; gale-username = { name = "gale"; email = "git@galewebsite.com"; @@ -9733,6 +9933,12 @@ githubId = 16470252; name = "Gemini Lasswell"; }; + gbhu753 = { + email = "me@gurjotbhullar.com"; + github = "GBHU753"; + githubId = 100983240; + name = "Gurjot Bhullar"; + }; gbtb = { email = "goodbetterthebeast3@gmail.com"; github = "gbtb"; @@ -9899,6 +10105,12 @@ githubId = 3217744; name = "Peter Ferenczy"; }; + ghastrum = { + name = "Dennis Malmin"; + email = "dennis.malmin@tuta.com"; + github = "Ghastrum"; + githubId = 276720856; + }; ghostbuster91 = { name = "Kasper Kondzielski"; email = "kghost0@gmail.com"; @@ -9912,12 +10124,6 @@ name = "Will Owens"; keys = [ { fingerprint = "8E98 BB01 BFF8 AEA4 E303 FC4C 8074 09C9 2CE2 3033"; } ]; }; - ghuntley = { - email = "ghuntley@ghuntley.com"; - github = "ghuntley"; - githubId = 127353; - name = "Geoffrey Huntley"; - }; gibbert = { email = "gbjgms@gmail.com"; github = "zgibberish"; @@ -10133,6 +10339,12 @@ githubId = 2041764; name = "Andreas Wendleder"; }; + goobertony = { + github = "goobertony"; + email = "tonygameing@proton.me"; + githubId = 133613491; + name = "Tonii Bittersweet"; + }; goodrone = { email = "goodrone@gmail.com"; github = "goodrone"; @@ -10227,6 +10439,11 @@ githubId = 13297896; name = "David Isaksson"; }; + grandjeanlab = { + github = "grandjeanlab"; + githubId = 22633767; + name = "grandjeanlab"; + }; gravndal = { email = "gaute.ravndal+nixos@gmail.com"; github = "gravndal"; @@ -10269,6 +10486,12 @@ githubId = 273582; name = "greg"; }; + gregshuflin = { + email = "greg@everdayimshuflin.com"; + github = "neunenak"; + githubId = 311545; + name = "Greg Shuflin"; + }; greizgh = { email = "greizgh@ephax.org"; github = "greizgh"; @@ -10478,12 +10701,23 @@ githubId = 14929991; keys = [ { fingerprint = "F7D3 7890 228A 9074 40E1 FD48 46B9 228E 814A 2AAC"; } ]; }; + haansn08 = { + name = "Stefan Haan"; + github = "haansn08"; + githubId = 6215916; + }; hacker1024 = { name = "hacker1024"; email = "hacker1024@users.sourceforge.net"; github = "hacker1024"; githubId = 20849728; }; + hadal84 = { + name = "hadal84"; + email = "business.masses555@passinbox.com"; + github = "hadal84"; + githubId = 143954694; + }; hadilq = { name = "Hadi Lashkari Ghouchani"; email = "hadilq.dev@gmail.com"; @@ -11035,6 +11269,12 @@ github = "HolgerPeters"; githubId = 4097049; }; + Holiu618 = { + email = "zvttt9db@anonaddy.me"; + github = "Holiu618"; + githubId = 165534185; + name = "Holiu"; + }; hollowman6 = { email = "hollowman@hollowman.ml"; github = "HollowMan6"; @@ -11250,12 +11490,6 @@ github = "hxtmdev"; githubId = 7771007; }; - hypersw = { - email = "baltic@hypersw.net"; - github = "hypersw"; - githubId = 2332070; - name = "Serge Baltic"; - }; hythera = { name = "Hythera"; github = "Hythera"; @@ -11317,6 +11551,18 @@ githubId = 69209; name = "Ian Duncan"; }; + IanHollow = { + github = "IanHollow"; + githubId = 72767437; + name = "Ian Holloway"; + }; + iank = { + email = "iank@iank.org"; + github = "iank"; + githubId = 109598; + name = "Ian Kilgore"; + keys = [ { fingerprint = "21F7 244E 095F 619E 8E3E 1EB4 9F3A 4AAB 4D90 D879"; } ]; + }; ianliu = { email = "ian.liu88@gmail.com"; github = "ianliu"; @@ -11727,12 +11973,6 @@ name = "Silvan Mosberger"; keys = [ { fingerprint = "6C2B 55D4 4E04 8266 6B7D DA1A 422E 9EDA E015 7170"; } ]; }; - iniw = { - email = "git@vini.cat"; - github = "iniw"; - githubId = 30220881; - name = "Vinicius Deolindo"; - }; insipx = { email = "github@andrewplaza.dev"; github = "insipx"; @@ -11776,6 +12016,12 @@ githubId = 16307070; name = "iosmanthus"; }; + ipetkov = { + name = "Ivan Petkov"; + github = "ipetkov"; + githubId = 1638690; + email = "nixpkgs@ipetkov.dev"; + }; ipsavitsky = { email = "ipsavitsky234@gmail.com"; github = "ipsavitsky"; @@ -12077,6 +12323,12 @@ githubId = 67414100; name = "Jachym Putta"; }; + jack-avery = { + email = "jack.avery.business@gmail.com"; + github = "jack-avery"; + githubId = 47289484; + name = "Jack Avery"; + }; jackcres = { email = "crespomerchano@gmail.com"; github = "omarcresp"; @@ -12344,6 +12596,12 @@ github = "JaviMerino"; githubId = 44926; }; + jayadeep-km-sonarsource = { + email = "jayadeep.kinavoormadam@sonarsource.com"; + name = "Jayadeep Kinavoor Madam"; + github = "jayadeep-km-sonarsource"; + githubId = 156662663; + }; jayesh-bhoot = { name = "Jayesh Bhoot"; email = "jb@jayeshbhoot.com"; @@ -12617,6 +12875,12 @@ githubId = 5741620; name = "Jeremy Schlatter"; }; + jeremystucki = { + email = "dev@jeremystucki.ch"; + github = "jeremystucki"; + githubId = 7629727; + name = "Jeremy Stucki"; + }; jerith666 = { email = "github@matt.mchenryfamily.org"; github = "jerith666"; @@ -12821,6 +13085,11 @@ name = "Jonathan Hult"; keys = [ { fingerprint = "DEE7 054C 5D43 ABEA C0F9 8BE4 3512 C8F8 2E2F 2A16"; } ]; }; + jiamingc = { + name = "Jiaming Chen"; + github = "jiamingc"; + githubId = 21327067; + }; jiegec = { name = "Jiajie Chen"; email = "c@jia.je"; @@ -13031,12 +13300,6 @@ githubId = 879272; name = "Julio Merino"; }; - jn-sena = { - email = "jn-sena@proton.me"; - github = "jn-sena"; - githubId = 45771313; - name = "Sena"; - }; jnsgruk = { email = "jon@sgrs.uk"; github = "jnsgruk"; @@ -13068,6 +13331,13 @@ name = "João Moreira"; keys = [ { fingerprint = "F457 0A3A 5F89 22F8 F572 E075 EF8B F2C8 C5F4 097D"; } ]; }; + joaosreis = { + email = "joaosreis@outlook.pt"; + github = "joaosreis"; + githubId = 3420596; + name = "João Santos Reis"; + keys = [ { fingerprint = "9BEB F137 4CAC 96D6 A4ED EC49 BA2E 05BD B7F8 C0EE"; } ]; + }; joaquintrinanes = { email = "hi@joaquint.io"; github = "JoaquinTrinanes"; @@ -13116,6 +13386,12 @@ githubId = 310981; name = "Joel Burget"; }; + joelgranados = { + email = "joel.granados.oss@joelgranados.com"; + github = "Joelgranados"; + githubId = 356364; + name = "Joel Granados"; + }; joelmo = { email = "joel.moberg@gmail.com"; github = "joelmo"; @@ -13457,12 +13733,6 @@ github = "joshprk"; githubId = 123624726; }; - joshuafern = { - name = "Joshua Fern"; - email = "joshuafern@protonmail.com"; - github = "JoshuaFern"; - githubId = 4300747; - }; joshvanl = { email = " me@joshvanl.dev "; github = "JoshVanL"; @@ -13569,6 +13839,11 @@ githubId = 4611077; name = "Raymond Gauthier"; }; + jromer = { + github = "jelleromer"; + githubId = 11951893; + name = "Jelle Römer"; + }; jrpotter = { email = "jrpotter2112@gmail.com"; github = "jrpotter"; @@ -13861,6 +14136,13 @@ githubId = 2396926; name = "Justin Woo"; }; + justkrysteq = { + email = "justkrysteq@proton.me"; + github = "justkrysteq"; + githubId = 43525126; + name = "Krysteq"; + matrix = "@krysteq:matrix.org"; + }; jvanbruegge = { email = "supermanitu@gmail.com"; github = "jvanbruegge"; @@ -13944,6 +14226,14 @@ name = "Kenichi Kamiya"; keys = [ { fingerprint = "9121 5D87 20CA B405 C63F 24D2 EF6E 574D 040A E2A5"; } ]; }; + kacper-uminski = { + name = "Kacper Uminski"; + email = "kacper+nixpkgs@lysator.liu.se"; + github = "kacper-uminski"; + githubId = 57466578; + matrix = "@kacper.uminski:matrix.org"; + keys = [ { fingerprint = "3DF9 3DEB CAA9 81FA B3E2 A7F0 87DA 201D E02F 14B1"; } ]; + }; kaction = { name = "Dmitry Bogatov"; email = "KAction@disroot.org"; @@ -14110,6 +14400,12 @@ githubId = 48174247; name = "Aleksandar Nesovic"; }; + kayoubi13 = { + email = "nix@foss-daily.org"; + github = "kayoubi13"; + githubId = 299534864; + name = "Kayoubi13"; + }; kazcw = { email = "kaz@lambdaverse.org"; github = "kazcw"; @@ -14177,6 +14473,12 @@ github = "keller00"; githubId = 8452750; }; + kenis1108 = { + email = "1836362346@qq.com"; + github = "kenis1108"; + githubId = 45393183; + name = "kenis"; + }; kenran = { email = "johannes.maier@mailbox.org"; github = "kenranunderscore"; @@ -14241,6 +14543,12 @@ githubId = 8211181; name = "Kevin Kandlbinder"; }; + kevinpita = { + email = "gitkevin@pm.me"; + github = "kevinpita"; + githubId = 69063372; + name = "Kevin Pita"; + }; keyruu = { name = "Lucas"; email = "me@keyruu.de"; @@ -14347,6 +14655,11 @@ githubId = 464625; name = "Enric Morales"; }; + kikos0 = { + github = "KiKoS0"; + githubId = 22998716; + name = "Riadh Daghmoura"; + }; kilianar = { email = "mail@kilianar.de"; github = "kilianar"; @@ -14395,6 +14708,12 @@ githubId = 691290; name = "Keshav Kini"; }; + kinnrai = { + email = "me@kinnrai.com"; + github = "kinnrai"; + githubId = 72676584; + name = "kinnrai"; + }; kintrix = { email = "kintrix007@proton.me"; github = "kintrix007"; @@ -14426,6 +14745,12 @@ github = "kiranshila"; githubId = 6305359; }; + KirCK = { + email = "Arikkenebas09@gmail.com"; + github = "AristarhKenebas"; + githubId = 142233116; + name = "Aristarh Kenebas"; + }; kirelagin = { email = "kirelagin@gmail.com"; matrix = "@kirelagin:matrix.org"; @@ -14455,6 +14780,13 @@ githubId = 7587245; name = "Kit Langton"; }; + Kitsune = { + name = "Lunae V"; + github = "KitsuneDev"; + githubId = 11809449; + email = "kitsune@akitsune.dev"; + matrix = "@kitsune:akitsune.dev"; + }; kitsunoff = { github = "kitsunoff"; githubId = 58953114; @@ -14578,6 +14910,12 @@ github = "kmicklas"; githubId = 929096; }; + kmjayadeep = { + email = "kmjayadeep@gmail.com"; + name = "Jayadeep KM"; + github = "kmjayadeep"; + githubId = 6793260; + }; kmogged = { name = "Kevin"; github = "kmogged"; @@ -14595,6 +14933,12 @@ github = "svelterust"; githubId = 85593302; }; + knightfemale = { + email = "2067834160@qq.com"; + github = "knightfemale"; + githubId = 124773040; + name = "骑士姬"; + }; knightpp = { email = "knightpp@proton.me"; github = "knightpp"; @@ -14614,8 +14958,7 @@ }; koi = { name = "june"; - email = "me@koi.rip"; - matrix = "@koi:nelliel.cv"; + email = "packages@koi.rip"; github = "koibtw"; githubId = 75480869; keys = [ @@ -15137,6 +15480,11 @@ githubId = 27364685; name = "Lorenzo Pasqui"; }; + l1n = { + github = "l1n"; + githubId = 1367322; + name = "Nova DasSarma"; + }; l1npengtul = { email = "l1npengtul@l1npengtul.lol"; github = "l1npengtul"; @@ -15177,7 +15525,7 @@ }; lactose = { name = "lactose"; - email = "lactose@allthingslinux.com"; + email = "mail@lactose.dev"; github = "juuyokka"; githubId = 15185244; }; @@ -15287,6 +15635,12 @@ githubId = 632767; name = "Guillaume Maudoux"; }; + layzyoldman = { + email = "ricardopaivacampos@gmail.com"; + github = "layzyoldman"; + githubId = 193278607; + name = "Ricardo Campos"; + }; LazilyStableProton = { email = "LazilyStable@proton.me"; github = "LazyStability"; @@ -15671,6 +16025,17 @@ githubId = 124475; name = "Olli Helenius"; }; + ligerothetiger = { + email = "ligero@ligerothetiger.com"; + name = "LigeroTheTiger"; + github = "LigeroTheTiger"; + githubId = 42996211; + keys = [ + { + fingerprint = "5zLV9yqjL18GsG1qan0tGM5341niQNYnU/hiBCscn04"; + } + ]; + }; lightbulbjim = { email = "chris@killred.net"; github = "lightbulbjim"; @@ -16059,6 +16424,13 @@ name = "Bernardo Meurer"; keys = [ { fingerprint = "F193 7596 57D5 6DA4 CCD4 786B F4C0 D53B 8D14 C246"; } ]; }; + lovistovis = { + email = "love.lysell.berglund@gmail.com"; + github = "lovistovis"; + githubId = 64896699; + name = "Love Lysell Berglund"; + keys = [ { fingerprint = "7958 2B47 1D85 3CC9 A3FB 30D5 7B54 D564 D46D 9880"; } ]; + }; lowfatcomputing = { email = "andreas.wagner@lowfatcomputing.org"; github = "lowfatcomputing"; @@ -16135,6 +16507,11 @@ githubId = 83420438; name = "Lewis"; }; + lubsch = { + github = "lubsch"; + githubId = 33580245; + name = "Benjamin Lohmar"; + }; luc65r = { email = "lucas@ransan.fr"; github = "luc65r"; @@ -16286,6 +16663,12 @@ githubId = 30468956; name = "Lukas Heiligenbrunner"; }; + lukas-sgx = { + email = "lukas.soigneux@epitech.eu"; + github = "lukas-sgx"; + githubId = 68616614; + name = "Lukas Soigneux"; + }; lukaslihotzki = { email = "lukas@lihotzki.de"; github = "lukaslihotzki"; @@ -16341,17 +16724,17 @@ githubId = 10746692; name = "Leopold Luley"; }; - lumi = { - email = "lumi@pew.im"; - github = "lumi-me-not"; - githubId = 26020062; - name = "lumi"; - }; luminarleaf = { github = "LuminarLeaf"; githubId = 80571430; name = "Luminar Leaf"; }; + luna-the-tuna = { + email = "contact@luna.fish"; + github = "luna-the-tuna"; + githubId = 112084382; + name = "Luna Heyman"; + }; luna_1024 = { email = "contact@luna.computer"; github = "luna-1024"; @@ -16408,6 +16791,12 @@ githubId = 115777584; name = "Lutz Berger"; }; + luuumine = { + email = "nix@luuumine.com"; + github = "luuumine"; + githubId = 55056797; + name = "Romain Delhommais"; + }; lux = { email = "lux@lux.name"; github = "luxzeitlos"; @@ -17067,6 +17456,12 @@ githubId = 110860; name = "Martin Jesper Low Madsen"; }; + martinkontsek = { + email = "martinkontsek@gmail.com"; + github = "martinkontsek"; + githubId = 9106867; + name = "Martin Kontšek"; + }; martinramm = { email = "martin-ramm@gmx.de"; github = "MartinRamm"; @@ -17191,6 +17586,12 @@ github = "matrss"; githubId = 9308656; }; + matshch = { + name = "Artem Leshchev"; + github = "matshch"; + githubId = 2412121; + email = "matshch@gmail.com"; + }; matt-snider = { email = "matt.snider@protonmail.com"; github = "matt-snider"; @@ -17497,12 +17898,6 @@ githubId = 9051309; name = "Maximilian Bode"; }; - mboes = { - email = "mboes@tweag.net"; - github = "mboes"; - githubId = 51356; - name = "Mathieu Boespflug"; - }; mBornand = { email = "dev.mbornand@systemb.ch"; github = "mBornand"; @@ -17574,6 +17969,12 @@ { fingerprint = "838A FE0D 55DC 074E 360F 943A 84B6 9CE6 F3F6 B767"; } ]; }; + mcuste = { + email = "github@muratcanuste.com"; + github = "mcuste"; + githubId = 10829864; + name = "Murat Can Üste"; + }; mcwitt = { email = "mcwitt@gmail.com"; github = "mcwitt"; @@ -17753,6 +18154,12 @@ github = "merrkry"; githubId = 124278440; }; + mert-kurttutan = { + email = "mert-kurttutan@gmail.com"; + name = "Mert Kurttutan"; + github = "mert-kurttutan"; + githubId = 88637659; + }; messemar = { email = "martin.messer@cyberus-technology.de"; name = "messemar"; @@ -17914,6 +18321,12 @@ githubId = 1575834; name = "Michael Adler"; }; + michaelAllen = { + name = "Michael Allen"; + email = "mcallen71398@gmail.com"; + github = "That1LinuxGuy"; + githubId = 207959559; + }; michaelBelsanti = { email = "mbels03@protonmail.com"; name = "Mike Belsanti"; @@ -18064,12 +18477,6 @@ githubId = 14096356; name = "Michael McLeod"; }; - mikefaille = { - email = "michael@faille.io"; - github = "mikefaille"; - githubId = 978196; - name = "Michaël Faille"; - }; mikehorn = { email = "mikehornproton@proton.me"; github = "MikeHorn-git"; @@ -18372,6 +18779,13 @@ github = "mkleczek"; githubId = 11559480; }; + mkoppmann = { + email = "dev@mkoppmann.at"; + github = "mkoppmann"; + githubId = 21209717; + matrix = "@shibayashi:ncrypt.at"; + name = "Michael Koppmann"; + }; mksafavi = { name = "MK Safavi"; email = "mksafavi@gmail.com"; @@ -18495,13 +18909,6 @@ github = "mohe2015"; githubId = 13287984; }; - momeemt = { - name = "Mutsuha Asada"; - email = "me@momee.mt"; - github = "momeemt"; - githubId = 43488453; - keys = [ { fingerprint = "D94F EA9F 5B08 F6A1 7B8F EB8B ACB5 4F0C BC6A A7C6"; } ]; - }; monaaraj = { name = "Mon Aaraj"; email = "owo69uwu69@gmail.com"; @@ -18550,6 +18957,12 @@ githubId = 830082; name = "Nathan Moos"; }; + mootfrost = { + email = "hello@mootfrost.dev"; + github = "mootfrost"; + githubId = 75925945; + name = "Andrew Semeykin"; + }; moraxyc = { name = "Moraxyc Xu"; email = "i@qaq.li"; @@ -18639,12 +19052,24 @@ githubId = 2072185; name = "Marc Scholten"; }; + Mr-Stoneman = { + email = "mrstoneman@sten.rocks"; + github = "Mr-Stoneman"; + githubId = 72991726; + name = "Mr-Stoneman"; + }; mrbenjadmin = { email = "mrbenjadmin@gmail.com"; github = "mrbenjadmin"; githubId = 68156310; name = "Benjamin Strachan"; }; + mrbjarksen = { + email = "bjarki@harksen.is"; + github = "mrbjarksen"; + githubId = 62466569; + name = "Bjarki B. Harksen"; + }; mrcjkb = { email = "marc@jakobi.dev"; matrix = "@mrcjk:matrix.org"; @@ -18897,6 +19322,12 @@ githubId = 220262; name = "Ion Mudreac"; }; + mugaizzo = { + email = "mugahedman@hotmail.com"; + github = "mugaizzo"; + githubId = 15838537; + name = "Mugahed Izzeldin"; + }; mulatta = { email = "seungwon@mulatta.io"; github = "mulatta"; @@ -19042,7 +19473,8 @@ }; MysteryBlokHed = { name = "Adam Thompson-Sharpe"; - email = "hi@adamts.me"; + email = "nix@adamts.me"; + matrix = "@adam:adamts.me"; github = "MysteryBlokHed"; githubId = 13910387; keys = [ { fingerprint = "086E EF20 D54E D348 E5BA 6263 16E9 43E6 596F FB4E"; } ]; @@ -19090,6 +19522,12 @@ githubId = 61601147; name = "basti n00b0ss"; }; + n0pl4c3 = { + email = "mail@n0pl4c3.net"; + github = "n0pl4c3"; + githubId = 69087176; + name = "n0pl4c3"; + }; n3oney = { name = "Michał Minarowski"; email = "nixpkgs@neoney.dev"; @@ -19259,12 +19697,6 @@ name = "Nasir Hussain"; keys = [ { fingerprint = "7A10 AB8E 0BEC 566B 090C 9BE3 D812 6E55 9CE7 C35D"; } ]; }; - nasrally = { - email = "suffer.ring@ya.ru"; - github = "nasrally"; - githubId = 50599445; - name = "Nikita Grishko"; - }; nat-418 = { github = "nat-418"; githubId = 93013864; @@ -19393,12 +19825,24 @@ githubId = 364510; name = "Tobias Geerinckx-Rice"; }; + ndavd = { + email = "email@ndavd.com"; + github = "ndavd"; + githubId = 74260683; + name = "Nuno David"; + }; ndl = { email = "ndl@endl.ch"; github = "ndl"; githubId = 137805; name = "Alexander Tsvyashchenko"; }; + ndom91 = { + email = "nix@ndo.dev"; + github = "ndom91"; + githubId = 7415984; + name = "Nico Domino"; + }; nealfennimore = { email = "hi@neal.codes"; github = "nealfennimore"; @@ -19499,6 +19943,12 @@ name = "neo"; email = "chojs990222@gmail.com"; }; + neobrain = { + github = "neobrain"; + githubId = 4840017; + matrix = "@neobrain:matrix.org"; + name = "Tony Wasserka"; + }; neonvoid = { email = "me@neonvoid.dev"; github = "neonvoidx"; @@ -19784,6 +20234,11 @@ name = "Jakub Kądziołka"; keys = [ { fingerprint = "E576 BFB2 CF6E B13D F571 33B9 E315 A758 4613 1564"; } ]; }; + nielmin = { + name = "Daniel Hwang"; + github = "nielmin"; + githubId = 81798555; + }; nielsegberts = { email = "nix@nielsegberts.nl"; github = "nielsegberts"; @@ -19796,6 +20251,12 @@ github = "nigelgbanks"; githubId = 487373; }; + nightconcept = { + email = "dark@nightconcept.net"; + github = "nightconcept"; + githubId = 486025; + name = "Danny Solivan"; + }; nikhilmaddirala = { name = "Nikhil Maddirala"; github = "nikhilmaddirala"; @@ -19847,12 +20308,6 @@ githubId = 70602908; github = "nikolaizombie1"; }; - niksingh710 = { - email = "nik.singh710@gmail.com"; - name = "Nikhil Singh"; - github = "niksingh710"; - githubId = 60490474; - }; nikstur = { email = "nikstur@outlook.com"; name = "nikstur"; @@ -19904,7 +20359,7 @@ name = "Nindouja"; }; ninelore = { - email = "9l+nix@9lo.re"; + email = "9l@9lo.re"; matrix = "@9lore:tchncs.de"; github = "ninelore"; githubId = 21343557; @@ -20027,6 +20482,12 @@ githubId = 4242897; name = "Nikolai Mishin"; }; + nmoya = { + email = "nikolasmoya@gmail.com"; + github = "nmoya"; + githubId = 1767648; + name = "Nikolas Moya"; + }; noaccos = { name = "Francesco Noacco"; email = "francesco.noacco2000@gmail.com"; @@ -20134,6 +20595,12 @@ githubId = 47303199; name = "Simon Gutgesell"; }; + nonplay = { + name = "Artem Ostrasev"; + email = "nonplay@bxteam.org"; + github = "NONPLAYT"; + githubId = 76615486; + }; noodlez1232 = { email = "contact@nathanielbarragan.xyz"; matrix = "@noodlez1232:matrix.org"; @@ -20379,8 +20846,9 @@ github = "numinit"; githubId = 369111; keys = [ - # SSH + # SSH, per-machine yubikey ecdsa-sk keys { fingerprint = "XX/0lMz82MpucPqf0KG+5EJoozzNRi8i/t59byD2kNo"; } + { fingerprint = "dye2C1N4RQaf+8ht5Ipd52BbnnuwBtdXxocPzk8b2mw"; } # GPG, >=2025, stays in one place { fingerprint = "FD28 F9C9 81C5 D78E 56E8 8311 5C3E B94D 198F 1491"; } # GPG, >=2025, travels with me @@ -20634,6 +21102,11 @@ githubId = 31112680; name = "oidro"; }; + ojii3 = { + github = "OJII3"; + githubId = 84656786; + name = "OJII3"; + }; ojsef39 = { name = "Josef Hofer"; github = "ojsef39"; @@ -20665,12 +21138,6 @@ matrix = "@olduser101:matrix.org"; name = "Nathan Gill"; }; - olebedev = { - email = "ole6edev@gmail.com"; - github = "olebedev"; - githubId = 848535; - name = "Oleg Lebedev"; - }; oleina = { email = "antholeinik@gmail.com"; github = "antholeole"; @@ -20859,12 +21326,6 @@ githubId = 19862; name = "KJ Ørbekk"; }; - orbitz = { - email = "mmatalka@gmail.com"; - github = "orbitz"; - githubId = 75299; - name = "Malcolm Matalka"; - }; orhun = { email = "orhunparmaksiz@gmail.com"; github = "orhun"; @@ -21683,6 +22144,12 @@ githubId = 421510; name = "Noé Rubinstein"; }; + phluxjr = { + email = "phluxjr@phluxjr.net"; + github = "phluxjr"; + githubId = 185956030; + name = "phluxjr"; + }; pho = { email = "phofin@gmail.com"; github = "pho"; @@ -21695,6 +22162,12 @@ githubId = 2997905; name = "Petr Hodina"; }; + phorcys420 = { + name = "Phorcys"; + email = "nixpkgs@phorcys.net"; + github = "phorcys420"; + githubId = 57866459; + }; photex = { email = "photex@gmail.com"; github = "photex"; @@ -22211,7 +22684,7 @@ githubId = 38916722; }; pradyuman = { - email = "me@pradyuman.co"; + email = "me@pmn.co"; github = "pradyuman"; githubId = 9904569; name = "Pradyuman Vig"; @@ -22326,18 +22799,18 @@ githubId = 406946; name = "Valentin Lorentz"; }; + proitheus = { + email = "me@mail.proitheus.top"; + github = "proitheus"; + githubId = 50539150; + name = "proitheus"; + }; projectinitiative = { name = "ProjectInitiative"; github = "ProjectInitiative"; githubId = 6314611; keys = [ { fingerprint = "EEC7 53FC EAAA FD9E 4DC0 9BB5 CAEB 4185 C226 D76B"; } ]; }; - prominentretail = { - email = "me@jakepark.me"; - github = "ProminentRetail"; - githubId = 94048404; - name = "Jake Park"; - }; proofconstruction = { email = "source@proof.construction"; github = "proofconstruction"; @@ -22786,11 +23259,6 @@ matrix = "@qyriad:katesiria.org"; name = "Qyriad"; }; - qzylinra = { - github = "qzylinra"; - githubId = 225773816; - name = "qzylinra"; - }; r-aizawa = { github = "Xantibody"; githubId = 109563705; @@ -23031,12 +23499,6 @@ githubId = 1246959; name = "Raquel García"; }; - rardiol = { - email = "ricardo.ardissone@gmail.com"; - github = "rardiol"; - githubId = 11351304; - name = "Ricardo Ardissone"; - }; raskin = { email = "7c6f434c@mail.ru"; github = "7c6f434c"; @@ -23196,6 +23658,11 @@ githubId = 77415970; name = "Redhawk"; }; + redhood = { + name = "Alice Liddell"; + github = "petalmaya"; + githubId = 258934709; + }; redianthus = { github = "redianthus"; githubId = 16472988; @@ -23857,6 +24324,12 @@ githubId = 64620440; name = "RoGreat"; }; + rohan-datar = { + email = "me@rohandatar.com"; + github = "rohan-datar"; + githubId = 37545071; + name = "Rohan Datar"; + }; rohanssrao = { email = "rohanssrao@gmail.com"; github = "rohanssrao"; @@ -23887,6 +24360,12 @@ githubId = 7335; name = "Roman Gonzalez"; }; + roman-16 = { + email = "roman@lerchster.dev"; + github = "roman-16"; + githubId = 15262665; + name = "Roman"; + }; romildo = { email = "malaquias@gmail.com"; github = "romildo"; @@ -24050,6 +24529,12 @@ githubId = 20300874; name = "Mohammad Rafiq"; }; + rsahwe = { + email = "rsahwe@gmx.net"; + github = "rsahwe"; + githubId = 201613730; + name = "rsahwe"; + }; rseichter = { email = "nixos.org@seichter.de"; github = "rseichter"; @@ -24296,6 +24781,7 @@ }; ryand56 = { email = "git@ryand.ca"; + matrix = "@ryan:ryand.ca"; github = "ryand56"; githubId = 22267679; name = "Ryan Omasta"; @@ -24526,6 +25012,12 @@ githubId = 47582; name = "Samir Talwar"; }; + samiser = { + email = "nixos@me.samiser.xyz"; + github = "samiser"; + githubId = 32001364; + name = "Sam"; + }; samlich = { email = "nixos@samli.ch"; github = "samlich"; @@ -24873,6 +25365,19 @@ githubId = 149248; name = "Christian Rackerseder"; }; + screwys = { + email = "screwygit@proton.me"; + github = "screwys"; + githubId = 254296947; + name = "screwy"; + }; + Scriptkiddi = { + email = "nixos@scriptkiddi.de"; + matrix = "@fritz.otlinghaus:helsinki-systems.de"; + github = "Scriptkiddi"; + githubId = 3598650; + name = "Fritz Otlinghaus"; + }; Scrumplex = { name = "Sefa Eyeoglu"; email = "contact@scrumplex.net"; @@ -25041,6 +25546,12 @@ githubId = 33031; name = "Greg Pfeil"; }; + semi710 = { + email = "nik.singh710@gmail.com"; + name = "Nikhil Singh"; + github = "semi710"; + githubId = 60490474; + }; sempiternal-aurora = { email = "myrialsarvay@gmail.com"; github = "sempiternal-aurora"; @@ -25097,6 +25608,13 @@ githubId = 35622998; name = "Suwon Park"; }; + sepointon = { + email = "sampointon@gmail.com"; + github = "sepointon"; + githubId = 209542026; + matrix = "sampointon:matrix.org"; + name = "Sam Pointon"; + }; seppeljordan = { email = "sebastian.jordan.mail@googlemail.com"; github = "seppeljordan"; @@ -25282,12 +25800,6 @@ githubId = 106669955; name = "Léon Gessner"; }; - shardy = { - email = "shardul@baral.ca"; - github = "shardulbee"; - githubId = 16765155; - name = "Shardul Baral"; - }; sharpchen = { github = "sharpchen"; githubId = 77432836; @@ -25587,6 +26099,12 @@ name = "Nikolay Korotkiy"; keys = [ { fingerprint = "ADF4 C13D 0E36 1240 BD01 9B51 D1DE 6D7F 6936 63A5"; } ]; }; + silicalet = { + name = "Mr. why"; + email = "silicalet@outlook.com"; + github = "silicalet"; + githubId = 188071249; + }; silky = { name = "Noon van der Silk"; email = "noonsilk+nixpkgs@gmail.com"; @@ -25849,6 +26367,11 @@ githubId = 20123683; name = "Shenleban Tongying"; }; + sledgehammervampire = { + name = "Kevin Tran"; + github = "sledgehammervampire"; + githubId = 47207223; + }; sleexyz = { email = "freshdried@gmail.com"; github = "sleexyz"; @@ -25991,6 +26514,12 @@ github = "snpschaaf"; githubId = 105843013; }; + sntx = { + name = "sntx"; + email = "sntx@sntx.space"; + github = "Sntx626"; + githubId = 48636286; + }; snu = { email = "kabelfrickler@gmail.com"; github = "snue"; @@ -26046,6 +26575,14 @@ githubId = 7116239; keys = [ { fingerprint = "E067 520F 5EF2 C175 3F60 50C0 BA46 725F 6A26 7442"; } ]; }; + Soliprem = { + email = "me@soliprem.eu"; + matrix = "@soliprem:soliprem.eu"; + name = "Francesco Prem Solidoro"; + github = "Soliprem"; + githubId = 73885403; + keys = [ { fingerprint = "F779 4E05 D8BB A608 73D0 1312 4FD6 B0D5 1C9A B6BD"; } ]; + }; solson = { email = "scott@solson.me"; matrix = "@solson:matrix.org"; @@ -26079,6 +26616,12 @@ githubId = 13762043; matrix = "@sophie:nue.soopy.moe"; }; + sophiebsw = { + name = "Sophia"; + email = "nixpkgs@drifter.dev"; + github = "sophiebsw"; + githubId = 4594464; + }; sophronesis = { email = "oleksandr.buzynnyi@gmail.com"; github = "sophronesis"; @@ -26097,6 +26640,12 @@ githubId = 115308; name = "Richard Marko"; }; + sorooris = { + email = "nixpkgs@pm.me"; + github = "sorooris"; + githubId = 10185314; + name = "Seb Soroori"; + }; sorpaas = { email = "hi@that.world"; github = "sorpaas"; @@ -26226,12 +26775,6 @@ github = "spreetin"; githubId = 7392173; }; - sprock = { - email = "rmason@mun.ca"; - github = "sprock"; - githubId = 6391601; - name = "Roger Mason"; - }; sputn1ck = { email = "kon@kon.ninja"; github = "sputn1ck"; @@ -26305,6 +26848,12 @@ githubId = 4061736; name = "Severen Redwood"; }; + ssnoer = { + email = "ssnoer@proton.me"; + github = "Seba244c"; + githubId = 23051740; + name = "Sebastian August Snoer"; + }; sstef = { email = "stephane@nix.frozenid.net"; github = "haskelious"; @@ -26497,6 +27046,11 @@ github = "StephenWithPH"; githubId = 2990492; }; + stephsi = { + name = "Stephan Siegl"; + github = "stephsi"; + githubId = 3120909; + }; sterfield = { email = "sterfield@gmail.com"; github = "sterfield"; @@ -26709,13 +27263,6 @@ githubId = 36031171; name = "Supa"; }; - superherointj = { - email = "sergiomarcelo@yandex.com"; - github = "superherointj"; - githubId = 5861043; - matrix = "@superherointj:matrix.org"; - name = "Sérgio Marcelo"; - }; supermarin = { email = "git+nixpkgs@mar.in"; name = "marin"; @@ -26802,6 +27349,13 @@ githubId = 36695359; name = "Vasyl Solovei"; }; + swaggeroo = { + email = "swaggerooo@pm.me"; + github = "swaggeroo"; + githubId = 57057662; + name = "Swaggeroo"; + keys = [ { fingerprint = "D221 99EC 4FFF EF4D F29D 2435 5208 74E7 3291 4E0B"; } ]; + }; swarren83 = { email = "shawn.w.warren@gmail.com"; github = "swarren83"; @@ -26925,6 +27479,11 @@ githubId = 203195; name = "Szczyp"; }; + szhekpisov = { + github = "szhekpisov"; + githubId = 87662520; + name = "Sergei Zhekpisov"; + }; szkiba = { email = "iszkiba@gmail.com"; github = "szkiba"; @@ -27188,12 +27747,6 @@ githubId = 101565936; name = "Tautvydas Cerniauskas"; }; - tcbravo = { - email = "tomas.bravo@protonmail.ch"; - github = "tcbravo"; - githubId = 66133083; - name = "Tomas Bravo"; - }; tchab = { email = "dev@chabs.name"; github = "t-chab"; @@ -27303,6 +27856,12 @@ github = "tembleking"; githubId = 2988780; }; + temidaradev = { + name = "temidaradev"; + email = "temidaradev@proton.me"; + github = "temidaradev"; + githubId = 118509044; + }; tengkuizdihar = { name = "Tengku Izdihar"; email = "tengkuizdihar@gmail.com"; @@ -27358,6 +27917,11 @@ githubId = 3889585; name = "Cheng Shao"; }; + terrorw0lf = { + name = "duckling"; + github = "TERRORW0LF"; + githubId = 61637480; + }; terryg = { name = "Terry Garcia"; email = "terry@terryg.org"; @@ -27471,6 +28035,13 @@ github = "thattemperature"; githubId = 125476238; }; + thbemme = { + name = "Thomas Bemme"; + email = "thomas.bemme@gmail.com"; + matrix = "@riza:chaos.jetzt"; + github = "thbemme"; + githubId = 14074615; + }; thblt = { name = "Thibault Polge"; email = "thibault@thb.lt"; @@ -27971,6 +28542,12 @@ githubId = 1334474; name = "Timothy Stott"; }; + tiptenbrink = { + email = "tip@tenbrinkmeijs.com"; + github = "tiptenbrink"; + githubId = 75669206; + name = "Tip ten Brink"; + }; tiramiseb = { email = "sebastien@maccagnoni.eu"; github = "tiramiseb"; @@ -28239,12 +28816,6 @@ githubId = 38566841; name = "Anthony Butt"; }; - toodeluna = { - email = "luna@toodeluna.net"; - github = "toodeluna"; - githubId = 112084382; - name = "Luna Heyman"; - }; toonn = { email = "nixpkgs@toonn.io"; matrix = "@toonn:matrix.org"; @@ -28252,6 +28823,12 @@ githubId = 1486805; name = "Toon Nolten"; }; + tophcodes = { + email = "toki@toph.so"; + github = "tophcodes"; + githubId = 3678770; + name = "Christopher Mühl"; + }; tornax = { email = "tornax@pm.me"; github = "TornaxO7"; @@ -28281,12 +28858,6 @@ github = "toXel"; githubId = 2300709; }; - ToxicFrog = { - email = "toxicfrog@ancilla.ca"; - github = "ToxicFrog"; - githubId = 90456; - name = "Rebecca (Bex) Kelly"; - }; toyboot4e = { email = "toyboot4e@gmail.com"; github = "toyboot4e"; @@ -28340,18 +28911,18 @@ githubId = 5623227; name = "Quentin Boyer"; }; + tree-sapii = { + email = "supersapiiiiii@gmail.com"; + github = "tree-sapii"; + githubId = 144389458; + name = "sapii"; + }; treemo = { email = "matthieu.chevrier@treemo.fr"; github = "treemo"; githubId = 207457; name = "Matthieu Chevrier"; }; - trepetti = { - email = "trepetti@cs.columbia.edu"; - github = "trepetti"; - githubId = 25440339; - name = "Tom Repetti"; - }; trespaul = { email = "paul@trespaul.com"; github = "trespaul"; @@ -28612,6 +29183,12 @@ github = "TyberiusPrime"; githubId = 1257580; }; + tyceherrman = { + email = "Tyce.Herrman@pm.me"; + github = "TyceHerrman"; + githubId = 22066434; + name = "Tyce Herrman"; + }; tye-exe = { name = "Tye"; email = "nixpkgs-fr@tye-home.xyz"; @@ -28695,7 +29272,7 @@ uku3lig = { name = "uku"; email = "hi@uku.moe"; - matrix = "@uku:m.uku.moe"; + matrix = "@uku:rei.uku.moe"; github = "uku3lig"; githubId = 61147779; }; @@ -28813,6 +29390,12 @@ githubId = 17836748; name = "Mason Mackaman"; }; + username-generic = { + name = "username-generic"; + email = "username-generic@tuta.io"; + github = "username-generic"; + githubId = 202454830; + }; usertam = { name = "Samuel Tam"; email = "code@usertam.dev"; @@ -28884,6 +29467,12 @@ github = "uxodb"; githubId = 20535246; }; + uzlkav = { + name = "Uzlkav"; + github = "Uzlkav"; + githubId = 177883133; + matrix = "@capybara_squash:unredacted.org"; + }; V = { name = "V"; email = "v@anomalous.eu"; @@ -28984,6 +29573,11 @@ githubId = 223833; name = "Klaas van Schelven"; }; + VarNepvius = { + name = "VarNapvius"; + github = "VarNapvius"; + githubId = 14352929; + }; varunpatro = { email = "varun.kumar.patro@gmail.com"; github = "varunpatro"; @@ -28996,18 +29590,20 @@ githubId = 110242808; name = "Vasilii Pustovoit"; }; + vavakado = { + email = "xor@vavakado.xyz"; + github = "vavakado"; + githubId = 80159210; + name = "Vladimir Rubin"; + matrix = "@vavakado:imagisphe.re"; + keys = [ { fingerprint = "A054 0374 CD37 2C71 FE6D E0CF CAB7 4472 7F36 B524"; } ]; + }; vbgl = { email = "Vincent.Laporte@gmail.com"; github = "vbgl"; githubId = 2612464; name = "Vincent Laporte"; }; - vbmithr = { - email = "vb@luminar.eu.org"; - github = "vbmithr"; - githubId = 797581; - name = "Vincent Bernardoff"; - }; vbrandl = { name = "Valentin Brandl"; email = "mail+nixpkgs@vbrandl.net"; @@ -29257,12 +29853,6 @@ githubId = 20145996; name = "Victor Fuentes"; }; - vlstill = { - email = "xstill@fi.muni.cz"; - github = "vlstill"; - githubId = 4070422; - name = "Vladimír Štill"; - }; vmandela = { email = "venkat.mandela@gmail.com"; github = "vmandela"; @@ -29306,6 +29896,12 @@ githubId = 45292658; name = "Julius Schmitt"; }; + voidlily = { + github = "voidlily"; + githubId = 221749; + name = "voidlily"; + keys = [ { fingerprint = "E735 CD3F A78C 0919 4012 ADF3 3FBF B3CC E12E 7D19"; } ]; + }; voidnoi = { email = "voidnoi@proton.me"; github = "VoidNoi"; @@ -29318,6 +29914,11 @@ githubId = 7038383; name = "Vojta Káně"; }; + vokinn = { + github = "vokinn"; + githubId = 113241287; + name = "vokin"; + }; volfyd = { email = "lb.nix@lisbethmail.com"; github = "volfyd"; @@ -29404,12 +30005,6 @@ name = "Vince Rose"; githubId = 9831420; }; - vrthra = { - email = "rahul@gopinath.org"; - github = "vrthra"; - githubId = 70410; - name = "Rahul Gopinath"; - }; vsharathchandra = { email = "chandrasharath.v@gmail.com"; github = "vsharathchandra"; @@ -29460,7 +30055,7 @@ VZstless = { name = "VZstless"; email = "i@vzstless.moe"; - github = "atlarator"; + github = "VZstless"; githubId = 233668878; }; w-lfchen = { @@ -29606,6 +30201,14 @@ github = "weitzj"; githubId = 829277; }; + Wekuz = { + name = "Wekuz"; + github = "Wekuz"; + githubId = 89638089; + email = "wekuz@duck.com"; + matrix = "@wekuz:matrix.org"; + keys = [ { fingerprint = "0CCE 1200 AB5E 7B05 9A22 B0D8 2E50 2F2A ABD3 2DF9"; } ]; + }; wellmannmathis = { email = "wellmannmathis@gmail.com"; github = "MathisWellmann"; @@ -29840,6 +30443,12 @@ githubId = 22803888; name = "Lu Hongxu"; }; + wini = { + email = "dev@vini.cat"; + github = "iniw"; + githubId = 30220881; + name = "Vinicius Deolindo"; + }; winpat = { email = "patrickwinter@posteo.ch"; github = "winpat"; @@ -29858,6 +30467,12 @@ name = "Edward"; keys = [ { fingerprint = "0BC2F3C6AE5D73DAE870CB0E8AE4DE0EFB6CC443"; } ]; }; + WiredMic = { + name = "Rasmus Enevoldsen"; + github = "WiredMic"; + githubId = 111731519; + email = "rasmus@enev.dk"; + }; wirew0rm = { email = "alex@wirew0rm.de"; github = "wirew0rm"; @@ -29882,6 +30497,12 @@ githubId = 36118348; keys = [ { fingerprint = "69C9 876B 5797 1B2E 11C5 7C39 80A1 F76F C9F9 54AE"; } ]; }; + wiyba = { + name = "Dmitry Shmakov"; + email = "contact@wiyba.org"; + github = "wiyba"; + githubId = 81859776; + }; wizardlink = { name = "wizardlink"; email = "contact@thewizard.link"; @@ -29899,6 +30520,11 @@ githubId = 168610; name = "Ricardo M. Correia"; }; + wjohnsto = { + name = "Will Johnston"; + github = "wjohnsto"; + githubId = 785258; + }; wkral = { email = "william.kral@gmail.com"; github = "wkral"; @@ -30125,6 +30751,13 @@ github = "x807x"; githubId = 86676478; }; + xaltsc = { + email = "hey+dev@xaltsc.dev"; + matrix = "@xaltsc:matrix.org"; + name = "xaltsc"; + github = "xaltsc"; + githubId = 41400742; + }; xanderio = { name = "Alexander Sieg"; email = "alex@xanderio.de"; @@ -30294,6 +30927,11 @@ githubId = 106241330; name = "Success Kingsley"; }; + xqtc161 = { + github = "xqtc161"; + githubId = 65857432; + name = "tila"; + }; xrelkd = { github = "xrelkd"; githubId = 46590321; @@ -30404,6 +31042,12 @@ github = "yarektyshchenko"; githubId = 185304; }; + yarn = { + name = "yarncat"; + github = "yaaaarn"; + githubId = 30006414; + email = "nix@yarncat.moe"; + }; yarny = { github = "Yarny0"; githubId = 41838844; @@ -30519,12 +31163,6 @@ githubId = 1742643; name = "Ravi Peters"; }; - ylecornec = { - email = "yves.stan.lecornec@tweag.io"; - github = "ylecornec"; - githubId = 5978566; - name = "Yves-Stan Le Cornec"; - }; ylh = { email = "nixpkgs@ylh.io"; github = "ylh"; @@ -30586,6 +31224,13 @@ { fingerprint = "D2A8 A906 ACA7 B6D6 575E 9A2F 3A49 5054 6EA6 9E5C"; } ]; }; + yoquec = { + email = "alvaro.viejo@yoquec.com"; + github = "yoquec"; + githubId = 59575696; + name = "Alvaro Viejo"; + matrix = "@yoquec.com:matrix.org"; + }; yorickvp = { email = "yorickvanpelt@gmail.com"; matrix = "@yorickvp:matrix.org"; @@ -30756,6 +31401,12 @@ githubId = 65394961; name = "Yves Straten"; }; + yvnth = { + email = "yashupress@gmail.com"; + github = "yvnth"; + githubId = 201552597; + name = "Yashwanth Prasannakumar"; + }; yzx9 = { email = "yuan.zx@outlook.com"; github = "yzx9"; @@ -30918,6 +31569,11 @@ githubId = 25164338; keys = [ { fingerprint = "065A 0A98 FE61 E1C1 41B0 AFE7 64FA BC62 F457 2875"; } ]; }; + zehuajun = { + github = "zehuajun"; + githubId = 87254340; + name = "zehuajun"; + }; zelkourban = { name = "zelkourban"; email = "zelo.urban@gmail.com"; @@ -31185,6 +31841,12 @@ github = "zuzuleinen"; githubId = 944919; }; + zwang20 = { + name = "Michael Wang"; + github = "zwang20"; + githubId = 41721295; + matrix = "@michael_wzq:matrix.org"; + }; zx2c4 = { email = "Jason@zx2c4.com"; github = "zx2c4"; diff --git a/maintainers/scripts/haskell/hydra-report.hs b/maintainers/scripts/haskell/hydra-report.hs index 263d0aa50e6e..5ef28baa41e0 100755 --- a/maintainers/scripts/haskell/hydra-report.hs +++ b/maintainers/scripts/haskell/hydra-report.hs @@ -272,7 +272,7 @@ instance FromJSON JobMaintainers where -- @@ -- fromList -- [ ("arion.aarch64-linux", ["rob22"]) --- , ("conduit.x86_64-darwin", ["snoyb", "webber"]) +-- , ("conduit.aarch64-darwin", ["snoyb", "webber"]) -- ] -- @@ type MaintainerMap = Map JobName (NonEmpty Text) @@ -404,15 +404,13 @@ platformIcon :: Platform -> Text platformIcon (Platform x) = case x of "x86_64-linux" -> "🐧" "aarch64-linux" -> "📱" - "x86_64-darwin" -> "🍎" - "aarch64-darwin" -> "🍏" + "aarch64-darwin" -> "🍎" _ -> x platformIsOS :: OS -> Platform -> Bool platformIsOS os (Platform x) = case (os, x) of (Linux, "x86_64-linux") -> True (Linux, "aarch64-linux") -> True - (Darwin, "x86_64-darwin") -> True (Darwin, "aarch64-darwin") -> True _ -> False diff --git a/maintainers/scripts/kde/collect-logs.nu b/maintainers/scripts/kde/collect-logs.nu index 1d07fa9d2caf..656a97a0ce38 100755 --- a/maintainers/scripts/kde/collect-logs.nu +++ b/maintainers/scripts/kde/collect-logs.nu @@ -6,6 +6,8 @@ mkdir logs nix-env -qaP -f . -A kdePackages --json --out-path | from json | values | par-each { |it| echo $"Processing ($it.pname)..." if "outputs" in $it { - nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + try { + nix-store --read-log $it.outputs.out | save -f $"logs/($it.pname).log" + } } } diff --git a/maintainers/scripts/kde/generate-sources.py b/maintainers/scripts/kde/generate-sources.py index 2966e7ef9675..11a24f7c47ed 100755 --- a/maintainers/scripts/kde/generate-sources.py +++ b/maintainers/scripts/kde/generate-sources.py @@ -37,6 +37,7 @@ PROJECTS_WITH_RUST = { "akonadi-search", "angelfish", "kdepim-addons", + "kdeplasma-addons", } def to_sri(hash): diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index 5a7ff4b27883..7e42800e5db3 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -6,12 +6,13 @@ basexx,,,,,, bcrypt,,,,,,ulysseszhan binaryheap,,,,,,vcunat bit32,,,,,5.1,lblasc -busted,,,,,, +busted,,,,,,alerque busted-htest,,,,,,mrcjkb +canola.nvim,,,,,,saadndm cassowary,,,,,,alerque cldr,,,,,,alerque commons.nvim,,,,,5.1,mrcjkb -compat53,,,,,,vcunat +compat53,,,,,,vcunat alerque coop.nvim,,,,,, cosmo,,,,,, coxpcall,,,,1.17.0-1,, @@ -35,8 +36,9 @@ haskell-tools.nvim,,,,,5.1,mrcjkb http,,,,0.4-0,,vcunat inspect,,,,,, jsregexp,,,,0.0.7-2,, +kulala.nvim,,,,,, ldbus,,,https://luarocks.org/dev,,, -ldoc,,,,,, +ldoc,,,,,,alerque lgi,,,,,, linenoise,https://raw.githubusercontent.com/hoelzro/lua-linenoise/master/linenoise-0.9-1.rockspec,,,,, ljsyscall,,,,,5.1,lblasc @@ -60,7 +62,7 @@ lua-cjson,,,,,, lua-cmsgpack,,,,,, lua-curl,,,,,, lua-ffi-zlib,,,,,, -lua-iconv,,,,7.0.0,, +lua-iconv,,,,7.0.0,,alerque lua-lsp,,,,,, lua-messagepack,,,,,, lua-protobuf,,,,,,lockejan @@ -76,10 +78,10 @@ lua-toml,,,,,, lua-utils.nvim,,,,,,mrcjkb lua-yajl,,,,,,pstn lua-zlib,,,,,,koral -lua_cliargs,,,,,, +lua_cliargs,,,,,,alerque luabitop,https://raw.githubusercontent.com/teto/luabitop/master/luabitop-1.0.2-3.rockspec,,,,, -luacheck,,,,,, -luacov,,,,,, +luacheck,,,,,,alerque +luacov,,,,,,alerque luacov-reporter-lcov,,,,,,ulysseszhan luadbi,,,,,, luadbi-mysql,,,,,, @@ -89,7 +91,7 @@ luaepnf,,,,,, luaevent,,,,,, luaexpat,,,,,,arobyn flosse luaffi,,,https://luarocks.org/dev,,, -luafilesystem,,,,,,flosse +luafilesystem,,,,,,flosse alerque lualdap,,,,,,aanderse lualine.nvim,,,https://luarocks.org/dev,,, lualogging,,,,,, @@ -102,12 +104,12 @@ luarocks-build-rust-mlua,,,,,,mrcjkb luarocks-build-tree-sitter-cli,,,,,, luarocks-build-treesitter-parser,,,,,,mrcjkb luarocks-build-treesitter-parser-cpp,,,,,,mrcjkb -luasec,,,,,,flosse +luasec,,,,,,flosse alerque luasnip,,,,,, -luasocket,,,,,, +luasocket,,,,,,alerque luasql-sqlite3,,,,,, -luassert,,,,,, -luasystem,,,,,, +luassert,,,,,,alerque +luasystem,,,,,,alerque luatext,,,,,, luaunbound,,,,,, luaunit,,,,,,lockejan @@ -135,6 +137,7 @@ mpack,,,,,, neorg,,,,,5.1,GaetanLepage neorg-interim-ls,,,,,, neotest,,,,,5.1,mrcjkb +neotest-nix,,,,,,khaneliman nginx-lua-prometheus,,,,,,ulysseszhan nlua,,,,,,teto nui.nvim,,,,,5.1,mrcjkb @@ -156,7 +159,7 @@ rocks-git.nvim,,,,,5.1,mrcjkb rocks.nvim,,,,,5.1,mrcjkb rtp.nvim,,,,,5.1,mrcjkb rustaceanvim,,,,,5.1,mrcjkb -say,,,,,, +say,,,,,,alerque serpent,,,,,,lockejan sofa,,,,,,f4z3r sqlite,,,,,, @@ -172,6 +175,7 @@ toml-edit,,,,,5.1,mrcjkb tomlua,,,,,,birdee tree-sitter-cli,,,,,, tree-sitter-http,,,,0.0.33-1,, +tree-sitter-kulala_http,,,,,, tree-sitter-norg,,,,,5.1,mrcjkb tree-sitter-norg-meta,,,,,, tree-sitter-orgmode,,,,,5.1, diff --git a/maintainers/scripts/update.nix b/maintainers/scripts/update.nix index ca231c9e735a..50ab53bc7bad 100644 --- a/maintainers/scripts/update.nix +++ b/maintainers/scripts/update.nix @@ -13,9 +13,9 @@ path ? null, max-workers ? null, include-overlays ? false, - keep-going ? null, - commit ? null, - skip-prompt ? null, + keep-going ? false, + commit ? false, + skip-prompt ? false, order ? null, }: @@ -206,18 +206,18 @@ let to increase the number of jobs in parallel, or - --argstr keep-going true + --arg keep-going true to continue running when a single update fails. You can also make the updater automatically commit on your behalf from updateScripts that support it by adding - --argstr commit true + --arg commit true - to skip prompt: + To skip the prompt, you can add - --argstr skip-prompt true + --arg skip-prompt true By default, the updater will update the packages in arbitrary order. Alternately, you can force a specific order based on the packages’ dependency relations: @@ -250,11 +250,15 @@ let # JSON file with data for update.py. packagesJson = pkgs.writeText "packages.json" (builtins.toJSON (map packageData packages)); + # Allow boolean arguments to be provided with either --arg or --argstr. + # The ability to use the string "true" will be deprecated. + isTrue = arg: arg == true || arg == "true"; + optionalArgs = lib.optional (max-workers != null) "--max-workers=${max-workers}" - ++ lib.optional (keep-going == "true") "--keep-going" - ++ lib.optional (commit == "true") "--commit" - ++ lib.optional (skip-prompt == "true") "--skip-prompt" + ++ lib.optional (isTrue keep-going) "--keep-going" + ++ lib.optional (isTrue commit) "--commit" + ++ lib.optional (isTrue skip-prompt) "--skip-prompt" ++ lib.optional (order != null) "--order=${order}"; args = [ packagesJson ] ++ optionalArgs; diff --git a/maintainers/scripts/update.py b/maintainers/scripts/update.py index ca35f04d1285..bf52c01bb56f 100644 --- a/maintainers/scripts/update.py +++ b/maintainers/scripts/update.py @@ -307,7 +307,7 @@ async def commit_changes( commit_message = "{attrPath}: {oldVersion} -> {newVersion}".format(**change) if "commitMessage" in change: commit_message = change["commitMessage"] - elif "commitBody" in change: + if "commitBody" in change: commit_message = commit_message + "\n\n" + change["commitBody"] await check_subprocess_output( "git", diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index d48fc406b57a..0cec2e3f5fda 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -68,12 +68,8 @@ with lib.maintainers; bazel = { members = [ - mboes cbley - olebedev groodt - aherrmann - ylecornec boltzmannrain ]; scope = "Bazel build tool & related tools https://bazel.build/"; @@ -510,12 +506,12 @@ with lib.maintainers; matrix = { members = [ ma27 - mguentner - dandellion nickcao teutat3s + transcaffeine + skowalak ]; - scope = "Maintain the ecosystem around Matrix, a decentralized messenger."; + scope = "Maintain the foundational packages of the Matrix ecosystem."; shortName = "Matrix"; }; @@ -567,7 +563,6 @@ with lib.maintainers; ethancedwards8 phanirithvij prince213 - wegank ]; scope = "Maintain NGI-supported software."; shortName = "NGI"; @@ -690,6 +685,10 @@ with lib.maintainers; github = "radicle"; }; + redis = { + github = "redis"; + }; + rocm = { github = "rocm"; }; @@ -718,6 +717,15 @@ with lib.maintainers; github = "security-review"; }; + stardust-xr = { + members = [ + pandapip1 + technobaboo + ]; + scope = "Maintain Stardust XR packages"; + shortName = "StardustXR"; + }; + stdenv = { enableFeatureFreezePing = true; github = "stdenv"; @@ -738,7 +746,6 @@ with lib.maintainers; dduan samasaur stephank - trepetti ]; scope = "Maintain Swift compiler suite for NixOS."; shortName = "Swift"; @@ -749,10 +756,8 @@ with lib.maintainers; enableFeatureFreezePing = true; }; - tests = { - members = [ tfc ]; - scope = "Maintain the NixOS VM test runner."; - shortName = "NixOS tests"; + test-driver = { + github = "test-driver"; enableFeatureFreezePing = true; }; diff --git a/nixos/doc/manual/configuration/file-systems.chapter.md b/nixos/doc/manual/configuration/file-systems.chapter.md index 8a63a2b849cd..8b6a06c5720a 100644 --- a/nixos/doc/manual/configuration/file-systems.chapter.md +++ b/nixos/doc/manual/configuration/file-systems.chapter.md @@ -41,5 +41,6 @@ and non-critical by adding `options = [ "nofail" ];`. ```{=include=} sections luks-file-systems.section.md sshfs-file-systems.section.md +nfs-file-systems.section.md overlayfs.section.md ``` diff --git a/nixos/doc/manual/configuration/nfs-file-systems.section.md b/nixos/doc/manual/configuration/nfs-file-systems.section.md new file mode 100644 index 000000000000..3ac6792e0167 --- /dev/null +++ b/nixos/doc/manual/configuration/nfs-file-systems.section.md @@ -0,0 +1,52 @@ +# NFS File Systems {#sec-nfs-file-systems} + +[NFS][nfs] (Network File System) allows you to mount directories from remote machines over the network. + +[nfs]: https://en.wikipedia.org/wiki/Network_File_System +[nfs-man]: https://man7.org/linux/man-pages/man5/nfs.5.html + +To mount NFS filesystems persistently, use the `fileSystems` option: + +```nix +{ + fileSystems."/mnt/data" = { + device = "server.example.com:/export/data"; + fsType = "nfs"; + }; +} +``` + +## Automounting {#sec-nfs-automount} + +To have NFS filesystems mounted on-demand instead of at boot, add the `noauto` and `x-systemd.automount` options: + +```nix +{ + fileSystems."/mnt/data" = { + device = "server.example.com:/export/data"; + fsType = "nfs"; + options = [ + "noauto" + "x-systemd.automount" + ]; + }; +} +``` + +## Ad-hoc Mounting {#sec-nfs-adhoc} + +To mount NFS filesystems ad-hoc using the `mount` command, enable NFS and required RPC services: + +```nix +{ + boot.supportedFilesystems = [ "nfs" ]; +} +``` + +Then you can mount filesystems manually: + +```shell +$ sudo mount -t nfs server.example.com:/export/data /mnt/data +``` + +For more information on NFS mount options, see the [nfs(5) man page][nfs-man]. diff --git a/nixos/doc/manual/contributing-to-this-manual.chapter.md b/nixos/doc/manual/contributing-to-this-manual.chapter.md index 19549c32f277..a98ce7fc9923 100644 --- a/nixos/doc/manual/contributing-to-this-manual.chapter.md +++ b/nixos/doc/manual/contributing-to-this-manual.chapter.md @@ -35,9 +35,11 @@ Make sure that your local files aren't added to Git history by adding the follow /**/.direnv ``` -### `devmode` {#sec-contributing-devmode} +### Live preview {#sec-contributing-devmode} -Use [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/de/devmode/README.md) for a live preview when editing the manual. +Run [`devmode`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/de/devmode/README.md) for a live preview while editing the manual: it rebuilds on every change and reloads the page in your browser automatically. + +Changes to the renderer 'pkgs/by-name/ni/nixos-render-docs' need a manual restart. Run: `devmode` again. ## Testing redirects {#sec-contributing-redirects} diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index c8afe6167a7d..78f44ad9ad74 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -201,8 +201,9 @@ rec { --script ./highlightjs/loader.js \ --script ./anchor.min.js \ --script ./anchor-use.js \ - --toc-depth 1 \ - --chunk-toc-depth 1 \ + --sidebar-depth 2 \ + --header ${./header.html}\ + --no-navheader \ ./manual.md \ $dst/${common.indexPath} diff --git a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md index 121abd51c804..78df8d3d77c7 100644 --- a/nixos/doc/manual/development/running-nixos-tests-interactively.section.md +++ b/nixos/doc/manual/development/running-nixos-tests-interactively.section.md @@ -43,6 +43,11 @@ test script). ## Shell access to VMs in interactive mode {#sec-nixos-test-shell-access} +::: {.warning} +Using `shell_interact()` is deprecated. Use the +[interactive SSH backdoor](#sec-nixos-test-ssh-access) instead. +::: + The function `.shell_interact()` grants access to a shell running inside a virtual machine. To use it, replace `` with the name of a virtual machine defined in the test, for example: `machine.shell_interact()`. diff --git a/nixos/doc/manual/development/settings-options.section.md b/nixos/doc/manual/development/settings-options.section.md index f3257a56d71b..e5532f00f371 100644 --- a/nixos/doc/manual/development/settings-options.section.md +++ b/nixos/doc/manual/development/settings-options.section.md @@ -322,6 +322,14 @@ have a predefined type and string generator already declared under The attribute `lib.type.atom` contains the used INI atom. +`pkgs.formats.configobj` { } + +: A function taking an attribute set with values + + It returns a set with [ConfigObj](https://pypi.org/project/configobj/)-specific attributes `type` and `generate` as specified [below](#pkgs-formats-result). + The type of the input is an attribute mapping supporting both atoms and nested attribute sets (sections/subsections), as supported by ConfigObj. + The renderer is based on Python's `configobj` module. + `pkgs.formats.iniWithGlobalSection` { *`listsAsDuplicateKeys`* ? false, *`listToValue`* ? null, \.\.\. } : A function taking an attribute set with values @@ -553,7 +561,7 @@ in default = { }; description = '' Configuration for foo, see - + for supported settings. ''; }; @@ -628,7 +636,7 @@ up in the manual. default = { }; description = '' Configuration for Foo, see - + for supported values. ''; }; diff --git a/nixos/doc/manual/development/writing-nixos-tests.section.md b/nixos/doc/manual/development/writing-nixos-tests.section.md index 8296b4904d3a..c43f6bb34299 100644 --- a/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -146,7 +146,7 @@ Some advantages of virtual machines over containers are: (kernel modules, etc.). - Virtual machines support testing graphical applications on X11. - Virtual machines allow testing NixOS modules that use systemd's namespacing options (such as `ProtectSystem=` or `MountAPIVFS=`). -- Virtual machines allow testing [`spcialisation`](options.html#opt-specialisation). +- Virtual machines allow testing [`specialisation`](options.html#opt-specialisation). (Switching to a specialisation requires the creation of SUID/SGID wrappers, which is disallowed in `systemd-nspawn` within the Nix sandbox.) - Virtual machines allow the execution of `setuid` binaries. diff --git a/nixos/doc/manual/header.html b/nixos/doc/manual/header.html new file mode 100644 index 000000000000..acc029f5c3e4 --- /dev/null +++ b/nixos/doc/manual/header.html @@ -0,0 +1,7 @@ +
+ + Nixos Manual +
diff --git a/nixos/doc/manual/installation/installing-from-other-distro.section.md b/nixos/doc/manual/installation/installing-from-other-distro.section.md index 2b9d3171264a..3ccb16cbe50e 100644 --- a/nixos/doc/manual/installation/installing-from-other-distro.section.md +++ b/nixos/doc/manual/installation/installing-from-other-distro.section.md @@ -47,7 +47,7 @@ The first steps to all these are the same: Where `` corresponds to the latest version available on [channels.nixos.org](https://channels.nixos.org/). - You may want to throw in a `nix-channel --update` for good measure. + You must run `$ nix-channel --update` for the channel change to take effect. 1. Install the NixOS installation tools: diff --git a/nixos/doc/manual/redirects.json b/nixos/doc/manual/redirects.json index 264b17c856e8..27be44d30b25 100644 --- a/nixos/doc/manual/redirects.json +++ b/nixos/doc/manual/redirects.json @@ -101,6 +101,9 @@ "module-services-mautrix-discord-troubleshooting": [ "index.html#module-services-mautrix-discord-troubleshooting" ], + "module-services-onedrive": [ + "index.html#module-services-onedrive" + ], "module-services-tandoor-recipes-migrating-media-option-move": [ "index.html#module-services-tandoor-recipes-migrating-media-option-move", "index.html#module-services-tandoor-recipes-migrating-media-option-1" @@ -616,6 +619,15 @@ "sec-luks-file-systems-fido2-systemd": [ "index.html#sec-luks-file-systems-fido2-systemd" ], + "sec-nfs-file-systems": [ + "index.html#sec-nfs-file-systems" + ], + "sec-nfs-automount": [ + "index.html#sec-nfs-automount" + ], + "sec-nfs-adhoc": [ + "index.html#sec-nfs-adhoc" + ], "sec-sshfs-file-systems": [ "index.html#sec-sshfs-file-systems" ], @@ -1888,6 +1900,9 @@ "sec-kubernetes": [ "index.html#sec-kubernetes" ], + "module-services-nordvpn": [ + "index.html#module-services-nordvpn" + ], "ch-running": [ "index.html#ch-running" ], @@ -2291,6 +2306,9 @@ "test-opt-meta.hydraPlatforms": [ "index.html#test-opt-meta.hydraPlatforms" ], + "test-opt-meta.teams": [ + "index.html#test-opt-meta.teams" + ], "test-opt-meta.timeout": [ "index.html#test-opt-meta.timeout" ], diff --git a/nixos/doc/manual/release-notes/rl-2605.section.md b/nixos/doc/manual/release-notes/rl-2605.section.md index 412afda72e2a..8cdd2f9b64d6 100644 --- a/nixos/doc/manual/release-notes/rl-2605.section.md +++ b/nixos/doc/manual/release-notes/rl-2605.section.md @@ -24,11 +24,11 @@ # Pinned Nixpkgs archive # # Use `curl -I https://channels.nixos.org/nixos-26.05` to get the - # latest commit of the stable channel and `nix --extra-experimental-features nix-command store prefetch-file --unpack` - # to compute its hash. + # latest commit of the stable channel and `nix-prefetch-url --unpack` + # to compute its sha256 hash. nixpkgs = builtins.fetchTarball { url = "https://github.com/NixOS/nixpkgs/archive/c217913993d6.tar.gz"; - hash = "sha256-D1PA3xQv/s4W3lnR9yJFSld8UOLr0a/cBWMQMXS+1Qg="; + sha256 = "026mprs324330pfazlgbw987qmsa8ligglarvqbcxzig2kgw0lqg"; }; in import "${nixpkgs}/nixos" { @@ -57,6 +57,8 @@ Container-based tests also run fine on Nix builders that are themselves VMs without KVM, and because containers can bind-mount host device nodes, they make it possible to exercise GPU/CUDA workloads from within NixOS integration tests. See [the NixOS manual section on writing tests](https://nixos.org/manual/nixos/stable/#sec-writing-nixos-tests) for details on how to opt in and on the limitations of the container backend. + - Coincidentally the driver now exposes machines to the testScript using their attr name used in the test module. E.g. a machine declared with `nodes. = …` is now available as ``. Before, the test driver used their `system.name` option value. They both default to the same value, but if you have set both independently, you might need to adapt your testScript. + ## New Modules {#sec-release-26.05-new-modules} @@ -78,6 +80,8 @@ - [ImmichFrame](https://immichframe.dev/), display your photos from Immich as a digital photo frame. Available as [services.immichframe](#opt-services.immichframe.enable). +- [adw-bluetooth](https://github.com/ezratweaver/adw-bluetooth), a GNOME-inspired LibAdwaita Bluetooth applet. Available as [services.adw-bluetooth](#opt-services.adw-bluetooth.enable). + - [PdfDing](https://www.pdfding.com/), manage, view and edit your PDFs seamlessly on all your devices wherever you are. Available as [services.pdfding](#opt-services.pdfding.enable). - [mangowc](https://github.com/DreamMaoMao/mangowc), a lightweight and feature-rich Wayland compositor based on dwl. Available as [programs.mangowc](#opt-programs.mangowc.enable). @@ -106,6 +110,8 @@ - [clevis-luks-askpass](https://github.com/latchset/clevis), automatic LUKS unlocking in initrd using clevis token bindings stored in LUKS headers. Available as [boot.initrd.clevisLuksAskpass](#opt-boot.initrd.clevisLuksAskpass.enable). +- [passless](https://github.com/pando85/passless), a daemon for using Webauthn Passkeys backed by password-store. + - [bentopdf](https://github.com/alam00000/bentopdf), a privacy-first PDF toolkit running completely in-browser. Available as [services.bentopdf](#opt-services.bentopdf.enable). - [hyprwhspr-rs](https://github.com/better-slop/hyprwhspr-rs), a keybind activated speech-to-text voice dictation utility built for use with Hyprland. Available as [services.hyprwhspr-rs](#opt-services.hyprwhspr-rs.enable). diff --git a/nixos/doc/manual/release-notes/rl-2611.section.md b/nixos/doc/manual/release-notes/rl-2611.section.md index 939b86f7d236..2b7750602776 100644 --- a/nixos/doc/manual/release-notes/rl-2611.section.md +++ b/nixos/doc/manual/release-notes/rl-2611.section.md @@ -4,7 +4,19 @@ -- Create the first release note entry in this section! +- The default PostgreSQL version for new NixOS installations (i.e. with `system.stateVersion >= 26.11`) is v18. + +- The {file}`nixexprs.tar.xz` tarball will be discontinued together with Nixpkgs + 27.05 after 2027-12-31. Migrate to the {file}`nixexprs.tar.zst` tarball + instead. + + This affects for example users who pull Nixpkgs as a flake input from + https://channels.nixos.org: + + ```diff + -nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.xz"; + +nixpkgs.url = "https://channels.nixos.org/nixos-26.05/nixexprs.tar.zst"; + ``` ## New Modules {#sec-release-26.11-new-modules} @@ -12,36 +24,147 @@ - [tranquil](https://tangled.org/tranquil.farm/tranquil-pds) is an ATProto PDS (personal data server) implementation in Rust. A featureful, spec conscious and community driven alternative to the Bluesky reference implementation PDS. Available as [services.tranquil-pds](#opt-services.tranquil-pds.enable). +- [Moonlight Qt](https://moonlight-stream.org/), a client for playing your PC games on almost any device. Available as [programs.moonlight-qt](#opt-programs.moonlight-qt.enable). + - [scx_loader](https://github.com/sched-ext/scx-loader), a system daemon and DBus-based loader for sched_ext schedulers. `scxctl` is the command-line client for interacting with the loader, allowing users to switch schedulers, modes, and arguments dynamically. Available as [services.scx-loader](#opt-services.scx-loader.enable) +- [tap](https://github.com/bluesky-social/indigo/tree/main/cmd/tap), an ATProtocol firehose synchronisation utility. Available as [services.tap](#opt-services.tap.enable). + +- [Nezha](https://github.com/nezhahq/nezha), a self-hosted, lightweight server and website monitoring and O&M tool. Available as [services.nezha](#opt-services.nezha.enable). + +- [Watt](https://github.com/NotAShelf/watt), a CPU frequency and power management daemon for Linux. Available as [services.watt](#opt-services.watt.enable). + +- [mail-tlsa-check-exporter](https://github.com/ietf-tools/mail-tlsa-check-exporter), validates SMTP / IMAP server certificates against a TLSA record as a Prometheus exporter. Available as [services.prometheus.exporters.mail-tlsa-check](#opt-services.prometheus.exporters.mail-tlsa-check.enable). + +- [CastSponsorSkip](https://github.com/gabe565/CastSponsorSkip/), skips YouTube sponsorships (and sometimes ads) on all local Google Cast devices. + +- [Stump](https://www.stumpapp.dev/), a free and open source comics, manga and digital book server with OPDS support. Available as [services.stump](#opt-services.stump.enable). + +- [Freescout](https://freescout.net/), a free, open source Helpdesk and shared mailbox. Available as [services.freescout](#opt-services.freescout.enable). + +- [Koito](https://koito.io/), a modern, themeable scrobbler that you can use with any program that scrobbles to a custom ListenBrainz URL. Available as [services.koito](#opt-services.koito.enable). + - [FlapAlerted](https://github.com/Kioubit/FlapAlerted), detects BGP flapping events and provides statistics based on BGP update messages. Available as [services.flap-alerted](#opt-services.flap-alerted.enable). +- [gocron](https://github.com/flohoss/gocron), a task scheduler with web interface. Available as [services.gocron](#opt-services.gocron.enable). + +- [Unpackerr](https://unpackerr.zip), extracts downloads for Radarr, Sonarr, Lidarr, Readarr, and/or a Watch folder. Available as [services.unpackerr](#opt-services.unpackerr.enable). + +- [Matrix Authentication Service](https://github.com/element-hq/matrix-authentication-service) is an OAuth2.0 and OpenID Connect provider for Matrix homeservers (such as Synapse). It replaces standard password authentication with modern OpenID Connect flows, and can delegate authentication to upstream OIDC providers. Available as [services.matrix-authentication-service](#opt-services.matrix-authentication-service.enable). + +- [stash-clipboard](https://github.com/NotAShelf/stash), a Wayland clipboard "manager" with fast persistent history and multi-media support. Available as [services.stash-clipboard](#opt-services.stash-clipboard.enable). + +- [OO7](https://github.com/linux-credentials/oo7) is a desktop-agnostic Secret Service provider. Available as [services.oo7](#opt-services.oo7.enable) + +- [NordVPN](https://github.com/NordSecurity/nordvpn-linux), a NordVPN client for linux. Available as [services.nordvpn](options.html#opt-services.nordvpn.enable). + ## Backward Incompatibilities {#sec-release-26.11-incompatibilities} - `boot.vesa` has been removed. It was deprecated in 2020 because Xorg now works better with kernel modesetting. If you still need the legacy VESA 800x600 fallback, set `boot.kernelParams = [ "vga=0x317" "nomodeset" ];` directly. +- `authentik` has been updated to 2026.5.3, which changes the default listen address from `0.0.0.0` to `[::]`. + IPv4-only deployments might need to adjust their listen settings. + Deployments running the server and worker in the same network namespace must also set at least the worker + `AUTHENTIK_LISTEN__HTTP` address so that the server and worker do not bind to the same address. + +- `services.alps` has been rewritten, see [upstream repository](https://github.com/migadu/alps) for configuration. + - Support for the legacy U‐Boot image format has been removed from the initrd generators, as it is deprecated upstream and no longer used by any platform in Nixpkgs. - Rustical migrates from `settings.http.host` and `settings.http.port` to `settings.http.bind` to support UNIX domain sockets as well as TCP sockets in one setting. -- `services.llama-cpp` is now configured using structured `services.llama-cpp.settings` attribute. +- A number of options for `services.llama-cpp` have been removed in favor of the structured [](#opt-services.llama-cpp.settings) option, attributes from which are used as arguments to `llama-server` executable, you can see all available options by running `llama-server --help`. Configuring model presets using Nix attribute set via `services.llama-cpp.modelsPreset` is no longer supported, please use `services.llama-cpp.settings.models-preset` with a path to an INI file containing desired options. + +- The `NIX_XDG_DESKTOP_PORTAL_DIR` environment variable is no longer used in the `xdg-desktop-portal` package and is therefore no longer set in `xdg.portal` module. + Instead the `XDG_DATA_DIRS` environment variable is used to find xdg-portals. + + If you were relying on `NIX_XDG_DESKTOP_PORTAL_DIR` to point at custom portal + definitions, add the package providing them to `xdg.portal.extraPortals`. - Python 2 has been removed from the top-level package set, as it is long past end-of-life. The `python2`, `python27`, `python2Full`, `python27Full`, `python2Packages`, and `python27Packages` attributes, along with the legacy `python`, `pythonFull`, and `pythonPackages` aliases, now throw an error directing you to `python3`. The `isPy2` and `isPy27` package flags have been removed accordingly. The only remaining Python 2 interpreter is vendored inside the `resholve` package for its `oil` dependency and is not exposed for general use. +- `security.polkit.enablePkexecWrapper` has been introduced, making the `pkexec` setuid wrapper opt-in. + +- Apache Kafka has dropped support for ZooKeeper mode. The `apacheKafka_3_9` and `apacheKafka_4_0` packages have been removed, as every remaining packaged version is KRaft-only. The `services.apache-kafka.zookeeper` option (previously an alias for `services.apache-kafka.settings."zookeeper.connect"`) has been removed; migrate your cluster to [KRaft](#module-services-apache-kafka-kraft) mode instead. + +- `virtualisation.registries.block` / `insecure` / `search` were deprecated, + because they mapped to the deprecated V1 `registries.conf` format. + See the new option {option}`virtualisation.registries.settings` + and [containers-registries.conf(5)](https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md) + to migrate to the new configuration format. + +- When Avahi's mDNS resolver is enabled (`services.avahi.nssmdns4` or `services.avahi.nssmdns6`), only the minimal mDNS resolver is enabled by default to avoid adding a 5 second delay to every failed reverse hostname lookup (e.g., delaying ping by 5 seconds). The "full" mDNS resolver now remains disabled unless `services.avahi.nssmdnsFull` is also enabled. Users who have customized [`/etc/mdns.allow`](https://github.com/avahi/nss-mdns/tree/master#etcmdnsallow) to allow mDNS domains not ending `.local` must enable `services.avahi.nssmdnsFull` to continue to resolve such domains. + +- String values passed to `services.phpfpm.settings`, `services.phpfpm.pools..phpEnv`, and `services.phpfpm.pools..settings` are now properly quoted and escaped, except for the `${}` syntax that is left as-is. If you are manually escaping these values, please adjust accordingly. + - `systemd.user.extraConfig` has been removed in favor of the structured [](#opt-systemd.user.settings.Manager) option. Use `systemd.user.settings.Manager` to set any `systemd-user.conf(5)` option directly. For example, replace `systemd.user.extraConfig = "DefaultTimeoutStartSec=60";` with `systemd.user.settings.Manager.DefaultTimeoutStartSec = 60;`. +- `matrix-appservice-discord` was removed from nixpkgs along with its NixOS module (`services.matrix-appservice-discord`) as it is no longer actively maintained upstream. Use the actively-maintained puppeting bridge [`mautrix-discord`](#opt-services.mautrix-discord.enable) instead. + - `services.timesyncd.extraConfig` has been removed in favor of the structured [](#opt-services.timesyncd.settings.Time) option. Use `services.timesyncd.settings.Time` to set any `timesyncd.conf(5)` option directly. For example, replace `services.timesyncd.extraConfig = "PollIntervalMaxSec=180";` with `services.timesyncd.settings.Time.PollIntervalMaxSec = 180;`. - `services.firezone.server.provision` has been removed due to it being unmaintanable. Remove all uses of provisioning and use the WebUI to configure firezone. - The `services.syncthing` module now updates the Syncthing REST API using partial updates (`PATCH`) instead of full replacements (`PUT`) for general settings. Updating these settings was broken and prone to errors after updates, see [#428808](https://github.com/NixOS/nixpkgs/issues/428808) and [#528889](https://github.com/NixOS/nixpkgs/issues/528889). As a result, settings modified manually through the Syncthing Web UI that are not explicitly defined in your Nix configuration will now persist across rebuilds. +- `services.plantuml-server.packages.jetty` now supports `jetty_12`, it no longer supports `jetty_11`. + +- `services.komodo-periphery` has been updated to support version 2.0.0. Some options have been renamed to match the new configuration structure; compatibility aliases are provided for the renamed options. The `passkeys` and `outbound.onboardingKey` options have been removed; use `passkeyFiles`, `auth.privateKey`/`auth.corePublicKeys`, or `outbound.onboardingKeyFile` instead. New outbound mode configuration is available under `outbound.*`. + ## Other Notable Changes {#sec-release-26.11-notable-changes} +- `komodo` has been updated to the v2 release line (2.x). See the [upstream v1 → v2 upgrade guide](https://github.com/moghtech/komodo/releases/tag/v2.0.0). + +- `temporal` has been updated to the 1.31 release line. Always consult the [upstream upgrade + notes](https://docs.temporal.io/self-hosted-guide/upgrade-server) before upgrading between versions. + +- The `shell_interact()` function on interactive runs of NixOS VM tests has been deprecated. Use the SSH backdoor instead. + +- [services.netbox](#opt-services.netbox.enable) has received a number of updates: + - Default settings can now be introspected at [](#opt-services.netbox.settings). + - Environment files can now be passed at [](#opt-services.netbox.environmentFiles). + - When Django [secret key](#opt-services.netbox.secretKeyFile) or [API token peppers](#opt-services.netbox.apiTokenPepperFiles) + remain unset, random values will automatically be generated and stored below `/var/lib/netbox`. + - Multiple peppers can now be maintained, which allows for pepper rotation. + - All options to bind the gunicorn socket have been unified in [](#opt-services.netbox.bind) + and the default changed to a UNIX domain socket. + - A cookie-cutter nginx vhost can be enabled at [](#opt-services.netbox.nginx.enable). + +- `security.run0.enableSudoAlias` now uses the `run0-sudo-shim` instead of a shell-script to improve compatibility. + +- With `system.etc.overlay.mutable = false`, NixOS now ships an empty `/etc/machine-id` in the image. Previously the file was absent and systemd logged `System cannot boot: Missing /etc/machine-id and /etc/ is read-only` while `ConditionFirstBoot` fired on every boot. With this change, systemd now overlays a transient ID from `/run/machine-id` for the session, and `systemd-machine-id-commit.service` has `ConditionFirstBoot` so it writes the machine-id through to a persistent backing file when one is bind-mounted over `/etc/machine-id`. To persist the machine-id across reboots, bind-mount a writable file containing `uninitialized` over `/etc/machine-id` from the initrd, or set `systemd.machine_id=` on the kernel command line (use `systemd.machine_id=firmware` to derive a stable ID on hardware that supports it). + +- `security.run0.persistentAuth` options have been added to support persistent Authentication of session. Timeout configurable via `security.polkit.settings.Polkitd.ExpirationSeconds`. + - `boot.loader.systemd-boot` gained support for [Automatic Boot Assessment](https://systemd.io/AUTOMATIC_BOOT_ASSESSMENT/) via the new [`boot.loader.systemd-boot.bootCounting`](#opt-boot.loader.systemd-boot.bootCounting.enable) options, allowing automatic detection of and recovery from bad NixOS generations. As part of this change, boot loader entries on the ESP/XBOOTLDR partition are now named `nixos-.conf` instead of `nixos-generation-.conf`; existing entries are migrated automatically on the next `nixos-rebuild boot`/`switch`. +- `services.nginx` gained a [`lua`](#opt-services.nginx.lua.enable) option to enable Lua scripting via OpenResty's lua-nginx-module on a stock nginx, configuring `lua_package_path`/`lua_package_cpath` from the packages listed in [`services.nginx.lua.extraPackages`](#opt-services.nginx.lua.extraPackages). Use this to add Lua to a regular nginx; for the full OpenResty platform (libraries that rely on its bundled lualib, such as `lua-resty-openidc`), set `services.nginx.package` to `pkgs.openresty` instead — the option configures the Lua search path for it too. + +- `security.polkit.settings` added for RFC42 style configuration of the polkitd daemon. + +- `boot.supportedFilesystems.ntfs` installs `ntfsprogs-plus` instead of `ntfs3g` on kernel version 7.1 and later, unless `boot.supportedFilesystems.ntfs-3g` is explicitly enabled. + +- The `programs.fuse` module, which provides the `fusermount3` executable and the `/etc/fuse.conf` config file, is now opt-in. The obligation to enable it has been shifted to its various consumers (e.g. gvfs, flatpak, appimage, sshfs). This can break fuse consumers at runtime, that don't explicitly declare that dependency with a module, e.g the mounting functionality in various backup tools (borg, restic, rclone, ...). + +- `services.plausible` can now again seed an initial admin user declaratively via [`services.plausible.adminUser.email`](#opt-services.plausible.adminUser.email). + This makes fully declarative deployments safer: Otherwise the user needed to either accept Plausible's unauthenticated "first launch" setup wizard, which lets anyone reaching the instance create the first admin account, or do more work (deploying with NixOS's default binding to `localhost` without exposing it publicly, going through the wizard, and then deploying Plausible exposed to the Internet). + This option was previously removed with NixOS 25.05 due to an upstream Plausible change making declarative admin creation more difficult, but this change re-implements the admin creation directly. + - The `newuidmap` and `newgidmap` security wrappers are now installed with `cap_setuid`/`cap_setgid` file capabilities instead of the setuid-root bit, matching shadow's `--with-fcaps` install mode and other major distributions. Rootless containers (podman, docker-rootless, unprivileged user namespaces) are unaffected. The only behavioural change is that mapping host uid 0 via `/etc/subuid` (which NixOS never configures by default) additionally requires `cap_setfcap`; users who explicitly grant uid 0 in a subuid range can restore the previous behaviour with `security.wrappers.newuidmap.capabilities = lib.mkForce "cap_setuid,cap_setfcap+ep";`. + +- The `authelia` module now uses systemd's `LoadCredential` to load all files defined in `secrets`. As such, these files no longer need to be readable by the authelia user and group: they can for example be set to be only readable by the root user. + +- `zoneminder` has been updated to 1.38.x release. See [upstream release note](https://github.com/ZoneMinder/zoneminder/releases/tag/1.38.0). While database migration should happen automatically, it's recommended that you make a backup of the database before upgrading your system. + +- The latest available version of Nextcloud is v34 (available as `pkgs.nextcloud34`). The installation logic is as follows: + - If [`services.nextcloud.package`](#opt-services.nextcloud.package) is specified explicitly, this package will be installed (**recommended**) + - If `system.stateVersion` is >=26.11, `pkgs.nextcloud34` will be installed by default. + - If [`system.stateVersion`](#opt-system.stateVersion) is >=26.05, `pkgs.nextcloud33` will be installed by default. + - If [`system.stateVersion`](#opt-system.stateVersion) is >=25.11, `pkgs.nextcloud32` will be installed by default. + - Please note that Nextcloud prohibits skipping major versions while upgrading. You can upgrade to specific versions by declaring `services.nextcloud.package = pkgs.nextcloud33;`. + +- `trilium-desktop` and `trilium-server` have been updated to 0.104.0. This release includes security hardening fixes that may break functionality. [See upstream release note for details](https://github.com/TriliumNext/Trilium/releases/tag/v0.104.0). diff --git a/nixos/lib/make-channel.nix b/nixos/lib/make-channel.nix index e366006e908c..098be3237dae 100644 --- a/nixos/lib/make-channel.nix +++ b/nixos/lib/make-channel.nix @@ -18,7 +18,10 @@ pkgs.releaseTools.makeSourceTarball { officialRelease = false; # FIXME: fix this in makeSourceTarball inherit version versionSuffix; - buildInputs = [ pkgs.nix ]; + buildInputs = with pkgs; [ + nix + zstd + ]; distPhase = '' rm -rf .git @@ -32,6 +35,35 @@ pkgs.releaseTools.makeSourceTarball { NIX_STATE_DIR=$TMPDIR nix-env -f ../$releaseName/default.nix -qaP --meta --show-trace --xml \* > /dev/null cd .. chmod -R u+w $releaseName - tar cfJ $out/tarballs/$releaseName.tar.xz $releaseName + + # The compression tasks are shortlived; use all available CPUs (-T0) to + # prioritize fast channel advancement. + XZ_OPT="-T0" tar \ + --create \ + --file=$out/tarballs/$releaseName.tar.xz \ + --xz \ + --absolute-names \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + $releaseName + + tar \ + --create \ + --file="$out/tarballs/$releaseName.tar.zst" \ + --use-compress-program="zstd -19 -T0" \ + --absolute-names \ + --owner=0 \ + --group=0 \ + --numeric-owner \ + --format=gnu \ + --sort=name \ + --mtime="@$SOURCE_DATE_EPOCH" \ + --hard-dereference \ + $releaseName ''; } diff --git a/nixos/lib/qemu-common.nix b/nixos/lib/qemu-common.nix index 9ff482b83f3a..346d3ffcef5a 100644 --- a/nixos/lib/qemu-common.nix +++ b/nixos/lib/qemu-common.nix @@ -46,15 +46,10 @@ rec { powerpc64-linux = "${qemuPkg}/bin/qemu-system-ppc64 -machine powernv"; riscv32-linux = "${qemuPkg}/bin/qemu-system-riscv32 -machine virt"; riscv64-linux = "${qemuPkg}/bin/qemu-system-riscv64 -machine virt"; - x86_64-darwin = "${qemuPkg}/bin/qemu-system-x86_64 -machine accel=${accel "kvm"} -cpu max"; }; otherHostGuestMatrix = { aarch64-darwin = { aarch64-linux = "${qemuPkg}/bin/qemu-system-aarch64 -machine virt,gic-version=2,accel=${accel "hvf"} -cpu max"; - inherit (otherHostGuestMatrix.x86_64-darwin) x86_64-linux; - }; - x86_64-darwin = { - x86_64-linux = "${qemuPkg}/bin/qemu-system-x86_64 -machine type=q35,accel=${accel "hvf"} -cpu max"; }; }; diff --git a/nixos/lib/systemd-lib.nix b/nixos/lib/systemd-lib.nix index 5c974f41dda5..99cc42c48a1d 100644 --- a/nixos/lib/systemd-lib.nix +++ b/nixos/lib/systemd-lib.nix @@ -78,16 +78,13 @@ rec { { preferLocalBuild = true; allowSubstitutes = false; - # unit.text can be null. But variables that are null listed in - # passAsFile are ignored by nix, resulting in no file being created, - # making the mv operation fail. - text = optionalString (unit.text != null) unit.text; - passAsFile = [ "text" ]; + text = unit.text or ""; + __structuredAttrs = true; } '' name=${shellEscape name} mkdir -p "$out/$(dirname -- "$name")" - mv "$textPath" "$out/$name" + printf "%s" "$text" > "$out/$name" '' else pkgs.runCommand "unit-${mkPathSafeName name}-disabled" diff --git a/nixos/lib/systemd-unit-options.nix b/nixos/lib/systemd-unit-options.nix index 8538c8519c53..86bb255a84c3 100644 --- a/nixos/lib/systemd-unit-options.nix +++ b/nixos/lib/systemd-unit-options.nix @@ -625,7 +625,7 @@ rec { listenStreams = mkOption { default = [ ]; - type = types.listOf types.str; + type = types.listOf (types.coercedTo types.port toString types.str); example = [ "0.0.0.0:993" "/run/my-socket" diff --git a/nixos/lib/test-driver/default.nix b/nixos/lib/test-driver/default.nix index 77638397d11c..efc7d8fa9a85 100644 --- a/nixos/lib/test-driver/default.nix +++ b/nixos/lib/test-driver/default.nix @@ -11,6 +11,7 @@ ptpython, pydantic, python, + ovmfvartool, remote-pdb, ruff, ty, @@ -18,8 +19,6 @@ netpbm, vhost-device-vsock, nixosTests, - qemu_pkg ? qemu_test, - qemu_test, setuptools, socat, systemd, @@ -49,6 +48,7 @@ buildPythonApplication { junit-xml ptpython pydantic + ovmfvartool remote-pdb ] ++ extraPythonPackages python.pkgs; @@ -56,7 +56,6 @@ buildPythonApplication { propagatedBuildInputs = [ coreutils netpbm - qemu_pkg socat util-linux vde2 diff --git a/nixos/lib/test-driver/src/test_driver/__init__.py b/nixos/lib/test-driver/src/test_driver/__init__.py index 62c2a6073e6c..774f3afdf49e 100644 --- a/nixos/lib/test-driver/src/test_driver/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/__init__.py @@ -6,6 +6,7 @@ import warnings from pathlib import Path import ptpython.ipython +import ptpython.repl from colorama import Fore, Style from test_driver.debug import Debug, DebugAbstract, DebugNop @@ -174,6 +175,7 @@ def main() -> None: if args.interactive: history_dir = os.getcwd() history_path = os.path.join(history_dir, ".nixos-test-history") + ptpython.repl.enable_deprecation_warnings() ptpython.ipython.embed( user_ns=driver.test_symbols(), history_filename=history_path, diff --git a/nixos/lib/test-driver/src/test_driver/efi.py b/nixos/lib/test-driver/src/test_driver/efi.py new file mode 100644 index 000000000000..fb547ded5dd9 --- /dev/null +++ b/nixos/lib/test-driver/src/test_driver/efi.py @@ -0,0 +1,233 @@ +import binascii +import io +import os.path +import uuid +from collections.abc import Generator +from contextlib import contextmanager +from pathlib import Path +from typing import IO, Any, TypeVar + +from ovmfvartool import ( + AuthenticatedVariable, + FirmwareVolumeHeader, + UEFITime, + VariableStoreHeader, + resolveUUID, +) + +import test_driver.machine +from test_driver.errors import RequestedAssertionFailed + +EfiVariableT = TypeVar("EfiVariableT", bound="EfiVariable") + +# See edk2.git/OvmfPkg/Bhyve/VarStore.fdf.inc +_NV_FTW_WORKING_OFFSET = 0x41000 +_NV_FTW_WORKING_VALUE = binascii.unhexlify( + b"2b29589e687c7d49a0ce6500fd9f1b952caf2c64feffffffe00f000000000000" +) +_NV_FTW_SIZE = 0x42000 +_NV_FTW_MAIN_PLUS_SPARE_SIZE = _NV_FTW_SIZE * 2 + + +class EfiVariable(AuthenticatedVariable): + class Flags: + NON_VOLATILE = 0x1 + BOOTSERVICE_ACCESS = 0x2 + RUNTIME_ACCESS = 0x4 + TIME_BASED_AUTHENTICATED_WRITE_ACCESS = 0x20 + + class State: + VAR_HEADER_VALID_ONLY = 0x7F + VAR_ADDED = 0x3F + + volatile = False + boot_access = False + runtime_access = False + hardware_error_record = False + authenticated_write_access = False + time_based_authenticated_write_access = False + append_write = False + + def __init__( + self, + vendor_uuid: uuid.UUID | None = None, + name: str | None = None, + data: bytes | None = None, + state: int | None = None, + flags: int | None = None, + ) -> None: + self.magic = 0x55AA + self.reserved1 = 0 + self.monotonicCount = 0 + self.timestamp = UEFITime() + self.pubKeyIdx = 0 + self.state = 0 + self.flags = 0 + + if vendor_uuid is not None: + self.vendorUUID = uuid.UUID(bytes=vendor_uuid.bytes_le) + + if state is not None: + self.state = state ^ 0xFF + else: + self.state = (0x40 | 0x80) ^ 0xFF + + if flags is not None: + self.flags = flags + + if name is not None: + self.name = name + self.nameLen = len(name) * 2 + 2 + + if data is not None: + self.data = data + self.dataLen = len(data) + + def _read_flags(self) -> None: + if not (self.flags & 0x1): + self.volatile = True + if self.flags & 0x2: + self.boot_access = True + if self.flags & 0x4: + self.runtime_access = True + if self.flags & 0x8: + self.hardware_error_record = True + if self.flags & 0x10: + self.authenticated_write_access = True + if self.flags & 0x20: + self.time_based_authenticated_write_access = True + if self.flags & 0x40: + self.append_write = True + + self.flags &= ~(0x1 | 0x2 | 0x4 | 0x8 | 0x10 | 0x20 | 0x40) + + @classmethod + def deserialize(cls: type[EfiVariableT], f: Any) -> EfiVariableT | None: + # pylint: disable=no-member + # false positive https://github.com/PyCQA/pylint/issues/981 + ret = super().deserialize(f) + if ret: + ret._read_flags() + return ret + + @classmethod + def deserializeFromDocument( # noqa: N802 + cls: type[EfiVariableT], + vendorID: str, # noqa: N803 + name: str, + doc: dict[str, Any], + ) -> EfiVariableT: + # pylint: disable=no-member + # false positive https://github.com/PyCQA/pylint/issues/981 + ret = super(cls, cls).deserializeFromDocument(vendorID, name, doc) + if ret: + ret._read_flags() + return ret + + +class EfiVars: + """A container around the ovmf variables""" + + state_path: Path + machine: "test_driver.machine.QemuMachine" + + def __init__(self, state_path: Path, machine: Any): + self.state_path = state_path + self.machine = machine + + def _assert_stopped(self) -> None: + if self.machine.booted: + raise RequestedAssertionFailed( + "System is currently running and concurrent reads / writes to the OVMF variables is unsupported" + ) + + def read_content(self) -> dict[str, dict[str, EfiVariable]] | None: + self._assert_stopped() + try: + with open(self.state_path, "rb") as f: + fvh = FirmwareVolumeHeader.deserialize(f) + vsh = VariableStoreHeader.deserialize(f) + _ = fvh + _ = vsh + variables: dict[str, dict[str, EfiVariable]] = {} + + while True: + v = EfiVariable.deserialize(f) + if not v: + break + if v.isDeleted: + continue + + k = resolveUUID(v.vendorUUID) + variables.setdefault(k, {}) + variables[k][v.name] = v + + return variables + + except FileNotFoundError: + return None + + @contextmanager + def _write_store(self, *args, **kwargs) -> Generator[IO[bytes]]: + with open(self.state_path, "wb") as fo: + fm = io.BytesIO(b"\xff" * _NV_FTW_MAIN_PLUS_SPARE_SIZE) + fm.write(FirmwareVolumeHeader.create().serialize()) + fm.write(VariableStoreHeader.create().serialize()) + + try: + yield fm + finally: + fm.seek(_NV_FTW_WORKING_OFFSET) + fm.write(_NV_FTW_WORKING_VALUE) + fm.seek(0) + fo.write(fm.read()) + + def create_empty(self) -> None: + self._assert_stopped() + + if os.path.exists(self.state_path): + raise RequestedAssertionFailed("OVMF variables store exists") + + with self._write_store(): + pass + + def write(self, add: list[EfiVariable]) -> None: + self._assert_stopped() + + variables = self.read_content() + if not variables: + variables = {} + + for var in add: + k = resolveUUID(var.vendorUUID) + variables.setdefault(k, {}) + variables[k][var.name] = var + + with self._write_store() as fm: + for _, vendor in variables.items(): + for _, v in vendor.items(): + fm.write(v.serialize()) + if fm.tell() % 4: + fm.write(b"\xff" * (4 - (fm.tell() % 4))) + assert (fm.tell() % 4) == 0 + + +class EfiGuid: + from ovmfvartool import ( + gEdkiiVarErrorFlagGuid, + gEfiAuthenticatedVariableGuid, + gEfiCertDbGuid, + gEfiCustomModeEnableGuid, + gEfiGlobalVariableGuid, + gEfiImageSecurityDatabaseGuid, + gEfiIp4Config2ProtocolGuid, + gEfiIScsiInitiatorNameProtocolGuid, + gEfiMemoryTypeInformationGuid, + gEfiSecureBootEnableDisableGuid, + gEfiSystemNvDataFvGuid, + gEfiVendorKeysNvGuid, + gIScsiConfigGuid, + gMicrosoftVendorGuid, + gMtcVendorGuid, + mBmHardDriveBootVariableGuid, + ) diff --git a/nixos/lib/test-driver/src/test_driver/machine/__init__.py b/nixos/lib/test-driver/src/test_driver/machine/__init__.py index db96445af912..d1f519c803b9 100644 --- a/nixos/lib/test-driver/src/test_driver/machine/__init__.py +++ b/nixos/lib/test-driver/src/test_driver/machine/__init__.py @@ -22,6 +22,7 @@ from pathlib import Path from queue import Queue from typing import Any +from test_driver.efi import EfiVariable, EfiVars from test_driver.errors import MachineError, RequestedAssertionFailed from test_driver.logger import AbstractLogger from test_driver.machine.ocr import ( @@ -192,6 +193,7 @@ class QemuStartCommand: def build_environment( state_dir: Path, shared_dir: Path, + efi_vars_path: Path | None = None, ) -> dict: # We make a copy to not update the current environment env = dict(os.environ) @@ -202,6 +204,13 @@ class QemuStartCommand: "USE_TMPDIR": "1", } ) + if efi_vars_path is not None: + env.update( + { + "NIX_EFI_VARS": str(efi_vars_path), + } + ) + return env def run( @@ -212,6 +221,7 @@ class QemuStartCommand: qmp_socket_path: Path, shell_socket_path: Path, allow_reboot: bool, + efi_vars_path: Path | None = None, vsock_guest: Path | None = None, ) -> subprocess.Popen: return subprocess.Popen( @@ -227,7 +237,9 @@ class QemuStartCommand: stderr=subprocess.STDOUT, shell=True, cwd=state_dir, - env=self.build_environment(state_dir, shared_dir), + env=self.build_environment( + state_dir, shared_dir, efi_vars_path=efi_vars_path + ), ) @@ -750,6 +762,9 @@ class QemuMachine(BaseMachine): # Store all console output for full log retrieval full_console_log: list[str] + efi_vars_path: Path + efi_vars: EfiVars + def __init__( self, out_dir: Path, @@ -791,6 +806,9 @@ class QemuMachine(BaseMachine): self.booted = False self.connected = False + self.efi_vars_path = self.state_dir / f"{self.name}-efi-vars.fd" + self.efi_vars = EfiVars(self.efi_vars_path, self) + def ssh_backdoor_command(self) -> str: assert self.vsock_host is not None return f"ssh -o User=root vsock-mux/{self.vsock_host}" @@ -908,6 +926,7 @@ class QemuMachine(BaseMachine): return (rc, output.decode(errors="replace")) + @warnings.deprecated("Use the SSH backdoor instead") def shell_interact(self, address: str | None = None) -> None: """ Allows you to directly interact with the guest shell. This should @@ -1044,12 +1063,16 @@ class QemuMachine(BaseMachine): assert self.shell tic = time.time() - # TODO: do we want to bail after a set number of attempts? - while not shell_ready(timeout_secs=30): + + for _ in range(10): + if shell_ready(timeout_secs=30): + break self.log("Guest root shell did not produce any data yet...") self.log( " To debug, enter the VM and run 'systemctl status backdoor.service'." ) + else: + raise RuntimeError("Shell did not start in time") while True: chunk = self.shell.recv(1024) @@ -1164,24 +1187,25 @@ class QemuMachine(BaseMachine): # to match multiline regexes. console = io.StringIO() - def console_matches(_last_try: bool) -> bool: + def console_matches(_last_try: bool, block: bool = False) -> bool: nonlocal console try: - # This will return as soon as possible and - # sleep 1 second. - console.write(self.last_lines.get(block=False)) + while True: + # This will return as soon as possible and + # sleep 1 second. + console.write(self.last_lines.get(block=block)) + console.seek(0) + matches = re.search(regex, console.read()) + if matches is not None: + return True except queue.Empty: - pass - console.seek(0) - matches = re.search(regex, console.read()) - return matches is not None + return False with self.nested(f"waiting for {regex} to appear on console"): if timeout is not None: retry(console_matches, timeout) else: - while not console_matches(False): - pass + console_matches(False, block=True) def get_console_log(self) -> str: """ @@ -1248,6 +1272,7 @@ class QemuMachine(BaseMachine): self.qmp_path, self.shell_path, allow_reboot, + self.efi_vars_path, self.vsock_guest, ) @@ -1432,6 +1457,28 @@ class QemuMachine(BaseMachine): self.connected = False self.connect() + def dump_efi_vars(self) -> None: + for var in self.read_efi_vars(): + var.print() + + def read_efi_vars(self) -> list[EfiVariable]: + config = self.efi_vars.read_content() + if not config: + return [] + + out = [] + for vendor, variables in config.items(): + for name, v in variables.items(): + out.append(v) + + return out + + def create_efi_vars(self) -> None: + self.efi_vars.create_empty() + + def write_efi_vars(self, add: list[EfiVariable]) -> None: + self.efi_vars.write(add) + class NspawnMachine(BaseMachine): """ @@ -1446,6 +1493,7 @@ class NspawnMachine(BaseMachine): machine_sock_path: Path machine_sock: socket.socket | None + notify_thread: threading.Thread | None @staticmethod def machine_name_from_start_command(start_command: str) -> str: @@ -1476,6 +1524,12 @@ class NspawnMachine(BaseMachine): self.start_command = start_command self.process = None + self.notify_thread = None + # State maintained by the notify-socket drainer thread (see + # `_drain_notify_socket`). Guarded by `_notify_lock`. + self._notify_lock = threading.Lock() + self._notify_ready = False + self._notify_leader_pid: int | None = None self.machine_sock_path = self.tmp_dir / f"{self.name}-nspawn.sock" @@ -1510,43 +1564,76 @@ class NspawnMachine(BaseMachine): def is_up(self) -> bool: return self.process is not None - def _poll_socket(self) -> tuple[bool, int | None]: - """Non-blocking check of container status via socket. - Returns (is_ready, leader_pid). + def _drain_notify_socket(self) -> None: + """Continuously drain the container's `sd_notify` socket (NOTIFY_SOCKET) + for the whole lifetime of the container, recording readiness and the + leader PID as they arrive. + + Draining must not stop after boot: the container's PID 1 re-sends + `READY=1` on every `systemctl daemon-reexec` (the same Manager.Reexecute + that switch-to-configuration issues on a systemd change). If nothing + reads the socket, its receive buffer fills and PID 1 blocks in + `sendmsg()` to NOTIFY_SOCKET while re-executing -- it never finishes + re-initializing, and every later `systemctl` call inside the container + hangs or fails with `Transport endpoint is not connected`. """ assert self.machine_sock is not None - ready = False - leader_pid = None - try: - data, _ = self.machine_sock.recvfrom(4096) - msg = data.decode() - for line in msg.splitlines(): + sock = self.machine_sock + proc = self.process + assert proc is not None + # Bound the thread to the container's lifetime: on + # `wait_for_shutdown()` only non-None `proc.poll()` ends the loop. + # On exit of PID 1, any datagrams still queued are stale, so drop them. + while proc.poll() is None: + try: + # Block (with a timeout so we notice the container exiting) + # rather than busy-poll; we just need to keep the buffer empty. + sock.settimeout(0.5) + data, _ = sock.recvfrom(4096) + except (TimeoutError, BlockingIOError): + continue + except OSError: + break + ready = False + leader_pid = None + for line in data.decode(errors="replace").splitlines(): if line == "READY=1": ready = True if line.startswith("X_NSPAWN_LEADER_PID="): leader_pid = int(line.split("=")[1]) - except OSError: - pass - return ready, leader_pid + if ready or leader_pid is not None: + with self._notify_lock: + if ready: + self._notify_ready = True + if leader_pid is not None: + self._notify_leader_pid = leader_pid @cached_property def get_systemd_process(self) -> int: - """Block until startup is complete and return the PID of the container's systemd process.""" - assert self.process is not None + """Block until startup is complete and return the PID of the container's systemd process. - container_pid: int | None = None - is_ready = False + Readiness and the leader PID are reported over NOTIFY_SOCKET, which is + drained by `_drain_notify_socket` (started in `start()`); we just wait + for that thread to record both. + """ + assert self.process is not None start_time = time.monotonic() last_warning = start_time delay = 0.01 max_delay = 0.5 - while not is_ready or container_pid is None: - # Poll the socket until we have the container leader PID + # Poll the socket until we have the container leader PID + while True: if self.process.poll() is not None: raise MachineError("systemd-nspawn process exited unexpectedly") + with self._notify_lock: + is_ready = self._notify_ready + container_pid = self._notify_leader_pid + if is_ready and container_pid is not None: + return container_pid + # Print periodic warnings every 10s so the user knows we aren't deadlocked now = time.monotonic() if now - last_warning > 10.0: @@ -1555,18 +1642,8 @@ class NspawnMachine(BaseMachine): ) last_warning = now - # Poll and update our local tracking variables - ready_now, pid_now = self._poll_socket() - if ready_now: - is_ready = True - if pid_now: - container_pid = pid_now - - if not (is_ready and container_pid): - time.sleep(delay) - delay = min(delay * 2, max_delay) - - return container_pid + time.sleep(delay) + delay = min(delay * 2, max_delay) def _execute( self, @@ -1587,7 +1664,7 @@ class NspawnMachine(BaseMachine): # NOTE If the test calls switch-to-configuration (with a differently configured specialization) # this will use the /etc/profile of the new specialisation while `QemuMachine` nodes # will continue to use the original /etc/profile. - command = f"set -eo pipefail; source /etc/profile; set -u; {command}" + command = f"set -eo pipefail; USER=root HOME=/root source /etc/profile; set -u; {command}" cp = subprocess.run( [ @@ -1680,10 +1757,10 @@ class NspawnMachine(BaseMachine): self.machine_sock = socket.socket(family=socket.AF_UNIX, type=socket.SOCK_DGRAM) self.machine_sock.bind(str(self.machine_sock_path)) - self.machine_sock.setblocking(False) self.process = subprocess.Popen( [self.start_command], + cwd=self.state_dir, env={ "RUN_NSPAWN_ROOT_DIR": str(self.state_dir), "RUN_NSPAWN_SHARED_DIR": str(self.shared_dir), @@ -1695,6 +1772,13 @@ class NspawnMachine(BaseMachine): self.log(f"systemd-nspawn running (pid {self.process.pid})") + # Keep the notify socket drained for the container's whole lifetime, so + # PID 1 never blocks re-sending `READY=1` on `daemon-reexec`. + self.notify_thread = threading.Thread( + target=self._drain_notify_socket, daemon=True + ) + self.notify_thread.start() + journal_thread = threading.Thread(target=self._stream_journal, daemon=True) journal_thread.start() diff --git a/nixos/lib/testing/driver.nix b/nixos/lib/testing/driver.nix index 7a4c7e31a0e1..c15578f4fbfc 100644 --- a/nixos/lib/testing/driver.nix +++ b/nixos/lib/testing/driver.nix @@ -20,7 +20,6 @@ let # the respective qemu version and with or without ocr support testDriver = config.pythonTestDriverPackage.override { inherit (config) enableOCR extraPythonPackages; - qemu_pkg = config.qemu.package; enableNspawn = config.containers != { }; }; diff --git a/nixos/lib/testing/meta.nix b/nixos/lib/testing/meta.nix index 1e8f37cf9b51..2194c04f4eda 100644 --- a/nixos/lib/testing/meta.nix +++ b/nixos/lib/testing/meta.nix @@ -1,6 +1,20 @@ -{ lib, ... }: +{ lib, options, ... }: let inherit (lib) types mkOption literalMD; + + # Approximate position of meta.teams / meta.maintainers in nixos tests. + # Right now this assumes only one such position and ignores other definitions. + # FIXME allow having multiple `maintainersPosition` et al.. + getPosition = + definitionsWithLocations: + if definitionsWithLocations == [ ] then + null + else + { + file = (lib.head definitionsWithLocations).file; + column = 0; + line = 1; + }; in { options = { @@ -12,7 +26,7 @@ in ''; apply = lib.filterAttrs (k: v: v != null); type = types.submodule ( - { config, ... }: + { options, config, ... }: { options = { maintainers = mkOption { @@ -22,6 +36,25 @@ in The [list of maintainers](https://nixos.org/manual/nixpkgs/stable/#var-meta-maintainers) for this test. ''; }; + maintainersPosition = mkOption { + internal = true; + readOnly = true; + type = types.nullOr types.attrs; + default = getPosition options.maintainers.definitionsWithLocations; + }; + teams = mkOption { + type = types.listOf types.raw; + default = [ ]; + description = '' + The [list of maintainer-teams](https://nixos.org/manual/nixpkgs/stable/#var-meta-teams) for this test. + ''; + }; + teamsPosition = mkOption { + internal = true; + readOnly = true; + type = types.nullOr types.attrs; + default = getPosition options.teams.definitionsWithLocations; + }; timeout = mkOption { type = types.nullOr types.int; default = 3600; # 1 hour diff --git a/nixos/lib/testing/network.nix b/nixos/lib/testing/network.nix index 570b854d8e28..86d65faf21ad 100644 --- a/nixos/lib/testing/network.nix +++ b/nixos/lib/testing/network.nix @@ -135,8 +135,13 @@ let ); udevRules = map ( interface: - # MAC Addresses for QEMU network devices are lowercase, and udev string comparison is case-sensitive. - ''SUBSYSTEM=="net",ACTION=="add",ATTR{address}=="${toLower (qemu-common.qemuNicMac interface.vlan config.virtualisation.test.nodeNumber)}",NAME="${interface.name}"'' + lib.concatStringsSep ", " [ + ''SUBSYSTEM=="net"'' + ''ACTION=="add"'' + # MAC Addresses for QEMU network devices are lowercase, and udev string comparison is case-sensitive. + ''ATTR{address}=="${toLower (qemu-common.qemuNicMac interface.vlan config.virtualisation.test.nodeNumber)}"'' + ''NAME="${interface.name}"'' + ] ) interfaces; in { diff --git a/nixos/lib/testing/nodes.nix b/nixos/lib/testing/nodes.nix index f83f268c88b3..6a90990b1829 100644 --- a/nixos/lib/testing/nodes.nix +++ b/nixos/lib/testing/nodes.nix @@ -27,7 +27,6 @@ let else let hostToGuest = { - "x86_64-darwin" = "x86_64-linux"; "aarch64-darwin" = "aarch64-linux"; }; diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 62214cacc101..16b22841ac14 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -127,6 +127,38 @@ let ''; + # user defined font aliases + # priority 53 + aliases = + let + mkFontBlock = + key: fonts: + lib.optionalString ((builtins.length fonts) > 0) '' + <${key}> + ${lib.concatMapStrings (font: "${font}") fonts} + + ''; + + mkAliasBlock = family: opts: '' + + ${family} + ${mkFontBlock "prefer" opts.prefer} + ${mkFontBlock "accept" opts.accept} + ${mkFontBlock "default" opts.default} + + ''; + in + pkgs.writeText "fc-53-user-aliases.conf" '' + + + + + + ${lib.concatStrings (lib.mapAttrsToList mkAliasBlock cfg.aliases)} + + + ''; + # bitmap font options # priority 53 rejectBitmaps = pkgs.writeText "fc-53-no-bitmaps.conf" '' @@ -245,6 +277,9 @@ let # 53-no-bitmaps.conf ln -s ${rejectBitmaps} $dst/53-no-bitmaps.conf + # 53-user-aliases.conf + ln -s ${aliases} $dst/53-user-aliases.conf + ${lib.optionalString (!cfg.allowType1) '' # 53-nixos-reject-type1.conf ln -s ${rejectType1} $dst/53-nixos-reject-type1.conf @@ -522,6 +557,69 @@ in description = "Use embedded bitmaps in fonts like Calibri."; }; + aliases = lib.mkOption { + type = lib.types.attrsOf ( + lib.types.submodule { + options = { + binding = lib.mkOption { + type = lib.types.enum [ + "same" + "weak" + "strong" + ]; + default = "same"; + description = '' + Binding precedence for this font family. See + fontconfig "Font Matching" section for details. + ''; + }; + + prefer = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Fonts whose glyphs are chosen preferentially prior + to fonts which match the alias family. + ''; + }; + + accept = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Fonts that are chosen if none of the preferred + fonts, nor the alias family could provide the + desired glyph. + ''; + }; + + default = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Last chance fallback fonts which are chosen by + default if none of the other options could + provide the desired glyph. + ''; + }; + }; + } + ); + default = { }; + example = lib.literalExpression '' + { + # use FreeSans for Greek symbols missing in Helvetica + "Helvetica" = { + default = [ "FreeSans" ]; + }; + }; + ''; + description = '' + Font aliases that can substitute preferential fonts, + or specify custom fallback fonts. + ''; + }; + }; }; @@ -557,6 +655,9 @@ in # 52-nixos-default-fonts.conf r ${defaultFontsConf}, + # 53-user-aliases.conf + r ${aliases}, + # 53-no-bitmaps.conf r ${rejectBitmaps}, diff --git a/nixos/modules/config/swap.nix b/nixos/modules/config/swap.nix index fa09b61ddec0..c99fd3ddf162 100644 --- a/nixos/modules/config/swap.nix +++ b/nixos/modules/config/swap.nix @@ -106,6 +106,11 @@ let description = "Path of the device or swap file."; }; + isDevice = mkOption { + default = lib.substring 0 5 config.device == "/dev/"; + internal = true; + }; + label = mkOption { example = "swap"; type = types.str; @@ -329,6 +334,7 @@ in ) } ${sw.device} ${sw.deviceName} mkswap ${sw.realDevice} + ${lib.optionalString sw.isDevice "udevadm trigger ${sw.realDevice}"} ''} ''; enableStrictShellChecks = true; diff --git a/nixos/modules/config/sysctl.nix b/nixos/modules/config/sysctl.nix index df4165fbbec5..05f99aff70f4 100644 --- a/nixos/modules/config/sysctl.nix +++ b/nixos/modules/config/sysctl.nix @@ -74,7 +74,9 @@ in } ( '' + set +e mmap_rnd_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$") + set -e if [[ -z "$mmap_rnd_bits_max" ]]; then echo "Unable to determine mmap_rnd_bits_max. Check your kernel configfile is valid." exit 1 @@ -83,7 +85,9 @@ in '' # HAVE_ARCH_MMAP_RND_COMPAT_BITS is not defined on 32-bit architectures or LoongArch64 + lib.optionalString (with pkgs.stdenv.hostPlatform; (!is32bit && !isLoongArch64)) '' + set +e mmap_rnd_compat_bits_max=$(grep "^CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MAX=" $configfile | grep --only-matching "[0-9]*$") + set -e if [[ -z "$mmap_rnd_compat_bits_max" ]]; then echo "Unable to determine mmap_rnd_compat_bits_max. Check your kernel configfile is valid." exit 1 diff --git a/nixos/modules/config/xdg/autostart.nix b/nixos/modules/config/xdg/autostart.nix index 8310c377d43b..46c90ae1793a 100644 --- a/nixos/modules/config/xdg/autostart.nix +++ b/nixos/modules/config/xdg/autostart.nix @@ -4,21 +4,33 @@ teams = [ lib.teams.freedesktop ]; }; - options = { - xdg.autostart.enable = lib.mkOption { - type = lib.types.bool; - default = true; - description = '' - Whether to install files to support the - [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest). - ''; - }; + options.xdg.autostart = { + enable = + lib.mkEnableOption "auto-starting of desktop applications according to the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest)." + // lib.mkOption { + default = true; + }; + install = + lib.mkEnableOption '' + install desktop files following the [XDG Autostart specification](https://specifications.freedesktop.org/autostart-spec/latest) into `/etc/xdg/autostart/`. + + These are handled by your desktop environment or [`systemd-xdg-autostart-generator`](https://www.freedesktop.org/software/systemd/man/latest/systemd-xdg-autostart-generator.html). + '' + // lib.mkOption { + default = true; + }; }; - config = lib.mkIf config.xdg.autostart.enable { - environment.pathsToLink = [ + config = { + # FIXME this does not actually work because "/etc/xdg" is linked + # unconditionally in `nixos/modules/config/system-path.nix` + environment.pathsToLink = lib.mkIf config.xdg.autostart.install [ "/etc/xdg/autostart" ]; - }; + # On by default + systemd.user.generators.systemd-xdg-autostart-generator = lib.mkIf (!config.xdg.autostart.enable) ( + lib.mkDefault "/dev/null" + ); + }; } diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix index 6bc6ce5e33e7..1c240f41c3a7 100644 --- a/nixos/modules/config/xdg/portal.nix +++ b/nixos/modules/config/xdg/portal.nix @@ -116,6 +116,8 @@ in packages = [ pkgs.xdg-desktop-portal ] ++ cfg.extraPortals; in mkIf cfg.enable { + programs.fuse.enable = true; + warnings = lib.optional (cfg.configPackages == [ ] && cfg.config == { }) '' xdg-desktop-portal 1.17 reworked how portal implementations are loaded, you should either set `xdg.portal.config` or `xdg.portal.configPackages` @@ -150,7 +152,6 @@ in sessionVariables = { NIXOS_XDG_OPEN_USE_PORTAL = mkIf cfg.xdgOpenUsePortal "1"; - NIX_XDG_DESKTOP_PORTAL_DIR = "/run/current-system/sw/share/xdg-desktop-portal/portals"; }; etc = lib.concatMapAttrs ( diff --git a/nixos/modules/hardware/all-hardware.nix b/nixos/modules/hardware/all-hardware.nix index b8e364e430d1..8f6ead303c40 100644 --- a/nixos/modules/hardware/all-hardware.nix +++ b/nixos/modules/hardware/all-hardware.nix @@ -79,6 +79,7 @@ in # USB support, especially for booting from USB CD-ROM # drives. "uas" + "xhci-pci-renesas" # SD cards. "sdhci_pci" @@ -158,9 +159,6 @@ in "pinctrl-axp209" "mp8859" - # USB drivers - "xhci-pci-renesas" - # Reset controllers "reset-raspberrypi" # Triggers USB chip firmware load. diff --git a/nixos/modules/hardware/opentabletdriver.nix b/nixos/modules/hardware/opentabletdriver.nix index aac29cac7f2f..44e28b31b387 100644 --- a/nixos/modules/hardware/opentabletdriver.nix +++ b/nixos/modules/hardware/opentabletdriver.nix @@ -61,16 +61,27 @@ in wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; + unitConfig = { + After = "graphical-session.target"; + ConditionEnvironment = [ + "|WAYLAND_DISPLAY" + "|DISPLAY" + ]; + }; + serviceConfig = { Type = "simple"; - # workaround for https://github.com/NixOS/nixpkgs/issues/469340 - ExecStartPre = pkgs.writeShellScript "disable-for-gdm-greeter" '' - if [[ "$USER" = "gdm-greeter"* ]]; then + # workaround for https://github.com/NixOS/nixpkgs/issues/469340 and + # https://github.com/OpenTabletDriver/OpenTabletDriver/issues/4885 + ExecStartPre = pkgs.writeShellScript "poll-for-non-gdm-greeter-display" '' + if [[ "$USER" = "gdm-greeter"* \ + || ( "$${XDG_SESSION_TYPE}" = wayland && -z "$${WAYLAND_DISPLAY}" ) ]]; then exit 1 fi ''; ExecStart = lib.getExe' cfg.package "otd-daemon"; Restart = "on-failure"; + RestartSec = 3; }; }; }; diff --git a/nixos/modules/i18n/input-method/default.nix b/nixos/modules/i18n/input-method/default.nix index 4bbc5f59b0bb..42d974b23d95 100644 --- a/nixos/modules/i18n/input-method/default.nix +++ b/nixos/modules/i18n/input-method/default.nix @@ -23,11 +23,16 @@ let allowSubstitutes = false; buildInputs = [ cfg.package + pkgs.gtk2 + ]; + + disallowedReferences = [ + (lib.getDev pkgs.gtk2) ]; } '' mkdir -p $out/etc/gtk-2.0/ - GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk2.dev "gtk-query-immodules-2.0"} > $out/etc/gtk-2.0/immodules.cache + GTK_PATH=${cfg.package}/lib/gtk-2.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-2.0 > $out/etc/gtk-2.0/immodules.cache ''; gtk3_cache = @@ -37,11 +42,16 @@ let allowSubstitutes = false; buildInputs = [ cfg.package + pkgs.gtk3 + ]; + + disallowedReferences = [ + (lib.getDev pkgs.gtk3) ]; } '' mkdir -p $out/etc/gtk-3.0/ - GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} ${lib.getExe' pkgs.gtk3.dev "gtk-query-immodules-3.0"} > $out/etc/gtk-3.0/immodules.cache + GTK_PATH=${cfg.package}/lib/gtk-3.0/ ${pkgs.stdenv.hostPlatform.emulator pkgs.buildPackages} gtk-query-immodules-3.0 > $out/etc/gtk-3.0/immodules.cache ''; in diff --git a/nixos/modules/i18n/input-method/fcitx5.nix b/nixos/modules/i18n/input-method/fcitx5.nix index 989e5fbf8239..a4c9c7787eff 100644 --- a/nixos/modules/i18n/input-method/fcitx5.nix +++ b/nixos/modules/i18n/input-method/fcitx5.nix @@ -109,7 +109,8 @@ in (pkgs.writeTextDir "share/fcitx5/data/QuickPhrase.mb" ( lib.concatStringsSep "\n" ( lib.mapAttrsToList ( - name: value: "${name} ${builtins.replaceStrings [ "\\" "\n" ] [ "\\\\" "\\n" ] value}" + name: value: + "${name} \"${builtins.replaceStrings [ "\\" "\n" "\"" ] [ "\\\\" "\\n" "\\\"" ] value}\"" ) cfg.quickPhrase ) )) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix index 097a4eca51d5..59e050fe2846 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical-calamares.nix @@ -11,6 +11,9 @@ in { imports = [ ./installation-cd-graphical-base.nix ]; + # required for calamares + security.polkit.enablePkexecWrapper = true; + # required for kpmcore to work correctly programs.partition-manager.enable = true; diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix deleted file mode 100644 index 997423e45257..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64-new-kernel.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-aarch64-new-kernel-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-aarch64-new-kernel.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-aarch64-new-kernel-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix b/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix deleted file mode 100644 index e7afffb81a5a..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-aarch64.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-aarch64-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-aarch64.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-aarch64-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix b/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix deleted file mode 100644 index c16b82256b4f..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-armv7l-multiplatform.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-armv7l-multiplatform-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-armv7l-multiplatform.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-armv7l-multiplatform-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix b/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix deleted file mode 100644 index b870d3a8b24e..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image-raspberrypi.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image-raspberrypi-installer.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image-raspberrypi.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image-raspberrypi-installer.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/cd-dvd/sd-image.nix b/nixos/modules/installer/cd-dvd/sd-image.nix deleted file mode 100644 index 8f8efff4d41d..000000000000 --- a/nixos/modules/installer/cd-dvd/sd-image.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, ... }: -{ - imports = [ - ../sd-card/sd-image.nix - ]; - config = { - warnings = [ - '' - .../cd-dvd/sd-image.nix is deprecated and will eventually be removed. - Please switch to .../sd-card/sd-image.nix, instead. - '' - ]; - }; -} diff --git a/nixos/modules/installer/sd-card/sd-image-aarch64.nix b/nixos/modules/installer/sd-card/sd-image-aarch64.nix index 2f6db6ed8abf..107879c188f1 100644 --- a/nixos/modules/installer/sd-card/sd-image-aarch64.nix +++ b/nixos/modules/installer/sd-card/sd-image-aarch64.nix @@ -31,17 +31,25 @@ populateFirmwareCommands = let configTxt = pkgs.writeText "config.txt" '' - [pi3] - kernel=u-boot-rpi3.bin + kernel=u-boot.bin + # Boot in 64-bit mode. + arm_64bit=1 + + # U-Boot needs this to work, regardless of whether UART is actually used or not. + # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still + # a requirement in the future. + enable_uart=1 + + # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel + # when attempting to show low-voltage or overtemperature warnings. + avoid_warnings=1 + + [pi3] # Otherwise the serial output will be garbled. core_freq=250 - [pi02] - kernel=u-boot-rpi3.bin - [pi4] - kernel=u-boot-rpi4.bin enable_gic=1 armstub=armstub8-gic.bin @@ -58,28 +66,24 @@ # (e.g. for USB device mode) or if USB support is not required. otg_mode=1 - [all] - # Boot in 64-bit mode. - arm_64bit=1 + [cm5] + dtoverlay=dwc2,dr_mode=host - # U-Boot needs this to work, regardless of whether UART is actually used or not. - # Look in arch/arm/mach-bcm283x/Kconfig in the U-Boot tree to see if this is still - # a requirement in the future. - enable_uart=1 - - # Prevent the firmware from smashing the framebuffer setup done by the mainline kernel - # when attempting to show low-voltage or overtemperature warnings. - avoid_warnings=1 + [pi5] + # On some revisions of the RPi5, U-Boot interprets picks up + # ghost inputs from the uart, interrupting the boot process. + # https://bugzilla.opensuse.org/show_bug.cgi?id=1251192 + enable_uart=0 ''; in '' (cd ${pkgs.raspberrypifw}/share/raspberrypi/boot && cp bootcode.bin fixup*.dat start*.elf $NIX_BUILD_TOP/firmware/) + cp ${pkgs.ubootRaspberryPiAarch64}/u-boot.bin firmware/u-boot.bin # Add the config cp ${configTxt} firmware/config.txt # Add pi3 specific files - cp ${pkgs.ubootRaspberryPi3_64bit}/u-boot.bin firmware/u-boot-rpi3.bin cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-2-b.dtb firmware/ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b.dtb firmware/ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-3-b-plus.dtb firmware/ @@ -88,12 +92,20 @@ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2710-rpi-zero-2-w.dtb firmware/ # Add pi4 specific files - cp ${pkgs.ubootRaspberryPi4_64bit}/u-boot.bin firmware/u-boot-rpi4.bin cp ${pkgs.raspberrypi-armstubs}/armstub8-gic.bin firmware/armstub8-gic.bin cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-4-b.dtb firmware/ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-400.dtb firmware/ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4.dtb firmware/ cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2711-rpi-cm4s.dtb firmware/ + + # Add pi5 specific files + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-d-rpi-5-b.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-5-b.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-500.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-cm5-cm4io.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-cm5-cm5io.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-cm5l-cm4io.dtb firmware/ + cp ${pkgs.raspberrypifw}/share/raspberrypi/boot/bcm2712-rpi-cm5l-cm5io.dtb firmware/ ''; populateRootCommands = '' mkdir -p ./files/boot diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index d64afef1e1f8..b9b8307c3ed1 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,8 +1,8 @@ { - x86_64-linux = "/nix/store/6qpfa1c19q4idpjij6s6yywkfvhp820s-nix-2.34.7"; - i686-linux = "/nix/store/npdbf892fhicd1pw8flpywzbvhcdx469-nix-2.34.7"; - aarch64-linux = "/nix/store/5i60qiqjx9bjkcy31fwvnx28ijljlbs3-nix-2.34.7"; - riscv64-linux = "/nix/store/xvl2f539v978jwflp2d9r7znk35br00i-nix-riscv64-unknown-linux-gnu-2.34.7"; - x86_64-darwin = "/nix/store/j9rh0z3zy9rq00lz9ckcsa1g1hn35cyw-nix-2.34.7"; - aarch64-darwin = "/nix/store/yxgyagiaffxkbrff4d7mrg718wdj3llj-nix-2.34.7"; + x86_64-linux = "/nix/store/09hmdfh1i61532nvhi1p1f37l9hjl6z7-nix-2.34.8"; + i686-linux = "/nix/store/5f24f8nk8wnm6fimnx36cl1yhv0i3pli-nix-2.34.8"; + aarch64-linux = "/nix/store/61m1ki4yy2b9gybx42p6czw8irmj7p5i-nix-2.34.8"; + riscv64-linux = "/nix/store/gf1ja21cvli7zl978a8bm0ixl5k69kgg-nix-riscv64-unknown-linux-gnu-2.34.8"; + x86_64-darwin = "/nix/store/kcnnz1r3sgp0bdpf3vjwqgqmk2m02rn8-nix-2.34.8"; + aarch64-darwin = "/nix/store/bfh32jcac5an863033jknr92qg729wl0-nix-2.34.8"; } diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 3d0f4a9f7d86..96d0d68e5c93 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -505,7 +505,7 @@ EOF # This should work for single and multi-device systems. # still needs subvolume support if ($fsType eq "bcachefs") { - my ($status, @info) = runCommand("bcachefs fs usage $rootDir$mountPoint"); + my ($status, @info) = runCommand("@bcachefs@ fs usage $rootDir$mountPoint"); my $UUID = $info[0]; if ($status == 0 && $UUID =~ /^Filesystem:[ \t\n]*([0-9a-z-]+)/) { diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 8fd268ee0d2d..da2e3288936d 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -30,15 +30,20 @@ let name = "nixos-generate-config"; src = ./nixos-generate-config.pl; replacements = { - perl = "${ + perl = lib.getExe ( pkgs.perl.withPackages (p: [ p.FileSlurp p.ConfigIniFiles ]) - }/bin/perl"; + ); hostPlatformSystem = pkgs.stdenv.hostPlatform.system; - detectvirt = "${config.systemd.package}/bin/systemd-detect-virt"; - btrfs = "${pkgs.btrfs-progs}/bin/btrfs"; + detectvirt = lib.getExe' config.systemd.package "systemd-detect-virt"; + bcachefs = + if pkgs.bcachefs-tools.meta.broken then + lib.getExe' pkgs.coreutils "false" + else + lib.getExe pkgs.bcachefs-tools; + btrfs = lib.getExe pkgs.btrfs-progs; inherit (config.system.nixos-generate-config) configuration desktopConfiguration flake; xserverEnabled = config.services.xserver.enable; }; @@ -330,7 +335,7 @@ in ''; config = lib.mkIf config.system.tools.nixos-rebuild.enableRun0Elevation { - security.polkit.enable = lib.mkDefault true; + security.run0.enable = lib.mkDefault true; environment.systemPackages = [ pkgs.polkit-stdin-agent ]; }; } diff --git a/nixos/modules/misc/documentation/modular-services.nix b/nixos/modules/misc/documentation/modular-services.nix index edc60d3bb592..102fa396a758 100644 --- a/nixos/modules/misc/documentation/modular-services.nix +++ b/nixos/modules/misc/documentation/modular-services.nix @@ -19,6 +19,10 @@ let modularServicesModule = { options = { + "" = + fakeSubmodule pkgs.autopush-rs.services.autoconnect; + "" = + fakeSubmodule pkgs.autopush-rs.services.autoendpoint; "" = fakeSubmodule pkgs.ghostunnel.services.default; "" = fakeSubmodule pkgs.ktls-utils.services.default; "" = fakeSubmodule pkgs.php.services.default; diff --git a/nixos/modules/misc/locate.nix b/nixos/modules/misc/locate.nix index 1affb234e418..f12ca95d6ea0 100644 --- a/nixos/modules/misc/locate.nix +++ b/nixos/modules/misc/locate.nix @@ -1,6 +1,7 @@ { config, lib, + utils, pkgs, ... }: @@ -59,7 +60,7 @@ in }; output = lib.mkOption { - type = lib.types.path; + type = lib.types.externalPath; default = "/var/cache/locatedb"; description = '' The database file to build. @@ -249,27 +250,35 @@ in systemd.services.update-locatedb = { description = "Update Locate Database"; - # mlocate's updatedb takes flags via a configuration file or - # on the command line, but not by environment variable. - script = - let - toFlags = - x: lib.optional (cfg.${x} != [ ]) "--${lib.toLower x} '${lib.concatStringsSep " " cfg.${x}}'"; - args = lib.concatLists ( - map toFlags [ + serviceConfig = { + # mlocate's updatedb takes flags via a configuration file or + # on the command line, but not by environment variable. + ExecStart = + let + toFlags = + x: + lib.optionals (cfg.${x} != [ ]) [ + "--${lib.toLower x}" + (lib.concatStringsSep " " cfg.${x}) + ]; + args = lib.concatMap toFlags [ "pruneFS" "pruneNames" "prunePaths" + ]; + in + utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "updatedb") + "--output" + cfg.output + "--prune-bind-mounts" + (lib.boolToYesNo cfg.pruneBindMounts) ] + ++ args + ++ cfg.extraFlags ); - in - '' - exec ${cfg.package}/bin/updatedb \ - --output ${toString cfg.output} ${lib.concatStringsSep " " args} \ - --prune-bind-mounts ${lib.boolToYesNo cfg.pruneBindMounts} \ - ${lib.concatStringsSep " " cfg.extraFlags} - ''; - serviceConfig = { + CapabilityBoundingSet = "CAP_DAC_READ_SEARCH CAP_CHOWN"; Nice = 19; IOSchedulingClass = "idle"; diff --git a/nixos/modules/misc/nixpkgs/test.nix b/nixos/modules/misc/nixpkgs/test.nix index 1d4eff6a72cd..96c461cf795b 100644 --- a/nixos/modules/misc/nixpkgs/test.nix +++ b/nixos/modules/misc/nixpkgs/test.nix @@ -36,7 +36,7 @@ let nixpkgs.hostPlatform = "aarch64-linux"; nixpkgs.buildPlatform = "aarch64-darwin"; nixpkgs.system = "x86_64-linux"; - nixpkgs.localSystem.system = "x86_64-darwin"; + nixpkgs.localSystem.system = "x86_64-freebsd"; nixpkgs.crossSystem.system = "i686-linux"; imports = [ { diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index c563ce901dca..898c0326cf0b 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -54,7 +54,8 @@ let BUG_REPORT_URL = optionalString isNixos "https://github.com/NixOS/nixpkgs/issues"; ANSI_COLOR = optionalString isNixos "0;38;2;126;186;228"; IMAGE_ID = optionalString (config.system.image.id != null) config.system.image.id; - IMAGE_VERSION = optionalString (config.system.image.version != null) config.system.image.version; + ${if config.system.image.version != null then "IMAGE_VERSION" else null} = + config.system.image.version; VARIANT = optionalString (cfg.variantName != null) cfg.variantName; VARIANT_ID = optionalString (cfg.variant_id != null) cfg.variant_id; DEFAULT_HOSTNAME = config.system.nixos.distroId; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a96e30cac837..de6172266d5e 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -193,6 +193,7 @@ ./programs/chrysalis.nix ./programs/clash-verge.nix ./programs/cnping.nix + ./programs/comma.nix ./programs/command-not-found/command-not-found.nix ./programs/coolercontrol.nix ./programs/corefreq.nix @@ -267,6 +268,7 @@ ./programs/mininet.nix ./programs/minipro.nix ./programs/miriway.nix + ./programs/moonlight-qt.nix ./programs/mosh.nix ./programs/mouse-actions.nix ./programs/msmtp.nix @@ -294,6 +296,7 @@ ./programs/opengamepadui.nix ./programs/openvpn3.nix ./programs/partition-manager.nix + ./programs/passless.nix ./programs/pay-respects.nix ./programs/plotinus.nix ./programs/pmount.nix @@ -328,6 +331,7 @@ ./programs/sysdig.nix ./programs/system-config-printer.nix ./programs/systemtap.nix + ./programs/tack.nix ./programs/tcpdump.nix ./programs/television.nix ./programs/throne.nix @@ -354,6 +358,7 @@ ./programs/wayland/mangowc.nix ./programs/wayland/miracle-wm.nix ./programs/wayland/niri.nix + ./programs/wayland/pinnacle.nix ./programs/wayland/river.nix ./programs/wayland/sway.nix ./programs/wayland/uwsm.nix @@ -387,6 +392,7 @@ ./programs/zsh/zsh-syntax-highlighting.nix ./programs/zsh/zsh.nix ./rename.nix + ./security/account-utils.nix ./security/acme ./security/agnos.nix ./security/apparmor.nix @@ -428,7 +434,6 @@ ./services/amqp/activemq/default.nix ./services/amqp/rabbitmq.nix ./services/audio/alsa.nix - ./services/audio/botamusique.nix ./services/audio/gmediarender.nix ./services/audio/gonic.nix ./services/audio/goxlr-utility.nix @@ -558,6 +563,7 @@ ./services/databases/victoriametrics.nix ./services/databases/victoriatraces.nix ./services/desktops/accountsservice.nix + ./services/desktops/adw-bluetooth.nix ./services/desktops/ayatana-indicators.nix ./services/desktops/bamf.nix ./services/desktops/blueman.nix @@ -590,6 +596,7 @@ ./services/desktops/linyaps.nix ./services/desktops/malcontent.nix ./services/desktops/neard.nix + ./services/desktops/oo7.nix ./services/desktops/pipewire/pipewire.nix ./services/desktops/pipewire/wireplumber.nix ./services/desktops/playerctld.nix @@ -725,6 +732,7 @@ ./services/hardware/usbmuxd.nix ./services/hardware/usbrelayd.nix ./services/hardware/vdr.nix + ./services/hardware/watt.nix ./services/home-automation/deye-dummycloud.nix ./services/home-automation/ebusd.nix ./services/home-automation/esphome.nix @@ -798,7 +806,6 @@ ./services/mail/sympa.nix ./services/mail/tlsrpt.nix ./services/mail/zeyple.nix - ./services/matrix/appservice-discord.nix ./services/matrix/appservice-irc.nix ./services/matrix/conduit.nix ./services/matrix/continuwuity.nix @@ -808,6 +815,7 @@ ./services/matrix/hookshot.nix ./services/matrix/lk-jwt-service.nix ./services/matrix/matrix-alertmanager.nix + ./services/matrix/matrix-authentication-service.nix ./services/matrix/maubot.nix ./services/matrix/mautrix-discord.nix ./services/matrix/mautrix-meta.nix @@ -816,6 +824,7 @@ ./services/matrix/mautrix-whatsapp.nix ./services/matrix/mjolnir.nix ./services/matrix/pantalaimon.nix + ./services/matrix/rust-federation-tester.nix ./services/matrix/synapse-auto-compressor.nix ./services/matrix/synapse.nix ./services/matrix/tuwunel.nix @@ -838,6 +847,7 @@ ./services/misc/blenderfarm.nix ./services/misc/calibre-server.nix ./services/misc/canto-daemon.nix + ./services/misc/castsponsorskip.nix ./services/misc/cfdyndns.nix ./services/misc/cgminer.nix ./services/misc/clipcat.nix @@ -977,6 +987,7 @@ ./services/misc/spice-webdavd.nix ./services/misc/spoolman.nix ./services/misc/sssd.nix + ./services/misc/stash-clipboard.nix ./services/misc/subsonic.nix ./services/misc/sundtek.nix ./services/misc/svnserve.nix @@ -996,6 +1007,7 @@ ./services/misc/tuxclocker.nix ./services/misc/tzupdate.nix ./services/misc/uhub.nix + ./services/misc/unpackerr.nix ./services/misc/wastebin.nix ./services/misc/weechat.nix ./services/misc/workout-tracker.nix @@ -1052,6 +1064,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/netdata.nix ./services/monitoring/nezha-agent.nix + ./services/monitoring/nezha.nix ./services/monitoring/ocsinventory-agent.nix ./services/monitoring/opentelemetry-collector.nix ./services/monitoring/osquery.nix @@ -1331,6 +1344,7 @@ ./services/networking/nncp.nix ./services/networking/nntp-proxy.nix ./services/networking/nomad.nix + ./services/networking/nordvpn.nix ./services/networking/nsd.nix ./services/networking/ntopng.nix ./services/networking/ntp/chrony.nix @@ -1423,6 +1437,7 @@ ./services/networking/tailscale-derper.nix ./services/networking/tailscale-serve.nix ./services/networking/tailscale.nix + ./services/networking/tap.nix ./services/networking/tayga.nix ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix @@ -1486,6 +1501,7 @@ ./services/scheduling/atd.nix ./services/scheduling/cron.nix ./services/scheduling/fcron.nix + ./services/scheduling/gocron.nix ./services/scheduling/prefect.nix ./services/scheduling/scx-loader.nix ./services/scheduling/scx.nix @@ -1658,10 +1674,12 @@ ./services/web-apps/firefly-iii.nix ./services/web-apps/flarum.nix ./services/web-apps/fluidd.nix + ./services/web-apps/freescout.nix ./services/web-apps/freshrss.nix ./services/web-apps/froide-govplan.nix ./services/web-apps/galene.nix ./services/web-apps/gancio.nix + ./services/web-apps/geoserver.nix ./services/web-apps/gerrit.nix ./services/web-apps/glance.nix ./services/web-apps/glitchtip.nix @@ -1700,6 +1718,7 @@ ./services/web-apps/kavita.nix ./services/web-apps/keycloak.nix ./services/web-apps/kimai.nix + ./services/web-apps/koito.nix ./services/web-apps/komga.nix ./services/web-apps/lanraragi.nix ./services/web-apps/lasuite-docs.nix @@ -1795,6 +1814,7 @@ ./services/web-apps/stirling-pdf.nix ./services/web-apps/strfry.nix ./services/web-apps/strichliste.nix + ./services/web-apps/stump.nix ./services/web-apps/suwayomi-server.nix ./services/web-apps/szurubooru.nix ./services/web-apps/tabbyapi.nix @@ -1805,6 +1825,7 @@ ./services/web-apps/umami.nix ./services/web-apps/vikunja.nix ./services/web-apps/wakapi.nix + ./services/web-apps/wealthfolio.nix ./services/web-apps/weblate.nix ./services/web-apps/websurfx.nix ./services/web-apps/whitebophir.nix @@ -1837,10 +1858,10 @@ ./services/web-servers/minio.nix ./services/web-servers/molly-brown.nix ./services/web-servers/nginx/default.nix - ./services/web-servers/nginx/gitweb.nix ./services/web-servers/nginx/tailscale-auth.nix ./services/web-servers/phpfpm/default.nix ./services/web-servers/pomerium.nix + ./services/web-servers/rustfs.nix ./services/web-servers/rustus.nix ./services/web-servers/send.nix ./services/web-servers/stargazer.nix @@ -1908,6 +1929,7 @@ ./system/boot/clevis-luks-askpass.nix ./system/boot/clevis.nix ./system/boot/emergency-mode.nix + ./system/boot/extra-initrd.nix ./system/boot/grow-partition.nix ./system/boot/initrd-network.nix ./system/boot/initrd-openvpn.nix @@ -1961,6 +1983,7 @@ ./system/boot/systemd/userdbd.nix ./system/boot/timesyncd.nix ./system/boot/tmp.nix + ./system/boot/tzpfms.nix ./system/boot/uki.nix ./system/boot/unl0kr.nix ./system/boot/uvesafb.nix diff --git a/nixos/modules/profiles/bashless.nix b/nixos/modules/profiles/bashless.nix index 501563b97b3d..20f2f7256f07 100644 --- a/nixos/modules/profiles/bashless.nix +++ b/nixos/modules/profiles/bashless.nix @@ -15,8 +15,6 @@ environment.corePackages = lib.mkForce [ ]; # Contains bash completions nix.enable = lib.mkDefault false; - # The fuse{,3} package contains a runtime dependency on bash. - programs.fuse.enable = lib.mkDefault false; documentation.man.man-db.enable = lib.mkDefault false; # autovt depends on bash console.enable = lib.mkDefault false; diff --git a/nixos/modules/programs/appimage.nix b/nixos/modules/programs/appimage.nix index c0379557c97a..4662a6c3d8cc 100644 --- a/nixos/modules/programs/appimage.nix +++ b/nixos/modules/programs/appimage.nix @@ -43,6 +43,8 @@ in } ); environment.systemPackages = [ cfg.package ]; + + programs.fuse.enable = true; }; meta.maintainers = with lib.maintainers; [ diff --git a/nixos/modules/programs/bat.nix b/nixos/modules/programs/bat.nix index cbe6ac48e909..3ebc0424a3fd 100644 --- a/nixos/modules/programs/bat.nix +++ b/nixos/modules/programs/bat.nix @@ -8,6 +8,7 @@ let inherit (builtins) isList; inherit (lib) concatMapStrings + escapeShellArg literalExpression maintainers mapAttrs' @@ -34,7 +35,7 @@ let else if isBool value then boolToString value else - toString value; + escapeShellArg (toString value); in { options.programs.bat = { diff --git a/nixos/modules/programs/captive-browser.nix b/nixos/modules/programs/captive-browser.nix index 368994e8829f..95c5c37e92be 100644 --- a/nixos/modules/programs/captive-browser.nix +++ b/nixos/modules/programs/captive-browser.nix @@ -21,8 +21,6 @@ let types ; - requiresSetcapWrapper = config.boot.kernelPackages.kernelOlder "5.7" && cfg.bindInterface; - browserDefault = chromium: concatStringsSep " " [ @@ -30,11 +28,20 @@ let "${chromium}/bin/chromium" "--user-data-dir=\${XDG_DATA_HOME:-$HOME/.local/share}/chromium-captive" ''--proxy-server="socks5://$PROXY"'' - ''--host-resolver-rules="MAP * ~NOTFOUND , EXCLUDE localhost"'' + ''--proxy-bypass-list="<-loopback>"'' "--no-first-run" "--new-window" "--incognito" "-no-default-browser-check" + "--no-crash-upload" + "--disable-extensions" + "--disable-sync" + "--disable-background-networking" + "--disable-client-side-phishing-detection" + "--disable-component-update" + "--disable-translate" + "--disable-web-resources" + "--safebrowsing-disable-auto-update" "http://cache.nixos.org/" ]; @@ -144,12 +151,5 @@ in else throw "programs.captive-browser.dhcp-dns must be set" ); - - security.wrappers.captive-browser = mkIf requiresSetcapWrapper { - owner = "root"; - group = "root"; - capabilities = "cap_net_raw+p"; - source = "${captive-browser-configured}/bin/captive-browser"; - }; }; } diff --git a/nixos/modules/programs/clash-verge.nix b/nixos/modules/programs/clash-verge.nix index b54643679279..511599efc9ac 100644 --- a/nixos/modules/programs/clash-verge.nix +++ b/nixos/modules/programs/clash-verge.nix @@ -21,7 +21,15 @@ defaultText = lib.literalExpression "pkgs.clash-verge-rev"; }; serviceMode = lib.mkEnableOption "Service Mode"; - tunMode = lib.mkEnableOption "Setcap for TUN Mode. DNS settings won't work on this way"; + tunMode = lib.mkEnableOption "" // { + description = '' + Whether to set the capabilities required for TUN mode. + + Without these capabilities, Clash Verge's DNS settings will not work in TUN mode. + + When enabled, reverse path filtering will be set to loose instead of strict. + ''; + }; autoStart = lib.mkEnableOption "Clash Verge auto launch"; group = lib.mkOption { type = lib.types.str; @@ -59,6 +67,22 @@ source = "${lib.getExe cfg.package}"; }; + assertions = [ + { + assertion = + cfg.tunMode + -> + config.networking.firewall.checkReversePath != true + && config.networking.firewall.checkReversePath != "strict"; + message = '' + {option}`programs.clash-verge.tunMode` requires {option}`networking.firewall.checkReversePath` + to be set to `false` or `"loose"`. + ''; + } + ]; + + networking.firewall.checkReversePath = lib.mkIf cfg.tunMode (lib.mkDefault "loose"); + systemd.services.clash-verge = lib.mkIf cfg.serviceMode { enable = true; description = "Clash Verge Service Mode"; diff --git a/nixos/modules/programs/comma.nix b/nixos/modules/programs/comma.nix new file mode 100644 index 000000000000..89fa20fd4812 --- /dev/null +++ b/nixos/modules/programs/comma.nix @@ -0,0 +1,52 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.programs.comma; +in +{ + options.programs.comma = { + enable = lib.mkEnableOption "comma"; + package = lib.mkPackageOption pkgs "comma" { }; + enableBashIntegration = lib.mkEnableOption "comma command-not-found handler for bash" // { + default = true; + }; + enableZshIntegration = lib.mkEnableOption "comma command-not-found handler for zsh" // { + default = true; + }; + enableFishIntegration = lib.mkEnableOption "comma command-not-found handler for fish" // { + default = true; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + programs = { + bash.interactiveShellInit = lib.mkIf cfg.enableBashIntegration '' + source ${cfg.package}/share/comma/command-not-found.sh + ''; + zsh.interactiveShellInit = lib.mkIf cfg.enableZshIntegration '' + source ${cfg.package}/share/comma/command-not-found.sh + ''; + fish.interactiveShellInit = '' + source ${cfg.package}/share/comma/command-not-found.fish + ''; + + # Disable *other* command-not-found handlers + command-not-found.enable = lib.mkIf ( + cfg.enableBashIntegration || cfg.enableZshIntegration || cfg.enableFishIntegration + ) (lib.mkDefault false); + nix-index = { + enableBashIntegration = lib.mkIf (cfg.enableBashIntegration) (lib.mkDefault false); + enableZshIntegration = lib.mkIf (cfg.enableZshIntegration) (lib.mkDefault false); + enableFishIntegration = lib.mkIf (cfg.enableFishIntegration) (lib.mkDefault false); + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ pandapip1 ]; +} diff --git a/nixos/modules/programs/corefreq.nix b/nixos/modules/programs/corefreq.nix index c656b4a13da1..b062ca22aa5e 100644 --- a/nixos/modules/programs/corefreq.nix +++ b/nixos/modules/programs/corefreq.nix @@ -12,7 +12,7 @@ in { options = { programs.corefreq = { - enable = lib.mkEnableOption "Whether to enable the corefreq daemon and kernel module"; + enable = lib.mkEnableOption "the corefreq daemon and kernel module"; package = lib.mkOption { type = lib.types.package; diff --git a/nixos/modules/programs/firefox.nix b/nixos/modules/programs/firefox.nix index 180e61231b07..243231e51470 100644 --- a/nixos/modules/programs/firefox.nix +++ b/nixos/modules/programs/firefox.nix @@ -327,7 +327,6 @@ in }; meta.maintainers = with lib.maintainers; [ - danth linsui ]; } diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix index 86c29477ebcc..734d19bdc92d 100644 --- a/nixos/modules/programs/fish.nix +++ b/nixos/modules/programs/fish.nix @@ -262,22 +262,17 @@ in (lib.mkIf cfg.generateCompletions { etc."fish/generated_completions".source = let - patchedGenerator = pkgs.stdenv.mkDerivation { - name = "fish_patched-completion-generator"; - srcs = [ - "${cfg.package}/share/fish/tools/create_manpage_completions.py" - ]; - unpackCmd = "cp $curSrc $(basename $curSrc)"; - sourceRoot = "."; - patches = [ ./fish_completion-generator.patch ]; # to prevent collisions of identical completion files - dontBuild = true; - installPhase = '' - mkdir -p $out - cp * $out/ - ''; - preferLocalBuild = true; - allowSubstitutes = false; - }; + # fish embeds the generator script in the binary, so extract it. + generator = + pkgs.runCommandLocal "fish_completion-generator" + { + nativeBuildInputs = [ cfg.package ]; + } + '' + mkdir -p $out + fish --no-config -c 'status get-file tools/create_manpage_completions.py' \ + > $out/create_manpage_completions.py + ''; generateCompletions = package: pkgs.runCommandLocal @@ -298,8 +293,25 @@ in '' mkdir -p $out if [ -d $package/share/man ]; then - find -L $package/share/man -type f | xargs ${pkgs.python3.pythonOnBuildForHost.interpreter} ${patchedGenerator}/create_manpage_completions.py --directory $out >/dev/null + find -L $package/share/man -type f -print0 \ + | xargs -0 ${pkgs.python3.pythonOnBuildForHost.interpreter} \ + ${generator}/create_manpage_completions.py --directory $out \ + >/dev/null fi + + # The generator emits a header comment containing the man page store + # path. Strip it so identical completions from different packages + # don't collide and so we don't retain runtime references to the + # inputs. Fail if generated files lack the expected header so that a + # change in the upstream format gets noticed. + shopt -s nullglob + for f in $out/*.fish; do + if ! grep -q '^# Autogenerated from ' "$f"; then + echo "error: expected '# Autogenerated from' header not found in $f" >&2 + exit 1 + fi + sed -i '/^# Autogenerated from /d' "$f" + done ''; packages = if diff --git a/nixos/modules/programs/fish_completion-generator.patch b/nixos/modules/programs/fish_completion-generator.patch deleted file mode 100644 index fa207e484c99..000000000000 --- a/nixos/modules/programs/fish_completion-generator.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/create_manpage_completions.py -+++ b/create_manpage_completions.py -@@ -879,10 +879,6 @@ def parse_manpage_at_path(manpage_path, output_directory): - ) - return False - -- # Output the magic word Autogenerated so we can tell if we can overwrite this -- built_command_output.insert( -- 0, "# " + CMDNAME + "\n# Autogenerated from man page " + manpage_path -- ) - # built_command_output.insert(2, "# using " + parser.__class__.__name__) # XXX MISATTRIBUTES THE CULPABLE PARSER! Was really using Type2 but reporting TypeDeroffManParser - - for line in built_command_output: - diff --git a/nixos/modules/programs/foot/bashrc b/nixos/modules/programs/foot/bashrc index e35bc29f117b..d3fb0ffcb4bf 100644 --- a/nixos/modules/programs/foot/bashrc +++ b/nixos/modules/programs/foot/bashrc @@ -1,3 +1,8 @@ +case "$TERM" in + foot*) : ;; + *) return 0 ;; +esac + osc7_cwd() { local strlen=${#PWD} local encoded="" diff --git a/nixos/modules/programs/foot/config.fish b/nixos/modules/programs/foot/config.fish index c7d45211327f..92f614421268 100644 --- a/nixos/modules/programs/foot/config.fish +++ b/nixos/modules/programs/foot/config.fish @@ -1,3 +1,7 @@ +if ! string match -q "foot*" "$TERM" + return 0 +end + function update_cwd_osc --on-variable PWD --description 'Notify terminals when $PWD changes' if status --is-command-substitution || set -q INSIDE_EMACS return diff --git a/nixos/modules/programs/foot/zshrc b/nixos/modules/programs/foot/zshrc index 186f21c987e5..935dd49aaed5 100644 --- a/nixos/modules/programs/foot/zshrc +++ b/nixos/modules/programs/foot/zshrc @@ -1,3 +1,8 @@ +case "$TERM" in + foot*) : ;; + *) return 0 ;; +esac + function osc7-pwd() { emulate -L zsh # also sets localoptions for us setopt extendedglob diff --git a/nixos/modules/programs/fuse.nix b/nixos/modules/programs/fuse.nix index e7e317d7ef9b..07026cbd33db 100644 --- a/nixos/modules/programs/fuse.nix +++ b/nixos/modules/programs/fuse.nix @@ -12,9 +12,7 @@ in meta.maintainers = [ ]; options.programs.fuse = { - enable = lib.mkEnableOption "fuse" // { - default = true; - }; + enable = lib.mkEnableOption "fuse"; mountMax = lib.mkOption { # In the C code it's an "int" (i.e. signed and at least 16 bit), but diff --git a/nixos/modules/programs/gamemode.nix b/nixos/modules/programs/gamemode.nix index 834ae6f54a1d..3e568f9a68aa 100644 --- a/nixos/modules/programs/gamemode.nix +++ b/nixos/modules/programs/gamemode.nix @@ -60,7 +60,10 @@ in }; security = { - polkit.enable = true; + polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; wrappers = lib.mkIf cfg.enableRenice { gamemoded = { owner = "root"; diff --git a/nixos/modules/programs/immersed.nix b/nixos/modules/programs/immersed.nix index 0fb217b91d54..7c7b8d13592d 100644 --- a/nixos/modules/programs/immersed.nix +++ b/nixos/modules/programs/immersed.nix @@ -26,6 +26,12 @@ in programs.immersed = { enable = lib.mkEnableOption "immersed"; + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to open firewall ports for Immersed"; + }; + package = lib.mkPackageOption pkgs "immersed" { }; }; }; @@ -43,6 +49,15 @@ in }; environment.systemPackages = [ cfg.package ]; + + # https://immersed.helpscoutdocs.com/article/23-connection-troubleshooting-linux + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ 21000 ]; + allowedUDPPorts = [ + 21000 + 21010 + ]; + }; }; meta.maintainers = pkgs.immersed.meta.maintainers; diff --git a/nixos/modules/programs/moonlight-qt.nix b/nixos/modules/programs/moonlight-qt.nix new file mode 100644 index 000000000000..e836869f2661 --- /dev/null +++ b/nixos/modules/programs/moonlight-qt.nix @@ -0,0 +1,39 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.programs.moonlight-qt; +in +{ + options.programs.moonlight-qt = { + enable = lib.mkEnableOption "Moonlight Qt, a client for playing your PC games on almost any device"; + + package = lib.mkPackageOption pkgs "moonlight-qt" { }; + + capSysNice = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Add the CAP_SYS_NICE capability to Moonlight Qt so that it may raise + its scheduling priority. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + security.wrappers.moonlight = lib.mkIf cfg.capSysNice { + owner = "root"; + group = "root"; + source = lib.getExe cfg.package; + capabilities = "cap_sys_nice+ep"; + }; + }; + + meta.maintainers = with lib.maintainers; [ aaravrav ]; +} diff --git a/nixos/modules/programs/mouse-actions.nix b/nixos/modules/programs/mouse-actions.nix index 3022a1059b1f..625c30308c37 100644 --- a/nixos/modules/programs/mouse-actions.nix +++ b/nixos/modules/programs/mouse-actions.nix @@ -17,9 +17,7 @@ in Note that only users in the "uinput" group will be able to use the package ''; }; - package = lib.mkPackageOption pkgs "mouse-actions" { - example = "mouse-actions-gui"; - }; + package = lib.mkPackageOption pkgs "mouse-actions" { }; autorun = lib.mkOption { type = lib.types.bool; default = false; diff --git a/nixos/modules/programs/passless.nix b/nixos/modules/programs/passless.nix new file mode 100644 index 000000000000..b25b2bd3d15d --- /dev/null +++ b/nixos/modules/programs/passless.nix @@ -0,0 +1,134 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.passless; + settingsFormat = pkgs.formats.toml { }; + settingsFile = settingsFormat.generate "passless.toml" cfg.settings; +in +{ + + options.programs.passless = { + enable = lib.mkEnableOption "passless"; + + package = lib.mkPackageOption pkgs "passless" { }; + + users = lib.options.mkOption { + type = with lib.types; listOf str; + description = '' + Users that intend to use passless and should be added to the fido group. + ''; + default = [ ]; + example = [ "alice" ]; + }; + + settings = lib.mkOption { + inherit (settingsFormat) type; + default = { }; + example = { + pass.store-path = "/home/alice/.local/share/password-store"; + }; + description = '' + Configuration included in `config.toml`. + + See for documentation or run `passless config print` to see default configuration. + ''; + }; + }; + + config = lib.mkIf config.programs.passless.enable { + users.groups.fido.members = cfg.users; + + boot.kernelModules = [ "uhid" ]; + + services.udev.extraRules = '' + KERNEL=="uhid", GROUP="fido", MODE="0660" + ''; + + # From https://github.com/pando85/passless/blob/master/contrib/systemd/passless.service + systemd.user.services.passless = { + description = "Passless FIDO2 Software Authenticator"; + documentation = [ "https://github.com/pando85/passless" ]; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "default.target" ]; + path = [ config.programs.gnupg.package ]; + serviceConfig = { + Type = "simple"; + ExecStart = "${lib.getExe cfg.package} --config-path ${settingsFile}"; + Restart = "on-failure"; + RestartSec = "5s"; + # Security hardening + # The application already handles its own memory locking and core dump prevention + # but we can add additional systemd protections + NoNewPrivileges = true; + LimitMEMLOCK = "2M"; + SyslogIdentifier = "passless"; + + # Found with shh + ProtectSystem = "strict"; + PrivateTmp = "disconnected"; + PrivateMounts = "true"; + ProtectKernelTunables = "true"; + ProtectKernelModules = true; + ProtectKernelLogs = true; + LockPersonality = true; + RestrictRealtime = true; + ProtectClock = true; + MemoryDenyWriteExecute = true; + RestrictAddressFamilies = "AF_UNIX"; + SocketBindDeny = [ + "ipv4:tcp" + "ipv4:udp" + "ipv6:tcp" + "ipv6:udp" + ]; + CapabilityBoundingSet = [ + "~CAP_BLOCK_SUSPEND" + "CAP_BPF" + "CAP_CHOWN" + "CAP_MKNOD" + "CAP_NET_RAW" + "CAP_PERFMON" + "CAP_SYS_BOOT" + "CAP_SYS_CHROOT" + "CAP_SYS_MODULE" + "CAP_SYS_NICE" + "CAP_SYS_PACCT" + "CAP_SYS_PTRACE" + "CAP_SYS_TIME" + "CAP_SYSLOG" + "CAP_WAKE_ALARM" + ]; + SystemCallFilter = [ + "~@aio:EPERM" + "@chown:EPERM" + "@clock:EPERM" + "@cpu-emulation:EPERM" + "@debug:EPERM" + "@ipc:EPERM" + "@keyring:EPERM" + "@module:EPERM" + "@mount:EPERM" + "@obsolete:EPERM" + "@pkey:EPERM" + "@privileged:EPERM" + "@raw-io:EPERM" + "@reboot:EPERM" + "@resources:EPERM" + "@sandbox:EPERM" + "@setuid:EPERM" + "@swap:EPERM" + "@sync:EPERM" + ]; + + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ erictapen ]; + +} diff --git a/nixos/modules/programs/sniffnet.nix b/nixos/modules/programs/sniffnet.nix index 91d56871dac6..6258bcb67c95 100644 --- a/nixos/modules/programs/sniffnet.nix +++ b/nixos/modules/programs/sniffnet.nix @@ -17,6 +17,8 @@ in }; config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.sniffnet ]; + security.wrappers.sniffnet = { owner = "root"; group = "root"; diff --git a/nixos/modules/programs/tack.nix b/nixos/modules/programs/tack.nix new file mode 100644 index 000000000000..6b39c72bda4e --- /dev/null +++ b/nixos/modules/programs/tack.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.programs.tack; +in +{ + options.programs.tack = { + enable = lib.mkEnableOption "tack, flake-like toml nix pins"; + + package = lib.mkPackageOption pkgs "tack" { }; + + nixConfTokens = lib.mkEnableOption "tack reading access tokens from nix.conf (significantly improves comparison speed)"; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + environment.sessionVariables = lib.mkIf cfg.nixConfTokens { + TACK_NIX_CONF_TOKENS = "1"; + }; + }; +} diff --git a/nixos/modules/programs/throne.nix b/nixos/modules/programs/throne.nix index 2023055892dd..a64178c77757 100644 --- a/nixos/modules/programs/throne.nix +++ b/nixos/modules/programs/throne.nix @@ -64,32 +64,36 @@ in # 3. Put ThroneCore into a systemd service, and let polkit check service name. # This is the most secure and convenient way but requires heavy modification # to Throne source code. Would be good to let upstream support that eventually. - security.polkit.extraConfig = - lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable) - '' - polkit.addRule(function(action, subject) { - const allowedActionIds = [ - "org.freedesktop.resolve1.revert", - "org.freedesktop.resolve1.set-domains", - "org.freedesktop.resolve1.set-default-route", - "org.freedesktop.resolve1.set-dns-servers" - ]; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + extraConfig = + lib.mkIf (cfg.tunMode.enable && (!cfg.tunMode.setuid) && config.services.resolved.enable) + '' + polkit.addRule(function(action, subject) { + const allowedActionIds = [ + "org.freedesktop.resolve1.revert", + "org.freedesktop.resolve1.set-domains", + "org.freedesktop.resolve1.set-default-route", + "org.freedesktop.resolve1.set-dns-servers" + ]; - if (allowedActionIds.indexOf(action.id) !== -1) { - try { - var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim(); - var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim(); - if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) { - return polkit.Result.YES; - } else { + if (allowedActionIds.indexOf(action.id) !== -1) { + try { + var parentPid = polkit.spawn(["${lib.getExe' pkgs.procps "ps"}", "-o", "ppid=", subject.pid]).trim(); + var parentCap = polkit.spawn(["${lib.getExe' pkgs.libcap "getpcaps"}", parentPid]).trim(); + if (parentCap.includes("cap_net_admin") && parentCap.includes("cap_net_raw")) { + return polkit.Result.YES; + } else { + return polkit.Result.NOT_HANDLED; + } + } catch (e) { return polkit.Result.NOT_HANDLED; } - } catch (e) { - return polkit.Result.NOT_HANDLED; } - } - }) - ''; + }) + ''; + }; }; meta.maintainers = with lib.maintainers; [ aleksana ]; diff --git a/nixos/modules/programs/vscode.nix b/nixos/modules/programs/vscode.nix index a20b6b055b10..087278a6d4d0 100644 --- a/nixos/modules/programs/vscode.nix +++ b/nixos/modules/programs/vscode.nix @@ -7,6 +7,7 @@ let cfg = config.programs.vscode; + jsonFormat = pkgs.formats.json { }; in { options.programs.vscode = { @@ -36,6 +37,21 @@ in description = "List of extensions to install."; }; + enterprisePolicies = lib.mkOption { + type = jsonFormat.type; + default = { }; + example = lib.literalExpression '' + { + "UpdateMode" = "none"; + "TelemetryLevel" = "off"; + } + ''; + description = '' + System-wide policies for VSCode in `/etc/vscode/policy.json`. + See for more information. + ''; + }; + finalPackage = lib.mkOption { type = lib.types.package; visible = false; @@ -45,13 +61,19 @@ in }; config = lib.mkIf cfg.enable { - environment.systemPackages = [ - cfg.finalPackage - ]; + environment = { + systemPackages = [ + cfg.finalPackage + ]; - environment.sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor ( - lib.mkOverride 900 cfg.finalPackage.meta.mainProgram - ); + sessionVariables.EDITOR = lib.mkIf cfg.defaultEditor ( + lib.mkOverride 900 cfg.finalPackage.meta.mainProgram + ); + + etc."vscode/policy.json" = lib.mkIf (cfg.enterprisePolicies != { }) { + source = jsonFormat.generate "vscode-policy.json" cfg.enterprisePolicies; + }; + }; programs.vscode.finalPackage = pkgs.vscode-with-extensions.override { vscode = cfg.package; diff --git a/nixos/modules/programs/wayland/pinnacle.nix b/nixos/modules/programs/wayland/pinnacle.nix new file mode 100644 index 000000000000..2b341136c583 --- /dev/null +++ b/nixos/modules/programs/wayland/pinnacle.nix @@ -0,0 +1,70 @@ +{ + pkgs, + config, + lib, + ... +}: +let + cfg = config.programs.pinnacle; + inherit (lib.options) mkEnableOption mkPackageOption; +in +{ + options.programs.pinnacle = { + enable = mkEnableOption "pinnacle"; + package = mkPackageOption pkgs "pinnacle" { + default = "pinnacle"; + example = "pkgs.pinnacle"; + extraDescription = "package containing the pinnacle server binary"; + }; + xdg-portals.enable = mkEnableOption "enable xdg-portals for pinnacle"; + withUWSM = mkEnableOption '' + manage the pinnacle session with [UWSM](https://github.com/Vladimir-csp/uwsm) instead + of independent systemd services and targets. + ''; + }; + + config = lib.mkIf cfg.enable ( + lib.mkMerge [ + { + environment.systemPackages = [ + cfg.package + pkgs.protobuf + cfg.package.lua-client-api + ]; + environment.pathsToLink = [ + # For /run/current-system/sw/share/pinnacle protobuf files - for + # pinnacle to be able to launch with a non-default config out of the + # box. + "/share/pinnacle" + ]; + xdg.portal = lib.mkIf cfg.xdg-portals.enable { + enable = true; + wlr.enable = true; + configPackages = [ cfg.package ]; + extraPortals = [ + pkgs.xdg-desktop-portal-wlr + pkgs.xdg-desktop-portal-gtk + pkgs.gnome-keyring + ]; + }; + } + (lib.mkIf (cfg.withUWSM) { + programs.uwsm.enable = true; + # Configure UWSM to launch Pinnacle from a display manager like SDDM + programs.uwsm.waylandCompositors = { + pinnacle = { + prettyName = "Pinnacle"; + comment = "Pinnacle compositor managed by UWSM"; + binPath = "/run/current-system/sw/bin/pinnacle"; + extraArgs = [ "--session" ]; + }; + }; + }) + (lib.mkIf (!cfg.withUWSM) { + services.displayManager.sessionPackages = [ cfg.package ]; + }) + ] + ); + + meta.maintainers = with lib.maintainers; [ cassandracomar ]; +} diff --git a/nixos/modules/programs/wayland/uwsm.nix b/nixos/modules/programs/wayland/uwsm.nix index 2ed6a643f39a..838ac2ef01de 100644 --- a/nixos/modules/programs/wayland/uwsm.nix +++ b/nixos/modules/programs/wayland/uwsm.nix @@ -37,6 +37,11 @@ let ; } ) cfg.waylandCompositors; + + sessionServices = [ + "wayland-wm@" + "wayland-session-bindpid@" + ]; in { options.programs.uwsm = { @@ -136,6 +141,17 @@ in # UWSM recommends dbus broker for better compatibility services.dbus.implementation = "broker"; + + # Restarting these kills the graphical session, same treatment as the + # display-manager modules. + systemd.user.services = lib.genAttrs sessionServices (_: { + restartIfChanged = false; + # Defining the units here generates drop-ins; without this they + # would carry the NixOS default Environment="PATH=coreutils:…", + # clobbering the PATH that uwsm imported into the user manager + # and breaking spawn actions that rely on it. + enableDefaultPath = false; + }); } (lib.mkIf (cfg.waylandCompositors != { }) { diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index bacb7275cea0..54664ae769ba 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -150,6 +150,9 @@ in ] "The baget module was removed due to the upstream package being unmaintained.") (mkRemovedOptionModule [ "services" "beegfs" ] "The BeeGFS module has been removed") (mkRemovedOptionModule [ "services" "beegfsEnable" ] "The BeeGFS module has been removed") + (mkRemovedOptionModule [ "services" "botamusique" ] + "The botamusique module has been removed. The project was archived upstream in 2024: https://github.com/azlux/botamusique" + ) (mkRemovedOptionModule [ "services" "cgmanager" @@ -274,6 +277,13 @@ in "services" "marathon" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule + [ + "services" + "matrix-appservice-discord" + ] + "The matrix-appservice-discord package has been removed as it is no longer actively maintained upstream. Use `services.mautrix-discord` instead." + ) (mkRemovedOptionModule [ "services" "mathics" ] "The Mathics module has been removed") (mkRemovedOptionModule [ "services" "matrix-sliding-sync" ] "The matrix-sliding-sync package has been removed, since matrix-synapse incorporated its functionality. Remove `services.sliding-sync` from your NixOS Configuration, and the `.well-known` record for `org.matrix.msc3575.proxy` from your webserver" @@ -501,7 +511,7 @@ in services.simplesamlphp has been vulnerable and unmaintained in nixpkgs. '') (mkRemovedOptionModule [ "security" "pam" "enableEcryptfs" ] '' - security.pam.enableFscrypt was removed since it was unmaintained in nixpkgs. + security.pam.enableEcryptfs was removed since it was unmaintained in nixpkgs. '') (mkRemovedOptionModule [ "security" "rngd" ] '' rngd is not necessary for any device that the kernel recognises diff --git a/nixos/modules/security/account-utils.nix b/nixos/modules/security/account-utils.nix new file mode 100644 index 000000000000..42daaf188ca6 --- /dev/null +++ b/nixos/modules/security/account-utils.nix @@ -0,0 +1,78 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.security.account-utils; + format = pkgs.formats.ini { }; +in +{ + options.security.account-utils = { + enable = lib.mkEnableOption "the account-utils implementation of Unix user authentication and management"; + package = lib.mkPackageOption pkgs "account-utils" { }; + extraArgs = lib.mkOption { + type = lib.types.listOf lib.types.nonEmptyStr; + default = [ ]; + example = [ + "--debug" + "-v" + ]; + description = '' + List of arguments to pass to the socket activated service executables. + ::: {.note} + This is passed to both pwupdd and pwaccessd, which support identical flags. + ::: + ''; + }; + pwaccessd.settings = lib.mkOption { + description = '' + Options for pwaccessd. + See {manpage}`pwaccessd.conf(5)` for available options. + ''; + type = lib.types.submodule { + freeformType = format.type; + }; + default = { }; + }; + }; + + config = lib.mkIf cfg.enable { + # use account-utils reimplementation of pam_unix + security.pam = { + pam_unixModulePath = "${cfg.package}/lib/security/pam_unix_ng.so"; + enableLegacySettings = false; + }; + + systemd = { + packages = [ cfg.package ]; + sockets.pwaccessd.wantedBy = [ "sockets.target" ]; + sockets.pwupdd.wantedBy = lib.optional config.users.mutableUsers "sockets.target"; # immutable users do not need password updating + sockets.newidmapd.wantedBy = [ "sockets.target" ]; + services."pwupdd@".environment.PWUPDD_OPTS = lib.escapeShellArgs cfg.extraArgs; + services."pwaccessd".environment.PWACCESSD_OPTS = lib.escapeShellArgs cfg.extraArgs; + }; + + environment.systemPackages = [ cfg.package ]; + environment.etc."account-utils/pwaccessd.conf".source = + format.generate "pwaccessd.conf" cfg.pwaccessd.settings; + + security.pam.services = { + pwupd-passwd = { }; + pwupd-chsh = { }; + pwupd-chfn = { }; + }; + + # covered by account-utils via socket-activated service + security.wrappers = { + # shadow suid binaries are no longer necessary, but disabling the entire shadow module is too intrusive + newuidmap.enable = false; + newgidmap.enable = false; + chsh.enable = false; + passwd.enable = false; + + unix_chkpwd.enable = false; # Not necessary when using pam_unix_ng.so + }; + }; +} diff --git a/nixos/modules/security/acme/default.nix b/nixos/modules/security/acme/default.nix index 13012e176753..7bce714b2a0b 100644 --- a/nixos/modules/security/acme/default.nix +++ b/nixos/modules/security/acme/default.nix @@ -2,13 +2,11 @@ config, lib, pkgs, - options, ... }: let cfg = config.security.acme; - opt = options.security.acme; user = if cfg.useRoot then "root" else "acme"; # Used to calculate timer accuracy for coalescing @@ -826,8 +824,8 @@ let type = lib.types.attrsOf (lib.types.path); inherit (defaultAndText "credentialFiles" { }) default defaultText; description = '' - Environment variables suffixed by "_FILE" to set for the cert's service - for your selected dnsProvider. + Environment variables suffixed by "_FILE" or "_PATH" to set for the + cert's service for your selected dnsProvider. To find out what values you need to set, consult the documentation at for the corresponding dnsProvider. This allows to securely pass credential files to lego by leveraging systemd @@ -1186,10 +1184,13 @@ in } ) { - assertion = lib.all (lib.hasSuffix "_FILE") (lib.attrNames data.credentialFiles); + assertion = lib.all (n: lib.hasSuffix "_FILE" n || lib.hasSuffix "_PATH" n) ( + lib.attrNames data.credentialFiles + ); + message = '' Option `security.acme.certs.${cert}.credentialFiles` can only be - used for variables suffixed by "_FILE". + used for variables suffixed by "_FILE" or "_PATH". ''; } diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 12e634c5e2d9..341c343adb44 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -241,7 +241,7 @@ in { Type = "oneshot"; RemainAfterExit = "yes"; - ExecStartPre = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStartPre = lib.getExe' pkgs.apparmor-init "aa-teardown"; ExecStart = lib.mapAttrsToList ( n: p: "${pkgs.apparmor-parser}/bin/apparmor_parser --add ${commonOpts n p}" ) enabledPolicies; @@ -262,7 +262,7 @@ in # Optionally kill the processes which are unconfined but now have a profile loaded # (because AppArmor can only start to confine new processes). lib.optional cfg.killUnconfinedConfinables killUnconfinedConfinables; - ExecStop = "${pkgs.apparmor-utils}/bin/aa-teardown"; + ExecStop = lib.getExe' pkgs.apparmor-init "aa-teardown"; CacheDirectory = [ "apparmor" "apparmor/logprof" diff --git a/nixos/modules/security/auditd.nix b/nixos/modules/security/auditd.nix index ba556da99c0c..e79b0a2c9231 100644 --- a/nixos/modules/security/auditd.nix +++ b/nixos/modules/security/auditd.nix @@ -18,7 +18,7 @@ let pluginOptions = lib.types.submodule { options = { - active = lib.mkEnableOption "Whether to enable this plugin"; + active = lib.mkEnableOption "this plugin"; direction = lib.mkOption { type = lib.types.enum [ "in" diff --git a/nixos/modules/security/default.nix b/nixos/modules/security/default.nix index 5170383d6f5e..c1a4f7cf34a1 100644 --- a/nixos/modules/security/default.nix +++ b/nixos/modules/security/default.nix @@ -1,4 +1,8 @@ -{ config, lib, ... }: +{ + config, + lib, + ... +}: let cfg = config.security; in @@ -16,10 +20,16 @@ in config = lib.mkMerge [ { # We set the default LSM's here due to them not being present if set when enabling AppArmor. - security.lsm = [ - "landlock" - "yama" - "bpf" + security.lsm = lib.mkMerge [ + [ + "landlock" + "yama" + ] + # Load BPF last unconditionally. See: https://github.com/NixOS/nixpkgs/pull/533428. + # Apparmor (and potentially other modules) will load incorrectly if they are not before BPF. + # It is believed that there was a regression between kernel 6.12 and 6.18 which caused the + # passthrough stub or LSM stacking of the BPF module to interact with other modules incorrectly. + (lib.mkAfter [ "bpf" ]) ]; } (lib.mkIf (lib.lists.length cfg.lsm > 0) { diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 586ae6fd9ede..240020c19374 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -678,6 +678,14 @@ let ''; }; + oo7 = { + enable = lib.mkEnableOption '' + automatically unlock the user's default Session Keyring using pam_oo7. + If the user's login password does not match their keyring password, + oo7 will prompt separately after login. + ''; + }; + enableUMask = lib.mkOption { default = config.security.pam.enableUMask; defaultText = lib.literalExpression "config.security.pam.enableUMask"; @@ -1008,7 +1016,7 @@ let { name = "unix"; control = "required"; - modulePath = "${package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } # pam_slurm_adopt must be the last module in the account stack. { @@ -1198,6 +1206,7 @@ let || cfg.pamMount || cfg.kwallet.enable || cfg.enableGnomeKeyring + || cfg.oo7.enable || config.services.intune.enable || cfg.googleAuthenticator.enable || cfg.gnupg.enable @@ -1217,11 +1226,11 @@ let name = "unix-early"; enable = cfg.unixAuth; control = "optional"; - modulePath = "${package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings = { nullok = cfg.allowNullPassword; inherit (cfg) nodelay; - likeauth = true; + likeauth = lib.mkIf config.security.pam.enableLegacySettings true; }; } { @@ -1261,6 +1270,12 @@ let control = "optional"; modulePath = "${pkgs.gnome-keyring}/lib/security/pam_gnome_keyring.so"; } + { + name = "oo7"; + enable = cfg.oo7.enable; + control = "optional"; + modulePath = "${pkgs.oo7-pam}/lib/security/pam_oo7.so"; + } { name = "intune"; enable = config.services.intune.enable; @@ -1315,11 +1330,11 @@ let name = "unix"; enable = cfg.unixAuth; control = "sufficient"; - modulePath = "${package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings = { nullok = cfg.allowNullPassword; inherit (cfg) nodelay; - likeauth = true; + likeauth = lib.mkIf config.security.pam.enableLegacySettings true; try_first_pass = true; }; } @@ -1404,10 +1419,10 @@ let { name = "unix"; control = "sufficient"; - modulePath = "${package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings = { nullok = true; - yescrypt = true; + yescrypt = lib.mkIf config.security.pam.enableLegacySettings true; }; } { @@ -1477,6 +1492,12 @@ let use_authtok = true; }; } + { + name = "oo7"; + enable = cfg.oo7.enable; + control = "optional"; + modulePath = "${pkgs.oo7-pam}/lib/security/pam_oo7.so"; + } ]; session = utils.pam.autoOrderRules [ @@ -1493,7 +1514,7 @@ let { name = "unix"; control = "required"; - modulePath = "${package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "loginuid"; @@ -1695,6 +1716,15 @@ let auto_start = true; }; } + { + name = "oo7"; + enable = cfg.oo7.enable; + control = "optional"; + modulePath = "${pkgs.oo7-pam}/lib/security/pam_oo7.so"; + settings = { + auto_start = true; + }; + } { name = "gnupg"; enable = cfg.gnupg.enable; @@ -1802,11 +1832,6 @@ let else config.users.motdFile; - makePAMService = name: service: { - name = "pam.d/${name}"; - value.source = pkgs.writeText "${name}.pam" service.text; - }; - optionalSudoConfigForSSHAgentAuth = lib.optionalString (config.security.pam.sshAgentAuth.enable || config.security.pam.rssh.enable) '' @@ -1858,8 +1883,27 @@ in options = { + security.pam.enable = lib.mkOption { + default = true; + type = lib.types.bool; + + description = '' + Whether to enable PAM, or entirely disable it. + + Unless you're building a container image, you probably don't want to disable PAM. + ''; + }; + security.pam.package = lib.mkPackageOption pkgs "pam" { }; + security.pam.pam_unixModulePath = lib.mkOption { + type = lib.types.pathInStore; + default = "${package}/lib/security/pam_unix.so"; + defaultText = "\${config.security.pam.package}/lib/security/pam_unix.so"; + description = "The pam_unix module to use in all the default pam services."; + internal = true; + }; + security.pam.loginLimits = lib.mkOption { default = [ ]; type = limitsType; @@ -1904,6 +1948,19 @@ in ''; }; + security.pam.enableLegacySettings = lib.mkOption { + default = true; + type = lib.types.bool; + description = '' + Alternative implementations of pam_unix may not support all legacy arguments. + This option will disable all known legacy settings. + ::: {.note} + Setting this option to false will omit arguments, such as `yescrypt`. + Doing so is only safe if the defaults used by pam_unix are sensible. + ::: + ''; + }; + security.pam.makeHomeDir.skelDirectory = lib.mkOption { type = lib.types.str; default = "/var/empty"; @@ -2218,6 +2275,30 @@ in ''; }; + prompt = lib.mkOption { + default = null; + type = with lib.types; nullOr str; + description = '' + Set individual prompt message for interactive mode. + By setting this option, you can set a message to be shown by the + {option}`security.pam.u2f.settings.interactive` option. + + Requires {option}`security.pam.u2f.settings.interactive` to be set to `true`. + ''; + }; + + cue_prompt = lib.mkOption { + default = null; + type = with lib.types; nullOr str; + description = '' + Set individual prompt message for cue mode. + By setting this option, you can set a message to be shown by the + {option}`security.pam.u2f.settings.cue` option. + + Requires {option}`security.pam.u2f.settings.cue` to be set to `true`. + ''; + }; + cue = lib.mkOption { default = false; type = lib.types.bool; @@ -2479,7 +2560,7 @@ in ###### implementation - config = { + config = lib.mkIf config.security.pam.enable { assertions = [ { assertion = config.users.motd == "" || config.users.motdFile == null; @@ -2562,7 +2643,26 @@ in }; }; - environment.etc = lib.mapAttrs' makePAMService enabledServices; + environment.etc = + let + # Write all pam config in a single derivation for performance + pamd = + pkgs.runCommand "pam.d" + { + __structuredAttrs = true; + services = lib.mapAttrs (_: svc: svc.text) enabledServices; + } + '' + mkdir $out + for i in "''${!services[@]}"; do + printf '%s' "''${services[$i]}" > "$out/$i" + done + ''; + in + lib.mapAttrs' (name: service: { + name = "pam.d/${name}"; + value.source = "${pamd}/${name}"; + }) enabledServices; systemd = lib.mkIf (lib.any (service: service.lastlog.enable) (lib.attrValues config.security.pam.services)) diff --git a/nixos/modules/security/polkit.nix b/nixos/modules/security/polkit.nix index c2bbe706529f..94237502160e 100644 --- a/nixos/modules/security/polkit.nix +++ b/nixos/modules/security/polkit.nix @@ -6,27 +6,69 @@ }: let + inherit (lib) + mkEnableOption + mkOption + mkIf + mkPackageOption + mkRemovedOptionModule + types + ; + cfg = config.security.polkit; + iniFmt = pkgs.formats.ini { }; in { + imports = [ + (mkRemovedOptionModule [ "security" "polkit" "debug" ] "Use security.polkit.extraArgs instead") + ]; - options = { + options.security.polkit = { + enable = mkEnableOption "polkit"; - security.polkit.enable = lib.mkEnableOption "polkit"; + enablePkexecWrapper = mkEnableOption "the setuid pkexec wrapper"; - security.polkit.package = lib.mkPackageOption pkgs "polkit" { }; + package = mkPackageOption pkgs "polkit" { }; - security.polkit.debug = lib.mkEnableOption "debug logs from polkit. This is required in order to see log messages from rule definitions"; + settings = mkOption { + description = '' + Options for polkitd. + See {manpage}`polkitd.conf(5)` for available options. + ''; + type = types.submodule { + freeformType = iniFmt.type; + options.Polkitd.ExpirationSeconds = lib.mkOption { + description = "Expiration timeout of authenticated sesssions."; + type = types.ints.positive; + default = 300; # current polkit upstream default + }; + }; + }; - security.polkit.extraConfig = lib.mkOption { - type = lib.types.lines; + extraArgs = mkOption { + type = types.listOf types.str; + default = [ + "--no-debug" + "--log-level=notice" + ]; + description = '' + List of arguments to pass to the polkitd executable. + + ::: {.note} + To see debug logs you need to negate the default `--no-debug` setting. + ::: + ''; + }; + + extraConfig = mkOption { + type = types.lines; default = ""; example = '' /* Log authorization checks. */ polkit.addRule(function(action, subject) { - // Make sure to set { security.polkit.debug = true; } in configuration.nix + // Make sure to negate --no-debug in services.polkit.extraArgs: { security.polkit.extraArgs = [ "--log-level=notice" ]; } polkit.log("user " + subject.user + " is attempting action " + action.id + " from PID " + subject.pid); }); @@ -41,8 +83,8 @@ in ''; }; - security.polkit.adminIdentities = lib.mkOption { - type = lib.types.listOf lib.types.str; + adminIdentities = mkOption { + type = with types; listOf str; default = [ "unix-group:wheel" ]; example = [ "unix-user:alice" @@ -58,25 +100,34 @@ in }; - config = lib.mkIf cfg.enable { + config = mkIf cfg.enable { environment.systemPackages = [ cfg.package.bin cfg.package.out ]; + services.dbus.packages = [ cfg.package.out ]; + systemd.packages = [ cfg.package.out ]; - systemd.services.polkit.serviceConfig.ExecStart = [ - "" - "${cfg.package.out}/lib/polkit-1/polkitd ${lib.optionalString (!cfg.debug) "--no-debug"}" - ]; - - systemd.services.polkit.restartTriggers = [ config.system.path ]; - systemd.services.polkit.reloadTriggers = [ - config.environment.etc."polkit-1/rules.d/10-nixos.rules".source - ]; - systemd.services.polkit.stopIfChanged = false; + systemd.services.polkit = { + restartTriggers = [ config.system.path ]; + reloadTriggers = [ + config.environment.etc."polkit-1/rules.d/10-nixos.rules".source + ]; + serviceConfig.ExecStart = [ + # nuke default ExecStart + "" + # provide our own instead + (toString ( + [ + "${lib.getLib cfg.package}/lib/polkit-1/polkitd" + ] + ++ cfg.extraArgs + )) + ]; + }; systemd.sockets."polkit-agent-helper".wantedBy = [ "sockets.target" ]; @@ -89,7 +140,7 @@ in # The upstream unit uses PrivateDevices=yes and ProtectHome=yes, # which prevents PAM modules from accessing hardware (e.g. FIDO # tokens via /dev/hidraw*) or reading key files from home directories. - (lib.mkIf config.security.pam.u2f.enable { + (mkIf config.security.pam.u2f.enable { # Override upstream PrivateDevices=yes to allow access to /dev/hidraw* PrivateDevices = false; DeviceAllow = [ @@ -100,7 +151,7 @@ in # ~/.config/Yubico/u2f_keys (the default key file location) ProtectHome = "read-only"; }) - (lib.mkIf config.security.pam.zfs.enable { + (mkIf config.security.pam.zfs.enable { PrivateDevices = false; DeviceAllow = [ "/dev/zfs rw" @@ -120,23 +171,17 @@ in ${cfg.extraConfig} ''; # TODO: validation on compilation (at least against typos) - services.dbus.packages = [ cfg.package.out ]; - + environment.etc."polkit-1/polkitd.conf".source = iniFmt.generate "polkitd.conf" cfg.settings; security.pam.services.polkit-1 = { }; security.wrappers.pkexec = { + enable = cfg.enablePkexecWrapper; setuid = true; owner = "root"; group = "root"; - source = "${cfg.package.bin}/bin/pkexec"; + source = lib.getExe' cfg.package "pkexec"; }; - systemd.tmpfiles.rules = [ - # Probably no more needed, clean up - "R /var/lib/polkit-1" - "R /var/lib/PolicyKit" - ]; - users.users.polkituser = { description = "PolKit daemon"; uid = config.ids.uids.polkituser; @@ -146,4 +191,7 @@ in users.groups.polkituser = { }; }; + meta = { + maintainers = with lib.maintainers; [ zimward ]; + }; } diff --git a/nixos/modules/security/run0.nix b/nixos/modules/security/run0.nix index 22296a76c95e..478fae3db67d 100644 --- a/nixos/modules/security/run0.nix +++ b/nixos/modules/security/run0.nix @@ -6,19 +6,29 @@ }: let - cfg = config.security.run0; + inherit (lib) + mkEnableOption + mkIf + mkMerge + mkOption + mkPackageOption + mkAliasOptionModule + optionalString + ; - sudoAlias = pkgs.writeShellScriptBin "sudo" '' - if [[ "$1" == -* ]]; then - echo "This script is a sudo-alias to systemd's run0 and does not support any sudo parameters." - exit 1 - fi - exec run0 "$@" - ''; + cfg = config.security.run0; in { options.security.run0 = { - wheelNeedsPassword = lib.mkOption { + enable = mkEnableOption "support for run0"; + + persistentAuth.enable = mkEnableOption '' + persistent authentication for sessions. + Timeout configurable via {option}`security.polkit.settings.Polkitd.ExpirationSeconds` + ''; + persistentAuth.enableRemote = mkEnableOption "persistent authentication for remote sessions"; + + wheelNeedsPassword = mkOption { type = lib.types.bool; default = true; description = '' @@ -27,26 +37,72 @@ in ''; }; - enableSudoAlias = lib.mkEnableOption "make {command}`sudo` an alias to {command}`run0`."; + sudo-shim.enable = mkEnableOption "make {command}`sudo` an alias to {command}`run0`."; + sudo-shim.package = mkPackageOption pkgs "run0-sudo-shim" { }; }; - config = { - assertions = [ - { - assertion = - cfg.enableSudoAlias -> (!config.security.sudo.enable && !config.security.sudo-rs.enable); - message = "`security.run0.enableSudoAlias` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled."; - } - ]; + imports = [ + (mkAliasOptionModule + [ "security" "run0" "enableSudoAlias" ] + [ "security" "run0" "sudo-shim" "enable" ] + ) + ]; - security.polkit.extraConfig = lib.mkIf (!cfg.wheelNeedsPassword) '' - polkit.addRule(function(action, subject) { - if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) { - return polkit.Result.YES; + config = mkMerge [ + { + # Late introduction of the enable toggle, this should help during migration. + # TODO: Remove after 26.11 release + assertions = [ + { + assertion = !cfg.wheelNeedsPassword -> cfg.enable; + message = "`security.run0.enable` is currently disabled, but is required for the `security.run0.wheelNeedsPassword` option to take effect"; } - }); - ''; + { + assertion = cfg.enableSudoAlias -> cfg.enable; + message = "`security.run0.enableSudoAlias` depends on `security.run0.enable`, which is disabled."; + } + ]; + } + (mkIf cfg.enable { + assertions = [ + { + assertion = + cfg.sudo-shim.enable -> (!config.security.sudo.enable && !config.security.sudo-rs.enable); + message = "`security.run0.sudo-shim.enable` cannot be enabled if `security.sudo` or `security.sudo-rs` are enabled."; + } + ]; - environment.systemPackages = lib.optional cfg.enableSudoAlias sudoAlias; + security.polkit = { + enable = true; + extraConfig = lib.concatLines [ + (optionalString (!cfg.wheelNeedsPassword) '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && subject.isInGroup("wheel")) { + return polkit.Result.YES; + } + }); + '') + (optionalString cfg.persistentAuth.enable '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.systemd1.manage-units" && subject.active ${ + optionalString (!cfg.persistentAuth.enableRemote) "&& subject.local" + }) { + return polkit.Result.AUTH_ADMIN_KEEP; + } + }); + '') + ]; + }; + + environment.systemPackages = lib.optional cfg.sudo-shim.enable cfg.sudo-shim.package; + }) + ]; + + meta = { + maintainers = with lib.maintainers; [ + zimward + grimmauld + kuflierl + ]; }; } diff --git a/nixos/modules/services/admin/komodo-periphery.nix b/nixos/modules/services/admin/komodo-periphery.nix index 5b7643baeea6..d4b0426903da 100644 --- a/nixos/modules/services/admin/komodo-periphery.nix +++ b/nixos/modules/services/admin/komodo-periphery.nix @@ -8,41 +8,65 @@ let cfg = config.services.komodo-periphery; settingsFormat = pkgs.formats.toml { }; + actualRepoDir = if cfg.repoDir != null then cfg.repoDir else "${cfg.rootDirectory}/repos"; + actualStackDir = if cfg.stackDir != null then cfg.stackDir else "${cfg.rootDirectory}/stacks"; + actualBuildDir = if cfg.buildDir != null then cfg.buildDir else "${cfg.rootDirectory}/builds"; + genFinalSettings = let + actualServerEnabled = + if cfg.inbound.serverEnabled != null then + cfg.inbound.serverEnabled + else + (cfg.outbound.coreAddress == ""); + + hasAnyPrivateKey = cfg.auth.privateKey != ""; + baseSettings = { - port = cfg.port; - bind_ip = cfg.bindIp; - root_directory = cfg.rootDirectory; - repo_dir = "${cfg.rootDirectory}/repos"; - stack_dir = "${cfg.rootDirectory}/stacks"; - ssl_enabled = cfg.ssl.enable; + default_terminal_command = cfg.defaultTerminalCommand; + disable_terminals = cfg.disableTerminals; + disable_container_terminals = cfg.disableContainerTerminals; + + stats_polling_rate = cfg.statsPollingRate; + container_stats_polling_rate = cfg.containerStatsPollingRate; + legacy_compose_cli = cfg.legacyComposeCli; + + include_disk_mounts = cfg.includeDiskMounts; + exclude_disk_mounts = cfg.excludeDiskMounts; + + # When a private key is explicitly configured, it's passed via env var. + # Otherwise, use the default file path so Periphery auto-generates a key. + private_key = if !hasAnyPrivateKey then "file:${cfg.rootDirectory}/keys/periphery.key" else ""; + core_public_keys = [ ]; + passkeys = [ ]; + + server_enabled = actualServerEnabled; + port = cfg.inbound.port; + bind_ip = cfg.inbound.bindIp; + allowed_ips = cfg.inbound.allowedIps; + ssl_enabled = cfg.inbound.ssl.enable; } - // lib.optionalAttrs cfg.ssl.enable { - ssl_key_file = cfg.ssl.keyFile; - ssl_cert_file = cfg.ssl.certFile; + // { + core_address = cfg.outbound.coreAddress; + connect_as = cfg.outbound.connectAs; + onboarding_key = ""; } // { logging = { level = cfg.logging.level; stdio = cfg.logging.stdio; + opentelemetry_service_name = cfg.logging.opentelemetryServiceName; + opentelemetry_scope_name = cfg.logging.opentelemetryScopeName; + pretty = cfg.logging.pretty; } // lib.optionalAttrs (cfg.logging.otlpEndpoint != "") { otlp_endpoint = cfg.logging.otlpEndpoint; }; - allowed_ips = cfg.allowedIps; - passkeys = cfg.passkeys; - disable_terminals = cfg.disableTerminals; - disable_container_exec = cfg.disableContainerExec; - stats_polling_rate = cfg.statsPollingRate; - container_stats_polling_rate = cfg.containerStatsPollingRate; - legacy_compose_cli = cfg.legacyComposeCli; - include_disk_mounts = cfg.includeDiskMounts; - exclude_disk_mounts = cfg.excludeDiskMounts; + pretty_startup_config = cfg.prettyStartupConfig; } // cfg.extraSettings; in - lib.filterAttrsRecursive (_: v: v != null && v != { } && v != [ ]) baseSettings; + lib.filterAttrsRecursive (_: v: v != null && v != { } && v != [ ] && v != "") baseSettings; configFile = if cfg.configFile == null then @@ -51,36 +75,98 @@ let cfg.configFile; in { + imports = with lib; [ + (mkRenamedOptionModule + [ "services" "komodo-periphery" "port" ] + [ "services" "komodo-periphery" "inbound" "port" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "bindIp" ] + [ "services" "komodo-periphery" "inbound" "bindIp" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "allowedIps" ] + [ "services" "komodo-periphery" "inbound" "allowedIps" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "ssl" "enable" ] + [ "services" "komodo-periphery" "inbound" "ssl" "enable" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "ssl" "keyFile" ] + [ "services" "komodo-periphery" "inbound" "ssl" "keyFile" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "ssl" "certFile" ] + [ "services" "komodo-periphery" "inbound" "ssl" "certFile" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "serverEnabled" ] + [ "services" "komodo-periphery" "inbound" "serverEnabled" ] + ) + (mkRenamedOptionModule + [ "services" "komodo-periphery" "disableContainerExec" ] + [ "services" "komodo-periphery" "disableContainerTerminals" ] + ) + (mkRemovedOptionModule [ "services" "komodo-periphery" "passkeys" ] + "services.komodo-periphery.passkeys has been removed. Use passkeyFiles for v1.X compatibility, or migrate to auth.privateKey and auth.corePublicKeys (v2.0+)." + ) + (mkRemovedOptionModule [ "services" "komodo-periphery" "outbound" "onboardingKey" ] + "services.komodo-periphery.outbound.onboardingKey has been removed. Use outbound.onboardingKeyFile instead for better security." + ) + ]; + options.services.komodo-periphery = { enable = lib.mkEnableOption "Periphery, a multi-server Docker and Git deployment agent by Komodo"; package = lib.mkPackageOption pkgs "komodo" { }; - configFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; + dockerHost = lib.mkOption { + type = lib.types.nullOr lib.types.str; default = null; - description = "Path to the periphery configuration file. If null, a configuration file will be generated from the module options."; + description = '' + Docker host socket URI to use for container operations. + If null, uses the default Docker socket and automatically enables Docker. + Set this to use alternative container runtimes like Podman or remote Docker hosts. + ''; example = lib.literalExpression '' - pkgs.writeText "periphery.toml" ''' - port = 8120 - bind_ip = "[::]" - ssl_enabled = true - [logging] - level = "info" - ''' + # Podman rootless + "unix:///run/user/1000/podman/podman.sock" + + # Podman rootful + "unix:///run/podman/podman.sock" + + # Remote Docker + "tcp://192.168.1.100:2375" ''; }; - port = lib.mkOption { - type = lib.types.port; - default = 8120; - description = "Port for the Periphery agent to listen on."; - }; + configFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + Path to the Periphery configuration file. - bindIp = lib.mkOption { - type = lib.types.str; - default = "[::]"; - description = "IP address to bind to."; + - If `null` (default), a configuration file will be automatically generated + from the module options (recommended for most users). + - If set to a path, that file will be used directly as the configuration file. + - You can also use `pkgs.writeText` to write configuration inline in your NixOS configuration. + + When using a custom config file, all other module options (except `package`, `user`, `group`, + `environment`, and `environmentFile`) will be ignored. + ''; + example = lib.literalExpression '' + # Option 1: Use an existing config file + "/etc/komodo/periphery.toml" + + # Option 2: Write config inline using pkgs.writeText + pkgs.writeText "periphery.toml" ''' + root_directory = "/var/lib/komodo-periphery" + + logging.level = "info" + logging.stdio = "standard" + ''' + ''; }; rootDirectory = lib.mkOption { @@ -89,24 +175,25 @@ in description = "Root directory for Komodo Periphery data."; }; - ssl = { - enable = lib.mkEnableOption "SSL/TLS support" // { - default = true; - }; + repoDir = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/repos"''; + description = "Directory for Komodo Periphery to manage repos. If null, defaults to `\${rootDirectory}/repos`."; + }; - keyFile = lib.mkOption { - type = lib.types.path; - default = "${cfg.rootDirectory}/ssl/key.pem"; - defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/ssl/key.pem"''; - description = "Path to SSL key file."; - }; + stackDir = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/stacks"''; + description = "Directory for Komodo Periphery to manage stacks. If null, defaults to `\${rootDirectory}/stacks`."; + }; - certFile = lib.mkOption { - type = lib.types.path; - default = "${cfg.rootDirectory}/ssl/cert.pem"; - defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/ssl/cert.pem"''; - description = "Path to SSL certificate file."; - }; + buildDir = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/builds"''; + description = "Directory for Komodo Periphery to manage builds. If null, defaults to `\${rootDirectory}/builds`."; }; logging = { @@ -139,26 +226,41 @@ in description = "OpenTelemetry OTLP endpoint for traces."; example = "http://localhost:4317"; }; + + opentelemetryServiceName = lib.mkOption { + type = lib.types.str; + default = "Periphery"; + description = "(v2.0+) OpenTelemetry service name attached to telemetry."; + }; + + opentelemetryScopeName = lib.mkOption { + type = lib.types.str; + default = "Komodo"; + description = "(v2.0+) OpenTelemetry scope name attached to telemetry."; + }; + + pretty = lib.mkOption { + type = lib.types.bool; + default = false; + description = "(v2.0+) Enable human-readable logging (multi-line)."; + }; }; - allowedIps = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "IP addresses or subnets allowed to call the periphery API. Empty list allows all."; - example = [ - "::ffff:12.34.56.78" - "10.0.10.0/24" - ]; + prettyStartupConfig = lib.mkOption { + type = lib.types.bool; + default = false; + description = "(v2.0+) Enable human-readable startup config log (multi-line)."; }; - passkeys = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; + passkeyFiles = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; description = '' - Passkeys required to access the periphery API. - WARNING: These will be stored in the Nix store in plain text! + Path to file containing passkeys (v1.X compatibility). + This will be passed via `PERIPHERY_PASSKEYS_FILE` environment variable. + Consider migrating to the new v2.0+ authentication mechanism. ''; - example = [ "your-secure-passkey" ]; + example = "/run/secrets/komodo-passkey"; }; extraSettings = lib.mkOption { @@ -170,16 +272,23 @@ in }; }; + defaultTerminalCommand = lib.mkOption { + type = lib.types.str; + default = "bash"; + description = "(v2.0+) Default terminal command used to initialize the shell."; + example = "zsh"; + }; + disableTerminals = lib.mkOption { type = lib.types.bool; default = false; description = "Disable remote shell access through Periphery."; }; - disableContainerExec = lib.mkOption { + disableContainerTerminals = lib.mkOption { type = lib.types.bool; default = false; - description = "Disable remote container shell access through Periphery."; + description = "(v2.0+) Disable remote container shell access through Periphery."; }; statsPollingRate = lib.mkOption { @@ -222,6 +331,147 @@ in ]; }; + auth = { + privateKey = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + (v2.0+) Private key used with the Noise handshake. + + Use `file:/path/to/file` prefix to load from a file. If the file doesn't exist, + Periphery will generate and write a new key to the path. + + If empty, defaults to `file:''${rootDirectory}/keys/periphery.key`. + ''; + example = lib.literalExpression '' + # Reference a secret file + "file:''${config.age.secrets.komodo-private-key.path}" + + # Or direct path + "file:/run/secrets/komodo-private-key" + ''; + }; + + corePublicKeys = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + (v2.0+) Accepted public keys to allow Core(s) to connect. + Accepts Spki base64 DER directly or can reference files using `file:/path/to/core.pub` prefix. + You can mix direct keys and file references. + + For better security, use the `file:` prefix to reference secret files. + ''; + example = lib.literalExpression '' + [ + # Direct key value + "MCowBQYDK2VuAyEATZgrjGHeF0KJUe0+n77+qAWOg3YzEzXOmQWaRgO3OGQ=" + # Reference secret files + "file:''${config.age.secrets.komodo-core1-pub.path}" + "file:''${config.age.secrets.komodo-core2-pub.path}" + ] + ''; + }; + }; + + inbound = { + serverEnabled = lib.mkOption { + type = lib.types.nullOr lib.types.bool; + default = null; + description = '' + Enable the inbound connection server for Core -> Periphery connections. + If null, defaults to false when `outbound.coreAddress` is defined, otherwise true. + ''; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8120; + description = "Port for the inbound Periphery server to listen on."; + }; + + bindIp = lib.mkOption { + type = lib.types.str; + default = "[::]"; + description = '' + IP address the periphery server will bind to. + The default allows external IPv4 and IPv6 connections. + ''; + }; + + allowedIps = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + Limit the IP addresses which can connect to Periphery. + Supports IPv4/IPv6 addresses and subnets. + Empty list allows all connections. + ''; + example = [ + "::ffff:12.34.56.78" + "10.0.10.0/24" + ]; + }; + + ssl = { + enable = lib.mkEnableOption "(v2.0+) SSL/TLS support for inbound connections" // { + default = true; + }; + + keyFile = lib.mkOption { + type = lib.types.path; + default = "${cfg.rootDirectory}/ssl/key.pem"; + defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/ssl/key.pem"''; + description = '' + Path to SSL key file. + If the file doesn't exist and SSL is enabled, self-signed keys will be generated using openssl. + ''; + }; + + certFile = lib.mkOption { + type = lib.types.path; + default = "${cfg.rootDirectory}/ssl/cert.pem"; + defaultText = lib.literalExpression ''"''${config.services.komodo-periphery.rootDirectory}/ssl/cert.pem"''; + description = '' + Path to SSL certificate file. + If the file doesn't exist and SSL is enabled, self-signed certificate will be generated using openssl. + ''; + }; + }; + }; + + outbound = { + coreAddress = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + (v2.0+) The address of Komodo Core. Must be reachable from this host. + If provided, Periphery will operate in outbound mode. + ''; + example = "demo.komo.do"; + }; + + connectAs = lib.mkOption { + type = lib.types.str; + default = ""; + description = '' + (v2.0+) The Server this Periphery agent should connect as. + Must match an existing Server name or id. + ''; + example = "server-name"; + }; + + onboardingKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + (v2.0+) Path to file containing the onboarding key. + This will be passed via `PERIPHERY_ONBOARDING_KEY_FILE` environment variable. + ''; + example = lib.literalExpression ''"''${config.age.secrets.komodo-onboarding.path}"''; + }; + }; + user = lib.mkOption { type = lib.types.str; default = "komodo-periphery"; @@ -253,14 +503,14 @@ in }; config = lib.mkIf cfg.enable { - virtualisation.docker.enable = true; + virtualisation.docker.enable = lib.mkDefault (cfg.dockerHost == null); users.users.${cfg.user} = lib.mkIf (cfg.user == "komodo-periphery") { isSystemUser = true; group = cfg.group; description = "Komodo Periphery service user"; home = cfg.rootDirectory; - extraGroups = [ "docker" ]; + extraGroups = lib.optional (cfg.dockerHost == null) "docker"; }; users.groups.${cfg.group} = lib.mkIf (cfg.group == "komodo-periphery") { }; @@ -271,16 +521,26 @@ in user = cfg.user; group = cfg.group; }; - "${cfg.rootDirectory}/repos".d = { + "${actualRepoDir}".d = { mode = "0755"; user = cfg.user; group = cfg.group; }; - "${cfg.rootDirectory}/stacks".d = { + "${actualStackDir}".d = { mode = "0755"; user = cfg.user; group = cfg.group; }; + "${actualBuildDir}".d = { + mode = "0755"; + user = cfg.user; + group = cfg.group; + }; + "${cfg.rootDirectory}/keys".d = { + mode = "0700"; + user = cfg.user; + group = cfg.group; + }; "${cfg.rootDirectory}/ssl".d = { mode = "0700"; user = cfg.user; @@ -292,35 +552,63 @@ in description = "Komodo Periphery - Multi-server Docker and Git deployment agent"; after = [ "network-online.target" - "docker.service" - ]; + ] + ++ lib.optional (cfg.dockerHost == null) "docker.service"; wants = [ "network-online.target" - "docker.service" - ]; + ] + ++ lib.optional (cfg.dockerHost == null) "docker.service"; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "simple"; User = cfg.user; Group = cfg.group; - SupplementaryGroups = [ "docker" ]; + SupplementaryGroups = lib.mkIf (cfg.dockerHost == null) [ "docker" ]; Restart = "on-failure"; RestartSec = "10s"; WorkingDirectory = cfg.rootDirectory; ExecStart = lib.escapeShellArgs [ - "${lib.getExe' cfg.package "periphery"}" + (lib.getExe' cfg.package "periphery") "--config-path" - (if cfg.configFile != null then cfg.configFile else configFile) + configFile ]; Environment = lib.mapAttrsToList (name: value: "${name}=${value}") ( - cfg.environment - // lib.optionalAttrs (!cfg.disableTerminals) { - PATH = "/run/current-system/sw/bin:/run/wrappers/bin"; + lib.optionalAttrs (cfg.configFile == null) { + PERIPHERY_ROOT_DIRECTORY = cfg.rootDirectory; + PERIPHERY_REPO_DIR = actualRepoDir; + PERIPHERY_STACK_DIR = actualStackDir; + PERIPHERY_BUILD_DIR = actualBuildDir; } + // lib.optionalAttrs (cfg.configFile == null && cfg.inbound.ssl.enable) { + PERIPHERY_SSL_KEY_FILE = cfg.inbound.ssl.keyFile; + PERIPHERY_SSL_CERT_FILE = cfg.inbound.ssl.certFile; + } + // lib.optionalAttrs (cfg.dockerHost != null) { + DOCKER_HOST = cfg.dockerHost; + } + // lib.optionalAttrs (cfg.passkeyFiles != null) { + PERIPHERY_PASSKEYS_FILE = cfg.passkeyFiles; + } + // lib.optionalAttrs (cfg.auth.privateKey != "") { + PERIPHERY_PRIVATE_KEY = cfg.auth.privateKey; + } + // lib.optionalAttrs (cfg.auth.corePublicKeys != [ ]) { + PERIPHERY_CORE_PUBLIC_KEYS = lib.concatStringsSep "," cfg.auth.corePublicKeys; + } + // lib.optionalAttrs (cfg.outbound.onboardingKeyFile != null) { + PERIPHERY_ONBOARDING_KEY_FILE = cfg.outbound.onboardingKeyFile; + } + // cfg.environment ); + + ExecSearchPath = lib.mkIf (!cfg.disableTerminals) [ + "/run/current-system/sw/bin" + "/run/wrappers/bin" + ]; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; StateDirectory = "komodo-periphery"; @@ -329,7 +617,7 @@ in NoNewPrivileges = true; PrivateTmp = true; ProtectSystem = "full"; - ProtectHome = true; + ProtectHome = "read-only"; }; }; }; diff --git a/nixos/modules/services/audio/botamusique.nix b/nixos/modules/services/audio/botamusique.nix deleted file mode 100644 index 1017d8d6fd0b..000000000000 --- a/nixos/modules/services/audio/botamusique.nix +++ /dev/null @@ -1,111 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.services.botamusique; - - format = pkgs.formats.ini { }; - configFile = format.generate "botamusique.ini" cfg.settings; -in -{ - options.services.botamusique = { - enable = lib.mkEnableOption "botamusique, a bot to play audio streams on mumble"; - - package = lib.mkPackageOption pkgs "botamusique" { }; - - settings = lib.mkOption { - type = - with lib.types; - submodule { - freeformType = format.type; - options = { - server.host = lib.mkOption { - type = types.str; - default = "localhost"; - example = "mumble.example.com"; - description = "Hostname of the mumble server to connect to."; - }; - - server.port = lib.mkOption { - type = types.port; - default = 64738; - description = "Port of the mumble server to connect to."; - }; - - bot.username = lib.mkOption { - type = types.str; - default = "botamusique"; - description = "Name the bot should appear with."; - }; - - bot.comment = lib.mkOption { - type = types.str; - default = "Hi, I'm here to play radio, local music or youtube/soundcloud music. Have fun!"; - description = "Comment displayed for the bot."; - }; - }; - }; - default = { }; - description = '' - Your {file}`configuration.ini` as a Nix attribute set. Look up - possible options in the [configuration.example.ini](https://github.com/azlux/botamusique/blob/master/configuration.example.ini). - ''; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.botamusique = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - unitConfig.Documentation = "https://github.com/azlux/botamusique/wiki"; - - environment.HOME = "/var/lib/botamusique"; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/botamusique --config ${configFile}"; - Restart = "always"; # the bot exits when the server connection is lost - - # Hardening - CapabilityBoundingSet = [ "" ]; - DynamicUser = true; - IPAddressDeny = [ - "link-local" - "multicast" - ]; - LockPersonality = true; - MemoryDenyWriteExecute = true; - ProcSubset = "pid"; - PrivateDevices = true; - PrivateUsers = true; - PrivateTmp = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - ]; - StateDirectory = "botamusique"; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service @resources" - "~@privileged" - ]; - UMask = "0077"; - WorkingDirectory = "/var/lib/botamusique"; - }; - }; - }; -} diff --git a/nixos/modules/services/audio/gonic.nix b/nixos/modules/services/audio/gonic.nix index da259d6957d9..d1b150b6501f 100644 --- a/nixos/modules/services/audio/gonic.nix +++ b/nixos/modules/services/audio/gonic.nix @@ -93,6 +93,7 @@ in ]; RestrictNamespaces = true; PrivateDevices = true; + PrivateTmp = true; PrivateUsers = true; ProtectClock = true; ProtectControlGroups = true; diff --git a/nixos/modules/services/audio/music-assistant.nix b/nixos/modules/services/audio/music-assistant.nix index a2a383bce8cd..be69ad9ba057 100644 --- a/nixos/modules/services/audio/music-assistant.nix +++ b/nixos/modules/services/audio/music-assistant.nix @@ -83,7 +83,18 @@ in lib.optional cfg.enable 8097 # Music Assistant stream port ++ lib.optional (lib.elem "airplay" cfg.providers) 7000 ++ lib.optional (lib.elem "sendspin" cfg.providers) 8927 - ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780; + ++ lib.optional (lib.elem "snapcast" cfg.providers) 1780 + ++ lib.optionals (lib.elem "squeezelite" cfg.providers) [ + # https://lyrion.org/reference/slimproto-protocol/ + 3483 # Slimproto control + # https://lyrion.org/reference/cli/using-the-cli/ + 9000 # Slimproto JSON-RPC + 9090 # Slimproto CLI + ]; + allowedUDPPorts = lib.optionals (lib.elem "squeezelite" cfg.providers) [ + # https://lyrion.org/reference/slimproto-protocol/ + 3483 # Slimproto discovery + ]; # The information published by Apple 1 seem to not apply to libraop. # The closest we could find that represents the port range being used as observed by tcpdump is the ephemeral port range. # 1: https://support.apple.com/en-us/103229#:~:text=49152%E2%80%93-,65535,-TCP%2C%20UDP @@ -96,13 +107,17 @@ in ]; }; - services.avahi = lib.mkIf (lib.elem "airplay_receiver" cfg.providers) { - enable = true; - openFirewall = lib.mkIf cfg.openFirewall true; - publish = { + services = { + avahi = lib.mkIf (lib.elem "airplay_receiver" cfg.providers) { enable = true; - userServices = true; + openFirewall = lib.mkIf cfg.openFirewall true; + publish = { + enable = true; + userServices = true; + }; }; + + music-assistant.providers = cfg.package.providersBuiltins; }; systemd.services.music-assistant = { @@ -131,9 +146,12 @@ in ++ lib.optionals (lib.elem "airplay_receiver" cfg.providers) [ shairport-sync ] - ++ lib.optionals (lib.elem "spotify" cfg.providers || lib.elem "spotify_connect" cfg.providers) [ + ++ lib.optionals (lib.elem "spotify" cfg.providers) [ librespot-ma ] + ++ lib.optionals (lib.elem "spotify_connect" cfg.providers) [ + go-librespot + ] ++ lib.optionals (lib.elem "snapcast" cfg.providers) [ snapcast ] @@ -156,8 +174,12 @@ in DevicePolicy = "closed"; LockPersonality = true; # breaks pyopenssl's cffi calls, used in remote access feature + # not compatible with llvmlite which is required by numba -> librosa MemoryDenyWriteExecute = false; - ProcSubset = "pid"; + # required for torch to properly detect the supported engines + # allows Music-Assistant to warn, if x86_64-v2 cpu features are missing + BindReadOnlyPaths = [ "/proc/cpuinfo" ]; + ProcSubset = "all"; ProtectClock = true; ProtectControlGroups = true; ProtectHome = true; @@ -179,7 +201,7 @@ in SystemCallArchitectures = "native"; SystemCallFilter = [ "@system-service" - "~@privileged @resources" + "~@privileged" "mbind" ] ++ lib.optionals useYTMusic [ diff --git a/nixos/modules/services/backup/duplicati.nix b/nixos/modules/services/backup/duplicati.nix index b69510f0aecb..7ee92591d35a 100644 --- a/nixos/modules/services/backup/duplicati.nix +++ b/nixos/modules/services/backup/duplicati.nix @@ -72,7 +72,7 @@ in Each line in this option should be of the format --option=value. The options in this file take precedence over the options provided through command line arguments. - Duplicati docs: parameters-file + [Duplicati docs: parameters-file](https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file) ''; }; @@ -85,7 +85,7 @@ in Each line in the file option should be of the format --option=value. The options in this file take precedence over the options provided through command line arguments. - Duplicati docs: parameters-file + [Duplicati docs: parameters-file](https://duplicati.readthedocs.io/en/latest/06-advanced-options/#parameters-file) ''; }; }; diff --git a/nixos/modules/services/backup/sanoid.nix b/nixos/modules/services/backup/sanoid.nix index b8b64075b1d5..ff033e0e2a94 100644 --- a/nixos/modules/services/backup/sanoid.nix +++ b/nixos/modules/services/backup/sanoid.nix @@ -275,7 +275,7 @@ in "${cfg.package}/bin/sanoid" "--cron" "--configdir" - (pkgs.writeTextDir "sanoid.conf" configFile) + "/etc/sanoid" ] ++ cfg.extraArgs ); @@ -290,6 +290,8 @@ in after = [ "zfs.target" ]; startAt = cfg.interval; }; + + environment.etc."sanoid/sanoid.conf".text = configFile; }; meta.maintainers = with lib.maintainers; [ lopsided98 ]; diff --git a/nixos/modules/services/backup/syncoid.nix b/nixos/modules/services/backup/syncoid.nix index 4fda57e8214c..8bfb3d70a6e6 100644 --- a/nixos/modules/services/backup/syncoid.nix +++ b/nixos/modules/services/backup/syncoid.nix @@ -459,7 +459,8 @@ in "~@privileged" "~@resources" "~@setuid" - "~@timer" + # NB: pv after 1.11.0 uses timer syscalls (specifically setitimer) + # "~@timer" ]; SystemCallArchitectures = "native"; # This is for BindPaths= and BindReadOnlyPaths= diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 2fd38e50459d..65df56ef39f1 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -360,7 +360,7 @@ in ${lib.optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra - runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra + runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -- -O hydra hydra touch ${baseDir}/.db-created fi echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra diff --git a/nixos/modules/services/databases/mysql.nix b/nixos/modules/services/databases/mysql.nix index 4a196efc7758..cfd7c8c76af3 100644 --- a/nixos/modules/services/databases/mysql.nix +++ b/nixos/modules/services/databases/mysql.nix @@ -293,6 +293,19 @@ in ''; }; + secureSuperUserByDefault = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to automatically secure the root@localhost user with auth_socket authentication. + + ::: {.note} + When enabled (default), the module will ensure root@localhost uses socket authentication, + preventing any local user from connecting as root without proper credentials. + ::: + ''; + }; + replication = { role = lib.mkOption { type = lib.types.enum [ @@ -411,6 +424,10 @@ in assertion = !cfg.galeraCluster.enable || isMariaDB; message = "'services.mysql.galeraCluster.enable' expect services.mysql.package to be an mariadb variant"; } + { + assertion = !isMariaDB || cfg.secureSuperUserByDefault == true; + message = "'services.mysql.secureSuperUserByDefault' has no effect on MariaDB (which is already secure by default)"; + } ] # galeraCluster options checks ++ lib.optionals cfg.galeraCluster.enable [ @@ -571,6 +588,7 @@ in let # The super user account to use on *first* run of MySQL server superUser = if isMariaDB then cfg.user else "root"; + isStateVersion2611Plus = lib.versionAtLeast config.system.stateVersion "26.11"; in '' ${lib.optionalString isMariaDB '' @@ -651,9 +669,35 @@ in cat ${toString cfg.initialScript} | ${cfg.package}/bin/mysql -u ${superUser} -N ''} + # Secure root@localhost for MySQL/Percona on first initialization + ${lib.optionalString (cfg.secureSuperUserByDefault && !isMariaDB) '' + echo "ALTER USER root@localhost IDENTIFIED WITH auth_socket;" | ${cfg.package}/bin/mysql -u ${superUser} -N + ''} + rm ${cfg.dataDir}/mysql_init fi + ${lib.optionalString (cfg.secureSuperUserByDefault && !isMariaDB) '' + # We try to detect if we are in the default insecure auth mode for MySQL (all users can connect with password) + # If the configuration has been moved to the socket-peer credential authentication we do nothing + # If we are not able to connect it also means the default setup has been adjusted, so we also skip and do not do any changes + if plugin_info=$(${cfg.package}/bin/mysql -u ${superUser} --skip-column-names 2>/dev/null -e "SELECT plugin FROM mysql.user WHERE user = 'root' AND host = 'localhost';"); then + case "$plugin_info" in + *auth_socket*) ;; + *) + ${lib.optionalString isStateVersion2611Plus '' + # Attempt to auto-fix to prevent local authentication without a password + echo "Securing root@localhost with auth_socket to local connection without password, see https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8" >&2 + echo "ALTER USER root@localhost IDENTIFIED WITH auth_socket;" | ${cfg.package}/bin/mysql -u ${superUser} -N + ''} + ${lib.optionalString (!isStateVersion2611Plus) '' + echo "Security warning: root@localhost seems to have open authentication, consider adjusting your configuration. See https://github.com/NixOS/nixpkgs/security/advisories/GHSA-6qxx-6rg8-c4p8" >&2 + ''} + ;; + esac + fi + ''} + ${lib.optionalString (cfg.ensureDatabases != [ ]) '' ( ${lib.concatMapStrings (database: '' diff --git a/nixos/modules/services/databases/postgresql.md b/nixos/modules/services/databases/postgresql.md index 27fe409579f1..96cdff8a3e82 100644 --- a/nixos/modules/services/databases/postgresql.md +++ b/nixos/modules/services/databases/postgresql.md @@ -194,7 +194,7 @@ For an upgrade, a script like this can be used to simplify the process: # XXX specify the postgresql package you'd like to upgrade to. # Do not forget to list the extensions you need. newPostgres = pkgs.postgresql_15.withPackages (pp: [ - # pp.plv8 + # pp.pl_cron ]); cfg = config.services.postgresql; in diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 2040d2be5bb1..f5350ad727ad 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -204,7 +204,9 @@ in type = types.package; example = literalExpression "pkgs.postgresql_15"; defaultText = literalExpression '' - if versionAtLeast config.system.stateVersion "25.11" then + if versionAtLeast config.system.stateVersion "26.11" then + pkgs.postgresql_18 + else if versionAtLeast config.system.stateVersion "25.11" then pkgs.postgresql_17 else if versionAtLeast config.system.stateVersion "24.11" then pkgs.postgresql_16 @@ -657,7 +659,9 @@ in ''; base = # XXX Don't forget to keep `defaultText` of `services.postgresql.package` up to date! - if versionAtLeast config.system.stateVersion "25.11" then + if versionAtLeast config.system.stateVersion "26.11" then + pkgs.postgresql_18 + else if versionAtLeast config.system.stateVersion "25.11" then pkgs.postgresql_17 else if versionAtLeast config.system.stateVersion "24.11" then pkgs.postgresql_16 @@ -705,9 +709,6 @@ in "~@privileged" = true; "~@resources" = true; }) - (mkIf (any extensionInstalled [ "plv8" ]) { - "@pkey" = true; - }) (mkIf (any extensionInstalled [ "citus" ]) { "getpriority" = true; "setpriority" = true; @@ -807,9 +808,7 @@ in PrivateTmp = true; ProtectHome = true; ProtectSystem = "strict"; - MemoryDenyWriteExecute = lib.mkDefault ( - cfg.settings.jit == "off" && (!any extensionInstalled [ "plv8" ]) - ); + MemoryDenyWriteExecute = lib.mkDefault (cfg.settings.jit == "off"); NoNewPrivileges = true; LockPersonality = true; PrivateDevices = true; diff --git a/nixos/modules/services/databases/redis.nix b/nixos/modules/services/databases/redis.nix index b735ffd79e70..0eab7103edda 100644 --- a/nixos/modules/services/databases/redis.nix +++ b/nixos/modules/services/databases/redis.nix @@ -30,6 +30,8 @@ let in { + meta.teams = [ lib.teams.redis ]; + imports = [ (lib.mkRemovedOptionModule [ "services" diff --git a/nixos/modules/services/desktop-managers/budgie.nix b/nixos/modules/services/desktop-managers/budgie.nix index 29bdb469d7f1..807d6b019b72 100644 --- a/nixos/modules/services/desktop-managers/budgie.nix +++ b/nixos/modules/services/desktop-managers/budgie.nix @@ -243,6 +243,8 @@ in # Required by Budgie's Polkit Dialog. security.polkit.enable = mkDefault true; + # Required by Budige's Control Center and Desktop + security.polkit.enablePkexecWrapper = mkDefault true; # Required by Budgie Panel plugins and/or Budgie Control Center panels. networking.networkmanager.enable = mkDefault true; # for BCC's Network panel. diff --git a/nixos/modules/services/desktop-managers/cosmic.nix b/nixos/modules/services/desktop-managers/cosmic.nix index c780a5164922..98bc4b933500 100644 --- a/nixos/modules/services/desktop-managers/cosmic.nix +++ b/nixos/modules/services/desktop-managers/cosmic.nix @@ -20,7 +20,7 @@ let with pkgs; [ cosmic-applets - cosmic-applibrary + cosmic-app-library cosmic-bg cosmic-comp cosmic-files @@ -84,6 +84,7 @@ in alsa-utils cosmic-edit cosmic-icons + cosmic-monitor cosmic-player cosmic-randr cosmic-reader @@ -124,16 +125,7 @@ in }; }; - systemd = { - packages = [ pkgs.cosmic-session ]; - user.targets = { - # TODO: remove when upstream has XDG autostart support - cosmic-session = { - wants = [ "xdg-desktop-autostart.target" ]; - before = [ "xdg-desktop-autostart.target" ]; - }; - }; - }; + systemd.packages = [ pkgs.cosmic-session ]; fonts.packages = with pkgs; [ fira @@ -146,7 +138,10 @@ in environment.sessionVariables.X11_EXTRA_RULES_XML = "${config.services.xserver.xkb.dir}/rules/base.extras.xml"; programs.dconf.enable = true; programs.dconf.packages = [ pkgs.cosmic-session ]; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; security.rtkit.enable = true; services.accounts-daemon.enable = true; services.displayManager.sessionPackages = [ pkgs.cosmic-session ]; diff --git a/nixos/modules/services/desktop-managers/gnome.nix b/nixos/modules/services/desktop-managers/gnome.nix index 3747a491098f..1d850f1f26e5 100644 --- a/nixos/modules/services/desktop-managers/gnome.nix +++ b/nixos/modules/services/desktop-managers/gnome.nix @@ -325,7 +325,11 @@ in i18n.inputMethod.enable = mkDefault true; i18n.inputMethod.type = mkDefault "ibus"; programs.dconf.enable = true; - security.polkit.enable = true; + security.polkit = { + enable = true; + # Required by gnome-initial-setup, gnome-system-monitor, gvfs for admin:// + enablePkexecWrapper = lib.mkDefault true; + }; security.rtkit.enable = mkDefault true; services.accounts-daemon.enable = true; services.dleyna.enable = mkDefault true; diff --git a/nixos/modules/services/desktop-managers/plasma6.nix b/nixos/modules/services/desktop-managers/plasma6.nix index 0785f4f809d1..f6106d3e83fe 100644 --- a/nixos/modules/services/desktop-managers/plasma6.nix +++ b/nixos/modules/services/desktop-managers/plasma6.nix @@ -172,6 +172,9 @@ in # touch keyboard plasma-keyboard qtvirtualkeyboard # used by plasma-keyboard KCM + + # experimental(?) Union theme + union ] ++ lib.optional config.networking.networkmanager.enable qrca ++ lib.optionals config.hardware.sensor.iio.enable [ @@ -271,6 +274,7 @@ in services.power-profiles-daemon.enable = mkDefault true; services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); + programs.fuse.enable = true; services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; services.libinput.enable = mkDefault true; diff --git a/nixos/modules/services/desktops/adw-bluetooth.nix b/nixos/modules/services/desktops/adw-bluetooth.nix new file mode 100644 index 000000000000..43c6cfe4e436 --- /dev/null +++ b/nixos/modules/services/desktops/adw-bluetooth.nix @@ -0,0 +1,34 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.adw-bluetooth; +in +{ + meta.maintainers = with lib.maintainers; [ ezratweaver ]; + + options.services.adw-bluetooth = { + enable = lib.mkEnableOption "Adwaita Bluetooth daemon"; + package = lib.mkPackageOption pkgs "adw-bluetooth" { }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; + + systemd.user.services.adw-bluetooth-daemon = { + description = "AdwBluetooth Daemon"; + wantedBy = [ "default.target" ]; + after = [ "bluetooth.target" ]; + serviceConfig = { + Type = "dbus"; + BusName = "com.ezratweaver.AdwBluetoothDaemon"; + ExecStart = "${cfg.package}/libexec/adw-bluetooth-daemon"; + }; + }; + }; +} diff --git a/nixos/modules/services/desktops/flatpak.nix b/nixos/modules/services/desktops/flatpak.nix index 5756738c9fda..e874cbac7a4f 100644 --- a/nixos/modules/services/desktops/flatpak.nix +++ b/nixos/modules/services/desktops/flatpak.nix @@ -40,6 +40,8 @@ in pkgs.fuse3 ]; + programs.fuse.enable = true; + security.polkit.enable = true; fonts.fontDir.enable = true; diff --git a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix index 958fbb546dc3..eaa9399862a4 100644 --- a/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix +++ b/nixos/modules/services/desktops/gnome/gnome-remote-desktop.nix @@ -22,6 +22,10 @@ config = lib.mkIf config.services.gnome.gnome-remote-desktop.enable { services.pipewire.enable = true; services.dbus.packages = [ pkgs.gnome-remote-desktop ]; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; environment.systemPackages = [ pkgs.gnome-remote-desktop ]; diff --git a/nixos/modules/services/desktops/gvfs.nix b/nixos/modules/services/desktops/gvfs.nix index 004810327798..cebfb0820229 100644 --- a/nixos/modules/services/desktops/gvfs.nix +++ b/nixos/modules/services/desktops/gvfs.nix @@ -40,6 +40,8 @@ in environment.systemPackages = [ cfg.package ]; + programs.fuse.enable = true; + services.dbus.packages = [ cfg.package ]; systemd.packages = [ cfg.package ]; diff --git a/nixos/modules/services/desktops/oo7.nix b/nixos/modules/services/desktops/oo7.nix new file mode 100644 index 000000000000..3053354a18d7 --- /dev/null +++ b/nixos/modules/services/desktops/oo7.nix @@ -0,0 +1,41 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.oo7; +in +{ + options.services.oo7 = { + enable = lib.mkEnableOption '' + oo7, a service providing the Secret Service D-Bus API + ''; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ pkgs.oo7 ]; + services.dbus.packages = [ pkgs.oo7-server ]; + + systemd = { + packages = [ pkgs.oo7-server ]; + user.services.oo7-daemon.wantedBy = [ "default.target" ]; + }; + + security = { + pam.services.login.oo7.enable = true; + + wrappers.oo7-daemon = { + owner = "root"; + group = "root"; + capabilities = "cap_ipc_lock=ep"; + source = "${pkgs.oo7-server}/libexec/oo7-daemon"; + }; + }; + + xdg.portal.extraPortals = [ pkgs.oo7-portal ]; + }; + + meta = { inherit (pkgs.oo7.meta) maintainers; }; +} diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix index 4449c273c7ec..fb72bd695cec 100644 --- a/nixos/modules/services/desktops/pipewire/pipewire.nix +++ b/nixos/modules/services/desktops/pipewire/pipewire.nix @@ -11,11 +11,17 @@ let inherit (lib) maintainers teams; inherit (lib.attrsets) attrByPath - attrsToList concatMapAttrs filterAttrs + mapAttrs' + nameValuePair + ; + inherit (lib.lists) + elem + flatten + optional + optionals ; - inherit (lib.lists) flatten optional optionals; inherit (lib.modules) mkIf mkRemovedOptionModule; inherit (lib.options) literalExpression @@ -23,7 +29,7 @@ let mkOption mkPackageOption ; - inherit (lib.strings) concatMapStringsSep hasPrefix optionalString; + inherit (lib.strings) hasPrefix optionalString; inherit (lib.types) attrsOf bool @@ -32,17 +38,6 @@ let ; json = pkgs.formats.json { }; - mapToFiles = - location: config: - concatMapAttrs (name: value: { - "share/pipewire/${location}.conf.d/${name}.conf" = json.generate "${name}" value; - }) config; - extraConfigPkgFromFiles = - locations: filesSet: - pkgs.runCommand "pipewire-extra-config" { } '' - mkdir -p ${concatMapStringsSep " " (l: "$out/share/pipewire/${l}.conf.d") locations} - ${concatMapStringsSep ";" ({ name, value }: "ln -s ${value} $out/${name}") (attrsToList filesSet)} - ''; cfg = config.services.pipewire; enable32BitAlsaPlugins = cfg.alsa.support32Bit && pkgs.stdenv.hostPlatform.isx86_64 && pkgs.pkgsi686Linux.pipewire != null; @@ -58,11 +53,24 @@ let configPackages = cfg.configPackages; - extraConfigPkg = extraConfigPkgFromFiles [ "pipewire" "client" "jack" "pipewire-pulse" ] ( - mapToFiles "pipewire" cfg.extraConfig.pipewire - // mapToFiles "client" cfg.extraConfig.client - // mapToFiles "jack" cfg.extraConfig.jack - // mapToFiles "pipewire-pulse" cfg.extraConfig.pipewire-pulse + extraConfigPkg = pkgs.linkFarm "pipewire-extra-config" ( + concatMapAttrs + ( + location: config: + mapAttrs' ( + name: value: + nameValuePair "share/pipewire/${location}.conf.d/${name}.conf" (json.generate name value) + ) config + ) + # cfg.extraConfig contains deprecated options, i.e. client-rt + { + inherit (cfg.extraConfig) + pipewire + client + jack + pipewire-pulse + ; + } ); configs = pkgs.buildEnv { diff --git a/nixos/modules/services/desktops/seatd.nix b/nixos/modules/services/desktops/seatd.nix index bedcc9a43120..939b9f338af9 100644 --- a/nixos/modules/services/desktops/seatd.nix +++ b/nixos/modules/services/desktops/seatd.nix @@ -40,7 +40,6 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = with pkgs; [ seatd - sdnotify-wrapper ]; users.groups.seat = lib.mkIf (cfg.group == "seat") { }; @@ -55,7 +54,7 @@ in Type = "notify"; NotifyAccess = "all"; SyslogIdentifier = "seatd"; - ExecStart = "${pkgs.sdnotify-wrapper}/bin/sdnotify-wrapper ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}"; + ExecStart = "${lib.getExe' pkgs.s6 "s6-notify-socket-from-fd"} ${pkgs.seatd.bin}/bin/seatd -n 1 -u ${cfg.user} -g ${cfg.group} -l ${cfg.logLevel}"; RestartSec = 1; Restart = "always"; }; diff --git a/nixos/modules/services/display-managers/dms-greeter.nix b/nixos/modules/services/display-managers/dms-greeter.nix index 5706c900c6f2..9814e5cdc25a 100644 --- a/nixos/modules/services/display-managers/dms-greeter.nix +++ b/nixos/modules/services/display-managers/dms-greeter.nix @@ -4,7 +4,6 @@ pkgs, ... }: - let inherit (lib) types @@ -24,13 +23,27 @@ let cfgAutoLogin = config.services.displayManager.autoLogin; sessionData = config.services.displayManager.sessionData; + # Miracle WM is nested under `programs.wayland.miracle-wm` unlike the rest + compositorOption = + if cfg.compositor.name == "miracle-wm" then "wayland.miracle-wm" else "${cfg.compositor.name}"; cacheDir = "/var/lib/dms-greeter"; + # Not all compositor packages match the name they use and Miracle does not have a package option + compositorPkg = + if cfg.compositor.name == "miracle-wm" then + pkgs.miracle-wm + else + lib.attrByPath [ + "programs" + cfg.compositor.name + "package" + ] null config; + greeterScript = pkgs.writeShellScriptBin "dms-greeter-start" '' export PATH=$PATH:${ makeBinPath [ cfg.quickshell.package - config.programs.${cfg.compositor.name}.package + compositorPkg ] } ${ @@ -123,6 +136,9 @@ in "niri" "hyprland" "sway" + "mangowc" + "miracle-wm" + "labwc" ]; example = "niri"; description = '' @@ -135,6 +151,9 @@ in - niri: A scrollable-tiling Wayland compositor - hyprland: A dynamic tiling Wayland compositor - sway: An i3-compatible Wayland compositor + - mango: A dwm-inspired Wayland compositor with modern config options and multiple layouts + - miracle-wm: A keyboard-driven Wayland compositor with smooth animations and extensibility + - labwc: Lightweight stacking Wayland compositor inspired by Openbox ''; }; @@ -242,12 +261,16 @@ in config = mkIf cfg.enable { assertions = [ { - assertion = config.programs.${cfg.compositor.name}.enable or false; + assertion = + # Assemble the full attribute structure because miracle-wm is not nested in the same location as the others + lib.attrByPath ( + [ "programs" ] ++ lib.splitString "." compositorOption ++ [ "enable" ] + ) false config; message = '' DankMaterialShell greeter: The compositor "${cfg.compositor.name}" is not enabled. Please enable the compositor via: - programs.${cfg.compositor.name}.enable = true; + programs.${compositorOption}.enable = true; ''; } { diff --git a/nixos/modules/services/display-managers/gdm.nix b/nixos/modules/services/display-managers/gdm.nix index b10c60436919..ea912d70b0af 100644 --- a/nixos/modules/services/display-managers/gdm.nix +++ b/nixos/modules/services/display-managers/gdm.nix @@ -200,8 +200,6 @@ in config = lib.mkIf cfg.enable { - warnings = lib.optional config.services.pulseaudio.enable "Support for Pulseaudio + gdm will be removed in NixOS 26.11"; - services.xserver.displayManager.lightdm.enable = false; users.users = lib.mkMerge [ @@ -423,7 +421,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -569,7 +567,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -577,7 +575,7 @@ in { name = "unix"; control = "requisite"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; settings.yescrypt = true; } diff --git a/nixos/modules/services/display-managers/plasma-login-manager.nix b/nixos/modules/services/display-managers/plasma-login-manager.nix index 65a16671bda0..b0d2fb01b76e 100644 --- a/nixos/modules/services/display-managers/plasma-login-manager.nix +++ b/nixos/modules/services/display-managers/plasma-login-manager.nix @@ -201,7 +201,7 @@ in # Setup session name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "systemd"; diff --git a/nixos/modules/services/display-managers/sddm.nix b/nixos/modules/services/display-managers/sddm.nix index 38725bf280f5..11a1089b4598 100644 --- a/nixos/modules/services/display-managers/sddm.nix +++ b/nixos/modules/services/display-managers/sddm.nix @@ -442,7 +442,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; diff --git a/nixos/modules/services/editors/emacs.nix b/nixos/modules/services/editors/emacs.nix index 2cf753484a80..c47577a6ce09 100644 --- a/nixos/modules/services/editors/emacs.nix +++ b/nixos/modules/services/editors/emacs.nix @@ -80,6 +80,9 @@ in unitConfig = lib.optionalAttrs cfg.startWithGraphical { After = "graphical-session.target"; }; + + # Long-lived session that ought to only be restarted manually + restartIfChanged = false; } // lib.optionalAttrs cfg.enable { wantedBy = if cfg.startWithGraphical then [ "graphical-session.target" ] else [ "default.target" ]; diff --git a/nixos/modules/services/games/quake3-server.nix b/nixos/modules/services/games/quake3-server.nix index 9a94ce2293db..43aad73a4b04 100644 --- a/nixos/modules/services/games/quake3-server.nix +++ b/nixos/modules/services/games/quake3-server.nix @@ -127,6 +127,4 @@ in }; }; }; - - meta.maintainers = with lib.maintainers; [ f4814n ]; } diff --git a/nixos/modules/services/hardware/pcscd.nix b/nixos/modules/services/hardware/pcscd.nix index f7e23df84f01..0b9aae8e2bbd 100644 --- a/nixos/modules/services/hardware/pcscd.nix +++ b/nixos/modules/services/hardware/pcscd.nix @@ -10,8 +10,6 @@ let builtins.concatStringsSep "\n\n" config.services.pcscd.readerConfigs ); - package = if config.security.polkit.enable then pkgs.pcscliteWithPolkit else pkgs.pcsclite; - pluginEnv = pkgs.buildEnv { name = "pcscd-plugins"; paths = map (p: "${p}/pcsc/drivers") config.services.pcscd.plugins; @@ -36,6 +34,11 @@ in options.services.pcscd = { enable = lib.mkEnableOption "PCSC-Lite daemon, to access smart cards using SCard API (PC/SC)"; + package = (lib.mkPackageOption pkgs "pcsclite" { }) // { + default = if config.security.polkit.enable then pkgs.pcscliteWithPolkit else pkgs.pcsclite; + defaultText = lib.literalExpression "if config.security.polkit.enable then pkgs.pcscliteWithPolkit else pkgs.pcsclite"; + }; + plugins = lib.mkOption { type = lib.types.listOf lib.types.package; defaultText = lib.literalExpression "[ pkgs.ccid ]"; @@ -101,8 +104,8 @@ in config = lib.mkIf config.services.pcscd.enable { environment.etc."reader.conf".source = cfgFile; - environment.systemPackages = [ package ]; - systemd.packages = [ package ]; + environment.systemPackages = [ cfg.package ]; + systemd.packages = [ cfg.package ]; services.pcscd.plugins = [ pkgs.ccid ]; @@ -133,7 +136,7 @@ in # https://github.com/NixOS/nixpkgs/issues/121088 serviceConfig.ExecStart = [ "" - "${lib.getExe package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" + "${lib.getExe cfg.package} -f -x -c ${cfgFile} ${lib.escapeShellArgs cfg.extraArgs}" ]; }; diff --git a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix index 074126518b45..fe156c0c9e32 100644 --- a/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix +++ b/nixos/modules/services/hardware/sane_extra_backends/brscan5_etc_files.nix @@ -58,17 +58,17 @@ stdenv.mkDerivation { dontConfigure = true; buildPhase = '' - TARGET_DIR="$out/etc/opt/brother/scanner/brscan5" + TARGET_DIR="$out/tmp" mkdir -p "$TARGET_DIR" cp -rp "./models" "$TARGET_DIR" cp -rp "./brscan5.ini" "$TARGET_DIR" cp -rp "./brsanenetdevice.cfg" "$TARGET_DIR" - export NIX_REDIRECTS="/etc/opt/brother/scanner/brscan5/=$TARGET_DIR/" - printf '${addAllNetDev netDevices}\n' - ${addAllNetDev netDevices} + + mkdir -p "$out/etc/opt/brother/scanner/brscan5" + mv -T "$TARGET_DIR" "$out/etc/opt/brother/scanner/brscan5" ''; dontInstall = true; diff --git a/nixos/modules/services/hardware/tuned.nix b/nixos/modules/services/hardware/tuned.nix index 65a857f4fde8..f399dc55c306 100644 --- a/nixos/modules/services/hardware/tuned.nix +++ b/nixos/modules/services/hardware/tuned.nix @@ -246,7 +246,10 @@ in systemPackages = [ cfg.package ]; }; - security.polkit.enable = lib.mkDefault true; + security.polkit = { + enable = lib.mkDefault true; + enablePkexecWrapper = lib.mkDefault true; + }; services = { dbus.packages = [ cfg.package ]; diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 1299a5115a5f..1f28286b059d 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -461,10 +461,17 @@ in "${config.boot.initrd.systemd.package}/lib/systemd/systemd-udevd" "${config.boot.initrd.systemd.package}/lib/udev/ata_id" "${config.boot.initrd.systemd.package}/lib/udev/cdrom_id" - "${config.boot.initrd.systemd.package}/lib/udev/dmi_memory_id" "${config.boot.initrd.systemd.package}/lib/udev/scsi_id" "${config.boot.initrd.systemd.package}/lib/udev/rules.d" ] + ++ lib.optional ( + # https://github.com/systemd/systemd/blob/v259/meson.build#L1529-L1530 + pkgs.stdenv.hostPlatform.isx86 + || pkgs.stdenv.hostPlatform.isAarch + || pkgs.stdenv.hostPlatform.isLoongArch64 + || pkgs.stdenv.hostPlatform.isMips + || pkgs.stdenv.hostPlatform.isRiscV64 + ) "${config.boot.initrd.systemd.package}/lib/udev/dmi_memory_id" ++ map (x: "${x}/bin") config.boot.initrd.services.udev.binPackages; # Generate the udev rules for the initrd diff --git a/nixos/modules/services/hardware/watt.nix b/nixos/modules/services/hardware/watt.nix new file mode 100644 index 000000000000..56b3d6f5036d --- /dev/null +++ b/nixos/modules/services/hardware/watt.nix @@ -0,0 +1,71 @@ +{ + config, + pkgs, + lib, + ... +}: +let + inherit (lib) + mkIf + mkOption + mkEnableOption + mkPackageOption + getExe + ; + inherit (lib.types) submodule; + + cfg = config.services.watt; + + format = pkgs.formats.toml { }; + cfgFile = format.generate "watt-config.toml" cfg.settings; + + conflictingServices = [ + "power-profiles-daemon" + "auto-cpufreq" + "tlp" + "cpupower-gui" + "thermald" + ]; + +in +{ + options.services.watt = { + enable = mkEnableOption "automatic CPU speed & power optimizer for Linux"; + package = mkPackageOption pkgs "watt" { }; + + settings = mkOption { + default = { }; + type = submodule { freeformType = format.type; }; + description = "Configuration for Watt. Options at https://github.com/notaShelf/watt"; + }; + }; + + config = mkIf cfg.enable { + assertions = map (service: { + assertion = !config.services.${service}.enable; + message = "You have set services.${service}.enable = true; which conflicts with Watt."; + }) conflictingServices; + + environment.systemPackages = [ cfg.package ]; + + # This is necessary for the Watt CLI. The environment variable + # passed to the systemd service will take priority in read order. + environment.etc."watt.toml".source = cfgFile; + + services.dbus.packages = [ cfg.package ]; + + systemd.services.watt = { + wantedBy = [ "multi-user.target" ]; + conflicts = map (service: "${service}.service") conflictingServices; + serviceConfig = { + WorkingDirectory = ""; + ExecStart = getExe cfg.package; + Restart = "on-failure"; + + RuntimeDirectory = "watt"; + RuntimeDirectoryMode = "0755"; + }; + }; + + }; +} diff --git a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix index 834cd7c6b774..c0851d190ec8 100644 --- a/nixos/modules/services/home-automation/wyoming/faster-whisper.nix +++ b/nixos/modules/services/home-automation/wyoming/faster-whisper.nix @@ -39,6 +39,17 @@ in options = { enable = mkEnableOption "Wyoming faster-whisper server"; + task = mkOption { + type = enum [ + "transcribe" + "translate" + ]; + default = "transcribe"; + description = '' + Whisper task to perform. + ''; + }; + zeroconf = { enable = mkEnableOption "zeroconf discovery" // { default = true; @@ -349,6 +360,8 @@ in options.uri "--device" options.device + "--whisper-task" + options.task "--stt-library" options.sttLibrary "--model" diff --git a/nixos/modules/services/home-automation/zigbee2mqtt.nix b/nixos/modules/services/home-automation/zigbee2mqtt.nix index 1372d2a8d097..5fe8b3a68db7 100644 --- a/nixos/modules/services/home-automation/zigbee2mqtt.nix +++ b/nixos/modules/services/home-automation/zigbee2mqtt.nix @@ -84,6 +84,7 @@ in StateDirectory = "zigbee2mqtt"; StateDirectoryMode = "0700"; Restart = "on-failure"; + RestartSec = 10; # Hardening CapabilityBoundingSet = ""; @@ -113,6 +114,7 @@ in "AF_INET" "AF_INET6" "AF_NETLINK" + "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; diff --git a/nixos/modules/services/mail/dovecot.nix b/nixos/modules/services/mail/dovecot.nix index 2c00b3ee6529..48b0795c53c1 100644 --- a/nixos/modules/services/mail/dovecot.nix +++ b/nixos/modules/services/mail/dovecot.nix @@ -7,7 +7,6 @@ let inherit (lib) - all attrsToList concatMapStringsSep concatStringsSep @@ -19,7 +18,6 @@ let isBool isDerivation isInt - isList isPath isString listToAttrs @@ -98,53 +96,67 @@ let i: n: v: "${i}${toString n} = ${v}"; - formatKeyValue = - indent: n: v: - if (v == null) then - "" - else if isInt v then - toOption indent n (toString v) + isPrimitive = v: !isAttrs v || isDerivation v; + + formatPrimitive = + v: + if isInt v then + toString v else if isBool v then - toOption indent n (yesOrNo v) + yesOrNo v else if isString v then - toOption indent n v - else if isList v then - if all isString v then - toOption indent n (concatStringsSep " " v) - else - map (formatKeyValue indent n) v + v else if isPath v || isDerivation v then # paths -> copy to store # derivations -> just use output path instead of looping over the attrs - toOption indent n "${v}" - else if isAttrs v && v ? _section then - let - sectionType = v._section.type; - sectionName = v._section.name; - sectionTitle = concatStringsSep " " ( - filter (s: s != null) [ - sectionType - sectionName - ] - ); - in - concatStringsSep "\n" ( - [ - "${indent}${sectionTitle} {" - ] - ++ (mapAttrsToList (formatKeyValue "${indent} ") (removeAttrs v [ "_section" ])) - ++ [ "${indent}}" ] - ) - else if isAttrs v then - concatStringsSep "\n" ( - [ - "${indent}${n} {" - ] - ++ (mapAttrsToList (formatKeyValue "${indent} ") v) - ++ [ "${indent}}" ] - ) + "${v}" else - throw (traceSeq v "services.dovecot2.settings: unexpected type"); + throw (traceSeq v "services.dovecot2.settings: unexpected primitive type"); + + formatSection = + indent: n: v: + let + sectionTitle = + if v ? _section then + concatStringsSep " " ( + filter (s: s != null) [ + v._section.type + v._section.name + ] + ) + else + n; + inner = removeAttrs v [ "_section" ]; + in + concatStringsSep "\n" ( + [ "${indent}${sectionTitle} {" ] + ++ flatten (mapAttrsToList (primitiveLinesFor "${indent} ") inner) + ++ flatten (mapAttrsToList (sectionLinesFor "${indent} ") inner) + ++ [ "${indent}}" ] + ); + + # emit lines for a k=v pair only when the value is a primitive + primitiveLinesFor = + indent: n: v: + let + primitives = filter isPrimitive (flatten [ v ]); + hasOnlySections = primitives == [ ] && v != [ ]; + in + # Only emit an empty list if the original entry was also an empty list. + # This is so that values like k = [{ ... }] will not produce an output + # here, but k = [] will, even though they result in the same + # primitives = []. + optional (!hasOnlySections && v != null) ( + toOption indent n (concatMapStringsSep " " formatPrimitive primitives) + ); + + # emit lines for a k=v pair only when the value is *not* a primitive + sectionLinesFor = + indent: n: v: + let + sections = filter (e: !isPrimitive e) (flatten [ v ]); + in + map (e: formatSection indent n e) sections; doveConf = let @@ -156,10 +168,13 @@ let ]; in concatStringsSep "\n" ( - optional (configVersion != null) (formatKeyValue "" "dovecot_config_version" configVersion) - ++ optional (storageVersion != null) (formatKeyValue "" "dovecot_storage_version" storageVersion) + optionals (configVersion != null) (primitiveLinesFor "" "dovecot_config_version" configVersion) + ++ optionals (storageVersion != null) ( + primitiveLinesFor "" "dovecot_storage_version" storageVersion + ) ++ optionals (cfg.includeFiles != [ ]) (map (f: "!include ${f}") cfg.includeFiles) - ++ flatten (mapAttrsToList (formatKeyValue "") remainingSettings) + ++ flatten (mapAttrsToList (primitiveLinesFor "") remainingSettings) + ++ flatten (mapAttrsToList (sectionLinesFor "") remainingSettings) ); isPre24 = versionOlder cfg.package.version "2.4"; diff --git a/nixos/modules/services/mail/maddy.nix b/nixos/modules/services/mail/maddy.nix index 32dcf0347d2e..61bab0e531d7 100644 --- a/nixos/modules/services/mail/maddy.nix +++ b/nixos/modules/services/mail/maddy.nix @@ -350,11 +350,13 @@ in }; secrets = lib.mkOption { - type = with lib.types; listOf path; + type = with lib.types; listOf (either str path); description = '' A list of files containing the various secrets. Should be in the format expected by systemd's `EnvironmentFile` directory. Secrets can be referenced in the format `{env:VAR}`. + + Paths can be prefixed with `-` to ignore errors if the file does not exist. ''; default = [ ]; }; diff --git a/nixos/modules/services/mail/postfix-tlspol.nix b/nixos/modules/services/mail/postfix-tlspol.nix index 23753897b229..f49a17991842 100644 --- a/nixos/modules/services/mail/postfix-tlspol.nix +++ b/nixos/modules/services/mail/postfix-tlspol.nix @@ -164,6 +164,20 @@ in }; users.groups.postfix-tlspol = { }; + systemd.sockets.postfix-tlspol = { + wantedBy = [ "sockets.target" ]; + socketConfig = { + Accept = false; + ListenStream = [ + (lib.removePrefix "unix:" cfg.settings.server.address) + ]; + SocketUser = "postfix-tlspol"; + SocketGroup = "postfix-tlspol"; + SocketMode = cfg.settings.server.socket-permissions; + DirectoryMode = "0755"; + }; + }; + systemd.services.postfix-tlspol = { after = [ "nss-lookup.target" @@ -173,7 +187,6 @@ in "nss-lookup.target" "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; description = "Postfix DANE/MTA-STS TLS policy socketmap service"; documentation = [ "https://github.com/Zuplu/postfix-tlspol" ]; @@ -217,9 +230,6 @@ in RestrictAddressFamilies = [ "AF_INET" "AF_INET6" - ] - ++ lib.optionals (lib.hasPrefix "unix:" cfg.settings.server.address) [ - "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; @@ -237,7 +247,7 @@ in RuntimeDirectory = "postfix-tlspol"; RuntimeDirectoryMode = "1750"; WorkingDirectory = "/var/cache/postfix-tlspol"; - UMask = "0117"; + UMask = "0077"; }; }; }) diff --git a/nixos/modules/services/mail/postsrsd.nix b/nixos/modules/services/mail/postsrsd.nix index dac11fdea236..9cf435e4893a 100644 --- a/nixos/modules/services/mail/postsrsd.nix +++ b/nixos/modules/services/mail/postsrsd.nix @@ -281,7 +281,7 @@ in environment.etc."postsrsd.conf".source = configFile; systemd.services.postsrsd = { - description = "PostSRSd SRS rewriting server"; + description = "Sender Rewriting Scheme daemon for Postfix"; after = [ "network.target" "postsrsd-generate-secrets.service" @@ -289,14 +289,20 @@ in before = [ "postfix.service" ]; wantedBy = [ "multi-user.target" ]; requires = [ "postsrsd-generate-secrets.service" ]; - restartTriggers = [ configFile ]; + reloadTriggers = [ configFile ]; serviceConfig = { + Type = "notify-reload"; ExecStart = utils.escapeSystemdExecArgs [ (lib.getExe cfg.package) "-C" "/etc/postsrsd.conf" ]; + ExecReload = toString [ + (lib.getExe' pkgs.coreutils "kill") + "-SIGHUP" + "$MAINPID" + ]; User = cfg.user; Group = cfg.group; RuntimeDirectory = "postsrsd"; @@ -319,7 +325,7 @@ in ProtectKernelModules = true; ProtectKernelTunables = true; ProtectSystem = "strict"; - ProtectProc = "invisible"; + ProtectProc = "noaccess"; ProcSubset = "pid"; RemoveIPC = true; RestrictAddressFamilies = diff --git a/nixos/modules/services/mail/rspamd.nix b/nixos/modules/services/mail/rspamd.nix index 189d2c078e0d..11867a6601ac 100644 --- a/nixos/modules/services/mail/rspamd.nix +++ b/nixos/modules/services/mail/rspamd.nix @@ -506,6 +506,7 @@ in CapabilityBoundingSet = ""; DevicePolicy = "closed"; LockPersonality = true; + MemoryDenyWriteExecute = false; # pcre2 jit NoNewPrivileges = true; PrivateDevices = true; PrivateMounts = true; diff --git a/nixos/modules/services/mail/stalwart.nix b/nixos/modules/services/mail/stalwart.nix index 4e596ad3e572..d4b3bf801042 100644 --- a/nixos/modules/services/mail/stalwart.nix +++ b/nixos/modules/services/mail/stalwart.nix @@ -57,7 +57,7 @@ in default = { }; description = '' Configuration options for the Stalwart server. - See for available options. + See for available options. By default, the module is configured to store everything locally. ''; diff --git a/nixos/modules/services/matrix/appservice-discord.nix b/nixos/modules/services/matrix/appservice-discord.nix deleted file mode 100644 index cf3c8ea20eae..000000000000 --- a/nixos/modules/services/matrix/appservice-discord.nix +++ /dev/null @@ -1,163 +0,0 @@ -{ - config, - options, - pkgs, - lib, - ... -}: -let - dataDir = "/var/lib/matrix-appservice-discord"; - registrationFile = "${dataDir}/discord-registration.yaml"; - cfg = config.services.matrix-appservice-discord; - opt = options.services.matrix-appservice-discord; - # TODO: switch to configGen.json once RFC42 is implemented - settingsFile = pkgs.writeText "matrix-appservice-discord-settings.json" ( - builtins.toJSON cfg.settings - ); - -in -{ - options = { - services.matrix-appservice-discord = { - enable = lib.mkEnableOption "a bridge between Matrix and Discord"; - - package = lib.mkPackageOption pkgs "matrix-appservice-discord" { }; - - settings = lib.mkOption rec { - # TODO: switch to lib.types.config.json as prescribed by RFC42 once it's implemented - type = lib.types.attrs; - apply = lib.recursiveUpdate default; - default = { - database = { - filename = "${dataDir}/discord.db"; - }; - - # empty values necessary for registration file generation - # actual values defined in environmentFile - auth = { - clientID = ""; - botToken = ""; - }; - }; - example = lib.literalExpression '' - { - bridge = { - domain = "public-domain.tld"; - homeserverUrl = "http://public-domain.tld:8008"; - }; - } - ''; - description = '' - {file}`config.yaml` configuration as a Nix attribute set. - - Configuration options should match those described in - [config.sample.yaml](https://github.com/Half-Shot/matrix-appservice-discord/blob/master/config/config.sample.yaml). - - {option}`config.bridge.domain` and {option}`config.bridge.homeserverUrl` - should be set to match the public host name of the Matrix homeserver for webhooks and avatars to work. - - Secret tokens should be specified using {option}`environmentFile` - instead of this world-readable attribute set. - ''; - }; - - environmentFile = lib.mkOption { - type = lib.types.nullOr lib.types.path; - default = null; - description = '' - File containing environment variables to be passed to the matrix-appservice-discord service, - in which secret tokens can be specified securely by defining values for - `APPSERVICE_DISCORD_AUTH_CLIENT_I_D` and - `APPSERVICE_DISCORD_AUTH_BOT_TOKEN`. - ''; - }; - - url = lib.mkOption { - type = lib.types.str; - default = "http://localhost:${toString cfg.port}"; - defaultText = lib.literalExpression ''"http://localhost:''${toString config.${opt.port}}"''; - description = '' - The URL where the application service is listening for HS requests. - ''; - }; - - port = lib.mkOption { - type = lib.types.port; - default = 9005; # from https://github.com/Half-Shot/matrix-appservice-discord/blob/master/package.json#L11 - description = '' - Port number on which the bridge should listen for internal communication with the Matrix homeserver. - ''; - }; - - localpart = lib.mkOption { - type = with lib.types; nullOr str; - default = null; - description = '' - The user_id localpart to assign to the AS. - ''; - }; - - serviceDependencies = lib.mkOption { - type = with lib.types; listOf str; - default = lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit; - defaultText = lib.literalExpression '' - lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit - ''; - description = '' - List of Systemd services to require and wait for when starting the application service, - such as the Matrix homeserver if it's running on the same host. - ''; - }; - }; - }; - - config = lib.mkIf cfg.enable { - systemd.services.matrix-appservice-discord = { - description = "A bridge between Matrix and Discord."; - - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ] ++ cfg.serviceDependencies; - after = [ "network-online.target" ] ++ cfg.serviceDependencies; - - preStart = '' - if [ ! -f '${registrationFile}' ]; then - ${cfg.package}/bin/matrix-appservice-discord \ - --generate-registration \ - --url=${lib.escapeShellArg cfg.url} \ - ${ - lib.optionalString (cfg.localpart != null) "--localpart=${lib.escapeShellArg cfg.localpart}" - } \ - --config='${settingsFile}' \ - --file='${registrationFile}' - fi - ''; - - serviceConfig = { - Type = "simple"; - Restart = "always"; - - ProtectSystem = "strict"; - ProtectHome = true; - ProtectKernelTunables = true; - ProtectKernelModules = true; - ProtectControlGroups = true; - - DynamicUser = true; - PrivateTmp = true; - WorkingDirectory = "${cfg.package}/${cfg.package.passthru.nodeAppDir}"; - StateDirectory = baseNameOf dataDir; - UMask = "0027"; - EnvironmentFile = cfg.environmentFile; - - ExecStart = '' - ${cfg.package}/bin/matrix-appservice-discord \ - --file='${registrationFile}' \ - --config='${settingsFile}' \ - --port='${toString cfg.port}' - ''; - }; - }; - }; - - meta.maintainers = with lib.maintainers; [ euxane ]; -} diff --git a/nixos/modules/services/matrix/dendrite.nix b/nixos/modules/services/matrix/dendrite.nix index 302bd42b5e37..671c3821da4d 100644 --- a/nixos/modules/services/matrix/dendrite.nix +++ b/nixos/modules/services/matrix/dendrite.nix @@ -13,6 +13,7 @@ in { options.services.dendrite = { enable = lib.mkEnableOption "matrix.org dendrite"; + package = lib.mkPackageOption pkgs "dendrite" { }; httpPort = lib.mkOption { type = lib.types.nullOr lib.types.port; default = 8008; @@ -321,7 +322,7 @@ in ]; ExecStart = lib.strings.concatStringsSep " " ( [ - "${pkgs.dendrite}/bin/dendrite" + (lib.getExe cfg.package) "--config /run/dendrite/dendrite.yaml" ] ++ lib.optionals (cfg.httpPort != null) [ @@ -341,5 +342,4 @@ in }; }; }; - meta.teams = [ lib.teams.matrix ]; } diff --git a/nixos/modules/services/matrix/hebbot.nix b/nixos/modules/services/matrix/hebbot.nix index efd22c906acc..d4c2daf47ab4 100644 --- a/nixos/modules/services/matrix/hebbot.nix +++ b/nixos/modules/services/matrix/hebbot.nix @@ -25,7 +25,7 @@ let }; in { - meta.maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ ]; options.services.hebbot = { enable = mkEnableOption "hebbot"; package = lib.mkPackageOption pkgs "hebbot" { }; diff --git a/nixos/modules/services/matrix/matrix-authentication-service.nix b/nixos/modules/services/matrix/matrix-authentication-service.nix new file mode 100644 index 000000000000..ee3c1a5d8232 --- /dev/null +++ b/nixos/modules/services/matrix/matrix-authentication-service.nix @@ -0,0 +1,474 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + inherit (lib) + concatMapStringsSep + filter + filterAttrs + getExe + getExe' + isAttrs + isList + mapAttrs + mkEnableOption + mkIf + mkOption + mkPackageOption + optional + types + ; + + cfg = config.services.matrix-authentication-service; + format = pkgs.formats.yaml { }; + filterRecursiveNull = + o: + if isAttrs o then + mapAttrs (_: v: filterRecursiveNull v) (filterAttrs (_: v: v != null) o) + else if isList o then + map filterRecursiveNull (filter (v: v != null) o) + else + o; + + # remove null values from the final configuration + finalSettings = + let + pruned = filterRecursiveNull cfg.settings; + in + if pruned ? upstream_oauth2 && pruned.upstream_oauth2 == { } then + removeAttrs pruned [ "upstream_oauth2" ] + else + pruned; + configFile = format.generate "config.yaml" finalSettings; + + extraConfigFiles = lib.imap0 ( + i: _: "\${CREDENTIALS_DIRECTORY}/config-${toString i}" + ) cfg.extraConfigFiles; + runtimeConfig = "/run/matrix-authentication-service/config.yaml"; +in +{ + meta.maintainers = with lib.maintainers; [ + eymeric + flashonfire + mkoppmann + skowalak + ]; + meta.teams = [ lib.teams.matrix ]; + + options.services.matrix-authentication-service = { + enable = mkEnableOption "Matrix Authentication Service"; + + package = mkPackageOption pkgs "matrix-authentication-service" { }; + + settings = mkOption { + default = { }; + description = '' + The primary mas configuration. See the + [configuration reference](https://element-hq.github.io/matrix-authentication-service/usage/configuration.html) + for possible values. + + Secrets should be passed in by using the `extraConfigFiles` option. + ''; + type = types.submodule { + freeformType = format.type; + + options = { + http.public_base = mkOption { + type = types.str; + default = "http://[::]:8080/"; + description = '' + Public URL base used when building absolute public URLs. + ''; + }; + http.trusted_proxies = mkOption { + type = types.listOf types.str; + default = [ + "127.0.0.1/8" + "::1/128" + ]; + description = '' + MAS can infer the client IP address from the X-Forwarded-For header. It will trust the value for this header only if the request comes from a trusted reverse proxy listed here. + ''; + }; + http.listeners = mkOption { + type = types.listOf ( + types.submodule { + freeformType = format.type; + options = { + name = mkOption { + type = types.str; + example = "web"; + description = '' + The name of the listener, used in logs and metrics. + ''; + }; + proxy_protocol = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the PROXY protocol on the listener. + ''; + }; + resources = mkOption { + type = types.listOf ( + types.submodule { + freeformType = format.type; + options = { + name = mkOption { + type = types.str; + description = '' + Serve the given resource. + ''; + }; + }; + } + ); + description = '' + List of resources to serve. + ''; + }; + binds = mkOption { + type = types.listOf ( + types.submodule { + freeformType = format.type; + options = { + host = mkOption { + type = types.nullOr types.str; + description = '' + Listen on the given host. + ''; + }; + port = mkOption { + type = types.nullOr types.port; + description = '' + Listen on the given port. + ''; + }; + }; + } + ); + description = '' + List of addresses and ports to listen to. + ''; + }; + }; + } + ); + default = [ + { + name = "web"; + resources = [ + { name = "discovery"; } + { name = "human"; } + { name = "oauth"; } + { name = "compat"; } + { name = "graphql"; } + { name = "assets"; } + ]; + binds = [ + { + host = "0.0.0.0"; + port = 8080; + } + ]; + proxy_protocol = false; + } + { + name = "internal"; + resources = [ + { name = "health"; } + ]; + binds = [ + { + host = "0.0.0.0"; + port = 8081; + } + ]; + proxy_protocol = false; + } + ]; + description = '' + Each listener can serve multiple resources, and listen on multiple TCP ports or UNIX sockets. + ''; + }; + + database.uri = mkOption { + type = types.str; + default = "postgresql:///matrix-authentication-service?host=/run/postgresql"; + description = '' + The postgres connection string. + Refer to . + If you need to put secrets in the uri, please use the `extraConfigFiles` option. + ''; + }; + + database.max_connections = mkOption { + type = types.ints.unsigned; + default = 10; + description = '' + Maximum number of connections for the connection pool. + ''; + }; + + database.min_connections = mkOption { + type = types.ints.unsigned; + default = 0; + description = '' + Minimum number of connections for the connection pool. + ''; + }; + + database.connect_timeout = mkOption { + type = types.ints.unsigned; + default = 30; + description = '' + Connection timeout for the connection pool. + ''; + }; + + database.idle_timeout = mkOption { + type = types.ints.unsigned; + default = 600; + description = '' + Idle timeout for the connection pool. + ''; + }; + + database.max_lifetime = mkOption { + type = types.ints.unsigned; + default = 1800; + description = '' + Maximum lifetime for the connection pool. + ''; + }; + + passwords.enabled = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable the password database. If disabled, users will only be able to log in using upstream OIDC providers. + ''; + }; + + passwords.schemes = mkOption { + type = types.listOf ( + types.submodule { + freeformType = format.type; + options = { + version = mkOption { + type = types.ints.unsigned; + description = '' + Password scheme version. + ''; + }; + algorithm = mkOption { + type = types.str; + description = '' + Password scheme algorithm. + ''; + }; + }; + } + ); + default = [ + { + version = 1; + algorithm = "argon2id"; + } + ]; + description = '' + List of password hashing schemes being used. Only change this if you know what you're doing. + ''; + }; + + passwords.minimum_complexity = mkOption { + type = types.enum [ + 0 + 1 + 2 + 3 + 4 + ]; + default = 3; + description = '' + Minimum complexity required for passwords, estimated by the zxcvbn algorithm. + Must be between 0 and 4, default is 3. See for more information. + ''; + }; + + matrix.homeserver = mkOption { + type = types.str; + default = ""; + description = '' + Corresponds to the server_name in the Synapse configuration file. + ''; + }; + matrix.endpoint = mkOption { + type = types.str; + default = ""; + description = '' + The URL to which the homeserver is accessible from the service. + ''; + }; + upstream_oauth2.providers = mkOption { + default = null; + type = types.nullOr ( + types.listOf ( + types.submodule { + freeformType = format.type; + options = { + id = mkOption { + type = types.nullOr types.str; + example = "01H8PKNWKKRPCBW4YGH1RWV279"; + default = null; + description = '' + Unique id for the provider, must be a ULID, and can be generated using online tools like . + ''; + }; + }; + } + ) + ); + description = '' + Configuration of upstream providers + ''; + }; + }; + }; + }; + + createDatabase = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable and configure `services.postgresql` to ensure that the database user `matrix-authentication-service` + and the database `matrix-authentication-service` exist. + ''; + }; + + extraConfigFiles = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + Extra config files to include. + + The configuration files will be included based on the command line + argument --config. This allows to configure secrets without + having to go through the Nix store, e.g. based on deployment keys if + NixOps is in use. + ''; + }; + + serviceDependencies = mkOption { + type = types.listOf types.str; + default = optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit; + defaultText = lib.literalExpression '' + lib.optional config.services.matrix-synapse.enable config.services.matrix-synapse.serviceUnit + ''; + description = '' + List of Systemd services to require and wait for when starting the application service, + such as the Matrix homeserver if it's running on the same host. + ''; + }; + + credentials = lib.mkOption { + type = lib.types.attrsOf lib.types.str; + default = { }; + description = '' + Mapping of credential name to source file-path. Exposed to the unit via LoadCredential and + readable inside the service at `''${CREDENTIALS_DIRECTORY}/`. + + For example: + + ``` + services.matrix-authentication-service.credentials."synapse-secret" = "/run/agenix/synapse-shared"; + services.matrix-authentication-service.settings.matrix.secret_file = + "\''${CREDENTIALS_DIRECTORY}/synapse-secret"; + ``` + ''; + }; + }; + + config = mkIf cfg.enable { + services.postgresql = mkIf cfg.createDatabase { + enable = true; + ensureDatabases = [ "matrix-authentication-service" ]; + ensureUsers = [ + { + name = "matrix-authentication-service"; + ensureDBOwnership = true; + } + ]; + }; + + systemd.services.matrix-authentication-service = rec { + after = optional cfg.createDatabase "postgresql.service" ++ cfg.serviceDependencies; + wants = after; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + LoadCredential = + (lib.imap0 (i: path: "config-${toString i}:${path}") cfg.extraConfigFiles) + ++ (lib.mapAttrsToList (name: path: "${name}:${path}") cfg.credentials); + ExecStartPre = pkgs.writeShellScript "mas-prepare" '' + ${getExe' pkgs.gettext "envsubst"} \ + '$CREDENTIALS_DIRECTORY' \ + < ${configFile} \ + > /run/matrix-authentication-service/config.yaml + ${getExe cfg.package} config check --config ${runtimeConfig} \ + ${concatMapStringsSep " " (x: "--config ${x}") extraConfigFiles} + ''; + ExecStart = '' + ${getExe cfg.package} server --config ${runtimeConfig} \ + ${concatMapStringsSep " " (x: "--config ${x}") extraConfigFiles} + ''; + Restart = "on-failure"; + RestartSec = "1s"; + + # Security Hardening + CapabilityBoundingSet = ""; + AmbientCapabilities = ""; + LockPersonality = true; + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_UNIX" + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + ]; + UMask = "0077"; + + # Working and state directories + StateDirectory = "matrix-authentication-service"; + StateDirectoryMode = "0700"; + RuntimeDirectory = "matrix-authentication-service"; + WorkingDirectory = "/var/lib/matrix-authentication-service"; + }; + }; + }; +} diff --git a/nixos/modules/services/matrix/rust-federation-tester.nix b/nixos/modules/services/matrix/rust-federation-tester.nix new file mode 100644 index 000000000000..4b7a3420d2e0 --- /dev/null +++ b/nixos/modules/services/matrix/rust-federation-tester.nix @@ -0,0 +1,153 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: + +let + cfg = config.services.rust-federation-tester; + + configFile = "/run/rust-federation-tester/config.yaml"; + commonServiceConfig = { + DynamicUser = true; + RuntimeDirectory = "rust-federation-tester"; + RuntimeDirectoryPreserve = true; + StateDirectory = "rust-federation-tester"; + User = "rust-federation-tester"; + WorkingDirectory = "%t/rust-federation-tester"; + + # Hardening + UMask = "0077"; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "strict"; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + LockPersonality = true; + PrivateDevices = true; + PrivateMounts = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + ]; + }; + + secretsInjection = utils.genJqSecretsReplacement { + loadCredential = true; + } cfg.settings configFile; +in +{ + options.services.rust-federation-tester = { + enable = lib.mkEnableOption "rust-federation-tester"; + + settings = lib.mkOption { + type = lib.types.submodule { + freeformType = lib.types.json; + options = { + frontend_url = lib.mkOption { + type = lib.types.str; + example = "federation-tester.example.org"; + description = '' + URL of the service's frontend. + ''; + }; + + database_url = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/rust-federation-tester/db?mode=rwc"; + example = "postgres://localhost/db?currentSchema=schema"; + description = '' + The database to store accounts and statistics. + ''; + }; + + smtp = { + enabled = lib.mkEnableOption "mail delivery for configured alerts"; + }; + + listen_addr = lib.mkOption { + type = lib.types.str; + default = "[::]:8080"; + example = "unix:/run/rust-federation-tester/rust-federation-tester.sock"; + description = '' + Address the API server should listen on. + ''; + }; + }; + }; + + description = '' + Settings representing the values in {file}`config.yaml` of the service. + + Refer to [`config.yaml.example`] for supported values. + + [`config.yaml.example`]: https://github.com/MTRNord/rust-federation-tester/blob/main/config.yaml.example + ''; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.sockets.rust-federation-tester = { + description = "Matrix-Federation-Tester in Rust socket"; + wantedBy = [ "sockets.target" ]; + listenStreams = [ (lib.removePrefix "unix:" cfg.settings.listen_addr) ]; + }; + + systemd.services.rust-federation-tester-setup = { + description = "Matrix-Federation-Tester in Rust"; + path = [ pkgs.rust-federation-tester ]; + + serviceConfig = lib.mkMerge [ + commonServiceConfig + { + Type = "oneshot"; + RemainAfterExit = true; + LoadCredential = secretsInjection.credentials; + ExecStart = "${pkgs.writeShellScript "rust-federation-tester-setup" '' + ${secretsInjection.script} + + migration up + ''}"; + } + ]; + }; + + systemd.services.rust-federation-tester = { + description = "Matrix-Federation-Tester in Rust"; + wantedBy = [ "multi-user.target" ]; + documentation = [ "https://github.com/MTRNord/rust-federation-tester" ]; + after = [ "rust-federation-tester-setup.service" ]; + requires = [ "rust-federation-tester-setup.service" ]; + + serviceConfig = lib.mkMerge [ + commonServiceConfig + { + ExecSearchPath = lib.makeBinPath [ pkgs.rust-federation-tester ]; + ExecStart = "rust-federation-tester"; + Restart = "on-failure"; + } + ]; + }; + }; +} diff --git a/nixos/modules/services/matrix/tuwunel.nix b/nixos/modules/services/matrix/tuwunel.nix index 6296fd6cb6cf..6a17ac5f726d 100644 --- a/nixos/modules/services/matrix/tuwunel.nix +++ b/nixos/modules/services/matrix/tuwunel.nix @@ -62,6 +62,19 @@ in }; }; + environmentFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/secrets/matrix-tuwunel.env"; + description = '' + Path to a file containing sensitive environment variables as described in {manpage}`systemd.exec(5). + + Refer to + + for specifying options as environment variables. + ''; + }; + settings = lib.mkOption { type = lib.types.submodule { freeformType = format.type; @@ -255,6 +268,7 @@ in ExecStart = lib.getExe cfg.package; Restart = "on-failure"; RestartSec = 10; + EnvironmentFile = lib.mkIf (cfg.environmentFile != null) cfg.environmentFile; }; }; }; diff --git a/nixos/modules/services/misc/angrr.nix b/nixos/modules/services/misc/angrr.nix index 92e371efdf2d..55e0687eef2e 100644 --- a/nixos/modules/services/misc/angrr.nix +++ b/nixos/modules/services/misc/angrr.nix @@ -27,6 +27,16 @@ let keep-latest-n = 5; keep-booted-system = true; keep-current-system = true; + keep-n-per-bucket = [ + { + bucket-window = "1 day"; + bucket-amount = 7; + } + { + bucket-window = "1 week"; + bucket-amount = 4; + } + ]; }; user = { enable = false; @@ -198,6 +208,13 @@ let Whether to keep the last booted system generation. Only useful for system profiles. ''; }; + keep-n-per-bucket = lib.mkOption { + type = with lib.types; listOf (submodule keepNPerBucketOptions); + default = [ ]; + description = '' + Specify a list of rules having n, bucket-window, and bucket-amount attributes. + ''; + }; }; }; filterOptions = { @@ -218,6 +235,31 @@ let }; }; }; + keepNPerBucketOptions = { + freeformType = toml.type; + options = { + n = lib.mkOption { + type = lib.types.int; + default = 1; + description = '' + Retain n generations every bucket-window duration for bucket-amount buckets. + ''; + }; + bucket-window = lib.mkOption { + type = lib.types.str; + description = '' + The duration of the bucket window. + ''; + }; + bucket-amount = lib.mkOption { + type = lib.types.int; + default = 1; + description = '' + The number of buckets to keep. + ''; + }; + }; + }; # toml.generate does not support null values, we need to filter them out first filteredSettings = lib.filterAttrsRecursive (name: value: value != null) cfg.settings; @@ -236,7 +278,6 @@ in { meta.maintainers = pkgs.angrr.meta.maintainers; imports = [ - (lib.mkRemovedOptionModule [ "services" "angrr" "period" ] configFileMigrationMsg) (lib.mkRemovedOptionModule [ "services" "angrr" "removeRoot" ] configFileMigrationMsg) (lib.mkRemovedOptionModule [ "services" "angrr" "ownedOnly" ] configFileMigrationMsg) ]; @@ -267,6 +308,15 @@ in Extra command-line arguments pass to angrr. ''; }; + period = lib.mkOption { + type = with lib.types; nullOr str; + default = null; + description = '' + If set, it configures {option}`services.angrr.settings` to a preset that + monitor .direnv, results, system, and user profiles, + retaining GC roots that are younger than the specified period. + ''; + }; settings = lib.mkOption { type = lib.types.submodule settingsOptions; example = exampleSettings; @@ -372,6 +422,38 @@ in _angrr_auto_use "$@" ''; }) + + # When period is set, configure a preset retention policy + # Users can still override settings via services.angrr.settings + (lib.mkIf (cfg.period != null) { + services.angrr.settings = { + temporary-root-policies = { + direnv = { + path-regex = "/\\.direnv/"; + period = cfg.period; + }; + result = { + path-regex = "/result[^/]*$"; + period = cfg.period; + }; + }; + profile-policies = { + system = { + profile-paths = [ "/nix/var/nix/profiles/system" ]; + keep-since = cfg.period; + keep-booted-system = true; + keep-current-system = true; + }; + user = { + profile-paths = [ + "~/.local/state/nix/profiles/profile" + "/nix/var/nix/profiles/per-user/root/profile" + ]; + keep-since = cfg.period; + }; + }; + }; + }) ] ); } diff --git a/nixos/modules/services/misc/apache-kafka.nix b/nixos/modules/services/misc/apache-kafka.nix index 5b52ee478560..acb3c17354cc 100644 --- a/nixos/modules/services/misc/apache-kafka.nix +++ b/nixos/modules/services/misc/apache-kafka.nix @@ -63,7 +63,7 @@ in options = { "broker.id" = lib.mkOption { - description = "Broker ID. -1 or null to auto-allocate in zookeeper mode."; + description = "Broker ID."; default = null; type = with lib.types; nullOr int; }; @@ -172,9 +172,13 @@ in [ "services" "apache-kafka" "logDirs" ] [ "services" "apache-kafka" "settings" "log.dirs" ] ) - (lib.mkRenamedOptionModule - [ "services" "apache-kafka" "zookeeper" ] - [ "services" "apache-kafka" "settings" "zookeeper.connect" ] + (lib.mkRemovedOptionModule + [ + "services" + "apache-kafka" + "zookeeper" + ] + "ZooKeeper mode is no longer supported by any packaged Apache Kafka version; please migrate to KRaft mode instead" ) (lib.mkRemovedOptionModule [ diff --git a/nixos/modules/services/misc/autosuspend.nix b/nixos/modules/services/misc/autosuspend.nix index 9bbc9b2e7af8..29380a35347f 100644 --- a/nixos/modules/services/misc/autosuspend.nix +++ b/nixos/modules/services/misc/autosuspend.nix @@ -240,12 +240,15 @@ in after = [ "network.target" ]; path = flatten (attrValues (filterAttrs (n: _: hasCheck n) dependenciesForChecks)); serviceConfig = { - ExecStart = "${autosuspend}/bin/autosuspend -l ${autosuspend}/etc/autosuspend-logging.conf -c ${autosuspend-conf} daemon"; + ExecStart = "${autosuspend}/bin/autosuspend --logging ${autosuspend}/etc/autosuspend-logging.conf daemon --config ${autosuspend-conf}"; }; }; }; meta = { - maintainers = with maintainers; [ xlambein ]; + maintainers = with maintainers; [ + xlambein + adamcstephens + ]; }; } diff --git a/nixos/modules/services/misc/bees.nix b/nixos/modules/services/misc/bees.nix index 1bf794988aa5..a5099db3e2ad 100644 --- a/nixos/modules/services/misc/bees.nix +++ b/nixos/modules/services/misc/bees.nix @@ -17,6 +17,7 @@ let notice = 5; info = 6; debug = 7; + trace = 8; }; fsOptions = with lib.types; { diff --git a/nixos/modules/services/misc/castsponsorskip.nix b/nixos/modules/services/misc/castsponsorskip.nix new file mode 100644 index 000000000000..0b7eb39de9c8 --- /dev/null +++ b/nixos/modules/services/misc/castsponsorskip.nix @@ -0,0 +1,49 @@ +{ + config, + pkgs, + lib, + ... +}: +let + cfg = config.services.castsponsorskip; +in +{ + options = { + services.castsponsorskip = { + enable = lib.mkEnableOption "castsponsorskip"; + package = lib.mkPackageOption pkgs "castsponsorskip" { }; + config = lib.mkOption { + type = (pkgs.formats.yaml { }).type; + default = { }; + example = { + CSS_SKIP_SPONSORS = false; + }; + description = "Configuration for the service. List of options all options ."; + }; + }; + }; + config = lib.mkIf cfg.enable { + systemd.services.castsponsorskip = + let + # Needed, even if empty, to avoid searching for a file in + # the user home directory, which doesn't exist for + # dynamic users + config = (pkgs.formats.yaml cfg.config).generate "config.yaml" { }; + in + { + description = "Skip YouTube ads and sponsorships on all local Google Cast devices"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + DynamicUser = true; + Restart = "always"; + ExecStart = "${lib.getExe cfg.package} --config=${config}"; + TimeoutStopSec = "20s"; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ wariuccio ]; + }; +} diff --git a/nixos/modules/services/misc/errbot.nix b/nixos/modules/services/misc/errbot.nix index aa94368d61d2..270375256159 100644 --- a/nixos/modules/services/misc/errbot.nix +++ b/nixos/modules/services/misc/errbot.nix @@ -91,6 +91,20 @@ in }; users.groups.errbot = { }; + systemd.tmpfiles.settings = { + "10-errbot" = lib.mapAttrs' ( + name: instanceCfg: + let + dataDir = if instanceCfg.dataDir != null then instanceCfg.dataDir else "/var/lib/errbot/${name}"; + in + lib.nameValuePair "${dataDir}".d { + group = "errbot"; + user = "errbot"; + mode = "0755"; + } + ) cfg.instances; + }; + systemd.services = lib.mapAttrs' ( name: instanceCfg: lib.nameValuePair "errbot-${name}" ( @@ -103,12 +117,7 @@ in serviceConfig = { User = "errbot"; Restart = "on-failure"; - ExecStartPre = [ - "${lib.getExe' pkgs.coreutils "mkdir"} -p ${dataDir}" - "${lib.getExe' pkgs.coreutils "chown"} -R errbot:errbot ${dataDir}" - ]; ExecStart = "${pkgs.errbot}/bin/errbot -c ${mkConfigDir instanceCfg dataDir}/config.py"; - PermissionsStartOnly = true; }; } ) diff --git a/nixos/modules/services/misc/gitweb.nix b/nixos/modules/services/misc/gitweb.nix index 3030dc5c8285..65f923add2d5 100644 --- a/nixos/modules/services/misc/gitweb.nix +++ b/nixos/modules/services/misc/gitweb.nix @@ -6,7 +6,12 @@ }: let cfg = config.services.gitweb; - + cfgNginx = config.services.gitweb.nginx; + package = pkgs.gitweb.override ( + lib.optionalAttrs cfg.gitwebTheme { + gitwebTheme = true; + } + ); in { @@ -55,6 +60,104 @@ in internal = true; }; + nginx = { + enable = lib.mkOption { + default = false; + type = lib.types.bool; + description = '' + If true, enable gitweb in nginx. + ''; + }; + + location = lib.mkOption { + default = "/gitweb"; + type = lib.types.str; + description = '' + Location to serve gitweb on. + ''; + }; + + user = lib.mkOption { + default = "nginx"; + type = lib.types.str; + description = '' + Existing user that the CGI process will belong to. (Default almost surely will do.) + ''; + }; + + group = lib.mkOption { + default = "nginx"; + type = lib.types.str; + description = '' + Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.) + ''; + }; + + virtualHost = lib.mkOption { + default = "_"; + type = lib.types.str; + description = '' + VirtualHost to serve gitweb on. Default is catch-all. + ''; + }; + }; + + }; + + imports = [ + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "enable" ] + [ "services" "gitweb" "nginx" "enable" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "location" ] + [ "services" "gitweb" "nginx" "location" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "user" ] + [ "services" "gitweb" "nginx" "user" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "group" ] + [ "services" "gitweb" "nginx" "group" ] + ) + (lib.mkRenamedOptionModule + [ "services" "nginx" "gitweb" "virtualHost" ] + [ "services" "gitweb" "nginx" "virtualHost" ] + ) + ]; + + config = lib.mkIf cfgNginx.enable { + + systemd.services.gitweb = { + description = "GitWeb service"; + script = "${package}/gitweb.cgi --fastcgi --nproc=1"; + environment = { + FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; + }; + serviceConfig = { + User = cfgNginx.user; + Group = cfgNginx.group; + RuntimeDirectory = [ "gitweb" ]; + }; + wantedBy = [ "multi-user.target" ]; + }; + + services.nginx = { + virtualHosts.${cfgNginx.virtualHost} = { + locations."${cfgNginx.location}/static/" = { + alias = "${package}/static/"; + }; + locations."${cfgNginx.location}/" = { + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param GITWEB_CONFIG ${cfg.gitwebConfigFile}; + fastcgi_pass unix:/run/gitweb/gitweb.sock; + ''; + }; + }; + }; + }; meta.maintainers = [ ]; diff --git a/nixos/modules/services/misc/graphical-desktop.nix b/nixos/modules/services/misc/graphical-desktop.nix index e26050c123de..906601d1fc0c 100644 --- a/nixos/modules/services/misc/graphical-desktop.nix +++ b/nixos/modules/services/misc/graphical-desktop.nix @@ -22,17 +22,23 @@ in config = lib.mkIf cfg.enable { environment = { - # localectl looks into 00-keyboard.conf - etc."X11/xorg.conf.d/00-keyboard.conf".text = '' - Section "InputClass" - Identifier "Keyboard catchall" - MatchIsKeyboard "on" - Option "XkbModel" "${xcfg.xkb.model}" - Option "XkbLayout" "${xcfg.xkb.layout}" - Option "XkbOptions" "${xcfg.xkb.options}" - Option "XkbVariant" "${xcfg.xkb.variant}" - EndSection - ''; + # systemd-localed looks into 00-keyboard.conf + # systemd-localed does not like if Option values are "" + etc."X11/xorg.conf.d/00-keyboard.conf".text = + let + optionLine = + name: value: lib.optionalString (value != null && value != "") ''Option "${name}" "${value}"''; + in + '' + Section "InputClass" + Identifier "Keyboard catchall" + MatchIsKeyboard "on" + ${optionLine "XkbModel" xcfg.xkb.model} + ${optionLine "XkbLayout" xcfg.xkb.layout} + ${optionLine "XkbOptions" xcfg.xkb.options} + ${optionLine "XkbVariant" xcfg.xkb.variant} + EndSection + ''; systemPackages = with pkgs; [ nixos-icons # needed for gnome and pantheon about dialog, nixos-manual and maybe more xdg-utils diff --git a/nixos/modules/services/misc/jellyfin.nix b/nixos/modules/services/misc/jellyfin.nix index d9e76154f0a8..7a6c5dae8536 100644 --- a/nixos/modules/services/misc/jellyfin.nix +++ b/nixos/modules/services/misc/jellyfin.nix @@ -33,7 +33,11 @@ let ; cfg = config.services.jellyfin; filteredDecodingCodecs = builtins.filter ( - c: c != "hevcRExt10bit" && c != "hevcRExt12bit" && cfg.transcoding.hardwareDecodingCodecs.${c} + c: + c != "hevc10bit" + && c != "hevcRExt10bit" + && c != "hevcRExt12bit" + && cfg.transcoding.hardwareDecodingCodecs.${c} ) (builtins.attrNames cfg.transcoding.hardwareDecodingCodecs); encodingXmlText = '' @@ -58,6 +62,7 @@ let ${boolToString cfg.transcoding.hardwareEncodingCodecs.av1} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} ${boolToString cfg.transcoding.enableIntelLowPowerEncoding} + ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevc10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt10bit} ${boolToString cfg.transcoding.hardwareDecodingCodecs.hevcRExt12bit} diff --git a/nixos/modules/services/misc/kafka.md b/nixos/modules/services/misc/kafka.md index 370bb3b482d2..a5d8f699f65d 100644 --- a/nixos/modules/services/misc/kafka.md +++ b/nixos/modules/services/misc/kafka.md @@ -12,10 +12,9 @@ manual](https://kafka.apache.org/documentation/#configuration) broker settings. ## KRaft {#module-services-apache-kafka-kraft} -Unlike in Zookeeper mode, Kafka in -[KRaft](https://kafka.apache.org/documentation/#kraft) mode requires each log -dir to be "formatted" (which means a cluster-specific a metadata file must -exist in each log dir) +Kafka in [KRaft](https://kafka.apache.org/documentation/#kraft) mode requires +each log dir to be "formatted" (which means a cluster-specific a metadata file +must exist in each log dir) The upstream intention is for users to execute the [storage tool](https://kafka.apache.org/documentation/#kraft_storage) to achieve this, @@ -59,5 +58,4 @@ Notable changes to be aware of include: - [Upstream docs](https://kafka.apache.org/documentation.html#brokerconfigs_broker.id) - Removal of `services.apache-kafka.zookeeper` - - Translate using: `services.apache-kafka.settings."zookeeper.connect"` - - [Upstream docs](https://kafka.apache.org/documentation.html#brokerconfigs_zookeeper.connect) + - ZooKeeper mode is no longer supported; migrate to [KRaft](#module-services-apache-kafka-kraft) mode instead. diff --git a/nixos/modules/services/misc/ntfy-sh.nix b/nixos/modules/services/misc/ntfy-sh.nix index 8e10576f54e4..69919c83e779 100644 --- a/nixos/modules/services/misc/ntfy-sh.nix +++ b/nixos/modules/services/misc/ntfy-sh.nix @@ -103,6 +103,7 @@ in ExecStart = "${cfg.package}/bin/ntfy serve -c ${configuration}"; User = cfg.user; StateDirectory = "ntfy-sh"; + RuntimeDirectory = "ntfy-sh"; DynamicUser = true; AmbientCapabilities = "CAP_NET_BIND_SERVICE"; diff --git a/nixos/modules/services/misc/ollama.nix b/nixos/modules/services/misc/ollama.nix index bc1693f1902e..547f4e0799e4 100644 --- a/nixos/modules/services/misc/ollama.nix +++ b/nixos/modules/services/misc/ollama.nix @@ -37,6 +37,18 @@ in "ollama" "acceleration" ] "Set `services.ollama.package` to one of `pkgs.ollama[,-vulkan,-rocm,-cuda,-cpu]` instead.") + (lib.mkRenamedOptionModule + [ + "services" + "ollama" + "models" + ] + [ + "services" + "ollama" + "modelsDir" + ] + ) ]; options = { @@ -91,7 +103,7 @@ in The home directory that the ollama service is started in. ''; }; - models = lib.mkOption { + modelsDir = lib.mkOption { type = types.str; default = "${cfg.home}/models"; defaultText = "\${config.services.ollama.home}/models"; @@ -207,7 +219,7 @@ in cfg.environmentVariables // { HOME = cfg.home; - OLLAMA_MODELS = cfg.models; + OLLAMA_MODELS = cfg.modelsDir; OLLAMA_HOST = "${cfg.host}:${toString cfg.port}"; } // lib.optionalAttrs (cfg.rocmOverrideGfx != null) { @@ -226,7 +238,7 @@ in StateDirectory = [ "ollama" ]; ReadWritePaths = [ cfg.home - cfg.models + cfg.modelsDir ]; CapabilityBoundingSet = [ "" ]; @@ -306,16 +318,18 @@ in script = let binaryInputs = lib.mapAttrs (_: lib.getExe) { - parallel = pkgs.parallel; awk = pkgs.gawk; sed = pkgs.gnused; }; + inherit (binaryInputs) - parallel awk sed ; + nproc = lib.getExe' pkgs.coreutils "nproc"; + xargs = lib.getExe' pkgs.findutils "xargs"; + declaredModelsRegex = lib.pipe cfg.loadModels [ (map lib.escapeRegex) (lib.concatStringsSep "|") @@ -344,7 +358,7 @@ in fi ''} - '${parallel}' --tag '${ollama}' pull ::: ${lib.escapeShellArgs cfg.loadModels} + printf "%s\0" ${lib.escapeShellArgs cfg.loadModels} | '${xargs}' -0 -r -n 1 -P "$('${nproc}')" '${ollama}' pull ''; }; diff --git a/nixos/modules/services/misc/paperless.nix b/nixos/modules/services/misc/paperless.nix index 9df4e99ff9a5..bfe8b651b350 100644 --- a/nixos/modules/services/misc/paperless.nix +++ b/nixos/modules/services/misc/paperless.nix @@ -24,6 +24,8 @@ let GRANIAN_HOST = cfg.address; GRANIAN_PORT = toString cfg.port; GRANIAN_WORKERS_KILL_TIMEOUT = "60"; + # django-allauth uses python requests, which doesn't use the systems CA bundle by default: https://requests.readthedocs.io/en/latest/user/advanced/#ca-certificates + REQUESTS_CA_BUNDLE = config.security.pki.caBundle; } // lib.optionalAttrs (config.time.timeZone != null) { PAPERLESS_TIME_ZONE = config.time.timeZone; @@ -621,7 +623,7 @@ in PrivateNetwork = false; }; environment = env // { - PYTHONPATH = "${cfg.package.python.pkgs.makePythonPath cfg.package.propagatedBuildInputs}:${cfg.package}/lib/paperless-ngx/src"; + PYTHONPATH = "${cfg.package.python.pkgs.makePythonPath cfg.package.passthru.dependencies}:${cfg.package}/lib/paperless-ngx/src"; }; # Allow the web interface to access the private /tmp directory of the server. # This is required to support uploading files via the web interface. diff --git a/nixos/modules/services/misc/redmine.nix b/nixos/modules/services/misc/redmine.nix index c017dd333e1a..731bd895c761 100644 --- a/nixos/modules/services/misc/redmine.nix +++ b/nixos/modules/services/misc/redmine.nix @@ -245,19 +245,19 @@ in }; components = { - subversion = lib.mkEnableOption "Subversion integration."; + subversion = lib.mkEnableOption "Subversion integration"; - mercurial = lib.mkEnableOption "Mercurial integration."; + mercurial = lib.mkEnableOption "Mercurial integration"; - git = lib.mkEnableOption "git integration."; + git = lib.mkEnableOption "git integration"; - cvs = lib.mkEnableOption "cvs integration."; + cvs = lib.mkEnableOption "cvs integration"; - breezy = lib.mkEnableOption "bazaar integration."; + breezy = lib.mkEnableOption "bazaar integration"; - imagemagick = lib.mkEnableOption "exporting Gant diagrams as PNG."; + imagemagick = lib.mkEnableOption "exporting Gant diagrams as PNG"; - ghostscript = lib.mkEnableOption "exporting Gant diagrams as PDF."; + ghostscript = lib.mkEnableOption "exporting Gant diagrams as PDF"; minimagick_font_path = lib.mkOption { type = lib.types.str; @@ -265,6 +265,8 @@ in description = "MiniMagick font path"; example = "/run/current-system/sw/share/X11/fonts/LiberationSans-Regular.ttf"; }; + + pandoc = lib.mkEnableOption "pandoc integration for previewing LibreOffice and Microsoft Office documents"; }; }; }; @@ -310,6 +312,7 @@ in imagemagick_convert_command = lib.optionalString cfg.components.imagemagick "${pkgs.imagemagick}/bin/convert"; gs_command = lib.optionalString cfg.components.ghostscript "${pkgs.ghostscript}/bin/gs"; minimagick_font_path = "${cfg.components.minimagick_font_path}"; + pandoc_command = lib.optionalString cfg.components.pandoc "${pkgs.pandoc}/bin/pandoc"; }; }; @@ -457,7 +460,7 @@ in Group = cfg.group; TimeoutSec = "300"; WorkingDirectory = "${cfg.package}/share/redmine"; - ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port} -P '${cfg.stateDir}/redmine.pid'"; + ExecStart = "${bundle} exec rails server -u webrick -e production -b ${toString cfg.address} -p ${toString cfg.port}"; RuntimeDirectory = "redmine"; RuntimeDirectoryMode = "0750"; AmbientCapabilities = ""; diff --git a/nixos/modules/services/misc/shoko.nix b/nixos/modules/services/misc/shoko.nix index 2b9ab971e212..9b41d45ca9c1 100644 --- a/nixos/modules/services/misc/shoko.nix +++ b/nixos/modules/services/misc/shoko.nix @@ -90,8 +90,5 @@ in }; }; - meta.maintainers = with lib.maintainers; [ - diniamo - nanoyaki - ]; + meta.maintainers = with lib.maintainers; [ nanoyaki ]; } diff --git a/nixos/modules/services/misc/stash-clipboard.nix b/nixos/modules/services/misc/stash-clipboard.nix new file mode 100644 index 000000000000..634f6433f118 --- /dev/null +++ b/nixos/modules/services/misc/stash-clipboard.nix @@ -0,0 +1,73 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.stash-clipboard; + inherit (lib) + mkPackageOption + mkEnableOption + mkOption + types + mkIf + getExe + concatStringsSep + ; +in +{ + options.services.stash-clipboard = { + enable = mkEnableOption "stash, a Wayland clipboard manager"; + + package = mkPackageOption pkgs [ "stash-clipboard" ] { }; + + arguments = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "--max-items 10" ]; + description = "A list of arguments to pass to stash watch."; + }; + + filterFile = mkOption { + type = types.str; + default = ""; + example = "/etc/stash/clipboard_filter"; + description = '' + Stash can be configured to avoid storing clipboard entries that match a sensitive pattern, using a regular expression. + The file set here should contain your regex pattern (no quotes). + + Example regex to block common password patterns: + - (password|secret|api[_-]?key|token)[=: ]+[^\s]+ + ''; + }; + + excludedApps = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "Bitwarden" ]; + description = '' + List of application classes to exclude from the database. + Entries from these apps are still copied to the clipboard, but it will never be put inside the database. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + systemd = { + user.services.stash-clipboard = { + description = "Stash clipboard manager daemon"; + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + serviceConfig = { + ExecStart = "${getExe cfg.package} ${concatStringsSep " " cfg.arguments} watch"; + LoadCredential = mkIf (cfg.filterFile != "") "clipboard_filter:${cfg.filterFile}"; + }; + environment = mkIf (cfg.excludedApps != [ ]) { + STASH_EXCLUDED_APPS = concatStringsSep "," cfg.excludedApps; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/misc/unpackerr.nix b/nixos/modules/services/misc/unpackerr.nix new file mode 100644 index 000000000000..710c44346b66 --- /dev/null +++ b/nixos/modules/services/misc/unpackerr.nix @@ -0,0 +1,102 @@ +{ + config, + pkgs, + lib, + utils, + ... +}: + +let + cfg = config.services.unpackerr; + configFormat = pkgs.formats.toml { }; + configFile = configFormat.generate "unpackerr.conf" cfg.settings; + inherit (lib) + mkEnableOption + mkOption + mkPackageOption + mkIf + getExe + types + ; +in +{ + options = { + services.unpackerr = { + enable = mkEnableOption "Unpackerr"; + + settings = mkOption { + type = configFormat.type; + default = { }; + example = { + radarr = [ + { + url = "http://127.0.0.1:8989"; + api_key = "0123456789abcdef0123456789abcdef"; + } + ]; + sonarr = [ + { + url = "http://127.0.0.1:7878"; + api_key = "0123456789abcdef0123456789abcdef"; + } + ]; + }; + description = '' + Unpackerr TOML configuration as a Nix attribute set. + Refer to [Unpackerr docs](https://unpackerr.zip/docs/install/configuration) for details. + For setting secrets refer to this [section](https://unpackerr.zip/docs/install/configuration/#secrets-and-passwords). + ''; + }; + + user = mkOption { + type = types.str; + default = "unpackerr"; + description = "User account under which Unpackerr runs."; + }; + + group = mkOption { + type = types.str; + default = "unpackerr"; + description = "Group under which Unpackerr runs."; + }; + + package = mkPackageOption pkgs "unpackerr" { }; + }; + }; + + config = mkIf cfg.enable { + # Upstream service: https://github.com/Unpackerr/unpackerr/blob/main/init/systemd/unpackerr.service + systemd = { + services.unpackerr = { + description = "Unpackerr - archive extraction daemon"; + wants = [ "network.target" ]; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "exec"; + User = cfg.user; + Group = cfg.group; + ExecStart = utils.escapeSystemdExecArgs [ + (getExe cfg.package) + "--config=${configFile}" + ]; + Restart = "always"; + RestartSec = 10; + }; + }; + }; + + users.users = mkIf (cfg.user == "unpackerr") { + unpackerr = { + inherit (cfg) group; + isSystemUser = true; + }; + }; + + users.groups = mkIf (cfg.group == "unpackerr") { + unpackerr = { }; + }; + }; + + meta.maintainers = with lib.maintainers; [ Wekuz ]; +} diff --git a/nixos/modules/services/monitoring/nezha.nix b/nixos/modules/services/monitoring/nezha.nix new file mode 100644 index 000000000000..b4ed76b031e7 --- /dev/null +++ b/nixos/modules/services/monitoring/nezha.nix @@ -0,0 +1,179 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.nezha; + + # nezha uses yaml as the configuration file format. + # Since we need to use jq to update the content, so here we generate json + settingsFormat = pkgs.formats.json { }; + configFile = settingsFormat.generate "config.json" cfg.settings; +in +{ + meta.maintainers = with lib.maintainers; [ moraxyc ]; + options = { + services.nezha = { + enable = lib.mkEnableOption "Nezha Monitoring"; + + package = lib.mkPackageOption pkgs "nezha" { }; + + debug = lib.mkEnableOption "verbose log"; + + settings = lib.mkOption { + description = '' + Generate to {file}`config.yaml` as a Nix attribute set. + Check the [guide](https://nezha.wiki/en_US/guide/dashboard.html) + for possible options. + ''; + type = lib.types.submodule { + freeformType = settingsFormat.type; + + options = { + listenhost = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = '' + Host on which the nezha web interface and grpc should listen. + ''; + }; + listenport = lib.mkOption { + type = lib.types.port; + default = 8008; + description = '' + Port on which the nezha web interface and grpc should listen. + ''; + }; + + }; + }; + }; + + mutableConfig = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether the config.yaml is writable by Nezha. + + If this option is disabled, changes on the web interface won't + be possible. If an config.yaml is present, it will be overwritten. + ''; + }; + + jwtSecretFile = lib.mkOption { + type = lib.types.path; + default = null; + description = '' + Path to the file containing the secret to sign web requests using JSON Web Tokens. + ''; + }; + + agentSecretFile = lib.mkOption { + type = lib.types.path; + default = null; + description = '' + Path to the file containing the secret used by agents to connect. + ''; + }; + + extraThemes = lib.mkOption { + type = lib.types.listOf lib.types.package; + default = [ ]; + example = lib.literalExpression "[ pkgs.nezha-theme-nazhua ]"; + description = '' + A list of additional themes. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + services.nezha.settings.debug = cfg.debug; + + systemd.services.nezha = { + serviceConfig = { + Restart = "on-failure"; + StateDirectory = "nezha"; + RuntimeDirectory = "nezha"; + ConfigurationDirectory = "nezha"; + WorkingDirectory = "/var/lib/nezha"; + ReadWritePaths = [ + "/var/lib/nezha" + "/etc/nezha" + ]; + + LoadCredential = [ + "jwt-secret:${cfg.jwtSecretFile}" + "agent-secret:${cfg.agentSecretFile}" + ]; + + # Hardening + ProcSubset = "pid"; + DynamicUser = true; + RemoveIPC = true; + LockPersonality = true; + ProtectClock = true; + MemoryDenyWriteExecute = true; + PrivateUsers = cfg.settings.listenport >= 1024; # incompatible with CAP_NET_BIND_SERVICE + ProtectHostname = true; + RestrictSUIDSGID = true; + CapabilityBoundingSet = lib.optionalString (cfg.settings.listenport < 1024) "CAP_NET_BIND_SERVICE"; + AmbientCapabilities = lib.optionalString (cfg.settings.listenport < 1024) "CAP_NET_BIND_SERVICE"; + NoNewPrivileges = true; + PrivateTmp = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + UMask = "0066"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ] + ++ lib.optional (cfg.settings ? tsdb) "mincore"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + PrivateDevices = "yes"; + + ExecStart = + let + package = cfg.package.override { withThemes = cfg.extraThemes; }; + in + ''${lib.getExe package} -c "''${CONFIGURATION_DIRECTORY}"/config.yaml -db "''${STATE_DIRECTORY}"/sqlite.db''; + }; + enableStrictShellChecks = true; + startLimitIntervalSec = 10; + startLimitBurst = 3; + preStart = '' + cp "${configFile}" "''${RUNTIME_DIRECTORY}"/new + ${lib.getExe pkgs.jq} \ + --arg jwt_secret "$(<"''${CREDENTIALS_DIRECTORY}"/jwt-secret)" \ + --arg agent_secret "$(<"''${CREDENTIALS_DIRECTORY}"/agent-secret)" \ + '. + { jwtsecretkey: $jwt_secret, agentsecretkey: $agent_secret }' \ + < "''${RUNTIME_DIRECTORY}"/new > "''${RUNTIME_DIRECTORY}"/tmp + mv "''${RUNTIME_DIRECTORY}"/tmp "''${RUNTIME_DIRECTORY}"/new + + ${lib.optionalString cfg.mutableConfig '' + [ -e "''${CONFIGURATION_DIRECTORY}"/config.yaml ] && \ + ${lib.getExe pkgs.yj} < "''${CONFIGURATION_DIRECTORY}"/config.yaml > "''${RUNTIME_DIRECTORY}"/old && \ + ${lib.getExe pkgs.jq} -s '.[0] * .[1]' \ + "''${RUNTIME_DIRECTORY}"/old "''${RUNTIME_DIRECTORY}"/new > "''${RUNTIME_DIRECTORY}"/tmp + [ -e "''${RUNTIME_DIRECTORY}"/old ] && rm "''${RUNTIME_DIRECTORY}"/old + [ -e "''${RUNTIME_DIRECTORY}"/tmp ] && mv "''${RUNTIME_DIRECTORY}"/tmp "''${RUNTIME_DIRECTORY}"/new + ''} + mv "''${RUNTIME_DIRECTORY}"/new "''${CONFIGURATION_DIRECTORY}"/config.yaml + ''; + wantedBy = [ "multi-user.target" ]; + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters.nix b/nixos/modules/services/monitoring/prometheus/exporters.nix index a625111fc2f0..b1d7f62b582e 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -86,6 +86,7 @@ let "lnd" "mail" "mailman3" + "mail-tlsa-check" "mikrotik" "modemmanager" "mongodb" @@ -114,7 +115,6 @@ let "restic" "rtl_433" "sabnzbd" - "scaphandre" "script" "shelly" "smartctl" @@ -521,26 +521,6 @@ in 'services.prometheus.exporters.sql.configFile' ''; } - { - assertion = cfg.scaphandre.enable -> (pkgs.stdenv.targetPlatform.isx86_64 == true); - message = '' - Scaphandre only support x86_64 architectures. - ''; - } - { - assertion = - cfg.scaphandre.enable - -> ((lib.kernel.whenHelpers pkgs.linux.version).whenOlder "5.11" true).condition == false; - message = '' - Scaphandre requires a kernel version newer than '5.11', '${pkgs.linux.version}' given. - ''; - } - { - assertion = cfg.scaphandre.enable -> (builtins.elem "intel_rapl_common" config.boot.kernelModules); - message = '' - Scaphandre needs 'intel_rapl_common' kernel module to be enabled. Please add it in 'boot.kernelModules'. - ''; - } { assertion = cfg.idrac.enable -> ((cfg.idrac.configurationPath == null) != (cfg.idrac.configuration == null)); diff --git a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix index 3390374172c4..935ebff7e5bd 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/bind.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/bind.nix @@ -17,7 +17,7 @@ in type = types.str; default = "http://localhost:8053/"; description = '' - HTTP XML API address of an Bind server. + HTTP API address of a BIND server. ''; }; bindTimeout = mkOption { @@ -29,13 +29,14 @@ in }; bindVersion = mkOption { type = types.enum [ - "xml.v2" + "json" + "xml" "xml.v3" "auto" ]; - default = "auto"; + default = "json"; description = '' - BIND statistics version. Can be detected automatically. + BIND statistics version. Defaults to JSON. ''; }; bindGroups = mkOption { diff --git a/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix b/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix index c5d97dc12238..eaec8041d294 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/imap-mailstat.nix @@ -94,8 +94,8 @@ in serviceConfig = { ExecStart = '' ${pkgs.prometheus-imap-mailstat-exporter}/bin/imap-mailstat-exporter \ - -config ${createConfigFile cfg.accounts} \ - ${optionalString cfg.oldestUnseenDate "-oldestunseendate"} \ + --config.file="${createConfigFile cfg.accounts}" \ + ${optionalString cfg.oldestUnseenDate "--oldestunseen.feature"} \ ${concatStringsSep " \\\n " cfg.extraFlags} ''; }; diff --git a/nixos/modules/services/monitoring/prometheus/exporters/mail-tlsa-check.nix b/nixos/modules/services/monitoring/prometheus/exporters/mail-tlsa-check.nix new file mode 100644 index 000000000000..aa66a45daee2 --- /dev/null +++ b/nixos/modules/services/monitoring/prometheus/exporters/mail-tlsa-check.nix @@ -0,0 +1,164 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.prometheus.exporters.mail-tlsa-check; + + inherit (lib) + boolToString + collect + concatStringsSep + getExe + isBool + isList + isString + listToAttrs + mapAttrsRecursive + mkForce + mkOption + mkPackageOption + optionalAttrs + pipe + toUpper + types + ; + + environment = pipe cfg.settings [ + (mapAttrsRecursive ( + path: value: + optionalAttrs (value != null) { + name = toUpper "MTCE_${concatStringsSep "_" path}"; + value = + if isList value then + concatStringsSep "," value + else if isBool value then + boolToString value + else + toString value; + } + )) + (collect (x: isString x.name or false && isString x.value or false)) + listToAttrs + ]; +in +{ + port = 19309; + extraOpts = { + package = mkPackageOption pkgs "mail-tlsa-check-exporter" { }; + settings = mkOption { + description = "Settings for the mail-tlsa-check-exporter"; + type = types.submodule { + freeformType = types.attrs; + + options = { + tlsa.record = mkOption { + description = "The TLSA record to monitor"; + type = types.str; + example = "_25._tcp.smtp.example.org"; + }; + check.timeout = mkOption { + description = "Timeout for validation checks to complete before giving up, in milliseconds (e.g. 15000 for 15 seconds)"; + type = types.ints.positive; + default = 15000; + example = 10000; + }; + ipv4.enabled = mkOption { + description = "Whether to enable monitoring over IPv4"; + type = types.bool; + default = true; + example = false; + }; + ipv6.enabled = mkOption { + description = "Whether to enable monitoring over IPv6"; + type = types.bool; + default = true; + example = false; + }; + server.port = mkOption { + description = '' + The port that the exporter listens on. + + ::: {.note} + This is a read-only option that is read from {option}`services.prometheus.exporters.mail-tlsa-check.port`. + ::: + ''; + type = types.port; + default = cfg.port; + defaultText = lib.literalExpression "config.services.prometheus.exporters.mail-tlsa-check.port"; + readOnly = true; + }; + smtp = { + hostname = mkOption { + description = "The SMTP hostname to monitor"; + type = types.nullOr types.str; + default = null; + example = "smtp.example.org"; + }; + port = mkOption { + description = '' + The SMTP port to monitor + + ::: {.note} + The exporter currently only supports explicit TLS (StartTLS), see + ::: + ''; + type = types.port; + default = 587; + example = 465; + }; + client = mkOption { + description = "The host to send in the SMTP EHLO command (name/domain/IP address)"; + type = types.str; + default = "tlsa-smtp-synthetics-probe"; + example = "tlsa-exporter"; + }; + }; + imap = { + hostname = mkOption { + description = "The IMAP hostname to monitor"; + type = types.nullOr types.str; + default = null; + example = "imap.example.org"; + }; + port = mkOption { + description = '' + The IMAP port to monitor + + ::: {.note} + The exporter currently only supports explicit TLS (StartTLS), see + ::: + ''; + type = types.port; + default = 143; + }; + }; + }; + }; + }; + }; + + assertions = [ + { + assertion = cfg.settings.ipv4.enabled || cfg.ipv6.enabled; + message = "Both IPv4 and IPv6 are disabled, this is not possible as it won't monitor anything"; + } + { + assertion = cfg.settings.smtp.hostname != null || cfg.settings.imap.hostname != null; + message = "Both SMTP and IMAP are disabled, this is not possible as it won't monitor anything"; + } + ]; + + serviceOpts = { + inherit environment; + + serviceConfig = { + ExecStart = getExe cfg.package; + MemoryDenyWriteExecute = mkForce false; # because v8 won't start otherwise + Restart = "always"; # because apparently, this service crashes and is intended to do so, see the upstream systemd unit + }; + }; +} diff --git a/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix b/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix deleted file mode 100644 index a3dadccfda19..000000000000 --- a/nixos/modules/services/monitoring/prometheus/exporters/scaphandre.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - pkgs, - options, - ... -}: - -let - logPrefix = "services.prometheus.exporter.scaphandre"; - cfg = config.services.prometheus.exporters.scaphandre; -in -{ - port = 8080; - extraOpts = { - telemetryPath = lib.mkOption { - type = lib.types.str; - default = "/metrics"; - description = '' - Path under which to expose metrics. - ''; - }; - }; - - serviceOpts = { - serviceConfig = { - ExecStart = '' - ${pkgs.scaphandre}/bin/scaphandre prometheus \ - --address ${cfg.listenAddress} \ - --port ${toString cfg.port} \ - --suffix ${cfg.telemetryPath} \ - ${lib.concatStringsSep " \\\n " cfg.extraFlags} - ''; - }; - }; -} diff --git a/nixos/modules/services/monitoring/traccar.nix b/nixos/modules/services/monitoring/traccar.nix index e1e73dc93e02..12622da99eb8 100644 --- a/nixos/modules/services/monitoring/traccar.nix +++ b/nixos/modules/services/monitoring/traccar.nix @@ -102,7 +102,7 @@ in ${lib.getExe pkgs.envsubst} \ -i ${configuration} \ -o ${configFilePath} - umask $old_umask + umask "$old_umask" ''; serviceConfig = { diff --git a/nixos/modules/services/monitoring/vnstat.nix b/nixos/modules/services/monitoring/vnstat.nix index 062d181b059a..4aaa89668c19 100644 --- a/nixos/modules/services/monitoring/vnstat.nix +++ b/nixos/modules/services/monitoring/vnstat.nix @@ -6,17 +6,32 @@ }: let cfg = config.services.vnstat; + settingsFormat = pkgs.formats.keyValue { }; in { options.services.vnstat = { enable = lib.mkEnableOption "update of network usage statistics via vnstatd"; package = lib.mkPackageOption pkgs "vnstat" { }; + settings = lib.mkOption { + type = lib.types.submodule { freeformType = settingsFormat.type; }; + default = { }; + description = '' + Configuration for vnstat. Refer to + [https://humdi.net/vnstat/man/vnstat.conf.html] + or {manpage}`vnstat.conf(5)` for more information. + ''; + example = { + AlwaysAddNewInterfaces = 1; + }; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; + environment.etc."vnstat.conf".source = settingsFormat.generate "vnstat.conf" cfg.settings; + users = { groups.vnstatd = { }; @@ -59,4 +74,8 @@ in }; }; }; + + meta = { + maintainers = with lib.maintainers; [ hmenke ]; + }; } diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix index c5d7e365fe67..328b33ee7d70 100644 --- a/nixos/modules/services/network-filesystems/ceph.nix +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -481,6 +481,15 @@ in "/run/ceph".d = defaultConfig // { mode = "0770"; }; + # Ceph daemons log to files under `/var/log/ceph` by default + # (`log_to_file = true`, `log_file = /var/log/ceph/$cluster-$name.log`). + # The daemons run as the unprivileged `ceph` user under + # `ProtectSystem=full` and cannot create this directory themselves, and + # Ceph silently discards its logs if the directory is missing; it does + # not even warn; the `::open()` failure in `Log::reopen_log_file()` is + # ignored, see https://github.com/ceph/ceph/blob/v20.2.1/src/log/Log.cc#L165-L174. + # Create the directory so logging works out of the box. + "/var/log/ceph".d = defaultConfig; "/var/lib/ceph".d = defaultConfig; "/var/lib/ceph/mgr".d = lib.mkIf (cfg.mgr.enable) defaultConfig; "/var/lib/ceph/mon".d = lib.mkIf (cfg.mon.enable) defaultConfig; diff --git a/nixos/modules/services/network-filesystems/glusterfs.nix b/nixos/modules/services/network-filesystems/glusterfs.nix index db00cdc11abb..c218d5505566 100644 --- a/nixos/modules/services/network-filesystems/glusterfs.nix +++ b/nixos/modules/services/network-filesystems/glusterfs.nix @@ -180,7 +180,9 @@ in # Excludes one hook due to missing SELinux binaries. + '' mkdir -p /var/lib/glusterd/hooks/ - ${rsync}/bin/rsync -a --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ + # --copy-unsafe-links: the glusterfind hook is a symlink into the package's + # libexec that would dangle once copied verbatim into / (#257863). + ${rsync}/bin/rsync -a --copy-unsafe-links --exclude="S10selinux-label-brick.sh" ${glusterfs}/var/lib/glusterd/hooks/ /var/lib/glusterd/hooks/ ${tlsCmd} '' @@ -189,6 +191,12 @@ in + '' mkdir -p /var/lib/glusterd/glusterfind/.keys mkdir -p /var/lib/glusterd/hooks/1/delete/post/ + '' + # Volume option presets, installed by upstream under $out/var; copy them so + # `gluster volume set group ` works (#33159). + + '' + mkdir -p /var/lib/glusterd/groups/ + ${rsync}/bin/rsync -a ${glusterfs}/var/lib/glusterd/groups/ /var/lib/glusterd/groups/ ''; serviceConfig = { diff --git a/nixos/modules/services/network-filesystems/kubo.nix b/nixos/modules/services/network-filesystems/kubo.nix index 3c75423f3ffa..9c08028a0842 100644 --- a/nixos/modules/services/network-filesystems/kubo.nix +++ b/nixos/modules/services/network-filesystems/kubo.nix @@ -332,8 +332,9 @@ in boot.kernel.sysctl."net.core.rmem_max" = lib.mkDefault 7500000; boot.kernel.sysctl."net.core.wmem_max" = lib.mkDefault 7500000; - programs.fuse = lib.mkIf (cfg.autoMount && cfg.settings.Mounts.FuseAllowOther) { - userAllowOther = true; + programs.fuse = { + enable = lib.mkIf cfg.autoMount true; + userAllowOther = lib.mkIf cfg.settings.Mounts.FuseAllowOther true; }; users.users = lib.mkIf (cfg.user == "ipfs") { diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 9d3c3f9e4188..38986dcd85f8 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -6,6 +6,14 @@ }: let + attrsToExports = lib.concatMapAttrsStringSep "\n" ( + exportPoint: clientsAndOptions: + exportPoint + + lib.concatMapAttrsStringSep "" ( + client: options: " ${client}(${lib.concatStringsSep "," options})" + ) clientsAndOptions + ); + cfg = config.services.nfs.server; exports = pkgs.writeText "exports" cfg.exports; @@ -48,12 +56,26 @@ in }; exports = lib.mkOption { - type = lib.types.lines; + type = with lib.types; coercedTo (attrsOf (attrsOf (listOf str))) attrsToExports lines; default = ""; description = '' Contents of the /etc/exports file. See {manpage}`exports(5)` for the format. ''; + example = { + "/usr" = { + "*.local.domain" = [ "ro" ]; + "@trusted" = [ "rw" ]; + }; + "/home/joe" = { + "pc001" = [ + "rw" + "all_squash" + "anonuid=150" + "anongid=100" + ]; + }; + }; }; hostName = lib.mkOption { diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index c3d81cb15302..8bae90b6cfda 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -132,7 +132,7 @@ in description = "socket for fast remote file copy program daemon"; conflicts = [ "rsync.service" ]; - listenStreams = [ (toString cfg.port) ]; + listenStreams = [ cfg.port ]; socketConfig.Accept = true; wantedBy = [ "sockets.target" ]; diff --git a/nixos/modules/services/networking/adguardhome.nix b/nixos/modules/services/networking/adguardhome.nix index 1df503146b54..caab4ba0c953 100644 --- a/nixos/modules/services/networking/adguardhome.nix +++ b/nixos/modules/services/networking/adguardhome.nix @@ -176,22 +176,32 @@ in StartLimitBurst = 10; }; - preStart = lib.optionalString (settings != null) '' - if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ] \ - && [ "${toString cfg.mutableSettings}" = "1" ]; then - # First run a schema_version update on the existing configuration - # This ensures that both the new config and the existing one have the same schema_version - # Note: --check-config has the side effect of modifying the file at rest! - ${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config + preStart = + let + installFresh = '' + cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml" + chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" + ''; + in + lib.optionalString (settings != null) ( + if cfg.mutableSettings then + '' + if [ -e "$STATE_DIRECTORY/AdGuardHome.yaml" ]; then + # First run a schema_version update on the existing configuration + # This ensures that both the new config and the existing one have the same schema_version + # Note: --check-config has the side effect of modifying the file at rest! + ${lib.getExe cfg.package} -c "$STATE_DIRECTORY/AdGuardHome.yaml" --check-config - # Writing directly to AdGuardHome.yaml results in empty file - ${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" - mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml" - else - cp --force "${configFile}" "$STATE_DIRECTORY/AdGuardHome.yaml" - chmod 600 "$STATE_DIRECTORY/AdGuardHome.yaml" - fi - ''; + # Writing directly to AdGuardHome.yaml results in empty file + ${lib.getExe pkgs.yaml-merge} "$STATE_DIRECTORY/AdGuardHome.yaml" "${configFile}" > "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" + mv "$STATE_DIRECTORY/AdGuardHome.yaml.tmp" "$STATE_DIRECTORY/AdGuardHome.yaml" + else + ${installFresh} + fi + '' + else + installFresh + ); serviceConfig = { DynamicUser = true; diff --git a/nixos/modules/services/networking/anubis.nix b/nixos/modules/services/networking/anubis.nix index 5c207a27ec25..08f8e8bc87d9 100644 --- a/nixos/modules/services/networking/anubis.nix +++ b/nixos/modules/services/networking/anubis.nix @@ -374,6 +374,10 @@ in anubis = { }; }; + systemd.slices.system-anubis = { + description = "Anubis AI Firewall System Slice"; + documentation = [ "https://anubis.techaro.lol" ]; + }; systemd.services = lib.mapAttrs' ( name: instance: lib.nameValuePair "${instanceName name}" { @@ -396,6 +400,7 @@ in ); serviceConfig = { + Slice = "system-anubis.slice"; User = instance.user; Group = instance.group; DynamicUser = true; diff --git a/nixos/modules/services/networking/avahi-daemon.nix b/nixos/modules/services/networking/avahi-daemon.nix index 6ff86daf6a9e..2e61b39835a2 100644 --- a/nixos/modules/services/networking/avahi-daemon.nix +++ b/nixos/modules/services/networking/avahi-daemon.nix @@ -262,6 +262,28 @@ in ''; }; + nssmdnsFull = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to enable the full mDNS NSS (Name Service Switch) plug-in. + + By default, only the minimal module is enabled. The minimal module + will only resolve `.local` domains and only perform reverse hostname + lookups for `169.254.0.0/16`. The full module will use mDNS to resolve any + domain allowed by [`/etc/mdns.allow`][1] and will perform reverse hostname + lookups for any IP address. + + [1]: https://github.com/avahi/nss-mdns/tree/master#etcmdnsallow + + ::: {.note} + Enabling this option will introduce a 5 second delay to failed reverse + hostname lookups. For example, this will often add a 5 second delay to + ping. + ::: + ''; + }; + cacheEntriesMax = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; @@ -287,6 +309,15 @@ in (lib.mkIf cfg.wideArea "Enabling `services.avahi.wideArea` exposes this system to `CVE-2024-52615`.") ]; + assertions = [ + { + assertion = cfg.nssmdnsFull -> (cfg.nssmdns4 || cfg.nssmdns6); + message = '' + `services.avahi.nssmdnsFull` requires one or both of `services.avahi.nssmdns4` and/or `services.avahi.nssmdns6` to be enabled. + ''; + } + ]; + users.users.avahi = { description = "avahi-daemon privilege separation user"; home = "/var/empty"; @@ -312,7 +343,7 @@ in lib.optionals (cfg.nssmdns4 || cfg.nssmdns6) ( lib.mkMerge [ (lib.mkBefore [ "${mdns}_minimal [NOTFOUND=return]" ]) # before resolve - (lib.mkAfter [ "${mdns}" ]) # after dns + (lib.mkAfter (lib.optional cfg.nssmdnsFull "${mdns}")) # after dns ] ); diff --git a/nixos/modules/services/networking/cloudflared.nix b/nixos/modules/services/networking/cloudflared.nix index 37889c7308da..26662e563356 100644 --- a/nixos/modules/services/networking/cloudflared.nix +++ b/nixos/modules/services/networking/cloudflared.nix @@ -240,6 +240,25 @@ in example = "auto"; }; + protocol = lib.mkOption { + type = lib.types.enum [ + "auto" + "http2" + "quic" + ]; + default = "auto"; + description = '' + Specifies the protocol used to establish a connection between `cloudflared` and the Cloudflare global network. + + The value `auto` lets `cloudflared` choose the protocol (currently QUIC, falling back to HTTP/2). + Set to `http2` to work around QUIC/UDP connectivity issues, such as restrictive firewalls, broken UDP path MTU, or QUIC interop bugs. + Set to `quic` to force QUIC. + + See [Tunnel run parameters](https://developers.cloudflare.com/cloudflare-one/connections/connect-networks/configure-tunnels/cloudflared-parameters/run-parameters/#protocol). + ''; + example = "http2"; + }; + default = lib.mkOption { type = lib.types.str; description = '' @@ -397,6 +416,7 @@ in environment = { TUNNEL_ORIGIN_CERT = lib.mkIf (certFile != null) "%d/cert.pem"; TUNNEL_EDGE_IP_VERSION = tunnel.edgeIPVersion; + TUNNEL_TRANSPORT_PROTOCOL = tunnel.protocol; }; } ) config.services.cloudflared.tunnels; diff --git a/nixos/modules/services/networking/epmd.nix b/nixos/modules/services/networking/epmd.nix index 08e9400702da..0d92a4586fe4 100644 --- a/nixos/modules/services/networking/epmd.nix +++ b/nixos/modules/services/networking/epmd.nix @@ -21,7 +21,7 @@ in Erlang computations. ''; }; - package = lib.mkPackageOption pkgs "erlang" { }; + package = lib.mkPackageOption pkgs [ "beamPackages" "erlang" ] { }; listenStream = lib.mkOption { type = oneOf [ str diff --git a/nixos/modules/services/networking/frp.nix b/nixos/modules/services/networking/frp.nix index f43a102d741d..fa636bbe06fc 100644 --- a/nixos/modules/services/networking/frp.nix +++ b/nixos/modules/services/networking/frp.nix @@ -76,6 +76,26 @@ in ]; }; }; + + extraConfig = lib.mkOption { + type = lib.types.lines; + default = ""; + description = '' + Extra frp TOML configuration included at the end of the generated configuration file. + Especially useful for [port range mapping]. + + [port range mapping]: https://github.com/fatedier/frp#port-range-mapping + ''; + example = '' + {{- range $_, $v := parseNumberRangePair "6000-6006,6007" "6000-6006,6007" }} + [[proxies]] + name = "tcp-{{ $v.First }}" + type = "tcp" + localPort = {{ $v.First }} + remotePort = {{ $v.Second }} + {{- end }} + ''; + }; }; } ); @@ -94,7 +114,18 @@ in instance: options: let serviceName = "frp" + lib.optionalString (instance != "") ("-" + instance); - configFile = settingsFormat.generate "${serviceName}.toml" options.settings; + baseConfigFile = settingsFormat.generate "${serviceName}-base.toml" options.settings; + configFile = + if options.extraConfig == "" then + baseConfigFile + else + pkgs.writeText "${serviceName}.toml" '' + # Nixos Module settings + ${builtins.readFile baseConfigFile} + + # Nixos Module extraConfig + ${options.extraConfig} + ''; isClient = (options.role == "client"); isServer = (options.role == "server"); serviceCapability = lib.optionals isServer [ "CAP_NET_BIND_SERVICE" ]; @@ -144,5 +175,8 @@ in ) enabledInstances; }; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; } diff --git a/nixos/modules/services/networking/ghostunnel.nix b/nixos/modules/services/networking/ghostunnel.nix index 72d1494632ea..815118ac3d38 100644 --- a/nixos/modules/services/networking/ghostunnel.nix +++ b/nixos/modules/services/networking/ghostunnel.nix @@ -192,7 +192,12 @@ let ++ optional (config.cacert != null) "cacert:${config.cacert}"; }; script = concatStringsSep " " ( - [ "${mainCfg.package}/bin/ghostunnel" ] + [ + "${mainCfg.package}/bin/ghostunnel" + # ghostunnel's landlock rules don't like reading the CA certs from /etc + # because they are links to /nix/store, which isn't part of its rules + "--disable-landlock" + ] ++ optional (config.keystore != null) "--keystore=$CREDENTIALS_DIRECTORY/keystore" ++ optional (config.cert != null) "--cert=$CREDENTIALS_DIRECTORY/cert" ++ optional (config.key != null) "--key=$CREDENTIALS_DIRECTORY/key" diff --git a/nixos/modules/services/networking/gokapi.nix b/nixos/modules/services/networking/gokapi.nix index d90588b55ba0..9ff12df5c036 100644 --- a/nixos/modules/services/networking/gokapi.nix +++ b/nixos/modules/services/networking/gokapi.nix @@ -82,7 +82,7 @@ in config = lib.mkIf cfg.enable { systemd.services.gokapi = { - wantedBy = [ "default.target" ]; + wantedBy = [ "multi-user.target" ]; wants = [ "network-online.target" ]; after = [ "network-online.target" ]; environment = lib.mapAttrs (_: value: toString value) cfg.environment; diff --git a/nixos/modules/services/networking/headplane.nix b/nixos/modules/services/networking/headplane.nix index 19e131fcab8d..7285accb5962 100644 --- a/nixos/modules/services/networking/headplane.nix +++ b/nixos/modules/services/networking/headplane.nix @@ -44,7 +44,7 @@ in settings = mkOption { description = '' Headplane configuration options. Generates a YAML config file. - See: https://github.com/tale/headplane/blob/main/config.example.yaml + See . ''; type = types.submodule { options = { @@ -129,6 +129,16 @@ in headscale = mkOption { type = types.submodule { options = { + api_key_path = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Path to a file containing a Headscale API key. + This is required for OIDC authentication aswell for the Headplane agent. + ''; + example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path"; + }; + url = mkOption { type = types.str; default = "http://127.0.0.1:${toString config.services.headscale.port}"; @@ -211,15 +221,6 @@ in ''; }; - pre_authkey_path = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a file containing a Headscale pre-auth key for the agent. - ''; - example = lib.literalExpression "config.sops.secrets.headplane_pre_authkey.path"; - }; - executable_path = mkOption { type = types.path; readOnly = true; @@ -237,20 +238,14 @@ in }; cache_ttl = mkOption { - type = types.nullOr types.int; - default = null; + type = types.ints.positive; + default = 180000; description = '' - Deprecated cache TTL for the agent. This option is accepted - by Headplane 0.6.2 but has no effect. + How long to cache agent information (in milliseconds). + If you want data to update faster, reduce the TTL, but this will increase the frequency of requests to Headscale. ''; }; - cache_path = mkOption { - type = types.path; - default = "/var/lib/headplane/agent_cache.json"; - description = "The path to store the agent's cache."; - }; - work_dir = mkOption { type = types.path; default = "/var/lib/headplane/agent"; @@ -325,16 +320,6 @@ in example = lib.literalExpression "config.sops.secrets.oidc_client_secret.path"; }; - headscale_api_key_path = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Path to a file containing the Headscale API key. - Required for OIDC authentication. - ''; - example = lib.literalExpression "config.sops.secrets.headscale_api_key.path"; - }; - disable_api_key_login = mkOption { type = types.bool; default = false; @@ -366,25 +351,6 @@ in ''; }; - redirect_uri = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Deprecated OIDC redirect URI. Use services.headplane.settings.server.base_url - instead; Headplane derives the callback URL from it. - ''; - example = "https://headplane.example.com/admin/oidc/callback"; - }; - - strict_validation = mkOption { - type = types.nullOr types.bool; - default = null; - description = '' - Deprecated OIDC validation setting. This option is accepted - by Headplane 0.6.2 but has no effect. - ''; - }; - profile_picture_source = mkOption { type = types.enum [ "oidc" @@ -429,16 +395,6 @@ in description = "Custom userinfo endpoint URL."; example = "https://provider.example.com/userinfo"; }; - - user_storage_file = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Deprecated path to the pre-0.6.2 JSON user database. - Headplane uses this once to migrate users into its internal database. - ''; - example = "/var/lib/headplane/users.json"; - }; }; } ); @@ -452,33 +408,6 @@ in }; config = mkIf cfg.enable { - warnings = - lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.redirect_uri != null) [ - '' - services.headplane.settings.oidc.redirect_uri is deprecated by Headplane 0.6.2. - Use services.headplane.settings.server.base_url instead; Headplane derives - the OIDC callback URL from it. - '' - ] - ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.strict_validation != null) [ - '' - services.headplane.settings.oidc.strict_validation is deprecated and has no effect - in Headplane 0.6.2. - '' - ] - ++ lib.optionals (cfg.settings.oidc != null && cfg.settings.oidc.user_storage_file != null) [ - '' - services.headplane.settings.oidc.user_storage_file is deprecated. Headplane 0.6.2 - uses it only to migrate the pre-0.6.2 JSON user database into the internal database. - '' - ] - ++ lib.optionals (agentSettings != null && agentSettings.cache_ttl != null) [ - '' - services.headplane.settings.integration.agent.cache_ttl is deprecated and has no - effect in Headplane 0.6.2. - '' - ]; - assertions = [ { assertion = config.services.headscale.enable; @@ -502,26 +431,25 @@ in ''; } { - assertion = cfg.settings.oidc == null || cfg.settings.oidc.headscale_api_key_path != null; + assertion = cfg.settings.oidc == null || cfg.settings.headscale.api_key_path != null; message = '' - services.headplane.settings.oidc.headscale_api_key_path must be set - when services.headplane.settings.oidc is non-null. Headplane's OIDC - flow requires a Headscale API key to mint sessions. + services.headplane.settings.headscale.api_key_path must be set + when services.headplane.settings.oidc is non-null. + Headplane's OIDC flow requires a Headscale API key to mint sessions. ''; } { assertion = - agentSettings == null || !agentSettings.enabled || agentSettings.pre_authkey_path != null; + agentSettings == null || !agentSettings.enabled || cfg.settings.headscale.api_key_path != null; message = '' - services.headplane.settings.integration.agent.pre_authkey_path must be set - when the agent is enabled. + services.headplane.settings.headscale.api_key_path must be set when the agent is enabled. ''; } ]; environment = { systemPackages = [ cfg.package ]; - etc."headplane/config.yaml".source = "${settingsFile}"; + etc."headplane/config.yaml".source = settingsFile; }; systemd.services.headplane = { @@ -534,6 +462,7 @@ in config.systemd.services.headscale.name ]; requires = [ config.systemd.services.headscale.name ]; + restartTriggers = [ settingsFile ]; environment = { HEADPLANE_DEBUG_LOG = toString cfg.debug; diff --git a/nixos/modules/services/networking/headscale.nix b/nixos/modules/services/networking/headscale.nix index b4873b854dd1..be868cfff8a6 100644 --- a/nixos/modules/services/networking/headscale.nix +++ b/nixos/modules/services/networking/headscale.nix @@ -36,8 +36,10 @@ in configFile = lib.mkOption { type = lib.types.path; readOnly = true; - default = settingsFormat.generate "headscale.yaml" cfg.settings; - defaultText = lib.literalExpression ''(pkgs.formats.yaml { }).generate "headscale.yaml" config.services.headscale.settings''; + default = settingsFormat.generate "headscale.yaml" ( + lib.filterAttrsRecursive (n: v: v != null) cfg.settings + ); + defaultText = lib.literalExpression ''(pkgs.formats.yaml { }).generate "headscale.yaml" (lib.filterAttrsRecursive (n: v: v != null) config.services.headscale.settings)''; description = '' Path to the configuration file of headscale. ''; @@ -398,6 +400,16 @@ in ''; }; + extra_records_path = lib.mkOption { + type = lib.types.nullOr lib.types.str; + default = null; + description = '' + Path to a JSON file containing extra DNS records. + This is mutually exclusive with {option}`extra_records`. + ''; + example = "/run/headscale/records.json"; + }; + search_domains = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ ]; @@ -657,6 +669,10 @@ in assertion = with cfg.settings; dns.override_local_dns -> dns.nameservers.global != [ ]; message = "dns.nameservers.global must be set when overriding local DNS"; } + { + assertion = with cfg.settings; dns.extra_records_path == null || dns.extra_records == null; + message = "dns.extra_records and dns.extra_records_path are mutually exclusive"; + } (assertRemovedOption [ "settings" "acl_policy_path" ] "Use `policy.path` instead.") (assertRemovedOption [ "settings" "db_host" ] "Use `database.postgres.host` instead.") (assertRemovedOption [ "settings" "db_name" ] "Use `database.postgres.name` instead.") diff --git a/nixos/modules/services/networking/kea.nix b/nixos/modules/services/networking/kea.nix index 99d938c14036..6612de82ffec 100644 --- a/nixos/modules/services/networking/kea.nix +++ b/nixos/modules/services/networking/kea.nix @@ -12,12 +12,6 @@ let chooseNotNull = x: y: if x != null then x else y; - ctrlAgentConfig = chooseNotNull cfg.ctrl-agent.configFile ( - format.generate "kea-ctrl-agent.conf" { - Control-agent = cfg.ctrl-agent.settings; - } - ); - dhcp4Config = chooseNotNull cfg.dhcp4.configFile ( format.generate "kea-dhcp4.conf" { Dhcp4 = cfg.dhcp4.settings; @@ -37,48 +31,15 @@ let ); in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "kea" "ctrl-agent" ] '' + https://kb.isc.org/docs/things-to-be-aware-of-when-upgrading-to-kea-3-2#the-kea-control-agent-ca + '') + ]; + options.services.kea = with lib.types; { package = lib.mkPackageOption pkgs "kea" { }; - ctrl-agent = lib.mkOption { - description = '' - Kea Control Agent configuration - ''; - default = { }; - type = submodule { - options = { - enable = lib.mkEnableOption "Kea Control Agent"; - - extraArgs = lib.mkOption { - type = listOf str; - default = [ ]; - description = '' - List of additional arguments to pass to the daemon. - ''; - }; - - configFile = lib.mkOption { - type = nullOr path; - default = null; - description = '' - Kea Control Agent configuration as a path, see . - - Takes preference over [settings](#opt-services.kea.ctrl-agent.settings). - Most users should prefer using [settings](#opt-services.kea.ctrl-agent.settings) instead. - ''; - }; - - settings = lib.mkOption { - type = format.type; - default = null; - description = '' - Kea Control Agent configuration as an attribute set, see . - ''; - }; - }; - }; - }; - dhcp4 = lib.mkOption { description = '' DHCP4 Server configuration @@ -290,7 +251,7 @@ in UMask = "0077"; }; in - lib.mkIf (cfg.ctrl-agent.enable || cfg.dhcp4.enable || cfg.dhcp6.enable || cfg.dhcp-ddns.enable) ( + lib.mkIf (cfg.dhcp4.enable || cfg.dhcp6.enable || cfg.dhcp-ddns.enable) ( lib.mkMerge [ { environment.systemPackages = [ cfg.package ]; @@ -302,58 +263,6 @@ in users.groups.kea = { }; } - (lib.mkIf cfg.ctrl-agent.enable { - assertions = [ - { - assertion = lib.xor (cfg.ctrl-agent.settings == null) (cfg.ctrl-agent.configFile == null); - message = "Either services.kea.ctrl-agent.settings or services.kea.ctrl-agent.configFile must be set to a non-null value."; - } - ]; - - environment.etc."kea/ctrl-agent.conf".source = ctrlAgentConfig; - - systemd.services.kea-ctrl-agent = { - description = "Kea Control Agent"; - documentation = [ - "man:kea-ctrl-agent(8)" - "https://kea.readthedocs.io/en/kea-${cfg.package.version}/arm/agent.html" - ]; - - wants = [ - "network-online.target" - ]; - after = [ - "network-online.target" - "time-sync.target" - ]; - wantedBy = [ - "kea-dhcp4-server.service" - "kea-dhcp6-server.service" - "kea-dhcp-ddns-server.service" - ]; - - environment = commonEnvironment; - - restartTriggers = [ - ctrlAgentConfig - ]; - - serviceConfig = { - ExecStart = utils.escapeSystemdExecArgs ( - [ - (lib.getExe' cfg.package "kea-ctrl-agent") - "-c" - "/etc/kea/ctrl-agent.conf" - ] - ++ cfg.ctrl-agent.extraArgs - ); - KillMode = "process"; - Restart = "on-failure"; - } - // commonServiceConfig; - }; - }) - (lib.mkIf cfg.dhcp4.enable { assertions = [ { diff --git a/nixos/modules/services/networking/keepalived/default.nix b/nixos/modules/services/networking/keepalived/default.nix index 61f9d0b5afd9..6c4a44ca6c72 100644 --- a/nixos/modules/services/networking/keepalived/default.nix +++ b/nixos/modules/services/networking/keepalived/default.nix @@ -325,18 +325,28 @@ in assertions = flatten (map vrrpInstanceAssertions vrrpInstances); - networking.firewall = lib.mkIf cfg.openFirewall { - extraCommands = '' - # Allow VRRP and AH packets - ip46tables -A nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ip46tables -A nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ''; + networking.firewall = lib.mkIf cfg.openFirewall ( + if config.networking.nftables.enable then + { + extraInputRules = '' + meta l4proto vrrp counter accept comment "services.keepalived.openFirewall" + meta l4proto ah counter accept comment "services.keepalived.openFirewall" + ''; + } + else + { + extraCommands = '' + # Allow VRRP and AH packets + ip46tables -A nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ip46tables -A nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ''; - extraStopCommands = '' - ip46tables -D nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ip46tables -D nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT - ''; - }; + extraStopCommands = '' + ip46tables -D nixos-fw -p vrrp -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ip46tables -D nixos-fw -p ah -m comment --comment "services.keepalived.openFirewall" -j ACCEPT + ''; + } + ); systemd.timers.keepalived-boot-delay = { description = "Keepalive Daemon delay to avoid instant transition to MASTER state"; diff --git a/nixos/modules/services/networking/llama-swap.nix b/nixos/modules/services/networking/llama-swap.nix index 3739e1b3f5de..b1ca322756db 100644 --- a/nixos/modules/services/networking/llama-swap.nix +++ b/nixos/modules/services/networking/llama-swap.nix @@ -42,6 +42,15 @@ in ''; }; + useLlamaCppCacheDir = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Whether to use {file}`/var/cache/llama-cpp` as {env}`LLAMA_CACHE` instead + of {file}`/var/cache/llama-swap` to share models and other cache with {option}`services.llama-cpp`. + ''; + }; + tls = { enable = lib.mkEnableOption "TLS encryption"; @@ -113,6 +122,10 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + environment = { + LLAMA_CACHE = lib.mkDefault "/var/cache/${config.systemd.services.llama-swap.serviceConfig.CacheDirectory}"; + }; + serviceConfig = { Type = "exec"; ExecStart = "${lib.getExe cfg.package} ${ @@ -130,6 +143,12 @@ in Restart = "on-failure"; RestartSec = 3; + CacheDirectory = + if cfg.useLlamaCppCacheDir then + config.systemd.services.llama-cpp.serviceConfig.CacheDirectory + else + "llama-swap"; + # for GPU acceleration PrivateDevices = false; diff --git a/nixos/modules/services/networking/mjpg-streamer.nix b/nixos/modules/services/networking/mjpg-streamer.nix index 4f0747d8a262..b7f0d93c0d7d 100644 --- a/nixos/modules/services/networking/mjpg-streamer.nix +++ b/nixos/modules/services/networking/mjpg-streamer.nix @@ -20,6 +20,8 @@ in enable = mkEnableOption "mjpg-streamer webcam streamer"; + package = mkPackageOption pkgs "mjpg-streamer" { }; + inputPlugin = mkOption { type = types.str; default = "input_uvc.so"; @@ -77,7 +79,7 @@ in IPLUGIN="${cfg.inputPlugin}" OPLUGIN="${cfg.outputPlugin}" OPLUGIN="''${OPLUGIN//@www@/${pkgs.mjpg-streamer}/share/mjpg-streamer/www}" - exec ${pkgs.mjpg-streamer}/bin/mjpg_streamer -i "$IPLUGIN" -o "$OPLUGIN" + exec ${lib.getExe cfg.package} -i "$IPLUGIN" -o "$OPLUGIN" ''; }; diff --git a/nixos/modules/services/networking/mptcpd.nix b/nixos/modules/services/networking/mptcpd.nix index 04279388d9de..429a3e856a91 100644 --- a/nixos/modules/services/networking/mptcpd.nix +++ b/nixos/modules/services/networking/mptcpd.nix @@ -5,11 +5,9 @@ ... }: let - cfg = config.services.mptcpd; - + settingsFormat = pkgs.formats.ini { }; in - { options = { @@ -20,15 +18,57 @@ in package = lib.mkPackageOption pkgs "mptcpd" { }; + settings = lib.mkOption { + type = settingsFormat.type; + default = { }; + example = lib.literalExpression '' + { + core = { + "addr-flags" = "subflow"; + "notify-flags" = "existing,skip_link_local,skip_loopback,check_route"; + "load-plugins" = "addr_adv,sspi"; + }; + } + ''; + description = '' + mptcpd configuration written to {file}`/etc/mptcpd/mptcpd.conf`. + + See {manpage}`mptcpd(8)` for details about available options and syntax. + ''; + }; + }; }; config = lib.mkIf cfg.enable { + # Disable NetworkManager from configuring the MPTCP endpoints. + # See https://github.com/multipath-tcp/mptcpd/blob/48942b2110805af236ca41164fde67830efd7507/README.md?plain=1#L19-L38 + networking.networkmanager.connectionConfig = { + "connection.mptcp-flags" = 1; + }; + + environment.etc."mptcpd/mptcpd.conf".source = settingsFormat.generate "mptcpd.conf" cfg.settings; + environment.systemPackages = [ cfg.package ]; + services.mptcpd.settings = { + core = { + log = lib.mkDefault "journal"; + "plugin-dir" = "${cfg.package}/lib/mptcpd"; + "path-manager" = lib.mkDefault "addr_adv"; + }; + }; + systemd.packages = [ cfg.package ]; + systemd.services.mptcp = { + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = [ + "" + "${cfg.package}/libexec/mptcpd" + ]; + }; }; diff --git a/nixos/modules/services/networking/netbird.nix b/nixos/modules/services/networking/netbird.nix index d7514f2360d3..c96be69162cf 100644 --- a/nixos/modules/services/networking/netbird.nix +++ b/nixos/modules/services/networking/netbird.nix @@ -340,7 +340,8 @@ in substitute ${cfg.ui.package}/share/applications/netbird.desktop \ "$out/share/applications/${mkBin "netbird"}.desktop" \ --replace-fail 'Name=Netbird' "Name=NetBird @ ${client.service.name}" \ - --replace-fail 'Icon=netbird' "Icon=${cfg.ui.package}/share/pixmaps/netbird.png" + --replace-fail 'Icon=netbird' "Icon=${cfg.ui.package}/share/icons/hicolor/256x256/apps/netbird.png" \ + --replace-fail 'Exec=netbird-ui' "Exec=${mkBin "netbird-ui"}" '') ]; }; diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index eb874447bb3a..e2f766463e38 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -93,6 +93,10 @@ in config = mkIf cfg.enable { + warnings = mkIf (!config.systemd.network.enable) [ + "services.networkd-dispatcher will not execute any scripts unless networkd is enabled, either via `systemd.network.enable` or via `networking.useNetworkd`." + ]; + systemd = { packages = [ pkgs.networkd-dispatcher ]; services.networkd-dispatcher = { diff --git a/nixos/modules/services/networking/nordvpn.md b/nixos/modules/services/networking/nordvpn.md new file mode 100644 index 000000000000..06016098894a --- /dev/null +++ b/nixos/modules/services/networking/nordvpn.md @@ -0,0 +1,65 @@ +# NordVPN {#module-services-nordvpn} + +*Source:* {file}`modules/services/networking/nordvpn.nix` + +*Upstream documentation:* + +NordVPN offers a paid virtual private network (VPN) service. +The service operates as closed-source, +but the Linux client uses open-source code licensed under GPLv3. +A minimal configuration in NixOS appears as follows: + +```nix +{ + services.nordvpn.enable = true; + networking.firewall.enable = true; + networking.firewall.checkReversePath = "loose"; +} +``` + +When using a firewall, set `networking.firewall.checkReversePath` to `"loose"` or `false`. +NordVPN includes a `kill-switch` feature that blocks all packets not associated with the VPN connection. + +Additionally, add your user to the `nordvpn` group. + +```nix +{ + users.users.yourUser = { + #.. + extraGroups = [ + #.. + "nordvpn" + ]; + }; +} +``` + +If you prefer to use your own user and group, you can do so using + +```nix +{ + services.nordvpn.user = "SOME-USER"; + services.nordvpn.group = "SOME-GROUP"; +} +``` + +NordVPN provides several useful CLI commands, including: + +```bash +nordvpn login # Log in using an OAuth URL +nordvpn login --token # Log in with a token obtained from your NordVPN account +nordvpn c # Connect to the VPN +nordvpn c ie # Connect to a NordVPN server in Ireland +nordvpn d # Disconnect from the VPN +nordvpn set technology openvpn # Switch to OpenVPN technology +nordvpn c # Reconnect after changing technology +``` + +Additionally, if you prefer to use the friendly GUI, + +```bash +nordvpn-gui +``` + +**Disclaimer:** NixOS currently does not support meshnet. +Contributions welcome! diff --git a/nixos/modules/services/networking/nordvpn.nix b/nixos/modules/services/networking/nordvpn.nix new file mode 100644 index 000000000000..b38d75dd519d --- /dev/null +++ b/nixos/modules/services/networking/nordvpn.nix @@ -0,0 +1,171 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.nordvpn; + defaultUser = "nordvpn"; + defaultGroup = "nordvpn"; + + nordvpn = + let + cli = cfg.package.cli.overrideAttrs (old: { + preBuild = + let + extraPreBuild = lib.optionalString (cfg.group != defaultGroup) '' + substituteInPlace internal/permissions.go \ + --replace-fail \ + 'string{"nordvpn"}' \ + 'string{"${cfg.group}"}' + + substituteInPlace internal/constants.go \ + --replace-fail \ + 'NordvpnGroup = "nordvpn"' \ + 'NordvpnGroup = "${cfg.group}"' + ''; + in + extraPreBuild + (old.preBuild or ""); + + # postFixup wraps nordvpnd so that it can find binaries that it calls. + # here, instead, use systemd to update the path to those binaries. + postFixup = ""; + }); + in + pkgs.symlinkJoin { + inherit (cfg.package) pname version meta; + paths = [ + cli + cfg.package.gui + ]; + }; +in +{ + options.services.nordvpn = { + enable = lib.mkEnableOption "Enable NordVPN"; + package = lib.mkPackageOption pkgs "nordvpn" { }; + user = lib.mkOption { + type = lib.types.str; + default = defaultUser; + description = '' + The User that owns the `nordvpnd` systemd process. + If overriding the default, a user with the same name must exist. + ''; + }; + group = lib.mkOption { + type = lib.types.str; + default = defaultGroup; + description = '' + The Group that owns the `nordvpnd` systemd process. + If overriding the default, a group with the same name must exist. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + + # create the default user if that's the one used + users.users = lib.mkIf (cfg.user == defaultUser) { + ${defaultUser} = { + description = "User that runs `nordvpnd`."; + group = cfg.group; + isSystemUser = true; + }; + }; + + # create the default group if that's the one used + users.groups = lib.mkIf (cfg.group == defaultGroup) { + ${defaultGroup} = { }; + }; + + # nordvpnd uses resolved to configure dns + services.resolved.enable = true; + + # policy that allows nordvpnd to configure dns + security.polkit = { + enable = true; + extraConfig = '' + polkit.addRule(function(action, subject) { + if (action.id == "org.freedesktop.resolve1.set-dns-servers" + && subject.isInGroup("${cfg.group}")) { + return polkit.Result.YES; + } + }); + ''; + }; + + environment.systemPackages = [ + nordvpn + ]; + + systemd.services.nordvpnd = { + after = [ "network-online.target" ]; + description = "NordVPN daemon."; + path = ( + with pkgs; + [ + e2fsprogs + iproute2 + libxslt + nftables + procps + wireguard-tools + ] + ++ [ nordvpn ] + ); + serviceConfig = { + # nordvpnd needs CAP_NET_ADMIN to configure network interfaces + AmbientCapabilities = "CAP_NET_ADMIN"; + CapabilityBoundingSet = "CAP_NET_ADMIN"; + ExecStart = lib.getExe' nordvpn "nordvpnd"; + Group = cfg.group; + KillMode = "process"; + NonBlocking = true; + Requires = "nordvpnd.socket"; + Restart = "on-failure"; + RestartSec = 5; + RuntimeDirectory = "nordvpn"; + RuntimeDirectoryMode = "0750"; + StateDirectory = "nordvpn"; + StateDirectoryMode = "0750"; + User = cfg.user; + }; + wantedBy = [ "default.target" ]; + wants = [ "network-online.target" ]; + }; + + systemd.sockets.nordvpnd = { + description = "NordVPN Daemon Socket"; + listenStreams = [ "/run/nordvpn/nordvpnd.sock" ]; + partOf = [ "nordvpnd.service" ]; + socketConfig = { + DirectoryMode = "0750"; + NoDelay = true; + SocketGroup = cfg.group; + SocketMode = "0770"; + SocketUser = cfg.user; + }; + wantedBy = [ "sockets.target" ]; + }; + + systemd.user.services.norduserd = { + after = [ "network-online.target" ]; + description = "NordUserD Service"; + serviceConfig = { + ExecStart = lib.getExe' nordvpn "norduserd"; + NonBlocking = true; + Restart = "on-failure"; + RestartSec = 5; + }; + wantedBy = [ "graphical-session.target" ]; + wants = [ "network-online.target" ]; + }; + + }; + + meta = { + doc = ./nordvpn.md; + maintainers = with lib.maintainers; [ different-error ]; + }; +} diff --git a/nixos/modules/services/networking/ntp/chrony.nix b/nixos/modules/services/networking/ntp/chrony.nix index 8dac1de5c574..628fb09ed156 100644 --- a/nixos/modules/services/networking/ntp/chrony.nix +++ b/nixos/modules/services/networking/ntp/chrony.nix @@ -300,6 +300,7 @@ in serviceConfig = { Type = "notify"; ExecStart = "${chronyPkg}/bin/chronyd ${toString chronyFlags}"; + Restart = "on-failure"; # Proc filesystem ProcSubset = "pid"; diff --git a/nixos/modules/services/networking/ntp/ntpd-rs.nix b/nixos/modules/services/networking/ntp/ntpd-rs.nix index 89735696616c..d68b7762805e 100644 --- a/nixos/modules/services/networking/ntp/ntpd-rs.nix +++ b/nixos/modules/services/networking/ntp/ntpd-rs.nix @@ -70,6 +70,7 @@ in services.ntpd-rs.settings = { observability = { + log-level = lib.mkDefault "warn"; observation-path = lib.mkDefault "/var/run/ntpd-rs/observe"; }; source = lib.mkIf cfg.useNetworkingTimeServers ( diff --git a/nixos/modules/services/networking/onedrive.md b/nixos/modules/services/networking/onedrive.md new file mode 100644 index 000000000000..2a114230c85f --- /dev/null +++ b/nixos/modules/services/networking/onedrive.md @@ -0,0 +1,39 @@ +# Microsoft OneDrive {#module-services-onedrive} + +Microsoft Onedrive is a popular cloud file-hosting service, used by 85% +of Fortune 500 companies. NixOS uses a popular OneDrive client for Linux +maintained by github user abraunegg. The Linux client is excellent and +allows customization of which files or paths to download, not much +unlike the default Windows OneDrive client by Microsoft itself. The +client allows syncing with multiple onedrive accounts at the same time, +of any type- OneDrive personal, OneDrive business, Office365 and +Sharepoint libraries, without any additional charge. + +For more information, guides and documentation, see . + +To enable OneDrive support, add the following to your +`configuration.nix`: {option}`services.onedrive.enable` = true; + +This installs the `onedrive` package and a service `onedriveLauncher` +which will instantiate a `onedrive` service for all your OneDrive +accounts. Follow the steps in documentation of the onedrive client to +setup your accounts. To use the service with multiple accounts, create a +file named `onedrive-launcher` in `~/.config` and add the filename of +the config directory, relative to `~/.config`. For example, if you have +two OneDrive accounts with configs in `~/.config/onedrive_bob_work` and +`~/.config/onedrive_bob_personal`, add the following lines: + +``` +onedrive_bob_work +# Not in use: +# onedrive_bob_office365 +onedrive_bob_personal +``` + +No such file needs to be created if you are using only a single OneDrive +account with config in the default location `~/.config/onedrive`, in the +absence of `~/.config/onedrive-launcher`, only a single service is +instantiated, with default config path. + +If you wish to use a custom OneDrive package, say from another channel, +add the following line: {option}`services.onedrive.package` = pkgs.unstable.onedrive; diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix index f7d1f0d0de5c..b466f4db5918 100644 --- a/nixos/modules/services/networking/onedrive.nix +++ b/nixos/modules/services/networking/onedrive.nix @@ -23,17 +23,13 @@ let in { - ### Documentation - # meta.doc = ./onedrive.xml; - - ### Interface + meta.doc = ./onedrive.md; options.services.onedrive = { enable = lib.mkEnableOption "OneDrive service"; package = lib.mkPackageOption pkgs "onedrive" { }; }; - ### Implementation config = lib.mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/networking/sabnzbd/default.nix b/nixos/modules/services/networking/sabnzbd/default.nix index d4a894faf96f..3775ba680758 100644 --- a/nixos/modules/services/networking/sabnzbd/default.nix +++ b/nixos/modules/services/networking/sabnzbd/default.nix @@ -29,71 +29,24 @@ let cfg = config.services.sabnzbd; + # Sabnzbd expects 0/1 instead of true/false + fixupSettings = lib.mapAttrsRecursive ( + path: value: + if value == true then + 1 + else if value == false then + 0 + else + value + ); + mandatoryGlobalSettings = { "__version__" = 19; "__encoding__" = "utf-8"; }; - allSettings = mandatoryGlobalSettings // cfg.settings; + allSettings = fixupSettings (mandatoryGlobalSettings // cfg.settings); - # sabnzbd uses configobj type inis, which support - # nested sections specified by increasing numbers - # of square brackets (but not toml style dotted paths) - configObjAtom = types.oneOf [ - types.str - types.int - types.bool - ]; - - configObjValue = - let - valueType = - types.oneOf [ - types.str - types.int - types.bool - (types.listOf configObjAtom) - (types.attrsOf valueType) - ] - // { - description = "ConfigObj type"; - }; - in - valueType; - - configObjIni = - { }: - let - extractAtoms = lib.filterAttrs (k: v: v != null && !lib.isAttrs v); - extractSections = lib.filterAttrs (k: v: lib.isAttrs v); - mkValueString = ( - v: - if true == v then - "1" - else if false == v then - "0" - else - mkValueStringDefault { } v - ); - mkKeyValue = mkKeyValueDefault { inherit mkValueString; } "="; - mkSection = ( - depth: attrs: - let - sections = extractSections attrs; - sectionHeadingLeft = lib.concatStrings (lib.replicate (depth + 1) "["); - sectionHeadingRight = lib.concatStrings (lib.replicate (depth + 1) "]"); - mkSectionHeading = - name: "${sectionHeadingLeft}${lib.escape [ "[" "]" ] name}${sectionHeadingRight}"; - mkSubsection = name: attrs: (mkSectionHeading name) + "\n" + (mkSection (depth + 1) attrs) + "\n"; - in - toKeyValue { inherit mkKeyValue; } (extractAtoms attrs) - + "\n" - + lib.concatStrings (lib.mapAttrsToList mkSubsection sections) - ); - in - { - type = types.attrsOf configObjValue; - generate = name: attrs: pkgs.writeText name (mkSection 0 attrs); - }; + configObjIni = pkgs.formats.configobj; publicSettingsIni = if cfg.configFile != null then @@ -164,6 +117,28 @@ in default = [ ]; }; + secretValues = mkOption { + type = with types; attrsOf path; + description = '' + Attrset of patterns in the settings that should be replaced at + runtime, just before the service starts, with values read from the + given files. The files must be readable by the service user. + + Compared to the secretFiles option, secretValues allows having the + full settings structure in Nix, and only externalizing the secret + values themselves. + ''; + default = { }; + example = lib.literalExpression '' + { + "@my_server_password@" = "/run/secrets/my_server_password"; + "@my_server_username@" = "/run/secrets/my_server_username"; + "@sabnzbd_api_key@" = "/run/secrets/sabnzbd_api_key"; + "@sabnzbd_nzb_key@" = "/run/secrets/sabnzbd_nzb_key"; + } + ''; + }; + allowConfigWrite = mkOption { type = types.bool; description = '' @@ -548,6 +523,12 @@ in "''${files[@]}" \ > "$tmpfile" + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (n: v: '' + "${lib.getExe pkgs.replace-secret}" "${n}" "${v}" "$tmpfile" + '') cfg.secretValues + )} + install -D \ -m ${if cfg.allowConfigWrite then "600" else "400"} \ -o '${cfg.user}' -g '${cfg.group}' \ diff --git a/nixos/modules/services/networking/searx.nix b/nixos/modules/services/networking/searx.nix index da48474d776c..6baf331187ec 100644 --- a/nixos/modules/services/networking/searx.nix +++ b/nixos/modules/services/networking/searx.nix @@ -5,44 +5,50 @@ pkgs, ... }: - -with lib; - let + inherit (lib) + literalExpression + mkDefault + mkIf + mkOption + mkPackageOption + mkRenamedOptionModule + optionalAttrs + types + ; + runDir = "/run/searx"; cfg = config.services.searx; + yamlFormat = pkgs.formats.yaml { }; + tomlFormat = pkgs.formats.toml { }; - settingsFile = pkgs.writeText "settings.yml" ( - builtins.toJSON (removeAttrs cfg.settings [ "redis" ]) - ); + settingsFile = yamlFormat.generate "settings.yml" (builtins.removeAttrs cfg.settings [ "redis" ]); - faviconsSettingsFile = (pkgs.formats.toml { }).generate "favicons.toml" cfg.faviconsSettings; - limiterSettingsFile = (pkgs.formats.toml { }).generate "limiter.toml" cfg.limiterSettings; + faviconsSettingsFile = tomlFormat.generate "favicons.toml" cfg.faviconsSettings; + limiterSettingsFile = tomlFormat.generate "limiter.toml" cfg.limiterSettings; generateConfig = '' cd ${runDir} - # write NixOS settings as JSON + # write NixOS settings ( umask 077 - ${pkgs.envsubst}/bin/envsubst < ${settingsFile} > settings.yml + ${lib.getExe pkgs.envsubst} < ${settingsFile} > settings.yml + ${ + if (cfg.faviconsSettings != { }) then + "ln -sf ${faviconsSettingsFile} favicons.toml" + else + "rm -f favicons.toml" + } + ${ + if (cfg.limiterSettings != { }) then + "ln -sf ${limiterSettingsFile} limiter.toml" + else + "rm -f limiter.toml" + } ) ''; - - settingType = - with types; - (oneOf [ - bool - int - float - str - (listOf settingType) - (attrsOf settingType) - ]) - // { - description = "JSON value"; - }; in { options = { @@ -107,7 +113,7 @@ in lib.warn "Obsolete option `services.searx.settings.redis' is used. It was renamed to `services.searx.settings.valkey'" config.redis ); - freeformType = settingType; + freeformType = yamlFormat.type; } ); default = { }; @@ -136,25 +142,25 @@ in ''; }; - settingsFile = mkOption { + settingsPath = mkOption { type = types.path; - default = "${runDir}/settings.yml"; + default = runDir; description = '' - The path of the Searx server settings.yml file. - If no file is specified, a default file is used (default config file has debug mode enabled). + The path of the SearXNG settings directory or the settings.yml file. + If no path is specified, a default one is used (default config file has debug mode enabled). ::: {.note} Setting this options overrides [](#opt-services.searx.settings). ::: ::: {.warning} - This file, along with any secret key it contains, will be copied into the world-readable Nix store. + This path, along with any secret keys it contains, will be copied into the world-readable Nix store. ::: ''; }; faviconsSettings = mkOption { - type = types.attrsOf settingType; + type = types.attrsOf tomlFormat.type; default = { }; example = literalExpression '' { @@ -182,18 +188,23 @@ in }; limiterSettings = mkOption { - type = types.attrsOf settingType; + type = types.attrsOf tomlFormat.type; default = { }; example = literalExpression '' { - real_ip = { - x_for = 1; + botdetection = { ipv4_prefix = 32; ipv6_prefix = 56; - } - botdetection.ip_lists.block_ip = [ - # "93.184.216.34" # example.org - ]; + + trusted_proxies = [ + "127.0.0.0/8" + "::1" + ]; + + ip_lists.block_ip = [ + # "93.184.216.34" # example.org + ]; + }; } ''; description = '' @@ -252,6 +263,7 @@ in }; imports = [ + (mkRenamedOptionModule [ "services" "searx" "settingsFile" ] [ "services" "searx" "settingsPath" ]) (mkRenamedOptionModule [ "services" "searx" "configFile" ] [ "services" "searx" "settingsFile" ]) (mkRenamedOptionModule [ "services" "searx" "runInUwsgi" ] [ "services" "searx" "configureUwsgi" ]) ]; @@ -264,17 +276,7 @@ in } ]; - environment = { - etc = { - "searxng/favicons.toml" = lib.mkIf (cfg.faviconsSettings != { }) { - source = faviconsSettingsFile; - }; - "searxng/limiter.toml" = lib.mkIf (cfg.limiterSettings != { }) { - source = limiterSettingsFile; - }; - }; - systemPackages = [ cfg.package ]; - }; + environment.systemPackages = [ cfg.package ]; services = { nginx = lib.mkIf cfg.configureNginx { @@ -338,7 +340,7 @@ in enable-threads = true; module = "searx.webapp"; env = [ - "SEARXNG_SETTINGS_PATH=${cfg.settingsFile}" + "SEARXNG_SETTINGS_PATH=${cfg.settingsPath}" ]; buffer-size = 32768; pythonPackages = _: [ cfg.package ]; @@ -379,17 +381,60 @@ in after = [ "searx-init.service" "network.target" - ]; + ] + ++ lib.optionals cfg.redisCreateLocally [ "redis-searx.service" ]; serviceConfig = { User = "searx"; + DynamicUser = true; Group = "searx"; ExecStart = lib.getExe cfg.package; + + CacheDirectory = "searx"; + CacheDirectoryMode = "0700"; + + ReadOnlyPaths = [ cfg.settingsPath ]; + ReadWritePaths = lib.optional cfg.redisCreateLocally config.services.redis.servers.searx.unixSocket; + + CapabilityBoundingSet = null; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + PrivateDevices = true; + PrivateMounts = true; + PrivateTmp = true; + PrivateUsers = true; + PrivateIPC = true; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged @resources" + ]; + UMask = "0077"; } // optionalAttrs (cfg.environmentFile != null) { EnvironmentFile = cfg.environmentFile; }; environment = { - SEARXNG_SETTINGS_PATH = cfg.settingsFile; + SEARXNG_SETTINGS_PATH = cfg.settingsPath; }; }; @@ -398,7 +443,7 @@ in after = [ "searx-init.service" ]; restartTriggers = [ cfg.package - cfg.settingsFile + cfg.settingsPath ] ++ lib.optional (cfg.environmentFile != null) cfg.environmentFile; }; @@ -416,7 +461,7 @@ in networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.settings.server.port ]; }; }; - meta.maintainers = with maintainers; [ + meta.maintainers = with lib.maintainers; [ SuperSandro2000 _999eagle ]; diff --git a/nixos/modules/services/networking/sing-box.nix b/nixos/modules/services/networking/sing-box.nix index c6ae9cb5c290..3076d94e83b9 100644 --- a/nixos/modules/services/networking/sing-box.nix +++ b/nixos/modules/services/networking/sing-box.nix @@ -50,6 +50,7 @@ in serviceConfig = { User = "sing-box"; Group = "sing-box"; + ConfigurationDirectory = "sing-box"; StateDirectory = "sing-box"; StateDirectoryMode = "0700"; RuntimeDirectory = "sing-box"; @@ -62,11 +63,15 @@ in chown --reference=/run/sing-box /run/sing-box/config.json ''; in - "+${script}"; - ExecStart = [ - "" - "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${RUNTIME_DIRECTORY} run" - ]; + lib.mkIf (cfg.settings != { }) "+${script}"; + ExecStart = + let + configDir = if cfg.settings != { } then "RUNTIME_DIRECTORY" else "CONFIGURATION_DIRECTORY"; + in + [ + "" + "${lib.getExe cfg.package} -D \${STATE_DIRECTORY} -C \${${configDir}} run" + ]; }; # After= is specified by upstream requires = [ "network-online.target" ]; diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index a948cd02bc4f..72702b605f3d 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -232,6 +232,10 @@ in "openssh" "banner" ] "Use services.openssh.settings.Banner instead.") + (lib.mkRenamedOptionModule + [ "services" "openssh" "moduliFile" ] + [ "services" "openssh" "settings" "ModuliFile" ] + ) ]; ###### interface @@ -729,6 +733,14 @@ in ''; example = "/etc/ssh/banner"; }; + ModuliFile = lib.mkOption { + type = lib.types.path; + default = "${config.services.openssh.package}/etc/ssh/moduli"; + defaultText = lib.literalExpression ''"''${config.services.openssh.package}/etc/ssh/moduli"''; + description = '' + Specifies the {manpage}`moduli(5)` file to use for Diffie-Hellman key exchange. + ''; + }; }; } ); @@ -740,16 +752,6 @@ in description = "Verbatim contents of {file}`sshd_config`."; }; - moduliFile = lib.mkOption { - example = "/etc/my-local-ssh-moduli;"; - type = lib.types.path; - description = '' - Path to `moduli` file to install in - `/etc/ssh/moduli`. If this option is unset, then - the `moduli` file shipped with OpenSSH will be used. - ''; - }; - }; users.users = lib.mkOption { @@ -770,14 +772,12 @@ in }; 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; }; diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index b96718675e15..413ac1795bf2 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -25,10 +25,10 @@ let if isUnixGui # if cfg.guiAddress is a unix socket, tell curl explicitly about it - # note that the dot in front of `${path}` is the hostname, which is + # note that the syncthing.local in front of `${path}` is the hostname, which is # required. then - "--unix-socket ${lib.strings.removePrefix "unix://" cfg.guiAddress} http://.${path}" + "--unix-socket ${lib.strings.removePrefix "unix://" cfg.guiAddress} http://syncthing.local${path}" # no adjustments are needed if cfg.guiAddress is a network address else "${cfg.guiAddress}${path}"; @@ -46,6 +46,19 @@ let folders = lib.pipe cfg.settings.folders [ (lib.filterAttrs (_: folder: folder.enable)) builtins.attrValues + (map ( + folder: + folder + // { + devices = map ( + device: + if builtins.isString device then + { deviceId = cfg.settings.devices.${device}.id; } + else + { deviceId = cfg.settings.devices.${device.name}.id; } // device + ) folder.devices; + } + )) ]; jq = "${pkgs.jq}/bin/jq"; diff --git a/nixos/modules/services/networking/tap.nix b/nixos/modules/services/networking/tap.nix new file mode 100644 index 000000000000..bea84531014d --- /dev/null +++ b/nixos/modules/services/networking/tap.nix @@ -0,0 +1,131 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.tap; +in +{ + options.services.tap = { + enable = lib.mkEnableOption "Tap, ATProtocol firehose sync utility"; + + package = lib.mkPackageOption pkgs "tap" { }; + + environmentFiles = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = [ ]; + description = '' + Files to load environment variables from. Use for secrets such as + {env}`TAP_ADMIN_PASSWORD` that should not be readable in the Nix store. + ''; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Configuration for Tap as environment variables. See the + [README](https://github.com/bluesky-social/indigo/blob/main/cmd/tap/README.md) + for all available options. + + Secrets such as {option}`settings.TAP_ADMIN_PASSWORD` should be set via + {option}`environmentFiles` rather than here, as values set here will + be readable in the Nix store. + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.nullOr ( + lib.types.oneOf [ + lib.types.bool + lib.types.int + lib.types.float + lib.types.str + ] + ) + ); + + options = { + TAP_BIND = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1:2480"; + description = "Address and port the HTTP server will listen on."; + }; + + TAP_DATABASE_URL = lib.mkOption { + type = lib.types.str; + default = "sqlite:///var/lib/tap/tap.db"; + description = '' + Database connection string. Accepts SQLite (`sqlite://path`) or + PostgreSQL (`postgres://...`) connection strings. + ''; + }; + }; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.tap = { + description = "Tap - ATProtocol firehose sync utility"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = "tap"; + DynamicUser = true; + + ExecStart = "${lib.getExe cfg.package} run"; + Environment = lib.mapAttrsToList ( + k: v: "${k}=${if lib.isBool v then lib.boolToString v else toString v}" + ) (lib.filterAttrs (_: v: v != null) cfg.settings); + EnvironmentFile = cfg.environmentFiles; + + Restart = "on-failure"; + RestartSec = 5; + StateDirectory = "tap"; + StateDirectoryMode = "0750"; + + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + ProtectSystem = "strict"; + + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + + LockPersonality = true; + NoNewPrivileges = true; + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + RemoveIPC = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; + }; + }; + }; + + meta.maintainers = with lib.maintainers; [ blooym ]; +} diff --git a/nixos/modules/services/networking/technitium-dns-server.nix b/nixos/modules/services/networking/technitium-dns-server.nix index 143b0c43cfdc..32aa247989aa 100644 --- a/nixos/modules/services/networking/technitium-dns-server.nix +++ b/nixos/modules/services/networking/technitium-dns-server.nix @@ -65,6 +65,7 @@ in DynamicUser = true; StateDirectory = "technitium-dns-server"; + LogsDirectory = "technitium"; Restart = "always"; RestartSec = 10; @@ -102,5 +103,8 @@ in }; }; - meta.maintainers = with lib.maintainers; [ fabianrig ]; + meta.maintainers = with lib.maintainers; [ + fabianrig + awildleon + ]; } diff --git a/nixos/modules/services/networking/tetrd.nix b/nixos/modules/services/networking/tetrd.nix index 77cf6722e404..18414c92d1dc 100644 --- a/nixos/modules/services/networking/tetrd.nix +++ b/nixos/modules/services/networking/tetrd.nix @@ -5,13 +5,19 @@ ... }: +let + cfg = config.services.tetrd; +in { - options.services.tetrd.enable = lib.mkEnableOption "tetrd"; + options.services.tetrd = { + enable = lib.mkEnableOption "tetrd"; + package = lib.mkPackageOption pkgs "tetrd" { }; + }; - config = lib.mkIf config.services.tetrd.enable { + config = lib.mkIf cfg.enable { environment = { - systemPackages = [ pkgs.tetrd ]; - etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; + systemPackages = [ cfg.package ]; + # etc."resolv.conf".source = "/etc/tetrd/resolv.conf"; # Disabled overwriting of resolve.conf since otherwise tetrd disables your dns when its not connected to a device. }; # Our resolv.conf will override resolvconf's version. @@ -21,11 +27,11 @@ tmpfiles.rules = [ "f /etc/tetrd/resolv.conf - - -" ]; services.tetrd = { - description = pkgs.tetrd.meta.description; + description = cfg.package.meta.description; wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.tetrd}/opt/Tetrd/bin/tetrd"; + ExecStart = "${cfg.package}/opt/Tetrd/bin/tetrd"; Restart = "always"; RuntimeDirectory = "tetrd"; RootDirectory = "/run/tetrd"; diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index e082214b5eca..22398f2ff5b0 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -421,10 +421,7 @@ in ExecStart = "${data.package}/bin/tincd -D -U tinc-${network} -n ${network} ${optionalString (data.chroot) "-R"} --pidfile /run/tinc.${network}.pid -d ${toString data.debugLevel}"; }; preStart = '' - mkdir -p /etc/tinc/${network}/hosts - chown tinc-${network} /etc/tinc/${network}/hosts - mkdir -p /etc/tinc/${network}/invitations - chown tinc-${network} /etc/tinc/${network}/invitations + install -d -o tinc-${network} /etc/tinc/${network} /etc/tinc/${network}/hosts /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index eaee405f8bda..ff489fe5db92 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -4,6 +4,7 @@ lib, pkgs, utils, + jdk25_headless, ... }: let @@ -29,21 +30,16 @@ let ); in { - options = { + services.unifi.enable = lib.mkEnableOption "UniFi controller service"; + + services.unifi.jrePackage = lib.mkOption { + type = lib.types.package; + default = cfg.unifiPackage.passthru.jrePackage or jdk25_headless; + defaultText = lib.literalExpression "unifiPackage.passthru.jrePackage"; - services.unifi.enable = lib.mkOption { - type = lib.types.bool; - default = false; description = '' - Whether or not to enable the unifi controller service. - ''; - }; - - services.unifi.jrePackage = lib.mkPackageOption pkgs "jdk" { - default = "jdk25_headless"; - extraDescription = '' - Check the UniFi controller release notes to ensure it is supported. + Which Java runtime to use. ''; }; @@ -56,6 +52,7 @@ in services.unifi.openFirewall = lib.mkOption { type = lib.types.bool; default = false; + description = '' Whether or not to open the minimum required ports on the firewall. @@ -69,6 +66,7 @@ in type = with lib.types; nullOr int; default = null; example = 1024; + description = '' Set the initial heap size for the JVM in MB. If this option isn't set, the JVM will decide this value at runtime. @@ -79,6 +77,7 @@ in type = with lib.types; nullOr int; default = null; example = 4096; + description = '' Set the maximum heap size for the JVM in MB. If this option isn't set, the JVM will decide this value at runtime. @@ -89,15 +88,14 @@ in type = with lib.types; listOf str; default = [ ]; example = lib.literalExpression ''["-Xlog:gc"]''; + description = '' Set extra options to pass to the JVM. ''; }; - }; config = lib.mkIf cfg.enable { - assertions = [ { assertion = @@ -128,16 +126,18 @@ in description = "UniFi controller daemon user"; home = "${stateDir}"; }; + users.groups.unifi = { }; + # https://help.ubnt.com/hc/en-us/articles/218506997 networking.firewall = lib.mkIf cfg.openFirewall { - # https://help.ubnt.com/hc/en-us/articles/218506997 allowedTCPPorts = [ 8080 # Port for UAP to inform controller. 8880 # Port for HTTP portal redirect, if guest portal is enabled. 8843 # Port for HTTPS portal redirect, ditto. 6789 # Port for UniFi mobile speed test. ]; + allowedUDPPorts = [ 3478 # UDP port used for STUN. 10001 # UDP port used for device discovery. @@ -151,6 +151,7 @@ in # This a HACK to fix missing dependencies of dynamic libs extracted from jars environment.LD_LIBRARY_PATH = with pkgs.stdenv; "${cc.cc.lib}/lib"; + # Make sure package upgrades trigger a service restart restartTriggers = [ cfg.unifiPackage @@ -220,12 +221,13 @@ in # Needs network access PrivateNetwork = false; + # Cannot be true due to OpenJDK MemoryDenyWriteExecute = false; }; }; - }; + imports = [ (lib.mkRemovedOptionModule [ "services" diff --git a/nixos/modules/services/networking/veilid.nix b/nixos/modules/services/networking/veilid.nix index e270fe7c076c..78c9e7ed9a65 100644 --- a/nixos/modules/services/networking/veilid.nix +++ b/nixos/modules/services/networking/veilid.nix @@ -92,7 +92,7 @@ in settings = mkOption { description = '' Build veilid-server.conf with nix expression. - Check Configuration Keys. + Check [Configuration Keys](https://veilid.gitlab.io/developer-book/admin/config.html#configuration-keys). ''; type = types.submodule { freeformType = settingsFormat.type; diff --git a/nixos/modules/services/networking/xrdp.nix b/nixos/modules/services/networking/xrdp.nix index a1e9f9c23d80..8938293fee28 100644 --- a/nixos/modules/services/networking/xrdp.nix +++ b/nixos/modules/services/networking/xrdp.nix @@ -19,7 +19,7 @@ let cat > $out/startwm.sh < for more details. + ''; + type = lib.types.either lib.types.str lib.types.bool; + default = true; + example = "read-only"; + }; + ProtectSystem = lib.mkOption { + description = '' + Whether to make several system directories inaccessible to the service. + See for more details. + ''; + type = lib.types.either lib.types.str lib.types.bool; + default = true; + example = "full"; + }; + }; + }; + }; +in +{ + + options.services.gocron = { + enable = lib.mkEnableOption "gocron, a task scheduler"; + + package = lib.mkOption { + default = pkgs.gocron; + defaultText = lib.literalExpression "pkgs.gocron"; + type = lib.types.package; + description = '' + gocron package to use. + ''; + }; + + openFirewall = lib.mkOption { + description = "Whether to open the firewall port to access the web ui."; + type = lib.types.bool; + default = false; + }; + + user = lib.mkOption { + description = "Unix User to run the server under"; + type = lib.types.str; + default = defaultUser; + }; + + group = lib.mkOption { + description = "Unix Group to run the server under"; + type = lib.types.str; + default = defaultGroup; + }; + + extraGroups = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + example = [ "backup" ]; + description = '' + Additional groups for the systemd service. + ''; + }; + + hardening = hardeningOptions; + + settings = lib.mkOption { + # Setting this type allows for correct merging behavior + type = settingsFormat.type; + default = { }; + description = '' + Configuration for gocron, see + + for supported settings. + ''; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !lib.hasAttr "software" cfg.settings; + message = "Software installation configuration is only supported for traditional distros by upstream."; + } + ]; + + services.gocron.settings = { + time_zone = if timeZone != null then timeZone else lib.mkDefault "Etc/UTC"; + server = { + address = lib.mkDefault "127.0.0.1"; + port = lib.mkDefault 8156; + }; + db.location = lib.mkDefault "/var/lib/gocron"; + }; + + systemd.services.gocron = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + ExecStart = "${lib.getExe pkgs.gocron} --config '${gocronConf}'"; + User = cfg.user; + Group = cfg.group; + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + MountAPIVFS = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = lib.mkDefault false; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = cfg.hardening.ProtectHome; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = cfg.hardening.ProtectSystem; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + UMask = "0077"; + StateDirectory = lib.mkIf (cfg.settings.db.location == "/var/lib/gocron") "gocron"; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + ]; + }; + }; + + networking.firewall.allowedTCPPorts = lib.mkIf cfg.openFirewall [ cfg.settings.server.port ]; + + users.users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + }; + + users.groups.${cfg.group} = { }; + + meta = { + buildDocsInSandbox = true; + maintainers = with lib.maintainers; [ juliusfreudenberger ]; + }; + }; +} diff --git a/nixos/modules/services/scheduling/scx-loader.nix b/nixos/modules/services/scheduling/scx-loader.nix index 70c4df00c3bb..55f9bb7bd065 100644 --- a/nixos/modules/services/scheduling/scx-loader.nix +++ b/nixos/modules/services/scheduling/scx-loader.nix @@ -75,7 +75,11 @@ in } ]; - environment.systemPackages = [ cfg.package ] ++ cfg.schedsPackages; + environment = { + systemPackages = [ cfg.package ] ++ cfg.schedsPackages; + etc."scx_loader.toml".source = configFile; + }; + systemd.packages = [ cfg.package ]; services.dbus.packages = [ cfg.package ]; @@ -84,10 +88,6 @@ in systemd.services.scx_loader = { path = cfg.schedsPackages; wantedBy = [ "multi-user.target" ]; - serviceConfig = { - TemporaryFileSystem = [ "/etc" ]; - BindReadOnlyPaths = [ "${configFile.outPath}:/etc/scx_loader.toml" ]; - }; }; }; diff --git a/nixos/modules/services/security/authelia.nix b/nixos/modules/services/security/authelia.nix index f8bcc4bb15b9..5fe0d6bc23e3 100644 --- a/nixos/modules/services/security/authelia.nix +++ b/nixos/modules/services/security/authelia.nix @@ -268,15 +268,6 @@ let }; }; - writeOidcJwksConfigFile = - oidcIssuerPrivateKeyFile: - pkgs.writeText "oidc-jwks.yaml" '' - identity_providers: - oidc: - jwks: - - key: {{ secret "${oidcIssuerPrivateKeyFile}" | mindent 10 "|" | msquote }} - ''; - # Remove an attribute in a nested set # https://discourse.nixos.org/t/modify-an-attrset-in-nix/29919/5 removeAttrByPath = @@ -362,7 +353,12 @@ in execCommand = "${instance.package}/bin/authelia"; configFile = format.generate "config.yml" cleanedSettings; oidcJwksConfigFile = lib.optional (instance.secrets.oidcIssuerPrivateKeyFile != null) ( - writeOidcJwksConfigFile instance.secrets.oidcIssuerPrivateKeyFile + pkgs.writeText "oidc-jwks.yaml" '' + identity_providers: + oidc: + jwks: + - key: {{ mustEnv "CREDENTIALS_DIRECTORY" | printf "%s/oidcIssuerPrivateKeyFile" | secret | mindent 10 "|" | msquote }} + '' ); configArg = "--config ${ builtins.concatStringsSep "," ( @@ -373,21 +369,25 @@ in ] ) }"; + # Mapping between the Authelia env variables and the secret keys defined in the module + envSecretsMap = { + AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = "jwtSecretFile"; + AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = "storageEncryptionKeyFile"; + AUTHELIA_SESSION_SECRET_FILE = "sessionSecretFile"; + AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = "oidcHmacSecretFile"; + }; + nonNullEnvSecretsMap = lib.filterAttrs (_: v: instance.secrets.${v} != null) envSecretsMap; in { description = "Authelia authentication and authorization server"; wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" ]; # Checks SMTP notifier creds during startup wants = [ "network-online.target" ]; - environment = - (lib.filterAttrs (_: v: v != null) { - X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; - AUTHELIA_IDENTITY_VALIDATION_RESET_PASSWORD_JWT_SECRET_FILE = instance.secrets.jwtSecretFile; - AUTHELIA_STORAGE_ENCRYPTION_KEY_FILE = instance.secrets.storageEncryptionKeyFile; - AUTHELIA_SESSION_SECRET_FILE = instance.secrets.sessionSecretFile; - AUTHELIA_IDENTITY_PROVIDERS_OIDC_HMAC_SECRET_FILE = instance.secrets.oidcHmacSecretFile; - }) - // instance.environmentVariables; + environment = { + X_AUTHELIA_CONFIG_FILTERS = lib.mkIf (oidcJwksConfigFile != [ ]) "template"; + } + // lib.mapAttrs (_: v: "%d/${v}") nonNullEnvSecretsMap + // instance.environmentVariables; preStart = "${execCommand} ${configArg} validate-config"; serviceConfig = { @@ -399,6 +399,12 @@ in StateDirectory = autheliaName instance.name; StateDirectoryMode = "0700"; + LoadCredential = + lib.optional ( + instance.secrets.oidcIssuerPrivateKeyFile != null + ) "oidcIssuerPrivateKeyFile:${instance.secrets.oidcIssuerPrivateKeyFile}" + ++ lib.mapAttrsToList (_: v: "${v}:${instance.secrets.${v}}") nonNullEnvSecretsMap; + # Security options: AmbientCapabilities = ""; CapabilityBoundingSet = ""; diff --git a/nixos/modules/services/security/endlessh-go.nix b/nixos/modules/services/security/endlessh-go.nix index 5c69d412a7d3..d1650654a62e 100644 --- a/nixos/modules/services/security/endlessh-go.nix +++ b/nixos/modules/services/security/endlessh-go.nix @@ -158,5 +158,5 @@ in networking.firewall.allowedTCPPorts = with cfg; lib.optionals openFirewall [ port ]; }; - meta.maintainers = with lib.maintainers; [ azahi ]; + meta.maintainers = [ ]; } diff --git a/nixos/modules/services/security/pocket-id.nix b/nixos/modules/services/security/pocket-id.nix index 9396185c2469..547b3df6db54 100644 --- a/nixos/modules/services/security/pocket-id.nix +++ b/nixos/modules/services/security/pocket-id.nix @@ -70,10 +70,13 @@ in ENCRYPTION_KEY = "/run/secrets/pocket-id/encryption-key"; }; description = '' - Environment variables which are loaded from the contents of the specified file paths. + Credentials which are loaded from the contents of the specified file paths. + This can be used to securely store tokens and secrets outside of the world-readable Nix store. - See [PocketID environment variables](https://pocket-id.org/docs/configuration/environment-variables). + See [PocketID environment variables](https://pocket-id.org/docs/configuration/environment-variables) (all with the `_FILE` suffix). + + Accepts an attrset mapping from the variable name *without its `_FILE` suffix* to the path on disk. Alternatively you can use `services.pocket-id.environmentFile` to define all the variables in a single file. ''; diff --git a/nixos/modules/services/security/vaultwarden/default.nix b/nixos/modules/services/security/vaultwarden/default.nix index b43ecc58f156..5c1b9e1ed114 100644 --- a/nixos/modules/services/security/vaultwarden/default.nix +++ b/nixos/modules/services/security/vaultwarden/default.nix @@ -173,6 +173,7 @@ in domain = lib.mkOption { type = with lib.types; nullOr str; default = null; + example = "bitwarden.example.com"; description = "The domain under which VaultWarden will be reachable."; }; diff --git a/nixos/modules/services/system/userborn.nix b/nixos/modules/services/system/userborn.nix index 5649b438965b..eeb0f6a40f35 100644 --- a/nixos/modules/services/system/userborn.nix +++ b/nixos/modules/services/system/userborn.nix @@ -86,7 +86,7 @@ in The primary motivation for this is an immutable `/etc`, where we cannot write the files directly to `/etc`. - However this an also serve other use cases, e.g. when `/etc` is on a `tmpfs`. + However this can also serve other use cases, e.g. when `/etc` is on a `tmpfs`. ''; }; diff --git a/nixos/modules/services/torrent/rtorrent.nix b/nixos/modules/services/torrent/rtorrent.nix index 07825ecbc897..2b672d6a6584 100644 --- a/nixos/modules/services/torrent/rtorrent.nix +++ b/nixos/modules/services/torrent/rtorrent.nix @@ -149,13 +149,6 @@ in protocol.encryption.set = allow_incoming,try_outgoing,enable_retry - # Limits for file handle resources, this is optimized for - # an `ulimit` of 1024 (a common default). You MUST leave - # a ceiling of handles reserved for rTorrent's internal needs! - network.http.max_open.set = 50 - network.max_open_files.set = 600 - network.max_open_sockets.set = 3000 - # Memory resource usage (increase if you have a large number of items loaded, # and/or the available resources to spend) pieces.memory.max.set = 1800M @@ -169,15 +162,14 @@ in execute.nothrow = sh, -c, (cat, "echo >", (session.path), "rtorrent.pid", " ", (system.pid)) # Other operational settings (check & adapt) - encoding.add = utf8 system.umask.set = 0027 system.cwd.set = (cfg.basedir) network.http.dns_cache_timeout.set = 25 - schedule2 = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) + schedule = monitor_diskspace, 15, 60, ((close_low_diskspace, 1000M)) # Watch directories (add more as you like, but use unique schedule names) - #schedule2 = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent"))) - #schedule2 = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent"))) + #schedule = watch_start, 10, 10, ((load.start, (cat, (cfg.watch), "start/*.torrent"))) + #schedule = watch_load, 11, 10, ((load.normal, (cat, (cfg.watch), "load/*.torrent"))) # Logging: # Levels = critical error warn notice info debug @@ -218,6 +210,10 @@ in RuntimeDirectory = "rtorrent"; RuntimeDirectoryMode = 750; + # rtorrent derives socket limits from this value since 0.16.15; see table in + # https://github.com/rakshasa/rtorrent/wiki/Socket-Manager-and-Resource-Allocation + LimitNOFILE = lib.mkDefault 16384; + CapabilityBoundingSet = [ "" ]; LockPersonality = true; NoNewPrivileges = true; diff --git a/nixos/modules/services/ttys/getty.nix b/nixos/modules/services/ttys/getty.nix index 35759716e08b..693716e738d7 100644 --- a/nixos/modules/services/ttys/getty.nix +++ b/nixos/modules/services/ttys/getty.nix @@ -76,6 +76,24 @@ in ''; }; + enable = mkOption { + type = types.bool; + default = true; + description = '' + Include getty in the system. + + getty is quiescent until called into action and does not have + runtime costs if it is not used. The benefit of disabling it is + in reducing closure size. + + Disabling getty means that console login may not be possible, + `machinectl shell` and `login` may not work, and other ills. + It is only recommended for lights-out, headless containers, + appliances, and similar configurations not meant for any human + interaction ever. + ''; + }; + loginProgram = mkOption { type = types.path; default = "${pkgs.shadow}/bin/login"; @@ -133,7 +151,7 @@ in ###### implementation - config = mkIf config.console.enable { + config = mkIf cfg.enable { # Note: this is set here rather than up there so that changing # nixos.label would not rebuild manual pages services.getty.greetingLine = mkDefault ''<<< Welcome to ${config.system.nixos.distroName} ${config.system.nixos.label} (\m) - \l >>>''; diff --git a/nixos/modules/services/ttys/kmscon.nix b/nixos/modules/services/ttys/kmscon.nix index 931fac1123c6..c52434c46a11 100644 --- a/nixos/modules/services/ttys/kmscon.nix +++ b/nixos/modules/services/ttys/kmscon.nix @@ -214,7 +214,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; session = utils.pam.autoOrderRules [ @@ -230,7 +230,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "systemd"; diff --git a/nixos/modules/services/video/wivrn.nix b/nixos/modules/services/video/wivrn.nix index 0515d93d71cb..82e356d419d4 100644 --- a/nixos/modules/services/video/wivrn.nix +++ b/nixos/modules/services/video/wivrn.nix @@ -24,6 +24,7 @@ let getExe types maintainers + makeBinPath ; cfg = config.services.wivrn; configFormat = pkgs.formats.json { }; @@ -63,13 +64,24 @@ let enabledConfig = optionalString cfg.config.enable "-f ${configFile}"; # Manage server executables and flags - serverExec = concatStringsSep " " ( + serverCmdline = concatStringsSep " " ( [ serverPackageExe enabledConfig ] ++ cfg.extraServerFlags ); + serverExec = + if cfg.steam.enable then + lib.getExe ( + pkgs.writeShellScriptBin "start-wivrn-server" '' + # The server needs Steam in PATH to open Steam games from the application launcher + export PATH="${makeBinPath [ cfg.steam.package ]}:$PATH" + exec -a wivrn-server ${serverCmdline} + '' + ) + else + serverCmdline; in { imports = [ @@ -184,6 +196,13 @@ in IPC_EXIT_ON_DISCONNECT = "off"; PRESSURE_VESSEL_IMPORT_OPENXR_1_RUNTIMES = mkIf cfg.steam.importOXRRuntimes "1"; } cfg.monadoEnvironment; + # WiVRn scans for .desktop files in $XDG_DATA_DIRS for the application launcher, + # which will execute the command in Exec when selected in the headset. If the + # Exec path isn't absolute, it will be resolved relative to $PATH, so we must + # not override the value of $PATH. + enableDefaultPath = false; + + unitConfig.ConditionUser = "!@system"; serviceConfig = ( if cfg.highPriority then { @@ -211,8 +230,6 @@ in RestrictSUIDSGID = true; } ); - # Needs Steam in the PATH to allow launching games from the headset - path = mkIf cfg.steam.enable [ cfg.steam.package ]; wantedBy = mkIf cfg.autoStart [ "default.target" ]; restartTriggers = [ cfg.package diff --git a/nixos/modules/services/wayland/cage.nix b/nixos/modules/services/wayland/cage.nix index 006520ea9b63..a084de9b7383 100644 --- a/nixos/modules/services/wayland/cage.nix +++ b/nixos/modules/services/wayland/cage.nix @@ -113,7 +113,7 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; } ]; @@ -121,14 +121,14 @@ in { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; session = utils.pam.autoOrderRules [ { name = "unix"; control = "required"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } { name = "env"; diff --git a/nixos/modules/services/web-apps/agorakit.nix b/nixos/modules/services/web-apps/agorakit.nix index 84bda144718f..24bce060da33 100644 --- a/nixos/modules/services/web-apps/agorakit.nix +++ b/nixos/modules/services/web-apps/agorakit.nix @@ -272,15 +272,15 @@ in Agorakit configuration options to set in the .env file. - Refer to + Refer to for details on supported values. Settings containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting .env file, the - OIDC_CLIENT_SECRET key will be set to the + `OIDC_CLIENT_SECRET` key will be set to the contents of the /run/keys/oidc_secret file. ''; diff --git a/nixos/modules/services/web-apps/akkoma.md b/nixos/modules/services/web-apps/akkoma.md index 7f07f2c73df8..c8419fe94ecc 100644 --- a/nixos/modules/services/web-apps/akkoma.md +++ b/nixos/modules/services/web-apps/akkoma.md @@ -27,7 +27,7 @@ be run behind a HTTP proxy on `fediverse.example.com`. name = "My Akkoma instance"; description = "More detailed description"; email = "admin@example.com"; - registration_open = false; + registrations_open = false; }; "Pleroma.Web.Endpoint" = { @@ -221,17 +221,28 @@ of the fediverse and providing a pleasant experience to the users of an instance ":mrf_simple" = { # Tag all media as sensitive - media_nsfw = mkMap { "nsfw.weird.kinky" = "Untagged NSFW content"; }; + media_nsfw = map mkTuple [ + [ + "nsfw.weird.kinky" + "Untagged NSFW content" + ] + ]; # Reject all activities except deletes - reject = mkMap { - "kiwifarms.cc" = "Persistent harassment of users, no moderation"; - }; + reject = map mkTuple [ + [ + "kiwifarms.cc" + "Persistent harassment of users, no moderation" + ] + ]; # Force posts to be visible by followers only - followers_only = mkMap { - "beta.birdsite.live" = "Avoid polluting timelines with Twitter posts"; - }; + followers_only = map mkTuple [ + [ + "beta.birdsite.live" + "Avoid polluting timelines with Twitter posts" + ] + ]; }; }; } diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix index 0a0925856e71..8359809fa010 100644 --- a/nixos/modules/services/web-apps/alps.nix +++ b/nixos/modules/services/web-apps/alps.nix @@ -1,151 +1,108 @@ { + config, lib, pkgs, - config, + utils, ... }: - -with lib; - let cfg = config.services.alps; in { + imports = [ + (lib.mkRemovedOptionModule [ "services" "alps" "port" ] '' + Use `services.alps.settings.server.addr` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "bindIP" ] '' + Use `services.alps.settings.server.addr` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "theme" ] '' + Themes are no longer customizable. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "imaps" "port" ] '' + Use `services.alps.settings.provider.imap.server` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "imaps" "host" ] '' + Use `services.alps.settings.provider.imap.server` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "smtps" "port" ] '' + Use `services.alps.settings.smtp.server` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "smtps" "host" ] '' + Use `services.alps.settings.smtp.server` instead. + '') + (lib.mkRemovedOptionModule [ "services" "alps" "args" ] '' + Use `services.alps.settings` instead. + '') + ]; + options.services.alps = { - enable = mkEnableOption "alps"; + enable = lib.mkEnableOption "alps"; + package = lib.mkPackageOption pkgs "alps" { }; - port = mkOption { - type = types.port; - default = 1323; + settings = lib.mkOption { description = '' - TCP port the service should listen on. + The ALPS configuration, see for documentation. + + Options containing secret data should be set to an attribute set + containing the attribute `_secret` - a string pointing to a file + containing the value the option should be set to. ''; - }; - - bindIP = mkOption { - default = "[::]"; - type = types.str; - description = '' - The IP the service should listen on. - ''; - }; - - theme = mkOption { - type = types.enum [ - "alps" - "sourcehut" - ]; - default = "sourcehut"; - description = '' - The frontend's theme to use. - ''; - }; - - imaps = { - port = mkOption { - type = types.port; - default = 993; - description = '' - The IMAPS server port. - ''; + default = { }; + type = lib.types.submodule { + freeformType = lib.types.toml; + options = { }; }; - - host = mkOption { - type = types.str; - default = "[::1]"; - example = "mail.example.org"; - description = '' - The IMAPS server address. - ''; - }; - }; - - smtps = { - port = mkOption { - type = types.port; - default = 465; - description = '' - The SMTPS server port. - ''; - }; - - host = mkOption { - type = types.str; - default = cfg.imaps.host; - defaultText = "services.alps.imaps.host"; - example = "mail.example.org"; - description = '' - The SMTPS server address. - ''; - }; - }; - - package = mkOption { - internal = true; - type = types.package; - default = pkgs.alps; - }; - - args = mkOption { - internal = true; - type = types.listOf types.str; - default = [ - "-addr" - "${cfg.bindIP}:${toString cfg.port}" - "-theme" - "${cfg.theme}" - "imaps://${cfg.imaps.host}:${toString cfg.imaps.port}" - "smtps://${cfg.smtps.host}:${toString cfg.smtps.port}" - ]; }; }; - config = mkIf cfg.enable { + config = lib.mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + systemd.services.alps = { - description = "alps is a simple and extensible webmail."; - documentation = [ "https://git.sr.ht/~migadu/alps" ]; wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ - "network.target" - "network-online.target" - ]; serviceConfig = { - ExecStart = "${cfg.package}/bin/alps ${escapeShellArgs cfg.args}"; - AmbientCapabilities = ""; - CapabilityBoundingSet = ""; DynamicUser = true; + RuntimeDirectory = "alps"; + ExecStartPre = + let + script = pkgs.writeShellScript "alps-pre-start" '' + ${utils.genJqSecretsReplacementSnippet cfg.settings "/run/alps/config.json"} + ${lib.getExe pkgs.remarshal} -f json -t toml /run/alps/config.json /run/alps/config.toml + chown --reference=/run/alps /run/alps/config.json /run/alps/config.toml + ''; + in + "+${script}"; + ExecStart = [ + "" + "${lib.getExe cfg.package} -config \${RUNTIME_DIRECTORY}/config.toml" + ]; + LockPersonality = true; MemoryDenyWriteExecute = true; - NoNewPrivileges = true; PrivateDevices = true; PrivateIPC = true; - PrivateTmp = true; PrivateUsers = true; + ProcSubset = "pid"; ProtectClock = true; ProtectControlGroups = true; - ProtectHome = true; ProtectHostname = true; ProtectKernelLogs = true; ProtectKernelModules = true; ProtectKernelTunables = true; ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; RestrictAddressFamilies = [ "AF_INET" "AF_INET6" ]; RestrictNamespaces = true; RestrictRealtime = true; - RestrictSUIDSGID = true; - SocketBindAllow = cfg.port; - SocketBindDeny = "any"; - SystemCallArchitectures = "native"; + SystemCallArchitectures = [ "native" ]; SystemCallFilter = [ "@system-service" - "~@privileged @obsolete" + "~@privileged" + "~@resources" ]; }; }; diff --git a/nixos/modules/services/web-apps/bentopdf.nix b/nixos/modules/services/web-apps/bentopdf.nix index bf03beccc938..5281bf4efdcf 100644 --- a/nixos/modules/services/web-apps/bentopdf.nix +++ b/nixos/modules/services/web-apps/bentopdf.nix @@ -60,7 +60,7 @@ in services.nginx = lib.mkIf cfg.nginx.enable { enable = lib.mkDefault true; virtualHosts."${cfg.domain}" = lib.mkMerge [ - cfg.nginx.virtualHost + (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.nginx.virtualHost) { root = lib.mkForce "${cfg.package}"; @@ -82,7 +82,7 @@ in services.caddy = lib.mkIf cfg.caddy.enable { enable = lib.mkDefault true; virtualHosts."${cfg.domain}" = lib.mkMerge [ - cfg.caddy.virtualHost + (lib.mapAttrsRecursive (_: lib.mkDefault) cfg.caddy.virtualHost) { hostName = lib.mkForce cfg.domain; extraConfig = '' diff --git a/nixos/modules/services/web-apps/chhoto-url.nix b/nixos/modules/services/web-apps/chhoto-url.nix index 8b6df98dc53e..54cb6bd81e00 100644 --- a/nixos/modules/services/web-apps/chhoto-url.nix +++ b/nixos/modules/services/web-apps/chhoto-url.nix @@ -30,7 +30,7 @@ in settings = lib.mkOption { description = '' Configuration of Chhoto URL. - See for a list of options. + See for a list of options. ''; example = { port = 4567; @@ -152,7 +152,7 @@ in description = '' Files to load environment variables from in addition to [](#opt-services.chhoto-url.settings). This is useful to avoid putting secrets into the nix store. - See for a list of options. + See for a list of options. ''; }; }; diff --git a/nixos/modules/services/web-apps/cloudlog.nix b/nixos/modules/services/web-apps/cloudlog.nix index bafe5420d7f7..8b750aaacfc5 100644 --- a/nixos/modules/services/web-apps/cloudlog.nix +++ b/nixos/modules/services/web-apps/cloudlog.nix @@ -62,17 +62,14 @@ let ln -s ${configFile} $out/application/config/config.php ln -s ${dbFile} $out/application/config/database.php + # make a copy of the original assets/json to prime the datadir + cp -a "$out/assets/json/" "$out/assets/json.original/" + # link writable directories - for directory in updates uploads backup logbook; do + for directory in updates uploads backup logbook assets/qslcard images/eqsl_card_images assets/sstvimages assets/json; do rm -rf $out/$directory ln -s ${cfg.dataDir}/$directory $out/$directory done - - # link writable asset files - for asset in dok sota wwff; do - rm -rf $out/assets/json/$asset.txt - ln -s ${cfg.dataDir}/assets/json/$asset.txt $out/assets/json/$asset.txt - done ''; }; in @@ -503,13 +500,26 @@ in group = config.services.nginx.group; in [ - "d ${cfg.dataDir} 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/updates 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/uploads 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/backup 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/logbook 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/assets/json 0750 ${cfg.user} ${group} - -" - "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir} 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/updates 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/uploads 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/backup 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/logbook 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/json 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/qslcard 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/assets/sstvimages 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/images 0750 ${cfg.user} ${group} - -" + "d ${cfg.dataDir}/images/eqsl_card_images 0750 ${cfg.user} ${group} - -" + "C ${cfg.dataDir}/assets/json/dok.txt 0640 ${cfg.user} ${group} - ${package}/assets/json.original/dok.txt" + "C ${cfg.dataDir}/assets/json/pota.txt 0640 ${cfg.user} ${group} - ${package}/assets/json.original/pota.txt" + "C ${cfg.dataDir}/assets/json/satellite_data.json 0640 ${cfg.user} ${group} - ${package}/assets/json.original/satellite_data.json" + "C ${cfg.dataDir}/assets/json/sota.txt 0640 ${cfg.user} ${group} - ${package}/assets/json.original/sota.txt" + "C ${cfg.dataDir}/assets/json/US_counties.csv 0640 ${cfg.user} ${group} - ${package}/assets/json.original/US_counties.csv" + "C ${cfg.dataDir}/assets/json/us_national_parksontheair.csv 0640 ${cfg.user} ${group} - ${package}/assets/json.original/us_national_parksontheair.csv" + "C ${cfg.dataDir}/assets/json/WABSquares.geojson 0640 ${cfg.user} ${group} - ${package}/assets/json.original/WABSquares.geojson" + "C ${cfg.dataDir}/assets/json/wwff.txt 0640 ${cfg.user} ${group} - ${package}/assets/json.original/wwff.txt" + "C+ ${cfg.dataDir}/assets/json/datatables_languages 0750 ${cfg.user} ${group} - ${package}/assets/json.original/datatables_languages" ]; }; diff --git a/nixos/modules/services/web-apps/davis.nix b/nixos/modules/services/web-apps/davis.nix index feb13b8bf87c..6a596f56d1b5 100644 --- a/nixos/modules/services/web-apps/davis.nix +++ b/nixos/modules/services/web-apps/davis.nix @@ -189,7 +189,7 @@ in name = lib.mkOption { type = lib.types.nullOr lib.types.str; default = "davis"; - description = "Database name, only used when the databse is created locally."; + description = "Database name, only used when the database is created locally."; }; createLocally = lib.mkOption { type = lib.types.bool; diff --git a/nixos/modules/services/web-apps/flarum.nix b/nixos/modules/services/web-apps/flarum.nix index c4c05826d8cd..1c7065c910bc 100644 --- a/nixos/modules/services/web-apps/flarum.nix +++ b/nixos/modules/services/web-apps/flarum.nix @@ -10,16 +10,23 @@ with lib; let cfg = config.services.flarum; + # Only placeholders reach the world-readable Nix store; the install + # script substitutes the real secrets at runtime. flarumInstallConfig = pkgs.writeText "config.json" ( builtins.toJSON { debug = false; offline = false; baseUrl = cfg.baseUrl; - databaseConfiguration = cfg.database; + databaseConfiguration = + cfg.database + // optionalAttrs (cfg.databasePasswordFile != null) { + password = "@databasePassword@"; + }; adminUser = { username = cfg.adminUser; - password = cfg.initialAdminPassword; + password = + if cfg.initialAdminPasswordFile != null then "@adminPassword@" else cfg.initialAdminPassword; email = cfg.adminEmail; }; settings = { @@ -69,7 +76,26 @@ in initialAdminPassword = mkOption { type = types.str; default = "flarum"; - description = "Initial password for the adminUser"; + description = '' + Initial password for the adminUser. + + WARNING: This is stored world-readable in the Nix store. + Use {option}`initialAdminPasswordFile` instead. + ''; + }; + + initialAdminPasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/flarum-admin-password"; + description = '' + File containing the initial password for adminUser. + Must be readable by the flarum user. + Takes precedence over {option}`initialAdminPassword`. + + The password must not contain `"` or `\` characters, as it is + substituted into a JSON installation config verbatim. + ''; }; user = mkOption { @@ -98,7 +124,12 @@ in bool int ]); - description = "MySQL database parameters"; + description = '' + MySQL database parameters. + + WARNING: A `password` set here is stored world-readable in the + Nix store. Use {option}`databasePasswordFile` instead. + ''; default = { # the database driver; i.e. MySQL; MariaDB... driver = "mysql"; @@ -118,6 +149,20 @@ in }; }; + databasePasswordFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/flarum-db-password"; + description = '' + File containing the database password. + Must be readable by the flarum user. + Takes precedence over `database.password`. + + The password must not contain `"` or `\` characters, as it is + substituted into a JSON installation config verbatim. + ''; + }; + createDatabaseLocally = mkOption { type = types.bool; default = false; @@ -210,6 +255,8 @@ in Type = "oneshot"; User = cfg.user; Group = cfg.group; + # The secret-filled install config is staged in /tmp + PrivateTmp = true; }; path = [ config.services.phpfpm.phpPackage ]; script = '' @@ -222,7 +269,18 @@ in '' + optionalString (cfg.createDatabaseLocally && cfg.database.driver == "mysql") '' if [ ! -f config.php ]; then - php flarum install --file=${flarumInstallConfig} + install -m 0600 ${flarumInstallConfig} /tmp/flarum-install.json + ${optionalString (cfg.initialAdminPasswordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@adminPassword@' \ + ${escapeShellArg cfg.initialAdminPasswordFile} /tmp/flarum-install.json + ''} + ${optionalString (cfg.databasePasswordFile != null) '' + ${pkgs.replace-secret}/bin/replace-secret '@databasePassword@' \ + ${escapeShellArg cfg.databasePasswordFile} /tmp/flarum-install.json + ''} + php flarum install --file=/tmp/flarum-install.json + # config.php contains the database password; stateDir is world-readable + chmod 600 config.php fi '' + '' diff --git a/nixos/modules/services/web-apps/freescout.nix b/nixos/modules/services/web-apps/freescout.nix new file mode 100644 index 000000000000..7c1339604c5f --- /dev/null +++ b/nixos/modules/services/web-apps/freescout.nix @@ -0,0 +1,487 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + # Simple alias variables + user = "freescout"; + group = user; + cfg = config.services.freescout; + datadir = "/var/lib/freescout"; + cachedir = "/var/cache/freescout"; + fpmService = "phpfpm-${user}"; + + # Generated config and more complex templates / default variables + autoDb = if !cfg.databaseSetup.enable then false else cfg.databaseSetup.kind; + dbService = lib.optional (autoDb != false) ( + if autoDb == "mysql" then "mysql.service" else "postgresql.service" + ); + db_config = lib.optionalAttrs (autoDb != false) ( + if autoDb == "mysql" then + { + DB_CONNECTION = "mysql"; + DB_HOST = ""; + DB_SOCKET = "/run/mysqld/mysqld.sock"; + DB_USERNAME = user; + DB_DATABASE = user; + } + else + { + DB_CONNECTION = "pgsql"; + DB_HOST = "/run/postgresql"; + DB_DATABASE = user; + DB_USERNAME = user; + } + ); + + raw_config = { + APP_ENV = "production"; + APP_FORCE_HTTPS = true; + APP_URL = "https://${cfg.domain}"; + APP_TIMEZONE = config.time.timeZone; + APP_DISABLE_UPDATING = true; + } + // cfg.settings + // db_config; + app_config = dropNull raw_config; + baseService = { + path = [ + pkgs.ps + artisanWrapped + ]; + requires = [ + # Using requires (instead of wants) since a failing config + # is indeed critical and should not allow this service to continue + "freescout-setup.service" + ] + ++ dbService; + serviceConfig = { + User = user; + Group = group; + }; + }; + + # Custom built packages / files / scripts + phpPackage = cfg.phpPackage.buildEnv { + # As of php8.5 opcache is required and automatically compiled in and thus is not available in + # all anymore. To keep compatibility with older versions, still add if available. + extensions = + { all, enabled }: enabled ++ [ all.iconv ] ++ (lib.optional (all ? opcache) all.opcache); + # Don't log anything because we are not sure, if this may leak secrets + # Logging can be increased, if we have time to check the logging library + extraConfig = '' + error_reporting = 0 + ''; + }; + + package = cfg.package.overrideAttrs (prev: { + pname = "${prev.pname}-${cfg.domain}"; + postInstall = prev.postInstall or "" + '' + ln -s ${datadir} $out/share/freescout/data + ''; + }); + + artisanWrapped = pkgs.writeShellApplication { + name = "artisan-wrapped"; + runtimeInputs = with pkgs; [ + util-linux + ]; + text = '' + cd ${datadir} + _runuser='exec' + if [[ "$USER" != ${user} ]]; then + _runuser='exec runuser --user ${user}' + fi + ''${_runuser} ${lib.getExe phpPackage} ${package}/share/freescout/artisan "$@" + ''; + }; + configFile = mkEnvFile "freescout.env" app_config; + allSecrets = lib.catAttrs "_secret" (lib.collect isSecret app_config); + + configSetupScript = pkgs.writeShellScript "freescout-config-setup" '' + set -o errexit -o pipefail -o nounset -o errtrace + shopt -s inherit_errexit + PATH=${lib.makeBinPath [ pkgs.replace-secret ]}:$PATH + cp ${configFile} "/tmp/raw.env"; + ${mkSecretsReplacement "/tmp/raw.env" allSecrets} + install -T --mode 400 -o ${user} -g ${group} "/tmp/raw.env" "${datadir}/.env" + rm "/tmp/raw.env" + ''; + + freescoutSetupScript = + let + rwPaths = [ + "storage/app" + "storage/framework" + "storage/framework/sessions" + "storage/framework/views" + "storage/framework/cache/data" + "storage/logs" + "bootstrap/cache" + "public/css/builds" + "public/js/builds" + "Modules" + "public/modules" + ]; + in + '' + set -x + umask 027 + # Working arround https://github.com/freescout-helpdesk/freescout/issues/2547 + # and having to manually clear cache when migrating from something around + # ~1.8.159 (╯°□°)╯︵ ┻━┻ + # See: https://github.com/freescout-help-desk/freescout/issues/4366#issuecomment-2495993397 + rm -f ${datadir}/bootstrap/cache.php ${datadir}/bootstrap/cache/{config,packages,services}.php + + ln -sf "${artisanWrapped}/bin/artisan-wrapped" "${datadir}/artisan" + ${lib.concatMapStringsSep "\n" (p: "mkdir -p ${datadir}/${p}") rwPaths} + + # Migrate database and stuff + # This does migrate, cache:clear, queue:restart + ${lib.getExe artisanWrapped} freescout:after-app-update + ''; + + # Helper functions + isSecret = v: lib.isAttrs v && v ? _secret && lib.strings.isConvertibleWithToString v._secret; + hashSecret = p: builtins.hashString "sha256" (toString p); + dropNull = lib.filterAttrsRecursive ( + _: v: + !lib.elem v [ + null + [ ] + { } + ] + ); + mkEnvVars = lib.generators.toKeyValue { + mkKeyValue = + k: v: + let + value = + with builtins; + if isInt v then + toString v + else if isString v then + v + else if isBool v then + lib.boolToString v + else if isSecret v then + hashSecret v._secret + else + throw "freescout: ${k} has unsupported type ${typeOf v}: ${(lib.generators.toPretty { }) v}"; + in + "${k}=${value}"; + }; + mkEnvFile = fname: values: pkgs.writeText fname (mkEnvVars values); + mkSecretsReplacement = + filePath: + lib.concatMapStringsSep "\n" ( + sp: + "replace-secret ${ + lib.escapeShellArgs [ + (hashSecret sp) + sp + ] + } ${filePath}" + ); +in +{ + options.services.freescout = with lib; { + enable = mkEnableOption "FreeScout helpdesk application"; + + package = mkPackageOption pkgs "freescout" { }; + + phpPackage = mkOption { + type = types.package; + default = pkgs.php; + description = "The php package to use"; + defaultText = literalExpression "pkgs.php"; + }; + + domain = mkOption { + type = types.str; + description = "Domain the freescout installation will run under"; + example = "support.mydomain.net"; + }; + + settings = mkOption { + type = with types; attrsOf anything; + apply = mapAttrs' ( + k: v: { + name = toUpper k; + value = v; + } + ); + default = { }; + description = '' + Settings to be set in the `.env` file. See + + for reference on available environment variables. + + Will be merged with the shown defaults. + ''; + defaultText = lib.literalExpression '' + { + APP_ENV = "production"; + APP_FORCE_HTTPS = true; + APP_URL = "https://''${config.services.freescout.domain}"; + APP_TIMEZONE = config.time.timeZone; + APP_DISABLE_UPDATING = true; + } + ''; + example = lib.literalExpression '' + { + # NOTE: MUST be 256 bits (32 bytes) in length, the form of base64: is recommended. + # You can generate a valid one using `echo "base64:$(openssl rand -base64 32)"` + APP_KEY_FILE = "/run/secret/freescout/app_key"; + DB_CONNECTION = "mysql"; + DB_HOST = "localhost"; + DB_PORT = 3306; + DB_DATABASE = "freescout"; + DB_USERNAME = "freescout"; + DB_PASSWORD._secret = "/run/secret/freescout/db_pass"; + } + ''; + }; + + poolConfig = mkOption { + type = + with types; + attrsOf (oneOf [ + str + int + bool + ]); + default = { + "pm" = "ondemand"; + "pm.max_children" = 32; + "pm.process_idle_timeout" = "120s"; + "pm.max_requests" = 500; + }; + description = '' + Options for the freescout PHP pool. See the documentation on `php-fpm.conf` + for details on configuration directives. + ''; + }; + + databaseSetup = { + enable = mkOption { + type = types.bool; + description = "Whether to enable automatic database setup and configuration"; + default = true; + }; + + kind = mkOption { + type = types.enum [ + "mysql" + "pgsql" + ]; + default = "pgsql"; + example = "mysql"; + description = "Type of database to automatically set up"; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = (app_config ? "APP_KEY" || app_config ? "APP_KEY_FILE"); + message = "`services.freescout.settings.APP_KEY_FILE` is required!"; + } + ]; + + warnings = + lib.optional (app_config ? "APP_KEY" && lib.isString app_config.APP_KEY) + "`services.freescout.settings.APP_KEY` will be stored in the world readable nix store. Use `APP_KEY._secret` or `APP_KEY_FILE` instead!"; + + users.users.${user} = { + inherit group; + isSystemUser = true; + createHome = true; + home = datadir; + homeMode = "750"; + }; + users.users.${config.services.nginx.user}.extraGroups = [ group ]; + users.groups.${group} = { }; + + services.postgresql = lib.mkIf (autoDb == "pgsql") { + enable = true; + ensureUsers = [ + { + name = user; + ensureDBOwnership = true; + } + ]; + ensureDatabases = [ + app_config.DB_DATABASE + ]; + }; + + services.mysql = lib.mkIf (autoDb == "mysql") { + enable = true; + package = lib.mkDefault pkgs.mariadb; + ensureUsers = [ + { + name = user; + ensurePermissions = { + "${app_config.DB_DATABASE}.*" = "ALL PRIVILEGES"; + }; + } + ]; + ensureDatabases = [ + app_config.DB_DATABASE + ]; + }; + + services.phpfpm.pools.${user} = { + inherit phpPackage user group; + + phpOptions = '' + display_errors = On + display_startup_errors = On + ''; + settings = { + "listen.owner" = user; + "listen.group" = config.services.nginx.group; + "catch_workers_output" = true; + } + // cfg.poolConfig; + }; + + systemd.services.${fpmService} = { + # Somehow the webinterface shows + inherit (baseService) path; + }; + + systemd.services.freescout-setup = lib.recursiveUpdate baseService { + description = "Preparational tasks for freescout"; + requires = dbService; + wantedBy = [ "multi-user.target" ]; + after = dbService; + script = freescoutSetupScript; + serviceConfig = { + PrivateTmp = true; + Type = "oneshot"; + RemainAfterExit = true; + ExecStartPre = "+${configSetupScript}"; + }; + }; + + # This needs to be manually started again and again + # Freescout has its own scheduler built in to ensure tasks run at the desired frequency + # --no-interaction makes sure, that the queue worker is not executed. + # This is needed, because otherweise the queue worker process would continue running + # thus block further schedule invocations until the queue worker terminates. + # See https://github.com/freescout-help-desk/freescout/blob/74fa4b7d4f8288f8d3fb1d343308d3289c4d72e2/app/Console/Kernel.php#L195-L267 + systemd.services."freescout-schedule-run" = baseService // { + startAt = "minutely"; + script = "${lib.getExe artisanWrapped} schedule:run --no-interaction"; + }; + + # This is both long-running but also stops quite frequently. + # Seeing job restart counts in the thousands here is normal. + systemd.services."freescout-queue" = lib.recursiveUpdate baseService { + # Copying the output to storage/logs because it makes + # debugging connection issues easier for the user. + script = '' + ${lib.getExe artisanWrapped} \ + queue:work \ + --queue emails,default \ + --sleep=5 \ + -vv \ + --tries=20 \ + | tee -a ${datadir}/storage/logs/queue-jobs.log + ''; + serviceConfig = { + RestartSec = "15s"; + RuntimeMaxSec = "1h"; + Restart = "always"; + }; + wantedBy = [ "multi-user.target" ]; + after = [ "freescout-setup.service" ] ++ dbService; + }; + + services.nginx = { + enable = true; + virtualHosts.${cfg.domain} = + let + vhostCfg = config.services.nginx.virtualHosts.${cfg.domain}; + optSsl = lib.optionalString (vhostCfg.forceSSL || vhostCfg.onlySSL) "fastcgi_param HTTPS on;"; + in + { + root = lib.mkForce "${package}/share/freescout/public"; + + locations = { + "/" = { + index = "index.php"; + tryFiles = "$uri $uri/ /index.php$is_args$args"; + + extraConfig = '' + # Defeats E-Mail open tracking or possibly "real" exploits + add_header X-XSS-Protection "1; mode=block" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "no-referrer-when-downgrade" always; + add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"; + ''; + }; + + "~ \\.php$" = { + tryFiles = "$uri $uri/ =404"; + extraConfig = '' + fastcgi_index index.php; + include ${pkgs.nginx}/conf/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name; + fastcgi_pass unix:${config.services.phpfpm.pools.${user}.socket}; + ${optSsl} + + # Defeats E-Mail open tracking or possibly "real" exploits + add_header X-XSS-Protection "1; mode=block" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "no-referrer-when-downgrade" always; + add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"; + ''; + }; + + "~* ^/storage/attachment/" = { + tryFiles = "$uri $uri/ /index.php?$query_string"; + extraConfig = '' + expires 1M; + access_log off; + ''; + }; + + "~* ^/(?:css|js)/.*\\.(?:css|js)$".extraConfig = '' + expires 2d; + access_log off; + add_header Cache-Control "public, must-revalidate"; + # Defeats E-Mail open tracking or possibly "real" exploits + add_header X-XSS-Protection "1; mode=block" always; + add_header X-Content-Type-Options "nosniff" always; + add_header Referrer-Policy "no-referrer-when-downgrade" always; + add_header Content-Security-Policy "default-src 'self'; style-src 'self' 'unsafe-inline'; script-src 'self' 'unsafe-inline'"; + ''; + + "~* ^/(?:css|fonts|img|installer|js|modules)$".extraConfig = '' + expires 1M; + access_log off; + add_header Cache-Control "public, must-revalidate"; + ''; + + "~ /\\.".extraConfig = '' + deny all; + ''; + "^~ /(css|js)/builds/".root = "${cachedir}/public/"; + "^~ /storage/app/attachment/" = { + alias = "${datadir}/storage/app/attachment/"; + extraConfig = '' + internal; + ''; + }; + }; + }; + }; + }; +} diff --git a/nixos/modules/services/web-apps/geoserver.nix b/nixos/modules/services/web-apps/geoserver.nix new file mode 100644 index 000000000000..578c6d69c9bc --- /dev/null +++ b/nixos/modules/services/web-apps/geoserver.nix @@ -0,0 +1,81 @@ +{ + config, + lib, + pkgs, + ... +}: + +with lib; + +let + + cfg = config.services.geoserver; + +in +{ + options = { + services.geoserver = { + enable = mkEnableOption "Geoserver service"; + + package = lib.mkPackageOption pkgs "geoserver" { }; + + user = mkOption { + type = types.str; + default = "geoserver"; + description = "The (system) user that will run the service."; + }; + + group = mkOption { + type = types.str; + default = "geoserver"; + description = "The user's group."; + }; + + jvmOpts = mkOption { + type = types.lines; + default = ""; + description = "Any options passed to the JVM via the `JAVA_OPTS` environment variable. See [startup.sh](https://github.com/geoserver/geoserver/blob/main/src/release/bin/startup.sh) for details."; + }; + + jettyOpts = mkOption { + type = types.lines; + default = ""; + example = "jetty.http.port=1234"; + description = "Any options passed to the Jetty web server via the `JETTY_OPTS` environment variable. See [startup.sh](https://github.com/geoserver/geoserver/blob/main/src/release/bin/startup.sh) for details."; + }; + }; + }; + + config = mkIf cfg.enable { + + users.users."${cfg.user}" = { + group = cfg.group; + isSystemUser = true; + }; + users.groups."${cfg.group}" = { }; + + systemd.services.geoserver = { + description = "Geoserver"; + + wantedBy = [ "multi-user.target" ]; + + environment = { + GEOSERVER_HOME = "${cfg.package}/share/geoserver"; + GEOSERVER_DATA_DIR = "/var/lib/geoserver"; + JAVA_OPTS = "${cfg.jvmOpts}"; + JETTY_OPTS = "${cfg.jettyOpts}"; + }; + + serviceConfig = { + ExecStart = "${cfg.package}/bin/geoserver-startup"; + User = cfg.user; + Group = cfg.group; + NoNewPrivileges = true; + ProtectHome = true; # true=deny access to /home, /root, /run/user + StateDirectory = "geoserver"; + }; + }; + }; + + meta.teams = [ lib.teams.geospatial ]; +} diff --git a/nixos/modules/services/web-apps/hatsu.nix b/nixos/modules/services/web-apps/hatsu.nix index 093ae150cfdc..fb83dfa8bc03 100644 --- a/nixos/modules/services/web-apps/hatsu.nix +++ b/nixos/modules/services/web-apps/hatsu.nix @@ -66,7 +66,7 @@ in description = '' Configuration for Hatsu, see - + for supported values. ''; }; diff --git a/nixos/modules/services/web-apps/homer.nix b/nixos/modules/services/web-apps/homer.nix index e34e43435d12..a89f51dd832d 100644 --- a/nixos/modules/services/web-apps/homer.nix +++ b/nixos/modules/services/web-apps/homer.nix @@ -169,11 +169,25 @@ in enable = true; virtualHosts."${cfg.virtualHost.domain}".extraConfig = '' root * ${cfg.package} - file_server + encode zstd gzip + + @immutable path /resources/* + header @immutable Cache-Control "public, max-age=31536000, immutable" + + @html not path /resources/* + header @html Cache-Control "no-store" + + header { + -ETag + -Last-Modified + } + handle_path /assets/config.yml { root * ${configFile} file_server } + + file_server ''; }; }; diff --git a/nixos/modules/services/web-apps/immichframe.nix b/nixos/modules/services/web-apps/immichframe.nix index cbe7d57bab7b..fb3257f80594 100644 --- a/nixos/modules/services/web-apps/immichframe.nix +++ b/nixos/modules/services/web-apps/immichframe.nix @@ -134,6 +134,40 @@ in Type = "simple"; Restart = "on-failure"; RestartSec = 3; + + # systemd hardening, based on jellyfin (also .NET) but stricter + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = !config.boot.isContainer; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = !config.boot.isContainer; + ProtectKernelTunables = !config.boot.isContainer; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + # no AF_NETLINK here since there's no network connection monitoring + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = !config.boot.isContainer; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + ]; + UMask = "0077"; }; }; }; diff --git a/nixos/modules/services/web-apps/isso.nix b/nixos/modules/services/web-apps/isso.nix index 87804b7ea7cf..97076eaba37c 100644 --- a/nixos/modules/services/web-apps/isso.nix +++ b/nixos/modules/services/web-apps/isso.nix @@ -37,6 +37,8 @@ in See [Isso Server Configuration](https://posativ.org/isso/docs/configuration/server/) for supported values. + You can set secrets using the secretFile option with environment variables following + [the documentation](https://isso-comments.de/docs/reference/server-config/#environment-variables). ''; type = types.submodule { @@ -51,6 +53,16 @@ in } ''; }; + + secretFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + A file containing secrets as environment variables that will be used in the configuration. + See [the documentation](https://isso-comments.de/docs/reference/server-config/#environment-variables) for details. + ''; + example = "/run/secrets/isso.env"; + }; }; }; @@ -65,6 +77,8 @@ in User = "isso"; Group = "isso"; + EnvironmentFile = mkIf (cfg.secretFile != null) [ cfg.secretFile ]; + DynamicUser = true; StateDirectory = "isso"; diff --git a/nixos/modules/services/web-apps/jitsi-meet.nix b/nixos/modules/services/web-apps/jitsi-meet.nix index 18da068fa5c6..b7da3b47371e 100644 --- a/nixos/modules/services/web-apps/jitsi-meet.nix +++ b/nixos/modules/services/web-apps/jitsi-meet.nix @@ -651,19 +651,17 @@ in }; }; - services.jitsi-meet.config = - recursiveUpdate - (mkIf cfg.excalidraw.enable { - whiteboard = { - enabled = true; - collabServerBaseUrl = "https://${cfg.hostName}"; - }; - }) - ( - mkIf cfg.secureDomain.enable { - hosts.anonymousdomain = "guest.${cfg.hostName}"; - } - ); + services.jitsi-meet.config = mkMerge [ + (mkIf cfg.excalidraw.enable { + whiteboard = { + enabled = true; + collabServerBaseUrl = "https://${cfg.hostName}"; + }; + }) + (mkIf cfg.secureDomain.enable { + hosts.anonymousdomain = "guest.${cfg.hostName}"; + }) + ]; services.jitsi-videobridge = mkIf cfg.videobridge.enable { enable = true; diff --git a/nixos/modules/services/web-apps/koito.nix b/nixos/modules/services/web-apps/koito.nix new file mode 100644 index 000000000000..f4b78770aed5 --- /dev/null +++ b/nixos/modules/services/web-apps/koito.nix @@ -0,0 +1,140 @@ +{ + lib, + config, + pkgs, + ... +}: +let + cfg = config.services.koito; + + inherit (lib) + getExe + mkEnableOption + mkIf + mkOption + mkPackageOption + types + ; +in +{ + options.services.koito = { + enable = mkEnableOption "koito"; + + package = mkPackageOption pkgs "koito" { }; + + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Open the appropriate ports in the firewall for Koito."; + }; + + environment = mkOption { + type = types.submodule { + freeformType = types.attrsOf types.str; + options = { + KOITO_BIND_ADDR = mkOption { + type = types.str; + default = "127.0.0.1"; + example = "0.0.0.0"; + description = "The IP address to bind the Koito server to."; + }; + KOITO_LISTEN_PORT = mkOption { + type = types.port; + default = 4110; + description = "TCP port for the Koito server."; + }; + KOITO_CONFIG_DIR = mkOption { + type = types.path; + default = "/var/lib/koito"; + description = "Directory for Koito import folders and image caches."; + }; + }; + }; + default = { }; + example = { + KOITO_DEFAULT_THEME = "black"; + KOITO_LOGIN_GATE = "true"; + }; + description = '' + Environment variables to pass to the Koito service. + See for available options. + ''; + }; + + environmentFile = mkOption { + type = types.nullOr types.path; + example = "/run/secrets/koito"; + default = null; + description = '' + Path of a file with extra environment variables to be loaded from disk. + This file is not added to the nix store, so it can be used to pass secrets to Koito. + See for available options. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd.services.koito = { + description = "Koito - modern scrobbler"; + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Environment = lib.mapAttrsToList (k: v: "${k}=${if builtins.isInt v then toString v else v}") ( + lib.filterAttrs (_: v: v != null) cfg.environment + ); + DynamicUser = true; + ExecStart = getExe cfg.package; + StateDirectory = "koito"; + EnvironmentFile = cfg.environmentFile; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectControlGroups = true; + ProtectKernelTunables = true; + RestrictSUIDSGID = true; + RemoveIPC = true; + UMask = "0077"; + + CapabilityBoundingSet = [ "" ]; + NoNewPrivileges = true; + + ProtectKernelModules = true; + ProtectKernelLogs = true; + ProtectClock = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + ]; + + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + + PrivateUsers = true; + + LockPersonality = true; + ProtectHostname = true; + RestrictRealtime = true; + RestrictNamespaces = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + DeviceAllow = [ "" ]; + }; + }; + networking.firewall = lib.mkIf cfg.openFirewall { + allowedTCPPorts = [ cfg.environment.KOITO_LISTEN_PORT ]; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ iv-nn ]; + }; +} diff --git a/nixos/modules/services/web-apps/lasuite-meet.nix b/nixos/modules/services/web-apps/lasuite-meet.nix index 421af1596483..9fff0e8a0b7a 100644 --- a/nixos/modules/services/web-apps/lasuite-meet.nix +++ b/nixos/modules/services/web-apps/lasuite-meet.nix @@ -36,48 +36,61 @@ let toString value ) cfg.settings; - commonServiceConfig = { - RuntimeDirectory = "lasuite-meet"; - StateDirectory = "lasuite-meet"; - WorkingDirectory = "/var/lib/lasuite-meet"; + commonSystemdConfig = { + after = [ + "network.target" + ] + ++ (optional cfg.postgresql.createLocally "postgresql.service") + ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); - User = "lasuite-meet"; - DynamicUser = true; - SupplementaryGroups = mkIf cfg.redis.createLocally [ - config.services.redis.servers.lasuite-meet.group - ]; - # hardening - AmbientCapabilities = ""; - CapabilityBoundingSet = [ "" ]; - DevicePolicy = "closed"; - LockPersonality = true; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateTmp = true; - PrivateUsers = true; - ProcSubset = "pid"; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - ProtectProc = "invisible"; - ProtectSystem = "strict"; - RemoveIPC = true; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_UNIX" - ]; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - MemoryDenyWriteExecute = true; - EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; - UMask = "0077"; + wants = + (optional cfg.postgresql.createLocally "postgresql.service") + ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); + + environment = pythonEnvironment; + + serviceConfig = { + StateDirectory = "lasuite-meet"; + WorkingDirectory = "/var/lib/lasuite-meet"; + + User = "lasuite-meet"; + DynamicUser = true; + SupplementaryGroups = mkIf cfg.redis.createLocally [ + config.services.redis.servers.lasuite-meet.group + ]; + # hardening + AmbientCapabilities = ""; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + PrivateUsers = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + MemoryDenyWriteExecute = true; + EnvironmentFile = optional (cfg.environmentFile != null) cfg.environmentFile; + UMask = "0077"; + }; }; in { @@ -342,74 +355,56 @@ in }; config = mkIf cfg.enable { - systemd.services.lasuite-meet = { - description = "Meet from SuiteNumérique"; - after = [ - "network.target" - ] - ++ (optional cfg.postgresql.createLocally "postgresql.service") - ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); + systemd.services.lasuite-meet = lib.mkMerge [ + { + description = "Meet from SuiteNumérique"; - wants = - (optional cfg.postgresql.createLocally "postgresql.service") - ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); + wantedBy = [ "multi-user.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - if [ ! -f .version ]; then - touch .version - fi - - ${optionalString (cfg.secretKeyPath == null) '' - if [[ ! -f /var/lib/lasuite-meet/django_secret_key ]]; then - ( - umask 0377 - tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge /var/lib/lasuite-meet/django_secret_key - ) + preStart = '' + if [ ! -f .version ]; then + touch .version fi - ''} - if [ "${cfg.package.version}" != "$(cat .version)" ]; then - ${getExe cfg.package} migrate - echo -n "${cfg.package.version}" > .version - fi - ''; - environment = pythonEnvironment; + ${optionalString (cfg.secretKeyPath == null) '' + if [[ ! -f /var/lib/lasuite-meet/django_secret_key ]]; then + ( + umask 0377 + tr -dc A-Za-z0-9 < /dev/urandom | head -c64 | ${pkgs.moreutils}/bin/sponge /var/lib/lasuite-meet/django_secret_key + ) + fi + ''} + if [ "${cfg.package.version}" != "$(cat .version)" ]; then + ${getExe cfg.package} migrate + echo -n "${cfg.package.version}" > .version + fi + ''; - serviceConfig = { - BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static"; + serviceConfig = { + # needs to be here so that cronjobs don't nuke it + RuntimeDirectory = "lasuite-meet"; + BindReadOnlyPaths = "${cfg.package}/share/static:/var/lib/lasuite-meet/static"; - ExecStart = utils.escapeSystemdExecArgs ( - [ - (lib.getExe' cfg.package "gunicorn") - "--bind=${cfg.bind}" - ] - ++ cfg.gunicorn.extraArgs - ++ [ "meet.wsgi:application" ] - ); + ExecStart = utils.escapeSystemdExecArgs ( + [ + (lib.getExe' cfg.package "gunicorn") + "--bind=${cfg.bind}" + ] + ++ cfg.gunicorn.extraArgs + ++ [ "meet.wsgi:application" ] + ); + }; } - // commonServiceConfig; - }; + commonSystemdConfig + ]; - systemd.services.lasuite-meet-celery = { - description = "Meet Celery broker from SuiteNumérique"; - after = [ - "network.target" - ] - ++ (optional cfg.postgresql.createLocally "postgresql.service") - ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); + systemd.services.lasuite-meet-celery = lib.mkMerge [ + { + description = "Meet Celery broker from SuiteNumérique"; - wants = - (optional cfg.postgresql.createLocally "postgresql.service") - ++ (optional cfg.redis.createLocally "redis-lasuite-meet.service"); + wantedBy = [ "multi-user.target" ]; - wantedBy = [ "multi-user.target" ]; - - environment = pythonEnvironment; - - serviceConfig = { - ExecStart = utils.escapeSystemdExecArgs ( + serviceConfig.ExecStart = utils.escapeSystemdExecArgs ( [ (lib.getExe' cfg.package "celery") ] ++ cfg.celery.extraArgs ++ [ @@ -418,8 +413,26 @@ in ] ); } - // commonServiceConfig; - }; + commonSystemdConfig + ]; + + systemd.services.lasuite-meet-clean-pending-files = lib.mkMerge [ + { + description = "Scheduled job to clean up pending uploads from LaSuite Meet"; + startAt = "daily"; + serviceConfig.ExecStart = "${getExe cfg.package} clean_pending_files"; + } + commonSystemdConfig + ]; + + systemd.services.lasuite-meet-purge-deleted-files = lib.mkMerge [ + { + description = "Scheduled job to purge deleted files from LaSuite Meet"; + startAt = "daily"; + serviceConfig.ExecStart = "${getExe cfg.package} purge_deleted_files"; + } + commonSystemdConfig + ]; services.postgresql = mkIf cfg.postgresql.createLocally { enable = true; diff --git a/nixos/modules/services/web-apps/lemmy.md b/nixos/modules/services/web-apps/lemmy.md index a3924448ceb5..02696d4601f1 100644 --- a/nixos/modules/services/web-apps/lemmy.md +++ b/nixos/modules/services/web-apps/lemmy.md @@ -1,26 +1,24 @@ # Lemmy {#module-services-lemmy} -Lemmy is a federated alternative to reddit in rust. +Lemmy is a federated alternative to Reddit in Rust. ## Quickstart {#module-services-lemmy-quickstart} -The minimum to start lemmy is +The minimum to start Lemmy is ```nix { services.lemmy = { enable = true; - settings = { - hostname = "lemmy.union.rocks"; - database.createLocally = true; - }; + settings.hostname = "lemmy.union.rocks"; + database.createLocally = true; caddy.enable = true; }; } ``` This will start the backend on port 8536 and the frontend on port 1234. -It will expose your instance with a caddy reverse proxy to the hostname you've provided. +It will expose your instance with a Caddy reverse proxy to the hostname you've provided. Postgres will be initialized on that same instance automatically. ## Usage {#module-services-lemmy-usage} @@ -29,5 +27,4 @@ On first connection you will be asked to define an admin user. ## Missing {#module-services-lemmy-missing} -- Exposing with nginx is not implemented yet. -- This has been tested using a local database with a unix socket connection. Using different database settings will likely require modifications +- This has been tested using a local database with a Unix socket connection. Using different database settings will likely require modifications. diff --git a/nixos/modules/services/web-apps/mediawiki.nix b/nixos/modules/services/web-apps/mediawiki.nix index af1dbcd223a7..b5a3e69209a6 100644 --- a/nixos/modules/services/web-apps/mediawiki.nix +++ b/nixos/modules/services/web-apps/mediawiki.nix @@ -616,7 +616,7 @@ in ++ lib.optional (cfg.database.type != "sqlite" && cfg.database.path != null) '' The services.mediawiki.database.path option will be ignored because services.mediawiki.database.type is not "sqlite". '' - ++ lib.optional (cfg.database.type == "mysql" && cfg.database.tablePrefix != null) '' + ++ lib.optional (cfg.database.type != "mysql" && cfg.database.tablePrefix != null) '' The services.mediawiki.database.tablePrefix option has no effect when the services.mediawiki.database.type is not "mysql". ''; diff --git a/nixos/modules/services/web-apps/monica.nix b/nixos/modules/services/web-apps/monica.nix index 2b0b1976422f..43bc381176db 100644 --- a/nixos/modules/services/web-apps/monica.nix +++ b/nixos/modules/services/web-apps/monica.nix @@ -274,15 +274,15 @@ in monica configuration options to set in the .env file. - Refer to + Refer to for details on supported values. Settings containing secret data should be set to an attribute - set containing the attribute _secret - a + set containing the attribute `_secret` - a string pointing to a file containing the value the option should be set to. See the example to get a better picture of this: in the resulting .env file, the - OIDC_CLIENT_SECRET key will be set to the + `OIDC_CLIENT_SECRET` key will be set to the contents of the /run/keys/oidc_secret file. ''; diff --git a/nixos/modules/services/web-apps/netbox.nix b/nixos/modules/services/web-apps/netbox.nix index 65f761373cda..d74c9c926b80 100644 --- a/nixos/modules/services/web-apps/netbox.nix +++ b/nixos/modules/services/web-apps/netbox.nix @@ -6,118 +6,433 @@ }: let - cfg = config.services.netbox; - pythonFmt = pkgs.formats.pythonVars { }; - staticDir = cfg.dataDir + "/static"; + inherit (lib) + any + attrValues + mkChangedOptionModule + mkEnableOption + mkOption + mkRemovedOptionModule + mkRenamedOptionModule + optionalString + types + ; - settingsFile = pythonFmt.generate "netbox-settings.py" cfg.settings; + cfg = config.services.netbox; + pythonVars = pkgs.formats.pythonVars { }; + + settingsFile = pythonVars.generate "netbox-settings.py" cfg.settings; extraConfigFile = pkgs.writeTextFile { name = "netbox-extraConfig.py"; text = cfg.extraConfig; }; configFile = pkgs.concatText "configuration.py" [ + nixosOptionsConfig settingsFile extraConfigFile ]; + secretKeyFile = + if cfg.secretKeyFile != null then cfg.secretKeyFile else "${cfg.dataDir}/secret.key"; - pkg = - (cfg.package.overrideAttrs (old: { + nixosOptionsConfig = pkgs.writeTextFile { + name = "netbox-nixos-options.py"; + text = '' + with open("${secretKeyFile}", "r") as file: + SECRET_KEY = file.readline() + + API_TOKEN_PEPPERS = { + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (id: file: '' + ${id}: open("${file}", "r").read().strip(), + '') cfg.apiTokenPepperFiles + )} + } + ''; + }; + + enableLDAP = cfg.ldapConfigFile != null; + + finalPackage = + (cfg.package.overrideAttrs (prev: { installPhase = - old.installPhase + prev.installPhase + '' ln -s ${configFile} $out/opt/netbox/netbox/netbox/configuration.py '' - + lib.optionalString cfg.enableLdap '' - ln -s ${cfg.ldapConfigPath} $out/opt/netbox/netbox/netbox/ldap_config.py + + lib.optionalString enableLDAP '' + ln -s ${cfg.ldapConfigFile} $out/opt/netbox/netbox/netbox/ldap_config.py ''; })).override { inherit (cfg) plugins; }; - netboxManageScript = - with pkgs; - (writeScriptBin "netbox-manage" '' - #!${stdenv.shell} - export PYTHONPATH=${pkg.pythonPath} + + netboxManageScript = ( + pkgs.writeShellScriptBin "netbox-manage" '' + set -a + ${lib.concatMapStringsSep "\n" (envFile: '' + . "${envFile}" + '') cfg.environmentFiles} + set +a + export PYTHONPATH=${finalPackage.pythonPath} case "$(whoami)" in - "root") - ${util-linux}/bin/runuser -u netbox -- ${pkg}/bin/netbox "$@";; - "netbox") - ${pkg}/bin/netbox "$@";; - *) - echo "This must be run by either by root 'netbox' user" + "root") + ${lib.getExe' pkgs.util-linux "runuser"} ${ + lib.cli.toCommandLineShellGNU { } { + preserve-environment = true; + user = "netbox"; + supp-group = if cfg.redis.createLocally then config.services.redis.servers.netbox.group else null; + } + } -- ${finalPackage}/bin/netbox "$@";; + "netbox") + exec ${finalPackage}/bin/netbox "$@";; + *) + echo "This must be run by either the root or the 'netbox' user." >&2 + exit 1 esac - ''); + '' + ); in { + imports = [ + (mkChangedOptionModule + [ "services" "netbox" "apiTokenPeppersFile" ] + [ "services" "netbox" "apiTokenPepperFiles" ] + (config: { + "1" = config.services.netbox.apiTokenPeppersFile; + }) + ) + (mkRemovedOptionModule [ "services" "netbox" "listenAddress" ] '' + Use `services.netbox.bind` with : format instead. + '') + (mkRemovedOptionModule [ "services" "netbox" "port" ] '' + Use `services.netbox.bind` with : format instead. + '') + (mkRemovedOptionModule [ "services" "netbox" "unixSocket" ] '' + Use `services.netbox.bind` with unix: format instead. + '') + (mkRemovedOptionModule [ "services" "netbox" "keycloakClientSecret" ] '' + Too much granularity hurts maintainability. Please configure secret key loading via `services.netbox.extraConfig` instead. + '') + (mkRemovedOptionModule [ "services" "netbox" "enableLdap" ] '' + LDAP support is automatically enabled when `services.netbox.ldapConfigFile` is configured. + '') + (mkRenamedOptionModule + [ "services" "netbox" "ldapConfigPath" ] + [ "services" "netbox" "ldapConfigFile" ] + ) + (mkRemovedOptionModule [ "services" "nginx" "gunicornArgs" ] '' + Removed in favor of `services.netbox.gunicorn.extraArgs`, an attribute set passed to `lib.cli.toCommandLineGNU`. + '') + ]; + options.services.netbox = { enable = lib.mkOption { - type = lib.types.bool; + type = types.bool; default = false; description = '' - Enable Netbox. + Whether to enable Netbox, a DCIM and IPAM source of truth. - This module requires a reverse proxy that serves `/static` separately. - See this [example](https://github.com/netbox-community/netbox/blob/develop/contrib/nginx.conf/) on how to configure this. + This module requires setting up a reverse proxy and has native support + for nginx. Additionally, the NetBox project has example configurations + for [nginx] and the [Apache httpd] server. + + The important change to make is to serve `/static` from + `''${config.services.netbox.settings.STATIC_ROOT}`. + + [nginx]: https://github.com/netbox-community/netbox/blob/main/contrib/nginx.conf + [Apache httpd]: https://github.com/netbox-community/netbox/blob/main/contrib/apache.conf + ''; + }; + + environmentFiles = mkOption { + type = with types; listOf path; + default = [ ]; + description = '' + Environment files loaded into all NetBox services and consumable in + {option}`services.netbox.extraConfig`. ''; }; settings = lib.mkOption { description = '' - Configuration options to set in `configuration.py`. - See the [documentation](https://docs.netbox.dev/en/stable/configuration/) for more possible options. + The main {file}`configuration.py` to set up NetBox. + + Can be used to define flat and nested key-value pairs. Check the \ + [NetBox documentation] for possible options. + + ::: {.tip} + Use {option}`services.netbox.extraConfig` to extend this file with Python code. + ::: + + [NetBox documentation]: https://netboxlabs.com/docs/netbox/configuration/#configuration-file ''; - default = { }; - - type = lib.types.submodule { - freeformType = pythonFmt.type; - + type = types.submodule { + freeformType = pythonVars.type; options = { ALLOWED_HOSTS = lib.mkOption { - type = with lib.types; listOf str; + type = with types; listOf str; default = [ "*" ]; description = '' A list of valid fully-qualified domain names (FQDNs) and/or IP addresses that can be used to reach the NetBox service. ''; }; + + STATIC_ROOT = mkOption { + type = types.path; + readOnly = true; + default = "${cfg.dataDir}/static/"; + defaultText = lib.literalExpression "$${config.services.netbox.dataDir}/static/"; + description = '' + Path to the collected static assets, served below `/static/`. + ''; + }; + + MEDIA_ROOT = mkOption { + type = types.path; + readOnly = true; + default = "${cfg.dataDir}/media/"; + defaultText = lib.literalExpression "$${config.services.netbox.dataDir}/media"; + description = '' + Path where uploaded media is stored. + ''; + }; + + REPORTS_ROOT = mkOption { + type = types.path; + readOnly = true; + default = "${cfg.dataDir}/reports/"; + defaultText = lib.literalExpression "$${config.services.netbox.dataDir}/reports"; + description = '' + Path where generated reports are stored. + ''; + }; + + SCRIPTS_ROOT = mkOption { + type = types.path; + readOnly = true; + default = "${cfg.dataDir}/scripts/"; + defaultText = lib.literalExpression "$${config.services.netbox.dataDir}/scripts"; + description = '' + Path where scripts are stored. + ''; + }; + + DATABASES = mkOption { + type = with types; attrsOf (attrsOf str); + default = { + "default" = { + NAME = "netbox"; + USER = "netbox"; + HOST = "/run/postgresql"; + }; + }; + description = '' + Configuration for one or multiple [database] backends. + + At least one database named `default` must be defined. + + [database]: https://netbox.readthedocs.io/en/stable/configuration/required-parameters/#database + ''; + }; + + # Redis database settings. Redis is used for caching and for queuing + # background tasks such as webhook events. A separate configuration + # exists for each. Full connection details are required in both + # sections, and it is strongly recommended to use two separate database + # IDs. + REDIS = { + tasks = { + URL = mkOption { + type = types.str; + default = "unix://${config.services.redis.servers.netbox.unixSocket}?db=0"; + defaultText = lib.literalExpression "unix://$${config.services.redis.servers.netbox.unixSocket}?db=0"; + description = '' + Redis database connection for queuing background tasks. + + > It is highly recommended to keep the task and cache + > databases separate. Using the same database number on the + > same Redis instance for both may result in queued background + > tasks being lost during cache flushing events. + + + ''; + }; + }; + caching = { + URL = mkOption { + type = types.str; + default = "unix://${config.services.redis.servers.netbox.unixSocket}?db=1"; + defaultText = "unix://$${config.services.redis.servers.netbox.unixSocket}?db=0"; + description = '' + Redis database connection for caching. + + > It is highly recommended to keep the task and cache + > databases separate. Using the same database number on the + > same Redis instance for both may result in queued background + > tasks being lost during cache flushing events. + + + ''; + }; + }; + }; + + REMOTE_AUTH_BACKEND = mkOption { + type = + with types; + oneOf [ + str + (listOf str) + ]; + default = + if enableLDAP then + "netbox.authentication.LDAPBackend" + else + "netbox.authentication.RemoteUserBackend"; + defaultText = lib.literalExpression '' + if config.services.netbox.ldapConfigFile != null then + "netbox.authentication.LDAPBackend" + else + "netbox.authentication.RemoteUserBackend" + ''; + description = '' + One or multiple [backends] used for authenticating external users. + + When multiple backends are specified, they are tried in order. + + [backends]: https://netbox.readthedocs.io/en/stable/configuration/remote-authentication/#remote_auth_backend + ''; + }; + + LOGGING = mkOption { + type = pythonVars.type; + default = { + version = 1; + + formatters.precise.format = "[%(levelname)s@%(name)s] %(message)s"; + + handlers.console = { + class = "logging.StreamHandler"; + formatter = "precise"; + }; + + # log to console/systemd instead of file + root = { + level = "INFO"; + handlers = [ "console" ]; + }; + }; + description = '' + [Logging configuration] based on the Python [`logging.config`] module. + + [`logging.config`]: https://docs.python.org/3/library/logging.config.html + [Logging configuration]: https://netboxlabs.com/docs/netbox/configuration/system/#logging + ''; + }; }; }; }; - listenAddress = lib.mkOption { - type = lib.types.str; - default = "[::1]"; + extraConfig = lib.mkOption { + type = types.lines; + default = ""; + example = '' + from os import environ + + # https://python-social-auth.readthedocs.io/en/latest/backends/oidc.html + # From the environment: + SOCIAL_AUTH_OIDC_SECRET = environ.get("OIDC_CLIENT_SECRET") + + # From a file: + with open("/run/keys/oidc-client-secret") as fd: + SOCIAL_AUTH_OIDC_SECRET = fd.read().strip() + ''; description = '' - Address the server will listen on. - Ignored if `unixSocket` is set. + Additional lines that are appended to {file}`configuration.py`. + + This option supports native Python code and can be used for reading + secrets from files or the environment into configuration variables: + + Possible options can be found in the [NetBox documentation] or, for + authentication purposes, in the [Python Social Auth] documentation. + + [NetBox documentation]: https://netboxlabs.com/docs/netbox/configuration/ + [Python Social Auth]: https://python-social-auth.readthedocs.io/en/latest/backends/index.html# ''; }; - unixSocket = lib.mkOption { - type = lib.types.nullOr lib.types.str; - default = null; + bind = lib.mkOption { + type = types.str; + default = "unix:/run/netbox/netbox.sock"; + example = "[::1]:8001"; description = '' - Enable Unix Socket for the server to listen on. - `listenAddress` and `port` will be ignored. + IP and port or Unix domain socket path to bind the HTTP socket to. + + ::: {.tip} + This setting will be passed to gunicorn's [--bind] flag. + ::: + + [--bind]: https://gunicorn.org/reference/settings/#bind ''; - example = "/run/netbox/netbox.sock"; }; - gunicornArgs = lib.mkOption { - type = lib.types.listOf lib.types.str; - default = [ ]; - description = "extra args for gunicorn when serving netbox"; - example = [ - "--workers" - "9" - ]; + gunicorn.extraArgs = lib.mkOption { + type = types.attrsOf types.str; + default = { }; + description = '' + Extra arguments passed the Gunicorn process that runs NetBox. + + See for possible flags. + ''; + example = lib.literalExpression '' + { + workers = 9; + ]; + ''; + }; + + nginx = { + enable = mkEnableOption "nginx and configure a virtual host"; + + hostname = mkOption { + type = types.str; + example = "netbox.example.com"; + description = '' + The hostname for which an nginx virtual host should be created. + + ::: {.tip} + Customize the virtual host through + `services.nginx.virtualHosts.''${config.services.netbox.nginx.hostname}`. + ::: + ''; + }; + }; + + redis.createLocally = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable and set up a Redis database for NetBox locally. + ''; + }; + + postgresql.createLocally = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable and set up PostgreSQL locally. + + This will automatically created a database and a local user, that can + authenticate over Unix domain sockets with `SO_PEERCRED`. + ''; }; package = lib.mkOption { - type = lib.types.package; + type = types.package; default = if lib.versionAtLeast config.system.stateVersion "26.05" then pkgs.netbox_4_5 else pkgs.netbox_4_4; defaultText = lib.literalExpression '' @@ -130,17 +445,8 @@ in ''; }; - port = lib.mkOption { - type = lib.types.port; - default = 8001; - description = '' - Port the server will listen on. - Ignored if `unixSocket` is set. - ''; - }; - plugins = lib.mkOption { - type = with lib.types; functionTo (listOf package); + type = with types; functionTo (listOf package); default = _: [ ]; defaultText = lib.literalExpression '' python3Packages: with python3Packages; []; @@ -151,7 +457,7 @@ in }; dataDir = lib.mkOption { - type = lib.types.str; + type = types.str; default = "/var/lib/netbox"; description = '' Storage path of netbox. @@ -159,46 +465,71 @@ in }; secretKeyFile = lib.mkOption { - type = lib.types.path; + type = + with types; + nullOr (pathWith { + inStore = false; + }); + default = null; description = '' - Path to a file containing the secret key. + Path to a file containing the [secret key]. + + The secret key is used for hashing passwords and signing HTTP cookies. + It can be rotated without data loss; however all existing user sessions + will be invalidated. + + ::: {.note} + If unset, a random secret will be created automatically at + `/var/lib/netbox/secret.key`. + ::: + + [secret key]: https://netboxlabs.com/docs/netbox/configuration/required-parameters/#secret_key ''; }; - apiTokenPeppersFile = lib.mkOption { - type = with lib.types; nullOr path; + apiTokenPepperFiles = lib.mkOption { + type = + with types; + attrsOf (pathWith { + inStore = false; + }); + default = { + "1" = "${cfg.dataDir}/pepper.1"; + }; + defaultText = lib.literalExpression '' + { + "1" = "''${config.services.netbox.dataDir}/pepper.1"; + } + ''; + example = { + "1" = "/run/keys/netbox-pepper-old"; + "2" = "/run/keys/netbox-pepper-current"; + }; description = '' - Path to a file containing the API_TOKEN_PEPPER that will be configured for the pepper_id with the id 1. - This is required for netbox >= 4.5. For generating this pepper, - [consider using `$INSTALL_ROOT/netbox/generate_secret_key.py`](https://netboxlabs.com/docs/netbox/configuration/required-parameters/#api_token_peppers) + Mapping of cryptographic pepper IDs to files containing the pepper values. + + Peppers provide an additional secret input in hashing operations. They + are required for v2 API tokens (NetBox 4.5+). + + ::: {.note} + By default a random pepper will be created automatically at + `/var/lib/netbox/pepper.1` and configured with pepper ID 1. + ::: + + [cryptographic peppers]: https://netboxlabs.com/docs/netbox/configuration/required-parameters/#api_token_peppers ''; }; - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; + ldapConfigFile = lib.mkOption { + type = with types; nullOr path; + default = null; description = '' - Additional lines of configuration appended to the `configuration.py`. - See the [documentation](https://docs.netbox.dev/en/stable/configuration/) for more possible options. - ''; - }; + Path to the [LDAP configuration] file, also known as {file}`ldap_config.py`. - enableLdap = lib.mkOption { - type = lib.types.bool; - default = false; - description = '' - Enable LDAP-Authentication for Netbox. + When set, will automatically load the `django-auth-ldap` plugin and + configure {option}`services.netbox.settings.REMOTE_AUTH_BACKEND`. - This requires a configuration file being pass through `ldapConfigPath`. - ''; - }; - - ldapConfigPath = lib.mkOption { - type = lib.types.path; - default = ""; - description = '' - Path to the Configuration-File for LDAP-Authentication, will be loaded as `ldap_config.py`. - See the [documentation](https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration) for possible options. + [LDAP configuration]: https://netbox.readthedocs.io/en/stable/installation/6-ldap/#configuration ''; example = '' import ldap @@ -226,197 +557,206 @@ in AUTH_LDAP_FIND_GROUP_PERMS = True ''; }; - keycloakClientSecret = lib.mkOption { - type = with lib.types; nullOr path; - default = null; - description = '' - File that contains the keycloak client secret. - ''; - }; }; - config = lib.mkIf cfg.enable { - services.netbox = { - plugins = lib.mkIf cfg.enableLdap (ps: [ ps.django-auth-ldap ]); - settings = { - STATIC_ROOT = staticDir; - MEDIA_ROOT = "${cfg.dataDir}/media"; - REPORTS_ROOT = "${cfg.dataDir}/reports"; - SCRIPTS_ROOT = "${cfg.dataDir}/scripts"; - - GIT_PATH = "${pkgs.gitMinimal}/bin/git"; - - DATABASES = { - "default" = { - NAME = "netbox"; - USER = "netbox"; - HOST = "/run/postgresql"; - }; - }; - - # Redis database settings. Redis is used for caching and for queuing - # background tasks such as webhook events. A separate configuration - # exists for each. Full connection details are required in both - # sections, and it is strongly recommended to use two separate database - # IDs. - REDIS = { - tasks = { - URL = "unix://${config.services.redis.servers.netbox.unixSocket}?db=0"; - SSL = false; - }; - caching = { - URL = "unix://${config.services.redis.servers.netbox.unixSocket}?db=1"; - SSL = false; - }; - }; - - REMOTE_AUTH_BACKEND = lib.mkIf cfg.enableLdap "netbox.authentication.LDAPBackend"; - - LOGGING = lib.mkDefault { - version = 1; - - formatters.precise.format = "[%(levelname)s@%(name)s] %(message)s"; - - handlers.console = { - class = "logging.StreamHandler"; - formatter = "precise"; - }; - - # log to console/systemd instead of file - root = { - level = "INFO"; - handlers = [ "console" ]; - }; - }; - }; - - extraConfig = '' - with open("${cfg.secretKeyFile}", "r") as file: - SECRET_KEY = file.readline() - '' - + (lib.optionalString (cfg.apiTokenPeppersFile != null) '' - with open("${cfg.apiTokenPeppersFile}", "r") as pepper_file: - API_TOKEN_PEPPERS = { - 1: pepper_file.readline(), - }; - '') - + (lib.optionalString (cfg.keycloakClientSecret != null) '' - with open("${cfg.keycloakClientSecret}", "r") as file: - SOCIAL_AUTH_KEYCLOAK_SECRET = file.readline() - ''); - }; - - services.redis.servers.netbox.enable = true; - - services.postgresql = { - enable = true; - ensureDatabases = [ "netbox" ]; - ensureUsers = [ - { - name = "netbox"; - ensureDBOwnership = true; - } - ]; - }; - - environment.systemPackages = [ netboxManageScript ]; - - systemd.targets.netbox = { - description = "Target for all NetBox services"; - wantedBy = [ "multi-user.target" ]; - wants = [ "network-online.target" ]; - after = [ - "network-online.target" - "redis-netbox.service" - ]; - }; - - systemd.services = - let - defaultServiceConfig = { - WorkingDirectory = "${cfg.dataDir}"; - User = "netbox"; - Group = "netbox"; - StateDirectory = "netbox"; - StateDirectoryMode = "0750"; - Restart = "on-failure"; - RestartSec = 30; - }; - in + config = lib.mkIf cfg.enable ( + lib.mkMerge [ { - netbox = { - description = "NetBox WSGI Service"; - documentation = [ "https://docs.netbox.dev/" ]; + services.netbox.plugins = lib.mkIf enableLDAP (ps: [ ps.django-auth-ldap ]); - wantedBy = [ "netbox.target" ]; + services.redis.servers.netbox.enable = cfg.redis.createLocally; - after = [ "network-online.target" ]; - wants = [ "network-online.target" ]; - - environment.PYTHONPATH = pkg.pythonPath; - - preStart = '' - # On the first run, or on upgrade / downgrade, run migrations and related. - # This mostly correspond to upstream NetBox's 'upgrade.sh' script. - versionFile="${cfg.dataDir}/version" - - if [[ -h "$versionFile" && "$(readlink -- "$versionFile")" == "${cfg.package}" ]]; then - exit 0 - fi - - ${pkg}/bin/netbox migrate - ${pkg}/bin/netbox trace_paths --no-input - ${pkg}/bin/netbox collectstatic --clear --no-input - ${pkg}/bin/netbox remove_stale_contenttypes --no-input - ${pkg}/bin/netbox reindex --lazy - ${pkg}/bin/netbox clearsessions - ${lib.optionalString - # The clearcache command was removed in 3.7.0: - # https://github.com/netbox-community/netbox/issues/14458 - (lib.versionOlder cfg.package.version "3.7.0") - "${pkg}/bin/netbox clearcache" + services.postgresql = lib.mkIf cfg.postgresql.createLocally { + enable = true; + ensureDatabases = [ "netbox" ]; + ensureUsers = [ + { + name = "netbox"; + ensureDBOwnership = true; } - - ln -sfn "${cfg.package}" "$versionFile" - ''; - - serviceConfig = defaultServiceConfig // { - ExecStart = '' - ${pkg.gunicorn}/bin/gunicorn netbox.wsgi \ - --bind ${ - if (cfg.unixSocket != null) then - "unix:${cfg.unixSocket}" - else - "${cfg.listenAddress}:${toString cfg.port}" - } \ - --pythonpath ${pkg}/opt/netbox/netbox \ - ${lib.concatStringsSep " " cfg.gunicornArgs} - ''; - PrivateTmp = true; - TimeoutStartSec = lib.mkDefault "10min"; - }; + ]; }; - netbox-rq = { - description = "NetBox Request Queue Worker"; - documentation = [ "https://docs.netbox.dev/" ]; + environment.systemPackages = [ netboxManageScript ]; - wantedBy = [ "netbox.target" ]; - after = [ "netbox.service" ]; - - environment.PYTHONPATH = pkg.pythonPath; - - serviceConfig = defaultServiceConfig // { - ExecStart = '' - ${pkg}/bin/netbox rqworker high default low - ''; - PrivateTmp = true; - }; + systemd.slices.system-netbox = { + description = "Netbox DCIM/IPAM"; }; - netbox-housekeeping = { - description = "NetBox housekeeping job"; - documentation = [ "https://docs.netbox.dev/" ]; + systemd.targets.netbox = { + description = "Target for all NetBox services"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network-online.target" ]; + after = [ + "network-online.target" + "redis-netbox.service" + ]; + }; + + systemd.services = + let + defaultUnitConfig = { + documentation = [ "https://netboxlabs.com/docs/netbox/" ]; + environment.PYTHONPATH = finalPackage.pythonPath; + }; + defaultServiceConfig = { + WorkingDirectory = "${cfg.dataDir}"; + User = "netbox"; + Group = "netbox"; + StateDirectory = "netbox"; + StateDirectoryMode = "0750"; + Restart = "on-failure"; + RestartSec = 30; + Slice = "system-netbox.slice"; + EnvironmentFile = cfg.environmentFiles; + SupplementaryGroups = lib.optionals cfg.redis.createLocally [ + config.services.redis.servers.netbox.group + ]; + + AmbientCapabilities = [ "" ]; + CapabilityBoundingSet = [ "" ]; + DevicePolicy = "closed"; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateTmp = true; + ProcSubset = "pid"; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProtectSystem = "strict"; + RemoveIPC = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + SystemCallFilter = [ + "@system-service" + "~@privileged" + "~@resources" + "@chown" + ]; + UMask = "0027"; + }; + in + { + netbox = defaultUnitConfig // { + description = "NetBox WSGI Service"; + + wantedBy = [ "netbox.target" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + preStart = '' + # Generate random default secrets, if the user didn't supply any. + ${optionalString (cfg.secretKeyFile == null) '' + if [ ! -e "${secretKeyFile}" ]; then + ${finalPackage}/opt/netbox/netbox/generate_secret_key.py > "${secretKeyFile}" + fi + ''} + ${optionalString + (any (path: path == "${cfg.dataDir}/pepper.1") (attrValues cfg.apiTokenPepperFiles)) + '' + if [ ! -e "${cfg.dataDir}/pepper.1" ]; then + ${finalPackage}/opt/netbox/netbox/generate_secret_key.py > "${cfg.dataDir}/pepper.1" + fi + '' + } + + # On the first run, or on upgrade / downgrade, run migrations and related. + # This mostly correspond to upstream NetBox's 'upgrade.sh' script. + versionFile="${cfg.dataDir}/version" + + if [[ -h "$versionFile" && "$(readlink -- "$versionFile")" == "${cfg.package}" ]]; then + exit 0 + fi + + ${lib.getExe finalPackage} migrate + ${lib.getExe finalPackage} trace_paths --no-input + ${lib.getExe finalPackage} collectstatic --clear --no-input + ${lib.getExe finalPackage} remove_stale_contenttypes --no-input + ${lib.getExe finalPackage} reindex --lazy + ${lib.getExe finalPackage} clearsessions + + ln -sfn "${cfg.package}" "$versionFile" + ''; + + serviceConfig = defaultServiceConfig // { + ExecStart = toString ( + [ + (lib.getExe finalPackage.gunicorn) + "netbox.wsgi" + ] + ++ lib.cli.toCommandLineGNU { } ( + { + inherit (cfg) bind; + pythonpath = "${finalPackage}/opt/netbox/netbox"; + } + // cfg.gunicorn.extraArgs + ) + ); + PrivateTmp = true; + RuntimeDirectory = "netbox"; + RuntimeDirectoryMode = "0750"; + TimeoutStartSec = lib.mkDefault "10min"; + }; + }; + + netbox-rq = defaultUnitConfig // { + description = "NetBox Request Queue Worker"; + + wantedBy = [ "netbox.target" ]; + after = [ "netbox.service" ]; + + serviceConfig = defaultServiceConfig // { + ExecStart = toString [ + (lib.getExe finalPackage) + "rqworker" + "high" + "default" + "low" + ]; + PrivateTmp = true; + }; + }; + + netbox-housekeeping = defaultUnitConfig // { + description = "NetBox housekeeping job"; + + wantedBy = [ "multi-user.target" ]; + + after = [ + "network-online.target" + "netbox.service" + ]; + wants = [ "network-online.target" ]; + + serviceConfig = defaultServiceConfig // { + Type = "oneshot"; + ExecStart = toString [ + (lib.getExe finalPackage) + "housekeeping" + ]; + }; + }; + }; + + systemd.timers.netbox-housekeeping = { + description = "Run NetBox housekeeping job"; + documentation = [ "https://netboxlabs.com/docs/netbox/" ]; wantedBy = [ "multi-user.target" ]; @@ -426,49 +766,35 @@ in ]; wants = [ "network-online.target" ]; - environment.PYTHONPATH = pkg.pythonPath; - - serviceConfig = defaultServiceConfig // { - Type = "oneshot"; - ExecStart = '' - ${pkg}/bin/netbox housekeeping - ''; + timerConfig = { + OnCalendar = "daily"; + AccuracySec = "1h"; + Persistent = true; }; }; - }; - systemd.timers.netbox-housekeeping = { - description = "Run NetBox housekeeping job"; - documentation = [ "https://docs.netbox.dev/" ]; - - wantedBy = [ "multi-user.target" ]; - - after = [ - "network-online.target" - "netbox.service" - ]; - wants = [ "network-online.target" ]; - - timerConfig = { - OnCalendar = "daily"; - AccuracySec = "1h"; - Persistent = true; - }; - }; - - users.users.netbox = { - home = "${cfg.dataDir}"; - isSystemUser = true; - group = "netbox"; - }; - users.groups.netbox = { }; - users.groups."${config.services.redis.servers.netbox.user}".members = [ "netbox" ]; - - assertions = [ - { - assertion = (lib.versionAtLeast cfg.package.version "4.5") -> (cfg.apiTokenPeppersFile != null); - message = "NetBox 4.5 or newer require setting `services.netbox.apiTokenPeppersFile`"; + users.users.netbox = { + home = "${cfg.dataDir}"; + isSystemUser = true; + group = "netbox"; + }; + users.groups.netbox = { }; } - ]; - }; + + (lib.mkIf cfg.nginx.enable { + # Access to STATIC_ROOT and the UNIX domain socket + systemd.services.nginx.serviceConfig.SupplementaryGroups = [ "netbox" ]; + + services.nginx = { + enable = true; + recommendedProxySettings = true; + + virtualHosts.${cfg.nginx.hostname} = { + locations."/".proxyPass = "http://${toString config.services.netbox.bind}"; + locations."/static/".alias = cfg.settings.STATIC_ROOT; + }; + }; + }) + ] + ); } diff --git a/nixos/modules/services/web-apps/nextcloud.md b/nixos/modules/services/web-apps/nextcloud.md index 69d7053d1adc..ad2b66ec941c 100644 --- a/nixos/modules/services/web-apps/nextcloud.md +++ b/nixos/modules/services/web-apps/nextcloud.md @@ -5,7 +5,7 @@ self-hostable cloud platform. The server setup can be automated using [services.nextcloud](#opt-services.nextcloud.enable). A desktop client is packaged at `pkgs.nextcloud-client`. -The current default by NixOS is `nextcloud33` which is also the latest +The current default by NixOS is `nextcloud34` which is also the latest major version available. ## Basic usage {#module-services-nextcloud-basic-usage} diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index a35f32f594ef..ab087cbce682 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -467,6 +467,7 @@ in relatedPackages = [ "nextcloud32" "nextcloud33" + "nextcloud34" ]; }; phpPackage = lib.mkPackageOption pkgs "php" { @@ -1195,7 +1196,7 @@ in { warnings = let - latest = 33; + latest = 34; upgradeWarning = major: nixos: '' A legacy Nextcloud install (from before NixOS ${nixos}) may be installed. @@ -1228,7 +1229,8 @@ in ++ (lib.optional (lib.versionOlder cfg.package.version "30") (upgradeWarning 29 "24.11")) ++ (lib.optional (lib.versionOlder cfg.package.version "31") (upgradeWarning 30 "25.05")) ++ (lib.optional (lib.versionOlder cfg.package.version "32") (upgradeWarning 31 "25.11")) - ++ (lib.optional (lib.versionOlder cfg.package.version "33") (upgradeWarning 32 "26.05")); + ++ (lib.optional (lib.versionOlder cfg.package.version "33") (upgradeWarning 32 "26.05")) + ++ (lib.optional (lib.versionOlder cfg.package.version "34") (upgradeWarning 33 "26.11")); services.nextcloud.package = lib.mkDefault ( if pkgs ? nextcloud then @@ -1241,8 +1243,10 @@ in pkgs.nextcloud31 else if lib.versionOlder stateVersion "26.05" then pkgs.nextcloud32 - else + else if lib.versionOlder stateVersion "26.11" then pkgs.nextcloud33 + else + pkgs.nextcloud34 ); services.nextcloud.phpOptions = lib.mkMerge [ diff --git a/nixos/modules/services/web-apps/ocis.nix b/nixos/modules/services/web-apps/ocis.nix index 98cc7d43d200..004010abc157 100644 --- a/nixos/modules/services/web-apps/ocis.nix +++ b/nixos/modules/services/web-apps/ocis.nix @@ -202,7 +202,6 @@ in meta.maintainers = with lib.maintainers; [ bhankas - danth ramblurr ]; } diff --git a/nixos/modules/services/web-apps/outline.nix b/nixos/modules/services/web-apps/outline.nix index e1bfa8ab47d3..bb0ab5f2751c 100644 --- a/nixos/modules/services/web-apps/outline.nix +++ b/nixos/modules/services/web-apps/outline.nix @@ -836,13 +836,17 @@ in ${ if (cfg.databaseUrl == "local") then '' - DATABASE_URL=${lib.escapeShellArg localPostgresqlUrl} + if [ -z "''${DATABASE_URL:-}" ]; then + DATABASE_URL=${lib.escapeShellArg localPostgresqlUrl} + fi export DATABASE_URL - export PGSSLMODE=disable + export PGSSLMODE="''${PGSSLMODE:-disable}" '' else '' - DATABASE_URL=${lib.escapeShellArg cfg.databaseUrl} + if [ -z "''${DATABASE_URL:-}" ]; then + DATABASE_URL=${lib.escapeShellArg cfg.databaseUrl} + fi export DATABASE_URL '' } diff --git a/nixos/modules/services/web-apps/papra.nix b/nixos/modules/services/web-apps/papra.nix index 8ee55736f1eb..a9a4d2b66ccb 100644 --- a/nixos/modules/services/web-apps/papra.nix +++ b/nixos/modules/services/web-apps/papra.nix @@ -80,8 +80,8 @@ in wantedBy = [ "multi-user.target" ]; serviceConfig = { Restart = "on-failure"; - ExecStartPre = "${lib.getExe pkgs.tsx} ${cfg.package}/lib/src/scripts/migrate-up.script.ts"; - ExecStart = "${cfg.package}/bin/papra"; + ExecStartPre = "${lib.getExe' cfg.package "papra-migrate-up"}"; + ExecStart = "${lib.getExe' cfg.package "papra"}"; User = cfg.user; Group = cfg.group; StateDirectory = "papra"; diff --git a/nixos/modules/services/web-apps/part-db.nix b/nixos/modules/services/web-apps/part-db.nix index b4b128dfa03d..006481e6dda7 100644 --- a/nixos/modules/services/web-apps/part-db.nix +++ b/nixos/modules/services/web-apps/part-db.nix @@ -8,6 +8,11 @@ let cfg = config.services.part-db; pkg = cfg.package; + envFile = pkgs.writeText "part-db-env" ( + lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}=\"${value}\"") cfg.settings) + + "\n" + ); + inherit (lib) mkEnableOption mkPackageOption @@ -62,6 +67,17 @@ in ''; }; + environmentFile = mkOption { + type = types.nullOr types.path; + default = null; + example = "/run/secrets/part-db.env"; + description = '' + Path to a file containing extra Part-DB environment variables in dotenv + format. This can be used for secrets such as `APP_SECRET` without + putting them in the Nix store. + ''; + }; + poolConfig = lib.mkOption { type = lib.types.attrsOf ( lib.types.oneOf [ @@ -176,18 +192,34 @@ in root = "${pkg}/public"; locations = { "/" = { - tryFiles = "$uri $uri/ /index.php?$query_string"; + tryFiles = "$uri $uri/ /index.php$is_args$args"; index = "index.php"; extraConfig = '' + add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; sandbox;" always; + add_header X-Content-Type-Options "nosniff" always; sendfile off; ''; }; - "~ \\.php$" = { + "= /index.php" = { extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi_params ; - fastcgi_param SCRIPT_FILENAME $request_filename; - fastcgi_param modHeadersAvailable true; #Avoid sending the security headers twice + include ${config.services.nginx.package}/conf/fastcgi_params; + fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name; + fastcgi_param DOCUMENT_ROOT $realpath_root; + fastcgi_param modHeadersAvailable true; # Avoid sending the security headers twice fastcgi_pass unix:${config.services.phpfpm.pools.part-db.socket}; + internal; + ''; + }; + "~ \\.php$" = { + return = "404"; + }; + "~* ^/media/.*\\.(php[3-8]?|phar|phtml|pht|phps)$" = { + return = "403"; + }; + "~* \\.svg$" = { + extraConfig = '' + add_header Content-Security-Policy "default-src 'self'; script-src 'none'; style-src 'self' 'unsafe-inline'; img-src 'self' data:; frame-ancestors 'none'; sandbox;" always; + add_header X-Content-Type-Options "nosniff" always; ''; }; }; @@ -197,10 +229,32 @@ in systemd = { services = { + part-db-setup = { + before = [ "part-db-migrate.service" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + restartTriggers = [ envFile ]; + script = '' + install -Dm0600 -o part-db -g part-db ${envFile} /var/lib/part-db/env.local + '' + + lib.optionalString (cfg.environmentFile != null) '' + cat ${lib.escapeShellArg cfg.environmentFile} >> /var/lib/part-db/env.local + ''; + }; + part-db-migrate = { before = [ "phpfpm-part-db.service" ]; - after = [ "postgresql.target" ]; - requires = [ "postgresql.target" ]; + after = [ + "postgresql.target" + "part-db-setup.service" + ]; + requires = [ + "postgresql.target" + "part-db-setup.service" + ]; wantedBy = [ "multi-user.target" ]; serviceConfig = { Type = "oneshot"; @@ -235,10 +289,30 @@ in user = "part-db"; group = "part-db"; }; - "/var/lib/part-db/env.local"."L+" = { - argument = "${pkgs.writeText "part-db-env" ( - lib.concatStringsSep "\n" (lib.mapAttrsToList (key: value: "${key}=\"${value}\"") cfg.settings) - )}"; + "/var/lib/part-db/".d = { + mode = "0755"; + user = "part-db"; + group = "part-db"; + }; + "/var/lib/part-db/public/".d = { + mode = "0755"; + user = "part-db"; + group = "part-db"; + }; + "/var/lib/part-db/public/media/".d = { + mode = "0755"; + user = "part-db"; + group = "part-db"; + }; + "/var/lib/part-db/uploads/".d = { + mode = "0750"; + user = "part-db"; + group = "part-db"; + }; + "/var/lib/part-db/share/".d = { + mode = "0750"; + user = "part-db"; + group = "part-db"; }; "/var/log/part-db/".d = { mode = "0750"; diff --git a/nixos/modules/services/web-apps/plantuml-server.nix b/nixos/modules/services/web-apps/plantuml-server.nix index 184787d94c0e..59e8bc94c541 100644 --- a/nixos/modules/services/web-apps/plantuml-server.nix +++ b/nixos/modules/services/web-apps/plantuml-server.nix @@ -37,15 +37,7 @@ in packages = { jdk = mkPackageOption pkgs "jdk" { }; jetty = mkPackageOption pkgs "jetty" { - default = [ "jetty_11" ]; - extraDescription = '' - At the time of writing (v1.2023.12), PlantUML Server does not support - Jetty versions higher than 12.x. - - Jetty 12.x has introduced major breaking changes, see - and - - ''; + default = [ "jetty_12" ]; }; }; @@ -115,11 +107,11 @@ in script = '' ${cfg.packages.jdk}/bin/java \ -jar ${cfg.packages.jetty}/start.jar \ - --module=deploy,http,jsp \ - jetty.home=${cfg.packages.jetty} \ - jetty.base=${cfg.package} \ - jetty.http.host=${cfg.listenHost} \ - jetty.http.port=${toString cfg.listenPort} + --module=http,ee11-deploy,ee11-jsp \ + -Djetty.home=${cfg.packages.jetty} \ + -Djetty.base=${cfg.package} \ + -Djetty.http.host=${cfg.listenHost} \ + -Djetty.http.port=${toString cfg.listenPort} ''; serviceConfig = { diff --git a/nixos/modules/services/web-apps/plausible.md b/nixos/modules/services/web-apps/plausible.md index 90e71c0d6d8d..f6cebac1e62a 100644 --- a/nixos/modules/services/web-apps/plausible.md +++ b/nixos/modules/services/web-apps/plausible.md @@ -20,6 +20,19 @@ After that, `plausible` can be deployed like this: # secretKeybaseFile is a path to the file which contains the secret generated # with openssl as described above. secretKeybaseFile = "/run/secrets/plausible-secret-key-base"; + # With an admin user seeded (below), registration can be locked down + # so only invited users (or nobody) can create further accounts. + disableRegistration = "invite_only"; + }; + # If you do not declare `adminUser`, Plausible shows an unauthenticated + # "first launch" setup wizard where anybody reaching the instance can create + # the first admin account. That may be convenient, but is also a security + # risk if somebody else uses it before you do. + adminUser = { + email = "admin@analytics.example.org"; + # passwordHashFile is a path to a file containing the bcrypt hash of the + # admin user's password, e.g. generated with `mkpasswd -m bcrypt`. + passwordHashFile = "/run/secrets/plausible-admin-password-hash"; }; }; } diff --git a/nixos/modules/services/web-apps/plausible.nix b/nixos/modules/services/web-apps/plausible.nix index 23510534a24d..d72c28113130 100644 --- a/nixos/modules/services/web-apps/plausible.nix +++ b/nixos/modules/services/web-apps/plausible.nix @@ -10,6 +10,68 @@ with lib; let cfg = config.services.plausible; + seedAdminEnabled = cfg.adminUser.email != null; + + # Note [plausible-seed-admin-no-wizard-race]: + # Plausible Community Edition shows an unauthenticated "first launch" setup + # wizard to create the admin user whenever no user exists in the database + # (`Plausible.Release.should_be_first_launch?` is + # `not Repo.exists?(Plausible.Auth.User)`, and `PlausibleWeb.FirstLaunchPlug` + # 302-redirects every page to `/register` while that is true). On an instance + # reachable over the network this lets any stranger create the first admin + # account. + # + # `DISABLE_REGISTRATION` does NOT gate this wizard (it must not, otherwise the + # first user could never be created), so the only robust fix is to ensure a + # user already exists before the web server accepts any connection. + # + # We therefore seed the admin user inside the service's main `script`, after + # the DB migrations and strictly before `exec plausible start`. This + # guarantees there is no time window in which the wizard is reachable. The + # seed is idempotent (it only inserts when no user exists), so it is safe to + # run on every (re)start. + # + # We insert the precomputed bcrypt `password_hash` directly rather than going + # through `Plausible.Auth.User.new/1`, so the plaintext password never has to + # be stored on disk. `email_verified` is set to `true` because self-hosted + # Plausible does not require email verification by default. + # + # This Elixir script may need updating as newer Plausible versions get + # released (e.g. if the `Plausible.Auth.User` schema changes). The NixOS VM + # test `nixos/tests/plausible.nix` validates that the wizard is unreachable + # once an admin user is configured. + seedAdminScript = pkgs.writeText "plausible-seed-admin.exs" '' + # This script runs via `plausible eval`, which evaluates it WITHOUT + # starting the `:plausible` application or its Ecto repos. We therefore + # start them ourselves before querying/inserting, mirroring the private + # `Plausible.Release.prepare/0` (the same startup the release uses for its + # `migrate`/`seed` commands): load the app, start the DB-related apps and + # start each Ecto repo. Otherwise `Repo.exists?/1` raises + # `could not lookup Ecto repo Plausible.Repo because it was not started`. + :ok = Application.ensure_loaded(:plausible) + Enum.each([:ssl, :postgrex, :ch, :ecto], &Application.ensure_all_started/1) + Enum.each(Application.fetch_env!(:plausible, :ecto_repos), & &1.start_link(pool_size: 2)) + + alias Plausible.Repo + alias Plausible.Auth.User + + unless Repo.exists?(User) do + email = System.fetch_env!("SEED_ADMIN_USER_EMAIL") + name = System.fetch_env!("SEED_ADMIN_USER_NAME") + password_hash = System.fetch_env!("SEED_ADMIN_USER_PASSWORD_HASH") + + %User{ + email: email, + name: name, + password_hash: password_hash, + email_verified: true + } + |> Repo.insert!() + + IO.puts("plausible: seeded admin user #{email}") + end + ''; + in { options.services.plausible = { @@ -51,6 +113,57 @@ in }; }; + adminUser = { + email = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Email address of an admin user to seed into the database before the + Plausible web server starts accepting connections. + + Plausible Community Edition shows an unauthenticated "first launch" + setup wizard whenever no user exists in the database, which redirects + every page to `/register` and lets anyone reaching the instance over + the network create the first admin account. Setting this option (and + {option}`services.plausible.adminUser.passwordHashFile`) seeds an + admin user before the port is opened, so the wizard is never reachable + by strangers. + + When `null`, no user is seeded and Plausible's setup wizard is used as + usual. + + Seeding is idempotent: if any user already exists, no user is created. + ''; + example = "admin@example.org"; + }; + + name = mkOption { + default = "Admin"; + type = types.str; + description = '' + Display name of the seeded admin user (see + {option}`services.plausible.adminUser.email`). + ''; + }; + + passwordHashFile = mkOption { + default = null; + type = with types; nullOr (either str path); + description = '' + Path to a file containing the bcrypt hash of the seeded admin user's + password (see {option}`services.plausible.adminUser.email`). + + Using a hash file (rather than the plaintext password) means the + plaintext never has to be stored on disk or in the Nix store. Generate + a hash e.g. with `mkpasswd -m bcrypt` (the resulting `$2b$...` string). + + This file is read via systemd's `LoadCredential`, so it does not enter + the Nix store. + ''; + example = "/run/secrets/plausible-admin-password-hash"; + }; + }; + server = { disableRegistration = mkOption { default = true; @@ -150,33 +263,34 @@ in (mkRemovedOptionModule [ "services" "plausible" "releaseCookiePath" ] "Plausible uses no distributed Erlang features, so this option is no longer necessary and was removed" ) - (mkRemovedOptionModule [ - "services" - "plausible" - "adminUser" - "name" - ] "Admin user is now created using first start wizard") - (mkRemovedOptionModule [ - "services" - "plausible" - "adminUser" - "email" - ] "Admin user is now created using first start wizard") - (mkRemovedOptionModule [ - "services" - "plausible" - "adminUser" - "passwordFile" - ] "Admin user is now created using first start wizard") - (mkRemovedOptionModule [ - "services" - "plausible" - "adminUser" - "activate" - ] "Admin user is now created using first start wizard") + (mkRemovedOptionModule + [ + "services" + "plausible" + "adminUser" + "passwordFile" + ] + "Use services.plausible.adminUser.passwordHashFile instead, which keeps the plaintext password out of the Nix store" + ) + (mkRemovedOptionModule + [ + "services" + "plausible" + "adminUser" + "activate" + ] + "The seeded admin user is always created as email-verified; self-hosted Plausible does not require email verification" + ) ]; config = mkIf cfg.enable { + assertions = [ + { + assertion = seedAdminEnabled -> (cfg.adminUser.passwordHashFile != null); + message = "services.plausible.adminUser.passwordHashFile must be set when services.plausible.adminUser.email is set."; + } + ]; + services.postgresql = mkIf cfg.database.postgres.setup { enable = true; }; @@ -285,6 +399,18 @@ in ''} ${cfg.package}/migrate.sh + + ${lib.optionalString seedAdminEnabled '' + # Seed the admin user before the web server starts, so the + # unauthenticated "first launch" setup wizard is never reachable; + # see note [plausible-seed-admin-no-wizard-race]. + export SEED_ADMIN_USER_EMAIL=${lib.escapeShellArg cfg.adminUser.email} + export SEED_ADMIN_USER_NAME=${lib.escapeShellArg cfg.adminUser.name} + SEED_ADMIN_USER_PASSWORD_HASH="$(< "$CREDENTIALS_DIRECTORY/ADMIN_USER_PASSWORD_HASH" )" + export SEED_ADMIN_USER_PASSWORD_HASH + plausible eval "$(< ${seedAdminScript} )" + ''} + export IP_GEOLOCATION_DB=${pkgs.dbip-country-lite}/share/dbip/dbip-country-lite.mmdb exec plausible start @@ -300,6 +426,9 @@ in ] ++ lib.optionals (cfg.mail.smtp.passwordFile != null) [ "SMTP_USER_PWD:${cfg.mail.smtp.passwordFile}" + ] + ++ lib.optionals seedAdminEnabled [ + "ADMIN_USER_PASSWORD_HASH:${cfg.adminUser.passwordHashFile}" ]; }; }; @@ -330,9 +459,6 @@ in ]; }; - meta.maintainers = with lib.maintainers; [ - e1mo - xanderio - ]; + meta.maintainers = [ ]; meta.doc = ./plausible.md; } diff --git a/nixos/modules/services/web-apps/pretalx.nix b/nixos/modules/services/web-apps/pretalx.nix index 37527a4e1688..53990f88bea5 100644 --- a/nixos/modules/services/web-apps/pretalx.nix +++ b/nixos/modules/services/web-apps/pretalx.nix @@ -21,17 +21,47 @@ let (toPythonModule finalPackage) gunicorn ] - ++ finalPackage.optional-dependencies.redis - ++ lib.optionals cfg.celery.enable [ celery ] ++ lib.optionals ( cfg.settings.database.backend == "postgresql" ) finalPackage.optional-dependencies.postgres; }; + + pretalxManageWrapper = pkgs.writeShellApplication { + name = "pretalx-manage"; + runtimeInputs = with pkgs; [ + util-linux + ]; + text = '' + cd ${cfg.settings.filesystem.data} + set -a + ${lib.concatMapStringsSep "\n" (file: '' + . ${lib.escapeShellArg file} + '') cfg.environmentFiles} + set +a + export PRETALX_CONFIG_FILE=${configFile} + exec runuser ${ + lib.cli.toCommandLineShellGNU { } { + inherit (cfg) user; + preserve-environment = true; + } + } -- ${lib.getExe' pythonEnv "pretalx-manage"} "$@" + ''; + excludeShellChecks = [ + # Not following: /run/agenix/pretalx-env was not specified as input + "SC1091" + ]; + }; in { meta.maintainers = pkgs.pretalx.meta.maintainers; + imports = [ + (lib.mkRemovedOptionModule [ "services" "pretalx" "celery" "enable" ] '' + Celery is now always required. + '') + ]; + options.services.pretalx = { enable = lib.mkEnableOption "pretalx"; @@ -110,15 +140,6 @@ in }; celery = { - enable = lib.mkOption { - type = lib.types.bool; - default = true; - example = false; - description = '' - Whether to set up celery as an asynchronous task runner. - ''; - }; - extraArgs = lib.mkOption { type = with lib.types; listOf str; default = [ ]; @@ -255,10 +276,8 @@ in celery = { backend = lib.mkOption { type = with lib.types; nullOr str; - default = lib.optionalString cfg.celery.enable "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1"; - defaultText = lib.literalExpression '' - optionalString config.services.pretalx.celery.enable "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1" - ''; + default = "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1"; + defaultText = lib.literalExpression "redis+socket://\${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1"; description = '' URI to the celery backend used for the asynchronous job queue. ''; @@ -266,10 +285,8 @@ in broker = lib.mkOption { type = with lib.types; nullOr str; - default = lib.optionalString cfg.celery.enable "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2"; - defaultText = lib.literalExpression '' - optionalString config.services.pretalx.celery.enable "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2" - ''; + default = "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2"; + defaultText = lib.literalExpression "redis+socket://\${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2"; description = '' URI to the celery broker used for the asynchronous job queue. ''; @@ -325,18 +342,7 @@ in # https://docs.pretalx.org/administrator/installation/ environment.systemPackages = [ - (pkgs.writeScriptBin "pretalx-manage" '' - cd ${cfg.settings.filesystem.data} - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=PRETALX_CONFIG_FILE' - fi - set -a - ${lib.concatMapStringsSep "\n" (file: ". ${lib.escapeShellArg file}") cfg.environmentFiles} - set +a - export PRETALX_CONFIG_FILE=${configFile} - $sudo ${lib.getExe' pythonEnv "pretalx-manage"} "$@" - '') + pretalxManageWrapper ]; services.logrotate.settings.pretalx = { @@ -370,6 +376,15 @@ in access_log off; more_set_headers 'Content-Disposition: attachment; filename="$1"'; expires 7d; + types { + # prevent xss through file uploads + text/plain html; + text/plain htm; + text/plain svg; + text/plain svgz; + text/plain js; + text/plain mjs; + } ''; }; "/static/" = { @@ -508,23 +523,21 @@ in }; }; - pretalx-worker = lib.mkIf cfg.celery.enable ( - lib.recursiveUpdate commonUnitConfig { - description = "pretalx asynchronous job runner"; - after = [ - "network.target" - "redis-pretalx.service" - ] - ++ lib.optionals (cfg.settings.database.backend == "postgresql") [ - "postgresql.target" - ] - ++ lib.optionals (cfg.settings.database.backend == "mysql") [ - "mysql.service" - ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${lib.getExe' pythonEnv "celery"} -A pretalx.celery_app worker ${cfg.celery.extraArgs}"; - } - ); + pretalx-worker = lib.recursiveUpdate commonUnitConfig { + description = "pretalx asynchronous job runner"; + after = [ + "network.target" + "redis-pretalx.service" + ] + ++ lib.optionals (cfg.settings.database.backend == "postgresql") [ + "postgresql.target" + ] + ++ lib.optionals (cfg.settings.database.backend == "mysql") [ + "mysql.service" + ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${lib.getExe' pythonEnv "celery"} -A pretalx.celery_app worker ${cfg.celery.extraArgs}"; + }; nginx.serviceConfig.SupplementaryGroups = lib.mkIf cfg.nginx.enable [ "pretalx" ]; }; diff --git a/nixos/modules/services/web-apps/pretix.nix b/nixos/modules/services/web-apps/pretix.nix index c62ae9bcc49e..9649f98349f8 100644 --- a/nixos/modules/services/web-apps/pretix.nix +++ b/nixos/modules/services/web-apps/pretix.nix @@ -24,7 +24,6 @@ let mkOption mkPackageOption optionals - optionalString recursiveUpdate types ; @@ -60,6 +59,24 @@ let }; withRedis = cfg.settings.redis.location != null; + + pretixManageWrapper = pkgs.writeShellApplication { + name = "pretix-manage"; + runtimeInputs = with pkgs; [ + util-linux + ]; + text = '' + cd ${cfg.settings.pretix.datadir} + export PRETIX_CONFIG_FILE=${configFile} + exec runuser ${ + lib.cli.toCommandLineShellGNU { } { + inherit (cfg) user; + supp-group = if withRedis then config.services.redis.servers.pretix.group else null; + whitelist-environment = "PRETIX_CONFIG_FILE"; + } + } -- ${getExe' pythonEnv "pretix-manage"} "$@" + ''; + }; in { meta = { @@ -396,15 +413,7 @@ in # https://docs.pretix.eu/en/latest/admin/installation/index.html environment.systemPackages = [ - (pkgs.writeScriptBin "pretix-manage" '' - cd ${cfg.settings.pretix.datadir} - sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} ${optionalString withRedis "-g redis-pretix"} --preserve-env=PRETIX_CONFIG_FILE' - fi - export PRETIX_CONFIG_FILE=${configFile} - $sudo ${getExe' pythonEnv "pretix-manage"} "$@" - '') + pretixManageWrapper ]; services.logrotate.settings.pretix = { diff --git a/nixos/modules/services/web-apps/rustical.nix b/nixos/modules/services/web-apps/rustical.nix index a92daf8c07b4..56661c9c24d6 100644 --- a/nixos/modules/services/web-apps/rustical.nix +++ b/nixos/modules/services/web-apps/rustical.nix @@ -149,6 +149,8 @@ in EnvironmentFile = cfg.environmentFiles; Restart = "on-failure"; StateDirectory = "rustical"; + RuntimeDirectory = "rustical"; + RuntimeDirectoryMode = "0750"; CapabilityBoundingSet = ""; DevicePolicy = "closed"; @@ -172,6 +174,7 @@ in RestrictAddressFamilies = [ "AF_INET" "AF_INET6" + "AF_UNIX" ]; RestrictNamespaces = true; RestrictRealtime = true; @@ -181,7 +184,7 @@ in "~@privileged @resources" ]; SystemCallErrorNumber = "EPERM"; - UMask = "0077"; + UMask = "0007"; }; }; }; diff --git a/nixos/modules/services/web-apps/rutorrent.nix b/nixos/modules/services/web-apps/rutorrent.nix index 82684f884980..c27f22324d3c 100644 --- a/nixos/modules/services/web-apps/rutorrent.nix +++ b/nixos/modules/services/web-apps/rutorrent.nix @@ -75,8 +75,8 @@ in default = [ "httprpc" ]; example = literalExpression ''[ "httprpc" "data" "diskspace" "edit" "erasedata" "theme" "trafic" ]''; description = '' - List of plugins to enable. See the list of available plugins. Note: the unpack plugin needs the nonfree unrar package. - You need to either enable one of the rpc or httprpc plugin or enable the option. + List of plugins to enable. See the list of [available plugins](https://github.com/Novik/ruTorrent/wiki/Plugins#currently-there-are-the-following-plugins). Note: the `unpack` plugin needs the nonfree `unrar` package. + You need to either enable one of the `rpc` or `httprpc` plugin or enable the {option}`services.rutorrent.nginx.exposeInsecureRPC2mount` option. ''; }; @@ -97,7 +97,7 @@ in "pm.max_requests" = 500; }; description = '' - Options for ruTorrent's PHP pool. See the documentation on php-fpm.conf for details on configuration directives. + Options for ruTorrent's PHP pool. See the documentation on `php-fpm.conf` for details on configuration directives. ''; }; @@ -107,8 +107,8 @@ in default = false; description = '' Whether to enable nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. + Further nginx configuration can be done by adapting `services.nginx.virtualHosts.`. + See {option}`services.nginx.virtualHosts` for further information. ''; }; @@ -116,8 +116,8 @@ in type = types.bool; default = false; description = '' - If you do not enable one of the rpc or httprpc plugins you need to expose an RPC mount through scgi using this option. - Warning: This allow to run arbitrary commands, as the rtorrent user, so make sure to use authentification. The simplest way would be to use the services.nginx.virtualHosts.<name>.basicAuth option. + If you do not enable one of the `rpc` or `httprpc` plugins you need to expose an RPC mount through scgi using this option. + Warning: This allow to run arbitrary commands, as the rtorrent user, so make sure to use authentication. The simplest way would be to use the {option}`services.nginx.virtualHosts..basicAuth` option. ''; }; }; diff --git a/nixos/modules/services/web-apps/strichliste.nix b/nixos/modules/services/web-apps/strichliste.nix index e32a2a169169..8aa78f62bcd0 100644 --- a/nixos/modules/services/web-apps/strichliste.nix +++ b/nixos/modules/services/web-apps/strichliste.nix @@ -128,21 +128,23 @@ in }; account = { - lower = mkOption { - type = types.int; - default = -200000; - example = 0; - description = '' - The credit limit for user accounts. - ''; - }; + boundary = { + lower = mkOption { + type = types.int; + default = -200000; + example = 0; + description = '' + The credit limit for user accounts. + ''; + }; - upper = mkOption { - type = types.ints.positive; - default = 200000; - description = '' - The maximum balance on a user account. - ''; + upper = mkOption { + type = types.ints.positive; + default = 200000; + description = '' + The maximum balance on a user account. + ''; + }; }; }; @@ -256,7 +258,7 @@ in }; }; - transaction = { + transactions = { enabled = mkOption { type = types.bool; default = true; @@ -476,20 +478,15 @@ in inherit (cfg) environment; serviceConfig = { Type = "oneshot"; + RemainAfterExit = true; User = "strichliste"; Group = "strichliste"; EnvironmentFile = cfg.environmentFiles; - ExecStart = map toString [ - [ - (lib.getExe cfg.packages.backend) - "cache:clear" - ] - [ - (lib.getExe cfg.packages.backend) - "doctrine:migrations:migrate" - "--allow-no-migration" - "--no-interaction" - ] + ExecStart = toString [ + (lib.getExe cfg.packages.backend) + "doctrine:migrations:migrate" + "--allow-no-migration" + "--no-interaction" ]; }; }; @@ -497,6 +494,11 @@ in systemd.services.phpfpm-strichliste = { inherit (cfg) environment; serviceConfig.EnvironmentFile = cfg.environmentFiles; + restartTriggers = [ settingsFile ]; + preStart = toString [ + (lib.getExe cfg.packages.backend) + "cache:clear" + ]; }; services.phpfpm.pools.strichliste = { diff --git a/nixos/modules/services/web-apps/stump.nix b/nixos/modules/services/web-apps/stump.nix new file mode 100644 index 000000000000..8dbf1dfcb7da --- /dev/null +++ b/nixos/modules/services/web-apps/stump.nix @@ -0,0 +1,172 @@ +{ + lib, + config, + pkgs, + ... +}: + +let + cfg = config.services.stump; + + inherit (lib) + types + mkIf + mkOption + mkEnableOption + ; + + secret = types.nullOr ( + types.str + // { + # We don't want users to be able to pass a path literal here but + # it should look like a path. + check = it: lib.isString it && lib.types.path.check it; + } + ); +in +{ + options.services.stump = { + enable = mkEnableOption "Stump"; + package = lib.mkPackageOption pkgs "stump" { }; + + configLocation = mkOption { + type = types.path; + default = "/var/lib/stump"; + description = "Directory used to store the database and configuration files. If it is not the default, the directory has to be created manually such that the stump user is able to read and write to it."; + }; + + environment = mkOption { + type = types.attrsOf types.str; + default = { }; + example = { + STUMP_VERBOSITY = "2"; + }; + description = '' + Extra configuration environment variables. Refer to the [documentation](https://www.stumpapp.dev/docs/guides/configuration/server-config) for options. + ''; + }; + + environmentFile = mkOption { + type = secret; + example = "/run/secrets/stump"; + default = null; + description = '' + Path of a file with extra environment variables to be loaded from disk. + This file is not added to the nix store, so it can be used to pass secrets to stump. + Refer to the [documentation](https://www.stumpapp.dev/docs/guides/configuration/server-config) for options. + ''; + }; + + secretFiles = mkOption { + type = types.attrsOf secret; + example = { + STUMP_OIDC_CLIENT_SECRET = "/run/secrets/stump_client_secret"; + }; + default = { }; + description = '' + Attribute set containing paths to files to add to the environment of stump. + The files are not added to the nix store, so they can be used to pass secrets to stump. + Refer to the [documentation](https://www.stumpapp.dev/docs/guides/configuration/server-config) for options. + ''; + }; + + ip = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "The IP address that Stump will listen on."; + }; + port = mkOption { + type = types.port; + default = 10001; + description = "The port that Stump will listen on."; + }; + openFirewall = mkOption { + type = types.bool; + default = false; + description = "Whether to open the Stump port in the firewall"; + }; + user = mkOption { + type = types.str; + default = "stump"; + description = "The user Stump should run as."; + }; + group = mkOption { + type = types.str; + default = "stump"; + description = "The group stump should run as."; + }; + }; + + config = mkIf cfg.enable { + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; + + services.stump.environment = { + STUMP_IP = cfg.ip; + STUMP_PORT = toString cfg.port; + STUMP_CONFIG_DIR = cfg.configLocation; + }; + + systemd.services.stump = { + description = "Stump (A free and open source comics, manga and digital book server with OPDS support)"; + requires = [ "network-online.target" ]; + after = [ "network-online.target" ]; + wantedBy = [ "multi-user.target" ]; + environment = cfg.environment; + serviceConfig = { + Type = "simple"; + Restart = "on-failure"; + RestartSec = 3; + + ExecStart = + if cfg.secretFiles == { } then + "${lib.getExe cfg.package}" + else + pkgs.writeShellScript "stump-env" '' + ${lib.strings.concatStringsSep "\n" ( + lib.attrsets.mapAttrsToList (key: path: "export ${key}=$(< \"${path}\")") cfg.secretFiles + )} + ${lib.getExe cfg.package} + ''; + EnvironmentFile = cfg.environmentFile; + StateDirectory = "stump"; + User = cfg.user; + Group = cfg.group; + + # Hardening + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + PrivateUsers = true; + PrivateTmp = true; + PrivateDevices = true; + PrivateMounts = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + "AF_NETLINK" # is used to determine local ip + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + }; + }; + + users.users = mkIf (cfg.user == "stump") { + stump = { + name = "stump"; + group = cfg.group; + isSystemUser = true; + }; + }; + users.groups = mkIf (cfg.group == "stump") { stump = { }; }; + + meta.maintainers = with lib.maintainers; [ jvanbruegge ]; + }; +} diff --git a/nixos/modules/services/web-apps/tabbyapi.nix b/nixos/modules/services/web-apps/tabbyapi.nix index 0340e69775a7..a955afe463b5 100644 --- a/nixos/modules/services/web-apps/tabbyapi.nix +++ b/nixos/modules/services/web-apps/tabbyapi.nix @@ -34,7 +34,7 @@ in host = lib.mkOption { type = lib.types.str; default = "127.0.0.1"; - description = "The IP to host on. Use 0.0.0.0 to expose on all adapters."; + description = "The IP to host on. Use 0.0.0.0 to expose on all network adapters."; }; port = lib.mkOption { @@ -46,13 +46,22 @@ in disable_auth = lib.mkOption { type = lib.types.bool; default = false; - description = "Disable HTTP token authentication. WARNING: Vulnerable if exposed."; + description = '' + Disable HTTP token authentication with requests. + WARNING: This will make your instance vulnerable! Only turn this on if you are ONLY connecting from localhost. + ''; + }; + + disable_fetch_requests = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Disable fetching external content in response to requests, such as images from URLs."; }; api_servers = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "OAI" ]; - description = "Select API servers to enable. Options: OAI, Kobold."; + description = "Select API servers to enable. Possible values: OAI, Kobold."; }; }; @@ -66,7 +75,18 @@ in log_requests = lib.mkOption { type = lib.types.bool; default = false; - description = "Enable request logging. Only use for debug."; + description = "Enable request logging. NOTE: Only use this for debugging!"; + }; + + log_chat_completion_requests = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Write every /v1/chat/completions request to logs/debug/ as JSON. + PRIVACY WARNING: Enabling this creates a comprehensive request log, including the + full message history and generation parameters. API keys are redacted, but prompts + and user-provided content are preserved for bug-report reproduction. + ''; }; }; @@ -111,35 +131,94 @@ in ''; }; + inline_model_loading = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Allow direct loading of models from a completion or chat completion request. + This method of loading is strict by default; enable dummy models to add + exceptions for invalid model names. + ''; + }; + model_name = lib.mkOption { type = lib.types.nullOr lib.types.str; default = null; - description = "The initial model to load on startup. Must exist in model_dir."; + description = '' + An initial model to load. Make sure the model is located in the model directory! + REQUIRED: This must be filled out to load a model on startup. + ''; example = "Qwen3_5-9B"; }; max_seq_len = lib.mkOption { type = lib.types.nullOr lib.types.int; default = null; - description = "Max sequence length. Set null to use model defaults."; + description = '' + Max sequence length (default: min(max_position_embeddings, cache_size)). + Set to -1 to fetch from the model's config.json. + ''; }; cache_mode = lib.mkOption { type = lib.types.str; default = "FP16"; - description = "Cache mode for VRAM savings. ExLlamaV2: FP16, Q8, Q6, Q4. ExLlamaV3: specific pair string (e.g., '8,8')."; + description = '' + Enable different cache modes for VRAM savings. + Specify the pair k_bits,v_bits where k_bits and v_bits are integers from 2-8 (e.g. '8,8'). + The legacy values 'FP16', 'Q8', 'Q6', 'Q4' are also accepted. + ''; + }; + + tensor_parallel = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Load model with tensor parallelism. + Falls back to autosplit if GPU split isn't provided. This ignores the gpu_split_auto value. + ''; }; gpu_split_auto = lib.mkOption { type = lib.types.bool; default = true; - description = "Automatically allocate resources to GPUs."; + description = "Automatically allocate resources to GPUs. Not parsed for single GPU users."; }; dummy_model_names = lib.mkOption { type = lib.types.listOf lib.types.str; default = [ "gpt-3.5-turbo" ]; - description = "List of fake model names sent via the /v1/models endpoint."; + description = '' + A list of fake model names that are sent via the /v1/models endpoint. + Also used as bypasses for strict mode if inline_model_loading is true. + ''; + }; + + vision = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Enables vision support if the model supports it."; + }; + + reasoning = lib.mkOption { + type = lib.types.bool; + default = false; + description = '' + Enable reasoning parser. + Do NOT enable this if the model is not a reasoning model (e.g. deepseek-r1 series). + ''; + }; + + reasoning_start_token = lib.mkOption { + type = lib.types.str; + default = ""; + description = "The start token for reasoning content."; + }; + + reasoning_end_token = lib.mkOption { + type = lib.types.str; + default = ""; + description = "The end token for reasoning content."; }; }; }; @@ -167,6 +246,13 @@ in wantedBy = [ "multi-user.target" ]; description = "TabbyAPI - OAI compatible server for Exllama"; + # Triton & huggingface downloader need writable cache folders + environment = { + HOME = "/var/lib/tabbyapi"; + XDG_CACHE_HOME = "/var/lib/tabbyapi/.cache"; + TRITON_CACHE_DIR = "/tmp/triton"; + }; + serviceConfig = { ExecStart = "${lib.getExe cfg.package} --config=${configFile}"; Restart = "on-failure"; diff --git a/nixos/modules/services/web-apps/wealthfolio.nix b/nixos/modules/services/web-apps/wealthfolio.nix new file mode 100644 index 000000000000..61d488595a90 --- /dev/null +++ b/nixos/modules/services/web-apps/wealthfolio.nix @@ -0,0 +1,184 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.services.wealthfolio; +in +{ + options.services.wealthfolio = { + enable = lib.mkEnableOption "Wealthfolio personal investment tracker"; + package = lib.mkPackageOption pkgs "wealthfolio-server" { }; + + address = lib.mkOption { + type = lib.types.str; + default = "127.0.0.1"; + description = "The IP address the Wealthfolio server binds to."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8088; + description = "The port the Wealthfolio server listens on."; + }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Whether to automatically open the specified port in the system firewall."; + }; + + secretKeyFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = lib.literalExpression "config.age.secrets.wealthfolio-key.path"; + description = '' + Path to a file containing the 32-byte secret key used for encrypting sensitive data + at rest (broker credentials, API keys) and signing JWT tokens. + + Generate with: `openssl rand -base64 32`. + + Note: Losing this key means losing access to all stored encrypted secrets. + There is no recovery. + ''; + }; + + authPasswordHashFile = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = lib.literalExpression "config.age.secrets.wealthfolio-hash.path"; + description = '' + Path to a file containing the Argon2id PHC string defining the login password. + Required for web access unless `authRequired` is false. + + Generate with: `printf 'your-password' | argon2 yoursalt16chars! -id -e` + ''; + }; + + authRequired = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether to require internal authentication. + + Security Note: The server panics at startup if the listener is bound to a + non-loopback address and authentication is disabled. Set this to `false` + only if a reverse proxy handles authentication for you. + ''; + }; + + corsAllowOrigins = lib.mkOption { + type = lib.types.str; + default = "*"; + example = "https://wealthfolio.example.com"; + description = '' + Comma-separated list of allowed CORS origins. + + Security Note: The server panics at startup if `*` is used while authentication + is enabled, as this is a CSRF vector. Set explicit origins matching your + deployment URL (scheme + host + port). + ''; + }; + + authTokenTtlMinutes = lib.mkOption { + type = lib.types.ints.positive; + default = 60; + description = "JWT access token lifetime in minutes. (e.g., 1440 for 24h, 10080 for 7d)."; + }; + + cookieSecure = lib.mkOption { + type = lib.types.enum [ + "auto" + "true" + "false" + ]; + default = "auto"; + description = '' + Controls the Secure attribute on the authentication session cookie. + - auto: Sets Secure based on HTTPS protocol. + - true: Always sets Secure (Use behind a reverse proxy that terminates HTTPS). + - false: Never sets Secure (Not recommended). + ''; + }; + + requestTimeoutMs = lib.mkOption { + type = lib.types.ints.positive; + default = 300000; + description = "HTTP request timeout in milliseconds. Default (5m) accommodates large broker syncs."; + }; + + logFormat = lib.mkOption { + type = lib.types.enum [ + "text" + "json" + ]; + default = "text"; + description = "Log output format. `json` is recommended if shipping to log aggregators."; + }; + }; + + config = lib.mkIf cfg.enable { + networking.firewall.allowedTCPPorts = lib.optional cfg.openFirewall cfg.port; + + assertions = [ + { + assertion = cfg.secretKeyFile != null; + message = "services.wealthfolio: secretKeyFile must be provided."; + } + { + assertion = cfg.authRequired -> cfg.authPasswordHashFile != null; + message = "services.wealthfolio: authPasswordHashFile must be provided when authRequired is true."; + } + { + assertion = cfg.authRequired -> cfg.corsAllowOrigins != "*"; + message = "services.wealthfolio: corsAllowOrigins cannot be '*' when authRequired is true. Provide an explicit domain."; + } + ]; + + systemd.services.wealthfolio = { + description = "Wealthfolio server service daemon."; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + WF_LISTEN_ADDR = "${cfg.address}:${toString cfg.port}"; + WF_DB_PATH = "/var/lib/wealthfolio/wealthfolio.db"; + WF_AUTH_REQUIRED = lib.boolToString cfg.authRequired; + WF_CORS_ALLOW_ORIGINS = cfg.corsAllowOrigins; + WF_AUTH_TOKEN_TTL_MINUTES = toString cfg.authTokenTtlMinutes; + WF_COOKIE_SECURE = cfg.cookieSecure; + WF_REQUEST_TIMEOUT_MS = toString cfg.requestTimeoutMs; + WF_LOG_FORMAT = cfg.logFormat; + }; + + script = '' + ${lib.optionalString ( + cfg.secretKeyFile != null + ) "export WF_SECRET_KEY=$(<\"$CREDENTIALS_DIRECTORY/secret_key\")"} + ${lib.optionalString ( + cfg.authPasswordHashFile != null + ) "export WF_AUTH_PASSWORD_HASH=$(<\"$CREDENTIALS_DIRECTORY/auth_hash\")"} + + exec ${lib.getExe cfg.package} + ''; + + serviceConfig = { + LoadCredential = + lib.optional (cfg.secretKeyFile != null) "secret_key:${cfg.secretKeyFile}" + ++ lib.optional (cfg.authPasswordHashFile != null) "auth_hash:${cfg.authPasswordHashFile}"; + + DynamicUser = true; + StateDirectory = "wealthfolio"; + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + }; + }; + }; + + meta = { + maintainers = with lib.maintainers; [ luuumine ]; + }; +} diff --git a/nixos/modules/services/web-servers/caddy/default.nix b/nixos/modules/services/web-servers/caddy/default.nix index 2ff45efd4e43..d707a6c4635c 100644 --- a/nixos/modules/services/web-servers/caddy/default.nix +++ b/nixos/modules/services/web-servers/caddy/default.nix @@ -448,8 +448,8 @@ in ''; # https://github.com/quic-go/quic-go/wiki/UDP-Buffer-Sizes - boot.kernel.sysctl."net.core.rmem_max" = mkDefault 2500000; - boot.kernel.sysctl."net.core.wmem_max" = mkDefault 2500000; + boot.kernel.sysctl."net.core.rmem_max" = mkDefault 7500000; + boot.kernel.sysctl."net.core.wmem_max" = mkDefault 7500000; systemd.packages = [ cfg.package ]; systemd.services.caddy = { diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 73efd441d23d..9553090e8c85 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -126,6 +126,28 @@ let '') (filterAttrs (name: conf: conf.enable) cfg.proxyCachePath) ); + # openresty bundles the lua module and resty.core; stock nginx needs them added. + packageBundlesLua = p: lib.getName p == "openresty"; + luaEnv = pkgs.luajit_openresty.withPackages ( + ps: + lib.optional (cfg.lua.enable && !packageBundlesLua cfg.package) ps.lua-resty-core + ++ cfg.lua.extraPackages ps + ); + luaVersion = pkgs.luajit_openresty.luaversion; + # Lua modules install under lib/lua or share/lua depending on the package; ;; keeps nginx's defaults. + luaConfig = '' + lua_package_path '${ + lib.concatMapStringsSep ";" (s: "${luaEnv}/${s}") [ + "lib/lua/${luaVersion}/?.lua" + "lib/lua/${luaVersion}/?/init.lua" + "share/lua/${luaVersion}/?.lua" + "share/lua/${luaVersion}/?/init.lua" + ] + };;'; + lua_package_cpath '${luaEnv}/lib/lua/${luaVersion}/?.so;;'; + lua_ssl_trusted_certificate ${config.security.pki.caBundle}; + ''; + toUpstreamParameter = key: value: if builtins.isBool value then lib.optionalString value key else "${key}=${toString value}"; @@ -295,6 +317,8 @@ let server_tokens ${if cfg.serverTokens then "on" else "off"}; + ${optionalString cfg.lua.enable luaConfig} + ${cfg.commonHttpConfig} ${proxyCachePathConfig} @@ -388,7 +412,7 @@ let " listen ${addr}${optionalString (port != null) ":${toString port}"} quic " + optionalString vhost.default "default_server " - + optionalString vhost.reuseport "reuseport " + + optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport " + optionalString (extraParameters != [ ]) ( concatStringsSep " " ( let @@ -414,7 +438,7 @@ let + optionalString (ssl && vhost.http2 && oldHTTP2) "http2 " + optionalString ssl "ssl " + optionalString vhost.default "default_server " - + optionalString vhost.reuseport "reuseport " + + optionalString (vhost.reuseport && !(lib.hasPrefix "unix:" addr)) "reuseport " + optionalString proxyProtocol "proxy_protocol " + optionalString (extraParameters != [ ]) (concatStringsSep " " extraParameters) + ";"; @@ -771,7 +795,11 @@ in apply = p: p.override { - modules = lib.unique (p.modules ++ cfg.additionalModules); + modules = lib.unique ( + p.modules + ++ cfg.additionalModules + ++ lib.optional (cfg.lua.enable && !packageBundlesLua p) pkgs.nginxModules.lua + ); }; description = '' Nginx package to use. This defaults to the stable version. Note @@ -791,6 +819,36 @@ in ''; }; + lua = { + enable = mkEnableOption '' + Lua scripting in nginx via OpenResty's lua-nginx-module, + wiring up `lua_package_path`/`lua_package_cpath` for + {option}`services.nginx.lua.extraPackages`. + + Use this to add Lua to a stock nginx. For the full OpenResty platform — + required by libraries that depend on its bundled lualib (for example + `lua-resty-openidc`, which needs `resty.string` and friends) — set + {option}`services.nginx.package` to `pkgs.openresty` instead; this option + then only sets up the search path and leaves OpenResty's built-in Lua + module in place + ''; + + extraPackages = mkOption { + type = types.functionTo (types.listOf types.package); + default = ps: [ ]; + defaultText = literalExpression "ps: [ ]"; + example = literalExpression '' + ps: with ps; [ lua-resty-openidc ] + ''; + description = '' + Extra Lua packages to put on `lua_package_path` / `lua_package_cpath`, + for both stock nginx and `pkgs.openresty`. Packages are selected from + `pkgs.luajit_openresty.pkgs`. `lua-resty-core`, which the Lua module + requires to start, is added automatically. + ''; + }; + }; + logError = mkOption { default = "stderr"; type = types.str; @@ -1559,7 +1617,7 @@ in MemoryDenyWriteExecute = !( (builtins.any (mod: (mod.allowMemoryWriteExecute or false)) cfg.package.modules) - || (cfg.package == pkgs.openresty) + || (lib.getName cfg.package == "openresty") ); RestrictRealtime = true; RestrictSUIDSGID = true; @@ -1633,9 +1691,7 @@ in ) ); - environment.etc."nginx/nginx.conf" = mkIf cfg.enableReload { - source = configFile; - }; + environment.etc."nginx/nginx.conf".source = configFile; security.acme.certs = let @@ -1699,4 +1755,8 @@ in postrotate = "[ ! -f /var/run/nginx/nginx.pid ] || kill -USR1 `cat /var/run/nginx/nginx.pid`"; }; }; + meta.maintainers = [ + lib.maintainers.leona + lib.maintainers.ma27 + ]; } diff --git a/nixos/modules/services/web-servers/nginx/gitweb.nix b/nixos/modules/services/web-servers/nginx/gitweb.nix deleted file mode 100644 index c379245c5bff..000000000000 --- a/nixos/modules/services/web-servers/nginx/gitweb.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.nginx.gitweb; - gitwebConfig = config.services.gitweb; - package = pkgs.gitweb.override ( - optionalAttrs gitwebConfig.gitwebTheme { - gitwebTheme = true; - } - ); - -in -{ - - options.services.nginx.gitweb = { - - enable = mkOption { - default = false; - type = types.bool; - description = '' - If true, enable gitweb in nginx. - ''; - }; - - location = mkOption { - default = "/gitweb"; - type = types.str; - description = '' - Location to serve gitweb on. - ''; - }; - - user = mkOption { - default = "nginx"; - type = types.str; - description = '' - Existing user that the CGI process will belong to. (Default almost surely will do.) - ''; - }; - - group = mkOption { - default = "nginx"; - type = types.str; - description = '' - Group that the CGI process will belong to. (Set to `config.services.gitolite.group` if you are using gitolite.) - ''; - }; - - virtualHost = mkOption { - default = "_"; - type = types.str; - description = '' - VirtualHost to serve gitweb on. Default is catch-all. - ''; - }; - - }; - - config = mkIf cfg.enable { - - systemd.services.gitweb = { - description = "GitWeb service"; - script = "${package}/gitweb.cgi --fastcgi --nproc=1"; - environment = { - FCGI_SOCKET_PATH = "/run/gitweb/gitweb.sock"; - }; - serviceConfig = { - User = cfg.user; - Group = cfg.group; - RuntimeDirectory = [ "gitweb" ]; - }; - wantedBy = [ "multi-user.target" ]; - }; - - services.nginx = { - virtualHosts.${cfg.virtualHost} = { - locations."${cfg.location}/static/" = { - alias = "${package}/static/"; - }; - locations."${cfg.location}/" = { - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi_params; - fastcgi_param GITWEB_CONFIG ${gitwebConfig.gitwebConfigFile}; - fastcgi_pass unix:/run/gitweb/gitweb.sock; - ''; - }; - }; - }; - - }; - - meta.maintainers = [ ]; - -} diff --git a/nixos/modules/services/web-servers/phpfpm/default.nix b/nixos/modules/services/web-servers/phpfpm/default.nix index 34845589fabe..43d394ad39f4 100644 --- a/nixos/modules/services/web-servers/phpfpm/default.nix +++ b/nixos/modules/services/web-servers/phpfpm/default.nix @@ -18,6 +18,15 @@ let "yes" else if false == value then "no" + else if isString value then + # Escape according to https://www.php.net/manual/en/function.parse-ini-file.php + # Not escaping `$` since users might want to use that to interpolate environment variables. + # Additionally, php-fpm applies post-processing to env values that start with `$` and replaces + # them with the respective env variable, with no way to escape: https://github.com/php/php-src/blob/631c366f9f58c8ba4078a48d1f56187cfbf8e549/sapi/fpm/fpm/fpm_env.c#L171-L180 + # In all platforms except for Windows, PHP_EOL is the line feed `\n` character, + # which we use here as an escape value since php-fpm parses the config line-by-line. + # See https://github.com/NixOS/nixpkgs/pull/516530#issuecomment-4878738511 for more information. + ''"${replaceString "\n" ''" PHP_EOL "'' (escape [ "\"" "\\" ] value)}"'' else toString value; diff --git a/nixos/modules/services/web-servers/rustfs.nix b/nixos/modules/services/web-servers/rustfs.nix new file mode 100644 index 000000000000..675a6314426b --- /dev/null +++ b/nixos/modules/services/web-servers/rustfs.nix @@ -0,0 +1,151 @@ +{ + config, + lib, + pkgs, + ... +}: + +let + cfg = config.services.rustfs; +in +{ + meta.maintainers = with lib.maintainers; [ + marcel + ]; + + options.services.rustfs = { + enable = lib.mkEnableOption "RustFS Object Storage Server"; + + package = lib.mkPackageOption pkgs "rustfs" { }; + + user = lib.mkOption { + type = lib.types.str; + default = "rustfs"; + description = "The user RustFS should run as."; + }; + + group = lib.mkOption { + type = lib.types.str; + default = "rustfs"; + description = "The group RustFS should run as."; + }; + + settings = lib.mkOption { + default = { }; + description = '' + Options for RustFS configuration. Refer to + + for details on supported values. + ''; + example = lib.literalExpression '' + { + RUSTFS_CONSOLE_ENABLE = "true"; + RUSTFS_VOLUMES = "/mnt/rustfs"; + } + ''; + type = lib.types.submodule { + freeformType = lib.types.attrsOf ( + lib.types.oneOf [ + lib.types.str + lib.types.int + ] + ); + options = { + RUSTFS_VOLUMES = lib.mkOption { + type = lib.types.path; + default = "/var/lib/rustfs"; + description = "The directory where RustFS stores it's data."; + }; + }; + }; + }; + + environmentFile = lib.mkOption { + type = lib.types.str; + description = "Path to environment file containing secrets like RUSTFS_ACCESS_KEY or RUSTFS_SECRET_KEY."; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = !(cfg.settings ? RUSTFS_ACCESS_KEY); + message = "RUSTFS_ACCESS_KEY must not be set in services.rustfs.settings. Use environmentFile instead."; + } + { + assertion = !(cfg.settings ? RUSTFS_SECRET_KEY); + message = "RUSTFS_SECRET_KEY must not be set in services.rustfs.settings. Use environmentFile instead."; + } + ]; + + systemd = { + tmpfiles.settings."10-rustfs".${cfg.settings.RUSTFS_VOLUMES}.d = { + inherit (cfg) user group; + }; + + # https://docs.rustfs.com/installation/linux/single-node-single-disk.html#_6-configure-system-service + services.rustfs = { + description = "RustFS Object Storage Server"; + documentation = [ "https://rustfs.com/docs/" ]; + + after = [ "network-online.target" ]; + wants = [ "network-online.target" ]; + + wantedBy = [ "multi-user.target" ]; + + environment = cfg.settings; + + preStart = '' + if [ -z "$RUSTFS_ACCESS_KEY" ] || [ -z "$RUSTFS_SECRET_KEY" ]; then + echo "RustFS uses well-known default values for RUSTFS_ACCESS_KEY and RUSTFS_SECRET_KEY," + echo "please configure them using services.rustfs.environmentFile." + exit 1 + fi + ''; + + serviceConfig = { + Type = "notify"; + NotifyAccess = "main"; + User = cfg.user; + Group = cfg.group; + + EnvironmentFile = cfg.environmentFile; + ExecStart = lib.getExe cfg.package; + + LimitNOFILE = 1048576; + LimitNPROC = 32768; + TasksMax = "infinity"; + + Restart = "always"; + RestartSec = "10s"; + + OOMScoreAdjust = "-1000"; + SendSIGKILL = false; + + TimeoutStartSec = "30s"; + TimeoutStopSec = "30s"; + + NoNewPrivileges = true; + + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectClock = true; + ProtectKernelTunables = true; + ProtectKernelModules = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + RestrictRealtime = true; + }; + }; + }; + + users = { + users.${cfg.user} = { + isSystemUser = true; + inherit (cfg) group; + }; + groups.${cfg.group} = { }; + }; + }; +} diff --git a/nixos/modules/services/x11/desktop-managers/cinnamon.nix b/nixos/modules/services/x11/desktop-managers/cinnamon.nix index a91fa045aa7a..1fb9a39782e7 100644 --- a/nixos/modules/services/x11/desktop-managers/cinnamon.nix +++ b/nixos/modules/services/x11/desktop-managers/cinnamon.nix @@ -111,15 +111,26 @@ in services.blueman.enable = mkDefault (notExcluded pkgs.blueman); services.hardware.bolt.enable = mkDefault (notExcluded pkgs.bolt); hardware.bluetooth.enable = mkDefault true; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; services.accounts-daemon.enable = true; - services.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); services.dbus.packages = with pkgs; [ cinnamon cinnamon-screensaver nemo-with-extensions xapp ]; + systemd.packages = + with pkgs; + [ + cinnamon-session + ] + ++ utils.removePackagesByName [ + xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/ + xdg-user-dirs-gtk + ] config.environment.cinnamon.excludePackages; services.cinnamon.apps.enable = mkDefault true; services.gnome.evolution-data-server.enable = true; services.gnome.glib-networking.enable = true; @@ -215,9 +226,13 @@ in mint-y-icons xapp # provides some xapp-* icons xapp-symbolic-icons + xdg-user-dirs-gtk ] config.environment.cinnamon.excludePackages ); + # For printers@cinnamon.org applet + programs.system-config-printer.enable = (mkIf config.services.printing.enable (mkDefault true)); + xdg.mime.enable = true; xdg.icons.enable = true; diff --git a/nixos/modules/services/x11/desktop-managers/default.nix b/nixos/modules/services/x11/desktop-managers/default.nix index 7ff8cabe244a..0d94ce74a856 100644 --- a/nixos/modules/services/x11/desktop-managers/default.nix +++ b/nixos/modules/services/x11/desktop-managers/default.nix @@ -13,7 +13,7 @@ let # If desktop manager `d' isn't capable of setting a background and # the xserver is enabled, `feh' or `xsetroot' are used as a fallback. - needBGCond = d: !(d ? bgSupport && d.bgSupport) && xcfg.enable; + needBGCond = d: !(d ? bgSupport && d.bgSupport) && xcfg.enable && cfg.wallpaper.enable; in @@ -48,6 +48,16 @@ in services.xserver.desktopManager = { wallpaper = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + The file {file}`~/.background-image` is used as a background image. + The `mode` option specifies the placement of this image onto your desktop. + To disable this, set this option to `false`. + ''; + }; + mode = mkOption { type = types.enum [ "center" @@ -59,9 +69,6 @@ in default = "scale"; example = "fill"; description = '' - The file {file}`~/.background-image` is used as a background image. - This option specifies the placement of this image onto your desktop. - Possible values: `center`: Center the image on the background. If it is too small, it will be surrounded by a black border. `fill`: Like `scale`, but preserves aspect ratio by zooming the image until it fits. Either a horizontal or a vertical part of the image will be cut off. diff --git a/nixos/modules/services/x11/desktop-managers/mate.nix b/nixos/modules/services/x11/desktop-managers/mate.nix index 764e903cc2c5..be5ed185e68d 100644 --- a/nixos/modules/services/x11/desktop-managers/mate.nix +++ b/nixos/modules/services/x11/desktop-managers/mate.nix @@ -141,6 +141,10 @@ in services.libinput.enable = mkDefault true; security.pam.services.mate-screensaver.unixAuth = true; + security.polkit = { + enable = true; + enablePkexecWrapper = mkDefault true; + }; xdg.portal.configPackages = mkDefault [ pkgs.mate-desktop ]; diff --git a/nixos/modules/services/x11/desktop-managers/xfce.nix b/nixos/modules/services/x11/desktop-managers/xfce.nix index 2d53eb58f287..3dcc5431e7c8 100644 --- a/nixos/modules/services/x11/desktop-managers/xfce.nix +++ b/nixos/modules/services/x11/desktop-managers/xfce.nix @@ -220,7 +220,10 @@ in # Enable helpful DBus services. services.udisks2.enable = true; - security.polkit.enable = true; + security.polkit = { + enable = true; + enablePkexecWrapper = lib.mkDefault true; + }; services.accounts-daemon.enable = true; services.upower.enable = config.powerManagement.enable; services.gnome.glib-networking.enable = true; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 2f9a8dcb210a..d5c1277a459c 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -48,7 +48,7 @@ let IFS=: for i in $XDG_CURRENT_DESKTOP; do case $i in - KDE|GNOME|Pantheon|Hyprland|niri|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;; + KDE|GNOME|Pantheon|Hyprland|niri|X-Cinnamon|X-NIXOS-SYSTEMD-AWARE) echo "1"; exit; ;; *) ;; esac done diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix deleted file mode 100644 index 977042a074bd..000000000000 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/enso-os.nix +++ /dev/null @@ -1,122 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -with lib; -let - dmcfg = config.services.xserver.displayManager; - ldmcfg = dmcfg.lightdm; - cfg = ldmcfg.greeters.enso; - - theme = cfg.theme.package; - icons = cfg.iconTheme.package; - cursors = cfg.cursorTheme.package; - - ensoGreeterConf = pkgs.writeText "lightdm-enso-os-greeter.conf" '' - [greeter] - default-wallpaper=${ldmcfg.background} - gtk-theme=${cfg.theme.name} - icon-theme=${cfg.iconTheme.name} - cursor-theme=${cfg.cursorTheme.name} - blur=${toString cfg.blur} - brightness=${toString cfg.brightness} - ${cfg.extraConfig} - ''; -in -{ - options = { - services.xserver.displayManager.lightdm.greeters.enso = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable enso-os-greeter as the lightdm greeter - ''; - }; - - theme = { - package = mkPackageOption pkgs "gnome-themes-extra" { }; - name = mkOption { - type = types.str; - default = "Adwaita"; - description = '' - Name of the theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - iconTheme = { - package = mkPackageOption pkgs "papirus-icon-theme" { }; - name = mkOption { - type = types.str; - default = "ePapirus"; - description = '' - Name of the icon theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - cursorTheme = { - package = mkPackageOption pkgs "capitaine-cursors" { }; - name = mkOption { - type = types.str; - default = "capitane-cursors"; - description = '' - Name of the cursor theme to use for the lightdm-enso-os-greeter - ''; - }; - }; - - blur = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable blur - ''; - }; - - brightness = mkOption { - type = types.int; - default = 7; - description = '' - Brightness - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Extra configuration that should be put in the greeter.conf - configuration file - ''; - }; - }; - }; - - config = mkIf (ldmcfg.enable && cfg.enable) { - environment.etc."lightdm/greeter.conf".source = ensoGreeterConf; - - environment.systemPackages = [ - cursors - icons - theme - ]; - - services.xserver.displayManager.lightdm = { - greeter = mkDefault { - package = pkgs.lightdm-enso-os-greeter.xgreeters; - name = "pantheon-greeter"; - }; - - greeters = { - gtk = { - enable = mkDefault false; - }; - }; - }; - }; -} diff --git a/nixos/modules/services/x11/display-managers/lightdm.nix b/nixos/modules/services/x11/display-managers/lightdm.nix index 699a9a9a07f3..d0d2d8de4411 100644 --- a/nixos/modules/services/x11/display-managers/lightdm.nix +++ b/nixos/modules/services/x11/display-managers/lightdm.nix @@ -83,7 +83,6 @@ in imports = [ ./lightdm-greeters/gtk.nix ./lightdm-greeters/mini.nix - ./lightdm-greeters/enso-os.nix ./lightdm-greeters/pantheon.nix ./lightdm-greeters/lomiri.nix ./lightdm-greeters/tiny.nix @@ -107,6 +106,9 @@ in "user" ] ) + (lib.mkRemovedOptionModule [ "services" "xserver" "displayManager" "lightdm" "greeters" "enso" ] + "services.xserver.displayManager.lightdm.greeters.enso has been removed following removal of the corresponding package." + ) ]; options = { @@ -362,7 +364,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -446,7 +448,7 @@ in { name = "unix"; control = "sufficient"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; } ]; @@ -454,7 +456,7 @@ in { name = "unix"; control = "requisite"; - modulePath = "${config.security.pam.package}/lib/security/pam_unix.so"; + modulePath = config.security.pam.pam_unixModulePath; settings.nullok = true; settings.yescrypt = true; } diff --git a/nixos/modules/system/boot/extra-initrd.nix b/nixos/modules/system/boot/extra-initrd.nix new file mode 100644 index 000000000000..22451c64da7d --- /dev/null +++ b/nixos/modules/system/boot/extra-initrd.nix @@ -0,0 +1,21 @@ +{ config, lib, ... }: +{ + options.system.boot.extraInitrd = { + paths = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = [ ]; + description = '' + List of paths relative to the ESP that are combined with the NixOS + main initrd before being passed to the kernel. + ''; + }; + }; + + config = { + boot.bootspec.extensions = lib.mkIf (config.system.boot.extraInitrd.paths != [ ]) { + "org.nixos.extra-initrd.v1" = { + inherit (config.system.boot.extraInitrd) paths; + }; + }; + }; +} diff --git a/nixos/modules/system/boot/loader/limine/limine-install.py b/nixos/modules/system/boot/loader/limine/limine-install.py index 7b2e263e401e..dacf4a339d0e 100644 --- a/nixos/modules/system/boot/loader/limine/limine-install.py +++ b/nixos/modules/system/boot/loader/limine/limine-install.py @@ -1,7 +1,7 @@ #!@python3@/bin/python3 -B from dataclasses import dataclass -from typing import Any, Callable, Dict, List, Optional, Tuple +from typing import Any, Dict, List, Optional, Tuple import datetime import hashlib @@ -16,6 +16,7 @@ import sys import tempfile import textwrap + @dataclass class XenBootSpec: """Represent the bootspec extension for Xen dom0 kernels""" @@ -25,6 +26,7 @@ class XenBootSpec: params: List[str] version: str + @dataclass class BootSpec: system: str @@ -34,17 +36,20 @@ class BootSpec: label: str toplevel: str specialisations: Dict[str, "BootSpec"] + extraInitrdPaths: list[str] xen: XenBootSpec | None initrd: str | None = None initrdSecrets: str | None = None -install_config = json.load(open('@configPath@', 'r')) + +install_config = json.load(open("@configPath@", "r")) libc = CDLL("libc.so.6") limine_install_dir: Optional[str] = None can_use_direct_paths = False paths: Dict[str, bool] = {} + def config(*path: str) -> Optional[Any]: result = install_config for component in path: @@ -53,60 +58,69 @@ def config(*path: str) -> Optional[Any]: def bool_to_yes_no(value: bool) -> str: - return 'yes' if value else 'no' + return "yes" if value else "no" -def get_system_path(profile: str = 'system', gen: Optional[str] = None, spec: Optional[str] = None) -> str: - basename = f'{profile}-{gen}-link' if gen is not None else profile - profiles_dir = '/nix/var/nix/profiles' - if profile == 'system': +def get_system_path( + profile: str = "system", gen: Optional[str] = None, spec: Optional[str] = None +) -> str: + basename = f"{profile}-{gen}-link" if gen is not None else profile + profiles_dir = "/nix/var/nix/profiles" + if profile == "system": result = os.path.join(profiles_dir, basename) else: - result = os.path.join(profiles_dir, 'system-profiles', basename) + result = os.path.join(profiles_dir, "system-profiles", basename) if spec is not None: - result = os.path.join(result, 'specialisation', spec) + result = os.path.join(result, "specialisation", spec) return result def get_profiles() -> List[str]: - profiles_dir = '/nix/var/nix/profiles/system-profiles/' + profiles_dir = "/nix/var/nix/profiles/system-profiles/" dirs = os.listdir(profiles_dir) if os.path.isdir(profiles_dir) else [] - return [path for path in dirs if not path.endswith('-link')] + return [path for path in dirs if not path.endswith("-link")] -def get_gens(profile: str = 'system') -> List[Tuple[int, List[str]]]: - nix_env = os.path.join(str(config('nixPath')), 'bin', 'nix-env') - output = subprocess.check_output([ - nix_env, '--list-generations', - '-p', get_system_path(profile), - '--option', 'build-users-group', '', - ], universal_newlines=True) +def get_gens(profile: str = "system") -> List[Tuple[int, List[str]]]: + nix_env = os.path.join(str(config("nixPath")), "bin", "nix-env") + output = subprocess.check_output( + [ + nix_env, + "--list-generations", + "-p", + get_system_path(profile), + "--option", + "build-users-group", + "", + ], + universal_newlines=True, + ) gen_lines = output.splitlines() gen_nums = [int(line.split()[0]) for line in gen_lines] - return [gen for gen in gen_nums][-config('maxGenerations'):] + return [gen for gen in gen_nums][-config("maxGenerations") :] def is_encrypted(device: str) -> bool: - for name in config('luksDevices'): - if os.readlink(os.path.join('/dev/mapper', name)) == os.readlink(device): + for name in config("luksDevices"): + if os.readlink(os.path.join("/dev/mapper", name)) == os.readlink(device): return True return False def is_fs_type_supported(fs_type: str) -> bool: - return fs_type.startswith('vfat') + return fs_type.startswith("vfat") def get_dest_file(path: str) -> str: package_id = os.path.basename(os.path.dirname(path)) suffix = os.path.basename(path) - return f'{package_id}-{suffix}' + return f"{package_id}-{suffix}" def get_dest_path(path: str, target: str) -> str: @@ -115,7 +129,7 @@ def get_dest_path(path: str, target: str) -> str: def get_copied_path_uri(path: str, target: str) -> str: - result = '' + result = "" dest_file = get_dest_file(path) dest_path = get_dest_path(path, target) @@ -125,15 +139,15 @@ def get_copied_path_uri(path: str, target: str) -> str: else: paths[dest_path] = True - path_with_prefix = os.path.join('/limine', target, dest_file) - result = f'boot():{path_with_prefix}' + path_with_prefix = os.path.join("/limine", target, dest_file) + result = f"boot():{path_with_prefix}" - if config('validateChecksums'): - with open(path, 'rb') as file: + if config("validateChecksums"): + with open(path, "rb") as file: b2sum = hashlib.blake2b() b2sum.update(file.read()) - result += f'#{b2sum.hexdigest()}' + result += f"#{b2sum.hexdigest()}" return result @@ -142,7 +156,9 @@ def get_path_uri(path: str) -> str: return get_copied_path_uri(path, "") -def get_file_uri(profile: str, gen: Optional[str], spec: Optional[str], name: str) -> str: +def get_file_uri( + profile: str, gen: Optional[str], spec: Optional[str], name: str +) -> str: gen_path = get_system_path(profile, gen, spec) path_in_store = os.path.realpath(os.path.join(gen_path, name)) return get_path_uri(path_in_store) @@ -151,22 +167,26 @@ def get_file_uri(profile: str, gen: Optional[str], spec: Optional[str], name: st def get_kernel_uri(kernel_path: str) -> str: return get_copied_path_uri(kernel_path, "kernels") + def bootjson_to_bootspec(bootjson: dict) -> BootSpec: - specialisations = bootjson['org.nixos.specialisation.v1'] + specialisations = bootjson["org.nixos.specialisation.v1"] specialisations = {k: bootjson_to_bootspec(v) for k, v in specialisations.items()} xen = None - if 'org.xenproject.bootspec.v2' in bootjson: - xen = bootjson['org.xenproject.bootspec.v2'] + if "org.xenproject.bootspec.v2" in bootjson: + xen = bootjson["org.xenproject.bootspec.v2"] + + extraInitrdExtension = bootjson.get("org.nixos.extra-initrd.v1", {}) + extraInitrdPaths = extraInitrdExtension.get("paths", []) + return BootSpec( - **bootjson['org.nixos.bootspec.v1'], + **bootjson["org.nixos.bootspec.v1"], specialisations=specialisations, xen=xen, + extraInitrdPaths=extraInitrdPaths, ) -def generate_xen_efi_files( - bootspec: BootSpec, - gen: str - ) -> str: + +def generate_xen_efi_files(bootspec: BootSpec, gen: str) -> str: """Generate a Xen EFI xen.cfg file, and copy required files in place. Assumes the bootspec has already been validated as having the requried @@ -179,43 +199,43 @@ def generate_xen_efi_files( Returns the path to the Xen EFI binary """ - xen_efi_boot_path = get_copied_path_uri(bootspec.xen['efiPath'], f'xen/{gen}') - xen_efi_path = get_dest_path(bootspec.xen['efiPath'], f'xen/{gen}') + xen_efi_boot_path = get_copied_path_uri(bootspec.xen["efiPath"], f"xen/{gen}") + xen_efi_path = get_dest_path(bootspec.xen["efiPath"], f"xen/{gen}") xen_efi_cfg_dir = os.path.dirname(xen_efi_path) - xen_efi_cfg_path = xen_efi_path[:-4] + '.cfg' + xen_efi_cfg_path = xen_efi_path[:-4] + ".cfg" if not os.path.exists(xen_efi_cfg_dir): os.makedirs(xen_efi_cfg_dir) - xen_efi_cfg = ( - f'default=nixos{gen}\n\n' + - f'[nixos{gen}]\n' - ) + xen_efi_cfg = f"default=nixos{gen}\n\n" + f"[nixos{gen}]\n" # set xen dom0 parameters - if 'params' in bootspec.xen and len(bootspec.xen['params']) > 0: - xen_efi_cfg += 'options=' + ' '.join(bootspec.xen['params']).strip() + '\n' + if "params" in bootspec.xen and len(bootspec.xen["params"]) > 0: + xen_efi_cfg += "options=" + " ".join(bootspec.xen["params"]).strip() + "\n" # set kernel and copy in-place - xen_efi_kernel_path = get_dest_path(bootspec.kernel, f'xen/{gen}') + xen_efi_kernel_path = get_dest_path(bootspec.kernel, f"xen/{gen}") copy_file(bootspec.kernel, xen_efi_kernel_path) xen_efi_cfg += ( - 'kernel=' + os.path.basename(xen_efi_kernel_path) + ' ' - + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() - + '\n' + "kernel=" + + os.path.basename(xen_efi_kernel_path) + + " " + + " ".join(["init=" + bootspec.init] + bootspec.kernelParams).strip() + + "\n" ) # set ramdisk and copy initrd in-place if bootspec.initrd: - xen_efi_initrd_path = get_dest_path(bootspec.initrd, f'xen/{gen}') + xen_efi_initrd_path = get_dest_path(bootspec.initrd, f"xen/{gen}") copy_file(bootspec.initrd, xen_efi_initrd_path) - xen_efi_cfg += 'ramdisk=' + os.path.basename(xen_efi_initrd_path) + '\n' + xen_efi_cfg += "ramdisk=" + os.path.basename(xen_efi_initrd_path) + "\n" - with open(xen_efi_cfg_path, 'w') as xen_efi_cfg_file: + with open(xen_efi_cfg_path, "w") as xen_efi_cfg_file: xen_efi_cfg_file.write(xen_efi_cfg) return xen_efi_boot_path + def xen_config_entry( levels: int, bootspec: BootSpec, xenVersion: str, gen: str, time: str, efi: bool ) -> str: @@ -230,15 +250,19 @@ def xen_config_entry( efi -- True if EFI protocol should be used for this entry """ # generate Xen menu label for the current generation - entry = '/' * levels + f'Generation {gen} with Xen {xenVersion}' + (' EFI\n' if efi else '\n') - entry += f'comment: Xen {xenVersion} {bootspec.label}, built on {time}\n' + entry = ( + "/" * levels + + f"Generation {gen} with Xen {xenVersion}" + + (" EFI\n" if efi else "\n") + ) + entry += f"comment: Xen {xenVersion} {bootspec.label}, built on {time}\n" # load Xen dom0 as the executable, using multiboot for EFI & BIOS if ( - efi and - 'multibootPath' in bootspec.xen and - len(bootspec.xen['multibootPath']) > 0 and - os.path.exists(bootspec.xen['multibootPath']) - ): + efi + and "multibootPath" in bootspec.xen + and len(bootspec.xen["multibootPath"]) > 0 + and os.path.exists(bootspec.xen["multibootPath"]) + ): # Use the EFI protocol and generate Xen EFI configuration # files and directories which are loaded by Xen's EFI binary # directly. @@ -247,84 +271,107 @@ def xen_config_entry( # an entry-point in Xen's multiboot binary, and multiboot1 # doesn't work under EFI. # Upstream Limine issue #482 - entry += 'protocol: efi\n' - entry += ( - 'path: ' + generate_xen_efi_files(bootspec, gen) + '\n' - ) + entry += "protocol: efi\n" + entry += "path: " + generate_xen_efi_files(bootspec, gen) + "\n" elif ( - 'multibootPath' in bootspec.xen and - len(bootspec.xen['multibootPath']) > 0 and - os.path.exists(bootspec.xen['multibootPath']) - ): + "multibootPath" in bootspec.xen + and len(bootspec.xen["multibootPath"]) > 0 + and os.path.exists(bootspec.xen["multibootPath"]) + ): # Use multiboot1 if not generating an EFI entry, as multiboot2 # doesn't work under Limine for booting Xen. # Upstream Limine issue #483 - entry += 'protocol: multiboot\n' + entry += "protocol: multiboot\n" entry += ( - 'path: ' + get_copied_path_uri(bootspec.xen['multibootPath'], f'xen/{gen}') + '\n' + "path: " + + get_copied_path_uri(bootspec.xen["multibootPath"], f"xen/{gen}") + + "\n" ) # set params as the multiboot executable's parameters - if 'params' in bootspec.xen and len(bootspec.xen['params']) > 0: + if "params" in bootspec.xen and len(bootspec.xen["params"]) > 0: # TODO: Understand why the first argument is ignored below? # --- to work around first argument being ignored - entry += ( - 'cmdline: -- ' + ' '.join(bootspec.xen['params']).strip() + '\n' - ) + entry += "cmdline: -- " + " ".join(bootspec.xen["params"]).strip() + "\n" # load the linux kernel as the second module - entry += 'module_path: ' + get_kernel_uri(bootspec.kernel) + '\n' + entry += "module_path: " + get_kernel_uri(bootspec.kernel) + "\n" # set kernel parameters as the parameters to the first module # TODO: Understand why the first argument is ignored below? # --- to work around first argument being ignored entry += ( - 'module_string: -- ' - + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() - + '\n' + "module_string: -- " + + " ".join(["init=" + bootspec.init] + bootspec.kernelParams).strip() + + "\n" ) if bootspec.initrd: # the final module is the initrd - entry += 'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n' + entry += "module_path: " + get_kernel_uri(bootspec.initrd) + "\n" + + for p in bootspec.extraInitrdPaths: + entry += f"module_path: boot():/{p}\n" + return entry + def config_entry(levels: int, bootspec: BootSpec, label: str, time: str) -> str: - entry = '/' * levels + label + '\n' - entry += 'protocol: linux\n' - entry += f'comment: {bootspec.label}, built on {time}\n' - entry += 'kernel_path: ' + get_kernel_uri(bootspec.kernel) + '\n' - entry += 'cmdline: ' + ' '.join(['init=' + bootspec.init] + bootspec.kernelParams).strip() + '\n' + entry = "/" * levels + label + "\n" + entry += "protocol: linux\n" + entry += f"comment: {bootspec.label}, built on {time}\n" + entry += "kernel_path: " + get_kernel_uri(bootspec.kernel) + "\n" + entry += ( + "cmdline: " + + " ".join(["init=" + bootspec.init] + bootspec.kernelParams).strip() + + "\n" + ) # Set framebuffer resolution for Linux boot entries if configured - resolution = config('resolution') + resolution = config("resolution") if resolution is not None: - entry += f'resolution: {resolution}\n' + entry += f"resolution: {resolution}\n" if bootspec.initrd: - entry += f'module_path: ' + get_kernel_uri(bootspec.initrd) + '\n' + entry += f"module_path: " + get_kernel_uri(bootspec.initrd) + "\n" + + for p in bootspec.extraInitrdPaths: + entry += f"module_path: boot():/{p}\n" if bootspec.initrdSecrets: - base_path = str(limine_install_dir) + '/kernels/' - initrd_secrets_path = base_path + os.path.basename(bootspec.toplevel) + '-secrets' + base_path = str(limine_install_dir) + "/kernels/" + initrd_secrets_path = ( + base_path + os.path.basename(bootspec.toplevel) + "-secrets" + ) if not os.path.exists(base_path): os.makedirs(base_path) old_umask = os.umask(0o137) - initrd_secrets_path_temp = tempfile.mktemp(os.path.basename(bootspec.toplevel) + '-secrets') + initrd_secrets_path_temp = tempfile.mktemp( + os.path.basename(bootspec.toplevel) + "-secrets" + ) - if os.system(bootspec.initrdSecrets + " " + initrd_secrets_path_temp) != 0: - print(f'warning: failed to create initrd secrets for "{label}"', file=sys.stderr) - print(f'note: if this is an older generation there is nothing to worry about') + if subprocess.run([bootspec.initrdSecrets, initrd_secrets_path_temp]).returncode != 0: + print( + f'warning: failed to create initrd secrets for "{label}"', + file=sys.stderr, + ) + print( + f"note: if this is an older generation there is nothing to worry about" + ) if os.path.exists(initrd_secrets_path_temp): copy_file(initrd_secrets_path_temp, initrd_secrets_path) os.unlink(initrd_secrets_path_temp) - entry += 'module_path: ' + get_kernel_uri(initrd_secrets_path) + '\n' + entry += "module_path: " + get_kernel_uri(initrd_secrets_path) + "\n" os.umask(old_umask) return entry def generate_config_entry(profile: str, gen: str, special: bool) -> str: - time = datetime.datetime.fromtimestamp(os.stat(get_system_path(profile,gen), follow_symlinks=False).st_mtime).strftime("%F %H:%M:%S") - boot_json = json.load(open(os.path.join(get_system_path(profile, gen), 'boot.json'), 'r')) + time = datetime.datetime.fromtimestamp( + os.stat(get_system_path(profile, gen), follow_symlinks=False).st_mtime + ).strftime("%F %H:%M:%S") + boot_json = json.load( + open(os.path.join(get_system_path(profile, gen), "boot.json"), "r") + ) boot_spec = bootjson_to_bootspec(boot_json) specialisation_list = boot_spec.specialisations.items() @@ -332,37 +379,37 @@ def generate_config_entry(profile: str, gen: str, special: bool) -> str: entry = "" # Xen, if configured, should be listed first for each generation - if boot_spec.xen and 'version' in boot_spec.xen: - xen_version = boot_spec.xen['version'] - if config('efiSupport'): + if boot_spec.xen and "version" in boot_spec.xen: + xen_version = boot_spec.xen["version"] + if config("efiSupport"): entry += xen_config_entry(2, boot_spec, xen_version, gen, time, True) entry += xen_config_entry(2, boot_spec, xen_version, gen, time, False) if len(specialisation_list) > 0: depth += 1 - entry += '/' * (depth-1) + entry += "/" * (depth - 1) if special: - entry += '+' + entry += "+" - entry += f'Generation {gen}' + '\n' - entry += config_entry(depth, boot_spec, f'Default', str(time)) + entry += f"Generation {gen}" + "\n" + entry += config_entry(depth, boot_spec, f"Default", str(time)) else: - entry += config_entry(depth, boot_spec, f'Generation {gen}', str(time)) + entry += config_entry(depth, boot_spec, f"Generation {gen}", str(time)) for spec, spec_boot_spec in specialisation_list: - entry += config_entry(depth, spec_boot_spec, f'{spec}', str(time)) + entry += config_entry(depth, spec_boot_spec, f"{spec}", str(time)) return entry def find_disk_device(part: str) -> str: part = os.path.realpath(part) - part = part.removeprefix('/dev/') - disk = os.path.realpath(os.path.join('/sys', 'class', 'block', part)) + part = part.removeprefix("/dev/") + disk = os.path.realpath(os.path.join("/sys", "class", "block", part)) disk = os.path.dirname(disk) - return os.path.join('/dev', os.path.basename(disk)) + return os.path.join("/dev", os.path.basename(disk)) def find_mounted_device(path: str) -> str: @@ -403,34 +450,48 @@ def install_bootloader() -> None: boot_fs = None - for mount_point, fs in config('fileSystems').items(): - if mount_point == '/boot': + for mount_point, fs in config("fileSystems").items(): + if mount_point == "/boot": boot_fs = fs - if config('efiSupport'): - limine_install_dir = os.path.join(str(config('efiMountPoint')), 'limine') - elif boot_fs and is_fs_type_supported(boot_fs['fsType']) and not is_encrypted(boot_fs['device']): - limine_install_dir = '/boot/limine' + if config("efiSupport"): + limine_install_dir = os.path.join(str(config("efiMountPoint")), "limine") + elif ( + boot_fs + and is_fs_type_supported(boot_fs["fsType"]) + and not is_encrypted(boot_fs["device"]) + ): + limine_install_dir = "/boot/limine" else: possible_causes = [] if not boot_fs: - possible_causes.append(f'/limine on the boot partition (not present)') + possible_causes.append(f"/limine on the boot partition (not present)") else: - is_boot_fs_type_ok = is_fs_type_supported(boot_fs['fsType']) - is_boot_fs_encrypted = is_encrypted(boot_fs['device']) - possible_causes.append(f'/limine on the boot partition ({is_boot_fs_type_ok=} {is_boot_fs_encrypted=})') + is_boot_fs_type_ok = is_fs_type_supported(boot_fs["fsType"]) + is_boot_fs_encrypted = is_encrypted(boot_fs["device"]) + possible_causes.append( + f"/limine on the boot partition ({is_boot_fs_type_ok=} {is_boot_fs_encrypted=})" + ) - causes_str = textwrap.indent('\n'.join(possible_causes), ' - ') + causes_str = textwrap.indent("\n".join(possible_causes), " - ") - raise Exception(textwrap.dedent(''' + raise Exception( + textwrap.dedent(""" Could not find a valid place for Limine configuration files!' Possible candidates that were ruled out: - ''') + causes_str + textwrap.dedent(''' + """) + + causes_str + + textwrap.dedent(""" Limine cannot be installed on a system without an unencrypted partition formatted as FAT. - ''')) + """) + ) - if config('secureBoot', 'enable') and not config('secureBoot', 'autoGenerateKeys') and not os.path.exists("/var/lib/sbctl"): + if ( + config("secureBoot", "enable") + and not config("secureBoot", "autoGenerateKeys") + and not os.path.exists("/var/lib/sbctl") + ): print("There are no sbctl secure boot keys present. Please generate some.") sys.exit(1) @@ -441,65 +502,103 @@ def install_bootloader() -> None: for file in files: paths[os.path.join(dir, file)] = False - limine_xen_dir = os.path.join(limine_install_dir, 'xen') + limine_xen_dir = os.path.join(limine_install_dir, "xen") if os.path.exists(limine_xen_dir): - print(f'cleaning {limine_xen_dir}') + print(f"cleaning {limine_xen_dir}") shutil.rmtree(limine_xen_dir) os.makedirs(limine_xen_dir) - profiles = [('system', get_gens())] + profiles = [("system", get_gens())] for profile in get_profiles(): profiles += [(profile, get_gens(profile))] - timeout = config('timeout') - editor_enabled = bool_to_yes_no(config('enableEditor')) - hash_mismatch_panic = bool_to_yes_no(config('panicOnChecksumMismatch')) + timeout = config("timeout") + editor_enabled = bool_to_yes_no(config("enableEditor")) + hash_mismatch_panic = bool_to_yes_no(config("panicOnChecksumMismatch")) last_gen = get_gens()[-1] - last_gen_json = json.load(open(os.path.join(get_system_path('system', last_gen), 'boot.json'), 'r')) + last_gen_json = json.load( + open(os.path.join(get_system_path("system", last_gen), "boot.json"), "r") + ) last_gen_boot_spec = bootjson_to_bootspec(last_gen_json) - config_file = str(config('extraConfig')) + '\n' - config_file += textwrap.dedent(f''' + config_file = str(config("extraConfig")) + "\n" + config_file += textwrap.dedent(f""" timeout: {timeout} editor_enabled: {editor_enabled} hash_mismatch_panic: {hash_mismatch_panic} graphics: yes default_entry: {3 if len(last_gen_boot_spec.specialisations.items()) > 0 else 2} - ''') + """) - for wallpaper in config('style', 'wallpapers'): - config_file += f'''wallpaper: {get_copied_path_uri(wallpaper, 'wallpapers')}\n''' + for wallpaper in config("style", "wallpapers"): + config_file += ( + f"""wallpaper: {get_copied_path_uri(wallpaper, "wallpapers")}\n""" + ) - config_file += option_from_config('wallpaper_style', ['style', 'wallpaperStyle']) - config_file += option_from_config('backdrop', ['style', 'backdrop']) + config_file += option_from_config("wallpaper_style", ["style", "wallpaperStyle"]) + config_file += option_from_config("backdrop", ["style", "backdrop"]) - config_file += option_from_config('interface_resolution', ['style', 'interface', 'resolution']) - config_file += option_from_config('interface_branding', ['style', 'interface', 'branding']) - config_file += option_from_config('interface_branding_colour', ['style', 'interface', 'brandingColor']) - config_file += option_from_config('interface_help_colour', ['style', 'interface', 'helpColor']) - config_file += option_from_config('interface_help_colour_bright', ['style', 'interface', 'helpColorBright']) - config_file += option_from_config('interface_help_hidden', ['style', 'interface', 'helpHidden']) - config_file += option_from_config('term_font_scale', ['style', 'graphicalTerminal', 'font', 'scale']) - config_file += option_from_config('term_font_spacing', ['style', 'graphicalTerminal', 'font', 'spacing']) - config_file += option_from_config('term_palette', ['style', 'graphicalTerminal', 'palette']) - config_file += option_from_config('term_palette_bright', ['style', 'graphicalTerminal', 'brightPalette']) - config_file += option_from_config('term_foreground', ['style', 'graphicalTerminal', 'foreground']) - config_file += option_from_config('term_background', ['style', 'graphicalTerminal', 'background']) - config_file += option_from_config('term_foreground_bright', ['style', 'graphicalTerminal', 'brightForeground']) - config_file += option_from_config('term_background_bright', ['style', 'graphicalTerminal', 'brightBackground']) - config_file += option_from_config('term_margin', ['style', 'graphicalTerminal', 'margin']) - config_file += option_from_config('term_margin_gradient', ['style', 'graphicalTerminal', 'marginGradient']) + config_file += option_from_config( + "interface_resolution", ["style", "interface", "resolution"] + ) + config_file += option_from_config( + "interface_branding", ["style", "interface", "branding"] + ) + config_file += option_from_config( + "interface_branding_colour", ["style", "interface", "brandingColor"] + ) + config_file += option_from_config( + "interface_help_colour", ["style", "interface", "helpColor"] + ) + config_file += option_from_config( + "interface_help_colour_bright", ["style", "interface", "helpColorBright"] + ) + config_file += option_from_config( + "interface_help_hidden", ["style", "interface", "helpHidden"] + ) + config_file += option_from_config( + "term_font_scale", ["style", "graphicalTerminal", "font", "scale"] + ) + config_file += option_from_config( + "term_font_spacing", ["style", "graphicalTerminal", "font", "spacing"] + ) + config_file += option_from_config( + "term_palette", ["style", "graphicalTerminal", "palette"] + ) + config_file += option_from_config( + "term_palette_bright", ["style", "graphicalTerminal", "brightPalette"] + ) + config_file += option_from_config( + "term_foreground", ["style", "graphicalTerminal", "foreground"] + ) + config_file += option_from_config( + "term_background", ["style", "graphicalTerminal", "background"] + ) + config_file += option_from_config( + "term_foreground_bright", ["style", "graphicalTerminal", "brightForeground"] + ) + config_file += option_from_config( + "term_background_bright", ["style", "graphicalTerminal", "brightBackground"] + ) + config_file += option_from_config( + "term_margin", ["style", "graphicalTerminal", "margin"] + ) + config_file += option_from_config( + "term_margin_gradient", ["style", "graphicalTerminal", "marginGradient"] + ) - config_file += textwrap.dedent(f''' - # {config('distroName')} boot entries start here - ''') + config_file += textwrap.dedent(f""" + # {config("distroName")} boot entries start here + """) - for (profile, gens) in profiles: - group_name = 'default profile' if profile == 'system' else f"profile '{profile}'" - config_file += f'/+{config('distroName')} {group_name}\n' + for profile, gens in profiles: + group_name = ( + "default profile" if profile == "system" else f"profile '{profile}'" + ) + config_file += f"/+{config('distroName')} {group_name}\n" isFirst = True @@ -507,12 +606,12 @@ def install_bootloader() -> None: config_file += generate_config_entry(profile, gen, isFirst) isFirst = False - config_file_path = os.path.join(limine_install_dir, 'limine.conf') - config_file += f'\n# {config('distroName')} boot entries end here\n\n' + config_file_path = os.path.join(limine_install_dir, "limine.conf") + config_file += f"\n# {config('distroName')} boot entries end here\n\n" - config_file += str(config('extraEntries')) + config_file += str(config("extraEntries")) - with open(f"{config_file_path}.tmp", 'w') as file: + with open(f"{config_file_path}.tmp", "w") as file: file.truncate() file.write(config_file.strip()) file.flush() @@ -521,150 +620,208 @@ def install_bootloader() -> None: paths[config_file_path] = True - for dest_path, source_path in config('additionalFiles').items(): - dest_path = os.path.join(limine_install_dir, dest_path) + for dest_path, source_path in config("additionalFiles").items(): + dest_path = os.path.join(str(config("efiMountPoint")), dest_path) copy_file(source_path, dest_path) - limine_binary = os.path.join(str(config('liminePath')), 'bin', 'limine') - cpu_family = config('hostArchitecture', 'family') - if config('efiSupport'): + limine_binary = os.path.join(str(config("liminePath")), "bin", "limine") + cpu_family = config("hostArchitecture", "family") + if config("efiSupport"): boot_file = "" - if cpu_family == 'x86': - if config('hostArchitecture', 'bits') == 32: - boot_file = 'BOOTIA32.EFI' - elif config('hostArchitecture', 'bits') == 64: - boot_file = 'BOOTX64.EFI' - elif cpu_family == 'arm': - if config('hostArchitecture', 'arch') == 'armv8-a' and config('hostArchitecture', 'bits') == 64: - boot_file = 'BOOTAA64.EFI' + if cpu_family == "x86": + if config("hostArchitecture", "bits") == 32: + boot_file = "BOOTIA32.EFI" + elif config("hostArchitecture", "bits") == 64: + boot_file = "BOOTX64.EFI" + elif cpu_family == "arm": + if ( + config("hostArchitecture", "arch") == "armv8-a" + and config("hostArchitecture", "bits") == 64 + ): + boot_file = "BOOTAA64.EFI" else: - raise Exception(f'Unsupported CPU arch: {config("hostArchitecture", "arch")}') + raise Exception( + f"Unsupported CPU arch: {config('hostArchitecture', 'arch')}" + ) else: - raise Exception(f'Unsupported CPU family: {cpu_family}') + raise Exception(f"Unsupported CPU family: {cpu_family}") - efi_path = os.path.join(str(config('liminePath')), 'share', 'limine', boot_file) - dest_path = os.path.join(str(config('efiMountPoint')), 'efi', 'boot' if config('efiRemovable') else 'limine', boot_file) + efi_path = os.path.join(str(config("liminePath")), "share", "limine", boot_file) + dest_path = os.path.join( + str(config("efiMountPoint")), + "efi", + "boot" if config("efiRemovable") else "limine", + boot_file, + ) copy_file(efi_path, dest_path) - if config('enrollConfig'): + if config("enrollConfig"): b2sum = hashlib.blake2b() b2sum.update(config_file.strip().encode()) try: - subprocess.run([limine_binary, 'enroll-config', dest_path, b2sum.hexdigest()]) + subprocess.run( + [limine_binary, "enroll-config", dest_path, b2sum.hexdigest()] + ) except: - print('error: failed to enroll limine config.', file=sys.stderr) + print("error: failed to enroll limine config.", file=sys.stderr) sys.exit(1) - if config('secureBoot', 'enable'): - sbctl = os.path.join(str(config('secureBoot', 'sbctl')), 'bin', 'sbctl') - if not os.path.exists("/var/lib/sbctl") and config('secureBoot', 'autoGenerateKeys'): - print('auto generating keys') + if config("secureBoot", "enable"): + sbctl = os.path.join(str(config("secureBoot", "sbctl")), "bin", "sbctl") + if not os.path.exists("/var/lib/sbctl/keys") and config( + "secureBoot", "autoGenerateKeys" + ): + print("auto generating keys") try: - subprocess.run([sbctl, 'create-keys']) + subprocess.run([sbctl, "create-keys"]) except: - print('error: failed to create keys', file=sys.stderr) + print("error: failed to create keys", file=sys.stderr) sys.exit(1) - if config('secureBoot', 'autoEnrollKeys', 'enable'): + if config("secureBoot", "autoEnrollKeys", "enable"): try: - command = [sbctl, 'enroll-keys'] - command.extend(config('secureBoot', 'autoEnrollKeys', 'extraArgs')) + command = [sbctl, "enroll-keys"] + command.extend( + config("secureBoot", "autoEnrollKeys", "extraArgs") + ) subprocess.run(command) except: - print('error: failed to enroll keys', file=sys.stderr) + print("error: failed to enroll keys", file=sys.stderr) sys.exit(1) - print('signing limine...') + print("signing limine...") try: - subprocess.run([sbctl, 'sign', dest_path]) + subprocess.run([sbctl, "sign", dest_path]) except: - print('error: failed to sign limine', file=sys.stderr) + print("error: failed to sign limine", file=sys.stderr) sys.exit(1) - if not config('efiRemovable') and not config('canTouchEfiVariables'): - print('warning: boot.loader.efi.canTouchEfiVariables is set to false while boot.loader.limine.efiInstallAsRemovable.\n This may render the system unbootable.') + if not config("efiRemovable") and not config("canTouchEfiVariables"): + print( + "warning: boot.loader.efi.canTouchEfiVariables is set to false while boot.loader.limine.efiInstallAsRemovable.\n This may render the system unbootable." + ) - if config('canTouchEfiVariables'): - if config('efiRemovable'): - print('note: boot.loader.limine.efiInstallAsRemovable is true, no need to add EFI entry.') + if config("canTouchEfiVariables"): + if config("efiRemovable"): + print( + "note: boot.loader.limine.efiInstallAsRemovable is true, no need to add EFI entry." + ) else: - efibootmgr = os.path.join(str(config('efiBootMgrPath')), 'bin', 'efibootmgr') - efi_partition = find_mounted_device(str(config('efiMountPoint'))) + efibootmgr = os.path.join( + str(config("efiBootMgrPath")), "bin", "efibootmgr" + ) + efi_partition = find_mounted_device(str(config("efiMountPoint"))) efi_disk = find_disk_device(efi_partition) - efibootmgr_output = subprocess.check_output([efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True) + efibootmgr_output = subprocess.check_output( + [efibootmgr], stderr=subprocess.STDOUT, universal_newlines=True + ) # Check the output of `efibootmgr` to find if limine is already installed and present in the boot record limine_boot_entry = None - if matches := re.findall(r'Boot([0-9a-fA-F]{4})\*? Limine', efibootmgr_output): + if matches := re.findall( + r"Boot([0-9a-fA-F]{4})\*? Limine", efibootmgr_output + ): limine_boot_entry = matches[0] # If there's already a Limine entry, replace it if limine_boot_entry: - boot_order = re.findall(r'BootOrder: ((?:[0-9a-fA-F]{4},?)*)', efibootmgr_output)[0] + boot_order = re.findall( + r"BootOrder: ((?:[0-9a-fA-F]{4},?)*)", efibootmgr_output + )[0] - efibootmgr_output = subprocess.check_output([ - efibootmgr, - '-b', limine_boot_entry, - '-B', - ], stderr=subprocess.STDOUT, universal_newlines=True) + efibootmgr_output = subprocess.check_output( + [ + efibootmgr, + "-b", + limine_boot_entry, + "-B", + ], + stderr=subprocess.STDOUT, + universal_newlines=True, + ) - efibootmgr_output = subprocess.check_output([ - efibootmgr, - '-c', - '-b', limine_boot_entry, - '-d', efi_disk, - '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), - '-l', f'\\efi\\limine\\{boot_file}', - '-L', 'Limine', - '-o', boot_order, - ], stderr=subprocess.STDOUT, universal_newlines=True) + efibootmgr_output = subprocess.check_output( + [ + efibootmgr, + "-c", + "-b", + limine_boot_entry, + "-d", + efi_disk, + "-p", + efi_partition.removeprefix(efi_disk).removeprefix("p"), + "-l", + f"\\efi\\limine\\{boot_file}", + "-L", + "Limine", + "-o", + boot_order, + ], + stderr=subprocess.STDOUT, + universal_newlines=True, + ) else: - efibootmgr_output = subprocess.check_output([ - efibootmgr, - '-c', - '-d', efi_disk, - '-p', efi_partition.removeprefix(efi_disk).removeprefix('p'), - '-l', f'\\efi\\limine\\{boot_file}', - '-L', 'Limine', - ], stderr=subprocess.STDOUT, universal_newlines=True) + efibootmgr_output = subprocess.check_output( + [ + efibootmgr, + "-c", + "-d", + efi_disk, + "-p", + efi_partition.removeprefix(efi_disk).removeprefix("p"), + "-l", + f"\\efi\\limine\\{boot_file}", + "-L", + "Limine", + ], + stderr=subprocess.STDOUT, + universal_newlines=True, + ) - if config('biosSupport'): - if cpu_family != 'x86': - raise Exception(f'Unsupported CPU family for BIOS install: {cpu_family}') + if config("biosSupport"): + if cpu_family != "x86": + raise Exception(f"Unsupported CPU family for BIOS install: {cpu_family}") - limine_sys = os.path.join(str(config('liminePath')), 'share', 'limine', 'limine-bios.sys') - limine_sys_dest = os.path.join(limine_install_dir, 'limine-bios.sys') + limine_sys = os.path.join( + str(config("liminePath")), "share", "limine", "limine-bios.sys" + ) + limine_sys_dest = os.path.join(limine_install_dir, "limine-bios.sys") copy_file(limine_sys, limine_sys_dest) - device = str(config('biosDevice')) + device = str(config("biosDevice")) - if device == 'nodev': - print("note: boot.loader.limine.biosSupport is set, but device is set to nodev, only the stage 2 bootloader will be installed.", file=sys.stderr) + if device == "nodev": + print( + "note: boot.loader.limine.biosSupport is set, but device is set to nodev, only the stage 2 bootloader will be installed.", + file=sys.stderr, + ) return - limine_deploy_args: List[str] = [limine_binary, 'bios-install', device] + limine_deploy_args: List[str] = [limine_binary, "bios-install", device] - if config('partitionIndex'): - limine_deploy_args.append(str(config('partitionIndex'))) + if config("partitionIndex"): + limine_deploy_args.append(str(config("partitionIndex"))) - if config('force'): - limine_deploy_args.append('--force') + if config("force"): + limine_deploy_args.append("--force") try: subprocess.run(limine_deploy_args) except: raise Exception( - 'Failed to deploy BIOS stage 1 Limine bootloader!\n' + - 'You might want to try enabling the `boot.loader.limine.force` option.') + "Failed to deploy BIOS stage 1 Limine bootloader!\n" + + "You might want to try enabling the `boot.loader.limine.force` option." + ) print("removing unused boot files...") for path in paths: if not paths[path] and os.path.exists(path): os.remove(path) + def main() -> None: try: install_bootloader() @@ -675,7 +832,11 @@ def main() -> None: # event sync the efi filesystem after each update. rc = libc.syncfs(os.open(f"{str(config('efiMountPoint'))}", os.O_RDONLY)) if rc != 0: - print(f"could not sync {str(config('efiMountPoint'))}: {os.strerror(rc)}", file=sys.stderr) + print( + f"could not sync {str(config('efiMountPoint'))}: {os.strerror(rc)}", + file=sys.stderr, + ) -if __name__ == '__main__': + +if __name__ == "__main__": main() diff --git a/nixos/modules/system/boot/loader/limine/limine.nix b/nixos/modules/system/boot/loader/limine/limine.nix index c9725a6fee00..956fa78800ef 100644 --- a/nixos/modules/system/boot/loader/limine/limine.nix +++ b/nixos/modules/system/boot/loader/limine/limine.nix @@ -205,6 +205,17 @@ in ''; }; + extraInstallCommands = lib.mkOption { + default = ""; + type = lib.types.lines; + description = '' + Additional shell commands inserted in the bootloader installer + script after generating menu entries. It can be used to expand + on extra boot entries that cannot incorporate certain pieces of + information (such as the resulting `init=` kernel parameter). + ''; + }; + secureBoot = { enable = lib.mkEnableOption null // { description = '' @@ -443,14 +454,25 @@ in system = { boot.loader.id = "limine"; - build.installBootLoader = pkgs.replaceVarsWith { - src = ./limine-install.py; - isExecutable = true; - replacements = { - python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]); - configPath = limineInstallConfig; - }; - }; + build.installBootLoader = + let + install = pkgs.replaceVarsWith { + src = ./limine-install.py; + isExecutable = true; + replacements = { + python3 = pkgs.python3.withPackages (python-packages: [ python-packages.psutil ]); + configPath = limineInstallConfig; + }; + }; + + final = pkgs.writeScript "limine-install.sh" '' + #!${pkgs.runtimeShell} + set -euo pipefail + ${install} "$@" + ${cfg.extraInstallCommands} + ''; + in + final; }; }) (lib.mkIf (cfg.enable && cfg.secureBoot.enable) { diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index 06c15ee6674b..3e917a7cf48f 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -45,6 +45,7 @@ BOOT_COUNTING = "@bootCounting@" == "True" class BootSpec: init: Path initrd: Path + extraInitrdPaths: list[Path] kernel: Path kernelParams: list[str] # noqa: N815 label: str @@ -242,6 +243,38 @@ def run( return subprocess.run(cmd, check=True, text=True, stdout=stdout, stderr=sys.stderr) +def bootctl_varlink_call(method: str, parameters: dict[str, Any]) -> dict[str, Any]: + # Spawn bootctl as a Varlink server on stdio, mirroring what varlinkctl + # does when given an executable path. We cannot talk to a running + # systemd-bootctl.socket because that would use bootctl from the booted + # system rather than the closure we are switching to, does not let us set + # SYSTEMD_ESP_PATH/SYSTEMD_XBOOTLDR_PATH, and is unavailable inside + # nixos-enter anyway. + env = os.environ | { + "SYSTEMD_VARLINK_LISTEN": "-", + "SYSTEMD_ESP_PATH": str(EFI_SYS_MOUNT_POINT), + } + if BOOT_MOUNT_POINT != EFI_SYS_MOUNT_POINT: + env["SYSTEMD_XBOOTLDR_PATH"] = str(BOOT_MOUNT_POINT) + + proc = subprocess.Popen( + [f"{SYSTEMD}/bin/bootctl"], + stdin=subprocess.PIPE, + stdout=subprocess.PIPE, + stderr=sys.stderr, + env=env, + ) + assert proc.stdin is not None and proc.stdout is not None + request = json.dumps({"method": method, "parameters": parameters}).encode() + out, _ = proc.communicate(request + b"\0") + reply, _, _ = out.partition(b"\0") + if not reply: + raise RuntimeError( + f"bootctl exited with status {proc.returncode} without a Varlink reply" + ) + return json.loads(reply) + + def generation_dir(profile: str | None, generation: int) -> Path: if profile: return Path( @@ -306,9 +339,7 @@ def get_bootspec(profile: str | None, generation: int) -> BootSpec | None: try: bootspec_json = json.load(f) except ValueError as e: - print( - f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr - ) + print(f"error: Malformed Json: {e}, in {boot_json_path}", file=sys.stderr) sys.exit(1) return bootspec_from_json(bootspec_json) @@ -320,6 +351,11 @@ def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec: sortKey = systemdBootExtension.get("sortKey", "nixos") devicetree = systemdBootExtension.get("devicetree") + extraInitrdExtension = bootspec_json.get("org.nixos.extra-initrd.v1", {}) + extraInitrdPaths = list( + map(lambda path: Path(path), extraInitrdExtension.get("paths", [])) + ) + if devicetree: devicetree = Path(devicetree) @@ -332,6 +368,7 @@ def bootspec_from_json(bootspec_json: dict[str, Any]) -> BootSpec: specialisations=specialisations, sortKey=sortKey, devicetree=devicetree, + extraInitrdPaths=extraInitrdPaths, ) @@ -374,16 +411,21 @@ def boot_file( specialisation=" (%s)" % specialisation if specialisation else "", ) description = f"Generation {generation} {bootspec.label}, built on {build_date}" - boot_entry = [ - f"title {title}", - f"version {description}", - f"linux /{str(kernel.path)}", - f"initrd /{str(initrd.path)}", - f"options {kernel_params}", - f"machine-id {machine_id}" if machine_id is not None else None, - f"devicetree /{str(devicetree.path)}" if devicetree is not None else None, - f"sort-key {bootspec.sortKey}", - ] + boot_entry = ( + [ + f"title {title}", + f"version {description}", + f"linux /{str(kernel.path)}", + f"initrd /{str(initrd.path)}", + ] + + list(map(lambda initrd: f"initrd /{initrd}", bootspec.extraInitrdPaths)) + + [ + f"options {kernel_params}", + f"machine-id {machine_id}" if machine_id is not None else None, + f"devicetree /{str(devicetree.path)}" if devicetree is not None else None, + f"sort-key {bootspec.sortKey}", + ] + ) contents = "\n".join(filter(None, boot_entry)) entry, bootctl_id = BootFile.from_entry(contents.encode("utf-8")) return (list(filter(None, [kernel, initrd, devicetree, entry])), bootctl_id) @@ -469,55 +511,29 @@ def install_bootloader(args: argparse.Namespace) -> None: + ["install"] ) else: - # Update bootloader to latest if needed - available_out = run( - [f"{SYSTEMD}/bin/bootctl", "--version"], stdout=subprocess.PIPE - ).stdout.split()[2] - installed_out = run( - [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}", "status"], - stdout=subprocess.PIPE, - ).stdout + # Let bootctl compare versions itself. Over Varlink, an already + # current binary comes back as an io.systemd.System error carrying + # ESTALE, which we can tell apart from real failures. + params: dict[str, Any] = {"operation": "update"} + if not CAN_TOUCH_EFI_VARIABLES: + params["touchVariables"] = False + if GRACEFUL: + params["graceful"] = True + reply = bootctl_varlink_call("io.systemd.BootControl.Install", params) - # See status_binaries() in systemd bootctl.c for code which generates this - # Matches - # Available Boot Loaders on ESP: - # ESP: /boot (/dev/disk/by-partuuid/9b39b4c4-c48b-4ebf-bfea-a56b2395b7e0) - # File: └─/EFI/systemd/systemd-bootx64.efi (systemd-boot 255.2) - # But also: - # Available Boot Loaders on ESP: - # ESP: /boot (/dev/disk/by-partuuid/9b39b4c4-c48b-4ebf-bfea-a56b2395b7e0) - # File: ├─/EFI/systemd/HashTool.efi - # └─/EFI/systemd/systemd-bootx64.efi (systemd-boot 255.2) - installed_match = re.search( - r"^\W+.*/EFI/(?:BOOT|systemd)/.*\.efi \(systemd-boot ([\d.]+[^)]*)\)$", - installed_out, - re.IGNORECASE | re.MULTILINE, - ) - - available_match = re.search(r"^\((.*)\)$", available_out) - - if installed_match is None: - raise Exception( - "Could not find any previously installed systemd-boot. If you are switching to systemd-boot from a different bootloader, you need to run `nixos-rebuild switch --install-bootloader`" - ) - - if available_match is None: - raise Exception("could not determine systemd-boot version") - - installed_version = installed_match.group(1) - available_version = available_match.group(1) - - if installed_version < available_version: - print( - "updating systemd-boot from %s to %s" - % (installed_version, available_version), - file=sys.stderr, - ) - run( - [f"{SYSTEMD}/bin/bootctl", f"--esp-path={EFI_SYS_MOUNT_POINT}"] - + bootctl_flags - + ["update"] - ) + error = reply.get("error") + if error is not None: + error_params = reply.get("parameters") or {} + if ( + error == "io.systemd.System" + and error_params.get("errno") == errno.ESTALE + ): + # Same or newer boot loader version already in place. + pass + else: + raise RuntimeError( + f"bootctl update failed: {error} {json.dumps(error_params)}" + ) (BOOT_MOUNT_POINT / NIXOS_DIR).mkdir(parents=True, exist_ok=True) (BOOT_MOUNT_POINT / "loader/entries").mkdir(parents=True, exist_ok=True) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 18116432d358..9108f0e6d2a2 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -1100,7 +1100,9 @@ in } { assertion = config.boot.initrd.systemd.enable -> all (dev: dev.preLVM) (attrValues luks.devices); - message = "boot.initrd.luks.devices..preLVM is not used by systemd stage 1."; + message = '' + boot.initrd.luks.devices..preLVM has no effect with systemd stage 1. It can be safely removed from your configuration, and systemd will discover LVM devices automatically at runtime, whether they come before or after LUKS. The preLVM option will be removed in 26.11 along with scripted stage 1. + ''; } { assertion = diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 2b14caac86fa..4a22d6585eb9 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -4231,8 +4231,10 @@ let "systemd-networkd-wait-online@.service" "systemd-networkd.service" "systemd-networkd.socket" - "systemd-networkd-persistent-storage.service" + "systemd-networkd-resolve-hook.socket" "systemd-networkd-varlink-metrics.socket" + "systemd-networkd-varlink.socket" + "systemd-networkd-persistent-storage.service" ]; systemd.sockets.systemd-networkd-varlink-metrics.wantedBy = [ "sockets.target" ]; @@ -4314,6 +4316,9 @@ let systemd.additionalUpstreamUnits = [ "systemd-networkd-wait-online.service" "systemd-networkd.service" + "systemd-networkd-resolve-hook.socket" + "systemd-networkd-varlink-metrics.socket" + "systemd-networkd-varlink.socket" "systemd-networkd.socket" "systemd-network-generator.service" "network-online.target" diff --git a/nixos/modules/system/boot/plymouth.nix b/nixos/modules/system/boot/plymouth.nix index 3636503992c5..f4923c55e149 100644 --- a/nixos/modules/system/boot/plymouth.nix +++ b/nixos/modules/system/boot/plymouth.nix @@ -68,7 +68,7 @@ let configFile = pkgs.writeText "plymouthd.conf" '' [Daemon] - ShowDelay=0 + ShowDelay=${toString cfg.showDelay} DeviceTimeout=8 Theme=${cfg.theme} ${cfg.extraConfig} @@ -166,6 +166,15 @@ in ''; }; + showDelay = mkOption { + type = types.numbers.nonnegative; + default = 0; + example = 0.5; + description = '' + Time (in seconds) to delay the splash screen. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index da2b57285a76..5e4dbe7d97f1 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -30,9 +30,8 @@ let dnsmasqResolve = config.services.dnsmasq.enable && config.services.dnsmasq.resolveLocalQueries; - transformSettings = - settings: - lib.mapAttrs ( + transformSettings = settings: { + Resolve = lib.mapAttrs ( key: value: # concat lists for options that should result in space-separated values if @@ -46,7 +45,8 @@ let concatStringsSep " " value else value - ) settings; + ) settings.Resolve; + }; resolvedConf = settingsToSections (transformSettings cfg.settings); in @@ -185,7 +185,11 @@ in # added with order 501 to allow modules to go before with mkBefore system.nssDatabases.hosts = (mkOrder 501 [ "resolve [!UNAVAIL=return]" ]); - systemd.additionalUpstreamSystemUnits = [ "systemd-resolved.service" ]; + systemd.additionalUpstreamSystemUnits = [ + "systemd-resolved.service" + "systemd-resolved-monitor.socket" + "systemd-resolved-varlink.socket" + ]; systemd.services.systemd-resolved = { wantedBy = [ "sysinit.target" ]; @@ -248,7 +252,12 @@ in tmpfiles.settings.systemd-resolved-stub."/etc/resolv.conf".L.argument = "/run/systemd/resolve/stub-resolv.conf"; - additionalUpstreamUnits = [ "systemd-resolved.service" ]; + additionalUpstreamUnits = [ + "systemd-resolved.service" + "systemd-resolved-monitor.socket" + "systemd-resolved-varlink.socket" + ]; + users.systemd-resolve = { }; groups.systemd-resolve = { }; storePaths = [ "${config.boot.initrd.systemd.package}/lib/systemd/systemd-resolved" ]; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 75b4143d6810..acfb213b98e0 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -65,6 +65,7 @@ let # Udev. "systemd-udevd-control.socket" "systemd-udevd-kernel.socket" + "systemd-udevd-varlink.socket" "systemd-udevd.service" ] ++ (optional (!config.boot.isContainer) "systemd-udev-trigger.service") @@ -157,6 +158,8 @@ let "systemd-ask-password-wall.service" # Varlink APIs + "systemd-ask-password@.service" + "systemd-ask-password.socket" ] ++ lib.optionals cfg.package.withBootloader [ "systemd-bootctl@.service" @@ -178,11 +181,13 @@ let ] ++ optionals cfg.package.withImportd [ "systemd-importd.service" + "systemd-importd.socket" ] ++ optionals cfg.package.withMachined [ "machine.slice" "machines.target" "systemd-machined.service" + "systemd-machined.socket" ] ++ optionals cfg.package.withNspawn [ "systemd-nspawn@.service" @@ -191,6 +196,9 @@ let # Misc. "systemd-sysctl.service" "systemd-machine-id-commit.service" + + "systemd-mute-console@.service" + "systemd-mute-console.socket" ] ++ optionals cfg.package.withTimedated [ "dbus-org.freedesktop.timedate1.service" @@ -209,6 +217,11 @@ let "dbus-org.freedesktop.portable1.service" "systemd-portabled.service" ] + ++ optionals cfg.package.withRepart [ + # Varlink APIs + "systemd-repart@.service" + "systemd-repart.socket" + ] ++ [ "systemd-exit.service" "systemd-update-done.service" @@ -221,6 +234,8 @@ let "factory-reset.target" "systemd-factory-reset-request.service" "systemd-factory-reset-reboot.service" + "systemd-factory-reset@.service" + "systemd-factory-reset.socket" ] ++ cfg.additionalUpstreamSystemUnits; diff --git a/nixos/modules/system/boot/systemd/fido2.nix b/nixos/modules/system/boot/systemd/fido2.nix index 02b4a1389fba..e665d1bbb793 100644 --- a/nixos/modules/system/boot/systemd/fido2.nix +++ b/nixos/modules/system/boot/systemd/fido2.nix @@ -27,6 +27,8 @@ in "${cfg.package}/lib/udev/fido_id" "${cfg.package}/lib/cryptsetup/libcryptsetup-token-systemd-fido2.so" "${pkgs.libfido2}/lib/libfido2.so.1" + # dlopened by the libpcsclite.so.1 shim, invisible to make-initrd-ng + "${lib.getLib pkgs.pcsclite}/lib/libpcsclite_real.so.1" ]; }; } diff --git a/nixos/modules/system/boot/systemd/initrd.nix b/nixos/modules/system/boot/systemd/initrd.nix index f242cb8c6a5b..311bf9cc9aa1 100644 --- a/nixos/modules/system/boot/systemd/initrd.nix +++ b/nixos/modules/system/boot/systemd/initrd.nix @@ -124,6 +124,16 @@ let jobScripts = concatLists ( mapAttrsToList (_: unit: unit.jobScripts or [ ]) (filterAttrs (_: v: v.enable) cfg.services) ); + unitEnv = pkgs.buildEnv { + name = "initrd-unit-env"; + paths = concatLists ( + mapAttrsToList (_: unit: unit.path or [ ]) (filterAttrs (_: v: v.enable) cfg.services) + ); + pathsToLink = [ + "/bin" + "/sbin" + ]; + }; stage1Units = generateUnits { type = "initrd"; @@ -636,6 +646,7 @@ in "${pkgs.bashNonInteractive}/bin" ] ++ jobScripts + ++ [ unitEnv ] ++ map (c: removeAttrs c [ "text" ]) (builtins.attrValues cfg.contents) ++ lib.optional (pkgs.stdenv.hostPlatform.libc == "glibc") "${pkgs.glibc}/lib/libnss_files.so.2"; @@ -763,6 +774,7 @@ in ]; }; serviceConfig.Type = "oneshot"; + serviceConfig.EnvironmentFile = "-/etc/switch-root.conf"; description = "NixOS Activation"; script = # bash @@ -770,6 +782,14 @@ in set -uo pipefail export PATH="/bin:${cfg.package.util-linux}/bin" + # A non-NixOS closure (e.g. init=/bin/sh) has no prepare-root; + # initrd-find-nixos-closure records this as a non-empty NEW_INIT. + # Skip activation and let initrd-switch-root hand over to it directly. + if [ -n "''${NEW_INIT:-}" ]; then + echo "$NEW_INIT is not a NixOS system - not activating" + exit 0 + fi + closure="$(realpath /nixos-closure)" # Initialize the system diff --git a/nixos/modules/system/boot/systemd/journald-gateway.nix b/nixos/modules/system/boot/systemd/journald-gateway.nix index cede0a65f510..76a858e1b471 100644 --- a/nixos/modules/system/boot/systemd/journald-gateway.nix +++ b/nixos/modules/system/boot/systemd/journald-gateway.nix @@ -9,16 +9,19 @@ let cfg = config.services.journald.gateway; cliArgs = lib.cli.toCommandLineShellGNU { } { - # If either of these are null / false, they are not passed in the command-line + # If either of these are false, they are not passed in the command-line inherit (cfg) - cert - key - trust system user merge ; }; + + tlsOptionRemovedMessage = '' + systemd in Nixpkgs is built without GnuTLS, so systemd-journal-gatewayd + cannot serve HTTPS. Use a reverse proxy (such as nginx) to terminate TLS + in front of the gateway if you need encrypted access. + ''; in { imports = [ @@ -26,9 +29,12 @@ in [ "services" "journald" "enableHttpGateway" ] [ "services" "journald" "gateway" "enable" ] ) + (lib.mkRemovedOptionModule [ "services" "journald" "gateway" "cert" ] tlsOptionRemovedMessage) + (lib.mkRemovedOptionModule [ "services" "journald" "gateway" "key" ] tlsOptionRemovedMessage) + (lib.mkRemovedOptionModule [ "services" "journald" "gateway" "trust" ] tlsOptionRemovedMessage) ]; - meta.maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ ]; options.services.journald.gateway = { enable = lib.mkEnableOption "the HTTP gateway to the journal"; @@ -40,47 +46,6 @@ in ''; }; - cert = lib.mkOption { - default = null; - type = with lib.types; nullOr str; - description = '' - The path to a file or `AF_UNIX` stream socket to read the server - certificate from. - - The certificate must be in PEM format. This option switches - `systemd-journal-gatewayd` into HTTPS mode and must be used together - with {option}`services.journald.gateway.key`. - ''; - }; - - key = lib.mkOption { - default = null; - type = with lib.types; nullOr str; - description = '' - Specify the path to a file or `AF_UNIX` stream socket to read the - secret server key corresponding to the certificate specified with - {option}`services.journald.gateway.cert` from. - - The key must be in PEM format. - - This key should not be world-readable, and must be readably by the - `systemd-journal-gateway` user. - ''; - }; - - trust = lib.mkOption { - default = null; - type = with lib.types; nullOr str; - description = '' - Specify the path to a file or `AF_UNIX` stream socket to read a CA - certificate from. - - The certificate must be in PEM format. - - Setting this option enforces client certificate checking. - ''; - }; - system = lib.mkOption { default = false; type = lib.types.bool; diff --git a/nixos/modules/system/boot/systemd/journald-remote.nix b/nixos/modules/system/boot/systemd/journald-remote.nix index 7216c179b3a0..fbb444b6400b 100644 --- a/nixos/modules/system/boot/systemd/journald-remote.nix +++ b/nixos/modules/system/boot/systemd/journald-remote.nix @@ -12,25 +12,30 @@ let cliArgs = lib.cli.toCommandLineShellGNU { } { inherit (cfg) output; # "-3" specifies the file descriptor from the .socket unit. - "listen-${cfg.listen}" = "-3"; + "listen-http" = "-3"; }; + + tlsOptionRemovedMessage = '' + systemd in Nixpkgs is built without GnuTLS, so systemd-journal-remote + cannot accept HTTPS connections or validate client certificates. Use a + reverse proxy (such as nginx) to terminate TLS in front of journal-remote + if you need encrypted ingestion. + ''; in { - meta.maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ ]; + imports = [ + (lib.mkRemovedOptionModule [ + "services" + "journald" + "remote" + "listen" + ] tlsOptionRemovedMessage) + ]; + options.services.journald.remote = { enable = lib.mkEnableOption "receiving systemd journals from the network"; - listen = lib.mkOption { - default = "https"; - type = lib.types.enum [ - "https" - "http" - ]; - description = '' - Which protocol to listen to. - ''; - }; - output = lib.mkOption { default = "/var/log/journal/remote/"; type = lib.types.str; @@ -50,10 +55,6 @@ in type = lib.types.port; description = '' The port to listen to. - - Note that this option is used only if - {option}`services.journald.upload.listen` is configured to be either - "https" or "http". ''; }; @@ -92,55 +93,28 @@ in one output journal file is used. ''; }; - - ServerKeyFile = lib.mkOption { - default = "/etc/ssl/private/journal-remote.pem"; - type = lib.types.str; - description = '' - A path to a SSL secret key file in PEM format. - - Note that due to security reasons, `systemd-journal-remote` will - refuse files from the world-readable `/nix/store`. This file - should be readable by the "" user. - - This option can be used with `listen = "https"`. If the path - refers to an `AF_UNIX` stream socket in the file system a - connection is made to it and the key read from it. - ''; - }; - - ServerCertificateFile = lib.mkOption { - default = "/etc/ssl/certs/journal-remote.pem"; - type = lib.types.str; - description = '' - A path to a SSL certificate file in PEM format. - - This option can be used with `listen = "https"`. If the path - refers to an `AF_UNIX` stream socket in the file system a - connection is made to it and the certificate read from it. - ''; - }; - - TrustedCertificateFile = lib.mkOption { - default = "/etc/ssl/ca/trusted.pem"; - type = lib.types.str; - description = '' - A path to a SSL CA certificate file in PEM format, or `all`. - - If `all` is set, then client certificate checking will be - disabled. - - This option can be used with `listen = "https"`. If the path - refers to an `AF_UNIX` stream socket in the file system a - connection is made to it and the certificate read from it. - ''; - }; }; }; }; }; config = lib.mkIf cfg.enable { + assertions = + map + (key: { + assertion = !(cfg.settings ? Remote.${key}); + message = '' + The option definition `services.journald.remote.settings.Remote.${key}' + no longer has any effect; please remove it. + ${tlsOptionRemovedMessage} + ''; + }) + [ + "ServerKeyFile" + "ServerCertificateFile" + "TrustedCertificateFile" + ]; + systemd.additionalUpstreamSystemUnits = [ "systemd-journal-remote.service" "systemd-journal-remote.socket" diff --git a/nixos/modules/system/boot/systemd/journald-upload.nix b/nixos/modules/system/boot/systemd/journald-upload.nix index 8cd67918f4f0..b18bfd1c141d 100644 --- a/nixos/modules/system/boot/systemd/journald-upload.nix +++ b/nixos/modules/system/boot/systemd/journald-upload.nix @@ -10,7 +10,7 @@ let format = pkgs.formats.systemd { }; in { - meta.maintainers = [ lib.maintainers.raitobezarius ]; + meta.maintainers = [ ]; options.services.journald.upload = { enable = lib.mkEnableOption "uploading the systemd journal to a remote server"; diff --git a/nixos/modules/system/boot/systemd/repart.nix b/nixos/modules/system/boot/systemd/repart.nix index fce8e417991d..2126464c5250 100644 --- a/nixos/modules/system/boot/systemd/repart.nix +++ b/nixos/modules/system/boot/systemd/repart.nix @@ -157,6 +157,12 @@ in boot.initrd.systemd = lib.mkIf initrdCfg.enable { additionalUpstreamUnits = [ "systemd-repart.service" + # Varlink APIs + # NOTE: compared to stage 2 where the IPC is enabled in the global location, initrd + # might be optimized to keep away the repart binary. + # As a result, we enable repart IPC in the initrd only if repart is enabled in the initrd. + "systemd-repart.socket" + "systemd-repart@.service" ]; storePaths = [ diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index c606ff1ac50b..631a02645d9b 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -317,6 +317,7 @@ in mkdir -p $out/lib/tmpfiles.d cd $out/lib/tmpfiles.d + ln -s "${systemd}/example/tmpfiles.d/credstore.conf" ln -s "${systemd}/example/tmpfiles.d/home.conf" ln -s "${systemd}/example/tmpfiles.d/journal-nocow.conf" ln -s "${systemd}/example/tmpfiles.d/portables.conf" diff --git a/nixos/modules/system/boot/systemd/tpm2.nix b/nixos/modules/system/boot/systemd/tpm2.nix index 2703d60428f1..3537dab80f13 100644 --- a/nixos/modules/system/boot/systemd/tpm2.nix +++ b/nixos/modules/system/boot/systemd/tpm2.nix @@ -43,6 +43,9 @@ "tpm2.target" "systemd-tpm2-setup-early.service" "systemd-tpm2-setup.service" + "systemd-pcrextend.socket" + "systemd-pcrextend@.service" + "systemd-pcrlogin@.service" ]; } ) @@ -69,6 +72,8 @@ boot.initrd.systemd.additionalUpstreamUnits = [ "tpm2.target" "systemd-tpm2-setup-early.service" + "systemd-pcrextend.socket" + "systemd-pcrextend@.service" ]; boot.initrd.availableKernelModules = [ @@ -81,6 +86,7 @@ pkgs.tpm2-tss "${cfg.package}/lib/systemd/systemd-tpm2-setup" "${cfg.package}/lib/systemd/system-generators/systemd-tpm2-generator" + "${cfg.package}/lib/systemd/systemd-pcrextend" ]; } ) @@ -89,7 +95,9 @@ cfg = config.boot.initrd.systemd; in lib.mkIf (cfg.enable && cfg.tpm2.enable && cfg.tpm2.pcrphases.enable) { - boot.initrd.systemd.additionalUpstreamUnits = [ "systemd-pcrphase-initrd.service" ]; + boot.initrd.systemd.additionalUpstreamUnits = [ + "systemd-pcrphase-initrd.service" + ]; boot.initrd.systemd.services.systemd-pcrphase-initrd.wantedBy = [ "initrd.target" ]; boot.initrd.systemd.storePaths = [ "${cfg.package}/lib/systemd/systemd-pcrextend" ]; } diff --git a/nixos/modules/system/boot/tzpfms.nix b/nixos/modules/system/boot/tzpfms.nix new file mode 100644 index 000000000000..e1ca02b3a209 --- /dev/null +++ b/nixos/modules/system/boot/tzpfms.nix @@ -0,0 +1,247 @@ +{ + config, + lib, + pkgs, + utils, + ... +}: + +# NOTE: the loading of keys is done in separate tzpfms systemd services +# defined below rather than inline in the ZFS import scripts. + +let + cfgZFS = config.boot.zfs; + cfg = cfgZFS.tzpfms; + + datasetToPool = x: lib.elemAt (lib.splitString "/" x) 0; + + pools = lib.unique (map datasetToPool cfg.datasets); + + # All ZFS filesystems + zfsFilesystems = lib.filter (x: x.fsType == "zfs") config.system.build.fileSystems; + + # Pools that are already imported in initrd (have neededForBoot filesystems) + fsToPool = fs: lib.elemAt (lib.splitString "/" fs.device) 0; + rootPools = lib.unique (map fsToPool (lib.filter utils.fsNeededForBoot zfsFilesystems)); + + # Only include initrd resources if datasets belong to pools that need initrd import. + # A pool needs initrd import if it has neededForBoot filesystems. + initrdPools = lib.filter (pool: lib.elem pool rootPools) pools; + systemPools = lib.filter (pool: !(lib.elem pool rootPools)) pools; + + needsInitrd = initrdPools != [ ]; + + datasetsByPool = lib.groupBy datasetToPool cfg.datasets; + + # Goup neededForBoot filesystems by pool → initrd mount units + initrdMountsByPool = lib.foldl' ( + acc: fs: + let + p = lib.elemAt (lib.splitString "/" fs.device) 0; + mount = "${utils.escapeSystemdPath ("/sysroot" + (lib.removeSuffix "/" fs.mountPoint))}.mount"; + in + if utils.fsNeededForBoot fs then acc // { ${p} = (acc.${p} or [ ]) ++ [ mount ]; } else acc + ) { } zfsFilesystems; + + # Group all ZFS filesystems by pool → system mount units + systemMountsByPool = lib.foldl' ( + acc: fs: + let + pool = lib.elemAt (lib.splitString "/" fs.device) 0; + mount = "${utils.escapeSystemdPath (lib.removeSuffix "/" fs.mountPoint)}.mount"; + in + acc // { ${pool} = (acc.${pool} or [ ]) ++ [ mount ]; } + ) { } zfsFilesystems; + + # Generate tzpfms key-loading bash script + mkTzpfmsScript = datasets: /* bash */ '' + tzpfms_load_key() { + zfs-tpm-list -H ${backendArgs} "$@" 2>/dev/null | while IFS=$'\t' read -r name backend status _; do + case "$backend" in + ${lib.optionalString (lib.elem "TPM2" cfg.backends) /* bash */ '' + TPM2) + zfs-tpm2-load-key "$name" || true + ;; + ''} + ${lib.optionalString (lib.elem "TPM1.X" cfg.backends) /* bash */ '' + TPM1.X) + zfs-tpm1x-load-key "$name" || true + ;; + ''} + *) + echo "[WARN] boot.zfs.tzpfms: Unsupported tzpfms backend: “$backend”; “$name” not unlocked" >&2 + ;; + esac + done + } + + ${lib.concatMapStringsSep "\n" (ds: "tzpfms_load_key -u ${lib.escapeShellArg ds}") datasets} + ''; + + mkTzpfmsService = + { + pool, + mountUnits, + script, + }: + { + description = "Load TPM keys for ZFS pool “${pool}”"; + after = [ "zfs-import-${pool}.service" ]; + before = mountUnits ++ [ "zfs-import.target" ]; + requiredBy = mountUnits ++ [ "zfs-import.target" ]; + unitConfig.DefaultDependencies = "no"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; + inherit script; + }; + + backendArgs = lib.escapeShellArgs ( + lib.concatMap (b: [ + "-b" + b + ]) cfg.backends + ); +in +{ + meta.maintainers = with lib.maintainers; [ toastal ]; + + options = { + boot.zfs.tzpfms = { + enable = lib.mkEnableOption '' + TPM-backed ZFS encryption using tzpfms. + Supports both TPM 2.0 & TPM 1.x. + ''; + + package = lib.mkPackageOption pkgs "tzpfms" { }; + + backends = lib.mkOption { + type = + with lib.types; + nonEmptyListOf (enum [ + "TPM2" + "TPM1.X" + ]); + default = [ + "TPM2" + ]; + description = '' + TPM backends to include in for tzpfms. + ''; + }; + + datasets = lib.mkOption { + # Needs to be explicit so we can build thy systemd services + type = with lib.types; nonEmptyListOf str; + example = [ + "tank/root" + "tank/var" + ]; + description = '' + Explicit list of ZFS datasets to unlock with TPM at boot. + ''; + }; + }; + }; + + config = lib.mkIf cfg.enable { + assertions = [ + { + assertion = + config.boot.supportedFilesystems.zfs or config.boot.initrd.supportedFilesystems.zfs or false; + message = "ZFS filesystem support needs to be enabled for boot.tzpfms to work"; + } + { + assertion = initrdPools != { } -> config.boot.initrd.systemd.enable; + message = "boot.zfs.tzpfms requires boot.initrd.systemd.enable = true"; + } + { + assertion = + !(cfgZFS.requestEncryptionCredentials == true) || cfgZFS.requestEncryptionCredentials == [ ]; + message = '' + boot.zfs.requestEncryptionCredentials = true would prompt for all + encrypted dataset passphrases at boot, which conflicts with automatic + TPM unlock via tzpfms. Either set it to false, or explicitly list the + datasets that still need passphrase prompting. + ''; + } + ( + let + intersected = lib.intersectLists cfg.datasets ( + if lib.isList cfgZFS.requestEncryptionCredentials then cfgZFS.requestEncryptionCredentials else [ ] + ); + in + { + assertion = builtins.length intersected == 0; + message = '' + The following datasets are listed in both boot.zfs.tzpfms.datasets + & boot.zfs.requestEncryptionCredentials, which would cause a + passphrase prompt to block boot before tzpfms can unlock them via + TPM: + + ${lib.concatMapStringsSep "\n" (d: "• ${d}") intersected} + + Remove them from boot.zfs.requestEncryptionCredentials to allow + automatic TPM unlock. + ''; + } + ) + ]; + + environment.systemPackages = [ cfg.package ]; + + # Automatically register pools from tzpfms datasets as extraPools + boot.zfs.extraPools = pools; + + boot.initrd = lib.mkMerge [ + (lib.mkIf cfg.enable { + availableKernelModules = [ + "tpm_tis" + "tpm_crb" + ]; + }) + (lib.mkIf needsInitrd ( + lib.mkMerge [ + (lib.mkIf config.boot.initrd.systemd.enable { + systemd.extraBin = { + zfs-tpm-list = "${lib.getBin cfg.package}/bin/zfs-tpm-list"; + } + // lib.optionalAttrs (lib.elem "TPM2" cfg.backends) { + zfs-tpm2-load-key = "${lib.getBin cfg.package}/bin/zfs-tpm2-load-key"; + } + // lib.optionalAttrs (lib.elem "TPM1.X" cfg.backends) { + zfs-tpm1x-load-key = "${lib.getBin cfg.package}/bin/zfs-tpm1x-load-key"; + }; + systemd.storePaths = + lib.optional (lib.elem "TPM2" cfg.backends) pkgs.tpm2-tss + ++ lib.optional (lib.elem "TPM1.X" cfg.backends) pkgs.trousers; + systemd.services = lib.genAttrs' initrdPools (pool: { + name = "tzpfms-load-${pool}"; + value = mkTzpfmsService { + inherit pool; + mountUnits = initrdMountsByPool.${pool} or [ ]; + script = mkTzpfmsScript (datasetsByPool.${pool} or [ ]); + }; + }); + }) + ] + )) + ]; + + systemd.services = lib.genAttrs' systemPools ( + pool: + let + mnts = systemMountsByPool.${pool} or [ ]; + in + { + name = "tzpfms-load-${pool}"; + value = mkTzpfmsService { + inherit pool; + mountUnits = mnts; + script = mkTzpfmsScript (datasetsByPool.${pool} or [ ]); + }; + } + ); + }; +} diff --git a/nixos/modules/system/boot/uki.nix b/nixos/modules/system/boot/uki.nix index fa12c63b751a..a33822a9ba37 100644 --- a/nixos/modules/system/boot/uki.nix +++ b/nixos/modules/system/boot/uki.nix @@ -81,7 +81,7 @@ in Linux = lib.mkOptionDefault "${config.boot.kernelPackages.kernel}/${config.system.boot.loader.kernelFile}"; Initrd = lib.mkOptionDefault "${config.system.build.initialRamdisk}/${config.system.boot.loader.initrdFile}"; Cmdline = lib.mkOptionDefault "init=${config.system.build.toplevel}/init ${toString config.boot.kernelParams}"; - Stub = lib.mkOptionDefault "${pkgs.systemd}/lib/systemd/boot/efi/linux${efiArch}.efi.stub"; + Stub = lib.mkOptionDefault "${config.systemd.package}/lib/systemd/boot/efi/linux${efiArch}.efi.stub"; Uname = lib.mkOptionDefault "${config.boot.kernelPackages.kernel.modDirVersion}"; OSRelease = lib.mkOptionDefault "@${config.system.build.etc}/etc/os-release"; # This is needed for cross compiling. diff --git a/nixos/modules/system/etc/build-composefs-dump.py b/nixos/modules/system/etc/build-composefs-dump.py index d8ede9aebf83..6b720f1c7631 100644 --- a/nixos/modules/system/etc/build-composefs-dump.py +++ b/nixos/modules/system/etc/build-composefs-dump.py @@ -20,6 +20,13 @@ from typing import Any Attrs = dict[str, Any] +# mkcomposefs hard-limits inline content to LCFS_INLINE_CONTENT_MAX (5000 bytes). +# We stay a bit below that. Files larger than this are served from the basedir +# data-only lower layer via an overlay redirect; files at or below it are +# embedded directly into the erofs metadata image, avoiding the redirect +# indirection at read time and keeping the basedir empty in the common case. +INLINE_CONTENT_MAX = 4096 + class FileType(Enum): """The filetype as defined by the `st_mode` stat field in octal @@ -55,12 +62,14 @@ class ComposefsPath: mode: str, payload: str, path: str | None = None, + content: str = "-", ): if path is None: path = attrs["target"] self.path = path self.size = size self.filetype = filetype + self.content = content match len(mode): case 3 | 4: @@ -95,6 +104,43 @@ def eprint(*args: Any, **kwargs: Any) -> None: print(*args, **kwargs, file=sys.stderr) +# Bytes that may appear unescaped in a composefs-dump field. Everything else +# is encoded as \xHH. See composefs-dump(5). +_DUMP_SHORT_ESCAPES: dict[int, str] = { + ord("\\"): r"\\", + ord("\n"): r"\n", + ord("\r"): r"\r", + ord("\t"): r"\t", +} + + +def escape_dump_field(data: bytes) -> str: + """Escape raw bytes for use as a composefs-dump field. + + The dump format separates fields by a single space and lines by a single + newline, uses '\\' as the escape character and reserves '-' for unset + optional fields, so all of these (plus non-printable bytes and '=') must + be escaped. + """ + if data == b"": + # An empty CONTENT field would be indistinguishable from two spaces + # between PAYLOAD and DIGEST; callers must emit '-' for size-0 files + # instead of inlining them. + raise ValueError("cannot escape empty content; emit '-' instead") + if data == b"-": + # A bare '-' means "unset"; escape it so it round-trips as content. + return r"\x2d" + out: list[str] = [] + for b in data: + if b in _DUMP_SHORT_ESCAPES: + out.append(_DUMP_SHORT_ESCAPES[b]) + elif b in (ord(" "), ord("=")) or not (0x20 <= b <= 0x7E): + out.append(f"\\x{b:02x}") + else: + out.append(chr(b)) + return "".join(out) + + def normalize_path(path: str) -> str: return str("/" + os.path.normpath(path).lstrip("/")) @@ -201,14 +247,37 @@ def main() -> None: payload=source, ) else: - composefs_path = ComposefsPath( - attrs, - size=os.stat(source).st_size, - filetype=FileType.file, - mode=mode, - # payload needs to be relative path in this case - payload=target.lstrip("/"), - ) + size = os.stat(source).st_size + if size <= INLINE_CONTENT_MAX: + # Inline small files directly into the erofs image so they + # do not need to be served from the basedir data layer via + # an overlay redirect. Empty files need neither payload nor + # content; mkcomposefs treats size=0 as an empty inline + # file. + if size > 0: + with open(source, "rb") as fh: + raw = fh.read() + content = escape_dump_field(raw) + size = len(raw) + else: + content = "-" + composefs_path = ComposefsPath( + attrs, + size=size, + filetype=FileType.file, + mode=mode, + payload="-", + content=content, + ) + else: + composefs_path = ComposefsPath( + attrs, + size=size, + filetype=FileType.file, + mode=mode, + # payload needs to be relative path in this case + payload=target.lstrip("/"), + ) paths[target] = composefs_path add_leading_directories(target, attrs, paths) diff --git a/nixos/modules/system/etc/etc-activation.nix b/nixos/modules/system/etc/etc-activation.nix index b00c25e37802..6cff22a1c0c6 100644 --- a/nixos/modules/system/etc/etc-activation.nix +++ b/nixos/modules/system/etc/etc-activation.nix @@ -71,6 +71,10 @@ RequiresMountsFor = [ "/sysroot/nix/store" ]; + # find-etc only creates this symlink for a NixOS init. For a + # non-NixOS init= (e.g. init=/bin/sh) it is absent, so skip the + # mount instead of failing the whole initrd. + ConditionPathExists = "/etc-metadata-image"; }; requires = [ config.boot.initrd.systemd.services.initrd-find-etc.name @@ -123,6 +127,8 @@ "/run/nixos-etc-metadata" ]; DefaultDependencies = false; + # Skip for a non-NixOS init=, see the metadata mount above. + ConditionPathExists = "/etc-basedir"; }; } ]; @@ -140,6 +146,8 @@ # before the overlay is mounted. "/run/nixos-etc-metadata" ]; + # Skip for a non-NixOS init=, see the metadata mount above. + ConditionPathExists = "/etc-metadata-image"; }; serviceConfig = { Type = "oneshot"; @@ -174,16 +182,37 @@ }) (lib.mkIf (config.system.etc.overlay.enable && !config.system.etc.overlay.mutable) { - # Systemd requires /etc/machine-id exists or can be initialized on first - # boot. This file should not be part of an image or system config because - # it is unique to the machine, so it is initialized at first boot and - # persisted in the system state directory, /var/lib/nixos. - environment.etc."machine-id".source = lib.mkDefault "/var/lib/nixos/machine-id"; - boot.initrd.systemd.tmpfiles.settings.machine-id."/sysroot/var/lib/nixos/machine-id".f = - lib.mkDefault - { - argument = "uninitialized"; - }; + # An empty regular file means systemd will bind mount /run/machine-id + # on top, and ConditionFirstBoot will be false (the file will never + # change, so this makes sense). See machine-id(5) "First Boot + # Semantics". It also serves as a target to bind mount an actually + # persistent machine-id onto. A symlink doesn't work here since + # systemd-machine-id-commit checks /etc/machine-id itself for being a + # mountpoint without following symlinks, so it would never commit + # through a symlink. + environment.etc.machine-id = lib.mkDefault { + text = ""; + mode = "0444"; + }; + + # The upstream unit has ConditionPathIsReadWrite=/etc, which is always + # false here. Replace it with ConditionFirstBoot: with the empty + # placeholder above first-boot is "no" and commit stays skipped, but + # when a persistence module bind-mounts a writable file containing + # "uninitialized" over /etc/machine-id, first-boot is "yes" once and + # commit writes the generated ID through the bind mount. + # + # An empty Condition*= assignment resets *all* condition types, and + # this attrset is serialised in key order, so the reset goes through + # ConditionFirstBoot (sorts first) and we re-add the upstream + # ConditionPathIsMountPoint afterwards. + systemd.services.systemd-machine-id-commit.unitConfig = { + ConditionFirstBoot = lib.mkDefault [ + "" + "true" + ]; + ConditionPathIsMountPoint = lib.mkDefault "/etc/machine-id"; + }; }) ]; diff --git a/nixos/modules/system/etc/etc.nix b/nixos/modules/system/etc/etc.nix index 9ab019171b4c..46cf116eabbb 100644 --- a/nixos/modules/system/etc/etc.nix +++ b/nixos/modules/system/etc/etc.nix @@ -69,6 +69,22 @@ let etcHardlinks = lib.filter (f: f.mode != "symlink" && f.mode != "direct-symlink") etc'; + # Regular files at or below this size are inlined into the erofs metadata + # image (see build-composefs-dump.py) and therefore do not need to be + # shipped in the basedir data-only lower layer. Keep this in sync with + # INLINE_CONTENT_MAX in build-composefs-dump.py. + etcInlineContentMax = 4096; + + # Entries whose content we can prove at eval time will be served directly + # from the metadata image (inlined, or empty). Excluding them here keeps + # their source paths out of the basedir build script, so changing a small + # text-backed /etc file does not rebuild etc-lowerdir. Entries backed by + # `source` (size unknown at eval time) are kept and filtered at build time + # below. + isInlinedAtEvalTime = f: f.text != null && lib.stringLength f.text <= etcInlineContentMax; + + etcBasedirEntries = lib.filter (f: !isInlinedAtEvalTime f) etcHardlinks; + in { @@ -371,6 +387,18 @@ in src="$1" target="$2" + if [[ -f "$src" ]]; then + # Small regular files are inlined into the erofs metadata image by + # build-composefs-dump.py and served directly from there, so we do + # not need a copy in the basedir data layer. Keep the size check in + # sync with INLINE_CONTENT_MAX in build-composefs-dump.py. Empty + # files need no backing copy either. + size=$(stat --dereference --format=%s "$src") + if (( size <= ${toString etcInlineContentMax} )); then + return + fi + fi + mkdir -p "$out/$(dirname "$target")" cp "$src" "$out/$target" } @@ -384,7 +412,7 @@ in "${etcEntry.source}" etcEntry.target ] - ) etcHardlinks} + ) etcBasedirEntries} ''; system.build.etcMetadataImage = diff --git a/nixos/modules/system/service/systemd/service.nix b/nixos/modules/system/service/systemd/service.nix index 5fdf70c53b08..e7fa338ff97b 100644 --- a/nixos/modules/system/service/systemd/service.nix +++ b/nixos/modules/system/service/systemd/service.nix @@ -113,6 +113,44 @@ in defaultText = lib.literalExpression "config.systemd.lib.escapeSystemdExecArgs config.process.argv"; }; + systemd.mainExecReload = mkOption { + description = '' + Main command line for systemd's ExecReload with systemd's specifier and + environment variable substitution enabled. + + This option sets the primary ExecRestart entry. Additional ExecReload entries + can be added via `systemd.service.serviceConfig.ExecReload` with `lib.mkBefore` + or `lib.mkAfter`. + + This option allows you to use systemd specifiers like `%n` (unit name), + `%i` (instance), `%t` (runtime directory), and environment variables using + `''${VAR}` syntax in your command line. + + By default, it is set to {option}`process.reloadCommand` when specified, or an + empty string otherwise. Because {option}`process.reloadCommand` is already a + command line (not an argument list), it is used verbatim so that references + like `$MAINPID` are preserved. + + To extend {option}`process.reloadCommand` with systemd specifiers, you can append + to the command line: + + ```nix + systemd.mainExecReload = + config.process.reloadCommand + " --systemd-unit %n"; + ``` + + This pattern allows you to pass the unit name (or other systemd specifiers) + as additional arguments. + + See {manpage}`systemd.service(5)` (section "COMMAND LINES") for details on + variable substitution and {manpage}`systemd.unit(5)` (section "SPECIFIERS") + for available specifiers like `%n`, `%i`, `%t`. + ''; + type = types.nullOr types.str; + default = if config.process.reloadCommand != null then config.process.reloadCommand else ""; + defaultText = lib.literalExpression "config.process.reloadCommand"; + }; + systemd.services = mkOption { description = '' This module configures systemd services, with the notable difference that their unit names will be prefixed with the abstract service name. @@ -170,7 +208,8 @@ in # TODO description; wantedBy = lib.mkDefault [ "multi-user.target" ]; serviceConfig = { - Type = lib.mkDefault "simple"; + ExecReload = config.systemd.mainExecReload; + Type = lib.mkDefault (if config.notificationProtocol.systemd then "notify" else "simple"); Restart = lib.mkDefault "always"; RestartSec = lib.mkDefault "5"; ExecStart = [ diff --git a/nixos/modules/tasks/filesystems/ntfs.nix b/nixos/modules/tasks/filesystems/ntfs.nix index 8ec839fed7eb..271680b56074 100644 --- a/nixos/modules/tasks/filesystems/ntfs.nix +++ b/nixos/modules/tasks/filesystems/ntfs.nix @@ -4,15 +4,24 @@ pkgs, ... }: - -with lib; - +let + ntfsEnabled = config.boot.supportedFilesystems.ntfs or false; + ntfs3gEnabled = config.boot.supportedFilesystems.ntfs-3g or false; + ntfsPlusSupported = config.boot.kernelPackages.kernelAtLeast "7.1"; + initrdSupport = config.boot.initrd.supportedFilesystems.ntfs or false; +in { - config = - mkIf (config.boot.supportedFilesystems.ntfs or config.boot.supportedFilesystems.ntfs-3g or false) - { + config = lib.mkMerge [ + (lib.mkIf (ntfsEnabled && ntfsPlusSupported && !ntfs3gEnabled) { + system.fsPackages = [ pkgs.ntfsprogs-plus ]; - system.fsPackages = [ pkgs.ntfs3g ]; + boot.initrd.availableKernelModules = lib.optionals initrdSupport [ "ntfs" ]; + }) - }; + (lib.mkIf (ntfs3gEnabled || (ntfsEnabled && !ntfsPlusSupported)) { + system.fsPackages = [ pkgs.ntfs3g ]; + + boot.initrd.availableKernelModules = lib.optionals initrdSupport [ "ntfs3" ]; + }) + ]; } diff --git a/nixos/modules/tasks/filesystems/sshfs.nix b/nixos/modules/tasks/filesystems/sshfs.nix index f070779ecc54..917ceea7b691 100644 --- a/nixos/modules/tasks/filesystems/sshfs.nix +++ b/nixos/modules/tasks/filesystems/sshfs.nix @@ -10,6 +10,8 @@ lib.mkIf (config.boot.supportedFilesystems.sshfs or config.boot.supportedFilesystems."fuse.sshfs" or false) { + programs.fuse.enable = true; + system.fsPackages = [ pkgs.sshfs ]; }; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 4887256b7be1..06b38deff6b6 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -1693,8 +1693,7 @@ in type = types.bool; description = '' Whether we should use networkd as the network configuration backend or - the legacy script based system. Note that this option is experimental, - enable at your own risk. + the legacy script based system. ''; }; diff --git a/nixos/modules/testing/test-instrumentation.nix b/nixos/modules/testing/test-instrumentation.nix index 4d20b20090b4..de2cb3d2afc8 100644 --- a/nixos/modules/testing/test-instrumentation.nix +++ b/nixos/modules/testing/test-instrumentation.nix @@ -78,6 +78,8 @@ let # Allow very slow start DefaultTimeoutStartSec = 300; DefaultDeviceTimeoutSec = 300; + # Don't enforce a minimum uptime before shutting down. + MinimumUptimeSec = 0; }; in diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 6386a57079f2..714169c2f554 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -9,6 +9,15 @@ let inherit (lib) literalExpression mkOption types; + oldRegistriesOptionsUsed = lib.any (x: x != [ ]) ( + with cfg.registries; + [ + search + insecure + block + ] + ); + toml = pkgs.formats.toml { }; in { @@ -61,30 +70,54 @@ in }; registries = { + # TODO: remove those options in 26.11 search = mkOption { + visible = false; type = types.listOf types.str; - default = [ - "docker.io" - "quay.io" - ]; + default = [ ]; description = '' List of repositories to search. + + Deprecated, examine {option}`virtualisation.registries.settings` instead. ''; }; insecure = mkOption { default = [ ]; + visible = false; type = types.listOf types.str; description = '' List of insecure repositories. + + Deprecated, examine {option}`virtualisation.registries.settings` instead. ''; }; block = mkOption { default = [ ]; + visible = false; type = types.listOf types.str; description = '' List of blocked repositories. + + Deprecated, examine {option}`virtualisation.registries.settings` instead. + ''; + }; + + settings = mkOption { + type = toml.type; + default = { + registry = [ + { location = "docker.io"; } + { location = "quay.io"; } + ]; + }; + description = '' + repositories.conf configuration. + + Examine [containers-registries.conf(5)] for more information about the format. + + [containers-registries.conf(5)]: https://github.com/containers/image/blob/main/docs/containers-registries.conf.5.md ''; }; }; @@ -112,6 +145,15 @@ in }; config = lib.mkIf cfg.enable { + warnings = lib.optional oldRegistriesOptionsUsed "the options virtualisation.registries.search / insecure / block are deprecated. See virtualisation.registries.settings instead."; + + virtualisation.containers.registries.settings = lib.mkIf oldRegistriesOptionsUsed { + registries = { + block.registries = cfg.registries.block; + insecure.registries = cfg.registries.insecure; + search.registries = cfg.registries.search; + }; + }; virtualisation.containers.containersConf.cniPlugins = [ pkgs.cni-plugins ]; @@ -136,9 +178,7 @@ in "containers/storage.conf".source = toml.generate "storage.conf" cfg.storage.settings; - "containers/registries.conf".source = toml.generate "registries.conf" { - registries = lib.mapAttrs (n: v: { registries = v; }) cfg.registries; - }; + "containers/registries.conf".source = toml.generate "registries.conf" cfg.registries.settings; "containers/policy.json".source = if cfg.policy != { } then diff --git a/nixos/modules/virtualisation/credentials-options.nix b/nixos/modules/virtualisation/credentials-options.nix new file mode 100644 index 000000000000..3345f6933784 --- /dev/null +++ b/nixos/modules/virtualisation/credentials-options.nix @@ -0,0 +1,63 @@ +{ lib, pkgs, ... }: +{ + options.virtualisation.credentials = lib.mkOption { + description = '' + Credentials to pass to the VM or container using systemd's credential system. + + See {manpage}`systemd.exec(5)`, {manpage}`systemd-creds(1)` and https://systemd.io/CREDENTIALS/ for more + information about systemd credentials. + ''; + default = { }; + example = lib.literalExpression '' + { + database-password = { + text = "my-secret-password"; + }; + ssl-cert = { + source = "./cert.pem"; + }; + binary-key = { + source = "./private.der"; + }; + } + ''; + type = lib.types.attrsOf ( + lib.types.submodule ( + { + name, + options, + config, + ... + }: + { + options = { + source = lib.mkOption { + type = lib.types.nullOr (lib.types.pathWith { }); + default = null; + description = '' + Source file on the host containing the credential data. + ''; + }; + text = lib.mkOption { + default = null; + type = lib.types.nullOr lib.types.str; + description = '' + Text content of the credential. + + For binary data or when the credential content should come from + an existing file, use `source` instead. + + ::: {.warning} + The text here is stored in the host's nix store as a file. + ::: + ''; + }; + }; + config.source = lib.mkIf (config.text != null) ( + lib.mkDerivedConfig options.text (pkgs.writeText name) + ); + } + ) + ); + }; +} diff --git a/nixos/modules/virtualisation/incus.nix b/nixos/modules/virtualisation/incus.nix index 83a5a731ccb7..ce414b8896f7 100644 --- a/nixos/modules/virtualisation/incus.nix +++ b/nixos/modules/virtualisation/incus.nix @@ -93,6 +93,9 @@ let ] ++ lib.optionals nvidiaEnabled [ libnvidia-container + ] + ++ lib.optionals cfg.storage.truenas.enable [ + truenas-incus-ctl ]; # https://github.com/lxc/incus/blob/cff35a29ee3d7a2af1f937cbb6cf23776941854b/internal/server/instance/drivers/driver_qemu.go#L123 @@ -284,6 +287,8 @@ in ''; }; + storage.truenas.enable = lib.mkEnableOption "TrueNAS storage driver support"; + ui = { enable = lib.mkEnableOption "Incus Web UI"; @@ -314,6 +319,10 @@ in ); message = "Incus on NixOS is unsupported using iptables. Set `networking.nftables.enable = true;`"; } + { + assertion = cfg.storage.truenas.enable -> config.services.openiscsi.enable; + messages = "`virtualisation.incus.storage.truenas.enable` requires `services.openiscsi.enable`"; + } ]; # https://github.com/lxc/incus/blob/f145309929f849b9951658ad2ba3b8f10cbe69d1/doc/reference/server_settings.md @@ -346,6 +355,9 @@ in # gui console support pkgs.spice-gtk + ] + ++ lib.optionals cfg.storage.truenas.enable [ + pkgs.truenas-incus-ctl ]; # Note: the following options are also declared in virtualisation.lxc, but @@ -363,22 +375,28 @@ in include ${cfg.lxcPackage}/etc/apparmor.d/lxc-containers ''; "incusd".profile = '' - # This profile allows everything and only exists to give the - # application a name instead of having the label "unconfined" + # incusd is deliberatly left unconfined, with NO named profile attached to the binary. + # Incus checks its own confinement at startup by reading /proc/self/attr/current + # (https://github.com/lxc/incus/blob/92b0cbbc5728ed45578fdeeec634606af8826404/internal/server/sys/apparmor.go). + # Anything other than "unconfined" makes Incus believe that the host process is + # itself confined, which sends every container down the "reuse my own profile" branch in + # https://github.com/lxc/incus/blob/92b0cbbc5728ed45578fdeeec634606af8826404/internal/server/instance/drivers/driver_lxc.go + # instead of generating a "proper" per-container profile. Furthermore, + # that branch only strips " (enforce)" suffix before handing the string to lxc.apparmor.profile + # (https://github.com/lxc/incus/blob/92b0cbbc5728ed45578fdeeec634606af8826404/internal/server/instance/drivers/driver_lxc.go#L96), + # so the named profile with flags=(unconfined) produces a literal string + # "incusd (unconfined)", which the kernel rejects at change_profile() time + # with "label not found", failing every `incus start` when AppArmor is enabled. + # This was not caught before as AppArmor was stifled by bpf. + + # We keep this policy to pull in the per-container / + # per-archive profiles incusd generates at runtime so + # apparmor_parser loads them. abi , include - profile incusd ${lib.getExe' config.virtualisation.incus.package "incusd"} flags=(unconfined) { - userns, - - include "/var/lib/incus/security/apparmor/cache" - - # Site-specific additions and overrides. See local/README for details. - include if exists - } - - include "/var/lib/incus/security/apparmor/profiles" + include if exists "/var/lib/incus/security/apparmor/profiles" ''; }; includes."abstractions/base" = '' @@ -428,6 +446,8 @@ in ] ++ lib.optionals (cfg.useACMEHost != null) [ "acme-${cfg.useACMEHost}.service" ]; + stopIfChanged = lib.mkIf cfg.softDaemonRestart false; + serviceConfig = { ExecStart = "${cfg.package}/bin/incusd --group incus-admin"; ExecStartPost = "${cfg.package}/bin/incusd waitready --timeout=${cfg.startTimeout}"; @@ -486,6 +506,7 @@ in # restarting this service will affect instances restartIfChanged = false; + stopIfChanged = false; serviceConfig = { ExecStart = "${incus-startup} start"; diff --git a/nixos/modules/virtualisation/nixos-containers.nix b/nixos/modules/virtualisation/nixos-containers.nix index dd9177a5bd21..ea904528caec 100644 --- a/nixos/modules/virtualisation/nixos-containers.nix +++ b/nixos/modules/virtualisation/nixos-containers.nix @@ -520,7 +520,7 @@ let hostAddress6 = null; localAddress = null; localAddress6 = null; - localmacAddress = null; + localMacAddress = null; tmpfs = null; }; diff --git a/nixos/modules/virtualisation/nspawn-container/default.nix b/nixos/modules/virtualisation/nspawn-container/default.nix index e1fdab1a6f1c..621f2bcb9f33 100644 --- a/nixos/modules/virtualisation/nspawn-container/default.nix +++ b/nixos/modules/virtualisation/nspawn-container/default.nix @@ -21,6 +21,10 @@ let cfg = config.virtualisation; in { + imports = [ + ../credentials-options.nix + ]; + options = { virtualisation.cmdline = lib.mkOption { @@ -77,39 +81,8 @@ in which is prohibited within the Nix build sandbox where the test is run. ''; } - { - # Check every interface defined in allInterfaces. - # Containers try to create a bridge "${config.system.name}-${interfaceName}" - assertion = lib.all ( - iface: - let - hostName = "${config.system.name}-${iface.name}"; - in - lib.stringLength hostName <= 15 - ) (lib.attrValues cfg.allInterfaces); - - message = - let - offendingInterfaces = lib.filter ( - iface: lib.stringLength "${config.system.name}-${iface.name}" > 15 - ) (lib.attrValues cfg.allInterfaces); - offenderList = map ( - i: - "${config.system.name}-${i.name} (${toString (lib.stringLength "${config.system.name}-${i.name}")} chars)" - ) offendingInterfaces; - in - '' - The following generated host interface names exceed the Linux 15-character limit: - ${lib.concatStringsSep "\n " offenderList} - - Please shorten 'config.system.name' or the interface names in 'virtualisation.interfaces'. - ''; - } ]; - # TODO(arianvp): Remove after https://github.com/NixOS/nixpkgs/pull/480686 is merged - console.enable = true; - virtualisation.systemd-nspawn.options = [ "--private-network" "--machine=${config.system.name}" @@ -134,7 +107,8 @@ in # Send a READY=1 notification to a socket when the container is fully booted. "--notify-ready=yes" - ]; + ] + ++ lib.mapAttrsToList (name: cred: "--load-credential=${name}:${cred.source}") cfg.credentials; system.build.nspawn = let diff --git a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py index f733ad1845c4..9d5d73433e66 100644 --- a/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py +++ b/nixos/modules/virtualisation/nspawn-container/run-nspawn/src/run_nspawn/__init__.py @@ -1,6 +1,7 @@ import contextlib import dataclasses import fcntl +import hashlib import logging import os import signal @@ -124,6 +125,13 @@ def mk_veth( vlan: int, ) -> typing.Generator[None, None, None]: host_intf_name = f"{container_name}-{container_intf_name}" + # If the names for systemd-nspawn containers are too long, + # the generated bridge interface names will surpass the + # kernel limit IFNAMSIZ (15 characters + '\0'). + if len(host_intf_name) > 15: + hashed = hashlib.sha256(host_intf_name.encode()).hexdigest()[:6] + host_intf_name = f"{host_intf_name[:8]}-{hashed}" + with ensure_vlan_bridge(vlan) as bridge_name: logger.info("creating interface %s", host_intf_name) run_ip( diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 8d2817c23bf0..59645757575f 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -399,6 +399,7 @@ in imports = [ ../profiles/qemu-guest.nix ./disk-size-option.nix + ./credentials-options.nix (mkRenamedOptionModule [ "virtualisation" @@ -740,7 +741,7 @@ in default = pkgs; defaultText = literalExpression "pkgs"; example = literalExpression '' - import pkgs.path { system = "x86_64-darwin"; } + import pkgs.path { system = "aarch64-darwin"; } ''; description = '' Package set to use for the host-specific packages of the VM runner. @@ -1126,81 +1127,20 @@ in }; virtualisation.credentials = mkOption { - description = '' - Credentials to pass to the VM using systemd's credential system. - - See {manpage}`systemd.exec(5)` , {manpage}`systemd-creds(1)` and https://systemd.io/CREDENTIALS/ for more - information about systemd credentials. - ''; - default = { }; - example = { - database-password = { - text = "my-secret-password"; - }; - ssl-cert = { - source = "./cert.pem"; - }; - binary-key = { - mechanism = "fw_cfg"; - source = "./private.der"; - }; - config-file = { - mechanism = "smbios"; - text = '' - [database] - host=localhost - port=5432 - ''; - }; - }; type = types.attrsOf ( - lib.types.submodule ( - { - name, - options, - config, - ... - }: - { - options = { - mechanism = lib.mkOption { - type = lib.types.enum [ - "fw_cfg" - "smbios" - ]; - default = if pkgs.stdenv.hostPlatform.isx86 then "smbios" else "fw_cfg"; - defaultText = lib.literalExpression ''if pkgs.stdenv.hostPlatform.isx86 then "smbios" else "fw_cfg"''; - description = '' - The mechanism used to pass the credential to the VM. - ''; - }; - source = lib.mkOption { - type = lib.types.nullOr (lib.types.pathWith { }); - default = null; - description = '' - Source file on the host containing the credential data. - ''; - }; - text = lib.mkOption { - default = null; - type = lib.types.nullOr lib.types.str; - description = '' - Text content of the credential. - - For binary data or when the credential content should come from - an existing file, use `source` instead. - - ::: {.warning} - The text here is stored in the host's nix store as a file. - ::: - ''; - }; - }; - config.source = lib.mkIf (config.text != null) ( - lib.mkDerivedConfig options.text (pkgs.writeText name) - ); - } - ) + lib.types.submodule { + options.mechanism = lib.mkOption { + type = lib.types.enum [ + "fw_cfg" + "smbios" + ]; + default = if pkgs.stdenv.hostPlatform.isx86 then "smbios" else "fw_cfg"; + defaultText = lib.literalExpression ''if pkgs.stdenv.hostPlatform.isx86 then "smbios" else "fw_cfg"''; + description = '' + The mechanism used to pass the credential to the VM. + ''; + }; + } ); }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index d6ec21f82226..219f386f3789 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -201,7 +201,7 @@ rec { (onFullSupported "nixos.tests.printing-socket") (onFullSupported "nixos.tests.proxy") (onFullSupported "nixos.tests.sddm.default") - (onFullSupported "nixos.tests.shadow") + (onFullSupported "nixos.tests.shadow.login") (onFullSupported "nixos.tests.simple-container") (onFullSupported "nixos.tests.simple-vm") (onFullSupported "nixos.tests.sway") diff --git a/nixos/release.nix b/nixos/release.nix index efc2570c5a70..f29e20efe19c 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -54,27 +54,6 @@ let ${system} = hydraJob test; } ); - } - // { - # for typechecking of the scripts and evaluation of - # the nodes, without running VMs. - allDrivers = import ./tests/all-tests.nix { - inherit system; - pkgs = import ./.. { inherit system; }; - callTest = - config: - let - inherit (config) driver; - in - lib.optionalAttrs (builtins.elem system (getPlatforms driver)) ( - if attrNamesOnly then - hydraJob driver - else - { - ${system} = hydraJob driver; - } - ); - }; }; allTests = foldAttrs recursiveUpdate { } ( @@ -111,7 +90,7 @@ let with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = makeModules module { }; }).config.system.build.isoImage @@ -123,7 +102,7 @@ let with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = makeModules module { }; }).config.system.build.sdImage @@ -141,7 +120,7 @@ let let config = - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = makeModules module { }; }).config; @@ -183,7 +162,7 @@ let makeNetboot = { module, system, ... }: let - configEvaled = import lib/eval-config.nix { + configEvaled = import ./lib/eval-config.nix { inherit system; modules = makeModules module { }; }; @@ -209,7 +188,7 @@ let in rec { - channel = import lib/make-channel.nix { + channel = import ./lib/make-channel.nix { inherit pkgs nixpkgs @@ -232,7 +211,7 @@ rec { kexec = forMatchingSystems supportedSystems ( system: - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ ./modules/installer/netboot/netboot-minimal.nix @@ -312,7 +291,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ ./modules/virtualisation/proxmox-image.nix @@ -331,7 +310,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ ./modules/virtualisation/proxmox-image.nix @@ -346,7 +325,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ ./modules/virtualisation/proxmox-lxc.nix @@ -362,7 +341,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -379,7 +358,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -403,7 +382,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -427,7 +406,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -451,7 +430,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -475,7 +454,7 @@ rec { with import ./.. { inherit system; }; hydraJob ( - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = [ configuration @@ -491,7 +470,7 @@ rec { system: pkgs.runCommand "dummy" { toplevel = - (import lib/eval-config.nix { + (import ./lib/eval-config.nix { inherit system; modules = singleton ( { ... }: @@ -539,14 +518,14 @@ rec { { ... }: { boot.isContainer = true; - imports = [ modules/profiles/minimal.nix ]; + imports = [ ./modules/profiles/minimal.nix ]; } ); ec2 = makeClosure ( { ... }: { - imports = [ modules/virtualisation/amazon-image.nix ]; + imports = [ ./modules/virtualisation/amazon-image.nix ]; } ); diff --git a/nixos/tests/accountsservice.nix b/nixos/tests/accountsservice.nix new file mode 100644 index 000000000000..95da652b0a97 --- /dev/null +++ b/nixos/tests/accountsservice.nix @@ -0,0 +1,26 @@ +{ ... }: + +{ + name = "accountsservice"; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = with pkgs; [ jq ]; + + services.accounts-daemon.enable = true; + + users.users.alice = { + isNormalUser = true; + description = "Alice"; + }; + }; + + testScript = '' + machine.start_job("accounts-daemon.service") + machine.wait_for_unit("accounts-daemon.service") + user = machine.succeed("busctl call -j org.freedesktop.Accounts /org/freedesktop/Accounts org.freedesktop.Accounts FindUserByName s alice | jq -j '.data[]'") + name = machine.succeed(f"busctl get-property -j org.freedesktop.Accounts {user} org.freedesktop.Accounts.User RealName | jq -j .data") + t.assertEqual(name, "Alice") + ''; +} diff --git a/nixos/tests/activation/etc-overlay-immutable.nix b/nixos/tests/activation/etc-overlay-immutable.nix index a76c1ad297da..febac2e016f2 100644 --- a/nixos/tests/activation/etc-overlay-immutable.nix +++ b/nixos/tests/activation/etc-overlay-immutable.nix @@ -20,6 +20,23 @@ text = "foo"; mode = "0300"; }; + # Small regular file: inlined into the metadata erofs image. + inlinetest = { + text = "inline-content\n"; + mode = "0640"; + }; + # Empty regular file: served directly from the metadata erofs image + # without payload or content. + emptytest = { + text = ""; + mode = "0644"; + }; + # Large regular file (>4096 bytes): served from the basedir data layer + # via overlay redirect, not inlined. + bigfile = { + text = lib.strings.replicate 5000 "a"; + mode = "0644"; + }; }; # Prerequisites @@ -59,10 +76,40 @@ with subtest("/etc is mounted as an overlay"): machine.succeed("findmnt --kernel --type overlay /etc") + with subtest("machine-id is set up without first-boot looping"): + # The baked-in placeholder is an empty regular file; systemd overlays + # /run/machine-id on top so the session has a valid ID while the + # commit service is condition-skipped (no writable /etc to commit to). + machine.succeed("stat --format '%F' /etc/machine-id | tee /dev/stderr | grep -q 'regular'") + machine.succeed("grep -qE '^[0-9a-f]{32}$' /etc/machine-id") + machine.fail("journalctl -b | grep -F 'System cannot boot: Missing /etc/machine-id'") + machine.fail("journalctl -b | grep -F 'Detected first boot'") + machine.fail("systemctl is-failed --quiet systemd-machine-id-commit.service") + assert machine.succeed( + "systemctl show -P ConditionResult systemd-machine-id-commit.service" + ).strip() == "no" + with subtest("modes work correctly"): machine.succeed("stat --format '%F' /etc/modetest | tee /dev/stderr | grep -q 'regular file'") machine.succeed("stat --format '%F' /etc/modetest2 | tee /dev/stderr | grep -q 'regular file'") + with subtest("small regular files are inlined into the metadata image"): + assert machine.succeed("cat /etc/inlinetest") == "inline-content\n" + machine.succeed("stat --format '%a' /etc/inlinetest | tee /dev/stderr | grep -Eq '^640$'") + # Inlined files are stored in the metadata erofs image, not redirected + # to the basedir data layer, so they carry no overlay redirect xattr. + machine.fail("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/inlinetest") + + with subtest("empty regular files are served from the metadata image"): + assert machine.succeed("cat /etc/emptytest") == "" + machine.succeed("stat --format '%F %s %a' /etc/emptytest | tee /dev/stderr | grep -Eq '^regular empty file 0 644$'") + machine.fail("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/emptytest") + + with subtest("large regular files are served from the basedir"): + assert machine.succeed("wc -c < /etc/bigfile").strip() == "5000" + assert machine.succeed("head -c 10 /etc/bigfile") == "aaaaaaaaaa" + machine.succeed("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/bigfile") + with subtest("direct symlinks point to the target without indirection"): assert machine.succeed("readlink -n /etc/localtime") == "/etc/zoneinfo/Utc" diff --git a/nixos/tests/activation/etc-overlay-mutable.nix b/nixos/tests/activation/etc-overlay-mutable.nix index b30ca7b4fd89..3bfe85db8fdd 100644 --- a/nixos/tests/activation/etc-overlay-mutable.nix +++ b/nixos/tests/activation/etc-overlay-mutable.nix @@ -20,6 +20,23 @@ text = "foo"; mode = "0300"; }; + # Small regular file: inlined into the metadata erofs image. + inlinetest = { + text = "inline-content\n"; + mode = "0640"; + }; + # Empty regular file: served directly from the metadata erofs image + # without payload or content. + emptytest = { + text = ""; + mode = "0644"; + }; + # Large regular file (>4096 bytes): served from the basedir data layer + # via overlay redirect, not inlined. + bigfile = { + text = lib.strings.replicate 5000 "a"; + mode = "0644"; + }; }; # Prerequisites @@ -66,6 +83,23 @@ machine.succeed("test -d /.rw-etc/upper/nixos") print(machine.succeed("getfattr -h -d -m 'trusted.overlay' /.rw-etc/upper/nixos 2>&1 || true")) + with subtest("small regular files are inlined into the metadata image"): + assert machine.succeed("cat /etc/inlinetest") == "inline-content\n" + machine.succeed("stat --format '%a' /etc/inlinetest | tee /dev/stderr | grep -Eq '^640$'") + # Inlined files are stored in the metadata erofs image, not redirected + # to the basedir data layer, so they carry no overlay redirect xattr. + machine.fail("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/inlinetest") + + with subtest("empty regular files are served from the metadata image"): + assert machine.succeed("cat /etc/emptytest") == "" + machine.succeed("stat --format '%F %s %a' /etc/emptytest | tee /dev/stderr | grep -Eq '^regular empty file 0 644$'") + machine.fail("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/emptytest") + + with subtest("large regular files are served from the basedir"): + assert machine.succeed("wc -c < /etc/bigfile").strip() == "5000" + assert machine.succeed("head -c 10 /etc/bigfile") == "aaaaaaaaaa" + machine.succeed("getfattr -h -n trusted.overlay.redirect /run/nixos-etc-metadata/bigfile") + with subtest("switching to the same generation"): machine.succeed("/run/current-system/bin/switch-to-configuration test") diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 96b117c3f9e5..f892390cefd5 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -63,7 +63,7 @@ let - `config.node.pkgs.` or `config.nodes.foo.nixpkgs.pkgs.` to refer to the Nixpkgs used on the VM guest(s). - `hostPkgs.` when invoking commands on the VM host (e.g. in Python - `os.system("foo")`) + `subprocess.run(["foo"])`) - Since the runTest argument is a module instead of a function, arguments must be passed as option definitions. You may declare explicit `options` for the test parameter(s), or use the @@ -152,7 +152,9 @@ in ssh-backdoor = runTestOn [ "x86_64-linux" ] ./nixos-test-driver/ssh-backdoor.nix; console-log = runTest ./nixos-test-driver/console-log.nix; containers = runTest ./nixos-test-driver/containers.nix; + nspawn-daemon-reexec-dbus = runTest ./nspawn-daemon-reexec-dbus.nix; skip-typecheck = runTest ./nixos-test-driver/skip-typecheck.nix; + console-timeout = runTest ./nixos-test-driver/console-timeout.nix; options-doc-regression = import ./nixos-test-driver/options-doc-regression.nix { inherit pkgs; }; driver-timeout = pkgs.runCommand "ensure-timeout-induced-failure" @@ -167,6 +169,7 @@ in [[ 143 = $(cat $failed/testBuildFailure.exit) ]] touch $out ''; + efivars = runTestOn [ "x86_64-linux" ] ./nixos-test-driver/efivars.nix; }; # NixOS vm tests and non-vm unit tests @@ -174,6 +177,7 @@ in # keep-sorted start case=no numeric=no block=yes _3proxy = runTest ./3proxy.nix; aaaaxy = runTest ./aaaaxy.nix; + accountsservice = runTest ./accountsservice.nix; acl = pkgs.callPackage ./acl.nix { }; acme = import ./acme/default.nix { inherit runTest; @@ -303,7 +307,6 @@ in bootspec = handleTestOn [ "x86_64-linux" ] ./bootspec.nix { }; borgbackup = runTest ./borgbackup.nix; borgmatic = runTest ./borgmatic.nix; - botamusique = runTest ./botamusique.nix; bpf = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./bpf.nix; bpftune = runTest ./bpftune.nix; breitbandmessung = runTest ./breitbandmessung.nix; @@ -330,8 +333,16 @@ in }; castopod = runTest ./castopod.nix; centrifugo = runTest ./centrifugo.nix; - ceph-multi-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-multi-node.nix; - ceph-single-node = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./ceph-single-node.nix; + ceph-multi-node-bluestore = runTestOn [ "aarch64-linux" "x86_64-linux" ] ( + import ./ceph-multi-node-bluestore.nix { } + ); + ceph-multi-node-bluestore-cephfs = runTestOn [ "aarch64-linux" "x86_64-linux" ] ( + import ./ceph-multi-node-bluestore.nix { withCephfs = true; } + ); + ceph-multi-node-deprecated-filestore = runTestOn [ + "aarch64-linux" + "x86_64-linux" + ] ./ceph-multi-node-deprecated-filestore.nix; ceph-single-node-bluestore = runTestOn [ "aarch64-linux" "x86_64-linux" @@ -340,6 +351,10 @@ in "aarch64-linux" "x86_64-linux" ] ./ceph-single-node-bluestore-dmcrypt.nix; + ceph-single-node-deprecated-filestore = runTestOn [ + "aarch64-linux" + "x86_64-linux" + ] ./ceph-single-node-deprecated-filestore.nix; certmgr = import ./certmgr.nix { inherit pkgs runTest; }; cfssl = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cfssl.nix; cgit = runTest ./cgit.nix; @@ -364,6 +379,7 @@ in }; cloud-init = runTest ./cloud-init.nix; cloud-init-hostname = runTest ./cloud-init-hostname.nix; + cloudcompare = import ./cloudcompare.nix { inherit pkgs runTest; }; cloudlog = runTest ./cloudlog.nix; cntr = import ./cntr.nix { inherit (pkgs) lib; @@ -408,31 +424,39 @@ in corerad = runTest ./corerad.nix; corteza = runTest ./corteza.nix; cosmic = runTest { - imports = [ ./cosmic.nix ]; + imports = [ ./cosmic ]; _module.args.testName = "cosmic"; _module.args.enableAutologin = false; _module.args.enableXWayland = true; }; cosmic-autologin = runTest { - imports = [ ./cosmic.nix ]; + imports = [ ./cosmic ]; _module.args.testName = "cosmic-autologin"; _module.args.enableAutologin = true; _module.args.enableXWayland = true; }; cosmic-autologin-noxwayland = runTest { - imports = [ ./cosmic.nix ]; + imports = [ ./cosmic ]; _module.args.testName = "cosmic-autologin-noxwayland"; _module.args.enableAutologin = true; _module.args.enableXWayland = false; }; cosmic-noxwayland = runTest { - imports = [ ./cosmic.nix ]; + imports = [ ./cosmic ]; _module.args.testName = "cosmic-noxwayland"; _module.args.enableAutologin = false; _module.args.enableXWayland = false; }; coturn = runTest ./coturn.nix; couchdb = runTest ./couchdb.nix; + credentials-fwcfg = runTest { + imports = [ ./credentials.nix ]; + _module.args.mechanism = "fw_cfg"; + }; + credentials-smbios = runTestOn [ "x86_64-linux" ] { + imports = [ ./credentials.nix ]; + _module.args.mechanism = "smbios"; + }; cri-o = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./cri-o.nix; croc = runTest ./croc.nix; cross-seed = runTest ./cross-seed.nix; @@ -495,7 +519,7 @@ in drupal = runTest ./drupal.nix; dublin-traceroute = runTest ./dublin-traceroute.nix; dwl = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./dwl.nix; - e57inspector = runTest ./e57inspector.nix; + e57inspector = import ./e57inspector.nix { inherit pkgs runTest; }; early-mount-options = runTest ./early-mount-options.nix; earlyoom = runTestOn [ "x86_64-linux" ] ./earlyoom.nix; easytier = runTest ./easytier.nix; @@ -541,6 +565,9 @@ in etebase-server = runTest ./etebase-server.nix; etesync-dav = runTest ./etesync-dav.nix; evcc = runTest ./evcc.nix; + extra-initrd = import ./extra-initrd.nix { + inherit runTest pkgs; + }; facter = runTest ./facter; fail2ban = runTest ./fail2ban.nix; fakeroute = runTest ./fakeroute.nix; @@ -577,6 +604,10 @@ in imports = [ ./firefox.nix ]; _module.args.firefoxPackage = pkgs.firefox-esr-140; }; + firefox-esr-153 = runTest { + imports = [ ./firefox.nix ]; + _module.args.firefoxPackage = pkgs.firefox-esr-153; + }; firefox-syncserver = runTest ./firefox-syncserver.nix; firefox_decrypt = runTest ./firefox_decrypt.nix; firefoxpwa = runTest ./firefoxpwa.nix; @@ -599,6 +630,7 @@ in flannel = runTestOn [ "x86_64-linux" ] ./flannel.nix; flap-alerted = runTest ./flap-alerted.nix; flaresolverr = runTest ./flaresolverr.nix; + flarum = runTest ./flarum.nix; flood = runTest ./flood.nix; fluent-bit = runTest ./fluent-bit.nix; fluentd = runTest ./fluentd.nix; @@ -614,6 +646,9 @@ in forgejoPackage = pkgs.forgejo-lts; }; freenet = runTest ./freenet.nix; + freescout = import ./freescout { + inherit runTest; + }; freeswitch = runTest ./freeswitch.nix; freetube = discoverTests (import ./freetube.nix); freshrss = import ./freshrss { inherit runTest; }; @@ -675,6 +710,7 @@ in gobgpd = runTest ./gobgpd.nix; gocd-agent = runTest ./gocd-agent.nix; gocd-server = runTest ./gocd-server.nix; + gocron = runTest ./gocron.nix; gocryptfs = runTest ./gocryptfs.nix; gokapi = runTest ./gokapi.nix; gollum = runTest ./gollum.nix; @@ -694,7 +730,13 @@ in greetd-no-shadow = runTest ./greetd-no-shadow.nix; grocy = runTest ./grocy.nix; grow-partition = runTest ./grow-partition.nix; - grub = runTest ./grub.nix; + grub = { + basic = runTest ./grub/basic.nix; + efi = runTest ./grub/efi.nix; + graphical = runTest ./grub/graphical.nix; + hashed-password = runTest ./grub/hashed-password.nix; + mirrored-boots = runTest ./grub/mirrored-boots.nix; + }; gs1200-exporter = runTest ./gs1200-exporter.nix; guacamole-server = runTest ./guacamole-server.nix; guix = handleTest ./guix { }; @@ -751,6 +793,7 @@ in hitch = handleTest ./hitch { }; hledger-web = runTest ./hledger-web.nix; hockeypuck = runTest ./hockeypuck.nix; + holo-daemon-modular-service = runTest ./holo-daemon-modular.nix; home-assistant = runTest ./home-assistant.nix; homebox = runTest ./homebox.nix; homebridge = runTest ./homebridge.nix; @@ -844,7 +887,7 @@ in kbd-setfont-decompress = runTest ./kbd-setfont-decompress.nix; kbd-update-search-paths-patch = runTest ./kbd-update-search-paths-patch.nix; kea = runTest ./kea.nix; - keepalived = runTest ./keepalived.nix; + keepalived = discoverTests (import ./keepalived.nix); keepassxc = runTest ./keepassxc.nix; kerberos = handleTest ./kerberos/default.nix { }; kernel-generic = handleTest ./kernel-generic { }; @@ -861,6 +904,7 @@ in kmonad = runTest ./kmonad.nix; kmscon = runTest ./kmscon.nix; knot = runTest ./knot.nix; + koito = runTest ./web-apps/koito.nix; komga = runTest ./komga.nix; komodo-periphery = runTest ./komodo-periphery.nix; krb5 = discoverTests (import ./krb5); @@ -926,6 +970,7 @@ in localsend = runTest ./localsend.nix; locate = runTest ./locate.nix; login = runTest ./login.nix; + login-nosuid = runTest ./login-nosuid.nix; logkeys = runTest ./logkeys.nix; logrotate = runTest ./logrotate.nix; loki = runTest ./loki.nix; @@ -943,6 +988,7 @@ in lomiri-system-settings = runTest ./lomiri-system-settings.nix; lorri = handleTest ./lorri/default.nix { }; luks = runTest ./luks.nix; + luks-suspend = runTest ./luks-suspend.nix; lvm2 = import ./lvm2 { inherit pkgs runTest; }; lxc = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./lxc; lxd-image-server = runTest ./lxd-image-server.nix; @@ -965,10 +1011,10 @@ in matomo = runTest ./matomo.nix; matrix-alertmanager = runTest ./matrix/matrix-alertmanager.nix; matrix-appservice-irc = runTest ./matrix/appservice-irc.nix; + matrix-authentication-service = runTest ./matrix/matrix-authentication-service.nix; matrix-conduit = runTest ./matrix/conduit.nix; matrix-continuwuity = runTest ./matrix/continuwuity.nix; matrix-synapse = runTest ./matrix/synapse.nix; - matrix-synapse-workers = runTest ./matrix/synapse-workers.nix; matrix-tuwunel = runTest ./matrix/tuwunel.nix; matter-server = runTest ./matter-server.nix; matterjs-server = runTest ./matterjs-server.nix; @@ -1047,6 +1093,7 @@ in mysql-autobackup = handleTest ./mysql/mysql-autobackup.nix { }; mysql-backup = handleTest ./mysql/mysql-backup.nix { }; mysql-replication = handleTest ./mysql/mysql-replication.nix { }; + mysql-secure-root = handleTest ./mysql/mysql-secure-root.nix { }; n8n = runTest ./n8n.nix; nagios = runTestOn [ "x86_64-linux" "aarch64-linux" ] ./nagios.nix; nar-serve = runTest ./nar-serve.nix; @@ -1098,6 +1145,7 @@ in nextflow = runTestOn [ "x86_64-linux" ] ./nextflow.nix; nextjs-ollama-llm-ui = runTest ./web-apps/nextjs-ollama-llm-ui.nix; nexus = runTest ./nexus.nix; + nezha = runTest ./nezha.nix; # TODO: Test nfsv3 + Kerberos nfs3 = handleTest ./nfs { version = 3; }; nfs4 = handleTest ./nfs { version = 4; }; @@ -1108,6 +1156,7 @@ in nginx-etag-compression = runTest ./nginx-etag-compression.nix; nginx-globalredirect = runTest ./nginx-globalredirect.nix; nginx-http3 = import ./nginx-http3.nix { inherit pkgs runTest; }; + nginx-lua = runTest ./nginx-lua.nix; nginx-mime = runTest ./nginx-mime.nix; nginx-modsecurity = runTest ./nginx-modsecurity.nix; nginx-moreheaders = runTest ./nginx-moreheaders.nix; @@ -1166,6 +1215,7 @@ in nominatim = runTest ./nominatim.nix; non-default-filesystems = handleTest ./non-default-filesystems.nix { }; non-switchable-system = runTest ./non-switchable-system.nix; + nordvpn = runTest ./nordvpn.nix; noto-fonts = runTest ./noto-fonts.nix; noto-fonts-cjk-qt-default-weight = runTest ./noto-fonts-cjk-qt-default-weight.nix; novacomd = handleTestOn [ "x86_64-linux" ] ./novacomd.nix { }; @@ -1326,7 +1376,7 @@ in pixelfed = import ./web-apps/pixelfed { inherit runTestOn; }; plantuml-server = runTest ./plantuml-server.nix; plasma6 = runTest ./plasma6.nix; - plausible = runTest ./plausible.nix; + plausible = import ./plausible.nix { inherit runTest; }; playwright-python = runTest ./playwright-python.nix; please = runTest ./please.nix; pleroma = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./pleroma.nix { }; @@ -1398,14 +1448,6 @@ in pykms = runTest ./pykms.nix; qbittorrent = runTest ./qbittorrent.nix; qboot = runTestOn [ "x86_64-linux" "i686-linux" ] ./qboot.nix; - qemu-vm-credentials-fwcfg = runTest { - imports = [ ./qemu-vm-credentials.nix ]; - _module.args.mechanism = "fw_cfg"; - }; - qemu-vm-credentials-smbios = runTestOn [ "x86_64-linux" ] { - imports = [ ./qemu-vm-credentials.nix ]; - _module.args.mechanism = "smbios"; - }; qemu-vm-external-disk-image = runTest ./qemu-vm-external-disk-image.nix; qemu-vm-restrictnetwork = handleTest ./qemu-vm-restrictnetwork.nix { }; qemu-vm-store = runTest ./qemu-vm-store.nix; @@ -1480,6 +1522,7 @@ in rtkit = runTest ./rtkit.nix; rtorrent = runTest ./rtorrent.nix; rush = runTest ./rush.nix; + rustfs = runTest ./rustfs.nix; rustical = runTest ./web-apps/rustical.nix; rustls-libssl = runTest ./rustls-libssl.nix; rxe = runTest ./rxe.nix; @@ -1491,7 +1534,6 @@ in sanoid = runTest ./sanoid.nix; saunafs = runTest ./saunafs.nix; scanservjs = runTest ./scanservjs.nix; - scaphandre = runTest ./scaphandre.nix; schleuder = runTest ./schleuder.nix; scion-freestanding-deployment = runTest ./scion/freestanding-deployment; scrutiny = runTest ./scrutiny.nix; @@ -1508,7 +1550,7 @@ in sftpgo = runTest ./sftpgo.nix; sfxr-qt = runTest ./sfxr-qt.nix; sgt-puzzles = runTest ./sgt-puzzles.nix; - shadow = runTest ./shadow.nix; + shadow = import ./shadow { inherit runTest; }; shadowsocks = handleTest ./shadowsocks { }; shadps4 = runTest ./shadps4.nix; sharkey = runTest ./web-apps/sharkey.nix; @@ -1554,6 +1596,8 @@ in sssd-ldap = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-ldap.nix { }; sssd-legacy-config = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./sssd-legacy-config.nix { }; stalwart = runTest ./stalwart/stalwart.nix; + stardust-xr-atmosphere = runTest ./stardust-xr/atmosphere.nix; + stardust-xr-flatland = runTest ./stardust-xr/flatland.nix; stargazer = runTest ./web-servers/stargazer.nix; starship = runTest ./starship.nix; startx = import ./startx.nix { inherit pkgs runTest; }; @@ -1565,6 +1609,7 @@ in strichliste = runTest ./web-apps/strichliste.nix; strongswan-swanctl = runTest ./strongswan-swanctl.nix; stub-ld = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./stub-ld.nix { }; + stump = runTest ./web-apps/stump.nix; stunnel = import ./stunnel.nix { inherit runTest; }; sudo = runTest ./sudo.nix; sudo-rs = runTest ./sudo-rs.nix; @@ -1595,6 +1640,16 @@ in syncthing-relay = runTest ./syncthing/relay.nix; sysfs = runTest ./sysfs.nix; sysinit-reactivation = runTest ./sysinit-reactivation.nix; + system-services-compliance = recurseIntoAttrs ( + import ./system-services-compliance.nix { + inherit + pkgs + evalSystem + runTest + callTest + ; + } + ); systemd = runTest ./systemd.nix; systemd-analyze = runTest ./systemd-analyze.nix; systemd-binfmt = handleTestOn [ "x86_64-linux" ] ./systemd-binfmt.nix { }; @@ -1629,6 +1684,7 @@ in "i686-linux" ] ./initrd-network-openvpn { systemdStage1 = true; }; systemd-initrd-networkd-ssh = runTest ./systemd-initrd-networkd-ssh.nix; + systemd-initrd-non-nixos = runTest ./systemd-initrd-non-nixos.nix; systemd-initrd-shutdown = runTest { imports = [ ./systemd-shutdown.nix ]; _module.args.systemdStage1 = true; @@ -1641,6 +1697,7 @@ in systemd-journal = runTest ./systemd-journal.nix; systemd-journal-gateway = runTest ./systemd-journal-gateway.nix; systemd-journal-upload = runTest ./systemd-journal-upload.nix; + systemd-localed = runTest ./systemd-localed.nix; systemd-lock-handler = runTestOn [ "aarch64-linux" "x86_64-linux" ] ./systemd-lock-handler.nix; systemd-machinectl = runTest ./systemd-machinectl.nix; systemd-misc = runTest ./systemd-misc.nix; @@ -1677,6 +1734,7 @@ in systemd-user-settings = runTest ./systemd-user-settings.nix; systemd-user-tmpfiles-rules = runTest ./systemd-user-tmpfiles-rules.nix; systemd-userdbd = runTest ./systemd-userdbd.nix; + systemd-varlink = runTest ./systemd-varlink.nix; systemtap = handleTest ./systemtap.nix { }; szurubooru = handleTest ./szurubooru.nix { }; taler = handleTest ./taler { }; @@ -1701,6 +1759,7 @@ in tiddlywiki = runTest ./tiddlywiki.nix; tigervnc = handleTest ./tigervnc.nix { }; tika = runTest ./tika.nix; + timekpr = runTest ./timekpr.nix; timezone = runTest ./timezone.nix; timidity = handleTestOn [ "aarch64-linux" "x86_64-linux" ] ./timidity { }; tinc = handleTest ./tinc { }; @@ -1740,6 +1799,7 @@ in twingate = runTest ./twingate.nix; txredisapi = runTest ./txredisapi.nix; typesense = runTest ./typesense.nix; + tzpfms = runTest ./tzpfms.nix; tzupdate = runTest ./tzupdate.nix; ucarp = runTest ./ucarp.nix; udisks2 = runTest ./udisks2.nix; @@ -1751,6 +1811,7 @@ in unifi = runTest ./unifi.nix; unit-perl = runTest ./web-servers/unit-perl.nix; unit-php = runTest ./web-servers/unit-php.nix; + unpackerr = runTest ./unpackerr.nix; upnp.iptables = handleTest ./upnp.nix { useNftables = false; }; upnp.nftables = handleTest ./upnp.nix { useNftables = true; }; uptermd = runTest ./uptermd.nix; @@ -1795,6 +1856,7 @@ in }; virtualbox = handleTestOn [ "x86_64-linux" ] ./virtualbox.nix { }; vm-variant = handleTest ./vm-variant.nix { }; + vnstat = runTest ./vnstat.nix; vscode-remote-ssh = handleTestOn [ "x86_64-linux" ] ./vscode-remote-ssh.nix { }; vscodium = import ./vscodium.nix { inherit runTest; }; vsftpd = runTest ./vsftpd.nix; @@ -1805,6 +1867,7 @@ in wasabibackend = runTest ./wasabibackend.nix; wastebin = runTest ./wastebin.nix; watchdogd = runTest ./watchdogd.nix; + watt = runTest ./watt.nix; webhook = runTest ./webhook.nix; weblate = runTest ./web-apps/weblate.nix; wg-access-server = runTest ./wg-access-server.nix; diff --git a/nixos/tests/alps.nix b/nixos/tests/alps.nix index ced254b1819c..b33428378bc2 100644 --- a/nixos/tests/alps.nix +++ b/nixos/tests/alps.nix @@ -1,12 +1,16 @@ +{ lib, ... }: let certs = import ./common/acme/server/snakeoil-certs.nix; domain = certs.domain; + port = 1323; in -{ pkgs, ... }: { name = "alps"; - meta = with pkgs.lib.maintainers; { - maintainers = [ hmenke ]; + meta = { + maintainers = with lib.maintainers; [ + hmenke + prince213 + ]; }; nodes = { @@ -53,43 +57,55 @@ in }; }; }; - client = - { nodes, config, ... }: + { nodes, pkgs, ... }: { security.pki.certificateFiles = [ certs.ca.cert ]; networking.extraHosts = '' - ${nodes.server.config.networking.primaryIPAddress} ${domain} + ${nodes.server.networking.primaryIPAddress} ${domain} ''; services.alps = { enable = true; - theme = "alps"; - imaps = { - host = domain; - port = 993; - }; - smtps = { - host = domain; - port = 465; + settings = { + server = { + addr = ":${toString port}"; + }; + provider = { + type = "imap"; + imap = { + server = "imaps://${domain}:993"; + }; + }; + smtp = { + server = "smtps://${domain}:465"; + }; }; }; environment.systemPackages = [ (pkgs.writers.writePython3Bin "test-alps-login" { } '' from urllib.request import build_opener, HTTPCookieProcessor, Request - from urllib.parse import urlencode, urljoin + from urllib.parse import urljoin from http.cookiejar import CookieJar + import json - baseurl = "http://localhost:${toString config.services.alps.port}" + baseurl = "http://localhost:${toString port}" username = "alice" - password = "${nodes.server.config.users.users.alice.password}" + password = "${nodes.server.users.users.alice.password}" cookiejar = CookieJar() cookieprocessor = HTTPCookieProcessor(cookiejar) opener = build_opener(cookieprocessor) - data = urlencode({"username": username, "password": password}).encode() - req = Request(urljoin(baseurl, "login"), data=data, method="POST") + data = json.dumps( + {"username": username, "password": password, "remember-me": ""} + ).encode() + req = Request( + urljoin(baseurl, "session"), + data=data, + headers={"Content-Type": "application/json"}, + method="POST", + ) with opener.open(req) as ret: # Check that the alps_session cookie is set print(cookiejar) @@ -102,9 +118,9 @@ in assert any(cookie.name == "alps_session" for cookie in cookiejar) # ...and that we have not been redirected back to the login page print(ret.url) - assert ret.url == urljoin(baseurl, "mailbox/INBOX") + assert ret.url != urljoin(baseurl, "#/login") - req = Request(urljoin(baseurl, "logout")) + req = Request(urljoin(baseurl, "session"), method="DELETE") with opener.open(req) as ret: # Check that the alps_session cookie is now gone print(cookiejar) @@ -114,18 +130,16 @@ in }; }; - testScript = - { nodes, ... }: - '' - server.start() - server.wait_for_unit("postfix.service") - server.wait_for_unit("dovecot.service") - server.wait_for_open_port(465) - server.wait_for_open_port(993) + testScript = '' + server.start() + server.wait_for_unit("postfix.service") + server.wait_for_unit("dovecot.service") + server.wait_for_open_port(465) + server.wait_for_open_port(993) - client.start() - client.wait_for_unit("alps.service") - client.wait_for_open_port(${toString nodes.client.config.services.alps.port}) - client.succeed("test-alps-login") - ''; + client.start() + client.wait_for_unit("alps.service") + client.wait_for_open_port(${toString port}) + client.succeed("test-alps-login") + ''; } diff --git a/nixos/tests/angrr.nix b/nixos/tests/angrr.nix index 300f3643b0ba..362ffe276872 100644 --- a/nixos/tests/angrr.nix +++ b/nixos/tests/angrr.nix @@ -95,7 +95,7 @@ in 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 + # No auto gc root will be removed 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") diff --git a/nixos/tests/authelia.nix b/nixos/tests/authelia.nix index 98abca0fbc57..256c92cd706e 100644 --- a/nixos/tests/authelia.nix +++ b/nixos/tests/authelia.nix @@ -28,12 +28,10 @@ # This is purely for testing purposes! environment.etc."authelia/storageEncryptionKeyFile" = { mode = "0400"; - user = "authelia-testing"; text = "you_must_generate_a_random_string_of_more_than_twenty_chars_and_configure_this"; }; environment.etc."authelia/jwtSecretFile" = { mode = "0400"; - user = "authelia-testing"; text = "a_very_important_secret"; }; environment.etc."authelia/users_database.yml" = { diff --git a/nixos/tests/bentopdf/caddy.nix b/nixos/tests/bentopdf/caddy.nix index 0f4fc88063db..9780f1e890a5 100644 --- a/nixos/tests/bentopdf/caddy.nix +++ b/nixos/tests/bentopdf/caddy.nix @@ -22,7 +22,7 @@ import ../make-test-python.nix ( machine.wait_for_unit("caddy.service") machine.wait_for_open_port(80) machine.succeed("curl -vvv --fail --show-error --silent --location --insecure http://localhost/") - assert "BentoPDF - The Privacy First PDF Toolkit" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/") + assert "PDF Tools" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost/") ''; } ) diff --git a/nixos/tests/bentopdf/nginx.nix b/nixos/tests/bentopdf/nginx.nix index 257dc909894e..68720403a3a4 100644 --- a/nixos/tests/bentopdf/nginx.nix +++ b/nixos/tests/bentopdf/nginx.nix @@ -18,7 +18,7 @@ import ../make-test-python.nix ( testScript = '' machine.wait_for_unit("nginx.service") machine.wait_for_open_port(80) - assert "BentoPDF - The Privacy First PDF Toolkit" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost:80/") + assert "PDF Tools" in machine.succeed("curl --fail --show-error --silent --location --insecure http://localhost:80/") ''; } ) diff --git a/nixos/tests/blint.nix b/nixos/tests/blint.nix index ea0a14cb4b1f..3438f4926f82 100644 --- a/nixos/tests/blint.nix +++ b/nixos/tests/blint.nix @@ -14,7 +14,7 @@ ] ++ teams.ngi.members; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ blint jq diff --git a/nixos/tests/bluesky-pds.nix b/nixos/tests/bluesky-pds.nix index b74c74955f54..aa791a43c27b 100644 --- a/nixos/tests/bluesky-pds.nix +++ b/nixos/tests/bluesky-pds.nix @@ -2,7 +2,7 @@ { name = "PDS"; - nodes.machine = { + containers.machine = { services.bluesky-pds = { enable = true; settings = { diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index d1ac1a8769fe..ecc6240fc888 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -203,11 +203,26 @@ in makeTest { name = "boot-uboot-extlinux"; nodes = { }; - testScript = '' - import os + testScript = /* py */ '' + import subprocess # Create a mutable linked image backed by the read-only SD image - if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0: + if ( + subprocess.run( + [ + "${pkgs.qemu}/bin/qemu-img", + "create", + "-f", + "qcow2", + "-F", + "raw", + "-b", + "${sdImage}", + "${mutableImage}", + ] + ).returncode + != 0 + ): raise RuntimeError("Could not create mutable linked image") machine = create_machine("${startCommand}") diff --git a/nixos/tests/botamusique.nix b/nixos/tests/botamusique.nix deleted file mode 100644 index 2a5c23000235..000000000000 --- a/nixos/tests/botamusique.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ - name = "botamusique"; - - nodes = { - machine = { - networking.extraHosts = '' - 127.0.0.1 all.api.radio-browser.info - ''; - - services.murmur = { - enable = true; - registerName = "NixOS tests"; - }; - - services.botamusique = { - enable = true; - settings = { - server = { - channel = "NixOS tests"; - }; - bot = { - version = false; - auto_check_update = false; - }; - }; - }; - }; - }; - - testScript = '' - start_all() - - machine.wait_for_unit("murmur.service") - machine.wait_for_unit("botamusique.service") - - machine.sleep(10) - - machine.wait_until_succeeds( - "journalctl -u murmur.service -e | grep -q '<1:botamusique(-1)> Authenticated'" - ) - - with subtest("Check systemd hardening"): - output = machine.execute("systemctl show botamusique.service")[1] - machine.log(output) - output = machine.execute("systemd-analyze security botamusique.service")[1] - machine.log(output) - ''; -} diff --git a/nixos/tests/caddy.nix b/nixos/tests/caddy.nix index c719a1b233b1..d7f2b72ef6de 100644 --- a/nixos/tests/caddy.nix +++ b/nixos/tests/caddy.nix @@ -1,11 +1,11 @@ -{ pkgs, ... }: +{ lib, ... }: + { name = "caddy"; - meta = with pkgs.lib.maintainers; { - maintainers = [ - stepbrobd - ]; - }; + + meta.maintainers = with lib.maintainers; [ + stepbrobd + ]; nodes = { webserver = @@ -69,24 +69,6 @@ respond "hello world" ''; }; - specialisation.with-plugins.configuration = { - services.caddy = { - package = pkgs.caddy.withPlugins { - plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ]; - hash = "sha256-0N/bQAM5yT6g9UAteWsfxofGcelmU/NDTroS2oL43Gs="; - }; - configFile = pkgs.writeText "Caddyfile" '' - { - order replace after encode - } - - localhost:80 { - respond "hello world" - replace world caddy - } - ''; - }; - }; }; }; @@ -98,7 +80,6 @@ multipleConfigs = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-configs"; multipleHostnames = "${nodes.webserver.system.build.toplevel}/specialisation/multiple-hostnames"; rfc42Config = "${nodes.webserver.system.build.toplevel}/specialisation/rfc42"; - withPluginsConfig = "${nodes.webserver.system.build.toplevel}/specialisation/with-plugins"; in '' url = "http://localhost/example.html" @@ -141,12 +122,5 @@ ) webserver.wait_for_open_port(80) webserver.succeed("curl http://localhost | grep hello") - - with subtest("plugins are correctled installed and configurable"): - webserver.succeed( - "${withPluginsConfig}/bin/switch-to-configuration test >&2" - ) - webserver.wait_for_open_port(80) - webserver.succeed("curl http://localhost | grep caddy") ''; } diff --git a/nixos/tests/cage.nix b/nixos/tests/cage.nix index 10fe997a71d7..fa0c8125862d 100644 --- a/nixos/tests/cage.nix +++ b/nixos/tests/cage.nix @@ -29,7 +29,7 @@ testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' with subtest("Wait for cage to boot up"): diff --git a/nixos/tests/cagebreak.nix b/nixos/tests/cagebreak.nix index 13012281a151..7a2c0a381836 100644 --- a/nixos/tests/cagebreak.nix +++ b/nixos/tests/cagebreak.nix @@ -47,7 +47,7 @@ in testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; XDG_RUNTIME_DIR = "/run/user/${toString user.uid}"; in '' diff --git a/nixos/tests/ceph-multi-node-bluestore.nix b/nixos/tests/ceph-multi-node-bluestore.nix new file mode 100644 index 000000000000..96fefca78230 --- /dev/null +++ b/nixos/tests/ceph-multi-node-bluestore.nix @@ -0,0 +1,602 @@ +# Multi-node Ceph cluster test using BlueStore OSDs. +{ + withCephfs ? false, +}: +{ lib, ... }: +let + # Development knobs: + # * `defaultTimeout` caps how long every `waitUntilSucceeds` waits before it + # gives up. Lower it for faster feedback while iterating on the test. + # * When `investigateFailures` is true, a `waitUntilSucceeds` that times out + # does NOT fail the test; instead it dumps each machine's full (multi-boot) + # journal and `/var/log/ceph` into a `test-failure-investigation/` directory + # inside the test's working/output directory and then lets the test succeed, + # so the collected logs end up in the build's store path for convenient + # reading. Keep this `false` for real CI runs. + defaultTimeout = 60; + investigateFailures = false; + + cfg = { + clusterId = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monA = { + name = "a"; + ip = "192.168.1.1"; + }; + osd0 = { + name = "0"; + ip = "192.168.1.2"; + key = "AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg=="; + uuid = "55ba2294-3e24-478f-bee0-9dca4c231dd9"; + }; + osd1 = { + name = "1"; + ip = "192.168.1.3"; + key = "AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ=="; + uuid = "5e97a838-85b6-43b0-8950-cb56d554d1e5"; + }; + osd2 = { + name = "2"; + ip = "192.168.1.4"; + key = "AQAdyhZeIaUlARAAGRoidDAmS6Vkp546UFEf5w=="; + uuid = "ea999274-13d0-4dd5-9af9-ad25a324f72f"; + }; + # Client that mounts CephFS using the in-kernel client. + kclient = { + ip = "192.168.1.5"; + }; + # Client that mounts CephFS using the `ceph-fuse` client. + fuseclient = { + ip = "192.168.1.6"; + }; + }; + generateCephConfig = + { daemonConfig }: + { + enable = true; + global = { + fsid = cfg.clusterId; + monHost = cfg.monA.ip; + monInitialMembers = cfg.monA.name; + }; + } + // daemonConfig; + + generateHost = + { cephConfig, networkConfig }: + { pkgs, ... }: + { + virtualisation = { + # A single raw block device per machine, consumed directly by BlueStore + # as `/dev/vdb`. Because BlueStore owns the raw device (there is no + # filesystem to mount), the OSD's on-disk state survives a hard + # crash/reboot and the OSD comes back automatically. + emptyDiskImages = [ 20480 ]; + vlans = [ 1 ]; + }; + + networking = networkConfig; + + # TODO: Why do we need any of these? Shouldn't Ceph work independent of `systemPackages`? Only `sudo` and `ceph` are used in our own test code. + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + netcat + ]; + + services.ceph = cephConfig; + + # Restart limits are unsuitable for daemons that must recover from + # arbitrary crash/network downtimes. + # Ensure all daemons have infinite restart limits. + # Otherwise the tests are flaky based on timing. + systemd.services = + let + daemonUnits = + lib.concatMap + ( + daemonType: + lib.optionals (cephConfig.${daemonType}.enable or false) ( + map (daemon: "ceph-${daemonType}-${daemon}") cephConfig.${daemonType}.daemons + ) + ) + [ + "mon" + "mgr" + "osd" + "mds" + ]; + in + lib.genAttrs daemonUnits (_: { + serviceConfig.Restart = lib.mkForce "always"; + serviceConfig.RestartSec = lib.mkForce "1"; + unitConfig.StartLimitIntervalSec = lib.mkForce 0; # Ensure Restart=always is always honoured (no start limit) + }); + }; + + networkMonA = { + dhcpcd.enable = false; + interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [ + { + address = cfg.monA.ip; + prefixLength = 24; + } + ]; + firewall = { + allowedTCPPorts = [ + 6789 + 3300 + ]; + allowedTCPPortRanges = [ + { + from = 6800; + to = 7300; + } + ]; + }; + }; + cephConfigMonA = generateCephConfig { + daemonConfig = { + mon = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + mgr = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + } + # The MDS daemon (which provides CephFS) is only configured in the CephFS + # variant of this test. + // lib.optionalAttrs withCephfs { + mds = { + enable = true; + daemons = [ cfg.monA.name ]; + }; + }; + }; + + networkOsd = osd: { + dhcpcd.enable = false; + interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [ + { + address = osd.ip; + prefixLength = 24; + } + ]; + firewall = { + allowedTCPPortRanges = [ + { + from = 6800; + to = 7300; + } + ]; + }; + }; + + cephConfigOsd = + osd: + generateCephConfig { + daemonConfig = { + osd = { + enable = true; + daemons = [ osd.name ]; + }; + }; + }; + + # The CephFS clients only need the ceph client tooling. They do not run any + # ceph daemon, so they only get a minimal ceph config pointing at the mon. + # The in-kernel ceph filesystem module is part of the default kernel and is + # autoloaded by `mount -t ceph`, so no extra modules are needed. + networkClient = client: { + dhcpcd.enable = false; + interfaces.eth1.ipv4.addresses = lib.mkOverride 0 [ + { + address = client.ip; + prefixLength = 24; + } + ]; + }; + + cephConfigClient = generateCephConfig { daemonConfig = { }; }; + + generateClientHost = + { networkConfig }: + { pkgs, ... }: + { + virtualisation = { + vlans = [ 1 ]; + }; + + networking = networkConfig; + + environment.systemPackages = with pkgs; [ + ceph + ]; + + services.ceph = cephConfigClient; + }; + + # Python prelude that must run before any test code. + # It replaces every machine's `wait_until_succeeds()` with a wrapper that + # implements the "development knobs" above. + helperScript = '' + import os + import shutil + + DEFAULT_TIMEOUT = ${toString defaultTimeout} + INVESTIGATE_FAILURES = ${if investigateFailures then "True" else "False"} + + def collect_failure_investigation(failed_machine, command): + out_dir = os.path.join(driver.out_dir, "test-failure-investigation") + os.makedirs(out_dir, exist_ok=True) + with open(os.path.join(out_dir, "README.txt"), "w") as f: + f.write( + "wait_until_succeeds timed out on machine " + f"'{failed_machine.name}' running command:\n{command}\n" + ) + for m in machines: + try: + m.execute("journalctl --no-pager --boot=all > /tmp/journal.txt 2>&1; true") + m.copy_from_machine("/tmp/journal.txt", out_dir) + shutil.move( + os.path.join(out_dir, "journal.txt"), + os.path.join(out_dir, f"{m.name}-journal.txt"), + ) + except Exception as e: + m.log(f"could not collect journal: {e}") + try: + m.copy_from_machine("/var/log/ceph", out_dir) + shutil.move( + os.path.join(out_dir, "ceph"), + os.path.join(out_dir, f"{m.name}-ceph-logs"), + ) + except Exception as e: + m.log(f"could not collect /var/log/ceph: {e}") + + # Replace the test driver's `wait_until_succeeds` with our wrapper. + machine_class = machines[0].__class__ + orig_wait_until_succeeds = machine_class.wait_until_succeeds + + def patched_wait_until_succeeds(self, command: str, timeout: int = DEFAULT_TIMEOUT) -> str: + try: + return orig_wait_until_succeeds(self, command, timeout=timeout) + except Exception: + if not INVESTIGATE_FAILURES: + raise + self.log( + "wait_until_succeeds timed out; collecting logs into " + "test-failure-investigation/ and ending the test as 'passed' " + "(investigateFailures = true)" + ) + collect_failure_investigation(self, command) + os._exit(0) + + # Use `setattr` (rather than a plain attribute assignment) so the type + # checker does not treat this as implicitly shadowing the driver's + # `wait_until_succeeds`; the replacement is intentional. + setattr(machine_class, "wait_until_succeeds", patched_wait_until_succeeds) + ''; + + # Set up the cluster (mon, mgr, BlueStore OSDs) and perform a + # hard whole-cluster crash/recovery (failover) test. + # + # Based on the "manual deployment" approach from: + # https://docs.ceph.com/en/tentacle/install/manual-deployment/ + baseScript = '' + start_all() + + monA.wait_for_unit("network.target") + osd0.wait_for_unit("network.target") + osd1.wait_for_unit("network.target") + osd2.wait_for_unit("network.target") + + # Bootstrap ceph-mon daemon + monA.succeed( + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "sudo -u ceph ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "sudo -u ceph ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add ${cfg.monA.name} ${cfg.monA.ip} --fsid ${cfg.clusterId} /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i ${cfg.monA.name} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "sudo -u ceph mkdir -p /var/lib/ceph/mgr/ceph-${cfg.monA.name}/", + "sudo -u ceph touch /var/lib/ceph/mon/ceph-${cfg.monA.name}/done", + "systemctl start ceph-mon-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mon-${cfg.monA.name}") + monA.succeed("ceph mon enable-msgr2") + monA.succeed("ceph config set mon auth_allow_insecure_global_id_reclaim false") + + # Can't check ceph status until a mon is up + monA.succeed("ceph -s | grep 'mon: 1 daemons'") + + # Start the ceph-mgr daemon, it has no deps and hardly any setup + monA.succeed( + "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring", + "sync", # to ensure shell redirection above is durable + "systemctl start ceph-mgr-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mgr-a") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + + # Send the admin keyring to the OSD machines. + monA.succeed("cp /etc/ceph/ceph.client.admin.keyring /tmp/shared") + osd0.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph") + osd1.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph") + osd2.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph") + + # Bootstrap the BlueStore OSDs. + osd0.succeed( + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd0.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd0.name}/type", + "ln -sf /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd0.name}/block", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd0.name}/keyring --name osd.${cfg.osd0.name} --add-key ${cfg.osd0.key}", + 'echo \'{"cephx_secret": "${cfg.osd0.key}"}\' | ceph osd new ${cfg.osd0.uuid} -i -', + ) + osd1.succeed( + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd1.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd1.name}/type", + "ln -sf /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd1.name}/block", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd1.name}/keyring --name osd.${cfg.osd1.name} --add-key ${cfg.osd1.key}", + 'echo \'{"cephx_secret": "${cfg.osd1.key}"}\' | ceph osd new ${cfg.osd1.uuid} -i -', + ) + osd2.succeed( + "mkdir -p /var/lib/ceph/osd/ceph-${cfg.osd2.name}", + "echo bluestore > /var/lib/ceph/osd/ceph-${cfg.osd2.name}/type", + "ln -sf /dev/vdb /var/lib/ceph/osd/ceph-${cfg.osd2.name}/block", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-${cfg.osd2.name}/keyring --name osd.${cfg.osd2.name} --add-key ${cfg.osd2.key}", + 'echo \'{"cephx_secret": "${cfg.osd2.key}"}\' | ceph osd new ${cfg.osd2.uuid} -i -', + ) + + # We `sync` so that the config survives the forced crashes below. + osd0.succeed( + "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}", + "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", + "systemctl start ceph-osd-${cfg.osd0.name}", + ) + osd1.succeed( + "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}", + "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", + "systemctl start ceph-osd-${cfg.osd1.name}", + ) + osd2.succeed( + "ceph-osd -i ${cfg.osd2.name} --mkfs --osd-uuid ${cfg.osd2.uuid}", + "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", + "systemctl start ceph-osd-${cfg.osd2.name}", + ) + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + monA.succeed( + "ceph osd pool create multi-node-test 32 32", + "ceph osd pool ls | grep 'multi-node-test'", + + # A pool that has no application associated with it stays unhealthy in + # state POOL_APP_NOT_ENABLED. Ceph only auto-associates an application + # for pools it manages itself, such as CephFS data/metadata pools + # (application "cephfs") and the pools RGW creates (application "rgw"); see + # https://docs.ceph.com/en/tentacle/rados/operations/pools/#associating-a-pool-with-an-application + # This is a plain RADOS pool, so we have to associate an application + # with it ourselves. We use the custom application name "nixos-test". + "ceph osd pool application enable multi-node-test nixos-test", + + "ceph osd pool rename multi-node-test multi-node-other-test", + "ceph osd pool ls | grep 'multi-node-other-test'", + ) + monA.succeed("ceph osd pool set multi-node-other-test size 2") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + monA.wait_until_succeeds("! ceph -s | grep -e 'unknown' -e 'pgs inactive'") + monA.fail( + "ceph osd pool ls | grep 'multi-node-test'", + "ceph osd pool delete multi-node-other-test multi-node-other-test --yes-i-really-really-mean-it", + ) + + # Shut down ceph on all machines in a very unpolite way + monA.crash() + osd0.crash() + osd1.crash() + osd2.crash() + + # Start it up + osd0.start() + osd1.start() + osd2.start() + monA.start() + + # Ensure the cluster comes back up again. + monA.wait_until_succeeds("ceph -s | grep 'mon: 1 daemons'") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + # Verify the recovery. + monA.wait_until_succeeds("! ceph -s | grep -e 'unknown' -e 'pgs inactive'", timeout=60) + ''; + + # For `withCephfs = true`, after the regular failover, test CephFS and mounts: + # * bring up an MDS + # * create a CephFS + # * mount it via in-kernel ("kclient") and a `ceph-fuse` ("fuseclient") + # from 2 different nodes + # * verify bidirectional visibility of file changes + # * performs another crash/recovery test (without crashing the clients) + # * verifiy the mounts survive and keep working. + cephfsScript = '' + kclient.wait_for_unit("network.target") + fuseclient.wait_for_unit("network.target") + + # Start the ceph-mds daemon (which provides CephFS), after creating + # its keyring and data dir. + monA.succeed( + "sudo -u ceph mkdir -p /var/lib/ceph/mds/ceph-${cfg.monA.name}/", + "ceph auth get-or-create mds.${cfg.monA.name} mon 'allow profile mds' mgr 'allow profile mds' osd 'allow rwx' mds 'allow' > /var/lib/ceph/mds/ceph-${cfg.monA.name}/keyring", + "chown ceph:ceph /var/lib/ceph/mds/ceph-${cfg.monA.name}/keyring", + "sync", # to ensure config survives the forced crashes below + "systemctl start ceph-mds-${cfg.monA.name}", + ) + monA.wait_for_unit("ceph-mds-${cfg.monA.name}") + + # Create a CephFS. + monA.succeed( + "ceph osd pool create cephfs-data 32 32", + "ceph osd pool create cephfs-metadata 32 32", + "ceph fs new cephfs cephfs-metadata cephfs-data", + ) + # Wait for the MDS to claim the filesystem and become active. + monA.wait_until_succeeds("ceph fs status cephfs | grep -e 'active'", timeout=60) + + # Distribute the admin keyring (and a plain secret file for the kernel + # client) to both client machines, so that they can authenticate. + monA.succeed( + "cp /etc/ceph/ceph.client.admin.keyring /tmp/shared", + "ceph-authtool -p /etc/ceph/ceph.client.admin.keyring > /tmp/shared/admin.secret", + ) + kclient.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph") + fuseclient.succeed("cp /tmp/shared/ceph.client.admin.keyring /etc/ceph") + kclient.succeed("cp /tmp/shared/admin.secret /etc/ceph/admin.secret") + + # Mount CephFS on the kernel client. + # We force the messenger v2 protocol via "ms_mode=secure"; the cluster + # has msgr2 enabled (see "ceph mon enable-msgr2" above) and the legacy v1 + # protocol apparently does not reconnect reliably after the servers are restarted. + # The msgr2 monitor listens on port 3300 (instead of legacy v1 port 6789), + # so we have to point the device string at that port explicitly. + # `recover_session=clean` makes the kernel client automatically reconnect + # (discarding its stale session) after the whole cluster has been down, + # which would otherwise leave the mount blocklisted and hanging forever. + # Real CephFS use may not prefer hanging `recover_session=clean`, and + # prefer manual de-blocklisting to avoid any failed OS syscalls, + # but for this test, discarding stale sessions is good enough. + kclient.succeed("mkdir -p /mnt/cephfs") + kclient.wait_until_succeeds( + "mount -t ceph ${cfg.monA.ip}:3300:/ /mnt/cephfs -o name=admin,secretfile=/etc/ceph/admin.secret,ms_mode=secure,recover_session=clean" + ) + kclient.succeed("mountpoint /mnt/cephfs") + + # Mount CephFS on the FUSE client using ceph-fuse. + fuseclient.succeed("mkdir -p /mnt/cephfs") + fuseclient.wait_until_succeeds( + "ceph-fuse --id admin -m ${cfg.monA.ip}:6789 /mnt/cephfs" + ) + fuseclient.succeed("mountpoint /mnt/cephfs") + + # Both clients mount the same CephFS, so files written by one must be + # visible to the other. Verify this in both directions. + + # Kernel client writes, FUSE client reads. + kclient.succeed("echo 'written by kclient' > /mnt/cephfs/from-kclient") + fuseclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-kclient)\" = 'written by kclient'" + ) + + # FUSE client writes, kernel client reads. + fuseclient.succeed("echo 'written by fuseclient' > /mnt/cephfs/from-fuseclient") + kclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-fuseclient)\" = 'written by fuseclient'" + ) + + # Crash test with CephFS. + # We deliberately do not crash the CephFS clients here: Their mounts must + # survive the (temporary) outage of the ceph servers and resume working + # once the cluster is healthy again. + monA.crash() + osd0.crash() + osd1.crash() + osd2.crash() + + # Start it up + osd0.start() + osd1.start() + osd2.start() + monA.start() + + # Ensure the cluster comes back up again. + # See the note above on why this uses `wait_until_succeeds`. + monA.wait_until_succeeds("ceph -s | grep 'mon: 1 daemons'") + monA.wait_until_succeeds("ceph -s | grep 'quorum ${cfg.monA.name}'") + monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") + monA.wait_until_succeeds("ceph -s | grep 'mgr: ${cfg.monA.name}(active,'") + + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'", timeout=60) + + # Ensure the MDS/CephFS comes back up again, too. + monA.wait_for_unit("ceph-mds-${cfg.monA.name}") + monA.wait_until_succeeds("ceph fs status cephfs | grep -e 'active'", timeout=60) + monA.wait_until_succeeds("ceph -s | grep 'HEALTH_OK'") + + # The clients kept running across the outage, so their CephFS mounts + # should still be present and should reconnect automatically. + kclient.succeed("mountpoint /mnt/cephfs") + fuseclient.succeed("mountpoint /mnt/cephfs") + + # The files written before the crash must still have the correct content. + kclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-fuseclient)\" = 'written by fuseclient'" + ) + fuseclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-kclient)\" = 'written by kclient'" + ) + + # Ensure the mounts are still writable after recovery, in both directions. + kclient.succeed("echo 'written by kclient after recovery' > /mnt/cephfs/from-kclient-2") + fuseclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-kclient-2)\" = 'written by kclient after recovery'" + ) + fuseclient.succeed("echo 'written by fuseclient after recovery' > /mnt/cephfs/from-fuseclient-2") + kclient.wait_until_succeeds( + "test \"$(cat /mnt/cephfs/from-fuseclient-2)\" = 'written by fuseclient after recovery'" + ) + ''; + +in +{ + name = "basic-multi-node-ceph-cluster-bluestore" + lib.optionalString withCephfs "-cephfs"; + meta = { + maintainers = with lib.maintainers; [ + nh2 + benaryorg + ]; + }; + + nodes = { + monA = generateHost { + cephConfig = cephConfigMonA; + networkConfig = networkMonA; + }; + osd0 = generateHost { + cephConfig = cephConfigOsd cfg.osd0; + networkConfig = networkOsd cfg.osd0; + }; + osd1 = generateHost { + cephConfig = cephConfigOsd cfg.osd1; + networkConfig = networkOsd cfg.osd1; + }; + osd2 = generateHost { + cephConfig = cephConfigOsd cfg.osd2; + networkConfig = networkOsd cfg.osd2; + }; + } + # CephFS client machines are only needed when testing CephFS. + // lib.optionalAttrs withCephfs { + kclient = generateClientHost { + networkConfig = networkClient cfg.kclient; + }; + fuseclient = generateClientHost { + networkConfig = networkClient cfg.fuseclient; + }; + }; + + testScript = + { ... }: + '' + ${helperScript} + ${baseScript} + ${lib.optionalString withCephfs cephfsScript} + ''; +} diff --git a/nixos/tests/ceph-multi-node.nix b/nixos/tests/ceph-multi-node-deprecated-filestore.nix similarity index 96% rename from nixos/tests/ceph-multi-node.nix rename to nixos/tests/ceph-multi-node-deprecated-filestore.nix index 7aaf31c14d3e..992a74f72972 100644 --- a/nixos/tests/ceph-multi-node.nix +++ b/nixos/tests/ceph-multi-node-deprecated-filestore.nix @@ -1,3 +1,4 @@ +# Tests the legacy FileStore OSD backend. { lib, ... }: let cfg = { @@ -159,6 +160,7 @@ let # Start the ceph-mgr daemon, it has no deps and hardly any setup monA.succeed( "ceph auth get-or-create mgr.${cfg.monA.name} mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-${cfg.monA.name}/keyring", + "sync", # to ensure shell redirection above is durable "systemctl start ceph-mgr-${cfg.monA.name}", ) monA.wait_for_unit("ceph-mgr-a") @@ -194,20 +196,23 @@ let 'echo \'{"cephx_secret": "${cfg.osd2.key}"}\' | ceph osd new ${cfg.osd2.uuid} -i -', ) - # Initialize the OSDs with regular filestore + # We `sync` so that the config survives the forced crashes below. osd0.succeed( "ceph-osd -i ${cfg.osd0.name} --mkfs --osd-uuid ${cfg.osd0.uuid}", "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", "systemctl start ceph-osd-${cfg.osd0.name}", ) osd1.succeed( "ceph-osd -i ${cfg.osd1.name} --mkfs --osd-uuid ${cfg.osd1.uuid}", "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", "systemctl start ceph-osd-${cfg.osd1.name}", ) osd2.succeed( "ceph-osd -i ${cfg.osd2.name} --mkfs --osd-uuid ${cfg.osd2.uuid}", "chown -R ceph:ceph /var/lib/ceph/osd", + "sync", "systemctl start ceph-osd-${cfg.osd2.name}", ) monA.wait_until_succeeds("ceph osd stat | grep -e '3 osds: 3 up[^,]*, 3 in'") @@ -258,7 +263,7 @@ let ''; in { - name = "basic-multi-node-ceph-cluster"; + name = "basic-multi-node-ceph-cluster-deprecated-filestore"; meta = with lib.maintainers; { maintainers = [ lejonet ]; }; diff --git a/nixos/tests/ceph-single-node.nix b/nixos/tests/ceph-single-node-deprecated-filestore.nix similarity index 99% rename from nixos/tests/ceph-single-node.nix rename to nixos/tests/ceph-single-node-deprecated-filestore.nix index c7d822230fde..c08238559155 100644 --- a/nixos/tests/ceph-single-node.nix +++ b/nixos/tests/ceph-single-node-deprecated-filestore.nix @@ -269,7 +269,7 @@ let ''; in { - name = "basic-single-node-ceph-cluster"; + name = "basic-single-node-ceph-cluster-deprecated-filestore"; meta = with lib.maintainers; { maintainers = [ lejonet diff --git a/nixos/tests/chhoto-url.nix b/nixos/tests/chhoto-url.nix index a2f443e9b0da..883b71117906 100644 --- a/nixos/tests/chhoto-url.nix +++ b/nixos/tests/chhoto-url.nix @@ -18,7 +18,6 @@ }; interactive.nodes.machine = { - services.glitchtip.listenAddress = "0.0.0.0"; networking.firewall.allowedTCPPorts = [ 8000 ]; virtualisation.forwardPorts = [ { @@ -29,9 +28,13 @@ ]; }; + interactive.sshBackdoor.enable = true; + interactive.defaults.virtualisation.graphics = false; + testScript = '' import json import re + import time machine.wait_for_unit("chhoto-url.service") machine.wait_for_open_port(8000) @@ -53,8 +56,10 @@ assert (match := re.search(r"(?m)^location: (.+?)\r?$", resp)) assert match[1] == "https://nixos.org/" + time.sleep(2) resp = json.loads(machine.succeed(f"curl -H 'X-API-Key: api_key' localhost:8000/api/expand -d '{slug}'")) assert resp["success"] is True + assert resp["longurl"] == "https://nixos.org/" assert resp["hits"] == 1 ''; } diff --git a/nixos/tests/cinnamon-wayland.nix b/nixos/tests/cinnamon-wayland.nix index 632ab53cc529..d26d50dd9dc6 100644 --- a/nixos/tests/cinnamon-wayland.nix +++ b/nixos/tests/cinnamon-wayland.nix @@ -51,8 +51,9 @@ machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") with subtest("Check if Cinnamon components actually start"): - for i in ["csd-media-keys", "xapp-sn-watcher", "nemo-desktop"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + # https://unix.stackexchange.com/a/74186 + for i in ["[c]sd-media-keys", "[x]app-sn-watcher", "[n]emo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f \"{i}\"") machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") @@ -84,6 +85,10 @@ machine.wait_until_succeeds("${eval "global.display.focus_window.wm_class"} | grep -i 'gnome-terminal'") machine.sleep(2) + # Only can be tested after opening the above apps. + with subtest("Check if x-d-p actually starts"): + machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"") + with subtest("Check if Cinnamon has ever coredumped"): machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") ''; diff --git a/nixos/tests/cinnamon.nix b/nixos/tests/cinnamon.nix index d8b52c261a42..da8bf8847a4b 100644 --- a/nixos/tests/cinnamon.nix +++ b/nixos/tests/cinnamon.nix @@ -62,8 +62,9 @@ machine.wait_until_succeeds("${eval "Main.runState"} | grep -q 'true,..2'") with subtest("Check if Cinnamon components actually start"): - for i in ["csd-media-keys", "cinnamon-killer-daemon", "xapp-sn-watcher", "nemo-desktop"]: - machine.wait_until_succeeds(f"pgrep -f {i}") + # https://unix.stackexchange.com/a/74186 + for i in ["[c]sd-media-keys", "[c]innamon-killer-daemon", "[x]app-sn-watcher", "[n]emo-desktop"]: + machine.wait_until_succeeds(f"pgrep -f \"{i}\"") machine.wait_until_succeeds("journalctl -b --grep 'Loaded applet menu@cinnamon.org'") machine.wait_until_succeeds("journalctl -b --grep 'calendar@cinnamon.org: Calendar events supported'") @@ -104,6 +105,10 @@ machine.sleep(2) machine.screenshot("cinnamon_virtual_keyboard") + # Only can be tested after opening the above apps. + with subtest("Check if x-d-p actually starts"): + machine.wait_until_succeeds("pgrep -xf \"${pkgs.xdg-desktop-portal}/libexec/xdg-desktop-portal\"") + with subtest("Check if Cinnamon has ever coredumped"): machine.fail("coredumpctl --json=short | grep -E 'cinnamon|nemo'") ''; diff --git a/nixos/tests/cloudcompare.nix b/nixos/tests/cloudcompare.nix new file mode 100644 index 000000000000..0e9b72da3a41 --- /dev/null +++ b/nixos/tests/cloudcompare.nix @@ -0,0 +1,55 @@ +{ pkgs, runTest }: +let + testFile = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; + hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + }; + + vmTest = runTest { + name = "cloudcompare-vm"; + meta.maintainers = with pkgs.lib.maintainers; [ + nh2 + ]; + + enableOCR = true; + + nodes.machine = + { ... }: + { + imports = [ + ./common/x11.nix + ]; + + services.xserver.enable = true; + environment.systemPackages = [ + pkgs.cloudcompare + ]; + }; + + testScript = '' + start_all() + machine.wait_for_x() + + machine.execute("CloudCompare ${testFile} >&2 &") + machine.wait_for_window("CloudCompare") + + # Wait for the file to be loaded; CloudCompare shows "loaded successfully" in its log panel at the bottom. + machine.wait_for_text("loaded successfully") + + machine.screenshot("screen.png") + ''; + }; +in +{ + vm = vmTest; + + screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix { + name = "cloudcompare-screenshot-analysis"; + screenshot = "${vmTest}/screen.png"; + question = '' + Look at this screenshot of a desktop application. + Answer: Does the application show a 3D point cloud viewer (CloudCompare) that has successfully loaded and is displaying a coloured point cloud? + Evidence of success: a 3D viewport with coloured points is visible AND there are no error dialogs or error messages. + ''; + }; +} diff --git a/nixos/tests/cockpit.nix b/nixos/tests/cockpit.nix index 6144450d3469..1bce4e584c06 100644 --- a/nixos/tests/cockpit.nix +++ b/nixos/tests/cockpit.nix @@ -102,7 +102,6 @@ in from selenium.webdriver.firefox.options import Options from selenium.webdriver.support.ui import WebDriverWait from selenium.webdriver.support import expected_conditions as EC - from time import sleep def log(msg): @@ -129,7 +128,7 @@ in wait.until(EC.presence_of_element_located((by, query))) - def wait_title_contains(title, timeout=10): + def wait_title_contains(title, timeout=30): wait = WebDriverWait(driver, timeout) wait.until(EC.title_contains(title)) @@ -138,11 +137,6 @@ in return driver.find_element(by, query) - def set_value(elem, value): - script = 'arguments[0].value = arguments[1]' - return driver.execute_script(script, elem, value) - - log("Waiting for the homepage to load") # cockpit sets initial title as hostname @@ -151,36 +145,45 @@ in log("Homepage loaded!") + # Prefer send_keys over setting .value via JS: Cockpit's login + # form (and PatternFly widgets) do not always react to the latter. log("Filling out username") login_input = find_element(By.CSS_SELECTOR, 'input#login-user-input') - set_value(login_input, "${user}") + login_input.clear() + login_input.send_keys("${user}") log("Filling out password") - password_input = find_element(By.CSS_SELECTOR, 'input#login-password-input') - set_value(password_input, "${password}") + password_input = find_element( + By.CSS_SELECTOR, 'input#login-password-input' + ) + password_input.clear() + password_input.send_keys("${password}") log("Submitting credentials for login") driver.find_element(By.CSS_SELECTOR, 'button#login-button').click() - # driver.implicitly_wait(1) - # driver.get("https://server:7890/system") - log("Waiting dashboard to load") wait_title_contains("${user}@server") - log("Waiting for the frontend to initialize") - sleep(1) - log("Looking for that banner that tells about limited access") - container_iframe = find_element(By.CSS_SELECTOR, 'iframe.container-frame') + wait_elem(By.CSS_SELECTOR, 'iframe.container-frame', timeout=30) + container_iframe = find_element( + By.CSS_SELECTOR, 'iframe.container-frame' + ) driver.switch_to.frame(container_iframe) - - assert "Web console is running in limited access mode" in driver.page_source + # Wait for the overview iframe to render the limited-access alert. + # Fixed sleeps were flaky after Cockpit 364 (slower SPA init). + phrase = "Web console is running in limited access mode" + WebDriverWait(driver, 30).until( + lambda d: phrase in d.page_source + ) log("Clicking the sudo button") + # Button label is "Turn on administrative access" for button in driver.find_elements(By.TAG_NAME, "button"): - if 'admin' in button.text: + if 'admin' in button.text.casefold(): button.click() + break driver.switch_to.default_content() log("Checking that /nonexistent is not a thing") @@ -189,13 +192,17 @@ in log("Checking plugin path") driver.get("https://server:7890/hello-test") - sleep(2) + wait_elem(By.CSS_SELECTOR, 'iframe.container-frame', timeout=30) for iframe in driver.find_elements(By.TAG_NAME, "iframe"): if "hello-test" in (iframe.get_attribute("src") or ""): driver.switch_to.frame(iframe) break - text = driver.find_element(By.ID, "output").text - sleep(1) + output = find_element(By.ID, "output") + WebDriverWait(driver, 30).until( + lambda d: "SUCCESS: Hello, world!" in output.text + or output.text.startswith("FAILED:") + ) + text = output.text assert "SUCCESS: Hello, world!" in text, f"Plugin failed: {text}" driver.close() @@ -215,8 +222,10 @@ in server.wait_for_unit("sockets.target") server.wait_for_open_port(7890) + # Port open is not enough: cockpit-ws may still be finishing startup. + server.wait_until_succeeds("curl -k https://127.0.0.1:7890 -o /dev/null") - client.succeed("curl -k https://server:7890 -o /dev/stderr") + client.wait_until_succeeds("curl -k https://server:7890 -o /dev/stderr") print(client.succeed("whoami")) client.succeed('PYTHONUNBUFFERED=1 selenium-script') ''; diff --git a/nixos/tests/common/ec2.nix b/nixos/tests/common/ec2.nix index 864afc63cb8b..f28e094d455b 100644 --- a/nixos/tests/common/ec2.nix +++ b/nixos/tests/common/ec2.nix @@ -51,9 +51,11 @@ in ) os.makedirs(image_dir, mode=0o700, exist_ok=True) disk_image = os.path.join(image_dir, "machine.qcow2") + QEMU_BIN = "${pkgs.qemu}" + QEMU_IMG = f"{QEMU_BIN}/bin/qemu-img" subprocess.check_call( [ - "qemu-img", + QEMU_IMG, "create", "-f", "qcow2", @@ -64,7 +66,7 @@ in disk_image, ] ) - subprocess.check_call(["qemu-img", "resize", disk_image, "10G"]) + subprocess.check_call([QEMU_IMG, "resize", disk_image, "10G"]) # Note: we use net=169.0.0.0/8 rather than # net=169.254.0.0/16 to prevent dhcpcd from getting horribly @@ -74,7 +76,7 @@ in # turn off the DHCP server, but qemu does not have an option # to do that. start_command = ( - "qemu-kvm -m 1024" + f"{QEMU_BIN}/bin/qemu-kvm -m 1024" + " -device virtio-net-pci,netdev=vlan0" + " -netdev 'user,id=vlan0,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${getExe imdsServer} ${metaData}'" + f" -drive file={disk_image},if=virtio,werror=report" diff --git a/nixos/tests/common/openxr.nix b/nixos/tests/common/openxr.nix new file mode 100644 index 000000000000..53b48d10e5fb --- /dev/null +++ b/nixos/tests/common/openxr.nix @@ -0,0 +1,39 @@ +{ + lib, + pkgs, + config, + ... +}: + +{ + imports = [ + ./user-account.nix + ./x11.nix + ]; + test-support.displayManager.auto.user = "alice"; + systemd.user.targets.xdg-desktop-autostart = { + wantedBy = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + }; + + hardware.graphics.enable = true; + + services.monado = { + enable = true; + defaultRuntime = true; + forceDefaultRuntime = true; + }; + systemd.user.services.monado = { + requires = [ "graphical-session.target" ]; + environment = { + # Stop Monado from probing for any hardware + SIMULATED_ENABLE = "1"; + SIMULATED_LEFT = "simple"; + SIMULATED_RIGHT = "simple"; + # Run as X11 client rather than using direct mode + XRT_COMPOSITOR_FORCE_XCB = "1"; + # And run fullscreen so that we can hide the DE + XRT_COMPOSITOR_XCB_FULLSCREEN = "1"; + }; + }; +} diff --git a/nixos/tests/containers-ip.nix b/nixos/tests/containers-ip.nix index 8dceda8db4c6..7465813775e0 100644 --- a/nixos/tests/containers-ip.nix +++ b/nixos/tests/containers-ip.nix @@ -47,9 +47,9 @@ in # need to distinguish because show-ip won't work for ipv6 if container == "webserver4": ip = machine.succeed(f"nixos-container show-ip {container}").rstrip() - assert ip == "${nodes.machine.config.containers.webserver4.localAddress}" + assert ip == "${nodes.machine.containers.webserver4.localAddress}" return ip - return "${nodes.machine.config.containers.webserver6.localAddress}" + return "${nodes.machine.containers.webserver6.localAddress}" for container in "webserver4", "webserver6": diff --git a/nixos/tests/coredns.nix b/nixos/tests/coredns.nix index 6ee6572d57c8..cb485ae34b5c 100644 --- a/nixos/tests/coredns.nix +++ b/nixos/tests/coredns.nix @@ -28,7 +28,7 @@ position = "start-of-file"; } ]; - vendorHash = "sha256-66WNU+t/frHfbxexYdiXzgXKLxPyLnN6JuKnlG/kSQY="; + vendorHash = "sha256-cvgq/Djlxjiu0C5QjaxrlEeG7O2mB6mGAwV7/reYlpY="; }; }; }; diff --git a/nixos/tests/cosmic.nix b/nixos/tests/cosmic.nix deleted file mode 100644 index f7fde6ca0e0f..000000000000 --- a/nixos/tests/cosmic.nix +++ /dev/null @@ -1,147 +0,0 @@ -{ - config, - lib, - testName, - enableAutologin, - enableXWayland, - ... -}: - -{ - name = testName; - - meta.maintainers = lib.teams.cosmic.members; - - nodes.machine = { - imports = [ ./common/user-account.nix ]; - - services = { - # For `cosmic-store` to be added to `environment.systemPackages` - # and for it to work correctly because Flatpak is a runtime - # dependency of `cosmic-store`. - flatpak.enable = true; - - displayManager.cosmic-greeter.enable = true; - desktopManager.cosmic = { - enable = true; - xwayland.enable = enableXWayland; - }; - }; - - services.displayManager.autoLogin = lib.mkIf enableAutologin { - enable = true; - user = "alice"; - }; - - environment.systemPackages = with config.node.pkgs; [ - # These two packages are used to check if a window was opened - # under the COSMIC session or not. Kinda important. - # TODO: Move the check from the test module to - # `nixos/lib/test-driver/src/test_driver/machine.py` so more - # Wayland-only testing can be done using the existing testing - # infrastructure. - jq - lswt - ]; - - # So far, all COSMIC tests launch a few GUI applications. In doing - # so, the default allocated memory to the guest of 1024M quickly - # poses a very high risk of an OOM-shutdown which is worse than an - # OOM-kill. Because now, the test failed, but not for a genuine - # reason, but an OOM-shutdown. That's an inconclusive failure - # which might possibly mask an actual failure. Not enabling - # systemd-oomd because we need said applications running for a - # few seconds. So instead, bump the allocated memory to the guest - # from 1024M to 4x; 4096M. - virtualisation.memorySize = 4096; - }; - - testScript = - { nodes, ... }: - let - cfg = nodes.machine; - user = cfg.users.users.alice; - DISPLAY = lib.strings.optionalString enableXWayland ( - if enableAutologin then "DISPLAY=:0" else "DISPLAY=:1" - ); - emptyPDF = config.node.pkgs.stdenvNoCC.mkDerivation { - name = "empty-pdf"; - dontUnpack = true; - nativeBuildInputs = [ config.node.pkgs.imagemagick ]; - buildPhase = '' - magick xc:none -page Letter empty.pdf - ''; - installPhase = '' - mkdir $out - mv empty.pdf $out/empty.pdf - ''; - }; - in - '' - #testName: ${testName} - '' - + ( - if enableAutologin then - '' - with subtest("cosmic-greeter initialisation"): - machine.wait_for_unit("graphical.target", timeout=120) - '' - else - '' - from time import sleep - - machine.wait_for_unit("graphical.target", timeout=120) - machine.wait_until_succeeds("pgrep --uid ${toString cfg.users.users.cosmic-greeter.name} --full cosmic-greeter", timeout=30) - # Sleep for 10 seconds for ensuring that `greetd` loads the - # password prompt for the login screen properly. - sleep(10) - - with subtest("cosmic-session login"): - machine.send_chars("${user.password}\n", delay=0.2) - '' - ) - + '' - # _One_ of the final processes to start as part of the - # `cosmic-session` target is the Workspaces applet. So, wait - # for it to start. The process existing means that COSMIC - # now handles any opened windows from now on. - machine.wait_until_succeeds("pgrep --uid ${toString user.uid} --full 'cosmic-panel-button com.system76.CosmicWorkspaces'", timeout=30) - - # The best way to test for Wayland and XWayland is to launch - # the GUI applications and see the results yourself. - with subtest("Launch applications"): - # key: binary_name - # value: "app-id" as reported by `lswt` - gui_apps_to_launch = {} - - # We want to ensure that the first-party applications - # start/launch properly. - gui_apps_to_launch['cosmic-edit'] = 'com.system76.CosmicEdit' - gui_apps_to_launch['cosmic-files'] = 'com.system76.CosmicFiles' - gui_apps_to_launch['cosmic-player'] = 'com.system76.CosmicPlayer' - gui_apps_to_launch['cosmic-reader'] = 'com.system76.CosmicReader' - gui_apps_to_launch['cosmic-settings'] = 'com.system76.CosmicSettings' - gui_apps_to_launch['cosmic-store'] = 'com.system76.CosmicStore' - gui_apps_to_launch['cosmic-term'] = 'com.system76.CosmicTerm' - - for gui_app, app_id in gui_apps_to_launch.items(): - # Don't fail the test if binary is absent - if machine.execute(f"su - ${user.name} -c 'command -v {gui_app}'", timeout=5)[0] == 0: - match gui_app: - case 'cosmic-reader': - opt_arg = '${emptyPDF}/empty.pdf' - case _: - opt_arg = "" - - machine.succeed(f"su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} ${DISPLAY} {gui_app} {opt_arg} >&2 &'", timeout=5) - # Nix builds the following non-commented expression to the following: - # `su - alice -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/1000 lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' ` - machine.wait_until_succeeds(f''''su - ${user.name} -c 'WAYLAND_DISPLAY=wayland-1 XDG_RUNTIME_DIR=/run/user/${toString user.uid} lswt --json | jq ".toplevels" | grep "^ \\"app-id\\": \\"{app_id}\\"$"' '''', timeout=60) - machine.succeed(f"pkill {gui_app}", timeout=5) - - machine.succeed("echo 'test completed succeessfully' > /${testName}", timeout=5) - machine.copy_from_machine('/${testName}') - - machine.shutdown() - ''; -} diff --git a/nixos/tests/cosmic/default.nix b/nixos/tests/cosmic/default.nix new file mode 100644 index 000000000000..3b6dce9f55a4 --- /dev/null +++ b/nixos/tests/cosmic/default.nix @@ -0,0 +1,168 @@ +{ + config, + lib, + testName, + enableAutologin, + enableXWayland, + ... +}: + +let + user = config.nodes.machine.users.users.alice; + logFilePath = "/home/${user.name}/${testName}"; + # Use `writeShellScriptBin` instead of `writeShellScript` so that the + # process name in the journald log appears as 'cosmicTest[$pid]' + cosmicTest = config.node.pkgs.writeShellScriptBin "cosmicTest" '' + exec ${lib.getExe config.node.pkgs.python3Minimal} ${./test-script.py} \ + --log-file-path ${logFilePath} \ + --cosmic-reader-pdf ${config.node.pkgs.empty-pdf} \ + --polkit-agent-helper-path ${config.node.pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1 \ + --root-user-password ${user.password} + ''; + cosmicTestDesktop = config.node.pkgs.makeDesktopItem { + name = "cosmicTest"; + desktopName = "COSMIC NixOS VM test (${testName})"; + exec = "cosmicTest"; + }; + cosmicTestAutostartItem = config.node.pkgs.makeAutostartItem { + name = "cosmicTest"; + package = cosmicTestDesktop; + }; +in + +{ + name = testName; + + meta.maintainers = lib.teams.cosmic.members; + + nodes.machine = { + imports = [ ../common/user-account.nix ]; + + services = { + # For `cosmic-store` to be added to `environment.systemPackages` + # and for it to work correctly because Flatpak is a runtime + # dependency of `cosmic-store`. + flatpak.enable = true; + + displayManager.cosmic-greeter.enable = true; + desktopManager.cosmic = { + enable = true; + xwayland.enable = enableXWayland; + }; + }; + + services.displayManager.autoLogin = lib.mkIf enableAutologin { + enable = true; + user = user.name; + }; + + users.users = { + alice.extraGroups = [ + "uinput" # for ydotoold + ]; + + root.password = user.password; + root.hashedPasswordFile = lib.mkForce null; + }; + + hardware.uinput.enable = true; + + environment.systemPackages = with config.node.pkgs; [ + ydotool + cosmicTest + cosmicTestAutostartItem + + # These two packages are used to check if a window was opened + # under the COSMIC session or not. Kinda important. + # TODO: Move the check from the test module to + # `nixos/lib/test-driver/src/test_driver/machine.py` so more + # Wayland-only testing can be done using the existing testing + # infrastructure. + jq + lswt + ]; + + # So far, all COSMIC tests launch a few GUI applications. In doing + # so, the default allocated memory to the guest of 1024M quickly + # poses a very high risk of an OOM-shutdown which is worse than an + # OOM-kill. Because now, the test failed, but not for a genuine + # reason, but an OOM-shutdown. That's an inconclusive failure + # which might possibly mask an actual failure. Not enabling + # systemd-oomd because we need said applications running for a + # few seconds. So instead, bump the allocated memory to the guest + # from 1024M to 4x; 4096M. + virtualisation.memorySize = 4096; + }; + + testScript = + { nodes, ... }: + '' + #testName: ${testName} + import sys + '' + + ( + if enableAutologin then + '' + with subtest("cosmic-greeter initialisation"): + machine.wait_for_unit("graphical.target", timeout=120) + '' + else + '' + from time import sleep + + machine.wait_for_unit("graphical.target", timeout=120) + machine.wait_until_succeeds("pgrep --uid ${config.nodes.machine.users.users.cosmic-greeter.name} --full cosmic-greeter", timeout=30) + # Sleep for 10 seconds for ensuring that `greetd` loads the + # password prompt for the login screen properly. + sleep(10) + + with subtest("cosmic-session login"): + machine.send_chars("${user.password}\n", delay=0.2) + '' + ) + + '' + with subtest("xdg autostart support in cosmic"): + # When checking the status of our `cosmicTest` package with: + # `machine.wait_for_unit("app-cosmicTest@autostart.service", user="${user.name}")` + # We are immediately greeted with the error: + # ``` + # subtest: xdg autostart support in cosmic + # machine: waiting for unit app-cosmicTest@autostart.service with user alice + # machine # [ 26.497516] cosmic-comp[1352]: [EGL] 0x3008 (BAD_DISPLAY) eglCreateSync: _eglCreateSync + # machine # [ 26.511706] su[1416]: Successful su for alice by root + # machine # [ 26.528190] su[1416]: pam_unix(su:session): session opened for user alice(uid=1000) by (uid=0) + # machine # Failed to connect to user scope bus via local transport: No such file or directory + # machine # [ 26.599563] su[1416]: pam_unix(su:session): session closed for user alice + # !!! Test "xdg autostart support in cosmic" failed with error: "retrieving systemctl property "ActiveState" for unit "app-cosmicTest@autostart.service" under user "alice" failed with exit code 1" + # ``` + # Meaning, our session is extremely new and the D-Bus user + # session socket does not yet exist. Instead, lets poll for + # the log file that the test is guaranteed to write to, as + # soon as it starts. + machine.wait_for_file("${logFilePath}.log", timeout=120) + + exit_code = 0 + try: + machine.wait_for_file("${logFilePath}.done", timeout=700) + except Exception: + exit_code = 1 + + # The log file is created in the very beginning of the test + # script's execution. If we are here, it means that the + # `wait_for_unit`'s "guard" on the test script's autostart unit + # plus the 630 second combined timeout of other two + # `wait_for_file`s, make it extremely likely for the log file to + # be present. + machine.copy_from_machine("${logFilePath}.log") + + machine.shutdown() + + with open(f"{machine.out_dir}/${testName}.log") as test_log_file: + contents = test_log_file.read() + print(contents) + if any("Z [ERROR] [L:" in line for line in contents.splitlines()): + exit_code = 1 + + sys.exit(exit_code) + ''; +} diff --git a/nixos/tests/cosmic/test-script.py b/nixos/tests/cosmic/test-script.py new file mode 100644 index 000000000000..07377fa95fac --- /dev/null +++ b/nixos/tests/cosmic/test-script.py @@ -0,0 +1,315 @@ +#!/usr/bin/env python3 +import argparse +import logging +import os +import pathlib +import subprocess +import time + + +def parse_cli_args() -> argparse.Namespace: + parser = argparse.ArgumentParser() + parser.add_argument( + "--log-file-path", + required=True, + type=str, + help="The path to the log file (without the '.log' suffix/extension)", + ) + parser.add_argument( + "--cosmic-reader-pdf", + required=True, + type=str, + help="The PDF that the `cosmic-reader` should open for testing", + ) + parser.add_argument( + "--polkit-agent-helper-path", + required=True, + type=str, + help="The path to the polkit agent helper (`${pkgs.polkit.out}/lib/polkit-1/polkit-agent-helper-1`)", + ) + parser.add_argument( + "--root-user-password", required=True, type=str, help="The root user's password" + ) + args = parser.parse_args() + return args + + +def start_ydotool_daemon() -> tuple[str, subprocess.Popen]: + """ + The ydotool requires a daemon to be running. + """ + xdg_runtime_dir = os.getenv("XDG_RUNTIME_DIR") or f"/run/user/{os.getuid()}" + ydotool_daemon_socket_path = f"{xdg_runtime_dir}/.ydotool_socket" + ydotool_daemon_process = subprocess.Popen( + [ + "ydotoold", + "--socket-path", + ydotool_daemon_socket_path, + "--mouse-off", + ], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + return ydotool_daemon_socket_path, ydotool_daemon_process + + +def wait_for_cosmic_de_readiness() -> None: + """ + Wait for the COSMIC DE to be ready, before running the tests. This + is done by waiting on the supposedly last component of the COSMIC + DE to be "ready." That component is the notification watcher, of + the `cosmic-applet` derivation. + """ + logging.info("=" * 80) + logging.info("Waiting for COSMIC DE to complete initialization") + + notification_watcher_wait_deadline = time.monotonic() + 360 + notification_watcher_exists = False + while time.monotonic() < notification_watcher_wait_deadline: + busctl_process = subprocess.run( + ["busctl", "--user", "status", "com.system76.CosmicStatusNotifierWatcher"], + check=False, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + if busctl_process.returncode == 0: + notification_watcher_exists = True + break + else: + time.sleep(1) + logging_msg = "The COSMIC DE is " + if notification_watcher_exists: + logging.info(f"{logging_msg} ready") + else: + logging.error(f"{logging_msg} not ready") + return + + +def perform_polkit_authentication_test( + cli_args: argparse.Namespace, + ydotool_daemon_socket_path: str, + ydotool_daemon_process: subprocess.Popen, +) -> None: + """ + 1. Run `pkexec` as a background process that produces a specific + output to stdout upon successful completion. + 2. Wait unil it has been confimred that `cosmic-osd` has created + a pop-up requesting the root user's password. + 3. Use ydotool to type the root user's password in the pop-up + prompt. + 4. Ensure that the the `pkexec` background process' stdout matches + the output that we expect. + + Any breakage in this flow is considered a failure of the polkit + authenticaion test. + """ + logging.info("=" * 80) + logging.info("Performing polkit authentication test") + + polkit_test_passed = False + polkit_test_command = [ + "pkexec", + "--disable-internal-agent", + "bash", + "-c", + "echo -n 'polkit test was successful'", + ] + logging.info(f"Running: {polkit_test_command}") + polkit_test_process = subprocess.Popen( + polkit_test_command, + stdout=subprocess.PIPE, + stderr=subprocess.PIPE, + text=True, + ) + + polkit_popup_deadline = time.monotonic() + 60 + pop_up_msg = "the pop-up for polkit password authentication" + encountered_polkit_authentication_popup = False + while time.monotonic() < polkit_popup_deadline: + polkit_popup_check_process = subprocess.run( + [ + "pgrep", + "-afx", + f"{cli_args.polkit_agent_helper_path} --socket-activated", + ], + check=False, + ) + if polkit_popup_check_process.returncode == 0: + encountered_polkit_authentication_popup = True + logging.info(f"Noticed {pop_up_msg}") + if ydotool_daemon_process.poll() is None: + # The polkit-agent-helper process exists, but that + # doesn't necessarily mean that the pop-up is + # **rendered** and ready to accept the password. So we + # sleep for a few seconds. + time.sleep(20) + ydotool_process = subprocess.run( + [ + "ydotool", + "type", + "--key-delay=500", + f"{cli_args.root_user_password}\n", + ], + env={ + **os.environ.copy(), + "YDOTOOL_SOCKET": ydotool_daemon_socket_path, + }, + check=False, + ) + ydotool_msg = ( + "the root user's password in the pop-up for polkit authentication" + ) + if ydotool_process.returncode == 0: + logging.info(f"ydotool typed {ydotool_msg}") + else: + logging.error(f"ydotool did not type {ydotool_msg}") + else: + logging.error( + "The ydotool daemon exited for some reason before it could be used" + ) + break + time.sleep(1) + if not encountered_polkit_authentication_popup: + logging.error(f"Did not notice {pop_up_msg}") + + polkit_test_process_stdout = "" + polkit_test_process_stderr = "" + try: + polkit_test_process_stdout, polkit_test_process_stderr = ( + polkit_test_process.communicate(timeout=45) + ) + except subprocess.TimeoutExpired: + polkit_test_process.kill() + polkit_test_process_stdout, polkit_test_process_stderr = ( + polkit_test_process.communicate() + ) + + logging.info(f"polkit stdout: '{polkit_test_process_stdout}'") + logging.info(f"polkit stderr: '{polkit_test_process_stderr}'") + + if polkit_test_process_stdout: + logging.info(f"pkexec command stdout: {polkit_test_process_stdout}") + polkit_test_passed = "polkit test was successful" in polkit_test_process_stdout + else: + logging.warning("Could not capture stdout from the polkit test command") + + if polkit_test_passed: + logging.info("The polkit authentication test passed") + else: + logging.error("The polkit authentication test failed") + return + + +def perform_gui_application_test(cli_args: argparse.Namespace) -> None: + """ + 1. Start one GUI application as a background process. + 2. Wait unil it has been confimred that the GUI application is + running. + 3. Kill the background process of the GUI application. + + Any breakage in this flow is considered a failure of the test for + the GUI application. + """ + logging.info("=" * 80) + logging.info("Performing test to launch GUI applications") + + gui_apps_to_test = { + "com.system76.CosmicEdit": [ + "cosmic-edit", + ], + "com.system76.CosmicFiles": [ + "cosmic-files", + ], + "com.system76.CosmicPlayer": [ + "cosmic-player", + ], + "com.system76.CosmicReader": [ + "cosmic-reader", + cli_args.cosmic_reader_pdf, + ], + "com.system76.CosmicSettings": [ + "cosmic-settings", + ], + "com.system76.CosmicStore": [ + "cosmic-store", + ], + "com.system76.CosmicTerm": [ + "cosmic-term", + ], + } + + for gui_app_id, gui_app_command in gui_apps_to_test.items(): + logging.info(f"Running: {gui_app_command}") + gui_app_bg_process = subprocess.Popen( + gui_app_command, + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + ) + gui_app_bg_process_deadline = time.monotonic() + 30 + gui_app_is_running = False + + while time.monotonic() < gui_app_bg_process_deadline and not gui_app_is_running: + lswt_process = subprocess.run( + [ + "lswt", + "--custom", + "a", + ], + check=False, + text=True, + stdout=subprocess.PIPE, + stderr=subprocess.DEVNULL, + ) + lswt_process_stdout = lswt_process.stdout.strip() + if lswt_process_stdout: + if gui_app_id in lswt_process_stdout.splitlines(): + gui_app_is_running = True + time.sleep(1) + pkill_process = subprocess.run( + ["pkill", gui_app_command[0]], + stdout=subprocess.DEVNULL, + stderr=subprocess.DEVNULL, + check=False, + ) + + log_message = ( + f"The GUI application test for '{gui_app_command[0]}' ({gui_app_id})" + ) + if gui_app_is_running: + logging.info(f"{log_message} passed") + else: + logging.error(f"{log_message} failed") + return + + +def main() -> None: + cli_args = parse_cli_args() + logging.basicConfig( + level=logging.INFO, + format=f"%(asctime)sZ [%(levelname)s] [L:%(lineno)d] %(message)s", + datefmt="%H:%M:%S", + handlers=[ + logging.StreamHandler(), + logging.FileHandler(f"{cli_args.log_file_path}.log", mode="w"), + ], + ) + logging.Formatter.converter = time.gmtime + logging.info(f"Logging to '{cli_args.log_file_path}.log'") + + ydotool_daemon_socket_path, ydotool_daemon_process = start_ydotool_daemon() + + # Wait for the DE to be ready + wait_for_cosmic_de_readiness() + + # tests go here + perform_polkit_authentication_test( + cli_args, ydotool_daemon_socket_path, ydotool_daemon_process + ) + perform_gui_application_test(cli_args) + + pathlib.Path(f"{cli_args.log_file_path}.done").touch() + return + + +if __name__ == "__main__": + main() diff --git a/nixos/tests/credentials.nix b/nixos/tests/credentials.nix new file mode 100644 index 000000000000..7984ffd03593 --- /dev/null +++ b/nixos/tests/credentials.nix @@ -0,0 +1,106 @@ +{ + lib, + pkgs, + mechanism, + ... +}: + +let + secret = '' + foo + bar + baz + ''; + secret-file = "bar"; + + common-credentials = { + secret-default-mechanism = { + text = "default-mechanism"; + }; + secret-file-nix-store = { + source = pkgs.writeText "secret-file-nix-store" secret-file; + }; + secret-file-host = { + source = "./secret-file-host"; + }; + secret-file-host-binary = { + source = "./secret-file-host-binary"; + }; + }; +in + +{ + name = "credentials-${mechanism}"; + + meta.maintainers = with lib.maintainers; [ arianvp ]; + + # No VM<->container traffic in this test; credentials are static. + requiredFeatures.devnet = lib.mkForce false; + + nodes.vm = { + virtualisation.credentials = common-credentials // { + secret = { + inherit mechanism; + text = secret; + }; + }; + }; + + containers.container = { + virtualisation.credentials = common-credentials // { + secret = { + text = secret; + }; + }; + }; + + testScript = '' + import base64 + + secret_file_host = "baz" + # Binary data with null bytes, high bytes, and other problematic characters. + secret_file_host_binary = bytes([ + 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, + 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, + 0xDE, 0xAD, 0xBE, 0xEF, + 0xFF, 0xFE, 0xFD, 0xFC, + 0x00, 0x00, 0x00, 0x00, + 0x80, 0x81, 0x82, 0x83, + ]) + + def assert_credentials(m): + with open(m.state_dir / "secret-file-host", "w") as f: + f.write(secret_file_host) + with open(m.state_dir / "secret-file-host-binary", "wb") as f2: + f2.write(secret_file_host_binary) + + t.assertEqual( + m.succeed("systemd-creds --system cat secret").strip(), + "foo\nbar\nbaz", + ) + t.assertEqual( + m.succeed("systemd-creds --system cat secret-default-mechanism").strip(), + "default-mechanism", + ) + t.assertEqual( + m.succeed("systemd-creds --system cat secret-file-nix-store").strip(), + "${secret-file}", + ) + t.assertEqual( + m.succeed("systemd-creds --system cat secret-file-host").strip(), + secret_file_host, + ) + result = m.succeed( + "systemd-creds --system cat secret-file-host-binary --transcode=base64" + ).strip() + expected = base64.b64encode(secret_file_host_binary).decode("ascii") + t.assertEqual( + result, + expected, + f"Binary credential mismatch: got {result}, expected {expected}", + ) + + assert_credentials(vm) + assert_credentials(container) + ''; +} diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix index f5eec96d6cc3..bb5d5d6635e4 100644 --- a/nixos/tests/croc.nix +++ b/nixos/tests/croc.nix @@ -12,8 +12,8 @@ in meta = with pkgs.lib.maintainers; { maintainers = [ equirosa - SuperSandro2000 ryan4yin + kaynetik ]; }; diff --git a/nixos/tests/dep-scan.nix b/nixos/tests/dep-scan.nix index 8d7bdde8578e..05298c004285 100644 --- a/nixos/tests/dep-scan.nix +++ b/nixos/tests/dep-scan.nix @@ -14,7 +14,7 @@ ] ++ teams.ngi.members; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ dep-scan jq diff --git a/nixos/tests/docker-rootless.nix b/nixos/tests/docker-rootless.nix index fcd33476ae45..17fec3e04f65 100644 --- a/nixos/tests/docker-rootless.nix +++ b/nixos/tests/docker-rootless.nix @@ -22,7 +22,7 @@ testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; sudo = lib.concatStringsSep " " [ "XDG_RUNTIME_DIR=/run/user/${toString user.uid}" "DOCKER_HOST=unix:///run/user/${toString user.uid}/docker.sock" diff --git a/nixos/tests/e57inspector.nix b/nixos/tests/e57inspector.nix index d421b69f2101..91c4bb90e996 100644 --- a/nixos/tests/e57inspector.nix +++ b/nixos/tests/e57inspector.nix @@ -1,38 +1,53 @@ -{ pkgs, ... }: -{ - name = "e57inspector"; - meta.maintainers = with pkgs.lib.maintainers; [ - nh2 - chpatrick - ]; +{ pkgs, runTest }: +let + testFile = pkgs.fetchurl { + url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; + hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + }; - nodes.machine = - { ... }: - { - imports = [ - ./common/x11.nix - ]; + vmTest = runTest { + name = "e57inspector-vm"; + meta.maintainers = with pkgs.lib.maintainers; [ + nh2 + chpatrick + ]; - services.xserver.enable = true; - environment.systemPackages = [ - pkgs.e57inspector - pkgs.xdotool - ]; - }; + nodes.machine = + { ... }: + { + imports = [ + ./common/x11.nix + ]; - testScript = - let - testFile = pkgs.fetchurl { - url = "https://raw.githubusercontent.com/asmaloney/libE57Format-test-data/bbcacec05d60f923869545c5eab33d94c390d50e/self/ColouredCubeFloat.e57"; - hash = "sha256-bb95crNYvX3Qhkx4k6Sqe2GjOf1u4nxxswMfdjyXfTM="; + services.xserver.enable = true; + environment.systemPackages = [ + pkgs.e57inspector + ]; }; - in - '' + enableOCR = true; + + testScript = '' start_all() machine.wait_for_x() machine.execute("e57inspector ${testFile} >&2 &") - machine.wait_until_succeeds("xdotool search --pid $(pidof .e57inspector-wrapped)") - machine.screenshot("screen") + machine.wait_for_text("File") # menu visible + + machine.screenshot("screen.png") ''; + }; +in +{ + vm = vmTest; + + screenshot-analysis = pkgs.callPackage ./vlm-screenshot-question.nix { + name = "e57inspector-screenshot-analysis"; + screenshot = "${vmTest}/screen.png"; + question = '' + Look at this screenshot of a desktop application. + Answer: Does the application show that a file was loaded into it successfully? + For this, only scans matter, as there are no images in the file. + The inspector on the left should show child elements below 'Data 3D'. + ''; + }; } diff --git a/nixos/tests/ec2-image.nix b/nixos/tests/ec2-image.nix index b54b153bd52e..b711ceadc2d5 100644 --- a/nixos/tests/ec2-image.nix +++ b/nixos/tests/ec2-image.nix @@ -88,294 +88,308 @@ in }; }; - testScript = '' - import os - import re - import subprocess - import tempfile + testScript = + { nodes, ... }: + '' + import os + import re + import subprocess + import tempfile - # Instance Metadata Service (IMDSv2 with 1.0 metadata version) - # TODO: Use 'latest' metadata version instead of '1.0' - # TODO: [Test matrix] also test providing the host key through IMDS - # - i.e. a test module argument to select between writing or reading the host key - def create_ec2_metadata_dir(temp_dir, client_pubkey): - """Create fake EC2 metadata directory structure with mock data""" - metadata_dir = os.path.join(temp_dir.name, "ec2-metadata") + # Instance Metadata Service (IMDSv2 with 1.0 metadata version) + # TODO: Use 'latest' metadata version instead of '1.0' + # TODO: [Test matrix] also test providing the host key through IMDS + # - i.e. a test module argument to select between writing or reading the host key + def create_ec2_metadata_dir(temp_dir, client_pubkey): + """Create fake EC2 metadata directory structure with mock data""" + metadata_dir = os.path.join(temp_dir.name, "ec2-metadata") - # Create directory structure - os.makedirs(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0"), exist_ok=True) - os.makedirs(os.path.join(metadata_dir, "latest", "api"), exist_ok=True) + # Create directory structure + os.makedirs(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0"), exist_ok=True) + os.makedirs(os.path.join(metadata_dir, "latest", "api"), exist_ok=True) - # Metadata version 1.0 endpoints (what fetch-ec2-metadata.sh actually fetches) - with open(os.path.join(metadata_dir, "1.0", "meta-data", "hostname"), "w") as f: - f.write("test-instance") - with open(os.path.join(metadata_dir, "1.0", "meta-data", "ami-manifest-path"), "w") as f: - f.write("(test)") - with open(os.path.join(metadata_dir, "1.0", "meta-data", "instance-id"), "w") as f: - f.write("i-1234567890abcdef0") - with open(os.path.join(metadata_dir, "1.0", "user-data"), "w") as f: - f.write("") - with open(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0", "openssh-key"), "w") as f: - f.write(client_pubkey) + # Metadata version 1.0 endpoints (what fetch-ec2-metadata.sh actually fetches) + with open(os.path.join(metadata_dir, "1.0", "meta-data", "hostname"), "w") as f: + f.write("test-instance") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "ami-manifest-path"), "w") as f: + f.write("(test)") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "instance-id"), "w") as f: + f.write("i-1234567890abcdef0") + with open(os.path.join(metadata_dir, "1.0", "user-data"), "w") as f: + f.write("") + with open(os.path.join(metadata_dir, "1.0", "meta-data", "public-keys", "0", "openssh-key"), "w") as f: + f.write(client_pubkey) - # IMDSv2 token endpoint - return a fake token - with open(os.path.join(metadata_dir, "latest", "api", "token"), "w") as f: - f.write("test-token-12345") + # IMDSv2 token endpoint - return a fake token + with open(os.path.join(metadata_dir, "latest", "api", "token"), "w") as f: + f.write("test-token-12345") - return metadata_dir + return metadata_dir - def generate_client_ssh_key(): - """Generate SSH key pair on VM host for client authentication""" - # Use temporary directory for key generation - import tempfile - with tempfile.TemporaryDirectory() as key_dir: - private_key = os.path.join(key_dir, "id_ed25519") - public_key = os.path.join(key_dir, "id_ed25519.pub") + def generate_client_ssh_key(): + """Generate SSH key pair on VM host for client authentication""" + # Use temporary directory for key generation + import tempfile + with tempfile.TemporaryDirectory() as key_dir: + private_key = os.path.join(key_dir, "id_ed25519") + public_key = os.path.join(key_dir, "id_ed25519.pub") - # Generate key pair using host SSH tools - ret = os.system(f"${hostPkgs.openssh}/bin/ssh-keygen -t ed25519 -f {private_key} -N \"\"") - if ret != 0: - raise Exception("Failed to generate SSH key pair") + # Generate key pair using host SSH tools + ret = subprocess.run( + [ + "${hostPkgs.openssh}/bin/ssh-keygen", + "-t", + "ed25519", + "-f", + private_key, + "-N", + "" + ] + ).returncode + if ret != 0: + raise Exception("Failed to generate SSH key pair") - # Read the generated public key - with open(public_key, "r") as f: - client_pubkey = f.read().strip() + # Read the generated public key + with open(public_key, "r") as f: + client_pubkey = f.read().strip() - # Read the private key - with open(private_key, "r") as f: - client_private_key = f.read() + # Read the private key + with open(private_key, "r") as f: + client_private_key = f.read() - return client_pubkey, client_private_key + return client_pubkey, client_private_key - def setup_client_ssh_key(client, client_private_key): - """Install the pre-generated SSH private key on client""" - client.succeed("mkdir -p /root/.ssh") - client.succeed(f"cat > /root/.ssh/id_ed25519 << 'EOF'\n{client_private_key}\nEOF") - client.succeed("chmod 600 /root/.ssh/id_ed25519") + def setup_client_ssh_key(client, client_private_key): + """Install the pre-generated SSH private key on client""" + client.succeed("mkdir -p /root/.ssh") + client.succeed(f"cat > /root/.ssh/id_ed25519 << 'EOF'\n{client_private_key}\nEOF") + client.succeed("chmod 600 /root/.ssh/id_ed25519") - def setup_machine(temp_dir, client_pubkey): - """Initialize EC2 machine with disk image, metadata server, and networking""" - # Set up disk image - image_dir = os.path.join( - os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" - ) - os.makedirs(image_dir, mode=0o700, exist_ok=True) - disk_image = os.path.join(image_dir, "machine.qcow2") - subprocess.check_call([ - "qemu-img", "create", "-f", "qcow2", "-F", "qcow2", - "-o", "backing_file=${image}", disk_image - ]) - subprocess.check_call(["qemu-img", "resize", disk_image, "10G"]) + def setup_machine(temp_dir, client_pubkey): + """Initialize EC2 machine with disk image, metadata server, and networking""" + # Set up disk image + image_dir = os.path.join( + os.environ.get("TMPDIR", tempfile.gettempdir()), "tmp", "vm-state-machine" + ) + os.makedirs(image_dir, mode=0o700, exist_ok=True) + disk_image = os.path.join(image_dir, "machine.qcow2") + QEMU = "${nodes.machine.virtualisation.qemu.package}" + QEMU_IMG = f"{QEMU}/bin/qemu-img" + subprocess.check_call([ + QEMU_IMG, "create", "-f", "qcow2", "-F", "qcow2", + "-o", "backing_file=${image}", disk_image + ]) + subprocess.check_call([QEMU_IMG, "resize", disk_image, "10G"]) - # Create fake EC2 metadata in temporary directory with client's public key - metadata_dir = create_ec2_metadata_dir(temp_dir, client_pubkey) + # Create fake EC2 metadata in temporary directory with client's public key + metadata_dir = create_ec2_metadata_dir(temp_dir, client_pubkey) - # Add both VLAN networking (matching test framework) and EC2 metadata server - vlan_net = ( - " -device virtio-net-pci,netdev=vlan1,mac=52:54:00:12:01:02" - + ' -netdev vde,id=vlan1,sock="$QEMU_VDE_SOCKET_1"' - ) - metadata_net = ( - " -device virtio-net-pci,netdev=ec2meta" - + f" -netdev 'user,id=ec2meta,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${lib.getExe imdsServer} {metadata_dir}'" - ) + # Add both VLAN networking (matching test framework) and EC2 metadata server + vlan_net = ( + " -device virtio-net-pci,netdev=vlan1,mac=52:54:00:12:01:02" + + ' -netdev vde,id=vlan1,sock="$QEMU_VDE_SOCKET_1"' + ) + metadata_net = ( + " -device virtio-net-pci,netdev=ec2meta" + + f" -netdev 'user,id=ec2meta,net=169.0.0.0/8,guestfwd=tcp:169.254.169.254:80-cmd:${lib.getExe imdsServer} {metadata_dir}'" + ) - start_command = ( - "qemu-kvm -m 1024" - + f" -drive file={disk_image},if=virtio,werror=report" - + vlan_net - + metadata_net - + " $QEMU_OPTS" - ) + start_command = ( + f"{QEMU}/bin/qemu-kvm -m 1024" + + f" -drive file={disk_image},if=virtio,werror=report" + + vlan_net + + metadata_net + + " $QEMU_OPTS" + ) - return create_machine(start_command), metadata_dir + return create_machine(start_command), metadata_dir - def test_userdata_decompression(machine, user_data_path, compressed_data, format_name): - """Test that compressed user-data is decompressed by fetch-ec2-metadata""" - test_marker = f"{format_name}-decompression-test" - with open(user_data_path, "wb") as f: - f.write(compressed_data) - machine.succeed("systemctl reset-failed fetch-ec2-metadata; systemctl restart fetch-ec2-metadata") - result = machine.succeed("cat /etc/ec2-metadata/user-data") - assert test_marker in result, f"Expected '{test_marker}' in decompressed {format_name} content, got: {result}" - journal = machine.succeed("journalctl -u fetch-ec2-metadata --no-pager -b") - assert "decompressing:" in journal, f"Expected decompression log in journal for {format_name}" + def test_userdata_decompression(machine, user_data_path, compressed_data, format_name): + """Test that compressed user-data is decompressed by fetch-ec2-metadata""" + test_marker = f"{format_name}-decompression-test" + with open(user_data_path, "wb") as f: + f.write(compressed_data) + machine.succeed("systemctl reset-failed fetch-ec2-metadata; systemctl restart fetch-ec2-metadata") + result = machine.succeed("cat /etc/ec2-metadata/user-data") + assert test_marker in result, f"Expected '{test_marker}' in decompressed {format_name} content, got: {result}" + journal = machine.succeed("journalctl -u fetch-ec2-metadata --no-pager -b") + assert "decompressing:" in journal, f"Expected decompression log in journal for {format_name}" - # Create temporary directory for metadata (scoped for cleanup) - temp_dir = tempfile.TemporaryDirectory() + # Create temporary directory for metadata (scoped for cleanup) + temp_dir = tempfile.TemporaryDirectory() - # Start client first (but don't wait for it to boot) - client.start() + # Start client first (but don't wait for it to boot) + client.start() - # Generate SSH key pair on VM host before starting machine - client_pubkey, client_private_key = generate_client_ssh_key() + # Generate SSH key pair on VM host before starting machine + client_pubkey, client_private_key = generate_client_ssh_key() - # Set up machine with client's public key in metadata service - machine, metadata_dir = setup_machine(temp_dir, client_pubkey) - user_data_path = os.path.join(metadata_dir, "1.0", "user-data") + # Set up machine with client's public key in metadata service + machine, metadata_dir = setup_machine(temp_dir, client_pubkey) + user_data_path = os.path.join(metadata_dir, "1.0", "user-data") - try: - machine.start() + try: + machine.start() - # Wait for services to be ready - machine.wait_for_unit("sshd.service") - machine.wait_for_unit("print-host-key.service") - machine.wait_for_unit("apply-ec2-data.service") + # Wait for services to be ready + machine.wait_for_unit("sshd.service") + machine.wait_for_unit("print-host-key.service") + machine.wait_for_unit("apply-ec2-data.service") - # Extract shared variables outside subtests - machine_ip = "${config.nodes.machine.networking.primaryIPAddress}" + # Extract shared variables outside subtests + machine_ip = "${config.nodes.machine.networking.primaryIPAddress}" - with subtest("EC2 metadata service connectivity"): - # Obtain an IMDSv2 token, then use it to fetch metadata - imds_token = machine.succeed( - "curl -sf -X PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 600'" - " http://169.254.169.254/latest/api/token" - ).strip() - assert imds_token, "Failed to obtain IMDSv2 token" - hostname_response = machine.succeed( - f"curl -sf -H 'X-aws-ec2-metadata-token: {imds_token}'" - " http://169.254.169.254/1.0/meta-data/hostname" - ) - assert "test-instance" in hostname_response, f"Expected 'test-instance', got: {hostname_response}" + with subtest("EC2 metadata service connectivity"): + # Obtain an IMDSv2 token, then use it to fetch metadata + imds_token = machine.succeed( + "curl -sf -X PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 600'" + " http://169.254.169.254/latest/api/token" + ).strip() + assert imds_token, "Failed to obtain IMDSv2 token" + hostname_response = machine.succeed( + f"curl -sf -H 'X-aws-ec2-metadata-token: {imds_token}'" + " http://169.254.169.254/1.0/meta-data/hostname" + ) + assert "test-instance" in hostname_response, f"Expected 'test-instance', got: {hostname_response}" - with subtest("SSH host key extraction from console"): - console_log = machine.get_console_log() - assert "-----BEGIN SSH HOST KEY FINGERPRINTS-----" in console_log - assert "-----END SSH HOST KEY FINGERPRINTS-----" in console_log - assert "-----BEGIN SSH HOST KEY KEYS-----" in console_log - assert "-----END SSH HOST KEY KEYS-----" in console_log + with subtest("SSH host key extraction from console"): + console_log = machine.get_console_log() + assert "-----BEGIN SSH HOST KEY FINGERPRINTS-----" in console_log + assert "-----END SSH HOST KEY FINGERPRINTS-----" in console_log + assert "-----BEGIN SSH HOST KEY KEYS-----" in console_log + assert "-----END SSH HOST KEY KEYS-----" in console_log - keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" - keys_match = re.search(keys_pattern, console_log, re.DOTALL) - assert keys_match, "Could not find SSH host keys section" - keys_content = keys_match.group(1).strip() - assert "ssh-" in keys_content, "SSH keys should contain ssh- prefix" + keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" + keys_match = re.search(keys_pattern, console_log, re.DOTALL) + assert keys_match, "Could not find SSH host keys section" + keys_content = keys_match.group(1).strip() + assert "ssh-" in keys_content, "SSH keys should contain ssh- prefix" - with subtest("Network connectivity"): - client.succeed(f"ping -c 1 {machine_ip}") + with subtest("Network connectivity"): + client.succeed(f"ping -c 1 {machine_ip}") - with subtest("SSH connectivity with strict host key checking"): - # Install the pre-generated private key on client - setup_client_ssh_key(client, client_private_key) + with subtest("SSH connectivity with strict host key checking"): + # Install the pre-generated private key on client + setup_client_ssh_key(client, client_private_key) - # Get console log and extract host keys - console_log = machine.get_console_log() - keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" - keys_match = re.search(keys_pattern, console_log, re.DOTALL) - assert keys_match, "Could not find SSH host keys section" + # Get console log and extract host keys + console_log = machine.get_console_log() + keys_pattern = r"-----BEGIN SSH HOST KEY KEYS-----(.*?)-----END SSH HOST KEY KEYS-----" + keys_match = re.search(keys_pattern, console_log, re.DOTALL) + assert keys_match, "Could not find SSH host keys section" - # Create known_hosts file from console-extracted host keys - keys_content = keys_match.group(1).strip() - known_hosts_entries = [] - for line in keys_content.split('\n'): - if line.strip() and line.startswith('ssh-'): - known_hosts_entries.append(f"{machine_ip} {line.strip()}") + # Create known_hosts file from console-extracted host keys + keys_content = keys_match.group(1).strip() + known_hosts_entries = [] + for line in keys_content.split('\n'): + if line.strip() and line.startswith('ssh-'): + known_hosts_entries.append(f"{machine_ip} {line.strip()}") - assert known_hosts_entries, "No SSH host keys found for known_hosts generation" + assert known_hosts_entries, "No SSH host keys found for known_hosts generation" - known_hosts_content = '\n'.join(known_hosts_entries) - client.succeed(f"cat > /root/.ssh/known_hosts << 'EOF'\n{known_hosts_content}\nEOF") + known_hosts_content = '\n'.join(known_hosts_entries) + client.succeed(f"cat > /root/.ssh/known_hosts << 'EOF'\n{known_hosts_content}\nEOF") - # Test SSH connectivity with strict host key checking - ssh_result = client.succeed(f"ssh -o ConnectTimeout=60 -o BatchMode=yes -i /root/.ssh/id_ed25519 root@{machine_ip} 'echo Hello from $(hostname)'") - assert "Hello from test-instance" in ssh_result, f"Unexpected SSH result: {ssh_result}" + # Test SSH connectivity with strict host key checking + ssh_result = client.succeed(f"ssh -o ConnectTimeout=60 -o BatchMode=yes -i /root/.ssh/id_ed25519 root@{machine_ip} 'echo Hello from $(hostname)'") + assert "Hello from test-instance" in ssh_result, f"Unexpected SSH result: {ssh_result}" - with subtest("Basic EC2 functionality"): - machine.succeed("findmnt / -o SIZE -n | grep -E '[0-9]+G'") + with subtest("Basic EC2 functionality"): + machine.succeed("findmnt / -o SIZE -n | grep -E '[0-9]+G'") - with subtest("Decompression of gzip-compressed user-data"): - import gzip as gzip_mod - test_data = b"#!/bin/bash\necho gzip-decompression-test\n" - test_userdata_decompression(machine, user_data_path, gzip_mod.compress(test_data), "gzip") + with subtest("Decompression of gzip-compressed user-data"): + import gzip as gzip_mod + test_data = b"#!/bin/bash\necho gzip-decompression-test\n" + test_userdata_decompression(machine, user_data_path, gzip_mod.compress(test_data), "gzip") - with subtest("Decompression of bzip2-compressed user-data"): - import bz2 - test_data = b"#!/bin/bash\necho bzip2-decompression-test\n" - test_userdata_decompression(machine, user_data_path, bz2.compress(test_data), "bzip2") + with subtest("Decompression of bzip2-compressed user-data"): + import bz2 + test_data = b"#!/bin/bash\necho bzip2-decompression-test\n" + test_userdata_decompression(machine, user_data_path, bz2.compress(test_data), "bzip2") - with subtest("Decompression of xz-compressed user-data"): - import lzma - test_data = b"#!/bin/bash\necho xz-decompression-test\n" - test_userdata_decompression(machine, user_data_path, lzma.compress(test_data), "xz") + with subtest("Decompression of xz-compressed user-data"): + import lzma + test_data = b"#!/bin/bash\necho xz-decompression-test\n" + test_userdata_decompression(machine, user_data_path, lzma.compress(test_data), "xz") - with subtest("Decompression of zstd-compressed user-data"): - test_data = b"#!/bin/bash\necho zstd-decompression-test\n" - proc = subprocess.run( - ["${hostPkgs.zstd}/bin/zstd", "-c"], - input=test_data, capture_output=True, check=True, - ) - test_userdata_decompression(machine, user_data_path, proc.stdout, "zstd") + with subtest("Decompression of zstd-compressed user-data"): + test_data = b"#!/bin/bash\necho zstd-decompression-test\n" + proc = subprocess.run( + ["${hostPkgs.zstd}/bin/zstd", "-c"], + input=test_data, capture_output=True, check=True, + ) + test_userdata_decompression(machine, user_data_path, proc.stdout, "zstd") - with subtest("Decompression of lzip-compressed user-data"): - test_data = b"#!/bin/bash\necho lzip-decompression-test\n" - proc = subprocess.run( - ["${hostPkgs.lzip}/bin/lzip", "-c"], - input=test_data, capture_output=True, check=True, - ) - test_userdata_decompression(machine, user_data_path, proc.stdout, "lzip") + with subtest("Decompression of lzip-compressed user-data"): + test_data = b"#!/bin/bash\necho lzip-decompression-test\n" + proc = subprocess.run( + ["${hostPkgs.lzip}/bin/lzip", "-c"], + input=test_data, capture_output=True, check=True, + ) + test_userdata_decompression(machine, user_data_path, proc.stdout, "lzip") - with subtest("IPv6 IMDS fallback"): - # Save hostname fetched via IPv4 for later comparison - original_hostname = machine.succeed("cat /etc/ec2-metadata/hostname").strip() + with subtest("IPv6 IMDS fallback"): + # Save hostname fetched via IPv4 for later comparison + original_hostname = machine.succeed("cat /etc/ec2-metadata/hostname").strip() - # Assign the EC2 IPv6 IMDS address to loopback - machine.succeed("ip -6 addr add fd00:ec2::254/128 dev lo") + # Assign the EC2 IPv6 IMDS address to loopback + machine.succeed("ip -6 addr add fd00:ec2::254/128 dev lo") - # Create metadata directory structure for the IPv6 endpoint - machine.succeed( - "mkdir -p /tmp/ipv6-metadata/1.0/meta-data/public-keys/0" - " && mkdir -p /tmp/ipv6-metadata/latest/api" - " && cp /etc/ec2-metadata/hostname /tmp/ipv6-metadata/1.0/meta-data/hostname" - " && cp /etc/ec2-metadata/ami-manifest-path /tmp/ipv6-metadata/1.0/meta-data/ami-manifest-path" - " && echo i-1234567890abcdef0 > /tmp/ipv6-metadata/1.0/meta-data/instance-id" - " && echo ipv6-test-token > /tmp/ipv6-metadata/latest/api/token" - " && touch /tmp/ipv6-metadata/1.0/user-data" - ) - machine.execute( - "test -f /etc/ec2-metadata/public-keys-0-openssh-key" - " && cp /etc/ec2-metadata/public-keys-0-openssh-key" - " /tmp/ipv6-metadata/1.0/meta-data/public-keys/0/openssh-key" - ) + # Create metadata directory structure for the IPv6 endpoint + machine.succeed( + "mkdir -p /tmp/ipv6-metadata/1.0/meta-data/public-keys/0" + " && mkdir -p /tmp/ipv6-metadata/latest/api" + " && cp /etc/ec2-metadata/hostname /tmp/ipv6-metadata/1.0/meta-data/hostname" + " && cp /etc/ec2-metadata/ami-manifest-path /tmp/ipv6-metadata/1.0/meta-data/ami-manifest-path" + " && echo i-1234567890abcdef0 > /tmp/ipv6-metadata/1.0/meta-data/instance-id" + " && echo ipv6-test-token > /tmp/ipv6-metadata/latest/api/token" + " && touch /tmp/ipv6-metadata/1.0/user-data" + ) + machine.execute( + "test -f /etc/ec2-metadata/public-keys-0-openssh-key" + " && cp /etc/ec2-metadata/public-keys-0-openssh-key" + " /tmp/ipv6-metadata/1.0/meta-data/public-keys/0/openssh-key" + ) - # Serve metadata on the IPv6 IMDS address via socat + imds-server (inetd-style) - machine.succeed( - "systemd-run --unit=ipv6-imds --" - " socat TCP6-LISTEN:80,bind=[fd00:ec2::254],fork,reuseaddr" - " SYSTEM:'${lib.getExe imdsServer} /tmp/ipv6-metadata'" - ) + # Serve metadata on the IPv6 IMDS address via socat + imds-server (inetd-style) + machine.succeed( + "systemd-run --unit=ipv6-imds --" + " socat TCP6-LISTEN:80,bind=[fd00:ec2::254],fork,reuseaddr" + " SYSTEM:'${lib.getExe imdsServer} /tmp/ipv6-metadata'" + ) - # Wait for IPv6 IMDS to become reachable (token endpoint doesn't require auth) - machine.wait_until_succeeds( - "curl -sf -X PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 600'" - " http://[fd00:ec2::254]/latest/api/token" - ) + # Wait for IPv6 IMDS to become reachable (token endpoint doesn't require auth) + machine.wait_until_succeeds( + "curl -sf -X PUT -H 'X-aws-ec2-metadata-token-ttl-seconds: 600'" + " http://[fd00:ec2::254]/latest/api/token" + ) - # Block IPv4 IMDS to force fallback to IPv6 - machine.succeed( - "iptables -I OUTPUT -d 169.254.169.254 -p tcp --dport 80 -j REJECT" - ) + # Block IPv4 IMDS to force fallback to IPv6 + machine.succeed( + "iptables -I OUTPUT -d 169.254.169.254 -p tcp --dport 80 -j REJECT" + ) - # Verify IPv4 IMDS is now unreachable - machine.fail( - "curl -sf --connect-timeout 2 http://169.254.169.254/1.0/meta-data/hostname" - ) + # Verify IPv4 IMDS is now unreachable + machine.fail( + "curl -sf --connect-timeout 2 http://169.254.169.254/1.0/meta-data/hostname" + ) - # Clear fetched metadata and re-run the fetcher - machine.succeed("rm -f /etc/ec2-metadata/*") - machine.succeed("systemctl restart fetch-ec2-metadata") + # Clear fetched metadata and re-run the fetcher + machine.succeed("rm -f /etc/ec2-metadata/*") + machine.succeed("systemctl restart fetch-ec2-metadata") - # Verify metadata was successfully re-fetched via IPv6 - hostname = machine.succeed("cat /etc/ec2-metadata/hostname").strip() - assert hostname == original_hostname, f"Expected '{original_hostname}', got '{hostname}'" + # Verify metadata was successfully re-fetched via IPv6 + hostname = machine.succeed("cat /etc/ec2-metadata/hostname").strip() + assert hostname == original_hostname, f"Expected '{original_hostname}', got '{hostname}'" - # Clean up: restore IPv4 IMDS access - machine.succeed( - "iptables -D OUTPUT -d 169.254.169.254 -p tcp --dport 80 -j REJECT" - ) - machine.succeed("systemctl stop ipv6-imds") + # Clean up: restore IPv4 IMDS access + machine.succeed( + "iptables -D OUTPUT -d 169.254.169.254 -p tcp --dport 80 -j REJECT" + ) + machine.succeed("systemctl stop ipv6-imds") - finally: - machine.shutdown() - temp_dir.cleanup() - ''; + finally: + machine.shutdown() + temp_dir.cleanup() + ''; } diff --git a/nixos/tests/endlessh-go.nix b/nixos/tests/endlessh-go.nix index 892d54af6101..f897b563b976 100644 --- a/nixos/tests/endlessh-go.nix +++ b/nixos/tests/endlessh-go.nix @@ -1,7 +1,7 @@ { lib, pkgs, ... }: { name = "endlessh-go"; - meta.maintainers = with lib.maintainers; [ azahi ]; + meta.maintainers = [ ]; nodes = { server = diff --git a/nixos/tests/enlightenment.nix b/nixos/tests/enlightenment.nix index 41dfc754e7fe..e5e6589976f6 100644 --- a/nixos/tests/enlightenment.nix +++ b/nixos/tests/enlightenment.nix @@ -33,7 +33,7 @@ testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' with subtest("Ensure x starts"): diff --git a/nixos/tests/etcd/default.nix b/nixos/tests/etcd/default.nix index 96add9670a95..16e605550136 100644 --- a/nixos/tests/etcd/default.nix +++ b/nixos/tests/etcd/default.nix @@ -22,16 +22,11 @@ let } (import path etcdPkgs) ); testEtcdPkg = pkg: path: testEtcd path { etcd = pkg; }; - testEtcd_3_4 = testEtcdPkg pkgs.etcd_3_4; testEtcd_3_5 = testEtcdPkg pkgs.etcd_3_5; testEtcd_3_6 = testEtcdPkg pkgs.etcd_3_6; in { - "3_4" = { - multi-node = testEtcd_3_4 ./multi-node.nix; - single-node = testEtcd_3_4 ./single-node.nix; - }; "3_5" = { multi-node = testEtcd_3_5 ./multi-node.nix; single-node = testEtcd_3_5 ./single-node.nix; diff --git a/nixos/tests/extra-initrd.nix b/nixos/tests/extra-initrd.nix new file mode 100644 index 000000000000..20da3ad8d11b --- /dev/null +++ b/nixos/tests/extra-initrd.nix @@ -0,0 +1,96 @@ +{ + runTest, + ... +}: +let + common = + { config, pkgs, ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + system.boot.extraInitrd.paths = [ + extraInitrdPath + ]; + + boot.loader.timeout = 2; + + boot.initrd.systemd.mounts = [ + { + what = "/canary.txt"; + where = "/sysroot/run/canary.txt"; + type = "none"; + options = "bind"; + unitConfig = { + DefaultDependencies = false; + }; + requiredBy = [ "initrd-fs.target" ]; + before = [ "initrd-fs.target" ]; + } + ]; + }; + + extraInitrdPath = "custom.cpio"; + canaryCpio = + pkgs: + pkgs.runCommand "canary.cpio" + { + nativeBuildInputs = [ pkgs.cpio ]; + } + '' + echo canary > canary.txt + find . -print0 | cpio --null -o --format=newc > $out + ''; + + testScript = + # python + '' + machine.wait_for_unit("multi-user.target") + + # Check that the extra cpio archive is on the ESP + machine.succeed("test -e /boot/custom.cpio") + + # Check that the initrd that we booted with contained the file from + # the extra initrd and our initrd mount unit bound it into sysroot + assert machine.succeed("cat /run/canary.txt").strip() == "canary" + ''; +in +{ + systemd-boot = runTest ( + { pkgs, ... }: { + name = "systemd-boot-extra-initrd"; + + nodes.machine = { config, ... }: { + imports = [ common ]; + + boot.loader.systemd-boot = { + enable = true; + extraInstallCommands = '' + cp ${canaryCpio pkgs} ${config.boot.loader.efi.efiSysMountPoint}/${extraInitrdPath} + ''; + }; + }; + + inherit testScript; + } + ); + + limine = runTest { + name = "limine-extra-initrd"; + + nodes.machine = { pkgs, config, ... }: { + imports = [ common ]; + + boot.loader.limine = { + enable = true; + efiSupport = true; + enableEditor = true; + extraInstallCommands = '' + cp ${canaryCpio pkgs} ${config.boot.loader.efi.efiSysMountPoint}/${extraInitrdPath} + ''; + }; + + }; + + inherit testScript; + }; +} diff --git a/nixos/tests/flarum.nix b/nixos/tests/flarum.nix new file mode 100644 index 000000000000..cbebe29c0c3c --- /dev/null +++ b/nixos/tests/flarum.nix @@ -0,0 +1,73 @@ +{ lib, ... }: +{ + name = "flarum"; + + meta = { + maintainers = with lib.maintainers; [ + fsagbuya + jasonodoom + ]; + }; + + nodes.machine = + { pkgs, ... }: + { + # Flarum installs and migrates the database on first boot and runs a + # MariaDB server alongside PHP-FPM and nginx, so give the VM some headroom. + virtualisation.memorySize = 2048; + + services.flarum = { + enable = true; + forumTitle = "NixOS Flarum Test Forum"; + domain = "localhost"; + baseUrl = "http://localhost"; + + # Run `flarum install` against the locally provisioned MariaDB. Safe here + # because the VM always starts from a fresh, empty database. + createDatabaseLocally = true; + + adminUser = "admin"; + adminEmail = "admin@example.com"; + # The trailing newline matches how secret managers typically write files. + initialAdminPasswordFile = "${pkgs.writeText "admin-pass" "flarum-admin-password\n"}"; + # MariaDB authenticates via unix socket and never checks this password; + # setting it still exercises the substitution path. + databasePasswordFile = "${pkgs.writeText "db-pass" "flarum-db-password\n"}"; + }; + }; + + testScript = '' + start_all() + + # PHP-FPM is ordered after the oneshot installer (Type=oneshot, no + # RemainAfterExit), so waiting on it implies the install/migrate finished. + machine.wait_for_unit("phpfpm-flarum.service") + machine.wait_for_unit("nginx.service") + machine.wait_for_open_port(80) + + # The forum front page is server-rendered and embeds the configured title. + machine.wait_until_succeeds("curl -sf http://localhost/ -o /dev/null") + machine.succeed("curl -sf http://localhost/ | grep -F 'NixOS Flarum Test Forum'") + + # The admin API endpoint should respond, confirming the app booted cleanly. + machine.succeed("curl -sf http://localhost/api -o /dev/null") + + # Only the placeholders may appear in the install config in the Nix store. + machine.succeed("grep -q '@adminPassword@' /nix/store/*-config.json") + machine.succeed("grep -q '@databasePassword@' /nix/store/*-config.json") + machine.fail("grep -qe 'flarum-admin-password' -e 'flarum-db-password' /nix/store/*-config.json") + + # A successful login proves the admin password was substituted intact. + machine.succeed( + "curl -sf http://localhost/api/token " + + "-H 'Content-Type: application/json' " + + "-d '{\"identification\": \"admin\", \"password\": \"flarum-admin-password\"}' " + + "| grep -F token" + ) + + # The database password must arrive intact in config.php, which must + # not be world-readable. + machine.succeed("grep -q 'flarum-db-password' /var/lib/flarum/config.php") + machine.succeed("[ $(stat -c %a /var/lib/flarum/config.php) = 600 ]") + ''; +} diff --git a/nixos/tests/fontconfig-default-fonts.nix b/nixos/tests/fontconfig-default-fonts.nix index 4a46b3e17172..9e6becd5ed02 100644 --- a/nixos/tests/fontconfig-default-fonts.nix +++ b/nixos/tests/fontconfig-default-fonts.nix @@ -6,20 +6,19 @@ jtojnar ]; - nodes.machine = + containers.machine = { config, pkgs, ... }: { fonts.enableDefaultPackages = true; # Background fonts fonts.packages = with pkgs; [ noto-fonts-color-emoji - cantarell-fonts twitter-color-emoji source-code-pro gentium ]; fonts.fontconfig.defaultFonts = { serif = [ "Gentium" ]; - sansSerif = [ "Cantarell" ]; + sansSerif = [ "DejaVu Sans" ]; monospace = [ "Source Code Pro" ]; emoji = [ "Twitter Color Emoji" ]; }; @@ -27,7 +26,7 @@ testScript = '' machine.succeed("fc-match serif | grep '\"Gentium\"'") - machine.succeed("fc-match sans-serif | grep '\"Cantarell\"'") + machine.succeed("fc-match sans-serif | grep '\"DejaVu Sans\"'") machine.succeed("fc-match monospace | grep '\"Source Code Pro\"'") machine.succeed("fc-match emoji | grep '\"Twitter Color Emoji\"'") ''; diff --git a/nixos/tests/freescout/default.nix b/nixos/tests/freescout/default.nix new file mode 100644 index 000000000000..603f61131432 --- /dev/null +++ b/nixos/tests/freescout/default.nix @@ -0,0 +1,5 @@ +{ runTest }: +{ + integration = runTest ./integration.nix; + upgrade = runTest ./upgrade.nix; +} diff --git a/nixos/tests/freescout/integration.nix b/nixos/tests/freescout/integration.nix new file mode 100644 index 000000000000..57d28f032c3a --- /dev/null +++ b/nixos/tests/freescout/integration.nix @@ -0,0 +1,195 @@ +# This tests runs freescout and performs the following tests: +# - Create amin user via the CLI +# - Create mailbox, configured for sending and receiving +# - Test if receiving, sending and notifications work +{ pkgs, lib, ... }: + +let + mailDomain = "freemail.local"; + freescoutDomain = "freescout.local"; + sendInitial = pkgs.writeShellScriptBin "send-initial" '' + exec ${pkgs.dovecot}/libexec/dovecot/deliver -d freescout <&2") + + machine.wait_for_unit("nginx") + machine.wait_for_unit("freescout-setup") + + with subtest("Check new API version"): + machine.succeed("curl -fsSL --cookie-jar cjar --cookie cjar 'http://${freescoutDomain}/system/status' | grep ${newVersion}") + ''; +} diff --git a/nixos/tests/frp.nix b/nixos/tests/frp.nix index 48c4e2bc842c..00982a6e05bf 100644 --- a/nixos/tests/frp.nix +++ b/nixos/tests/frp.nix @@ -9,10 +9,14 @@ let name = "secrets"; text = "token=${token}"; }; + portRange = 6003; in { name = "frp"; - meta.maintainers = with lib.maintainers; [ zaldnoay ]; + meta.maintainers = with lib.maintainers; [ + zaldnoay + epireyn + ]; nodes = { frps = { networking = { @@ -56,14 +60,25 @@ in services.httpd = { enable = true; adminAddr = "admin@example.com"; - virtualHosts."test-appication" = + virtualHosts = let testdir = pkgs.writeTextDir "web/index.php" " {log_file} 2>&1 &") - machine.wait_until_succeeds(f"{curl_cmd} {base_url} 2>&1", timeout=60) + machine.wait_until_succeeds(f"{CURL_CMD} {BASE_URL_PKG} 2>&1", timeout=60) yield finally: # We need to wait a little bit to make sure the server is properly # shutdown before launching a new instance. machine.execute(f"{pkg}/bin/geoserver-shutdown; sleep 1") + @contextmanager + def running_geoserver_service(): + service_name = "geoserver" + try: + print(f"Launching service {service_name}...") + machine.execute(f"systemctl start {service_name} > tee {log_file} 2>&1") + machine.wait_until_succeeds(f"{CURL_CMD} {BASE_URL_SERVICE} 2>&1", timeout=60) + yield + finally: + # We need to wait a little bit to make sure the server is properly + # shutdown before launching a new instance. + machine.execute(f"systemctl stop {service_name}; sleep 1") + start_all() - with running_geoserver("${geoserver}"): - machine.succeed(f"{curl_cmd} {base_url}/ows?service=WMS&version=1.3.0&request=GetCapabilities") + with subtest("A standalone Geoserver installation without extensions can be started."): + with running_geoserver_pkg("${geoserver}"): + machine.succeed(f"{CURL_CMD} {BASE_URL_PKG}/ows?service=WMS&version=1.3.0&request=GetCapabilities") - # No extensions yet. - machine.fail(f"{curl_cmd_rest} {base_url}/rest/imports") - machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") + # No extensions yet. + machine.fail(f"{CURL_CMD_REST} {BASE_URL_PKG}/rest/imports") + machine.fail(f"{CURL_CMD_REST} {BASE_URL_PKG}/rest/monitor/requests.csv") + with subtest("A standalone Geoserver installation with numerous extensions can be started."): + with running_geoserver_pkg("${geoserverWithAllExtensions}"): + machine.succeed(f"{CURL_CMD_REST} {BASE_URL_PKG}/rest/imports") + machine.succeed(f"{CURL_CMD_REST} {BASE_URL_PKG}/rest/monitor/requests.csv") + _, stdout = machine.execute(f"cat {log_file}") + print(stdout.replace("\\n", "\n")) + assert "GDAL Native Library loaded" in stdout, "gdal" + assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf" + assert "Unable to load library 'netcdf'" not in stdout, "netcdf" - with running_geoserver("${geoserverWithImporterExtension}"): - machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports") - machine.fail(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") + # libjpeg-turbo is disabled as of 2.28.1. + # assert "The turbo jpeg encoder is available for usage" in stdout, "libjpeg-turbo" - with running_geoserver("${geoserverWithAllExtensions}"): - machine.succeed(f"{curl_cmd_rest} {base_url}/rest/imports") - machine.succeed(f"{curl_cmd_rest} {base_url}/rest/monitor/requests.csv") - _, stdout = machine.execute(f"cat {log_file}") - print(stdout.replace("\\n", "\n")) - assert "GDAL Native Library loaded" in stdout, "gdal" - assert "org.geotools.imageio.netcdf.utilities.NetCDFUtilities" in stdout, "netcdf" - assert "Unable to load library 'netcdf'" not in stdout, "netcdf" + with subtest("Geoserver can be run as a service. Some Extensions are available."): + with running_geoserver_service(): + # Only the importer extension is available. + machine.succeed(f"{CURL_CMD_REST} {BASE_URL_SERVICE}/rest/imports") + machine.fail(f"{CURL_CMD_REST} {BASE_URL_SERVICE}/rest/monitor/requests.csv") - # 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/ghostunnel-modular.nix b/nixos/tests/ghostunnel-modular.nix index bb4cef2a9f08..7fa301168a46 100644 --- a/nixos/tests/ghostunnel-modular.nix +++ b/nixos/tests/ghostunnel-modular.nix @@ -54,13 +54,13 @@ }; testScript = '' - import os + import subprocess # prepare certificates def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/ghostunnel.nix b/nixos/tests/ghostunnel.nix index acd9c4331835..58749591ffbc 100644 --- a/nixos/tests/ghostunnel.nix +++ b/nixos/tests/ghostunnel.nix @@ -48,13 +48,13 @@ }; testScript = '' - import os + import subprocess # prepare certificates def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/glusterfs.nix b/nixos/tests/glusterfs.nix index 9224797704e2..ac4c8e7024f7 100644 --- a/nixos/tests/glusterfs.nix +++ b/nixos/tests/glusterfs.nix @@ -49,6 +49,14 @@ in server1.wait_for_unit("glusterd.service") server2.wait_for_unit("glusterd.service") + # The glusterfind delete hook must be a real file, not the dangling + # symlink it used to be after being copied out of the package (#257863). + server1.succeed("test -f /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post") + server1.fail("test -L /var/lib/glusterd/hooks/1/delete/post/S57glusterfind-delete-post") + + # The volume option presets must be installed (#33159). + server1.succeed("test -f /var/lib/glusterd/groups/metadata-cache") + server1.wait_until_succeeds("gluster peer status") server2.wait_until_succeeds("gluster peer status") @@ -64,6 +72,9 @@ in server1.succeed("gluster volume create gv0 server1:/data/vg0 server2:/data/vg0") server1.succeed("gluster volume start gv0") + # Applying a group preset needs /var/lib/glusterd/groups populated (#33159). + server1.succeed("gluster volume set gv0 group metadata-cache") + # test clients client1.wait_for_unit("gluster.mount") client2.wait_for_unit("gluster.mount") diff --git a/nixos/tests/gnome-extensions.nix b/nixos/tests/gnome-extensions.nix index d3047abd39a6..ed94a2dbd19e 100644 --- a/nixos/tests/gnome-extensions.nix +++ b/nixos/tests/gnome-extensions.nix @@ -146,7 +146,7 @@ machine.succeed(f"${run "gnome-extensions enable {extension}"}") wait_time = 5 - while getState(extension) == "ACTIVATING" and (wait_time := wait_time - 1) > 0: + while "ACTIVATING" in getState(extension) and (wait_time := wait_time - 1) > 0: machine.log(f"Extension {extension} is still activating, waiting {wait_time} more seconds") machine.sleep(1) checkState("ACTIVE", extension) diff --git a/nixos/tests/gocron.nix b/nixos/tests/gocron.nix new file mode 100644 index 000000000000..2625dc474b53 --- /dev/null +++ b/nixos/tests/gocron.nix @@ -0,0 +1,58 @@ +{ pkgs, ... }: + +{ + name = "gocron"; + meta.maintainers = with pkgs.lib.maintainers; [ juliusfreudenberger ]; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.jq ]; + services.gocron = { + enable = true; + settings = { + jobs = [ + { + name = "Test job"; + disabled_cron = true; + commands = [ + "echo 'Job runs successfully'" + ]; + } + ]; + }; + }; + }; + + testScript = '' + def gocron_is_up(_) -> bool: + status, _ = machine.execute("curl --fail http://localhost:8156") + return status == 0 + + def job_is_available() -> bool: + status, output = machine.execute("curl http://localhost:8156/api/jobs | jq '. | length'") + return status == 0 and int(output) == 1 + + def start_job(): + machine.succeed("curl -X POST http://localhost:8156/api/jobs/Test%20job") + + def job_ran_successfully() -> bool: + output = machine.succeed("curl http://localhost:8156/api/runs/Test%20job | jq '.[0].status_id, .[0].logs.[2].message'") + split_output = output.split('\n') + ran_successfully = int(split_output[0]) == 3 + log_message_as_expected = "Job runs not successfully" in split_output[1] + return ran_successfully and log_message_as_expected + + machine.wait_for_unit("gocron.service") + machine.wait_for_open_port(8156) + with machine.nested("Waiting for UI to work"): + retry(gocron_is_up) + + with machine.nested("Test job"): + if not job_is_available(): + exit(1) + start_job() + if not job_ran_successfully(): + exit(1) + ''; +} diff --git a/nixos/tests/gocryptfs.nix b/nixos/tests/gocryptfs.nix index d0e5df5e40b5..763e1c1407fa 100644 --- a/nixos/tests/gocryptfs.nix +++ b/nixos/tests/gocryptfs.nix @@ -13,6 +13,8 @@ pkgs.openssl ]; + programs.fuse.enable = true; + specialisation.fstab-test.configuration = { # This can't be fileSytems, as the qemu machinery doesn't honor it. virtualisation.fileSystems."/plain" = { diff --git a/nixos/tests/grafana/basic.nix b/nixos/tests/grafana/basic.nix index eb024be44fa9..2221960135c5 100644 --- a/nixos/tests/grafana/basic.nix +++ b/nixos/tests/grafana/basic.nix @@ -84,7 +84,7 @@ import ../make-test-python.nix ( }; }; - nodes = builtins.mapAttrs ( + containers = builtins.mapAttrs ( _: val: mkMerge [ val @@ -97,7 +97,7 @@ import ../make-test-python.nix ( meta.maintainers = [ ]; - inherit nodes; + inherit containers; testScript = '' start_all() diff --git a/nixos/tests/grafana/provision/default.nix b/nixos/tests/grafana/provision/default.nix index 8fed76d5b282..9109aa58a99a 100644 --- a/nixos/tests/grafana/provision/default.nix +++ b/nixos/tests/grafana/provision/default.nix @@ -183,7 +183,7 @@ import ../../make-test-python.nix ( }; }; - nodes = builtins.mapAttrs ( + containers = builtins.mapAttrs ( _: val: mkMerge [ val @@ -196,7 +196,7 @@ import ../../make-test-python.nix ( meta.maintainers = [ ]; - inherit nodes; + inherit containers; testScript = '' start_all() diff --git a/nixos/tests/grub.nix b/nixos/tests/grub/basic.nix similarity index 100% rename from nixos/tests/grub.nix rename to nixos/tests/grub/basic.nix diff --git a/nixos/tests/grub/efi.nix b/nixos/tests/grub/efi.nix new file mode 100644 index 000000000000..953548bb24bb --- /dev/null +++ b/nixos/tests/grub/efi.nix @@ -0,0 +1,45 @@ +{ lib, ... }: +{ + name = "grub-efi"; + + meta = with lib.maintainers; { + maintainers = [ + tomfitzhenry + rnhmjoj + ]; + }; + + nodes.machine = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + + boot.loader.grub = { + enable = true; + efiSupport = true; + device = "nodev"; + + # Read GRUB from the serial console so its output can be matched + # deterministically with wait_for_console_text, rather than via OCR. + extraConfig = "serial; terminal_output serial"; + }; + boot.loader.efi.canTouchEfiVariables = true; + }; + + testScript = '' + machine.start() + + with subtest("Enters GRUB"): + machine.wait_for_console_text("GNU GRUB") + + with subtest("Loads kernel"): + machine.wait_for_console_text("Linux version") + + with subtest("Reaches multi-user target"): + machine.wait_for_unit("multi-user.target") + + with subtest("Boots via UEFI"): + machine.succeed("test -d /sys/firmware/efi") + ''; +} diff --git a/nixos/tests/grub/graphical.nix b/nixos/tests/grub/graphical.nix new file mode 100644 index 000000000000..54d25ce3d843 --- /dev/null +++ b/nixos/tests/grub/graphical.nix @@ -0,0 +1,57 @@ +{ lib, ... }: +{ + name = "grub-graphical"; + + meta = with lib.maintainers; { + maintainers = [ + tomfitzhenry + rnhmjoj + ]; + }; + + nodes.machine = + { pkgs, ... }: + let + # GRUB only draws a background image when it is in graphical gfxterm + # mode. Bake a marker string into the splash so the OCR check below can + # only succeed when gfxterm actually rendered it; a silent fallback to + # text mode would show the plain menu without this image (and its text). + # + # The image must be an 8-bit sRGB PNG, otherwise GRUB's png module fails + # to load it and silently falls back to its default (non-graphical) menu. + splash = pkgs.runCommand "grub-gfxterm-splash.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } '' + magick -size 1024x768 xc:'#2d2d2d' \ + -font ${pkgs.dejavu_fonts.minimal}/share/fonts/truetype/DejaVuSans.ttf \ + -gravity south -pointsize 48 -fill white \ + -annotate +0+150 'GFXTERMOK' \ + -depth 8 -type TrueColor PNG24:$out + ''; + in + { + virtualisation.useBootLoader = true; + + # Leave the menu up long enough for OCR to catch it; we boot early with a + # keypress once it has, so this does not slow the test down. + boot.loader.timeout = 30; + boot.loader.grub = { + enable = true; + splashImage = splash; + }; + }; + + enableOCR = true; + + testScript = '' + machine.start() + + with subtest("GRUB renders its menu graphically (gfxterm), showing the splash"): + # The marker text lives inside the background image, so reading it back + # proves GRUB displayed the image rather than falling back to text mode. + machine.wait_for_text("GFXTERMOK") + machine.screenshot("grub_gfxterm") + + with subtest("Machine boots into NixOS from GRUB"): + machine.send_key("ret") + machine.wait_for_unit("multi-user.target") + ''; +} diff --git a/nixos/tests/grub/hashed-password.nix b/nixos/tests/grub/hashed-password.nix new file mode 100644 index 000000000000..191468f8b69a --- /dev/null +++ b/nixos/tests/grub/hashed-password.nix @@ -0,0 +1,77 @@ +{ lib, ... }: +{ + name = "grub-hashed-password"; + + meta = with lib.maintainers; { + maintainers = [ + tomfitzhenry + rnhmjoj + ]; + }; + + nodes.machine = + { pkgs, ... }: + let + mkGrubPbkdf2HashFile = + password: + toString ( + pkgs.runCommandLocal "grub-pbkdf2-hash" { nativeBuildInputs = [ pkgs.grub2 ]; } '' + printf "%s\n%s\n" "${password}" "${password}" | grub-mkpasswd-pbkdf2 | grep -o 'grub\.pbkdf2\.[^[:space:]]*' > $out + '' + ); + in + { + virtualisation.useBootLoader = true; + + boot.loader.timeout = null; + boot.loader.grub = { + enable = true; + users.bob.hashedPasswordFile = mkGrubPbkdf2HashFile "bobsecret"; + + # Read GRUB from the serial console so its output can be matched + # deterministically; OCR would work but is flakier, which matters for + # the multi-step interactive login exercised below. + extraConfig = "serial; terminal_output serial"; + }; + }; + + testScript = '' + def grub_login_as(user, password): + """ + Enters user and password to log into GRUB + """ + machine.wait_for_console_text("Enter username:") + machine.send_chars(user + "\n") + machine.wait_for_console_text("Enter password:") + machine.send_chars(password + "\n") + + + def grub_select_all_configurations(): + """ + Selects "All configurations" from the GRUB menu + to trigger a login request. + """ + machine.send_monitor_command("sendkey down") + machine.send_monitor_command("sendkey ret") + + + machine.start() + + # wait for grub screen + machine.wait_for_console_text("GNU GRUB") + + grub_select_all_configurations() + with subtest("Invalid hashedPassword credentials are rejected"): + grub_login_as("bob", "wrongsecret") + machine.wait_for_console_text("access denied") + + grub_select_all_configurations() + with subtest("Valid hashedPassword credentials are accepted"): + grub_login_as("bob", "bobsecret") + machine.send_chars("\n") # press enter to boot + machine.wait_for_console_text("Linux version") + + with subtest("Machine boots correctly"): + machine.wait_for_unit("multi-user.target") + ''; +} diff --git a/nixos/tests/grub/mirrored-boots.nix b/nixos/tests/grub/mirrored-boots.nix new file mode 100644 index 000000000000..f3059bf675bc --- /dev/null +++ b/nixos/tests/grub/mirrored-boots.nix @@ -0,0 +1,61 @@ +{ lib, ... }: +{ + name = "grub-mirrored-boots"; + + meta = with lib.maintainers; { + maintainers = [ + tomfitzhenry + rnhmjoj + ]; + }; + + nodes.machine = + { lib, ... }: + { + virtualisation.useBootLoader = true; + + boot.loader.timeout = null; + boot.loader.grub = { + enable = true; + device = lib.mkOverride 0 ""; + mirroredBoots = [ + { + path = "/boot1"; + devices = [ "/dev/vda" ]; + } + { + path = "/boot2"; + devices = [ "nodev" ]; + } + ]; + + # Read GRUB from the serial console so its output can be matched + # deterministically with wait_for_console_text, rather than via OCR. + extraConfig = "serial; terminal_output serial"; + }; + }; + + testScript = '' + machine.start() + + # wait for grub screen + machine.wait_for_console_text("GNU GRUB") + + machine.send_chars("\n") # press enter to boot default option + + with subtest("Machine boots correctly"): + machine.wait_for_unit("multi-user.target") + + with subtest("Verify boot path 1 GRUB installation and configuration"): + machine.succeed("test -d /boot1/grub") + machine.succeed("test -f /boot1/grub/grub.cfg") + machine.succeed("test -f /boot1/grub/state") + machine.succeed("grep -q 'menuentry' /boot1/grub/grub.cfg") + + with subtest("Verify boot path 2 GRUB installation and configuration"): + machine.succeed("test -d /boot2/grub") + machine.succeed("test -f /boot2/grub/grub.cfg") + machine.succeed("test -f /boot2/grub/state") + machine.succeed("grep -q 'menuentry' /boot2/grub/grub.cfg") + ''; +} diff --git a/nixos/tests/gs1200-exporter.nix b/nixos/tests/gs1200-exporter.nix index 5f4b4c611c36..03185a4b3b04 100644 --- a/nixos/tests/gs1200-exporter.nix +++ b/nixos/tests/gs1200-exporter.nix @@ -2,7 +2,7 @@ { name = "gs1200-exporter"; meta.maintainers = with lib.maintainers; [ DerGrumpf ]; - nodes.machine = _: { + containers.machine = { services.gs1200-exporter = { enable = true; address = "192.168.2.4"; diff --git a/nixos/tests/haproxy.nix b/nixos/tests/haproxy.nix index 107010528737..20bcd700bb58 100644 --- a/nixos/tests/haproxy.nix +++ b/nixos/tests/haproxy.nix @@ -69,12 +69,12 @@ }; }; testScript = '' - import os + import subprocess # Helpers def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/hedgedoc.nix b/nixos/tests/hedgedoc.nix index 75a81e69b61c..b8701d866bdf 100644 --- a/nixos/tests/hedgedoc.nix +++ b/nixos/tests/hedgedoc.nix @@ -1,16 +1,16 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { name = "hedgedoc"; meta.maintainers = [ ]; - nodes = { - hedgedocSqlite = + containers = { + sqlite = { ... }: { services.hedgedoc.enable = true; }; - hedgedocPostgresWithTCPSocket = + pgsqltcp = { ... }: { systemd.services.hedgedoc.after = [ "postgresql.target" ]; @@ -44,7 +44,7 @@ }; }; - hedgedocPostgresWithUNIXSocket = + pgsqluds = { ... }: { systemd.services.hedgedoc.after = [ "postgresql.target" ]; @@ -78,22 +78,22 @@ start_all() with subtest("HedgeDoc sqlite"): - hedgedocSqlite.wait_for_unit("hedgedoc.service") - hedgedocSqlite.wait_for_open_port(3000) - hedgedocSqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new") + sqlite.wait_for_unit("hedgedoc.service") + sqlite.wait_for_open_port(3000) + sqlite.wait_until_succeeds("curl -sSf http://localhost:3000/new") with subtest("HedgeDoc postgres with TCP socket"): - hedgedocPostgresWithTCPSocket.wait_for_unit("postgresql.target") - hedgedocPostgresWithTCPSocket.wait_for_unit("hedgedoc.service") - hedgedocPostgresWithTCPSocket.wait_for_open_port(5432) - hedgedocPostgresWithTCPSocket.wait_for_open_port(3000) - hedgedocPostgresWithTCPSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new") + pgsqltcp.wait_for_unit("postgresql.target") + pgsqltcp.wait_for_unit("hedgedoc.service") + pgsqltcp.wait_for_open_port(5432) + pgsqltcp.wait_for_open_port(3000) + pgsqltcp.wait_until_succeeds("curl -sSf http://localhost:3000/new") with subtest("HedgeDoc postgres with UNIX socket"): - hedgedocPostgresWithUNIXSocket.wait_for_unit("postgresql.target") - hedgedocPostgresWithUNIXSocket.wait_for_unit("hedgedoc.service") - hedgedocPostgresWithUNIXSocket.wait_for_open_port(5432) - hedgedocPostgresWithUNIXSocket.wait_for_open_port(3000) - hedgedocPostgresWithUNIXSocket.wait_until_succeeds("curl -sSf http://localhost:3000/new") + pgsqluds.wait_for_unit("postgresql.target") + pgsqluds.wait_for_unit("hedgedoc.service") + pgsqluds.wait_for_open_port(5432) + pgsqluds.wait_for_open_port(3000) + pgsqluds.wait_until_succeeds("curl -sSf http://localhost:3000/new") ''; } diff --git a/nixos/tests/holo-daemon-modular.nix b/nixos/tests/holo-daemon-modular.nix new file mode 100644 index 000000000000..af32d7e5d472 --- /dev/null +++ b/nixos/tests/holo-daemon-modular.nix @@ -0,0 +1,66 @@ +{ ... }: +{ + _class = "nixosTest"; + name = "holo-daemon-modular-service-test"; + + nodes = { + machine = + { pkgs, ... }: + { + environment.systemPackages = [ + pkgs.holo-daemon + pkgs.holo-cli + ]; + system.services.holo-daemon = { + imports = [ pkgs.holo-daemon.services.default ]; + }; + users.users.holo = { + isSystemUser = true; + group = "holo"; + home = "/var/lib/holo"; + createHome = true; + }; + users.groups.holo = { }; + services.getty.autologinUser = "root"; + }; + }; + + testScript = + { nodes, ... }: + '' + import time + + start_all() + + # holo-cli connects to the daemon at startup + # features a bash-like editing functionality for interactive use + # uses -c option to execute arguments as commands + + machine.wait_for_unit("multi-user.target") + + machine.wait_for_unit("holo-daemon.service") + + machine.succeed("holo-cli -V") + + # wait for cli to connect to the daemon + machine.wait_for_open_port(50051) + + # Test the running configuration is empty + machine.succeed("holo-cli -c 'show running format json'") + + # Configure an OSPFv3 instance: + # as seen in https://asciinema.org/a/qYxmDu1QjGPBAt5gNyNKvXhHk + + machine.send_chars("holo-cli\n", 1) + time.sleep(5) + machine.send_chars("configure\n", 1) + machine.send_chars("routing control-plane-protocols control-plane-protocol ietf-ospf:ospfv3 main\n", 1) + machine.send_chars("ospf preference inter-area 50\n", 1) + machine.send_chars("show changes\n", 1) + machine.send_chars("commit\n", 1) + machine.send_chars("exit\n", 1) + + # Verify the configuration was applied (in interactive test) + machine.succeed("test \"$(holo-cli -c 'show running format json')\" != \"{}\""); + ''; +} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 76b3b62c0389..d90fbafd93e8 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -41,7 +41,7 @@ let documentation.enable = false; # To ensure that we can rebuild the grub configuration on the nixos-rebuild - system.extraDependencies = with pkgs; [ stdenvNoCC ]; + system.extraDependencies = with pkgs; [ stdenvNoCC hello ]; boot.initrd.systemd.enable = ${boolToString systemdStage1}; @@ -278,14 +278,14 @@ let target.succeed("nix-store --verify --check-contents >&2") with subtest("Check whether the channel works"): - target.succeed("nix-env -iA nixos.procps >&2") - assert ".nix-profile" in target.succeed("type -tP ps | tee /dev/stderr") + target.succeed("nix-env -iA nixos.hello >&2") + assert ".nix-profile" in target.succeed("type -tP hello | tee /dev/stderr") with subtest( "Check that the daemon works, and that non-root users can run builds " "(this will build a new profile generation through the daemon)" ): - target.succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2") + target.succeed("su alice -l -c 'nix-env -iA nixos.hello' >&2") with subtest("Configure system with writable Nix store on next boot"): # we're not using copy_from_host here because the installer image @@ -677,7 +677,6 @@ let # non-EFI tests can only run on x86 platforms = mkIf (!isEfi) [ "x86_64-linux" - "x86_64-darwin" "i686-linux" ]; inherit broken; @@ -745,6 +744,7 @@ let desktop-file-utils docbook5 docbook_xsl_ns + hello kbd.dev kmod.dev libarchive.dev @@ -1467,7 +1467,6 @@ in # Full disk encryption (root, kernel and initrd encrypted) using GRUB, GPT/UEFI, # LVM-on-LUKS and a keyfile in initrd.secrets to enter the passphrase once fullDiskEncryption = makeInstallerTest "fullDiskEncryption" { - broken = true; createPartitions = '' installer.succeed( "flock /dev/vda parted --script /dev/vda -- mklabel gpt" @@ -1508,6 +1507,53 @@ in ''; enableOCR = true; postBootCommands = '' + target.wait_for_text("Enter passphrase for") + # GRUB's EFI keyboard input appears to drop characters when typed at the + # default speed (producing an "Invalid passphrase" error), so type slowly. + target.send_chars("supersecret\n", 0.2) + ''; + }; + + # Root, kernel and initrd encrypted using GRUB cryptodisk, MBR/legacy BIOS, + # plain LUKS and a keyfile in initrd.secrets to enter the passphrase once + grubCryptodiskLegacyBios = makeInstallerTest "grubCryptodiskLegacyBios" { + meta.maintainers = [ maintainers.tomfitzhenry ]; + createPartitions = '' + installer.succeed( + "flock /dev/vda parted --script /dev/vda -- mklabel msdos mkpart primary ext4 1MiB -1GiB mkpart primary linux-swap -1GiB 100%", + "udevadm settle", + "echo -n supersecret | cryptsetup luksFormat -q --pbkdf-force-iterations 1000 --type luks1 /dev/vda1 -", + "echo -n supersecret | cryptsetup luksOpen /dev/vda1 cryptroot", + "mkfs.ext4 -L nixos /dev/mapper/cryptroot", + "mkswap -L swap /dev/vda2", + "swapon -L swap", + "mount LABEL=nixos /mnt", + "mkdir -p /mnt/etc/nixos", + # Add a keyfile so stage 1 can unlock the root device without a second, + # interactive prompt. This keeps the test independent of the stage 1 + # implementation, which matters because the scripted and systemd + # initrds word their passphrase prompts differently. Only GRUB (which + # is stage 1 independent) then prompts interactively. + "dd if=/dev/urandom of=/mnt/etc/nixos/luks.key bs=256 count=1", + "echo -n supersecret | cryptsetup luksAddKey -q --pbkdf-force-iterations 1000 --key-file - /dev/vda1 /mnt/etc/nixos/luks.key", + ) + ''; + bootLoader = "grub"; + # GRUB draws its cryptodisk passphrase prompt on the console terminal + # without a trailing newline, so the line-based wait_for_console_text can + # never observe it. Use OCR (wait_for_text) to read it off the screen. + enableOCR = true; + extraConfig = '' + boot.loader.grub.enableCryptodisk = true; + boot.initrd.secrets."/luks.key" = "/etc/nixos/luks.key"; + boot.initrd.luks.devices.cryptroot = { + device = lib.mkForce "/dev/vda1"; + keyFile = "/luks.key"; + }; + ''; + postBootCommands = '' + # GRUB has to unlock the disk to read /boot before it can boot the kernel; + # stage 1 then unlocks the root device with the embedded keyfile. target.wait_for_text("Enter passphrase for") target.send_chars("supersecret\n") ''; diff --git a/nixos/tests/iscsi-multipath-root.nix b/nixos/tests/iscsi-multipath-root.nix index 90723bdbb604..08cd0c0f3f30 100644 --- a/nixos/tests/iscsi-multipath-root.nix +++ b/nixos/tests/iscsi-multipath-root.nix @@ -126,7 +126,7 @@ in ]; environment.etc."initiator-root-disk-closure".source = - nodes.initiatorRootDisk.config.system.build.toplevel; + nodes.initiatorRootDisk.system.build.toplevel; nix.settings = { substituters = lib.mkForce [ ]; diff --git a/nixos/tests/iscsi-root.nix b/nixos/tests/iscsi-root.nix index 571dbecad244..6872dfbda94c 100644 --- a/nixos/tests/iscsi-root.nix +++ b/nixos/tests/iscsi-root.nix @@ -169,7 +169,7 @@ in initiatorAuto.succeed("mkfs.xfs /dev/sda") initiatorAuto.succeed("mkdir /mnt && mount /dev/sda /mnt") initiatorAuto.succeed( - "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.config.system.build.toplevel}" + "nixos-install --no-bootloader --no-root-passwd --system ${nodes.initiatorRootDisk.system.build.toplevel}" ) initiatorAuto.succeed("umount /mnt && rmdir /mnt") initiatorAuto.shutdown() diff --git a/nixos/tests/jellyfin.nix b/nixos/tests/jellyfin.nix index 4896c13d4eca..7463b920727e 100644 --- a/nixos/tests/jellyfin.nix +++ b/nixos/tests/jellyfin.nix @@ -33,6 +33,7 @@ hardwareDecodingCodecs = { h264 = true; hevc = true; + hevc10bit = true; vp9 = true; hevcRExt10bit = true; hevcRExt12bit = true; @@ -174,7 +175,8 @@ assert config.get("EnableIntelLowPowerH264HwEncoder") == True, f"Intel low power H264: expected True, got '{config.get('EnableIntelLowPowerH264HwEncoder')}'" assert config.get("EnableIntelLowPowerHevcHwEncoder") == True, f"Intel low power HEVC: expected True, got '{config.get('EnableIntelLowPowerHevcHwEncoder')}'" - # HEVC RExt color depth verification + # HEVC color depth verification + assert config.get("EnableDecodingColorDepth10Hevc") == True, f"HEVC 10bit: expected True, got '{config.get('EnableDecodingColorDepth10Hevc')}'" assert config.get("EnableDecodingColorDepth10HevcRext") == True, f"HEVC RExt 10bit: expected True, got '{config.get('EnableDecodingColorDepth10HevcRext')}'" assert config.get("EnableDecodingColorDepth12HevcRext") == True, f"HEVC RExt 12bit: expected True, got '{config.get('EnableDecodingColorDepth12HevcRext')}'" diff --git a/nixos/tests/kafka/base.nix b/nixos/tests/kafka/base.nix index 678a28c31413..3a37048ca362 100644 --- a/nixos/tests/kafka/base.nix +++ b/nixos/tests/kafka/base.nix @@ -5,10 +5,7 @@ with pkgs.lib; let makeKafkaTest = name: - { - kafkaPackage, - mode ? "kraft", - }: + { kafkaPackage }: (import ../make-test-python.nix { inherit name; @@ -16,48 +13,36 @@ let kafka = { ... }: { - services.apache-kafka = mkMerge [ - { - enable = true; - package = kafkaPackage; - settings = { - "offsets.topic.replication.factor" = 1; - "log.dirs" = [ - "/var/lib/kafka/logdir1" - "/var/lib/kafka/logdir2" - ]; - }; - } - (mkIf (mode == "zookeeper") { - settings = { - "zookeeper.session.timeout.ms" = 600000; - "zookeeper.connect" = [ "zookeeper1:2181" ]; - }; - }) - (mkIf (mode == "kraft") { - clusterId = "ak2fIHr4S8WWarOF_ODD0g"; - formatLogDirs = true; - settings = { - "node.id" = 1; - "process.roles" = [ - "broker" - "controller" - ]; - "listeners" = [ - "PLAINTEXT://:9092" - "CONTROLLER://:9093" - ]; - "listener.security.protocol.map" = [ - "PLAINTEXT:PLAINTEXT" - "CONTROLLER:PLAINTEXT" - ]; - "controller.quorum.voters" = [ - "1@kafka:9093" - ]; - "controller.listener.names" = [ "CONTROLLER" ]; - }; - }) - ]; + services.apache-kafka = { + enable = true; + package = kafkaPackage; + clusterId = "ak2fIHr4S8WWarOF_ODD0g"; + formatLogDirs = true; + settings = { + "offsets.topic.replication.factor" = 1; + "log.dirs" = [ + "/var/lib/kafka/logdir1" + "/var/lib/kafka/logdir2" + ]; + "node.id" = 1; + "process.roles" = [ + "broker" + "controller" + ]; + "listeners" = [ + "PLAINTEXT://:9092" + "CONTROLLER://:9093" + ]; + "listener.security.protocol.map" = [ + "PLAINTEXT:PLAINTEXT" + "CONTROLLER:PLAINTEXT" + ]; + "controller.quorum.voters" = [ + "1@kafka:9093" + ]; + "controller.listener.names" = [ "CONTROLLER" ]; + }; + }; networking.firewall.allowedTCPPorts = [ 9092 @@ -67,29 +52,11 @@ let # i686 tests: qemu-system-i386 can simulate max 2047MB RAM (not 2048) virtualisation.memorySize = 2047; }; - } - // optionalAttrs (mode == "zookeeper") { - zookeeper1 = - { ... }: - { - services.zookeeper = { - enable = true; - }; - - networking.firewall.allowedTCPPorts = [ 2181 ]; - virtualisation.diskSize = 1024; - }; }; testScript = '' start_all() - ${optionalString (mode == "zookeeper") '' - zookeeper1.wait_for_unit("default.target") - zookeeper1.wait_for_unit("zookeeper.service") - zookeeper1.wait_for_open_port(2181) - ''} - kafka.wait_for_unit("default.target") kafka.wait_for_unit("apache-kafka.service") kafka.wait_for_open_port(9092) @@ -115,12 +82,8 @@ let in with pkgs; { - kafka_3_9 = makeKafkaTest "kafka_3_9" { - kafkaPackage = apacheKafka_3_9; - mode = "zookeeper"; - }; - kafka_4_0 = makeKafkaTest "kafka_4_0" { kafkaPackage = apacheKafka_4_0; }; kafka_4_1 = makeKafkaTest "kafka_4_1" { kafkaPackage = apacheKafka_4_1; }; kafka_4_2 = makeKafkaTest "kafka_4_2" { kafkaPackage = apacheKafka_4_2; }; + kafka_4_3 = makeKafkaTest "kafka_4_3" { kafkaPackage = apacheKafka_4_3; }; kafka = makeKafkaTest "kafka" { kafkaPackage = apacheKafka; }; } diff --git a/nixos/tests/kea.nix b/nixos/tests/kea.nix index bb361eba14fb..ec249f0c7150 100644 --- a/nixos/tests/kea.nix +++ b/nixos/tests/kea.nix @@ -6,7 +6,6 @@ # address. { - pkgs, lib, ... }: @@ -15,7 +14,7 @@ name = "kea"; - nodes = { + containers = { router = { config, pkgs, ... }: { @@ -26,6 +25,7 @@ firewall.allowedUDPPorts = [ 67 ]; }; + services.resolved.enable = false; systemd.network = { enable = true; networks = { @@ -77,7 +77,7 @@ # Enable communication between dhcp4 and a local dhcp-ddns # instance. - # https://kea.readthedocs.io/en/kea-2.2.0/arm/dhcp4-srv.html#ddns-for-dhcpv4 + # https://kea.readthedocs.io/en/kea-3.2.0/arm/dhcp4-srv.html#ddns-for-dhcpv4 dhcp-ddns = { enable-updates = true; }; @@ -93,7 +93,7 @@ forward-ddns = { # Configure updates of a forward zone named `lan.nixos.test` # hosted at the nameserver at 10.0.0.2 - # https://kea.readthedocs.io/en/kea-2.2.0/arm/ddns.html#adding-forward-dns-servers + # https://kea.readthedocs.io/en/kea-3.2.0/arm/ddns.html#adding-forward-dns-servers ddns-domains = [ { name = "lan.nixos.test."; @@ -111,22 +111,10 @@ }; }; - services.kea.ctrl-agent = { - enable = true; - settings = { - http-host = "127.0.0.1"; - http-port = 8000; - control-sockets.dhcp4 = { - socket-type = "unix"; - socket-name = "/run/kea/dhcp4.sock"; - }; - }; - }; - services.prometheus.exporters.kea = { enable = true; controlSocketPaths = [ - "http://127.0.0.1:8000" + config.services.kea.dhcp4.settings.control-socket.socket-name ]; }; }; @@ -141,6 +129,7 @@ firewall.allowedUDPPorts = [ 53 ]; }; + services.resolved.enable = false; systemd.network = { enable = true; networks = { @@ -153,8 +142,6 @@ }; }; - services.resolved.enable = false; - # Set up an authoritative nameserver, serving the `lan.nixos.test` # zone and configure an ACL that allows dynamic updates from # the router's ip address. @@ -213,6 +200,7 @@ { virtualisation.vlans = [ 1 ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; @@ -222,16 +210,23 @@ }; }; testScript = - { ... }: + # python '' start_all() + router.wait_for_unit("kea-dhcp4-server.service") - client.systemctl("start systemd-networkd-wait-online.service") - client.wait_for_unit("systemd-networkd-wait-online.service") - client.wait_until_succeeds("ping -c 5 10.0.0.1") - router.wait_until_succeeds("ping -c 5 10.0.0.3") - nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3") - router.log(router.execute("curl 127.0.0.1:9547")[1]) - router.succeed("curl --no-buffer 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'") + + with subtest("DHCPv4"): + client.systemctl("start systemd-networkd-wait-online.service") + client.wait_for_unit("systemd-networkd-wait-online.service") + client.wait_until_succeeds("ping -c 5 10.0.0.1") + router.wait_until_succeeds("ping -c 5 10.0.0.3") + + with subtest("DDNS"): + nameserver.wait_until_succeeds("kdig +short client.lan.nixos.test @10.0.0.2 | grep -q 10.0.0.3") + + with subtest("Prometheus Exporter"): + router.log(router.execute("curl 127.0.0.1:9547")[1]) + router.succeed("curl --silent 127.0.0.1:9547 | grep -qE '^kea_dhcp4_addresses_assigned_total.*1.0$'") ''; } diff --git a/nixos/tests/keepalived.nix b/nixos/tests/keepalived.nix index d5ffa6e9838d..2bc512446693 100644 --- a/nixos/tests/keepalived.nix +++ b/nixos/tests/keepalived.nix @@ -1,48 +1,60 @@ -{ pkgs, lib, ... }: +let + mkTest = + { useNftables }: + import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "keepalived-${if useNftables then "nftables" else "iptables"}"; + meta.maintainers = [ lib.maintainers.raitobezarius ]; + + nodes = { + node1 = + { pkgs, ... }: + { + networking.nftables.enable = useNftables; + services.keepalived.enable = true; + services.keepalived.openFirewall = true; + services.keepalived.vrrpInstances.test = { + interface = "eth1"; + state = "MASTER"; + priority = 50; + virtualIps = [ { addr = "192.168.1.200"; } ]; + virtualRouterId = 1; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + }; + node2 = + { pkgs, ... }: + { + networking.nftables.enable = useNftables; + services.keepalived.enable = true; + services.keepalived.openFirewall = true; + services.keepalived.vrrpInstances.test = { + interface = "eth1"; + state = "MASTER"; + priority = 100; + virtualIps = [ { addr = "192.168.1.200"; } ]; + virtualRouterId = 1; + }; + environment.systemPackages = [ pkgs.tcpdump ]; + }; + }; + + testScript = '' + # wait for boot time delay to pass + for node in [node1, node2]: + node.wait_until_succeeds( + "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'" + ) + node.wait_for_unit("keepalived") + node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200") + node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200") + node1.succeed("ping -c1 192.168.1.200") + ''; + } + ); +in { - name = "keepalived"; - meta.maintainers = [ lib.maintainers.raitobezarius ]; - - nodes = { - node1 = - { pkgs, ... }: - { - services.keepalived.enable = true; - services.keepalived.openFirewall = true; - services.keepalived.vrrpInstances.test = { - interface = "eth1"; - state = "MASTER"; - priority = 50; - virtualIps = [ { addr = "192.168.1.200"; } ]; - virtualRouterId = 1; - }; - environment.systemPackages = [ pkgs.tcpdump ]; - }; - node2 = - { pkgs, ... }: - { - services.keepalived.enable = true; - services.keepalived.openFirewall = true; - services.keepalived.vrrpInstances.test = { - interface = "eth1"; - state = "MASTER"; - priority = 100; - virtualIps = [ { addr = "192.168.1.200"; } ]; - virtualRouterId = 1; - }; - environment.systemPackages = [ pkgs.tcpdump ]; - }; - }; - - testScript = '' - # wait for boot time delay to pass - for node in [node1, node2]: - node.wait_until_succeeds( - "systemctl show -p LastTriggerUSecMonotonic keepalived-boot-delay.timer | grep -vq 'LastTriggerUSecMonotonic=0'" - ) - node.wait_for_unit("keepalived") - node2.wait_until_succeeds("ip addr show dev eth1 | grep -q 192.168.1.200") - node1.fail("ip addr show dev eth1 | grep -q 192.168.1.200") - node1.succeed("ping -c1 192.168.1.200") - ''; + nftables = mkTest { useNftables = true; }; + iptables = mkTest { useNftables = false; }; } diff --git a/nixos/tests/kerberos/heimdal.nix b/nixos/tests/kerberos/heimdal.nix index f12141d94627..e399bf0c3d67 100644 --- a/nixos/tests/kerberos/heimdal.nix +++ b/nixos/tests/kerberos/heimdal.nix @@ -169,7 +169,7 @@ import ../make-test-python.nix ( with subtest("Server: initialize host principal with keytab"): server.send_chars("sudo ktutil get -p alice/admin host/server.foo.bar\n") server.wait_until_tty_matches("1", "password for alice:") - server.send_chars("${nodes.server.config.users.users.alice.password}\n") + server.send_chars("${nodes.server.users.users.alice.password}\n") server.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:") server.send_chars(f'{alice_krb_admin_pw}\n') server.wait_for_file("/etc/krb5.keytab") @@ -194,7 +194,7 @@ import ../make-test-python.nix ( client.send_chars("sudo ktutil get -p alice/admin host/client.foo.bar\n") client.wait_until_tty_matches("1", "password for alice:") - client.send_chars("${nodes.client.config.users.users.alice.password}\n") + client.send_chars("${nodes.client.users.users.alice.password}\n") client.wait_until_tty_matches("1", "alice/admin@FOO.BAR's Password:") client.send_chars(f"{alice_krb_admin_pw}\n") client.wait_for_file("/etc/krb5.keytab") diff --git a/nixos/tests/keycloak.nix b/nixos/tests/keycloak.nix index 28b47661f3d8..8c5227dd443e 100644 --- a/nixos/tests/keycloak.nix +++ b/nixos/tests/keycloak.nix @@ -38,6 +38,7 @@ let enable = true; settings = { hostname = certs.domain; + metrics-enabled = true; }; inherit initialAdminPassword; sslCertificate = "${certs.${certs.domain}.cert}"; @@ -50,7 +51,6 @@ let }; plugins = with config.services.keycloak.package.plugins; [ keycloak-discord - keycloak-metrics-spi ]; }; environment.systemPackages = with pkgs; [ @@ -131,13 +131,7 @@ let | jq -r '"Authorization: bearer " + .access_token' >admin_auth_header """) - # Register the metrics SPI - keycloak.succeed( - """${pkgs.jre}/bin/keytool -import -alias snakeoil -file ${certs.ca.cert} -storepass aaaaaa -keystore cacert.jks -noprompt""", - """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh config credentials --server '${frontendUrl}' --realm master --user admin --password "$(<${adminPasswordFile})" """, - """KC_OPTS='-Djavax.net.ssl.trustStore=cacert.jks -Djavax.net.ssl.trustStorePassword=aaaaaa' kcadm.sh update events/config -s 'eventsEnabled=true' -s 'adminEventsEnabled=true' -s 'eventsListeners+=metrics-listener'""", - """curl -sSf '${frontendUrl}/realms/master/metrics' | grep '^keycloak_admin_event_UPDATE'""" - ) + keycloak.succeed("curl -sSf https://${certs.domain}:9000/metrics | grep '^jvm_'") # Publish the realm, including a test OIDC client and user keycloak.succeed( diff --git a/nixos/tests/knot.nix b/nixos/tests/knot.nix index 651fccc21949..3c6217195464 100644 --- a/nixos/tests/knot.nix +++ b/nixos/tests/knot.nix @@ -209,11 +209,11 @@ in testScript = { nodes, ... }: let - primary4 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv4.addresses).address; - primary6 = (lib.head nodes.primary.config.networking.interfaces.eth1.ipv6.addresses).address; + primary4 = (lib.head nodes.primary.networking.interfaces.eth1.ipv4.addresses).address; + primary6 = (lib.head nodes.primary.networking.interfaces.eth1.ipv6.addresses).address; - secondary4 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv4.addresses).address; - secondary6 = (lib.head nodes.secondary.config.networking.interfaces.eth1.ipv6.addresses).address; + secondary4 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv4.addresses).address; + secondary6 = (lib.head nodes.secondary.networking.interfaces.eth1.ipv6.addresses).address; in '' import re diff --git a/nixos/tests/komodo-periphery.nix b/nixos/tests/komodo-periphery.nix index 64bcbfa7b6e3..e376ddee6506 100644 --- a/nixos/tests/komodo-periphery.nix +++ b/nixos/tests/komodo-periphery.nix @@ -5,22 +5,63 @@ maintainers = with lib.maintainers; [ channinghe ]; }; - nodes.machine = - { config, pkgs, ... }: - { - virtualisation.docker.enable = true; - services.komodo-periphery = { - enable = true; - bindIp = "127.0.0.1"; - port = 8120; - ssl.enable = false; - passkeys = [ "test-passkey" ]; + nodes = { + periphery = + { ... }: + { + virtualisation.docker.enable = true; + services.komodo-periphery = { + enable = true; + inbound.bindIp = "127.0.0.1"; + inbound.port = 8120; + inbound.ssl.enable = false; + inbound.serverEnabled = true; + disableTerminals = true; + disableContainerTerminals = true; + statsPollingRate = "10-sec"; + containerStatsPollingRate = "1-min"; + logging.level = "debug"; + extraSettings = { + secrets.TEST_SECRET = "test-value"; + }; + auth.privateKey = "file:/var/lib/komodo-periphery/keys/test.key"; + auth.corePublicKeys = [ "MCowBQYDK2VuAyEATZgrjGHeF0KJUe0+n77+qAWOg3YzEzXOmQWaRgO3OGQ=" ]; + }; }; - }; + + peripheryOutbound = + { ... }: + { + virtualisation.docker.enable = true; + services.komodo-periphery = { + enable = true; + inbound.ssl.enable = false; + logging.level = "debug"; + outbound.coreAddress = "core.invalid"; + outbound.connectAs = "test-server"; + }; + }; + }; testScript = '' - machine.wait_for_unit("komodo-periphery.service") - machine.wait_for_open_port(8120) - machine.succeed("systemctl status komodo-periphery.service") + start_all() + + with subtest("Inbound periphery starts and serves /version"): + periphery.wait_for_unit("komodo-periphery.service") + periphery.wait_for_open_port(8120) + periphery.succeed("curl -fsS --max-time 10 http://127.0.0.1:8120/version") + + with subtest("Periphery creates managed directories"): + periphery.succeed("test -d /var/lib/komodo-periphery") + periphery.succeed("test -d /var/lib/komodo-periphery/repos") + periphery.succeed("test -d /var/lib/komodo-periphery/stacks") + periphery.succeed("test -d /var/lib/komodo-periphery/builds") + periphery.succeed("test -d /var/lib/komodo-periphery/keys") + periphery.succeed("test -d /var/lib/komodo-periphery/ssl") + + with subtest("Outbound periphery stays active despite unreachable core"): + peripheryOutbound.wait_for_unit("komodo-periphery.service") + peripheryOutbound.sleep(15) + peripheryOutbound.succeed("systemctl is-active komodo-periphery") ''; } diff --git a/nixos/tests/libuiohook.nix b/nixos/tests/libuiohook.nix index 34a200bd0349..47114bcd8e88 100644 --- a/nixos/tests/libuiohook.nix +++ b/nixos/tests/libuiohook.nix @@ -8,7 +8,7 @@ nodes.client = { nodes, ... }: let - user = nodes.client.config.users.users.alice; + user = nodes.client.users.users.alice; in { imports = [ @@ -24,7 +24,7 @@ testScript = { nodes, ... }: let - user = nodes.client.config.users.users.alice; + user = nodes.client.users.users.alice; in '' client.wait_for_x() diff --git a/nixos/tests/lightdm.nix b/nixos/tests/lightdm.nix index 3d51924af8de..f561f89df221 100644 --- a/nixos/tests/lightdm.nix +++ b/nixos/tests/lightdm.nix @@ -20,7 +20,7 @@ testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' start_all() diff --git a/nixos/tests/limine/additional-files.nix b/nixos/tests/limine/additional-files.nix new file mode 100644 index 000000000000..9e7e00184185 --- /dev/null +++ b/nixos/tests/limine/additional-files.nix @@ -0,0 +1,51 @@ +{ pkgs, lib, ... }: +{ + name = "additionalFiles"; + meta.maintainers = with lib.maintainers; [ + flokli + ]; + meta.platforms = [ + "x86_64-linux" + ]; + nodes.machine = + { ... }: + { + virtualisation.useBootLoader = true; + virtualisation.useEFIBoot = true; + boot.loader.limine.enable = true; + boot.loader.limine.efiSupport = true; + boot.loader.timeout = 0; + + specialisation.withAdditionalFiles.configuration = { ... }: { + boot.loader.limine.additionalFiles = { + "efi/memtest86/memtest86.efi" = "${pkgs.memtest86-efi}/BOOTX64.efi"; + }; + }; + specialisation.withAdditionalFilesOther.configuration = { ... }: { + boot.loader.limine.additionalFiles = { + "efi/memtest86/memtest86.efi" = "${builtins.toFile "some-file" "some-content"}"; + }; + }; + }; + + testScript = + { nodes, ... }: + let + withAdditionalFiles = + nodes.machine.specialisation.withAdditionalFiles.configuration.system.build.toplevel; + withAdditionalFilesOther = + nodes.machine.specialisation.withAdditionalFilesOther.configuration.system.build.toplevel; + in + '' + machine.start() + machine.wait_for_unit("multi-user.target") + + # switch to a generation with additional files and ensure they're present + machine.succeed("${withAdditionalFiles}/bin/switch-to-configuration switch") + machine.succeed("stat /boot/efi/memtest86/memtest86.efi") + + # switch to the next generation with something else in there and ensure it got updated + machine.succeed("${withAdditionalFilesOther}/bin/switch-to-configuration switch") + assert machine.succeed("cat /boot/efi/memtest86/memtest86.efi").strip() == "some-content" + ''; +} diff --git a/nixos/tests/limine/default.nix b/nixos/tests/limine/default.nix index fd7a583f09c6..debce99b0fd8 100644 --- a/nixos/tests/limine/default.nix +++ b/nixos/tests/limine/default.nix @@ -3,6 +3,7 @@ ... }: { + additionalFiles = runTest ./additional-files.nix; bios = runTest ./bios.nix; checksum = runTest ./checksum.nix; secureBoot = runTest ./secure-boot.nix; diff --git a/nixos/tests/listmonk.nix b/nixos/tests/listmonk.nix index 7d4af8dce31b..7a43d09b7c22 100644 --- a/nixos/tests/listmonk.nix +++ b/nixos/tests/listmonk.nix @@ -2,7 +2,7 @@ import ./make-test-python.nix ( { lib, ... }: { name = "listmonk"; - meta.maintainers = with lib.maintainers; [ raitobezarius ]; + meta.maintainers = [ ]; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/login-nosuid.nix b/nixos/tests/login-nosuid.nix new file mode 100644 index 000000000000..f5582382891f --- /dev/null +++ b/nixos/tests/login-nosuid.nix @@ -0,0 +1,113 @@ +{ + name = "login-nosuid"; + meta = { + maintainers = [ ]; + }; + + # node.pkgsReadOnly = false; # needed when overriding pam to debug mode + + nodes.machine = + { pkgs, ... }: + { + security.enableWrappers = false; + systemd.settings.Manager.NoNewPrivileges = true; + security.account-utils = { + enable = true; + pwaccessd.settings = { + ExpiredCheck.SpMin = true; + }; + }; + users.mutableUsers = true; + security.account-utils.extraArgs = [ + "-v" + "--debug" + ]; + security.loginDefs.chfnRestrict = "f"; # allow allice to change name + + environment.systemPackages = [ + pkgs.which + pkgs.fish # environment.shells does not actually link fish to /run/current-system/sw/bin, causing chsh to fail unexpectedly + ]; + environment.shells = [ pkgs.fish ]; + + # pam debug without giant rebuild + # system.replaceDependencies.replacements = [ + # { + # oldDependency = pkgs.linux-pam; + # newDependency = pkgs.linux-pam.override { debugMode = true; }; + # } + # ]; + }; + + testScript = '' + machine.start(allow_reboot = True) + + machine.wait_for_unit("multi-user.target") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'") + machine.screenshot("postboot") + + with subtest("account-utils passwd has priority"): + passwd_path = machine.succeed("realpath $(which passwd)") + print(f"passwd path is: {passwd_path}") + assert "account-utils" in passwd_path + + with subtest("config file exists"): + machine.succeed("ls /etc/account-utils/pwaccessd.conf") + + with subtest("create user"): + machine.succeed("useradd -m alice") + machine.succeed("(echo foobar; echo foobar) | passwd alice") + + with subtest("Check whether switching VTs works"): + machine.fail("pgrep -f 'agetty.*tty2'") + machine.send_key("alt-f2") + machine.wait_until_succeeds("[ $(fgconsole) = 2 ]") + machine.wait_for_unit("getty@tty2.service") + machine.wait_until_succeeds("pgrep -f 'agetty.*tty2'") + + with subtest("Log in as alice on a virtual console"): + machine.wait_until_tty_matches("2", "login: ") + machine.send_chars("alice\n") + machine.wait_until_tty_matches("2", "login: alice") + machine.wait_until_succeeds("pgrep login") + machine.wait_until_tty_matches("2", "Password: ") + machine.sleep(1) # something is racy here, so lets just sleep a bit... Not great, but seems to work + machine.send_chars("foobar\n") + machine.wait_until_succeeds("pgrep -u alice bash") + machine.send_chars("touch done\n") + machine.wait_for_file("/home/alice/done") + + with subtest("Systemd gives and removes device ownership as needed"): + machine.succeed("getfacl /dev/snd/timer | grep -q alice") + machine.send_key("alt-f1") + machine.wait_until_succeeds("[ $(fgconsole) = 1 ]") + machine.fail("getfacl /dev/snd/timer | grep -q alice") + machine.succeed("chvt 2") + machine.wait_until_succeeds("getfacl /dev/snd/timer | grep -q alice") + + with subtest("User can change their login shell"): + machine.send_chars("clear\n") # remove previous password prompts + machine.send_chars("chsh -s /run/current-system/sw/bin/fish\n") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("foobar\n") + machine.wait_until_fails("pgrep pwupdd") + login_shell = machine.succeed("getent passwd alice | cut -d: -f7").strip() + print(f"login shell of user alice: {login_shell}") + assert "/run/current-system/sw/bin/fish" == login_shell + + with subtest("User can change their name"): + machine.send_chars("clear\n") # remove previous password prompts + machine.send_chars("chfn -f 'Alice in Wonderland'\n") + machine.wait_until_tty_matches("2", "Password: ") + machine.send_chars("foobar\n") + machine.wait_until_fails("pgrep pwupdd") + full_name = machine.succeed("getent passwd alice | cut -d: -f5").strip() + print(f"full name of user alice: {full_name}") + assert "Alice in Wonderland" == full_name + + with subtest("Virtual console logout"): + machine.send_chars("exit\n") + machine.wait_until_fails("pgrep -u alice bash") + machine.screenshot("getty") + ''; +} diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 5dc43286c0f3..61893abe91a1 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -669,7 +669,7 @@ in # Doing this here, since we need an in-session shell & separately starting a terminal again wastes time with subtest("polkit agent works"): - machine.send_chars("pkexec touch /tmp/polkit-test\n") + machine.send_chars("run0 touch /tmp/polkit-test\n") # There's an authentication notification here that gains focus, but we struggle with OCRing it # Just hope that it's up after a short wait machine.sleep(10) diff --git a/nixos/tests/luks-suspend.nix b/nixos/tests/luks-suspend.nix new file mode 100644 index 000000000000..d1aa4862a85e --- /dev/null +++ b/nixos/tests/luks-suspend.nix @@ -0,0 +1,146 @@ +# Tests that `cryptsetup luksSuspend` successfully wipes the volume key from memory. +{ pkgs, lib, ... }: + +let + # Fixed 64-byte volume key. + # Chosen by fair dice roll. Guaranteed to be random. :-) + # (tr -dc '0-9A-Za-z' ` captures all of guest RAM. + memorySizeMiB = 1024; + + # A LUKS2 container with the known master key above. + luksImage = + pkgs.runCommand "luks-suspend-test-disk.img" { nativeBuildInputs = [ pkgs.cryptsetup ]; } + '' + truncate -s 64M $out + + echo -n abc | cryptsetup luksFormat \ + --batch-mode \ + --uuid ${luksUUID} \ + --pbkdf pbkdf2 --pbkdf-force-iterations 1000 \ + --volume-key-file <(echo -n "${volumeKey}") \ + $out + ''; + + commonMachine = + { pkgs, ... }: + { + environment.systemPackages = [ pkgs.cryptsetup ]; + virtualisation.memorySize = memorySizeMiB; + virtualisation.qemu.drives = [ + { + name = "luks"; + file = "${luksImage}"; + driveExtraOpts = { + format = "raw"; + readonly = "on"; + }; + } + ]; + }; +in +{ + name = "luks-suspend"; + meta.maintainers = with lib.maintainers; [ iblech ]; + + nodes = { + # Variant 1: LUKS volume opened after boot via the cryptsetup CLI. + cli = commonMachine; + + # Variant 2: LUKS volume opened during boot by systemd-cryptsetup, + # driven by the native NixOS LUKS module. + native = + { pkgs, lib, ... }: + { + imports = [ commonMachine ]; + boot.initrd.systemd.enable = true; + + # The test framework's qemu-vm module force-clears + # boot.initrd.luks.devices via mkVMOverride (priority 10) when + # virtualisation.useDefaultFilesystems is on (the default). + # Our setting should have priority. + boot.initrd.luks.devices = lib.mkOverride 5 { + foo = { + device = "/dev/disk/by-uuid/${luksUUID}"; + keyFile = "/etc/luks-foo.key"; + }; + }; + + # Will produce (harmless) warnings about a world-readable keyFile. + boot.initrd.systemd.contents."/etc/luks-foo.key".source = pkgs.writeText "luks-foo-key" "abc"; + }; + }; + + testScript = '' + import mmap + + MEM_BYTES = ${toString memorySizeMiB} * 1024 * 1024 + VOLUME_KEY = b"${volumeKey}" + LUKS_DEV = "/dev/disk/by-uuid/${luksUUID}" + + def count_occurrences(dump_path, needle): + count = 0 + with open(dump_path, "rb") as f: + with mmap.mmap(f.fileno(), 0, prot=mmap.PROT_READ) as m: + i = m.find(needle) + while i != -1: + count += 1 + i = m.find(needle, i + 1) + return count + + def dump_and_count(machine, label): + path = machine.state_dir / f"ram-{machine.name}-{label}.raw" + reply = machine.send_monitor_command(f'pmemsave 0 {MEM_BYTES} "{path}"') + if not path.exists(): + raise Exception(f"pmemsave wrote no dump; monitor replied: {reply!r}") + full = count_occurrences(path, VOLUME_KEY) + first = count_occurrences(path, VOLUME_KEY[:32]) + second = count_occurrences(path, VOLUME_KEY[32:]) + path.unlink() + print( + f"[{machine.name}/{label}] volume-key copies in RAM: " + f"full={full} first-half={first} second-half={second}" + ) + return full, first, second + + def check_suspend_wipes_key(machine): + # Precondition: `machine` reached multi-user.target with the LUKS + # volume open as /dev/mapper/foo. + machine.succeed("test -b /dev/mapper/foo") + + # Give kernel-keyring garbage collection time to run. + machine.sleep(10) + + before_full, before_first, before_second = dump_and_count(machine, "before-suspend") + assert (before_full, before_first, before_second) == (0, 1, 1), ( + f"[{machine.name}] expected exactly one copy of the two parts of the volume key each " + f"while the volume is open, found {before_full} / {before_first} / {before_second}" + ) + + # Suspend the volume -- this must wipe the key from kernel memory. + machine.succeed("cryptsetup luksSuspend foo") + + after_full, after_first, after_second = dump_and_count(machine, "after-suspend") + assert (after_full, after_first, after_second) == (0, 0, 0), ( + f"[{machine.name}] volume key material still present in RAM after luksSuspend " + f"(full={after_full} first-half={after_first} second-half={after_second}) " + f"-- key-wipe bug is present" + ) + + # Variant 1 + cli.start() + cli.wait_for_unit("multi-user.target") + cli.wait_for_file(LUKS_DEV) + cli.succeed(f"echo -n abc | cryptsetup luksOpen {LUKS_DEV} foo") + check_suspend_wipes_key(cli) + + # Variant 2 + native.start() + native.wait_for_unit("multi-user.target") + check_suspend_wipes_key(native) + ''; +} diff --git a/nixos/tests/matrix/continuwuity.nix b/nixos/tests/matrix/continuwuity.nix index cf07293b1ab0..80c46fb21362 100644 --- a/nixos/tests/matrix/continuwuity.nix +++ b/nixos/tests/matrix/continuwuity.nix @@ -20,61 +20,66 @@ in }; networking.firewall.allowedTCPPorts = [ 6167 ]; }; + client = { pkgs, ... }: { environment.systemPackages = [ - (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.matrix-nio ]; } '' + (pkgs.writers.writePython3Bin "do_test" { libraries = [ pkgs.python3Packages.mautrix ]; } '' import asyncio - import nio + + from mautrix.client import Client + from mautrix.types import EventType, RoomFilter async def main() -> None: # Connect to continuwuity - client = nio.AsyncClient("http://continuwuity:6167", "${user}") + client = Client( + mxid="@${user}:${name}", + base_url="http://continuwuity:6167", + ) # Log in as user alice - response = await client.login("${pass}") + await client.login(password="${pass}") # Create a new room - response = await client.room_create(federate=False) - print("Matrix room create response:", response) - assert isinstance(response, nio.RoomCreateResponse) - room_id = response.room_id + room_id = await client.create_room() + print("Created room:", room_id) # Join the room - response = await client.join(room_id) - print("Matrix join response:", response) - assert isinstance(response, nio.JoinResponse) + await client.join_room_by_id(room_id) + print("Joined room") # Send a message to the room - response = await client.room_send( - room_id=room_id, - message_type="m.room.message", - content={ - "msgtype": "m.text", - "body": "Hello continuwuity!" - } - ) - print("Matrix room send response:", response) - assert isinstance(response, nio.RoomSendResponse) + received = asyncio.Event() + msg = "Hello continuwuity!" - # Sync responses - response = await client.sync(timeout=30000) - print("Matrix sync response:", response) - assert isinstance(response, nio.SyncResponse) + async def on_message(evt): + if ( + evt.room_id != room_id + or evt.sender != client.mxid + or evt.type != EventType.ROOM_MESSAGE + ): + return - # Check the message was received by continuwuity - last_message = response.rooms.join[room_id].timeline.events[-1].body - assert last_message == "Hello continuwuity!" + assert evt.content.body == msg + received.set() + + client.add_event_handler(EventType.ROOM_MESSAGE, on_message) + sync_task = client.start(RoomFilter(rooms=[room_id])) + + await client.send_text(room_id, msg) + + # Sync until message is received + await asyncio.wait_for(received.wait(), timeout=30) # Leave the room - response = await client.room_leave(room_id) - print("Matrix room leave response:", response) - assert isinstance(response, nio.RoomLeaveResponse) + await client.leave_room(room_id) + print("Left room") # Close the client - await client.close() + client.stop() + await sync_task if __name__ == "__main__": @@ -96,6 +101,7 @@ in ''; meta.maintainers = with lib.maintainers; [ + bartoostveen nyabinary snaki ]; diff --git a/nixos/tests/matrix/matrix-authentication-service.nix b/nixos/tests/matrix/matrix-authentication-service.nix new file mode 100644 index 000000000000..19900b5a9c18 --- /dev/null +++ b/nixos/tests/matrix/matrix-authentication-service.nix @@ -0,0 +1,438 @@ +{ pkgs, lib, ... }: +let + mailerCerts = import ../common/acme/server/snakeoil-certs.nix; + ca_key = mailerCerts.ca.key; + ca_pem = mailerCerts.ca.cert; + + mkBundle = + domain: + pkgs.runCommand "bundle-${domain}" + { + nativeBuildInputs = [ pkgs.minica ]; + } + '' + minica -ca-cert ${ca_pem} -ca-key ${ca_key} \ + -domains ${domain} + install -Dm444 -t $out ${domain}/{key,cert}.pem + ''; + + mkDexConfig = + domain: primaryIP: + let + bundle = mkBundle domain; + in + { + enable = true; + settings = { + issuer = "https://${dexDomain}:5556"; + storage.type = "sqlite3"; + web = { + https = "${primaryIP}:5556"; + tlsCert = "${bundle}/cert.pem"; + tlsKey = "${bundle}/key.pem"; + }; + oauth2.skipApprovalScreen = true; + connectors = [ + { + type = "mockPassword"; + id = "mock"; + name = "Example"; + config = { + username = "${testUser}"; + password = "${testPassword}"; + }; + } + ]; + }; + }; + + testUser = "alice"; + testPassword = "AliceSuperSecretPassword123!"; + + matrixSecret = "test_matrix_shared_secret_0123456789abcdef"; + + synapseDomain = "hs1.test"; + + masDomain = "mas1.test"; + masULID = "01KVT6DSNT2MWD7WYMT2FY4SH5"; + + dexDomain = "dex1.test"; + oidcClientID = "matrix-authentication-service"; + oidcClientSecret = "lalalalalala"; + + loginCodeVerifier = "5kaYTTNVVehUrtJ8xi72ogdfwX8vxHMb3jEUBjyWcXQ"; + loginCodeChallenge = "FbNLCROaJHe4LJQ7FEm7XjqDoWazb3emTE89x6Nx0Ng"; +in +{ + + name = "matrix-authentication-service-upstream"; + meta = { + teams = [ lib.teams.matrix ]; + }; + + nodes = { + hs1 = + { + lib, + config, + pkgs, + nodes, + ... + }: + let + bundle = mkBundle synapseDomain; + in + { + networking = { + hostName = lib.head (lib.strings.splitString "." synapseDomain); + domain = lib.last (lib.strings.splitString "." synapseDomain); + firewall.allowedTCPPorts = [ + 80 + 443 + 8448 + ]; + }; + + services.matrix-synapse = { + enable = true; + extras = [ "oidc" ]; + settings = { + listeners = [ + { + port = 8448; + bind_addresses = [ + config.networking.primaryIPAddress + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ + { + names = [ + "client" + ]; + compress = true; + } + { + names = [ + "federation" + ]; + compress = false; + } + ]; + } + ]; + + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + redis = { + enabled = true; + host = "localhost"; + port = config.services.redis.servers.matrix-synapse.port; + }; + tls_certificate_path = "${bundle}/cert.pem"; + tls_private_key_path = "${bundle}/key.pem"; + public_baseurl = "https://${synapseDomain}:8448"; + + # Delegate authentication to MAS + matrix_authentication_service = { + enabled = true; + endpoint = "https://${masDomain}:8080"; + force_http2 = true; + secret = matrixSecret; + }; + }; + }; + services.postgresql = { + enable = true; + authentication = pkgs.lib.mkOverride 10 '' + local all all trust + host all all 127.0.0.1/32 trust + host all all ::1/128 trust + ''; + + # The database name and user are configured by the following options: + # - services.matrix-synapse.database_name + # - services.matrix-synapse.database_user + # + # The values used here represent the default values of the module. + initialScript = pkgs.writeText "synapse-init.sql" '' + CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; + CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" + TEMPLATE template0 + LC_COLLATE = "C" + LC_CTYPE = "C"; + ''; + }; + services.redis.servers.matrix-synapse = { + enable = true; + port = 6379; + }; + security.pki.certificateFiles = [ + ca_pem + ]; + networking.extraHosts = '' + ${nodes.mas1.networking.primaryIPAddress} ${masDomain} + ${nodes.dex1.networking.primaryIPAddress} ${dexDomain} + ${nodes.hs1.networking.primaryIPAddress} ${synapseDomain} + ''; + + environment.systemPackages = [ + pkgs.matrix-synapse + pkgs.matrix-authentication-service + ]; + }; + + mas1 = + { nodes, ... }: + let + bundle = mkBundle masDomain; + + extraConfig = pkgs.writeText "masExtraConfig.yml" ( + builtins.toJSON { + secrets = { + encryption_file = "/var/lib/matrix-authentication-service/encryption"; + keys = [ + { + kid = "rsa-4096"; + key_file = "/var/lib/matrix-authentication-service/key_rsa_4096"; + } + ]; + }; + } + ); + in + { + services.matrix-authentication-service = { + enable = true; + createDatabase = true; + extraConfigFiles = [ (toString extraConfig) ]; + settings = { + http = { + public_base = "https://${masDomain}:8080/"; + tls = { + certificate_file = "${bundle}/cert.pem"; + key_file = "${bundle}/key.pem"; + }; + listeners = [ + { + name = "web"; + binds = [ { address = "0.0.0.0:8080"; } ]; + resources = [ + { name = "discovery"; } + { name = "human"; } + { name = "oauth"; } + ]; + tls = { + certificate_file = "${bundle}/cert.pem"; + key_file = "${bundle}/key.pem"; + }; + } + ]; + }; + matrix = { + homeserver = "hs1"; + endpoint = "https://${synapseDomain}:8448/"; + secret_file = "/var/lib/matrix-authentication-service/matrix_secret"; + }; + database.uri = "postgresql:///matrix-authentication-service?host=/run/postgresql&user=matrix-authentication-service"; + # secrets is defined in extraConfigFiles + policy.data.client_registration.allow_insecure_uris = true; + upstream_oauth2.providers = [ + { + id = masULID; + client_id = oidcClientID; + client_secret_file = "\${CREDENTIALS_DIRECTORY}/oidc_client_secret"; + issuer = "https://${dexDomain}:5556"; + scope = "openid email profile"; + token_endpoint_auth_method = "client_secret_post"; + } + ]; + }; + credentials.oidc_client_secret = "${pkgs.writeText "oidc-client-secret" oidcClientSecret}"; + }; + services.postgresql.authentication = pkgs.lib.mkOverride 10 '' + local all all trust + host all all 127.0.0.1/32 trust + host all all ::1/128 trust + ''; + systemd.services.matrix-authentication-service.preStart = '' + echo -n '${matrixSecret}' > /var/lib/matrix-authentication-service/matrix_secret + echo -n '0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef' > /var/lib/matrix-authentication-service/encryption + ${pkgs.openssl}/bin/openssl genrsa -out /var/lib/matrix-authentication-service/key_rsa_4096 4096 + ''; + security.pki.certificateFiles = [ ca_pem ]; + networking.extraHosts = '' + ${nodes.hs1.networking.primaryIPAddress} ${synapseDomain} + ${nodes.dex1.networking.primaryIPAddress} ${dexDomain} + ''; + networking.firewall.allowedTCPPorts = [ + 8080 + 8081 + ]; + }; + + dex1 = + { + lib, + config, + nodes, + ... + }: + { + services.dex = lib.mkMerge [ + (mkDexConfig dexDomain config.networking.primaryIPAddress) + { + settings.staticClients = [ + { + id = oidcClientID; + name = "Matrix"; + redirectURIs = [ "https://${masDomain}:8080/upstream/callback/${masULID}" ]; + secret = oidcClientSecret; + } + ]; + } + ]; + security.pki.certificateFiles = [ ca_pem ]; + networking.extraHosts = '' + ${nodes.hs1.networking.primaryIPAddress} ${synapseDomain} + ${nodes.mas1.networking.primaryIPAddress} ${masDomain} + ${nodes.dex1.networking.primaryIPAddress} ${dexDomain} + ''; + networking.firewall.allowedTCPPorts = [ 5556 ]; + }; + }; + + testScript = '' + import json + import re + + + COOKIES = "-c /tmp/cookies.txt -b /tmp/cookies.txt" + + + def visit(url, *opts): + """Follow the whole redirect chain from `url`; return `effective_url` and response body.""" + out = dex1.succeed( + f"curl -sL {COOKIES} {' '.join(opts)} -w '\\n%{{url_effective}}' '{url.strip()}'" + ) + body, _, effective = out.rpartition("\n") + return effective.strip(), body + + + def location(url, *opts): + """Request `url` and return where it redirects, but don't follow it. + + Used for the OAuth callback, which points at http://localhost:1234 where + nothing is listening, so `curl --location` would ultimately fail. + """ + return dex1.succeed( + f"curl -s {COOKIES} -w '%{{redirect_url}}' -o /dev/null " + f"{' '.join(opts)} '{url.strip()}'" + ).strip() + + + def extract_csrf(html): + match = re.search(r'name="csrf" value="([^"]+)"', html) + assert match is not None, f"unable to find csrf token in {html}" + return match.group(1) + + + def authorize(): + """Start the OIDC flow and return the first redirect URL.""" + return dex1.succeed( + "scope='openid urn:matrix:org.matrix.msc2967.client:api:*'; " + "curl -fs -G -w '%{redirect_url}' -o /dev/null https://${masDomain}:8080/authorize " + f"-d response_type=code -d client_id={client_id} " + "-d redirect_uri=http://localhost:1234/callback " + '--data-urlencode "scope=$scope" ' + "-d state=somestate -d code_challenge=${loginCodeChallenge} " + "-d code_challenge_method=S256" + ) + + + start_all() + + # wait locally until units are ready + dex1.wait_for_unit("dex.service") + hs1.wait_for_unit("matrix-synapse.service") + mas1.wait_for_unit("matrix-authentication-service.service") + hs1.wait_until_succeeds("curl --fail -s --cacert ${ca_pem} https://${synapseDomain}:8448/") + hs1.wait_until_succeeds("journalctl -u matrix-synapse.service | grep -q 'Connected to redis'") + hs1.require_unit_state("postgresql.target") + mas1.wait_for_open_port(8080) + + # cross-node reachability + mas1.wait_until_succeeds("curl --fail --silent --show-error --cacert ${ca_pem} https://${dexDomain}:5556/.well-known/openid-configuration") + mas1.wait_until_succeeds("curl --fail --silent --show-error --cacert ${ca_pem} https://${synapseDomain}:8448/") + hs1.wait_until_succeeds("curl --fail --silent --show-error https://${masDomain}:8080/.well-known/openid-configuration") + + # Register a fresh OAuth client and grab its client_id + client_id_resp = json.loads(dex1.succeed( + "curl -s -X POST https://${masDomain}:8080/oauth2/registration " + "-H 'Content-Type: application/json' " + "-d '{ \"client_name\": \"test_client\", \"client_uri\": \"http://localhost:1234/\", \"redirect_uris\": [\"http://localhost:1234/callback\"], \"response_types\": [\"code\"], \"grant_types\": [ \"authorization_code\" ], \"token_endpoint_auth_method\": \"none\" }'" + )) + t.assertIn("client_id", client_id_resp) + client_id = client_id_resp["client_id"] + + with subtest("Register"): + location(authorize()) # follow /authorize to put the session cookie in the jar. + + # To login with Upstream (Dex) the page returns a clickable link; we hardcode + # it here since we already know its shape. + upstream_url = f"https://${masDomain}:8080/upstream/authorize/${masULID}?id={client_id}&kind=continue_authorization_grant" + _, mock_body = visit(upstream_url) + _match = re.search(r'state=([^"&]+)', mock_body) + assert _match is not None, f"unable to find state in {mock_body}" + oidc_state = _match.group(1) + + next_url, body = visit( + f"https://${dexDomain}:5556/auth/mock/login?back=&state={oidc_state}", + "-d 'login=${testUser}'", + "-d 'password=${testPassword}'", + ) + next_url, body = visit(next_url, f"-d 'csrf={extract_csrf(body)}&action=register&username=${testUser}'") + visit(next_url, f"-d 'csrf={extract_csrf(body)}&action=set&display_name=Alice'") + + with subtest("Login"): + consent_url, body = visit(authorize()) + + # Alice already has a session cookie, so /consent redirects straight to the callback. + callback_url = location(consent_url, f"-d 'csrf={extract_csrf(body)}&action=consent'") + _match = re.search(r'code=([^&]+)', callback_url) + assert _match is not None, f"unable to find code in {callback_url}" + code = _match.group(1) + + access_token_resp = json.loads(dex1.succeed( + "curl -s -X POST https://${masDomain}:8080/oauth2/token " + "-d 'grant_type=authorization_code' " + f"-d 'client_id={client_id}' -d 'code={code}' " + "-d 'redirect_uri=http://localhost:1234/callback' " + "-d 'code_verifier=${loginCodeVerifier}'" + )) + t.assertIn("access_token", access_token_resp) + access_token = access_token_resp["access_token"] + + with subtest("Create Room"): + room_id_resp = json.loads(dex1.succeed( + "curl --fail -s -X POST https://${synapseDomain}:8448/_matrix/client/v3/createRoom " + "-H 'Content-Type: application/json' " + f"-H 'Authorization: Bearer {access_token}' " + "-d '{}'" + )) + t.assertIn("room_id", room_id_resp) + room_id = room_id_resp["room_id"] + + with subtest("Send Message"): + dex1.succeed( + "curl -fs -X POST " + f"https://${synapseDomain}:8448/_matrix/client/v3/rooms/{room_id}/send/m.room.message " + f"-H 'Authorization: Bearer {access_token}' " + "-H 'Content-Type: application/json' " + "-d '{\"msgtype\":\"m.text\",\"body\":\"hello from alice\"}' | grep event_id" + ) + ''; +} diff --git a/nixos/tests/matrix/pantalaimon.nix b/nixos/tests/matrix/pantalaimon.nix index fdf2c4de7ad3..aac75ab28c9d 100644 --- a/nixos/tests/matrix/pantalaimon.nix +++ b/nixos/tests/matrix/pantalaimon.nix @@ -31,9 +31,6 @@ let in { name = "pantalaimon"; - meta = { - maintainers = pkgs.lib.teams.matrix.members; - }; nodes.machine = { pkgs, ... }: diff --git a/nixos/tests/matrix/synapse-workers.nix b/nixos/tests/matrix/synapse-workers.nix deleted file mode 100644 index 949658caac47..000000000000 --- a/nixos/tests/matrix/synapse-workers.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ pkgs, ... }: -{ - name = "matrix-synapse-workers"; - meta = { - inherit (pkgs.matrix-synapse.meta) maintainers; - }; - - nodes = { - homeserver = - { - pkgs, - nodes, - ... - }: - { - services.postgresql = { - enable = true; - initialScript = pkgs.writeText "synapse-init.sql" '' - CREATE ROLE "matrix-synapse" WITH LOGIN PASSWORD 'synapse'; - CREATE DATABASE "matrix-synapse" WITH OWNER "matrix-synapse" - TEMPLATE template0 - LC_COLLATE = "C" - LC_CTYPE = "C"; - ''; - }; - - services.matrix-synapse = { - enable = true; - settings = { - database = { - name = "psycopg2"; - args.password = "synapse"; - }; - enable_registration = true; - enable_registration_without_verification = true; - - federation_sender_instances = [ "federation_sender" ]; - }; - configureRedisLocally = true; - workers = { - "federation_sender" = { }; - }; - }; - }; - }; - - testScript = '' - start_all() - - homeserver.wait_for_unit("matrix-synapse.service"); - homeserver.wait_for_unit("matrix-synapse-worker-federation_sender.service"); - ''; -} diff --git a/nixos/tests/matrix/synapse.nix b/nixos/tests/matrix/synapse.nix index 7827705ffe21..961c0506ed9d 100644 --- a/nixos/tests/matrix/synapse.nix +++ b/nixos/tests/matrix/synapse.nix @@ -1,101 +1,194 @@ { pkgs, ... }: let - ca_key = mailerCerts.ca.key; ca_pem = mailerCerts.ca.cert; - bundle = - pkgs.runCommand "bundle" + aliceName = "alice"; + alicePassword = "alicealice"; + aliceEmail = "alice@example.com"; + + bobName = "bob"; + bobPassword = "hunter2"; + + mkBundle = + domain: + pkgs.runCommand "bundle-${domain}" { nativeBuildInputs = [ pkgs.minica ]; } '' minica -ca-cert ${ca_pem} -ca-key ${ca_key} \ - -domains localhost - install -Dm444 -t $out localhost/{key,cert}.pem + -domains ${domain} + install -Dm444 -t $out ${domain}/{key,cert}.pem ''; mailerCerts = import ../common/acme/server/snakeoil-certs.nix; mailerDomain = mailerCerts.domain; registrationSharedSecret = "unsecure123"; - testUser = "alice"; - testPassword = "alicealice"; - testEmail = "alice@example.com"; - listeners = [ + anonHash = "hunter2hunter2hunter2"; + anonHashF = pkgs.writeText "hash" anonHash; + + mkHomeserverBase = + domain: nodes: + let + bundle = mkBundle domain; + in + { lib, ... }: { - port = 8448; - bind_addresses = [ - "127.0.0.1" - "::1" + security.pki.certificateFiles = [ + mailerCerts.ca.cert ]; - type = "http"; - tls = true; - x_forwarded = false; - resources = [ - { - names = [ - "client" - ]; - compress = true; - } - { - names = [ - "federation" - ]; - compress = false; - } - ]; - } - ]; + networking = { + hostName = lib.head (lib.strings.splitString "." domain); + domain = lib.last (lib.strings.splitString "." domain); + firewall.allowedTCPPorts = [ + 80 + 443 + 8448 + ]; + }; + + services.nginx = { + enable = true; + virtualHosts."${domain}" = { + sslCertificate = "${bundle}/cert.pem"; + sslCertificateKey = "${bundle}/key.pem"; + addSSL = true; + locations."/.well-known/matrix/server".extraConfig = '' + default_type application/json; + return 200 '${ + builtins.toJSON { + "m.server" = "${domain}:8448"; + } + }'; + ''; + }; + }; + }; + + mkSynapseConfig = + domain: primaryIP: + let + bundle = mkBundle domain; + in + { + enable = true; + settings = { + # We're in a test environment with local machines, so + # we actually _want_ to use RFC1918 addresses. + ip_range_blacklist = [ ]; + + trusted_key_servers = [ + { server_name = "hs1.test"; } + { server_name = "hs2.test"; } + ]; + + registration_shared_secret = registrationSharedSecret; + public_baseurl = "https://${domain}"; + tls_certificate_path = "${bundle}/cert.pem"; + tls_private_key_path = "${bundle}/key.pem"; + listeners = [ + # Using a local listener, otherwise matrix-synapse-register_new_matrix_user will + # fail because it'll try to connect to the first bind address, but via TLS resulting + # in a signature verification failure. + { + port = 8008; + type = "http"; + tls = false; + resources = [ + { + names = [ "client" ]; + compress = true; + } + ]; + bind_addresses = [ "::1" ]; + } + { + port = 8448; + bind_addresses = [ + primaryIP + ]; + type = "http"; + tls = true; + x_forwarded = false; + resources = [ + { + names = [ + "client" + ]; + compress = true; + } + { + names = [ + "federation" + ]; + compress = false; + } + ]; + } + ]; + }; + }; in { - name = "matrix-synapse"; meta = { inherit (pkgs.matrix-synapse.meta) maintainers; }; nodes = { - # Since 0.33.0, matrix-synapse doesn't allow underscores in server names - serverpostgres = + synapse-with-workers = { + lib, + config, pkgs, nodes, - config, ... }: - let - mailserverIP = nodes.mailserver.networking.primaryIPAddress; - in { - services.matrix-synapse = { - enable = true; - settings = { - inherit listeners; - database = { - name = "psycopg2"; - args.password = "synapse"; + imports = [ + (mkHomeserverBase "hs1.test" nodes) + ]; + + services.matrix-synapse = lib.mkMerge [ + (mkSynapseConfig "hs1.test" config.networking.primaryIPAddress) + { + settings = { + server_name = "hs1.test"; + email = { + smtp_host = mailerDomain; + smtp_port = 25; + require_transport_security = true; + notif_from = "matrix "; + app_name = "Matrix"; + }; + listeners = [ + { + path = "/run/matrix-synapse/main_replication.sock"; + type = "http"; + resources = [ + { + names = [ "replication" ]; + compress = false; + } + ]; + } + ]; + database = { + name = "psycopg2"; + args.password = "synapse"; + }; + federation_sender_instances = [ "federation_sender" ]; }; - redis = { - enabled = true; - host = "localhost"; - port = config.services.redis.servers.matrix-synapse.port; + configureRedisLocally = true; + workers = { + "federation_sender" = { }; }; - tls_certificate_path = "${bundle}/cert.pem"; - tls_private_key_path = "${bundle}/key.pem"; - registration_shared_secret = registrationSharedSecret; - public_baseurl = "https://example.com"; - email = { - smtp_host = mailerDomain; - smtp_port = 25; - require_transport_security = true; - notif_from = "matrix "; - app_name = "Matrix"; - }; - }; - }; + } + ]; + services.postgresql = { enable = true; @@ -113,20 +206,6 @@ in ''; }; - services.redis.servers.matrix-synapse = { - enable = true; - port = 6380; - }; - - networking.extraHosts = '' - ${mailserverIP} ${mailerDomain} - ''; - - security.pki.certificateFiles = [ - mailerCerts.ca.cert - ca_pem - ]; - environment.systemPackages = let sendTestMailStarttls = pkgs.writeScriptBin "send-testmail-starttls" '' @@ -140,7 +219,7 @@ in smtp.ehlo() smtp.starttls(context=ctx) smtp.ehlo() - smtp.sendmail('matrix@${mailerDomain}', '${testEmail}', 'Subject: Test STARTTLS\n\nTest data.') + smtp.sendmail('matrix@${mailerDomain}', '${aliceEmail}', 'Subject: Test STARTTLS\n\nTest data.') smtp.quit() ''; @@ -149,16 +228,14 @@ in # adding the email through the API is quite complicated as it involves more than one step and some # client-side calculation insertEmailForAlice = pkgs.writeText "alice-email.sql" '' - INSERT INTO user_threepids (user_id, medium, address, validated_at, added_at) VALUES ('${testUser}@serverpostgres', 'email', '${testEmail}', '1629149927271', '1629149927270'); + INSERT INTO user_threepids (user_id, medium, address, validated_at, added_at) VALUES ('${aliceName}@serverpostgres', 'email', '${aliceEmail}', '1629149927271', '1629149927270'); ''; in pkgs.writeScriptBin "obtain-token-and-register-email" '' #!${pkgs.runtimeShell} - set -o errexit - set -o pipefail - set -o nounset + set -euxo pipefail su postgres -c "psql -d matrix-synapse -f ${insertEmailForAlice}" - curl --fail -XPOST 'https://localhost:8448/_matrix/client/r0/account/password/email/requestToken' -d '{"email":"${testEmail}","client_secret":"foobar","send_attempt":1}' -v + curl --fail -XPOST 'https://hs1.test:8448/_matrix/client/r0/account/password/email/requestToken' -d '{"email":"${aliceEmail}","client_secret":"foobar","send_attempt":1}' -v ''; in [ @@ -168,74 +245,189 @@ in ]; }; - # test mail delivery - mailserver = args: { - security.pki.certificateFiles = [ - mailerCerts.ca.cert - ]; + mailserver = + { lib, ... }: + { + security.pki.certificateFiles = [ + mailerCerts.ca.cert + ]; - networking.firewall.enable = false; + networking = { + hostName = lib.head (lib.strings.splitString "." mailerDomain); + domain = lib.last (lib.strings.splitString "." mailerDomain); + firewall.enable = false; + }; - services.postfix = { - enable = true; - enableSubmission = true; + services.postfix = { + enable = true; + enableSubmission = true; - # blackhole transport - transport = "example.com discard:silently"; + # blackhole transport + transport = "example.com discard:silently"; - settings.main = { - myhostname = "${mailerDomain}"; - # open relay for subnet - mynetworks_style = "subnet"; - debug_peer_level = "10"; - smtpd_relay_restrictions = [ - "permit_mynetworks" - "reject_unauth_destination" - ]; + settings.main = { + myhostname = "${mailerDomain}"; + # open relay for subnet + mynetworks_style = "subnet"; + debug_peer_level = "10"; + smtpd_relay_restrictions = [ + "permit_mynetworks" + "reject_unauth_destination" + ]; - # disable obsolete protocols, something old versions of twisted are still using - smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; - smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; - smtpd_tls_chain_files = [ - "${mailerCerts.${mailerDomain}.key}" - "${mailerCerts.${mailerDomain}.cert}" - ]; + # disable obsolete protocols, something old versions of twisted are still using + smtpd_tls_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtpd_tls_mandatory_protocols = "TLSv1.3, TLSv1.2, !TLSv1.1, !TLSv1, !SSLv2, !SSLv3"; + smtpd_tls_chain_files = [ + "${mailerCerts.${mailerDomain}.key}" + "${mailerCerts.${mailerDomain}.cert}" + ]; + }; }; }; - }; - serversqlite = args: { - services.matrix-synapse = { - enable = true; - settings = { - inherit listeners; - database.name = "sqlite3"; - tls_certificate_path = "${bundle}/cert.pem"; - tls_private_key_path = "${bundle}/key.pem"; + synapse-minimal = + { + nodes, + config, + lib, + ... + }: + { + imports = [ + (mkHomeserverBase "hs2.test" nodes) + ]; + + services.matrix-synapse = lib.mkMerge [ + (mkSynapseConfig "hs2.test" config.networking.primaryIPAddress) + { + settings = { + database.name = "sqlite3"; + server_name = "hs2.test"; + }; + } + ]; + }; + + client = + { pkgs, ... }: + { + environment.systemPackages = [ + # `pkgs.olm` is cached on c.n.o, even if this test isn't built due + # to it being allow-listed in `pkgs/top-level/release.nix`. + (import pkgs.path { + config = pkgs.config // { + permittedInsecurePackages = [ "olm-3.2.16" ]; + }; + }).matrix-commander + pkgs.jq + ]; + + security.pki.certificateFiles = [ mailerCerts.ca.cert ]; + + users.users = { + alice.isNormalUser = true; + bob.isNormalUser = true; + }; + + networking.useNetworkd = true; + services.rust-federation-tester = { + enable = true; + settings = { + listen_addr = "unix:/run/rust-federation-tester/rust-federation-tester.sock"; + frontend_url = "http://localhost:8080"; + database_url = "sqlite:///var/lib/rust-federation-tester/db?mode=rwc"; + magic_token_secret = "foobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobarfoobar"; + statistics = { + enabled = true; + prometheus_enabled = true; + anonymization_salt._secret = "${anonHashF}"; + raw_retention_days = 30; + }; + }; }; }; - }; }; testScript = '' + import json + from pprint import pprint + start_all() - mailserver.wait_for_unit("postfix.service") - serverpostgres.succeed("send-testmail-starttls") - serverpostgres.wait_for_unit("matrix-synapse.service") - serverpostgres.wait_until_succeeds( - "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" - ) - serverpostgres.wait_until_succeeds( + + synapse_with_workers.wait_for_unit("multi-user.target") + synapse_minimal.wait_for_unit("multi-user.target") + mailserver.wait_for_unit("multi-user.target") + + synapse_with_workers.wait_until_succeeds( "journalctl -u matrix-synapse.service | grep -q 'Connected to redis'" ) - serverpostgres.require_unit_state("postgresql.target") - serverpostgres.succeed("REQUESTS_CA_BUNDLE=${ca_pem} register_new_matrix_user -u ${testUser} -p ${testPassword} -a -k ${registrationSharedSecret} https://localhost:8448/") - serverpostgres.succeed("obtain-token-and-register-email") - serversqlite.wait_for_unit("matrix-synapse.service") - serversqlite.wait_until_succeeds( - "curl --fail -L --cacert ${ca_pem} https://localhost:8448/" - ) - serversqlite.succeed("[ -e /var/lib/matrix-synapse/homeserver.db ]") - ''; + synapse_with_workers.wait_for_unit("matrix-synapse-worker-federation_sender.service"); + with subtest("register user with email confirmation"): + synapse_with_workers.succeed("send-testmail-starttls") + synapse_with_workers.succeed("REQUESTS_CA_BUNDLE=${mailerCerts.ca.cert} register_new_matrix_user -u ${aliceName} -p ${alicePassword} -a -k ${registrationSharedSecret} https://hs1.test:8448/") + synapse_with_workers.succeed("obtain-token-and-register-email") + + with subtest("matrix-synapse-register_new_matrix_user"): + synapse_minimal.succeed("matrix-synapse-register_new_matrix_user -u ${bobName} -p ${bobPassword} --no-admin") + synapse_minimal.succeed("[ -e /var/lib/matrix-synapse/homeserver.db ]") + + with subtest("Federation tester"): + expected_anonymization_hashes = { + "hs1.test": "0558582846d6e2d90612900d449871dfcbf9878ba78de4a8469d8aba2d9c037b", + "hs2.test": "d3d88c2033c03b74ec1e086e15c0251514de060de5e51cb381e896f892a5b0cd", + } + + # /metrics are cached for up to 30 seconds + for n, domain in enumerate(["hs2.test", "hs1.test"], start=3): + result = json.loads( + client.succeed( + f"curl --fail --unix-socket /run/rust-federation-tester/rust-federation-tester.sock 'http://localhost:8080/api/federation/report?server_name={domain}&stats_opt_in=true'" + ) + ) + pprint(result) + t.assertTrue(result["FederationOK"]) + t.assertTrue(result["ConnectionReports"][f"192.168.1.{n}:8448"]["Checks"]["AllChecksOK"]) + t.assertEqual(f"{domain}:8448", result["WellKnownResult"][f"192.168.1.{n}:443"]["m.server"]) + + client.sleep(30) + # /metrics are cached for up to 30 seconds + for domain in ["hs2.test", "hs1.test"]: + metrics = client.succeed("curl --unix-socket /run/rust-federation-tester/rust-federation-tester.sock http://localhost:8080/metrics --fail") + t.assertRegex( + metrics, + f'federation_request_total\\{{server=\\"{expected_anonymization_hashes[domain]}\\",result=\\"success\\",[^}}]+\\}} 1' + ) + + def run_as_alice(cmd): + return client.succeed(f"sudo -u alice matrix-commander -c /home/alice/credentials.json -s /home/alice/matrix {cmd}") + + def run_as_bob(cmd): + return client.succeed(f"sudo -u bob matrix-commander -c /home/bob/credentials.json -s /home/bob/matrix {cmd}") + + with subtest("Login"): + run_as_alice("--login password --homeserver https://hs1.test:8448 --user-login @${aliceName}:hs1.test --password ${alicePassword} --device commander --room-default '#welcome:hs1.test'") + run_as_bob("--login password --homeserver https://hs2.test:8448 --user-login @${bobName}:hs2.test --password ${bobPassword} --device commander --room-default '#welcome:hs1.test'") + + with subtest("Create/Invite/Join"): + run_as_alice("--room-create '#welcome:hs1.test'") + + run_as_alice("--room-invite '#welcome:hs1.test' -u @${bobName}:hs2.test") + run_as_bob("--listen once --room-invites 'list+join'") + + with subtest("Send/receive messages"): + senders = { + "alice": ("hs1", run_as_alice), + "bob": ("hs2", run_as_bob), + } + + for name, (hs, fn) in senders.items(): + fn(f"-m 'hello, I am {name}'") + for _, run in senders.values(): + msg_data = json.loads(run("--listen once --listen-self --output json")) + pprint(msg_data) + t.assertEqual(msg_data["source"]["content"]["body"], f"hello, I am {name}") + t.assertEqual(msg_data["source"]["sender"], f"@{name}:{hs}.test") + ''; } diff --git a/nixos/tests/matter-server.nix b/nixos/tests/matter-server.nix index 5aeffaa97b42..ca4d55a161ce 100644 --- a/nixos/tests/matter-server.nix +++ b/nixos/tests/matter-server.nix @@ -1,7 +1,7 @@ { pkgs, lib, ... }: let - chipVersion = pkgs.python311Packages.home-assistant-chip-core.version; + chipVersion = pkgs.python3Packages.home-assistant-chip-core.version; in { diff --git a/nixos/tests/mattermost/default.nix b/nixos/tests/mattermost/default.nix index 075781583c00..1fd46f19abfa 100644 --- a/nixos/tests/mattermost/default.nix +++ b/nixos/tests/mattermost/default.nix @@ -66,12 +66,7 @@ import ../make-test-python.nix ( # Upgrade to the latest Mattermost. specialisation.latest.configuration = { - services.mattermost.package = lib.mkForce ( - pkgs.mattermostLatest.override { - removeFreeBadge = true; - removeUserLimit = true; - } - ); + services.mattermost.package = lib.mkForce pkgs.mattermostLatest; system.stateVersion = lib.mkVMOverride (lib.versions.majorMinor lib.version); }; } diff --git a/nixos/tests/monado.nix b/nixos/tests/monado.nix index 609b0fa647e5..ab73471215b1 100644 --- a/nixos/tests/monado.nix +++ b/nixos/tests/monado.nix @@ -3,47 +3,57 @@ name = "monado"; nodes.machine = - { pkgs, ... }: + { + lib, + pkgs, + config, + ... + }: { - hardware.graphics.enable = true; - users.users.alice = { - isNormalUser = true; - uid = 1000; + imports = [ ./common/openxr.nix ]; + + systemd.user.services.print-openxr-info = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + requires = [ "monado.service" ]; + script = lib.getExe' pkgs.openxr-loader "openxr_runtime_list"; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + }; }; - services.monado = { - enable = true; - defaultRuntime = true; - - forceDefaultRuntime = true; + systemd.user.services.xrgears = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + requires = [ "monado.service" ]; + script = lib.getExe pkgs.xrgears; }; - # Stop Monado from probing for any hardware - systemd.user.services.monado.environment.SIMULATED_ENABLE = "1"; - - environment.systemPackages = with pkgs; [ openxr-loader ]; }; testScript = { nodes, ... }: - let - userId = toString nodes.machine.users.users.alice.uid; - runtimePath = "/run/user/${userId}"; - in '' - # for defaultRuntime - machine.succeed("stat /etc/xdg/openxr/1/active_runtime.json") + with subtest("Ensure X11 starts"): + start_all() + machine.succeed("loginctl enable-linger alice") + machine.wait_for_x() - machine.succeed("loginctl enable-linger alice") - machine.wait_for_unit("user@${userId}.service") + with subtest("Ensure default runtime present"): + machine.succeed("stat /etc/xdg/openxr/1/active_runtime.json") - machine.wait_for_unit("monado.socket", "alice") - machine.systemctl("start monado.service", "alice") - machine.wait_for_unit("monado.service", "alice") + with subtest("Ensure forced runtime present"): + # Monado needs to be started to create the forced runtime file + machine.systemctl("start monado.service", "alice") + machine.wait_for_unit("monado.service", "alice") + machine.succeed("stat /home/alice/.config/openxr/1/active_runtime.json") - # for forceDefaultRuntime - machine.succeed("stat /home/alice/.config/openxr/1/active_runtime.json") + with subtest("Ensure openxr_runtime_list can find runtime"): + machine.wait_for_unit("print-openxr-info.service", "alice") - machine.succeed("su -- alice -c env XDG_RUNTIME_DIR=${runtimePath} openxr_runtime_list") + with subtest("Ensure xrgears launches"): + machine.wait_for_unit("xrgears.service", "alice") + # TODO: 10 seconds should be long enough for anything, but this is theoretically flaky + machine.sleep(10) + machine.screenshot("screen") ''; } diff --git a/nixos/tests/mtp.nix b/nixos/tests/mtp.nix index be2ed5b1f018..47cf10561eb6 100644 --- a/nixos/tests/mtp.nix +++ b/nixos/tests/mtp.nix @@ -23,7 +23,6 @@ environment.systemPackages = with pkgs; [ usbutils glib - jmtpfs tree ]; services.gvfs.enable = true; @@ -88,22 +87,6 @@ ${unmountAllMtpDevices} ''; }; - jmtpfs = { - # jmtpfsTest: - # 1. Mounts the device on a dir named `phone` using jmtpfs - # 2. Puts the current Nixpkgs libmtp version into a file - # 3. Checks for corruption with `diff` - # 4. Prints the directory tree - jmtpfsTest = pkgs.writeScript "jmtpfsTest.sh" '' - set -e - mkdir phone - jmtpfs phone - echo "${pkgs.libmtp.version}" > phone/tmp/testFile - echo "${pkgs.libmtp.version}" > testFile - diff phone/tmp/testFile testFile - tree phone - ''; - }; in # Using >&2 allows the results of the scripts to be printed to the terminal # when building this test with Nix. Scripts would otherwise complete @@ -113,6 +96,5 @@ client.wait_for_unit("multi-user.target") client.wait_for_unit("dbus.service") client.succeed("${gvfs.gvfsTest} >&2") - client.succeed("${jmtpfs.jmtpfsTest} >&2") ''; } diff --git a/nixos/tests/mysql/mysql-secure-root.nix b/nixos/tests/mysql/mysql-secure-root.nix new file mode 100644 index 000000000000..faaf1bb3955e --- /dev/null +++ b/nixos/tests/mysql/mysql-secure-root.nix @@ -0,0 +1,94 @@ +{ + system ? builtins.currentSystem, + config ? { }, + pkgs ? import ../../.. { inherit system config; }, + lib ? pkgs.lib, +}: + +let + makeTest = import ./../make-test-python.nix; + inherit (import ./common.nix { inherit pkgs lib; }) + mysqlPackages + ; + + makeSecureRootTest = + { + package, + name ? "mysql_secure_root_" + (builtins.replaceStrings [ "-" "." ] [ "_" "" ] package.pname), + }: + makeTest { + inherit name; + + nodes.${name} = { pkgs, ... }: { + services.mysql = { + enable = true; + package = package; + }; + }; + + testScript = '' + start_all() + + machine = ${name} + machine.wait_for_unit("mysql") + + # Verify that non-root user cannot connect as root + machine.fail("sudo -u nobody mysql -u root -e 'SELECT 1;' 2>&1") + + # Verify that system root can connect as root via socket + machine.succeed("mysql -u root -e 'SELECT 1;'") + + # Verify that root@localhost has auth_socket plugin + machine.succeed("[ \"$(mysql -u root -N -e \"SELECT plugin FROM mysql.user WHERE user = 'root' AND host = 'localhost';\")\" = \"auth_socket\" ]") + + # Test service restart - verify it still works + machine.succeed("systemctl restart mysql") + machine.wait_for_unit("mysql") + + # After restart, verify non-root user still cannot connect as root + machine.fail("sudo -u nobody mysql -u root -e 'SELECT 1;' 2>&1") + + # After restart, verify system root can still connect + machine.succeed("mysql -u root -e 'SELECT 1;'") + + # After restart, verify root@localhost still has auth_socket + machine.succeed("[ \"$(mysql -u root -N -e \"SELECT plugin FROM mysql.user WHERE user = 'root' AND host = 'localhost';\")\" = \"auth_socket\" ]") + ''; + }; + + makeInsecureRootTest = + { + package, + name ? "mysql_insecure_root_" + (builtins.replaceStrings [ "-" "." ] [ "_" "" ] package.pname), + }: + makeTest { + inherit name; + + nodes.${name} = { pkgs, ... }: { + services.mysql = { + enable = true; + package = package; + secureSuperUserByDefault = false; + }; + }; + + testScript = '' + start_all() + + machine = ${name} + machine.wait_for_unit("mysql") + + # With secureRootByDefault = false, anyone can connect as root (default --initialize-insecure behavior) + machine.succeed("sudo -u nobody mysql -u root -e 'SELECT 1;' 2>&1") + ''; + }; + +in +{ + "secure-by-default" = lib.mapAttrs ( + _: package: makeSecureRootTest { inherit package; } + ) mysqlPackages; + "can-be-insecure" = lib.mapAttrs ( + _: package: makeInsecureRootTest { inherit package; } + ) mysqlPackages; +} diff --git a/nixos/tests/netdata.nix b/nixos/tests/netdata.nix index 2a85c11f0542..f03894671709 100644 --- a/nixos/tests/netdata.nix +++ b/nixos/tests/netdata.nix @@ -6,7 +6,6 @@ meta = with pkgs.lib.maintainers; { maintainers = [ cransom - raitobezarius ]; }; diff --git a/nixos/tests/nextcloud/default.nix b/nixos/tests/nextcloud/default.nix index 9a3785f89627..2cb226e353da 100644 --- a/nixos/tests/nextcloud/default.nix +++ b/nixos/tests/nextcloud/default.nix @@ -149,5 +149,6 @@ listToAttrs ( concatMap genTests [ 32 33 + 34 ] ) diff --git a/nixos/tests/nezha.nix b/nixos/tests/nezha.nix new file mode 100644 index 000000000000..924cfc1d8300 --- /dev/null +++ b/nixos/tests/nezha.nix @@ -0,0 +1,114 @@ +{ lib, pkgs, ... }: +let + agent_host = "agent.test"; + dashboard_host = "dashboard.test"; + + agentSecret = pkgs.writeText "fakeagentsecret" "fakeagentsecret"; + + hosts = { + "${agent_host}" = "192.168.0.2"; + "${dashboard_host}" = "192.168.0.1"; + }; + hostsEntries = lib.mapAttrs' (k: v: { + name = v; + value = lib.singleton k; + }) hosts; +in +{ + name = "nezha"; + + meta.maintainers = with lib.maintainers; [ moraxyc ]; + + containers = { + agent = _: { + networking = { + hostName = builtins.elemAt (lib.splitString "." agent_host) 0; + domain = builtins.elemAt (lib.splitString "." agent_host) 1; + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1.ipv4.addresses = lib.singleton { + address = hosts."${agent_host}"; + prefixLength = 24; + }; + }; + services.nezha-agent = { + enable = true; + debug = true; + genUuid = true; + settings = { + server = hosts."${dashboard_host}" + ":80"; + }; + clientSecretFile = agentSecret; + }; + }; + + dashboard = + { pkgs, ... }: + { + networking = { + firewall.enable = false; + hosts = hostsEntries; + useDHCP = false; + interfaces.eth1.ipv4.addresses = lib.singleton { + address = hosts."${dashboard_host}"; + prefixLength = 24; + }; + }; + services.nezha = { + enable = true; + debug = true; + settings = { + listenhost = "0.0.0.0"; + # Test CAP_NET_BIND_SERVICE + listenport = 80; + }; + mutableConfig = true; + jwtSecretFile = pkgs.writeText "fakejwt" "fakejwt"; + agentSecretFile = agentSecret; + }; + }; + }; + + testScript = '' + import json + + with subtest("Wait for services and network"): + dashboard.wait_for_unit("nezha.service") + agent.wait_for_unit("nezha-agent.service") + dashboard.wait_for_open_port(80) + dashboard.wait_for_unit("network.target") + agent.wait_for_unit("network.target") + agent.succeed("curl --fail --max-time 10 http://dashboard.test/") + + with subtest("Test mutableConfig"): + dashboard.succeed("systemctl stop nezha") + dashboard.succeed(""" + echo '{"sitename": "Nezha on NixOS"}' > /etc/nezha/config.yaml + """) + dashboard.succeed("systemctl start nezha") + dashboard.wait_for_unit("nezha.service") + dashboard.wait_for_open_port(80) + result = json.loads(agent.succeed(""" + curl --fail -X POST --json '{ "username": "admin", "password": "admin"}' \ + 'http://dashboard.test/api/v1/login' + """)) + token = result['data']['token'] + result = json.loads(agent.succeed(f""" + curl --fail -X GET --header 'Authorization: Bearer {token}' \ + 'http://dashboard.test/api/v1/setting' + """)) + assert "Nezha on NixOS" == result['data']['config']['site_name'] + + with subtest("Verify connection and uuid"): + uuid = agent.succeed( + "${lib.getExe' pkgs.util-linux "uuidgen"} --md5 -n @dns -N ${agent_host}" + ) + # remove unprintable characters + uuid = "".join([char for char in uuid if char.isprintable()]) + agent.wait_until_succeeds(f""" + curl --fail -X GET --header 'Authorization: Bearer {token}' \ + 'http://dashboard.test/api/v1/server' | grep {uuid} + """) + ''; +} diff --git a/nixos/tests/nfs/kerberos.nix b/nixos/tests/nfs/kerberos.nix index f9720cfb87e2..ae787f8b7436 100644 --- a/nixos/tests/nfs/kerberos.nix +++ b/nixos/tests/nfs/kerberos.nix @@ -83,9 +83,16 @@ import ../make-test-python.nix ( services.nfs.server.enable = true; services.nfs.server.createMountPoints = true; - services.nfs.server.exports = '' - /data *(rw,no_root_squash,fsid=0,sec=krb5p) - ''; + services.nfs.server.exports = { + "/data" = { + "*" = [ + "rw" + "no_root_squash" + "fsid=0" + "sec=krb5p" + ]; + }; + }; }; }; diff --git a/nixos/tests/nfs/simple.nix b/nixos/tests/nfs/simple.nix index 3f2b8d3bbb1c..eebcb36cc0a5 100644 --- a/nixos/tests/nfs/simple.nix +++ b/nixos/tests/nfs/simple.nix @@ -37,9 +37,16 @@ import ../make-test-python.nix ( { ... }: { services.nfs.server.enable = true; - services.nfs.server.exports = '' - /data 192.168.1.0/255.255.255.0(rw,no_root_squash,no_subtree_check,fsid=0) - ''; + services.nfs.server.exports = { + "/data" = { + "192.168.1.0/255.255.255.0" = [ + "rw" + "no_root_squash" + "no_subtree_check" + "fsid=0" + ]; + }; + }; services.nfs.server.createMountPoints = true; networking.firewall.enable = false; # FIXME: figure out what ports need to be allowed }; diff --git a/nixos/tests/nginx-lua.nix b/nixos/tests/nginx-lua.nix new file mode 100644 index 000000000000..8159882a7d5c --- /dev/null +++ b/nixos/tests/nginx-lua.nix @@ -0,0 +1,37 @@ +{ lib, ... }: +{ + name = "nginx-lua"; + + meta.maintainers = [ lib.maintainers.kranzes ]; + + nodes.machine = { + services.nginx = { + enable = true; + lua = { + enable = true; + extraPackages = p: [ + p.lua-resty-lrucache + p.lua-cjson + ]; + }; + virtualHosts."localhost".locations."/" = { + extraConfig = '' + default_type text/plain; + content_by_lua_block { + local cache = require("resty.lrucache").new(8) + cache:set("greeting", require("cjson").decode('"Hello world!"')) + ngx.say((cache:get("greeting"))) + } + ''; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("nginx") + machine.wait_for_open_port(80) + + response = machine.wait_until_succeeds("curl -fsS http://127.0.0.1/").strip() + assert response == "Hello world!", f"Expected 'Hello world!', got '{response}'" + ''; +} diff --git a/nixos/tests/nixos-test-driver/console-timeout.nix b/nixos/tests/nixos-test-driver/console-timeout.nix new file mode 100644 index 000000000000..504f4504bf9d --- /dev/null +++ b/nixos/tests/nixos-test-driver/console-timeout.nix @@ -0,0 +1,26 @@ +{ pkgs, lib, ... }: +{ + name = "console-timeout"; + + nodes.machine = { + systemd.services.generate-output.script = '' + echo "match that" + sleep 1 + + for i in $(seq 15); do + echo "line $i" + done + + echo "match this" + ''; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("multi-user.target") + + machine.systemctl("start generate-output") + machine.wait_for_console_text("match that") + machine.wait_for_console_text("match this", timeout=10) + ''; +} diff --git a/nixos/tests/nixos-test-driver/efivars.nix b/nixos/tests/nixos-test-driver/efivars.nix new file mode 100644 index 000000000000..953c69a0257e --- /dev/null +++ b/nixos/tests/nixos-test-driver/efivars.nix @@ -0,0 +1,110 @@ +{ pkgs, lib, ... }: +let + vendorUuid = "a19f72f8-b554-4bd7-a0c2-2762bd854691"; + varName = "Demo"; + readWriteVar = pkgs.writers.writePython3 "read-increment-efi-var" { } '' + import os + import sys + import fcntl + import array + + if len(sys.argv) != 3: + print(f"Usage: {sys.argv[0]} NAME UUID", file=sys.stderr) + sys.exit(1) + + name = sys.argv[1] + uuid = sys.argv[2] + path = f"/sys/firmware/efi/efivars/{name}-{uuid}" + + FS_IMMUTABLE_FL = 0x00000010 + FS_IOC_GETFLAGS = 0x80086601 + FS_IOC_SETFLAGS = 0x40086602 + + if not os.path.exists(path): + print(f"{path}: does not exist", file=sys.stderr) + sys.exit(1) + + with open(path, "rb") as f: + data = f.read() + + # The first 4 bytes are attributes, the rest is the data + if data[4:] != b"\x2a": + print(f"0x2a value expected, got {data[4:]!r}", file=sys.stderr) + sys.exit(1) + + fd = os.open(path, os.O_RDONLY) + arg = array.array("L", [0]) + fcntl.ioctl(fd, FS_IOC_GETFLAGS, arg) + if arg[0] & FS_IMMUTABLE_FL: + arg[0] &= ~FS_IMMUTABLE_FL + fcntl.ioctl(fd, FS_IOC_SETFLAGS, arg) + os.close(fd) + + with open(path, "wb") as f: + # Write 0x2b + data = bytes(list(data[:4]) + [0x2b]) + f.write(data) + ''; +in +{ + name = "efivars"; + + nodes.machine = { + boot.loader.efi.canTouchEfiVariables = true; + virtualisation.useEFIBoot = true; + }; + + testScript = '' + import uuid + import unittest + + from test_driver.efi import EfiVariable + from test_driver.errors import RequestedAssertionFailed + + + class TestConcurrentRead(unittest.TestCase): + def __init__(self, machine): + super().__init__() + self.machine = machine + + def test_concurrent_read(self): + with self.assertRaises(RequestedAssertionFailed): + self.machine.read_efi_vars() + + + vendor_uuid = uuid.UUID('${vendorUuid}') + machine.create_efi_vars() + machine.write_efi_vars([ + EfiVariable( + vendor_uuid=vendor_uuid, + name="${varName}", + data=bytes([0x2a]), + flags=EfiVariable.Flags.NON_VOLATILE | EfiVariable.Flags.BOOTSERVICE_ACCESS | EfiVariable.Flags.RUNTIME_ACCESS, + ) + ]) + + machine.start() + machine.wait_for_unit("multi-user.target") + + print(machine.succeed('${readWriteVar} "${varName}" "${vendorUuid}"')) + + TestConcurrentRead(machine).test_concurrent_read() + machine.crash() + + machine.dump_efi_vars() + vars = machine.read_efi_vars() + + guid = uuid.UUID(bytes=vendor_uuid.bytes_le) + predicate = lambda v: v.name == "${varName}" and v.vendorUUID == guid + var = next((v for v in vars if predicate(v)), None) + + if var: + var.print() + if var.data == bytes([0x2b]): + print("Congrats!") + else: + raise ValueError("Value 0x2b expected") + else: + raise ValueError("Could not find ${varName} variable") + ''; +} diff --git a/nixos/tests/nordvpn.nix b/nixos/tests/nordvpn.nix new file mode 100644 index 000000000000..59af7c54660f --- /dev/null +++ b/nixos/tests/nordvpn.nix @@ -0,0 +1,129 @@ +{ lib, ... }: +{ + name = "nordvpn"; + meta.maintainers = with lib.maintainers; [ different-error ]; + nodes = + let + commonConfig = user: { + # norduserd reads DBUS_SESSION_BUS_ADDRESS which the + # desktopManager sets on user session creation (i.e. login) + services.xserver.enable = true; + services.desktopManager.plasma6.enable = true; + services.displayManager.gdm.enable = true; + services.displayManager.autoLogin = { + enable = true; + user = user; + }; + }; + in + { + nada = { ... }: { }; + basic = + { ... }: + lib.recursiveUpdate { + users.users.alice = { + extraGroups = [ "nordvpn" ]; + isNormalUser = true; + }; + # default: run nordvpnd as nordvpn:nordvpn + services.nordvpn.enable = true; + } (commonConfig "alice"); + userOnly = + { ... }: + lib.recursiveUpdate { + users.users.kanye = { + extraGroups = [ "nordvpn" ]; + isNormalUser = true; + }; + # run nordvpnd as kanye:nordvpn + services.nordvpn = { + enable = true; + user = "kanye"; + }; + } (commonConfig "kanye"); + groupOnly = + { ... }: + lib.recursiveUpdate { + users.users.alice = { + extraGroups = [ "kanye" ]; + isNormalUser = true; + }; + users.groups.kanye = { }; + # run nordvpnd as nordvpn:kanye + services.nordvpn = { + enable = true; + group = "kanye"; + }; + } (commonConfig "alice"); + userAndGroup = + { ... }: + lib.recursiveUpdate { + users.users.kanye = { + group = "kanye"; + isNormalUser = true; + }; + users.groups.kanye = { }; + # run nordvpnd as kanye:kanye + services.nordvpn = { + enable = true; + group = "kanye"; + user = "kanye"; + }; + } (commonConfig "kanye"); + }; + + testScript = '' + class UserGroupTestCase: + def __init__(self, machine, user, has_nordvpn_usr, has_nordvpn_gp): + self.machine = machine + self.user = user + self.has_nordvpn_usr = has_nordvpn_usr + self.has_nordvpn_gp = has_nordvpn_gp + + def run(self): + self.machine.start() + self.verify_nordvpn_user() + self.verify_nordvpn_group() + self.verify_services() + self.machine.shutdown() + + def verify_nordvpn_user(self): + if self.has_nordvpn_usr: + self.machine.succeed("id nordvpn") + else: + self.machine.fail("id nordvpn") + + def verify_nordvpn_group(self): + group_str = self.machine.succeed(f"sudo -u {self.user} groups") + groups = [x.strip() for x in group_str.split(" ")] + if self.has_nordvpn_gp: + assert "nordvpn" in groups, f"nordvpn is not in {groups} but should be" + else: + assert "nordvpn" not in groups, f"nordvpn is in {groups} but should not be" + + def verify_services(self): + self.machine.wait_for_unit("nordvpnd", timeout=60) + self.machine.wait_for_unit("norduserd", self.user, timeout=90) + # verify can talk to nordvpnd. give nordvpnd at most 5s to initialize. + self.machine.wait_until_succeeds("nordvpn status", timeout=5) + self.machine.succeed("nordvpn status") + + test_cases = [ + UserGroupTestCase(basic, "alice", has_nordvpn_usr=True, has_nordvpn_gp=True), + UserGroupTestCase(userOnly, "kanye", has_nordvpn_usr=False, has_nordvpn_gp=True), + UserGroupTestCase(groupOnly, "alice", has_nordvpn_usr=True, has_nordvpn_gp=False), + UserGroupTestCase(userAndGroup, "kanye", has_nordvpn_usr=False, has_nordvpn_gp=False), + ] + + # NADA + nada.start() + nada.wait_for_unit("multi-user.target", timeout=60) + nada.fail("nordvpnd") + nada.fail("nordvpn") + nada.fail("norduserd") + nada.shutdown() + + for test_case in test_cases: + test_case.run() + ''; +} diff --git a/nixos/tests/nsd.nix b/nixos/tests/nsd.nix index 747d691a87d6..04e9fd7f1ba4 100644 --- a/nixos/tests/nsd.nix +++ b/nixos/tests/nsd.nix @@ -21,7 +21,7 @@ in { imports = [ common ]; networking.nameservers = lib.mkForce [ - (lib.head nodes.server.config.networking.interfaces.eth1.ipv4.addresses).address + (lib.head nodes.server.networking.interfaces.eth1.ipv4.addresses).address ]; networking.interfaces.eth1.ipv4.addresses = [ { @@ -36,7 +36,7 @@ in { imports = [ common ]; networking.nameservers = lib.mkForce [ - (lib.head nodes.server.config.networking.interfaces.eth1.ipv6.addresses).address + (lib.head nodes.server.networking.interfaces.eth1.ipv6.addresses).address ]; networking.interfaces.eth1.ipv4.addresses = [ { diff --git a/nixos/tests/nspawn-daemon-reexec-dbus.nix b/nixos/tests/nspawn-daemon-reexec-dbus.nix new file mode 100644 index 000000000000..115deb778bb5 --- /dev/null +++ b/nixos/tests/nspawn-daemon-reexec-dbus.nix @@ -0,0 +1,79 @@ +# Regression test for an nspawn-only systemd re-exec failure that broke D-Bus. +# +# Demonstrates `systemctl show` keeps working on `daemon-reexec`. +# +# Trigger: `systemctl daemon-reexec` issues a D-Bus `Manager.Reexecute`, like +# `switch-to-configuration-ng` on a systemd package change. +# +# Root cause: inside nspawn test containers PID 1 re-send `READY=1` on the +# `NOTIFY_SOCKET` on re-exec. The test driver stopped draining that socket +# after boot, so until drained its receive buffer filled and `systemctl` hung / +# errored `Failed to connect to bus: Transport endpoint is not connected`. +{ ... }: +{ + name = "nspawn-daemon-reexec-dbus"; + + # `containers.` => systemd-nspawn machine (vs `nodes.` => QEMU). + # An empty container boots full systemd + D-Bus, which is all we need. + containers.machine = { }; + + testScript = # python + '' + import re + + BUS_BROKEN = re.compile( + r"Transport endpoint is not connected|Failed to connect to bus" + ) + + # Without the fix the notify socket's receive buffer fills after 10 + # undrained `READY=1` resends, so PID 1 blocks then. + REEXECS = 10 + + + def bus_broken(): + """Whether the in-container D-Bus is unusable. A broken bus prints a + transport error or hangs until `timeout` kills it (status 124); both + count as broken.""" + status, out = machine.execute( + "timeout 10 systemctl show -p ActiveState --value " + "multi-user.target 2>&1", + check_return=False, + timeout=20, + ) + return status != 0 or bool(BUS_BROKEN.search(out)), status, out + + + machine.start() + machine.wait_for_unit("multi-user.target", timeout=120) + + # Pre-reexec sanity: the bus works and shows no break. + broken, status, out = bus_broken() + assert not broken, ( + f"bus already broken before any reexec: status={status} out={out!r}" + ) + machine.log(f"pre-reexec sanity OK: {out.strip()!r}") + + broke_at = None + for i in range(1, REEXECS + 1): + # The same D-Bus Manager.Reexecute that switch-to-configuration issues + # on a systemd change. + machine.execute( + "timeout 30 systemctl daemon-reexec", + check_return=False, + timeout=45, + ) + broken, status, out = bus_broken() + machine.log(f"[reexec {i}] status={status} out={out.strip()!r}") + if broken: + broke_at = i + break + + assert broke_at is None, ( + f"nspawn D-Bus broke after daemon-reexec #{broke_at} of {REEXECS} " + "(systemctl hung or returned a bus transport error). The re-exec'd " + "PID 1 never finished re-initialising -- the test driver stopped " + "draining the notify socket, so PID 1's READY=1 resend blocked. " + "Never observed on QEMU." + ) + ''; +} diff --git a/nixos/tests/openresty-lua.nix b/nixos/tests/openresty-lua.nix index 367154947371..999bd6963470 100644 --- a/nixos/tests/openresty-lua.nix +++ b/nixos/tests/openresty-lua.nix @@ -1,12 +1,4 @@ -{ pkgs, lib, ... }: -let - luaLibs = [ - pkgs.lua.pkgs.markdown - ]; - - getLuaPath = lib: "${lib}/share/lua/${pkgs.lua.luaversion}/?.lua"; - luaPath = lib.concatStringsSep ";" (map getLuaPath luaLibs); -in +{ pkgs, ... }: { name = "openresty-lua"; meta = with pkgs.lib.maintainers; { @@ -15,7 +7,7 @@ in nodes = { webserver = - { pkgs, lib, ... }: + { pkgs, ... }: { networking = { extraHosts = '' @@ -27,9 +19,10 @@ in enable = true; package = pkgs.openresty; - commonHttpConfig = '' - lua_package_path '${luaPath};;'; - ''; + lua = { + enable = true; + extraPackages = p: [ p.markdown ]; + }; virtualHosts."default.test" = { default = true; diff --git a/nixos/tests/optee.nix b/nixos/tests/optee.nix index 2d7c80bda78c..08377a84a188 100644 --- a/nixos/tests/optee.nix +++ b/nixos/tests/optee.nix @@ -4,7 +4,6 @@ meta = { maintainers = with lib.maintainers; [ jmbaur ]; - broken = pkgs.stdenv.hostPlatform.isAarch64; }; nodes.machine = @@ -17,7 +16,8 @@ uboot = ubootQemuAarch64.overrideAttrs (old: { postPatch = (old.postPatch or "") + '' substituteInPlace board/emulation/qemu-arm/qemu-arm.env \ - --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x46000000" + --replace-fail "kernel_addr_r=0x40400000" "kernel_addr_r=0x50000000" \ + --replace-fail "ramdisk_addr_r=0x44000000" "ramdisk_addr_r=0x58000000" ''; }); @@ -53,6 +53,7 @@ # VM boots up via qfw boot.loader.grub.enable = false; + boot.kernelModules = [ "optee" ]; services.tee-supplicant = { enable = true; diff --git a/nixos/tests/outline.nix b/nixos/tests/outline.nix index 15abc22270d4..0956d2607f7b 100644 --- a/nixos/tests/outline.nix +++ b/nixos/tests/outline.nix @@ -7,10 +7,7 @@ xanderio ]; - node.pkgsReadOnly = false; - - nodes.outline = { - virtualisation.memorySize = 2 * 1024; + containers.outline = { services.outline = { enable = true; forceHttps = false; diff --git a/nixos/tests/owi.nix b/nixos/tests/owi.nix index 74e9d2d394fd..68945f721582 100644 --- a/nixos/tests/owi.nix +++ b/nixos/tests/owi.nix @@ -8,7 +8,7 @@ meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ owi ]; environment.etc."owipass.rs".source = pkgs.writeText "owi.rs" '' diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix index 6018e2eef172..162d8b315a8b 100644 --- a/nixos/tests/parsedmarc/default.nix +++ b/nixos/tests/parsedmarc/default.nix @@ -93,8 +93,8 @@ in testScript = { nodes, ... }: let - esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; - valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value"; + esPort = toString nodes.parsedmarc.services.elasticsearch.port; + valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value"; in '' parsedmarc.start() @@ -143,7 +143,7 @@ in networking.extraHosts = '' 127.0.0.1 ${parsedmarcDomain} - ${nodes.mail.config.networking.primaryIPAddress} ${mailDomain} + ${nodes.mail.networking.primaryIPAddress} ${mailDomain} ''; services.parsedmarc = { @@ -170,7 +170,7 @@ in networking.extraHosts = '' 127.0.0.1 ${mailDomain} - ${nodes.parsedmarc.config.networking.primaryIPAddress} ${parsedmarcDomain} + ${nodes.parsedmarc.networking.primaryIPAddress} ${parsedmarcDomain} ''; services.dovecot2 = { @@ -204,8 +204,8 @@ in testScript = { nodes, ... }: let - esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; - valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value"; + esPort = toString nodes.parsedmarc.services.elasticsearch.port; + valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.services.elasticsearch.package.version "7") ".value"; in '' mail.start() diff --git a/nixos/tests/pass-secret-service.nix b/nixos/tests/pass-secret-service.nix index 57c7ac8bdcbc..6ef896f78bf2 100644 --- a/nixos/tests/pass-secret-service.nix +++ b/nixos/tests/pass-secret-service.nix @@ -39,7 +39,7 @@ testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; gpg-uid = "alice@example.net"; gpg-pw = "foobar9000"; ready-file = "/tmp/secrets-dbus-init.done"; diff --git a/nixos/tests/php/fpm-modular.nix b/nixos/tests/php/fpm-modular.nix index 360e664963cf..443594673e13 100644 --- a/nixos/tests/php/fpm-modular.nix +++ b/nixos/tests/php/fpm-modular.nix @@ -7,7 +7,7 @@ aanderse ]; - nodes.machine = + containers.machine = { config, pkgs, ... }: { environment.systemPackages = [ php ]; @@ -56,14 +56,14 @@ }; }; testScript = - { ... }: + # python '' machine.wait_for_unit("nginx.service") machine.wait_for_unit("php-fpm.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") - assert "PHP Version ${php.version}" in response, "PHP version not detected" + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:80/") + t.assertIn("PHP Version ${php.version}", response, "PHP version not detected") # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]: diff --git a/nixos/tests/php/fpm.nix b/nixos/tests/php/fpm.nix index 21336ade042b..16377ec19c24 100644 --- a/nixos/tests/php/fpm.nix +++ b/nixos/tests/php/fpm.nix @@ -3,7 +3,7 @@ name = "php-${php.version}-fpm-nginx-test"; meta.maintainers = lib.teams.php.members; - nodes.machine = + containers.machine = { config, pkgs, ... }: { environment.systemPackages = [ php ]; @@ -44,17 +44,33 @@ "pm.min_spare_servers" = 1; "pm.start_servers" = 2; }; + phpEnv = { + # check that keywords and special characters are escaped properly + keyword = "false"; + characters = "^ = \\"; + quoted = "\"'"; + newline = "hello\nworld"; + }; }; }; testScript = - { ... }: + # python '' machine.wait_for_unit("nginx.service") machine.wait_for_unit("phpfpm-foobar.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") - assert "PHP Version ${php.version}" in response, "PHP version not detected" + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:80/") + t.assertIn("PHP Version ${php.version}", response, "PHP version not detected") + + expected_env = { + "keyword": "false", + "characters": "^ = \\", + "quoted": ""'", + "newline": "hello\nworld", + } + for env, value in expected_env.items(): + assert f'{env} {value} ' in response, f"phpEnv.{env} not detected" # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite", "apcu"]: diff --git a/nixos/tests/php/httpd.nix b/nixos/tests/php/httpd.nix index 9ee157a01096..36381c15509f 100644 --- a/nixos/tests/php/httpd.nix +++ b/nixos/tests/php/httpd.nix @@ -7,7 +7,7 @@ name = "php-${php.version}-httpd-test"; meta.maintainers = lib.teams.php.members; - nodes.machine = + containers.machine = { config, pkgs, @@ -32,13 +32,13 @@ }; }; testScript = - { ... }: + # python '' machine.wait_for_unit("httpd.service") # Check so we get an evaluated PHP back - response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/") - assert "PHP Version ${php.version}" in response, "PHP version not detected" + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:80/") + t.assertIn("PHP Version ${php.version}", response, "PHP version not detected") # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: diff --git a/nixos/tests/php/pcre.nix b/nixos/tests/php/pcre.nix index e95ce76c7d7e..fb4c59e310da 100644 --- a/nixos/tests/php/pcre.nix +++ b/nixos/tests/php/pcre.nix @@ -11,7 +11,7 @@ in name = "php-${php.version}-httpd-pcre-jit-test"; meta.maintainers = lib.teams.php.members; - nodes.machine = + containers.machine = { pkgs, ... }: { time.timeZone = "UTC"; @@ -50,12 +50,13 @@ in pcntl_wait($pid); ''; in + # python '' machine.wait_for_unit("httpd.service") # Ensure php evaluation by matching on the var_dump syntax - response = machine.succeed("curl -fvvv -s http://127.0.0.1:80/index.php") + response = machine.wait_until_succeeds("curl -fvvv -s http://127.0.0.1:80/index.php") expected = 'string(${toString (builtins.stringLength testString)}) "${testString}"' - assert expected in response, "Does not appear to be able to use subgroups." - machine.succeed("${php}/bin/php -f ${pcreJitSeallocForkIssue}") + t.assertIn(expected, response, "Does not appear to be able to use subgroups.") + machine.succeed("${lib.getExe php} -f ${pcreJitSeallocForkIssue}") ''; } diff --git a/nixos/tests/plausible.nix b/nixos/tests/plausible.nix index b7da2eb4bbb9..5b0d58464ae5 100644 --- a/nixos/tests/plausible.nix +++ b/nixos/tests/plausible.nix @@ -1,37 +1,142 @@ -{ lib, ... }: -{ - name = "plausible"; - meta = { - maintainers = with lib.maintainers; [ - e1mo - xanderio - ]; - }; +{ runTest }: - nodes.machine = - { pkgs, ... }: +let + secretKeybase = "nannannannannannannannannannannannannannannannannannannan_batman!"; + + # A fixed bcrypt password hash is fine for a test; the plaintext is never + # needed because the test only checks that an admin user exists (and thus the + # "first launch" setup wizard is unreachable), not that login with the + # password works. + adminEmail = "admin@localhost"; + + mkPlausibleTest = { - virtualisation.memorySize = 4096; - services.plausible = { - enable = true; - server = { - baseUrl = "http://localhost:8000"; - secretKeybaseFile = "${pkgs.writeText "dont-try-this-at-home" "nannannannannannannannannannannannannannannannannannannan_batman!"}"; + seedAdmin ? false, + }: + runTest ( + { lib, pkgs, ... }: + let + adminPassword = "correct-horse-battery-staple"; + adminPasswordHashFile = pkgs.runCommand "plausible-admin-password-hash" { } '' + ${lib.getExe pkgs.mkpasswd} -m bcrypt ${lib.escapeShellArg adminPassword} > "$out" + ''; + in + { + name = "plausible" + lib.optionalString seedAdmin "-declarative-admin-user"; + meta = { + maintainers = with lib.maintainers; [ + nh2 + stepbrobd + ]; }; - }; - }; - testScript = '' - start_all() - machine.wait_for_unit("plausible.service") - machine.wait_for_open_port(8000) + nodes.machine = { + # On first boot, the ClickHouse migrations run by Plausible's + # `migrate.sh` intermittently fail with `(Mint.TransportError) socket + # closed`, which aborts startup before the web server opens its port. + # The failure is transient and succeeds on a subsequent attempt, so + # retry startup without a rate limit until the port opens. (Without + # this, the test is flaky.) + systemd.services.plausible.serviceConfig.Restart = lib.mkForce "always"; + systemd.services.plausible.serviceConfig.RestartSec = 1; + systemd.services.plausible.unitConfig.StartLimitIntervalSec = 0; - # Ensure that the software does not make not make the machine - # listen on any public interfaces by default. - machine.fail("ss -tlpn 'src = 0.0.0.0 or src = [::]' | grep LISTEN") + services.plausible = { + enable = true; + adminUser = lib.mkIf seedAdmin { + email = adminEmail; + name = "Test Admin"; + passwordHashFile = "${adminPasswordHashFile}"; + }; + server = { + baseUrl = "http://localhost:8000"; + secretKeybaseFile = builtins.toFile "plausible-test-secret-keybase-file" secretKeybase; + }; + }; + }; - machine.succeed("curl -f localhost:8000 >&2") + testScript = '' + machine.wait_for_unit("plausible.service") + machine.wait_for_open_port(8000) - machine.succeed("curl -f localhost:8000/js/script.js >&2") - ''; + # Ensure that the software does not make the machine + # listen on any public interfaces by default. + machine.fail("ss -tlpn 'src = 0.0.0.0 or src = [::]' | grep LISTEN") + + machine.succeed("curl -f localhost:8000 >&2") + machine.succeed("curl -f localhost:8000/js/script.js >&2") + + def user_count(): + # Plausible's "first launch" state is defined as "no user exists" + # (`Plausible.Release.should_be_first_launch?` is + # `not Repo.exists?(Plausible.Auth.User)`), so we inspect the `users` + # table directly. Local Postgres connections use `trust` auth in this + # VM, so the `postgres` superuser can query without a password. + return machine.succeed( + "sudo -u postgres psql --dbname plausible --tuples-only --no-align " + "--command 'SELECT count(*) FROM users'" + ).strip() + + def login_redirect_url(): + return machine.succeed( + "curl -s -o /dev/null -w '%{redirect_url}' localhost:8000/login" + ).strip() + '' + + ( + if seedAdmin then + '' + with subtest("the admin user is seeded"): + assert user_count() == "1", "expected exactly one seeded admin user" + email = machine.succeed( + "sudo -u postgres psql --dbname plausible --tuples-only --no-align " + "--command 'SELECT email FROM users'" + ).strip() + assert email == "${adminEmail}", f"unexpected seeded admin email: {email!r}" + + with subtest("the setup wizard is NOT reachable"): + # `/login` must render normally (HTTP 200) and must not redirect + # to the first-launch `/register` wizard. + status = machine.succeed( + "curl -s -o /dev/null -w '%{http_code}' localhost:8000/login" + ).strip() + assert status == "200", f"expected /login to render (200), got: {status!r}" + location = login_redirect_url() + assert "/register" not in location, ( + f"/login unexpectedly redirected to the setup wizard: {location!r}" + ) + + with subtest("seeding is idempotent across restarts"): + machine.succeed("systemctl restart plausible.service") + machine.wait_for_open_port(8000) + assert user_count() == "1", "expected still exactly one user after restart" + '' + else + '' + with subtest("without an admin user, the setup wizard is reachable"): + assert user_count() == "0", "expected no users in first-launch state" + # With no user seeded, `should_be_first_launch?` is true and the + # browser pipeline's `FirstLaunchPlug` 302-redirects every page to + # `/register`. + location = login_redirect_url() + assert "/register" in location, ( + f"expected /login to redirect to the setup wizard /register, but redirect was: {location!r}" + ) + '' + ); + } + ); +in +{ + # Basic test: Plausible without a declaratively configured admin user is in + # the "first launch" state, so the unauthenticated setup wizard is reachable. + # This also asserts that the way the `declarative-admin-user` test detects + # "wizard reachable" actually fires for this Plausible version, so a future + # Plausible change that breaks the detection would make that test fail rather + # than silently pass. + basic = mkPlausibleTest { seedAdmin = false; }; + + # Tests that a declaratively configured admin user is seeded before the web + # server accepts connections, so the unauthenticated "first launch" setup + # wizard is never reachable. + declarative-admin-user = mkPlausibleTest { seedAdmin = true; }; } diff --git a/nixos/tests/playwright-python.nix b/nixos/tests/playwright-python.nix index 7911dac1b428..018985020ddb 100644 --- a/nixos/tests/playwright-python.nix +++ b/nixos/tests/playwright-python.nix @@ -29,7 +29,7 @@ "firefox": {}, "webkit": {} } - needle = re.compile("Nix.*Reference Manual") + needle = re.compile("Nix.* Manual") if len(sys.argv) != 3 or sys.argv[1] not in browsers.keys(): print(f"usage: {sys.argv[0]} [{'|'.join(browsers.keys())}] ") sys.exit(1) diff --git a/nixos/tests/podman/tls-ghostunnel.nix b/nixos/tests/podman/tls-ghostunnel.nix index 1fcfd08f0efc..027683df4b25 100644 --- a/nixos/tests/podman/tls-ghostunnel.nix +++ b/nixos/tests/podman/tls-ghostunnel.nix @@ -83,7 +83,7 @@ import ../make-test-python.nix ( }; testScript = '' - import os + import subprocess import shlex @@ -93,7 +93,7 @@ import ../make-test-python.nix ( def cmd(command): print(f"+{command}") - r = os.system(command) + r = subprocess.run(command, shell=True).returncode if r != 0: raise Exception(f"Command {command} failed with exit code {r}") diff --git a/nixos/tests/postfix-tlspol.nix b/nixos/tests/postfix-tlspol.nix index d1af9877adb3..76a99b920c75 100644 --- a/nixos/tests/postfix-tlspol.nix +++ b/nixos/tests/postfix-tlspol.nix @@ -9,7 +9,10 @@ containers.machine = { services.postfix.enable = true; - services.postfix-tlspol.enable = true; + services.postfix-tlspol = { + enable = true; + settings.server.metrics-address = "127.0.0.1:8642"; + }; services.dnsmasq = { enable = true; @@ -26,13 +29,19 @@ with subtest("Interact with the service"): machine.succeed("postfix-tlspol -purge") - response = json.loads((machine.succeed("postfix-tlspol -query localhost"))) + response = machine.log(machine.succeed("postfix-tlspol -query localhost")) + response = json.loads(machine.succeed("postfix-tlspol -query localhost")) machine.log(json.dumps(response, indent=2)) assert response["dane"]["policy"] == "", f"Unexpected DANE policy for localhost: {response["dane"]["policy"]}" assert response["mta-sts"]["policy"] == "TEMP", f"Unexpected MTA-STS policy for localhost: {response["mta-sts"]["policy"]}" - machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1]) + with subtest("Metrics listener"): + machine.log(machine.succeed("curl --silent --fail http://localhost:8642/metrics | grep --quiet postfix_tlspol_queries_total")) + + + with subtest("Hardening"): + machine.log(machine.execute("systemd-analyze security postfix-tlspol.service | grep -v ✓")[1]) ''; } diff --git a/nixos/tests/postgresql/postgresql.nix b/nixos/tests/postgresql/postgresql.nix index d832f5caa4e9..6fa8351bcae0 100644 --- a/nixos/tests/postgresql/postgresql.nix +++ b/nixos/tests/postgresql/postgresql.nix @@ -31,17 +31,6 @@ let INSERT INTO sth (id) VALUES (1); CREATE TABLE xmltest ( doc xml ); INSERT INTO xmltest (doc) VALUES ('ok'); -- check if libxml2 enabled - - -- check if hardening gets relaxed - CREATE EXTENSION plv8; - -- try to trigger the V8 JIT, which requires MemoryDenyWriteExecute - DO $$ - let xs = []; - for (let i = 0, n = 400000; i < n; i++) { - xs.push(Math.round(Math.random() * n)) - } - console.log(xs.reduce((acc, x) => acc + x, 0)); - $$ LANGUAGE plv8; ''; in @@ -60,9 +49,6 @@ let identMap = '' postgres root postgres ''; - # TODO(@Ma27) split this off into its own VM test and move a few other - # extension tests to use postgresqlTestExtension. - extensions = ps: with ps; [ plv8 ]; }; services.postgresqlBackup = { diff --git a/nixos/tests/prometheus-exporters.nix b/nixos/tests/prometheus-exporters.nix index ae2457265047..990dc02a5ab8 100644 --- a/nixos/tests/prometheus-exporters.nix +++ b/nixos/tests/prometheus-exporters.nix @@ -21,6 +21,9 @@ let * `nodeName` (optional) * override an incompatible testnode name * + * `testBackend` (optional) + * whether to run in `containers` (default) or `nodes` scope + * * Example: * exporterTests. = { * exporterConfig = { @@ -108,7 +111,7 @@ let wait_for_unit("prometheus-bind-exporter.service") wait_for_open_port(9119) succeed( - "curl -sSf http://localhost:9119/metrics | grep 'bind_query_recursions_total 0'" + "curl -sSf http://localhost:9119/metrics | grep 'bind_up 1'" ) ''; }; @@ -168,6 +171,7 @@ let blackbox = { pkgs, ... }: { + testBackend = "nodes"; exporterConfig = { enable = true; configFile = pkgs.writeText "config.yml" ( @@ -373,16 +377,23 @@ let }; dovecot = - { ... }: + { pkgs, ... }: { + testBackend = "nodes"; exporterConfig = { enable = true; scopes = [ "global" ]; - socketPath = "/var/run/dovecot2/old-stats"; + socketPath = "/var/run/dovecot2/stats-reader"; user = "root"; # <- don't use user root in production }; metricProvider = { - services.dovecot2.enable = true; + services.dovecot2 = { + enable = true; + settings = { + dovecot_config_version = pkgs.dovecot.version; + dovecot_storage_version = pkgs.dovecot.version; + }; + }; }; exporterTest = '' wait_for_unit("prometheus-dovecot-exporter.service") @@ -423,6 +434,7 @@ let ebpf = { ... }: { + testBackend = "nodes"; exporterConfig = { enable = true; names = [ "timers" ]; @@ -447,7 +459,6 @@ let # `services.elasticsearch` is unmaintained; OpenSearch is the same # engine class and is explicitly supported by the exporter. services.opensearch.enable = true; - virtualisation.memorySize = 2048; }; exporterTest = '' wait_for_unit("opensearch.service") @@ -463,6 +474,7 @@ let fail2ban = { ... }: { + testBackend = "nodes"; # setfacl exporterConfig = { enable = true; exitOnError = true; @@ -964,6 +976,7 @@ let modemmanager = { ... }: { + testBackend = "nodes"; exporterConfig = { enable = true; refreshRate = "10s"; @@ -1099,7 +1112,7 @@ let wait_for_unit("nginx.service") wait_for_unit("prometheus-nextcloud-exporter.service") wait_for_open_port(9205) - succeed("curl -sSf http://localhost:9205/metrics | grep 'nextcloud_up 1'") + wait_until_succeeds("curl -sSf http://localhost:9205/metrics | grep 'nextcloud_up 1'") ''; }; @@ -1658,24 +1671,6 @@ let ''; }; - scaphandre = - { ... }: - { - exporterConfig = { - enable = true; - }; - metricProvider = { - boot.kernelModules = [ "intel_rapl_common" ]; - }; - exporterTest = '' - wait_for_unit("prometheus-scaphandre-exporter.service") - wait_for_open_port(8080) - wait_until_succeeds( - "curl -sSf 'localhost:8080/metrics'" - ) - ''; - }; - shelly = { pkgs, ... }: { @@ -2143,6 +2138,7 @@ let zfs = { ... }: { + testBackend = "nodes"; # zfs kmod exporterConfig = { enable = true; }; @@ -2165,13 +2161,14 @@ lib.mapAttrs ( { pkgs, lib, ... }: let testConfig = testConfigFun { inherit pkgs lib; }; - nodeName = testConfig.nodeName or exporter; + testBackend = testConfig.testBackend or "containers"; + nodeName = "machine"; in { name = "prometheus-${exporter}-exporter"; node.pkgsReadOnly = testConfig.pkgsReadOnly or true; - nodes.${nodeName} = lib.mkMerge [ + ${testBackend}.${nodeName} = lib.mkMerge [ { services.prometheus.exporters.${exporter} = testConfig.exporterConfig; } @@ -2196,7 +2193,6 @@ lib.mapAttrs ( "${nodeName}.${line}" ) (lib.splitString "\n" (lib.removeSuffix "\n" testConfig.exporterTest)) )} - ${nodeName}.shutdown() ''; meta.maintainers = [ ]; diff --git a/nixos/tests/proxy.nix b/nixos/tests/proxy.nix index f051d429a508..1e76c7811c79 100644 --- a/nixos/tests/proxy.nix +++ b/nixos/tests/proxy.nix @@ -41,8 +41,8 @@ in Require all granted - BalancerMember http://${nodes.backend1.config.networking.hostName} retry=0 - BalancerMember http://${nodes.backend2.config.networking.hostName} retry=0 + BalancerMember http://${nodes.backend1.networking.hostName} retry=0 + BalancerMember http://${nodes.backend2.networking.hostName} retry=0 ProxyStatus full diff --git a/nixos/tests/qemu-vm-credentials.nix b/nixos/tests/qemu-vm-credentials.nix deleted file mode 100644 index 9ee2d270d8f0..000000000000 --- a/nixos/tests/qemu-vm-credentials.nix +++ /dev/null @@ -1,83 +0,0 @@ -{ - lib, - pkgs, - mechanism, - ... -}: - -let - secret = '' - foo - bar - baz - ''; - secret-file = "bar"; -in - -{ - name = "qemu-vm-credentials-${mechanism}"; - - meta.maintainers = with lib.maintainers; [ arianvp ]; - - nodes = { - machine = { - virtualisation.credentials = { - secret = { - inherit mechanism; - text = secret; - }; - secret-default-mechanism = { - text = "default-mechanism"; - }; - secret-file-nix-store = { - inherit mechanism; - source = pkgs.writeText "secret-file-nix-store" secret-file; - }; - secret-file-host = { - inherit mechanism; - source = "./secret-file-host"; - }; - secret-file-host-binary = { - inherit mechanism; - source = "./secret-file-host-binary"; - }; - }; - }; - }; - - testScript = '' - import base64 - secret_file_host = "baz" - # Binary data with null bytes, high bytes, and all sorts of problematic characters - secret_file_host_binary = bytes([ - 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, # null and control chars - 0x08, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F, - 0xDE, 0xAD, 0xBE, 0xEF, # classic binary pattern - 0xFF, 0xFE, 0xFD, 0xFC, # high bytes - 0x00, 0x00, 0x00, 0x00, # multiple nulls - 0x80, 0x81, 0x82, 0x83, # more high bytes - ]) - - with open(machine.state_dir / "secret-file-host", "w") as f: - f.write(secret_file_host) - with open(machine.state_dir / "secret-file-host-binary", "wb") as f2: - f2.write(secret_file_host_binary) - - - # Test text credential - t.assertEqual(machine.succeed("systemd-creds --system cat secret").strip(), "foo\nbar\nbaz") - - t.assertEqual(machine.succeed("systemd-creds --system cat secret-default-mechanism").strip(), "default-mechanism") - - # Test credential from nix store - t.assertEqual(machine.succeed("systemd-creds --system cat secret-file-nix-store").strip(), "${secret-file}") - - # Test credential from host file - t.assertEqual(machine.succeed("systemd-creds --system cat secret-file-host").strip(), secret_file_host) - - # Test binary credential - verify exact binary content - result = machine.succeed("systemd-creds --system cat secret-file-host-binary --transcode=base64").strip() - expected = base64.b64encode(secret_file_host_binary).decode('ascii') - t.assertEqual(result, expected, f"Binary credential mismatch: got {result}, expected {expected}") - ''; -} diff --git a/nixos/tests/redis.nix b/nixos/tests/redis.nix index f878509bce35..4ff35a509145 100644 --- a/nixos/tests/redis.nix +++ b/nixos/tests/redis.nix @@ -19,11 +19,7 @@ let }: makeTest { inherit name; - meta.maintainers = [ - lib.maintainers.das_j - lib.maintainers.flokli - lib.maintainers.helsinki-Jo - ]; + meta.maintainers = lib.teams.redis.members; nodes = { machine = diff --git a/nixos/tests/rtkit.nix b/nixos/tests/rtkit.nix index 74bf69e02a83..295fd36a1391 100644 --- a/nixos/tests/rtkit.nix +++ b/nixos/tests/rtkit.nix @@ -55,7 +55,7 @@ # Provide a little logging of polkit checks - otherwise it's # impossible to know what's going on. - security.polkit.debug = true; + security.polkit.extraArgs = [ "--log-level=notice" ]; security.polkit.extraConfig = '' polkit.addRule(function(action, subject) { const ns = "org.freedesktop.RealtimeKit1."; diff --git a/nixos/tests/rustfs.nix b/nixos/tests/rustfs.nix new file mode 100644 index 000000000000..7cace30e3bfc --- /dev/null +++ b/nixos/tests/rustfs.nix @@ -0,0 +1,69 @@ +{ pkgs, ... }: + +let + accessKey = "BKIKJAA5BMMU2RHO6IBB"; + secretKey = "V7f1CwQqAcwo80UEIJEjc5gVQUSSx5ohQ9GSrr12"; + + rustfsPythonScript = + pkgs.writers.writePython3 "rustfs-test" { libraries = with pkgs.python3Packages; [ minio ]; } + /* python */ '' + import io + import os + from minio import Minio + + minioClient = Minio( + 'localhost:9000', + access_key='${accessKey}', + secret_key='${secretKey}', + secure=False + ) + sio = io.BytesIO() + sio.write(b'Test from Python') + sio.seek(0, os.SEEK_END) + sio_len = sio.tell() + sio.seek(0) + minioClient.put_object( + 'test-bucket', + 'test.txt', + sio, + sio_len, + content_type='text/plain' + ) + ''; + +in +{ + name = "rustfs"; + meta = with pkgs.lib.maintainers; { + maintainers = [ + marcel + ]; + }; + + containers.machine = + { pkgs, ... }: + { + services.rustfs = { + enable = true; + environmentFile = builtins.toString ( + pkgs.writeText "rustfs-secrets.env" '' + RUSTFS_ACCESS_KEY=${accessKey} + RUSTFS_SECRET_KEY=${secretKey} + '' + ); + }; + + environment.systemPackages = with pkgs; [ minio-client ]; + }; + + testScript = /* python */ '' + machine.wait_for_unit("rustfs.service") + + machine.succeed("mc alias set rustfs http://localhost:9000 ${accessKey} ${secretKey} --api s3v4") + machine.succeed("mc mb rustfs/test-bucket") + machine.succeed("${rustfsPythonScript}") + assert "test-bucket" in machine.succeed("mc ls rustfs") + assert "Test from Python" in machine.succeed("mc cat rustfs/test-bucket/test.txt") + machine.succeed("mc rb --force rustfs/test-bucket") + ''; +} diff --git a/nixos/tests/sabnzbd-module.nix b/nixos/tests/sabnzbd-module.nix index 3eb9bd21e2ff..4398c5401832 100644 --- a/nixos/tests/sabnzbd-module.nix +++ b/nixos/tests/sabnzbd-module.nix @@ -105,6 +105,26 @@ in }; }; + nodes.with_secret_values = + { pkgs, ... }: + { + config = { + services.sabnzbd = { + enable = true; + settings = { + misc.api_key = "@api_key@"; + misc.nzb_key = "@nzb_key@"; + }; + secretValues = { + # Just for testing; don't use world readable files from the Nix + # store in production! + "@api_key@" = builtins.toFile "api_key" "dummyapikey"; + "@nzb_key@" = builtins.toFile "nzb_key" "dummynzbkey"; + }; + }; + }; + }; + testScript = '' def wait_for_up(m): m.wait_for_unit("sabnzbd.service") @@ -113,9 +133,12 @@ in wait_for_up(machine) wait_for_up(with_writeable_config) wait_for_up(with_raw_config_file) + wait_for_up(with_secret_values) machine.succeed("do_test") with_writeable_config.succeed("do_test") with_raw_config_file.succeed("do_test_2") + with_secret_values.succeed("grep dummyapikey /var/lib/sabnzbd/sabnzbd.ini") + with_secret_values.succeed("grep dummynzbkey /var/lib/sabnzbd/sabnzbd.ini") ''; } diff --git a/nixos/tests/scaphandre.nix b/nixos/tests/scaphandre.nix deleted file mode 100644 index bf9854b1c919..000000000000 --- a/nixos/tests/scaphandre.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ - name = "scaphandre"; - - nodes.scaphandre = - { pkgs, ... }: - { - boot.kernelModules = [ "intel_rapl_common" ]; - - environment.systemPackages = [ pkgs.scaphandre ]; - }; - - testScript = '' - scaphandre.start() - scaphandre.wait_until_succeeds( - "scaphandre stdout -t 4", - ) - ''; -} diff --git a/nixos/tests/scx/default.nix b/nixos/tests/scx/default.nix index 6865390737f8..41c7b84c90b7 100644 --- a/nixos/tests/scx/default.nix +++ b/nixos/tests/scx/default.nix @@ -13,16 +13,19 @@ specialisation = { beerland.configuration.services.scx.scheduler = "scx_beerland"; bpfland.configuration.services.scx.scheduler = "scx_bpfland"; + cake.configuration.services.scx.scheduler = "scx_cake"; + chaos.configuration.services.scx.scheduler = "scx_chaos"; cosmos.configuration.services.scx.scheduler = "scx_cosmos"; flash.configuration.services.scx.scheduler = "scx_flash"; - flatcg.configuration.services.scx.scheduler = "scx_flatcg"; + flow.configuration.services.scx.scheduler = "scx_flow"; + forge.configuration.services.scx.scheduler = "scx_forge"; lavd.configuration.services.scx.scheduler = "scx_lavd"; - nest.configuration.services.scx.scheduler = "scx_nest"; p2dq.configuration.services.scx.scheduler = "scx_p2dq"; + pandemonium.configuration.services.scx.scheduler = "scx_pandemonium"; rlfifo.configuration.services.scx.scheduler = "scx_rlfifo"; rustland.configuration.services.scx.scheduler = "scx_rustland"; rusty.configuration.services.scx.scheduler = "scx_rusty"; - simple.configuration.services.scx.scheduler = "scx_simple"; + tickless.configuration.services.scx.scheduler = "scx_tickless"; }; }; @@ -30,16 +33,19 @@ specialisation = [ "beerland", "bpfland", + "cake", + "chaos", "cosmos", "flash", - "flatcg", + "flow", + "forge", "lavd", - "nest", "p2dq", + "pandemonium", "rlfifo", "rustland", "rusty", - "simple" + "tickless", ] def activate_specialisation(name: str): diff --git a/nixos/tests/service-runner.nix b/nixos/tests/service-runner.nix index e7a552b9e536..ce7fecdb143b 100644 --- a/nixos/tests/service-runner.nix +++ b/nixos/tests/service-runner.nix @@ -29,7 +29,7 @@ machine.succeed( """ mkdir -p /run/nginx /var/log/nginx /var/cache/nginx - ${nodes.machine.config.systemd.services.nginx.runner} >&2 & + ${nodes.machine.systemd.services.nginx.runner} >&2 & echo $!>my-nginx.pid """ ) diff --git a/nixos/tests/shadow/default.nix b/nixos/tests/shadow/default.nix new file mode 100644 index 000000000000..ba773f93f073 --- /dev/null +++ b/nixos/tests/shadow/default.nix @@ -0,0 +1,5 @@ +{ runTest }: +{ + login = runTest ./login.nix; + system = runTest ./system.nix; +} diff --git a/nixos/tests/shadow.nix b/nixos/tests/shadow/login.nix similarity index 100% rename from nixos/tests/shadow.nix rename to nixos/tests/shadow/login.nix diff --git a/nixos/tests/shadow/system.nix b/nixos/tests/shadow/system.nix new file mode 100644 index 000000000000..fbed9be8beba --- /dev/null +++ b/nixos/tests/shadow/system.nix @@ -0,0 +1,147 @@ +{ pkgs, ... }: +let + # Create a Python environment for the controller with all necessary test framework dependencies + controllerPython = pkgs.python3.withPackages (ps: [ + ps.flaky + ps.jc + ps.pytest + ps.pytest-mh + ps.pytest-ticket + ]); + + shadowHostName = "shadowhost"; +in +{ + name = "shadow-system-tests"; + + meta.maintainers = with pkgs.lib.maintainers; [ joaosreis ]; + + nodes = { + # The target host: runs sshd, has shadow and other test dependencies installed, mutable users, and some specific settings to match the expectations of the test suite + shadowhost = + { pkgs, ... }: + { + networking.hostName = shadowHostName; + services.openssh = { + enable = true; + settings = { + PermitRootLogin = "yes"; + PasswordAuthentication = false; + }; + }; + + users.mutableUsers = true; + + environment.systemPackages = with pkgs; [ + shadow + expect + ]; + + users.defaultUserShell = "/bin/sh"; + + security.loginDefs.settings = { + PASS_MAX_DAYS = 99999; + PASS_MIN_DAYS = 0; + PASS_WARN_AGE = 7; + USERGROUPS_ENAB = "yes"; + CREATE_HOME = "yes"; + UID_MIN = 1001; + GID_MIN = 1001; + }; + + security.pam.services = { + newusers.text = '' + auth required pam_permit.so + account required pam_permit.so + password required pam_permit.so + session required pam_permit.so + ''; + }; + + services.envfs.enable = true; + }; + + # The controller: runs pytest-mh against the shadow host + controller = + { pkgs, ... }: + { + environment.systemPackages = [ + controllerPython + pkgs.openssh + ]; + }; + + }; + + testScript = '' + import textwrap + + start_all() + + # ------------------------------------------------------------------ + # 1. Generate an SSH keypair on the controller and authorise it + # on the shadow host + # ------------------------------------------------------------------ + controller.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + controller.succeed( + "ssh-keygen -t ed25519 -N \'\' -f /root/.ssh/id_ed25519 2>&1" + ) + pub_key = controller.succeed("cat /root/.ssh/id_ed25519.pub").strip() + + # Inject the generated public key into the shadow host at runtime + shadowhost.succeed("mkdir -p /root/.ssh && chmod 700 /root/.ssh") + shadowhost.succeed( + f"echo '{pub_key}' >> /root/.ssh/authorized_keys && " + "chmod 600 /root/.ssh/authorized_keys" + ) + + # ------------------------------------------------------------------ + # 2. Make sure the shadow host has a writable /etc/login.defs, + # since the test framework expects to be able to write to it. + # ------------------------------------------------------------------ + shadowhost.succeed( + "cp --remove-destination $(readlink -f /etc/login.defs) /etc/login.defs && " + "chmod 644 /etc/login.defs" + ) + + # ------------------------------------------------------------------ + # 3. Copy the upstream test suite onto the controller + # ------------------------------------------------------------------ + controller.succeed( + "cp -r ${pkgs.shadow.passthru.testFramework} /root/shadow-tests && " + "chmod -R u+w /root/shadow-tests" + ) + + # ------------------------------------------------------------------ + # 4. Write the mhc.yaml topology config + # This tells pytest-mh where the shadow host is and which role + # it plays. The hostname must match the NixOS node name. + # ------------------------------------------------------------------ + controller.succeed(textwrap.dedent(""" + cat > /root/shadow-tests/mhc.yaml << 'EOF' + domains: + - id: shadow + hosts: + - hostname: ${shadowHostName} + role: shadow + ssh: + user: root + private_key: /root/.ssh/id_ed25519 + EOF + """)) + + + # ------------------------------------------------------------------ + # 5. Run the upstream pytest-mh test suite from the controller + # ------------------------------------------------------------------ + shadowhost.wait_for_unit("sshd.service") + # gpasswd tests are disabled, since they rely on specific behavior of the gpasswd command that is not applicable to NixOS + controller.succeed( + "cd /root/shadow-tests && " + "${controllerPython}/bin/pytest " + "--mh-config=mhc.yaml " + "--deselect=tests/test_gpasswd.py " + "-v tests/" + ) + ''; +} diff --git a/nixos/tests/shoko.nix b/nixos/tests/shoko.nix index dfddc19b83c5..7fe68abbbd52 100644 --- a/nixos/tests/shoko.nix +++ b/nixos/tests/shoko.nix @@ -17,10 +17,7 @@ machine.succeed("curl --fail http://localhost:8111") ''; - meta.maintainers = with lib.maintainers; [ - diniamo - nanoyaki - ]; + meta.maintainers = with lib.maintainers; [ nanoyaki ]; } ); diff --git a/nixos/tests/signal-desktop.nix b/nixos/tests/signal-desktop.nix index 398f8603308c..a6c5d08c0d30 100644 --- a/nixos/tests/signal-desktop.nix +++ b/nixos/tests/signal-desktop.nix @@ -42,7 +42,7 @@ in testScript = { nodes, ... }: let - user = nodes.machine.config.users.users.alice; + user = nodes.machine.users.users.alice; in '' start_all() diff --git a/nixos/tests/simple-container.nix b/nixos/tests/simple-container.nix index 269853423651..5cd3478f3d40 100644 --- a/nixos/tests/simple-container.nix +++ b/nixos/tests/simple-container.nix @@ -1,11 +1,16 @@ { name = "simple-container"; - containers.machine = { }; + containers = { + machine = { pkgs, ... }: { + users.users.root.packages = [ pkgs.hello ]; + }; + noprofile = { }; + }; testScript = '' start_all() - machine.wait_for_unit("multi-user.target") - machine.shutdown() + machine.succeed("hello") + noprofile.fail("hello") ''; } diff --git a/nixos/tests/sing-box.nix b/nixos/tests/sing-box.nix index cc890fa6fe69..820675d69a11 100644 --- a/nixos/tests/sing-box.nix +++ b/nixos/tests/sing-box.nix @@ -511,6 +511,31 @@ in }; }; }; + + empty_settings = + { ... }: + { + environment.etc."sing-box/config.json".text = builtins.toJSON { + inbounds = [ + { + type = "mixed"; + listen = "127.0.0.1"; + listen_port = 1088; + } + ]; + outbounds = [ + { + type = "direct"; + tag = "outbound:direct"; + } + ]; + }; + + services.sing-box = { + enable = true; + settings = { }; + }; + }; }; testScript = '' @@ -558,6 +583,9 @@ in fakeip.wait_for_unit("sing-box.service") fakeip.wait_until_succeeds("ip route get ${hosts."${target_host}"} | grep 'dev ${tunInbound.interface_name}'") fakeip.succeed("dig +short A ${target_host} @${target_host} | grep '^198.18.'") + + with subtest("empty settings"): + empty_settings.wait_for_unit("sing-box.service") ''; } diff --git a/nixos/tests/slipshow.nix b/nixos/tests/slipshow.nix index abbbc6361e88..c8bd4158af5b 100644 --- a/nixos/tests/slipshow.nix +++ b/nixos/tests/slipshow.nix @@ -8,7 +8,7 @@ meta.maintainers = with lib.maintainers; [ ethancedwards8 ]; - nodes.machine = { + containers.machine = { environment.systemPackages = with pkgs; [ slipshow ]; environment.etc."slipshow".source = pkgs.fetchFromGitHub { diff --git a/nixos/tests/stardust-xr/atmosphere.nix b/nixos/tests/stardust-xr/atmosphere.nix new file mode 100644 index 000000000000..7eb2f7b2778e --- /dev/null +++ b/nixos/tests/stardust-xr/atmosphere.nix @@ -0,0 +1,54 @@ +{ ... }: +{ + name = "stardust-xr-atmosphere"; + + # Doesn't understand @polling_condition + skipTypeCheck = true; + + nodes.machine = + { + lib, + pkgs, + config, + ... + }: + + { + imports = [ ./common.nix ]; + + virtualisation.memorySize = 4096; + + systemd.user.services.stardust-xr-atmosphere = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + requires = [ "stardust-xr-server.service" ]; + after = [ "stardust-xr-server.service" ]; + script = '' + set -eufx pipefail + ${lib.getExe pkgs.stardust-xr-atmosphere} install ${pkgs.stardust-xr-atmosphere}/share/atmosphere/default_envs/the_grid + ${lib.getExe pkgs.stardust-xr-atmosphere} set-default the_grid + ${lib.getExe pkgs.stardust-xr-atmosphere} show + ''; + environment.RUST_BACKTRACE = "full"; + }; + }; + + testScript = + { nodes, ... }: + '' + @polling_condition() + def atmosphere_running(): + machine.wait_for_unit("stardust-xr-atmosphere.service", "alice") + + with subtest("Ensure X11 starts"): + start_all() + machine.succeed("loginctl enable-linger alice") + machine.wait_for_x() + + with subtest("Ensure system works"): + with atmosphere_running: + # TODO(@Pandapip1): 20 seconds should be long enough for anything, but this is theoretically flaky + # Adding systemd notify support to stardust-xr-atmosphere should resolve this + machine.sleep(20) + machine.screenshot("screen") + ''; +} diff --git a/nixos/tests/stardust-xr/common.nix b/nixos/tests/stardust-xr/common.nix new file mode 100644 index 000000000000..bbc5af59b772 --- /dev/null +++ b/nixos/tests/stardust-xr/common.nix @@ -0,0 +1,23 @@ +{ + lib, + pkgs, + ... +}: + +{ + imports = [ ../common/openxr.nix ]; + + # TODO(@Pandapip1): For the time being, Stardust doesn't like controllers rather than hand tracking + services.monado.enable = lib.mkForce false; + + systemd.user.services.stardust-xr-server = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + # requires = [ "monado.service" ]; + serviceConfig = { + Type = "notify"; + NotifyAccess = "all"; + ExecStart = "${lib.getExe pkgs.stardust-xr-server} -e ${pkgs.writeShellScript "notifyReady" "systemd-notify --ready"}"; + }; + environment.RUST_BACKTRACE = "full"; + }; +} diff --git a/nixos/tests/stardust-xr/flatland.nix b/nixos/tests/stardust-xr/flatland.nix new file mode 100644 index 000000000000..748a1e0cbd84 --- /dev/null +++ b/nixos/tests/stardust-xr/flatland.nix @@ -0,0 +1,57 @@ +{ ... }: +{ + name = "stardust-xr-flatland"; + + # Doesn't understand @polling_condition + skipTypeCheck = true; + + nodes.machine = + { + lib, + pkgs, + config, + ... + }: + + { + imports = [ ./common.nix ]; + + systemd.user.services.stardust-xr-flatland = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + requires = [ "stardust-xr-server.service" ]; + after = [ "stardust-xr-server.service" ]; + script = lib.getExe pkgs.stardust-xr-flatland; + environment.RUST_BACKTRACE = "full"; + }; + + systemd.user.services.test-wayland-app = { + wantedBy = [ "xdg-desktop-autostart.target" ]; + requires = [ "stardust-xr-flatland.service" ]; + after = [ "stardust-xr-flatland.service" ]; + script = lib.getExe pkgs.wayland-colorbar; + environment = { + DISPLAY = ""; + WAYLAND_DISPLAY = "wayland-0"; + }; + }; + }; + + testScript = + { nodes, ... }: + '' + @polling_condition() + def wayland_client_running(): + machine.wait_for_unit("test-wayland-app.service", "alice") + + with subtest("Ensure X11 starts"): + start_all() + machine.succeed("loginctl enable-linger alice") + machine.wait_for_x() + + with subtest("Ensure system works"): + with wayland_client_running: + # TODO: 20 seconds should be long enough for anything, but this is theoretically flaky + machine.sleep(20) + machine.screenshot("screen") + ''; +} diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix index e310b94df1a7..80f8e96b89eb 100644 --- a/nixos/tests/sunshine.nix +++ b/nixos/tests/sunshine.nix @@ -40,9 +40,10 @@ ./common/x11.nix ]; - environment.systemPackages = with pkgs; [ - moonlight-qt - ]; + programs.moonlight-qt = { + enable = true; + capSysNice = true; + }; }; @@ -52,6 +53,7 @@ # start the tests, wait for sunshine to be up start_all() sunshine.wait_for_open_port(48010,"localhost") + moonlight.succeed("${pkgs.libcap}/bin/getcap \"$(command -v moonlight)\" | grep -q 'cap_sys_nice'") # set the admin username/password, restart sunshine sunshine.execute("sunshine --creds sunshine sunshine") diff --git a/nixos/tests/sway.nix b/nixos/tests/sway.nix index 6de050418592..6427d688db7d 100644 --- a/nixos/tests/sway.nix +++ b/nixos/tests/sway.nix @@ -194,7 +194,7 @@ swaymsg("exec swaylock") machine.wait_until_succeeds("pgrep -xf swaylock") machine.sleep(3) - machine.send_chars("${nodes.machine.config.users.users.alice.password}") + machine.send_chars("${nodes.machine.users.users.alice.password}") machine.send_key("ret") machine.wait_until_fails("pgrep -xf swaylock") diff --git a/nixos/tests/switch-test.nix b/nixos/tests/switch-test.nix index 2dbc9386f8ae..b81d84086f2e 100644 --- a/nixos/tests/switch-test.nix +++ b/nixos/tests/switch-test.nix @@ -43,6 +43,19 @@ let server.serve_forever() ''; + # Per-connection (Accept=yes) socket-activated service that requires the + # connection socket to be passed via socket activation and fails when started + # without one. It greets the client and stays alive for as long as the + # connection is held open. + acceptSocketTest = pkgs.writeShellScript "accept-socket-test.sh" '' + if [ "''${LISTEN_FDS:-0}" -lt 1 ]; then + echo "Expected exactly one socket, got 0" >&2 + exit 4 + fi + printf hello >&3 + exec ${lib.getExe' pkgs.coreutils "cat"} <&3 >/dev/null + ''; + in { name = "switch-test"; @@ -508,6 +521,32 @@ in }; }; + accept-socket.configuration = { + systemd.sockets.accept-socket = { + wantedBy = [ "sockets.target" ]; + listenStreams = [ "/run/accept-test.sock" ]; + socketConfig = { + Accept = "yes"; + SocketMode = "0777"; + }; + }; + systemd.services."accept-socket@" = { + description = "A per-connection socket-activated service"; + serviceConfig.ExecStart = acceptSocketTest; + }; + }; + + accept-socket-service-modified.configuration = { + imports = [ accept-socket.configuration ]; + systemd.services."accept-socket@".serviceConfig.X-Test = "test"; + }; + + socket-activated-without-socket.configuration = { + imports = [ simple-socket.configuration ]; + systemd.sockets.socket-activated.enable = false; + systemd.services.socket-activated.wantedBy = [ "multi-user.target" ]; + }; + mount.configuration = { systemd.mounts = [ { @@ -1587,6 +1626,49 @@ in if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": raise Exception("Socket was not properly activated after the service was restarted") + # A service transitioning to socket activation is not started directly, + # it's left for the newly started socket to activate on demand + switch_to_specialisation("${machine}", "socket-activated-without-socket") + machine.succeed("systemctl is-active socket-activated.service") + out = switch_to_specialisation("${machine}", "simple-socket-stop-if-changed") + assert_contains(out, "stopping the following units: socket-activated.service\n") + assert_lacks(out, "\nstarting the following units:") + assert_contains(out, "the following new units were started: socket-activated.socket\n") + machine.succeed("[ -S /run/test.sock ]") + if machine.succeed("socat - UNIX-CONNECT:/run/test.sock") != "hello": + raise Exception("Socket was not properly activated after the transition") + + with subtest("socket-activated services with Accept=yes"): + # Socket-activated services don't get started, just the socket + machine.fail("[ -S /run/accept-test.sock ]") + out = switch_to_specialisation("${machine}", "accept-socket") + assert_contains(out, "the following new units were started: accept-socket.socket\n") + machine.succeed("[ -S /run/accept-test.sock ]") + + # Hold a connection open so a per-connection instance keeps running + machine.succeed("socat EXEC:'sleep infinity' UNIX-CONNECT:/run/accept-test.sock >&2 &") + instance = machine.wait_until_succeeds( + "systemctl list-units --no-legend --state=running 'accept-socket@*.service' " + + "| grep -m1 -o 'accept-socket@[^ ]*\\.service'" + ).strip() + + # Changing the templated service must stop the running instance and + # restart the socket instead of (re)starting the per-connection + # instance, which cannot be started without a connection socket + out = switch_to_specialisation("${machine}", "accept-socket-service-modified") + assert_contains(out, "stopping the following units:") + assert_contains(out, instance) + assert_contains(out, "accept-socket.socket") + assert_contains(out, "\nstarting the following units: accept-socket.socket\n") + assert_lacks(out, "NOT restarting the following changed units:") + assert_lacks(out, "\nrestarting the following units:") + # The per-connection instance must not be (re)started + starting = out[out.index("\nstarting the following units:") :] + assert instance not in starting, f"instance {instance} should not be (re)started" + # Socket-activation of the unit still works + if machine.succeed("socat - UNIX-CONNECT:/run/accept-test.sock &2 + exit 1 + ''; + }); +in + +# Please the callTest pattern. +# +# runTest results already go through findTests/callTest. +# For plain derivations like `eval`, we apply callTest directly. +pkgs.lib.mapAttrs ( + _: v: + if v ? test then + v + else + callTest { + test = v; + driver = v; + } +) (suite // { systemd-eval = systemdEval; }) diff --git a/nixos/tests/systemd-boot.nix b/nixos/tests/systemd-boot.nix index c2d9131f1974..f36d3870f98e 100644 --- a/nixos/tests/systemd-boot.nix +++ b/nixos/tests/systemd-boot.nix @@ -460,6 +460,9 @@ in nodes.machine = common; testScript = + let + oldVersion = "222"; + in # python '' machine.succeed("mount -o remount,rw /boot") @@ -469,13 +472,12 @@ in machine.succeed( """ find /boot -iname '*boot*.efi' -print0 | \ - xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot 000.0-1-notnixos ####/' '{}' + xargs -0 -I '{}' sed -i 's/#### LoaderInfo: systemd-boot .* ####/#### LoaderInfo: systemd-boot ${oldVersion} ####/' '{}' """ ) return machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1") output = switch() - assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" @@ -486,9 +488,12 @@ in "mv /boot/EFI/BOOT/bootx64.efi.new /boot/EFI/BOOT/bootx64.efi", ) output = switch() - assert "updating systemd-boot from 000.0-1-notnixos to " in output, "Couldn't find systemd-boot update message" assert 'to "/boot/EFI/systemd/systemd-bootx64.efi"' in output, "systemd-boot not copied to to /boot/EFI/systemd/systemd-bootx64.efi" assert 'to "/boot/EFI/BOOT/BOOTX64.EFI"' in output, "systemd-boot not copied to to /boot/EFI/BOOT/BOOTX64.EFI" + + with subtest("Test that switching with an up-to-date bootloader is a no-op"): + output = machine.succeed("/run/current-system/bin/switch-to-configuration boot 2>&1") + assert "same boot loader version in place already" in output, "Expected bootctl to skip already-current binary" ''; } ); diff --git a/nixos/tests/systemd-initrd-non-nixos.nix b/nixos/tests/systemd-initrd-non-nixos.nix new file mode 100644 index 000000000000..0f564af6504a --- /dev/null +++ b/nixos/tests/systemd-initrd-non-nixos.nix @@ -0,0 +1,68 @@ +{ lib, pkgs, ... }: +let + marker = "REACHED NON-NIXOS INIT AS PID 1"; + + # A non-NixOS init (no prepare-root). We use a store path, not literal + # /bin/sh: a fresh disk has no /bin/sh yet (it is created by the activation a + # non-NixOS init skips), while the store is always mounted; init=/bin/sh works + # the same on a real system. Writes a marker, then stays alive so PID 1 lives. + nonNixosInit = pkgs.writeShellScriptBin "non-nixos" '' + echo "${marker}" > /dev/console + exec ${pkgs.coreutils}/bin/sleep infinity + ''; + + common = { + boot.initrd.systemd.enable = true; + + virtualisation = { + # tmpfs root, like real non-NixOS closure init= microvm consumers. + diskImage = null; + + graphics = false; + }; + + # Speed up wait_for_console. + boot.consoleLogLevel = lib.mkForce 3; + boot.initrd.systemd.managerEnvironment.SYSTEMD_LOG_LEVEL = "warning"; + + # switch-root needs an os-release on the target root. A real system has one + # on disk; our fresh tmpfs does not, so create it. + boot.initrd.systemd.tmpfiles.settings."10-os-release"."/sysroot/etc/os-release".f = { + mode = "0644"; + argument = "ID=test-non-nixos"; + }; + }; +in +{ + name = "systemd-initrd-non-nixos"; + + nodes = { + bashActivation = common; + + nixosInit = { + imports = [ common ]; + system.nixos-init.enable = true; + system.etc.overlay.enable = true; + services.userborn.enable = true; + }; + }; + + testScript = '' + import os + + # The last init= on the cmdline wins; QEMU_KERNEL_PARAMS is appended after + # the default one, so this boots our non-NixOS init. + os.environ["QEMU_KERNEL_PARAMS"] = "init=${lib.getExe nonNixosInit}" + + start_all() + + # If a code path does not skip the non-NixOS init, switch-root is blocked and + # the machine drops to emergency mode: the marker never appears and the wait + # times out. + with subtest("bash initrd-nixos-activation skips a non-NixOS init"): + bashActivation.wait_for_console_text("${marker}", timeout=300) + + with subtest("nixos-init switches to a non-NixOS init directly"): + nixosInit.wait_for_console_text("${marker}", timeout=300) + ''; +} diff --git a/nixos/tests/systemd-initrd-simple.nix b/nixos/tests/systemd-initrd-simple.nix index 191a23abb2e4..b02616e1b772 100644 --- a/nixos/tests/systemd-initrd-simple.nix +++ b/nixos/tests/systemd-initrd-simple.nix @@ -1,15 +1,15 @@ +{ pkgs, ... }: { name = "systemd-initrd-simple"; - nodes.machine = - { pkgs, ... }: - { - testing.initrdBackdoor = true; - boot.initrd.systemd.enable = true; - virtualisation.fileSystems."/".autoResize = true; - }; + nodes.machine = { + testing.initrdBackdoor = true; + boot.initrd.systemd.enable = true; + virtualisation.fileSystems."/".autoResize = true; + }; testScript = + { nodes, ... }: # python '' import subprocess @@ -43,7 +43,7 @@ oldAvail = machine.succeed("df --output=avail / | sed 1d") machine.shutdown() - subprocess.check_call(["qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) + subprocess.check_call(["${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", "resize", "vm-state-machine/machine.qcow2", "+1G"]) machine.start() machine.switch_root() diff --git a/nixos/tests/systemd-journal-gateway.nix b/nixos/tests/systemd-journal-gateway.nix index 52c45033113c..17b454d9595e 100644 --- a/nixos/tests/systemd-journal-gateway.nix +++ b/nixos/tests/systemd-journal-gateway.nix @@ -1,71 +1,27 @@ -{ lib, pkgs, ... }: +{ pkgs, ... }: { name = "systemd-journal-gateway"; meta = with pkgs.lib.maintainers; { maintainers = [ minijackson - raitobezarius ]; }; - # Named client for coherence with the systemd-journal-upload test, and for - # certificate validation + # Named client for coherence with the systemd-journal-upload test. nodes.client = { - services.journald.gateway = { - enable = true; - cert = "/run/secrets/client/cert.pem"; - key = "/run/secrets/client/key.pem"; - trust = "/run/secrets/ca.cert.pem"; - }; + services.journald.gateway.enable = true; }; testScript = '' import json - import subprocess - import tempfile - - tmpdir_o = tempfile.TemporaryDirectory() - tmpdir = tmpdir_o.name - - def generate_pems(domain: str): - subprocess.run( - [ - "${pkgs.minica}/bin/minica", - "--ca-key=ca.key.pem", - "--ca-cert=ca.cert.pem", - f"--domains={domain}", - ], - cwd=str(tmpdir), - ) - - with subtest("Creating keys and certificates"): - generate_pems("server") - generate_pems("client") - - client.wait_for_unit("multi-user.target") - - def copy_pem(file: str): - client.copy_from_host(source=f"{tmpdir}/{file}", target=f"/run/secrets/{file}") - client.succeed(f"chmod 600 /run/secrets/{file} && chown systemd-journal-gateway /run/secrets/{file}") - - with subtest("Copying keys and certificates"): - client.succeed("mkdir -p /run/secrets/{client,server}") - copy_pem("server/cert.pem") - copy_pem("server/key.pem") - copy_pem("client/cert.pem") - copy_pem("client/key.pem") - copy_pem("ca.cert.pem") client.wait_for_unit("multi-user.target") curl = '${pkgs.curl}/bin/curl' accept_json = '--header "Accept: application/json"' - cacert = '--cacert /run/secrets/ca.cert.pem' - cert = '--cert /run/secrets/server/cert.pem' - key = '--key /run/secrets/server/key.pem' - base_url = 'https://client:19531' + base_url = 'http://client:19531' - curl_cli = f"{curl} {accept_json} {cacert} {cert} {key} --fail" + curl_cli = f"{curl} {accept_json} --fail" machine_info = client.succeed(f"{curl_cli} {base_url}/machine") assert json.loads(machine_info)["hostname"] == "client", "wrong machine name" @@ -79,11 +35,8 @@ client.succeed(f"systemd-cat --identifier={identifier} <<< '{message}'") - # max-time is a workaround against a bug in systemd-journal-gatewayd where - # if TLS is enabled, the connection is never closed. Since it will timeout, - # we ignore the return code. entries = client.succeed( - f"{curl_cli} --max-time 5 {base_url}/entries?SYSLOG_IDENTIFIER={identifier} || true" + f"{curl_cli} {base_url}/entries?SYSLOG_IDENTIFIER={identifier}" ) # Number of entries should be only 1 diff --git a/nixos/tests/systemd-journal-upload.nix b/nixos/tests/systemd-journal-upload.nix index af7817bd97d8..f01ed17019f8 100644 --- a/nixos/tests/systemd-journal-upload.nix +++ b/nixos/tests/systemd-journal-upload.nix @@ -4,52 +4,87 @@ meta = with pkgs.lib.maintainers; { maintainers = [ minijackson - raitobezarius ]; }; + # systemd in Nixpkgs is built without GnuTLS, so systemd-journal-remote + # cannot terminate TLS itself. We put nginx in front of it with mutual TLS + # and have systemd-journal-upload (which uses curl+openssl) talk HTTPS to + # nginx. This exercises both the recommended migration path and verifies + # that journal-upload's TLS support still works. nodes.server = - { nodes, ... }: + { lib, nodes, ... }: { + services.journald.remote = { enable = true; - listen = "http"; settings.Remote = { - ServerCertificateFile = "/run/secrets/sever.cert.pem"; - ServerKeyFile = "/run/secrets/sever.key.pem"; - TrustedCertificateFile = "/run/secrets/ca.cert.pem"; Seal = true; }; }; - networking.firewall.allowedTCPPorts = [ nodes.server.services.journald.remote.port ]; - }; + # Keep journal-remote loopback-only; only nginx is exposed to the network. + systemd.sockets.systemd-journal-remote.listenStreams = lib.mkForce [ + "" + "127.0.0.1:${toString nodes.server.services.journald.remote.port}" + ]; - nodes.client = - { lib, nodes, ... }: - { - services.journald.upload = { + virtualisation.credentials = { + "ca.cert.pem".source = "./ca.cert.pem"; + "server.cert.pem".source = "./server.cert.pem"; + "server.key.pem".source = "./server.key.pem"; + }; + systemd.services.nginx.serviceConfig.ImportCredential = [ + "server.cert.pem" + "server.key.pem" + "ca.cert.pem" + ]; + services.nginx = { enable = true; - settings.Upload = { - URL = "http://server:${toString nodes.server.services.journald.remote.port}"; - ServerCertificateFile = "/run/secrets/client.cert.pem"; - ServerKeyFile = "/run/secrets/client.key.pem"; - TrustedCertificateFile = "/run/secrets/ca.cert.pem"; + virtualHosts."server" = { + onlySSL = true; + http2 = false; + sslCertificate = "/run/credentials/nginx.service/server.cert.pem"; + sslCertificateKey = "/run/credentials/nginx.service/server.key.pem"; + extraConfig = '' + ssl_client_certificate /run/credentials/nginx.service/ca.cert.pem; + ssl_verify_client on; + ''; + locations."/".proxyPass = "http://127.0.0.1:${toString nodes.server.services.journald.remote.port}"; }; }; - # Wait for the PEMs to arrive - systemd.services.systemd-journal-upload.wantedBy = lib.mkForce [ ]; - systemd.paths.systemd-journal-upload = { - wantedBy = [ "default.target" ]; - # This file must be copied last - pathConfig.PathExists = [ "/run/secrets/ca.cert.pem" ]; + networking.firewall.allowedTCPPorts = [ 443 ]; + }; + + nodes.client = + { lib, ... }: + { + virtualisation.credentials = { + "ca.cert.pem".source = "./ca.cert.pem"; + "client.cert.pem".source = "./client.cert.pem"; + "client.key.pem".source = "./client.key.pem"; + }; + systemd.services.systemd-journal-upload.serviceConfig.ImportCredential = [ + "client.cert.pem" + "client.key.pem" + "ca.cert.pem" + ]; + services.journald.upload = { + enable = true; + settings.Upload = { + URL = "https://server:443"; + ServerCertificateFile = "/run/credentials/systemd-journal-upload.service/client.cert.pem"; + ServerKeyFile = "/run/credentials/systemd-journal-upload.service/client.key.pem"; + TrustedCertificateFile = "/run/credentials/systemd-journal-upload.service/ca.cert.pem"; + }; }; }; testScript = '' import subprocess import tempfile + import shutil tmpdir_o = tempfile.TemporaryDirectory() tmpdir = tmpdir_o.name @@ -69,33 +104,17 @@ generate_pems("server") generate_pems("client") - server.wait_for_unit("multi-user.target") - client.wait_for_unit("multi-user.target") - def copy_pems(machine: BaseMachine, domain: str): - machine.succeed("mkdir /run/secrets") - machine.copy_from_host( - source=f"{tmpdir}/{domain}/cert.pem", - target=f"/run/secrets/{domain}.cert.pem", - ) - machine.copy_from_host( - source=f"{tmpdir}/{domain}/key.pem", - target=f"/run/secrets/{domain}.key.pem", - ) - # Should be last - machine.copy_from_host( - source=f"{tmpdir}/ca.cert.pem", - target="/run/secrets/ca.cert.pem", - ) + shutil.copy(f"{tmpdir}/{domain}/cert.pem", machine.state_dir / f"{domain}.cert.pem") + shutil.copy(f"{tmpdir}/{domain}/key.pem", machine.state_dir / f"{domain}.key.pem") + shutil.copy(f"{tmpdir}/ca.cert.pem", machine.state_dir / "ca.cert.pem") with subtest("Copying keys and certificates"): copy_pems(server, "server") copy_pems(client, "client") + server.wait_for_unit("nginx.service") client.wait_for_unit("systemd-journal-upload.service") - # The journal upload should have started the remote service, triggered by - # the .socket unit - server.wait_for_unit("systemd-journal-remote.service") identifier = "nixos-test" message = "Hello from NixOS test infrastructure" diff --git a/nixos/tests/systemd-localed.nix b/nixos/tests/systemd-localed.nix new file mode 100644 index 000000000000..308d90122868 --- /dev/null +++ b/nixos/tests/systemd-localed.nix @@ -0,0 +1,23 @@ +{ lib, ... }: +{ + name = "systemd-localed"; + meta.maintainers = [ lib.maintainers.haansn08 ]; + + nodes.machine = { ... }: { + # we don't use services.xserver.enable because some window managers like + # niri rely on systemd-localed for the keyboard layout: + # https://niri-wm.github.io/niri/Configuration%3A-Input.html#layout + services.graphical-desktop.enable = true; + + services.xserver.xkb.layout = "jp"; + }; + + testScript = '' + machine.start() + machine.wait_for_unit("default.target") + machine.wait_for_unit("dbus.socket") + + status, stdout = machine.execute("localectl") + t.assertIn("X11 Layout: jp", stdout) + ''; +} diff --git a/nixos/tests/systemd-machinectl.nix b/nixos/tests/systemd-machinectl.nix index 4b6c8febbb04..8a525a036977 100644 --- a/nixos/tests/systemd-machinectl.nix +++ b/nixos/tests/systemd-machinectl.nix @@ -106,6 +106,8 @@ let } ]; + extraCommands = "mkdir -p usr"; + contents = [ { source = containerSystem + "/etc/os-release"; @@ -171,6 +173,7 @@ in systemd.tmpfiles.rules = [ "d /var/lib/machines/shared-decl 0755 root root - -" + "d /var/lib/machines/shared-decl/usr 0755 root root - -" ]; systemd.nspawn.shared-decl = { execConfig = { @@ -228,7 +231,7 @@ in machine.wait_until_succeeds("systemctl -M shared-decl is-active default.target"); machine.succeed("machinectl stop shared-decl"); - machine.succeed("mkdir -p ${containerRoot}"); + machine.succeed("mkdir -p ${containerRoot}/usr"); # start container with shared nix store by using same arguments as for systemd-nspawn@.service machine.succeed("systemd-run systemd-nspawn --machine=${containerName} --network-veth -U --bind-ro=/nix/store ${containerSystem}/init") diff --git a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix index 5ab21bee0195..7b8c53283a79 100644 --- a/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix +++ b/nixos/tests/systemd-networkd-ipv6-prefix-delegation.nix @@ -17,7 +17,7 @@ import ./make-test-python.nix ( hexa ]; }; - nodes = { + containers = { # The ISP's routers job is to delegate IPv6 prefixes via DHCPv6. Like with # regular IPv6 auto-configuration it will also emit IPv6 router @@ -38,6 +38,7 @@ import ./make-test-python.nix ( interfaces.eth1 = lib.mkForce { }; # Don't use scripted networking }; + services.resolved.enable = false; systemd.network = { enable = true; @@ -204,6 +205,7 @@ import ./make-test-python.nix ( interfaces.eth1.ipv6.addresses = lib.mkForce [ ]; }; + services.resolved.enable = false; systemd.network = { networks = { # systemd-networkd will load the first network unit file @@ -300,6 +302,7 @@ import ./make-test-python.nix ( client = { virtualisation.vlans = [ 2 ]; systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + services.resolved.enable = false; networking = { useNetworkd = true; useDHCP = false; diff --git a/nixos/tests/systemd-repart.nix b/nixos/tests/systemd-repart.nix index a991709a5c66..ebc487a8c1bc 100644 --- a/nixos/tests/systemd-repart.nix +++ b/nixos/tests/systemd-repart.nix @@ -303,10 +303,14 @@ in systemd = { enable = true; # avoids reaching cryptsetup.target before recreation of the - # "state" volume completed, during the factory reset + # "state" volume completed, during the factory reset and tries to + # ensure that devices are retriggered before trying to work with them. services.systemd-repart.before = [ "systemd-cryptsetup@state.service" ]; + services.systemd-factory-reset-complete.before = [ + "systemd-cryptsetup@state.service" + ]; repart = { enable = true; extraArgs = [ diff --git a/nixos/tests/systemd-varlink.nix b/nixos/tests/systemd-varlink.nix new file mode 100644 index 000000000000..df5d7cbb73a3 --- /dev/null +++ b/nixos/tests/systemd-varlink.nix @@ -0,0 +1,46 @@ +{ lib, ... }: +{ + name = "systemd-varlink"; + meta.maintainers = [ lib.maintainers.raitobezarius ]; + nodes.machine = + { config, pkgs, ... }: + { + networking.useNetworkd = true; + services.resolved.enable = true; + systemd.network.enable = true; + }; + testScript = '' + def list_interfaces(intf_path: str) -> list[str]: + return machine.succeed(f"varlinkctl list-interfaces {intf_path}").split('\n') + + expected_reg_sd_interfaces = [ + ("BootControl", "bootctl"), + ("Credentials", "creds"), + ("Hostname", "hostnamed"), + ("JournalAccess", "journald"), + ("Import", "importd"), + ("Machine", "machined"), + ("Resolve", "resolved-varlink"), + ("Resolve.Monitor", "resolved-monitor"), + ("Udev", "udevd-varlink"), + ("MuteConsole", "mute-console"), + ("FactoryReset", "factory-reset"), + ("AskPassword", "ask-password"), + ("Network", "networkd-varlink"), + ("Repart", "repart"), + ] + expected_priv_sd_interfaces = [ + ("Login", None), # systemd-logind-varlink.socket exist but is not necessary. + ] + expected_interfaces = [ + (f"io.systemd.{intf}", f"systemd-{socket_name}", f"/run/varlink/registry/io.systemd.{intf}") for intf, socket_name in expected_reg_sd_interfaces + ] + [ + (f"io.systemd.{intf}", f"systemd-{socket_name}" if socket_name is not None else None, f"/run/systemd/io.systemd.{intf}") for intf, socket_name in expected_priv_sd_interfaces + ] + + for intf, socket_name, intf_path in expected_interfaces: + if socket_name is not None: + machine.wait_for_unit(f"{socket_name}.socket") + assert intf in list_interfaces(intf_path), f"Interface '{intf}' not found in the Varlink registry" + ''; +} diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix index 8cca68465802..b04b288e8939 100644 --- a/nixos/tests/systemd.nix +++ b/nixos/tests/systemd.nix @@ -38,21 +38,23 @@ services.journald.extraConfig = "Storage=volatile"; test-support.displayManager.auto.user = "alice"; - systemd.shutdown.test = pkgs.writeScript "test.shutdown" '' - #!${pkgs.runtimeShell} - PATH=${ - lib.makeBinPath ( - with pkgs; - [ - util-linux - coreutils - ] - ) - } - mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared - touch /tmp/shared/shutdown-test - umount /tmp/shared - ''; + systemd.shutdownRamfs.contents."/etc/systemd/system-shutdown/test".source = + pkgs.writeShellScript "test.shutdown" '' + PATH=${ + lib.makeBinPath ( + with pkgs; + [ + util-linux + coreutils + ] + ) + } + mkdir -p /tmp/shared + mount -t 9p shared -o trans=virtio,version=9p2000.L /tmp/shared + touch /tmp/shared/shutdown-test + umount /tmp/shared + ''; + systemd.shutdownRamfs.storePaths = [ "${pkgs.util-linux}/bin" ]; systemd.services.oncalendar-test = { description = "calendar test"; @@ -147,7 +149,7 @@ subprocess.check_call( [ - "qemu-img", + "${nodes.machine.virtualisation.qemu.package}/bin/qemu-img", "convert", "-O", "raw", diff --git a/nixos/tests/thanos.nix b/nixos/tests/thanos.nix index 5f0edd0ddfba..b4b58a8e60b9 100644 --- a/nixos/tests/thanos.nix +++ b/nixos/tests/thanos.nix @@ -322,7 +322,7 @@ in # and check if the blocks have the correct labels: store.succeed( "thanos tools bucket ls " - + "--objstore.config-file=${nodes.store.config.services.thanos.store.objstore.config-file} " + + "--objstore.config-file=${nodes.store.services.thanos.store.objstore.config-file} " + "--output=json | " + "jq .thanos.labels.some_label | " + "grep 'required by thanos'" diff --git a/nixos/tests/timekpr.nix b/nixos/tests/timekpr.nix index 1ae793d8f70e..9f832d2b62dd 100644 --- a/nixos/tests/timekpr.nix +++ b/nixos/tests/timekpr.nix @@ -1,13 +1,15 @@ -{ pkgs, lib, ... }: +{ + lib, + ... +}: + { name = "timekpr"; meta.maintainers = [ lib.maintainers.atry ]; - nodes.machine = - { pkgs, lib, ... }: - { - services.timekpr.enable = true; - }; + containers.machine = { + services.timekpr.enable = true; + }; testScript = '' start_all() diff --git a/nixos/tests/txredisapi.nix b/nixos/tests/txredisapi.nix index 171d3efee78f..57a32e624c24 100644 --- a/nixos/tests/txredisapi.nix +++ b/nixos/tests/txredisapi.nix @@ -25,7 +25,7 @@ testScript = { nodes, ... }: let - inherit (nodes.machine.config.services) redis; + inherit (nodes.machine.services) redis; in '' start_all() diff --git a/nixos/tests/tzpfms.nix b/nixos/tests/tzpfms.nix new file mode 100644 index 000000000000..8bd9131140ec --- /dev/null +++ b/nixos/tests/tzpfms.nix @@ -0,0 +1,135 @@ +{ lib, ... }: + +{ + name = "tzpfms"; + + meta = { + maintainers = with lib.maintainers; [ toastal ]; + }; + + nodes.machine = + { pkgs, ... }: + { + environment.systemPackages = [ + pkgs.jq + pkgs.parted + pkgs.tzpfms + ]; + + boot = { + initrd.systemd.enable = true; + loader = { + systemd-boot.enable = true; + timeout = 0; + efi.canTouchEfiVariables = true; + }; + supportedFilesystems = [ "zfs" ]; + zfs = { + devNodes = "/dev"; + forceImportRoot = lib.mkDefault false; + requestEncryptionCredentials = false; + }; + }; + + networking.hostId = "deadbeef"; + + virtualisation = { + emptyDiskImages = [ 1024 ]; + mountHostNixStore = true; + useBootLoader = true; + useEFIBoot = true; + tpm.enable = true; + }; + + specialisation.tzpfms-unlock.configuration = { + boot = { + kernelParams = [ + "rd.debug" + "rd.log=all" + ]; + zfs = { + devNodes = "/dev"; + requestEncryptionCredentials = false; + tzpfms = { + enable = true; + datasets = [ + "tpmpool/boot" + "tpmpool/data" + ]; + }; + }; + }; + + virtualisation.fileSystems = { + "/bootz" = { + device = "tpmpool/boot"; + fsType = "zfs"; + options = [ "zfsutil" ]; + neededForBoot = true; + }; + "/dataz" = { + device = "tpmpool/data"; + fsType = "zfs"; + options = [ "zfsutil" ]; + neededForBoot = false; + }; + }; + }; + }; + + testScript = /* python */ '' + datasets = ["boot", "data"] + + machine.start(allow_reboot=True) + + machine.wait_for_unit("multi-user.target") + + machine.succeed("test -e /dev/tpm0") + machine.succeed("test -e /dev/tpmrm0") + + machine.succeed("parted --script /dev/vdb mklabel gpt") + machine.succeed("parted --script /dev/vdb -- mkpart primary 1M 100%") + + with subtest("Create encrypted ZFS datasets"): + machine.succeed("zpool create -O mountpoint=none tpmpool /dev/vdb1") + for ds in datasets: + machine.succeed("echo aoeuhtns | zfs create -o encryption=aes-128-gcm -o keyformat=passphrase -o mountpoint=/" + ds + "z tpmpool/" + ds) + + with subtest("Wrap keys to TPM with backup"): + for ds in datasets: + machine.succeed("printf '\\n\\n' | zfs-tpm2-change-key -b /tmp/tzpfms-backup-" + ds + ".key tpmpool/" + ds) + machine.succeed("test -f /tmp/tzpfms-backup-" + ds + ".key") + list = machine.succeed("zfs-tpm-list -H") + for ds in datasets: + assert "tpmpool/" + ds in list + + with subtest("Verify backup keys work"): + for ds in datasets: + machine.succeed("zfs unmount tpmpool/" + ds + " || true") + machine.succeed("zfs unload-key tpmpool/" + ds) + machine.succeed("zfs load-key tpmpool/" + ds + " /tmp/file.txt && cd /tmp && zip /srv/unpackerr/test.zip ./file.txt && rm ./file.txt") + machine.wait_until_succeeds("[[ -d /srv/unpackerr/test ]]", timeout=120) + machine.succeed("""[[ 'unpackerr-test' == "$(< /srv/unpackerr/test/file.txt)" ]]""") + ''; +} diff --git a/nixos/tests/victorialogs/local-write.nix b/nixos/tests/victorialogs/local-write.nix index 894394e2365f..6afc8e33378a 100644 --- a/nixos/tests/victorialogs/local-write.nix +++ b/nixos/tests/victorialogs/local-write.nix @@ -3,7 +3,7 @@ name = "victorialogs-local-write"; meta.maintainers = with lib.maintainers; [ marie ]; - nodes.machine = + containers.machine = { pkgs, ... }: { services.victorialogs.enable = true; diff --git a/nixos/tests/victorialogs/remote-write-with-vlagent.nix b/nixos/tests/victorialogs/remote-write-with-vlagent.nix index e2bdc395d20e..115ce2665743 100644 --- a/nixos/tests/victorialogs/remote-write-with-vlagent.nix +++ b/nixos/tests/victorialogs/remote-write-with-vlagent.nix @@ -9,7 +9,7 @@ in name = "victorialogs-remote-write-with-vlagent"; meta.maintainers = [ lib.maintainers.shawn8901 ]; - nodes.server = + containers.server = { pkgs, ... }: { networking.firewall.allowedTCPPorts = [ 9428 ]; @@ -20,7 +20,7 @@ in }; }; - nodes.client = + containers.client = { pkgs, ... }: { services.vlagent = { diff --git a/nixos/tests/victoriametrics/external-promscrape-config.nix b/nixos/tests/victoriametrics/external-promscrape-config.nix index f645b8c839b9..15b8c9bde157 100644 --- a/nixos/tests/victoriametrics/external-promscrape-config.nix +++ b/nixos/tests/victoriametrics/external-promscrape-config.nix @@ -29,8 +29,8 @@ in ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -55,14 +55,14 @@ in node.wait_for_unit("prometheus-node-exporter") node.wait_for_open_port(${toString nodeExporterPort}) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_open_port(8428) - promscrape_config = victoriametrics.succeed("journalctl -u victoriametrics -o cat | grep 'promscrape.config'") + promscrape_config = vmserver.succeed("journalctl -u victoriametrics -o cat | grep 'promscrape.config'") assert '${toString promscrapeConfigYaml}' in promscrape_config - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) diff --git a/nixos/tests/victoriametrics/remote-write.nix b/nixos/tests/victoriametrics/remote-write.nix index 1788c9d8747c..721c4822c1d0 100644 --- a/nixos/tests/victoriametrics/remote-write.nix +++ b/nixos/tests/victoriametrics/remote-write.nix @@ -14,8 +14,8 @@ in ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -34,7 +34,7 @@ in services.vmagent = { enable = true; remoteWrite = { - url = "http://victoriametrics:8428/api/v1/write"; + url = "http://vmserver:8428/api/v1/write"; basicAuthUsername = username; basicAuthPasswordFile = toString passwordFile; }; @@ -71,13 +71,13 @@ in node.wait_for_unit("prometheus-node-exporter") node.wait_for_open_port(9100) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_open_port(8428) vmagent.wait_for_unit("vmagent") # check remote write - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl --user '${username}:${password}' -sf 'http://localhost:8428/api/v1/query?query=node_exporter_build_info\{instance=\"node:9100\"\}' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) diff --git a/nixos/tests/victoriametrics/vmalert.nix b/nixos/tests/victoriametrics/vmalert.nix index e6a0ab5d4e52..684b60d0a605 100644 --- a/nixos/tests/victoriametrics/vmalert.nix +++ b/nixos/tests/victoriametrics/vmalert.nix @@ -9,8 +9,8 @@ ]; }; - nodes = { - victoriametrics = + containers = { + vmserver = { config, pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; @@ -27,7 +27,7 @@ static_configs = [ { targets = [ - "alertmanager:${toString config.services.prometheus.alertmanager.port}" + "alert:${toString config.services.prometheus.alertmanager.port}" ]; } ]; @@ -51,7 +51,7 @@ settings = { "datasource.url" = "http://localhost:8428"; # victoriametrics' api "notifier.url" = [ - "http://alertmanager:${toString config.services.prometheus.alertmanager.port}" + "http://alert:${toString config.services.prometheus.alertmanager.port}" ]; # alertmanager's api rule = [ (pkgs.writeText "instance-down.yml" '' @@ -71,7 +71,7 @@ }; }; - alertmanager = { + alert = { services.prometheus.alertmanager = { enable = true; openFirewall = true; @@ -115,33 +115,33 @@ }; testScript = '' - alertmanager.wait_for_unit("alertmanager") - alertmanager.wait_for_open_port(9093) - alertmanager.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") + alert.wait_for_unit("alertmanager") + alert.wait_for_open_port(9093) + alert.wait_until_succeeds("curl -s http://127.0.0.1:9093/-/ready") logger.wait_for_unit("alertmanager-webhook-logger") logger.wait_for_open_port(6725) - victoriametrics.wait_for_unit("victoriametrics") - victoriametrics.wait_for_unit("vmalert") - victoriametrics.wait_for_open_port(8428) + vmserver.wait_for_unit("victoriametrics") + vmserver.wait_for_unit("vmalert") + vmserver.wait_for_open_port(8428) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"alertmanager\"\}==1)' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=sum(alertmanager_build_info)%20by%20(version)' | " + "jq '.data.result[0].metric.version' | grep '\"${pkgs.prometheus-alertmanager.version}\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=count(up\{job=\"node\"\}!=1)' | " + "jq '.data.result[0].value[1]' | grep '\"1\"'" ) - victoriametrics.wait_until_succeeds( + vmserver.wait_until_succeeds( "curl -sf 'http://127.0.0.1:8428/api/v1/query?query=alertmanager_notifications_total\{integration=\"webhook\"\}' | " + "jq '.data.result[0].value[1]' | grep -v '\"0\"'" ) @@ -152,6 +152,6 @@ logger.log(logger.succeed("systemd-analyze security alertmanager-webhook-logger.service | grep -v '✓'")) - alertmanager.log(alertmanager.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) + alert.log(alert.succeed("systemd-analyze security alertmanager.service | grep -v '✓'")) ''; } diff --git a/nixos/tests/victoriatraces/otlp-ingestion.nix b/nixos/tests/victoriatraces/otlp-ingestion.nix index d3807c6bde66..586348c58d8d 100644 --- a/nixos/tests/victoriatraces/otlp-ingestion.nix +++ b/nixos/tests/victoriatraces/otlp-ingestion.nix @@ -82,7 +82,7 @@ in machine.wait_until_succeeds(""" curl -s 'http://localhost:10428/select/jaeger/api/services' | \ jq -e '.data[] | select(. == "test-service")' - """, timeout=10) + """, timeout=20) # Query for traces from our test service machine.wait_until_succeeds(""" diff --git a/nixos/tests/vlm-screenshot-question.nix b/nixos/tests/vlm-screenshot-question.nix new file mode 100644 index 000000000000..9009f4a21d84 --- /dev/null +++ b/nixos/tests/vlm-screenshot-question.nix @@ -0,0 +1,118 @@ +# Reusable VLM screenshot analysis derivation. +# +# Similar to `wait_for_text()` in NixOS VM tests. +# +# Runs a VLM (Vision Language Model) on a screenshot and asserts that the +# model's answer to a yes/no question ends with "YES". +# +# This is useful to automatically test software that is otherwise +# hard to test, e.g. "does this 3D program render the bunny correctly?". +# It is especially useful to judge screenshots made in NixOS VM tests. +{ + lib, + writers, + fetchurl, + llama-cpp, + runCommand, + # VLM defaults, chosen to pick a model smart enough to be useful + # for screenshot analysis, but small enough to not consume too much RAM + # or be too slow for CI. + model ? ( + fetchurl { + url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/gemma-4-E2B-it-Q4_0.gguf"; + hash = "sha256-nEwdSKRi9/iDsomErE9C02bJxXNDTqtoVT4POL9+tQw="; + } + ), + mmproj ? ( + fetchurl { + url = "https://huggingface.co/unsloth/gemma-4-E2B-it-GGUF/resolve/90f9618340396838ee7ff5b0ba2da27da62953d3/mmproj-F16.gguf"; + hash = "sha256-FAvo14SXQfiMUHV9UpuENz7o4nBSzCI2hVtTf0qCFfo="; + } + ), + # User-provided arguments: + name, + screenshot, + question, +}: +let + + analysisScript = + writers.writePython3 "${name}-script" { flakeIgnore = [ "E501" ]; } # allow long lines + '' + import os + import re + import subprocess + import time + + out = os.environ["out"] + screenshot = "${screenshot}" + # Using JSON here even permits preserving multi-line ASCII art questions and so on. + question = ${builtins.toJSON question} + + # Build the full prompt with output markers for reliable extraction. + prompt = ( + "Start your output with [output-start]." + f" {question}" + " Explain what you see, and your judgment." + " Then answer that question with exactly YES or NO, followed by [output-end]." + ) + + vlm_start = time.time() + result = subprocess.run( + [ + "${lib.getExe llama-cpp}", + "--single-turn", "--no-display-prompt", "--log-verbosity", "0", "--jinja", + "--simple-io", # disables the spinner whose backspace chars would corrupt captured output + "--reasoning", "off", "--temp", "0", + "--threads", "1", # for determinism + "--n-gpu-layers", "0", # force CPU-only (results on GPUs might be different and nondeterministic, see https://github.com/ggml-org/llama.cpp/pull/16016#issuecomment-3293505238) + "--model", "${model}", + "--mmproj", "${mmproj}", + "--image", screenshot, + "-p", prompt, + ], + capture_output=True, + text=True, + # `OMP_NUM_THREADS=1` prevents OpenMP from spawning extra threads in the BLAS backend + # (OpenBLAS), which causes nondeterminism with `--image`; without `--image`, `--threads 1` + # alone is already deterministic (BLAS is not used for short text prompts). + # Relevant code: https://github.com/ggml-org/llama.cpp/blob/80afa33aadcc4f71212b17e5e52904491c76b63e/ggml/src/ggml-blas/ggml-blas.cpp#L30-L148 + # PR to fix it in OpenBLAS: https://github.com/OpenMathLib/OpenBLAS/pull/5808 + env={**os.environ, "OMP_NUM_THREADS": "1"}, + ) + vlm_elapsed = time.time() - vlm_start + output = result.stdout + print(f"VLM inference took {vlm_elapsed:.1f}s") + print(f"VLM raw output: {repr(output)}") + if result.returncode != 0: + print(f"VLM stderr: {result.stderr}") + assert result.returncode == 0, f"llama-cli failed with exit code {result.returncode}" + + print() + + # Post-process: extract the answer between `[output-start]` and `[output-end]` markers. + # This is needed because llama-cli prints UI noise (banner, + # spinner, stats) to stdout alongside the model's response. + # TODO: Replace with `--quiet` once https://github.com/ggml-org/llama.cpp/pull/22848 is merged; + # then also remove the markers from the prompt and the extraction below. + matches = re.findall(r"\[output-start\](.*?)\[output-end\]", output, re.DOTALL) + assert matches, ( + f"VLM output did not contain [output-start]...[output-end] markers." + f" Raw output: {repr(output)}" + ) + answer = matches[-1].strip() # use last match (first may be prompt echo) + print("VLM answer:") + print(answer) + assert answer.upper().endswith("YES"), ( + f"VLM did not confirm expected answer. Answer: {answer}" + ) + + os.makedirs(out, exist_ok=True) + with open(os.path.join(out, "vlm-answer.txt"), "w") as f: + f.write(answer + "\n") + os.symlink(screenshot, os.path.join(out, "screen.png")) + ''; +in +runCommand name { } '' + ${analysisScript} +'' diff --git a/nixos/tests/vnstat.nix b/nixos/tests/vnstat.nix new file mode 100644 index 000000000000..eae44e1a92d3 --- /dev/null +++ b/nixos/tests/vnstat.nix @@ -0,0 +1,26 @@ +{ lib, ... }: +{ + name = "vnstat"; + meta.maintainers = with lib.maintainers; [ hmenke ]; + + containers.machine = { + services.vnstat = { + enable = true; + settings = { + AlwaysAddNewInterfaces = 1; + }; + }; + }; + + testScript = '' + start_all() + + machine.wait_for_unit("vnstat.service") + + machine.succeed("vnstat --iflist") + machine.fail("vnstat -i dummy0") + machine.succeed("ip link add dummy0 type dummy") + machine.succeed("ip link set dummy0 up") + machine.wait_until_succeeds("vnstat -i dummy0", timeout=10) + ''; +} diff --git a/nixos/tests/watt.nix b/nixos/tests/watt.nix new file mode 100644 index 000000000000..b06661b4b79f --- /dev/null +++ b/nixos/tests/watt.nix @@ -0,0 +1,19 @@ +{ pkgs, lib, ... }: +{ + name = "watt"; + meta.maintainers = with lib.maintainers; [ Soliprem ]; + + nodes.machine = _: { + services.watt.enable = true; + }; + + testScript = '' + machine.wait_for_unit("watt.service") + machine.succeed("watt --version | grep ${pkgs.watt.version}") + machine.wait_until_succeeds("busctl --system status net.hadess.PowerProfiles") + machine.wait_until_succeeds("busctl --system status dev.notashelf.Watt") + machine.succeed("busctl --system introspect net.hadess.PowerProfiles /net/hadess/PowerProfiles net.hadess.PowerProfiles") + machine.succeed("busctl --system introspect dev.notashelf.Watt /dev/notashelf/Watt dev.notashelf.Watt") + machine.succeed("busctl --system get-property dev.notashelf.Watt /dev/notashelf/Watt dev.notashelf.Watt Version | grep ${pkgs.watt.version}") + ''; +} diff --git a/nixos/tests/web-apps/dashy.nix b/nixos/tests/web-apps/dashy.nix index 39454b5b8d8a..d83c14d3294f 100644 --- a/nixos/tests/web-apps/dashy.nix +++ b/nixos/tests/web-apps/dashy.nix @@ -1,6 +1,5 @@ { pkgs, lib, ... }: let - customSettings = { pageInfo = { title = "My Custom Dashy Title"; @@ -45,29 +44,29 @@ in } ]; }; - nodes = { - machine = { }; + containers = { + container = { }; - machine-custom = { + custom = { services.dashy.settings = customSettings; }; }; testScript = '' start_all() - machine.wait_for_unit("nginx.service") - machine.wait_for_open_port(80) + container.wait_for_unit("nginx.service") + container.wait_for_open_port(80) - actual = machine.succeed("curl -v --stderr - http://dashy.local/", timeout=10) + actual = container.succeed("curl -v --stderr - http://dashy.local/", timeout=10) expected = "Dashy" assert expected in actual, \ f"unexpected reply from Dashy, expected: '{expected}' got: '{actual}'" - machine_custom.wait_for_unit("nginx.service") - machine_custom.wait_for_open_port(80) + custom.wait_for_unit("nginx.service") + custom.wait_for_open_port(80) - actual_custom = machine_custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() - expected_custom = machine_custom.succeed("cat ${customSettingsYaml}").strip() + actual_custom = custom.succeed("curl -s --stderr - http://dashy.local/conf.yml", timeout=10).strip() + expected_custom = custom.succeed("cat ${customSettingsYaml}").strip() assert expected_custom == actual_custom, \ f"unexpected reply from Dashy, expected: '{expected_custom}' got: '{actual_custom}'" diff --git a/nixos/tests/web-apps/gotosocial.nix b/nixos/tests/web-apps/gotosocial.nix index d9e50ecaa150..bf74bcf09887 100644 --- a/nixos/tests/web-apps/gotosocial.nix +++ b/nixos/tests/web-apps/gotosocial.nix @@ -3,7 +3,7 @@ name = "gotosocial"; meta.maintainers = with lib.maintainers; [ blakesmith ]; - nodes.machine = + containers.machine = { pkgs, ... }: { environment.systemPackages = [ pkgs.jq ]; diff --git a/nixos/tests/web-apps/immich-vectorchord-reindex.nix b/nixos/tests/web-apps/immich-vectorchord-reindex.nix index 65308d11838f..da808cf64a8e 100644 --- a/nixos/tests/web-apps/immich-vectorchord-reindex.nix +++ b/nixos/tests/web-apps/immich-vectorchord-reindex.nix @@ -37,6 +37,10 @@ hash = "sha256-+BOuiinbKPZZaDl9aYsIoZPgvLZ4FA6Rb4/W+lAz4so="; }; + # Remove the patches currently used for vectorchord 1.1.1, + # as vectorchord 1.0.0 does not need them. + patches = [ ]; + cargoDeps = pkgs.rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; hash = "sha256-kwe2x7OTjpdPonZsvnR1C/89D5W/R5JswYF79YcSFEA="; diff --git a/nixos/tests/web-apps/immich.nix b/nixos/tests/web-apps/immich.nix index 406b51600c4e..bf8df063fa63 100644 --- a/nixos/tests/web-apps/immich.nix +++ b/nixos/tests/web-apps/immich.nix @@ -8,7 +8,7 @@ # These tests need a little more juice virtualisation = { cores = 2; - memorySize = 2048; + memorySize = 4096; diskSize = 4096; }; diff --git a/nixos/tests/web-apps/immichframe.nix b/nixos/tests/web-apps/immichframe.nix index f2f590470163..810fe24b796d 100644 --- a/nixos/tests/web-apps/immichframe.nix +++ b/nixos/tests/web-apps/immichframe.nix @@ -1,10 +1,21 @@ +{ + lib, + ... +}: + let apiKeyFile = "/tmp/immich-api.key"; customInterval = 5; + user = "alice"; in { name = "immichframe"; + meta.maintainers = with lib.maintainers; [ + numinit + jfly + ]; + enableOCR = true; nodes.machine = @@ -15,11 +26,22 @@ in ... }: { - imports = [ ../common/x11.nix ]; + imports = [ + ../common/user-account.nix + ../common/x11.nix + ]; - # When setting this to 2500 I got "Kernel panic - not syncing: Out of + # When setting memory to 2500 I got "Kernel panic - not syncing: Out of # memory: compulsory panic_on_oom is enabled". - virtualisation.memorySize = 3000; + # Setting cores to 1 (the default) also makes immich take a long time to start up. + # If this breaks, keep synced with the immich test. + virtualisation = { + memorySize = 4096; + cores = 2; + }; + hardware.graphics.enable = true; + environment.variables.XAUTHORITY = "/home/${user}/.Xauthority"; + test-support.displayManager.auto.user = user; environment.systemPackages = with pkgs; [ imagemagick @@ -69,6 +91,7 @@ in custom_interval = ${toString customInterval} + machine.wait_for_x() machine.wait_for_unit("immich-server.service") machine.wait_for_open_port(2283) @@ -133,11 +156,7 @@ in 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.execute("su - ${user} -c 'firefox --kiosk http://localhost:8002' >&2 & disown") machine.wait_for_text('reproduce this moment') machine.wait_for_text('with NixOS tests') machine.screenshot("screen") diff --git a/nixos/tests/web-apps/koito.nix b/nixos/tests/web-apps/koito.nix new file mode 100644 index 000000000000..8839d4bfc57f --- /dev/null +++ b/nixos/tests/web-apps/koito.nix @@ -0,0 +1,20 @@ +{ ... }: +{ + name = "koito"; + + nodes.machine = { + services.koito.enable = true; + }; + + testScript = + { nodes, ... }: + let + port = toString nodes.machine.services.koito.environment.KOITO_LISTEN_PORT; + in + '' + machine.wait_for_unit('koito.service') + + machine.wait_for_open_port(${port}) + machine.succeed('curl --fail http://localhost:${port}') + ''; +} diff --git a/nixos/tests/web-apps/netbox-upgrade.nix b/nixos/tests/web-apps/netbox-upgrade.nix index ee84a6b34fd8..ffea21a648cd 100644 --- a/nixos/tests/web-apps/netbox-upgrade.nix +++ b/nixos/tests/web-apps/netbox-upgrade.nix @@ -18,7 +18,6 @@ in meta.maintainers = with lib.maintainers; [ minijackson - raitobezarius ]; node.pkgsReadOnly = false; @@ -35,23 +34,10 @@ in # Pick the NetBox package from this config's "pkgs" argument, # so that `nixpkgs.config.permittedInsecurePackages` works package = pkgs.${oldNetbox}; - secretKeyFile = pkgs.writeText "secret" '' - abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 - ''; - apiTokenPeppersFile = pkgs.writeText "pepper" '' - kp7ht*76fiQAhUi5dHfASLlYUE_S^gI^(7J^K5M!LfoH@vl&b_ - ''; - }; - services.nginx = { - enable = true; - - recommendedProxySettings = true; - - virtualHosts.netbox = { - default = true; - locations."/".proxyPass = "http://localhost:${toString config.services.netbox.port}"; - locations."/static/".alias = "/var/lib/netbox/static/"; + nginx = { + enable = true; + hostname = "localhost"; }; }; @@ -82,7 +68,7 @@ in headers = machine.succeed( "curl -sSL http://localhost/api/ --head -H 'Content-Type: application/json'" ) - assert api_version(headers) == version + t.assertEqual(api_version(headers), version) with subtest("NetBox version is the old one"): check_api_version("${oldApiVersion}") diff --git a/nixos/tests/web-apps/netbox/default.nix b/nixos/tests/web-apps/netbox/default.nix index 803cf5c25ed3..4b72f703df89 100644 --- a/nixos/tests/web-apps/netbox/default.nix +++ b/nixos/tests/web-apps/netbox/default.nix @@ -27,23 +27,23 @@ import ../../make-test-python.nix ( skipTypeCheck = true; - nodes.machine = + containers.machine = { config, ... }: { - virtualisation.memorySize = 2048; + boot.kernelParams = [ + # helps debugging seccomp filter issues + "audit=1" + ]; services.netbox = { enable = true; package = netbox; - secretKeyFile = pkgs.writeText "secret" '' - abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789 - ''; - # Value from https://netbox.readthedocs.io/en/feature/configuration/required-parameters/#api_token_peppers - apiTokenPeppersFile = pkgs.writeText "pepper" '' - kp7ht*76fiQAhUi5dHfASLlYUE_S^gI^(7J^K5M!LfoH@vl&b_ - ''; - enableLdap = true; - ldapConfigPath = pkgs.writeText "ldap_config.py" '' + nginx = { + enable = true; + hostname = "localhost"; + }; + + ldapConfigFile = pkgs.writeText "ldap_config.py" '' import ldap from django_auth_ldap.config import LDAPSearch, PosixGroupType @@ -70,18 +70,6 @@ import ../../make-test-python.nix ( ''; }; - services.nginx = { - enable = true; - - recommendedProxySettings = true; - - virtualHosts.netbox = { - default = true; - locations."/".proxyPass = "http://localhost:${toString config.services.netbox.port}"; - locations."/static/".alias = "/var/lib/netbox/static/"; - }; - }; - # Adapted from the sssd-ldap NixOS test services.openldap = { enable = true; diff --git a/nixos/tests/web-apps/netbox/testScript.py b/nixos/tests/web-apps/netbox/testScript.py index 4ff035a1f0cf..2e98cf4d87ef 100644 --- a/nixos/tests/web-apps/netbox/testScript.py +++ b/nixos/tests/web-apps/netbox/testScript.py @@ -62,11 +62,11 @@ def compare(a: str, b: str): with subtest("Home screen loads"): machine.wait_until_succeeds( - "curl -sSfL http://[::1]:8001 | grep 'Home | NetBox'" + "curl -sSfL http://[::1]:80 | grep 'Home | NetBox'" ) with subtest("Staticfiles are generated"): - machine.succeed("test -e /var/lib/netbox/static/netbox.js") + machine.wait_for_file("/var/lib/netbox/static/netbox.js") with subtest("Superuser can be created"): machine.succeed( @@ -155,7 +155,7 @@ def patch(uri: str, data: Dict[str, Any]): return data_request(uri, "PATCH", data) with subtest("Can retrieve netbox version"): - assert netbox_version == get("/status/")["netbox-version"] + t.assertEqual(netbox_version, get("/status/")["netbox-version"]) with subtest("Can create objects"): result = post("/dcim/sites/", {"name": "Test site", "slug": "test-site"}) @@ -196,28 +196,28 @@ with subtest("Can create objects"): with subtest("Can list objects"): result = get("/dcim/sites/") - assert result["count"] == 1 - assert result["results"][0]["id"] == site_id - assert result["results"][0]["name"] == "Test site" - assert result["results"][0]["description"] == "" + t.assertEqual(result["count"], 1) + t.assertEqual(result["results"][0]["id"], site_id) + t.assertEqual(result["results"][0]["name"], "Test site") + t.assertEqual(result["results"][0]["description"], "") result = get("/dcim/device-types/") - assert result["count"] == 1 - assert result["results"][0]["id"] == device_type_id - assert result["results"][0]["model"] == "Test device type" + t.assertEqual(result["count"], 1) + t.assertEqual(result["results"][0]["id"], device_type_id) + t.assertEqual(result["results"][0]["model"], "Test device type") with subtest("Can update objects"): new_description = "Test site description" patch(f"/dcim/sites/{site_id}/", {"description": new_description}) result = get(f"/dcim/sites/{site_id}/") - assert result["description"] == new_description + t.assertEqual(result["description"], new_description) with subtest("Can delete objects"): # Delete a device-type since no object depends on it delete(f"/dcim/device-types/{device_type_id}/") result = get("/dcim/device-types/") - assert result["count"] == 0 + t.assertEqual(result["count"], 0) def request_graphql(query: str): return machine.succeed( @@ -252,10 +252,10 @@ if compare(netbox_version, '4.2.0') >= 0: answer = request_graphql(graphql_query) result = json.loads(answer) - assert len(result["data"]["prefix_list"]) == 3 - assert test_objects["prefixes"]["v4-with-updated-desc"] in result["data"]["prefix_list"] - assert test_objects["prefixes"]["v6-cidr-32"] in result["data"]["prefix_list"] - assert test_objects["prefixes"]["v6-cidr-48"] in result["data"]["prefix_list"] + t.assertEqual(len(result["data"]["prefix_list"]), 3) + t.assertIn(test_objects["prefixes"]["v4-with-updated-desc"], result["data"]["prefix_list"]) + t.assertIn(test_objects["prefixes"]["v6-cidr-32"], result["data"]["prefix_list"]) + t.assertIn(test_objects["prefixes"]["v6-cidr-48"], result["data"]["prefix_list"]) if compare(netbox_version, '4.2.0') < 0: with subtest("Can use the GraphQL API (Netbox <= 4.2.0)"): @@ -270,8 +270,8 @@ if compare(netbox_version, '4.2.0') < 0: ''') result = json.loads(answer) print(result["data"]["prefix_list"][0]) - assert result["data"]["prefix_list"][0]["prefix"] == test_objects["prefixes"]["v4-with-updated-desc"]["prefix"] - assert int(result["data"]["prefix_list"][0]["site"]["id"]) == int(test_objects["prefixes"]["v4-with-updated-desc"]["scope"]["id"]) + t.assertEqual(result["data"]["prefix_list"][0]["prefix"], test_objects["prefixes"]["v4-with-updated-desc"]["prefix"]) + t.assertEqual(int(result["data"]["prefix_list"][0]["site"]["id"]), int(test_objects["prefixes"]["v4-with-updated-desc"]["scope"]["id"])) # With 4.5.2 and higher, obtaining a session cookie or token without supplying # proper CSRF tokens on the frontend /login/ endpoint is no longer possible @@ -283,5 +283,8 @@ if compare(netbox_version, '4.5.2') < 0: with subtest("Can associate LDAP groups"): result = get("/users/users/?username=${testUser}") - assert result["count"] == 1 - assert any(group["name"] == "${testGroup}" for group in result["results"][0]["groups"]) + t.assertEqual(result["count"], 1) + t.assertTrue(any(group["name"] == "${testGroup}" for group in result["results"][0]["groups"])) + +# Print systemd unit hardening state +machine.log(machine.execute("systemd-analyze security netbox.service netbox-rq.service netbox-housekeeping.service | grep -v ✓")[1]) diff --git a/nixos/tests/web-apps/part-db.nix b/nixos/tests/web-apps/part-db.nix index 66e43b09a50e..5e96774c2730 100644 --- a/nixos/tests/web-apps/part-db.nix +++ b/nixos/tests/web-apps/part-db.nix @@ -1,11 +1,16 @@ -{ lib, ... }: +{ lib, pkgs, ... }: { name = "part-db"; meta.maintainers = with lib.maintainers; [ oddlama ]; nodes = { machine = { - services.part-db.enable = true; + services.part-db = { + enable = true; + environmentFile = pkgs.writeText "part-db.env" '' + APP_SECRET=0123456789abcdef0123456789abcdef + ''; + }; }; }; @@ -15,8 +20,22 @@ machine.wait_for_unit("part-db-migrate.service") machine.wait_for_unit("phpfpm-part-db.service") machine.wait_for_unit("nginx.service") + + machine.succeed("test -d /var/lib/part-db/public/media") + machine.succeed("test -d /var/lib/part-db/uploads") + machine.succeed("test -d /var/lib/part-db/share") + machine.succeed("test $(readlink ${pkgs.part-db}/public/media) = /var/lib/part-db/public/media/") + machine.succeed("test $(readlink ${pkgs.part-db}/uploads) = /var/lib/part-db/uploads/") + machine.succeed("grep APP_SECRET=0123456789abcdef0123456789abcdef /var/lib/part-db/env.local") + machine.succeed("test $(stat -c %a:%U:%G /var/lib/part-db/env.local) = 600:part-db:part-db") + machine.wait_for_open_port(80) machine.succeed("curl -L --fail http://localhost | grep 'Part-DB'", timeout=10) + machine.succeed("echo static > /var/lib/part-db/public/media/static.txt") + machine.succeed("curl -I --fail http://localhost/media/static.txt | grep 'Content-Security-Policy'") + machine.succeed("curl -I --fail http://localhost/media/static.txt | grep 'X-Content-Type-Options: nosniff'") + machine.succeed("echo '' > /var/lib/part-db/public/media/shell.phar") + machine.succeed("curl -I http://localhost/media/shell.phar | grep 'HTTP/1.1 403 Forbidden'") ''; } diff --git a/nixos/tests/web-apps/pdfding/basic.nix b/nixos/tests/web-apps/pdfding/basic.nix index 5dec3de378e3..10db93c5203b 100644 --- a/nixos/tests/web-apps/pdfding/basic.nix +++ b/nixos/tests/web-apps/pdfding/basic.nix @@ -17,6 +17,11 @@ secretKeyFile = pkgs.writeText "secretKeyFile" "test123"; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + environment.systemPackages = with pkgs; [ sqlite ]; @@ -60,6 +65,7 @@ # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost") diff --git a/nixos/tests/web-apps/pdfding/postgres.nix b/nixos/tests/web-apps/pdfding/postgres.nix index c6a82fad839a..635799571315 100644 --- a/nixos/tests/web-apps/pdfding/postgres.nix +++ b/nixos/tests/web-apps/pdfding/postgres.nix @@ -22,6 +22,14 @@ installTestHelpers = true; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 ( + lib.mkForce [ ] + ); + environment.systemPackages = [ config.services.postgresql.finalPackage ]; @@ -46,6 +54,8 @@ # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") + machine.succeed("systemctl start pdfding-background.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost") diff --git a/nixos/tests/web-apps/pdfding/s3-backups.nix b/nixos/tests/web-apps/pdfding/s3-backups.nix index a3955c968b0d..610acabc9abb 100644 --- a/nixos/tests/web-apps/pdfding/s3-backups.nix +++ b/nixos/tests/web-apps/pdfding/s3-backups.nix @@ -31,12 +31,20 @@ in backup.schedule = "*/1 * * * *"; backup.endpoint = "[::]:3900"; extraEnvironment.BACKUP_BUCKET_NAME = "pdfding-bucket"; - extraEnvironment.BACKUP_REGION = "garage"; + extraEnvironment.BACKUP_REGION = "us-east-1"; envFiles = [ pdfding-s3-keys ]; installTestHelpers = true; }; + # NOTE: on aarch64-linux github actions runer due to lack of kvm, we need to delay pdfding start and give it more time to finish + systemd.services.pdfding.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 (lib.mkForce [ ]); + systemd.services.pdfding.serviceConfig.TimeoutStartSec = + lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 "900"; + systemd.services.pdfding-background.wantedBy = lib.mkIf pkgs.stdenv.hostPlatform.isAarch64 ( + lib.mkForce [ ] + ); + # Setup a local garage service for the backup feature # taken from garage nixosTest services.garage = { @@ -48,7 +56,7 @@ in rpc_secret = "5c1915fa04d0b6739675c61bf5907eb0fe3d9c69850c83820f51b4d25d13868c"; s3_api = { - s3_region = "garage"; + s3_region = "us-east-1"; api_bind_addr = "[::]:3900"; root_domain = ".s3.garage"; }; @@ -113,6 +121,8 @@ in # create admin machine.wait_for_unit("multi-user.target") + machine.succeed("systemctl start pdfding.service") + machine.succeed("systemctl start pdfding-background.service") machine.wait_for_open_port(${toString port}) machine.succeed("DJANGO_SUPERUSER_PASSWORD=admin pdfding-manage createsuperuser --no-input --username admin --email admin@localhost") @@ -140,7 +150,7 @@ in -F "description=" \ -F "collection=1" \ -F "use_file_name=on" \ - -F "name=test-upload" \ + -F "name=dummy" \ -F "file=@{test_pdf};type=application/pdf" \ -F "csrfmiddlewaretoken=$csrf_token" \ -H "Referer: {endpoint}/pdf/add" \ diff --git a/nixos/tests/web-apps/pretalx.nix b/nixos/tests/web-apps/pretalx.nix index 03fa6684b8b5..f6d61786e893 100644 --- a/nixos/tests/web-apps/pretalx.nix +++ b/nixos/tests/web-apps/pretalx.nix @@ -4,37 +4,38 @@ name = "pretalx"; meta.maintainers = pkgs.pretalx.meta.maintainers; - nodes = { - pretalx = - { config, ... }: - { - networking.extraHosts = '' - 127.0.0.1 talks.local - ''; + containers.pretalx = + { config, ... }: + { + networking.extraHosts = '' + 127.0.0.1 talks.local + ''; - services.pretalx = { - enable = true; - plugins = with config.services.pretalx.package.plugins; [ - pages - ]; - nginx.domain = "talks.local"; - settings = { - site.url = "http://talks.local"; - }; + services.pretalx = { + enable = true; + plugins = with config.services.pretalx.package.plugins; [ + pages + ]; + nginx.domain = "talks.local"; + settings = { + site.url = "http://talks.local"; }; }; - }; + }; - testScript = '' - start_all() + testScript = + # python + '' + start_all() - pretalx.wait_for_unit("pretalx-web.service") - pretalx.wait_for_unit("pretalx-worker.service") + pretalx.wait_for_unit("pretalx-web.service") + pretalx.wait_for_unit("pretalx-worker.service") - pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") + pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") - pretalx.succeed("pretalx-manage --help") + pretalx.log(pretalx.succeed("id")) + pretalx.succeed("pretalx-manage --help | grep -q 'createsuperuser'") - pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service")) - ''; + pretalx.log(pretalx.succeed("systemd-analyze security pretalx-web.service")) + ''; } diff --git a/nixos/tests/web-apps/pretix.nix b/nixos/tests/web-apps/pretix.nix index f99bb8733547..f58ad78146d2 100644 --- a/nixos/tests/web-apps/pretix.nix +++ b/nixos/tests/web-apps/pretix.nix @@ -1,50 +1,47 @@ { - lib, pkgs, ... }: { name = "pretix"; - meta.maintainers = with lib.maintainers; [ hexa ]; + meta.maintainers = pkgs.pretix.meta.maintainers; - nodes = { - pretix = { - virtualisation.memorySize = 2048; + containers.pretix = { + networking.extraHosts = '' + 127.0.0.1 tickets.local + ''; - networking.extraHosts = '' - 127.0.0.1 tickets.local - ''; - - services.pretix = { - enable = true; - nginx.domain = "tickets.local"; - plugins = with pkgs.pretix.plugins; [ - passbook - pages - zugferd - ]; - settings = { - pretix = { - instance_name = "NixOS Test"; - url = "http://tickets.local"; - }; - mail.from = "hello@tickets.local"; + services.pretix = { + enable = true; + nginx.domain = "tickets.local"; + plugins = with pkgs.pretix.plugins; [ + passbook + pages + zugferd + ]; + settings = { + pretix = { + instance_name = "NixOS Test"; + url = "http://tickets.local"; }; + mail.from = "hello@tickets.local"; }; }; }; - testScript = '' - start_all() + testScript = + # python + '' + start_all() - pretix.wait_for_unit("pretix-web.service") - pretix.wait_for_unit("pretix-worker.service") + pretix.wait_for_unit("pretix-web.service") + pretix.wait_for_unit("pretix-worker.service") - pretix.wait_until_succeeds("curl -q --fail http://tickets.local") + pretix.wait_until_succeeds("curl -q --fail http://tickets.local") - pretix.succeed("pretix-manage --help") + pretix.succeed("pretix-manage --help | grep -q 'createsuperuser'") - pretix.log(pretix.succeed("systemd-analyze security pretix-web.service")) - ''; + pretix.log(pretix.succeed("systemd-analyze security pretix-web.service")) + ''; } diff --git a/nixos/tests/web-apps/rustical.nix b/nixos/tests/web-apps/rustical.nix index 15a718e87702..3213cfd61f09 100644 --- a/nixos/tests/web-apps/rustical.nix +++ b/nixos/tests/web-apps/rustical.nix @@ -4,10 +4,6 @@ ... }: -let - port = "4000"; -in - { name = "rustical"; @@ -15,14 +11,21 @@ in containers.machine = { + config, pkgs, ... }: { - services.rustical = { + services.rustical.enable = true; + services.nginx = { enable = true; - settings.http.bind = "[::]:${port}"; + virtualHosts."localhost" = { + locations."/" = { + proxyPass = "http://${config.services.rustical.settings.http.bind}"; + }; + }; }; + systemd.services.nginx.serviceConfig.SupplementaryGroups = [ "rustical" ]; environment.systemPackages = with pkgs; [ calendar-cli ]; }; @@ -32,8 +35,6 @@ in ... }: let - url = "http://localhost:${toString port}"; - createPrincipalScript = pkgs.writeScript "rustical-create-principal" '' #!${lib.getExe pkgs.expect} spawn rustical principals create alice --password @@ -45,30 +46,31 @@ in calendarCliConfig = (pkgs.formats.json { }).generate "rustical-test-calendar-cli.json" { default = { caldav_user = "alice"; - caldav_url = "${url}/caldav/"; - calendar_url = "${url}/caldav/principal/alice"; + caldav_url = "http://localhost/caldav/"; + calendar_url = "http://localhost/caldav/principal/alice"; }; testcal = { inherits = "default"; - calendar_url = "${url}/caldav/principal/alice/testcal"; + calendar_url = "http://localhost/caldav/principal/alice/testcal"; }; }; in # python '' machine.wait_for_unit("rustical.service") - machine.wait_for_open_port(${port}) + machine.wait_for_file("${lib.removePrefix "unix:" containers.machine.services.rustical.settings.http.bind}") + machine.wait_for_open_port(80) with subtest("Smoketest"): - machine.succeed("curl --fail ${url}") + machine.succeed("curl --fail http://localhost") with subtest("Create principal"): machine.succeed("${createPrincipalScript}") machine.succeed("rustical principals list | grep alice") with subtest("Generate token for principal"): - machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' ${url}/frontend/login") - machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' ${url}/frontend/user/alice/app_token > token.txt") + machine.succeed("curl -f -c cookies.txt -d 'username=alice&password=foobar' http://localhost/frontend/login") + machine.succeed("curl -f -b cookies.txt -d 'name=mytoken' http://localhost/frontend/user/alice/app_token > token.txt") with subtest("Interact with caldav"): machine.succeed('calendar-cli --config-file ${calendarCliConfig} --caldav-pass "$(cat token.txt)" calendar create testcal') diff --git a/nixos/tests/web-apps/stump.nix b/nixos/tests/web-apps/stump.nix new file mode 100644 index 000000000000..ce67647404f0 --- /dev/null +++ b/nixos/tests/web-apps/stump.nix @@ -0,0 +1,26 @@ +{ ... }: +{ + name = "stump-nixos"; + + nodes.machine = + { ... }: + { + services.stump.enable = true; + }; + + testScript = '' + import json + + machine.wait_for_unit("stump.service") + + machine.wait_for_open_port(10001) + machine.succeed("curl --fail -s http://localhost:10001/") + + machine.succeed("curl --fail -s --data '{\"username\":\"admin\",\"password\":\"admin\"}' -H 'Content-Type: application/json' -X POST http://localhost:10001/api/v2/auth/register") + + response = machine.succeed("curl --fail -s -X GET http://localhost:10001/api/v2/claim") + is_claimed = json.loads(response)['isClaimed'] + + assert is_claimed + ''; +} diff --git a/nixos/tests/xrdp-with-audio-pulseaudio.nix b/nixos/tests/xrdp-with-audio-pulseaudio.nix index cc630143b990..3f7534c74bcf 100644 --- a/nixos/tests/xrdp-with-audio-pulseaudio.nix +++ b/nixos/tests/xrdp-with-audio-pulseaudio.nix @@ -10,8 +10,8 @@ # - Open a browser or something that plays sound. Ex: chromium name = "xrdp-with-audio-pulseaudio"; - meta = with pkgs.lib.maintainers; { - maintainers = [ lucasew ]; + meta = { + maintainers = [ ]; }; nodes = { @@ -73,7 +73,7 @@ testScript = { nodes, ... }: let - user = nodes.client.config.users.users.alice; + user = nodes.client.users.users.alice; in '' start_all() diff --git a/nixos/tests/your_spotify.nix b/nixos/tests/your_spotify.nix index c4935face7df..9fa13e453fb5 100644 --- a/nixos/tests/your_spotify.nix +++ b/nixos/tests/your_spotify.nix @@ -6,6 +6,7 @@ }; nodes.machine = { + services.mongodb.package = pkgs.mongodb-ce; services.your_spotify = { enable = true; spotifySecretFile = pkgs.writeText "spotifySecretFile" "deadbeef"; diff --git a/pkgs/README.md b/pkgs/README.md index 5578e8df3a96..2f1f0434d3e2 100644 --- a/pkgs/README.md +++ b/pkgs/README.md @@ -183,12 +183,18 @@ To add a package to Nixpkgs: Examples: * nginx: init at 2.0.1 + * qt6Packages.qtdeclarative: fix build * firefox: 54.0.1 -> 55.0 https://www.mozilla.org/en-US/firefox/55.0/releasenotes/ (using "→" instead of "->" is also accepted) +For package sets with multiple versions, such as `perlPackages` (aliased to +`perl5Packages`) and `python3Packages` (aliased to `python313Packages` at the +time of writing), please use the unversioned attribute in your commit message +unless the change is specific to one version. + Using the `(pkg-name):` prefix is important beyond just being a convention: it queues automatic builds by CI. More sophisticated prefixes are also possible: @@ -196,8 +202,8 @@ More sophisticated prefixes are also possible: |--------------------------------------------------------------------------|------------------------------------------------------------| | `vim: 1.0.0 -> 2.0.0` | `vim` | | `vagrant: fix dependencies for version 2.0.2` | `vagrant` | -| `python3{9,10}Packages.requests: 1.0.0 -> 2.0.0` | `python39Packages.requests`, `python310Packages.requests` | -| `python312.pkgs.numpy,python313.pkgs.scipy: fix build` | `python312.pkgs.numpy` , `python313.pkgs.scipy` | +| `python3Packages.requests: 1.0.0 -> 2.0.0` | `python3Packages.requests` | +| `python3Packagess.{numpy,scipy}: fix build` | `python3Packages.numpy` , `python3Packages.scipy` | When opening a PR with multiple commits, CI creates a single build job for all detected packages. If `passthru.tests` attributes are available, these will be built as well. @@ -906,10 +912,14 @@ stdenv.mkDerivation { ## Automatic package updates [automatic-package-updates]: #automatic-package-updates -Nixpkgs periodically tries to update all packages that have a `passthru.updateScript` attribute. +The [community bot `r-ryantm`](https://nix-community.org/update-bot/), periodically tries to update all packages in Nixpkgs. +`r-ryantm` runs the program [`nixpkgs-update`](https://nix-community.github.io/nixpkgs-update/) to find new versions of packages. +In most cases, `nixpkgs-update` will be capable of finding new versions and perform the update with out any special instructions. +Putting a `passthru.updateScript` attribute sets an explicit update procedure for `nixpkgs-update`, but this is not required for most cases. +To learn more about the default update procedures, read their [FAQ for Nixpkgs maintainers](https://nix-community.github.io/nixpkgs-update/nixpkgs-maintainer-faq/). > [!Note] -> A common pattern is to use the [`nix-update-script`](../pkgs/by-name/ni/nix-update/nix-update-script.nix) attribute provided in Nixpkgs, which runs [`nix-update`](https://github.com/Mic92/nix-update): +> A common pattern is to use the [`nix-update-script`](../pkgs/by-name/ni/nix-update/nix-update-script.nix) function provided in Nixpkgs, which makes automatic updates use [`nix-update`](https://github.com/Mic92/nix-update): > > ```nix > { stdenv, nix-update-script }: @@ -919,9 +929,10 @@ Nixpkgs periodically tries to update all packages that have a `passthru.updateSc > } > ``` > -> For simple packages, this is often enough, and will ensure that the package is updated automatically by [`nixpkgs-update`](https://github.com/nix-community/nixpkgs-update) when a new version is released. -> The [update bot](https://nix-community.org/update-bot) runs periodically to attempt to automatically update packages, and will run `passthru.updateScript` if set. -> While not strictly necessary if the project is listed on [Repology](https://repology.org), using `nix-update-script` allows the package to update via many more sources (e.g. GitHub releases). +> `nix-update` is a little bit more flexible than `nixpkgs-update` in performing updates, so it can be useful for cases such as: +> +> - A `nix-update` CLI flag like `--version branch` or `--version-regex` are needed to make the update work. +> - You don't want to rely upon new versions to be listed in [Repology](https://repology.org/), and `nix-update` finds new versions easily (e.g GitLab projects). The `passthru.updateScript` attribute can contain one of the following: @@ -1019,7 +1030,7 @@ Furthermore each update script will be passed the following environment variable > An update script will be usually run from the root of the Nixpkgs repository, but you should not rely on that. > Also note that `update.nix` executes update scripts in parallel by default, so you should avoid running `git commit` or any other commands that cannot handle that. -While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--argstr commit true`. +While update scripts should not create commits themselves, `update.nix` supports automatically creating commits when running it with `--arg commit true`. If you need to customize commit message, you can have the update script implement the `commit` feature. ### Supported features @@ -1046,7 +1057,7 @@ If you need to customize commit message, you can have the update script implemen ``` ::: - When `update.nix` is run with `--argstr commit true`, it will create a separate commit for each of the objects. + When `update.nix` is run with `--arg commit true`, it will create a separate commit for each of the objects. An empty list can be returned when the script did not update any files; for example, when the package is already at the latest version. The commit object contains the following values: diff --git a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix index f23e967d5687..3f7479882c59 100644 --- a/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix +++ b/pkgs/applications/audio/deadbeef/plugins/statusnotifier.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deadbeef-statusnotifier-plugin"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "vovochka404"; repo = "deadbeef-statusnotifier-plugin"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-6WEbY59vPNrL3W5GUwFQJimmSS+td8Ob+G46fPAxfV4="; + sha256 = "sha256-pDiQn+iHSTNWTO01j/fbEq3P374TMmnUiC5/Jn2hwBI="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix b/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix index 665b685932f9..98669ee1c13d 100644 --- a/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix +++ b/pkgs/applications/audio/deadbeef/plugins/vgmstream.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deadbeef-vgmstream-plugin"; - version = "2026-05-24"; + version = "2026-06-22"; src = fetchFromGitHub { owner = "jchv"; repo = "deadbeef-vgmstream"; rev = finalAttrs.version; - hash = "sha256-wuyqAAcNQZH7HeDve4ZXXK5q28lFfSYracCVuGjxfbw="; + hash = "sha256-pX6uhrLgJ2sWwm2tR45YuYbICrP8fKgOD/TXV79bHn4="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/audio/mopidy/mopidy.nix b/pkgs/applications/audio/mopidy/mopidy.nix index 2465b0256aa9..07c89dad0fce 100644 --- a/pkgs/applications/audio/mopidy/mopidy.nix +++ b/pkgs/applications/audio/mopidy/mopidy.nix @@ -51,7 +51,9 @@ pythonPackages.buildPythonApplication (finalAttrs: { pygobject3 pykka requests - setuptools + # Provides pkg_resources required by Mopidy 3 and affected extensions. + # Remove when updating to Mopidy 4. + setuptools_80 tornado ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ dbus-python ]; diff --git a/pkgs/applications/audio/pianoteq/default.nix b/pkgs/applications/audio/pianoteq/default.nix index 7778fed0e1c2..d596c8b20be0 100644 --- a/pkgs/applications/audio/pianoteq/default.nix +++ b/pkgs/applications/audio/pianoteq/default.nix @@ -13,6 +13,7 @@ makeDesktopItem, makeWrapper, p7zip, + gnutar, writeShellScript, }: let @@ -46,9 +47,17 @@ let pname = "pianoteq-${name}"; - unpackPhase = '' - ${p7zip}/bin/7z x $src - ''; + unpackPhase = + if lib.hasSuffix ".7z" src then + '' + ${p7zip}/bin/7z x $src + '' + else if lib.hasSuffix ".tar.xz" src then + '' + ${gnutar}/bin/tar -xf $src + '' + else + throw "unexpected file format"; nativeBuildInputs = [ autoPatchelfHook @@ -243,6 +252,7 @@ let version6 = "6.7.3"; version7 = "7.5.4"; version8 = "8.4.0"; + version9 = "9.1.2"; mkStandard = version: hash: @@ -292,8 +302,35 @@ let inherit hash; }; }; + mkTrial9 = + hash: + mkPianoteq { + name = "trial"; + version = version9; + mainProgram = "Pianoteq 9"; + startupWMClass = "Pianoteq Trial"; + src = fetchPianoteqTrial { + name = "pianoteq_trial_v${versionForFile version9}.tar.xz"; + inherit hash; + }; + }; + mkStage9 = + hash: + mkPianoteq { + name = "stage"; + version = version9; + mainProgram = "Pianoteq 9 STAGE"; + startupWMClass = "Pianoteq STAGE"; + src = fetchPianoteqWithLogin { + name = "pianoteq_setup_v${versionForFile version9}.tar.xz"; + inherit hash; + }; + }; in { + trial_9 = mkTrial9 "sha256-1ofPL6F12Gv+k2rZBadOa5Iyukuji6vdww87ufdKjM8="; + stage_9 = mkStage9 "sha256-Jvm/AhBwgj5INW8U48rJjgDB7j/Z1VnYKczvtrpl/AY="; + standard_8 = mkStandard version8 "sha256-ZDGB/SOOz+sWz7P+sNzyaipEH452n8zq5LleO3ztSXc="; stage_8 = mkStage version8 ""; standard-trial_8 = mkStandardTrial version8 "sha256-K3LbAWxciXt9hVAyRayxSoE/IYJ38Fd03+j0s7ZsMuw="; diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index f3cecb980d19..fa043d3cdb9e 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -16,19 +16,19 @@ let inherit tiling_wm; }; stableVersion = { - version = "2026.1.1.8"; # "Android Studio Quail 1 | 2026.1.1" - sha256Hash = "sha256-DB+kujz6vQfkipDgCl+i6iqCzVhwgz2tpbApDIF9g9M="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.8/android-studio-quail1-linux.tar.gz"; + version = "2026.1.2.10"; # "Android Studio Quail 2 | 2026.1.2" + sha256Hash = "sha256-ZERaVAkucFbG638aia0RbQ/uwu9flluOWU1iq9tYWQ8="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.10/android-studio-quail2-linux.tar.gz"; }; betaVersion = { - version = "2026.1.1.7"; # "Android Studio Quail 1 | 2026.1.1 RC 2" - sha256Hash = "sha256-TB9hPynvVq1axv6oAw8un6WHVHakZPvEBjfPCs+Dwj0="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.1.7/android-studio-quail1-rc2-linux.tar.gz"; + version = "2026.1.3.5"; # "Android Studio Quail 3 | 2026.1.3 RC 1" + sha256Hash = "sha256-P8YoUnG4YtCOPkbHLFBHfteZg8cJJeXuDgty+kmgbSw="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.3.5/android-studio-quail3-rc1-linux.tar.gz"; }; latestVersion = { - version = "2026.1.2.7"; # "Android Studio Quail 2 | 2026.1.2 Canary 7" - sha256Hash = "sha256-LHszfAtM5ZLNbTZG0isb+aUW3uwp+zav/igHT4HDeEM="; - url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.2.7/android-studio-quail2-canary7-linux.tar.gz"; + version = "2026.1.4.1"; # "Android Studio Quail 4 | 2026.1.4 Canary 1" + sha256Hash = "sha256-ynHUoMDsTNgKKRAU948k37ktAIlIm9A+md8KyVBTjl4="; + url = "https://edgedl.me.gvt1.com/android/studio/ide-zips/2026.1.4.1/android-studio-quail4-canary1-linux.tar.gz"; }; in { diff --git a/pkgs/applications/editors/cudatext/deps.json b/pkgs/applications/editors/cudatext/deps.json deleted file mode 100644 index 3a1e643c6f7f..000000000000 --- a/pkgs/applications/editors/cudatext/deps.json +++ /dev/null @@ -1,57 +0,0 @@ -{ - "EncConv": { - "owner": "Alexey-T", - "rev": "2023.04.16", - "hash": "sha256-6KaYv4OO6Ctk+vgow67LKGkbEEd1+lFJ9B1wSk4m3pc=" - }, - "ATBinHex-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-dEwz052aYcJtKpRcP8t7gE2RHuHPQ4T0zHFMv6zVZ6g=" - }, - "ATFlatControls": { - "owner": "Alexey-T", - "rev": "2023.10.30", - "hash": "sha256-fuTQnnuWjIsABx457y+n6luLxQf+b9TiZGLXYjNsUrw=" - }, - "ATSynEdit": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-LGYGCxEPdZL4BU3TGiFxydu7AN8g5kqOdW+dcbiCf7E=" - }, - "ATSynEdit_Cmp": { - "owner": "Alexey-T", - "rev": "2023.05.31", - "hash": "sha256-QXu/p3o0RSwMyntFYrjIQBtOBGvL9rAsINaglG3fZvo=" - }, - "EControl": { - "owner": "Alexey-T", - "rev": "2023.11.16", - "hash": "sha256-FxUV+K9JRsdr0xqQzvg1UI4bBHyhqxiVoPN58h2+WVg=" - }, - "ATSynEdit_Ex": { - "owner": "Alexey-T", - "rev": "2023.11.23", - "hash": "sha256-RNXP8O3UF+hwA3TNzLorZqlt04Idnc4Z9LA87JJSsZE=" - }, - "Python-for-Lazarus": { - "owner": "Alexey-T", - "rev": "2023.06.30", - "hash": "sha256-mO8/RNJjy9KtFuDUmV2Y8Ff+Jjm9yRd7GSrI6mOONUc=" - }, - "Emmet-Pascal": { - "owner": "Alexey-T", - "rev": "2023.08.12", - "hash": "sha256-s9ZKrL+XIWIwejnLz+uuyDbbDuOZLJhiuiMChKB4Reg=" - }, - "CudaText-lexers": { - "owner": "Alexey-T", - "rev": "2021.07.09", - "hash": "sha256-OyC85mTMi9m5kbtx8TAK2V4voL1i+J+TFoLVwxlHiD4=" - }, - "bgrabitmap": { - "owner": "bgrabitmap", - "rev": "v11.5.6", - "hash": "sha256-7TuHCCaH8/RxiVQmDILPW4T6op/XW6djwA5iSh/Yb5w=" - } -} diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix index 818646630cc5..e8d8c46ff192 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-common-overrides.nix @@ -323,8 +323,5 @@ in ''; }); - # native-ice https://github.com/mattiase/xr/issues/9 - xr = ignoreCompilationError super.xr; - # keep-sorted end } diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix index 5f4e032acc72..52e108e746e2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-devel-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "a68-mode"; ename = "a68-mode"; - version = "1.2.0.20260129.20653"; + version = "1.3.0.20260710.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/a68-mode-1.2.0.20260129.20653.tar"; - sha256 = "03b4608ij5jiijasy41vndwcnzl92gwc0frh2pxs6112p7xk2sf0"; + url = "https://elpa.gnu.org/devel/a68-mode-1.3.0.20260710.2.tar"; + sha256 = "10qxsr316kv8317zfjwixj7pmsrqykycwf6pmw0wiv8w0vq0v9jr"; }; packageRequires = [ ]; meta = { @@ -52,10 +52,10 @@ elpaBuild { pname = "ack"; ename = "ack"; - version = "1.11.0.20220924.84123"; + version = "1.11.0.20260429.83816"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ack-1.11.0.20220924.84123.tar"; - sha256 = "0vic2izviakj6qh2l15jd8qm8yr0h0qhy4r8sx7zdngpi9i14r5v"; + url = "https://elpa.gnu.org/devel/ack-1.11.0.20260429.83816.tar"; + sha256 = "106m586p8ynjbsf9yknsfjpgvss6wxivgshc5kg7l8fg61d7c0nd"; }; packageRequires = [ ]; meta = { @@ -74,10 +74,10 @@ elpaBuild { pname = "activities"; ename = "activities"; - version = "0.8pre0.20251118.222434"; + version = "0.8pre0.20251118.85"; src = fetchurl { - url = "https://elpa.gnu.org/devel/activities-0.8pre0.20251118.222434.tar"; - sha256 = "0062llgn5ljf18d8fcdp4mkmn6dr67gkh8d56s8gy6rdiw354k8p"; + url = "https://elpa.gnu.org/devel/activities-0.8pre0.20251118.85.tar"; + sha256 = "0v0s5vlfd2dv4shbmxqn37mcvfmfszdk0nwi1y184hwsp0bkvzqx"; }; packageRequires = [ persist ]; meta = { @@ -207,10 +207,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.7.0.20220417.71805"; + version = "1.8.0.20260529.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/aggressive-completion-1.7.0.20220417.71805.tar"; - sha256 = "1nmh9as4m0xjvda1f0hda8s1wk1z973wlfxcfci768y45ffnjn0g"; + url = "https://elpa.gnu.org/devel/aggressive-completion-1.8.0.20260529.0.tar"; + sha256 = "0w567lldk16v5x80h7wm8vmz5947izxi842m3cwsx2hghpsp1rrq"; }; packageRequires = [ ]; meta = { @@ -249,10 +249,10 @@ elpaBuild { pname = "agitate"; ename = "agitate"; - version = "0.0.20241021.65229"; + version = "0.0.20260424.102016"; src = fetchurl { - url = "https://elpa.gnu.org/devel/agitate-0.0.20241021.65229.tar"; - sha256 = "11f1yj937wfnn6d12845pwa8045wp5pk9mbcvzhigni3jkm8820p"; + url = "https://elpa.gnu.org/devel/agitate-0.0.20260424.102016.tar"; + sha256 = "1sgzy52irfd1p5nppqrlna05fhrscchmclr3wj9s5qh3wdpfwqv8"; }; packageRequires = [ ]; meta = { @@ -291,10 +291,10 @@ elpaBuild { pname = "aircon-theme"; ename = "aircon-theme"; - version = "0.0.6.0.20240613.140459"; + version = "0.0.6.0.20260507.72645"; src = fetchurl { - url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20240613.140459.tar"; - sha256 = "1npppgbs1dfixqpmdc0nfxx4vvnsvpy101q8lcf7h9i8br63mlqy"; + url = "https://elpa.gnu.org/devel/aircon-theme-0.0.6.0.20260507.72645.tar"; + sha256 = "1cld1ns2q4vkxpmc69s6scnhgghi36ibmscg8zjwwhbbp31ah0ir"; }; packageRequires = [ ]; meta = { @@ -333,10 +333,10 @@ elpaBuild { pname = "altcaps"; ename = "altcaps"; - version = "1.3.0.0.20260413.54314"; + version = "1.3.0.0.20260424.102117"; src = fetchurl { - url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260413.54314.tar"; - sha256 = "1jj7321nhxy7gk2cchv81nyw8fzzw7zkikgwgnj6k7kki53rhp8c"; + url = "https://elpa.gnu.org/devel/altcaps-1.3.0.0.20260424.102117.tar"; + sha256 = "00bjfrm5hyp53779fg40yjaldlqdli4frl4dmf7371zvpd63184z"; }; packageRequires = [ ]; meta = { @@ -461,10 +461,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "14.1.2.0.20260331.191333"; + version = "14.1.2.0.20260710.47"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260331.191333.tar"; - sha256 = "1xan7cfl5nhndngmdrgs2832xpfl7jvfb86kgjn8i8lm81djz5r9"; + url = "https://elpa.gnu.org/devel/auctex-14.1.2.0.20260710.47.tar"; + sha256 = "0vlx2mi7fvch1h6s2cyjrwk88zib8l5cmzwh9z0i0z6pgnx5d7nq"; }; packageRequires = [ ]; meta = { @@ -483,10 +483,10 @@ elpaBuild { pname = "auctex-cont-latexmk"; ename = "auctex-cont-latexmk"; - version = "0.3.0.20250115.185937"; + version = "0.3.0.20260617.10"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.3.0.20250115.185937.tar"; - sha256 = "1rdnnc7ihg12dprivywjmhfl5s2cb58bl2n3fy7gf6h2wsjw0md5"; + url = "https://elpa.gnu.org/devel/auctex-cont-latexmk-0.3.0.20260617.10.tar"; + sha256 = "1dcppji0h1yd75iv6ihg7iyjzwf14l6h32cf7k4aiyb58d8x2ka6"; }; packageRequires = [ auctex ]; meta = { @@ -505,10 +505,10 @@ elpaBuild { pname = "auctex-label-numbers"; ename = "auctex-label-numbers"; - version = "0.2.0.20241019.12742"; + version = "0.3.0.20260714.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.2.0.20241019.12742.tar"; - sha256 = "0y4y8267r3bmwshcb5qkfrpnaxs1zwy1rwdhngjci005n68bslk9"; + url = "https://elpa.gnu.org/devel/auctex-label-numbers-0.3.0.20260714.1.tar"; + sha256 = "1bqw342873z0cpjg6lg3inscbjilwrgm0dgd9bhc7bb8mas7hkaj"; }; packageRequires = [ auctex ]; meta = { @@ -548,10 +548,10 @@ elpaBuild { pname = "auth-source-xoauth2-plugin"; ename = "auth-source-xoauth2-plugin"; - version = "0.3.2.0.20251113.213445"; + version = "0.4.1.0.20260526.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.3.2.0.20251113.213445.tar"; - sha256 = "02g7qy4aj85jqzzsqka9ki712hbz58ygwvr8f56ncyy1xapcjpsz"; + url = "https://elpa.gnu.org/devel/auth-source-xoauth2-plugin-0.4.1.0.20260526.0.tar"; + sha256 = "058src50y1rynyrsfcdlrswbmsmf41ic1aa0bfkqg19dgaag81qy"; }; packageRequires = [ oauth2 ]; meta = { @@ -719,10 +719,10 @@ elpaBuild { pname = "beframe"; ename = "beframe"; - version = "1.5.0.0.20260413.54824"; + version = "1.5.0.0.20260605.5"; src = fetchurl { - url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260413.54824.tar"; - sha256 = "1nj3gn44bd867yx34d9nzzqcfk5k3fp89wg7k83lpcc7f2a6w3dw"; + url = "https://elpa.gnu.org/devel/beframe-1.5.0.0.20260605.5.tar"; + sha256 = "1i4dmcxbjd73gpkbj82qw6r95hc2dqm4zvcmkmka9ymwxdjamwi1"; }; packageRequires = [ ]; meta = { @@ -740,10 +740,10 @@ elpaBuild { pname = "bicep-ts-mode"; ename = "bicep-ts-mode"; - version = "0.1.4.0.20251121.60244"; + version = "0.1.4.0.20260720.83"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20251121.60244.tar"; - sha256 = "0423n65lcxd56xc4q1mihwb07y81y12wh2qiwgwc1n1b7wilbpkg"; + url = "https://elpa.gnu.org/devel/bicep-ts-mode-0.1.4.0.20260720.83.tar"; + sha256 = "19k83fn4i2vvvad6pz865ns165vpd9msa1cnjhmlcfv5cxsa7wk3"; }; packageRequires = [ ]; meta = { @@ -902,10 +902,10 @@ elpaBuild { pname = "breadcrumb"; ename = "breadcrumb"; - version = "1.0.1.0.20260110.120308"; + version = "1.0.1.0.20260630.15"; src = fetchurl { - url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20260110.120308.tar"; - sha256 = "0g5gcq3iqvrkfi6iwbiiyrcwac36czxrfqi9gybipd9k11fqplcr"; + url = "https://elpa.gnu.org/devel/breadcrumb-1.0.1.0.20260630.15.tar"; + sha256 = "12l1bi4gynmgfffbj7w6za21a3n6776iqixm33rh7zkbzfhafvxl"; }; packageRequires = [ project ]; meta = { @@ -950,10 +950,10 @@ elpaBuild { pname = "buffer-env"; ename = "buffer-env"; - version = "0.6.0.20250516.122320"; + version = "0.6.0.20260604.5"; src = fetchurl { - url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20250516.122320.tar"; - sha256 = "0m1kb8h2mjjd5hznp86yxjdic0zngq89x67vd7srvikxxbj312d9"; + url = "https://elpa.gnu.org/devel/buffer-env-0.6.0.20260604.5.tar"; + sha256 = "0w0lbfqn3mn628w2mhcfgmsrzzl3915vsry84g64gfb1ga7r4ld3"; }; packageRequires = [ compat ]; meta = { @@ -993,10 +993,10 @@ elpaBuild { pname = "bufferlo"; ename = "bufferlo"; - version = "1.2.0.20260314.110439"; + version = "1.2.0.20260531.20"; src = fetchurl { - url = "https://elpa.gnu.org/devel/bufferlo-1.2.0.20260314.110439.tar"; - sha256 = "0jf14ac09wrx8hc6bkrczaddf48fxglvgz7qik7bd2vb7w9dpn80"; + url = "https://elpa.gnu.org/devel/bufferlo-1.2.0.20260531.20.tar"; + sha256 = "04g5c2zar12k9b4jrka13zc8bd67kn4xhjsybhrjdz3fhphj5ivn"; }; packageRequires = [ ]; meta = { @@ -1106,10 +1106,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "2.6.0.20260419.184703"; + version = "2.7.0.20260628.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cape-2.6.0.20260419.184703.tar"; - sha256 = "143b5kxykz4mgx2y7gq6vidrqnnjnc0ay809hjzbqfmpvlnf86fn"; + url = "https://elpa.gnu.org/devel/cape-2.7.0.20260628.1.tar"; + sha256 = "1hbwh1752p1rjh4csn6vs4k9bv2qxa0ms6s914aclx72slqa2qvj"; }; packageRequires = [ compat ]; meta = { @@ -1266,6 +1266,28 @@ }; } ) { }; + cm-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cm-mode"; + ename = "cm-mode"; + version = "1.10.0.20260518.192037"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/cm-mode-1.10.0.20260518.192037.tar"; + sha256 = "17ck187x677s00lvk09lr76fgl9i0sx7p46dqhf033k70c46a4gj"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/devel/cm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; cobol-mode = callPackage ( { elpaBuild, @@ -1311,6 +1333,7 @@ ) { }; colorful-mode = callPackage ( { + cl-lib ? null, compat, elpaBuild, fetchurl, @@ -1319,12 +1342,15 @@ elpaBuild { pname = "colorful-mode"; ename = "colorful-mode"; - version = "1.2.5.0.20260324.223335"; + version = "1.2.5.0.20260508.152701"; src = fetchurl { - url = "https://elpa.gnu.org/devel/colorful-mode-1.2.5.0.20260324.223335.tar"; - sha256 = "0gyz2n3j4ja4diknh6rm5rlzyw49pqbxin2j7ykjz0iprzr5vgnw"; + url = "https://elpa.gnu.org/devel/colorful-mode-1.2.5.0.20260508.152701.tar"; + sha256 = "1yif2xib8czihif7ls2kw98akjjc76ml0ic69jr3qysi73p3n6iv"; }; - packageRequires = [ compat ]; + packageRequires = [ + cl-lib + compat + ]; meta = { homepage = "https://elpa.gnu.org/devel/colorful-mode.html"; license = lib.licenses.free; @@ -1383,16 +1409,17 @@ elpaBuild, fetchurl, lib, + posframe, }: elpaBuild { pname = "company"; ename = "company"; - version = "1.0.2.0.20260331.24502"; + version = "1.0.2.0.20260718.178"; src = fetchurl { - url = "https://elpa.gnu.org/devel/company-1.0.2.0.20260331.24502.tar"; - sha256 = "19apxj576hy09pk37rpnzybab0ffrw63j2ycad5vwz75y84dhjys"; + url = "https://elpa.gnu.org/devel/company-1.0.2.0.20260718.178.tar"; + sha256 = "15ymhxywy9kh33rpjrbnn6h545hkwgqcc7mbjpjp7p2kghh1xndj"; }; - packageRequires = [ ]; + packageRequires = [ posframe ]; meta = { homepage = "https://elpa.gnu.org/devel/company.html"; license = lib.licenses.free; @@ -1478,17 +1505,16 @@ elpaBuild, fetchurl, lib, - seq, }: elpaBuild { pname = "compat"; ename = "compat"; - version = "30.1.0.1.0.20260411.151508"; + version = "31.0.0.2.0.20260716.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/compat-30.1.0.1.0.20260411.151508.tar"; - sha256 = "14vim5vlv57q6zl83lixj2palwbxz2dkbpivyvs56cjwqck41bvd"; + url = "https://elpa.gnu.org/devel/compat-31.0.0.2.0.20260716.2.tar"; + sha256 = "179w1zim5nfj1crvc2qm9ipvwwh2yr9q3rs8wjffcvsfjipnym5d"; }; - packageRequires = [ seq ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.gnu.org/devel/compat.html"; license = lib.licenses.free; @@ -1504,10 +1530,10 @@ elpaBuild { pname = "cond-star"; ename = "cond-star"; - version = "1.0.0.20260228.134355"; + version = "1.0.0.20260523.114724"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cond-star-1.0.0.20260228.134355.tar"; - sha256 = "1hl7m4rjjq8c99f1xqa1b8hn3hpixx3ryzlf6wiq2lc7fn4icail"; + url = "https://elpa.gnu.org/devel/cond-star-1.0.0.20260523.114724.tar"; + sha256 = "15gp54pkm50dq9141fknq4gy8ya6wrbr0nyzqax15rxz57gsf6cs"; }; packageRequires = [ ]; meta = { @@ -1547,10 +1573,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "3.4.0.20260421.111434"; + version = "3.6.0.20260716.5"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-3.4.0.20260421.111434.tar"; - sha256 = "16gz342an0vsdj7jdy5gcrv8wwcwfqabdzsyyg1dcfzrlmvxvfja"; + url = "https://elpa.gnu.org/devel/consult-3.6.0.20260716.5.tar"; + sha256 = "1hn04wqdbdbrim1idbcqj9b0lkicghhyaba0jpw7zdw682hfjcaf"; }; packageRequires = [ compat ]; meta = { @@ -1570,10 +1596,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.4.2.0.20260423.93857"; + version = "0.5.1.0.20260704.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-denote-0.4.2.0.20260423.93857.tar"; - sha256 = "1fcf1abqg71kp9g0nsxdnmb33m6g4kn0iwgvfd1cqslyhmdkk0c8"; + url = "https://elpa.gnu.org/devel/consult-denote-0.5.1.0.20260704.0.tar"; + sha256 = "0bfy6gzznxg356s1nqrv5ma26rlb9njf12dbkma6glpr8l7gpavv"; }; packageRequires = [ consult @@ -1595,10 +1621,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.6.0.0.20260410.130304"; + version = "0.7.0.0.20260430.125841"; src = fetchurl { - url = "https://elpa.gnu.org/devel/consult-hoogle-0.6.0.0.20260410.130304.tar"; - sha256 = "1067wh3r087bdvg4zqbzwmzh6qssj7x7y12qs3fh96vpqrjw2a11"; + url = "https://elpa.gnu.org/devel/consult-hoogle-0.7.0.0.20260430.125841.tar"; + sha256 = "06kqrgbm80bpszqb9i1zx0mwaw4imi3i3lz802rwbfdfa6cg1vnh"; }; packageRequires = [ consult ]; meta = { @@ -1660,10 +1686,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "2.9.0.20260419.183827"; + version = "2.10.0.20260719.16"; src = fetchurl { - url = "https://elpa.gnu.org/devel/corfu-2.9.0.20260419.183827.tar"; - sha256 = "06myb0qgv8q3iak83bdpkjmd8vplqcvypl9q1y1h7qfbcy2yvssh"; + url = "https://elpa.gnu.org/devel/corfu-2.10.0.20260719.16.tar"; + sha256 = "0h3mjsfk8zsviqcqccql4pcj87ja0am78ag3q2w8jw77bqvk5s4a"; }; packageRequires = [ compat ]; meta = { @@ -1835,10 +1861,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.27.0.20250307.75451"; + version = "1.27.0.20260505.161621"; src = fetchurl { - url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20250307.75451.tar"; - sha256 = "089z16kqm12zs7wrs46hskmz3mc1jqx00mzilaap197xq9hqkc3m"; + url = "https://elpa.gnu.org/devel/csv-mode-1.27.0.20260505.161621.tar"; + sha256 = "0g166wcxh7fl8ixnbc1ap2dl5mrq9ahzkx3b5fzfcx7f6b3aw8ym"; }; packageRequires = [ cl-lib ]; meta = { @@ -1877,10 +1903,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "1.2.0.0.20260413.54607"; + version = "1.2.0.0.20260701.4"; src = fetchurl { - url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260413.54607.tar"; - sha256 = "00cxb53p6l3d395vkmza1zqjrpx9rq65xy5cnv410i7lricrwpfr"; + url = "https://elpa.gnu.org/devel/cursory-1.2.0.0.20260701.4.tar"; + sha256 = "0087hsy0qzzlhj7zsasmc6x41w6gnh21sb0in7zyahy2x0qrqwi4"; }; packageRequires = [ ]; meta = { @@ -1941,10 +1967,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.26.0.0.20260406.153653"; + version = "0.27.1.0.20260719.8"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dape-0.26.0.0.20260406.153653.tar"; - sha256 = "0hpssk2z4i4nalmf9h0iz6iwawks3wh2lkf7il9pvsmxfyi5qb1q"; + url = "https://elpa.gnu.org/devel/dape-0.27.1.0.20260719.8.tar"; + sha256 = "08y9z6l5qirz812v0wz1y3fklsqj9b0476scl2ziq8mvjdkv37bq"; }; packageRequires = [ jsonrpc ]; meta = { @@ -2075,10 +2101,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "4.1.3.0.20260423.182534"; + version = "4.2.3.0.20260707.7"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-4.1.3.0.20260423.182534.tar"; - sha256 = "1mh9sl4rhsmxniibrnym69xdwgswij8132b4n7k65lw75y0p05j9"; + url = "https://elpa.gnu.org/devel/denote-4.2.3.0.20260707.7.tar"; + sha256 = "0yrqdz1znd5nkrwqiwrzgsgb7d1yysqmy1lr05r2yj3rlfzhcnvi"; }; packageRequires = [ ]; meta = { @@ -2097,10 +2123,10 @@ elpaBuild { pname = "denote-journal"; ename = "denote-journal"; - version = "0.2.2.0.20260328.192346"; + version = "0.3.0.0.20260520.123338"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-journal-0.2.2.0.20260328.192346.tar"; - sha256 = "1cp907wdx6cqy5qadq1dsp292ms7wr0qy5znf8fjj4112gxv7ymd"; + url = "https://elpa.gnu.org/devel/denote-journal-0.3.0.0.20260520.123338.tar"; + sha256 = "11ad50v3p81vrana2dbnqi7xm07aly4iv03rw5kxblynjcarsd1i"; }; packageRequires = [ denote ]; meta = { @@ -2119,10 +2145,10 @@ elpaBuild { pname = "denote-markdown"; ename = "denote-markdown"; - version = "0.2.2.0.20260423.181135"; + version = "0.3.0.0.20260520.123211"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-markdown-0.2.2.0.20260423.181135.tar"; - sha256 = "18l9aymn3v5i3y3g4bx81b16zw4mdgrkkz3939xq5dxy4wwmiqjk"; + url = "https://elpa.gnu.org/devel/denote-markdown-0.3.0.0.20260520.123211.tar"; + sha256 = "0bbf5cycmjl5p6cl81x5cjac98y97cr9jkwnrgi5sy5rgxqfpj8k"; }; packageRequires = [ denote ]; meta = { @@ -2163,10 +2189,10 @@ elpaBuild { pname = "denote-org"; ename = "denote-org"; - version = "0.2.1.0.20260228.191514"; + version = "0.3.0.0.20260520.123505"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-org-0.2.1.0.20260228.191514.tar"; - sha256 = "1x42gak4mqs6b5zw3z2akpylf3g5pnscg926b92a20naj31j71np"; + url = "https://elpa.gnu.org/devel/denote-org-0.3.0.0.20260520.123505.tar"; + sha256 = "12g38pk2vg1g1p9b847r4aisxxr9l36rsbgg1s4aqavd2cd3b00g"; }; packageRequires = [ denote ]; meta = { @@ -2229,10 +2255,10 @@ elpaBuild { pname = "denote-sequence"; ename = "denote-sequence"; - version = "0.2.0.0.20260409.181206"; + version = "0.3.3.0.20260523.202058"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-sequence-0.2.0.0.20260409.181206.tar"; - sha256 = "0r3b31hsnp3c4fjsjcyvbpzbbbbs465fn29zja23xwfix3x0y0rp"; + url = "https://elpa.gnu.org/devel/denote-sequence-0.3.3.0.20260523.202058.tar"; + sha256 = "1iyfm6y37waq2vfb210kdwkkrr8gv9l443b4wq768f1kj4bns2gg"; }; packageRequires = [ denote ]; meta = { @@ -2251,10 +2277,10 @@ elpaBuild { pname = "denote-silo"; ename = "denote-silo"; - version = "0.2.0.0.20260111.93458"; + version = "0.3.2.0.20260705.4"; src = fetchurl { - url = "https://elpa.gnu.org/devel/denote-silo-0.2.0.0.20260111.93458.tar"; - sha256 = "0f57s97k267vd4wm9ps9q57wsrq5djrcsxmmkwlqngmr1yrnnhla"; + url = "https://elpa.gnu.org/devel/denote-silo-0.3.2.0.20260705.4.tar"; + sha256 = "08zgg8jll6kdmzqrzx2j0q0g35sk6sfbp6qxd687sc8p9n9bx4yg"; }; packageRequires = [ denote ]; meta = { @@ -2337,10 +2363,10 @@ elpaBuild { pname = "dicom"; ename = "dicom"; - version = "1.3.0.20260330.63030"; + version = "1.5.0.20260704.4"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dicom-1.3.0.20260330.63030.tar"; - sha256 = "0xfvmxp1w730b5hgq3wnaa79mi2ib2v43z4as9py82ccvmcw2c40"; + url = "https://elpa.gnu.org/devel/dicom-1.5.0.20260704.4.tar"; + sha256 = "0b5mm81wfskhls44w951igz2y5yf4lx3g61fswyk9hjhm4sccgz5"; }; packageRequires = [ compat ]; meta = { @@ -2387,10 +2413,10 @@ elpaBuild { pname = "diff-hl"; ename = "diff-hl"; - version = "1.10.0.0.20260328.192544"; + version = "1.10.0.0.20260627.186"; src = fetchurl { - url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20260328.192544.tar"; - sha256 = "1whznmdqlf3gnyq0k7n9pj71d8qb3avv27dmk86kmgvp1n2bq3c4"; + url = "https://elpa.gnu.org/devel/diff-hl-1.10.0.0.20260627.186.tar"; + sha256 = "0anq2hcihzsm3ff0g0smk8w72x5fi3frqymbm1dci679ssx4316v"; }; packageRequires = [ cl-lib ]; meta = { @@ -2514,10 +2540,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.6.0.0.20260413.54225"; + version = "0.6.1.0.20260610.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dired-preview-0.6.0.0.20260413.54225.tar"; - sha256 = "0x1s8b4swr62a833zszyk9kfnh2fx5kl5rwjdfhm4mgpib50nmcy"; + url = "https://elpa.gnu.org/devel/dired-preview-0.6.1.0.20260610.0.tar"; + sha256 = "061b09z60jjd8gggjln9nr5fb0r3rvip31mi8l7r9b1f49k8x730"; }; packageRequires = [ ]; meta = { @@ -2621,10 +2647,10 @@ elpaBuild { pname = "dmsg"; ename = "dmsg"; - version = "0.2.0.20260422.105206"; + version = "0.3.0.20260515.181304"; src = fetchurl { - url = "https://elpa.gnu.org/devel/dmsg-0.2.0.20260422.105206.tar"; - sha256 = "0h8l75k00hh0j2cyc2jwqkrnr7qmkz0jydbhm2qwpm3bb5pyd6bq"; + url = "https://elpa.gnu.org/devel/dmsg-0.3.0.20260515.181304.tar"; + sha256 = "0f95v15bcyclap8zcz5iyaf09wq63px29q12w0s6aza3j5sslz6p"; }; packageRequires = [ ]; meta = { @@ -2642,10 +2668,10 @@ elpaBuild { pname = "do-at-point"; ename = "do-at-point"; - version = "0.2.0.0.20260302.225537"; + version = "0.2.0.0.20260502.162532"; src = fetchurl { - url = "https://elpa.gnu.org/devel/do-at-point-0.2.0.0.20260302.225537.tar"; - sha256 = "093jsdpwv4caq46fhr7q0ymh59v45w78pfr5l1mrw9rl1cjh1b37"; + url = "https://elpa.gnu.org/devel/do-at-point-0.2.0.0.20260502.162532.tar"; + sha256 = "07mamgs1fhx9kkfliz9c9a3cdbxjbbydc8hr9zkjf8sy0gwy65da"; }; packageRequires = [ ]; meta = { @@ -2684,10 +2710,10 @@ elpaBuild { pname = "doc-view-follow"; ename = "doc-view-follow"; - version = "0.3.2.0.20250427.143824"; + version = "0.3.2.0.20260708.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/doc-view-follow-0.3.2.0.20250427.143824.tar"; - sha256 = "04jk93rkv682w6zcfr283gpwgi5fiq5w3xdpv49zkwddx783crfa"; + url = "https://elpa.gnu.org/devel/doc-view-follow-0.3.2.0.20260708.1.tar"; + sha256 = "0xyd9w7fqaj22dp43788gm5i7rzbhch2sh2mmarhyw4xp9a7j83w"; }; packageRequires = [ ]; meta = { @@ -2726,10 +2752,10 @@ elpaBuild { pname = "doric-themes"; ename = "doric-themes"; - version = "1.1.0.0.20260325.70019"; + version = "1.2.1.0.20260716.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/doric-themes-1.1.0.0.20260325.70019.tar"; - sha256 = "1775v235qd5v0zxakf992iwcmm7nwxppwm2ghx1l86iyfr4l80s4"; + url = "https://elpa.gnu.org/devel/doric-themes-1.2.1.0.20260716.2.tar"; + sha256 = "00jysh555i53hx32drdfwc25bf09jq4hm0q6w2q9h2pzrk8wmk85"; }; packageRequires = [ ]; meta = { @@ -2748,10 +2774,10 @@ elpaBuild { pname = "drepl"; ename = "drepl"; - version = "0.4.0.20251012.81518"; + version = "0.4.0.20260715.8"; src = fetchurl { - url = "https://elpa.gnu.org/devel/drepl-0.4.0.20251012.81518.tar"; - sha256 = "0xq39hhxx8fpkxqkxnihgn0dw3gxxyzaglpw4cpbn5f6zx2x26yy"; + url = "https://elpa.gnu.org/devel/drepl-0.4.0.20260715.8.tar"; + sha256 = "01gbl3gqrlz2gimmjsk0nb6zyps8a89z96bwrxqfjph6w13d33gw"; }; packageRequires = [ comint-mime ]; meta = { @@ -2950,10 +2976,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "2.1.0.0.20260405.133650"; + version = "2.2.0.0.20260621.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ef-themes-2.1.0.0.20260405.133650.tar"; - sha256 = "0mg7zxw33swrwy195cbnpjsi9waydbw0aq8hvpwf58cwf6lnszzn"; + url = "https://elpa.gnu.org/devel/ef-themes-2.2.0.0.20260621.0.tar"; + sha256 = "0l4qcn558wwwq29n0kf5ws8xbw834dp5n8kzdn225kg9x6h9a5dd"; }; packageRequires = [ modus-themes ]; meta = { @@ -2978,10 +3004,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.23.0.20260422.80836"; + version = "1.24.0.20260623.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eglot-1.23.0.20260422.80836.tar"; - sha256 = "1w7pfbx6m68x6anxg1038cah2wbyb3f3mdgsqsrsj0dbh9qwzzq5"; + url = "https://elpa.gnu.org/devel/eglot-1.24.0.20260623.0.tar"; + sha256 = "16zcxb2xfxfxppkr0l00h72q5wgww6bi66zqf76h1j84k295mjwv"; }; packageRequires = [ eldoc @@ -3054,10 +3080,10 @@ elpaBuild { pname = "eldoc"; ename = "eldoc"; - version = "1.16.0.0.20260101.125434"; + version = "1.16.0.0.20260709.6"; src = fetchurl { - url = "https://elpa.gnu.org/devel/eldoc-1.16.0.0.20260101.125434.tar"; - sha256 = "1c29yb3x2sfnqq690hgvw0f4wsf1aj327k137hwcz6pgc6llgg76"; + url = "https://elpa.gnu.org/devel/eldoc-1.16.0.0.20260709.6.tar"; + sha256 = "0i3bls6iq0lm03w09vrillqygx8xx9xpf2ixr8k2q3my4g8kszqx"; }; packageRequires = [ ]; meta = { @@ -3152,10 +3178,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "1.13.0.0.20260410.5454"; + version = "1.30.0.0.20260712.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ellama-1.13.0.0.20260410.5454.tar"; - sha256 = "05pvhjagzc0nb2nsagbd1xhxfqvrfhjn734881ph6njr3ns186ai"; + url = "https://elpa.gnu.org/devel/ellama-1.30.0.0.20260712.1.tar"; + sha256 = "0gn0jgi3li4ycqwjk2bbfwp47awxkr5pscyxpnxyy1qbjlv77s4d"; }; packageRequires = [ compat @@ -3221,10 +3247,10 @@ elpaBuild { pname = "emacs-lisp-intro-nl"; ename = "emacs-lisp-intro-nl"; - version = "0.0.20260419.193604"; + version = "0.0.20260702.44"; src = fetchurl { - url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260419.193604.tar"; - sha256 = "1spqwayvm830vzsyy7l768yd91f3h8agpd9wpaa6g0pd5pdhh42r"; + url = "https://elpa.gnu.org/devel/emacs-lisp-intro-nl-0.0.20260702.44.tar"; + sha256 = "1xsnp0pfsvs20wscbqcqsigl56ig5vacmkl86f3ljp338ka90d5f"; }; packageRequires = [ ]; meta = { @@ -3243,10 +3269,10 @@ elpaBuild { pname = "embark"; ename = "embark"; - version = "1.2.0.20260404.170203"; + version = "1.2.0.20260609.21"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-1.2.0.20260404.170203.tar"; - sha256 = "1ppb6axy1bwxm7qa0pw9cn2k0whl3dfnq69cw2qh62pqi1rnwvh6"; + url = "https://elpa.gnu.org/devel/embark-1.2.0.20260609.21.tar"; + sha256 = "1b4gkqrsjv21gxz6padf27wmzj46rryfy0pp662xf0fz9fab2ngp"; }; packageRequires = [ compat ]; meta = { @@ -3267,10 +3293,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1.0.20260404.170203"; + version = "1.2.0.20260609.20"; src = fetchurl { - url = "https://elpa.gnu.org/devel/embark-consult-1.1.0.20260404.170203.tar"; - sha256 = "1lh9jnqhb22yqwiacblcwwfj92lljxc12mamkzq6zk894hxnf9hd"; + url = "https://elpa.gnu.org/devel/embark-consult-1.2.0.20260609.20.tar"; + sha256 = "0507mv73swsdymlxqmqx40pr723jlrwmnwiy9qq294ihdk60npgd"; }; packageRequires = [ compat @@ -3299,10 +3325,10 @@ elpaBuild { pname = "ement"; ename = "ement"; - version = "0.18pre0.20251117.191748"; + version = "0.18pre0.20251117.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ement-0.18pre0.20251117.191748.tar"; - sha256 = "04qlw00maswc152fchhpf1028426qsg37ky1ap4lsbkpay3cfhqp"; + url = "https://elpa.gnu.org/devel/ement-0.18pre0.20251117.1.tar"; + sha256 = "0d5cgm00qq6rclpq63jkn8677kkhbql79xg6isij39d7nhrkfyp1"; }; packageRequires = [ map @@ -3420,10 +3446,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.2snapshot0.20260323.181457"; + version = "5.7snapshot0.20260630.20"; src = fetchurl { - url = "https://elpa.gnu.org/devel/erc-5.6.2snapshot0.20260323.181457.tar"; - sha256 = "0i94a6g1k4gzfz3jzm975w9v21bj6kifajn6wqnnswyl4cis65n3"; + url = "https://elpa.gnu.org/devel/erc-5.7snapshot0.20260630.20.tar"; + sha256 = "0b8nibq9xrs6y0ia99fvf2vxx8wkvkj4vygzswb7130fdf7s3r5l"; }; packageRequires = [ compat ]; meta = { @@ -3467,10 +3493,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "26.1.0.0.20260423.92659"; + version = "26.5.0.0.20260526.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/ess-26.1.0.0.20260423.92659.tar"; - sha256 = "0fmq3fp4dya40ab3rg511i7p3pi2mhx98dvl27fs186ya79bgvgq"; + url = "https://elpa.gnu.org/devel/ess-26.5.0.0.20260526.0.tar"; + sha256 = "08nkdqp7in2skkvs4z5q171i2yvmjhk0ycwa15ffvsjwanf328y7"; }; packageRequires = [ ]; meta = { @@ -3539,10 +3565,10 @@ elpaBuild { pname = "expreg"; ename = "expreg"; - version = "1.4.1.0.20250918.220913"; + version = "1.4.1.0.20260619.7"; src = fetchurl { - url = "https://elpa.gnu.org/devel/expreg-1.4.1.0.20250918.220913.tar"; - sha256 = "1fdwxr3albv7ww87w8ib8r0rid8zkibcgbl3qhp29vm8g28s89ws"; + url = "https://elpa.gnu.org/devel/expreg-1.4.1.0.20260619.7.tar"; + sha256 = "0dxdr7ahhj17fvsvpb0w6ylh20qkgrvy53pc9a0r6m8pv97i6mx0"; }; packageRequires = [ ]; meta = { @@ -3560,10 +3586,10 @@ elpaBuild { pname = "external-completion"; ename = "external-completion"; - version = "0.1.0.20260101.125434"; + version = "0.1.0.20260501.92309"; src = fetchurl { - url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20260101.125434.tar"; - sha256 = "0ca24q2l56i5p03l4h1r5qvrqvsc5330csc7aj205hl94wpmhz1z"; + url = "https://elpa.gnu.org/devel/external-completion-0.1.0.20260501.92309.tar"; + sha256 = "1jdd1dixbyxfm8k1zcajajdi2r718vyqg1phxcp2mi61npwk9li0"; }; packageRequires = [ ]; meta = { @@ -3583,10 +3609,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.34.0.20260204.122929"; + version = "0.35.0.20260718.3"; src = fetchurl { - url = "https://elpa.gnu.org/devel/exwm-0.34.0.20260204.122929.tar"; - sha256 = "1bmn6d7pjgjrh265y4w0g1ip8n21sx5z6xsl0vhfhvdf6h2w3c0b"; + url = "https://elpa.gnu.org/devel/exwm-0.35.0.20260718.3.tar"; + sha256 = "1kk9ggm9q32rz5dld2w2znpifwpjcncn7ih19rkw3bfd2q8bgirg"; }; packageRequires = [ compat @@ -3620,6 +3646,27 @@ }; } ) { }; + ffs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ffs"; + ename = "ffs"; + version = "0.2.3snapshot0.20260522.1"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ffs-0.2.3snapshot0.20260522.1.tar"; + sha256 = "1csx6sxdi4aa68ajjbgfymb1y2l3n6w1ig566n1lhxkpn2mh5xji"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ffs.html"; + license = lib.licenses.free; + }; + } + ) { }; filechooser = callPackage ( { compat, @@ -3717,10 +3764,10 @@ elpaBuild { pname = "flymake"; ename = "flymake"; - version = "1.4.5.0.20260326.141956"; + version = "1.4.5.0.20260702.3"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-1.4.5.0.20260326.141956.tar"; - sha256 = "11cjgvqzp4jilw90hm82gzca68hr3dn0smg8wvfy8k0br8qq48nx"; + url = "https://elpa.gnu.org/devel/flymake-1.4.5.0.20260702.3.tar"; + sha256 = "1fddbgjlqkdr6kml7mbwhv1y6imkp5a73v6ynqhr7wkjh65vhryg"; }; packageRequires = [ eldoc @@ -3784,10 +3831,10 @@ elpaBuild { pname = "flymake-proselint"; ename = "flymake-proselint"; - version = "0.3.0.0.20230325.160756"; + version = "0.3.0.0.20260704.11"; src = fetchurl { - url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20230325.160756.tar"; - sha256 = "1p3jpsv6w4hask7bk07dmafwgymbw3xl6i0vx0sjd0i5aa0xs9vz"; + url = "https://elpa.gnu.org/devel/flymake-proselint-0.3.0.0.20260704.11.tar"; + sha256 = "0n619yab8s9lr00b7zcbgywvm5phwrh19iww8rwm0sf1qhmg3azf"; }; packageRequires = [ ]; meta = { @@ -3805,10 +3852,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "3.0.1.0.20260413.54632"; + version = "3.1.0.0.20260629.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/fontaine-3.0.1.0.20260413.54632.tar"; - sha256 = "1s7wz2807a49vhcj3zv7hx75kz4l9zkhi53fvppab46j2wyaw8qs"; + url = "https://elpa.gnu.org/devel/fontaine-3.1.0.0.20260629.0.tar"; + sha256 = "1d4jf8y02xp09c9gwa0rnp5c941rzpkpf9npk9zs07c6k1612j34"; }; packageRequires = [ ]; meta = { @@ -3817,6 +3864,28 @@ }; } ) { }; + forgejo = callPackage ( + { + elpaBuild, + fetchurl, + keymap-popup, + lib, + }: + elpaBuild { + pname = "forgejo"; + ename = "forgejo"; + version = "0.2.3.0.20260715.17"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/forgejo-0.2.3.0.20260715.17.tar"; + sha256 = "12vg44zkpr8s8i4wal2z3b6ii9gigdw674p10dx3zpj7zibjglry"; + }; + packageRequires = [ keymap-popup ]; + meta = { + homepage = "https://elpa.gnu.org/devel/forgejo.html"; + license = lib.licenses.free; + }; + } + ) { }; frame-tabs = callPackage ( { elpaBuild, @@ -3916,10 +3985,10 @@ elpaBuild { pname = "futur"; ename = "futur"; - version = "1.4.0.20260423.160640"; + version = "1.7.0.20260622.8"; src = fetchurl { - url = "https://elpa.gnu.org/devel/futur-1.4.0.20260423.160640.tar"; - sha256 = "04z4660mjgnf5z4qyzbiwdi7cd9b42ncvxrvpxr9i9q51sky72jb"; + url = "https://elpa.gnu.org/devel/futur-1.7.0.20260622.8.tar"; + sha256 = "1wwkm6955wy31ig84x7kgm5sl56jvgkgi706awhbvji0nrrj2nys"; }; packageRequires = [ ]; meta = { @@ -4105,17 +4174,21 @@ compat, elpaBuild, fetchurl, + keymap-popup, lib, }: elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.10.3.0.20260420.110309"; + version = "0.10.6.0.20260707.26"; src = fetchurl { - url = "https://elpa.gnu.org/devel/gnosis-0.10.3.0.20260420.110309.tar"; - sha256 = "0inrv51wkjycbxhhlsivfig2479v18jcvps1dq2psjas0r2crsx3"; + url = "https://elpa.gnu.org/devel/gnosis-0.10.6.0.20260707.26.tar"; + sha256 = "1s3mf539ri3d7rq0b9w6f6kla2ybkxrzwkqzq2mi92vzvypjmbv0"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + keymap-popup + ]; meta = { homepage = "https://elpa.gnu.org/devel/gnosis.html"; license = lib.licenses.free; @@ -4318,10 +4391,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.19.0.0.20260409.233021"; + version = "0.19.5.0.20260627.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/greader-0.19.0.0.20260409.233021.tar"; - sha256 = "1lq10b8b3nkzf6lx9z1h3cv2537g4ymj5qw6xbclpxzrj07zalg7"; + url = "https://elpa.gnu.org/devel/greader-0.19.5.0.20260627.0.tar"; + sha256 = "1c37viwmwvhha7hra6zraim58yy3mf68ds738xky448ddbimrvl0"; }; packageRequires = [ compat @@ -4386,10 +4459,10 @@ elpaBuild { pname = "guess-language"; ename = "guess-language"; - version = "0.0.1.0.20240528.185800"; + version = "0.0.1.0.20260625.150"; src = fetchurl { - url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20240528.185800.tar"; - sha256 = "0hlcnd69mqs90ndp59pqcjdwl27cswnpqy6yjzaspmbya6plv3g6"; + url = "https://elpa.gnu.org/devel/guess-language-0.0.1.0.20260625.150.tar"; + sha256 = "0g3cvp1p1bpbf2h5vwrjcghj4bkhcpx00jqsivvrmyighpmgpxzs"; }; packageRequires = [ cl-lib @@ -4580,10 +4653,10 @@ elpaBuild { pname = "hyperbole"; ename = "hyperbole"; - version = "9.0.2pre0.20260422.74419"; + version = "9.0.2pre0.20260712.1235"; src = fetchurl { - url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260422.74419.tar"; - sha256 = "1k6qcwb9bhf062bd0d6q69n1wbk68bkmb8d30c5hnd32s2m261xp"; + url = "https://elpa.gnu.org/devel/hyperbole-9.0.2pre0.20260712.1235.tar"; + sha256 = "0ca3kpkv2rzydn7rxqvn4dw8dgk72q51mdpvdbwdk9a18pjp0fam"; }; packageRequires = [ ]; meta = { @@ -4592,6 +4665,27 @@ }; } ) { }; + ibuffer-sidebar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ibuffer-sidebar"; + ename = "ibuffer-sidebar"; + version = "1.0.0.0.20260718.2"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/ibuffer-sidebar-1.0.0.0.20260718.2.tar"; + sha256 = "1l9wk75nqbl0n8k0zbqjvkd7fb2j6b2zsag62khk9zpya50gsap7"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/ibuffer-sidebar.html"; + license = lib.licenses.free; + }; + } + ) { }; idlwave = callPackage ( { elpaBuild, @@ -4913,10 +5007,10 @@ elpaBuild { pname = "jarchive"; ename = "jarchive"; - version = "0.12.0.0.20260419.91017"; + version = "0.12.0.0.20260530.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jarchive-0.12.0.0.20260419.91017.tar"; - sha256 = "0mdsfvggcv2iyia0vpp1lj1xarg8kjbksvxzl6w2b2q5k8j1gl8f"; + url = "https://elpa.gnu.org/devel/jarchive-0.12.0.0.20260530.1.tar"; + sha256 = "022msc0a39wl29j14sf4pfy1xc8p1bm8khx49f1qhlj3ppw3zr26"; }; packageRequires = [ ]; meta = { @@ -4934,10 +5028,10 @@ elpaBuild { pname = "javaimp"; ename = "javaimp"; - version = "0.9.1.0.20260403.224537"; + version = "0.9.2.0.20260715.9"; src = fetchurl { - url = "https://elpa.gnu.org/devel/javaimp-0.9.1.0.20260403.224537.tar"; - sha256 = "0jkw3dklylz7l7wq162c16ak8fbjpp23g38y5fmpgrinrbfjpwmd"; + url = "https://elpa.gnu.org/devel/javaimp-0.9.2.0.20260715.9.tar"; + sha256 = "1fv10bx8f7y5f85zkyavav6ylkwxlznhfwbf4w4mybfj1p61mwha"; }; packageRequires = [ ]; meta = { @@ -4978,10 +5072,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "2.7.0.20260330.62245"; + version = "2.8.0.20260628.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jinx-2.7.0.20260330.62245.tar"; - sha256 = "1js65bg2pm4ql6rri6wvm91klhfnziv75n7cmix5z3lk0836qw7d"; + url = "https://elpa.gnu.org/devel/jinx-2.8.0.20260628.1.tar"; + sha256 = "0rgmkdiw7x0xknp9ndwzz1jvnkl9pyymzm7wrlzsigf5mzvx9n79"; }; packageRequires = [ compat ]; meta = { @@ -5022,10 +5116,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20231224.0.20241205.14012"; + version = "20231224.0.20260627.14"; src = fetchurl { - url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20241205.14012.tar"; - sha256 = "0kcxgkib56fjgv9c2ancr046ag3nwr6zw5x2dzw9gbnlma5w3x66"; + url = "https://elpa.gnu.org/devel/js2-mode-20231224.0.20260627.14.tar"; + sha256 = "1cjccwswizryk0wn6ps40clmbjgf1h2amfw1hp6akmzsq4hs9abi"; }; packageRequires = [ cl-lib ]; meta = { @@ -5064,10 +5158,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.28.0.20260416.174639"; + version = "1.0.29.0.20260623.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/jsonrpc-1.0.28.0.20260416.174639.tar"; - sha256 = "0j7y9kcjdai6sd1634ln4ag0fg5x8ljzq50f25nc5miadaq93vw8"; + url = "https://elpa.gnu.org/devel/jsonrpc-1.0.29.0.20260623.0.tar"; + sha256 = "08l1xicms32yagpv20yi0b626nkyc5xwaljq4fda7ygndkhlm5a2"; }; packageRequires = [ ]; meta = { @@ -5097,6 +5191,27 @@ }; } ) { }; + keymap-popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keymap-popup"; + ename = "keymap-popup"; + version = "0.4.0.0.20260715.2"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/keymap-popup-0.4.0.0.20260715.2.tar"; + sha256 = "02077lc09shc76y1gzh7gk9ij2ap0hkgqx40m6bsg79n25i55zgz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/keymap-popup.html"; + license = lib.licenses.free; + }; + } + ) { }; kind-icon = callPackage ( { elpaBuild, @@ -5171,10 +5286,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.6.1.0.20260413.204601"; + version = "0.7.1.0.20260619.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/kubed-0.6.1.0.20260413.204601.tar"; - sha256 = "1q7ykifs44ywrq94fhvdz4svpxm2j3yj4vmq74lz5d57q702xz9l"; + url = "https://elpa.gnu.org/devel/kubed-0.7.1.0.20260619.0.tar"; + sha256 = "0lgdl06lv66zxy5qcdnhrc118hxllaj7zjr7aphdm755lckd3f3i"; }; packageRequires = [ ]; meta = { @@ -5215,10 +5330,10 @@ elpaBuild { pname = "latex-table-wizard"; ename = "latex-table-wizard"; - version = "1.5.5.0.20260212.172924"; + version = "1.6.0.0.20260503.212802"; src = fetchurl { - url = "https://elpa.gnu.org/devel/latex-table-wizard-1.5.5.0.20260212.172924.tar"; - sha256 = "0n2zvy43lmyvygy3npfgh3897gpwdvxpjd35n6011hbnm3b05s55"; + url = "https://elpa.gnu.org/devel/latex-table-wizard-1.6.0.0.20260503.212802.tar"; + sha256 = "0gsqgykvfg27c9gs83rjg8aaxm44a06r5d8ify7s7wcxpasdys1p"; }; packageRequires = [ auctex @@ -5239,10 +5354,10 @@ elpaBuild { pname = "leaf"; ename = "leaf"; - version = "4.5.5.0.20260302.65208"; + version = "4.5.5.0.20260508.153103"; src = fetchurl { - url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20260302.65208.tar"; - sha256 = "0j2m24vhgn11w3cg8f3nsmvlgb0sfk6524xgfavqrhw528si1hj7"; + url = "https://elpa.gnu.org/devel/leaf-4.5.5.0.20260508.153103.tar"; + sha256 = "0zps0wiyplsv8nghyjfvv8m20rn0bsx7dapdfbvx3bkiqbmf8crq"; }; packageRequires = [ ]; meta = { @@ -5312,10 +5427,10 @@ elpaBuild { pname = "let-alist"; ename = "let-alist"; - version = "1.0.6.0.20260315.121536"; + version = "1.0.6.0.20260523.93734"; src = fetchurl { - url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20260315.121536.tar"; - sha256 = "1qx7979xjnb1xgk8jbxdizm7cdmnxhbgk39daclhv1322lj79w2s"; + url = "https://elpa.gnu.org/devel/let-alist-1.0.6.0.20260523.93734.tar"; + sha256 = "0wqim4mjy59yy5ykjiy5kl91c0841yp071cdh11p7mz54liw8yrc"; }; packageRequires = [ ]; meta = { @@ -5333,10 +5448,10 @@ elpaBuild { pname = "lex"; ename = "lex"; - version = "1.2.0.20240216.82808"; + version = "1.3.0.20260601.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lex-1.2.0.20240216.82808.tar"; - sha256 = "0mh2jk838216mwv6bab28mq9nb5617c5y7s0yqynkz3vkarnnxx1"; + url = "https://elpa.gnu.org/devel/lex-1.3.0.20260601.0.tar"; + sha256 = "1c79jqc7292qhs542nfgqg7va20k02sldb3n75vjsbhp13q05d6w"; }; packageRequires = [ ]; meta = { @@ -5354,10 +5469,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "2.0.0.0.20260413.54759"; + version = "2.0.0.0.20260424.102712"; src = fetchurl { - url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260413.54759.tar"; - sha256 = "18im9kd79wvhk92p8wm0hxf67c85g6f2rlppx3dkn0r601hmpv2w"; + url = "https://elpa.gnu.org/devel/lin-2.0.0.0.20260424.102712.tar"; + sha256 = "11l840kmy06f59n1p2cac59fmdwqmwqyn1d7sx10k4xfx2i8f3pp"; }; packageRequires = [ ]; meta = { @@ -5366,6 +5481,32 @@ }; } ) { }; + lisp-ts-mode = callPackage ( + { + compat, + cond-star, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lisp-ts-mode"; + ename = "lisp-ts-mode"; + version = "0.3.0.0.20260720.0"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/lisp-ts-mode-0.3.0.0.20260720.0.tar"; + sha256 = "09xnsw5rsvkwx8dvxw9m60fc3pwk21r0iydm0r55bj7sksb6z7id"; + }; + packageRequires = [ + compat + cond-star + ]; + meta = { + homepage = "https://elpa.gnu.org/devel/lisp-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; listen = callPackage ( { elpaBuild, @@ -5430,10 +5571,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.30.1.0.20260417.170756"; + version = "0.31.2.0.20260718.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/llm-0.30.1.0.20260417.170756.tar"; - sha256 = "01dzr0qli82gdm24fdqiw7gn10w1gallgcss04v5d251idgfh87q"; + url = "https://elpa.gnu.org/devel/llm-0.31.2.0.20260718.2.tar"; + sha256 = "0zhf1a7n0x58hf56ln1lpf61pjfn2bj8mmy940w5k3kp8y3zyxz7"; }; packageRequires = [ compat @@ -5563,10 +5704,10 @@ elpaBuild { pname = "logos"; ename = "logos"; - version = "1.2.0.0.20260111.105252"; + version = "1.2.0.0.20260424.102714"; src = fetchurl { - url = "https://elpa.gnu.org/devel/logos-1.2.0.0.20260111.105252.tar"; - sha256 = "0566wrazp2z0np1rx6fqv6541b6a37j1k4x9rrnylzk9sgcnr1qp"; + url = "https://elpa.gnu.org/devel/logos-1.2.0.0.20260424.102714.tar"; + sha256 = "0wk6b064sl8kjnqn6ihcxaps6m7cpr4h78np3ls4w4018na90rmi"; }; packageRequires = [ ]; meta = { @@ -5670,10 +5811,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "2.10.0.20260330.62326"; + version = "2.11.0.20260628.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/marginalia-2.10.0.20260330.62326.tar"; - sha256 = "1vlzmpk04q2cgaqnlzdqdn6ll58jvkb3v93hnkifrldgzqkgd40n"; + url = "https://elpa.gnu.org/devel/marginalia-2.11.0.20260628.1.tar"; + sha256 = "1kya2x33xbp0ghjv46484jjy7qhqsh7xkcr0pnvi6m4dgcxrg6al"; }; packageRequires = [ compat ]; meta = { @@ -5776,10 +5917,10 @@ elpaBuild { pname = "matlab-mode"; ename = "matlab-mode"; - version = "8.2.0.0.20260419.100405"; + version = "8.2.0.0.20260428.134050"; src = fetchurl { - url = "https://elpa.gnu.org/devel/matlab-mode-8.2.0.0.20260419.100405.tar"; - sha256 = "114s5ra2h4d8k0qn27blb8bzxjjlcgrrkmg1y647m2kzwfbp8hx5"; + url = "https://elpa.gnu.org/devel/matlab-mode-8.2.0.0.20260428.134050.tar"; + sha256 = "0caab8wxwn55zk6cd20qm20z2nkwff8a1y3jrwfd41i1kx18mcg4"; }; packageRequires = [ ]; meta = { @@ -5797,10 +5938,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.1.0.0.20260413.54251"; + version = "1.1.1.0.20260629.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mct-1.1.0.0.20260413.54251.tar"; - sha256 = "1wlyg28xcyig05248nic6jia4zw0q5k0rg8l3facskisbhild7dz"; + url = "https://elpa.gnu.org/devel/mct-1.1.1.0.20260629.0.tar"; + sha256 = "1dff7gm1cw1ljvsdw7j43laamhpck598c7f5r6679gf9zqm3bdfv"; }; packageRequires = [ ]; meta = { @@ -5939,6 +6080,7 @@ ) { }; minimail = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -5947,12 +6089,15 @@ elpaBuild { pname = "minimail"; ename = "minimail"; - version = "0.4.2.0.20260428.192238"; + version = "0.5.0.20260513.113502"; src = fetchurl { - url = "https://elpa.gnu.org/devel/minimail-0.4.2.0.20260428.192238.tar"; - sha256 = "0wd5nay9x0sqr7l96ibi554qab5mfgh3dw493rcw7cs3cwiwsvhm"; + url = "https://elpa.gnu.org/devel/minimail-0.5.0.20260513.113502.tar"; + sha256 = "0b3npm8wsgl3nizvgvpb11i4kamg89js04nd52f28hb6f75mwjkh"; }; - packageRequires = [ transient ]; + packageRequires = [ + compat + transient + ]; meta = { homepage = "https://elpa.gnu.org/devel/minimail.html"; license = lib.licenses.free; @@ -5991,10 +6136,10 @@ elpaBuild { pname = "minuet"; ename = "minuet"; - version = "0.7.1.0.20260424.3009"; + version = "0.8.0.0.20260518.211153"; src = fetchurl { - url = "https://elpa.gnu.org/devel/minuet-0.7.1.0.20260424.3009.tar"; - sha256 = "0g9vqm9wby07pmhc6ai31krk473lif74273qbjrfzxzqbg4iavbk"; + url = "https://elpa.gnu.org/devel/minuet-0.8.0.0.20260518.211153.tar"; + sha256 = "1sxfwivmlpc2cdkx5bn1nmprkpqi43m8bp8zna6ba64ajm4i2k4c"; }; packageRequires = [ dash @@ -6058,10 +6203,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "5.2.0.0.20260418.131316"; + version = "5.3.0.0.20260717.26"; src = fetchurl { - url = "https://elpa.gnu.org/devel/modus-themes-5.2.0.0.20260418.131316.tar"; - sha256 = "1qcb53pp05bk2fpjmli68kbmpk4wk8b7ll6iimvmgw8nlq4qzlhb"; + url = "https://elpa.gnu.org/devel/modus-themes-5.3.0.0.20260717.26.tar"; + sha256 = "0a3gd5cww0bifh9j3hxnsjb4csik7qlifa3i306l0lmj00sls1hl"; }; packageRequires = [ ]; meta = { @@ -6079,10 +6224,10 @@ elpaBuild { pname = "mpdired"; ename = "mpdired"; - version = "4pre0.20250502.114712"; + version = "4pre0.20250502.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/mpdired-4pre0.20250502.114712.tar"; - sha256 = "1s831xln9vlxcchmxmis8ky751r3xwi5nlnnchdn7sjngkqjkl30"; + url = "https://elpa.gnu.org/devel/mpdired-4pre0.20250502.1.tar"; + sha256 = "1hrp0q5dql57hd40q838vbdrlbbyd1g7kfvf5w3zvhziq0dj61gx"; }; packageRequires = [ ]; meta = { @@ -6400,10 +6545,10 @@ elpaBuild { pname = "notmuch-indicator"; ename = "notmuch-indicator"; - version = "1.3.0.0.20260413.54903"; + version = "1.3.0.0.20260424.102728"; src = fetchurl { - url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260413.54903.tar"; - sha256 = "091rlqqp7ngff0x1f8fh6axyyzbxrdvwnjqyqly5axazv8sm846n"; + url = "https://elpa.gnu.org/devel/notmuch-indicator-1.3.0.0.20260424.102728.tar"; + sha256 = "0iz3rzzb4rq7j5dwvyrdfyn2j1hag882204bc7fdldglwinic5zx"; }; packageRequires = [ ]; meta = { @@ -6463,10 +6608,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.18.4.0.20251120.214128"; + version = "0.19.1snapshot0.20260526.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/oauth2-0.18.4.0.20251120.214128.tar"; - sha256 = "1x9v0s652al0ms37hafmqwla6wl97wpgvxh7w2ixpyrwrj206c93"; + url = "https://elpa.gnu.org/devel/oauth2-0.19.1snapshot0.20260526.1.tar"; + sha256 = "0fxrg7ypj642mxdpn06g31ynlb96w64na99fakpdcf9wa0a5ir2s"; }; packageRequires = [ ]; meta = { @@ -6592,10 +6737,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.6.0.20260127.172602"; + version = "1.7.0.20260628.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/orderless-1.6.0.20260127.172602.tar"; - sha256 = "1arpnkw49vhrdgp7b9mpxbbv6q3mwnimn1d79cr3jjs97ngii980"; + url = "https://elpa.gnu.org/devel/orderless-1.7.0.20260628.2.tar"; + sha256 = "12xwkskpbwh6aav9zpl1f8alkv0bsh7aaw9q3hciab6ai6v6x723"; }; packageRequires = [ compat ]; meta = { @@ -6613,10 +6758,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "10.0pre0.20260421.184316"; + version = "10.0pre0.20260715.383"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-10.0pre0.20260421.184316.tar"; - sha256 = "0809x9rw2smb5ya3x2272qcjjj6kx6xrj8ajlzzwiz2m1wdhz5w3"; + url = "https://elpa.gnu.org/devel/org-10.0pre0.20260715.383.tar"; + sha256 = "0dys9gg55z0bn7p9g7f2rw01v1my3ba3qmm3555g7xhpmy7gcfd6"; }; packageRequires = [ ]; meta = { @@ -6684,10 +6829,10 @@ elpaBuild { pname = "org-gnosis"; ename = "org-gnosis"; - version = "0.2.2.0.20260224.203152"; + version = "0.2.2.0.20260711.6"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-gnosis-0.2.2.0.20260224.203152.tar"; - sha256 = "1ls3wnd4brn3aadafyfn4m4lkav5v5sm77irlijnm90rg2jdk7xc"; + url = "https://elpa.gnu.org/devel/org-gnosis-0.2.2.0.20260711.6.tar"; + sha256 = "0zh6wl8qcxx1av1x8pp6756wcdqnwa2h2yv6i8742l8rqi5xfybg"; }; packageRequires = [ compat @@ -6760,10 +6905,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.13.0.20260330.62401"; + version = "1.14.0.20260707.5"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-modern-1.13.0.20260330.62401.tar"; - sha256 = "1lh1n09aqi8jxqpwsdv806910bflw25z6mcblplapk4lcd6al4y2"; + url = "https://elpa.gnu.org/devel/org-modern-1.14.0.20260707.5.tar"; + sha256 = "1hd30siq6jnqnxmkrgibp86cn3kjma1ifa216mw9fkl3bg8js506"; }; packageRequires = [ compat @@ -6832,10 +6977,10 @@ elpaBuild { pname = "org-remark"; ename = "org-remark"; - version = "1.3.0.0.20251214.30531"; + version = "1.3.0.0.20260531.4"; src = fetchurl { - url = "https://elpa.gnu.org/devel/org-remark-1.3.0.0.20251214.30531.tar"; - sha256 = "1fs0k4a132bizm5pihp3gc7yzdgwzzfiwyqj3bawjqkzpgx2wlpl"; + url = "https://elpa.gnu.org/devel/org-remark-1.3.0.0.20260531.4.tar"; + sha256 = "1k69ndpwk6mrlzdcv727fpfb73glis2dgxm48kdnbgz5167blydg"; }; packageRequires = [ org ]; meta = { @@ -6940,10 +7085,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "2.2.0.20260330.62455"; + version = "2.4.0.20260705.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/osm-2.2.0.20260330.62455.tar"; - sha256 = "0rj0zs5xmmj2swdjyk9pichljjd9c1qzbl836xaahxq2grcbqs5i"; + url = "https://elpa.gnu.org/devel/osm-2.4.0.20260705.0.tar"; + sha256 = "0s9m0j1r3hxllwmzarbg3k3yqfqrfnz93nqphpnf1p7lbwzk5v1c"; }; packageRequires = [ compat ]; meta = { @@ -7174,10 +7319,10 @@ elpaBuild { pname = "php-fill"; ename = "php-fill"; - version = "1.1.1.0.20260307.232207"; + version = "1.1.2.0.20260624.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/php-fill-1.1.1.0.20260307.232207.tar"; - sha256 = "0vsq47s8cph31fc7ij3j34z4g3r830cr35498rkz9psrjzsr4jsy"; + url = "https://elpa.gnu.org/devel/php-fill-1.1.2.0.20260624.0.tar"; + sha256 = "016gy8dmvavw75h5ccyfzmhg3z634yhifwgkvydw87qnlrfm452p"; }; packageRequires = [ ]; meta = { @@ -7259,10 +7404,10 @@ elpaBuild { pname = "plz"; ename = "plz"; - version = "0.10pre0.20250318.183534"; + version = "0.10pre0.20250318.18"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-0.10pre0.20250318.183534.tar"; - sha256 = "08iyw80d2431k60fkw26i3z8zw0jk9czmxr1vi7z7hdfrqmw7gc0"; + url = "https://elpa.gnu.org/devel/plz-0.10pre0.20250318.18.tar"; + sha256 = "0lsaxls0dgj1hqm6fc03ns67k0wdp6jp688n9galiczk7zzllvpg"; }; packageRequires = [ ]; meta = { @@ -7281,10 +7426,10 @@ elpaBuild { pname = "plz-event-source"; ename = "plz-event-source"; - version = "0.1.4pre0.20250413.93107"; + version = "0.1.4pre0.20250413.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-event-source-0.1.4pre0.20250413.93107.tar"; - sha256 = "1g4bvdbdg5c0ch62l8314rv44b2wyymkbydyi0fkdjjb3a9ns4b0"; + url = "https://elpa.gnu.org/devel/plz-event-source-0.1.4pre0.20250413.0.tar"; + sha256 = "12f9ava513hiwb9cighnnliq7nn3d1kfy2hjg6npl89nhii82g5f"; }; packageRequires = [ plz-media-type ]; meta = { @@ -7303,10 +7448,10 @@ elpaBuild { pname = "plz-media-type"; ename = "plz-media-type"; - version = "0.2.5pre0.20250412.100044"; + version = "0.2.5pre0.20250412.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/plz-media-type-0.2.5pre0.20250412.100044.tar"; - sha256 = "1w35bdxgsv1wvqwn64miyzplbb6gqry25wnl6l7dyd2n71h2hmxl"; + url = "https://elpa.gnu.org/devel/plz-media-type-0.2.5pre0.20250412.0.tar"; + sha256 = "1agd1m6pxmqd7vkqvrv382fg76wx0kz9dxkbz0pwpf5p9dlpl6mm"; }; packageRequires = [ plz ]; meta = { @@ -7430,10 +7575,10 @@ elpaBuild { pname = "polymode"; ename = "polymode"; - version = "0.2.2.0.20260302.104336"; + version = "0.2.2.0.20260505.180301"; src = fetchurl { - url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20260302.104336.tar"; - sha256 = "04jfj25kmh55jq7bm5dq02xp4kgfvpbgsngx825qpgfsl3lkq6yi"; + url = "https://elpa.gnu.org/devel/polymode-0.2.2.0.20260505.180301.tar"; + sha256 = "00h3hyaz8rkv9wyvn0afg63v4v5ghz6h6hk1rds54wi8mb1501nc"; }; packageRequires = [ ]; meta = { @@ -7472,10 +7617,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.5.1.0.20260423.21349"; + version = "1.5.2.0.20260527.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/posframe-1.5.1.0.20260423.21349.tar"; - sha256 = "0ylxj2spphywm7851lyrki34gkcznjd24xpd75f47pa1wcplkc48"; + url = "https://elpa.gnu.org/devel/posframe-1.5.2.0.20260527.0.tar"; + sha256 = "1gjj04a8sbngcvmkr9kfnx335k5z0knclabl6jz8rcnswj531ac6"; }; packageRequires = [ ]; meta = { @@ -7493,10 +7638,10 @@ elpaBuild { pname = "pq"; ename = "pq"; - version = "0.2.0.20240317.135839"; + version = "0.2.0.20240911.1"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pq-0.2.0.20240317.135839.tar"; - sha256 = "0hva6d8iqqdvnllm7cssxrmn21alcb2aa4d6874bqdfqjij2hw1z"; + url = "https://elpa.gnu.org/devel/pq-0.2.0.20240911.1.tar"; + sha256 = "07033s0lrns0ibmpvm7n02xfp1dwzkrb08vlsv5fj3lx7v0dk5g6"; }; packageRequires = [ ]; meta = { @@ -7536,10 +7681,10 @@ elpaBuild { pname = "preview-auto"; ename = "preview-auto"; - version = "0.4.2.0.20260327.92953"; + version = "0.5.0.0.20260708.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/preview-auto-0.4.2.0.20260327.92953.tar"; - sha256 = "0mc0gwl3hk5fq9qfysxkphj9irzabm5bgkv8cz7m60k9s5g399rh"; + url = "https://elpa.gnu.org/devel/preview-auto-0.5.0.0.20260708.0.tar"; + sha256 = "1f4y9mrv7g46cvzjiygn703nfc293zha0ivsbkbj6qd6r78hklpf"; }; packageRequires = [ auctex ]; meta = { @@ -7580,10 +7725,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.11.2.0.20260407.143459"; + version = "0.12.0.0.20260716.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/project-0.11.2.0.20260407.143459.tar"; - sha256 = "01pjihpy1496rwxyir9n1di1x2fkpmdb6c9gcmah3ygfg9gkqj7d"; + url = "https://elpa.gnu.org/devel/project-0.12.0.0.20260716.0.tar"; + sha256 = "0iaqw9ci3sbq3y3ry7r3pyv4ydlbx8b01p7chqq3b3h55vdi3i1d"; }; packageRequires = [ xref ]; meta = { @@ -7643,10 +7788,10 @@ elpaBuild { pname = "pulsar"; ename = "pulsar"; - version = "1.3.4.0.20260421.185730"; + version = "1.3.4.0.20260426.51313"; src = fetchurl { - url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260421.185730.tar"; - sha256 = "100nyvpnap1bjc5k4ryni0h43dpacw1nbc6kyz73q82m19m78cnx"; + url = "https://elpa.gnu.org/devel/pulsar-1.3.4.0.20260426.51313.tar"; + sha256 = "0nw5hpxk5v334xp43gnnv2jknq88lgba69j8sn0i1625cvwpijiq"; }; packageRequires = [ ]; meta = { @@ -7713,10 +7858,10 @@ elpaBuild { pname = "python"; ename = "python"; - version = "0.30.0.20260307.113211"; + version = "0.30.0.20260620.46"; src = fetchurl { - url = "https://elpa.gnu.org/devel/python-0.30.0.20260307.113211.tar"; - sha256 = "0rbq19sgxf3p9dnx8fkwyki6qmdajmxygmcn34f9gbwyg1ip2m2c"; + url = "https://elpa.gnu.org/devel/python-0.30.0.20260620.46.tar"; + sha256 = "00vdr03pbmfv6sbvjk410x13msfgm3d3f6qs8hpkb67pg4q87xzb"; }; packageRequires = [ compat ]; meta = { @@ -7906,10 +8051,10 @@ elpaBuild { pname = "realgud"; ename = "realgud"; - version = "1.6.0.0.20260411.181642"; + version = "1.6.0.0.20260609.11"; src = fetchurl { - url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260411.181642.tar"; - sha256 = "11rs4xcy7xz2ckvpii33mmy04flwfladpi5j70bxc5anmhn5fh68"; + url = "https://elpa.gnu.org/devel/realgud-1.6.0.0.20260609.11.tar"; + sha256 = "1j598wswb1s3gn2h2sk5hvz93nphlnmx3xqpa1nr2rg3jwpmv4zr"; }; packageRequires = [ load-relative @@ -8250,10 +8395,10 @@ elpaBuild { pname = "rnc-mode"; ename = "rnc-mode"; - version = "0.3.0.20221221.81910"; + version = "0.4.0.20260610.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/rnc-mode-0.3.0.20221221.81910.tar"; - sha256 = "1rdz1g440sjzxcqc4p2s0vv525ala4k470ddn4h9ghljnncqbady"; + url = "https://elpa.gnu.org/devel/rnc-mode-0.4.0.20260610.0.tar"; + sha256 = "1yvkmcqykpvnfzpq2qra4dc14rviwhhvch2wb19iy781v6dryxj5"; }; packageRequires = [ ]; meta = { @@ -8418,6 +8563,27 @@ }; } ) { }; + sendai-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sendai-theme"; + ename = "sendai-theme"; + version = "0.1.1snapshot0.20260701.2"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/sendai-theme-0.1.1snapshot0.20260701.2.tar"; + sha256 = "08xpcxs280mbipllcjl06hmrxmpdzrwkfzcrvq6n9k2dv62x1cki"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/sendai-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; seq = callPackage ( { elpaBuild, @@ -8490,10 +8656,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.5.0.0.20250930.194048"; + version = "2.5.0.0.20260516.144445"; src = fetchurl { - url = "https://elpa.gnu.org/devel/shell-command+-2.5.0.0.20250930.194048.tar"; - sha256 = "1p6s6rp10mg23vvnls5pxgx014jf86x6427xbqms3bbdz0fpzn5j"; + url = "https://elpa.gnu.org/devel/shell-command+-2.5.0.0.20260516.144445.tar"; + sha256 = "1s6zwc08jgxjrbbdz7nbw4698vyd0z3zfqmkkkqx5ihklm1i1156"; }; packageRequires = [ ]; meta = { @@ -8544,6 +8710,27 @@ }; } ) { }; + shift-number = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shift-number"; + ename = "shift-number"; + version = "0.3.0.20260621.19"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/shift-number-0.3.0.20260621.19.tar"; + sha256 = "08wc1kb8fvccfaw1c5n5cpmpxrjhzxaamsp9076lb59aa2ffgsz8"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/shift-number.html"; + license = lib.licenses.free; + }; + } + ) { }; show-font = callPackage ( { elpaBuild, @@ -8553,10 +8740,10 @@ elpaBuild { pname = "show-font"; ename = "show-font"; - version = "1.0.0.0.20260111.105401"; + version = "1.0.0.0.20260424.102736"; src = fetchurl { - url = "https://elpa.gnu.org/devel/show-font-1.0.0.0.20260111.105401.tar"; - sha256 = "146mmg4kv3sz9bd4b1026fsws16w3nz99m4sbkhgwaf09mrr2bkl"; + url = "https://elpa.gnu.org/devel/show-font-1.0.0.0.20260424.102736.tar"; + sha256 = "06kf0hivajpb7g7ba3sc8nkaz1pny6j1imsr5jqf1nawfyb24qrd"; }; packageRequires = [ ]; meta = { @@ -8830,10 +9017,10 @@ elpaBuild { pname = "spacious-padding"; ename = "spacious-padding"; - version = "0.8.0.0.20260111.105014"; + version = "0.8.0.0.20260505.183614"; src = fetchurl { - url = "https://elpa.gnu.org/devel/spacious-padding-0.8.0.0.20260111.105014.tar"; - sha256 = "0yxml44g1lc0r2jca9qwbkqv3d2jx79nvyhw1gxx6wjj76wlwzwf"; + url = "https://elpa.gnu.org/devel/spacious-padding-0.8.0.0.20260505.183614.tar"; + sha256 = "0pzcfd3z5w67cfcmp9hzyjjjxx5i5pxgl5k45hhxcwrfwm4x8h4l"; }; packageRequires = [ ]; meta = { @@ -9027,10 +9214,10 @@ elpaBuild { pname = "standard-themes"; ename = "standard-themes"; - version = "3.0.2.0.20260405.133615"; + version = "3.0.2.0.20260424.102741"; src = fetchurl { - url = "https://elpa.gnu.org/devel/standard-themes-3.0.2.0.20260405.133615.tar"; - sha256 = "0b88iyisvqqv3ziciypkqdjz9i14xcgjlymaf0n3s34yycgglbsz"; + url = "https://elpa.gnu.org/devel/standard-themes-3.0.2.0.20260424.102741.tar"; + sha256 = "1h3q71b4g89av2a9i1864mhkww75669051xs2qzp78aglqnm8dr6"; }; packageRequires = [ modus-themes ]; meta = { @@ -9069,10 +9256,10 @@ elpaBuild { pname = "substitute"; ename = "substitute"; - version = "0.5.0.0.20260324.124253"; + version = "0.5.0.0.20260424.102743"; src = fetchurl { - url = "https://elpa.gnu.org/devel/substitute-0.5.0.0.20260324.124253.tar"; - sha256 = "0m5jmchrzh1cwq6zd8jd65v7kaks6cgqjvw8094ijq8bc28ni3k7"; + url = "https://elpa.gnu.org/devel/substitute-0.5.0.0.20260424.102743.tar"; + sha256 = "1zl5hyq0919c3mp680v22xjmfggfkdn1mz13sf1ivbahgndjbddk"; }; packageRequires = [ ]; meta = { @@ -9220,10 +9407,10 @@ elpaBuild { pname = "sxhkdrc-mode"; ename = "sxhkdrc-mode"; - version = "1.2.0.0.20260111.105425"; + version = "1.2.0.0.20260424.102746"; src = fetchurl { - url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.2.0.0.20260111.105425.tar"; - sha256 = "07a9ykifnan2wljglkrl7yk2s3ihb8ij47bqlkq7c6w74symgz7z"; + url = "https://elpa.gnu.org/devel/sxhkdrc-mode-1.2.0.0.20260424.102746.tar"; + sha256 = "1cr31122688fl5cyslqzawinaca7df64hxzqvszalzv32gimzm15"; }; packageRequires = [ ]; meta = { @@ -9331,10 +9518,10 @@ elpaBuild { pname = "taxy"; ename = "taxy"; - version = "0.11pre0.20251129.62050"; + version = "0.11pre0.20251129.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/taxy-0.11pre0.20251129.62050.tar"; - sha256 = "1g937immy39j8qfmcq4skxc2xlkn0h57v2w6h7g3rsjgns50l5ca"; + url = "https://elpa.gnu.org/devel/taxy-0.11pre0.20251129.2.tar"; + sha256 = "1y4k68h5z1xc7x0rc3lx1cyvbpniirqglr2gik08m1m1570r6w4x"; }; packageRequires = [ ]; meta = { @@ -9400,10 +9587,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.12.0.20260330.62558"; + version = "1.14.0.20260705.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tempel-1.12.0.20260330.62558.tar"; - sha256 = "0f2gy05isba11k2sqgv7yjiw06i72p9fjbfzgwh3nrljpvndc2cf"; + url = "https://elpa.gnu.org/devel/tempel-1.14.0.20260705.0.tar"; + sha256 = "0bxj1qkxy9sd5js36rnvjlgxhvb8nza38l4ccbnnrj4p7h72n9hl"; }; packageRequires = [ compat ]; meta = { @@ -9421,10 +9608,10 @@ elpaBuild { pname = "termint"; ename = "termint"; - version = "0.2.2.0.20260411.234846"; + version = "0.2.3.0.20260517.165016"; src = fetchurl { - url = "https://elpa.gnu.org/devel/termint-0.2.2.0.20260411.234846.tar"; - sha256 = "0xsrqxgndzmxskcmfx4184nb7yvwmv9lqdy40cjhpc8f3xwmzqwq"; + url = "https://elpa.gnu.org/devel/termint-0.2.3.0.20260517.165016.tar"; + sha256 = "0x3sg96qwrqiclw5gplakynfgsa1cfqa3yj4a4f705in9xaaswjr"; }; packageRequires = [ ]; meta = { @@ -9485,10 +9672,10 @@ elpaBuild { pname = "tex-parens"; ename = "tex-parens"; - version = "0.7.0.20250709.53958"; + version = "0.7.0.20260225.9"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tex-parens-0.7.0.20250709.53958.tar"; - sha256 = "0mbcgc17cy8imk7dzh9krwd62dy2h7fj5pzvfr1wggdczrs2zva8"; + url = "https://elpa.gnu.org/devel/tex-parens-0.7.0.20260225.9.tar"; + sha256 = "040997wgzhkc071hrlcidakicxm1p8fg3mdykr5476cw3ffx6ra1"; }; packageRequires = [ ]; meta = { @@ -9527,10 +9714,10 @@ elpaBuild { pname = "timeout"; ename = "timeout"; - version = "2.1.0.20251209.235840"; + version = "2.1.6.0.20260504.161229"; src = fetchurl { - url = "https://elpa.gnu.org/devel/timeout-2.1.0.20251209.235840.tar"; - sha256 = "1i1yijhvq1i5z3mvhw587n8md3yric545r2bc5ik76gdm8rhslf0"; + url = "https://elpa.gnu.org/devel/timeout-2.1.6.0.20260504.161229.tar"; + sha256 = "00ygq747m4yhp1mjj083ai18av8jri76q33gp214skpac85dxdb5"; }; packageRequires = [ ]; meta = { @@ -9591,10 +9778,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "1.3.0.0.20260423.190529"; + version = "1.3.0.0.20260529.24"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260423.190529.tar"; - sha256 = "1m6ymyrv2fc8j22w12ppj2l1j6cczld8kd6hn2imbxga04knni9z"; + url = "https://elpa.gnu.org/devel/tmr-1.3.0.0.20260529.24.tar"; + sha256 = "0ybzzynk6prnanly0izr59p0kajp4nbm8jk8vqrg4mliidl79fmw"; }; packageRequires = [ ]; meta = { @@ -9680,10 +9867,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.8.1.3.0.20260330.55054"; + version = "2.8.2.0.20260720.2"; src = fetchurl { - url = "https://elpa.gnu.org/devel/tramp-2.8.1.3.0.20260330.55054.tar"; - sha256 = "01c5l03x5krzga9a9gg3klcn47k357p0k0ad09cd0g5qi4jmss5j"; + url = "https://elpa.gnu.org/devel/tramp-2.8.2.0.20260720.2.tar"; + sha256 = "01a6riczx8wvy72x9v56p314r37xnr7i8z6394li307xw3gkznzd"; }; packageRequires = [ ]; meta = { @@ -9784,19 +9971,21 @@ elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "transient"; ename = "transient"; - version = "0.13.0.0.20260422.164634"; + version = "0.13.5.0.20260701.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-0.13.0.0.20260422.164634.tar"; - sha256 = "1mqky3s852p8fw9h9s2wqn7f40fbk8zy5rz9yxwq88w55nyw2kw5"; + url = "https://elpa.gnu.org/devel/transient-0.13.5.0.20260701.0.tar"; + sha256 = "0hhb042jacadfz01fgc9dpjqcz441vpwn3gw0g7qyqaqjhh1i5ci"; }; packageRequires = [ compat cond-let + llama seq ]; meta = { @@ -9814,10 +10003,10 @@ elpaBuild { pname = "transient-cycles"; ename = "transient-cycles"; - version = "2.0.0.20250625.85410"; + version = "2.1.0.20260625.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/transient-cycles-2.0.0.20250625.85410.tar"; - sha256 = "1782gr8hwidfxilggb83s2v9wzkvyhcxbv3nj8f4aylhcdahfzf8"; + url = "https://elpa.gnu.org/devel/transient-cycles-2.1.0.20260625.0.tar"; + sha256 = "1jadhnszdnc9hj6992bpdmdrqcrig0r172dis8cwxksfrcb0qpgs"; }; packageRequires = [ ]; meta = { @@ -9918,6 +10107,27 @@ }; } ) { }; + trust-manager = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "trust-manager"; + ename = "trust-manager"; + version = "0.4.1.0.20260426.120509"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/trust-manager-0.4.1.0.20260426.120509.tar"; + sha256 = "0dvn2x443czsamawylwm5ixayv77fs53ixvkkdg0yj4n6iv3kcg6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/trust-manager.html"; + license = lib.licenses.free; + }; + } + ) { }; ulisp-repl = callPackage ( { elpaBuild, @@ -10013,10 +10223,10 @@ elpaBuild { pname = "urgrep"; ename = "urgrep"; - version = "0.6.1snapshot0.20260321.103449"; + version = "0.6.1snapshot0.20260619.3"; src = fetchurl { - url = "https://elpa.gnu.org/devel/urgrep-0.6.1snapshot0.20260321.103449.tar"; - sha256 = "09ijxd7nzx7xps3db408i0hmr40m7rsc2phim67dm2sma622xl57"; + url = "https://elpa.gnu.org/devel/urgrep-0.6.1snapshot0.20260619.3.tar"; + sha256 = "0aks8nan0rjavz72s34c1d6wq4031z2wf2rbi73kr4sfq944yiss"; }; packageRequires = [ compat ]; meta = { @@ -10232,10 +10442,10 @@ elpaBuild { pname = "vc-jj"; ename = "vc-jj"; - version = "0.5.0.20260416.141453"; + version = "0.5.0.20260531.62"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260416.141453.tar"; - sha256 = "0x5qj0a77wjfqxyr8wv9gswm205jj52cihlpmbkspn01a93ljr04"; + url = "https://elpa.gnu.org/devel/vc-jj-0.5.0.20260531.62.tar"; + sha256 = "120aln68dyj2faknjpjzfgdm6ln90ryh3v803lmgpfhpiph2w1dp"; }; packageRequires = [ compat ]; meta = { @@ -10343,10 +10553,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2026.1.18.88738971.0.20260118.95917"; + version = "2026.4.14.10117132.0.20260621.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/verilog-mode-2026.1.18.88738971.0.20260118.95917.tar"; - sha256 = "1h5mp70kg1w85g0kx6ipdczkza553d7mzffxx832j4wx3wr5afql"; + url = "https://elpa.gnu.org/devel/verilog-mode-2026.4.14.10117132.0.20260621.0.tar"; + sha256 = "1c5jkwxv3bpc9mpsbja9dzycz8zpccsjc7wg5ws5zxlzqbi2p46q"; }; packageRequires = [ ]; meta = { @@ -10365,10 +10575,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "2.8.0.20260419.183845"; + version = "2.10.0.20260709.7"; src = fetchurl { - url = "https://elpa.gnu.org/devel/vertico-2.8.0.20260419.183845.tar"; - sha256 = "0mxhmknbx9sjsvxz9mc5vvg8pag9ijll0s71c2in307scdmp3lvk"; + url = "https://elpa.gnu.org/devel/vertico-2.10.0.20260709.7.tar"; + sha256 = "0jq13xdfbgrdf6b48sd70znax4mvcbf2p0h17mbc8vg006fs3xih"; }; packageRequires = [ compat ]; meta = { @@ -10517,10 +10727,10 @@ elpaBuild { pname = "wcheck-mode"; ename = "wcheck-mode"; - version = "2026.0.20260412.44645"; + version = "2026.5.0.20260529.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/wcheck-mode-2026.0.20260412.44645.tar"; - sha256 = "0gbx80sv5kg8jnk5vzr3hr4lc25rhyl6jva14nr2c2v6bidfi97x"; + url = "https://elpa.gnu.org/devel/wcheck-mode-2026.5.0.20260529.0.tar"; + sha256 = "07pyq411jvpkdgwhhj0snpqdiaxjlfb2wklqqankc4c2qmck7nmv"; }; packageRequires = [ ]; meta = { @@ -10769,6 +10979,27 @@ }; } ) { }; + with-command-redo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-command-redo"; + ename = "with-command-redo"; + version = "0.2.0.20260710.0"; + src = fetchurl { + url = "https://elpa.gnu.org/devel/with-command-redo-0.2.0.20260710.0.tar"; + sha256 = "0zk18x8bplbishpxwy8r3m51i3kcai4crc6d4pipg927qdymry7z"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/devel/with-command-redo.html"; + license = lib.licenses.free; + }; + } + ) { }; wpuzzle = callPackage ( { elpaBuild, @@ -10863,10 +11094,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.22.0.20260406.170713"; + version = "0.23.0.20260627.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/xelb-0.22.0.20260406.170713.tar"; - sha256 = "1np8vw3f8xp5fxbx0zq62li7bq87f20pz4zjsn1n3h4scg5albba"; + url = "https://elpa.gnu.org/devel/xelb-0.23.0.20260627.0.tar"; + sha256 = "0q5z5mvdfgc411nqxqf9qi8gw43pdf3yqsg48riv67w58nnx11bv"; }; packageRequires = [ compat ]; meta = { @@ -10973,10 +11204,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.2.3.0.20260113.65351"; + version = "1.2.4.0.20260605.0"; src = fetchurl { - url = "https://elpa.gnu.org/devel/yaml-1.2.3.0.20260113.65351.tar"; - sha256 = "09ffagrz3qnbca8z4wm6bvxmdfnl2355sz9vgs9x3cavmy3pfy1x"; + url = "https://elpa.gnu.org/devel/yaml-1.2.4.0.20260605.0.tar"; + sha256 = "10hmq703w380gj1bns32k7qz2d5rvvaxd3hyyz76iahfnd574569"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix index 1b3e77cf6319..95b2b716ab6d 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/elpa-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "a68-mode"; ename = "a68-mode"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/a68-mode-1.2.tar"; - sha256 = "1x40j0w6kzjxxrj7qdvll1psackq526cfrihfmacmq97c9g8xwm6"; + url = "https://elpa.gnu.org/packages/a68-mode-1.3.tar"; + sha256 = "0x5jj95bk07wnl9aqf35hcm9ajdwbrg74xm90i5kfn6nrxmnjmyp"; }; packageRequires = [ ]; meta = { @@ -207,10 +207,10 @@ elpaBuild { pname = "aggressive-completion"; ename = "aggressive-completion"; - version = "1.7"; + version = "1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/aggressive-completion-1.7.tar"; - sha256 = "0d388w0yjpjzhqlar9fjrxsjxma09j8as6758sswv01r084gpdbk"; + url = "https://elpa.gnu.org/packages/aggressive-completion-1.8.tar"; + sha256 = "07dqw6mvb1vp4fmii1y7wc074xxi9wfwalflszjpzcjbalklcqdq"; }; packageRequires = [ ]; meta = { @@ -484,10 +484,10 @@ elpaBuild { pname = "auctex-label-numbers"; ename = "auctex-label-numbers"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.2.tar"; - sha256 = "1cd68yvpm061r9k4x6rvy3g2wdynv5gbjg2dyp06nkrgvakdb00x"; + url = "https://elpa.gnu.org/packages/auctex-label-numbers-0.3.tar"; + sha256 = "10dgq2jnzxd2w10a9raz9gj6nzlmyk048fzlv839sf5m73pjq89s"; }; packageRequires = [ auctex ]; meta = { @@ -527,10 +527,10 @@ elpaBuild { pname = "auth-source-xoauth2-plugin"; ename = "auth-source-xoauth2-plugin"; - version = "0.3.2"; + version = "0.4.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.3.2.tar"; - sha256 = "1k48kg6n72vzxaiqidg4m0w69c2s6ynvgcr08p4i8x2fsgaigcp2"; + url = "https://elpa.gnu.org/packages/auth-source-xoauth2-plugin-0.4.1.tar"; + sha256 = "038wikkg4lmgjjnwkliwwx8iif55vlc6720qz55lkr7pkrzp5vas"; }; packageRequires = [ oauth2 ]; meta = { @@ -1085,10 +1085,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "2.6"; + version = "2.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-2.6.tar"; - sha256 = "0n4j70w1q9ix9d8s276g4shkn1k7hv8d6wqpx65wchgilwbjx07z"; + url = "https://elpa.gnu.org/packages/cape-2.7.tar"; + sha256 = "0543x1j4pakdqm8vba0450yl9b30z527dx8x84mzjqkhksn40pzv"; }; packageRequires = [ compat ]; meta = { @@ -1245,6 +1245,28 @@ }; } ) { }; + cm-mode = callPackage ( + { + cl-lib ? null, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "cm-mode"; + ename = "cm-mode"; + version = "1.10"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/cm-mode-1.10.tar"; + sha256 = "1lg9rzv9hk89qi43msrbmi1hyy8zgr75740h7kj7rbl41v808bd7"; + }; + packageRequires = [ cl-lib ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cm-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; cobol-mode = callPackage ( { cl-lib ? null, @@ -1458,17 +1480,16 @@ elpaBuild, fetchurl, lib, - seq, }: elpaBuild { pname = "compat"; ename = "compat"; - version = "30.1.0.1"; + version = "31.0.0.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-30.1.0.1.tar"; - sha256 = "1rj5i709i0l7drr7f571gsk8d6b5slwrd2l9flayv63kwk1gizhn"; + url = "https://elpa.gnu.org/packages/compat-31.0.0.2.tar"; + sha256 = "0f0gig6imlf5gx8qykvwajvhr66v52v7hsifqwh8nzq820x6kn27"; }; - packageRequires = [ seq ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.gnu.org/packages/compat.html"; license = lib.licenses.free; @@ -1527,10 +1548,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "3.4"; + version = "3.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-3.4.tar"; - sha256 = "1silvwrss87fa5lss19a08bv72fwvnblkic24qn53c3z6zcd22zd"; + url = "https://elpa.gnu.org/packages/consult-3.6.tar"; + sha256 = "0c8pp537qv2zxkzk0nlrvzbn1v72v9ddhwf1nks3hwvwrff58db8"; }; packageRequires = [ compat ]; meta = { @@ -1550,10 +1571,10 @@ elpaBuild { pname = "consult-denote"; ename = "consult-denote"; - version = "0.4.2"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-denote-0.4.2.tar"; - sha256 = "1vz96mcfw23y84dibnj6r3d7l0qj191fcnvx2piwhm26n0j43q8m"; + url = "https://elpa.gnu.org/packages/consult-denote-0.5.1.tar"; + sha256 = "0if1qfma6ssb4ciwviz5avm68k1yivj23sg2m2fmb9asry9zrvjd"; }; packageRequires = [ consult @@ -1575,10 +1596,10 @@ elpaBuild { pname = "consult-hoogle"; ename = "consult-hoogle"; - version = "0.6.0"; + version = "0.7.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-hoogle-0.6.0.tar"; - sha256 = "0iln71qlmcfmlys5z5bs4304av91ick0wq1ckhffh7d6xkxy0rv5"; + url = "https://elpa.gnu.org/packages/consult-hoogle-0.7.0.tar"; + sha256 = "17slksxs1vx19djf5q772hwq1fpaqsd0xpbh6zrrvvgv18h2ac8l"; }; packageRequires = [ consult ]; meta = { @@ -1640,10 +1661,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "2.9"; + version = "2.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-2.9.tar"; - sha256 = "0h5vz8jyy06380m802jla9312h2rbn2k8fdskjfwkqd1v6dc0c8n"; + url = "https://elpa.gnu.org/packages/corfu-2.10.tar"; + sha256 = "0wp9jr1l81si8p1rxa5dkkwbx6k77rs0629q2lxk1l8lnb0j7h6n"; }; packageRequires = [ compat ]; meta = { @@ -1900,10 +1921,10 @@ elpaBuild { pname = "dape"; ename = "dape"; - version = "0.26.0"; + version = "0.27.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dape-0.26.0.tar"; - sha256 = "0arid8qwaf7ic76hsjzj7grn41krsphnzvihmjbgm4im6b7zzb37"; + url = "https://elpa.gnu.org/packages/dape-0.27.1.tar"; + sha256 = "1na3080gaygw4fsaymjjx9jgh9ai5k7gb0jmlrkbqnmdypag3mb7"; }; packageRequires = [ jsonrpc ]; meta = { @@ -2034,10 +2055,10 @@ elpaBuild { pname = "denote"; ename = "denote"; - version = "4.1.3"; + version = "4.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-4.1.3.tar"; - sha256 = "197m0bx1gxrzbqlfr5h52il3ivbixzg1pkhkrf488kidww8qmpvf"; + url = "https://elpa.gnu.org/packages/denote-4.2.3.tar"; + sha256 = "0r5p2iy7wssm6hl4dal1sav5x4vvijq54lyzqabg49v6lsbszf74"; }; packageRequires = [ ]; meta = { @@ -2056,10 +2077,10 @@ elpaBuild { pname = "denote-journal"; ename = "denote-journal"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-journal-0.2.2.tar"; - sha256 = "00rav8kachy85npcr96dwzb4kbgym0p2m5aw3v3pmg278nmc73v3"; + url = "https://elpa.gnu.org/packages/denote-journal-0.3.0.tar"; + sha256 = "1l2zrr5nczxyqsmr73m93jqphp6s79f55grpahig0xj2kji8d6gk"; }; packageRequires = [ denote ]; meta = { @@ -2078,10 +2099,10 @@ elpaBuild { pname = "denote-markdown"; ename = "denote-markdown"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-markdown-0.2.2.tar"; - sha256 = "1nb5rcjgkhw3nl2jva6lyblmfsl24cdryx3c16w8ydbx6fswhjpj"; + url = "https://elpa.gnu.org/packages/denote-markdown-0.3.0.tar"; + sha256 = "0adg2nr8s8rjynrpj0b37ni4jcm1igvls3zyyr313xifnrbiznym"; }; packageRequires = [ denote ]; meta = { @@ -2122,10 +2143,10 @@ elpaBuild { pname = "denote-org"; ename = "denote-org"; - version = "0.2.1"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-org-0.2.1.tar"; - sha256 = "1cs1ml38xhj0c921qdsvqhqg42lm5r0qb7nf7sj1krvw1r9913bn"; + url = "https://elpa.gnu.org/packages/denote-org-0.3.0.tar"; + sha256 = "0r3idn17875hzmidi1xjb9hddifzby9i23j35ywzn88h9a33845k"; }; packageRequires = [ denote ]; meta = { @@ -2188,10 +2209,10 @@ elpaBuild { pname = "denote-sequence"; ename = "denote-sequence"; - version = "0.2.0"; + version = "0.3.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-sequence-0.2.0.tar"; - sha256 = "0i0vm1n48aw7j4y6laa8fvs0av5smimdky980qgp69pha6hcvph5"; + url = "https://elpa.gnu.org/packages/denote-sequence-0.3.3.tar"; + sha256 = "017h9bwaqv9lxv8ibbl739a9vkcknsv8ch2sqrbaybhri74a3mqk"; }; packageRequires = [ denote ]; meta = { @@ -2210,10 +2231,10 @@ elpaBuild { pname = "denote-silo"; ename = "denote-silo"; - version = "0.2.0"; + version = "0.3.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/denote-silo-0.2.0.tar"; - sha256 = "10n4xv179dl6zz1k28lcbrgyqx8k3hfh3isd7q3qg1vcahlw04vl"; + url = "https://elpa.gnu.org/packages/denote-silo-0.3.2.tar"; + sha256 = "14qbzf336n62s5wp2v67fp8das28aa8a0ahv3nxg5w3fbdxdf03b"; }; packageRequires = [ denote ]; meta = { @@ -2296,10 +2317,10 @@ elpaBuild { pname = "dicom"; ename = "dicom"; - version = "1.3"; + version = "1.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dicom-1.3.tar"; - sha256 = "05n9azzj0wskzd0jzyqhfk3blss31wjzp8wkqam79hq0j6daf6g5"; + url = "https://elpa.gnu.org/packages/dicom-1.5.tar"; + sha256 = "02i90769952g80f8fjj9phwwm7ln8q6w65pc065r5vln1knjm7gd"; }; packageRequires = [ compat ]; meta = { @@ -2473,10 +2494,10 @@ elpaBuild { pname = "dired-preview"; ename = "dired-preview"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dired-preview-0.6.0.tar"; - sha256 = "1nlibx8jwyvb5n58sx8bg6vcazhnlj5dydmf36v7hzy0h4i460i0"; + url = "https://elpa.gnu.org/packages/dired-preview-0.6.1.tar"; + sha256 = "115cassm68rga9q8z7qr1ghi4f9j0immc8ccqwa21vnyvjj02q7a"; }; packageRequires = [ ]; meta = { @@ -2558,10 +2579,10 @@ elpaBuild { pname = "dmsg"; ename = "dmsg"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/dmsg-0.2.tar"; - sha256 = "18wnbkd707n2qh9an72wizs0yp71hys6vg0y02iclqmj7igjg28k"; + url = "https://elpa.gnu.org/packages/dmsg-0.3.tar"; + sha256 = "18r81rdpw0jnhxca3fr7bxpalabicbj2y55z5gb2llqrh9plarq6"; }; packageRequires = [ ]; meta = { @@ -2663,10 +2684,10 @@ elpaBuild { pname = "doric-themes"; ename = "doric-themes"; - version = "1.1.0"; + version = "1.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/doric-themes-1.1.0.tar"; - sha256 = "12rm5swbhn52yh4nvngqqbaiy8j97bi86a0k7swdb08vxmgp5kzh"; + url = "https://elpa.gnu.org/packages/doric-themes-1.2.1.tar"; + sha256 = "0p7qvn8g0hw7h1r3b0m2iif5f4739jmkqn0zih90qw5lbbjf4i86"; }; packageRequires = [ ]; meta = { @@ -2887,10 +2908,10 @@ elpaBuild { pname = "ef-themes"; ename = "ef-themes"; - version = "2.1.0"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ef-themes-2.1.0.tar"; - sha256 = "09rb5pkqz63mc86f8n7969f8x27jdrhz51rh6vl0v3j4nvivv3dx"; + url = "https://elpa.gnu.org/packages/ef-themes-2.2.0.tar"; + sha256 = "0jm3hqg53cq0dfvmszmwzwrfi9n2mgdbz176qzxhjqm16rw2bwds"; }; packageRequires = [ modus-themes ]; meta = { @@ -2915,10 +2936,10 @@ elpaBuild { pname = "eglot"; ename = "eglot"; - version = "1.23"; + version = "1.24"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eglot-1.23.tar"; - sha256 = "1l83c90rdamlk576bd859jkg6406hgxi7w4c6ixlw509c66qr3s6"; + url = "https://elpa.gnu.org/packages/eglot-1.24.tar"; + sha256 = "0fi10gxw33lh15xvwv5bfqzv81wp7k3yibqc2mzbn59kwrja94gc"; }; packageRequires = [ eldoc @@ -3089,10 +3110,10 @@ elpaBuild { pname = "ellama"; ename = "ellama"; - version = "1.13.0"; + version = "1.30.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ellama-1.13.0.tar"; - sha256 = "0i3lzb68bwyr974wc0i8dn1kiryjs49zg79hli21wycm0j7a3six"; + url = "https://elpa.gnu.org/packages/ellama-1.30.0.tar"; + sha256 = "0xfyli6mzv5rdw6ddzy7q4w7332z4vniz1dmxlyr4r0dczyjq0pk"; }; packageRequires = [ compat @@ -3183,10 +3204,10 @@ elpaBuild { pname = "embark-consult"; ename = "embark-consult"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/embark-consult-1.1.tar"; - sha256 = "06yh6w4zgvvkfllmcr0szsgjrfhh9rpjwgmcrf6h2gai2ps9xdqr"; + url = "https://elpa.gnu.org/packages/embark-consult-1.2.tar"; + sha256 = "1m6i8f49qmzfvqz0mq3ga0gcdi364pqsdph6arpwl4rr59r6sfwn"; }; packageRequires = [ compat @@ -3336,10 +3357,10 @@ elpaBuild { pname = "erc"; ename = "erc"; - version = "5.6.1"; + version = "5.6.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/erc-5.6.1.tar"; - sha256 = "13dzip6xhj0mf8hs8wk08pfxny5gwpbzfsqkmz146xvl2d8m621x"; + url = "https://elpa.gnu.org/packages/erc-5.6.2.tar"; + sha256 = "0rm7aw6p8736ssp4z7vmfmwff93h4dwcv9pz3b83f9060i2svvvn"; }; packageRequires = [ compat ]; meta = { @@ -3383,10 +3404,10 @@ elpaBuild { pname = "ess"; ename = "ess"; - version = "26.1.0"; + version = "26.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ess-26.1.0.tar"; - sha256 = "1spyys37b2rzqzpa7y5ajrrjzckrsbp3hrhsvn28qav3g5d17463"; + url = "https://elpa.gnu.org/packages/ess-26.5.0.tar"; + sha256 = "07mfjhcnq3wn6q0dxc4yn5aqnvb9sfnwgi581b5283pfbszhxd29"; }; packageRequires = [ ]; meta = { @@ -3499,10 +3520,10 @@ elpaBuild { pname = "exwm"; ename = "exwm"; - version = "0.34"; + version = "0.35"; src = fetchurl { - url = "https://elpa.gnu.org/packages/exwm-0.34.tar"; - sha256 = "1hp2ni9c6bn627275x37n6zhcismvni6vqp7cpdn3cx292n7sx6z"; + url = "https://elpa.gnu.org/packages/exwm-0.35.tar"; + sha256 = "05sfgprmsy3yc82qqm2ysg091yw91d0vb74cd612bqxyi3ifqa19"; }; packageRequires = [ compat @@ -3535,6 +3556,27 @@ }; } ) { }; + ffs = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ffs"; + ename = "ffs"; + version = "0.2.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ffs-0.2.2.tar"; + sha256 = "1mwjk877qfccdrp046j431pawr9g489gdz803wg55j0r12whh94a"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ffs.html"; + license = lib.licenses.free; + }; + } + ) { }; filechooser = callPackage ( { compat, @@ -3719,10 +3761,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-3.0.1.tar"; - sha256 = "0bgfg6pkw724id1d3igiw4g0204wnjwsbnabfy2rq6nrf99z1qwr"; + url = "https://elpa.gnu.org/packages/fontaine-3.1.0.tar"; + sha256 = "066q3pys9f4d7jkvm52yrj0df12jz8z22gv2f4jpb47g1iapkp9f"; }; packageRequires = [ ]; meta = { @@ -3731,6 +3773,28 @@ }; } ) { }; + forgejo = callPackage ( + { + elpaBuild, + fetchurl, + keymap-popup, + lib, + }: + elpaBuild { + pname = "forgejo"; + ename = "forgejo"; + version = "0.2.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/forgejo-0.2.3.tar"; + sha256 = "0q4y474acb759vx3d0xcqgikbq666nckka4hfashi1jwnas98qcg"; + }; + packageRequires = [ keymap-popup ]; + meta = { + homepage = "https://elpa.gnu.org/packages/forgejo.html"; + license = lib.licenses.free; + }; + } + ) { }; frame-tabs = callPackage ( { elpaBuild, @@ -3830,10 +3894,10 @@ elpaBuild { pname = "futur"; ename = "futur"; - version = "1.4"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/futur-1.4.tar"; - sha256 = "036b81cp5nbzhykfsj6rkhxb5b675k38njmb32bj20g9h7pkd1vl"; + url = "https://elpa.gnu.org/packages/futur-1.7.tar"; + sha256 = "1zb533jkhsi6p0ikx9jc7igz4yfq7b35apz9b8w7g0yrvq5jcl4i"; }; packageRequires = [ ]; meta = { @@ -4019,17 +4083,21 @@ compat, elpaBuild, fetchurl, + keymap-popup, lib, }: elpaBuild { pname = "gnosis"; ename = "gnosis"; - version = "0.10.3"; + version = "0.10.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/gnosis-0.10.3.tar"; - sha256 = "0642xdgpljfmzi27gfbzhngpyc82blpyyvkvqqbm6khiqac9wdxz"; + url = "https://elpa.gnu.org/packages/gnosis-0.10.6.tar"; + sha256 = "1g8zbvid2l7wfyagqynjd1jcjnd0m3zkh9ww0dadppj24n37k57n"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + keymap-popup + ]; meta = { homepage = "https://elpa.gnu.org/packages/gnosis.html"; license = lib.licenses.free; @@ -4232,10 +4300,10 @@ elpaBuild { pname = "greader"; ename = "greader"; - version = "0.17.0"; + version = "0.19.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/greader-0.17.0.tar"; - sha256 = "0kz9qvwkxfl3p4fwl235vxdv19iqrz2jrp9hk06z8bmwmdvj7nxd"; + url = "https://elpa.gnu.org/packages/greader-0.19.5.tar"; + sha256 = "1kzm63xp0fzryha5msyl0f4gdhhacz4ys0b0z1wf5phy832bc1w1"; }; packageRequires = [ compat @@ -4510,6 +4578,27 @@ }; } ) { }; + ibuffer-sidebar = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "ibuffer-sidebar"; + ename = "ibuffer-sidebar"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/ibuffer-sidebar-1.0.0.tar"; + sha256 = "00wgka7g7gndk8vczrm3pvx09l46mv93yc0i4w3xlma30z0clivw"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/ibuffer-sidebar.html"; + license = lib.licenses.free; + }; + } + ) { }; idlwave = callPackage ( { elpaBuild, @@ -4852,10 +4941,10 @@ elpaBuild { pname = "javaimp"; ename = "javaimp"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/javaimp-0.9.1.tar"; - sha256 = "1gy7qys9mzpgbqm5798fncmblmi32b350q51ccsyydq67yh69s3z"; + url = "https://elpa.gnu.org/packages/javaimp-0.9.2.tar"; + sha256 = "0y756psqlb2rn0bbrdndddsy6d22arv5f4qzaxgzp5p323vzjp7w"; }; packageRequires = [ ]; meta = { @@ -4896,10 +4985,10 @@ elpaBuild { pname = "jinx"; ename = "jinx"; - version = "2.7"; + version = "2.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jinx-2.7.tar"; - sha256 = "0ikyr5spj7vk0xycgmywr2sqn9gy1khg6h7kdlzjgy0mrjpxl32w"; + url = "https://elpa.gnu.org/packages/jinx-2.8.tar"; + sha256 = "0cxgj390zylr4lqjmfd7f8898z4zsjy1ln783fcjlhcpf94jjjmx"; }; packageRequires = [ compat ]; meta = { @@ -4982,10 +5071,10 @@ elpaBuild { pname = "jsonrpc"; ename = "jsonrpc"; - version = "1.0.28"; + version = "1.0.29"; src = fetchurl { - url = "https://elpa.gnu.org/packages/jsonrpc-1.0.28.tar"; - sha256 = "13zdm9ss1sfpw55lwr8nrv1ha30qcj7v10m1ql8r9cbdxxkzxp8f"; + url = "https://elpa.gnu.org/packages/jsonrpc-1.0.29.tar"; + sha256 = "1cjxdzckxffiw2cjp68rf382iaf7qpg9iqkxm0yrz0rmw3vk3gcq"; }; packageRequires = [ ]; meta = { @@ -5015,6 +5104,27 @@ }; } ) { }; + keymap-popup = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "keymap-popup"; + ename = "keymap-popup"; + version = "0.4.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/keymap-popup-0.4.0.tar"; + sha256 = "0hdzppwrq78hzamr05jjj3nmdsv0fxbv93gs94gmwbc07jiq0937"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/keymap-popup.html"; + license = lib.licenses.free; + }; + } + ) { }; kind-icon = callPackage ( { elpaBuild, @@ -5089,10 +5199,10 @@ elpaBuild { pname = "kubed"; ename = "kubed"; - version = "0.6.1"; + version = "0.7.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kubed-0.6.1.tar"; - sha256 = "1filhadwzdkrw2dsma28b10nx62qnhxkp8g483r0il986ipnnshp"; + url = "https://elpa.gnu.org/packages/kubed-0.7.1.tar"; + sha256 = "1c8jr0wi52waa1yrz1y16gpyqabpqpyymmdf8c4apsja0i6345fk"; }; packageRequires = [ ]; meta = { @@ -5133,10 +5243,10 @@ elpaBuild { pname = "latex-table-wizard"; ename = "latex-table-wizard"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/latex-table-wizard-1.5.5.tar"; - sha256 = "1fffbaqiz3f1f2ki26b8x0cmisqhaijpw5vrh73k769wqdv09g43"; + url = "https://elpa.gnu.org/packages/latex-table-wizard-1.6.0.tar"; + sha256 = "1zpf3x62ldqy12npypjk1x8dw7adfmqqhqj30cl2s659vq7gs4nb"; }; packageRequires = [ auctex @@ -5251,10 +5361,10 @@ elpaBuild { pname = "lex"; ename = "lex"; - version = "1.2"; + version = "1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lex-1.2.tar"; - sha256 = "1pqjrlw558l4z4k40jmli8lmcqlzddhkr0mfm38rbycp7ghdr4zx"; + url = "https://elpa.gnu.org/packages/lex-1.3.tar"; + sha256 = "162y483d1gczjfcbds50y7iqbxmx7sfxi5mbdxyrhc2my6nq40lx"; }; packageRequires = [ ]; meta = { @@ -5284,6 +5394,32 @@ }; } ) { }; + lisp-ts-mode = callPackage ( + { + compat, + cond-star, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "lisp-ts-mode"; + ename = "lisp-ts-mode"; + version = "0.3.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/lisp-ts-mode-0.3.0.tar"; + sha256 = "0dh15bdmjgn4jmdc8xdf0wddj1zkbpi9xqw32m724h1y5511whh2"; + }; + packageRequires = [ + compat + cond-star + ]; + meta = { + homepage = "https://elpa.gnu.org/packages/lisp-ts-mode.html"; + license = lib.licenses.free; + }; + } + ) { }; listen = callPackage ( { elpaBuild, @@ -5348,10 +5484,10 @@ elpaBuild { pname = "llm"; ename = "llm"; - version = "0.30.1"; + version = "0.31.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/llm-0.30.1.tar"; - sha256 = "11mmaw24dg9iwml8kx09xv8h9iyz9i9jw4m1kghq192fp9wy668i"; + url = "https://elpa.gnu.org/packages/llm-0.31.2.tar"; + sha256 = "08lc058w1xhiv3cxfkbcjaszplvwhmdyxpcwqkzw3x2sb11pn7rj"; }; packageRequires = [ compat @@ -5586,10 +5722,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "2.10"; + version = "2.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-2.10.tar"; - sha256 = "12did4rn4dp7km6shq7jvab2xbr0wxks4h1by19qz10rm5b0jl71"; + url = "https://elpa.gnu.org/packages/marginalia-2.11.tar"; + sha256 = "0h7jqgx95f5km90qc4g06ib3mi4acwggvx9yiwwirxj2mqwivifk"; }; packageRequires = [ compat ]; meta = { @@ -5713,10 +5849,10 @@ elpaBuild { pname = "mct"; ename = "mct"; - version = "1.1.0"; + version = "1.1.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/mct-1.1.0.tar"; - sha256 = "0kv0j37bdsmc2jv7adpx5m48cp4h0kvjq2jfwv7d8nzpk5kk2d2p"; + url = "https://elpa.gnu.org/packages/mct-1.1.1.tar"; + sha256 = "18kwrm93vmkhm8l6gim1r3daizrj6k65lsq8xmja55a1jr60j1xi"; }; packageRequires = [ ]; meta = { @@ -5855,6 +5991,7 @@ ) { }; minimail = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -5863,12 +6000,15 @@ elpaBuild { pname = "minimail"; ename = "minimail"; - version = "0.4.2"; + version = "0.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minimail-0.4.2.tar"; - sha256 = "1ri424g6v55405d4zr4qhnvdswd5hc9n4hs2xds40ps0h6qp05hm"; + url = "https://elpa.gnu.org/packages/minimail-0.5.tar"; + sha256 = "1m1yn8f9mn3zqf7zc0691qaya5l504ry3afz2nmjycavzh8hzk5h"; }; - packageRequires = [ transient ]; + packageRequires = [ + compat + transient + ]; meta = { homepage = "https://elpa.gnu.org/packages/minimail.html"; license = lib.licenses.free; @@ -5907,10 +6047,10 @@ elpaBuild { pname = "minuet"; ename = "minuet"; - version = "0.7.1"; + version = "0.8.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/minuet-0.7.1.tar"; - sha256 = "0g18hfpjryg2kjj5gqr4jf1vgfjglaczd4w19g76233m31kd8f0n"; + url = "https://elpa.gnu.org/packages/minuet-0.8.0.tar"; + sha256 = "0vk118qd7g2b7vsaygj0lwnzj818p5nlsm36s1c7cm5inz1h6mfc"; }; packageRequires = [ dash @@ -5953,10 +6093,10 @@ elpaBuild { pname = "modus-themes"; ename = "modus-themes"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/modus-themes-5.2.0.tar"; - sha256 = "1715x863mbvcc2lqf61lll5j50zhpc0jysdgd7v0ajznx40kqmxv"; + url = "https://elpa.gnu.org/packages/modus-themes-5.3.0.tar"; + sha256 = "04561ndfxq2y17drklkb3wl9kl6hdc05d4b6rrlqs3fdxcs6q6mx"; }; packageRequires = [ ]; meta = { @@ -6355,10 +6495,10 @@ elpaBuild { pname = "oauth2"; ename = "oauth2"; - version = "0.18.4"; + version = "0.19"; src = fetchurl { - url = "https://elpa.gnu.org/packages/oauth2-0.18.4.tar"; - sha256 = "1hhfk7glp3m9f4aqf1dvqs5f7qp4s2gvbxamyxjalw3sj6pbv92n"; + url = "https://elpa.gnu.org/packages/oauth2-0.19.tar"; + sha256 = "0fjs2wk2ayhzh9ba8fa8pki4c5cyavcw0vqsscj93894s7xv9xgz"; }; packageRequires = [ ]; meta = { @@ -6484,10 +6624,10 @@ elpaBuild { pname = "orderless"; ename = "orderless"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/orderless-1.6.tar"; - sha256 = "15gif01ivwg03h45azrj3kw2lgj7xnkr6p9r95m36fmfbg31csdh"; + url = "https://elpa.gnu.org/packages/orderless-1.7.tar"; + sha256 = "0g1klijlvv44fd7xjvlh6v97zjvca37710bxlgk629v6k4kl2rbz"; }; packageRequires = [ compat ]; meta = { @@ -6505,10 +6645,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "9.8.3"; + version = "9.8.7"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-9.8.3.tar"; - sha256 = "0csfrn0k1fysjfwf8xmdnmizfjz62scr3kjawpafwv58gvizk32z"; + url = "https://elpa.gnu.org/packages/org-9.8.7.tar"; + sha256 = "1y7sf3p9jqkfw8k6wddy2p9hfskiq4a5hkx8sq39dgb4sri6v03d"; }; packageRequires = [ ]; meta = { @@ -6652,10 +6792,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "1.13"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-1.13.tar"; - sha256 = "0cl6dqk8zq213j9ph07689dbzh1q1xr96kf512vvmgkln0himfqj"; + url = "https://elpa.gnu.org/packages/org-modern-1.14.tar"; + sha256 = "08rvxrr67ypvncrg7znl3in8c314l7x1a18m6hr458wqc1xb57zx"; }; packageRequires = [ compat @@ -6832,10 +6972,10 @@ elpaBuild { pname = "osm"; ename = "osm"; - version = "2.2"; + version = "2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/osm-2.2.tar"; - sha256 = "0xq5gzhgxgv52kxprik15b5ijrdw7c5262ifzdcjg3vv3qv0hwy8"; + url = "https://elpa.gnu.org/packages/osm-2.4.tar"; + sha256 = "1w270bjnxxlwi3vbgfb0aih6lkr8bgs872yrwfpl423x9wkrk48j"; }; packageRequires = [ compat ]; meta = { @@ -7066,10 +7206,10 @@ elpaBuild { pname = "php-fill"; ename = "php-fill"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/php-fill-1.1.1.tar"; - sha256 = "130q6nyx5837wvhvis0nlzsqky7hic00z1jakik66asqpyrl7ncj"; + url = "https://elpa.gnu.org/packages/php-fill-1.1.2.tar"; + sha256 = "0r1zmin3wv8sqzgw6zbvbb7wix7d6h6s798f9r05w6g9m1vf0r5r"; }; packageRequires = [ ]; meta = { @@ -7343,10 +7483,10 @@ elpaBuild { pname = "posframe"; ename = "posframe"; - version = "1.5.1"; + version = "1.5.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/posframe-1.5.1.tar"; - sha256 = "1g1pcf83w4fv299ykvx7b93kxkc58fkr6yk39sxny5g16d4gl80g"; + url = "https://elpa.gnu.org/packages/posframe-1.5.2.tar"; + sha256 = "0ywbcwm3sh01vc4nc2ra3b09gri2lgz838gjxgsflv9g3si1918x"; }; packageRequires = [ ]; meta = { @@ -7386,10 +7526,10 @@ elpaBuild { pname = "preview-auto"; ename = "preview-auto"; - version = "0.4.2"; + version = "0.5.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/preview-auto-0.4.2.tar"; - sha256 = "1fg4nxzqjk13q9yvhrjmm9qqrszf9xd2n9jfji2v31f0rphlkc3p"; + url = "https://elpa.gnu.org/packages/preview-auto-0.5.0.tar"; + sha256 = "1d8rm22aqvgyg46r4vdf2w3ywxmqiny46y0p030i9q26xc2xq7my"; }; packageRequires = [ auctex ]; meta = { @@ -7430,10 +7570,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.11.2"; + version = "0.12.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.11.2.tar"; - sha256 = "0gyjdqxsblsmh2higkr2a6vfl051hpqzm0pxrzwsg2766xmldgqk"; + url = "https://elpa.gnu.org/packages/project-0.12.0.tar"; + sha256 = "0g7in5lzv21j4mrmqp60bl02gwrh2mrs6fw1ysj6pwaqlza9hw4w"; }; packageRequires = [ xref ]; meta = { @@ -8081,10 +8221,10 @@ elpaBuild { pname = "rnc-mode"; ename = "rnc-mode"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar"; - sha256 = "1p03g451888v86k9z6g8gj375p1pcdvikgk1phxkhipwi5hbf5g8"; + url = "https://elpa.gnu.org/packages/rnc-mode-0.4.tar"; + sha256 = "1igg829mm6n35mpfp254276ib3x7x7wxdg9zm38yf5n3bmjq7cxf"; }; packageRequires = [ ]; meta = { @@ -8249,6 +8389,27 @@ }; } ) { }; + sendai-theme = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "sendai-theme"; + ename = "sendai-theme"; + version = "0.1.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/sendai-theme-0.1.0.tar"; + sha256 = "0c8k19pj5l148g34isi6w309msrq6q3z65427ilky47xzs067faz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/sendai-theme.html"; + license = lib.licenses.free; + }; + } + ) { }; seq = callPackage ( { elpaBuild, @@ -8354,6 +8515,27 @@ }; } ) { }; + shift-number = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "shift-number"; + ename = "shift-number"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/shift-number-0.3.tar"; + sha256 = "0vqwy0ai4f1ga4j2inl2s1ly0v9i3fmqyd0p28fgyx3f23c83jqn"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/shift-number.html"; + license = lib.licenses.free; + }; + } + ) { }; show-font = callPackage ( { elpaBuild, @@ -9164,10 +9346,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "1.12"; + version = "1.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-1.12.tar"; - sha256 = "1ghlnf7533i6iarzmsgyc0d366bzc3jbyvn6bq650c10ci4wjzsm"; + url = "https://elpa.gnu.org/packages/tempel-1.14.tar"; + sha256 = "1m2zy53drrpcjqky7a2pfhrnrynhj7hdksl68kfz8r6lp5id6xf3"; }; packageRequires = [ compat ]; meta = { @@ -9185,10 +9367,10 @@ elpaBuild { pname = "termint"; ename = "termint"; - version = "0.2.2"; + version = "0.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/termint-0.2.2.tar"; - sha256 = "0iavnximqsx6vl6yx36n829h67x4pyfmm8xcp5fzjwphdmgfdann"; + url = "https://elpa.gnu.org/packages/termint-0.2.3.tar"; + sha256 = "1yir074lihlr2y78a58jm233a6s807j8d8fvlvv6b62wm0036frk"; }; packageRequires = [ ]; meta = { @@ -9291,10 +9473,10 @@ elpaBuild { pname = "timeout"; ename = "timeout"; - version = "2.1"; + version = "2.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/timeout-2.1.tar"; - sha256 = "1mm4yp1spw512dnav1p3wnxqrsyls918i14azg03by4v32r9945p"; + url = "https://elpa.gnu.org/packages/timeout-2.1.6.tar"; + sha256 = "08lijbbbx2wx64jn6l5820phkmi6cagym1239zj1hx25h28b2h0r"; }; packageRequires = [ ]; meta = { @@ -9444,10 +9626,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.8.1.3"; + version = "2.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.8.1.3.tar"; - sha256 = "1jjbgg48q6dlfp9rpn0pla4mlclw60079d51bgnb84q3pv3zdqwj"; + url = "https://elpa.gnu.org/packages/tramp-2.8.2.tar"; + sha256 = "1d9mki1ik8ck891jq7kzkf93aqalfm0i9vqdbm5km8g317wqpaqn"; }; packageRequires = [ ]; meta = { @@ -9548,19 +9730,21 @@ elpaBuild, fetchurl, lib, + llama, seq, }: elpaBuild { pname = "transient"; ename = "transient"; - version = "0.13.0"; + version = "0.13.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-0.13.0.tar"; - sha256 = "0rwb7l823d4nkk7zmnyi5j7id7kswxrc0h9crqyd63n14w78bksi"; + url = "https://elpa.gnu.org/packages/transient-0.13.5.tar"; + sha256 = "15mdg6q6ns6sqyrikvxvn4l76dxz5gai9a9hqvf61vgk35vkgz47"; }; packageRequires = [ compat cond-let + llama seq ]; meta = { @@ -9578,10 +9762,10 @@ elpaBuild { pname = "transient-cycles"; ename = "transient-cycles"; - version = "2.0"; + version = "2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/transient-cycles-2.0.tar"; - sha256 = "0cq2k77rgbw3fx84a2d33nbb75wqxynrc1mx4gb32a9ysm0sa4s3"; + url = "https://elpa.gnu.org/packages/transient-cycles-2.1.tar"; + sha256 = "12g22ajwf3lsqi3c9bajqq30n1aaq96r15mfd1z2bbzpn1gfahkf"; }; packageRequires = [ ]; meta = { @@ -9682,6 +9866,27 @@ }; } ) { }; + trust-manager = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "trust-manager"; + ename = "trust-manager"; + version = "0.4.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/trust-manager-0.4.1.tar"; + sha256 = "1azp3kzkw76xbwsn6j94liy33d3swajc1v2h8ghczvxv8sw8khgj"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/trust-manager.html"; + license = lib.licenses.free; + }; + } + ) { }; ulisp-repl = callPackage ( { elpaBuild, @@ -10111,10 +10316,10 @@ elpaBuild { pname = "verilog-mode"; ename = "verilog-mode"; - version = "2026.1.18.88738971"; + version = "2026.4.14.10117132"; src = fetchurl { - url = "https://elpa.gnu.org/packages/verilog-mode-2026.1.18.88738971.tar"; - sha256 = "1m215m38mia2wiq1zzyy85k268pch10yzf3p4i0nk5s7ijxl6ls4"; + url = "https://elpa.gnu.org/packages/verilog-mode-2026.4.14.10117132.tar"; + sha256 = "0n699kpqhh1b023wswm938f7kxc983faw0bv4x70kq12y7h3slj1"; }; packageRequires = [ ]; meta = { @@ -10133,10 +10338,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "2.8"; + version = "2.10"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-2.8.tar"; - sha256 = "0v19z3sh4npjmvii03r5v9mbmg8g3bp1ay82ydalw864hlcwgb71"; + url = "https://elpa.gnu.org/packages/vertico-2.10.tar"; + sha256 = "1kwmlpfxjnjkv05hfqhxmxw5d1vlhqvdmyc3p34qhp3bj2xafwm0"; }; packageRequires = [ compat ]; meta = { @@ -10285,10 +10490,10 @@ elpaBuild { pname = "wcheck-mode"; ename = "wcheck-mode"; - version = "2026"; + version = "2026.5"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wcheck-mode-2026.tar"; - sha256 = "019lsaihpl9w17qfhn8c5j8rp8nrvlmb16w6r8sb1iril31997sz"; + url = "https://elpa.gnu.org/packages/wcheck-mode-2026.5.tar"; + sha256 = "0yxg6s4s5103zfa8m82gaxc46d9gjpiknmvgm2lcb21dckdsay13"; }; packageRequires = [ ]; meta = { @@ -10536,6 +10741,27 @@ }; } ) { }; + with-command-redo = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "with-command-redo"; + ename = "with-command-redo"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/with-command-redo-0.2.tar"; + sha256 = "1da6xklk9yf9xazspr9d987rsfxl8m2y556g99cnf3cj6bx8npa3"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.gnu.org/packages/with-command-redo.html"; + license = lib.licenses.free; + }; + } + ) { }; wpuzzle = callPackage ( { elpaBuild, @@ -10630,10 +10856,10 @@ elpaBuild { pname = "xelb"; ename = "xelb"; - version = "0.22"; + version = "0.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xelb-0.22.tar"; - sha256 = "0vd0dsigr2lvwvvm32kf20dyg5bvafinb2xhz491f8wj2w99fjx4"; + url = "https://elpa.gnu.org/packages/xelb-0.23.tar"; + sha256 = "1fsqs06g2hx248sngp7lqkx1m63m96jvmdks28xcamw1j1p8h0v0"; }; packageRequires = [ compat ]; meta = { @@ -10740,10 +10966,10 @@ elpaBuild { pname = "yaml"; ename = "yaml"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/yaml-1.2.3.tar"; - sha256 = "0wyvhh4ij22wdd3g5jkg2mnyglbk2k7mf2jv48jkpb5jc4kf6jvr"; + url = "https://elpa.gnu.org/packages/yaml-1.2.4.tar"; + sha256 = "12ji680hjm1isc5k3yapvnp2m7pk23syfxwhi95bizhka02n0qly"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix index 2bbfb02d7f96..6b67b2605c15 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/color-theme-solarized/package.nix @@ -18,9 +18,6 @@ melpaBuild { files = ''(:defaults (:exclude "color-theme-solarized-pkg.el"))''; - # https://github.com/NixOS/nixpkgs/issues/335408 - ignoreCompilationError = true; - meta = { homepage = "http://ethanschoonover.com/solarized"; description = "Precision colors for machines and people; Emacs implementation"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix index 07bf31827567..1115f32c61d0 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/copilot/package.nix @@ -12,13 +12,13 @@ }: melpaBuild (finalAttrs: { pname = "copilot"; - version = "0.5.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "copilot-emacs"; repo = "copilot.el"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-1uHPtz0F0pim7KlotB1+pmls1i7H3hRhZ0DX1h53cPc="; + sha256 = "sha256-x2Lzhz8Yi3/EsahkJZ/pJoaJuVb1xIHgNt50qi0ndeo="; }; files = ''(:defaults "dist")''; @@ -47,7 +47,6 @@ melpaBuild (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" "x86_64-windows" ]; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix index 83f2b5da36df..c9b05825c7df 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ebuild-mode/package.nix @@ -6,11 +6,11 @@ melpaBuild (finalAttrs: { pname = "ebuild-mode"; - version = "1.83"; + version = "1.84"; src = fetchzip { url = "https://gitweb.gentoo.org/proj/ebuild-mode.git/snapshot/ebuild-mode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-xZA3Vkh8frgXzyGZs5UELdBh0vrcsXJN/2aJX56QH0Y="; + hash = "sha256-+WbKgOR0eCIvBgQrXzVOk8k2mV7INObY59vc46KvMYo="; }; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix index cbb23ee3e9ff..588218f3f05a 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ghostel/package.nix @@ -6,6 +6,7 @@ stdenv, zig_0_15, emacs, + xcbuild, }: let @@ -13,13 +14,13 @@ let pname = "ghostel"; - version = "0.34.0-unstable-2026-06-08"; + version = "0.44.0"; src = fetchFromGitHub { owner = "dakra"; repo = "ghostel"; - rev = "f7800f6430b6ab85dbfc2db2129625e8a28ac17e"; - hash = "sha256-o9EQFA6xunwt/chdA5z8bqadr9V3COBPjRqiAY3jkp0="; + tag = "v${version}"; + hash = "sha256-vRGZoQtjsL42ga07fOfEjccKRidAhqgwHBoKs++62Ls="; }; module = stdenv.mkDerivation (finalAttrs: { @@ -28,10 +29,10 @@ let deps = zig.fetchDeps { inherit (finalAttrs) src pname version; fetchAll = true; - hash = "sha256-CTsG3dXu3DECDbklBAtr2fYou82WNvQ1Q3JET0TmuyM="; + hash = "sha256-yrVgiofdmVjTGJ+PGPGRCc8gb/JcEca1uAzIoPgHHqU="; }; - nativeBuildInputs = [ zig ]; + nativeBuildInputs = [ zig ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcbuild ]; env.EMACS_INCLUDE_DIR = "${emacs}/include"; @@ -59,15 +60,16 @@ melpaBuild { inherit pname version src; files = '' - (:defaults "etc" "ghostel-module${libExt}") + (:defaults "etc" "ghostel-module${libExt}" "ghostel-module.version") ''; preBuild = '' - install ${module}/lib/libghostel-module${libExt} ghostel-module${libExt} + install ${module}/ghostel-module${libExt} ghostel-module${libExt} + install --mode=444 ${module}/ghostel-module.version ghostel-module.version ''; passthru = { - updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + updateScript = nix-update-script { }; inherit module; }; @@ -75,7 +77,10 @@ melpaBuild { meta = { homepage = "https://github.com/dakra/ghostel"; description = "Terminal emulator powered by libghostty"; - maintainers = with lib.maintainers; [ vonfry ]; + maintainers = with lib.maintainers; [ + rohan-datar + vonfry + ]; license = lib.licenses.gpl3Plus; }; } diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix index 082579c45068..0b20ac1d399c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/holo-layer/package.nix @@ -22,7 +22,7 @@ let pyqt6-sip sexpdata six - xlib + python-xlib ]; pythonEnv = python3.withPackages pythonPkgs; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix new file mode 100644 index 000000000000..46aa2e404c91 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/majutsu/package.nix @@ -0,0 +1,35 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + nix-update-script, + magit, + transient, + with-editor, +}: +melpaBuild { + pname = "majutsu"; + version = "0.6.0-unstable-2026-07-09"; + + src = fetchFromGitHub { + owner = "0WD0"; + repo = "majutsu"; + rev = "59aff9b93eac575fbccc1f4ab2d48d048e0ead9b"; + hash = "sha256-GJ62hsHgLEFIY0ghij0VPFt1jMUGRKhI2eCroBjkxtc="; + }; + + packageRequires = [ + magit + transient + with-editor + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + + meta = { + description = "Magit for jujutsu"; + homepage = "https://github.com/0WD0/majutsu"; + maintainers = [ lib.maintainers.shunueda ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix new file mode 100644 index 000000000000..67b3c50b35d5 --- /dev/null +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/modus-themes-exporter/package.nix @@ -0,0 +1,28 @@ +{ + lib, + melpaBuild, + fetchFromGitHub, + modus-themes, + nix-update-script, +}: +melpaBuild { + pname = "modus-themes-exporter"; + version = "0-unstable-2026-04-24"; + + src = fetchFromGitHub { + owner = "protesilaos"; + repo = "modus-themes-exporter"; + rev = "a19c4b0f22d353afcd441fbbc6c0565858a86c9b"; + hash = "sha256-/PCCArQUV1uhhbOC3fqSuUkgDqc4+QlLubTtjx8/vGc="; + }; + + packageRequires = [ modus-themes ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch=main" ]; }; + + meta = { + description = "Export a Modus themes to another application"; + homepage = "https://github.com/protesilaos/modus-themes-exporter"; + maintainers = [ lib.maintainers.HeitorAugustoLN ]; + license = lib.licenses.gpl3Plus; + }; +} diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix index f66bf92548bd..d0198a8adbaf 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/session-management-for-emacs/package.nix @@ -7,17 +7,14 @@ melpaBuild (finalAttrs: { pname = "session-management-for-emacs"; ename = "session"; - version = "2.2a"; - melpaVersion = "2.2"; # default value derived from version is not valid for Emacs + version = "2.4b"; + melpaVersion = "2.4"; # default value derived from version is not valid for Emacs src = fetchzip { url = "mirror://sourceforge/emacs-session/session-${finalAttrs.version}.tar.gz"; - hash = "sha256-lc6NIX+lx97qCs5JqG7x0iVE6ki09Gy7DEQuPW2c+7s="; + hash = "sha256-xF/hyUyerZPXgklOn2DElJtbyPZqSG/6S2PPxh971F0="; }; - # https://github.com/NixOS/nixpkgs/issues/335421 - ignoreCompilationError = true; - meta = { /* installation: add to your ~/.emacs diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix index aa1931869d6b..ed8e4eaa3521 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/treesit-grammars/package.nix @@ -15,9 +15,9 @@ let # Usage: # treesit-grammars.with-grammars (p: [ p.tree-sitter-bash p.tree-sitter-c ... ]) - with-grammars = fn: grammarPackage (fn pkgs.tree-sitter.builtGrammars); + with-grammars = fn: grammarPackage (fn pkgs.tree-sitter-grammars.derivations); - with-all-grammars = grammarPackage pkgs.tree-sitter.allGrammars; + with-all-grammars = grammarPackage pkgs.tree-sitter-grammars.allGrammars; in { inherit with-grammars with-all-grammars; diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix index 35e9335e4e5f..287631bea6ae 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/tsc/package.nix @@ -12,16 +12,16 @@ let tsc-dyn = rustPlatform.buildRustPackage (finalAttrs: { pname = "tsc-dyn"; - version = "0.18.0"; + version = "0.19.4"; src = fetchFromGitHub { owner = "emacs-tree-sitter"; repo = "emacs-tree-sitter"; tag = finalAttrs.version; - hash = "sha256-LrakDpP3ZhRQqz47dPcyoQnu5lROdaNlxGaQfQT6u+k="; + hash = "sha256-7B9Q8ke8gY9cFIAjpyH21P240goKUEKgppfqP3PSxYA="; }; - cargoHash = "sha256-Tua3ZFfSyWVYXU9mPLWXE6ejGlXowTNe3nvZBaicmSQ="; + cargoHash = "sha256-mjR8PehbhY1o/5L2l/OMh/NwjjmQXErPHh00cAD94pw="; sourceRoot = "${finalAttrs.src.name}/core"; diff --git a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix index fae91613fd19..66941ed76987 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/melpa-packages.nix @@ -1536,6 +1536,8 @@ let org-change = ignoreCompilationError super.org-change; # elisp error + org-cite-overlay = ignoreCompilationError super.org-cite-overlay; # native-ice + org-edit-latex = mkHome super.org-edit-latex; # https://github.com/GuiltyDolphin/org-evil/issues/24 @@ -1701,6 +1703,9 @@ let shampoo = ignoreCompilationError super.shampoo; # elisp error + # missing optional dependencies + shexc-ts-mode = addPackageRequires super.shexc-ts-mode [ self.yaml ]; + # missing optional dependencies and one of them (mew) is not on any ELPA shimbun = ignoreCompilationError ( addPackageRequires super.shimbun [ diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix index 06c66787c3f1..5c71f117ea75 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-common-overrides.nix @@ -20,5 +20,22 @@ in yasnippet ] ); + + # requires optional dependency for OMEMO support. + jabber = super.jabber.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.mbedtls ]; + nativeBuildInputs = old.nativeBuildInputs ++ [ pkgs.pkg-config ]; + + # We need to run this in postInstall for package directory to become available + postInstall = + (old.postInstall or "") + + "\n" + + '' + pushd $out/share/emacs/site-lisp/elpa/jabber-*/src + make CC=$CC + rm -r $out/share/emacs/site-lisp/elpa/jabber-*/src + popd + ''; + }); # keep-sorted end } diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix index f870cacfbf89..093cb083cc8e 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-devel-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "adoc-mode"; ename = "adoc-mode"; - version = "0.8.0.0.20260221.220754"; + version = "0.9.0.0.20260612.26"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.8.0.0.20260221.220754.tar"; - sha256 = "19cn5vm963pygzi42r7zw0n7g1adipa0k8f8chwlwibhzwmx3vyz"; + url = "https://elpa.nongnu.org/nongnu-devel/adoc-mode-0.9.0.0.20260612.26.tar"; + sha256 = "0ivn3j21cn5xqd4bwr2razaxg2sljg18d70vwksgrb74zyz3lkxy"; }; packageRequires = [ ]; meta = { @@ -75,10 +75,10 @@ elpaBuild { pname = "aidermacs"; ename = "aidermacs"; - version = "1.6.0.20251203.181819"; + version = "1.9.0.20260719.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.6.0.20251203.181819.tar"; - sha256 = "0kyy5fw8397hcahm4wlvl51ch2fbrlw2r8arvcxflssngy7cbbaa"; + url = "https://elpa.nongnu.org/nongnu-devel/aidermacs-1.9.0.20260719.1.tar"; + sha256 = "1rian9r2vvdnrk0hqmrgpsp2lbi7ci5gr8jzg9ghgpkz7bjsa8w1"; }; packageRequires = [ compat @@ -121,10 +121,10 @@ elpaBuild { pname = "ample-theme"; ename = "ample-theme"; - version = "0.3.0.0.20240426.84530"; + version = "0.3.0.0.20260611.50"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/ample-theme-0.3.0.0.20240426.84530.tar"; - sha256 = "00h1za3qdqjgaxr2c3qlmz374gl9fhrgg7r453wvkz1fy6n9vp5i"; + url = "https://elpa.nongnu.org/nongnu-devel/ample-theme-0.3.0.0.20260611.50.tar"; + sha256 = "1r0sw8iwrpxwvpr3ijxadh0ldkpljyd9j9wviga7j9c2q9248xkw"; }; packageRequires = [ ]; meta = { @@ -142,10 +142,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.4.5.0.20251111.163545"; + version = "2.5.0.0.20260514.132017"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.4.5.0.20251111.163545.tar"; - sha256 = "09jghlf5bjiiah1qqvr1s3lkjqzywf9cxrfzpfq192ms1hzs1wmd"; + url = "https://elpa.nongnu.org/nongnu-devel/annotate-2.5.0.0.20260514.132017.tar"; + sha256 = "0rsgi0slvnjccv414f1229nm98yd9icla0py1nd11zqqi5n8a0c4"; }; packageRequires = [ ]; meta = { @@ -205,10 +205,10 @@ elpaBuild { pname = "apache-mode"; ename = "apache-mode"; - version = "2.2.0.0.20251120.174624"; + version = "2.2.0.0.20260618.15"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20251120.174624.tar"; - sha256 = "0f536bc064ykjajsgyxcbdjxch14wi2kkxhva9szi802l78zkdhh"; + url = "https://elpa.nongnu.org/nongnu-devel/apache-mode-2.2.0.0.20260618.15.tar"; + sha256 = "10n61089a40jh3n8ail15m7vy5k0lxgyw4jd31p4zihd45q4hhx1"; }; packageRequires = [ ]; meta = { @@ -269,10 +269,10 @@ elpaBuild { pname = "auto-dim-other-buffers"; ename = "auto-dim-other-buffers"; - version = "2.2.1.0.20250116.140242"; + version = "2.2.2.0.20260624.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.1.0.20250116.140242.tar"; - sha256 = "07v5n7d3whk79by6xwd1gak1m73k4zpcscwfminfidj3f6rmkj92"; + url = "https://elpa.nongnu.org/nongnu-devel/auto-dim-other-buffers-2.2.2.0.20260624.0.tar"; + sha256 = "1kpglnqss61dx9px0v2agbnfnjymjynslr31mpc73p6qjv0fqgcv"; }; packageRequires = [ ]; meta = { @@ -291,10 +291,10 @@ elpaBuild { pname = "autothemer"; ename = "autothemer"; - version = "0.2.18.0.20251114.41509"; + version = "0.2.18.0.20260620.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20251114.41509.tar"; - sha256 = "0ix8byl6fa2qpcjvcf93afbsk2f9frnsbq9mcnhxmx17l48fzl06"; + url = "https://elpa.nongnu.org/nongnu-devel/autothemer-0.2.18.0.20260620.7.tar"; + sha256 = "1awdmkxy2gdrk20j63k8fjclfsmnkx33hm55x636fmcrh2niqcg7"; }; packageRequires = [ dash ]; meta = { @@ -333,10 +333,10 @@ elpaBuild { pname = "bash-completion"; ename = "bash-completion"; - version = "3.2.1snapshot0.20260325.162703"; + version = "3.2.1snapshot0.20260325.20"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20260325.162703.tar"; - sha256 = "1w2ymxz5pcpdfxw2jaqqg5c8i1dkj4cp23y15sk80q9mfcyfmkxj"; + url = "https://elpa.nongnu.org/nongnu-devel/bash-completion-3.2.1snapshot0.20260325.20.tar"; + sha256 = "1ircxf1kgdjbrkx1i16z3lv62vbdsspyhl6hh589827031lsz0sj"; }; packageRequires = [ ]; meta = { @@ -354,10 +354,10 @@ elpaBuild { pname = "beancount"; ename = "beancount"; - version = "0.9.0.0.20251027.80859"; + version = "0.9.0.0.20260517.140330"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.0.20251027.80859.tar"; - sha256 = "19lklnmqpxzxgwdjb3wzaarkklxqswnl9ff11pg854rr7kivlmwl"; + url = "https://elpa.nongnu.org/nongnu-devel/beancount-0.9.0.0.20260517.140330.tar"; + sha256 = "0rziax9ci1vi5z6v686j7nmbvx8cym7zpi8479md52gpsd58daqn"; }; packageRequires = [ ]; meta = { @@ -501,10 +501,10 @@ elpaBuild { pname = "buttercup"; ename = "buttercup"; - version = "1.40.0.20260411.203013"; + version = "1.40.0.20260512.214133"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.40.0.20260411.203013.tar"; - sha256 = "13s30dv7vhzbm80f4brza2mk7lpf3l7ffbzbjv4ln2s8rgsh6g64"; + url = "https://elpa.nongnu.org/nongnu-devel/buttercup-1.40.0.20260512.214133.tar"; + sha256 = "0fays43ygmxp14gsv75zgwmhg2iycl758684g3b3xvgiq8k6dlw8"; }; packageRequires = [ ]; meta = { @@ -543,10 +543,10 @@ elpaBuild { pname = "caml"; ename = "caml"; - version = "4.10snapshot0.20250227.123439"; + version = "4.10snapshot0.20250227.11"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/caml-4.10snapshot0.20250227.123439.tar"; - sha256 = "1bg8vf7sh6f7s7jghfyqhb5da38kr8f3bbizzy7xfim2jy1i4ci7"; + url = "https://elpa.nongnu.org/nongnu-devel/caml-4.10snapshot0.20250227.11.tar"; + sha256 = "06r646gvwkqmsiiln434c6x6w17f8in0rqaymxpgyfhrxmx6skbb"; }; packageRequires = [ ]; meta = { @@ -566,10 +566,10 @@ elpaBuild { pname = "casual"; ename = "casual"; - version = "2.16.0.0.20260415.182614"; + version = "2.17.1.0.20260718.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/casual-2.16.0.0.20260415.182614.tar"; - sha256 = "0a0ba4b506pbv4nff8qspqjfzlfng77i3nqs3vwg1ybz6rhj7cwj"; + url = "https://elpa.nongnu.org/nongnu-devel/casual-2.17.1.0.20260718.0.tar"; + sha256 = "031vpnhf498lic2ngh9bmg0917561dsnrn3apsdv0id3rl7vsd35"; }; packageRequires = [ csv-mode @@ -619,10 +619,10 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.22.0snapshot0.20260420.43551"; + version = "2.0.1snapshot0.20260718.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cider-1.22.0snapshot0.20260420.43551.tar"; - sha256 = "14vhww7sm3hzvrag671m8l4sbh4mi4iy395vnqhpyn6wxp0z9m91"; + url = "https://elpa.nongnu.org/nongnu-devel/cider-2.0.1snapshot0.20260718.7.tar"; + sha256 = "1y5bp14z67xky44nv419hwjry2n0md2ff54pi8mnfffcd0ikvp97"; }; packageRequires = [ clojure-mode @@ -649,10 +649,10 @@ elpaBuild { pname = "clojure-mode"; ename = "clojure-mode"; - version = "5.23.0.0.20260325.143544"; + version = "5.23.0.0.20260709.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.23.0.0.20260325.143544.tar"; - sha256 = "0rapsgj8kxnf7c9zvpjn9adjw7gxb9q3bpxwv1r610l8gdz9haj5"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-mode-5.23.0.0.20260709.7.tar"; + sha256 = "0rw17p4kgifzyxz393say6dbv5m5csvfwbyj9l96cyi9x71llz19"; }; packageRequires = [ ]; meta = { @@ -670,10 +670,10 @@ elpaBuild { pname = "clojure-ts-mode"; ename = "clojure-ts-mode"; - version = "0.6.0.0.20260325.210727"; + version = "0.6.0.0.20260709.48"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0.0.20260325.210727.tar"; - sha256 = "06fi1l2dzd9gbkjafvnmhmhcc9i5iwlk5kgfbcavm8a9cvfrdv1q"; + url = "https://elpa.nongnu.org/nongnu-devel/clojure-ts-mode-0.6.0.0.20260709.48.tar"; + sha256 = "0ia909an1q6zig3ysvnjf6nrv0gyz7jm7k3xzqfnqb0idm0sllx7"; }; packageRequires = [ ]; meta = { @@ -712,10 +712,10 @@ elpaBuild { pname = "cond-let"; ename = "cond-let"; - version = "0.2.2.0.20260420.135245"; + version = "1.1.3.0.20260701.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cond-let-0.2.2.0.20260420.135245.tar"; - sha256 = "1zm81zgmf5k6akh4pngjln1xp7p561h97hkcrsbc78v7nq48x8kb"; + url = "https://elpa.nongnu.org/nongnu-devel/cond-let-1.1.3.0.20260701.0.tar"; + sha256 = "1swmpvpx2437js3vn93vnfj5aqnwaf1xxw1ynyr0i2g4nr27qc7s"; }; packageRequires = [ ]; meta = { @@ -735,10 +735,10 @@ elpaBuild { pname = "consult-flycheck"; ename = "consult-flycheck"; - version = "1.1.0.20260330.61817"; + version = "1.2.0.20260628.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.1.0.20260330.61817.tar"; - sha256 = "0qibwl60kwyj3azpz7zph3frb8ia7ll7qr70mfj6brdng0wdc9b1"; + url = "https://elpa.nongnu.org/nongnu-devel/consult-flycheck-1.2.0.20260628.1.tar"; + sha256 = "0vffihzsnpnjcfkj2gc9qyx4hh274zhfq3nsgddygsl7dcbjv8xp"; }; packageRequires = [ consult @@ -785,10 +785,10 @@ elpaBuild { pname = "crux"; ename = "crux"; - version = "0.6.0snapshot0.20260315.62204"; + version = "0.6.0snapshot0.20260315.12"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20260315.62204.tar"; - sha256 = "0pk55r3yr4nl43r61ay29rhx0kw77k0490w3j2gq60h89b605rjm"; + url = "https://elpa.nongnu.org/nongnu-devel/crux-0.6.0snapshot0.20260315.12.tar"; + sha256 = "09anj5a7p0waqyg0cng6x8231078xk4p6ig0ayancspbgyi9yp4d"; }; packageRequires = [ ]; meta = { @@ -807,10 +807,10 @@ elpaBuild { pname = "csv2ledger"; ename = "csv2ledger"; - version = "1.5.4.0.20250417.171625"; + version = "1.5.5.0.20260621.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.4.0.20250417.171625.tar"; - sha256 = "1m72znfi5hd9pwavc99g8amxwc0jdyly7gsww2aq0fw4q971kiaf"; + url = "https://elpa.nongnu.org/nongnu-devel/csv2ledger-1.5.5.0.20260621.0.tar"; + sha256 = "0mvyzsr02allsf6a6ac4b8cb1cbzajcs4v082qnklf7dwmcya8dg"; }; packageRequires = [ csv-mode ]; meta = { @@ -850,10 +850,10 @@ elpaBuild { pname = "cycle-at-point"; ename = "cycle-at-point"; - version = "0.2.0.20260111.124011"; + version = "0.2.0.20260502.92709"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20260111.124011.tar"; - sha256 = "0jnd8r1xpyyklbpvy18mxz3slcl0jz6zi41vymzgmv9a6xig5cvs"; + url = "https://elpa.nongnu.org/nongnu-devel/cycle-at-point-0.2.0.20260502.92709.tar"; + sha256 = "0nyk8p55xjkfzxyrpgz7dy2k7scgdi3h4x9hiw1xcrbcfxnlaxks"; }; packageRequires = [ recomplete ]; meta = { @@ -892,10 +892,10 @@ elpaBuild { pname = "dart-mode"; ename = "dart-mode"; - version = "1.0.7.0.20251203.195437"; + version = "1.0.7.0.20260619.52"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20251203.195437.tar"; - sha256 = "1l4p4ybw69ni2vx016bi2nz3kjqziy6nk3vv1nr9gjbslpmkck5k"; + url = "https://elpa.nongnu.org/nongnu-devel/dart-mode-1.0.7.0.20260619.52.tar"; + sha256 = "114dh5k5b1b7gkbqn96k2ncgsav05hcgz6304br2czkdx0xcacid"; }; packageRequires = [ ]; meta = { @@ -914,10 +914,10 @@ elpaBuild { pname = "datetime"; ename = "datetime"; - version = "0.10.3snapshot0.20250203.204701"; + version = "0.10.3snapshot0.20250203.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.3snapshot0.20250203.204701.tar"; - sha256 = "0l9z5bqbxbn456rin27x4zfa5pjvqjr2vhzxpgssrndm7bprm614"; + url = "https://elpa.nongnu.org/nongnu-devel/datetime-0.10.3snapshot0.20250203.0.tar"; + sha256 = "0d3vi2fg17rv4id78jdq9xv44skc1ndkajq9plf6x9bsgbbf3mcz"; }; packageRequires = [ extmap ]; meta = { @@ -978,10 +978,10 @@ elpaBuild { pname = "devil"; ename = "devil"; - version = "0.7.0beta3.0.20240129.2809"; + version = "0.7.0beta3.0.20240129.11"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.2809.tar"; - sha256 = "1fhvp1kvvli5g9a3575bsa8zyfnf1q0p5wn15819zvncjp1912nl"; + url = "https://elpa.nongnu.org/nongnu-devel/devil-0.7.0beta3.0.20240129.11.tar"; + sha256 = "174wkr002wif8h62dlj34c5h7a1a52zs097n8flncm014l6m3y3i"; }; packageRequires = [ ]; meta = { @@ -999,10 +999,10 @@ elpaBuild { pname = "diff-ansi"; ename = "diff-ansi"; - version = "0.2.0.20260108.151229"; + version = "0.2.0.20260713.62"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20260108.151229.tar"; - sha256 = "0b1i031fyjszinpngz804di4fng6i71pcmckq05z75p3gjjfyx2j"; + url = "https://elpa.nongnu.org/nongnu-devel/diff-ansi-0.2.0.20260713.62.tar"; + sha256 = "0gxf2cjk96c5kx80qsn4w9ckg738zis2hhvbp26dgzkppmwxdwyk"; }; packageRequires = [ ]; meta = { @@ -1021,10 +1021,10 @@ elpaBuild { pname = "dirvish"; ename = "dirvish"; - version = "2.3.0.0.20250504.80741"; + version = "2.3.0.0.20260716.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20250504.80741.tar"; - sha256 = "0h8ap8bnqy2czvgkc71l49ms3kwk8lciz0ydzi2yy5xgh5pvs71k"; + url = "https://elpa.nongnu.org/nongnu-devel/dirvish-2.3.0.0.20260716.9.tar"; + sha256 = "0yr5x846v1zynyacfpgn8zhhrzsw5qw3fqnr1w9cscljzfwlajs8"; }; packageRequires = [ compat ]; meta = { @@ -1084,10 +1084,10 @@ elpaBuild { pname = "dracula-theme"; ename = "dracula-theme"; - version = "1.8.3.0.20260224.145537"; + version = "1.8.3.0.20260701.10"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.3.0.20260224.145537.tar"; - sha256 = "0g83cgcackysjh5x35j0vniqyysk1lgijk0mhmgnwnhm2fji1b74"; + url = "https://elpa.nongnu.org/nongnu-devel/dracula-theme-1.8.3.0.20260701.10.tar"; + sha256 = "0m26r1swffj2ax3rl3yikgqi2rq796y8vwazisfsb1lsx06hwyyn"; }; packageRequires = [ ]; meta = { @@ -1256,10 +1256,10 @@ elpaBuild { pname = "eldoc-mouse"; ename = "eldoc-mouse"; - version = "3.0.7.0.20260402.102509"; + version = "3.0.8.0.20260612.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/eldoc-mouse-3.0.7.0.20260402.102509.tar"; - sha256 = "1frp7dkqf1wzlfijlqra1himvl5qba0cj3s172kh8yyncpvjvnqj"; + url = "https://elpa.nongnu.org/nongnu-devel/eldoc-mouse-3.0.8.0.20260612.0.tar"; + sha256 = "0w0c30vxqbca8zgj6zql4lxqfj2nz1xh9lcllzz09k2pydki0f4n"; }; packageRequires = [ eglot @@ -1297,6 +1297,56 @@ }; } ) { }; + elfeed = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elfeed"; + ename = "elfeed"; + version = "4.1.0.0.20260714.9"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/elfeed-4.1.0.0.20260714.9.tar"; + sha256 = "05y0j3hmz1ch2fsv4gryf6d4ygk1xc5vh6zi5fn7ydyxkp49pnqr"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/elfeed.html"; + license = lib.licenses.free; + }; + } + ) { }; + elfeed-web = callPackage ( + { + compat, + elfeed, + elpaBuild, + fetchurl, + lib, + simple-httpd, + }: + elpaBuild { + pname = "elfeed-web"; + ename = "elfeed-web"; + version = "4.0.0.0.20260628.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/elfeed-web-4.0.0.0.20260628.4.tar"; + sha256 = "0vwd5k1h47xcj6jz5wqcppm9cv2ywiliq4x3mszbharqklw83wmx"; + }; + packageRequires = [ + compat + elfeed + simple-httpd + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/elfeed-web.html"; + license = lib.licenses.free; + }; + } + ) { }; elixir-mode = callPackage ( { elpaBuild, @@ -1348,10 +1398,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.3.6.0.20260401.122028"; + version = "4.4.1.0.20260601.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.3.6.0.20260401.122028.tar"; - sha256 = "0n9m33wlygpdj8id31sfxkj328j1dzf1gzkwkvr99ncvcn6qr0l6"; + url = "https://elpa.nongnu.org/nongnu-devel/emacsql-4.4.1.0.20260601.0.tar"; + sha256 = "0fnj6ysv7a0pwcklr9rdb1fybfpv0z6gw60r8jgjgb0y2j4204rz"; }; packageRequires = [ ]; meta = { @@ -1381,6 +1431,27 @@ }; } ) { }; + eprolog = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eprolog"; + ename = "eprolog"; + version = "0.3.2.0.20260308.150317"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/eprolog-0.3.2.0.20260308.150317.tar"; + sha256 = "0d5y5dz602npmfxpp9cbrg5dp6axb97v8v9nagindkmh3m7yymkz"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/eprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; esxml = callPackage ( { cl-lib ? null, @@ -1415,10 +1486,10 @@ elpaBuild { pname = "evil"; ename = "evil"; - version = "1.15.0.0.20251108.13841"; + version = "1.15.0.0.20260603.296"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20251108.13841.tar"; - sha256 = "0vh9pmwsapdg2pn1cnp03jv9y35ddi57niwacrikn12g7niwh8jn"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-1.15.0.0.20260603.296.tar"; + sha256 = "08l0w089647g8h61wfpcjs0zwcrx3dxjp14shdw4k7p0g6ijrdxs"; }; packageRequires = [ cl-lib @@ -1479,6 +1550,28 @@ }; } ) { }; + evil-collection = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-collection"; + ename = "evil-collection"; + version = "3.0.0.0.20260719.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/evil-collection-3.0.0.0.20260719.2.tar"; + sha256 = "0xccbmkxzqdw5nqzaink8yab4ga3j0cg7djgiqrzdcd2cc44vqgx"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/evil-collection.html"; + license = lib.licenses.free; + }; + } + ) { }; evil-emacs-cursor-model-mode = callPackage ( { elpaBuild, @@ -1685,10 +1778,10 @@ elpaBuild { pname = "evil-nerd-commenter"; ename = "evil-nerd-commenter"; - version = "3.6.1.0.20240216.114656"; + version = "3.6.1.0.20260507.41457"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter-3.6.1.0.20240216.114656.tar"; - sha256 = "0wav3c5k2iz4xzrkwj7nj3xg5zp9nldynxag2gl7p3nkz4scg49r"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-nerd-commenter-3.6.1.0.20260507.41457.tar"; + sha256 = "023gd3br1i6pvbnan83c9825jfc20q1w5xn472qsi0035lmi6wj2"; }; packageRequires = [ ]; meta = { @@ -1703,16 +1796,20 @@ evil, fetchurl, lib, + shift-number, }: elpaBuild { pname = "evil-numbers"; ename = "evil-numbers"; - version = "0.7.0.20260102.82951"; + version = "0.8.0.20260103.85055"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.7.0.20260102.82951.tar"; - sha256 = "03nxzdaxnlfmn6w3sgwixmqqv275rskxkjc93zwac55i9h3xn0kb"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-numbers-0.8.0.20260103.85055.tar"; + sha256 = "1kr89paj83kiy27yd9rbq0xgda7xrifnxh5nyv3lik4sqd8ds7sm"; }; - packageRequires = [ evil ]; + packageRequires = [ + evil + shift-number + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/evil-numbers.html"; license = lib.licenses.free; @@ -1729,10 +1826,10 @@ elpaBuild { pname = "evil-surround"; ename = "evil-surround"; - version = "1.0.4.0.20240325.85222"; + version = "1.0.4.0.20260607.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/evil-surround-1.0.4.0.20240325.85222.tar"; - sha256 = "0ji4pp9dp0284km585a3iay60m9v0xzsn42g3fw431vadbs0y5ym"; + url = "https://elpa.nongnu.org/nongnu-devel/evil-surround-1.0.4.0.20260607.25.tar"; + sha256 = "0q14djyjciywxh7sb4ljgwfv09233nr2jprkk5h4pjn4a3ymsjv3"; }; packageRequires = [ evil ]; meta = { @@ -1798,10 +1895,10 @@ elpaBuild { pname = "exec-path-from-shell"; ename = "exec-path-from-shell"; - version = "2.2.0.20260423.183347"; + version = "2.2.0.20260619.14"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20260423.183347.tar"; - sha256 = "0s80hah6795p2k97qpnqj3baaw1cy9c54g38vbcczq4mn8faimk6"; + url = "https://elpa.nongnu.org/nongnu-devel/exec-path-from-shell-2.2.0.20260619.14.tar"; + sha256 = "197f0zlb9lkllssmzvc3zllsxn7i1glpvsm75aa54hylzyfiys1j"; }; packageRequires = [ ]; meta = { @@ -1819,10 +1916,10 @@ elpaBuild { pname = "extmap"; ename = "extmap"; - version = "1.3.1snapshot0.20250203.193959"; + version = "1.3.1snapshot0.20250203.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.1snapshot0.20250203.193959.tar"; - sha256 = "16sfa2zv0g7dz1zflg848dh643c8vfrb93blqvnd1vmlmf3bsyqy"; + url = "https://elpa.nongnu.org/nongnu-devel/extmap-1.3.1snapshot0.20250203.2.tar"; + sha256 = "07davhhx3nq15b3i7mfckxy9cnsq12y5cds8m0m4bw61sz8svxvi"; }; packageRequires = [ ]; meta = { @@ -1841,10 +1938,10 @@ elpaBuild { pname = "fedi"; ename = "fedi"; - version = "0.3.0.20260223.132625"; + version = "0.4.0.20260509.80113"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/fedi-0.3.0.20260223.132625.tar"; - sha256 = "15cvwfyvixac3vvfjnmz0fvfzk5iq9sndnryzi3zlp3njjjds0wv"; + url = "https://elpa.nongnu.org/nongnu-devel/fedi-0.4.0.20260509.80113.tar"; + sha256 = "0c3zn9cb320zqy3p339npzlhp8z7jwd31l8p77hix6cnczx66z7y"; }; packageRequires = [ markdown-mode ]; meta = { @@ -1866,10 +1963,10 @@ elpaBuild { pname = "fj"; ename = "fj"; - version = "0.34.0.20260327.90645"; + version = "0.37.0.20260509.74153"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/fj-0.34.0.20260327.90645.tar"; - sha256 = "0wigq0746npxkbqkqdarw4l89vk04ywd7cx01irc3v7ci9s192xk"; + url = "https://elpa.nongnu.org/nongnu-devel/fj-0.37.0.20260509.74153.tar"; + sha256 = "0fwklcgc11lynkfp00wwjrsbdkxsdhi5vis2qcmlcnh5l4lwmi7y"; }; packageRequires = [ fedi @@ -1883,6 +1980,27 @@ }; } ) { }; + flamegraph = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flamegraph"; + ename = "flamegraph"; + version = "0.2.0.20260609.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/flamegraph-0.2.0.20260609.2.tar"; + sha256 = "09akb8akgvrh8gigchalkb29ipfa90b7r8li9vxdh7d7ginq5mw6"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/flamegraph.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -1941,10 +2059,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "36.0.0.20260320.171504"; + version = "37.0.0.20260720.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/flycheck-36.0.0.20260320.171504.tar"; - sha256 = "1pzwhry986dfkvibfdqwb6nllmmn2yc3kpzgd046jnyq25xikgig"; + url = "https://elpa.nongnu.org/nongnu-devel/flycheck-37.0.0.20260720.8.tar"; + sha256 = "1d7pb6kqz5s862d43l0ywzvhcd15xj2y8ixgc9zy42yz3rwnqlbj"; }; packageRequires = [ seq ]; meta = { @@ -2142,10 +2260,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.32.0.20251220.230156"; + version = "0.33.1.0.20260718.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.32.0.20251220.230156.tar"; - sha256 = "1a6l6b659h9mf0dqc6yvq2pc75x3rw3ysn6k9ap5pyrsdz7286f5"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-0.33.1.0.20260718.4.tar"; + sha256 = "14sipclbj37v0f0yc1pk0fl1p704f1gzpd3r21zyh3wkgfj2vjf5"; }; packageRequires = [ project ]; meta = { @@ -2186,10 +2304,10 @@ elpaBuild { pname = "geiser-chibi"; ename = "geiser-chibi"; - version = "0.17.0.20240521.155242"; + version = "0.17.0.20260706.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20240521.155242.tar"; - sha256 = "0xiaikj274ypfj546snxpi6h30jlc9hifhnw8ljj1zxsafr1wzqq"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-chibi-0.17.0.20260706.3.tar"; + sha256 = "08rhpfr9zsgdmz8j4f8va07ww7lk9kbxcpnm3wxjl940n56nhji9"; }; packageRequires = [ geiser ]; meta = { @@ -2275,10 +2393,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.3.0.20240920.3540"; + version = "0.28.5.0.20260516.1909"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.3.0.20240920.3540.tar"; - sha256 = "1ijrhz86nva194qsdch2zm9v4bzdppcg3vslnh03ss4f6qkcrfzz"; + url = "https://elpa.nongnu.org/nongnu-devel/geiser-guile-0.28.5.0.20260516.1909.tar"; + sha256 = "1pvpji1py4ghxkpvxf08fpdg8j37qcn2lc8dc9i47b7b9w5x9bpg"; }; packageRequires = [ geiser @@ -2418,10 +2536,10 @@ elpaBuild { pname = "git-modes"; ename = "git-modes"; - version = "1.4.8.0.20260101.183425"; + version = "1.5.0.0.20260601.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.4.8.0.20260101.183425.tar"; - sha256 = "1lw8cwrg66gw4pxbf6kwzglddc9jszz55nw1z0hpaiaz24yi17lg"; + url = "https://elpa.nongnu.org/nongnu-devel/git-modes-1.5.0.0.20260601.0.tar"; + sha256 = "1wwqr0w7vdspv0lkznh6srb0mil0ydirr7mb6wy1yacpz5mlzvwz"; }; packageRequires = [ compat ]; meta = { @@ -2512,10 +2630,10 @@ elpaBuild { pname = "gnuplot"; ename = "gnuplot"; - version = "0.11.0.20260330.71827"; + version = "0.12.0.20260628.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.11.0.20260330.71827.tar"; - sha256 = "16m7jnsd9rv7f7fnbcm8sbphb21sl63igpzcbki27rcvhp3r5y4i"; + url = "https://elpa.nongnu.org/nongnu-devel/gnuplot-0.12.0.20260628.3.tar"; + sha256 = "1gmivwm8xv4x3gab3xnlxnjsqxivb9xdkk6gb8nc6a3rl87py19w"; }; packageRequires = [ compat ]; meta = { @@ -2533,10 +2651,10 @@ elpaBuild { pname = "go-mode"; ename = "go-mode"; - version = "1.6.0.0.20250311.20239"; + version = "1.6.0.0.20260529.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/go-mode-1.6.0.0.20250311.20239.tar"; - sha256 = "1viwxqbp6jdhbmapjgcgrjyrzn4m2r68b5vb0814y3w4gi55rzgq"; + url = "https://elpa.nongnu.org/nongnu-devel/go-mode-1.6.0.0.20260529.24.tar"; + sha256 = "0m69khwj17fp6fhl6xgqsmxqc3729x679rpxph7gv5hgdpqks7ha"; }; packageRequires = [ ]; meta = { @@ -2619,10 +2737,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.9.4.0.20260422.5643"; + version = "0.9.9.5.0.20260715.65"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.4.0.20260422.5643.tar"; - sha256 = "07drqy9aksqsvfgg7a6r7bp430qccs6bngrs367dp0vr46mx6kw0"; + url = "https://elpa.nongnu.org/nongnu-devel/gptel-0.9.9.5.0.20260715.65.tar"; + sha256 = "0ax0i8v68ibx4mh6pyz8lqjrkjw7zz9chwkricmjkcn7kha3l6l2"; }; packageRequires = [ compat @@ -2643,10 +2761,10 @@ elpaBuild { pname = "graphql-mode"; ename = "graphql-mode"; - version = "1.0.0.0.20260330.140853"; + version = "1.0.0.0.20260524.82344"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20260330.140853.tar"; - sha256 = "07rwy23fglwq5h8x16syvgl9nb0lg5gqfx4d1qqls0c6gha7pal1"; + url = "https://elpa.nongnu.org/nongnu-devel/graphql-mode-1.0.0.0.20260524.82344.tar"; + sha256 = "0zr62g3jhf47d7cjjcx3a8m1kqp4h14k4k7jdqqiivg6hc1k43qv"; }; packageRequires = [ ]; meta = { @@ -2750,10 +2868,10 @@ elpaBuild { pname = "haskell-mode"; ename = "haskell-mode"; - version = "17.5.0.20260206.105045"; + version = "17.5.0.20260619.67"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20260206.105045.tar"; - sha256 = "012w356crya0ik9p16xlkykk1xv9yk4w3k029xrmjhjw1jqvkybd"; + url = "https://elpa.nongnu.org/nongnu-devel/haskell-mode-17.5.0.20260619.67.tar"; + sha256 = "1v4ksswhi8d17did2fz3j3yqm30jd0yqj83h2093dqnhyphha9dl"; }; packageRequires = [ ]; meta = { @@ -2816,10 +2934,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.6.0.20260424.61638"; + version = "4.0.7.0.20260716.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.6.0.20260424.61638.tar"; - sha256 = "1h45ffmj2myiv1yg0gy1kfxwky41xfzdzy4vhzc67w1a6g6kh9jq"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-4.0.7.0.20260716.25.tar"; + sha256 = "0g3qmffjwfyrw3iqwrp2ai8pm7q6wan2x0w62vlbacvkziqy7vgf"; }; packageRequires = [ helm-core @@ -2841,10 +2959,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.6.0.20260424.61638"; + version = "4.0.7.0.20260716.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.6.0.20260424.61638.tar"; - sha256 = "1484qsigbybnxlcb0jrx8v62fa7dqv7szia7p1lghp3q76cjlfv7"; + url = "https://elpa.nongnu.org/nongnu-devel/helm-core-4.0.7.0.20260716.25.tar"; + sha256 = "0qrcc87av7s3xmrl9290rsjljlh68hdh4wyrfjk0g988kpdpbyqx"; }; packageRequires = [ async ]; meta = { @@ -2974,10 +3092,10 @@ elpaBuild { pname = "hyperdrive"; ename = "hyperdrive"; - version = "0.6pre0.20251120.145618"; + version = "0.6pre0.20251120.26"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20251120.145618.tar"; - sha256 = "1s57c6m6fh593b9ax5skc5v1k3l0w983iq6mp3vx2a6g276qa44l"; + url = "https://elpa.nongnu.org/nongnu-devel/hyperdrive-0.6pre0.20251120.26.tar"; + sha256 = "0j8zglxc2bjvbfdzw9lzy5lksda6hq6xjwcmiyg489yfrx1n5gk5"; }; packageRequires = [ compat @@ -3052,10 +3170,10 @@ elpaBuild { pname = "idris-mode"; ename = "idris-mode"; - version = "1.1.0.0.20260209.110723"; + version = "1.1.0.0.20260506.203306"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20260209.110723.tar"; - sha256 = "19rw6k40qkn4b11vhr95w71rdfqdmrr27ga8vdj7imb812wcdqyy"; + url = "https://elpa.nongnu.org/nongnu-devel/idris-mode-1.1.0.0.20260506.203306.tar"; + sha256 = "11mcszs9l8cw90v1kp4dnsjw3y86dspbjbb87fz7za8yrizki0id"; }; packageRequires = [ cl-lib @@ -3098,10 +3216,10 @@ elpaBuild { pname = "inf-clojure"; ename = "inf-clojure"; - version = "3.4.0.0.20260227.65854"; + version = "3.4.0.0.20260507.60144"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.4.0.0.20260227.65854.tar"; - sha256 = "1115nzzddmwz8rxvln6lgn0halnxjdlf6cgjprfnjm60ajfa861h"; + url = "https://elpa.nongnu.org/nongnu-devel/inf-clojure-3.4.0.0.20260507.60144.tar"; + sha256 = "031kf4yqnvggrk9flxcfwgz3ps2wpl6sxsvdkwxymdaahywv5yp2"; }; packageRequires = [ clojure-mode ]; meta = { @@ -3161,10 +3279,10 @@ elpaBuild { pname = "isl"; ename = "isl"; - version = "1.6.0.20260414.62054"; + version = "1.7.0.20260524.35203"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/isl-1.6.0.20260414.62054.tar"; - sha256 = "149fcgwl3r5wiw8zwb1cgy4g96nv90a8wpjk8qh0dgcdz1vgsiqq"; + url = "https://elpa.nongnu.org/nongnu-devel/isl-1.7.0.20260524.35203.tar"; + sha256 = "1hr6nngd0z266vwz2h76xzvjx5zgy8ljjf04q6338kmzb16m24wr"; }; packageRequires = [ ]; meta = { @@ -3225,17 +3343,21 @@ elpaBuild, fetchurl, fsm, + keymap-popup, lib, }: elpaBuild { pname = "jabber"; ename = "jabber"; - version = "0.10.5.0.20260423.192938"; + version = "0.12.2.0.20260715.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.10.5.0.20260423.192938.tar"; - sha256 = "1q79iv4znishj6rdz1m76r0c8h72i2g47xfh6xfw2gqxbkkyilv3"; + url = "https://elpa.nongnu.org/nongnu-devel/jabber-0.12.2.0.20260715.2.tar"; + sha256 = "1d07y9qax62hgyxmcyfdk8w30y0p7qn4x0al2qzh1k0slvw12yjy"; }; - packageRequires = [ fsm ]; + packageRequires = [ + fsm + keymap-popup + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/jabber.html"; license = lib.licenses.free; @@ -3314,10 +3436,10 @@ elpaBuild { pname = "julia-mode"; ename = "julia-mode"; - version = "1.1.0.0.20260226.104209"; + version = "1.1.0.0.20260529.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.1.0.0.20260226.104209.tar"; - sha256 = "0ks6a1h9mfcc5fjjs6dwg0gv4w5l56kifxl59gpxfn3ahca3y2z0"; + url = "https://elpa.nongnu.org/nongnu-devel/julia-mode-1.1.0.0.20260529.7.tar"; + sha256 = "0h0aahyw658zqkzk7h39lsc5vmab4b9jzkqrmwn3q5zgnqy5nfcr"; }; packageRequires = [ ]; meta = { @@ -3329,6 +3451,7 @@ keycast = callPackage ( { compat, + cond-let, elpaBuild, fetchurl, lib, @@ -3336,12 +3459,15 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.4.7.0.20260101.183551"; + version = "1.4.8.0.20260601.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.7.0.20260101.183551.tar"; - sha256 = "1p0kzw0ciygp5xgyv2c7z9byn7x1x8zdrd7x3mlizjh3mpmwyl3k"; + url = "https://elpa.nongnu.org/nongnu-devel/keycast-1.4.8.0.20260601.0.tar"; + sha256 = "1b27wp1y2c0sh29f7chpks3zmdxksg8v8xyy9r62r7mdy2aylm2z"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + cond-let + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/keycast.html"; license = lib.licenses.free; @@ -3380,10 +3506,10 @@ elpaBuild { pname = "lem"; ename = "lem"; - version = "0.24.0.20250806.92416"; + version = "0.25.0.20260509.75856"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/lem-0.24.0.20250806.92416.tar"; - sha256 = "0hamh1xvwir0dhf91vn0fch39hxs7k443q4x9anfv44006fsgd3f"; + url = "https://elpa.nongnu.org/nongnu-devel/lem-0.25.0.20260509.75856.tar"; + sha256 = "0l6kg0y6y268hgyifxbkwjx1wk1d5d6wq86kykfq9fngwy8d5359"; }; packageRequires = [ fedi @@ -3405,10 +3531,10 @@ elpaBuild { pname = "llama"; ename = "llama"; - version = "1.0.4.0.20260301.125328"; + version = "1.0.5.0.20260601.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.4.0.20260301.125328.tar"; - sha256 = "04g5qakdxc4dfarkiv4d4jmfw609hbfxad1582aykfrzqngma2sd"; + url = "https://elpa.nongnu.org/nongnu-devel/llama-1.0.5.0.20260601.0.tar"; + sha256 = "0fv7agjcfj59wbis1sw175j6v36zdg0qp84dkv1l3ql6fixcwqh1"; }; packageRequires = [ compat ]; meta = { @@ -3429,10 +3555,10 @@ elpaBuild { pname = "logview"; ename = "logview"; - version = "0.19.4snapshot0.20260218.201306"; + version = "0.19.4snapshot0.20260218.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.4snapshot0.20260218.201306.tar"; - sha256 = "1f49zs4w4wmn7famsc3ay8n7834c8zk2z3xmw74sk3744ygrc8d3"; + url = "https://elpa.nongnu.org/nongnu-devel/logview-0.19.4snapshot0.20260218.1.tar"; + sha256 = "1z9qplw6gbkvq5dmh2pwiwjva36bzy2dcfc4xrc79l1m0c0nffks"; }; packageRequires = [ compat @@ -3458,10 +3584,10 @@ elpaBuild { pname = "loopy"; ename = "loopy"; - version = "0.15.0.0.20260312.10626"; + version = "0.16.1.0.20260718.10"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.15.0.0.20260312.10626.tar"; - sha256 = "1s16v7g2lszhq3qxp9fyfqk0f8l1x4599zgvbnplnamll0jsi7z3"; + url = "https://elpa.nongnu.org/nongnu-devel/loopy-0.16.1.0.20260718.10.tar"; + sha256 = "1gcw2if57rf30n0clxjfg372zb41nkrbx2q1ygh792l1cxlhbr51"; }; packageRequires = [ compat @@ -3486,10 +3612,10 @@ elpaBuild { pname = "loopy-dash"; ename = "loopy-dash"; - version = "0.13.0.0.20260312.12155"; + version = "0.13.0.0.20260718.11"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20260312.12155.tar"; - sha256 = "1rg98wgrh5s6slafz8g8piazz04pa6fwiymgpic6hcrmf842fgpy"; + url = "https://elpa.nongnu.org/nongnu-devel/loopy-dash-0.13.0.0.20260718.11.tar"; + sha256 = "0ph9w0505yljnaiykmas8hjfj0d4rnbxv7xdw3j5aglffshl626z"; }; packageRequires = [ dash @@ -3585,10 +3711,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.5.0.0.20260422.220622"; + version = "4.6.0.0.20260718.46"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-4.5.0.0.20260422.220622.tar"; - sha256 = "1sm2ixy8hnamzvapy4i2j58ydharg47xb3s1981yr2d948dl2kxd"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-4.6.0.0.20260718.46.tar"; + sha256 = "1ln6p4y19z2j2x9hj63v4p5d9kl83vzw993bwirbljf59gwn60qz"; }; packageRequires = [ compat @@ -3618,10 +3744,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.5.0.0.20260422.220622"; + version = "4.6.0.0.20260718.46"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.5.0.0.20260422.220622.tar"; - sha256 = "13hzbc26wi6llab43gy8m6jpnm5faji7bqk5xlaxwinfqhzjfb2a"; + url = "https://elpa.nongnu.org/nongnu-devel/magit-section-4.6.0.0.20260718.46.tar"; + sha256 = "02glfja6slz17qv3qzrwjz32a5j3yqj135z430nm2bz015c4k2gv"; }; packageRequires = [ compat @@ -3644,10 +3770,10 @@ elpaBuild { pname = "markdown-mode"; ename = "markdown-mode"; - version = "2.9alpha0.20260423.150805"; + version = "2.9alpha0.20260425.11"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260423.150805.tar"; - sha256 = "1ap384fyxbny1pn59grjj6x8y29hcfl1vlhim4r177j2killr4sh"; + url = "https://elpa.nongnu.org/nongnu-devel/markdown-mode-2.9alpha0.20260425.11.tar"; + sha256 = "0gfaxz089cm7rzwdz9dva4kz8i1cndlq67svcb0fnyca03p6lgkr"; }; packageRequires = [ ]; meta = { @@ -3667,10 +3793,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "2.0.16.0.20260406.85635"; + version = "2.0.17.0.20260509.74935"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.16.0.20260406.85635.tar"; - sha256 = "0wlb1pd08m0bhn5fjxynhq285z7c210k5i8g08wj7b5gsjxmqqkx"; + url = "https://elpa.nongnu.org/nongnu-devel/mastodon-2.0.17.0.20260509.74935.tar"; + sha256 = "1i656xma6mw8fis91fwvzz9c1fpihxcgpwx78vm10k939j1ghhpg"; }; packageRequires = [ persist @@ -3742,10 +3868,10 @@ elpaBuild { pname = "meow"; ename = "meow"; - version = "1.5.0.0.20250914.165407"; + version = "1.5.0.0.20260714.67"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20250914.165407.tar"; - sha256 = "02wq0az10vqa7m55mga89aipjfqdwbw83rrf0xdyzc1f1r8841bm"; + url = "https://elpa.nongnu.org/nongnu-devel/meow-1.5.0.0.20260714.67.tar"; + sha256 = "1w91jlbpp37p4c11z15njvn8icd78hhwkldx70d6y28ngk14q9g3"; }; packageRequires = [ ]; meta = { @@ -3784,10 +3910,10 @@ elpaBuild { pname = "moe-theme"; ename = "moe-theme"; - version = "1.1.0.0.20260304.151933"; + version = "1.1.0.0.20260515.84137"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20260304.151933.tar"; - sha256 = "1chfka5hgda9bclgvlkvs76zn6w7ra4rqnsrhmn8bn6s9s1k8chj"; + url = "https://elpa.nongnu.org/nongnu-devel/moe-theme-1.1.0.0.20260515.84137.tar"; + sha256 = "0q8sdm7sd82xgas83z0i5rrjq26b9crvakr5iqdcms9pnckqkfl8"; }; packageRequires = [ ]; meta = { @@ -3869,10 +3995,10 @@ elpaBuild { pname = "nasm-mode"; ename = "nasm-mode"; - version = "1.1.1.0.20250320.164627"; + version = "1.1.1.0.20260509.95321"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20250320.164627.tar"; - sha256 = "0dm1zg15q18v9y4mx2p8hdqvql4dikw8chkj3i3jb1jp9d0v2rf3"; + url = "https://elpa.nongnu.org/nongnu-devel/nasm-mode-1.1.1.0.20260509.95321.tar"; + sha256 = "0gp5mn9p9k647042nizvnzx0ns0fhlg9h266vzbkzpimhn8a7pp2"; }; packageRequires = [ ]; meta = { @@ -3980,10 +4106,10 @@ elpaBuild { pname = "opam-switch-mode"; ename = "opam-switch-mode"; - version = "1.8snapshot0.20230802.91729"; + version = "1.8snapshot0.20230802.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.8snapshot0.20230802.91729.tar"; - sha256 = "01ccpzlanc42na9hdm8f8ys4b1lsxqx5f2ks3ya3f5yr580amy1w"; + url = "https://elpa.nongnu.org/nongnu-devel/opam-switch-mode-1.8snapshot0.20230802.1.tar"; + sha256 = "11nvx2rp6zc4m78nkf5c9gbpfyrg68rkrwfvg6iqsga4aw4mr5z8"; }; packageRequires = [ ]; meta = { @@ -4024,10 +4150,10 @@ elpaBuild { pname = "org-contrib"; ename = "org-contrib"; - version = "0.8.0.20260221.192041"; + version = "0.8.0.20260505.72437"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.8.0.20260221.192041.tar"; - sha256 = "15mrdfmj4nxqh7ayyc2nyhxak5ymfsa9ym8dl8gwjsc8xym9jidd"; + url = "https://elpa.nongnu.org/nongnu-devel/org-contrib-0.8.0.20260505.72437.tar"; + sha256 = "1qx4vnbqczn313pjx1fky78d83ixyr39807hr88sd81h98ggq61f"; }; packageRequires = [ org ]; meta = { @@ -4162,10 +4288,10 @@ elpaBuild { pname = "org-transclusion-http"; ename = "org-transclusion-http"; - version = "0.5pre0.20240630.140904"; + version = "0.5pre0.20240630.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.5pre0.20240630.140904.tar"; - sha256 = "1gkh5flmbj0gah8vbw6ghqagak220ljym8rsgpwmpxmqzwjhp5kp"; + url = "https://elpa.nongnu.org/nongnu-devel/org-transclusion-http-0.5pre0.20240630.1.tar"; + sha256 = "06cnyym38nrli2hb74g8qpwaajy3brg64sfkfr5rmbrqyqwlqspp"; }; packageRequires = [ org-transclusion @@ -4205,20 +4331,22 @@ elpaBuild, fetchurl, lib, + llama, magit, org, }: elpaBuild { pname = "orgit"; ename = "orgit"; - version = "2.1.2.0.20260301.125552"; + version = "2.2.0.0.20260701.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.1.2.0.20260301.125552.tar"; - sha256 = "1yy549phcdkm6sn70bb92lm1yrfc1k1d716kcblmrl6p2vd450l7"; + url = "https://elpa.nongnu.org/nongnu-devel/orgit-2.2.0.0.20260701.0.tar"; + sha256 = "143w8vvgn9qfyfrdd8ccs4grpgnksbvjby9sb077ciqjnzimnx5d"; }; packageRequires = [ compat cond-let + llama magit org ]; @@ -4259,10 +4387,10 @@ elpaBuild { pname = "package-lint"; ename = "package-lint"; - version = "0.26.0.20251205.172019"; + version = "0.26.0.20260619.23"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20251205.172019.tar"; - sha256 = "1b8pdsy3ym66vcf7f98prlr9hia710zxksyjsnf6r9mnddk2hry4"; + url = "https://elpa.nongnu.org/nongnu-devel/package-lint-0.26.0.20260619.23.tar"; + sha256 = "1a1lbk0ypicqwx6afavwfqwibp0pvyry84372s441bmd89xp072k"; }; packageRequires = [ let-alist ]; meta = { @@ -4302,10 +4430,10 @@ elpaBuild { pname = "page-break-lines"; ename = "page-break-lines"; - version = "0.15.0.20251121.212752"; + version = "0.15.0.20260619.18"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20251121.212752.tar"; - sha256 = "0jzga42sd4p4nibbypi0f6427pfibdmpdjrcxnygvj8rc3wk1qv6"; + url = "https://elpa.nongnu.org/nongnu-devel/page-break-lines-0.15.0.20260619.18.tar"; + sha256 = "0x9b97wgxjvm42k9910fyfyd6ddwkh3fiwc5g7ix7izzxvsx511g"; }; packageRequires = [ ]; meta = { @@ -4323,10 +4451,10 @@ elpaBuild { pname = "paredit"; ename = "paredit"; - version = "27beta0.20241103.213959"; + version = "27beta0.20241103.20"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20241103.213959.tar"; - sha256 = "00xb4lzkbfsz7f7pnsjfzbhigp4r2piimj7cplq7fxjl80j39lka"; + url = "https://elpa.nongnu.org/nongnu-devel/paredit-27beta0.20241103.20.tar"; + sha256 = "0dmqfcir64pb9nw577wqnh0g0d6kvvzc4v8hca4bcl17ipa0wjkz"; }; packageRequires = [ ]; meta = { @@ -4344,10 +4472,10 @@ elpaBuild { pname = "parseclj"; ename = "parseclj"; - version = "1.1.1.0.20231203.190509"; + version = "1.1.1.0.20260526.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/parseclj-1.1.1.0.20231203.190509.tar"; - sha256 = "1h0lfy17613s7ls55ca77nqmc87v3kdwz1cvymzf2jp4xckgcsvw"; + url = "https://elpa.nongnu.org/nongnu-devel/parseclj-1.1.1.0.20260526.2.tar"; + sha256 = "0w6d1bvjdl1sg17iz77bf6n7j1k8j7x2jp7iki1r1lipi0ygfrmv"; }; packageRequires = [ ]; meta = { @@ -4367,10 +4495,10 @@ elpaBuild { pname = "parseedn"; ename = "parseedn"; - version = "1.2.1.0.20231203.190947"; + version = "1.2.1.0.20260601.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/parseedn-1.2.1.0.20231203.190947.tar"; - sha256 = "0l8w1qr2nqngpcdcw1052dpx8q69xyz20mr2vvqayr5jmsgbvaad"; + url = "https://elpa.nongnu.org/nongnu-devel/parseedn-1.2.1.0.20260601.4.tar"; + sha256 = "0im6p06rh0vzqc5rdz5ydgqlys69dfcibkl4lz7isd3yndalwqwy"; }; packageRequires = [ map @@ -4460,10 +4588,10 @@ elpaBuild { pname = "pg"; ename = "pg"; - version = "0.65.0.20260421.212130"; + version = "0.68.0.20260719.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/pg-0.65.0.20260421.212130.tar"; - sha256 = "13a88q1hx7mkc58a3ry5ym56kn5ppqr32j18n2ms69a5if301nhs"; + url = "https://elpa.nongnu.org/nongnu-devel/pg-0.68.0.20260719.0.tar"; + sha256 = "1awd1rsb95vka0raf8pdgpyj1mmx8s3nqqhgqcxs4h44v8fppyc6"; }; packageRequires = [ peg ]; meta = { @@ -4481,10 +4609,10 @@ elpaBuild { pname = "php-mode"; ename = "php-mode"; - version = "1.26.1.0.20251112.64638"; + version = "1.26.1.0.20260719.80"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20251112.64638.tar"; - sha256 = "1vh7ynpbpps46jw5g9qwzzhyb4kll0dpppj5493kpjj3d87xclir"; + url = "https://elpa.nongnu.org/nongnu-devel/php-mode-1.26.1.0.20260719.80.tar"; + sha256 = "0wsid2y7lybyzk6kf61k9jc80vk3qz3bqsr2rgqy6hln5rv8g5q8"; }; packageRequires = [ ]; meta = { @@ -4523,10 +4651,10 @@ elpaBuild { pname = "popup"; ename = "popup"; - version = "0.5.9.0.20251231.162233"; + version = "0.5.9.0.20260619.57"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20251231.162233.tar"; - sha256 = "0w6f04gx4k3das0p8hdx178ldvwwx8jbzns1n1kwwgc1i5x8fl51"; + url = "https://elpa.nongnu.org/nongnu-devel/popup-0.5.9.0.20260619.57.tar"; + sha256 = "01pjvxcsrvcp8j8xrh096x6c4fd94wwihvzphqcxmbrdkhvsgbhh"; }; packageRequires = [ ]; meta = { @@ -4566,10 +4694,10 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.10.0snapshot0.20260310.85858"; + version = "3.3.0snapshot0.20260720.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/projectile-2.10.0snapshot0.20260310.85858.tar"; - sha256 = "081aljvri52f6l4jj9w16lv67gzihmw1afymzpr6c8ak5q02c5vd"; + url = "https://elpa.nongnu.org/nongnu-devel/projectile-3.3.0snapshot0.20260720.5.tar"; + sha256 = "1n26lg4i2k8nh5sw3yxjrjdmqdylmf0wdbijc0gkqzlafa3nh6qg"; }; packageRequires = [ compat ]; meta = { @@ -4587,10 +4715,10 @@ elpaBuild { pname = "proof-general"; ename = "proof-general"; - version = "4.6snapshot0.20260124.135141"; + version = "4.6snapshot0.20260622.265"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20260124.135141.tar"; - sha256 = "0wjjip6pph8s8j613md5j6f5ba40cl88v44i88s6s11ixrmd73sl"; + url = "https://elpa.nongnu.org/nongnu-devel/proof-general-4.6snapshot0.20260622.265.tar"; + sha256 = "1w3xbgzq9ibhdb4b06f658lvg79c0gyacicmaljp8pz3548dcly8"; }; packageRequires = [ ]; meta = { @@ -4631,10 +4759,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20260303.123213"; + version = "1.0.20260626.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260303.123213.tar"; - sha256 = "1iqbrsy5sivv9mm6sk48vj1mv4magh7bg7346i1a02plr0hg8qml"; + url = "https://elpa.nongnu.org/nongnu-devel/racket-mode-1.0.20260626.0.tar"; + sha256 = "19lbiv2wd1fs1jzr4j9q89j41hbhvlgfg9h48bjxki8dqs96d668"; }; packageRequires = [ compat ]; meta = { @@ -4711,16 +4839,17 @@ elpaBuild, fetchurl, lib, + with-command-redo, }: elpaBuild { pname = "recomplete"; ename = "recomplete"; - version = "0.2.0.20260403.113038"; + version = "0.2.0.20260504.120143"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20260403.113038.tar"; - sha256 = "1mnd8d2hyfcjribvgq955sn0vm1265xs0jqc55rylwpkr4cff779"; + url = "https://elpa.nongnu.org/nongnu-devel/recomplete-0.2.0.20260504.120143.tar"; + sha256 = "0za4w629nwd1yra59qrn9j8ll9w8bl10skx9xk16lcli7g479j2s"; }; - packageRequires = [ ]; + packageRequires = [ with-command-redo ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/recomplete.html"; license = lib.licenses.free; @@ -4736,10 +4865,10 @@ elpaBuild { pname = "reformatter"; ename = "reformatter"; - version = "0.8.0.20251121.93526"; + version = "0.8.0.20260619.30"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20251121.93526.tar"; - sha256 = "11s23mply7aaa68y6miwzn6bld5m1rynk19l5jj2i1mwjk2plrlk"; + url = "https://elpa.nongnu.org/nongnu-devel/reformatter-0.8.0.20260619.30.tar"; + sha256 = "0lqigd7kr1xyzz3asy376ng5r9flda4l8njxpflgaly137ifzil3"; }; packageRequires = [ ]; meta = { @@ -4778,10 +4907,10 @@ elpaBuild { pname = "rfc-mode"; ename = "rfc-mode"; - version = "1.4.2.0.20260127.180740"; + version = "1.4.2.0.20260617.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rfc-mode-1.4.2.0.20260127.180740.tar"; - sha256 = "1i01x9k208zasil586q1jz28hdl5hpx964a6bgb6wwgf9ya79xlx"; + url = "https://elpa.nongnu.org/nongnu-devel/rfc-mode-1.4.2.0.20260617.2.tar"; + sha256 = "1kk70niw36vb2ldrclk34r6hy4555hcqkcbss2dn1mfbp9sf54d6"; }; packageRequires = [ ]; meta = { @@ -4800,10 +4929,10 @@ elpaBuild { pname = "rpm-spec-mode"; ename = "rpm-spec-mode"; - version = "0.16.0.20260423.74352"; + version = "0.16.0.20260616.59"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20260423.74352.tar"; - sha256 = "0pqq31x60g3ig7fmd4jh7kjz051m020kqs3pfpbiznwhjh8v63ad"; + url = "https://elpa.nongnu.org/nongnu-devel/rpm-spec-mode-0.16.0.20260616.59.tar"; + sha256 = "1yn9ihrbviyzyadh2yc6c85sjh94pdbp9h7jzlmmims6xhkmjk24"; }; packageRequires = [ compat ]; meta = { @@ -4821,10 +4950,10 @@ elpaBuild { pname = "rubocop"; ename = "rubocop"; - version = "0.7.0snapshot0.20210309.124149"; + version = "0.7.0snapshot0.20210309.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0snapshot0.20210309.124149.tar"; - sha256 = "110rfww9kl2f8mj45nf1irwmwj4bfgla6glc52dhqi2ibvpik1h5"; + url = "https://elpa.nongnu.org/nongnu-devel/rubocop-0.7.0snapshot0.20210309.1.tar"; + sha256 = "0bggy6nc2wsng83df3vrqw8ygs5ys87i09511kl5d9xfhds7fx4j"; }; packageRequires = [ ]; meta = { @@ -4842,10 +4971,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.6.0.20260416.50503"; + version = "1.0.6.0.20260618.49"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260416.50503.tar"; - sha256 = "12bcjfi7s7gisx31rwncvcs7j7m57kcs7rs5jfhmmpfsm8n24yba"; + url = "https://elpa.nongnu.org/nongnu-devel/rust-mode-1.0.6.0.20260618.49.tar"; + sha256 = "1ldkx6plsvaijibb4szyjs2b3hcl6svmbd8fn0j4015558shif4q"; }; packageRequires = [ ]; meta = { @@ -4890,10 +5019,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "98.0.0.20260330.71707"; + version = "99.0.0.20260628.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-98.0.0.20260330.71707.tar"; - sha256 = "05fcw1wc6n0k9acjm6hmmidfp7pp0zgshwd63ijpz5d8l0plim29"; + url = "https://elpa.nongnu.org/nongnu-devel/scad-mode-99.0.0.20260628.1.tar"; + sha256 = "0pwx9vknh5w1m3cqp1081dq07061qwn7y292y0x85cvisak8hkcs"; }; packageRequires = [ compat ]; meta = { @@ -4995,10 +5124,10 @@ elpaBuild { pname = "sesman"; ename = "sesman"; - version = "0.3.3snapshot0.20240417.172323"; + version = "0.3.3snapshot0.20260616.21"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.3snapshot0.20240417.172323.tar"; - sha256 = "1d4c3ymxas4xsjbkg7yj80x6lgly5rch7fvyvi495yvk3mzd9yzk"; + url = "https://elpa.nongnu.org/nongnu-devel/sesman-0.3.3snapshot0.20260616.21.tar"; + sha256 = "1nc2h58dcjwvi9kjqgmw79cvdc9i1ja8xkxs69hjhyq7y0wp85kf"; }; packageRequires = [ ]; meta = { @@ -5028,6 +5157,28 @@ }; } ) { }; + simple-httpd = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "simple-httpd"; + ename = "simple-httpd"; + version = "1.6.0.20260709.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu-devel/simple-httpd-1.6.0.20260709.3.tar"; + sha256 = "0fyl4r8x0k074cb5h7agfm9zdpny68n0sm24wb9mc089fx9j9q5c"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu-devel/simple-httpd.html"; + license = lib.licenses.free; + }; + } + ) { }; slime = callPackage ( { elpaBuild, @@ -5038,10 +5189,10 @@ elpaBuild { pname = "slime"; ename = "slime"; - version = "2.32snapshot0.20260421.225639"; + version = "2.32snapshot0.20260719.53"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260421.225639.tar"; - sha256 = "0gqj2nd82wljvfrqwah3qczkjq8q4i1k3cprypydxzlfh45k13jf"; + url = "https://elpa.nongnu.org/nongnu-devel/slime-2.32snapshot0.20260719.53.tar"; + sha256 = "06isvwjq37vzf636ci5jb8fkzc926fnjzwx0fszlfax4hy00mlqf"; }; packageRequires = [ macrostep ]; meta = { @@ -5102,10 +5253,10 @@ elpaBuild { pname = "solarized-theme"; ename = "solarized-theme"; - version = "2.1.0.0.20260329.155902"; + version = "2.1.0.0.20260703.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.1.0.0.20260329.155902.tar"; - sha256 = "19bj5hfz6ydhxd6qcrkw1lgpfbhjm5iwq96i6i4z56yffm7ijl9k"; + url = "https://elpa.nongnu.org/nongnu-devel/solarized-theme-2.1.0.0.20260703.8.tar"; + sha256 = "0iqgpdjxn6an3vn0pmy7iya5xs1ihjc9rj0kiyk6xlfswzc5pyfk"; }; packageRequires = [ ]; meta = { @@ -5123,10 +5274,10 @@ elpaBuild { pname = "spacemacs-theme"; ename = "spacemacs-theme"; - version = "0.2.0.20260414.205200"; + version = "0.2.0.20260523.125627"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260414.205200.tar"; - sha256 = "076nbpp16wy6j9ic3bhj9cj58bmah6ivhh842lkh7y7lgp6f7q7j"; + url = "https://elpa.nongnu.org/nongnu-devel/spacemacs-theme-0.2.0.20260523.125627.tar"; + sha256 = "0rxvvfcssxvgfi8djd3y5ncd5hhhbqclprp3529zw390m8qlcicd"; }; packageRequires = [ ]; meta = { @@ -5144,10 +5295,10 @@ elpaBuild { pname = "spell-fu"; ename = "spell-fu"; - version = "0.3.0.20260108.133641"; + version = "0.3.0.20260524.63613"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20260108.133641.tar"; - sha256 = "1yrv1a3k6nk92bhs4gsqpb1gc7x55gpp365ykpx6zj0hiapfhq80"; + url = "https://elpa.nongnu.org/nongnu-devel/spell-fu-0.3.0.20260524.63613.tar"; + sha256 = "1s2x3ymj1zb5iczwsrq00s0ynx1n6s3ls7y2nxrhxf04x93swqbf"; }; packageRequires = [ ]; meta = { @@ -5249,10 +5400,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.4.2.0.20260418.123100"; + version = "1.5.1.0.20260618.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/subed-1.4.2.0.20260418.123100.tar"; - sha256 = "1xdz1vglwza0lik5zqx6f8x8w3a7yq8x7wkd7zr5k932pjmhqbnd"; + url = "https://elpa.nongnu.org/nongnu-devel/subed-1.5.1.0.20260618.1.tar"; + sha256 = "1b74rndjdjawxl6fbksw7816135hyyk9sffijcrfyfd5c9k0c5zn"; }; packageRequires = [ ]; meta = { @@ -5271,10 +5422,10 @@ elpaBuild { pname = "sweeprolog"; ename = "sweeprolog"; - version = "0.27.6.0.20250624.64526"; + version = "0.27.6.0.20260510.162905"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20250624.64526.tar"; - sha256 = "1ywcwm4r7hd21bayilvmw530axa2gc8f689fr5swxfyig49qjqz5"; + url = "https://elpa.nongnu.org/nongnu-devel/sweeprolog-0.27.6.0.20260510.162905.tar"; + sha256 = "1x38q2hrrapfzb8ky7bzfw58pi00yyj4qnwrpsqcc1hhaxq6h1dr"; }; packageRequires = [ compat ]; meta = { @@ -5292,10 +5443,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.4.0.0.20251122.85713"; + version = "10.0.0.0.20260608.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-9.4.0.0.20251122.85713.tar"; - sha256 = "1sn7lm6srrlnbxfdjpqdr503plkml61bz79ivwgz9rs9fqkbrvgg"; + url = "https://elpa.nongnu.org/nongnu-devel/swift-mode-10.0.0.0.20260608.3.tar"; + sha256 = "0xla80pyl6x1jmni7n4n7kxshhn7yb5zsmbck5dxmc1jh6cfvjp6"; }; packageRequires = [ ]; meta = { @@ -5314,10 +5465,10 @@ elpaBuild { pname = "symbol-overlay"; ename = "symbol-overlay"; - version = "4.3.0.20260423.145452"; + version = "4.3.0.20260703.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260423.145452.tar"; - sha256 = "16gm3gj84wd7v6qhf3p0sz2jgbbyi60kqwkb41rfiz7n79qlijpg"; + url = "https://elpa.nongnu.org/nongnu-devel/symbol-overlay-4.3.0.20260703.4.tar"; + sha256 = "1mg02vrf7lhqiqkqlnl9czd11aw9i3gsa00f53fbn80vy123hixb"; }; packageRequires = [ seq ]; meta = { @@ -5489,10 +5640,10 @@ elpaBuild { pname = "toc-org"; ename = "toc-org"; - version = "1.1.0.20230831.75249"; + version = "1.1.0.20260514.144504"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/toc-org-1.1.0.20230831.75249.tar"; - sha256 = "1kscz2s87l8a8w0d4s3g8ilspd63p0ij2vgncvzvb8hjld4pdcfh"; + url = "https://elpa.nongnu.org/nongnu-devel/toc-org-1.1.0.20260514.144504.tar"; + sha256 = "0rjzk0lzxppj5xvkh80nkaipf1m1d7wascx09hljrsk4fg583idb"; }; packageRequires = [ ]; meta = { @@ -5533,10 +5684,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.8.0.20260219.143500"; + version = "0.9.0.20260509.80242"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/tp-0.8.0.20260219.143500.tar"; - sha256 = "15szb0li4ibsaja39699rc85nvk2s466g303dp0si62h9ipha68w"; + url = "https://elpa.nongnu.org/nongnu-devel/tp-0.9.0.20260509.80242.tar"; + sha256 = "15yw87gayvm79i2ah5qkvgvcsma3l6iwa34732bs3r0yqcgwfw9q"; }; packageRequires = [ transient ]; meta = { @@ -5554,10 +5705,10 @@ elpaBuild { pname = "treepy"; ename = "treepy"; - version = "0.1.3.0.20260313.91605"; + version = "0.1.3.0.20260531.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/treepy-0.1.3.0.20260313.91605.tar"; - sha256 = "0bxp1xf2ckq4pa7bm5sc5i8y1nlyy36zyfavjndc2fihskr7d6pm"; + url = "https://elpa.nongnu.org/nongnu-devel/treepy-0.1.3.0.20260531.3.tar"; + sha256 = "0zzz43pdxirljmjn0zwf2rdnd2gm14nk5gzafsshbw9mzys1r2vq"; }; packageRequires = [ ]; meta = { @@ -5575,10 +5726,10 @@ elpaBuild { pname = "treesit-fold"; ename = "treesit-fold"; - version = "0.2.1.0.20260417.100827"; + version = "0.2.1.0.20260619.51"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260417.100827.tar"; - sha256 = "04v6yqj6a4aahff2kbpmj3k8jzqxa6idfgpfsd6l98yb3kqldil7"; + url = "https://elpa.nongnu.org/nongnu-devel/treesit-fold-0.2.1.0.20260619.51.tar"; + sha256 = "0zjkpa07dd3lk9clf10gb3l5s626yg2qyzwxczmymy4lla8njjnr"; }; packageRequires = [ ]; meta = { @@ -5610,7 +5761,6 @@ ) { }; tuareg = callPackage ( { - caml, elpaBuild, fetchurl, lib, @@ -5618,12 +5768,12 @@ elpaBuild { pname = "tuareg"; ename = "tuareg"; - version = "3.0.2snapshot0.20250910.140516"; + version = "3.1.1snapshot0.20260626.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.0.2snapshot0.20250910.140516.tar"; - sha256 = "0m9xid4s6qqdw8vlpgzsf2lc877shf7dvfxk8b9bhiva56dhrqfw"; + url = "https://elpa.nongnu.org/nongnu-devel/tuareg-3.1.1snapshot0.20260626.1.tar"; + sha256 = "0y1ygn4d8dcw0zgq0y2f65kmx64id5dcv2d23kvk2sddr53qya8f"; }; - packageRequires = [ caml ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/tuareg.html"; license = lib.licenses.free; @@ -5660,10 +5810,10 @@ elpaBuild { pname = "typst-ts-mode"; ename = "typst-ts-mode"; - version = "0.12.2.0.20260415.103532"; + version = "0.12.2.0.20260624.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260415.103532.tar"; - sha256 = "190jabvm3p74cd96rrbj45y68myg32zvlxjrq01zvi3jv29xbpf6"; + url = "https://elpa.nongnu.org/nongnu-devel/typst-ts-mode-0.12.2.0.20260624.24.tar"; + sha256 = "13amyfg5zkbxwp1gipnyn01wpwpyv0p0w4sv97xpfiyazhs5w4bn"; }; packageRequires = [ ]; meta = { @@ -5808,10 +5958,10 @@ elpaBuild { pname = "vm"; ename = "vm"; - version = "8.3.3snapshot0.20260420.63204"; + version = "8.3.3snapshot0.20260716.51"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260420.63204.tar"; - sha256 = "03804kmfwp994szv5gdgsg1sxmmdhzam8aq17r402chj6lhpla1x"; + url = "https://elpa.nongnu.org/nongnu-devel/vm-8.3.3snapshot0.20260716.51.tar"; + sha256 = "04pq2a39czffcj4rwv0c7bg53vc95mjyk4jqqp25blk4v4l9ygs2"; }; packageRequires = [ vcard ]; meta = { @@ -5829,10 +5979,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.23.0.20260331.144101"; + version = "17.3.24.0.20260623.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.23.0.20260331.144101.tar"; - sha256 = "1yk7dcsgry69dz3scx32p4zqp1ay6354rr017ygqffkl0fcqhgdg"; + url = "https://elpa.nongnu.org/nongnu-devel/web-mode-17.3.24.0.20260623.0.tar"; + sha256 = "0k6p06qbcclc2hywplpk09iz266k80zhlw4031whrrrmij9700j6"; }; packageRequires = [ ]; meta = { @@ -5876,10 +6026,10 @@ elpaBuild { pname = "wfnames"; ename = "wfnames"; - version = "1.2.0.20260105.45812"; + version = "1.2.0.20260706.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20260105.45812.tar"; - sha256 = "116d5j1sqb0fbqlfaxxiaraw8c6mg69nw5mn412zwrvbq4vgpp4c"; + url = "https://elpa.nongnu.org/nongnu-devel/wfnames-1.2.0.20260706.4.tar"; + sha256 = "1gzypbg4nkf7yyscyq8p9n5ckclg0rcks5s8rilsljb0csnx35nz"; }; packageRequires = [ ]; meta = { @@ -5933,19 +6083,25 @@ with-editor = callPackage ( { compat, + cond-let, elpaBuild, fetchurl, lib, + llama, }: elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.4.9.0.20260422.182143"; + version = "3.5.2.0.20260701.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.4.9.0.20260422.182143.tar"; - sha256 = "10zb39gwdbamb11msxkayzspi09fpagip93xm90lc39w850xmbbm"; + url = "https://elpa.nongnu.org/nongnu-devel/with-editor-3.5.2.0.20260701.0.tar"; + sha256 = "067x2q0ykrp9llva4gn1cjyxwnhb0yh1cxr6ghdd4yccbfdi4y85"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + cond-let + llama + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu-devel/with-editor.html"; license = lib.licenses.free; @@ -6050,10 +6206,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "28.11.20260416140940.0.20260416.141130"; + version = "28.11.20260712150256.0.20260712.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260416140940.0.20260416.141130.tar"; - sha256 = "0mrfn3z60jgk2f9lccb3qcaa52rvh366ys97ypz5lgjlxal1sr5r"; + url = "https://elpa.nongnu.org/nongnu-devel/xah-fly-keys-28.11.20260712150256.0.20260712.0.tar"; + sha256 = "0g4lfqm81kpszwlkapvr25c8c0b4rmg00zrr62ziz16bplvgy3ky"; }; packageRequires = [ ]; meta = { @@ -6093,10 +6249,10 @@ elpaBuild { pname = "xml-rpc"; ename = "xml-rpc"; - version = "1.6.17.0.20251122.185743"; + version = "1.6.17.0.20260619.13"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/xml-rpc-1.6.17.0.20251122.185743.tar"; - sha256 = "1sshmzg6v27v8l0q3lq2apfvpbkkg71dyn7mk99a56qab4ajm6zs"; + url = "https://elpa.nongnu.org/nongnu-devel/xml-rpc-1.6.17.0.20260619.13.tar"; + sha256 = "0h0l1xlifl12n2bhjr9yx8nffl0wbhi1mnlj0f1w7f9b3vdgcn1a"; }; packageRequires = [ ]; meta = { @@ -6157,10 +6313,10 @@ elpaBuild { pname = "zenburn-theme"; ename = "zenburn-theme"; - version = "2.9.0.0.20260329.183806"; + version = "2.10.0.0.20260704.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.9.0.0.20260329.183806.tar"; - sha256 = "16ma8gishgdbaalk1slqci7dciyjjnbifvn15iyby4ccqy3dc8gz"; + url = "https://elpa.nongnu.org/nongnu-devel/zenburn-theme-2.10.0.0.20260704.2.tar"; + sha256 = "17wp8z3nycqr3rva4npq3gi8ddv93fwzqh45bfgcr6a0zv4pfxp4"; }; packageRequires = [ ]; meta = { @@ -6179,10 +6335,10 @@ elpaBuild { pname = "zig-mode"; ename = "zig-mode"; - version = "0.0.8.0.20251128.25646"; + version = "0.0.8.0.20260717.49"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20251128.25646.tar"; - sha256 = "03nqzy5xyqsr7ax1m0sprk75ygkyspj824vixgkrflqnrhyj5b2s"; + url = "https://elpa.nongnu.org/nongnu-devel/zig-mode-0.0.8.0.20260717.49.tar"; + sha256 = "182rhhax10ldn763fraa5fc2vqlglzm9iq2yq2rvndgklqlf5bsc"; }; packageRequires = [ reformatter ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix index e5dfa1df3392..ce5821da02a2 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/nongnu-generated.nix @@ -9,10 +9,10 @@ elpaBuild { pname = "adoc-mode"; ename = "adoc-mode"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.8.0.tar"; - sha256 = "16459ial82gybqjm8ib0cxry6daipak4baxiz2wnldgy5vpgjnrd"; + url = "https://elpa.nongnu.org/nongnu/adoc-mode-0.9.0.tar"; + sha256 = "11anl5b9ka9aww2w2jv0clrvq98f2vsa9ri3n1xxdll5z77rvw56"; }; packageRequires = [ ]; meta = { @@ -75,10 +75,10 @@ elpaBuild { pname = "aidermacs"; ename = "aidermacs"; - version = "1.6"; + version = "1.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/aidermacs-1.6.tar"; - sha256 = "07ql2kv7naza7jigmsw9x1k3md0hz2c302qrc0cy1a1h07567nli"; + url = "https://elpa.nongnu.org/nongnu/aidermacs-1.9.tar"; + sha256 = "05ff2kfy97870qgvv89ysrk8cwnr3zxh1f01lvp7rk7siln0w10d"; }; packageRequires = [ compat @@ -142,10 +142,10 @@ elpaBuild { pname = "annotate"; ename = "annotate"; - version = "2.4.5"; + version = "2.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-2.4.5.tar"; - sha256 = "0pdhwlz792sf5zipv8s449bah7xm9klbpicx9203fhsc0ad82d0j"; + url = "https://elpa.nongnu.org/nongnu/annotate-2.5.0.tar"; + sha256 = "0nydnnjx1p4fkiix70zg0apxxd0sprlzxk111lvgnamp3c4hxf93"; }; packageRequires = [ ]; meta = { @@ -269,10 +269,10 @@ elpaBuild { pname = "auto-dim-other-buffers"; ename = "auto-dim-other-buffers"; - version = "2.2.1"; + version = "2.2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.2.1.tar"; - sha256 = "00x0niv1zd47b2xl19k3fi0xxskdndiabns107cxzwb7pnkp4f0m"; + url = "https://elpa.nongnu.org/nongnu/auto-dim-other-buffers-2.2.2.tar"; + sha256 = "1464kwsdkzh4v0w2y8sv2v5w1s552a2pq1q81jpbfwh2md47ais2"; }; packageRequires = [ ]; meta = { @@ -566,10 +566,10 @@ elpaBuild { pname = "casual"; ename = "casual"; - version = "2.16.0"; + version = "2.17.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/casual-2.16.0.tar"; - sha256 = "1s0d5c3aacyh1n5qy7ka4xwnmdbx3qrh0z0z41bc958zmay6mgpa"; + url = "https://elpa.nongnu.org/nongnu/casual-2.17.1.tar"; + sha256 = "0wnr7lqb3c6wzcbjh19cj00jdh3rhplzyxq2khk009pfld861pa3"; }; packageRequires = [ csv-mode @@ -605,6 +605,7 @@ cider = callPackage ( { clojure-mode, + compat, elpaBuild, fetchurl, lib, @@ -618,13 +619,14 @@ elpaBuild { pname = "cider"; ename = "cider"; - version = "1.21.0"; + version = "2.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cider-1.21.0.tar"; - sha256 = "0rfjq6fqvam9v7mcx1459p377ryzi9wf7p2dn68nd51f324hx0gj"; + url = "https://elpa.nongnu.org/nongnu/cider-2.0.0.tar"; + sha256 = "1i8drgg7fbj4l4y7mgh47fw94bajwd5sdacfkvii0d6pc8sda2if"; }; packageRequires = [ clojure-mode + compat parseedn queue seq @@ -733,10 +735,10 @@ elpaBuild { pname = "cond-let"; ename = "cond-let"; - version = "0.2.2"; + version = "1.1.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/cond-let-0.2.2.tar"; - sha256 = "0ip5k8jhdgq1zkc6cj4ax8rv4236cxla2dapj83y526ra321gkzy"; + url = "https://elpa.nongnu.org/nongnu/cond-let-1.1.3.tar"; + sha256 = "0zxirrq3rps48irxab1m1hkvbxjfahibfaynl4qb0lrz0bv8dzcf"; }; packageRequires = [ ]; meta = { @@ -756,10 +758,10 @@ elpaBuild { pname = "consult-flycheck"; ename = "consult-flycheck"; - version = "1.1"; + version = "1.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.1.tar"; - sha256 = "0nanxx0fbj6w9sxzz4ys8nxpv63al3m4lliy30y4ydiaig2a0abc"; + url = "https://elpa.nongnu.org/nongnu/consult-flycheck-1.2.tar"; + sha256 = "0g5lb3p4g91ax0c4zkkyvi2l4hkq5b9r2bciddgg1h4bsmrs6vhx"; }; packageRequires = [ consult @@ -828,10 +830,10 @@ elpaBuild { pname = "csv2ledger"; ename = "csv2ledger"; - version = "1.5.4"; + version = "1.5.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.4.tar"; - sha256 = "1h935g97fjrs1q0yz0q071zp91bhsb3yg13zqpp8il5gif20qqls"; + url = "https://elpa.nongnu.org/nongnu/csv2ledger-1.5.5.tar"; + sha256 = "09k7q33jxwrcf52csgf25kd9wqcs9bicl8azmkbrmm8d9jqgg3md"; }; packageRequires = [ csv-mode ]; meta = { @@ -1278,10 +1280,10 @@ elpaBuild { pname = "eldoc-mouse"; ename = "eldoc-mouse"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/eldoc-mouse-3.0.7.tar"; - sha256 = "17s3iqkdswjfcdiyaa732v27pcpmxa96i17mwpzi34vw53a1r3wl"; + url = "https://elpa.nongnu.org/nongnu/eldoc-mouse-3.0.8.tar"; + sha256 = "1snacbxjqp8ykic5z1nzhg0fnd5fnafsgwxmfd9vy4rsm0ag9mrl"; }; packageRequires = [ eglot @@ -1319,6 +1321,56 @@ }; } ) { }; + elfeed = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "elfeed"; + ename = "elfeed"; + version = "4.1.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elfeed-4.1.0.tar"; + sha256 = "0bwmhba975rsj9pk3s6wq7lsa38v4s0737hvhhdbzx1i66z45hmx"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/elfeed.html"; + license = lib.licenses.free; + }; + } + ) { }; + elfeed-web = callPackage ( + { + compat, + elfeed, + elpaBuild, + fetchurl, + lib, + simple-httpd, + }: + elpaBuild { + pname = "elfeed-web"; + ename = "elfeed-web"; + version = "4.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/elfeed-web-4.0.0.tar"; + sha256 = "0ah6zjcihxfra34zglqrj6pnxqnakgc58dlkgjzgrxdamx4dxfwg"; + }; + packageRequires = [ + compat + elfeed + simple-httpd + ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/elfeed-web.html"; + license = lib.licenses.free; + }; + } + ) { }; elixir-mode = callPackage ( { elpaBuild, @@ -1370,10 +1422,10 @@ elpaBuild { pname = "emacsql"; ename = "emacsql"; - version = "4.3.6"; + version = "4.4.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/emacsql-4.3.6.tar"; - sha256 = "1zj04kqq3c5915n9pj5qx63rw8hnnpag2y5qca4d4y9h1lqnj2pp"; + url = "https://elpa.nongnu.org/nongnu/emacsql-4.4.1.tar"; + sha256 = "1gja15jyalzrlcs85ng98p6g7b0id4rayj4shwf7x1ic30sv12p3"; }; packageRequires = [ ]; meta = { @@ -1404,6 +1456,27 @@ }; } ) { }; + eprolog = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "eprolog"; + ename = "eprolog"; + version = "0.3.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/eprolog-0.3.2.tar"; + sha256 = "1vbnbdpmxvqgay5m01bcm1wlsyz16nn4fydv7ipd8kzr4lw59qyg"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/eprolog.html"; + license = lib.licenses.free; + }; + } + ) { }; esxml = callPackage ( { cl-lib ? null, @@ -1495,6 +1568,28 @@ }; } ) { }; + evil-collection = callPackage ( + { + elpaBuild, + evil, + fetchurl, + lib, + }: + elpaBuild { + pname = "evil-collection"; + ename = "evil-collection"; + version = "3.0.0"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/evil-collection-3.0.0.tar"; + sha256 = "1a347yznrgw8b5y8jwj4rbryidr24c7g8c2is9pd4470v5h7jnfd"; + }; + packageRequires = [ evil ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/evil-collection.html"; + license = lib.licenses.free; + }; + } + ) { }; evil-emacs-cursor-model-mode = callPackage ( { elpaBuild, @@ -1719,16 +1814,20 @@ evil, fetchurl, lib, + shift-number, }: elpaBuild { pname = "evil-numbers"; ename = "evil-numbers"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar"; - sha256 = "1k5vrh8bj9kldqq8kxn1qi3k82i7k4v4h6nkk9hng8p90zhac02i"; + url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.8.tar"; + sha256 = "0l1ik0fz1bzpxnz9rnn0817j8ghpwhf3qv3lidzb3vpbynkas5a1"; }; - packageRequires = [ evil ]; + packageRequires = [ + evil + shift-number + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/evil-numbers.html"; license = lib.licenses.free; @@ -1857,10 +1956,10 @@ elpaBuild { pname = "fedi"; ename = "fedi"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/fedi-0.3.tar"; - sha256 = "1s1dn7n860b18cwyahc20lbl1bhv4y5h8jijs4iqbbgbk8w7hsjg"; + url = "https://elpa.nongnu.org/nongnu/fedi-0.4.tar"; + sha256 = "0zh2rkkj1wyj7csg72gg54mxlrd5kav54z3qhk6lp6j8h3zxkdvd"; }; packageRequires = [ markdown-mode ]; meta = { @@ -1882,10 +1981,10 @@ elpaBuild { pname = "fj"; ename = "fj"; - version = "0.34"; + version = "0.37"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/fj-0.34.tar"; - sha256 = "0aqfipcpbsxp2pm05p44fdybhldpbvii2x2m0az9s3gkm7dvwg87"; + url = "https://elpa.nongnu.org/nongnu/fj-0.37.tar"; + sha256 = "1kya5xif5ffiqv9fk4mxwx6x6gqshkpji21z0q84q438hfbxpwl9"; }; packageRequires = [ fedi @@ -1899,6 +1998,27 @@ }; } ) { }; + flamegraph = callPackage ( + { + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "flamegraph"; + ename = "flamegraph"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/flamegraph-0.2.tar"; + sha256 = "0zlji7iq7zrxix4mzw6z25rqgrmlnxnrc7skflkj0nv90z5w3fsh"; + }; + packageRequires = [ ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/flamegraph.html"; + license = lib.licenses.free; + }; + } + ) { }; flx = callPackage ( { cl-lib ? null, @@ -1957,10 +2077,10 @@ elpaBuild { pname = "flycheck"; ename = "flycheck"; - version = "36.0"; + version = "37.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flycheck-36.0.tar"; - sha256 = "0172y6qzkys77cbvdla1iiiznpxpscjzmsdr66m66s8g4bf7f1p2"; + url = "https://elpa.nongnu.org/nongnu/flycheck-37.0.tar"; + sha256 = "0x565wcnxkmdsf87dzv555r6m86lmlwz4c16isgac8dn1qp7l5jb"; }; packageRequires = [ seq ]; meta = { @@ -2158,10 +2278,10 @@ elpaBuild { pname = "geiser"; ename = "geiser"; - version = "0.32"; + version = "0.33.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-0.32.tar"; - sha256 = "1mija2lp2fqhzi9bifl0ipkjhj3gx89qz41mk0phb5y5cws6nar1"; + url = "https://elpa.nongnu.org/nongnu/geiser-0.33.1.tar"; + sha256 = "0mh701hp587ahiqf0znnc4jm46i49z85nwac4bxn7sxxjid3xffl"; }; packageRequires = [ project ]; meta = { @@ -2291,10 +2411,10 @@ elpaBuild { pname = "geiser-guile"; ename = "geiser-guile"; - version = "0.28.3"; + version = "0.28.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.3.tar"; - sha256 = "163p8ll68qdgpz6l1ixwcmffcsv1kas095davgwgq001hfx9db5x"; + url = "https://elpa.nongnu.org/nongnu/geiser-guile-0.28.5.tar"; + sha256 = "078hmmqg6m428bg2sf640bwylrh4y64qanbz00prvjhgkrp1awnn"; }; packageRequires = [ geiser @@ -2434,10 +2554,10 @@ elpaBuild { pname = "git-modes"; ename = "git-modes"; - version = "1.4.8"; + version = "1.5.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/git-modes-1.4.8.tar"; - sha256 = "08bgjpns90c36cdb6qbc24d41z1jg94mwsc91irpsmsvivxw1ksr"; + url = "https://elpa.nongnu.org/nongnu/git-modes-1.5.0.tar"; + sha256 = "0fxvv451pf8izn5q16ly21dxjax43l2p7qav11hi7qmygrrhxsc6"; }; packageRequires = [ compat ]; meta = { @@ -2528,10 +2648,10 @@ elpaBuild { pname = "gnuplot"; ename = "gnuplot"; - version = "0.11"; + version = "0.12"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gnuplot-0.11.tar"; - sha256 = "10zjkf0ba7jaqx41csa815apx58s0b87svvmzzld3i3xf91sash7"; + url = "https://elpa.nongnu.org/nongnu/gnuplot-0.12.tar"; + sha256 = "13pbnlwg9z7yc8s1hr1fq031cl9swld2jgxdd74jra49vvh6a3ar"; }; packageRequires = [ compat ]; meta = { @@ -2635,10 +2755,10 @@ elpaBuild { pname = "gptel"; ename = "gptel"; - version = "0.9.9.4"; + version = "0.9.9.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/gptel-0.9.9.4.tar"; - sha256 = "0j410b0bynq91dxwakrrzp92m3p2lznzvmyq41viscjm0gjng4kn"; + url = "https://elpa.nongnu.org/nongnu/gptel-0.9.9.5.tar"; + sha256 = "1x1sd8g5fbgidj40ri9xg0rvyxdyjpxxnr45i0dj8d333nvssdq0"; }; packageRequires = [ compat @@ -2831,10 +2951,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-4.0.6.tar"; - sha256 = "1nnkhffns1yj24slfln5rywqdw514jfklys3g5kmrl90i9apd5cp"; + url = "https://elpa.nongnu.org/nongnu/helm-4.0.7.tar"; + sha256 = "1x1wg3z6y5rb4r17ifwvz79pa3m6w9kkvxlfivznqh4ajgafrnn5"; }; packageRequires = [ helm-core @@ -2856,10 +2976,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "4.0.6"; + version = "4.0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.6.tar"; - sha256 = "0b39k4wwl3sjw5c19g36a0lsxiascrqw23cf3hgksrpzp3amipbz"; + url = "https://elpa.nongnu.org/nongnu/helm-core-4.0.7.tar"; + sha256 = "1d7a61rbc7rlr144v9qm6c89dnchn7xwcv05gl6kdapb7gir9l8f"; }; packageRequires = [ async ]; meta = { @@ -3176,10 +3296,10 @@ elpaBuild { pname = "isl"; ename = "isl"; - version = "1.6"; + version = "1.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/isl-1.6.tar"; - sha256 = "1bsqq3i7flpbihvcmvcwb1s3gabq6wslwpamcqhcf15j30znwhb1"; + url = "https://elpa.nongnu.org/nongnu/isl-1.7.tar"; + sha256 = "1nksczxv2bq6l8wg855a0ahzp1w3dhai4vwni8hyrp5fk2z0gcan"; }; packageRequires = [ ]; meta = { @@ -3240,17 +3360,21 @@ elpaBuild, fetchurl, fsm, + keymap-popup, lib, }: elpaBuild { pname = "jabber"; ename = "jabber"; - version = "0.10.5"; + version = "0.12.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/jabber-0.10.5.tar"; - sha256 = "1vjmajcls0l6mwccqdp7gr4g4r1z6f2qaf2palnimjb7w3gzh4mk"; + url = "https://elpa.nongnu.org/nongnu/jabber-0.12.2.tar"; + sha256 = "0klii5m93g5dva7wrf7v0habb9pghrpa6kw63c5x1ym2w7sh8v6q"; }; - packageRequires = [ fsm ]; + packageRequires = [ + fsm + keymap-popup + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/jabber.html"; license = lib.licenses.free; @@ -3344,6 +3468,7 @@ keycast = callPackage ( { compat, + cond-let, elpaBuild, fetchurl, lib, @@ -3351,12 +3476,15 @@ elpaBuild { pname = "keycast"; ename = "keycast"; - version = "1.4.7"; + version = "1.4.8"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/keycast-1.4.7.tar"; - sha256 = "0ipjn0b9jr6m7a88f76mz6j5na20hix94h8c5ghv705izjlqla0w"; + url = "https://elpa.nongnu.org/nongnu/keycast-1.4.8.tar"; + sha256 = "0rgaqc2d7n8a498n8jb14890gp6z49nqnpzk1h0xw03hnh8smz90"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + cond-let + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/keycast.html"; license = lib.licenses.free; @@ -3395,10 +3523,10 @@ elpaBuild { pname = "lem"; ename = "lem"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/lem-0.24.tar"; - sha256 = "1ykyahpd7y43lf3vk3a0w9rjim4lsm35mlw1qqljbixci2izk797"; + url = "https://elpa.nongnu.org/nongnu/lem-0.25.tar"; + sha256 = "1hrnq46bmz10a3w89flhw85rqs58wpnywslx3p8g16196ln348sd"; }; packageRequires = [ fedi @@ -3420,10 +3548,10 @@ elpaBuild { pname = "llama"; ename = "llama"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/llama-1.0.4.tar"; - sha256 = "0kxrbsck78f4r4npssywai2paf9mlyx59zpnfvmkgv50gphrwx7h"; + url = "https://elpa.nongnu.org/nongnu/llama-1.0.5.tar"; + sha256 = "10ysi2a7aifp9ixrhygfcas7zn9dfqy1zpiycwz3gamlzkvjzw2l"; }; packageRequires = [ compat ]; meta = { @@ -3473,10 +3601,10 @@ elpaBuild { pname = "loopy"; ename = "loopy"; - version = "0.15.0"; + version = "0.16.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/loopy-0.15.0.tar"; - sha256 = "18l1bml8xiji0mgmm6fb669iwyidg7pay231kv14kbv1agiwfkbp"; + url = "https://elpa.nongnu.org/nongnu/loopy-0.16.1.tar"; + sha256 = "17p5km90v2pwwqr66x39h2ca6dx47xig1rkpvk1m4nlw32nqv1dh"; }; packageRequires = [ compat @@ -3600,10 +3728,10 @@ elpaBuild { pname = "magit"; ename = "magit"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-4.5.0.tar"; - sha256 = "080hc0y9pah86g7nw1x1gh2issap54r8dg9vzpm2l923cxy9jnbp"; + url = "https://elpa.nongnu.org/nongnu/magit-4.6.0.tar"; + sha256 = "0m7n3jvdf8d40wzglz67addk1nwwbvb7wkm0nq1mjpayqvwqyjml"; }; packageRequires = [ compat @@ -3633,10 +3761,10 @@ elpaBuild { pname = "magit-section"; ename = "magit-section"; - version = "4.5.0"; + version = "4.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/magit-section-4.5.0.tar"; - sha256 = "1k63g8ayvg152r16ml5ph8q07qs5a424vs4i5q32icvl78v6cn2z"; + url = "https://elpa.nongnu.org/nongnu/magit-section-4.6.0.tar"; + sha256 = "085fr4fnk2wcd9z5l4ks20q69r501sx96abhyw80lshbd9rzj59z"; }; packageRequires = [ compat @@ -3682,10 +3810,10 @@ elpaBuild { pname = "mastodon"; ename = "mastodon"; - version = "2.0.16"; + version = "2.0.17"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.16.tar"; - sha256 = "0zyqqfxg7b22pj8y181x30rhy81ijbm21ai70l7cq79dr2a3yr96"; + url = "https://elpa.nongnu.org/nongnu/mastodon-2.0.17.tar"; + sha256 = "1yg1fylz1dp7my8zfnscnvd1sdhjhi45xw10sqn3rmqmmrwd87d9"; }; packageRequires = [ persist @@ -4227,20 +4355,22 @@ elpaBuild, fetchurl, lib, + llama, magit, org, }: elpaBuild { pname = "orgit"; ename = "orgit"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/orgit-2.1.2.tar"; - sha256 = "10cc70538mq89ypwcb22x4797qa38z60mw0h67xdf2zisdiw5c6z"; + url = "https://elpa.nongnu.org/nongnu/orgit-2.2.0.tar"; + sha256 = "0lw6mp6war3aqsad8vbdpz33nx7kki8df39xm7gnq1ja2dkgf9ah"; }; packageRequires = [ compat cond-let + llama magit org ]; @@ -4482,10 +4612,10 @@ elpaBuild { pname = "pg"; ename = "pg"; - version = "0.65"; + version = "0.68"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/pg-0.65.tar"; - sha256 = "1gf93xsldhx105r5m03hiq3lzlzb3r5pjd3j99jl0gs3z8pmn8ic"; + url = "https://elpa.nongnu.org/nongnu/pg-0.68.tar"; + sha256 = "0nnr5gz4bm0hfdwj8f0vkfwb2apbk5sv3l85q7b420nwcs7d546r"; }; packageRequires = [ peg ]; meta = { @@ -4580,6 +4710,7 @@ ) { }; projectile = callPackage ( { + compat, elpaBuild, fetchurl, lib, @@ -4587,12 +4718,12 @@ elpaBuild { pname = "projectile"; ename = "projectile"; - version = "2.9.1"; + version = "3.2.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/projectile-2.9.1.tar"; - sha256 = "07icp9baa7jkyqnz4b1sxl1dg88y5vzzhiwyfb12q349flbkkkb1"; + url = "https://elpa.nongnu.org/nongnu/projectile-3.2.1.tar"; + sha256 = "07hfhfbig1zw1fs0k7m22n3wqdyk4fj5fbpcrg0x4q2dw05r5bbj"; }; - packageRequires = [ ]; + packageRequires = [ compat ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/projectile.html"; license = lib.licenses.free; @@ -4652,10 +4783,10 @@ elpaBuild { pname = "racket-mode"; ename = "racket-mode"; - version = "1.0.20260303.123213"; + version = "1.0.20260626.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260303.123213.tar"; - sha256 = "1wxhdrwm2fr3rnv7ghziibnpbx99z9qdaa54zd11jzjpkjgf2jxs"; + url = "https://elpa.nongnu.org/nongnu/racket-mode-1.0.20260626.0.tar"; + sha256 = "0y45m019fl0rdgjdz9ap1cr5agqg0gssfi04p33xqdcjkwrf51d0"; }; packageRequires = [ compat ]; meta = { @@ -4906,10 +5037,10 @@ elpaBuild { pname = "scad-mode"; ename = "scad-mode"; - version = "98.0"; + version = "99.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/scad-mode-98.0.tar"; - sha256 = "0ksiz8rxxykm2lnc2lil1qndpl0lxcw8fa9nlh420xva9m3s9sda"; + url = "https://elpa.nongnu.org/nongnu/scad-mode-99.0.tar"; + sha256 = "1wdb7ri2716r4m22asj370c3mnjchcsnxjwbw3m13rgvkj2ax6j4"; }; packageRequires = [ compat ]; meta = { @@ -5044,6 +5175,28 @@ }; } ) { }; + simple-httpd = callPackage ( + { + compat, + elpaBuild, + fetchurl, + lib, + }: + elpaBuild { + pname = "simple-httpd"; + ename = "simple-httpd"; + version = "1.6"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/simple-httpd-1.6.tar"; + sha256 = "08rkqid2c11dl0sm8795jzkiilj02kbq6xy56b3bh83pc09wfmay"; + }; + packageRequires = [ compat ]; + meta = { + homepage = "https://elpa.nongnu.org/nongnu/simple-httpd.html"; + license = lib.licenses.free; + }; + } + ) { }; slime = callPackage ( { elpaBuild, @@ -5265,10 +5418,10 @@ elpaBuild { pname = "subed"; ename = "subed"; - version = "1.4.2"; + version = "1.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/subed-1.4.2.tar"; - sha256 = "0crpgxqk164z602iajhx7b0zxdjs5f9g8hv0q6n1vjrsby87pl1x"; + url = "https://elpa.nongnu.org/nongnu/subed-1.5.1.tar"; + sha256 = "0gk9r2dvmrxpz4gpypnnzjgph6xasn5f9i51cx1hnd9r5zim2qy3"; }; packageRequires = [ ]; meta = { @@ -5304,17 +5457,16 @@ elpaBuild, fetchurl, lib, - seq, }: elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "9.4.0"; + version = "10.0.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-9.4.0.tar"; - sha256 = "0zfwzz5n98svv1if9wwj37hraiw2in06ks7n3mnk1jjik54kmpxd"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-10.0.0.tar"; + sha256 = "07wydsy8ihfmr1i4hya270f9v5dy9mfn6kzbmyj3kf9kx5grhybl"; }; - packageRequires = [ seq ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/swift-mode.html"; license = lib.licenses.free; @@ -5572,10 +5724,10 @@ elpaBuild { pname = "tp"; ename = "tp"; - version = "0.8"; + version = "0.9"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tp-0.8.tar"; - sha256 = "1psa4sdia1vx3l2v1lklc8wy8nqbq6g83fyj46xii20rfm4db9hk"; + url = "https://elpa.nongnu.org/nongnu/tp-0.9.tar"; + sha256 = "0xaqynvw65l5dm3hxba6v8jrh2pvn6b2q0npsf9sdwryjg2zlk41"; }; packageRequires = [ transient ]; meta = { @@ -5649,7 +5801,6 @@ ) { }; tuareg = callPackage ( { - caml, elpaBuild, fetchurl, lib, @@ -5657,12 +5808,12 @@ elpaBuild { pname = "tuareg"; ename = "tuareg"; - version = "3.0.1"; + version = "3.1.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/tuareg-3.0.1.tar"; - sha256 = "04lb71cafg4bqicx3q3rb9jpxbq6hmdrzw88f52sjqxq5c4cqdkj"; + url = "https://elpa.nongnu.org/nongnu/tuareg-3.1.0.tar"; + sha256 = "1fhw143rmdzrfrh6y3jdsyq6yqwv1dy6m6sg4s3mbqhnhxawc9sm"; }; - packageRequires = [ caml ]; + packageRequires = [ ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/tuareg.html"; license = lib.licenses.free; @@ -5868,10 +6019,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.3.23"; + version = "17.3.24"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.23.tar"; - sha256 = "17l0lda5p8nf239b0x43w8fx9a87rmk9rk282983nqi4f57iyzb2"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.3.24.tar"; + sha256 = "129hz6h2ygmqhn3bbjxx2gpdnvh0gifc4xaipsjz0716rj1s0k81"; }; packageRequires = [ ]; meta = { @@ -5972,19 +6123,25 @@ with-editor = callPackage ( { compat, + cond-let, elpaBuild, fetchurl, lib, + llama, }: elpaBuild { pname = "with-editor"; ename = "with-editor"; - version = "3.4.9"; + version = "3.5.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/with-editor-3.4.9.tar"; - sha256 = "0bzwxy67x8yvs1qv2m5mzkcssk9r3dm1zvq2map6kpscqgc15gq8"; + url = "https://elpa.nongnu.org/nongnu/with-editor-3.5.2.tar"; + sha256 = "1qibgsb67zh8k8mpk3ghy2ilmrmf3dxz75clfvn2qji5ds2qlkzq"; }; - packageRequires = [ compat ]; + packageRequires = [ + compat + cond-let + llama + ]; meta = { homepage = "https://elpa.nongnu.org/nongnu/with-editor.html"; license = lib.licenses.free; @@ -6089,10 +6246,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "28.11.20260416140940"; + version = "28.11.20260712150256"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260416140940.tar"; - sha256 = "0zzdwrd4h12bqlxzpj7xs4m5cdgx9nbljrnyld6qs5b19352izyl"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-28.11.20260712150256.tar"; + sha256 = "1c4xsvmc92ydil78j2kk6avgswgz4ll5fx4mrlsmrq1z57v99ca1"; }; packageRequires = [ ]; meta = { @@ -6196,10 +6353,10 @@ elpaBuild { pname = "zenburn-theme"; ename = "zenburn-theme"; - version = "2.9.0"; + version = "2.10.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.9.0.tar"; - sha256 = "0nldp5id0lkajnqpzw8agmpdjm0jfb70ma2wip06nh5zqcrrpg6s"; + url = "https://elpa.nongnu.org/nongnu/zenburn-theme-2.10.0.tar"; + sha256 = "0h1qd1xay2ci51y3vdq480afbx6hq40ywplsh76m85mr199pf751"; }; packageRequires = [ ]; meta = { diff --git a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json index 4487c767c79c..74789be8df6c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json +++ b/pkgs/applications/editors/emacs/elisp-packages/recipes-archive-melpa.json @@ -1599,20 +1599,20 @@ "repo": "xenodium/acp.el", "unstable": { "version": [ - 20260325, - 1158 + 20260719, + 342 ], - "commit": "c32fbf8df34ed0095853a8cf55dc783e68b67d90", - "sha256": "0hr1176sy8xrx6wkqadmvwdjm1sv7aq8ddrw8h3ha6sn74glx8ws" + "commit": "a29cb161ac95f1819f34481a98666707661c5cf8", + "sha256": "0mbhra3nnvfwja3bamhcg8nfgrh4l19sv5cvir452xhab0y9rs7a" }, "stable": { "version": [ 0, - 11, - 3 + 12, + 2 ], - "commit": "c32fbf8df34ed0095853a8cf55dc783e68b67d90", - "sha256": "0hr1176sy8xrx6wkqadmvwdjm1sv7aq8ddrw8h3ha6sn74glx8ws" + "commit": "c8ee1d7f70105fba8efa964ca63f38ca94a1e759", + "sha256": "1zxns3y4wgfq7mndyvia3yhmc1qzlk9f7rw3khlyl1sxr0rnim42" } }, { @@ -1728,11 +1728,11 @@ "repo": "brownts/ada-ts-mode", "unstable": { "version": [ - 20251125, - 2018 + 20260627, + 1553 ], - "commit": "52e0fd11604ab1d51a34c89e05692446d9dc5ecb", - "sha256": "064lbyywnlcgjfz86bwhk13waqsc651jrnpf9liqc55r8i97igxi" + "commit": "32fcf68dba7463902481b256cdecad08e4b5b0a7", + "sha256": "05qj0zv33f6f8gknfbpz1fdz4nx7c3zzpl62qdxb5zvdsrmmdj0a" }, "stable": { "version": [ @@ -1883,20 +1883,20 @@ "repo": "bbatsov/adoc-mode", "unstable": { "version": [ - 20260221, - 2207 + 20260612, + 638 ], - "commit": "50b601dd92f99dd9534ff44de5f411480ca32b09", - "sha256": "1sgmhsvr0kbkv86zgp82r5bs3wpn4sn7mm15fdn7mv3dsjkngssv" + "commit": "5c1484b8982845845ccd0be02629e21f1d5bed81", + "sha256": "174930vgjf35ix2q3ra40zb9n2r1x7ynnb2h8p7dp37x31v38lhv" }, "stable": { "version": [ 0, - 8, + 9, 0 ], - "commit": "6fc5ebc9478de17b1971222485e7729f04fbcf57", - "sha256": "0hjhjg9kdx849qbdhzryfv8c21h2xq02991hixykmxf1b2xv1y69" + "commit": "ba362d87d5970fa2c3287d46950063b2b686179c", + "sha256": "1d0r3nffpxzvshg72xp951fk4g8dyy7ynp6xvz65fbnsnw1sm7g7" } }, { @@ -1969,25 +1969,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20260322, - 19 + 20260519, + 1026 ], "deps": [ "consult" ], - "commit": "6e06b8efcd5b57160ba267e42cbf3b982a4b89a1", - "sha256": "1bm3fcmr8kspd09qzvxfklblapm1p3z7p9div651450pbwn0ccnx" + "commit": "ccc6e4dc3dc7c87bdd4733d174274f4710f9e99e", + "sha256": "07f3z5cp98nlmxbii8fnsq9p87v4j29pydadzic2kzckzp5rcymw" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ "consult" ], - "commit": "a1607fbc66789408128e12c9224b6a6c51d12bcb", - "sha256": "166v7d120hbk6vczj1iam85xivk6wwpvga8m0vxgcii19issh5b3" + "commit": "ccc6e4dc3dc7c87bdd4733d174274f4710f9e99e", + "sha256": "07f3z5cp98nlmxbii8fnsq9p87v4j29pydadzic2kzckzp5rcymw" } }, { @@ -2152,14 +2152,26 @@ "repo": "Marx-A00/agent-recall", "unstable": { "version": [ - 20260420, - 1713 + 20260710, + 1707 ], "deps": [ "agent-shell" ], - "commit": "a90c86c53e65f95fd19c67587ba7d904b939db3d", - "sha256": "15p23fvf6mc461j5rl4jzhhq2lkznfllhrcd9pagzzqwp0mjy8l1" + "commit": "166f421bce4a6550507e0bd2b896956d0d9d4a94", + "sha256": "1pyzipf18sjlcrgkzldgfb8dvk0j1m9g88v28r5iha99hbglg4pk" + }, + "stable": { + "version": [ + 0, + 6, + 1 + ], + "deps": [ + "agent-shell" + ], + "commit": "166f421bce4a6550507e0bd2b896956d0d9d4a94", + "sha256": "1pyzipf18sjlcrgkzldgfb8dvk0j1m9g88v28r5iha99hbglg4pk" } }, { @@ -2170,28 +2182,28 @@ "repo": "xenodium/agent-shell", "unstable": { "version": [ - 20260423, - 2254 + 20260719, + 1729 ], "deps": [ "acp", "shell-maker" ], - "commit": "21a8c8b4e735cf3f35ac857b4857817971432265", - "sha256": "0f8ds25x4fl1195jm4jn13wx791zn76my26f9xnxfslmiam6f36a" + "commit": "d5675782a24e6e6ea850d5015e6b7cacf305854c", + "sha256": "1l6pv6zr5630lygaf7lmbaic2pbjxbf5n873c8lzg60cfswfydnz" }, "stable": { "version": [ 0, - 50, + 62, 1 ], "deps": [ "acp", "shell-maker" ], - "commit": "68b8c394a4838fb54f7dbfc70cee38e7310f03a3", - "sha256": "0njajpz51pbz4hqaq7lcvwaypilq1c9sdxsk6sdxgk1xpivqlxfb" + "commit": "4a4b98b008ce9dba2edf22dc3a265abd1679ab0d", + "sha256": "0i46dw0a1djr8yx239x51i3cqd11zqs1lcrdzi87r8gvy82bd7wk" } }, { @@ -2244,16 +2256,16 @@ "repo": "halvin/agitjo", "unstable": { "version": [ - 20260415, - 1451 + 20260523, + 2048 ], "deps": [ "magit", "markdown-mode", "transient" ], - "commit": "47f20e04ed09724b0859cade3cb52eae31274c13", - "sha256": "046fcrhm0fhnq2fygbswbcyl21davbjirjl9mq7cdx5cl5x4kg5q" + "commit": "fa9737479f44c62f76e2dc6561ffb340d8eead3e", + "sha256": "07hf538qbj2anb3007i7vafmbb87szs5n4cimpmh2g97j2vzxwah" }, "stable": { "version": [ @@ -2365,33 +2377,33 @@ }, { "ename": "ai-code", - "commit": "3751d27902c40d37f780bc8304d9a54fb23cc929", - "sha256": "1ans15163afvmh3l6mn1j8h5sbkivxqmf9v9wcbgs33xrnl6xc85", + "commit": "091b5d894f5a30a31790d1d834f14e2405955a3c", + "sha256": "039bx5s9pwjrf6cfbaiq10vx7jrgg8z05xyvv8i5p7pqmc3c06vn", "fetcher": "github", "repo": "tninja/ai-code-interface.el", "unstable": { "version": [ - 20260423, - 1511 + 20260719, + 2236 ], "deps": [ "magit", "transient" ], - "commit": "bb725e376479d0c6ac50f47fd89b7f8972db2465", - "sha256": "0lzxd2v7v5fysna2ywh8zks5s51kf2naqw9mp3mcmbx482n5sv86" + "commit": "0a7839ccc93f9769a27aa382da581518bcbf7390", + "sha256": "14dfcwv0zb4hv15az1vwg6xvznxli8hfyjhl3s9g3f2l3qp5rqxf" }, "stable": { "version": [ 1, - 74 + 900 ], "deps": [ "magit", "transient" ], - "commit": "e44a49ef51ab795538cb39238c9290c0ac2783c9", - "sha256": "1ra6r227d5b7g0rynb8a3ngb9cpa3zjjjrbvb778bkc3h1fr6mz6" + "commit": "0a7839ccc93f9769a27aa382da581518bcbf7390", + "sha256": "14dfcwv0zb4hv15az1vwg6xvznxli8hfyjhl3s9g3f2l3qp5rqxf" } }, { @@ -2438,29 +2450,29 @@ "repo": "MatthewZMD/aidermacs", "unstable": { "version": [ - 20251203, - 2318 + 20260719, + 1435 ], "deps": [ "compat", "markdown-mode", "transient" ], - "commit": "6d0c41d1cfd24821fb32933edf8c0c2a9bb8c847", - "sha256": "0mwh2ikw3kkbphm2f8grgygmib51azwisp5s7nljb17aq7ncdk3h" + "commit": "c548c5cf0d4a427a9c59d6e384ac1d96c285adbe", + "sha256": "0rk8h2vjzkrwzmqsrw2pf3hikbj10v5n6z7jjjjil8pqj146whjy" }, "stable": { "version": [ 1, - 6 + 8 ], "deps": [ "compat", "markdown-mode", "transient" ], - "commit": "9cd6796833b7f830b55d2e3dcc6ef05693bed61b", - "sha256": "0fbhigzba5mj9303bvwn999dain916zqc59hvl2gk7v2i5gr1wmb" + "commit": "7496878820661a950ef1b28ce8814177b3010825", + "sha256": "0rn0va9k69bf5021w4b8g76m5lsvp2h8ch5ch4kb0060xmdnc2gb" } }, { @@ -2609,15 +2621,15 @@ "repo": "alan-platform/AlanForEmacs", "unstable": { "version": [ - 20260209, - 1113 + 20260523, + 1330 ], "deps": [ "flycheck", "s" ], - "commit": "87eed317ea7eac483a33680fd230ffc9f0eb3297", - "sha256": "1ky2znrnmsjl9vahlbkcrmab6cbjf5j7ja3iixb2wir3d712fifv" + "commit": "10d7a0a51451e9b023ac3dc0b24fdba9d81ecb2c", + "sha256": "11413241wr0sa913nvilkn5b0x70b22xhpr0gwn6c6f4qhzpw49c" }, "stable": { "version": [ @@ -2748,14 +2760,14 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20260406, - 2342 + 20260525, + 2000 ], "deps": [ "flycheck" ], - "commit": "86bac4eae28c2d6f27859a4ca8821a374e8b1c4f", - "sha256": "1gfsrr9w2xj0synd9i0xzrrva7k6ngdf53j4aidh66wg75iihws1" + "commit": "bf99e72c54579460769984ba668e46c235ad18d8", + "sha256": "0nnzxhp3y98ay9sykig8v5fh468ysdn98dka3mb3wj4l3kwwf7qj" }, "stable": { "version": [ @@ -3091,15 +3103,15 @@ "repo": "mohkale/all-the-icons-nerd-fonts", "unstable": { "version": [ - 20240210, - 1127 + 20260614, + 1246 ], "deps": [ "all-the-icons", "nerd-icons" ], - "commit": "67a9cc9de2d2d4516cbfb752879b1355234cb42a", - "sha256": "00klvdalj8051axxg50dq4wdbzzrfr7ayzq8a6zzpnbhzlq7j2f6" + "commit": "4583cf5e8cce73c35e8ec3195915ce693d703bb1", + "sha256": "0lc770zw5v3k97mi39ppkgag3p9i49wwxrmycw1n9264xpjvqcjk" } }, { @@ -3283,11 +3295,11 @@ "repo": "jordonbiondo/ample-theme", "unstable": { "version": [ - 20240426, - 1545 + 20260611, + 1532 ], - "commit": "39ac29cf9a1229bb076964335fbd71cfb52e498b", - "sha256": "1s2k1r3wwvwa3rkfsyg5y9386fl0v4qzlqriwldblpq5glyg40qq" + "commit": "6952b29a588c854084ca1360bed16c9bc2d48e37", + "sha256": "1jxlfqbgjwc4s5y8b7v3qhpqgx5klq5hfkxlqn9gygg2plc726xy" } }, { @@ -3438,11 +3450,11 @@ "repo": "rolandwalker/anaphora", "unstable": { "version": [ - 20240120, - 1744 + 20260720, + 903 ], - "commit": "a755afa7db7f3fa515f8dd2c0518113be0b027f6", - "sha256": "1mmil5ckb623wxxmvw1cfi1fycxiz7aalfjm768h7wc73xfa7ks4" + "commit": "d22ae8afd3b3bf6a383f6a6c27522893b57130b1", + "sha256": "10nn49csvxqljhj17v1qlqzhmzrx5lz7yzp5fa33xjy7gn7j1v8d" }, "stable": { "version": [ @@ -3596,28 +3608,28 @@ "repo": "kickingvegas/anju", "unstable": { "version": [ - 20260424, - 156 + 20260701, + 2139 ], "deps": [ "casual", "markdown-mode" ], - "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06", - "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x" + "commit": "f5d27108ffe5facb6886fab191068efd1faea39f", + "sha256": "0agkin9ph1mhfl3dr4p2ljs48npjgm70kpxd43vl5xgyz1dhkkfl" }, "stable": { "version": [ 1, - 2, + 8, 0 ], "deps": [ "casual", "markdown-mode" ], - "commit": "7a700608e9143f8e29a533bdeee9a6f175df6d06", - "sha256": "1gfwd0j1bwnggj0sjw1kcwx462qcvxjg1px2vfzmsh41zbxlv02x" + "commit": "f5d27108ffe5facb6886fab191068efd1faea39f", + "sha256": "0agkin9ph1mhfl3dr4p2ljs48npjgm70kpxd43vl5xgyz1dhkkfl" } }, { @@ -3643,11 +3655,11 @@ "repo": "anki-editor/anki-editor", "unstable": { "version": [ - 20260317, - 715 + 20260714, + 1156 ], - "commit": "982a9d141fe87b1378f6695c3804e30446cbeac2", - "sha256": "14bcsx9f0lcbmw709qgjb20yrqdc0dfkbv7dgq7qva0j86z0gkih" + "commit": "4a55c3f937b176d31e36d484c196682cae9f9104", + "sha256": "02q4qh3hliah8h4648vbn13mw5xspps54kwp1k9gvxmnmz8ch85f" } }, { @@ -3728,14 +3740,14 @@ "repo": "noctuid/annalist.el", "unstable": { "version": [ - 20240501, - 1201 + 20260531, + 1558 ], "deps": [ "cl-lib" ], - "commit": "e1ef5dad75fa502d761f70d9ddf1aeb1c423f41d", - "sha256": "1di8wknirx3ql9bqp940yy5p07n2x82wgqyvfmdxblagh7pcp8a8" + "commit": "0d958732b710a8e9edc4c70b2318570e1c7d4923", + "sha256": "062rxrs0hcd9zgjpb7bnyrlkvmsh66mp7lixfjal8v71fbvd8j77" }, "stable": { "version": [ @@ -3758,11 +3770,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20251111, - 1635 + 20260514, + 1320 ], - "commit": "9c80b465297dce20901abaf0389a48951b6e030f", - "sha256": "04d8737kjqavg8j062wf6z1fd7k8l25bcc7h82fgg9w485c953qk" + "commit": "347525024f319ab50735ef324e8900aecda3724c", + "sha256": "0b6mzkfk4wabhrriwya8gzly5sp5nvc80p491fw0ib8p3cg39504" }, "stable": { "version": [ @@ -3879,28 +3891,28 @@ "repo": "emacs-ansible/emacs-ansible", "unstable": { "version": [ - 20250613, - 2354 + 20260607, + 1852 ], "deps": [ "f", "s" ], - "commit": "7385222a4f209eca6d72d412c03da99097e2755f", - "sha256": "0b5rrkxygxhnixbwhv5gsz3d216l2j6ljbvipdyysmvzv4fxmgwj" + "commit": "0d7bc93ad963677880d99c846a30ea6e6ed9eec5", + "sha256": "04zr6vswxnh3jqf180lv32s4f6bap8913fym2d2gnmjv7nb6wb3i" }, "stable": { "version": [ 0, 4, - 2 + 3 ], "deps": [ "f", "s" ], - "commit": "7385222a4f209eca6d72d412c03da99097e2755f", - "sha256": "0b5rrkxygxhnixbwhv5gsz3d216l2j6ljbvipdyysmvzv4fxmgwj" + "commit": "0d7bc93ad963677880d99c846a30ea6e6ed9eec5", + "sha256": "04zr6vswxnh3jqf180lv32s4f6bap8913fym2d2gnmjv7nb6wb3i" } }, { @@ -4176,20 +4188,20 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20260422, - 253 + 20260619, + 1935 ], - "commit": "1720200b1271a9e70ebfc86c0f942ff02aefcdd1", - "sha256": "19wwb71v7jpwhrk3y1pn39sb0knizfg1vrgscflgvcgk3qc8l3kr" + "commit": "14a0bb4454fb2cc3b5b377619288b742ce117da5", + "sha256": "0yp74vmwiav15igwcmgjngzylixw11ayrhyj3wg97w07sqxivlcr" }, "stable": { "version": [ 4, - 4, - 3 + 5, + 0 ], - "commit": "2bc2bb4cc2caad111e6f2f1b9daf20ec388101ff", - "sha256": "1vs532hjkwj19laigqvvk11r0gwhv5vd8v6wh5598dzmfw3yh4bm" + "commit": "b5d120a419816f9d6b3d0e45f0951dd3d6a10b77", + "sha256": "181whpb774gv3k2xxswxkjhd3075r2dpgvdfmpsjqyl2s1jpn5fj" } }, { @@ -4267,11 +4279,26 @@ "repo": "apparmor/apparmor-mode", "unstable": { "version": [ - 20260311, - 140 + 20260515, + 454 ], - "commit": "fd9c6f142602bf5ed730305419b2b7cad2269e57", - "sha256": "1xw2v51m7x68xx36z41qqxy1vwd3aszfz4qkx8bhdic7n7xqv9xy" + "commit": "b0e4bbcd30aafd71f484c74164351af40ef885bf", + "sha256": "04kz786xwmsv8w879c9nwspgv0dgfkqmrg2frplhvyizdi0cfinl" + } + }, + { + "ename": "apple-container-tramp", + "commit": "497d8e93d2e3faaa2bf6c63548bf43c5f6862f5b", + "sha256": "0kzx8dvrv36nppvw3l5zqfzri1clql2wr0x7513cp43k9971f70f", + "fetcher": "github", + "repo": "major1201/apple-container-tramp.el", + "unstable": { + "version": [ + 20260504, + 1350 + ], + "commit": "f47d58d029c594f4c9e9b1cfff79630de68a9cb5", + "sha256": "0545qhdnwdm3cqxa25mkll8qkr818za1wmp8vmnqbs0q9qckyf61" } }, { @@ -4464,11 +4491,11 @@ "repo": "motform/arduino-cli-mode", "unstable": { "version": [ - 20250524, - 901 + 20260628, + 2219 ], - "commit": "aa93d49dc90c54e61b70f40fe88967fc0ae04927", - "sha256": "1b84gaz8libqfapkgxfbbsbn5pvzxnm6b7c96vbxa0ry3jc0bd34" + "commit": "d5614acdca80871cf4db65843227223b5a0e3a2c", + "sha256": "03av4cy826kxi8lxl3asay044dxnax5wxlx3i7hbmya20rckczqh" } }, { @@ -4680,20 +4707,20 @@ "repo": "bbatsov/asciidoc-mode", "unstable": { "version": [ - 20260222, - 1804 + 20260612, + 645 ], - "commit": "4b5e89bedc0453e63147e08cdd759cbf2e31be26", - "sha256": "0gn8lcx2j6yrgh0wggnb6hjs5x1hwhvbc6g2f7vk42hsgz5skng4" + "commit": "8914fad451f9c7f9c2286cf18db5edaa51a92cd7", + "sha256": "07mmc2xg0dyrxsas5xqvfa3bmscww240707l5kf0l1k18dbxa06f" }, "stable": { "version": [ 0, - 1, + 4, 0 ], - "commit": "4b5e89bedc0453e63147e08cdd759cbf2e31be26", - "sha256": "0gn8lcx2j6yrgh0wggnb6hjs5x1hwhvbc6g2f7vk42hsgz5skng4" + "commit": "aa836bb0aa25427914ef3a938ed218aedd9123d9", + "sha256": "07imzld1j3jkr2p327ha1h1qikzw8jn3hxqzin9rs4m8av5fn38g" } }, { @@ -4835,20 +4862,20 @@ "repo": "SunskyXH/ast-grep.el", "unstable": { "version": [ - 20250703, - 723 + 20260702, + 238 ], - "commit": "3682f0cab0147e85d3f8ffc6b68b1dc30ffba5cd", - "sha256": "01hcdqd4wccpynhfjgbvcm7rn343qkbfh61p2bkmsll29ias3lcs" + "commit": "28bc6e9ac21acf1d1ef58b962b6acd670c27e80f", + "sha256": "1li2aj2aaicpc291igzkfsvjdr85nnd27kc976389zn0ngqngyd4" }, "stable": { "version": [ 0, - 1, - 2 + 6, + 0 ], - "commit": "cb9e9c453abaf7852dda84707152e52ad7f9e910", - "sha256": "08akfj0g27qy7a2l6p5rssinh5l2rgambzx95ggpdzg1rbzxw8yd" + "commit": "28bc6e9ac21acf1d1ef58b962b6acd670c27e80f", + "sha256": "1li2aj2aaicpc291igzkfsvjdr85nnd27kc976389zn0ngqngyd4" } }, { @@ -5403,27 +5430,25 @@ "repo": "alezost/aurel", "unstable": { "version": [ - 20170114, - 937 + 20260429, + 458 ], "deps": [ - "bui", - "dash" + "bui" ], - "commit": "fc7ad208f43f8525f84a18941c9b55f956df8961", - "sha256": "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94" + "commit": "c571cc44ea3b9aa96399056bff22919efffbbb06", + "sha256": "1h2x0424s9ia6wb4yd3rsq9xn90fzbydhqlqikgrf4mk1ab7pnl3" }, "stable": { "version": [ 0, - 9 + 10 ], "deps": [ - "bui", - "dash" + "bui" ], - "commit": "fc7ad208f43f8525f84a18941c9b55f956df8961", - "sha256": "0mcbw8p4wrnnr39wzkfz9kc899w0k1jb00q1926mchf202cmnz94" + "commit": "c571cc44ea3b9aa96399056bff22919efffbbb06", + "sha256": "1h2x0424s9ia6wb4yd3rsq9xn90fzbydhqlqikgrf4mk1ab7pnl3" } }, { @@ -5619,26 +5644,26 @@ }, { "ename": "auto-compile", - "commit": "57a2fb9524df3fdfdc54c403112e12bd70888b23", - "sha256": "08k9wqk4yysps8n5n50v7lpadwsnm553pv9p7m242fwbgbsgz6nf", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "0d7l6vc1vp0kg1rlh7nl6bf9w08sw67wci1q16br0g584bwh8cjz", "fetcher": "github", "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20260301, - 1252 + 20260601, + 1449 ], - "commit": "cc51aea86617cab6cb1ef76672a343f2bf3206c1", - "sha256": "0pccv3jgl6grfl1rh0yspdcg2kfap0sn24gj5ps5vz6mqli85221" + "commit": "4db3a0e497feecc8b3dbeeefacdf363ae60a6392", + "sha256": "1kcmr2jb79qg6jx8pfw2yxgsiwx3hwgwglbjwamr8hv9swj5jdl1" }, "stable": { "version": [ 2, 1, - 3 + 4 ], - "commit": "cc51aea86617cab6cb1ef76672a343f2bf3206c1", - "sha256": "0pccv3jgl6grfl1rh0yspdcg2kfap0sn24gj5ps5vz6mqli85221" + "commit": "4db3a0e497feecc8b3dbeeefacdf363ae60a6392", + "sha256": "1kcmr2jb79qg6jx8pfw2yxgsiwx3hwgwglbjwamr8hv9swj5jdl1" } }, { @@ -5986,11 +6011,11 @@ "repo": "mina86/auto-dim-other-buffers.el", "unstable": { "version": [ - 20250116, - 1402 + 20260624, + 950 ], - "commit": "d8591d048f97478e75c71830fb6d7c009351c73d", - "sha256": "0ipx6gpgbap5jxkvhxxifllhcjyap552835jz26h9w3ppa4q1hig" + "commit": "cf0263073470190b85f6013066856126aac67d19", + "sha256": "047zvky0m51c31y6ai7g2y2y4zndrx3fv9ymvv1nlk595qc4rg4r" } }, { @@ -6091,14 +6116,14 @@ "repo": "rranelli/auto-package-update.el", "unstable": { "version": [ - 20211108, - 2025 + 20260601, + 1804 ], "deps": [ "dash" ], - "commit": "ad95435fefe2bb501d1d787b08272f9c1b7df488", - "sha256": "00456kxd1zb5lcwkm211mhdgkl0b01pp4fbkl1ryvdnhddn83ipv" + "commit": "e966c6c95de1742d867250dc15b1c6bd570b6ea5", + "sha256": "06ndbwk6agzzymdw1zk1j12xa2cc8q2118bv482sjhvlm8asv7bj" }, "stable": { "version": [ @@ -6136,14 +6161,14 @@ "repo": "zonuexe/auto-read-only.el", "unstable": { "version": [ - 20200827, - 1754 + 20260521, + 1659 ], "deps": [ "cl-lib" ], - "commit": "db209bf5b7f76f4c3dc4d0892fc6a24430779f29", - "sha256": "0zb8n97x5ji9clyls7k5pj7pq3yms82b6wgkww6djcabb26b5xb4" + "commit": "206d4559762fe6ef9e91de8f9dc43e1e41c0f42c", + "sha256": "1vgi84yvpbvmsaydwhpzc5vwcj62lwijw91wpw4182gqfzbva9pf" } }, { @@ -6540,14 +6565,14 @@ "repo": "jasonm23/autothemer", "unstable": { "version": [ - 20251114, - 415 + 20260530, + 2349 ], "deps": [ "dash" ], - "commit": "e62bf83414abd8b1cefafb7480612faa30ed7878", - "sha256": "0w7qrfl38qc64a6bansrmvzxcdrlfpkd4l41scgr242dgy4dnq45" + "commit": "99fd9b45ef6cc931fcf030b1a6c050ca3c17ce04", + "sha256": "1cw9j6vfkppzrcaxacb9hjnxwcds6nx1xwgyvhb9wv79pnigr7z6" }, "stable": { "version": [ @@ -6839,15 +6864,14 @@ "repo": "zkry/awqat", "unstable": { "version": [ - 20250727, - 1902 + 20260613, + 2054 ], "deps": [ - "alert", - "s" + "alert" ], - "commit": "52754b230c5796eb9c8aaeda87083855c4235f32", - "sha256": "1r2q2amn3qry6k7z1wyyfmabb6kq5ggr8068apwpb1vc4jgc5prn" + "commit": "0ef8501dc31774cbc6b17f8b899609a45c1fe0c7", + "sha256": "03jm1hpl9mymbb1kfnf8a7kqd4j5zp18p35jff3642zh4bgwycy9" } }, { @@ -7069,28 +7093,28 @@ "repo": "tarsius/backline", "unstable": { "version": [ - 20260101, - 1825 + 20260601, + 1450 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "ba263f5ea3dc1818c7a61b50acec52fe2cce02ca", - "sha256": "02wk8qhy1ns1dfbgid7z77hjiywmx5ngv3bvli5h5js1zkj9fcr9" + "commit": "cc6e54e40bdbb725cdaf0cc95cef8cd48dce413f", + "sha256": "1jnxp817jc5b38xmfp67n17fyzib06fg5waly6zalnmcrsqdm2cq" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "compat", "outline-minor-faces" ], - "commit": "ba263f5ea3dc1818c7a61b50acec52fe2cce02ca", - "sha256": "02wk8qhy1ns1dfbgid7z77hjiywmx5ngv3bvli5h5js1zkj9fcr9" + "commit": "cc6e54e40bdbb725cdaf0cc95cef8cd48dce413f", + "sha256": "1jnxp817jc5b38xmfp67n17fyzib06fg5waly6zalnmcrsqdm2cq" } }, { @@ -7220,11 +7244,20 @@ "repo": "wbolster/emacs-balanced-windows", "unstable": { "version": [ - 20190903, - 1120 + 20260706, + 1545 ], - "commit": "1da5354ad8a9235d13928e2ee0863f3642ccdd13", - "sha256": "1hsjg48jlfi6lc6izp9xcfqvxj7c0ivjrfsr2q3yv3s1iy2fz37l" + "commit": "f94f9cbe832147396bb0d67e687a9dc33ec2a2c5", + "sha256": "081k5qdvjp3f9swnn45azsy233x9sza9y1qj7sy85bj7xcrmz82q" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "f94f9cbe832147396bb0d67e687a9dc33ec2a2c5", + "sha256": "081k5qdvjp3f9swnn45azsy233x9sza9y1qj7sy85bj7xcrmz82q" } }, { @@ -7334,11 +7367,11 @@ "repo": "tinted-theming/base16-emacs", "unstable": { "version": [ - 20260419, + 20260719, 235 ], - "commit": "8461432c62353f302b79bf0b2db2f99b83183dbe", - "sha256": "1n36k7fax231x07n82licps5kvm682nz1adr93ly7np5434m0926" + "commit": "0fa7a37a5140cc64f44ef404309b8961d2e46562", + "sha256": "1ahay37adsv3givhcpc1jzl054sw9n8rslk3m786fjvqn4zn5h92" }, "stable": { "version": [ @@ -7505,11 +7538,11 @@ "repo": "bbatsov/batppuccin-emacs", "unstable": { "version": [ - 20260421, - 1706 + 20260703, + 608 ], - "commit": "4e9c240c332e745d58cf47ad900fdeefb01f707a", - "sha256": "0xlhiybbnxgjgiqh88h9fp8q5gdkgwrjir2pm3afqmrhhzr3d933" + "commit": "5fc17c1c403bed4b7728ee0afbb4563749fd381d", + "sha256": "1gg69xxdalb5ylh2h7kii0ncp5ffj2501f0vzpmcwz31w47510w1" }, "stable": { "version": [ @@ -7992,15 +8025,28 @@ "repo": "pastor/ben.el", "unstable": { "version": [ - 20260424, - 826 + 20260626, + 1926 ], "deps": [ "inheritenv", "seq" ], - "commit": "139dcfef116e376138abddc7cc179cbe68f457fd", - "sha256": "0mscx327acxv74c54lnb0xzsqnkbzrkrwngw6qkrkbqsllbyagwc" + "commit": "247054fe5da00ee4aee4607da0075935541017a9", + "sha256": "1rzs21l032awcpyq7alh2xy7ibkzqlhmph9jx8rbs6ml8wzyc0l6" + }, + "stable": { + "version": [ + 0, + 12, + 13 + ], + "deps": [ + "inheritenv", + "seq" + ], + "commit": "247054fe5da00ee4aee4607da0075935541017a9", + "sha256": "1rzs21l032awcpyq7alh2xy7ibkzqlhmph9jx8rbs6ml8wzyc0l6" } }, { @@ -8133,11 +8179,11 @@ "repo": "technomancy/better-defaults", "unstable": { "version": [ - 20251012, - 2227 + 20260621, + 1647 ], - "commit": "b4e566ddd368609c7df711c4f0d9cc345455aa0f", - "sha256": "1jn2cp2hj62yl3ari0q7jdjw0cmnwzidd9xd1d2w3xwc998j8har" + "commit": "faf5c664472d01d978442b5e567470a51f9566c2", + "sha256": "02shdak3cy53qswbzyq6zzm1s26fwrwjf9mdzjmkfq5ddmdim1qz" } }, { @@ -8274,20 +8320,20 @@ "repo": "kristjoc/bible-gateway", "unstable": { "version": [ - 20260404, - 2018 + 20260601, + 825 ], - "commit": "dcae05a4a3bae4d07cb6d7144f54d14651c56f61", - "sha256": "1lnrl70qzx5c9j08gisyd1mzxm86wz6s2vimsk0c08z7kn58yhdb" + "commit": "2df8d0500aa842fbb60109e863a70c705dfe998d", + "sha256": "1d8wxk169gpv5h24fwav2532njl6hgl39pxk14rvljkw72bi6h9p" }, "stable": { "version": [ 1, 6, - 4 + 7 ], - "commit": "fdca45e4f84c7743b4a57c3318114fa987fafb95", - "sha256": "1lbfig3sz9n5lhw29p1q3c2rl4b1y9q47lgf3wpwca4hmdlz0zgk" + "commit": "2df8d0500aa842fbb60109e863a70c705dfe998d", + "sha256": "1d8wxk169gpv5h24fwav2532njl6hgl39pxk14rvljkw72bi6h9p" } }, { @@ -8449,9 +8495,9 @@ }, { "ename": "bibtex-capf", - "commit": "a400d5b255b8aba48aa32fe0a503df476053e4eb", - "sha256": "1014wj9wa8jv3vp9ddwqj205s37br7msfklv33ppwi14salqq9y5", - "fetcher": "github", + "commit": "bbf2574e8c8be0f19149e4971ae6f1f2e7bd2b54", + "sha256": "07s0hnvyb4pc0awf9v78clgl9hhbvn8r2pn44nrllh5y6vxsr5s1", + "fetcher": "codeberg", "repo": "mclear-tools/bibtex-capf", "unstable": { "version": [ @@ -8528,26 +8574,26 @@ "repo": "tarsius/bicycle", "unstable": { "version": [ - 20260101, - 1825 + 20260601, + 1451 ], "deps": [ "compat" ], - "commit": "9da65dcb0e8ea6a9fe2b02d3be3cd4f2f4e29977", - "sha256": "113aj4mc3dz199826sy69nja9qys3637947alq3mv185gbaz4gdd" + "commit": "b8919e56e7f20e4164002e9b4dba0268779b5645", + "sha256": "1mw1826lfvqibg0gxwa39mbas4d3m83xix3pgmscvpphidpnl61h" }, "stable": { "version": [ 1, 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "9da65dcb0e8ea6a9fe2b02d3be3cd4f2f4e29977", - "sha256": "113aj4mc3dz199826sy69nja9qys3637947alq3mv185gbaz4gdd" + "commit": "b8919e56e7f20e4164002e9b4dba0268779b5645", + "sha256": "1mw1826lfvqibg0gxwa39mbas4d3m83xix3pgmscvpphidpnl61h" } }, { @@ -8779,14 +8825,14 @@ "repo": "eki3z/binky.el", "unstable": { "version": [ - 20250123, - 1928 + 20260719, + 1537 ], "deps": [ "dash" ], - "commit": "29f2492366ced8ff13802faf4a1c6df5e0c9cb07", - "sha256": "16qvz52lqrv3gv9fvnm8hfxghlnim7gf05y7l0i3zwgcmc2nhk3n" + "commit": "e24c4691d231f4b0f649e155d2c93cd83d3dc073", + "sha256": "1wrp3ys5lv10ny2fspg5sqbwcxlmn315q7g8icjsjnk64dbdicvs" }, "stable": { "version": [ @@ -8809,8 +8855,8 @@ "repo": "SqrtMinusOne/biome", "unstable": { "version": [ - 20250623, - 1954 + 20260607, + 1500 ], "deps": [ "compat", @@ -8818,8 +8864,8 @@ "request", "transient" ], - "commit": "b26c0a6ec533ba5c3524721af224708de9362979", - "sha256": "0fsh21fgrqw0mlh1kwn7idk0sdah5yxlwwcz8f847pj0w1n4rvxg" + "commit": "77a94f3c5210b80b63d5002c4780e542cd98a65f", + "sha256": "1n2am7gf28nlz7pxb02x5nvy0911x0z61az9vasl9i47ff9yzch4" } }, { @@ -8895,22 +8941,22 @@ }, { "ename": "bitbake", - "commit": "da099b66180ed537f8962ab4ca727d2441f9691d", - "sha256": "1k2n1i8g0jc78sp1icm64rlhi1q0vqar2a889nldp134a1l7bfah", + "commit": "a5308691e59a7803320af6792a92546d004317af", + "sha256": "0xqpgg5b5ahqilvfc71sva0can04cbr5l9h3mgg1l44csmvgz4wb", "fetcher": "github", - "repo": "canatella/bitbake-el", + "repo": "danielcmccarthy/bitbake-el", "unstable": { "version": [ - 20251230, - 1237 + 20260712, + 1615 ], "deps": [ "dash", - "mmm-mode", + "polymode", "s" ], - "commit": "44513a330d3bb2bceb1bfd99b4eb63b37f681369", - "sha256": "0zbbxgi87594aikvc89fq66sky9xp1kfmif74jbdkyfjjkydkzz0" + "commit": "f626d37727df0550aa2afd3f1b0ce81f38be18a3", + "sha256": "0jzig4hyia6zi31qygh8c62jzfas7vz7kp3nfh8s1fvqx8pj8lrk" } }, { @@ -9045,11 +9091,11 @@ "repo": "gdonald/blackjack-el", "unstable": { "version": [ - 20260418, - 1402 + 20260705, + 2046 ], - "commit": "3930d197d1f8f37de0dbb6c9875ef5279e16cdfa", - "sha256": "0zxpiz9kjicyf2lhq2rclj2cqaf3f518xwlm48dcrkr1hjn6yqac" + "commit": "7f98c9d15fa2d42abb2643235f73a9513b46c227", + "sha256": "0zsia1p1vch1ph24k7nq0q0cb7f4kz2dk75sywkh9rdfcs8cijgm" }, "stable": { "version": [ @@ -9084,6 +9130,30 @@ "sha256": "0n0889vsm3lzswkcdgdykgv3vz4pb9s88wwkinc5bn70vc187byp" } }, + { + "ename": "blamee", + "commit": "6a860645041c1ca63437f4ce06ad73bfdd3ff356", + "sha256": "1hv320apk7lj7sk3yqpam33bw1b4czqqakc5m5m13x71m06c4s3v", + "fetcher": "github", + "repo": "fvi-att/blamee", + "unstable": { + "version": [ + 20260619, + 227 + ], + "commit": "60bb7e7dd29e0e0fabd172e91d362b00fac363c4", + "sha256": "0i5kaidka9668wiarpkkj0s9s35r7hmmp78z57nhz3nqn7nc7315" + }, + "stable": { + "version": [ + 1, + 0, + 5 + ], + "commit": "60bb7e7dd29e0e0fabd172e91d362b00fac363c4", + "sha256": "0i5kaidka9668wiarpkkj0s9s35r7hmmp78z57nhz3nqn7nc7315" + } + }, { "ename": "blamer", "commit": "412fea9e0564929310918096bae95636ba885a7c", @@ -9312,14 +9382,48 @@ "repo": "lapislazuli/blue.el", "unstable": { "version": [ - 20260422, - 644 + 20260709, + 1248 ], "deps": [ "magit-section" ], - "commit": "16c7092e7483cf7b29511374bbc8c80a1359b6b9", - "sha256": "1f0glcg6y081wqgidakn56bdy6cx87fxw4zhdxc4l0vcsr98rc7m" + "commit": "3668ca7f627f3497d907293f38dcfbe33fb6f4f7", + "sha256": "1gqcbxr3dr2wi1r0fqzm4zvgsqhw6l9zph81h5k23nzw62aryx0i" + } + }, + { + "ename": "bluesky", + "commit": "100e7d9b24c01f98456197ad904983c6758219ff", + "sha256": "07mhiqyv7mxv7hplsykmfnqpblgyhr63g6crrgl5fn7sl9fd3ysn", + "fetcher": "github", + "repo": "ahyatt/emacs-bluesky", + "unstable": { + "version": [ + 20260618, + 147 + ], + "deps": [ + "futur", + "plz", + "vui" + ], + "commit": "b4b7957a3af0533918535486f44afcb808d38d24", + "sha256": "1vrbspbn58b90fx6vvwnndlvzp05znvsr0gyz3akk7p9s8a0svvn" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "deps": [ + "futur", + "plz", + "vui" + ], + "commit": "f88486f57bde983f24d1cad04525039ca5d37344", + "sha256": "1frmgg7zy1a2mc620v2rr0hr3m2m88521if40v2imysf9lp429ny" } }, { @@ -9330,11 +9434,11 @@ "repo": "rwv/bluesound-el", "unstable": { "version": [ - 20251022, - 1406 + 20260616, + 831 ], - "commit": "60d7f422483bd7f3cf23983160e28ecff9c14b38", - "sha256": "1bg2y0ny4yszs03hj7aiq8mm57zbind5i0pk17bms12sl2ahkm82" + "commit": "3a99edc4232d41a9cd13b846c7a4f27036256d29", + "sha256": "0jrch7sbry41r630yxwvcqzzi1w6nszr615xmx4v2dly70w3khj0" }, "stable": { "version": [ @@ -9722,28 +9826,28 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20260422, - 1711 + 20260701, + 1437 ], "deps": [ "epkg", "magit" ], - "commit": "5aa950cf07c3f16528232a81dcedd792f74c0471", - "sha256": "1ygv5hvbr9ygkdab4mqc94f6z7h10yfbllxv8v48wfx902ys4wjs" + "commit": "a844569c8ef24408ba0df31d5cd58be9d955efce", + "sha256": "1sywja538dm77p4jmd83hvymmj98hqzpvmnsg3zigrjyd0ywr28y" }, "stable": { "version": [ 4, - 4, - 3 + 5, + 2 ], "deps": [ "epkg", "magit" ], - "commit": "8d0e26e6c16c1e503785b3e6b62a9a6d55b4e472", - "sha256": "094ykn4niknciqy71v74ry70imj6xri6wrm477yavwanzdr4b2rc" + "commit": "a844569c8ef24408ba0df31d5cd58be9d955efce", + "sha256": "1sywja538dm77p4jmd83hvymmj98hqzpvmnsg3zigrjyd0ywr28y" } }, { @@ -9754,11 +9858,11 @@ "repo": "fourier/borland-blue-theme", "unstable": { "version": [ - 20160117, - 1321 + 20260620, + 1425 ], - "commit": "db74eefebbc89d3c62575f8f50b319e87b4a3470", - "sha256": "0yzfxxv2bw4x320268bixfc7yf97851804bz3829vbdhnr4kp6y5" + "commit": "c24ef5aa16fed6727696b0ea71bf154889e4ee0a", + "sha256": "1hwyyv20xkb4ygqfk0nyp2z59bmxxiycnca6yi9iifq7cwwiq7yi" } }, { @@ -9890,17 +9994,26 @@ }, { "ename": "bracket-face", - "commit": "890e94376ea0b6ada2c49a0a3e11b2a59aab7caa", - "sha256": "1j9iczccp494yqviqawphhndzyz6hsd21fqvsj7cd20balgz2g3g", + "commit": "fefa3d4feab1be45b0169c31781a1e995d0963ae", + "sha256": "1wj0mmn8wz7srm2rzh1hj2wd3szhnbrrj7xj77n94r3cmzffaaq7", "fetcher": "github", "repo": "tarsius/paren-face", "unstable": { "version": [ - 20260101, - 1846 + 20260601, + 1519 ], - "commit": "2c279a236404b2eebacb435aa92d5e9c97939c03", - "sha256": "06ypi3hgrr9rigcb9gy5j4l9f3z7lnz1rssv1pqda55srkvcp39x" + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" + }, + "stable": { + "version": [ + 1, + 2, + 4 + ], + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" } }, { @@ -10115,20 +10228,20 @@ "repo": "browse-kill-ring/browse-kill-ring", "unstable": { "version": [ - 20251208, - 1041 + 20260503, + 1620 ], - "commit": "26ea5759c996e782abadc61b85c5f9324d1d1dae", - "sha256": "1wr0adcbb6l9ma5lnjq37w0f7m7w7vw77f7jvm53x3vw0cpz3mmv" + "commit": "39d65a830b93530c9bd68a7dc14353cbffd1d01f", + "sha256": "01v64b8p0nzqczv3sjd6qacdh6lm635w5hndqk76ydxz5nga89n5" }, "stable": { "version": [ 2, - 0, + 1, 0 ], - "commit": "2a7acf98c348c4f405a6b2ab216224ca14915be8", - "sha256": "0y9m6cv70pzcm0v2v8nwmyh1xx40831chx72m85h5ic5db03gy7b" + "commit": "1fa2c611f80ccdadfe766e3e7f4272b0f5d1dd28", + "sha256": "0xm857gs7xj5z9l8zfkdh87j3r6kszj1jwzzx4w0wafr69dnyjwc" } }, { @@ -10161,6 +10274,25 @@ "sha256": "08qz9l0gb7fvknzkp67srhldzkk8cylnbn0qwkflxgcs6ndfk95y" } }, + { + "ename": "browsel", + "commit": "d771cf4923d77a6908addf93352ddb88f24f0275", + "sha256": "0w6p75nnv6qyjczqs8ypibn636lwk75wl3zzb1wk0cxxjbywa1cs", + "fetcher": "github", + "repo": "dmgerman/browsel", + "unstable": { + "version": [ + 20260629, + 542 + ], + "deps": [ + "org", + "websocket" + ], + "commit": "805a4162762c3a1e60ebb791007c788bde0d0be0", + "sha256": "0n6bb6pj9giynxkxxkr6zw6h16i4sjb9a9kh1665kp8lisk2wkdj" + } + }, { "ename": "browser-hist", "commit": "bc155dcf3df95ab12a305d0f2cf67a04bf4bc82a", @@ -10169,11 +10301,11 @@ "repo": "agzam/browser-hist.el", "unstable": { "version": [ - 20250501, - 1450 + 20260425, + 1930 ], - "commit": "1cd80081feaab99fef9e8eadd55d68b3cef90144", - "sha256": "12jarw5sca6r171lzba727xbii6xjlv432j8frgkph4r0k0946id" + "commit": "aab0a364077bfbf5559085086545d30bbaf7ac5e", + "sha256": "04xmn00pvnzralw4y8j3ilf7lprv5h01kmasyxnnr99ndphs8q62" } }, { @@ -10318,14 +10450,14 @@ "repo": "astoff/buffer-env", "unstable": { "version": [ - 20250516, - 1223 + 20260604, + 645 ], "deps": [ "compat" ], - "commit": "fc5cab4db55f0b95c4b97fbe3104e394da34b91a", - "sha256": "0a30li0s06qviz44cdnbw1mh0kxlap9zzwa2cfdd79xj8aj5r3z4" + "commit": "81968582b2dbfd5171b57206b44a4bb8fc31cc69", + "sha256": "1bfc9yxirwm2z5q58w3v9lr6sb4v4yivirmmpk56qw6zxk9c7jbj" } }, { @@ -10362,20 +10494,20 @@ "repo": "jamescherti/buffer-guardian.el", "unstable": { "version": [ - 20260316, - 1912 + 20260715, + 1805 ], - "commit": "0bffb2bf0ab5b54e1dd61b773cb453f8dff33636", - "sha256": "1xp8hhys1x278dskwzfrc5f92jzzjhq2csnndjhy1n3fxqi3gabi" + "commit": "e56fe46b8588dd851406e5d5264644898730ea20", + "sha256": "10a48yfn0x55mv56aiwpza9pchlxb8532psg0rfjzhdq3psx4rmi" }, "stable": { "version": [ 1, 0, - 0 + 1 ], - "commit": "0bffb2bf0ab5b54e1dd61b773cb453f8dff33636", - "sha256": "1xp8hhys1x278dskwzfrc5f92jzzjhq2csnndjhy1n3fxqi3gabi" + "commit": "44a692448659e529a9b6d5a1b36b40a66601376f", + "sha256": "16lb8f38qgf8rnh9k9ik00g6qrilv1dx91qpsia94kld85ympwqn" } }, { @@ -10386,27 +10518,28 @@ "repo": "plandes/buffer-manage", "unstable": { "version": [ - 20241019, - 1748 + 20260713, + 121 ], "deps": [ "choice-program", "dash" ], - "commit": "3d338b1e64f256ccb70adf81de4c04bcda7eb8d8", - "sha256": "122nwyakicv72jxwrrjcg5j2arlhqqzlislfsy48920jjz47ngk0" + "commit": "f32c756a261aebca0a864e41958097b30690e171", + "sha256": "0sq3h0r7nr2x129f5b8gcjxmq90myixrmi9xggf9q40861jqjqwp" }, "stable": { "version": [ 1, + 2, 1 ], "deps": [ "choice-program", "dash" ], - "commit": "819bbfd9ae2f028361f484bc3b60d751623a2df5", - "sha256": "0g79xcq0jf8p1cpsz3fifjpyaidkr0b2zm8sf11n8li4hfqmr10d" + "commit": "f32c756a261aebca0a864e41958097b30690e171", + "sha256": "0sq3h0r7nr2x129f5b8gcjxmq90myixrmi9xggf9q40861jqjqwp" } }, { @@ -10500,14 +10633,14 @@ "stable": { "version": [ 3, - 7, - 2 + 8, + 0 ], "deps": [ "cl-lib" ], - "commit": "cdc66804b8a1ec7ddf94d99c7f24b801148b64df", - "sha256": "0lz7bjmxzxkri6mvqk6lrl6dp58as6py3i41hkfkj9zjmjvsl589" + "commit": "8d67ed8c9ea182abdcf457e0c247ab44675def9e", + "sha256": "07rjf3j44kpgcizx0cmdhccbyf0dd9pxv7i6zic2vlq1jvhj9mci" } }, { @@ -10518,20 +10651,20 @@ "repo": "jamescherti/buffer-terminator.el", "unstable": { "version": [ - 20260404, - 1551 + 20260715, + 1822 ], - "commit": "19ff0cc0096ceed961e2a4ea95124cd3a38ce966", - "sha256": "1y9398p87sl2gxkg1qyk0vam7s9rja2vx3zgzrliipc26s4rvx75" + "commit": "68dbf7e34babe0467886132c641c54372d369acb", + "sha256": "100gypdg3v9w3pmv4ryy8fjv6k79mff8r2zjx0ayx7j4q2mcm3az" }, "stable": { "version": [ 1, 2, - 4 + 5 ], - "commit": "f4f3733863e90dcf90e2d6b3cdbdf67d036f37ad", - "sha256": "08cyrvz9bnf3s1b99zamyi77jvlcy7fq8wkj962bk19ykwqf3dbn" + "commit": "0f31cbbb1a8368f08b486525f419dc3d059f05df", + "sha256": "0m7l6a6dmjaxq76g2kxnx2g9ayp3h2r8v9liz8djskdllaxkxvyd" } }, { @@ -10635,20 +10768,20 @@ "repo": "jamescherti/bufferfile.el", "unstable": { "version": [ - 20260401, - 233 + 20260627, + 1319 ], - "commit": "05b893762ede97f59923684868a4ba26e82c4f75", - "sha256": "1py13x9bdmxjs1j1awplqpvvq6gd7c7b8vxxvm1n0lvpggb2sgqh" + "commit": "e60be7084d5395617565531efab49718fe7c1a36", + "sha256": "0lhcq7z61s1z3n41nskc8lkpp6k2a4766cjibbij1sjhrfhlgbj6" }, "stable": { "version": [ 1, 0, - 6 + 8 ], - "commit": "5a78bf05443d60d651aaadcb8855d84b39bab182", - "sha256": "157hs1wigczs7l674j3aml7hlng806kafdryix939v9xrv58z8lx" + "commit": "e60be7084d5395617565531efab49718fe7c1a36", + "sha256": "0lhcq7z61s1z3n41nskc8lkpp6k2a4766cjibbij1sjhrfhlgbj6" } }, { @@ -10745,26 +10878,19 @@ "repo": "alezost/bui.el", "unstable": { "version": [ - 20210108, - 1141 + 20260502, + 730 ], - "deps": [ - "dash" - ], - "commit": "ab62fcefc3c7ddf5e5d64c18045148a3c297592d", - "sha256": "1vcfrm776y108kibkiabdzq0rbgqx0wwx6hqm2r87bbsfqxhbbrz" + "commit": "4319e1bf3ff94ff0568eed280ac1f980a4b68679", + "sha256": "1645v8h2szhmy2ahzf6f2izc834k00gpik5qmmpdysw50p90d3n3" }, "stable": { "version": [ 1, - 2, - 1 + 3 ], - "deps": [ - "dash" - ], - "commit": "9162c24b75799857d54838d961c60776ffcd657e", - "sha256": "0sszdl4kvqbihdh8d7mybpp0d8yw2p3gyiipjcxz9xhvvmw3ww4x" + "commit": "5be69e47d5fa4e48a6c8f75d6b85f4c32a31398c", + "sha256": "1dwmx7fmfg6jcwplk2pds56vvcy425plhfzajm52i5ysi2qka6p1" } }, { @@ -10975,11 +11101,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20260411, - 2019 + 20260512, + 2141 ], - "commit": "57d03004cc730678bcdefb91ad294824975cfea4", - "sha256": "1b55cfh4wr40max2c42crvaa6wid7a83g28yximsin98i32q5f5r" + "commit": "39c8e762408a166a5afa03b8e79dd8d1a0de5caa", + "sha256": "1k5x12mn8xp4wyalxwjc86zl96ai3f62ia06mfavkkzm7s90smlg" }, "stable": { "version": [ @@ -11214,11 +11340,11 @@ "repo": "Michael-Garibaldi/cacao-theme", "unstable": { "version": [ - 20251104, - 2135 + 20260519, + 1959 ], - "commit": "72c1cff056fcfbada298d32811b14988dff1cf6d", - "sha256": "1xx5zqppl91bj9flrphr215i62z7zw3lcq2iar0l452q5jqxyygd" + "commit": "73d8f81b7c9d2957cf7201d89a7a81bb673af03f", + "sha256": "0k6kgx2lxikirp5isqc5jk9fmkdlphsdmvrsww5r4gnp45wjcd85" } }, { @@ -11552,14 +11678,14 @@ "repo": "kiwanami/emacs-calfw", "unstable": { "version": [ - 20251030, - 845 + 20260426, + 925 ], "deps": [ "calfw" ], - "commit": "57be107b20625c13ed010cb0f70a603a61d47629", - "sha256": "0hr55mwqk8h2hx2lwdlwrwq2hjwrxvjjbnwzzv4rr0ywqpxf6g5r" + "commit": "24fa167af96a6e677aea7c6b9385f669b550ee2f", + "sha256": "1i4ww2r26xr1f8nh1fssh679h0j08h3r3mqkynxaxvjc3bz794s6" }, "stable": { "version": [ @@ -11651,31 +11777,30 @@ "repo": "beacoder/call-graph", "unstable": { "version": [ - 20260212, - 649 + 20260713, + 638 ], "deps": [ "beacon", "ivy", "tree-mode" ], - "commit": "38cb7a4488af63208d7ee1766a141453518e0abc", - "sha256": "00yn00kgski6nyfxjjqr1cxyf725dnl81v6chy0kc94mxnww8ybr" + "commit": "99cab0f3829632f39f0e76f4e992c7bd988203a7", + "sha256": "0y3lmb8232qv2gkqc35qc3ipmc8jlp1cni4dbhl1aqgvhwjma1jq" }, "stable": { "version": [ - 0, 1, - 0 + 0, + 6 ], "deps": [ - "cl-lib", - "hierarchy", + "beacon", "ivy", "tree-mode" ], - "commit": "0bbe292b1b9c7ba1d8a65ed5e475f6a53f5f9f27", - "sha256": "0kckjs7yg8d04nir5z3f00k05272kgma98794g0ycgfn1vrck0h0" + "commit": "99cab0f3829632f39f0e76f4e992c7bd988203a7", + "sha256": "0y3lmb8232qv2gkqc35qc3ipmc8jlp1cni4dbhl1aqgvhwjma1jq" } }, { @@ -11686,20 +11811,20 @@ "repo": "kickingvegas/calle24", "unstable": { "version": [ - 20260326, - 1749 + 20260506, + 2210 ], - "commit": "1ebc385496a600ee492df4abd55cbf7b899145d5", - "sha256": "06cbdpysya1kkh3g0cjih5k88al30xc8jcr2arslmdn4zn50ifcm" + "commit": "24d6240209b46c5005121d14cba3fae0e0ff257f", + "sha256": "18scb447smgg9lmpvk3mymh85k9yb230kc30a4c0ksbr692ppfx8" }, "stable": { "version": [ 1, 1, - 3 + 4 ], - "commit": "1ebc385496a600ee492df4abd55cbf7b899145d5", - "sha256": "06cbdpysya1kkh3g0cjih5k88al30xc8jcr2arslmdn4zn50ifcm" + "commit": "24d6240209b46c5005121d14cba3fae0e0ff257f", + "sha256": "18scb447smgg9lmpvk3mymh85k9yb230kc30a4c0ksbr692ppfx8" } }, { @@ -11813,25 +11938,25 @@ "repo": "minad/cape", "unstable": { "version": [ - 20260419, - 1847 + 20260519, + 1021 ], "deps": [ "compat" ], - "commit": "2e15e1909754752f66096dde1b8d639d6eb25f35", - "sha256": "0lhjavwiyp5vd9i6xcr1g4mcb53fxmqyq0yx5f5sp00mcp6y3kg5" + "commit": "c99911b08831c26179145686b4beffa96f1f8a68", + "sha256": "1qnqn27jay3gffqj5vm1bfsd8qaqx7jixja2y2i9f0r7hlh399ny" }, "stable": { "version": [ 2, - 6 + 7 ], "deps": [ "compat" ], - "commit": "2b2a5c5bef16eddcce507d9b5804e5a0cc9481ae", - "sha256": "18pdm8dlvzjry7xxx3yyka7rmrx94cvwkhwiagxcfprk6yinx21z" + "commit": "c99911b08831c26179145686b4beffa96f1f8a68", + "sha256": "1qnqn27jay3gffqj5vm1bfsd8qaqx7jixja2y2i9f0r7hlh399ny" } }, { @@ -11851,11 +11976,11 @@ "stable": { "version": [ 1, - 4, + 5, 0 ], - "commit": "8b892a8a11a632f5d52b877a49728808a142379a", - "sha256": "17dmyq3v6xj2zphbr52rirbq7bwxw9gg0lalwsv03y8lkhw4ms0a" + "commit": "373e61ec89e2359f1c362e9b2eadc552f4779306", + "sha256": "0p6zb9icy2cjj6y8bj2ai7csghak5aix8wld3jhvddf00diwb7fq" } }, { @@ -11950,11 +12075,11 @@ "repo": "peterstuart/cargo-transient", "unstable": { "version": [ - 20241204, - 1217 + 20260718, + 1155 ], - "commit": "b75511f911189b6b6c47976dd970eeb80ccfb3ee", - "sha256": "1s1kjc7xg55lnwn5ngdp89hnh2qp42x10cyqlji268xiglx0xzs2" + "commit": "a1fac6ce76d32317fd9f6bcdcc86fca46460c709", + "sha256": "1k3mzxj49f680dxzla58xn1yg9s93rs1qj2ig0a9ay12z3zpr5mr" } }, { @@ -12141,28 +12266,28 @@ "repo": "kickingvegas/casual", "unstable": { "version": [ - 20260416, - 126 + 20260718, + 1803 ], "deps": [ "csv-mode", "transient" ], - "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b", - "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy" + "commit": "cadbeab2ec45804e63a328202c9a82fbed2413c5", + "sha256": "1dr4bdxm5c69kpn0312a9jxl1ds6m66dr0x1571993qga4m67aqn" }, "stable": { "version": [ 2, - 16, - 0 + 17, + 1 ], "deps": [ "csv-mode", "transient" ], - "commit": "6a3fbb40d3369614f36d9a37035942fa57572c5b", - "sha256": "06i7zv7x8cs87qjpvsjqg2bi68pyw2j0z9pnzbsjj81pafmm2xdy" + "commit": "cadbeab2ec45804e63a328202c9a82fbed2413c5", + "sha256": "1dr4bdxm5c69kpn0312a9jxl1ds6m66dr0x1571993qga4m67aqn" } }, { @@ -12408,15 +12533,15 @@ "repo": "emacs-lsp/emacs-ccls", "unstable": { "version": [ - 20250825, - 531 + 20260507, + 1746 ], "deps": [ "dash", "lsp-mode" ], - "commit": "80981d751198b59a7960a5437cb42a4d9974f254", - "sha256": "02crd43hxk2b8pdwnihp3lchb1wbba0whj3jwhg4yzxn32zlgw1y" + "commit": "f728c92e33844f1da54cb47ecb4e44160f2042a8", + "sha256": "1mmz7dxj577lr8viyqpcjdqxla1jabm96fhdxvxw13qvfm0c2v2s" } }, { @@ -12784,7 +12909,7 @@ "repo": "worr/cfn-mode", "unstable": { "version": [ - 20260419, + 20260705, 807 ], "deps": [ @@ -12792,8 +12917,8 @@ "s", "yaml-mode" ], - "commit": "2813707d1f2c98562fa873624abc79ce49db969c", - "sha256": "0kc3mb0q86wc9ajmdvb26wpd0fg4gllgg8s3pfb49w8qgz7z02ba" + "commit": "407094bd072103d43fddb3e186077d65f4f62f26", + "sha256": "0igcfj6c89mbvw5wpfhqihfwjxi851k89dagj3mfchdwrbfn7xvs" }, "stable": { "version": [ @@ -13498,26 +13623,26 @@ "repo": "breatheoutbreathein/chordpro-mode.el", "unstable": { "version": [ - 20250814, - 301 + 20260711, + 623 ], "deps": [ "compat" ], - "commit": "ae6db74f2078e4ee3d6262ac1344df9c1ab87527", - "sha256": "03aqw9385f5xdhphhm352n66yi2fmah6n43wrnr850d3mq5485g0" + "commit": "9d7b242b06453aaaa3fb3d1cca438ebcd478979b", + "sha256": "13447a0cc0jhxxmjhazv0hshbr13vpx22r30xhxm38c4hq7rfalk" }, "stable": { "version": [ 2, - 6, + 7, 0 ], "deps": [ "compat" ], - "commit": "c4167676831c790240610cfb4b5bbef93b5ddd49", - "sha256": "0x0a1990fip335ajd6zs90wq6lzb89gxaxr28nniyifrix8q8cxb" + "commit": "7a412da298dcc290050c4c6ba3571c0975a815a9", + "sha256": "14cy93yzzb7qy01mig9kkwnahmr8awh5ip4fxkky0a4c16pcw4dr" } }, { @@ -13745,8 +13870,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20260417, - 1318 + 20260718, + 1302 ], "deps": [ "clojure-mode", @@ -13758,17 +13883,18 @@ "spinner", "transient" ], - "commit": "b9e8a26197f5a2a6a8d1dfb21ef5eae6fe17e0b6", - "sha256": "11v3d5gl4p2iqfym9nxcdwyvyyzal9dkri6wwfd74w0cgkgrlw46" + "commit": "03bffb62b7c30250979a9b4512c210f165dc36c9", + "sha256": "1251fs6namlghmgy581mw7lijv9fnwn68pfah6pjgn8vmqdzk041" }, "stable": { "version": [ - 1, - 21, + 2, + 0, 0 ], "deps": [ "clojure-mode", + "compat", "parseedn", "queue", "seq", @@ -13776,8 +13902,8 @@ "spinner", "transient" ], - "commit": "c71bc65af7709667b0cc77306f4e3d5befe86d27", - "sha256": "19wx9mc488qipm08s7hc0zrfmiylw577lmf3jpvqcjq7amx14jgc" + "commit": "39c70c0f5f7985704c14e3254ca8a1fbd15d1088", + "sha256": "18i5ajdns4mhh7d8jnrg1c1im7cwmk8yq3myz4m8lbxmka7gv6g7" } }, { @@ -13980,14 +14106,14 @@ "repo": "emacs-circe/circe", "unstable": { "version": [ - 20260315, - 1435 + 20260525, + 1114 ], "deps": [ "cl-lib" ], - "commit": "f717332348e4b59499dbf60c56155d9f03cd9303", - "sha256": "01z41abbhp2plsa9qq28rx16mzflzr1vmy4b2h1fmw4qiqafs9r4" + "commit": "4bd1e964066fe8985d8112ed9172db3a1ecf58c8", + "sha256": "0gs270kpbr8a574y58bdh3jwz3ma4n2fz5r2zp2z2pflhf9vk9kg" }, "stable": { "version": [ @@ -14073,17 +14199,16 @@ "repo": "emacs-citar/citar", "unstable": { "version": [ - 20260328, - 1759 + 20260706, + 1221 ], "deps": [ "citeproc", - "compat", "org", "parsebib" ], - "commit": "58df8b9b8af8a2636b28ed5c6005eddef7f579f7", - "sha256": "0b7gkik5p087hp08v40lll66sryy8yhnari5wqnkq984z1qwhsad" + "commit": "d2289669fea76ae7b2f7ad04794fcc230d65e055", + "sha256": "0gnh7lajg6sirr1dyygl3bczp13zdll9wq5zimylvh7l916x03y9" }, "stable": { "version": [ @@ -14371,11 +14496,11 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20260220, - 1324 + 20260530, + 602 ], - "commit": "72375aac87cb245b4f49a4737456f626091a0a42", - "sha256": "0gslc3xqdbwjyb0rci1877ihinp8zlvjgf7maxbbmdgjgqpdlmwh" + "commit": "be0d9c6dc9b1ac67d76fc7ed315f2369d5c3bde8", + "sha256": "1zgkbx9slm2kgcxjarvjxq01j00v6xggiixvsvxnacy7pqm23s66" }, "stable": { "version": [ @@ -14509,6 +14634,30 @@ "sha256": "0acgncalbdd74abd25max11l1q6vdcxsnr7g49gnq7v55qv0spqw" } }, + { + "ename": "clatter", + "commit": "94c60de3a59fb002f2c1e8bbf7996079feba2d38", + "sha256": "1l99xvnbm6swrjid4rrv48g1skxa2an67sirnih4ijjfrxh82pg9", + "fetcher": "github", + "repo": "parenworks/clatter.el", + "unstable": { + "version": [ + 20260720, + 457 + ], + "commit": "9b81c45c423755333929dbe4e2e204ae0246c016", + "sha256": "0qpwslixsbyypc8z67yjnhxz3a2v5yg66q1jii26knkqjg216x32" + }, + "stable": { + "version": [ + 0, + 6, + 0 + ], + "commit": "6b1c8466d283b052e2dbba44e6df06f5fe0c16df", + "sha256": "1baq6i5nsqd4qzp8zdb5zl199jipnjhfwk88nq11pd3v5xskl2my" + } + }, { "ename": "claude-code", "commit": "ad463328e858a1df77d95da55cfde40ccae31cc9", @@ -14517,8 +14666,8 @@ "repo": "yuya373/claude-code-emacs", "unstable": { "version": [ - 20260227, - 1055 + 20260526, + 1329 ], "deps": [ "markdown-mode", @@ -14526,13 +14675,13 @@ "transient", "vterm" ], - "commit": "0c3019819ce870619d4425cebf7286e03e531c66", - "sha256": "08l8pg2v7gi25nvijbxfazqw9syqkkjbrqld3hz5h7w1nyiwp35q" + "commit": "4d460e2fa56e6919a9fc4f9b985592a983f9f724", + "sha256": "076xb0193bjav8g03l6sjlb4pgwhnkbvri69lj3lcn8mqj2swxcz" }, "stable": { "version": [ 0, - 8, + 9, 1 ], "deps": [ @@ -14541,8 +14690,23 @@ "transient", "vterm" ], - "commit": "0c3019819ce870619d4425cebf7286e03e531c66", - "sha256": "08l8pg2v7gi25nvijbxfazqw9syqkkjbrqld3hz5h7w1nyiwp35q" + "commit": "4d460e2fa56e6919a9fc4f9b985592a983f9f724", + "sha256": "076xb0193bjav8g03l6sjlb4pgwhnkbvri69lj3lcn8mqj2swxcz" + } + }, + { + "ename": "claude-code-context", + "commit": "6082e33dbf835c4a86d13d15c8f17df0c392a19f", + "sha256": "0h8al6ifiag66pgcw51y0bq1f7favg00idx32pkwykkvhgj9dl4l", + "fetcher": "github", + "repo": "lukehoersten/claude-code-context", + "unstable": { + "version": [ + 20260503, + 2210 + ], + "commit": "1e9062b0bc5e0d4f3f9f98a349b6ed9c775360ca", + "sha256": "01m86vy5dv2i9phzhir9rm23gqpn9zymn5l2g4r3qpi2bkajwqfc" } }, { @@ -14926,41 +15090,38 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20260403, - 830 + 20260716, + 1545 ], "deps": [ "cider", "clojure-mode", - "hydra", - "inflections", - "multiple-cursors", "paredit", "parseedn", + "spinner", + "transient", "yasnippet" ], - "commit": "39c9688c79e1d00965621d04c04fe1ddde4b571f", - "sha256": "1im1l9910asx9bvgcdrrznmrm52kb9jrgkicb3jmplbvay2xyxzv" + "commit": "2805bd5f505fdb199a8c5a25fca398ec9c161e5b", + "sha256": "0v4j0y81m0bk3v0rp1f32imymplqd7p1i9p3k9xix254cnpq0ywg" }, "stable": { "version": [ - 3, - 12, + 4, + 0, 0 ], "deps": [ "cider", "clojure-mode", - "hydra", - "inflections", - "multiple-cursors", "paredit", "parseedn", - "seq", + "spinner", + "transient", "yasnippet" ], - "commit": "dc1bbc8cdaa723bdbb6669ea7d280625c370755d", - "sha256": "0mha1wqn5hd9g8y0fp35qkhlnxlrwli62x7mbifman279h16gaml" + "commit": "2805bd5f505fdb199a8c5a25fca398ec9c161e5b", + "sha256": "0v4j0y81m0bk3v0rp1f32imymplqd7p1i9p3k9xix254cnpq0ywg" } }, { @@ -15031,24 +15192,6 @@ "sha256": "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc" } }, - { - "ename": "cljstyle-format", - "commit": "dbc850fd5711658cd4f04a5c796ec5062fb71469", - "sha256": "145p63r2arn3cpn3i6d7d5mvsj4030fpqn6aj9dyqyx5minmd0zq", - "fetcher": "github", - "repo": "dpassen/cljstyle-format", - "unstable": { - "version": [ - 20220706, - 309 - ], - "deps": [ - "reformatter" - ], - "commit": "31a43dfbeea12bbd4639dcec4fbb043cc0ff86d3", - "sha256": "0gjyxbwmidl1g4ld88rfg2rgc3fjzanw189xj9v1psv0dpbgv4yx" - } - }, { "ename": "clmemo", "commit": "890ec47013f1638d3b12f2d08118bf64c104be2b", @@ -15254,11 +15397,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20260325, - 811 + 20260709, + 952 ], - "commit": "9146525680b29a0c6b72a1126d075b54f8066710", - "sha256": "1nl51qmm50n2l4wmwbm35lhpjy3k56nji2ncb9iz67hlivncvb5h" + "commit": "38c72d3284367459a8b116deb660c3163f6653ea", + "sha256": "03c6a12jlg0jvq4f146d9q2iq1waw047jcaja8b8vbpchfr40hl7" }, "stable": { "version": [ @@ -15371,11 +15514,11 @@ "repo": "clojure-emacs/clojure-ts-mode", "unstable": { "version": [ - 20260325, - 2107 + 20260616, + 1927 ], - "commit": "ba6de87b0acb5aa5483f6012611b30f6bf0414f3", - "sha256": "0bqcw4ljvnks5ngbv6rr01c4v2chxr5g7f7h0y34cyklcrv50yyp" + "commit": "af00860cd85a46d7b95af1e4f966d3ddccdab9b4", + "sha256": "0fxl153gszq8clnqmhzp7lnki34zzfa788x3jh6wiw2nd0hidsvl" }, "stable": { "version": [ @@ -15430,30 +15573,32 @@ "repo": "magit/closql", "unstable": { "version": [ - 20260101, - 1828 + 20260601, + 1540 ], "deps": [ "compat", "cond-let", - "emacsql" + "emacsql", + "llama" ], - "commit": "947426d0c93e5ad5374c464b2f121c36cdaf2132", - "sha256": "08zxrzwpsixcc9ma7zps21krm0fn7l97aawhhacn2yf1mjja0p5s" + "commit": "d382e7427f5d375ffc872851b049e9f9c4a43dfc", + "sha256": "0jh5qkcxxmdql7jfizqfkiix6ikwli8qgk5z5k9sxn4kpniisvjk" }, "stable": { "version": [ 2, 4, - 0 + 1 ], "deps": [ "compat", "cond-let", - "emacsql" + "emacsql", + "llama" ], - "commit": "947426d0c93e5ad5374c464b2f121c36cdaf2132", - "sha256": "08zxrzwpsixcc9ma7zps21krm0fn7l97aawhhacn2yf1mjja0p5s" + "commit": "d382e7427f5d375ffc872851b049e9f9c4a43dfc", + "sha256": "0jh5qkcxxmdql7jfizqfkiix6ikwli8qgk5z5k9sxn4kpniisvjk" } }, { @@ -15525,6 +15670,36 @@ "sha256": "118k5bnlk9sc2n04saaxjncmc1a4m1wlf2y7xyklpffkazbd0m72" } }, + { + "ename": "clutch", + "commit": "08801af1c2c10c1cc6f456392680d05bc57398a7", + "sha256": "1637jb2ggxlaabla0w9yfbxvlda21yy5vayhvivhx7mwsnp02yik", + "fetcher": "github", + "repo": "LuciusChen/clutch", + "unstable": { + "version": [ + 20260719, + 1018 + ], + "deps": [ + "transient" + ], + "commit": "f64414e20c58a6b92255fd3f634785b0855ea8f5", + "sha256": "0akgrdhrbmwjwl7g4zlym5blpja3q9p55mygcck17xxqrl40z4fw" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "transient" + ], + "commit": "a4dfac80ebbf54df48f6fbf7936da0d6f1b6f321", + "sha256": "1cyjawbrfphdqcrwg10nrhcvmr45hlhjr3v1g8k0ypcgmfa7cmjs" + } + }, { "ename": "cm-mode", "commit": "42dda804ec0c7338c39c57eec6ba479609a38555", @@ -15533,25 +15708,25 @@ "repo": "joostkremers/criticmarkup-emacs", "unstable": { "version": [ - 20251229, - 930 + 20260518, + 1920 ], "deps": [ "cl-lib" ], - "commit": "5c9fadbae23d5ba51b65a4620354621ee8c1907d", - "sha256": "1lg22rj7axrpay8r5gdpiffm9lz27pmkv86nmh72am2bb4094c1p" + "commit": "a5816175548a821bf62d374b40d6974e4956c44b", + "sha256": "1nxfjfwfmzf68rfhbmb3qk26g0z5pdgn5jwzzcqv43s6iz55dxgm" }, "stable": { "version": [ 1, - 9 + 10 ], "deps": [ "cl-lib" ], - "commit": "5c2decacdd1a48c9e4ed2ce2289622aa5915ea24", - "sha256": "1lblkdp0xim22xc71xxgiwlvqrs500rirqz1in546d10ij445ygq" + "commit": "a5816175548a821bf62d374b40d6974e4956c44b", + "sha256": "1nxfjfwfmzf68rfhbmb3qk26g0z5pdgn5jwzzcqv43s6iz55dxgm" } }, { @@ -15626,20 +15801,20 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20260421, - 1337 + 20260709, + 1724 ], - "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4", - "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5" + "commit": "44125a9e977c834f06ac1e5fe8db55355261ef87", + "sha256": "1b356mjzcsdj9im4404h2y51gfphqxg83s6cmgrlnmm3bycj71bg" }, "stable": { "version": [ 4, - 3, - 2 + 4, + 0 ], - "commit": "8d3c68cc0f36108f7ebb23ba7a6bc08b9b1d81e4", - "sha256": "15q1qgjsgqzirq6f59q6y402bhcw6q3pvmpdh8zs5va70a37p7j5" + "commit": "44125a9e977c834f06ac1e5fe8db55355261ef87", + "sha256": "1b356mjzcsdj9im4404h2y51gfphqxg83s6cmgrlnmm3bycj71bg" } }, { @@ -15755,20 +15930,20 @@ }, { "ename": "coc-dc", - "commit": "df9255e363e96363a7d976abd3276a3cb08dd601", - "sha256": "1zfd2pzgmisksq7jprwhrpx7x92fhjfk4camrjqhlkwmanlbql67", + "commit": "bb59486eac3592dde53412b52bdd49e7589887f9", + "sha256": "1d41ws61xlpbly5p0m9sxd2iqc8a56vjlx8m5p2vhhacyycgnawv", "fetcher": "github", - "repo": "S0mbr3/coc-damage-calculator", + "repo": "lejicore/coc-damage-calculator", "unstable": { "version": [ - 20241104, - 1739 + 20260629, + 1344 ], "deps": [ "hydra" ], - "commit": "097bc2496263fc1e69a04d0528b41baf2fd08115", - "sha256": "0y8x197zlmg0ipbk6jjcjcwmw2ncfplbdpjhpdk4lj684hacxsr9" + "commit": "c5bb252b1ed39c17796ef2b4dcaf66e1202cbd89", + "sha256": "1ri6nym15laavfqvmzipyf3ndak9s9ymbsi7a4ilkldwz6by5wsr" } }, { @@ -15827,8 +16002,8 @@ "repo": "ag91/code-compass", "unstable": { "version": [ - 20250227, - 1124 + 20260520, + 1418 ], "deps": [ "async", @@ -15836,8 +16011,8 @@ "s", "simple-httpd" ], - "commit": "6b741978c83f0359c7e555ab78708eed6ced8486", - "sha256": "0g8bw01jpp488y95m14nbizq0acx9grqhk34g37lwn8imshl9hi6" + "commit": "f5b96ab2f0866ab3dcae170a9953d7eb0ef52dbf", + "sha256": "1fxg7hkgv9lmjjbakg2i7wfi4xdj7bm1wnnb8aav16zwx45vighw" } }, { @@ -16308,11 +16483,11 @@ "repo": "purcell/color-theme-sanityinc-tomorrow", "unstable": { "version": [ - 20260211, - 1131 + 20260710, + 1606 ], - "commit": "7aec77ed89402bebf0ed879848329ac336f44188", - "sha256": "04a0mvff2k9dg3flx953w1yfnwp345za7k8220zcwxmpi5rcnzz5" + "commit": "d32469ec6529e3a7f84b45277f233497b74f5bab", + "sha256": "0l7jbsq3992sjrj0afldb7q746wq44ir02cdrqdfzn1d0ndm62yb" }, "stable": { "version": [ @@ -16495,14 +16670,14 @@ "repo": "NicholasBHubbard/comint-histories", "unstable": { "version": [ - 20260330, - 1650 + 20260608, + 1833 ], "deps": [ "f" ], - "commit": "da9dddafa825a40cd1e25261bb088701c08a80d8", - "sha256": "0j64ia11p7jlxvkyvjn3bls03qpin2j5amg7liy7fzc17hpjx5iy" + "commit": "e13c5ac7f812bc6f7da57c4640600b97356bd02b", + "sha256": "0axi8nkywysvbw311b9gbjpk0zr0mwqb93rd485mzpq93di537kp" } }, { @@ -16810,11 +16985,14 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20260331, - 245 + 20260718, + 1243 ], - "commit": "59626254bbac187fc2b8d7a189aca90976ab36a8", - "sha256": "13dd87hcad91y5ay6gxrzkn98d5h90ib4k7nsfkzf955rdpxqvrr" + "deps": [ + "posframe" + ], + "commit": "24a4a6b129546a1ce2fcb3e3c5948259dff00685", + "sha256": "0qjqk4zh3fk1m7rhkj4sp6wdrsk3ki6jwdc5fly3gng3fjlc5lz1" }, "stable": { "version": [ @@ -16985,14 +17163,14 @@ "repo": "randomphrase/company-c-headers", "unstable": { "version": [ - 20190825, - 1631 + 20260511, + 1117 ], "deps": [ "company" ], - "commit": "5e676ab0c2f287c868b1e3931afd4c78895910cd", - "sha256": "18zyzhjnlbwblgqgr876ynrc7k736lg5s6bgxmxph7gymdz4fb4h" + "commit": "986cef8c7aae821ae65b193ea15e7f4a7097821c", + "sha256": "1imsk4c5dpggi92pljzmv035i55pvmhs3a0xnjk6519g6j54yzzr" } }, { @@ -18046,28 +18224,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], "deps": [ "company", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], "deps": [ "company", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" } }, { @@ -18732,20 +18910,20 @@ "repo": "jamescherti/compile-angel.el", "unstable": { "version": [ - 20260421, - 1222 + 20260710, + 1459 ], - "commit": "e17764996ec7a0f74f0ad4399cfdd7e44e11d8ae", - "sha256": "054546x4d11mrva52kg8ja3ik13v6yii34pnv56ml5wkscpsq2v9" + "commit": "fc469061a294a2a9888736d9b9c4ff9b9e6971ce", + "sha256": "0xcq3pbw52fbk54xk1hdq24wbcg87yl8zk3j02xhi65dqih8qj3m" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "520e516fb794336ddaef4a4e7b02e3e9d60eda04", - "sha256": "18bhhsw8qfj4rx6fmvr3cp419pw5yn5lfvdwdi8dcczi8bf1f7dh" + "commit": "a75f4fe69abc0e8b15c739e3d07bc237a974e052", + "sha256": "1vzs2j9xwgxd54gm6j73dpxs5si77l3ywkf3g4af5hmrqpshb6c0" } }, { @@ -18779,14 +18957,14 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20250101, - 2156 + 20251004, + 2121 ], "deps": [ "all-the-icons-completion" ], - "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", - "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" + "commit": "2976058c416b19f9761d5b8cf596210803afd2d7", + "sha256": "01jhkygrddsrw0m3y6aa10vy4qjgigsszyl5z50hl8xglfc3pijm" }, "stable": { "version": [ @@ -18839,14 +19017,14 @@ "repo": "mohkale/compile-multi", "unstable": { "version": [ - 20250101, - 2156 + 20251004, + 2121 ], "deps": [ "nerd-icons-completion" ], - "commit": "19d16d8871b5f19f5625e1a66c1dc46a7c3f6a3a", - "sha256": "0zs7s8k5vf0wl3jh374p62vaak0l6p5xy525ys2nv7mghgbv5a53" + "commit": "2976058c416b19f9761d5b8cf596210803afd2d7", + "sha256": "01jhkygrddsrw0m3y6aa10vy4qjgigsszyl5z50hl8xglfc3pijm" }, "stable": { "version": [ @@ -19029,20 +19207,20 @@ "repo": "tarsius/cond-let", "unstable": { "version": [ - 20260201, - 1500 + 20260701, + 1237 ], - "commit": "8bf87d45e169ebc091103b2aae325aece3aa804d", - "sha256": "08ay78mbypfs1nl31dsv4b7bixnsl5kp1xkg0jkk7fvbsfv22679" + "commit": "c48600dfab6372670225f046cace263700c78eab", + "sha256": "1d5daj00qkpyjqhdy24rng08ynpqxc44d30sv5f1y92nmlhswmdv" }, "stable": { "version": [ - 0, - 2, - 2 + 1, + 1, + 3 ], - "commit": "8bf87d45e169ebc091103b2aae325aece3aa804d", - "sha256": "08ay78mbypfs1nl31dsv4b7bixnsl5kp1xkg0jkk7fvbsfv22679" + "commit": "c48600dfab6372670225f046cace263700c78eab", + "sha256": "1d5daj00qkpyjqhdy24rng08ynpqxc44d30sv5f1y92nmlhswmdv" } }, { @@ -19291,25 +19469,25 @@ "repo": "minad/consult", "unstable": { "version": [ - 20260421, + 20260716, 1105 ], "deps": [ "compat" ], - "commit": "14131ab6247e1b4b0f28134fba5e92a4707dbc1d", - "sha256": "01bjr30ka1xljwk93yzfqvb210fyc6ln9jik9gi9cinp27hmaap7" + "commit": "8c6787edc690097ccfcf2255fecf623a8ab29c7e", + "sha256": "0pl4fxggmjjfmad9qwvpsjjihz86j6gcigb1xylml9q9rrnh3yf7" }, "stable": { "version": [ 3, - 4 + 6 ], "deps": [ "compat" ], - "commit": "f8c2ef57e83af3d45e345e5c14089f2f9973682b", - "sha256": "0la70jnf14aqaa23ym5phamjay4l4fy3vmizplljli63q8jf89qk" + "commit": "9bb68cf3941eb618fff18bd7626164951c70eb8a", + "sha256": "02ain9sqvivhhy1fbxv7ayl6mshaiz484y2gcifvml1wjrnygwr2" } }, { @@ -19479,16 +19657,16 @@ "repo": "mohkale/consult-eglot", "unstable": { "version": [ - 20250831, - 924 + 20260613, + 1443 ], "deps": [ "consult", "eglot", "project" ], - "commit": "d7296fef3f9c4280229df51f32fc0b5db2392c22", - "sha256": "1x5v82zrjqlckshy4sjpkwkj6mqqk6njiz00z68n1a8383f1jlik" + "commit": "3e4d9a40911b897c0a2c5d20199d0f7c30bfc1c2", + "sha256": "0rbsh5v836jdfwiy9p92f4wra33p4v6x4d77jmsys2sl92d57qx0" }, "stable": { "version": [ @@ -19545,27 +19723,27 @@ "repo": "minad/consult-flycheck", "unstable": { "version": [ - 20260322, - 16 + 20260605, + 1858 ], "deps": [ "consult", "flycheck" ], - "commit": "21c74a96e787606f8572453b17f6912c3755be42", - "sha256": "1sxkyxqkgxcysqyapjsylwanas419wz8y59q9prdld0sm57npjsa" + "commit": "9dd95361669f87e14230376f4f93c6b9a222c497", + "sha256": "1n8n9wd4rn3x8kqyrlimb1hhm3nwgh7vawg7hjy63mfmvcfgrlqk" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "consult", "flycheck" ], - "commit": "9fe96c4b75c8566170ad41a04c3849d2e2606104", - "sha256": "0ga6mqskgmq979nj6ri89x85chcfw0pxhx2vz1xgssz10hwpbla9" + "commit": "9dd95361669f87e14230376f4f93c6b9a222c497", + "sha256": "1n8n9wd4rn3x8kqyrlimb1hhm3nwgh7vawg7hjy63mfmvcfgrlqk" } }, { @@ -19594,8 +19772,8 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250915, - 2043 + 20260625, + 257 ], "deps": [ "consult", @@ -19603,8 +19781,8 @@ "ox-gfm", "yaml" ], - "commit": "699af6c2b179c6a7888352e78413b7e3f76ae6ba", - "sha256": "1brv97np4l3cfby88izwdqc4k1h6ikbx5h08i01j858bkpzkwbnz" + "commit": "7042619362cd47314d3d0f706fa9cac5bf07950c", + "sha256": "0xa7z2zhz44i2fhgiag3a96jkhz71z294qfnphqjxw96cqcq3mb7" }, "stable": { "version": [ @@ -19629,8 +19807,8 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250906, - 1805 + 20260623, + 1820 ], "deps": [ "consult", @@ -19638,8 +19816,8 @@ "embark-consult", "which-key" ], - "commit": "2b625a0331c9a92c67fef8ea2e694b28d5006421", - "sha256": "1p9lcjrzwxgscxpy0x992g8sxy6h3mcin1vffxf6nx28akwz13in" + "commit": "7b0fba0dc81a446c95cd39fa2a6adcd39501df9d", + "sha256": "18bmk52z2fx23mnbg8c8cv78fp68l958j2zkhk7wxcip7zzjnr7q" }, "stable": { "version": [ @@ -19728,16 +19906,16 @@ "repo": "armindarvish/consult-gh", "unstable": { "version": [ - 20250906, - 1805 + 20260623, + 1742 ], "deps": [ "consult", "consult-gh", "pr-review" ], - "commit": "2b625a0331c9a92c67fef8ea2e694b28d5006421", - "sha256": "1p9lcjrzwxgscxpy0x992g8sxy6h3mcin1vffxf6nx28akwz13in" + "commit": "a9e9144fd9d0a689d26818eeb8eb108cd4696718", + "sha256": "1jd2ky32l51vd89lxgk95dl9q8yh4mghdyfx7y11pzmjrw9nbljp" }, "stable": { "version": [ @@ -19896,16 +20074,16 @@ "repo": "gagbo/consult-lsp", "unstable": { "version": [ - 20251025, - 719 + 20260619, + 643 ], "deps": [ "consult", "f", "lsp-mode" ], - "commit": "d11102c9db33c4ca7817296a2edafc3e26a61117", - "sha256": "1lswbg18f1f3xg25hlgbn4rrlm4h4p5y27msx2g2gm49bk6ybfdi" + "commit": "f41a3946987a3880068f95f3725bbb7b0d4b0b22", + "sha256": "1az6p9m1vf78a2p11apvh0105vys5ibbifvzbljilifjs5mfb07w" }, "stable": { "version": [ @@ -19923,22 +20101,22 @@ }, { "ename": "consult-notes", - "commit": "bd01544509dfe92d007d1edd47cfff0686a057f5", - "sha256": "0s13l1xdbihyp48k9nkflfw257q008imhv2zpfa86g9j04n4h0rz", - "fetcher": "github", + "commit": "e5b575433d962e6c281731daf227f82a57f2ce7d", + "sha256": "0v2vij3hdn47343xps5xm7mk4vig98y8mv39bw5h273ndc73yad2", + "fetcher": "codeberg", "repo": "mclear-tools/consult-notes", "unstable": { "version": [ - 20260222, - 1928 + 20260706, + 1837 ], "deps": [ "consult", "dash", "s" ], - "commit": "94e5b19ec84363438eb7114e59c059a67f3d7c59", - "sha256": "1cvvmk3nf3fidcfc2x8wvsb1yc98cilhhcl7kgawzlwmy8r0libr" + "commit": "1e095562c5d8245e9f85c043cbaa9aa4dc0b9ded", + "sha256": "1f5jl777akjpx0ays16wy1hiv684x33v0c4g0mzlxmb9zify65d9" } }, { @@ -20000,15 +20178,15 @@ "repo": "Qkessler/consult-project-extra", "unstable": { "version": [ - 20260117, - 813 + 20260428, + 2007 ], "deps": [ "consult", "project" ], - "commit": "2b3fa36fd3a14deacf594f4acd54d220d6890c55", - "sha256": "1k1z8rsqqri4dpvc7vnrgc2s53h538vyllvc700wci1zk5pa9khj" + "commit": "52c453b7f85dea90cc53ff8fba750795606415df", + "sha256": "0j14ama1n79w7h3kdmknx3hrjp6a2vfcmmwaa1y5df2ymhnc2bkq" }, "stable": { "version": [ @@ -20098,14 +20276,14 @@ "repo": "guibor/consult-spotlight", "unstable": { "version": [ - 20260202, - 2318 + 20260708, + 2142 ], "deps": [ "consult" ], - "commit": "b60fef973c19e22225cae395217ff01bd32a0ef5", - "sha256": "0dsd12kj7blnd6mhs3kgww5x4bz7xl8qbj2xg3xra8jgdic03njk" + "commit": "c6d8cb34e223608708c5424e4d03d04d6d6648f7", + "sha256": "0fps3yhla3d9wawm3fchgfqxhd4wih48lp7ib2qzk7bj1i9yhihw" } }, { @@ -20257,15 +20435,45 @@ "repo": "mohkale/consult-yasnippet", "unstable": { "version": [ - 20250411, - 1922 + 20260613, + 1436 ], "deps": [ "consult", "yasnippet" ], - "commit": "a3482dfbdcbe487ba5ff934a1bb6047066ff2194", - "sha256": "0cyzyxmdrk7dcpsw51pv1vz1f6px5yjmbmsa6r74vmshfdmljm3j" + "commit": "89e39887c87e25d18861216a4d72e5d174f13751", + "sha256": "1x72lgk79j215l5gn0mzqakf20h06fbhjg7afkwcywm5gpqhnind" + } + }, + { + "ename": "context-clues", + "commit": "095357945ea2d37ff4bec125c10a3d5d6e7b7738", + "sha256": "10mwins3ssg75sgdm3imvvlz24x4fh3id4akalmyqq1kzlbhrf1n", + "fetcher": "github", + "repo": "mrcnski/context-clues", + "unstable": { + "version": [ + 20260719, + 2046 + ], + "deps": [ + "transient" + ], + "commit": "51fa7a434a234d64c70054dd8d99ca4792bb7ee1", + "sha256": "1zgk58myqh8b4nnx8r8bj77cqsdrfswwsw8yi493f0cqwasgc9vy" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "transient" + ], + "commit": "55483a68c18e4c5960bfb89c0ea95265a89db0ab", + "sha256": "19pps2wjzlv1ghl6nlrl9fndz8ankfyxmvkgwcl87ba7bhbm4d67" } }, { @@ -20428,8 +20636,8 @@ "repo": "copilot-emacs/copilot.el", "unstable": { "version": [ - 20260331, - 713 + 20260707, + 516 ], "deps": [ "compat", @@ -20437,13 +20645,13 @@ "jsonrpc", "track-changes" ], - "commit": "ab5c58bc969f52f6d75e972658f2c3381c70b4fa", - "sha256": "1glqr4x7r2f0wgcn0mbcvphdidirpnq1b771ig5ly4s3zaxnqxl5" + "commit": "277ca357422ba34bcf7fe650cb720580994eea84", + "sha256": "0fj6h3v3v3h0cczs9mc728bcx5zkqlh4yi11la347wah39wdk21d" }, "stable": { "version": [ 0, - 5, + 9, 0 ], "deps": [ @@ -20452,16 +20660,16 @@ "jsonrpc", "track-changes" ], - "commit": "c8c06efaa508569e13d7191882ae33435bb14543", - "sha256": "1xvhfwgddms0cxhi9pn75vb6qsd6gqfv8s59xjk9ilh57nvwzqfn" + "commit": "15a4be6bbe13220d9781e10d6e2086c21c3bc7ee", + "sha256": "1skm4wnslx6y6vh83i7maswqk1i6x6gjar58n727z2qq7y3z6qn7" } }, { "ename": "copilot-chat", - "commit": "6e3852d02866ef577717fae04a56c876efa4217d", - "sha256": "1xzaa9rn8bnbjlcvlir2nnvidnmyhhcjqi7yi7xadv5i0rw66zxz", + "commit": "b5b0b336a5c9cbe201c26449eca9d7a854d4ac0a", + "sha256": "1cwixa30d6k9915wbv31wzzllb75i8rp27ssrs30vdxiz3a46z0h", "fetcher": "github", - "repo": "chep/copilot-chat.el", + "repo": "chep/gh-copilot-chat.el", "unstable": { "version": [ 20260401, @@ -20649,25 +20857,25 @@ "repo": "minad/corfu", "unstable": { "version": [ - 20260419, - 1808 + 20260719, + 2241 ], "deps": [ "compat" ], - "commit": "1466f6f7effc0a783c8acda66471be0db11f789a", - "sha256": "1qsq3cay6khphq008nyfybg4iafsmszk9j4dr35sr1bzfdq0wml2" + "commit": "991224fc0387f005f4ffa896b35eca70b54c651a", + "sha256": "0bmbljl6xz7ml312sisy6j9sl9lsfzh7g6hk15fda4464lfx8jcl" }, "stable": { "version": [ 2, - 9 + 10 ], "deps": [ "compat" ], - "commit": "d2a995c5c732d0fc439efe09440870a9de779a74", - "sha256": "0hb9ycq6v28nkx0qbczfks4hz26g1d1bdb48ylxb9pd26irxb9pm" + "commit": "4a9c67da16eb64cadaa4bfcc16713188145c83da", + "sha256": "1qw0xzlxr6fh9iiszqnl4hfjm2h0rd08warhanq99q34nz4iviny" } }, { @@ -20707,28 +20915,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], "deps": [ "corfu", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], "deps": [ "corfu", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" } }, { @@ -20794,14 +21002,14 @@ "repo": "rob137/Corsair", "unstable": { "version": [ - 20241018, - 1015 + 20260505, + 1402 ], "deps": [ "gptel" ], - "commit": "f750a435d6be68f0d75dc5a90f8aa3cb58e8c16a", - "sha256": "0xwkfv63klpyqkgx1ihwqh1aqyk8yi3z3appygp28q60rybsyiyl" + "commit": "412285e1feeba9c6e0e3a103d64396cef1e73d51", + "sha256": "04azlj15jhg02sxjihnc15k4sgcar1vxhd8rxz82y446y00hg235" } }, { @@ -20812,15 +21020,15 @@ "repo": "conao3/cort.el", "unstable": { "version": [ - 20241019, - 936 + 20260516, + 827 ], "deps": [ "ansi", "cl-lib" ], - "commit": "262966c9bc7fd3aa7bcf2dc3b9edc286c7f19e58", - "sha256": "01n7rcvdw98q0dvc51pk6nyrjwcf76cfs7r7c93xnjv5pmpjczfr" + "commit": "851a8669f14a1cfc3b0f9d6bf046139cb5bb7470", + "sha256": "170dbh6cywyvzc0asayql4vmwa4dyk9k102q0ndkh7m7s33dlsjr" }, "stable": { "version": [ @@ -21096,34 +21304,34 @@ "repo": "redguardtoo/counsel-etags", "unstable": { "version": [ - 20260320, - 524 + 20260513, + 1048 ], "deps": [ "counsel" ], - "commit": "292fe179ccfc4a194e1a362d2929280bdf6e76b1", - "sha256": "1jd7hxf0np94fxzp0p9nrm2ql8j85zq6a0ivsq3xg4j6wm8bbjbh" + "commit": "d9ed92310da368d8d037e151b8dcbb7ada55d42c", + "sha256": "063anpspqamza51ndbg6q0j3m29w6w9jklryq5kbwgmp4h3qz71b" }, "stable": { "version": [ - 1, - 11, - 0 + 2, + 0, + 5 ], "deps": [ "counsel" ], - "commit": "292fe179ccfc4a194e1a362d2929280bdf6e76b1", - "sha256": "1jd7hxf0np94fxzp0p9nrm2ql8j85zq6a0ivsq3xg4j6wm8bbjbh" + "commit": "385eb738d09ce47f905982532e2b03cfb8381f17", + "sha256": "1g9pbk4xdwz0qr49wgzg5hkk1rjc8ayv9zyckn0b46jcg7cqg14i" } }, { "ename": "counsel-fd", - "commit": "b2e58e2a0bf3825d6ef43455fd3e60b33c88aaa2", - "sha256": "1ywyg2l1dx2rziw23b0i5m4xg4n8laarkq9wbbq80ma5pjb18ims", + "commit": "28dfcdf4682782b00234542bc9a06f2f57db66db", + "sha256": "0nhvqi3xr3pkrf1l1s6iihsk3hhjb7nrj4bi8i2m0bdgr1inwja0", "fetcher": "github", - "repo": "CsBigDataHub/counsel-fd", + "repo": "ChetanKoneru/counsel-fd", "unstable": { "version": [ 20221011, @@ -21501,6 +21709,30 @@ "sha256": "0khwqwwsp2zhz7x2w7qcsdh5vmk3ybshj9isa6zr2ygag8aag13h" } }, + { + "ename": "countdown-modeline", + "commit": "f5d525e6591a6e7aa4a8b28f096adbae03851856", + "sha256": "1p3k558189lb3h93znpm2prrl3jc1z7wpk94qsn59bszjlfjqzcg", + "fetcher": "github", + "repo": "jholland82/countdown-modeline", + "unstable": { + "version": [ + 20260615, + 1455 + ], + "commit": "7485863972bd941a786bc595d566e02a490bb352", + "sha256": "03nq1l4m2cc5r0mhgq1bc4zjfxak6rsnq2hm1lgyazrwsgk6kyi1" + }, + "stable": { + "version": [ + 1, + 3, + 2 + ], + "commit": "7485863972bd941a786bc595d566e02a490bb352", + "sha256": "03nq1l4m2cc5r0mhgq1bc4zjfxak6rsnq2hm1lgyazrwsgk6kyi1" + } + }, { "ename": "cov", "commit": "d0f35ce436ac157955d6f92de96e14bef9ad69e3", @@ -21665,11 +21897,11 @@ "repo": "ignity21/cppinsights.el", "unstable": { "version": [ - 20250519, - 101 + 20260628, + 722 ], - "commit": "941e48a0d5c4a6aed865d8be30ebca006b5a6e3f", - "sha256": "0sz6bgk2i7jgr1g31pyxr1b4sknipiic3li1k5fwrfx35gs92hnm" + "commit": "552d959a7313e746b2a343991bffb9c2271dba47", + "sha256": "0rp3xbklgbaacwlzimb6hhizb4qjzhjmdgbypa0h7bkqkwv0l7fi" } }, { @@ -22081,11 +22313,11 @@ "repo": "crystal-lang-tools/emacs-crystal-mode", "unstable": { "version": [ - 20260111, - 2220 + 20260607, + 2043 ], - "commit": "559e1d8ff9bb87a4e937978001386bfb58b113a0", - "sha256": "0mf2cl99y187c1v0cw192jchdwivm5c1m1154hnl6kyks2wkh7l2" + "commit": "f3b01df0bbe58852d0d7242bf5c0495931bb6fa6", + "sha256": "1823q4clg1hr085pbxpwdqy9gy86grvwfj224wnx5x2w7xi1mqsc" }, "stable": { "version": [ @@ -22177,31 +22409,20 @@ "repo": "hlolli/csound-mode", "unstable": { "version": [ - 20250310, - 1026 + 20260719, + 833 ], - "deps": [ - "dash", - "highlight", - "multi", - "shut-up" - ], - "commit": "4a6aa20ad919f088d65b903814453bd56266cf77", - "sha256": "18q4jpj6fnry67m6z3y5kk70hhk8db5l7wjwylhwmh362c3hzp30" + "commit": "9b12204deb8cede38dbb178f4b9c5f101e06d6a3", + "sha256": "0w7s3n4l1dw00j7k2f6h0q2dhbn8ydy3dqq20bp647sq2xpdihzp" }, "stable": { "version": [ 0, 2, - 1 + 9 ], - "deps": [ - "highlight", - "multi", - "shut-up" - ], - "commit": "389be230aecfea03e8043e8ea6884ea21ea9230b", - "sha256": "1c88ak0jaj51fwiqniqxd7xyk23wjl9m57znzm8j267ld8g12znp" + "commit": "9b12204deb8cede38dbb178f4b9c5f101e06d6a3", + "sha256": "0w7s3n4l1dw00j7k2f6h0q2dhbn8ydy3dqq20bp647sq2xpdihzp" } }, { @@ -22657,6 +22878,30 @@ "sha256": "1nkdc8r77ln8v2vdahrhkl87hwpahkwpw9gck7bd29krc8fj7d48" } }, + { + "ename": "cui", + "commit": "4e8c83c93df26fdbec89d3bd1152ae7daaeb35f5", + "sha256": "0gkaqg6m58smi4fhylz139aznr33xq50nrdz5jwcm5313skd7hkb", + "fetcher": "github", + "repo": "Anoncheg1/emacs-cui", + "unstable": { + "version": [ + 20260715, + 1931 + ], + "commit": "f68f1261f4618fee1d061b22a3a4155589b52259", + "sha256": "1spzw7c2x47axlj52a10wvzvcx0x485bsw515i78h4ggi1kf4ri6" + }, + "stable": { + "version": [ + 0, + 3, + 2 + ], + "commit": "d4ea6f0667f12a7b6022107e84de76fd5739a041", + "sha256": "0n4jf27yxwnwa28xk14r7gj46r0k2a1rp4pqd5s2n72hmm6a1g4l" + } + }, { "ename": "curl-to-elisp", "commit": "11453864d71c7853bc743341db7ca071126ca160", @@ -22930,14 +23175,14 @@ "repo": "ideasman42/emacs-cycle-at-point", "unstable": { "version": [ - 20260111, - 1240 + 20260502, + 927 ], "deps": [ "recomplete" ], - "commit": "0af1fa35f49d320960870b9dbcb4d03440139fdf", - "sha256": "154sh14iqdwf02qdl8h8jsrr8rw60479bh6n1p1mx2xvx2yjpad1" + "commit": "0be4e5813250139697773275784a9a8d144f47b1", + "sha256": "1x1ml0sxm37f737j4cpfwxr5d704pfcywxaz49hshrvc53i3s55x" } }, { @@ -23183,28 +23428,28 @@ "repo": "trevoke/dag-draw.el", "unstable": { "version": [ - 20251218, - 1333 + 20260627, + 2238 ], "deps": [ "dash", "ht" ], - "commit": "0c10afdff9f1ebfeea242e921fa22bb385cdf899", - "sha256": "11m2b30asrg54cysim6yyc4fhym9mgjg909yjjwja45qp8q3llin" + "commit": "c20b3c28781f1d768116a2cc601a4e8d0058e2ba", + "sha256": "0rylci9y8lpmsrac07npz0n3xkql61zxpj338qr0ffpdfd0vj8gq" }, "stable": { "version": [ 1, - 0, - 4 + 1, + 0 ], "deps": [ "dash", "ht" ], - "commit": "0c10afdff9f1ebfeea242e921fa22bb385cdf899", - "sha256": "11m2b30asrg54cysim6yyc4fhym9mgjg909yjjwja45qp8q3llin" + "commit": "c20b3c28781f1d768116a2cc601a4e8d0058e2ba", + "sha256": "0rylci9y8lpmsrac07npz0n3xkql61zxpj338qr0ffpdfd0vj8gq" } }, { @@ -23371,8 +23616,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20260208, - 1403 + 20260616, + 1526 ], "deps": [ "bui", @@ -23385,8 +23630,8 @@ "posframe", "s" ], - "commit": "b77d9bdb15d89e354b8a20906bebe7789e19fc9b", - "sha256": "1092xys5dx9k0rq3vgkrrgx6bfkpvq8lbhng8p8cvhspi2fi766s" + "commit": "c73a587d613788003986a11ffe393b46affe8322", + "sha256": "1556sxkgm1n0m70js4qspzq613j490z18395c33zm8i1smj21ybl" }, "stable": { "version": [ @@ -23431,11 +23676,11 @@ "repo": "fommil/darcula-theme.el", "unstable": { "version": [ - 20171227, - 1845 + 20260617, + 1603 ], - "commit": "d9b82b58ded9014985be6658f4ab17e26ed9e93e", - "sha256": "1y8rsc63nl4n43pvn283f1vcpqyjnv6xl60fwyscwrqaz19bsnl1" + "commit": "89e81a156f375306aa0aa639b3d0161543ce514f", + "sha256": "0i8x4a9kds8v0j3rdlrs3rl2k4vkksp1w4ik61r5zk79ip8lnpy0" }, "stable": { "version": [ @@ -23583,11 +23828,11 @@ "repo": "emacsorphanage/dart-mode", "unstable": { "version": [ - 20251105, - 543 + 20260529, + 1840 ], - "commit": "22288d0bb374f6880ffc211ce87c302acb3421e7", - "sha256": "0z1j0v5h5472r04bl9c7hwr0l9mjhp48kcyqgdrb3rx7z0id7052" + "commit": "793d7bcc18a2636ebafe06450356c08ea6d638ca", + "sha256": "0x7nmrwjsac0bpln5w38na8bx14q2q76a4r9dgcyyq3qckcq2qqa" }, "stable": { "version": [ @@ -23643,11 +23888,11 @@ "repo": "nameiwillforget/d-emacs", "unstable": { "version": [ - 20260421, - 833 + 20260626, + 1859 ], - "commit": "8e23c3b0eda55ba9bcdaffa5ab7f179c23012163", - "sha256": "0v7zkxdpcr5wgccvz8yiwahb6j2pl89hsjxhzs7ishakxw41asxa" + "commit": "288211ee4789392aa1b5ea9c665c6e9fd04b3a84", + "sha256": "0s4s97icch04zp44ah3dfzn865xmy8ak17r0s7zhpwzssbbajdr6" } }, { @@ -23785,15 +24030,15 @@ "repo": "hyakt/emacs-dashboard-hackernews", "unstable": { "version": [ - 20240918, - 1301 + 20260521, + 1635 ], "deps": [ "dashboard", "request" ], - "commit": "ea49fd79d12c26a2c3f9bcdffd0d70dcfee7cd74", - "sha256": "1s5rs8snd82fcq5ic7vy1612462958h02n23bpvl2mss6m7w33w0" + "commit": "ecc8c1eeca10408ac1fab2ad0e80fccf9c6bc0b2", + "sha256": "0psxjlr2fhvyjnz4hk1khbyl1frc2nzqjsc4xzzbkbayd7bp5bci" } }, { @@ -24200,15 +24445,15 @@ "repo": "conao3/ddskk-posframe.el", "unstable": { "version": [ - 20200812, - 917 + 20260516, + 827 ], "deps": [ "ddskk", "posframe" ], - "commit": "299493dd951e5a0b43b8213321e3dc0bac10f762", - "sha256": "1rsy0wjncxzjhis8jrxpxjh9l9pw0bngg1sb4dj5qvhsgszhawpn" + "commit": "1b5c8f85cafb1e763e214f4310113c75e28cce0d", + "sha256": "12d8nnq2czk2qjkgz3csh37943v0jgccdw8gng1lqsfcxywsil6g" }, "stable": { "version": [ @@ -24231,16 +24476,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20241210, - 1630 + 20260629, + 1858 ], "deps": [ "dash", "s", "spinner" ], - "commit": "bb555790c6f404572d537e1e4adec8b4ff0515f5", - "sha256": "04jskm3qlxq7zvyvcn33gsjcd5312nzmrpznpkqai9gb1v2zhrd8" + "commit": "9ba86acdd9fa6aec55c753f4db8c3a5778941259", + "sha256": "1pl0cl44ygrgx527fca4sql099xc78wqazxhdlsrsd2bq6jnk1lc" }, "stable": { "version": [ @@ -24264,11 +24509,11 @@ "url": "https://salsa.debian.org/emacsen-team/debian-el.git", "unstable": { "version": [ - 20260324, - 1738 + 20260703, + 520 ], - "commit": "d0f6cc8474fa0c022d738acdc159c1550188c991", - "sha256": "169jq55h22vpn0l0v4vryximxw3mmjxndjnqhl3knaa79yprwr0f" + "commit": "ce58c690e27522669eb1905e21a194ff9eb79a9b", + "sha256": "02ck505cswfzq8i7szbp1yvgyqkngxqxmfpb13qwqyg5q9nwkfdj" }, "stable": { "version": [ @@ -24462,11 +24707,11 @@ "repo": "ideasman42/emacs-default-font-presets", "unstable": { "version": [ - 20251214, - 1133 + 20260505, + 1159 ], - "commit": "6d69a989409ba3498032d9218abe92f58148562f", - "sha256": "00v94ckw5klljdv0pm4xjpcm9qhq6i5r76kzn7fkkjm1jvgp6cmj" + "commit": "43e778da6ef468e187743f009e14270875bc312e", + "sha256": "0p81fhmcp7m7z52i34j6hcz85pmx0xmgz9w3x9pk0rzkb9096c80" } }, { @@ -24893,16 +25138,16 @@ "repo": "pprevos/denote-explore", "unstable": { "version": [ - 20251027, - 911 + 20260719, + 936 ], "deps": [ "dash", "denote", "denote-regexp" ], - "commit": "3adc8b4d342bbc411d667f93dbc1f1468a245e04", - "sha256": "12b0bxvz01za3bxs66n63l6fyffnhq1br5fz0nf28839gvi80npg" + "commit": "bd442d761d0ce6efe5cd3b7ce4806a86a49cf8a9", + "sha256": "1pfvwg1akn59jqrc829fky91kpm0j7maq8s8dsb5z0lfb8i08ksx" }, "stable": { "version": [ @@ -24943,14 +25188,14 @@ "repo": "swflint/denote-project-notes", "unstable": { "version": [ - 20250610, - 1516 + 20260622, + 1947 ], "deps": [ "denote" ], - "commit": "697420c089d313bf65e7963248c1909a8fdb348d", - "sha256": "1yh8idry374lxngv63rclaci5h8cpxc3b2fk8q15v70ivsc04gvj" + "commit": "e109c84071b3aa8da49e5b0fc56e96f8d1cf5e95", + "sha256": "06qc0qi93s6cw81bnyxxlv9b6ynapg7bj8m8vyxc591hmrw109nj" } }, { @@ -24990,6 +25235,42 @@ "sha256": "0rrnr3my8w76zv99wlhhym0j5c3amlgjlamv8q3raglhbk683q3g" } }, + { + "ename": "denote-solo", + "commit": "35e65c9e778b25fd5a9e95db05e5feb7e63094d3", + "sha256": "1vwcl3kspiayw06y2l471ybl5vd5wqr3a9lx0rdhfqswmk331kcr", + "fetcher": "github", + "repo": "pavlo/denote-solo", + "unstable": { + "version": [ + 20260621, + 1352 + ], + "deps": [ + "denote" + ], + "commit": "f6f3621b48022fe43ec54429dcff4f92a06d7c15", + "sha256": "1z7n9zpxfbmp49x5j4hal5797xx2hbma0zwibwvh1ang51ffhv06" + } + }, + { + "ename": "denote-wordcloud", + "commit": "eaae76cbd2071cb7841baa01f30a80681cbe7289", + "sha256": "1b3plav8vrfbwvlh9qz48jm18kybfj1qvargg1ygkk6hm1k0zkg7", + "fetcher": "codeberg", + "repo": "treflip/denote-wordcloud", + "unstable": { + "version": [ + 20260506, + 1238 + ], + "deps": [ + "denote" + ], + "commit": "01a74f13bd1fa4f1645851cc64f2701ff2654e64", + "sha256": "0y371cq7gkqw8xg5pr3p8vprf9mkfkm9v0wv8izvq0d7xf1syksz" + } + }, { "ename": "departure-times-norway", "commit": "6fab35ad7b09bdaab751ac1b24f8a51749a17c66", @@ -25062,6 +25343,21 @@ "sha256": "13fasbhdjwc4jh3cy25gm5sbbg56hq8la271098qpx6dhqm2wycq" } }, + { + "ename": "desert-theme", + "commit": "fa2e546d32f6d70d57daf387fe49fc3c9e1d6034", + "sha256": "1nlp9v23ias4bc5bplk8c05d0shgrz6ijdx441g43vr1kv53f85p", + "fetcher": "github", + "repo": "bkc39/desert-theme", + "unstable": { + "version": [ + 20260606, + 1836 + ], + "commit": "a334abfe4d624cb37bb4a2dc309f8623f42b74d1", + "sha256": "1yglxj03k9ffh0ywp5285q9pczzkcnpkl6w7rjb959d5n5arcfmk" + } + }, { "ename": "desktop+", "commit": "0b009b42c73490d56d4613dcf5a57447fb4ccab4", @@ -25316,11 +25612,11 @@ "repo": "mew/dialog-mode", "unstable": { "version": [ - 20260406, - 1841 + 20260619, + 1559 ], - "commit": "7a14cb400ec46a4f0d9df5270866592d3529986d", - "sha256": "0sh59a1i19lqws8mn1j1pi1hyyhskysx7xwvi0xqwcf1h2iwf72x" + "commit": "e092fe2c3915e28ae9151f856d340c2ba17ecb68", + "sha256": "12qfbyk9f8s77y8q09xg674xbc9b23a32672v7z9f92bl64x0nd2" } }, { @@ -25392,31 +25688,31 @@ }, { "ename": "dicom", - "commit": "879fe6f4268ea058c6b1b6380dfbd1bc05917ffa", - "sha256": "0ixj9mg2q4s4457sxp0qd13q9cicgi3p904x8jc0a6clyz6nlh36", + "commit": "4e939f55653401f55c8d31a694d7a0e4b4a6e184", + "sha256": "1z19fhrbfrmrymml4wg2giz3wli1z1872s1b5ssdfzr6cghdv5hg", "fetcher": "github", "repo": "minad/dicom", "unstable": { "version": [ - 20260117, - 1648 + 20260704, + 2150 ], "deps": [ "compat" ], - "commit": "03a12498905ef80d67ff53d138d415d828ceb12f", - "sha256": "0k4gq0bznkq8i017xpycmyii5x48xqcq8x04p3r5a7qg9ljlwvfk" + "commit": "50bfab3a34e502d6bac8ab12854cb33c8aff343c", + "sha256": "1821jfsirv1lph6d2amv8b8zzan0jgvb2i0zylv2mgy9irh8mi6p" }, "stable": { "version": [ 1, - 3 + 5 ], "deps": [ "compat" ], - "commit": "03a12498905ef80d67ff53d138d415d828ceb12f", - "sha256": "0k4gq0bznkq8i017xpycmyii5x48xqcq8x04p3r5a7qg9ljlwvfk" + "commit": "026a12a27939b29935ea343bab9162ed27bd732e", + "sha256": "1bi9mrwvyw4gkxix66gf9xhars830kbfinzrai3biixfd3gkdgs2" } }, { @@ -25513,11 +25809,11 @@ "repo": "ideasman42/emacs-diff-ansi", "unstable": { "version": [ - 20260108, - 1512 + 20260713, + 2340 ], - "commit": "98f1837840e9afedbff48969b2bd8468af7ceef3", - "sha256": "1hrhg1zly19c7fplswb2jcspsf0rcjwkh28pjrgrinw9n7dvwzqm" + "commit": "86c0b3525b2793b585b548c6e975d6fe6a2cea2a", + "sha256": "11h1gvm5iz2rd8ap3p745ndygmpay641ibaw9kk09rcr8rqr1cpy" } }, { @@ -25543,14 +25839,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20260328, - 1925 + 20260627, + 208 ], "deps": [ "cl-lib" ], - "commit": "b965e19e6e7f9933199e421849a49229207c1c9f", - "sha256": "07mmfc44wn0gsg4h4c4fnz0w8jzsj403nxkjbbn20pr3rfln42rq" + "commit": "2d7d0714d9637f54af672987c65b6973b31e56a2", + "sha256": "1w6vqdcqwrbaxm70j6klhnmn3i2h4rx8b2g1ymj1dsclabw6i3rl" }, "stable": { "version": [ @@ -25582,22 +25878,22 @@ }, { "ename": "difflib", - "commit": "df1924ddff6fd1b5fa32481d3b3d6fbe89a127d3", - "sha256": "07bm5hib3ihrrx0lhfsl6km9gfckl73qd4cb37h93zw0hc9xwhy6", - "fetcher": "github", + "commit": "1d888e12b1c4002896723b3c993a72bf920ef37b", + "sha256": "0z3rvzp63bbnxp7i22w9qd475k53xk75501d2gz25wv01xs030vk", + "fetcher": "sourcehut", "repo": "dieggsy/difflib.el", "unstable": { "version": [ - 20210224, - 2242 + 20260530, + 536 ], "deps": [ "cl-generic", "ht", "s" ], - "commit": "646fc4388274fe765bbf4661e17a24e4d081250c", - "sha256": "1qagl3ffg01zjqrgpq32h4ya869066n8ll9yq8lk40argjm523fa" + "commit": "9efb87bcf430600e8beb1a821dc78c1088a081e7", + "sha256": "0ky754i5czqi5rfw9k69hdccjg0ky5rfnnvhs3xvkc5d4kswr1w5" }, "stable": { "version": [ @@ -25850,32 +26146,32 @@ }, { "ename": "dim-autoload", - "commit": "66b1a81dfd09a2859ae996d5d8e3d704857a340f", - "sha256": "0lhzzjrgfvbqnzwhjywrk3skdb7x10xdq7d21q6kdk3h5r0np9f9", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "0v6dyij2fvj6wp1jlg9q3ii39ylabjh3vlmlb1f4ff9jw99ngf5k", "fetcher": "github", "repo": "tarsius/dim-autoload", "unstable": { "version": [ - 20260101, - 1826 + 20260601, + 1459 ], "deps": [ "compat" ], - "commit": "503eee682c2fcc24e05a765ac28e847be950bad9", - "sha256": "1f0nwz85dhnf0via74yw21f30mg3afkfng5w6ssrny906jzg3pnp" + "commit": "a9024464f0f0573338eaa490cfca998e66bf47f7", + "sha256": "15654pgqcm2lngkiznq3xf29m8c0an9rs6nzvpdrlmar8h98dqg3" }, "stable": { "version": [ 2, 1, - 2 + 3 ], "deps": [ "compat" ], - "commit": "503eee682c2fcc24e05a765ac28e847be950bad9", - "sha256": "1f0nwz85dhnf0via74yw21f30mg3afkfng5w6ssrny906jzg3pnp" + "commit": "a9024464f0f0573338eaa490cfca998e66bf47f7", + "sha256": "15654pgqcm2lngkiznq3xf29m8c0an9rs6nzvpdrlmar8h98dqg3" } }, { @@ -25963,20 +26259,20 @@ "repo": "gonewest818/dimmer.el", "unstable": { "version": [ - 20220817, - 122 + 20260618, + 1559 ], - "commit": "a5b697580e5aed6168b571ae3d925753428284f8", - "sha256": "1lj7pgsyzmd547yq33k4r75vfz3pdqafvnrxcv110hmb7mj3dvr4" + "commit": "bbab62f01d45086b9098f6a0ab765282d9c7bc45", + "sha256": "1azpm377q2qvwfgfpc01fgma66s52xy829r2kjadqsw0px0gjkq4" }, "stable": { "version": [ 0, 4, - 2 + 3 ], - "commit": "e45bf2d064a8ecdea2b4caf646ece2d0adc1d84e", - "sha256": "0dw0qh5hm1x76s5cqxvylvmjgy0jwy11xm258g6kmx6w1k6r1d2l" + "commit": "a5b697580e5aed6168b571ae3d925753428284f8", + "sha256": "1lj7pgsyzmd547yq33k4r75vfz3pdqafvnrxcv110hmb7mj3dvr4" } }, { @@ -26027,11 +26323,11 @@ "repo": "jamescherti/dir-config.el", "unstable": { "version": [ - 20260314, - 1908 + 20260710, + 1609 ], - "commit": "e2168cb2da83b36d071efec3d4e2ee42a599ed36", - "sha256": "10h06ssb0rjrgwh774i8hfzxy506hs5c8h2lrkxrc19lyvcl46x3" + "commit": "5620beabc842f5d63c02c90d28618d5c67fdf94e", + "sha256": "0sqja9riky1ixjns9hhqlq51ss5jjamrgflixwy2hbdlyz68mrmk" }, "stable": { "version": [ @@ -26819,15 +27115,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20260204, - 1424 + 20260716, + 1319 ], "deps": [ "dash", "s" ], - "commit": "24ceb60b168c591d7e2d9440a7f1895880681f48", - "sha256": "0vrpwk91qrcnkr6cgmal7abi0cmykfr840l4cxvv5jzr8c1m1zhi" + "commit": "eecf700ce70b282040b87ccdb76ff4195bdba919", + "sha256": "102gbq4xpgwrfznys13fdjvxpfsf8v7mf6f1z9k51i3mg0fs9iyk" }, "stable": { "version": [ @@ -26881,15 +27177,15 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20260415, - 638 + 20260619, + 56 ], "deps": [ "compat", "dired-subtree" ], - "commit": "19cdf0b9ed634efb7ae7047861fbcbd9dc0ee2e9", - "sha256": "1jsyrj6mam68klb5ygjks98a4npx85d1xx5viwss2c11zk52699r" + "commit": "1852a0b17bf2619607f6b4dfc437e279ba04e93c", + "sha256": "0br2a2nccbbmp5mgj4b0q28k0gaq10w1mrsyabfk9va9dqb8iscn" }, "stable": { "version": [ @@ -27034,14 +27330,14 @@ "repo": "Boruch-Baum/emacs-diredc", "unstable": { "version": [ - 20260414, - 1238 + 20260714, + 1154 ], "deps": [ "key-assist" ], - "commit": "7bbc7bfa60c2b3c7f39f75e1600b13260315271e", - "sha256": "0knsbywpmdb6jbb3frgnl9p6mi6ac2brhajb2rlqxqvr8fx9xz4b" + "commit": "0ad972d370e63e9b81909a60c06a147986de84f2", + "sha256": "0shfb53i53a390yxap2dsa0bpl2bh9614xpx1gk7hrgxr29g5pin" }, "stable": { "version": [ @@ -27133,26 +27429,26 @@ "repo": "wbolster/emacs-direnv", "unstable": { "version": [ - 20240314, - 715 + 20260630, + 839 ], "deps": [ "dash" ], - "commit": "c0bf3b81c7a97e2a0d06d05495e86848254fcc1f", - "sha256": "1b68rz3y64afwbh5brxa9yzwmsjg1g8irgvbvdblazhciap397c3" + "commit": "c1f38f71184f8aa3130898932f2de638beb5ed33", + "sha256": "078g5x3xzsqh9j87qdxmp131fbwrazcj0hxr5c7rr2f25pih8lq4" }, "stable": { "version": [ 2, - 2, + 3, 0 ], "deps": [ "dash" ], - "commit": "bd161f38621d1a9e4d70c9bafab9b7e3520f00b2", - "sha256": "0cf5npgksl9a03mnfdhfdhlf46gr9qz9adjxz3dbckq9b1vl0dfc" + "commit": "c1f38f71184f8aa3130898932f2de638beb5ed33", + "sha256": "078g5x3xzsqh9j87qdxmp131fbwrazcj0hxr5c7rr2f25pih8lq4" } }, { @@ -27255,14 +27551,14 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20250504, - 807 + 20260716, + 729 ], "deps": [ "compat" ], - "commit": "d877433f957a363ad78b228e13a8e5215f2d6593", - "sha256": "0d9c7i3x4vfl7k4vi29zyrz1d2cx7kfdnir8slqdjbapyacrl4s0" + "commit": "5152c80a32de3965a3e131a9314514af4aa8aa1e", + "sha256": "0v6l4vxxb5fvqgbrwlzwj7kc1m492vmxp231555hcw589qk3av5y" }, "stable": { "version": [ @@ -28028,8 +28324,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20260126, - 1212 + 20260709, + 1426 ], "deps": [ "aio", @@ -28038,8 +28334,8 @@ "tablist", "transient" ], - "commit": "916686b86e83a3bd2281fbc5e6f98962aa747429", - "sha256": "0yql0k5bw1vsqh44g5aq6ip6dn3c36k8gpljvbghsj01fcqdlvj6" + "commit": "f32940100035438934d626adb99cfc63036de490", + "sha256": "07wsf9p7dy7qws7jdksra3xh6lwlkh0dxmjskmbzd6wz86c2vx1i" }, "stable": { "version": [ @@ -28296,11 +28592,11 @@ "repo": "ag91/doctest", "unstable": { "version": [ - 20240421, - 1517 + 20260620, + 2225 ], - "commit": "0620ab6283a4e4302761ac415354b0b2b889dcda", - "sha256": "1g759f1ypw00vqbbcxa8yxf51bdmlrfdxybgjf4fmzzhvfbcpc4d" + "commit": "cdf41b5185dcd502f92722297f4361eab4ef1d13", + "sha256": "1mli87r0nlrfalh5mbnlg52cfhz9pgccnqlfzjj7k3fj0cl7rnvw" } }, { @@ -28459,16 +28755,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20260411, - 1454 + 20260708, + 823 ], "deps": [ "compat", "nerd-icons", "shrink-path" ], - "commit": "870b4b215fda881d29278d81bbab7f934a9bd8b3", - "sha256": "15m4c6bafc742cm3mwq9x889c3s96minp6957ipbxyd6qaxzfjly" + "commit": "017854c6484dd6a38e4b039dad04ce6dbec02f08", + "sha256": "0mvyi6r1599fsz6hfgbvq1i8z569xsh9iwwzz8pwd15c9v8i71v6" }, "stable": { "version": [ @@ -28493,14 +28789,14 @@ "repo": "elken/doom-modeline-now-playing", "unstable": { "version": [ - 20250906, - 630 + 20260501, + 743 ], "deps": [ "doom-modeline" ], - "commit": "aff9417faaf5f1945b9ad95f27fa777bbcf269f7", - "sha256": "0z7xsrm30dmi359hzairy94md0jmas0q9n939zy4yv708xykbxpj" + "commit": "11e060f9e30c2ae3e95e71a18f3d0d91b7a54d97", + "sha256": "1fqmbxchy8i9qb4lsqpb8lj9ly5sq3xxhzh9pn0jc5j5g37wak0x" }, "stable": { "version": [ @@ -28831,14 +29127,14 @@ "url": "https://salsa.debian.org/emacsen-team/dpkg-dev-el.git", "unstable": { "version": [ - 20260326, - 2334 + 20260713, + 1140 ], "deps": [ "debian-el" ], - "commit": "f65f60feb19357196594a09ce9fe23da9291cef0", - "sha256": "1vqibm6iwnbdxgq2mmly1xqdgbs80qqi20xzwcrb571yvw42nqh3" + "commit": "74ccc3b0a227a2e71b2c69af4da09e28ae944972", + "sha256": "1a43p1jm5yn7v03pby62bl0dichcbqyidpa1fvksfhz3ry8289cc" }, "stable": { "version": [ @@ -28884,11 +29180,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20260224, - 1455 + 20260701, + 2051 ], - "commit": "b1a4d87ba1cf880143f4ab2ccd942cf556887fb1", - "sha256": "10yy3abny8iv74pxw2m94gnnszylpsqsf85lp7rla7lslmykhqys" + "commit": "1acd97258258415f6a43c332475fbdcd7ceb9274", + "sha256": "17crkxrfn1cmkjvl5hnfnl6g86z1ipjd7i4qm30r7q2gxh0yh64y" }, "stable": { "version": [ @@ -29201,19 +29497,19 @@ "repo": "jscheid/dtrt-indent", "unstable": { "version": [ - 20251102, - 857 + 20260709, + 2011 ], - "commit": "7c372bec8d84c247e4bd0d5599024d66ee300429", - "sha256": "04p6avj8d15i6qswdfpgvdil5c13rcfmc4n2jili485zgpw14j81" + "commit": "8402da6bcc288709366e0b589fa79e744e877788", + "sha256": "0r6fa6mim20bya2z3y0cvgrgjndcl839w01byjkb3zbjvwxc0byj" }, "stable": { "version": [ 1, - 26 + 28 ], - "commit": "7c372bec8d84c247e4bd0d5599024d66ee300429", - "sha256": "04p6avj8d15i6qswdfpgvdil5c13rcfmc4n2jili485zgpw14j81" + "commit": "8402da6bcc288709366e0b589fa79e744e877788", + "sha256": "0r6fa6mim20bya2z3y0cvgrgjndcl839w01byjkb3zbjvwxc0byj" } }, { @@ -29304,11 +29600,11 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20260406, - 1824 + 20260603, + 1700 ], - "commit": "9ce4598e9c485821a6e639fa48854d8e05acd970", - "sha256": "00p4wmymvc0rspg3kddv5y8r1hxwb1j907bpgscjwjfpshm5swaq" + "commit": "cf06b4ccdce6a39346c32f05139f9ee8b77ee229", + "sha256": "1i3zykfg5dc562naqd9f7fybx9y624783av1w1ikw51p0f2wr139" }, "stable": { "version": [ @@ -29365,20 +29661,20 @@ "repo": "ocaml/dune", "unstable": { "version": [ - 20260410, - 1721 + 20260621, + 2057 ], - "commit": "df26745e52be99ecdb2ff994feab1eacd858b226", - "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv" + "commit": "47f64de764078db6edb2698958b5270a17bffb05", + "sha256": "1j0nqvr4njj8z8fcfhxq7c2fid4hc4c46vcx2077sj6iqd8kd02f" }, "stable": { "version": [ 3, - 22, - 2 + 24, + 0 ], - "commit": "df26745e52be99ecdb2ff994feab1eacd858b226", - "sha256": "0gnv5926xmvsna0bvgymj1rr9awkrc9krij6zbjnx90mcf091bsv" + "commit": "47f64de764078db6edb2698958b5270a17bffb05", + "sha256": "1j0nqvr4njj8z8fcfhxq7c2fid4hc4c46vcx2077sj6iqd8kd02f" } }, { @@ -29532,11 +29828,11 @@ "repo": "xenodium/dwim-shell-command", "unstable": { "version": [ - 20260123, - 1157 + 20260708, + 1641 ], - "commit": "a408b7826bb4535e7a14e16848ad41820d63411f", - "sha256": "1a30h2ly34pplfnpxhnkdjwqlsfkjchx01wcnh1cnd9zlg05sinp" + "commit": "3566651e24ca05fe818897f2cf31718d2bcd1c99", + "sha256": "1n8zfh4bibk3c99pijw5xma4sz03jj0m10557ny55wwbz7aqfzny" }, "stable": { "version": [ @@ -30021,20 +30317,20 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20260412, - 237 + 20260427, + 655 ], - "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53", - "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5" + "commit": "19f0170f3548eb49f5bd92653f321c3b1742b492", + "sha256": "08fdsnh0jxpnihqmv9vbrv8hxiw2dd4y66h67w6lw6yxlglw9p0d" }, "stable": { "version": [ 2, 2, - 2 + 3 ], - "commit": "5a304e4655a28cc817b9a633304bd64a5d5ddf53", - "sha256": "145z8qv1xmx0y3g00n2jivhzi8h6zc5ai3wfijmijdam0yg377p5" + "commit": "19f0170f3548eb49f5bd92653f321c3b1742b492", + "sha256": "08fdsnh0jxpnihqmv9vbrv8hxiw2dd4y66h67w6lw6yxlglw9p0d" } }, { @@ -30384,20 +30680,20 @@ "repo": "jamescherti/easysession.el", "unstable": { "version": [ - 20260421, - 1132 + 20260715, + 1819 ], - "commit": "77a55e7ed2ad0ea5b741193a4e5a91c91021387f", - "sha256": "0bzc1078r485177nnfsxxjjjxd502cm850jysg57zbwp1yydmzk4" + "commit": "a722fad8a087b7036657dc22015d0fffbd63d893", + "sha256": "1yafwq7cqkxawd3f2jsvbj2z6vz29ypq2bmas37q8babby4knk1n" }, "stable": { "version": [ 1, 2, - 1 + 5 ], - "commit": "962cf2c6465acc7ef2d7d260240058a98ec2342d", - "sha256": "02z5w31sv091yvzhgri2aaparh6m4nhvrhglqia73ly9p7n6jr6s" + "commit": "8a195693ccc144f48d7dedf50e136be9a76b437c", + "sha256": "0yakk0n7n7m9x847pbva2qf700aygyls1qpwcc1xxd53n87aigcm" } }, { @@ -30473,15 +30769,15 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20250909, - 1036 + 20260621, + 1413 ], "deps": [ "compat", "parsebib" ], - "commit": "72686b4d045dcbdb794e56c8ba60a77eed52ee83", - "sha256": "07sl4myxvqqdyj6fgybiz93dw9yba1wkhy3f99mz3fv8hyr06jjr" + "commit": "32c6ab8ce418af10b54f497a404b9b33a67d48fc", + "sha256": "1nf7lhzgiwhxslaa65a5i3iw7mwzj0jdh3ishrdwybaxyirili4v" }, "stable": { "version": [ @@ -30556,11 +30852,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20240921, - 839 + 20260712, + 308 ], - "commit": "45294cedeeefdcb0193b18dc3e2254db0aa700c3", - "sha256": "11canjhvwpj2hy5czav2hn1hx0lzckicsbr3p8fr6pjrg3gg2bwh" + "commit": "dba4523f18591491c2d716442ad1da184747d879", + "sha256": "1vdsp873xmhm49r5cdha82halgwz5p85k9977xfw2163ldlkqigx" } }, { @@ -30571,8 +30867,8 @@ "repo": "editor-code-assistant/eca-emacs", "unstable": { "version": [ - 20260423, - 1754 + 20260716, + 1447 ], "deps": [ "compat", @@ -30581,14 +30877,14 @@ "markdown-mode", "s" ], - "commit": "bd5a72aef67eca944a7ad0d9916eb0d0f0f11f9d", - "sha256": "0ngap75h8344csabhmf12y4wdii6rxb94yxvdx8aj31kggxaqn6l" + "commit": "005fbd8872ca23437e2c5e72f0f9c605bbc7360d", + "sha256": "1kzk07bkqdd8054441p30xj4aihh6a8b8d4q7pn1aqgk2iprld66" }, "stable": { "version": [ 0, 9, - 0 + 1 ], "deps": [ "compat", @@ -30597,8 +30893,8 @@ "markdown-mode", "s" ], - "commit": "4e867e883cdb7733809a9c5b76c0ca9af022db98", - "sha256": "1kdf2vb2905zz80hnzwclfdqb3zk3v5qdchajfwr8snwlsdca80r" + "commit": "0e1c7b4e924d7d7d99720342e60483b6dda187a3", + "sha256": "053qqrwlrnaa306kq8fz9s2dlaavgd71frxikkyq7ph6gnj2p6wf" } }, { @@ -30609,11 +30905,11 @@ "repo": "ecb-org/ecb", "unstable": { "version": [ - 20251014, - 1427 + 20260518, + 524 ], - "commit": "2f9028aa1d8791720e809954016dbc84fe8fc864", - "sha256": "1gvqayfp8a5fjd6clibj4fn4algy921ck0ifa61g3gykhkmj1jhi" + "commit": "ac7c585be4de7ba085ec91ef580361711a7f8c54", + "sha256": "0mk5dd386z52cidpkjf6igwcbg75i5cs85q8j2rkjnzsl3qrli25" }, "stable": { "version": [ @@ -30728,26 +31024,6 @@ "sha256": "0xy3q68i47a3s81jwr0rdvc1722bp78ng56xm53pri05g1z0db9s" } }, - { - "ename": "ede-compdb", - "commit": "3b70138b7d82aec2d60f4a7c0cd21e734a1fc52a", - "sha256": "1ypi7rxbgg2qck1b571hcw5m4ipllb48g6sindpdf180kbfbfpn7", - "fetcher": "github", - "repo": "randomphrase/ede-compdb", - "unstable": { - "version": [ - 20150920, - 2033 - ], - "deps": [ - "cl-lib", - "ede", - "semantic" - ], - "commit": "23c91082270fcef24ea791b848f1604e36888ff0", - "sha256": "03xphcdw4b6z8i3dgrmq0l8m5nfpsjn0jv0y1rlabrbvxw1gpcqq" - } - }, { "ename": "ede-php-autoload", "commit": "afc7ddfcf16e92889e54f30599b576a24823f60d", @@ -31409,26 +31685,26 @@ }, { "ename": "egison-mode", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0bch4863l9wxrss63fj46gy3nx3hp635709xr4c2arw0j7n82lzd", + "commit": "9fdde45d92600e1327dec06b78e8bfea1a58c601", + "sha256": "0kx0gf98zzyvvqxi8mips2bgfx3cf34gc0mhz3rx9gw8bsb94sil", "fetcher": "github", "repo": "egison/egison", "unstable": { "version": [ - 20260104, - 1519 + 20260217, + 1013 ], - "commit": "4e796ee52785e052f3b10c6493fa484461bb4482", - "sha256": "0m4sp7ncf6d9maf1sm4p4rg4z140bdfvbxgd05fmly4pk1yz0yv8" + "commit": "448dc7ee9db1e2778261f295715fcb64496ba19e", + "sha256": "1jgv77v6wkbc8ixmifvwlc6izn9rkr8nnca7g9cbzzp4npys2d5n" }, "stable": { "version": [ - 4, - 1, - 3 + 5, + 0, + 0 ], - "commit": "dbb395b41a4e4eb69f3f045cbfbe95a1575ac45b", - "sha256": "14g0dpn8j7kh3iiq7qlhaa1wdk6xvl60hkl3j87ncjwkh6h4imcg" + "commit": "3a5b520c6b5bc4a78523573d06e3be887e02d1dd", + "sha256": "04rk39z345wm8byrg0kk02d5l2i6vvjnmaa3h817kns1d3gsdk9s" } }, { @@ -31503,16 +31779,16 @@ "repo": "non-Jedi/eglot-jl", "unstable": { "version": [ - 20240911, - 1352 + 20260705, + 2320 ], "deps": [ "cl-generic", "eglot", "project" ], - "commit": "7c968cc61fb64016ebe6dc8ff83fd05923db4374", - "sha256": "1xy6lssg5x8m2d5802in2b5nl5wrcxz4pilw85kk0mc8640kg2ma" + "commit": "ebe4358b48827a85dd4c714bcc3db11842aa6c3c", + "sha256": "16bjkwsgsc9181kpav563nv9jpqzw0ycwgvzgdqjsj42c4pyajsv" }, "stable": { "version": [ @@ -31567,26 +31843,26 @@ "repo": "mwolson/eglot-python-preset", "unstable": { "version": [ - 20260424, - 334 + 20260617, + 148 ], "deps": [ "eglot" ], - "commit": "8219aa2b3d595af42108881b4d26750ec20105b7", - "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3" + "commit": "719b3aa8fd47aec6c1c3094e2468f41b9d588b09", + "sha256": "08y0y1bsbyrlp704ajjkyd0ki8bfpcm9ncb7796fc61ajmz26ak2" }, "stable": { "version": [ + 1, 0, - 6, 0 ], "deps": [ "eglot" ], - "commit": "8219aa2b3d595af42108881b4d26750ec20105b7", - "sha256": "1w4vvhdjdv8ny3wg6nlvwjv7mgz0bkdi9pkvi2krzarsk6wlhiv3" + "commit": "719b3aa8fd47aec6c1c3094e2468f41b9d588b09", + "sha256": "08y0y1bsbyrlp704ajjkyd0ki8bfpcm9ncb7796fc61ajmz26ak2" } }, { @@ -31665,26 +31941,26 @@ "repo": "mwolson/eglot-typescript-preset", "unstable": { "version": [ - 20260417, - 1841 + 20260617, + 128 ], "deps": [ "eglot" ], - "commit": "f789a45d98eb4d5cc8129a34893a91bd36abd09c", - "sha256": "1jy3hp621p7lh3zrxs7rgq7kajmxb5wvqjfd4flna4vmxrjg4r3q" + "commit": "cc780650223cf08f2268bca3de16509c61ef885d", + "sha256": "18vsmjfsa6fm5lsdpfh05gckllppj5b048da04wmvnb2l4xbmsis" }, "stable": { "version": [ + 1, 0, - 5, - 2 + 0 ], "deps": [ "eglot" ], - "commit": "97c673f6408fa35fe859330f6014c35f9dce15a8", - "sha256": "0k12kszfg68q343mww7ivacpkw177ca23878v13b8p00xac86app" + "commit": "cc780650223cf08f2268bca3de16509c61ef885d", + "sha256": "18vsmjfsa6fm5lsdpfh05gckllppj5b048da04wmvnb2l4xbmsis" } }, { @@ -31854,30 +32130,30 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20260415, - 39 + 20260707, + 412 ], "deps": [ "llm", "triples", "vui" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "f1401f4189143dcfce5cd7d68231462d7a8873ec", + "sha256": "0xr95r48i057pjkiai4dyr6wchv7ciq0h4g2rn1qrj88zcmxhx91" }, "stable": { "version": [ 0, 9, - 0 + 1 ], "deps": [ "llm", "triples", "vui" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "f1401f4189143dcfce5cd7d68231462d7a8873ec", + "sha256": "0xr95r48i057pjkiai4dyr6wchv7ciq0h4g2rn1qrj88zcmxhx91" } }, { @@ -31888,28 +32164,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20260415, - 39 + 20260717, + 2134 ], "deps": [ "ekg", "futur" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "3ea7ac9fc6f881ce63e8ab06dc71f4f383016c6f", + "sha256": "0ncq61rhmmmhavgdyjd4ddsvpkp47lrw2gx9qnv72nzdip05rfk5" }, "stable": { "version": [ 0, 9, - 0 + 1 ], "deps": [ "ekg", "futur" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "f1401f4189143dcfce5cd7d68231462d7a8873ec", + "sha256": "0xr95r48i057pjkiai4dyr6wchv7ciq0h4g2rn1qrj88zcmxhx91" } }, { @@ -31920,28 +32196,28 @@ "repo": "ahyatt/ekg", "unstable": { "version": [ - 20260415, - 39 + 20260707, + 412 ], "deps": [ "denote", "ekg" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "f1401f4189143dcfce5cd7d68231462d7a8873ec", + "sha256": "0xr95r48i057pjkiai4dyr6wchv7ciq0h4g2rn1qrj88zcmxhx91" }, "stable": { "version": [ 0, 9, - 0 + 1 ], "deps": [ "denote", "ekg" ], - "commit": "be6cc349a5054154470173af6521e569cb21bcb1", - "sha256": "12jkrzxk541i4d1b427zhg7klg304kqidksypikbq18dppsvdh5l" + "commit": "f1401f4189143dcfce5cd7d68231462d7a8873ec", + "sha256": "0xr95r48i057pjkiai4dyr6wchv7ciq0h4g2rn1qrj88zcmxhx91" } }, { @@ -32014,19 +32290,19 @@ "repo": "dimitri/el-get", "unstable": { "version": [ - 20260215, - 1117 + 20260615, + 2354 ], - "commit": "911c252afe763a5cd1cbd188c476d44353cd5271", - "sha256": "094xlvqaj2crd405jhfk7raxdylw43k9f42wzc15miix6c98ldsz" + "commit": "447b7efc9fca29a087f4ec29c5d8ccb580cd1c78", + "sha256": "1qxxrvjw5fi75q6sgpkb83r4jg77prjgzf6lgvjb2vqzqyl046ir" }, "stable": { "version": [ 5, - 1 + 2 ], - "commit": "bfffd553f4c72b818e9ee94f05458eae7a16056b", - "sha256": "1awyh9ffd6a4cia239s89asb88ddqlnrv757d76vcb701pq412bz" + "commit": "ec3b0a052bf2f90f30c51042ddb06471b35c7ab6", + "sha256": "1qmgrkwyv8irfsagz0n960z7ihw0q995d2s2cazyxcxzhw6817vx" } }, { @@ -32486,11 +32762,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20260121, - 1637 + 20260506, + 2048 ], - "commit": "827dccbbdae038330f47e16ca189fd3e4ef25964", - "sha256": "15vfrb6vl1ycx2as051p8nqmfbcxhzcf2pqc52a5nq1lsdq1ybk0" + "commit": "033be3dc076fdb3de335d3b12bac5f783ebec820", + "sha256": "0x17jrv7pblrd8r2kgky1ndwi8fnz8p88hd6hmghdrwbl7ffpdlw" } }, { @@ -32580,20 +32856,20 @@ "repo": "emacs-eldev/eldev", "unstable": { "version": [ - 20250314, - 2105 + 20260612, + 1624 ], - "commit": "87373ddace0c4b2267d8f45ebd20e4b0eb27f821", - "sha256": "19lapjhhq39ffimgh20l148c456811xrgdxnycjlc6iy6zrbdbda" + "commit": "7ce62b0a71f75c8568e391e45eafe0687f610076", + "sha256": "0hch4cp47a4hrc1604cryq0yq8a9518a0wjkaz9s0a9ajlvx13y6" }, "stable": { "version": [ 1, 11, - 1 + 2 ], - "commit": "ff1e8269fca7e2ee2e50774ade3ce88b79e78cfc", - "sha256": "0sf8xyzblc0fs2d65jgcycavnzmrp1wg0sfr29gjkq1kvzyl7phb" + "commit": "92a46b48793e561b00189a06014df0d7bbeed3be", + "sha256": "1khqapvgm1y3svzb3pr6s1a3b6mzxdwy1cybbnssaxlvfjvgyvaz" } }, { @@ -32604,11 +32880,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20260415, - 226 + 20260620, + 158 ], - "commit": "2680a08ff2438ff8c2ea6f8d57f22095f857900c", - "sha256": "1iqha79lpydaz2i5dah11zsj060bs1livl3fpi76kh3j5ak6v5id" + "commit": "e458cefba4013785ef6099c6245463689a50dd7d", + "sha256": "0bza0jgzlrz25xb1dy3l17gbmd4nnqi5x8bsvqa586i8jgd06hqw" }, "stable": { "version": [ @@ -32696,28 +32972,28 @@ "repo": "huangfeiyu/eldoc-mouse", "unstable": { "version": [ - 20260402, - 1025 + 20260612, + 945 ], "deps": [ "eglot", "posframe" ], - "commit": "67bb73e54533e276e35d2548aa30e299c3a5ee18", - "sha256": "1ysdf36dva7kzhxm63fp229fqp1ii2i5swf1qwgj03i4j755pfnz" + "commit": "6b7bddc4b16c0b3d6f4203e03e659b5211cab516", + "sha256": "1y4lfk2k3qhpjav0b3vhlfhvl1zy74lg64cbmhs6kmiajrn578rv" }, "stable": { "version": [ 3, 0, - 6 + 8 ], "deps": [ "eglot", "posframe" ], - "commit": "79e47a4099cd4f9144a1636d8353a07b614c0c0a", - "sha256": "028gyngnlq6x0g8cd3m0a33v9skn94lavykls65lqxh91gr39lb3" + "commit": "6b7bddc4b16c0b3d6f4203e03e659b5211cab516", + "sha256": "1y4lfk2k3qhpjav0b3vhlfhvl1zy74lg64cbmhs6kmiajrn578rv" } }, { @@ -32883,20 +33159,20 @@ "repo": "swflint/electric-ospl-mode", "unstable": { "version": [ - 20260108, - 1622 + 20260701, + 1901 ], - "commit": "8599de5864e20831f2a3719f83da6690e0575c56", - "sha256": "0xhf52vkmilr4knc5xnjxphii0dlm8w4azqw9gbw4ypwx2rcz2jw" + "commit": "88ab5ca588b4cbd1ddd27757d390da19298b05bd", + "sha256": "0ngnb5db38vl2g8xln6ai1law92bci3mpa533k47k9rg5rbp0zbl" }, "stable": { "version": [ 3, 3, - 1 + 2 ], - "commit": "a17f7312ef48eba1586c7d0637336eb19aee057e", - "sha256": "04mp6pqxr5p01z4wqkj8wy07ys3p1n5fm9h3yzplknvr3n2djvxl" + "commit": "88ab5ca588b4cbd1ddd27757d390da19298b05bd", + "sha256": "0ngnb5db38vl2g8xln6ai1law92bci3mpa533k47k9rg5rbp0zbl" } }, { @@ -32988,26 +33264,32 @@ }, { "ename": "elfeed", - "commit": "25cd87f2f80a7228ae65ec26dc6c87f50fd2f9d0", - "sha256": "16f6y81n1kh9fhyl9950pfm0z3knv1ygam2cs41ydz6drnrvh119", + "commit": "d006f2f4284c73e83028d951632d4b7a61e87607", + "sha256": "1qi1q9lbf5x4zwa3nr5h7srr8ckyys0jdxwbc57nhch65dbs7l4y", "fetcher": "github", - "repo": "skeeto/elfeed", + "repo": "emacs-elfeed/elfeed", "unstable": { "version": [ - 20260218, - 1306 + 20260714, + 920 ], - "commit": "bbb3cac27b0412d80b327b5cfaab83683c96a2a1", - "sha256": "1z1ig5h2mhy7zdz8vh003536mmpkrjr7jm84ih3wsx8krvhgc1lb" + "deps": [ + "compat" + ], + "commit": "e18cbb8cc4bb08e1512571449623f5f03f43f94c", + "sha256": "1kbhzzf614dd8pz1s90vpqfx75dpv016z474i7l2rsq0an6xxb3s" }, "stable": { "version": [ - 3, 4, - 2 + 1, + 0 ], - "commit": "904b6d4feca78e7e5336d7dbb7b8ba53b8c4dac1", - "sha256": "0yq93abyadzrmcd40pi06wcr4jg9ddhlz2phg0wjypprqvv4q49z" + "deps": [ + "compat" + ], + "commit": "d08bb8e3d1e57f1b3941abcd8d141ac59315a5e4", + "sha256": "0r207pxip8s7h4lcmrbd98p1psrs5211byvj5501n8qdcdwn199s" } }, { @@ -33177,28 +33459,28 @@ "repo": "fasheng/elfeed-protocol", "unstable": { "version": [ - 20240822, - 805 + 20260523, + 1339 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "4f5e77a28c501db686ac06a2ea250a7b37d5420c", - "sha256": "04dvg0haz5b2gl4iz7aqiryys24fwjrp6h23fcga3gjipwwwxzmb" + "commit": "58936590459ccc2dfd6132f69983011d15d9404a", + "sha256": "014b4986w860mf8zvbfmchbc3sjmndcwy3wrx5fncmndkd750j2b" }, "stable": { "version": [ + 1, 0, - 9, - 1 + 0 ], "deps": [ "cl-lib", "elfeed" ], - "commit": "bcefb85a1d4075f36e73a94bda569e71f28a52c2", - "sha256": "1n5bns7181j6n603a626jsv26v06s3wm86ml7vixlp234p0frypp" + "commit": "58936590459ccc2dfd6132f69983011d15d9404a", + "sha256": "014b4986w860mf8zvbfmchbc3sjmndcwy3wrx5fncmndkd750j2b" } }, { @@ -33239,15 +33521,15 @@ "repo": "fritzgrabo/elfeed-summarize", "unstable": { "version": [ - 20260217, - 1534 + 20260522, + 2046 ], "deps": [ "elfeed", "llm" ], - "commit": "b4d9f8a7bb72d9fd0db804eff535c42859d94cf8", - "sha256": "09f0v2mxrq01fjkpz6zk34c74hqy8y2z9qawv5lmm55sc91z2ajv" + "commit": "9b2fbc469d31e1f965ff1953e483adabbdf4495d", + "sha256": "116znd3s2alzr59zv0yarili4nk2sgbymkj7mkr9plfnzshr80ka" } }, { @@ -33258,15 +33540,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20240929, - 2043 + 20260607, + 1418 ], "deps": [ "elfeed", "magit-section" ], - "commit": "76b4b93838b0420a114f934bbf8c09f25bf6ad16", - "sha256": "0ic2nzs88ck4f5vkk8m7sln2hawglnj4b2vzfl80vlip13dj3l3a" + "commit": "d8f237530c05c8be3093af295d3f5d530c2d3130", + "sha256": "1b2kfjjk8kk4hl6mswjh74hklmx494ra4m3lzrkx2yrmj3mmgw0w" }, "stable": { "version": [ @@ -33290,15 +33572,15 @@ "repo": "karthink/elfeed-tube", "unstable": { "version": [ - 20260404, - 1841 + 20260702, + 1928 ], "deps": [ "aio", "elfeed" ], - "commit": "8e1334cfc8114ddd71b4de99760429e4e8a81f7b", - "sha256": "0c3lxk5r1v04rbsv4ivhwpvd0g8dzlq1lqzc35xy862ckaj41ci7" + "commit": "f653d5b7f27a2eace217d9e6b4f40e0e35ae88cd", + "sha256": "1lll43d8bd4j36ckvyrsc7fdbcxs6j8p21nk49rlngkczk12pfxy" }, "stable": { "version": [ @@ -33344,6 +33626,40 @@ "sha256": "1vsrsnvz0ysd36a99zk7n2giv0gxznlnls8zq6lcc0hwqw78i5cq" } }, + { + "ename": "elfeed-web", + "commit": "1285db21b49c7d81ee9f4751aee3efc80457d3c1", + "sha256": "1nfpiy3fa11gibv96lr2awqbzfczq22w3hqvcx423zkg5riiq7pr", + "fetcher": "github", + "repo": "emacs-elfeed/elfeed-web", + "unstable": { + "version": [ + 20260623, + 1111 + ], + "deps": [ + "compat", + "elfeed", + "simple-httpd" + ], + "commit": "9074428d7a5159e647ebdd07f53c9720b908aaf6", + "sha256": "0awlazj1cpb1idsw8pflc3r1xdc65n7fwyjf3csa6aph0awzrnq3" + }, + "stable": { + "version": [ + 4, + 0, + 0 + ], + "deps": [ + "compat", + "elfeed", + "simple-httpd" + ], + "commit": "e947501a29457a55dfb0828aa791185c6b41bc37", + "sha256": "1gz10229bksz96l06czk2n6as65zb8kyib9mwln08ysrpdjs2k18" + } + }, { "ename": "elfeed-webkit", "commit": "75394f3a128e21c730ca755fca540c4723436733", @@ -33466,11 +33782,11 @@ "repo": "ideasman42/emacs-elisp-autofmt", "unstable": { "version": [ - 20260407, - 326 + 20260611, + 427 ], - "commit": "b1cdd8661930a35b1633ccc28b27b793145cd108", - "sha256": "1fpyr30aln2rpslx3n7s868cbxw20yv5cdsn8hvf0mvb2bwfmny3" + "commit": "fdae9054c55804def507cf7045c8460573d876a9", + "sha256": "1m43xcddswr7kl218w06rmix833jfhyr6car173ln00ggd5yvnf7" } }, { @@ -33571,14 +33887,14 @@ "repo": "laurynas-biveinis/elisp-dev-mcp", "unstable": { "version": [ - 20260210, - 434 + 20260630, + 1120 ], "deps": [ "mcp-server-lib" ], - "commit": "acce467f667df06e8dd391d64c5a553997dabed5", - "sha256": "019b0yg1k1dknmw47wz9s8f9k6rzj7535g5alxrf4nw9j165n0i2" + "commit": "d70a8f38ededefb7e3d11f3e2b519bf754a54d1a", + "sha256": "0km6yzp3274aqv394zsafgy2vj8ljh61na53x56svaxxq46v0dzc" }, "stable": { "version": [ @@ -33872,8 +34188,8 @@ "repo": "s-kostyaev/ellama", "unstable": { "version": [ - 20260410, - 54 + 20260712, + 1716 ], "deps": [ "compat", @@ -33882,13 +34198,13 @@ "transient", "yaml" ], - "commit": "de68b25318a1eef629f4aad677dc7dd6fe446c2e", - "sha256": "0nk7c47qqm2w00c6cmlw6fv23qsfhg7fqb303fv5a9avdl47mnvh" + "commit": "b00c307c97a2e447948a589fe591e3cad2d4b93a", + "sha256": "16nxq115s3b70y9gj5w1wn4ihq4wfczaripwnlb283sz3waygj9m" }, "stable": { "version": [ 1, - 13, + 30, 0 ], "deps": [ @@ -33898,8 +34214,8 @@ "transient", "yaml" ], - "commit": "de68b25318a1eef629f4aad677dc7dd6fe446c2e", - "sha256": "0nk7c47qqm2w00c6cmlw6fv23qsfhg7fqb303fv5a9avdl47mnvh" + "commit": "b00c307c97a2e447948a589fe591e3cad2d4b93a", + "sha256": "16nxq115s3b70y9gj5w1wn4ihq4wfczaripwnlb283sz3waygj9m" } }, { @@ -34056,20 +34372,20 @@ "repo": "sp1ff/elmpd", "unstable": { "version": [ - 20250910, - 327 + 20260619, + 2114 ], - "commit": "a68563fa3e3b09fcdaf4b9f070542f8cfa257067", - "sha256": "0kyw7j2zi2ji07hmpiyrpnyfmdrficinyjnvp7cnrphai925gj92" + "commit": "40a666c153da0c45262230bed3c7594e3362ca09", + "sha256": "0qip0rj6zj1p2a8a45dvlnkayjc2pj4ywc80mq0qg7yf6cnxw7jp" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "89d8b514ed940d7a9452a804158fe6604ec6016f", - "sha256": "16fg699zgy14yl3ymqq2cqbpplb9prsqvi550rx69zbq7sq24bp0" + "commit": "40a666c153da0c45262230bed3c7594e3362ca09", + "sha256": "0qip0rj6zj1p2a8a45dvlnkayjc2pj4ywc80mq0qg7yf6cnxw7jp" } }, { @@ -34144,6 +34460,30 @@ "sha256": "0fwl14xqnxq5d4a9wk0p1xvfkmff5inwmz2v1s8n7w1sy29zslrn" } }, + { + "ename": "elot", + "commit": "523f6f9edbf3af4a4bbfe0bdbdc15cfd0376c4c7", + "sha256": "1z1jrp3g8jsdsiq2p0abns0zmj4h09d2aq78bcm4kg8m9173s1mm", + "fetcher": "github", + "repo": "johanwk/elot", + "unstable": { + "version": [ + 20260709, + 1716 + ], + "commit": "d7e9b47207a16841bb5a08077e1dfcb47608f37f", + "sha256": "113nyv2w42mvmkkrfzxfdzsz0x57icwlfa62rmxcgxflizy2ff37" + }, + "stable": { + "version": [ + 2, + 1, + 0 + ], + "commit": "62e4ce56610caf2336a19f23418bea819c1e36b7", + "sha256": "07syg6kih7z2hzwxvx8h9pd8wrpyak7m0z343yggzncl5iyp9zq1" + } + }, { "ename": "eloud", "commit": "f1e80fba9bc541594129756f5c668f3192919bc8", @@ -34265,11 +34605,11 @@ "stable": { "version": [ 3, - 6, - 6 + 7, + 0 ], - "commit": "dcdeb86f7ae633e252f9ef8a73d3458e87c1ab12", - "sha256": "15cgqzzfjikq4spsmf7mmhvrd6igcsv75d9mdsxl5j6zhq784hh8" + "commit": "d799c467a1f35934f96d33960d638ddf796f01ba", + "sha256": "0wzj4n8wc90mqzmd86rvq8g20mk44lvmqdvfan3pj3z3b1jnk82c" } }, { @@ -34295,8 +34635,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20260413, - 2143 + 20260715, + 1747 ], "deps": [ "company", @@ -34305,8 +34645,8 @@ "s", "yasnippet" ], - "commit": "777f5a5f951ee4b717856007c337e9f37fd4ea5d", - "sha256": "03rkjfi08j5lz0jl0aw66sqc2rbrx55kj6yanxmd6drv63ryd1zj" + "commit": "9cdf26dfea1cb044b3cf1dfa9755b6479bfd9a1c", + "sha256": "13pkr52vzz9fkp4062zrqdxh04rscka5f1anl9lk730z8c7p5f23" }, "stable": { "version": [ @@ -34656,34 +34996,36 @@ }, { "ename": "elx", - "commit": "57a2fb9524df3fdfdc54c403112e12bd70888b23", - "sha256": "008nwa2gn3d2ayr8023pxyvph52gh9m56f77h41hp8hcw6hbdwrz", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "1rn1cxcw8gqagiap4k0zrl680x8jr7x2fcbli9kc5s16gibazdzw", "fetcher": "github", "repo": "emacscollective/elx", "unstable": { "version": [ - 20260101, - 1832 + 20260601, + 1500 ], "deps": [ "compat", + "cond-let", "llama" ], - "commit": "5c700de6d3b4163b0a3ed3060f491c22b4bfaa85", - "sha256": "1naspqq3d93l8d2iba00gkhhvwxrj8nj5h459msd6in0s1lqc682" + "commit": "99ea4bde756a3ae4a0cae96e9fffe6b13421d25f", + "sha256": "0ni8agxcf64cgpmy4jhqsss2d90bd0hfg48187idfq7clhnxl07i" }, "stable": { "version": [ 2, 3, - 2 + 3 ], "deps": [ "compat", + "cond-let", "llama" ], - "commit": "5c700de6d3b4163b0a3ed3060f491c22b4bfaa85", - "sha256": "1naspqq3d93l8d2iba00gkhhvwxrj8nj5h459msd6in0s1lqc682" + "commit": "99ea4bde756a3ae4a0cae96e9fffe6b13421d25f", + "sha256": "0ni8agxcf64cgpmy4jhqsss2d90bd0hfg48187idfq7clhnxl07i" } }, { @@ -34778,20 +35120,20 @@ "repo": "magit/emacsql", "unstable": { "version": [ - 20260401, - 1220 + 20260601, + 1722 ], - "commit": "2fe6d4562b32a170a750d5e80514fbb6b6694803", - "sha256": "1hm6g2ad8bsfrl7gqcb5psphcgvak8608b6vw1rc5rrsr7j6rdsl" + "commit": "d811bbefcb5e27841af55cae53aa939ba720de77", + "sha256": "0spinavna6k6b43lcj92w1sc0jlffzqyj9byxyayg4g6md995dhi" }, "stable": { "version": [ 4, - 3, - 6 + 4, + 1 ], - "commit": "2fe6d4562b32a170a750d5e80514fbb6b6694803", - "sha256": "1hm6g2ad8bsfrl7gqcb5psphcgvak8608b6vw1rc5rrsr7j6rdsl" + "commit": "d811bbefcb5e27841af55cae53aa939ba720de77", + "sha256": "0spinavna6k6b43lcj92w1sc0jlffzqyj9byxyayg4g6md995dhi" } }, { @@ -34898,14 +35240,14 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20260404, - 2302 + 20260610, + 302 ], "deps": [ "compat" ], - "commit": "27de48004242e98586b9c9661fdb6912f26fe70f", - "sha256": "1y97kibzz36wrzcjv997qp5pliikda0dhsm9461pin3q5gv8y6kq" + "commit": "350ca86924c5027e80875943fba7b912a71e5791", + "sha256": "0s2q46qbf9aa0hs53m4qp4pwjh9zhsfiagragwy0iffh4rw5jn73" }, "stable": { "version": [ @@ -34927,16 +35269,16 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20260404, - 2302 + 20260503, + 118 ], "deps": [ "compat", "consult", "embark" ], - "commit": "27de48004242e98586b9c9661fdb6912f26fe70f", - "sha256": "1y97kibzz36wrzcjv997qp5pliikda0dhsm9461pin3q5gv8y6kq" + "commit": "ec5dd1475595277ef908567d0a18d32f1c40bc91", + "sha256": "04kbfad7qjcraihf3238xxadw10g96ndl08449d53avwwclr679d" }, "stable": { "version": [ @@ -35104,6 +35446,26 @@ "sha256": "0hc61haiyhrzfm44b17ndqdbyq5vgy4g2v4da87scvkaxnsj8vbq" } }, + { + "ename": "emcp", + "commit": "49fc1d7aaed297404c3d40d083395ae108aef4eb", + "sha256": "06d5l76qdd48130w2zyqq80m682das82l2w7mc7n5039zqfz8fvs", + "fetcher": "codeberg", + "repo": "martenlienen/emcp", + "unstable": { + "version": [ + 20260706, + 1558 + ], + "deps": [ + "elisp-refs", + "http-server", + "magit-section" + ], + "commit": "cc452a2cb8b128305c7091a4adf9435e6b227fc1", + "sha256": "18i0lwv057lij599y2f2hblivvc7rmiwl1ff2vbykmakcsxfncrp" + } + }, { "ename": "emidje", "commit": "5d64b3b42b4b9acd3e9d84921df287f3217db83e", @@ -35769,28 +36131,28 @@ "repo": "jamescherti/enhanced-evil-paredit.el", "unstable": { "version": [ - 20260314, - 1908 + 20260604, + 223 ], "deps": [ "evil", "paredit" ], - "commit": "11521019d4800f4de2a2ac460a48eba013ad89b6", - "sha256": "0px209sgx7lzlybbaw28l71zcgbynb95gwyb7xnis37mb4m6w589" + "commit": "2209fceae2acab381facb1865ac41b28c2938f10", + "sha256": "1xyld0nfgnzrz36djv7c1q722gva9a93gxrsxxnx6s4pknrghlza" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "evil", "paredit" ], - "commit": "7ca82138881a5efacacf0494b898fb1201311fc8", - "sha256": "0kkfnnqd2pzzm92pi13ngh63frp33z2mfb1prkqaw62nq4yrw6d8" + "commit": "2209fceae2acab381facb1865ac41b28c2938f10", + "sha256": "1xyld0nfgnzrz36djv7c1q722gva9a93gxrsxxnx6s4pknrghlza" } }, { @@ -35946,15 +36308,15 @@ "repo": "purcell/envrc", "unstable": { "version": [ - 20260325, - 1609 + 20260622, + 1004 ], "deps": [ "inheritenv", "seq" ], - "commit": "60820285aeed4f87969d663a1c14a905c7bb763a", - "sha256": "0a8ymkzjvykjjpnd6m1ysmbq1pqyvbijx6awwwwqwgzq0q5q2l8z" + "commit": "77e9dec1563bc204cc9e086cd8a7d3622196224c", + "sha256": "11ksm8049332a9j5p1xmrwwvmmn74kxwc7v4gaza131kx271jr19" }, "stable": { "version": [ @@ -36090,32 +36452,34 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20260416, - 1107 + 20260701, + 1311 ], "deps": [ "closql", "compat", + "cond-let", "emacsql", "llama" ], - "commit": "f3f8d26401a7a9c49d4b670dbf463dd010c26fae", - "sha256": "0n6agpskxxqm5618ajp9wk8i6g047yjf889lw4qp5cb2kdqslfp8" + "commit": "63bf2ab384c0f96f344492d151549c5b95b6830f", + "sha256": "0wbx78x1knmm64kvy1rhln8hdg3qj7yvvxdk9wbpx00r9s5kh6hh" }, "stable": { "version": [ 4, - 1, - 4 + 2, + 2 ], "deps": [ "closql", "compat", + "cond-let", "emacsql", "llama" ], - "commit": "fc3cba38a416ec4e26a7d8eb7bc5ee910e67aa73", - "sha256": "1im5di9rgvirzlnkfns6sv6wrn2sfb7k98f4i4b29kh7jwrrwzax" + "commit": "63bf2ab384c0f96f344492d151549c5b95b6830f", + "sha256": "0wbx78x1knmm64kvy1rhln8hdg3qj7yvvxdk9wbpx00r9s5kh6hh" } }, { @@ -36126,30 +36490,32 @@ "repo": "emacscollective/epkg-marginalia", "unstable": { "version": [ - 20260301, - 1306 + 20260601, + 1622 ], "deps": [ "compat", + "cond-let", "epkg", "marginalia" ], - "commit": "d6ccf20529c39652968d1b017fae78404ac191fb", - "sha256": "1qchlg0aimljbxsa641lgscyqlbyjch6p1lyaa9gffmc1jgslzn2" + "commit": "e789ebff7af97f193e38cc3d5636dd55022973b8", + "sha256": "1pkjlyh5n714q604savi4yg05xlqza9q6a85p1gdpxgv5gxa3dfd" }, "stable": { "version": [ 1, 1, - 4 + 5 ], "deps": [ "compat", + "cond-let", "epkg", "marginalia" ], - "commit": "d6ccf20529c39652968d1b017fae78404ac191fb", - "sha256": "1qchlg0aimljbxsa641lgscyqlbyjch6p1lyaa9gffmc1jgslzn2" + "commit": "e789ebff7af97f193e38cc3d5636dd55022973b8", + "sha256": "1pkjlyh5n714q604savi4yg05xlqza9q6a85p1gdpxgv5gxa3dfd" } }, { @@ -36453,11 +36819,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20210804, - 504 + 20260628, + 743 ], - "commit": "e3a59267c044474f9ca066d36517e9a3d872759c", - "sha256": "1iqyyhaz8zypgj9ij8ivqym0xry10zzyi8qf16fzg2ppxl47bc5i" + "commit": "f4c8e3cac924065b2d0e43114459c45fa39cc006", + "sha256": "0jsw6vbhr5g10cv3sw5lkkv8nkb18gcc6x2zy4hzqp9d72y7y08h" } }, { @@ -36842,19 +37208,20 @@ "repo": "erlang/otp", "unstable": { "version": [ - 20260420, - 1445 + 20260702, + 800 ], - "commit": "a42e46bab47432b988ee60e4c9d915c858bcf32d", - "sha256": "0vfzzxs7dv3wadrlgb97fjc7vr8hvwghjz9hynqjvzf2i2ranl4f" + "commit": "40ea544c97aa8492596f35a88286ea80326510ec", + "sha256": "1h6gv5hakz0jw6b93c7kyadcqbgp1xai3svd18hcr9z67bxm8m3j" }, "stable": { "version": [ - 28, - 5 + 29, + 0, + 3 ], - "commit": "f4506ee46d68694a1d23ca81c314092fd83e8f85", - "sha256": "15vjxb10840jvxhnnrgsd2s4j1sclwn5nkfwyd8zdbdcyn6hi203" + "commit": "40ea544c97aa8492596f35a88286ea80326510ec", + "sha256": "1h6gv5hakz0jw6b93c7kyadcqbgp1xai3svd18hcr9z67bxm8m3j" } }, { @@ -36877,13 +37244,13 @@ "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "erlang" ], - "commit": "bf5adaa17a55a8a0d21c30de949d6074731711a0", - "sha256": "01sl1162w9qx10yl1c8k5a5gskflpd47ky7qsh5zln9qyrqpr5bw" + "commit": "4e9095be49630dc279c70033245a7e1051614f92", + "sha256": "149brvyawf38q0d1i43abnzqijnwj2sqnvwic68kz1cn3c3vdzch" } }, { @@ -37281,32 +37648,32 @@ }, { "ename": "esh-autosuggest", - "commit": "dc3776068d6928fc1661a27cccaeb8fb85577099", - "sha256": "1rcng1dhy4yw95qg909ck33svpdxhv9v5k7226d29gp4y54dwyrx", - "fetcher": "github", + "commit": "1d888e12b1c4002896723b3c993a72bf920ef37b", + "sha256": "1adsjqm1h8pj2p6n49l7y02ccqwxfw40crkpd1r60xizmdj19gcn", + "fetcher": "sourcehut", "repo": "dieggsy/esh-autosuggest", "unstable": { "version": [ - 20241002, - 1820 + 20260530, + 527 ], "deps": [ "company" ], - "commit": "b3ae8eb2d6f8da1dc59f61a589003d741514d6f6", - "sha256": "1n4zswxs49qn2jngr82w9kk7qdhdwysknsm95iq3ija2azyvqgcr" + "commit": "40774022105ed16287fcf26553a16c4cdda5e1ab", + "sha256": "08x015gvdp804gpfhvxz72m7iw4zg4lrrzyd8gg191j4mrskjbzk" }, "stable": { "version": [ 2, - 0, - 1 + 1, + 0 ], "deps": [ "company" ], - "commit": "a6d5eb3337d010bd2a2d677ff304cd53adc291a0", - "sha256": "0l2nnlr3b6df1xn0qjf5d5ryy1wcs1jczyfy795vsasd5gm3g0xh" + "commit": "1017a4992c086d6d0924572561879af1ac1d8c03", + "sha256": "01d40x7zibd8gdxlvnkn9hhj6bgdxn6g4mz4h7pvgryyvgbljy0g" } }, { @@ -37971,11 +38338,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20260423, - 1426 + 20260526, + 1432 ], - "commit": "5a09992aa6276fc8626a41d01d58b1d85959edaf", - "sha256": "1f238ajfm1qjg5qqkaknw1flvrdxrzhqmsb5mswv00irbagb6bb2" + "commit": "da7d7dc1d2cf95760f56cb1763eb543c4dadaa0c", + "sha256": "0rma9cz44ajiwnbndmc8hqfn61gc6asj38fzd06nhyf2l39gqrcs" }, "stable": { "version": [ @@ -38317,21 +38684,21 @@ }, { "ename": "eterm-256color", - "commit": "e556383f7e18c0215111aa720d4653465e91eff6", - "sha256": "1mxc2hqjcj67jq5k4621a7f089qahcqw7f0dzqpaxn7if11w333b", - "fetcher": "github", + "commit": "1d888e12b1c4002896723b3c993a72bf920ef37b", + "sha256": "153g793mfgwrf9b7jkdlk18z493jgx3igbg1mz5n6g6s8vps92dc", + "fetcher": "sourcehut", "repo": "dieggsy/eterm-256color", "unstable": { "version": [ - 20210224, - 2241 + 20260530, + 531 ], "deps": [ "f", "xterm-color" ], - "commit": "05fdbd336a888a0f4068578a6d385d8bf812a4e8", - "sha256": "0ln1agcgr607n5akm0ax659g11kfbik7cq8ssnqpr3z7riiv95dm" + "commit": "868eeaa958de1deab690fe8ac8f5477452ccdb6a", + "sha256": "0w9khzgkg17dsyd623p3gbqyd372ld3mrniwsidj2awk6y5k0y2r" }, "stable": { "version": [ @@ -38622,19 +38989,20 @@ "repo": "beacoder/everlasting-scratch", "unstable": { "version": [ - 20250206, - 628 + 20260713, + 605 ], - "commit": "a990e8d2261e5ac109729eb8c2c8e1947e45c8ed", - "sha256": "0lhyaqwxwm54rw9lvhk6vqpnz4350dx45gxc4qgm0g6qgdzn78dk" + "commit": "4180fd04183a24de44a920cc02ac5a3bbf23643f", + "sha256": "1gqarbnnq2rs8ckvisf0bbrmh9nmfhvlqv2b1a0xwlcbn6mhn6cc" }, "stable": { "version": [ 0, + 1, 1 ], - "commit": "509cf24422d4047b110aac8ed077b52a8011cfe7", - "sha256": "04snf28gk7lc9pd5ilv9w1xjm14fi3ajp6dwaz4bbq8haacm3hpz" + "commit": "4180fd04183a24de44a920cc02ac5a3bbf23643f", + "sha256": "1gqarbnnq2rs8ckvisf0bbrmh9nmfhvlqv2b1a0xwlcbn6mhn6cc" } }, { @@ -38645,16 +39013,16 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20251108, - 138 + 20260603, + 654 ], "deps": [ "cl-lib", "goto-chg", "nadvice" ], - "commit": "729d9a58b387704011a115c9200614e32da3cefc", - "sha256": "0scdws40fg4k9lqyznjghnn8svn7l0c6mq7h2aq5pzkm6hanzqn3" + "commit": "3b678a221ee99cc6a95b01d7a3129ce5efc4c3da", + "sha256": "18hqjh4vz2pq40bvnrmshg1w5msq1b17l20vv5j6a76a2a7iqy8x" }, "stable": { "version": [ @@ -38797,28 +39165,28 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20241004, - 1613 + 20260619, + 1649 ], "deps": [ "evil", "evil-snipe" ], - "commit": "9465c8da35fe7dd0f66184e671e357ec91faa3fe", - "sha256": "1w1d239c7ivqdz46vnqhaz2fkx8xzzc2209ldf9w4f68nd6awqj3" + "commit": "70a08ff4c8148c38e0cdc2b89b0316fd504501f6", + "sha256": "1dg7kymvq3v5dblzja6qvm7nx44ly15715279vhpkq3xnig6ag3d" }, "stable": { "version": [ - 2, - 2, - 1 + 3, + 0, + 0 ], "deps": [ "evil", "evil-snipe" ], - "commit": "05c023740f3d95805533081894bfd87f06401af5", - "sha256": "1fnzrwr53h18wp4wkb834j39xg8bv7yqcmilb41bc81npfmi2mn1" + "commit": "70a08ff4c8148c38e0cdc2b89b0316fd504501f6", + "sha256": "1dg7kymvq3v5dblzja6qvm7nx44ly15715279vhpkq3xnig6ag3d" } }, { @@ -38847,28 +39215,26 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20260423, - 438 + 20260719, + 2207 ], "deps": [ - "annalist", "evil" ], - "commit": "2df40737c6cc9ccd8b69462a6f2f6a045c2d7684", - "sha256": "1skwz01sjhgha848gk0vw9cbxzkip1nz4hkn629z8jzw25npdna3" + "commit": "03e1c04b398bc8948a21fac5f3baa4f70da1a350", + "sha256": "1b9nnnincpw5rvmqvlniy4hyq08vbdca9p40x0avr8r4scf7vzx2" }, "stable": { "version": [ + 3, 0, - 0, - 10 + 0 ], "deps": [ - "annalist", "evil" ], - "commit": "d0518fc1626f09a341d4b5a98c857087abfb1b0c", - "sha256": "09hnxb8nh3g0hi93fz9f1y164gv9iyh5994wfn6fsq2v1xdz8phm" + "commit": "29acaa81d2992d9c89a4b15ead917abb3af05228", + "sha256": "0j89w682394fq96jx0da8scl7n0pihp8gb23sg4frkdp2l8yvl3z" } }, { @@ -38927,15 +39293,16 @@ "repo": "PythonNut/evil-easymotion", "unstable": { "version": [ - 20200424, - 135 + 20260602, + 2314 ], "deps": [ "avy", - "cl-lib" + "cl-lib", + "evil" ], - "commit": "f96c2ed38ddc07908db7c3c11bcd6285a3e8c2e9", - "sha256": "0xsva9bnlfwfmccm38qh3yvn4jr9za5rxqn4pwxbmhnx4rk47cch" + "commit": "629c894af63336028a61cc93d6465d10837eb82b", + "sha256": "0mlaqlfq99s3l6azrx2lbhxb4d7lc45z6jrj3y5cs8j606qd9x6h" } }, { @@ -39132,6 +39499,38 @@ "sha256": "0pf8bl7bmcn1l0dlxkgbgwb1n2fxpzxwcr4jf06gzyrrmmwah526" } }, + { + "ename": "evil-ghostel", + "commit": "32c111d2c381b618d3ca556c09b15bc3a0d91287", + "sha256": "0dq9lcwxil6qayxhhcy6csfbfk8jx8pi3r9gyx9l0jn2rsm9b6d6", + "fetcher": "github", + "repo": "dakra/ghostel", + "unstable": { + "version": [ + 20260713, + 2022 + ], + "deps": [ + "evil", + "ghostel" + ], + "commit": "2191afe3049fc785c6fd2b1ab6b826daf500ffbe", + "sha256": "1fyqpbpv62hs3hqai1j04x30miwdqkkpqfxdh4vbxc331fhrj4dx" + }, + "stable": { + "version": [ + 0, + 44, + 0 + ], + "deps": [ + "evil", + "ghostel" + ], + "commit": "2191afe3049fc785c6fd2b1ab6b826daf500ffbe", + "sha256": "1fyqpbpv62hs3hqai1j04x30miwdqkkpqfxdh4vbxc331fhrj4dx" + } + }, { "ename": "evil-god-state", "commit": "46b8586e9a821efb67539155f783a32867084bfa", @@ -39159,28 +39558,28 @@ "repo": "jam1015/evil-god-toggle", "unstable": { "version": [ - 20251031, - 2050 + 20260522, + 2049 ], "deps": [ "evil", "god-mode" ], - "commit": "5f61e718133c86db3ddc0532cc0e1d4f80b967cb", - "sha256": "1l7mj3lndk4lzn8min1cncqs7kdyzjd750i5m6dk9q1llnfnbn3d" + "commit": "d6f8d098b9f9e0046df5afd35ced5bc5ed5a0ea0", + "sha256": "0zrl2rzp8pb03ji90r9nr2kjfw39iw5kifkiyv01wh7jrdyjsxy3" }, "stable": { "version": [ 1, - 0, + 3, 0 ], "deps": [ "evil", "god-mode" ], - "commit": "a2e240e8ffdfff16ffa2be2517a7c60d3cc3ced9", - "sha256": "19j9ip27va0m6sjm67mffyzz00fy1bxj09jlsvhxisd3c30300gk" + "commit": "d6f8d098b9f9e0046df5afd35ced5bc5ed5a0ea0", + "sha256": "0zrl2rzp8pb03ji90r9nr2kjfw39iw5kifkiyv01wh7jrdyjsxy3" } }, { @@ -39290,13 +39689,13 @@ "version": [ 0, 5, - 5 + 4 ], "deps": [ "evil" ], - "commit": "a43914e3d483685dc11d616f9fcd268779dd0258", - "sha256": "1ahnh30qimcfydwmdwblg3h1gmjlq5iibcr7h0r1s720fsb73fn7" + "commit": "d584ed3ea2a49ed7f93fe176800e7a2f95dff6aa", + "sha256": "1fjrq54vfacxmmk1w1f35w9mdbrlld462nnqfappj6v4d14cq3fs" } }, { @@ -39487,26 +39886,26 @@ "repo": "redguardtoo/evil-mark-replace", "unstable": { "version": [ - 20250422, - 242 + 20260716, + 634 ], "deps": [ "evil" ], - "commit": "90ee84748582be05fa8f9a02872321a08b455282", - "sha256": "1w2f2df48hvabb750p3c9lsb2clpif4bv11z67wl9vafci53lahh" + "commit": "3221d2c3b304a1cb825f6c79da4d418a8233dcc2", + "sha256": "1fliqxyzg2sagwva618373ly83rj3xw16ri5s3s21jfm5jva73kz" }, "stable": { "version": [ 0, 0, - 6 + 7 ], "deps": [ "evil" ], - "commit": "217d5b507aa11dd0b334d5c3e1f74ac1fc2f66a4", - "sha256": "17mn7jybnlzhb82h6jkxdhcr76p1p5dk1v7dpb74r3ccd75sqn2b" + "commit": "3221d2c3b304a1cb825f6c79da4d418a8233dcc2", + "sha256": "1fliqxyzg2sagwva618373ly83rj3xw16ri5s3s21jfm5jva73kz" } }, { @@ -39675,11 +40074,11 @@ "repo": "redguardtoo/evil-nerd-commenter", "unstable": { "version": [ - 20230625, - 254 + 20260507, + 414 ], - "commit": "3b197a2b559b06a7cf39978704b196f53dac802a", - "sha256": "1xi4sd75pzhgcd9lzhx18hlzbrwh5q9gbscb1971qn94mzxwd60r" + "commit": "db5ee61a6e75db074b7d20e9dcb68e0b94b4edc7", + "sha256": "0x7h3b44jdsdvz1991bmhblmc82s59rq9wnd4qvl3m783cxa9jdi" }, "stable": { "version": [ @@ -40237,20 +40636,20 @@ "repo": "wbolster/evil-swap-keys", "unstable": { "version": [ - 20191105, - 1426 + 20260624, + 2045 ], - "commit": "b5ef105499f998b5667da40da30c073229a213ea", - "sha256": "1kawq9c64cmkdjy03sfppjn7g9anxnmds3ip7cgj1j0yym0glyfq" + "commit": "889672ad0d35ab062c52d9d84b22de4ac49753f3", + "sha256": "066qrmdxz77zmc9k7wbyzrzrgwfkr75g413r80jll9varf73y9sn" }, "stable": { "version": [ 1, - 0, + 1, 0 ], - "commit": "56bc201e265a6bd482a7c41a7c81d2238341ef3a", - "sha256": "0n0hl0plaghz9rjssabxwfzm46kr6564hpfh6hn8lzla4rf1q5zs" + "commit": "889672ad0d35ab062c52d9d84b22de4ac49753f3", + "sha256": "066qrmdxz77zmc9k7wbyzrzrgwfkr75g413r80jll9varf73y9sn" } }, { @@ -40280,11 +40679,11 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20260405, - 711 + 20260523, + 1907 ], - "commit": "06adce5174cf97d500d250fa6053722a326c18db", - "sha256": "0a2v0wryg7y4y0chq08045wppm0bms0z99vv0bbzmc90cmpgsm6x" + "commit": "fb824f657fb4325c1124f3e1b61f0de7ed062adf", + "sha256": "1qywpk9z893q4a12n0zqgwsychhfqjv2py20z0fsg4j78aszdpnv" }, "stable": { "version": [ @@ -40384,27 +40783,28 @@ "repo": "wbolster/evil-text-object-python", "unstable": { "version": [ - 20191010, - 1328 + 20260706, + 1546 ], "deps": [ "dash", "evil" ], - "commit": "39d22fc524f0413763f291267eaab7f4e7984318", - "sha256": "0293hfgczpjghvg28s27c5r6ll1zaq466pasrhzj71sqzyvxq7ax" + "commit": "c8b2c6d8f5194af99f65cceec1b692f464f00a8b", + "sha256": "06n7p1cwb1aaj5ixr0mb8s9fmkq45jrlwwp00p447vsnc5rsjv4l" }, "stable": { "version": [ 1, - 0, - 1 + 1, + 0 ], "deps": [ + "dash", "evil" ], - "commit": "3b3fb01e7ad7eeeeae1143695547fe75148cc44f", - "sha256": "1alin2rmx1xa1w3b1nb76bplmg10il55jxxm6jj7qs6z1izzllci" + "commit": "c8b2c6d8f5194af99f65cceec1b692f464f00a8b", + "sha256": "06n7p1cwb1aaj5ixr0mb8s9fmkq45jrlwwp00p447vsnc5rsjv4l" } }, { @@ -40530,11 +40930,11 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20260310, - 405 + 20260616, + 730 ], - "commit": "7f58008a82c70eb1c6c5761db499f0be0db9d6cb", - "sha256": "0nfaz4vdghyaf0k8b35ssqif4fdisylqs55v1v0a8ss114r96b26" + "commit": "fecc0e11615df31a6651ce11b012388e53cad4e9", + "sha256": "074kadi1z43ixxvlfwd917czpiw4qg1ysybwxwdd7kb4x8siqpas" }, "stable": { "version": [ @@ -41139,10 +41539,10 @@ }, { "ename": "exotica-theme", - "commit": "ca71d6b596e2595f356f7848e202b2450d395f49", - "sha256": "0bzibc1s7a2qxh03573q43dw4pk1svrvh17n6nzxznag8abnndqn", + "commit": "f5dc52f2853b75497df431a4d35663f3574c8286", + "sha256": "0yyn8fsj0x6cfp68skr72zy4ipndyi2f4s37fkns81ykgpmdrkas", "fetcher": "github", - "repo": "sacredyak/exotica-theme", + "repo": "rokrdev/exotica-theme", "unstable": { "version": [ 20180212, @@ -41733,6 +42133,30 @@ "sha256": "1qg48zbjdjqimw4516ymrsilz41zkib9321q0caf9474s9xyp2bi" } }, + { + "ename": "f90-ts-mode", + "commit": "15ade73fdc7b379649b5cead652f8ad3a2c1e624", + "sha256": "1rwgvjks9bp37zgb81d7h0q8dw2rj2v3bxf5z678bkcx8bs8gfih", + "fetcher": "github", + "repo": "mscfd/emacs-f90-ts-mode", + "unstable": { + "version": [ + 20260717, + 1000 + ], + "commit": "e4549d68501bdef06db615b8674a9bd9f1f70a9d", + "sha256": "1wyfzp02brpvrxnzkjf0jdscxx1nlglk2g00bw0g5qy6xp36pzbn" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "commit": "3fbdbf64a17b2c712552d4733b02bf9bbf9258f6", + "sha256": "04l6iwz33gsbp6ab4idfh7zb7b9ggq9m34w67f7k7ps85hg2fgzg" + } + }, { "ename": "fabric", "commit": "83939d2a4d5874244a4916eee9ae6b327af18b5d", @@ -41831,25 +42255,26 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20260413, - 2137 + 20260507, + 114 ], "deps": [ "modus-themes" ], - "commit": "1a6ee167627a4c623f157f3afb5ec12d368889af", - "sha256": "13vb0c5v5hd8jzy8cp6r2fv8wixcj5gfl9060d7w0qdf1h6kx6rv" + "commit": "468d7d4fafc8f8fe8515ac0454561121619e1129", + "sha256": "0j1b5irhj9ijs504i0sa4i4jvd9n08cr8r2qr1l0l3mj5qlppy8k" }, "stable": { "version": [ 4, - 0 + 0, + 4 ], "deps": [ "modus-themes" ], - "commit": "8f976f810e6f23d2afaaa13f53e11d73e941cbcf", - "sha256": "1083ias5bk17vcvpa4xrnpps6r1v46xnzy2b2x0azin0vj9pvc65" + "commit": "468d7d4fafc8f8fe8515ac0454561121619e1129", + "sha256": "0j1b5irhj9ijs504i0sa4i4jvd9n08cr8r2qr1l0l3mj5qlppy8k" } }, { @@ -41918,14 +42343,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20220211, - 633 + 20260717, + 1243 ], "deps": [ "popup" ], - "commit": "cf4a2f7e3e43e07ab9aa9db16532a21010e9fc8c", - "sha256": "04z9pwvl68hsisnyf9wlxmkwk8xag36jvcchwcwp4n9vp04z8745" + "commit": "9a9296f0dcfe272cdff1fc2e0a6a62b8cdaf11ab", + "sha256": "0ix7cdcivkfxgd81hpx8bilz0dh6hgikvh5lgl0dyap9ml4y6br0" } }, { @@ -41936,11 +42361,11 @@ "repo": "ideasman42/emacs-fancy-fill-paragraph", "unstable": { "version": [ - 20260421, - 124 + 20260615, + 716 ], - "commit": "3f3e8fddc4f69c7c0ff933af58e8c3a71292a7cb", - "sha256": "1475h2i8b8b7xawkvawb76yr62y8p603id4lbhrrrrw9wvr7dnj2" + "commit": "a3a2b880db857e8e55a4d20a87680c35d0325439", + "sha256": "0ky203nmvdz4nfl8acs7g3fzklcm1pynjz2z3kiqgyhhxn85f4p4" } }, { @@ -42355,25 +42780,25 @@ "repo": "martianh/fedi.el", "unstable": { "version": [ - 20260223, - 1326 + 20260509, + 801 ], "deps": [ "markdown-mode" ], - "commit": "74fab520f1d008f5a389a673616a617c03c74600", - "sha256": "0ldag8659nqphc2isw1n3xv8dqf468ppwf1q10zn03sdj4dc1i11" + "commit": "91f28ee199a499b8d6e1b9c7a0f1c15f8a382198", + "sha256": "0xlsh4a42mymi4jrb32ak4srbm28hq67jwijnpbyfzfkchjsqimj" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "markdown-mode" ], - "commit": "74fab520f1d008f5a389a673616a617c03c74600", - "sha256": "0ldag8659nqphc2isw1n3xv8dqf468ppwf1q10zn03sdj4dc1i11" + "commit": "91f28ee199a499b8d6e1b9c7a0f1c15f8a382198", + "sha256": "0xlsh4a42mymi4jrb32ak4srbm28hq67jwijnpbyfzfkchjsqimj" } }, { @@ -42452,11 +42877,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20260408, - 1529 + 20260704, + 2353 ], - "commit": "c963b4701e4668717df083c8a4591c93e6b1dc8d", - "sha256": "0mdhcqns89fm2yc7j3pbaniqg3mx9gffgfj3fbnnpfwj7mf9gadc" + "commit": "bbc28a629405de628880d8fb485fce23ff7fab69", + "sha256": "1rpyp660j9shlilxgwvc4i01qpmqyz3zy3dxk10dilw2g5n6dd0q" }, "stable": { "version": [ @@ -42587,15 +43012,15 @@ "repo": "Artawower/file-info.el", "unstable": { "version": [ - 20251107, - 1738 + 20260509, + 754 ], "deps": [ "browse-at-remote", "hydra" ], - "commit": "5d8c5158a57e0077410bcdb802c344f5e8da4aca", - "sha256": "1ap8ms7vrv0hnra0mcxpkf364j3ql5s9j40fmqqi84djr6w0abn6" + "commit": "c20ab17ee23e7e1b07975cce9a3c2d5e3dff14f6", + "sha256": "19msd6iaadnxg8rdvlj12vdwpq3jk81q23hz68pdz1yp9spndbc5" }, "stable": { "version": [ @@ -43363,8 +43788,8 @@ "repo": "martianh/fj.el", "unstable": { "version": [ - 20260327, - 906 + 20260509, + 741 ], "deps": [ "fedi", @@ -43372,13 +43797,13 @@ "tp", "transient" ], - "commit": "3697ac2847180bd307e70ff0fb9ef086f59dec24", - "sha256": "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l" + "commit": "4832dcfcd167d1975bb44a024881c75fef64182e", + "sha256": "09ff20am16ysjpbqx7b92qgmvyar9b6blm32flkvzqxccqqinxya" }, "stable": { "version": [ 0, - 34 + 37 ], "deps": [ "fedi", @@ -43386,8 +43811,8 @@ "tp", "transient" ], - "commit": "3697ac2847180bd307e70ff0fb9ef086f59dec24", - "sha256": "1y3k82q5iii7ddm6yj7397x2jscbcnvapd04zc5wjkqdr50cay3l" + "commit": "4832dcfcd167d1975bb44a024881c75fef64182e", + "sha256": "09ff20am16ysjpbqx7b92qgmvyar9b6blm32flkvzqxccqqinxya" } }, { @@ -43443,11 +43868,11 @@ "repo": "Prgebish/flash", "unstable": { "version": [ - 20260308, - 621 + 20260711, + 805 ], - "commit": "42fbc5883fd802df97cae842c403deba4c433d45", - "sha256": "18jbcqp844s1cvra2xw9nq9fw3g3y0jwyi1bxlm4f8s8g97bfvxd" + "commit": "db3bfa84866f143a0665d1b5a48c3b30dc7b528f", + "sha256": "02z4h73018mv5hf6xzwhaamv24abnj2s6lg5daybd0qz9ncvxxrd" } }, { @@ -43610,15 +44035,15 @@ "repo": "plandes/flex-compile", "unstable": { "version": [ - 20251218, - 243 + 20260716, + 2144 ], "deps": [ "buffer-manage", "dash" ], - "commit": "f15d23afabd03c39583b1a87dd847a91cb7bfe34", - "sha256": "0k1q4fmh43jwcl81v4qxr4s0azbikh6cnfa0ngs8g83ahrwdag76" + "commit": "0bd757312b0118ed55d3f4eefe4adca983f588ec", + "sha256": "1n71ll57wpfps1av89k63awhbhrg527anqxhgfiglswzba5970yg" }, "stable": { "version": [ @@ -43649,6 +44074,21 @@ "sha256": "0xbwrzkfv4i91qxs80p0pfjlvj5pyigvidby8m5lammm8idwx9dh" } }, + { + "ename": "flex-x", + "commit": "86f02e077f9339a0eadc479fb3ff8b73440bf325", + "sha256": "1k6i7qpwavabfgvrx5fczcyb91wazynqjnh4a0jwq85igvb767ls", + "fetcher": "github", + "repo": "kn66/flex-x", + "unstable": { + "version": [ + 20260713, + 1220 + ], + "commit": "c5fba3d76b1eab42f9e524f0c48d6db61274aeb1", + "sha256": "1n4bgmd6hspc1jy8fsmscwazgahl5pqfdsp6ydya41rfhcbirbbh" + } + }, { "ename": "flexoki-themes", "commit": "45e87fc1fc52dc3d7df148a4b5adf306cbda63ce", @@ -43657,11 +44097,11 @@ "repo": "crmsnbleyd/flexoki-emacs-theme", "unstable": { "version": [ - 20250228, - 1934 + 20260516, + 1228 ], - "commit": "4ca5d80bc4f33b5ace8950f0c00069539835fab4", - "sha256": "0yka5ry44cfdwgfbl2bwix3pfnrvziyq9bza64j21f5f3kjwdmw2" + "commit": "3d6074282ff6e181e98f16000f3355fb977e2b56", + "sha256": "19x1rr6bzc9l2j4srz1f51z3cjf6s1b7m4k98mbkbfghw5nl23mn" } }, { @@ -43973,25 +44413,25 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20260320, - 1715 + 20260720, + 531 ], "deps": [ "seq" ], - "commit": "0e5eb8300d32fd562724216c19eaf199ee1451ab", - "sha256": "0jzzx3hhvb4rmqvavzkw3gnf3csczng1imgfk019pd30pj2wrxbd" + "commit": "7e44b59718318abb4bf9732de2538f4e0281ce49", + "sha256": "1gr5b4n2ljmvd40a35g3xwsrkafg4rf4mfc294690kzh3y0lgmbz" }, "stable": { "version": [ - 36, + 37, 0 ], "deps": [ "seq" ], - "commit": "ebddfd89b1eea91b8590f542908672569942fb82", - "sha256": "0gndi96ijxqj6k9qy5d4l0cwqh0ky7w1p27z90ipkn05xz4j3zp5" + "commit": "af6b60fd544c29f68c731d709a066317b8ed0628", + "sha256": "0s2a7qzifz25231pzaq38j8sqnzjid0cxck91kgnazhhp4gdndl7" } }, { @@ -44352,14 +44792,14 @@ "repo": "borkdude/flycheck-clj-kondo", "unstable": { "version": [ - 20240218, - 2215 + 20260615, + 1926 ], "deps": [ "flycheck" ], - "commit": "e38c67ba9db1ea1cbe1b61ab39b506c05efdcdbf", - "sha256": "1pxlb8axgmc8cw4id40z576kd041qb1irq8rkjn6xbda585ix58f" + "commit": "414a3ead1faefb234d658fd8a8ba121c95b71de2", + "sha256": "08llz442nxk2ijpfshfcb5mh2h9rk76h93rax90rg5xmbbsx3f26" }, "stable": { "version": [ @@ -45108,25 +45548,25 @@ "url": "https://git.umaneti.net/flycheck-grammalecte/", "unstable": { "version": [ - 20251001, - 2010 + 20260615, + 1837 ], "deps": [ "flycheck" ], - "commit": "4b50d794a88d31c43023bed78f1815673f0c8890", - "sha256": "1bv6g3y39ifcyxynmwk619hkfl643s3pa4qrmy7m440dndfqjzxf" + "commit": "f822e96ef54cc8d0d9ca64ad489b915bc36f6ac0", + "sha256": "1vbvgh9qkvvylskk292hcgl347ygb744w2jwx8cw41fk30i2v7qc" }, "stable": { "version": [ 2, - 5 + 6 ], "deps": [ "flycheck" ], - "commit": "4b50d794a88d31c43023bed78f1815673f0c8890", - "sha256": "1bv6g3y39ifcyxynmwk619hkfl643s3pa4qrmy7m440dndfqjzxf" + "commit": "f822e96ef54cc8d0d9ca64ad489b915bc36f6ac0", + "sha256": "1vbvgh9qkvvylskk292hcgl347ygb744w2jwx8cw41fk30i2v7qc" } }, { @@ -45317,15 +45757,15 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20200129, - 2046 + 20260516, + 852 ], "deps": [ "flycheck", "indent-lint" ], - "commit": "23ef4bab5509e2e7fb1f4a194895a9510fa7c797", - "sha256": "00ipp87hjiymraiv6xy0lqzhn9h3wcrw7z4dkzb2934d7bd08j29" + "commit": "3660b10520d78dd545fd0c52d7e7a36dc602492d", + "sha256": "1r15nwxkb5d3zx7m1i5z8jmql551dcnq37czhk57v5madr6hggw6" }, "stable": { "version": [ @@ -45942,28 +46382,28 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20250930, - 1139 + 20260717, + 1734 ], "deps": [ "flycheck", "phpstan" ], - "commit": "07ef7531f2ec73b90a965ac865cca8c96086f9de", - "sha256": "1myzqbd00892a604kg88bxglk0w6valdvmaybsixapr5wgg2sbri" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "flycheck", "phpstan" ], - "commit": "206573c8de58654384823765dcca636c9e35e909", - "sha256": "12qzjy3zz0lk439y0y9gl5pirzlf52li3lbyjjmq7lq6yg30qzxm" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" } }, { @@ -46207,14 +46647,14 @@ "repo": "msherry/flycheck-pycheckers", "unstable": { "version": [ - 20240817, - 2 + 20260624, + 439 ], "deps": [ "flycheck" ], - "commit": "1bd9b7a7d4009a81ebd34515a72a3a94c313ad76", - "sha256": "1m33yrx2nbwawh38fsibv97fb8gnr461bbrh5yqcnjyw635n7199" + "commit": "de546e52ceb3147da9688c428f7243e6d98af507", + "sha256": "1hfbsb0rrlsdvay34jl1cw0dsv6vbgc0l3wsqr7d3cxx1va3j5k2" }, "stable": { "version": [ @@ -46811,20 +47251,20 @@ "repo": "jamescherti/flymake-ansible-lint.el", "unstable": { "version": [ - 20260320, - 13 + 20260703, + 1441 ], - "commit": "359a11d3e1a9f1cd131aa85edd1c5feb3fcee38b", - "sha256": "1jlnnxdxq94ndcbi62xgy6g2nijzqllg40ijxby1kn7slp5bn91x" + "commit": "bfb8148d9a1aece141d18eef484e7c0c8db79855", + "sha256": "1dk84j778r38lk40d9ic2ihp5pbq7z2gplzjlj18s9f0nmj241d8" }, "stable": { "version": [ 1, 0, - 5 + 7 ], - "commit": "c5375aea83586e1ae97e6c2fa74ea61cf44d98f4", - "sha256": "1w34h714q7gvhpazbqfh0b6vgm0sy7h5xkhsksdqy144agj7jja3" + "commit": "bfb8148d9a1aece141d18eef484e7c0c8db79855", + "sha256": "1dk84j778r38lk40d9ic2ihp5pbq7z2gplzjlj18s9f0nmj241d8" } }, { @@ -46850,26 +47290,26 @@ "repo": "jamescherti/flymake-bashate.el", "unstable": { "version": [ - 20260314, - 1906 + 20260605, + 1304 ], "deps": [ "flymake-quickdef" ], - "commit": "f60c17c8f4b8c9059f615e0895656de65ffb21dd", - "sha256": "1xqi111ilcqk3lj3xhkvlzj11vc58as0gia8pli9p5cidmyl8djk" + "commit": "e36eab741444112bcc1a0cd95b7eb878b82e31da", + "sha256": "1nbh6m8c121ql78ziw86ydvf66b4277hw66i7m5zh6g638davy6v" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "flymake-quickdef" ], - "commit": "c599d3c15c6f174a54c1f3d0081311758e682089", - "sha256": "1xwngb8i39siw2wb0m4pvgwnd1ax5rl5xq9ny3s40bcxs262grm7" + "commit": "4893738819306517736e3f8ea8aeebadb4df4bf9", + "sha256": "1g4vh6kcgla3mdwrbjzfmcljxfd8bmb67w64n7j73xgg3sm867dd" } }, { @@ -46939,15 +47379,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20250831, - 1353 + 20260613, + 1434 ], "deps": [ "flymake", "let-alist" ], - "commit": "909d98d9ec70c2baa5467634ec37181a058f2548", - "sha256": "0082l6ia1p08y86qr1vz6i76gmcpliba7lzm9akr6nlzr5s2d8g0" + "commit": "1c771edc125ae44d9574489f3989397027b17654", + "sha256": "18bb38h9gc69h1shbqdzfrq939jpvb49v98cdgq8d8zcw72nfn8m" }, "stable": { "version": [ @@ -47888,26 +48328,26 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20250930, - 1139 + 20260717, + 1734 ], "deps": [ "phpstan" ], - "commit": "07ef7531f2ec73b90a965ac865cca8c96086f9de", - "sha256": "1myzqbd00892a604kg88bxglk0w6valdvmaybsixapr5wgg2sbri" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ "phpstan" ], - "commit": "206573c8de58654384823765dcca636c9e35e909", - "sha256": "12qzjy3zz0lk439y0y9gl5pirzlf52li3lbyjjmq7lq6yg30qzxm" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" } }, { @@ -48083,14 +48523,14 @@ "repo": "erickgnavar/flymake-ruff", "unstable": { "version": [ - 20251221, - 2344 + 20260616, + 427 ], "deps": [ "project" ], - "commit": "8f1602fa4ddf0abd3dfb8051cbd0259fc351d015", - "sha256": "1mm7lq4qrq8m56cwygi2darm1kakwprm4fm1x3h12slgk4fayww5" + "commit": "ef4a6caed72bce77a27bda54ffb30e3fdb0e7d76", + "sha256": "0frlx7fhfppisldk05jqj2ifhyfkq6015kp1cwmazczb4zsvz45i" } }, { @@ -48577,11 +49017,11 @@ "repo": "awdeorio/flywrite", "unstable": { "version": [ - 20260404, - 33 + 20260526, + 1418 ], - "commit": "174d72ed77a72e0b5751062caa4cae1a853f9974", - "sha256": "1l7ijm6kqw687akm8qlh75skrfpp9wbkwyqh92y4wb9zwhfd2jsz" + "commit": "e9d11b17fdb4a2d986354a5b942952dea9876a6b", + "sha256": "1fk7nz73s9xhkfq2f4kdabq18ij5vjpbcm312zx1zkvkb055ccsf" } }, { @@ -48805,6 +49245,56 @@ "sha256": "05z1xg474mar77wax2lxlf35461w2wk0bwkg79c671wcsgjixvdw" } }, + { + "ename": "folgezett", + "commit": "06df34c7f3def8eadf72c97650aa1ae28746d79c", + "sha256": "0an09035lkj4nb98d6ixval8iq4vck9mj4b32h7v2j5zcsmg08dd", + "fetcher": "github", + "repo": "landerwells/folgezett.el", + "unstable": { + "version": [ + 20260517, + 422 + ], + "deps": [ + "org-roam" + ], + "commit": "8b60ab378fd83a4fc9abc15c82bdcd3cdb2c507d", + "sha256": "1985nyxd7rpca440brzns9kvd5k6pqjgh3r6hyihmwqypx92ac7i" + } + }, + { + "ename": "folio-theme", + "commit": "5cdf39f996aedcb54ca024b0c62bca0ecb1f8669", + "sha256": "1417nn8303q4r53165kj1454dbc3vjrfh4w6q0hvq4286ww0r40y", + "fetcher": "github", + "repo": "kn66/folio-theme.el", + "unstable": { + "version": [ + 20260711, + 13 + ], + "deps": [ + "ef-themes", + "modus-themes" + ], + "commit": "758ca1f9674d685747d0846160e76bb6cb677a2d", + "sha256": "0cwnn6dwd6hvf46pyp3b0nmirh0fh85kz91i2n9q0zfyf7jc5r7d" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "ef-themes", + "modus-themes" + ], + "commit": "247280f0ed9d9c94614635baf69d2a3d65bf1793", + "sha256": "1byxrivjk6h07jqa2lzqpafyn9pxmhhyjafkd40qi55d0blsh72z" + } + }, { "ename": "font-lock-profiler", "commit": "b372892a29376bc3f0101ea5865efead41e1df26", @@ -49086,8 +49576,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20260423, - 1757 + 20260701, + 1425 ], "deps": [ "closql", @@ -49098,18 +49588,17 @@ "llama", "magit", "markdown-mode", - "seq", "transient", "yaml" ], - "commit": "3eff1dab171602db9d1b7cfb0e6e7014eac73665", - "sha256": "0115af0vg9bsmmizfny3k4k9hlkgclpgq6wd05fv3ibhbhc95n5a" + "commit": "9628f76740aec9270e9fb31457ff4cb38d9f3f16", + "sha256": "1xmq50026z47imlwi6an50h2yp6b894m84kfq6bf4878qbfmfw2w" }, "stable": { "version": [ 0, 6, - 4 + 7 ], "deps": [ "closql", @@ -49120,12 +49609,11 @@ "llama", "magit", "markdown-mode", - "seq", "transient", "yaml" ], - "commit": "69801d0da19d62b4b68b1f1756900e47ce7e8769", - "sha256": "10ym872n05nlkd9q1r3dl7vkbniacxm8g9159v56f9z9r6nznwyh" + "commit": "9628f76740aec9270e9fb31457ff4cb38d9f3f16", + "sha256": "1xmq50026z47imlwi6an50h2yp6b894m84kfq6bf4878qbfmfw2w" } }, { @@ -49194,15 +49682,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20260312, - 1136 + 20260620, + 1824 ], "deps": [ "inheritenv", "language-id" ], - "commit": "d44bf536fdae83ad7a798565e21f59c02e461c47", - "sha256": "14wjms8q2pjbwain5gimfcalvxp6vfa1wwv2cb6wr11qdb64n9rd" + "commit": "0dbe9c70eaf8b92dca1a42552761eaa13c3139cf", + "sha256": "16rdqcprb09fgsgbw0fl5zm1d6fg01sr6infg1z1q1r0s7c4z3za" }, "stable": { "version": [ @@ -49372,11 +49860,11 @@ "repo": "gmlarumbe/fpga", "unstable": { "version": [ - 20260407, - 1246 + 20260715, + 1713 ], - "commit": "6b22e9e034411a03e574b00377ce0bcf5dafb1d3", - "sha256": "0fxn76jjalhyymhdwqvgm3s97drkm9y44dd9sivqmpbh01r2dslm" + "commit": "cbf972cf8700291d904f8b922f5d919295d69a67", + "sha256": "1xznaq4bvmmajjsd16546fkax1ww1clpb8kvskf8jw5aqdsrji8q" }, "stable": { "version": [ @@ -49429,14 +49917,14 @@ "repo": "colonelpanic8/frame-mode", "unstable": { "version": [ - 20230823, - 1850 + 20260710, + 1851 ], "deps": [ "s" ], - "commit": "ab5e568a7c7259d31c252c263458bd76490241d0", - "sha256": "044ppidaapay08nw4gv85ir5ivxwwbys0gdvg6mbpf142qk093hb" + "commit": "0435d9ed05223904cf389eea881553632e681035", + "sha256": "17mzw7h4f8fkrkfazsalh3mskhyp81xcfwzxz5nnhzmnbrqv6y2w" } }, { @@ -49522,26 +50010,26 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20260101, - 1833 + 20260601, + 1501 ], "deps": [ "compat" ], - "commit": "975450f325f0e29a73214deff011ad524f02bc74", - "sha256": "0ax9jkchlb1fc6fxw09zps6qhaazbpgm7b66hbsblkdy2apczcnm" + "commit": "6e1f45af13ebaf6ff6f13207c74ed4c5fb8e10c9", + "sha256": "0fqkq3wj4h6qfdd69gz18g7jl4vxy392hp64c6bnk8h38basfs2h" }, "stable": { "version": [ 1, 2, - 1 + 2 ], "deps": [ "compat" ], - "commit": "975450f325f0e29a73214deff011ad524f02bc74", - "sha256": "0ax9jkchlb1fc6fxw09zps6qhaazbpgm7b66hbsblkdy2apczcnm" + "commit": "6e1f45af13ebaf6ff6f13207c74ed4c5fb8e10c9", + "sha256": "0fqkq3wj4h6qfdd69gz18g7jl4vxy392hp64c6bnk8h38basfs2h" } }, { @@ -49998,11 +50486,11 @@ "repo": "bbatsov/fsharp-ts-mode", "unstable": { "version": [ - 20260424, - 617 + 20260624, + 924 ], - "commit": "415dcaf2cb83d98af86ae072a11eae2558047c6c", - "sha256": "0z20v2wnqqd672y7mwjgx88nh3pwq7mdvzck1sjpmqq53gb2lgj4" + "commit": "a7a4f0612456e992c5e3420b3296ed2c1d3c472c", + "sha256": "1zqw57r4gg2rwg8z2p3i2j73rybg3zmm5554s2xs6jf72zvn7mb5" }, "stable": { "version": [ @@ -50233,27 +50721,27 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20260424, - 408 + 20260613, + 1231 ], "deps": [ "compat", "flx" ], - "commit": "6366161a0e03c6c12aeba872fed3dfdc135bff9c", - "sha256": "1hwk15hlq82khx38xriqpd1syfr3zn4m90n65s8ijfjmaysfcg9j" + "commit": "78730ceefb23ee6314803f54eaf73cb044055f47", + "sha256": "0bq6mpq0h65l2nc9wv3vhfqfvsid989brxswli5bbv6n13yrji72" }, "stable": { "version": [ 2, - 2 + 3 ], "deps": [ "compat", "flx" ], - "commit": "92fb91c034707af77be9869500a5ae1ea0079b7d", - "sha256": "1vwxqil4mmll7zdnc1yn8g54kk7p39fyf7y62lxpakij7vxncf43" + "commit": "029d726c3309f148cff162758f60d0e6dbe18f76", + "sha256": "0cnb3a471hwq9pyz69f705a4pyvhjhgm9n358xr2bl8qd802wxw1" } }, { @@ -50387,32 +50875,32 @@ }, { "ename": "fwb-cmds", - "commit": "fe40cdeb5e19628937820181479897acdad40200", - "sha256": "0wnjvi0v0l2h1mhwlsk2d8ggwh3nk7pks48l55gp18nmj00jxycx", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "0lci0xrkqwdlgw31grl16ljxnmw0jsji5p13gbg8sid72z11w0sz", "fetcher": "github", "repo": "tarsius/fwb-cmds", "unstable": { "version": [ - 20260101, - 1833 + 20260601, + 1507 ], "deps": [ "compat" ], - "commit": "d230b9e42f992d9a4c4b155ba7f1920e8577caca", - "sha256": "07h0h2jsb4imkc6n4wxc255f3glgq5kcl2xq85h0769qa28qy5w4" + "commit": "bb62a32dbd3febdd2e644af25a22e56259ed060d", + "sha256": "1a3vmd64zijcxp1fvg7yp8lmc3lfxlfjpblqlwn2y5c03852bc37" }, "stable": { "version": [ 2, 0, - 5 + 6 ], "deps": [ "compat" ], - "commit": "d230b9e42f992d9a4c4b155ba7f1920e8577caca", - "sha256": "07h0h2jsb4imkc6n4wxc255f3glgq5kcl2xq85h0769qa28qy5w4" + "commit": "bb62a32dbd3febdd2e644af25a22e56259ed060d", + "sha256": "1a3vmd64zijcxp1fvg7yp8lmc3lfxlfjpblqlwn2y5c03852bc37" } }, { @@ -50467,11 +50955,11 @@ "repo": "bling/fzf.el", "unstable": { "version": [ - 20260121, - 1418 + 20260505, + 1105 ], - "commit": "0f6a2fd644bedfbcc061f995c8c270d084da1cba", - "sha256": "1q6hs3kksr7lxj6w42gp6q16m86zmkc4r1mr8j5s3n0y8mw9gy2y" + "commit": "75060d81f4eea3f8088ac2a4a3a253c686b44d44", + "sha256": "0a6k9s5c92qg078xgyhfhz7pf3g677rfp0my7zln10nxh628pc3k" }, "stable": { "version": [ @@ -50482,6 +50970,59 @@ "sha256": "14drm6b6rxbcdilcms1jlqyrqbipcqbdil6q06ni9pgafi7xp8hz" } }, + { + "ename": "fzf-native", + "commit": "7869ef9df545789bebfc73caf7a55cbf649324be", + "sha256": "01hbi1jgqdbjliybfc3aw5b8xy6xk5ckpdwh743xanbn994xjvzv", + "fetcher": "github", + "repo": "dangduc/fzf-native", + "unstable": { + "version": [ + 20260714, + 2328 + ], + "commit": "39dc386062d6ae942b4a7e8592d26ce11b73bf29", + "sha256": "04xhv90sbhsx79r6nlkcl71g8sdxcyw20856wd02d71qpf3zmxp4" + }, + "stable": { + "version": [ + 2, + 2 + ], + "commit": "39dc386062d6ae942b4a7e8592d26ce11b73bf29", + "sha256": "04xhv90sbhsx79r6nlkcl71g8sdxcyw20856wd02d71qpf3zmxp4" + } + }, + { + "ename": "fzfa", + "commit": "d4fc9674633431bd3122e1e69ae1e2585ba700f3", + "sha256": "0npg0wgxzlgrc2jxr7pkjl06iwphy2sbp2gvaqa22sp9v891liw3", + "fetcher": "github", + "repo": "jojojames/fzfa", + "unstable": { + "version": [ + 20260719, + 1940 + ], + "deps": [ + "fzf-native" + ], + "commit": "427ff74d62abcd4ee1729d8743fde69cd1a722f9", + "sha256": "1jxdvhq92aa1z16s07zgy7hjkkz2ias153v4554pq2m0crav8h51" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "fzf-native" + ], + "commit": "6737ba916ace7147eaa492fdbe950817beeecfd8", + "sha256": "1jxdvhq92aa1z16s07zgy7hjkkz2ias153v4554pq2m0crav8h51" + } + }, { "ename": "gameoflife", "commit": "bdfc00fe567155ae98fbf1a44d0bb4fa3a8e5786", @@ -50655,11 +51196,11 @@ "repo": "godotengine/emacs-gdscript-mode", "unstable": { "version": [ - 20260417, - 1926 + 20260720, + 923 ], - "commit": "f6ee6891e15b4aaf4e159ecf3ab8482da6fe0ea7", - "sha256": "1hqrc20cgqgcrbc5wqwldq7f0xxfvm3y6cnxzy4brdvg61hdg82b" + "commit": "5ea9bb0a2ee3b3845918084bbb422391dfcc852c", + "sha256": "1r2zps4x1228pz4v6q3536giiynzz0xz0r69nhmli9aqihg4nv62" }, "stable": { "version": [ @@ -50768,39 +51309,40 @@ }, { "ename": "geiser", - "commit": "4f305d3a7823c69455aad9088789afef73477c7a", - "sha256": "0k0jv5a3qlad5qp72m80yi5xws3gdf38pj06azvdg4kzvhgrxpgz", - "fetcher": "gitlab", - "repo": "emacs-geiser/geiser", + "commit": "008e3547b0de78eb6e89edb936b9e40d4b0eb7e0", + "sha256": "0pp2yndrjkhsyym46sn5ww0332kdzwiicq3a2fk2vpkhj98bj1sk", + "fetcher": "codeberg", + "repo": "geiser/geiser", "unstable": { "version": [ - 20251220, - 2301 + 20260718, + 8 ], "deps": [ "project" ], - "commit": "8842104d1521a00c182ce78e9d50d394e9ba86f5", - "sha256": "05sfrads398vh8wghlwhqw809s91j6n5v3k1lfi25dqlp2zvif7m" + "commit": "3e506d06b34ccda8a50ac3e43c90d722c00065fe", + "sha256": "0yzl6hirz8x13pm3v9n7flz44pczfc0cmv8ysmxhndk93c925k17" }, "stable": { "version": [ 0, - 32 + 33, + 1 ], "deps": [ "project" ], - "commit": "9e76f336b91151315642de9bcbed0ffe83b69db7", - "sha256": "09dqwxa2h471xcyk5zncxzaz19gf8d5r83yhi425blf2r1ir7b34" + "commit": "84c25e9683a18d00387b6c16b0cee66269536c3c", + "sha256": "0gyr7fky3jppk3vy44mq3lfwz0n7r0k6cxim7bdfp9qy8jqw1pr8" } }, { "ename": "geiser-chez", - "commit": "6c2ee4d4fbde853481aa66925763845daadd5439", - "sha256": "1csx76zgg26wqbq6q10v4yqj5hadsww0jw17dbz718521906a4ql", - "fetcher": "gitlab", - "repo": "emacs-geiser/chez", + "commit": "8baa86e8c2c05343785242c791347152df6da8b7", + "sha256": "1wikn3n73jx58xnzrcrwh0kn58l1hlx9lgbkhr8nj1qw0iw6hr0h", + "fetcher": "codeberg", + "repo": "geiser/chez", "unstable": { "version": [ 20230707, @@ -50826,20 +51368,20 @@ }, { "ename": "geiser-chibi", - "commit": "29aa9f96fa0826e8e26e2e1219b78c73f9af66fb", - "sha256": "17zkic298ckq8mdmlc25ycafcx2yy11xfdlfjnyy20p7nqqw8njj", - "fetcher": "gitlab", - "repo": "emacs-geiser/chibi", + "commit": "eff5e148c77386a7451ebb194645866c0a5fbce9", + "sha256": "0ka6yf8pm7brvj719sk4qmz5pg4v2bk8gwrwwqwbvhqlhg7777xf", + "fetcher": "codeberg", + "repo": "geiser/chibi", "unstable": { "version": [ - 20240521, - 2252 + 20260706, + 27 ], "deps": [ "geiser" ], - "commit": "2502fed1349c2703eea528b74bcc980ad6bceab8", - "sha256": "1j8vld3s653af8jyvdb3sl16ix3al4fxprawgi3r9rrvrai2wz22" + "commit": "98cda369db3faf7268dd3b1705bb914dd6dad56a", + "sha256": "0gx6r9pczy73gl0cnrv3pn1fsj2dnzffi7j340vn54gg4832bpwr" }, "stable": { "version": [ @@ -50855,10 +51397,10 @@ }, { "ename": "geiser-chicken", - "commit": "a2ad985f3b2b3e9192b6a8525483f43f52df9a10", - "sha256": "1hq3qk8vbspycvm9fv5s9d07gn0m55gwcvgv4ycvyf8gmi2j3xdy", - "fetcher": "gitlab", - "repo": "emacs-geiser/chicken", + "commit": "9fff1d932215fdc55a768d1c6c5e714d83b1b7bd", + "sha256": "0valajqf5x9s09jzzr15z3nl5r0s0y69psd4mg61ach2lb9x0ggk", + "fetcher": "codeberg", + "repo": "geiser/chicken", "unstable": { "version": [ 20250803, @@ -50884,10 +51426,10 @@ }, { "ename": "geiser-gambit", - "commit": "3b4af6c41cf776dff3bcb09ae08f6f3acc880b33", - "sha256": "0vjq5b1warybr57kc855lbmda109vv4kbysn4s4zfi0mz45y0lbx", - "fetcher": "gitlab", - "repo": "emacs-geiser/gambit", + "commit": "bdd0a29ce7b3a725f9216562a942ed990de30295", + "sha256": "03a8z9r8bzb7yw0v1rj2vyxzj9adw6qa10vm5xs3lfi5vkiv7fi6", + "fetcher": "codeberg", + "repo": "geiser/gambit", "unstable": { "version": [ 20220208, @@ -50940,34 +51482,34 @@ }, { "ename": "geiser-guile", - "commit": "779ebb6fa2f9ee7a86425c4364ae8141f66a0f4f", - "sha256": "18w8spn3ys3ggnqic4isy6ggzdjjsvsc1rbpq346mmb1xdy5bjna", - "fetcher": "gitlab", - "repo": "emacs-geiser/guile", + "commit": "d66972d8569c062b7cd9492bf27e6a37f1b8d09e", + "sha256": "0ciz7dbhgkn4dj760s5gx9zldl05qysmjcyx3bf829rfjschnpzw", + "fetcher": "codeberg", + "repo": "geiser/guile", "unstable": { "version": [ - 20240920, - 35 + 20260516, + 19 ], "deps": [ "geiser", "transient" ], - "commit": "a0f111f8dedd31c593c4ed12c0b99745f3c1340f", - "sha256": "0i6drqz7cnx97bs5kprvb0hsg2h4bwkfdi61ajv43dqgb368jbff" + "commit": "cbab81bd2dcb4c787bcda4ae18062db3087e6887", + "sha256": "0hvjc1s74ansn3c5pmizs9q234wz2h52y0070qg008i1vmqvymzp" }, "stable": { "version": [ 0, 28, - 3 + 5 ], "deps": [ "geiser", "transient" ], - "commit": "a0f111f8dedd31c593c4ed12c0b99745f3c1340f", - "sha256": "0i6drqz7cnx97bs5kprvb0hsg2h4bwkfdi61ajv43dqgb368jbff" + "commit": "cbab81bd2dcb4c787bcda4ae18062db3087e6887", + "sha256": "0hvjc1s74ansn3c5pmizs9q234wz2h52y0070qg008i1vmqvymzp" } }, { @@ -51001,10 +51543,10 @@ }, { "ename": "geiser-mit", - "commit": "a327661f80b577f53ae8874ce9ab499d95c442c8", - "sha256": "1zbisdf8mw183qxx7khlfni31lp6airza8q8vvcp5frz277kk9cg", - "fetcher": "gitlab", - "repo": "emacs-geiser/mit", + "commit": "243e7a585f04deb209b6ba4d043b39560e0abc2a", + "sha256": "1vj8jvhllpbq70pb3vaxlajmw3sdvfng7vqhn8qhnvnszdbf0sr1", + "fetcher": "codeberg", + "repo": "geiser/mit", "unstable": { "version": [ 20240909, @@ -51060,10 +51602,10 @@ }, { "ename": "geiser-racket", - "commit": "eddf5704aa4c2373dbe7b7b89934f6db3737a769", - "sha256": "13m7xkimn7qn03cxdp8h1b5g1cnkn5pviq48zlw394xlaz67vn3m", - "fetcher": "gitlab", - "repo": "emacs-geiser/racket", + "commit": "b7b544af40010e336548b5c7ef50ab3323a6cfc4", + "sha256": "09nqp0sy133mnj13g1pgbf9kc0inrl1xkv026cz266z4dggd52sr", + "fetcher": "codeberg", + "repo": "geiser/racket", "unstable": { "version": [ 20210421, @@ -51077,14 +51619,14 @@ }, "stable": { "version": [ - 1, - 0 + 0, + 16 ], "deps": [ "geiser" ], - "commit": "42376b74ae0ad84d02c26560dfd9181493dcccd7", - "sha256": "04gwd9qa0785zfr6m9a5443ilgvyz05l06cb1waicf83sgp8xl32" + "commit": "22e56ce80389544d3872cf4beb4008fb514b2218", + "sha256": "1aqsvmk1hi7kc3j4h8xlza7c6rwm71v98fv5wpw8kmyj9vsp49wx" } }, { @@ -51133,10 +51675,10 @@ }, { "ename": "gemini-write", - "commit": "e97c45cafc44a4b2f08e577325e375c6312f6557", - "sha256": "039rdjsyx9lw7lh21ps84agm1rpinbylzlks6iv1h5pn341s67nd", + "commit": "fd2082f1d5170d65f46116a012d2d1abedf62dba", + "sha256": "0x2qbiy1s15xpfhqgvajp59fjrzkpc6crwglmh93h7l25bzyivz5", "fetcher": "git", - "url": "https://alexschroeder.ch/cgit/gemini-write", + "url": "https://src.alexschroeder.ch/gemini-write.git", "unstable": { "version": [ 20211114, @@ -51191,11 +51733,11 @@ "repo": "larme/genexpr-mode", "unstable": { "version": [ - 20240930, - 1335 + 20260701, + 1400 ], - "commit": "27d9d4d32aef1799698ddbf75e92cb71d0ce99bf", - "sha256": "1qwrxca7qpm3df07y8cchg3vqvgbj2nnlv942ykrkxgcvkx0j5qf" + "commit": "b5007dbd80b9468b7b206927791171218f2f5da1", + "sha256": "0sm5jfrnwl9lh6k3bcfq64p8wnz1svmrwmwrps3b9jxrzyab48bc" } }, { @@ -51328,16 +51870,16 @@ "repo": "twmr/gerrit.el", "unstable": { "version": [ - 20260208, - 922 + 20260512, + 617 ], "deps": [ "dash", "magit", "s" ], - "commit": "317599943495da561a508b31e83ae55c800e5a52", - "sha256": "185q22afq281k6whhjrmikgr711xd7blv6ixir8pinv7d4m5psmd" + "commit": "ccbc70a482305c8f0c88da3a9daead6a16c63ae5", + "sha256": "1g3l0igmrll7a39bw1068yjfdyhvwysn94pk8z0yyh5jclh3hhr8" } }, { @@ -51479,15 +52021,15 @@ "repo": "anticomputer/gh-notify", "unstable": { "version": [ - 20251209, - 1735 + 20260701, + 1512 ], "deps": [ "forge", "magit" ], - "commit": "d606d1390778cb104c28dbc5220e685293e1e687", - "sha256": "17mszbyl8162j0c4jn8hlyiy3a8s9b80n7q32n09vdnrs1akdg25" + "commit": "efecbc0ea7a1b77a48fb395ce3d5a54271974608", + "sha256": "1sz662vz3h1h0vmf4052i103yvbf994gp3l9wsdd0kwrjsbxkf8b" }, "stable": { "version": [ @@ -51580,26 +52122,32 @@ }, { "ename": "ghostel", - "commit": "f092656c1fc300c4d69c762a1e6c72dd3eb657d9", - "sha256": "191p8jh0ck96645skbijybrrsvckr98p54ls2d1n474yxdnbywpf", + "commit": "32c111d2c381b618d3ca556c09b15bc3a0d91287", + "sha256": "1k6yvnsd13lqxw31kmdszsfikabc8js4d4xrcsf4m50gzvk3bf4f", "fetcher": "github", "repo": "dakra/ghostel", "unstable": { "version": [ - 20260423, - 1706 + 20260719, + 2039 ], - "commit": "63e008f32e4896ecd18e24ccfc08a3775561722c", - "sha256": "13pk32b32p9hw0lw957gha89dinqs8g53v73nqhzq9axrp7m9qp0" + "deps": [ + "compat" + ], + "commit": "af41a8b461bbd353bdf07e27c73521aea7311151", + "sha256": "0ch7nh8l1aqlxjknbl5n56200fnvw76xrdfhjscy9c5298daglbd" }, "stable": { "version": [ 0, - 17, + 44, 0 ], - "commit": "6117978d2089d807dd457f9cf2d9382a4a4558c6", - "sha256": "0mmvwms7r4l1ypvxa10s164a6shqwc7bqvrr1wgqkp5z4wqd9dsk" + "deps": [ + "compat" + ], + "commit": "2191afe3049fc785c6fd2b1ab6b826daf500ffbe", + "sha256": "1fyqpbpv62hs3hqai1j04x30miwdqkkpqfxdh4vbxc331fhrj4dx" } }, { @@ -51642,8 +52190,8 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20260423, - 1634 + 20260701, + 1318 ], "deps": [ "compat", @@ -51651,14 +52199,14 @@ "llama", "treepy" ], - "commit": "2b6df7c3f958e64c47151d7d6ef45de38e614936", - "sha256": "1mm60zga2flbh2gnv5554if8d6jiwvzw3px8h87zi7y8dx8rkwmw" + "commit": "59d0b9b33e780d6cff5131886904ff26033dd2e6", + "sha256": "0xcdwm383907hxvxxdx0f1jk1ppdch2pai5csfl97wdzqdg278ah" }, "stable": { "version": [ 5, - 1, - 0 + 2, + 2 ], "deps": [ "compat", @@ -51666,8 +52214,8 @@ "llama", "treepy" ], - "commit": "1fb0fba075cb8b80f9819c874be584dffce50b51", - "sha256": "0d49qkkza9my2xz1vdyq7l3vmmjbamhsqm9xy7xikisyhsngvj73" + "commit": "59d0b9b33e780d6cff5131886904ff26033dd2e6", + "sha256": "0xcdwm383907hxvxxdx0f1jk1ppdch2pai5csfl97wdzqdg278ah" } }, { @@ -52330,20 +52878,20 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20260411, - 1730 + 20260612, + 337 ], - "commit": "b651de43236276cdb18ec7727f645cbf6743a499", - "sha256": "1zpws6z5v54g94jnsw78k42apxpffg54dlkm5i8gclsaxhn6xpdg" + "commit": "3870ae57408dc72ae2215b0056d6661e2c198e75", + "sha256": "0qlmmb1h4clg2967ia9mbrpawhmgj6lbzp6hcb5ihwr10msw7s04" }, "stable": { "version": [ 0, - 10, + 11, 0 ], - "commit": "67b02cf0df4e789771f2344b4dd77c85334a0f9f", - "sha256": "1cq456q908nmbz2br578fhi8vq2jh11nf0axxa7913gd7dhmqklg" + "commit": "ca1a170343448c6d5d265ec12f934d865f7e0aee", + "sha256": "03dgjnjgyz8km7y0mfd4snk8s8r1w7ybmai6wgvjm5hzwmsqrq3l" } }, { @@ -52377,32 +52925,32 @@ }, { "ename": "git-modes", - "commit": "cc3a0ce6c8a4a67b8a8d4b8b2c090694535e6848", - "sha256": "0rpl890n76aqdpx6flgc5kvgg7sic1i85ps8c5j8mbz0pbz06ajv", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "16960l5zpy78k5lcfh7gihw569w12qal644j4x3dpz7db5wn14cd", "fetcher": "github", "repo": "magit/git-modes", "unstable": { "version": [ - 20260101, - 1834 + 20260601, + 1550 ], "deps": [ "compat" ], - "commit": "c3faeeea1982786f78d8c38397dec0f078eaec84", - "sha256": "12r2n3w3yigszh2cszfca1rmrifj2lib5aswcjrx4rd9pzziavzk" + "commit": "f291a4cc4a8b02a25d5cf93b4ab6af29e6f060d9", + "sha256": "16j4slgl1mlqz8bd6g4izkc9dskv80c2dvvqclkabq6mldmib1n6" }, "stable": { "version": [ 1, - 4, - 8 + 5, + 0 ], "deps": [ "compat" ], - "commit": "c3faeeea1982786f78d8c38397dec0f078eaec84", - "sha256": "12r2n3w3yigszh2cszfca1rmrifj2lib5aswcjrx4rd9pzziavzk" + "commit": "f291a4cc4a8b02a25d5cf93b4ab6af29e6f060d9", + "sha256": "16j4slgl1mlqz8bd6g4izkc9dskv80c2dvvqclkabq6mldmib1n6" } }, { @@ -52424,6 +52972,26 @@ "sha256": "01fcf0qqy24ji0ka9gh91gdrp81ilq2xjwah3rv2b90yjk8wib60" } }, + { + "ename": "git-overleaf", + "commit": "cd76e9b4c36ddec9fa3d74a43804016a112c2529", + "sha256": "03np77ap1yzi7jk1afy0gmqznjhli3nlxxvjkvbidbmlnlkfslyl", + "fetcher": "github", + "repo": "Jamie-Cui/git-overleaf.el", + "unstable": { + "version": [ + 20260713, + 844 + ], + "deps": [ + "magit-section", + "webdriver", + "websocket" + ], + "commit": "2559016e1fac95889ba04a0ac9c59c85a267d176", + "sha256": "0vgzvi72gn4xjpc9xryjc3nningvsi9kg8qprflg0m8vp7ynkfgm" + } + }, { "ename": "git-ps1-mode", "commit": "ea177b5ea168828881bd8dcd29ef6b4cb81317f0", @@ -52676,20 +53244,20 @@ "repo": "Justintime50/github-dark-vscode-emacs-theme", "unstable": { "version": [ - 20240716, - 523 + 20260706, + 2133 ], - "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d", - "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k" + "commit": "b3590004a25a279a913168801142d18d2decfde0", + "sha256": "0pjxpnhanqvjfrpxggcj7njd9wrkh71bay8zr3z3qp6147p77syw" }, "stable": { "version": [ 0, - 4, + 5, 0 ], - "commit": "00cac57857732999681e14d0c04fd8b8dbf3ef2d", - "sha256": "1lj75w4lzjk7c05mc2srjl5ciplwn6z5rd8rjj6q8ahsm5pkkd5k" + "commit": "b3590004a25a279a913168801142d18d2decfde0", + "sha256": "0pjxpnhanqvjfrpxggcj7njd9wrkh71bay8zr3z3qp6147p77syw" } }, { @@ -52913,14 +53481,14 @@ "repo": "agzam/github-topics", "unstable": { "version": [ - 20250416, - 2102 + 20260106, + 1904 ], "deps": [ "ts" ], - "commit": "296cb525c5387e5242b89950d2d84d258ff82fd2", - "sha256": "1l5n5wgcnws0iz5ym4znbssin67dzgz3iwq3cp04jf1nssay863h" + "commit": "dce3530b61fe4293190e40edf835291e8542a762", + "sha256": "0v2c7dlky03a94nrbbpl0l2zj74sd43nyds03r2im7rg8r4ssc5p" } }, { @@ -53315,11 +53883,11 @@ "repo": "gleam-lang/gleam-mode", "unstable": { "version": [ - 20251106, - 221 + 20260604, + 1354 ], - "commit": "91cf073c5fb889c091b1797f44cc52419b7c9ae2", - "sha256": "0dd7qylvhrqlxnbvvkb3f03gz14v0sjg9fhiymfhw7p571bq8nqi" + "commit": "ae8aecda23e9dca755d80e86cdb7c336011c2321", + "sha256": "1sg9349ris49gfbx69fawiqfgj2xilqz5w514p3dhbc8qw6brhdb" }, "stable": { "version": [ @@ -53372,11 +53940,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20250324, - 1304 + 20260603, + 1348 ], - "commit": "86e6bb6cf28d1053366039683a4498401bab9c47", - "sha256": "03ajf9q2ijgfmmqvk7kmmxba6bsyrb2q49li93fmdj5dwdyjkgqv" + "commit": "515a2ba4dab3ec89c83a962902a123ddf81e3cfe", + "sha256": "1lf2ydjw5vlvn50l0lag0n31zmy3m6wlhih54q05brzaf2m8rrni" } }, { @@ -53582,26 +54150,28 @@ "url": "https://git.thanosapollo.org/gnosis", "unstable": { "version": [ - 20260406, - 150 + 20260507, + 2347 ], "deps": [ - "compat" + "compat", + "keymap-popup" ], - "commit": "62193075aa38cd64fc812b6208e6fffb2a207e5f", - "sha256": "02cirrzwzsjhrng2p3rb09790p7yc1v598miwdkjbz30linlgjvn" + "commit": "07de9c67536fe3e8c5fef1daf61527f3bcfa46a7", + "sha256": "1cjm8hj62zm9k89pnsh5hbgjqqnh53byw4mijl76a7cn8args4gy" }, "stable": { "version": [ 0, 10, - 3 + 6 ], "deps": [ - "compat" + "compat", + "keymap-popup" ], - "commit": "e830171c4bcbcbc0b1d466ffdbec179e32e9688e", - "sha256": "0kpzc2jw51sklz15v0d0vzm5ck05n3d90l02la4nxn8r85jb1f53" + "commit": "07de9c67536fe3e8c5fef1daf61527f3bcfa46a7", + "sha256": "1cjm8hj62zm9k89pnsh5hbgjqqnh53byw4mijl76a7cn8args4gy" } }, { @@ -53665,25 +54235,25 @@ "repo": "emacs-gnuplot/gnuplot", "unstable": { "version": [ - 20260322, - 20 + 20260623, + 1111 ], "deps": [ "compat" ], - "commit": "39ba1dec5e8e227ba093a30ca07b20d8eb038f29", - "sha256": "1laysqvkn1nvjhx9mjh2m0qc72gky9zja858l557imvhvihllr1c" + "commit": "81e3cb30297f0d12df41b865d2a76c8ba179089c", + "sha256": "1yhs7jxa9z6c1girzpch0db40kvbfzyfzl3iiyh3wjh05i9r31jm" }, "stable": { "version": [ 0, - 11 + 12 ], "deps": [ "compat" ], - "commit": "f10d42221856e86c57dd5cc7400c078c021ba710", - "sha256": "17kh2mpbm5rir4bfrl2hmf8hic6v09z13y6svbf22fm0nkfvic1p" + "commit": "2da2ef68d4861e2e5a5b1a81340b8d92b276a3a5", + "sha256": "1hv7pyvwad67p2ii0lnww0vkk1jrj5pdkph5fxpavyln84wxxnmq" } }, { @@ -53716,6 +54286,21 @@ "sha256": "15fpvwz2mxgn6jb6gvgfnp9snjiwxhw783lfkj8qxn12hcwz6c7m" } }, + { + "ename": "gnus-browse-url-in-article", + "commit": "a9c676b593e91b7ddc18353c7d0db13e2f4ea7e2", + "sha256": "1fis9jgrdy8gi4bjg3kx72xr3n2f7f3p609sph7ks8p4fxma3dnl", + "fetcher": "github", + "repo": "jmibanez/gnus-browse-url-in-article", + "unstable": { + "version": [ + 20260514, + 2045 + ], + "commit": "45d1cbc7bcb55d25d215d4ae39bf6dedf357853a", + "sha256": "0dgcb6lcbhv10drxh1mzmgz1jax5xbgf6ja5iry5hm6drz4fd1pg" + } + }, { "ename": "gnus-desktop-notify", "commit": "c1cf98dff029d494007fe25d29bd8bcfecc5b8e6", @@ -54171,15 +54756,15 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20240210, - 10 + 20260529, + 1355 ], "deps": [ "cl-lib", "go-mode" ], - "commit": "6f4ff9ef874d151ed8d297a80f1bf27db5d9dbf0", - "sha256": "1pbnpj8qqdk4871m1nj39jilcqnz0l5sn9w34s9y2j526rz5l83z" + "commit": "3a71d28ab47df685e54ca6046a7a3dd3e28b682c", + "sha256": "0hm3917kxqgx23ig7617vv5nk8wc17qd26rlxbj141ag0ifwqs32" }, "stable": { "version": [ @@ -54271,11 +54856,11 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20250311, - 156 + 20260510, + 1707 ], - "commit": "58b0c3dfc87f5ae4137ea498dc0e03adc9eeb751", - "sha256": "01db618lfkqwf7ps9hi9k2s1v6p7vgj901p04kn5vdcrs3b7cxny" + "commit": "8aaaa9d2574d7862ecbbe1ff369e88fe3796c8be", + "sha256": "1svycl0zai9zkhpmq72063szwzww6g270qik46d79mg3j0jhaf46" }, "stable": { "version": [ @@ -54366,11 +54951,11 @@ "repo": "snyssfx/go-prettify-mode.el", "unstable": { "version": [ - 20260422, - 732 + 20260429, + 1651 ], - "commit": "6aafd440383931b368901de66bf974bbd37a45f9", - "sha256": "1rrfcnyfqry6ihlkz2w05sgsvcjb8yx74f3dinzpafxa8c2lh9x4" + "commit": "446907afa83d749dbd0a610d1d6fea6bbb822335", + "sha256": "0cang6yam22c7mhakj90pjg5jb72f7p89pmdq5dih1vjxm51lbkb" } }, { @@ -54404,14 +54989,14 @@ "repo": "dominikh/go-mode.el", "unstable": { "version": [ - 20220114, - 2239 + 20260510, + 1707 ], "deps": [ "go-mode" ], - "commit": "3273fcece5d9ab7edd4f15b2d6bce61f4e5a0666", - "sha256": "00qzn136d8cl3szbi44xf3iiv75r6n1m7wwgldmzn4i5mpz8dbq7" + "commit": "144dc7d312d260f8dad7dfa6168537ae57f8e436", + "sha256": "154yhmkcdfwdhkgy4bi20wfz0mhgarm3wq5rz2zs2n0xx84437pj" }, "stable": { "version": [ @@ -54590,11 +55175,11 @@ "repo": "emacsorphanage/god-mode", "unstable": { "version": [ - 20250820, - 259 + 20260428, + 56 ], - "commit": "e6eef24dbf739d819a6651e854ec732ac3f386e6", - "sha256": "1b39lq1l7xa2i4l5ciry3pjaxgzs0xawadb5kbcfhqhd4xlgb04g" + "commit": "4deb47444dd21c67521908cef8b11ab377bfbd6f", + "sha256": "0djj04spg2m40a0c6cgb18pfdcxr3xr3qwhzqpb78ml2p9yxd2za" }, "stable": { "version": [ @@ -54662,19 +55247,25 @@ "repo": "minad/goggles", "unstable": { "version": [ - 20260322, - 18 + 20260519, + 1038 ], - "commit": "73040c4dc8fe946d3657accb5dc4ed4065abd348", - "sha256": "0dbvzyg9cmiis1aj0xb57gdr32p238hwfw731n10gxik9yzhhd2w" + "deps": [ + "compat" + ], + "commit": "e473909708aa0df2134b7bb7f6654d0fb5f23e23", + "sha256": "0247jq97l30ykn02wmkpq401is453yqix7y28pf2milj3mic9blw" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "41d3669d7ae7b73bd39d298e5373ece48b656ce3", - "sha256": "1fczxygg1blfmlwswck49rllww77rc7qn91wqw1kvjwfz31sk8z4" + "deps": [ + "compat" + ], + "commit": "e473909708aa0df2134b7bb7f6654d0fb5f23e23", + "sha256": "0247jq97l30ykn02wmkpq401is453yqix7y28pf2milj3mic9blw" } }, { @@ -55040,24 +55631,6 @@ "sha256": "19lpr9wa73415jmdl1acijz54h5sdsj95wxigigbiqdhq6pd301p" } }, - { - "ename": "gotest-ts", - "commit": "86837556b6cdc831bb4bb387a0840fe6186ebedc", - "sha256": "1fl8cyykfq9myrs8p5240mp2jh3lb1p5f0fgvrq0bw7cj4rp9306", - "fetcher": "github", - "repo": "chmouel/gotest-ts.el", - "unstable": { - "version": [ - 20260127, - 1547 - ], - "deps": [ - "gotest" - ], - "commit": "b12e08d925bab705792f14b29acdca9af550d9a8", - "sha256": "053q4h0wd8rbrcdmn85v1530cvbx4ygwlr0yp8v5pji7wrgbbpd7" - } - }, { "ename": "gotham-theme", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", @@ -55216,7 +55789,7 @@ "stable": { "version": [ 0, - 53, + 55, 1 ], "deps": [ @@ -55225,8 +55798,8 @@ "magit-popup", "s" ], - "commit": "21f582334c38f866ac587f1489d637440d1428aa", - "sha256": "19bwm2sn8g3a85y6kgs3fh40z2xv53k1ipddfb3qdiml1z69f33s" + "commit": "1e372f1c01953d43fe4d573eb60f33f7e3d3aa41", + "sha256": "012fcyyi63r8i4f9b8hlh9bz6g89v4v6n4h3fwbcqsqb9jka25wf" } }, { @@ -55389,29 +55962,29 @@ "repo": "karthink/gptel", "unstable": { "version": [ - 20260422, - 756 + 20260715, + 1547 ], "deps": [ "compat", "transient" ], - "commit": "593786fce27b54248d4c0ae19b120cbbcf51aea9", - "sha256": "1g436n57r6czk7vrzq8brzvsadrc16p37wicars750i5qhph7f48" + "commit": "8701e2bd80c5d2091ce2decef5d34d6fce4a3ada", + "sha256": "0sy58l4ixv01g7n9ybzcp7y3mhwm3p9353aj0wn46nharji4nca5" }, "stable": { "version": [ 0, 9, 9, - 4 + 5 ], "deps": [ "compat", "transient" ], - "commit": "d221329ee3aa0198ad51c003a8d94b2af3a72dce", - "sha256": "1ffh2mwy9znjd0v9mh065lv122xg4nlnkbxwjfrsaqn1j1q2xc0c" + "commit": "f5ad4eb812920fba3fcfbe32042ef89f979a7e17", + "sha256": "1bf7xynmrm859471nxc56sv028i039qnqhhmkhzkhf76mwac6cx8" } }, { @@ -55422,8 +55995,8 @@ "repo": "karthink/gptel-agent", "unstable": { "version": [ - 20260415, - 611 + 20260717, + 506 ], "deps": [ "compat", @@ -55431,8 +56004,8 @@ "orderless", "yaml" ], - "commit": "e2ef97d6b566b2ad751c8a0a87b8272710c95808", - "sha256": "0k88fav640ckjjv269zx6zlhjghr551bcamx7argvs8i5ca7r9jx" + "commit": "e833bcaf617baf8c8075eac098231c4457386814", + "sha256": "165jvz2v88j9j2h76qxj4awk7x699v5ahg4vvg06p6p37zfyfzc1" } }, { @@ -55461,14 +56034,14 @@ "repo": "lakkiy/gptel-commit", "unstable": { "version": [ - 20250726, - 1448 + 20260520, + 342 ], "deps": [ "gptel" ], - "commit": "2b1063a01ab894ae5661bfffeb97331ad0cf2e3b", - "sha256": "1lc459dhjhhhh2dzvfmvnjdjmn0z1998wn6n6927llways61wvz5" + "commit": "c354320fc6a2f3df4594d524d78a7effa765636e", + "sha256": "1j0fg9qp9nyd62qis2gvjf7cy9i0pfhj2ar82m587r2hy4lyf75s" }, "stable": { "version": [ @@ -55491,15 +56064,28 @@ "repo": "beacoder/gptel-cpp-complete", "unstable": { "version": [ - 20260330, - 755 + 20260715, + 307 ], "deps": [ "eglot", "gptel" ], - "commit": "4a5fe7941a76f74fe277da916be2cd20e06d2b60", - "sha256": "0wzrc6j56zlf7yswhrfd706jnf5a8agbnpq4cdrdg2n0s2ai6q20" + "commit": "d1d083100a57edc467fb1adf3afe405bf0b2c258", + "sha256": "1vb464kplxqhnicymgz3gzkdc7422d221imwghi1qxq3i6qsyz9i" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "eglot", + "gptel" + ], + "commit": "650e4077dc35e5be8fc63b3c1cc1323099731ffa", + "sha256": "1m2n0sq68w1xjkn5bmqdl4ky6p35gx09pja35n13islchyn42knr" } }, { @@ -55540,16 +56126,16 @@ "repo": "ArthurHeymans/gptel-forge-prs", "unstable": { "version": [ - 20260318, - 1114 + 20260624, + 821 ], "deps": [ "forge", "gptel", "magit" ], - "commit": "aed2bbd21a359770a7739f18f34837ec8d0add24", - "sha256": "01p9n7515xn1blssv04lfb1yqm9g2zvjf9npqm3szmqrnxr88c0g" + "commit": "0a23a7f3f339bb0110a446a7b358aa68867c7898", + "sha256": "06wzpw5z9vgwz7yls5z52wpw8wd17kz01krf13qi8781m1v64b6h" } }, { @@ -56042,28 +56628,28 @@ "repo": "michelangelo-rodriguez/greader", "unstable": { "version": [ - 20260409, - 2330 + 20260627, + 1651 ], "deps": [ "compat", "seq" ], - "commit": "4b0deb0b0ef4a73ea8fe9e2b62b45321dd76a609", - "sha256": "1f6mz0815v862ppnf67gs13p4mfjykp2iap8iysl8yy999a23bac" + "commit": "5c304ad008d8688e4eccd9947ba5e410399bf021", + "sha256": "150d9jjb3famg1phvdn4gifd5xcc3zm543m6w5czfy44khps4ll0" }, "stable": { "version": [ 0, 19, - 0 + 5 ], "deps": [ "compat", "seq" ], - "commit": "e3f930f6ad3f5296252409d3015d6ecce0a5e91b", - "sha256": "08c4i5qbr0ndbbps6y5kpp0lzfmxnwifrxssqkd9qdzj068k69k3" + "commit": "5c304ad008d8688e4eccd9947ba5e410399bf021", + "sha256": "150d9jjb3famg1phvdn4gifd5xcc3zm543m6w5czfy44khps4ll0" } }, { @@ -56227,11 +56813,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20260324, - 1109 + 20260610, + 628 ], - "commit": "d2d27240d0150c00f0b9a5d7d840357e84d4728d", - "sha256": "1x0r8zcblbzzjx9w192mygndga6qp4baq4xkyvsny121vifdb9za" + "commit": "6ed3f9739e4a3320ab063f923c00215f7ee5b5cc", + "sha256": "0vgi7ji64xvy45qn84h2dysyhfngc331swkqc69216sl50d24vh8" }, "stable": { "version": [ @@ -56333,6 +56919,21 @@ "sha256": "1jpfyqnqd8nj0g8xbiw4ar2qzxx3pvhwibr6hdzhyy9mmc4yzdgk" } }, + { + "ename": "grove", + "commit": "ad2ba82bb65b2d3e140887299dffada73955cad6", + "sha256": "19ffibm27ibqz0xrhj8rpxw5fyw7qs971jrf2zzilbq7jrbqa9cq", + "fetcher": "github", + "repo": "jonathanchu/grove", + "unstable": { + "version": [ + 20260509, + 358 + ], + "commit": "8cb33df4e39c51265b8021ecf858ab4bde27f41e", + "sha256": "0g2s3hyc8nhxc0ga33snvh2ybccapc9fc62giw496mzw2x75d3hp" + } + }, { "ename": "gruber-darker-theme", "commit": "87ade74553c04cb9dcfe16d03f263cc6f1fed046", @@ -56489,21 +57090,21 @@ "repo": "wbolster/emacs-gsettings", "unstable": { "version": [ - 20210407, - 2045 + 20260706, + 1543 ], "deps": [ "dash", "gvariant", "s" ], - "commit": "9f9fb1fe946bbba46307c26355f355225ea7262a", - "sha256": "1pq18kz6dqk45ib70sch38ql63smpv7s80ik478ajjysks3882rc" + "commit": "e911edf0c80f3bb9599b3b628425e510f0acb63f", + "sha256": "1yll0lml8ilxqxy8wv18xrid040qrdgr6ahj2dicam589rhvkncs" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -56511,8 +57112,8 @@ "gvariant", "s" ], - "commit": "1dd9a6a3036d76d8e680b2764c35b31bf5e6aff7", - "sha256": "0bv6acy3b6pbjqm24yxgi7xdd3x0c2b7s5sq65sb3lxf8hy5gdf6" + "commit": "e911edf0c80f3bb9599b3b628425e510f0acb63f", + "sha256": "1yll0lml8ilxqxy8wv18xrid040qrdgr6ahj2dicam589rhvkncs" } }, { @@ -56663,20 +57264,20 @@ "repo": "bormoge/guava-themes", "unstable": { "version": [ - 20260421, - 2012 + 20260701, + 2352 ], - "commit": "de9bbe98c5186ab56cb460c59644bb9da6c6437c", - "sha256": "04xf7k1x7l13hzsyi56dzph1nhc6rmanqvdbqv7ngb8kqd810msv" + "commit": "49339c87d895d0726280811b325bb631f08aec69", + "sha256": "0svr8sa8k1w37ijv46bsshkax2zkjgd9821azr4bqq306iirin5n" }, "stable": { "version": [ 0, - 15, + 18, 0 ], - "commit": "50881883b9ca7fbceb9bfedb04d2a16ea01125bb", - "sha256": "0pkng9vra4ymjnwys4d3b6ly8marpc6zl6yl02k731lhx3a1kll7" + "commit": "92ed6ba6c117ce52137fae975e6c73aa1ff3ed62", + "sha256": "11ii5l7kvsf9vm0wlixsysbcqsagrbz3qncj7phriwrwxqsf1nmh" } }, { @@ -56687,14 +57288,14 @@ "repo": "tmalsburg/guess-language.el", "unstable": { "version": [ - 20240528, - 1319 + 20260625, + 628 ], "deps": [ "cl-lib" ], - "commit": "a17203d26135b970e4d7c5d101955d41303a758f", - "sha256": "1v9wwpfjl7a37jx0s2w5g48mv58vw8b3d0552v5ksxw21mbkya8s" + "commit": "f7f74d50b11e090d7543daa0dfbf273820c006c7", + "sha256": "00540641raakr3f1v4l09g1h7j3x5c69221y8smfr6jm0m9ghaxy" } }, { @@ -56769,8 +57370,8 @@ "repo": "guix/emacs-guix", "unstable": { "version": [ - 20260310, - 758 + 20260719, + 1326 ], "deps": [ "bui", @@ -56780,14 +57381,14 @@ "magit-popup", "transient" ], - "commit": "43151aa6902c7122e919d3ed688fd484ec004feb", - "sha256": "0zj4369i667z9v9lmmhc0zyfhia7xss5127p2hspi513mg415wsn" + "commit": "5d41b59529548cca88c368fe7975856a49b50a7b", + "sha256": "00904i5kby3794lfyic80pqwbxk4v3a8p1v5v6wi59fzzpwz26kh" }, "stable": { "version": [ 0, - 6, - 1 + 7, + 0 ], "deps": [ "bui", @@ -56797,8 +57398,8 @@ "magit-popup", "transient" ], - "commit": "72833603ee54c7a8d955415869a332419680ca50", - "sha256": "14639wg2717yawj4qhmmzvirrvjy0s1jw2j9wgyzc21h7hl016pz" + "commit": "5d41b59529548cca88c368fe7975856a49b50a7b", + "sha256": "00904i5kby3794lfyic80pqwbxk4v3a8p1v5v6wi59fzzpwz26kh" } }, { @@ -56862,26 +57463,26 @@ "repo": "wbolster/emacs-gvariant", "unstable": { "version": [ - 20210507, - 1310 + 20260630, + 840 ], "deps": [ "parsec" ], - "commit": "f2e87076845800cbaaeed67f175ad4e4a9c01e37", - "sha256": "1m6gwplzps0hykzszh0vh4rs48hcfi99vxb4i870y46lq2y8x2xb" + "commit": "b49a9c6623773be20e59eada9f8eab33210cc89b", + "sha256": "127pnhnljdbw1l74zj7b4ncr6vzpi6rpqmn6ikn14g5jj1nh2813" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "parsec" ], - "commit": "79c34d11ee6a34f190f1641a133d34b0808a1143", - "sha256": "18ld0wv8r5wlbicqym8vdw33la0bn59s7bxm2fw0w97qwjka8g8k" + "commit": "b49a9c6623773be20e59eada9f8eab33210cc89b", + "sha256": "127pnhnljdbw1l74zj7b4ncr6vzpi6rpqmn6ikn14g5jj1nh2813" } }, { @@ -57001,17 +57602,17 @@ }, { "ename": "hacker-typer", - "commit": "3416586d4d782cdd61a56159c5f80a0ca9b3ddf4", - "sha256": "0vf18hylhszvplam6c4yynr53zc3n816p9k36gywm6awwblfpyfb", - "fetcher": "github", + "commit": "1d888e12b1c4002896723b3c993a72bf920ef37b", + "sha256": "1a60cx65nn50xlrrcbyh47drnkh2an0wfsyjbxzqzgacbjf1v5g7", + "fetcher": "sourcehut", "repo": "dieggsy/emacs-hacker-typer", "unstable": { "version": [ - 20170206, - 1520 + 20260530, + 526 ], - "commit": "d5a23714a4ccc5071580622f278597d5973f40bd", - "sha256": "13wp7cg9d9ij44inxxyk1knczglxrbfaq50wyhc4x5zfhz5yw7wx" + "commit": "3f15d0cfe7636d5b32cbc882f23d5a7b61a86ae7", + "sha256": "0mvavn0xvih5bnag5g94przsxhmmc6bf1xh4s1268ng3j3if8d1j" }, "stable": { "version": [ @@ -57379,6 +57980,21 @@ "sha256": "17xsyvi8myrcyxrv07ckb6dr3mpkihva7y3daw13a3jnm2kzjsp4" } }, + { + "ename": "har-viewer", + "commit": "a5c3eb103915ee1fb71f39125567e938c0ced7cc", + "sha256": "1c8agd7lgaz31nss6plz7hqf3jd7183v3w94ixm5d223hg9ax4az", + "fetcher": "github", + "repo": "bozoslivehere/har-viewer.el", + "unstable": { + "version": [ + 20260523, + 2035 + ], + "commit": "0b36dd0ef6743e0267e603127a4509737f8b1f0b", + "sha256": "1cdlc41vxv3z8n5l9q1dixznjdm6vx1kna44hrmcgqc366phs5k3" + } + }, { "ename": "hardcore-mode", "commit": "b929b3343cd5925944665e4e09b4524bca873c95", @@ -57969,20 +58585,20 @@ "repo": "mgmarlow/helix-mode", "unstable": { "version": [ - 20260313, - 2319 + 20260629, + 1530 ], - "commit": "682049dbc0616f5f9737db3aad2aa1caacf71727", - "sha256": "1i41z8jqy7sm4cn1wm54xnkvfng8nkc499clk66vqppzjjrq8gnw" + "commit": "eca52f517583a599a0a2589cdaa04f00cfc86184", + "sha256": "0s5dpz0jhwdfqjqyjzar38zwd1i1p33m82as6bjlz7h3hkndb5gd" }, "stable": { "version": [ 0, - 9, + 10, 0 ], - "commit": "f3f724ab2c933811a779e0cd6917829ab9e2de3c", - "sha256": "0rbchgcg3xkmia8qxh7v3mf0ijpzs7jx3g76dcc1zcpzj2kx46h5" + "commit": "eca52f517583a599a0a2589cdaa04f00cfc86184", + "sha256": "0s5dpz0jhwdfqjqyjzar38zwd1i1p33m82as6bjlz7h3hkndb5gd" } }, { @@ -58008,28 +58624,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20260424, - 553 + 20260716, + 1207 ], "deps": [ "helm-core", "wfnames" ], - "commit": "c316c0b50317f83d0448d1e49714733215eae133", - "sha256": "1zyr0ra1kd4lqphz1f079wf6w0p8mmyn9rm008y61i77p8w3mgfk" + "commit": "0046ed9ab32d6fa3e60865e84b27cf62fe386b67", + "sha256": "0d7faxj2si3x76kmxfq2qnlhl85yrpmcgfnl2j6hybc2q402m6ni" }, "stable": { "version": [ 4, 0, - 6 + 7 ], "deps": [ "helm-core", "wfnames" ], - "commit": "f12e7dd3132724cc294e79b55291a2c967a8fe5c", - "sha256": "0bcwy60wqfhxvxkhc0rl7bkasf0y1pm5kwg90qh9y23ri69z08zx" + "commit": "3cd5097285dc10ac0898cf6f30c9699c3399e421", + "sha256": "1yihrb2gsl4p24xwwpdapgmnv64sd0pmbfzgpcp8nypyvs5g7kb3" } }, { @@ -58191,15 +58807,15 @@ "repo": "emacs-helm/helm-bbdb", "unstable": { "version": [ - 20190728, - 1325 + 20260719, + 1537 ], "deps": [ "bbdb", "helm" ], - "commit": "db69114ff1af8bf48b5a222242e3a8dd6e101e67", - "sha256": "1yfz5s83589jazyfzyrzh84iv0db2akbwj796gadpb3yhn17pl4v" + "commit": "3eb99e36ed18ca2809594d165664af77a02d2bd0", + "sha256": "0s0rkzf8v135pjk409lbihz9b3wvr8dnjhqq98qris4rvvl0d67h" }, "stable": { "version": [ @@ -58819,26 +59435,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20260412, - 600 + 20260618, + 1908 ], "deps": [ "async" ], - "commit": "8e1be2fdba8d99aab20c31f1bd08535773549fa4", - "sha256": "0f6q8wimad16wqarhkzkqyc47maad77r7s9mjlfpfmm3mbbi9ixa" + "commit": "558427bf221a61014e25d1be3a29dbebad277973", + "sha256": "1brd3q69yfhw5dr0bwmlsjsjh9m32wdkr3llv6y7rx35bh4rhdf5" }, "stable": { "version": [ 4, 0, - 6 + 7 ], "deps": [ "async" ], - "commit": "f12e7dd3132724cc294e79b55291a2c967a8fe5c", - "sha256": "0bcwy60wqfhxvxkhc0rl7bkasf0y1pm5kwg90qh9y23ri69z08zx" + "commit": "3cd5097285dc10ac0898cf6f30c9699c3399e421", + "sha256": "1yihrb2gsl4p24xwwpdapgmnv64sd0pmbfzgpcp8nypyvs5g7kb3" } }, { @@ -59002,14 +59618,14 @@ "repo": "emacs-helm/helm-dictionary", "unstable": { "version": [ - 20250227, - 1635 + 20260611, + 719 ], "deps": [ "helm" ], - "commit": "725cc0df42ad57a7902c330065d9e8ee1216791c", - "sha256": "1ipia68s5x1ny6w99g56hfcnhphlz7zh7bhmrrjyv3aflr7d3170" + "commit": "79eb9b8b33cb3fd8228efde146e23866b4a02652", + "sha256": "0hc31rn0ri6l3nv5z4l2gqc03zmi6p08q80dbdddjk6npv8nf9ba" } }, { @@ -60295,16 +60911,16 @@ "repo": "emacs-lsp/helm-lsp", "unstable": { "version": [ - 20250812, - 1134 + 20260507, + 1749 ], "deps": [ "dash", "helm", "lsp-mode" ], - "commit": "d9d1a60f5020196b71fa89e5db3dcd12d00b7d02", - "sha256": "1g212mkzfm3pb1ynn3m141sz7w0ih9ssdz36a97l3wk4g14p9ric" + "commit": "056bb16b5f69137218613b7558b477f6b21f22be", + "sha256": "0m0lbw7n8lfyahpwg9lpqa9wf7bn90416va3wn2lik8gapxwwgwa" }, "stable": { "version": [ @@ -61023,28 +61639,28 @@ "repo": "bbatsov/helm-projectile", "unstable": { "version": [ - 20250902, - 830 + 20260708, + 1251 ], "deps": [ "helm", "projectile" ], - "commit": "0ffb6b5f09c1d65d721c1111ebfa6cec0ba63234", - "sha256": "19zafd0l2mcd53q83bd2mxinadzsp90q5znfcm9fq0m88lpcmg94" + "commit": "150ab7b669f7d3000718b73fa857dfe0ad641a97", + "sha256": "1s1pxi6f7v23fr7iax075wq6jkn3vrnasm2rjxmf781cjkjayk09" }, "stable": { "version": [ 1, - 4, + 7, 0 ], "deps": [ "helm", "projectile" ], - "commit": "0ffb6b5f09c1d65d721c1111ebfa6cec0ba63234", - "sha256": "19zafd0l2mcd53q83bd2mxinadzsp90q5znfcm9fq0m88lpcmg94" + "commit": "150ab7b669f7d3000718b73fa857dfe0ad641a97", + "sha256": "1s1pxi6f7v23fr7iax075wq6jkn3vrnasm2rjxmf781cjkjayk09" } }, { @@ -62599,19 +63215,19 @@ "repo": "Anoncheg1/emacs-hidepass", "unstable": { "version": [ - 20260415, - 1941 + 20260512, + 1112 ], - "commit": "0cdc0d7910501d91d5d75ae53a42726d3fca0302", - "sha256": "1fv98diy9nj8n8y6ndb3n6vddvbqi539b1q87vsfzfna2gwnrpn6" + "commit": "6094bc0e37f5ac4abfe3fe8ed0ce8eef1a928ef9", + "sha256": "1ji625asb8xrb7ajm2vdk2iq2n6dv8y4558pi9ywq0ihdfddxvwd" }, "stable": { "version": [ 0, - 1 + 2 ], - "commit": "da33a03407f1fd8e23959abbc37ba50ec1317a39", - "sha256": "1xjl1z7nxdkc7s18jl4bbvaf3cayki865xm3w3f0py276j7gl1gw" + "commit": "6094bc0e37f5ac4abfe3fe8ed0ce8eef1a928ef9", + "sha256": "1ji625asb8xrb7ajm2vdk2iq2n6dv8y4558pi9ywq0ihdfddxvwd" } }, { @@ -63124,11 +63740,11 @@ "repo": "bdsatish/hindu-calendar", "unstable": { "version": [ - 20260326, - 2105 + 20260627, + 1755 ], - "commit": "118e8455e3c2c8a0b2661b41eee0df9cb07fc87d", - "sha256": "1crgia9fgbfmanpxzpaklvv4vjxajw4bpaynvp65f86j7y1rm53w" + "commit": "0868cb7548830e50d801f68a79e34fd988464f3e", + "sha256": "0gsp9wfrnzbqkddbpi9w5nbhsbsiyg5aq01xpbqmrc4fwdw616xc" } }, { @@ -63369,11 +63985,11 @@ "repo": "ideasman42/emacs-hl-indent-scope", "unstable": { "version": [ - 20251231, - 706 + 20260502, + 926 ], - "commit": "38c8775dc575ecf6a35fa88946be3dfb5b489018", - "sha256": "0qmab8g6mwacvgyjjwdblzx9j5wgyzkwz7b54vj9r1v2as79idhb" + "commit": "538ddc0295727b11e20a9615a18d0f280bc0212a", + "sha256": "16v0cp3z655siniqz8x27xxyifs7jmpkb60gbjvs1yx36jg1k6zp" } }, { @@ -63402,11 +64018,11 @@ "repo": "ideasman42/emacs-hl-prog-extra", "unstable": { "version": [ - 20251224, - 230 + 20260502, + 900 ], - "commit": "1cfce465f59700820932ec71c019d821c6cea126", - "sha256": "0fl94alqmj1530l632wwv2s84jgvppbxsk3w5r6faddf03c8zpcm" + "commit": "2eac9eb5a428b23f87cfa1373f5f8fd634a72e48", + "sha256": "0raxwlqbp6587c5f68dd3xq12yxaq3g5cw9r3526vnmkzajxix1s" } }, { @@ -63433,32 +64049,34 @@ }, { "ename": "hl-todo", - "commit": "7c262f6a1a10e8b3cc30151cad2e34ceb66c6ed7", - "sha256": "1iyh68xwldj1r02blar5zi01wnb90dkbmi67vd6h78ksghl3z9j4", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "14h09cxwi3hh63xdnc2a9pvaf51gws7crhs2ivci7h9377yqqcir", "fetcher": "github", "repo": "tarsius/hl-todo", "unstable": { "version": [ - 20260101, - 1834 + 20260601, + 1508 ], "deps": [ - "compat" + "compat", + "cond-let" ], - "commit": "9540fc414014822dde00f0188b74e17ac99e916d", - "sha256": "01rfyp1iqiyp8k7fg16ji8p2dp74ffdhl4bdikfxb2sz4jbz8x80" + "commit": "527d545b8c2f36243194cbe4a8d0e6ac9d50e6a7", + "sha256": "0zn5mk2m9gk7dyx04hmn8jfq0b4ai6l0nd9xss4gdzcdxh74779s" }, "stable": { "version": [ 3, 9, - 3 + 4 ], "deps": [ - "compat" + "compat", + "cond-let" ], - "commit": "9540fc414014822dde00f0188b74e17ac99e916d", - "sha256": "01rfyp1iqiyp8k7fg16ji8p2dp74ffdhl4bdikfxb2sz4jbz8x80" + "commit": "527d545b8c2f36243194cbe4a8d0e6ac9d50e6a7", + "sha256": "0zn5mk2m9gk7dyx04hmn8jfq0b4ai6l0nd9xss4gdzcdxh74779s" } }, { @@ -63557,6 +64175,25 @@ "sha256": "1abqjrzq75ijhn3sfmy0wy6acp8x7nj5gihqy34mickz4v5wqbil" } }, + { + "ename": "hnview", + "commit": "6623d052596f1be181d9365cda61caca3d92afbd", + "sha256": "1xwh6fcbk1r8psqm8wkd5hs8n88p3gg7k2hwg74wi67yq80q9s57", + "fetcher": "github", + "repo": "LuciusChen/hnview", + "unstable": { + "version": [ + 20260720, + 641 + ], + "deps": [ + "llm", + "plz" + ], + "commit": "9b835985f9513f6801109b26d2b311f90195a3b3", + "sha256": "0cwkvasab7js3b47is1s5xhvy4j0lk5jb697dpvfn51c6b3dvm83" + } + }, { "ename": "hoa-mode", "commit": "07e85198e461f6a5e440ec95f7a5e93dd624205c", @@ -64107,17 +64744,17 @@ }, { "ename": "http-server", - "commit": "038be2fbd45ee801be37c42f8cd2ddedd0138f05", - "sha256": "0cy94j82qfd7x0riz7mhas52xdbr3nhi0ch0x3whbnpjklhkq6c0", - "fetcher": "git", - "url": "https://codeberg.org/martenlienen/http-server.el.git", + "commit": "555731d091158b9d7d16fe0c6904b66c7e0e502f", + "sha256": "025z8pk4064rmgpjx7g6vh8am8q2sa6yinj162y84a74a1af06ah", + "fetcher": "codeberg", + "repo": "martenlienen/http-server.el", "unstable": { "version": [ - 20260419, - 1924 + 20260609, + 1136 ], - "commit": "973c87b418e59404dcdfe823254e5094adf290f7", - "sha256": "1hmkm0wp5g6ac2hdg306sl42v12x3znsz363v75k6fd1qydhkk1v" + "commit": "4285bd3e4b67983cb783f46afc736032f895882d", + "sha256": "0wwv7k4avxgrscmvqnxada38ry03ijncracwvgkpgfky1cj3r0l8" } }, { @@ -64333,6 +64970,27 @@ "sha256": "18yspmwn9wd00arfj80wj6lk7khcgn1arjbs2y8zqv8g7ms9xvh6" } }, + { + "ename": "hutch", + "commit": "17017ad00b0a010ceb735079100fc95345804ce2", + "sha256": "13wxpgp1l35hl2phb5f58y2whcghwp5v4ibf1qnhrvbplclwjdwv", + "fetcher": "github", + "repo": "adjaecent/magit-hutch", + "unstable": { + "version": [ + 20260630, + 1048 + ], + "deps": [ + "gptel", + "magit", + "svg-lib", + "transient" + ], + "commit": "ee06a06093c66f2c4c5873434aba44b62e11bf76", + "sha256": "0g1h5laqwd14dvdpwn0nj3picygqf6dgvg9lcbk727v2i9qvpssm" + } + }, { "ename": "hy-mode", "commit": "fc9ab5cf16b61bb27559cd8ec5cf665a5aab2154", @@ -64498,11 +65156,11 @@ "url": "https://git.savannah.gnu.org/git/hyperbole.git", "unstable": { "version": [ - 20260422, - 744 + 20260719, + 1833 ], - "commit": "d16aa9cf3e496aa9a6c20d73f4494e16feb4d092", - "sha256": "0iv3sy2zympi1r04aqmlrz64zjf9xy51v6yf329nqybm12mkqgsx" + "commit": "a517c813cd40597a2f9ecb2370607147846e2125", + "sha256": "1ib3bb9p3r2kblf0pmxhdsw9f3rpxqkaprwdf8ydfmj8frhwmsyd" }, "stable": { "version": [ @@ -64671,19 +65329,19 @@ "repo": "precompute/hyperstitional-themes", "unstable": { "version": [ - 20260215, - 1305 + 20260701, + 1314 ], - "commit": "b4bf851ea46ad4ddc8c45afc3c2d000d7f13bc4b", - "sha256": "1zqcy2zhgp2qfj4k01ns8pc7ff449gyrx4gfwlzny8cgmbv01fkd" + "commit": "18b5ee327f6e7e3d82fe3a274c351137e6e0cecd", + "sha256": "0qjp85836gv4kbq580xrqvdx92h4f0m0k2pyg8cw28nd1mwj85ma" }, "stable": { "version": [ 3, - 4 + 5 ], - "commit": "b4bf851ea46ad4ddc8c45afc3c2d000d7f13bc4b", - "sha256": "1zqcy2zhgp2qfj4k01ns8pc7ff449gyrx4gfwlzny8cgmbv01fkd" + "commit": "18b5ee327f6e7e3d82fe3a274c351137e6e0cecd", + "sha256": "0qjp85836gv4kbq580xrqvdx92h4f0m0k2pyg8cw28nd1mwj85ma" } }, { @@ -64946,11 +65604,20 @@ "repo": "jojojames/ibuffer-sidebar", "unstable": { "version": [ - 20210508, - 836 + 20260718, + 2134 ], - "commit": "fb685e1e43db979e25713081d8ae4073453bbd5e", - "sha256": "04x87gngmvyj4nfq1dm3h9jr6b0kvikxsg1533kdkz9k72khs3n3" + "commit": "b9b985f4ceb627521ed78cfdc4270305f3b0f272", + "sha256": "0hncjhbznkfjafhyc8nxyy0k8pja3qbkm2innalv45i5y2hli6ar" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "commit": "39299532ad8a040197b18ed2bce928524182c7b7", + "sha256": "0gxn5j4i5jjkzjkyzv42j3a3y6158b4ynj4vj6aznj4dzin8hm8s" } }, { @@ -65029,14 +65696,14 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20220622, - 1 + 20260516, + 827 ], "deps": [ "solarized-theme" ], - "commit": "c9fdf9a8f5ff417c206730a84731f64a95483935", - "sha256": "03a7mmaykwvmm9yc8ii5k5wgihl88kyq0amp2byjddl7f4mq7zak" + "commit": "78b6cb1fce4d7456d928c32a7799809103fbbc10", + "sha256": "08zlw6krpfd5116w4dawp07gp2636gfv6lizd5virm4qvg3s2cg1" }, "stable": { "version": [ @@ -65624,15 +66291,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20260209, - 1107 + 20260506, + 2033 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "d32b2396a8ad17820e308cd267f1b464a5235abc", - "sha256": "1vldwsmyaazrkcmff6qv5hlprsj37dvj7p01lphg6x20pv63c6av" + "commit": "22cc1bf237428b24de5f4f228db747e93a4ae619", + "sha256": "1rjk1xmx75r32giazj88jq392lakwvpa03a8xdwmifrw5kryrl5h" }, "stable": { "version": [ @@ -65734,28 +66401,28 @@ "repo": "KarimAziev/igist", "unstable": { "version": [ - 20251023, - 848 + 20260508, + 1037 ], "deps": [ "ghub", "transient" ], - "commit": "badbc1302e6f83cfebd304c6332b321ca3313f21", - "sha256": "0s96wv35dax1j4qa0c72l658317r34xbgmhvvl3lz6khac64k8s5" + "commit": "0735363f6b24910655e42e086e3a82ca5267dfc0", + "sha256": "1319nprmnrqwlqslrrm8wdzbjpyyj5gndrxnn7akkbg7x3lpsrp9" }, "stable": { "version": [ 1, 8, - 0 + 2 ], "deps": [ "ghub", "transient" ], - "commit": "badbc1302e6f83cfebd304c6332b321ca3313f21", - "sha256": "0s96wv35dax1j4qa0c72l658317r34xbgmhvvl3lz6khac64k8s5" + "commit": "0735363f6b24910655e42e086e3a82ca5267dfc0", + "sha256": "1319nprmnrqwlqslrrm8wdzbjpyyj5gndrxnn7akkbg7x3lpsrp9" } }, { @@ -65910,26 +66577,26 @@ "repo": "tarsius/imake", "unstable": { "version": [ - 20260101, - 1835 + 20260601, + 1510 ], "deps": [ "compat" ], - "commit": "c3d7fcc0d40676f47450891dc034511185566a0e", - "sha256": "1ch8ckb9gd89wr8v6150k0rnia54cbna9hxiivx3jnnr4lwn63lj" + "commit": "19447819b9e27421fff8381873489938978d220e", + "sha256": "01pp1n278hkgy7p6waq1gvm2l154fc1xzsbdyi2aw0bf69l53j3r" }, "stable": { "version": [ 1, 2, - 6 + 7 ], "deps": [ "compat" ], - "commit": "c3d7fcc0d40676f47450891dc034511185566a0e", - "sha256": "1ch8ckb9gd89wr8v6150k0rnia54cbna9hxiivx3jnnr4lwn63lj" + "commit": "19447819b9e27421fff8381873489938978d220e", + "sha256": "01pp1n278hkgy7p6waq1gvm2l154fc1xzsbdyi2aw0bf69l53j3r" } }, { @@ -65940,11 +66607,11 @@ "repo": "QiangF/imbot", "unstable": { "version": [ - 20260422, - 1521 + 20260606, + 428 ], - "commit": "d228085198669c559f670d48251bfc5399e72a63", - "sha256": "1jnyxyahzs8hm8bcnafzwxa08gvvqry3xgqaxd627wv5zddkyrbl" + "commit": "69d1551bbca9c991a4cfe3ccb133d862854ee1c7", + "sha256": "08jrx67m0zlvmbkh7l82z3xhysv3hna309w909gb1yb4g2c278qm" } }, { @@ -66166,15 +66833,15 @@ "repo": "skeeto/impatient-mode", "unstable": { "version": [ - 20230511, - 1746 + 20260426, + 1323 ], "deps": [ "htmlize", "simple-httpd" ], - "commit": "a4e4e12852840996b027cb8e9fb2b809c37a0ee3", - "sha256": "1cwascc08pzmvgjf0z5fh3w3jf85rgk13haz085qbdkhxsbivav2" + "commit": "4bb8009c6c6a6339a8fd7b4dea4a165af3721812", + "sha256": "1mic0g45g93r53zh8y1gdl0lkwpvdhi05jffz1jr8qq41jpp1886" }, "stable": { "version": [ @@ -66318,11 +66985,11 @@ "repo": "flashcode/impostman", "unstable": { "version": [ - 20250412, - 1521 + 20260714, + 1545 ], - "commit": "c1e764b16d32930d157e5bf2d2e6ac4dc3a23b8c", - "sha256": "0b0jg4kscd8n9kccqckv9zl14ymd4w4aa6krvb3bh446y7j3i1hl" + "commit": "afaeefd8db6e72cd3022821db5aa5e1b521549b3", + "sha256": "1kiwlws6m8pn42mdsq0v2077ikvj441fwwny112iqx3kkcjnpa0q" }, "stable": { "version": [ @@ -66389,11 +67056,11 @@ "repo": "zk-phi/indent-guide", "unstable": { "version": [ - 20260211, - 1005 + 20260629, + 918 ], - "commit": "f3455c6c798b568a6ea1013b7eea1153d2e092be", - "sha256": "18bmf426xbqlrz448i9aphw69zh8nki1zy1s59l9drz1h5h15n7r" + "commit": "1332f95d6f08afee35f62621793e2622b9f86f27", + "sha256": "0fk3qi3ncdyyqa0x07sm4y2z5fgwhmcqviicvhwmz782n8c6h8wd" }, "stable": { "version": [ @@ -66435,16 +67102,16 @@ "repo": "conao3/indent-lint.el", "unstable": { "version": [ - 20230822, - 46 + 20260516, + 852 ], "deps": [ "async", "async-await", "promise" ], - "commit": "aee76faf54a55e0bcb5dc07a667d7f5999299c9b", - "sha256": "19yixxsrwdm4wqch5011mk4gimsyh9rqzvrxkg7l7baa7am8v902" + "commit": "3660b10520d78dd545fd0c52d7e7a36dc602492d", + "sha256": "1r15nwxkb5d3zx7m1i5z8jmql551dcnq37czhk57v5madr6hggw6" }, "stable": { "version": [ @@ -66538,6 +67205,30 @@ "sha256": "1dx93qlzsl5zsinslgybd1lca6962dinzy91ndqijj7sicv9nd0r" } }, + { + "ename": "indigo", + "commit": "8dc4f277cf9a064587a614ef685774a4ef398534", + "sha256": "1vznkl2mh9zyr004gy0xnwkvwna2hxikpbxhvggmzqz4wg24n14a", + "fetcher": "github", + "repo": "gicrisf/emacs-indigo", + "unstable": { + "version": [ + 20260506, + 1617 + ], + "commit": "86433c884f5ef591ff8250b3322e5e9abd8a502d", + "sha256": "1aa6pgxqv37x26cm2fdxls5lyqr20v62zyghfm14w7lb1w0j6h6r" + }, + "stable": { + "version": [ + 0, + 11, + 1 + ], + "commit": "f9305632ca14dd27bef538007ff73ec941bbbd31", + "sha256": "083kkhc4hfxihib7b2kzkf1mh17wzv4l8hbf6nwalwp3rm92dzrn" + } + }, { "ename": "indium", "commit": "4292058cc6e31cabc0de575134427bce7fcef541", @@ -67001,20 +67692,20 @@ "repo": "jamescherti/inhibit-mouse.el", "unstable": { "version": [ - 20260314, - 1908 + 20260710, + 1610 ], - "commit": "93d7e3f3dc2a869f025f743e9fc0bedf1aaa82f0", - "sha256": "1s958as7d46ha1pa7v1fik5pqvqxajry3v476pa6sf5l9glx3a2c" + "commit": "0bda8fe615b093b837d78ccb110d3d37e81641a8", + "sha256": "1rwdwmpq8xy588hbvhaids462mcph4gb2k3iik3hwr67anqxdla7" }, "stable": { "version": [ 1, 0, - 2 + 4 ], - "commit": "89e009898dca46e07fed5fb313eb7bcdeb9d9714", - "sha256": "01jcgrqlwwihvdv0bm1lddlm933czgdnas7rbxhr5zvdys9gfimz" + "commit": "86cae75bbb771ea6be6269b925c39761be12b065", + "sha256": "1046g96qvvsz66qnhnk6x1d4a535cgk7qbhx6bqhr44vwzg0h1h8" } }, { @@ -67986,29 +68677,6 @@ "sha256": "0avxwa6d19i5fns27vwpl95f5iawm710jlnrihi5i21ndfm4mcyw" } }, - { - "ename": "isgd", - "commit": "d5ff75b269fd57c5822277b9ed850c69b626f1a5", - "sha256": "0yc9mkjzj3w64f48flnjvd193mk9gndrrqbxz3cvmvq3vgahhzyi", - "fetcher": "github", - "repo": "chmouel/isgd.el", - "unstable": { - "version": [ - 20241230, - 1331 - ], - "commit": "2dd030ab451cb9e704d173ee1b2388d92362db3b", - "sha256": "0wn6nx94pl7nc94bygm4vi1apzp2qlhfc3m2cg7myj9d2n5aa4xd" - }, - "stable": { - "version": [ - 1, - 1 - ], - "commit": "764306dadd5a9213799081a48aba22f7c75cca9a", - "sha256": "09hx28lmldm7z3x22a0qx34id09fdp3z61pdr61flgny213q1ach" - } - }, { "ename": "islisp-mode", "commit": "f276aa46506c784e1dc8caff8c5fa9885da4ba82", @@ -68801,28 +69469,28 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], "deps": [ "ivy", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], "deps": [ "ivy", "prescient" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" } }, { @@ -69275,6 +69943,30 @@ "sha256": "1i9f61x8pdf26p640gqjh7vb9a2yiqv915immbmbgrp6rmpdh48h" } }, + { + "ename": "jal", + "commit": "16eb6bd862f3dcac53b8b0badb8115c7da27e7ad", + "sha256": "0gal293igsxs3iygbjj5sh6ayqfg35jgw28pyr9rrdbkqqsj58hs", + "fetcher": "github", + "repo": "saulotoledo/java-agent-loader", + "unstable": { + "version": [ + 20260629, + 1417 + ], + "commit": "54cbd7a6b613dc6ac2135ada9de47130e0665d3e", + "sha256": "1k0n25rsv5y7aadcbz9xmny4g111km2177q7x73p6bzk7k8cwqqc" + }, + "stable": { + "version": [ + 2, + 0, + 0 + ], + "commit": "54cbd7a6b613dc6ac2135ada9de47130e0665d3e", + "sha256": "1k0n25rsv5y7aadcbz9xmny4g111km2177q7x73p6bzk7k8cwqqc" + } + }, { "ename": "jami-bot", "commit": "aeb2ddddedbccaf65b670458cdca86e884e7a56b", @@ -70023,25 +70715,25 @@ "repo": "minad/jinx", "unstable": { "version": [ - 20260325, - 1326 + 20260519, + 1041 ], "deps": [ "compat" ], - "commit": "70d7a0680edcb0db74b0c9c89a5b5bf4de3eeb20", - "sha256": "113zjfa98qgvs9i96sdmbn82gyi1vsfnkmivim3q4ga7a8h1d4xk" + "commit": "987b9f90eb10df53c34c0f4972469875c1e93203", + "sha256": "0vb7vdv168wpn7pxcnkj2lqkc2y50ig7inr5l7z2mbx5xasgkb7y" }, "stable": { "version": [ 2, - 7 + 8 ], "deps": [ "compat" ], - "commit": "61bed3f77d37ae02100e8a2ec1cfb849d649fa5d", - "sha256": "116kah9l2bw3a6a8hgvqb9bqb388m63j5603vlybgafkra46gjwl" + "commit": "987b9f90eb10df53c34c0f4972469875c1e93203", + "sha256": "0vb7vdv168wpn7pxcnkj2lqkc2y50ig7inr5l7z2mbx5xasgkb7y" } }, { @@ -70643,14 +71335,14 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20241205, - 140 + 20260627, + 1342 ], "deps": [ "cl-lib" ], - "commit": "e0c302872de4d26a9c1614fac8d6b94112b96307", - "sha256": "1midf8yib70k6kh50a2r7g9xri2jvvglz4rchjw89wl2zqyl1p91" + "commit": "41d0e7f5ef51109c682016baa6fc6846e03e8517", + "sha256": "16y7cdjkg1q1lr1svd0g43sqlplj67yacdfbmax4iw7fv91iac66" }, "stable": { "version": [ @@ -70794,15 +71486,15 @@ "stable": { "version": [ 0, - 4, + 3, 0 ], "deps": [ "dash", "s" ], - "commit": "5b514ad23834b7a584b184125ba4a66bc3c26cff", - "sha256": "0j99rax3n905ya0ya42093pl8q7kcb8xx2qz6b918f7d8q0mr44n" + "commit": "623994bb50d845de487c100f5cd393ce1d792460", + "sha256": "1aza1p747i6bz2xg2vz63isbnh8agkdffsd7mdxb9xdfnn9cik6f" } }, { @@ -71056,11 +71748,11 @@ "repo": "iwahbe/jsonian", "unstable": { "version": [ - 20250507, - 1231 + 20260612, + 2214 ], - "commit": "513219ebb3ccdefc915715e4bf2dd6e718fabccd", - "sha256": "0liyv5lgx8lp7gkkljr7crich03w6w07i0jx1qifpxpq4rxmwpi0" + "commit": "2709fb0140c92eb183c849fdc530fd59f4e4fd3d", + "sha256": "1alqaynlrwqnakq2x03xh66jbh7365rsbdnip39xwxwfjnkblj0g" }, "stable": { "version": [ @@ -71246,11 +71938,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20260204, - 807 + 20260529, + 1424 ], - "commit": "aadf29523a120c666939cd7adac4b7dece5bd6ef", - "sha256": "0kw79pz3l40d533hhrrw21hskayr38nffnp0cnwjq0zv9fvxwin1" + "commit": "1b5a4c2f5b7c3f842785985bf8778b8805cc6766", + "sha256": "00by1x900gzg42lwzd59awhsl5z73pna4cmzjpp2dflwvddy7vn6" }, "stable": { "version": [ @@ -71317,8 +72009,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20260403, - 453 + 20260713, + 1343 ], "deps": [ "dash", @@ -71327,8 +72019,8 @@ "s", "spinner" ], - "commit": "3c0beddcd21464d52e95e65ee8b3d7b3a148d83d", - "sha256": "1p00j4lh9nhkim0lg1f0swvv5lsn54w9qk1g2pjxldrfsad7bqwg" + "commit": "6c545d67e93590d1155b60e79384481438cb7527", + "sha256": "0n9isijm9x3ansmvg4m81kd4vzrzs8xlyn6n6qia622csqjfxbw1" }, "stable": { "version": [ @@ -71355,14 +72047,14 @@ "repo": "JuliaEditorSupport/julia-ts-mode", "unstable": { "version": [ - 20250115, - 1449 + 20260616, + 1624 ], "deps": [ "julia-mode" ], - "commit": "d693c6b35d3aed986b2700a3b5f910de12d6c53c", - "sha256": "0jg59d6q4lab2p5d2f8yp95xpbqkc614ayl137mv14l5apgayvbc" + "commit": "d53fb5b2c7e83223dcd8c7ae6bd5e1abf18665f6", + "sha256": "16iss4q0arlggwdgqjjwj8flywk6h53ylzf5m1ig1jxkl8vqpiby" }, "stable": { "version": [ @@ -71600,10 +72292,10 @@ "version": [ 0, 1, - 8 + 9 ], - "commit": "d7f52eab8fa3828106f80acb1e2176e5877b7191", - "sha256": "103jwkmg3dphmr885rpbxjp3x8xw45c0zbcvwarkv4bjhph8y4vh" + "commit": "b6173c7bf4d8d28e0dbd80fa41b9c75626885b4e", + "sha256": "1czf779akdcx72ma7x9v70kjbic73312fi1czbzvlvxr01pjpyj0" } }, { @@ -71619,6 +72311,15 @@ ], "commit": "94f788eccb13cd3ade827af5612ffe3cad5fddf0", "sha256": "0rzgj007bjjlrgknhsdpk7vfhqpp9r1yxkhsj2a4ijg3rxw9s802" + }, + "stable": { + "version": [ + 0, + 1, + 9 + ], + "commit": "9dd136bc809de85fa66a4665312eb0f55b1c8094", + "sha256": "0gmimdy2isfmyf622926y3w0a0fxm1q98ry0lbqjjvhfq9i2h3mc" } }, { @@ -71629,8 +72330,8 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20260228, - 1147 + 20260513, + 850 ], "deps": [ "f", @@ -71638,8 +72339,8 @@ "s", "transient" ], - "commit": "4a149c0ad91f60c4d4338e7aa0676ad792a52eca", - "sha256": "01wg76330lcff8bd83ym65yhbbwp48yrr2crafn2bdlncgd4whqy" + "commit": "2b6e5f8d2d16e7c535553dcb9c496f8bd1bb827e", + "sha256": "01fqxpkyv1l1hqmsjc50g65cdq5fd3wx9id3qgzng9f7vc2dmfh9" }, "stable": { "version": [ @@ -71694,11 +72395,11 @@ "repo": "joshbax189/jwt-el", "unstable": { "version": [ - 20251022, - 2118 + 20260514, + 2219 ], - "commit": "d6754f8fab6ff4041a7bece1963495e99ad9fe68", - "sha256": "0crqy2r2bx03f2z7pg1h2qm7csx3ncxqbya4bz976ssq0p7mljnv" + "commit": "83bcef37c311645a07c0263007c5b962ca3dab15", + "sha256": "0kawf3f59cizq730dyh7avkb774lw773vb7wvqjnygjqky8kqirj" }, "stable": { "version": [ @@ -71998,11 +72699,11 @@ "repo": "Fabiokleis/kanagawa-emacs", "unstable": { "version": [ - 20260413, - 1643 + 20260625, + 2142 ], - "commit": "c0ec6694a6574ad2d54ca671de2093c81b54888a", - "sha256": "1bk7x77a11nlnfl0z40bvyi0c86vyfncjrk1dggs79qw9bnx04i2" + "commit": "fe06241196bf9c77df751cfd74a984b5d8a45ba4", + "sha256": "0g4mr3y69zdi9hvw7d3mv7k2jz7a5xggyyh4sarwibwgxckbkfrp" } }, { @@ -72077,28 +72778,28 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20260114, - 2021 + 20260619, + 2211 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "fc0337582f36167b74cbdc86a48471092c8f3262", - "sha256": "1lbqvs2jqvs6x8gj7bali24mw2fl6gk184zln6avy6wmam7n8dqi" + "commit": "432c6672b16e867ec40eaf312d2fbbeb38673fa9", + "sha256": "0jsxmi4l2kjpfgfbacixcbxdr1sz45qj5y2hz447fca8y9875p9y" }, "stable": { "version": [ 1, 7, - 4 + 7 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "fc0337582f36167b74cbdc86a48471092c8f3262", - "sha256": "1lbqvs2jqvs6x8gj7bali24mw2fl6gk184zln6avy6wmam7n8dqi" + "commit": "8dc98bd1a63aa35e44ff8b3fd1be6d6afd4e2301", + "sha256": "1133gw5fnfj5plg4ny2lkhzsqsd6624fbnfh822p9dqxfmfckb1z" } }, { @@ -72109,11 +72810,11 @@ "repo": "gicrisf/kaomel", "unstable": { "version": [ - 20250923, - 1958 + 20260615, + 1304 ], - "commit": "9476f16a72e61f08f403cb4dbe860e39f1856c7a", - "sha256": "04k36fjd165isbbb5vz0nl945k0b73z62hs271ivp74z6f8nfafg" + "commit": "652b31cc8437d87b65e618af9428229182ea595c", + "sha256": "1na4jn2w147sl3qq4jxnfz98qv5cfydrhvdny7pd3z4mlj9w5f3f" }, "stable": { "version": [ @@ -72300,11 +73001,11 @@ "repo": "conao3/keg.el", "unstable": { "version": [ - 20240713, - 1007 + 20260527, + 831 ], - "commit": "e1726f89dab1811a110eebb3f3e4b673742faf05", - "sha256": "02wwr40jxny9w0xnjwi4n40hn5jmdkkzng4rml846hw4ih1vxc0k" + "commit": "91030f36115ce50c4f812b95b169aeaffdd0e042", + "sha256": "1jlwd71ba6ahcbl1dydhx63c5wxsh4kdml1jjs9zc75sd18j69k4" } }, { @@ -72532,26 +73233,28 @@ "repo": "tarsius/keycast", "unstable": { "version": [ - 20260101, - 1835 + 20260601, + 1510 ], "deps": [ - "compat" + "compat", + "cond-let" ], - "commit": "b831e380c4deb1d51ce5db0a965b96427aec52e4", - "sha256": "1bn30n0b0wsvzhpa4qsghh5acb82r07sw82xjwjqq26kckfisvkx" + "commit": "a6518e1b48b08ba883e9b1a2db0872d5bf3d85f4", + "sha256": "1q4mfxy0022hw07nh2rqii1wkmk5za5hx5jdaqmb7xkj5z12cxj3" }, "stable": { "version": [ 1, 4, - 7 + 8 ], "deps": [ - "compat" + "compat", + "cond-let" ], - "commit": "b831e380c4deb1d51ce5db0a965b96427aec52e4", - "sha256": "1bn30n0b0wsvzhpa4qsghh5acb82r07sw82xjwjqq26kckfisvkx" + "commit": "a6518e1b48b08ba883e9b1a2db0872d5bf3d85f4", + "sha256": "1q4mfxy0022hw07nh2rqii1wkmk5za5hx5jdaqmb7xkj5z12cxj3" } }, { @@ -72629,32 +73332,34 @@ }, { "ename": "keymap-utils", - "commit": "c03acebf1462dea36c81d4b9ab41e2e5739be3c3", - "sha256": "0nbcwz4nls0pva79lbx91bpzkl38g98yavwkvg2rxbhn9vjbhzs9", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "00xjczwi1f2wzjp556p94kn7b5gkvb9gmblfqx0rpk4y6akn8afw", "fetcher": "github", "repo": "tarsius/keymap-utils", "unstable": { "version": [ - 20260401, - 1221 + 20260601, + 1550 ], "deps": [ - "compat" + "compat", + "llama" ], - "commit": "46e4aeb2801740a69f4ab5411579cc9cb2f0e786", - "sha256": "0bgx2v23z8iq04f8d3zyga9729l7arqyv6id0qc7br9yacj5x4jc" + "commit": "3064e5ffe98458500c75bf7c854c45d3e60e8e90", + "sha256": "1a0n5k19ra3k0chsc8j74b6rcnaf3jdk0hi28f3g600h3ivccfxl" }, "stable": { "version": [ 4, 1, - 3 + 4 ], "deps": [ - "compat" + "compat", + "llama" ], - "commit": "46e4aeb2801740a69f4ab5411579cc9cb2f0e786", - "sha256": "0bgx2v23z8iq04f8d3zyga9729l7arqyv6id0qc7br9yacj5x4jc" + "commit": "3064e5ffe98458500c75bf7c854c45d3e60e8e90", + "sha256": "1a0n5k19ra3k0chsc8j74b6rcnaf3jdk0hi28f3g600h3ivccfxl" } }, { @@ -72827,20 +73532,20 @@ "repo": "hperrey/khalel", "unstable": { "version": [ - 20250910, - 946 + 20260709, + 655 ], - "commit": "f7cdb3246d193a518b3a4ca7381ffb6ed8087fcf", - "sha256": "06h5272kmg0ykf0zqdy2qwhlzszqsw176l1brk04bg8xyc3a4384" + "commit": "3691b4545eaef5a246f020f57bd0f843cc9c84ef", + "sha256": "1g9cjiyajh3j175chf5lr8z857aim0h82sxnjh757cw4jz94kfzl" }, "stable": { "version": [ 0, 1, - 15 + 16 ], - "commit": "f7cdb3246d193a518b3a4ca7381ffb6ed8087fcf", - "sha256": "06h5272kmg0ykf0zqdy2qwhlzszqsw176l1brk04bg8xyc3a4384" + "commit": "3691b4545eaef5a246f020f57bd0f843cc9c84ef", + "sha256": "1g9cjiyajh3j175chf5lr8z857aim0h82sxnjh757cw4jz94kfzl" } }, { @@ -73032,20 +73737,20 @@ "repo": "jamescherti/kirigami.el", "unstable": { "version": [ - 20260416, - 1901 + 20260613, + 1820 ], - "commit": "5236f011f420465c2abd853e7f16727c0c8eab7d", - "sha256": "1awvliza7fva0a74lf6xqx7gzfbby5kr7z4ki818yd98z4x1rqxf" + "commit": "948cccf6499415005a43112e5daadc6ecc57fa1c", + "sha256": "0203slgl1wal7x6hygwc2hkkm92i95cq6n0abgc0x8bnkkm7n0v5" }, "stable": { "version": [ 1, - 0, + 1, 5 ], - "commit": "7038a9dcfa7e2d8848817508777d8ad878756cfb", - "sha256": "1j6l2nm5jv96636sz9w9yf32vcmkc5n9zylh6k1vf5gidgwlgxni" + "commit": "77e967baf830aa411404ed695826f0b589bdc28a", + "sha256": "03ql2x4npkw60mjvfn83gnp6dbshf6ikhj7558mwdk8qi695q2fc" } }, { @@ -73166,14 +73871,14 @@ "repo": "benotn/kkp", "unstable": { "version": [ - 20260306, - 1633 + 20260706, + 858 ], "deps": [ "compat" ], - "commit": "73957230ffdd3dedf16f4436f61471bd1365abf6", - "sha256": "1j5igiys8asjg0v18flc7p71xjynqi7v8s06qgkac8djvjamd4lh" + "commit": "82b7443e10a2ba287467b62e90b6adb6dd93dc99", + "sha256": "10iwwd2jn2hy8m5pqpl9sdvx2m9s1pcjpfpqj8i7d6mfr9pjqy6z" } }, { @@ -73184,11 +73889,11 @@ "repo": "tomenzgg/emacs-klere-theme", "unstable": { "version": [ - 20250517, - 452 + 20260526, + 323 ], - "commit": "377cc33617184e23acde6707beaf8938915fe093", - "sha256": "15rgq1a6k64ws0fh864awnw22qzpb58z5s2gj2cp1svw4yakr84w" + "commit": "332d93b22f0359150c8dd8de710ffed09c34664f", + "sha256": "1x3z1j33w3pj6mhj07lgclzmf9cwgx505mn4gvlpshwlxwp6ms0w" } }, { @@ -73392,11 +74097,11 @@ "repo": "bricka/emacs-kotlin-ts-mode", "unstable": { "version": [ - 20260326, - 930 + 20260512, + 1409 ], - "commit": "136d8d1fd3158fc5558aff866041c1935b574588", - "sha256": "15iqvbv8i3n27yssfr47fh75ir89a6jxicp7vi8jk51a45symhnf" + "commit": "39e30e4cf803910c2f6716efd7a5cd408a9d996b", + "sha256": "1zabj07ffmi9g0vv74xkrwim7dwx3hsirr9abaxh6acwykp2ma6d" } }, { @@ -73552,8 +74257,8 @@ "repo": "abrochard/kubel", "unstable": { "version": [ - 20260423, - 1353 + 20260508, + 2043 ], "deps": [ "dash", @@ -73561,8 +74266,8 @@ "transient", "yaml-mode" ], - "commit": "b6581c657830c21a58aba5df5239cf7ece44f1c9", - "sha256": "03qrdr0gf5a560ywwjj1xwq9xh19v1rliwjjdklhcq6qacaxvq0k" + "commit": "f2d64227c6d2ce0a3a9023345b230b5b2b30d147", + "sha256": "0sij8hi8h92ryp6vphs4hpqvw5r19k5q7cr0r6aifqfk4di61j7q" }, "stable": { "version": [ @@ -73773,6 +74478,36 @@ "sha256": "14n6mg9ph8a3gmglj9gnapwh0zc6mn400a0nh961d5y8i8qqc1y6" } }, + { + "ename": "kusanagi-theme", + "commit": "537d8f60b711bf9ac5523e61c5da7b857765523d", + "sha256": "1rc44skay54jhhlqcf75qqxw51ymsjjrf50ml29s9iyq7klv9zgp", + "fetcher": "github", + "repo": "LionyxML/kusanagi-theme", + "unstable": { + "version": [ + 20260629, + 307 + ], + "deps": [ + "modus-themes" + ], + "commit": "9bc24e173addb206a583fcd23086d79cd3e6c360", + "sha256": "18xk63g63kxn7qxakjjmrpjvy6f63mjhk6z4an2wzp0011yrkxq4" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "modus-themes" + ], + "commit": "9bc24e173addb206a583fcd23086d79cd3e6c360", + "sha256": "18xk63g63kxn7qxakjjmrpjvy6f63mjhk6z4an2wzp0011yrkxq4" + } + }, { "ename": "kv", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", @@ -73843,8 +74578,8 @@ "repo": "isamert/lab.el", "unstable": { "version": [ - 20260419, - 1535 + 20260715, + 1437 ], "deps": [ "async-await", @@ -73854,13 +74589,13 @@ "request", "s" ], - "commit": "b91086760688328e032af454c1ca3ae5061356dc", - "sha256": "003pm093zrx6qv2sa959sws74a4h0w8g2mcyjyqsvm0xxjshzifw" + "commit": "6a23522b5d451234d5f799caaef385bab7ff7df2", + "sha256": "0ki2w7p3wq5prb9aidg2qni5807rvjimrgy907cn338i9kpaiw8j" }, "stable": { "version": [ 3, - 7, + 8, 0 ], "deps": [ @@ -73871,8 +74606,8 @@ "request", "s" ], - "commit": "aa3af6f8e2eb16edac2b680ecddf4823f94287de", - "sha256": "12xb18ssn5zf9gy2px2x6mnbjh9bny1rf7kldlvv84s86iiqzxpl" + "commit": "2be6e50e75b4372337b77d0ae5563cb8cd671352", + "sha256": "1d0q7ssm9ynhd1da34by6a5zwbyzq20x8bqky9hf0fk28m9xpjjh" } }, { @@ -73961,16 +74696,16 @@ "repo": "Deducteam/lambdapi", "unstable": { "version": [ - 20260423, - 1057 + 20260701, + 916 ], "deps": [ "eglot", "highlight", "math-symbol-lists" ], - "commit": "fbbe050639dfe7c1c1f2be2e6807dd31e3108e5e", - "sha256": "11jpn7w0iy4vp555hsc425ipjzsv0ajhph1ih5ajqkn2lxd46b8v" + "commit": "d4fcaa80d2ac820be9928e4c75a6a0ad723d2c30", + "sha256": "1363z64si20xa3y86vpm7dnngyyq8s388zkzc4v5cllkkicz8bav" }, "stable": { "version": [ @@ -74379,28 +75114,28 @@ "repo": "enricoflor/latex-table-wizard", "unstable": { "version": [ - 20260212, - 2229 + 20260504, + 128 ], "deps": [ "auctex", "transient" ], - "commit": "681c03010e38e8cb4089171be72d73e6d28cd472", - "sha256": "1v5dwidr9gvlqdspalr1iqw7gdcyl6lyji4cl8dddj9rmyf3x8rw" + "commit": "0ccd242ba521ed3b323d1dc84f49febe80b2eec7", + "sha256": "0mf7r22n51wyrdbsb5jm1jfhcivifz6d5l029wv3p5p88mylx2ks" }, "stable": { "version": [ 1, - 5, + 6, 0 ], "deps": [ "auctex", "transient" ], - "commit": "b41aac096b96aeb446346c3cbd6537cc0eb1f70d", - "sha256": "03sj7kq9xwak5mzllvgjq5ysarph55rxknn09dgdn8fs74hlifcb" + "commit": "0ccd242ba521ed3b323d1dc84f49febe80b2eec7", + "sha256": "0mf7r22n51wyrdbsb5jm1jfhcivifz6d5l029wv3p5p88mylx2ks" } }, { @@ -74704,6 +75439,30 @@ "sha256": "02pyqgml6mfsj70qvingq8ff2qvfs35nb28z465mqpcgfvb8xapv" } }, + { + "ename": "leadkey", + "commit": "20a81a260cec3d49dd1ebde86bf99b9bf3f3cd8e", + "sha256": "1s03n14nzqmp1p7shz9ym0n7p8plhc9wzlfw20krmg7xcqy91dmz", + "fetcher": "github", + "repo": "jixiuf/emacs-leadkey", + "unstable": { + "version": [ + 20260706, + 257 + ], + "commit": "a7bf4c8a5bfee908c5287ebe86dcbaddd2b0fb8d", + "sha256": "04d7l0gnjm92r9l8q7j9iqwhsk6w5n1vf494yysbjafhva49q6wg" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "61042efbbde72e096e74833eeebdcdf9599cab7c", + "sha256": "1z43875hnqv4xz383ahs035v41n39ycnm9r10s7qamy6sv5rvj99" + } + }, { "ename": "leaf", "commit": "24afe5b39979e2f17e104ae97d840645d2a5c2f1", @@ -74736,16 +75495,16 @@ "repo": "conao3/leaf-convert.el", "unstable": { "version": [ - 20210816, - 1103 + 20260516, + 853 ], "deps": [ "leaf", "leaf-keywords", "ppp" ], - "commit": "da86654f1021445cc42c1a5a9195f15097352209", - "sha256": "14pvdkknbng44frlf8accpqd1bc9j99x7xjymgrdbyczbq2srv4n" + "commit": "37967565c023596d863d9cd45527a024c5922553", + "sha256": "0vfj01b37im8wqzn4rnbl9wqxgsb8pcandzmnk9d3bhb1scg3lx0" } }, { @@ -74756,15 +75515,15 @@ "repo": "conao3/leaf-defaults.el", "unstable": { "version": [ - 20210301, - 118 + 20260516, + 827 ], "deps": [ "leaf", "leaf-keywords" ], - "commit": "96ce39d4f16736f1e654e24eac16a2603976c724", - "sha256": "1z56x3wnyakilgxak2yyf6rf35072996szxfz712lmdwqs6xfqv4" + "commit": "238282d31d20c9b5077d7274ba9448eaaf0d44cc", + "sha256": "0wxzs107fp8hsbm9r2nb4chw9qvwkf72nn49ki1wwd8za205d8vj" } }, { @@ -74775,14 +75534,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20240808, - 2302 + 20260516, + 827 ], "deps": [ "leaf" ], - "commit": "82ec27e3441900daedeaaebca509181f964da81f", - "sha256": "0nsa01d35z3dvvb6dnc43ii461c15pp35ji92k15x8z9nyr25wrd" + "commit": "36efb8c94071c0fd98b6534866297f2238b78630", + "sha256": "0sfrjiwrzyphmwyh2yxzgw46js7jiwrnm10hhaqkzrqalvh4i68h" }, "stable": { "version": [ @@ -74836,14 +75595,14 @@ "repo": "conao3/leaf-tree.el", "unstable": { "version": [ - 20211105, - 19 + 20260516, + 827 ], "deps": [ "imenu-list" ], - "commit": "89c3b8842df067bba67663d309f43aa311acdccd", - "sha256": "0him39wsl65nmml9as8gfrix707xjxwvjkwmrgxc9qfjwcxvbvsj" + "commit": "6c85ef64bb21ddbd64e70625dbd59b0539fac534", + "sha256": "1n3h5mk7j295br17nx9vfn8v6sx1683wdnyd5j8scwqc7qwgf9ds" }, "stable": { "version": [ @@ -74948,11 +75707,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20251219, - 2350 + 20260709, + 1534 ], - "commit": "40e6a167530e21968e3ce7b8cb74e7595cb6009a", - "sha256": "020sm0ljnbx389cspn1blz1d19w6sx4j68cp39b8hb9h9xdd4n55" + "commit": "f7761ab7070e8c0c1cfb97e571ba81c3377a7447", + "sha256": "1qb4lrp5f2p1gcfrpbh86xcwggc8ffz62rq4lj6v4klyjyk52h2y" }, "stable": { "version": [ @@ -75036,27 +75795,27 @@ "repo": "martianh/lem.el", "unstable": { "version": [ - 20250806, - 924 + 20260509, + 758 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "a0f4fa89fe73dfe7412f5d25d6e0619abf8cff14", - "sha256": "181cibmv6da4rjr6p3nqpza6i7v4scc4qndznhyjb9nhbf3gsil4" + "commit": "3abd1604c3ab9451dcbc087099c499e6dc8882d7", + "sha256": "1h28bwy0nd08lxvpqdxqcbg0n2j09ilb7rf3nj6csflz64nhg40x" }, "stable": { "version": [ 0, - 24 + 25 ], "deps": [ "fedi", "markdown-mode" ], - "commit": "a0f4fa89fe73dfe7412f5d25d6e0619abf8cff14", - "sha256": "181cibmv6da4rjr6p3nqpza6i7v4scc4qndznhyjb9nhbf3gsil4" + "commit": "3abd1604c3ab9451dcbc087099c499e6dc8882d7", + "sha256": "1h28bwy0nd08lxvpqdxqcbg0n2j09ilb7rf3nj6csflz64nhg40x" } }, { @@ -75322,15 +76081,15 @@ "repo": "alhassy/lf", "unstable": { "version": [ - 20210808, - 1921 + 20260502, + 1103 ], "deps": [ "dash", "s" ], - "commit": "35db92ca765a0544721fdeea036d77b7d192d083", - "sha256": "0c22347dfrjdrn0cn4bqqsw8gd1663hkgycxkfivpyg0d734g5nq" + "commit": "dbe5a7c66c51d1a3036eb33d13c0a0a399349dda", + "sha256": "0ljr174ni05mbp2b169d96qkik2kzpqr4rqp5px9v0rs22v0g50g" } }, { @@ -75434,26 +76193,27 @@ }, { "ename": "liberime", - "commit": "0ccac33c02762314d997156df4627c0c4a0279c6", - "sha256": "0i95vjn4rw7n4f83nrxjkmilzalgmjlmyhsvwfm4n1rqfqdwkl5h", + "commit": "41d8e39c6f7bdade9b13c27ee1290dad21b4877f", + "sha256": "0vwmfr0lk7fmxfg7bdi6kcsaaz5hvv4rvfzdkv7klpvp89dvjvzz", "fetcher": "github", - "repo": "merrickluo/liberime", + "repo": "emacs-rime/liberime", "unstable": { "version": [ - 20260427, - 303 + 20260715, + 958 ], - "commit": "2130baba8e5e15922650bc01de95a1d6c6a1c1f7", - "sha256": "0zr0hk11xani4pn0yv2xlpfwargv33q610w0yw6ac1r91bn9r9z9" + "commit": "64db15eca098f3d3942e9f83422e12711dbe2ecb", + "sha256": "1nhrxh3wawgxjky2zklkc8qnwjrxxzhsl47lv4yk7wa67k4667nb" }, "stable": { "version": [ 0, 0, - 9 + 10, + 1 ], - "commit": "2130baba8e5e15922650bc01de95a1d6c6a1c1f7", - "sha256": "0zr0hk11xani4pn0yv2xlpfwargv33q610w0yw6ac1r91bn9r9z9" + "commit": "8e52f3128e553a9b0cf270ead5c8cca4de2dd0d8", + "sha256": "0mq106yppl9kkqfyvbxma4d9k88bqpvwk6b6lcyr8kmkd2bd6n8f" } }, { @@ -75616,19 +76376,19 @@ "repo": "tmythicator/lichess.el", "unstable": { "version": [ - 20260203, - 1027 + 20260710, + 914 ], - "commit": "1dd8a25ede7144c5d6be1f45f4ae3d07903783cd", - "sha256": "157l4crbz37x367m69sxwvnd1pd8cqa6w0lcvyyvs27cm021d2gr" + "commit": "572a6a353e2113c8a95564b9bea1f2896e6d3dab", + "sha256": "1d87qjmdpizggkrzq39i9vqgvbpjf5mv97vm7zy28ksbqxmfasqa" }, "stable": { "version": [ - 0, - 8 + 1, + 0 ], - "commit": "1dd8a25ede7144c5d6be1f45f4ae3d07903783cd", - "sha256": "157l4crbz37x367m69sxwvnd1pd8cqa6w0lcvyyvs27cm021d2gr" + "commit": "572a6a353e2113c8a95564b9bea1f2896e6d3dab", + "sha256": "1d87qjmdpizggkrzq39i9vqgvbpjf5mv97vm7zy28ksbqxmfasqa" } }, { @@ -75663,11 +76423,19 @@ "repo": "mickeynp/ligature.el", "unstable": { "version": [ - 20220808, - 1225 + 20260714, + 655 ], - "commit": "89cbd67a815f61e5001f19d64d6ec1771e867742", - "sha256": "106p73km11kzins0bx01n6ypz8if20g56ljx0dnnq0fi6hsn87d7" + "commit": "5ef919d3e3e2cf2c4622cbea28e429b29e86fc97", + "sha256": "1pjq8bka1ppfvijhlv55bzk3rf0xdm10jy4sfslzb4094lvdd3w1" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "b732c7c57d06bda30d31fa6b52758a94490d0710", + "sha256": "0c3wgcgvk0wxk3dwgpl7y7w0y14z68qkcck099x42qsxix57amjw" } }, { @@ -75887,11 +76655,11 @@ "repo": "Judafa/linkin-org", "unstable": { "version": [ - 20260313, - 2013 + 20260617, + 2114 ], - "commit": "daab39c4e3dc5d77c55630e26f8b0339ae218dd1", - "sha256": "0iy6vipdf74ggz14brnj3hljq75kj2dfg49vlv0p85x0a5aacv1y" + "commit": "51d7c2c2689c0cfd48f91986d36ffdabea57369f", + "sha256": "02ym261g4y8k98b4f78fbjb9alk844h8p3snck4q4n7f6371w6sl" } }, { @@ -75902,11 +76670,11 @@ "repo": "erickgnavar/linkode.el", "unstable": { "version": [ - 20240604, - 53 + 20260605, + 352 ], - "commit": "5152aa3ba7a4360133efd5892f0891837af30440", - "sha256": "0c9ly7lf1ydn3zjqn265vkjq4n4qn3xvr4lhs66gh2krk8qrm9cm" + "commit": "8bfb80ca046bc0c942a14effef354722ad8a8a6c", + "sha256": "151115q9c1l87c4kv60nv4py0h121wrxr5xs2asibh9p3773zx3m" } }, { @@ -76011,17 +76779,17 @@ }, { "ename": "lirve", - "commit": "67708cb34ff0000d571b732792e7d7d82bd4084a", - "sha256": "160k3kpc0ldxzbqhnvd71jmslwjnbh8cmy474d07ccqjcsn8mkb0", - "fetcher": "github", - "repo": "tanrax/lirve.el", + "commit": "1d1a6da1f377c3b1b4a33cbc6e1183689d74cc77", + "sha256": "1vgq6svl2i316qbdsigwsr5mvmgzgjdmn92ksmzacl7x4mx3fh58", + "fetcher": "git", + "url": "https://git.andros.dev/andros/lirve.el", "unstable": { "version": [ - 20240419, - 1918 + 20260708, + 1737 ], - "commit": "ff3031fa82d854411da40a32c6191d201b4abf09", - "sha256": "1m4bg931w83vyhrpgsmdyl6hkknnd99mmvj34g0drhb9170sx0kb" + "commit": "b8dfa92eb51bde15c269dede50342f0b94240a49", + "sha256": "1pwhbkdz6w0b40jwgr68w8mdx8wjfdmgdvfnxssfrjc1829brbkp" } }, { @@ -76071,26 +76839,26 @@ "repo": "ryukinix/lisp-chat", "unstable": { "version": [ - 20260323, - 206 + 20260425, + 1217 ], "deps": [ "websocket" ], - "commit": "cff980c915db1e47d3090c212050b7598d15daca", - "sha256": "02fiyky63z4zr6x4xyf72d457f4x8fqraax3lk13zwjlxv1nn2xd" + "commit": "066f2a5d4ca2ff50f6a0a1413182e08f17040e3a", + "sha256": "0qqnn5pb7qghn3ryrixjzgb9vabgm96n10l189j9izr5zfzg194f" }, "stable": { "version": [ 0, 9, - 0 + 1 ], "deps": [ "websocket" ], - "commit": "cff980c915db1e47d3090c212050b7598d15daca", - "sha256": "02fiyky63z4zr6x4xyf72d457f4x8fqraax3lk13zwjlxv1nn2xd" + "commit": "066f2a5d4ca2ff50f6a0a1413182e08f17040e3a", + "sha256": "0qqnn5pb7qghn3ryrixjzgb9vabgm96n10l189j9izr5zfzg194f" } }, { @@ -76368,14 +77136,14 @@ "repo": "zzkt/metabrainz", "unstable": { "version": [ - 20230530, - 741 + 20260603, + 1009 ], "deps": [ "request" ], - "commit": "2386189ec8a19a74d7b8a46e08a9fa6d974a6305", - "sha256": "0lkqgjzp5lwjv1j6jjal4nsps3cxdg1nc2rr83v5a3gylsy0x69w" + "commit": "abd37d9f1c25a021b32eac54e6deff6080a66bca", + "sha256": "1kri05wx2r88pbh7pvwkcz4csi8g5qn1bjb31nbda6vs39db8l6m" } }, { @@ -76578,11 +77346,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20250103, - 132 + 20260621, + 1253 ], - "commit": "c559eff46dd7fe0ffc4ad7bf6dd65ee5be516368", - "sha256": "1h8j16hqhncbfa6nf046qfzhplzqql9i2jjwx1kmqnyxfcvv1zs6" + "commit": "6cbe22aab87886cf61c4866653e24ebdb88b1523", + "sha256": "0xaz583wvk6510027kp73p7swkdi8z7929k8p0jmpav2x5n1207d" }, "stable": { "version": [ @@ -76828,26 +77596,26 @@ "repo": "tarsius/llama", "unstable": { "version": [ - 20260301, - 1253 + 20260601, + 1455 ], "deps": [ "compat" ], - "commit": "d430d48e0b5afd2a34b5531f103dcb110c3539c4", - "sha256": "07rjfjk01gd4jqk38wc0a2vrsk15p8sx0varqbhjdyns7w2xs1d7" + "commit": "4d4024048053b898a01521046e0f063ee47615b0", + "sha256": "1qya4drpfnr25lgpagxzi22llrvs9ysqgfhs3093ly2k4pi28nvk" }, "stable": { "version": [ 1, 0, - 4 + 5 ], "deps": [ "compat" ], - "commit": "d430d48e0b5afd2a34b5531f103dcb110c3539c4", - "sha256": "07rjfjk01gd4jqk38wc0a2vrsk15p8sx0varqbhjdyns7w2xs1d7" + "commit": "4d4024048053b898a01521046e0f063ee47615b0", + "sha256": "1qya4drpfnr25lgpagxzi22llrvs9ysqgfhs3093ly2k4pi28nvk" } }, { @@ -77006,15 +77774,15 @@ "repo": "tanrax/lobsters.el", "unstable": { "version": [ - 20251217, - 1458 + 20260623, + 735 ], "deps": [ "request", "visual-fill-column" ], - "commit": "58f91e5adc9660a54a3f6eb1cd49fbbeb2229b74", - "sha256": "19nik1vaazf0w43fvksshx2c1fbby0fyafn2859jbdmvxwb5imw7" + "commit": "41ca67e5827793e91834bf03cdefab581783c3d5", + "sha256": "01pxdzk0xaqqkc17zp3x2d4s8sm212z217kvzlwj697afh1vndy4" }, "stable": { "version": [ @@ -77468,11 +78236,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20250511, - 602 + 20260712, + 530 ], - "commit": "6d82a013ede5f9ef5493801c3071bad5f6b283bb", - "sha256": "1hbhvj2z41sdb03srm9q88pl5f7dzvgif9y5p7sw45gpz1bmnhmf" + "commit": "9102caebfb266e8153e14f7462dddfcfa8ba54dd", + "sha256": "1vm8s0al1ydkbfgqqjjzzgfhkkws621304pr3bfllwffkn3gddz3" } }, { @@ -77524,14 +78292,14 @@ }, { "ename": "loopy", - "commit": "f43d9c8c9862f4f008af6206467c58ae4edfc4a8", - "sha256": "0zrib0gvzk3rnvskpwi5d3v4624lf4z7l8kg4dg944v0x5qgy8iy", - "fetcher": "github", + "commit": "c078f84e004b187ed96523ce62ef4f7fd18aea67", + "sha256": "0ms91lw7h349z8qh0g3vddiqy3svmx10bnrhpj64yca1fy6lmr74", + "fetcher": "codeberg", "repo": "okamsn/loopy", "unstable": { "version": [ - 20260309, - 304 + 20260704, + 1904 ], "deps": [ "compat", @@ -77539,14 +78307,14 @@ "seq", "stream" ], - "commit": "b78b88173df00cf95cda401a6d3b0872dce8aa08", - "sha256": "156r43kpfk2kdkgj7m6pk4pql4y9vsj5igwni00dzr437y74sb2p" + "commit": "838e1f5d38281dde54efbf61142267224e78e494", + "sha256": "18hmdlv95kl2q04b8xrvs3jrqf9kpg7p9gp9p938z416ljzja5r0" }, "stable": { "version": [ 0, - 15, - 0 + 16, + 1 ], "deps": [ "compat", @@ -77554,27 +78322,27 @@ "seq", "stream" ], - "commit": "1849c6c774332c6451288debd4c353449ee79a92", - "sha256": "0qpzg7p8qiggscddbbf85av7zp7b38jjib49jrzl9skliwc0klcr" + "commit": "70427df284cc0a70a75c00be221fbabc433183c5", + "sha256": "0pjf0h3nzlbikxwqik58qwp2qgqyai6v1vx9kw7m7y43x46nv5hq" } }, { "ename": "loopy-dash", - "commit": "b51bc89476900ff52cfeeee5943ddee561bcb5dc", - "sha256": "0gqy6z8b7iyyhbqy33n1b67v839z5711x49w097phvvm5rbwi7i2", - "fetcher": "github", + "commit": "82895d2a7d7a4664d5e1dac752ac987d69011097", + "sha256": "00y19abkank9vkg5wjr1llfz3kgv35p3cv6jp9qan32dbbc58avh", + "fetcher": "codeberg", "repo": "okamsn/loopy-dash", "unstable": { "version": [ - 20251226, - 2031 + 20260627, + 112 ], "deps": [ "dash", "loopy" ], - "commit": "d60c4f49a640541e415e5471ad26c2d8e6886888", - "sha256": "0pwayqwyarbg26piwzxag13xbx3dzdx779c4n7crzjk4gj3d80fw" + "commit": "d7630105c7188a6e7bc23e66e0c1efb56e005d21", + "sha256": "1yh6xmzymp48s101syy8zgr9faxv76k69x8iqyhplzcwnrrra83k" }, "stable": { "version": [ @@ -77688,8 +78456,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20260214, - 2354 + 20260507, + 1741 ], "deps": [ "dap-mode", @@ -77701,8 +78469,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "166e4f2ba12403da5691d352b587c88d24ddb574", - "sha256": "177l32r1ns8rxq5z8qa5k5nv3v4l29zps9xn4ps196298phd253a" + "commit": "a0649b4dbf3eb1f1fac4be172ba282df43b16b73", + "sha256": "1khpnm3m90ijbrcaz2isgq7z9zs5hfh9kqn7g14wqzbzrvvijz37" }, "stable": { "version": [ @@ -77732,8 +78500,8 @@ "repo": "emacs-lsp/lsp-docker", "unstable": { "version": [ - 20250228, - 2210 + 20260507, + 1750 ], "deps": [ "dash", @@ -77743,8 +78511,8 @@ "s", "yaml" ], - "commit": "3960c73349e5658220f0f48587894ac098e62b97", - "sha256": "05sblmvj1vhk4rgfqahr0i0dnaczcixcddd88w3rsdyh72wpxdg6" + "commit": "f666fba72b496c7750bb3f349771b07aa51714f0", + "sha256": "02ihnn5rnk6l9x5wvgj0mrglyss80x47phhks6r3is1frh935xxq" }, "stable": { "version": [ @@ -77772,15 +78540,15 @@ "repo": "emacs-lsp/lsp-focus", "unstable": { "version": [ - 20250825, - 539 + 20260507, + 1747 ], "deps": [ "focus", "lsp-mode" ], - "commit": "4621d310e780e384cbe93d5680fa9ec5d03e2c73", - "sha256": "09yzcfv9gpifsy5ckvmacj7fg0fz1pnnjdzghj4i28x738g7ixxb" + "commit": "675a20610c63577bb5363c2ed9b253705bbfee4f", + "sha256": "0kcy73chsrilb7clmwdmjlcdmfi6zdg6q758lnb20dicixlpjayi" }, "stable": { "version": [ @@ -77804,8 +78572,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20251231, - 1727 + 20260503, + 1232 ], "deps": [ "grammarly", @@ -77814,8 +78582,8 @@ "request", "s" ], - "commit": "4c3aa9e757ff9082a4d7ff104dd5ff0f28f0b811", - "sha256": "16ysivfk6lv8ndifxrhxya3hk3w3rv8p3bwy3ssz7g7q388n1k3v" + "commit": "237a8322bee1982e926610c7d228fd0bc1e3bc50", + "sha256": "1z8gwldm9gqkw9mwlnv6hlsqk603c3zngsf56pq5r1d89wm7j34b" }, "stable": { "version": [ @@ -77842,14 +78610,14 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20251121, - 1710 + 20260507, + 1745 ], "deps": [ "lsp-mode" ], - "commit": "871a0ef2e98b3a749d0b69d958698000ca5640d3", - "sha256": "0chk1nxagbf0n1xxl8namxj7z5bqhidgyp0nqynqbi8799v62aa7" + "commit": "4c3001aeb116fb489223269ea353359b90e2a5e1", + "sha256": "17wgagx29piqgss8qkfizh4ikss7dm6m9jglh9x04dyk4264c197" } }, { @@ -77878,16 +78646,16 @@ "repo": "emacs-lsp/lsp-ivy", "unstable": { "version": [ - 20250825, - 512 + 20260507, + 1752 ], "deps": [ "dash", "ivy", "lsp-mode" ], - "commit": "2927cbc776477e23d4a1062568d55793eed33c51", - "sha256": "12l160q4wi9wc17n1r4pdmp42hwyqrmzc3xcfki6pivmqdaark45" + "commit": "c0930544948dfdb7bf497fc9e58aa6b4b857e237", + "sha256": "11mknb893ry3m99gd44ywjwjp21a02j0yg2xibc9zf2jbb16rppb" }, "stable": { "version": [ @@ -77911,8 +78679,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20260312, - 1356 + 20260510, + 647 ], "deps": [ "dap-mode", @@ -77924,18 +78692,17 @@ "request", "treemacs" ], - "commit": "0a9f4d0b3ddf300bc9ca7546f5bed288bdfc8377", - "sha256": "1rc9fy27kzgs6hdp7j9ybzmzxmcdj63jzwzsxfzlm8pqp1y8xkcb" + "commit": "5294db2ac033a289e4878fa8386629b75cb3ccb6", + "sha256": "134fw9kxwfi2glkxb7r32la3wip9y2jz8hkv0c3si1jv5p4g22zp" }, "stable": { "version": [ - 3, - 1 + 4, + 0 ], "deps": [ "dap-mode", "dash", - "dash-functional", "f", "ht", "lsp-mode", @@ -77943,8 +78710,8 @@ "request", "treemacs" ], - "commit": "260016236fa0520b5b6ec7f51ca2086288524cba", - "sha256": "1h0hqgjpk5mbylma1fkva0vx45achf0k7ab2c5y8a2449niww90h" + "commit": "5294db2ac033a289e4878fa8386629b75cb3ccb6", + "sha256": "134fw9kxwfi2glkxb7r32la3wip9y2jz8hkv0c3si1jv5p4g22zp" } }, { @@ -78068,14 +78835,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20260101, - 535 + 20260503, + 1233 ], "deps": [ "lsp-mode" ], - "commit": "6adc2b4d32a907943a6ce06e2267090241e7af6a", - "sha256": "1rll8wa07inh39nnk7j0g8v9z4h4wfnqcff3dqq1kcnp5r5p4vpk" + "commit": "a7014677b10ddc1127f9e6ed4ffaf9c5ab18922c", + "sha256": "0k1wsik3bnrpkpyqbmbgwjmkq9wzycwn6ql13zrlspb2rjz5njvg" }, "stable": { "version": [ @@ -78092,6 +78859,36 @@ "sha256": "0s7xi41di8gszn0fz04lpnv610xgydfr5hylp3z1dshba2kpkk1f" } }, + { + "ename": "lsp-ltex-plus", + "commit": "adbdf03557a845c56935b40a4cd7f9e1dbcf92ab", + "sha256": "1gcbaw9nwpz98a75v2i6jykwnay4chk65kq8cynf55xbfpzavhwp", + "fetcher": "github", + "repo": "ltex-plus/emacs-ltex-plus", + "unstable": { + "version": [ + 20260626, + 618 + ], + "deps": [ + "lsp-mode" + ], + "commit": "dc617ed2a21f6453053d218601fee38d1bfd6c70", + "sha256": "00fnyw9s7nhkr6l4f9lv10zar13crcj5jrlq7i85py3s37xfmrbh" + }, + "stable": { + "version": [ + 0, + 4, + 0 + ], + "deps": [ + "lsp-mode" + ], + "commit": "2dded9da2dbced4624ecad4ab51ee2ee62aa2cad", + "sha256": "1fwihxqhb4x94z36qvh45rrjg95sswwx4y952skxy2fvm0dl5fa0" + } + }, { "ename": "lsp-metals", "commit": "ee055cc258692a92f727633306adf7df31267479", @@ -78100,8 +78897,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20250228, - 2145 + 20260529, + 1928 ], "deps": [ "dap-mode", @@ -78113,8 +78910,8 @@ "scala-mode", "treemacs" ], - "commit": "345b4fa80e31c58fd14e4c0cf9b88eb2aededcb0", - "sha256": "0y1pkzc7symdzgh0vk5plcn2r23ai2gbnjps1cr5kjjbwqq1yz4q" + "commit": "afeacc7a528b80b9a9f2747428e5608c264201ec", + "sha256": "023yydw9lbk621pka6iavdqdm515cxi9fmbqh7flkfgq09lvj00a" }, "stable": { "version": [ @@ -78144,8 +78941,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20260423, - 1033 + 20260716, + 755 ], "deps": [ "dash", @@ -78156,8 +78953,8 @@ "markdown-mode", "spinner" ], - "commit": "74270b286a9c8f1fc56f97dc118ff010880ed3ff", - "sha256": "13avmvbldb27pwm8a4s190601jwgzfhpzx86h2yjd6g0vjvx3lkv" + "commit": "6bfc593d7b1bc0dd656f09ffce52cc085ebced05", + "sha256": "0n48qdc9y4vq5bmxfxv2gwmv7ngawq30ai280jhdn2ilzqjw4w4d" }, "stable": { "version": [ @@ -78186,8 +78983,8 @@ "repo": "emacs-lsp/lsp-mssql", "unstable": { "version": [ - 20251117, - 1444 + 20260507, + 1743 ], "deps": [ "dash", @@ -78196,8 +78993,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "810d632bd4abc4f105681a674ebea5d09407a04e", - "sha256": "0v3csv4qgpkh3g7vwd4fxd35adjsz5g425m8972zixinshy2csk6" + "commit": "02e50306c92af1c98473840169a477b22f72af2d", + "sha256": "1w6diyzsyf7p2kipl6yf3rjjinz3pfggf66ybhji8zc4jmdwxkgf" } }, { @@ -78208,15 +79005,15 @@ "repo": "emacs-lsp/lsp-origami", "unstable": { "version": [ - 20250825, - 521 + 20260507, + 1743 ], "deps": [ "lsp-mode", "origami" ], - "commit": "b52f42b7932dd968b398e7cfd2ca29051b1a50b4", - "sha256": "0gpvdhipwz70p6pmrsy6z1f8zbpfazmrvp5anymywm9g8gq212pr" + "commit": "dd398afcf8e9077231dc26ea189916e6ea64c6ab", + "sha256": "0grk1b9xg53qz3lmmqyj3vy5zp7wq9ifx3yjyyqcyw4fbn0j87wl" }, "stable": { "version": [ @@ -78276,16 +79073,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20250905, - 136 + 20260507, + 1742 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "3756ff971797ae04fc43ca29c66ba4d854eff038", - "sha256": "0pd9g8asags5sqj8h77r9k6yn0xj8da4604zva0vqj5plzq81ral" + "commit": "187e08caee4e1630a9975f492274c739f325392f", + "sha256": "0n2nx5xms6jpngkrvjsbamhd5fid5i6yqaravw3s5bl5km6ljddy" }, "stable": { "version": [ @@ -78391,14 +79188,14 @@ "repo": "shader-ls/lsp-shader", "unstable": { "version": [ - 20251231, - 1653 + 20260503, + 1236 ], "deps": [ "lsp-mode" ], - "commit": "f8772e749d212adf95b901c3c94c9c96f9da3707", - "sha256": "09j7i051qp6qi28sn52wzxqcl5sg7433a1q7f1qm3lsgdyq8zw7c" + "commit": "85430cd7d20019aa39e624990fd814650af9b3a2", + "sha256": "07kvykysqpkq7n5zqy7s3l52a9scyf4nfrfm16f686mgvv0amj5d" }, "stable": { "version": [ @@ -78421,16 +79218,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20250301, - 131 + 20260507, + 1751 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "f9c61eafce62edf15f05d7262290ea87f2beb60d", - "sha256": "0v8jvgy5y0s0nyiga4p2xmfdjzkhl29y6kl12kw6zfz82r3y4smv" + "commit": "91794c7663fc24afd8d93a74e775793de8f2f811", + "sha256": "0rbb9gfkz4lizwq81xwfvdq8pfv1d0536c73zff9ik1c14ahqa6n" }, "stable": { "version": [ @@ -78455,44 +79252,14 @@ "repo": "emacs-lsp/lsp-sourcekit", "unstable": { "version": [ - 20250825, - 538 + 20260507, + 1745 ], "deps": [ "lsp-mode" ], - "commit": "30918cd1aeeda5cfbc0fd615f97cf1bf388d8f2d", - "sha256": "1d5iq4rhcpa0crwi67ibzmahg6zzlwpm48dkvgbckqa8si589g88" - } - }, - { - "ename": "lsp-tailwindcss", - "commit": "c837c3b97d7e833d22a1605dcf3c2ebc35c19e0c", - "sha256": "0cnkj1ahp48i8zx1qh0fbxf40cnv6d1i9c579kmkfmfbnvxpp080", - "fetcher": "github", - "repo": "merrickluo/lsp-tailwindcss", - "unstable": { - "version": [ - 20251009, - 810 - ], - "deps": [ - "f", - "lsp-mode" - ], - "commit": "cdd0325a6a571e51f6c7d1cbc198c7a7ea4a194a", - "sha256": "1a159pbq5x2w3id815ln103prdvyg8kbcmzr2r2cag8aa24hvs91" - }, - "stable": { - "version": [ - 0, - 2 - ], - "deps": [ - "lsp-mode" - ], - "commit": "5250c4305f2334796d65779c7b61442e17d7c69b", - "sha256": "10xlb3gqlsx9k716mmrvpwlsdn086vr0jiqakcj2f5vixpxj1sxy" + "commit": "252decc7ae53170eb1c67f97ff3e7f576dd13734", + "sha256": "1fphyd85qjv3zx1ggrbz973s8dmsb14nqzvgg2ad5jqvp0ijgmwv" } }, { @@ -78503,8 +79270,8 @@ "repo": "emacs-lsp/lsp-treemacs", "unstable": { "version": [ - 20251217, - 1621 + 20260515, + 746 ], "deps": [ "dash", @@ -78513,8 +79280,8 @@ "lsp-mode", "treemacs" ], - "commit": "49df7292c521b4bac058985ceeaf006607b497dd", - "sha256": "17jp3xfi1xxqn8amqx279pns3r25xhx789bjlqmj2apm338wm6z2" + "commit": "3519ac907ea391e18d9599375b116aeeb6f8a38a", + "sha256": "0bwdbzc9h4zypmspvw14fksbzkr6z87x42rnmynv28hrwy7r5ayd" }, "stable": { "version": [ @@ -78540,16 +79307,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20260104, - 1525 + 20260512, + 1516 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "ff349658ed69086bd18c336c8a071ba15f7fd574", - "sha256": "1gkqd9lqb1f6xxl6zf00lc8a14khsqjkjm4mx3253fagd6m242li" + "commit": "8d888a3ab1ba9e46bd4711398c57d39d0b709a45", + "sha256": "0hqjp55049bmjzxwv3bxks5rr8j91372aj11dsfmmi9r0y5l9wwl" }, "stable": { "version": [ @@ -78892,6 +79659,30 @@ "sha256": "1sx76i59razwccvn6x7rx5a124bfyjw9fcbxf4gj7nsg33qiq809" } }, + { + "ename": "mac-ime", + "commit": "3bf8f44390c988a00ec38963aca6cf3d87fc4132", + "sha256": "05l2s58h16z7spyxqkkpn5n8hasks5g0cxxv12wms490nxmwmg2z", + "fetcher": "github", + "repo": "ma0001/mac-ime", + "unstable": { + "version": [ + 20260605, + 1210 + ], + "commit": "0a8f40c6ad8d02f9b99e3eaa5a68e625b87e7f30", + "sha256": "0db1sg51z7n7skigsz329fzrb5q2jh4lgslb98b5kk9y8p0lkirs" + }, + "stable": { + "version": [ + 0, + 2, + 2 + ], + "commit": "0a8f40c6ad8d02f9b99e3eaa5a68e625b87e7f30", + "sha256": "0db1sg51z7n7skigsz329fzrb5q2jh4lgslb98b5kk9y8p0lkirs" + } + }, { "ename": "mac-pseudo-daemon", "commit": "6104efc035bcf469d133ab9a2caf42c9d4482334", @@ -78967,14 +79758,14 @@ "repo": "kmontag/macher", "unstable": { "version": [ - 20260420, - 107 + 20260718, + 1815 ], "deps": [ "gptel" ], - "commit": "2a4d2ce81076134c7521bfd3a345c5440c440c2f", - "sha256": "130i2qzqb9p1k6qznciab2n8m1911pm5yqv13x0fdhfd8nyj4hkj" + "commit": "b6e51cb9a01c87e36d8920d947ed171bf21c8287", + "sha256": "1wxa7zkwj9c8h6qq61wr36c54fq8kabhp47ij6d7b659cc9bhwbz" }, "stable": { "version": [ @@ -79204,40 +79995,40 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20260328, - 1014 + 20260706, + 1226 ], "deps": [ "compat", "yasnippet" ], - "commit": "caeb52d21d5cdb2b1e3550cd95d68568479d0dbb", - "sha256": "0f3wdjzr7g2ym5m8dpd6srg1ggwffssm5f6rbdpdkdf4424f3jmf" + "commit": "ed8e8dce0e7bb552beda9649790b8ff9a6e1ae3b", + "sha256": "0pij6wn1m1pvdg16plls6z64jhffq95clwsdkci1gzall0ddm7dj" }, "stable": { "version": [ 0, - 5, + 6, 5 ], "deps": [ "compat", "yasnippet" ], - "commit": "0ccfffef530802698447ce4f549477e724ab8710", - "sha256": "0vfjbf4vm4r2cc0bd3yc5rw6mn8c5169nirw0ixrzp6w70h0b903" + "commit": "95dcd634d9de45851fce911dd0fffc85822a2ecb", + "sha256": "07pszv4xz1j0ai19cigrmfr31qhzv1fy4a0rvz19p5pinds03lib" } }, { "ename": "magit", - "commit": "ad502b9c75d8b2cc09f5fe64dcc5b36e434129b4", - "sha256": "1h3zqmc1jz9l8g5mfc2miihib29w69nsyg8anyfqbij1v0rdg3ln", + "commit": "5c4845003f7a970416c0db190987ba99369e8cb9", + "sha256": "1mfm8xs3acjikl66d1ra0n20v0ava72wvlwxjsh5r8813s2kjfa0", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20260422, - 2206 + 20260719, + 948 ], "deps": [ "compat", @@ -79248,13 +80039,13 @@ "transient", "with-editor" ], - "commit": "569b9656d6a2c792b07d3980796c76b121c9737e", - "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8" + "commit": "0988e1564bbe5a08f876fa0d78eb9d587c704121", + "sha256": "0rnk6kd0q8wmm1n96pvd3qkc7hwkq771vs20qqpcbb9mwqg2faaw" }, "stable": { "version": [ 4, - 5, + 6, 0 ], "deps": [ @@ -79266,8 +80057,8 @@ "transient", "with-editor" ], - "commit": "c800f79c2061621fde847f6a53129eca0e8da728", - "sha256": "04yxjkv5h3arcj1s0nq9kyh3l1z4c9wml35vb67jvv1h7mslwz55" + "commit": "b6c512597fd66abe69883a058a2d13bcea76bf33", + "sha256": "0pfx2rkxpfkyfwaz759q9b1yjd8vdwgf5jbrix5i1y06i54rnazr" } }, { @@ -79326,14 +80117,14 @@ "repo": "ideasman42/emacs-magit-commit-mark", "unstable": { "version": [ - 20260105, - 203 + 20260511, + 839 ], "deps": [ "magit" ], - "commit": "ba986f350466a68d9937d0487e9b8f75303bc465", - "sha256": "0rhinmvpcyv17klix5bivw0ksfz4kzlwa9q6n8wkwikxpsh1m6ks" + "commit": "9712db3fd09fe493d2ac5644b40e9cd451877180", + "sha256": "09bx5l7d4ilsxx3gqrj5j3c2ivbrx5gbxaa0x8pfgg46x7zbbx1m" } }, { @@ -79445,14 +80236,14 @@ "unstable": { "version": [ 20250825, - 722 + 811 ], "deps": [ "magit", "transient" ], - "commit": "37a4774c3cc401f849d57aaa2c105ca401f9983c", - "sha256": "0pbh0w49jhvmgz6liravkn0ajdgzdapb13gpd8j6r4i6mw3n0v2a" + "commit": "d95d6d3febf7f9c04a4abefa3640610aae626683", + "sha256": "0kl05z07jjlm58fl6dpnijyl5gnx54b75cl0gbvflyv8z60y8mmz" }, "stable": { "version": [ @@ -79615,16 +80406,16 @@ "repo": "douo/magit-gptcommit", "unstable": { "version": [ - 20251206, - 1143 + 20260530, + 2339 ], "deps": [ "dash", "llm", "magit" ], - "commit": "4a60438fd2a349610e571f10596f6642dfab119d", - "sha256": "0li82bf6cmwmh7mb2bfz4m9dy6w01sn89lvsx1ywwi96vax36688" + "commit": "b3ac0bfad8b06b6930dc4e35e3adefb4b6646193", + "sha256": "1mr3xhkwwwhdcsakmhz670cn69igmgqvqfs9wkpb9918dcsw5vqj" } }, { @@ -79808,10 +80599,10 @@ }, { "ename": "magit-popup", - "commit": "0263ca6aea7bf6eae26a637454affbda6bd106df", - "sha256": "1pv5slspcfmi10bnnw6acpijn7vkn2h9iqww3w641v41d3p37jmv", + "commit": "5c4189d36ff03a8a2425d5db65e5a7eaefa09761", + "sha256": "0x4c21f7ir8aaxp9jra80djrj52w0c144gfhwyhdwnxq4rzwyq4b", "fetcher": "github", - "repo": "magit/magit-popup", + "repo": "emacsattic/magit-popup", "unstable": { "version": [ 20200719, @@ -79932,8 +80723,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20260422, - 2206 + 20260709, + 950 ], "deps": [ "compat", @@ -79941,13 +80732,13 @@ "llama", "seq" ], - "commit": "569b9656d6a2c792b07d3980796c76b121c9737e", - "sha256": "1y8q8d3lw4yq04kngnskw0yx6x96yzd09052cjx9anyqwcyhbhk8" + "commit": "cf9d129d3612c7a900a82263951310b186860834", + "sha256": "1ddh1s34ibd25wkyi85054dkcpz3l3xb37pinkpvx7vgsq80m90s" }, "stable": { "version": [ 4, - 5, + 6, 0 ], "deps": [ @@ -79956,8 +80747,8 @@ "llama", "seq" ], - "commit": "c800f79c2061621fde847f6a53129eca0e8da728", - "sha256": "04yxjkv5h3arcj1s0nq9kyh3l1z4c9wml35vb67jvv1h7mslwz55" + "commit": "b6c512597fd66abe69883a058a2d13bcea76bf33", + "sha256": "0pfx2rkxpfkyfwaz759q9b1yjd8vdwgf5jbrix5i1y06i54rnazr" } }, { @@ -80213,15 +81004,15 @@ "repo": "hrishikeshs/magnus", "unstable": { "version": [ - 20260421, - 201 + 20260711, + 945 ], "deps": [ "transient", "vterm" ], - "commit": "ef87ed770acf3113f060afdd6949ac24ce46dee8", - "sha256": "1qlf4vc0r73jh4nxx86dw0f4g6qk4c5ypkwkj591p02x3w7l5a3s" + "commit": "0939004f0bf00021246b8fb62fc5e8939b8d98da", + "sha256": "1k921pisal7qzv7j1dd0cynx1gr6nv539hr0y35mspmvk40bihqb" } }, { @@ -80346,16 +81137,16 @@ "repo": "Olivia5k/makefile-executor.el", "unstable": { "version": [ - 20230224, - 1329 + 20260716, + 1302 ], "deps": [ "dash", "f", "s" ], - "commit": "d1d98eaf522a767561f6c7cbd8d2526be58b3ec5", - "sha256": "0wm0i2m124dglwq0szp6pdh2r0dln0xpgscw2immi9cchcmgcy4f" + "commit": "b22e10f528def19da9b1575546f62693555e6b22", + "sha256": "0h9214mg9mfmpmyrya1fqa5hs4a67mv0fk2z8mp8r68p8i4w2jw8" } }, { @@ -80582,11 +81373,11 @@ "repo": "choppsv1/emacs-mandm-theme", "unstable": { "version": [ - 20260328, - 1745 + 20260513, + 247 ], - "commit": "bccf228e07e785f6534faaf50edc2e1b212c9d54", - "sha256": "15fzbs3ygzj8x4g3js2gjyvzilmvfr482z8a6hnvs4316yzp1vjd" + "commit": "c9ebcbe0518798cab3667762637062f0255bbad2", + "sha256": "166i2iic1n848099x1khrxl1phcmn4d7sgkjknd3b40ns6mf4a48" } }, { @@ -80704,25 +81495,25 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20260309, - 1545 + 20260519, + 1044 ], "deps": [ "compat" ], - "commit": "d28a5e5c1a2e5f3e6669b0197f38da84e08f94a0", - "sha256": "12gz095kmlj5xvx6709jl388x16724hivnncan9s52yf8rfjnlbm" + "commit": "feb66c02bbd88dba867cdd92b94fe24279ed578a", + "sha256": "11w1avjwqbv1pbsvhlw3vrc7ka41nmgaqa90zjvfgf69z46ycgsx" }, "stable": { "version": [ 2, - 10 + 11 ], "deps": [ "compat" ], - "commit": "d28a5e5c1a2e5f3e6669b0197f38da84e08f94a0", - "sha256": "12gz095kmlj5xvx6709jl388x16724hivnncan9s52yf8rfjnlbm" + "commit": "feb66c02bbd88dba867cdd92b94fe24279ed578a", + "sha256": "11w1avjwqbv1pbsvhlw3vrc7ka41nmgaqa90zjvfgf69z46ycgsx" } }, { @@ -80763,14 +81554,14 @@ "repo": "plandes/mark-thing-at", "unstable": { "version": [ - 20250126, - 2020 + 20260711, + 1130 ], "deps": [ "choice-program" ], - "commit": "a9a6c824ede52825a1dea8d880776ad20f12f488", - "sha256": "1nq3f05js3zvksc43i01pavy9iyjdmvfr5rcy67r9x9ahdjs1nmm" + "commit": "7829d89ba7da560adb4236fd26fc6ed5813b7173", + "sha256": "0y62fhdsmi3da53ldrv8l3jwg756dqwa5r1av442hnxv8pmq8v7d" }, "stable": { "version": [ @@ -80894,11 +81685,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20260423, - 1508 + 20260425, + 954 ], - "commit": "51ccd3df38d85d0abc9d43d25fc7ea9b9131db45", - "sha256": "1a0ah4r2shbjb9gwa5yr534fq2rb6nyf0qbhsqsf0pvwx5lskfr4" + "commit": "1f72cefa6a4b759f90e335e4908725a721b17ad9", + "sha256": "100dwx61v5n07i04r9gh9s9c29v1d59lqrqnk88x0v9z9jjpvgnq" }, "stable": { "version": [ @@ -81060,11 +81851,11 @@ "repo": "LionyxML/markdown-ts-mode", "unstable": { "version": [ - 20240422, - 2329 + 20260505, + 1217 ], - "commit": "2f1ee8b94cdf53cebc31ae08ecfbba846193d5e1", - "sha256": "1fhvsfa4q46xa092dkpgki8qhfs71x414yrqlxnf2vfs9bd6w7pn" + "commit": "e7e78ec55213909d2b70e3dd943b776f622cc991", + "sha256": "1gkb0xf1qwf808k7ihwkixffmpb31b3zq23qwavhj8h9q6y4p5c5" } }, { @@ -81278,14 +82069,14 @@ "repo": "mason-org/mason.el", "unstable": { "version": [ - 20260409, + 20260517, 1744 ], "deps": [ "s" ], - "commit": "3ac674a7880dd6432f83e249bfd6fea8cf6fc974", - "sha256": "0mslpkdxlkvzvn0av5vdjgi4w39jp07nr7ki1ni7pialrf3qdfg9" + "commit": "8dc604d12bea314dba3db89ea29d84b0d1438eeb", + "sha256": "0pwxx0wb345cn408ssg9h8bsfjclfv43zzxcwz8z6fy9yilhkbyh" } }, { @@ -81296,28 +82087,28 @@ "repo": "martianh/mastodon.el", "unstable": { "version": [ - 20260406, - 856 + 20260509, + 749 ], "deps": [ "persist", "tp" ], - "commit": "5bba23045efda9f63c36ac431bec8f318a55e76a", - "sha256": "1z8qwnc01d9hx5m1xj3acpdzllfh4rxmypzcr3jl4ipp6dybzbx6" + "commit": "4b30b2d96625e23325ff3727daa30969b6fe2eed", + "sha256": "1pz0ac5r6g34x0nlwwh55c369swiv8h3dr6ndkkm7k2ql7f75xdv" }, "stable": { "version": [ 2, 0, - 16 + 17 ], "deps": [ "persist", "tp" ], - "commit": "5bba23045efda9f63c36ac431bec8f318a55e76a", - "sha256": "1z8qwnc01d9hx5m1xj3acpdzllfh4rxmypzcr3jl4ipp6dybzbx6" + "commit": "4b30b2d96625e23325ff3727daa30969b6fe2eed", + "sha256": "1pz0ac5r6g34x0nlwwh55c369swiv8h3dr6ndkkm7k2ql7f75xdv" } }, { @@ -81470,11 +82261,11 @@ "repo": "mathworks/Emacs-MATLAB-Mode", "unstable": { "version": [ - 20260419, - 1224 + 20260428, + 1740 ], - "commit": "a42d34dfc498b8754ac89512b399b77481791406", - "sha256": "020ay6d8hm6z8n6p70yi4hpa0kzbc0dd2kwik3d2jgwdc9s8sb8i" + "commit": "83ea45983975bc6d17a908bf4acddfc47d51763a", + "sha256": "1r9ky4rdjp4vzbzkzi0xjr5arjwmih22bq1qsnch3gq83x3yxxnj" }, "stable": { "version": [ @@ -81725,14 +82516,14 @@ "repo": "lizqwerscott/mcp.el", "unstable": { "version": [ - 20260222, - 1058 + 20260615, + 940 ], "deps": [ "jsonrpc" ], - "commit": "5c105a8db470eb9777fdbd26251548dec42c03f0", - "sha256": "03npn50zfc3f0w30d47qqwxzky7ambd03arf94w025ilcfbc4dmm" + "commit": "2d172809cbdb2a40d86b28ad73bd65547cefe0e1", + "sha256": "03zvdvjh724kpb2p7j208fm0z73g21vij0jms8azdxbazyw6yj77" } }, { @@ -81743,20 +82534,20 @@ "repo": "laurynas-biveinis/mcp-server-lib.el", "unstable": { "version": [ - 20260415, - 1038 + 20260630, + 1141 ], - "commit": "942d0d2da3a6b61be4d4b12e8158f8b0189963a8", - "sha256": "0brfaqm0f670zkgqf4k1dww1ji26rmgwpc2xxa3s23cp0csv136h" + "commit": "dec55e6405987250256a81efe92d65bdfa8a140c", + "sha256": "1hw6wj62nwvjap3yjqjm7ybkwpnh7xi2q21rg2hi36cnzarb59yd" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "cfa2f2f3367b32429a06d2c401a2b791a896bba6", - "sha256": "0qn38iqf75xzz0vkgac2ngv49qv52rbbfpziczb052r5fnl0pzp0" + "commit": "e643b25af647e7bb5d3958262c9c728a3bb9676f", + "sha256": "0c8wk2mhyn10ri4qjk3zy1811k7pzg3i3mm9lzn00v6wdccrm59a" } }, { @@ -81782,11 +82573,11 @@ "repo": "dnouri/md-ts-mode", "unstable": { "version": [ - 20260309, - 11 + 20260530, + 1627 ], - "commit": "209f7b89383169ad759ba6bec8642d3fc15ce212", - "sha256": "0fiblwqn66xp38n50mca9zcmrxassmxqiyfmn86gwp4zcfbifx9i" + "commit": "95ae25162da092cb1d55d2be0c2c95e0591086c2", + "sha256": "1ssparkbli7zrrkdvlr5nav460rq3xr38dnmvdbcalkhyzswzfbg" }, "stable": { "version": [ @@ -81897,11 +82688,11 @@ "repo": "jojojames/media-thumbnail", "unstable": { "version": [ - 20240816, - 458 + 20260712, + 2348 ], - "commit": "190632c1d6cc2ab94031d57e0c24412a4698faf0", - "sha256": "1bj4l8yb383m2b43i514044yjpgh27v69gvm71a08n7r4hhdhbpr" + "commit": "4cb8075ec8bc46408a6b01fc8877571d8e66e439", + "sha256": "0nv5cf4plgf77bvvsy6y8frz6dwv90qpvbm53h2n3qd5qjc9grmi" } }, { @@ -81912,20 +82703,20 @@ "repo": "hexmode/mediawiki-el", "unstable": { "version": [ - 20260303, - 2008 + 20260708, + 2249 ], - "commit": "e7b229450ac5383c4cde2639836cb0dc99220127", - "sha256": "1ygiq0xvxm5jgx9l50wicviq4j6b02ss2fydzkaz47zsffr8mhk2" + "commit": "6e081439a876b3cb9a27146fd75e887997712629", + "sha256": "1i9jqchlbg5w8zmqbzpnyz11xgqhfriy1kyp8z8mczpyvhyz646f" }, "stable": { "version": [ - 2, 4, - 10 + 1, + 0 ], - "commit": "cf091148fd8fcf17d81bc5ad556ae18c839f6507", - "sha256": "199vkks9adkw7rvac960sz2625n0pa7zr2bixrb552dvh29c1lxc" + "commit": "6e081439a876b3cb9a27146fd75e887997712629", + "sha256": "1i9jqchlbg5w8zmqbzpnyz11xgqhfriy1kyp8z8mczpyvhyz646f" } }, { @@ -81936,11 +82727,11 @@ "repo": "ideasman42/emacs-meep", "unstable": { "version": [ - 20260423, - 152 + 20260716, + 112 ], - "commit": "98a8b2bd6384237005e258a647f3d16a90bc0b97", - "sha256": "16q48yh2nzrf07x5j7kkb9s0ykdnvkw2glzk2ds3wf6zhq10agjl" + "commit": "8ddd6a5b61e295e9e423708e66f28e12c6199c8b", + "sha256": "05xw0c03h90kn6chilin6rr8wdqfkbsvcplcl9sz2ni8rx7mssm7" } }, { @@ -82146,11 +82937,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20250904, - 1606 + 20260714, + 1200 ], - "commit": "ff5315b3b2ebc9a37414cbd2f2a3378162f9953a", - "sha256": "1l6m3vbbqg11nyr51zl3yqz5d61rl60ccrr43p00pagrpql9sacn" + "commit": "aa8aec19e70369b547176e625f5b95c4a8565e8e", + "sha256": "1mgrh9yfhv0nvb0x1ab0bmyl8x7wzb6av5ywkxidnn4jllvf1n07" }, "stable": { "version": [ @@ -82200,11 +82991,11 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20240925, - 900 + 20260602, + 1457 ], - "commit": "80e919cf32a62acdaee95a5dab9b4bc18a8b4034", - "sha256": "1lwh4pv7an9rfalk9nz2ds2ia09dm69bhsfx28795v7hal46rq80" + "commit": "653fdaaf2b1be998e3edc6645a2ddee9a3e1bf52", + "sha256": "0pjybqp404j42qzmbk47rmg72jg94nc0hg9b22xq2cmg61aa9kaz" }, "stable": { "version": [ @@ -82363,11 +83154,11 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20260306, - 2210 + 20260607, + 15 ], - "commit": "127fad71666faacf4e962a1498f3fe08910cc6c4", - "sha256": "0nr89nnk3gwwm8ij9n49afmc384s3lrxzfmip47q4i03z40dkh38" + "commit": "804dbcb1452e7496ae0c48e20362da6351227246", + "sha256": "1f1dzabb5647la40siwifv90678xpig2bsn5dl1p1s88q5xs9yk9" } }, { @@ -82393,11 +83184,26 @@ "url": "https://git.andros.dev/andros/meshmonitor-chat.el.git", "unstable": { "version": [ - 20260409, - 802 + 20260609, + 557 ], - "commit": "862d8fed090dde4db19105afcc29199b3aa38cf0", - "sha256": "1rncjj6l31v6q4dhpngsarm31ifmnd6gsrdkaqpkp4y7qrspy0vd" + "commit": "cb89039bb723301d2a69326f98ca1f141d6a0112", + "sha256": "0bgfkbxxb650r7nd6xgwcdydz7kwfa0c99kv713r15lkmmlndj8z" + } + }, + { + "ename": "meshtastic", + "commit": "141f731232697e997efe49295531f92589d36c3b", + "sha256": "0pv628gsjck99s6qqjysm5drwrqsmyzyrf5ydxn5n048nmyl2b71", + "fetcher": "git", + "url": "https://git.andros.dev/andros/meshtastic.el", + "unstable": { + "version": [ + 20260527, + 1500 + ], + "commit": "5ad027669b3e652f704857e3d7e373095d1c09d1", + "sha256": "16h9vif9i82gk3bpy6d3x1ifbc3bag3hg3dl19hfbqs054xkjccq" } }, { @@ -82676,19 +83482,19 @@ "repo": "kazu-yamamoto/Mew", "unstable": { "version": [ - 20260424, - 551 + 20260707, + 2341 ], - "commit": "b53e86e1a9bd7db8634387ee54e5af62e35925ad", - "sha256": "0is3lvaxgsv1qvh3m0qa9s91m7wffsqjnwzyv5csd85xs6rypv16" + "commit": "880d4af5cadadfa3b0348c340f187aa45c0a870c", + "sha256": "0sl6w556znxgxy4j0simmn3kgrh0w81aspnqh00yd7iqwcf9yllw" }, "stable": { "version": [ 6, - 10 + 11 ], - "commit": "2392ee9b869029a9900587011fe541abe08a2fd5", - "sha256": "13ajr51yk2hcfiq532cayb0kvpdb3psf877cxl6qwx0pgaf1qm57" + "commit": "b905786ae1da9da4c015d69b9417a55985f07668", + "sha256": "1xbdix7hn6i224gglpab43qqi5mkv356zf7gs9359vnwslfm5x6n" } }, { @@ -82714,8 +83520,8 @@ "repo": "danielsz/meyvn-el", "unstable": { "version": [ - 20250815, - 2140 + 20260611, + 354 ], "deps": [ "cider", @@ -82723,16 +83529,15 @@ "geiser", "parseclj", "parseedn", - "projectile", "s" ], - "commit": "5380626e327b7a48531c4a652bab4896ba179312", - "sha256": "0gnjal5ikz2g5ac7h1lx8hwkix0j18l6sg26ydn6wdhix2yjdfmq" + "commit": "48c12b8d7d79c1b35d54d195d1ce4c7113ef5215", + "sha256": "0qm7qz3w9pm1820xk8h2kga5g1c31fxc7jr1bzcl79mqvjhw351x" }, "stable": { "version": [ 1, - 4 + 8 ], "deps": [ "cider", @@ -82740,11 +83545,10 @@ "geiser", "parseclj", "parseedn", - "projectile", "s" ], - "commit": "62802ab42ee021f89f980bd3de3e1336ad760944", - "sha256": "0821sk0mq1602mk3hp7igcafp8fpfg586nk41iz9syc06xbh0if7" + "commit": "48c12b8d7d79c1b35d54d195d1ce4c7113ef5215", + "sha256": "0qm7qz3w9pm1820xk8h2kga5g1c31fxc7jr1bzcl79mqvjhw351x" } }, { @@ -82755,20 +83559,20 @@ "repo": "purpleidea/mgmt", "unstable": { "version": [ - 20260222, - 1339 + 20260623, + 203 ], - "commit": "2a08fa18cd3d0ba4a6433bdd9c4c0f3e85ed7528", - "sha256": "0576pmm5cya802p4kw0d1g0fv95ng8jzzgaiw6x9xb86p3vkifcw" + "commit": "0f7ad93cd17e5251c6ec112fa6ff4272499b430a", + "sha256": "0csy7rkx3wdknk2j1b0b0zy2ml3rm5zr3mhcmk9zf3mdbib4hlcd" }, "stable": { "version": [ 1, - 0, - 2 + 1, + 0 ], - "commit": "2a08fa18cd3d0ba4a6433bdd9c4c0f3e85ed7528", - "sha256": "0576pmm5cya802p4kw0d1g0fv95ng8jzzgaiw6x9xb86p3vkifcw" + "commit": "0f7ad93cd17e5251c6ec112fa6ff4272499b430a", + "sha256": "0csy7rkx3wdknk2j1b0b0zy2ml3rm5zr3mhcmk9zf3mdbib4hlcd" } }, { @@ -82973,11 +83777,11 @@ "repo": "countvajhula/mindstream", "unstable": { "version": [ - 20260218, - 312 + 20260614, + 1629 ], - "commit": "6b51036a069379d18538a7cca5274c21666a5979", - "sha256": "0j82dm2mj49fs2q6qklhfimv1gvy6q3l6bqaj1azxyh1hbg4d0vi" + "commit": "0b7a2889e8de419d90a3eaa137c82febe014fda6", + "sha256": "1w00k2l021l2g4amxdfsyfxs252kfskd2pflhcki8fzbdghaxa0a" }, "stable": { "version": [ @@ -83060,11 +83864,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20220627, - 2041 + 20260619, + 549 ], - "commit": "60838f3cab438dcbda8eaa15ab3e5d1af88910e9", - "sha256": "0q01iymz657bg3mcmq7vcl8r0ypsa1pqj1p6gxs7ywx1d33lan4d" + "commit": "066af90bb2c9a52ff0bfbcdb25539e1b92b68586", + "sha256": "07a0l53ihkqan5n1kg07vy80m46y6ri6ijjf1frzd6ciha37ad4b" } }, { @@ -83220,11 +84024,20 @@ "repo": "dheerajshenoy/minimal-dashboard.el", "unstable": { "version": [ - 20251102, - 1952 + 20260710, + 1120 ], - "commit": "b7dbce88a19777c0d33df025e2b830094e521af8", - "sha256": "0qa1sgijf8qywi8zxiv2bs6j526q5aankp6790q10p1r8d1vdhdp" + "commit": "260a074d44eaa9e49576dca24c09cca54f1e193d", + "sha256": "1gjrb8hmf44vhf0dssm7pwkz4mx2w7hkxk7540xd6qiwx7xnl6gz" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "commit": "260a074d44eaa9e49576dca24c09cca54f1e193d", + "sha256": "1gjrb8hmf44vhf0dssm7pwkz4mx2w7hkxk7540xd6qiwx7xnl6gz" } }, { @@ -83274,26 +84087,28 @@ "repo": "tarsius/minions", "unstable": { "version": [ - 20260101, - 1837 + 20260601, + 1513 ], "deps": [ - "compat" + "compat", + "seq" ], - "commit": "5b73cd443c28a6e9c8e5ddd60ada38afdf40dfb9", - "sha256": "0kl269rq1abjcpnxffd8xgcdw3bwgcq31bzfvmp8wvdnkdpfi3ci" + "commit": "7ec2810c9b3019f8e379022b0ca7ce61e9e7c810", + "sha256": "11y569lmrm7fj42janr9n4fggvi3jh5zzxs33n9q49kg50hclh4s" }, "stable": { "version": [ 1, 2, - 0 + 1 ], "deps": [ - "compat" + "compat", + "seq" ], - "commit": "5b73cd443c28a6e9c8e5ddd60ada38afdf40dfb9", - "sha256": "0kl269rq1abjcpnxffd8xgcdw3bwgcq31bzfvmp8wvdnkdpfi3ci" + "commit": "7ec2810c9b3019f8e379022b0ca7ce61e9e7c810", + "sha256": "11y569lmrm7fj42janr9n4fggvi3jh5zzxs33n9q49kg50hclh4s" } }, { @@ -83304,14 +84119,14 @@ "repo": "shoshin/minitest-emacs", "unstable": { "version": [ - 20250803, - 49 + 20260622, + 2214 ], "deps": [ "dash" ], - "commit": "d278e94fb1874c584699e1d6fa1b34224c1f8550", - "sha256": "1snkk3fqhaaaxbhlshfvmpq1bs2bcbgmamm7fncgaz5kkv3d0x0n" + "commit": "596cc885d3f4898d85c78d1686b22c379fe2acae", + "sha256": "0ysdaysqm82zb01dwy5yxk3g41fy0phskd4imcwzkngazwdq2k2l" }, "stable": { "version": [ @@ -83379,11 +84194,11 @@ "repo": "loj/minsk-theme", "unstable": { "version": [ - 20250706, - 1827 + 20260612, + 845 ], - "commit": "c9caae876ef184053fef0bd3fee6243632702487", - "sha256": "0lmf5wdwffgi9l0y8wpis45gg7wzhvvflzfnxly681byginaqjrc" + "commit": "7d1259165a1b7eaecc97d76fc288fa56f8736bef", + "sha256": "1r4hkw4qpx9xq25w0hzzw1kxzvl2rk050a39hd96s15a3jsfix38" } }, { @@ -83418,28 +84233,28 @@ "repo": "milanglacier/minuet-ai.el", "unstable": { "version": [ - 20260424, - 430 + 20260519, + 111 ], "deps": [ "dash", "plz" ], - "commit": "36049820ca987c79c87cc4d9f21d16ca23ff8ebb", - "sha256": "15165fn161c6fvqcrpfffy7l5abs7zscarzhhvzbwppqk3r9wrq8" + "commit": "13fb314a795951b9190c53c59ef281abf7a2cb4f", + "sha256": "13maiy40n4sgmwwp83xc4pwgmdv0jd1j7ca75cna9swqq28dmfgi" }, "stable": { "version": [ 0, - 7, - 1 + 8, + 0 ], "deps": [ "dash", "plz" ], - "commit": "7b34bf0f0334478dab15ce185eacc794a6c7415f", - "sha256": "085iclc2766sv6mxim7ppxdcss769zax2gk92wpj5130zpayngzq" + "commit": "13fb314a795951b9190c53c59ef281abf7a2cb4f", + "sha256": "13maiy40n4sgmwwp83xc4pwgmdv0jd1j7ca75cna9swqq28dmfgi" } }, { @@ -83512,6 +84327,21 @@ "sha256": "0insbf8gcg172yg1w7gmy4hf3krv58gxqbb1ch2902djyvsfwwdn" } }, + { + "ename": "mise-tasks", + "commit": "a00cda32a35da1bb4eb33c81212a4aa5df26755e", + "sha256": "0nhaidc9il333v2br9ha5xzwlb3qin9l4ghjp1xgri2hsi8l5v3l", + "fetcher": "github", + "repo": "klochowicz/mise-tasks.el", + "unstable": { + "version": [ + 20260703, + 656 + ], + "commit": "76c762bd920bf1e2faac631ac990c4e2e798d321", + "sha256": "178apcbm3bl1fyphbi1mkd3hrfd418g4nmahz5msad145vr01z5j" + } + }, { "ename": "mistty", "commit": "8a66484b8aff8298222e70466f8f9b09b31bc598", @@ -83520,11 +84350,11 @@ "repo": "szermatt/mistty", "unstable": { "version": [ - 20260205, - 1444 + 20260715, + 1804 ], - "commit": "bf0ddd077351001c56a4c754399d7ec025b93bab", - "sha256": "0j4m5ivbzkrp4jspcvbi3jy3dq4lqmm93p47pc1v9v0g54hym5nr" + "commit": "879abed83287ab79b6d3dbdab7df2bf3fc68769a", + "sha256": "1vhrsmbg6lx2ckxsxqjv5f4wnijdilbzj5qpdq47f8j2fqslw2mw" }, "stable": { "version": [ @@ -83600,20 +84430,20 @@ "repo": "jdtsmith/mlscroll", "unstable": { "version": [ - 20250112, - 1440 + 20260703, + 1544 ], - "commit": "d22f5d8e6ca5054d01f06ac57419267098b709a5", - "sha256": "00q0s1y8y4j9qyldbp9bwd7cqd5023wizlmsm7rkns5icf42hwbm" + "commit": "ff698fbbfc3b7c5775944bdff2da0acfb697d162", + "sha256": "197k737a3dxfjakj4lzf09sasjd46nq7dk5c78bbjlzbjdpg3r53" }, "stable": { "version": [ 0, 2, - 3 + 4 ], - "commit": "d22f5d8e6ca5054d01f06ac57419267098b709a5", - "sha256": "00q0s1y8y4j9qyldbp9bwd7cqd5023wizlmsm7rkns5icf42hwbm" + "commit": "ff698fbbfc3b7c5775944bdff2da0acfb697d162", + "sha256": "197k737a3dxfjakj4lzf09sasjd46nq7dk5c78bbjlzbjdpg3r53" } }, { @@ -83850,20 +84680,20 @@ "repo": "trevoke/mock-fs.el", "unstable": { "version": [ - 20260111, - 410 + 20260708, + 2247 ], - "commit": "c1a4b1f923bed627aea5579acd782e91243e7cdc", - "sha256": "10cg7gsf0iba8jh9gxvykrhc0ai3rnnwwjrcc0jnasn8fxfpkyz1" + "commit": "b15c34281d076d6aa1ea5820368307694952e2ce", + "sha256": "0jdpqpzcwf2d2pwlj9car9zx7y4d2i4nm8b057fyk5klw3hk4hpq" }, "stable": { "version": [ 0, 10, - 1 + 2 ], - "commit": "c1a4b1f923bed627aea5579acd782e91243e7cdc", - "sha256": "10cg7gsf0iba8jh9gxvykrhc0ai3rnnwwjrcc0jnasn8fxfpkyz1" + "commit": "b15c34281d076d6aa1ea5820368307694952e2ce", + "sha256": "0jdpqpzcwf2d2pwlj9car9zx7y4d2i4nm8b057fyk5klw3hk4hpq" } }, { @@ -83976,49 +84806,49 @@ "repo": "purcell/mode-line-bell", "unstable": { "version": [ - 20181029, - 516 + 20260702, + 1209 ], - "commit": "4985ba42f5a19f46ddbf9b3622453a9694995ce5", - "sha256": "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y" + "commit": "b888963bf390b6e1d132b72b8a14041bd7afae4b", + "sha256": "0lbdwwb6wyqpk3kbs4bp7lvcsp2jjks6v5flx66cinl6jg20l4gj" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "4985ba42f5a19f46ddbf9b3622453a9694995ce5", - "sha256": "13n3di05lgqfm4f8krn3p36yika5znhymp5vr2d747x54hqmgh7y" + "commit": "6ab459f7be311f5a30679a3dfb28431e3e8d2dad", + "sha256": "11j0dzc8290ykcs2wwyjda3lvmxm39zrvgmig5fq1p3l2984m88b" } }, { "ename": "mode-line-debug", - "commit": "b0080ab9ef1eca5dd19b3fd9af536d8aa17773a2", - "sha256": "0ppj14bm3rx3xgg4mfxa5zcm2r129jgmsx817wq3h7akjngcbfkd", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "02zr339lbgzqn881jbfs0yhg7d9kaa89szd90q30kbhd8ykly4yz", "fetcher": "github", "repo": "tarsius/mode-line-debug", "unstable": { "version": [ - 20260101, - 1838 + 20260601, + 1514 ], "deps": [ "compat" ], - "commit": "a6c26f9d8b574edd3001b8abc6c4801048428385", - "sha256": "0nggr6pwl34qhdjh7dxh88fa35i4d3nhan9w1xwa2fvmjycbayvg" + "commit": "3e1b50bc666beaf6441f652608bf7f48b74e80df", + "sha256": "0n0a5k4vp971nxmpvx0ywynv7si67h0a3ajr10sk51j4v3gffynr" }, "stable": { "version": [ 1, 5, - 2 + 3 ], "deps": [ "compat" ], - "commit": "a6c26f9d8b574edd3001b8abc6c4801048428385", - "sha256": "0nggr6pwl34qhdjh7dxh88fa35i4d3nhan9w1xwa2fvmjycbayvg" + "commit": "3e1b50bc666beaf6441f652608bf7f48b74e80df", + "sha256": "0n0a5k4vp971nxmpvx0ywynv7si67h0a3ajr10sk51j4v3gffynr" } }, { @@ -84197,15 +85027,15 @@ "repo": "deadendpl/modus-ewal-theme", "unstable": { "version": [ - 20260413, - 1551 + 20260715, + 906 ], "deps": [ "ewal", "modus-themes" ], - "commit": "4e52d98c95fb506daa2eec35c6141171f686649d", - "sha256": "0ph4vshvl8knbqhxbklca73zkh0pgihar85lfliyahcr32zfpiax" + "commit": "75f4cbe730d16407f0251d3c45297bb83d31f6db", + "sha256": "1dlqpbc9yn0mpm1rnmy1l1c325jz5hwlnhccsdzc9ai64f4f778d" } }, { @@ -84216,20 +85046,20 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20260418, - 1313 + 20260717, + 1109 ], - "commit": "7c2ce1ff0dc25215061d05a9d796d6193f93c84e", - "sha256": "0ymzjwqbmszjsy30057m91vwvbqyvprsjd7r0cxigqspk2qabfiy" + "commit": "e81c3c6ce3cdeb02266487a6fc1461cb9194c70e", + "sha256": "0y7c8dk5m8nn05s0gazpipvhmadn493clx7hr0dfm54cd767bz8d" }, "stable": { "version": [ 5, - 2, + 3, 0 ], - "commit": "d1037f1322487e5686fff655dcd88aa644b2ad51", - "sha256": "1iqbi71h9xajsw4330157dfs10npfi1z2ads99vr7n5pll7060rc" + "commit": "2d044ac89f3bca7011fa2bfda003cf80ce115f70", + "sha256": "1xbwvw3fg1c18gs6w10vp843mzjqxrv24ks7ll2zj8y4mcig3fbm" } }, { @@ -84240,11 +85070,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20260304, - 1519 + 20260515, + 841 ], - "commit": "075f91acc2a7ad722bdda0ab945a7fb0f7c4565f", - "sha256": "1z3whsgjj404dxylgz430l0n8j9kbjab87phy6g8q2pqciailbd8" + "commit": "c7d711e940a6c4e7a2270830aeaf52c1ce789455", + "sha256": "141jzhfpcah0lw17lwgsd31jp93qr02371rjm2k92vawhx90hir6" }, "stable": { "version": [ @@ -84407,11 +85237,11 @@ "repo": "ideasman42/emacs-mono-complete", "unstable": { "version": [ - 20260105, - 209 + 20260522, + 348 ], - "commit": "12eb3f326f49212787be6e34a69e830652c8a9be", - "sha256": "1p9bac7196cjfxqsxigcpjxxswvhrpy8cxpxhyd5n8mw8yp7nl5w" + "commit": "7d3d5656269f290a8ebec772d877d95cc815939b", + "sha256": "0m2qma32a23amc3s3h66j9df55gm4airw888ibd3nmsfx6n46iki" } }, { @@ -84578,26 +85408,26 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20260101, - 1838 + 20260601, + 1514 ], "deps": [ "compat" ], - "commit": "82f65014dcdfc7178464c282b5c9ec5f7016c945", - "sha256": "1ash61h0w26yzjgxzi8ga4baki35724h75nf3ivp8hlgpcnnb8rj" + "commit": "48556e65f37c040a430f123494f517f961ae000c", + "sha256": "04y4nlrfrk35pw55pfss2kwxg851dpb9lbmzi3hzc1xm3wmk63mb" }, "stable": { "version": [ 1, 2, - 2 + 3 ], "deps": [ "compat" ], - "commit": "82f65014dcdfc7178464c282b5c9ec5f7016c945", - "sha256": "1ash61h0w26yzjgxzi8ga4baki35724h75nf3ivp8hlgpcnnb8rj" + "commit": "48556e65f37c040a430f123494f517f961ae000c", + "sha256": "04y4nlrfrk35pw55pfss2kwxg851dpb9lbmzi3hzc1xm3wmk63mb" } }, { @@ -84624,6 +85454,21 @@ "sha256": "0rdvcv8hwrxxbb9s8sfx5331a08kdk28x8chnnq3pj58pxqvagy3" } }, + { + "ename": "moonbit-ts-mode", + "commit": "f75f44e867a0ed35a5beb1436f8e2f46ebd97358", + "sha256": "0i4wbg7vd2ijmv3z86gmbv6irkaa37cxlvm8f9wg73qzlxgx8haw", + "fetcher": "github", + "repo": "moonbit-community/moonbit-ts-mode", + "unstable": { + "version": [ + 20260713, + 229 + ], + "commit": "f8ae31f506571614afea2fcd03532d872afd917b", + "sha256": "0nsmxrk39sh0dl2vjr9zpx0h5yngagarkcvs85iaqmk149fm0368" + } + }, { "ename": "moonscript", "commit": "3046afee95277024830d7d372f2f1c84a0adcb00", @@ -84699,26 +85544,26 @@ }, { "ename": "morlock", - "commit": "b6ef53bbc80edda12a90a8a9705fe14415972833", - "sha256": "0693jr1k8mzd7hwp52azkl62c1g1p5yinarjcmdksfyqblqq5jna", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "1cg5p37w83z5jrryp574qmnqgp4rpzgd0ghm2arwd18lmryddi66", "fetcher": "github", "repo": "tarsius/morlock", "unstable": { "version": [ - 20260101, - 1839 + 20260601, + 1518 ], - "commit": "4ec0253ffbac4764b90457bb3b887b0a07badb20", - "sha256": "03n4vrlik3mid9jvvn36q856a48dghpcjcdhkjfshxdialywfdza" + "commit": "1fd3cc79b1fa1f69386d6b2fa058e2477d35a4e7", + "sha256": "0xwm8dzb9jaflra3r60iq56wgfwhydh7y66ycgfk3fja48mzppxk" }, "stable": { "version": [ 2, 1, - 3 + 4 ], - "commit": "4ec0253ffbac4764b90457bb3b887b0a07badb20", - "sha256": "03n4vrlik3mid9jvvn36q856a48dghpcjcdhkjfshxdialywfdza" + "commit": "1fd3cc79b1fa1f69386d6b2fa058e2477d35a4e7", + "sha256": "0xwm8dzb9jaflra3r60iq56wgfwhydh7y66ycgfk3fja48mzppxk" } }, { @@ -84937,11 +85782,11 @@ "repo": "emacsfodder/move-text", "unstable": { "version": [ - 20231204, - 1514 + 20260508, + 508 ], - "commit": "90ef0b078dbcb2dee47a15b0c6c6f417101e0c43", - "sha256": "16x8p9brj5nrjk2rmhwf6hb8sj0rjr4j2827z0g679zyns3cbyrb" + "commit": "142890cfb46d9c374113b4b49021a4202033147b", + "sha256": "0zhzfiwcslkgbjqgiyrp7yr3n41cys26i1qdq7p29bwmsm61iqc9" }, "stable": { "version": [ @@ -84985,20 +85830,20 @@ "repo": "mekeor/mowie", "unstable": { "version": [ - 20250113, - 122 + 20260610, + 846 ], - "commit": "26f605cf632579af897a85a3922bf17fac616519", - "sha256": "091ylr2mk1767h076g6wcx99rv2v78bmfw2b6hjmc9260m7mvr8y" + "commit": "30eb09b9c671b61b081b1d7096f4650641ee3ea0", + "sha256": "0aq078i75x742b15cr7crn7bfb8nqw9kldax8g2ixbyp3h374l9l" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "7b826c751014a294b493a6bfebe1cda6a1832ab0", - "sha256": "19k89z6ji2j99q72b3dc28w2d9pqhcfwnzfll1yqd8sc1dkkd03k" + "commit": "30eb09b9c671b61b081b1d7096f4650641ee3ea0", + "sha256": "0aq078i75x742b15cr7crn7bfb8nqw9kldax8g2ixbyp3h374l9l" } }, { @@ -85009,20 +85854,20 @@ "repo": "google/mozc", "unstable": { "version": [ - 20260327, - 323 + 20260624, + 1355 ], - "commit": "891e32473ece7f77f0b69c73bc5a53a352a27ad0", - "sha256": "0izy16hdjqrlh5516y868fvgmrfmncxpxbfjsiwlwg9xf006vh41" + "commit": "76887c679e1e4f156102e4bc62ea9cf9174678a3", + "sha256": "18v2vlxcs0pxq84mydqdzrfn5jf7waav6ykrawd74mfhlwjp3f4v" }, "stable": { "version": [ 3, - 33, - 6133 + 34, + 6239 ], - "commit": "c9163b6bb1010671781b8acd358b025c519fc1e0", - "sha256": "0hq5iin2fnf4y6klmlbiqkw1h0l77appyhlagn735brf2n74qaxg" + "commit": "76887c679e1e4f156102e4bc62ea9cf9174678a3", + "sha256": "18v2vlxcs0pxq84mydqdzrfn5jf7waav6ykrawd74mfhlwjp3f4v" } }, { @@ -85063,6 +85908,36 @@ "sha256": "0cpcldizgyr125j7lzkl8l6jw1hc3fb12cwgkpjrl6pjpr80vb15" } }, + { + "ename": "mozc-modeless", + "commit": "021a4e6c04f634474e15acb8685c5e2adc286e2d", + "sha256": "0ncjci8a2szdimb7zmyxla57jgljmz6kc5dgc12rg1ggqbndp76g", + "fetcher": "github", + "repo": "kiyoka/mozc-modeless-emacs", + "unstable": { + "version": [ + 20260621, + 520 + ], + "deps": [ + "mozc" + ], + "commit": "95adeb91fbafb569d7ac06a3ab7df9679349a7be", + "sha256": "1bn673i194w77k84lnj2m5lmdhnxw5xpw5byr74496075axlnrnh" + }, + "stable": { + "version": [ + 0, + 10, + 0 + ], + "deps": [ + "mozc" + ], + "commit": "95adeb91fbafb569d7ac06a3ab7df9679349a7be", + "sha256": "1bn673i194w77k84lnj2m5lmdhnxw5xpw5byr74496075axlnrnh" + } + }, { "ename": "mozc-popup", "commit": "c1f6256e8ef106684b1b546003ec8b591fdea560", @@ -85367,11 +86242,11 @@ "repo": "xuchunyang/msgpack.el", "unstable": { "version": [ - 20200323, - 515 + 20260706, + 1555 ], - "commit": "e2a0d76d1087bc8178c9f27222cb9b93e2e815ec", - "sha256": "016vjm7sjasqqhxpq0yl12fxx9pfi3dzpp48k9xhr5wldw94czqx" + "commit": "5353a7b2da854c843cbec4536996242001f63471", + "sha256": "08pr8ijvfpnzx4bxbj8cjmibk2mlx0ksjwm3dv3lzp3i6cg5mhsw" } }, { @@ -85592,14 +86467,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20250228, - 218 + 20260629, + 815 ], "deps": [ "nerd-icons" ], - "commit": "13541181d5144ee91d570ab74558abce194b083f", - "sha256": "1lvwg0yb993j57y7663jm33g7j0x0jqbhqgf8vdy6qv198wpj5nc" + "commit": "2d048729ab106aebf1acb99e1ccfd002a0f2ec4a", + "sha256": "08p0lvlf6s1w6wd588x64jshxaqyazszmrcwq83bd242k101vvnk" } }, { @@ -85610,11 +86485,11 @@ "repo": "mkcms/mu4e-overview", "unstable": { "version": [ - 20250406, - 1225 + 20260515, + 1818 ], - "commit": "527c3d3a4618c6ba7e6dec679ec2eff8854775d2", - "sha256": "1fxxbfn8hgx07rr9rrfr8bmhay576shc1s14smnjakrg51a69sl9" + "commit": "b6dfe3ecc569aa6313ef093c0c49df8a507f19c4", + "sha256": "0xkaqnqxj2f1f9ssnrgv4aqdwb6aq148pnhzrl52z1lj3p8k7q31" }, "stable": { "version": [ @@ -85859,11 +86734,11 @@ "repo": "ellisvelo/multi-project", "unstable": { "version": [ - 20240115, - 1635 + 20260513, + 1126 ], - "commit": "3bc67ba8adf10a0844fa2f9cce9d78f130307645", - "sha256": "0f4p3ndp2qlphad46qhyfmjcd0kmazkz6yr7278ca4zminchfrvc" + "commit": "1ddfd60410dd146c59e9950ef88c5f0084807012", + "sha256": "17zjbfjz96j5bjjdwxb7qaybd4s1f8xgnldnd0qjqrcc5w2aazis" }, "stable": { "version": [ @@ -86087,6 +86962,24 @@ "sha256": "06flfld7s8ld02j6d3zhdppb7cqz1cbizdp5pkx252r4cl5i73m0" } }, + { + "ename": "musicbrainz-interactive", + "commit": "cf0a2b5b33488677cae50502ebdce479f9784a4c", + "sha256": "1vxaldmhp3crz3xsspiq1xyja7k7spsmbwk27dmmzm5lisvxhc6c", + "fetcher": "github", + "repo": "zzkt/metabrainz", + "unstable": { + "version": [ + 20260711, + 830 + ], + "deps": [ + "musicbrainz" + ], + "commit": "6c699a9c1a8b9292a732ae1bd662b021fcd8d8b8", + "sha256": "0xnx60g9l523k5ckx97bv1h3n472da268acl20nq6158w7zh6ni0" + } + }, { "ename": "mustache", "commit": "ad320d60e2c95881f31628c19ad3b9ece7e3d165", @@ -86467,6 +87360,21 @@ "sha256": "0gylwdq81s89civrlwsg4zrvyjkjw37jdp1mvsihx8xpq38w4r65" } }, + { + "ename": "mysql", + "commit": "81dfb7ffcdeaca544f659556c1dd9f020f3429df", + "sha256": "0kfdchh7nhywdq3yw0ac9clxaihxib9rysbrybzyk9ksxkpdvqgj", + "fetcher": "github", + "repo": "LuciusChen/mysql.el", + "unstable": { + "version": [ + 20260716, + 1425 + ], + "commit": "af030703c54004d28794c9b259d8fa6c7eaeec19", + "sha256": "0piq2xb93x7hviip5hyaj7vfgrcwrkd190hydlwvsg1j2sw9y3na" + } + }, { "ename": "mysql-to-org", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -86958,20 +87866,20 @@ "repo": "skeeto/nasm-mode", "unstable": { "version": [ - 20250320, - 1646 + 20260509, + 953 ], - "commit": "4e670f6dededab858251670aa5459c950f78d867", - "sha256": "12ynvw6l1a9n8x1q4fpm0fz15zf2vp3jibsq5z8si1czgkz0cw97" + "commit": "fab76d8e092419c341b6240fcc7123975db177e1", + "sha256": "11qjcbvac2aqba136zyvgqhcfcrx6znc9s4cym8mcvfms05sphsm" }, "stable": { "version": [ 1, - 1, - 1 + 2, + 0 ], - "commit": "d990ed94d902b74a5c834fb567e03307607cee45", - "sha256": "1dyc50a1zskx9fqxl2iy2x74f3bkb2ccz908v0aj13rqfqqnns9j" + "commit": "fab76d8e092419c341b6240fcc7123975db177e1", + "sha256": "11qjcbvac2aqba136zyvgqhcfcrx6znc9s4cym8mcvfms05sphsm" } }, { @@ -87176,20 +88084,20 @@ "repo": "babashka/neil", "unstable": { "version": [ - 20251217, - 857 + 20260524, + 1246 ], - "commit": "196e8f7933289902965fdc6da2d0227b80e06936", - "sha256": "1rn5ykaccwmgx7s68nksfv6v5s9qz7saq3ayhafzfpv3smj02p0m" + "commit": "2cdd7c66843ba3f1a2adb08208f2312b72b31900", + "sha256": "0x93zp21744df5i7aqqgxbgdi1xwmx2yr6x96c0r8g9rzyp5krby" }, "stable": { "version": [ 0, 3, - 69 + 70 ], - "commit": "fa793214d7820e6763108c942e9cf16e1cd2db96", - "sha256": "0lk0ppykxp4nci6989bz0rh5jb4a4pl0pdzqim87kxv1ji2rc6rm" + "commit": "2cdd7c66843ba3f1a2adb08208f2312b72b31900", + "sha256": "0x93zp21744df5i7aqqgxbgdi1xwmx2yr6x96c0r8g9rzyp5krby" } }, { @@ -87223,20 +88131,20 @@ "repo": "bbatsov/neocaml", "unstable": { "version": [ - 20260416, - 647 + 20260710, + 532 ], - "commit": "06794d8d9ae1180a37b71b02ed8eadd464129b73", - "sha256": "1wzjsk8252clak794yhk89s2qwgcl95a8mgdyd6wvn4a4bg0ksaw" + "commit": "32acab3624160a7d0bb04c42babaa791729ab8b5", + "sha256": "0jib25g15aj65jvsfb0ngkiwh85nlyz18qb6wjdd3rfmxb68wrjh" }, "stable": { "version": [ 0, - 8, + 10, 0 ], - "commit": "deb95d8b87641cf31d64487f627d8a51e48ff2e7", - "sha256": "0prsi5g8wamh6v4l6jqsws78q63i07gfxkgbvns139fckdssgr2b" + "commit": "32acab3624160a7d0bb04c42babaa791729ab8b5", + "sha256": "0jib25g15aj65jvsfb0ngkiwh85nlyz18qb6wjdd3rfmxb68wrjh" } }, { @@ -87301,11 +88209,11 @@ "repo": "rainstormstudio/nerd-icons.el", "unstable": { "version": [ - 20260325, - 346 + 20260710, + 1627 ], - "commit": "1db0b0b9203cf293b38ac278273efcfc3581a05f", - "sha256": "0v7wm8p432h3v2q4sll254hl3n9vdb5irfp6yw9kl1sc9j5x4iif" + "commit": "674909974637ff0ec2b5ebf43f9a8aefa35d93e9", + "sha256": "14rd0nj7v29mq78gvmsqys650fz1q44hqk6ymhlr380wjhsx8jpx" }, "stable": { "version": [ @@ -87532,11 +88440,11 @@ "repo": "Feyorsh/nethack-el", "unstable": { "version": [ - 20260417, - 234 + 20260503, + 532 ], - "commit": "4c6e483966eee5a210b99ea8de34d20146e21237", - "sha256": "1x5z3ncla9726pihvfw8qzdbahqii0gfh9wcfh3v03f1ggjim7hh" + "commit": "a666c5917a44458a103e99587239fa7db67b9072", + "sha256": "1h2akkw5hg7d2ffra94gam2zm5al4lxxhd2indkap8ppnjiidl32" } }, { @@ -87632,11 +88540,11 @@ "repo": "vekatze/neut-mode", "unstable": { "version": [ - 20250608, - 958 + 20260425, + 747 ], - "commit": "8cfea9d387dd252de40c941c52b08699d45e1f04", - "sha256": "01pifaj9dsilxh020v2qqhw070r8hhy4s3n73bfs6ka957wrjja9" + "commit": "536ba9641011ea31c019beb6399ffca9945fc34e", + "sha256": "1va03vy072cd4n0pvi0swvnx9bxirfsaiwk29j55w91f14jcqh0p" } }, { @@ -87776,8 +88684,8 @@ "repo": "ewantown/nice-org-html", "unstable": { "version": [ - 20250608, - 1715 + 20260625, + 1926 ], "deps": [ "dash", @@ -87785,8 +88693,8 @@ "s", "uuidgen" ], - "commit": "bdb49bbe22dbd99489f2c65a10cb90f29d39d80d", - "sha256": "1gm9dr5914hgq07xng06w2myhn115ayv5x8br6s2njw9lqmj6zxz" + "commit": "16c9efdd92a12c78a55364f3d5e8e310585aa012", + "sha256": "0skahzl2ai7v92cl40p8hxs2qj82dbpf9gmq7314s2gbdibklpk3" } }, { @@ -87956,20 +88864,20 @@ "repo": "mrcnski/nimbus-theme", "unstable": { "version": [ - 20260112, - 41 + 20260719, + 1540 ], - "commit": "1ee3e643a01129263833ee5538e5df1fefb25cde", - "sha256": "0a4w8pvwmpjb0lflxccvp67gr16xb458hzkj7zjkm44iq7i55qy1" + "commit": "d755926ec6984207f63733a0fa9612954b350c34", + "sha256": "1vc0c3pdcrqqizf7v3nlg6dhljwsb4vycncspx9qfi1znr8cw56d" }, "stable": { "version": [ 1, - 3, + 4, 0 ], - "commit": "178557148f2e132c79be25429d04c5b89f6535dd", - "sha256": "09lcyxd4nds79m8bpk5pq5p5brb8c6czzvniarn8njzj13lcy2g6" + "commit": "d8544f963463d9d2e6ae3b701c1538064d57c6df", + "sha256": "1adkbhs2yrmhi6nh30c2dsiamh5wd3ibg31nl4f2qyc00cpzs40j" } }, { @@ -88167,11 +89075,11 @@ "repo": "nix-community/nix-ts-mode", "unstable": { "version": [ - 20260423, - 1718 + 20260705, + 1600 ], - "commit": "50916188784786ed201a8edc70a5264eefb525e3", - "sha256": "14yqs2gibq7fdg79h9mcjrnxm0y6gscbvgzjlkp8gm0dmh2x8b1y" + "commit": "3b69aeb8d2403ea52b60a46fa452965b7b37a50e", + "sha256": "0br7g2py8r1xgc0hmcbcax77kiw8ljwbcp8y51ryvjpah0jrb0pf" }, "stable": { "version": [ @@ -88349,16 +89257,16 @@ "repo": "dickmao/nnhackernews", "unstable": { "version": [ - 20230705, - 1359 + 20260630, + 1255 ], "deps": [ "anaphora", "dash", "request" ], - "commit": "4c13d261bf660901d5ff63a7ee170097ebe464ed", - "sha256": "08z81m25lh1basmq5w8w1sg284dfck3nzlcnv1cbj4fr2qqncvyn" + "commit": "0cb7ff0a86c9c5b08786b6dc0591adcb25fbe3b3", + "sha256": "0hcvas8h5mfs7g80in9yvahvb8s18frfy6glv27f3czjaf9s1crz" } }, { @@ -88442,26 +89350,26 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20260415, - 2031 + 20260706, + 850 ], "deps": [ "compat" ], - "commit": "3c40e8a1dd7b20c6db90874b7b3088089a48acdc", - "sha256": "19pbbhdad38h87mwqrhrzzbi66ml9l94rjyfh6h14xqvhy11z0y4" + "commit": "fa0801e5a1135cdb5ba525869f578cea87e8db0e", + "sha256": "10mamnnayfxwa1x5ibyks8i684bhqzq6k24askzdi3galc31gpdh" }, "stable": { "version": [ 1, 8, - 6 + 9 ], "deps": [ "compat" ], - "commit": "db60be0939f31eae0cfc537918503a13b028fa56", - "sha256": "1iaszl8q6chaj8cx0gmzg3pkmm9kl9pdr9nxlqydnzbxfc041zi9" + "commit": "719c2a3773419ebc92a06e61b0fb26f6d64e750e", + "sha256": "1ydqwg77k8f67fa8dnmxxcg4nyyrcm459h1553j15fm1bjw0af0v" } }, { @@ -88900,6 +89808,30 @@ "sha256": "1yin5i38jdp47k6b7mc0jkv9ihl8nk5rpqin4qmwbhb871zxn7ma" } }, + { + "ename": "nostr-publish", + "commit": "280679e6f0834e6e7e936b72044e9426dcc28c01", + "sha256": "012yq5nhirhf01dsi34p3s2cc1xl6bp7qpf16bmzk195lccjiyz2", + "fetcher": "github", + "repo": "941design/emacs-nostr-publish", + "unstable": { + "version": [ + 20260223, + 951 + ], + "commit": "f39220f2aaff5fc39e4268d6449a1a402a69cafa", + "sha256": "0gmcwsbndbc0n5jkxp5cx6irnph4lslcmvp33y7cn1nb0ikghqj9" + }, + "stable": { + "version": [ + 0, + 2, + 1 + ], + "commit": "f39220f2aaff5fc39e4268d6449a1a402a69cafa", + "sha256": "0gmcwsbndbc0n5jkxp5cx6irnph4lslcmvp33y7cn1nb0ikghqj9" + } + }, { "ename": "nothing-theme", "commit": "8f69a676e9adfb45f8fbd4467e86a4cb0fbf6ae8", @@ -88961,28 +89893,28 @@ "repo": "tarsius/notmuch-addr", "unstable": { "version": [ - 20260101, - 1842 + 20260601, + 1530 ], "deps": [ "compat", "notmuch" ], - "commit": "f4cb7f273b44faa4c0c5c85b2d740086ca709c56", - "sha256": "17nbzpq69drksjbi2ckwnp837kjapsg0s0y8xd1m3p706cvsnd6i" + "commit": "0cb6f9e0dc0e27b31b4849630f7e74bafaa78758", + "sha256": "07030f81pskm3v3fwqwrrjl3jmk9sw21hypmzv764zvifd4mq5z4" }, "stable": { "version": [ 1, 1, - 3 + 4 ], "deps": [ "compat", "notmuch" ], - "commit": "f4cb7f273b44faa4c0c5c85b2d740086ca709c56", - "sha256": "17nbzpq69drksjbi2ckwnp837kjapsg0s0y8xd1m3p706cvsnd6i" + "commit": "0cb6f9e0dc0e27b31b4849630f7e74bafaa78758", + "sha256": "07030f81pskm3v3fwqwrrjl3jmk9sw21hypmzv764zvifd4mq5z4" } }, { @@ -89053,28 +89985,58 @@ "repo": "tarsius/notmuch-maildir", "unstable": { "version": [ - 20260101, - 1843 + 20260601, + 1530 ], "deps": [ "compat", "notmuch" ], - "commit": "ef3952c785cc4bc41366d798bff5edad1a945553", - "sha256": "0an2y57q45dmwm0jp884m6bfnl2x6r1fxb41ckznylcmvwbn3km2" + "commit": "1ed7738468da9910a9bd32f3c44201ab1e9db242", + "sha256": "09zm428867fkmn5dbmn4l5d1lh8w5d6iwa09skakqmkq2ms4m334" }, "stable": { "version": [ 1, 3, - 2 + 3 ], "deps": [ "compat", "notmuch" ], - "commit": "ef3952c785cc4bc41366d798bff5edad1a945553", - "sha256": "0an2y57q45dmwm0jp884m6bfnl2x6r1fxb41ckznylcmvwbn3km2" + "commit": "1ed7738468da9910a9bd32f3c44201ab1e9db242", + "sha256": "09zm428867fkmn5dbmn4l5d1lh8w5d6iwa09skakqmkq2ms4m334" + } + }, + { + "ename": "notmuch-multi", + "commit": "2eb9727941d4815bd04d47495df109a0320e6198", + "sha256": "0qd4kwgsr7f5gvylajlaq7p5lh222p70f6fynfbf96j063k1n0i6", + "fetcher": "github", + "repo": "pivaldi/notmuch-multi", + "unstable": { + "version": [ + 20260616, + 722 + ], + "deps": [ + "notmuch" + ], + "commit": "baf954b1d510b0e298823ac9c4b1174d953a24c0", + "sha256": "1q47pj6i6rhxwwfi6kjz6g1k62z0lgwpmjl1g2kpngwci79s3mg9" + }, + "stable": { + "version": [ + 0, + 2, + 3 + ], + "deps": [ + "notmuch" + ], + "commit": "baf954b1d510b0e298823ac9c4b1174d953a24c0", + "sha256": "1q47pj6i6rhxwwfi6kjz6g1k62z0lgwpmjl1g2kpngwci79s3mg9" } }, { @@ -89085,30 +90047,30 @@ "repo": "tarsius/notmuch-transient", "unstable": { "version": [ - 20260401, - 1226 + 20260701, + 1305 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "582ebaab67d3c59ec002ae23e0072e4ac9a2f13a", - "sha256": "1k3fk086ijixaqcl2xj4izdncn2q42ldz72bh0rdpng7zn4bfb97" + "commit": "e60942fce3cb1f6a11533500c670ca4ac22186e5", + "sha256": "16kkqvr4bm52vmkz0rpy7icwzk2b796v13pgk1nnpvlq2z6j364n" }, "stable": { "version": [ 1, 2, - 0 + 2 ], "deps": [ "compat", "notmuch", "transient" ], - "commit": "582ebaab67d3c59ec002ae23e0072e4ac9a2f13a", - "sha256": "1k3fk086ijixaqcl2xj4izdncn2q42ldz72bh0rdpng7zn4bfb97" + "commit": "e60942fce3cb1f6a11533500c670ca4ac22186e5", + "sha256": "16kkqvr4bm52vmkz0rpy7icwzk2b796v13pgk1nnpvlq2z6j364n" } }, { @@ -89149,11 +90111,11 @@ "repo": "muirdm/emacs-nova-theme", "unstable": { "version": [ - 20260202, - 501 + 20260508, + 2135 ], - "commit": "6daa91ff091653cae7a94345ca579084f954effc", - "sha256": "1m2hrg9nxc179v9zv4asr38wq4h1w5gk0ih1yfm0fhp8gknkjhw6" + "commit": "84915bcaf5b5ac3accd39853a17b59483e38a8ac", + "sha256": "16z33vg8jf0114l7g3h0ix8kjnb3ziqircpdwa1w21ykk3sczhq9" } }, { @@ -89316,11 +90278,11 @@ "repo": "mattfidler/nsis-mode", "unstable": { "version": [ - 20260331, - 53 + 20260628, + 1801 ], - "commit": "0e1ec26a3943865f33e5590e26f5bc31684ad67e", - "sha256": "0n3hlz00yjznns4d8rshfqwf1yvynr99qhsjkhd5njnfqswfi67d" + "commit": "5ee283dd4da0bf8ca90cc8210da6ad94899d50b9", + "sha256": "0f4a2qha8lgrnw14xrfaiz2s8wzka2p7llc0jymfyln52d2m10hc" }, "stable": { "version": [ @@ -89392,6 +90354,30 @@ "sha256": "0i1x0sd61c8k4q9ijgxyz21gvj1gah273990qfjzj9a25r4hzvlj" } }, + { + "ename": "nucleo-completion", + "commit": "8f1634e697286e8cf318d112f698dd01b53f72e9", + "sha256": "08lhzg7wprax9maggk4vhlf8j9yna4q1qawbrva90lfm4a0yzhaw", + "fetcher": "github", + "repo": "kn66/nucleo-completion.el", + "unstable": { + "version": [ + 20260530, + 1008 + ], + "commit": "0f07a5bcd384716a3b79ab9e82005bb54f721122", + "sha256": "0lbif4isxnawj266cgxvh82fz8238g6vchfishqk9h8b025b6vc4" + }, + "stable": { + "version": [ + 0, + 1, + 15 + ], + "commit": "0f07a5bcd384716a3b79ab9e82005bb54f721122", + "sha256": "0lbif4isxnawj266cgxvh82fz8238g6vchfishqk9h8b025b6vc4" + } + }, { "ename": "number", "commit": "a84d58f0dfdf5f58205fb79d6d52d00637f443aa", @@ -89547,11 +90533,11 @@ "repo": "herbertjones/nushell-ts-mode", "unstable": { "version": [ - 20230911, - 152 + 20260705, + 141 ], - "commit": "68afe1a8275880995b4d9a122fecf4accca15183", - "sha256": "0kd4pqsfyjpi8wdrqnbl18hz3i64gvfs9aarmxq86v8vj519z0wd" + "commit": "49915cd99d62b7e743bd8cf9023a5819479d166f", + "sha256": "1bm9jn1laapvfqh6r47wsav47r44q7w108ysyj622fhd9d6lf022" } }, { @@ -89657,29 +90643,6 @@ "sha256": "1qamw4x3yrygy8qkicy6smxksnsfkkp76hlnivswh7dm3fr23v6m" } }, - { - "ename": "oai", - "commit": "c726b8b2a8db2f008123086f72ec31c99f91c7ea", - "sha256": "1kg3hkka9hp4w2jqg6b7170d2afdgvmlyx51sl05pdqynb3i3zzv", - "fetcher": "github", - "repo": "Anoncheg1/emacs-oai", - "unstable": { - "version": [ - 20260422, - 858 - ], - "commit": "fd2fea7b49a51a1e9d6690d35b1e2f14bf389692", - "sha256": "00kfr18vscizfpf80a9n0yjkbrxlq9wkmrxsr0x18n458cck4fr5" - }, - "stable": { - "version": [ - 0, - 2 - ], - "commit": "48831f36bf7262d33cec19fa6bcafad6b7edfb59", - "sha256": "1b4jp14zvxr3gi4qf3fvcimx24mh96x2nb4hpdjrbdl37wl2wcap" - } - }, { "ename": "oauth", "commit": "32bb970e1577ea36895cf45edec93c9b0878685e", @@ -89723,15 +90686,15 @@ "repo": "conao3/oauth2-request.el", "unstable": { "version": [ - 20210215, - 657 + 20260516, + 830 ], "deps": [ "oauth2", "request" ], - "commit": "86ff048635e002b00e23d6bed2ec6f36c17bca8e", - "sha256": "0z9vkssdxkikwjcb3vrby5dfcixy4lw9r2jp7g9nls6w88l184jf" + "commit": "f6b7ba42ecdfd4cc3588bd57bbb345bdae9b9cd6", + "sha256": "0hclg17qskz2hpxy056x9wgj0lg45z0vrp2h8aswxz7f9dk42x86" } }, { @@ -91540,11 +92503,11 @@ "repo": "gynamics/oboe.el", "unstable": { "version": [ - 20260311, - 1431 + 20260611, + 1508 ], - "commit": "8205f2c6ea747179382423ec5317b70126faaeb2", - "sha256": "0fbh6511s07b4rbx53h7yhfjp8hy57wpgq0ws872ic1r6wf5p1kp" + "commit": "07bd775c04b7c6cf552e34fb7ff5f7df9bb2f81c", + "sha256": "0yn3xhjyqqha61bs9shf9qxpkiij0yf0az2181ii8z1avysh501p" } }, { @@ -91612,11 +92575,11 @@ "repo": "tarides/ocaml-eglot", "unstable": { "version": [ - 20260331, - 1306 + 20260526, + 2031 ], - "commit": "b3ab5f049838d96444d8dcaa83e0b9cb2e9ee4cc", - "sha256": "06nsaxyzvgdjp3wy4hrjcyi904dwqk4wdvyfiprvgd93bqg18f46" + "commit": "1edc88567f45dba18f220fc705acd93e652e12ff", + "sha256": "0w8ca8d8hyyl6mglxyqwbgzbpd1hsjx6h0k602k1m38jc8l7zbbi" }, "stable": { "version": [ @@ -91960,11 +92923,50 @@ "repo": "swflint/ol-bible", "unstable": { "version": [ - 20250819, - 1543 + 20260714, + 1429 ], - "commit": "b67ff8c45d51af9fa71aa44bacb4a872f6b750c6", - "sha256": "0ipx60r8vpjqyan40qv78xg3rbra84yf87bqndz87f6n3h52pc6g" + "commit": "711f9a984c23b0cc91a3a12a339e3d0ebb714a8f", + "sha256": "1433kbnxkhaml5zpkq64k40kyh4wribk963kj1scv7bncgsg4lgz" + }, + "stable": { + "version": [ + 1, + 3, + 3 + ], + "commit": "711f9a984c23b0cc91a3a12a339e3d0ebb714a8f", + "sha256": "1433kbnxkhaml5zpkq64k40kyh4wribk963kj1scv7bncgsg4lgz" + } + }, + { + "ename": "ol-locate-file", + "commit": "7a34c96396078ece320d6d0a061526bb277c226c", + "sha256": "09dqv171lzhzzhql7pji6qb5zkpy9md8xydgvpynbvfzbwlb9qfl", + "fetcher": "github", + "repo": "p-snow/ol-locate-file", + "unstable": { + "version": [ + 20260707, + 933 + ], + "deps": [ + "org" + ], + "commit": "30f84f72616f38975a2dd069dd9f729cb21cca32", + "sha256": "1zlkixv2w3hrbw1jgd6qhfllxbkliqxhv71y8ghj63508vwr34jn" + }, + "stable": { + "version": [ + 0, + 1, + 2 + ], + "deps": [ + "org" + ], + "commit": "30f84f72616f38975a2dd069dd9f729cb21cca32", + "sha256": "1zlkixv2w3hrbw1jgd6qhfllxbkliqxhv71y8ghj63508vwr34jn" } }, { @@ -91975,30 +92977,30 @@ "repo": "tarsius/ol-notmuch", "unstable": { "version": [ - 20260101, - 1844 + 20260601, + 1532 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "8f717329388935538fe433b9a15f1599edd9fcd5", - "sha256": "0vlb6wgp314n6ilzfhz3j3lkzdpv4y0mngp6l2q04np9cqffkvf3" + "commit": "fba0b5790a4c9aafeab69fd329776d0b4afa9aac", + "sha256": "1d5dfr5ndl9lr045fy0wwf1fkxyx4v1viln4pv3gg771x0wxx3sk" }, "stable": { "version": [ 2, 1, - 3 + 4 ], "deps": [ "compat", "notmuch", "org" ], - "commit": "8f717329388935538fe433b9a15f1599edd9fcd5", - "sha256": "0vlb6wgp314n6ilzfhz3j3lkzdpv4y0mngp6l2q04np9cqffkvf3" + "commit": "fba0b5790a4c9aafeab69fd329776d0b4afa9aac", + "sha256": "1d5dfr5ndl9lr045fy0wwf1fkxyx4v1viln4pv3gg771x0wxx3sk" } }, { @@ -92081,11 +93083,11 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20260419, - 703 + 20260524, + 213 ], - "commit": "d1bdd439421865c20e907d9abe65840c57411bc9", - "sha256": "1x88ncrv2mvj5lxwj79pix33mmlarh073vkx8ghdfhlk8qm05w5a" + "commit": "d2ccae56b442d9c5b06dd2481057abbd7eb82551", + "sha256": "1kxzyg453wwn3kr8216zh36z9sn17y4s69fqka1ax33q05074h5s" }, "stable": { "version": [ @@ -92105,11 +93107,14 @@ "repo": "captainflasmr/ollama-buddy", "unstable": { "version": [ - 20260421, - 1616 + 20260715, + 1551 ], - "commit": "62451e54c6f523d839d46a779ebd5c03e10c38c1", - "sha256": "0n29n43jwscplyr8ybpb4fvsg9wcws7cslahwi9vsq0b6rg0ja2b" + "deps": [ + "transient" + ], + "commit": "296dd738e43b91bd877743acd7e57139d437cc97", + "sha256": "17qgn2dkmgp1ka3w5vwfx99snjas1xib61g165xi9ahbl26fp37m" }, "stable": { "version": [ @@ -92870,25 +93875,25 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20260124, - 1000 + 20260519, + 1029 ], "deps": [ "compat" ], - "commit": "6e3a09d6026fe7d7d5a3caf9a3d777cc9841fe80", - "sha256": "1r6sbyz8f3nkq5pr7iq3mm0q2dq3nq28xycf0x6xys7nsq2nink5" + "commit": "cebe19e3cf0f30604d1ed1bfaa74fff21a4e89a5", + "sha256": "0qw3lcn5iqmfa7lmkhrlzpwxm80k1bxb11h0w8akp6910iiq12b8" }, "stable": { "version": [ 1, - 6 + 7 ], "deps": [ "compat" ], - "commit": "6e3a09d6026fe7d7d5a3caf9a3d777cc9841fe80", - "sha256": "1r6sbyz8f3nkq5pr7iq3mm0q2dq3nq28xycf0x6xys7nsq2nink5" + "commit": "cebe19e3cf0f30604d1ed1bfaa74fff21a4e89a5", + "sha256": "0qw3lcn5iqmfa7lmkhrlzpwxm80k1bxb11h0w8akp6910iiq12b8" } }, { @@ -93137,30 +94142,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20260423, - 741 + 20260427, + 1354 ], "deps": [ "dash", "promise", "request" ], - "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc", - "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1" + "commit": "fa5e66fc96a25477780b13cec1fca391260da81e", + "sha256": "1dxij5lm1vk58w87j9ckn38ax5kawcx5v4r2d6rmdvsphnzaxi81" }, "stable": { "version": [ 4, 0, - 4 + 5 ], "deps": [ "dash", "promise", "request" ], - "commit": "2f44330aa2cd0a1f58259c9d83bb697fb0f7b0cc", - "sha256": "0x33724pw8xk6vwksswn7wky1q3n0cxgy0s5s25hxjwzgfg8j4n1" + "commit": "fa5e66fc96a25477780b13cec1fca391260da81e", + "sha256": "1dxij5lm1vk58w87j9ckn38ax5kawcx5v4r2d6rmdvsphnzaxi81" } }, { @@ -93171,14 +94176,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20240716, - 1413 + 20260716, + 2120 ], "deps": [ "org" ], - "commit": "32ee50f8fdfa449bbc235617549c1bccb503cb09", - "sha256": "1hfhnzhmbxrw4kz977s48x4nbq86vda5dvj00s2ima2i22b8l2z4" + "commit": "77d23efec5f5c25fc0798364d2b51a3ce3d8d518", + "sha256": "1kfgiaaq7lxjwczc693vv1yddz28zh4gfl48bf5bggka7b22n36c" }, "stable": { "version": [ @@ -93415,28 +94420,28 @@ "repo": "will-abb/org-aws-iam-role", "unstable": { "version": [ - 20260308, - 1750 + 20260625, + 102 ], "deps": [ "async", "promise" ], - "commit": "0175d5ac66f43f8d32db64a04421fddf57e10af7", - "sha256": "0p1lcchdnmkk9xa2rl1l6dz6nwsb71xq2lbk4ivblmlyqckc1l5n" + "commit": "2e7072a8322a95d39c0019d41eebf9b93bb4a08d", + "sha256": "12fdk34w3kc8w58lsqmw7f5lkblr95hv2s9hhx6q38jd42payki1" }, "stable": { "version": [ 1, 6, - 6 + 7 ], "deps": [ "async", "promise" ], - "commit": "4c6cdde1efd1f33a4e2434db7af7617ce590e90c", - "sha256": "16d92ckk4dk4dgpj0wcw79wnls4r8mfkx2j6pipphp8qr8fi8xmd" + "commit": "49434f06ea8fe1ae3b1ea28555f435bafb6fc5f9", + "sha256": "12fdk34w3kc8w58lsqmw7f5lkblr95hv2s9hhx6q38jd42payki1" } }, { @@ -93598,8 +94603,8 @@ "repo": "lepisma/org-books", "unstable": { "version": [ - 20251022, - 1020 + 20260528, + 819 ], "deps": [ "dash", @@ -93609,14 +94614,14 @@ "org", "s" ], - "commit": "3f769e5a5a85a5eb6a2249ba971a3d77dc6e7d94", - "sha256": "0nf5d5nc9x7sjg35hcjk19xspr6k722g60lmfrb855m4vxliril7" + "commit": "74b82acd56c7ddaec5b03135a4cbbd5330a9b020", + "sha256": "1j2yw6mpki3k5ak5ll93129y389gpbnl86y4c651gash3pd6k088" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "dash", @@ -93626,8 +94631,8 @@ "org", "s" ], - "commit": "3f769e5a5a85a5eb6a2249ba971a3d77dc6e7d94", - "sha256": "0nf5d5nc9x7sjg35hcjk19xspr6k722g60lmfrb855m4vxliril7" + "commit": "74b82acd56c7ddaec5b03135a4cbbd5330a9b020", + "sha256": "1j2yw6mpki3k5ak5ll93129y389gpbnl86y4c651gash3pd6k088" } }, { @@ -93703,14 +94708,14 @@ "repo": "dengste/org-caldav", "unstable": { "version": [ - 20260222, - 437 + 20260501, + 8 ], "deps": [ "org" ], - "commit": "2afbeca982d6b0987b1566eba5a4efa871546955", - "sha256": "0f6pi583zb0i2323m5xdsh8w3f78a0f46nf3315mhdyrv74i7isv" + "commit": "14f541814df597395fddb44b6e4bdb7c20f72cbe", + "sha256": "09gc1q2zs4b66lnjmhbil5c0z84cl44si4qrjh30f6i21gbbbsnq" }, "stable": { "version": [ @@ -93792,11 +94797,11 @@ "repo": "drghirlanda/org-change", "unstable": { "version": [ - 20260227, - 224 + 20260719, + 1721 ], - "commit": "1da8d9384c42f559d41d6564e90c03c28b777387", - "sha256": "17h0rv7gdv3lhfw2cp8d6hqcqwh7lk5dbk1141sk55vxnh45f7l7" + "commit": "5ee789e00157c7cbd88ae8b97f3408f303f1878e", + "sha256": "1imfrwqxbffzzshqx3m6c9bsp2bdzfvs2027avkp1j1y5mszlyyh" } }, { @@ -93825,14 +94830,14 @@ "repo": "swflint/org-cite-overlay", "unstable": { "version": [ - 20251130, - 328 + 20260630, + 558 ], "deps": [ "citeproc" ], - "commit": "b30e7fa63779ea6adf626227bc84c0b114e66c50", - "sha256": "1hbk2zkj0sjm0qlv9lzaacnkp90ajfrahh1wmxcd3qc1r2dcchkd" + "commit": "40dde06e57f4b7f5335e9d5e076e7c2a2dcc7861", + "sha256": "05wa8apw2h4xgj5038gvfv9lvjad0db50y150a9s04frf08jy8ml" }, "stable": { "version": [ @@ -94440,10 +95445,10 @@ }, { "ename": "org-elisp-help", - "commit": "b0a9bf5046a4c3be8a83004d506bd258a6f7ff15", - "sha256": "0a4wvz52hkcw5nrml3h1yp8w97vg5jw22wnpfbb827zh7iwb259h", + "commit": "b8bb0d76e4f23f7255a45360f2a89c5563fd7ed2", + "sha256": "1r0v1ppvdkxc6c1glysc78gq7cx5n8ig4kgrxvdbcydyy5xlss4n", "fetcher": "github", - "repo": "tarsius/org-elisp-help", + "repo": "emacsorphanage/org-elisp-help", "unstable": { "version": [ 20161122, @@ -94620,10 +95625,11 @@ "stable": { "version": [ 0, - 21 + 2, + 1 ], - "commit": "ba81ff4866326dae63b5eecf2643abb444de32a3", - "sha256": "1596r4ix0yas2qwrf38kj14dxdrns0m5622kxvapg7kin67kbifk" + "commit": "5ca3994f2e13b342e0b9d353b66b892e34c7b784", + "sha256": "1sn90262rcrqmmwy45dz8vdd10sv7d5m2dmzz79f5lj6kh90h5zw" } }, { @@ -94688,8 +95694,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20260225, - 409 + 20260612, + 1823 ], "deps": [ "aio", @@ -94700,8 +95706,8 @@ "request", "request-deferred" ], - "commit": "0f46c08f60355729526e970e370defe624e84956", - "sha256": "0cdscldk9fi9vvk8qc4qqhi61qm8n1y35d44jw52dxl4i6wfiggi" + "commit": "7304b592c283944db54ac83201d7be6f13a1f447", + "sha256": "1b701j2m4cn17bh8n3xmxh5d4bwg5i4spc1v9i9rcq96kpj4mkbj" }, "stable": { "version": [ @@ -94730,15 +95736,15 @@ "repo": "conao3/org-generate.el", "unstable": { "version": [ - 20240713, - 159 + 20260516, + 826 ], "deps": [ "mustache", "org" ], - "commit": "39dbf8b5c3d225438f7d65e0dc7e9766d61d4c81", - "sha256": "03xd0cm0splhiznd8sdaipjvifc8pvsyj82s7mj5f3nzpqvv1m9m" + "commit": "e77b9cc063fdc035110ac2feea0799316e7e5339", + "sha256": "041q7mn1kw4wj4kr5gbmqc7nwibqxx9rhzswhwcqh0gvk65pz38a" }, "stable": { "version": [ @@ -94849,8 +95855,8 @@ "repo": "Trevoke/org-gtd.el", "unstable": { "version": [ - 20260303, - 1359 + 20260605, + 2210 ], "deps": [ "compat", @@ -94860,8 +95866,8 @@ "org-edna", "transient" ], - "commit": "1b93028024f587b3da133b4bcae473f92bb60bb6", - "sha256": "0y4rjjxbwgczv3g2mpakx36hp5zbvwkmh9s4594r2vi5mlfllmh5" + "commit": "01a12298033304b751628f41c088e9467d80532c", + "sha256": "1rppn7x9aamag0y7jwpfvbg7gga6bdxh7armrdinpsh1bdrfz2ff" }, "stable": { "version": [ @@ -94881,6 +95887,38 @@ "sha256": "0y4rjjxbwgczv3g2mpakx36hp5zbvwkmh9s4594r2vi5mlfllmh5" } }, + { + "ename": "org-habit-ng", + "commit": "7df3f295c7c16c0b0d3fb7852c3325dfb1c708aa", + "sha256": "0s3lxw45c606dc8r3szr9ccfm8bddr7qppmzwzb0bbhp6079zcll", + "fetcher": "codeberg", + "repo": "Trevoke/org-habit-ng", + "unstable": { + "version": [ + 20260713, + 1625 + ], + "deps": [ + "org", + "transient" + ], + "commit": "8710d55411af41d5505236d33bd5b7ad05807441", + "sha256": "0xdm81y0ws09a4nlv76qm7zzdg30blb0xmb9ryhm8rg8i0nvjpfm" + }, + "stable": { + "version": [ + 0, + 7, + 1 + ], + "deps": [ + "org", + "transient" + ], + "commit": "7fdd0331edbce773ca87f6544c501accd32711f9", + "sha256": "05hi7xig2sml8m5ayzl117rnvdx9k404mqs9mw1lznd7zwm5szwi" + } + }, { "ename": "org-habit-stats", "commit": "dd9fbd4b21685225c2dedafd7eee40fa58910cb1", @@ -94920,6 +95958,29 @@ "sha256": "1s1wlhbd0k10p1d93f7vi29jsm2kh2ws7bqwc9r2fjqd0hgcaz8x" } }, + { + "ename": "org-history", + "commit": "7d3ea7283f6f1b6dde81dfb00b656855f50810e3", + "sha256": "1pwmzmpkgb00frw6id30ni3kcn1k85bvblz12r5lj12hvk6bb7bh", + "fetcher": "github", + "repo": "Anoncheg1/emacs-org-history", + "unstable": { + "version": [ + 20260720, + 250 + ], + "commit": "8a24e4c85c3cce0c91e6aaf37748abccd0cea3ba", + "sha256": "0qk21l399d6whcb8q9qrgyzffkzf3mbv7y4ljm4isy5hng3qffmj" + }, + "stable": { + "version": [ + 0, + 5 + ], + "commit": "518040a62ee8c63e94e7c3147103b0a558c72a29", + "sha256": "1djjnhln4y1g7h5khd5g7n95nigaddj4h7hia4hx6pgica2pyfyx" + } + }, { "ename": "org-hyperscheduler", "commit": "ecb150e9b5370e6a7a5e5d64a577c2a3b58b8a81", @@ -95009,8 +96070,8 @@ }, { "ename": "org-incoming", - "commit": "abd059db58d08c881df15cc8c89fca90252771fe", - "sha256": "0fcrh4q5726zw4q33qh667qh0hbq9z21qchsfs0asmmj4rbmznzj", + "commit": "7b5d551c4669ab4e91a7a54019ec64f48b62f372", + "sha256": "0vwni4kbyy2fxypmanzc3dyzim4nz2bmbp0a9w71c7ffi27v25p1", "fetcher": "github", "repo": "tinloaf/org-incoming", "unstable": { @@ -95188,14 +96249,14 @@ "repo": "a-manumohan/org-invox", "unstable": { "version": [ - 20260408, - 1633 + 20260624, + 405 ], "deps": [ "org" ], - "commit": "6725996a43a1f223caf202eed9d81efd08adf5a7", - "sha256": "0yd5gadhb0s2y8r2n8p2l98k7lygfcr58llb4mw3arri88gc1a6q" + "commit": "0373529a0c922fcca62c7cb604099323bc869f76", + "sha256": "13q23lliqcn1jb7jshl25krgw3lrfcllgq570hgjd7bzf50cs2lr" } }, { @@ -95226,16 +96287,30 @@ "repo": "beacoder/org-ivy-search", "unstable": { "version": [ - 20250305, - 159 + 20260713, + 622 ], "deps": [ "beacon", "ivy", "org" ], - "commit": "d09472c5ae5c099bee17fb0e4f3f017ce7ebd031", - "sha256": "1p48k2fjiig8kfpgrnsrpcyfpyfm17gjr80p0r52bq6ijh2z53bj" + "commit": "5aa418961c6dae576e800df459ad6dbd7740b4b4", + "sha256": "03h0d83zs5qwrs7i7zi96jwwjr4idyw4rngs864vz46kz8amk6nd" + }, + "stable": { + "version": [ + 0, + 1, + 8 + ], + "deps": [ + "beacon", + "ivy", + "org" + ], + "commit": "5aa418961c6dae576e800df459ad6dbd7740b4b4", + "sha256": "03h0d83zs5qwrs7i7zi96jwwjr4idyw4rngs864vz46kz8amk6nd" } }, { @@ -95432,6 +96507,21 @@ "sha256": "0f61xy0hv3pjbhx9wmhpbi43nis90rsx1ljw9kirp99h64gg0jgd" } }, + { + "ename": "org-lark", + "commit": "6f590a3e7e130a87efa3bcb4e166682849dbe103", + "sha256": "1ydwk0vb5xvb6hdhpqys2568lz8dnm2l26kqbs0k4wncpxmyphm9", + "fetcher": "github", + "repo": "bbw9n/org-lark", + "unstable": { + "version": [ + 20260614, + 319 + ], + "commit": "ebbe9ed102be2bf00b698f1280a305d8f3b0d38d", + "sha256": "1a4njnhr9cih9v4mnrf9fpdqbfv5x3rywrs7pk3nhggl81890j40" + } + }, { "ename": "org-latex-impatient", "commit": "5c49e1970a12617b00c79ec2d7112da8c9d8f4f7", @@ -95461,18 +96551,16 @@ "repo": "seokbeomKim/org-linenote", "unstable": { "version": [ - 20241231, - 616 + 20260518, + 1058 ], "deps": [ "eldoc", "fringe-helper", - "lsp-mode", - "projectile", "vertico" ], - "commit": "407d2ac834d1de82dd1e37f4642f74a81cf03350", - "sha256": "12scyxmiirc50qqwxql976560ccipyjrlnxsifwhc7p6xr0jylii" + "commit": "35a7940c1c81a1faf8f4b58a633cdcdd89c99509", + "sha256": "0za47d07qkg1h4baa0jhwd8sgpd56dxkznqjw46524dhzgl9b9mk" } }, { @@ -95483,15 +96571,15 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20260417, - 705 + 20260426, + 557 ], "deps": [ "nerd-icons", "qrencode" ], - "commit": "273e5b250fa2cc9b2dbbb63d9a7225536116fbd7", - "sha256": "1zhwq9mlx6bpfvqqgzmk210na7s8z9dc2cgs031by9b983rjh0bs" + "commit": "7ef11d4fe9874324985006875b9c96f227c6c10b", + "sha256": "1blyiszcrddyr9qjp39fmbz81zbv273d8d2iyxqfpl69nwmvixwq" }, "stable": { "version": [ @@ -95576,19 +96664,19 @@ "repo": "Anoncheg1/emacs-org-links", "unstable": { "version": [ - 20260423, - 1949 + 20260717, + 1827 ], - "commit": "cd2e9c074576e44469d84b5827933a035cf493c5", - "sha256": "01z3pph23cciv92l007s0z9rlhfgyj2ihy264s3l02csssnijma7" + "commit": "d46c02edbdbd9f070b0492ffbe9f4ceea3322737", + "sha256": "0z5lrb25gd1yd4amja3izj5qqrh8v8pw7q5qqjz064hxkmi83xmx" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "c6e8cc6753d3b880b09a6e28f244ada48debfb2b", - "sha256": "1vnqg43f94viixlqqjj0vfrpshzj3inpn36j5ds3f3icjzg7i16z" + "commit": "d46c02edbdbd9f070b0492ffbe9f4ceea3322737", + "sha256": "0z5lrb25gd1yd4amja3izj5qqrh8v8pw7q5qqjz064hxkmi83xmx" } }, { @@ -95675,14 +96763,14 @@ "repo": "laurynas-biveinis/org-mcp", "unstable": { "version": [ - 20251111, - 1319 + 20260714, + 1520 ], "deps": [ "mcp-server-lib" ], - "commit": "70fef64ee096c13eb33389c4803c5825e146c60e", - "sha256": "0r76wcyxmg4glhgj7576jbb0ax7zxbzl7rkg3fx13yfaaxqyw90f" + "commit": "29a2310ed17283e379c322dbf7a1b957a6f2395c", + "sha256": "0djdlq4w3zc02q9kr7y4iv1v3v1ia0aq7jpngvzvrb61233fngq9" }, "stable": { "version": [ @@ -95773,6 +96861,36 @@ "sha256": "0y0yjb0w6s5yxklcxkmylmw031plxhl9dvachx325mb9qcwskycp" } }, + { + "ename": "org-mindmap", + "commit": "c7b17ab04bff23ccea6710224cb46e69c987af61", + "sha256": "0iknjygxiwqsr66vrid2685mbs1xdh5hi0b7lfdfv9ccjn2xq7xp", + "fetcher": "github", + "repo": "krvkir/org-mindmap", + "unstable": { + "version": [ + 20260617, + 1609 + ], + "deps": [ + "org" + ], + "commit": "128e8fb853718bb4a04aff29703b927276a8b24c", + "sha256": "14658gdvk3ii4krli2gr018iwbgdwdkg9lxkpzh4hsnz28fm1v5b" + }, + "stable": { + "version": [ + 0, + 3, + 0 + ], + "deps": [ + "org" + ], + "commit": "de81481bff9e33568b7df202478e95aff9e7b4af", + "sha256": "1i184clw6vagpd15r2v9582yvf3wfqkxarwb4x2mly01s11zzvr0" + } + }, { "ename": "org-ml", "commit": "95cc2843698e2341697a223a463c4d51348aec5e", @@ -95833,58 +96951,27 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20260325, - 721 + 20260707, + 1016 ], "deps": [ "compat", "org" ], - "commit": "0e385ab42887b8589292527735ccd4d2345fa904", - "sha256": "1kdbaxx11gc8q52szfs9hp3is17v04z0jr147d06sxmky5rigphx" + "commit": "d41bedbab849745bd10e300b8d93a17bc78a5ad6", + "sha256": "10yidx97sb0sk6rp4fry4dl5psspjc4mz0aqir53p84nv08y5y6j" }, "stable": { "version": [ 1, - 13 + 14 ], "deps": [ "compat", "org" ], - "commit": "f514a2570da0f7a8ff0d72641458dbcf96ccf702", - "sha256": "16i1nwdilhpjlphpbwi8vjfwfb721gm0mm37hjx570wx4sskvg30" - } - }, - { - "ename": "org-movies", - "commit": "ea06dc48003ba3c4f8e70fef4738cdb306362198", - "sha256": "1l4vd091vqhcs7qgws762x4cdnalj1hiq31d6l740miskc8nb8hr", - "fetcher": "github", - "repo": "teeann/org-movies", - "unstable": { - "version": [ - 20210920, - 101 - ], - "deps": [ - "org", - "request" - ], - "commit": "e96fecaffa2924de64a507aa31d2934e667ee1ea", - "sha256": "1h514knqys20nv9qknxdl5y6rgmyymyr42i07dar8hln9vj0ywqm" - }, - "stable": { - "version": [ - 0, - 1 - ], - "deps": [ - "org", - "request" - ], - "commit": "e96fecaffa2924de64a507aa31d2934e667ee1ea", - "sha256": "1h514knqys20nv9qknxdl5y6rgmyymyr42i07dar8hln9vj0ywqm" + "commit": "4855ade77ab17de7587c37bde12a0afeab342783", + "sha256": "18yg3bg0mnhk4hkx5402rb5d6lyy5qn9pp5m2cigwjaa3316prk9" } }, { @@ -95934,14 +97021,14 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20260211, - 901 + 20260507, + 725 ], "deps": [ "htmlize" ], - "commit": "aa608b399586fb771ad37045a837f8286a0b6124", - "sha256": "0n02g88jybzsx0lqqpzag7hkrlvy3gh6irphgm5wsx42w312k1jl" + "commit": "7b45df759340f3e388e84f497052b7cf3a41698c", + "sha256": "1h44pc7l4racn3rhc705rslwsnk7hmkad3508qdd2raadpj452ja" } }, { @@ -96912,28 +97999,28 @@ "repo": "mrcnski/org-recur", "unstable": { "version": [ - 20230124, - 1532 + 20260707, + 2223 ], "deps": [ "dash", "org" ], - "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", - "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" + "commit": "680731635038bf453dc75242bf007e886be8c765", + "sha256": "1a81zah2fhflc2wcv7kl4c15m0gbhz8flwi9hk19gb5l9k8sm9m1" }, "stable": { "version": [ 1, - 3, - 3 + 4, + 0 ], "deps": [ "dash", "org" ], - "commit": "628099883a63d219f76cd9631cc914fe6ec8a3e3", - "sha256": "0s2n62y3qc72ldzpaq2jz9335h532s566499n346nx21l4qsqdz6" + "commit": "680731635038bf453dc75242bf007e886be8c765", + "sha256": "1a81zah2fhflc2wcv7kl4c15m0gbhz8flwi9hk19gb5l9k8sm9m1" } }, { @@ -97026,20 +98113,20 @@ "repo": "TomoeMami/org-repeat-by-cron.el", "unstable": { "version": [ - 20260303, - 726 + 20260718, + 441 ], - "commit": "9a382e817dc63d5f8a6c74bd9d9233a14f1f3c96", - "sha256": "188ax1qyjgaz5qj5w1g67hnn7xg9m55j6ymqhd1gks52z0g67cyf" + "commit": "3009d28e434e1c44cf55490cfa54d5668107aca9", + "sha256": "0fc3cvcqyg7nqhfhvyy4gcwh2lavpc9af7yvsn82gqjmr8fi366m" }, "stable": { "version": [ 1, 1, - 6 + 7 ], - "commit": "9a382e817dc63d5f8a6c74bd9d9233a14f1f3c96", - "sha256": "188ax1qyjgaz5qj5w1g67hnn7xg9m55j6ymqhd1gks52z0g67cyf" + "commit": "a52d57016d350b10baca2229dc832311f77e6ebb", + "sha256": "195c8b1id0g65yajzmn880zlcsp42f69q96y0l4d0f4zp134pdm5" } }, { @@ -97145,8 +98232,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20260423, - 437 + 20260425, + 1623 ], "deps": [ "compat", @@ -97154,8 +98241,8 @@ "magit-section", "org" ], - "commit": "d42da0e594b5737d25e3662e482d110f29a2668f", - "sha256": "0nvbzz6q4kvv8zqwnlwkk8m469vaf8b8zh0l3d8j2gsk4whn22y3" + "commit": "c54c523dec175695645399705606ea19056a3053", + "sha256": "18l0ka57l5j9js4dm50k174riyrb510yfaylyj8m0yqyrz6jbkn4" }, "stable": { "version": [ @@ -97244,8 +98331,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20260322, - 808 + 20260627, + 2312 ], "deps": [ "dash", @@ -97254,8 +98341,8 @@ "s", "transient" ], - "commit": "b6b6a25029503c27c2d4e4e0ca17a0ab82611470", - "sha256": "1zqpr2hvxisk0lqf6j9ak79s338wwlf4xbvkqh752pm5idlia7fj" + "commit": "89bdd60367f95309334e8804b465e80c1aab9a78", + "sha256": "0ywbih47j81s6zn5x6ilcjx41blx4vg91aqpdiqkhzz8kwpgwggn" }, "stable": { "version": [ @@ -97281,8 +98368,8 @@ "repo": "ahmed-shariff/org-roam-ql", "unstable": { "version": [ - 20260322, - 808 + 20260627, + 829 ], "deps": [ "org-ql", @@ -97291,8 +98378,8 @@ "s", "transient" ], - "commit": "b6b6a25029503c27c2d4e4e0ca17a0ab82611470", - "sha256": "1zqpr2hvxisk0lqf6j9ak79s338wwlf4xbvkqh752pm5idlia7fj" + "commit": "196e6cd37f3eb7418ef250664d62b2cbd67a88e3", + "sha256": "0bl9k29fp59ph431j2132gv3g82ca6v4wbw21cbqy3map4ac2qfv" }, "stable": { "version": [ @@ -97641,8 +98728,8 @@ "repo": "tanrax/org-social.el", "unstable": { "version": [ - 20260418, - 1402 + 20260525, + 725 ], "deps": [ "async-http-queue", @@ -97651,22 +98738,23 @@ "request", "seq" ], - "commit": "613dcf8b65216a32afee1c42bb3273f6c4e1cd91", - "sha256": "14nnnfwp2wqhvv4pcwhasynrjgp6yyqkisfsqmsc87w0akfaziph" + "commit": "754f16c45585fb733fd521558b572f03bc964708", + "sha256": "0m5nrhp1d6ndj48fyh547fdk8gcldwxxczki8hklbpiv1w9s4jsb" }, "stable": { "version": [ 2, - 11 + 13 ], "deps": [ + "async-http-queue", "emojify", "org", "request", "seq" ], - "commit": "367ab5cf6ae12715bb9cade7a8eb45cf8d7f8723", - "sha256": "1aw0zfg898ggyn139n0x2fgaygayl14gv48mq59zw6b8ffkrff52" + "commit": "1dbc252a45881388f9f7cbbf51d5bfd5c0a80d80", + "sha256": "165c50rfzqjij3cm6cxw82gzh71zk5w6zswvzb3qp37rdwjynynf" } }, { @@ -97750,15 +98838,15 @@ "repo": "bohonghuang/org-srs", "unstable": { "version": [ - 20251223, - 1556 + 20260628, + 1143 ], "deps": [ "fsrs", "org" ], - "commit": "c0aff45392b1f836fd943467cc266cef50899a44", - "sha256": "0bvczpn93afdng9xnr3licgmv3yw4rdmsbn45206r756738capn9" + "commit": "e6e5fbfcb8beb520141edac647ccb76af9b71df6", + "sha256": "199qc0ikz9b6hbrpdpc737byqscp2rnh3syvjp71jwf2r7kwkz6h" } }, { @@ -98088,14 +99176,14 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20260123, - 235 + 20260606, + 516 ], "deps": [ "nerd-icons" ], - "commit": "3b0e03b5a7929b2c0b107d90355e0a0f03490aef", - "sha256": "1y2lilr1yjfcrbb6vhc2h8vknh0pwrfrwajim1h8c0xcc6ilzl9g" + "commit": "af491d225771af377d65961e8a5f251b82a0a09a", + "sha256": "1q2bw2s0hs75babxs0wj7hylx0f98gnfv269bifymz6k7y2smwwx" } }, { @@ -98214,20 +99302,20 @@ "repo": "rul/org-tempus", "unstable": { "version": [ - 20260222, - 1840 + 20260601, + 1225 ], - "commit": "f3912ccd9032bea28ff0ee4b3d49a90e17097e26", - "sha256": "158gq02r7vcpbl93s2f1zdwbz4ccyn39i3m6w7bz2c6q3w3ymja6" + "commit": "b5562ca4e3344dde465b5cbd86275336aeac44df", + "sha256": "1gl4bcs7xq0bq4bs7mhmkr24a8n44v7iip2qfp423r4v1a3qk0ry" }, "stable": { "version": [ 0, 0, - 1 + 2 ], - "commit": "e07a05d66c084cf4796c2683f4320d9360af8b83", - "sha256": "1rsybp4827z7z3d66rzjp7kjyb84c12igzxqz26kfzhcd9dlqpav" + "commit": "2226ef0ae21022b9a343983847bce3e6bb07d63f", + "sha256": "0q3pc66naw399f13jgwmknyvsggxjaiyblxi9p77382rizqgkyb1" } }, { @@ -98898,14 +99986,14 @@ "repo": "colonelpanic8/org-window-habit", "unstable": { "version": [ - 20260406, - 1805 + 20260620, + 108 ], "deps": [ "dash" ], - "commit": "dcf1d7b896bd2c0a706c00c0d0daab2fa9e49828", - "sha256": "1016w3zar3l5ry7fvvvidk4fb2hxbb54yizj1583ca57yf40qxid" + "commit": "19a6e070502e2b0d9aa85f12eda48debb44a479b", + "sha256": "16lhsvdi0niaab5cy3ga0h6y63lwqpjiav6ks95lhkf9fjrwa80z" }, "stable": { "version": [ @@ -99280,32 +100368,34 @@ "repo": "magit/orgit", "unstable": { "version": [ - 20260301, - 1255 + 20260717, + 1740 ], "deps": [ "compat", "cond-let", + "llama", "magit", "org" ], - "commit": "4fb91faff3bf32dac5f6f932654c280cd1f190f7", - "sha256": "1qa07q41383f79iv4r5ykxrb1fs2drk6h3qxkb3z7ymhjfbcifli" + "commit": "47b3568fce775c756fb5bb3545c2edd48b8e2fc1", + "sha256": "1yd1rk4cfr7n2fxidmpcpza8zwnzmf6sayp2i0mclrx31y88nmhl" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 0 ], "deps": [ "compat", "cond-let", + "llama", "magit", "org" ], - "commit": "4fb91faff3bf32dac5f6f932654c280cd1f190f7", - "sha256": "1qa07q41383f79iv4r5ykxrb1fs2drk6h3qxkb3z7ymhjfbcifli" + "commit": "7c4827cd04953166f71eaec151ad1c50872fc680", + "sha256": "1730vha6pa10cnz5j5nyzf8wxnnkck6ncmi4i3sqmhfxalf901xk" } }, { @@ -99352,8 +100442,8 @@ "repo": "magit/orgit-forge", "unstable": { "version": [ - 20260401, - 1227 + 20260717, + 1424 ], "deps": [ "compat", @@ -99363,14 +100453,14 @@ "org", "orgit" ], - "commit": "8e4496d7f7f84fab3e36d10883386c02f43a67e7", - "sha256": "0fawwd2yys89kyp1q03xng9azgmbdai067m60x0agahrpvgdrysm" + "commit": "f812864aae188bbbc36725c87bd92909ff0dda3a", + "sha256": "030zdna7kx9bcrbgkn8fmkk4bx3mab6gwhly5dzh4wdf908px1d6" }, "stable": { "version": [ 1, 1, - 2 + 3 ], "deps": [ "compat", @@ -99380,42 +100470,44 @@ "org", "orgit" ], - "commit": "8e4496d7f7f84fab3e36d10883386c02f43a67e7", - "sha256": "0fawwd2yys89kyp1q03xng9azgmbdai067m60x0agahrpvgdrysm" + "commit": "c421620af3fb38ab4654f745f51370471b65cf4e", + "sha256": "1qaq722m0sr1awdgm6fbl52h8h9qa532lisnnnrh578b8aqs3yvv" } }, { "ename": "orglink", - "commit": "be9b8e97cda6af91d54d402887f225e3a0caf055", - "sha256": "0ldrvvqs3hlazj0dch162gsbnbxcg6fgrxid8p7w9gj19vbcl52b", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "1xnrj81fzzbczrh6cirgy9d4gsc6g6qydh1s0zzya1da1sgsd1sb", "fetcher": "github", "repo": "tarsius/orglink", "unstable": { "version": [ - 20260101, - 1845 + 20260601, + 1536 ], "deps": [ "compat", + "llama", "org", "seq" ], - "commit": "0de830edc6ffc0b07b95284f545ffe7d7c37dfb8", - "sha256": "11173ja0cga82fp7qxw900l8wg5fhygi7d5qn0vi5hrh1rwyg9da" + "commit": "e4805628e731021cf360ae7e61dcb40ae1e1992f", + "sha256": "17n6njdp824h0dkdpryw0hzkbaj344c5ya2a5ddiivxbx7i56x2y" }, "stable": { "version": [ 1, - 2, - 9 + 3, + 0 ], "deps": [ "compat", + "llama", "org", "seq" ], - "commit": "0de830edc6ffc0b07b95284f545ffe7d7c37dfb8", - "sha256": "11173ja0cga82fp7qxw900l8wg5fhygi7d5qn0vi5hrh1rwyg9da" + "commit": "e4805628e731021cf360ae7e61dcb40ae1e1992f", + "sha256": "17n6njdp824h0dkdpryw0hzkbaj344c5ya2a5ddiivxbx7i56x2y" } }, { @@ -99561,11 +100653,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20260412, - 811 + 20260717, + 1115 ], - "commit": "348394cbd9d8a25b61bccd284196c97a065b7013", - "sha256": "1jriyc1ir4agljygsq4qc7qdr57231ba2gy1p64pccad01nkpbxl" + "commit": "dc2fdb7149b07f0a4454a36a05b3a174efdfcb6e", + "sha256": "0x7g01yklayxhrsamg3av3sdsdb1077gpddy1098nflvqvsf30kn" } }, { @@ -99606,11 +100698,11 @@ "repo": "tbanel/orgtbljoin", "unstable": { "version": [ - 20260412, - 844 + 20260705, + 1412 ], - "commit": "37883c21e85e71797538d154226e24666bc73047", - "sha256": "0asvlwp7z350v7iphmvfrsgqmw8bfgqvi3bcgpxf2w7i6624hdks" + "commit": "cd637a44e69b8ac3bdb9d99bee5066be279da1d8", + "sha256": "165bb0yhx1fm11cld61lrhfivg4x4pn65r5baciqcfwblsiifxpw" } }, { @@ -99769,25 +100861,25 @@ "repo": "minad/osm", "unstable": { "version": [ - 20260125, - 1200 + 20260705, + 1259 ], "deps": [ "compat" ], - "commit": "19c9c958dd530a1ba606fc1074a28523af40ec28", - "sha256": "1lwjnxafhy5f83ydlccd47r2ramgwdlgzlj15h82yxsl4l0sq380" + "commit": "d6167ca4f99bead657ac6f7f163c1fcf9b34267f", + "sha256": "11nn4rvjqs8f43gfazpghf67ihd994jd53z2pwfjhk8w8dav0gc2" }, "stable": { "version": [ 2, - 2 + 4 ], "deps": [ "compat" ], - "commit": "19c9c958dd530a1ba606fc1074a28523af40ec28", - "sha256": "1lwjnxafhy5f83ydlccd47r2ramgwdlgzlj15h82yxsl4l0sq380" + "commit": "d6167ca4f99bead657ac6f7f163c1fcf9b34267f", + "sha256": "11nn4rvjqs8f43gfazpghf67ihd994jd53z2pwfjhk8w8dav0gc2" } }, { @@ -99853,14 +100945,14 @@ "repo": "xuchunyang/osx-dictionary.el", "unstable": { "version": [ - 20240330, - 942 + 20260520, + 1154 ], "deps": [ "cl-lib" ], - "commit": "6abfd6908b0dc773020466225c908000870b383b", - "sha256": "16mvkrs82g6zhaa10r28v8br0cshv1bsbywyb1qkc8hdkj1hh37j" + "commit": "8e6897844c4d6ff6039b31569058273632afea16", + "sha256": "003rkv79rwaz2zy12vf5hb10sqs00b1ds8398swmj7k48d4la5p2" }, "stable": { "version": [ @@ -100042,26 +101134,26 @@ "repo": "abougouffa/one-tab-per-project", "unstable": { "version": [ - 20260211, - 2247 + 20260606, + 13 ], "deps": [ "compat" ], - "commit": "2c5bfb6ef06d27a9589394339dadb856580a5a84", - "sha256": "1qql95w8mdsb6scvi7xg0xc3c33pw385a1fvm1vilwbr1s7y32yd" + "commit": "ef1460cf7cd978554f894325303a46e629ea2633", + "sha256": "0qg4ysrcgw252flsr5hh0diy7f8wgplnib6r0rfdqswfprnhwlqm" }, "stable": { "version": [ 3, - 4, - 1 + 5, + 4 ], "deps": [ "compat" ], - "commit": "2c5bfb6ef06d27a9589394339dadb856580a5a84", - "sha256": "1qql95w8mdsb6scvi7xg0xc3c33pw385a1fvm1vilwbr1s7y32yd" + "commit": "ef1460cf7cd978554f894325303a46e629ea2633", + "sha256": "0qg4ysrcgw252flsr5hh0diy7f8wgplnib6r0rfdqswfprnhwlqm" } }, { @@ -100116,20 +101208,26 @@ "repo": "jamescherti/outline-indent.el", "unstable": { "version": [ - 20260416, - 1902 + 20260715, + 1813 ], - "commit": "b25886d0b6a6de1b6c3e881230e41b76ad8652e0", - "sha256": "1bmfi4bc0zjczivq7dc7zb1z016sswpz83czsfp0ggpm4xfjv79w" + "deps": [ + "kirigami" + ], + "commit": "6e12bf82611644584536f87f49d51042b2ec0339", + "sha256": "1j340v1s8f53vbk1db81j46n13v9bxrbm2ix8qxfqmk3mqw7m965" }, "stable": { "version": [ 1, - 1, - 8 + 2, + 0 ], - "commit": "85d1f66e82454829fcda5aa40334bb47be10586c", - "sha256": "1r12xvlxr6mylz0jkc63hwdsapw73xcqvqry5xbyqc6d778m0zsz" + "deps": [ + "kirigami" + ], + "commit": "57b9f4bb9724a82f7e5e15e2a62e04373aee3d08", + "sha256": "0d9qm0a5vnnhfslpxvnsf5pcqv35wqqv4niqsq7m64fcn9z4lnlh" } }, { @@ -100155,26 +101253,50 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20260101, - 1824 + 20260601, + 1519 ], "deps": [ "compat" ], - "commit": "ad3ec4620b79ae5c3e840ed1f47f892c5f917d8c", - "sha256": "00l2pmvyglbl6440fkk0sm31a5l7gss4pmdnw1ar7vaqz4afwi4d" + "commit": "71705d0708459f765403968567a329a76c38cf62", + "sha256": "0xp8vk85kby4gvxb97hs4lpc1kd67m4jw185l87ssvc52v9yq9kv" }, "stable": { "version": [ 1, 2, - 2 + 4 ], "deps": [ "compat" ], - "commit": "ad3ec4620b79ae5c3e840ed1f47f892c5f917d8c", - "sha256": "00l2pmvyglbl6440fkk0sm31a5l7gss4pmdnw1ar7vaqz4afwi4d" + "commit": "71705d0708459f765403968567a329a76c38cf62", + "sha256": "0xp8vk85kby4gvxb97hs4lpc1kd67m4jw185l87ssvc52v9yq9kv" + } + }, + { + "ename": "outline-stars", + "commit": "cad99860ad193dbbc7ca8c3bfea6e36b3f140e90", + "sha256": "0f0342misllapvwa7qfmwxb78cmzzypb179bgnv1pwskqzd8ivfs", + "fetcher": "codeberg", + "repo": "phmcc/outline-stars", + "unstable": { + "version": [ + 20260427, + 2355 + ], + "commit": "a08f50d395a1a74406da97b22ab22d72ffc4df51", + "sha256": "0y7hivf5i9i0kazc5b7vs1i7jjgh1bc4raimq2ryh0f3fazv0r9s" + }, + "stable": { + "version": [ + 0, + 4, + 3 + ], + "commit": "a08f50d395a1a74406da97b22ab22d72ffc4df51", + "sha256": "0y7hivf5i9i0kazc5b7vs1i7jjgh1bc4raimq2ryh0f3fazv0r9s" } }, { @@ -100341,8 +101463,8 @@ "repo": "vale981/overleaf.el", "unstable": { "version": [ - 20260417, - 1854 + 20260604, + 1734 ], "deps": [ "plz", @@ -100350,8 +101472,8 @@ "webdriver", "websocket" ], - "commit": "62c31c609d7d96ec6c592eec40fba41735e40875", - "sha256": "1bj7jq63v52gn8jaa7bsi22ac321j21cmsxd9vl5kvvagzrjqbiv" + "commit": "506fe07b79ceefce3e53196711e10700da344d49", + "sha256": "0hrn0dvk7pqhw63s015hfav7d8fcsfn9sx46dzjn59mfqy9qwm5c" }, "stable": { "version": [ @@ -100825,28 +101947,28 @@ "repo": "jlumpe/ox-json", "unstable": { "version": [ - 20250825, - 125 + 20260629, + 631 ], "deps": [ "org", "s" ], - "commit": "0f7c63b9bbbf6c8b2547e46adc7f34289869105f", - "sha256": "1xlqd4rb5br3illbxg7k0rbspxfns2sr5wn7w9k546sb6lg5p4i2" + "commit": "3fa63a260fc58b09eed5dd8c36904ae80148adbe", + "sha256": "0x8bbg37qcg2ckqrjns6kx61pr4sbg9la3h2ywbsivrbw5bjagg2" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "org", "s" ], - "commit": "57a43e3b3e400d219b80008c51373796b844c6b8", - "sha256": "12fxflyh92awjwfj5gwp8frrbjc63kj7ajlwbsmzgpnp9rr43fpx" + "commit": "3fa63a260fc58b09eed5dd8c36904ae80148adbe", + "sha256": "0x8bbg37qcg2ckqrjns6kx61pr4sbg9la3h2ywbsivrbw5bjagg2" } }, { @@ -100884,16 +102006,16 @@ "repo": "zzamboni/ox-leanpub", "unstable": { "version": [ - 20260419, - 2104 + 20260506, + 759 ], "deps": [ "org", "ox-gfm", "s" ], - "commit": "cfd521786c281ad7fa38212016226af80e163329", - "sha256": "1mf3s459b4s2ykj9af0j9afx3c77gndnyzlfb38ml2c17pl3jrsa" + "commit": "6197366b8b534484e9cba4a2dfaf82aa37432917", + "sha256": "1bi9g218w9wr98x26gaqs62148gar1cfxli4c1pzns7667qb3zb7" } }, { @@ -100972,6 +102094,24 @@ "sha256": "10rw12gmg3d6fvkqijmjnk5bdpigvm8fy34435mwg7raw0gmlq75" } }, + { + "ename": "ox-mom", + "commit": "00b85145e379e14c76d549732ed9426200d0e98f", + "sha256": "04rfcyaw9yni19y011j2ydbg1d8jzyjgwppys6pf6zwxwpbhk0i0", + "fetcher": "github", + "repo": "hinman/ox-mom", + "unstable": { + "version": [ + 20260707, + 243 + ], + "deps": [ + "org" + ], + "commit": "40711a3681cbeb4cbcb520371297bf3d932a333b", + "sha256": "0yr6hy0rb46d7vyzbs6hcsiicdl4l390mc0zvr6hqi4nrlx82w8k" + } + }, { "ename": "ox-nikola", "commit": "4e3fa1b0728ad3058376800ec5e2e9e3847c1d2f", @@ -101032,15 +102172,15 @@ "repo": "0x60df/ox-qmd", "unstable": { "version": [ - 20230325, - 1315 + 20260514, + 1442 ], "deps": [ "mimetypes", "request" ], - "commit": "0b5fa1e20aaa48d93600e1b8d09c3b6f55af3373", - "sha256": "1n0il25a5dwn0dh5a8q3190yfbmfgdi17k1b4vyj83gl7ga40v0d" + "commit": "7a1a4f2679a38e216130d749dfbb38e2d63b713f", + "sha256": "03svx2fc99kwlyvmsv9xm0j8hhnpvczl3l9x8366q5w1acg8pp53" } }, { @@ -101158,20 +102298,20 @@ }, { "ename": "ox-rss", - "commit": "0cc83cda4df36ceb9584d02c36392b6c1fcce4d0", - "sha256": "0ngc4v5gg7py623nxl56wm6qrijryvsrbasjgxpn74cx3lblw8m4", + "commit": "f04da02bca96384a837ba680b297b9f58b0a8db2", + "sha256": "097k7yc9gkvz0l6rrsgic1jwlsi6pv6wbd1hhxl90rx78vbm4r4k", "fetcher": "github", - "repo": "BenedictHW/ox-rss", + "repo": "bhw-foss/ox-rss", "unstable": { "version": [ - 20230408, - 231 + 20260512, + 2231 ], "deps": [ "org" ], - "commit": "ee7347fca8f10a4b53075a8d1e3cac3aff6e6dac", - "sha256": "19fz5vvad8j3p1sm39spmby1h3h9djw5hlvwsdssk6bdpmvlcjp0" + "commit": "c83db3dc521d0dd423b0f24e57b7eaa798ab5e40", + "sha256": "1dynf55r19iwci8b9dm20vi00r22z8949wzh12ya84ab4g29i9nq" } }, { @@ -101414,14 +102554,14 @@ "repo": "jmpunkt/ox-typst", "unstable": { "version": [ - 20260419, - 1805 + 20260502, + 1009 ], "deps": [ "org" ], - "commit": "d05bdf1676c7564af6d87b438c669e93904c2b10", - "sha256": "10y15nhb3lkcykxd12wl8maf7ygvshif6r1nnk4hxjacsa8p6dkc" + "commit": "3e499609a201405a6064144792dab14e3cc19b93", + "sha256": "0aw2wz33s053vb1qxwshsblw6vd86qgdvjnrh73ala2fdfaqn0bs" } }, { @@ -101505,6 +102645,24 @@ "sha256": "1n57bzsp73g5iqdnhc4jhsylif93h4kkl7zgqi1i9b8bi90sqrl1" } }, + { + "ename": "ox-zola", + "commit": "1e9831885355ff0d936446f45a848108093d8cb8", + "sha256": "1jjgnnl7l7qamjdbxbv7qmz5ghqn3wgm1mcdkdrx465f0pzva18i", + "fetcher": "github", + "repo": "gicrisf/ox-zola", + "unstable": { + "version": [ + 20260506, + 1952 + ], + "deps": [ + "ox-hugo" + ], + "commit": "c6ab97d53b471ed53803e44169ac5d3766d72cbe", + "sha256": "09d7n0bc2axgkmj3yhl4smnjscsignlajrrhx8dj9hyvvp3pdkdv" + } + }, { "ename": "p-search", "commit": "90bf1ee96813129643468b0c1d5d1a435d40ff30", @@ -101700,29 +102858,32 @@ }, { "ename": "package-build", - "commit": "948fb86b710aafe6bc71f95554655dfdfcab0cca", - "sha256": "0kr82j9rbvmapsph0jdxy24p0b8mcnj01sg1myywf428nf30cgbh", + "commit": "d328de2f2fed796535509e3a1b4e5d9194c5739d", + "sha256": "0aykmvx2rqk4zzgivl9hdzbnhk2p6alzyd2g5l1hx7sxigpwawhc", "fetcher": "github", "repo": "melpa/package-build", "unstable": { "version": [ - 20260421, - 2136 + 20260701, + 1334 ], "deps": [ "compat" ], - "commit": "2db42a9050923c2245bb525345a8b12bd6c0973a", - "sha256": "15iajmnrgm1lcl792km7c34nfw9r2dhy5hrzpvv4raijvcbhxkpq" + "commit": "f19a7f58cf4b2e573a6d551d8d3dbe265c2566b4", + "sha256": "00v3fi2ssq9z9z5qf40b49z2yw9dsjkhcdfzy7qk1wdgv0pjbq0h" }, "stable": { "version": [ - 4, + 5, 0, 0 ], - "commit": "0598e92cd61aa5196f78576fac7675bcff4ab217", - "sha256": "165gbrc1h1yj764kn3qq2y1551y04lqnklfa0k87gqgd38q5v985" + "deps": [ + "compat" + ], + "commit": "f19a7f58cf4b2e573a6d551d8d3dbe265c2566b4", + "sha256": "00v3fi2ssq9z9z5qf40b49z2yw9dsjkhcdfzy7qk1wdgv0pjbq0h" } }, { @@ -101748,14 +102909,14 @@ "repo": "purcell/package-lint", "unstable": { "version": [ - 20251205, - 1720 + 20260619, + 1246 ], "deps": [ "let-alist" ], - "commit": "1c37329703a507fa357302cf6fc29d4f2fe631a8", - "sha256": "1c5icb7j8jc5d38svpfbxm4m4pdlb3xq4b9m2234wiwf2a128dkz" + "commit": "35996f478d81e51dae4fa30d051f741895d07399", + "sha256": "10yp7x36d0zj6pkr8asnyjfh9is40869vmyyx5k6vg0ar294x9l0" }, "stable": { "version": [ @@ -102133,11 +103294,11 @@ "repo": "coldnew/pangu-spacing", "unstable": { "version": [ - 20250124, - 142 + 20260717, + 230 ], - "commit": "6509df9c90bbdb9321a756f7ea15bb2b60ed2530", - "sha256": "1i52qmky0azwp5pn20nh1zrikn71m95v4hgfc3l3cgq2rqkzzm8x" + "commit": "72de84e999aafa753a635b14bb199fc46d322945", + "sha256": "0dg13cqgzw5b49gmrv7fvmji2a23z5irkv7k4plsvsi2ci435zn7" }, "stable": { "version": [ @@ -102355,26 +103516,26 @@ "repo": "tarsius/paren-face", "unstable": { "version": [ - 20260101, - 1846 + 20260601, + 1519 ], "deps": [ "compat" ], - "commit": "2c279a236404b2eebacb435aa92d5e9c97939c03", - "sha256": "06ypi3hgrr9rigcb9gy5j4l9f3z7lnz1rssv1pqda55srkvcp39x" + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" }, "stable": { "version": [ 1, 2, - 3 + 4 ], "deps": [ "compat" ], - "commit": "2c279a236404b2eebacb435aa92d5e9c97939c03", - "sha256": "06ypi3hgrr9rigcb9gy5j4l9f3z7lnz1rssv1pqda55srkvcp39x" + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" } }, { @@ -102403,17 +103564,26 @@ }, { "ename": "parenthesis-face", - "commit": "890e94376ea0b6ada2c49a0a3e11b2a59aab7caa", - "sha256": "078c97yjxp6344i4d5v5k07yxpm9y0qbjcmgim89hmgmira8iqvx", + "commit": "fefa3d4feab1be45b0169c31781a1e995d0963ae", + "sha256": "1vwbwl0vyazrlc4d5dfa6301h4b33ix8bxjbmgh6d6facgj2rrxx", "fetcher": "github", "repo": "tarsius/paren-face", "unstable": { "version": [ - 20260101, - 1846 + 20260601, + 1519 ], - "commit": "2c279a236404b2eebacb435aa92d5e9c97939c03", - "sha256": "06ypi3hgrr9rigcb9gy5j4l9f3z7lnz1rssv1pqda55srkvcp39x" + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" + }, + "stable": { + "version": [ + 1, + 2, + 4 + ], + "commit": "57307b5ea75e07d2dc0c64c7e3eeadee3369a7aa", + "sha256": "11g3wg79kvg4nkm2knabpzsf0lcpnak94kkdb5cscp3w3fg3x5a7" } }, { @@ -102576,11 +103746,11 @@ "repo": "clojure-emacs/parseclj", "unstable": { "version": [ - 20231203, - 1905 + 20260526, + 1843 ], - "commit": "6af22372e0fe14df882dd300b22b12ba2d7e00b0", - "sha256": "1iz7qbsq4whmb3iqy777jlm47chjp62313hc6nfcp0lfqsanmcmv" + "commit": "ca828c202c026e45bd60503984cf510d904cae50", + "sha256": "1j992kbnl4f25cfb0bjjv2pcl6zxrlg4fvf2r3740a9vmigrl82q" }, "stable": { "version": [ @@ -102600,15 +103770,15 @@ "repo": "clojure-emacs/parseedn", "unstable": { "version": [ - 20231203, - 1909 + 20260601, + 1258 ], "deps": [ "map", "parseclj" ], - "commit": "3407e4530a367b6c2b857dae261cdbb67a440aaa", - "sha256": "0b2jralm5lm4z4lpkn8ygzfga67xsalaszc8gqqv36khmz2mrckc" + "commit": "1a28a88e2aabd99b41e02f491d6b8874ec128d7d", + "sha256": "1y25vvbknm5bsqhy7d6sjk6f3f2apmf3f84l1949pz3hcr7nh938" }, "stable": { "version": [ @@ -103038,20 +104208,20 @@ "repo": "jamescherti/pathaction.el", "unstable": { "version": [ - 20260328, - 1613 + 20260715, + 1811 ], - "commit": "f3010d3485d7939f252dee59e4b335cb28e5069c", - "sha256": "0k9b4a9psbz4zdbnfriayklbhgqglwlagcamk0srizjhs08xrqhy" + "commit": "5d80485e7f006a827fcd9b55f40481785abf31ee", + "sha256": "1ri12d9w0kkzn5jkcqs1ifq391m1ddd0vshwmc87rbaj37hpblzc" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "5082e3492a7f760cda3c2764f4b9a38b18bd44f3", - "sha256": "09ckg9l854kk203x08lacdmvhx70gngrv7z6x90lamc5qbc87ddc" + "commit": "19dc91a8da6574dc7f80b263cc3a909be1c300e4", + "sha256": "1f1bqaya4xbwqaljfqffvn3lahh4s9q3nflhj20ny86cd5zcgdaj" } }, { @@ -103392,10 +104562,11 @@ "stable": { "version": [ 0, - 23 + 2, + 3 ], - "commit": "8f7516510459477c2ff368a7fde4cc68cead2402", - "sha256": "0xx35811kxlrnsa2ydkgli60xvqjd9i7cx7j5z8zidzgzkywdnj5" + "commit": "15594c3348ed7febef31f99d709b128f267035eb", + "sha256": "0xap7i2x8mqpwr52xdqb8c6lhjmxm1d6car2533ynyr4k2fn4lw5" } }, { @@ -103505,14 +104676,14 @@ "repo": "emacsomancer/pdffontetc", "unstable": { "version": [ - 20260325, - 1408 + 20260624, + 1756 ], "deps": [ "pdf-tools" ], - "commit": "b2db6c1377c080d9425836efa19690df3eb44516", - "sha256": "11kpb4k0xjnxxnf8dw1rvw2hnflag7w2k7a680gcvywpllp5zl6z" + "commit": "063529d92f833ca4342f88a4928f6ec74826ccd0", + "sha256": "0pw0f1fifni6y6hy05bbbgx8s2w40as2y1n56a938jkxhmwxdi1m" } }, { @@ -103770,20 +104941,20 @@ "repo": "jamescherti/persist-text-scale.el", "unstable": { "version": [ - 20260326, - 1609 + 20260718, + 1651 ], - "commit": "e835e76bad452b1e5a59eb9a0fef650e0680ab90", - "sha256": "0vvpd0vrzy2rk6xsqnfp65jbm1ls4z1v8syji6rlz2sfnkv94m73" + "commit": "2535c7cda4d196d2c4f6311b27cff88aefabb14f", + "sha256": "0qrr99ss7pcj2j3azcqy8rimbw0w7k34zc12bkaxd7ky3ah2h614" }, "stable": { "version": [ 1, 0, - 4 + 7 ], - "commit": "8098af6ba9ff251d19f9e41b39c84f7b9b758f26", - "sha256": "006j8sdzp671wj07bs5lfr21lcfb81c2gn0kn13jphmki14s7i02" + "commit": "2535c7cda4d196d2c4f6311b27cff88aefabb14f", + "sha256": "0qrr99ss7pcj2j3azcqy8rimbw0w7k34zc12bkaxd7ky3ah2h614" } }, { @@ -103995,25 +105166,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20260403, - 538 + 20260717, + 1853 ], "deps": [ "cl-lib" ], - "commit": "230cabf4c1406569bac416cff9502ae23648e3f8", - "sha256": "0k7bfhjb71ippzrc65i0rbngj65wbhzl5rxygjshwf83rvfwimab" + "commit": "352a06502582646c8a79d5e1a0c36f1b61b6e6cc", + "sha256": "02l9hhp6qk6djs1p3q5zg4yjr8m46ax7n6553had1b1kvhbxbxm5" }, "stable": { "version": [ 2, - 21 + 22 ], "deps": [ "cl-lib" ], - "commit": "64ef5eaaab9e7564e8b9788ce6d0e2359daf5dca", - "sha256": "1v22m3l7p89wsdy0ydv0w91v0h9wjl1v33gim756dz8zcx8m1p8y" + "commit": "451b0f0272c732f5e822b0c0c590d9dd0937915e", + "sha256": "1x1s2yji3w86mv0hfpma4axj70gqhavazmv0vj4kxwc24r8fj8xr" } }, { @@ -104126,16 +105297,16 @@ "repo": "wyuenho/emacs-pet", "unstable": { "version": [ - 20251217, - 2147 + 20260716, + 2214 ], "deps": [ "f", "map", "seq" ], - "commit": "222f1da892462d7bea5c7a7bbcb6b5a5f4cb2158", - "sha256": "0rm2a1cs4gv30968sap84jm0r5m4mmyi9rbwmdwklfb53698x3v9" + "commit": "c0d856782d74d205a9359ae2f5c623d8152d20d1", + "sha256": "0z50piq8wp239xc5hx51q4907yyqnmijx6x325hp60rk7kdabkga" }, "stable": { "version": [ @@ -104184,25 +105355,25 @@ "repo": "emarsden/pg-el", "unstable": { "version": [ - 20260418, - 1149 + 20260719, + 1514 ], "deps": [ "peg" ], - "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3", - "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594" + "commit": "6d4b528cfd1e7f776eb0e4c14d84668fa69a041b", + "sha256": "1v19h9q7lsiqaxpfqhlvg16iqjj47hin4h1qgmw8kngy68l6w4js" }, "stable": { "version": [ 0, - 65 + 68 ], "deps": [ "peg" ], - "commit": "e82be0a8a69042c102119b9c7d59619f3a2277a3", - "sha256": "164kfd0lc1qw3wnlxqyjmqd3yhmkkf81qmgdx0kydlrij8a7z594" + "commit": "6d4b528cfd1e7f776eb0e4c14d84668fa69a041b", + "sha256": "1v19h9q7lsiqaxpfqhlvg16iqjj47hin4h1qgmw8kngy68l6w4js" } }, { @@ -104445,6 +105616,36 @@ "sha256": "02fhna45wq3wja51yrwm0xysdvyck1r0a3dx41i5sh89504gl6a9" } }, + { + "ename": "phony", + "commit": "763d5a953e1495c8abe8f86c873e4f78bef75050", + "sha256": "1dd4w968n5ni03i9m6dzf88b2bzadxdskhgs1xi8ah0b64ka8g4q", + "fetcher": "github", + "repo": "ErikPrantare/phony.el", + "unstable": { + "version": [ + 20260630, + 1002 + ], + "deps": [ + "simulacrum" + ], + "commit": "b155ee3686c732cfe02a4bcd5f3e07fdc39dca35", + "sha256": "058lmswkvx22vlwk149hb3n8wmph9rp18n925ghy46w4qhvqd0s5" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "simulacrum" + ], + "commit": "b155ee3686c732cfe02a4bcd5f3e07fdc39dca35", + "sha256": "058lmswkvx22vlwk149hb3n8wmph9rp18n925ghy46w4qhvqd0s5" + } + }, { "ename": "php-boris", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -104529,11 +105730,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20250602, - 1308 + 20260719, + 209 ], - "commit": "40b8abed3079771e060dd99a56703520dabf5be4", - "sha256": "0f558vrgsb354jp4q7z52s3ybpybwjw2yxr8vlj58jg7dam6smyp" + "commit": "6ebe4a618aa64db3e15f809b036c1b1a6d05c030", + "sha256": "1fcdncv959ssqnbsjkjy2ay82h4qkrr6wzr1911b39gf78s9xn0h" }, "stable": { "version": [ @@ -104674,21 +105875,21 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20260218, - 453 + 20260717, + 1734 ], "deps": [ "compat", "php-mode", "php-runtime" ], - "commit": "77fba8fe9d63661e940b392a0e4b573e7edafb7b", - "sha256": "0q08wx0k7n86v4jdspkjdjn1kmjy4cf1qrkj71qi0ga943vwz11l" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" }, "stable": { "version": [ 0, - 9, + 10, 0 ], "deps": [ @@ -104696,8 +105897,8 @@ "php-mode", "php-runtime" ], - "commit": "206573c8de58654384823765dcca636c9e35e909", - "sha256": "12qzjy3zz0lk439y0y9gl5pirzlf52li3lbyjjmq7lq6yg30qzxm" + "commit": "00942a5d5b28560bd08f7355d131074772bb7a01", + "sha256": "1hf5jxj1amvv9ac1jm5bly38xfhj5k0rmsg3sd9kd888hi95gph8" } }, { @@ -104776,30 +105977,30 @@ "repo": "dnouri/pi-coding-agent", "unstable": { "version": [ - 20260418, - 1713 + 20260720, + 258 ], "deps": [ "markdown-table-wrap", "md-ts-mode", "transient" ], - "commit": "a07e1d0a3a2dbbac6f1d2a92656d2239f0dcb2c7", - "sha256": "03cdqhsqml5sbpa2pm06hphavhnyq1b11nany1cpg7hshixz37wr" + "commit": "3e6b04514592e0a38189552a686b9dbe51453bd7", + "sha256": "07zl6qw3ai2z3318qp0x0rmjil9x10f0h1fashxdrv6cm57cqxbz" }, "stable": { "version": [ 2, - 2, - 1 + 6, + 0 ], "deps": [ "markdown-table-wrap", "md-ts-mode", "transient" ], - "commit": "ca0d60474cede8198329a939a902f51081543612", - "sha256": "16vhk22gdcyl87l1fknkzqkr7nxyqrs2hlghr3vwlmcj9igr4cfa" + "commit": "2b6a27feb6d224aeb9b680941a925c7c42948c59", + "sha256": "16x82wk0rz7cvwl3y13rjvy06chbzm4301wp4zh1gal7dh7h158y" } }, { @@ -104870,20 +106071,20 @@ "repo": "oliverepper/pif", "unstable": { "version": [ - 20250207, - 1624 + 20260504, + 1621 ], - "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", - "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + "commit": "72978dddffa3d9c68c6510c3a0381ffcdb691188", + "sha256": "1pvvkg31w10am3fldkq7lgi7f0bjmzg5kwgfjiwfbnd24j7mi03x" }, "stable": { "version": [ 0, 0, - 6 + 7 ], - "commit": "c993c1446ff3460a2f599b84ac81e9f00c4c7333", - "sha256": "02ywbxfg7s1hsiwi2zqvhlqd8wfhfzasb3n6gsj0rl5ix8c7gsmw" + "commit": "85e55528967d5aee87ae84b306c1cd292a6705c9", + "sha256": "0628k53zcbid37dggn7jpsf2yqzi2hcrd3vr897xh0jcczb76m9s" } }, { @@ -105118,20 +106319,20 @@ "repo": "Anoncheg1/pinyin-isearch", "unstable": { "version": [ - 20260323, - 1922 + 20260718, + 1804 ], - "commit": "935e582668d6a9a55fd9dd262d46ed1f2bb98f35", - "sha256": "0zvx6xn8sl8gx3n4kk3i13vq55v5qjmhaxhk5k63cagjh0pzyy47" + "commit": "9834cb04fb59d8cb600059f20bf297522c764deb", + "sha256": "0h2cg9x8hpjxhdbql9lnncdij65lq70dl0imhqx2xkc32si9v97m" }, "stable": { "version": [ 1, - 6, - 9 + 7, + 1 ], - "commit": "1ed4218cb50b4de614c11dc41ab6053255271ae7", - "sha256": "0m9j819q7mm5q418g160c0bickjij37w5j7c0lzhwvpilhmh2cny" + "commit": "9834cb04fb59d8cb600059f20bf297522c764deb", + "sha256": "0h2cg9x8hpjxhdbql9lnncdij65lq70dl0imhqx2xkc32si9v97m" } }, { @@ -105455,10 +106656,10 @@ }, { "ename": "plain-theme", - "commit": "0742da1d0fb37ebf2d66eba4533b914056399036", - "sha256": "0igncivhnzzirglmz451czx69cwshjkigqvqddj0a77b1cwszfw8", + "commit": "6f4c3e13ccb622527676b03dc23db47ff8152cb5", + "sha256": "1krlsb7sr1bl7rvplblkbsf41pbazp64l3d2vklxiqmdp95vv865", "fetcher": "github", - "repo": "yegortimoshenko/plain-theme", + "repo": "lukateras/plain-theme", "unstable": { "version": [ 20171124, @@ -105524,28 +106725,28 @@ "repo": "skuro/plantuml-mode", "unstable": { "version": [ - 20250705, - 1148 + 20260514, + 1745 ], "deps": [ "dash", "deflate" ], - "commit": "0a19d9988879c57b176dd4c03f59003644f9c9b0", - "sha256": "02nck5f8f7vlwi57kb33679d912dq2n2g9ipvkp0x9dsivz1fpi3" + "commit": "a4a63efa4a3980bfbd825bfb3a263c6664401e79", + "sha256": "18hibqf0yb8fdj3niy9l1i9j0diskg433f5jqnkg3fifm058fsf2" }, "stable": { "version": [ 1, - 8, + 9, 0 ], "deps": [ "dash", "deflate" ], - "commit": "0eaf340303cf65ddd20cfb65fee1137b52ea229f", - "sha256": "1h68bfczpvbzi29ggl3dciiz5187px14xi2sz5pywwl84sg5x2b5" + "commit": "7a93f7ce96cff5bd48ca4cde70d3bbf789839613", + "sha256": "125w8lz89wvr1micz470rvyfv1qq71xxjl0brimrbsb6ql5vrqam" } }, { @@ -106568,11 +107769,11 @@ "repo": "polymode/polymode", "unstable": { "version": [ - 20260302, - 1043 + 20260505, + 1803 ], - "commit": "4604f55cc020c75562526fb76b723e5e242c97c0", - "sha256": "1g36ss0ms12ah84dxdbdw0kim6wymrf2hmpsvd7lnszc19ip6zf9" + "commit": "8cb72fa5dcc0d98746c680043dc121edc7621e3a", + "sha256": "02vzq5v6kykw389lymgb5cri8h4p3rwjbwg67zkhbd1mrfa9525g" }, "stable": { "version": [ @@ -106645,15 +107846,15 @@ "repo": "kn66/pomo-cat.el", "unstable": { "version": [ - 20260224, - 2202 + 20260627, + 147 ], "deps": [ "popon", "posframe" ], - "commit": "f9eab9a897598c6da713b1730739dd2e41e70fda", - "sha256": "0l9ad8lmxhr8ni1ivf4fwmsawwkri6rn8ms7iibs5z342jqy4bn7" + "commit": "499241d5277429e0d9b37f866460e93e6b1c3a02", + "sha256": "0g8rhjzbp6abj97xcxfwkh7343p84s8068hr04093abji36dgkdw" } }, { @@ -106823,20 +108024,20 @@ }, { "ename": "popterm", - "commit": "e4d79aed1b29079b096ae3453d874fd830b369b7", - "sha256": "1k0kzr7ax1mzpv60ln1ky2x06yl7psznga6x4mnh52xxgwh1f95m", + "commit": "166bc08a635f453e7204dc0515e0a8b3efef0159", + "sha256": "0sg55hmxn0hx5lmwr7r58c3d46aaxxsddg955a4vyf8pk7dkmcxg", "fetcher": "github", - "repo": "CsBigDataHub/popterm.el", + "repo": "ChetanKoneru/popterm.el", "unstable": { "version": [ - 20260423, - 2106 + 20260717, + 1502 ], "deps": [ "posframe" ], - "commit": "7efcca742ec9a23c2e6e627b2c1d42aa752dea5d", - "sha256": "0j0y4rgvrvj3kkr10qyl89nmdp7yzpqa9j1yy2bxaalsff6pbdpd" + "commit": "c3f2079bdd5d480a7509b2f28cc104ec7473ffb7", + "sha256": "06ddkcvji5dz091kblr5h82jipig7q3zjcb20qc1cfv1d9lv9y46" } }, { @@ -107126,20 +108327,20 @@ "repo": "tumashu/posframe", "unstable": { "version": [ - 20260423, - 213 + 20260527, + 857 ], - "commit": "fcf1757baee481f617fbf2dc39f8c561207df263", - "sha256": "0r6kr3b5kr34kbcic61qnjyhli9imz6n4arddf3v3c34abamgvdy" + "commit": "74c8c56131ed866db47ae4191364b72dd4852456", + "sha256": "10a6n3pgh36j3smizgh48p2bbi680dsdssz1563ijxj01cy2b0hv" }, "stable": { "version": [ 1, 5, - 1 + 2 ], - "commit": "4fc893c3c9ea3f6b5099ac1b369abb3c6da40b1e", - "sha256": "01x9kyfghx48gxh7mxfvkvvi0m64zv7w9pl4fnryzm9d5ql5lbw4" + "commit": "74c8c56131ed866db47ae4191364b72dd4852456", + "sha256": "10a6n3pgh36j3smizgh48p2bbi680dsdssz1563ijxj01cy2b0hv" } }, { @@ -107248,25 +108449,6 @@ "sha256": "1hp3xp18943n0rlggz55150020ivw8gvi1vyxkr4z8xhpwq4gaar" } }, - { - "ename": "powerline-evil", - "commit": "c1a92c8b5b92269773d314aa6cec4f0057291a68", - "sha256": "1x5hvnjdrpn3c8z6m7xfk30qd5y58p3jcyqr48qx91d0109gk342", - "fetcher": "github", - "repo": "johnson-christopher/powerline-evil", - "unstable": { - "version": [ - 20190603, - 340 - ], - "deps": [ - "evil", - "powerline" - ], - "commit": "b77e2cf571e9990734f2b30d826f3a362b559fd1", - "sha256": "1hs9jvl5lmfwr9k6qcnxjhd61zsmzq53ania1w5616gqa4qnjzhn" - } - }, { "ename": "powershell", "commit": "7002c50f2734675134791916aa9d8b82b4582fcb", @@ -107393,8 +108575,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20260423, - 953 + 20260509, + 1433 ], "deps": [ "ghub", @@ -107402,8 +108584,8 @@ "magit-section", "markdown-mode" ], - "commit": "23dcb45979e58c971d1d9a94f0af819f5d04d583", - "sha256": "08gw1bb87f9rs812adfadqzccm63pm06mr7b4g0dnji1sclzfryv" + "commit": "938db766007f3444a2899b2457d9e2f4b4ffbebf", + "sha256": "0rc1phxl1hrfzj85b4fshir8lgmbzn1idwax37kkjvx42lgvw8v3" }, "stable": { "version": [ @@ -107508,20 +108690,20 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" } }, { @@ -108211,19 +109393,20 @@ "repo": "lucius-martius/project-cmake", "unstable": { "version": [ - 20250830, - 1304 + 20260529, + 1744 ], - "commit": "519ca5d7dd490a6b54435841c9fce3d5e3dcc140", - "sha256": "1dhs4irm6am24cx20bcrmnxspazm8iwv3kbb755lsx70040gx4b8" + "commit": "a1888d8ef6c32a8cf39e0056594179be1e9865ee", + "sha256": "1bs7pv2k0alh234haff7pg1j16j1jzcw53acrca99fxmvvhj33g9" }, "stable": { "version": [ 0, + 2, 1 ], - "commit": "4a261cef5b7ca406577d3b0eaeabfae88419edeb", - "sha256": "1m4pachj26gdbmwbv15d7wshay7qnmaxy6x5nzi9hnvcfhg5v7xs" + "commit": "e177dfff76c03fc8f589c8070c9b1a945b2f8851", + "sha256": "0vim9kik7pd9dml7lycdmc7q9l6i6hxgmympfk89ncqd68icmspr" } }, { @@ -108337,14 +109520,14 @@ "repo": "harrybournis/project.el-rails", "unstable": { "version": [ - 20260415, - 1855 + 20260425, + 1314 ], "deps": [ "inflections" ], - "commit": "d066f984eb88c6d239d19adbf8025bcafe665d53", - "sha256": "175vsmf3zgl7qi8sa4pnhzjk0b3qr1a02pg16nlxa0ci4kx59x34" + "commit": "2c72764790f9f6f283f713bb72a9f4952ced690d", + "sha256": "0ipph4wfl74zmvpawhsqaq3x4bbwxxv1svqi9j1chf0rb0bzw99p" } }, { @@ -108403,26 +109586,26 @@ "repo": "TxGVNN/project-tasks", "unstable": { "version": [ - 20241220, - 1028 + 20260520, + 133 ], "deps": [ "project" ], - "commit": "1faaa975c99e358165cfc3df160c21c2c611e1c3", - "sha256": "0wg1biic9sfsdhq1x1hkcbr396vkklhzz2f6an22amk2jc1pmfnn" + "commit": "a8736133dc3ee77b6002098592853ac56e5a5b40", + "sha256": "1rwi1y75migfg382nkahid9c4qh7f5jx8bkwmmmz5kfggjdf3cps" }, "stable": { "version": [ 0, 7, - 1 + 2 ], "deps": [ "project" ], - "commit": "1faaa975c99e358165cfc3df160c21c2c611e1c3", - "sha256": "0wg1biic9sfsdhq1x1hkcbr396vkklhzz2f6an22amk2jc1pmfnn" + "commit": "a8736133dc3ee77b6002098592853ac56e5a5b40", + "sha256": "1rwi1y75migfg382nkahid9c4qh7f5jx8bkwmmmz5kfggjdf3cps" } }, { @@ -108451,23 +109634,26 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20260310, - 858 + 20260720, + 549 ], "deps": [ "compat" ], - "commit": "f8be23b266aec7108fb4b80410623cd50ba8ded9", - "sha256": "1gg9mv6sz705x2lgwx4qz13wj20lcc6pv813k2h9ixdk4rxl1il4" + "commit": "a4a91e08d49d280c9c5c2b0820bb04da198d61db", + "sha256": "0lm9jw8563hly4zi9yx9f4q28jpww4hazgdw2jigcjwgf3q7zn6q" }, "stable": { "version": [ + 3, 2, - 9, 1 ], - "commit": "ef17d2971bbcce13b1ac16e0e36d44fa0defca63", - "sha256": "15wc2ivmac0kgbdgsaaxngmcffgd3227zsb4n7inhn14cqwr6qxd" + "deps": [ + "compat" + ], + "commit": "8ac2834f1f70af977f17944c7968c72ea46bf62c", + "sha256": "0vqigfrgakjzvm9y2zg9vvnjx3xpzcb5s218qfphs8rqi87a6hzb" } }, { @@ -108719,8 +109905,8 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20250927, - 1605 + 20260614, + 1822 ], "deps": [ "compat", @@ -108728,8 +109914,8 @@ "project", "s" ], - "commit": "482789397c5e11dbb95438c87ccd0cad3d37a33a", - "sha256": "0rlx9n1hmnzk46ml93g6lpv32ivmm7lfbb4mzicnapq7gly41132" + "commit": "870a60b26416e13a7cd37ecfd863ae730d6a13fa", + "sha256": "0xb46ispkmr8m46avhqx5sqbn9lcvsf7c43iigvn668xvivz4r2x" } }, { @@ -108759,15 +109945,15 @@ "repo": "mohkale/projection", "unstable": { "version": [ - 20250921, - 1037 + 20260614, + 1822 ], "deps": [ "compile-multi", "projection" ], - "commit": "f4b108eeb55c79b201c140bd8fe7f1fcaffd3617", - "sha256": "0p9xpbc62rcf9qbcc0rf36hd0z7b6c7apnji4gxdmggmpfaxnhva" + "commit": "66dfa454cbd0ca356d0c5761f6ade248b612b204", + "sha256": "1xd9pdm0p0ips0xm11a3qswj2nbk3a1fnl186f3gkx4npfmz3x19" } }, { @@ -108985,11 +110171,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20260124, - 1351 + 20260622, + 1503 ], - "commit": "75c13f91b6eb40b8855dfe8ac55f8f7dac876caa", - "sha256": "0zsvvq54q50q9zcmgxiqgks7hkzm9v740mrygvlxyb8yhrv7j4h9" + "commit": "38e3f59d4b650fbfb9649c84f24adbc9056ffa30", + "sha256": "1fgzfy6gfm4p8fafa58ismypac0lvna917dmfgwlb2bwb7n1k55v" }, "stable": { "version": [ @@ -109097,11 +110283,11 @@ }, "stable": { "version": [ - 34, + 35, 1 ], - "commit": "4b0c3aacf0657fbf38253b38918d3358dd4319ec", - "sha256": "07in860f2msc05ywh3di7d1fr6mszr2jxjh6lgm7m0kdqckib8ix" + "commit": "35cd01f9fe9afbeea38cc7b979a3b6bfcde82c03", + "sha256": "0n85mx3xq403yvavqa585lmahiac6dwlkvwvva8h9p3y6z3gs9wy" } }, { @@ -109621,11 +110807,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20260305, - 1923 + 20260519, + 1527 ], - "commit": "fe132f803868f325cf6f162139e327b76df9e4c1", - "sha256": "0ffjpb0ilhcng1wwmnl1lx7h8v1z0bgsq6wb7x4x2rwsrvqjv9hm" + "commit": "04819e0bad5ed62af9e412ef9715b33bb1edc3ba", + "sha256": "0pydanhwji3jglqc4pq7ljc5ik93ycgg8c8nvzsmgw6q5anqs09g" } }, { @@ -109696,6 +110882,30 @@ "sha256": "0lwx9j5p8ayg4px4jlfr57hv5cla1lmbxcqgagjpd73z3f8daahy" } }, + { + "ename": "pure-light-theme", + "commit": "7a493d693870d0f73de1d39ae7ad22cc982b2a8c", + "sha256": "0rxcqj229pg4w9gf079qcgk6arp52myfd5hkig5wkd7iqdm687c6", + "fetcher": "github", + "repo": "nyrell/pure-light-eink-color", + "unstable": { + "version": [ + 20260613, + 824 + ], + "commit": "0cf41b8cb0ec95efd363889f8877d7f65514e4ad", + "sha256": "1cl806h6rgqnw410xqnnp7xg7cbgfdd40hh58kgxnx2b2hwh1p4v" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "commit": "0cf41b8cb0ec95efd363889f8877d7f65514e4ad", + "sha256": "1cl806h6rgqnw410xqnnp7xg7cbgfdd40hh58kgxnx2b2hwh1p4v" + } + }, { "ename": "purescript-mode", "commit": "55462ed7e9bf353f26c5315015436b2a1b37f9bc", @@ -109704,11 +110914,19 @@ "repo": "purescript-emacs/purescript-mode", "unstable": { "version": [ - 20250613, - 944 + 20260717, + 1433 ], - "commit": "61732e23bd33b7d0d71bc6cff84b612bd2d9dff2", - "sha256": "19fycmdzyipb1lwdr4p86sg4j6qjy1j2rl8raml5yrbm1cra791a" + "commit": "7ad5eff9bd59632d49a44f5935c65f1069e17fed", + "sha256": "01jpf8whcjl7awwabhj3wpbajrv7varh4n0ammsq98ymzqlyywin" + }, + "stable": { + "version": [ + 14, + 0 + ], + "commit": "7ad5eff9bd59632d49a44f5935c65f1069e17fed", + "sha256": "01jpf8whcjl7awwabhj3wpbajrv7varh4n0ammsq98ymzqlyywin" } }, { @@ -110171,8 +111389,8 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20241216, - 1959 + 20260605, + 1055 ], "deps": [ "ivy", @@ -110181,8 +111399,8 @@ "tree-sitter-langs", "uci-mode" ], - "commit": "3f1ce4efd1c34b9fc347c848eb4426bfcc851118", - "sha256": "0238s7dzrr0g19arah8b385bad5q1vz155f599pgwilj8cpqz7dz" + "commit": "6eed5ea66d37ae25c4db98ca21b164a98234b59e", + "sha256": "0pb7hqv7qkv2w0y3xqvcb86qb6l5fpi1927yx78xsl1gbs89z4hs" }, "stable": { "version": [ @@ -110262,10 +111480,10 @@ }, { "ename": "pyim-cangjiedict", - "commit": "e5886262459d25a03839fd3a854510a7415bd241", - "sha256": "13lr9ms87s3b0hf97hx81lvag8kqk5pn99hnzi5nwwlj7nlf6xj4", + "commit": "46bd94ae4e098154d2c35a186277665c07575a30", + "sha256": "0cxszzyivp1g7hyyzlbcjv6h7flckv3bad3alg510va6l7nf87ym", "fetcher": "github", - "repo": "cor5corpii/pyim-cangjiedict", + "repo": "a5corpii/pyim-cangjiedict", "unstable": { "version": [ 20250924, @@ -110280,10 +111498,10 @@ }, { "ename": "pyim-smzmdict", - "commit": "f42c59e7af89ec9a24363c1f942ef92e89d11a65", - "sha256": "1bl6b0zyv45wjz2fbb12a7vfb27439n2vgby6wxlya2d0pljfgk8", + "commit": "9c5fa988d59676fbb0cb7548d827d0425f6b3de5", + "sha256": "1bs7l86qngv2569881g6q88k9j2kcmn3g9nn408z28j3gaf8v4zs", "fetcher": "github", - "repo": "cor5corpii/pyim-smzmdict", + "repo": "a5corpii/pyim-smzmdict", "unstable": { "version": [ 20250621, @@ -110542,28 +111760,28 @@ "repo": "wbolster/emacs-python-black", "unstable": { "version": [ - 20240520, - 729 + 20260706, + 1540 ], "deps": [ "dash", "reformatter" ], - "commit": "4da1519345b3d5c513d82ef0d39536dd9c626d42", - "sha256": "0haxkpjggf91ahy6zl4qzpv7l9chi9yd0c0a054y3kjpvn64axqd" + "commit": "779d49c7db54590d1fa483ef2f89eea5ef8774e1", + "sha256": "19wjs67yc6gdfdjdrfav8m3w0rmyhdzfwq3hi2gcy6shyykm7s0i" }, "stable": { "version": [ 1, - 2, + 3, 0 ], "deps": [ "dash", "reformatter" ], - "commit": "e1bbf574a952562ddeadb0caa42c44016136c2c9", - "sha256": "1x6b67cs7kn8711fxr3fq8y9wcpf9g71asf9wiqfrk2mrfzli6a3" + "commit": "779d49c7db54590d1fa483ef2f89eea5ef8774e1", + "sha256": "19wjs67yc6gdfdjdrfav8m3w0rmyhdzfwq3hi2gcy6shyykm7s0i" } }, { @@ -110589,16 +111807,30 @@ "repo": "wbolster/emacs-python-coverage", "unstable": { "version": [ - 20250601, - 1621 + 20260706, + 1541 ], "deps": [ "dash", "s", "xml+" ], - "commit": "ec1789b8cbbfd58b8f4f687c2e4efb7e30429643", - "sha256": "0hvschfsvj6wg00nab0c1kki9m74ii4zbnzmn6a46yqvnyxjy2qc" + "commit": "9e7af6999077ed3f861c5813297aee13804fcfb1", + "sha256": "1an8c18g7fpsz8rc0ds4ff0k9yxyw7xipyz4gcwgdlm1kchkhyns" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "dash", + "s", + "xml+" + ], + "commit": "9e7af6999077ed3f861c5813297aee13804fcfb1", + "sha256": "1an8c18g7fpsz8rc0ds4ff0k9yxyw7xipyz4gcwgdlm1kchkhyns" } }, { @@ -110752,11 +111984,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20260410, - 1849 + 20260710, + 1059 ], - "commit": "c6f7bcd79d43b2a4915b75c481355601f95968a0", - "sha256": "09hhiwsk08c34h8v98q1s4g09byvj3r1dn18agl4x1v2528fiszk" + "commit": "dbbfaa9bbfa1e330f4d9ec81b3793fbb2a297ecd", + "sha256": "1h1im4ph5n7799z6iax5bzxmad7m1qc9apgdb1hq8b7xqa0bd9hd" }, "stable": { "version": [ @@ -110776,31 +112008,30 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20260117, - 2218 + 20260630, + 859 ], "deps": [ "dash", "s", "transient" ], - "commit": "78b5ea1d19c7e365ac00649d13c733954b11f822", - "sha256": "1s7slp14lrb4iik847ybk6dsqvcb4r1b50hx3pv3hn63rvpwc5jq" + "commit": "8c0e048a771f355903a8c2ce78fa0974a077214e", + "sha256": "06k1509nnzrffmkzz5shikz2msk6g0bb89v56fxf9w9prpb0nna3" }, "stable": { "version": [ 3, - 4, + 6, 0 ], "deps": [ "dash", - "projectile", "s", "transient" ], - "commit": "46fd006462258a3366723fafacdf2db6a6ae689d", - "sha256": "1ahpzay6gbxrcin4ldcp1sm17fcvg94n729haj3zgcalsmhjlx90" + "commit": "8c0e048a771f355903a8c2ce78fa0974a077214e", + "sha256": "06k1509nnzrffmkzz5shikz2msk6g0bb89v56fxf9w9prpb0nna3" } }, { @@ -110898,16 +112129,16 @@ "repo": "wavexx/python-x.el", "unstable": { "version": [ - 20260309, - 1727 + 20260619, + 1406 ], "deps": [ "compat", "folding", "python" ], - "commit": "c7c1986753f112e3bf0e8f25bf74de1f422a5121", - "sha256": "0q9wg3brprlkkf512i8cbqpqd5bavj2cqyb3j4xgdab2amrc6w4v" + "commit": "548a95c42c110cd65b559416e497de20f5c21d92", + "sha256": "1d0mfl3z5954jm0v8fk2hkkajfzrv5j3v69ypyc21z66ysnz6qys" }, "stable": { "version": [ @@ -111018,11 +112249,11 @@ "repo": "psaris/q-mode", "unstable": { "version": [ - 20260418, - 249 + 20260620, + 531 ], - "commit": "7690b9569892bf5e5f87cae290cb6a861cd1deeb", - "sha256": "0m9rxh51pny3cpiy4x24qqpgpfbaibdfv1yh5ckzy8hqcgkxq222" + "commit": "ca73cb94f8391ebfb2a60537f8c51b244cbad9d9", + "sha256": "06n6vf0xx61vzpmxdn1s7psanilmg30n1v8ach1za3996wmdx214" } }, { @@ -111056,11 +112287,11 @@ "repo": "ruediger/qrencode-el", "unstable": { "version": [ - 20260109, - 2234 + 20260628, + 2140 ], - "commit": "023c61309e8f9e7b27fd28fe4d71a2217b2f3f9d", - "sha256": "0ivcdr89531yps6izk7fs7xqrz00m4b02c5rrbjalz33sj06ss41" + "commit": "7df905c77f590278d301679db354a3d7662407c9", + "sha256": "1vsj6vq003anbwhaqcfl4sswkn8zl6fazwyvy6dk1xf87nll6540" }, "stable": { "version": [ @@ -111079,11 +112310,11 @@ "repo": "K6SM/Emacs-QSO-Logger", "unstable": { "version": [ - 20250709, - 1505 + 20260707, + 1515 ], - "commit": "33d3211748aa7e94f1aa187570beca8b9b2093d8", - "sha256": "033l5pg7bfc598xqniavwwlhlq488fzl92d17603c45f51v5yvff" + "commit": "a3b0d1f0b103cd00e0980637d75b6e3092d07b48", + "sha256": "0m2g5lbwi5kp54kldm13swwrgx3q126bqdax0ik9q45fv69x3q5c" } }, { @@ -111317,20 +112548,20 @@ "repo": "jamescherti/quick-fasd.el", "unstable": { "version": [ - 20260114, - 1535 + 20260701, + 1254 ], - "commit": "7f295404a9d5f93450c071e6226d8f52e574ab8b", - "sha256": "1b2hkvzisxdv46iyf5b3pfyw3s99v57klm5clscpwbzh8n4dnmza" + "commit": "40ac0f067b8c24ab4ac8283a9bf79655e586304f", + "sha256": "0yvd3za47s0ypv4ffc1rgp2y3zbb5jw0xbjzyh033c0d89js5r7j" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "fe0d6c611ec995e2f59b23d45af3b8b28244703b", - "sha256": "1fsl6l67jf8fm5h6i5qxqvibzssbiyyjzchq3r5sbqry3d8yx3mk" + "commit": "249334222d13b5ea6d4811833326358e8d0dd30a", + "sha256": "0662xmvikhfgcvivxb0m9d583ir1skj904i3sl5qq1cnn2a4hgcd" } }, { @@ -111371,20 +112602,20 @@ "repo": "jamescherti/quick-sdcv.el", "unstable": { "version": [ - 20260326, - 1610 + 20260601, + 1608 ], - "commit": "e28c59514500d61d825657fc735fbafce3599d32", - "sha256": "1bpgyry817zcbqilmbiiv3la11zszbvrhcy7826gif6rpyyq2wgi" + "commit": "f0583c0ca6a9c155ea0037c9c59e0665a884e33d", + "sha256": "0x0z124d4gp9d3dakxb9ghwssk3cwdh20r2xiwddgxxx77p4b5nw" }, "stable": { "version": [ 1, 0, - 4 + 5 ], - "commit": "43385cddb1e0cad978ac007079f33a788cc5457a", - "sha256": "1r881b5j207376zj73z9y54r8v0hjizh0lz8wckfsz2dhyqa00ri" + "commit": "f0583c0ca6a9c155ea0037c9c59e0665a884e33d", + "sha256": "0x0z124d4gp9d3dakxb9ghwssk3cwdh20r2xiwddgxxx77p4b5nw" } }, { @@ -111624,14 +112855,14 @@ "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20260303, - 1556 + 20260626, + 1429 ], "deps": [ "compat" ], - "commit": "24cb8e977a05d188756284e46ff7cece2d899f75", - "sha256": "00zvqsaav2hr1hllvv7nxbnb4yzkz64val46qp5rb4mf217rlqnz" + "commit": "97d9b8b7d73a02777c0f70ce6d145a99a99b37cb", + "sha256": "1rcflgpnl77wlhlcg6wikwaw39wyhn0n4fr3i43gypa04q3ih9f9" } }, { @@ -111935,11 +113166,11 @@ "repo": "punassuming/ranger.el", "unstable": { "version": [ - 20260201, - 717 + 20260527, + 2231 ], - "commit": "61e7c840c52007dc17e64215fe8dbcb71139fa39", - "sha256": "1nyh2c6z9pp2gmcybpy5b2i1rg4d7v9v2ck8m7siagrjwfzdxqfk" + "commit": "cfcab21cd21eb48709fb4436ba84f3e2a048a432", + "sha256": "13z425h92ay1w3kkgz018ajig2ggd2lzgz76szws9vn3k57b9wzm" }, "stable": { "version": [ @@ -111952,6 +113183,21 @@ "sha256": "01rphv92g1r0cw5bwkbrh02s0na7fjrddxx1dckk2y7qr97s7l8j" } }, + { + "ename": "rare-words", + "commit": "bcedf998dbd7d11de06d4c6361863a8c594a4ae3", + "sha256": "1lh5q96nbrik69alj4agapmc0c8fjhxwi9dp5gvgqswgvhmxbil6", + "fetcher": "github", + "repo": "amolv06/rare-words", + "unstable": { + "version": [ + 20260401, + 618 + ], + "commit": "7e6b3e2083dd37e1a150422c648c28d3b703f185", + "sha256": "1982fnjpw6lqgnbkqn39q2dh52hyhakg35g2vgjn13f8a4csqdfs" + } + }, { "ename": "rase", "commit": "334419debe065c34665bb0207574d1d4dfb9e8ae", @@ -112430,16 +113676,16 @@ "repo": "realgud/realgud", "unstable": { "version": [ - 20260411, - 2216 + 20260609, + 1331 ], "deps": [ "load-relative", "loc-changes", "test-simple" ], - "commit": "34a9065d1695c3b4bfbae076440397ad24bc8faf", - "sha256": "1bwdmkj0imlarki09k5i1lrhk3c1rqa899zy6n8j76xpcc57jqwl" + "commit": "bc3fbafc190a1a38fd12459bf323ffe4dcb159af", + "sha256": "0y1kbmk4wyffbyzlhjn86bbvps5v4hapsmlfl35304kji24ydgia" }, "stable": { "version": [ @@ -112906,11 +114152,14 @@ "repo": "ideasman42/emacs-recomplete", "unstable": { "version": [ - 20260403, - 1048 + 20260504, + 1201 ], - "commit": "c0b1a38cceb3cd65c8e6004f527eba293caafeef", - "sha256": "1sx0bnjnapnp9nym9hnhxc981ifg5waxiv1palgcsxm0jrazxkm7" + "deps": [ + "with-command-redo" + ], + "commit": "d8e2b35a65910fee40cebee39153c1e6bc462cc1", + "sha256": "09kkh842ypi89l6r3qa5f1xx9985nvas22687fyv607ja4iyp9yz" } }, { @@ -113021,25 +114270,25 @@ "repo": "minad/recursion-indicator", "unstable": { "version": [ - 20260322, - 18 + 20260519, + 1025 ], "deps": [ "compat" ], - "commit": "4805275937585102aba0047169f047032201c5b9", - "sha256": "0fs2xzpdj0prk8zc43biayk2yad4yyj07lq7qph1vfgv5dg308fv" + "commit": "eb33010866742808cabae694fa4e77b33737522e", + "sha256": "1i5rpzpmh50yg0vsy5049sf9xz5i5cglrpcm5fni1w1ja78qnxjd" }, "stable": { "version": [ 1, - 1 + 2 ], "deps": [ "compat" ], - "commit": "548838df2ef15fdd8e9d904d0a74182297e3383f", - "sha256": "1m9fxl405yprz0id18g7192h8sp51j07n8lc41lb3yn8vwl13g0l" + "commit": "eb33010866742808cabae694fa4e77b33737522e", + "sha256": "1i5rpzpmh50yg0vsy5049sf9xz5i5cglrpcm5fni1w1ja78qnxjd" } }, { @@ -113553,11 +114802,11 @@ "repo": "ideasman42/emacs-repeat-fu", "unstable": { "version": [ - 20260403, - 1127 + 20260617, + 256 ], - "commit": "ec9965832f4b94e635478fd6e67c29a523e2e36e", - "sha256": "0xymxdyj48q94zkk9igkcy8swmiad4l2rw2nwmsgrjkm0ccqmkfk" + "commit": "4d30d92a1fc3b5f0207866685de16cb78b83337c", + "sha256": "1dc3g7fagzll24ws39gwy5zl3bxmca1njky4gw5s5yb5gd40cypk" } }, { @@ -113988,11 +115237,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20260419, - 1929 + 20260505, + 2042 ], - "commit": "202cf1202f286b4440980e46c0a0c0a8003f7ec6", - "sha256": "0xfrqf61y70dl600p7pqg7fmykv5jwmis2m8r3dxgxajw84vl80j" + "commit": "d0ff73d8e6c9653f0baf7edbcd7e585a24dedf8d", + "sha256": "134ks3anl9p70f427pc0r90nrp5lxp28hqy1zcncdm1zjnxhlqwq" } }, { @@ -114056,14 +115305,14 @@ "repo": "emacsorphanage/restclient", "unstable": { "version": [ - 20251209, - 2022 + 20260627, + 1851 ], "deps": [ "compat" ], - "commit": "1800a4e367c250051617d0b8c16a7cbd7f47da69", - "sha256": "02yphcli11j0p6144rwh7l5whx4ahxm3y15nz0b7r3y04fm25w6g" + "commit": "d280632df39a175dac06037038105e32945624be", + "sha256": "1v49has9ckn2rpjhfjds86vaaa4i0wnazz9061smaasqkf28r3i3" } }, { @@ -114437,11 +115686,11 @@ "repo": "galdor/rfc-mode", "unstable": { "version": [ - 20260127, - 1807 + 20260617, + 1030 ], - "commit": "2d3dcd649e291eeb93091560b504f96162371c32", - "sha256": "0hrh5b0ph39nbqxgvj69i3mcmiq2gfsxgfzydj539x3vcz8s4140" + "commit": "0ab3e0b5eca45e7baaea748063b8590d08b55789", + "sha256": "005006yz8yq7b0a0ds8k1p50in3yassds6p7jq45cwbblmchyv11" }, "stable": { "version": [ @@ -114461,15 +115710,15 @@ "repo": "dajva/rg.el", "unstable": { "version": [ - 20251022, - 457 + 20260517, + 1310 ], "deps": [ "transient", "wgrep" ], - "commit": "9ff6cb24bda58f481886ebaf16b524f4f9b3769c", - "sha256": "0yxs6szqhvkmg1ikmpykh5w2kk1jgyfvbymxp19i26pkjfrxfl52" + "commit": "e46a16b8bdba111c9c0036d0e209490dd7a3690f", + "sha256": "12niibbw7d1ncj8l6pm21wv61js9kmikphn9b7md1mpvbhz78bxy" }, "stable": { "version": [ @@ -114749,20 +115998,20 @@ }, { "ename": "rimel", - "commit": "9071d1f195bcc22bbfb9c4486e5a8a5ec0d477c3", - "sha256": "197r8a0s0ixkkq8gh0ia23q42wgh9mxzq9pakma6wdxjljggqm5f", + "commit": "eb0134db6bc0f83b4b8984e354caa7efd55dda98", + "sha256": "0d2a780ml3c1js2521g5bcmfsrib6a88iai77y3gv41w8jzmwdnn", "fetcher": "github", - "repo": "jixiuf/rimel", + "repo": "emacs-rime/rimel", "unstable": { "version": [ - 20260420, - 1036 + 20260706, + 343 ], "deps": [ "liberime" ], - "commit": "1b7e6c7c626b36a7f80e8c388454bb4562da11e9", - "sha256": "00arwm2r3m80lq41ywdn0220a12ski8iwigxnr83wfh771kb2iw1" + "commit": "4d7bbad3e9b70fe0755174a79d5b7e59dfb6d3f7", + "sha256": "19rqq53akvrzdj74ajqvgb4dz1rmiqyivs9vcpaz43s56q00sa5c" }, "stable": { "version": [ @@ -115231,11 +116480,11 @@ "repo": "marcowahl/rope-read-mode", "unstable": { "version": [ - 20250428, - 1236 + 20260610, + 2004 ], - "commit": "7cd80d6c8e4a7e24a5147c06f083d745aef91b55", - "sha256": "1f55x5cwc87jqhxpg7bwgr8mwv544awqf1sn6fnc7qzma8bm02pn" + "commit": "4270080eafa5fe5ce1d1a7ecc7ac4143a7d62a22", + "sha256": "123sdgbrgqsr0fdsviibhrmw5xp20g4ki2nvffd0h4p2fmrmdm89" }, "stable": { "version": [ @@ -115328,11 +116577,11 @@ "repo": "daichirata/emacs-rotate", "unstable": { "version": [ - 20210126, - 637 + 20260521, + 630 ], - "commit": "4e9ac3ff800880bd9b705794ef0f7c99d72900a6", - "sha256": "1v4xaqfh3madrc8jcr16xzs40vvmk2ml1qwgsxkcm11l6pglmnnk" + "commit": "d61c7643b8dbe3fdd59f8ee40212f27bd14cfb61", + "sha256": "0v5jgmv78z7z5l92bfi39w36i8z29zni8cm4sbh39z97x059zljz" } }, { @@ -115417,15 +116666,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20230819, - 154 + 20260618, + 548 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "29df3d081c6a1cbdf840cd13d45ea1c100c5bbaa", - "sha256": "0fyqlsj91j1fks16bx8zy0ly3mc6nk4fk2vbf0yjc2fa14hda41m" + "commit": "b5d48de9b56a0070d7a0d3e642b139992a1ce3f0", + "sha256": "067na709bbsazhpd8y22lxplh34lf0r4jf2akpqbyiai1izs9vdl" }, "stable": { "version": [ @@ -115466,11 +116715,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20260303, - 1816 + 20260504, + 1903 ], - "commit": "787fb682a13ca1c131c07ee28603cb1f2544595b", - "sha256": "0wcs0g588az1asdbkavac5543kglsvn0xlg8zh9jdj534q6a7n4b" + "commit": "2d9049adfef58961d0a710f93a8af387eb84dd01", + "sha256": "1a1k4rpjhp0k2255aa4myfymv3qailklgk200220yw3qn2wwcgs4" }, "stable": { "version": [ @@ -116047,20 +117296,20 @@ "repo": "Anoncheg/emacs-russian-calendar", "unstable": { "version": [ - 20251201, - 1323 + 20260716, + 2030 ], - "commit": "4b250e6aeb37470a030ebddf92f9a65184f67f03", - "sha256": "0xcksm64fqg9bmkjp9h83rrvjnycbcyi1nqa6sk55zpyjq3gj7sb" + "commit": "99077f02546a1a3619c46f95be926ceada155478", + "sha256": "1alk0v36jr3xbd0ykdq8kil35cqdjhcfczlnmwvdkn6ydy5igv3l" }, "stable": { "version": [ 0, 1, - 1 + 2 ], - "commit": "23bc82093556a2bd045621c9964ba9162aac9937", - "sha256": "09609pffp0rr87xqldznjjx5f60h3l9dg266sgiciid34hl0f1m8" + "commit": "23d222041dba8e5dad07542e0dc7dd3fc8419112", + "sha256": "0hwhs8qx0jp45d39zzbg7ab0nb96v6wyb86hymsahdxp32yhaing" } }, { @@ -116133,11 +117382,11 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20260416, - 505 + 20260521, + 745 ], - "commit": "06cf08810018f54bf5246d8db155c90ab60d381f", - "sha256": "18khvsny09dbxbhfi3fl7dyy06n69p7xl5b84brfqcl9w8rgbcmr" + "commit": "ed401a65743359b8de11ee9ced0e1da39946cefd", + "sha256": "1srgvdg3mhgs9v4g5yan4p510gaw5mj56smy2i5lil1zzbrk0kd6" }, "stable": { "version": [ @@ -116366,16 +117615,16 @@ "repo": "sagemath/sage-shell-mode", "unstable": { "version": [ - 20240504, - 726 + 20260523, + 1504 ], "deps": [ "cl-lib", "deferred", "let-alist" ], - "commit": "4291700e981a2105d55fa56382ba25046d3d268d", - "sha256": "1dch7cwwslffgnzp1djlhz6a792ci42p4bvazxd9lqzhzal0rsbb" + "commit": "bb59cd559a9d7639d9ef16addbb0809ea4790392", + "sha256": "11daz4h30p74cc7rxyn12g53qgl01mfgd17d62sllip30iy1k035" }, "stable": { "version": [ @@ -116518,11 +117767,14 @@ "repo": "thapakrish/samskritam.el", "unstable": { "version": [ - 20250829, - 2315 + 20260701, + 225 ], - "commit": "e84358904b93c5c03d00b62f1e6735393d2b3d53", - "sha256": "1k2lsgn2zz82qpbz1ym9d69a008q3w5z7szszs1i2pz2cqwp4f91" + "deps": [ + "transient" + ], + "commit": "30bbd177d2664c5a0d33f17b42c07705b8473b66", + "sha256": "0126jqcr9gjyd8sg0dmdg2j1pcgd55i7kxmrw81ysy6x586h3h1q" } }, { @@ -116730,26 +117982,26 @@ "repo": "clojure-emacs/sayid", "unstable": { "version": [ - 20220101, - 1357 + 20260717, + 1435 ], "deps": [ "cider" ], - "commit": "879aff586336a0ec4d46c0ed4720fb1de22082bd", - "sha256": "013afdzz0rvb428pla78an052jvw2q95zzqvnq9z9w16y5yd1n0c" + "commit": "16fe77228cb3f76eee52d1be336a505f23a31223", + "sha256": "13gsvd11h5gq2ppgx9sk65vlcv3cgxj45br5izm3kjy6hy9hqbrg" }, "stable": { "version": [ 0, - 1, + 8, 0 ], "deps": [ "cider" ], - "commit": "985837897ca6f9bc5f1d1b1414ad15554a60d3b3", - "sha256": "0vdz3dxwi02an5k956apq3ah0dpzly9zd44fhmrqlcjimxc69m7p" + "commit": "16fe77228cb3f76eee52d1be336a505f23a31223", + "sha256": "13gsvd11h5gq2ppgx9sk65vlcv3cgxj45br5izm3kjy6hy9hqbrg" } }, { @@ -116784,25 +118036,25 @@ "repo": "openscad/emacs-scad-mode", "unstable": { "version": [ - 20260330, - 717 + 20260519, + 1039 ], "deps": [ "compat" ], - "commit": "44481331536516e34940315f67fa58f99f62a589", - "sha256": "198m7xhyvjmqar9n7pmi7m36rvw47w2g218hkgzdkdlq55a17w32" + "commit": "8798dca7e919705bcbc35d4ab5639556827ccb6f", + "sha256": "0mqfvff8f7lqjviwz30j7vkb098xd0k8bdzznb77aw4q7gdsf8nm" }, "stable": { "version": [ - 98, + 99, 0 ], "deps": [ "compat" ], - "commit": "546d1507cd131f55ca930de7ae1518884e8221f4", - "sha256": "19mn6z98c8s7mspa7j8xw7za33gmpsy4iw2r9xiggdv7yh6mh8h8" + "commit": "8798dca7e919705bcbc35d4ab5639556827ccb6f", + "sha256": "0mqfvff8f7lqjviwz30j7vkb098xd0k8bdzznb77aw4q7gdsf8nm" } }, { @@ -117366,19 +118618,19 @@ "repo": "precompute/sculpture-themes", "unstable": { "version": [ - 20260215, - 1259 + 20260701, + 1308 ], - "commit": "e5ac2c7b72ee58eb66510937270716d25484ecd6", - "sha256": "0137zqir9p1lfazs6n8qz0nw4vajawh7w1104psabrqm2izwpjz2" + "commit": "8fa20dc87a86ea4576debb38a75d71f1ee6ae273", + "sha256": "1mw1wf62jxs3nb84b9d4ziyn6xqj4g8skg9n1dpyw6yiy3ycaazj" }, "stable": { "version": [ 1, - 10 + 11 ], - "commit": "e5ac2c7b72ee58eb66510937270716d25484ecd6", - "sha256": "0137zqir9p1lfazs6n8qz0nw4vajawh7w1104psabrqm2izwpjz2" + "commit": "8fa20dc87a86ea4576debb38a75d71f1ee6ae273", + "sha256": "1mw1wf62jxs3nb84b9d4ziyn6xqj4g8skg9n1dpyw6yiy3ycaazj" } }, { @@ -117521,10 +118773,10 @@ }, { "ename": "secretaria", - "commit": "3eeddbcf95315da40d021a6913ccf344849c4284", - "sha256": "04pcibzdljcfiha4yh10van8gsjrzn6bdkvkm2ahfcwrmscfn3hf", - "fetcher": "gitlab", - "repo": "shackra/secretaria", + "commit": "c2aa66942cf1712306f07bb15c8090ed10e50fd5", + "sha256": "0jlya40q1rflm75jzwr9cnlw94ggryhi1fc64dly8gjbp5zvkfvz", + "fetcher": "github", + "repo": "emacsattic/secretaria", "unstable": { "version": [ 20191128, @@ -117690,11 +118942,11 @@ "repo": "Kungsgeten/selected.el", "unstable": { "version": [ - 20230219, - 1328 + 20260523, + 1823 ], - "commit": "1ca6e12f456caa1dc97c3d68597598662eb5de9a", - "sha256": "11xjv861mx15fhvv8g67ahri5p8mplnhq9sf30c825bk1f0h7xzy" + "commit": "9f5a6324e4911515972989841f143696472f2374", + "sha256": "00k3r89br7wqd30ka94igsbk7iqljf9ink60pbc2wkr6i5xl5hdi" } }, { @@ -117705,11 +118957,11 @@ "repo": "captainflasmr/selected-window-accent-mode", "unstable": { "version": [ - 20260326, - 837 + 20260630, + 801 ], - "commit": "1ab6e720ee2c34035b5d0ab855c32d471f7ca849", - "sha256": "0avkn256njlzkn0hkr7l1rykcsrs8zgmpahnj6zm5z789200g7c2" + "commit": "57dfb3b4c65943f542eca322644cfa4d0731366c", + "sha256": "0b2r09jkpvcsj01cdw1cwajhlfvavbqk11fnsxcph2bbkin0a7yv" }, "stable": { "version": [ @@ -117803,28 +119055,43 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], "deps": [ "prescient", "selectrum" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], "deps": [ "prescient", "selectrum" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" + } + }, + { + "ename": "sema-mode", + "commit": "be69ff027d4d11a3a4d87b190aa794fea638c079", + "sha256": "06k9mac5cdlxpay408221m4xhljcrxc12xyllyq4gqrb5xwvmc3q", + "fetcher": "github", + "repo": "sema-lisp/emacs-sema", + "unstable": { + "version": [ + 20260713, + 653 + ], + "commit": "296c970854225ffa2f1a9944835f07e40b5cd7b0", + "sha256": "1m0q874nzvp4rph5dkfv0whkalcgff2jnjnwyxikfi0n7w1bvq74" } }, { @@ -117906,16 +119173,16 @@ "repo": "conao3/seml-mode.el", "unstable": { "version": [ - 20230702, - 1446 + 20260516, + 826 ], "deps": [ "htmlize", "impatient-mode", "web-mode" ], - "commit": "23d684ac590fad6aa3c5ce3962c4683c1eb8fdb5", - "sha256": "1146ap0jl1n0qfn117r3iz98zm3qfwm5w0hj0gigq0cqy9c305lb" + "commit": "ec1efc3fb1a3d831a744bdaa0beb4ac5fcf59d2c", + "sha256": "0pmxglsyp2p0h1a3qmwbwnacqfrdbjfad2ja4gc49i4qz0jcp9x5" }, "stable": { "version": [ @@ -118260,11 +119527,11 @@ "repo": "vspinu/sesman", "unstable": { "version": [ - 20240417, - 1723 + 20260616, + 1239 ], - "commit": "7bca68dbbab0af26a6a23be1ff5fa97f9a18e022", - "sha256": "1gl2dv7smyxkga4b5dflahqhasw9k15ppc4s0py29454p5k861yi" + "commit": "7eb733acb33e610a53979fa7fc13393eeda3cc53", + "sha256": "10c0djz3pqi84fynajaqkxls7j7r04xylxgfpysvlmj1jhd3f4lp" }, "stable": { "version": [ @@ -118388,17 +119655,17 @@ }, { "ename": "sexy-theme", - "commit": "3c721d77616bda8bc4b7819a24698690c737c07e", - "sha256": "0pfnn880iyjzsr4fcrrpc65d0z5a9s4iy4bgrz7qrrjfygdni6fz", + "commit": "1e1e825c81265015938b1fca212b88b54982cbba", + "sha256": "1f2wh180smq8g6cny5yd2cnjkzam2xjykqlj7gy282rnj6bhs8gz", "fetcher": "github", - "repo": "thebigcicca/sexy-theme.el", + "repo": "xenodesire/sexy-theme.el", "unstable": { "version": [ - 20250312, - 1640 + 20260708, + 327 ], - "commit": "57cca02c067ded3964de6cf1566ef08cf5130189", - "sha256": "0qn0h309dqdi08bjfwdm1l0rpq1r2gzv88v2azwnnrxqldk2lkzs" + "commit": "eb747facb5916d8cbcac3e5d086317ce5e1ff341", + "sha256": "0kbjmz4lv9812qxl2d3q195833zyrb641p1kbfp4wbrkvy9jpgn3" } }, { @@ -118554,6 +119821,30 @@ "sha256": "11g9lsgakq8nf689k49p9l536ffi62g3bh11mh9ix1l058xamqw2" } }, + { + "ename": "shannon-max", + "commit": "73d14d4edcf1d456fc94b0edfa25334231eaa132", + "sha256": "0kyifilkk5xsimvyfwz894zwq2znycd3dwvi7qdnl3vhx7im9bck", + "fetcher": "github", + "repo": "sstraust/shannonmax", + "unstable": { + "version": [ + 20260505, + 1426 + ], + "commit": "539bd5f771b798973734696b3b0ae10f56d3966d", + "sha256": "0hg36vyn3lxl60jid04r61c9vwr7c3g1sniiwix86wv1ysmh6qi9" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "9ebeddb9e0fe4958a2347288d3860097a331a77c", + "sha256": "0pr14gywkpjmcsvjslqb0sxpk2r88s0sdiq67l7sxfkp9hrcszjx" + } + }, { "ename": "shanty-themes", "commit": "202aaca417d9e7a5a473fe4e448b13fa4ca3a444", @@ -118679,20 +119970,20 @@ "repo": "xenodium/shell-maker", "unstable": { "version": [ - 20260330, - 851 + 20260713, + 844 ], - "commit": "6377cbdb49248d670170f1c8dbe045648063583e", - "sha256": "0v2iqvr2ywng5d22sw88k90i2jzl3cf2ybp9q6qpqirhvlsbgq19" + "commit": "071c6df3ca22a2f4c0daa689848ac9bd21bf4e2b", + "sha256": "1bbh53hg1j6ic6pjjprl5y6h217f4zcj7z7pyyp5d75qv7m59f0v" }, "stable": { "version": [ 0, - 90, - 1 + 93, + 5 ], - "commit": "38951e875c1203f1dd6d4a4a3bc57e6a7ffc066a", - "sha256": "06ibxnb765sjcxjv2w923cnjr9664qp2pf7w3wxdp8vrbxg1s670" + "commit": "071c6df3ca22a2f4c0daa689848ac9bd21bf4e2b", + "sha256": "1bbh53hg1j6ic6pjjprl5y6h217f4zcj7z7pyyp5d75qv7m59f0v" } }, { @@ -118703,22 +119994,19 @@ "repo": "kyagi/shell-pop-el", "unstable": { "version": [ - 20241207, - 1539 + 20260610, + 2231 ], - "commit": "657171f296fc930b1f335a96e6f67ae04b731b19", - "sha256": "1j8bwgrp4ydpd4s08px15sv5ri28zyb8zfpmfanh9k77m4hmx8cq" + "commit": "446b1691454e65be648dcb7e316639aa7dd73be2", + "sha256": "03j6kv0vhijjwb1d9rfb075d9qfbfi021prjwyx9a9jwp90z7pbr" }, "stable": { "version": [ 0, - 64 + 70 ], - "deps": [ - "cl-lib" - ], - "commit": "4a3a9d093ad1add792bba764c601aa28de302b34", - "sha256": "1ybvg048jvijcg9jjfrbllf59pswmp0fd5zwq5x6nwg5wmggplzd" + "commit": "29f279c36c002810b750c10326ccd7d63b3aded1", + "sha256": "1sdi7ckn3dcxy9kw7xz2b5z46fgjjn5mvwpqsmjh3qa6kqirlwmi" } }, { @@ -118933,6 +120221,33 @@ "sha256": "1d8462mrifp33pbkr5kgkb0m6fk98r6ysi6j9giyj83xih9rpxd5" } }, + { + "ename": "shexc-ts-mode", + "commit": "8d43ade341b5f0902f5e7748d325592e30178cc1", + "sha256": "03isnhya3hfc0l80p5m7xi6qdz83xb1zwam0yqgayc9zpal9yw0y", + "fetcher": "github", + "repo": "ericprud/shexc-mode-for-emacs", + "unstable": { + "version": [ + 20260705, + 2334 + ], + "deps": [ + "compat", + "transient" + ], + "commit": "d113ddc322a7cca2ef92ee6af95e5755af429ccb", + "sha256": "0xzfzcc43skcgqm8h9g6c6bnd1qbadd7q7q0sakczal66ndwvrnb" + }, + "stable": { + "version": [ + 3, + 0 + ], + "commit": "485f3b3d215ad86ba36dcdca9cf9adfbeaba049b", + "sha256": "1jy3y3bqhg95451mhc3jkak745cnv6f4wgs8s7b2kl3lc2alga79" + } + }, { "ename": "shfmt", "commit": "a20dde08de1a7cd70739a791e1ae321e8f152685", @@ -118970,11 +120285,11 @@ "repo": "ideasman42/emacs-shift-number", "unstable": { "version": [ - 20260103, - 831 + 20260620, + 1211 ], - "commit": "a71f5c3c77affc27a3d0bf16886a8a3b03c05044", - "sha256": "03xv2y03xn08mb2hmqd5kljqa4jsfwg3l89micc6xvvkl1slimsj" + "commit": "d5e8bece6e6ab21ad5a93330d49b2554e9eb72a9", + "sha256": "139ilxbqjcf1x3x0dc9vw0jf986cr7qkc2x7fxggkcny90dwiqhi" }, "stable": { "version": [ @@ -119142,11 +120457,11 @@ "repo": "ideasman42/emacs-show-inactive-region", "unstable": { "version": [ - 20260410, - 318 + 20260612, + 949 ], - "commit": "d2715aba9fb17e38651b434f0f71fa2234eb8576", - "sha256": "0q4qxazzvgjql6bcyv2awncgyb7f47yl738wi7ivr08hsf3k179k" + "commit": "c870fe641c56328458e16d92fd7aedf688844a3b", + "sha256": "15b6iynwxjxha86gsa1z1a8vfq346zprw39ngqv5pr834hyqyyrq" } }, { @@ -119496,11 +120811,11 @@ "repo": "rain-64/sidebuf", "unstable": { "version": [ - 20260415, - 2249 + 20260621, + 1644 ], - "commit": "89ca26d1859e89759f00065c07904d3ef5c80a4f", - "sha256": "19hfypy9ca0rnh66pfyzm2g93dn0q3iak4mgs8nx9vgnwsrc64sz" + "commit": "bac206ea46bdf8450317d29b98dfcd970aa6e85e", + "sha256": "0prya6sb1q35wq5ms0gq55n34ca47dwmx9735qacmfwcd0z61r9q" } }, { @@ -119526,14 +120841,14 @@ "repo": "emacs-sideline/sideline", "unstable": { "version": [ - 20260101, - 540 + 20260716, + 349 ], "deps": [ "ht" ], - "commit": "b4ada1ddf7da96c2e87453130f6ff7b7d577810f", - "sha256": "1kw3294cz43425zmayv7jsfy9q9466jirdkyfagfh27v20bcp6vy" + "commit": "247cd6f6a0a841c5da20b3cc179d77c118641d66", + "sha256": "1ab9vhak97qkprg2ayh6s9p4isbiq8glbgvgf1an768cpzlky67y" }, "stable": { "version": [ @@ -119621,16 +120936,16 @@ "repo": "emacs-sideline/sideline-flycheck", "unstable": { "version": [ - 20260101, - 541 + 20260514, + 1443 ], "deps": [ "flycheck", "ht", "sideline" ], - "commit": "5a4d63210acf735829b08164897fef6a2abc8bab", - "sha256": "0mk7xbkhrknkc8wbkjbnsd2v12gzbrgpvwi7yzrj01dlmjqn9268" + "commit": "ceacbb060c382e31a47b7c7c09da0b42f4d091f5", + "sha256": "1z2ix4crmgxwjdrya2bzsw06jqpf1nhvnigrv5h3mz17fl6fb2lp" }, "stable": { "version": [ @@ -119685,8 +121000,8 @@ "repo": "emacs-sideline/sideline-lsp", "unstable": { "version": [ - 20260101, - 542 + 20260503, + 1235 ], "deps": [ "dash", @@ -119695,8 +121010,8 @@ "s", "sideline" ], - "commit": "dfa29a7b27e5ab64788c76544444f678ae4db18d", - "sha256": "027r0hfqw89pnknw1qmmgzmjixbg0dzk1vgsicnvdqgxr22lraym" + "commit": "393459a7a947a62eb3f1d587fe576937afefb63f", + "sha256": "1s4j1zmrrz6hzrksb3z334hn5xysvqqqappprpj6ywmyyfylpzqw" }, "stable": { "version": [ @@ -119865,26 +121180,25 @@ "repo": "skeeto/emacs-web-server", "unstable": { "version": [ - 20230821, - 1458 + 20260623, + 1110 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "347c30494d3bcfc79de35e54538f92f4e4a46ecd", - "sha256": "1dj2w5yx2dzv6gv4iwahr3mx46dhjfaimw5yycdhb0iljr97a4lp" + "commit": "ceb208f96601be09397fc9e64fa96014ac1c8739", + "sha256": "0svqrd4a7xmxjnqdbj3sbx5glrg1b9gsr6rxy9rz5r1yz2nq1pzk" }, "stable": { "version": [ 1, - 5, - 1 + 6 ], "deps": [ - "cl-lib" + "compat" ], - "commit": "a5eb49a6567e33586fba15dd649d63ca6e964314", - "sha256": "0dpn92rg813c4pq7a1vzj3znyxzp2lmvxqz6pzcqi0l2xn5r3wvb" + "commit": "5a9c69ae93ed5e2cdca98f51b41f6a6782091d74", + "sha256": "0cbidjfrrwwpj73248bw8mb1fbhh4md9awhq4x6wmjl6lkfwr8pj" } }, { @@ -120139,14 +121453,14 @@ "repo": "captainflasmr/simply-annotate", "unstable": { "version": [ - 20260422, - 1527 + 20260630, + 653 ], "deps": [ "transient" ], - "commit": "fe7ed2ebcda0d1899f97f06191adbf260cc5b1eb", - "sha256": "0c3lwzcz6lcf1jdyxlln0npdlvnc3npz0743cjzkwy757wbdnlvs" + "commit": "330c6b4014dcb42526b7a76affed345b1aba8b89", + "sha256": "0xa82hl582plg47ash7ivs05l4yfhbnyax8d1k9640lr7a4nfvss" }, "stable": { "version": [ @@ -120158,6 +121472,30 @@ "sha256": "11irqfqk2rrsncaxm4dggxd639p4ljzcpvibv6g4qpvnzpdihjc8" } }, + { + "ename": "simulacrum", + "commit": "c384223ee1dda500fa03fa314fdaf7b4a6da1e94", + "sha256": "0fxzkvm0rmjzzv4p9mavvrbr0yp6kzswzhyfh9sjah0ssxl3fgkh", + "fetcher": "github", + "repo": "ErikPrantare/simulacrum.el", + "unstable": { + "version": [ + 20260601, + 35 + ], + "commit": "ad01fcf054f9fc573b7023e2fc86566d27ae45b1", + "sha256": "1k06jm4v2xya267hlj516sad99swxi63i2cxdyq1kq46mx1ma40l" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "ad01fcf054f9fc573b7023e2fc86566d27ae45b1", + "sha256": "1k06jm4v2xya267hlj516sad99swxi63i2cxdyq1kq46mx1ma40l" + } + }, { "ename": "sink", "commit": "9f6b09154d54b3bfbc16ef606fc7dfefb4762014", @@ -120196,11 +121534,11 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20251208, - 853 + 20260711, + 608 ], - "commit": "515e1dbe0180f33c292660b4b70d02d47153be5b", - "sha256": "1gd9zribaif3kdaja2csbhc1a05vh6bjxqfm4qlk4bvw88ldqv0b" + "commit": "7ca3e115f159f22ddb4bcea85a22246ee03c422c", + "sha256": "1s8sy3vv55hh63rrpprd24p934lmvll2m5wspwfi2pibvx9jajkv" } }, { @@ -120211,8 +121549,8 @@ "repo": "magit/sisyphus", "unstable": { "version": [ - 20260101, - 1900 + 20260620, + 1659 ], "deps": [ "compat", @@ -120221,14 +121559,14 @@ "llama", "magit" ], - "commit": "7774ea7030fb7b2793eff41a8cae1e80c2ed955a", - "sha256": "0j8cz9gmb49x60hi0fq4swkr0nyyahda35nj7pqn9brpgiihaang" + "commit": "dd4ae5d52c9d862c2ebeb1c72422ba0f6e22e62b", + "sha256": "13sgw5z0ww14ff7rnzd248a2d19rpkyhw8p222fgh59nri1n7dfm" }, "stable": { "version": [ 0, 4, - 0 + 1 ], "deps": [ "compat", @@ -120237,8 +121575,8 @@ "llama", "magit" ], - "commit": "7774ea7030fb7b2793eff41a8cae1e80c2ed955a", - "sha256": "0j8cz9gmb49x60hi0fq4swkr0nyyahda35nj7pqn9brpgiihaang" + "commit": "4c88989715f2c347714e9cad26b03789e2b68143", + "sha256": "0mpclwvygn28qk0xabz8fmjmiha4v8dk8k2z2vi5fgj8zrdmbm1k" } }, { @@ -120329,9 +121667,9 @@ }, { "ename": "sketch-themes", - "commit": "d1b2026ff5fe7a2893dd4c71d9089e97c4fd48f1", - "sha256": "18n6blkrn72zyjj4ik3f6w2axmn0rwk8lpbcaynl3y7v7ij35m0r", - "fetcher": "github", + "commit": "1715bc37bd72251436041d0089c1472774c81379", + "sha256": "02ki700xrc87b46jpi0s2031c87dc42q9dp9yddrgv77wf0fa9xs", + "fetcher": "codeberg", "repo": "dawranliou/sketch-themes", "unstable": { "version": [ @@ -120481,8 +121819,8 @@ "repo": "emacs-slack/emacs-slack", "unstable": { "version": [ - 20260417, - 1053 + 20260716, + 1645 ], "deps": [ "alert", @@ -120494,8 +121832,32 @@ "ts", "websocket" ], - "commit": "904741295a5df0e6a127cacaf60a567924bb27f3", - "sha256": "0n6z7p9b3n8mlwkwzv6b588lcla9d0izmrhf8p5ajlr1pf979i92" + "commit": "93be9f2a47a576e300568fb82b6d5db53b9f200b", + "sha256": "0var54x5r8db5vppsg7lq5badzy7sbqj87zg4cjjsks4fwmil8b6" + } + }, + { + "ename": "sleek-modeline", + "commit": "65dce69ca7a66141a74470c0c0345d7b3a960e28", + "sha256": "1hx3riadzdxspjshc8vasqv7dnf0hcpn5kw6l5xi6kjxix0iw6d7", + "fetcher": "github", + "repo": "abidanBrito/sleek-modeline", + "unstable": { + "version": [ + 20260712, + 2128 + ], + "commit": "e5981c02498f4922f220f16f062f91512a5c406d", + "sha256": "1hj0b6gyf56lf0dcambdasg068z2i6jja3w3m6fb6k01cxdppjc2" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "commit": "e5981c02498f4922f220f16f062f91512a5c406d", + "sha256": "1hj0b6gyf56lf0dcambdasg068z2i6jja3w3m6fb6k01cxdppjc2" } }, { @@ -120553,14 +121915,14 @@ "repo": "slime/slime", "unstable": { "version": [ - 20260421, - 2256 + 20260719, + 420 ], "deps": [ "macrostep" ], - "commit": "b18fc71ab25ad8dd16e008ad6ed1ac1eb34be736", - "sha256": "0d27fqnbsl4ispi722b8q7bsd4n32rccm0p0hysq7q0b2ml2kg1g" + "commit": "055c1c98c2b7791162b0e8c994051a7d72208dc1", + "sha256": "0scijga623w7q0hx04dl9lybvd3pvp2pvz51fwfn3gxgc64ip7pd" }, "stable": { "version": [ @@ -120888,28 +122250,28 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20221119, - 2235 + 20260614, + 2139 ], "deps": [ "popup", "sly" ], - "commit": "6f9d751469bb82530db1673c22e7437ca6c95f45", - "sha256": "0bxan0h12xqdsfr3bpk7n8zj7d5xvp4v3wg4fbcf2xw63j02m810" + "commit": "c1fa52dadb2f453243dc522203b7a883adef63fb", + "sha256": "090cam192hrk6xriwscbfnzkdbvrbmdncdrmxxqgv048bcnj93g0" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "popup", "sly" ], - "commit": "3180921efdc19a2195960e1d601b2a6f31a6feea", - "sha256": "0gncp8xv33s4wx594bgd35vr1455bcggv1bg28qv75mhv41nzw97" + "commit": "c1fa52dadb2f453243dc522203b7a883adef63fb", + "sha256": "090cam192hrk6xriwscbfnzkdbvrbmdncdrmxxqgv048bcnj93g0" } }, { @@ -121461,19 +122823,19 @@ "repo": "mickeynp/smart-scan", "unstable": { "version": [ - 20170211, - 2033 + 20260710, + 1518 ], - "commit": "234e077145710a174c20742de792b97ed2f965f6", - "sha256": "1nzkgfr1w30yi88h4kwgiwq4lcd0fpm1cd50gy0csjcpbnyq6ykf" + "commit": "5e283b92b5c5826e194043b0314e0d6d88a94a62", + "sha256": "0dxbwxl3280700my2rcpxga2z4aqs1xqivinr91ia9n0w2jgad31" }, "stable": { "version": [ 0, - 2 + 3 ], - "commit": "13c9fd6c0e38831f78dec55051e6b4a643963176", - "sha256": "1sd7dh9114mvr4xnp43xx4b7qmwkaj1a1fv7pwc28fhiy89d2md4" + "commit": "5e283b92b5c5826e194043b0314e0d6d88a94a62", + "sha256": "0dxbwxl3280700my2rcpxga2z4aqs1xqivinr91ia9n0w2jgad31" } }, { @@ -122294,11 +123656,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20260329, - 1559 + 20260610, + 1943 ], - "commit": "0972a0f1471ed67211b7c8918a3c049380050d7b", - "sha256": "17h3kncdkdnn2c64g0hlbl45yvv6vqvvy8akcgzn32iw7nlx7b9a" + "commit": "0d9d9efff196d8d8ee4ac606e70bf062a057136b", + "sha256": "12679vralilqxzdfkkylcxfj6qf74na0pakrbc4wqkqx8gak11vf" }, "stable": { "version": [ @@ -122512,20 +123874,20 @@ "repo": "djgoku/sops", "unstable": { "version": [ - 20251102, - 57 + 20260518, + 350 ], - "commit": "7cce0d6800eff1e9c21ab43fffe1918bcc006e7d", - "sha256": "0vi7jw7zqj04ikajnssa68v6npd43bvaiw2afck25wxa9hnaja7f" + "commit": "95b2178a71dcbf3e69729c52cba2bc23171e059d", + "sha256": "01wd7qglz3z5ip9mviy92bhfvmnhfm3mwfirxrhjb9y4jxyq9da3" }, "stable": { "version": [ 0, - 1, - 8 + 2, + 0 ], - "commit": "4c0eba238837b439ac23493e70255abb22653ac6", - "sha256": "0vi7jw7zqj04ikajnssa68v6npd43bvaiw2afck25wxa9hnaja7f" + "commit": "95b2178a71dcbf3e69729c52cba2bc23171e059d", + "sha256": "01wd7qglz3z5ip9mviy92bhfvmnhfm3mwfirxrhjb9y4jxyq9da3" } }, { @@ -122554,11 +123916,11 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20250703, - 508 + 20260702, + 1424 ], - "commit": "65581530155b097fc314a19b2851a7dffcfd3790", - "sha256": "0142sa6dxlj77f629xp8724fja1378hjqp2k5mw7zkmjfj2finj4" + "commit": "bd83db9f83dff1cc717f9a6b4a2feab05031458a", + "sha256": "1s5iz6fzbf91cabhvgdhpkbq1kr7s4cvw3gzm9l93vysbggnbgyy" }, "stable": { "version": [ @@ -122958,11 +124320,11 @@ "repo": "nashamri/spacemacs-theme", "unstable": { "version": [ - 20260414, - 2052 + 20260523, + 1256 ], - "commit": "789d20c55cd01f757929d0232dd1d5227c84ad7e", - "sha256": "0zxydjg954kaqsc5xi4yzr0b78nk4mxvbl5ch4yw6zv15h99n68i" + "commit": "cbd290dfde96f53a7b41730c7840850a8a7b8a02", + "sha256": "07a15mx6p1s3dpbqplv24p7blqvdcr8b92g9ds60za6p25yrfmgs" }, "stable": { "version": [ @@ -123110,11 +124472,11 @@ "repo": "ideasman42/emacs-spatial-navigate", "unstable": { "version": [ - 20260420, - 428 + 20260705, + 40 ], - "commit": "764cf2ea5ded501493bfd543c5a290b8cda847d5", - "sha256": "0dqa4lfw8kmnpnmf62s5p0z6y15k26c5y7vfqcv32apqzynqvkva" + "commit": "358337ddaef449ad0f1c6b9ab29f99db363ab319", + "sha256": "0p8arfa19jq1i7cqd6hz5cld9c976ig4zmz5zdwsvjz9hr2s0aj7" } }, { @@ -123155,11 +124517,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20260424, - 159 + 20260717, + 154 ], - "commit": "2cc92e11cc1b6007d8ffdd18c541e9ac126664ed", - "sha256": "01qk8zkm9kla42dabpjh04s2p8zmx7qfh27i7h5i5as0d4b3wgkh" + "commit": "e839ca0184713dd954aba57d59c618b7afdb678e", + "sha256": "04k4jmxx0znh605nzlqkfr9zv2xi0djhp123zgik09zcqdh68hc6" } }, { @@ -123220,14 +124582,14 @@ "repo": "dakra/speed-type", "unstable": { "version": [ - 20260330, - 1430 + 20260611, + 1554 ], "deps": [ "compat" ], - "commit": "f349c000c4d9541cc0e9dcf072555c7f4c9f9a46", - "sha256": "0y2vi01agwwjgklxsfaf1hh9q1mnn82s2rnkkmqnqrycpa0p1wzk" + "commit": "f004cce95e0f5c5048d38f973b654587ed73abf6", + "sha256": "1a1fmnlkgrya86hw9alccfjhldg5lx1bbffvlhk5hqkgsm1dx627" }, "stable": { "version": [ @@ -123294,11 +124656,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20260108, - 1336 + 20260524, + 636 ], - "commit": "94686051261a065574fc6535979f8ff08a37f0ee", - "sha256": "1gbyx1w0k1jwngp22qm7yl1wg82ciybnarcm3frqch7b472dpr7h" + "commit": "103c4aaf0d2ec452359e087bed50504e2bdf4661", + "sha256": "1hm396yhh62k95n8r0kw5jxnbfzx5i3d56sj51p7xb02ayccwv8l" } }, { @@ -123681,6 +125043,21 @@ "sha256": "0s7xx83w6w9nvja999fnl6gw132d01l3qvms87i5fcfrvd9czsbl" } }, + { + "ename": "sql-bigquery", + "commit": "c1d99b61ec22c5a86e5264c317cb39d845d45a67", + "sha256": "09gmia1vibh6k50wbh0w4hj8mrz4yzczgsyqjmd0rlqwlc6jsvp7", + "fetcher": "github", + "repo": "regadas/sql-bigquery", + "unstable": { + "version": [ + 20260502, + 1517 + ], + "commit": "1d068f7a7226d7af70d4ffceb86bc5e91826c29e", + "sha256": "0mjnv0llz818vq3j3rz7k4gya1jhmk0ppfdcf0v8i0lxp331awjs" + } + }, { "ename": "sql-clickhouse", "commit": "cdd1f8002636bf02c7a3d3d0a075758972eaf228", @@ -123948,11 +125325,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20260403, - 411 + 20260719, + 56 ], - "commit": "272df3cae401da0853dc50344500b522f96a9286", - "sha256": "1rbisgin3vs2yicyxs0acf6j59hzrr14vddv89vf223r40ipgwqp" + "commit": "4b8e56ce6545de9b33ddb841f535c5f1ec301e00", + "sha256": "0qmn8fr9d1bk0pgfsq4p9y0lw0f1209pwyi4pz37r8za7xfpyld8" }, "stable": { "version": [ @@ -123966,6 +125343,36 @@ "sha256": "1il0z6lb2jz495gdp6g7wc0n9a4z8z8ndhrrl71rnws53fah0lm3" } }, + { + "ename": "srs", + "commit": "201754208a9e4d7db2ad88f8672dddb865c53fa1", + "sha256": "1p1grz3wy9znqw2zblqxmspx3sxzc8mqn7ja63f8p8vs9rsr8n9k", + "fetcher": "github", + "repo": "Duncan-Britt/srs.el", + "unstable": { + "version": [ + 20260716, + 2238 + ], + "deps": [ + "transient" + ], + "commit": "72b3db068a3b7a5e0a3f02d5f24434bec984225f", + "sha256": "1s9pv9y2hlgnwj8yr0f2n7c99cdybg7a63c5rqm86dgfpq03lxp0" + }, + "stable": { + "version": [ + 1, + 0, + 1 + ], + "deps": [ + "transient" + ], + "commit": "57cf956a746c2f948b801514f62a55a97fb3ef22", + "sha256": "02jzidpc56pw54pf2781i4rsgbw7kcbhha2m1p3a1pkrbxjjpyxz" + } + }, { "ename": "srv", "commit": "6b0b7f22631e7749da484ced9192d8ae5e1be941", @@ -124062,11 +125469,11 @@ "repo": "peterhoeg/ssh-config-mode-el", "unstable": { "version": [ - 20260108, - 2149 + 20260706, + 1430 ], - "commit": "f21726d6f44a0e769a15f0a94620078a326774f7", - "sha256": "0y8m7j2bwg4v2xbwfbdhfsxah47yfydyh61wybl5akmiwgm6101p" + "commit": "a171e48c3cef777556961323d4dd6172a94be0f1", + "sha256": "0pvm1hh3946y59xd70p687rnyl3c0qd7dxsmjy1x8fbwkqby9sd8" } }, { @@ -124259,26 +125666,26 @@ "repo": "draxil/starling-el", "unstable": { "version": [ - 20251029, - 707 + 20260427, + 1351 ], "deps": [ "plz" ], - "commit": "298186dc003052051cbcac08b270afb2b1f4f2b9", - "sha256": "01s7bkn8hr5j4ynk4lclc4269p1dr0l3zl5hlpc047ln32b2gfjb" + "commit": "9a5f3003d40a9c6bd64b5cf396973c4922006e4d", + "sha256": "0ns4f6nj80bygyizisabj6d25dpd3y98a1ni9flm0gk2q03hwh43" }, "stable": { "version": [ 0, 1, - 4 + 5 ], "deps": [ "plz" ], - "commit": "e6fae24f889d886f3d02cafee0a6067d35576378", - "sha256": "1igmjvzjlbvv543laqajd5i08dzabd4dv3p9fvg7r3znk17fl2bq" + "commit": "9a5f3003d40a9c6bd64b5cf396973c4922006e4d", + "sha256": "0ns4f6nj80bygyizisabj6d25dpd3y98a1ni9flm0gk2q03hwh43" } }, { @@ -124448,20 +125855,20 @@ "repo": "stacked-git/stgit", "unstable": { "version": [ - 20251110, - 503 + 20260622, + 407 ], - "commit": "020140581698f62d846c995ee6e3bebe0c20ff14", - "sha256": "0r9canxbj30anga9mbhym87jdrxcd0xp4d7a3lfhrrbmig5z2pff" + "commit": "faa026a62a423762b9821d332aa0f13d59b339e0", + "sha256": "08hw37c1l4lrfkpch4vk1z6zcgvf89pkm7wsad51lhnkkaqrf7cr" }, "stable": { "version": [ 2, - 5, - 5 + 6, + 1 ], - "commit": "020140581698f62d846c995ee6e3bebe0c20ff14", - "sha256": "0r9canxbj30anga9mbhym87jdrxcd0xp4d7a3lfhrrbmig5z2pff" + "commit": "faa026a62a423762b9821d332aa0f13d59b339e0", + "sha256": "08hw37c1l4lrfkpch4vk1z6zcgvf89pkm7wsad51lhnkkaqrf7cr" } }, { @@ -124593,28 +126000,28 @@ "repo": "beacoder/stock-tracker", "unstable": { "version": [ - 20250206, - 814 + 20260713, + 303 ], "deps": [ "async", "dash" ], - "commit": "51963a654a1199ec23f0938c247b1411fee85c6f", - "sha256": "12aipdqhx2pfgas0c3m4i1z0p45vrrld4c6ahnx9qgp4nig9b2bh" + "commit": "d3482bf03e738d70396412e2437da534b9059176", + "sha256": "0872lhnya5lyv57pn530yi2gbrrbzsf4a8ihpkc905z0gzw0kh34" }, "stable": { "version": [ 0, - 1, - 6 + 2, + 0 ], "deps": [ "async", "dash" ], - "commit": "58018a1747273df23dec08ec5d318da1960428c1", - "sha256": "0jbj24pbc07gjb6zk29yzjrd80c4aaqfp2mffc4qqisws0f8gfvb" + "commit": "d3482bf03e738d70396412e2437da534b9059176", + "sha256": "0872lhnya5lyv57pn530yi2gbrrbzsf4a8ihpkc905z0gzw0kh34" } }, { @@ -124829,20 +126236,20 @@ "repo": "jamescherti/stripspace.el", "unstable": { "version": [ - 20260422, - 1404 + 20260715, + 1824 ], - "commit": "5dd864613dc2743d0970684de7c8c01a431f1ffa", - "sha256": "0l1rkgj5m0cka1y2qnxhisy8sx6qldw66k0bdrf1nib9dxfw3cyn" + "commit": "35e6e86195a1192822ed13090b60426d4a768d95", + "sha256": "0b8djf24rz2dvfv6i5z2588cvnawwv60fwy97483m5iafwardk0z" }, "stable": { "version": [ 1, 0, - 4 + 5 ], - "commit": "e77dadb7ad15e8eeff8c874118f8ce461b70dd44", - "sha256": "0vh45vhk873mqg2m9f6ym7n19r9d9wndd9zdr0g000qdbvmrmn9v" + "commit": "c8a53e2bce4347f5d6d8ae8d3050e3bbf3f96562", + "sha256": "1yfc0fwzpfi08p50ymmi3g8s947hdzdf42g0kic519rp4g9bd5cg" } }, { @@ -125238,8 +126645,8 @@ "repo": "kiyoka/Sumibi", "unstable": { "version": [ - 20260417, - 1157 + 20260719, + 559 ], "deps": [ "deferred", @@ -125247,13 +126654,13 @@ "popup", "unicode-escape" ], - "commit": "366cf1a2a9f408cc34c1412a4b06dfe01f46d97f", - "sha256": "0z6g97975y2vchr2bkks4v18pk9zlcpgrffm53f4jvqjgp7pdxas" + "commit": "9b191439bdaa0f6a36ad95429e725d096d564096", + "sha256": "0rg6la4fq6m3j2blvscg4kwc32s7va7a10ar825jnsdg5cxriqn3" }, "stable": { "version": [ 6, - 0, + 2, 0 ], "deps": [ @@ -125262,8 +126669,8 @@ "popup", "unicode-escape" ], - "commit": "e52bd87416458bd8bb920b33fac9afdee27140d5", - "sha256": "0zbpycvymqhjx8jrfq9rszl9yyvjjk35a2fkd45ghg7kfcqhlsk3" + "commit": "9b191439bdaa0f6a36ad95429e725d096d564096", + "sha256": "0rg6la4fq6m3j2blvscg4kwc32s7va7a10ar825jnsdg5cxriqn3" } }, { @@ -125360,21 +126767,6 @@ "sha256": "08mvmp87bx5blpc8l89dwxs7kcz9vql1mlzj7jr1hfh9ds1vd602" } }, - { - "ename": "supergenpass", - "commit": "091dcc3775ec2137cb61d66df4e72aca4900897a", - "sha256": "0ldy6j6l6rf72w0hl195rdnrabml2a5k91200s186k0r5aja4b95", - "fetcher": "github", - "repo": "ober/sgpass", - "unstable": { - "version": [ - 20130329, - 548 - ], - "commit": "549072ef7b5b82913cadd4758e8a0a9926f0a04a", - "sha256": "0m02snzka243adhwwgriml133n4312lhdia3wdqjcq8y2mlp3331" - } - }, { "ename": "surround", "commit": "1d196e36a3afd6d84206fb10dcdf71a1dd272835", @@ -125771,23 +127163,20 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20251122, - 857 + 20260510, + 616 ], - "commit": "cfae3b85ad09bd293df941261afbc21e41bbb5f8", - "sha256": "11jwdk5h3mmsmfzllqfrh11v2p96fpiswf2aahg8hr80zqk4p6nb" + "commit": "a4c54629ba946cf009631e25a11618e886e7b25d", + "sha256": "1isw98pz3kar0zffjqhfgs8l850n05ikxpnmnm7xa1r0634hlbz7" }, "stable": { "version": [ - 9, - 4, + 10, + 0, 0 ], - "deps": [ - "seq" - ], - "commit": "fc7df7bd906a2bb04aac6e0de47fc7acf33ceed3", - "sha256": "1z9ybkjwbdayk8yfclwp0irfy0mn15p6m1mfvv4vrn6ami2wvrsv" + "commit": "bf56866b98de2fd73029da2bca1035ca02f9e879", + "sha256": "01rn7g6xbalayx335jsvlb8kkab0p61g60fwn1h49pfi0kv2n9kx" } }, { @@ -126104,14 +127493,14 @@ "repo": "wolray/symbol-overlay", "unstable": { "version": [ - 20260423, - 1454 + 20260703, + 1437 ], "deps": [ "seq" ], - "commit": "253b957f5082603708b469d02ae8c31c58292823", - "sha256": "18w7qa959na5c9rvjarrnmb3l63pdfrfv865i3nb6lx7ap6iw2jc" + "commit": "85d100b0cca35b70cee1b260e09af8e1fb2fcc08", + "sha256": "1d26wzd3bla1sqwsly1ldlzxp24z3nrr6zf8rfzxip90b6wpk3yv" }, "stable": { "version": [ @@ -126241,6 +127630,24 @@ "sha256": "030bglxnvrkf1f9grbhd8n11j4c6sxpabpjdr1ryx522v01fvx8j" } }, + { + "ename": "synaxis", + "commit": "07e0e048519b8bcc834c5712d3a95d03683fc5fe", + "sha256": "1gqd69z3vs2y86y20qyqvik3sbhfwgras54n9wdi34raxpjcgjx7", + "fetcher": "git", + "url": "https://git.thanosapollo.org/synaxis", + "unstable": { + "version": [ + 20260713, + 1937 + ], + "deps": [ + "keymap-popup" + ], + "commit": "fd0272e9a9dde9e31d592348638f62bcb3baebfe", + "sha256": "163d6qb3y3vpy72616pymhsriln9rrzawv1rcdf5iaf814qv1sah" + } + }, { "ename": "sync-recentf", "commit": "9858ea35f2a3faacab56b6ccba5672956560456b", @@ -126489,6 +127896,21 @@ "sha256": "03id3zjiq15nyw0by4fari837c8362fscl7y329gn9ikf7z6hxd9" } }, + { + "ename": "sysml-mode", + "commit": "de274a2c8c5bfc0e22949c5c3e409ddf34f32cb0", + "sha256": "0vbkkdqcs2b5y5nmgqi99k6wjy6ax1r65qmz3a4wsm4916h4d1kx", + "fetcher": "github", + "repo": "DeciSym/sysml-mode", + "unstable": { + "version": [ + 20260528, + 1759 + ], + "commit": "e8ff9eea7f8f5d18e6a74a48411a1b8e39dd0916", + "sha256": "0j32ivr2lnwdpg1am4y84by844svns8cvixgjc7j4qgkrndvpmfy" + } + }, { "ename": "system-idle", "commit": "d3c041dafd99718beccfe4153b34b7ac8a6848ea", @@ -126611,11 +128033,11 @@ "repo": "ajrosen/tab-bar-buffers", "unstable": { "version": [ - 20240227, - 2037 + 20260511, + 1927 ], - "commit": "08a3f39c0b1673e3cad34e1f0e83fb56c903586c", - "sha256": "0rgxwyjkhlhzr4nbbjy08l4z26cic9dw4rhlkpkv9s51wxxnhaw8" + "commit": "12f52b896eedd7a871df4ef985430b53bcd6c08b", + "sha256": "0ygyn053gmlbqbmrg8900gk0xv35rydp1x0farw9vz7rzdh18ami" } }, { @@ -126780,8 +128202,8 @@ "repo": "mattfidler/tabbar-ruler.el", "unstable": { "version": [ - 20260417, - 2349 + 20260426, + 1441 ], "deps": [ "cl-lib", @@ -126789,8 +128211,8 @@ "powerline", "tabbar" ], - "commit": "2b72193e4fa9665236ec5dd17c47d0cf91ccc977", - "sha256": "04y6yrgqvap4gkn0c1py8qx1vp9gpnhs5xaf82qb1ak903hwwms4" + "commit": "306fc4f8e450704c68fca23791cfa50f2f9f99db", + "sha256": "1akycy81cl2lxgz7fqcmiv7lj0rvz06ym72ck2r1gpwz7iydhy1a" }, "stable": { "version": [ @@ -126851,20 +128273,20 @@ "repo": "isamert/tabgo.el", "unstable": { "version": [ - 20250103, - 1740 + 20260624, + 1540 ], - "commit": "23b6397fd61db31689feacb4b7df2b1f64e69572", - "sha256": "13d72g9h33a8gkrw76nz6dzpalj91pp17707mqwz6zn0miyyzx9d" + "commit": "7cf1142c3e194ded79632846830775b42830ce51", + "sha256": "1yzpmfggsq96nffqmxq6zzrfkdnxawrr5qngl51mixlw9pcks573" }, "stable": { "version": [ 1, 0, - 1 + 2 ], - "commit": "23b6397fd61db31689feacb4b7df2b1f64e69572", - "sha256": "13d72g9h33a8gkrw76nz6dzpalj91pp17707mqwz6zn0miyyzx9d" + "commit": "7cf1142c3e194ded79632846830775b42830ce51", + "sha256": "1yzpmfggsq96nffqmxq6zzrfkdnxawrr5qngl51mixlw9pcks573" } }, { @@ -126875,19 +128297,19 @@ "repo": "emacsorphanage/tablist", "unstable": { "version": [ - 20231019, - 1126 + 20260623, + 1855 ], - "commit": "fcd37147121fabdf003a70279cf86fbe08cfac6f", - "sha256": "1n1isr98xsc66n8ax0lcld2p80rr3b9s0pnh0jllhvmbkkb88xzi" + "commit": "01f065e387ffe6b7a41f180f257cd12551c7a9c2", + "sha256": "0nc6dw9p420kf3c6wbi0fl31sm9q9357dnx3wyphj0r6162f3fvb" }, "stable": { "version": [ 1, - 1 + 3 ], - "commit": "5f7b71a92bfb25418d7da86ad9c45f14b149496f", - "sha256": "11vmvrhmsxy97bfj7jndpc58bik7177i3wvc45mlyldxwyirs962" + "commit": "01f065e387ffe6b7a41f180f257cd12551c7a9c2", + "sha256": "0nc6dw9p420kf3c6wbi0fl31sm9q9357dnx3wyphj0r6162f3fvb" } }, { @@ -126930,20 +128352,20 @@ }, { "ename": "tabspaces", - "commit": "d0adcadc4cf81da6e1a7ec7c65ba510ff2f8f45c", - "sha256": "0aq9vqs5ixp78ppagzgw1jcjbvfafj6gz4a8jd438l7cd6ngsq6a", - "fetcher": "github", + "commit": "c333f3b3397a05eb38df3b631fbc1dc1ef87e622", + "sha256": "0lzbg0abxfa5cr7g76mq3ykxcq1an9wvrb2wjbx1brhk5ns69ix6", + "fetcher": "codeberg", "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20260222, - 1958 + 20260529, + 1452 ], "deps": [ "project" ], - "commit": "06fe5ad149bc5852698cd0adda6dd6e320b4cf8f", - "sha256": "180gzqjmmin35b7lj93pgrakh0b5wq10q232y5zfhibsmsnxayhi" + "commit": "d3a74c0d39a0029d956dc37ddbf540802fb76973", + "sha256": "1hgsg01l17l61g3ky6r7c6579bm9j1hm93chdajfnlzcpaz4b9p1" } }, { @@ -127058,11 +128480,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20250813, - 1242 + 20260615, + 1520 ], - "commit": "6c57ae3745ab66c75d4ebb336d3403d90537206a", - "sha256": "1apvwc5v27dq4mjv0rk5yqs0pgxmd6ar3jgxdb2488lws2z08xdq" + "commit": "e9be23b05e39591e0740c1a837a9f093a0e14419", + "sha256": "0knxfnzirf2630hv8bcvqmp3cy8r41inf3m630bq4wzlvxnhp4sb" } }, { @@ -127151,20 +128573,20 @@ "repo": "devrintalen/taskjuggler-mode.el", "unstable": { "version": [ - 20260423, - 1854 + 20260506, + 137 ], - "commit": "49d3cdf2dbf4c27e037bb4c96bb0cc6d2e000fab", - "sha256": "1v5hln35qwy97qnc7nrql3mr53j8q2zkadnf49mw9zdw5psl383b" + "commit": "e68d9e6d50c848b1a20b75af3ac1ddda95c9fe3e", + "sha256": "04lbsqvc4sjh30q872srafq4x551vmi1z5ffzcb7fzvg884afz0i" }, "stable": { "version": [ 0, - 5, - 2 + 6, + 0 ], - "commit": "9a43c9dcf36b52d302d41aeaf6ad62aa6776a966", - "sha256": "1qj57mk2qz9wwihj5jlgx4ngf4b33n581cpwvpmbidi6rj1dwb77" + "commit": "e68d9e6d50c848b1a20b75af3ac1ddda95c9fe3e", + "sha256": "04lbsqvc4sjh30q872srafq4x551vmi1z5ffzcb7fzvg884afz0i" } }, { @@ -127175,11 +128597,11 @@ "repo": "saf-dmitry/taskpaper-mode", "unstable": { "version": [ - 20260414, - 1851 + 20260715, + 1341 ], - "commit": "809c15fe893bb4ffa17bf515908a37c97e74afb9", - "sha256": "1gd3ip106zdwqhk39jsj2xhsn0c6wa65g6navkiy6z3gb95gs3ha" + "commit": "0f8747a8736a6e1bff6cc401144799bdef0e69ed", + "sha256": "0cwv9s3ss990c26ilp88hb762zv6g221xm0wjhgs4k6jbcn05bi4" }, "stable": { "version": [ @@ -127217,26 +128639,26 @@ "repo": "phillord/tawny-owl", "unstable": { "version": [ - 20241104, - 1432 + 20260508, + 848 ], "deps": [ "cider" ], - "commit": "0baa9c3e9aea40bcf9c11c9a009f0e26efbc366f", - "sha256": "1rn0lmn0pcsyvh55kfv1afhwmgxyks8knlmncj95a53ydra0qriv" + "commit": "5366ed3d12e7272e7a404040d7199b0a560f25a8", + "sha256": "1kil0q6bc94551xs2x7z0wwk1yclqfdnf61hv1afrslm8p36z8q0" }, "stable": { "version": [ - 2, 3, - 3 + 0, + 0 ], "deps": [ "cider" ], - "commit": "b2708d693400a2010370df040d7571bc30fa4d75", - "sha256": "02p8gw7pzawzq2zzkgfx8wpp4l4zlz9zyw0f298yqrwp2zsrw5fx" + "commit": "5366ed3d12e7272e7a404040d7199b0a560f25a8", + "sha256": "1kil0q6bc94551xs2x7z0wwk1yclqfdnf61hv1afrslm8p36z8q0" } }, { @@ -127381,15 +128803,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20260416, - 546 + 20260711, + 827 ], "deps": [ "transient", "visual-fill-column" ], - "commit": "5196e752b1dae4367d446a3fcc6169e6a7533093", - "sha256": "1l6lsbzha40nvbwiaqiva96vp5iyjjqls761ggzfl3bkrslk53vq" + "commit": "fc6a4d1ec6edba6b3c65b3f069cce0398c2fb7a5", + "sha256": "1lcv7nq08llr8s0yhjbaj33lk169nyn60ldrmvjkbdra8qzy9chp" }, "stable": { "version": [ @@ -127520,25 +128942,25 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20260309, - 1547 + 20260705, + 1258 ], "deps": [ "compat" ], - "commit": "add72000e580aaf80e64195412747181fc95d231", - "sha256": "0183qyb9cvjkav0v7q3s64gza5yxjd806j9yn0scbxhr1d1pz0lw" + "commit": "c5fdc3806b486d9d86a54c50efac3d4a141e789d", + "sha256": "1vy53i1rpzhx644qhwm2vbb3z4z00wrc2127zfd3i08h8dlck3r0" }, "stable": { "version": [ 1, - 12 + 14 ], "deps": [ "compat" ], - "commit": "add72000e580aaf80e64195412747181fc95d231", - "sha256": "0183qyb9cvjkav0v7q3s64gza5yxjd806j9yn0scbxhr1d1pz0lw" + "commit": "c5fdc3806b486d9d86a54c50efac3d4a141e789d", + "sha256": "1vy53i1rpzhx644qhwm2vbb3z4z00wrc2127zfd3i08h8dlck3r0" } }, { @@ -127549,14 +128971,14 @@ "repo": "Crandel/tempel-collection", "unstable": { "version": [ - 20260227, - 1133 + 20260516, + 1317 ], "deps": [ "tempel" ], - "commit": "6292604c1d5ed0044ce0beb2d46c73697dc66ed3", - "sha256": "1nbffii5n07928kahc4cgkfb7f434rld9vm9l9n6h0xxb1vldzwj" + "commit": "4ea6f92ecb69dc38c666bfa6c4a253ff94699c80", + "sha256": "1gvw02sfnvsfi32fqw13hxb9kwkpag195kils9rlxyq3r23pp07c" } }, { @@ -127710,10 +129132,10 @@ }, { "ename": "tengo-mode", - "commit": "9ae2528b4322ed892d54e61a2c7c086a028aeab1", - "sha256": "1c1c4lmilr7d1688df0ykn1j2gjg5n2sa942pr957fr2q0vay75n", + "commit": "7a51fd6e6eb4485d7add6216b690c19897bbfa6a", + "sha256": "1bll91n7x0dgxs78r49rx8k5fpsrqi9b2dy2da2w7llmk62klsmn", "fetcher": "github", - "repo": "CsBigDataHub/tengo-mode", + "repo": "ChetanKoneru/tengo-mode", "unstable": { "version": [ 20260125, @@ -127820,27 +129242,27 @@ "repo": "calliecameron/term-cmd", "unstable": { "version": [ - 20260117, - 1350 + 20260510, + 1834 ], "deps": [ "dash", "f" ], - "commit": "0596a96b0e5a4e8a5f828951fb6e2c1af03914c8", - "sha256": "1fiwz43zvjx8wlzjs68lhgwjd6bywsk8pnnhc120rs7v88d6qygg" + "commit": "15f737427b21adc722a76a71c0aaeb2dcb95efbc", + "sha256": "1n1hj0xkr8ws78flcfmwn3qgvz0yvwg4705nwafysq3w29ddnlr4" }, "stable": { "version": [ 1, - 3 + 4 ], "deps": [ "dash", "f" ], - "commit": "0596a96b0e5a4e8a5f828951fb6e2c1af03914c8", - "sha256": "1fiwz43zvjx8wlzjs68lhgwjd6bywsk8pnnhc120rs7v88d6qygg" + "commit": "15f737427b21adc722a76a71c0aaeb2dcb95efbc", + "sha256": "1n1hj0xkr8ws78flcfmwn3qgvz0yvwg4705nwafysq3w29ddnlr4" } }, { @@ -128031,20 +129453,20 @@ "repo": "milanglacier/termint.el", "unstable": { "version": [ - 20260412, - 348 + 20260517, + 2050 ], - "commit": "689549245bb6dc0429d8af06c4830c92b09f4667", - "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw" + "commit": "f51ab6c4ef50eb8781560d3596335a6f7f668c7c", + "sha256": "0wdyv7spafhj5d2y6xwdnm0dd5xv4bnaa9pc2wr6pz1q4x1r8qws" }, "stable": { "version": [ 0, 2, - 2 + 3 ], - "commit": "689549245bb6dc0429d8af06c4830c92b09f4667", - "sha256": "1ggxqb9b7kv32rns9gagggmq0fsj9a8i3jkhqhfwz0c75fv05jlw" + "commit": "f51ab6c4ef50eb8781560d3596335a6f7f668c7c", + "sha256": "0wdyv7spafhj5d2y6xwdnm0dd5xv4bnaa9pc2wr6pz1q4x1r8qws" } }, { @@ -128055,15 +129477,15 @@ "repo": "ternjs/tern", "unstable": { "version": [ - 20191227, - 950 + 20260514, + 1348 ], "deps": [ "cl-lib", "json" ], - "commit": "0d19800db70a6348c627a69f444b91d21ad89629", - "sha256": "0ydrxxc3lgs8mpg577iw5sfxgyqfbdkrghwxmv8sxf6sawvhx8zv" + "commit": "fab80daebd798b233a9a40d5a8b99359ace63b5e", + "sha256": "10fh2hkiha7y0qviw7anfiw4qfv4aajqj342sp9l4q776v8gzdx8" }, "stable": { "version": [ @@ -128614,11 +130036,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20251103, - 1021 + 20260615, + 1213 ], - "commit": "ff0d3ba077d7d48c46a00b724de8eb4ce163fab9", - "sha256": "0bnflam6hsayh2kcjd0bydsyj64d33gcjj7w7gj3y8x0h68n89hj" + "commit": "fe0b8776191744359767ecc4113dda1ade4a5adb", + "sha256": "0yyd4z2acz48h3d6j6d7kbb4kacqhy5b47vrbsw4xnvmzyjfsiik" } }, { @@ -128847,21 +130269,21 @@ "repo": "facebook/fbthrift", "unstable": { "version": [ - 20260420, - 1434 + 20260713, + 813 ], - "commit": "075dc1f32336878453b628373e8e0b29775a60d3", - "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f" + "commit": "fe08f6c48479e1f851390b0c88e6c5644a4e9ff6", + "sha256": "13fbxpzlysvj95y72a57hlkprkq3cmzg5if26fhzncc12359hfyq" }, "stable": { "version": [ 2026, - 4, - 20, + 7, + 13, 0 ], - "commit": "075dc1f32336878453b628373e8e0b29775a60d3", - "sha256": "08l5hjwyfb4fm8zyp5im66r2mzbd72kz7z3ircsxzzf1zwaznn6f" + "commit": "fe08f6c48479e1f851390b0c88e6c5644a4e9ff6", + "sha256": "13fbxpzlysvj95y72a57hlkprkq3cmzg5if26fhzncc12359hfyq" } }, { @@ -128943,26 +130365,26 @@ "repo": "uzu/tidal", "unstable": { "version": [ - 20260109, - 1704 + 20260702, + 630 ], "deps": [ "haskell-mode" ], - "commit": "4e444a2d5118d67a0ef7a588a2b783b39d9b1357", - "sha256": "0yfv1pl8i256j7zy28af7x9yjgxk4bxmkbnh4j6s6bw3mfc2hx4w" + "commit": "5ae655255d87c983a596f398a0385b21df97df3b", + "sha256": "0c51zyqbyly8h7zwxnxc9sbfx3md170y0ckpvrsmycq0kwgs0mm0" }, "stable": { "version": [ 1, 10, - 1 + 3 ], "deps": [ "haskell-mode" ], - "commit": "660ac746ec5c89da7ead100c0c46bf67e4037f41", - "sha256": "05xf1ifd24afqmxfs9kkhkc1m9sc2cs9q9xkyym6r3bywgi5zs4j" + "commit": "5ae655255d87c983a596f398a0385b21df97df3b", + "sha256": "0c51zyqbyly8h7zwxnxc9sbfx3md170y0ckpvrsmycq0kwgs0mm0" } }, { @@ -129074,11 +130496,19 @@ "repo": "ctanas/tiles", "unstable": { "version": [ - 20260412, - 1929 + 20260603, + 1458 ], - "commit": "149a5015b3d2a2ebdd15660cab9c736549af7532", - "sha256": "19fmzw46vyfz6kz4ksmm5w4c6vmkyjacsqznbf0d8d9qsmy1nyf8" + "commit": "754b11764f8204ff1fce6d3aa80eca2150a8a164", + "sha256": "0mmw3slsndfq2jrlmfl6aly018jz4ycyhg7rizc0igl0jpcg8acg" + }, + "stable": { + "version": [ + 0, + 5 + ], + "commit": "15fa6fa0f2b44b0db0110862b609a42aabb8bb40", + "sha256": "1xjzbwddwlaf0dwf3ql4ljwr8sg3anrpgnlsz6zfi2bnhggl4v8z" } }, { @@ -129149,11 +130579,11 @@ "repo": "xenodium/time-zones", "unstable": { "version": [ - 20260211, - 2330 + 20260716, + 845 ], - "commit": "9f1326ad9e62daa242a5174b193a27b28e209b36", - "sha256": "0wcbbxa6wsb08d76g4fyf4yblpx8rx8q96l2rhchk2jmrxl10rvz" + "commit": "4cc37a54ba6447dc0570cd2e42052689d94f09ee", + "sha256": "0xajsx2363sj6shqv8nwbvcr4z2sq6pa4j7rbncn79qlq8wr26l4" }, "stable": { "version": [ @@ -129191,19 +130621,20 @@ "repo": "karthink/timeout", "unstable": { "version": [ - 20251210, - 758 + 20260504, + 2312 ], - "commit": "a5e661de4d3c1d5ac25c449011fe99059fc55920", - "sha256": "1lp57mfsvngx20sxvq0v0hmxqy705glya93yffk5q4r5vn946dx8" + "commit": "b1212984709c4b50c509ef6d3bd959951e5dcc91", + "sha256": "1h5z7gxl2q6dlcy9zj9f9iqlahqk30lqkw5ym3i89mm6m80h9731" }, "stable": { "version": [ 2, - 1 + 1, + 7 ], - "commit": "6d31046c5b1817271a52ab810e5bc635fe7ab3b4", - "sha256": "16hzgdm5pq5qwg7w64w1q8kkwv1r9967bpcashcnm7pcwgk7bavk" + "commit": "b1212984709c4b50c509ef6d3bd959951e5dcc91", + "sha256": "1h5z7gxl2q6dlcy9zj9f9iqlahqk30lqkw5ym3i89mm6m80h9731" } }, { @@ -129572,11 +131003,11 @@ "repo": "acdw/titlecase.el", "unstable": { "version": [ - 20230714, - 323 + 20260622, + 446 ], - "commit": "eb8d23925fb8ccbd3b2e3804fb0a312ee227610b", - "sha256": "1j696incblnqhz7yi8xmshiz2p5kp910288j513sj8rknlykpr4n" + "commit": "eb75d7539243832761e8e75782252fd7a489fb37", + "sha256": "04sdmawnpby5fhvch7fn83an24033zin3yxp1b0swjrdl8wbasjj" }, "stable": { "version": [ @@ -129665,11 +131096,35 @@ "repo": "vifon/tmsu.el", "unstable": { "version": [ - 20241230, - 2209 + 20260610, + 1429 ], - "commit": "c75ae9bed8f3bb2229e873fcc85fe62701e47974", - "sha256": "0mxz9bmdcdxkj7f4ih405i4vpd35c72xgs1i8cbi0132dpnnblpz" + "commit": "625d01d87f2820f648816f78b0c5bc220f14488b", + "sha256": "1h043myzvk40c3lbykikvhy6zcx5ac8r3jhkrzzhak1ngb5lpa9g" + } + }, + { + "ename": "tmux-csi-u", + "commit": "3e16dc8d7a262b450719b41ea64649a60146c8f1", + "sha256": "0gprwbcxi1rw1g3k3j6nqfrfbdqsg6yqhfppyvikr40xp9igzm4f", + "fetcher": "github", + "repo": "lajarre/tmux-csi-u.el", + "unstable": { + "version": [ + 20260428, + 2220 + ], + "commit": "38e95db84ad02ad440e4fc0b18896e1c621e5f5d", + "sha256": "1k8ys2x0hl8zhxba5fb9k1dbd2xmxmknai90z0j07f70zq8pkm34" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "commit": "38e95db84ad02ad440e4fc0b18896e1c621e5f5d", + "sha256": "1k8ys2x0hl8zhxba5fb9k1dbd2xmxmknai90z0j07f70zq8pkm34" } }, { @@ -129729,11 +131184,11 @@ "repo": "snosov1/toc-org", "unstable": { "version": [ - 20220110, - 1452 + 20260514, + 1415 ], - "commit": "bf2e4b358efbd860ecafe6e74776de0885d9d100", - "sha256": "1mck86704akw8jlczimb4wi9z7x5mxag9s7z2vxfgg8xfmbmj8jr" + "commit": "781376e9dc9a901116c0c39914aeb4d46e524e0a", + "sha256": "19vzfwcxvknbx0zdad6p8bfkj28mx2c5rm4zxq4yyqg56cpx224i" }, "stable": { "version": [ @@ -129926,11 +131381,11 @@ "repo": "bbatsov/tokyo-night-emacs", "unstable": { "version": [ - 20260421, - 1234 + 20260528, + 551 ], - "commit": "8d30673c060ab791818e9ac3fd96ebeba93b926d", - "sha256": "1zgjhb9ngdll284h5gf0mdjikfgifrb1z55ydmd8vcm17b83sd48" + "commit": "92037072b6e9a48d5d736bf8a76731936ea94410", + "sha256": "13ya7p5ppd7p15q91g7a8yky85lzadii0ggchklxh8ipigsamrdh" }, "stable": { "version": [ @@ -130047,11 +131502,11 @@ "repo": "jamescherti/tomorrow-night-deepblue-theme.el", "unstable": { "version": [ - 20260314, - 1909 + 20260710, + 1611 ], - "commit": "377fb120128c10929abc12f5d606a146b85372e0", - "sha256": "023q97lydjcqjaqw9flrmivvah8b24ahhm0c9q89h8zv99qzrfbd" + "commit": "38e601d69e5741463e6d725100234d0c6e3e5741", + "sha256": "04xx9dyj2ps3lb7x72i0g41ld4p59cghzb35wvgp6cp5g199ksnm" }, "stable": { "version": [ @@ -130313,30 +131768,6 @@ "sha256": "1jbpf28918pjiqhw8rackv9r8iq9ydd3jw1zwwifznglmpyca7jk" } }, - { - "ename": "tox", - "commit": "08a7433e16f2a9a2c04168600a9c99bc21c68ddf", - "sha256": "1z81x8fs5q6r19hpqphsilk8wdwwnfr8w78x5x298x74s9mcsywl", - "fetcher": "github", - "repo": "chmouel/tox.el", - "unstable": { - "version": [ - 20250216, - 1042 - ], - "commit": "831521fdfdd0b903c50616c6d675e63279c8b4aa", - "sha256": "0kyg6bczgzjp79fiaqa2imq9xlmy40x3sbql3v1bdk6543r6dv2m" - }, - "stable": { - "version": [ - 0, - 4, - 0 - ], - "commit": "7655eb254038d5e34433e8a9d66b3ffc9c72e40c", - "sha256": "1212b7s00kw9hk5gc2jx88hqd825rvkz1ss7phnxkrz833l062ki" - } - }, { "ename": "toxi-theme", "commit": "2e57d7abe1e43101558b27b0995f54f74a620b33", @@ -130369,25 +131800,25 @@ "repo": "martianh/tp.el", "unstable": { "version": [ - 20260219, - 1435 + 20260509, + 802 ], "deps": [ "transient" ], - "commit": "cef3fc2daefbbfc29ad02b7e1f39542b57c72fe8", - "sha256": "1zhvridy6p7dy9hpf088k166a1c918hqf6k3jmnm7raw8vflc7qq" + "commit": "a83cd422cca09bc863a7179f1c5b5a35435e0d32", + "sha256": "01g72x2lqmrdh3qgd3135hgijka975xg92ki36qyv71vi20rhmnm" }, "stable": { "version": [ 0, - 8 + 9 ], "deps": [ "transient" ], - "commit": "cef3fc2daefbbfc29ad02b7e1f39542b57c72fe8", - "sha256": "1zhvridy6p7dy9hpf088k166a1c918hqf6k3jmnm7raw8vflc7qq" + "commit": "a83cd422cca09bc863a7179f1c5b5a35435e0d32", + "sha256": "01g72x2lqmrdh3qgd3135hgijka975xg92ki36qyv71vi20rhmnm" } }, { @@ -130526,20 +131957,20 @@ "repo": "saulotoledo/trailing-newline-indicator", "unstable": { "version": [ - 20260112, - 1713 + 20260516, + 2154 ], - "commit": "f53d9e139f734d9ea35a907a6c44b70795d81737", - "sha256": "0zld6218jzmjq5afz4525mjc4whi9lix571wn35jpgvf8y1y8lgd" + "commit": "52af1d7d63499020b21d57147cd7d27bc1bb35d3", + "sha256": "16ggckn7g07jqnmldmdq9qwa5ldcdivi8im66dics5s0cf3g6xb2" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "f53d9e139f734d9ea35a907a6c44b70795d81737", - "sha256": "0zld6218jzmjq5afz4525mjc4whi9lix571wn35jpgvf8y1y8lgd" + "commit": "52af1d7d63499020b21d57147cd7d27bc1bb35d3", + "sha256": "16ggckn7g07jqnmldmdq9qwa5ldcdivi8im66dics5s0cf3g6xb2" } }, { @@ -130653,36 +132084,38 @@ }, { "ename": "transient", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "0pjj4zj3sa6mhf7fwb5b33y9b506g3bcjyzy44h5n6s79shbak60", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "11a2m4vdccn2yfn5aj2g5smiml69vidir9ss8c70pld17z1wzx07", "fetcher": "github", "repo": "magit/transient", "unstable": { "version": [ - 20260422, - 1646 + 20260701, + 1255 ], "deps": [ "compat", "cond-let", + "llama", "seq" ], - "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1", - "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c" + "commit": "3d20a780605f0a33d6360dc0a2ce9174c69a9a92", + "sha256": "0893jfiqqyxc54hbzspkp5mhfzj7s1nkdfdmrp590g559blcjhmg" }, "stable": { "version": [ 0, 13, - 0 + 5 ], "deps": [ "compat", "cond-let", + "llama", "seq" ], - "commit": "cd97319a851db9b2ed3faecdb735c6d089edf4e1", - "sha256": "18pay3a7qbxw3ci2y11d3pvzbdkp8q1n4xyr4zhz1vg2n36vj56c" + "commit": "3d20a780605f0a33d6360dc0a2ce9174c69a9a92", + "sha256": "0893jfiqqyxc54hbzspkp5mhfzj7s1nkdfdmrp590g559blcjhmg" } }, { @@ -130693,14 +132126,14 @@ "repo": "conao3/transient-dwim.el", "unstable": { "version": [ - 20251006, - 339 + 20260516, + 853 ], "deps": [ "transient" ], - "commit": "65985faf00f5a0e5e725c4f3f9f4118d19b8ee5a", - "sha256": "16ygz5csgcx5ri3qpid3v3kk1wfshf9napli5ymn6g76spp07sam" + "commit": "f1973c1f75a9c4fd122ebba878aac7f1d0d54111", + "sha256": "0rzj1awr1d9lw2dkhnb9z7rwjsrhhr7icxqg9xir474n8x5yp7qr" } }, { @@ -130958,28 +132391,28 @@ "repo": "tarsius/tray", "unstable": { "version": [ - 20260101, - 1847 + 20260701, + 1300 ], "deps": [ "compat", "transient" ], - "commit": "b77e046b173008a95f9ba37f4d34c088f5f0a8ab", - "sha256": "0y6mrqnc652jfcxhwh5xxphd5cfk3rbngv88i791f531lyninrih" + "commit": "0e6f331dd7fcef6a591c4954808a6b262522fa40", + "sha256": "1cz9f22ln823zpnh0fba3nmcs3qj3wxl1sb9kdi3phmbhxyhjq38" }, "stable": { "version": [ 0, - 1, - 8 + 2, + 0 ], "deps": [ "compat", "transient" ], - "commit": "b77e046b173008a95f9ba37f4d34c088f5f0a8ab", - "sha256": "0y6mrqnc652jfcxhwh5xxphd5cfk3rbngv88i791f531lyninrih" + "commit": "0e6f331dd7fcef6a591c4954808a6b262522fa40", + "sha256": "1cz9f22ln823zpnh0fba3nmcs3qj3wxl1sb9kdi3phmbhxyhjq38" } }, { @@ -131137,26 +132570,26 @@ "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20260420, - 54 + 20260719, + 1913 ], "deps": [ "tree-sitter" ], - "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5", - "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9" + "commit": "7a2b658586ad2108ff90fc978af1c4a33a44e07a", + "sha256": "1sik64yq1gv8rv4qhdlai40p1qck35yhb2vjvrbj8a87i2r5q97a" }, "stable": { "version": [ 0, 13, - 45 + 73 ], "deps": [ "tree-sitter" ], - "commit": "0c9390a5ec483a63c9cecd57be71520b20a858c5", - "sha256": "08jsvkjnqywgar2yv2a8vz85hwfiasa849dwixhrvavfqd2ss1d9" + "commit": "7a2b658586ad2108ff90fc978af1c4a33a44e07a", + "sha256": "1sik64yq1gv8rv4qhdlai40p1qck35yhb2vjvrbj8a87i2r5q97a" } }, { @@ -131167,14 +132600,11 @@ "repo": "purplg/treebundel", "unstable": { "version": [ - 20260404, - 2133 + 20260613, + 317 ], - "deps": [ - "compat" - ], - "commit": "35e55a21914772e2f125fd1c4682f7e239f192d3", - "sha256": "1ipypcrc2xgyrvwv6hk3hvwrkamsf4rrpnm13xczz19bqp1svjqp" + "commit": "9b64c358338e90c02e9aedb4689a3c1a8be29abf", + "sha256": "0987rpd4zpc7wprva533gnl1l97pj10bkjkawlg7dqxhcipj2xig" }, "stable": { "version": [ @@ -131560,11 +132990,11 @@ "repo": "volrath/treepy.el", "unstable": { "version": [ - 20260313, - 916 + 20260531, + 1144 ], - "commit": "28f0e2c2c75ea186e8beb570a4a70087926ff80b", - "sha256": "0z91vd12gikgb6207sz45fhcmhkl5hqbxjbzcaqpkznfgsq95f7j" + "commit": "806c000bd40153d17dfa5709c6d19546d507a416", + "sha256": "06i7r0v23j6d5q5w7p4cb7jidpnpy02a92fpjfqjlcd52cch02mc" }, "stable": { "version": [ @@ -131714,20 +133144,20 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20230506, - 1037 + 20260610, + 1908 ], - "commit": "44996469041a9b7f54c2a42ad2a3c16ac9579d77", - "sha256": "09ak0pysizblq39ndzry6af2g6byzpwrdvfwb2d5kyc5z76cw36d" + "commit": "fab4946d6266f73d5ec25660f67bd186dc44d426", + "sha256": "07fpm6v9qk5z7l81c5ssm6612dprh330h4zsfql0s5hyyj273l0r" }, "stable": { "version": [ 2, - 6, + 7, 0 ], - "commit": "74e0cf066392c6fa99327e42b24caf4ed2fc414f", - "sha256": "1vc50y7a248f0b4bk6mawb6f7n5dd6skrln8asall2m834bzzg37" + "commit": "fab4946d6266f73d5ec25660f67bd186dc44d426", + "sha256": "07fpm6v9qk5z7l81c5ssm6612dprh330h4zsfql0s5hyyj273l0r" } }, { @@ -131810,17 +133240,17 @@ }, { "ename": "trust-manager", - "commit": "420c42f0bf4fb2be86fd3103b0f35bfcb48184b4", - "sha256": "1nsm0xb6ls8vkc987ajs4qrbaclim5fc9m1i77mfwbz0znmwn32r", - "fetcher": "github", - "repo": "eshelyaron/trust-manager", + "commit": "bf967692af1501b21f0c07f026f1d8855cd7c6cb", + "sha256": "0r76fyd4f26ad3n9rgdwa143n0k5vv3hbfkgnnpnzfh535fxppf9", + "fetcher": "sourcehut", + "repo": "eshel/trust-manager", "unstable": { "version": [ - 20260422, - 952 + 20260426, + 1205 ], - "commit": "3a702921eaa65ce8de552e88f6280786a645252d", - "sha256": "1c6v36fa8j9q0j8s5i1kdw4gkqmv6qldsswdccvyfcmbyl2wr3dw" + "commit": "530c559ffa01b99ced8073ba4c74f1b8152a0ef2", + "sha256": "0h6v3dcczh8644n09ny9mwx3zb5vy4ydify24zf09f6wlkkhzr5b" }, "stable": { "version": [ @@ -132073,6 +133503,21 @@ "sha256": "1yy0sdp7vv94cij0i220scy5aafi7b9qmv59r2k739sr82c3pd75" } }, + { + "ename": "ttx-mode", + "commit": "11181b36316b3e0658afb13bcb63a590173387d1", + "sha256": "06v42hidmncd6d6gli8fv11nrwz6n2prblac4dv9djkh5ja6zi79", + "fetcher": "github", + "repo": "wmedrano/ttx-mode", + "unstable": { + "version": [ + 20260628, + 418 + ], + "commit": "58f4d4b2de51cfc47f3320c88fdb679ac8df6758", + "sha256": "05l1ishm3cja05dx0g6w10ilya7161cxp0fd6ng9zkxasv82jdwg" + } + }, { "ename": "tuareg", "commit": "01fb6435a1dfeebdf4e7fa3f4f5928bc75526809", @@ -132081,26 +133526,20 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20250909, - 1604 + 20260626, + 936 ], - "deps": [ - "caml" - ], - "commit": "de9572f537b71c5e67b6ad676e1f7e42e8180878", - "sha256": "0c9cpwbqn1mpyz8gw09n7kffs3rm3v58q0wrzkihbig47cvzj998" + "commit": "2d67d53a66fbf9d83c0416dba3275080b1bc6dfd", + "sha256": "10k810kw3mijqprnky15id39hzzwcqwlxmlyjp5m817mslmkwnii" }, "stable": { "version": [ 3, - 0, - 1 + 1, + 0 ], - "deps": [ - "caml" - ], - "commit": "4d94293cc5a7bba6cd043e29968719ce597d65f5", - "sha256": "1p3xpk78i8ywgdmc59w05wjjy9dg6gm5gicm08szmrlnx08v2ihm" + "commit": "29ed86896e24c9d9d9855cf05ab7a6166a030250", + "sha256": "0gmgxqy0x3318gpwb8bjr5f53mv9xy3psrcz1h9c4xqrc189lm68" } }, { @@ -132194,17 +133633,17 @@ }, { "ename": "turing-machine", - "commit": "6440f81aed1fcddcaf7afeedb74520e605211986", - "sha256": "0q9a31m5wnz9j9l4i8czdl7z12nrcdjw72w8sqvf94ri2g5dbpkq", - "fetcher": "github", + "commit": "1d888e12b1c4002896723b3c993a72bf920ef37b", + "sha256": "14xvh9p0jgkh8g3akrgbzcxyh0aa5jc66jc74731b3b10wmlpcrk", + "fetcher": "sourcehut", "repo": "dieggsy/turing-machine", "unstable": { "version": [ - 20180222, - 438 + 20260530, + 523 ], - "commit": "ad1dccc9c445f9e4465e1c67cbbfea9583153047", - "sha256": "0qaz4r5ahg2fxsfyxilb8c9956i5ra9vg80l82slm8vrnsinzll6" + "commit": "165f868d5b47b93ca00bc73b0055cdcd7696449d", + "sha256": "0klq2d8q9vlqa80k9kxali6r5lv6lk8i5ry3ky4yii9jq7b0nwp3" }, "stable": { "version": [ @@ -132224,11 +133663,11 @@ "repo": "emres/turkish-mode", "unstable": { "version": [ - 20170910, - 1511 + 20260614, + 919 ], - "commit": "9831a316c176bb21a1b91226323ea4133163e00c", - "sha256": "0nrxi845gd24d5vymbmxz696jwld4rn6nw2dz1gzmdaks7bbv87m" + "commit": "70196d4502759060bb2b0ac2f09f18ce1cbbcb20", + "sha256": "13axgawzw4838kwvabzn5g1c1bf8mnnn38yqmhl6mg306zlsqzxb" } }, { @@ -132581,15 +134020,15 @@ "repo": "havarddj/typst-preview.el", "unstable": { "version": [ - 20260215, - 2252 + 20260617, + 2023 ], "deps": [ "compat", "websocket" ], - "commit": "7e89cf105e4fef5e79977a4a790d5b3b18d305f6", - "sha256": "0lsbr9i8kmzjbl9k86g8jnsbgz2vrlys7cii4fjrkg0dg9ijvk2w" + "commit": "f2903a1b98e13be7c927de835ae0d9159dd9fb9a", + "sha256": "0zd1hjqnjz9fhw7gbnawnx9cp0gbkd1730inl23q5rz0w80lksnl" }, "stable": { "version": [ @@ -132779,14 +134218,14 @@ "repo": "crmsnbleyd/uiua-mode", "unstable": { "version": [ - 20240930, - 1206 + 20260618, + 822 ], "deps": [ "reformatter" ], - "commit": "5627ac4450d5a5d2c657befc63c7594939c5ff4c", - "sha256": "1gnrjlp0p55n02vx0p1krjil2pxv4b7hg0krazs9b3nr2ar4cfqg" + "commit": "4194e877aef707f8475c3632390179b03571d091", + "sha256": "1ynhqz8g64zqry90g9s3c7wqzjy95vd348q1m0ff0cq3qjjqyws2" }, "stable": { "version": [ @@ -132872,20 +134311,20 @@ "repo": "jamescherti/ultisnips-mode.el", "unstable": { "version": [ - 20260324, - 101 + 20260628, + 1957 ], - "commit": "1ccd9d4bfd12545de299974083da9d2fbeec194b", - "sha256": "074pwsps3ib7wnc8nqicqqpdg76688bwm4agfdjii6fh34w0w7wz" + "commit": "3fc59835f6407fb60bb9935a63fc0479f8807f37", + "sha256": "13rn768inw0mnxp75plc981dm46vi9p8c0bckb8q8p2f0iy6rdsc" }, "stable": { "version": [ 1, 0, - 3 + 4 ], - "commit": "1ccd9d4bfd12545de299974083da9d2fbeec194b", - "sha256": "074pwsps3ib7wnc8nqicqqpdg76688bwm4agfdjii6fh34w0w7wz" + "commit": "39df8b78d4a9450cec5acbd74eb82b7372e28b73", + "sha256": "0rynfikr47afa5nd0npk1b6q69fym7l0mqb7abivkipg2zz3ysn7" } }, { @@ -132896,19 +134335,20 @@ "repo": "jdtsmith/ultra-scroll", "unstable": { "version": [ - 20260325, - 2311 + 20260616, + 2126 ], - "commit": "0a03e5f9f70f63a660623198179963c7c06a07c1", - "sha256": "0a3m1aapcrbf2b78712xh0lx4bblq3jx3n0bnhm9m9qs8889w7ir" + "commit": "5be267d2d92c230b4347e0769f584c71aec53589", + "sha256": "0lzycvg61lq0azc280bq4m0d1xrffrac966ax9qbnn5rxm78ikrp" }, "stable": { "version": [ 0, - 6 + 6, + 2 ], - "commit": "0a03e5f9f70f63a660623198179963c7c06a07c1", - "sha256": "0a3m1aapcrbf2b78712xh0lx4bblq3jx3n0bnhm9m9qs8889w7ir" + "commit": "f38653053b5c9bbe8dbcb6b2236ab8997fc2f9bb", + "sha256": "0ajynkiqiq7pvd7wqgf8wig8q288nsxixgl851bw0bjhivv32fmx" } }, { @@ -133298,17 +134738,17 @@ }, { "ename": "unicode-math-input", - "commit": "e0d39bc129500e55b99c11b3d27e042619777414", - "sha256": "1hra3vf6nzh99piagbxsmp0sizvki2jl7qkfmlwd5nwmicw0ykrq", - "fetcher": "github", + "commit": "94e6b48c731067a6f30a343f9ddbd5f365ae7043", + "sha256": "0czy5kp1f9xhakgd1g68z7sg3swwy3nc90cakpavja6bn6l1fbcz", + "fetcher": "codeberg", "repo": "astoff/unicode-math-input.el", "unstable": { "version": [ - 20251012, - 953 + 20260601, + 734 ], - "commit": "d7ee1a963f140acd5650b86e808129077c6a7828", - "sha256": "0xsf0v2pnq1zaln8hcrd4np9d5clxykh9bhfvhrkp2zwi9xirr5s" + "commit": "f0ad9e4bf23df653bc68d578e610a2d0431b87df", + "sha256": "1cr7p5nysn28an9hkzanvifiv3c24j3y1p3b98lr1xcsm0q07dvm" } }, { @@ -133467,14 +134907,14 @@ "repo": "tbanel/uniline", "unstable": { "version": [ - 20260411, - 1423 + 20260721, + 1504 ], "deps": [ "hydra" ], - "commit": "14a0949539679e89f706601a501ae8a8d090c71f", - "sha256": "1fcqr4q5dc9kfzqp6b9wfqma4qbb6dmjia639wfgdj3xqxa8ygl7" + "commit": "dc31332675769a789da879608276ec7e5b964865", + "sha256": "1nb2slw8has9bs2xh78zdkhgadqslkgpvlc3iab89a50bpa2mdf1" } }, { @@ -133530,20 +134970,20 @@ "repo": "fmguerreiro/unison-ts-mode", "unstable": { "version": [ - 20260126, - 915 + 20260720, + 619 ], - "commit": "83fe7aadecc5438be19ccb50b089c1ba95803839", - "sha256": "04abri83yz3yr3ffvj780sjljbhlz468a579i2i8rh01pgdz4dqx" + "commit": "d46a659e2a884bd843da16b21b605755a2c3444f", + "sha256": "0nqynakmyr31am5zpnvvx4r866vxlivjxlnjrmp0nvb8ixxzybix" }, "stable": { "version": [ 0, - 2, + 3, 0 ], - "commit": "e31a211899e5c249a521b8b1e09f48bcc40383af", - "sha256": "00z4l8d1p80lb0n2h2sp1bbhyc6rym1y0wvcrcqwiq5k023kacyc" + "commit": "626e1575386f9ed996004ecce2e5672cc2583c18", + "sha256": "0jqkib3ibg3iyqpxibck1ax6lgprclrh7yhkhq8b7x8a9canb5xm" } }, { @@ -133825,19 +135265,19 @@ "repo": "tee3/unobtrusive-magit-theme", "unstable": { "version": [ - 20200411, - 1349 + 20260424, + 1659 ], - "commit": "aede357009655d19d4468320b2b61b0f26a47593", - "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + "commit": "33d265d08a0a215aab558550d1596ac0e57c9d63", + "sha256": "07pdc6idc5zm1fjmi472lbc67y3sgli1pvksnphfp0gvd284fp7f" }, "stable": { "version": [ 0, - 4 + 5 ], - "commit": "aede357009655d19d4468320b2b61b0f26a47593", - "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" + "commit": "33d265d08a0a215aab558550d1596ac0e57c9d63", + "sha256": "07pdc6idc5zm1fjmi472lbc67y3sgli1pvksnphfp0gvd284fp7f" } }, { @@ -133991,20 +135431,20 @@ "repo": "ursalang/ursa-ts-mode", "unstable": { "version": [ - 20250407, - 1303 + 20260503, + 2249 ], - "commit": "25dd8c309ad9433a5bb57b47b947447c420efb77", - "sha256": "02nkfaz8wwb3fywvig21br7m4rd6xk7gz04izv6vya9fsybphd2a" + "commit": "b76fb46721839ef210700ee6d00763f5646c30af", + "sha256": "05wshv3bv5xr8d6pdlcryfivv6f6dxyrdz1vxvawrjcw2h7m3cn1" }, "stable": { "version": [ 1, 3, - 11 + 12 ], - "commit": "84689fb37dfb6ddbd0a22cc1dcef25203f0689a8", - "sha256": "06fabv3b4ghljg2ybriswqc71avb4mzjpwc373k643l5gj47wfnf" + "commit": "b76fb46721839ef210700ee6d00763f5646c30af", + "sha256": "05wshv3bv5xr8d6pdlcryfivv6f6dxyrdz1vxvawrjcw2h7m3cn1" } }, { @@ -134126,6 +135566,38 @@ "sha256": "0kpnac51ykmhkirz7shryasd7h2gvkfrhyysy55bpn8swdzknawm" } }, + { + "ename": "use-package-x", + "commit": "28893a37e38074ffbadd6b1cf0109d4ba238e4dc", + "sha256": "004nr4fqdh131906j1pi8lk8bjm561vlqsj7ys9wwv777l80nxw0", + "fetcher": "github", + "repo": "DevelopmentCool2449/use-package-x", + "unstable": { + "version": [ + 20260525, + 1628 + ], + "deps": [ + "compat", + "use-package" + ], + "commit": "45ed391f1d6816b1fff0a3104c6c0d94d9bebd64", + "sha256": "1cipdps4d2rxvqa8px26522sly55zchj6ag7n5g67i6xalw3nyf5" + }, + "stable": { + "version": [ + 0, + 0, + 1 + ], + "deps": [ + "compat", + "use-package" + ], + "commit": "2f679f089956af769ddc8f7473f01afd9b6fe56a", + "sha256": "1cpj6ancx7ahpczn6bcig6jwcayz8cig466viq2p0qyrv7s8wj2a" + } + }, { "ename": "use-proxy", "commit": "e9fb7f05b76517aa918fbd08a52719d1692d6dfc", @@ -134317,11 +135789,11 @@ "repo": "kborling/uwu-theme", "unstable": { "version": [ - 20250902, - 202 + 20260703, + 1803 ], - "commit": "430e06214e8230357bea8252e8a56c5c1aa8f3eb", - "sha256": "175d83yzhv84ib92dxhiy2b4dndiynis60kmcnffbwwb4j5pxra1" + "commit": "10b07fae92e2b28d7f3948e5feba0e3172123370", + "sha256": "1jc1inzs2v4m8sgxmwv06xh5ddhzy0j5y51yixnrqzygz56cswcn" } }, { @@ -134708,26 +136180,26 @@ }, { "ename": "vcomp", - "commit": "561442ea9f75ebe8444db1a0c40f7756fcbca482", - "sha256": "02cj2nlyxvgvl2rjfgacljvcsnfm9crmmkhcm2pznj9xw10y8pq0", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "1i4jcbkcpqim8f1fdkfrznszn575zkhc61s030wxgdk1l19p5yib", "fetcher": "github", "repo": "tarsius/vcomp", "unstable": { "version": [ - 20260420, - 1508 + 20260701, + 1247 ], - "commit": "213c3f6b085182d20065caa1c53b6a543ca42694", - "sha256": "1ajfpxnpbg92r2dvz9jfk2fxii079gif5sar8r6pvhqyh7868yrk" + "commit": "ba2d07505dc29e3128ea915bb252969b82d2af08", + "sha256": "133fp6fpvh8a1kp8n5iv94yybs87x2i69fk4j8nvazsaiandfs4w" }, "stable": { "version": [ 1, - 1, - 0 + 2, + 1 ], - "commit": "99831d234481a61488aca4b96b842b63a79c732a", - "sha256": "06qcmlr16dnvwln4136vz6m0zs5mp81awy40jv8pmvhwms9fprr7" + "commit": "ba2d07505dc29e3128ea915bb252969b82d2af08", + "sha256": "133fp6fpvh8a1kp8n5iv94yybs87x2i69fk4j8nvazsaiandfs4w" } }, { @@ -135030,20 +136502,88 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20260414, - 1812 + 20260708, + 1918 ], - "commit": "ffe668c20120ba215f14d6d5720e327fbadbd10d", - "sha256": "0bvz5y05b6kvax4yak193ki8mja8v544ycg31i70863q6p356vhy" + "commit": "ef09a5804cac4816ca9a0d1fb9c71c8ed3d3df8f", + "sha256": "0cli080ndalc7xc96f017xk6b5b00hfz0831r64jx8ci9xscwr5a" }, "stable": { "version": [ 3, - 1, + 2, 0 ], - "commit": "2e778afd08b8a9872b8273528052f52d53c2bd45", - "sha256": "12y2shqhbl21xj18hldg17n03pq3qcycwmswxdwr0pnac8613pq6" + "commit": "81aa67dffb17b3d88b35f16787aa3292d5761abb", + "sha256": "0bz41lw1d4ps3hg07g2frdjx9d1w9fwdhsfc9k78d20ns3l07wrx" + } + }, + { + "ename": "verdict", + "commit": "99def78eea057a9e772b7bea8baa08b45a6080a2", + "sha256": "1wjyramicz7p756r830r6jqvg3yybmyx20k4jvxncfdii921v7b9", + "fetcher": "github", + "repo": "tjarvstrand/verdict.el", + "unstable": { + "version": [ + 20260506, + 914 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "ff29a0681f7cca17c0e7b467229b2a8441559a2e", + "sha256": "0n9bh35l4sxrkq4c892fn0lhgna03hginabn0a3arb00yrrvxwar" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "dash", + "treemacs" + ], + "commit": "84fff362b8068a1a8112b772fa927b56a6786482", + "sha256": "1w79z03d1wq2g1d15b1zppnwh3hp3n74l2ciriq5fzybcwfk7kag" + } + }, + { + "ename": "verdict-dart", + "commit": "d86b05b64bef357dd7c58b02ed58e45e6b6029e3", + "sha256": "0dg6vkdyw90641w3ilbqxg6gnzaxrx7abkxjys25q579c4lcv49h", + "fetcher": "github", + "repo": "tjarvstrand/verdict.el", + "unstable": { + "version": [ + 20260505, + 1121 + ], + "deps": [ + "dash", + "f", + "verdict", + "yaml" + ], + "commit": "84fff362b8068a1a8112b772fa927b56a6786482", + "sha256": "1w79z03d1wq2g1d15b1zppnwh3hp3n74l2ciriq5fzybcwfk7kag" + }, + "stable": { + "version": [ + 0, + 1, + 4 + ], + "deps": [ + "dash", + "f", + "verdict", + "yaml" + ], + "commit": "84fff362b8068a1a8112b772fa927b56a6786482", + "sha256": "1w79z03d1wq2g1d15b1zppnwh3hp3n74l2ciriq5fzybcwfk7kag" } }, { @@ -135091,44 +136631,42 @@ "repo": "gmlarumbe/verilog-ext", "unstable": { "version": [ - 20260225, - 1300 + 20260716, + 1137 ], "deps": [ - "ag", "apheleia", "async", "flycheck", "hydra", "lsp-mode", - "ripgrep", + "rg", "verilog-mode", "verilog-ts-mode", "yasnippet" ], - "commit": "e2217561bc6ee84b4e925951ef3794957048bf73", - "sha256": "0h6q7105ccb64cid5h89j8m3a4s40ifnl6c9j8xak23k3q3l9jk4" + "commit": "f4c65a24724cd2d1eeb1e21ec10c9cee4bfcc385", + "sha256": "08nsjdiwy7znymcmddxd3jmzhmvzjvihcsyrsmggpk1y2m1qlbjf" }, "stable": { "version": [ 0, - 8, + 9, 0 ], "deps": [ - "ag", "apheleia", "async", "flycheck", "hydra", "lsp-mode", - "ripgrep", + "rg", "verilog-mode", "verilog-ts-mode", "yasnippet" ], - "commit": "fb7d629688f862e0bdb91986d72bcff2ae7c3e23", - "sha256": "1hgplmd9zzikp6wklx4y8svzd7n2i0rmfhphpms0f2zl74ana6c6" + "commit": "f4c65a24724cd2d1eeb1e21ec10c9cee4bfcc385", + "sha256": "08nsjdiwy7znymcmddxd3jmzhmvzjvihcsyrsmggpk1y2m1qlbjf" } }, { @@ -135139,26 +136677,26 @@ "repo": "gmlarumbe/verilog-ts-mode", "unstable": { "version": [ - 20260225, - 1302 + 20260716, + 1249 ], "deps": [ "verilog-mode" ], - "commit": "a804a3e8b744edeaf879705c85aae196f761cba8", - "sha256": "18ndf250z55dz8vic6xxyfxjlymy8inf4ga0swdf4swhfyfp5im3" + "commit": "fc19bce75747a578305130bb8ef1e7972b028def", + "sha256": "1qnw5lqxb7n8kvsp16ms6l6w7gdgdmdacvmd55falfj4cyjdyr1p" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "verilog-mode" ], - "commit": "b71a15e1677060bc0a3e7dc180a11a82074a2157", - "sha256": "19jzdi4n8qj65wxgfr0simnsy2r90rpac5bgkc5bz7w2vfy7rhk3" + "commit": "088960470a3cb25537173c0619400675319c759c", + "sha256": "0pybfj9vdvb4nqn77mmy62iw4w5ydipgj1v381yjknfqlxlpkym5" } }, { @@ -135262,25 +136800,25 @@ "repo": "minad/vertico", "unstable": { "version": [ - 20260419, - 1808 + 20260709, + 1303 ], "deps": [ "compat" ], - "commit": "daa0dddeb5bc152e13ec4f166cc2f84150b7a2e8", - "sha256": "1vlhmvjsgcsfhpd2hcfq1zlz0r2pb6ww1rhra17kdf5cg0dnns2q" + "commit": "99b9ef78e653422466ee14f1672af3ee7f685ca4", + "sha256": "0dkrgvf8j5nayl4n48i4v66r4kw569m2j25p8cmwfab5d5g10p80" }, "stable": { "version": [ 2, - 8 + 10 ], "deps": [ "compat" ], - "commit": "0b96e8f169653cba6530da1ab0a1c28ffa44b180", - "sha256": "0kia499sijkmpj5l9r0r3pwc1kjyvbfxc15k85dyfq9dvc4z1drr" + "commit": "6028bd3d32c99c28e2b938e5e5393ec3508d2424", + "sha256": "0hzl3p7b62f3p2419c5d7340h7y6ry2xhwdds166wfcgwpwnm7m6" } }, { @@ -135291,30 +136829,30 @@ "repo": "radian-software/prescient.el", "unstable": { "version": [ - 20250816, - 19 + 20260628, + 2243 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" }, "stable": { "version": [ 6, 3, - 2 + 3 ], "deps": [ "compat", "prescient", "vertico" ], - "commit": "87e2d2f2ddf24f591a5f70cc90d2afb4537caa18", - "sha256": "0f4wi8aq3yfykxfza4y4c5yhcs50cs3gpfj0qrmvfq9hvkhzj52w" + "commit": "5649977fa7789e4615efeca09397ed7eccd06dfc", + "sha256": "199150yng81f6n3kb120s37yf2dqs0i9k91f2gzkk8kjn6hvrsj8" } }, { @@ -135369,38 +136907,36 @@ "repo": "gmlarumbe/vhdl-ext", "unstable": { "version": [ - 20251118, - 1340 + 20260716, + 1401 ], "deps": [ - "ag", "async", "flycheck", "hydra", "lsp-mode", - "ripgrep", + "rg", "vhdl-ts-mode" ], - "commit": "19b5be6e3b794e848b2554ffc6f03dfb35c75c8e", - "sha256": "0pqfci24mbp8cjwrikvs4gvfvgf0wjqv68nzzcs7lqx41682ixpd" + "commit": "fd400c09de24d3c7da9aed5884b6f114f595373c", + "sha256": "0nznf1w67fnqk00690kdwh0q43480crdz61qdvsnx23yfx5q9i65" }, "stable": { "version": [ 0, - 7, + 8, 0 ], "deps": [ - "ag", "async", "flycheck", "hydra", "lsp-mode", - "ripgrep", + "rg", "vhdl-ts-mode" ], - "commit": "5a3513d2f26ace017e9fab7141754ff5bdebb0eb", - "sha256": "0agiamq7g8zm3blznykbr1kgr09rb133rd4mh9nfc0vfk8i5mabv" + "commit": "22fa38698bdf106194c02a6d2e3830d8685437fb", + "sha256": "1c9cfwadi18ib4psnf5xlgdjg75038fq1zhz2fxcjdp2kjwv5nwb" } }, { @@ -135411,20 +136947,20 @@ "repo": "gmlarumbe/vhdl-ts-mode", "unstable": { "version": [ - 20251008, - 2052 + 20260716, + 1206 ], - "commit": "9da613a72aa7caaa32b11f4de6f2e778bfb9376c", - "sha256": "0x11sjiy3j43am0clwxsbx7b38pfsl74qgypkc3czs7dh1c5xyrx" + "commit": "a9bfb0dffb5f994b11b7921d5e145ea40e9a68a2", + "sha256": "0y41cva3qknisxnskmn1s15r3ja2hcf4bbzc5nx1z9xk2ndh8rzf" }, "stable": { "version": [ 0, 3, - 2 + 3 ], - "commit": "9da613a72aa7caaa32b11f4de6f2e778bfb9376c", - "sha256": "0x11sjiy3j43am0clwxsbx7b38pfsl74qgypkc3czs7dh1c5xyrx" + "commit": "a9bfb0dffb5f994b11b7921d5e145ea40e9a68a2", + "sha256": "0y41cva3qknisxnskmn1s15r3ja2hcf4bbzc5nx1z9xk2ndh8rzf" } }, { @@ -135525,20 +137061,20 @@ "repo": "jamescherti/vim-tab-bar.el", "unstable": { "version": [ - 20260314, - 1906 + 20260710, + 1614 ], - "commit": "3ab286ffc3ce5e4215d9d7f502a6982111e49207", - "sha256": "19n4nhm9gvz6z93prq3v413qcl4iknprnkjcmixlg4lkm59kl3bw" + "commit": "c2f03438f62915e71a780ca1cb05b94fe2871a71", + "sha256": "1v9bv8lj125sfvmqc1bm37msaw438hk1mn8gdf59kh7p2fwgv730" }, "stable": { "version": [ 1, 1, - 4 + 5 ], - "commit": "22d2d8a92b8d8cd0532c8382dcfe7df405f1563a", - "sha256": "00bajfkqcpn15d5vdr52nd56qny68r59xc7yshw7wxs9awfpxrzz" + "commit": "61290afd8c1fdef6b5b03b1588c5cf830e196ded", + "sha256": "1530p5qr9b53jljsv9bx7m54zri1i2jzglvcd58akrv5krs5wrp2" } }, { @@ -136082,11 +137618,11 @@ "repo": "ianyepan/vscode-dark-plus-emacs-theme", "unstable": { "version": [ - 20260420, - 8 + 20260606, + 209 ], - "commit": "082b012d203fed17d54b4a3b7437db545f15ddbb", - "sha256": "0mik95vf8nc61g33jfmb885jrrk64xghzx0ip443gigdr1pbs2yk" + "commit": "c401b44809bfbf5928582efddc19ddda4f271ed4", + "sha256": "1d9y5ghzpaflkd5dpqsf6cni47k1ib5sgh3fd58jh708cc0lhgsz" }, "stable": { "version": [ @@ -136151,11 +137687,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20260406, - 134 + 20260706, + 1652 ], - "commit": "54c29d14bca05bdd8ae60cda01715d727831e3f9", - "sha256": "1jwby4pyzqv4n7fi8d617j93bbgdr3hkcpkkv2cqqpz1lfy0cab5" + "commit": "9a32a4afce25647282bc8a8792468e41bc64adf4", + "sha256": "19y0vxlx90rx0sxrwa41h9rbvxwccls0lf9h7136xm4hsn5h2d9x" } }, { @@ -136202,14 +137738,14 @@ "repo": "jixiuf/vterm-toggle", "unstable": { "version": [ - 20260420, - 1244 + 20260601, + 1632 ], "deps": [ "vterm" ], - "commit": "80989c6ca35416a5c85fa76277ef49a13c3eac11", - "sha256": "1941hls4lz4a4ww4jmns23zydzl3z948w72m7ji22y0f0hppf1af" + "commit": "a0051a8b8eaa85f8df54ddb032f5710c1f62779d", + "sha256": "14dpnvsjd1hz67japlp3vazydj4hljhhffywgq8r4mqgg0781cjw" } }, { @@ -136312,20 +137848,20 @@ "repo": "d12frosted/vui.el", "unstable": { "version": [ - 20260130, - 2113 + 20260702, + 1513 ], - "commit": "7d904ddff91325d756ad7ffd4dfb0db855f3a120", - "sha256": "03p61v8ra4fy83amhgmzidhlh66vwpgcclw8h2wlwzsxg4sf3lr5" + "commit": "9101db52a29c4276b45f85e63924008f0e41c39c", + "sha256": "1xlnp9myjw4p90lir78p0kwl0shfglwm6wb3afd2wk1l3bf8882b" }, "stable": { "version": [ 1, - 0, + 3, 0 ], - "commit": "67c508c0f2dd6773a590df47c355edb3911f0bcb", - "sha256": "05jny12ncjr7ybwab8lmshjjhcrsax67063xbfv7ri6j5kdk5r52" + "commit": "9101db52a29c4276b45f85e63924008f0e41c39c", + "sha256": "1xlnp9myjw4p90lir78p0kwl0shfglwm6wb3afd2wk1l3bf8882b" } }, { @@ -136374,8 +137910,8 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20260308, - 1107 + 20260720, + 628 ], "deps": [ "dash", @@ -136383,13 +137919,13 @@ "org", "s" ], - "commit": "4433949421f302edefb575896265f11a261275bf", - "sha256": "0f30icbk4z5l5b3bkww4y00rlb94cnpr3cc108p5rba4f9kffga0" + "commit": "f7a9e919ffd73109f545796e0b8f78f8bc3d0d1f", + "sha256": "1a5cwvsf4izxir1ynn4gqlkvdlvmgfx09zb8dfqr9cmd775fdw3i" }, "stable": { "version": [ 2, - 2, + 6, 0 ], "deps": [ @@ -136398,8 +137934,8 @@ "org", "s" ], - "commit": "e2330e8ff04590913570773ddcb87355427ffbb7", - "sha256": "01vq47y9sr62b1nb8dr5aq499kvgca8dswrxn3bpnzxfx5sfdq3b" + "commit": "66bee1cc931d70f0ee31087e5d6217d9b65bf3a6", + "sha256": "05x7h6d5lb0qfd29ml1haplx9fyvha2lhfri3ivnq2l2382xf0s0" } }, { @@ -136410,30 +137946,32 @@ "repo": "d12frosted/vulpea-journal", "unstable": { "version": [ - 20260306, - 921 + 20260718, + 532 ], "deps": [ "dash", + "vui", "vulpea", "vulpea-ui" ], - "commit": "071533d534e69e302dac543053c59ea8d4d7af77", - "sha256": "0kaawf7jy4kd14spmi6pzhqjpf6gh0y18j8hn2a8nm4dfljr1hbd" + "commit": "3bd4fbbae8deece4d595f39e6f629b6cfeaf888f", + "sha256": "0rkzbn9hp9bxyxh6wr2lkpy6dg1glfl87ah3a5r3rrh2dhhs64rv" }, "stable": { "version": [ 1, - 0, + 1, 1 ], "deps": [ "dash", + "vui", "vulpea", "vulpea-ui" ], - "commit": "7525fde77555d25cbe3b78fbe5cf35113b65e7cd", - "sha256": "0x47rvpmrpg6m2lyh7550mynkpjqqihgj7v04wbn2s85vr9gnv94" + "commit": "4f6b195faec8f468047efe76a74fbd60a495c32a", + "sha256": "0yad7qjam45myc4a2d9jfmcajjb40v9qbhr9gkgbdk82jp3jfbf5" } }, { @@ -136444,28 +137982,28 @@ "repo": "d12frosted/vulpea-ui", "unstable": { "version": [ - 20260331, - 601 + 20260708, + 1156 ], "deps": [ "vui", "vulpea" ], - "commit": "5bf32360d5107053a2b7ee9e75e647faa1f099c7", - "sha256": "04n5c3rl9y479cg98j37l5r4k13bc5jjnzl43yn9czyf9556b0vd" + "commit": "e734d083e2838250f3ca2ec6da616ce8dcbb96d8", + "sha256": "1lpz2pidglzxfky20ljxqvipldg54765b9allkmysy21gl37hy67" }, "stable": { "version": [ 1, - 1, + 2, 0 ], "deps": [ "vui", "vulpea" ], - "commit": "fdd6749cb4a252a369e09dd1c76d01f063b44d8b", - "sha256": "1jc8c1s8slsbs1yvyw0h14wcmzmyxrc15jpmmcvr0jibp7k45brr" + "commit": "54e4478cc1a0ee7036d11f91f4e378bcc57fa314", + "sha256": "1jvw7gryb4l6x0ljb03d4fvkh15j71pxjigb1g9sl5ygqlw6j8sj" } }, { @@ -136570,15 +138108,14 @@ "repo": "shosti/wacspace.el", "unstable": { "version": [ - 20180311, - 2350 + 20260427, + 2039 ], "deps": [ - "cl-lib", "dash" ], - "commit": "54d19aab6fd2bc5945b7ffc58104e695064927e2", - "sha256": "1nfx1qsl2gxjqbbc5xsr8f3xz2qyb4wnz3634k3hglb1jpa78j3n" + "commit": "28b1fb7a124febb8dbf47aaae8d7dd8c185eea7d", + "sha256": "102zabzygvf7aw879sdyyldgjsih0cpvmjfg4llwf4jp9wf0fzja" }, "stable": { "version": [ @@ -136632,11 +138169,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20240623, - 653 + 20260520, + 234 ], - "commit": "1c5b2254dd72f2ff504d6a6189a8c10be03a98d1", - "sha256": "00qv6b756qiaqrmfg1w03psnsdj0iaz3sp50ib4kmdm2g9vgxl1s" + "commit": "464ea0ea99696133553c565cdfc0966a496b1887", + "sha256": "0pyfjk7azfhxqklazvcc17n59dvin0csndkf6rm2cadr5n15r0wg" } }, { @@ -136719,16 +138256,16 @@ "repo": "abrochard/walkman", "unstable": { "version": [ - 20241204, - 2234 + 20260515, + 1746 ], "deps": [ "json-mode", "org", "transient" ], - "commit": "b8260b6c1c6bdc8878c6f8cbeeea05040ac92b65", - "sha256": "1l3hg4spzgf4ymqp9ka7dys4hp1p227y1lf4cbni4ngz6ajynh26" + "commit": "0328a6b8ca98926a4fed88e722eba66ddbc5b0a8", + "sha256": "1n662r7q9vmbndswnhv77r1nngb65qwvnx5vii1nnd31p4vhvp0j" }, "stable": { "version": [ @@ -136945,11 +138482,11 @@ "repo": "gmlarumbe/wavedrom-mode", "unstable": { "version": [ - 20250720, - 1337 + 20260715, + 1713 ], - "commit": "159767bc9e1726035c9e21ac50f2d0f7fe315fa8", - "sha256": "06kiv7qsfj4xw55jzzbmf1l6n4an5rn13ms9z2516x26v3sjyix7" + "commit": "5d59b7ca2bdf355d9d2f00d563acf4e17e8ba8b9", + "sha256": "0yszy0cz57sahmz7splqkq103jp68vfrwh5if9qfra81plykcml1" }, "stable": { "version": [ @@ -137183,11 +138720,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20260331, - 1441 + 20260623, + 932 ], - "commit": "e93b3fb89fd6345a5ff59795bed712abd486200a", - "sha256": "02xn5wqmjv46nqrd73prddzx20c3r5idyg55rchbzvd4wwxjc9a6" + "commit": "aeee2d4c82a791ff69657c1413873bf9265544df", + "sha256": "0bpm6njk1pmqckvmk7zwcfms8csb9rzj3zylh3pl7xr2k25gaj1x" }, "stable": { "version": [ @@ -137548,11 +139085,11 @@ "repo": "thierryvolpiatto/wfnames", "unstable": { "version": [ - 20260105, - 458 + 20260706, + 903 ], - "commit": "6ea49841ab76f44c0164b9f4722da2f9d46228da", - "sha256": "1agbwnhgagfrgz5w47x8b4i6x8qdvv03f08p1fi44wsld2h0xvwr" + "commit": "d8839fa42a24f7c781cd2d8c3f40eda31faa19be", + "sha256": "0ghb3y2qbkb819l81xcb6859h3yzppahbnwykmf8bcim29i3wclf" }, "stable": { "version": [ @@ -138162,14 +139699,14 @@ "repo": "agzam/wiktionary-bro.el", "unstable": { "version": [ - 20251218, - 2021 + 20260615, + 1744 ], "deps": [ "request" ], - "commit": "def5f3cb1486077cb090da48d77f790b858e7886", - "sha256": "1iijq66awixa8wr6rm44kxsgl55dggqvdgp3b41wm6j1w6vb1cic" + "commit": "bf53a1b3ce71ecf13d3b8a7aa0ba3a66bcf3f2a1", + "sha256": "1dyyp85jika15kq4cyjnm53zqfilsxbsljg38ib36r3hiic896x7" }, "stable": { "version": [ @@ -138539,11 +140076,11 @@ "repo": "xenodium/winpulse", "unstable": { "version": [ - 20260216, - 2106 + 20260611, + 341 ], - "commit": "c58352bea2223fd6f0cc11deb4d33bca2ff0213c", - "sha256": "0fpnh45mm608i41mv7abkkm4m29bzwhgls9r2gcdvcbsaddcfk61" + "commit": "dcfccb28394d8eb09a8bbbca69e466b334af461d", + "sha256": "0zvfa5jkcaxxzcydx7w227hh08vgrgzij520620nbb0a5ran9vwz" } }, { @@ -138609,20 +140146,20 @@ "url": "https://hg.sr.ht/~arnebab/wisp", "unstable": { "version": [ - 20251108, - 2318 + 20260711, + 2357 ], - "commit": "cfebcd5f097f2f7bbb0f5b0c3730584313c93bac", - "sha256": "1pq5qiswihisym9c7161m3flh4idhmk1dagzlvak8riz0h47glm4" + "commit": "97cdd788b49ea385cdc423b411af37dacd3bc5f9", + "sha256": "1g8599h87gsa3ffskbnapvasl4sd26fgyy5rc0mhnzzlbw91zi1s" }, "stable": { "version": [ 1, 0, - 12 + 13 ], - "commit": "7c6239a779656cd55225ad24e15cc29bc896f834", - "sha256": "0m5ssl4ngk2jl1zk0fnsss0asyvwanjaa5rrcksldqnh2ikcr4bm" + "commit": "de5543e8e0b3bf05f3db552e71e0ed52169f0307", + "sha256": "0fb4l0ww4rnkrsh4x46301j5xrqniny9b7yh7i6lp4wprwx0a7fs" } }, { @@ -138655,34 +140192,53 @@ "sha256": "188h1sy4mxzrkwi3zgiw108c5f71rkj5agdkf9yy9v8c1bkawm4x" } }, + { + "ename": "with-command-redo", + "commit": "fc803a9357d301d3f0b2b6396f1f85db36c27cbc", + "sha256": "0payls4280ng2lxqqjlhfc90xgxikk3kh6j7lhxfrykjag26k2m2", + "fetcher": "codeberg", + "repo": "ideasman42/emacs-with-command-redo", + "unstable": { + "version": [ + 20260710, + 942 + ], + "commit": "b3e3c86e2cbeb097552a1bff000905ad28de7907", + "sha256": "0kn6mlim6an53kwh09fiyvjgavm42l7sdmb3nsrmw47dky2za827" + } + }, { "ename": "with-editor", - "commit": "a74629656e9a23133219a0bd805982f1497b35d7", - "sha256": "1pgw52pn0vam3p8hh5cyivsg0i8r6pigam6xvbk46siffk16g0wk", + "commit": "aec4a76eaea31408bd27d76a0b8cea5268663cc1", + "sha256": "1wsl1vwvywlc32r5pcc9jqd0pbzq1sn4fppxk3vwl0s5h40v8rnb", "fetcher": "github", "repo": "magit/with-editor", "unstable": { "version": [ - 20260417, - 751 + 20260701, + 1252 ], "deps": [ - "compat" + "compat", + "cond-let", + "llama" ], - "commit": "d0935036eb894680d8ca1a4d1ed8e8d5d90005e5", - "sha256": "15vvc6awlk8mzqqfqn7n3k349skzg0jk645sjgmzq1sfig4yfcsy" + "commit": "45bfc6084f03e3aa7f4f8db20836d559186c5957", + "sha256": "12vh1p6zlqi7rv0xmd6v0mxyxyafh5izw9x990x5m9rrzxb5q306" }, "stable": { "version": [ 3, - 4, - 9 + 5, + 2 ], "deps": [ - "compat" + "compat", + "cond-let", + "llama" ], - "commit": "64211dcb815f2533ac3d2a7e56ff36ae804d8338", - "sha256": "0gxmmzx7z84d4684q58ijms7d555ngasvzhfz2gna9awly5qig6z" + "commit": "45bfc6084f03e3aa7f4f8db20836d559186c5957", + "sha256": "12vh1p6zlqi7rv0xmd6v0mxyxyafh5izw9x990x5m9rrzxb5q306" } }, { @@ -139057,11 +140613,11 @@ "repo": "martianh/wordreference.el", "unstable": { "version": [ - 20241203, - 1648 + 20260509, + 754 ], - "commit": "4f68d155ceb3328c3263faee86cfb82d50402f05", - "sha256": "0kv0b2nbaafjznclahymxcrp2mj06v71887jg5rlj2i09mb0igf1" + "commit": "6b1e321ec48ae6eadc06ed25f018c384e396644b", + "sha256": "1qsiwk6j73fvjhhwzf3qi5zhp59ix7h7fz3z6xp7vr7h6dyal2l9" } }, { @@ -139390,26 +140946,26 @@ "repo": "cjennings/emacs-wttrin", "unstable": { "version": [ - 20260422, - 507 + 20260626, + 1725 ], "deps": [ "xterm-color" ], - "commit": "9958ec4c4396ae8435f7e1818ff383c05df47a14", - "sha256": "1i4k7aj2w5mawfc9h8h7s5c3r886bmzxf4ai2q1caarhckb81wj3" + "commit": "ee8fdeb692d666c12ce068a2b1ee90e9451ac892", + "sha256": "11yri41vzsj08arxvavc6hvkcxc4mg2bgc3in3fiksvcwy20pb44" }, "stable": { "version": [ 0, 3, - 1 + 2 ], "deps": [ "xterm-color" ], - "commit": "a0f1b4f07c98ab3d4d4b50a330822d0991b733a7", - "sha256": "1b28z8zl53lf5cvybynsnkhs85jz346y7vvhd32l1ypwsr7s0p4d" + "commit": "fe653a231b186393b02a2723985e61ce97baba1c", + "sha256": "02wkqjyap6gxbi2mcrzpbdjz40igsmf1cbqqr7iw0mgp4ray7zxd" } }, { @@ -139511,14 +141067,26 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20260410, - 723 + 20260715, + 1405 ], "deps": [ "compat" ], - "commit": "c5dc5a97469166b5a4e835b878ca3c0ed2df055a", - "sha256": "03k3lk2viplhivq01j5f088b6kv9dc5iz2zf6i0mlba45jm8vp5f" + "commit": "fec2f7281b3224ea950284cf39ba45a355c652f5", + "sha256": "0p4i7z3jhn2r60lxmva2l227xplkrsi2skqaj6vr3wyvxz18sasd" + }, + "stable": { + "version": [ + 2, + 0, + 1 + ], + "deps": [ + "compat" + ], + "commit": "fec2f7281b3224ea950284cf39ba45a355c652f5", + "sha256": "0p4i7z3jhn2r60lxmva2l227xplkrsi2skqaj6vr3wyvxz18sasd" } }, { @@ -140042,11 +141610,11 @@ "repo": "ideasman42/emacs-xref-rst", "unstable": { "version": [ - 20260108, - 1306 + 20260528, + 14 ], - "commit": "2d1ed3f31b64a9e10a757dedf06f1b514894d67f", - "sha256": "157cfapjp8ip3maqlnbdndlk6j9sr0lrdcl67fvmcxnflabrssff" + "commit": "e54656eff9138d71c5d9ad7717675575b9f2b636", + "sha256": "08kw6ksgr9rjg56a377fvl5qb0x0c6zqcsv3v9zi4hqhqnycwri4" } }, { @@ -140081,11 +141649,11 @@ "repo": "atomontage/xterm-color", "unstable": { "version": [ - 20251128, - 1842 + 20260531, + 1854 ], - "commit": "ce82e87ea3d277c7e4fc48ce390d540fbd78f6d1", - "sha256": "0zkjfvma70lw0iv31g1n1naz40d2wpngiasnjy9gslm1nybxj76a" + "commit": "0b0d808f8bc5007037341dc5f63149cc32cf2c5b", + "sha256": "1jhflkq2jji1nv2hc94xkmfsw383nav2rppl1g4xf76ld1yinkfr" }, "stable": { "version": [ @@ -140380,20 +141948,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20260113, - 653 + 20260605, + 834 ], - "commit": "f2369fb4985ed054be47ae111760ff2075dff72a", - "sha256": "1fb7hgb6r0pk30w2vdcci494rrn337ibjvq7xj1ihj2cv2xk8pdb" + "commit": "5546f36bde24a9a8c1934e0f6ce205cd41d72537", + "sha256": "06s7hl8gn80r7ydvgraml3i51iprmvllz15flfrv7y02ncz98jd5" }, "stable": { "version": [ 1, 2, - 3 + 4 ], - "commit": "f2369fb4985ed054be47ae111760ff2075dff72a", - "sha256": "1fb7hgb6r0pk30w2vdcci494rrn337ibjvq7xj1ihj2cv2xk8pdb" + "commit": "5546f36bde24a9a8c1934e0f6ce205cd41d72537", + "sha256": "06s7hl8gn80r7ydvgraml3i51iprmvllz15flfrv7y02ncz98jd5" } }, { @@ -140530,11 +142098,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20250609, - 1121 + 20260506, + 850 ], - "commit": "55891dde4c9d83b86f94764e7a1990084e66ee53", - "sha256": "060vyy0l6y2mjyhk4xys28c85jhqrm8dilrzx4xdmlnd2x4nm1al" + "commit": "183b92a25a6fcc1496a8028d80397662e0bd5f19", + "sha256": "1s6kd0y1xk6k9xxlna8ayrz7ryd3jq05qcfmakxl4mi4jjf11q53" }, "stable": { "version": [ @@ -140577,11 +142145,11 @@ "repo": "binjo/yara-mode", "unstable": { "version": [ - 20220317, - 935 + 20260702, + 151 ], - "commit": "4c959b300ce52665c92e04e524dda5ed051c34f3", - "sha256": "0kb2a4hcmaczn279hbgk0jv88hsjznv1kqpkgkadszd02q53n0cl" + "commit": "2b097f685e2770d2c16e5f59e1434a8dcc38db86", + "sha256": "1l1v1nnl93gmj1gg5h254v1v0c417pywblifqyggkjn66jppwgwf" } }, { @@ -140933,26 +142501,28 @@ "url": "https://git.thanosapollo.org/yeetube", "unstable": { "version": [ - 20260302, - 1931 + 20260713, + 333 ], "deps": [ - "compat" + "compat", + "keymap-popup" ], - "commit": "77e816972a70db86ad06ef10db56e0d8cecede5c", - "sha256": "0zvbfwxq3dx14ynpafpvv1swg7hbg3k9avir9b7cymf4r5hrjnx3" + "commit": "066bc1c2c06493d10388f8a0ecd8e90f8cd28532", + "sha256": "0m52fkv7zjz1iicq5qjxfmz3hcns99bc165r9wxy84j83lb6mry0" }, "stable": { "version": [ 2, - 1, - 12 + 3, + 0 ], "deps": [ - "compat" + "compat", + "keymap-popup" ], - "commit": "77e816972a70db86ad06ef10db56e0d8cecede5c", - "sha256": "0zvbfwxq3dx14ynpafpvv1swg7hbg3k9avir9b7cymf4r5hrjnx3" + "commit": "3a5ca54f63a1c8688ca580e77f06a1065283f0e7", + "sha256": "0phlcmf54f2wih7rksazf8k2jz4i31siqzd4gb7x3d6zddk2rs97" } }, { @@ -141138,6 +142708,21 @@ "sha256": "1araszwlw53g82phwmmp9x84rq07ma2payplr68yg3k159jbmapr" } }, + { + "ename": "youtube-music", + "commit": "d26ac835326a8911dbb5efae2409a33388592454", + "sha256": "1g9g6ddcdyz1dpdjwvn8qgxs4cy0a8yyqpbvr1x87s1kc06czkmd", + "fetcher": "github", + "repo": "cyberkm/emacs-youtube-music", + "unstable": { + "version": [ + 20260717, + 1039 + ], + "commit": "2a962d972d8a59fed718aec039c9c61ef3c0392d", + "sha256": "126clxww967w2fb3padiabh6qaxfpka3kcx6xfl1k9x2n56927p1" + } + }, { "ename": "youtube-sub-extractor", "commit": "6b5f8eceb815d74d7839e30971c96aebc7944c7f", @@ -141258,11 +142843,11 @@ "repo": "treflip/zathura.el", "unstable": { "version": [ - 20250728, - 1208 + 20260603, + 1620 ], - "commit": "947b8332f25810105d35e350f604cdad4e32ee6f", - "sha256": "16hprzf15y7zwr28dimlmlylz5sxy54kfq2yniqwxsrm3r59j1bp" + "commit": "874dadbf07e22811b6b309200cad32b4ccca0e51", + "sha256": "1fjdwjygxxf6dfcff74r39z53mf3bkwgrfl8jcfdnkfdx9mpi8x9" } }, { @@ -141327,20 +142912,20 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20260329, - 1838 + 20260601, + 1829 ], - "commit": "1022240b1061369ecb605d55fa074d20d5c84aae", - "sha256": "17rl292240j2c8db01irpp5khsqwwwwcjlzwa52adyirc5bdb74v" + "commit": "8697934a57151de119744ea79fde83120e05b88d", + "sha256": "0g54j3n2khc470i80diqqdxds0xiysvwdjss3jmgdf73argslj1q" }, "stable": { "version": [ 2, - 9, + 10, 0 ], - "commit": "1022240b1061369ecb605d55fa074d20d5c84aae", - "sha256": "17rl292240j2c8db01irpp5khsqwwwwcjlzwa52adyirc5bdb74v" + "commit": "8697934a57151de119744ea79fde83120e05b88d", + "sha256": "0g54j3n2khc470i80diqqdxds0xiysvwdjss3jmgdf73argslj1q" } }, { @@ -141375,10 +142960,10 @@ }, { "ename": "zeno-theme", - "commit": "f6633f0376fd50b6cc45d96c67848dbf8f38e210", - "sha256": "0akc4llnam4p699v01szhf0xj7r6475y14kbpxli29n5612cwdax", + "commit": "469e38ed467ec98dd7fac2e2d3143f18dbd97197", + "sha256": "1pg7jkxg5ixqaj4c6igk6hkjv6fdn8b147i05jpl3pfh0dij6h5c", "fetcher": "github", - "repo": "sacredyak/zeno-theme", + "repo": "rokrdev/zeno-theme", "unstable": { "version": [ 20211205, @@ -141912,19 +143497,19 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20250908, - 1240 + 20260708, + 2048 ], - "commit": "302e494324066d63f317b54c4db75d173914c521", - "sha256": "10qdia4w31709jk81xcvlyn1ac7zspiawvfx5spr09vff00gbljc" + "commit": "3ecb5ac3c56f8727c99458b6d3ad8e2c7df25348", + "sha256": "0nalp20qfmaj6028ncl0lqv86kv2jdil0wgvnqb1wb7jllpcgn2d" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], - "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", - "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" } }, { @@ -141935,27 +143520,27 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20251215, - 1140 + 20260704, + 2129 ], "deps": [ "consult", "zk" ], - "commit": "5b7fcbdd7bcfd0903e3844d0b4b28826bfb7ef5d", - "sha256": "0rp5q6x93r10lrhrrlrdyg2q5amylsvjgjnkb0mgdwfyh8i9fw78" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], "deps": [ "consult", "zk" ], - "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", - "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" } }, { @@ -141966,27 +143551,27 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20250905, - 1921 + 20260704, + 2129 ], "deps": [ "zk", "zk-index" ], - "commit": "a634b6ec7af4f16a1ceed9271d2a0dbd9bca8501", - "sha256": "1akiid6z812sp1jfwrf3qz4wklc0mdmina4rfj9bfyphiivk4lf6" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], "deps": [ "zk", "zk-index" ], - "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", - "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" } }, { @@ -141997,25 +143582,25 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20250908, - 1240 + 20260708, + 2048 ], "deps": [ "zk" ], - "commit": "302e494324066d63f317b54c4db75d173914c521", - "sha256": "10qdia4w31709jk81xcvlyn1ac7zspiawvfx5spr09vff00gbljc" + "commit": "3ecb5ac3c56f8727c99458b6d3ad8e2c7df25348", + "sha256": "0nalp20qfmaj6028ncl0lqv86kv2jdil0wgvnqb1wb7jllpcgn2d" }, "stable": { "version": [ - 0, - 7 + 1, + 0 ], "deps": [ "zk" ], - "commit": "599be69ae1c1283935f98f9aca4ccda47063d82c", - "sha256": "0449zsahyzvjlhv27lkj33ybnq86j47paww779zd0qhq550hdnjs" + "commit": "ad82465a4a65fba7cff07da419455947507080cc", + "sha256": "1d00i9p391h4341q76ci0x6pxsishsh2mkxshfqivllv80gczn2c" } }, { @@ -142026,15 +143611,27 @@ "repo": "localauthor/zk-luhmann", "unstable": { "version": [ - 20250406, - 844 + 20260705, + 1412 ], "deps": [ "zk", "zk-index" ], - "commit": "1fe0d9053b603037898530ae8aa6361c4e409e46", - "sha256": "1gphp973a4msciy0xcfpkw8nmdvn23d5chg7qjqq7a93rpyx3qir" + "commit": "8b34138abc432a37642d7d60f1c2d043e07bb680", + "sha256": "13mxca8rj56afr1rphv2bscdbpkyxvnppr6m8bc0sxzkd86h8p8y" + }, + "stable": { + "version": [ + 1, + 0 + ], + "deps": [ + "zk", + "zk-index" + ], + "commit": "8b34138abc432a37642d7d60f1c2d043e07bb680", + "sha256": "13mxca8rj56afr1rphv2bscdbpkyxvnppr6m8bc0sxzkd86h8p8y" } }, { @@ -142256,11 +143853,11 @@ "repo": "cyrus-and/zoom", "unstable": { "version": [ - 20250214, - 1251 + 20260509, + 908 ], - "commit": "36f9db90941b10d34bac976aee35dfe25242cd03", - "sha256": "0y01yn0gaycyhqifg8gq0ilr20qr0xm51rh97vbp1vh1n74fca4q" + "commit": "5e524d98c7f2b4dd6ed41d95573b29b263632eb2", + "sha256": "1761ad33yppr3xb5244lpn68l4n3blk577f4l5mbvbkapnfly89q" }, "stable": { "version": [ @@ -142514,24 +144111,6 @@ "sha256": "02g65hri4k362lqk43vpzzdlxisdbjbknvb4riib5dcdar08qr34" } }, - { - "ename": "zprint-format", - "commit": "54457e29def6ecfdf96f599e6a007f5ebee485b9", - "sha256": "1flb1i5byp6s8fj1vpgm5wc43f8hld7rg940m20a40ysr1x35szk", - "fetcher": "github", - "repo": "dpassen/zprint-format", - "unstable": { - "version": [ - 20210602, - 146 - ], - "deps": [ - "reformatter" - ], - "commit": "fa575c17a40033189f2f23f1a5b27b88c399d200", - "sha256": "0xzq07xbk3pz1hhbwb7hakd1w6x20jm3q1flqjl3c8wxgbi7cmml" - } - }, { "ename": "zprint-mode", "commit": "188d40daec1ff86dcfa807a91eb77a1281de3951", diff --git a/pkgs/applications/editors/emacs/load-the-early-default-library-after-early-init.el.patch b/pkgs/applications/editors/emacs/load-the-early-default-library-after-early-init.el.patch new file mode 100644 index 000000000000..63a53936034b --- /dev/null +++ b/pkgs/applications/editors/emacs/load-the-early-default-library-after-early-init.el.patch @@ -0,0 +1,140 @@ +From: Lin Jian +Subject: Load the early-default library after early-init.el + +emacs.pkgs.withPackages from Nixpkgs can be used to configure Emacs. +Its main functionality is to add extra Emacs lisp libraries. +By (ab)using a library named default, user configuration (init.el) can +also be added by it. + +A natural extension[1] is to add early-init.el via +emacs.pkgs.withPackages. With this patch, early-init.el can be added by +packaging it as a library named early-default. + +The early-default library is similar to the default library except that +it is loaded right after early-init.el and is controlled by +inhibit-early-default-init. + +[1]: https://github.com/nix-community/emacs-overlay/issues/532 + +--- a/doc/emacs/cmdargs.texi ++++ b/doc/emacs/cmdargs.texi +@@ -338,9 +338,10 @@ meant for regular (or interactive) use, since it makes commands like + @opindex -q + @itemx --no-init-file + @opindex --no-init-file +-@cindex bypassing init and @file{default.el} file ++@cindex bypassing init, @file{early-default.el} and @file{default.el} file + @cindex init file, not loading + @cindex @file{default.el} file, not loading ++@cindex @file{early-default.el} file, not loading + Do not load any initialization file (@pxref{Init File}). When Emacs + is invoked with this option, the Customize facility does not allow + options to be saved (@pxref{Easy Customization}). This option does +--- a/doc/emacs/custom.texi ++++ b/doc/emacs/custom.texi +@@ -2601,6 +2601,13 @@ But your init file, if any, is loaded first; if it sets + @code{inhibit-default-init} non-@code{nil}, then @file{default} is not + loaded. + ++@cindex @file{early-default.el}, the early default init file ++ There can also be an @dfn{early default init file}, which is the library ++named @file{early-default.el}. It is similar to the default init file ++except that it is loaded after the early init file (@pxref{Early Init File}) ++and is controlled by @code{inhibit-early-default-init}. This behavior is ++Nixpkgs-specific. ++ + @cindex site init file + @cindex @file{site-start.el}, the site startup file + Your site may also have a @dfn{site startup file}; this is named +@@ -2614,7 +2621,8 @@ better to put them in @file{default.el}, so that users can more easily + override them. + + @cindex @file{site-lisp} directories +- You can place @file{default.el} and @file{site-start.el} in any of ++ You can place @file{early-default.el}, @file{default.el} and ++@file{site-start.el} in any of + the directories which Emacs searches for Lisp libraries. The variable + @code{load-path} (@pxref{Lisp Libraries}) specifies these directories. + Many sites put these files in a subdirectory named @file{site-lisp} in +--- a/doc/lispref/os.texi ++++ b/doc/lispref/os.texi +@@ -107,6 +107,13 @@ GNU Emacs Manual}). This is not done if the options @samp{-q}, + was specified, Emacs looks for the init file in that user's home + directory instead. + ++@item ++It loads the library @file{early-default}, if it exists. This is not done ++if @code{inhibit-early-default-init} is non-@code{nil}, nor if the options ++@samp{-q}, @samp{-Q}, or @samp{--batch} were specified. This behavior is ++Nixpkgs-specific. ++@cindex @file{early-default.el} ++ + @item + It calls the function @code{package-activate-all} to activate any + optional Emacs Lisp package that has been installed. @xref{Packaging +@@ -358,7 +365,8 @@ Do not initialize any display; just start a server. + + @item --no-init-file + @itemx -q +-Do not load either the init file, or the @file{default} library. ++Do not load either the init file, or the @file{default} and ++@file{early-default} libraries. + + @item --no-site-file + Do not load the @file{site-start} library. +@@ -428,6 +436,13 @@ to a non-@code{nil} value, then Emacs does not subsequently load the + (or @samp{-Q}), Emacs loads neither your personal init file nor + the default init file. + ++@cindex early default init file ++ An Emacs installation may also have an @dfn{early default init file}, ++which is a Lisp library named @file{early-default.el}. It is similar to ++the default init file except that it is loaded after the early init file ++and is controlled by @code{inhibit-early-default-init}. This behavior ++is Nixpkgs-specific. ++ + Another file for site-customization is @file{site-start.el}. Emacs + loads this @emph{before} the user's init file. You can inhibit the + loading of this file with the option @samp{--no-site-file}. +@@ -449,6 +464,12 @@ If this variable is non-@code{nil}, it prevents Emacs from loading the + default initialization library file. The default value is @code{nil}. + @end defopt + ++@defopt inhibit-early-default-init ++If this variable is non-@code{nil}, it prevents Emacs from loading the ++early default initialization library file. The default value is @code{nil}. ++This is Nixpkgs-specific. ++@end defopt ++ + @defvar before-init-hook + This normal hook is run, once, just before loading all the init files + (@file{site-start.el}, your init file, and @file{default.el}). +--- a/lisp/startup.el ++++ b/lisp/startup.el +@@ -101,6 +101,12 @@ startup message unless he personally acts to inhibit it." + :type '(choice (const :tag "Don't inhibit") + (string :tag "Enter your user name, to inhibit"))) + ++(defcustom inhibit-early-default-init nil ++ "Non-nil inhibits loading the `early-default' library. ++ ++This behavior is Nixpkgs-specific." ++ :type 'boolean) ++ + (defcustom inhibit-default-init nil + "Non-nil inhibits loading the `default' library." + :type 'boolean) +@@ -1540,6 +1546,10 @@ please check its value") + startup-init-directory))) + (setq early-init-file user-init-file) + ++ (when (and init-file-user ++ (not inhibit-early-default-init)) ++ (load "early-default" 'noerror 'nomessage)) ++ + ;; Amend `native-comp-eln-load-path', since the early-init file may + ;; have altered `user-emacs-directory' and/or changed the eln-cache + ;; directory. +-- +2.53.0 + diff --git a/pkgs/applications/editors/emacs/make-emacs.nix b/pkgs/applications/editors/emacs/make-emacs.nix index 7178b8931ca5..1a650a3b2af6 100644 --- a/pkgs/applications/editors/emacs/make-emacs.nix +++ b/pkgs/applications/editors/emacs/make-emacs.nix @@ -162,6 +162,9 @@ stdenv.mkDerivation (finalAttrs: { patches = patches fetchpatch + ++ [ + ./load-the-early-default-library-after-early-init.el.patch + ] ++ lib.optionals withNativeCompilation [ (replaceVars ./native-comp-driver-options-30.patch { backendPath = ( @@ -463,9 +466,8 @@ stdenv.mkDerivation (finalAttrs: { | xargs -n $((1000/NIX_BUILD_CORES + 1)) -P $NIX_BUILD_CORES \ $out/bin/emacs --batch -l comp --eval "(while argv \ (comp-trampoline-compile (intern (pop argv))))" - mkdir -p $out/share/emacs/native-lisp $out/bin/emacs --batch \ - --eval "(add-to-list 'native-comp-eln-load-path \"$out/share/emacs/native-lisp\")" \ + --eval "(add-to-list 'native-comp-eln-load-path \"$out/lib/emacs/$siteVersionDir/native-lisp\")" \ -f batch-native-compile $out/share/emacs/site-lisp/site-start.el ''; diff --git a/pkgs/applications/editors/emacs/sources.nix b/pkgs/applications/editors/emacs/sources.nix index 1e00137cb90c..f7cddf1c9cb2 100644 --- a/pkgs/applications/editors/emacs/sources.nix +++ b/pkgs/applications/editors/emacs/sources.nix @@ -146,14 +146,9 @@ in pname = "emacs-mac"; version = "30.2.50"; variant = "macport"; - rev = "emacs-mac-30.2"; - hash = "sha256-i/W2Xa6Vk1+T1fs6fa4wJVMLLB6BK8QAPcdmPrU8NwM="; + rev = "emacs-mac-30.2.1"; + hash = "sha256-KFgQZBW0QRX0k4k8gkVuGhNTfxArOH1+rwUzsmyEuss="; patches = fetchpatch: [ - (fetchpatch { - name = "fix-off-by-one-mistake-80851-CVE-2026-6861.patch"; - url = "https://cgit.git.savannah.gnu.org/cgit/emacs.git/patch/?id=8f535370b9efbc91673b20c6987a5cae4f6dc562"; - hash = "sha256-ny44eIi8DUa9pQhVGzhGz4H6FXU4+ki86SITLXhkwpw="; - }) (fetchpatch { # tree-sitter 0.26 compatibility fix, see https://bugs.gentoo.org/970856 url = "https://gitweb.gentoo.org/proj/emacs-patches.git/plain/emacs/30.2/01_all_treesit-0.26.patch?id=d0f47979806d9be5a190fdb4ffa1bde439b2d616"; diff --git a/pkgs/applications/editors/jetbrains/ides/clion.nix b/pkgs/applications/editors/jetbrains/ides/clion.nix index 5b6885bb4614..547e4878df21 100644 --- a/pkgs/applications/editors/jetbrains/ides/clion.nix +++ b/pkgs/applications/editors/jetbrains/ides/clion.nix @@ -21,20 +21,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.tar.gz"; - hash = "sha256-Q3LOhpwpU6vrPWEzA+s2ZnbRxo+EeodBUHUYs3Xikrs="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4.tar.gz"; + hash = "sha256-uOhFuDqVw3pxtqBvOQH+FpJTFrneaD/R0VcpJZRYD2o="; }; aarch64-linux = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.tar.gz"; - hash = "sha256-YM105ozP78oLDmwKL0t4Z4wGjCDh6xvhf/C1oCD6Qi8="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2.dmg"; - hash = "sha256-UEkYDJBjRvvUUB2UFsc37kdp/i+1ctqULSKs62/t9/I="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.tar.gz"; + hash = "sha256-I6IKQng4lNtRlQIq08K5bueqgKI/q1awX4EuRnyAnOk="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/cpp/CLion-2026.1.2-aarch64.dmg"; - hash = "sha256-scMwDF+mIfx/66cBrvdxp+gU3+qA2sUWqoGCEhPItjE="; + url = "https://download.jetbrains.com/cpp/CLion-2026.1.4-aarch64.dmg"; + hash = "sha256-i3stX7dyRgSOJkFTMD9/hkw6e2mGNqn13S7X/vJ66RQ="; }; }; # update-script-end: urls @@ -48,8 +44,8 @@ in product = "CLion"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.148"; + version = "2026.1.4"; + buildNumber = "261.26222.59"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/datagrip.nix b/pkgs/applications/editors/jetbrains/ides/datagrip.nix index dfe4ed7f7d3f..81c7b8d92a09 100644 --- a/pkgs/applications/editors/jetbrains/ides/datagrip.nix +++ b/pkgs/applications/editors/jetbrains/ides/datagrip.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.tar.gz"; hash = "sha256-G+tinD/+qM5HVR4u2E0cNXtdVsbwgK8/PdZ3ic6hf4M="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3.dmg"; - hash = "sha256-vW2LEonl0D9S0VxbeJX4jRrwhELGBwlOXwiHslvh06E="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/datagrip/datagrip-2026.1.3-aarch64.dmg"; hash = "sha256-Kyt3fYPXzwTVxPFVKd+atiHWb/i7gjGahz1MJ4iXxy8="; diff --git a/pkgs/applications/editors/jetbrains/ides/dataspell.nix b/pkgs/applications/editors/jetbrains/ides/dataspell.nix index 18dd09b48cf9..a9435844c443 100644 --- a/pkgs/applications/editors/jetbrains/ides/dataspell.nix +++ b/pkgs/applications/editors/jetbrains/ides/dataspell.nix @@ -21,10 +21,6 @@ let url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.tar.gz"; hash = "sha256-SSmIPF0pDMolxeXL21UaHMbZdtYbChWVxTKZOsPhH+I="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/dataspell-2026.1.2.dmg"; - hash = "sha256-2qzwzGMYuy1qEuTprxwNa5gOPgCZq2MadSKN8FT8w8c="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/python/dataspell-2026.1.2-aarch64.dmg"; hash = "sha256-MGWufS0nlswdqhACNQWtlXJwfPiYw8wUx7olIxPS15k="; diff --git a/pkgs/applications/editors/jetbrains/ides/gateway.nix b/pkgs/applications/editors/jetbrains/ides/gateway.nix index 56370da57946..28f722fed168 100644 --- a/pkgs/applications/editors/jetbrains/ides/gateway.nix +++ b/pkgs/applications/editors/jetbrains/ides/gateway.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.tar.gz"; hash = "sha256-CSe04BBo4jS1cIhu4NfZqaSHMaNue2eFUPa+1gOxuoo="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3.dmg"; - hash = "sha256-WKwIP19y5EKO98JgEm468ofaRp/JO5z8lqNhtpsH4tY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-2026.1.3-aarch64.dmg"; hash = "sha256-AHY/lY0ARkW0VoSgy0t7LLNXA965PLooWBSWxBKBV5M="; diff --git a/pkgs/applications/editors/jetbrains/ides/goland.nix b/pkgs/applications/editors/jetbrains/ides/goland.nix index fe92428cd2a8..b19fd343d896 100644 --- a/pkgs/applications/editors/jetbrains/ides/goland.nix +++ b/pkgs/applications/editors/jetbrains/ides/goland.nix @@ -12,20 +12,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/go/goland-2026.1.2.tar.gz"; - hash = "sha256-1FkDEaapyDbTPe4soOdyCHLkp/UT3rZ6siGyGyjmGJo="; + url = "https://download.jetbrains.com/go/goland-2026.1.4.tar.gz"; + hash = "sha256-pHSbmAZ+tSfa0wdtDp/3Ib/GNMP30OFNQlHWUfMwrW0="; }; aarch64-linux = { - url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.tar.gz"; - hash = "sha256-E8WpA4s/ePEDAs47IPC0v10C1VKl9UYU7VNX/5igpm4="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.2.dmg"; - hash = "sha256-iWYTMImwzMh9KSJgek8a84o/KlLWBaOj80vKlB8Ftes="; + url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.tar.gz"; + hash = "sha256-7s98kY08aKjdRGQLDkffeVhgj1FWurLmTTYmtb5Qx6c="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/go/goland-2026.1.2-aarch64.dmg"; - hash = "sha256-TFnEMq7u51UvtaOjnxS+abJhsR3aSnaQjNFfF8EQrcQ="; + url = "https://download.jetbrains.com/go/goland-2026.1.4-aarch64.dmg"; + hash = "sha256-y7mEke0z0MvQs+kMtrmrq7EeAtJUbgo6sGZrOB0MraM="; }; }; # update-script-end: urls @@ -39,8 +35,8 @@ in product = "Goland"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.154"; + version = "2026.1.4"; + buildNumber = "261.26222.72"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/idea.nix b/pkgs/applications/editors/jetbrains/ides/idea.nix index bf9dbdae54be..3367506afa51 100644 --- a/pkgs/applications/editors/jetbrains/ides/idea.nix +++ b/pkgs/applications/editors/jetbrains/ides/idea.nix @@ -15,20 +15,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.tar.gz"; - hash = "sha256-pvBJcW2h0J2eDsFQDGC/AaX/ig/iQZF43R/y/bK3dWM="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4.tar.gz"; + hash = "sha256-MQTYXZUH/4ggZeP465UGQCtKgSkJLSaCZiu26cTwY/w="; }; aarch64-linux = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.tar.gz"; - hash = "sha256-dlnnkWCSM8Pmv2fBv8yG9foRdkd8pYFa5hJbDq6EqIs="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3.dmg"; - hash = "sha256-Sv6A37Y5yIkaE+qnFEGDBq/q9fSSSZPjJC59NB2Fsns="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.tar.gz"; + hash = "sha256-MDZFuLrUxcCIc0Zhi4QhgKPeU7Pgs9oJ/FxQH1n3gBM="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/idea/ideaIU-2026.1.3-aarch64.dmg"; - hash = "sha256-LRyg2DLmTgChdFKR8NMGGjWDZTAWnjQpoTp3NIBvYrI="; + url = "https://download.jetbrains.com/idea/ideaIU-2026.1.4-aarch64.dmg"; + hash = "sha256-XIBK/+Lxaz9dX+Lxl7HXsl+Z3Z7GBzSuDxNssb/4A2s="; }; }; # update-script-end: urls @@ -43,8 +39,8 @@ mkJetBrainsProduct { productShort = "IDEA"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.95"; + version = "2026.1.4"; + buildNumber = "261.26222.65"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/mps.nix b/pkgs/applications/editors/jetbrains/ides/mps.nix index 52e18be29bcd..691bd0f94179 100644 --- a/pkgs/applications/editors/jetbrains/ides/mps.nix +++ b/pkgs/applications/editors/jetbrains/ides/mps.nix @@ -19,10 +19,6 @@ let url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3.tar.gz"; hash = "sha256-xAI+UrTheCTWHSdoI4YZvhTlrlc121M+OVFkfzd7a3k="; }; - x86_64-darwin = { - url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos.dmg"; - hash = "sha256-whYAjKkF79mrknHflZnvOOy2bLosYUguelZDSuPt3uY="; - }; aarch64-darwin = { url = "https://download.jetbrains.com/mps/2025.3/MPS-2025.3-macos-aarch64.dmg"; hash = "sha256-3HnEHOhRRI9IYjBhc5FO7h5j4jBBDtZTVkmO/S1fBEQ="; diff --git a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix index a034954c8e1e..b76837caa81b 100644 --- a/pkgs/applications/editors/jetbrains/ides/phpstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/phpstorm.nix @@ -12,20 +12,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.tar.gz"; - hash = "sha256-hXb2KcCaNKIJOGbN0ZUDxMKuX++dO1FRoxvC580VIHQ="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4.tar.gz"; + hash = "sha256-SF25D7dDn7b6AzcXEDLKwhpjTnCqYz1fEmvND5dl8Is="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.tar.gz"; - hash = "sha256-+As41qcyCvAICIttMEi30b8mBTZoWKK4rjxjkVx4TXs="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3.dmg"; - hash = "sha256-Q9m/XIgDg4F4yH0P35IaInk/se5CXqewvp248VqA4uc="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.tar.gz"; + hash = "sha256-T9q3/nxv/AA6y7CHWtOhUibR7bnKN8OZmfN3NWYTsIQ="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.3-aarch64.dmg"; - hash = "sha256-Yo50EhVQDg7c/C3JZ9utZxpsOY0DuZfgYzYtBN9Nmwk="; + url = "https://download.jetbrains.com/webide/PhpStorm-2026.1.4-aarch64.dmg"; + hash = "sha256-XGcfEWHHeLugvkT/WlQDsVRN33F46b1PCNhINQitqSY="; }; }; # update-script-end: urls @@ -39,8 +35,8 @@ mkJetBrainsProduct { product = "PhpStorm"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.104"; + version = "2026.1.4"; + buildNumber = "261.26222.71"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/pycharm.nix b/pkgs/applications/editors/jetbrains/ides/pycharm.nix index e972abdd1633..452f73600373 100644 --- a/pkgs/applications/editors/jetbrains/ides/pycharm.nix +++ b/pkgs/applications/editors/jetbrains/ides/pycharm.nix @@ -13,20 +13,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.2.tar.gz"; - hash = "sha256-kcd1vhb7CFn5sY69RW2I4THK3zN7DOn52O0YeIZWGWY="; + url = "https://download.jetbrains.com/python/pycharm-2026.1.4.tar.gz"; + hash = "sha256-RIufgZhg/n+D1uEdcDyYRjTDfh8Jicyz4h0B1kTbVXs="; }; aarch64-linux = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.tar.gz"; - hash = "sha256-5rTyUmevreBL5nZPa7FuodFhWcrjSQ+7T1jMFo7P/uM="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.2.dmg"; - hash = "sha256-Fej8KylKSFKVxCMrBAcUIDwb0v5B5r1RysMAvcBVgh8="; + url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.tar.gz"; + hash = "sha256-71FbYpN0seJ5k/yZA7aoXgU4W/N1BhjtKl7W7Hic9UE="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/python/pycharm-2026.1.2-aarch64.dmg"; - hash = "sha256-oau/wa9spYnn7XE07NGsINyqof3Mu9t9WQLuPAQ4TDc="; + url = "https://download.jetbrains.com/python/pycharm-2026.1.4-aarch64.dmg"; + hash = "sha256-qxSgp8r4S0KXjCCTIoAiEZFCn3uBE/0pWLLA6td0Fq0="; }; }; # update-script-end: urls @@ -40,8 +36,8 @@ in product = "PyCharm"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.152"; + version = "2026.1.4"; + buildNumber = "261.26222.68"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/rider.nix b/pkgs/applications/editors/jetbrains/ides/rider.nix index df8d35ea2f20..d787cbecf590 100644 --- a/pkgs/applications/editors/jetbrains/ides/rider.nix +++ b/pkgs/applications/editors/jetbrains/ides/rider.nix @@ -24,20 +24,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.tar.gz"; - hash = "sha256-OmysaGXGMxxAAa2qrHvX8yXIwJLU7tKG8/EBGhr55EA="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4.tar.gz"; + hash = "sha256-K+X2M4idv+oDqC/dkbzMTX3W3zx0b0e8ZTsxkP7rAfI="; }; aarch64-linux = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.tar.gz"; - hash = "sha256-xcwd4OgobMXFQ2W+SN6O5I3mud4kedVQ/0rZBWbXIGY="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2.dmg"; - hash = "sha256-uoOP+EYB11M99MlAFF7efZSKmCk0fwjCImFiasUQPUw="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.tar.gz"; + hash = "sha256-GXmyBrqxUpwK4djjwllvK+pnfktDrDHpLJKoe4D2xFo="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.2-aarch64.dmg"; - hash = "sha256-Mo6gxWatX6wlL3s8Li19F58cnKZtOtFUfNyGPrC6CtA="; + url = "https://download.jetbrains.com/rider/JetBrains.Rider-2026.1.4-aarch64.dmg"; + hash = "sha256-cfwT22BN1jzKZzrZHMQqYFJPGuRwta/sqoOJOp+PfBE="; }; }; # update-script-end: urls @@ -51,8 +47,8 @@ in product = "Rider"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.190"; + version = "2026.1.4"; + buildNumber = "261.26222.60"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix index 807fe17c4e06..b99a31ccb041 100644 --- a/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix +++ b/pkgs/applications/editors/jetbrains/ides/ruby-mine.nix @@ -12,20 +12,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.tar.gz"; - hash = "sha256-0KF/IEVRT8kgHpULEmqMy9gOf06IIDA4vEV3RujjQoE="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4.tar.gz"; + hash = "sha256-0EhtU4XKWI9i7ij+m5uvxHSYnbQaYJy8Sa6S1OW4CFU="; }; aarch64-linux = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.tar.gz"; - hash = "sha256-kiuRp9JhdS0aUFPX1brI1T9ik/iWhglIckHvv4bdPWk="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3.dmg"; - hash = "sha256-UjpwMCXhI+bMOvyyEbRBoNW3GGCDpi7aF6hUxffW/h0="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.tar.gz"; + hash = "sha256-oSu19pkGVWt31vWBdAffSZsu4QzsUznVbUSwDy98nug="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.3-aarch64.dmg"; - hash = "sha256-lqa3L+rBiEH/hPmFcevWBumvvyBBzoUR3ttvA8s0uT0="; + url = "https://download.jetbrains.com/ruby/RubyMine-2026.1.4-aarch64.dmg"; + hash = "sha256-4wEnwcPRtwp0wxePUMiLow6sMxirwndRMdmJL8LBh9k="; }; }; # update-script-end: urls @@ -39,8 +35,8 @@ mkJetBrainsProduct { product = "RubyMine"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.97"; + version = "2026.1.4"; + buildNumber = "261.26222.67"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix index 9f73dc336a5d..6e4312187c31 100644 --- a/pkgs/applications/editors/jetbrains/ides/rust-rover.nix +++ b/pkgs/applications/editors/jetbrains/ides/rust-rover.nix @@ -18,20 +18,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.tar.gz"; - hash = "sha256-INIz7nGar/oHh+CHfz4jm5t9/ARPcMfpnOl99Z3kg3I="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4.tar.gz"; + hash = "sha256-8x/AP6uKSVJavwjA9tYT1IM1xVspOZZzwmcwpGloIcw="; }; aarch64-linux = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.tar.gz"; - hash = "sha256-PmCDYM8nqySQm6cpUJQ9PyzSkKOR6V3LuXnYpE0i7fU="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2.dmg"; - hash = "sha256-HI2qt6wTddANqdRuKQ4X7mXQyBA4dJYz9ewfI2iAYfw="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.tar.gz"; + hash = "sha256-KpF3jCnLKCEeEXkBdB8ZsPPqP9FOVRTwRV/FQLKyh1Q="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.2-aarch64.dmg"; - hash = "sha256-JMg/vs3aVeHmr6tiZZTggRGpH9O6lKlyeP8Ot4mm24w="; + url = "https://download.jetbrains.com/rustrover/RustRover-2026.1.4-aarch64.dmg"; + hash = "sha256-Hly4NBv9mg/RMmxCM6m9w5eS/CQ7ycxp7V2VQZwyGQE="; }; }; # update-script-end: urls @@ -45,8 +41,8 @@ in product = "RustRover"; # update-script-start: version - version = "2026.1.2"; - buildNumber = "261.24374.182"; + version = "2026.1.4"; + buildNumber = "261.26222.73"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/ides/webstorm.nix b/pkgs/applications/editors/jetbrains/ides/webstorm.nix index 637302db7639..6e28014f825b 100644 --- a/pkgs/applications/editors/jetbrains/ides/webstorm.nix +++ b/pkgs/applications/editors/jetbrains/ides/webstorm.nix @@ -12,20 +12,16 @@ let # update-script-start: urls urls = { x86_64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3.tar.gz"; - hash = "sha256-lryIoVxoytyDyfgjnobQ3e94wIIohmIKL88fwf2I49w="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4.tar.gz"; + hash = "sha256-BPuMTwZ3Xkk4SBRCdgZ8vCoEYjhTa3d8CFOqrGlcGg0="; }; aarch64-linux = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3-aarch64.tar.gz"; - hash = "sha256-oZQaxpVV0O4WlDE6Ia+KzHIF0SfWQBubBFIopSRMbvE="; - }; - x86_64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3.dmg"; - hash = "sha256-KUcQRWYUD/+4HHWnkGuqoltqL2an0WQkUEfUcttwjCI="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.tar.gz"; + hash = "sha256-f9KenMq1gtldzpBraSBwOb/186WQwh1ps5Ypj5JoOU0="; }; aarch64-darwin = { - url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.3-aarch64.dmg"; - hash = "sha256-1N1RtN1QLvuJ1QL8jbN5TdbOHAHSN84W9XEK2PEPijI="; + url = "https://download.jetbrains.com/webstorm/WebStorm-2026.1.4-aarch64.dmg"; + hash = "sha256-ZYen6Ew0GYbBAmuGCDACPBsygxZ6sT787o6gqF9DJzw="; }; }; # update-script-end: urls @@ -39,8 +35,8 @@ mkJetBrainsProduct { product = "WebStorm"; # update-script-start: version - version = "2026.1.3"; - buildNumber = "261.25134.101"; + version = "2026.1.4"; + buildNumber = "261.26222.58"; # update-script-end: version src = fetchurl (urls.${system} or (throw "Unsupported system: ${system}")); diff --git a/pkgs/applications/editors/jetbrains/readme.md b/pkgs/applications/editors/jetbrains/readme.md index 0ed0a67d4fd5..c890021090e9 100644 --- a/pkgs/applications/editors/jetbrains/readme.md +++ b/pkgs/applications/editors/jetbrains/readme.md @@ -78,7 +78,5 @@ Any comments or other manual changes between these markers will be removed when - on `aarch64-linux`: - from source build - see if build (binary or source) works without expat - - on `x86_64-darwin`: - - from source build - on `aarch64-darwin`: - from source build diff --git a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py index 0449427e945f..d2c202c13fcf 100644 --- a/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py +++ b/pkgs/applications/editors/jetbrains/updater/jetbrains_nix_updater/config.py @@ -3,7 +3,7 @@ import os import dataclasses from pathlib import Path -SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "x86_64-darwin", "aarch64-darwin"] +SUPPORTED_SYSTEMS = ["x86_64-linux", "aarch64-linux", "aarch64-darwin"] def find_nixpkgs(current_path: Path) -> Path: diff --git a/pkgs/applications/editors/jetbrains/updater/updateInfo.json b/pkgs/applications/editors/jetbrains/updater/updateInfo.json index a64e1af94fcd..41f9f5b8ddd1 100644 --- a/pkgs/applications/editors/jetbrains/updater/updateInfo.json +++ b/pkgs/applications/editors/jetbrains/updater/updateInfo.json @@ -4,7 +4,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/cpp/CLion-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/cpp/CLion-{version}-aarch64.dmg" } }, @@ -13,7 +12,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/datagrip/datagrip-{version}-aarch64.dmg" } }, @@ -22,7 +20,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/dataspell-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/dataspell-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/dataspell-{version}-aarch64.dmg" } }, @@ -31,7 +28,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/gateway/JetBrainsGateway-{version}-aarch64.dmg" } }, @@ -40,7 +36,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/go/goland-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/go/goland-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/go/goland-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/go/goland-{version}-aarch64.dmg" } }, @@ -49,7 +44,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/idea/ideaIU-{version}-aarch64.dmg" } }, @@ -62,7 +56,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos.dmg", "aarch64-darwin": "https://download.jetbrains.com/mps/{versionMajorMinor}/MPS-{version}-macos-aarch64.dmg" } }, @@ -71,7 +64,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webide/PhpStorm-{version}-aarch64.dmg" } }, @@ -80,7 +72,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/python/pycharm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/python/pycharm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/python/pycharm-{version}-aarch64.dmg" } }, @@ -93,7 +84,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rider/JetBrains.Rider-{version}-aarch64.dmg" } }, @@ -102,7 +92,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/ruby/RubyMine-{version}-aarch64.dmg" } }, @@ -111,7 +100,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/rustrover/RustRover-{version}-aarch64.dmg" } }, @@ -120,7 +108,6 @@ "urls": { "x86_64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}.tar.gz", "aarch64-linux": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.tar.gz", - "x86_64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}.dmg", "aarch64-darwin": "https://download.jetbrains.com/webstorm/WebStorm-{version}-aarch64.dmg" } } diff --git a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix index ee081737e355..af56ba9147eb 100644 --- a/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/clojupyter/default.nix @@ -13,7 +13,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel clojupyter.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.clojure = clojupyter.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.clojure = clojupyter.definition; }) ]' -c jupyter-notebook let cljdeps = import ./deps.nix { inherit pkgs; }; diff --git a/pkgs/applications/editors/jupyter-kernels/octave/default.nix b/pkgs/applications/editors/jupyter-kernels/octave/default.nix index 74ea3d9b60f5..f4b9202b8109 100644 --- a/pkgs/applications/editors/jupyter-kernels/octave/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/octave/default.nix @@ -12,7 +12,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel octave-kernel.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.octave = octave-kernel.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.octave = octave-kernel.definition; }) ]' -c jupyter-notebook let kernel = callPackage ./kernel.nix { diff --git a/pkgs/applications/editors/jupyter-kernels/r-ark/default.nix b/pkgs/applications/editors/jupyter-kernels/r-ark/default.nix new file mode 100644 index 000000000000..2c7a6be07046 --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/r-ark/default.nix @@ -0,0 +1,31 @@ +{ ark }: + +# Jupyter notebook: +# nix shell --impure --expr 'with import ./. {}; [ (jupyter.override { definitions.r = r-ark-kernel.definition; }) ]' -c jupyter-notebook + +{ + definition = { + displayName = "Ark R Kernel"; + argv = [ + "${ark}/bin/ark" + "--connection_file" + "{connection_file}" + "--session-mode" + "notebook" + ]; + language = "R"; + # Ark logs at INFO to stderr by default, which includes Jupyter messages. + # The notebook forwards this to the cell output, so quiet it to warnings. + # + # The `ark::console::console_comm=error` directive additionally silences a + # per-cell "UI comm is absent during dispatch" warning: after every execute, + # ark unconditionally tries to push an environment-pane update over the + # Positron-only `positron.ui` comm, which a plain Jupyter frontend never + # opens. + env = { + RUST_LOG = "ark=warn,ark::console::console_comm=error"; + }; + logo32 = null; + logo64 = null; + }; +} diff --git a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix index 92ffdcb38e8a..89efbb9d041e 100644 --- a/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix +++ b/pkgs/applications/editors/jupyter-kernels/wolfram/default.nix @@ -7,7 +7,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel wolfram-for-jupyter-kernel.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.wolfram = wolfram-for-jupyter-kernel.definition; }) ]' -c jupyter-notebook let kernel = callPackage ./kernel.nix { }; diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch b/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch deleted file mode 100644 index dac0825b01a1..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0001-Fix-bug-in-extract_filename.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 8bfa594bc37630956f80496106bb1d6070035570 Mon Sep 17 00:00:00 2001 -From: thomasjm -Date: Wed, 2 Aug 2023 18:26:58 -0700 -Subject: [PATCH 1/3] Fix bug in extract_filename - ---- - src/main.cpp | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/main.cpp b/src/main.cpp -index 2ee19be..57294b4 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -61,19 +61,19 @@ bool should_print_version(int argc, char* argv[]) - return false; - } - --std::string extract_filename(int argc, char* argv[]) -+std::string extract_filename(int *argc, char* argv[]) - { - std::string res = ""; -- for (int i = 0; i < argc; ++i) -+ for (int i = 0; i < *argc; ++i) - { -- if ((std::string(argv[i]) == "-f") && (i + 1 < argc)) -+ if ((std::string(argv[i]) == "-f") && (i + 1 < *argc)) - { - res = argv[i + 1]; -- for (int j = i; j < argc - 2; ++j) -+ for (int j = i; j < *argc - 2; ++j) - { - argv[j] = argv[j + 2]; - } -- argc -= 2; -+ *argc -= 2; - break; - } - } -@@ -128,7 +128,7 @@ int main(int argc, char* argv[]) - #endif - signal(SIGINT, stop_handler); - -- std::string file_name = extract_filename(argc, argv); -+ std::string file_name = extract_filename(&argc, argv); - - interpreter_ptr interpreter = build_interpreter(argc, argv); - --- -2.40.1 - diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch b/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch deleted file mode 100644 index c07e57dfe85d..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0002-Don-t-pass-extra-includes-configure-this-with-flags.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 9e6a14bb20567071883563dafb5dfaf512df6243 Mon Sep 17 00:00:00 2001 -From: thomasjm -Date: Wed, 2 Aug 2023 18:27:16 -0700 -Subject: [PATCH 2/3] Don't pass extra includes; configure this with flags - ---- - src/main.cpp | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/main.cpp b/src/main.cpp -index 57294b4..0041a55 100644 ---- a/src/main.cpp -+++ b/src/main.cpp -@@ -84,7 +84,7 @@ using interpreter_ptr = std::unique_ptr; - - interpreter_ptr build_interpreter(int argc, char** argv) - { -- int interpreter_argc = argc + 1; -+ int interpreter_argc = argc; - const char** interpreter_argv = new const char*[interpreter_argc]; - interpreter_argv[0] = "xeus-cling"; - // Copy all arguments in the new array excepting the process name. -@@ -92,8 +92,6 @@ interpreter_ptr build_interpreter(int argc, char** argv) - { - interpreter_argv[i] = argv[i]; - } -- std::string include_dir = std::string(LLVM_DIR) + std::string("/include"); -- interpreter_argv[interpreter_argc - 1] = include_dir.c_str(); - - interpreter_ptr interp_ptr = interpreter_ptr(new xcpp::interpreter(interpreter_argc, interpreter_argv)); - delete[] interpreter_argv; --- -2.40.1 - diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0003-Remove-unsupported-src-root-flag.patch b/pkgs/applications/editors/jupyter-kernels/xeus-cling/0003-Remove-unsupported-src-root-flag.patch deleted file mode 100644 index 8a44919e47d5..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/0003-Remove-unsupported-src-root-flag.patch +++ /dev/null @@ -1,85 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 43718f5..d0d8670 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -63,8 +63,7 @@ if(LLVM_CONFIG) - "--bindir" - "--libdir" - "--includedir" -- "--prefix" -- "--src-root") -+ "--prefix") - execute_process(COMMAND ${CONFIG_COMMAND} - RESULT_VARIABLE HAD_ERROR - OUTPUT_VARIABLE CONFIG_OUTPUT) -diff --git a/src/xmagics/executable.cpp b/src/xmagics/executable.cpp -index 391c8c9..aba5e03 100644 ---- a/src/xmagics/executable.cpp -+++ b/src/xmagics/executable.cpp -@@ -12,6 +12,7 @@ - #include - #include - #include -+#include - #include - #include - -@@ -25,7 +26,7 @@ - #include "clang/AST/ASTContext.h" - #include "clang/AST/DeclGroup.h" - #include "clang/AST/RecursiveASTVisitor.h" --#include "clang/Basic/DebugInfoOptions.h" -+#include "llvm/Frontend/Debug/Options.h" - #include "clang/Basic/Sanitizers.h" - #include "clang/Basic/TargetInfo.h" - #include "clang/CodeGen/BackendUtil.h" -@@ -115,7 +116,7 @@ namespace xcpp - // Filter out functions added by Cling. - if (auto Identifier = D->getIdentifier()) - { -- if (Identifier->getName().startswith("__cling")) -+ if (Identifier->getName().starts_with("__cling")) - { - return true; - } -@@ -153,12 +154,13 @@ namespace xcpp - if (EnableDebugInfo) - { - CodeGenOpts.setDebugInfo( -- clang::codegenoptions::DebugInfoKind::FullDebugInfo); -+ llvm::codegenoptions::DebugInfoKind::FullDebugInfo); - } - - std::unique_ptr CG(clang::CreateLLVMCodeGen( -- CI->getDiagnostics(), "object", HeaderSearchOpts, -- CI->getPreprocessorOpts(), CodeGenOpts, *Context)); -+ CI->getDiagnostics(), "object", -+ llvm::IntrusiveRefCntPtr(&CI->getVirtualFileSystem()), -+ HeaderSearchOpts, CI->getPreprocessorOpts(), CodeGenOpts, *Context)); - CG->Initialize(AST); - - FindTopLevelDecls Visitor(CG.get()); -@@ -186,7 +188,9 @@ namespace xcpp - EmitBackendOutput(CI->getDiagnostics(), HeaderSearchOpts, - CodeGenOpts, CI->getTargetOpts(), - CI->getLangOpts(), DataLayout, CG->GetModule(), -- clang::Backend_EmitObj, std::move(OS)); -+ clang::Backend_EmitObj, -+ llvm::IntrusiveRefCntPtr(&CI->getVirtualFileSystem()), -+ std::move(OS)); - return true; - } - -@@ -222,10 +226,10 @@ namespace xcpp - - llvm::StringRef OutputFileStr(OutputFile); - llvm::StringRef ErrorFileStr(ErrorFile); -- llvm::SmallVector, 16> Redirects = {llvm::NoneType::None, OutputFileStr, ErrorFileStr}; -+ llvm::SmallVector, 16> Redirects = {std::nullopt, OutputFileStr, ErrorFileStr}; - - // Finally run the linker. -- int ret = llvm::sys::ExecuteAndWait(Compiler, Args, llvm::NoneType::None, -+ int ret = llvm::sys::ExecuteAndWait(Compiler, Args, std::nullopt, - Redirects); - - // Read back output and error streams. diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix deleted file mode 100644 index 9588900f6dc5..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/default.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - lib, - callPackage, - cling, - fetchurl, - jq, - makeWrapper, - python3, - stdenv, -}: - -# Jupyter console: -# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel cpp17-kernel' - -# Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions = { cpp17 = cpp17-kernel; }; }' - -let - xeus-cling-unwrapped = callPackage ./xeus-cling.nix { }; - - xeus-cling = xeus-cling-unwrapped.overrideAttrs (oldAttrs: { - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ makeWrapper ]; - - # xcpp needs a collection of flags to start up properly, so wrap it by default. - # We'll provide the unwrapped version as a passthru - flags = cling.flags ++ [ - "-resource-dir" - "${cling.unwrapped}" - "-L" - "${cling.unwrapped}/lib" - "-l" - "${cling.unwrapped}/lib/cling.so" - ]; - - fixupPhase = '' - runHook preFixup - - wrapProgram $out/bin/xcpp --add-flags "$flags" - - runHook postFixup - ''; - - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - - # Smoke check: run a test notebook using Papermill by creating a simple kernelspec - mkdir -p kernels/cpp17 - export JUPYTER_PATH="$(pwd)" - cat << EOF > kernels/cpp17/kernel.json - { - "argv": ["$out/bin/xcpp", "-std=c++17", "-f", "{connection_file}"], - "language": "cpp17" - } - EOF - - ${python3.pkgs.papermill}/bin/papermill ${./test.ipynb} out.ipynb - result="$(cat out.ipynb | ${jq}/bin/jq -r '.cells[0].outputs[0].text[0]')" - if [[ "$result" != "Hello world." ]]; then - echo "Kernel test gave '$result'. Expected: 'Hello world.'" - exit 1 - fi - - runHook postInstallCheck - ''; - - passthru = (oldAttrs.passthru or { }) // { - unwrapped = xeus-cling-unwrapped; - }; - }); - - mkKernelSpec = std: { - displayName = builtins.replaceStrings [ "c++" ] [ "C++ " ] std; - argv = [ - "${xeus-cling}/bin/xcpp" - "-std=${std}" - "-f" - "{connection_file}" - ]; - language = "cpp"; - logo32 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-32x32.png"; - logo64 = "${xeus-cling-unwrapped}/share/jupyter/kernels/xcpp17/logo-64x64.png"; - }; - -in - -{ - cpp11-kernel = mkKernelSpec "c++11"; - cpp14-kernel = mkKernelSpec "c++14"; - cpp17-kernel = mkKernelSpec "c++17"; - cpp2a-kernel = mkKernelSpec "c++2a"; - - inherit xeus-cling; -} diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/test.ipynb b/pkgs/applications/editors/jupyter-kernels/xeus-cling/test.ipynb deleted file mode 100644 index 27e5932b8c8f..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/test.ipynb +++ /dev/null @@ -1,24 +0,0 @@ -{ - "cells": [ - { - "cell_type": "code", - "execution_count": 1, - "id": "574ed398-7bfe-4a34-a7dd-9fa85535aed2", - "metadata": {}, - "outputs": [], - "source": [ - "#include \n", - "std::cout << \"Hello world.\";" - ] - } - ], - "metadata": { - "kernelspec": { - "display_name": "C++ 17", - "language": "cpp", - "name": "cpp17" - } - }, - "nbformat": 4, - "nbformat_minor": 5 -} diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix deleted file mode 100644 index 50ee8bbd685c..000000000000 --- a/pkgs/applications/editors/jupyter-kernels/xeus-cling/xeus-cling.nix +++ /dev/null @@ -1,112 +0,0 @@ -{ - lib, - clangStdenv, - cmake, - fetchFromGitHub, - llvmPackages_18, - # Libraries - argparse, - cling, - cppzmq, - libuuid, - ncurses, - openssl, - pugixml, - xeus, - xeus-zmq, - xtl, - zeromq, - zlib, - # Settings - debug ? false, -}: - -let - # Nixpkgs moved to argparse 3.x, but we need ~2.9 - argparse_2_9 = argparse.overrideAttrs (oldAttrs: { - version = "2.9"; - - src = fetchFromGitHub { - owner = "p-ranav"; - repo = "argparse"; - rev = "v2.9"; - sha256 = "sha256-vbf4kePi5gfg9ub4aP1cCK1jtiA65bUS9+5Ghgvxt/E="; - }; - }); - - # Nixpkgs moved to xeus 5.2.0, but we need 3.2.0 - # https://github.com/jupyter-xeus/xeus-cling/issues/523 - xeus_3_2_0 = xeus.overrideAttrs (oldAttrs: { - version = "3.2.0"; - - src = fetchFromGitHub { - owner = "jupyter-xeus"; - repo = "xeus"; - tag = "3.2.0"; - sha256 = "sha256-D/dJ0SHxTHJw63gHD6FRZS7O2TVZ0voIv2mQASEjLA8="; - }; - - buildInputs = oldAttrs.buildInputs ++ lib.singleton xtl; - }); - -in - -clangStdenv.mkDerivation (finalAttrs: { - pname = "xeus-cling"; - version = "0.15.3"; - - src = fetchFromGitHub { - owner = "QuantStack"; - repo = "xeus-cling"; - rev = "${finalAttrs.version}"; - hash = "sha256-OfZU+z+p3/a36GntusBfwfFu3ssJW4Fu7SV3SMCoo1I="; - }; - - patches = [ - ./0001-Fix-bug-in-extract_filename.patch - ./0002-Don-t-pass-extra-includes-configure-this-with-flags.patch - ./0003-Remove-unsupported-src-root-flag.patch - ]; - - nativeBuildInputs = [ cmake ]; - buildInputs = [ - argparse_2_9 - cling.unwrapped - cppzmq - libuuid - llvmPackages_18.llvm - ncurses - openssl - pugixml - xeus_3_2_0 - xeus-zmq - xtl - zeromq - zlib - ]; - - cmakeBuildType = if debug then "Debug" else "Release"; - - postPatch = '' - substituteInPlace src/xmagics/executable.cpp \ - --replace-fail "getDataLayout" "getDataLayoutString" - substituteInPlace src/xmagics/execution.cpp \ - --replace-fail "simplisticCastAs" "castAs" - substituteInPlace src/xmime_internal.hpp \ - --replace-fail "code.str()" "code.str().str()" - - substituteInPlace CMakeLists.txt \ - --replace-fail "cmake_minimum_required(VERSION 3.4.3)" "cmake_minimum_required(VERSION 3.10)" - ''; - - dontStrip = debug; - - meta = { - description = "Jupyter kernel for the C++ programming language"; - mainProgram = "xcpp"; - homepage = "https://github.com/jupyter-xeus/xeus-cling"; - maintainers = with lib.maintainers; [ thomasjm ]; - platforms = lib.platforms.unix; - license = lib.licenses.mit; - }; -}) diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cpp/default.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cpp/default.nix new file mode 100644 index 000000000000..c595cf1eee6a --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cpp/default.nix @@ -0,0 +1,37 @@ +{ + callPackage, +}: + +# Jupyter console: +# nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel cpp17-kernel' + +# Jupyter notebook: +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions = { cpp17 = cpp17-kernel; }; }) ]' -c jupyter-notebook + +let + xeus-cpp = callPackage ./xeus-cpp.nix { }; + + mkKernelSpec = std: { + displayName = builtins.replaceStrings [ "c++" ] [ "C++ " ] std; + argv = [ + "${xeus-cpp}/bin/xcpp" + "-std=${std}" + "-f" + "{connection_file}" + ]; + language = "cpp"; + logo32 = "${xeus-cpp}/share/jupyter/kernels/xcpp17/logo-32x32.png"; + logo64 = "${xeus-cpp}/share/jupyter/kernels/xcpp17/logo-64x64.png"; + }; + +in + +{ + cpp11-kernel = mkKernelSpec "c++11"; + cpp14-kernel = mkKernelSpec "c++14"; + cpp17-kernel = mkKernelSpec "c++17"; + cpp20-kernel = mkKernelSpec "c++20"; + cpp23-kernel = mkKernelSpec "c++23"; + + inherit xeus-cpp; +} diff --git a/pkgs/applications/editors/jupyter-kernels/xeus-cpp/xeus-cpp.nix b/pkgs/applications/editors/jupyter-kernels/xeus-cpp/xeus-cpp.nix new file mode 100644 index 000000000000..c0e415a4dcfd --- /dev/null +++ b/pkgs/applications/editors/jupyter-kernels/xeus-cpp/xeus-cpp.nix @@ -0,0 +1,183 @@ +{ + lib, + clangStdenv, + fetchFromGitHub, + cmake, + pkg-config, + + cpp-interop, + cling, + + # Jupyter / xeus stack + xeus, + xeus-zmq, + nlohmann_json, + argparse, + pugixml, + + # Runtime libs + zeromq, + openssl, + libuuid, + curl, + makeWrapper, + + # tests + doctest, + + # installCheck + python3, + jq, + + # "clang-repl" | "cling" + backend ? "clang-repl", +}: + +let + stdenv = clangStdenv; + + useCling = backend == "cling"; + cppInterop = cpp-interop.override { inherit backend; }; + + # xeus-cpp 0.10.0 needs newer xeus / xeus-zmq than nixpkgs ships by default. + xeus_6 = xeus.overrideAttrs (old: { + version = "6.0.5"; + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus"; + tag = "6.0.5"; + hash = "sha256-nbjq4dzrukVsZI6X3lWpr9oCZV5IUu/vkqSNKD7o3vo="; + }; + doCheck = false; + }); + + xeus_zmq_4 = (xeus-zmq.override { xeus = xeus_6; }).overrideAttrs (old: { + version = "4.0.0"; + src = fetchFromGitHub { + owner = "jupyter-xeus"; + repo = "xeus-zmq"; + tag = "4.0.0"; + hash = "sha256-Ux8klPh33XWFu9eu+GTk5ZcqIcoP/GM4/J1uaz9xRHI="; + }; + }); + + # The interpreter behind CppInterOp must be told where the C/C++ standard + # library and Clang builtin headers live: there is no system compiler to detect + # at runtime in the Nix sandbox. We pass this set via CppInterOp's runtime + # override env var. For the Cling backend cling.flags already carries it; for + # clang-repl we reuse the hermetic resource dir and include flags CppInterOp + # exposes. + resourceDir = if useCling then "${cling.unwrapped}/lib/clang/20" else cppInterop.resourceDir; + interpreterArgs = lib.concatStringsSep " " ( + if useCling then cling.flags else cppInterop.interpreterArgs + ); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "xeus-cpp"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "compiler-research"; + repo = "xeus-cpp"; + tag = finalAttrs.version; + hash = "sha256-r6ojIcebWzpP85Djl36EMucnfQQgjGJUakSbMYW+czs="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + cmake + pkg-config + makeWrapper + ]; + + buildInputs = [ + cppInterop + xeus_6 + xeus_zmq_4 + nlohmann_json + argparse + pugixml + zeromq + openssl + libuuid + curl + ]; + + cmakeFlags = [ + (lib.cmakeBool "XEUS_CPP_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + "-DXEUS_CPP_RESOURCE_DIR=${resourceDir}" + ]; + + # Make the kernel hermetic: hand the interpreter the include/resource flags it + # needs, since it cannot probe a system compiler in the sandbox. + postInstall = '' + wrapProgram $out/bin/xcpp \ + --set-default CPPINTEROP_EXTRA_INTERPRETER_ARGS "${interpreterArgs}" + + # xeus-cpp builds the kernelspec argv from CMAKE_INSTALL_PREFIX *and* the + # (absolute, under Nix) CMAKE_INSTALL_BINDIR, producing a doubled store path + # for xcpp. Point each kernel.json back at the wrapped binary. + for k in $out/share/jupyter/kernels/*/kernel.json; do + substituteInPlace "$k" --replace-fail "$out/$out/bin/xcpp" "$out/bin/xcpp" + done + ''; + + # Run the upstream doctest suite. Like the wrapped kernel, the test binary + # drives CppInterOp directly, so it needs the same hermetic interpreter args. + doCheck = true; + checkInputs = [ doctest ]; + checkPhase = '' + runHook preCheck + + export CPPINTEROP_EXTRA_INTERPRETER_ARGS="${interpreterArgs}" + # The test binary is linked with the install RPATH ($out/lib), which does not + # exist yet at check time; point it at the freshly built libxeus-cpp instead. + export LD_LIBRARY_PATH="$PWD''${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" + cmake --build . --target check-xeus-cpp + + runHook postCheck + ''; + + # Smoke test: drive the installed, wrapped kernel through Papermill and check + # it actually compiles and runs C++. + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + + export HOME=$(mktemp -d) + mkdir -p "$HOME/kernels/xcpp" + cat > "$HOME/kernels/xcpp/kernel.json" < "$HOME/test.ipynb" <<'NBEOF' + {"cells":[ + {"cell_type":"code","id":"a","metadata":{},"execution_count":null,"outputs":[],"source":["#include "]}, + {"cell_type":"code","id":"b","metadata":{},"execution_count":null,"outputs":[],"source":["std::cout << \"Hello world.\" << std::endl;"]} + ],"metadata":{"kernelspec":{"name":"xcpp","display_name":"C++","language":"cpp"}},"nbformat":4,"nbformat_minor":5} + NBEOF + + ${python3.pkgs.papermill}/bin/papermill "$HOME/test.ipynb" "$HOME/out.ipynb" --kernel xcpp + ${jq}/bin/jq -e '[.. | .text? // empty | tostring] | add | contains("Hello world.")' "$HOME/out.ipynb" + + runHook postInstallCheck + ''; + + passthru = { + inherit backend; + flags = interpreterArgs; + }; + + meta = { + description = "Jupyter kernel for C++ based on CppInterOp (${backend} backend)"; + mainProgram = "xcpp"; + homepage = "https://github.com/compiler-research/xeus-cpp"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/applications/editors/kakoune/plugins/overrides.nix b/pkgs/applications/editors/kakoune/plugins/overrides.nix index 054ad9cebd92..71537c1f51ac 100644 --- a/pkgs/applications/editors/kakoune/plugins/overrides.nix +++ b/pkgs/applications/editors/kakoune/plugins/overrides.nix @@ -47,13 +47,13 @@ self: super: { kak-ansi = stdenv.mkDerivation (finalAttrs: { pname = "kak-ansi"; - version = "0.2.4"; + version = "0.3.0"; src = fetchFromGitHub { owner = "eraserhd"; repo = "kak-ansi"; rev = "v${finalAttrs.version}"; - sha256 = "kFjTYFy0KF5WWEHU4hHFAnD/03/d3ptjqMMbTSaGImE="; + sha256 = "sha256-Tp+cKZxDESlpks6l+6J0H/1BvHyfQSqCxeutUcsZrEc="; }; installPhase = '' diff --git a/pkgs/applications/editors/neovim/tests/default.nix b/pkgs/applications/editors/neovim/tests/default.nix index 5bc2730da87b..c17957ffbe3a 100644 --- a/pkgs/applications/editors/neovim/tests/default.nix +++ b/pkgs/applications/editors/neovim/tests/default.nix @@ -204,23 +204,23 @@ pkgs.lib.recurseIntoAttrs rec { ${nvim_with_plug}/bin/nvim -V3log.txt -i NONE -c 'color base16-tomorrow-night' +quit! -e ''; - nvim_with_autoconfigure = pkgs.neovim.overrideAttrs { - plugins = [ - vimPlugins.unicode-vim - vimPlugins.fzf-hoogle-vim - ]; + nvim_with_autoconfigure = pkgs.neovim.override { + configure = { + packages.myPlugins.start = [ + vimPlugins.unicode-vim + vimPlugins.fzf-hoogle-vim + ]; + }; autoconfigure = true; - # legacy wrapper sets it to false - wrapRc = true; }; - nvim_with_runtimeDeps = pkgs.neovim.overrideAttrs { - plugins = [ - pkgs.vimPlugins.hex-nvim - ]; + nvim_with_runtimeDeps = pkgs.neovim.override { + configure = { + packages.myPlugins.start = [ + pkgs.vimPlugins.hex-nvim + ]; + }; autowrapRuntimeDeps = true; - # legacy wrapper sets it to false - wrapRc = true; }; nvim_with_ftplugin = diff --git a/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh b/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh index 24e8428ef483..abe16c805309 100644 --- a/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh +++ b/pkgs/applications/editors/neovim/to-nvim-treesitter-grammar.sh @@ -4,7 +4,11 @@ toNvimTreesitterGrammar() { echo "Executing toNvimTreesitterGrammar" mkdir -p "$out/parser" - ln -s "$origGrammar/parser" "$out/parser/$grammarName.so" + if [ -e "$origGrammar/parser.wasm" ]; then + ln -s "$origGrammar/parser.wasm" "$out/parser/$grammarName.wasm" + else + ln -s "$origGrammar/parser" "$out/parser/$grammarName.so" + fi if [ "$installQueries" != 1 ]; then echo "Installing queries is disabled: installQueries=$installQueries" diff --git a/pkgs/applications/editors/sublime/4/common.nix b/pkgs/applications/editors/sublime/4/common.nix index be77793c7964..e6422c8f370c 100644 --- a/pkgs/applications/editors/sublime/4/common.nix +++ b/pkgs/applications/editors/sublime/4/common.nix @@ -6,6 +6,7 @@ }: { + config, fetchurl, stdenv, lib, @@ -22,7 +23,6 @@ writeShellScript, common-updater-scripts, curl, - openssl_1_1, openssl_3_5, bzip2, sqlite, @@ -33,7 +33,6 @@ let packageAttribute = "sublime4${lib.optionalString dev "-dev"}"; binaries = [ "sublime_text" - "plugin_host-3.3" "plugin_host-3.${if lib.versionAtLeast buildVersion "4205" then "14" else "8"}" crashHandlerBinary ]; @@ -55,7 +54,6 @@ let libxtst glib libglvnd - openssl_1_1 gtk3 cairo pango @@ -88,6 +86,10 @@ let buildPhase = '' runHook preBuild + # Remove old plugin host because it depends on EOL openssl 1.1 + rm plugin_host-3.3 + echo '{"disable_plugin_host_3.3": true}' > Packages/Preferences.sublime-settings + for binary in ${builtins.concatStringsSep " " binaries}; do patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ @@ -221,11 +223,18 @@ stdenv.mkDerivation (finalAttrs: { demin-dmitriy zimbatm ]; + mainProgram = "subl"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.unfree; platforms = [ "aarch64-linux" "x86_64-linux" ]; + problems = { + removal.message = "We have removed Python 3.3 package support ahead of upstream schedule but if you do not use any old packages, this should just work."; + } + // lib.optionalAttrs (lib.versionOlder buildVersion "4205") { + broken.message = "Packages, including core ones, do not run without plug-in host depending on insecure OpenSSL."; + }; }; }) diff --git a/pkgs/applications/editors/sublime/4/packages.nix b/pkgs/applications/editors/sublime/4/packages.nix index 2b734a8f0c44..331ac8c65542 100644 --- a/pkgs/applications/editors/sublime/4/packages.nix +++ b/pkgs/applications/editors/sublime/4/packages.nix @@ -11,9 +11,9 @@ in } { }; sublime4-dev = common { - buildVersion = "4205"; + buildVersion = "4206"; dev = true; - x64sha256 = "1Tg8m4FNrVOeHK6VSmlua30pW4Bu7Gz+sT0t/w01UyM="; - aarch64sha256 = "K94UipUVZRh8xJKYW35be0u9L/VHpZ+FYhC26v41b3U="; + x64sha256 = "WZ+MfKnOYTTfVbyW2QRstkAOhAxEv4nXsxsQnnAeA6I="; + aarch64sha256 = "opMVWTGsPQSb/SpN4Cz9CC8jL42BaqO/da6uC++6t3o="; } { }; } diff --git a/pkgs/applications/editors/vim/common.nix b/pkgs/applications/editors/vim/common.nix index 05ac73b9f13e..f336ecbced79 100644 --- a/pkgs/applications/editors/vim/common.nix +++ b/pkgs/applications/editors/vim/common.nix @@ -4,7 +4,7 @@ stdenv, }: rec { - version = "9.2.0389"; + version = "9.2.0782"; outputs = [ "out" @@ -15,7 +15,7 @@ rec { owner = "vim"; repo = "vim"; rev = "v${version}"; - hash = "sha256-shhdJn1bPJ/68a54UZMn1fla7P4tjVUN4DGLbx3ohOg="; + hash = "sha256-D4IyDgl1JdmumDzO0uMg2LhoSnFUeqhcMJ6ImC17wzs="; }; enableParallelBuilding = true; diff --git a/pkgs/applications/editors/vim/plugins/aliases.nix b/pkgs/applications/editors/vim/plugins/aliases.nix index 7dc05270b5c0..423895d4e41b 100644 --- a/pkgs/applications/editors/vim/plugins/aliases.nix +++ b/pkgs/applications/editors/vim/plugins/aliases.nix @@ -55,7 +55,9 @@ mapAliases ( mind-nvim = throw "'vimPlugins.mind-nvim' has been removed: the upstream repository got deleted"; # Added 2026-05-03 minsnip-nvim = throw "'vimPlugins.minsnip-nvim' has been removed: the upstream repository got deleted"; # Added 2025-08-30 neuron-nvim = throw "'vimPlugins.neuron-nvim' has been removed: archived repository 2023-02-19"; # Added 2025-09-10 + null-ls-nvim = throw "'vimPlugins.null-ls-nvim' has been removed: upstream deleted repository. Use none-ls-nvim instead."; # Added 2026-06-15 nvim-gps = throw "'vimPlugins.nvim-gps' has been archived since 2022. Use nvim-navic instead."; # Added 2025-12-18 + nvim-lsp-ts-utils = throw "'vimPlugins.nvim-lsp-ts-utils' has been removed: upstream deleted repository"; # Added 2026-06-15 nvim-ts-rainbow = throw "'vimPlugins.nvim-ts-rainbow' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 nvim-ts-rainbow2 = throw "'vimPlugins.nvim-ts-rainbow2' has been deprecated: Use rainbow-delimiters-nvim"; # Added 2023-11-30 peskcolor-vim = throw "'vimPlugins.peskcolor-vim' has been removed: abandoned by upstream"; # Added 2024-08-23 @@ -69,8 +71,10 @@ mapAliases ( sparkup = throw "'vimPlugins.sparkup' was removed: the upstream repository got deleted"; # Added 2025-08-06 syntax-tree-surfer = throw "'vimPlugins.syntax-tree-surfer' has been archived"; # Added 2025-12-18 todo-nvim = throw "'vimPlugins.todo-nvim' has been removed: abandoned by upstream"; # Added 2023-08-23 + typescript-nvim = throw "'vimPlugins.typescript-nvim' has been removed: upstream deleted repository"; # Added 2026-06-15 vim-csharp = throw "'vimPlugins.vim-csharp' has been removed: repository deleted"; # Added 2026-05-12 vim-sourcetrail = throw "'vimPlugins.vim-sourcetrail' has been removed: abandoned by upstream"; # Added 2022-08-14 + vimacs = throw "'vimPlugins.vimacs' has been removed due to lack of maintenance"; # Added 2026-07-07 # keep-sorted end } // deprecations diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index 65faa0676f7c..899dacbf34a0 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -82,12 +82,12 @@ final: prev: { CopilotChat-nvim = buildVimPlugin { pname = "CopilotChat.nvim"; - version = "4.7.4-unstable-2026-06-02"; + version = "4.7.4-unstable-2026-06-17"; src = fetchFromGitHub { owner = "CopilotC-Nvim"; repo = "CopilotChat.nvim"; - rev = "2025f92022bef434de0511c5157a19974a9377a4"; - hash = "sha256-YyzJBoOVYefBlpck9O80BdPjQIlH6p5o6Ta2n9aWu4A="; + rev = "f0c2a23ab79dc295f5e0eef0d8b587a39020c852"; + hash = "sha256-jBxtWF4GNSXB+/xUnUWs0RzSXAkQKa5cd3mljTHuarw="; }; meta.homepage = "https://github.com/CopilotC-Nvim/CopilotChat.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -446,12 +446,12 @@ final: prev: { SchemaStore-nvim = buildVimPlugin { pname = "SchemaStore.nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "961c2a806abf56d4e100713ec9dc71d2c8d9d022"; - hash = "sha256-p4YkQeJybRAbZ2zwK39rm/0Q5iSJqYlhJde7bXV6J/Y="; + rev = "e520902f405da5f5ad392d32babad5b5dd5ffa44"; + hash = "sha256-zNXm/0W+Hv562zt6NxHnFuO2nBxjX5dlxS7pRB+KXQY="; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -628,12 +628,12 @@ final: prev: { YouCompleteMe = buildVimPlugin { pname = "YouCompleteMe"; - version = "0-unstable-2026-01-30"; + version = "0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "6a52780a22dfd4ddafbe23c0d2c2a2107ceeb397"; - hash = "sha256-/k9lIx9BVaTNu9Kqrz9Y6d+hTGsDnspmq0rcdJpZo7I="; + rev = "d4c91430b70a21ce471c8572400b647d313995b4"; + hash = "sha256-G/xFHsu2HveQDpFGCQY99Z5KGrIcJaLs7Jq9a1PuYJY="; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -798,12 +798,12 @@ final: prev: { agitator-nvim = buildVimPlugin { pname = "agitator.nvim"; - version = "0-unstable-2026-02-26"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "emmanueltouzery"; repo = "agitator.nvim"; - rev = "87949ff3610d502d178e25bdbe906942771922b8"; - hash = "sha256-oT9xyB6ymkZnjgLwOoQdavntoCtTDB6Ts4dl+nLrwYQ="; + rev = "ceaf20e08b0d37ef6e63f38f7fac3f7d700ffede"; + hash = "sha256-1b+/6fW9StBfxx3KiZxVjoZtPg5z+RK9cJi8HWiUdPo="; }; meta.homepage = "https://github.com/emmanueltouzery/agitator.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -868,12 +868,12 @@ final: prev: { ale = buildVimPlugin { pname = "ale"; - version = "4.0.0-unstable-2026-06-01"; + version = "4.0.0-unstable-2026-06-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "178fe113564d31cba304263765aeb21e7ed23a7e"; - hash = "sha256-9O1LLT4l+bxfCcYTLpazhEQsNGaAfueaIlQarbF0GjA="; + rev = "d0ea94323207abcdee717d76bb57b38d46055664"; + hash = "sha256-m8ztWD74kc3Pd5dDDAJcAcC6tH2EHOp4ZHp3tvYEGZw="; }; meta.homepage = "https://github.com/dense-analysis/ale/"; meta.license = getLicenseFromSpdxId "BSD-2-Clause"; @@ -924,12 +924,12 @@ final: prev: { amp-nvim = buildVimPlugin { pname = "amp.nvim"; - version = "0-unstable-2025-12-15"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "ampcode"; repo = "amp.nvim"; - rev = "3b9ad5ef0328de1b35cc9bfa723a37db5daf9434"; - hash = "sha256-f/li32jpVigbZANnnbgSArnOH4nusj0DUz7952K+Znw="; + rev = "b851d97d8e8782e58343608d8de7d9eb3a88090f"; + hash = "sha256-SdpKR1hfSyJ25tD7G1u4wYOHRNyeuTKbdMKG80iCUB4="; }; meta.homepage = "https://github.com/ampcode/amp.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -1050,12 +1050,12 @@ final: prev: { artio-nvim = buildVimPlugin { pname = "artio.nvim"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "comfysage"; repo = "artio.nvim"; - rev = "0b08d6862afe685fd78963808d022d7c15c89546"; - hash = "sha256-SrYZPFBQVJgm0X/CzyOOTfDwgNBIrjH+jlW6K8aE2Ec="; + rev = "19d71f8d9c721872e97aa0e5f094041c96f3feca"; + hash = "sha256-X1QXSoowhgs+uhO1T9OtaSXhAryzLCzGfHNgCFiO3is="; }; meta.homepage = "https://github.com/comfysage/artio.nvim/"; meta.license = getLicenseFromSpdxId "EUPL-1.2"; @@ -1092,12 +1092,12 @@ final: prev: { astrotheme = buildVimPlugin { pname = "astrotheme"; - version = "4.11.0"; + version = "4.12.0"; src = fetchFromGitHub { owner = "AstroNvim"; repo = "astrotheme"; - tag = "v4.11.0"; - hash = "sha256-h84Ay5EPft2ZPCY9iuqvyOXPFrVGZwjUi3OWyQ3x+AQ="; + tag = "v4.12.0"; + hash = "sha256-jDj0rDfGifyC9aTxhN0Ps9OD/s0U2Wvkgfk7mqTFG0Q="; }; meta.homepage = "https://github.com/AstroNvim/astrotheme/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -1120,12 +1120,12 @@ final: prev: { async-nvim = buildVimPlugin { pname = "async.nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "lewis6991"; repo = "async.nvim"; - rev = "f72017409d703ecf25972a05c6f89acb31adb952"; - hash = "sha256-E8ZS7m2QejmImzmQ+wrgSUlC2x4tkMHv7xGt+XDqcXQ="; + rev = "46adf61a022d5c923f981d527443f406e7d0f63e"; + hash = "sha256-7VuTWfdh3d3/q2KUyi5d+7GbaEq8NgbQgBt+Wt+/n5U="; }; meta.homepage = "https://github.com/lewis6991/async.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1414,12 +1414,12 @@ final: prev: { autoclose-nvim = buildVimPlugin { pname = "autoclose.nvim"; - version = "0-unstable-2026-03-22"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "autoclose.nvim"; - rev = "bafd0368716216fa6a7bb2a43ecd889b44efdb46"; - hash = "sha256-DOKKyaDmfUPRTcXJvqD+0zAr63+93H0auax6Dse0Igo="; + rev = "27063904b2238ce7867e430885b6abcfb08357ea"; + hash = "sha256-BjNP8Facn3Cy/EHYioUB9mXb19sBzBeSCY1xTpPOWG8="; }; meta.homepage = "https://github.com/m4xshen/autoclose.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1610,12 +1610,12 @@ final: prev: { base16-nvim = buildVimPlugin { pname = "base16-nvim"; - version = "0-unstable-2026-05-03"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "RRethy"; repo = "base16-nvim"; - rev = "23e5128eb5f629c29532c24a1e733cbe019f05bb"; - hash = "sha256-n9GrDSLW5+N0LA8QNnG/LubSkC/mLe7ut30N+SfBE7o="; + rev = "fd128e380624c34f12a201690944bf657f861361"; + hash = "sha256-W5tHY4U87eCAiOerNMAeqcbz1JlMZ6YGqSC0TBhI6t4="; }; meta.homepage = "https://github.com/RRethy/base16-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1638,12 +1638,12 @@ final: prev: { base46 = buildVimPlugin { pname = "base46"; - version = "0-unstable-2026-01-16"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "base46"; - rev = "884b990dcdbe07520a0892da6ba3e8d202b46337"; - hash = "sha256-AUdBZbGcPDtixHMFms9Y0EyUdAXOzvcA2AbrRdYQ4ig="; + rev = "8d059b82367160cd530253afbbcd20dc4b34129f"; + hash = "sha256-wW6UidkM6avqQVhPEgRtDXgxHsMdD+IM01A5ABebYT4="; }; meta.homepage = "https://github.com/nvchad/base46/"; meta.license = unfree; @@ -1736,12 +1736,12 @@ final: prev: { bitbake = buildVimPlugin { pname = "bitbake"; - version = "5.0.18"; + version = "6.0.2"; src = fetchFromGitHub { owner = "openembedded"; repo = "bitbake"; - tag = "yocto-5.0.18"; - hash = "sha256-Kl+4P3C4Gn/uXUxrIAi+V9pBJqxpI7Z+6vt8gfdCBag="; + tag = "yocto-6.0.2"; + hash = "sha256-Jho1X7udSvh413u8ueRqR8z1Q7E2qcotdkzl9azBu7g="; }; meta.homepage = "https://github.com/openembedded/bitbake/"; meta.license = unfree; @@ -1792,12 +1792,12 @@ final: prev: { blink-calc = buildVimPlugin { pname = "blink-calc"; - version = "0-unstable-2025-10-06"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "joelazar"; repo = "blink-calc"; - rev = "199e8a5fe356d553d33a3511ca28e625dac5c470"; - hash = "sha256-3w+vQf3N6+umBUF+PkCbPXggn53rNekxHgR2y+ICwHw="; + rev = "1b75c20cbb21c95bf08694eed605fa0bdbbe5ca2"; + hash = "sha256-hWPRXBIQ2uaoWNSXFQ1OGcWLbfE9nCmX/Q6Zs5JCjqE="; }; meta.homepage = "https://github.com/joelazar/blink-calc/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -1946,12 +1946,12 @@ final: prev: { blink-cmp-tmux = buildVimPlugin { pname = "blink-cmp-tmux"; - version = "0-unstable-2026-02-11"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "mgalliou"; repo = "blink-cmp-tmux"; - rev = "1ef35d8e388475ab8eaeecfc12e196c78bd5de04"; - hash = "sha256-enoPsYF8llGShf+sx6rLYYnLLzrd+jdCdZ4gy9A2lKU="; + rev = "112ddbf2e09d9cb4736de70dd01eb9654cf01d70"; + hash = "sha256-7Wj7bIg7vAOz0OygISORRphsEV6RcsR6m/S2tRyzEpU="; }; meta.homepage = "https://github.com/mgalliou/blink-cmp-tmux/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2030,18 +2030,32 @@ final: prev: { blink-indent = buildVimPlugin { pname = "blink.indent"; - version = "2.1.2"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.indent"; - tag = "v2.1.2"; - hash = "sha256-SS66JZFCX8viYxYaObASlwtrG5h7yHbVvRBVXBNXkng="; + tag = "v2.2.0"; + hash = "sha256-x4nILac79C60FVsMQiWqlU1FjM891W5U9UZWwGAjnk0="; }; meta.homepage = "https://github.com/Saghen/blink.indent/"; meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; + blink-lib = buildVimPlugin { + pname = "blink.lib"; + version = "0-unstable-2026-06-19"; + src = fetchFromGitHub { + owner = "saghen"; + repo = "blink.lib"; + rev = "5876dd95deeb70aadbe9f1c0b7117a135061cdac"; + hash = "sha256-FsDcgBiD3fl0EO1advAoQBbA2HY1p8Ja7lwhmpB++Zc="; + }; + meta.homepage = "https://github.com/saghen/blink.lib/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + blink-nerdfont-nvim = buildVimPlugin { pname = "blink-nerdfont.nvim"; version = "0-unstable-2025-12-14"; @@ -2114,12 +2128,12 @@ final: prev: { boo-colorscheme-nvim = buildVimPlugin { pname = "boo-colorscheme-nvim"; - version = "0.5.2-unstable-2026-02-10"; + version = "0.5.2-unstable-2026-07-06"; src = fetchFromGitHub { owner = "rockerBOO"; repo = "boo-colorscheme-nvim"; - rev = "36a52f900f49fe78bfeb30d2519a8dd356bf8fc1"; - hash = "sha256-oGplv+2q1M1pIwFj2u8ZT9WTNNImYreQtiBECGJKe/Q="; + rev = "8eb36d50a124472c8b3c864e45997b4ac7331db7"; + hash = "sha256-K/9OkwFHVgu1JJbkhqGr4pO9P6c4Qf4SB6LLSdqLkIc="; }; meta.homepage = "https://github.com/rockerBOO/boo-colorscheme-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2254,12 +2268,12 @@ final: prev: { bullets-vim = buildVimPlugin { pname = "bullets.vim"; - version = "2.0.0-unstable-2026-06-03"; + version = "2.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "bullets-vim"; repo = "bullets.vim"; - rev = "3f667eeca58bd4ba411b41edefef51e7fed1a2b1"; - hash = "sha256-fq3ATtCeXeq3CR97KbEu8mOEF8CtpEt7z8z3OO5IQQY="; + rev = "81570b98ca44b4100b3ddcf8d9ca74b9a9b0c884"; + hash = "sha256-yTxXXnVyk/vbr+tWD9RquJvk2ksa8Okuhg3NnyeBp3o="; }; meta.homepage = "https://github.com/bullets-vim/bullets.vim/"; meta.license = unfree; @@ -2268,12 +2282,12 @@ final: prev: { calendar-vim = buildVimPlugin { pname = "calendar.vim"; - version = "0-unstable-2025-03-07"; + version = "0-unstable-2026-07-01"; src = fetchFromGitHub { owner = "itchyny"; repo = "calendar.vim"; - rev = "36d1a3a76e39b9d73ff964db2f75dacaf2d2bef3"; - hash = "sha256-rNB44bWt6kFnrn+UyOqYHjigA9F/Iao9Osg/YTO4nhw="; + rev = "2ef5b0a2717d8a2ea24c55d11e426f25e6243282"; + hash = "sha256-1aLYR0yTtOV0DYrcSics0PZo0+FLSO6CGYScmyyvQN4="; }; meta.homepage = "https://github.com/itchyny/calendar.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2310,12 +2324,12 @@ final: prev: { catppuccin-vim = buildVimPlugin { pname = "catppuccin-vim"; - version = "0-unstable-2025-08-11"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "catppuccin"; repo = "vim"; - rev = "fc2e9d853208621a94ec597c50bf559875bf6d99"; - hash = "sha256-Ap9UKMWfDBbWLf7Rh47JQy3EO2Tphf05RZvX9voF1Ac="; + rev = "78c40a773e56d05e1c4e29216c45a483bdd67351"; + hash = "sha256-xOf5PwhgVWwMGtJt+om9z0MULrMLoO6AmaJ/G/vWGrk="; }; meta.homepage = "https://github.com/catppuccin/vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2547,12 +2561,12 @@ final: prev: { claudecode-nvim = buildVimPlugin { pname = "claudecode.nvim"; - version = "0.3.0-unstable-2026-06-09"; + version = "0.3.0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "coder"; repo = "claudecode.nvim"; - rev = "7b8b7090c16f4151401a281741a4bf37050ebd26"; - hash = "sha256-NHhoAqCTa1+go+DYFj25eH0ZDmAqbA9tpHtj3IarCUU="; + rev = "2390c6e45c4789072c293ac69de051d169668b29"; + hash = "sha256-oMBPSRQFDmJ9Lq+ZP8vFMHaocm4sPX3D/orVMNwVXuM="; }; meta.homepage = "https://github.com/coder/claudecode.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -2631,12 +2645,12 @@ final: prev: { cmake-tools-nvim = buildVimPlugin { pname = "cmake-tools.nvim"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "Civitasv"; repo = "cmake-tools.nvim"; - rev = "38f320fb9f0c4c9f1019f412f561c4d370a94d23"; - hash = "sha256-U8lLK5FzeOiJVUI0Y3AQ7TM+21tegMnnRbn18c7yXfc="; + rev = "22859d754b5de738cfe9945e0910729f63deefd0"; + hash = "sha256-HOA8bi+qngLoeicN8DTsgY3r37FMJQ8psyuTXjVd7TY="; }; meta.homepage = "https://github.com/Civitasv/cmake-tools.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -3484,12 +3498,12 @@ final: prev: { coc-nvim = buildVimPlugin { pname = "coc.nvim"; - version = "0.0.82-unstable-2026-06-08"; + version = "0.0.82-unstable-2026-07-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "92ab906cab1e6b19ad03f754df4f3930f9eae22c"; - hash = "sha256-c0ChbihCajCuEh1hu5XOFtomiFA6OzbCl7eNpzPfBXM="; + rev = "d1689a4876305e5fc6691910c8ee6f1eb5da2219"; + hash = "sha256-6AjcLD8gh3rG3uXj8LjdXr5pbzIKwtu+14ZcCVwXCuI="; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; meta.license = unfree; @@ -3568,12 +3582,12 @@ final: prev: { codecompanion-nvim = buildVimPlugin { pname = "codecompanion.nvim"; - version = "19.15.0"; + version = "19.20.0"; src = fetchFromGitHub { owner = "olimorris"; repo = "codecompanion.nvim"; - tag = "v19.15.0"; - hash = "sha256-M/2pkFeL+sWwrXiCcE38WWmPb73kdCwC8AWg3ldScY0="; + tag = "v19.20.0"; + hash = "sha256-vDKbjW9izNruCLiPRQEs+yoOrA+YkuyvmdovFTY4nfw="; }; meta.homepage = "https://github.com/olimorris/codecompanion.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -3582,12 +3596,12 @@ final: prev: { codecompanion-spinner-nvim = buildVimPlugin { pname = "codecompanion-spinner.nvim"; - version = "0.2.5"; + version = "0.3.0"; src = fetchFromGitHub { owner = "franco-ruggeri"; repo = "codecompanion-spinner.nvim"; - tag = "v0.2.5"; - hash = "sha256-QSkiyV70kFkArCnTXYRR+Dt4i5XSq072tYnOnHbKEBc="; + tag = "v0.3.0"; + hash = "sha256-icFyR0q814mfLj+wT3ArSYwo50EWpn9BgI81qhbQDCQ="; }; meta.homepage = "https://github.com/franco-ruggeri/codecompanion-spinner.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -3650,6 +3664,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + cole-nvim = buildVimPlugin { + pname = "cole.nvim"; + version = "0-unstable-2026-07-14"; + src = fetchFromGitHub { + owner = "thekylehuang"; + repo = "cole.nvim"; + rev = "74f6a8e1bbce0d9a845a339d849bca3c0bec7aaa"; + hash = "sha256-TJxpLhabIl73I9O6Soi9TEd/9Xa7FVfpV7sNrza64oM="; + }; + meta.homepage = "https://github.com/thekylehuang/cole.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + colibri-vim = buildVimPlugin { pname = "colibri.vim"; version = "0-unstable-2019-06-15"; @@ -3680,12 +3708,12 @@ final: prev: { colorful-menu-nvim = buildVimPlugin { pname = "colorful-menu.nvim"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-06-30"; src = fetchFromGitHub { owner = "xzbdmw"; repo = "colorful-menu.nvim"; - rev = "13f9b7eaa9cd2901b4f8915cfb2483c3be4c8c20"; - hash = "sha256-RPYTEtJ3pazPJjIby+WQOHVAa1BE58d9/EOu8XQnUNk="; + rev = "196ddf16d5f8fec09ba7f20e6b153aa5188e907b"; + hash = "sha256-cqujcf3hgTcHtwqRliEvFAtkBRkNljSNXn/N4AOgeyc="; }; meta.homepage = "https://github.com/xzbdmw/colorful-menu.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -3764,12 +3792,12 @@ final: prev: { command-t = buildVimPlugin { pname = "command-t"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - tag = "8.1"; - hash = "sha256-yp3kqhHQMtUFFPfbqgnrmmclx6r39k3ohen4Ys3s3BU="; + tag = "8.2"; + hash = "sha256-Q2fYHr9GFQvkoyoAOkvxJDArtqMxq7352eSGQNHBFZ8="; }; meta.homepage = "https://github.com/wincent/command-t/"; meta.license = getLicenseFromSpdxId "BSD-2-Clause"; @@ -4073,12 +4101,12 @@ final: prev: { copilot-lua = buildVimPlugin { pname = "copilot.lua"; - version = "2.0.4"; + version = "3.0.0"; src = fetchFromGitHub { owner = "zbirenbaum"; repo = "copilot.lua"; - tag = "v2.0.4"; - hash = "sha256-+hQ4Og0ZZS/tvs4z5733qRu5+W4D24HgHHPIL5vd0Eo="; + tag = "v3.0.0"; + hash = "sha256-xjdTysyt7BMb8a9c2HPQN85EujhQv9ZCQ87yWHjELls="; }; meta.homepage = "https://github.com/zbirenbaum/copilot.lua/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4143,12 +4171,12 @@ final: prev: { coq-thirdparty = buildVimPlugin { pname = "coq.thirdparty"; - version = "0-unstable-2025-10-29"; + version = "0-unstable-2026-06-21"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "2bd969a2bcd2624f9c260b1000957c7e665e308e"; - hash = "sha256-l+wMABt0lnKn1V6d7uhe6rUjfKsZw9XcO6RHwEVrZSI="; + rev = "a021e24f1ff538d339aece0de80d621b68862701"; + hash = "sha256-x08Ggz/maGv1tUY0P0ITFym+4W8vg6sXPLgGo6kXFNQ="; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; meta.license = unfree; @@ -4171,12 +4199,12 @@ final: prev: { coq_nvim = buildVimPlugin { pname = "coq_nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "5054268e58e9e45dbdae598c2d7cca232085d2ce"; - hash = "sha256-SxffEztUDSXp1skO52Pi8XQCinWwFbw34Nn3cvC9GW8="; + rev = "83580b587f6fc50568ec61ae79e18762fcf35c17"; + hash = "sha256-OKlZh1FKIk4DhyAtc0rSnEOZoa75NQKRtdFYDjkTZPE="; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -4185,12 +4213,12 @@ final: prev: { cornelis = buildVimPlugin { pname = "cornelis"; - version = "2.8.0-unstable-2026-06-02"; + version = "0.12-compat"; src = fetchFromGitHub { owner = "agda"; repo = "cornelis"; - rev = "f6db4a8e0993276557cc59b8e720d04e73138ded"; - hash = "sha256-XG7F0ALVWU+8XHfYEj0R8SF+vjwCyy65oX4UcVxRlPc="; + tag = "nvim-0.12-compat"; + hash = "sha256-ObmnsH25/vnC6TEJ44ZZuJJBrnnAJuDNYkJZU6YnTi4="; }; meta.homepage = "https://github.com/agda/cornelis/"; meta.license = getLicenseFromSpdxId "BSD-3-Clause"; @@ -4381,12 +4409,12 @@ final: prev: { cyberdream-nvim = buildVimPlugin { pname = "cyberdream.nvim"; - version = "5.4.0"; + version = "5.5.0"; src = fetchFromGitHub { owner = "scottmckendry"; repo = "cyberdream.nvim"; - tag = "v5.4.0"; - hash = "sha256-lz9TlZRhJIUnv/4qTT8SoimRiY/vGFlrOKT3xc3FtoQ="; + tag = "v5.5.0"; + hash = "sha256-iLdBf66y5nZgSj3OJWjjv07vBOMMRxx0ncSH477eXIg="; }; meta.homepage = "https://github.com/scottmckendry/cyberdream.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4521,12 +4549,12 @@ final: prev: { ddc-filter-matcher_head = buildVimPlugin { pname = "ddc-filter-matcher_head"; - version = "0-unstable-2025-09-02"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-matcher_head"; - rev = "7a955d2f6a44e39687459f8f3a22f4daa063a981"; - hash = "sha256-VYNjVH1OtmSyvBoFxF5WBf150GwoIpjTe0Y0oK8Hp8A="; + rev = "7a52b2facb97a352fcd900baca1b4efa7b652176"; + hash = "sha256-toNCobCS9NiLQewXZpKyZvuA3AZ83v/rhUbMkV1WOOQ="; }; meta.homepage = "https://github.com/Shougo/ddc-filter-matcher_head/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4535,12 +4563,12 @@ final: prev: { ddc-filter-sorter_rank = buildVimPlugin { pname = "ddc-filter-sorter_rank"; - version = "0-unstable-2025-09-02"; + version = "0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-filter-sorter_rank"; - rev = "eed3cb33b3ae3f9128257fcfb95e0511d1b13891"; - hash = "sha256-8zoRsX7ZNCNkokku0TW0LNkjXmBL8UCu8h3EAe4KQ+g="; + rev = "0d58fe698528dfeaf895eb70791c1b5e8a1d2288"; + hash = "sha256-0iLK7vdkZ27sMUho3SK7NHh77uL+aLpIjqkSOuKc5j8="; }; meta.homepage = "https://github.com/Shougo/ddc-filter-sorter_rank/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4563,12 +4591,12 @@ final: prev: { ddc-source-around = buildVimPlugin { pname = "ddc-source-around"; - version = "0-unstable-2025-09-03"; + version = "0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-around"; - rev = "68e679ca0b989cfe3300acac9099b893d0675063"; - hash = "sha256-wLQ9vpKgl4fyjLEWo1XIElw8CbFjpBkvYMFoMPrQTxM="; + rev = "277b926fdb3b642572cc756d52a42f18ac7c6059"; + hash = "sha256-5KT1verDM4My7ow+9nswHPsSUNmdqsyx1H3jd2SKp3k="; }; meta.homepage = "https://github.com/Shougo/ddc-source-around/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4577,12 +4605,12 @@ final: prev: { ddc-source-file = buildVimPlugin { pname = "ddc-source-file"; - version = "0-unstable-2026-05-24"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "LumaKernel"; repo = "ddc-source-file"; - rev = "b2ff132a07a881251edbc03b5c81f3655803a5b9"; - hash = "sha256-Iw6dYzIUzx7O6+YmNl1W7kjBgjc52m1KGG0oFBySqfk="; + rev = "8548b553c7dbf49728788c29142108c437e0ec76"; + hash = "sha256-96W64aTUbyKgrEDaA6iFDcsVCA6TF3ei/xYyon/N2uY="; }; meta.homepage = "https://github.com/LumaKernel/ddc-source-file/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4591,12 +4619,12 @@ final: prev: { ddc-source-lsp = buildVimPlugin { pname = "ddc-source-lsp"; - version = "1.2.0-unstable-2026-05-24"; + version = "1.2.0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-source-lsp"; - rev = "a8fef26851f3b648e064fa3aeb7c8c054684e846"; - hash = "sha256-vB3sCEJw67kJLON+AXo6B/38jBAFq079EouVxaI9QlQ="; + rev = "2f476ae123bea5b3583f9d4ca141f63981e70b06"; + hash = "sha256-2rMdU1FUP4HJP2o2MtL93po/FmloMzZ/sqeQWHPP55g="; }; meta.homepage = "https://github.com/Shougo/ddc-source-lsp/"; meta.license = unfree; @@ -4605,12 +4633,12 @@ final: prev: { ddc-ui-native = buildVimPlugin { pname = "ddc-ui-native"; - version = "0-unstable-2026-04-30"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-native"; - rev = "4f409fc24e0c1ce2a99a2c055b6a216feef2f076"; - hash = "sha256-hMsOqJ8Db2W15Z73jQDldwkRBbaI5p8gap8UqgKRNiY="; + rev = "7b946489962453c485b894c18dd8e81057dd8098"; + hash = "sha256-p+jUxvJ7Wza9PtxHMJbwbHV7GZ1iPsfVGNwIYuiM938="; }; meta.homepage = "https://github.com/Shougo/ddc-ui-native/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4619,12 +4647,12 @@ final: prev: { ddc-ui-pum = buildVimPlugin { pname = "ddc-ui-pum"; - version = "0-unstable-2025-08-26"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "Shougo"; repo = "ddc-ui-pum"; - rev = "f7f334380e18af42297468b3cf696794bbfa2652"; - hash = "sha256-kQ1fK65V0NtObqBy/FhcfACUGeI5Pk4t3Kw0BPpxChw="; + rev = "0679df221520576d07add3cf4219d478db110801"; + hash = "sha256-6KRKuovKkYUdtyirZ/UNvtAZzgtVgc+EGVTETq2Hu2U="; }; meta.homepage = "https://github.com/Shougo/ddc-ui-pum/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -4745,12 +4773,12 @@ final: prev: { demicolon-nvim = buildVimPlugin { pname = "demicolon.nvim"; - version = "2.0-unstable-2026-01-25"; + version = "2.0-unstable-2026-06-20"; src = fetchFromGitHub { owner = "mawkler"; repo = "demicolon.nvim"; - rev = "a9ca137474b3a02e1d6ac48bfdb1985172e2ec9a"; - hash = "sha256-jDvdyAT2lngYDSDw4c+zziUYUuNeET0FBWJA+IeD2Ts="; + rev = "153444f17494e2ff6ab7d226e6173c1841b1130a"; + hash = "sha256-gBGJphvT1AXN/UImrSWiWhhzcQt4i68Vbwtr9jXipwo="; }; meta.homepage = "https://github.com/mawkler/demicolon.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5181,12 +5209,12 @@ final: prev: { diagram-nvim = buildVimPlugin { pname = "diagram.nvim"; - version = "0-unstable-2026-02-21"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "3rd"; repo = "diagram.nvim"; - rev = "89d8110ec15021ac9a03ff2317d27b900c45bf60"; - hash = "sha256-0KgZ/3q26b7MxMPRXp4/mgfl7tIUD3PnC6TYgagDGP4="; + rev = "a221810b17cdda2d5fdddba9bab3eba6fab8fabc"; + hash = "sha256-+K5o50CtBFqn37t6GnAnI1p2CfCyA1w4TIhMKpfZX4A="; }; meta.homepage = "https://github.com/3rd/diagram.nvim/"; meta.license = unfree; @@ -5209,12 +5237,12 @@ final: prev: { diffs-nvim = buildVimPlugin { pname = "diffs.nvim"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "barrettruth"; repo = "diffs.nvim"; - tag = "v0.3.3"; - hash = "sha256-g/kXdeNT2NLgQ+iPTI1GdlJyzvSHrcJoCLa0tPDj3gM="; + tag = "v0.4.0"; + hash = "sha256-ZkdvFn5oIlHfXXbO68GxtLrVkF2vxYlG8Fglrkc3Byc="; }; meta.homepage = "https://github.com/barrettruth/diffs.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5237,12 +5265,12 @@ final: prev: { diffview-plus-nvim = buildVimPlugin { pname = "diffview-plus.nvim"; - version = "0.34"; + version = "0.36"; src = fetchFromGitHub { owner = "dlyongemallo"; repo = "diffview-plus.nvim"; - tag = "v0.34"; - hash = "sha256-M3Hf4y9HGFquBOK/Stv5FIxoVYX4aoO4dbbYQNPhisk="; + tag = "v0.36"; + hash = "sha256-RBH06hWEW5fP80Sj48UhVT9KexLtm3xWZtdVH+rGWhY="; }; meta.homepage = "https://github.com/dlyongemallo/diffview-plus.nvim/"; meta.license = unfree; @@ -5419,12 +5447,12 @@ final: prev: { easy-dotnet-nvim = buildVimPlugin { pname = "easy-dotnet.nvim"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "GustavEikaas"; repo = "easy-dotnet.nvim"; - rev = "5c9577f6fc086e211ccc7d93b763e9a5ace4e64b"; - hash = "sha256-E+f0SHaTN8FI3gEs4t+6NuS5xn45kneK39kSam+Ya9M="; + rev = "26b939e2e013ddfc137a8e6149cda1f0b62303ca"; + hash = "sha256-M6uNfKiHviaJyItvvAdEplB+pdqF4N5DOwxG2oPYwpg="; }; meta.homepage = "https://github.com/GustavEikaas/easy-dotnet.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5546,12 +5574,12 @@ final: prev: { efmls-configs-nvim = buildVimPlugin { pname = "efmls-configs-nvim"; - version = "1.11.1-unstable-2026-05-24"; + version = "1.11.2"; src = fetchFromGitHub { owner = "creativenull"; repo = "efmls-configs-nvim"; - rev = "2f5dc31042cc76fc3d5a859842a8416085c4d41f"; - hash = "sha256-mtHihfpaV9gJFqZBD0h90dAC6kECNxbFPH3OYJoKVT0="; + tag = "v1.11.2"; + hash = "sha256-NXwwuvdMpqI0+i0gmX7mtNlUHWTJnDejuZUN2PiS6hs="; }; meta.homepage = "https://github.com/creativenull/efmls-configs-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -5981,12 +6009,12 @@ final: prev: { flash-nvim = buildVimPlugin { pname = "flash.nvim"; - version = "2.1.0-unstable-2025-10-28"; + version = "2.1.0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "fcea7ff883235d9024dc41e638f164a450c14ca2"; - hash = "sha256-pHh0tJd/ynfjriu8xjnKunKVDHkoXii6ZbikdkIwovY="; + rev = "b6346946d10d07998efee029fb0f7a593806d0cd"; + hash = "sha256-1v2+iq4/TnJq37iiGedIKFf6PxlTHQac8RXECZ2HYdM="; }; meta.homepage = "https://github.com/folke/flash.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -5995,12 +6023,12 @@ final: prev: { flatten-nvim = buildVimPlugin { pname = "flatten.nvim"; - version = "0.5.1-unstable-2025-05-27"; + version = "0.5.1-unstable-2026-06-19"; src = fetchFromGitHub { owner = "willothy"; repo = "flatten.nvim"; - rev = "72527798e75b5e34757491947c2cb853ce21dc0e"; - hash = "sha256-NaOgzTVqOpQnEIOIMlHCupZUDYnLUic9zITKFxcOg3A="; + rev = "d92ca41e9c330f45c1b854a80c89c8488a9d730c"; + hash = "sha256-ZixskxLpno0BbzseafBILoFzRzs14HrBeWlRQrqkAS8="; }; meta.homepage = "https://github.com/willothy/flatten.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -6332,14 +6360,14 @@ final: prev: { fyler-nvim = buildVimPlugin { pname = "fyler.nvim"; - version = "2.0.0-unstable-2025-11-23"; + version = "2.0.0-unstable-2026-06-28"; src = fetchFromGitHub { - owner = "A7Lavinraj"; + owner = "FylerOrg"; repo = "fyler.nvim"; - rev = "bb8b9f30c652c948d35211958b0deec3496bcc08"; - hash = "sha256-Caf1dJiIATbs0PNjSANjA3QgHg7PdeMz9Pjoc0Ti7G4="; + rev = "70e1202434a21b45649dd59ec82dc3330f79125e"; + hash = "sha256-va0a+y6fjut99A7MBjKYvfmhQUDp/zyD/65neYWVHE8="; }; - meta.homepage = "https://github.com/A7Lavinraj/fyler.nvim/"; + meta.homepage = "https://github.com/FylerOrg/fyler.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; meta.hydraPlatforms = [ ]; }; @@ -6388,12 +6416,12 @@ final: prev: { fzf-vim = buildVimPlugin { pname = "fzf.vim"; - version = "0-unstable-2026-06-02"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "356608e2ae5d9127e2c964885ea2b21ea7aea9ab"; - hash = "sha256-3u6E8HgLVwAk75fOAWP1zrRb54N4YG6MbRDrKpn7bdw="; + rev = "d2a59a992a2455f609c0fde2ebd84427ea8f919a"; + hash = "sha256-TQR+ivA4nnichGdCDSeL2WeT+dHfNeQM1BPdrXM0Cd8="; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -6682,11 +6710,11 @@ final: prev: { gitlab-vim = buildVimPlugin { pname = "gitlab.vim"; - version = "1.1.0-unstable-2026-06-10"; + version = "1.1.0-unstable-2026-07-03"; src = fetchgit { url = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; - rev = "eaddfb6717d7d1118b40403dd8ae76b79e28eb33"; - hash = "sha256-RSPu9WhHfb5JyaYYZGJ4tYe0USOQ4ap68Z27ZhkA5Vc="; + rev = "ca4971d02c3114d6f5e94b1d0bf460faccbf7f5e"; + hash = "sha256-i64MIJqWf3BVJPEf5dpzU5nvnTNXjqn4c8SuQ6Pkct4="; }; meta.homepage = "https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim"; meta.license = unfree; @@ -6723,14 +6751,13 @@ final: prev: { gitportal-nvim = buildVimPlugin { pname = "gitportal.nvim"; - version = "0-unstable-2025-12-21"; - src = fetchFromGitHub { - owner = "trevorhauter"; - repo = "gitportal.nvim"; - rev = "0c3e1c1d518c9e42e61e8df35ea0c0582a278a65"; - hash = "sha256-ag7t+G5TKRajLNc4ZrNuMufJSxqJQXPpWINZSFwEmx4="; + version = "0-unstable-2026-07-10"; + src = fetchgit { + url = "https://codeberg.org/trevorhauter/gitportal.nvim/"; + rev = "d2efb8d1bf141c77cfa1b5311995912bc36671d0"; + hash = "sha256-ofRP84DSgrXyNXXZjM82n1AhsfleDU6k7r4+R9sof40="; }; - meta.homepage = "https://github.com/trevorhauter/gitportal.nvim/"; + meta.homepage = "https://codeberg.org/trevorhauter/gitportal.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; @@ -7073,12 +7100,12 @@ final: prev: { guh-nvim = buildVimPlugin { pname = "guh.nvim"; - version = "0.0.1-unstable-2026-06-10"; + version = "0.0.1-unstable-2026-06-24"; src = fetchFromGitHub { owner = "justinmk"; repo = "guh.nvim"; - rev = "89bca23616361fa316c72b1171bc7aa3401800be"; - hash = "sha256-HEDQMSbWWg7UEru+hf0cT+7KbIMi1r1cU5YcgaBLq/E="; + rev = "943779f7cdb0acee203985ad531fb53ff95d9c8e"; + hash = "sha256-IfcrDH4B5J4aeV/Ff8mZ93nh3TNNoX/miZRWn6uMcu0="; }; meta.homepage = "https://github.com/justinmk/guh.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -7087,12 +7114,12 @@ final: prev: { guihua-lua = buildVimPlugin { pname = "guihua.lua"; - version = "0.1-unstable-2026-05-26"; + version = "0.1-unstable-2026-07-03"; src = fetchFromGitHub { owner = "ray-x"; repo = "guihua.lua"; - rev = "f8e06bd8a26dee3377d63c2adf1e57cdb58ac474"; - hash = "sha256-lupDg/yt75164H8zQs/HTKqC3Y1FnQCzoMq90nwapO8="; + rev = "4c513d5dac550af77034cced421967b393261509"; + hash = "sha256-e0Almh8wWGp5NxHX48Y4XGEUHtPCYOXi4BIlfeSzaIs="; }; meta.homepage = "https://github.com/ray-x/guihua.lua/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -7158,12 +7185,12 @@ final: prev: { hardtime-nvim = buildVimPlugin { pname = "hardtime.nvim"; - version = "1.2.0-unstable-2025-09-13"; + version = "1.2.0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "hardtime.nvim"; - rev = "b4e431934af1fe224a3a801f632c008278cb7628"; - hash = "sha256-Jy9ARUHU1ySpSxxoS3hLRjxp5Lqt7juWN5Jnbdo0rg0="; + rev = "244753782b945def87472d8f4e9e6a9d4ec18689"; + hash = "sha256-Zers7vdGRGy8n520G9uMuHwMAP3STHqU5d5a2Ln9rDQ="; }; meta.homepage = "https://github.com/m4xshen/hardtime.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -7241,12 +7268,12 @@ final: prev: { haskell-snippets-nvim = buildVimPlugin { pname = "haskell-snippets.nvim"; - version = "1.5.0-unstable-2026-05-11"; + version = "1.5.0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "mrcjkb"; repo = "haskell-snippets.nvim"; - rev = "f7482c1097007e8bac0502c0644e375a12ae72ba"; - hash = "sha256-BygC8L0Jau5/7ljHfD9LJO18jhXvIq1SSvtyb7bNv40="; + rev = "5be33b79f0320ad9ef7f558507f2e365deebef4f"; + hash = "sha256-/xJ1Wx6Y24NvrbX4+v2lF+anEhP14p+N9jc2/p859LU="; }; meta.homepage = "https://github.com/mrcjkb/haskell-snippets.nvim/"; meta.license = getLicenseFromSpdxId "GPL-2.0-only"; @@ -7367,12 +7394,12 @@ final: prev: { helpview-nvim = buildVimPlugin { pname = "helpview.nvim"; - version = "2.1.2-unstable-2026-05-14"; + version = "2.2.0"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "helpview.nvim"; - rev = "0057599e169ea6ffd53fef77f279cb13b61e174a"; - hash = "sha256-F3mdFqzMZhdT0ag+d7Ze9Knv4NW9/YBGVjqRYcQpCCI="; + tag = "v2.2.0"; + hash = "sha256-zWwgfikrE9bagMuFSo6XByprANqIJkx6g2567ZTOEYk="; fetchSubmodules = true; }; meta.homepage = "https://github.com/OXY2DEV/helpview.nvim/"; @@ -7452,12 +7479,12 @@ final: prev: { hlchunk-nvim = buildVimPlugin { pname = "hlchunk.nvim"; - version = "1.3.0-unstable-2026-05-07"; + version = "1.3.0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "shellRaining"; repo = "hlchunk.nvim"; - rev = "06f51922ca43d5cdacf96725c106405fe064c59e"; - hash = "sha256-ETsuiYjTR4JF/4RVqRXJHLtcoalEaFinHxxD4Ww34xU="; + rev = "fb5a16ecc4ff15772189679ffdede6ee879288ec"; + hash = "sha256-rSQnHnks068egYd9AlfuC43F3BcysyMTYnlaUFjlDM4="; }; meta.homepage = "https://github.com/shellRaining/hlchunk.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8110,12 +8137,12 @@ final: prev: { jedi-vim = buildVimPlugin { pname = "jedi-vim"; - version = "0.11.2-unstable-2026-05-04"; + version = "0.11.2-unstable-2026-06-16"; src = fetchFromGitHub { owner = "davidhalter"; repo = "jedi-vim"; - rev = "a33071af6b3cf2399bc4631e0aa265901e1cf99e"; - hash = "sha256-Tg+JHiOneIqfVKJa8VfIbB1aNAYlJGNoiY/+7qgAYf8="; + rev = "a13c7bf64dbb4abcf676b4e41c5fedc2d4e7f6dd"; + hash = "sha256-Fy0zJHambtY9T4KPWXBc7wXktXo/EIUr6t+eehFAz3M="; fetchSubmodules = true; }; meta.homepage = "https://github.com/davidhalter/jedi-vim/"; @@ -8167,12 +8194,12 @@ final: prev: { jj-nvim = buildVimPlugin { pname = "jj.nvim"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "NicolasGB"; repo = "jj.nvim"; - tag = "v0.6.0"; - hash = "sha256-hoU+DenrgxNwvLNmDtIsJ5yB5fhRjDRPOOL8WW9bpZM="; + tag = "v0.7.1"; + hash = "sha256-AxmZTSytBEGzjqQJrFV2+oHSVaG21Vx6YRezto3MT9s="; }; meta.homepage = "https://github.com/NicolasGB/jj.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8362,12 +8389,12 @@ final: prev: { kitty-scrollback-nvim = buildVimPlugin { pname = "kitty-scrollback.nvim"; - version = "9.2.0"; + version = "9.2.1"; src = fetchFromGitHub { owner = "mikesmithgh"; repo = "kitty-scrollback.nvim"; - tag = "v9.2.0"; - hash = "sha256-M/sd8lUv7leapzI3uD0VNkMAwaFhPmXsktFnHMPJz0U="; + tag = "v9.2.1"; + hash = "sha256-8IkvoJ8nTlP5WCqMpJqUhBsz7OYB/Mlp1lH5TJRpvOE="; }; meta.homepage = "https://github.com/mikesmithgh/kitty-scrollback.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -8418,12 +8445,12 @@ final: prev: { koda-nvim = buildVimPlugin { pname = "koda.nvim"; - version = "2.10.3"; + version = "2.11.0"; src = fetchFromGitHub { owner = "oskarnurm"; repo = "koda.nvim"; - tag = "v2.10.3"; - hash = "sha256-CU634QzBkPRVntJ/fKBu/V0WNQ7K9fzqOtMIUEb9/Vw="; + tag = "v2.11.0"; + hash = "sha256-OiWW7c+cd/MioepNN40pFO3hTAm9ov80I1mVYmTW428="; }; meta.homepage = "https://github.com/oskarnurm/koda.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -8458,21 +8485,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - kulala-nvim = buildVimPlugin { - pname = "kulala.nvim"; - version = "6.9.2"; - src = fetchFromGitHub { - owner = "mistweaverco"; - repo = "kulala.nvim"; - tag = "v6.9.2"; - hash = "sha256-7q/lV939qxozpsE0SM272ztSdzqIDuAdrgXSITCDLko="; - fetchSubmodules = true; - }; - meta.homepage = "https://github.com/mistweaverco/kulala.nvim/"; - meta.license = getLicenseFromSpdxId "MIT"; - meta.hydraPlatforms = [ ]; - }; - lackluster-nvim = buildVimPlugin { pname = "lackluster.nvim"; version = "0-unstable-2025-10-06"; @@ -8754,12 +8766,12 @@ final: prev: { lexima-vim = buildVimPlugin { pname = "lexima.vim"; - version = "2.1.0-unstable-2025-05-15"; + version = "2.1.0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "cohama"; repo = "lexima.vim"; - rev = "ab621e4756465c9d354fce88cff2bd1aa7887065"; - hash = "sha256-NtHCfuL2Tq1a4Xevx+xAbnzsKqnPAbU/l7JvK7p0evU="; + rev = "9f6942c5e1f0f6fe63bdcdac515f34c484b970f5"; + hash = "sha256-hU/MmP5Ykb52vCJvlMtQipKe4LGC7d+lH//r8ysDELE="; }; meta.homepage = "https://github.com/cohama/lexima.vim/"; meta.license = unfree; @@ -8880,12 +8892,12 @@ final: prev: { lightline-vim = buildVimPlugin { pname = "lightline.vim"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-07-01"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "6c283f8df85aa7219fa4096a6ed4ff45d48aa9e1"; - hash = "sha256-YYhSlqYUXFbArn2lq80LH/WXIUbHjt087+w2y/6EjtQ="; + rev = "d042c506cb2e7a59112a72447e0b5fe8739d9d1d"; + hash = "sha256-CVxtG8RLBgHOQUwIjaB9vmeOjGODZzNj/KCEOHTw7EI="; }; meta.homepage = "https://github.com/itchyny/lightline.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9327,12 +9339,12 @@ final: prev: { lspsaga-nvim = buildVimPlugin { pname = "lspsaga.nvim"; - version = "0-unstable-2026-05-14"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "nvimdev"; repo = "lspsaga.nvim"; - rev = "3e33a6a6c5d379f3d4fae77fae6b53b762a0a30f"; - hash = "sha256-hkXvv5NgW+wnbR7wGtAs+aUDv/4o/T5Mv7rGhk1qR3U="; + rev = "cf6fc9473bba1d332eda9887855ea29ed9b37701"; + hash = "sha256-ggw3U/LXNCDaSmXmHWEV9coOjoDW6v0JvD5BGSvDCaM="; }; meta.homepage = "https://github.com/nvimdev/lspsaga.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9580,12 +9592,12 @@ final: prev: { mason-lspconfig-nvim = buildVimPlugin { pname = "mason-lspconfig.nvim"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason-lspconfig.nvim"; - tag = "v2.2.0"; - hash = "sha256-wWoRUg2nvmqaEWxjYEOk1q+jQyKupgJi2LubhewcVCw="; + tag = "v2.3.0"; + hash = "sha256-yaR7P33ZQdJNAh0P3slN/TS0OL9p6ShMEIWGF4rFqxQ="; }; meta.homepage = "https://github.com/mason-org/mason-lspconfig.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -9608,12 +9620,12 @@ final: prev: { mason-nvim = buildVimPlugin { pname = "mason.nvim"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "mason-org"; repo = "mason.nvim"; - tag = "v2.3.0"; - hash = "sha256-O+11o3c0iNZ4tMZV80QbzwuMV3mP2Ml4lXQKHz4uR54="; + tag = "v2.3.1"; + hash = "sha256-zx45l5yZeWgnkzaQeY+V3GK84arritj7jfpJ64Go9rg="; }; meta.homepage = "https://github.com/mason-org/mason.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -9818,12 +9830,12 @@ final: prev: { mini-ai = buildVimPlugin { pname = "mini.ai"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.ai"; - rev = "4511b3481707c1d021485475d34f2ed2a50bf47b"; - hash = "sha256-weROF3Xf/XzUYJyI1NGm1HRnWEWjWbiEc5th5Gv55Tk="; + tag = "v0.18.0"; + hash = "sha256-5lmxcbEwlUcV3D4Zw93dLH2onFdpGMEAhul51lbxFIg="; }; meta.homepage = "https://github.com/nvim-mini/mini.ai/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9832,12 +9844,12 @@ final: prev: { mini-align = buildVimPlugin { pname = "mini.align"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.align"; - rev = "a7cd9465ac72c65d726f8fdc8b71ceb63ce8c0fd"; - hash = "sha256-SBc4LHrQ2WqJINLjJC3qQfTfKVP7p6gxa7D+sz15CSc="; + tag = "v0.18.0"; + hash = "sha256-0YVTahHSbzhEEpw9zYfGljxx+ufsuZ0qWiu2SZzTD9U="; }; meta.homepage = "https://github.com/nvim-mini/mini.align/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9846,12 +9858,12 @@ final: prev: { mini-animate = buildVimPlugin { pname = "mini.animate"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.animate"; - rev = "a133965b027a6377fddca43f11659af357c12758"; - hash = "sha256-mSeJEg5WUQrObE/eX7mmazBQFF9i+f/WLlxWXmLCaSI="; + tag = "v0.18.0"; + hash = "sha256-xxEoAH267h7oEMaMtv9YRsJRL5X1pWbAeCy/U+i33gs="; }; meta.homepage = "https://github.com/nvim-mini/mini.animate/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9860,12 +9872,12 @@ final: prev: { mini-base16 = buildVimPlugin { pname = "mini.base16"; - version = "0.17.0-unstable-2026-06-04"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.base16"; - rev = "33c6fb4a088392df272a4d88f9bf07f466c5a459"; - hash = "sha256-oVUSqKyMhnGKsrmZmtm8GM59FIGILYquoq1K6sNNF84="; + tag = "v0.18.0"; + hash = "sha256-Q038ztqiCjX9WAqlcKC4auNNeRtC+hOV6BvMml/Tdp8="; }; meta.homepage = "https://github.com/nvim-mini/mini.base16/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9874,12 +9886,12 @@ final: prev: { mini-basics = buildVimPlugin { pname = "mini.basics"; - version = "0.17.0-unstable-2026-05-21"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.basics"; - rev = "4255727accba14db930823da4168c7f1ea68ff80"; - hash = "sha256-UVZkMfRub44plD0+wOd+//P7BejCqwf3mxCH9fMiosw="; + tag = "v0.18.0"; + hash = "sha256-/H9/3JkZigApufNvWMtOFbsrHuG4cwPuY+fKmklWkU8="; }; meta.homepage = "https://github.com/nvim-mini/mini.basics/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9888,12 +9900,12 @@ final: prev: { mini-bracketed = buildVimPlugin { pname = "mini.bracketed"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.bracketed"; - rev = "d94d51dcee625723aaaf8d38174b48522eaf9131"; - hash = "sha256-6HD3eYKkRYsS+evLvfptMOczC3ljrf5PurIwx9tZp1U="; + tag = "v0.18.0"; + hash = "sha256-vsj7cf6deB9o0UkFN/ewk/kxKooC0lB7txRpbbNnaLc="; }; meta.homepage = "https://github.com/nvim-mini/mini.bracketed/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9902,11 +9914,11 @@ final: prev: { mini-bufremove = buildVimPlugin { pname = "mini.bufremove"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.bufremove"; - rev = "4cfbb201b2760da79ca6e1a00e9f67cbc99cbb8f"; + tag = "v0.18.0"; hash = "sha256-TVae69MHavTTgBCWpIbQk0L3EgLlRQgqXZlotSbG8bk="; }; meta.homepage = "https://github.com/nvim-mini/mini.bufremove/"; @@ -9916,12 +9928,12 @@ final: prev: { mini-clue = buildVimPlugin { pname = "mini.clue"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.clue"; - rev = "4b3db71003fa06200680afb9f1d05506b79eb953"; - hash = "sha256-6ttyphQgT3yjWOOzmLKzSqQUtyah2FvZz3jDprqKjno="; + tag = "v0.18.0"; + hash = "sha256-ivDrHCyW7YaaEtUwkmqRKwT4bYnvy3Nn3fH//STYsPA="; }; meta.homepage = "https://github.com/nvim-mini/mini.clue/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9930,12 +9942,12 @@ final: prev: { mini-cmdline = buildVimPlugin { pname = "mini.cmdline"; - version = "0.17.0-unstable-2026-06-01"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.cmdline"; - rev = "044848fd9b69d01ba05d0a56a530969743a94eba"; - hash = "sha256-fq10UdMxenCCdpBv/S6ZdqCbjXPAj9eWCljBGPRMWOI="; + tag = "v0.18.0"; + hash = "sha256-WCsFDbk4/Cql9kJ44m++YlanasLE7ptYaaGrLoSpxYw="; }; meta.homepage = "https://github.com/nvim-mini/mini.cmdline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9944,12 +9956,12 @@ final: prev: { mini-colors = buildVimPlugin { pname = "mini.colors"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.colors"; - rev = "c40f49f3d41a3207f1b8f854919837c34acdc0c5"; - hash = "sha256-dcsAoj9r02YuWC0gz1BtjSVguQNxyD85Q4mEp3cDsSk="; + tag = "v0.18.0"; + hash = "sha256-YMBNhdIRSAKhTA3h0K1jKAW4+z/+Nj6kApMAHxkIUaE="; }; meta.homepage = "https://github.com/nvim-mini/mini.colors/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9958,12 +9970,12 @@ final: prev: { mini-comment = buildVimPlugin { pname = "mini.comment"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.comment"; - rev = "fc87ba6554f182161d9a4bab5017c575571f000f"; - hash = "sha256-kNELUIgJxiEJHj+evZt0aG4+Nvzdow1NpZOI2M2xTaU="; + tag = "v0.18.0"; + hash = "sha256-14YdoEPMudcfYWrb62Fv2GuoWW85v2F9s3/yKxbFN88="; }; meta.homepage = "https://github.com/nvim-mini/mini.comment/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9972,12 +9984,12 @@ final: prev: { mini-completion = buildVimPlugin { pname = "mini.completion"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.completion"; - rev = "04abe6fc7860858785ba63c435d76bf5b8b64b5f"; - hash = "sha256-DYJkOr64I1CLo5N+vgRa4xIbi3SUSZVPyy0e0Qo39C0="; + tag = "v0.18.0"; + hash = "sha256-GD6s5qDvKrGk3qM+rk5L8fp7SmvhfKrZO+B6h7cwpAg="; }; meta.homepage = "https://github.com/nvim-mini/mini.completion/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -9986,12 +9998,12 @@ final: prev: { mini-cursorword = buildVimPlugin { pname = "mini.cursorword"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.cursorword"; - rev = "a01471856e462144ea53972f22a67e790be68ee6"; - hash = "sha256-udcgvHbdBgQnxNix5cRK+FgEraZGdvma+HnVX+b7FPo="; + tag = "v0.18.0"; + hash = "sha256-FHD3fBCmYpw3P/o//CocQNSBoElOr7EleIdiSKM7c8E="; }; meta.homepage = "https://github.com/nvim-mini/mini.cursorword/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10000,12 +10012,12 @@ final: prev: { mini-deps = buildVimPlugin { pname = "mini.deps"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.deps"; - rev = "9da6c44316de10f4227ff366d574a2baa4004b1b"; - hash = "sha256-QGDLIXIMynE6c5iC56z9bXB2d2iPSOYeq5IOFEIsRYA="; + tag = "v0.18.0"; + hash = "sha256-nbtOiQAgUfgoLzjXVb/SKPVRBp7bdYLBvYPg4CvchsI="; }; meta.homepage = "https://github.com/nvim-mini/mini.deps/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10014,12 +10026,12 @@ final: prev: { mini-diff = buildVimPlugin { pname = "mini.diff"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.diff"; - rev = "5af2b6be4a4beb673f3196a414f6fd932bbedd48"; - hash = "sha256-DVvZOwUQCT/TGfkdy65BjH7gPPDIQ9ib2VCqOPzG5fs="; + tag = "v0.18.0"; + hash = "sha256-ZhCsTAzuVRMbVSWWepsA8qrS1GTPNokm0NxXn3hYEoM="; }; meta.homepage = "https://github.com/nvim-mini/mini.diff/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10028,12 +10040,12 @@ final: prev: { mini-doc = buildVimPlugin { pname = "mini.doc"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.doc"; - rev = "bc3a3ecfd38cbda6752cbe4559aca225085dd90e"; - hash = "sha256-Qv7mbu/X6UoPG66oMR3TMcyWSAnc1AZUrhCGLd58M6w="; + tag = "v0.18.0"; + hash = "sha256-g1JvCOxQY5oFEr2Q5l8e31gC0O5VvIP9ZuHncK83QSE="; }; meta.homepage = "https://github.com/nvim-mini/mini.doc/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10042,12 +10054,12 @@ final: prev: { mini-extra = buildVimPlugin { pname = "mini.extra"; - version = "0.17.0-unstable-2026-06-07"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.extra"; - rev = "eb21c1117207d3aa1ae532c666c692e94909087e"; - hash = "sha256-kViQTJ5jzCXf7McuikvwaqfzB54JSheyeiBzSKoq9vY="; + tag = "v0.18.0"; + hash = "sha256-QjA7O9AXfRWgsq3ma2Q0eonD66WRvd4qT3Jk61PgfG0="; }; meta.homepage = "https://github.com/nvim-mini/mini.extra/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10056,12 +10068,12 @@ final: prev: { mini-files = buildVimPlugin { pname = "mini.files"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.files"; - rev = "02874bc653fbecf2bee2c65441d0ebd09110f011"; - hash = "sha256-IfV2W9EFVtfXofEbwiWwCK8zprJlXiAKZgvKhnsp/mc="; + tag = "v0.18.0"; + hash = "sha256-RhD0kEdJL47nSDjrKzuN+l5+65gJ/7w+eqtP3zLVln8="; }; meta.homepage = "https://github.com/nvim-mini/mini.files/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10070,12 +10082,12 @@ final: prev: { mini-fuzzy = buildVimPlugin { pname = "mini.fuzzy"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.fuzzy"; - rev = "2c0e7809e0c51dccb335d01f02d4f6b2b4d6fcdc"; - hash = "sha256-AX/Di9KfRryWthGs1kIObxlR9vG9/YAXylWyPGxe+js="; + tag = "v0.18.0"; + hash = "sha256-xk7PqaKzvUXl7v2DSRD3xu6aV1lrHB0GtbGOaoSRyZc="; }; meta.homepage = "https://github.com/nvim-mini/mini.fuzzy/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10084,12 +10096,12 @@ final: prev: { mini-git = buildVimPlugin { pname = "mini-git"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini-git"; - rev = "7c81d173462042cd3a3571643bce03a6c255fd41"; - hash = "sha256-hII9oQKitOzpycdgP41c4INZUJ1kEtwUtf8SlfFDlZU="; + tag = "v0.18.0"; + hash = "sha256-Xu3yiQU1ibvq1skFiyie5IkHWGU7UQ46jChyO3hrgZw="; }; meta.homepage = "https://github.com/nvim-mini/mini-git/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10098,12 +10110,12 @@ final: prev: { mini-hipatterns = buildVimPlugin { pname = "mini.hipatterns"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hipatterns"; - rev = "e25cf080aae092a651a92fa5e477f64a61adbebf"; - hash = "sha256-0oheCwV4qpU45f7S2jFkqMwpRiatjXjtDFAerNU2fLQ="; + tag = "v0.18.0"; + hash = "sha256-7ydDX9dKXFKg4o9omp+ZZfC3DLjQoIDC6n+iAYoH2ug="; }; meta.homepage = "https://github.com/nvim-mini/mini.hipatterns/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10112,12 +10124,12 @@ final: prev: { mini-hues = buildVimPlugin { pname = "mini.hues"; - version = "0.17.0-unstable-2026-06-04"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.hues"; - rev = "ab36ead75b445fd81e00e7c3e1cbf0bc1e8f2d14"; - hash = "sha256-QYl68gVtqsmIrVAN1hUH3kkdmNAKAHPjMhIXTFJm3iI="; + tag = "v0.18.0"; + hash = "sha256-x//2b2QUSmHP7HgjG1Ri31vwJ0acDkI6Pr75927wNrI="; }; meta.homepage = "https://github.com/nvim-mini/mini.hues/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10126,12 +10138,12 @@ final: prev: { mini-icons = buildVimPlugin { pname = "mini.icons"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.icons"; - rev = "520995f1d75da0e4cc901ee95080b1ff2bc46b94"; - hash = "sha256-Q61iFTDA2groQu3qMNJu0yuVnB6NtsGNihpGD5ppeuI="; + tag = "v0.18.0"; + hash = "sha256-Lr5/aHSnwfDAidvGTIOfEvp0lNpnp5kFNnIUSssnaOw="; }; meta.homepage = "https://github.com/nvim-mini/mini.icons/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10140,12 +10152,12 @@ final: prev: { mini-indentscope = buildVimPlugin { pname = "mini.indentscope"; - version = "0.17.0-unstable-2026-06-07"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.indentscope"; - rev = "98453149c3394ca3d1bf252e838e4777573b63e2"; - hash = "sha256-6b6rVX74wp6cnSaQyZ0hCfWOD94skyFInZgg8JHD5HY="; + tag = "v0.18.0"; + hash = "sha256-ahA7Ud+f55wpEK7Lp0Zuf1djB8NcIpqmvwFPO2r6EPs="; }; meta.homepage = "https://github.com/nvim-mini/mini.indentscope/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10154,12 +10166,12 @@ final: prev: { mini-input = buildVimPlugin { pname = "mini.input"; - version = "0-unstable-2026-06-07"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.input"; - rev = "44477bc40a1d9556decab08cd0e13187f9d909e4"; - hash = "sha256-ex0BKThn97+lnWm6EaI4JuCViQ7B6na+n5yCX9OJavU="; + tag = "v0.18.0"; + hash = "sha256-lATmLit9sU/7xcoEz4gD277hoDbPuifGGIwlbWKNrjg="; }; meta.homepage = "https://github.com/nvim-mini/mini.input/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10168,12 +10180,12 @@ final: prev: { mini-jump = buildVimPlugin { pname = "mini.jump"; - version = "0.17.0-unstable-2026-06-07"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump"; - rev = "741a2ac3ac4015a78ee5e7b90ba054508686457a"; - hash = "sha256-q5e1HScZsQFNNiMBd9Kn4qjW+oV5XfZUtkBeYduZ9+o="; + tag = "v0.18.0"; + hash = "sha256-AsrwzaOsh+c3BtN4knD6FvLvQl0JwQ8kPi6c/8KZGSw="; }; meta.homepage = "https://github.com/nvim-mini/mini.jump/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10182,12 +10194,12 @@ final: prev: { mini-jump2d = buildVimPlugin { pname = "mini.jump2d"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.jump2d"; - rev = "f95769bc20586f63d16d814175f759bf4d44bfd2"; - hash = "sha256-AvkV549zYxtRnjWtZHwGwwPHMy1D2sWNxkUSUQhMyCE="; + tag = "v0.18.0"; + hash = "sha256-tEYxxutbVzMg2nthOVvMUQFW9MZDLlTTB9HRMS2Y62M="; }; meta.homepage = "https://github.com/nvim-mini/mini.jump2d/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10196,12 +10208,12 @@ final: prev: { mini-keymap = buildVimPlugin { pname = "mini.keymap"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.keymap"; - rev = "14f4cf1058bd3458d4cccd6a4587b6ebb1d43385"; - hash = "sha256-jDrh4BE5U4+ADmMtZpUiY4azxG/8H7ntz54VW6mLh3g="; + tag = "v0.18.0"; + hash = "sha256-hAkaV2IXBYhoObNOZO2JOxYC+0f2dY090x+d91B0MCg="; }; meta.homepage = "https://github.com/nvim-mini/mini.keymap/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10210,12 +10222,12 @@ final: prev: { mini-map = buildVimPlugin { pname = "mini.map"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.map"; - rev = "b5c13c5740afdd0f5b0f0af9aa2928e4481212af"; - hash = "sha256-WwTnkEVHubvI55ipKy1aA81H4LR7VuBi6KvIXUS0/p4="; + tag = "v0.18.0"; + hash = "sha256-c80XxN/jrC9qqCWmERaRrpNOrkDadcXuy02zr7ffvlI="; }; meta.homepage = "https://github.com/nvim-mini/mini.map/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10224,12 +10236,12 @@ final: prev: { mini-misc = buildVimPlugin { pname = "mini.misc"; - version = "0.17.0-unstable-2026-05-28"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.misc"; - rev = "eb2246ede307fc863a12e9d9b0fa4b7ca9b88188"; - hash = "sha256-gX1li7+jJq0/I0rT13aJsBIbFFrufJIFhz2bFGGy+mw="; + tag = "v0.18.0"; + hash = "sha256-m5jbhTNVT2A9lQhwEVGay3hJD7SkFc+az6DwfishVj0="; }; meta.homepage = "https://github.com/nvim-mini/mini.misc/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10238,12 +10250,12 @@ final: prev: { mini-move = buildVimPlugin { pname = "mini.move"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.move"; - rev = "a776027e68fe763987a0132d59877d651a7c0130"; - hash = "sha256-f+MHsSCR9Y2gVV7X/o+HIVzbwZZVG7eL7Q9XILbqAsc="; + tag = "v0.18.0"; + hash = "sha256-HVTI8k5KJeULmW6AC1qgCUXF5lHDcCzzp1aaI4H1PgU="; }; meta.homepage = "https://github.com/nvim-mini/mini.move/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10252,12 +10264,12 @@ final: prev: { mini-notify = buildVimPlugin { pname = "mini.notify"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.notify"; - rev = "7e75de73c60590e3f35d5cecd5677a68a437fc54"; - hash = "sha256-VXhsQM5WQwOTpsus0WOTwmdz4TtGVyM8ZZOpXBqqqv4="; + tag = "v0.18.0"; + hash = "sha256-5qd0Kg7HCYHlgMjCiDRgqCXuqrlM2VuwpSjWXXVazN4="; }; meta.homepage = "https://github.com/nvim-mini/mini.notify/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10266,12 +10278,12 @@ final: prev: { mini-nvim = buildVimPlugin { pname = "mini.nvim"; - version = "0.17.0-unstable-2026-06-07"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.nvim"; - rev = "ff8b3580935818ef2f21bdd651f057a2ae071eab"; - hash = "sha256-wVRhe2ufPG/2DRtJGyAAhoCOTX8CLB2zZ8TQOQz9TqQ="; + tag = "v0.18.0"; + hash = "sha256-kCcyl4KUEY51UeGYmvuLD1hswWbwKhHGUt/0XLbPuUw="; }; meta.homepage = "https://github.com/nvim-mini/mini.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10280,12 +10292,12 @@ final: prev: { mini-operators = buildVimPlugin { pname = "mini.operators"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.operators"; - rev = "d9b2f3892ad177cc141987ccfa8944cf21474f77"; - hash = "sha256-FrkWVfNzHaVqqvmprj8kn7MubSXjgXn/z0qRT5+hMwM="; + tag = "v0.18.0"; + hash = "sha256-9RVfrlRd8THUJb8nJKqTbUPQKPwN8xyKzqZvr0oGQk0="; }; meta.homepage = "https://github.com/nvim-mini/mini.operators/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10294,12 +10306,12 @@ final: prev: { mini-pairs = buildVimPlugin { pname = "mini.pairs"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pairs"; - rev = "30cf2f01c4aaa2033db67376b9924fa2442c05d6"; - hash = "sha256-rLl7zM97oyi/M4jsq/Zvl9u7Z3enLvNzByyhT4xaCg8="; + tag = "v0.18.0"; + hash = "sha256-35ewaDXW5RoQUHns0hVXMw6OTf/BTvKXLd1u/warDSE="; }; meta.homepage = "https://github.com/nvim-mini/mini.pairs/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10308,12 +10320,12 @@ final: prev: { mini-pick = buildVimPlugin { pname = "mini.pick"; - version = "0.17.0-unstable-2026-06-06"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.pick"; - rev = "1ffba38c7221669d3da7792d4bbe1c9761075f4d"; - hash = "sha256-N/RdA7mEno3E5D4c9gxm9ZIlzAz3f7CPAJbyGEiECBM="; + tag = "v0.18.0"; + hash = "sha256-ebjHOQpHWsOdAIdJjimCJqXOmKCZnLobLOF8JroRRxk="; }; meta.homepage = "https://github.com/nvim-mini/mini.pick/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10322,12 +10334,12 @@ final: prev: { mini-sessions = buildVimPlugin { pname = "mini.sessions"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.sessions"; - rev = "e59286b20fbf61171039ddfebc736cf9562e75d5"; - hash = "sha256-rULcDHhAcZDQzX6KJ+PoZncNqGnU1t4iSBpUiGBHZ+g="; + tag = "v0.18.0"; + hash = "sha256-hXdpKozw9ZFkrIe/wGxEJR8j02EAPnB5txq+NtrjHgI="; }; meta.homepage = "https://github.com/nvim-mini/mini.sessions/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10336,12 +10348,12 @@ final: prev: { mini-snippets = buildVimPlugin { pname = "mini.snippets"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.snippets"; - rev = "9a08aa14e02abb790c823a622d7d6c736cbbe65a"; - hash = "sha256-1w8t2ANiBue7mNk5QYhi8aBHGGNvIbrKPQgGqGO0RqI="; + tag = "v0.18.0"; + hash = "sha256-AoSGqdCBdcCwZdwjhgSU3ACvE40FlrZARN/Lp1aZg54="; }; meta.homepage = "https://github.com/nvim-mini/mini.snippets/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10350,12 +10362,12 @@ final: prev: { mini-splitjoin = buildVimPlugin { pname = "mini.splitjoin"; - version = "0.17.0-unstable-2026-05-12"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.splitjoin"; - rev = "146aef247d9bfc58bab20dd921ba6b75ac4b8cf9"; - hash = "sha256-lW9RY8ky7WBL8H5joXiOubOhJjiMGrmRmR/4e59s2g4="; + tag = "v0.18.0"; + hash = "sha256-/3S6D+kuSXgmf3dlCRcABnFpNY6eaFUbEDxGHduh1Es="; }; meta.homepage = "https://github.com/nvim-mini/mini.splitjoin/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10364,12 +10376,12 @@ final: prev: { mini-starter = buildVimPlugin { pname = "mini.starter"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.starter"; - rev = "a7d8b353cf120fee32bb5d88e7a9de5eaec746e7"; - hash = "sha256-fzp3maSVIQYh4Gr5FfDiAdrXdK7Z+V9hpqjgftAkG5U="; + tag = "v0.18.0"; + hash = "sha256-4oaQrsp5f2NqxiiMEzHel0U/onctfnbCBKVTJqhQUPM="; }; meta.homepage = "https://github.com/nvim-mini/mini.starter/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10378,12 +10390,12 @@ final: prev: { mini-statusline = buildVimPlugin { pname = "mini.statusline"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.statusline"; - rev = "7091f554d7d26b5d55f4c937634da53ba277a44a"; - hash = "sha256-EUSzEt4JJI+bT6ll511tT+7ZTkpNqBYxQYw/e+CwHtM="; + tag = "v0.18.0"; + hash = "sha256-CVebe3F7o7o+qXiEQkngfvmgtGF7dt1u7ALh1bgedzw="; }; meta.homepage = "https://github.com/nvim-mini/mini.statusline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10392,12 +10404,12 @@ final: prev: { mini-surround = buildVimPlugin { pname = "mini.surround"; - version = "0.17.0-unstable-2026-06-05"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.surround"; - rev = "9fd5ebef2b34cc4ac3c0f1811a6726ea6d92fa91"; - hash = "sha256-5dJ8GI9NtYbiAUvYdRjtxrTIUVS41VRkWvLtrBNqbhs="; + tag = "v0.18.0"; + hash = "sha256-ILKwZ1+Dh4HH5DNnNwqH7xnDyCIEnxPRjLDCwqWOeXY="; }; meta.homepage = "https://github.com/nvim-mini/mini.surround/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10406,12 +10418,12 @@ final: prev: { mini-tabline = buildVimPlugin { pname = "mini.tabline"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.tabline"; - rev = "7d4a8a79f37361ad287d27bda0f37fc53f924a50"; - hash = "sha256-KlrjsgsSnuW0Fpr2Jq2YYRCiw0+KET+YHEKiOnXfYk8="; + tag = "v0.18.0"; + hash = "sha256-6vLYDvQWbI6xILsdedJCU7G129TzcMJdwC0xB50Gw8Y="; }; meta.homepage = "https://github.com/nvim-mini/mini.tabline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10420,11 +10432,11 @@ final: prev: { mini-trailspace = buildVimPlugin { pname = "mini.trailspace"; - version = "0.17.0-unstable-2026-05-19"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.trailspace"; - rev = "22653218f1aedc9bf306c8b4e8ec2c8a575f6fae"; + tag = "v0.18.0"; hash = "sha256-7qPgRedHWA3IQhshOGjENDBztJA+Q/j+ASpLdf9BQwM="; }; meta.homepage = "https://github.com/nvim-mini/mini.trailspace/"; @@ -10434,12 +10446,12 @@ final: prev: { mini-visits = buildVimPlugin { pname = "mini.visits"; - version = "0.17.0-unstable-2026-06-01"; + version = "0.18.0"; src = fetchFromGitHub { owner = "nvim-mini"; repo = "mini.visits"; - rev = "d3cce4e1f07d59e4e2e1d31502e342fc48376c19"; - hash = "sha256-7fHzk7DsoX2ocwYelaXsOUrxuwAtvD6giHsQC9mVz1E="; + tag = "v0.18.0"; + hash = "sha256-rDVKgX2T85i8b29QI8549RaHoEWhUQmxi++hwDR9mZk="; }; meta.homepage = "https://github.com/nvim-mini/mini.visits/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -10490,12 +10502,12 @@ final: prev: { mkdnflow-nvim = buildVimPlugin { pname = "mkdnflow.nvim"; - version = "2.22.2-unstable-2026-03-25"; + version = "2.22.3"; src = fetchFromGitHub { owner = "jakewvincent"; repo = "mkdnflow.nvim"; - rev = "f20732686f70f60f18f09f4befe984ae63a99201"; - hash = "sha256-DxoSwy8WTgfKpguNVKsII2IUNfMS4oDGO18JmqalCcQ="; + tag = "v2.22.3"; + hash = "sha256-z382m54owzdh5+xUHjGdELuZqc8kD4z5TaqzptO0Fac="; }; meta.homepage = "https://github.com/jakewvincent/mkdnflow.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -10574,12 +10586,12 @@ final: prev: { molten-nvim = buildVimPlugin { pname = "molten-nvim"; - version = "1.9.2-unstable-2026-03-01"; + version = "1.9.2-unstable-2026-07-03"; src = fetchFromGitHub { owner = "benlubas"; repo = "molten-nvim"; - rev = "c1db39e78fe18559d8f2204bf5c4d476bdc80d3e"; - hash = "sha256-FsDtd50Ehyd6EVdyU3fIDefkZJsOIi5bMPPdV3rKZw0="; + rev = "bedea63819c618e007e7c40059fc6e72d598c8df"; + hash = "sha256-fzVqcow/Ugjq/owYt6wnz22iF/vHGZEKOkPV0kabWYE="; }; meta.homepage = "https://github.com/benlubas/molten-nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -10684,6 +10696,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + multiple-cursors-nvim = buildVimPlugin { + pname = "multiple-cursors.nvim"; + version = "0.15-unstable-2026-05-10"; + src = fetchFromGitHub { + owner = "brenton-leighton"; + repo = "multiple-cursors.nvim"; + rev = "eae76d4c5f7ede2d45746dc2affb5e7a139e4aa8"; + hash = "sha256-iLQT+M0wL/Bh0zzgLSozSRjsELzKochMlM6djUwg/og="; + }; + meta.homepage = "https://github.com/brenton-leighton/multiple-cursors.nvim/"; + meta.license = getLicenseFromSpdxId "Apache-2.0"; + meta.hydraPlatforms = [ ]; + }; + muren-nvim = buildVimPlugin { pname = "muren.nvim"; version = "0-unstable-2025-02-09"; @@ -11022,12 +11048,12 @@ final: prev: { neoconf-nvim = buildVimPlugin { pname = "neoconf.nvim"; - version = "1.4.0-unstable-2026-06-10"; + version = "1.4.0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "folke"; repo = "neoconf.nvim"; - rev = "3a0a976a10cba0ff9d9406e4652755881321ecf9"; - hash = "sha256-hPv22eaPTY0UKoCxOXq/D1eUGOomAc8D0CB5mRs1ueQ="; + rev = "1246df7a5d1811d84212f11edb43550cd8380ebd"; + hash = "sha256-hlQf+xJ+/9OTqp5VtPsNE7QW6uVjWeUkqQ8r1u6MWkI="; }; meta.homepage = "https://github.com/folke/neoconf.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -11106,12 +11132,12 @@ final: prev: { neogit = buildVimPlugin { pname = "neogit"; - version = "3.0.0-unstable-2026-05-13"; + version = "3.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "NeogitOrg"; repo = "neogit"; - rev = "99326a1310fb2d616b455d2fd16d01bf00682f06"; - hash = "sha256-ZKK4JbeuMGYvUjG1B6vLZTeSMeQTXQGFQAlIMqqN660="; + rev = "f8674ec894315c02449b61c9de9a116c5aafeb90"; + hash = "sha256-ETu9zy2In3M8/3fqYUfTRt0mKiocm3paJFjgQ82Yj3I="; }; meta.homepage = "https://github.com/NeogitOrg/neogit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11487,12 +11513,12 @@ final: prev: { neotest-java = buildVimPlugin { pname = "neotest-java"; - version = "0.37.3"; + version = "0.38.0"; src = fetchFromGitHub { owner = "rcasia"; repo = "neotest-java"; - tag = "v0.37.3"; - hash = "sha256-ALVudtC49gAQOGwucOh7zvhbUyZX0lTGyizhn+QCPl4="; + tag = "v0.38.0"; + hash = "sha256-R24mbFbYTH166gq8EZOuLDZ7dA2Yhjmrc77K2os5jtE="; }; meta.homepage = "https://github.com/rcasia/neotest-java/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11599,12 +11625,12 @@ final: prev: { neotest-python = buildVimPlugin { pname = "neotest-python"; - version = "0-unstable-2026-04-05"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "nvim-neotest"; repo = "neotest-python"; - rev = "e6df4f1892f6137f58135917db24d1655937d831"; - hash = "sha256-TUu50qK97RuBI1eOD0JGtSq3M7o0HwlRKjLz2SCfjlE="; + rev = "1b56ca4ba51c6014f986d6548ee629bdc95589d1"; + hash = "sha256-9FL0qWTdkeX57ujRvSa9QqO/ZIthlzLSJyKHtNitbSg="; }; meta.homepage = "https://github.com/nvim-neotest/neotest-python/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11613,12 +11639,12 @@ final: prev: { neotest-rspec = buildVimPlugin { pname = "neotest-rspec"; - version = "0-unstable-2025-09-14"; + version = "0-unstable-2026-06-18"; src = fetchFromGitHub { owner = "olimorris"; repo = "neotest-rspec"; - rev = "e7dc67c1167a9e593c804a6be6808ba9a5920d43"; - hash = "sha256-45DTXO0CQ/YCivDev0We7+7Ca4i0kHKZmbSc73lkPSY="; + rev = "7629f8c2837becb72090fbafce58506bb56a00f0"; + hash = "sha256-6FUhSFpQ243mS2Cu7ou7gCr2NlTRtk9+n43aPDeE1U8="; }; meta.homepage = "https://github.com/olimorris/neotest-rspec/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11669,12 +11695,12 @@ final: prev: { neotest-vitest = buildVimPlugin { pname = "neotest-vitest"; - version = "0.2.0-unstable-2026-05-28"; + version = "0.2.0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "marilari88"; repo = "neotest-vitest"; - rev = "2f19d215d7d4d7f121826f99f6f35a81e2c18a6f"; - hash = "sha256-QvtaCUno7/8pU32f5YLWrlYAzjDhBTmCtgxweIUFAow="; + rev = "c3c69715da4b158069fd4262083e7219a5c14cfb"; + hash = "sha256-BPERc4+iWEu1UWDXv+MaSUXJR4KNFFAqrPXxyJCSe9I="; }; meta.homepage = "https://github.com/marilari88/neotest-vitest/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -11723,6 +11749,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neovim-project = buildVimPlugin { + pname = "neovim-project"; + version = "0.1"; + src = fetchFromGitHub { + owner = "coffebar"; + repo = "neovim-project"; + tag = "0.1"; + hash = "sha256-OCo4rF+mJ5it1S7UhlzpPpbi6Zxt211c4v6t1IPf1rw="; + }; + meta.homepage = "https://github.com/coffebar/neovim-project/"; + meta.license = getLicenseFromSpdxId "Apache-2.0"; + meta.hydraPlatforms = [ ]; + }; + neovim-sensible = buildVimPlugin { pname = "neovim-sensible"; version = "0-unstable-2017-09-20"; @@ -11737,6 +11777,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + neovim-session-manager = buildVimPlugin { + pname = "neovim-session-manager"; + version = "0-unstable-2026-01-26"; + src = fetchFromGitHub { + owner = "shatur"; + repo = "neovim-session-manager"; + rev = "89d253a6c68af60b49570044591d5b8701866601"; + hash = "sha256-d7lXPIy6qJDPvFk8twwkqKUWI205HfTqXMspnVRkng0="; + }; + meta.homepage = "https://github.com/shatur/neovim-session-manager/"; + meta.license = getLicenseFromSpdxId "GPL-3.0-only"; + meta.hydraPlatforms = [ ]; + }; + neovim-tips = buildVimPlugin { pname = "neovim-tips"; version = "0.8.4"; @@ -11962,12 +12016,12 @@ final: prev: { nightfox-nvim = buildVimPlugin { pname = "nightfox.nvim"; - version = "3.10.0-unstable-2026-05-03"; + version = "3.10.0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "26b61b1f856ec37cae3cb64f5690adb955f246a1"; - hash = "sha256-xSnMYGilRjNHh1G1eOghl8Dr93HsCe3WHHAkchCyW+E="; + rev = "4dacd3f0185a2227bdf3b6c0975a8f0bf87cac9a"; + hash = "sha256-LR0VqMMuH3GN6uI2aun7yOFsLxhGASMnFuzMrhPNJ+Q="; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12100,6 +12154,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + none-ls-extras-nvim = buildVimPlugin { + pname = "none-ls-extras.nvim"; + version = "0-unstable-2026-07-17"; + src = fetchFromGitHub { + owner = "nvimtools"; + repo = "none-ls-extras.nvim"; + rev = "9a8b8a9aeb43382e5aaf49b00b7cfb5d42d32118"; + hash = "sha256-YmDhDUqSJPOllXzkyrVUgnshrI5+Kt5Te8tEmnjOAVQ="; + }; + meta.homepage = "https://github.com/nvimtools/none-ls-extras.nvim/"; + meta.license = getLicenseFromSpdxId "Unlicense"; + meta.hydraPlatforms = [ ]; + }; + none-ls-nvim = buildVimPlugin { pname = "none-ls.nvim"; version = "0-unstable-2026-06-02"; @@ -12184,20 +12252,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - null-ls-nvim = buildVimPlugin { - pname = "null-ls.nvim"; - version = "0-unstable-2023-08-12"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "null-ls.nvim"; - rev = "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7"; - hash = "sha256-cWA0rzkOp/ekVKaFee7iea1lhnqKtWUIU+fW5M950wI="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; - meta.license = unfree; - meta.hydraPlatforms = [ ]; - }; - numb-nvim = buildVimPlugin { pname = "numb.nvim"; version = "1.1.0"; @@ -12214,12 +12268,12 @@ final: prev: { nvchad = buildVimPlugin { pname = "nvchad"; - version = "2.5-unstable-2026-04-13"; + version = "2.5-unstable-2026-07-03"; src = fetchFromGitHub { owner = "nvchad"; repo = "nvchad"; - rev = "d042cc975247c2aa55fcb228e5d146dc1dc6c648"; - hash = "sha256-WNQMaM5EQBRQC9JfvEIgFhn3K5n8q0YeiJ9NdG3E+z4="; + rev = "add44b952d631981614bbb8cfc6f7002f296dfe6"; + hash = "sha256-EuP+/HWJgqwG5LR2rNvtq7mhFkUDs0oyeG6xbbPogC4="; }; meta.homepage = "https://github.com/nvchad/nvchad/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -12228,12 +12282,12 @@ final: prev: { nvchad-ui = buildVimPlugin { pname = "nvchad-ui"; - version = "0-unstable-2026-05-10"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvchad"; repo = "ui"; - rev = "3e67e9d5325fd47fdbc90ca00a147db2f3525754"; - hash = "sha256-bl2erzyZCZp9seb4E7o/SFsBUHwocVOmQNv0mbO5yR0="; + rev = "222c8cc1ad66076c05b7c9d0695781ebe3799d88"; + hash = "sha256-SKSRwXi0KdJtWkmak1LLwXIUukwIhMxKHy9HIMnu0DQ="; }; meta.homepage = "https://github.com/nvchad/ui/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -12396,12 +12450,12 @@ final: prev: { nvim-cokeline = buildVimPlugin { pname = "nvim-cokeline"; - version = "0.4.0-unstable-2025-01-24"; + version = "0.4.0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "willothy"; repo = "nvim-cokeline"; - rev = "9fbed130683b7b6f73198c09e35ba4b33f547c08"; - hash = "sha256-O0msAljyNYj4zdFBOCR43QiqHYl1e9c4MASi9MmS+R4="; + rev = "854849e6b853a6ee1f17d62c80ae37435cfb0a3e"; + hash = "sha256-gSwGjKpjVQ2zvbX7jlfdqc4Z0k89uWcKhxYsQaFs24M="; }; meta.homepage = "https://github.com/willothy/nvim-cokeline/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12410,12 +12464,12 @@ final: prev: { nvim-colorizer-lua = buildVimPlugin { pname = "nvim-colorizer.lua"; - version = "0-unstable-2026-05-30"; + version = "0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "catgoose"; repo = "nvim-colorizer.lua"; - rev = "664c0b7cea1de71f8b65dfe951b7996fc3e6ccde"; - hash = "sha256-qVFQGJMGr0htwZqarhMdh7yG6SSH/rv8yqmp1CsoT3I="; + rev = "72a05f62c52241bc7441c820eb53946f92b2e6a4"; + hash = "sha256-hdnk816SBKWD/Ula4hjQ3o14I3+fBmEengfo72S4+8U="; }; meta.homepage = "https://github.com/catgoose/nvim-colorizer.lua/"; meta.license = unfree; @@ -12494,11 +12548,11 @@ final: prev: { nvim-dap = buildVimPlugin { pname = "nvim-dap"; - version = "0.10.0-unstable-2026-05-20"; + version = "0.10.0-unstable-2026-06-19"; src = fetchgit { url = "https://codeberg.org/mfussenegger/nvim-dap/"; - rev = "531771530d4f82ad2d21e436e3cc052d68d7aebb"; - hash = "sha256-pgD51NWFyjK1FrXZ8MFFIM9DX2OBxL7cd7JlST2Twvc="; + rev = "9e848e09a697ee95302a3ef2dd43fd6eb709e570"; + hash = "sha256-IHm3CwO7qUTtOZqhljDjSzz4WbaAJ4kPY384MyZZ9ac="; }; meta.homepage = "https://codeberg.org/mfussenegger/nvim-dap/"; meta.license = unfree; @@ -12521,11 +12575,11 @@ final: prev: { nvim-dap-disasm = buildVimPlugin { pname = "nvim-dap-disasm"; - version = "0-unstable-2026-02-25"; + version = "0-unstable-2026-06-14"; src = fetchgit { url = "https://codeberg.org/Jorenar/nvim-dap-disasm"; - rev = "1119f3f2b22e411adcd123cdcf6d0425b61a31a7"; - hash = "sha256-lq0tbMksVXccf6GGD7OxWAuoD9w8tlt30dpJSMtN4g8="; + rev = "b86a1e3f03f268635f9b362ccc8ffa5f240dd25d"; + hash = "sha256-hkoFEH8UoAzWOue1YTrHCQn7/N54fXsHpOZ5xAaSbIw="; }; meta.homepage = "https://codeberg.org/Jorenar/nvim-dap-disasm"; meta.license = unfree; @@ -12631,12 +12685,12 @@ final: prev: { nvim-dap-ui = buildVimPlugin { pname = "nvim-dap-ui"; - version = "4.0.0-unstable-2026-04-05"; + version = "4.0.0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "1a66cabaa4a4da0be107d5eda6d57242f0fe7e49"; - hash = "sha256-J/gUD4X//JtC2HB3HBeONivCQdMnXDnZJWd6jFF9+nk="; + rev = "cc9dd33aade7f20bae414d0cba163bc60d4d4b43"; + hash = "sha256-za3/6W1J6aMvNZQq8ANCq+TGHKHJtSxR/C5t3/oL3DI="; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12687,12 +12741,12 @@ final: prev: { nvim-docs-view = buildVimPlugin { pname = "nvim-docs-view"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-06-11"; src = fetchFromGitHub { owner = "amrbashir"; repo = "nvim-docs-view"; - rev = "9a262fa7e181e924d355e8725c68c48f076138b1"; - hash = "sha256-zsrrsTIpjRqDS/NXQH7TA6CjZj3PK8kstD9EB4omSGw="; + rev = "a1696d058a4223d8c3615bb305abfa638c5689a9"; + hash = "sha256-Ws/s3tgFTZczTVDjagBSY2bfso7oWRFB4oy/Y3DFdEA="; }; meta.homepage = "https://github.com/amrbashir/nvim-docs-view/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12701,12 +12755,12 @@ final: prev: { nvim-early-retirement = buildVimPlugin { pname = "nvim-early-retirement"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-early-retirement"; - rev = "3b05315a61c8f01bb893249f9e044fc359122c9d"; - hash = "sha256-vc2Q2iiyx6WcEr4RYtvr4s5yYSYKst+DpNG1WNKLQCI="; + rev = "dee05ab8d105d091faa4aad5659348f0e9734628"; + hash = "sha256-FteHivPNYlBbu6xyVFTNMnxNfHe2wN3qb/xBwT4T9c4="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-early-retirement/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12757,12 +12811,12 @@ final: prev: { nvim-gdb = buildVimPlugin { pname = "nvim-gdb"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "3ea9e52a7be60373a127be9dcc94773bc1d6e25c"; - hash = "sha256-y8dxr4xAOX7+PKCd2h3iMlmWZtmBr9Wp6ecjAYFtunc="; + rev = "67abac716b626ece57f3a7c72121542f0b3edfe9"; + hash = "sha256-6MnwKYvOL3b0hKOnLTvdRYrZkZBYt4XAK2jlFw+DfTM="; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12771,12 +12825,12 @@ final: prev: { nvim-genghis = buildVimPlugin { pname = "nvim-genghis"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-genghis"; - rev = "e6fd1f42736b15e63c0c703457c5ca162228a2f3"; - hash = "sha256-UG3yDZJ/j4Z+fDm5/qrVuUUA8rU4oc4chqFJK25jjYw="; + rev = "12100e3fe7fa863f60b5b81a3587c8c9d5a5b2ff"; + hash = "sha256-z4VSvOWY85W6A9jiZkAgY/ezvxSXKBJdgjGXC0Thud0="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-genghis/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12813,12 +12867,12 @@ final: prev: { nvim-highlite = buildVimPlugin { pname = "nvim-highlite"; - version = "4.22.0-unstable-2026-04-30"; + version = "4.22.0-unstable-2026-06-17"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "4a4d614020d423015e8e08c3335d3f9704d67a6d"; - hash = "sha256-R91WwMm0X1bEckus0YCdZ8RygYXb/W58yLTxyE+dYxc="; + rev = "3281bea1080d85f0a878793c0b7b962b9da1c7fd"; + hash = "sha256-bq4tUf1SLXEgw9p3BrXryreJM89Fe+OG4TyPo9TE1oU="; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; meta.license = unfree; @@ -12855,12 +12909,12 @@ final: prev: { nvim-impairative = buildVimPlugin { pname = "nvim-impairative"; - version = "0.6.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "idanarye"; repo = "nvim-impairative"; - tag = "v0.6.0"; - hash = "sha256-xl33sp/+wjH8Y8Uoa7j7kaQIgcMXUWYlGfCDKkZQNLk="; + tag = "v0.6.1"; + hash = "sha256-rQGtfLCCICUtkhTp4/r0KLCouxOtP8XEvWJDWRpVw0I="; }; meta.homepage = "https://github.com/idanarye/nvim-impairative/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12869,12 +12923,12 @@ final: prev: { nvim-java = buildVimPlugin { pname = "nvim-java"; - version = "4.1.0"; + version = "4.1.2"; src = fetchFromGitHub { owner = "nvim-java"; repo = "nvim-java"; - tag = "v4.1.0"; - hash = "sha256-w4BCKMbbFps6YxV3gyo5KGzBRJnU6h1vrUbYRq9cO0A="; + tag = "v4.1.2"; + hash = "sha256-7mtQVcO4skrUFClGOXxKqmvVo6Vgq6ZM2Um0x6C7IGg="; }; meta.homepage = "https://github.com/nvim-java/nvim-java/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -12993,12 +13047,12 @@ final: prev: { nvim-justice = buildVimPlugin { pname = "nvim-justice"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-justice"; - rev = "a3e0d2d73d1748d1bed45e6b1797fbc73961e53f"; - hash = "sha256-gT+vPt9BWe1AylFqbZsoEXL8cXSpMjRdiY44Cxalwcg="; + rev = "11e4deec4c00d07b48d5b5008ab53bba267e71f5"; + hash = "sha256-VorppQ/Xs4vKzzSX5NXgtR2RQB2JBUjwgzbUbbwtVRQ="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-justice/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13077,11 +13131,11 @@ final: prev: { nvim-lint = buildVimPlugin { pname = "nvim-lint"; - version = "05-unstable-2026-06-06"; + version = "05-unstable-2026-06-25"; src = fetchgit { url = "https://codeberg.org/mfussenegger/nvim-lint/"; - rev = "99cbc3ca8a76845fca50e496be7212bebf907dd3"; - hash = "sha256-c0LEEbbWHZAKk+dpLGOjKvS1miuYLsxUM3AUf/t9ti8="; + rev = "a219b2c9e5b4765e5c845aba119dad55806fcaf1"; + hash = "sha256-pABhzTRkcxAT/ELeltz47eCAKCnzdoCtc2QRu3wm0xU="; }; meta.homepage = "https://codeberg.org/mfussenegger/nvim-lint/"; meta.license = unfree; @@ -13116,20 +13170,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - nvim-lsp-ts-utils = buildVimPlugin { - pname = "nvim-lsp-ts-utils"; - version = "0-unstable-2022-07-17"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "nvim-lsp-ts-utils"; - rev = "0a6a16ef292c9b61eac6dad00d52666c7f84b0e7"; - hash = "sha256-38YOgLDtku2BPCaNEmX0555x1QmHuuDSCZL274bBhcg="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/"; - meta.license = getLicenseFromSpdxId "Unlicense"; - meta.hydraPlatforms = [ ]; - }; - nvim-lspconfig = buildVimPlugin { pname = "nvim-lspconfig"; version = "2.10.0"; @@ -13202,12 +13242,12 @@ final: prev: { nvim-metals = buildVimPlugin { pname = "nvim-metals"; - version = "0.10.x-unstable-2026-04-29"; + version = "0.10.x-unstable-2026-07-02"; src = fetchFromGitHub { owner = "scalameta"; repo = "nvim-metals"; - rev = "4cc98f07ec96bb748a8796831767538e0e4f9be4"; - hash = "sha256-uXmLZMbJKUFua9Jg/LYJ9dGRz+QF+nw7Nz5n6uaGSdQ="; + rev = "a4b20656bf1014404dd63bf9fd5f22fcc50fee52"; + hash = "sha256-3Vqc82HfKRKw/4LrrpamInCY5uVT6dfuENhmMie0DQ8="; }; meta.homepage = "https://github.com/scalameta/nvim-metals/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -13328,12 +13368,12 @@ final: prev: { nvim-numbertoggle = buildVimPlugin { pname = "nvim-numbertoggle"; - version = "0-unstable-2026-04-08"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "sitiom"; repo = "nvim-numbertoggle"; - rev = "c5c0d305aee8532b5515914a08396b9154394c55"; - hash = "sha256-C11XegdlMo5l4NVi9txSc5uivz9qx5HCNtwQSbMm28k="; + rev = "704e098c7f056f0dae9407d8651edd3d183f3fff"; + hash = "sha256-P+Rfzsc8eQiozGPWW0pyNw2mo1cAIAd6a9kEGhZvlXU="; }; meta.homepage = "https://github.com/sitiom/nvim-numbertoggle/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13342,12 +13382,12 @@ final: prev: { nvim-origami = buildVimPlugin { pname = "nvim-origami"; - version = "1.9-unstable-2026-05-27"; + version = "1.9-unstable-2026-07-06"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-origami"; - rev = "47be2209d09755c0202da1e22a8d67af8f5ae178"; - hash = "sha256-Pg6pwiB8mEQfMDv5aLZKx06EEZuaVN1xtuVBOpd4iWo="; + rev = "02312301df125908031b27dc556adb4cd81893d6"; + hash = "sha256-d9yY/4EMl+5wetAasjhVlee1l7GGxYdqKAA9ajxaHss="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-origami/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13468,12 +13508,12 @@ final: prev: { nvim-rip-substitute = buildVimPlugin { pname = "nvim-rip-substitute"; - version = "0-unstable-2026-05-19"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-rip-substitute"; - rev = "c65592d88f0fa00396e260da99d9e419f4891e3b"; - hash = "sha256-sKfxZxB2b2jUNEc/EvCd81s9FMZqBdiMZXJJKkOUyz4="; + rev = "5aafa8e31971d2fb1dbb207f1ecd3b12b1ba0f88"; + hash = "sha256-U1/whBLVdHiS+ykAdOVdY+bIVcP/+kDE/rN2uM/D/vY="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-rip-substitute/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13482,12 +13522,12 @@ final: prev: { nvim-scissors = buildVimPlugin { pname = "nvim-scissors"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-06-30"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-scissors"; - rev = "9cc1ba06afa8b23b0d30cadc02c40940df1d701e"; - hash = "sha256-uhNlLndXpLiU0qYvnnCepqqCp5eA+GRxq/aWJcRts+U="; + rev = "77dfcafd53088c7941f2d383541aa8fdda7fd7b7"; + hash = "sha256-8zRw79IKv7suISRjcUxs/iUWxp6tb+aDDsMo6DYuQ9o="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-scissors/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13552,12 +13592,12 @@ final: prev: { nvim-sioyek-highlights = buildVimPlugin { pname = "nvim-sioyek-highlights"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-06-27"; src = fetchFromGitHub { owner = "jbuck95"; repo = "nvim-sioyek-highlights"; - rev = "753f5d309d08229325134e5992cd032d06f72ee8"; - hash = "sha256-JiHBw/3LqYW4oxT+ObvU3IsDU1Q5JaKr4TDBZautNV0="; + rev = "ed275e3766d9055503b4ad1aebb9fde75e81b80a"; + hash = "sha256-RRVUG6OMjhQy2mw8LjFUSkoZd2u1FzdJlbZiXq/vwMU="; }; meta.homepage = "https://github.com/jbuck95/nvim-sioyek-highlights/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13622,12 +13662,12 @@ final: prev: { nvim-spider = buildVimPlugin { pname = "nvim-spider"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-spider"; - rev = "4fdd56a4f45bca13a607632e15a6f9f8d1b1f99e"; - hash = "sha256-2ZJV23CZ8B3x4DPHGuWnq84Jp3gLvyCARuyqtrZEOos="; + rev = "7f021426d4a615ea8f11cabed434b1f20376abae"; + hash = "sha256-r9b0dB2lzSUDWiPiclnjk7wOrLscTkd3UxFo0ZCBcek="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-spider/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13678,12 +13718,12 @@ final: prev: { nvim-test = buildVimPlugin { pname = "nvim-test"; - version = "1.4.1"; + version = "1.4.1-unstable-2026-05-16"; src = fetchFromGitHub { owner = "klen"; repo = "nvim-test"; - tag = "1.4.1"; - hash = "sha256-mMi07UbMWmC75DFfW1b+sR2uRPxizibFwS2qcN9rpLI="; + rev = "feb834cbc806029239479f501e8492c01a2bea65"; + hash = "sha256-DTns8LG3PFFKYG6Ayt90Brf2lbZjNfDLLKUDxsqMisk="; }; meta.homepage = "https://github.com/klen/nvim-test/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13692,12 +13732,12 @@ final: prev: { nvim-tinygit = buildVimPlugin { pname = "nvim-tinygit"; - version = "1.0-unstable-2026-04-20"; + version = "1.0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-tinygit"; - rev = "f12990601dfa63c623049b470dc306ca905064c8"; - hash = "sha256-NNdwBJjVlCwR3VzN7JRMhRRNHENRO9SXNnUUr4zZ8Eg="; + rev = "7cc03bfd73863fc24e1a07e9465d3dba32336b74"; + hash = "sha256-2P8C0A2zPxlyGnex0yiKlpXUS1RpXHKZGuRDToieqXM="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-tinygit/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -13706,12 +13746,12 @@ final: prev: { nvim-tree-lua = buildVimPlugin { pname = "nvim-tree.lua"; - version = "1.17.0-unstable-2026-06-08"; + version = "1.18.0"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "82f58063d67defc620e1ef8be606fc62a7b5dc1e"; - hash = "sha256-JfOkJkTGVWPw7dhcbDNPsyeNbidrtIvzJhPYUQJ1NoY="; + tag = "v1.18.0"; + hash = "sha256-QPPtshLL7sfb3wUxr/kusA3nAEfoxgiOxayUFptGUI0="; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; meta.license = unfree; @@ -13720,12 +13760,12 @@ final: prev: { nvim-treesitter = buildVimPlugin { pname = "nvim-treesitter"; - version = "0.10.0-unstable-2026-04-03"; + version = "0.10.0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "4916d6592ede8c07973490d9322f187e07dfefac"; - hash = "sha256-PQR6tFt4lCrAZNQG7BLMD1IiCKja9wDS1S4laGJf/HE="; + rev = "7248feaca45e4d944591497964bc19afa89ad1c6"; + hash = "sha256-FQj0+qeaW9rLy3dUbGbUG4UYtnry7UBA1n9SM2qXLdk="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -13832,12 +13872,12 @@ final: prev: { nvim-treesitter-textobjects = buildVimPlugin { pname = "nvim-treesitter-textobjects"; - version = "0-unstable-2026-04-07"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "851e865342e5a4cb1ae23d31caf6e991e1c99f1e"; - hash = "sha256-fOpRElIwvsFWm4AwETx7fpC3RtdH2BpCfX4YHVitqw0="; + rev = "898ee307df58f854d11cd7edd06472574d48014e"; + hash = "sha256-naZ+p5RrC+uUyFRaksmozDfNgJRifff+9TDWx79DCPk="; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -13958,12 +13998,12 @@ final: prev: { nvim-various-textobjs = buildVimPlugin { pname = "nvim-various-textobjs"; - version = "0-unstable-2026-04-13"; + version = "0-unstable-2026-06-22"; src = fetchFromGitHub { owner = "chrisgrieser"; repo = "nvim-various-textobjs"; - rev = "ad78e9d925c95d675b32dd7ba6d253f96ce063fe"; - hash = "sha256-FZKW7/9Y6MRxEbd00HBt9eGpJWbAP8GNM6p8M9s/3ts="; + rev = "fed132a88454e52c9691f4751090031944af4a7e"; + hash = "sha256-eYHMSng5gnnD6X71GlfUWbeX74z5CcXr35JLJZeiOCg="; }; meta.homepage = "https://github.com/chrisgrieser/nvim-various-textobjs/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14028,12 +14068,12 @@ final: prev: { nvim_context_vt = buildVimPlugin { pname = "nvim_context_vt"; - version = "0-unstable-2025-09-17"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "nvim_context_vt"; - rev = "fadbd9e57af72f6df3dd33df32ee733aa01cdbc0"; - hash = "sha256-ghpXrJgEN0CCCEXDsqe9G34KTGpAc0x8UhMQNmakp2c="; + rev = "b72accf0ba6772c9ae6e37f4540a81f1bc715f1a"; + hash = "sha256-ahqp4VVPyt7Cev98Icr2p8RbbDOGiUYIsbOXxX6AwkE="; }; meta.homepage = "https://github.com/andersevenrud/nvim_context_vt/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14126,12 +14166,12 @@ final: prev: { obsidian-nvim = buildVimPlugin { pname = "obsidian.nvim"; - version = "3.16.4"; + version = "3.16.5"; src = fetchFromGitHub { owner = "obsidian-nvim"; repo = "obsidian.nvim"; - tag = "v3.16.4"; - hash = "sha256-9Su5t8cJAHlXV+EE4GLa1+BhezfHZIZgl2P6kBrkX8E="; + tag = "v3.16.5"; + hash = "sha256-jSaAT7DCGsgzNJCd+ey3My2zqQ7kDcRm5ALDTOJKmJM="; }; meta.homepage = "https://github.com/obsidian-nvim/obsidian.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -14140,12 +14180,12 @@ final: prev: { ocaml-nvim = buildVimPlugin { pname = "ocaml.nvim"; - version = "1.0.0-unstable-2026-05-28"; + version = "1.0.0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "tarides"; repo = "ocaml.nvim"; - rev = "f1ef89e7f2a0c24974798b1c9ad7b73222283d08"; - hash = "sha256-ViZPylvq40WM8WibABWnDlWMY45b4BATkLFu5x4kFrA="; + rev = "d74934117fb7a513e64601ad1d1b53a34b00b01f"; + hash = "sha256-zJJZP8jxa7e9Fn0N8JFzfP3d2TElkASFt8ptaWCOYpM="; }; meta.homepage = "https://github.com/tarides/ocaml.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14182,12 +14222,12 @@ final: prev: { octo-nvim = buildVimPlugin { pname = "octo.nvim"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "7fed87415c401954f73401bbed0fd736b9611e7c"; - hash = "sha256-9f8ZKK8OKlQSMjvFW6VY/861IZ/EugKfj5WLDkjg+ac="; + rev = "8476766529b7c0ee9b7da12b6dbce1b716bb62cd"; + hash = "sha256-Ahxcp7UCoISeLOhZAkX966lyHk8jiSwWy9SAlUnzJo4="; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14238,12 +14278,12 @@ final: prev: { oklch-color-picker-nvim = buildVimPlugin { pname = "oklch-color-picker.nvim"; - version = "4.1.2"; + version = "5.0.2"; src = fetchFromGitHub { owner = "eero-lehtinen"; repo = "oklch-color-picker.nvim"; - tag = "v4.1.2"; - hash = "sha256-KEmKDWKQC87rAghhOxbJN4umZvBSx0Um0ur3GdMZFhU="; + tag = "v5.0.2"; + hash = "sha256-cFCA/4xoY/P0h4aL2y6ZVdWiizhz1aRplE6RaQoxeYY="; }; meta.homepage = "https://github.com/eero-lehtinen/oklch-color-picker.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14392,12 +14432,12 @@ final: prev: { onenord-nvim = buildVimPlugin { pname = "onenord.nvim"; - version = "0.7.0-unstable-2026-05-14"; + version = "0.7.0-unstable-2026-07-01"; src = fetchFromGitHub { owner = "rmehri01"; repo = "onenord.nvim"; - rev = "8b6fe1e0f260ca0b8201ef6a8e2c97e0f38ea35d"; - hash = "sha256-iqnWSAV16m5RTHs3YeYolF+amXvHbsnkHNtVa2mBhyY="; + rev = "5240bfb79bcab7e03508626c5283cfc417b79169"; + hash = "sha256-17HuRmDezELDyBscbFuksflCoiVXuALG+xbGKb6vCJo="; }; meta.homepage = "https://github.com/rmehri01/onenord.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14434,12 +14474,12 @@ final: prev: { opencode-nvim = buildVimPlugin { pname = "opencode.nvim"; - version = "0.11.0"; + version = "0.13.4"; src = fetchFromGitHub { owner = "nickjvandyke"; repo = "opencode.nvim"; - tag = "v0.11.0"; - hash = "sha256-i6Ty/TXy9Ph6Ex39qumfgH7ArenH159EHy1UFvNBJfI="; + tag = "v0.13.4"; + hash = "sha256-exXm85BrPcHx8DU5vih7DNv8XPLEzxI2MrPLWoxDRnk="; }; meta.homepage = "https://github.com/nickjvandyke/opencode.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14518,12 +14558,12 @@ final: prev: { otter-nvim = buildVimPlugin { pname = "otter.nvim"; - version = "2.14.5"; + version = "2.14.6"; src = fetchFromGitHub { owner = "jmbuhr"; repo = "otter.nvim"; - tag = "v2.14.5"; - hash = "sha256-kTDFzud+Kx3YAI36QhEi+WjVkB6Owao7PdUBX3mLXKw="; + tag = "v2.14.6"; + hash = "sha256-hfyZ9eG6dMbDzPtQ8wIrx4B3la2VQqnZuXS2eG9gaFU="; }; meta.homepage = "https://github.com/jmbuhr/otter.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14603,12 +14643,12 @@ final: prev: { palenight-vim = buildVimPlugin { pname = "palenight.vim"; - version = "0-unstable-2023-04-27"; + version = "0-unstable-2026-06-20"; src = fetchFromGitHub { owner = "drewtempelmeyer"; repo = "palenight.vim"; - rev = "5552a6349bcd927df9f17db34f017b77b963e503"; - hash = "sha256-3zgTux85/9lttmIik+IVUJhXbwJCo4SRJDAD8g6tv1U="; + rev = "9e9b102c54b830b72f51917b6b86c3b3b02dcea2"; + hash = "sha256-WRe+PZdfbo0DyOwrtPCh1pi6NZoaTGx8uiEzN8mOmEw="; }; meta.homepage = "https://github.com/drewtempelmeyer/palenight.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -14643,6 +14683,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + pantran-nvim = buildVimPlugin { + pname = "pantran.nvim"; + version = "0-unstable-2025-04-07"; + src = fetchFromGitHub { + owner = "potamides"; + repo = "pantran.nvim"; + rev = "b87c3ae48cba4659587fb75abd847e5b7a7c9ca0"; + hash = "sha256-b4odpXwh+BmFsK5v3HmSWG43FA+ygOAPU+qFNy6vWDU="; + }; + meta.homepage = "https://github.com/potamides/pantran.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + papercolor-theme = buildVimPlugin { pname = "papercolor-theme"; version = "1.0-unstable-2024-03-12"; @@ -14869,12 +14923,12 @@ final: prev: { pi-nvim = buildVimPlugin { pname = "pi.nvim"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "pablopunk"; repo = "pi.nvim"; - rev = "4ba6db0dd30406995a2e46e4f1ae39377e66e733"; - hash = "sha256-z1gN1TKQKrM8dMh8rQMaAtGgi4ELV21WgswJBVyXulE="; + rev = "9b619b4f9fb96fa4dc1a6a7776a651980cd819a0"; + hash = "sha256-xtA3Ylu6kB5QF3KJ+4eDDO1PJhcTZVZyS3ei96Hs4bM="; }; meta.homepage = "https://github.com/pablopunk/pi.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15036,6 +15090,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + present-nvim = buildVimPlugin { + pname = "present.nvim"; + version = "0-unstable-2025-03-03"; + src = fetchFromGitHub { + owner = "Chaitanyabsprip"; + repo = "present.nvim"; + rev = "c76e6996b346ff3ec6260c2461e56946c4a72d0d"; + hash = "sha256-EPQlVv4zn3LNgYu58xpp3OlLrFOW+VuRgiP0YzO6REw="; + }; + meta.homepage = "https://github.com/Chaitanyabsprip/present.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + presenting-vim = buildVimPlugin { pname = "presenting.vim"; version = "0.1.0-unstable-2023-12-30"; @@ -15094,12 +15162,12 @@ final: prev: { project-nvim = buildVimPlugin { pname = "project.nvim"; - version = "5.0.0-1"; + version = "5.2.0-1"; src = fetchFromGitHub { owner = "DrKJeff16"; repo = "project.nvim"; - tag = "v5.0.0-1"; - hash = "sha256-zJ/UMESO69829eGgsq53a/LttRSE1bRTo2vy4HjaHY8="; + tag = "v5.2.0-1"; + hash = "sha256-p/p7VxmuNusgUXtPpiCGa+BSgDDS/yKvtAV93cKmIEg="; }; meta.homepage = "https://github.com/DrKJeff16/project.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -15486,12 +15554,12 @@ final: prev: { refactoring-nvim = buildVimPlugin { pname = "refactoring.nvim"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "624c01e8175901484eac74512baf35e9dfe269b8"; - hash = "sha256-PPGSMbLVHLghqaVfRsViw7gYHrL4RtiH0Svw8H65TpE="; + rev = "64e10d782ae5b9653558482910213b8946651456"; + hash = "sha256-lclcY2rNbpc8X0whwsVFwfC+eoPvSw3IFY2SQl0TZPE="; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15570,12 +15638,12 @@ final: prev: { render-markdown-nvim = buildVimPlugin { pname = "render-markdown.nvim"; - version = "8.12.0-unstable-2026-05-25"; + version = "8.13.0"; src = fetchFromGitHub { owner = "MeanderingProgrammer"; repo = "render-markdown.nvim"; - rev = "5adf0895310c1904e5abfaad40a2baad7fe44a07"; - hash = "sha256-vB8rFNSUW9pcBiCjtsA+LRbuysP8HnpsCQHPEFyHTrM="; + tag = "v8.13.0"; + hash = "sha256-ukJUaqEYI60o/lyLM5GaKsRdMW/24IZnzVzPB9/Q/zo="; }; meta.homepage = "https://github.com/MeanderingProgrammer/render-markdown.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15711,12 +15779,12 @@ final: prev: { roslyn-nvim = buildVimPlugin { pname = "roslyn.nvim"; - version = "0-unstable-2026-06-07"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "seblyng"; repo = "roslyn.nvim"; - rev = "9c5da79216e5776e020dcc6c157983f5352f3f11"; - hash = "sha256-EGsDK45Tl+slGT0fibcwQDdHS1obJHPWgd1+jaOw8fg="; + rev = "b4954e97e145bd8129b3bbe99809759f6ced2235"; + hash = "sha256-AuJNxfvNYnqPvihxBn1vADdvwoDNInVbOLS0Pq5q9v8="; }; meta.homepage = "https://github.com/seblyng/roslyn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -15892,12 +15960,12 @@ final: prev: { scnvim = buildVimPlugin { pname = "scnvim"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-16"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "ec347b24168ac922de4dcddc181efd2fcdcfa0d0"; - hash = "sha256-cqZF3b+DkOQUOSU502vGQx8RNzH4b97B9zqHO9v8IBI="; + rev = "876732590ef3f409c9705f3659fa1061db2dc7bf"; + hash = "sha256-qpOKAXkj6QjitypJL6YW7qTgQ0iJZpZZhA9tpr4Ya4g="; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -15990,12 +16058,12 @@ final: prev: { searchbox-nvim = buildVimPlugin { pname = "searchbox.nvim"; - version = "0-unstable-2026-06-01"; + version = "0-unstable-2026-06-20"; src = fetchFromGitHub { owner = "VonHeikemen"; repo = "searchbox.nvim"; - rev = "e66c850fbdebf493969da87e4f665acfb539b9c3"; - hash = "sha256-3HFofdEzVK+kXENrll8rxq/Huyg8HhiDg8P7n0JFQXE="; + rev = "f86a9f7943ffa4dd5829ef0fc7c55fa2f95729ba"; + hash = "sha256-aLyflmkPj9aaqDeShyelD9NYwDl4V2MNY7W/KP47P7M="; }; meta.homepage = "https://github.com/VonHeikemen/searchbox.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16060,12 +16128,12 @@ final: prev: { seoul256-vim = buildVimPlugin { pname = "seoul256.vim"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "junegunn"; repo = "seoul256.vim"; - rev = "88997adf362f57c3eadedde6b8c1393fe218c02c"; - hash = "sha256-Em9vpXJmUyLfBHOLHVQQUGsOuluwyx+J4Q5vU8akyS0="; + rev = "0357ff3e44faab66c98bc98dfc89c834e37012da"; + hash = "sha256-TEu6ybYthrtTd7k2HkQEEH1z2iImU0I6SEclt87oAGQ="; }; meta.homepage = "https://github.com/junegunn/seoul256.vim/"; meta.license = unfree; @@ -16157,6 +16225,20 @@ final: prev: { meta.hydraPlatforms = [ ]; }; + slimline-nvim = buildVimPlugin { + pname = "slimline.nvim"; + version = "2.10.0"; + src = fetchFromGitHub { + owner = "sschleemilch"; + repo = "slimline.nvim"; + tag = "v2.10.0"; + hash = "sha256-ma+79ysHuTe4KxmFjxO0xMCz/bvhc3mc3sXBNcecjdI="; + }; + meta.homepage = "https://github.com/sschleemilch/slimline.nvim/"; + meta.license = getLicenseFromSpdxId "MIT"; + meta.hydraPlatforms = [ ]; + }; + slimv = buildVimPlugin { pname = "slimv"; version = "0.9.13-unstable-2026-05-17"; @@ -16187,12 +16269,12 @@ final: prev: { smart-splits-nvim = buildVimPlugin { pname = "smart-splits.nvim"; - version = "2.1.0-unstable-2026-06-05"; + version = "2.1.0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "smart-splits.nvim"; - rev = "6806149fd36d1c5e797debe3e18b2c07219b685a"; - hash = "sha256-INxUHLtQBnnmbKBmQNgcdm4FxP5Amig2Q2s6pAub11U="; + rev = "de39b4d75695e2377401c7d05f896657637d244b"; + hash = "sha256-Xqnre4RfIID/m8hXUpcMrsLssjfp/cbSpG24cory2BI="; }; meta.homepage = "https://github.com/mrjones2014/smart-splits.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16201,12 +16283,12 @@ final: prev: { smartcolumn-nvim = buildVimPlugin { pname = "smartcolumn.nvim"; - version = "1.1.1-unstable-2025-07-21"; + version = "1.1.1-unstable-2026-07-20"; src = fetchFromGitHub { owner = "m4xshen"; repo = "smartcolumn.nvim"; - rev = "b9cdbdf42f7ac5a659204cd5926017c7ff724a19"; - hash = "sha256-QAb0O/ZwTVogRyTK8+Y4ORaN6nVaeYepKgfSCF/fIPU="; + rev = "5351ae24e992a397d2abac48b7774dc8ef0acf40"; + hash = "sha256-+ICVS16n0CFWbTqBzGkvxQohyYiAvr6gIxZqura3PUw="; }; meta.homepage = "https://github.com/m4xshen/smartcolumn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16466,12 +16548,12 @@ final: prev: { spellwarn-nvim = buildVimPlugin { pname = "spellwarn.nvim"; - version = "0-unstable-2026-03-05"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "ravibrock"; repo = "spellwarn.nvim"; - rev = "c98cfca978791cae3edaced7056bd340debee8fe"; - hash = "sha256-rLsiBIifNC8zwUNsAJ8AeTlDS9IS/y3XEKfF5FZ2hZI="; + rev = "3e818a7da69bfb342e2d84fdef9cb9f639d047d3"; + hash = "sha256-WHXJaSTB91B0S3YizCJLBriGQDvYQKVK3I8WT97YQEc="; }; meta.homepage = "https://github.com/ravibrock/spellwarn.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -16691,12 +16773,12 @@ final: prev: { statuscol-nvim = buildVimPlugin { pname = "statuscol.nvim"; - version = "0-unstable-2025-06-02"; + version = "0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "statuscol.nvim"; - rev = "c46172d0911aa5d49ba5f39f4351d1bb7aa289cc"; - hash = "sha256-nFEQRJ5V+0RskJoAVRPAe2yrkORMTg9Jm13ClTmTSgk="; + rev = "887b8a03ea3804628505c9002fd07bd06a3db2e0"; + hash = "sha256-YZ+vXxTREp2OIxBQGt4pYP8hWcswM9XN5BlOSzd6g0Y="; }; meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17071,12 +17153,12 @@ final: prev: { tagbar = buildVimPlugin { pname = "tagbar"; - version = "3.1.1-unstable-2026-05-17"; + version = "3.1.1-unstable-2026-06-14"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "b37b05ff1925b0b3931f031ebf88690aa0974375"; - hash = "sha256-Vqjq6ClXntfg2579MG37MQJWv6tN/4Y5/uuF4OqFMDQ="; + rev = "07cb8247487208124978daff8e13624667635457"; + hash = "sha256-bezgPiUz5EKKjTLuP6SpWGRCEYo8VXGvoF96qhR0aF8="; }; meta.homepage = "https://github.com/preservim/tagbar/"; meta.license = unfree; @@ -17886,12 +17968,12 @@ final: prev: { tinted-nvim = buildVimPlugin { pname = "tinted-nvim"; - version = "1.0.0-unstable-2026-06-02"; + version = "1.0.0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-nvim"; - rev = "836f016255b886a267a04c8ee190e2f667b092c0"; - hash = "sha256-cKVmIBPTlzOngk/jIOsYw5dJvVzg8nRxz2SfFbqwUYU="; + rev = "a229fe0efadb4d9bfa92cad16175bb4e93fa70d4"; + hash = "sha256-a79rQSpPyCH/zbunrW9NxtsnwKVcQiwLzhW/1YNl3a4="; }; meta.homepage = "https://github.com/tinted-theming/tinted-nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17900,12 +17982,12 @@ final: prev: { tinted-vim = buildVimPlugin { pname = "tinted-vim"; - version = "01-unstable-2026-05-04"; + version = "01-unstable-2026-07-15"; src = fetchFromGitHub { owner = "tinted-theming"; repo = "tinted-vim"; - rev = "c086276f0227f41d17b68b1fe2e378b3b113401d"; - hash = "sha256-qfG5xFnAZd3o1kGL8xQPAkqHHvx+twJMkwCrL2Wdkrg="; + rev = "1ee9f7bbb3e5928b84ab0bedaf04f6ad9dafdfb2"; + hash = "sha256-fwFxfq0Kr/EPdx4r9qTjzvjxkQsNoAD9KvB6kP3NwlE="; }; meta.homepage = "https://github.com/tinted-theming/tinted-vim/"; meta.license = unfree; @@ -17914,12 +17996,12 @@ final: prev: { tiny-cmdline-nvim = buildVimPlugin { pname = "tiny-cmdline.nvim"; - version = "0-unstable-2026-05-31"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-cmdline.nvim"; - rev = "b1db8607a78f0c23b3bae08e079b1b7f147619d7"; - hash = "sha256-O2j7KGqlFGl1oHW/0yRmDDTGIHn4hnpShgHcX++KWz4="; + rev = "e247d9ee4c980734f8f8bf616d31e0ab7c27485d"; + hash = "sha256-DEfoqGFoGdybgZyO+Jqxz4gYkrgoek4cQYulLEsvnU8="; }; meta.homepage = "https://github.com/rachartier/tiny-cmdline.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17942,12 +18024,12 @@ final: prev: { tiny-glimmer-nvim = buildVimPlugin { pname = "tiny-glimmer.nvim"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-glimmer.nvim"; - rev = "f26728abf811324d7ed6b035a11d7b76a27c06c3"; - hash = "sha256-CUxWZOoEj2kamwlhcpz0K1IR+7TfFC22RPIVj4x6TeI="; + rev = "9a48d8a7436231cb16d47c88f924702e5602870a"; + hash = "sha256-ONv/NE4D5vWNV56oJc/h5/nniOWjH5eUG0Q80dMVSxg="; }; meta.homepage = "https://github.com/rachartier/tiny-glimmer.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -17956,12 +18038,12 @@ final: prev: { tiny-inline-diagnostic-nvim = buildVimPlugin { pname = "tiny-inline-diagnostic.nvim"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "rachartier"; repo = "tiny-inline-diagnostic.nvim"; - rev = "e930d0a46031645040d5492595b46cdf6ab3514f"; - hash = "sha256-m4ax8+4P+fWtne7hLn3I9RXPeC8y/CZXqtqKCVa8e7c="; + rev = "6264451f14119d63a52580e5198d6baf8518b0b2"; + hash = "sha256-dG4eCcIRaHOPj75DNOBJAqo2Vy7LAQ0QfWOVD94FloA="; }; meta.homepage = "https://github.com/rachartier/tiny-inline-diagnostic.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18154,15 +18236,15 @@ final: prev: { transparent-nvim = buildVimPlugin { pname = "transparent.nvim"; - version = "0-unstable-2025-06-22"; + version = "0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "xiyaowong"; repo = "transparent.nvim"; - rev = "8ac59883de84e9cd1850ea25cf087031c5ba7d54"; - hash = "sha256-GlN7/+TmXld2UVPN2rDP7nKqbnswiezmGXn+uGK5I5c="; + rev = "e00ca1cf09caef575edf8da7e5a8b9193893b4c7"; + hash = "sha256-VMWvh5QLV7y65SPEbKacrdL6WvHSF+z+LEaWugxqQOI="; }; meta.homepage = "https://github.com/xiyaowong/transparent.nvim/"; - meta.license = unfree; + meta.license = getLicenseFromSpdxId "MIT"; meta.hydraPlatforms = [ ]; }; @@ -18196,12 +18278,12 @@ final: prev: { treewalker-nvim = buildVimPlugin { pname = "treewalker.nvim"; - version = "0-unstable-2026-06-04"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "aaronik"; repo = "treewalker.nvim"; - rev = "e1779657d41df2fdf8fd825712051f90e7c9c836"; - hash = "sha256-Byg5O1AndhqoBpv8VyGrGaiNsq4mGy57yoV3lFJDH2c="; + rev = "228f9cd84e7ee45c72e4c9c5c0523e50f13ad520"; + hash = "sha256-TSwvL0e4JmzjdcphNkft1G/leJ8VCEZ7f8xYNo9/q18="; }; meta.homepage = "https://github.com/aaronik/treewalker.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18295,12 +18377,12 @@ final: prev: { ts-autotag-nvim = buildVimPlugin { pname = "ts-autotag.nvim"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "tronikelis"; repo = "ts-autotag.nvim"; - rev = "b1d0dd4fe5e63e9a744595bdfd41b74c3dea2e88"; - hash = "sha256-lGDnNpG5kcKOI2AlVovuuTHx+AntKagw9c9e1Eg4T2M="; + rev = "6178353d9003e91eb053d69cf9a4d72e28137daa"; + hash = "sha256-JM6r91+3ehAk24kDt0O9iZhTPfXYt+zx5+86Ihh+fOU="; }; meta.homepage = "https://github.com/tronikelis/ts-autotag.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18309,12 +18391,12 @@ final: prev: { ts-comments-nvim = buildVimPlugin { pname = "ts-comments.nvim"; - version = "1.5.0-unstable-2025-10-28"; + version = "1.5.0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "folke"; repo = "ts-comments.nvim"; - rev = "123a9fb12e7229342f807ec9e6de478b1102b041"; - hash = "sha256-ORK3XpHANaqvp1bfMG2GJmAiaOsLoGW82ebL/FJtKaA="; + rev = "a59d6092213447450191122c9346f309161504cb"; + hash = "sha256-uqFE+EXQt6+UqwxVRdgk7oY05DPo5sV1q9KvvE1xVGk="; }; meta.homepage = "https://github.com/folke/ts-comments.nvim/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -18420,20 +18502,6 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - typescript-nvim = buildVimPlugin { - pname = "typescript.nvim"; - version = "0-unstable-2023-08-12"; - src = fetchFromGitHub { - owner = "jose-elias-alvarez"; - repo = "typescript.nvim"; - rev = "4de85ef699d7e6010528dcfbddc2ed4c2c421467"; - hash = "sha256-tStomym4qd7IXj/ohYAc3akImNsOJdC7nQL+CkdMomc="; - }; - meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/"; - meta.license = getLicenseFromSpdxId "Unlicense"; - meta.hydraPlatforms = [ ]; - }; - typescript-tools-nvim = buildVimPlugin { pname = "typescript-tools.nvim"; version = "0-unstable-2025-11-18"; @@ -18478,12 +18546,12 @@ final: prev: { typst-preview-nvim = buildVimPlugin { pname = "typst-preview.nvim"; - version = "1.4.2-unstable-2026-03-30"; + version = "1.5.0"; src = fetchFromGitHub { owner = "chomosuke"; repo = "typst-preview.nvim"; - rev = "87db18b8d19c8b0eed399f52e4c527ce5afe4817"; - hash = "sha256-EUYiHzDWJQM9Guk6ZM5GWE/etB+GHM48myRg/BPtOV0="; + tag = "v1.5.0"; + hash = "sha256-UTugVfydwGTmf5RomQ0R72Yf6fSz8gGeY/fg51qW454="; }; meta.homepage = "https://github.com/chomosuke/typst-preview.nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -18576,12 +18644,12 @@ final: prev: { unicode-vim = buildVimPlugin { pname = "unicode.vim"; - version = "21-unstable-2025-09-22"; + version = "21-unstable-2026-06-24"; src = fetchFromGitHub { owner = "chrisbra"; repo = "unicode.vim"; - rev = "902cd2b0a41a38528d080f8dd7a16ec5a865ebdd"; - hash = "sha256-Cv1ETqnqbVQgKrXTMDA1JgcqQSIzK6S7i9pZHDNI4BU="; + rev = "762993f8a8070c3126323a076510cf10de2ff3ce"; + hash = "sha256-Pc5tGq6DoiZUK98PbJrI7AKFjw6koGaPgiw2BbCb3cs="; }; meta.homepage = "https://github.com/chrisbra/unicode.vim/"; meta.license = unfree; @@ -18744,12 +18812,12 @@ final: prev: { vague-nvim = buildVimPlugin { pname = "vague.nvim"; - version = "2.1.2"; + version = "2.1.4"; src = fetchFromGitHub { owner = "vague-theme"; repo = "vague.nvim"; - tag = "v2.1.2"; - hash = "sha256-8y4Dc+AXx4+DmnOAYYD6Yyi0GDyI6fwdM4AKsmM5hZU="; + tag = "v2.1.4"; + hash = "sha256-57dHWOUPFIyFdLEs9RDv0cateLRc8XAqT4TmDUSQyV4="; }; meta.homepage = "https://github.com/vague-theme/vague.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -18800,12 +18868,12 @@ final: prev: { vifm-vim = buildVimPlugin { pname = "vifm.vim"; - version = "0.14-unstable-2026-06-07"; + version = "0.14-unstable-2026-07-12"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "6bffbab9c448f2814217ea2f7f982ad73b8fa718"; - hash = "sha256-/8lN8y20+g9pWzBrXgVArgZQq0CfXyLGRVDpweDmguE="; + rev = "9102ad4198c4f3adeef4b039c042866eb9345cdd"; + hash = "sha256-BLI7TEtSfXG1Md8lBnejJ3vUuXh3LJyZH6PJGHMoCuI="; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; meta.license = unfree; @@ -19444,12 +19512,12 @@ final: prev: { vim-autoformat = buildVimPlugin { pname = "vim-autoformat"; - version = "0-unstable-2026-01-15"; + version = "0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "vim-autoformat"; repo = "vim-autoformat"; - rev = "34c5309ab11d175c73d8ab7195a4d831b9f502c4"; - hash = "sha256-LQVXUmrNOvJr78ULU9/8SRtHec6p9iNUT1YBDuxFYVQ="; + rev = "38161c4e875cf198789f32e0f773039696a431f0"; + hash = "sha256-V1tun/l0bVgsT0jqdRF3Iqr5CtllQyX+gJY27aDf5xw="; }; meta.homepage = "https://github.com/vim-autoformat/vim-autoformat/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -20186,12 +20254,12 @@ final: prev: { vim-dadbod-ui = buildVimPlugin { pname = "vim-dadbod-ui"; - version = "0-unstable-2026-02-11"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "vim-dadbod-ui"; - rev = "07e92e22114cc5b1ba4938d99897d85b58e20475"; - hash = "sha256-Of/9Ju2pkMEAZdSnDoRGxGSCBbR0e0oSRTts1VXVCf4="; + rev = "afd07819d8efcefc3317205b855ad4e3513b0011"; + hash = "sha256-jyNaKXUM0uWsZO4G0y09hgfq5Ned9bFSjahL/T/V7Fs="; }; meta.homepage = "https://github.com/kristijanhusak/vim-dadbod-ui/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -20284,12 +20352,12 @@ final: prev: { vim-dirvish = buildVimPlugin { pname = "vim-dirvish"; - version = "1.0-unstable-2026-06-02"; + version = "1.0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-dirvish"; - rev = "ad478b4ac86484edc525bfc5379f261204dfbf4c"; - hash = "sha256-D76E8Wnl3x9RMUkpG7/izFLSTtuhp0/TMX/ZWP4TvD4="; + rev = "4cbf39ce024c57f700c4d5502cc172ea91d69360"; + hash = "sha256-w2sdZLTh8kk0M6NuZ1a4MYpr+tNi9LQwbTiJXeoXiUs="; }; meta.homepage = "https://github.com/justinmk/vim-dirvish/"; meta.license = unfree; @@ -20788,12 +20856,12 @@ final: prev: { vim-flog = buildVimPlugin { pname = "vim-flog"; - version = "3.0.0-unstable-2025-03-19"; + version = "3.0.0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "rbong"; repo = "vim-flog"; - rev = "665b16ac8915f746bc43c9572b4581a5e9047216"; - hash = "sha256-x8fUmcuBLEQwZD+m7gEanpPppukRa6NoalNehY/2JuM="; + rev = "c8a573b5a829d0a3ed1b72c87dd62d832b665e87"; + hash = "sha256-BKnp7LKONUT/BRu7kS8Yvmj7xcFgrTWxHtz2wyAhtYg="; }; meta.homepage = "https://github.com/rbong/vim-flog/"; meta.license = unfree; @@ -21082,12 +21150,12 @@ final: prev: { vim-go = buildVimPlugin { pname = "vim-go"; - version = "1.29-unstable-2026-03-28"; + version = "1.29-unstable-2026-07-18"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "f4b4ba17035aebcd222df90375c1cbb1dc4d8c5b"; - hash = "sha256-0mmt7i8GImhVR2kmr8MOQHFybw8QDXVRrYVg/ty30zU="; + rev = "d69962d20a2a60e4bdc92a2281e5f0aaaa109635"; + hash = "sha256-tXA45Hhnr9Vv4p6MyNAxj2SOC+P8eGkIEVE8PDnyFx4="; }; meta.homepage = "https://github.com/fatih/vim-go/"; meta.license = unfree; @@ -21124,11 +21192,11 @@ final: prev: { vim-graphql = buildVimPlugin { pname = "vim-graphql"; - version = "1.6-unstable-2026-04-14"; + version = "1.6-unstable-2026-06-20"; src = fetchFromGitHub { owner = "jparise"; repo = "vim-graphql"; - rev = "640d32063cd2526e2395db1b67fcd733524099e2"; + rev = "d6c0991b70c0d6f4b3fa3283a2838d2ce47635d0"; hash = "sha256-hN+YE6PQnApdK5dKERJBVpKepicYIgsfY5mpZiiOcfE="; }; meta.homepage = "https://github.com/jparise/vim-graphql/"; @@ -21194,12 +21262,12 @@ final: prev: { vim-habamax = buildVimPlugin { pname = "vim-habamax"; - version = "0-unstable-2026-06-10"; + version = "0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "habamax"; repo = "vim-habamax"; - rev = "cf275f3cb71afb52773cced233f5da3c8e168250"; - hash = "sha256-oiTjsrld7jqcaBYP/q4ndQlySoY1XTxIv/Jj9zqb6fo="; + rev = "f6e3f8d68606e51deaeca591f2036b3e14fb120c"; + hash = "sha256-nfo4OXAC3r99MEWO567kgQodPaqDTWEZFCVRthafNbU="; }; meta.homepage = "https://github.com/habamax/vim-habamax/"; meta.license = unfree; @@ -21517,12 +21585,12 @@ final: prev: { vim-illuminate = buildVimPlugin { pname = "vim-illuminate"; - version = "0-unstable-2025-05-24"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "0d1e93684da00ab7c057410fecfc24f434698898"; - hash = "sha256-KqAJRCtDBG5xsvNsqkxoBdDckg02u4NBBreYQw7BphA="; + rev = "91313e598ca62e110bc71535c49069b66b9883c9"; + hash = "sha256-3HM1aqFasEWXHaLQbJnax6Spw71TVd23BjsmH8jdTtQ="; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -21868,12 +21936,12 @@ final: prev: { vim-just = buildVimPlugin { pname = "vim-just"; - version = "0-unstable-2026-05-10"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "NoahTheDuke"; repo = "vim-just"; - rev = "6034ccf6a4682c91f90f38fae4c882068e6723fe"; - hash = "sha256-3ytgSsTvtmq9jC2qyeBzKLK+x0UppyVODggcspDX7ZE="; + rev = "d9aa6784fe3a870e78ba82b5d176c0c5745e23f7"; + hash = "sha256-/QrVhax5PTidfSi6WAxJNX4mbBhUGFZLlG3WsqoT2Ro="; }; meta.homepage = "https://github.com/NoahTheDuke/vim-just/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22176,12 +22244,12 @@ final: prev: { vim-lsp-settings = buildVimPlugin { pname = "vim-lsp-settings"; - version = "0.0.1-unstable-2026-05-21"; + version = "0.0.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "mattn"; repo = "vim-lsp-settings"; - rev = "1558bbaba4cbb593901e3dfc4d0f1a0cd212b09c"; - hash = "sha256-wMF4y4eMz7UR50GpBvStDsQ0SpKUt48tll6rqEr6AHY="; + rev = "22d06c9e4b620d5c2f055aec590dec6d383e5316"; + hash = "sha256-LiWvL9QpZFPUH+Uek19ce6/e8B6uATmje/emUvyLWJk="; }; meta.homepage = "https://github.com/mattn/vim-lsp-settings/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -22316,12 +22384,12 @@ final: prev: { vim-matchup = buildVimPlugin { pname = "vim-matchup"; - version = "0.8.0-unstable-2026-05-19"; + version = "0.8.0-unstable-2026-06-27"; src = fetchFromGitHub { owner = "andymass"; repo = "vim-matchup"; - rev = "a2d618496223386844acb5a6763cfc3cc1357af1"; - hash = "sha256-6v4kWrOxGvrtSkL7itcxXgOarKWmb0y++8mLnyc1XRI="; + rev = "055881643e1b37038a572c883de7b1969716db77"; + hash = "sha256-8PmYDrvUzUdg/ErnIGPdK8eZH7EvZezfpsjAjy/sAbw="; }; meta.homepage = "https://github.com/andymass/vim-matchup/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23926,11 +23994,11 @@ final: prev: { vim-solarized8 = buildVimPlugin { pname = "vim-solarized8"; - version = "1.6.4-unstable-2026-03-11"; + version = "1.6.4-unstable-2026-06-11"; src = fetchgit { url = "https://codeberg.org/lifepillar/vim-solarized8/"; - rev = "5dfbfb00be8237619c680302fc9250e391b1686a"; - hash = "sha256-qJLlHsXKcLC+bpirfcuBj3igK9dDk8L9oVGPzWhtkEI="; + rev = "1cb22c68158a3e27cf5943052a4bd36c3dd4151c"; + hash = "sha256-XPhiSwyV0A23e6NOEb8OejC68WtVVTL5A4YranlghZs="; }; meta.homepage = "https://codeberg.org/lifepillar/vim-solarized8/"; meta.license = unfree; @@ -23981,12 +24049,12 @@ final: prev: { vim-spirv = buildVimPlugin { pname = "vim-spirv"; - version = "0.5.2-unstable-2026-05-28"; + version = "0.5.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "kbenzie"; repo = "vim-spirv"; - rev = "e7de5b5adbb3c59014d98cf0d1198919f9fa5e1c"; - hash = "sha256-MoHDekfBwUBBsrR7AYkL3tT0aSIDqcFOK13+mEjdpfo="; + rev = "34b44acbdbfffbfa161569fc255ac56e7f72ec1f"; + hash = "sha256-yW/B8UqzfXlPpWVBTW5ROBq7UrJCqptM/4xKFdSnKhw="; }; meta.homepage = "https://github.com/kbenzie/vim-spirv/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -23995,12 +24063,12 @@ final: prev: { vim-splunk = buildVimPlugin { pname = "vim-splunk"; - version = "0-unstable-2026-05-24"; + version = "0-unstable-2026-05-26"; src = fetchFromGitHub { owner = "yorokobi"; repo = "vim-splunk"; - rev = "003bc863caa442dbcbb711d8c61ad8895c0da47a"; - hash = "sha256-KRF707b0O9FuS5R7m688+9x7RxNzRlDFI3Nz2g6nels="; + rev = "eae98aaa9232ee86e4bd3ffb4e795290891b64c5"; + hash = "sha256-LI2vHM55sUGVsWFyiMgmIBuD49qUlsvFbER7zg7lKNg="; }; meta.homepage = "https://github.com/yorokobi/vim-splunk/"; meta.license = getLicenseFromSpdxId "Unlicense"; @@ -25070,28 +25138,14 @@ final: prev: { meta.hydraPlatforms = [ ]; }; - vimacs = buildVimPlugin { - pname = "vimacs"; - version = "0.96-unstable-2016-03-24"; - src = fetchFromGitHub { - owner = "andrep"; - repo = "vimacs"; - rev = "7b8e297722d55089f0f0535fe6422533c98112fb"; - hash = "sha256-zgSKuwhuyoa67UlX4yX2JumjfHrx7Mlvg7Bv2i6TInU="; - }; - meta.homepage = "https://github.com/andrep/vimacs/"; - meta.license = unfree; - meta.hydraPlatforms = [ ]; - }; - vimade = buildVimPlugin { pname = "vimade"; - version = "2.5.1-unstable-2026-05-17"; + version = "2.5.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "TaDaa"; repo = "vimade"; - rev = "a5323f4930e3f1f48c0329e50bd218ba61577aaf"; - hash = "sha256-sBCZ/EEuGoqCBSg3Jh1o05sSuAJNOdortEB7b4sR2Z4="; + rev = "3d3d2db7ecd43c0181b20fede11d26f090dbc0d9"; + hash = "sha256-dR+h9pPglZmpOsrmOUJpwVDcx5m+RqeNMjsoWcGhMsQ="; }; meta.homepage = "https://github.com/TaDaa/vimade/"; meta.license = getLicenseFromSpdxId "Apache-2.0"; @@ -25212,12 +25266,12 @@ final: prev: { vimspector = buildVimPlugin { pname = "vimspector"; - version = "8968291813-unstable-2026-01-11"; + version = "8968291813-unstable-2026-07-03"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "409005fac4f014b271ed3526f3c0d08c4d42ed19"; - hash = "sha256-Kyx3YHOvZ7xagbU4xzumEAshU7oZOssacQBb7bIRu98="; + rev = "34099d18d8957bb3db5f396c8ca993ffb246a437"; + hash = "sha256-ByYDS33zvVc97qD8g52+3VbPPWnaoUK7/Ou2Ai4X1M8="; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -25227,12 +25281,12 @@ final: prev: { vimtex = buildVimPlugin { pname = "vimtex"; - version = "2.17-unstable-2026-05-26"; + version = "2.17-unstable-2026-07-18"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "24e229914182ff301496a3e2c4214b28c4928d3f"; - hash = "sha256-y45zOpF68G51jVdCsa27iiDdw2YEmHZNgkIHDI62nAo="; + rev = "6368e31fdaf766ff908a2c06e9ee14fc66dec409"; + hash = "sha256-/0DoAJ3Iv8eJlRqNodumYqllY+4c3zv+oY1EpbvC8ak="; }; meta.homepage = "https://github.com/lervag/vimtex/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25521,12 +25575,12 @@ final: prev: { wiki-vim = buildVimPlugin { pname = "wiki.vim"; - version = "0.11-unstable-2026-03-26"; + version = "0.12"; src = fetchFromGitHub { owner = "lervag"; repo = "wiki.vim"; - rev = "44f266fc8ed6f8fbc6bae47ee1ca6ba32e5995f8"; - hash = "sha256-wcoiv8lPBr/r4yMw4tO6SmNQ09f1SjFqWlNDat7oXDk="; + tag = "v0.12"; + hash = "sha256-6562XAJFqmWUo/IzBI6Mmy2Jp1p9smwt4LV95X6Cf5w="; }; meta.homepage = "https://github.com/lervag/wiki.vim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25733,12 +25787,12 @@ final: prev: { pname = "xeno.nvim"; version = "0-unstable-2025-10-23"; src = fetchFromGitHub { - owner = "kyzadev"; + owner = "kyzabuilds"; repo = "xeno.nvim"; rev = "f70c22447c7d954973f35c10dd9e9942cd7fb2eb"; hash = "sha256-zTGclrlxThgqEvj8K3fQ87G98g3VDqvp/dCnZwSm4I8="; }; - meta.homepage = "https://github.com/kyzadev/xeno.nvim/"; + meta.homepage = "https://github.com/kyzabuilds/xeno.nvim/"; meta.license = unfree; meta.hydraPlatforms = [ ]; }; @@ -25787,12 +25841,12 @@ final: prev: { y9nika-nvim = buildVimPlugin { pname = "y9nika.nvim"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "y9san9"; repo = "y9nika.nvim"; - rev = "0fc35319498d8e4509601546f4efb423026e53a1"; - hash = "sha256-0S2+9L1gW6Rbh1lUP+EGJ0AGIUnNAiTlrGAEJrbm7rc="; + rev = "18827266802e8e105c724c72a84c2c59beb5d90f"; + hash = "sha256-CzEqiuag+4RKOCjM4P2qp3ux9LMcRpQNA8t9r8RzXRc="; }; meta.homepage = "https://github.com/y9san9/y9nika.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25872,12 +25926,13 @@ final: prev: { yazi-nvim = buildVimPlugin { pname = "yazi.nvim"; - version = "13.1.7"; + version = "13.9.0"; src = fetchFromGitHub { owner = "mikavilpas"; repo = "yazi.nvim"; - tag = "v13.1.7"; - hash = "sha256-hPmdkCz/XTujUllBPfK7kjCrJA2rQQOBINczaGF3DKM="; + tag = "v13.9.0"; + hash = "sha256-Ua8FqTFlTSqnHSrz31RuS+A3SkOxjXB/L8Yb8fq+FSQ="; + fetchSubmodules = true; }; meta.homepage = "https://github.com/mikavilpas/yazi.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -25984,12 +26039,12 @@ final: prev: { zen-nvim = buildVimPlugin { pname = "zen.nvim"; - version = "0-unstable-2026-04-17"; + version = "0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "sand4rt"; repo = "zen.nvim"; - rev = "8d77a06063d74393ace9a984f32c4c158dcef6ba"; - hash = "sha256-1zLxgs1EqAoGrjIr26awTFZ+NS06Ph/SDQHczBNCsaA="; + rev = "cc7306e9ea479b19e8ef4c5fba35b4efd4b66692"; + hash = "sha256-ZFuhNDVmUU7A02w/rzDn8uze7ivHVu2GI3+6PyIxAgE="; }; meta.homepage = "https://github.com/sand4rt/zen.nvim/"; meta.license = getLicenseFromSpdxId "MIT"; @@ -26040,11 +26095,11 @@ final: prev: { zig-vim = buildVimPlugin { pname = "zig.vim"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-07-12"; src = fetchgit { url = "https://codeberg.org/ziglang/zig.vim/"; - rev = "29f7a9b8a4e33f936b803de0b713683ad687a6c3"; - hash = "sha256-nIek0mbJ869dWuX3LAeSHJay86zE4lupXQTeYhLzth8="; + rev = "1ba233de1f93ae7cf5c0903541e6ad422207b089"; + hash = "sha256-rbzX8wJKczk/dKpjPnNouf/LhpFmN9/zRNzEc0QhHm0="; }; meta.homepage = "https://codeberg.org/ziglang/zig.vim/"; meta.license = unfree; @@ -26053,12 +26108,12 @@ final: prev: { zk-nvim = buildVimPlugin { pname = "zk-nvim"; - version = "0.4.8"; + version = "0.4.10"; src = fetchFromGitHub { owner = "zk-org"; repo = "zk-nvim"; - tag = "v0.4.8"; - hash = "sha256-cq76bVNyoK1Oi0d61Wa3B3iFvLzboozZaZlWBTJik5U="; + tag = "v0.4.10"; + hash = "sha256-/3M40vkIZ+O0FCk0K6bL8He6WapQ5s74RMxkoxhPM8A="; }; meta.homepage = "https://github.com/zk-org/zk-nvim/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; @@ -26081,12 +26136,12 @@ final: prev: { zotcite = buildVimPlugin { pname = "zotcite"; - version = "0.7-unstable-2026-05-18"; + version = "0.7-unstable-2026-07-02"; src = fetchFromGitHub { owner = "jalvesaq"; repo = "zotcite"; - rev = "49e5fb6012077d2fe60681da3d8ff71e4c2a1c12"; - hash = "sha256-G/JnH9zF9m06Al8lzda6/P4K3S7iChaIzvZjKGLghAc="; + rev = "2f55d9a0eba87144bfb9211f17342490cd28bcd5"; + hash = "sha256-aZUOa74Qbnr68hqRfDPsn5AoSAFUr/qPsOhMBxFhWPM="; }; meta.homepage = "https://github.com/jalvesaq/zotcite/"; meta.license = getLicenseFromSpdxId "GPL-3.0-only"; diff --git a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix index b8c8dccb4960..4edadc94cdf1 100644 --- a/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix +++ b/pkgs/applications/editors/vim/plugins/luaPackagePlugins.nix @@ -9,12 +9,14 @@ let luarocksPackageNames = [ # # keep-sorted start case=no + "canola-nvim" "fidget-nvim" "fzf-lua" "gitsigns-nvim" "grug-far-nvim" "haskell-tools-nvim" "image-nvim" + "kulala-nvim" "lsp-progress-nvim" "lualine-nvim" "luasnip" @@ -28,6 +30,7 @@ let "neorg" "neorg-interim-ls" "neotest" + "neotest-nix" "nui-nvim" "nvim-cmp" "nvim-nio" 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 5b65f729acc2..a9161cb4ed56 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 @@ -9,15 +9,15 @@ vimPlugins, vimUtils, makeWrapper, - pkgs, + perl, }: let - version = "0.0.27-unstable-2026-03-11"; + version = "0.1.2"; src = fetchFromGitHub { owner = "yetone"; repo = "avante.nvim"; - rev = "9a7793461549939f1d52b2b309a1aa44680170c8"; - hash = "sha256-EEkAoufj29P46RIUrRNG0xJL9Wu4X7LZCS1fer4/nZQ="; + tag = "v${version}"; + hash = "sha256-x7OhVz4rWj2x1UsUm8iqkB5PQVAELvAYJ0yo2beU9TY="; }; avante-nvim-lib = rustPlatform.buildRustPackage { pname = "avante-nvim-lib"; @@ -28,7 +28,7 @@ let nativeBuildInputs = [ pkg-config makeWrapper - pkgs.perl + perl ]; buildInputs = [ @@ -66,20 +66,16 @@ vimUtils.buildVimPlugin { ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - mkdir -p $out/build - ln -s ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/build/avante_repo_map${ext} - ln -s ${avante-nvim-lib}/lib/libavante_templates${ext} $out/build/avante_templates${ext} - ln -s ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/build/avante_tokenizers${ext} - ln -s ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/build/avante_html2md${ext} - - # Fixes PKCE auth flows not finding libcrypto - substituteInPlace "$out/lua/avante/auth/pkce.lua" \ - --replace-fail 'pcall(ffi.load, "crypto")' 'pcall(ffi.load, "${lib.getLib openssl}/lib/libcrypto${ext}")' + # place dynamic shared libraries directly into lua/ for native C-module discovery + mkdir -p $out/lua + cp ${avante-nvim-lib}/lib/libavante_repo_map${ext} $out/lua/avante_repo_map${ext} + cp ${avante-nvim-lib}/lib/libavante_templates${ext} $out/lua/avante_templates${ext} + cp ${avante-nvim-lib}/lib/libavante_tokenizers${ext} $out/lua/avante_tokenizers${ext} + cp ${avante-nvim-lib}/lib/libavante_html2md${ext} $out/lua/avante_html2md${ext} ''; passthru = { updateScript = nix-update-script { - extraArgs = [ "--version=branch" ]; attrPath = "vimPlugins.avante-nvim.avante-nvim-lib"; }; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix index e5bd0c366c31..be782ea40042 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/blink-pairs/default.nix @@ -3,25 +3,26 @@ rustPlatform, fetchFromGitHub, pkg-config, + vimPlugins, vimUtils, stdenv, nix-update-script, }: let - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "Saghen"; repo = "blink.pairs"; tag = "v${version}"; - hash = "sha256-PTbj6jlXNRUOmwFSplvRDDiyyGqkBzUKtuBrvZm9kzM="; + hash = "sha256-XWrsZAH0tIPyRjr3PnAS2QAGE3+1z00jdnsxkKG0qPE="; }; blink-pairs-lib = rustPlatform.buildRustPackage { pname = "blink-pairs"; inherit version src; - cargoHash = "sha256-Cn9zRsQkBwaKbBD/JEpFMBOF6CBZTDx7fQa6Aoic4YU="; + cargoHash = "sha256-XLlluprxhVueHhkIufJa7fJXvFxpJJzh89+yL9PZ4GI="; env = { RUSTC_BOOTSTRAP = 1; @@ -42,13 +43,15 @@ vimUtils.buildVimPlugin { pname = "blink.pairs"; inherit version src; + dependencies = [ vimPlugins.blink-lib ]; + preInstall = let ext = stdenv.hostPlatform.extensions.sharedLibrary; in '' - mkdir -p target/release - ln -s ${blink-pairs-lib}/lib/libblink_pairs${ext} target/release/ + mkdir -p lib + ln -s ${blink-pairs-lib}/lib/libblink_pairs_parser${ext} lib/ ''; nvimSkipModules = [ @@ -71,6 +74,9 @@ vimUtils.buildVimPlugin { homepage = "https://github.com/Saghen/blink.pairs"; changelog = "https://github.com/Saghen/blink.pairs/blob/${src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ isabelroses ]; + maintainers = with lib.maintainers; [ + isabelroses + saadndm + ]; }; } diff --git a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix index 028aae4c8913..c8e323df7c50 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/codediff-nvim/default.nix @@ -11,13 +11,13 @@ }: vimUtils.buildVimPlugin rec { pname = "codediff.nvim"; - version = "2.45.1"; + version = "2.49.2"; src = fetchFromGitHub { owner = "esmuellert"; repo = "codediff.nvim"; tag = "v${version}"; - hash = "sha256-1F6z/rhZxiuI6W1ReyHP6EQFxys4qm3fbINxoy1hQZA="; + hash = "sha256-kT5plTJP4VfN6mFkq6voDTmr9LaZ37W80UU3QUGlKkY="; }; dependencies = [ vimPlugins.nui-nvim ]; 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 fae96fde6b60..d6bbea45d0fd 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 @@ -13,18 +13,18 @@ writableTmpDirAsHomeHook, }: let - version = "0.9.3"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dmtrKovalenko"; - repo = "fff.nvim"; + repo = "fff"; tag = "v${version}"; - hash = "sha256-9k1XWnHzBjy7dABCzZ0yxCHqgX1bsWkkxksLVLDqdmc="; + hash = "sha256-GGoy8ghA87vwHEc0fi97uiBrpRTAGk/QgqzKu8BBRXo="; }; fff-nvim-lib = rustPlatform.buildRustPackage { pname = "fff-nvim-lib"; inherit version src; - cargoHash = "sha256-R/w3Km9LTqWQ2NFbwYbTCld72av26BdXtxC/K0sqdlQ="; + cargoHash = "sha256-sOE3Zrs/ZtOIusH0+OvR1Ew5sfQfse6eWSLPwDPVSU4="; cargoBuildFlags = [ "-p" @@ -108,7 +108,7 @@ vimUtils.buildVimPlugin { meta = { description = "Fast Fuzzy File Finder for Neovim"; - homepage = "https://github.com/dmtrKovalenko/fff.nvim"; + homepage = "https://github.com/dmtrKovalenko/fff"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage diff --git a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix index cc81c6815cb9..c442bb136623 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/meson/default.nix @@ -8,11 +8,9 @@ vimUtils.buildVimPlugin { preInstall = "cd data/syntax-highlighting/vim"; meta = { + description = "Vim plugin for meson providing syntax highlighting"; inherit (meson.meta) homepage - description - mainProgram - longDescription license platforms ; diff --git a/pkgs/applications/editors/vim/plugins/non-generated/mirth/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/mirth/default.nix new file mode 100644 index 000000000000..3409d9f27312 --- /dev/null +++ b/pkgs/applications/editors/vim/plugins/non-generated/mirth/default.nix @@ -0,0 +1,15 @@ +{ vimUtils, mirth }: + +vimUtils.buildVimPlugin { + pname = "mirth"; + inherit (mirth) version; + src = mirth.vim; + meta = { + inherit (mirth.meta) + homepage + license + platforms + ; + description = "Syntax highlighting & filetype detection for the Mirth programming language"; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix index ca8b0fec8b1c..077bff37e046 100644 --- a/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix +++ b/pkgs/applications/editors/vim/plugins/non-generated/windsurf-nvim/default.nix @@ -14,7 +14,6 @@ let codeiumHashes = { x86_64-linux = "sha256-IeNK7UQtOhqC/eQv7MAya4jB1WIGykSR7IgutZatmHM="; aarch64-linux = "sha256-ujTFki/3V79El2WCkG0PJhbaMT0knC9mrS9E7Uv9HD4="; - x86_64-darwin = "sha256-r2KloEQsUku9sk8h76kwyQuMTHcq/vwfTSK2dkiXDzE="; aarch64-darwin = "sha256-1jNH0Up8mAahDgvPF6g42LV+RVDVsPqDM54lE2KYY48="; }; @@ -30,7 +29,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } .${system} or throwSystem; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 31f159c32118..68cd96848d13 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -49,12 +49,12 @@ }; angular = buildGrammar { language = "angular"; - version = "0.0.0+rev=f0d0685"; + version = "0.0.0+rev=38a8014"; src = fetchFromGitHub { owner = "dlvandenberg"; repo = "tree-sitter-angular"; - rev = "f0d0685701b70883fa2dfe94ee7dc27965cab841"; - hash = "sha256-rCecCdb/Bi90KsMvStNvldDPI73EDevA+QLXTYRwueg="; + rev = "38a8014ed5452cd6b7cf1399c00177a1f5374256"; + hash = "sha256-BhqeUS3KYL5jf0BfNvOs/hOPC5Thj6cEjYFfOfTbCJc="; }; passthru.requires = [ "html" @@ -63,12 +63,12 @@ }; apex = buildGrammar { language = "apex"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "apex"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -158,12 +158,12 @@ }; beancount = buildGrammar { language = "beancount"; - version = "0.0.0+rev=429cff8"; + version = "0.0.0+rev=c8a9780"; src = fetchFromGitHub { owner = "polarmutex"; repo = "tree-sitter-beancount"; - rev = "429cff869513cf9e34a2cf604fbfaaedc467e809"; - hash = "sha256-UJ8bswQJB7UYspNKLWaEXMOR4XlKVHfd7rvV5iaA5Tw="; + rev = "c8a9780610dbe8ade4888045b1f2caa7a0a9d8aa"; + hash = "sha256-5gFTocO/io5jg3zJ5U9Z46BgNqqgap0afM4VlpTyaGA="; }; meta.homepage = "https://github.com/polarmutex/tree-sitter-beancount"; }; @@ -202,12 +202,12 @@ }; blade = buildGrammar { language = "blade"; - version = "0.0.0+rev=b9436b7"; + version = "0.0.0+rev=5dbdcb0"; src = fetchFromGitHub { owner = "EmranMR"; repo = "tree-sitter-blade"; - rev = "b9436b7b936907aff730de0dac1b99d7c632cc86"; - hash = "sha256-QBsgHV/7zBF2OJfCVB3B27WVCCoMMzc5bTaubBvn2QI="; + rev = "5dbdcb0ccbe91e64b038b41545d3acc26c74907a"; + hash = "sha256-NOyGw9jhy0r2zCsbkbew+VsHWx92flJOfaCgTjRQdX4="; }; meta.homepage = "https://github.com/EmranMR/tree-sitter-blade"; }; @@ -224,12 +224,12 @@ }; bpftrace = buildGrammar { language = "bpftrace"; - version = "0.0.0+rev=774f445"; + version = "0.0.0+rev=50b27d8"; src = fetchFromGitHub { owner = "sgruszka"; repo = "tree-sitter-bpftrace"; - rev = "774f4458ad39691336ead1ee361b22434c4cdec7"; - hash = "sha256-BIPAnkY9QcW+LSR9w1E7gsCAqpOYSBpG/FF7UQYm5XI="; + rev = "50b27d8b5cae89e77702ab249dcd743a41848e5b"; + hash = "sha256-f1Hfqml59B0sjI1Yry9vnVmcsJj8kpnSlDub4nGLHSM="; }; meta.homepage = "https://github.com/sgruszka/tree-sitter-bpftrace"; }; @@ -246,34 +246,34 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=ae19b67"; + version = "0.0.0+rev=b780e47"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "ae19b676b13bdcc13b7665397e6d9b14975473dd"; - hash = "sha256-i40dlg12UNR3dUWtdlYLZKsusYUWzu+QgC2iedRk968="; + rev = "b780e47fc780ddc8da13afa35a3f4ed5c157823d"; + hash = "sha256-Juuf57GQI7OAP6O03KtSzyKJAoXtGKjyYJ+sTM1A4mU="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; c3 = buildGrammar { language = "c3"; - version = "0.0.0+rev=78e2ae9"; + version = "0.0.0+rev=1c6a952"; src = fetchFromGitHub { owner = "c3lang"; repo = "tree-sitter-c3"; - rev = "78e2ae9cff29ef8ca6666006abe80f1236d42996"; - hash = "sha256-IM2jmaP6ZeV7iGyPCHP71/wsFvPwel3TxyUr51qgTcc="; + rev = "1c6a95234c62130763ed1c479f958b74fdbfdb2a"; + hash = "sha256-EADHh63Sf4VlffQX3gH/9kodiws4lQsG+cyMwg1dFp8="; }; meta.homepage = "https://github.com/c3lang/tree-sitter-c3"; }; c_sharp = buildGrammar { language = "c_sharp"; - version = "0.0.0+rev=8836663"; + version = "0.0.0+rev=v0.23.5"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c-sharp"; - rev = "88366631d598ce6595ec655ce1591b315cffb14c"; - hash = "sha256-x2JQKMCyvqJkVuQPfAmoihSaBxgWaTFadkmZOuc58Bc="; + tag = "v0.23.5"; + hash = "sha256-N5AAlwQFGGi47cj0m7Te08bA486gwY6NBOx4Qcy4lpo="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c-sharp"; }; @@ -345,12 +345,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=c7b2a71"; + version = "0.0.0+rev=ca627bb"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "c7b2a71e7f8ecb167fad4c97227c838439280175"; - hash = "sha256-+Lom3xjPmhhZr3G4aV054lbhLjvJsPaQalSqkKUijvU="; + rev = "ca627bb5828616b6246aafdc3c3222789e728e37"; + hash = "sha256-tLC3WHEQS2GqUr+5Q884fc+tDCTxx6Jxg83T9wPlHw4="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -465,12 +465,12 @@ }; cue = buildGrammar { language = "cue"; - version = "0.0.0+rev=20bb919"; + version = "0.0.0+rev=dd7b90e"; src = fetchFromGitHub { owner = "eonpatapon"; repo = "tree-sitter-cue"; - rev = "20bb9195dac00b64c00ee494812abf3bf76f4181"; - hash = "sha256-q41CTw7/+j+hq9ejM0yusObmAVdi1tbUKzRN59M/QVY="; + rev = "dd7b90e0770ff18070c515937ba3c3d6d93db00e"; + hash = "sha256-9PwcWEz8sfJ4v+xeFGGI2JHXq5X1oI5K0mRvCEWDjgA="; }; meta.homepage = "https://github.com/eonpatapon/tree-sitter-cue"; }; @@ -487,23 +487,23 @@ }; d = buildGrammar { language = "d"; - version = "0.0.0+rev=fb028c8"; + version = "0.0.0+rev=64f2793"; src = fetchFromGitHub { owner = "gdamore"; repo = "tree-sitter-d"; - rev = "fb028c8f14f4188286c2eef143f105def6fbf24f"; - hash = "sha256-Xi8out5j4L5pAArA9zmLA7aGhma++G+AaVLgFW+TEAo="; + rev = "64f27931b4e6fdd75af1102c79bacbca68a8dacc"; + hash = "sha256-LNEFFoN9lA3fBgzBDrv3NdADS5UIQYHq851KePl6siE="; }; meta.homepage = "https://github.com/gdamore/tree-sitter-d"; }; dart = buildGrammar { language = "dart"; - version = "0.0.0+rev=0fc19c3"; + version = "0.0.0+rev=be07cf7"; src = fetchFromGitHub { owner = "UserNobody14"; repo = "tree-sitter-dart"; - rev = "0fc19c3a57b1109802af41d2b8f60d8835c5da3a"; - hash = "sha256-yK4XfjVPABFHf8MjoDge6bmapcybhdIF+49rlXFP+pw="; + rev = "be07cf7118d3dba06236a3f19541685a68209934"; + hash = "sha256-BPy4K3mjVBFdAtkVJBa8JCaWwRiO73khO32lh0rlcfw="; }; meta.homepage = "https://github.com/UserNobody14/tree-sitter-dart"; }; @@ -520,12 +520,12 @@ }; devicetree = buildGrammar { language = "devicetree"; - version = "0.0.0+rev=e685f1f"; + version = "0.0.0+rev=e78bf56"; src = fetchFromGitHub { owner = "joelspadin"; repo = "tree-sitter-devicetree"; - rev = "e685f1f6ac1702b046415efb476444167d63e41a"; - hash = "sha256-iMmr4zSm6B7goevHE03DMj9scW4ldXS7CV74sKeqGD4="; + rev = "e78bf56f206cb47bee28a217423acb651e076848"; + hash = "sha256-avjOWIK+DTyJQq2sgvm3PN4umagNrJ3wCKS8woK56pk="; }; meta.homepage = "https://github.com/joelspadin/tree-sitter-devicetree"; }; @@ -542,12 +542,12 @@ }; diff = buildGrammar { language = "diff"; - version = "0.0.0+rev=2520c3f"; + version = "0.0.0+rev=7d20331"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-diff"; - rev = "2520c3f934b3179bb540d23e0ef45f75304b5fed"; - hash = "sha256-8rYLNGgoZSvvfqO2++nAgFKmvbkKJ3m+9B8bTXp6Us4="; + rev = "7d20331b97a008daf2dd0055da8c609f03424105"; + hash = "sha256-l9KwHqEdwqN5CYZQVCEymhld/m+MArAzqfPz8mV7M8Q="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-diff"; }; @@ -564,12 +564,12 @@ }; djot = buildGrammar { language = "djot"; - version = "0.0.0+rev=74fac1f"; + version = "0.0.0+rev=759a618"; src = fetchFromGitHub { owner = "treeman"; repo = "tree-sitter-djot"; - rev = "74fac1f53c6d52aeac104b6874e5506be6d0cfe6"; - hash = "sha256-HfEZHNhxEbH07gDzLPdl6n2Pf//o8tbJvwE+tesJDC8="; + rev = "759a61896ccb2200a4becec4443e768638a21d58"; + hash = "sha256-QLjTBLWjybrj197oykkH0saED8SPpjOwyL4VFUnKBCw="; }; meta.homepage = "https://github.com/treeman/tree-sitter-djot"; }; @@ -676,23 +676,23 @@ }; elixir = buildGrammar { language = "elixir"; - version = "0.0.0+rev=7937d3b"; + version = "0.0.0+rev=c4f9f5a"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "tree-sitter-elixir"; - rev = "7937d3b4d65fa574163cfa59394515d3c1cf16f4"; - hash = "sha256-6V1W/MOx03dPvL8adgE16du7eGemPwwdiZ3NL8FNBkg="; + rev = "c4f9f5a15ddad8635ba59a5b99c2e9124e74ad91"; + hash = "sha256-nQq8ZQUkLWuko6kNQRFtKwTQFuWzpIob9Cgjcn4Jrvk="; }; meta.homepage = "https://github.com/elixir-lang/tree-sitter-elixir"; }; elm = buildGrammar { language = "elm"; - version = "0.0.0+rev=6d9511c"; + version = "0.0.0+rev=6bf1558"; src = fetchFromGitHub { owner = "elm-tooling"; repo = "tree-sitter-elm"; - rev = "6d9511c28181db66daee4e883f811f6251220943"; - hash = "sha256-jhI0CRi8rgiwBfwEwNBBZ7QrKXYRQ9gUCO7c37Y/ibc="; + rev = "6bf155821d8d18f1e9d0c951fe77202daa7eb9c2"; + hash = "sha256-A3S7oQSPqP/tya5gK8d6Sr54B9OZ2KDVPZIgZgr2Gz4="; }; meta.homepage = "https://github.com/elm-tooling/tree-sitter-elm"; }; @@ -731,23 +731,23 @@ }; enforce = buildGrammar { language = "enforce"; - version = "0.0.0+rev=eb27968"; + version = "0.0.0+rev=d222ea5"; src = fetchFromGitHub { owner = "simonvic"; repo = "tree-sitter-enforce"; - rev = "eb2796871d966264cdb041b797416ef1757c8b4f"; - hash = "sha256-50yK0MIMFFjUlcE99MEESKdcLnyIurAl16uGXGQyjkI="; + rev = "d222ea5d2f047e67a16234237cfc1c8489aac2fb"; + hash = "sha256-fwcD9Y/4j0S5M0gW9tdMgNZfpkLIV4IMyhQThLij4XY="; }; meta.homepage = "https://github.com/simonvic/tree-sitter-enforce"; }; erlang = buildGrammar { language = "erlang"; - version = "0.0.0+rev=1d78195"; + version = "0.0.0+rev=836aa2b"; src = fetchFromGitHub { owner = "WhatsApp"; repo = "tree-sitter-erlang"; - rev = "1d78195c4fbb1fc027eb3e4220427f1eb8bfc89e"; - hash = "sha256-v/yG3J+f62W3f7jS5/TslepZGHUbFIH8duA+hFVLblU="; + rev = "836aa2b6c3af2c7cef3f84049b0ed6d44485a870"; + hash = "sha256-1bviRDBztC6EplHFS4lqRYt05f0VH6Ofwo9umwSqve4="; }; meta.homepage = "https://github.com/WhatsApp/tree-sitter-erlang"; }; @@ -764,12 +764,12 @@ }; faust = buildGrammar { language = "faust"; - version = "0.0.0+rev=122dd10"; + version = "0.0.0+rev=6074204"; src = fetchFromGitHub { owner = "khiner"; repo = "tree-sitter-faust"; - rev = "122dd101919289ea809bad643712fcb483a1bed0"; - hash = "sha256-5T+Om1qdSIal1pMIoaM44FexSqZyhZCZb/Pa0/udzZI="; + rev = "6074204d3511392fd0b9c4fa1cef347ded65b246"; + hash = "sha256-jzedhMP31Q17+UN6qi8k4nyqvoqVeYxflFIZcE8sf4g="; }; meta.homepage = "https://github.com/khiner/tree-sitter-faust"; }; @@ -808,12 +808,12 @@ }; fish = buildGrammar { language = "fish"; - version = "0.0.0+rev=fa2143f"; + version = "0.0.0+rev=f435b0b"; src = fetchFromGitHub { owner = "ram02z"; repo = "tree-sitter-fish"; - rev = "fa2143f5d66a9eb6c007ba9173525ea7aaafe788"; - hash = "sha256-n6eGMdbW1Rsn5XbszLSSSG3F8jh+loYnPEiabNY+jfk="; + rev = "f435b0bd772578c70e5d158b85267bb886316f88"; + hash = "sha256-9an4YAz2QKC3yAJ5/tOfmqOJViGATz7+NhKuZpr4oC4="; }; meta.homepage = "https://github.com/ram02z/tree-sitter-fish"; }; @@ -830,23 +830,23 @@ }; forth = buildGrammar { language = "forth"; - version = "0.0.0+rev=360ef13"; + version = "0.0.0+rev=7190f21"; src = fetchFromGitHub { owner = "AlexanderBrevig"; repo = "tree-sitter-forth"; - rev = "360ef13f8c609ec6d2e80782af69958b84e36cd0"; - hash = "sha256-d7X1Ubd9tKMQgNHlH+sQxmcsgLWB4mxR5CIdyKkLnM8="; + rev = "7190f2173060d19a2174c96bfb5b7c6f9745512b"; + hash = "sha256-BhlENOsBHH8rUU/NDFO4vc7rcjvvQOWLsomO/nr51RQ="; }; meta.homepage = "https://github.com/AlexanderBrevig/tree-sitter-forth"; }; fortran = buildGrammar { language = "fortran"; - version = "0.0.0+rev=be30d90"; + version = "0.0.0+rev=7edacd2"; src = fetchFromGitHub { owner = "stadelmanma"; repo = "tree-sitter-fortran"; - rev = "be30d90dc7dfa4080b9c4abed3f400c9163a88df"; - hash = "sha256-Y+HrMtswSmoFWH6YTBHfC1qQafqePOJB8tyoPRIbjQg="; + rev = "7edacd2b21aa80057d9725384a1304a1c758e0f8"; + hash = "sha256-KWIAKJBV9qrNviLKbGkIyznHEMeO0tC/Pa1maRVINRM="; }; meta.homepage = "https://github.com/stadelmanma/tree-sitter-fortran"; }; @@ -863,12 +863,12 @@ }; fsharp = buildGrammar { language = "fsharp"; - version = "0.0.0+rev=1c2d935"; + version = "0.0.0+rev=148ea97"; src = fetchFromGitHub { owner = "ionide"; repo = "tree-sitter-fsharp"; - rev = "1c2d9351d1f731c08cfdc4ed41e63126ae56e462"; - hash = "sha256-MeYYCVO+KXC2pGYebbQzaK8ZyLAjPm5kBUROCQEn9Cw="; + rev = "148ea977d630e2d1c34bf717329141707620226d"; + hash = "sha256-yaVeqC1RXgD7EMU8nRcdgkRQZXBcGw0lztTFvK4uM2I="; }; location = "fsharp"; meta.homepage = "https://github.com/ionide/tree-sitter-fsharp"; @@ -886,12 +886,12 @@ }; gap = buildGrammar { language = "gap"; - version = "0.0.0+rev=ed2480d"; + version = "0.0.0+rev=96fe2e4"; src = fetchFromGitHub { owner = "gap-system"; repo = "tree-sitter-gap"; - rev = "ed2480d42281586932920527823b307bc45052b8"; - hash = "sha256-rLCuVHBT/8DsHiE8Z4PbeAGjFmBT86vnJVvr258MKoA="; + rev = "96fe2e49745ecd62b80cd19dca01fb52b83f93a1"; + hash = "sha256-bHbWHfwzQVnbqNZ65Ls2h3hsnIpQpylzy2Sviw8aTcs="; }; meta.homepage = "https://github.com/gap-system/tree-sitter-gap"; }; @@ -944,12 +944,12 @@ }; git_rebase = buildGrammar { language = "git_rebase"; - version = "0.0.0+rev=760ba8e"; + version = "0.0.0+rev=32686d6"; src = fetchFromGitHub { owner = "the-mikedavis"; repo = "tree-sitter-git-rebase"; - rev = "760ba8e34e7a68294ffb9c495e1388e030366188"; - hash = "sha256-TJ3n3HA51qJPVS40GHqGJ6qK4fE9iFfAYH866uHgdtU="; + rev = "32686d6b72980b36f876ae2d07719c9c3ed154e2"; + hash = "sha256-+aQNbKWZgmWe21Wv1ih6kuiPDrjgY8ghi6dbQbV3PQg="; }; meta.homepage = "https://github.com/the-mikedavis/tree-sitter-git-rebase"; }; @@ -966,12 +966,12 @@ }; gitcommit = buildGrammar { language = "gitcommit"; - version = "0.0.0+rev=33fe854"; + version = "0.0.0+rev=49715a9"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-gitcommit"; - rev = "33fe8548abcc6e374feaac5724b5a2364bf23090"; - hash = "sha256-ttULjFU9slnPcT4bCjOozGkaKAOxMW5Oa2/caVNeEsA="; + rev = "49715a9e6f19ce3d33b875aacdd6ad8ddaee0ffe"; + hash = "sha256-LMo+NufYbxb8G3ZCKNvtPHafTVHRM4HrZr7kjSkHjrw="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit"; }; @@ -988,34 +988,34 @@ }; gleam = buildGrammar { language = "gleam"; - version = "0.0.0+rev=0bb1b0a"; + version = "0.0.0+rev=cefbd68"; src = fetchFromGitHub { owner = "gleam-lang"; repo = "tree-sitter-gleam"; - rev = "0bb1b0ae1a3555180ae7b0004851da747fc230d1"; - hash = "sha256-x6DGHCCVl6w3na69gTtcsewS18VO1nTq8BE01Te/Ua4="; + rev = "cefbd6863983b4df3214b7934bde5e9ca63d5b7f"; + hash = "sha256-j5FFZ/2HsCfMuJpDHJZ2pfYaFU6Rc3BjUrSeOi/89ZM="; }; meta.homepage = "https://github.com/gleam-lang/tree-sitter-gleam"; }; glimmer = buildGrammar { language = "glimmer"; - version = "0.0.0+rev=88af855"; + version = "0.0.0+rev=c67a736"; src = fetchFromGitHub { owner = "ember-tooling"; repo = "tree-sitter-glimmer"; - rev = "88af85568bde3b91acb5d4c352ed094d0c1f9d84"; - hash = "sha256-AW+jd1Kl3krTgnPc8NoXfSM91fOan/wIB/mo/feWj74="; + rev = "c67a73679db2945a686ca45d3e5318d86138e72a"; + hash = "sha256-rNDLaxio3n4Lura5qxCSFopajm6XkWxwsJ4yfJIsdio="; }; meta.homepage = "https://github.com/ember-tooling/tree-sitter-glimmer"; }; glimmer_javascript = buildGrammar { language = "glimmer_javascript"; - version = "0.0.0+rev=5cc865a"; + version = "0.0.0+rev=d9cf7a2"; src = fetchFromGitHub { owner = "NullVoxPopuli"; repo = "tree-sitter-glimmer-javascript"; - rev = "5cc865a2a0a77cbfaf5062c8fcf2a9919bd54f87"; - hash = "sha256-4MSBaGdX5lvhvz2LyQb+NuQY9Vc5CFL0C6S3sO3Tz2U="; + rev = "d9cf7a2f1dad3c6b660148eaf77e955d418fdb8b"; + hash = "sha256-gvs85PiyNov10Ar0JytOzjmJQVOeVx74ZQSbV+XUKa4="; }; meta.homepage = "https://github.com/NullVoxPopuli/tree-sitter-glimmer-javascript"; }; @@ -1060,12 +1060,12 @@ }; gnuplot = buildGrammar { language = "gnuplot"; - version = "0.0.0+rev=8923c1e"; + version = "0.0.0+rev=20a9829"; src = fetchFromGitHub { owner = "dpezto"; repo = "tree-sitter-gnuplot"; - rev = "8923c1e38b9634a688a6c0dce7c18c8ffb823e79"; - hash = "sha256-fR3lIscfrBqpBH1jZ4RB1Qa8r+hxy6I0OzzoQqAe2aw="; + rev = "20a98295a52caa5f474839838a800d250e8fe1f4"; + hash = "sha256-UHgeM0pQm9DQwZdPByzJvYY4DbzcxE0WDDuqVGcsxts="; }; meta.homepage = "https://github.com/dpezto/tree-sitter-gnuplot"; }; @@ -1170,23 +1170,23 @@ }; gren = buildGrammar { language = "gren"; - version = "0.0.0+rev=c36aac5"; + version = "0.0.0+rev=cecd8ce"; src = fetchFromGitHub { owner = "MaeBrooks"; repo = "tree-sitter-gren"; - rev = "c36aac51a915fdfcaf178128ba1e9c2205b25930"; - hash = "sha256-XtLP2ncpwAiubHug6k4sJCYRZo5f+Nu02tho/4tVD/k="; + rev = "cecd8ce9b18f1803d37682f33b6224978fd04d31"; + hash = "sha256-E96GzFmQDEb3Uq6sEThxqpRwqEH+JwE/hJ0xM1r2VjI="; }; meta.homepage = "https://github.com/MaeBrooks/tree-sitter-gren"; }; groovy = buildGrammar { language = "groovy"; - version = "0.0.0+rev=781d9cd"; + version = "0.0.0+rev=deb0dcf"; src = fetchFromGitHub { owner = "murtaza64"; repo = "tree-sitter-groovy"; - rev = "781d9cd1b482a70a6b27091e5c9e14bbcab3b768"; - hash = "sha256-KvgVjFLzT1jJ9PieVslJLKXrijYzI/ttny+536famw0="; + rev = "deb0dcf8c4544f07564060f6e9b9f6e4b0bfc27d"; + hash = "sha256-x7PawYYtgsduh60KNnS4LgB7SvoBV9aOJ9cHNsLBBhc="; }; meta.homepage = "https://github.com/murtaza64/tree-sitter-groovy"; }; @@ -1236,12 +1236,12 @@ }; haskell = buildGrammar { language = "haskell"; - version = "0.0.0+rev=7fa19f1"; + version = "0.0.0+rev=98aedbd"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-haskell"; - rev = "7fa19f195803a77855f036ee7f49e4b22856e338"; - hash = "sha256-/cruCFNEyZf5d3TCw+vkJOgJqWvS1Re5F4dMVuXXJBg="; + rev = "98aedbd2d6947a168ba3ba3755d70b0cb6b78395"; + hash = "sha256-eunizglx3nye3LZIAndBX/hf0BvFOWmThQwxvvjqcfU="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-haskell"; }; @@ -1318,17 +1318,6 @@ ]; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-hlsl"; }; - hlsplaylist = buildGrammar { - language = "hlsplaylist"; - version = "0.0.0+rev=3bfda92"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-hlsplaylist"; - rev = "3bfda9271e3adb08d35f47a2102fe957009e1c55"; - hash = "sha256-BvLT+BbnJgM14a896p39dywYy/4S45xOBtBukYTbW6E="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-hlsplaylist"; - }; hocon = buildGrammar { language = "hocon"; version = "0.0.0+rev=c390f10"; @@ -1364,12 +1353,12 @@ }; htmldjango = buildGrammar { language = "htmldjango"; - version = "0.0.0+rev=3a64316"; + version = "0.0.0+rev=a103188"; src = fetchFromGitHub { owner = "interdependence"; repo = "tree-sitter-htmldjango"; - rev = "3a643167ad9afac5d61e092f08ff5b054576fadf"; - hash = "sha256-sQV7olTaQ68wixzvKV44myVvDUXXjBZh9N3jvDFUSvE="; + rev = "a10318892603d9a0b925df7cc7771a840304b997"; + hash = "sha256-tFcdc2fd+oEVtB2ccKRHppMkxf1bPorKWRgfn5xZoaw="; }; meta.homepage = "https://github.com/interdependence/tree-sitter-htmldjango"; }; @@ -1408,12 +1397,12 @@ }; idl = buildGrammar { language = "idl"; - version = "0.0.0+rev=fb65762"; + version = "0.0.0+rev=f319b8b"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-idl"; - rev = "fb65762a13538b397e41a5fc1e9564c9df841410"; - hash = "sha256-CDbE9TxcxZWhyv6DPgw/ygvY5fayNF4usTlZPGp/KjM="; + rev = "f319b8b0b5cb218cf3f63aa821d2ab722524dbe9"; + hash = "sha256-x1XT6iowS2ywp8c8RdQqix/WC/OfR5p8MjIhGljbA/8="; }; meta.homepage = "https://github.com/cathaysia/tree-sitter-idl"; }; @@ -1441,23 +1430,23 @@ }; inko = buildGrammar { language = "inko"; - version = "0.0.0+rev=v0.5.1"; + version = "0.0.0+rev=v0.8.0"; src = fetchFromGitHub { owner = "inko-lang"; repo = "tree-sitter-inko"; - tag = "v0.5.1"; - hash = "sha256-bt/T6O/7of8r9DrA6DU8pM4vWlBCgWWzw89GZbDyJnw="; + tag = "v0.8.0"; + hash = "sha256-Jud0/5vgm3hF94lXu2i6rxHHvpMWFH3y5ye9jIrjmZk="; }; meta.homepage = "https://github.com/inko-lang/tree-sitter-inko"; }; ispc = buildGrammar { language = "ispc"; - version = "0.0.0+rev=9b2f9ae"; + version = "0.0.0+rev=ba1bb38"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-ispc"; - rev = "9b2f9aec2106b94b4e099fe75e73ebd8ae707c04"; - hash = "sha256-vxe+g7o0gXgB4GjhjkxqLqcLL2+8wqMB3tm1xQFSitI="; + rev = "ba1bb38ac8ddfa6aa7571cbfe9b4d029f7f77447"; + hash = "sha256-biJ30aNRzfiuDdT0Xl4h8cQ7x84ck/no272+mjydne0="; }; passthru.requires = [ "c" @@ -1466,12 +1455,12 @@ }; janet_simple = buildGrammar { language = "janet_simple"; - version = "0.0.0+rev=d183186"; + version = "0.0.0+rev=3c1bdcf"; src = fetchFromGitHub { owner = "sogaiu"; repo = "tree-sitter-janet-simple"; - rev = "d183186995204314700be3e9e0a48053ea16b350"; - hash = "sha256-zETOH+HpHyiCdOiggRy7VVjOv/WVRDb4qQ+kN9r2Frc="; + rev = "3c1bdcfff374138da03a1db25c75efce623910fe"; + hash = "sha256-IiL3vi2i+VVKtfd49hz4T+mztj+o2Hxaeo/PAGFBX8Y="; }; meta.homepage = "https://github.com/sogaiu/tree-sitter-janet-simple"; }; @@ -1488,12 +1477,12 @@ }; javadoc = buildGrammar { language = "javadoc"; - version = "0.0.0+rev=e2f56b4"; + version = "0.0.0+rev=51b55fb"; src = fetchFromGitHub { owner = "rmuir"; repo = "tree-sitter-javadoc"; - rev = "e2f56b4d0df08f6ed5df8bae266f9e75b340a9ab"; - hash = "sha256-31HnXUtuimS9gr71r6Rs3VZYmiR8N8iuNNWsbe7Sz48="; + rev = "51b55fbf40e49c5207a3f922c0d4550e743761c5"; + hash = "sha256-18rICYDu/tW5CV/WC8fbr2mwVhg6f9Hn6p9WFMCnxgQ="; }; meta.homepage = "https://github.com/rmuir/tree-sitter-javadoc"; }; @@ -1510,12 +1499,12 @@ }; jinja = buildGrammar { language = "jinja"; - version = "0.0.0+rev=413dba9"; + version = "0.0.0+rev=c213d37"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "413dba9fea354b62f6adada1815b2f504e32ffb5"; - hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM="; + rev = "c213d3745ccdcaaa858869181c7b1bf9557a025f"; + hash = "sha256-DgHJ3pwLG6yLxzIaNSB+wpmt8Wl0CLdYcfOx+MDr39A="; }; location = "tree-sitter-jinja"; passthru.requires = [ @@ -1525,12 +1514,12 @@ }; jinja_inline = buildGrammar { language = "jinja_inline"; - version = "0.0.0+rev=413dba9"; + version = "0.0.0+rev=c213d37"; src = fetchFromGitHub { owner = "cathaysia"; repo = "tree-sitter-jinja"; - rev = "413dba9fea354b62f6adada1815b2f504e32ffb5"; - hash = "sha256-edHxTYvMfBh0OJbEfKgSqumV2JH/48cQ2u0Uq8e4CxM="; + rev = "c213d3745ccdcaaa858869181c7b1bf9557a025f"; + hash = "sha256-DgHJ3pwLG6yLxzIaNSB+wpmt8Wl0CLdYcfOx+MDr39A="; }; location = "tree-sitter-jinja_inline"; meta.homepage = "https://github.com/cathaysia/tree-sitter-jinja"; @@ -1581,12 +1570,12 @@ }; json5 = buildGrammar { language = "json5"; - version = "0.0.0+rev=aa630ef"; + version = "0.0.0+rev=248b856"; src = fetchFromGitHub { owner = "Joakker"; repo = "tree-sitter-json5"; - rev = "aa630ef48903ab99e406a8acd2e2933077cc34e1"; - hash = "sha256-WMGZxt1F2Ca7xoBSCld04LpQr37MhZpARK9mPF8RMUI="; + rev = "248b8564567087d7866be76569b182f6dd7e14e9"; + hash = "sha256-1tzvsId57HV4bKyZ5IRdXqhW2c8sc+0CfcsE9WYxz14="; }; meta.homepage = "https://github.com/Joakker/tree-sitter-json5"; }; @@ -1603,12 +1592,12 @@ }; julia = buildGrammar { language = "julia"; - version = "0.0.0+rev=8454f26"; + version = "0.0.0+rev=60fc237"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-julia"; - rev = "8454f266717232525ed03c7b09164b0404a03150"; - hash = "sha256-o4yep2RJU53lWajxfPgAk/m+DpMIeYCHYAHsR3FZMT8="; + rev = "60fc2370605db09d9b39877c6f754ff345bcb7a5"; + hash = "sha256-6ajPGZqZ96FCvLee1v4SDB61R/aO4ixRgqqU6CT0KHc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-julia"; }; @@ -1625,12 +1614,12 @@ }; kcl = buildGrammar { language = "kcl"; - version = "0.0.0+rev=b0b2eb3"; + version = "0.0.0+rev=026f40f"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "tree-sitter-kcl"; - rev = "b0b2eb38009e04035a6e266c7e11e541f3caab7c"; - hash = "sha256-Aeu1j77GdsNpo9PU+FcqN3ttT0eLaDKY4n8buftMiDc="; + rev = "026f40fb0a59a35da75b9c8801d52f6c14feda24"; + hash = "sha256-YfD4MpU5c73wNIAEG875cA00OOKs02jeUfn0+iau2E0="; }; meta.homepage = "https://github.com/kcl-lang/tree-sitter-kcl"; }; @@ -1658,45 +1647,45 @@ }; kitty = buildGrammar { language = "kitty"; - version = "0.0.0+rev=fa6ab3f"; + version = "0.0.0+rev=4d93f64"; src = fetchFromGitHub { owner = "OXY2DEV"; repo = "tree-sitter-kitty"; - rev = "fa6ab3fd32d890a0217495c96b35761e6d2dcb5b"; - hash = "sha256-hyzwZfnslyxqL+98BWejCyLwwJMcj6O8EGuBYrCKn4o="; + rev = "4d93f6486c6cd81e583bd18f2462f8a6026f2d83"; + hash = "sha256-Uj1ctHB6lWtxWAJbgcB1ydWOoGRF4+YvLQaqcQfP8hE="; }; meta.homepage = "https://github.com/OXY2DEV/tree-sitter-kitty"; }; kos = buildGrammar { language = "kos"; - version = "0.0.0+rev=03b261c"; + version = "0.0.0+rev=a733862"; src = fetchFromGitHub { owner = "kos-lang"; repo = "tree-sitter-kos"; - rev = "03b261c1a78b71c38cf4616497f253c4a4ce118b"; - hash = "sha256-38i2AbPZNQb5EOUoyNvk20HfesLmbkvNxn/oyGx/W3k="; + rev = "a7338629da17c5246dc2129cd2a493a6ee59e922"; + hash = "sha256-CwQQkieDk1YJxYH07V/IoDd4yiOBLLq6ih8szFVabKU="; }; meta.homepage = "https://github.com/kos-lang/tree-sitter-kos"; }; kotlin = buildGrammar { language = "kotlin"; - version = "0.0.0+rev=93bfeee"; + version = "0.0.0+rev=c8ac3d2"; src = fetchFromGitHub { owner = "fwcd"; repo = "tree-sitter-kotlin"; - rev = "93bfeee1555d2b1442d68c44b0afde2a3b069e46"; - hash = "sha256-9kNYaT0A9/B5/Vzg2d02XRYORlQpI9zK0e8E26FEEDg="; + rev = "c8ac3d2627240160b999a2c100de3babbdb8f419"; + hash = "sha256-hHiZNuiU05zT2JGG/60wX5XD6CY27QDChe4FlRB4j4E="; }; meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin"; }; koto = buildGrammar { language = "koto"; - version = "0.0.0+rev=f8b3f62"; + version = "0.0.0+rev=e8d41cb"; src = fetchFromGitHub { owner = "koto-lang"; repo = "tree-sitter-koto"; - rev = "f8b3f62c0eed185dca1559789e78759d4bee60e5"; - hash = "sha256-vv5HMDXMcSi91loIppsx/5Hu6jJ7/cedtTyahOBP780="; + rev = "e8d41cbaca867aa1b0213e1fc1caeaf593da7bf7"; + hash = "sha256-a8Rzt7vuJmV8jyRB1tK3Gy6NV0+lv8+e+q5m1EDoq2U="; }; meta.homepage = "https://github.com/koto-lang/tree-sitter-koto"; }; @@ -1769,12 +1758,12 @@ }; liquid = buildGrammar { language = "liquid"; - version = "0.0.0+rev=9566ca7"; + version = "0.0.0+rev=e45dbac"; src = fetchFromGitHub { owner = "hankthetank27"; repo = "tree-sitter-liquid"; - rev = "9566ca79911052919fce09d26f1f655b5e093857"; - hash = "sha256-KUp/uqTV8C98TLJ4VDtbB9Dygq4DQNv1VInzTtYS/BA="; + rev = "e45dbac8c5fa95b1f0e00e7e0c04bc8855823391"; + hash = "sha256-oTM9YdDVuNlR8aXjeB3oYXQdh+nek+GRLBiestn396U="; }; meta.homepage = "https://github.com/hankthetank27/tree-sitter-liquid"; }; @@ -1849,12 +1838,12 @@ }; m68k = buildGrammar { language = "m68k"; - version = "0.0.0+rev=e128454"; + version = "0.0.0+rev=ab9f2ad"; src = fetchFromGitHub { owner = "grahambates"; repo = "tree-sitter-m68k"; - rev = "e128454c2210c0e0c10b68fe45ddb8fee80182a3"; - hash = "sha256-g7SZ/TrTaaeGDNOqId4eom9R/5gOyXcmmhWY4WW0fF4="; + rev = "ab9f2ad96db56619d05a6474a52e3dbdd705a637"; + hash = "sha256-owwsDRqPgjTvdJkPXg+TX65g+deBI6Fui6h40EFzKVo="; }; meta.homepage = "https://github.com/grahambates/tree-sitter-m68k"; }; @@ -1871,12 +1860,12 @@ }; markdown = buildGrammar { language = "markdown"; - version = "0.0.0+rev=f969cd3"; + version = "0.0.0+rev=c357072"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5"; - hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8="; + rev = "c3570720f7f7bbad22fe96603f106276618e0cf5"; + hash = "sha256-wQKcqU0V6gHj84qOkUwdXsBW3f6MNfJMFxuGTucAgh8="; }; location = "tree-sitter-markdown"; passthru.requires = [ @@ -1886,24 +1875,24 @@ }; markdown_inline = buildGrammar { language = "markdown_inline"; - version = "0.0.0+rev=f969cd3"; + version = "0.0.0+rev=c357072"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-markdown"; - rev = "f969cd3ae3f9fbd4e43205431d0ae286014c05b5"; - hash = "sha256-WUVN7+lzDI+VC5PuJjhHiS4JpVr1x0Ic30i2tVrI6W8="; + rev = "c3570720f7f7bbad22fe96603f106276618e0cf5"; + hash = "sha256-wQKcqU0V6gHj84qOkUwdXsBW3f6MNfJMFxuGTucAgh8="; }; location = "tree-sitter-markdown-inline"; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-markdown"; }; matlab = buildGrammar { language = "matlab"; - version = "0.0.0+rev=c2390a5"; + version = "0.0.0+rev=c9ef947"; src = fetchFromGitHub { owner = "acristoffers"; repo = "tree-sitter-matlab"; - rev = "c2390a59016f74e7d5f75ef09510768b4f30217e"; - hash = "sha256-WgyWvItbysSqeD/LdBr233NYlKF1HaxIDtHIr6BQOjw="; + rev = "c9ef947ec67fb6b500d5def4f5e09b56990a9f91"; + hash = "sha256-PjOJSMWQ0z8vVE38OdFgloFDMbKr/SVOYFTy0krtgRQ="; }; meta.homepage = "https://github.com/acristoffers/tree-sitter-matlab"; }; @@ -1931,38 +1920,27 @@ }; meson = buildGrammar { language = "meson"; - version = "0.0.0+rev=c84f354"; + version = "0.0.0+rev=aa8d472"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-meson"; - rev = "c84f3540624b81fc44067030afce2ff78d6ede05"; - hash = "sha256-+GMR051L89asgavX2T3zKwWl8xUFHenlCWJYELhMuyA="; + rev = "aa8d472034956f94f51f2ef2cbfec4cc07efbfde"; + hash = "sha256-UJREw7mQqJTKcD2owKJ4GZkkch/KGTIy9/+Fdl3W3ik="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-meson"; }; mlir = buildGrammar { language = "mlir"; - version = "0.0.0+rev=96fa0ad"; + version = "0.0.0+rev=a5bcbd0"; src = fetchFromGitHub { owner = "artagnon"; repo = "tree-sitter-mlir"; - rev = "96fa0adc3028cc6a9d281370c9f213a457c4a2d0"; - hash = "sha256-6zXWbcwptKfJxZzx9txteVS1LSTSD9XUs3B4JsJLZlk="; + rev = "a5bcbd07b4bc6103a8ee1536188c42a2059d43ba"; + hash = "sha256-h0ZKsVbZg4i99qsH0xHW/KcStl73HBKX8LtixMzPcf0="; }; generate = true; meta.homepage = "https://github.com/artagnon/tree-sitter-mlir"; }; - muttrc = buildGrammar { - language = "muttrc"; - version = "0.0.0+rev=173b0ab"; - src = fetchFromGitHub { - owner = "neomutt"; - repo = "tree-sitter-muttrc"; - rev = "173b0ab53a9c07962c9777189c4c70e90f1c1837"; - hash = "sha256-zma/oyMFI+r+/616yXV9b4ptC1FNYpHlpqY/Fez++n0="; - }; - meta.homepage = "https://github.com/neomutt/tree-sitter-muttrc"; - }; nasm = buildGrammar { language = "nasm"; version = "0.0.0+rev=d1b3638"; @@ -1987,23 +1965,23 @@ }; nickel = buildGrammar { language = "nickel"; - version = "0.0.0+rev=b5b6cc3"; + version = "0.0.0+rev=7780a16"; src = fetchFromGitHub { owner = "nickel-lang"; repo = "tree-sitter-nickel"; - rev = "b5b6cc3bc7b9ea19f78fed264190685419cd17a8"; - hash = "sha256-aPiOtpZJQQmAjCwx2Ssirhe6rqxbrwjxIWK5l3L14EY="; + rev = "7780a16a992d8e68f8fb65cb6828caa01f22fd17"; + hash = "sha256-uUaudpb/t55OPpkE2VaLGiEqP3Lt6485HSkliJ6IH8Y="; }; meta.homepage = "https://github.com/nickel-lang/tree-sitter-nickel"; }; nim = buildGrammar { language = "nim"; - version = "0.0.0+rev=3878440"; + version = "0.0.0+rev=ac72ba3"; src = fetchFromGitHub { owner = "alaviss"; repo = "tree-sitter-nim"; - rev = "3878440d9398515ae053c6f6024986e69868bb74"; - hash = "sha256-mdAT1jTFeVP8TYi4H36sjd826KmxHQ1EZ+8gd37NGfY="; + rev = "ac72ba30d16edf0be021588a9301ede4accd6cf4"; + hash = "sha256-1jr8tKdKvKTKCUSEvC+vRGw+W1Rl3WMbv0ZS3u7H1GA="; }; passthru.requires = [ "nim_format_string" @@ -2034,12 +2012,12 @@ }; nix = buildGrammar { language = "nix"; - version = "0.0.0+rev=eabf968"; + version = "0.0.0+rev=3d0173d"; src = fetchFromGitHub { owner = "nix-community"; repo = "tree-sitter-nix"; - rev = "eabf96807ea4ab6d6c7f09b671a88cd483542840"; - hash = "sha256-cSiBd0XkSR8l1CF2vkThWUtMxqATwuxCNO5oy2kyOZY="; + rev = "3d0173d903e630b6e14d17f1cf79488791379ded"; + hash = "sha256-DFmFRZ47TPr8mgmRyXuHLfkQRmO58m4QyN9OBISb7IE="; }; meta.homepage = "https://github.com/nix-community/tree-sitter-nix"; }; @@ -2056,12 +2034,12 @@ }; nu = buildGrammar { language = "nu"; - version = "0.0.0+rev=696d257"; + version = "0.0.0+rev=d694570"; src = fetchFromGitHub { owner = "nushell"; repo = "tree-sitter-nu"; - rev = "696d257f6b652edb50878a783b30ad7833dec49e"; - hash = "sha256-G+XuQSqvJ9xRNq4fYiyHK9+AmCNofayPOC6JrFXpcjU="; + rev = "d694570aa26b53d0d642460a0430e8aa07dcbea0"; + hash = "sha256-eWHAcV8bPCnL9y4PtPn6cJRylGQ2KMxCUoUGwDVigkg="; }; meta.homepage = "https://github.com/nushell/tree-sitter-nu"; }; @@ -2092,24 +2070,24 @@ }; ocaml = buildGrammar { language = "ocaml"; - version = "0.0.0+rev=5a979b3"; + version = "0.0.0+rev=527d62e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45"; - hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw="; + rev = "527d62ef0f24ce0d97fbedf004921d75d0a7e086"; + hash = "sha256-HvnMfxQ0Cxb5atSIyW518AM/Z/5JhjisvbUSYlPnwRw="; }; location = "grammars/ocaml"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ocaml"; }; ocaml_interface = buildGrammar { language = "ocaml_interface"; - version = "0.0.0+rev=5a979b3"; + version = "0.0.0+rev=527d62e"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ocaml"; - rev = "5a979b3ec7f1fe990b8e8c4412294a0cf7228e45"; - hash = "sha256-dG9v5/NcYR8J33wEfA8BpJNFd5i4M8Cay+gBxjiRIqw="; + rev = "527d62ef0f24ce0d97fbedf004921d75d0a7e086"; + hash = "sha256-HvnMfxQ0Cxb5atSIyW518AM/Z/5JhjisvbUSYlPnwRw="; }; location = "grammars/interface"; passthru.requires = [ @@ -2175,24 +2153,24 @@ }; perl = buildGrammar { language = "perl"; - version = "0.0.0+rev=ea9667d"; + version = "0.0.0+rev=c3e17b3"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-perl"; - rev = "ea9667dc65a816acace002a2b1b099978785ca33"; - hash = "sha256-siyJfN5s63pPxrSpuzKltgXWeNDytc80MDXo4pz3j7Q="; + rev = "c3e17b31179bf8f658c9f37c7a3ea6a202212d5a"; + hash = "sha256-i5T7jT0zi0TSt7eAvjvJRak8kpzxOEoPydU+yEosNgA="; }; generate = true; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-perl"; }; php = buildGrammar { language = "php"; - version = "0.0.0+rev=3f2465c"; + version = "0.0.0+rev=3821698"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "3f2465c217d0a966d41e584b42d75522f2a3149e"; - hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0="; + rev = "38216983c07bf9e1b56e16acde53b25adaeab61c"; + hash = "sha256-Y02akiL95WGV8J3gd6FXQ0XHPoE59d2zuFQkXh6eyAQ="; }; location = "php"; passthru.requires = [ @@ -2202,12 +2180,12 @@ }; php_only = buildGrammar { language = "php_only"; - version = "0.0.0+rev=3f2465c"; + version = "0.0.0+rev=3821698"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-php"; - rev = "3f2465c217d0a966d41e584b42d75522f2a3149e"; - hash = "sha256-RV6wHYVTOFdRYMqXdPw2Ryk3FadJJ4jcJVFjsJG8Ri0="; + rev = "38216983c07bf9e1b56e16acde53b25adaeab61c"; + hash = "sha256-Y02akiL95WGV8J3gd6FXQ0XHPoE59d2zuFQkXh6eyAQ="; }; location = "php_only"; meta.homepage = "https://github.com/tree-sitter/tree-sitter-php"; @@ -2236,12 +2214,12 @@ }; pkl = buildGrammar { language = "pkl"; - version = "0.0.0+rev=f5beed1"; + version = "0.0.0+rev=3486521"; src = fetchFromGitHub { owner = "apple"; repo = "tree-sitter-pkl"; - rev = "f5beed1da8e5fc856a1a11e29a929d0b7cdcfe3c"; - hash = "sha256-q0K+q8GEOiwbgFjA/jiY/Hg6kPlgqMUvH8g+GdEDU3I="; + rev = "3486521eb1c2fcb3c9a5e88300215930ee515693"; + hash = "sha256-bQNSSDVVi0kmsIlpmI+7LWf8/SrXylAyEju/DAahqzg="; }; meta.homepage = "https://github.com/apple/tree-sitter-pkl"; }; @@ -2258,12 +2236,12 @@ }; pod = buildGrammar { language = "pod"; - version = "0.0.0+rev=57c606a"; + version = "0.0.0+rev=ffbd7f3"; src = fetchFromGitHub { owner = "tree-sitter-perl"; repo = "tree-sitter-pod"; - rev = "57c606aa3373ba876d44113d13fe7bdc2c060723"; - hash = "sha256-HE4jwqAn4jfyonFkUzA0n+MZxWa7LuV8Cfq5wgrDwjI="; + rev = "ffbd7f3b7b68edaaa0532898953c627355cb1a1a"; + hash = "sha256-5EHA3hPyrfana+g3kxqnKUwT2jUiVNb8fy07RWwp1/A="; }; generate = true; meta.homepage = "https://github.com/tree-sitter-perl/tree-sitter-pod"; @@ -2292,12 +2270,12 @@ }; powershell = buildGrammar { language = "powershell"; - version = "0.0.0+rev=73800ec"; + version = "0.0.0+rev=e7bd348"; src = fetchFromGitHub { owner = "airbus-cert"; repo = "tree-sitter-powershell"; - rev = "73800ecc8bddeee8f1079a5a2e0c13c3d00269bb"; - hash = "sha256-76Rjkoh+qtmr4KCbsEEhx1VrVlGfOxywHRFKNA/XYhU="; + rev = "e7bd348c49fdfd5c853a146a670965ba516a6239"; + hash = "sha256-jJq/x0jsXiV5VdYA+vspecTEiEy3vWLCdF0N4v0lZcs="; }; meta.homepage = "https://github.com/airbus-cert/tree-sitter-powershell"; }; @@ -2323,33 +2301,6 @@ }; meta.homepage = "https://github.com/victorhqc/tree-sitter-prisma"; }; - problog = buildGrammar { - language = "problog"; - version = "0.0.0+rev=d8d415f"; - src = fetchFromGitHub { - owner = "foxyseta"; - repo = "tree-sitter-prolog"; - rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa"; - hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; - }; - location = "grammars/problog"; - passthru.requires = [ - "prolog" - ]; - meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; - }; - prolog = buildGrammar { - language = "prolog"; - version = "0.0.0+rev=d8d415f"; - src = fetchFromGitHub { - owner = "foxyseta"; - repo = "tree-sitter-prolog"; - rev = "d8d415f6a1cf80ca138524bcc395810b176d40fa"; - hash = "sha256-SEqqmkfV/wsr1ObcBN5My29RY9TWfxnQlsnEEIZyR18="; - }; - location = "grammars/prolog"; - meta.homepage = "https://github.com/foxyseta/tree-sitter-prolog"; - }; promql = buildGrammar { language = "promql"; version = "0.0.0+rev=77625d7"; @@ -2374,12 +2325,12 @@ }; proto = buildGrammar { language = "proto"; - version = "0.0.0+rev=d65a18c"; + version = "0.0.0+rev=cf8e4eb"; src = fetchFromGitHub { owner = "coder3101"; repo = "tree-sitter-proto"; - rev = "d65a18ce7c2242801f702770114ad08056c7f8c9"; - hash = "sha256-bgrL4IK9sUB5tGoIBdNLGudbFf2OhQYdw0Ub1gM0NL0="; + rev = "cf8e4eba6e5b4afb9eb16c9178bba3d2504b46c2"; + hash = "sha256-jG7j+uBb92QdI5En/qjxhfKYm9Elf8/+OFvw1makUkY="; }; meta.homepage = "https://github.com/coder3101/tree-sitter-proto"; }; @@ -2466,67 +2417,67 @@ }; ql = buildGrammar { language = "ql"; - version = "0.0.0+rev=1fd627a"; + version = "0.0.0+rev=5b8ee9a"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-ql"; - rev = "1fd627a4e8bff8c24c11987474bd33112bead857"; - hash = "sha256-mJ/bj09mT1WTaiKoXiRXDM7dkenf5hv2ArXieeTVe6I="; + rev = "5b8ee9adaa1f2a1ea958064b61f8feb0a5a886c0"; + hash = "sha256-YhT1R0PrOFfqCLIdlAiJB+D2d31xW0iGAn8UwoxHui0="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-ql"; }; qmldir = buildGrammar { language = "qmldir"; - version = "0.0.0+rev=6b2b5e4"; + version = "0.0.0+rev=c57e008"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-qmldir"; - rev = "6b2b5e41734bd6f07ea4c36ac20fb6f14061c841"; - hash = "sha256-7ic9Xd+1G0JM25bY0f8N5r6YZx5NV5HrJXXHp6pXvo4="; + rev = "c57e00865a1a6f1cca83340d6dad91f13df55479"; + hash = "sha256-FQpheeuWg66jpIVtp++2MmJmEjlE2SiNcv59vlpNtkc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-qmldir"; }; qmljs = buildGrammar { language = "qmljs"; - version = "0.0.0+rev=0bec435"; + version = "0.0.0+rev=de96ed6"; src = fetchFromGitHub { owner = "yuja"; repo = "tree-sitter-qmljs"; - rev = "0bec4359a7eb2f6c9220cd57372d87d236f66d59"; - hash = "sha256-tV4lipey+OAQwygRFp9lQAzgCNiZzSu7p3Mr6CCBH1g="; + rev = "de96ed62abded51fcdfcbeaaa120e0dd0d20c697"; + hash = "sha256-Yn3/adOETfPHBVCIVfI5qXUwC2wQr14pbhK2aUtdCiY="; }; meta.homepage = "https://github.com/yuja/tree-sitter-qmljs"; }; query = buildGrammar { language = "query"; - version = "0.0.0+rev=fc5409c"; + version = "0.0.0+rev=8e9e223"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-query"; - rev = "fc5409c6820dd5e02b0b0a309d3da2bfcde2db17"; - hash = "sha256-51dMHH50zVP/N0ljZs7J2wh0EiNtsr2+UvM/S3LkP10="; + rev = "8e9e223812ff30854fbc912adbec696ba5f0e023"; + hash = "sha256-TxAbPlDeNsF6j5NverXARlcGAtOcRRmjzxsZpyCoPLY="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-query"; }; r = buildGrammar { language = "r"; - version = "0.0.0+rev=0e6ef77"; + version = "0.0.0+rev=58a2279"; src = fetchFromGitHub { owner = "r-lib"; repo = "tree-sitter-r"; - rev = "0e6ef7741712c09dc3ee6e81c42e919820cc65ef"; - hash = "sha256-9T0wjo8i34rvR1g4WBpDFQXQodyv4kNomayGBZK9hfg="; + rev = "58a22794466c0fc15b0d3b40531db751593721e8"; + hash = "sha256-OHmCctvFOmmL4JmjuvawR45dourXmII7Cx7hLlUCDtI="; }; meta.homepage = "https://github.com/r-lib/tree-sitter-r"; }; racket = buildGrammar { language = "racket"; - version = "0.0.0+rev=54649be"; + version = "0.0.0+rev=e2b8064"; src = fetchFromGitHub { owner = "6cdh"; repo = "tree-sitter-racket"; - rev = "54649be8b939341d2d5410b594ab954fe8814bd0"; - hash = "sha256-+pYy/WzjXqTBBxJRBbyFKGOdBd1WZ+AFr8oUWJWR/qU="; + rev = "e2b8064b32ab1dfa30532aeac1577ae4c1cc3df5"; + hash = "sha256-NuEFNKoP2JaodFfX/8wizLC3xjKPvLwHIgefzI5oXMg="; }; meta.homepage = "https://github.com/6cdh/tree-sitter-racket"; }; @@ -2554,12 +2505,12 @@ }; razor = buildGrammar { language = "razor"; - version = "0.0.0+rev=fe46ce5"; + version = "0.0.0+rev=900f53d"; src = fetchFromGitHub { owner = "tris203"; repo = "tree-sitter-razor"; - rev = "fe46ce5ea7d844e53d59bc96f2175d33691c61c5"; - hash = "sha256-E4fgy588g6IP258TS2DvoILc1Aikvpfbtq20VIhBE4U="; + rev = "900f53dc6cc592f6e616adc2f732cb0f66fc9147"; + hash = "sha256-s+evcRfRQcW7HAGRikqF+zEZK4WYFTGWWRcpe9cwxgM="; }; meta.homepage = "https://github.com/tris203/tree-sitter-razor"; }; @@ -2609,34 +2560,34 @@ }; rego = buildGrammar { language = "rego"; - version = "0.0.0+rev=ddd39af"; + version = "0.0.0+rev=7f8a431"; src = fetchFromGitHub { owner = "FallenAngel97"; repo = "tree-sitter-rego"; - rev = "ddd39af81fe8b0288102a7cb97959dfce723e0f3"; - hash = "sha256-I6jZ5jsJUAdjQti/lj4d11+GRSHjbN/hoGYO7ezGKv8="; + rev = "7f8a43138951a13832919312290147bd175180cd"; + hash = "sha256-kBTK6IjEnMnSPIF964GmTv6m+RukfP2TLcPHqHnxyIc="; }; meta.homepage = "https://github.com/FallenAngel97/tree-sitter-rego"; }; requirements = buildGrammar { language = "requirements"; - version = "0.0.0+rev=caeb2ba"; + version = "0.0.0+rev=2c3bb29"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-requirements"; - rev = "caeb2ba854dea55931f76034978de1fd79362939"; - hash = "sha256-YszXgZZSMiWBf2vIij8+5GA1FY3Ipeoow8dkrzkLl78="; + rev = "2c3bb291f497258ba417d052faa14a2dfee6d401"; + hash = "sha256-jLG+DcdVfC2Rj8SYL3WTBWreOLJWwtxpPxzyvJl77d4="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-requirements"; }; rescript = buildGrammar { language = "rescript"; - version = "0.0.0+rev=43c2f1f"; + version = "0.0.0+rev=19ed8a8"; src = fetchFromGitHub { owner = "rescript-lang"; repo = "tree-sitter-rescript"; - rev = "43c2f1f35024918d415dc933d4cc534d6419fedf"; - hash = "sha256-QG4LvF/ix7wKHrZ1pUNXzG6ibbITUYAZYb4a39qJF/o="; + rev = "19ed8a8e6bcc844b71c37e9edaffc60c77f74d7c"; + hash = "sha256-mQJSmb9Qy5pFS+nNz4+C7RPs1mpAoxxqbx7seYo8+JI="; }; meta.homepage = "https://github.com/rescript-lang/tree-sitter-rescript"; }; @@ -2708,12 +2659,12 @@ }; rst = buildGrammar { language = "rst"; - version = "0.0.0+rev=4e562e1"; + version = "0.0.0+rev=a60f107"; src = fetchFromGitHub { owner = "stsewd"; repo = "tree-sitter-rst"; - rev = "4e562e1598b95b93db4f3f64fe40ddefbc677a15"; - hash = "sha256-C65FmrEUyMQN+rF3RTN1oNVJtGiTHMZvdRyy/tMjVqY="; + rev = "a60f1070b824cb8bb8409b4b6d7da0d07997c30e"; + hash = "sha256-miULT1wsWvIdgtOfT5claorIjJFbO9xzy0/SbBrmSvU="; }; meta.homepage = "https://github.com/stsewd/tree-sitter-rst"; }; @@ -2752,12 +2703,12 @@ }; scala = buildGrammar { language = "scala"; - version = "0.0.0+rev=14c5cfd"; + version = "0.0.0+rev=4d081d9"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-scala"; - rev = "14c5cfd2b8e0f057ba0f4f72ee4812b0ae6cdce3"; - hash = "sha256-xDp1+i0QLnY18EtiwurW1B4bbeS1qZKNJRxS6Qeb3pw="; + rev = "4d081d98670ff6e98ca42c085294fc75eec15e1d"; + hash = "sha256-arwLfqA/C4w8GQv6GE/H4/tDRWaGDfvEiv7Q7mYRBRI="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-scala"; }; @@ -2799,12 +2750,12 @@ }; sflog = buildGrammar { language = "sflog"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "sflog"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2822,23 +2773,23 @@ }; slim = buildGrammar { language = "slim"; - version = "0.0.0+rev=a06113f"; + version = "0.0.0+rev=d4ff7e3"; src = fetchFromGitHub { owner = "theoo"; repo = "tree-sitter-slim"; - rev = "a06113f5175b805a37d20df0a6f9d722e0ab6cfe"; - hash = "sha256-Uk0AltQNhVd3VHQYRN+gJWd7tnVYr7qzBce6yEdtVaw="; + rev = "d4ff7e388eb271c04662f2176c08548c9c51078f"; + hash = "sha256-wl+HTLJoadlSTfDUCDV/juECth5e/FDNa7lPi8+1EEk="; }; meta.homepage = "https://github.com/theoo/tree-sitter-slim"; }; slint = buildGrammar { language = "slint"; - version = "0.0.0+rev=4d7ad06"; + version = "0.0.0+rev=68b2524"; src = fetchFromGitHub { owner = "slint-ui"; repo = "tree-sitter-slint"; - rev = "4d7ad0617c30f865f051bbac04a9826bea29f987"; - hash = "sha256-u/nVbZEJPMbBzYCgXpE8L1KJyWJmB27uofSkeOMSOnI="; + rev = "68b25244cec6eb9d7f8f790ef781c29c822d8f84"; + hash = "sha256-ugdB7gN3zTAGLm9Jk2hjuuZWxIYxEWYXW72qLpXM+1Q="; }; meta.homepage = "https://github.com/slint-ui/tree-sitter-slint"; }; @@ -2899,24 +2850,24 @@ }; soql = buildGrammar { language = "soql"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "soql"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; }; sosl = buildGrammar { language = "sosl"; - version = "0.0.0+rev=3597575"; + version = "0.0.0+rev=27a3091"; src = fetchFromGitHub { owner = "aheber"; repo = "tree-sitter-sfapex"; - rev = "3597575a429766dd7ecce9f5bb97f6fec4419d5d"; - hash = "sha256-TOytPX/jBdVDYHBacpT9hAVVZcW+XGvIsubAqs9Dm80="; + rev = "27a3091a1a444ce19d6099e00cd3788f019d0c2b"; + hash = "sha256-Pg8zZmjGFcLftPNPiASt0uUxYG6CRcsB9qKhTMC5G7U="; }; location = "sosl"; meta.homepage = "https://github.com/aheber/tree-sitter-sfapex"; @@ -2978,12 +2929,12 @@ }; ssh_config = buildGrammar { language = "ssh_config"; - version = "0.0.0+rev=71d2693"; + version = "0.0.0+rev=b7db80e"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-ssh-config"; - rev = "71d2693deadaca8cdc09e38ba41d2f6042da1616"; - hash = "sha256-LvdvnzpqjuVAf5DZmxYfELV3C+U1iJuG9B+UCQD47qo="; + rev = "b7db80ee4c8a29543904f14fb3ae3eb24f047925"; + hash = "sha256-PX5oVRBOUgTnG6UcqVNM3EZyAc1SPE0vbZjyA19FQHc="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-ssh-config"; }; @@ -3033,12 +2984,12 @@ }; superhtml = buildGrammar { language = "superhtml"; - version = "0.0.0+rev=8b5bb27"; + version = "0.0.0+rev=d4d81e1"; src = fetchFromGitHub { owner = "kristoff-it"; repo = "superhtml"; - rev = "8b5bb272b269afdd38cdf641c4a707dd92fbe902"; - hash = "sha256-9RizfSi+ouCcLUL2+gPc8GljNo9KCX57VElLSlha05A="; + rev = "d4d81e1ad35f8f6c060f3cb49b60c5d54a7d012a"; + hash = "sha256-tDRb/TKyj0icKJRuzNn+eNbz1S1BWj8K5eR+reZAbyM="; }; location = "tree-sitter-superhtml"; meta.homepage = "https://github.com/kristoff-it/superhtml"; @@ -3078,12 +3029,12 @@ }; swift = buildGrammar { language = "swift"; - version = "0.0.0+rev=8abb3e8"; + version = "0.0.0+rev=28fe3a8"; src = fetchFromGitHub { owner = "alex-pinkus"; repo = "tree-sitter-swift"; - rev = "8abb3e8b33256d89127a35e87480736f74755ff9"; - hash = "sha256-JztVY5/jb532lUV0ziEIW1auDsfKy7gZNDFHvjDIPLk="; + rev = "28fe3a8a85586aa297524fe6164140b9521dcaff"; + hash = "sha256-uotg71UvLWd98jRe3YvQEBcZFJR2VXocjNWrXTNUW8g="; }; generate = true; meta.homepage = "https://github.com/alex-pinkus/tree-sitter-swift"; @@ -3112,23 +3063,23 @@ }; systemverilog = buildGrammar { language = "systemverilog"; - version = "0.0.0+rev=2939285"; + version = "0.0.0+rev=aa09b90"; src = fetchFromGitHub { owner = "gmlarumbe"; repo = "tree-sitter-systemverilog"; - rev = "293928578cb27fbd0005fcc5f09c09a1e8628c89"; - hash = "sha256-bvnJlEiaHtcmvNw3yyiysKMvdz919Fvr+/fyH8GcEYs="; + rev = "aa09b9004478cea0f46d877608910dc153b277b6"; + hash = "sha256-ig4mpzN/bvnD5e5MN11a7YkONDeJ3R8kz/AbS0GDreI="; }; meta.homepage = "https://github.com/gmlarumbe/tree-sitter-systemverilog"; }; t32 = buildGrammar { language = "t32"; - version = "0.0.0+rev=3bce397"; + version = "0.0.0+rev=acc92b0"; src = fetchFromGitHub { owner = "xasc"; repo = "tree-sitter-t32"; - rev = "3bce3977303c3f88bfa9fcdfcfd1a4f8f6ffa0b0"; - hash = "sha256-ysdKgzF5VFV0BeeXlV8gZ5pW7WzYJtYnyBE+MaxG3Jo="; + rev = "acc92b00d8564421f9c9c05ececfd2c7c942fe47"; + hash = "sha256-7qWKy5ZcAB2VptlVHIGf3qTPmDI7mRdvB8weRvH9mi0="; }; meta.homepage = "https://github.com/xasc/tree-sitter-t32"; }; @@ -3145,12 +3096,12 @@ }; tact = buildGrammar { language = "tact"; - version = "0.0.0+rev=a6267c2"; + version = "0.0.0+rev=1c689f0"; src = fetchFromGitHub { owner = "tact-lang"; repo = "tree-sitter-tact"; - rev = "a6267c2091ed432c248780cec9f8d42c8766d9ad"; - hash = "sha256-2AUN/VYor3K0hkneLYa6+LjE+V8EJogFqBTgdfvOiKM="; + rev = "1c689f0a8bbe5910db628a62bfc26d37f54bf9be"; + hash = "sha256-SA33We0hOBc97iBom7m2tBfcquopJs1hi/QsJFb7XBw="; }; meta.homepage = "https://github.com/tact-lang/tree-sitter-tact"; }; @@ -3179,12 +3130,12 @@ }; templ = buildGrammar { language = "templ"; - version = "0.0.0+rev=1c6db04"; + version = "0.0.0+rev=04bae7c"; src = fetchFromGitHub { owner = "vrischmann"; repo = "tree-sitter-templ"; - rev = "1c6db04effbcd7773c826bded9783cbc3061bd55"; - hash = "sha256-n+TJLNB6AoFOjkqpb8vkxXsXno/vE8M8yRzVflRUVd0="; + rev = "04bae7c82de2fcfec94254fef50f5f1c5924f5f5"; + hash = "sha256-s2hkhES86Idf9vbDqrX6Lh7iUn0dTq8DBqw5qUBAYzE="; }; meta.homepage = "https://github.com/vrischmann/tree-sitter-templ"; }; @@ -3258,17 +3209,6 @@ }; meta.homepage = "https://github.com/tlaplus-community/tree-sitter-tlaplus"; }; - tmux = buildGrammar { - language = "tmux"; - version = "0.0.0+rev=75d1b99"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-tmux"; - rev = "75d1b995b0c23400ac8e49db757a2e0386f9fa8f"; - hash = "sha256-LdXPdijcsfPYIrbTMDIy46wqOaJfxwVBVpOVVfXrJIg="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-tmux"; - }; todotxt = buildGrammar { language = "todotxt"; version = "0.0.0+rev=3937c5c"; @@ -3331,12 +3271,12 @@ }; twig = buildGrammar { language = "twig"; - version = "0.0.0+rev=7195ee5"; + version = "0.0.0+rev=0afd9a6"; src = fetchFromGitHub { owner = "gbprod"; repo = "tree-sitter-twig"; - rev = "7195ee573ab5c3b3bb0e91b042e6f83ac1b11104"; - hash = "sha256-wQ5pHFU35wqT3UxHIZ/cP8RPPX+mpGQCoBr9ilRfc4w="; + rev = "0afd9a6d808944e65a7be393e31868b85345735f"; + hash = "sha256-QXwijdfVay4PH0yKmWuMUnqqInir2yjJZjHxZQTYRxE="; }; meta.homepage = "https://github.com/gbprod/tree-sitter-twig"; }; @@ -3443,12 +3383,12 @@ }; v = buildGrammar { language = "v"; - version = "0.0.0+rev=095865d"; + version = "0.0.0+rev=925d457"; src = fetchFromGitHub { owner = "vlang"; repo = "v-analyzer"; - rev = "095865df4b9ddd21e376d635586c663d5a736f71"; - hash = "sha256-ypdtFzQwd5t7/iFthX4hb4zNeFQZKaatF8JA4XutOt4="; + rev = "925d4570d1668746762a2cdf0ecb9a25be704a67"; + hash = "sha256-MRkZTJkpqvdpuyOuk683ko5GPtIa4U7BozzssuAX+0M="; }; location = "tree_sitter_v"; meta.homepage = "https://github.com/vlang/v-analyzer"; @@ -3477,12 +3417,12 @@ }; vhdl = buildGrammar { language = "vhdl"; - version = "0.0.0+rev=c2d9be3"; + version = "0.0.0+rev=e97406d"; src = fetchFromGitHub { owner = "jpt13653903"; repo = "tree-sitter-vhdl"; - rev = "c2d9be3d5ab7fb2cae8ad5ae604cd3606a4af0f2"; - hash = "sha256-/bz7ab0XjLfHYEJDv71uLSbduInjDK06d3UQLdiiJ78="; + rev = "e97406d6ddfbed73dd8cdfcc3cf4c7b200b4211d"; + hash = "sha256-2vSkL8DetMtTRpvujg4tzxW2AbAhz56qBWRmgA8u3qk="; }; meta.homepage = "https://github.com/jpt13653903/tree-sitter-vhdl"; }; @@ -3499,23 +3439,23 @@ }; vim = buildGrammar { language = "vim"; - version = "0.0.0+rev=3092fcd"; + version = "0.0.0+rev=039c8d0"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-vim"; - rev = "3092fcd99eb87bbd0fc434aa03650ba58bd5b43b"; - hash = "sha256-MnLBFuJCJbetcS07fG5fkCwHtf/EcNP+Syf0Gn0K39c="; + rev = "039c8d0aa1deae00ddeb0374dd70bcc0ec56938d"; + hash = "sha256-i+CfSWLRXhR2g98cGlfW4iRhNb3nt8O+WJ1Bjf2tnEM="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-vim"; }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=f061895"; + version = "0.0.0+rev=23daa41"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "f061895a0eff1d5b90e4fb60d21d87be3267031a"; - hash = "sha256-K3nzoLlzbgIJc7EnqgYgNDLCBXOg7oy9eV2lI0duwaE="; + rev = "23daa416c1ff5d15f59a1aa648f031d6e3ee15c5"; + hash = "sha256-SG5oz/vXz1rdCjzAo2bE3xz107Hc+qOqfsC5V+j0X1I="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; @@ -3576,12 +3516,12 @@ }; wit = buildGrammar { language = "wit"; - version = "0.0.0+rev=v1.3.0"; + version = "0.0.0+rev=v1.4.0"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = "tree-sitter-wit"; - tag = "v1.3.0"; - hash = "sha256-FG73R38Bw60+aT5YB/xpENCnQwoGMVjXRLjP1GdJEn4="; + tag = "v1.4.0"; + hash = "sha256-63xH63s6lgticgRtMz7LCL1ThuXegn7qFCZgeQqIZH4="; }; meta.homepage = "https://github.com/bytecodealliance/tree-sitter-wit"; }; @@ -3635,12 +3575,12 @@ }; yaml = buildGrammar { language = "yaml"; - version = "0.0.0+rev=4463985"; + version = "0.0.0+rev=a1c4812"; src = fetchFromGitHub { owner = "tree-sitter-grammars"; repo = "tree-sitter-yaml"; - rev = "4463985dfccc640f3d6991e3396a2047610cf5f8"; - hash = "sha256-nCyGepZg6n2a/Clc0NFxTSt3Pm1z4OHIzJSjrjGudmw="; + rev = "a1c4812a73ec5e089de8e441fdea3a921e8d5079"; + hash = "sha256-I4jI68HNDyV6cqa6S9cLqoKwnw/E2pFHbOimhHJISMY="; }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yaml"; }; @@ -3666,17 +3606,6 @@ }; meta.homepage = "https://github.com/tree-sitter-grammars/tree-sitter-yuck"; }; - zathurarc = buildGrammar { - language = "zathurarc"; - version = "0.0.0+rev=0554b4a"; - src = fetchFromGitHub { - owner = "Freed-Wu"; - repo = "tree-sitter-zathurarc"; - rev = "0554b4a5d313244b7fc000cbb41c04afae4f4e31"; - hash = "sha256-edwLcz1WlcRJOoV2Unpho8wmi7TmcpwysBOAdRKprNw="; - }; - meta.homepage = "https://github.com/Freed-Wu/tree-sitter-zathurarc"; - }; zig = buildGrammar { language = "zig"; version = "0.0.0+rev=6479aa1"; @@ -3714,12 +3643,12 @@ }; zsh = buildGrammar { language = "zsh"; - version = "0.0.0+rev=bd344c2"; + version = "0.0.0+rev=7a59340"; src = fetchFromGitHub { owner = "georgeharker"; repo = "tree-sitter-zsh"; - rev = "bd344c23a7683e293d077c6648e88f209782fedb"; - hash = "sha256-91peFWN4vPRRZ4yZCl3Wtp0SzFKT7pBGihDgWX9IeZk="; + rev = "7a593401efb5418ffdedbe3c0e4c61c6d240166d"; + hash = "sha256-KCvuyVWR09jlTk+za0FA/z89O5deToxvJ9zNQoBq/+E="; }; meta.homepage = "https://github.com/georgeharker/tree-sitter-zsh"; }; @@ -4109,9 +4038,6 @@ "cpp" ]; }; - hlsplaylist = buildQueries { - language = "hlsplaylist"; - }; hocon = buildQueries { language = "hocon"; }; @@ -4302,9 +4228,6 @@ mlir = buildQueries { language = "mlir"; }; - muttrc = buildQueries { - language = "muttrc"; - }; nasm = buildQueries { language = "nasm"; }; @@ -4410,15 +4333,6 @@ prisma = buildQueries { language = "prisma"; }; - problog = buildQueries { - language = "problog"; - requires = [ - "prolog" - ]; - }; - prolog = buildQueries { - language = "prolog"; - }; promql = buildQueries { language = "promql"; }; @@ -4677,9 +4591,6 @@ tlaplus = buildQueries { language = "tlaplus"; }; - tmux = buildQueries { - language = "tmux"; - }; todotxt = buildQueries { language = "todotxt"; }; @@ -4799,9 +4710,6 @@ yuck = buildQueries { language = "yuck"; }; - zathurarc = buildQueries { - language = "zathurarc"; - }; zig = buildQueries { language = "zig"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix index 84051feecadc..9eb050654f91 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/overrides.nix @@ -4,6 +4,7 @@ symlinkJoin, vimUtils, tree-sitter, + tree-sitter-grammars, neovim, neovimUtils, runCommand, @@ -127,7 +128,7 @@ let withPlugins = f: let - selectedGrammars = f (tree-sitter.builtGrammars // builtGrammars); + selectedGrammars = f (tree-sitter-grammars.derivations // builtGrammars); grammarPlugins = map grammarToPlugin selectedGrammars; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index d94ebe53b78b..aee1f1aa5955 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -935,6 +935,7 @@ assertNoAdditions { nvimSkipModules = [ "repro_blink" "repro_cmp" + "repro_native_completion" ]; }; @@ -1551,6 +1552,18 @@ assertNoAdditions { ]; }; + fyler-nvim = super.fyler-nvim.overrideAttrs { + nvimSkipModules = [ + # Requires setup + "fyler.extensions.trash" + "fyler.finder" + "fyler.integrations.icon" + "fyler.integrations.window_picker" + "fyler.schemes.file" + "fyler.state" + ]; + }; + fzf-checkout-vim = super.fzf-checkout-vim.overrideAttrs { # The plugin has a makefile which tries to run tests in a docker container. # This prevents it. @@ -1656,7 +1669,8 @@ assertNoAdditions { ]; checkInputs = with self; [ luasnip - null-ls-nvim + none-ls-nvim + plenary-nvim ]; nvimSkipModules = [ "init" @@ -2012,18 +2026,13 @@ assertNoAdditions { let kulala-http-grammar = neovimUtils.grammarToPlugin ( tree-sitter.buildGrammar { - inherit (old) version src meta; language = "kulala_http"; - location = "lua/tree-sitter"; + inherit (luaPackages.tree-sitter-kulala_http) version src meta; generate = false; } ); in { - patches = (old.patches or [ ]) ++ [ - ./patches/kulala-nvim/use-packaged-tree-sitter-parser.patch - ]; - dependencies = [ kulala-http-grammar ]; postPatch = '' @@ -2036,6 +2045,7 @@ assertNoAdditions { "cli.kulala_cli" # Upstream test harnesses are not require-safe modules "minit" + "minit-userscript" "minitest" "test" # Legacy parser module; active parsing is handled by kulala-core @@ -2481,7 +2491,8 @@ assertNoAdditions { mason-null-ls-nvim = super.mason-null-ls-nvim.overrideAttrs { dependencies = with self; [ mason-nvim - null-ls-nvim + none-ls-nvim + plenary-nvim ]; }; @@ -3014,12 +3025,25 @@ assertNoAdditions { ]; }; + neovim-project = super.neovim-project.overrideAttrs { + dependencies = with self; [ + plenary-nvim + neovim-session-manager + ]; + }; + neovim-sensible = super.neovim-sensible.overrideAttrs (old: { meta = old.meta // { license = lib.licenses.mit; }; }); + neovim-session-manager = super.neovim-session-manager.overrideAttrs { + dependencies = with self; [ + plenary-nvim + ]; + }; + neovim-tips = super.neovim-tips.overrideAttrs { dependencies = [ self.nui-nvim @@ -3074,6 +3098,10 @@ assertNoAdditions { dependencies = [ self.nui-nvim ]; }; + none-ls-extras-nvim = super.none-ls-extras-nvim.overrideAttrs { + dependencies = [ self.none-ls-nvim ]; + }; + none-ls-nvim = super.none-ls-nvim.overrideAttrs { dependencies = [ self.plenary-nvim ]; }; @@ -3094,13 +3122,6 @@ assertNoAdditions { dependencies = [ self.aniseed ]; }; - null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { - dependencies = [ self.plenary-nvim ]; - meta = old.meta // { - license = lib.licenses.unlicense; - }; - }); - nvchad = super.nvchad.overrideAttrs { # You've signed up for a distro, providing dependencies. dependencies = with self; [ @@ -3299,6 +3320,7 @@ assertNoAdditions { }; nvim-jdtls = super.nvim-jdtls.overrideAttrs (old: { + runtimeDeps = [ python3 ]; meta = old.meta // { license = lib.licenses.gpl3Only; }; @@ -3443,7 +3465,7 @@ assertNoAdditions { # Optional toggleterm integration checkInputs = [ self.toggleterm-nvim ]; dependencies = with self; [ - nvim-treesitter-legacy + nvim-treesitter nvim-treesitter-parsers.c_sharp nvim-treesitter-parsers.go nvim-treesitter-parsers.haskell @@ -3580,7 +3602,6 @@ assertNoAdditions { snacks-nvim telescope-nvim ]; - dependencies = [ self.plenary-nvim ]; nvimSkipModules = [ # Issue reproduction file "minimal" @@ -3737,6 +3758,10 @@ assertNoAdditions { dependencies = [ self.nui-nvim ]; }; + pantran-nvim = super.pantran-nvim.overrideAttrs { + runtimeDeps = [ curl ]; + }; + parpar-nvim = super.parpar-nvim.overrideAttrs { dependencies = with self; [ nvim-parinfer @@ -4089,6 +4114,20 @@ assertNoAdditions { }; }); + slimline-nvim = super.slimline-nvim.overrideAttrs { + nvimSkipModules = [ + # Component modules read the user-supplied slimline.config at require time. + "slimline.components.diagnostics" + "slimline.components.filetype_lsp" + "slimline.components.mode" + "slimline.components.path" + "slimline.components.progress" + "slimline.components.recording" + "slimline.components.searchcount" + "slimline.components.selectioncount" + ]; + }; + smart-open-nvim = super.smart-open-nvim.overrideAttrs { dependencies = with self; [ plenary-nvim @@ -4628,17 +4667,6 @@ assertNoAdditions { runtimeDeps = [ television ]; }; - typescript-nvim = super.typescript-nvim.overrideAttrs { - checkInputs = [ - # Optional null-ls integration - self.none-ls-nvim - ]; - dependencies = with self; [ - nvim-lspconfig - plenary-nvim - ]; - }; - typescript-tools-nvim = super.typescript-tools-nvim.overrideAttrs { dependencies = with self; [ nvim-lspconfig @@ -5796,22 +5824,6 @@ assertNoAdditions { }; }); - vimacs = super.vimacs.overrideAttrs (old: { - buildPhase = '' - substituteInPlace bin/vim \ - --replace-fail '/usr/bin/vim' 'vim' \ - --replace-fail '/usr/bin/gvim' 'gvim' - # remove unnecessary duplicated bin wrapper script - rm -r plugin/vimacs - ''; - meta = old.meta // { - description = "Vim-Improved eMACS: Emacs emulation plugin for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; - }; - }); - vimade = super.vimade.overrideAttrs { checkInputs = with self; [ # Optional providers diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch deleted file mode 100644 index 00a76f9c0492..000000000000 --- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/do-not-install-grammar.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/lua/kulala/config/init.lua b/lua/kulala/config/init.lua -index 7298f95..d781a12 100644 ---- a/lua/kulala/config/init.lua -+++ b/lua/kulala/config/init.lua -@@ -122,6 +122,10 @@ local function setup_treesitter_master() - end - - local function set_kulala_parser() -+ assert(vim.treesitter.language.add("kulala_http")) -+ vim.treesitter.language.register("kulala_http", { "http", "rest" }) -+ do return end -+ - local parsers = vim.F.npcall(require, "nvim-treesitter.parsers") - - if not parsers then diff --git a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch b/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch deleted file mode 100644 index 2398bd254e22..000000000000 --- a/pkgs/applications/editors/vim/plugins/patches/kulala-nvim/use-packaged-tree-sitter-parser.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/lua/kulala/config/parser.lua b/lua/kulala/config/parser.lua -index 5f37046..c60c474 100644 ---- a/lua/kulala/config/parser.lua -+++ b/lua/kulala/config/parser.lua -@@ -37,7 +37,6 @@ local function sync_queries() - end - - local function load_parser() -- if not Fs.file_exists(parser_target_path) then return false end - return vim.treesitter.language.add(parser_name) == true - end - -@@ -48,7 +47,6 @@ M.register_parser = function() - -- queries/kulala_http/*.scm live under lua/tree-sitter/queries/ - vim.opt.rtp:prepend(parser_source_path) - ensure_site_rtp() -- sync_queries() - vim.treesitter.language.register(parser_name, filetypes) - vim.treesitter.language.register("markdown", "kulala_ui") - local backend = require("kulala.backend") -@@ -94,7 +92,7 @@ local function has_kulala_parser() - end - - M.is_up_to_date = function() -- return has_kulala_parser() and is_parser_ver_current() -+ return load_parser() - end - - M.setup = function() diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index d813e9230d58..593397bf9dca 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -146,6 +146,7 @@ https://github.com/MahanRahmati/blink-nerdfont.nvim/,, https://github.com/mikavilpas/blink-ripgrep.nvim/,, https://github.com/Saghen/blink.compat/,, https://github.com/Saghen/blink.indent/,, +https://github.com/saghen/blink.lib/,, https://github.com/dundalek/bloat.nvim/,, https://github.com/HampusHauffman/block.nvim/,, https://github.com/uloco/bluloco.nvim/,, @@ -259,6 +260,7 @@ https://github.com/mrjones2014/codesettings.nvim/,, https://github.com/gorbit99/codewindow.nvim/,, https://github.com/johnseth97/codex.nvim/,, https://github.com/metakirby5/codi.vim/,, +https://github.com/thekylehuang/cole.nvim/,, https://github.com/archseer/colibri.vim/,, https://github.com/tjdevries/colorbuddy.nvim/,, https://github.com/xzbdmw/colorful-menu.nvim/,, @@ -450,7 +452,7 @@ https://github.com/shumphrey/fugitive-gitlab.vim/,, https://github.com/BeneCollyridam/futhark-vim/,, https://github.com/tzachar/fuzzy.nvim/,, https://github.com/rktjmp/fwatch.nvim/,, -https://github.com/A7Lavinraj/fyler.nvim/,stable, +https://github.com/FylerOrg/fyler.nvim/,stable, https://github.com/stsewd/fzf-checkout.vim/,, https://github.com/monkoose/fzf-hoogle.vim/,, https://github.com/gfanto/fzf-lsp.nvim/,, @@ -478,7 +480,7 @@ https://github.com/vim-scripts/gitignore.vim/,, https://gitlab.com/gitlab-org/editor-extensions/gitlab.vim,, https://github.com/LionyxML/gitlineage.nvim/,, https://github.com/ruifm/gitlinker.nvim/,, -https://github.com/trevorhauter/gitportal.nvim/,, +https://codeberg.org/trevorhauter/gitportal.nvim/,, https://github.com/gregsexton/gitv/,, https://github.com/DNLHC/glance.nvim/,, https://github.com/ellisonleao/glow.nvim/,, @@ -602,7 +604,6 @@ https://github.com/frabjous/knap/,, https://github.com/oskarnurm/koda.nvim/,, https://github.com/b3nj5m1n/kommentary/,, https://github.com/udalov/kotlin-vim/,, -https://github.com/mistweaverco/kulala.nvim/,, https://github.com/slugbyte/lackluster.nvim/,, https://github.com/qnighy/lalrpop.vim/,, https://github.com/Wansmer/langmapper.nvim/,, @@ -761,6 +762,7 @@ https://github.com/leafo/moonscript-vim/,, https://github.com/yegappan/mru/,, https://github.com/jake-stewart/multicursor.nvim/,, https://github.com/smoka7/multicursors.nvim/,, +https://github.com/brenton-leighton/multiple-cursors.nvim/,main, https://github.com/AckslD/muren.nvim/,, https://github.com/jbyuki/nabla.nvim/,, https://github.com/ncm2/ncm2/,, @@ -835,7 +837,9 @@ https://github.com/marilari88/neotest-vitest/,, https://github.com/lawrence-laz/neotest-zig/,, https://github.com/Shatur/neovim-ayu/,, https://github.com/cloudhead/neovim-fuzzy/,, +https://github.com/coffebar/neovim-project/,, https://github.com/jeffkreeftmeijer/neovim-sensible/,, +https://github.com/shatur/neovim-session-manager/,, https://github.com/saxon1964/neovim-tips/,, https://github.com/trunk-io/neovim-trunk/,, https://github.com/Shougo/neoyank.vim/,, @@ -862,13 +866,13 @@ https://github.com/aktersnurra/no-clown-fiesta.nvim/,, https://github.com/shortcuts/no-neck-pain.nvim/,, https://github.com/kartikp10/noctis.nvim/,, https://github.com/folke/noice.nvim/,, +https://github.com/nvimtools/none-ls-extras.nvim/,, https://github.com/nvimtools/none-ls.nvim/,, https://github.com/nordtheme/vim/,,nord-vim https://github.com/shaunsingh/nord.nvim/,, https://github.com/alexvzyl/nordic.nvim/,, https://github.com/vigoux/notifier.nvim/,, https://github.com/jlesquembre/nterm.nvim/,, -https://github.com/jose-elias-alvarez/null-ls.nvim/,, https://github.com/nacro90/numb.nvim/,, https://github.com/nvchad/nvchad/,, https://github.com/nvchad/ui/,,nvchad-ui @@ -935,7 +939,6 @@ https://github.com/martineausimon/nvim-lilypond-suite/,, https://codeberg.org/mfussenegger/nvim-lint/,, https://github.com/antosha417/nvim-lsp-file-operations/,, https://github.com/mrded/nvim-lsp-notify/,, -https://github.com/jose-elias-alvarez/nvim-lsp-ts-utils/,, https://github.com/neovim/nvim-lspconfig/,, https://github.com/RishabhRD/nvim-lsputils/,, https://github.com/sam4llis/nvim-lua-gf/,, @@ -1044,6 +1047,7 @@ https://github.com/wbthomason/packer.nvim/,, https://github.com/drewtempelmeyer/palenight.vim/,, https://github.com/JoosepAlviste/palenightfall.nvim/,, https://github.com/roobert/palette.nvim/,, +https://github.com/potamides/pantran.nvim/,, https://github.com/NLKNguyen/papercolor-theme/,, https://github.com/pappasam/papercolor-theme-slim/,, https://github.com/dundalek/parpar.nvim/,, @@ -1072,6 +1076,7 @@ https://github.com/RishabhRD/popfix/,, https://github.com/nvim-lua/popup.nvim/,, https://github.com/tris203/precognition.nvim/,, https://github.com/andweeb/presence.nvim/,, +https://github.com/Chaitanyabsprip/present.nvim/,, https://github.com/sotte/presenting.vim/,, https://github.com/ewilazarus/preto/,, https://github.com/anuvyklack/pretty-fold.nvim/,, @@ -1152,6 +1157,7 @@ https://github.com/folke/sidekick.nvim/,, https://github.com/AndrewRadev/sideways.vim/,, https://github.com/skim-rs/skim.vim/,, https://github.com/mopp/sky-color-clock.vim/,, +https://github.com/sschleemilch/slimline.nvim/,, https://github.com/kovisoft/slimv/,, https://github.com/danielfalk/smart-open.nvim/,, https://github.com/mrjones2014/smart-splits.nvim/,, @@ -1315,7 +1321,6 @@ https://github.com/alexpasmantier/tv.nvim/,, https://github.com/folke/twilight.nvim/,, https://github.com/pmizio/typescript-tools.nvim/,, https://github.com/leafgarland/typescript-vim/,, -https://github.com/jose-elias-alvarez/typescript.nvim/,, https://github.com/MrPicklePinosaur/typst-conceal.vim/,, https://github.com/chomosuke/typst-preview.nvim/,, https://github.com/kaarmu/typst.vim/,, @@ -1788,7 +1793,6 @@ https://github.com/marrub--/vim-zscript/,, https://github.com/dag/vim2hs/,, https://github.com/monkoose/vim9-stargate/,, https://github.com/dominikduda/vim_current_word/,, -https://github.com/andrep/vimacs/,, https://github.com/TaDaa/vimade/,, https://github.com/jreybert/vimagit/,, https://github.com/gotcha/vimelette/,, @@ -1835,7 +1839,7 @@ https://github.com/natecraddock/workspaces.nvim/,, https://github.com/andrewferrier/wrapping.nvim/,, https://github.com/tweekmonster/wstrip.vim/,, https://github.com/piersolenski/wtf.nvim/,, -https://github.com/kyzadev/xeno.nvim/,, +https://github.com/kyzabuilds/xeno.nvim/,, https://github.com/Mythos-404/xmake.nvim/,, https://github.com/drmingdrmer/xptemplate/,, https://github.com/guns/xterm-color-table.vim/,, diff --git a/pkgs/applications/editors/vim/vimacs.nix b/pkgs/applications/editors/vim/vimacs.nix deleted file mode 100644 index 050f803fa0dd..000000000000 --- a/pkgs/applications/editors/vim/vimacs.nix +++ /dev/null @@ -1,44 +0,0 @@ -{ - lib, - stdenv, - config, - vim-full, - macvim, - vimPlugins, - useMacvim ? stdenv.hostPlatform.isDarwin && (config.vimacs.macvim or true), - vimacsExtraArgs ? "", -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "vimacs"; - version = lib.getVersion finalAttrs.vimPackage; - vimPackage = if useMacvim then macvim else vim-full; - - buildInputs = [ - finalAttrs.vimPackage - vimPlugins.vimacs - ]; - - buildCommand = '' - mkdir -p "$out"/bin - cp "${vimPlugins.vimacs}"/bin/vim $out/bin/vimacs - substituteInPlace "$out"/bin/vimacs \ - --replace '-vim}' '-@bin@/bin/vim}' \ - --replace '-gvim}' '-@bin@/bin/vim -g}' \ - --replace '--cmd "let g:VM_Enabled = 1"' \ - '--cmd "let g:VM_Enabled = 1" --cmd "set rtp^=@rtp@" ${vimacsExtraArgs}' \ - --replace @rtp@ ${vimPlugins.vimacs} \ - --replace @bin@ ${finalAttrs.vimPackage} - for prog in vm gvm gvimacs vmdiff vimacsdiff - do - ln -s "$out"/bin/vimacs $out/bin/$prog - done - ''; - - meta = { - description = "Vim-Improved eMACS: Emacs emulation for Vim"; - homepage = "http://algorithm.com.au/code/vimacs"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ millerjason ]; - }; -}) diff --git a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix index 159d7df1b9d2..49e9e8b2b4a5 100644 --- a/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix +++ b/pkgs/applications/editors/vscode/extensions/WakaTime.vscode-wakatime/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-wakatime"; publisher = "WakaTime"; - version = "30.0.8"; - hash = "sha256-IRpjwlLzof2Ll2s/k9K6LPFYp4NTvpfZWfMbMMk+rbY="; + version = "30.2.1"; + hash = "sha256-FlH8uobKgUAAOr+6TCG9xYPiNN3FhlFp18dWKX8pFtE="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix index 47157bcb6e27..d1d931df338f 100644 --- a/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/amazonwebservices.amazon-q-vscode/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { name = "amazon-q-vscode"; publisher = "AmazonWebServices"; - version = "2.2.0"; - hash = "sha256-HwgInQOaSKHSs8CU+Ng4jYA6aaP/g3l4CSb/0ewkmc4="; + version = "2.3.0"; + hash = "sha256-2EEhGU+I61yiVvPEIJlQUgTej9Oi7jW3n5znN2Y2vP4="; }; meta = { 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 3acd29d4b269..7d9174b46e19 100644 --- a/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/anthropic.claude-code/default.nix @@ -21,26 +21,22 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-XA4xSd/sg9vhOGqcCNliHzloBxPZsgXW/dSkKp/RzM0="; + hash = "sha256-Y6MXjJBmhMzuQMwhkPLHK/vtciTdjsGvkEblH3ofju0="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-l2NjDHBOMBzJT9Pis7sqSuFuG07eZPALximND+hVqDU="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-hE/1N28f9uAzg2fG3Hrc4z1kW21rdhtCRmF9SphqiFc="; + hash = "sha256-8VvDtb+8SoLTRC7pXwH40amRurxTQgCmhdi0u7e5AfU="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-68CmDax385o0juoQWNX/NLx+tjIt9YytTHjRZkqAR98="; + hash = "sha256-bqjEgsjY+zyG1g/KtkRNxAlazIpc+HwGWvsMQNnPI2M="; }; }; in { name = "claude-code"; publisher = "anthropic"; - version = "2.1.175"; + version = "2.1.218"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -60,7 +56,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch index fc3b7fd177eb..f8e24a309940 100644 --- a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/commands-abspath.patch @@ -1,13 +1,11 @@ -diff --git a/package.json b/package.json -index 7ab70e8..2ebe541 100644 --- a/package.json +++ b/package.json @@ -437,7 +437,7 @@ - }, - "asciidoc.asciidoctorpdf_command": { - "type": "string", -- "default": "asciidoctor-pdf", -+ "default": "@ASCIIDOCTOR_PDF_BIN@", - "markdownDescription": "%asciidoc.asciidoctorpdf_command.desc%", - "markdownDeprecationMessage": "%asciidoc.asciidoctorpdf_command.deprecationMessage%", - "scope": "resource" + }, + "asciidoc.asciidoctorpdf_command": { + "type": "string", +- "default": "asciidoctor-pdf", ++ "default": "@ASCIIDOCTOR_PDF_BIN@", + "markdownDescription": "%asciidoc.asciidoctorpdf_command.desc%", + "markdownDeprecationMessage": "%asciidoc.asciidoctorpdf_command.deprecationMessage%", + "scope": "resource" diff --git a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix index 3f7dabf2e256..19205609d398 100644 --- a/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/asciidoctor.asciidoctor-vscode/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "asciidoctor-vscode"; publisher = "asciidoctor"; - version = "3.4.2"; - hash = "sha256-HG3y7999xeE1erQZCnBgUPj/aC0Kwyn20PEZR9gKrxY="; + version = "3.4.5"; + hash = "sha256-X7njFSqfb45l6ZTr7GDS3At6DMHyvBT41JoghOeVjwI="; }; patches = [ diff --git a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix index 563253536441..370cd2ee9ec1 100644 --- a/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix +++ b/pkgs/applications/editors/vscode/extensions/azdavis.millet/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "Millet"; publisher = "azdavis"; - version = "0.15.1"; - hash = "sha256-5V5GG7M52ohpS9Zg2TTamEjbWyXH9kllZyy7Oezy4Iw="; + version = "0.15.2"; + hash = "sha256-mtI4IW+xBIuo11ctTIv5/6LOXVStD3YqSYkIQYJWqmo="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix index 54593282150a..d2b8e6dab445 100644 --- a/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix +++ b/pkgs/applications/editors/vscode/extensions/betterthantomorrow.calva/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; publisher = "betterthantomorrow"; - version = "2.0.572"; - hash = "sha256-Tv4bZdfROJbnhgJ65lP+F4f2xkICr4X+P08P66Kuu7A="; + version = "2.0.593"; + hash = "sha256-/pPDghizzU/EulLyeFzmsufEwegR4ngo0rxW1Qnjock="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix index 669c066b81d4..0d9d9b62839a 100644 --- a/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix +++ b/pkgs/applications/editors/vscode/extensions/biomejs.biome/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "biome"; publisher = "biomejs"; - version = "2026.3.311859"; - hash = "sha256-HH+KJYY4J6nuHwQ/+DhEFsJ7P5S97UsNuoc+y7GnE00="; + version = "2026.6.181955"; + hash = "sha256-6FRrVKDY+E9wuqgeNKArgGn4PDp5ViJsdCPjjwBGbGI="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix index d3f08bc5df9a..2128bad3a243 100644 --- a/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix +++ b/pkgs/applications/editors/vscode/extensions/charliermarsh.ruff/default.nix @@ -12,26 +12,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-qXGdFXx8Vr9oVStBjaeWEsQjhQUbp9MnLUfJtyhgwkA="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-Bd3ool5Ep8I5iiTMUHF48r/sf3F1dROx6Umns0pDGzE="; + hash = "sha256-lhDt8XEF90y4pj8RLUZgfZNmHkV1XlmHsYuT6sGJMRc="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-Jv2lrdvY0tthJM2fifUlCW/QBzEZAa8QDHj4o+a4KxY="; + hash = "sha256-iuYVCG4YWPFI8o4GmuNjkbXvzJsAre0gSSEWq6CUk2E="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-VooAoTyysIFH1AaidcoRs7fJpID0LbmWnLdivGZfdrM="; + hash = "sha256-wEp7kaEnkdBl44WjKuDBjR5SEjYNdgIX7DdJWKvv6I4="; }; }; in { name = "ruff"; publisher = "charliermarsh"; - version = "2026.48.0"; + version = "2026.54.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -57,7 +53,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.azd325 ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix index 7b6bb870f2a9..330c30ad87dd 100644 --- a/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix +++ b/pkgs/applications/editors/vscode/extensions/continue.continue/default.nix @@ -11,26 +11,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-/D6d0qfgl8+cTEQ5ZeMjGgo1/Uzw5BxwBdM2m0fBjNU="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-jIyFt1ZLNPS4DbQLnZJ3p30AnPJz3qNFDj/rL6EdnKw="; + hash = "sha256-4GiTNT+UPdTth9VDhHTXfqhQ5gM6vfLAaU5Cy3VMTCI="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-6At96R7jSDAjvC7Bugpg4L/aHgHFQmBOdKcOTa3Y940="; + hash = "sha256-QngCharrjiDKrY7RgWtKzIJxjXazuRvpuHVUAxknWfA="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-GB/QLRmtY/cVs4lrU8OFnWgztJSF8e07VADIra/et2s="; + hash = "sha256-QPRZG7/Pjo9uboJl/RH0cdNf+zGM+ZRxdaMULxl34Jk="; }; }; in { name = "continue"; publisher = "Continue"; - version = "1.2.22"; + version = "2.0.0"; } // sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -44,7 +40,6 @@ vscode-utils.buildVscodeMarketplaceExtension { maintainers = with lib.maintainers; [ flacks ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; 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 1198737e3486..fb92fbcdbb38 100644 --- a/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/dbaeumer.vscode-eslint/default.nix @@ -17,6 +17,5 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint"; homepage = "https://github.com/Microsoft/vscode-eslint"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 06b34fcebfa9..f7e51d43f96e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -396,8 +396,8 @@ let mktplcRef = { name = "astro-vscode"; publisher = "astro-build"; - version = "2.16.14"; - hash = "sha256-WuDsYSQ5B2xA3LnU1fiXBx8yqOplGstZO0qYaLtPF0A="; + version = "2.16.17"; + hash = "sha256-k54hpRlzjtNWv0mIUBKFxJYc5T2jpWxB9U8nuXXmjJ0="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/astro-build.astro-vscode/changelog"; @@ -481,8 +481,8 @@ let mktplcRef = { publisher = "ban"; name = "spellright"; - version = "3.0.148"; - hash = "sha256-h1xKEpKg4j7mGw3EQQDPZBDBDY/xjk2lsGk0ktd2ems="; + version = "3.0.154"; + hash = "sha256-vGzmzY78FOS8ZsrT1YpTNOUJprW4rZHVuM83cZz6V+Q="; }; meta = { description = "Visual Studio Code extension for Spellchecker"; @@ -497,8 +497,8 @@ let mktplcRef = { publisher = "banacorn"; name = "agda-mode"; - version = "0.8.0"; - hash = "sha256-2xYC+tStBXTL4koqUOcyxQUTDTipeUMTFLbrwqA6p7Q="; + version = "0.10.0"; + hash = "sha256-rz3Ehq/2AewE5ADYHVk8pHICSWO58i8v+nBwzkFkGCY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/banacorn.agda-mode/changelog"; @@ -727,8 +727,8 @@ let mktplcRef = { name = "vscode-intelephense-client"; publisher = "bmewburn"; - version = "1.16.5"; - hash = "sha256-ppWHZFQfC2bje1rNZh8Pu+BKQdAI60kpxRwUg8EfD8M="; + version = "1.18.5"; + hash = "sha256-yLp7lBWjdH+KtBUlkjLWz5OmAvEQWJFIVCVsBt9BTeE="; }; meta = { description = "PHP code intelligence for Visual Studio Code"; @@ -1007,8 +1007,8 @@ let mktplcRef = { name = "coder-remote"; publisher = "coder"; - version = "1.14.6"; - hash = "sha256-dABM44pSD0srzNl6J+1OsqugWb++soVFmtEIzliByDs="; + version = "1.15.2"; + hash = "sha256-mBACvGUQF3LoaFJ9MIewN9zu4jDTWfUgyd1MQvZQUvk="; }; meta = { description = "Extension for Visual Studio Code to open any Coder workspace in VS Code with a single click"; @@ -1096,8 +1096,8 @@ let mktplcRef = { name = "csharpier-vscode"; publisher = "csharpier"; - version = "10.0.3"; - hash = "sha256-YTDpBGLbyM6Nq5DlEtqFiSsSRRECLIEqSM4xgIIVWG0="; + version = "11.0.0"; + hash = "sha256-LVGIKCW2z2Y2k0qPmJZZO66W3E9UDBtl5EnycanMPxA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/csharpier.csharpier-vscode/changelog"; @@ -1145,8 +1145,8 @@ let mktplcRef = { name = "vscode-database-client2"; publisher = "cweijan"; - version = "8.5.1"; - hash = "sha256-adpTh4tNlWFdAGultTLZ9SfN9sMOpMaMWq8x6diGzBg="; + version = "9.0.2"; + hash = "sha256-RCjtYpGDEjFkKvTspvgopccNVvMt1imeAGHZYRsle/Q="; }; meta = { description = "Database Client For Visual Studio Code"; @@ -1174,8 +1174,8 @@ let mktplcRef = { publisher = "DanielSanMedium"; name = "dscodegpt"; - version = "3.22.1"; - hash = "sha256-ln9DcfjW0QO7V6hF+QNqy+V13hbjWwhsisrgZPrk1R4="; + version = "3.24.12"; + hash = "sha256-2vpFCxF65Y/VfyTHDO0wLAe0+m/lc0+iloEI//FdaQg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DanielSanMedium.dscodegpt/changelog"; @@ -1204,8 +1204,8 @@ let mktplcRef = { name = "dart-code"; publisher = "dart-code"; - version = "3.136.0"; - hash = "sha256-XPajPR0MX6TiUfaCw/+WYyc453cZOMaK1Uen6ND+RKY="; + version = "3.136.1"; + hash = "sha256-z9DPxEtQwjx9xk5ucHKfX2BYRij5UA253oPuHpD0jdU="; }; meta.license = lib.licenses.mit; @@ -1215,8 +1215,8 @@ let mktplcRef = { name = "flutter"; publisher = "dart-code"; - version = "3.136.0"; - hash = "sha256-RK493qHjEK/k8oy/OIzO3bvNnFo+ZftQhZMIAmBCaJk="; + version = "3.138.0"; + hash = "sha256-FkaUKApoN6e8ET2o/71GVhyNWdZ34t6fqEzlraH7QBc="; }; meta.license = lib.licenses.mit; @@ -1226,8 +1226,8 @@ let mktplcRef = { name = "databricks"; publisher = "databricks"; - version = "2.11.0"; - hash = "sha256-9izhQvZmfUVeKS0H89XXkN1bNP4+AZyUuetfD0kRJ/c="; + version = "2.12.3"; + hash = "sha256-/hFBw6STQG4zycS44em1DlaQSpKGP4w7YlH+fu/cHlA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/databricks.databricks/changelog"; @@ -1286,8 +1286,8 @@ let mktplcRef = { publisher = "denoland"; name = "vscode-deno"; - version = "3.52.0"; - hash = "sha256-0Qkruo7Eh86JRm58G7XhyceUpCJDmhoYaPjUKJQjFiU="; + version = "3.53.0"; + hash = "sha256-M+wFee1x/cCgGMFrDaV7OtIhEORHkLHf/Z06/VuZZmg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/denoland.vscode-deno/changelog"; @@ -1346,8 +1346,8 @@ let mktplcRef = { publisher = "discloud"; name = "discloud"; - version = "2.29.6"; - hash = "sha256-CHpRetKZnGzShIePnbVUdR06/1AAO2I1RX7NiZ7GBNs="; + version = "2.29.8"; + hash = "sha256-dvyIdixtmg5ZTo/REB/E5QlHJu2xZ+Ui5qwJegoHTfk="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/discloud.discloud/changelog"; @@ -1375,8 +1375,8 @@ let mktplcRef = { name = "competitive-programming-helper"; publisher = "DivyanshuAgrawal"; - version = "2026.6.1780508121"; - hash = "sha256-4kb7Nk+gctECMQM/cko+q1Bta1EKPXPEqyCQLBMkbEo="; + version = "2026.7.1784455023"; + hash = "sha256-mUiQ+35R1HXC+23qYKRJwV61poEsyhY2NkDizU+QMx8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/DivyanshuAgrawal.competitive-programming-helper/changelog"; @@ -1457,8 +1457,8 @@ let mktplcRef = { name = "protobuf-vsc"; publisher = "DrBlury"; - version = "1.6.6"; - hash = "sha256-uMyxdLptaLZBlLEugvYQgJTZCtysmnZix9faXsQfHGk="; + version = "1.6.9"; + hash = "sha256-4Mas35dRrPaXvrlpe0HdCUp/1+XDwhLeUhnq7EvKsco="; }; meta = { description = "Comprehensive Protocol Buffers support with syntax highlighting, IntelliSense, diagnostics and formatting"; @@ -1567,8 +1567,8 @@ let mktplcRef = { name = "elixir-ls"; publisher = "JakeBecker"; - version = "0.30.0"; - hash = "sha256-vHD16liYmcWeiSP16QqKhPst8e7iT9wZ1vGT5gV6xoo="; + version = "0.31.1"; + hash = "sha256-eF0OGWpiu5aDiFp8MFP7j2r2+3QCPb1q93gWg7L/Xzc="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/JakeBecker.elixir-ls/changelog"; @@ -1710,8 +1710,8 @@ let mktplcRef = { name = "dependi"; publisher = "fill-labs"; - version = "0.7.22"; - hash = "sha256-XY0fbWHGZ3Gs7wRZdtq005l2/Ucvs/EmemLjMgRma7I="; + version = "0.7.25"; + hash = "sha256-DvLksbhruNHIav2EOCxajhqJC7sYsveUnCyPVLABj0Y="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/fill-labs.dependi/changelog"; @@ -1760,8 +1760,8 @@ let mktplcRef = { name = "foam-vscode"; publisher = "foam"; - version = "0.43.1"; - hash = "sha256-rZjdBzqXpSG4aCMjRCmIrWtQdmmh7vEJQLIuH65Ewf0="; + version = "0.44.2"; + hash = "sha256-jz1j8KzD5PDZ+P5V7yLo1BEmcW+q+D2nYKzYEf7Sg2w="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/foam.foam-vscode/changelog"; @@ -1884,8 +1884,8 @@ let mktplcRef = { name = "godot-tools"; publisher = "geequlim"; - version = "2.6.1"; - hash = "sha256-x+u5t4HB+uM2CbhSw0h/zoYPgBPTZNFaMuzL+KB9mAM="; + version = "2.7.1"; + hash = "sha256-TNCMSmZdBXxAHkcFLpTDkCzaXNO4yvkCfQ8Xrb9gquo="; }; meta = { description = "VS Code extension for game development with Godot Engine and GDScript"; @@ -1929,12 +1929,29 @@ let }; }; + ginfuru.better-solarized = buildVscodeMarketplaceExtension { + meta = { + changelog = "https://marketplace.visualstudio.com/items/ginfuru.ginfuru-better-solarized-dark-theme/changelog"; + description = "A Better Solarized theme for Visual Studio Code include light and dark versions"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=ginfuru.ginfuru-better-solarized-dark-theme"; + homepage = "https://github.com/ginfuru/vscode-better-solarized"; + license = lib.licenses.mit; + maintainers = [ ]; + }; + mktplcRef = { + name = "ginfuru-better-solarized-dark-theme"; + publisher = "ginfuru"; + version = "0.10.9"; + hash = "sha256-Zh3u1iq/kSzwtOY1RmG4cwvN6nJO6ys88BXn/EH/wTs="; + }; + }; + github.codespaces = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "codespaces"; - version = "1.18.13"; - hash = "sha256-tvs35GA3bZ4jExiAe0NeHx/vQV/+2zio2Q0813/MAMU="; + version = "1.18.15"; + hash = "sha256-NcW2XVQ6F7s6k4mIesEXhCkVVRfudwFr3glqB+TjrqM="; }; meta = { @@ -1998,8 +2015,8 @@ let mktplcRef = { name = "gitlab-workflow"; publisher = "gitlab"; - version = "6.78.1"; - hash = "sha256-N6M8HLSpnfUqMaPaWZuedWbA7ITwKhLS1n+uuwudpkU="; + version = "6.85.3"; + hash = "sha256-EsQ+95Wo/5F9mEMQ7X36vBgUWlsz5BCOm+7QrGHuepc="; }; meta = { description = "GitLab extension for Visual Studio Code"; @@ -2014,8 +2031,8 @@ let mktplcRef = { name = "gleam"; publisher = "gleam"; - version = "2.12.2"; - hash = "sha256-41HgkDcgyStJtyeE0x1H9rFOZ18imcKF7XQixDOmurE="; + version = "2.13.0"; + hash = "sha256-eCiBbdKMeXcRS4kyI2rH1iAT0CmQmo2SybeW+Y7FRio="; }; meta = { description = "Support for the Gleam programming language"; @@ -2030,8 +2047,8 @@ let mktplcRef = { name = "Go"; publisher = "golang"; - version = "0.54.0"; - hash = "sha256-o1SJjR6eQcGWN9BGoN5CBTdn6RsNG2a0+p/ZDcywzr0="; + version = "0.56.0"; + hash = "sha256-n1lZ+xe6Co29gEOH3dpQl1/Kqd1SZ6oz6qqJkSByqss="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/golang.Go/changelog"; @@ -2048,6 +2065,21 @@ let gplane.wasm-language-tools = callPackage ./gplane.wasm-language-tools { }; + grafana.grafana-alloy = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "grafana-alloy"; + publisher = "grafana"; + version = "0.2.0"; + hash = "sha256-XcoiEDCPp6GzYQDhJArZBEWxSnZrSTHofIyLFegsbh0="; + }; + meta = { + changelog = "https://github.com/grafana/vscode-alloy/releases"; + description = "Grafana Alloy support for VSCode"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=grafana.grafana-alloy"; + license = lib.licenses.asl20; + }; + }; + grapecity.gc-excelviewer = buildVscodeMarketplaceExtension { mktplcRef = { name = "gc-excelviewer"; @@ -2112,17 +2144,7 @@ let }; }; - gruntfuggly.todo-tree = buildVscodeMarketplaceExtension { - mktplcRef = { - name = "todo-tree"; - publisher = "Gruntfuggly"; - version = "0.0.226"; - hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; - }; - meta = { - license = lib.licenses.mit; - }; - }; + gruntfuggly.todo-tree = callPackage ./gruntfuggly.todo-tree { }; hars.cppsnippets = buildVscodeMarketplaceExtension { mktplcRef = { @@ -2162,8 +2184,8 @@ let mktplcRef = { publisher = "haskell"; name = "haskell"; - version = "2.8.0"; - hash = "sha256-Tp4Ahfp3Ma9aJtghD+mgsCBTMOP1GI1vGE5xzvHO+d4="; + version = "2.8.1"; + hash = "sha256-mAlEy5a83BRhUhA22AKheP6PPpfbrdGT6HsTKbFwJYs="; }; meta = { license = lib.licenses.mit; @@ -2324,8 +2346,8 @@ let mktplcRef = { name = "vscode-vibrancy-continued"; publisher = "illixion"; - version = "1.1.78"; - hash = "sha256-w0i0Gmqj2atCtEYW+0XvZech37qQaTjkt8MJRdHamxs="; + version = "1.1.85"; + hash = "sha256-hHbBg7h8iab8ArbiuEx+a5zqr02hIu8DGHnvh0XwH9g="; }; meta = { downloadPage = "https://marketplace.visualstudio.com/items?itemName=illixion.vscode-vibrancy-continued"; @@ -2337,6 +2359,8 @@ let }; }; + inferrinizzard.prettier-sql-vscode = callPackage ./inferrinizzard.prettier-sql-vscode { }; + intellsmi.comment-translate = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "intellsmi"; @@ -2429,6 +2453,8 @@ let jackmacwindows.craftos-pc = callPackage ./jackmacwindows.craftos-pc { }; + jacobdufault.fuzzy-search = callPackage ./jacobdufault.fuzzy-search { }; + jakestanger.corn = callPackage ./jakestanger.corn { }; james-yu.latex-workshop = callPackage ./james-yu.latex-workshop { }; @@ -2570,8 +2596,8 @@ let mktplcRef = { publisher = "jnoortheen"; name = "nix-ide"; - version = "0.5.9"; - hash = "sha256-hPOcp6Yksgfu1+In21/gJ3MthV8JUV5WaRpYHvo5GGk="; + version = "0.5.10"; + hash = "sha256-5rNqQRFLryzeIezUiqgvSY8Vz5n48367RHQrFDxpoD8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; @@ -2648,8 +2674,8 @@ let mktplcRef = { name = "language-julia"; publisher = "julialang"; - version = "1.215.2"; - hash = "sha256-/3ULGcywO6SHvABRxaLXJQpjcrVs/vZxUGpG+NaSx3s="; + version = "1.219.2"; + hash = "sha256-LQ7UL+/FtzRxn/M85fv3oh8g622KEPS35lque3kqby8="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/julialang.language-julia/changelog"; @@ -2884,8 +2910,8 @@ let mktplcRef = { name = "vscode-ltex-plus"; publisher = "ltex-plus"; - version = "15.6.1"; - hash = "sha256-UOiYjA11P7xqPFgdR7eS63wOQl9dqWAqBxz3nklapqo="; + version = "15.7.1"; + hash = "sha256-wOwOD/rsUdwGJ24n6NkH1XY5Hf4T6LE34nFDOteubLY="; }; meta = { description = "VS Code extension for grammar/spell checking using LanguageTool with support for LaTeX, Markdown, and others"; @@ -3147,8 +3173,8 @@ let mktplcRef = { name = "vscode-dotnet-runtime"; publisher = "ms-dotnettools"; - version = "3.0.0"; - hash = "sha256-RA7skgj6yFZxk2XuJZtcDrI4dFrAbwODmwqSx4xWFUY="; + version = "3.1.0"; + hash = "sha256-jmdf/l82dEMNY+KNLcBatA82yElOlUnnnTmV1yGxP1o="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-dotnettools.vscode-dotnet-runtime/changelog"; @@ -3168,10 +3194,6 @@ let arch = "linux-x64"; hash = "sha256-pmA7BNwyHiaU93j61/MyrBV5kH0DlW+7BA6HNlKGnso="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-E2KRzjIxLFmwArzEKittjejacrCOFFNNzphWw8v5CpE="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-pnQP1OKr3NJgUuXzO1InYqGA49OuMFn2iEf8wpl4PqM="; @@ -3202,7 +3224,6 @@ let maintainers = [ lib.maintainers.magnouvean ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; @@ -3432,8 +3453,8 @@ let mktplcRef = { name = "remote-containers"; publisher = "ms-vscode-remote"; - version = "0.447.0"; - hash = "sha256-JUTwzde97CQK/0Hp3E8JPrS3UY6vh9jud1ho1R0ODus="; + version = "0.459.1"; + hash = "sha256-e5azL+9hluC/YyWb9uQxrr9p/9K2cYcUhalc9nZlOEg="; }; meta = { description = "Open any folder or repository inside a Docker container"; @@ -3491,8 +3512,8 @@ let mktplcRef = { name = "veriloghdl"; publisher = "mshr-h"; - version = "1.25.0"; - hash = "sha256-7DN0lYxwLL+Z0mIKApRHGHT7HiJZ0nfDMdojQm7XGAM="; + version = "1.29.0"; + hash = "sha256-/VIAT9nnDG52Jzh+j0E038NSjoLCXZSVRSvGWXOeuuY="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/mshr-h.VerilogHDL/changelog"; @@ -3644,8 +3665,8 @@ let mktplcRef = { name = "just-black"; publisher = "nur"; - version = "3.1.1"; - hash = "sha256-fatJZquCDsLDFGVzBol2D6LIZUbZ6GzqcVEFAwLodW0="; + version = "4.0.2"; + hash = "sha256-gfUavJXIgbNLYJNVrDeEIrpbKkgXs0YJNNb5P4480M0="; }; meta = { description = "Dark theme designed specifically for syntax highlighting"; @@ -3670,8 +3691,8 @@ let mktplcRef = { name = "ocaml-platform"; publisher = "ocamllabs"; - version = "2.0.1"; - hash = "sha256-BFRGEH5a2kTSIZG3o0GkYPeZch5b7OBUN4+pKXSQ7SY="; + version = "2.3.0"; + hash = "sha256-vb2tTtdHRmlF/TZRqUFjZNgE+5jizX/ky+NgzJYvXUg="; }; }; @@ -3711,6 +3732,8 @@ let oxc.oxc-vscode = callPackage ./oxc.oxc-vscode { }; + pflannery.vscode-versionlens = callPackage ./pflannery.vscode-versionlens { }; + ph-hawkins.arc-plus = callPackage ./ph-hawkins.arc-plus { }; phind.phind = buildVscodeMarketplaceExtension { @@ -3850,6 +3873,8 @@ let }; }; + rangav.vscode-thunder-client = callPackage ./rangav.vscode-thunder-client { }; + rebornix.ruby = buildVscodeMarketplaceExtension { mktplcRef = { name = "ruby"; @@ -3881,8 +3906,8 @@ let mktplcRef = { publisher = "redhat"; name = "java"; - version = "1.54.0"; - hash = "sha256-G1L8fSRXj4rmyGFyvPuz7zoQ367Lc5PoyVOZnHPHcu0="; + version = "1.55.0"; + hash = "sha256-ARY5w+40e5WRiVv8d9jPKPg2wFPQpJrkqD7+ncRzpgM="; }; buildInputs = [ jdk ]; meta = { @@ -3902,8 +3927,8 @@ let mktplcRef = { publisher = "redhat"; name = "vscode-yaml"; - version = "1.23.0"; - hash = "sha256-GC7AIQIUw+F5rBscTe+ulKt/97s7p636TLRvmcT9b9c="; + version = "1.24.0"; + hash = "sha256-Bmh1gxKn+mvtolnKWmhJ2QxdUZ32QV7b4kbBNeBtcWg="; }; meta = { description = "YAML Language Support by Red Hat, with built-in Kubernetes syntax support"; @@ -4113,8 +4138,8 @@ let mktplcRef = { name = "sas-lsp"; publisher = "SAS"; - version = "1.19.1"; - hash = "sha256-aVtMiSbPLs6zIdcD0TopIAVKvJksSdTy9ND+jGw/G0A="; + version = "1.20.0"; + hash = "sha256-s2CAzAXMXdmCyOoMmyHjz5GRPHi5riDf/Og3SVrW7QI="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/SAS.sas-lsp/changelog"; @@ -4142,8 +4167,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.65.0"; - hash = "sha256-Ob4F+MZI1hKi4bK8zM5kn0kjzhMklUqEB/B+hh612nU="; + version = "1.67.0"; + hash = "sha256-THrd3Yix0gohTo/cshy9ZYZysA+xCGLx4KJHFk4zmCM="; }; meta = { license = lib.licenses.asl20; @@ -4209,8 +4234,8 @@ let mktplcRef = { publisher = "shardulm94"; name = "trailing-spaces"; - version = "0.4.1"; - hash = "sha256-pLE1bfLRxjlm/kgU9nmtiPBOnP05giQnWq6bexrrIZY="; + version = "0.4.4"; + hash = "sha256-L2WM021Jyyovy8KElkIspXc0MdHC9APsbPdX5hK4CIM="; }; meta = { license = lib.licenses.mit; @@ -4534,8 +4559,8 @@ let mktplcRef = { name = "svelte-vscode"; publisher = "svelte"; - version = "110.2.0"; - hash = "sha256-5WCaYhWA6soB2AALFY/5Z7Y8IBAj5/4XSR/I4jHhth8="; + version = "110.3.0"; + hash = "sha256-vVLnjFOpOmfmkwP0Yz7zONrBgpNDFfFZ0TAAicxdZ64="; }; meta = { changelog = "https://github.com/sveltejs/language-tools/releases"; @@ -4789,12 +4814,28 @@ let }; }; + tomblind.local-lua-debugger-vscode = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "local-lua-debugger-vscode"; + publisher = "tomblind"; + version = "0.3.3"; + hash = "sha256-7uZHbhOa/GT9F7+xikaxuQXIGzre1q1uWTWaTJhi2UA="; + }; + meta = { + changelog = "https://github.com/tomblind/local-lua-debugger-vscode/blob/master/CHANGELOG.md"; + description = "Simple Lua debugger for Visual Studio Code which requires no additional dependencies"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=tomblind.local-lua-debugger-vscode"; + homepage = "https://github.com/tomblind/local-lua-debugger-vscode"; + license = lib.licenses.mit; + }; + }; + tsandall.opa = buildVscodeMarketplaceExtension { mktplcRef = { name = "opa"; publisher = "tsandall"; - version = "0.23.0"; - hash = "sha256-xya4Kxjc/uR4LFTZ5fAVOa0/cyHy8XHZkkapmODyMK4="; + version = "0.24.1"; + hash = "sha256-wNlZM9/2K32W4vYPKzLiBCTqhV+SqgZzXGRxKoHoIaM="; }; meta = { changelog = "https://github.com/open-policy-agent/vscode-opa/blob/master/CHANGELOG.md"; @@ -4811,8 +4852,8 @@ let mktplcRef = { name = "emacs-mcx"; publisher = "tuttieee"; - version = "0.110.9"; - hash = "sha256-xHu8GvBoZKMag7BdHddXyjm2IReMujs9cggOn4h32t8="; + version = "0.111.0"; + hash = "sha256-3z4B1NBQD3hbGcwWpS48bXuUAN1jVlSRLF0PDKGJH3A="; }; meta = { changelog = "https://github.com/whitphx/vscode-emacs-mcx/blob/main/CHANGELOG.md"; @@ -5080,8 +5121,8 @@ let mktplcRef = { name = "vscode-gradle"; publisher = "vscjava"; - version = "3.17.3"; - hash = "sha256-heFcGOe10r7y23xyFc/nFKk/nsrX4wc5fT9e4GKGhW0="; + version = "3.18.0"; + hash = "sha256-ybMejIJER9HHVh1z+tazgvQ0UIa8eKoJBb7JOLU1Kpw="; }; meta = { @@ -5134,8 +5175,8 @@ let mktplcRef = { name = "vscode-java-pack"; publisher = "vscjava"; - version = "0.31.0"; - hash = "sha256-E0GJoITZIh2XemVpyPh3gAEtlvM2PZHgNzZDctSpwIA="; + version = "0.31.1"; + hash = "sha256-SfrsL27uQyrtsNyqZe0q5Fv5sHMwRvBZ+iS6/JIpFVo="; }; meta = { description = "Popular extensions for Java development that provides Java IntelliSense, debugging, testing, Maven/Gradle support, project management and more"; @@ -5200,8 +5241,8 @@ let mktplcRef = { name = "volar"; publisher = "Vue"; - version = "3.3.3"; - hash = "sha256-Q2PnfjO7wzHrmWAeD4dOFT+GFe8qGG8wHU1FpwYeDnA="; + version = "3.3.7"; + hash = "sha256-qXbJCRzHc7QS4QLCGso5orfSiRYp6V2wz/4tvyU3rfg="; }; meta = { changelog = "https://github.com/vuejs/language-tools/blob/master/CHANGELOG.md"; @@ -5244,8 +5285,8 @@ let mktplcRef = { name = "csharp-ls"; publisher = "vytautassurvila"; - version = "0.0.32"; - hash = "sha256-dc7aIUb+5fdmqVeHrysy8jjk0Sx6ThIsO9KagdQpx+M="; + version = "0.0.33"; + hash = "sha256-VsNjdPmnstXgmgxzbC7+IGFggfLtYlQFsH3tGWjdUhM="; }; meta = { changelog = "https://github.com/vytautassurvila/vscode-csharp-ls/blob/master/CHANGELOG.md"; @@ -5260,8 +5301,8 @@ let mktplcRef = { name = "gitblame"; publisher = "waderyan"; - version = "13.0.1"; - sha256 = "sha256-N0UgWdwGj3NW4x0Ea+jKL5Jvp0YE+HfK5tkUjmynPuY="; + version = "13.1.0"; + sha256 = "sha256-32ohvlIV7ogX+hGgcrCyHrv2hKWSpi+YuRMv0SGDYYA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/waderyan.gitblame/changelog"; @@ -5460,8 +5501,8 @@ let mktplcRef = { name = "markdown-editor"; publisher = "zaaack"; - version = "0.1.13"; - hash = "sha256-Si8/piNNktcyRY8o8o9my9sP9NEwrNuySVjlyadDjtU="; + version = "0.1.19"; + hash = "sha256-W0lL0JMNyEszyJa6I7RbXYLu4cU9DQUh0ZEAOd6eshI="; }; meta = { description = "Visual Studio Code extension for WYSIWYG markdown editing"; @@ -5536,8 +5577,8 @@ let mktplcRef = { name = "vscode-zig"; publisher = "ziglang"; - version = "0.6.18"; - hash = "sha256-jn/2Nmz6N84BCWnRdnM8w5AdiF2hh55h39SDTmRry5I="; + version = "0.6.19"; + hash = "sha256-kdoks0da6+uofzvN5lulkDAVihSS7xoF/Q6Fo5yzQbg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ziglang.vscode-zig/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix index f21f58fc6b29..5ebaa79fb71b 100644 --- a/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/detachhead.basedpyright/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "basedpyright"; publisher = "detachhead"; - version = "1.39.6"; - hash = "sha256-shxV0g1XDu7qjrGiwyHGpY2qBCJt23tz7SuDbm5AXws="; + version = "1.39.9"; + hash = "sha256-Iycuj7EXzRwVgvpk0KXa3dNw2rL21DnG4ohqIExS6Go="; }; meta = { changelog = "https://github.com/detachhead/basedpyright/releases"; diff --git a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix index 70523c30c6d4..2abc84aba7d9 100644 --- a/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix +++ b/pkgs/applications/editors/vscode/extensions/docker.docker/default.nix @@ -10,10 +10,6 @@ let hash = "sha256-jfjd2V7IJ4GQlz/pXmrY/LlBjQ2qtlsQV4ZRD8RiWTg="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-aOFoTLVaaMFsdGoWV0OC31/nmOHXUhr2Y8K4SWcNil8="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-ugluaghNNZ/VrQORVIhc0Fuv3rHo++LO3Uwg2ujmsQc="; arch = "linux-arm64"; 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 89d018488b56..64bb5e1086ce 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,12 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "harper"; publisher = "elijah-potter"; version = harper.version; - hash = "sha256-nK97C9ZYSI6dh4w1ntDP0mbmv6ez3pyAfv/4D30I2sA="; + + # Because the binary is removed in favor of the harper package, + # it does not matter which binary is fetched. Using only a single + # hash makes this easier to maintain. + arch = "linux-x64"; + hash = "sha256-/brjx/yY4JLLboI6dLwF/eyX7yhRyMlohhGNFGIrm54="; }; nativeBuildInputs = [ @@ -23,8 +28,11 @@ vscode-utils.buildVscodeMarketplaceExtension { postInstall = '' cd "$out/$installPrefix" - jq '.contributes.configuration.properties."harper.path".default = "${harper}/bin/harper-ls"' package.json | sponge package.json + jq '.contributes.configuration.properties."harper.path".default = "${lib.getExe harper}"' package.json | sponge package.json + + rm ./bin/harper-ls ''; + passthru.updateScript = vscode-extension-update-script { }; meta = { @@ -34,5 +42,10 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/automattic/harper"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ MasterEvarior ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; }; } 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 a95633c3f014..b3fa749a8638 100644 --- a/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/esbenp.prettier-vscode/default.nix @@ -17,6 +17,5 @@ vscode-utils.buildVscodeMarketplaceExtension { downloadPage = "https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode"; homepage = "https://github.com/prettier/prettier-vscode"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.datafoo ]; }; } diff --git a/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix b/pkgs/applications/editors/vscode/extensions/fstarlang.fstar-vscode-assistant/default.nix index 55f7767f06b4..2c7b9fef6eb7 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.25.0"; - hash = "sha256-sya3P9Kn3DM/z5p8xF6TLEUPgrCs5+jgD89Y1KSJAgY="; + version = "0.25.4"; + hash = "sha256-9gPM/T3Kbwt40V2ZuzN/OkQVNATsp4AYK9HuOu/Ui+0="; }; meta = { description = "Interactive editing mode VS Code extension for F*"; diff --git a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix index 042f86577079..f6c355e0ed3e 100644 --- a/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix +++ b/pkgs/applications/editors/vscode/extensions/github.copilot-chat/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "github"; name = "copilot-chat"; - version = "0.45.1"; - hash = "sha256-xxJ+h0/XyT8otXUzIYW9/KMxKLk5zoEE/fiqj4SZK+A="; + version = "0.48.1"; + hash = "sha256-eFLfYMFxvgtZtmwLsxfneMjD4jOg8/Uk0Eu/6+A6odY="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix index 543b8ef5fa53..44e21076b955 100644 --- a/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/gplane.wasm-language-tools/default.nix @@ -14,8 +14,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "gplane"; name = "wasm-language-tools"; - version = "1.20.0"; - hash = "sha256-AXLwEp6uospVZwd2NxLEfABsNQOt1uRJTQ4HMTXbrJc="; + version = "1.21.0"; + hash = "sha256-r1gnq12O/tNx175/nmrQD3b7HVipVT0pEoLvg2HrWwI="; }; buildPhase = '' diff --git a/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix new file mode 100644 index 000000000000..5a169aee2a20 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/gruntfuggly.todo-tree/default.nix @@ -0,0 +1,47 @@ +{ + jq, + lib, + moreutils, + ripgrep, + vscode-utils, + vscode-extension-update-script, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "todo-tree"; + publisher = "Gruntfuggly"; + version = "0.0.226"; + hash = "sha256-Fj9cw+VJ2jkTGUclB1TLvURhzQsaryFQs/+f2RZOLHs="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + jq + moreutils + ]; + + buildInputs = [ ripgrep ]; + + postInstall = '' + cd "$out/$installPrefix" + jq '(.contributes.configuration[] | select(.title == "%todo-tree.configuration.regex%") | .properties."todo-tree.ripgrep.ripgrep".default) = $s' \ + --arg s "${lib.getExe ripgrep}" \ + package.json | sponge package.json + ''; + + passthru.updateScript = vscode-extension-update-script { }; + + meta = { + changelog = "https://marketplace.visualstudio.com/items/Gruntfuggly.todo-tree/changelog"; + description = "Show TODO, FIXME, etc. comment tags in a tree view"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=Gruntfuggly.todo-tree"; + homepage = "https://github.com/Gruntfuggly/todo-tree"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + sandarukasa + ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix index 5e9772aefe0d..d1d0f74562f3 100644 --- a/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix +++ b/pkgs/applications/editors/vscode/extensions/hashicorp.terraform/default.nix @@ -11,8 +11,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.39.2"; - hash = "sha256-Lb20IdQcroJ/9Jn+epcIDvciFb/GDmklR9pDzrC5JbQ="; + version = "2.39.3"; + hash = "sha256-oU3kAhIsuadjyBvi+gJ6h19A3KueQYCZWLIN0ZUhoOE="; }; postInstall = '' diff --git a/pkgs/applications/editors/vscode/extensions/inferrinizzard.prettier-sql-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/inferrinizzard.prettier-sql-vscode/default.nix new file mode 100644 index 000000000000..c87dde51734a --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/inferrinizzard.prettier-sql-vscode/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "prettier-sql-vscode"; + publisher = "inferrinizzard"; + version = "1.6.0"; + hash = "sha256-l6pf/+uv8Bn4uDMX0CbzSjydTStr73uRY550Ad9wm7Q="; + }; + + meta = { + description = "VSCode Extension to format SQL files"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=inferrinizzard.prettier-sql-vscode"; + homepage = "https://github.com/sql-formatter-org/sql-formatter"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ AlexAntonik ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/jacobdufault.fuzzy-search/default.nix b/pkgs/applications/editors/vscode/extensions/jacobdufault.fuzzy-search/default.nix new file mode 100644 index 000000000000..ca91a9ea3754 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/jacobdufault.fuzzy-search/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "fuzzy-search"; + publisher = "jacobdufault"; + version = "0.0.3"; + hash = "sha256-oN1SzXypjpKOTUzPbLCTC+H3I/40LMVdjbW3T5gib0M="; + }; + + meta = { + description = "Provides a fuzzy search using the quick pick window of the current text document."; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=jacobdufault.fuzzy-search"; + homepage = "https://github.com/jacobdufault/vscode-fuzzy-search"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ AlexAntonik ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix index 31fc7cf075b7..2fa4097929c3 100644 --- a/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix +++ b/pkgs/applications/editors/vscode/extensions/kilocode.kilo-code/default.nix @@ -12,26 +12,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-YeF6LyQzVAXgZ5Iqr6YvNcACfiUukUsq7cybeCQdSYc="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-SjirNvI83eh3Gt5rGsaiLT6TJMH6LRQAasOFNy9OMCY="; + hash = "sha256-uPmJyEq7X6uJzE1M5Xywax1mrnTcg6jOb9MlpKZ0WRk="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-FjE3xTp5Mj1584bepVc4nZr3rxCR3CV+jplmA45VF44="; + hash = "sha256-b46f0f99rjBivewC9jUbAFiKK+DS1XKv+AynUlKHliw="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-SAf3+0QSFUDq09AZQnw78ps55RM/RwoAeQuVly7vn10="; + hash = "sha256-yBJjt53eOazV9FB8qimerwXTX4vCIPC+lyXtau/3FyI="; }; }; in { publisher = "kilocode"; name = "Kilo-Code"; - version = "7.2.20"; + version = "7.3.53"; } // sources.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); @@ -52,7 +48,6 @@ vscode-utils.buildVscodeMarketplaceExtension { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix index dc8ca7283294..67df81e6ddf4 100644 --- a/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/mongodb.mongodb-vscode/default.nix @@ -4,8 +4,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "mongodb-vscode"; publisher = "mongodb"; - version = "1.16.0"; - hash = "sha256-cnKYDrExL3yDJkEofWPglzMa50KDMgKQxsM5zK1RaBs="; + version = "1.16.1"; + hash = "sha256-UIxXrJpH/Ix4Ev6veumcT/9h1SgZgEXHjnwkOH9ch44="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix index 2542e6c955c8..60a20f2ae3cc 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-bicep/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-bicep"; - version = "0.42.1"; - hash = "sha256-rlLR/95DcxwkLxvyJgt3ptBvelL5VCIQvDl72eqk63s="; + version = "0.43.8"; + hash = "sha256-OweBVc8s+CEaCW4IZu43HaXOAL/PBjnunCEoPsq0pI0="; }; buildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix index b74a72a52c9e..24e1da8ff882 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-azuretools.vscode-containers/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-azuretools"; name = "vscode-containers"; - version = "2.4.2"; - hash = "sha256-qkQAv53y+PVKJdReffjHwoJbvj20o4DF/c6omLIWB80="; + version = "2.4.5"; + hash = "sha256-Js+403StdF3WmlHOiB78UKM77njReuKOiQ9NHnFljs8="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix index af7fd5daef40..96eeea294b2d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csdevkit/default.nix @@ -22,10 +22,6 @@ let arch = "linux-arm64"; hash = "sha256-1zz9xrMALIOXzMpArWSwO12WmRE+0ldbIwUFH1G2GQI="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-3PoSbp8M2X4bhSQyxvNC7jtNDVNEuEKeYRZQMFOmbtQ="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-F4CsyiX46SpjilJNV+qYps1JAw09pVruLmW+muN9/B4="; @@ -138,7 +134,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix index 00df6cd1e9a1..abd222def11d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-dotnettools.csharp/default.nix @@ -18,19 +18,15 @@ let { x86_64-linux = { arch = "linux-x64"; - hash = "sha256-DtvdlODo0tbFxHTXR0MBOCM2wxWYqUCYbJRU1um+Pck="; + hash = "sha256-FTS8cK9ovmxGLnywOGTIP7oUOHZ4RLE5t7lfhltdmIc="; }; aarch64-linux = { arch = "linux-arm64"; - hash = "sha256-WduoZivxgoePof1H/DGEdnqXN7sLvQMq9I0z9NzwDnI="; - }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-a5njdsMEvqVcbfzaB5APzoGCHhl0Fcmo4tylckcv80U="; + hash = "sha256-EV3745OXbwrRmc8P5e13DZbomyJGcYQUF07WflRWU1Q="; }; aarch64-darwin = { arch = "darwin-arm64"; - hash = "sha256-6tFj6Am2SyhF/rHBhQIR7eL866Jq6Vqfl3IKWYu85zY="; + hash = "sha256-KCIkjBmYZPiuFmQ3/aDycARYIHPyDTmMkoGcuG5DQX8="; }; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}") @@ -52,7 +48,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "csharp"; publisher = "ms-dotnettools"; - version = "2.131.79"; + version = "2.140.8"; inherit (extInfo) hash arch; }; @@ -159,7 +155,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix index 827152ef6b6c..178cba1207f7 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-pyright.pyright/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-pyright"; name = "pyright"; - version = "1.1.408"; - hash = "sha256-IxfqzPBKqslpKaEP2eD+DS0BdSUDfo2w4u1FK0Uzvwo="; + version = "1.1.411"; + hash = "sha256-cK7zP8RiG2BOadIgeRxwAYmtZK4HQV1Hp1ECGD/bJUk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix index 9887ca490d02..e5f996c1c976 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.debugpy/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "debugpy"; publisher = "ms-python"; - version = "2025.18.0"; - hash = "sha256-UegvlhgIjbwv9SgZIdtzX8FDOL9qjBLOFm0jaTexNrQ="; + version = "2026.6.0"; + hash = "sha256-zgfBcgIKc78f9qpcl9ULoQTUQ1ETAxfwpH/SSOhyaZc="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix index 1cc22b7a7a3e..d6d00003428d 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.pylint/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ms-python"; name = "pylint"; - version = "2026.4.0"; - hash = "sha256-yWp7poC1PCoou+1XADmW0ftzyQDtJbqb3YyMf24Jprc="; + version = "2026.6.0"; + hash = "sha256-lJl+nQyLjnkuMfewYXcrU+Nne7R2foUPn50TtE9OqDA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/ms-python.pylint/changelog"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix index a934f7a21db6..4c95c0174df3 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-python.python/default.nix @@ -18,10 +18,6 @@ let hash = "sha256-HQfmDV6rJX6l1pGybe8//2QrTSwE+rlEJOi4/iW69lY="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-tAZyt2fwB/GOhffY5lhHJTmbXG8UloynPtjoMtWRHok="; - arch = "darwin-x64"; - }; aarch64-linux = { hash = "sha256-v7fatW/LMJ8CeSRrE/5b7dLqOrhNhwzUySUxtAMuBUE="; arch = "linux-arm64"; diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix index ebfa123e5996..902cda5b3941 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.cpptools/default.nix @@ -42,15 +42,15 @@ let isDarwin = stdenv.hostPlatform.isDarwin; supported = { x86_64-linux = { - hash = "sha256-5L4PrwcZ/Q3g6qlCsCebx3czLZVD2sDrDf99l9nooSo="; + hash = "sha256-KTGDbX/T1BhoYxEjqPmPTAkyNjGDEV1Ao4nMIhHpGys="; arch = "linux-x64"; }; aarch64-linux = { - hash = "sha256-nQNDPfk6BRHp7veyx18GMlEt3Xa8iDuqtHG7qzJcPS4="; + hash = "sha256-4gl6sVgWAkV2XJFOipVbBUDGG1ncm41TjSoFnRW78m0="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-jhoa9UcYg2Uj8x9AZwAh68k7WCi6mpgNUUx2YsRIkjw="; + hash = "sha256-EMkq7Y0Eo629GzW6pDL1UYijyvLU6sp7YxPaKm0va6s="; arch = "darwin-arm64"; }; }; @@ -63,16 +63,16 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "cpptools"; publisher = "ms-vscode"; - version = "1.31.5"; + version = "1.32.2"; }; nativeBuildInputs = [ autoPatchelfHook + jq makeWrapper ]; buildInputs = [ - jq libkrb5 zlib (lib.getLib stdenv.cc.cc) diff --git a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix index a92f471d2f06..4399094441b1 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-vscode.vscode-speech/default.nix @@ -16,10 +16,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-dZwOBehoYEqaYskvcPB55IKnG1CMToioyUJXlndqorA="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-b6LobvVngC0TFuWTC9JBQrECkoX7ewLNCpCROkXHk20="; - }; "aarch64-linux" = { arch = "linux-arm64"; hash = "sha256-/EaOfoubfq1ufwB7TTQ2hqmh1ZJiZ1+B6QeYu3MoFPI="; @@ -68,7 +64,6 @@ vscode-utils.buildVscodeMarketplaceExtension { license = lib.licenses.unfree; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix index 6e9d6f6d72eb..f9bf09ec61d2 100644 --- a/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ms-windows-ai-studio.windows-ai-studio/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "windows-ai-studio"; publisher = "ms-windows-ai-studio"; - version = "1.0.1"; - hash = "sha256-85bFomfGcFiXJuTUv46B47PEtzFP6H7rggCZzf5/fK8="; + version = "1.6.2"; + hash = "sha256-irI7rcyCUc3jUhrEa449pDix3MhwMh18ezvri3bi0Gk="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix index e2dff1363b83..d1c2cd86f006 100644 --- a/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix +++ b/pkgs/applications/editors/vscode/extensions/myriad-dreamin.tinymist/default.nix @@ -11,7 +11,7 @@ vscode-utils.buildVscodeMarketplaceExtension { name = "tinymist"; publisher = "myriad-dreamin"; inherit (tinymist) version; - hash = "sha256-13/qw2BZ/WG+TYNVncJ/PuFLaUhlAn63zaa27JcLITE="; + hash = "sha256-FLWUeRPoqzHjwBrf0OOejaAVY+KBOpNBb9OJMdfLr04="; }; __structuredAttrs = true; diff --git a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix index 85066de0f914..0493204a18bd 100644 --- a/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix +++ b/pkgs/applications/editors/vscode/extensions/ndonfris.fish-lsp/default.nix @@ -7,8 +7,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "ndonfris"; name = "fish-lsp"; - version = "0.1.20"; - hash = "sha256-aDqAbzWaMJ1k/2Pu3j+WRaIGMrS6J2bImbSfBmelDKM="; + version = "0.1.22"; + hash = "sha256-rbxjPThdqVSbE6aZ8pcN2awMNypPaN0KQ/BzgO2Aqog="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix index d2e8dcbddf83..9b60246c80f4 100644 --- a/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/oxc.oxc-vscode/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { publisher = "oxc"; name = "oxc-vscode"; - version = "1.57.0"; - hash = "sha256-kz4YqPcDjBX7hT3O7odPQgYmGMO34VGw16d6mpzXq7c="; + version = "1.58.0"; + hash = "sha256-30dFeguNbY8WM3fLym6aUMkHYH5wA5scSNn04Ukbj9U="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/editors/vscode/extensions/pflannery.vscode-versionlens/default.nix b/pkgs/applications/editors/vscode/extensions/pflannery.vscode-versionlens/default.nix new file mode 100644 index 000000000000..e39cded3c0eb --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/pflannery.vscode-versionlens/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-versionlens"; + publisher = "pflannery"; + version = "1.28.0"; + hash = "sha256-IZjTHE51hdrQpDndsz5bBCKre0zmWkCAJa/v8k4iLy0="; + }; + + meta = { + description = "Shows the latest version for each package using code lens"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=pflannery.vscode-versionlens"; + homepage = "https://gitlab.com/versionlens/vscode-versionlens"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ AlexAntonik ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix index 00982423a806..6babbd0c2a77 100644 --- a/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix +++ b/pkgs/applications/editors/vscode/extensions/pkief.material-icon-theme/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "5.33.1"; - hash = "sha256-GWHWEdi2kPkxS0RGAxFcy+njFCl1iiEBu41V/5sHqvc="; + version = "5.37.0"; + hash = "sha256-remt7+OQnOqSrtUoUN3QCXXR3Bti/lWIMfb7i4j3w84="; }; meta = { description = "Material Design Icons for Visual Studio Code"; diff --git a/pkgs/applications/editors/vscode/extensions/rangav.vscode-thunder-client/default.nix b/pkgs/applications/editors/vscode/extensions/rangav.vscode-thunder-client/default.nix new file mode 100644 index 000000000000..53033e8dee08 --- /dev/null +++ b/pkgs/applications/editors/vscode/extensions/rangav.vscode-thunder-client/default.nix @@ -0,0 +1,21 @@ +{ + lib, + vscode-utils, +}: + +vscode-utils.buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-thunder-client"; + publisher = "rangav"; + version = "2.41.0"; + hash = "sha256-c5oEaRMeTEWT0dtd6bzWMumhTEchOsLDXp+D76orL+k="; + }; + + meta = { + description = "Lightweight Rest API Client for VS Code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=rangav.vscode-thunder-client"; + homepage = "https://github.com/thunderclient/thunder-client-support"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ AlexAntonik ]; + }; +} diff --git a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix index 4e311914bc7a..1df127e0fd59 100644 --- a/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix +++ b/pkgs/applications/editors/vscode/extensions/redhat.vscode-xml/default.nix @@ -13,10 +13,6 @@ vscode-utils.buildVscodeMarketplaceExtension { arch = "linux-x64"; hash = "sha256-cP/oFn19CZ/G3kjdHNZGqXvoDE1qUtg6xrg/2MO14Lo="; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-wtk8SasxXEQ3pCJpVTWR8wcY/bNaIZmImbAtrFWYWOo="; - }; "aarch64-darwin" = { arch = "darwin-arm64"; hash = "sha256-XYdwVoDqK+88ZYUm6APyamFNx6XlYjy0R4CIhSMuRmU="; @@ -42,7 +38,6 @@ vscode-utils.buildVscodeMarketplaceExtension { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } 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 ce082884d3d2..64137bc9fd95 100644 --- a/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix +++ b/pkgs/applications/editors/vscode/extensions/rooveterinaryinc.roo-cline/default.nix @@ -16,20 +16,20 @@ let vsix = stdenvNoCC.mkDerivation (finalAttrs: { name = "roo-code-${finalAttrs.version}.vsix"; pname = "roo-code-vsix"; - version = "3.52.0"; + version = "3.54.0"; src = fetchFromGitHub { owner = "RooCodeInc"; repo = "Roo-Code"; tag = "v${finalAttrs.version}"; - hash = "sha256-DvuL1WByEJER+v73pCvwNdRNfM8j+c1VQGGjAyV79p8="; + hash = "sha256-pVJcFAI/xxNflzf+wj0fOASP8Fx9oybu9V6dGrDx7do="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-t2sPuhn8xdk6hGfmViPGG+5TAhtBBOMYNoOb6DlPzws="; + hash = "sha256-VD4DDLpZdnsfZNkg2oD0DT+zoxsk4CUh2pFll8n3mu4="; }; nativeBuildInputs = [ 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 c4b9eee45455..2baf64ec3aa9 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.89.2"; - hash = "sha256-lDt/xn1PFs0UDg0rOOun8Bl/FTXSjvQ//ETkoHFypAM="; + version = "4.0.8"; + hash = "sha256-qSlz2wXQwpO1Wi9P40hVm+ACZ+VfCiV9LF3lnOkMoXA="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix index 93a8d164f8c5..305f1123a1b8 100644 --- a/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sourcery.sourcery/default.nix @@ -6,13 +6,27 @@ zlib, }: -vscode-utils.buildVscodeMarketplaceExtension { +let + inherit (stdenv.hostPlatform) system; +in +vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { + passthru.platformTable = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-Oz4Buraof4yXIxGeKXIsDkvEQQ0Gzf/b5mdses1nHlo="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-vMDB5zmdBNt3R5AkeuCYhxzW/rSGwM+wtU5K4v3ZU/U="; + }; + }; + mktplcRef = { name = "sourcery"; publisher = "sourcery"; - version = "1.37.0"; - hash = "sha256-ovCxcr1m3GmRu45hr5DG781xkQdANbQYLvV2gFhG4eQ="; - }; + version = "1.43.0"; + } + // finalAttrs.passthru.platformTable.${system} or (throw "Unsupported platform ${system}"); nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ]; @@ -28,9 +42,6 @@ vscode-utils.buildVscodeMarketplaceExtension { homepage = "https://github.com/sourcery-ai/sourcery-vscode"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ tomasajt ]; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; + platforms = lib.attrNames finalAttrs.passthru.platformTable; }; -} +}) diff --git a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix index 54e6a13d1b7c..c02660aadfee 100644 --- a/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix +++ b/pkgs/applications/editors/vscode/extensions/sumneko.lua/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "lua"; publisher = "sumneko"; - version = "3.18.1"; - hash = "sha256-TmQFl2+4hiu1qlGA6D+3kynC4m4kVJMoMn3b+TLZaz8="; + version = "3.18.2"; + hash = "sha256-8mvauayksFk/3A7VMJ3EZYyRK8YLgX03W7bzEIdGkXQ="; }; # Running chmod in runtime will lock up extension 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 a9d4c460e5c9..f1a77d0952be 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.14"; - hash = "sha256-b4e5Qgk8YfI1nAB8yrM5k0svgebgZSucXRktkK0EItk="; + version = "0.2.17"; + hash = "sha256-8qYDp6IcUvlFdCPmMozHVocsgGqK8b2+tve1wBO3bhU="; }; meta = { diff --git a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix index 6d5b83c7e2d6..f7aafb38d63a 100644 --- a/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tekumara.typos-vscode/default.nix @@ -20,10 +20,6 @@ let arch = "linux-arm64"; hash = "sha256-Z3cRojI4mCCS2t3aLojgImULQOobq5liDwoeHuzKEhY="; }; - x86_64-darwin = { - arch = "darwin-x64"; - hash = "sha256-Th0cseTJk+CD3BO/99t0VMD7zcF6nxAfmHFhfN8j5sw="; - }; aarch64-darwin = { arch = "darwin-arm64"; hash = "sha256-rHgMl71YCs9ea0nFnx+E2U8isL4zQzIvvE9tgxM7IiA="; @@ -66,7 +62,6 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix index db9db86a0813..b7289bf725e2 100644 --- a/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix +++ b/pkgs/applications/editors/vscode/extensions/timonwong.shellcheck/default.nix @@ -10,8 +10,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.39.3"; - sha256 = "sha256-A87dG+bBNCMZ8ERDGpVJIP7lXL8rfRely2Uo/ZMsgVI="; + version = "0.39.5"; + sha256 = "sha256-8f9LGmNE8ilPYZmbJpmmAx9DkKJXbQzAia11rM3wTec="; }; nativeBuildInputs = [ jq diff --git a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix index 795b167a667a..c29133655ef5 100644 --- a/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix +++ b/pkgs/applications/editors/vscode/extensions/tombi-toml.tombi/default.nix @@ -7,19 +7,15 @@ let supported = { x86_64-linux = { - hash = "sha256-7uZZuEijg1Aca1h2NrBwFU9iFnfhG17waXxqVlAKzTA="; + hash = "sha256-DWrKvjWpUYvyqgZCShqwBKw33MHW31cxb4ERV65O+uc="; arch = "linux-x64"; }; - x86_64-darwin = { - hash = "sha256-NPh3Sxf2k/Nj4vt0SGsa5H6QOI1IBaL20g79Pl4/iPg="; - arch = "darwin-x64"; - }; aarch64-linux = { - hash = "sha256-tszcouaPUGTH1MpGJfU0RiLvBN7qIhH1vC3XiAmHFK8="; + hash = "sha256-iFHeZiTubXA/t2Gib9hP42d7yjq/WRyywp+l8VhGfmo="; arch = "linux-arm64"; }; aarch64-darwin = { - hash = "sha256-JV9pZqq48q00GM0cg3Wu00qrrkn2fczbHBVqnCM84lI="; + hash = "sha256-qe7K3PQIgZztIdOVx37LGXrzBmYui2o2CcmDK+5jaFM="; arch = "darwin-arm64"; }; }; @@ -34,7 +30,7 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = base // { name = "tombi"; publisher = "tombi-toml"; - version = "1.1.2"; + version = "1.1.7"; }; meta = { description = "TOML Language Server"; diff --git a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix index b17bc1d76708..7523d64c9ea6 100644 --- a/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix +++ b/pkgs/applications/editors/vscode/extensions/vadimcn.vscode-lldb/default.nix @@ -16,7 +16,7 @@ assert lib.versionAtLeast python3.version "3.5"; let publisher = "vadimcn"; pname = "vscode-lldb"; - version = "1.12.1"; + version = "1.12.2"; vscodeExtUniqueId = "${publisher}.${pname}"; vscodeExtPublisher = publisher; @@ -26,7 +26,7 @@ let owner = "vadimcn"; repo = "codelldb"; rev = "v${version}"; - hash = "sha256-B8iCy4NXG7IzJVncbYm5VoAMfhMfxGF+HW7M5sVn5b0="; + hash = "sha256-7//+y02rfDloeNADpoM8tist7fPstBZ2Eqt4dM5dCaE="; }; lldb = llvmPackages_19.lldb; @@ -180,8 +180,8 @@ stdenv.mkDerivation { meta = { description = "Native debugger extension for VSCode based on LLDB"; homepage = "https://github.com/vadimcn/vscode-lldb"; - license = [ lib.licenses.mit ]; - maintainers = [ lib.maintainers.r4v3n6101 ]; + license = lib.licenses.mit; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix index 00aaa8b46c06..f07054e2fd07 100644 --- a/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix +++ b/pkgs/applications/editors/vscode/extensions/visualjj.visualjj/default.nix @@ -13,26 +13,22 @@ vscode-utils.buildVscodeMarketplaceExtension { sources = { "x86_64-linux" = { arch = "linux-x64"; - hash = "sha256-VZKvoTJ/IKxYsEJl0XhtglsggmrYdaRUlXCpDv/9fQ0="; - }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-jo+fET/IyOl2zI/xxYy3KwnyOegTOXFhO1hDg5QtWrQ="; + hash = "sha256-htZGjy7ZnQLGZUncokGaGHyLpvPM5jzWUvCdnfN1vbM="; }; "aarch64-linux" = { arch = "linux-arm64"; - hash = "sha256-HOSKZjozJlWn++P5bSwWdK3I+fgsPtS8kyvDWHMJQAY="; + hash = "sha256-rgeNJbl6G2yKAWYW7NarQwVLmd3oZ4YTOVeCUat6ZqQ="; }; "aarch64-darwin" = { arch = "darwin-arm64"; - hash = "sha256-ABBYsSR3HQgSnnXUJXsg1DwqwFj9W6CT59/1fuqWsTc="; + hash = "sha256-YBapB9XZ1/fUOflFDxZGT9rnPTumHQR/PfmyISHAAkY="; }; }; in { name = "visualjj"; publisher = "visualjj"; - version = "0.29.0"; + version = "0.30.0"; } // sources.${stdenvNoCC.hostPlatform.system} or (throw "Unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -48,14 +44,14 @@ vscode-utils.buildVscodeMarketplaceExtension { meta = { description = "Jujutsu version control integration, for simpler Git workflow"; - downloadPage = "https://www.visualjj.com"; homepage = "https://www.visualjj.com"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=visualjj.visualjj"; + changelog = "https://marketplace.visualstudio.com/items/visualjj.visualjj/changelog"; license = lib.licenses.unfree; platforms = [ "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ sandarukasa ]; }; diff --git a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix index 6bfcf8380051..67cc36a9e06b 100644 --- a/pkgs/applications/editors/vscode/extensions/vscode-utils.nix +++ b/pkgs/applications/editors/vscode/extensions/vscode-utils.nix @@ -73,6 +73,9 @@ let # This cannot be removed, it is used by some extensions. installPrefix = "share/vscode/extensions/${vscodeExtUniqueId}"; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ unpackVsixSetupHook ] ++ nativeBuildInputs; installPhase = diff --git a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix index a309d6d7ddc9..8933fcac2d30 100644 --- a/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yoshi47.selection-path-copier/default.nix @@ -8,8 +8,8 @@ vscode-utils.buildVscodeMarketplaceExtension (finalAttrs: { mktplcRef = { publisher = "yoshi47"; name = "selection-path-copier"; - version = "1.5.0"; - hash = "sha256-ip8dsU8B2vghINPSftvfC5OtM0bjIP0V3JAMt5skmdg="; + version = "1.6.0"; + hash = "sha256-KnV9WariqK3GMjoQARtamxriBkL0Pi9y7+fhfwObCWE="; }; meta = { description = "Copy file paths with line numbers, code snippets, and GitHub permalinks in multiple formats"; diff --git a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix index 8fd8e3c5f538..c01f05fc1f05 100644 --- a/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix +++ b/pkgs/applications/editors/vscode/extensions/yy0931.vscode-sqlite3-editor/default.nix @@ -6,8 +6,8 @@ vscode-utils.buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-sqlite3-editor"; publisher = "yy0931"; - version = "1.0.212"; - hash = "sha256-mG75eEK7agZ8R4LNN5xM7GqaBQC5JKhUR0/ZogZTHpY="; + version = "1.0.214"; + hash = "sha256-lxH+j83R2ZYCWrEB0c70DRSCMn5iH1Xz/vXLZBE42Eg="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/yy0931.vscode-sqlite3-editor/changelog"; diff --git a/pkgs/applications/editors/vscode/generic.nix b/pkgs/applications/editors/vscode/generic.nix index 93329c9c52de..78c0cb0b3d73 100644 --- a/pkgs/applications/editors/vscode/generic.nix +++ b/pkgs/applications/editors/vscode/generic.nix @@ -38,6 +38,10 @@ webkitgtk_4_1, ripgrep, which, + libxtst, + libjpeg8, + pipewire, + libei, # needed to fix "Save as Root" asar, @@ -149,6 +153,7 @@ stdenv.mkDerivation ( extraBwrapArgs = [ "--bind-try /etc/nixos/ /etc/nixos/" "--ro-bind-try /etc/xdg/ /etc/xdg/" + "--ro-bind-try /etc/vscode/policy.json /etc/vscode/policy.json" ]; # symlink shared assets, including icons and desktop entries @@ -176,7 +181,6 @@ stdenv.mkDerivation ( buildFHSEnv customizedArgs; in { - inherit pname version @@ -194,8 +198,16 @@ stdenv.mkDerivation ( updateScript vscodeVersion ; - fhs = fhs { }; - fhsWithPackages = f: fhs { additionalPkgs = f; }; + fhs = (fhs { }).overrideAttrs (old: { + strictDeps = true; + __structuredAttrs = true; + }); + fhsWithPackages = + f: + (fhs { additionalPkgs = f; }).overrideAttrs (old: { + strictDeps = true; + __structuredAttrs = true; + }); } // lib.optionalAttrs (vscodeServer != null) { inherit rev vscodeServer; @@ -244,6 +256,9 @@ stdenv.mkDerivation ( }) ]; + strictDeps = true; + __structuredAttrs = true; + buildInputs = [ libsecret ] @@ -256,6 +271,10 @@ stdenv.mkDerivation ( systemdLibs webkitgtk_4_1 libxkbfile + libxtst + libjpeg8.out + pipewire + libei ]; runtimeDependencies = lib.optionals stdenv.hostPlatform.isLinux [ @@ -296,11 +315,6 @@ stdenv.mkDerivation ( dontConfigure = true; noDumpEnvVars = true; - stripExclude = lib.optional hasVsceSign [ - # vsce-sign is a single executable application built with Node.js, and it becomes non-functional if stripped - "lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign" - ]; - installPhase = '' runHook preInstall '' @@ -376,7 +390,7 @@ stdenv.mkDerivation ( ) } --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" - --add-flags ${lib.escapeShellArg commandLineArgs} + --append-flags ${lib.escapeShellArg commandLineArgs} ) ''; @@ -412,7 +426,11 @@ stdenv.mkDerivation ( let nodeModulesPath = if stdenv.hostPlatform.isDarwin then - if lib.versionAtLeast vscodeVersion "1.94.0" then + # 1.129 moved node_modules back into app.asar, shipping native + # binaries in the asar.unpacked directory like before 1.94 + if lib.versionAtLeast vscodeVersion "1.129.0" then + "Contents/Resources/app/node_modules.asar.unpacked" + else if lib.versionAtLeast vscodeVersion "1.94.0" then "Contents/Resources/app/node_modules" else "Contents/Resources/app/node_modules.asar.unpacked" @@ -422,11 +440,11 @@ stdenv.mkDerivation ( # see https://www.npmjs.com/package/@vscode/ripgrep-universal?activeTab=code ripgrepSystem = { - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-arm"; aarch64-linux = "linux-arm64"; i686-linux = "linux-ia32"; + loongarch64-linux = "linux-loong64"; powerpc64-linux = "linux-ppc64"; riscv64-linux = "linux-riscv64"; s390x-linux = "linux-s390x"; @@ -462,10 +480,13 @@ stdenv.mkDerivation ( --add-needed ${libglvnd}/lib/libEGL.so.1 \ $out/lib/${libraryName}/${executableName} '' + # restore original vsce-sign, which has integrity checks + (lib.optionalString hasVsceSign '' + cp -r ./resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign "$out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign" patchelf \ - --add-needed ${lib.getLib openssl}/lib/libssl.so \ + --add-needed ${lib.getLib openssl}/lib/libssl.so.3 \ $out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign + chmod +x $out/lib/vscode/resources/app/node_modules/@vscode/vsce-sign/bin/vsce-sign '') ); diff --git a/pkgs/applications/editors/vscode/update-vscodium.sh b/pkgs/applications/editors/vscode/update-vscodium.sh index 6420ff0ee1f2..49a92b9fb35a 100755 --- a/pkgs/applications/editors/vscode/update-vscodium.sh +++ b/pkgs/applications/editors/vscode/update-vscodium.sh @@ -19,10 +19,8 @@ fi for i in \ "x86_64-linux linux-x64 tar.gz" \ "aarch64-linux linux-arm64 tar.gz" \ - "armv7l-linux linux-armhf tar.gz" \ "loongarch64-linux linux-loong64 tar.gz" \ - "aarch64-darwin darwin-arm64 zip" \ - "x86_64-darwin darwin-x64 zip"; do + "aarch64-darwin darwin-arm64 zip"; do set -- $i hash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri $(nix-prefetch-url "https://github.com/VSCodium/vscodium/releases/download/$latestVersion/VSCodium-$2-$latestVersion.$3")) update-source-version vscodium $latestVersion $hash --system=$1 --ignore-same-version diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index 46879543ae20..d81cbab69d97 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -24,7 +24,6 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; armv7l-linux = "linux-armhf"; @@ -35,17 +34,16 @@ let hash = { - x86_64-linux = "sha256-L975R3F779LgaFTL4B6ZtImPd1LyXhImnDgCPmO5PI8="; - x86_64-darwin = "sha256-Sygw/VkIiyV+iABylgFpTiHs0f5dS6NYPWSm5BNh9tQ="; - aarch64-linux = "sha256-jcFC668WKAjlYju33RI6poAKnhm3fL1hO16alUwjwv4="; - aarch64-darwin = "sha256-AY6WeDzGEH5zXRosN1H/osxC3e5j0Hs9s2Ys2xe1UxI="; - armv7l-linux = "sha256-LqofnnZid/I0lVTyhC7yHD+Fxz4dSBxKJ8n+lp2uucQ="; + x86_64-linux = "sha256-cieB7O7HQ2oJVFT4OfmaToXHh6pFPpBk7dltKZ8CSVM="; + aarch64-linux = "sha256-G5F497a4aL79ijDC3P1mP58w1aA+LmxpSljnU30zbOI="; + aarch64-darwin = "sha256-zBuCRa+EqMafAZahkJP1IajO1ceIIbOfDn5Qwl0Hw90="; + armv7l-linux = "sha256-O39xDcl34Qiafmi7OQn0AYBvqC4Yn7IyOLR/vsI2uHs="; } .${system} or throwSystem; # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.123.0"; + version = "1.129.1"; # The update server (update.code.visualstudio.com) expects the version path # segment in X.Y.Z form, so we normalize X.Y to X.Y.0 (e.g. "1.110" → "1.110.0"). @@ -53,7 +51,7 @@ let downloadVersion = lib.versions.pad 3 version; # This is used for VS Code - Remote SSH test - rev = "6a44c352bd24569c417e530095901b649960f9f8"; + rev = "8a7abeba6e03ea3af87bfbce9a1b7e48fed567b8"; in buildVscode { pname = "vscode" + lib.optionalString isInsiders "-insiders"; @@ -86,7 +84,7 @@ buildVscode { src = fetchurl { name = "vscode-server-${rev}.tar.gz"; url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable"; - hash = "sha256-i034bIsaPlxlVFNY5cKf/ftWPy17SFokbFUMa+zeLng="; + hash = "sha256-LVd4zd90R8sM96tWe9gJacO2KFMQkruoZEO8kI3tzzg="; }; stdenv = stdenvNoCC; }; @@ -128,7 +126,6 @@ buildVscode { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index af9fa5cc4eba..5a5ee6d5d342 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,10 +15,8 @@ let plat = { x86_64-linux = "linux-x64"; - x86_64-darwin = "darwin-x64"; aarch64-linux = "linux-arm64"; aarch64-darwin = "darwin-arm64"; - armv7l-linux = "linux-armhf"; loongarch64-linux = "linux-loong64"; } .${system} or throwSystem; @@ -27,12 +25,10 @@ let hash = { - x86_64-linux = "sha256-LJsGc11MH6zlcJNfSWjTWPn2Jp9dkjeBPQuCXH1woUM="; - x86_64-darwin = "sha256-bC7AfH2eKmmsWIOHifNGKD/kVQCYyuMfU3SUil0DXkM="; - aarch64-linux = "sha256-mT5dvw8GOZ0GnZaKRS/TAzQDEEYDOgcj6w6lNLy5kQ0="; - aarch64-darwin = "sha256-c8K17XKpRG1ji2mUfoyg2+cRF+qc1KVMYVkaQoUIz7Y="; - armv7l-linux = "sha256-91ZHhEUDVoDiRBLwMHVLhzKmb9gWcPBUsVRZVLhCA4M="; - loongarch64-linux = "sha256-7iUdsIyJkIi40Xn+/PWdCVgahQxbZtiMw0QLMisN+sg="; + x86_64-linux = "sha256-rfNUjfBV0Y5HbN7oh0iLp0hrh5rZmjGlRsa1xf8pbCQ="; + aarch64-linux = "sha256-c9h9RtTcII/hLASX3GB6qwpuK/My9UoLaCajoaoyvDQ="; + aarch64-darwin = "sha256-8h7lJinrXjnAVdrqcBGLemBVxjmuzz2tBeGZeprYOsA="; + loongarch64-linux = "sha256-p8hwOg5BbVvJGeQoBrgtd4gHsYmwEhsF/I+bk8gzIo4="; } .${system} or throwSystem; @@ -43,8 +39,8 @@ buildVscode rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.121.03429"; - vscodeVersion = "1.121.0"; + version = "1.126.04524"; + vscodeVersion = "1.126.0"; pname = "vscodium"; executableName = "codium"; @@ -88,10 +84,8 @@ buildVscode rec { mainProgram = "codium"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" - "armv7l-linux" "loongarch64-linux" ]; # requires libc.so.6 and other glibc specifics diff --git a/pkgs/applications/editors/vscode/with-extensions.nix b/pkgs/applications/editors/vscode/with-extensions.nix index c942f64b43e2..e64f0beea2df 100644 --- a/pkgs/applications/editors/vscode/with-extensions.nix +++ b/pkgs/applications/editors/vscode/with-extensions.nix @@ -92,12 +92,14 @@ runCommand "${wrappedPkgName}-with-extensions-${wrappedPkgVersion}" mkdir -p $out/bin/ mkdir -p "$out/Applications/${longName}.app/Contents/MacOS" + binary_name="$(awk -F'[<>]' '/CFBundleExecutable/{getline; print $3}' '${vscode}/Applications/${longName}.app/Contents/Info.plist')" + for path in PkgInfo Frameworks Resources _CodeSignature Info.plist; do ln -s "${vscode}/Applications/${longName}.app/Contents/$path" "$out/Applications/${longName}.app/Contents/" done makeWrapper "${vscode}/bin/${executableName}" "$out/bin/${executableName}" ${extensionsFlag} - makeWrapper "${vscode}/Applications/${longName}.app/Contents/MacOS/Electron" "$out/Applications/${longName}.app/Contents/MacOS/Electron" ${extensionsFlag} + makeWrapper "${vscode}/Applications/${longName}.app/Contents/MacOS/$binary_name" "$out/Applications/${longName}.app/Contents/MacOS/$binary_name" ${extensionsFlag} '' else '' diff --git a/pkgs/applications/emulators/libretro/cores/atari800.nix b/pkgs/applications/emulators/libretro/cores/atari800.nix index c0ff28fe23af..9068c73de8c0 100644 --- a/pkgs/applications/emulators/libretro/cores/atari800.nix +++ b/pkgs/applications/emulators/libretro/cores/atari800.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "atari800"; - version = "0-unstable-2026-05-28"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-atari800"; - rev = "b6638e72b9d7770144837b0b63c637dd7ab2b39c"; - hash = "sha256-G1RJXhgMq8txotriK0Xy8HdDDCzeDbEQ+3LQ5sUt8G0="; + rev = "9d3bcf283502512052e21c6f1453fbdf7aa3122b"; + hash = "sha256-uLMQWi+Z21irwkFBArlHNXILintSWF7PfGy5bgKmAhQ="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix b/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix index b90d833ab114..1e8018a58817 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-ngp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-ngp"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-ngp-libretro"; - rev = "0c81ce8991a47aac5d0a7d1ae53de75bc7ddf847"; - hash = "sha256-+HGzNSkM0bs8DoBCZ3FqxoqjBSwnKvK7K38341vUYco="; + rev = "a50d5ac288a81f2104ddf43195a4efdd15c72227"; + hash = "sha256-Zh+8JLkTcrLxjueQvaIhdOxHpl6Uf5ZRQ/cMNPHLVhk="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix index bdc76f293079..8a89ec55c87b 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-pce-fast.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-pce-fast"; - version = "0-unstable-2026-05-22"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-pce-fast-libretro"; - rev = "b4de121a733a57ce825a7fd7543206ca96af8a18"; - hash = "sha256-0V6w9F2T2ROkPvH6K5mKltblogn9mAtvb/JGrWMk4CQ="; + rev = "0bc6c86928343ca4202c5b6ef33fa4387c47fc12"; + hash = "sha256-TgUueogxf5KZ1S5pt0WiYtoHXWQI81C6QUts1xJClh8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix index eb613fa069dc..e4474bfe8d6b 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-psx.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-psx.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "mednafen-psx" + lib.optionalString withHw "-hw"; - version = "0-unstable-2026-06-02"; + version = "0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-psx-libretro"; - rev = "ee042b73f8fe2aa9c8c73408b5bf200a3ce1a67b"; - hash = "sha256-k1DvQHGQH/d6W7jTIAW9jIk0qVHUji3PeYAa8MuUP9w="; + rev = "c27ab27c05569575e04b25e03e87fe3220fde599"; + hash = "sha256-dXYnTkDEzAve7bBclOahKHFB2ef2u7vbNeGWLIfkLGc="; }; extraBuildInputs = lib.optionals withHw [ diff --git a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix index dc0edc71f8f3..3772f959ad2a 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-saturn.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-saturn"; - version = "0-unstable-2026-05-28"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-saturn-libretro"; - rev = "8f0d69a4938edd84ef5b308b6013ed4b17b5b7dd"; - hash = "sha256-hDiUcmkAyFbuMdK3LCshC2vMMU4TbJQAyqzkye/Sb5U="; + rev = "6f0cb9d1b9689601cd7dbf08e992d232304f50f7"; + hash = "sha256-Q50CQDLO090csrF73fo2qxzIaV7o3E8YS9MdQZBp/V8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix index 619d07ba98b3..2368ed316d72 100644 --- a/pkgs/applications/emulators/libretro/cores/beetle-vb.nix +++ b/pkgs/applications/emulators/libretro/cores/beetle-vb.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mednafen-vb"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-14"; src = fetchFromGitHub { owner = "libretro"; repo = "beetle-vb-libretro"; - rev = "1275bd7bddf2166be5a10e45c26c5c2a61370658"; - hash = "sha256-3JTcAITogWP9yQ4sLZl8YlUHzu9LvWor9liQRIwf2b8="; + rev = "38e7a0ec9ac7079ca1c1e3dd9aaf5b56f527efca"; + hash = "sha256-+57qsfH2wygKdD66yauzKD9XDf01q4LeiWdIeYbVUmc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/bluemsx.nix b/pkgs/applications/emulators/libretro/cores/bluemsx.nix index 4d28a074a0b2..aa880fa348a9 100644 --- a/pkgs/applications/emulators/libretro/cores/bluemsx.nix +++ b/pkgs/applications/emulators/libretro/cores/bluemsx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bluemsx"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "libretro"; repo = "bluemsx-libretro"; - rev = "b76f27959a32e18aa04c619273152178fd0cf03b"; - hash = "sha256-0FUfeA8IY3VyzhbZqiWYJ7Ttp4CT7kernhgwji6wALQ="; + rev = "2f31e9ca38785ad4c2bd9e1d91829eda14a92954"; + hash = "sha256-J1LbOsUR+9HX/LRtkG9XQIiRdhfyHUYvqXYBKWdGxBI="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/bsnes.nix b/pkgs/applications/emulators/libretro/cores/bsnes.nix index 049d841d0541..59cf62693d39 100644 --- a/pkgs/applications/emulators/libretro/cores/bsnes.nix +++ b/pkgs/applications/emulators/libretro/cores/bsnes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "bsnes"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "libretro"; repo = "bsnes-libretro"; - rev = "d62d219ac22f1ed179738d107d8a4da2c4289845"; - hash = "sha256-XYCzXAFkSFNMlRjzH4zR3lpRguOqvAJM4TBcL9Feog8="; + rev = "9c1285dda7dd6bb9a9951d37bcee8794ada640e6"; + hash = "sha256-hu4Odi+6A8OrpsNbWZI5JrBkFI1brsqp08fyOySFyr8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/dolphin.nix b/pkgs/applications/emulators/libretro/cores/dolphin.nix index 9ff08b1ff89f..3b96117dcb04 100644 --- a/pkgs/applications/emulators/libretro/cores/dolphin.nix +++ b/pkgs/applications/emulators/libretro/cores/dolphin.nix @@ -20,13 +20,13 @@ }: mkLibretroCore { core = "dolphin"; - version = "0-unstable-2026-04-08"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "libretro"; repo = "dolphin"; - rev = "0cd3bb89c29535db9b7552fc86871867ccf5b471"; - hash = "sha256-cSiJO/EvspNvHopo/RLfuz8ONpbXk2NrrSDhkiAm7/s="; + rev = "0b766a68cc835775b3216500bb9af2f5d4602b12"; + hash = "sha256-JaUiDc4/vEWjEXe6H9+i6pft2DTsl5my5wyFmtbjdR0="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix index 3ba3297685f4..fe101fa4f1f3 100644 --- a/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix +++ b/pkgs/applications/emulators/libretro/cores/dosbox-pure.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "dosbox-pure"; - version = "0-unstable-2026-06-06"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "schellingb"; repo = "dosbox-pure"; - rev = "b2825c2f0a705f93d3c4d1b4369c8728d76f2e07"; - hash = "sha256-S470+U7rP7EXapPSwliUh8MwIKvKm+mgc7BuQkN572k="; + rev = "a4a0bab7f8931433588f2fcad9045c85b277373d"; + hash = "sha256-sniDrr5kSU/OnoE08WXNmTTstfI6cHyq4I7xjtrM+7c="; }; hardeningDisable = [ "format" ]; diff --git a/pkgs/applications/emulators/libretro/cores/fbneo.nix b/pkgs/applications/emulators/libretro/cores/fbneo.nix index 0002e31fe4af..1034b6054b68 100644 --- a/pkgs/applications/emulators/libretro/cores/fbneo.nix +++ b/pkgs/applications/emulators/libretro/cores/fbneo.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fbneo"; - version = "0-unstable-2026-06-04"; + version = "0-unstable-2026-07-19"; src = fetchFromGitHub { owner = "libretro"; repo = "fbneo"; - rev = "298f913aeb781908c7f6a568a2ede3940a98738d"; - hash = "sha256-UP0jNsqXMzrO+EQY8Gbkl2lIizfsAKoKiGaXGp7Nok8="; + rev = "63796c5d2d40010b5a495c748b74f5f8cd7d8b4d"; + hash = "sha256-Mv7NSw28O41iPEfaE5d7tAZPgUA7XmRFUODfatgTEiI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/fceumm.nix b/pkgs/applications/emulators/libretro/cores/fceumm.nix index 3abd97a160f1..1ba899595e21 100644 --- a/pkgs/applications/emulators/libretro/cores/fceumm.nix +++ b/pkgs/applications/emulators/libretro/cores/fceumm.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "fceumm"; - version = "0-unstable-2026-05-06"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-fceumm"; - rev = "3a84a6fd0ba20dd4877c06b1d58741172148395f"; - hash = "sha256-4+kEoN0+SWl284n7tIR76aysf0GlLdxELDXfpEK6mi8="; + rev = "0d610d9a6401697157f693a5407adf450a0e52fb"; + hash = "sha256-4QroyuhQrH5FhK86nuUztvrIwG4Ibj2zltPhhdLuJm0="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/flycast.nix b/pkgs/applications/emulators/libretro/cores/flycast.nix index f38a67291e33..d7c4f0b6a0c4 100644 --- a/pkgs/applications/emulators/libretro/cores/flycast.nix +++ b/pkgs/applications/emulators/libretro/cores/flycast.nix @@ -8,13 +8,13 @@ }: mkLibretroCore { core = "flycast"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "flyinghead"; repo = "flycast"; - rev = "751295151eed3cae619b14bcee49bb07f4fdb59c"; - hash = "sha256-PwmJspKYWS7WUAK7XRr2FYiAMnc03xp8qH23EZUC6Hs="; + rev = "f09d1f22ef8d199b8b7a2395d0b46774e08a58c2"; + hash = "sha256-labl5MPpBNkg/M95WzJgiKVdvHJDN6jeFSLsHg5+G78="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/gambatte.nix b/pkgs/applications/emulators/libretro/cores/gambatte.nix index d72170bb68f0..2229f2efc0fe 100644 --- a/pkgs/applications/emulators/libretro/cores/gambatte.nix +++ b/pkgs/applications/emulators/libretro/cores/gambatte.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gambatte"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "libretro"; repo = "gambatte-libretro"; - rev = "6716e6ee39c2abd3ea325f66fb26e7f866f4c5dc"; - hash = "sha256-sn8UWO1YR3qLpsR0dwpyy42L+QWrYpwO2lL4NqgUmWM="; + rev = "9b3b5e3cc18ec92f460d37dd551eaf90c55bfcea"; + hash = "sha256-IBQmVcWx839rRV8uLUou4fdwxgZqVbMWyqRVa3Dq0rc="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix index 04d25dced59e..e02fd2ef0eab 100644 --- a/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/genesis-plus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "genesis-plus-gx"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "libretro"; repo = "Genesis-Plus-GX"; - rev = "f2b40ca6c97b2ff7f70d3c00d7ace84200bb31eb"; - hash = "sha256-mvPRDQpRFClcQS26ARf7Mp2eEhf8AbvDG9DdTGHOrlI="; + rev = "fa4dca561e08d5be9077419f7b255e1da213ed21"; + hash = "sha256-FfO5LzCH0hYqiVpE2qPJhX4gOrXqqYCoW4XRbz93La4="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/gpsp.nix b/pkgs/applications/emulators/libretro/cores/gpsp.nix index 927fde20bfbd..e75ac6d7b6a6 100644 --- a/pkgs/applications/emulators/libretro/cores/gpsp.nix +++ b/pkgs/applications/emulators/libretro/cores/gpsp.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "gpsp"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "libretro"; repo = "gpsp"; - rev = "d6decfa351b575e2936afebba26d41ec20e4ddcd"; - hash = "sha256-kqqNyBEaWlj9E4tZz7VK2186Y6DRDtcFBMIH7GpUDx4="; + rev = "69e86ebe89f14c3f5f75b809c12c0a953b3d6ce4"; + hash = "sha256-ppdwcE66igBarGAiupKB8pkRY8y5x/EPobiqJz93plA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/hatari.nix b/pkgs/applications/emulators/libretro/cores/hatari.nix index 88480119bb42..1214fe8b1ece 100644 --- a/pkgs/applications/emulators/libretro/cores/hatari.nix +++ b/pkgs/applications/emulators/libretro/cores/hatari.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "hatari"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-10"; src = fetchFromGitHub { owner = "libretro"; repo = "hatari"; - rev = "6aa7c7079b3186025ebc6bad4b4251aa359a3947"; - hash = "sha256-17L2EpLGwkWA/9XTgtIq+PNABGvgdBQDsAfAZFRKLOE="; + rev = "c605d3aa342f2ad8f915f94bf03bae018e1be7b7"; + hash = "sha256-UJyfIt5+anXaqqMmL9JNTBvXu5bmyMYloYc8fWxx2m0="; }; extraNativeBuildInputs = [ which ]; diff --git a/pkgs/applications/emulators/libretro/cores/mame.nix b/pkgs/applications/emulators/libretro/cores/mame.nix index 7d30ae2ed015..e54c1d6e6f5b 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-2026-05-31"; + version = "0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "libretro"; repo = "mame"; - rev = "2ffec28bcf65eceb395722c9d721e7d4523fbb56"; - hash = "sha256-37SD78rFYgIoI7FDsgHhupYse8QbzwVRrJCXSVjpLCc="; + rev = "e2f8a31819e9e510dd06ab11f0d387ca7789776e"; + hash = "sha256-LzN5rbo8kev8aogIMTQMLXseZBzx2XtDGGEUtABW92M="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/mame2000.nix b/pkgs/applications/emulators/libretro/cores/mame2000.nix index 28fe0821ebb6..f8a651a68410 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2000.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2000.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "mame2000"; - version = "0-unstable-2026-05-22"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2000-libretro"; - rev = "fd0e767bd6378b35b505a04ada2b32bd98ffe8fb"; - hash = "sha256-gS+fwsJ0/Bel2y2ajI+cSsrKlV5kWlCyOgr/JkJns1o="; + rev = "131ae96d72a613451517fa2eca0b598b2b266a94"; + hash = "sha256-fbOGMebiqckcwPk81YrdSHwti6qrLSxB3qYSY8SEqRs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2003.nix b/pkgs/applications/emulators/libretro/cores/mame2003.nix index b9b93ff31f69..101450b99d38 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2003.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2003.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "mame2003"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-06-15"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2003-libretro"; - rev = "299789ce642b34c2679cfd89d7ecf06b09851bc1"; - hash = "sha256-FX+onEaaQUdcjAvgsrdW0m408oCSXJEJHQncrN2Uk/Y="; + rev = "8f17f5f4cb432c5d2d2771e5a76f8c4eac2d31a6"; + hash = "sha256-yXII81KiO+53/S2p9H5/81fyCf1qKauQTVjlfNOwu3s="; }; # Fix build with GCC 14 diff --git a/pkgs/applications/emulators/libretro/cores/mame2010.nix b/pkgs/applications/emulators/libretro/cores/mame2010.nix index 658d4e361fc2..99dc2348e644 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2010.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2010.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "mame2010"; - version = "0-unstable-2026-06-08"; + version = "0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "libretro"; repo = "mame2010-libretro"; - rev = "64d2bee2e03d5eb1db77bcb4595099553a1b9a97"; - hash = "sha256-XU2g7bxt2y8gqIMACUXGDbZCWNrg9BWcqBudK699Uhw="; + rev = "484456818393505dd4367e6e4c116c573c04a1ec"; + hash = "sha256-CstMUeTxOsL419R2kzSK6hDd1okxsbtwMvqjwzSf3bI="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/mame2015.nix b/pkgs/applications/emulators/libretro/cores/mame2015.nix index 6165afd0b93d..a537e03e5633 100644 --- a/pkgs/applications/emulators/libretro/cores/mame2015.nix +++ b/pkgs/applications/emulators/libretro/cores/mame2015.nix @@ -22,7 +22,8 @@ mkLibretroCore { extraBuildInputs = [ alsa-lib ]; makefile = "Makefile"; # Build failures when this is set to a bigger number - NIX_BUILD_CORES = 8; + env.NIX_BUILD_CORES = 8; + meta = { description = "Port of MAME ~2015 to libretro, compatible with MAME 0.160 sets"; homepage = "https://github.com/libretro/mame2015-libretro"; diff --git a/pkgs/applications/emulators/libretro/cores/melonds.nix b/pkgs/applications/emulators/libretro/cores/melonds.nix index b6846e4d1e89..099248a22c0d 100644 --- a/pkgs/applications/emulators/libretro/cores/melonds.nix +++ b/pkgs/applications/emulators/libretro/cores/melonds.nix @@ -7,13 +7,13 @@ }: mkLibretroCore { core = "melonds"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "libretro"; repo = "melonds"; - rev = "634e51477364edc39aaccd3bebf8bcab5776148c"; - hash = "sha256-/u6CQKpb9eIls0TYpSpWoIf+IQ0CTIx48oq8LscfhFw="; + rev = "c9550d18923fe86a5ad9faa159399b55c12b47f1"; + hash = "sha256-xvBdt/TMxZOrC//DLHRWRMqIibt7dNsfLM/FeMTRA60="; }; extraBuildInputs = [ diff --git a/pkgs/applications/emulators/libretro/cores/melondsds.nix b/pkgs/applications/emulators/libretro/cores/melondsds.nix index ea5e45cbcfc7..67a04500c12d 100644 --- a/pkgs/applications/emulators/libretro/cores/melondsds.nix +++ b/pkgs/applications/emulators/libretro/cores/melondsds.nix @@ -1,17 +1,27 @@ { lib, + applyPatches, + coreutils, fetchFromGitHub, - glm, - libslirp, fmt_11, - span-lite, + glm, + gnugrep, + gnused, howard-hinnant-date, + jq, libGL, libGLU, - cmake, + libslirp, mkLibretroCore, + nix, + nix-prefetch-git, + cmake, + span-lite, + unstableGitUpdater, + writeShellApplication, }: let + # NOTE: before changing the following fetches, see the updateScript below # https://github.com/JesseTG/melonds-ds/blob/33c48260402865ef77667487528efd5ca7ce1233/cmake/FetchDependencies.cmake#L44 melonDS-src = fetchFromGitHub { owner = "JesseTG"; @@ -28,8 +38,8 @@ let embed-binaries-src = fetchFromGitHub { owner = "andoalon"; repo = "embed-binaries"; - rev = "21f28cabbba02cd657578c70b7aedd0f141467ff"; - hash = "sha256-iW3DBGdp/ykE3EoGcuirq5V5lKV0vemzIjDFrINzQPM="; + rev = "078b62beba97e8192c99bfb16d5e17220cfc7598"; + hash = "sha256-EkK+ZCbrZ2Y9wJ864OIwRWDfHcmxzKMco0QAkLOQOwY="; }; pntr-src = fetchFromGitHub { owner = "robloach"; @@ -44,35 +54,33 @@ let hash = "sha256-J5wAqF5yQ5KYArJJyKzaqscWsXq+KAPKXybYfVgasXs="; }; # using nixpkgs zlib gives a linking error - zlib-src = fetchFromGitHub { - owner = "madler"; - repo = "zlib"; - rev = "570720b0c24f9686c33f35a1b3165c1f568b96be"; - hash = "sha256-5g/Jo8M/jvkgV0NofSAV4JdwJSk5Lyv9iGRb2Kz/CC0="; + zlib-src = applyPatches { + src = fetchFromGitHub { + owner = "madler"; + repo = "zlib"; + rev = "925af44f3cde53c6b076611c297850091b5dc7bb"; + hash = "sha256-TkPLWSN5QcPlL9D0kc/yhH0/puE9bFND24aj5NVDKYs="; + }; + patches = [ ./patches/melondsds-zlib-no-zconf-rename.patch ]; }; in mkLibretroCore rec { core = "melondsds"; - version = "1.2.0"; + version = "0-unstable-2026-03-03"; src = fetchFromGitHub { owner = "JesseTG"; repo = "melonds-ds"; - rev = "33c48260402865ef77667487528efd5ca7ce1233"; - hash = "sha256-n5MZ6BWUWRi+jz34EbL+SeSkjFZeqQNXE3hS6JzS424="; + rev = "bac0256dc6a8736c5a228f57c562257e45fd49f3"; + hash = "sha256-EeXYibPV9BPazC/i5UqXEd4BKlIZbNbPNgpsoo4ws7k="; }; - patches = [ ./patches/melondsds-noslirpcopy.patch ]; postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail "find_package(Git REQUIRED)" "" substituteInPlace src/libretro/CMakeLists.txt \ --replace-fail "include(embed-binaries)" "include(${embed-binaries-src}/cmake/embed-binaries.cmake)" - - substituteInPlace cmake/FetchDependencies.cmake \ - --replace-fail "set_target_properties(example" "set_target_properties(zlib_example" \ - --replace-fail "set_target_properties(zlib_example64 minigzip64" "set_target_properties(zlib_example64" ''; makefile = ""; @@ -100,6 +108,79 @@ mkLibretroCore rec { postBuild = "cd src/libretro"; + passthru.updateScript = [ + (lib.getExe (writeShellApplication { + name = "update-libretro-melondsds"; + runtimeInputs = [ + coreutils + gnugrep + gnused + jq + nix + nix-prefetch-git + ]; + text = '' + ${lib.escapeShellArgs (unstableGitUpdater { + hardcodeZeroVersion = true; + })} + + src=$(nix-build --no-out-link -A "$UPDATE_NIX_ATTR_PATH.src") + core_file="pkgs/applications/emulators/libretro/cores/melondsds.nix" + + # find lines in the format: + # fetch_dependency(name url rev) + # and extracts name, url and rev + grep "^fetch_dependency" "''${src}/cmake/FetchDependencies.cmake" | + sed 's/"//g' | + sed 's/fetch_dependency(\(.*\))/\1/' | + while read -r name url rev + do + echo >&2 + + # example: if there is fetch_dependency(melonDS ...) and no melonDS-src + if ! fetch_block=$(grep -A10 "''${name}-src =" "$core_file") + then + + # if the dependency comes from nix, we just skip it + if grep -q "FETCHCONTENT_SOURCE_DIR_''${name^^}" "$core_file" + then + echo "> skipped: ''${name} is provided by nixpkgs" >&2 + continue + fi + + # otherwise, its a new dependency not specified on the config, and the updater can't continue + echo "> ERROR: dependency missing: ''${name}" >&2 + exit 1 + fi + + echo "> ''${name}: ''${url} (''${rev})" >&2 + + prefetch=$(nix-prefetch-git --url "''${url}" --rev "''${rev}" --quiet) + rev=$(echo "$prefetch" | jq -r ".rev") + hash=$(echo "$prefetch" | jq -r ".hash") + + old_rev=$(echo "$fetch_block" | grep -m1 "rev =" | sed 's/\s*rev = "\(.*\)".*/\1/') + old_hash=$(echo "$fetch_block" | grep -m1 "hash =" | sed 's/\s*hash = "\(.*\)".*/\1/') + + if [[ "$old_hash" == "$hash" ]] + then + echo "> skipped: same hash" >&2 + continue + fi + + echo "rev - old: $old_rev" >&2 + echo "rev - new: $rev" >&2 + echo "hash - old: $old_hash" >&2 + echo "hash - new: $hash" >&2 + + # finally replace old revision and old hash by the new one + sed -i "s|$old_hash|$hash|" "$core_file" + sed -i "s/$old_rev/$rev/" "$core_file" + done + ''; + })) + ]; + meta = { description = "A remake of the libretro MelonDS core"; homepage = "https://github.com/JesseTG/melonds-ds"; diff --git a/pkgs/applications/emulators/libretro/cores/np2kai.nix b/pkgs/applications/emulators/libretro/cores/np2kai.nix index c8ce21d781ed..b5a7edf8d4d5 100644 --- a/pkgs/applications/emulators/libretro/cores/np2kai.nix +++ b/pkgs/applications/emulators/libretro/cores/np2kai.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "np2kai"; - version = "0-unstable-2026-05-09"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "AZO234"; repo = "NP2kai"; - rev = "eebb95c060f82df45a5615be676c3fa4b7bb7ae0"; - hash = "sha256-KBvxqxCeYyIKCTHdcczwpgHBIZds6xMfHt6LblRRoFc="; + rev = "e2dc9046aa5c786fcfbfb87e883457e421026e31"; + hash = "sha256-35LWLk4U1B1NjXN94QN5nsMMXCmo+VKOVWhzFdZ79oc="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/opera.nix b/pkgs/applications/emulators/libretro/cores/opera.nix index 35dd849c0993..e1d168a73376 100644 --- a/pkgs/applications/emulators/libretro/cores/opera.nix +++ b/pkgs/applications/emulators/libretro/cores/opera.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "opera"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-07-23"; src = fetchFromGitHub { owner = "libretro"; repo = "opera-libretro"; - rev = "5e36d4a9fbb2afbb8de2313b8e2bf83998ec2341"; - hash = "sha256-TmSk0PIXOLToElUnyRkDFfpq3bvBh7+P8r8brYICJSY="; + rev = "74dd2a8c6319678ffce9f31bdf36279db5681762"; + hash = "sha256-NHXOfKItLkQJ0/jH1gLBpLFqOKBB8qgH5gMw7j1YoLw="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch b/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch deleted file mode 100644 index fb589848d0cd..000000000000 --- a/pkgs/applications/emulators/libretro/cores/patches/melondsds-noslirpcopy.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/cmake/libslirp.cmake b/cmake/libslirp.cmake -index 1cb6758..bef1793 100644 ---- a/cmake/libslirp.cmake -+++ b/cmake/libslirp.cmake -@@ -2,12 +2,6 @@ add_library(slirp STATIC - src/glib-stub/glib.c - ) - --# Copy libslirp's files to another directory so that we can include it as --file(MAKE_DIRECTORY "${libslirp_BINARY_DIR}/include") --file(REMOVE_RECURSE "${libslirp_BINARY_DIR}/include/slirp") --file(COPY "${libslirp_SOURCE_DIR}/src" DESTINATION "${libslirp_BINARY_DIR}/include") --file(RENAME "${libslirp_BINARY_DIR}/include/src" "${libslirp_BINARY_DIR}/include/slirp") -- - target_include_directories(slirp PUBLIC - "${libslirp_BINARY_DIR}/include" - "${libslirp_SOURCE_DIR}/src" diff --git a/pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch b/pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch new file mode 100644 index 000000000000..9499ac9f921a --- /dev/null +++ b/pkgs/applications/emulators/libretro/cores/patches/melondsds-zlib-no-zconf-rename.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 13dd268..69779cf 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -62,18 +62,6 @@ if(MSVC) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + endif() + +-if(NOT CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_CURRENT_BINARY_DIR) +- # If we're doing an out of source build and the user has a zconf.h +- # in their source tree... +- if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h) +- message(STATUS "Renaming") +- message(STATUS " ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h") +- message(STATUS "to 'zconf.h.included' because this file is included with zlib") +- message(STATUS "but CMake generates it automatically in the build directory.") +- file(RENAME ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h ${CMAKE_CURRENT_SOURCE_DIR}/zconf.h.included) +- endif() +-endif() +- + set(ZLIB_PC ${CMAKE_CURRENT_BINARY_DIR}/zlib.pc) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/zlib.pc.cmakein + ${ZLIB_PC} @ONLY) diff --git a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix index b579ede72fec..d2f42d2e655b 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx-rearmed.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "pcsx-rearmed"; - version = "0-unstable-2026-05-15"; + version = "0-unstable-2026-06-28"; src = fetchFromGitHub { owner = "libretro"; repo = "pcsx_rearmed"; - rev = "c88070df8e0e84106ecc4b6394860a413a7bc046"; - hash = "sha256-ZngYExWmL4NlmSfaRbTpSthNY1QRwKXtSiSX8zS/teo="; + rev = "050981b6eeb715f142854f57c68086f62921f027"; + hash = "sha256-MFNA3YPhLKa5q9hYM11O5/BIrj5xOsiNXkFLnCzugzo="; }; dontConfigure = true; diff --git a/pkgs/applications/emulators/libretro/cores/pcsx2.nix b/pkgs/applications/emulators/libretro/cores/pcsx2.nix index 3524cf6d25b7..66078f17214a 100644 --- a/pkgs/applications/emulators/libretro/cores/pcsx2.nix +++ b/pkgs/applications/emulators/libretro/cores/pcsx2.nix @@ -11,13 +11,13 @@ }: mkLibretroCore { core = "pcsx2"; - version = "0-unstable-2026-06-01"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "libretro"; repo = "ps2"; - rev = "65e8afb9e9ca0a3f3af32d9b35d7d8537cd3cbc1"; - hash = "sha256-H6lZLLO1+ir+vPchq3XGHKsepmYLbohQFvoA0+yiQo0="; + rev = "43129ad5ccbde21b022dd3b3fad1862f72a109bf"; + hash = "sha256-frS44hQeMAgNMEJ5xzmt4fUpx5om5csUsE4qe4kZBao="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/play.nix b/pkgs/applications/emulators/libretro/cores/play.nix index b08e3f75140a..26b3d48ea660 100644 --- a/pkgs/applications/emulators/libretro/cores/play.nix +++ b/pkgs/applications/emulators/libretro/cores/play.nix @@ -14,13 +14,13 @@ }: mkLibretroCore { core = "play"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "jpd002"; repo = "Play-"; - rev = "3a904f67694ce6ce8f88fd97ebaf30240bd87dce"; - hash = "sha256-vxedP/J6LhTqhoRw1bn6uCNedRJUpKHZnD8OQ5z1rxY="; + rev = "50aedca2639521bc498ace0b2be1ea012801a86a"; + hash = "sha256-ywqwy8HwxigRG/2GfvfpewNjTIeunXH9NtyAH5iUfa8="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/ppsspp.nix b/pkgs/applications/emulators/libretro/cores/ppsspp.nix index 37abf02a03fb..5e17f556e43b 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-2026-06-13"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "hrydgard"; repo = "ppsspp"; - rev = "238a88e92b092215dd0cbdc33da6f5e4385ccfb2"; - hash = "sha256-dROUYWxpefM+2SuK/vcnPDnwdh9LH6oGoadGrz+gGJk="; + rev = "f0c28c67446fd9a08b124ea2bfb0e997fe909de5"; + hash = "sha256-p6QNLT7Yp7qWCP/T1HYOzho8oBJVbxheZACatuGq5ng="; fetchSubmodules = true; }; diff --git a/pkgs/applications/emulators/libretro/cores/prboom.nix b/pkgs/applications/emulators/libretro/cores/prboom.nix index 08fbcfe778ed..93e102a11fd2 100644 --- a/pkgs/applications/emulators/libretro/cores/prboom.nix +++ b/pkgs/applications/emulators/libretro/cores/prboom.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "prboom"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-21"; src = fetchFromGitHub { owner = "libretro"; repo = "libretro-prboom"; - rev = "648223372e24773821a2041e0c39728f723badf4"; - hash = "sha256-LyITrBmL5me5zWOfMRZAeCM9rDS19aV2TAFuU8QU/Kw="; + rev = "c5b09532fa633e015ac75c0a2acfec049f65ded3"; + hash = "sha256-13oL/U3uwNejqTIbKmITRbK8Eddg9YH5CMDIDXA6zKs="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/quicknes.nix b/pkgs/applications/emulators/libretro/cores/quicknes.nix index 78151466a51c..a92cf4c454e5 100644 --- a/pkgs/applications/emulators/libretro/cores/quicknes.nix +++ b/pkgs/applications/emulators/libretro/cores/quicknes.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "quicknes"; - version = "0-unstable-2026-05-11"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "libretro"; repo = "QuickNES_Core"; - rev = "a0ec494c417f365c578f3dacadb04383e4a99ade"; - hash = "sha256-q1AS4mASF2gaiGyuM6a/Z57bp0DPRQADlM+snb3iNSg="; + rev = "26bb785c9deddb66a17717b21bb4e328f03ade32"; + hash = "sha256-0W6kYAnRw7uVdjoFL+f4Y8Ut932NbsoEer5TTwf9rBk="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix index 7a360436d3f2..feee8c55bccc 100644 --- a/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix +++ b/pkgs/applications/emulators/libretro/cores/smsplus-gx.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "smsplus"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "libretro"; repo = "smsplus-gx"; - rev = "6dc7119f6f8d7f6437320405ee3b0de5f227913f"; - hash = "sha256-kWq4yzYl0ZTnnhLfhtgPyf2CRequ6yn2DLp3Yc7EBbA="; + rev = "8a63f82d3c3bbf7215a31f86a4aaa13fb68a579f"; + hash = "sha256-yNaNkvRzpli4NMqFvlQ/6US7zw8xXiYWw6R0ev6ubLA="; }; meta = { diff --git a/pkgs/applications/emulators/libretro/cores/snes9x.nix b/pkgs/applications/emulators/libretro/cores/snes9x.nix index 288bf5f1acdb..ac4657b975c3 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-13"; src = fetchFromGitHub { owner = "snes9xgit"; repo = "snes9x"; - rev = "f8aff9cbd0ab3ee92679f039298d57b55f9d790e"; - hash = "sha256-4tOXpK2OBY6u5NnuIq5NWT3haOp2y+4BtBlHVAzEuRE="; + rev = "b5cc7651f9fc02189cb51b5a43848877db5aec42"; + hash = "sha256-htwL5m49J+ku7h79Eu4y74LKiHkbL3UE3+LAXE52ZY8="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix index 56c57527c59b..cd9e77f643a5 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2002.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2002.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "snes9x2002"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-06-25"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2002"; - rev = "39e0d8c6daf4b1b1302eeecfee8309570aeb6a82"; - hash = "sha256-mOtCZEuXKWQEupWfFfr3Ji6m15zZuOIJ/ieKtrFGsWI="; + rev = "5bd8bd6d449be8a2ef7909e1aeb2bd8c9c0da8cb"; + hash = "sha256-iqhmSJzWqr5HgtY9q+kBb/xB6njvG3M2SePXdRszqqc="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2005.nix b/pkgs/applications/emulators/libretro/cores/snes9x2005.nix index a244b5e2f0f7..20a0a12e6bd8 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2005.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2005.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "snes9x2005" + lib.optionalString withBlarggAPU "-plus"; - version = "0-unstable-2026-04-20"; + version = "0-unstable-2026-07-22"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2005"; - rev = "b60356971fc9caae02cd0853676dced886a08be7"; - hash = "sha256-6IuEFyJEoCHluSAXbk5qRTXku1XJCZ6p04BhdjqZqJQ="; + rev = "deb49d80d1836e3e737480a326e31a54c46c04ae"; + hash = "sha256-UMW+YTzcSZ5CWSyRBYc8y1cDh/CU3Am11rkjSXlyxZA="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix index 677f2268981f..f328ea948094 100644 --- a/pkgs/applications/emulators/libretro/cores/snes9x2010.nix +++ b/pkgs/applications/emulators/libretro/cores/snes9x2010.nix @@ -5,13 +5,13 @@ }: mkLibretroCore rec { core = "snes9x2010"; - version = "0-unstable-2026-05-16"; + version = "0-unstable-2026-07-07"; src = fetchFromGitHub { owner = "libretro"; repo = "snes9x2010"; - rev = "bc82e8281ddbbd487875866f5db27cdb9838d319"; - hash = "sha256-laAXE4U5ROKe2QnYbUrvJ4xRPv1hzllDZ8ei01IwqKA="; + rev = "8b0d82d9a515b6c75bd46fd80c3e2e19b0780998"; + hash = "sha256-wbfIbb5Bb78gb1N2L5g/Z3YzqzE3+0tVYVS/vyjtTzQ="; }; makeFlags = [ "GIT_VERSION=${builtins.substring 0 7 src.rev}" ]; diff --git a/pkgs/applications/emulators/libretro/cores/stella.nix b/pkgs/applications/emulators/libretro/cores/stella.nix index a662a9176249..bfb7842100db 100644 --- a/pkgs/applications/emulators/libretro/cores/stella.nix +++ b/pkgs/applications/emulators/libretro/cores/stella.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "stella-emu"; repo = "stella"; - rev = "3e3061809913e59a4378737127ce0ae95b36e889"; - hash = "sha256-fKivb4sFR4F0ub1NLpazLg3i3M9LOely08M8kBEczmo="; + rev = "61f4282f57934df94e08a2db79ec492aaab5b805"; + hash = "sha256-2pEQzl3aUq5ya9297Aj4MYN2ePkg/dyCvJavRWkyE1U="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/stella2014.nix b/pkgs/applications/emulators/libretro/cores/stella2014.nix index 6c7c4a2f6ba4..9432548683f3 100644 --- a/pkgs/applications/emulators/libretro/cores/stella2014.nix +++ b/pkgs/applications/emulators/libretro/cores/stella2014.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "stella2014"; - version = "0-unstable-2026-04-12"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "libretro"; repo = "stella2014-libretro"; - rev = "eed47e154d1bbda3305e9ef2d486b6710c8973f4"; - hash = "sha256-QpPjVnFCkn6xlB7LxpE6bsNfYe3HSsEKUjqmEf2yTvA="; + rev = "4a7da82595d27b8df7af1ecb467a64b642a41bc9"; + hash = "sha256-uwtYNo6hUR6u2OicFYcbfgCGNlpDfIOF7Q5bNuJ/uMM="; }; makefile = "Makefile"; diff --git a/pkgs/applications/emulators/libretro/cores/swanstation.nix b/pkgs/applications/emulators/libretro/cores/swanstation.nix index 4c46caf841d1..f4f7f0a91e27 100644 --- a/pkgs/applications/emulators/libretro/cores/swanstation.nix +++ b/pkgs/applications/emulators/libretro/cores/swanstation.nix @@ -6,13 +6,13 @@ }: mkLibretroCore { core = "swanstation"; - version = "0-unstable-2026-05-20"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "libretro"; repo = "swanstation"; - rev = "62697276b95848bd35b9c7b81daab899a98e0789"; - hash = "sha256-jisW5Mk5PF3rxj9mF5FJXtktAKEAq2a6DUvCXBgri3E="; + rev = "5430a4a53b89fa5827c97b84ada29d23317245bc"; + hash = "sha256-sE9jJjdt25nz0+B0oSonRubYWurE20o/FDdUTj//qOI="; }; extraNativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/emulators/libretro/cores/vba-next.nix b/pkgs/applications/emulators/libretro/cores/vba-next.nix index a9a207d71dd6..94cd4212aab6 100644 --- a/pkgs/applications/emulators/libretro/cores/vba-next.nix +++ b/pkgs/applications/emulators/libretro/cores/vba-next.nix @@ -5,13 +5,13 @@ }: mkLibretroCore { core = "vba-next"; - version = "0-unstable-2026-06-06"; + version = "0-unstable-2026-07-21"; src = fetchFromGitHub { owner = "libretro"; repo = "vba-next"; - rev = "349b57c6442af56248433c114500a460ef9bfd8c"; - hash = "sha256-46ps2P1a8pa9vcZ7Saz8Mh+w5e2lEWjIRAw5WQh1BjQ="; + rev = "2b96fd3a77025f3083daf61126b1852d5e0eace7"; + hash = "sha256-09KSCGlmHNrftX86CVUUAAIHiOpM+MpWwa+XOw3MrJA="; }; meta = { diff --git a/pkgs/applications/emulators/wibo/default.nix b/pkgs/applications/emulators/wibo/default.nix index f982374e6b73..7a5b0ad8e937 100644 --- a/pkgs/applications/emulators/wibo/default.nix +++ b/pkgs/applications/emulators/wibo/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta.license = lib.licenses.unfree; }; in - lib.optionalString finalAttrs.doCheck '' + lib.optionalString finalAttrs.finalPackage.doCheck '' MWCIncludes=../test ./wibo ${gc}/GC/2.7/mwcceppc.exe -c ../test/test.c file test.o | grep "ELF 32-bit" ''; diff --git a/pkgs/applications/emulators/wine/base.nix b/pkgs/applications/emulators/wine/base.nix index bee9d7c4af85..776dceef6050 100644 --- a/pkgs/applications/emulators/wine/base.nix +++ b/pkgs/applications/emulators/wine/base.nix @@ -64,6 +64,7 @@ x11Support ? false, ffmpegSupport ? false, embedInstallers ? false, + smartcardSupport ? false, }: let @@ -251,6 +252,9 @@ stdenv.mkDerivation ( ++ lib.optionals ffmpegSupport [ pkgs.ffmpeg-headless ] + ++ lib.optionals smartcardSupport [ + pkgs.pcsclite + ] ); inherit patches; @@ -275,7 +279,8 @@ stdenv.mkDerivation ( ++ lib.optionals vulkanSupport [ "--with-vulkan" ] ++ lib.optionals ((stdenv.hostPlatform.isDarwin && !xineramaSupport) || !x11Support) [ "--without-x" - ]; + ] + ++ lib.optionals smartcardSupport [ "--with-pcsclite" ]; # Wine locates a lot of libraries dynamically through dlopen(). Add # them to the RPATH so that the user doesn't have to set them in @@ -360,7 +365,7 @@ stdenv.mkDerivation ( meta = { inherit version; homepage = "https://www.winehq.org/"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; sourceProvenance = with lib.sourceTypes; [ fromSource binaryNativeCode # mono, gecko diff --git a/pkgs/applications/emulators/wine/default.nix b/pkgs/applications/emulators/wine/default.nix index 9c5d918bf057..07ee1ec83771 100644 --- a/pkgs/applications/emulators/wine/default.nix +++ b/pkgs/applications/emulators/wine/default.nix @@ -51,6 +51,7 @@ args@{ ffmpegSupport ? false, embedInstallers ? false, # The Mono and Gecko MSI installers moltenvk, # Allow users to override MoltenVK easily + smartcardSupport ? false, }: let diff --git a/pkgs/applications/emulators/wine/fonts.nix b/pkgs/applications/emulators/wine/fonts.nix index 94b2d74440a4..3ed188a42705 100644 --- a/pkgs/applications/emulators/wine/fonts.nix +++ b/pkgs/applications/emulators/wine/fonts.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { meta = { description = "Microsoft replacement fonts by the Wine project"; homepage = "https://wiki.winehq.org/Create_Fonts"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ avnik diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index c548d3c1a72e..918046b464da 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -84,7 +84,6 @@ in if pkgs.stdenv.hostPlatform.isAarch64 then [ "--enable-archs=aarch64" ] else [ "--enable-win64" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; @@ -145,7 +144,6 @@ in [ "--enable-archs=x86_64,i386" ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; mainProgram = "wine"; diff --git a/pkgs/applications/emulators/wine/sources.nix b/pkgs/applications/emulators/wine/sources.nix index 40fd2da565b1..ef983a647be6 100644 --- a/pkgs/applications/emulators/wine/sources.nix +++ b/pkgs/applications/emulators/wine/sources.nix @@ -151,9 +151,9 @@ rec { unstable = fetchurl rec { # NOTE: Don't forget to change the hash for staging as well. - version = "11.9"; + version = "11.12"; url = "https://dl.winehq.org/wine/source/11.x/wine-${version}.tar.xz"; - hash = "sha256-45zBjbKHNYokNvivSYvtx+RE1V65nvVFtg53i7TqD28="; + hash = "sha256-07wJEZLZhYRsnyAGXMgfITMfAeIrc2sTHjRJ4TBmcbw="; patches = [ # Also look for root certificates at $NIX_SSL_CERT_FILE @@ -163,7 +163,7 @@ rec { # see https://gitlab.winehq.org/wine/wine-staging staging = fetchFromGitLab { inherit version; - hash = "sha256-IQSu/Nr3JynVv95/jaZCZrCQWKE8/pp9JGEwfmDdI9s="; + hash = "sha256-3pE/RVUvH56z9Ilumokl7nNMrhfksuUWzKq6k8behW4="; domain = "gitlab.winehq.org"; owner = "wine"; repo = "wine-staging"; @@ -186,9 +186,9 @@ rec { ## see http://wiki.winehq.org/Mono mono = fetchurl rec { - version = "11.1.0"; + version = "11.2.0"; url = "https://dl.winehq.org/wine/wine-mono/${version}/wine-mono-${version}-x86.msi"; - hash = "sha256-3rA0FDH4Jgsgn/9rx53cxUFLl/jpI2q5+9ykzlngqbk="; + hash = "sha256-tFJWeefaMNRljOuFc5y8VcdxeRBUq7tLMVL+lt7QuJc="; }; updateScript = writeShellScript "update-wine-unstable" '' diff --git a/pkgs/applications/gis/qgis/unwrapped-ltr.nix b/pkgs/applications/gis/qgis/unwrapped-ltr.nix index ee4d1b5a6364..5096d3568716 100644 --- a/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -85,7 +85,7 @@ let ]; in mkDerivation rec { - version = "3.44.10"; + version = "3.44.11"; pname = "qgis-ltr-unwrapped"; outputs = [ "out" ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) "man"; @@ -93,7 +93,7 @@ mkDerivation rec { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-wWLbnZpLIchm0NXuU7jEXCBctrI6G1z8iqf9R2YhS8Y="; + hash = "sha256-gWSl9OrRSxreQdKxKKDCOUWBE5uE2w3/ebW266LCWLI="; }; passthru = { diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix index 89a8c9f1cbd8..4a0ef5e72bb8 100644 --- a/pkgs/applications/graphics/gimp/default.nix +++ b/pkgs/applications/graphics/gimp/default.nix @@ -310,7 +310,8 @@ stdenv.mkDerivation (finalAttrs: { # for gimp-script-fu-interpreter-3.0 invoked by shebang of some plug-ins "$out" ] - }") + }" + --suffix XDG_DATA_DIRS : "${adwaita-icon-theme}/share") ''; postFixup = '' @@ -338,8 +339,6 @@ stdenv.mkDerivation (finalAttrs: { gtk = gtk3; }; - __structuredAttrs = true; - meta = { description = "GNU Image Manipulation Program"; homepage = "https://www.gimp.org/"; diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index cdbac84aaf3d..a2decfce52cd 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -209,7 +209,7 @@ lib.makeScope pkgs.newScope ( broken = gimp.apiVersion != "2.0"; description = "GIMP plug-in to do the fourier transform"; homepage = "https://people.via.ecp.fr/~remi/soft/gimp/gimp_plugin_en.php3#fourier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; @@ -243,7 +243,7 @@ lib.makeScope pkgs.newScope ( broken = lib.versionOlder gimp.version "3"; description = "Suite of gimp plugins for texture synthesis"; homepage = "https://github.com/bootchk/resynthesizer"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }; diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix index 7a5b12418a12..ccea323f700b 100644 --- a/pkgs/applications/graphics/inkscape/default.nix +++ b/pkgs/applications/graphics/inkscape/default.nix @@ -103,6 +103,14 @@ stdenv.mkDerivation (finalAttrs: { # Fix path to ps2pdf binary inherit ghostscript; }) + # https://gitlab.com/inkscape/inkscape/-/merge_requests/7919 + (fetchpatch { + name = "fix-build-poppler-26.05.0"; + url = "https://gitlab.com/inkscape/inkscape/-/commit/98828255aa0c1212329236b3ff4ac7f41efb4a67.patch"; + hash = "sha256-ujUl0SxZyb/TyJRmq1ETNn5W8lDDNn3JqHQQQPU5klA="; + }) + # https://gitlab.com/inkscape/inkscape/-/merge_requests/7968 + ./fix-build-poppler-26.06.0.patch ]; postPatch = '' diff --git a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix index 0024092cfcd5..65151cb3192b 100644 --- a/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/inkstitch/default.nix @@ -101,7 +101,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Inkscape extension for machine embroidery design"; homepage = "https://inkstitch.org/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ tropf pluiedev diff --git a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix index 20f7f2a2a055..2e2fd2abe665 100644 --- a/pkgs/applications/graphics/inkscape/extensions/textext/default.nix +++ b/pkgs/applications/graphics/inkscape/extensions/textext/default.nix @@ -109,6 +109,20 @@ python3.pkgs.buildPythonApplication (finalAttrs: { # Include gobject-introspection typelibs in the wrapper. makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + + # TexText probes for a GUI toolkit by spawning a subprocess + # (`sys.executable -c "import gi; gi.require_version('Gtk', '3.0'); ..."`) + # instead of importing in-process. The Python wrapper makes runtime + # dependencies importable via a site.addsitedir preamble and deliberately + # does not export PYTHONPATH, so the spawned probe interpreter cannot import + # gi and TexText aborts with "Neither GTK nor TkInter has been found". + # Export PYTHONPATH so the probe subprocess inherits the dependencies too. + # See https://github.com/NixOS/nixpkgs/issues/384042 + makeWrapperArgs+=(--prefix PYTHONPATH : "${ + lib.makeSearchPath python3.sitePackages ( + finalAttrs.propagatedBuildInputs ++ [ python3.pkgs.pycairo ] + ) + }") ''; postFixup = '' diff --git a/pkgs/applications/graphics/inkscape/fix-build-poppler-26.06.0.patch b/pkgs/applications/graphics/inkscape/fix-build-poppler-26.06.0.patch new file mode 100644 index 000000000000..e9af942188db --- /dev/null +++ b/pkgs/applications/graphics/inkscape/fix-build-poppler-26.06.0.patch @@ -0,0 +1,487 @@ +From 35a470d9cbff50467cc700bc17ab2c4e8f5cf0bc Mon Sep 17 00:00:00 2001 +From: KrIr17 +Date: Mon, 8 Jun 2026 20:16:32 +0200 +Subject: [PATCH] Fix Building with Poppler 26.06.0 + +- pdfparser: Some `const PDFRectangle *` to `const PDFRectangle &` [1] +- pdfparser: Some `const GfxColor *` to `const GfxColor &` [2] +- pdf-utils: Add a `getRect(const PDFRectangle &)` alongside `getRect(const + PDFRectangle *)` +- poppler-cairo-font-engine: `getKey()` now returns std::string and not + char[], so change `strcmp` to `std::string(...).compare(...)` [3] +- poppler-utils: `obj->dictGetKey()` etc. were removed; use + `obj->dict()->getKey()` instead (these have also existed in poppler + since the beginning, so shouldn't break any old poppler) [4,5] +- svg-builder: `convertGfxColor` now takes `const GfxColor &` as input. + A convenience function taking `const GfxColor *` (for older poppler) + now calls the new one after confirming `color` is a valid pointer +- svg-builder: `_addStopToGradient` now takes `const GfxColor &` as + input. This was used only in `convertGfxColor` and therefore doesn't + need a helper function for compatibility +- testfiles pdf-utils-test: `` to `<*.h>` (see e3eb1210) +- testfiles pdf-utils-test: Some `const PDFRectangle *` + to `const PDFRectangle &` [1] + +Fixes https://gitlab.com/inkscape/inkscape/-/work_items/6210 + +Upstream Commits: + +[1] https://gitlab.freedesktop.org/poppler/poppler/-/commit/d50a4510 +[2] https://gitlab.freedesktop.org/poppler/poppler/-/commit/0f94f530 +[3] https://gitlab.freedesktop.org/poppler/poppler/-/commit/a3de7f8a +[4] https://gitlab.freedesktop.org/poppler/poppler/-/commit/bb13b0f5 +[5] https://gitlab.freedesktop.org/poppler/poppler/-/commit/8ae0f8e7 +--- + src/extension/internal/pdfinput/pdf-input.cpp | 14 +++++- + .../internal/pdfinput/pdf-parser.cpp | 45 ++++++++++--------- + src/extension/internal/pdfinput/pdf-parser.h | 4 +- + src/extension/internal/pdfinput/pdf-utils.cpp | 5 +++ + src/extension/internal/pdfinput/pdf-utils.h | 1 + + .../pdfinput/poppler-cairo-font-engine.cpp | 2 +- + .../pdfinput/poppler-transition-api.h | 16 +++++++ + .../internal/pdfinput/poppler-utils.cpp | 20 +++++---- + .../internal/pdfinput/svg-builder.cpp | 36 +++++++++------ + src/extension/internal/pdfinput/svg-builder.h | 3 +- + testfiles/src/pdf-utils-test.cpp | 7 +-- + 11 files changed, 100 insertions(+), 53 deletions(-) + +diff --git a/src/extension/internal/pdfinput/pdf-input.cpp b/src/extension/internal/pdfinput/pdf-input.cpp +index aa4285b01d..dc5394c3d8 100644 +--- a/src/extension/internal/pdfinput/pdf-input.cpp ++++ b/src/extension/internal/pdfinput/pdf-input.cpp +@@ -820,7 +820,11 @@ PdfInput::add_builder_page(std::shared_ptrpdf_doc, SvgBuilder *builder, + } + + // Apply crop settings ++#if POPPLER_CHECK_VERSION(26, 2, 0) ++ std::optional clipToBox; ++#else + _POPPLER_CONST PDFRectangle *clipToBox = nullptr; ++#endif + + if (crop_to == "media-box") { + clipToBox = page->getMediaBox(); +@@ -834,8 +838,16 @@ PdfInput::add_builder_page(std::shared_ptrpdf_doc, SvgBuilder *builder, + clipToBox = page->getArtBox(); + } + ++ std::optional cropBox; ++#if POPPLER_CHECK_VERSION(26, 2, 0) ++ cropBox = clipToBox; ++#else ++ if (clipToBox) { ++ cropBox = *clipToBox; ++ } ++#endif + // Create parser (extension/internal/pdfinput/pdf-parser.h) +- auto pdf_parser = PdfParser(pdf_doc, builder, page, clipToBox); ++ auto pdf_parser = PdfParser(pdf_doc, builder, page, cropBox); + + // Set up approximation precision for parser. Used for converting Mesh Gradients into tiles. + if ( color_delta <= 0.0 ) { +diff --git a/src/extension/internal/pdfinput/pdf-parser.cpp b/src/extension/internal/pdfinput/pdf-parser.cpp +index b336c48ce3..86fc51b1f2 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.cpp ++++ b/src/extension/internal/pdfinput/pdf-parser.cpp +@@ -43,6 +43,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -264,7 +265,7 @@ GfxPatch blankPatch() + //------------------------------------------------------------------------ + + PdfParser::PdfParser(std::shared_ptr pdf_doc, Inkscape::Extension::Internal::SvgBuilder *builderA, Page *page, +- _POPPLER_CONST PDFRectangle *cropBox) ++ const std::optional &cropBox) + : _pdf_doc(pdf_doc) + , xref(pdf_doc->getXRef()) + , builder(builderA) +@@ -307,8 +308,8 @@ PdfParser::PdfParser(std::shared_ptr pdf_doc, Inkscape::Extension::Inter + builder->setMargins(getRect(page->getTrimBox()) * scale, + getRect(page->getArtBox()) * scale, + getRect(page->getBleedBox()) * scale); +- if (cropBox && getRect(cropBox) != page_box) { +- builder->cropPage(getRect(cropBox) * scale); ++ if (cropBox && getRect(*cropBox) != page_box) { ++ builder->cropPage(getRect(*cropBox) * scale); + } + + saveState(); +@@ -331,7 +332,7 @@ PdfParser::PdfParser(XRef *xrefA, Inkscape::Extension::Internal::SvgBuilder *bui + , printCommands(false) + , res(new GfxResources(xref, resDict, nullptr)) + , // start the resource stack +- state(new GfxState(72, 72, box, 0, false)) ++ state(new _POPPLER_GFX_STATE(72, 72, *box, 0, false)) + , fontChanged(gFalse) + , clip(clipNone) + , ignoreUndef(0) +@@ -964,7 +965,7 @@ void PdfParser::opSetFillGray(Object args[], int /*numArgs*/) + state->setFillPattern(nullptr); + state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique())); + color.c[0] = dblToCol(args[0].getNum()); +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + +@@ -976,7 +977,7 @@ void PdfParser::opSetStrokeGray(Object args[], int /*numArgs*/) + state->setStrokePattern(nullptr); + state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(std::make_unique())); + color.c[0] = dblToCol(args[0].getNum()); +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + +@@ -991,7 +992,7 @@ void PdfParser::opSetFillCMYKColor(Object args[], int /*numArgs*/) + for (i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + +@@ -1005,7 +1006,7 @@ void PdfParser::opSetStrokeCMYKColor(Object args[], int /*numArgs*/) + for (int i = 0; i < 4; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + +@@ -1019,7 +1020,7 @@ void PdfParser::opSetFillRGBColor(Object args[], int /*numArgs*/) + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + +@@ -1032,7 +1033,7 @@ void PdfParser::opSetStrokeRGBColor(Object args[], int /*numArgs*/) { + for (int i = 0; i < 3; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + +@@ -1048,7 +1049,7 @@ void PdfParser::opSetFillColorSpace(Object args[], int numArgs) + GfxColor color; + colorSpace->getDefaultColor(&color); + state->setFillColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(colorSpace)); +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } else { + error(errSyntaxError, getPos(), "Bad color space (fill)"); +@@ -1069,7 +1070,7 @@ void PdfParser::opSetStrokeColorSpace(Object args[], int numArgs) + GfxColor color; + colorSpace->getDefaultColor(&color); + state->setStrokeColorSpace(_POPPLER_CONSUME_UNIQPTR_ARG(colorSpace)); +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } else { + error(errSyntaxError, getPos(), "Bad color space (stroke)"); +@@ -1089,7 +1090,7 @@ void PdfParser::opSetFillColor(Object args[], int numArgs) { + for (i = 0; i < numArgs; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + +@@ -1106,7 +1107,7 @@ void PdfParser::opSetStrokeColor(Object args[], int numArgs) { + for (i = 0; i < numArgs; ++i) { + color.c[i] = dblToCol(args[i].getNum()); + } +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + +@@ -1127,7 +1128,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { + color.c[i] = dblToCol(args[i].getNum()); + } + } +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +@@ -1146,7 +1147,7 @@ void PdfParser::opSetFillColorN(Object args[], int numArgs) { + color.c[i] = dblToCol(args[i].getNum()); + } + } +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + builder->updateStyle(state); + } + } +@@ -1170,7 +1171,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { + color.c[i] = dblToCol(args[i].getNum()); + } + } +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + if (auto pattern = lookupPattern(&(args[numArgs - 1]), state)) { +@@ -1189,7 +1190,7 @@ void PdfParser::opSetStrokeColorN(Object args[], int numArgs) { + color.c[i] = dblToCol(args[i].getNum()); + } + } +- state->setStrokeColor(&color); ++ state->_POPPLER_SET_STROKE_COLOR(color); + builder->updateStyle(state); + } + } +@@ -1673,7 +1674,7 @@ void PdfParser::doFunctionShFill1(GfxFunctionShading *shading, + + // use the center color + shading->getColor(xM, yM, &fillColor); +- state->setFillColor(&fillColor); ++ state->_POPPLER_SET_FILL_COLOR(fillColor); + + // fill the rectangle + state->moveTo(x0 * matrix[0] + y0 * matrix[2] + matrix[4], +@@ -1799,7 +1800,7 @@ void PdfParser::gouraudFillTriangle(double x0, double y0, GfxColor *color0, + } + } + if (i == nComps || depth == maxDepths[pdfGouraudTriangleShading-1]) { +- state->setFillColor(color0); ++ state->_POPPLER_SET_FILL_COLOR(*color0); + state->moveTo(x0, y0); + state->lineTo(x1, y1); + state->lineTo(x2, y2); +@@ -1877,7 +1878,7 @@ void PdfParser::fillPatch(_POPPLER_CONST GfxPatch *patch, int nComps, int depth) + color.c[i] = GfxColorComp(patch->color[0][0].c[i]); + } + if (i == nComps || depth == maxDepths[pdfPatchMeshShading-1]) { +- state->setFillColor(&color); ++ state->_POPPLER_SET_FILL_COLOR(color); + state->moveTo(patch->x[0][0], patch->y[0][0]); + state->curveTo(patch->x[0][1], patch->y[0][1], + patch->x[0][2], patch->y[0][2], +diff --git a/src/extension/internal/pdfinput/pdf-parser.h b/src/extension/internal/pdfinput/pdf-parser.h +index 098ff26e26..29dd259167 100644 +--- a/src/extension/internal/pdfinput/pdf-parser.h ++++ b/src/extension/internal/pdfinput/pdf-parser.h +@@ -113,8 +113,8 @@ struct OpHistoryEntry { + class PdfParser { + public: + +- // Constructor for regular output. +- PdfParser(std::shared_ptr pdf_doc, SvgBuilder *builderA, Page *page, _POPPLER_CONST PDFRectangle *cropBox); ++ // Constructor for regular output. ++ PdfParser(std::shared_ptr pdf_doc, SvgBuilder *builderA, Page *page, const std::optional &cropBox); + // Constructor for a sub-page object. + PdfParser(XRef *xrefA, SvgBuilder *builderA, Dict *resDict, _POPPLER_CONST PDFRectangle *box); + +diff --git a/src/extension/internal/pdfinput/pdf-utils.cpp b/src/extension/internal/pdfinput/pdf-utils.cpp +index 22e5df62c8..3aa6c02d3c 100644 +--- a/src/extension/internal/pdfinput/pdf-utils.cpp ++++ b/src/extension/internal/pdfinput/pdf-utils.cpp +@@ -133,6 +133,11 @@ Geom::Rect getRect(_POPPLER_CONST PDFRectangle *box) + return Geom::Rect(box->x1, box->y1, box->x2, box->y2); + } + ++Geom::Rect getRect(const PDFRectangle &box) ++{ ++ return Geom::Rect(box.x1, box.y1, box.x2, box.y2); ++} ++ + Geom::PathVector getPathV(GfxPath *path) + { + if (!path) { +diff --git a/src/extension/internal/pdfinput/pdf-utils.h b/src/extension/internal/pdfinput/pdf-utils.h +index d259a8c2f7..30e9b5bf86 100644 +--- a/src/extension/internal/pdfinput/pdf-utils.h ++++ b/src/extension/internal/pdfinput/pdf-utils.h +@@ -59,6 +59,7 @@ private: + }; + + Geom::Rect getRect(_POPPLER_CONST PDFRectangle *box); ++Geom::Rect getRect(_POPPLER_CONST PDFRectangle &box); + Geom::PathVector getPathV(GfxPath *gPath); + + #endif /* PDF_UTILS_H */ +diff --git a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +index 19ebd26693..39ce22af38 100644 +--- a/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp ++++ b/src/extension/internal/pdfinput/poppler-cairo-font-engine.cpp +@@ -713,7 +713,7 @@ CairoType3Font *CairoType3Font::create(GfxFont *gfxFont, PDFDoc *doc, CairoFontE + codeToGID[i] = 0; + if (charProcs && (name = enc[i])) { + for (int j = 0; j < charProcs->getLength(); j++) { +- if (strcmp(name, charProcs->getKey(j)) == 0) { ++ if (std::string(charProcs->getKey(j)).compare(name) == 0) { + codeToGID[i] = j; + } + } +diff --git a/src/extension/internal/pdfinput/poppler-transition-api.h b/src/extension/internal/pdfinput/poppler-transition-api.h +index d69829d512..23550a3068 100644 +--- a/src/extension/internal/pdfinput/poppler-transition-api.h ++++ b/src/extension/internal/pdfinput/poppler-transition-api.h +@@ -15,6 +15,22 @@ + #include + #include + ++#if POPPLER_CHECK_VERSION(26, 6, 0) ++#define _POPPLER_GET_GRAY(color, gray) getGray(color, gray) ++#define _POPPLER_GET_RGB(color, rgb) getRGB(color, rgb) ++#define _POPPLER_GET_CMYK(color, cmyk) getCMYK(color, cmyk) ++#define _POPPLER_SET_FILL_COLOR(color) setFillColor(color) ++#define _POPPLER_SET_STROKE_COLOR(color) setStrokeColor(color) ++#define _POPPLER_GFX_STATE(h, v, Rect, rotateA, upsideDown) GfxState(h, v, Rect, rotateA, upsideDown) ++#else ++#define _POPPLER_GET_GRAY(color, gray) getGray(&color, gray) ++#define _POPPLER_GET_RGB(color, rgb) getRGB(&color, rgb) ++#define _POPPLER_GET_CMYK(color, cmyk) getCMYK(&color, cmyk) ++#define _POPPLER_SET_FILL_COLOR(color) setFillColor(&color) ++#define _POPPLER_SET_STROKE_COLOR(color) setStrokeColor(&color) ++#define _POPPLER_GFX_STATE(h, v, Rect, rotateA, upsideDown) GfxState(h, v, &Rect, rotateA, upsideDown) ++#endif ++ + #if POPPLER_CHECK_VERSION(26, 2, 0) + #define _POPPLER_WMODE GfxFont::WritingMode + #define _POPPLER_WMODE_HORIZONTAL GfxFont::WritingMode::Horizontal +diff --git a/src/extension/internal/pdfinput/poppler-utils.cpp b/src/extension/internal/pdfinput/poppler-utils.cpp +index 2338dbe2d9..66dcf85e1d 100644 +--- a/src/extension/internal/pdfinput/poppler-utils.cpp ++++ b/src/extension/internal/pdfinput/poppler-utils.cpp +@@ -196,15 +196,17 @@ void InkFontDict::hashFontObject1(const Object *obj, FNVHash *h) + hashFontObject1(&obj2, h); + } + break; +- case objDict: +- h->hash('d'); +- n = obj->dictGetLength(); +- h->hash((char *)&n, sizeof(int)); +- for (i = 0; i < n; ++i) { +- p = obj->dictGetKey(i); +- h->hash(p, (int)strlen(p)); +- const Object &obj2 = obj->dictGetValNF(i); +- hashFontObject1(&obj2, h); ++ case objDict: { ++ h->hash('d'); ++ auto objdict = obj->getDict(); ++ n = objdict->getLength(); ++ h->hash((char *)&n, sizeof(int)); ++ for (i = 0; i < n; ++i) { ++ auto p = std::string(objdict->getKey(i)); ++ h->hash(p.c_str(), p.length()); ++ const Object &obj2 = objdict->getValNF(i); ++ hashFontObject1(&obj2, h); ++ } + } + break; + case objStream: +diff --git a/src/extension/internal/pdfinput/svg-builder.cpp b/src/extension/internal/pdfinput/svg-builder.cpp +index 3dfdfbbed4..bf7ccf1a8b 100644 +--- a/src/extension/internal/pdfinput/svg-builder.cpp ++++ b/src/extension/internal/pdfinput/svg-builder.cpp +@@ -392,7 +392,15 @@ static std::string svgConvertGfxRGB(GfxRGB *color) + return svgConvertRGBToText(r, g, b); + } + +-std::string SvgBuilder::convertGfxColor(const GfxColor *color, GfxColorSpace *space) ++// for poppler < 26.06.0 ++std::string SvgBuilder::convertGfxColor(const GfxColor *color, GfxColorSpace *space) { ++ if (!color) { ++ return ""; ++ } ++ return convertGfxColor(*color, space); ++} ++ ++std::string SvgBuilder::convertGfxColor(const GfxColor &color, GfxColorSpace *space) + { + std::string icc = ""; + switch (space->getMode()) { +@@ -419,7 +427,7 @@ std::string SvgBuilder::convertGfxColor(const GfxColor *color, GfxColorSpace *sp + Inkscape::CSSOStringStream icc_color; + icc_color << rgb_color << " icc-color(" << icc; + for (int i = 0; i < space->getNComps(); ++i) { +- icc_color << ", " << colToDbl((*color).c[i]); ++ icc_color << ", " << colToDbl((color).c[i]); + } + icc_color << ");"; + return icc_color.str(); +@@ -1204,7 +1212,7 @@ gchar *SvgBuilder::_createGradient(GfxShading *shading, const Geom::Affine pat_m + /** + * \brief Adds a stop with the given properties to the gradient's representation + */ +-void SvgBuilder::_addStopToGradient(Inkscape::XML::Node *gradient, double offset, GfxColor *color, GfxColorSpace *space, ++void SvgBuilder::_addStopToGradient(Inkscape::XML::Node *gradient, double offset, GfxColor &color, GfxColorSpace *space, + double opacity) + { + Inkscape::XML::Node *stop = _xml_doc->createElement("svg:stop"); +@@ -1255,8 +1263,8 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + if (!svgGetShadingColor(shading, 0.0, &stop1) || !svgGetShadingColor(shading, 1.0, &stop2)) { + return false; + } else { +- _addStopToGradient(gradient, 0.0, &stop1, space, 1.0); +- _addStopToGradient(gradient, 1.0, &stop2, space, 1.0); ++ _addStopToGradient(gradient, 0.0, stop1, space, 1.0); ++ _addStopToGradient(gradient, 1.0, stop2, space, 1.0); + } + } else if (type == _POPPLER_FUNCTION_TYPE_STITCHING) { + auto stitchingFunc = static_cast<_POPPLER_CONST StitchingFunction*>(func); +@@ -1269,7 +1277,7 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + // Add stops from all the stitched functions + GfxColor prev_color, color; + svgGetShadingColor(shading, bounds[0], &prev_color); +- _addStopToGradient(gradient, bounds[0], &prev_color, space, 1.0); ++ _addStopToGradient(gradient, bounds[0], prev_color, space, 1.0); + for ( int i = 0 ; i < num_funcs ; i++ ) { + svgGetShadingColor(shading, bounds[i + 1], &color); + // Add stops +@@ -1279,14 +1287,14 @@ bool SvgBuilder::_addGradientStops(Inkscape::XML::Node *gradient, GfxShading *sh + expE = (bounds[i + 1] - bounds[i])/expE; // approximate exponential as a single straight line at x=1 + if (encode[2*i] == 0) { // normal sequence + auto offset = (bounds[i + 1] - expE) / max_bound; +- _addStopToGradient(gradient, offset, &prev_color, space, 1.0); ++ _addStopToGradient(gradient, offset, prev_color, space, 1.0); + } else { // reflected sequence + auto offset = (bounds[i] + expE) / max_bound; +- _addStopToGradient(gradient, offset, &color, space, 1.0); ++ _addStopToGradient(gradient, offset, color, space, 1.0); + } + } + } +- _addStopToGradient(gradient, bounds[i + 1] / max_bound, &color, space, 1.0); ++ _addStopToGradient(gradient, bounds[i + 1] / max_bound, color, space, 1.0); + prev_color = color; + } + } else { // Unsupported function type +diff --git a/src/extension/internal/pdfinput/svg-builder.h b/src/extension/internal/pdfinput/svg-builder.h +index c4b217f58e..348f3a2ce3 100644 +--- a/src/extension/internal/pdfinput/svg-builder.h ++++ b/src/extension/internal/pdfinput/svg-builder.h +@@ -186,7 +186,7 @@ private: + // Pattern creation + gchar *_createPattern(GfxPattern *pattern, GfxState *state, bool is_stroke=false); + gchar *_createGradient(GfxShading *shading, const Geom::Affine pat_matrix, bool for_shading = false); +- void _addStopToGradient(Inkscape::XML::Node *gradient, double offset, GfxColor *color, GfxColorSpace *space, ++ void _addStopToGradient(Inkscape::XML::Node *gradient, double offset, GfxColor &color, GfxColorSpace *space, + double opacity); + bool _addGradientStops(Inkscape::XML::Node *gradient, GfxShading *shading, + _POPPLER_CONST Function *func); +@@ -239,6 +239,7 @@ private: + static bool _attrEqual(Inkscape::XML::Node *a, Inkscape::XML::Node *b, char const *attr); + + // Colors ++ std::string convertGfxColor(const GfxColor &color, GfxColorSpace *space); + std::string convertGfxColor(const GfxColor *color, GfxColorSpace *space); + std::string _getColorProfile(cmsHPROFILE hp); + diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 64f2b04b613c..ae0950b70b13 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - protobuf, wrapQtAppsHook, python3, zbar, @@ -21,14 +20,14 @@ let else "libzbar${stdenv.hostPlatform.extensions.sharedLibrary}"; in -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "electrum"; - version = "4.7.2"; + version = "4.8.0"; pyproject = true; src = fetchurl { - url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - hash = "sha256-qzA/HLw+QPTdE6qsg8TNqr0DuOgfMrs8UcEnfp1uBpc="; + url = "https://download.electrum.org/${finalAttrs.version}/Electrum-${finalAttrs.version}.tar.gz"; + hash = "sha256-z14bzs81eJNTMSWSBLTyCmsljDNztG54SVkoTcSqvsM="; }; build-system = with python3.pkgs; [ @@ -36,7 +35,6 @@ python3.pkgs.buildPythonApplication rec { ]; nativeBuildInputs = [ - protobuf python3.pkgs.pythonRelaxDepsHook ] ++ lib.optionals enableQt [ @@ -101,11 +99,7 @@ python3.pkgs.buildPythonApplication rec { "tests/test_qml_types.py" ]; - postPatch = '' - # Upstream tarball omits regenerated protobuf bindings in some releases. - protoc --python_out=. electrum/paymentrequest.proto - '' - + ( + postPatch = if enableQt then '' substituteInPlace ./electrum/qrscanner.py \ @@ -114,8 +108,7 @@ python3.pkgs.buildPythonApplication rec { else '' sed -i '/qdarkstyle/d' contrib/requirements/requirements.txt - '' - ); + ''; postInstall = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/share/applications/electrum.desktop \ @@ -175,4 +168,4 @@ python3.pkgs.buildPythonApplication rec { ]; mainProgram = "electrum"; }; -} +}) diff --git a/pkgs/applications/misc/sweethome3d/default.nix b/pkgs/applications/misc/sweethome3d/default.nix index 17291bdc2cce..f0a220d8733d 100644 --- a/pkgs/applications/misc/sweethome3d/default.nix +++ b/pkgs/applications/misc/sweethome3d/default.nix @@ -29,7 +29,6 @@ let ]; platforms = [ "i686-linux" - "x86_64-darwin" "x86_64-linux" "aarch64-darwin" ]; diff --git a/pkgs/applications/misc/xppen/generic.nix b/pkgs/applications/misc/xppen/generic.nix index a48a20b2ef4c..8dd7b39b14fe 100644 --- a/pkgs/applications/misc/xppen/generic.nix +++ b/pkgs/applications/misc/xppen/generic.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation { mainProgram = "PenTablet"; maintainers = with lib.maintainers; [ gepbird - nasrally ]; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 3d4138570f74..dd4df835a93c 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -480,13 +480,15 @@ let # BUNDLE_WIDEVINE_CDM build flag does work in the way we want though. # We also need enable_widevine_cdm_component to be false. Unfortunately it isn't exposed as gn # flag (declare_args) so we simply hardcode it to false. - ./patches/widevine-disable-auto-download-allow-bundle.patch + ./patches/${lib.optionalString (chromiumVersionAtLeast "150") "chromium-150-"}widevine-disable-auto-download-allow-bundle.patch ] - ++ [ + ++ lib.optionals (!chromiumVersionAtLeast "150") [ # Required to fix the build with a more recent wayland-protocols version # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 ./patches/angle-wayland-include-protocol.patch + ] + ++ [ # Chromium reads initial_preferences from its own executable directory # This patch modifies it to read /etc/chromium/initial_preferences ./patches/chromium-initial-prefs.patch @@ -504,11 +506,16 @@ let # allowing us to use our rustc and our clang. ./patches/chromium-140-rust.patch ] - ++ lib.optionals (chromiumVersionAtLeast "141") [ + ++ lib.optionals (versionRange "141" "150") [ # Rebased variant of the patch above due to # https://chromium-review.googlesource.com/c/chromium/src/+/6897026 ./patches/chromium-141-rust.patch ] + ++ lib.optionals (chromiumVersionAtLeast "150") [ + # Rebased variant of the patch above due to + # https://chromium-review.googlesource.com/c/chromium/src/+/7858711 + ./patches/chromium-150-rust.patch + ] ++ lib.optionals (!chromiumVersionAtLeast "145" && stdenv.hostPlatform.isAarch64) [ # Reverts decommit pooled pages which causes random crashes of tabs on systems # with page sizes different than 4k. It 'supports' runtime page sizes, but has @@ -676,6 +683,17 @@ let revert = true; hash = "sha256-7xg8IZ2gO+Wtnv7lWLVE3lLpcmMgvtDtcWwUuMBzkrE="; }) + ] + ++ lib.optionals (versionRange "150" "151") [ + # ninja: Entering directory `out/Release' + # ninja: error: 'ar', needed by 'default_for_rust_host_build_tools/obj/build/rust/allocator/liballoc_error_handler_impl.a', missing and no known rule to make it + (fetchpatch { + name = "chromium-150-backport-build--Omit-ar-from-inputs-when-resolved-via--PATH.patch"; + # https://chromium-review.googlesource.com/c/chromium/src/+/7904982 + url = "https://chromium.googlesource.com/chromium/src/+/60f987d8d5f7272793a40290d060b8f50933f825^!?format=TEXT"; + decode = "base64 -d"; + hash = "sha256-MryWxSwBxSIONhl3X1cDxTWwNWy8a4yt/sqkrueSUNs="; + }) ]; postPatch = @@ -910,6 +928,12 @@ let # TODO: remove opt-out of https://chromium.googlesource.com/chromium/src/+/main/docs/modules.md use_clang_modules = false; } + // lib.optionalAttrs (chromiumVersionAtLeast "150") { + # ERROR at //build/modules/BUILD.gn:80:23: Directory does not exist: /usr/include/ + # system_headers += expand_directory("${sysroot}/${root_include_dir}", true) + # ^------------------------------------------------------ + use_unified_system_module = false; + } // { use_qt5 = false; use_qt6 = false; @@ -986,24 +1010,34 @@ let runHook postConfigure ''; - # Chromium expects nightly/bleeding edge rustc features to be available. - # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires - # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to - # enable those features in our stable builds. - env.RUSTC_BOOTSTRAP = 1; - # Mute some warnings that are enabled by default. This is useful because - # our Clang is always older than Chromium's and the build logs have a size - # of approx. 25 MB without this option (and this saves e.g. 66 %). - env.NIX_CFLAGS_COMPILE = - "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow" - # warning: '_LIBCPP_HARDENING_MODE' macro redefined [-Wmacro-redefined] - # because of hardeningDisable = [ "strictflexarrays1" ]; - + lib.optionalString (chromiumVersionAtLeast "149") " -Wno-macro-redefined"; - env.BUILD_CC = "$CC_FOR_BUILD"; - env.BUILD_CXX = "$CXX_FOR_BUILD"; - env.BUILD_AR = "$AR_FOR_BUILD"; - env.BUILD_NM = "$NM_FOR_BUILD"; - env.BUILD_READELF = "$READELF_FOR_BUILD"; + env = { + # Chromium expects nightly/bleeding edge rustc features to be available. + # Our rustc in nixpkgs follows stable, but since bootstrapping rustc requires + # nightly features too, we can (ab-)use RUSTC_BOOTSTRAP here as well to + # enable those features in our stable builds. + RUSTC_BOOTSTRAP = 1; + + # Mute some warnings that are enabled by default. This is useful because + # our Clang is always older than Chromium's and the build logs have a size + # of approx. 25 MB without this option (and this saves e.g. 66 %). + NIX_CFLAGS_COMPILE = + "-Wno-unknown-warning-option -Wno-unused-command-line-argument -Wno-shadow" + # warning: '_LIBCPP_HARDENING_MODE' macro redefined [-Wmacro-redefined] + # because of hardeningDisable = [ "strictflexarrays1" ]; + + lib.optionalString (chromiumVersionAtLeast "149") " -Wno-macro-redefined"; + + BUILD_CC = "$CC_FOR_BUILD"; + BUILD_CXX = "$CXX_FOR_BUILD"; + BUILD_AR = "$AR_FOR_BUILD"; + BUILD_NM = "$NM_FOR_BUILD"; + BUILD_READELF = "$READELF_FOR_BUILD"; + } + // lib.optionalAttrs (chromiumVersionAtLeast "150") { + # [56385/56385] LINK ./chrome + # FAILED: [code=1] chrome + # /nix/store/[...]/bin/ld.lld: line 288: /nix/store/[...]/bin/ld.lld: Argument list too long + NIX_LD_USE_RESPONSE_FILE = 1; + }; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index a4997eb3d576..3c058a84ed64 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -204,7 +204,7 @@ stdenv.mkDerivation { ln -s "$out/bin/chromium" "$out/bin/chromium-browser" mkdir -p "$out/share" - for f in '${chromium.browser}'/share/*; do + for f in '${chromiumWV}'/share/*; do ln -s -t "$out/share/" "$f" done ''; diff --git a/pkgs/applications/networking/browsers/chromium/depot_tools.py b/pkgs/applications/networking/browsers/chromium/depot_tools.py index ab8007a4e910..45f18098ff61 100755 --- a/pkgs/applications/networking/browsers/chromium/depot_tools.py +++ b/pkgs/applications/networking/browsers/chromium/depot_tools.py @@ -43,7 +43,14 @@ class Repo: ) deps_file = self.get_file("DEPS") - evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS") + evaluated = gclient_eval.Parse( + deps_file, + filename="DEPS", + vars_override=repo_vars, + # KeyError: "host_cpu was used as a variable, but was not declared in the vars dict (file 'DEPS', line 114)" + # https://chromium.googlesource.com/webpagereplay.git/+/b2b856131e36c99e9de9c419fe8ca02f857082ba/DEPS#114 + builtin_vars= {"host_cpu": "*host_cpu_placeholder*"} if path == "src/third_party/webpagereplay" else None, + ) repo_vars = dict(evaluated.get("vars", {})) | repo_vars diff --git a/pkgs/applications/networking/browsers/chromium/info.json b/pkgs/applications/networking/browsers/chromium/info.json index 3b348ec2911a..8953f8ecea4b 100644 --- a/pkgs/applications/networking/browsers/chromium/info.json +++ b/pkgs/applications/networking/browsers/chromium/info.json @@ -1,28 +1,27 @@ { "chromium": { - "version": "149.0.7827.114", + "version": "150.0.7871.186", "chromedriver": { - "version": "149.0.7827.115", - "hash_darwin": "sha256-DOhM1knKphvLNyrkf0uvb9NZ3kBwSuVN5hkQLqAZR1Y=", - "hash_darwin_aarch64": "sha256-HXWvAjMdMMbeF8DsgFKNM+S0ZEYr2M8Wj0uUZC7tmxY=" + "version": "150.0.7871.187", + "hash_darwin_aarch64": "sha256-+C3GByBglQ49VI/zJ5PqzYdo1bQUDNmHVtjPWx0A4ks=" }, "deps": { "depot_tools": { - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "gn": { - "version": "0-unstable-2026-05-01", - "rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756", - "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04=" + "version": "0-unstable-2026-05-27", + "rev": "3357c4f51b1a9e676378c695dd9c7e9911c35ee6", + "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "5be7af702aa73ed64f47858cecc86290e42f2a20", - "hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=", + "rev": "0fcdce5f4fdec8d442d7df760cb541f1ca6e446d", + "hash": "sha256-6coAYewN8RC5kx0PmmiV6mXQhLqWF3BZP320PmOcPvw=", "recompress": true }, "src/third_party/clang-format/script": { @@ -32,13 +31,13 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b", - "hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM=" + "rev": "03641f7a5b05e48e318d64369057db577cafc594", + "hash": "sha256-KnWESGG6aI0S+fkJ3/T1x4QSiIYaOOvWUAm6l6l9iME=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "be1c391acca009d8d80535ce924e3d285451cdfa", - "hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc=" + "rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11", + "hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", @@ -47,13 +46,13 @@ }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "71192be150bbe04d87bb5298512d464e38d2f654", - "hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw=" + "rev": "d6c7a21e978f0adaa43accaad53bc64f0b64f6ec", + "hash": "sha256-EuaVSYiR7qrlYqBR0UqdWCvwdzJSn0RS2wC/lnP19AE=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db", - "hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M=" + "rev": "6e5ec6f78d8b9f2e8a50fcc5692d1fc8b2964bde", + "hash": "sha256-qrkx8Z1fc088Ja32obIUPxDwklI7i1wdEw051UZ08u8=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -72,8 +71,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010", - "hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY=" + "rev": "3da515a67f412be05ea1ea6b39832a69aef8f54e", + "hash": "sha256-wrkFsPX7jrsjD/Ow1gna/xLvk0E49m5GVxP1G7Vx7HM=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -82,8 +81,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8", - "hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY=" + "rev": "997d654308b6a1a17435e472ef5190aecb12e3eb", + "hash": "sha256-xgDgW2foZZEWpr0ibSG21kf028FN07/1ecOqFCkNj/I=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -92,8 +91,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642", - "hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI=" + "rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c", + "hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -107,13 +106,18 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b", - "hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI=" + "rev": "01471f4b3846c97eceb5b16b8acad950808791b2", + "hash": "sha256-SrL+G3osTtJGQslfCBEYbslb2kWtHRrwO87PHi+5o6E=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "208ea23596884f6d86476ea88b64e7931cdec08a", - "hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04=" + "rev": "92d1fdf881a932e7aa2a9b20e006136a659c7a20", + "hash": "sha256-llPt+UR8hY0yaJkYmq+A3ZfRRReuaXN09qpap6C28jc=" + }, + "src/third_party/aria-practices/src": { + "url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git", + "rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc", + "hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc=" }, "src/third_party/readability/src": { "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git", @@ -127,13 +131,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "5cfc3832687e3229117203905faf5425ac6bc0d7", - "hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I=" + "rev": "62501cc7db378532d7e85ea434b70d57e1ba2cb0", + "hash": "sha256-5cpKTUnhR+QzQJR4KbAvdvqsWnT1fpH0g9MObv8Nx0c=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf", - "hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I=" + "rev": "d089fc91e7e4881362463faf8efe9ae435e34660", + "hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q=" }, "src/third_party/dawn/third_party/glfw3/src": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -142,8 +146,8 @@ }, "src/third_party/dawn/third_party/directx-shader-compiler/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "d73829d4e677ef00931e8e57de6d544396ab46cb", - "hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w=" + "rev": "35c1b99e9e552267da5efaea07c003e322d65777", + "hash": "sha256-pzBk+jUp/FUV8ahHquE0942Qw/DjAUemSM9fxdFJ0JA=" }, "src/third_party/dawn/third_party/directx-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -152,8 +156,8 @@ }, "src/third_party/dawn/third_party/OpenGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb", - "hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I=" + "rev": "a30033d3e812c9bf10094f1010374a6b15e192eb", + "hash": "sha256-xLacUOSy783bCtv+wUnjVnNLwTQ3eLwUJtYXmELqekY=" }, "src/third_party/dawn/third_party/EGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", @@ -162,8 +166,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4", - "hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ=" + "rev": "f08551b0fc4d6cfa5ba582a0235b571aa363102d", + "hash": "sha256-f5kWMnaod/Ved1Fz/vTkdL0ihSUnNM8XN5Ht3Vs1YpU=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", @@ -187,13 +191,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "65818adf16411ca394625f5747a1af28faf95d2c", - "hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo=" + "rev": "3a9254f16eda7a4c5d2260039ff23456a0a34de4", + "hash": "sha256-JuMnNppWhIFHYfk6ANIZLC7ABhqMseoV5LYV7slevBE=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "afa2870e449ef33ad41545e7670c574cf70926a4", - "hash": "sha256-+N6FPtSiLQmNqf5+x5XDSksrRq/YDVSMVx5Rv1PGjfI=" + "rev": "8ef5673404a3bbc192b0997e1c2df559cc5bd79d", + "hash": "sha256-NplvLz9oET6mhTuBkHH6pZc8qdfhqI7g69eZRCyae0A=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -202,13 +206,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641", - "hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA=" - }, - "src/third_party/catapult/third_party/webpagereplay": { - "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "2852bb7e91e4995502ffb72b7ed21412ee157914", + "hash": "sha256-XYufVvzOXD4voZUWUvumQQqLNsx9sy0QmQzNzrgNEWg=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -227,13 +226,13 @@ }, "src/third_party/cpu_features/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b", - "hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys=" + "rev": "81d13c49649f0714dd41fb56bb246398b6584085", + "hash": "sha256-TrC1WMLAhko57rAyDCiAC/IJ0unAqVhyjkh7gKibyi4=" }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c", - "hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=" + "rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d", + "hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -242,28 +241,28 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f", - "hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA=" + "rev": "1c69e700a01a7fd3dd331f526c8a31ac1e5e49d0", + "hash": "sha256-qIwUs0KVU9xYFLN3UUayPLfz0ObA+EN6owKPW61J/5w=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af", - "hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o=" + "rev": "7d52b4ffbc319a7d5a0e0a0ebff744e5281d60c5", + "hash": "sha256-iwwvvIOuRMo/ZEu8Gk0lZaS4P5uGt8zpnYMChpZPcUo=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", - "rev": "baf176aadedccc44329231d5dd40346874c2a63e", - "hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw=" + "rev": "7b3de17542cc613aaddbfc72c6e12be37eed7b73", + "hash": "sha256-7ly4vaK+Pj4y91t6Q+igQ0890CqKyu9jNBhJnxbNGjI=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361", - "hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0=" + "rev": "ec97cf3bbeea2cb623fbf97c4e3f22f5acb4d568", + "hash": "sha256-kbGcNwpdmqFTIAe/OU3Y1C13ZEHz5OP+QDAExg6tw2g=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -277,8 +276,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "2cf9891537250255f50df5109ffe9e700e2a73de", - "hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o=" + "rev": "662ba79d796a2851b10cdafc6668e45b65b1120f", + "hash": "sha256-6bZFDeo7TqWNunkkQv8OJ+7/hfKwoIUtqZoXaeLp6M8=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -287,18 +286,18 @@ }, "src/third_party/fast_float/src": { "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git", - "rev": "05087a303dad9c98768b33c829d398223a649bc6", - "hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A=" + "rev": "cfd12ebcf1f82c4fd44a950b1815dd0549bc8d89", + "hash": "sha256-hzoB+Mmok3oe6B494uLc5ReWpUcB89zCGPYw4gvanK0=" }, "src/third_party/federated_compute/src": { "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git", - "rev": "3112513bf1a80872311e7718c5385f535a819b89", - "hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU=" + "rev": "8de5837b817f28abc54a387a9417631b905ba90a", + "hash": "sha256-GZYo0FjgW8XCplAi6jzzruwDlIzsWjNEVQuCwXBCPz8=" }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0", - "hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk=" + "rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3", + "hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -327,8 +326,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a", - "hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4=" + "rev": "b08a2eb0dd37f4a6c886fa5b0ecf5b3e1d27aac7", + "hash": "sha256-xnYeUAJx5n8LSg04AknfiudonfmlUdlj8nzHzSZi65I=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -337,13 +336,13 @@ }, "src/third_party/harfbuzz/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "e6741e2205309752839da60ff075b7fa2e7cddd3", - "hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8=" + "rev": "d639197ed529b05c27f38ebaab365a621d5edad5", + "hash": "sha256-uT4zK2hwHzEH6Nrd2rAeyzpQA1TmwtrdcujKYEUbLsY=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd", - "hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k=" + "rev": "0f9c6172b2ccc6b830ae313d522caf09e6933e06", + "hash": "sha256-LF+OcqNeg+KRuYmGuMZb4tmnr53sZHn/ZW1jg9ArPfc=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", @@ -367,8 +366,8 @@ }, "src/third_party/libgav1/src": { "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc", - "hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo=" + "rev": "66ac17620652635392f6ab24065c77b035e281c9", + "hash": "sha256-6/zMaX2DPSKpsaqirhrgi3nL/88Qr2VXacmyL5IyJ3U=" }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", @@ -392,8 +391,8 @@ }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=" + "rev": "d4d072177213b117fb81d4cfda140de090616161", + "hash": "sha256-q+DOwkjRlHacgfWf5UVY02aqfnKK9M/1YRBX6aMce9g=" }, "src/third_party/leveldatabase/src": { "url": "https://chromium.googlesource.com/external/leveldb.git", @@ -407,8 +406,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be", - "hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk=" + "rev": "da27bcae1a8902af1ae6a5c55d3674f22709bbf5", + "hash": "sha256-317zRhJPc0D9A58W8fdCGFmpNZ5vACfd/tlZOsp/Cvw=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -417,18 +416,18 @@ }, "src/third_party/libaddressinput/src": { "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5", - "hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4=" + "rev": "81eb9628382b07d371d8ea0b11badf7de3857fd5", + "hash": "sha256-6yDZpZ+CwxGqNO4+lZLFB6ESREeVku1BoOMtR+hKQ3I=" }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a", - "hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs=" + "rev": "137bcff61e73fdd2836dc04e8258bfb49cef595e", + "hash": "sha256-oDubKvgqMk3w0luM//rR3NnCOk1h/WVTyRkuCmYASrw=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c433c9a32320aed983e4106931596fbbae3f77ee", - "hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q=" + "rev": "5e140b5abb9a91eb25b5ef66d29f6ee784ab7eab", + "hash": "sha256-tN+2YH2O9FTV50o4OVhKcKdwRwTI8NuNA0WqljUcrmo=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", @@ -442,8 +441,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842", - "hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8=" + "rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a", + "hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -482,8 +481,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57", - "hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k=" + "rev": "0abb2efaa3d16db861c9710b193c39e657ac3bdf", + "hash": "sha256-viuntf6umyLZwDR9BXG+ZOakp9f8rvpZYDBYAUkKzL4=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -492,8 +491,8 @@ }, "src/third_party/expat/src": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a", - "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc=" + "rev": "9bdfbc77e3355405ceefbe59420abed953a5657e", + "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU=" }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", @@ -502,8 +501,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "d1f5f2393e0d51f840207342ae86e55a86443288", - "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=" + "rev": "640f254ad0fa03f6b1f29f89b7dd9366f2f6e533", + "hash": "sha256-wor4RTF3/5BFL9EWcGEofY+M4HN2+/KJUaOY+u86K5Q=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -512,8 +511,8 @@ }, "src/third_party/libphonenumber/src": { "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "ade546d8856475d0493863ee270eb3be9628106b", - "hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg=" + "rev": "c25558e39e2bcc9f26f7a2a1ef804324169eaf8f", + "hash": "sha256-Lr/gB5Em+TE092McPwJdOU0Ab4zyP4/2ZxlavMZMm+s=" }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", @@ -537,8 +536,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "640d4ce27ba918783e28a0da46a8a37abe4a65b6", - "hash": "sha256-uCa/MEfw2s05kK91uubi/TqztHulwattzt1vfr0LR4E=" + "rev": "5f00413667d19ad683674524a9d03543d86d188b", + "hash": "sha256-uTteQ+z7t5KOtPuBoZazmonRHd8jGS1/YZAq+RAvhX4=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -552,8 +551,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8", - "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -572,8 +571,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f", - "hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc=" + "rev": "525a09a813be0f75b646ee93fc2a31c27b87d722", + "hash": "sha256-uC6bGxSdz1V2SXIQjMsDd6555b3gAPN1Y0ZQtWoqDww=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -587,8 +586,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e", - "hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE=" + "rev": "37ff938a93cb04c6b77e019b52328c8e9b320317", + "hash": "sha256-M57un/TVQPfTnKScVHS1VK1cUs8F/YPT3TwMVdo+mhM=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -602,13 +601,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "74d747ce1d383caca3ec0e604d77bac35ccd1e58", - "hash": "sha256-qMY6L93hlnMgGZ5Blk5ldDnI/LUXYyuk+b7FXCiVV6s=" + "rev": "c052afb72a08d79a26bcf3103d11f344981b09f1", + "hash": "sha256-zqfErp0pDXHXIvRpZ1TJu2UGXNZjATRbPgQWTniKTJs=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f", - "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38=" + "rev": "9ede949f025303868fa0c42418f122ac47312539", + "hash": "sha256-IRzEqgunO4Nfz+FkYir8G/Ht+Zsn6wpzncgkEFpsC+k=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -617,8 +616,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "a56dcd79c699366e7ac6466792c3025883ff7704", - "hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY=" + "rev": "02460584c6092e527c8b89f7df4de143d70e801f", + "hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -647,13 +646,18 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67", - "hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ=" + "rev": "1aab872af8d44dcf59362d7ba8255922f74fafde", + "hash": "sha256-5/XnNx6Pyk4KBb9krVo9u6i7LWNrsLLOIi4qhEY2PZc=" + }, + "src/third_party/sframe/src": { + "url": "https://chromium.googlesource.com/external/github.com/cisco/sframe", + "rev": "b14090904433bed0d4ec3f875b9b39f3e0555930", + "hash": "sha256-bw+6ycUpnFZJhtXFUzr7XTOljNrs+7oFdVY+LN0Rqek=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "92a56ebeef43061f4878aa869aa1f2160265c24c", - "hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A=" + "rev": "587c5b0f5a7b0260826a0c19094c2d952195066e", + "hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -667,13 +671,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239", - "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg=" + "rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181", + "hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305", - "hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o=" + "rev": "fce27a96526f54c6d31fdccf57629788e3712220", + "hash": "sha256-bmXZLpz3wv7eQWoqTjZmjwnnILWSIjZ8iqo8CeLk5fw=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -682,23 +686,23 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "2216f531fb72119745382c62f232acf9790f4b6e", - "hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI=" + "rev": "999d49c10046e240cd5366d349d3a5f6af16a0d4", + "hash": "sha256-eSqaWXtzZ4Bi9ilaJYGdZamzUjmo+AtDZ9KeZhsc/fY=" }, "src/third_party/litert/src": { "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git", - "rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0", - "hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts=" + "rev": "09b4b05203fd7a9402ffcce9cc736d887ff7e3fc", + "hash": "sha256-skMOzpsn67mmOAp7Mf6UrJdi2lbiQQ8b6kBy4Ik2ED8=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "d234b7b29748c07ef389279dd24f533ebd04cadc", - "hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk=" + "rev": "669a28b1f31f89bfc46b74791f127bcc5e5b2f06", + "hash": "sha256-lsR+sh+XQP/wKgkBbie6Gp+kQNFnnC8TeNWpiWTdevw=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "458ff50a67cb69371850068a62b78f1990a1ff9a", - "hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw=" + "rev": "f6d9303ddaf2e879b9155f7186cd234f5a79079c", + "hash": "sha256-ru3QVyyyqxZRcvSpy9pYhHHhkjuLVhQbgOT/vQJ/oIw=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -707,43 +711,43 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "126038020c2bd47efaa942ccc364ca5353ffccde", - "hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc=" + "rev": "1e770e7de8373a8dd49f23416cf7ca4001d01040", + "hash": "sha256-t8Shkoa90TJt1MbTOefnLaguW4eYKsRFO1Jd0AUc70Y=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f", - "hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q=" + "rev": "b38c4f83024546d4000b2db8e2294cf81b7f26e0", + "hash": "sha256-q5G4B75xBIXl1aG/vzbIDrc3Hs/MFoQ4nwh4ozb8hys=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8", - "hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ=" + "rev": "015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9", + "hash": "sha256-pUxPwFGbOzP8ymTooeA1slFWEFsRoqUROSnndVtLiY8=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "15a84652b94e465e9a7b25eb507193929863bc2f", - "hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84=" + "rev": "cf0cf82ea16c0ff0be75940f282540d6085b2d3b", + "hash": "sha256-uyoysS7lSBNDRfvcwPT+gQqhE20UxiYUEw1UXnYS3fY=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7c46da2b39036a80ce088576d5794bf39e667f56", - "hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw=" + "rev": "e3d18f90c0b8ef1f52539e0674a42f0adfe30381", + "hash": "sha256-Hs9N0FM3eWWjLm4BrDJoZIrsPDVFx0iRAJeQ4gHTM7o=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead", - "hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho=" + "rev": "8383c46b129c2b3a5f3833e602d946d2fcc57e39", + "hash": "sha256-ZBie5uDTVEehxRQW1GZY5Ki/bnp82LoW3jfMUFL0O9A=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "b105d8ea361af258abed65efb5a1565c031dcf1c", - "hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk=" + "rev": "044eaba8a34a6e3bfb1d6aafac7c01068813a2b6", + "hash": "sha256-i3hochkK0LZPg8CsZMFkAL+8tf8QuuwtApAc4FDd0RM=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50", - "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=" + "rev": "7e55b011e16182fc349149abbd3aaf3b1db46421", + "hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -777,18 +781,23 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3", - "hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I=" + "rev": "b507bd117e53db86f2fb52d0d858d3ae7d684a85", + "hash": "sha256-6Y5Z0ErtsZdbuWTHa+PEiOxcZSbjBcnuOHbgtI1/+80=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "b2b856131e36c99e9de9c419fe8ca02f857082ba", + "hash": "sha256-+hcaP7C5Eh3SLl5B8mRgOVdM/tvnFnb/oqUIWPoe0NA=" + }, + "src/third_party/webpagereplay/third_party/clang-format/script": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11", + "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e", - "hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4=" + "rev": "1f975dfd761af6e5d76d28333191973b258d82a8", + "hash": "sha256-ucH+9HBkFyOKEItAWVoYmEzyU7h/UgWIvp/eC/JqGWU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -802,8 +811,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80", - "hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg=" + "rev": "56ac34b3f45fae2eca1f32584f7f0b279be2cf1f", + "hash": "sha256-uw3r5g5rWamlFubBkXDb4KRx3hkOAoQyFo8l95GYGZI=" }, "src/third_party/libei/src": { "url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git", @@ -812,39 +821,44 @@ }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f", - "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg=" + "rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc", + "hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31", - "hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI=" + "rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638", + "hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs=" + }, + "src/agents/shared": { + "url": "https://chromium.googlesource.com/chromium/agents.git", + "rev": "e75efa515896f6bf1dea92eaffbcf8ee711a65d8", + "hash": "sha256-z2GrzF8jDkdfBdq1HP3gTgQpoqjmhc80kEZBmlue0os=" } } }, "ungoogled-chromium": { - "version": "149.0.7827.114", + "version": "150.0.7871.181", "deps": { "depot_tools": { - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "gn": { - "version": "0-unstable-2026-05-01", - "rev": "1740f5c25bcac5a650ee3d1c1ec22bfa25fcd756", - "hash": "sha256-oFs7fZAZEs/gQ7X1A4uigo9+Y+iEN9sMMQYwAjEuD04=" + "version": "0-unstable-2026-05-27", + "rev": "3357c4f51b1a9e676378c695dd9c7e9911c35ee6", + "hash": "sha256-/1A+DkzAQj2zGPe/A/G0Z3VrYJXUxq4Hd/+d/o5p3G8=" }, "ungoogled-patches": { - "rev": "149.0.7827.114-1", - "hash": "sha256-F0pIlZM/EBPLIZxD8jyLX7HWe0vFn2HXs2vkM5+Xplg=" + "rev": "150.0.7871.181-1", + "hash": "sha256-ifqEnOcvi49cFOYan8ShiwteXYnFrLPclrIBZiE1rGY=" }, "npmHash": "sha256-pF0JtwFpPC4/fodbhSJnQKkczA9WlDg4VqEAy9aDVLg=" }, "DEPS": { "src": { "url": "https://chromium.googlesource.com/chromium/src.git", - "rev": "5be7af702aa73ed64f47858cecc86290e42f2a20", - "hash": "sha256-R2vnW3Wa+REar23OhyFWzOo44F8NN9IqH7GjWJ1g1lo=", + "rev": "24b04c927b23c39cf9c5227cc8dc6f64a744c8e9", + "hash": "sha256-F52wmxyNPEV26v8YgAz+MRhyEGyV7YUX+/wj95H4Lf0=", "recompress": true }, "src/third_party/clang-format/script": { @@ -854,13 +868,13 @@ }, "src/third_party/compiler-rt/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/compiler-rt.git", - "rev": "0408cce08083f3d81379ed7d9f5bd26c03e1495b", - "hash": "sha256-kR5osTmp2girvNRVHzEKMZDCelgux9RrRuMoXMCRSGM=" + "rev": "03641f7a5b05e48e318d64369057db577cafc594", + "hash": "sha256-KnWESGG6aI0S+fkJ3/T1x4QSiIYaOOvWUAm6l6l9iME=" }, "src/third_party/libc++/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx.git", - "rev": "be1c391acca009d8d80535ce924e3d285451cdfa", - "hash": "sha256-zKb9PUiiBvhVhWnbQwR8uOFJ9gt3uYmfJ4M9ijpgKRc=" + "rev": "5abc7f839700f0f17338434e1c1c6a8c87c00c11", + "hash": "sha256-vT1km7JgVpotDoNK+ae1gplSHcwrVNLsv/QAFUrDsIM=" }, "src/third_party/libc++abi/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxxabi.git", @@ -869,13 +883,13 @@ }, "src/third_party/libunwind/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind.git", - "rev": "71192be150bbe04d87bb5298512d464e38d2f654", - "hash": "sha256-PxXemxdWZoEavKDOovi67IVWEr2YW8YK2F0LXM3LZPw=" + "rev": "d6c7a21e978f0adaa43accaad53bc64f0b64f6ec", + "hash": "sha256-EuaVSYiR7qrlYqBR0UqdWCvwdzJSn0RS2wC/lnP19AE=" }, "src/third_party/llvm-libc/src": { "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libc.git", - "rev": "deb95b5e48e875920a2eaae799c8dbcd76a6a4db", - "hash": "sha256-oAgIT3+vjBrX86jgi/Pb0SCyco0lozjBjXlrKm6i56M=" + "rev": "6e5ec6f78d8b9f2e8a50fcc5692d1fc8b2964bde", + "hash": "sha256-qrkx8Z1fc088Ja32obIUPxDwklI7i1wdEw051UZ08u8=" }, "src/chrome/test/data/perf/canvas_bench": { "url": "https://chromium.googlesource.com/chromium/canvas_bench.git", @@ -894,8 +908,8 @@ }, "src/docs/website": { "url": "https://chromium.googlesource.com/website.git", - "rev": "c9a9ad55e9ec9934244e58a5a8cab9a295526010", - "hash": "sha256-2GKWEnlExrTzoIYMxeP4n2klLLT/phB5ZVJ5Nj3/aoY=" + "rev": "3da515a67f412be05ea1ea6b39832a69aef8f54e", + "hash": "sha256-wrkFsPX7jrsjD/Ow1gna/xLvk0E49m5GVxP1G7Vx7HM=" }, "src/media/cdm/api": { "url": "https://chromium.googlesource.com/chromium/cdm.git", @@ -904,8 +918,8 @@ }, "src/net/third_party/quiche/src": { "url": "https://quiche.googlesource.com/quiche.git", - "rev": "fafc2fe9efc9f2e28a0815229fc14ca30c266ba8", - "hash": "sha256-4UmjE41MOFCBa3APDMyyJwkeV6LhHl5UsMxZpPRDsRY=" + "rev": "997d654308b6a1a17435e472ef5190aecb12e3eb", + "hash": "sha256-xgDgW2foZZEWpr0ibSG21kf028FN07/1ecOqFCkNj/I=" }, "src/testing/libfuzzer/fuzzers/wasm_corpus": { "url": "https://chromium.googlesource.com/v8/fuzzer_wasm_corpus.git", @@ -914,8 +928,8 @@ }, "src/third_party/angle": { "url": "https://chromium.googlesource.com/angle/angle.git", - "rev": "4b8c7f0f321952bba4f81056b4aa57d0d6428642", - "hash": "sha256-ADG0WfkeFRq4NF0m+s3a/N5+u3q4ApExuWUnV3m5uAI=" + "rev": "edae461ad2122a3a2be0b5d3d067472aa0e3329c", + "hash": "sha256-V4D7jAPJy4llbfJ6WmgCaqaH3TgkWIg5UtRAUaB9dE4=" }, "src/third_party/angle/third_party/glmark2/src": { "url": "https://chromium.googlesource.com/external/github.com/glmark2/glmark2", @@ -929,13 +943,18 @@ }, "src/third_party/angle/third_party/VK-GL-CTS/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/VK-GL-CTS", - "rev": "3fe33a325af90c1c820b1e8109f11ea0f4b60c9b", - "hash": "sha256-JgOdlwtjC5HiCWBAaeM+Ffp9KlbI7+erT0ZRZBlWxXI=" + "rev": "01471f4b3846c97eceb5b16b8acad950808791b2", + "hash": "sha256-SrL+G3osTtJGQslfCBEYbslb2kWtHRrwO87PHi+5o6E=" }, "src/third_party/anonymous_tokens/src": { "url": "https://chromium.googlesource.com/external/github.com/google/anonymous-tokens.git", - "rev": "208ea23596884f6d86476ea88b64e7931cdec08a", - "hash": "sha256-HLUX0mUzA3xcXbw71sIxFBNEkL8x86urcdJH2Yuuy04=" + "rev": "92d1fdf881a932e7aa2a9b20e006136a659c7a20", + "hash": "sha256-llPt+UR8hY0yaJkYmq+A3ZfRRReuaXN09qpap6C28jc=" + }, + "src/third_party/aria-practices/src": { + "url": "https://chromium.googlesource.com/external/github.com/w3c/aria-practices.git", + "rev": "7b134ce6d19497cce8a67db4a9f59980baf853dc", + "hash": "sha256-POnvoO1KfzJj4CbcMPI0pUTRk5EtHLTOyKKmJCZdXOc=" }, "src/third_party/readability/src": { "url": "https://chromium.googlesource.com/external/github.com/mozilla/readability.git", @@ -949,13 +968,13 @@ }, "src/third_party/dav1d/libdav1d": { "url": "https://chromium.googlesource.com/external/github.com/videolan/dav1d.git", - "rev": "5cfc3832687e3229117203905faf5425ac6bc0d7", - "hash": "sha256-MWDDrb8P5AIFszY0u5gCrK+kZlbYffIt9Y1b/thXL7I=" + "rev": "62501cc7db378532d7e85ea434b70d57e1ba2cb0", + "hash": "sha256-5cpKTUnhR+QzQJR4KbAvdvqsWnT1fpH0g9MObv8Nx0c=" }, "src/third_party/dawn": { "url": "https://dawn.googlesource.com/dawn.git", - "rev": "c1179de12ec3ed8feb91e922f12a90ae33f4a8cf", - "hash": "sha256-VFEBqbSsn/3jqRGJgTM/r5DEtfhvTOIfS9fGIKzYo9I=" + "rev": "d089fc91e7e4881362463faf8efe9ae435e34660", + "hash": "sha256-ZcfSMBvdAdEJQv+qfwAe8EFHPAfPtuKLTIR5lDRKP3Q=" }, "src/third_party/dawn/third_party/glfw3/src": { "url": "https://chromium.googlesource.com/external/github.com/glfw/glfw", @@ -964,8 +983,8 @@ }, "src/third_party/dawn/third_party/directx-shader-compiler/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectXShaderCompiler", - "rev": "d73829d4e677ef00931e8e57de6d544396ab46cb", - "hash": "sha256-BIXNgVeF5x3BZWFWZ1Gz+zpNSOEl+hZWB0GgMEaNS2w=" + "rev": "35c1b99e9e552267da5efaea07c003e322d65777", + "hash": "sha256-pzBk+jUp/FUV8ahHquE0942Qw/DjAUemSM9fxdFJ0JA=" }, "src/third_party/dawn/third_party/directx-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/microsoft/DirectX-Headers", @@ -974,8 +993,8 @@ }, "src/third_party/dawn/third_party/OpenGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/OpenGL-Registry", - "rev": "9cb90ca4902d588bef3c830fbb1da484893bd5fb", - "hash": "sha256-mWVORjrbNFINr5WKAIDVnPs2T+96vkxWqZdJwp8oT9I=" + "rev": "a30033d3e812c9bf10094f1010374a6b15e192eb", + "hash": "sha256-xLacUOSy783bCtv+wUnjVnNLwTQ3eLwUJtYXmELqekY=" }, "src/third_party/dawn/third_party/EGL-Registry/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/EGL-Registry", @@ -984,8 +1003,8 @@ }, "src/third_party/dawn/third_party/webgpu-cts": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts", - "rev": "5c6b119c4fa0d9059c45f7637df1fe26fc80a6e4", - "hash": "sha256-9DAdS2u2YtrCFJu0KTuwRJjTUNexFxdmnn7LkwQ+KiQ=" + "rev": "f08551b0fc4d6cfa5ba582a0235b571aa363102d", + "hash": "sha256-f5kWMnaod/Ved1Fz/vTkdL0ihSUnNM8XN5Ht3Vs1YpU=" }, "src/third_party/dawn/third_party/webgpu-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/webgpu-native/webgpu-headers", @@ -1009,13 +1028,13 @@ }, "src/third_party/boringssl/src": { "url": "https://boringssl.googlesource.com/boringssl.git", - "rev": "65818adf16411ca394625f5747a1af28faf95d2c", - "hash": "sha256-tcTTzQnBp8Od1jdDMrFoCr9bnW0OCjGqUjH3QMnusmo=" + "rev": "3a9254f16eda7a4c5d2260039ff23456a0a34de4", + "hash": "sha256-JuMnNppWhIFHYfk6ANIZLC7ABhqMseoV5LYV7slevBE=" }, "src/third_party/breakpad/breakpad": { "url": "https://chromium.googlesource.com/breakpad/breakpad.git", - "rev": "afa2870e449ef33ad41545e7670c574cf70926a4", - "hash": "sha256-+N6FPtSiLQmNqf5+x5XDSksrRq/YDVSMVx5Rv1PGjfI=" + "rev": "8ef5673404a3bbc192b0997e1c2df559cc5bd79d", + "hash": "sha256-NplvLz9oET6mhTuBkHH6pZc8qdfhqI7g69eZRCyae0A=" }, "src/third_party/cast_core/public/src": { "url": "https://chromium.googlesource.com/cast_core/public", @@ -1024,13 +1043,8 @@ }, "src/third_party/catapult": { "url": "https://chromium.googlesource.com/catapult.git", - "rev": "6e4188cabb4f37314ea41e9adfcb2cf9b64e2641", - "hash": "sha256-/kleYYllR22KjxHT2gTMGf6LEUZ1Ud7j593fIIAgqAA=" - }, - "src/third_party/catapult/third_party/webpagereplay": { - "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "2852bb7e91e4995502ffb72b7ed21412ee157914", + "hash": "sha256-XYufVvzOXD4voZUWUvumQQqLNsx9sy0QmQzNzrgNEWg=" }, "src/third_party/ced/src": { "url": "https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git", @@ -1049,13 +1063,13 @@ }, "src/third_party/cpu_features/src": { "url": "https://chromium.googlesource.com/external/github.com/google/cpu_features.git", - "rev": "d3b2440fcfc25fe8e6d0d4a85f06d68e98312f5b", - "hash": "sha256-IBJc1sHHh4G3oTzQm1RAHHahsEECC+BDl14DHJ8M1Ys=" + "rev": "81d13c49649f0714dd41fb56bb246398b6584085", + "hash": "sha256-TrC1WMLAhko57rAyDCiAC/IJ0unAqVhyjkh7gKibyi4=" }, "src/third_party/cpuinfo/src": { "url": "https://chromium.googlesource.com/external/github.com/pytorch/cpuinfo.git", - "rev": "3681f0ce1446167d01dfe125d6db96ba2ac31c3c", - "hash": "sha256-PhWbzQgZSUb3eVyx+JTSnxVOAC2WzL2Dw1I9/6LEIsw=" + "rev": "ea6b9f1bb6e1001d8b21574d5bc78ddef62e499d", + "hash": "sha256-/QsOjDik0TnH3FnK7LOwsJkvX+O+2DRFX4eF3MxD3fc=" }, "src/third_party/crc32c/src": { "url": "https://chromium.googlesource.com/external/github.com/google/crc32c.git", @@ -1064,28 +1078,28 @@ }, "src/third_party/cros_system_api": { "url": "https://chromium.googlesource.com/chromiumos/platform2/system_api.git", - "rev": "7ecd2b41460516ecd7b7d6e5c298db25e1436b6f", - "hash": "sha256-ehbAXv4DZStWDMC3iOjmWkAc4PhAamyI4C9bdXO7FfA=" + "rev": "1c69e700a01a7fd3dd331f526c8a31ac1e5e49d0", + "hash": "sha256-qIwUs0KVU9xYFLN3UUayPLfz0ObA+EN6owKPW61J/5w=" }, "src/third_party/crossbench": { "url": "https://chromium.googlesource.com/crossbench.git", - "rev": "cecd70a5f49f777f603d38d11ac1f66c03c3e8af", - "hash": "sha256-zLwIY8fQVebkfN4KFMbitZODhmiN65JK2s9IG/5Cd+o=" + "rev": "7d52b4ffbc319a7d5a0e0a0ebff744e5281d60c5", + "hash": "sha256-iwwvvIOuRMo/ZEu8Gk0lZaS4P5uGt8zpnYMChpZPcUo=" }, "src/third_party/crossbench-web-tests": { "url": "https://chromium.googlesource.com/chromium/web-tests.git", - "rev": "baf176aadedccc44329231d5dd40346874c2a63e", - "hash": "sha256-oY1/uGB6ykePIklWe35rmJWsnpu/wjkER4TJeP4TTdw=" + "rev": "7b3de17542cc613aaddbfc72c6e12be37eed7b73", + "hash": "sha256-7ly4vaK+Pj4y91t6Q+igQ0890CqKyu9jNBhJnxbNGjI=" }, "src/third_party/depot_tools": { "url": "https://chromium.googlesource.com/chromium/tools/depot_tools.git", - "rev": "45dedc4c3b87c982fd846b3dc599b233ed3aff90", - "hash": "sha256-Ttklyw6IdNeMExlzeiQg/qsCkTmqVhUJ34MFgYmCWD4=" + "rev": "f4fadaf6a5ba1bced9d3d9021060667b563bf583", + "hash": "sha256-3atvbwYnFTA40MonAxSQWkF58Jku7O7fUzelGPQvDyY=" }, "src/third_party/devtools-frontend/src": { "url": "https://chromium.googlesource.com/devtools/devtools-frontend", - "rev": "33c2f401a9c8ddad2159eb0ab83aa244a5247361", - "hash": "sha256-M9aULI+HECgA0ptAG47OPK0QuB+xzmb29iOtJ3whpB0=" + "rev": "ec97cf3bbeea2cb623fbf97c4e3f22f5acb4d568", + "hash": "sha256-kbGcNwpdmqFTIAe/OU3Y1C13ZEHz5OP+QDAExg6tw2g=" }, "src/third_party/dom_distiller_js/dist": { "url": "https://chromium.googlesource.com/chromium/dom-distiller/dist.git", @@ -1099,8 +1113,8 @@ }, "src/third_party/eigen3/src": { "url": "https://chromium.googlesource.com/external/gitlab.com/libeigen/eigen.git", - "rev": "2cf9891537250255f50df5109ffe9e700e2a73de", - "hash": "sha256-1bu1Y9itHIKcwY5J0sF08DSyfElLHiZ6SRsNZkFjz8o=" + "rev": "662ba79d796a2851b10cdafc6668e45b65b1120f", + "hash": "sha256-6bZFDeo7TqWNunkkQv8OJ+7/hfKwoIUtqZoXaeLp6M8=" }, "src/third_party/farmhash/src": { "url": "https://chromium.googlesource.com/external/github.com/google/farmhash.git", @@ -1109,18 +1123,18 @@ }, "src/third_party/fast_float/src": { "url": "https://chromium.googlesource.com/external/github.com/fastfloat/fast_float.git", - "rev": "05087a303dad9c98768b33c829d398223a649bc6", - "hash": "sha256-ZQm8kDMYdwjKugc2vBG5mwTqXa01u6hODQc/Tai2I9A=" + "rev": "cfd12ebcf1f82c4fd44a950b1815dd0549bc8d89", + "hash": "sha256-hzoB+Mmok3oe6B494uLc5ReWpUcB89zCGPYw4gvanK0=" }, "src/third_party/federated_compute/src": { "url": "https://chromium.googlesource.com/external/github.com/google-parfait/federated-compute.git", - "rev": "3112513bf1a80872311e7718c5385f535a819b89", - "hash": "sha256-jnG3PCxjaYcClRgzOfIkHbbD3xU9TDLyQR3VZUwHIgU=" + "rev": "8de5837b817f28abc54a387a9417631b905ba90a", + "hash": "sha256-GZYo0FjgW8XCplAi6jzzruwDlIzsWjNEVQuCwXBCPz8=" }, "src/third_party/ffmpeg": { "url": "https://chromium.googlesource.com/chromium/third_party/ffmpeg.git", - "rev": "f45bab87ce4c5fafc67fd53fcde777578d01bfa0", - "hash": "sha256-fsZSqmG6vFOPJYuBgG6OSWkzRu27B3mv/PqAP8s4ARk=" + "rev": "ad41607c61898cf7150e0fb20fe4bbabd44922a3", + "hash": "sha256-41qpsOTedB51WMzzHXDiXA19OIzA7wG/Qgbz6IkmWpk=" }, "src/third_party/flac": { "url": "https://chromium.googlesource.com/chromium/deps/flac.git", @@ -1149,8 +1163,8 @@ }, "src/third_party/freetype/src": { "url": "https://chromium.googlesource.com/chromium/src/third_party/freetype2.git", - "rev": "b6bcd2177f72bb4842c7701d7b7f633bb3fc951a", - "hash": "sha256-TUz3yUD9HxqUMCOpLk74rEf8J0tMTh4ZCuD94AD4+q4=" + "rev": "b08a2eb0dd37f4a6c886fa5b0ecf5b3e1d27aac7", + "hash": "sha256-xnYeUAJx5n8LSg04AknfiudonfmlUdlj8nzHzSZi65I=" }, "src/third_party/fxdiv/src": { "url": "https://chromium.googlesource.com/external/github.com/Maratyszcza/FXdiv.git", @@ -1159,13 +1173,13 @@ }, "src/third_party/harfbuzz/src": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "e6741e2205309752839da60ff075b7fa2e7cddd3", - "hash": "sha256-XjUuY17fcZi+dIZFojq+eDsDVrBxtAWRydPdudt56+8=" + "rev": "d639197ed529b05c27f38ebaab365a621d5edad5", + "hash": "sha256-uT4zK2hwHzEH6Nrd2rAeyzpQA1TmwtrdcujKYEUbLsY=" }, "src/third_party/ink/src": { "url": "https://chromium.googlesource.com/external/github.com/google/ink.git", - "rev": "a988417b6d0b1ea03fb0b40269fbc42313acc6fd", - "hash": "sha256-6O+N/ULn8sqsdgFw7VZ7TMjWvCAZbYo398PruPScU/k=" + "rev": "0f9c6172b2ccc6b830ae313d522caf09e6933e06", + "hash": "sha256-LF+OcqNeg+KRuYmGuMZb4tmnr53sZHn/ZW1jg9ArPfc=" }, "src/third_party/instrumented_libs": { "url": "https://chromium.googlesource.com/chromium/third_party/instrumented_libraries.git", @@ -1189,8 +1203,8 @@ }, "src/third_party/libgav1/src": { "url": "https://chromium.googlesource.com/codecs/libgav1.git", - "rev": "40f58ed32ff39071c3f2a51056dbc49a070af0dc", - "hash": "sha256-gisU0p0HDL7Po/ZXIIZVOTnxnOuVvSE/FYo9DaEUFfo=" + "rev": "66ac17620652635392f6ab24065c77b035e281c9", + "hash": "sha256-6/zMaX2DPSKpsaqirhrgi3nL/88Qr2VXacmyL5IyJ3U=" }, "src/third_party/googletest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/googletest.git", @@ -1214,8 +1228,8 @@ }, "src/third_party/jsoncpp/source": { "url": "https://chromium.googlesource.com/external/github.com/open-source-parsers/jsoncpp.git", - "rev": "42e892d96e47b1f6e29844cc705e148ec4856448", - "hash": "sha256-bSLNcoYBz3QCt5VuTR056V9mU2PmBuYBa0W6hFg2m8Q=" + "rev": "d4d072177213b117fb81d4cfda140de090616161", + "hash": "sha256-q+DOwkjRlHacgfWf5UVY02aqfnKK9M/1YRBX6aMce9g=" }, "src/third_party/leveldatabase/src": { "url": "https://chromium.googlesource.com/external/leveldb.git", @@ -1229,8 +1243,8 @@ }, "src/third_party/fuzztest/src": { "url": "https://chromium.googlesource.com/external/github.com/google/fuzztest.git", - "rev": "e24a91020ab19c3d6f590bd0911b7acb492f81be", - "hash": "sha256-wFjuvJzGEaal+pIo5UtkdLHYTpoWxRE6Vf5OGLObGQk=" + "rev": "da27bcae1a8902af1ae6a5c55d3674f22709bbf5", + "hash": "sha256-317zRhJPc0D9A58W8fdCGFmpNZ5vACfd/tlZOsp/Cvw=" }, "src/third_party/domato/src": { "url": "https://chromium.googlesource.com/external/github.com/googleprojectzero/domato.git", @@ -1239,18 +1253,18 @@ }, "src/third_party/libaddressinput/src": { "url": "https://chromium.googlesource.com/external/libaddressinput.git", - "rev": "e20690c8d5178bb282641d5eb06ef0298ff4cbc5", - "hash": "sha256-rX7LQNUgk5ZljUrayD1a/SUrBrvpomW0Cs0KBw3lYu4=" + "rev": "81eb9628382b07d371d8ea0b11badf7de3857fd5", + "hash": "sha256-6yDZpZ+CwxGqNO4+lZLFB6ESREeVku1BoOMtR+hKQ3I=" }, "src/third_party/libaom/source/libaom": { "url": "https://aomedia.googlesource.com/aom.git", - "rev": "33dba9e12a9f12e737eaa7c2624e8c580950a89a", - "hash": "sha256-01DbV0kQFg1yyFpVeo82KBoZHhizA7xnZ1qOuu4HTcs=" + "rev": "137bcff61e73fdd2836dc04e8258bfb49cef595e", + "hash": "sha256-oDubKvgqMk3w0luM//rR3NnCOk1h/WVTyRkuCmYASrw=" }, "src/third_party/crabbyavif/src": { "url": "https://chromium.googlesource.com/external/github.com/webmproject/CrabbyAvif.git", - "rev": "c433c9a32320aed983e4106931596fbbae3f77ee", - "hash": "sha256-yw1cXB6s6biD2vj2K/3sVbKiaNK7bt+NkbQovbYlJ2Q=" + "rev": "5e140b5abb9a91eb25b5ef66d29f6ee784ab7eab", + "hash": "sha256-tN+2YH2O9FTV50o4OVhKcKdwRwTI8NuNA0WqljUcrmo=" }, "src/third_party/nearby/src": { "url": "https://chromium.googlesource.com/external/github.com/google/nearby-connections.git", @@ -1264,8 +1278,8 @@ }, "src/third_party/jetstream/main": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", - "rev": "de88e36ae91d5bd13126fa4cc4b0e0346d779842", - "hash": "sha256-ZpU0ONqIVmY2VR0MxqtYj8KPNlK0L21gLJuT/Ff7KI8=" + "rev": "b7babdf323e64e69bd2f6c376189c15825f5c73a", + "hash": "sha256-s6UMdUYWZqk/MbhyCi2zdQNgni98gGsYxcuUh/5AUy0=" }, "src/third_party/jetstream/v2.2": { "url": "https://chromium.googlesource.com/external/github.com/WebKit/JetStream.git", @@ -1304,8 +1318,8 @@ }, "src/third_party/cros-components/src": { "url": "https://chromium.googlesource.com/external/google3/cros_components.git", - "rev": "e580888fcc1c108e25c218ccf8b7a4372de18d57", - "hash": "sha256-p0Wfvhg/j8v9xL9Pueo7xPVHBKowOLI00AeIZXPQw4k=" + "rev": "0abb2efaa3d16db861c9710b193c39e657ac3bdf", + "hash": "sha256-viuntf6umyLZwDR9BXG+ZOakp9f8rvpZYDBYAUkKzL4=" }, "src/third_party/libdrm/src": { "url": "https://chromium.googlesource.com/chromiumos/third_party/libdrm.git", @@ -1314,8 +1328,8 @@ }, "src/third_party/expat/src": { "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", - "rev": "f31adfd584b7f6c50bbf4d22eb928538ffc9145a", - "hash": "sha256-tLz4RejYQ/kFXhsWTduuGcinfUkqxYKPCpsou+WlvBc=" + "rev": "9bdfbc77e3355405ceefbe59420abed953a5657e", + "hash": "sha256-veGg5/QjtBSmxYa8IyHF0NxEdJzlcJSZfzw8ay3ASVU=" }, "src/third_party/libipp/libipp": { "url": "https://chromium.googlesource.com/chromiumos/platform2/libipp.git", @@ -1324,8 +1338,8 @@ }, "src/third_party/libjpeg_turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "d1f5f2393e0d51f840207342ae86e55a86443288", - "hash": "sha256-KGeB/lTjhm8DQBDZVSPENvZEGSHeLTkviJrYsFh5vEM=" + "rev": "640f254ad0fa03f6b1f29f89b7dd9366f2f6e533", + "hash": "sha256-wor4RTF3/5BFL9EWcGEofY+M4HN2+/KJUaOY+u86K5Q=" }, "src/third_party/liblouis/src": { "url": "https://chromium.googlesource.com/external/liblouis-github.git", @@ -1334,8 +1348,8 @@ }, "src/third_party/libphonenumber/src": { "url": "https://chromium.googlesource.com/external/libphonenumber.git", - "rev": "ade546d8856475d0493863ee270eb3be9628106b", - "hash": "sha256-cLtsM35Ir3iG3j8+Cy2McL1ysRB0Y1PXealAKl05Twg=" + "rev": "c25558e39e2bcc9f26f7a2a1ef804324169eaf8f", + "hash": "sha256-Lr/gB5Em+TE092McPwJdOU0Ab4zyP4/2ZxlavMZMm+s=" }, "src/third_party/libprotobuf-mutator/src": { "url": "https://chromium.googlesource.com/external/github.com/google/libprotobuf-mutator.git", @@ -1359,8 +1373,8 @@ }, "src/third_party/libvpx/source/libvpx": { "url": "https://chromium.googlesource.com/webm/libvpx.git", - "rev": "640d4ce27ba918783e28a0da46a8a37abe4a65b6", - "hash": "sha256-uCa/MEfw2s05kK91uubi/TqztHulwattzt1vfr0LR4E=" + "rev": "5f00413667d19ad683674524a9d03543d86d188b", + "hash": "sha256-uTteQ+z7t5KOtPuBoZazmonRHd8jGS1/YZAq+RAvhX4=" }, "src/third_party/libwebm/source": { "url": "https://chromium.googlesource.com/webm/libwebm.git", @@ -1374,8 +1388,8 @@ }, "src/third_party/libyuv": { "url": "https://chromium.googlesource.com/libyuv/libyuv.git", - "rev": "644251f252a84bf8ce91ff0aca86a9b16b069ab8", - "hash": "sha256-DsoOY8bg0sPOF8tF67Gk7fRqdQzG1hc9fVMlZVjKWU4=" + "rev": "8aeb3a9ca36341a640528e59b34b5d641080dca8", + "hash": "sha256-FGl0xK7ooaRFzFBxuV6oOu3h1x2b/myLLO2En3xgVCk=" }, "src/third_party/lss": { "url": "https://chromium.googlesource.com/linux-syscall-support.git", @@ -1394,8 +1408,8 @@ }, "src/third_party/nasm": { "url": "https://chromium.googlesource.com/chromium/deps/nasm.git", - "rev": "358842b6b7dd69b2ed635bef17f941e030a05e5f", - "hash": "sha256-YwjwubijMZ9OvYeMUVMSunWZ2VCuqUFEOyv/MK/oojc=" + "rev": "525a09a813be0f75b646ee93fc2a31c27b87d722", + "hash": "sha256-uC6bGxSdz1V2SXIQjMsDd6555b3gAPN1Y0ZQtWoqDww=" }, "src/third_party/neon_2_sse/src": { "url": "https://chromium.googlesource.com/external/github.com/intel/ARM_NEON_2_x86_SSE.git", @@ -1409,8 +1423,8 @@ }, "src/third_party/openscreen/src": { "url": "https://chromium.googlesource.com/openscreen", - "rev": "684bcd767271a21f3e5d475b17a0fd862f16c65e", - "hash": "sha256-Yjz2E1/h+zp7L2x0zE0l+ktQIiSrJ4ZknXOhaVPKQVE=" + "rev": "37ff938a93cb04c6b77e019b52328c8e9b320317", + "hash": "sha256-M57un/TVQPfTnKScVHS1VK1cUs8F/YPT3TwMVdo+mhM=" }, "src/third_party/openscreen/src/buildtools": { "url": "https://chromium.googlesource.com/chromium/src/buildtools", @@ -1424,13 +1438,13 @@ }, "src/third_party/pdfium": { "url": "https://pdfium.googlesource.com/pdfium.git", - "rev": "74d747ce1d383caca3ec0e604d77bac35ccd1e58", - "hash": "sha256-qMY6L93hlnMgGZ5Blk5ldDnI/LUXYyuk+b7FXCiVV6s=" + "rev": "c052afb72a08d79a26bcf3103d11f344981b09f1", + "hash": "sha256-zqfErp0pDXHXIvRpZ1TJu2UGXNZjATRbPgQWTniKTJs=" }, "src/third_party/perfetto": { "url": "https://chromium.googlesource.com/external/github.com/google/perfetto.git", - "rev": "97c58a94bb6495c4e202467fb1c55eaa22b5670f", - "hash": "sha256-qtClkWAluLDRZn7yrHLU7qp9szP+/WsiG5JZZzRKd38=" + "rev": "9ede949f025303868fa0c42418f122ac47312539", + "hash": "sha256-IRzEqgunO4Nfz+FkYir8G/Ht+Zsn6wpzncgkEFpsC+k=" }, "src/third_party/protobuf-javascript/src": { "url": "https://chromium.googlesource.com/external/github.com/protocolbuffers/protobuf-javascript", @@ -1439,8 +1453,8 @@ }, "src/third_party/pthreadpool/src": { "url": "https://chromium.googlesource.com/external/github.com/google/pthreadpool.git", - "rev": "a56dcd79c699366e7ac6466792c3025883ff7704", - "hash": "sha256-WfyuPfII4eSmLskZV0TAcu4K6OyW38TjkDHm+VUx5eY=" + "rev": "02460584c6092e527c8b89f7df4de143d70e801f", + "hash": "sha256-4EHJzZT+Gbhs8SkOhjSvDIPEqIQU93oJmtF3c/T+qjw=" }, "src/third_party/pyelftools": { "url": "https://chromium.googlesource.com/chromiumos/third_party/pyelftools.git", @@ -1469,13 +1483,18 @@ }, "src/third_party/search_engines_data/resources": { "url": "https://chromium.googlesource.com/external/search_engines_data.git", - "rev": "2345fee6ce4ae24d9c365d5c0884ece593c55c67", - "hash": "sha256-5qkra6FURaMvEOk+ZKMRH1hc8ixEnk3u4rxNm0G8tuQ=" + "rev": "1aab872af8d44dcf59362d7ba8255922f74fafde", + "hash": "sha256-5/XnNx6Pyk4KBb9krVo9u6i7LWNrsLLOIi4qhEY2PZc=" + }, + "src/third_party/sframe/src": { + "url": "https://chromium.googlesource.com/external/github.com/cisco/sframe", + "rev": "b14090904433bed0d4ec3f875b9b39f3e0555930", + "hash": "sha256-bw+6ycUpnFZJhtXFUzr7XTOljNrs+7oFdVY+LN0Rqek=" }, "src/third_party/skia": { "url": "https://skia.googlesource.com/skia.git", - "rev": "92a56ebeef43061f4878aa869aa1f2160265c24c", - "hash": "sha256-QEY9Wy2guRuS4CXeXHUhUNigCJWWndnNCbWQmaSYJ/A=" + "rev": "587c5b0f5a7b0260826a0c19094c2d952195066e", + "hash": "sha256-COvdvWVfafVhccLIj2dJzu62Rbyi3oDgORtjIGolCRo=" }, "src/third_party/smhasher/src": { "url": "https://chromium.googlesource.com/external/smhasher.git", @@ -1489,13 +1508,13 @@ }, "src/third_party/sqlite/src": { "url": "https://chromium.googlesource.com/chromium/deps/sqlite.git", - "rev": "508ab21dc25702ed6690c4dd77da209a6bcd1239", - "hash": "sha256-SfvLfBKdPjFvZ7CzUeFMcyoHdCzQgNRQwZyzb6MRtJg=" + "rev": "fc121d7d03cd6cbf499ec06a5112b263471b1181", + "hash": "sha256-hf9PxQhXEKT49GbkFYCvRPBT0Qu+hDnDpebI92yO1Oo=" }, "src/third_party/swiftshader": { "url": "https://swiftshader.googlesource.com/SwiftShader.git", - "rev": "f9d5d49a3c599a315e3493dc1e9b5309cffb3305", - "hash": "sha256-kBfqgXXJeEPT80mu6CJ2Bwmdv/y8jVzM6TedMXbzo4o=" + "rev": "fce27a96526f54c6d31fdccf57629788e3712220", + "hash": "sha256-bmXZLpz3wv7eQWoqTjZmjwnnILWSIjZ8iqo8CeLk5fw=" }, "src/third_party/text-fragments-polyfill/src": { "url": "https://chromium.googlesource.com/external/github.com/GoogleChromeLabs/text-fragments-polyfill.git", @@ -1504,23 +1523,23 @@ }, "src/third_party/tflite/src": { "url": "https://chromium.googlesource.com/external/github.com/tensorflow/tensorflow.git", - "rev": "2216f531fb72119745382c62f232acf9790f4b6e", - "hash": "sha256-zySLNPmug5HS5pwJ/lEMAWjjZSOuxdTgup7Y90k7NZI=" + "rev": "999d49c10046e240cd5366d349d3a5f6af16a0d4", + "hash": "sha256-eSqaWXtzZ4Bi9ilaJYGdZamzUjmo+AtDZ9KeZhsc/fY=" }, "src/third_party/litert/src": { "url": "https://chromium.googlesource.com/external/github.com/google-ai-edge/LiteRT.git", - "rev": "9b5418dd7a1a318eed20395743dcc868df17d8b0", - "hash": "sha256-80amwDPF3RrcoTaTQsunNmlvBGs6KCv369FW3J/Xcts=" + "rev": "09b4b05203fd7a9402ffcce9cc736d887ff7e3fc", + "hash": "sha256-skMOzpsn67mmOAp7Mf6UrJdi2lbiQQ8b6kBy4Ik2ED8=" }, "src/third_party/vulkan-deps": { "url": "https://chromium.googlesource.com/vulkan-deps", - "rev": "d234b7b29748c07ef389279dd24f533ebd04cadc", - "hash": "sha256-w49HOjPixSI/C5IGlxQMj/Ol9f/Lr2zI2oMhQzzu1zk=" + "rev": "669a28b1f31f89bfc46b74791f127bcc5e5b2f06", + "hash": "sha256-lsR+sh+XQP/wKgkBbie6Gp+kQNFnnC8TeNWpiWTdevw=" }, "src/third_party/glslang/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/glslang", - "rev": "458ff50a67cb69371850068a62b78f1990a1ff9a", - "hash": "sha256-2WauVjAEeZn16b4fE4ImKPX3wjDmeN92mqWi3NMiXSw=" + "rev": "f6d9303ddaf2e879b9155f7186cd234f5a79079c", + "hash": "sha256-ru3QVyyyqxZRcvSpy9pYhHHhkjuLVhQbgOT/vQJ/oIw=" }, "src/third_party/spirv-cross/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Cross", @@ -1529,43 +1548,43 @@ }, "src/third_party/spirv-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Headers", - "rev": "126038020c2bd47efaa942ccc364ca5353ffccde", - "hash": "sha256-QBX2M+ZSWgVvCx58NeDIdf6mIkdJbecDktBfUWGPvNc=" + "rev": "1e770e7de8373a8dd49f23416cf7ca4001d01040", + "hash": "sha256-t8Shkoa90TJt1MbTOefnLaguW4eYKsRFO1Jd0AUc70Y=" }, "src/third_party/spirv-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/SPIRV-Tools", - "rev": "2ec8457ab33d539b6f1fecc998360c0b8b05ed4f", - "hash": "sha256-9TBb/gnDXgZRZXhF27KEQ0XQI5itRHKJQjLrkFDQq7Q=" + "rev": "b38c4f83024546d4000b2db8e2294cf81b7f26e0", + "hash": "sha256-q5G4B75xBIXl1aG/vzbIDrc3Hs/MFoQ4nwh4ozb8hys=" }, "src/third_party/vulkan-headers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Headers", - "rev": "f6a6f7ab165cedbfa2a7d0c93fe27a2d01ce09c8", - "hash": "sha256-ZbjmxbRUiVJADNRWziCH0UIM09qKf+lm9PRnWOhZFhQ=" + "rev": "015e25c3c91b70eb1a754d36fb14c4ba6ad9b0b9", + "hash": "sha256-pUxPwFGbOzP8ymTooeA1slFWEFsRoqUROSnndVtLiY8=" }, "src/third_party/vulkan-loader/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Loader", - "rev": "15a84652b94e465e9a7b25eb507193929863bc2f", - "hash": "sha256-pdC3YCM0Nzeabi5TPD+qR5PVdsxmWMnf2L9HsOcbv84=" + "rev": "cf0cf82ea16c0ff0be75940f282540d6085b2d3b", + "hash": "sha256-uyoysS7lSBNDRfvcwPT+gQqhE20UxiYUEw1UXnYS3fY=" }, "src/third_party/vulkan-tools/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Tools", - "rev": "7c46da2b39036a80ce088576d5794bf39e667f56", - "hash": "sha256-nAyNVveeGg9sA0E37YiEPm+UdKsy48nAOjnUYHQnuqw=" + "rev": "e3d18f90c0b8ef1f52539e0674a42f0adfe30381", + "hash": "sha256-Hs9N0FM3eWWjLm4BrDJoZIrsPDVFx0iRAJeQ4gHTM7o=" }, "src/third_party/vulkan-utility-libraries/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-Utility-Libraries", - "rev": "2c909c1ab6f9c6caba39a84a4887186b3fafdead", - "hash": "sha256-k3xeKHQbd2rTQJsOZKXEMPrYjcHwoCC1N12F6AIP6Ho=" + "rev": "8383c46b129c2b3a5f3833e602d946d2fcc57e39", + "hash": "sha256-ZBie5uDTVEehxRQW1GZY5Ki/bnp82LoW3jfMUFL0O9A=" }, "src/third_party/vulkan-validation-layers/src": { "url": "https://chromium.googlesource.com/external/github.com/KhronosGroup/Vulkan-ValidationLayers", - "rev": "b105d8ea361af258abed65efb5a1565c031dcf1c", - "hash": "sha256-GgznBGYgnCFMNaqAOQ15dlw2dOFfSp3mAV2KokVLzgk=" + "rev": "044eaba8a34a6e3bfb1d6aafac7c01068813a2b6", + "hash": "sha256-i3hochkK0LZPg8CsZMFkAL+8tf8QuuwtApAc4FDd0RM=" }, "src/third_party/vulkan_memory_allocator": { "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator.git", - "rev": "cb0597213b0fcb999caa9ed08c2f88dc45eb7d50", - "hash": "sha256-yBCs3zfqs/60htsZAOscjcyKhVbAWE6znweuXcs1oKo=" + "rev": "7e55b011e16182fc349149abbd3aaf3b1db46421", + "hash": "sha256-fOnFkcQDEGIe5yB507qnP9nA1LBBPFblncNiJ8JxAwI=" }, "src/third_party/wayland/src": { "url": "https://chromium.googlesource.com/external/anongit.freedesktop.org/git/wayland/wayland.git", @@ -1599,18 +1618,23 @@ }, "src/third_party/webgpu-cts/src": { "url": "https://chromium.googlesource.com/external/github.com/gpuweb/cts.git", - "rev": "3b327ebc44f11212fd3872972a6dd394634fb9e3", - "hash": "sha256-RSZVKv2Z0pg2cGa3Elr2r5VZqdxlRJ+6mzm1Au1qg1I=" + "rev": "b507bd117e53db86f2fb52d0d858d3ae7d684a85", + "hash": "sha256-6Y5Z0ErtsZdbuWTHa+PEiOxcZSbjBcnuOHbgtI1/+80=" }, "src/third_party/webpagereplay": { "url": "https://chromium.googlesource.com/webpagereplay.git", - "rev": "b7ac48f52cd298e966a76eb054412915c3e445d4", - "hash": "sha256-smtwB6vzLgCAePz0jNfrpm8TxrxBnBkigLxERhxUEvE=" + "rev": "b2b856131e36c99e9de9c419fe8ca02f857082ba", + "hash": "sha256-+hcaP7C5Eh3SLl5B8mRgOVdM/tvnFnb/oqUIWPoe0NA=" + }, + "src/third_party/webpagereplay/third_party/clang-format/script": { + "url": "https://chromium.googlesource.com/external/github.com/llvm/llvm-project/clang/tools/clang-format.git", + "rev": "6eddfb5ec5f92127a531eda66c568d3a11e7ec11", + "hash": "sha256-Cm6BOOlEyD0kdYxMSmk6Fj1Dnfs3zCzXsm+BOXgBme0=" }, "src/third_party/webrtc": { "url": "https://webrtc.googlesource.com/src.git", - "rev": "e8b4d4c5952a8fb7b35c2a6cba4e8c3de2ea2e1e", - "hash": "sha256-94U9URlFGLYe94KCFU0giY9bBbrHNDCBr9GEwbRbOK4=" + "rev": "1f975dfd761af6e5d76d28333191973b258d82a8", + "hash": "sha256-ucH+9HBkFyOKEItAWVoYmEzyU7h/UgWIvp/eC/JqGWU=" }, "src/third_party/wuffs/src": { "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", @@ -1624,8 +1648,8 @@ }, "src/third_party/xnnpack/src": { "url": "https://chromium.googlesource.com/external/github.com/google/XNNPACK.git", - "rev": "2ad25fc09167df69c6c02eb8082a0b9658dd5e80", - "hash": "sha256-vBMGBXzJPCcsc2kMyGecjti68oZHWUwJKd7tkKub6kg=" + "rev": "56ac34b3f45fae2eca1f32584f7f0b279be2cf1f", + "hash": "sha256-uw3r5g5rWamlFubBkXDb4KRx3hkOAoQyFo8l95GYGZI=" }, "src/third_party/libei/src": { "url": "https://chromium.googlesource.com/external/gitlab.freedesktop.org/libinput/libei.git", @@ -1634,13 +1658,18 @@ }, "src/third_party/zstd/src": { "url": "https://chromium.googlesource.com/external/github.com/facebook/zstd.git", - "rev": "3ae099b48dfcfe02b1b3ba81ab85457f8a922e9f", - "hash": "sha256-futF0sM6z9HAl6AMJwUULBRByN92FTBjRIzYb2vBFGg=" + "rev": "5233c58e6ca0b1c4c6b353ad79649191ed195bdc", + "hash": "sha256-vEl0s7Mjh+5rciOMxm99PNWiamtCk+sTN4lRYKCIZ+8=" }, "src/v8": { "url": "https://chromium.googlesource.com/v8/v8.git", - "rev": "16ef80c1f5d3cfade812bd1743952a4cfd480a31", - "hash": "sha256-GI0NWA0XYGocxZp3+lPen6BkwaG7X3EDaEWM9rejgkI=" + "rev": "49df3678d1b6a1511167b15a6b7499d3ab37a638", + "hash": "sha256-T9FWX3zuP1V7wvxeHgv2MEfRiwbJC0ElI3eazSYq3fs=" + }, + "src/agents/shared": { + "url": "https://chromium.googlesource.com/chromium/agents.git", + "rev": "e75efa515896f6bf1dea92eaffbcf8ee711a65d8", + "hash": "sha256-z2GrzF8jDkdfBdq1HP3gTgQpoqjmhc80kEZBmlue0os=" } } } diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch new file mode 100644 index 000000000000..113097a87be8 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-rust.patch @@ -0,0 +1,21 @@ +diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn +index e1da11405c1f667280099ee815abc5349d1ad1bd..202992dbbe1c2a70eb6d8b559568d388f98b28f6 100644 +--- a/build/config/compiler/BUILD.gn ++++ b/build/config/compiler/BUILD.gn +@@ -1678,16 +1678,6 @@ config("runtime_library") { + configs += [ "//build/config/c++:runtime_library" ] + } + +- # Rust and C++ both provide intrinsics for LLVM to call for math operations. +- # We want to use the C++ intrinsics, not the ones in the Rust +- # compiler_builtins library. The Rust symbols are marked as weak, so that they +- # can be replaced by the C++ symbols. This config ensures the C++ symbols +- # exist and are strong in order to cause that replacement to occur by +- # explicitly linking in clang's compiler-rt library. +- if (is_clang && !(is_a_target_toolchain && is_cronet_build)) { +- configs += [ "//build/config/clang:compiler_builtins" ] +- } +- + # TODO(crbug.com/40570904): Come up with a better name for is POSIX + Fuchsia + # configuration. + if (is_posix || is_fuchsia) { diff --git a/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch new file mode 100644 index 000000000000..84926ab177b3 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/patches/chromium-150-widevine-disable-auto-download-allow-bundle.patch @@ -0,0 +1,27 @@ +diff --git a/third_party/widevine/cdm/BUILD.gn b/third_party/widevine/cdm/BUILD.gn +index 6d18f9fa163718d95610de9b6229dd38478543c7..93884543edcaa7211f4a7d61175bc068c6fd7dd4 100644 +--- a/third_party/widevine/cdm/BUILD.gn ++++ b/third_party/widevine/cdm/BUILD.gn +@@ -19,7 +19,7 @@ buildflag_header("buildflags") { + + flags = [ + "ENABLE_WIDEVINE=$enable_widevine", +- "BUNDLE_WIDEVINE_CDM=$bundle_widevine_cdm", ++ "BUNDLE_WIDEVINE_CDM=true", + "ENABLE_WIDEVINE_CDM_COMPONENT=$enable_widevine_cdm_component", + "ENABLE_MEDIA_FOUNDATION_WIDEVINE_CDM=$enable_media_foundation_widevine_cdm", + ] +diff --git a/third_party/widevine/cdm/widevine.gni b/third_party/widevine/cdm/widevine.gni +index 927b2e4809cf76e6b3ef51ee6cd2bbd04a92d60b..41761d10a4105a20fc4acf35f761c7ab23f867dd 100644 +--- a/third_party/widevine/cdm/widevine.gni ++++ b/third_party/widevine/cdm/widevine.gni +@@ -40,8 +40,7 @@ enable_library_widevine_cdm = + # Widevine CDM can be deployed as a component. Currently only supported on + # desktop platforms. The CDM can be bundled regardless whether it's a + # component. See below. +-enable_widevine_cdm_component = +- enable_library_widevine_cdm && (is_win || is_mac || is_linux || is_chromeos) ++enable_widevine_cdm_component = false + + # Enable (Windows) Media Foundation Widevine CDM component. + declare_args() { diff --git a/pkgs/applications/networking/browsers/chromium/update.mjs b/pkgs/applications/networking/browsers/chromium/update.mjs index 9aab0753db78..c3652f161d5e 100755 --- a/pkgs/applications/networking/browsers/chromium/update.mjs +++ b/pkgs/applications/networking/browsers/chromium/update.mjs @@ -170,7 +170,6 @@ async function fetch_chromedriver_binaries(version) { const url = (platform) => `https://storage.googleapis.com/chrome-for-testing-public/${version}/${platform}/chromedriver-${platform}.zip` return { version, - hash_darwin: await prefetch(url('mac-x64')), hash_darwin_aarch64: await prefetch(url('mac-arm64')), } } diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 947166188ad2..88d59af1aa81 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -39,9 +39,7 @@ let i686-linux = "linux-i686"; x86_64-linux = "linux-x86_64"; aarch64-linux = "linux-aarch64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; arch = mozillaPlatforms.${stdenv.hostPlatform.system}; diff --git a/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix b/pkgs/applications/networking/browsers/firefox-bin/release_sources.nix index 08a1a43785b9..4b3517b7bae6 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 = "151.0.4"; + version = "153.0"; sources = [ { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ach/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ach/firefox-153.0.tar.xz"; locale = "ach"; arch = "linux-x86_64"; - sha256 = "239e586b8d30af758163a6893d9734111b92573130795992be5996ad7eef9238"; + sha256 = "baee94e03a1981c1d94540bdf3a76437e9620edccec0490907edcdb041b2b15d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/af/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/af/firefox-153.0.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "f7cc68084015fb622ae64749977a453e4449955fee9a144d6b65b7322f053b7a"; + sha256 = "af98691ea9d4a7ae5896c4067ee6b1d22fcf60213a66d7339ba9449cbca7e9bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/an/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/an/firefox-153.0.tar.xz"; locale = "an"; arch = "linux-x86_64"; - sha256 = "4452f4579146ae8bd1b6996f29035a792d0bb93d2791d6c82452c5b115610708"; + sha256 = "ec5e5b285b3f1273a292e0c747af06f08caa2542f05efa01553aca900fbc1fe3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ar/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ar/firefox-153.0.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "feb34c02f109e8baaf496cbac0427328921899a9b9676333fbe3148cff8479f9"; + sha256 = "e0708eeb9201e418b974fb2c7dfadfc1f463ac3826db79a4a8c8db9e6673cdea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ast/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ast/firefox-153.0.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7c4f40a56f71cd1b4af4e98db2d2466bebdda8b8952005d8acdda7985508ea45"; + sha256 = "5461424207414c50b78890cdab3cf386bc71a5e4641b565540583f45b7531e22"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/az/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/az/firefox-153.0.tar.xz"; locale = "az"; arch = "linux-x86_64"; - sha256 = "0c7fcd9410d9c7db885c3f50cb861004397886c96e1f0af999bdb02f6307dca2"; + sha256 = "d0dd2ee2d543bd171ccd6b7c66ac2583216992674894e61ac83a5ea92e9dcbd8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/be/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/be/firefox-153.0.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "ab0d253699c0fcbb9734e3ad060cbbc7a19edaaf8abb291f9ad35c9c96896d62"; + sha256 = "db717cc3797a98817f8be6674cf1d989cedd07f4e0b27e69683bcb8064673ad0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bg/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/bg/firefox-153.0.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "77a4d058ab8cb9d1f63622723b37a4a6b81cba50a71cc7e94cda26a9de2ce0f7"; + sha256 = "cf8cb970ba0ec0a080b9b85bf7f6b495290e94b2850f69dc531cf42032f2c03c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/bn/firefox-153.0.tar.xz"; locale = "bn"; arch = "linux-x86_64"; - sha256 = "4770c8158da2c7c2808ff13e431cb0164172a1ad6ce1bfcc900ac2960621a68e"; + sha256 = "ac7664a6675205ef8f4618b67e4e26e97de7b73ca8de3da4350b5fccd1f62c21"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/br/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/br/firefox-153.0.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "4994cbd8ccd2d68d4cb6d10db26df6d37a0ee4b138e4b6aa654515fd19619a9a"; + sha256 = "b02f566850dc23d6df22e114eca73f35ea12fc71add221d8a2cfbc782c9c1e7c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/bs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/bs/firefox-153.0.tar.xz"; locale = "bs"; arch = "linux-x86_64"; - sha256 = "c977928fcf18369e9cc1e34843cd62393daf818f95944d32d20c0cc954cd4d1b"; + sha256 = "d6bcdf510be3a114e92f4771708acc545884d2be3909cc1eee1a39ca601b22c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ca-valencia/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ca-valencia/firefox-153.0.tar.xz"; locale = "ca-valencia"; arch = "linux-x86_64"; - sha256 = "38c934332d748ee9233dcb036ce1835cd969b386a34610b4ba27eec021d00284"; + sha256 = "8775f5c9dd1ab55e2572bf86a8eb27e8f587dfb0220ec73897dff0d067d7a5b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ca/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ca/firefox-153.0.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "b1b90cc7b6c7ba214c886e10e486726a4d4521747af640eb72d9e6ac1b223478"; + sha256 = "27751e52faf788cf9a19a417e1e87f4eb21be01c15b46393022bf63db88ed4fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cak/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/cak/firefox-153.0.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "1ee199865a35fd34b3f572a2b1334f331ae6f80b369fb3c087c54029b6745db0"; + sha256 = "aa611f6a3deeaa48129fb40b592dcff3e070e14e143d850bb5d6afb44f6b62c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/cs/firefox-153.0.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "397d8e62e80061cf7d857cb1057bcfc05babf530d99755fe730de6930d3aaae0"; + sha256 = "9d09c9967ba1068efaa316cfb65dd75b5746634d7f34682481e6129a907bf2aa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/cy/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/cy/firefox-153.0.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "8216dcaec6e3f0f9defeea937ab0f7d8aed3c20bc013d608e1ffb8652aa8d5e7"; + sha256 = "7f9af6a436f8a8dc3a304534ba902a23fc0f7c1b85d3a014fce3bc5393ccf682"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/da/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/da/firefox-153.0.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "b99997b5a3b1e8929ff5ac5170b1636a2aa1877bd82d4533f61d89ae70dc1dc7"; + sha256 = "001c2c9a17e2b98b4c994414bd5d0f2015eb4fbc20e5be708bdef05ec1e991fd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/de/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/de/firefox-153.0.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "12cb34cadcc246fe831f08e3d1b8a8dd64be4007d7d936adcdd604c4500dabcd"; + sha256 = "51034fa489d62616a208634435b469f04b7cdd86d4281823e6e28c525f98166b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/dsb/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/dsb/firefox-153.0.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "da06a8d0f551b6e84bd273c2c55aa2c231f18870ef5fb2c15713879f757f45bf"; + sha256 = "b15c72a61ed97fc1eebefb595f3ff9a43939ae87bcb7555fdff6b6dff969d7bb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/el/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/el/firefox-153.0.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "721e70e7c708a5c71afb5645f3f4b45882de39377a965aefb11dd1a825665c27"; + sha256 = "d6b2e6d21b872435466c2416c8f1f3274bebb676c67e29f6108e2f2497d0e3d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-CA/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/en-CA/firefox-153.0.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "abc5ad597445d84f54e0b64b490c511c68ff8bb26ebe373ab75a49abe6366465"; + sha256 = "9158479291de4cf684c7a03e583dccfdeb31c73f5af6d6aa11db3e02c6a9aba8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-GB/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/en-GB/firefox-153.0.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6d5839c2efe1d2e3546ac17e771f8ff007dd6aedc55dacf9df863f8fa9e363e1"; + sha256 = "38adb3ae51df0fd599a43bf29274a01c4bf40a4b848ccbf4df508454dd55841b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/en-US/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/en-US/firefox-153.0.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "5fa872cb4845a52829fa58568c2901edcbda4b79ce466b4b9b09afe41cffcd9b"; + sha256 = "bfc57e7b6b4e6204b11e7e03c4b93cff708e9fb37f6b9948be243455311d82ee"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/eo/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/eo/firefox-153.0.tar.xz"; locale = "eo"; arch = "linux-x86_64"; - sha256 = "13e7b1992205a8bbcea8a3c4c8dab09226459e962f5e40f34038e59cf7322c84"; + sha256 = "0f5e3844b403c1f72f8e1cf1103647b9973d588148beb5df099bdfe72fba8c93"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-AR/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/es-AR/firefox-153.0.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "b2d0bf9dac50fb8874107fe56055ea742e9508ac6f87dfefdd455116b3b117fc"; + sha256 = "df7adcf9a9787e1f9340f6246902b5115ab58890502fa9ca560c1e01ade62dc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-CL/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/es-CL/firefox-153.0.tar.xz"; locale = "es-CL"; arch = "linux-x86_64"; - sha256 = "97c265491171b493fa3ba7989f35fac556b474935e695b6011d02fab3b44176c"; + sha256 = "3a738ef12c8d3bab3335ac61b5de37ed6417ef7a306b63131f5406c0ebc2c861"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-ES/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/es-ES/firefox-153.0.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "81f0b699d18f88cfb7746d6ff256b80f18cc1de0e2fb1200986ac2bb9853d1b8"; + sha256 = "1aa845adbf772c60b144eb86865c6dc51200000493cb163c7e15018a3f5e147a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/es-MX/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/es-MX/firefox-153.0.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "8344bd79f6d98e0d058e0aa941cd8ac2b5cff2924f1f19a6f69d71b58cb075d4"; + sha256 = "a52f3ea26bf51a1dc533635289ccb897a93afa9fae01f2256fe67ab991282c3c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/et/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/et/firefox-153.0.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "7b95f81d52ee59f9f593079b1bf9cf3cb178ac8105d0ee26b7da1c642fd2c89e"; + sha256 = "ed434ecc7f24b0a15bfc68b989042f01e5d48ec1b23546ea9f83419ce914c792"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/eu/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/eu/firefox-153.0.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "2e602d0c0e93e941fdecf3a4077ae1242d78692a7b4698ee0acd5fd6ccc832fe"; + sha256 = "b560c1929f2596b048681dc4fdc55327c64c27bcd3133df69b60b02167698b75"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fa/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/fa/firefox-153.0.tar.xz"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "938b24ee51e07e64a4a6043b355dc5e583aa29c97c3342e61c63cb203bce8361"; + sha256 = "bb16f2bf57d357c563e79c98601cd454cc67f02ae71097f8c1fc799ff5fa8600"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ff/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ff/firefox-153.0.tar.xz"; locale = "ff"; arch = "linux-x86_64"; - sha256 = "0ef584148b7678895d1dbb196e34d8c0f698157c90b59602a7d58e2c1cbda326"; + sha256 = "57d27facfcc28a40fb0b6442a375578977b8827c571d1eaaf972a2334327663e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fi/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/fi/firefox-153.0.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "2d874871d85119426b0f2abd44288d410695bf1923b6f7dc8754d3a29b46db47"; + sha256 = "f2c70af42e52be18bac9045c066713de3b0d00ff9308107827003e34631d03b8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/fr/firefox-153.0.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "8bf00a047fb12cdd58065cc6ba51521c058cfaa9fbfc750c83838d0b03d1b0f5"; + sha256 = "1244b7167482f4964fac9dc67ab3ea50ebea9e41b835196d9db91310632e4523"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fur/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/fur/firefox-153.0.tar.xz"; locale = "fur"; arch = "linux-x86_64"; - sha256 = "90d4e8e2f5033c83653efc5f48fc39a391c7b3760d318ee4378eadf373671e67"; + sha256 = "6aaf4b43dc8ea00aa1e8fea5dfec14e0cc7216e2d6081541014da47cc7887425"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/fy-NL/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/fy-NL/firefox-153.0.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "3deb92769480435283a394601f1b8d24998f37bc52fae06b204ba468084503dc"; + sha256 = "8199180ef7633541555af1504b81abf3d12fce0db6400f6de11f83eeac898fc3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ga-IE/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ga-IE/firefox-153.0.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "d417883b6d77a9908bc807d2249e6492c1c6a6c63c70a95bd58a4754127aeb86"; + sha256 = "d4257d18a350c5f57a3779053aa10bdc00b4a0eb7fe7550651332f6d53b7fb2c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gd/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/gd/firefox-153.0.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "c8c1222f6b301631afb6d6ced425d81535ed11bedc83463216d2b36019b51830"; + sha256 = "d38e95625591a70e2d711c913d44b806a0da29b0ac22f8e3d857dfa9a39dd7eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/gl/firefox-153.0.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "21e9ac44b0abb9885ffb97c56c885153bc826c376373c5ca3886fbb97842f6ee"; + sha256 = "662453ff1ed0784b359b09e99ba7b88c012f19a8d5baf25ab6b654454b1b9578"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/gn/firefox-153.0.tar.xz"; locale = "gn"; arch = "linux-x86_64"; - sha256 = "115525969ac0425d983a95bbcb1184bc0655b899efd6e75a0ce16c8a3b4fdb1e"; + sha256 = "cf0e016f8a975245ddf8294f48ef2d7d7241a546b51c615d49074843d537e8f9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/gu-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/gu-IN/firefox-153.0.tar.xz"; locale = "gu-IN"; arch = "linux-x86_64"; - sha256 = "2990959f8cfa15b3340b2c38722a6d8dab25bff4ea4b60e2218fcea91a2c1e92"; + sha256 = "2711604911a4d94f36beed3035b7d8a8cdcb5aa408ad974edce5c941dbd0682a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/he/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/he/firefox-153.0.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "a122be5612000f5fc821d800dd2b5d4dc76ac9d1399f409de0812612c1653999"; + sha256 = "00fd70cbe17b03af0ed33888c3cc24a9ffc36a99c05612848f15ef230e3bd7c8"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hi-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/hi-IN/firefox-153.0.tar.xz"; locale = "hi-IN"; arch = "linux-x86_64"; - sha256 = "2b59ee424191c3dc14a6ba4dca8d2e2f4ada98324f81ba03aa471ed59e491c00"; + sha256 = "a6e4f7e139d6c637c752d5bbbeafeb3e27fdc9c7456a860818b815a8c1952e90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/hr/firefox-153.0.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "8ad4320ee62c1017fe9038dd4702826e62ef4a60bc06e5d8aa0084e63074f2ab"; + sha256 = "042dda11e5508028d083013990eb723b975fe74a4e3ca75c626882e2d60b1ff4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hsb/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/hsb/firefox-153.0.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0a6c4ea8e2efab955933a4aa697502244a838daa73d1ea12becab37aec37cf4d"; + sha256 = "ee68c20b6af083e2efbf98c8f245d79f600f2ad7d623a7b33bc8b254f1355223"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hu/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/hu/firefox-153.0.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "4a6b64fd8c730991e307b794a8efd40e05cabb338ef48aac79347114fbaeac62"; + sha256 = "b2f758885087a12a2dc22e1079b2653d021f56f3103e6d0394f5c15ea7fc9cac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/hy-AM/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/hy-AM/firefox-153.0.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "b392f16280bf9977cd1de1f5b451cce4887a991920b67fb1ff05e014dcdc1e12"; + sha256 = "141bfb0e3771bee7b0284e0600893ebdff1a64d2eb25359825c39ea4e584b939"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ia/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ia/firefox-153.0.tar.xz"; locale = "ia"; arch = "linux-x86_64"; - sha256 = "afb8de469c0be4f7544a6477c66e610ae8c11150c494581777b92528878a8e1a"; + sha256 = "59f55f5e51a5e1eec8478e1157ba7658c8e44ccaa1622a075892cdebad88ef99"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/id/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/id/firefox-153.0.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "6e42cec538a69f74f0c558d23b63d7500c05789efc78774329f74e0d53363974"; + sha256 = "f2d525259e158c4a67c9fc613431d3875d703f0f0961c064937a06fae924516a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/is/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/is/firefox-153.0.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "fb3cc4371c5a57d99d8636c5c6fc3810f21a1ec88f6f3c11a30b2c097cd7af4e"; + sha256 = "40717297334e0668c3c70c010cf3e02e652cc5316c015ea3073260e50f6147e0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/it/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/it/firefox-153.0.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "64b0e2f041ddb7e3cd63c5e2128634d67661348f988990813de3b1c03c791bba"; + sha256 = "3a4b0da68bab65373d9f63cc1c2f8aef56936929905a69adacfcbc2c1c21735b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ja/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ja/firefox-153.0.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "a69b5156f3a825920952df1cf1d689b2465ea755d38a39fa14f73763a9d060e7"; + sha256 = "ec380b072b368635037912ae82e69fedc0b9f20a84704ed9d84b0acf634be381"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ka/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ka/firefox-153.0.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "b23ad11801254bd60a02b7eff122b7372dd25cd5b26b0544b8402e68c6082e5d"; + sha256 = "62732e447af2aef150e853685c5910d9cadeb378fe8b3daf2259be27acdeb898"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kab/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/kab/firefox-153.0.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f833c910ab36dd8e48e9865dfba85028a4f075938bb0b72697a78d54c8ba384e"; + sha256 = "a794a72d0f3d5bbcfcf4359958f2f1f170ccbdd345b99a1ad54e136fcaaee361"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/kk/firefox-153.0.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0977ea48d98834f23df941cd4a949b5cf6c3df2dd1a93b1c3b27a63c8135b584"; + sha256 = "cec4422654262f833c938dadc146182176e0b32d8eb2431f540023817920351c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/km/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/km/firefox-153.0.tar.xz"; locale = "km"; arch = "linux-x86_64"; - sha256 = "61145917a4f3f3ef6aaca76c448b45755ab0f99b653b1a04aec3f816629c7c82"; + sha256 = "9dd97fa90b245f9810b5cc525cc2283a525b0d822f5c7d34d108159dec1bd9ba"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/kn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/kn/firefox-153.0.tar.xz"; locale = "kn"; arch = "linux-x86_64"; - sha256 = "12e15bb2fb1284d60bc9677a8bff5114860757cb6436813af758ffb56d464c13"; + sha256 = "af43cc4adc9640e43f567abafd275a3bcd19f2657f2df81779b1f556a6fec49c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ko/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ko/firefox-153.0.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "5e531c64c897fc78c894a5c072c3b1f1746a5dee4dca58fc733591fed481d5cb"; + sha256 = "b74f524f140cc5edcc601b3d30ad1cacb482c3b6277341f310984d9dfc0a96d4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lij/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/lij/firefox-153.0.tar.xz"; locale = "lij"; arch = "linux-x86_64"; - sha256 = "46381c13c6ffb5e274c700f8596e6c96f32ff2b6e7b028dba7254d437d249705"; + sha256 = "880c3ff335a6a42ceb2b9bd02563d7aa27d84d833128e1b6f6d3563495448841"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lt/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/lt/firefox-153.0.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "367161d330271d03ab006fa4a388c3506313010688291d2ab380ddce2e3e7cc3"; + sha256 = "3ea646f6b4f75608b3eac7abdc53550a62af67885191e66756b332517db5309c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/lv/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/lv/firefox-153.0.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "bb6e468fa954e55f0ff7be00becefefb153c74d6fa9772d75e221efc39443637"; + sha256 = "1ad560f1a1b76e54f6bfa89a9f1dead4d2d92ba37b67ac92c932145ca0433085"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/mk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/mk/firefox-153.0.tar.xz"; locale = "mk"; arch = "linux-x86_64"; - sha256 = "7546a51c35a0cca092a2173bb11a130c3538de3f39c2805cd8c78df93b1822b1"; + sha256 = "f6f381a1e3601dc9068393df1b7b283dfce89fd61a4b5d6a5c6cdf2cf6b4d9f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/mr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/mr/firefox-153.0.tar.xz"; locale = "mr"; arch = "linux-x86_64"; - sha256 = "0430c34b5ab543c758202b9e20825dbb801e32ac79b6ceee507237f2ba942a71"; + sha256 = "e840dd1620b206e3ed026d95f275c8dfa4967b937c4f10ff5d32b30f745960c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ms/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ms/firefox-153.0.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "4fa461bd9f1b1afb1deab7f1acb758ce9af57fe5e5cc217eb14656a5cd3dccbe"; + sha256 = "8a72e3a1b60540ef75ed0c548856a453912ad3b77ea3a8ed05fe4c526da6d976"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/my/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/my/firefox-153.0.tar.xz"; locale = "my"; arch = "linux-x86_64"; - sha256 = "880d7c9428876a0d160c1912032ed8de5948055e75ecd8dc686dc8edcbe2f633"; + sha256 = "a56c48a3380af7ed1d078188d92256d5d2300e7f65e7a735d1b99afef6c7acb5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nb-NO/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/nb-NO/firefox-153.0.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "2b7f7c6525855bb81c6f6c35a8a98d83888b3e4392ce6c814298234c4ddccaa9"; + sha256 = "e5e9b8b00762c699462cb4f5c1492145b6df24671e28082f06169de6633902a6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ne-NP/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ne-NP/firefox-153.0.tar.xz"; locale = "ne-NP"; arch = "linux-x86_64"; - sha256 = "88f21e16d1b6e075f87a3d6ce79d9187be02590f38ffd219a2080bbf78f4e12f"; + sha256 = "4a2a2b7350caaa2071cba8efcf76dcc8277ed66042abfb6b1bfdfe355609aeda"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/nl/firefox-153.0.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "55fab1471b8bf19ddbab5c5c01d3e190d61658d598aa6142f80f2d0dd4a5e9b2"; + sha256 = "1dc825c88176cacedda739f97a420becd762e857bc5bca69854ff11014303813"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/nn-NO/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/nn-NO/firefox-153.0.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "110e35c48fb3e24e2dc028906133726441ec56fb79b0d702b3c632b8ece33e7b"; + sha256 = "ead19ef5c40aa58022ea9b464182ff2bf53d21acaeb5c59c744872f08bbd81c1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/oc/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/oc/firefox-153.0.tar.xz"; locale = "oc"; arch = "linux-x86_64"; - sha256 = "073f3c525754a003551c86663beebb2fc9a139c1d3b67ca3a1ff5f4056e02880"; + sha256 = "cff4422669a00c69179475b2567b1df5cbcf97c2144a28786b3c13a561ffaeea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pa-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/pa-IN/firefox-153.0.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "9059a6e36bffe39d447f275385c25a38b9dd117671a917086dce559093d3af9f"; + sha256 = "63f75b10d1cb060e42eb7b33007dd4104e005e5d838372e737ef2ba4f219ec8c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/pl/firefox-153.0.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "b8d82d1546c2de3e750c620361bdcd014a6efcfc6827ab2376b37ab610dc899b"; + sha256 = "94d7ce2eb0bb672391dc33fcf58df6f9ff1e1b7b9767c306fb1b8afbd632ca62"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pt-BR/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/pt-BR/firefox-153.0.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "cb84e8d322d29c1ff21c085a433fc2f59883e7af135a27271f6b0d317ae14a3b"; + sha256 = "c283c16df2e149bf9b76b3fae02a13c64fd6a745e96ed344379392cf85ad93c6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/pt-PT/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/pt-PT/firefox-153.0.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "3c2fee42dc1706437775f48b486920cafc8b99f394c7d995e8f83f4653ef2f29"; + sha256 = "d4da2efcca42ef38f24d42bd2ca580353c9dfbbd989c6360faee83a7bfbeeace"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/rm/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/rm/firefox-153.0.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "664eff14b84169f13c64548d1d0789d03e4da5c7fefaca587fbcaee6cb321417"; + sha256 = "6a49f8a1517b5bf7c13ac4f7fb8014a134e972ad5acb95f42d7f086e4fc3457f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ro/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ro/firefox-153.0.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "8b17c14de1a069026495c00d86044d5b1fce816740d2117359c4db1ca8b253be"; + sha256 = "eee9c733aec7d140849e4259e566b695cca06d94bb2d464575a6909d81fafba4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ru/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ru/firefox-153.0.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "87e93998790b98eecc2781f1d0b73c85fbc9ef21addceea66a561d6aeb11c07c"; + sha256 = "94d884963112d7367d3191b81e0bc9d042608fb5a90ca7d4c4be62ca54a218f5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sat/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sat/firefox-153.0.tar.xz"; locale = "sat"; arch = "linux-x86_64"; - sha256 = "5da3172c2663dc85288b45e4d3e76af1122be8b7744922e95f062b9621e54045"; + sha256 = "ea1fa1fd0b2e2f7f6734afce1a84bc08d5d6a842de731f4812fd3810fa23f809"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sc/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sc/firefox-153.0.tar.xz"; locale = "sc"; arch = "linux-x86_64"; - sha256 = "7e46dd591dcfbaf30da7f5513a7e6ad66671ddfc18eac4d82ae6a10b68effeb0"; + sha256 = "48fa3b7e7c2e486a1ac7d4a14cd966b1e1fe77481dc5b3bb8c9f94b572ec0b6d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sco/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sco/firefox-153.0.tar.xz"; locale = "sco"; arch = "linux-x86_64"; - sha256 = "3238b6c0f8103bf25298a5df64e6969fe203e72b60407147efd2115f33bdc552"; + sha256 = "8aa477472addbc7932f68409f74500b502bac586269b734a09c572a6e76ee2ca"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/si/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/si/firefox-153.0.tar.xz"; locale = "si"; arch = "linux-x86_64"; - sha256 = "4b3c3cc0634cc640db0a174ad07ae5c35c74da107a23919bf8c0aa176b4eff87"; + sha256 = "0a8afcc80a522a249b862f28fd7efd6d27415b3d6abf6fd75b96a5eb38dd6aea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sk/firefox-153.0.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d61d02c09ef8d554b0412d59902a1da092ba35fedf0bf97f05fa7b9000b9422c"; + sha256 = "dd2631df9e08e7864bc3cc3af840ed74ae73be9ab3d921675411acfafe885a7d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/skr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/skr/firefox-153.0.tar.xz"; locale = "skr"; arch = "linux-x86_64"; - sha256 = "4de00a9ac21dbac4008b2be38890e2f56a0f5f7b97ebabaf5b8e755278ecd432"; + sha256 = "a92e47a7dddf36be7a327d551d0a6ad53f5010f5a824bdb5cc76a06c71512905"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sl/firefox-153.0.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "a695b7dbe92b22c3eff265ad3f95bbc8b2baf3597e3fa70287a65ea32b909bd8"; + sha256 = "a2b17a96b925c60f1c1d142025c99ec6754949105ea04964657503fc2e2b32b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/son/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/son/firefox-153.0.tar.xz"; locale = "son"; arch = "linux-x86_64"; - sha256 = "45c93b4d2f1096b34a1df3a09fa6d1ea09827a32348c4ef9882016f8b602a69f"; + sha256 = "ef9b175acbb118dee10007ffdf2bf79a4949594a031b56716638e89c166dfdd2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sq/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sq/firefox-153.0.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "85a50059a4ed730c2353e674f995668828a5f660aca46dd6d4f8cc166da79652"; + sha256 = "0eac57abdb5a42681210cd5c7db202addee1553a6d147374dd38c27cd309b131"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sr/firefox-153.0.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "7e0cc7694b3f5686c8b11a5bc9419b4668ca95251d22656b37062cac675434bf"; + sha256 = "2fd12659d39ac650fb673d4d552a5e2e283e67d00bfb9d4142d154bc506ed6ac"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/sv-SE/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/sv-SE/firefox-153.0.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "d5ecbc202eaec32036a8bb6d6d7df39bf53ccbc4506c27c282d88cf3c27094e9"; + sha256 = "035126a903d61973fb38d6c00c6ed269824a287b48cc21cdfaca250fe5e341a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/szl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/szl/firefox-153.0.tar.xz"; locale = "szl"; arch = "linux-x86_64"; - sha256 = "554256a3e6d316dafbba75f4019d80a154f6f06ebf4e47c2403d87daaedefd3a"; + sha256 = "3f5a34268bdbcaeb55cc5f101b009b93db62ba004ca319910581b644414ff07a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ta/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ta/firefox-153.0.tar.xz"; locale = "ta"; arch = "linux-x86_64"; - sha256 = "2932599e7f7ea4c4fb5081b6ecc13e48b00045ef1b35efb3c87c2e515d62bf73"; + sha256 = "a307017b94dcb71634a635c1837d0de457c271085e1e879ab6ca1a835a046e96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/te/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/te/firefox-153.0.tar.xz"; locale = "te"; arch = "linux-x86_64"; - sha256 = "eee28745d2cf06d93ad2471241ded63c695cb926be07490f5d324ee0bb3476db"; + sha256 = "6df5db1113a33b037976ad860d7c6f7dce1cb95a258f211c33a0869204985359"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tg/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/tg/firefox-153.0.tar.xz"; locale = "tg"; arch = "linux-x86_64"; - sha256 = "5db058056434892cfecd6d2fe7e416623c612e4e7f67c0e8241f7adb00899a21"; + sha256 = "abbaacda8bd76f4f6633801b3f39cdf2552ca851fabf4870f034d8cbbdac0b7a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/th/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/th/firefox-153.0.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0a570b70825cdadef9812ec3a7733b0a2f4241c789cd81dbe8d5da939caf8f09"; + sha256 = "a4417b3f6db045996976b8d7bba4e75f81e0219afe6e4aee52455a97d640640e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/tl/firefox-153.0.tar.xz"; locale = "tl"; arch = "linux-x86_64"; - sha256 = "f76dc8d34852a5c2ed9e52dccbcc6cf68e2b661d05800ce726f7b3dffb5e06db"; + sha256 = "451d27e33f7bb17c85cbff1f641d44035e7c082494b22bcabf969a1da2a5ed24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/tr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/tr/firefox-153.0.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "553226c673a4f015ce05c1412a06a8a3493fd42ac67539624a60c93e3d88c811"; + sha256 = "f5f2cd225cc31bbad11d51112a2b9c8bae2160c2774868242767d7b6c365bb50"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/trs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/trs/firefox-153.0.tar.xz"; locale = "trs"; arch = "linux-x86_64"; - sha256 = "5eb9902019c6688732d4eeaf6077efd6fd97ed70169fe6e9323c822aa6125894"; + sha256 = "22f673e645a9b2a60923597a1cc3e860867edaaa3d742d28697563419fe64616"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/uk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/uk/firefox-153.0.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "4ae67bb1127387879acfefd49f973a4c52d70c26412fe2195be070db0f220cee"; + sha256 = "2d4ede02763e6fcf59ddcb31d6c33271bf390c6d0328dcd213b61aab43332c74"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/ur/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/ur/firefox-153.0.tar.xz"; locale = "ur"; arch = "linux-x86_64"; - sha256 = "a368812f3872b26004558e71f5344cf8730f5676cd6791dab86d1a8d2f5058fb"; + sha256 = "440c977e61df55d690428a329787db9c127529c1d54efaf88dd28420263b8f48"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/uz/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/uz/firefox-153.0.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "8b034ef77df66121dd424c561f107fdec1b26bcfe873cb042718fa152d23ca44"; + sha256 = "56f127b9f88f9de5ddac07abf900acbf70dfb4c1ee9418e71b58642294c4e05e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/vi/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/vi/firefox-153.0.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "0efdbfc744486392ba48171c8cc119402d98ba0071488c2496f0feef2a072ef5"; + sha256 = "ebbad6f671c0411f6741ec5da32d182b6391a2617a36100530306b5b67916509"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/xh/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/xh/firefox-153.0.tar.xz"; locale = "xh"; arch = "linux-x86_64"; - sha256 = "07e9ee8230d48bf8511b817c4fb7ca99f06ca23ad03a454b10c793355b846a78"; + sha256 = "e2312a314a75d6de41d96c6e7f3f4502cb9e7902bb7d5674cd12936d210c51de"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/zh-CN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/zh-CN/firefox-153.0.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "097d12b4892658712913f4c59578b3ed78692061816190d47cd521f2452e232b"; + sha256 = "b7ad44c3ed3b1d5b735c53f6b6eac8e03317d63a8dfc471a98bf0472960662c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-x86_64/zh-TW/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-x86_64/zh-TW/firefox-153.0.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "89621bb75479b7f30fbcca8358f4a477358de3a622ed83c0c91661fef0169dcb"; + sha256 = "fec121572a558ec99b7f36a681ad0886e103dea0c3c9119f3428efeb2e018970"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ach/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ach/firefox-153.0.tar.xz"; locale = "ach"; arch = "linux-aarch64"; - sha256 = "2a148ba5395d248a979fb86ac45ea7940aae254a0dab7d83c3842b880218b6c4"; + sha256 = "09e345e06e691549587326dd9495b7e9e77e2c6c60e31721e893ebfbf7a17c03"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/af/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/af/firefox-153.0.tar.xz"; locale = "af"; arch = "linux-aarch64"; - sha256 = "a10a63f3c1c9918013c05322c9b66a9377bec1001a5da85883be116bb8a541ae"; + sha256 = "db09ad99c368154fb21019e0afefbff51bbb1990a4ed421ed3d86793478b5816"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/an/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/an/firefox-153.0.tar.xz"; locale = "an"; arch = "linux-aarch64"; - sha256 = "a3a68e693fd54675e81d07a017e21e4a69808262b7d94753f31e9355501776c0"; + sha256 = "d387ce7139b9b1357575312e3706cded7addbd80d33819e454c87ac420cebcc7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ar/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ar/firefox-153.0.tar.xz"; locale = "ar"; arch = "linux-aarch64"; - sha256 = "ff7dbe73d85709663ebcb0437d68391a4309e154527b2f384087ba0cfed51eea"; + sha256 = "0248ba15c616d417143f0fca62a91a01df557da5d81609440684213a26e40d0b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ast/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ast/firefox-153.0.tar.xz"; locale = "ast"; arch = "linux-aarch64"; - sha256 = "fcd69eaa2e2dea0e685a9e23ad24b9aec4c11790ac7f23f75bfb7ad38e7b4876"; + sha256 = "7ed2bb42b3ff8adfc5bc0367e78b65da5141cdcd0d94c5b2055008632fd06cc2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/az/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/az/firefox-153.0.tar.xz"; locale = "az"; arch = "linux-aarch64"; - sha256 = "20152c7d830b9577c472263e5abc141c21e30cb231900faf7e39104b1eb7b3e9"; + sha256 = "3574ff59f3edefc643d41b775a10fe2ac3014ab4531f17006e6acf77bf3ab2aa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/be/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/be/firefox-153.0.tar.xz"; locale = "be"; arch = "linux-aarch64"; - sha256 = "e34760e4b5ae98515f237e524008a1db30d5c05feea3d59be68964090dbb89c0"; + sha256 = "7f1af13d5e754d76c9743c0b715b00d1e287feb37b8c8ff4cf693d61e41a418e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bg/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/bg/firefox-153.0.tar.xz"; locale = "bg"; arch = "linux-aarch64"; - sha256 = "992cf32b95a623969d136cef89a1dba44a20eb00b74918c098b61a108d59c738"; + sha256 = "70806050186af2633fbd40afda2435e11574df042dde08556a48b72ea71e8d1d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/bn/firefox-153.0.tar.xz"; locale = "bn"; arch = "linux-aarch64"; - sha256 = "af5bc711a904f24226dfd6883bfdc63a69c030a33681aee838f19e95ff4268ad"; + sha256 = "14543700a56879ecaaa4ef2b8b9782222fb06d165ce8528fe3fdeac96f4767fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/br/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/br/firefox-153.0.tar.xz"; locale = "br"; arch = "linux-aarch64"; - sha256 = "616bf28b84f98c2253a8c7072f1aeb29b0927f703d751368c879fc3b911865ff"; + sha256 = "f9b9ce51734face632051169c7bfd05db2839a65521aba31fec6b1100e64d26f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/bs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/bs/firefox-153.0.tar.xz"; locale = "bs"; arch = "linux-aarch64"; - sha256 = "fb32d2badde34732bb232652a96330205d57188afc91775c4861a4f9d879833a"; + sha256 = "491140761559538e2e30a93727a786ba58ed1058b0264a510ad4daa14ce6caf9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ca-valencia/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ca-valencia/firefox-153.0.tar.xz"; locale = "ca-valencia"; arch = "linux-aarch64"; - sha256 = "1a74d1d62b84977e2cc08fe85ba88b2a074db48a87d36ca87ca50f43224b9013"; + sha256 = "331487ef1ff90b0cff9daa12a27d70bda70f2e23b9e9049f776b9b74f63f5ddd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ca/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ca/firefox-153.0.tar.xz"; locale = "ca"; arch = "linux-aarch64"; - sha256 = "bb5e52dcdc6137a99e3f3ae9ce51ceafaebbd2065c3ed61d0cbf943dba87101f"; + sha256 = "3fe493c3b6d4f0c62d97111c77bce080f220b192ab005e77376aceb5be45418b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cak/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/cak/firefox-153.0.tar.xz"; locale = "cak"; arch = "linux-aarch64"; - sha256 = "324c518b8c7a7bfc5cbf41346bab81f8b69a18356a78cf79d6a09ec4878bb21f"; + sha256 = "e664ffc5255bf133feaf5032a0adc1ef178b363963e4339fad0efb7b3495f867"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/cs/firefox-153.0.tar.xz"; locale = "cs"; arch = "linux-aarch64"; - sha256 = "3dfae5a5174a10224f9275591c3e4287f433996d7428fad4484af76ddda39894"; + sha256 = "642cddc336c30b7934b5d6d75d00cb5fef75a00875322a409bf2f789bc30b61c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/cy/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/cy/firefox-153.0.tar.xz"; locale = "cy"; arch = "linux-aarch64"; - sha256 = "57c594eff446adf6d8c6443e6a5f375a5eae2edd4328012b5dc5f37e29ee6469"; + sha256 = "82c3e2449599519faddf3314c37f743d5b7239a9cd9078e6cfe7dee70549e968"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/da/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/da/firefox-153.0.tar.xz"; locale = "da"; arch = "linux-aarch64"; - sha256 = "fecadf40892bfd6d51142e5aa0250846a78647002c10b608f25febd8aa6c3719"; + sha256 = "b6ea3240cb9bb9edc09d97000855e9d1cc41b0b2b08a742cd69d8d6833b0edf0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/de/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/de/firefox-153.0.tar.xz"; locale = "de"; arch = "linux-aarch64"; - sha256 = "9b01eff2c90e0f7c34f57e53a182e1609356f68411a650eeafb342d2e211e285"; + sha256 = "867701ef0b96f5b1e4d21a2b4c68f8116325d3fff1b37ae018ce9077f07d7cfa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/dsb/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/dsb/firefox-153.0.tar.xz"; locale = "dsb"; arch = "linux-aarch64"; - sha256 = "1eb1bc9c3533e5b62cca23de936c45aa77ba1dce840eb9627a3b28590b281ec0"; + sha256 = "1923c7d5ab1beecad80f36aeaa4e0248a5cb06165bc55ebb9e2953533c698419"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/el/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/el/firefox-153.0.tar.xz"; locale = "el"; arch = "linux-aarch64"; - sha256 = "7f4a71487fb4dc7bff2f37013d04db3acf1e9a02525c7305f1ade36153d52c61"; + sha256 = "d22cddaf79540e6f0d133b4911b71f260d995b73092223d8ce19f4c20555c9ce"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-CA/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/en-CA/firefox-153.0.tar.xz"; locale = "en-CA"; arch = "linux-aarch64"; - sha256 = "10bb7e02801535e97d9267c472d40b3328cfe11f600cd5f95e317278e120b8c1"; + sha256 = "c813f9a67b7215a81d8653164000d82e26f8e2a953e305a12879dfcc46425464"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-GB/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/en-GB/firefox-153.0.tar.xz"; locale = "en-GB"; arch = "linux-aarch64"; - sha256 = "c11b0198a5441dbf83bfc90033be092783854a7a5bb6f9fd04611aff29aaa3f2"; + sha256 = "b1aead2821765cc5825be58097562044f58efdb89ad6cb7bf103b6e408160566"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/en-US/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/en-US/firefox-153.0.tar.xz"; locale = "en-US"; arch = "linux-aarch64"; - sha256 = "31eac8648add83583ce13b1635eca1a24f25ce5dd921f606687909a5cec252f3"; + sha256 = "5d0a7390ab9eef510c9962b3010903b3a4dea0d0472f9035021c03ed4252c67d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/eo/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/eo/firefox-153.0.tar.xz"; locale = "eo"; arch = "linux-aarch64"; - sha256 = "e7400613f2a8993c97fe2dc340037604f203d4ac37655a9700b694c6f2479cc0"; + sha256 = "22abf1761ed7f1083dfdb62a42c696f4e94b0c4bbb8b006f4d855a9c2bef77bc"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-AR/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/es-AR/firefox-153.0.tar.xz"; locale = "es-AR"; arch = "linux-aarch64"; - sha256 = "96796ecdc735a391521cbf3b9e303cec64171b9a2e51580da828ed02b589ab4d"; + sha256 = "f0a044b8e6778c734e9f2173cbe296c21490a384ed7b49b3c37c1d32e0508709"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-CL/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/es-CL/firefox-153.0.tar.xz"; locale = "es-CL"; arch = "linux-aarch64"; - sha256 = "e232f089967203a114d27f58a22b327ecbfdc6f6c26ef85bfacdb4cd62b61e5d"; + sha256 = "b82aaa19fae4efacbfa654d5d4fb6deecae581e5240faa1a955ab34b7e3da79e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-ES/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/es-ES/firefox-153.0.tar.xz"; locale = "es-ES"; arch = "linux-aarch64"; - sha256 = "e4a78ce58e6ea5dd2f5f2688830fd057d88ba28a4cf47ff47c65ab569fb588ec"; + sha256 = "f4776064595bc05e209a86be6230470a9c02f7ce2e0868f4c1ea0f1504ddc3c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/es-MX/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/es-MX/firefox-153.0.tar.xz"; locale = "es-MX"; arch = "linux-aarch64"; - sha256 = "8e9361112eecf1f3f3964ce07c7fc6b2cf7b0350dc86347a8844228eaa71405e"; + sha256 = "d2929ae013ed0ead3bfd8d9d37ea230b6814c2aee4070a094fc3888f501c0cf1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/et/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/et/firefox-153.0.tar.xz"; locale = "et"; arch = "linux-aarch64"; - sha256 = "40dfddc2dd4a20d41195d0d9db0193e900eedd14d466161e9df46d7f6c2fc22e"; + sha256 = "5f87bb9c52205a3fe7cf92069b5a198d65d3385dbc6ea050f4c6fcda4c483155"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/eu/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/eu/firefox-153.0.tar.xz"; locale = "eu"; arch = "linux-aarch64"; - sha256 = "4fcd800585dd9281ba4c922d9f9402511d85d2751eb72c1677176d9f9f06246c"; + sha256 = "4db8cbb12142b559ac767c45d854f6f67831424496b08eb022fc936caa072c04"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fa/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/fa/firefox-153.0.tar.xz"; locale = "fa"; arch = "linux-aarch64"; - sha256 = "c856afc2f8f92d1f4d189d3be5e93bf987984f43362c7e6f30eabb7734cbd514"; + sha256 = "a18dd0f441480688337d9d210d4d703b42214383dc4084885484090b66ce952a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ff/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ff/firefox-153.0.tar.xz"; locale = "ff"; arch = "linux-aarch64"; - sha256 = "d30ce672b4a8032b56bd91b4d7cc5fd6507c7e3e9926a68a0656edc8768b54ed"; + sha256 = "87f339f0886e918f47b2409201643e4d88cc98d9002746ccfc7724d4752955e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fi/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/fi/firefox-153.0.tar.xz"; locale = "fi"; arch = "linux-aarch64"; - sha256 = "e6b8be08ce3692d2d4e9b96de7a88794ca3cfd9f4368b95c4772a7b7df687853"; + sha256 = "269b43d690fcb8a30bd8c02e02fafcd06a4cf48dc42aff04b397445ee78c69d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/fr/firefox-153.0.tar.xz"; locale = "fr"; arch = "linux-aarch64"; - sha256 = "a5d275c078f6835d8f8edc34f968fbd14e5b8dca4f83ad92f275b4740bb51026"; + sha256 = "fe2f42a67d996aa153d22a0613765c3bca504fe436f0e06c1c543903b7c207fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fur/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/fur/firefox-153.0.tar.xz"; locale = "fur"; arch = "linux-aarch64"; - sha256 = "f02b78936f50c20ec1c2d87737a532477cd2242a760093c0114bac91e088196b"; + sha256 = "1b49b1ca722556265191076d7d852f886260e252def36acc24aa0dcc169510eb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/fy-NL/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/fy-NL/firefox-153.0.tar.xz"; locale = "fy-NL"; arch = "linux-aarch64"; - sha256 = "6d24f9de7c251e0fd6b5a31bf3c5558f1cfd078fe4fe439bc3632f6fbc8db960"; + sha256 = "617a564da122a1701d8b150464a6ae9dfb8dd83e55d618d87afeeefccb0079a7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ga-IE/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ga-IE/firefox-153.0.tar.xz"; locale = "ga-IE"; arch = "linux-aarch64"; - sha256 = "64e2b7ba35f9e5cb45b7ad1fc7dacc902b980ba8f21c7ea9eb508a6d6cffef0e"; + sha256 = "3c2fc1e99a447ba4575eac128b89c8a2bbda0eebb1b7b81d2524a8e6ffce1658"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gd/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/gd/firefox-153.0.tar.xz"; locale = "gd"; arch = "linux-aarch64"; - sha256 = "ec520d9aeedb700664c3dbf6b3549b422c097b0c4aebbb5ea9eb3693fb62dd41"; + sha256 = "d9eaf694de7cd990049f27a02119e276a2a627db89036d4b2160e4b853d28e01"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/gl/firefox-153.0.tar.xz"; locale = "gl"; arch = "linux-aarch64"; - sha256 = "1a6075d581857d1273f3c4cb643609c17d45d02385ab69941fa06d421f0fd757"; + sha256 = "3599f4076f1756de97d475a0ebd1fda344d208ea893e0c478eaa1a8671df9554"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/gn/firefox-153.0.tar.xz"; locale = "gn"; arch = "linux-aarch64"; - sha256 = "d0dd378393b4909a10380d9999e763a0043da09c686e3e4337e2d9eb3675757d"; + sha256 = "6debfe4642f6a0afdfa0ed8f47510111a4266ea1e9a56a4514bae9c43b750f59"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/gu-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/gu-IN/firefox-153.0.tar.xz"; locale = "gu-IN"; arch = "linux-aarch64"; - sha256 = "c713a928e655c1ebfc34fc9a9818d08049f9bf79f8709d7265e38efe436a1571"; + sha256 = "e4ba466a1080b9954ba4e79bc2e862c48804d9f35d06c3bde9c5cc9fe578c18a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/he/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/he/firefox-153.0.tar.xz"; locale = "he"; arch = "linux-aarch64"; - sha256 = "3dd19410481bed37cca8a66ba8710236ff1310a2e92a9b130f2f3d1ed6185d51"; + sha256 = "6f1a70bc2d90e69284ab4e717a4907c8e67e01bb298483f60fa6b23854f1a98f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hi-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/hi-IN/firefox-153.0.tar.xz"; locale = "hi-IN"; arch = "linux-aarch64"; - sha256 = "48a05d3a894a664df179d9b30ac8f27a484cd0ffa306d1a4141a876d4fea9215"; + sha256 = "0e1d4c1cf387d285086bb413ea5a358feee46efd431fe7bbb18aa4820558d71b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/hr/firefox-153.0.tar.xz"; locale = "hr"; arch = "linux-aarch64"; - sha256 = "c23027e824c602d8e8b8c768187ba2eda33fb2b29202fb5ddabdb11c72d0f94c"; + sha256 = "bfa3acfdcf7ed1dcbc927959cbc75f099f626fa648718f71a1fe9e06a875841c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hsb/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/hsb/firefox-153.0.tar.xz"; locale = "hsb"; arch = "linux-aarch64"; - sha256 = "bb9614ce4f61932e43e9c881644d63feb5b3667be2a1a04800624d3d777fee9c"; + sha256 = "ec531c2cadd9ab3be710945d44c700af33aafab1f50c835e7f5de343c631b431"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hu/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/hu/firefox-153.0.tar.xz"; locale = "hu"; arch = "linux-aarch64"; - sha256 = "784300fde25f2e41c0845352a22cddb54a421ab75bf0770e0b01714482726b05"; + sha256 = "0ffa31186a48a2a6bd48fd03ebd48fbcc35f677b6e0092f5c05f91f9d650144b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/hy-AM/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/hy-AM/firefox-153.0.tar.xz"; locale = "hy-AM"; arch = "linux-aarch64"; - sha256 = "ec1c56d7c5daae64ef901b6c60881b62e64f595c0f29cb6ec35df3b2f6711ad4"; + sha256 = "f5dcd6d79f8eeac4592a28f8192eb4b105d2db4976a7bd7d249a357822eb3cda"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ia/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ia/firefox-153.0.tar.xz"; locale = "ia"; arch = "linux-aarch64"; - sha256 = "414dc6d722559ac106c87c36829a2a13b97615341df068d4644bc28357ffd021"; + sha256 = "1268ae8d23c145a97e8b76b24746349fae53bd9f306d12203b337761bd162bd4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/id/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/id/firefox-153.0.tar.xz"; locale = "id"; arch = "linux-aarch64"; - sha256 = "eaeff32ef724ba192fab1deeead47b9439529c27350bb154d6f99989c9e5a6cc"; + sha256 = "c04bede404d014d65ebdab85426a2ec8d38ac7281968edc357725a6ab24219cb"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/is/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/is/firefox-153.0.tar.xz"; locale = "is"; arch = "linux-aarch64"; - sha256 = "577af541c0d8c2b132436487b37deda00be525b187b1f90c53a38b7854286d88"; + sha256 = "e60bc1836aa11cc0d4432578441972d8863f593cf3f8d93fcbf14a1e709ec8b2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/it/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/it/firefox-153.0.tar.xz"; locale = "it"; arch = "linux-aarch64"; - sha256 = "a3c62cbc99944bedc53e925ec19f4e49675f98f623ee14d50510965d47945bd7"; + sha256 = "7e560c59b77c906af79fd6c9db20cadc6143d6af2d5bd51ecf9ea2f0c1f63f4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ja/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ja/firefox-153.0.tar.xz"; locale = "ja"; arch = "linux-aarch64"; - sha256 = "8d2af729d55febd5992d32f6048327c9a29ad6b3013860173262fa8d7ac5a57d"; + sha256 = "3e12387a48818e89106cff11f75688368d72fe7370836fa1e387a017f62b03da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ka/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ka/firefox-153.0.tar.xz"; locale = "ka"; arch = "linux-aarch64"; - sha256 = "4558e58356f3b2f8a45e5dc2405ec2972b36b1fb89f620beb60862fa1fe1b60e"; + sha256 = "84545bda5723e10c5d45c30ca32e348b9dbd0b4da9c00a91bf6ff1d475efd897"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kab/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/kab/firefox-153.0.tar.xz"; locale = "kab"; arch = "linux-aarch64"; - sha256 = "fe6de24faabd6026fbbbc0ce9d01b72a05ee921632b1de54e5ca00c4413e0181"; + sha256 = "8c0a073862a9dc1a07fdf3f788f42d347b245159799c46e187070dec60aa7e46"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/kk/firefox-153.0.tar.xz"; locale = "kk"; arch = "linux-aarch64"; - sha256 = "cd8a8d5ddedc126e438a35ac1e3b7dc6ae33869741d4f37a2b315184ca533836"; + sha256 = "40de4783333c1b8aad715dbfa752f28eaab8d3e364e52bd8596973aff4ca0881"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/km/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/km/firefox-153.0.tar.xz"; locale = "km"; arch = "linux-aarch64"; - sha256 = "8d0adb3e7db27c014f5bb0707abb146a301f77bb007d6cdec98bb313184a2f1e"; + sha256 = "f2dea5148a20b7c6ebc4e1bb4f6d35753a93b9e1acc1fa5c7aad4e04682e854f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/kn/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/kn/firefox-153.0.tar.xz"; locale = "kn"; arch = "linux-aarch64"; - sha256 = "7dfe723e490361092314fcad1c28b79f7449720b7999a338d4c392f8bb45ebba"; + sha256 = "0e8a0019548803865535c849f26bd005065a91e2de9341a7d77e39aee6209b24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ko/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ko/firefox-153.0.tar.xz"; locale = "ko"; arch = "linux-aarch64"; - sha256 = "55c68c17ec82f4451571fdd3dbbe781954429a54c41b12d65c922661703ad5ce"; + sha256 = "04fba33c7a7c95d91a4af2eefb7ab7b7a0306debaf1720814bd2ad59678d28df"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lij/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/lij/firefox-153.0.tar.xz"; locale = "lij"; arch = "linux-aarch64"; - sha256 = "6d5f90e399770e6f90a02c2a6f9201c81bd75aa4ddf5f0c9830e7f2bb976b3e6"; + sha256 = "a2cc18133f5b3db0e7e6f30f9137eb19a2837f0326a284ae75ba95b572212cfa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lt/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/lt/firefox-153.0.tar.xz"; locale = "lt"; arch = "linux-aarch64"; - sha256 = "0c271897c167f9aa78d441587bcdc491858bae35d0193a555c81e8e654f72da5"; + sha256 = "c93c0daf58860b06bd2aa756c24b2b85351cc1db0297f9e113ec23f51e0270cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/lv/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/lv/firefox-153.0.tar.xz"; locale = "lv"; arch = "linux-aarch64"; - sha256 = "9f8ca04ab9bb7897e2b5f2fea8d14051005e8b84e238479310486126e2c8aa7b"; + sha256 = "9fdda857bc94463efef4a44ec4bf273ce14d5b113a47596ac85731cad78f44c4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/mk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/mk/firefox-153.0.tar.xz"; locale = "mk"; arch = "linux-aarch64"; - sha256 = "a6059f371ebc9fb7b894a16419f1fb8dc8eb52b7e215faebbefe18e140b0781e"; + sha256 = "3957da17e523108949d2ef97529bb621a824f2c739d1457168304fe2086dbb53"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/mr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/mr/firefox-153.0.tar.xz"; locale = "mr"; arch = "linux-aarch64"; - sha256 = "05e1cc59ef7b4db5a6f9c5950145672b98d1e8dd0e514d911a931f40af52ada6"; + sha256 = "31ea7342463c7dfbdba31b97c098054773eeac7fc54937fc660f8f47b235a545"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ms/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ms/firefox-153.0.tar.xz"; locale = "ms"; arch = "linux-aarch64"; - sha256 = "33f166acab96b7aed064e73ab290457af3daaa57bb530b1607bfd149796e6118"; + sha256 = "f1191753892f94986e2af34daea9c3a1e40353f63bf7d539e8f535a449068e25"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/my/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/my/firefox-153.0.tar.xz"; locale = "my"; arch = "linux-aarch64"; - sha256 = "da4d2a6160cc516388c7e5ba6c61ce35fa2760f85e1b482bf0168986a54b1221"; + sha256 = "511d3793a7ffdbf3ca9ea734e4ca9cf64edd7a5bb3799daea84c1c5d50031049"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nb-NO/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/nb-NO/firefox-153.0.tar.xz"; locale = "nb-NO"; arch = "linux-aarch64"; - sha256 = "c508e7af4e8d6b76798e7b8a0ee904304d01a2ad062adf107f69c0b691fa35dd"; + sha256 = "a9fada332a4007001c8151dfc83a58ef5a23203a1b5322200aa1a2e0f3617dd3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ne-NP/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ne-NP/firefox-153.0.tar.xz"; locale = "ne-NP"; arch = "linux-aarch64"; - sha256 = "aeb81280e7f0dffd203e31e999292ec043d9bad49fc7aa05c4960568466f67e7"; + sha256 = "e401828a16e21783356e4e6527196a9fb991f7a525094768774e13a0cc495933"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/nl/firefox-153.0.tar.xz"; locale = "nl"; arch = "linux-aarch64"; - sha256 = "c702b2122a045990dcc8b93f02fbcfd20c0228cad6122ba87110ae8d8e1a4013"; + sha256 = "a7cf62885f11846a9899bcdc8010a9004c7f97a088b7ee47104cd83c6f4e0028"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/nn-NO/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/nn-NO/firefox-153.0.tar.xz"; locale = "nn-NO"; arch = "linux-aarch64"; - sha256 = "f4715bc8bd6fa2448628b79accceb2ee222e32505d116c5014e95a9da462b5c6"; + sha256 = "f2746f21a10e8694b41e6eb03bac3a2fe03e1b3661c5a05a9fc371baace35cde"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/oc/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/oc/firefox-153.0.tar.xz"; locale = "oc"; arch = "linux-aarch64"; - sha256 = "e2443416b04c023f049e2848909135eefac3561589ac68e977bf85163ab27f0e"; + sha256 = "b361970f65f971bb93477c97643f272e1b5e1887c3ef7bd14cdfee1bbdde83c3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pa-IN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/pa-IN/firefox-153.0.tar.xz"; locale = "pa-IN"; arch = "linux-aarch64"; - sha256 = "08734b2e09ad01749121961a16826342d7c9f0fa86bdaa9ce5ab1d37dc5e7f68"; + sha256 = "9282aec6838eefe26329199856fa1829e9e9eed9339575e49e5668120d52abef"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/pl/firefox-153.0.tar.xz"; locale = "pl"; arch = "linux-aarch64"; - sha256 = "43225e4645a56524c358740ba76e3a985d316fe9fac684d190f74edb2da82661"; + sha256 = "f0a79f7832e7d136edaa022f9208ad5145f28f306c442ba72b0619d0ed139616"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pt-BR/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/pt-BR/firefox-153.0.tar.xz"; locale = "pt-BR"; arch = "linux-aarch64"; - sha256 = "cc8f1c2e049e944da5978b6bb00df7dcfe200bad9e642234c0b10e77ec74a900"; + sha256 = "7e86f765a49674a57c146ff6a7241de89a1d80dc68d7e384b18adccca2ab2846"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/pt-PT/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/pt-PT/firefox-153.0.tar.xz"; locale = "pt-PT"; arch = "linux-aarch64"; - sha256 = "849f574ba5a78768ff57e45e2f33e824f9d5d8e10676e38d52cddfe2451e145d"; + sha256 = "151c1c0423619b63d45ef4cab838f97fb776496b8b3adc3f14091e52e02bf408"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/rm/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/rm/firefox-153.0.tar.xz"; locale = "rm"; arch = "linux-aarch64"; - sha256 = "06b1d82020959127d6ad13e0ca34c5709b1fc02fc8ea4d033e2852fa6cbfbc80"; + sha256 = "41b8f3745f694969071362f2152263bbd0d937770c2e47e1473189a75e960d5b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ro/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ro/firefox-153.0.tar.xz"; locale = "ro"; arch = "linux-aarch64"; - sha256 = "5304dd3f87009cdc6baa8edb212f0e97bc062e9606e522cce265fc1b81e8f651"; + sha256 = "55c65701fd12cac86c3c2f5e4401f83417ff5520cc48a287bda3a24a0fe9b00c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ru/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ru/firefox-153.0.tar.xz"; locale = "ru"; arch = "linux-aarch64"; - sha256 = "d3dfc4a2d53f229a4462dc850f1f16bd4ae03edacdbb9a3fbb0116649ae98a05"; + sha256 = "24ab9207558c5d21693fc189aec9ce2904138ed6d9fd29d90da7c35fc97df94e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sat/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sat/firefox-153.0.tar.xz"; locale = "sat"; arch = "linux-aarch64"; - sha256 = "92349a705603d4ea74fdfd03e98dc04c2918f2163cdd2b0bf33b1e75e890dddb"; + sha256 = "33bb77a11e28d902ff2b449e29068f38f1edfa1df60dbb2a00786bfcaa62a234"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sc/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sc/firefox-153.0.tar.xz"; locale = "sc"; arch = "linux-aarch64"; - sha256 = "e5858c4ad0d1e0694b63a96de3db5dedfc8de6a01b55526b98575786d259f7c2"; + sha256 = "d1dfb1d148ba9ac2c943e9c77516a4400c8657ca496ac66d2ba39c7a24b61b14"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sco/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sco/firefox-153.0.tar.xz"; locale = "sco"; arch = "linux-aarch64"; - sha256 = "fbf420f26e3bd5412f010b5029617b96f4fd0f75b10a85f3c65a8f12148c0054"; + sha256 = "e776d7a8a0a786513beb27c77709b7a2f632ac8ad0fd1e6cfbf634d45db8a003"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/si/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/si/firefox-153.0.tar.xz"; locale = "si"; arch = "linux-aarch64"; - sha256 = "e15bbcd9af0e722112e90654b29ce81f86e75c78f93769e4078a71f3560e1690"; + sha256 = "c114199c3dcdd63292b1fff8a1450c078b215e83e4358f92b0ea388d2c664498"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sk/firefox-153.0.tar.xz"; locale = "sk"; arch = "linux-aarch64"; - sha256 = "15fe710c5877fa30c215d93c819ab85ede215765416c6f68c649a8c43303a36e"; + sha256 = "7d58ca09dac8715b46335997a72dce0ed51b2a34fbed0dd24d08166db0c95989"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/skr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/skr/firefox-153.0.tar.xz"; locale = "skr"; arch = "linux-aarch64"; - sha256 = "a45e02c07dec0d9dc5ef5c961f5dc83647fb6e95763e7a091c848fe0df356121"; + sha256 = "96fa153c19be9cc9a14d9602145292f061e914a661e241d968fc4c5e188f1697"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sl/firefox-153.0.tar.xz"; locale = "sl"; arch = "linux-aarch64"; - sha256 = "f661da01a752d5462549d945407c56366962c6943f923ed10c26d7d3f7626ba7"; + sha256 = "9ac553b23bac68434c6c196159ec42c59ac0ba668bc0c45bf5f6320e30469686"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/son/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/son/firefox-153.0.tar.xz"; locale = "son"; arch = "linux-aarch64"; - sha256 = "3487d39b10f379c7879c9a122cca170e3c96ce3b01778349fbc04cf97a9bfe45"; + sha256 = "b9eae2e912cae4919d36d6692749daf06a5c5ee0238e0df405af36f69bb9f372"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sq/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sq/firefox-153.0.tar.xz"; locale = "sq"; arch = "linux-aarch64"; - sha256 = "669d4b95bd8dbd1a68d6bd436a08c4d5a745f77958cd58b2f3ea1ccad52f0985"; + sha256 = "b73c3c163032ff1d3c19bd81da14e3db5148c9083c598cf5082c66c0c7b80cdd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sr/firefox-153.0.tar.xz"; locale = "sr"; arch = "linux-aarch64"; - sha256 = "5cc14011df05aee9f03e84dbe2bc16d0f78047f68634ad32725c1f521dfbe098"; + sha256 = "1cce42540553e45e6efc6d8e771cbeb9a6d30191e1aa867d4550a09b699a373e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/sv-SE/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/sv-SE/firefox-153.0.tar.xz"; locale = "sv-SE"; arch = "linux-aarch64"; - sha256 = "b0d8d05ae36ce9bc0e65aa3c83804d20416cbfc3636f62e1704eb6ddb6965a16"; + sha256 = "9cd5b0d4da31972f1b8aaf0a192771ee655e32afb38267c66557637f958eb996"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/szl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/szl/firefox-153.0.tar.xz"; locale = "szl"; arch = "linux-aarch64"; - sha256 = "b94d603bf1737b759a8126ec6b2e55e99aac34f4ab3bdd81253329800ce6c1f3"; + sha256 = "6e60817ea2a0d169fc9c7fb611f6275f62ae35223926fb53ebf13b11387e2c62"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ta/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ta/firefox-153.0.tar.xz"; locale = "ta"; arch = "linux-aarch64"; - sha256 = "6423a83944dba8e78d6ce2d80414ac48b22486ac4f84bf0cd23ffdc0849c56fd"; + sha256 = "c950e8d457d92c19101464666d1841e1003b8413fd4b1838d1f9a4a1493f4644"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/te/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/te/firefox-153.0.tar.xz"; locale = "te"; arch = "linux-aarch64"; - sha256 = "b3ff7a776dd223b141182ee4635ef28b1e32fb86c5271323eeafaff8a45ea989"; + sha256 = "9f168d41189d31de10ad19622d2ac58de9c3d4e9030b69b9f66ac0008909d426"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tg/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/tg/firefox-153.0.tar.xz"; locale = "tg"; arch = "linux-aarch64"; - sha256 = "66cc2d41ee37917c5187dbf77706f80da466ad8cccdb88631ad36ed6b0effd8b"; + sha256 = "3c7186d240106df28f560b6637e5a0fe8007a6419bddb1e3f4687b26a045511d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/th/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/th/firefox-153.0.tar.xz"; locale = "th"; arch = "linux-aarch64"; - sha256 = "5da41a2c479c420401f287ebcac977af376511d06ec5f64676c6d5a07dc6d321"; + sha256 = "04c2575fc15601e0ed63973a8e20457165b0cc06caabe3fc471345ae66d16baf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tl/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/tl/firefox-153.0.tar.xz"; locale = "tl"; arch = "linux-aarch64"; - sha256 = "fd89b192207bb24ff2185121a1765fe05f98bb12e38ed3699c5a846765162bcd"; + sha256 = "1a37c15b371ec2eba01bc39a796534195ae9b4b5e22a09382b7bde20fdbc67c2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/tr/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/tr/firefox-153.0.tar.xz"; locale = "tr"; arch = "linux-aarch64"; - sha256 = "bf923969fcaade255f6158d3ab97889c6ce224cdcb59206c852f5d5323affa9d"; + sha256 = "54123516d77eaaf57446bb2072cc13d2457dabfdb5cbaae2d5ed1050a5b2b47a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/trs/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/trs/firefox-153.0.tar.xz"; locale = "trs"; arch = "linux-aarch64"; - sha256 = "fdf040055cc0af6146b14ee6ed529ba3370fff2eeeb1d635fa20a9ac5ea57d7f"; + sha256 = "47e32a11ffbb2593c4f601c9e7a77f0378a38eddb0d04ffe94cd32a4efdaf58d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/uk/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/uk/firefox-153.0.tar.xz"; locale = "uk"; arch = "linux-aarch64"; - sha256 = "1eecddfb59ed090f73f78deb03166aa119dff4bbe9aab6c438c6a5f04d315ef1"; + sha256 = "b0a6133d93bc4b62207041f332217dd42d95621113ea10e4850fab6f87c4511c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/ur/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/ur/firefox-153.0.tar.xz"; locale = "ur"; arch = "linux-aarch64"; - sha256 = "752a957ba36c07c9e4c38261fdb10e01b4b971aea83fe51dc46560b6468d983f"; + sha256 = "84fda8e40c9ca4cd0127112354834154a6216fd3c4292c5789b2fc4220d5b6cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/uz/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/uz/firefox-153.0.tar.xz"; locale = "uz"; arch = "linux-aarch64"; - sha256 = "838934d0833b8b5e64f6cb97cb652dae90bb10ed17aa7fe45d65d1878f6c1a86"; + sha256 = "a19682f6c959bc8dd063883bd4a840ffae619e0493dda00041962e2d6cfcf823"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/vi/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/vi/firefox-153.0.tar.xz"; locale = "vi"; arch = "linux-aarch64"; - sha256 = "0d62bfdfc15d80f9790b0ec499947073fc3a0b1648c912463a6cfc30fb0cb8eb"; + sha256 = "818690d5fb8838a59e3c5d8776b51c7aa7d232c0b4a5e42118293f1d5137276f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/xh/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/xh/firefox-153.0.tar.xz"; locale = "xh"; arch = "linux-aarch64"; - sha256 = "e1f78b8ec12283b54567005da707aec84eaff12b6f223095c1d896b747d5fbb2"; + sha256 = "672c576ff69fdb27b3775a0744c7921c951a996f67c7ba163aa00d5b4d6e180f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/zh-CN/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/zh-CN/firefox-153.0.tar.xz"; locale = "zh-CN"; arch = "linux-aarch64"; - sha256 = "87a9a8bdac0107a7f8a32ea51f7f636d251d10e3be11bb8f5326358e8b600b89"; + sha256 = "c71fb04e709a132d09ae1a39ac22718ac9702e00e8bfc08e3e50b37548022406"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/linux-aarch64/zh-TW/firefox-151.0.4.tar.xz"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/linux-aarch64/zh-TW/firefox-153.0.tar.xz"; locale = "zh-TW"; arch = "linux-aarch64"; - sha256 = "f85df75f51b6ab9ed8271a1af51865c9f07e3556fd00ca53b1b0b73aadc5d586"; + sha256 = "d56e22983f797a286a027b4c604011a8df79a8b66bc9f74586fb8471d6369699"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ach/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ach/Firefox%20153.0.dmg"; locale = "ach"; arch = "mac"; - sha256 = "d109d6468240e837bb7a15129def3c4563d3f8f26275b74a0c1f4b260e005b64"; + sha256 = "96b030be04e51b27e90da84e038151d97f2fe3c88ab3cf775c5bbd7488566972"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/af/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/af/Firefox%20153.0.dmg"; locale = "af"; arch = "mac"; - sha256 = "a418e97bd52aed2991ac6be0e8b07629d8ffeb203a56f45e5848c251c3d0d286"; + sha256 = "5669da8a7b0f35b8b90817fded49d91e5595245a9f2e79763bc18f729d642c9a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/an/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/an/Firefox%20153.0.dmg"; locale = "an"; arch = "mac"; - sha256 = "cd11259a2104c0046d7a5d251f379b00498e2bf81715e2dd0e0d9dab893d5bc4"; + sha256 = "e6e3fb717f4d22d53107a45b05e4578be6d33b6d30c8c2e1b4f465600cafafa5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ar/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ar/Firefox%20153.0.dmg"; locale = "ar"; arch = "mac"; - sha256 = "2c2137daddc5b4b4db50e80b1cd9008ce9491d26451a010c8111ca858146dcc1"; + sha256 = "ba5fd593ca6a695cd74f7e3b842a8e624686273f1c66ef1989c791c1626ab54d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ast/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ast/Firefox%20153.0.dmg"; locale = "ast"; arch = "mac"; - sha256 = "64be4f35eccb686dda5cc8e5f24e7e93143e9b12792411e9f359cac9374de54d"; + sha256 = "5f8655ec129a5f84aefd4d1b4df27566763a1a982f9c9f9064a3528591173888"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/az/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/az/Firefox%20153.0.dmg"; locale = "az"; arch = "mac"; - sha256 = "ecbf2be24f776897b02a50aca30f75381ad5f6a9260402c61f8c19ff4265ee36"; + sha256 = "d8921b101bc0aec0b25759cb7f4bdb0b603b607a5e23a0e47558a9efcad56dc4"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/be/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/be/Firefox%20153.0.dmg"; locale = "be"; arch = "mac"; - sha256 = "a0af5e21d9dcb892ef045916c9da9f137ec1e2c92bdd8c1c34266bc6f121aff5"; + sha256 = "64c1844ae67fe4f3e3f1e7915d0777ff9c4ff123e55cfe1f619ee08e1aad555e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bg/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/bg/Firefox%20153.0.dmg"; locale = "bg"; arch = "mac"; - sha256 = "4f38503171219bab259a206e90d0ec7c9e6f034c89b25506e37e3f3c37d7d7dc"; + sha256 = "219fe04c440ebf05dda3cc4507df79d3519910d8727b159318503153bd4dc529"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bn/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/bn/Firefox%20153.0.dmg"; locale = "bn"; arch = "mac"; - sha256 = "feea23926e4ab04b5773d64435a71bec09e5074da7b36bc13e321cfe930b9744"; + sha256 = "67298fb790a8adce0b59c8b60e7d6855d53873b2a0c20e0f84453f70b1f529f6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/br/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/br/Firefox%20153.0.dmg"; locale = "br"; arch = "mac"; - sha256 = "252bd21e6fbfb5f736eb74c79ea3896c1bf3c306301475c83dcca1240957467f"; + sha256 = "66244c989334a3b3ad994321bd5f2843977d1e1bb5e33f51bfbed0a3ce41fc19"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/bs/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/bs/Firefox%20153.0.dmg"; locale = "bs"; arch = "mac"; - sha256 = "34f561c4743bdfaf1a7495804f939553645606427c9e304d1a09af7740192eae"; + sha256 = "11434d4b68faf18dea9bfbadbb2af514695c967b394d57f4b5bd29448920dddd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ca-valencia/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ca-valencia/Firefox%20153.0.dmg"; locale = "ca-valencia"; arch = "mac"; - sha256 = "b4579744b35df912677a755dad2272e12de3cc5a29e828cafb577608a700d739"; + sha256 = "65eabc830bd36ec7b9756113cf7290f3cd2df668ea3a2d91c6a6661588ea8659"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ca/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ca/Firefox%20153.0.dmg"; locale = "ca"; arch = "mac"; - sha256 = "051dce45f09bb8cc62846fc30b8e7c4d3e2598b5abc5647dc1ab085a8e88965a"; + sha256 = "6767fbbda0e80c31fb4c3961246d41461bd371d65b4bba9f0314e5cb71024c2a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cak/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/cak/Firefox%20153.0.dmg"; locale = "cak"; arch = "mac"; - sha256 = "dce3c9a4a0199aa2306c4a3937630cf83916fa5facd72b8b7f4f60f97e5f5206"; + sha256 = "c4f1480bb3747b0725b4825240bb26181dbf2398d682b5df55df6e8dcc0b922b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cs/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/cs/Firefox%20153.0.dmg"; locale = "cs"; arch = "mac"; - sha256 = "8a61ef07a97745bd68e241f4af9d7c448c7f3bee7762ceb330c9e9d880c4784e"; + sha256 = "3090a1827e432fba690f287b269e027b1e25e4c54831f79475fa804961629661"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/cy/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/cy/Firefox%20153.0.dmg"; locale = "cy"; arch = "mac"; - sha256 = "652cd696099b3713736c130e5bb54dfd99fb2bb50a4928397f49bd42cd8b8f54"; + sha256 = "6d3d257608c3363cd2ea7e33f99539f2d60fecb7d9c666438a35b6d298064196"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/da/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/da/Firefox%20153.0.dmg"; locale = "da"; arch = "mac"; - sha256 = "bd1d3ea2d75329e99db7ce9c83268216034bdabf92c10b2dbc1f080dbf1ccebd"; + sha256 = "e0ad1744398ac0750312745d0fd22ca4bd5e743eadf28ef3da56fb069a785d47"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/de/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/de/Firefox%20153.0.dmg"; locale = "de"; arch = "mac"; - sha256 = "7f6232d39fc3b42499c8e2a8c485a15cce1967582d2d30ef6558efef4b996f94"; + sha256 = "cf1baf71065517ae51175b09204ebf6e912c96e01ecc26fd85c953e1faa8f08a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/dsb/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/dsb/Firefox%20153.0.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "db131cdce9e759f482498bee9836f8f6dc9b270559b9f2fd967695c4e91316ee"; + sha256 = "eb018117826e3855a42e734e3561ab1b56d2d1bab9ce5096388281f581118d86"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/el/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/el/Firefox%20153.0.dmg"; locale = "el"; arch = "mac"; - sha256 = "3524cf8d5d34816c2ca0f77a688a83e1451c9840bf226229ffc76ec0c0b1e3c9"; + sha256 = "8e1e29f33666d1cf6b1bdaaa7b358b8d3679d8ba60431cb87d65e2bfb9b3de90"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-CA/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/en-CA/Firefox%20153.0.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "577372a9575bc7fc291c2c1539c83218d0ff783222e125a4ad0daacfad71d41c"; + sha256 = "e0f424e35f09a1721097f16eb9e2c32f3d5391b324679bd82b6c4b251ab0fc69"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-GB/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/en-GB/Firefox%20153.0.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "2f3570e61bf02642a306f83f338f598ed5fddc672cf5b9f65d9c74bdf6dd6d2b"; + sha256 = "b52a11b259624830c1af864a8c8c40ba13828b3d424c55d62c8873589a795ff0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/en-US/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/en-US/Firefox%20153.0.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "bc2e72f6abf31aa854b30a3e2841d3f2b8b8e153eaa0a5c3ab285728b7f9b160"; + sha256 = "2f9b5a20e546e7e79e4182f8fe10353a3e251635963ab3f6d399a3f290adeb96"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/eo/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/eo/Firefox%20153.0.dmg"; locale = "eo"; arch = "mac"; - sha256 = "a6ed72875ea0280a45016ce9233ab2ea28bb32833cdead4981e85a92e3c1fc4d"; + sha256 = "e302647e7cc7cd03056055a70edae7e54f8eb17ed0bc893f4a54dc1418dae071"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-AR/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/es-AR/Firefox%20153.0.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "7f5228050a974ddc86c3b288941c221d4593a926533d318029896f64cfdb0adc"; + sha256 = "5e6f585fa8217cf8fe6624ebec7435632a4b1e5fac564ea4522b76f6013da3cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-CL/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/es-CL/Firefox%20153.0.dmg"; locale = "es-CL"; arch = "mac"; - sha256 = "662b648abd16d473c1bbfeeda51422b58588a78ab84452f5626f7eed0efac2f9"; + sha256 = "d913914ea12d9783d60812af2193203ebc4555024d7bc3a521ee1f71b5408879"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-ES/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/es-ES/Firefox%20153.0.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "bbe59b59a737f709bbc3dbc8e07a6e7b556bbf5039f3268532a99e261cd8a033"; + sha256 = "c88d5a0115724e2adda15c2aa4e262c160a1491d4d31c40c55f141272af1a59c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/es-MX/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/es-MX/Firefox%20153.0.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "da418707aff6ed6e2d8c1b0264d3a5124bfc0b2abac887fcf18e983fee31b2cf"; + sha256 = "86a8b36e46aa6a3626e918bdcbb81b6847a8569f04b8a43f0d2a16a487a4981a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/et/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/et/Firefox%20153.0.dmg"; locale = "et"; arch = "mac"; - sha256 = "6e3969680c68e857d8bab99ede4878e2a9896588e0b856a0fc07a5bdd8628b57"; + sha256 = "14daf5041f98109ac7ec8327c777615d6e1d19ab2f208d7363862f7fa84405d0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/eu/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/eu/Firefox%20153.0.dmg"; locale = "eu"; arch = "mac"; - sha256 = "8e5d162e687cfed827bea13e64ef63bc4d0ed801dd240f01ed5a0e1fcb4110da"; + sha256 = "ab6b5ced6ac7a24007df72f476e3c04ea2451f843ce4014a6b6504c12a82814c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fa/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/fa/Firefox%20153.0.dmg"; locale = "fa"; arch = "mac"; - sha256 = "b33d33f0fb0bae5eb04725ee63dffdcc007a9d4f2426b96096a2354a06501b3f"; + sha256 = "a23a2407f69523da2fd1d0f88b3491115a2e518275143b36af5a384f9ba43e6b"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ff/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ff/Firefox%20153.0.dmg"; locale = "ff"; arch = "mac"; - sha256 = "7b6b586d82c03ab031b3b90c0a2cb594aa8b876178a6c7d1a76e70eb13e7ef48"; + sha256 = "f023a67ae55c6ba25b394a7f8e76484c4bb997dd20954b10a82f878e034cdd4f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fi/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/fi/Firefox%20153.0.dmg"; locale = "fi"; arch = "mac"; - sha256 = "f73d6d3a0a2cf245105fe2b15be4e9fb075058ce58a3c9bebd64ec8b832b1c0a"; + sha256 = "175c90ad743183656e96a60a8959212b5bae07c0719089e3260c561329143ed3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/fr/Firefox%20153.0.dmg"; locale = "fr"; arch = "mac"; - sha256 = "e219c74cad44193370aab7cf58c6131d0646b352f7e79b55d12437ad482214b8"; + sha256 = "a0c8ed6091eac65ad5fda440e6b547e3af8a0aeb175fcc7e01eb0c938680428c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fur/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/fur/Firefox%20153.0.dmg"; locale = "fur"; arch = "mac"; - sha256 = "f6d1bd6e98239962364fa178366c7bdd3997e60bcc4416493f22ab11204ce77d"; + sha256 = "5ba5621aa9711ea7487076c045540c453b71273880f92d47646e7426050145ea"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/fy-NL/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/fy-NL/Firefox%20153.0.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "ee96dfc51c8fbd63c5fa6f9f529a6069485eb6daa24275352cd138cd8b6ead6b"; + sha256 = "1c9a2083888ac5f8ffec8d3990f235435e6896d852d0a8e3be92f5036a019ab1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ga-IE/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ga-IE/Firefox%20153.0.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "9fc53b347aa4662e9d18c19ce6c3392561cb237fc5878d6e1c0b7ce9401e5c2f"; + sha256 = "d80640b3551fdce26ac8705510939e28b6db25f5dbe02fd13c774b3401563204"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gd/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/gd/Firefox%20153.0.dmg"; locale = "gd"; arch = "mac"; - sha256 = "5672037b3e176a056671c218036c0429892a3c58d899221172733ad7dde4748c"; + sha256 = "b0ab56e45d5a234542821648a2c930928d93d1dcb879eb73d6c9248619616b2e"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/gl/Firefox%20153.0.dmg"; locale = "gl"; arch = "mac"; - sha256 = "d8133870cdb2ded7191bfa4fa3fab2dbb05f0431835133f76769745239ffafff"; + sha256 = "397cbc085496e41566b8ee10efc97563df1a91da04dc806525b1bfbb45a81668"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gn/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/gn/Firefox%20153.0.dmg"; locale = "gn"; arch = "mac"; - sha256 = "17fc1998cad24861025a9c03e53077c2ccd82d6c4f7bd798013c6a0fcc2c0045"; + sha256 = "b1b496a009e36292c6dbdc162a12efe512451fc6d5186c92c4fe3058f3c457cd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/gu-IN/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/gu-IN/Firefox%20153.0.dmg"; locale = "gu-IN"; arch = "mac"; - sha256 = "88932d471b7cc1c83489bf3d47bd010028842d39085096fdf000c45e2d27766f"; + sha256 = "48fe07f53c95b5d77a990d32bf965d7dda71cebab0e702bd2fcb5f0276c1697d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/he/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/he/Firefox%20153.0.dmg"; locale = "he"; arch = "mac"; - sha256 = "009fb0d815e1c5f30ae17879bfcafb6bcdc522929208f9ce4404b389e1973377"; + sha256 = "091cc0fd07964248940da11f43d92bc88c5224dea463f95da34b9a6c86168629"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hi-IN/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/hi-IN/Firefox%20153.0.dmg"; locale = "hi-IN"; arch = "mac"; - sha256 = "c6e09aa3f0c2ada9bdd086b35c264fd0276c1267d64d5c189333c249c16e1850"; + sha256 = "7d225e6c75e3e7b7fcd09a81907b28aba27a16d41930ef187d96d858256151e5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/hr/Firefox%20153.0.dmg"; locale = "hr"; arch = "mac"; - sha256 = "70e0aa55d64ce6cb7f616708f6fcdd76aef8fbafa7c70db265e16c88d008c077"; + sha256 = "fb4bb6e51c46bd2cf03618961f60364b56fcf0086f7c60e5aa60737f471a7957"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hsb/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/hsb/Firefox%20153.0.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "a336d45d2467c513f7358073bb38a5762670afbcb7c277c75b63fe7e29eb9e32"; + sha256 = "19636cc407ebf9884cae4ec0342739a2c13c20283fa601450c03acecd2700b1a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hu/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/hu/Firefox%20153.0.dmg"; locale = "hu"; arch = "mac"; - sha256 = "0ce51e08a8da787e071a66271a167d99c757af0899ae1f7f5c9f5cc7ecb51714"; + sha256 = "dda0df0731b80fa2a21146a171f415adfb44242582a0783de203444096442565"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/hy-AM/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/hy-AM/Firefox%20153.0.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "b7cc80fed0a7754e410b68143375acfa04e054f2931beb36cf27bdd021d356ad"; + sha256 = "031cea97489db096c7dca071209e3e85e2ceca50b9816980b229cadbabfb5938"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ia/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ia/Firefox%20153.0.dmg"; locale = "ia"; arch = "mac"; - sha256 = "c5462045f4978c23d16f0cd9bfef75ed37a9bdbdce880691028b059d171b3ff8"; + sha256 = "3955026d7b643b932a6e6e66d17852f4edab1b546efebf88ef0c0dcea4ed4604"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/id/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/id/Firefox%20153.0.dmg"; locale = "id"; arch = "mac"; - sha256 = "9987f59f7fbdb6da0c66bd60b2a2259c9b8514c59dbf5901bebbef147205a8a9"; + sha256 = "06bdd61e811051f2fbf13eeac5bf47055958df87d0fde9628c82977f0e722d76"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/is/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/is/Firefox%20153.0.dmg"; locale = "is"; arch = "mac"; - sha256 = "b258a97995fbb72f977a4633299d5e2849056d1495d444ac304a330275c16091"; + sha256 = "1489f330ce8690dc5a91dc826a2278f2dfbe0d9c01f1092864abc4662490dc47"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/it/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/it/Firefox%20153.0.dmg"; locale = "it"; arch = "mac"; - sha256 = "7ba2e0c6061e1ac3ea06bc568155f1a206003402b645e513182321a09114c6a7"; + sha256 = "b45d6e5f6566fd980f87171c97eb6eb3b81e3213ac453202884207961bc3e6f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ja-JP-mac/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ja-JP-mac/Firefox%20153.0.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "45ce4c7c928d24feb77f1d57333342247a523eec584fc6cf10f79b3dcfd3996c"; + sha256 = "ae0b689d3c4fccbea1e8b0106b3ee6185300adf3d07e7ed1ce525687781a7932"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ka/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ka/Firefox%20153.0.dmg"; locale = "ka"; arch = "mac"; - sha256 = "6ae7cc3b545561a389dbd718a41c9fce96e29caa37112eaeb72e25cd0f28fa50"; + sha256 = "83437e6f2e8b7361a5df5ffa4745a3a77738769983253cc882054eebad462f5a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kab/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/kab/Firefox%20153.0.dmg"; locale = "kab"; arch = "mac"; - sha256 = "2879b7279509a3cb207d764e6a9fb851d5182d11f2434d603e8b4f9fa6507d40"; + sha256 = "89473fb2e864a219ba1c0ceff39cf03cea70d4cb80ad92c635e366c97916b447"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kk/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/kk/Firefox%20153.0.dmg"; locale = "kk"; arch = "mac"; - sha256 = "8f1cbd44c51d55e7aeaa7f02f69e56ccd473d6afab4f6f9cbb399d928e63deea"; + sha256 = "e080144a151f5abda3d7a6aca587349e39d137b2598b9750a0c6ac8170e45570"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/km/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/km/Firefox%20153.0.dmg"; locale = "km"; arch = "mac"; - sha256 = "3b3b5a2bef80085504b4817116f82e0cb117c2fc2d449d40e66d40988e5f9075"; + sha256 = "1e9ed09fccabb2f2138942a08da8ea384328accb4985521d30e6d881f0c9a801"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/kn/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/kn/Firefox%20153.0.dmg"; locale = "kn"; arch = "mac"; - sha256 = "a5c42eb35ea9909a69799b7160c2256b2bd54596f2feab3a971fe3b86235d31c"; + sha256 = "3f9b675c5ee5eb36200ed59241ed4451e6d8f1992485c41e5b41bd713d0aef24"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ko/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ko/Firefox%20153.0.dmg"; locale = "ko"; arch = "mac"; - sha256 = "8480a0e8f4e74667f5f30495feb907919f55e14d2cebbd7a7b549fb4fba1f57b"; + sha256 = "54628f5e2294ffc4f4f67b0d87aaf0be8b230f310a502c35c99f9a9e09d9b8fe"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lij/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/lij/Firefox%20153.0.dmg"; locale = "lij"; arch = "mac"; - sha256 = "7d5fb1de26bd29c7d42b9ec57f530140a264d2bd7944b9e7a702dd0af27cf680"; + sha256 = "e9a1625360f5471bd3ed1f54802aa45273b4d22f35f66ce9f9258f4e1f888966"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lt/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/lt/Firefox%20153.0.dmg"; locale = "lt"; arch = "mac"; - sha256 = "95b106de218172a8e23faaa281217465160de4c94212f001dbec79f8b1e72ad0"; + sha256 = "36db97615eab2c6ff0954edf619e9ab5358f6c3d071b1ea931bee4723b5991f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/lv/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/lv/Firefox%20153.0.dmg"; locale = "lv"; arch = "mac"; - sha256 = "4ff3c84cd71df51d93158d7da62b4a97b69bb0c043653539157b986024803743"; + sha256 = "135a8cc108ed70e606408f4ae39b36eb8bc264b94b750d06070d811386a9cfb7"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/mk/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/mk/Firefox%20153.0.dmg"; locale = "mk"; arch = "mac"; - sha256 = "e6d9d7e152a17cf4c24cc1761b2e14ebf2b6085fd2b709de992ba00683adb03e"; + sha256 = "aeab0788ea3450a4997beca8fc40a988e6746934f58595f7cbd693249d4566b6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/mr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/mr/Firefox%20153.0.dmg"; locale = "mr"; arch = "mac"; - sha256 = "a24d6e5a0d6251eecadf5af806e6a823664909c389707178b8f26229f1d895ca"; + sha256 = "95a259e5c4f228ccd780243150db9f86216e1ef3feb684001e945a0677023a82"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ms/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ms/Firefox%20153.0.dmg"; locale = "ms"; arch = "mac"; - sha256 = "432a3c8e806fc3129538f665caec1fca5c4a36bfa6f43a87bd6497dab5a598b2"; + sha256 = "1ed967a7659a139b703943d1b37b918490efc026e9817697ce6799b074b35831"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/my/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/my/Firefox%20153.0.dmg"; locale = "my"; arch = "mac"; - sha256 = "49f4fd9595f06a45484ea15c0d1a42c35e56eb21e9ea88d26faba1fe380d7129"; + sha256 = "a9d4d4911b7e09526933d7ccc6b821df9b50c6b90dc2cd4b187ea88b999ee27f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nb-NO/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/nb-NO/Firefox%20153.0.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "e91073c6f259c96eafcc19f5d059e2ba94c642066962484a9767bdcdfa8bf970"; + sha256 = "47c9789e7ad99abc6a872bb62f0bb443f7e2f07767e230357bb4007204df2d45"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ne-NP/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ne-NP/Firefox%20153.0.dmg"; locale = "ne-NP"; arch = "mac"; - sha256 = "f4ba5e70cb7dccd729d62a66b5341418a625f3622a155f022f67ecfba175571f"; + sha256 = "af4ce3b82baf37076f06f413e6cd66587e2eac1dbcb9c8044677c257d2eef426"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/nl/Firefox%20153.0.dmg"; locale = "nl"; arch = "mac"; - sha256 = "ccb3fa66fa102b1ba78312bf128b7afbc9e0989684dfc7b6d4392b3bbf284934"; + sha256 = "2b19387b7499d1b357bb68a6123d1f6fbcd92182b390f5c016cc57dd83a0b480"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/nn-NO/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/nn-NO/Firefox%20153.0.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "ac824d101b89a75afa9d195a740b32ae9d54c120fedb395a97df8614c6d4da48"; + sha256 = "b3bc1401ced74bc61c3a3505c4467022fcb8ae298f11bad692372a2479db6488"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/oc/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/oc/Firefox%20153.0.dmg"; locale = "oc"; arch = "mac"; - sha256 = "a376f7b39f49ca455bff09bead533418db9aae706a81d1e567b35f00817f27fe"; + sha256 = "532c433190d6a22bc590510ea610768f1b6326a9f20aedd2e021be3afd111624"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pa-IN/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/pa-IN/Firefox%20153.0.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "02f369380f0734b4a6e4b762bd3a39a4e51e849693abc468f6618202ba2427dd"; + sha256 = "bdbf417c7f74ca904d7176ae3d93e39d1632d9fcc81703b3ae0965eb1a3975f1"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/pl/Firefox%20153.0.dmg"; locale = "pl"; arch = "mac"; - sha256 = "86f3a774809efb8722478e8257fbf7196dcedb42645c5dd37127c7c0119e93c2"; + sha256 = "6023d2e9ed3188657bc7ffc7f5fb40f3c8a6239ba90f2be924ea1d722f483b5d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pt-BR/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/pt-BR/Firefox%20153.0.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "9532f7c63cc71891bea015f4f71df858fd016c3ed9920ca0e415966d7c3807e6"; + sha256 = "8146af9e68e9484aca7a6f9efabe79f319cdc83b4ecf3e0612a40d23f1240016"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/pt-PT/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/pt-PT/Firefox%20153.0.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "42d135d2fe9e69bbcf72472287d8cde5fc1ebb3e32487dc720962a3164bd87bb"; + sha256 = "103a97da2f299176e72a2bd5198841135a16e25235b714996fff49534af85746"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/rm/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/rm/Firefox%20153.0.dmg"; locale = "rm"; arch = "mac"; - sha256 = "33e250c0c56167ef4d0536b88d575ca58be26aacfb75e823b0de68d2b208cccd"; + sha256 = "ec26b024f14eeb3e713ce403b2334f60dcad6260f87186a94eea43584a807ea0"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ro/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ro/Firefox%20153.0.dmg"; locale = "ro"; arch = "mac"; - sha256 = "027e7bdffa4db1948fe66d9e4c46e523a2931ab7db7babc7e3db41c1eecb5888"; + sha256 = "1631091bdaa9a075dc94ccd3e6a9ca2bbef7b1448ece9c0270df32e1618538cf"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ru/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ru/Firefox%20153.0.dmg"; locale = "ru"; arch = "mac"; - sha256 = "92dc8213d80d417d394bdefd7e4aed99b3c979d53dec3cb2dd135eeb37078b0b"; + sha256 = "5835815abcd35ffe56db5fb7efd8006ffece375ffa14736742689ad9a2474be9"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sat/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sat/Firefox%20153.0.dmg"; locale = "sat"; arch = "mac"; - sha256 = "7711e02cb8d398c2787bd621362ec6bdd7fc89a7bc23e94fd02e8158dd9569ec"; + sha256 = "4ca5fdb03584d8ba5bcea6a7e780c0248b66badd002e1a52e1829ee2af4cde4a"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sc/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sc/Firefox%20153.0.dmg"; locale = "sc"; arch = "mac"; - sha256 = "cf61b01d10317b5ddf6ed5b2169818381efff98bbd3e863eb3a7b9aef7a68e26"; + sha256 = "ce8e0759e9bb6d52a50c2d32dc45b0aa75554898cb8197493cae2d93f807e9e3"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sco/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sco/Firefox%20153.0.dmg"; locale = "sco"; arch = "mac"; - sha256 = "8a5ab2301f95861c69f6e7e956b5cab5913a467413c319057ca4d7d771bf928a"; + sha256 = "81c18aa8f3a869aaaca810a8eb7520a91ed1a8a2517f8467f8b1ee97894c8487"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/si/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/si/Firefox%20153.0.dmg"; locale = "si"; arch = "mac"; - sha256 = "e4f692fc6102fb1e7a8f8e4f28ca4633ec8b0de4d7180b4667e4268d9ca1231b"; + sha256 = "430957e1ded5667d9eff7752d9b44d673355fcea1009cf1b0bcb547bfbbb1609"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sk/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sk/Firefox%20153.0.dmg"; locale = "sk"; arch = "mac"; - sha256 = "92bcaf75ef583f464dbd060fef08369baaa53ce395846961942309f7be8ee9fe"; + sha256 = "3af5606002cd5a1f61b38e48989bb6126adec402571a51e33e314c7371dabf17"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/skr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/skr/Firefox%20153.0.dmg"; locale = "skr"; arch = "mac"; - sha256 = "23ffa1aba5fc2513b75e561615c07f4ab73cf464cec313b189adde13a3f6d6c5"; + sha256 = "ee7a77b4cb459f85540a74a3eefcdc8bcdc5e5355e97e8140f3b4b139d5f39e2"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sl/Firefox%20153.0.dmg"; locale = "sl"; arch = "mac"; - sha256 = "96c619665ca7f90bf605d4b33c16a5eb3209a5bc982de65e6362e74abb322a5a"; + sha256 = "bc60b72372ae61d9c093ebde1e0bee7719871ddc7365c421bf8dbba06d6f3d77"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/son/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/son/Firefox%20153.0.dmg"; locale = "son"; arch = "mac"; - sha256 = "75a48f037c8161549c7025c035c067f234012ab14d50bebc2858d099c3cea999"; + sha256 = "5cf39f15a21df88c3891f204ecf98242b67a4f55564d988e0ce52bde49a96708"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sq/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sq/Firefox%20153.0.dmg"; locale = "sq"; arch = "mac"; - sha256 = "3bb6af9c8217b22f7c469498186831da05eefb4f97f3d790329e6fb6002a382b"; + sha256 = "9967c38652c5dc8f0910aa16524052d923161f885f31c15d094d76cf8a11b891"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sr/Firefox%20153.0.dmg"; locale = "sr"; arch = "mac"; - sha256 = "38e4cb5a7df9e80a0536d810b260883b5caa7ff61766874bc675fac4607372ba"; + sha256 = "720ff98d204cb759022e56f707bcc2ca90efe1f0f312da37c523d04d1e80c458"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/sv-SE/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/sv-SE/Firefox%20153.0.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "8d4cb2cc9f76671903d0feb6169f620a364c72f54f654fca071a2f66af9b135d"; + sha256 = "a3b70bbdaf84358b16d0e3673d312455cdbf4b4536c0ef44ffdf24270d54b30f"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/szl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/szl/Firefox%20153.0.dmg"; locale = "szl"; arch = "mac"; - sha256 = "b85165efb112bdc0a5725c4f1a6a6120d07e07a70504799b9a4813121eb1f75f"; + sha256 = "fb4cd0e272ad8fa982e56847e3483d282cc8623d4817aebbed52a9f9784340fa"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ta/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ta/Firefox%20153.0.dmg"; locale = "ta"; arch = "mac"; - sha256 = "b3b75b28988a7847cac82abb6c1cdad02b02653d9d8ec5b28d32ca5986a0d205"; + sha256 = "08bfc64a54ce16c9f066174f7b759cb81fe5dd28988f5a7f33b7accfd7fa9480"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/te/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/te/Firefox%20153.0.dmg"; locale = "te"; arch = "mac"; - sha256 = "aaca8301f2857abfa176d428a5b1cf49dbd289502b3fa878bbf87cb20cacbf26"; + sha256 = "c87a55021014e82148a16588010e038ffb8ca49a7707574e475f97d923308c78"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tg/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/tg/Firefox%20153.0.dmg"; locale = "tg"; arch = "mac"; - sha256 = "36d2c47239879a3d1cf0b0c39dc3f2b6e03b589ecdaf5d9ce1969fbf3f33d7a0"; + sha256 = "cc93f8ea9664ce3cd47548b176935e1d5061eaa0c4e87cfa6d8084f02fcbc0da"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/th/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/th/Firefox%20153.0.dmg"; locale = "th"; arch = "mac"; - sha256 = "141a725ff1b58f2ce2e98e4d3b75917d85d0883e1f1ac8e0ac5ffa60fb2767b4"; + sha256 = "6534a1fe8b6ba384c0456fb937234fb2c61b0a42a3bb3f43e91990524fd52f53"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tl/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/tl/Firefox%20153.0.dmg"; locale = "tl"; arch = "mac"; - sha256 = "424ed93cac2306a480ebd50ae35401e2665f0f41aab75e6dea9c43882a81666e"; + sha256 = "7d7ba852af7564e06c57c3b3815d216174ce82267a690e189cb7bca764137ebd"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/tr/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/tr/Firefox%20153.0.dmg"; locale = "tr"; arch = "mac"; - sha256 = "c6a42ff159c20ae851803c68930374482cc464d0e2dc8e542cf06e9826157312"; + sha256 = "53985a150d86635186cf7e07a9d6f2626c21dbe5d80d319664f21a8c14b27db6"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/trs/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/trs/Firefox%20153.0.dmg"; locale = "trs"; arch = "mac"; - sha256 = "7a884903c4b9935aa4a1f86ab3af01dfd039613100b044261b207d1bae1dbdfd"; + sha256 = "367c27a32da15e51233d1a6638a4b19a07b55e38e40722709b82b7426a20590c"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/uk/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/uk/Firefox%20153.0.dmg"; locale = "uk"; arch = "mac"; - sha256 = "c8fa5f9b3bcbc69ef01f3d42c5e1cbe7964407e070a9f866840e81e3d9f40d4d"; + sha256 = "9c92e2fadb5768c956e7a77df4bf03522010c057cdf05873d63615bb8de14679"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/ur/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/ur/Firefox%20153.0.dmg"; locale = "ur"; arch = "mac"; - sha256 = "12a1bc68cfe6727cc140541aff3186c9c39722afff9e83abfe9a7ae1ae61396e"; + sha256 = "7ab0c7aa38cb01e1cf81331f514270933882852d554642864a9d1996739724c5"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/uz/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/uz/Firefox%20153.0.dmg"; locale = "uz"; arch = "mac"; - sha256 = "62f0cbcaa8ac13ffb3203015806622eaad786486ab3b2bb864e4b77b71ed7809"; + sha256 = "dda7c1ed2f6edcb59e8b6ac7ebcd14f12e0ee253934d7564d7c2b8d94eef2888"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/vi/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/vi/Firefox%20153.0.dmg"; locale = "vi"; arch = "mac"; - sha256 = "748d90db2e87eb31992acc9e1a2e274a4c8ee2b164c4d494e9c7ce948a931462"; + sha256 = "3fee1231a71a49a1ff71617237ac52e555aeed85688eb95260ac51e901c68501"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/xh/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/xh/Firefox%20153.0.dmg"; locale = "xh"; arch = "mac"; - sha256 = "6c9f4c0deee6b49b14a3e82376f3bd027d5522c2c8923d595e3797a01c611711"; + sha256 = "5a9d20d61521fe0ec9f297351444420c0d2b4d987360051b3ac993f68cc8b23d"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/zh-CN/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/zh-CN/Firefox%20153.0.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "e27fe006d808af3519ea45aad63087aa0786d825f21cb16280c33b054c0c86bf"; + sha256 = "9bfd261a65dcf84df479041cd42c20130d975d5fd943f6dce5d6527126f55f08"; } { - url = "https://archive.mozilla.org/pub/firefox/releases/151.0.4/mac/zh-TW/Firefox%20151.0.4.dmg"; + url = "https://archive.mozilla.org/pub/firefox/releases/153.0/mac/zh-TW/Firefox%20153.0.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "78748a47a616b6389e4dd315d785d83aedbb83d8d20a776f72a8e0f8253c1ad6"; + sha256 = "1e7ff3bdc7f0901ad72ebff9d1960f180b9c517bc4200d101570ff6406ee9436"; } ]; } diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-beta.nix index a1037c52818f..83fb6538eb5b 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 = "151.0b9"; + version = "153.0b13"; applicationName = "Firefox Beta"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "2d50cbe82dd470ab94148ab57585324ff98950fa25b806065b61ab2f541c795d826f4d9a454225ec798cdcd77dfd453dc50d26f0ccf8bdb5fcdf010244aec45a"; + sha512 = "fecfb1837d1907d54ed52bc40113804b6637352c2cbe6eb906f950d7749cbece32446b42c392102fa9e16591949619237dc2dbeb13bec18697ddd42e9ce8d4dd"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix index 8b7ee5d85834..23e821f4494e 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-devedition.nix @@ -10,13 +10,13 @@ buildMozillaMach rec { pname = "firefox-devedition"; binaryName = "firefox-devedition"; - version = "152.0b8"; + version = "153.0b13"; applicationName = "Firefox Developer Edition"; requireSigning = false; branding = "browser/branding/aurora"; src = fetchurl { url = "mirror://mozilla/devedition/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "e76142f19c3eccfeedd069bb14a6732b73a848ecbd16e74b6902e73b560db023611fabfef238d2f92b522ad75bb24d9368e2a75dfac9a6ff6c665a542445f157"; + sha512 = "ee1a699ab3f390031e7eb85b6cc394d3431cc2e2960e97cabc393cc4edad1bd1a2ba62e7d834e2ae52fa7fcf3a08c6194c1801ba7e62fa3ceb98ee08ac27981d"; }; # buildMozillaMach sets MOZ_APP_REMOTINGNAME during configuration, but 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 ca7547cf6f1b..9b6ed3c5325a 100644 --- a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-140.nix @@ -1,5 +1,4 @@ { - stdenv, lib, callPackage, fetchurl, @@ -9,11 +8,11 @@ buildMozillaMach rec { pname = "firefox"; - version = "140.11.0esr"; + version = "140.13.0esr"; applicationName = "Firefox ESR"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "d06adb3ef4de1324e3d61872d70de31ab08ac013f33903549bed28c6ebcc5b4dee94bb36388282c1935d77d1a564079f3adbf08d6bb80284a899cbb3d861300c"; + sha512 = "937a4103d71c5e1e4bf051821729f6ea70b5c18d444930a487695cc23d74712a0134047248f6ac02305e01becb705426a55b9d89739f02a01eda01ecf5bc27f1"; }; meta = { @@ -22,9 +21,6 @@ buildMozillaMach rec { homepage = "http://www.mozilla.com/en-US/firefox/"; maintainers = with lib.maintainers; [ hexa ]; platforms = lib.platforms.unix; - broken = stdenv.buildPlatform.is32bit; - # since Firefox 60, build on 32-bit platforms fails with "out of memory". - # not in `badPlatforms` because cross-compilation on 64-bit machine might work. maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; mainProgram = "firefox"; diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix new file mode 100644 index 000000000000..5604796cdde0 --- /dev/null +++ b/pkgs/applications/networking/browsers/firefox/packages/firefox-esr-153.nix @@ -0,0 +1,37 @@ +{ + lib, + callPackage, + fetchurl, + nixosTests, + buildMozillaMach, +}: + +buildMozillaMach rec { + pname = "firefox"; + version = "153.0esr"; + applicationName = "Firefox ESR"; + src = fetchurl { + url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; + sha512 = "3ea7956ef2fdcaa86430ef922f04484cbb1a3faf447e035107159fcd5ecd8d0a0e4507a332fc3d7b66e4308c38733bd0624affd7629447b89c655a9ea0fb0936"; + }; + + meta = { + changelog = "https://www.firefox.com/en-US/firefox/${lib.removeSuffix "esr" version}/releasenotes/"; + description = "Web browser built from Firefox source tree"; + homepage = "http://www.mozilla.com/en-US/firefox/"; + maintainers = with lib.maintainers; [ hexa ]; + platforms = lib.platforms.unix; + badPlatforms = [ lib.systems.inspect.patterns.is32bit ]; + maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) + license = lib.licenses.mpl20; + mainProgram = "firefox"; + }; + tests = { + inherit (nixosTests) firefox-esr-153; + }; + updateScript = callPackage ../update.nix { + attrPath = "firefox-esr-153-unwrapped"; + versionPrefix = "153"; + versionSuffix = "esr"; + }; +} diff --git a/pkgs/applications/networking/browsers/firefox/packages/firefox.nix b/pkgs/applications/networking/browsers/firefox/packages/firefox.nix index c24ed2dd9b13..d0251d267526 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 = "151.0.4"; + version = "153.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; - sha512 = "7df6099411843764321e1480b058530193bf134f590b97aadf053603c356c34599f42d6b83d739c2d6440a78cd81dd0b19fd2ddc2a59746d6bbe7e39f00b7e04"; + sha512 = "a1af5866e1c9a732818123f2f041bfd5993d093e96dd743b583312fb11d2b39d429df750f9ec22ded64b58a209bb1ecabc7aaf73057d7a64c7349e4da043d66d"; }; meta = { diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 149a3f13e54d..d945a0a3d063 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -215,6 +215,7 @@ let in stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; + strictDeps = true; inherit pname version; desktopItem = makeDesktopItem ( @@ -434,7 +435,7 @@ let ;; *) # Copy if the symlink resolves to a Mach-O dylib - otool -l "$file" 2>/dev/null | grep -q 'LC_ID_DYLIB' || continue + otool -l "$file" 2>/dev/null | grep -F 'LC_ID_DYLIB' >/dev/null || continue ;; esac diff --git a/pkgs/applications/networking/cluster/calico/default.nix b/pkgs/applications/networking/cluster/calico/default.nix index 63a9d7107b47..c498b380b616 100644 --- a/pkgs/applications/networking/cluster/calico/default.nix +++ b/pkgs/applications/networking/cluster/calico/default.nix @@ -14,16 +14,16 @@ builtins.mapAttrs }: buildGoModule rec { inherit pname; - version = "3.31.5"; + version = "3.31.6"; src = fetchFromGitHub { owner = "projectcalico"; repo = "calico"; rev = "v${version}"; - hash = "sha256-HdTnERSuqJ2ORijvI8AbzLGTwXaRl349p9onKgH4HE8="; + hash = "sha256-lME1x04iFaNg+dilS66dGuFmw3IEJQmyPcnDvGTzk/8="; }; - vendorHash = "sha256-LwOEshx4VU+a0oBlq/881RC/ViQVDnZZlZs/U3BMJ7M="; + vendorHash = "sha256-8CvnDaoEkb/yMMgGBG03RFrdHdc5Anbv9t1TnOYHA9A="; inherit doCheck subPackages; diff --git a/pkgs/applications/networking/cluster/cni/plugins.nix b/pkgs/applications/networking/cluster/cni/plugins.nix index 5803d84dc9d8..f57bbe3679a2 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.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "containernetworking"; repo = "plugins"; rev = "v${version}"; - hash = "sha256-0ZonR8pV20bBbC2AkNCJhoseDVxNwwMa7coD/ON6clA="; + hash = "sha256-3OhUvIJPU5Ayc4/po9Rj4Tfa5536aN8bj+51M6Xg5os="; }; vendorHash = null; diff --git a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix b/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix deleted file mode 100644 index 2e430baa0706..000000000000 --- a/pkgs/applications/networking/cluster/docker-machine/hyperkit.nix +++ /dev/null @@ -1,35 +0,0 @@ -{ - lib, - buildGoModule, - minikube, -}: - -buildGoModule rec { - inherit (minikube) - version - src - nativeBuildInputs - buildInputs - vendorHash - doCheck - postPatch - ; - - pname = "docker-machine-hyperkit"; - - buildPhase = '' - make docker-machine-driver-hyperkit COMMIT=${src.rev} - ''; - - installPhase = '' - install out/docker-machine-driver-hyperkit -Dt $out/bin - ''; - - meta = { - homepage = "https://minikube.sigs.k8s.io/docs/drivers/hyperkit"; - description = "HyperKit driver for docker-machine"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ atkinschang ]; - platforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index e592740d8129..11e899ebe285 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -26,7 +26,6 @@ assert lib.elem stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; @@ -178,7 +177,6 @@ in srcHash = "sha256-AkZjpHk57S3pYiZambxgRHR7PD51HSI4H1HHW9ICah4="; variant = "lean"; }; - x86_64-darwin = x86_64-linux; aarch64-linux = { version = "3.4.0"; hash = "sha256-QWxzKtNyw/AzcHMv0v7kj91pw1HO7VAN9MHO84caFk8="; @@ -199,7 +197,6 @@ in hash = "sha256-9RlQWcDUECrap//xf3sqhd+Qa8tuGZSHFjGfmXhkGgQ="; srcHash = "sha256-4OEsVhBNV9CJ+PN4FgCduUCVA9/el5yezSCZ6ko3+bU="; }; - x86_64-darwin = x86_64-linux; aarch64-linux = x86_64-linux // { hash = "sha256-5Lv2uA72BJEva5v2yncyPe5gKNCNOPNsoHffVt6KXQ0="; }; diff --git a/pkgs/applications/networking/cluster/helm/default.nix b/pkgs/applications/networking/cluster/helm/default.nix index 0981a3ce5bc8..be3010316f0f 100644 --- a/pkgs/applications/networking/cluster/helm/default.nix +++ b/pkgs/applications/networking/cluster/helm/default.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "kubernetes-helm"; - version = "4.2.0"; + version = "4.2.3"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${finalAttrs.version}"; - hash = "sha256-Wyihzf7KpnVuIdp5lmjhB7uLAGgtmI0TXYl29uaVC5Y="; + hash = "sha256-t7cdJjazG38T49y+x2B1akBNvZNXhN2ig3eNnHirV2g="; }; - vendorHash = "sha256-QTDC0v0BPE3FoK9AAq1n2jWxOE9gB9OsoY2wnpcCDUQ="; + vendorHash = "sha256-6TJWtGTdTtzOpPvWsk4rtJwxZxkIxIA6QSAemOnHcJ4="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix index b12a71003953..7000d9505809 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-diff.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "helm-diff"; - version = "3.15.8"; + version = "3.15.10"; src = fetchFromGitHub { owner = "databus23"; repo = "helm-diff"; rev = "v${version}"; - hash = "sha256-rH5EgSrL6yBmLd8m5QhEe3VTv8NVmyO5AC++7QQw/wI="; + hash = "sha256-c0sbFd19cDGm7VJbbfT+FKzUbeyAO1kCgh1eYV11C3I="; }; - vendorHash = "sha256-wBGHhjVNqA7SAueg9xowqxcCda8HzggepmOprsKPnjo="; + vendorHash = "sha256-GanQBm/g+PcMHaXA5gAaqacpOuv6kES6ng/CmH8/0j4="; ldflags = [ "-s" diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix index 85a9ba1dc7cc..20968d05f475 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-dt.nix @@ -5,13 +5,13 @@ }: buildGoModule rec { pname = "helm-dt"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "vmware-labs"; repo = "distribution-tooling-for-helm"; tag = "v${version}"; - hash = "sha256-KjIlmioDyj79jCnEi+Iimdg0eZruHdeD9JorkJbifJg="; + hash = "sha256-ytbwUfjPpvKxX6d24ifCyeD1WtFpzA52QniMImTun+c="; }; vendorHash = "sha256-dkE3eYZnaS+kC0kDVxaFW/Ev15TY2MY3m5xgPof7Y18="; diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix index 7a57f58bef6c..8ba869bfb2ec 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-mapkubeapis.nix @@ -32,7 +32,7 @@ buildGoModule rec { meta = { description = "Helm plugin which maps deprecated or removed Kubernetes APIs in a release to supported APIs"; homepage = "https://github.com/helm/helm-mapkubeapis"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ aos ]; }; } diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index 6395244fe708..7b23822646e0 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { runHook preInstall install -dm755 $out/helm-secrets $out/helm-secrets/scripts - install -m644 -Dt $out/helm-secrets plugin.yaml - cp -r scripts/* $out/helm-secrets/scripts + install -m644 -Dt $out/helm-secrets plugins/helm-secrets-cli/plugin.yaml + cp -r plugins/helm-secrets-cli/scripts/* $out/helm-secrets/scripts wrapProgram $out/helm-secrets/scripts/run.sh \ --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix index 48f7914cd0d5..08d653227f02 100644 --- a/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix +++ b/pkgs/applications/networking/cluster/helm/plugins/helm-unittest.nix @@ -1,15 +1,18 @@ { buildGoModule, fetchFromGitHub, + kubernetes-helm, lib, - yq-go, nix-update-script, + runCommand, + wrapHelm, + writableTmpDirAsHomeHook, }: let - version = "1.1.0"; + version = "1.1.1"; in -buildGoModule { +buildGoModule (finalAttrs: { pname = "helm-unittest"; inherit version; @@ -17,28 +20,56 @@ buildGoModule { owner = "helm-unittest"; repo = "helm-unittest"; tag = "v${version}"; - hash = "sha256-tSagZzAEaJRNZwflrqoyuIMWmt3oCsyHPHwctNTrtVM="; + hash = "sha256-oiTW8F0yo+kN943MI2mR5uEEYbMVxJx4RdEislJ3XSo="; }; - vendorHash = "sha256-LZOvss6wiZZi5USuXfivqtt69dTKzEmm7lM2LUDACfY="; + vendorHash = "sha256-4ckjM520MGYb64LbjYURe7AIScm4aGbj81rGKSSYaAo="; - # NOTE: Remove the install and upgrade hooks. postPatch = '' - sed -i '/^hooks:/,+2 d' plugin.yaml + # Remove the install and upgrade hooks. + sed -i '/^platformHooks:[[:space:]]*$/,/^[^[:space:]]/d' plugin.yaml + # Remove the per-platform commands + sed -i '/^platformCommand:[[:space:]]*$/,/^[^[:space:]]/d' plugin.yaml + # Add a simple runtime config + cat <<'EOF' >> ./plugin.yaml + platformCommand: + - command: "''$HELM_PLUGIN_DIR/helm-unittest" + EOF ''; - postInstall = '' - install -dm755 $out/helm-unittest - mv $out/bin/helm-unittest $out/helm-unittest/untt - rmdir $out/bin - install -m644 -Dt $out/helm-unittest plugin.yaml - ''; + subPackages = [ "cmd/helm-unittest" ]; - nativeCheckInputs = [ - yq-go - ]; + installPhase = '' + runHook preInstall + + install -dm755 "$out/helm-unittest" + install -m755 -Dt "$out/helm-unittest" "$GOPATH/bin/helm-unittest" + install -m644 -Dt "$out/helm-unittest" ./plugin.yaml + + runHook postInstall + ''; passthru = { + tests.smoke = + let + helm = wrapHelm kubernetes-helm { + plugins = [ finalAttrs.finalPackage ]; + }; + in + runCommand "helm-unittest-plugin-smoke" + { + nativeBuildInputs = [ + helm + writableTmpDirAsHomeHook + ]; + } + '' + cp -r ${./tests/helm-unittest/smoke} chart + chmod -R u+w chart + helm unittest chart + touch $out + ''; + updateScript = nix-update-script { }; }; @@ -51,4 +82,4 @@ buildGoModule { yurrriq ]; }; -} +}) diff --git a/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/Chart.yaml b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/Chart.yaml new file mode 100644 index 000000000000..fe0d4f805044 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/Chart.yaml @@ -0,0 +1,3 @@ +apiVersion: v2 +name: smoke +version: 0.1.0 diff --git a/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/templates/configmap.yaml b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/templates/configmap.yaml new file mode 100644 index 000000000000..25dff3db6797 --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/templates/configmap.yaml @@ -0,0 +1,6 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: "{{ .Release.Name }}-smoke" +data: + value: "{{ .Values.value }}" diff --git a/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/tests/configmap_test.yaml b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/tests/configmap_test.yaml new file mode 100644 index 000000000000..ce6b1ac74dec --- /dev/null +++ b/pkgs/applications/networking/cluster/helm/plugins/tests/helm-unittest/smoke/tests/configmap_test.yaml @@ -0,0 +1,11 @@ +suite: configmap +templates: + - templates/configmap.yaml +tests: + - it: renders the configured value + set: + value: ok + asserts: + - equal: + path: data.value + value: ok diff --git a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json index 8ba5e8386b80..5ac3317d21de 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_33/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "6a29f795a718e0b7a11b81b4f8a342764a90b78a83a57ad6e1b90d81c3718290" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "2e96b421314df12b5a4b2168ae0a8f097a63b9826bf93fbb86f7b69a48551cd7" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "1ec9755fbe791b710b176c12f66160e19b31605345c92f3b5916176976f813a8" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b01d1c0b5eeff414a405a423851e13575317831eec3f87f22d6a7038f9a1fdb7" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "893e395bbee35745e32aaa4e421aaf0c88e685739edc5658f9bf573a95a86782" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "b0d3bbbb034fcb920124562ef115ede32c2269fa8f5c35342a7c801c1e3d8068" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "ce3ac7a19d4753d543063e8bc70425b289a4b0c5c1a9e5e23555f2c70c3053f8" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "5fa48235a216c9dfcaefcd344597d221adf16aa583a0ca9d9b4094e4c9c1ef5f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "e483093a7cfa530445405faa7496ac6dedd7cb51312afc5e0cd8455923bd661e" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.12%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "ec56b324e405a3990b9ee16b5aa39bfb636ce88a127869685c042944caf38835" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.33.13%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "76103ee88986c05f858d3f0f92c5e42f6410e33a94b5ee528897c7d45e1bef74" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix index 57f04c1c12c8..373d2b37a938 100644 --- a/pkgs/applications/networking/cluster/k3s/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_33/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.33.12+k3s1"; - k3sCommit = "35e4874312bcfd643320c7f7cb225f7063cb9e4e"; - k3sRepoSha256 = "1md7w6n9iz3nk63rnf4ahs66d2vg3gfc5frksar2iw3kcv99bhmc"; - k3sVendorHash = "sha256-O0HIcCzrKGR8NkMoDfaD1wPbAttHt0kEpVjr/kOLMu8="; + k3sVersion = "1.33.13+k3s1"; + k3sCommit = "86c2c10c51e4340bb8252fff312d74dcafaf39d5"; + k3sRepoSha256 = "06m8rqarxii7ip4pjwyr25mskgnr00lp3xypr8ywq01akns8y2bg"; + k3sVendorHash = "sha256-oshDuY+I4sdXvjxyrp7meI9XzXo9DUr9wdD6pvUT3fg="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1.33"; - containerdSha256 = "1zkbjwnhxxkc9lqk2i9wfi10ywd4rsky3sjs2dzlid91l6xgrwhv"; + containerdVersion = "2.2.5-k3s1.33"; + containerdSha256 = "1al4zsyh3pz379ia0awhrlz7nyl2abyy0ayw0gl4gr6xjp7jsp1s"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.33.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s2"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json index 08b82fbac7a7..3c9c172d8786 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_34/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "2a5f910bb31b8674dff61f55a242b8dacb553894a50d66ea3c2dbf4ec8931345" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "87a83fb2db2883e427e3c2351c2d3bff7bd6d3ad2ab703aec22e81e326bd63cf" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b01d1c0b5eeff414a405a423851e13575317831eec3f87f22d6a7038f9a1fdb7" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "a14b0421af4e4afe70010886cf66eb99b2cb48e1f810269bae47dad5c8bbc2c7" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "6063398406fca10cafb109a04967c42dfcfee7216e6c6ec49a2f8c3a3b51d80a" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "b6dba85a8470f95ab2a57658bb5ac2adfcf3e3c0634501e7b87d6904f32308d6" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "db42a4016d8ff1f98520613fd0f569723c7553063d1a3f9aa12f25bc68b19b2a" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "dbb6f771024fbf07a85d57fb77d43a59a4cd712684e819dd31f9633088c3f99e" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "eedeab95e4e1f7f11bdd08b45555c591d6b35a59be9f476b9ac95d9940ab720d" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.8%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "984dc4a2050e1bde1b57ac8a07ce6639a56151a3b57cee0616220bc680c65041" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.34.9%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26a5528bb00c7beac8c88399af77c71123e74fedbba5b03c1c5ae003c838880f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix index 1d2e8503b87a..53e795b1bf52 100644 --- a/pkgs/applications/networking/cluster/k3s/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_34/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.34.8+k3s1"; - k3sCommit = "fb21251ee14ffbec9a2ba5d8ff25a7aa1221fbe3"; - k3sRepoSha256 = "18f2mhhn7nz8lri1qbjja5nfjncsadra9wrqxxgprfg5lx7fi3a2"; - k3sVendorHash = "sha256-jikPQgyQ4ApWPF+iHYjL7H6ccWcC1x/JEABluJyzmfs="; + k3sVersion = "1.34.9+k3s1"; + k3sCommit = "5f72184f2d188f75171bbd21953b1c16268e425f"; + k3sRepoSha256 = "0z9c98f02ixvfjlm6yj3i93pvplnfc52l54lyfrb40d1b9wgrsdw"; + k3sVendorHash = "sha256-JAOi23vFIYoTxB7g5Fyr+91dEX0lqChJMHCNW3q8O/g="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.2.5-k3s2"; + containerdSha256 = "1i9vkmf3gg34d9hjq15c00frhqxs9cba03zwg7qqq34gkb4qhjch"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.34.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_35/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json index d2675277bd54..bc929fe914c9 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_35/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "b25863ba596e81ee773b462edc1b7ee26e80ff8e675c983115464372713237ac" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "0ffcf255abd68eb4a321c9b13e1b596c1d32a59c5b9bbcaa4d415f213ba34cf1" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "c1a261f664a58664aab975ba5c861d872c825d4f8ccc391c649283bf2c1663cf" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "b3af3ad5f8faaaf5deb3e875815f0805f2abd31f8c2f4d566cc2d9e6bb7e688a" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "5b9fc436d67f0ca941084c512715f2ea21e6c66732144145788f1403ffd6c082" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "1e5747971cc382ef44b3f0b0aa640da45642c2bec330fd6daae28d61c90f0eca" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "1613727aaa8ae55a1a597a2914faf9ab909a710e175a26b4652754b25ab01337" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "29eae298befd23f13426443ccc049921874dd4e4987c4e5e15a1e63b816177fd" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "bc085e02004382b15413e98457079e2a0a3d8f18b3c9a4a58917f1bc6064ea29" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "14d4b33fd5dbc60c47d2c025b9a0cb1fa617e3ff351cc9c284ad9da3caf0263b" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.5%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "0bf33db3b0595166f1c36a6780ebd789343f50f23a4d61157519ada4d002919d" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.35.6%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "850056a90a804ae95977bed34bcaf7d0cbc9fcb794700a25f34454c2b2fd6b50" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix index b9f0c59bf1ad..9e3e82739c1b 100644 --- a/pkgs/applications/networking/cluster/k3s/1_35/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_35/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.35.5+k3s1"; - k3sCommit = "6a4781ad53ee5cad273bedcd9462ae36ac97d798"; - k3sRepoSha256 = "1m6sy7p5v3kkg66mzsna9c4d1f7ly843ii42zmb2a26vxa0dicx3"; - k3sVendorHash = "sha256-czE0ZJ9yWc3VSuPqjy4V+ViBGPriluMPmUK5aTk4DmY="; + k3sVersion = "1.35.6+k3s1"; + k3sCommit = "87243446a2c2fe958c31ad552fe38ebf96757b06"; + k3sRepoSha256 = "0hcd2pyd66isnii7x6nbw420n0sc7rwrbws4aayakas1xi0yrkzq"; + k3sVendorHash = "sha256-U8JM3CKLGUMWLntMyczrHCW+WMAeiDy2xwzR39InvCM="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.2.5-k3s2"; + containerdSha256 = "1i9vkmf3gg34d9hjq15c00frhqxs9cba03zwg7qqq34gkb4qhjch"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.35.0-k3s2"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s3"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix b/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix index 5ce71b5a5bb6..df7d8abdceac 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_36/chart-versions.nix @@ -1,10 +1,10 @@ { traefik-crd = { - url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-39.0.701+up39.0.7.tgz"; - sha256 = "1ii00d4r0lmzwi8n16m2fgi50j0s5cj1bm0jlsi3dbdbpq0savi3"; + url = "https://k3s.io/k3s-charts/assets/traefik-crd/traefik-crd-40.1.3+up40.1.0.tgz"; + sha256 = "0wrjc73w4h7bshm5lg6hb71h6s49wmxkmplrf6601zq400yr0m2y"; }; traefik = { - url = "https://k3s.io/k3s-charts/assets/traefik/traefik-39.0.701+up39.0.7.tgz"; - sha256 = "1ijrh3wr4k6ydcv0ylvy4i3swbj5byam0lkk51khfl9mmz4z8y0r"; + url = "https://k3s.io/k3s-charts/assets/traefik/traefik-40.1.3+up40.1.0.tgz"; + sha256 = "1sgc46xpc2vg5s5vbs7jk2y2bzylf34qcamx681jq0gfjaxs0cdz"; }; } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json index 28aed9e04b27..52d66c3f06bd 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json +++ b/pkgs/applications/networking/cluster/k3s/1_36/images-versions.json @@ -1,26 +1,26 @@ { "airgap-images-amd64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.gz", - "sha256": "8aad05e71764f08eae8d4db9e5d42d892dce39c9eb79206514c4ee03f4293db1" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-amd64.tar.gz", + "sha256": "6065608edb70f061570fa15c4cce4eeb31e5218eadbacad65de4a75d1de4dad6" }, "airgap-images-amd64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-amd64.tar.zst", - "sha256": "72cf836bfcf8f9af2de88102b69129d297b77a60243895a7ac4bc47d77a65079" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-amd64.tar.zst", + "sha256": "da6a3b2dbd55cc368d930078ae8814ed22eb9c92247f7b9b46bf073445ff55b3" }, "airgap-images-arm-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.gz", - "sha256": "639f155016f956764b212a1671a6e090100016505b34d3f45e76513fdd93cb5f" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm.tar.gz", + "sha256": "aaa7e592ba0b83e4e70741fc963358b87d57bb20a6daa09ef102db14995285e4" }, "airgap-images-arm-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm.tar.zst", - "sha256": "4b16cc7a17bac0957db9df4ad937ce52792a696b0eb60944b52eb65447a0d1fa" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm.tar.zst", + "sha256": "9d1440d7fc88720f03b0e57d291e3a727a67a4f2e89bb5c4757d83a390635b2e" }, "airgap-images-arm64-tar-gz": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.gz", - "sha256": "bc84f7965ef5f3a7e45e9f79f1090ef066fdd9bdb96d476c5d37cb13d0c2935b" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm64.tar.gz", + "sha256": "07766de91ed2bfa240e12b1d0b9c3af2257c8296bfa4ce17fba776243a2790fb" }, "airgap-images-arm64-tar-zst": { - "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.1%2Bk3s1/k3s-airgap-images-arm64.tar.zst", - "sha256": "174e1e7cf8493ea8fb2550231de3e93fc2f3cec27f977236fd7ab90a18680eed" + "url": "https://github.com/k3s-io/k3s/releases/download/v1.36.2%2Bk3s1/k3s-airgap-images-arm64.tar.zst", + "sha256": "26a5528bb00c7beac8c88399af77c71123e74fedbba5b03c1c5ae003c838880f" } } diff --git a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix index a0c220c4ca8c..3cdb98b851cb 100644 --- a/pkgs/applications/networking/cluster/k3s/1_36/versions.nix +++ b/pkgs/applications/networking/cluster/k3s/1_36/versions.nix @@ -1,21 +1,21 @@ { - k3sVersion = "1.36.1+k3s1"; - k3sCommit = "a9663261a7ff40522542485a6b2f81916b6d72f9"; - k3sRepoSha256 = "0788034bw5pl8ikfb16fvdhl8a3dhhfasrbafir6s9fb8q9h3z4z"; - k3sVendorHash = "sha256-jX/qoRhVLZy/25fdhp5NOiRSGEatV/acBbSpjhutAzU="; + k3sVersion = "1.36.2+k3s1"; + k3sCommit = "01b6f04aaa69e8b09303f0393d4b4f1811da23aa"; + k3sRepoSha256 = "0iqh1hkqfgm9df3bnwi79zxcdk0a9621q451yibr19j58pb76pxv"; + k3sVendorHash = "sha256-rwFC0bzUacl5kiQrnpRqqIam+9ADqaPuxLxNBX0wWXY="; chartVersions = import ./chart-versions.nix; imagesVersions = builtins.fromJSON (builtins.readFile ./images-versions.json); - k3sRootVersion = "0.15.0"; - k3sRootSha256 = "008n8xx7x36y9y4r24hx39xagf1dxbp3pqq2j53s9zkaiqc62hd0"; + k3sRootVersion = "0.15.2"; + k3sRootSha256 = "0yxq2jqqb7flm4rs9dl7fqxba3mmwkmjbc8rx7pgai4qa1lzyigy"; k3sCNIVersion = "1.9.1-k3s1"; k3sCNISha256 = "1ggaz0p1c2k94car9d89a05smz3zx32sxn197b1l5kmjcnzdwadh"; - containerdVersion = "2.2.3-k3s1"; - containerdSha256 = "0fn252icn082822r754i2bqd8rivhvjwkfk031a8g0vvw8rz46vj"; + containerdVersion = "2.3.2-k3s2"; + containerdSha256 = "1jzhkh0zg1s2922fkr4r5v1680apafkjqba8ic6br8nc8bk7j4xq"; containerdPackage = "github.com/k3s-io/containerd/v2"; criCtlVersion = "1.36.0-k3s1"; flannelVersion = "v0.28.4"; flannelPluginVersion = "v1.9.0-flannel1"; kubeRouterVersion = "v2.6.3-k3s1"; criDockerdVersion = "v0.3.19-k3s5"; - helmJobVersion = "v0.10.0-build20260513"; + helmJobVersion = "v0.11.1-build20260615"; } diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index 2e9ff9ae31d9..f95a2ec08764 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -1,7 +1,7 @@ { lib, - buildGoModule, buildGo125Module, + buildGo126Module, fetchFromGitHub, nixosTests, installShellFiles, @@ -82,6 +82,19 @@ rec { nomad = nomad_1_11; + nomad_2_0 = generic { + buildGoModule = buildGo126Module; + version = "2.0.0"; + hash = "sha256-5rCAcOXWQ6g2iK1d5wy/a/DZQC2xwwdpI1SscDX98C8="; + vendorHash = "sha256-3/H7QgVOHtaUs6BOF7ATVgrA0cfNBbm940Axrvq2bKU="; + license = lib.licenses.bsl11; + passthru.tests.nomad = nixosTests.nomad; + preCheck = '' + export PATH="$PATH:$NIX_BUILD_TOP/go/bin" + ''; + __structuredAttrs = true; + }; + nomad_1_11 = generic { buildGoModule = buildGo125Module; version = "1.11.3"; 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 16d2806a85b6..42b6796435a8 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.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "dd6d234775759b8abdd3a87a1a748f92db648f096cc9381eb27afd8ae8186f20" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "f2341239b5fd73f2b07b074d88c7b34334a808684462f4a6e70fa27591e479a7" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "1c10516660617d6db897bec16e362b4c4e4a0c1f43f08bb9a87663e051d8b806" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "8b91f83ee480ae60cc85601e150a2bf412531763ab8e2eaab0b0e4cefa1a83a5" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "02a2df53bea7805ee124e17db2263d17588a74d091c9656dd07052bcaf7fc159" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "4fdf2f4bc634c60e6503c7ddd52042baa2d65570a8a0a41eb883bd34920e6766" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "7b8e832bfde832d24335786c43a8c0aeede3c04e2aee4c8349822383f2fa390e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "dacd942276d2ffe8487bee4f7ff8df1522b935eed4eef2cae89f260580eb3305" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "16275efc94e4a399f0edbbf5ebfe46d8c5c7784d5a4ea300c7313ebbb24190d8" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "a3e0c2e05174839fe3e66639afa40bb96466a09e60fb73ec15685d1628f96191" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst", "sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "14fb90f2931bea3f030e7ba6c682013911260177bce91eadb2b45f23936465a5" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "d86eb346ca1db9ab0efaaf5b4c3418cc096ffd476d2c57f9d4a98a3bab06ef32" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "59f494c03d9aa0f96d99d28e505fae57dd2c30907ea055b888705555ae289d3c" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "fd6f6e0051f68efd21425364f17156d58f605063f562069fddf398e208a08032" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "21ebfe2078b4ef92b2ac3dfe664fd48556cf2b79f9058dd3cd6ed5ed10fcbe1b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "3623e1e59fd4d4a47c4b5e4143d7a8ef31707efbca7d7bf9c299d700c0e1d291" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "766acd7cbff87a3eab89cc0dc433df34c5d44bfc5304872adfffa432f968450c" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "70b362df86f882e64c4d7a8a01901a528bb22e12a28a6996d754bd04b9f396e5" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "6bd03722d01aa1d281da47318ddca6e1dafbac7acf23f7dc864c7799b4616479" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "030d22fd0cb52d90321b37e2d1cd9448b571ba5eeb6b1d68daba40ecff515214" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "4b61e3e97e6770b9a2625a21925282e1774bc9114f0a9df5392cd1199b4df744" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.gz", + "sha256": "4513f277d0380330eba4d31dc8096142c2a654a34f01f1c90ab167b78dc58181" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "c9a0fe7e3a747fb01d19b0a846df97d4d53a31f563e5308d86401d6b000b031b" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-amd64.tar.zst", + "sha256": "a82003606da83f683a7025de7481ef9939d1b10a9f9b222ca5e80f34885a87dc" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "899f8e8b8ece3d85384de407fd3f8d375daa9b6f0c1bbd54108426e22fa4a623" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.gz", + "sha256": "121690236b9c7f0dd094d4070e80cf9b624888e2418b10c66ebbf894d63c2788" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "be6bc62be91cef6ebb9f995fb4a3e7ca68ab485eec7eb304d129c9d44d543e0c" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-core.linux-arm64.tar.zst", + "sha256": "26edec0d747a5578f7e638a36f54e8f301a06bcc87814d3b2274db571900f44f" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "56c322cf540988649257018f8be4cac80ff1fafb206c3efeb7cfc190d76eff6f" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "cb33139d9e7569f9b6ad5822f481c83f259a6cd13639f3980e2ad8c2dabb8284" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", - "sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst", + "sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "ffc90536663d1edd4cd101e492d84dcd79dd1af1b3b16643786ab8a5d2fcccb7" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "a4d428464b3e3e11aafa8fab70a7f183d57d152049f02bd295a6bb4e925a4dbf" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "93e0f6a8e5024f054cdce242aea4fdb833e476d7b2531b454f5f3267f724594e" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "97cd2eb0920d433ef57c1a8c8f4a6680faba9a0589c9605c30a56e2c09110c77" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "2b72f3bf1485a986d4a325cd15cb12163f4acabcdd4fcf77400a4c226a26c097" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "f16ef32d0b9586fb7e600013e56dd9098149dc5ce5239f4828ad03dc7463553f" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "4e675fca42ba1862810e021570f58462046e11fb92552d699e20d314be4dd54f" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "86fe56d8a277208c26c13a9b04b18b4eb4f2b6debcc7ad754af873e4c64d66c5" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "c642cadb4f1ccf8439e3c47b10933cae6db0d29c2d9bb9b45267ca69191b0c3f" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "dc8e9aa0dd1ce2a62b58b7ebfc673911364bd2c3228781f4a226e4796d0436be" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "080cbffc7710eb25167e65619101b9cbfbd80d6510da2c857a7fe2d70140358d" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "287437a99ff5c42516764d625571c10d2fbb44ef82cdb026d37b141e56305664" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst", "sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "1009e845edf77dbe04e8d815ce036c73f1309c0a4a2ec69abafb3e058365513c" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "98f213f7c8a70c4b0d0fb22329212190e08c82d6be482b227e3256637388c732" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "4268db05101d1022ee1002f46516aebeac1b9f8171288ea2d14ddd4763b35ff1" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "86a46ecea0d7a60a68314a5794698d6421aa4ce69c05a1f836360e9be996a36b" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst", "sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "39381c15bf462071edeb8f735d447ec6d750cc23f6dd3efb45d7b38193ccb7a2" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "29372e44e2c1b682c4bc070a764746138a850e24c2cef7edbc97bb2afae51bd8" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst", "sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "6bcd307750c4077eca4cf934dffa4e93277479512639f4c2458f0b0b0eb2cddb" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "237d3f47fdbc2e511b002ed700536125ccb0fcf7c69f2b192db3bd351043d3cc" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "707374e5a6066ec39b70f46ac43e5ca7c10a04811c509dbbacd3edd2cbc8fc0f" + "url": "https://github.com/rancher/rke2/releases/download/v1.33.12%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "be5e7d4a33142cb07ac687b777c2c892354f44061d769a72b4731af49c307ec1" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix index 0db096d140ab..826ecfc1e987 100644 --- a/pkgs/applications/networking/cluster/rke2/1_33/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_33/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.33.12+rke2r1"; - rke2Commit = "2cf00d600ee7064fe19efee3e35195ad92c006ef"; - rke2TarballHash = "sha256-CESLU8qyr0MnVmXRKaPZ7CFvBmIqpLAiklBrsuw9W/k="; + rke2Version = "1.33.12+rke2r2"; + rke2Commit = "341f3e620b43d178daccfe5199f9cb752b0c3922"; + rke2TarballHash = "sha256-fjhAeDjX8w3c943wjaOamlR4NXZEIhE68iSIP6co6OQ="; rke2VendorHash = "sha256-I09PTw359mW9b8j/tjbedu7gJ0cp+NPEvmikxJMOufQ="; - k8sImageTag = "v1.33.12-rke2r1-build20260512"; + k8sImageTag = "v1.33.12-rke2r2-build20260521"; etcdVersion = "v3.6.7-k3s1-build20260512"; pauseVersion = "3.6"; ccmVersion = "v1.33.11-0.20260415182038-2566e39d309b-build20260416"; - dockerizedVersion = "v1.33.12-rke2r1"; + dockerizedVersion = "v1.33.12-rke2r2"; helmJobVersion = "v0.10.0-build20260513"; 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 dd74cf02d366..67930cebdd80 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.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "9191dccc4fa6bdb8bc589d20d34c643227fe2c1e3d198eaf600780a1c44dfd5d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "351e9047ce160cbf3b9ed4a32996f36bb4266c200e9957407178d2d28e55f8e5" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "707eaba12e9e9d5e5090bb5fb3e066b893c0b0aeeee6f3627c1153e2db380567" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "aa746ea4dd91422e37d2cac07b36854ddc1c551b4da061c261d1e0132a983656" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "33421abe9967b3f00799b3251f84a3a36ab03378a4f1c556663ac2b829f59cf4" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "96829f58e60b02ccee8e19b9ec4ad2ce7ade6f9030b1379eadedd42d151a783b" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "f727fa092650bf685b68358cf41422c260fe9eee7a2aebecc68f14a2fd24a678" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "6a7f4404f92e88eb515bbff4513b5771e82c69111dfdd7e88c7d83d4366480e6" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "b46d57b12bd62a5f4c4227fc1339ba8785853e55f81031c97774f44844c6769d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "16bc527e0b4ab9612747534c2b5801487a12379a364da4936d01816fcb608040" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst", "sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "ece067531498aec3847a73cd4e4e379c2bb3186f72717601b4766f2a50df0f3a" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst", "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "2ad31cd1bcb0ba5ca050bda0942a0b6b79f21ae4dfc70f70001be08921c4c3cb" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "95d566220546d6b49f6b79fb729c976fc435ae85fcb39add9ca4e8cade953e8f" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "c812ea710fcac1dd25e1be8f45e9fd3218296fdd6414c90a5b856fc16a5835f5" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "fc146c92933270bd4291a75069f1d724629c84ebb6c8cd5549756a895a5a9e3d" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "07507811563e82578142bd56c2b394b32b55bd53c965f8fc9a9881570feac68d" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "d5bfc28db9031a8be3a5c325fe6f6cc6dca8f101af5fce394d11e00a0e866dc2" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "0d5813611f47a460c7762f1902e1be7785f52903b8340fc112dd67c5ba9e0adf" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "0590f43bf3d6ea590a9069d62170956d72f6ff1b1a45574ef7129a6fb07481ae" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "4716d37e4c4974c50d88a6c4a4dd1ae59e5d416b06161dc97af267ac91005200" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.gz", + "sha256": "2d89ef07043ee8475bd91c97c7419dcb068e089ba8d74f31a503749fdd29a700" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "c326f685c5037ae41a76d0a57d81ad365664fdb4f09dd8ed1c085daef6e8898c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-amd64.tar.zst", + "sha256": "663f048d7ad31aeaf5820effc4e9fd6499ee038c2736afa6721c2384c049765c" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "8439de0d0159a2d0458a94c48d4f856dd499106bb97a1228315172a8ccf7a227" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.gz", + "sha256": "740bed7351bab07dbdaaef316d3c9c817c381fefff4ce43af78381596e1f34d6" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "dbfb0ba0d552b9f09d6fd7c3f1313c2d3a65b1fe9d003925f90206bb908ceb1c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-core.linux-arm64.tar.zst", + "sha256": "d224ffbf50eb2be8edaa1b923323df17336b8c435bce034e2ba4ae96a54244ec" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "2b65ebfff9edad28dc5df77d58a9f9191ae6ed1ffd47e001c61979940dbd30cc" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "1a84527d66538b5ff96e331493006bbd3ccc06529d51a8b7c9a3e0d219c25a6f" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "832aae87b5eba45be64b47a5ebc04824060095dbc79d58adb009dbc0b738252a" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "17393dba1ce79c78739381ba2c6dc9383f41bf78e511b04a3eca0564d88a58d9" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "80d7ab29cce2d595926ed0999e663932489c62c9e4b818909a05739357e584bc" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "8d6e85fbf15c10faa6c50098f462e1f042e37e80df8aaa67f4e4a4cfbb61b3f7" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "86299476461d69c9db81c47f1bff915f122dd31f229679033cb9ac3888f34d20" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "44bca782f1503b189e17248edbfc344c129ffedeabf886c5ecae89717a68e6df" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "c3c2539999dbd963deb1533d76fef211902322d7204c977b7534c37342a6ccba" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "0af1f6bf05788880ac4617271b8896662c41ed3b099ad617bae21aa41f669f68" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "dadfbc1e60b11be02c186343748f3c5e6a7c03bedf4bf36b1007b6addafaf6e2" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "085489645c3bdeb44216be70e0194f6e356a4e0116e861fac7009dfc671f99b8" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "ec9d3370c2cb488fe98ed38688fd3cec14ba136783efd894b3bec2a5599f8c08" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "6c759cc8ce3e9ae7b6aef0b5cdf4094762f6f69d55dd70b6d9a405db796f1cb3" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "a4bbad1ab2c8d7f65e6cc9238d63f29524774bc07163a4a23688d9a0a63c4629" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "530f83485923076b7769c4ced5c87b88979dff0e4d28faf33fc5e9b67fc5dadf" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "efc94b4850aef8d2973f51bff0df31ce0689949e22bd05161fd5c12cfa9672ce" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "1ec1676f8bcb054ab243cc7b3df555e0099fd2a227683615f15c8cbb95db040a" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "883d23d8ef3733d9747251c8a1d223571153fd233eb93e5d32a76129a6c64f2c" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "c310597f504b2dd8ac46cc2b87125dcf57a3ae77e4bbbeba4f436a598a2b96f3" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "282c456cbcdaf42f2b4c62b110aaa459e5517dba0a7dd8c6fd539ce93c9fd632" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "288cb12a19e0419f91a56286c934823eda31c523f865bb24b66c9cdeb89cc73f" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst", "sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "f3d34ffea490540c028f800362862c74d1b45efb0acb3db072f5417443b71733" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst", "sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "b15c7523c8ece5525acdd1e04bdcde1a3e54435fcdb1a8ec949de9395f69a3aa" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "c87a8f5b553e664f0c7dfa44b2fdea40b7bbe22bbf4d96667009a76f5b181f86" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "ca086d7c16de41dfd1fd5f2e745949f0a51d4de45f9bacdaa3b1955936f595e9" + "url": "https://github.com/rancher/rke2/releases/download/v1.34.8%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "df524665950321e45d0b8521532263e969533af82f7c77dddc86b4b6dfa675a3" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix index 06abce696b04..8ca875d9afdf 100644 --- a/pkgs/applications/networking/cluster/rke2/1_34/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_34/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.34.8+rke2r1"; - rke2Commit = "4fdfd151975bbc58c8d392620db8eea72fea2abc"; - rke2TarballHash = "sha256-n98pZhWARQMyKj8G9+ymmMZyzoiGo+KPMr0F5KDphqU="; + rke2Version = "1.34.8+rke2r2"; + rke2Commit = "b227fefe1936a550450ce3b6248c559fa58b5cd3"; + rke2TarballHash = "sha256-Ojc4PhsEYJBhgj+r+XEcdFEjZIlJCCVNC+w7mZWY2hA="; rke2VendorHash = "sha256-752RlnL+7reFk4G/X8kgHdad71fatY+Ss714MbJDvg8="; - k8sImageTag = "v1.34.8-rke2r1-build20260512"; + k8sImageTag = "v1.34.8-rke2r2-build20260521"; etcdVersion = "v3.6.7-k3s1-build20260512"; pauseVersion = "3.6"; ccmVersion = "v1.34.7-0.20260415182025-e7567db58dd7-build20260416"; - dockerizedVersion = "v1.34.8-rke2r1"; + dockerizedVersion = "v1.34.8-rke2r2"; helmJobVersion = "v0.10.0-build20260513"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json index ceafc8a2dc76..e86d9a95a58d 100644 --- a/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_35/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "483d18ab6a64d279b4411098dec8b6f4219839bdb0d3e023f87679e6c71905de" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "d53e659b7f934fb811eadeb7d6e348b12ef932b0a414073301bdf03d1501f32f" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "c8ab27e9f5cd0d85cc20ed8c02c71128f021199a0256c5a051734817193e913c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "b7cf99a56b03469169e8b1a32f9aa61b828268dd5aff9482503d00c884260f0e" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "01339c90624d6745e16b7706585fdb32825df66adb892a9bd265257d2de315a5" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "53a95f56dbd4aeefe631afdf05d00592da7bbb2c089e694d06ffd6c6c8665375" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "9816fa61d5b89ab40ba59db3c0593ed37f712c6bfd1f3b763641b0bfad8b5d04" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "c49ef55be8b1a30597e4315fac563282cac7870045a465ba7e1ee2c81db44cf6" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "cc4d48fde0650c666f87322ef3fec4987de06d99b4f008a07b667a7650451069" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "f6ffb60b14b0fda2e3a138f4d6a7e9cb71e8fc759d69cb0fda00aedcaa03ab0f" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst", "sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "977c126339368ac55ccd3cb658dcc6530d46426292735dc8cff95dad99543ebd" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "2319ab1753330cb13ea7ac56198d9da78123aaa6a3b66ea3d970a6c57de9ce41" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "0877802ec5502223f1b233573b2e87e3347a7922f2bb52702f9461958ac0c043" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "9c6ab1f22a157e7a74c35c4be3c025eb154e6315be9c2085451f59b11b63f8e1" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "345afdae010cf3c77e02c4e339749f3c3a5d4d62c3ed486edab0bb1d4089c67e" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "38892592ae5e45e27e4cad76d4364c549bdb386def54398cc26c9249bbd34760" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "00161836b5f27f1ce07be67337d08781033d6df4efe429bd922459738145ecdc" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "a0a02109ef5a5f4eae1a06003ba80544b405b155840ce5c3535b1c4e02d16f0e" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "32b275bc86c35471d9deea33b6119a33667a28477c06500db3ea9d1d0cdf7d4b" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "8110fc9517469dad0c291258e0dbdece6e4e3c9a51d539531527f4236692b7bd" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "e0519dd39f2f3297a84fa7c2e9c6fdda508386169474a47ebbb570c66f51c27c" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.gz", + "sha256": "2d32c6205a83ac776fe54d7777472725edfc204fd7a30befa0ee9c5f7fde80cc" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "6f63f6cf296f828ef1ff98041691e9a6126490000ae2e90648c0699ab1bde91f" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-amd64.tar.zst", + "sha256": "48bdbb2bc2652eb6647ce3f2ce215ac9bf12cf5fbe4936688e5de34605f0fb2c" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "b66332a3a903e1d18c783a7d58d9eb74aef9d4cb0fe91a4aa75a63cff5b3e92a" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.gz", + "sha256": "3e392555a295ec6f7e3ea477ded0bb71c04957dccd168de87d87226dfdbb753f" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "98abe8232378ef17f9890e3c77cd405a90e7aa2fdf5d612bd7d42ee174714cf6" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-core.linux-arm64.tar.zst", + "sha256": "29d28cb1b2035c1d5123fdb6bb0fa8cc647ad9cd570edf434bc7e560806426fa" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "4ea4b1fb4a653a5ad00dd206406482abddf9f53a1b1c4f884e7e7fb4fe720c90" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "e86e5631c691d2dcac99764542c875e4bed902f385f5a6e2f6e6b88facf114aa" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "d4dcaa35507a5f9d407a5d3a3fccee3e52061256bd0b420123bf888a24915758" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "396084ee38b31e5b78e3d8c3a015f8a56194119204aecb9de052a5be20c61e01" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst", "sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "b47becfdf139af069eaf1f691498ff689b577af43ed934edba119257bf652cab" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "38eecc385bbb77bde48d7dec9aa48bc897136c5714e5eff9c56c9df580dfb35d" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "b00afa052e7b67d4111f19a4eefb22095c836a7972911880e65dee2044975898" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "20e7b012ab2802a057be6cf6ef3d8f04a65484403615ddd3c2852d59d3ed7453" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "1e9a034a075472ecaa6f9e66c7ff2ada6f97b4a02a5e070ce36208b4eb4f1fcc" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "8b712f389d2118a802a70ec4175e83be0557a4b699bc238bd228c862aa337419" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "8ddfde1b1ceea2f08db9fef9da9cb9745bbe74b2520cfceeb150c623102401a3" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "dfa539c18041a6e0ef1747c469c718f7e608e031dbc99eada2dbf56768f6de72" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "b75549d8d650823ac9c8f5b5ba247901a8c5681ac91d909aea5a0d4f66d0b5bd" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "48a6e3c5fc5534b6c77957dd82e488f46cd6c6a713233da32ab18e94961f33a2" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "108543225439fc50053a904b953813a39a0d0d4e6c7a76a2e99a8ee26a69f1a2" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "c0f20bbcc6b238af7249c265a7c6458c30f9358007c1380c7b99de01ee219398" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "cf99f6af0ae8389926f9cba977370ffbe1ee261d429281957eb2b5cfb015a71e" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "eee8c18cf3bfea3df603e2d9fb0c30c75fcc7e88dc58c1cab1b8d5926aa8dd52" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "f76f06cd2344a2c44283733c0e02a94b1bea6c63bc0b7cb6aa2871a474661628" }, "images-traefik-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.gz", - "sha256": "1aed02afe45b0f6abe3b8934bdd6beee5a8018b31e81be896e9bbfbf75cd2bc5" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.gz", + "sha256": "f77681adb7835d43c2eb77d189573990f32fa8b3d98bf7d8fb559788f0e30eea" }, "images-traefik-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-amd64.tar.zst", "sha256": "aec23459c8e51ec16491b4657a3b2a64e49357d3e6cef0a11ac7d3c2f285fe4b" }, "images-traefik-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.gz", - "sha256": "4ffe8a7b25bc4c116f34b29f51de69ffbe7702f473f8b68577ac086f88e0c5fb" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.gz", + "sha256": "5a57534fd048ad725e15a38a8be65a642f6ad443cb55c9dad6eff276d704dd44" }, "images-traefik-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-traefik.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-traefik.linux-arm64.tar.zst", "sha256": "dd5efa19d02ca7a8a0bcb05febd2781e8ad85016c09b1defe09cdc5f494f05fc" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "4d1a7ba7c43d474d796d7b05a0f24a423b6c3a5a53388e9d803fd31c54efb912" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "c3e5339a35bba7b7184850935bbfcda7d6c2dc7dd4e34d7c9f390a58766ac654" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "d2f8909d694493222aa1051f8c013ffa73615567141336b872ada5c9e6312cd8" + "url": "https://github.com/rancher/rke2/releases/download/v1.35.5%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "f0a388912b6150d4ff820b53ee58c398d5572c325f381ad5ce4d82f0d10f5849" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_35/versions.nix b/pkgs/applications/networking/cluster/rke2/1_35/versions.nix index 3d645c28b4b5..a4893d822583 100644 --- a/pkgs/applications/networking/cluster/rke2/1_35/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_35/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.35.5+rke2r1"; - rke2Commit = "e28e7c1a0404f1e9bf36e8b7222d64aec6b7a004"; - rke2TarballHash = "sha256-t++HKNbR4WGzZiR6rVMke7lbixXA8H5ibovfitwPuXE="; + rke2Version = "1.35.5+rke2r2"; + rke2Commit = "a779b949d9a7987fc51e7c71c146db4160d0e3bf"; + rke2TarballHash = "sha256-eMqaz7DmIwANpvcQxEA6rJQcLmdBlEFT8Qju+Wr0dTo="; rke2VendorHash = "sha256-LV3ISu7bW6kxlKFe0GUqkB9Jte1Ey5DaWm+OKq1/1uY="; - k8sImageTag = "v1.35.5-rke2r1-build20260512"; + k8sImageTag = "v1.35.5-rke2r2-build20260521"; etcdVersion = "v3.6.7-k3s1-build20260512"; pauseVersion = "3.6"; ccmVersion = "v1.35.4-0.20260415195656-e51c0636351d-build20260415"; - dockerizedVersion = "v1.35.5-rke2r1"; + dockerizedVersion = "v1.35.5-rke2r2"; helmJobVersion = "v0.10.0-build20260513"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json index b82d9e141d76..8c5273df8031 100644 --- a/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json +++ b/pkgs/applications/networking/cluster/rke2/1_36/images-versions.json @@ -1,138 +1,138 @@ { "images-calico-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.gz", - "sha256": "bc9fb1ba72af6185de90e4e0f8a384993657c4b0fdedbb14e7ca5cf93bf2303d" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-amd64.tar.gz", + "sha256": "ec37f597d76bbe3f30b6108049faaf9f4a6e99b4d228f9b8485fb492c31aa0aa" }, "images-calico-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-amd64.tar.zst", - "sha256": "38fc5ecd017e9a66e3831ece42efedcfedaafc000759eaa4fb9f19a68122ec51" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-amd64.tar.zst", + "sha256": "5112e4bf4f4f5f553addb98abf53636b8ff57cbf18514d7537ec03c344d5b345" }, "images-calico-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.gz", - "sha256": "e86ac7f4cf14e4f02fcdd0e3d74e832fa43654f592068c2b5d8c044c69e2b749" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-arm64.tar.gz", + "sha256": "7161e8af4ae5c45d480be7083f15d3e7992745e9559d460584c5136d9caca789" }, "images-calico-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-calico.linux-arm64.tar.zst", - "sha256": "03df93db61bc54f351bb6131c632279c265d4b71af0a90e2a6898f9b99b453f4" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-calico.linux-arm64.tar.zst", + "sha256": "f63ba6f6b30564626d6839002117325b3d48b2f2a131a8bfeb1192244da1de7e" }, "images-canal-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.gz", - "sha256": "5cce5314ed6ff237c646723456c81876e89517b9164368728a9df00697655858" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-amd64.tar.gz", + "sha256": "7478fa0950554451cd856dbb8a800486f73fbb4758ccad28d1d218febe9b0b39" }, "images-canal-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-amd64.tar.zst", - "sha256": "3a7828ce0143c3eb91cae940cebdfa0145960e91be056e88a8b077ee39ccc54d" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-amd64.tar.zst", + "sha256": "d4d14e4ae3f34d0615fd6007e7048b54bc5a15be9f57fa6be6cd72346c39ccdf" }, "images-canal-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.gz", - "sha256": "e8346348137747fbd626846e5b71d182c49e8a1dcb997ea9e91f50e7bd907129" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-arm64.tar.gz", + "sha256": "4a77a243413b7963e3f3a98fcdb1cc2bd96cbe83b6a3f3d7ca73f05c1d7bd855" }, "images-canal-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-canal.linux-arm64.tar.zst", - "sha256": "ede6d29451a99d7f4663b6a2b8eb0cfa093f83b7b025fd5c4899fb02edac703d" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-canal.linux-arm64.tar.zst", + "sha256": "63b0888d1adebb72a77c2d1f1eb1ced1519cfdeb57681026a94c1f53f87f5610" }, "images-cilium-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.gz", - "sha256": "8c52261340b4af54186f83d2913c676a2dcef820f25a1b42b8c51cfef1dcdbc6" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-amd64.tar.gz", + "sha256": "83642c47920ab60e3042895aee5e56914187c822ac279178096c5430ce655988" }, "images-cilium-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-amd64.tar.zst", - "sha256": "865913456dc55b2ba4748b0fe76489e4960a60990f207341c66bcbf9e93e95b3" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-amd64.tar.zst", + "sha256": "442a391b5486a551fec98464a02396179e6f70a4cc41e0bb631b0ea70a8affc3" }, "images-cilium-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.gz", - "sha256": "4170bfc7d0ebf9167a94d24e393fbff0fc7dce4da1443257709fdbe603ffc579" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-arm64.tar.gz", + "sha256": "a5d7ec33831f617546aee8ad44a521e06cdef30c5ac9e3c23b1876dddacccb9b" }, "images-cilium-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-cilium.linux-arm64.tar.zst", - "sha256": "016caf748e5c39460b9618d998d261c7db8fe8348f9fa43d35693a47d4913b86" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-cilium.linux-arm64.tar.zst", + "sha256": "d5b757ba6313c6bfb4e85b238aa318ac12aeed7ec8f1e4af825405648737e1bb" }, "images-core-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.gz", - "sha256": "03a72f2c228131b7cb616c5b7758cd1c00b7f3e7d589573c5faf837e4e2ab764" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-amd64.tar.gz", + "sha256": "30ff144583c0b3249b06801d78c902305e1a5009bf3ab7211862d989fca18267" }, "images-core-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-amd64.tar.zst", - "sha256": "37acd15d183693fb0bb465840590593ed78d72415752a052d282a418fdb905cf" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-amd64.tar.zst", + "sha256": "e056f1ba054b8b39a68c4df19480d878327327583ea843f4a80ea0289e796e15" }, "images-core-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.gz", - "sha256": "4798bf3293e7b5b62e694bee8a811c3ace86bb5c7516c9f196a4ba48dc947c3f" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-arm64.tar.gz", + "sha256": "54d0d3d97462f8f70c75479cc77edd482cf318bef31ecaa3063b354432d7af9a" }, "images-core-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-core.linux-arm64.tar.zst", - "sha256": "ff8c770fa2b17151e333a0a4449bc4dc3cd5c65662ec88b2ffc31fde6a40d0ed" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-core.linux-arm64.tar.zst", + "sha256": "62528323277c307d46e0564288508d9203dc460f93be222075b5a1c1be1c910e" }, "images-flannel-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.gz", - "sha256": "0e5c71c9ecd89f11bb1cc0ea72a0297090e7a44395efe5fd74e14af3db3581a8" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-amd64.tar.gz", + "sha256": "b9742e4656c394dff69f7356e9fd22bc7ed4e0b4cac2d86e224cdbb5d793158e" }, "images-flannel-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-amd64.tar.zst", "sha256": "23695fd8c2a77f043a089c44437d12b5bde88422dbcd1d70edcda7a78f651137" }, "images-flannel-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.gz", - "sha256": "d9f75aaace63bcba2cbaeba2662d9877d39ec822621fd96824e9ec3fbe62a79c" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-arm64.tar.gz", + "sha256": "e2ea34d8f0207197758c75dbadb1e6ea1e31758ea26f49ac6cd8cb5ea941e743" }, "images-flannel-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-flannel.linux-arm64.tar.zst", - "sha256": "8aa8e19b739bc3fd897115f92d54acd081453441ee4dae8ca694ec47662838a7" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-flannel.linux-arm64.tar.zst", + "sha256": "39b36764f09857c01eaa9520da3e2d5023d7df881bc72379e4c55d05ebde8f6f" }, "images-harvester-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.gz", - "sha256": "c9442d489c4170fc515d04c2c5c7c76ff3ca2fb4093a94aea0d0a6fb1719c5d3" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-amd64.tar.gz", + "sha256": "34d08bdfe771f5d6c2c1a077519aa9dea2c4ec5ff6598812630b5175e15b0436" }, "images-harvester-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-amd64.tar.zst", - "sha256": "9551558d7baba1a78de7954f4801cf4329b5fb5ffd0cc3566b9fa32732ff950c" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-amd64.tar.zst", + "sha256": "04e83f1ee26a6e40cd4267025b85a8afba847e8b89bbf25ad33d3f598128c3d5" }, "images-harvester-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.gz", - "sha256": "11ea150625fc1a4700cec2859367692d533f7f9288f7196b331a77682766d742" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-arm64.tar.gz", + "sha256": "b56ec39e51d0f99a3bee9cb7b93fa5c07e4b91a2709bf6cca246d3c47f442c1d" }, "images-harvester-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-harvester.linux-arm64.tar.zst", - "sha256": "045db3938a0a11f6d5b4936f63471fec48fd76d29ef85e9cfe6bae5bddd8525e" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-harvester.linux-arm64.tar.zst", + "sha256": "e8a51c1926db9e71ab970b0a08a2becb85b2c2aab0108120d1f3d6d21f17f1cd" }, "images-ingress-nginx-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.gz", - "sha256": "0af77531d170d30b844518bb4665b29f3f386cf160f7c2b955467516f4d04dc3" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-amd64.tar.gz", + "sha256": "100d6841727443cc9558a4aaed924c1f23e8d39e4302bd32dac6fbdebed940e9" }, "images-ingress-nginx-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-amd64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-amd64.tar.zst", "sha256": "d5b7d3f12de0799cebf84fc6260fc4f093f2837c5fef6fc84849d8f1da5cbc22" }, "images-ingress-nginx-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.gz", - "sha256": "8c5d5eea216102e5dd07621671f2e462dfade184f20c81adb8facbaa58e59c2c" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-arm64.tar.gz", + "sha256": "f10675c08075e5312f650bde022990e2122de979e4559f2c56aa1ec941516eb2" }, "images-ingress-nginx-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-ingress-nginx.linux-arm64.tar.zst", + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-ingress-nginx.linux-arm64.tar.zst", "sha256": "363f42d83118e3398e72996f6b42477230000ffd50d93fdda570140ea020539b" }, "images-multus-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.gz", - "sha256": "ec3d8557e36db43acd9a76c38242de6feea354e41ae3ff8b9ab55de82ee19026" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-amd64.tar.gz", + "sha256": "70dd5bf043e5ade8f15bf794ed68c2632fa168cdabb88a59e1664c21802b1b72" }, "images-multus-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-amd64.tar.zst", - "sha256": "8be7075092a5e179e50fb526ea730018103d9f8a609f22f0d1431482690a9d7f" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-amd64.tar.zst", + "sha256": "98e17b69423ff3de402803a0ec2fb63748252c800c672a232f912d312cf41ff5" }, "images-multus-linux-arm64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.gz", - "sha256": "caebabf77d9d3190d76156990d8eaa0c2df5cb563a8447f1e506b50f4104e1a0" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-arm64.tar.gz", + "sha256": "70dc7d7e6b5ceee67e1ea31a9fb8915b23697b46ab81962fcf2bc23994eadcdb" }, "images-multus-linux-arm64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-multus.linux-arm64.tar.zst", - "sha256": "39bd89d250894254f7c1f9b061401a574716574ab3f51cc3a82c03eb4e804825" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-multus.linux-arm64.tar.zst", + "sha256": "7d768e2a1ba9eeb051e2cc74e1886a21cef515230a531a300dfe8b988a426fdf" }, "images-vsphere-linux-amd64-tar-gz": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.gz", - "sha256": "d07ed8b72db67fae9024540fca3eed7990b4a4b3a7ba6eef78a2eae8e6b3b4d3" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.gz", + "sha256": "a16d790a062b96f792952a8e87df314050032e1306d3f1b411c4c1e80cea574a" }, "images-vsphere-linux-amd64-tar-zst": { - "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r1/rke2-images-vsphere.linux-amd64.tar.zst", - "sha256": "4cd43197b21bd1344c0a7e87a7f28c8766b3edfab8e2fb2bb6954d144f3b44a7" + "url": "https://github.com/rancher/rke2/releases/download/v1.36.1%2Brke2r2/rke2-images-vsphere.linux-amd64.tar.zst", + "sha256": "bb33b083c06d621bb430942aad52ddfe45fd4cff956072104d83ea22ef91be02" } } diff --git a/pkgs/applications/networking/cluster/rke2/1_36/versions.nix b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix index 0df94c7d70dd..fd170c37f15f 100644 --- a/pkgs/applications/networking/cluster/rke2/1_36/versions.nix +++ b/pkgs/applications/networking/cluster/rke2/1_36/versions.nix @@ -1,13 +1,13 @@ { - rke2Version = "1.36.1+rke2r1"; - rke2Commit = "b4a8e78038f35eb282a8d6e3c29797a1181fa961"; - rke2TarballHash = "sha256-SD7+lNYu6/5iMxEmHEpkD8g9UCgN6gjkFsGdQn9o1Cc="; + rke2Version = "1.36.1+rke2r2"; + rke2Commit = "05cf623e2245271b63d1d7ef2caced897636175c"; + rke2TarballHash = "sha256-hxnO8w+ec9cx6betH2hdC50AO/VHmPlseeKV8HgH5ZE="; rke2VendorHash = "sha256-gUgRAC9yKDa8JYb/jdCxZdP6500XxjqHprmYlPv5A8c="; - k8sImageTag = "v1.36.1-rke2r1-build20260512"; + k8sImageTag = "v1.36.1-rke2r2-build20260521"; etcdVersion = "v3.6.7-k3s1-build20260512"; pauseVersion = "3.6"; - ccmVersion = "v1.36.0-rc2.0.20260427154526-d239025e2a23-build20260429"; - dockerizedVersion = "v1.36.1-rke2r1"; + ccmVersion = "v1.36.1-0.20260508014929-7bbbf7c9b258-build20260515"; + dockerizedVersion = "v1.36.1-rke2r2"; helmJobVersion = "v0.10.0-build20260513"; imagesVersions = with builtins; fromJSON (readFile ./images-versions.json); } diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index c1ef75053831..c55a27edcda8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -127,189 +127,13 @@ let removed = name: date: throw "the ${name} terraform provider removed from nixpkgs on ${date}"; in lib.optionalAttrs config.allowAliases { - _assert = archived "_assert" "2025/10"; - azurestack = archived "azurestack" "2025/10"; - googleworkspace = archived "googleworkspace" "2025/10"; - huaweicloudstack = archived "huaweicloudstack" "2025/10"; - metal = archived "metal" "2025/10"; - stackpath = archived "stackpath" "2025/10"; - vra7 = archived "vra7" "2025/10"; ccloud = removed "ccloud" "2025/11. Try sap-cloud-infrastructure_sci instead."; sapcc_ccloud = removed "sapcc_ccloud" "2025/11. Try sap-cloud-infrastructure_sci instead."; argocd = removed "argocd" "2025/12. Try argoproj-labs_argocd instead."; oboukili_argocd = removed "oboukili_argocd" "2025/12. Try argoproj-labs_argocd instead."; }; - # added 2025-10-12 - renamed-providers = lib.optionalAttrs config.allowAliases { - onepassword = - lib.warnOnInstantiate - "terraform-providers.onepassword has been renamed to terraform-providers.1password_onepassword" - actualProviders."1password_onepassword"; - thunder = lib.warnOnInstantiate "terraform-providers.thunder has been renamed to terraform-providers.a10networks_thunder" actualProviders.a10networks_thunder; - netlify = lib.warnOnInstantiate "terraform-providers.netlify has been renamed to terraform-providers.aegirhealth_netlify" actualProviders.aegirhealth_netlify; - aiven = lib.warnOnInstantiate "terraform-providers.aiven has been renamed to terraform-providers.aiven_aiven" actualProviders.aiven_aiven; - akamai = lib.warnOnInstantiate "terraform-providers.akamai has been renamed to terraform-providers.akamai_akamai" actualProviders.akamai_akamai; - alicloud = lib.warnOnInstantiate "terraform-providers.alicloud has been renamed to terraform-providers.aliyun_alicloud" actualProviders.aliyun_alicloud; - minio = lib.warnOnInstantiate "terraform-providers.minio has been renamed to terraform-providers.aminueza_minio" actualProviders.aminueza_minio; - auth0 = lib.warnOnInstantiate "terraform-providers.auth0 has been renamed to terraform-providers.auth0_auth0" actualProviders.auth0_auth0; - aviatrix = lib.warnOnInstantiate "terraform-providers.aviatrix has been renamed to terraform-providers.aviatrixsystems_aviatrix" actualProviders.aviatrixsystems_aviatrix; - dhall = lib.warnOnInstantiate "terraform-providers.dhall has been renamed to terraform-providers.awakesecurity_dhall" actualProviders.awakesecurity_dhall; - baiducloud = lib.warnOnInstantiate "terraform-providers.baiducloud has been renamed to terraform-providers.baidubce_baiducloud" actualProviders.baidubce_baiducloud; - brightbox = lib.warnOnInstantiate "terraform-providers.brightbox has been renamed to terraform-providers.brightbox_brightbox" actualProviders.brightbox_brightbox; - buildkite = lib.warnOnInstantiate "terraform-providers.buildkite has been renamed to terraform-providers.buildkite_buildkite" actualProviders.buildkite_buildkite; - pass = lib.warnOnInstantiate "terraform-providers.pass has been renamed to terraform-providers.camptocamp_pass" actualProviders.camptocamp_pass; - sops = lib.warnOnInstantiate "terraform-providers.sops has been renamed to terraform-providers.carlpett_sops" actualProviders.carlpett_sops; - checkly = lib.warnOnInstantiate "terraform-providers.checkly has been renamed to terraform-providers.checkly_checkly" actualProviders.checkly_checkly; - aci = lib.warnOnInstantiate "terraform-providers.aci has been renamed to terraform-providers.ciscodevnet_aci" actualProviders.ciscodevnet_aci; - ciscoasa = lib.warnOnInstantiate "terraform-providers.ciscoasa has been renamed to terraform-providers.ciscodevnet_ciscoasa" actualProviders.ciscodevnet_ciscoasa; - age = lib.warnOnInstantiate "terraform-providers.age has been renamed to terraform-providers.clementblaise_age" actualProviders.clementblaise_age; - cloudamqp = lib.warnOnInstantiate "terraform-providers.cloudamqp has been renamed to terraform-providers.cloudamqp_cloudamqp" actualProviders.cloudamqp_cloudamqp; - cloudflare = lib.warnOnInstantiate "terraform-providers.cloudflare has been renamed to terraform-providers.cloudflare_cloudflare" actualProviders.cloudflare_cloudflare; - cloudfoundry = lib.warnOnInstantiate "terraform-providers.cloudfoundry has been renamed to terraform-providers.cloudfoundry-community_cloudfoundry" actualProviders.cloudfoundry-community_cloudfoundry; - utils = lib.warnOnInstantiate "terraform-providers.utils has been renamed to terraform-providers.cloudposse_utils" actualProviders.cloudposse_utils; - cloudscale = lib.warnOnInstantiate "terraform-providers.cloudscale has been renamed to terraform-providers.cloudscale-ch_cloudscale" actualProviders.cloudscale-ch_cloudscale; - constellix = lib.warnOnInstantiate "terraform-providers.constellix has been renamed to terraform-providers.constellix_constellix" actualProviders.constellix_constellix; - porkbun = lib.warnOnInstantiate "terraform-providers.porkbun has been renamed to terraform-providers.cullenmcdermott_porkbun" actualProviders.cullenmcdermott_porkbun; - postgresql = lib.warnOnInstantiate "terraform-providers.postgresql has been renamed to terraform-providers.cyrilgdn_postgresql" actualProviders.cyrilgdn_postgresql; - rabbitmq = lib.warnOnInstantiate "terraform-providers.rabbitmq has been renamed to terraform-providers.cyrilgdn_rabbitmq" actualProviders.cyrilgdn_rabbitmq; - datadog = lib.warnOnInstantiate "terraform-providers.datadog has been renamed to terraform-providers.datadog_datadog" actualProviders.datadog_datadog; - nexus = lib.warnOnInstantiate "terraform-providers.nexus has been renamed to terraform-providers.datadrivers_nexus" actualProviders.datadrivers_nexus; - deno = lib.warnOnInstantiate "terraform-providers.deno has been renamed to terraform-providers.denoland_deno" actualProviders.denoland_deno; - hydra = lib.warnOnInstantiate "terraform-providers.hydra has been renamed to terraform-providers.determinatesystems_hydra" actualProviders.determinatesystems_hydra; - digitalocean = lib.warnOnInstantiate "terraform-providers.digitalocean has been renamed to terraform-providers.digitalocean_digitalocean" actualProviders.digitalocean_digitalocean; - libvirt = lib.warnOnInstantiate "terraform-providers.libvirt has been renamed to terraform-providers.dmacvicar_libvirt" actualProviders.dmacvicar_libvirt; - dnsimple = lib.warnOnInstantiate "terraform-providers.dnsimple has been renamed to terraform-providers.dnsimple_dnsimple" actualProviders.dnsimple_dnsimple; - dme = lib.warnOnInstantiate "terraform-providers.dme has been renamed to terraform-providers.dnsmadeeasy_dme" actualProviders.dnsmadeeasy_dme; - doppler = lib.warnOnInstantiate "terraform-providers.doppler has been renamed to terraform-providers.dopplerhq_doppler" actualProviders.dopplerhq_doppler; - bitbucket = lib.warnOnInstantiate "terraform-providers.bitbucket has been renamed to terraform-providers.drfaust92_bitbucket" actualProviders.drfaust92_bitbucket; - equinix = lib.warnOnInstantiate "terraform-providers.equinix has been renamed to terraform-providers.equinix_equinix" actualProviders.equinix_equinix; - exoscale = lib.warnOnInstantiate "terraform-providers.exoscale has been renamed to terraform-providers.exoscale_exoscale" actualProviders.exoscale_exoscale; - bigip = lib.warnOnInstantiate "terraform-providers.bigip has been renamed to terraform-providers.f5networks_bigip" actualProviders.f5networks_bigip; - fastly = lib.warnOnInstantiate "terraform-providers.fastly has been renamed to terraform-providers.fastly_fastly" actualProviders.fastly_fastly; - flexibleengine = lib.warnOnInstantiate "terraform-providers.flexibleengine has been renamed to terraform-providers.flexibleenginecloud_flexibleengine" actualProviders.flexibleenginecloud_flexibleengine; - fortios = lib.warnOnInstantiate "terraform-providers.fortios has been renamed to terraform-providers.fortinetdev_fortios" actualProviders.fortinetdev_fortios; - kubectl = lib.warnOnInstantiate "terraform-providers.kubectl has been renamed to terraform-providers.gavinbunney_kubectl" actualProviders.gavinbunney_kubectl; - gitlab = lib.warnOnInstantiate "terraform-providers.gitlab has been renamed to terraform-providers.gitlabhq_gitlab" actualProviders.gitlabhq_gitlab; - gandi = lib.warnOnInstantiate "terraform-providers.gandi has been renamed to terraform-providers.go-gandi_gandi" actualProviders.go-gandi_gandi; - gitea = lib.warnOnInstantiate "terraform-providers.gitea has been renamed to terraform-providers.go-gitea_gitea" actualProviders.go-gitea_gitea; - harbor = lib.warnOnInstantiate "terraform-providers.harbor has been renamed to terraform-providers.goharbor_harbor" actualProviders.goharbor_harbor; - grafana = lib.warnOnInstantiate "terraform-providers.grafana has been renamed to terraform-providers.grafana_grafana" actualProviders.grafana_grafana; - gridscale = lib.warnOnInstantiate "terraform-providers.gridscale has been renamed to terraform-providers.gridscale_gridscale" actualProviders.gridscale_gridscale; - archive = lib.warnOnInstantiate "terraform-providers.archive has been renamed to terraform-providers.hashicorp_archive" actualProviders.hashicorp_archive; - aws = lib.warnOnInstantiate "terraform-providers.aws has been renamed to terraform-providers.hashicorp_aws" actualProviders.hashicorp_aws; - awscc = lib.warnOnInstantiate "terraform-providers.awscc has been renamed to terraform-providers.hashicorp_awscc" actualProviders.hashicorp_awscc; - azuread = lib.warnOnInstantiate "terraform-providers.azuread has been renamed to terraform-providers.hashicorp_azuread" actualProviders.hashicorp_azuread; - azurerm = lib.warnOnInstantiate "terraform-providers.azurerm has been renamed to terraform-providers.hashicorp_azurerm" actualProviders.hashicorp_azurerm; - cloudinit = lib.warnOnInstantiate "terraform-providers.cloudinit has been renamed to terraform-providers.hashicorp_cloudinit" actualProviders.hashicorp_cloudinit; - consul = lib.warnOnInstantiate "terraform-providers.consul has been renamed to terraform-providers.hashicorp_consul" actualProviders.hashicorp_consul; - dns = lib.warnOnInstantiate "terraform-providers.dns has been renamed to terraform-providers.hashicorp_dns" actualProviders.hashicorp_dns; - external = lib.warnOnInstantiate "terraform-providers.external has been renamed to terraform-providers.hashicorp_external" actualProviders.hashicorp_external; - google = lib.warnOnInstantiate "terraform-providers.google has been renamed to terraform-providers.hashicorp_google" actualProviders.hashicorp_google; - google-beta = lib.warnOnInstantiate "terraform-providers.google-beta has been renamed to terraform-providers.hashicorp_google-beta" actualProviders.hashicorp_google-beta; - helm = lib.warnOnInstantiate "terraform-providers.helm has been renamed to terraform-providers.hashicorp_helm" actualProviders.hashicorp_helm; - http = lib.warnOnInstantiate "terraform-providers.http has been renamed to terraform-providers.hashicorp_http" actualProviders.hashicorp_http; - kubernetes = lib.warnOnInstantiate "terraform-providers.kubernetes has been renamed to terraform-providers.hashicorp_kubernetes" actualProviders.hashicorp_kubernetes; - local = lib.warnOnInstantiate "terraform-providers.local has been renamed to terraform-providers.hashicorp_local" actualProviders.hashicorp_local; - nomad = lib.warnOnInstantiate "terraform-providers.nomad has been renamed to terraform-providers.hashicorp_nomad" actualProviders.hashicorp_nomad; - null = lib.warnOnInstantiate "terraform-providers.null has been renamed to terraform-providers.hashicorp_null" actualProviders.hashicorp_null; - random = lib.warnOnInstantiate "terraform-providers.random has been renamed to terraform-providers.hashicorp_random" actualProviders.hashicorp_random; - tfe = lib.warnOnInstantiate "terraform-providers.tfe has been renamed to terraform-providers.hashicorp_tfe" actualProviders.hashicorp_tfe; - time = lib.warnOnInstantiate "terraform-providers.time has been renamed to terraform-providers.hashicorp_time" actualProviders.hashicorp_time; - tls = lib.warnOnInstantiate "terraform-providers.tls has been renamed to terraform-providers.hashicorp_tls" actualProviders.hashicorp_tls; - vault = lib.warnOnInstantiate "terraform-providers.vault has been renamed to terraform-providers.hashicorp_vault" actualProviders.hashicorp_vault; - vsphere = lib.warnOnInstantiate "terraform-providers.vsphere has been renamed to terraform-providers.hashicorp_vsphere" actualProviders.hashicorp_vsphere; - heroku = lib.warnOnInstantiate "terraform-providers.heroku has been renamed to terraform-providers.heroku_heroku" actualProviders.heroku_heroku; - hcloud = lib.warnOnInstantiate "terraform-providers.hcloud has been renamed to terraform-providers.hetznercloud_hcloud" actualProviders.hetznercloud_hcloud; - huaweicloud = lib.warnOnInstantiate "terraform-providers.huaweicloud has been renamed to terraform-providers.huaweicloud_huaweicloud" actualProviders.huaweicloud_huaweicloud; - ibm = lib.warnOnInstantiate "terraform-providers.ibm has been renamed to terraform-providers.ibm-cloud_ibm" actualProviders.ibm-cloud_ibm; - icinga2 = lib.warnOnInstantiate "terraform-providers.icinga2 has been renamed to terraform-providers.icinga_icinga2" actualProviders.icinga_icinga2; - infoblox = lib.warnOnInstantiate "terraform-providers.infoblox has been renamed to terraform-providers.infobloxopen_infoblox" actualProviders.infobloxopen_infoblox; - github = lib.warnOnInstantiate "terraform-providers.github has been renamed to terraform-providers.integrations_github" actualProviders.integrations_github; - artifactory = lib.warnOnInstantiate "terraform-providers.artifactory has been renamed to terraform-providers.jfrog_artifactory" actualProviders.jfrog_artifactory; - project = lib.warnOnInstantiate "terraform-providers.project has been renamed to terraform-providers.jfrog_project" actualProviders.jfrog_project; - sentry = lib.warnOnInstantiate "terraform-providers.sentry has been renamed to terraform-providers.jianyuan_sentry" actualProviders.jianyuan_sentry; - openwrt = lib.warnOnInstantiate "terraform-providers.openwrt has been renamed to terraform-providers.joneshf_openwrt" actualProviders.joneshf_openwrt; - triton = lib.warnOnInstantiate "terraform-providers.triton has been renamed to terraform-providers.joyent_triton" actualProviders.joyent_triton; - keycloak = lib.warnOnInstantiate "terraform-providers.keycloak has been renamed to terraform-providers.keycloak_keycloak" actualProviders.keycloak_keycloak; - neon = lib.warnOnInstantiate "terraform-providers.neon has been renamed to terraform-providers.kislerdm_neon" actualProviders.kislerdm_neon; - docker = lib.warnOnInstantiate "terraform-providers.docker has been renamed to terraform-providers.kreuzwerker_docker" actualProviders.kreuzwerker_docker; - launchdarkly = lib.warnOnInstantiate "terraform-providers.launchdarkly has been renamed to terraform-providers.launchdarkly_launchdarkly" actualProviders.launchdarkly_launchdarkly; - linode = lib.warnOnInstantiate "terraform-providers.linode has been renamed to terraform-providers.linode_linode" actualProviders.linode_linode; - htpasswd = lib.warnOnInstantiate "terraform-providers.htpasswd has been renamed to terraform-providers.loafoe_htpasswd" actualProviders.loafoe_htpasswd; - ssh = lib.warnOnInstantiate "terraform-providers.ssh has been renamed to terraform-providers.loafoe_ssh" actualProviders.loafoe_ssh; - incus = lib.warnOnInstantiate "terraform-providers.incus has been renamed to terraform-providers.lxc_incus" actualProviders.lxc_incus; - dexidp = lib.warnOnInstantiate "terraform-providers.dexidp has been renamed to terraform-providers.marcofranssen_dexidp" actualProviders.marcofranssen_dexidp; - bitwarden = lib.warnOnInstantiate "terraform-providers.bitwarden has been renamed to terraform-providers.maxlaverse_bitwarden" actualProviders.maxlaverse_bitwarden; - migadu = lib.warnOnInstantiate "terraform-providers.migadu has been renamed to terraform-providers.metio_migadu" actualProviders.metio_migadu; - kafka = lib.warnOnInstantiate "terraform-providers.kafka has been renamed to terraform-providers.mongey_kafka" actualProviders.mongey_kafka; - kafka-connect = lib.warnOnInstantiate "terraform-providers.kafka-connect has been renamed to terraform-providers.mongey_kafka-connect" actualProviders.mongey_kafka-connect; - mongodbatlas = lib.warnOnInstantiate "terraform-providers.mongodbatlas has been renamed to terraform-providers.mongodb_mongodbatlas" actualProviders.mongodb_mongodbatlas; - namecheap = lib.warnOnInstantiate "terraform-providers.namecheap has been renamed to terraform-providers.namecheap_namecheap" actualProviders.namecheap_namecheap; - jetstream = lib.warnOnInstantiate "terraform-providers.jetstream has been renamed to terraform-providers.nats-io_jetstream" actualProviders.nats-io_jetstream; - ansible = lib.warnOnInstantiate "terraform-providers.ansible has been renamed to terraform-providers.nbering_ansible" actualProviders.nbering_ansible; - newrelic = lib.warnOnInstantiate "terraform-providers.newrelic has been renamed to terraform-providers.newrelic_newrelic" actualProviders.newrelic_newrelic; - ns1 = lib.warnOnInstantiate "terraform-providers.ns1 has been renamed to terraform-providers.ns1-terraform_ns1" actualProviders.ns1-terraform_ns1; - linuxbox = lib.warnOnInstantiate "terraform-providers.linuxbox has been renamed to terraform-providers.numtide_linuxbox" actualProviders.numtide_linuxbox; - secret = lib.warnOnInstantiate "terraform-providers.secret has been renamed to terraform-providers.numtide_secret" actualProviders.numtide_secret; - nutanix = lib.warnOnInstantiate "terraform-providers.nutanix has been renamed to terraform-providers.nutanix_nutanix" actualProviders.nutanix_nutanix; - okta = lib.warnOnInstantiate "terraform-providers.okta has been renamed to terraform-providers.okta_okta" actualProviders.okta_okta; - oktaasa = lib.warnOnInstantiate "terraform-providers.oktaasa has been renamed to terraform-providers.oktadeveloper_oktaasa" actualProviders.oktadeveloper_oktaasa; - opennebula = lib.warnOnInstantiate "terraform-providers.opennebula has been renamed to terraform-providers.opennebula_opennebula" actualProviders.opennebula_opennebula; - openstack = lib.warnOnInstantiate "terraform-providers.openstack has been renamed to terraform-providers.terraform-provider-openstack_openstack" actualProviders.terraform-provider-openstack_openstack; - opentelekomcloud = lib.warnOnInstantiate "terraform-providers.opentelekomcloud has been renamed to terraform-providers.opentelekomcloud_opentelekomcloud" actualProviders.opentelekomcloud_opentelekomcloud; - opsgenie = lib.warnOnInstantiate "terraform-providers.opsgenie has been renamed to terraform-providers.opsgenie_opsgenie" actualProviders.opsgenie_opsgenie; - oci = lib.warnOnInstantiate "terraform-providers.oci has been renamed to terraform-providers.oracle_oci" actualProviders.oracle_oci; - ovh = lib.warnOnInstantiate "terraform-providers.ovh has been renamed to terraform-providers.ovh_ovh" actualProviders.ovh_ovh; - slack = lib.warnOnInstantiate "terraform-providers.slack has been renamed to terraform-providers.pablovarela_slack" actualProviders.pablovarela_slack; - pagerduty = lib.warnOnInstantiate "terraform-providers.pagerduty has been renamed to terraform-providers.pagerduty_pagerduty" actualProviders.pagerduty_pagerduty; - powerdns = lib.warnOnInstantiate "terraform-providers.powerdns has been renamed to terraform-providers.pan-net_powerdns" actualProviders.pan-net_powerdns; - elasticsearch = lib.warnOnInstantiate "terraform-providers.elasticsearch has been renamed to terraform-providers.phillbaker_elasticsearch" actualProviders.phillbaker_elasticsearch; - ct = lib.warnOnInstantiate "terraform-providers.ct has been renamed to terraform-providers.poseidon_ct" actualProviders.poseidon_ct; - matchbox = lib.warnOnInstantiate "terraform-providers.matchbox has been renamed to terraform-providers.poseidon_matchbox" actualProviders.poseidon_matchbox; - rancher2 = lib.warnOnInstantiate "terraform-providers.rancher2 has been renamed to terraform-providers.rancher_rancher2" actualProviders.rancher_rancher2; - rootly = lib.warnOnInstantiate "terraform-providers.rootly has been renamed to terraform-providers.rootlyhq_rootly" actualProviders.rootlyhq_rootly; - rundeck = lib.warnOnInstantiate "terraform-providers.rundeck has been renamed to terraform-providers.rundeck_rundeck" actualProviders.rundeck_rundeck; - sakuracloud = lib.warnOnInstantiate "terraform-providers.sakuracloud has been renamed to terraform-providers.sacloud_sakuracloud" actualProviders.sacloud_sakuracloud; - btp = lib.warnOnInstantiate "terraform-providers.btp has been renamed to terraform-providers.sap_btp" actualProviders.sap_btp; - scaleway = lib.warnOnInstantiate "terraform-providers.scaleway has been renamed to terraform-providers.scaleway_scaleway" actualProviders.scaleway_scaleway; - shell = lib.warnOnInstantiate "terraform-providers.shell has been renamed to terraform-providers.scottwinkler_shell" actualProviders.scottwinkler_shell; - selectel = lib.warnOnInstantiate "terraform-providers.selectel has been renamed to terraform-providers.selectel_selectel" actualProviders.selectel_selectel; - talos = lib.warnOnInstantiate "terraform-providers.talos has been renamed to terraform-providers.siderolabs_talos" actualProviders.siderolabs_talos; - skytap = lib.warnOnInstantiate "terraform-providers.skytap has been renamed to terraform-providers.skytap_skytap" actualProviders.skytap_skytap; - snowflake = lib.warnOnInstantiate "terraform-providers.snowflake has been renamed to terraform-providers.snowflake-labs_snowflake" actualProviders.snowflake-labs_snowflake; - spacelift = lib.warnOnInstantiate "terraform-providers.spacelift has been renamed to terraform-providers.spacelift-io_spacelift" actualProviders.spacelift-io_spacelift; - signalfx = lib.warnOnInstantiate "terraform-providers.signalfx has been renamed to terraform-providers.splunk-terraform_signalfx" actualProviders.splunk-terraform_signalfx; - spotinst = lib.warnOnInstantiate "terraform-providers.spotinst has been renamed to terraform-providers.spotinst_spotinst" actualProviders.spotinst_spotinst; - statuscake = lib.warnOnInstantiate "terraform-providers.statuscake has been renamed to terraform-providers.statuscakedev_statuscake" actualProviders.statuscakedev_statuscake; - sumologic = lib.warnOnInstantiate "terraform-providers.sumologic has been renamed to terraform-providers.sumologic_sumologic" actualProviders.sumologic_sumologic; - sysdig = lib.warnOnInstantiate "terraform-providers.sysdig has been renamed to terraform-providers.sysdiglabs_sysdig" actualProviders.sysdiglabs_sysdig; - tailscale = lib.warnOnInstantiate "terraform-providers.tailscale has been renamed to terraform-providers.tailscale_tailscale" actualProviders.tailscale_tailscale; - proxmox = lib.warnOnInstantiate "terraform-providers.proxmox has been renamed to terraform-providers.telmate_proxmox" actualProviders.telmate_proxmox; - temporalcloud = lib.warnOnInstantiate "terraform-providers.temporalcloud has been renamed to terraform-providers.temporalio_temporalcloud" actualProviders.temporalio_temporalcloud; - tencentcloud = lib.warnOnInstantiate "terraform-providers.tencentcloud has been renamed to terraform-providers.tencentcloudstack_tencentcloud" actualProviders.tencentcloudstack_tencentcloud; - remote = lib.warnOnInstantiate "terraform-providers.remote has been renamed to terraform-providers.tenstad_remote" actualProviders.tenstad_remote; - virtualbox = lib.warnOnInstantiate "terraform-providers.virtualbox has been renamed to terraform-providers.terra-farm_virtualbox" actualProviders.terra-farm_virtualbox; - lxd = lib.warnOnInstantiate "terraform-providers.lxd has been renamed to terraform-providers.terraform-lxd_lxd" actualProviders.terraform-lxd_lxd; - routeros = lib.warnOnInstantiate "terraform-providers.routeros has been renamed to terraform-providers.terraform-routeros_routeros" actualProviders.terraform-routeros_routeros; - hetznerdns = lib.warnOnInstantiate "terraform-providers.hetznerdns has been renamed to terraform-providers.timohirt_hetznerdns" actualProviders.timohirt_hetznerdns; - pocketid = lib.warnOnInstantiate "terraform-providers.pocketid has been renamed to terraform-providers.trozz_pocketid" actualProviders.trozz_pocketid; - turbot = lib.warnOnInstantiate "terraform-providers.turbot has been renamed to terraform-providers.turbot_turbot" actualProviders.turbot_turbot; - unifi = lib.warnOnInstantiate "terraform-providers.unifi has been renamed to terraform-providers.ubiquiti-community_unifi" actualProviders.ubiquiti-community_unifi; - ucloud = lib.warnOnInstantiate "terraform-providers.ucloud has been renamed to terraform-providers.ucloud_ucloud" actualProviders.ucloud_ucloud; - acme = lib.warnOnInstantiate "terraform-providers.acme has been renamed to terraform-providers.vancluever_acme" actualProviders.vancluever_acme; - venafi = lib.warnOnInstantiate "terraform-providers.venafi has been renamed to terraform-providers.venafi_venafi" actualProviders.venafi_venafi; - vinyldns = lib.warnOnInstantiate "terraform-providers.vinyldns has been renamed to terraform-providers.vinyldns_vinyldns" actualProviders.vinyldns_vinyldns; - avi = lib.warnOnInstantiate "terraform-providers.avi has been renamed to terraform-providers.vmware_avi" actualProviders.vmware_avi; - vcd = lib.warnOnInstantiate "terraform-providers.vcd has been renamed to terraform-providers.vmware_vcd" actualProviders.vmware_vcd; - wavefront = lib.warnOnInstantiate "terraform-providers.wavefront has been renamed to terraform-providers.vmware_wavefront" actualProviders.vmware_wavefront; - vpsadmin = lib.warnOnInstantiate "terraform-providers.vpsadmin has been renamed to terraform-providers.vpsfreecz_vpsadmin" actualProviders.vpsfreecz_vpsadmin; - vultr = lib.warnOnInstantiate "terraform-providers.vultr has been renamed to terraform-providers.vultr_vultr" actualProviders.vultr_vultr; - mailgun = lib.warnOnInstantiate "terraform-providers.mailgun has been renamed to terraform-providers.wgebis_mailgun" actualProviders.wgebis_mailgun; - yandex = lib.warnOnInstantiate "terraform-providers.yandex has been renamed to terraform-providers.yandex-cloud_yandex" actualProviders.yandex-cloud_yandex; - }; - # excluding aliases, used by terraform-full actualProviders = automated-providers // special-providers; in -actualProviders // removed-providers // renamed-providers // { inherit actualProviders mkProvider; } +actualProviders // removed-providers // { inherit actualProviders mkProvider; } diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index bfddf2080ff8..fbf9abf0d639 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -27,40 +27,40 @@ "vendorHash": null }, "aiven_aiven": { - "hash": "sha256-Yevs7mUu5Mr9JBbPE8CIKufYCLKealbBXrNL+mRH2Yw=", + "hash": "sha256-rXoDdoBK4yS/suC6lEnK+dWxcILRG+XcMNXVyVmeQYw=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.57.0", + "rev": "v4.60.0", "spdx": "MIT", - "vendorHash": "sha256-ndIxcO14+NAKmRs9wVEE/HhBx9Wj4AwiMv+nus6BDK4=" + "vendorHash": "sha256-4S5uyvSjtEOO1hK5MhuAmjsPBJ6qC1KN3/mrtRHU+P4=" }, "akamai_akamai": { - "hash": "sha256-M6Btq8wX1lsEs1HUaaTwGspnvS2IyE0L2ITe+ogDTlc=", + "hash": "sha256-AYvC8s8OKwlwF8eDoCsuOhOanCwbn/5u/vGumee6FNg=", "homepage": "https://registry.terraform.io/providers/akamai/akamai", "owner": "akamai", "repo": "terraform-provider-akamai", - "rev": "v10.2.0", + "rev": "v10.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-5IfYhOEhXRpdL7G3Op9a0Ep14el2gwcVmRMkGB7oWH4=" + "vendorHash": "sha256-031RZo1EqWrt79NvdrrZ9FW/E+mfwkGmr7wyMYX4SHg=" }, "aliyun_alicloud": { - "hash": "sha256-dIMlk/ZKIJjrkAk0EGCz3UTZvjbEltWq879331EEMD0=", + "hash": "sha256-G52l+5WlcxSNflx0ioD0jEKI1GBWe5D4qW8VH8k6uTA=", "homepage": "https://registry.terraform.io/providers/aliyun/alicloud", "owner": "aliyun", "repo": "terraform-provider-alicloud", - "rev": "v1.281.0", + "rev": "v1.285.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-lBD9ifRpUwg45V7zZG3grHvndG0V42oiX68zgcM7t74=" + "vendorHash": "sha256-sZeXHTrMUUPllPzvpbFjwA5FjFJXnO1k5h9B5i8U+vs=" }, "aminueza_minio": { - "hash": "sha256-TLwOp7dSMjwOjlxEzYbFgw/S+Zkv+tCdknSjonmsRJo=", + "hash": "sha256-lSjpFr0qBhCvwE1+DgaGPQe9gsgVNPh+go801BhedfY=", "homepage": "https://registry.terraform.io/providers/aminueza/minio", "owner": "aminueza", "repo": "terraform-provider-minio", - "rev": "v3.38.0", + "rev": "v3.38.5", "spdx": "AGPL-3.0", - "vendorHash": "sha256-BShrfr4EUvcpn0cLaohm1r5XqER4ba7bokHKuHxcW+g=" + "vendorHash": "sha256-gSGsjK6JOBN5NdV7tpTXU7UMze9t7UHMDe/W7suFNU0=" }, "argoproj-labs_argocd": { "hash": "sha256-c6+WY4oXL8evvPk/RzVrwtgq4XLB/LzAH5tpjErbE60=", @@ -73,13 +73,13 @@ "vendorHash": "sha256-FHBpTYSmVivoqz+Eaa/r5y1f/saIx4l6mjOtZhxZVRw=" }, "auth0_auth0": { - "hash": "sha256-v0EPS8sVHZRDkc8zJtVGL6pDFbHhxyW3D+iLYe0kSVI=", + "hash": "sha256-c/pgoD8aNcYQUjrPz4SobpJ+C8d4me5K6HKsAZPYdTg=", "homepage": "https://registry.terraform.io/providers/auth0/auth0", "owner": "auth0", "repo": "terraform-provider-auth0", - "rev": "v1.48.0", + "rev": "v1.53.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-xf2c6wjpBxEmWm2t3/fFvekGfi2XbruV/kWeBLcTN4g=" + "vendorHash": "sha256-Lv01jBbXTQOFQ4ljhqpx/n2fvvMNfGUHXfYDMlLDkdM=" }, "aviatrixsystems_aviatrix": { "hash": "sha256-46djOfAj/5kfeoKLQHbeKefzdGbmlBATR+uN/IaAn8I=", @@ -101,40 +101,40 @@ "vendorHash": "sha256-quoFrJbB1vjz+MdV+jnr7FPACHuUe5Gx9POLubD2IaM=" }, "baidubce_baiducloud": { - "hash": "sha256-+doYnLRuseR5YtqMJeoxJtnb0UGBx+UgZ7S1sOLiF68=", + "hash": "sha256-vSEPf0r7R5anuaTsAJFIx0GPTtrSKbRqqZoQA67Q2C0=", "homepage": "https://registry.terraform.io/providers/baidubce/baiducloud", "owner": "baidubce", "repo": "terraform-provider-baiducloud", - "rev": "v1.23.2", + "rev": "v1.23.5", "spdx": "MPL-2.0", "vendorHash": null }, "bpg_proxmox": { - "hash": "sha256-10cdMZSGJuhUx432/2NazA8T88zclcnbolcU31wfIEM=", + "hash": "sha256-lZQTbs5hPGswNiF5lJ+95y30i0TQAH3v5W4bVilp+CE=", "homepage": "https://registry.terraform.io/providers/bpg/proxmox", "owner": "bpg", "repo": "terraform-provider-proxmox", - "rev": "v0.109.0", + "rev": "v0.111.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Tx5DjRLZJXm0GjKRaogra7m55Opeu9LVvT25UW5q4D0=" + "vendorHash": "sha256-kvHI8cd/rl9kVKKzSwjrC0+Qikz3w2P9jgLvYa+T2DE=" }, "brightbox_brightbox": { - "hash": "sha256-pwFbCP+qDL/4IUfbPRCkddkbsEEeAu7Wp12/mDL0ABA=", + "hash": "sha256-bvwdtiwzXElhsXLmftXZQ567ExcC0E0L/5OeqIdp1SQ=", "homepage": "https://registry.terraform.io/providers/brightbox/brightbox", "owner": "brightbox", "repo": "terraform-provider-brightbox", - "rev": "v3.4.3", + "rev": "v3.4.4", "spdx": "MPL-2.0", - "vendorHash": "sha256-/dOiXO2aPkuZaFiwv/6AXJdIADgx8T7eOwvJfBBoqg8=" + "vendorHash": "sha256-TLNHhSyMw0rKFtd9EChg7zSGoxe57rh36nAPqu1j8w8=" }, "buildkite_buildkite": { - "hash": "sha256-MoucQgeikKMh4P8nRWIJ5SkLFGeVfDutsSBUSowz6VM=", + "hash": "sha256-egeZCTQFyhKG0giyjNK9C/W+OGMOGv2l+65Vg3iTi2A=", "homepage": "https://registry.terraform.io/providers/buildkite/buildkite", "owner": "buildkite", "repo": "terraform-provider-buildkite", - "rev": "v1.34.0", + "rev": "v1.35.0", "spdx": "MIT", - "vendorHash": "sha256-uYyj6GSV5bWEfRTOODMuReEHe9wnF4cVoHM9rBMpgmM=" + "vendorHash": "sha256-oYwtPTXNCkTizQWix2GYpb23mFvTmIzbcY3UTfB2Leo=" }, "camptocamp_pass": { "hash": "sha256-GQ2g7VyK+eeBqW3LMR4U0gMYsvQnG3y+KEKKkvnmfsk=", @@ -155,20 +155,20 @@ "vendorHash": "sha256-SO3CX7pZ+q7ytz/55cxTPlW7ByY1zKhxkQxMiqAvm8o=" }, "checkly_checkly": { - "hash": "sha256-9kcZXbrfl8ovrg1w3bWdta/ABnLtVIfseRptZn5NrgI=", + "hash": "sha256-or9qjJdA8sDmPnETyedWtsAWEsF9hJdDmPpX+qncN7E=", "homepage": "https://registry.terraform.io/providers/checkly/checkly", "owner": "checkly", "repo": "terraform-provider-checkly", - "rev": "v1.25.0", + "rev": "v1.26.0", "spdx": null, - "vendorHash": "sha256-7XgTkzYBfkpF8Dd4YsgpB+YIfkANsg/60b3AyO8Y8FA=" + "vendorHash": "sha256-nB77EpptqXhF+7/85h37CRQUk/iyq1ffSc2v2kQwFAQ=" }, "ciscodevnet_aci": { - "hash": "sha256-Z3qat3S7dv5kGpc82RxAwlgp3hfscFbkokVsgGnBRHY=", + "hash": "sha256-8QnmISiZGRbW60mN9I6UYWDo6f2HUIFersVs/pDUD3o=", "homepage": "https://registry.terraform.io/providers/CiscoDevNet/aci", "owner": "CiscoDevNet", "repo": "terraform-provider-aci", - "rev": "v2.19.0", + "rev": "v2.20.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -200,22 +200,22 @@ "vendorHash": "sha256-b27UcoNuaX3PxNlJLdU9njCl5JymBQhxD6rq8yT3gi4=" }, "cloudamqp_cloudamqp": { - "hash": "sha256-LAQ5MVZe4OSIJb7X6gdx1lPmgAEKZIm/7lL/93NTP6I=", + "hash": "sha256-n78nZ01ley9ueYBZ7+bi0BLJ/RIc66HHjcmhFwDem3E=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.45.3", + "rev": "v1.46.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-59bhibkok4w7dLTf96jZGk2di6TpR6IAqp0i3xmtlyI=" + "vendorHash": "sha256-rCWeetM6nhNb1I1PmB66E5K1ku9ODRqN87MU9y6W/dc=" }, "cloudflare_cloudflare": { - "hash": "sha256-1qgPmsk6lSTuESBy/kSrm2f/BnvTcrKqj+IphsKfqEw=", + "hash": "sha256-qy/bW3CnsSXoiCLPW+LVuBb7OQLhxIpCDNTyAdjU5rM=", "homepage": "https://registry.terraform.io/providers/cloudflare/cloudflare", "owner": "cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v5.19.1", + "rev": "v5.22.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-Gkb493fesB/jOdvnQrwt4MrNKO+YlR3+9Mu5TiaG084=" + "vendorHash": "sha256-IwklxMtQ6pOO/066SKx298ANoh0i/DiGtgqamenMi+s=" }, "cloudfoundry-community_cloudfoundry": { "hash": "sha256-1nYncJLVU/f9WD6Quh9IieIXgixPzbPk4zbtI1zmf9g=", @@ -265,13 +265,13 @@ "vendorHash": "sha256-vT1n4FN0s9rQFj4HuXPm6lvNdzWZMyrzeWAanHOQqCg=" }, "cyrilgdn_postgresql": { - "hash": "sha256-q4duDY9//BK5Jkg6stn0Ig4DJfzkc0gAkUua18XPgSM=", + "hash": "sha256-Z0hgD+tRi5tf+1k/KsktKNWGAgqeJNGzmUFGKNMUVJs=", "homepage": "https://registry.terraform.io/providers/cyrilgdn/postgresql", "owner": "cyrilgdn", "repo": "terraform-provider-postgresql", - "rev": "v1.26.0", + "rev": "v1.27.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-wUd5cFXX/oc96WFyNKgQxw8kvYDiqwpDM84wbNml7LA=" + "vendorHash": "sha256-Gcrdn6bKVS0Y7dNCo/cg+GpDE7b9NMP/au73jgY4aU0=" }, "cyrilgdn_rabbitmq": { "hash": "sha256-313I7E3mMiZfa7i5lZGIZolPMcGuSqhrTWVt3MVpEGA=", @@ -283,13 +283,13 @@ "vendorHash": "sha256-3o6YRDrq4rQhNAFyqiGJrAoxuAykWw85OExRGSE3kGI=" }, "datadog_datadog": { - "hash": "sha256-HGRv2leNSZleAmlsoTgbEng1W02XUAOaw5nFz6AeckI=", + "hash": "sha256-PmzUO8mCYQRYWI0MxFqVua+laKybLAFgeW9+9HZ/7A8=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v4.12.1", + "rev": "v4.15.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VBLDf6wkRT2k5ExmpQ1aDKf/BGqossVEQpGmeHsgrcQ=" + "vendorHash": "sha256-G3lkLzLo31XGDyTgprHd7LbbOaAGRvq9LTIth2vnH00=" }, "datadrivers_nexus": { "hash": "sha256-gwExaFhOoJFrAhH91oZEp1AFvI7kgWekp655zd4tyd8=", @@ -319,11 +319,11 @@ "vendorHash": null }, "digitalocean_digitalocean": { - "hash": "sha256-gvLdDUFg8WoBg8+351CCK84LhLJlsV6Nqm9kbxlQQ50=", + "hash": "sha256-r+Bi8F603JE9K4hZDFwuhYtfg3FKYNPP1A7lpvvrZQg=", "homepage": "https://registry.terraform.io/providers/digitalocean/digitalocean", "owner": "digitalocean", "repo": "terraform-provider-digitalocean", - "rev": "v2.89.0", + "rev": "v2.95.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -355,31 +355,31 @@ "vendorHash": null }, "dopplerhq_doppler": { - "hash": "sha256-vYLNRSk8U9Ez5+LrC9cr6Ux32p7n93WOJaM4lY7ghE0=", + "hash": "sha256-SS2S4JGG1Xu0p4k6lVlTr173Xanwc6hZ0A3osEWGdEg=", "homepage": "https://registry.terraform.io/providers/DopplerHQ/doppler", "owner": "DopplerHQ", "repo": "terraform-provider-doppler", - "rev": "v1.21.3", + "rev": "v1.21.4", "spdx": "Apache-2.0", "vendorHash": "sha256-B8mYLd4VdADWoQLWiCM85VQrBfDdlYQ0wkCp9eUBQ4U=" }, "drfaust92_bitbucket": { - "hash": "sha256-TPRHLR1wqX2uxV51iSk7IveqNQ1lLEy51G0fnfAM0No=", + "hash": "sha256-m5Ya99ulMesUwl54sbHuvOYumbPcAhWMESVGbXIOJpE=", "homepage": "https://registry.terraform.io/providers/DrFaust92/bitbucket", "owner": "DrFaust92", "repo": "terraform-provider-bitbucket", - "rev": "v2.51.0", + "rev": "v2.52.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RtS88NqkO1nG/8znM0sQqsAIfDc+sOMy8N4T4hmvaVA=" + "vendorHash": "sha256-uokHd4hDvWl6mrBa062F/uZmYPnW3TIZZKZwKBVq+Lo=" }, "e-breuninger_netbox": { - "hash": "sha256-04k9lKwoczptgoMW5C8EitP/u/Joi4/OCd3+I+nr5pc=", + "hash": "sha256-qyzw5a35twJ5gsEe0ANv6a9MMD0UyV8hYbYt/2bBJ/k=", "homepage": "https://registry.terraform.io/providers/e-breuninger/netbox", "owner": "e-breuninger", "repo": "terraform-provider-netbox", - "rev": "v5.4.0", + "rev": "v5.7.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-RWoe4QQE55lW+B20uDJt0qX3Om/oc3em3LXhN+cBoUY=" + "vendorHash": "sha256-y9GRTuoh1X6GfGkGZbPpO500y8DoJS1dnwZL3BCTUcY=" }, "equinix_equinix": { "hash": "sha256-Tn8CnLx2ibkj7qlzpYCX7Cm+yoTcZujVELMJSbG+/ec=", @@ -391,31 +391,31 @@ "vendorHash": "sha256-WFlKj1IO9ylXn5frdnLcctQawjUXBTqcoMhQUQTU06A=" }, "exoscale_exoscale": { - "hash": "sha256-eK9XWu1Hh/sFWkUO5r0HIcw8tIhhP1nzkI41B0DpMZg=", + "hash": "sha256-QIYIqJI/xznbkqR8E8R2LwF15M6ZdEntQ8JtdIwZypM=", "homepage": "https://registry.terraform.io/providers/exoscale/exoscale", "owner": "exoscale", "repo": "terraform-provider-exoscale", - "rev": "v0.69.2", + "rev": "v0.70.0", "spdx": "MPL-2.0", "vendorHash": null }, "f5networks_bigip": { - "hash": "sha256-tGERBmsYeoUPlTBknUOARQCs38cnAinJzFaRQDE2hHM=", + "hash": "sha256-CYTgJfT2RTS/affp4yZGgoUHPv5JeHfRTJ0JND7pqW4=", "homepage": "https://registry.terraform.io/providers/F5Networks/bigip", "owner": "F5Networks", "repo": "terraform-provider-bigip", - "rev": "v1.27.0", + "rev": "v1.28.0", "spdx": "MPL-2.0", "vendorHash": null }, "fastly_fastly": { - "hash": "sha256-S6VIwqwTPr276TTqgEFTxhE5c97lCd8/5dJnDGori4s=", + "hash": "sha256-I1a2wus61as24DMBZEZsl2C6YJ5B0CaIST/FM+8KMLc=", "homepage": "https://registry.terraform.io/providers/fastly/fastly", "owner": "fastly", "repo": "terraform-provider-fastly", - "rev": "v9.2.1", + "rev": "v9.3.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-8QF9gOuvuZwAoFWePjti4h6VzmA+TGiFaC/ShuEAZqA=" + "vendorHash": "sha256-TDU8T91em1+Y+0LN6FQSGEKJ4T9dIUxyuOTvx6HBYjg=" }, "flexibleenginecloud_flexibleengine": { "hash": "sha256-yEZ9JiUSqFFbfqzOOD59ZBv4yFCeUBBKlp6aiUqDqiM=", @@ -427,13 +427,13 @@ "vendorHash": "sha256-ZbU2z7qUHPR7vDSflesSjgK7x3LYXVe/gnVsy19q6Bs=" }, "fortinetdev_fortios": { - "hash": "sha256-w7LxnOEAoeJKyicI8Bfd2yH+3oTz3ZVBnskbSEgZBO4=", + "hash": "sha256-etGi9KDbmET8Eh4DPJkNA/HbjR+1VUBADlf3MKWbqkc=", "homepage": "https://registry.terraform.io/providers/fortinetdev/fortios", "owner": "fortinetdev", "repo": "terraform-provider-fortios", - "rev": "1.24.1", + "rev": "1.25.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-V+D/D+i1xbPp9IAfrAds2rNv5t/aXQxPwH9vY09DsMo=" + "vendorHash": "sha256-ZU05thGO6uUsAxEi/aMQFxlQZ57okGfDEHx/+wNe+x8=" }, "gavinbunney_kubectl": { "hash": "sha256-UQ/xvhs7II+EGH5bKdrVC47hp5dhLqQZeqSBz06ho1s=", @@ -445,13 +445,13 @@ "vendorHash": "sha256-FcxAh8EOvnT8r1GHu0Oj2C5Jgbr2WPwD7/vY4/qIvTA=" }, "gitlabhq_gitlab": { - "hash": "sha256-pMwgByUQPPKM6ZQP/DkbJERXPqfw6pU/zMnJH2YXhCE=", + "hash": "sha256-BMOFi/g0W6xo/Kfqw8oqsMeeU3aXyWAKSgF9lIS4AbA=", "homepage": "https://registry.terraform.io/providers/gitlabhq/gitlab", "owner": "gitlabhq", "repo": "terraform-provider-gitlab", - "rev": "v19.0.0", + "rev": "v19.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-YdNHXnJXUIYrq9BJ+58+0LEtgKNCF481pAsggBRjISA=" + "vendorHash": "sha256-9aoJGVTC9t76auYy8K3QSWGzSAq9aTxemKNc3aCLjRY=" }, "go-gandi_gandi": { "hash": "sha256-fsCtmwyxkXfOtiZG27VEb010jglK35yr4EynnUWlFog=", @@ -472,22 +472,22 @@ "vendorHash": "sha256-/8h2bmesnFz3tav3+iDelZSjp1Z9lreexwcw0WdYekA=" }, "goharbor_harbor": { - "hash": "sha256-2mi1QlWPAPGVr/Q0xOQjI8R8baeyJotjjoKZyQYNJg0=", + "hash": "sha256-P7xfHqXZAdXIQPzfWh+PU/gx1XgGP+q/YT28PSErZ+I=", "homepage": "https://registry.terraform.io/providers/goharbor/harbor", "owner": "goharbor", "repo": "terraform-provider-harbor", - "rev": "v3.11.6", + "rev": "v3.12.1", "spdx": "MIT", - "vendorHash": "sha256-874QpqIFFhzIGJZ8nKGcUe9qEpR9jQkx4nl75Cpqpww=" + "vendorHash": "sha256-N0AYv7XGmo7D1gcDGsmO9JoBGRiJWj10OZptWgO7NPs=" }, "grafana_grafana": { - "hash": "sha256-STYK0M5eq5hECKJUrk2Q4qhOrPt+eiyIGi0boukSHBM=", + "hash": "sha256-ZZpk0I9MIiGpS354rER+HZNsB5S0U+fQaaCu5Lu5BL4=", "homepage": "https://registry.terraform.io/providers/grafana/grafana", "owner": "grafana", "repo": "terraform-provider-grafana", - "rev": "v4.36.2", + "rev": "v4.41.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-VEAtUCVZ3nJ1jfDYkkek+VQ1LjNQgRstRNtsM05ebZo=" + "vendorHash": "sha256-AyVCuqbVPoEMgcDmJsyJDstYFkukoDq7iIkfbvlAiE0=" }, "gridscale_gridscale": { "hash": "sha256-FAKvQ/MEod5Ck0PG4ffQ+gQp6zZ0JDRXPOrOiDpWMls=", @@ -508,38 +508,38 @@ "vendorHash": "sha256-ikBqIxD5aTOcwNHCMN6EaOwSHCAP5n/SULuqQXPLpOc=" }, "hashicorp_aws": { - "hash": "sha256-073kfB/vwTtlbjO3I4s+QLPQT127Hvab8jc7/NFvcmk=", + "hash": "sha256-ZeFC9ebkt7SWFOCpt6zD60wOTRB8tiV6SQYr/O38FRw=", "homepage": "https://registry.terraform.io/providers/hashicorp/aws", "owner": "hashicorp", "repo": "terraform-provider-aws", - "rev": "v6.49.0", + "rev": "v6.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DyYT8SK5/IbkXWvzRTF6TjTi4aIpokLPOz5H/O05YU8=" + "vendorHash": "sha256-/6esBCIsNXUmx38NXUk/d3Td4uSgwZXvkETQhaERwLQ=" }, "hashicorp_awscc": { - "hash": "sha256-/4NhHZs/8LwrL+TXoOGyszvHZcKps5tDu7uewKeNmb4=", + "hash": "sha256-SziDO4K6qv62zolBKdrhXIyaEOMM5hJ0h6ros1wC2l0=", "homepage": "https://registry.terraform.io/providers/hashicorp/awscc", "owner": "hashicorp", "repo": "terraform-provider-awscc", - "rev": "v1.88.0", + "rev": "v1.93.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-vTJI/71O8u6DqAF3E7pde1Z1qsoyTTJMNen3AvRomls=" + "vendorHash": "sha256-dGxUV7gK4Af4O6FnZ2Pm6OKX0/xVU9+8nfUd0R/ot+Y=" }, "hashicorp_azuread": { - "hash": "sha256-BkQwLkGu8Xmb4laoXOLDbSPyya5v8HBBNIya5hUBlV8=", + "hash": "sha256-mEYEZIztDjyqWSJFoJPXtV0E9YikumtwGVtZA4Jfw3U=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v3.8.0", + "rev": "v3.9.0", "spdx": "MPL-2.0", "vendorHash": null }, "hashicorp_azurerm": { - "hash": "sha256-NJ3g5w9bkY7tM/f67HOEiq6Uz99CHaJBKaW+mLHrxFM=", + "hash": "sha256-XJmSVCX6rigPD4oi0S4qUyvgvR5SkCHZV2rMAqsmIIo=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v4.76.0", + "rev": "v4.79.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -580,22 +580,22 @@ "vendorHash": "sha256-sPQR+LDZRMXygLUd9xj6/bI+8DhAPKbkytlTzmrEOBU=" }, "hashicorp_google": { - "hash": "sha256-GTcMwL5lZ81KDtohog4cCvy9zxXU/jh5k+aLosZZfRM=", + "hash": "sha256-QgGEF8L4O6ON1VhEUFrLwc2WNUSt8qIjn5DWVOQAxB0=", "homepage": "https://registry.terraform.io/providers/hashicorp/google", "owner": "hashicorp", "repo": "terraform-provider-google", - "rev": "v7.35.0", + "rev": "v7.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-R3Bd+n/ySx4FyDQAP72P0hIjTSQjzNJE2QqUgRV+eQE=" + "vendorHash": "sha256-moP2fqZnj8J6IFAhb0n6pikVYVg2Is22xd/xuuJ+zIQ=" }, "hashicorp_google-beta": { - "hash": "sha256-WsZY4O5kUoOkDcP2iKmkLo85XaBM2oQxaB/7ibJMDwA=", + "hash": "sha256-wf+pFYuDMqlFYvaTKTpgaeSSBoLgQlUAarobUAotLMo=", "homepage": "https://registry.terraform.io/providers/hashicorp/google-beta", "owner": "hashicorp", "repo": "terraform-provider-google-beta", - "rev": "v7.35.0", + "rev": "v7.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-CjrVDZpRlnPA1MnWEZdFyO3YzgaHqTsiw+kKOW+//2g=" + "vendorHash": "sha256-7f0HZQXVsIq7m8CUApTnHIroOjKwT1GaP+GjCf4C6n0=" }, "hashicorp_helm": { "hash": "sha256-Dw6khnp0pronRKbBv2gx8ygtVvRV9uQIHCXj2BblZ6k=", @@ -616,13 +616,13 @@ "vendorHash": "sha256-hh0tOG9HY0cWTda5vjpGwCGntD7I/wCJf6B92EMKRrQ=" }, "hashicorp_kubernetes": { - "hash": "sha256-P0V0bUkRDwo1EK9D5VE/F7BIz0uov3XsRr5tPbevAI8=", + "hash": "sha256-B/BPhNlQytohgRWdO4oA1FcB8zneVieXlOqYzr+HJX4=", "homepage": "https://registry.terraform.io/providers/hashicorp/kubernetes", "owner": "hashicorp", "repo": "terraform-provider-kubernetes", - "rev": "v3.2.0", + "rev": "v3.2.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-TUs0DTfbNYOwKdUTJmiB1/ja97r+GsVH+k5VMp/wKrI=" + "vendorHash": "sha256-GyuSdDpsOqd1ntwAm09AKCoxeFOLhXo0jPTTxYZC+vg=" }, "hashicorp_local": { "hash": "sha256-qntV0gfxEVV24gqiVOvUai+pai4vvU+KtLmLBqOBQbY=", @@ -661,13 +661,13 @@ "vendorHash": "sha256-CwTlb0QTq0lpZK90IL6mBLoarFYFLsjiLYauGEaR1Rk=" }, "hashicorp_tfe": { - "hash": "sha256-GRrtwrShJj+d2h6CpxjP+QmRKQLTWoNt5889ek9rfyE=", + "hash": "sha256-y6FZamAq/YhynWe55Syy5xA6aSPOeECkWRQbML1AjQU=", "homepage": "https://registry.terraform.io/providers/hashicorp/tfe", "owner": "hashicorp", "repo": "terraform-provider-tfe", - "rev": "v0.77.0", + "rev": "v0.79.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-DutNev1ABazfV6QOWMFsFc0QSkffARhaJ7RXTWG2Jyo=" + "vendorHash": "sha256-PKAFhHCaeCtV1frMyCidCcJgWTA8/7Cbdq6h3RTeqAQ=" }, "hashicorp_time": { "hash": "sha256-5+iPq2It3oFHPBHWshfIuNo1xkOPcuSYyljt6j+j7lg=", @@ -688,13 +688,13 @@ "vendorHash": "sha256-aM9bDzYM4RW3cIeJCMnIB9VqEaPV4D0r3zMOU3d0QDs=" }, "hashicorp_vault": { - "hash": "sha256-k/S1ez6q70vvnHMfU2aweTFzRnLlYbxUEh4xZumT1mo=", + "hash": "sha256-Jl1mF2DIzLcXmevrFGLjnThUBR0TXiXvvgQYwFLwBtE=", "homepage": "https://registry.terraform.io/providers/hashicorp/vault", "owner": "hashicorp", "repo": "terraform-provider-vault", - "rev": "v5.9.0", + "rev": "v5.10.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-0TJbC7gG5yduWrzp7MN5WWDjsdyL6RqXmOlIDs3OtaU=" + "vendorHash": "sha256-MMivACUsYhJg+wkag08NHEYkjjdJouq+QCR08CTAiKM=" }, "hashicorp_vsphere": { "hash": "sha256-vRO6vxzi4d0hNc0MmQLhN7roONnsjxPBtFt0fyvxWd8=", @@ -706,40 +706,40 @@ "vendorHash": "sha256-47xWjlzpQ/EYzjbuuMKQiu5cfYAXdYkXRl+AOEP+sA4=" }, "heroku_heroku": { - "hash": "sha256-hR4DvSneqG/5P4tYljcuFxQ34AnDIjIt+JMn1BhloeU=", + "hash": "sha256-AmHgAlz4J3l9OCjUMVxLMWtKZB1LpNOyX1exUI6fWHA=", "homepage": "https://registry.terraform.io/providers/heroku/heroku", "owner": "heroku", "repo": "terraform-provider-heroku", - "rev": "v5.3.2", + "rev": "v5.4.0", "spdx": "MPL-2.0", "vendorHash": null }, "hetznercloud_hcloud": { - "hash": "sha256-yIzI1p4U8klNqqFqiMuKhVb8njoslJ+vDXFOv+9EmFw=", + "hash": "sha256-pfcgLftuPwbVsKVPAE0iF9p59eK12dtLjwPY2YMy4KE=", "homepage": "https://registry.terraform.io/providers/hetznercloud/hcloud", "owner": "hetznercloud", "repo": "terraform-provider-hcloud", - "rev": "v1.64.0", + "rev": "v1.66.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-f49amYWzWSG9tzY6wvpxtTFiyJ8zC/Lc1hIQtzdgJRs=" + "vendorHash": "sha256-Hh9sMVRVVoUEsu6nqdHhmPO2q4xPfyb0VNbhDvyPdRg=" }, "huaweicloud_huaweicloud": { - "hash": "sha256-4KRJhLnpKZwmL5aQqva8JZGDCYBzlGepE7zP6hwP+KY=", + "hash": "sha256-1WVZ5NOvVFuRIWJQpFy9lRvlt5GbOHINFISABexcb/M=", "homepage": "https://registry.terraform.io/providers/huaweicloud/huaweicloud", "owner": "huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.92.0", + "rev": "v1.95.0", "spdx": "MPL-2.0", "vendorHash": null }, "ibm-cloud_ibm": { - "hash": "sha256-bLbm+wbC+2bMor9fYmB6J+iclSOsdP3dIkJiy3Jk6Xg=", + "hash": "sha256-hDLD3h+640IRIL5lDegn4W2tOuSef6Bi5JWdlLbtqoM=", "homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm", "owner": "IBM-Cloud", "repo": "terraform-provider-ibm", - "rev": "v2.2.2", + "rev": "v2.4.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-FFQEmg2hui1KyzP1WWR6Lx9tKi2aEDAHKztubHMaTAQ=" + "vendorHash": "sha256-/UNr2OiDlq0gX3D77mbruDj9WMnS/0AxkoEaBcWlFHU=" }, "icinga_icinga2": { "hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=", @@ -760,13 +760,13 @@ "vendorHash": null }, "integrations_github": { - "hash": "sha256-OpuKe7/Ymr46J41zgYdk1Qet+trEGTafl6TM23PV1lA=", + "hash": "sha256-2y25AE4iLckdvvFv+vPRdl2wLCPlUnK2Xc73m0qVyxc=", "homepage": "https://registry.terraform.io/providers/integrations/github", "owner": "integrations", "repo": "terraform-provider-github", - "rev": "v6.12.1", + "rev": "v6.13.0", "spdx": "MIT", - "vendorHash": "sha256-qzyV/rgQ79XvoTBRjjIsPFfqAXLROiIAlY7Y/d8SYcM=" + "vendorHash": "sha256-crDSVC0UvJ8fXoKwSgyFWHivwOA9XRO7dXoEOYLPZTo=" }, "jfrog_artifactory": { "hash": "sha256-BSUOmqHwnDEYojtwTXBWo9oGG2FbgaODUKClZPCaK/I=", @@ -787,13 +787,13 @@ "vendorHash": "sha256-mnKXYT0GfIS+ODzBCS9l4rLF1ugadesmpgdOgj74nLg=" }, "jianyuan_sentry": { - "hash": "sha256-/FOpuCdMkUHpJN3z18guNqzG4Ujv8B+gZ67R2TgqKBk=", + "hash": "sha256-V0+vbeECEaeOwr8a1HohdClZKwVkjHSxbhu86Bl9ZKE=", "homepage": "https://registry.terraform.io/providers/jianyuan/sentry", "owner": "jianyuan", "repo": "terraform-provider-sentry", - "rev": "v0.15.1", + "rev": "v0.15.4", "spdx": "MIT", - "vendorHash": "sha256-6XGS1T1bMUQKPOTqS3i92ZMfyD00ZovTuCViYyM/OEU=" + "vendorHash": "sha256-qSLy0iPPiJ9EdpU1D879bICDKwJfDA+JnxCepsvGVbA=" }, "joneshf_openwrt": { "hash": "sha256-z78IceF2VJtiQpVqC+rTUDsph73LZawIK+az3rEhljA=", @@ -824,40 +824,40 @@ "vendorHash": "sha256-JTcIyUKoeCRxAzUWJy9FkMCYy3+D70uyzuiSTW3nHlA=" }, "kislerdm_neon": { - "hash": "sha256-1o5EnAI9X8Q+dXxh1/jZwimy1MmPDF3X2aRc+HO7HpQ=", + "hash": "sha256-NvAQY8uoTtBoyx6XF8rruaRXVRARAr1yFKFkBes6Css=", "homepage": "https://registry.terraform.io/providers/kislerdm/neon", "owner": "kislerdm", "repo": "terraform-provider-neon", - "rev": "v0.13.0", + "rev": "v0.14.0", "spdx": "MPL-2.0", "vendorHash": "sha256-7mJ+BX7laBKsr4DX1keMXnGi79CZp8M1jD0COQ1lcmU=" }, "kreuzwerker_docker": { - "hash": "sha256-wC0XYOGx3CBrXOkISmYFMMqcNijl3u2XZzrVOPF+EDo=", + "hash": "sha256-prvQBNT2OhKmH0ABIs7saRqpURZwO+ntfIxoGe/KmMc=", "homepage": "https://registry.terraform.io/providers/kreuzwerker/docker", "owner": "kreuzwerker", "repo": "terraform-provider-docker", - "rev": "v4.4.0", + "rev": "v4.5.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PIltVJ3o3ROFi1ensrJyFYEsCm6nEFXHkkTPU3ho+gU=" + "vendorHash": "sha256-EAv8EeNn0PJ3BElmg6sKkd/LXNe0lFjEIjHuZRG3CoQ=" }, "launchdarkly_launchdarkly": { - "hash": "sha256-DCc+qQdVVDdFiHaDv6jc4MUuWPemk3XEeBEKAbTUi7M=", + "hash": "sha256-xQhWB5gUO10v7KXXHci3gvXlI/hg7JXsn9bYxHVGJwc=", "homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly", "owner": "launchdarkly", "repo": "terraform-provider-launchdarkly", - "rev": "v2.29.0", + "rev": "v2.30.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-OgKOjLwDQxJiv+VWdOzjMcUDPu9LOuhyTRyLyM39vLM=" + "vendorHash": "sha256-9RisIZUblqqylMW6Bz6ehpwRUXyvTdicuhEGI+n5G3Y=" }, "linode_linode": { - "hash": "sha256-aOLto01ntce/l+1ZcQf5Rsdu6ptgpYWpf5JpJ0zRUNs=", + "hash": "sha256-N/SVZ1ajNRT53zxdYBT6Hd/wwAuKhEre0QSZUYbkwGA=", "homepage": "https://registry.terraform.io/providers/linode/linode", "owner": "linode", "repo": "terraform-provider-linode", - "rev": "v3.14.1", + "rev": "v4.1.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-dnvv6sSzEUZ4Hbrq/pAgi/O1RyxCx89omCVzvCe70S0=" + "vendorHash": "sha256-r5T8kmvCb2iBUJqw5m7hrr+ET7U9kIBUbsvEVqZlgrE=" }, "loafoe_htpasswd": { "hash": "sha256-1HCvAGWsYlcYCA8iOmBb/AawxHPLuoxxQWLzNy0x79M=", @@ -878,13 +878,13 @@ "vendorHash": "sha256-vcuUt3WIo1TnLApch410JgtyCzliQRYMQQQ2Z9diDZ8=" }, "lxc_incus": { - "hash": "sha256-m3xUqIUvowu+SZ7TxXYKjOv0Th/Pah0MXVAdaaSPeCo=", + "hash": "sha256-Jabbg13UetT4B+kGNP2DDEXFALR8apqjPB5xWkHF5UA=", "homepage": "https://registry.terraform.io/providers/lxc/incus", "owner": "lxc", "repo": "terraform-provider-incus", - "rev": "v1.1.0", + "rev": "v1.1.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-vTJXA7vHVE/m68gr1nHInGs/2T/4OzwS6T3BAAJ+ATo=" + "vendorHash": "sha256-nRkttehaieVOcTBJ3rIU/JHtv/q4fU18z8MUo3xtE28=" }, "marcofranssen_dexidp": { "hash": "sha256-Aby3FNEA6LgsGM/N10LNu9sCv3f2N8WIrmWoqEqTa8E=", @@ -905,13 +905,13 @@ "vendorHash": "sha256-t4dbDJNjEQ6/u+/6zqk2Sdd3LVn/L2BCJujpiLdGc58=" }, "metio_migadu": { - "hash": "sha256-q+7tTBMxqGlN6GyosnL70/qGtnwueWr1n+WI5BhnV4E=", + "hash": "sha256-Aef1H/L2EFeU9mhecOnlPAbJbt3XfBL0Wz67IqxCI10=", "homepage": "https://registry.terraform.io/providers/metio/migadu", "owner": "metio", "repo": "terraform-provider-migadu", - "rev": "2026.5.28", + "rev": "2026.7.2", "spdx": "0BSD", - "vendorHash": "sha256-ap1+0luy/9OQYNkYh1Aj+2LPMt7JdhKNn0ENrQMz3Uk=" + "vendorHash": "sha256-wUX2smEhKUftBCRi7ANq8NpHXpB+EmlVshrhI2ltY2I=" }, "mongey_kafka": { "hash": "sha256-rTa6c7jAMH027V7h/yUGVGz6TS0PDdObilxU0Vpr6FI=", @@ -932,13 +932,13 @@ "vendorHash": "sha256-ulhKT0DaS6gg9Ucz9pqqIg4mxRpGDGz2rN1R0RNuumg=" }, "mongodb_mongodbatlas": { - "hash": "sha256-8HZOdEHD5KwVuSDe3EDX54nPqn3Uz6kooi/HEGoI3F0=", + "hash": "sha256-AC2dxPaWzwYzNfMZtIHsCVkRU6U8NX1soL8zFzxomE8=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v2.12.0", + "rev": "v2.14.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-c864XU6t/ehD1KhlV0aBddEc0eifWHHWeS67BH3odbM=" + "vendorHash": "sha256-oGCpF+upWZfYfobtbakmTLu+8/ZU+c88v6Ffd4UTBX0=" }, "namecheap_namecheap": { "hash": "sha256-eV2K3KHTEXEEt1WXwfYfNMK+gLUY0EoHFQg9kLdAI3s=", @@ -968,22 +968,22 @@ "vendorHash": "sha256-OAd8SeTqTrH0kMoM2LsK3vM2PI23b3gl57FaJYM9hM0=" }, "newrelic_newrelic": { - "hash": "sha256-eQpwxA51hmysBpvTVgcyTlBTpHqfeRy+tLl5HTxAPAk=", + "hash": "sha256-qElRjPX7275o7HxTXzwNNJbh3Wjn1EJ6NnHq17Ant4o=", "homepage": "https://registry.terraform.io/providers/newrelic/newrelic", "owner": "newrelic", "repo": "terraform-provider-newrelic", - "rev": "v3.91.0", + "rev": "v3.95.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-MP3CHOybrF3EoynQ5Wi6+J+5+N6pxxIvFZZD6dJ5WHI=" + "vendorHash": "sha256-NS/TY/GJIEBszm4pwy0Z7aj3pFIozenGvRp0+v07Zfw=" }, "ns1-terraform_ns1": { - "hash": "sha256-MX/Wd9Lztjn7uwDzJjs4bsSSp0PFzUgsu4jXke9jHL8=", + "hash": "sha256-6w0r6QXm16h4I4PFj80dJhTDbF4FPMjJalO0TfXGBEA=", "homepage": "https://registry.terraform.io/providers/ns1-terraform/ns1", "owner": "ns1-terraform", "repo": "terraform-provider-ns1", - "rev": "v2.8.2", + "rev": "v2.9.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-iFya3JEM2XklfunQq0Mbdar/nyWOQZHfYWa2NWBxzTM=" + "vendorHash": "sha256-aI08WEXxcw3Lt83oKrohXTJIMo3sWPF3UuteIeDX+WM=" }, "numtide_linuxbox": { "hash": "sha256-svQRz1/PdVLpHoxOam1sfRTwHqgqs4ohJQs3IPMMAM4=", @@ -1013,13 +1013,13 @@ "vendorHash": "sha256-/4mktOn7qjWIkpyqeEW4vzY0w0pG+0qx7KRYBkE1IkQ=" }, "okta_okta": { - "hash": "sha256-3zuD+R1fUAFJ3pvzzHmN92RGGiWLYpnGOJXSsv89Les=", + "hash": "sha256-Qpdinb4ZJRjZG4lMv5EFkicBcYU+OiLz9on3ZaQQu8s=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v6.11.0", + "rev": "v6.13.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-/IbzilmyVTZh7qWogtXd+/Y7UJdjsQaf7Yjhi1fU1Vc=" + "vendorHash": "sha256-z13CKv4d+C2VsdUfiArzLLaXExq8k4Y5Y9GEidqqGb0=" }, "oktadeveloper_oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", @@ -1040,13 +1040,13 @@ "vendorHash": "sha256-ofzbDmivXgH1i1Gjhpyp0bk3FDs5SnxwoRuNAWyMqyI=" }, "opentelekomcloud_opentelekomcloud": { - "hash": "sha256-olgUy66gTSPGPvwMKaOeLhjmA3pS9LX/SPdaf8vNbhM=", + "hash": "sha256-4ldbcTTm5mV1/OQ+Y1WGZP8MzLooxc+JrPj2WtHC0Tw=", "homepage": "https://registry.terraform.io/providers/opentelekomcloud/opentelekomcloud", "owner": "opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.36.67", + "rev": "v1.37.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y+U+8iR3iu62DN/KgYQj7XsSjD3T9GJjQM1Osq//03w=" + "vendorHash": "sha256-EUIYUJ92IScZL1Xst5HWGgJS9aH9Zugwk17WR7w+lKs=" }, "opsgenie_opsgenie": { "hash": "sha256-Y67kcg/ovvZc22l1CBz0Mqu7DAIit5F0jQNfQrl2EGI=", @@ -1058,20 +1058,20 @@ "vendorHash": null }, "oracle_oci": { - "hash": "sha256-uIggPhDgTMQei6LpXPzAbfbsoNjVN35P60QcqqHyCIA=", + "hash": "sha256-ZDpyBnralPWEMorou9A8+llGqavGlPMe1YJlUMrfYRY=", "homepage": "https://registry.terraform.io/providers/oracle/oci", "owner": "oracle", "repo": "terraform-provider-oci", - "rev": "v8.17.0", + "rev": "v8.23.0", "spdx": "MPL-2.0", "vendorHash": null }, "ovh_ovh": { - "hash": "sha256-xjSGnukY76k6xalVMBfXikuI2MyXvROVoA91wB8AXnI=", + "hash": "sha256-BKaPKG9xuRq2rNxkMJnN428woyeK0NnssZaJRrGutoM=", "homepage": "https://registry.terraform.io/providers/ovh/ovh", "owner": "ovh", "repo": "terraform-provider-ovh", - "rev": "v2.13.1", + "rev": "v2.17.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1085,11 +1085,11 @@ "vendorHash": "sha256-F1AuO/dkldEDRvkwrbq2EjByxjg3K2rohZAM4DzKPUw=" }, "pagerduty_pagerduty": { - "hash": "sha256-ZbkCJIDZdqry5y4gv7wtkf2GFfvhUCsj5knICUidjZQ=", + "hash": "sha256-+0edUEoaJCg8iDZxRQVQMiP3pLROTi19djEhS5LiRHw=", "homepage": "https://registry.terraform.io/providers/PagerDuty/pagerduty", "owner": "PagerDuty", "repo": "terraform-provider-pagerduty", - "rev": "v3.32.4", + "rev": "v3.34.0", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1139,13 +1139,13 @@ "vendorHash": "sha256-WpI4OZ7BUVgHwQY+7ct+K6CnwXFFuiRbI+iTFSJ8a5A=" }, "rootlyhq_rootly": { - "hash": "sha256-lGd864ugC5hfgN86ByEIJhjkMJVCPDNCKzoXx6pKjS0=", + "hash": "sha256-uxEqnGPJPUHhD2qtT9BR34/x6xSN5cZcW0JvH8fKfT0=", "homepage": "https://registry.terraform.io/providers/rootlyhq/rootly", "owner": "rootlyhq", "repo": "terraform-provider-rootly", - "rev": "v5.16.0", + "rev": "v5.17.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-QVZBQ7Ir8iEUaJo0yXFNp8rInIcbp9qw70UDJ3NAgRM=" + "vendorHash": "sha256-CndTtUfv1NWZd1sgfGq+e4lPm68aQuqwo55KzmdgXeI=" }, "rundeck_rundeck": { "hash": "sha256-g8unbz8+UGLiAOJju6E2bLkygvZgHkv173PdMDefmrc=", @@ -1157,13 +1157,13 @@ "vendorHash": null }, "sacloud_sakuracloud": { - "hash": "sha256-qeFN+JMs/TLV/oPFjMjpUmqv6fTiY+qREXQNYHMk8vY=", + "hash": "sha256-oAD+QfMqUOtbh2GNooyV1Yc1OVHuAnv86ZvuCB7zo8E=", "homepage": "https://registry.terraform.io/providers/sacloud/sakuracloud", "owner": "sacloud", "repo": "terraform-provider-sakuracloud", - "rev": "v2.35.1", + "rev": "v2.36.1", "spdx": "Apache-2.0", - "vendorHash": "sha256-w2NSJv6BY7S5KHeBttxqY2cMR+yPvr2IsC5X4aJAo3A=" + "vendorHash": "sha256-zklw0YajAZZLkosLxZCsWtAbvmHuGEI8OGpVykp1Xw4=" }, "sap-cloud-infrastructure_sci": { "hash": "sha256-eQA4mY+Rx5PLbTgGqfefYFc5gZKIvt1w2eag8ipE0PI=", @@ -1175,22 +1175,22 @@ "vendorHash": "sha256-InCRL4k6v0avmnNja+b6Ozg5+injxa8EmrRHIWrq4Ag=" }, "sap_btp": { - "hash": "sha256-kTH3diM9jbncv80+I//mj+zCWGosIXjjMETXa6IS2HU=", + "hash": "sha256-1+gi+iRTKe/LHM6O3IBMRk9nba0kQ6+AbjYkrRXa5hM=", "homepage": "https://registry.terraform.io/providers/SAP/btp", "owner": "SAP", "repo": "terraform-provider-btp", - "rev": "v1.23.1", + "rev": "v1.24.0", "spdx": "Apache-2.0", - "vendorHash": "sha256-w/AmSHydCeyp/EURgPY2c/E2LjqAXXCORI53X1hEdxY=" + "vendorHash": "sha256-uCw5Xdqp3VjLj6IytoVfO0atxkT69FNqJmAlA6eCmfs=" }, "scaleway_scaleway": { - "hash": "sha256-nBx7zmNiQHL+VomJJ4/tyd0gujc2BNQfVA8zG3hT0wc=", + "hash": "sha256-NXW3b4E92uqZbzIpRTFKVKbPRghwfRK4akn4KY7C9p0=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.76.0", + "rev": "v2.79.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-X5OVBa1vKsPA2gfXDZWJIcncor9V4NFmWILarqbIBiw=" + "vendorHash": "sha256-MKYAdMLETD12850TIBqBfHLRNLy15B6ycDUckIapwt8=" }, "scottwinkler_shell": { "hash": "sha256-LTWEdXxi13sC09jh+EFZ6pOi1mzuvgBz5vceIkNE/JY=", @@ -1202,13 +1202,13 @@ "vendorHash": "sha256-MIO0VHofPtKPtynbvjvEukMNr5NXHgk7BqwIhbc9+u0=" }, "selectel_selectel": { - "hash": "sha256-xoIwvrjeuY1T+7pyBQfoU8orWC4qMuQ9IgbLYIEzLIA=", + "hash": "sha256-ff8XqDp31pwbPmKe7RFMupwVWuhQoOTizFdTAfW5eek=", "homepage": "https://registry.terraform.io/providers/selectel/selectel", "owner": "selectel", "repo": "terraform-provider-selectel", - "rev": "v8.1.0", + "rev": "v8.2.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-Y2oj1DIn80CCdJ7ZM/p6sGqT64dGIEFg/vXXSv6B+iE=" + "vendorHash": "sha256-zdAJOPL+4gEsESzG4XHSMhM9JkFPuoMudwNmVr6HJFE=" }, "siderolabs_talos": { "hash": "sha256-/NACmEpodBNx+Q2M9y3JnKpw9a3Y1eFDdTQ+48MXAc8=", @@ -1238,31 +1238,31 @@ "vendorHash": "sha256-skswuFKhN4FFpIunbom9rM/FVRJVOFb1WwHeAIaEjn8=" }, "spacelift-io_spacelift": { - "hash": "sha256-pWj9K8+ssAuSz1oufi/Ce701xaBDmHKtyijA/R/kQ/g=", + "hash": "sha256-mPrRDA/waxBNIpO8u/QCSi8uNZT6sCs2M5UFyMYZ4dw=", "homepage": "https://registry.terraform.io/providers/spacelift-io/spacelift", "owner": "spacelift-io", "repo": "terraform-provider-spacelift", - "rev": "v1.51.0", + "rev": "v1.52.4", "spdx": "MIT", - "vendorHash": "sha256-C8TE7uxMf6LOTS6v22mXwUdk2eqQRinwrCH4ZVUCx4k=" + "vendorHash": "sha256-VmrvdRsNk2s6GQw7t8Aj0ASAEgQ/9v1TxnNIO9TderI=" }, "splunk-terraform_signalfx": { - "hash": "sha256-bX6CtNP7uB50kk3ddu52YfKE04PsEJw6DXl6yQxOeVI=", + "hash": "sha256-xdB2VAacBGFAeVd60Zy6MWSmx6BFJ7ciZKSTXYdRZY0=", "homepage": "https://registry.terraform.io/providers/splunk-terraform/signalfx", "owner": "splunk-terraform", "repo": "terraform-provider-signalfx", - "rev": "v9.30.1", + "rev": "v9.33.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-27mA2OAApUtPawZZk7Wxme9TfQY19TraIJSqHh8MFZg=" + "vendorHash": "sha256-m7Op/K3Xo9nKgVg9bTHmpmPiFpCB6Ek/kgj76P+ViGQ=" }, "spotinst_spotinst": { - "hash": "sha256-cZ2gKgXLM/0msBvtlWn16TdM1kwd2wRUyV7bvVEd+SE=", + "hash": "sha256-OX2uclduqzLPlRNHmji8X+PrEV78gdsE/W/SND4cVRA=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.236.1", + "rev": "v1.238.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-Gb07NAvZowWIUokmjLq2IOvg4El2hGwJ6J2J9hBj+eg=" + "vendorHash": "sha256-s6ld+xi++QWBlVmE+5BCY6+vMcn3yr/WM9NX/PlIC/M=" }, "statuscakedev_statuscake": { "hash": "sha256-zXBZZA+2uRN2FeGrayq0a4EBk7T+PvlBIwbuxwM7yBc=", @@ -1274,20 +1274,20 @@ "vendorHash": "sha256-9M1DsE/FPQK8TG7xCJWbU3HAJCK3p/7lxdzjO1oAfWs=" }, "sumologic_sumologic": { - "hash": "sha256-5X/3oHaW+b9U8W1DPKAJltDwGJjV4Mx1XP/JCkQtpwA=", + "hash": "sha256-h4ipmgcEK8Cv9/gQwdOtQqbhfXO/QXJsrHHV6O1HtL8=", "homepage": "https://registry.terraform.io/providers/SumoLogic/sumologic", "owner": "SumoLogic", "repo": "terraform-provider-sumologic", - "rev": "v3.2.8", + "rev": "v3.2.10", "spdx": "MPL-2.0", - "vendorHash": "sha256-R/+PS4cUtr8/twUXOPRiVweb5I9NNiD6mGOcAFr9IDs=" + "vendorHash": "sha256-nbiLH+J051XxTx+z8xGrp/DPYB7g9S4clFSWcZUKnAg=" }, "sysdiglabs_sysdig": { - "hash": "sha256-yjuh6JVIt+FYVe9yILORklwt/KiBFcjmZnEHf5oeQQw=", + "hash": "sha256-VeIgHhCHyNgAcv2NIBAWCJIwGHE3nqYeCxGd4VSUymU=", "homepage": "https://registry.terraform.io/providers/sysdiglabs/sysdig", "owner": "sysdiglabs", "repo": "terraform-provider-sysdig", - "rev": "v3.8.1", + "rev": "v3.9.0", "spdx": "MPL-2.0", "vendorHash": "sha256-HjrB7C0KaLJz9NVLfZdq5EZbNbF9lJPxSkQwnWUF978=" }, @@ -1301,29 +1301,29 @@ "vendorHash": "sha256-rD4W2PkRrIQfACm8UWdF0yfZ+Qc5hTjH1lA6U7GJxpE=" }, "telmate_proxmox": { - "hash": "sha256-1aKKlOIk1mH4yx66eD635d1IaUWXIiBGHEt4A2F2mGM=", + "hash": "sha256-38q64EwxcdFzmlkL/jA0bTAF0WKXHEBIO0yS/44PizA=", "homepage": "https://registry.terraform.io/providers/Telmate/proxmox", "owner": "Telmate", "repo": "terraform-provider-proxmox", - "rev": "v3.0.2-rc04", + "rev": "v3.0.2-rc07", "spdx": "MIT", - "vendorHash": "sha256-Hzq97ElAjs7Y4tmJ2x7+g4j74MEdEvI2bD8pkvi5ZXg=" + "vendorHash": "sha256-ZuH+uIv+iRQgUooyXsryICItSRglk1AGGWMVb+o1ILs=" }, "temporalio_temporalcloud": { - "hash": "sha256-gWboOWDlfoMIlfmeGOom83T/ymMW8leqO0tzrG5xhmk=", + "hash": "sha256-7xj+/RzXtMXN9IWjua0+cAH5zyMMCIqlOzvFqNsAFHk=", "homepage": "https://registry.terraform.io/providers/temporalio/temporalcloud", "owner": "temporalio", "repo": "terraform-provider-temporalcloud", - "rev": "v1.5.0", + "rev": "v1.6.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-7ZoJg1HEVj5Nygr46lmBZeJDfZuU4F90yntrgkBVgGg=" + "vendorHash": "sha256-QvtirfTfnvy7CBNUng07OZnbXLHJAyRlf1I9Mur44N4=" }, "tencentcloudstack_tencentcloud": { - "hash": "sha256-9TTN1DmIXxqIWWiPdFQLRZbJ1mXkibXAOKfF4rJTPBE=", + "hash": "sha256-mIiTAFVWNoD2JkVJNYUbrhOPNwCY/ocbTnoGbFROggo=", "homepage": "https://registry.terraform.io/providers/tencentcloudstack/tencentcloud", "owner": "tencentcloudstack", "repo": "terraform-provider-tencentcloud", - "rev": "v1.82.101", + "rev": "v1.83.13", "spdx": "MPL-2.0", "vendorHash": null }, @@ -1346,13 +1346,13 @@ "vendorHash": "sha256-SF11E60OQiRdf+Pf6XyJg60yGRnGOcSzhrYccrWaeYE=" }, "terraform-lxd_lxd": { - "hash": "sha256-ovYvRpGY8tUiX5zYpTkb8uuQcKsW7o/bDgUPbkXnVnI=", + "hash": "sha256-fGiXnP8neze47FQXVCFlScya9ih67/5TQW5xKEBnI+Y=", "homepage": "https://registry.terraform.io/providers/terraform-lxd/lxd", "owner": "terraform-lxd", "repo": "terraform-provider-lxd", - "rev": "v2.7.1", + "rev": "v3.0.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-vOip6KfD0hOQtNEc7U6DfMjitFGOleNlF88qKtbssng=" + "vendorHash": "sha256-jOZw/va3dA0DYmnYSKbASHvyL7levjf1Bk6WelLga+Q=" }, "terraform-provider-openstack_openstack": { "hash": "sha256-6TcyPUacJNfGsaevg1DQ+WJrMFvGeo2mmsE2+P3RAZM=", @@ -1391,13 +1391,13 @@ "vendorHash": "sha256-da0+/aLNEuMZWD7+zMUGpc1Ch5VKyN+EyO0Mp4mZWv8=" }, "trozz_pocketid": { - "hash": "sha256-/rEdOnAbVM69mA/eP6SlZhk1FZfzrYpej2aO0NUP6E4=", + "hash": "sha256-QjK8AOnil1UQ3/vjtXxm2p62xVPrGuKDwl9wTUxnpSI=", "homepage": "https://registry.terraform.io/providers/Trozz/pocketid", "owner": "Trozz", "repo": "terraform-provider-pocketid", - "rev": "v0.1.7", + "rev": "v2.1.0", "spdx": "MIT", - "vendorHash": "sha256-ozAYLFkilSK0Nygdglhz3VNtRVKoLDGRnrVvg4nWyH4=" + "vendorHash": "sha256-Y1vNBojo+8UYTfuR7NeOKdOPDDH9tIVjjpPAxLDa5iA=" }, "turbot_turbot": { "hash": "sha256-sJODPeFzU3vaiHbKlGe1dR5Pi7aS56JcmZUe8Yg1BcQ=", @@ -1409,13 +1409,13 @@ "vendorHash": null }, "ubiquiti-community_unifi": { - "hash": "sha256-STJXSLtAN1HR46p/Vs3E0ZB/DQ1NW5HTPK50k9kk3EY=", + "hash": "sha256-pN/4HAQlcwr49WftYWqWRJWMuMuXFgrgC70WCn6tP3w=", "homepage": "https://registry.terraform.io/providers/ubiquiti-community/unifi", "owner": "ubiquiti-community", "repo": "terraform-provider-unifi", - "rev": "v0.42.0", + "rev": "v0.55.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-1leizEFn+5VFy3LOAFAogtDT4pyuaG5in0hMat1sORg=" + "vendorHash": "sha256-/5VP9ljeMyvikllhfZ4kUQgMEeyRKG3lfJjbp5SWtJ0=" }, "ucloud_ucloud": { "hash": "sha256-k+NkB1q0oiasLc4+b+mbJ0TNUD67XR9ga9MwSbEXjKQ=", @@ -1427,22 +1427,22 @@ "vendorHash": null }, "vancluever_acme": { - "hash": "sha256-AlT7Qe4YGdPUhM1N4OiMyjbmupgqXcQ/6SLz/v+W8lI=", + "hash": "sha256-CziwRMh53FPGhXw/TFWJUuI3KtMlwobCVNOgfRyjRLA=", "homepage": "https://registry.terraform.io/providers/vancluever/acme", "owner": "vancluever", "repo": "terraform-provider-acme", - "rev": "v2.48.1", + "rev": "v2.48.3", "spdx": "MPL-2.0", - "vendorHash": "sha256-lWBMihP6oX7qPpTuPQQwQS3IDwdyb/rEYqtBsTozb7Q=" + "vendorHash": "sha256-I6u4huFtk7dXmSyPRX4NxvcUJ4Q2iKuw8qzCdNzYjoQ=" }, "venafi_venafi": { - "hash": "sha256-wpAckNRqZjSDt7KpCRpLSYkn6Gm+QPzn5sIJ90wRXjI=", + "hash": "sha256-tCjeApdanKPNEy7snb6QJoCvwjpNa2fdDryoD+7wn8Y=", "homepage": "https://registry.terraform.io/providers/Venafi/venafi", "owner": "Venafi", "repo": "terraform-provider-venafi", - "rev": "v0.23.1", + "rev": "v0.24.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-chDZVBd7tb1VsfTXcWz7j29LzHpUnJpXKRFAyqxnR8s=" + "vendorHash": "sha256-MXkMUXhE5oUIni9nlZgyN5rXCUl52NmYqMwAnvXpBBo=" }, "vinyldns_vinyldns": { "hash": "sha256-/M+HFMDeKpIzzdn04TkMxriVeE6vvORRiqonxF38B9Q=", @@ -1463,13 +1463,13 @@ "vendorHash": "sha256-WXw9H/BQj0ZEW5YLRHWTiXF4VyaVpwlxWO4Hfy4/NdM=" }, "vmware_vcd": { - "hash": "sha256-W+ffIT70IaePg3xfOaQgCjPTWTN3iSAYwkf+s+zkB84=", + "hash": "sha256-/o1bINYaSJXqFkda3N2iRwno2QVCE+KaLLGjvlllMEw=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.14.1", + "rev": "v3.14.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-eCIJ2w8DjmUCGp0VbliLaQ6C29mJhl6Spya06Xyiqd4=" + "vendorHash": "sha256-CnYLJAvhyx0NS+ng4qLCu/ZR774dMmw3iJjWt78FVHE=" }, "vmware_wavefront": { "hash": "sha256-yNNtOkodzwxKvHQq9GZlUicezGW6u2ih6ry/cOtJQGM=", @@ -1490,13 +1490,13 @@ "vendorHash": "sha256-rUYHapEVqRupLOPVbcAH8YP0cuXclMmYTQUkqeOwCN0=" }, "vultr_vultr": { - "hash": "sha256-TMja+5jeYxIjY/MvJwCR/2rsbHuF7RcPReQSzkksk7Q=", + "hash": "sha256-hK4/Pzj0UtWDLQS3cRMC73ZRr20HCWqI+jUlTUHcHaw=", "homepage": "https://registry.terraform.io/providers/vultr/vultr", "owner": "vultr", "repo": "terraform-provider-vultr", - "rev": "v2.31.2", + "rev": "v2.32.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-OASLdReS245N4y0SQ4WY7kPNPpGTHptQgXlNqPlb3nM=" + "vendorHash": "sha256-av/hIjHWw64WIJv3LVyVDu6IMUKCsM4VOLFZKB0IXjU=" }, "wgebis_mailgun": { "hash": "sha256-cz+KSvlm1mFe+NXn4IhiWYWT0/U+UAAA8SCNJgXvIKc=", @@ -1508,12 +1508,12 @@ "vendorHash": "sha256-8p6dJwGyTK+qtgplSLtIRKxnNAQAgHfs4z/EsBcg/iY=" }, "yandex-cloud_yandex": { - "hash": "sha256-JSF1Q0wNRg2oavZ1+67QfCxNz+JOHrG+rfKn/1T9cgc=", + "hash": "sha256-0155GXJMfoCnyqaJiF5SJIA1Qz1q2AYe/BB0AYODG/0=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "repo": "terraform-provider-yandex", - "rev": "v0.206.0", + "rev": "v0.218.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-SpJ6wuzBzfI46C7MbNxs0gQpG62ODmB0WIZ8UpJjuPU=" + "vendorHash": "sha256-FfZvuC/XXhKS03E+l4/9KCLSwx+uTP1LzywckZqX6pA=" } } diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 102e4d3a5a39..e6703411d595 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -200,9 +200,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.15.6"; - hash = "sha256-FH5s0uyRESytv/1xloU3HXuH2ApjBC3FfEqFqIgBgFs="; - vendorHash = "sha256-3y9+KCmvskJ24X4F6gSLglmsl4hUlvzBb/ep4kcbS8A="; + version = "1.15.8"; + hash = "sha256-FeXebcNl/npEkEyMvwzeMYTEsl9t8Iz+4lBHd/HzQHQ="; + vendorHash = "sha256-l5n5PS2buGPvmx/U8vQeKk6BlZdJQQEujJxlPMTdg0k="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; diff --git a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 48d683e14f21..4260630190a4 100644 --- a/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -4,41 +4,45 @@ buildDunePackage, fetchFromGitHub, extlib, - ocamlfuse, + fuse3, gapi-ocaml, ocaml_sqlite3, + otoml, tiny_httpd, ounit2, }: -buildDunePackage rec { +buildDunePackage (finalAttrs: { pname = "google-drive-ocamlfuse"; - version = "0.7.32"; + version = "0.9.0"; + + minimalOCamlVersion = "4.13"; src = fetchFromGitHub { owner = "astrada"; repo = "google-drive-ocamlfuse"; - rev = "v${version}"; - hash = "sha256-AWr1tcium70rXFKMTv6xcWxndOJua3UXG8Q04TN1Siw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-nTZdE9F6ufQ/O/Ck6fzoK65uZ0ylMR6HkwKsBNRDjMs="; }; - doCheck = lib.versionAtLeast ocaml.version "5"; + doCheck = lib.versionAtLeast ocaml.version "4.14"; checkInputs = [ ounit2 ]; buildInputs = [ extlib - ocamlfuse + fuse3 gapi-ocaml ocaml_sqlite3 + otoml tiny_httpd ]; meta = { - inherit (src.meta) homepage; + homepage = "https://github.com/astrada/google-drive-ocamlfuse/"; description = "FUSE-based file system backed by Google Drive, written in OCaml"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ obadz ]; mainProgram = "google-drive-ocamlfuse"; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/discord/darwin.nix b/pkgs/applications/networking/instant-messengers/discord/darwin.nix index 649dd753d9ff..c440becd5da4 100644 --- a/pkgs/applications/networking/instant-messengers/discord/darwin.nix +++ b/pkgs/applications/networking/instant-messengers/discord/darwin.nix @@ -107,6 +107,7 @@ stdenv.mkDerivation { sourceRoot = "."; dontUnpack = true; + dontStrip = true; installPhase = '' runHook preInstall diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 409078b739ec..4bedf5ef87fe 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -35,7 +35,7 @@ let self = discord-development; }; }; - x86_64-darwin = { + aarch64-darwin = { discord = rec { branch = "stable"; binaryName = desktopName; @@ -62,7 +62,6 @@ let }; }; - aarch64-darwin = x86_64-darwin; default = x86_64-linux; # Used for unsupported platforms, so we can return *something* there. }; @@ -74,14 +73,13 @@ let mainProgram = "discord"; maintainers = with lib.maintainers; [ artturin - FlameFlag + _4evy infinidoge jopejoe1 Scrumplex ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/applications/networking/instant-messengers/discord/linux.nix b/pkgs/applications/networking/instant-messengers/discord/linux.nix index 206c308504c0..cd61cd501e48 100644 --- a/pkgs/applications/networking/instant-messengers/discord/linux.nix +++ b/pkgs/applications/networking/instant-messengers/discord/linux.nix @@ -153,14 +153,13 @@ let stageModules = writeShellScript "discord-stage-modules" '' store_modules="$1" modules_dir="''${XDG_CONFIG_HOME:-$HOME/.config}/${lib.toLower binaryName}/${version}/modules" - if [ ! -f "$modules_dir/installed.json" ]; then - mkdir -p "$modules_dir" - for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do - ln -sfn "$store_modules/$m" "$modules_dir/$m" - done - echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ - > "$modules_dir/installed.json" - fi + rm -rf "$modules_dir" + mkdir -p "$modules_dir" + for m in ${lib.concatStringsSep " " (lib.attrNames moduleSrcs)}; do + ln -sn "$store_modules/$m" "$modules_dir/$m" + done + echo '${builtins.toJSON (lib.mapAttrs (_: mod: { installedVersion = mod; }) moduleVersions)}' \ + > "$modules_dir/installed.json" ''; disableBreakingUpdates = @@ -223,7 +222,7 @@ stdenv.mkDerivation (finalAttrs: { dontUnpack = true; - inherit libPath; + inherit libPath stageModules; autoPatchelfIgnoreMissingDeps = [ "libssl.so.1.1" @@ -261,8 +260,9 @@ stdenv.mkDerivation (finalAttrs: { ${lib.strings.optionalString enableAutoscroll "--add-flags \"--enable-blink-features=MiddleClickAutoscroll\""} \ --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ --prefix LD_LIBRARY_PATH : ${finalAttrs.libPath}:$out/opt/${binaryName}:${addDriverRunpath.driverLink}/lib \ + --suffix VK_ADD_DRIVER_FILES : "${addDriverRunpath.driverLink}/share/vulkan/icd.d" \ ${lib.strings.optionalString disableUpdates "--run ${lib.getExe disableBreakingUpdates}"} \ - --run "${stageModules} $out/opt/${binaryName}/modules" \ + --run "${finalAttrs.stageModules} $out/opt/${binaryName}/modules" \ --add-flags ${lib.escapeShellArg commandLineArgs} ln -s $out/opt/${binaryName}/${binaryName} $out/bin/ diff --git a/pkgs/applications/networking/instant-messengers/discord/sources.json b/pkgs/applications/networking/instant-messengers/discord/sources.json index 267a985415cd..f3fea60b1fd3 100644 --- a/pkgs/applications/networking/instant-messengers/discord/sources.json +++ b/pkgs/applications/networking/instant-messengers/discord/sources.json @@ -1,627 +1,622 @@ { "linux-canary": { "distro": { - "hash": "sha256-S1GwB+65+Y3uEr6h54IB8d2CWwCcMevfXZGTyspMZ2w=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/full.distro" + "hash": "sha256-YXwWHjQnqHIVHte3ZYJwONFukCd2KmseEmzKAZltw28=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-If+B4uqvOvS7NTnnstequpolrxIcM9MZhAsDCkFMhgM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_cloudsync/1/full.distro", + "hash": "sha256-mJ8h1KC6JbqLhYFZ98Ko/0rHajxyFfeOVp0poazdHKk=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-N7To9vgdOc20omNyOEWnOexsE83nO5imp9/coliuJZY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_desktop_core/1/full.distro", + "hash": "sha256-nILxbgnowDmGgvl6evlBC11BNRhv5G88ni4uvgo+VhI=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-BQ3bPkjNGS8v171JMayHdRyqbB2PX0Xxdrukz3MpJJU=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_dispatch/1/full.distro", + "hash": "sha256-HndezvELozyQ77lEkkTNn7Gl7V6czWOZq8EyfJBVdVg=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-E/rjqsFNFLWLZxHqAzVHvRmoI1pSWt7my4C+2mNUuJE=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_erlpack/1/full.distro", + "hash": "sha256-vM6OYH5yGTRigIyg36Y1KKg0WtNq9Hd5hmdX9r72eyQ=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-oUlod+YECmdqy4c+sWPZt1yYvGZwYimoIVRPA5v6r+8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_game_utils/1/full.distro", + "hash": "sha256-5b1mNvLLrYCtcNHn0vWAlfEns4DVJVsdLlu/fhGbfQ0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-xDEDlwIInDVSRISoWb07KQvVOqdNxzjWM/s5R/1Ra44=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_krisp/1/full.distro", + "hash": "sha256-W1tDAyW0lD9dG7G9Mm3Az5FUsR07oGXgR0yeKbVzXjc=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-Gh0JBMfaX63sUIGQ+OKqrSzDuADhjKJB3ger9ONkz9k=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_modules/1/full.distro", + "hash": "sha256-TlBDD+sSlOIYpnYZ35vE1WyJl/1qHOFzhcfLLWWb0eM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-texX0BTDW0Pef2gMmkOFjxikKIBYIKSTT+Rsk8Zdn5A=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_rpc/1/full.distro", + "hash": "sha256-8sRdHH/lcfjKMvspohhV+4qz0LYIQIox87bKA/Vwe80=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-NrhpLEVLW3SqoGGiFcNbcM4sQQzW+6mkUaI50Ry66dY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_spellcheck/1/full.distro", + "hash": "sha256-3ap4R+mraQPUySPP0Uxc5cvNv6X5646GWFP9tYMxa2I=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-uXPBkrdnXQnYs3+oTn2gds+au+ZDMYNvOBXTjjhcFsQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_utils/1/full.distro", + "hash": "sha256-hhZQW48n2k4RiMwMrpKV2RVPw3OI+M4nYN1Q4rpnTgY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-UeXNXR+BHljnW5Xb/E9CrJhBv5hchPS6R1P0dvKoZGQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_voice/1/full.distro", + "hash": "sha256-MFDCDC3gBjRpXdre24TLCLre78ETA8klca1Op8heTRw=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-llG+0+Z0boy5ZhtPGiCDUr4sVa4mdR6FjT71ZSX5ez4=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1177/discord_zstd/1/full.distro", + "hash": "sha256-9nSczIYl6rR/Z4jxqA1/2/z79uHdqyNTSgoCJbNWDlM=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/linux/x64/1.0.1398/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.1177" + "version": "1.0.1398" }, "linux-development": { "distro": { - "hash": "sha256-Je/HUlN3aWGXRKj7yFv4S5YtlrCyEZNJ+GPJlG3GA/U=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/full.distro" + "hash": "sha256-1gqCetK6SEW9h68uvvbdQdG3/aeSEBAcSFWeR5HWAzE=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-tZVDeeocUb4lcx8fBGLvzW7cdws4vB0Tsu6LzwS7Jyc=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_cloudsync/1/full.distro", + "hash": "sha256-++Fr9fxL8TycHVPJGHgNwLQbGj/plLbCVV0WjBFKfWs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-qVhVFbRuUYMWoONhmc1aQFRYtCOBh59xiMUIBsIInng=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_desktop_core/1/full.distro", + "hash": "sha256-tUeNfyHYRlSVlo9z7no7DvqpYME/sq9OSuat61IhArs=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-hGGTK6xHBTyMHXTs4uRcms9hA8zpv2h13xuZW/K6FHk=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_dispatch/1/full.distro", + "hash": "sha256-cX0KaUlY4gRy3seF9O4PHWr5gBrEWfMLJEIaxzzhYJQ=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-2i4dMQQQV0EO2rafVG7no1bMVOb++qkwga5I4hNiJ1c=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_erlpack/1/full.distro", + "hash": "sha256-+AEkr5uLoxH3puHYXHTT5GmmC8foCUTSrpFhMuThNLo=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-l5STKk1FYHIWLpq/dVwsY5Q8ce89EiSYZyKE5drzpTQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_game_utils/1/full.distro", + "hash": "sha256-teskTOsRJweCYeTvxS8PR5CEX4EaGm8tU/oseL4ad1s=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-93GXORqBh2IDZz7gwC1lLP/dHwfXK1wqfOdDl7nmy6w=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_krisp/1/full.distro", + "hash": "sha256-k6oid+zDm+yfUTtSZY1Irm808zUa/5s+J4OQHPEI+1M=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-sMsii7pOnusjkmj9gzhRbyLGzAusYhizzZ0Unry+oYQ=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_modules/1/full.distro", + "hash": "sha256-8iM6E+UQMOIXfFjqIvJb+VdfT5wF49gvKU4tX6lc3/Q=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-M6FtXDTGWsqafyQPsVIPJ3F0zUiJZxejuAGJg5MxF+E=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_rpc/1/full.distro", + "hash": "sha256-wxiU4kGdLfpBA5MqLvGnzvlCutaSErRl82SEaL+Xn/I=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-pkJLh3aZ99E5wuBF08uEU4fP9QqDn9Xrwtbk4i0Q/Rw=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_spellcheck/1/full.distro", + "hash": "sha256-9r7wsEAg0LNbL1FbVJl/3pJ65h4nuSSnpUUy2iC7gMg=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-f01INbXJ1l/L5VuskTnz32YF9NH2R9/Apla2iYoEF5M=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_utils/1/full.distro", + "hash": "sha256-AcPgnX4VhD+n9cTGru0qsOC838TCmjrtjtTNI86/Nts=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-YDij0YVearAetTN/1j14eBle+7LKcYGdE1TDIbWH27Y=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_voice/1/full.distro", + "hash": "sha256-UIruTOyO62eFeB7qfabr5rEhwzwd7jNUCqKtQnVfB7E=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-PC5yxqN/ky/ThGRMCCKBSZBqVUJjAV+sl41LlPCvHc0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.992/discord_zstd/1/full.distro", + "hash": "sha256-ex0pjGnH8RgssZ64kfX+AA7f4THmPNUFb/pMiOZruX4=", + "url": "https://development.dl2.discordapp.net/distro/app/development/linux/x64/1.0.1001/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.992" + "version": "1.0.1001" }, "linux-ptb": { "distro": { - "hash": "sha256-hZi+7k6+KoroSosJ5jOmhfKCrXqK5mzMlChvd+O57lE=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/full.distro" + "hash": "sha256-l8zQPa9N2lzJ4Rpsuhr8EsyXkwWXVTU0L7fm1+RzOJs=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-g63Wz47H63bOiyLJ2V4/4z6ZpCVZFWkdJUEaYtTzv5U=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_cloudsync/1/full.distro", + "hash": "sha256-qrdzHzhRaPSOdbAf2O2XqOUOMouh7HCMcTF5PFwBqBE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-78r6lth+V0OPEEJQ53FZhDGAS8RJ2/gGXqROi508Rzk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_desktop_core/1/full.distro", + "hash": "sha256-pA3U5WSNeH07RYpeer062khjGk9B1fLwlmGFRiH0XSY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-Q+1rU46jP3/GuJ3yjvVk4xC0xHuY866JCPVsiqE2/Dk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_dispatch/1/full.distro", + "hash": "sha256-n0QRUZgqF7t0mTaNn44bUw4wo5YJwBt/nrfawpDRjGs=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-Zxv+pZIiX/dgWLtQu+ouJIiaDECBGgcbxzVst/x5QtI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_erlpack/1/full.distro", + "hash": "sha256-OeYaeB6Uwtie9Gh7wEIXbWrzI3PRzForP0mBLAMdrSI=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-HxQldTPK3dGuJyRKw6q23iyR4rO9UkASHa/F7zzHbX0=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_game_utils/1/full.distro", + "hash": "sha256-qG+kR+IxMa9+12anqeuLaAQJdtgsXhItWUVIYvlNHmY=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-ptVbz0AcEttoldc7WV/nD1lYptJTnIy8p6QUD5pbkYg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_krisp/1/full.distro", + "hash": "sha256-UrTU83pYGII+URgwqgBCAWBUV7U2dH2Cyhc3O6IZkEM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-ex9Jud2OTjcWZbcx+D39uyIrh6K5OJANCMc+zfx0Sv8=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_modules/1/full.distro", + "hash": "sha256-KO+26TE5VHUnrdEwXYfYwKrwVZePmmlBH/tGL77gyq8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-TZqW1pxrqVIszGLBcoKErZUoNGNeepRHNqaOXoG9rHs=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_rpc/1/full.distro", + "hash": "sha256-iphB/rQ7Wx39EqpViid9MgOG50gH5BxsPARPDkJXhkM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-a20ZUdyDnnG31DnJP1+ADZxQbk3B1YKPrNPcb13S//4=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_spellcheck/1/full.distro", + "hash": "sha256-OzYl5D/3F4T8TOdAtv8EcL+B2Jb9avlG8iSD18WsDss=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-W7m6Ql9L5GwRQnx9TUjbRZ8c0HGFfFriMoF6HC/RfZg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_utils/1/full.distro", + "hash": "sha256-lfkvyLXha83pV/H9NCf0+8ky+PK6AuNmW9zKj8lCmeE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-S9z/eS5P4sn5yuPdHP9HrmreEIU5vE44Np6QtHVdZm0=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_voice/1/full.distro", + "hash": "sha256-BH+AGzAKJulallcT1pP06xC1Ib8t0Rq85rMWJujWQDA=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-rhoLsPy3zW5+bQuGYGxMtgDHaICrSKapTQD4Zcw3GHo=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.193/discord_zstd/1/full.distro", + "hash": "sha256-HleJ0AvFtKKxBqWn3UAVRHBFMQi2fdHoYCPimCDmVJc=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/linux/x64/1.0.198/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.193" + "version": "1.0.198" }, "linux-stable": { "distro": { - "hash": "sha256-XqiD6DtJgFPmh4cSBgbvz52uBnJ7FUZ+VMcB9KxBzeE=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/full.distro" + "hash": "sha256-DOc00KaMDkG0ggfeB3XaoFNDLB5DNFCsy0LpNcRTSNo=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-NHT/o5cb0VQZQ4CaItCHTOkfXEjYqPlIA3gSSLvCgJk=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_cloudsync/1/full.distro", + "hash": "sha256-zrREHNdv2oD9IiYroQwmwGCXoGopJ9FOPtfzJZEtJQ8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-THCGUwshMlNWCHgTf0d/W2SlBDEUcZ5dg255O4DwQHQ=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_desktop_core/1/full.distro", + "hash": "sha256-jz/qQx+B1HraLPc+cuWeLMI/yJEx/OGPWdSBctqmjE4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-C1742juma1bCGVWMCT903BFHNedc6V+iws8kKTQBE4M=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_dispatch/1/full.distro", + "hash": "sha256-jjSf/9zBWqZ90HskSd2x0Kxi7dy2Yd2wdpO7q/ksSVE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-IrLq1n96rm1YE1UA/P2b9VHzX09Wa4DT9yj5wHhytno=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_erlpack/1/full.distro", + "hash": "sha256-gStY1JHxI7NVZ+ZrRIFepDtGmfScaQYv/UF+aumnkxM=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-Y3shNsfjcBvSvUt+D56qIMaa73lpF/+c/jURWd9hV/g=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_game_utils/1/full.distro", + "hash": "sha256-7UMUAB48PFnGPrzQE5bbdT5dNk08+5I/TIIFj4Sog3U=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_game_utils/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-b+n1X67Iscs1Cjq7KbpXBqqIC35tWqaQh/hPEbq0vuc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_krisp/1/full.distro", + "hash": "sha256-DsnIrErojTUd7jN5YNoE2opqFC34ykKP+WkcU0TksFw=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-U3f+1y1WlGZuP5OlJ4AeakhNYXlx5xbKqHjiCFfGg0E=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_modules/1/full.distro", + "hash": "sha256-3awhenotD42Frkp6RZx6QwzCyOmpXIznasG2ihGjiDs=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_modules/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-rtBhw5MHG/MCAVG2YvzKOEVmN8f02DPI5LBKg8Qj9ZA=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_rpc/1/full.distro", + "hash": "sha256-OT/o8zvHG2QaLvme3F9QhB9qrfadX5iUAYKIPdkAjgE=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-BFTkMV1n9ann2c+GMiuIHZexGO8C/yOi8sbBWrqErKE=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_spellcheck/1/full.distro", + "hash": "sha256-GWRqjMnJBeZi5aR61s9BieoEoc6IYxRRxgRw+q0xdh4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-isXprPxivFIdD1Cvb7tbhdWSNPbU3Rrv2muYg6tXW0M=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_utils/1/full.distro", + "hash": "sha256-AJftqpwcrGzu203HgucYHDYGkIWEFhU0eKYHSgF29zc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-v60GjLJ3LuAppMRSjZQNWSLEamswDcTm/AjtwG04fgM=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_voice/1/full.distro", + "hash": "sha256-ViHQZnR6mxYKH51n63TJjniaJC63dxpNI/m60uV88dc=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_voice/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-Db8KbISU5W8G0qfqGaumrOZU75B6IWBzf3JFIyUzadU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.141/discord_zstd/1/full.distro", + "hash": "sha256-HpB27U60HXn9rNu6Mi8JLzWZ0DGIUKZJh1r91myTBg4=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/linux/x64/1.0.146/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.141" + "version": "1.0.146" }, "osx-canary": { "distro": { - "hash": "sha256-cKGa089UswaZzoAHzkStkROitXDNUMmGENQzUkrmTlY=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/full.distro" + "hash": "sha256-MABVLE+3vnmBCmhHVpJqIKpxDBzj7N5ulcNBqWDUp94=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-9QGggOph9Xs4Q/LjnZ3KFwhXxgNRyli9fNoFz6H3jqM=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_cloudsync/1/full.distro", + "hash": "sha256-fLocipTy9vP6rf4XjaFuZDUQnWoaakmcbjLYOnh5OFg=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-UNTm7ItVQkEIEb6htmc13DxEJdqli0uL69OR9ADVAEk=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_desktop_core/1/full.distro", + "hash": "sha256-1IJai0qH3RVA5jkzqf1KkCZlz+1D/KNBRGf8HlUGZWY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-TihLreO5lbuQGAxljjAaPZVr+KGmmveqTd6tUYvKV1I=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_dispatch/1/full.distro", + "hash": "sha256-L95JqWyryZYAKuOWUZ+gexgTlziWfl41hopVBVCqjLs=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-oaUEWbrxizY/kP1IPHhumErlTKQVQMRyt5P/7dJU9DI=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_erlpack/1/full.distro", + "hash": "sha256-xb3fxy6MqhnqN1i5HTJi3L6GPYxAPvfkahtMV0WlT7U=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-KCA77WXi9MFBfH04DLpiJCcUnX6V03UbiN2ZhvR951k=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_game_utils/1/full.distro", + "hash": "sha256-HsqjBvYiBkJ/xjmEhX+TR7UkokxnLe3LEPOEBB2RHd4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-LDzacYKK1/6blKRI+9fLMz83GT7QpAkw7R9pFzpO2Rg=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_intents/1/full.distro", + "hash": "sha256-gEozULgI4A+iNcIabHmB1iWH+LNQKQnSTId+/r2X4go=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-Xmcukut0dljr87fHH3hLuuum1aKaEbyz6/Doy+5aOOc=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_krisp/1/full.distro", + "hash": "sha256-6W7CuREYkbZIRAaFHxkTNPLl6ScHDej2NWnmcTEcgpY=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-EAPj4leGDWMV/80fZUJjgsJDea5e+GAEhl8fyU7i/7o=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_modules/1/full.distro", + "hash": "sha256-kpLahPp2iWcFBHJgblEg9g/lk19e6os/Kz//Yl5oge4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-N5ZsYM7Y/XcMG6nOc3xVd4zg16MlozmZXK1xO3ARW/8=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_notifications/1/full.distro", + "hash": "sha256-RvSKe1XNvXqoE/MPl8/9bOhA+tW71cnc7EYd/L39dKE=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-NvwdAvR6fZd/Hlcw3Kb5sINche3ZdiTwQO0P0nY3jVQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_rpc/1/full.distro", + "hash": "sha256-dGLMa/SYxy4RPrqfj6oVF2i6xrFZbgkv08kaaVl7uXo=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-4V0Ij/kniCO46cmy8pYOc7Hu2VFRuSYx1EmTV+wZDsQ=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_spellcheck/1/full.distro", + "hash": "sha256-LqyZA0KhqLrbw8Scw1Ctt8VPcE5sbOnTEQp29FMqiXg=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-zPVB5RaxPLSyakY8ZqyyVNWuZEJog78KOROHbupxTSs=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_utils/8/full.distro", - "version": 8 + "hash": "sha256-Mab3V31DCfao0Hpe7p0aBOpWAiYFNay2FcBIO3ENL28=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_utils/3/full.distro", + "version": 3 }, "discord_voice": { - "hash": "sha256-1CSPUCxqeLQxSHZWlSeAYIj9XqCXWD2gxcR4F9kd+54=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_voice/6/full.distro", - "version": 6 + "hash": "sha256-s6xAtPnD24uGEuvfHgtySWHIgSbtMhihfxdmWWSgED4=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_voice/1/full.distro", + "version": 1 }, "discord_webauthn": { - "hash": "sha256-ZMo19cg7Q0uXdDATAHkYWzDrU44jXicHeqpsIiA0iEs=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_webauthn/1/full.distro", + "hash": "sha256-e0K4owkgsogjveuWlvXSpvmT0Roic0Udz1aN5lAm4ME=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-NyK4eH6joep5BzM91AZLRU3jXC2sXdSp3/s4w/Xqkn0=", - "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1132/discord_zstd/1/full.distro", + "hash": "sha256-DfwIq15/ymRoPTHWBPmMtOZnfplpeOflFTUixq33bf0=", + "url": "https://canary.dl2.discordapp.net/distro/app/canary/osx/universal/0.0.1187/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.1132" + "version": "0.0.1187" }, "osx-development": { "distro": { - "hash": "sha256-9rlxgLp8PxtuFSjK+nDshIiDigjsBjox2bUI7cp1XXs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/full.distro" + "hash": "sha256-Oh7Z3Vgz6X94gouVGH6ZK1cyY8xJB5sRD4SGV0bLJGU=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-6DAvT/Rocsu6tYMMt4VJMmfhYxLw1Hl0EgJK6hmw6j0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_cloudsync/1/full.distro", + "hash": "sha256-f7oEWFia4x12EzKdsedVXF/SRRqdcrD+I8jqs9zrKkA=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-xA53RC1WAcsmyKl5c2f2CGhFzficibB/h7psEsr3IRs=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_desktop_core/1/full.distro", + "hash": "sha256-v3rQ9qIb/n4YCKzmajU0IDHz3hV/y+k+KytmQ/YXmLk=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-ebWRxbIIsrf72bj1NoxamL2cxZNrmvkRxfB/jXS6HmI=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_dispatch/1/full.distro", + "hash": "sha256-SHfcGs/NBldbjbmL0BJZd/WTYom6AcVG7I5m7ymNPZc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-GLaAXTePgAWeRwVskt+tBtrVTn3miadBWImPMibG/+Y=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_erlpack/1/full.distro", + "hash": "sha256-Y7BqeSkpZcyOpkI0GJyw6WZUBJRYoVL+bupbf1SojPc=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-A2+GyRC/RXTMnDagsT6zP1S5T+PCyMK55eiEF2JMV84=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_game_utils/1/full.distro", + "hash": "sha256-4ZMhl4mCSkHHjyqz1t4x2uGmLa1X317GzFHrWAxqfuY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-sjylilIyOziJgH4gl+1Y6oIB1drMF7EWrt2mVMliCoU=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_intents/1/full.distro", + "hash": "sha256-rhubNaouXncxstHF6AMbp8rF6GWVZwP9466jPYSFRK0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-w4ZRMT30/KzMrXv0wxUd0U9yv95jOVhSG/6zzbrBaG8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_krisp/1/full.distro", - "version": 1 - }, - "discord_ml": { - "hash": "sha256-TVyM430eeKoq9RNXoLmd1xe2t3xqgxmbQd5G5+chcnI=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_ml/1/full.distro", + "hash": "sha256-AJy1HPU6gCkvymmF0VJtioJ4b0iWl68LK6oD3ZqPmlM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-TKsAh8tNHzQELizvKfMcfLvm0h4F69iON2VBIWq3qxY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_modules/1/full.distro", + "hash": "sha256-1b1JyS8rk0roXq2Pj38asbtqV0Tv54QN51ayHfMfQFg=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-O1+hqRWztrhlYvyHv/oYTO82Ru5VRwPxo7FyAQSbgkI=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_notifications/1/full.distro", + "hash": "sha256-K+qPQAS+a+Aw62XTQRT+QKCXhMCcTyXidXgfVlQW7gM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-zcx4PDynhCApRWJyI1KA8t4IS0flDxtc9NGiT3mqaKY=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_rpc/1/full.distro", + "hash": "sha256-1pmg/bEY+88kB2YC5wLpaGGqKiT/B3XYbadUVsBmna0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-A0gObDSLQWb3Fp+f/xQC8ij2mGBdzeHMuC+A5+XpZdo=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_spellcheck/1/full.distro", + "hash": "sha256-xIB3D9YXDlsquJZYEkSu2tMtC/J+NGe/seHN1UwVGGM=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-SvipA8cXIeeFkBC9RdcNHielVmpwlilGB0mmHFXNUx0=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_utils/1/full.distro", + "hash": "sha256-6C0B2Vylwjhx4H1W2LkgUgrzwyNDDwFhM6nOOUn5tGY=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-BQhaZXj8jVuNtVvGN5nmSfkv2OpETTu+VRt/AZzkSms=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_voice/1/full.distro", + "hash": "sha256-Bifs4a+ezNg+wLIyI4y1F8aXMNifq4XcPlnh/GxP73I=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-XRs6HhQ5XOhQZ2CjhzNW8jMFORby80eWUU5FHBN0Ui8=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_webauthn/1/full.distro", + "hash": "sha256-pcowWk2E/oeisZPUvzpgUChv0SotEjdlwvo4DSDmiA8=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-9cRSkG1gVP6+casDOnJ1gSknXh1kumIeUQd+EcLtNZM=", - "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.993/discord_zstd/1/full.distro", + "hash": "sha256-RO25Js1nsUR0Mjakjebvk+xA0qSq8csgyu7Goqm7Dm0=", + "url": "https://development.dl2.discordapp.net/distro/app/development/osx/universal/1.0.1002/discord_zstd/1/full.distro", "version": 1 } }, - "version": "1.0.993" + "version": "1.0.1002" }, "osx-ptb": { "distro": { - "hash": "sha256-yxbYcpaoUkUlHIC2wf3yVYlxM1KBcCA6vnXqeUctRhQ=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/full.distro" + "hash": "sha256-8rGN6l46T86ITq5sietYgvzBXmXoT6nwzjMnuuQSjZA=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-RDTWKgPcehCjcR1J+jmj+ICZz65ozCMS1zPxroTcxE0=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_cloudsync/1/full.distro", + "hash": "sha256-HBRk6tuF/ZVUwdbTc12WAB0yoO/LvpgeKDcbicTBdZA=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-w3yILQKWaqX6rXFmDhpakUlw5xFW6LI7Z3CL1lPddsI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_desktop_core/1/full.distro", + "hash": "sha256-g93AhKKuH7AzT9Y8ffrHG9hRebkWKYYOjjcs++yUdEE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-RnOLwaCiWS04PFD/d3XLL6erxtDYYrNJ0D6YCcE0uMk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_dispatch/1/full.distro", + "hash": "sha256-e7mbVl2k7M36/sZx71kYvrLDMy42yNrsRqqjZMiWCuA=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-IgeoTXiFWw4BcljPwl7fqAL+Av6bRLFT80tfG5v2Muw=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_erlpack/1/full.distro", + "hash": "sha256-efKY4APaWuWfExbIc4FDml2uiDyjHtUJienynt971gM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-dOSI1OTNkfxfWisrl9DTA8WRU/PjS05c0ZDzNBbBpRg=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_game_utils/1/full.distro", + "hash": "sha256-DpoEfSuoD9p4cdAFCA/qZ3hLcczSo6MBkfo4fxb+A4E=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-EFeUxVEPex20Mrfd04dHYCpfKZM4zIZqOEyREixPcqI=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_intents/1/full.distro", + "hash": "sha256-jTXiR+et6y6AgNBVNrgeapxeuzR0/DWp8su8GhsQSAQ=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-XkzYfeQ32JpdzmIOnYBi9bsSSJFCzbSDFNHAPFcAwGc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_krisp/1/full.distro", + "hash": "sha256-tYwNFZW/BUJtKxRZnaJSRR4XFeDi+IW7o3+PjQkBlSo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-v7Hdk7WO2wCRbJD6SOHfUKAFX8ZVYfe5qhNHnTZvsZk=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_modules/1/full.distro", + "hash": "sha256-9kKjZzWePOU35wDHiBsl0zII9o5RH4eyOyCPFZR0XZo=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-T+4YM57ZbYZSSCPsAgfqcdVl3Ifuf5q/j3p9YUGHfwM=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_notifications/1/full.distro", + "hash": "sha256-+3dkquHgrax8lj7n08Xx9HF6OQ01WIL5d+aCY26nhLU=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-hPPQ5+jHeJSMG3SythZrndhU2F5sl6am3K1lVtDrE40=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_rpc/1/full.distro", + "hash": "sha256-rWC5DloPUbkvDIEBPKg4EKDY5FSacBshxo+vJvuJ5AE=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-yIHkUjjWaPTwvlVaKlucpZUimVWbGd3dDOKOoWcJJAc=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_spellcheck/1/full.distro", + "hash": "sha256-M9TflkDKRWbTPi+cgW3PrEYCB7zp3Woc9yB/pNH8p6E=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-DgAQns2Ky1nBABIhTuSfjvLLOry0/sDx6TRUfVqy8PA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_utils/1/full.distro", + "hash": "sha256-3zpREVrc0xRUPAKNg01O40Koq8lUTrMLVq+y/Prjph4=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-esidGrZQjLpOix2HWYYEPwCoU/QcU6AGM7XZPMvSzsA=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_voice/1/full.distro", + "hash": "sha256-J0LWWnNHquFmL9A21aTWNtoSQFokRRaWCn9j7vbTrc8=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-Iwl0cgBmJdAFUSyq+l6wuIAS633yxwBl0lxUktmKa5Y=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_webauthn/1/full.distro", + "hash": "sha256-awMRcEndx6Z7gakNs+xjU0B1xTkpzKLy6mh0FzV9FaM=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-GTWMUSTNYa4ZdmSBy0a3+PejYRITwTLrj5MOZsCVW4U=", - "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.237/discord_zstd/1/full.distro", + "hash": "sha256-pKQb8nsBQYttsfxVSr8x9OcIyMcvqZOqRfoRL+VkGbg=", + "url": "https://ptb.dl2.discordapp.net/distro/app/ptb/osx/universal/0.0.243/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.237" + "version": "0.0.243" }, "osx-stable": { "distro": { - "hash": "sha256-y8Dr+me5JFnw5/kMcnce1YCjiAN1mqOw77NHykAYQKY=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/full.distro" + "hash": "sha256-uIFpupv+dYzsrm7u4oRD16xgcJGdB0F66Y8PloIuhNs=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/full.distro" }, "kind": "distro", "modules": { "discord_cloudsync": { - "hash": "sha256-+MaEpY7bCNqJNOk2VcHDBM1ZEEctvkjDJIoO0dCTa/0=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_cloudsync/1/full.distro", + "hash": "sha256-XmekQCmlwasCDjk8PKqYb1NlsCRYncYA8NEHZ64nIBI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_cloudsync/1/full.distro", "version": 1 }, "discord_desktop_core": { - "hash": "sha256-n0i+FEtNF6ZOrZNBzSex5pMUtnR9j6kllCsVk7yYN70=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_desktop_core/1/full.distro", + "hash": "sha256-vRkYtbDncwynzAHMPbrcgbue8eNwD192ZTWpKlhMts0=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_desktop_core/1/full.distro", "version": 1 }, "discord_dispatch": { - "hash": "sha256-Qo1cGTH5wQe4Cpzfld5Z/D/C+BKzjAw/d2nk/EUgj3c=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_dispatch/1/full.distro", + "hash": "sha256-33M/ThvatgTHmPY6CIVG1kTrzNqaiz5kEyKS7o20m2Q=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_dispatch/1/full.distro", "version": 1 }, "discord_erlpack": { - "hash": "sha256-jC+2AXMlD0d2+Bcme1lHsAXYn1Dj+vvxjvWK41SvODg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_erlpack/1/full.distro", + "hash": "sha256-yWIUP5aJ4X+Cb0RkS4yTg8DMywdoXW3hSQa7FGmbLXg=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_erlpack/1/full.distro", "version": 1 }, "discord_game_utils": { - "hash": "sha256-HoEsai4W/z6W3sLCGoP6v1BWmuZQvmzOXLLCIUkXNqk=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_game_utils/1/full.distro", + "hash": "sha256-vnXPaWtiSg0rbX7MGo//+jI+jVGEZvsSBo+TzFAwW2U=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_game_utils/1/full.distro", "version": 1 }, "discord_intents": { - "hash": "sha256-Tk3D3Ail8Bu9+mYbASLJDsSAltD/f/g7q1/vUlIIutc=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_intents/1/full.distro", + "hash": "sha256-LMzWKuGH6nFaFgPuzL6NZd4HIxO+0VFqbagoNb1lV8M=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_intents/1/full.distro", "version": 1 }, "discord_krisp": { - "hash": "sha256-6Vt93M5bwstZEn7mb33w2IlgpvstGa6kGTV+Tza92B4=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_krisp/1/full.distro", + "hash": "sha256-p+3SKNKUsrGlLA5GkkYr2TD7k7ldVIxH90u6TxW5OtI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_krisp/1/full.distro", "version": 1 }, "discord_modules": { - "hash": "sha256-Hl+q4s2zYWa57RwpyZ4p9oEfkUl1ekq6xrKitS4BPN0=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_modules/1/full.distro", + "hash": "sha256-iamZlUKVHMlm3ZCX6kVx7EfEP1Xsox5a1DL+TzyPZ4U=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_modules/1/full.distro", "version": 1 }, "discord_notifications": { - "hash": "sha256-rnHE+V90VsR9DWDZ9jN2+pRrQu96clqNq9sFoMpiNZg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_notifications/1/full.distro", + "hash": "sha256-UUdOFaSrcWdvslEAUtkaio9GjsdIKvJ3it871ZcdX9c=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_notifications/1/full.distro", "version": 1 }, "discord_rpc": { - "hash": "sha256-azkCFwPM51sqHjbgsRCOyoPlBMwf+wVt2qrlTl1v+1c=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_rpc/1/full.distro", + "hash": "sha256-i9X90vIFc2Sf/NEHcc9EOqd9vHRl0liOOeJiu8VsjDs=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_rpc/1/full.distro", "version": 1 }, "discord_spellcheck": { - "hash": "sha256-x7qjYGYC4LDbk3wDxDOjqo/cBoyRJQlzsXpoyJyzFnU=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_spellcheck/1/full.distro", + "hash": "sha256-mWYbD4w/Hg53Ncl+b4dDAqw/iXvIlFa2OQZanhAdN4Q=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_spellcheck/1/full.distro", "version": 1 }, "discord_utils": { - "hash": "sha256-sdvSFA7GZS6dUXiemSJpsn92UhaRlNCH9N8UkgQRV/Y=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_utils/1/full.distro", + "hash": "sha256-S7N+84gmA8jTN4FOVhFt1jRtku+hvACJ+SH75gvZXcA=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_utils/1/full.distro", "version": 1 }, "discord_voice": { - "hash": "sha256-2/oH5L7MIIsKLavU4J0O8/hqzFx9BpY9LSuSJKaSwDo=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_voice/1/full.distro", + "hash": "sha256-2AenCW7EKw1R+znM1wGaiw8UHDZSKCqwmzNeFhqIyx8=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_voice/1/full.distro", "version": 1 }, "discord_webauthn": { - "hash": "sha256-z0sbteCmrXjvWathL+c1oXL63UV9fhGYtTEOXnBqa4o=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_webauthn/1/full.distro", + "hash": "sha256-fR6ArgR+/oo1QpkJQ1GralesT1o7W9hvuRxN5NjXGGI=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_webauthn/1/full.distro", "version": 1 }, "discord_zstd": { - "hash": "sha256-mCzmStANoOc4b/UPZmkndzhnxZ1H6Q+rnNsroObPnCg=", - "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.393/discord_zstd/1/full.distro", + "hash": "sha256-JUbwxsOw5XAE+EWj1F67kCXLHmltLCwsz9kC4E7/O5Q=", + "url": "https://stable.dl2.discordapp.net/distro/app/stable/osx/universal/0.0.398/discord_zstd/1/full.distro", "version": 1 } }, - "version": "0.0.393" + "version": "0.0.398" } } diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index d5fe7bb3f3c5..e9b623befca0 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -13,10 +13,6 @@ glib-networking, libadwaita, - # Test dependencies - xvfb-run, - dbus, - # Optional dependencies enableJingle ? true, farstream, @@ -25,7 +21,6 @@ gst-libav, gst-plugins-good, libnice, - enableE2E ? true, enableSecrets ? true, libsecret, enableRST ? true, @@ -41,16 +36,16 @@ extraPythonPackages ? ps: [ ], }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gajim"; - version = "2.4.6"; + version = "2.5.0"; src = fetchFromGitLab { domain = "dev.gajim.org"; owner = "gajim"; repo = "gajim"; - tag = version; - hash = "sha256-QHfJ52uMDlE/rqqy7y2JIQLMOPaTp7eh4DEsPLBx6p8="; + tag = finalAttrs.version; + hash = "sha256-3/HQNizXLjeQpCdEK14LMflyNUKF1BI8eli3BGxiH40="; }; pyproject = true; @@ -60,11 +55,11 @@ python3.pkgs.buildPythonApplication rec { adwaita-icon-theme gtksourceview5 glib-networking + gstreamer + gst-plugins-base ] ++ lib.optionals enableJingle [ farstream - gstreamer - gst-plugins-base gst-libav gst-plugins-good libnice @@ -115,44 +110,35 @@ python3.pkgs.buildPythonApplication rec { httpx h2 truststore + pysequoia ] ++ httpx.optional-dependencies.socks - ++ lib.optionals enableE2E [ - pycrypto - python-gnupg - ] ++ lib.optional enableRST docutils ++ extraPythonPackages python3.pkgs; nativeCheckInputs = [ - xvfb-run - dbus + python3.pkgs.pytestCheckHook ]; - checkPhase = '' - xvfb-run dbus-run-session \ - --config-file=${dbus}/share/dbus-1/session.conf \ - ${python3.interpreter} -m unittest discover -s test/gui -v - ${python3.interpreter} -m unittest discover -s test/common -v - ''; - - # test are broken in 1.7.3, 1.8.0 - doCheck = false; - # necessary for wrapGAppsHook3 strictDeps = false; meta = { homepage = "http://gajim.org/"; - description = "Jabber client written in PyGTK"; + description = "XMPP chat client"; + longDescription = "Gajim aims to be an easy to use and fully-featured XMPP client. Just chat with your friends or family, easily share pictures and thoughts or discuss the news with your groups."; + changelog = "https://dev.gajim.org/gajim/gajim/-/blob/${finalAttrs.version}/ChangeLog"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin hlad vbgl + haansn08 ]; + donationPage = "https://liberapay.com/Gajim"; downloadPage = "http://gajim.org/download/"; platforms = lib.platforms.linux; mainProgram = "gajim"; + identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "gajim" finalAttrs.version; }; -} +}) diff --git a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix index b6fc9a80f8a5..adbe9fa9659c 100644 --- a/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/hydrogen-web/unwrapped.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight matrix client with legacy and mobile browser support"; homepage = "https://github.com/element-hq/hydrogen-web"; - teams = [ lib.teams.matrix ]; license = lib.licenses.asl20; platforms = lib.platforms.all; inherit (olm.meta) knownVulnerabilities; diff --git a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix index f4f3561ecd3e..cc90b0138a50 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/mediastreamer2/default.nix @@ -5,6 +5,7 @@ glew, gsm, lib, + libsm, libx11, libxext, libopus, @@ -47,6 +48,7 @@ mkLinphoneDerivation (finalAttrs: { ffmpeg_4 glew + libsm libx11 libxext libpulseaudio diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index cff21dd33d16..b30c26877e9e 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -175,7 +175,7 @@ let homepage = "https://pidgin.im/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }; diff --git a/pkgs/applications/networking/instant-messengers/profanity/default.nix b/pkgs/applications/networking/instant-messengers/profanity/default.nix index 31c6c9cdfc6e..117a95f4e476 100644 --- a/pkgs/applications/networking/instant-messengers/profanity/default.nix +++ b/pkgs/applications/networking/instant-messengers/profanity/default.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, - autoconf-archive, - autoreconfHook, + meson, + ninja, cmocka, curl, expat, @@ -12,7 +12,6 @@ glibcLocales, libstrophe, libmicrohttpd, - libotr, libuuid, ncurses, openssl, @@ -35,41 +34,39 @@ python3, traySupport ? true, gtk3, + otrSupport ? true, + libotr, + avatarScalingSupport ? true, + spellcheckSupport ? true, + enchant, }: stdenv.mkDerivation (finalAttrs: { pname = "profanity"; - version = "0.17.0"; + version = "0.18.2"; src = fetchFromGitHub { owner = "profanity-im"; repo = "profanity"; rev = finalAttrs.version; - hash = "sha256-fZFLEkbwiYeAtnqDOImV8aXbYGMqO9TEcXPFMuchJaE="; + hash = "sha256-rPiYzG5KvJyKt7b99AImmO6wTYxZPFcf/6Xhz8SrgIo="; }; - patches = [ - ./patches/packages-osx.patch - ]; - enableParallelBuilding = true; nativeBuildInputs = [ - autoconf-archive - autoreconfHook - glibcLocales + meson pkg-config + ninja ]; buildInputs = [ - cmocka curl expat expect glib libstrophe libmicrohttpd - libotr libuuid ncurses openssl @@ -91,22 +88,38 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals pgpSupport [ gpgme ] ++ lib.optionals pythonPluginSupport [ python3 ] - ++ lib.optionals traySupport [ gtk3 ]; + ++ lib.optionals traySupport [ gtk3 ] + ++ lib.optionals otrSupport [ libotr ] + ++ lib.optionals spellcheckSupport [ enchant ] + ++ lib.optionals avatarScalingSupport [ gdk-pixbuf ]; - # Enable feature flags, so that build fail if libs are missing - configureFlags = [ - "--enable-c-plugins" - "--enable-otr" - ] - ++ lib.optionals notifySupport [ "--enable-notifications" ] - ++ lib.optionals traySupport [ "--enable-icons-and-clipboard" ] - ++ lib.optionals pgpSupport [ "--enable-pgp" ] - ++ lib.optionals pythonPluginSupport [ "--enable-python-plugins" ] - ++ lib.optionals omemoSupport [ "--enable-omemo" ]; + # see also: https://profanity-im.github.io/guide/latest/build.html#expl + mesonFlags = [ + (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonEnable "notifications" notifySupport) + (lib.mesonEnable "python-plugins" pythonPluginSupport) + (lib.mesonEnable "c-plugins" true) + (lib.mesonEnable "otr" otrSupport) + (lib.mesonEnable "pgp" pgpSupport) + (lib.mesonEnable "omemo" omemoSupport) + (lib.mesonEnable "omemo-qrcode" omemoSupport) + (lib.mesonEnable "icons-and-clipboard" traySupport) + (lib.mesonEnable "gdk-pixbuf" avatarScalingSupport) + (lib.mesonEnable "xscreensaver" autoAwaySupport) + (lib.mesonEnable "spellcheck" spellcheckSupport) + ]; + + # this build directory is hard coded by the tests: + # https://github.com/profanity-im/profanity/blob/c9033aae568d1a8f5435c566f31aa165718c7726/tests/functionaltests/proftest.c#L275 + mesonBuildDir = "build_run"; doCheck = true; + nativeCheckInputs = [ + cmocka - env.LC_ALL = "en_US.utf8"; + # when stabber is found, functional tests are enabled which take a very long time + # stabber + ]; meta = { homepage = "https://profanity-im.github.io"; diff --git a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch b/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch deleted file mode 100644 index 796ec6b0a615..000000000000 --- a/pkgs/applications/networking/instant-messengers/profanity/patches/packages-osx.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 5c00aca..eb78060 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -23,7 +23,6 @@ PLATFORM="unknown" - AS_CASE([$host_os], - [freebsd*], [PLATFORM="freebsd"], - [openbsd*], [PLATFORM="openbsd"], -- [darwin*], [PLATFORM="osx"], - [cygwin], [PLATFORM="cygwin"], - [PLATFORM="nix"]) - - diff --git a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix b/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix deleted file mode 100644 index a346ebd7b0de..000000000000 --- a/pkgs/applications/networking/instant-messengers/ripcord/darwin.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - stdenvNoCC, - lib, - fetchzip, -}: - -stdenvNoCC.mkDerivation rec { - pname = "ripcord"; - version = "0.4.29"; - - src = fetchzip { - url = "https://cancel.fm/dl/Ripcord_Mac_${version}.zip"; - sha256 = "sha256-v8iydjLBjFN5LuctpcBpEkhSICxPhLKzLjSASWtsQok="; - stripRoot = false; - }; - - dontBuild = true; - dontFixup = true; # modification is not allowed by the license https://cancel.fm/ripcord/shareware-redistribution/ - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r $src/Ripcord.app $out/Applications/ - - runHook postInstall - ''; - - meta = { - description = "Desktop chat client for Slack and Discord"; - homepage = "https://cancel.fm/ripcord/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - # See: https://cancel.fm/ripcord/shareware-redistribution/ - license = lib.licenses.unfreeRedistributable; - maintainers = with lib.maintainers; [ mikroskeem ]; - platforms = [ "x86_64-darwin" ]; - }; -} diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch deleted file mode 100644 index e334777ac14f..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/cstring-includes.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/src/api/video/nv12_buffer.cc b/src/api/video/nv12_buffer.cc -index ca9dcd867..89d28f23c 100644 ---- a/src/api/video/nv12_buffer.cc -+++ b/src/api/video/nv12_buffer.cc -@@ -16,6 +16,8 @@ - #include "third_party/libyuv/include/libyuv/convert.h" - #include "third_party/libyuv/include/libyuv/scale.h" - -+#include -+ - namespace webrtc { - - namespace { -diff --git a/src/audio/utility/channel_mixer.cc b/src/audio/utility/channel_mixer.cc -index 0f1e66387..33b771b0c 100644 ---- a/src/audio/utility/channel_mixer.cc -+++ b/src/audio/utility/channel_mixer.cc -@@ -15,6 +15,8 @@ - #include "rtc_base/logging.h" - #include "rtc_base/numerics/safe_conversions.h" - -+#include -+ - namespace webrtc { - - ChannelMixer::ChannelMixer(ChannelLayout input_layout, -diff --git a/src/modules/audio_processing/aec3/alignment_mixer.cc b/src/modules/audio_processing/aec3/alignment_mixer.cc -index 7f076dea8..ffd7242b5 100644 ---- a/src/modules/audio_processing/aec3/alignment_mixer.cc -+++ b/src/modules/audio_processing/aec3/alignment_mixer.cc -@@ -10,6 +10,7 @@ - #include "modules/audio_processing/aec3/alignment_mixer.h" - - #include -+#include - - #include "rtc_base/checks.h" - -diff --git a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -index 7ef1a030e..5b9ab7137 100644 ---- a/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -+++ b/src/modules/desktop_capture/linux/wayland/shared_screencast_stream.cc -@@ -18,6 +18,7 @@ - #include - #include - -+#include - #include - - #include "absl/memory/memory.h" -diff --git a/src/modules/video_coding/utility/ivf_file_reader.cc b/src/modules/video_coding/utility/ivf_file_reader.cc -index 4c08ca613..f82f2bfcb 100644 ---- a/src/modules/video_coding/utility/ivf_file_reader.cc -+++ b/src/modules/video_coding/utility/ivf_file_reader.cc -@@ -10,6 +10,7 @@ - - #include "modules/video_coding/utility/ivf_file_reader.h" - -+#include - #include - #include - -diff --git a/src/net/dcsctp/packet/bounded_byte_writer.h b/src/net/dcsctp/packet/bounded_byte_writer.h -index d754549e4..bf5e3ed42 100644 ---- a/src/net/dcsctp/packet/bounded_byte_writer.h -+++ b/src/net/dcsctp/packet/bounded_byte_writer.h -@@ -12,6 +12,7 @@ - #define NET_DCSCTP_PACKET_BOUNDED_BYTE_WRITER_H_ - - #include -+#include - - #include "api/array_view.h" - \ No newline at end of file diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index 0bc68cd19b3c..f4402d9798d8 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -1,96 +1,28 @@ { lib, - stdenv, fetchFromGitHub, - fetchpatch, - libsForQt5, - yasm, - alsa-lib, - jemalloc, - libopus, - libpulseaudio, + telegram-desktop, withWebkit ? true, }: let - telegram-desktop = libsForQt5.callPackage ../telegram-desktop { - inherit stdenv; - # N/A on Qt5 - kimageformats = null; - unwrapped = libsForQt5.callPackage ../telegram-desktop/unwrapped.nix { - inherit stdenv; - kcoreaddons = null; - }; - }; version = "1.4.9"; - tg_owt = telegram-desktop.tg_owt.overrideAttrs (oldAttrs: { - version = "0-unstable-2024-06-15"; - - src = fetchFromGitHub { - owner = "desktop-app"; - repo = "tg_owt"; - rev = "c9cc4390ab951f2cbc103ff783a11f398b27660b"; - hash = "sha256-FfWmSYaeryTDbsGJT3R7YK1oiyJcrR7YKKBOF+9PmpY="; - fetchSubmodules = true; - }; - - patches = [ - # fix build with latest glibc - # upstream PR: https://github.com/desktop-app/tg_owt/pull/172 - ./cstring-includes.patch - (fetchpatch { - url = "https://webrtc.googlesource.com/src/+/e7d10047096880feb5e9846375f2da54aef91202%5E%21/?format=TEXT"; - decode = "base64 -d"; - stripLen = 1; - extraPrefix = "src/"; - hash = "sha256-goxnuRRbwcdfIk1jFaKGiKCTCYn2saEj7En1Iyglzko="; - }) - ]; - - nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ yasm ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++11-narrowing"; - }); in telegram-desktop.override { pname = "kotatogram-desktop"; inherit withWebkit; - unwrapped = (telegram-desktop.unwrapped.override { inherit tg_owt; }).overrideAttrs (old: { + unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: { pname = "kotatogram-desktop-unwrapped"; - version = "${version}-unstable-2024-09-27"; + version = "${version}-unstable-2026-07-03"; src = fetchFromGitHub { owner = "kotatogram"; repo = "kotatogram-desktop"; - rev = "0581eb6219343b3cfcbb81124b372df1039b7568"; - hash = "sha256-rvn8GZmHdMkVutLUe/LmUNIawlb9VgU3sYhPwZ2MWsI="; + rev = "7263a1b53c9e6b45a416532644fff7a4c7f90d54"; + hash = "sha256-xOfHZ7oUJKk65j7o/AgxtFfc5NqsAoA9E+8U6rHlSmc="; fetchSubmodules = true; }; - patches = [ - ./macos-qt5.patch - ./glib-2.86.patch - (fetchpatch { - url = "https://gitlab.com/mnauw/cppgir/-/commit/c8bb1c6017a6f7f2e47bd10543aea6b3ec69a966.patch"; - stripLen = 1; - extraPrefix = "cmake/external/glib/cppgir/"; - hash = "sha256-8B4h3BTG8dIlt3+uVgBI569E9eCebcor9uohtsrZpnI="; - }) - ]; - - buildInputs = - (old.buildInputs or [ ]) - ++ [ - libopus - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - alsa-lib - jemalloc - libpulseaudio - ]; - - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-missing-template-arg-list-after-template-kw"; - meta = { description = "Kotatogram – experimental Telegram Desktop fork"; longDescription = '' @@ -103,7 +35,7 @@ telegram-desktop.override { homepage = "https://kotatogram.github.io"; changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k${version}"; maintainers = with lib.maintainers; [ ilya-fedin ]; - mainProgram = if stdenv.hostPlatform.isLinux then "kotatogram-desktop" else "Kotatogram"; + mainProgram = "Kotatogram"; }; }); } diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/glib-2.86.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/glib-2.86.patch deleted file mode 100644 index 5e7f5dc698ae..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/glib-2.86.patch +++ /dev/null @@ -1,37 +0,0 @@ -Submodule Telegram/lib_base contains modified content -diff --git a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp -index 4197367..f79d2fa 100644 ---- a/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp -+++ b/Telegram/lib_base/base/platform/linux/base_url_scheme_linux.cpp -@@ -15,7 +15,7 @@ - #include - #include - --#include -+#include - #include - - namespace base::Platform { -@@ -125,7 +125,7 @@ void RegisterUrlScheme(const UrlSchemeDescriptor &descriptor) { - - const auto appId = QGuiApplication::desktopFileName().toStdString(); - if (!appId.empty()) { -- Gio::AppInfo appInfo = Gio::DesktopAppInfo::new_(appId + ".desktop"); -+ Gio::AppInfo appInfo = GioUnix::DesktopAppInfo::new_(appId + ".desktop"); - if (appInfo) { - if (appInfo.get_commandline() == commandlineForCreator + " %u") { - appInfo.set_as_default_for_type(handlerType); -Submodule cmake contains modified content -diff --git a/cmake/external/glib/CMakeLists.txt b/cmake/external/glib/CMakeLists.txt -index 3c6fe4b..6f73dc5 100644 ---- a/cmake/external/glib/CMakeLists.txt -+++ b/cmake/external/glib/CMakeLists.txt -@@ -16,7 +16,7 @@ endfunction() - add_cppgir() - - include(generate_cppgir.cmake) --generate_cppgir(external_glib Gio-2.0) -+generate_cppgir(external_glib GioUnix-2.0) - - find_package(PkgConfig REQUIRED) - pkg_check_modules(GLIB2 REQUIRED IMPORTED_TARGET glib-2.0 gobject-2.0 gio-2.0 gio-unix-2.0) diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-qt5.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-qt5.patch deleted file mode 100644 index 55beb31a7a4d..000000000000 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/macos-qt5.patch +++ /dev/null @@ -1,75 +0,0 @@ -diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.h b/Telegram/SourceFiles/platform/mac/main_window_mac.h -index 2a3a59b9cf..16b7b6cdde 100644 ---- a/Telegram/SourceFiles/platform/mac/main_window_mac.h -+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.h -@@ -10,6 +10,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL - #include "platform/platform_main_window.h" - #include "platform/mac/specific_mac_p.h" - #include "base/timer.h" -+#include "base/qt/qt_common_adapters.h" - - #include - #include -@@ -52,7 +53,7 @@ private: - bool nativeEvent( - const QByteArray &eventType, - void *message, -- qintptr *result) override; -+ base::NativeEventResult *result) override; - - void hideAndDeactivate(); - void updateDockCounter(); -diff --git a/Telegram/SourceFiles/platform/mac/main_window_mac.mm b/Telegram/SourceFiles/platform/mac/main_window_mac.mm -index e95ef79f16..c3381926a9 100644 ---- a/Telegram/SourceFiles/platform/mac/main_window_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/main_window_mac.mm -@@ -305,7 +305,7 @@ void MainWindow::updateWindowIcon() { - bool MainWindow::nativeEvent( - const QByteArray &eventType, - void *message, -- qintptr *result) { -+ base::NativeEventResult *result) { - if (message && eventType == "NSEvent") { - const auto event = static_cast(message); - if (PossiblyTextTypingEvent(event)) { -diff --git a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm -index de28809077..2521428567 100644 ---- a/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm -+++ b/Telegram/SourceFiles/platform/mac/notifications_manager_mac.mm -@@ -502,11 +502,11 @@ void Manager::Private::invokeIfNotFocused(Fn callback) { - } else { - if (!_processesInited) { - _processesInited = true; -- QObject::connect(&_dnd, &QProcess::finished, [=] { -+ QObject::connect(&_dnd, QOverload::of(&QProcess::finished), [=] { - _waitingDnd = false; - checkFocusState(); - }); -- QObject::connect(&_focus, &QProcess::finished, [=] { -+ QObject::connect(&_focus, QOverload::of(&QProcess::finished), [=] { - _waitingFocus = false; - checkFocusState(); - }); -@@ -536,7 +536,7 @@ void Manager::Private::checkFocusState() { - } - const auto istrue = [](QProcess &process) { - const auto output = process.readAllStandardOutput(); -- DEBUG_LOG(("Focus Check: %1").arg(output)); -+ DEBUG_LOG(("Focus Check: %1").arg(QString::fromUtf8(output))); - const auto result = (output.trimmed() == u"true"_q); - return result; - }; -Submodule Telegram/lib_ui contains modified content -diff --git a/Telegram/lib_ui/ui/rp_widget.cpp b/Telegram/lib_ui/ui/rp_widget.cpp -index 0b57704..0d2ca01 100644 ---- a/Telegram/lib_ui/ui/rp_widget.cpp -+++ b/Telegram/lib_ui/ui/rp_widget.cpp -@@ -62,7 +62,7 @@ TWidget::TWidget(QWidget *parent) - auto format = QSurfaceFormat::defaultFormat(); - format.setSwapInterval(0); - #ifdef Q_OS_MAC -- format.setColorSpace(QColorSpace::SRgb); -+ format.setColorSpace(QSurfaceFormat::sRGBColorSpace); - #endif // Q_OS_MAC - QSurfaceFormat::setDefaultFormat(format); - return true; diff --git a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix index fe1cf5cbfe59..e744ee618380 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/telegram-desktop/unwrapped.nix @@ -6,8 +6,8 @@ pkg-config, cmake, ninja, - clang, python3, + qtshadertools, tdlib, tg_owt ? callPackage ./tg_owt.nix { inherit stdenv; }, qtbase, @@ -19,7 +19,7 @@ ffmpeg_6, protobuf, openal-soft, - minizip-ng, + minizip-ng-compat, range-v3, tl-expected, hunspell, @@ -28,6 +28,7 @@ microsoft-gsl, boost, ada, + cmark-gfm, libavif, libheif, libjxl, @@ -45,14 +46,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "telegram-desktop-unwrapped"; - version = "6.8.2"; + version = "7.0.2"; src = fetchFromGitHub { owner = "telegramdesktop"; repo = "tdesktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-1zKAywh6EXGDi5t7CKQRWADRKX0mFEMyeIoK4hrTFFQ="; + hash = "sha256-G/A5J2m1sXHD50zDmMD9ehnorAGRjnQ+YGMv6DEiJcQ="; }; nativeBuildInputs = [ @@ -60,10 +61,9 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja python3 + qtshadertools ] ++ lib.optionals stdenv.hostPlatform.isLinux [ - # to build bundled libdispatch - clang gobject-introspection ]; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { xxhash ffmpeg_6 openal-soft - minizip-ng + minizip-ng-compat range-v3 tl-expected rnnoise @@ -82,6 +82,7 @@ stdenv.mkDerivation (finalAttrs: { microsoft-gsl boost ada + cmark-gfm (tdlib.override { tde2eOnly = true; }) ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/applications/networking/irc/weechat/default.nix b/pkgs/applications/networking/irc/weechat/default.nix index c9e8fc153c49..4c9bf0bd6b2b 100644 --- a/pkgs/applications/networking/irc/weechat/default.nix +++ b/pkgs/applications/networking/irc/weechat/default.nix @@ -105,11 +105,11 @@ assert lib.all (p: p.enabled -> !(builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { pname = "weechat"; - version = "4.9.2"; + version = "4.9.4"; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.xz"; - hash = "sha256-0TianlIb2gxOv6EI4qv4he5sUVDDhSmfXcoBgaQ6CRQ="; + hash = "sha256-P8UDWfOjsljJ8DFIsC87nFkZRTXRtGXEgfuFp2wu0AU="; }; # Why is this needed? https://github.com/weechat/weechat/issues/2031 diff --git a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix index 28ecc9faf3e1..535c9214dbee 100644 --- a/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix +++ b/pkgs/applications/networking/mailreaders/evolution/evolution/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution"; - version = "3.60.1"; + version = "3.60.2"; outputs = [ "out" @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution/${lib.versions.majorMinor finalAttrs.version}/evolution-${finalAttrs.version}.tar.xz"; - hash = "sha256-jzM860wxzOfXdJXokBoA79xTdtpUKcHClNfj77xvcwg="; + hash = "sha256-IYpJ+lBoFV29vTWjDRCi8jfHJGX7HQ4Kp4iJ8DnC7Y8="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 9591516d88b9..004c91f93cfc 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -39,9 +39,7 @@ let mozillaPlatforms = { x86_64-linux = "linux-x86_64"; - # bundles are universal and can be re-used for both darwin architectures aarch64-darwin = "mac"; - x86_64-darwin = "mac"; }; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; @@ -69,7 +67,8 @@ let meta = { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Mozilla Thunderbird, a full-featured email client (binary package)"; - homepage = "http://www.mozilla.org/thunderbird/"; + homepage = "https://www.thunderbird.net/"; + donationPage = "https://www.thunderbird.net/donate/"; mainProgram = "thunderbird"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mpl20; diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix index 473ba3792a08..633d5c6bb451 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_esr_sources.nix @@ -1,1193 +1,1193 @@ { - version = "140.11.1esr"; + version = "140.12.1esr"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/af/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/af/thunderbird-140.12.1esr.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "cd44e22f8f2ec9a8691ff5b19479bb80b1251d8ec821876ef7b73cc4d6ad38b1"; + sha256 = "be9018fd65fea36f04564f34277e82700dd6f6ea1a08a2141d7e8b1fd18d7aaf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ar/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ar/thunderbird-140.12.1esr.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "51855dbbd4c59d414c211c138aa46dd8b513825c02830bc68fa469248493a9f0"; + sha256 = "79deb45cd4b928e501498a0367882a9b05ef986f636f6d4decaad3dbf4b89880"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ast/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ast/thunderbird-140.12.1esr.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "81099d46f5776631e2ac59c269c36e80a0878812fd7422509cb940261bc702a9"; + sha256 = "ecf4361deb934a3a81434b58c6835eeaf226a7265a58b198572a03641858675e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/be/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/be/thunderbird-140.12.1esr.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "9310cb6f6ba5371861f8f3d4695cb599839d726dc62cb280b03461e2bcbfd677"; + sha256 = "be21c4c898d1454573db61e7ee4b8428bb7656d5b9de839f43cc06bf18fc596c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/bg/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/bg/thunderbird-140.12.1esr.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "88103bba753cf512319a05a6fc2fc1a4bf5ef51623a16e8ca06b6120eadd55e5"; + sha256 = "c14361f950b6fdacb576dcd1cfe751db826ff433cc7df7faa6463b654410a479"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/br/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/br/thunderbird-140.12.1esr.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "b2507e3615fb3aa1f9b440304ecc14a5f3a82ea11cb1f26dfba049f247baba4c"; + sha256 = "e049cefec62df1fa31eeb9cfb0959d07ca6a2ed61fbc1e4b19b392d974900769"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ca/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ca/thunderbird-140.12.1esr.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "286528d64bb61a45fc75ed3eb9acdb51d86dccdf69f4921225b72f2f9705cab0"; + sha256 = "6f4a3318fec4a757750e586a4a97370c8db4320cb3033aa251a8eed21d18aa48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cak/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cak/thunderbird-140.12.1esr.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "b055cda1a66326625cd9073e3ef59100011fb1fa94842bb1377982793e89fe13"; + sha256 = "f42fa814fe765c1f99acb1747708f0f485847020de43a82c62e72e5834e2c3d7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cs/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cs/thunderbird-140.12.1esr.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c7c986a1b2928d50793be7a768f41792a11b10840c4b89e362fdd87dff8b859c"; + sha256 = "57f774c07dfe8145b3cb0dbd95f65c7f8e97aef3123774f43a2608b5159b03f6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/cy/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/cy/thunderbird-140.12.1esr.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "fec3476eb18c24fa23119f0ead79a14f50e243c60e18729a42d7390065a7752e"; + sha256 = "9cd18105b3ec4b7026e6eeb09610ebdc7e16e3f7d2f6af91b216a2356c97d6e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/da/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/da/thunderbird-140.12.1esr.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "e879bbac85ed9aff18564afcd652d5ab7bb99eb9e36134bba36dda3c988dc754"; + sha256 = "765ceeec2296798053febab1a1e32dbe142738db72b88945e619aa238713682f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/de/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/de/thunderbird-140.12.1esr.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "72a5273c008060bc2a856eb33c49023ee1ed25f9826471cb2a04418b5d29ec6a"; + sha256 = "15ba511fb57c09b50b061b4bb164e21391b70a875dd5d0ee3a26fba414326f07"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/dsb/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/dsb/thunderbird-140.12.1esr.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "ad5fdff483dfe20441a6b48d22dd3a82a2b7c20f7af06025744cc0a73f4e1504"; + sha256 = "dbf0bf70808da40282e32e1a75e0ed6f21af8fe47faf59888fcdd6be60a5f8b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/el/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/el/thunderbird-140.12.1esr.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "0ecb235a03ceaf27e93f949d0a7f4534db48e2a1050ed10f644f70db794a78c5"; + sha256 = "4a9c787562473045724653302b2de0bca5626571633246a373ae1b06e57ba904"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-CA/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-CA/thunderbird-140.12.1esr.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "5645c08f8630849b1efede22d46a8526ee157683458ce3929e1094a928be742e"; + sha256 = "4514da1947cc1733e29b19c4130283415caf6271df1e670779001d2544fbaf35"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-GB/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-GB/thunderbird-140.12.1esr.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "5172cc07af724e427f593687f348cc501628786cc5d6c943d1d194e04075721f"; + sha256 = "31a404d71ff2d3e6c6e0dfea7201cc5bb926fe22d0f57f2e6577384846c699ad"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/en-US/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/en-US/thunderbird-140.12.1esr.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "9b453e56b395aa06237891644bc412609291522105bd87c4cb902caf82ccfbe5"; + sha256 = "9219a4dce3e4fa5b70678df7841151264d27ebbfdd0da8fa3dcb1c42f39afc9d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-AR/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-AR/thunderbird-140.12.1esr.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "d88f03eb618276e8be922fed996ae67f8d2cf9167c7c7c77302b67db9b5794a5"; + sha256 = "4f2e575099db2aae498212b1cff6ec9f400f13e620d36a708b7dae0b4d26d19d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-ES/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-ES/thunderbird-140.12.1esr.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "6ca15e9d2d58e1580ad08019c4272eec5e5f9be4b9f781628d0b0f42f7b572b9"; + sha256 = "4c1c55cba2a2a9bd0bac06e3de6c53bbbdf83ca762d3dc2df7b8d5e7fcafb44f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/es-MX/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/es-MX/thunderbird-140.12.1esr.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "40196953a9f29207f64c535ea159673120eee51f03478518b8f86ff46a6d6d8a"; + sha256 = "33db312a8bcf41d818db437b322c10a93742457440ac89766fc54e2990185785"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/et/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/et/thunderbird-140.12.1esr.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "78398e3d931c722bf35a30c3bc69218f2d396c6d4ff7cbb3130c01a20a23fa7c"; + sha256 = "890b21ffe3bc46cc16cbd568bd3c7c773688466b86508972c4bcf9ebd147c943"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/eu/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/eu/thunderbird-140.12.1esr.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a5acae7a5b8d31dae0fc3fe7c3c41b582011af654bc0846921ae2661576a1a48"; + sha256 = "5219c5671612d0d2a0caf687769a1f44509ccece02a160804d89c1dc462a3602"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fi/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fi/thunderbird-140.12.1esr.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "97d66dc25f0fde8a1f9559164bc1eb641f4e5f8aca34cf0b1f0bb10bd19636cd"; + sha256 = "e95521bd64512ada8c370e3fe90c79bbf0b05e2b496dd199e1b041d6300ed657"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fr/thunderbird-140.12.1esr.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "1497140b897323600202a1c982c80e1f69607351d4b243575f37e8b372d97681"; + sha256 = "2aa93022829facf005b19544247f5c12ff7cecc5f0794ec9526a95eeddf822ab"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/fy-NL/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/fy-NL/thunderbird-140.12.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e4126a7e2cc7ba4d0891896fb4a096971c2dbb2d932813d365dd90001e9b7c61"; + sha256 = "5be868b0a147da456afcd3ddf77a298fb70772f7bc63440e4861e470e91a64d5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ga-IE/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ga-IE/thunderbird-140.12.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "03c1da05b74097d8103c4b98ac22077a01deef089d5509a2dcb89b235da91cc2"; + sha256 = "aa5c6b581f29e3075dfb648928c15a5adcecbf20933ebdff70e0849206e581c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/gd/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gd/thunderbird-140.12.1esr.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "ec118262c5c8c4430f574b3a0613f4da1f6ff5e3e6a2b0bee0248021a98f5e54"; + sha256 = "16664961711bd9b9538747e107d429b1934ac1fe8310fd643febe7698324de93"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/gl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/gl/thunderbird-140.12.1esr.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "c585f158acc1cd998edb46d8c5221e760f5e921f778b396ec89daa000ff426d8"; + sha256 = "6ff317dde8a319983a01f2b46466eebb8f2225eb2c88d5950f437616ebe84507"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/he/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/he/thunderbird-140.12.1esr.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "81fae1be93af6bdc667f58cb6976376fdc334c4d5432c31d87fcf887dbe0f503"; + sha256 = "e0bea2a1252ea3ea6529ea51059e732b03d45095ef3adc7ea7fdde36d83ad398"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hr/thunderbird-140.12.1esr.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "1d3c4e0fbd28b3931584454b3b7e392c793c5e75cdd21067be4faccc1e4ecfe7"; + sha256 = "1d298936666fac71a516acb54278ffe7e8ac1b5d37139d275624c48a793f2ebe"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hsb/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hsb/thunderbird-140.12.1esr.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "064ce5e72d37607aa8103a046913efd93b659257463fa897a46f0ab5bf2971ae"; + sha256 = "a46bda6771c5d83aaec24439de21c33a97f01cfbb712dd7d111a4baf589209dd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hu/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hu/thunderbird-140.12.1esr.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "2c366fce17fafd29c7f389a33674e117ac1d50074c3d3a35f7495bf868843b87"; + sha256 = "ebc0c1b12e90a53ae35652ccbe9181773a382fa02ecc29a74f29fca684f41362"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/hy-AM/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/hy-AM/thunderbird-140.12.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "fd3aaace09db4cefa108c25eda88c9a3879c8ec227e572eaf2fd22729df7dc94"; + sha256 = "0b54dc71db19e9d7e28402bee8b98c8d244fb8eac708621f0b5e168ec9662883"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/id/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/id/thunderbird-140.12.1esr.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ff3eece338e9eb8fb6f09c8fcaa019254171fd5e6c4bd7af8f316d090367f00a"; + sha256 = "94e241fbd784980ae83d8d7238e8e30602d405827be3609b89a0a67d031cc99e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/is/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/is/thunderbird-140.12.1esr.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "9a2ce7350e387bc697093f39fac52b1e4c80fa0a9c736900d63551a4a381c357"; + sha256 = "7c9fbe81d96274b8657a966ae7b093bc3e2a8f7e35ef256d175a6c2fc06d4d90"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/it/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/it/thunderbird-140.12.1esr.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "3983915b58c46a64978a7b3332923077059fda6cabef4faa39ce1e9dabbb2667"; + sha256 = "17c912a8dbca2be4abfd29af189137e72b64213a2eaa2848a19fd5a1493f1635"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ja/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ja/thunderbird-140.12.1esr.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "0d7e7b11797826fed39ef5016301cddda761f39921b8d25288900358e3bf579a"; + sha256 = "dab5b64a874c14f6f9b07224e93ac2cc35f4f787e7faf57eb6e04030d1041cbf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ka/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ka/thunderbird-140.12.1esr.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "6952c4d12ac989b2073f112f02e14298756673945839ffcce2a887a562cdb9da"; + sha256 = "115d44e3d91e5018d426c2dbd204cefa019bd671c65a7bac125bb27614e6a5db"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/kab/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kab/thunderbird-140.12.1esr.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "7245abb39634a26a2987f5a5ca2cdfed4a1957c0cb29900ea82146d63517210c"; + sha256 = "dd5168e203131682bf80b0e7dfbaa7e212dbd375cf886861412eca7a1d0db7bf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/kk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/kk/thunderbird-140.12.1esr.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "208deec2213742c05d3ab742b7f7c86a007892ebc372f8810c09b783e4976200"; + sha256 = "755d97a8987dd5bd8fdc5612ce687e162713670483b3c55e7b44c7dd042a91ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ko/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ko/thunderbird-140.12.1esr.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "c8df67e9af8b1efc1e608f95b5075346db19283c285baabca27950545d6e3714"; + sha256 = "30687136cfa82e455667604e42f495e83a21ef90b19c865de4f7099013ff3cbf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/lt/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lt/thunderbird-140.12.1esr.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "75f859da709c8698679eb49d5336220efdcda50acc0dc415be6c6f0be08780b4"; + sha256 = "f087ff1203bc99e78ebd04ac80527f547ca13da3c63fecf379ab30e130c2a526"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/lv/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/lv/thunderbird-140.12.1esr.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "81cacd303205c11460037c372b25b0d79153c340e9be727f87f4950c924a1235"; + sha256 = "9fa7035fd9e39c727486d52ce5dc56bd17bf753758d5a5a693f7b33ee5736087"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ms/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ms/thunderbird-140.12.1esr.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "36023a03fdc7e1fea7fc5beb8baf8eed8683efd68e9971cf8d907e1306368de9"; + sha256 = "7983e316aa18d324ba9fbca057d96ec0028575d126c32ae045176ddef811dbe4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nb-NO/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nb-NO/thunderbird-140.12.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "499e5a4f08a0e82c38dbe5718878330f0ad35e9f6c0b93995d22661dfa8434e0"; + sha256 = "d7921d8bf450eaa33646d3ae66c7645ccb88eb6486edee48134efec9759bd229"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nl/thunderbird-140.12.1esr.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "7f74580c216f949f68d29c3daba3094135b847b20a4796480526047c4a5ef938"; + sha256 = "5a55d46fb87a2737986c6cb28c35140063040dfa9a734025504c5e818d896840"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/nn-NO/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/nn-NO/thunderbird-140.12.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "df1e38486df5e06c8b2b8df51c5e34464fdd7ecf99ed7ce27b61c80496abf945"; + sha256 = "fe501181a77c26d9653dea39ad93fc1d822ad1759ce4d39942eea10b2b85366c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pa-IN/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pa-IN/thunderbird-140.12.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "2f9e63be4fe48eae42f9b2142de21697fa2b5f6e454f13f0c595a223c8d72dff"; + sha256 = "c8a3393940e824e07c3754be6a923d94fe18520eeeeb687234ce5dca7150c0e7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pl/thunderbird-140.12.1esr.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "02af40342348ff187b402c96b5ca5cc5214932a6598e9499bba02ae6fcc168a6"; + sha256 = "a9491c647a326d167c4d48cd6ed12ae6dbeda56d74a327f52200c2a4be1160d3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pt-BR/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-BR/thunderbird-140.12.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "1364587ed5d821a999df87278905725c361c0dcf6aa1b60b90995ebf65a1d2d2"; + sha256 = "1136d4946243d708dbc1c9da8e049d19c4e36c66f0c985820e37d78738ac7f6b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/pt-PT/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/pt-PT/thunderbird-140.12.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "bde7be8accc37063c8817afe218c07445141c4964f077b47025819617e87d128"; + sha256 = "e23622710ac085886fd024e3190de0970aa51f9997ee58867f502f43b3cf631b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/rm/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/rm/thunderbird-140.12.1esr.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "62e733d827e128eeb60f094bad877a7a35c812c6969f920a8d333c68090c5f63"; + sha256 = "5d151b3715a3dd26bb38a2c5d8c10214c9f23bce42018009a9add87b8ed69e17"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ro/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ro/thunderbird-140.12.1esr.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "bd15dc06055d993c1935574fdcbd15f5d00df6399a4e200292d1a47eb1a8e196"; + sha256 = "0b113061d80cbaf5cb535634ce373167d6a64cb1f3237d33633d2fea125f8e4d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/ru/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/ru/thunderbird-140.12.1esr.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0fd47d7dd9dc7b12d331420074fa219d3f1eafbdbf2fa1bdf198c20c72ebc1aa"; + sha256 = "7a39a7d6b459e27f321fdd38f39a95958c5032d3ecfcc051ac2ac44949d527c2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sk/thunderbird-140.12.1esr.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "979378ef6cb26761e0960948974a184eaf01cb8ca260e6adc51334ccbc47af0a"; + sha256 = "63d73b38596f78719f3223e9bb2943e1e984f415d82ce6a2c33587c8e1c49e43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sl/thunderbird-140.12.1esr.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "ac1507b38c50a318b0e59687209979c9c4c0c389afa5583c8e610333e7495319"; + sha256 = "aceafcf6797834e8b4718b57124c0a1c4ef4457bf3e70e23ad5140c40ce2cf2d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sq/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sq/thunderbird-140.12.1esr.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "eb6c22097d6aef20d121e35ffff4e0599929e167817dd0d22059f07742fafdfe"; + sha256 = "2ee339035fe6d9507a8e52879ed56982ed534f7cae580fd7ae46656607626042"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sr/thunderbird-140.12.1esr.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "31022daed19b0fc26d03aa5ba482e5f214e6d1a5579c16e6695fccf5fc0c9b76"; + sha256 = "69bd23d5426be0eff640aa012a27375c1af0810dcdeeeab04760112bdad0a798"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/sv-SE/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/sv-SE/thunderbird-140.12.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "e69480753cb4487fd7aeafca2042fe5661345066fa452be31e879dcc9c370504"; + sha256 = "3860304e7c2690ce4596022744f2a4108f4e0850eea9c35fc5e5f3030119b403"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/th/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/th/thunderbird-140.12.1esr.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "d1e945026998163ca3c8ab37be348caed49c9f72864323e456ff9b8728c03c4f"; + sha256 = "165ac84909adc334bc47b8c9df7cd5450fee5c4d645da893b1f337d4c36dc0ce"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/tr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/tr/thunderbird-140.12.1esr.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "4bf8bce7b5e303d44e0c8a3a0e4f1002d637bc73f9c290ed42f97fc9a255fe4c"; + sha256 = "03ec5cda6b9e65b5a0763e354d39ff96586a8d1013f217354b8c0b44634aac28"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/uk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uk/thunderbird-140.12.1esr.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e4110dfb97f35d1373640374a213163362877d212cc65cd64bd20742aa24dd63"; + sha256 = "1fcfc649b3313e17d0a74a1ffef8ca05935632d7ae0efdd2c546555cd099cabc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/uz/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/uz/thunderbird-140.12.1esr.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "1874900326621f5888fbe669a37b0a04228d30f70c3d23bd037f05edce286faa"; + sha256 = "7385491cd07d147b598f8c95c0522b9d9eece19a3bb02b21112deeb419f78ede"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/vi/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/vi/thunderbird-140.12.1esr.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "41494dc6f259067ee48ad713cc4fb84d8f25cee723ff1a8bbad98771a1822d21"; + sha256 = "bddfaa6a2c41872e4b3a739163d1090e8173f08538dba53a5779087a58cde745"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/zh-CN/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-CN/thunderbird-140.12.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "2a1f12a9f87b72d45924f2d00037007a955dde55f82b1d5d6d520e15d90e5b8c"; + sha256 = "d6a5a5ede7339f087c4ef4c246895be9e09200bbc7b4940d3d103c4c636d6aed"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-x86_64/zh-TW/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-x86_64/zh-TW/thunderbird-140.12.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "cb358b240ff255b98d9d4061ea99524ee4774aedafbf962c284d1871ec11000e"; + sha256 = "7bffdbc3af3158652c2a1ae7fc824d26b7d57daa5bb8d65ef2137eb33bd3a2eb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/af/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/af/thunderbird-140.12.1esr.tar.xz"; locale = "af"; arch = "linux-i686"; - sha256 = "a451426fc9d84724255411a6464e05e7ac46f46912fc2c04182b349e3f02e44e"; + sha256 = "b520b52478ceab0508b3ba28b4ba22b2c2ee3e7e6d683bd30591191af35ebe48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ar/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ar/thunderbird-140.12.1esr.tar.xz"; locale = "ar"; arch = "linux-i686"; - sha256 = "9f85ad16c9670be0f85d096a2db3713cb65c670c25977a92200687710fe6bfcb"; + sha256 = "3251114ee3d1d01a51ab60d486c0251020986f87acec3e83ff19102c3d530b8b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ast/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ast/thunderbird-140.12.1esr.tar.xz"; locale = "ast"; arch = "linux-i686"; - sha256 = "790e24d94ddd53798a1e9ac76b7c096aa2c7428f62ccdd04756c8a4b46d20402"; + sha256 = "eabc7ae14de3b38dc7897b12214ac9a2564deaa3d98ef0893a704c6f5884478d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/be/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/be/thunderbird-140.12.1esr.tar.xz"; locale = "be"; arch = "linux-i686"; - sha256 = "7dcbd7b4817cb491a0c171524aa212f5786b9a93a5834a1e7b01e03d02b8dc58"; + sha256 = "0be307dc8bedbedae132ca4a3c72e0437f7b625badf607ab6509eb0cd32129c9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/bg/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/bg/thunderbird-140.12.1esr.tar.xz"; locale = "bg"; arch = "linux-i686"; - sha256 = "425bc5719ac01c3600523d7b0d26e38cfb86e5be2de15550b0781b15dca61310"; + sha256 = "5b9adf440bd069833843b02c00204971397b8a1e39a87b94da28e327d981fce7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/br/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/br/thunderbird-140.12.1esr.tar.xz"; locale = "br"; arch = "linux-i686"; - sha256 = "31a747ae4b6a429e3f630e4dbf19bae8cc1f97f1adf0b89d56162845d5e1ed7b"; + sha256 = "01b47cbc9deb1d16b89b0965bcad20d51c60cc4cf26821264b080d410bca51a3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ca/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ca/thunderbird-140.12.1esr.tar.xz"; locale = "ca"; arch = "linux-i686"; - sha256 = "9caf9871fc73bfe2730ac231833cff6bbd60224c082ff26b1d8f2ffc407770ac"; + sha256 = "5badc5fbddda73bfbe828ee095d27cd1c5f49d8787a9e4821fd09c26fd9f8885"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cak/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cak/thunderbird-140.12.1esr.tar.xz"; locale = "cak"; arch = "linux-i686"; - sha256 = "ff8a4299610825a202b58ddea4e69eddbe8e1892319002eb8d031f513adf7709"; + sha256 = "4dccbba36bcd3f06e477e6d543e772e69a0635845d26d64f01a06010f858babc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cs/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cs/thunderbird-140.12.1esr.tar.xz"; locale = "cs"; arch = "linux-i686"; - sha256 = "64b86c5e360f93ad380d27c28bc126c8bc88c6028f9ba77fc799bdf75f5627cb"; + sha256 = "150838ded74553e561087eca0444ae6e9e46896540d91687431b5089ca83c37d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/cy/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/cy/thunderbird-140.12.1esr.tar.xz"; locale = "cy"; arch = "linux-i686"; - sha256 = "522a5db1ff214dcfc892004723338cb2c02f7d529c43b892a1bc2fb378277462"; + sha256 = "f3e0a6c27e254772ca18c6937391186ce9126c57bec71dc71cd46e9dd9b17687"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/da/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/da/thunderbird-140.12.1esr.tar.xz"; locale = "da"; arch = "linux-i686"; - sha256 = "e400141a23886b4a88262a67b9ae69f9d342061c770ea94ed9b9e792b40c5a4b"; + sha256 = "f835517b095eb3e64f1cb84f7adce45a1af69d865ad26c563d926e97de3a2b44"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/de/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/de/thunderbird-140.12.1esr.tar.xz"; locale = "de"; arch = "linux-i686"; - sha256 = "bff772a4f3a9eca47900d65715640db7c7d0605570470eb35c1d96537b64192c"; + sha256 = "14c624a29ee80726352dca7101d6395e971a10ca9397d5a2b1c20cf106c61e64"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/dsb/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/dsb/thunderbird-140.12.1esr.tar.xz"; locale = "dsb"; arch = "linux-i686"; - sha256 = "61c388aab0f7edb6fbbee05b51f13efc50f154e33ae9d20bb2b61f3784e55821"; + sha256 = "f9b99a02515378fcac4ce2cd2b65cfb647ef845750362a6d6a3ac61e98eba687"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/el/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/el/thunderbird-140.12.1esr.tar.xz"; locale = "el"; arch = "linux-i686"; - sha256 = "22a7e3f9ca36d5c6eaeb64076223a884c18e34016d1df8328f380dc966c191eb"; + sha256 = "3ed79ad13c821ad87c66376ce4f9283c19300added87a88d4d8735331ac44c7b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-CA/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-CA/thunderbird-140.12.1esr.tar.xz"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "c31862319d08a58c689aa25cc8fc619b64a63e8453817e0c2d312ecb0a9aa9ec"; + sha256 = "698015ad0c3ef52a9abf38d20c5f4ab8f434f2450926a06a5c0840115121b4d1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-GB/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-GB/thunderbird-140.12.1esr.tar.xz"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eefc9967520048074756116537a8d83419cd3f2e6fb172dedda9c55914e927f2"; + sha256 = "1ac015e0f4bd8848bb95b6c2201b8167abbfc45421d800348a488ba0f3119edf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/en-US/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/en-US/thunderbird-140.12.1esr.tar.xz"; locale = "en-US"; arch = "linux-i686"; - sha256 = "9ff43141905503ba3d8a0beb92dccf1f422c91b3d7c40c252b9d431093607f55"; + sha256 = "a21ca02982f3d88b03039b699bba90a77e0a7cbdeddfd51bed5e6a7ac29876e1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-AR/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-AR/thunderbird-140.12.1esr.tar.xz"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "75744354f8e6b8a6ac3b25c917aede6a1eca3e7d3861c1692cf4378b49e7cc84"; + sha256 = "9781223342677c21b3b806df269a911e18954bab50df3829c67bf8d542f38953"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-ES/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-ES/thunderbird-140.12.1esr.tar.xz"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "139f1be50f0658100828cd3a0608ee31ef1952aa80048eb9a254c097ba7e04c9"; + sha256 = "5aa5a3540b03a3ab3a7b7394467ce1985563ba8f51e92c449d5c82a14c3fa3f6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/es-MX/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/es-MX/thunderbird-140.12.1esr.tar.xz"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "206f3efbdd7566986824e62124f6855c3b88679d4c4e9eee2041b26d01501fe7"; + sha256 = "92b2b8bd6cd999376709cdaf196a76041cd5a26e789fb9b2ffe3e712183555c5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/et/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/et/thunderbird-140.12.1esr.tar.xz"; locale = "et"; arch = "linux-i686"; - sha256 = "6385a2b7201b295a9becb2e3326a87db7f26af19852141e82aaa1b9288e4cac1"; + sha256 = "7886929abd458a1d1b734a205bed81d94993409ced11f031a5a53d546ec8765c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/eu/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/eu/thunderbird-140.12.1esr.tar.xz"; locale = "eu"; arch = "linux-i686"; - sha256 = "1b115910849f6655d366f28949e998b1bc8b7b4c1b61d6af761fca6aba00a507"; + sha256 = "cca8aff9c6273d4145ec746d4b1cbfbca78bde4b663d0afc35ad8fa1b8576b4d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fi/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fi/thunderbird-140.12.1esr.tar.xz"; locale = "fi"; arch = "linux-i686"; - sha256 = "7afb20de6e21db2fcbc7be7622bbf7ec84948eae6d1a9bc98c9b894d375e7667"; + sha256 = "7c1f5997171892e340f92c4de01f3f609b2f6a7c0a5189350823f39e6e7948f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fr/thunderbird-140.12.1esr.tar.xz"; locale = "fr"; arch = "linux-i686"; - sha256 = "b8637b6e2478d662f55c942d49810801bfb1ae085db4970d76843fb553971e03"; + sha256 = "5cbcd9928838c44896a903d4a42fb06be0ad12175da8c972a40cdaf14ea2a3a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/fy-NL/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/fy-NL/thunderbird-140.12.1esr.tar.xz"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "dccb74f43b41a5c4c29a02e6ebeb947b8844f823c151be531548ef4b274accfb"; + sha256 = "7b3e22f7974d1a802e2445a04b1138b32560cf84425ae1c4d728dbfe333680d5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ga-IE/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ga-IE/thunderbird-140.12.1esr.tar.xz"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "2a6e2d3631ae61956936f839c5926b0447dd435b0f01e23e6f9d2ef1943c66d4"; + sha256 = "87d459dd414167e12f97caa0d927b71e2a234d0ed12707978e1969b5aec03c3d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/gd/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gd/thunderbird-140.12.1esr.tar.xz"; locale = "gd"; arch = "linux-i686"; - sha256 = "b206f80708e217b928dae816e34d9a2150bfe30825853779c0ff24308f0b788b"; + sha256 = "83c6e9c09917d70484b86dc4b318449f5e92677e93266792ad72a4681fe4e206"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/gl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/gl/thunderbird-140.12.1esr.tar.xz"; locale = "gl"; arch = "linux-i686"; - sha256 = "e934577623dc7f1e086207389b46221c5f126bb0068ab75ed8f328e8b153682d"; + sha256 = "f64dd91c64096cc6e06a455f952e41577511522caa939f08cce80d206a15508f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/he/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/he/thunderbird-140.12.1esr.tar.xz"; locale = "he"; arch = "linux-i686"; - sha256 = "6625eb3e5714b4701c3f932837373fb125f1796939858396b186ea96dc7ea390"; + sha256 = "146089027ae517144c2f51576b1802f6a13f6fd9a58f451d61d09c70ec63429c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hr/thunderbird-140.12.1esr.tar.xz"; locale = "hr"; arch = "linux-i686"; - sha256 = "2c1009505352e4635d7f26ffd70d349eb3d42f8cbd82d3957007a6e78a0a301b"; + sha256 = "a4ebb133d33be440bbafc4f3b87e0c5bc30c53834b8e990edcdf49766bfeb99a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hsb/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hsb/thunderbird-140.12.1esr.tar.xz"; locale = "hsb"; arch = "linux-i686"; - sha256 = "959dc26e5dc95ad761b446d99968eba0a28d96df81e9bf1c5f7037f7d42c6f5c"; + sha256 = "ad15e52932683f5408eea7749abd3745787b1d603afd283c8b380bcf5a313e4e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hu/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hu/thunderbird-140.12.1esr.tar.xz"; locale = "hu"; arch = "linux-i686"; - sha256 = "67704499a7cbb17a403586f4b3f87da8029f347d01c0a815b88094afbf6d9a36"; + sha256 = "562f1b5e58b7912b2c72a9dc72e14d4bf13f702a3aadae3a72cf697e9ee2eb19"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/hy-AM/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/hy-AM/thunderbird-140.12.1esr.tar.xz"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "c25bde4dab387304e5e87ebf0874746600403a0077329dfe03324abe006fa5ff"; + sha256 = "0dc244101322a521e28598fad1cbd93ebdd0d2165a1d7fe126fc293b9c95ad92"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/id/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/id/thunderbird-140.12.1esr.tar.xz"; locale = "id"; arch = "linux-i686"; - sha256 = "67e1b9b33f16f19f90a6913d04db8d312378b73cac4da7e2146cde306e0b7143"; + sha256 = "f6494040521b1aff5aa3be06167856a0d8ce699e6cb37a892cdfaa0070da4419"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/is/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/is/thunderbird-140.12.1esr.tar.xz"; locale = "is"; arch = "linux-i686"; - sha256 = "89498071c81e3d4117976c91f5863512d700c3a26b9ea843c5e96163537d65a9"; + sha256 = "e1597ef6a1313ee50f09f6fdd049c6f360d029c08ef23ce8b29925d82402365a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/it/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/it/thunderbird-140.12.1esr.tar.xz"; locale = "it"; arch = "linux-i686"; - sha256 = "102f8e8510473e6a93dc91c1395232c24f0e54df1da4da63c08080b133c4b6c8"; + sha256 = "8e98a32d07b24259d51b3bf3752f3b85848403b1f59c57f51536330d0567471f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ja/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ja/thunderbird-140.12.1esr.tar.xz"; locale = "ja"; arch = "linux-i686"; - sha256 = "3aa0922fec0c4631f24623ed08c8c6912426caf2839ab4124c58417128b6dc11"; + sha256 = "ef83364088cee448f1a4e3b24661a78f615f51e8dad920b483e3234d4cd8f1b4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ka/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ka/thunderbird-140.12.1esr.tar.xz"; locale = "ka"; arch = "linux-i686"; - sha256 = "f4239740b4e511088bde916f168dc9a05dc85984c3ff35e2d471ec2e8b606660"; + sha256 = "3be9730bf6abe81eccb7d830b535ec5148b53cf2c1263aa400a2d2ecabcf7b38"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/kab/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kab/thunderbird-140.12.1esr.tar.xz"; locale = "kab"; arch = "linux-i686"; - sha256 = "006acc5b65e26864e06f3fc8edd4e462e540ca03ec6e6d72a0e1fc73b531cd9b"; + sha256 = "84c9602022538c9dd109b70ef61041fe7418b772c35639f0bfb0fba8467c17b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/kk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/kk/thunderbird-140.12.1esr.tar.xz"; locale = "kk"; arch = "linux-i686"; - sha256 = "1fa3c1d87134b8e16d619ad6186eaf61827c50edde35e97e149d5d0fe9dd7ae0"; + sha256 = "888ed5bbe5e873bdd12b0688d5c3be8f4121dc4fdd8021e91e18512fd6ae597c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ko/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ko/thunderbird-140.12.1esr.tar.xz"; locale = "ko"; arch = "linux-i686"; - sha256 = "a79794232413e466978ee067190c47f668637477981e6938d82251c1b66fd185"; + sha256 = "11016f84ca55fdf8ba66895ec43c5c7c4ce45d36c1c8d877cf36a579c2a94e73"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/lt/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lt/thunderbird-140.12.1esr.tar.xz"; locale = "lt"; arch = "linux-i686"; - sha256 = "a89485d85e2e637e81de889ae6d69dd0407ff34a683d35d3ceacdc6abc3002a6"; + sha256 = "95a570c146e17c523d30194740f94a08cda05ba63d653865269af90bc953b89d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/lv/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/lv/thunderbird-140.12.1esr.tar.xz"; locale = "lv"; arch = "linux-i686"; - sha256 = "90a05ad24b9de9adefc3ebe56999f63a44b809243593a32e53d7f9925188e850"; + sha256 = "629ae06a9940b3bab1163ade2329adc3126ea41f4bfa1312e1e36786ce87e0a2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ms/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ms/thunderbird-140.12.1esr.tar.xz"; locale = "ms"; arch = "linux-i686"; - sha256 = "b309a1c322c0342a9bcfe48dfbf8c0fc73dd77b1237390c4cbf0b72c413496ef"; + sha256 = "1f692dbe750aaf4f05f95632352bc67c6da69488b632ef89641f74829af1c173"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nb-NO/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nb-NO/thunderbird-140.12.1esr.tar.xz"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "525f8b1e56cc3ea5b1c16d190489758a0e7af3013ee6491fdd8d3b8620cd5c59"; + sha256 = "a481cbbc9888681e9b49c121b2ca94300fd427665b976b0ae124b6dbbb4d8987"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nl/thunderbird-140.12.1esr.tar.xz"; locale = "nl"; arch = "linux-i686"; - sha256 = "f5509e36added3e130d014988abbf023c0f9a580ef24fbf695efa5261e68cb96"; + sha256 = "a04d5ee21a69490b5ec0529704ec4f4f7db301f4a66bd15083ac945cbd549dfd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/nn-NO/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/nn-NO/thunderbird-140.12.1esr.tar.xz"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "972cd6c2f95376ab8af6878790be288076c871a75056cc30597f9f0d872ef560"; + sha256 = "df72af0af915afb82253c85de7984ef29574b44cd179cd23f54ac59558768542"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pa-IN/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pa-IN/thunderbird-140.12.1esr.tar.xz"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "75ea1cd47d13fa174cb6b9f0e5fadf98cbf946e1433bd8521e5fcd270a6915d2"; + sha256 = "5a15e3a2362e53f3e9e1bf1ac9383e3bc120d5348894f8c6383af684345e2da1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pl/thunderbird-140.12.1esr.tar.xz"; locale = "pl"; arch = "linux-i686"; - sha256 = "a38797492d37e59ec4b43f0af22a89b84c5f5d75e4e0c4c8964e81a845b4d119"; + sha256 = "e4bda61c36cf9427f8086c6c84199c0599bac72008982a4ac2da89a26cffe8c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pt-BR/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-BR/thunderbird-140.12.1esr.tar.xz"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "f8b008e467bc8d42a7a8bc94e62693b7cc922135ac1ff4371a5beeb090606f9a"; + sha256 = "55ae0e5c95927befdf768469648dd1e60cbabc6fee17b19726e249a491dd43db"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/pt-PT/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/pt-PT/thunderbird-140.12.1esr.tar.xz"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "d78f6ece643f3245f6182d64fa5ae85559feda053920c9bdb3ab728a8eab83e5"; + sha256 = "e7c26ade8ecc4b3e6917cb795f68945066feaa0079d5ccf0d50ce1edb770b5a9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/rm/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/rm/thunderbird-140.12.1esr.tar.xz"; locale = "rm"; arch = "linux-i686"; - sha256 = "b6238ca303658ffe91c69295efcb0e47b7887b53c914eec189ba105a5a5140b9"; + sha256 = "c77e809f87f7d13a3567952673f2d0b4c37dbac7cb95212500c693847cd6b41a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ro/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ro/thunderbird-140.12.1esr.tar.xz"; locale = "ro"; arch = "linux-i686"; - sha256 = "b21ba5df7ef7153d5e7e3fbbadffaec870a671293bf70056c867b69bf9130706"; + sha256 = "c6062ca4e6626dc448e47362a5ed29de48e1d2ebb439d77d28d9478a2c0b4949"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/ru/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/ru/thunderbird-140.12.1esr.tar.xz"; locale = "ru"; arch = "linux-i686"; - sha256 = "5504c9c7922aef8ab2895dcca5e0a91777bdf9c23b04b51e91311ff1e6c19cfb"; + sha256 = "91c801faf58e6fc5794ca084b70bda15fa504d7b23b8a2b7a8db7bf75275ce65"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sk/thunderbird-140.12.1esr.tar.xz"; locale = "sk"; arch = "linux-i686"; - sha256 = "7c5f26aa5dcaae38fbc304f2ddb378c9aebac38b6162c89f75952b4cbc20a4a9"; + sha256 = "72b93a682e47e2e246890ea6971ddc46ee586153549d70cc66b7f603a82c3227"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sl/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sl/thunderbird-140.12.1esr.tar.xz"; locale = "sl"; arch = "linux-i686"; - sha256 = "a464a4c90cdbfa9e8e1b1911bc0fa1e6d14fa1ab79aeb9787c734823f52500db"; + sha256 = "4f442bd3a070de0a640527aa077ce480c1b18f16353425baf7efd179d19425c2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sq/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sq/thunderbird-140.12.1esr.tar.xz"; locale = "sq"; arch = "linux-i686"; - sha256 = "983fd50f8065ff1128162c0bc02d3ce0831811e63ecf2232a60fb539463c700b"; + sha256 = "23fde29af4fbba7e20a01923b1abe259d296a74871a4ef370c0624a4a28f3a0f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sr/thunderbird-140.12.1esr.tar.xz"; locale = "sr"; arch = "linux-i686"; - sha256 = "42287c4beab560a65eb160d2cb29ef76aea4ad617b04bfc2ca5e31ffa56c5526"; + sha256 = "445c0654200decad0fdaf7612d9d24c20de827e19054bc619cb5cb65a28b06b8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/sv-SE/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/sv-SE/thunderbird-140.12.1esr.tar.xz"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "665f3b3a5ecb750a4c9ed28cde5ed75cf2363ca17aa2d35c0fdcc4345c54139a"; + sha256 = "04c8955cbd2cf75e2ec0d95abcd594e5a4de5a43f5387e4f37079254c3f61335"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/th/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/th/thunderbird-140.12.1esr.tar.xz"; locale = "th"; arch = "linux-i686"; - sha256 = "e1ed90e486f2f5e0204bf42b281c92ebaf69512200d072d59bbb3e3dcc3976a9"; + sha256 = "c63fda92f76c6c4c921adfbf06822297665c981cd501b29ec332eb5794816942"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/tr/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/tr/thunderbird-140.12.1esr.tar.xz"; locale = "tr"; arch = "linux-i686"; - sha256 = "e152cb6a608fd4e8fd39dbd64836d08fe764da453117c15ebb182d0e6d86a14d"; + sha256 = "d4adaf76dfd82ce79ce77fff7b039471f5d308228efa7bddcc13b37f9b680060"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/uk/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uk/thunderbird-140.12.1esr.tar.xz"; locale = "uk"; arch = "linux-i686"; - sha256 = "951b52b9092be3fdb102439d91d1637112b765236255ec5332023109f0989585"; + sha256 = "280cd0d5a55af237fab2f2682a006b7f1e988fdaf02b9a44cda96f55658b6229"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/uz/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/uz/thunderbird-140.12.1esr.tar.xz"; locale = "uz"; arch = "linux-i686"; - sha256 = "f8fb96e26415860d54a66defce161f3d838429a9d8350ce71e88f6caa43ea565"; + sha256 = "492146aa92ced6882a6a55a4780c28f88bae944fa074a3aa1a5859cfd9fa58ec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/vi/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/vi/thunderbird-140.12.1esr.tar.xz"; locale = "vi"; arch = "linux-i686"; - sha256 = "780b6fd4d2ba00b63a4c6e7627b67414cf9c3cd63104d6a66697886cea126b21"; + sha256 = "9236344e5284f7fa5b04daef9d2dc0ba09ce21498aa4f2b8ecf35957f23d068f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/zh-CN/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-CN/thunderbird-140.12.1esr.tar.xz"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "bfb2f2624f6acf646fe355e8b225f43aff91074fe7769ec38a598cc70744398d"; + sha256 = "9cb9de006d389c13fd00fb0cf9df69139ff18c0b4ece994a2d4b0072f29ea770"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/linux-i686/zh-TW/thunderbird-140.11.1esr.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/linux-i686/zh-TW/thunderbird-140.12.1esr.tar.xz"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "ef6a6c877a3974f3f2c9ab43f019dd4aade5103cbb2ba231846f057f9d335240"; + sha256 = "92456256948e38efdde5ea801d0c373f0592707d1bb1178b2f1adbb60ae64213"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/af/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/af/Thunderbird%20140.12.1esr.dmg"; locale = "af"; arch = "mac"; - sha256 = "71384c413ed31247caf5162b2cd7afe37df565febad3dbbec4260204f1aca5df"; + sha256 = "0fef87105a73ba05dfdf6be92d472d4d5c982481506697a7d2a0add172842a8d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ar/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ar/Thunderbird%20140.12.1esr.dmg"; locale = "ar"; arch = "mac"; - sha256 = "c1f52fa77f922c748720965930e9896ecb8df86d9271632b64f732ac15f635e7"; + sha256 = "28f6c9eab299bc3694d2ef7ae6138889fdae6ed7b7de78c6a9aada87fe4f38a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ast/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ast/Thunderbird%20140.12.1esr.dmg"; locale = "ast"; arch = "mac"; - sha256 = "4494a9119296b62c834a256baed1f6cfcc887a775749c476540532f775757b63"; + sha256 = "63869bd4c720fd47ef289b217c5db2bce68518efe0f8345d1e3a44df51e8bc17"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/be/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/be/Thunderbird%20140.12.1esr.dmg"; locale = "be"; arch = "mac"; - sha256 = "666959b19337a26ff81f0ae8b48ac43368ea8e91b7c497073da5fff5b2ff14f3"; + sha256 = "a5bcf4f3fee19b0b6c841669a83476759b75c0c7084fd01c0f2c45f84310a566"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/bg/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/bg/Thunderbird%20140.12.1esr.dmg"; locale = "bg"; arch = "mac"; - sha256 = "633900af011489b54a465caa2767f51081bbe66c6da0840a94c96e53ab1e5e25"; + sha256 = "4b211c162a1ec29de5ad8d106c0a629600113c778491126c5897aad5228b0eff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/br/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/br/Thunderbird%20140.12.1esr.dmg"; locale = "br"; arch = "mac"; - sha256 = "9841cba701ef1207bcb1c8cc5ba741968c4785a7f03f6005baa3026cb5d6e830"; + sha256 = "65985864e75f7d8d994070c8708d4ef8dfd3a00cd6dbd977a4fa30cad7e1cb57"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ca/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ca/Thunderbird%20140.12.1esr.dmg"; locale = "ca"; arch = "mac"; - sha256 = "f595c3892d7626ab90b96580933016533ffa30032c35d56afd6b11099d1788d1"; + sha256 = "bebe335a26e384ee788885bb8b737b68b4fb8d6edad0c165425d9609079bca41"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cak/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cak/Thunderbird%20140.12.1esr.dmg"; locale = "cak"; arch = "mac"; - sha256 = "7ee4bd5badecda67bc6c02ffaea353d8225b800a3e3dad631d1f78e28cce19d0"; + sha256 = "e94d4fe036361140e747c46ce55166603356f5d46bac4746e14a9363c1519f2f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cs/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cs/Thunderbird%20140.12.1esr.dmg"; locale = "cs"; arch = "mac"; - sha256 = "367a85f54fbecd8476f598c9d5cc3eaa59846d9103c80b621698043fd8d46d8b"; + sha256 = "248cdafa7e62f4b49f914bdc6b5ee69643b754f68d86cd88018d7618e47d70b8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/cy/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/cy/Thunderbird%20140.12.1esr.dmg"; locale = "cy"; arch = "mac"; - sha256 = "13ac90da12ed2dbeb3f3715212d3aeaaad9b7e591e18d1b7fa1a131fd0903d11"; + sha256 = "dea95b3c3658ca476f48add5c9bcf89cee784d8076bfd951364168c519b8a7a7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/da/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/da/Thunderbird%20140.12.1esr.dmg"; locale = "da"; arch = "mac"; - sha256 = "44e07909b0702b93a6a9ecc58db518cc53f37ad51892cadf3ae7fae71506ae1c"; + sha256 = "976a52ff8776cd75a90a8e3b3ac00026c96ba041f4e76a5de889d010851d4261"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/de/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/de/Thunderbird%20140.12.1esr.dmg"; locale = "de"; arch = "mac"; - sha256 = "fa754adbc3f907347052751567ef6f3ee5d77e6077f7e0fde20c4e7ac1b15677"; + sha256 = "6fcb167da688ba52bce4477c62c8fe07c67f14718fadcd3719fd49bff63f8c80"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/dsb/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/dsb/Thunderbird%20140.12.1esr.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "87512955ada4e34c18e43652a3a98f66b289cda1d2eef6758b65d2417d073fba"; + sha256 = "f3ac9ff7d9d24ffd6b267adda98af7944ad259a40600c4bd02d77097c551373e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/el/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/el/Thunderbird%20140.12.1esr.dmg"; locale = "el"; arch = "mac"; - sha256 = "b440215c64da72c295aae50f268d56fd19213cbab62b52735daaa7f6bf2b3673"; + sha256 = "481796c07b5d469746f9833e0cd5e8e3bfe1cf91216d6e4809b3e3d976f6a942"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-CA/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-CA/Thunderbird%20140.12.1esr.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "c06aeafe163740b4cd0c6a8794131a72567e1396a7bcb45a0bd719256bb97b65"; + sha256 = "6f004764e0139d8ff51ac098d572c5a68351d144d203fa68b797490daa72c9cc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-GB/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-GB/Thunderbird%20140.12.1esr.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "08963c43d94b2b8d0e16b746252da8d48c3015d92f512c63a2868f06ae0667b4"; + sha256 = "a814bbb9e61deeb5395b11c1dba1f7202dfd4813319f5011d8f99bcd203c941e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/en-US/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/en-US/Thunderbird%20140.12.1esr.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "2bc10b29aed42ce6b6148f351d02042ed81510938fdeaef291894f1f536ebddd"; + sha256 = "a7545590281d0d75bfcf107c5b281e45b5a09d64229ebfce33592c423b581006"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-AR/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-AR/Thunderbird%20140.12.1esr.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "5a596c72011d7e04fafa9edd17c48c5d56b0fa4b25b9774829ef1171519cb9e3"; + sha256 = "0c36eeff28151332752f6144bba01d9dc5955fa31776824080b920cf474880d7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-ES/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-ES/Thunderbird%20140.12.1esr.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "1a33b872d51c231746998398584840fcec9dbbb2ae5c9aaf85471805003d462e"; + sha256 = "f4d7bde33c2502435d4e9ab95fc82ce9b1a46f17697bb14b7fd64f51d1fd3d11"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/es-MX/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/es-MX/Thunderbird%20140.12.1esr.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "564f1c44ee6b2acb27daa93046af0e8b4df6030404ac2c15e69192a2db7b02af"; + sha256 = "8b7d7252754f16e811e9ef1fc9aae774eb37ef1442dd9676ec8b4e70abd3f39f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/et/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/et/Thunderbird%20140.12.1esr.dmg"; locale = "et"; arch = "mac"; - sha256 = "7f91c172337ab957fa2a432d81929ec7505e510f84ce5c51db5be98679782aa0"; + sha256 = "b330eb3fe10cd519f80676baa6936697efb9b9d095f7a166180cc36e6d7ee949"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/eu/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/eu/Thunderbird%20140.12.1esr.dmg"; locale = "eu"; arch = "mac"; - sha256 = "44778d36575fa0925e959042097896024fda1818e3148092da80b40afc711d25"; + sha256 = "cfb69e8ebce5203178f0bb3a900849dff0f0444d72a16458b68c2e465f7c1217"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fi/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fi/Thunderbird%20140.12.1esr.dmg"; locale = "fi"; arch = "mac"; - sha256 = "0651b37a0e4783a082741e83393514cfb1c874fedba7d5383eca4015faf8111c"; + sha256 = "2dacdc3c560f643d7fc967f306f53a872a7cc7558f2a3073ca85ff19a71bd347"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fr/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fr/Thunderbird%20140.12.1esr.dmg"; locale = "fr"; arch = "mac"; - sha256 = "dcd4962c03ad913772dea4b21994efa6f2b4a8d7a9aaa7f25f8256c2f219c01e"; + sha256 = "3d5369d321de23abeb62ad1993342d6d6d71f2da56d0d2ab98011c46ac884876"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/fy-NL/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/fy-NL/Thunderbird%20140.12.1esr.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "e273ad2248947a28482f3bbbc940bb82a50c1e7c9f2b138a9bd672db47394e2d"; + sha256 = "020f9670a519155d05e772a20eaf35ef4aca8075cacd19873f1be23c84d49eaa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ga-IE/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ga-IE/Thunderbird%20140.12.1esr.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "ef295ce6bb41f10ed2a9b46ad78b92693493886b4527e4b2f3b339cfcaed1006"; + sha256 = "d7724a80711c879d559c167088fe41aa1e6531ea38757d1aaae4fe3d043b2796"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/gd/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gd/Thunderbird%20140.12.1esr.dmg"; locale = "gd"; arch = "mac"; - sha256 = "c20587243b2c52155f36383c9d7807c77888db10828d9a452aeb2ad2818d9940"; + sha256 = "b6022adc6fc36979a66f8d74bd6e0476673882d6ac60ef0b22d2e59cefffefb3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/gl/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/gl/Thunderbird%20140.12.1esr.dmg"; locale = "gl"; arch = "mac"; - sha256 = "5fb722d840f6ba1ad387618c4cc12948d0c3f29154eb27fbe80faa152a45fa72"; + sha256 = "9b9878870596d85f78d511e37d4df4cf504bc61f1dcd5cf184989401b525f9a6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/he/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/he/Thunderbird%20140.12.1esr.dmg"; locale = "he"; arch = "mac"; - sha256 = "7467a99abe96bc08ed288fe233f5f4200f29dec876715471df94b5715b5b52da"; + sha256 = "f83d4794e193d00d14bc41b27e955372b9a2af3d6172520ea34433a0a0d20372"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hr/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hr/Thunderbird%20140.12.1esr.dmg"; locale = "hr"; arch = "mac"; - sha256 = "3673ed4900ca38a8fc3ecf491c1106bfd8fd62f73b0f1b5d72c19f6a097e894f"; + sha256 = "8ccaffcfe95a610c00760bb4998be5ad8024bf2805f06d4bcd029ddfccaac0f9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hsb/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hsb/Thunderbird%20140.12.1esr.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "0f8cc936971b3aad9b4825f7b6a44f49b3d1cb131fec95b9e09a298b6dfa7c4d"; + sha256 = "69bd5f6eaa17c39817680fd9813043a383b564715bcbfdf85342f27d684de10e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hu/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hu/Thunderbird%20140.12.1esr.dmg"; locale = "hu"; arch = "mac"; - sha256 = "b3b526480a8580f534f56a15792b8c04d356b78b8055e88f34ea7589d5ec395c"; + sha256 = "406c258b687c966f1c9bf0d28ff5a47f7cf2716fb20d99a88b512da12b6fc2a7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/hy-AM/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/hy-AM/Thunderbird%20140.12.1esr.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "58ed43d6933d7b0d70935abcd816a035344b346bf5353b9c0b83b8e97e01be5c"; + sha256 = "182d1415b28855c5524aa6cab0fbd59d5bcb29f0464f5f06b70fff042e0256bd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/id/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/id/Thunderbird%20140.12.1esr.dmg"; locale = "id"; arch = "mac"; - sha256 = "da3db2edf3773e80976c378c52b522d4019a69a1f14df0c08679587310561248"; + sha256 = "94f5a03cffe7cb69d998fac6a24a448ea60b1fd22e75cd085eebb6abcf674916"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/is/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/is/Thunderbird%20140.12.1esr.dmg"; locale = "is"; arch = "mac"; - sha256 = "db3966328ab4a5e9cf8783cccdca5955bfd7c049ca772d7f2e9955078d83989d"; + sha256 = "a6d3624410ac4186f669f7b7115b180ae547fd4c94b508e2cf78b655167fd4dc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/it/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/it/Thunderbird%20140.12.1esr.dmg"; locale = "it"; arch = "mac"; - sha256 = "7297c55daeeabcd2a60fb55699f1387609e7a3eb9bac3f81a86d1bdb31bd4299"; + sha256 = "592e9b1bf6ccaf7aa7c380e494910b95dd3975c06b9c069e41b319d744fb5184"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ja-JP-mac/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ja-JP-mac/Thunderbird%20140.12.1esr.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "78b03aa4af0af37662aff128570964017a730727d9e8baaa6d58ddbb850c15cb"; + sha256 = "fbe32356a00e8d5feb31387bce6e8345d9cfbf4e598646496fa84e0616717e4a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ka/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ka/Thunderbird%20140.12.1esr.dmg"; locale = "ka"; arch = "mac"; - sha256 = "48a6a8fa454da3f2aabe9734ed3271354f26146b6bb63fd0e84c9ca66e525242"; + sha256 = "260e84ba60f95110adef65b12e8e4f3af0b119e3d56c4610fea9f5015158e5d7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/kab/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kab/Thunderbird%20140.12.1esr.dmg"; locale = "kab"; arch = "mac"; - sha256 = "f93bbc335e9117b0bd8b4553a9f908d7088083251c59e8818cfd37f6f9ea000c"; + sha256 = "fb4fd0e9652a1417b415d4df450e670753f915a05b32de6418e64e61cfd9a84f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/kk/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/kk/Thunderbird%20140.12.1esr.dmg"; locale = "kk"; arch = "mac"; - sha256 = "4898a0e073caf10b3d886f902a99658073f79484ab23faf8ac2d44b4e1066a5c"; + sha256 = "41f4d663cc28831c7f33d364e18bc50ea4895dd1edbb4e71750ca42c5554f546"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ko/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ko/Thunderbird%20140.12.1esr.dmg"; locale = "ko"; arch = "mac"; - sha256 = "bed653c957c9cf392b2b33acac927c7c695b051daafc5c3e2e1df0606b39f602"; + sha256 = "8788bf49e1d6b94dfd582510fabfb6db11f3d7b1d70a41f3116600f6f7244fe4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/lt/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lt/Thunderbird%20140.12.1esr.dmg"; locale = "lt"; arch = "mac"; - sha256 = "a46821ce5e80703f5b98590343491f25aad4d42f46606729612c200f7826a5b0"; + sha256 = "d3202d63ae54f07a911d8d96bdb3a6cca4c798b31e6478a4d7be39246a614fee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/lv/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/lv/Thunderbird%20140.12.1esr.dmg"; locale = "lv"; arch = "mac"; - sha256 = "5745ed7e1e54f292e540124b027070fd132807955712722d7ec0b842655873ca"; + sha256 = "89947413ee7e30f81d794aedd4f553fc84d25ed52556b48daa93b959cd2d4d80"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ms/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ms/Thunderbird%20140.12.1esr.dmg"; locale = "ms"; arch = "mac"; - sha256 = "c4f827aa57cde10bd59e24e34a285762d1f765027f6ad834735a2a4a97155b2c"; + sha256 = "d9fb626dd801eb542717767276fa8ab50615134d3c8fa6a6249a97a8b0a4d530"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nb-NO/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nb-NO/Thunderbird%20140.12.1esr.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "846c2a0f9b6d118911f2623e949192acc492b37b086e9356b52875357b623945"; + sha256 = "361a10aeb578c2d00b4af934890b9d19fa6673308a3d8373d567944849980a27"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nl/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nl/Thunderbird%20140.12.1esr.dmg"; locale = "nl"; arch = "mac"; - sha256 = "48e6e7be5ea330b39653bdbfca4835db02c9545c51627f8411f8886b70838da9"; + sha256 = "bae2ec71f7164d27bf51895026f61c5bfc5726e841df2407164b96ac6aa9d6ee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/nn-NO/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/nn-NO/Thunderbird%20140.12.1esr.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "f1b28f4583fac39e57b173040df702d650011c1925082a91b3d630749a6db67f"; + sha256 = "ad720bc0279ebe05dae45b4504fe3b59a5cb26cade9fb0552e7563b92424c9ae"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pa-IN/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pa-IN/Thunderbird%20140.12.1esr.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "535cc3c913cb47b4d9dc540c17ba06d8a885904b2a44a0da4e039af010d70bb6"; + sha256 = "4864c13e90c6002412f52a4ad4edf68f34ea595bfbdf73ae58d84445d243805e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pl/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pl/Thunderbird%20140.12.1esr.dmg"; locale = "pl"; arch = "mac"; - sha256 = "4195b67da5ea25f656f44523a111fc0e5876b299b5293e015c651f9a12833062"; + sha256 = "5132c04421c86392a2b20f92a25c0f40760b106cededa99a32779b1376b2f3aa"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pt-BR/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-BR/Thunderbird%20140.12.1esr.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "e0b1ee7eacc6252d6bfb7233504c17c8ed178048dfb34fb1294d2624203e2cca"; + sha256 = "044b80f53e19945a95905cb14397038cb9031c8e87cd0c821f289cd72d94c6c7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/pt-PT/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/pt-PT/Thunderbird%20140.12.1esr.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "2b9518c194259e570be52a866a13119f8a53effc8ccf47e602a0301bf51e5645"; + sha256 = "98898d9bef060de7f1d015ba41cb6d18970c621c6164ac2eae2fed5a1f5d0339"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/rm/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/rm/Thunderbird%20140.12.1esr.dmg"; locale = "rm"; arch = "mac"; - sha256 = "3b184d62ac323cf4617693dbc3fded23edc0f6e24ae0184310e0b3114cce2442"; + sha256 = "3f36fee7c1133c5b0e88c9653a1a1e4c6885dbd3e08656571ab11522092b443f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ro/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ro/Thunderbird%20140.12.1esr.dmg"; locale = "ro"; arch = "mac"; - sha256 = "361ff7aec05dde3c141193fa02c51ff5233ed5c6164ad2f592c5c019029f0935"; + sha256 = "7a92082eea4fd402b6268f9afd0edd1e628538a934c0043128622282ad4e2acd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/ru/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/ru/Thunderbird%20140.12.1esr.dmg"; locale = "ru"; arch = "mac"; - sha256 = "0a4f588fbff81465284f80e46556577860cf4e39e091c9e35c3e5478a4a4f568"; + sha256 = "23e1ca559b2b38d001704b5e4a412186a09f822c1f6da7e05f6c809ca79f908f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sk/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sk/Thunderbird%20140.12.1esr.dmg"; locale = "sk"; arch = "mac"; - sha256 = "74104f7ff10755d3fffa97c9fc00c71011808a3247b9c895e72323ed393ba0c6"; + sha256 = "e22c2f92dd219666bb93279cd99b3c488e6a5ccc090b6c5f9a5d5dc53d0e8d7c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sl/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sl/Thunderbird%20140.12.1esr.dmg"; locale = "sl"; arch = "mac"; - sha256 = "0a8aa57d7e45c3831a5a0ff67ca2a0617a9a580bd1bc543c6956d13d9fab5ebc"; + sha256 = "7229fdbe391154c0a5d2282f61c3e11d7fc226230a13552b4d4df1cb25cbc0e3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sq/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sq/Thunderbird%20140.12.1esr.dmg"; locale = "sq"; arch = "mac"; - sha256 = "c1049a86ec71f56ca56fa9ce0af245fc84afc600274f572376c62dea9c06f1dc"; + sha256 = "4fd15f38178e96fad7192587e557165bcafbe6b303ee0a5b46c48357e92348f3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sr/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sr/Thunderbird%20140.12.1esr.dmg"; locale = "sr"; arch = "mac"; - sha256 = "ea00bccc0d461dd18f8bceb3d5291f0d8938ec33cfe4f3a62f340eba1d7e0d0c"; + sha256 = "c7ae5528e9dc77069eccf1194273c1e47f784884a0c463e10b20c2bec4f2d614"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/sv-SE/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/sv-SE/Thunderbird%20140.12.1esr.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "8cc6fed9ca0f5dd538b4b0f7847ed288d3dce1417e3711a8108d407506334116"; + sha256 = "deb300d744da7c1ab6a64993b1f468ff6b9be32e8911569631b623a037208420"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/th/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/th/Thunderbird%20140.12.1esr.dmg"; locale = "th"; arch = "mac"; - sha256 = "c9ea193f65ded29b4b7fe95b976e2b3986991fc27ce2c36644c3b19d670897a1"; + sha256 = "7554039b6255191f1c270dd5c3d9582cc9d0c2c4d904adf1260da99b6d6e413e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/tr/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/tr/Thunderbird%20140.12.1esr.dmg"; locale = "tr"; arch = "mac"; - sha256 = "599f39c1e9afc484e93a889d4c61b6951cc4ea6bc3cc97c3b89d233e053f07b6"; + sha256 = "18fa954a199e7b6d4520741f09e7549f33a0cd96111f8cc4228eb79a634af116"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/uk/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uk/Thunderbird%20140.12.1esr.dmg"; locale = "uk"; arch = "mac"; - sha256 = "fa31863b8cbd39628cfa8c6e1e6152ba44d12e1b2545f02ba12651c0ea236b5a"; + sha256 = "ce9fe5b139dc104f300e834eca6d091832af90152537ff11729353e1314d05fb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/uz/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/uz/Thunderbird%20140.12.1esr.dmg"; locale = "uz"; arch = "mac"; - sha256 = "dc14d21c99880d48646d3207091d3ca6771da82384a8d89004964b6d013297ae"; + sha256 = "1417676c77fff78b411e532eddb17fc22f7c2eb92fa3a996de9135bdca4cd30b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/vi/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/vi/Thunderbird%20140.12.1esr.dmg"; locale = "vi"; arch = "mac"; - sha256 = "6284f3cb464dfd22a4277bdcbf8a02cbd4a8a2b3906ef0a4c8afcb189c509a08"; + sha256 = "b2711b07f3db0980744c4576e95d5ad10846710e95dd1b75352eafc2b1052491"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/zh-CN/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-CN/Thunderbird%20140.12.1esr.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "56813d07d216c08b101b9368913ecdd95ad01163dfb925acce3942056ef7be40"; + sha256 = "a29458425d6fc8bd85307629ebcb841fa38d8e47a8dc419c38db1ad047663493"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/140.11.1esr/mac/zh-TW/Thunderbird%20140.11.1esr.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/140.12.1esr/mac/zh-TW/Thunderbird%20140.12.1esr.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "950f3f82e472db1aa408ec50817e40225c38b4511d66ba727240e1c42cc64e10"; + sha256 = "10154c8457e2e1fb74355485b8d9afd251d134a7c189fca2886564b223683a1b"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 92afe41b632a..44a39a193ea8 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,797 +1,797 @@ { - version = "151.0.1"; + version = "152.0.1"; sources = [ { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/af/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/af/thunderbird-152.0.1.tar.xz"; locale = "af"; arch = "linux-x86_64"; - sha256 = "aee6f67628574c2ea7227674fe7211b3e98b08c069f075c296240f3d21e2b8bd"; + sha256 = "4d81a3dac8e71d11950fc908d025afc54d6c96a8464ff30728b70e3359cc27d3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ar/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ar/thunderbird-152.0.1.tar.xz"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "d08d8488693158922d1ec5ed80718fd4f4df11f9c29d0dc4ed7c09faa2c754a3"; + sha256 = "30e4b843aecc0e29e5f0e21c786746230b2a0a8fbec302f3c931c9d1256c40f1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ast/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ast/thunderbird-152.0.1.tar.xz"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "d1a8e7ea9c27369261eb84de41c6f7f770b4efe11ebbc2dbb07f60abfeb3fa86"; + sha256 = "f27e475de0c8fd493812762d738955c2d829ffa55152cb8818e3d1a838b76654"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/be/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/be/thunderbird-152.0.1.tar.xz"; locale = "be"; arch = "linux-x86_64"; - sha256 = "d58b2b360da1bd58944a4bb566895150cf9bb13c966dcc770d49ede19e681951"; + sha256 = "695938a400f10cb01318b33351299b01d46d749c091b473b3617802443ef206a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/bg/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/bg/thunderbird-152.0.1.tar.xz"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "7f75a7bf7737d367fe4443e2685bfa785ed7a603510d18d542163a15dcfdc37e"; + sha256 = "dc02bb1a8dcb5914112ddee4f1d040032bc3d20f115764da0e9d04682f19575e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/br/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/br/thunderbird-152.0.1.tar.xz"; locale = "br"; arch = "linux-x86_64"; - sha256 = "bf6374b33f1deb231b429eb9c5097b10b7989333eefb8c30fa2fb990592a3193"; + sha256 = "fbce72250ac139d59d6afe0b9ef4e0b30d0173b895a0a164233fb3fa8381828a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ca/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ca/thunderbird-152.0.1.tar.xz"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "1d8282b5f59e525f6f8eb526fb7dda0b1ed32c3ec3dd681a4b84b119ab0f0a82"; + sha256 = "df734731d9e17d367e099cd2bed636a899e3f1dc1ecdcb3489e20c996adfa5b5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/cak/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cak/thunderbird-152.0.1.tar.xz"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "ef36b382578f51b5b0987c3882a246f9c7e2cde2ee09f7512b953e529d97bbc3"; + sha256 = "a39a113102842c31f1e6fce77640e9882e74b10634d4e6e7619ab3ddae9ae1cd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/cs/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cs/thunderbird-152.0.1.tar.xz"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "4cbd34b1575e4f439071c66a63664f5e62f2c08cbbe53466404571b11e1da381"; + sha256 = "b02377f4575e0309d7f01165b3e8eba9af2794525d3541f2532b2bd8eb2141ea"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/cy/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/cy/thunderbird-152.0.1.tar.xz"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "76a854b052b7ed835530bddddd3d28d0df9802361bf03fc2ff5d208e04378527"; + sha256 = "c3c1c7cefccc0407b0af66a58d906db48c4ba7adb91379ff88096aa8fa23c99c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/da/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/da/thunderbird-152.0.1.tar.xz"; locale = "da"; arch = "linux-x86_64"; - sha256 = "2d9b95a303f59f6e87c26fc2d344ef27199fc3fb001ead5651e680a88494b3da"; + sha256 = "14584ef3996ec7c23c61da688dabd12dd1efdd8b31aeff55e28db0c64b49874d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/de/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/de/thunderbird-152.0.1.tar.xz"; locale = "de"; arch = "linux-x86_64"; - sha256 = "403255843b8219e73458e02fb1fdb08db61a0e16bbf9c0e99a175c26787dfb15"; + sha256 = "5dfddb6ea62d75292b9d119bb56529f719fe38a8a00f2db4377bb74ceaaf5832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/dsb/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/dsb/thunderbird-152.0.1.tar.xz"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "e47db6d51bbf8927c5b0e6e9d3499f676f91df9b1f0080705c4b9582aec78a79"; + sha256 = "82aba1f083e356920afa71f0f64d71fd6d4dbe2bd456f9a25ece63c312a083b2"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/el/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/el/thunderbird-152.0.1.tar.xz"; locale = "el"; arch = "linux-x86_64"; - sha256 = "6ba1c00f51d281676cd88c29a9cc4e979d54b298b28eef8eae6d988076eac2b0"; + sha256 = "60126796e6519edd80da3cdd8a906b85027602f2b0ed7e0719a36fd478da7693"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/en-CA/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-CA/thunderbird-152.0.1.tar.xz"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "e8e81308e3cf4a4de85d23b3dd40395834ac9d3c52a35acbffd6e5568b4883ba"; + sha256 = "13f78d7e874c282ce1d2247ce34f6cef87bd0de0200f8b50ceff7ccbee883fdf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/en-GB/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-GB/thunderbird-152.0.1.tar.xz"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "758700ca0c5aaa94ccd3a1f5f48baf340903b895d53eb13565b2e9eebd2b6819"; + sha256 = "26720c7ba7b48cd33343dc5f9256f8a642e0371b86cb728e83622a2a2404b69a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/en-US/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/en-US/thunderbird-152.0.1.tar.xz"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "350c77286ad11cd2679d22b0cf9d15e84b665cef70c1b436d177cfa43846c6a8"; + sha256 = "4c1c89352b5593d8a9fce73e10c446c9f95efad9160230082bed071b2af71f9b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/es-AR/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-AR/thunderbird-152.0.1.tar.xz"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "cbbe3ff9b6af69f528ec84f5dfa34e0449316e40fffc79c1ae6f24e96bf64794"; + sha256 = "a531075526dec09870efcd102008f8a869658c44d59f675fb91ce1137a23d18e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/es-ES/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-ES/thunderbird-152.0.1.tar.xz"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "23964319a5491b5d04b903060f2e392247bc7ccee9bd528bea11be093258e8a3"; + sha256 = "bc2a13c87c2740f2f6b560f8fedbee8b02b236a8b6c33639c4d8cc6bc7bfd594"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/es-MX/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/es-MX/thunderbird-152.0.1.tar.xz"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "574079dacc7f707c49bda4016601f63cafdbd5b262dfdfd2eb3fcd5b84a0fcee"; + sha256 = "aa98d74303220b1f8f3da31a2a46073615a0335bf7e333447436e769e58adba3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/et/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/et/thunderbird-152.0.1.tar.xz"; locale = "et"; arch = "linux-x86_64"; - sha256 = "4ee41f1b58b6b4ce86995897cc1e19e81789733ccabf19dce951f7eaeff4dd97"; + sha256 = "6dbebe03fc6b404407a1d0704dc8fe336c6b370bf0ffece70f5dc17676fac032"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/eu/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/eu/thunderbird-152.0.1.tar.xz"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "e35488c88b702a19594c0558e3e102e0a0bb57759477652ac7165a424b00cdf4"; + sha256 = "aca435a77ca215ce12fa0057c4dbf14e4aecd56615ca9965bce14a5d43159836"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/fi/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fi/thunderbird-152.0.1.tar.xz"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "df08b81f17519da8a49ba9a6b5e7cc0bcca049b124aedb274c83adad4de0296b"; + sha256 = "ed66ab39a832e16fc1a6eabda70b10ebfb377a4b3647d555736759458a0e5238"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/fr/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fr/thunderbird-152.0.1.tar.xz"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c9242ad7d08ffe8d156900dbc8cce3d2b5e397f0534e6414418d924f46c5e6f5"; + sha256 = "64f997263e5a66e7fe888500595c8b333cf93e82873c091308862213c414ef52"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/fy-NL/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/fy-NL/thunderbird-152.0.1.tar.xz"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "e95d8aed2e678fd8263b0d38f1deeb59d97f86cc7fffaed50c74da1da08e55a5"; + sha256 = "d2ed5698fda8515d3e0ad41a2d1cefac42ebd1b1d48f48dfef338509b4d652d8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ga-IE/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ga-IE/thunderbird-152.0.1.tar.xz"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "0cfeecd2ece40ad73731ffe06d47100d93b4fd2b4bb28b874484099e0b87f6d1"; + sha256 = "c121fa734cbf24d157dfbe53f06d43a483dbaa3fb443ef4858dbd5ba0bb89c45"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/gd/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/gd/thunderbird-152.0.1.tar.xz"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "014fd0e0aaa39c12b89c54e447699e9db1946e75ca72d7d0340a167485320fb5"; + sha256 = "118d82a56ca7b5cab8d4f58821958bd5048cea9d92a9866328c840b827114cf9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/gl/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/gl/thunderbird-152.0.1.tar.xz"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "01a6e31e7b48f7fd4bc5773d4f6acdc34ffb526f5f6b48f5f777c7aefea0206c"; + sha256 = "ce1e968514ed207ef3dec874c03fd6b38ea919ca323d6f864943c989866a1aa0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/he/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/he/thunderbird-152.0.1.tar.xz"; locale = "he"; arch = "linux-x86_64"; - sha256 = "c6accef65894bc092ddf2eaed14a13327eaa1e748d69b654314a141abf737fdf"; + sha256 = "5fb9ad329da71e722d7c09104173e50198ff60e2d60b019ca545c61cc309e575"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/hr/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hr/thunderbird-152.0.1.tar.xz"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "9671f388c66d5776aaecef4e1820496a63101bba318690ed8936d1a74b6da1d6"; + sha256 = "fd054e8e357eb45ff0185782c39aea1ffe3fbf9d9c73e212c7a508f71ebb5363"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/hsb/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hsb/thunderbird-152.0.1.tar.xz"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "0287dea060ddf05d49afe47fdff227e983b1173276ed1b61394d76f0649e85ee"; + sha256 = "120e6cec01b5b384b9e1c8e1f68d607f922e197e0e80e935f1519c51e8d91b02"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/hu/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hu/thunderbird-152.0.1.tar.xz"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "ac9d347c7128ad6f03eea37b33b2917936ebad221295fb9d5ac080b08094cab9"; + sha256 = "f1e32edada9bf6649af6abdac582972dc51f342ed4698c7b5ec4055ea4166dab"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/hy-AM/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/hy-AM/thunderbird-152.0.1.tar.xz"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "ff0a1336cb1d2e8aed9d97c5c9a0f729b27f5ac81363e7ea621c65eca05e1021"; + sha256 = "5cdc75efea4f9d5cb12217c83f5697542544b48d042625c83205187b181f1e91"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/id/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/id/thunderbird-152.0.1.tar.xz"; locale = "id"; arch = "linux-x86_64"; - sha256 = "01b3ef18cc6ff34b70d8aa8848f10ccd6f5d975c08a9190e4ed16475036d2651"; + sha256 = "5ab5a0c8df4f329cddc24fe5b3cd9f7c6d68fc1023e33bff4ea97aea276caeb6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/is/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/is/thunderbird-152.0.1.tar.xz"; locale = "is"; arch = "linux-x86_64"; - sha256 = "c2d12e700d782d6e415ec288096b26df49882816c833f5120dfce5a36e5693c5"; + sha256 = "99b443148993fbd16fa6de8703949fa8935a2a03a3d51e3381fbf3b355700f61"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/it/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/it/thunderbird-152.0.1.tar.xz"; locale = "it"; arch = "linux-x86_64"; - sha256 = "132b26bd20fe31492530b1ff7d355cdfa144ef12f3c20fc3ec13c9184b415cfe"; + sha256 = "db9c3bf364f972e93ac76218a8375ad28e3fca4c679c5cb4d2cd4eee5c50aae9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ja/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ja/thunderbird-152.0.1.tar.xz"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2d7e3f83e74a39bb01278535828620e475e9c323beb3ab8b3f25f82119123d56"; + sha256 = "3443752d5321e2d6362a839a052bac4704fafdab9050711c2b5f7f376f429db9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ka/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ka/thunderbird-152.0.1.tar.xz"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "5eb27ddd0e84c3822c0114014c2b80f2542236d06d71835ae5737263433ad3e1"; + sha256 = "f4605a1f51a11e4967ae780885519dbcb3c5314e3f7fe052c8a3c59478acca51"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/kab/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/kab/thunderbird-152.0.1.tar.xz"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "87dcf426ee9c5cb57d20b7221e9eaabade8c9f6ba78749d0f2e5b44b8635bfaa"; + sha256 = "017592e09e8c3dbc99cebbb3f395e21d73e1193f294257cba8530df246bf0aa9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/kk/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/kk/thunderbird-152.0.1.tar.xz"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "4f2ebcf0c32e5698a2ba60420448f53e4342674c1ec16c2df7b6f74e3831242a"; + sha256 = "b52f50007704f3d5d091ae772c8bb47a8b6be859767dd05e3dc3b6ab531d810d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ko/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ko/thunderbird-152.0.1.tar.xz"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "de65be3d933e2b27dfb16cacd6dafacf4851ff2dab4515a199132469a6c8bf55"; + sha256 = "e7dea245659b76060d7b1a4d629aa7d54dbc51afc38e78c66e284c40e9d69d76"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/lt/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/lt/thunderbird-152.0.1.tar.xz"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "e23ca590d95a7bc4ff20626fac7df7b3f11676eb3a2d914258166adad53bb82c"; + sha256 = "ebc4e083a78d4997021556c3733f428f39563d160be5fed9e26c174032890c48"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/lv/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/lv/thunderbird-152.0.1.tar.xz"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "159c11d970160dc793003c00defa52545276ce7268211207de671426d9046518"; + sha256 = "9ea1e28299f96d04d4d7c79831c96b27d2ffaf5766825625ec15b32f4a0c3aa3"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ms/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ms/thunderbird-152.0.1.tar.xz"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "f69ca46fb945d584ea17c0642fedcde5471220c45e3067894c9bedc5c14a87f2"; + sha256 = "83907525cd325568caaa2e118d17aa2a7fa376597230b99e5c6501c662bbac67"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/nb-NO/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nb-NO/thunderbird-152.0.1.tar.xz"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "588c4b5857b986cf3c0beadcc1def800aac4a42ac35062bdb47ed41c66126c91"; + sha256 = "4e1914054f7360cffdf5ad8eb768acb7b1b6ad12fbebd42af2ebe25ca2c65aeb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/nl/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nl/thunderbird-152.0.1.tar.xz"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "042d0f2c57e5203ece0bcd960f1eec1b1cff26dab5d618e0592b23537e04833d"; + sha256 = "03555fabad23a6feaef4c3bfc36dfe80a277f95a61d778948e65200dd6ca901a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/nn-NO/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/nn-NO/thunderbird-152.0.1.tar.xz"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1892f334d471fa7dee84bb960b6d1f902b9869e2be27bf2868499aa8f22d8fbb"; + sha256 = "348647bc24040a353824035a02fa937557cb06d4fd789ed5faa545db0c6a8d44"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/pa-IN/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pa-IN/thunderbird-152.0.1.tar.xz"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "762b122c86097e1594e1d1d7f8fc6bdbf97f8b8a98d1d2d4f5d4910d3b9c703d"; + sha256 = "68aff1456e36ef21ac64eba44f859ed0c5babfccba1afc4e91d4d3168f5b5ffb"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/pl/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pl/thunderbird-152.0.1.tar.xz"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "78537831b639575e9b0d78e8c2e4c8e762890908a3f73984c580d09596564190"; + sha256 = "61029cd0b65035f39cbd8fccea313d56a13a1ac3d6752a5a30820486724c5a39"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/pt-BR/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pt-BR/thunderbird-152.0.1.tar.xz"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "dc496532391a6a742f6be8ef1dc585a19c41421dd4ba67f183cc07103934957e"; + sha256 = "2da35094aefb00d8c6cb5de741ee70b2f7f0b83972f1eed0bd63c9a2ace4d0c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/pt-PT/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/pt-PT/thunderbird-152.0.1.tar.xz"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "48e607388ed4da0e0bf3b61aebd17ab81408957ef0da2a9915fc1202917bd208"; + sha256 = "50a2160a41264a44dc9daa22e0443c3c7d79b165f6612655d314dcb40651cd43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/rm/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/rm/thunderbird-152.0.1.tar.xz"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "e255a0231407560d8d00a0faf84b187985d471f47ab8c77b4f872f4e81d5a102"; + sha256 = "ea61621141f6d3f957dcc52e4b8e63c5f0af2da9c71c11538cdc494c6fa9e713"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ro/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ro/thunderbird-152.0.1.tar.xz"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "2c45b57aa3d0fcfd2531c6a9310b469a85db65d649b291afdd57ebbc2404a3c6"; + sha256 = "f59aa1fe09405b50413eef49a0e9dec3d38cc853a6e3b0805556b9e6edfdc435"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/ru/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/ru/thunderbird-152.0.1.tar.xz"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "cec101067329f01ea1bf7d0ff857879b7677271acbf9d58a62f0fc361ff8f6cf"; + sha256 = "e56f0979e9e4fec993cdef77bebbfb3f70a94c28a7b041d5891c5f5108875b43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/sk/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sk/thunderbird-152.0.1.tar.xz"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "1ef2995f78cf0d6342d386d16de0b033890a8d976e9e156050c1c90953ac234d"; + sha256 = "c80e1b7f55ff1b377ee5e31170e0eeab702e19c2cfcdd1d1d6bb0a28a292552b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/sl/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sl/thunderbird-152.0.1.tar.xz"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "dbee23cb2a06b718a02e7cf05b3052cbd33943e65b5f284d9d08442067eb8ef2"; + sha256 = "d922a7ef6bc55a6499676498efd8d580c93f9d8c90f04493f62b0239386018a5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/sq/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sq/thunderbird-152.0.1.tar.xz"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "6dd49a3a60231d3046101094c0e47749ec2a0b748271a78e1be3189c8fa9756c"; + sha256 = "5040e32916ac1328b404327b07d00448b04c8f7c5340e43088253cf04242215f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/sr/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sr/thunderbird-152.0.1.tar.xz"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "941f9be3ed637a8cc13f3b955fa53b527a0da20dc4d680094b545eff522d152f"; + sha256 = "3fe1d75afc21fa130ab42595ae754b70ce70c9237654271d24b78e3ca2bc8e9d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/sv-SE/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/sv-SE/thunderbird-152.0.1.tar.xz"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "0854e7608bc22311d9f763939143f502e022aec5f73d50d202f670814ef5f713"; + sha256 = "92bc1225f62f3cd9722e7698815ffcf4c7461ad85a33171b7ba7e845e43af5b0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/th/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/th/thunderbird-152.0.1.tar.xz"; locale = "th"; arch = "linux-x86_64"; - sha256 = "adae4b6084ef579c41bffe2094c2fbd80d840821769b4af7d5a289d1f8be80f2"; + sha256 = "e42cb3ca1256dc8c8ecee3608c42aee52d6af242f9c1e84f70d6f89b09eacb10"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/tr/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/tr/thunderbird-152.0.1.tar.xz"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "044e7f8bc8f4714b189d88c034abcada3a6815e05aab59573f0de719f7ea3352"; + sha256 = "412b576b11fc50523c2d60cf424a3345a7c60c687c3a9a19324654feb05d00e6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/uk/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/uk/thunderbird-152.0.1.tar.xz"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "e85c60ab8fc67a46c5ccd62c70b4693c88145b05ec2280bcf3a8ec3991e3e382"; + sha256 = "b4f0134adf16d406cc385cff255ff89de3f30ecfb351d7e4cae69652feb53c85"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/uz/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/uz/thunderbird-152.0.1.tar.xz"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "9d02e76e71dd186c01e2c285d31c557ccb8581b7a34ba63a366a2f4a31497686"; + sha256 = "9be0000d168ea4e7cefb8db26a2e6581d090f3d67d80e30281a6e9a3141e441e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/vi/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/vi/thunderbird-152.0.1.tar.xz"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "a71e10eab8d868409d255cb27bc6ca6293284ac181a08278755e846df5051bc6"; + sha256 = "2f002d79964af466b1c85dc6cb0ab9796bc63d526975c837448161852904e20a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/zh-CN/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/zh-CN/thunderbird-152.0.1.tar.xz"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "41f7e2965fd6a86a910aeaaff7695b2d6b52834f5544c2d0390fc069cdd3c1ae"; + sha256 = "96b250be51398b0a48cd1ed47a92fb17b326da5f3444d8f2b7623cf0caccc2f7"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/linux-x86_64/zh-TW/thunderbird-151.0.1.tar.xz"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/linux-x86_64/zh-TW/thunderbird-152.0.1.tar.xz"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "760bca2bd7c63edfc5b9f4d0f0963d0761a86ec7f2689ae3135080bf0f5031b3"; + sha256 = "544cb2db7c03a21af83869d86154a105ef332f2658885fb0cdba0122b555d432"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/af/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/af/Thunderbird%20152.0.1.dmg"; locale = "af"; arch = "mac"; - sha256 = "4ee9d6a7b599332945190054920adf614b58085d7707886f956168b1b78abd5d"; + sha256 = "4408ab7b882c87b49e336366d734d092d0179df4fdc42a02cfdb285564080dff"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ar/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ar/Thunderbird%20152.0.1.dmg"; locale = "ar"; arch = "mac"; - sha256 = "ff5ae57c4ec01fa9f97035b3eb0fd2d90cdc66e428e6b821134e6cab30b2d65f"; + sha256 = "89ec721e4ddfe899cbf091c8106daff50bf6d7f24c16c057d24d84d6d27804c0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ast/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ast/Thunderbird%20152.0.1.dmg"; locale = "ast"; arch = "mac"; - sha256 = "82a4053f603dce3f797f9d3c115eafd16c389d26913cc66e9aca69751bb46446"; + sha256 = "1d25f08eba3ce2309ad50301d63e075a5a2c432860415a497164780b14ed8503"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/be/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/be/Thunderbird%20152.0.1.dmg"; locale = "be"; arch = "mac"; - sha256 = "022366dd373cb23544f6e280c1ad076fc74e9899a7c6da3da87efa05a957f1c2"; + sha256 = "d8ea62ba64e8f11fbef7f5ce7498f9741dde044479a362f6fe74797a23118bfd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/bg/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/bg/Thunderbird%20152.0.1.dmg"; locale = "bg"; arch = "mac"; - sha256 = "2def93dd5b36a3515bef68b79a9fe1f29e13059062465e90ea51a28dd8742190"; + sha256 = "4da05c87c12bcae424e7aa2fb6f929e396f57c77c2b811cc30f57e4872702b20"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/br/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/br/Thunderbird%20152.0.1.dmg"; locale = "br"; arch = "mac"; - sha256 = "b740ae16fa784cabf6fedd845b79b319510f2a4fc14b4408604ba293b8a61084"; + sha256 = "78d270d1e5927e563ba21039b5e196adf69e7a0324c40fe11125fe20c635c451"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ca/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ca/Thunderbird%20152.0.1.dmg"; locale = "ca"; arch = "mac"; - sha256 = "27c82ffde3968acf31bb81025ad31a275057866fec25b58d332dfbee443bdc2a"; + sha256 = "032afb66a26ec0dc03b72b7ca80ee4a6900cdaeea2ee66056dd437e7e887312a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/cak/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cak/Thunderbird%20152.0.1.dmg"; locale = "cak"; arch = "mac"; - sha256 = "555d0a5ca28787dd72b656acc8abf953bdbdd3ca79b9d721ca09a8d6017b3172"; + sha256 = "41e5c9b3835e6d92739902d298cb317fe9d2db8ad72a53c3b9f78867d13669d9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/cs/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cs/Thunderbird%20152.0.1.dmg"; locale = "cs"; arch = "mac"; - sha256 = "edc44e48ea143f746c893fcde6eab2263f9c427cffdf6202316a514fe7d8dbcc"; + sha256 = "f0bec80b949c9bca491565f0cccb24228834a7cc1d47abc54c8029b5584ac97b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/cy/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/cy/Thunderbird%20152.0.1.dmg"; locale = "cy"; arch = "mac"; - sha256 = "bebdda5cc81addd42068edd426bce89da4a88fdd21bf46c5adc25b540e9194f3"; + sha256 = "a6242b2b7dc0e8d34b3763a54c8b7e84cb6eaab116e6c8af8cd23de934445156"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/da/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/da/Thunderbird%20152.0.1.dmg"; locale = "da"; arch = "mac"; - sha256 = "0dea7848ec06c8ddaa89d21d1af2800bb40ccfcf6830ebb391842df63bdddbbe"; + sha256 = "54ca25e3c72f4c57b83fdb0d058e48fd144a71b754d930f28e14a7d80e7ece92"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/de/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/de/Thunderbird%20152.0.1.dmg"; locale = "de"; arch = "mac"; - sha256 = "2b8a6fab36d9e87624293641514a89f95fb840fd96e5ac01fc19f58a1d1ac3f6"; + sha256 = "9f3adbb7b8728d36462c884111b0933eea00761102417a96b6718973235e6d13"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/dsb/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/dsb/Thunderbird%20152.0.1.dmg"; locale = "dsb"; arch = "mac"; - sha256 = "fd22389c456eb9ccb93291ff837fcd2a800d75b44d7aacf0c4e5bfac6c236daa"; + sha256 = "57a36c2099e9932d9161a650e370b52bf5b399c53df45e93899a7bef38867bec"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/el/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/el/Thunderbird%20152.0.1.dmg"; locale = "el"; arch = "mac"; - sha256 = "fd7d1310829af952b3472ada816ebe0bfdaad21ca5e8bbd82f2cbc68a256fcde"; + sha256 = "98fb7469ad7747372d70fe526a6e319ed390f436f42d02af60fd14a6955efe5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/en-CA/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-CA/Thunderbird%20152.0.1.dmg"; locale = "en-CA"; arch = "mac"; - sha256 = "232b2a80c79c6fc2ad87513d54d804ea0a0978f56671064f7a843f4ac7a765ff"; + sha256 = "14d52981f5cfafbba62523cc8fac0a8804d92266e998b48a9a0d107c0bcd9c5e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/en-GB/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-GB/Thunderbird%20152.0.1.dmg"; locale = "en-GB"; arch = "mac"; - sha256 = "696cb5eb4a5753702d327379c956f8099875b00b838c519d65cdb52c87c49158"; + sha256 = "e86244b4244b62c85b70fe7074ad8e7fb418dc4ade583af61c9601792bd1fbef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/en-US/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/en-US/Thunderbird%20152.0.1.dmg"; locale = "en-US"; arch = "mac"; - sha256 = "161efae828f7cb85acc7e7490c88042a22c0867f3c6bb616b73319bea834a378"; + sha256 = "2ddb04427a7153e2c25f2f118ba42d5904f73b8e8b7599a0761a30c774fc00c6"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/es-AR/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-AR/Thunderbird%20152.0.1.dmg"; locale = "es-AR"; arch = "mac"; - sha256 = "4d8087895b17937a62af0ac45209d72b531011f43e387eb2d1e7617d56cb0e66"; + sha256 = "b2474b995b3e15c30a91afc4746c1858da3eb17e1cf5f31156393a661581fb9e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/es-ES/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-ES/Thunderbird%20152.0.1.dmg"; locale = "es-ES"; arch = "mac"; - sha256 = "f3c9b79bf2e4cf57df551a3c9fc1dac8e38d38e5502524574c772d02b62915d7"; + sha256 = "6fc00ab22c863261e28d7cee0d11d9fd7ec8fbc387a90477e2a87a17c9d24fa0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/es-MX/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/es-MX/Thunderbird%20152.0.1.dmg"; locale = "es-MX"; arch = "mac"; - sha256 = "f03f6635cdb8903e38742a2ec633bb0ac95a0b88e7881bad8f9decac3f7038c8"; + sha256 = "33cc5572a9b0c368df1bbf87218cdb693b2ef209491c865d674463f8262b3aa9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/et/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/et/Thunderbird%20152.0.1.dmg"; locale = "et"; arch = "mac"; - sha256 = "59d466e2e6de618d6ea4da86db18aa531e30754f7f7b77ead69ed5b27a76470e"; + sha256 = "16d369305e03b19a50ce4a31807d28f08c12ea15fcea77f6a8b43e581c9a0a14"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/eu/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/eu/Thunderbird%20152.0.1.dmg"; locale = "eu"; arch = "mac"; - sha256 = "debb7b4633145f46cf211d8ca80c90c180a15b135bbccc750a74a994bd0762da"; + sha256 = "58f2e8080fc9d9d3a4ff8f6721d73e639932574fd82cc65b58012f1c7f336518"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/fi/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fi/Thunderbird%20152.0.1.dmg"; locale = "fi"; arch = "mac"; - sha256 = "88b5d5906eb29a9b2fe8c64fcc52b8b71eef2614dcf57341fbba1ac4bf4e8b28"; + sha256 = "516dc7c067e4eae883823378d8b78dbf6d74b6e6224e6c4b4e2d36750d53effc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/fr/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fr/Thunderbird%20152.0.1.dmg"; locale = "fr"; arch = "mac"; - sha256 = "17296d4edeb6ca24c21254d5f20ed426b5997fca3792841c21026b040224746a"; + sha256 = "c5f1da966b4dbdab893c85785ee1ab9439a31c33b8f3b9a2ca9ed04c32164ddf"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/fy-NL/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/fy-NL/Thunderbird%20152.0.1.dmg"; locale = "fy-NL"; arch = "mac"; - sha256 = "0246cf00ae02b15cad97134a9750624e313624db23ae763911fb4ebbd18f625e"; + sha256 = "992036c121dc6f641f05a849f6638f337ebdb319b8a4c13f92ae56efc2462f7f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ga-IE/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ga-IE/Thunderbird%20152.0.1.dmg"; locale = "ga-IE"; arch = "mac"; - sha256 = "6fccb859a1f2b1055719df3ef3df3d45b74f92a26c3c329c616f8a1a15bd05bc"; + sha256 = "686e62df158651404ec2d17ed20913acf3ca2eaa23cf23f0d1dd4118f7a47358"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/gd/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/gd/Thunderbird%20152.0.1.dmg"; locale = "gd"; arch = "mac"; - sha256 = "f932ce10d5ba53366e0bf09234a7c9aed26e83f17de43c0546d9a18ac8f18a3e"; + sha256 = "bc4d5c71286f446362517234bc3b68c707d03848db5b4c631f8106c5a60578ef"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/gl/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/gl/Thunderbird%20152.0.1.dmg"; locale = "gl"; arch = "mac"; - sha256 = "572f0d4adc494162f9d43ae9f4af62f6e0738675c42fca5120fb2990e879aa56"; + sha256 = "1a5e70641572149cdc602bcb734518e05d31052460870401d90e0ede5d779683"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/he/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/he/Thunderbird%20152.0.1.dmg"; locale = "he"; arch = "mac"; - sha256 = "f4b90c12e3f87698a32001a86b847b30a8e41ae360324a51c5294f7b9acba058"; + sha256 = "5bac4ed802ca670726f02a1227440633d6d7710e87c6d314283c1a5aab4230a4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/hr/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hr/Thunderbird%20152.0.1.dmg"; locale = "hr"; arch = "mac"; - sha256 = "35c5fa6f4648d99d10f28fc46e50e6dc6808196b56f8e70aa16e55bea499e1e7"; + sha256 = "b1aa9eeaf1e44f63f6cb52fe9fdd7516b62fa08cb0e061b00d37b333d576c9f0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/hsb/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hsb/Thunderbird%20152.0.1.dmg"; locale = "hsb"; arch = "mac"; - sha256 = "f526fc3f78e52295e867feff8a7006c45032aefc592f548422d14f4b7a618355"; + sha256 = "6971c8781561378794d9b97769baf5ed4351fb6e34f4446665bcdb1b16526783"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/hu/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hu/Thunderbird%20152.0.1.dmg"; locale = "hu"; arch = "mac"; - sha256 = "5b1b16966b7c583fb101e8056ef071e991add25cc5e8ef6e9d0776eef72354c2"; + sha256 = "dcad9ed1f99cfe06f2b6af081c13383e68a2f9ea703e2632f5f7f08e1cd2b63d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/hy-AM/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/hy-AM/Thunderbird%20152.0.1.dmg"; locale = "hy-AM"; arch = "mac"; - sha256 = "b3f9f01425f282616b3bcbcf3d139e97b994b6f43dc6b31f83206beaf028708c"; + sha256 = "cfbc7a9989daa7c5690531280f86404571795c9a8de798c3cf468b569fb12f43"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/id/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/id/Thunderbird%20152.0.1.dmg"; locale = "id"; arch = "mac"; - sha256 = "a926df05aabb6dd2a40ab931bc19e633165bceb249600e9706929ad10997c771"; + sha256 = "b5cab6d618e161ca3b56a869628aec16997c24961f149f4f1e8476fcf1ff73ab"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/is/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/is/Thunderbird%20152.0.1.dmg"; locale = "is"; arch = "mac"; - sha256 = "b527dc4f7e45c4ac930dfeed60102aef2f477add5686eb0472b9fa6b94b402cc"; + sha256 = "c388e46c1127894a7811be9396b00b16d995e8ade53cf6ac09e0fdb1a041ee54"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/it/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/it/Thunderbird%20152.0.1.dmg"; locale = "it"; arch = "mac"; - sha256 = "82a33b41a7375850c5070a98691d3decbdd4d564823266b36f7123ca163ad7f2"; + sha256 = "35eed5be6ea98a55b30a02c4ff197acf1e357e0aee73f99e30196c06d455c0f0"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ja-JP-mac/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ja-JP-mac/Thunderbird%20152.0.1.dmg"; locale = "ja-JP-mac"; arch = "mac"; - sha256 = "fafa588a8906d0d6b8228cb703a7e0ae6dfb45203da835bb50fe0ce73338179e"; + sha256 = "b8c5522eddf6c92f127b0b261922841b6298f8fa3a10daddb81928035da4b949"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ka/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ka/Thunderbird%20152.0.1.dmg"; locale = "ka"; arch = "mac"; - sha256 = "d4e3f0d0c6602210ea67dffa001a80fe5605a82561bacad224a8290dbb4a5965"; + sha256 = "d69fc15f1380a7d49019ede8cf63b81298c06505889cd2030b42c942b3e77b9a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/kab/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/kab/Thunderbird%20152.0.1.dmg"; locale = "kab"; arch = "mac"; - sha256 = "f48785aab56f79ee7ca21e8b3023968c34229a97f588bfbbef0c60a841310d66"; + sha256 = "b3dad85c2214c6c994bf20e0a150a4ed59f5b2a64e80fa82e07d109dfc4a26e4"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/kk/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/kk/Thunderbird%20152.0.1.dmg"; locale = "kk"; arch = "mac"; - sha256 = "3de49ac472eb55a24d01b269aa5b16ace2c8ec61ab1312032e58e7659a707dd7"; + sha256 = "0eb5767276165f67dad1d786ed794b21b45f82c9a7e7dd13efc53069191a7db5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ko/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ko/Thunderbird%20152.0.1.dmg"; locale = "ko"; arch = "mac"; - sha256 = "d02f547def514737ba423efe0f1addb892d48e79859cb1e4d1476945b44a6186"; + sha256 = "1d3d93ea1e5c07f94170f8a8661667f2e450b628e5d165d73c5e7b98f12ae3f9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/lt/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/lt/Thunderbird%20152.0.1.dmg"; locale = "lt"; arch = "mac"; - sha256 = "f49ed4e7bccf8b75466348f16f399fe09fa36f7bc97eea120619431acf510b88"; + sha256 = "edeff3cc61e1060826333cd9f71ebe5b7ccd5943a88123b72071f2b05902eebd"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/lv/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/lv/Thunderbird%20152.0.1.dmg"; locale = "lv"; arch = "mac"; - sha256 = "d904f26857cb9e46e58c00d932355378395e70b4d101812fd3ed01ba92648a48"; + sha256 = "f4c6c62114b803cc1c50776a66e06ab4cc64158f2e397e5b693e9631c3e587b8"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ms/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ms/Thunderbird%20152.0.1.dmg"; locale = "ms"; arch = "mac"; - sha256 = "f13a328db2e58788b76d44da616d5e5775cd66cda0e6183033c42c144b18ee26"; + sha256 = "29a87af2113ac76c51f87eb982dc377295be836aaf944cb382cce5002882180a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/nb-NO/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nb-NO/Thunderbird%20152.0.1.dmg"; locale = "nb-NO"; arch = "mac"; - sha256 = "4a695d4a191bf0433cb4bbb91391f1282cda883bdbb02bb04bc269917e8c0d3d"; + sha256 = "55523504611afba716e782aae7f1f2f9c57a296f082ea6f923aca5df6cde05bc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/nl/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nl/Thunderbird%20152.0.1.dmg"; locale = "nl"; arch = "mac"; - sha256 = "db330c8251e4bb91bea875807ac486189a2e60cb09427334c18f9b8b7dc082a7"; + sha256 = "ac8885100e33ba4dd53d3513338885e651d5399abcb1b88fe30cd6be284d4832"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/nn-NO/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/nn-NO/Thunderbird%20152.0.1.dmg"; locale = "nn-NO"; arch = "mac"; - sha256 = "3a5a505ff46428636b3deecd6caa724d75231a6fb50a5d9819c19ddea48737f5"; + sha256 = "bba879fa2a64572e97ac2c890f2c57414653b105ef2a5ce14a588bdab17b0aba"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/pa-IN/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pa-IN/Thunderbird%20152.0.1.dmg"; locale = "pa-IN"; arch = "mac"; - sha256 = "75f7f7ecc2e0f5e8bfd732763e29f6928b39d221bc18a345740ddda8dcad53b0"; + sha256 = "2193c9f55b83a3bcd803a8e34654b19902065b78633e456eb639d9344d8c2ec1"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/pl/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pl/Thunderbird%20152.0.1.dmg"; locale = "pl"; arch = "mac"; - sha256 = "68bb5ac81dd94b32b33a8084464658f010d8615a6cce49e9c68814145723a83c"; + sha256 = "014d20781639014d304866c9772903dc4bb4c552d320a120c0b31143381499ee"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/pt-BR/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pt-BR/Thunderbird%20152.0.1.dmg"; locale = "pt-BR"; arch = "mac"; - sha256 = "1efcc35ef1c96dfdd5c8fd0403160985982e5fdd3186b018fc13df32061cfff7"; + sha256 = "fd3400134bd5420db23cac7095d6855ce2a8ffed9f8d8ac00891cf708971551c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/pt-PT/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/pt-PT/Thunderbird%20152.0.1.dmg"; locale = "pt-PT"; arch = "mac"; - sha256 = "731b9eaa6a4be349d6cd496c9d0cee5869b3cf4113f6ed9fa166c4ea8bfb7f96"; + sha256 = "ff56e84058d5d42a44e7f6a59571888b539aad30c79c0703915ea8b1130a05f5"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/rm/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/rm/Thunderbird%20152.0.1.dmg"; locale = "rm"; arch = "mac"; - sha256 = "e80fa36eaeb055a9186cd19f1dc8e9873f080512b3108616b969c58d98eb24c5"; + sha256 = "9b02c2033256331363af9ca3288d9ccc47cf98010e21d91766df1721f4ee088d"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ro/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ro/Thunderbird%20152.0.1.dmg"; locale = "ro"; arch = "mac"; - sha256 = "0968d478170e848ccad9e2ffd1be076019c288fb29c745225b6dd8f84d2acd84"; + sha256 = "477c5714f088703526f4f32388067e5c57dfac1d7425739b86b169d0a7d93234"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/ru/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/ru/Thunderbird%20152.0.1.dmg"; locale = "ru"; arch = "mac"; - sha256 = "323b4bedfced3e60b36e542d50106a4c95e290033afdc7fddc88fa32192b513c"; + sha256 = "cdeb26cc7d4370ecd93df3cf429f92468617ed1436dd8439c9c40b8446bad48a"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/sk/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sk/Thunderbird%20152.0.1.dmg"; locale = "sk"; arch = "mac"; - sha256 = "bdb8d82610cdbe8231b11a70745ad5c878faa97a735523b17e5cbcc9102c3c72"; + sha256 = "a79436bbe2e69c096800e84f20887fb44d08ae044f86a7e1c380a92ce3f34527"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/sl/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sl/Thunderbird%20152.0.1.dmg"; locale = "sl"; arch = "mac"; - sha256 = "f375b3266873e9a3ff83fccb5d39c0b51d9916b027753dc85d2074c56916a188"; + sha256 = "4860141caee86a667319cae4a45f4d5a55c16ae74d930c654b0d40a95537914e"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/sq/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sq/Thunderbird%20152.0.1.dmg"; locale = "sq"; arch = "mac"; - sha256 = "8f45cec988eccb40a57f974b558d6096eaa696da337f404d458bb2404750a8f8"; + sha256 = "e6c2b2678c7c4a07c2bd3a84767d5c8e253a044fe23060ee7e36b035da39a777"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/sr/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sr/Thunderbird%20152.0.1.dmg"; locale = "sr"; arch = "mac"; - sha256 = "f3d2825c219becef5a566cff38550a690122f089ecd087b276350974eeeddd79"; + sha256 = "237758f368539a799974b6fab81a1a221c77971ecd6d2fbff53d7905865468dc"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/sv-SE/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/sv-SE/Thunderbird%20152.0.1.dmg"; locale = "sv-SE"; arch = "mac"; - sha256 = "ab3a167a122bcc8824734a058fe7d1b2f7d4f2833cc29e8199d9b2bcdb33261c"; + sha256 = "f41bf3544886a60269598db51c775595472cd44b2a88d5592e87d84f8ccf71d9"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/th/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/th/Thunderbird%20152.0.1.dmg"; locale = "th"; arch = "mac"; - sha256 = "acc0338065033339858e7a16e6ebb6c79ffffcb665907a5a49f88ac1d7ced103"; + sha256 = "bd61e2a35e48003ef1d95bfde78fabe274f49ab80ac200109b8f7acc48e9cf35"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/tr/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/tr/Thunderbird%20152.0.1.dmg"; locale = "tr"; arch = "mac"; - sha256 = "1e2e36dc2e693c63e7934d8bea651bdc9416c85608646ffcfb8b7bb00baa70d9"; + sha256 = "83803875437161d44ca569c1b29156452cf6a9afae0e962bfe13c9b9077a627b"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/uk/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/uk/Thunderbird%20152.0.1.dmg"; locale = "uk"; arch = "mac"; - sha256 = "aad2c6ac1e91c640d3815532299314ff36613373fc7e522a192da3e6f892bb6a"; + sha256 = "2532b1b8fceeab71b57477a6f5e3c016f47d3eae73637b6cdb3fdb6dd589260f"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/uz/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/uz/Thunderbird%20152.0.1.dmg"; locale = "uz"; arch = "mac"; - sha256 = "0ff881361fd63dde5d66cb2855ada2272cc0dac15dd8f7c79b8c8167b039d700"; + sha256 = "1e93deb4ebfb9a6c9df082765955bc02bafce5ad92376f9a7aecf5a2d8bcf84c"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/vi/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/vi/Thunderbird%20152.0.1.dmg"; locale = "vi"; arch = "mac"; - sha256 = "4c3516cf8db48ca6e1a98a220db2d4e2a646169b527d6322549e7e201bc6d6fd"; + sha256 = "c9975acbdb805e2b992b98025724f07601d070848af6a019a9f1eeba00fbd479"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/zh-CN/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/zh-CN/Thunderbird%20152.0.1.dmg"; locale = "zh-CN"; arch = "mac"; - sha256 = "9bcfdb9a06131546cd8dd6ce09d7b59d76923de8f7b9606c951de26aee51167c"; + sha256 = "c9d95293b8d6d16d5175b9881a3e7423d8086eddd2f2feb47613c3cc14fae078"; } { - url = "https://archive.mozilla.org/pub/thunderbird/releases/151.0.1/mac/zh-TW/Thunderbird%20151.0.1.dmg"; + url = "https://archive.mozilla.org/pub/thunderbird/releases/152.0.1/mac/zh-TW/Thunderbird%20152.0.1.dmg"; locale = "zh-TW"; arch = "mac"; - sha256 = "31099269bcadbacb002e3876b510382d70c3ba061a7b7954f4e80c568422a200"; + sha256 = "44b69c1314cccfaad0031a85484daa9b1f53ac187c54fc3988d17affbeff0477"; } ]; } diff --git a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index 71d6cb7a2fa6..f8fadc9d1dca 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -44,7 +44,8 @@ let meta = { changelog = "https://www.thunderbird.net/en-US/thunderbird/${version}/releasenotes/"; description = "Full-featured e-mail client"; - homepage = "https://thunderbird.net/"; + homepage = "https://www.thunderbird.net/"; + donationPage = "https://www.thunderbird.net/donate/"; mainProgram = "thunderbird"; maintainers = with lib.maintainers; [ booxter # darwin @@ -77,8 +78,8 @@ rec { thunderbird = thunderbird-latest; thunderbird-latest = common { - version = "151.0.1"; - sha512 = "a09c1e18faa8d7fdccf39e905542c21e817230e68c7cc6050beec048d0fec0f8eb92e51278d2ccd8d8cfa842762662235517e20238b555a4ad48ee5648dc3589"; + version = "152.0.1"; + sha512 = "f66c87de4dd73c3c45e420a55d76c3cb6ac091a61794ccf58ba59d1a40cf8001dee19a6a7f4c6bef7d36ea94ed4e4f677449d3006b2004abbd3fab42ad1c9228"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-latest"; @@ -91,8 +92,8 @@ rec { thunderbird-140 = common { applicationName = "Thunderbird ESR"; - version = "140.11.1esr"; - sha512 = "93dfdd26e6f4c7dd2f7dcc2e4994980d017868341c60c93775721467abd9192b815f2de63928e7d10c965fc045ed72ca5b49ed6502a61e50104ee5cd00941d1e"; + version = "140.13.0esr"; + sha512 = "778d2fc2837ba367e90c4336f3873da5a0823c182e2f50aa9373cd1ee9ee2b5310372ad9d33e1e11978791b67de4a6952d3036ff7d57b257a06f49c8cd4a830e"; updateScript = callPackage ./update.nix { attrPath = "thunderbirdPackages.thunderbird-140"; diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index 20e8c0786b19..604b5582985e 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -78,6 +78,7 @@ let "-D bundled-gsl=OFF" "-D bundled-json=OFF" "-D warnings-as-errors=OFF" # protobuf 34.x `[[nodiscard]]` workaround https://github.com/mumble-voip/mumble/issues/7102 + "-D use-timestamps=OFF" ] ++ (overrides.cmakeFlags or [ ]); @@ -152,7 +153,6 @@ let env.NIX_CFLAGS_COMPILE = lib.optionalString speechdSupport "-I${speechd-minimal}/include/speech-dispatcher"; patches = [ - ./disable-overlay-build.patch ./fix-plugin-copy.patch ]; @@ -166,6 +166,7 @@ let --source-dir=$NIX_BUILD_TOP/source/ \ --binary-dir=$out \ --only-appbundle \ + --no-overlay \ --version "${source.version}" mkdir -p $out/Applications $out/bin @@ -217,14 +218,14 @@ let } source; source = rec { - version = "1.5.857"; + version = "1.5.901"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; tag = "v${version}"; - hash = "sha256-4ySak2nzT8p48waMgBc9kLrvFB8716e7p0G4trzuh1k="; + hash = "sha256-UBJH7EwfWvInuSD6ZALOKeVnWdfh/rmq8GVLG5URjOQ="; fetchSubmodules = true; }; }; diff --git a/pkgs/applications/networking/mumble/disable-overlay-build.patch b/pkgs/applications/networking/mumble/disable-overlay-build.patch deleted file mode 100644 index 9d2aff0d8da0..000000000000 --- a/pkgs/applications/networking/mumble/disable-overlay-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff --git a/macx/scripts/osxdist.py b/macx/scripts/osxdist.py -index bdc7fcbd2..2114caf37 100755 ---- a/macx/scripts/osxdist.py -+++ b/macx/scripts/osxdist.py -@@ -128,7 +128,7 @@ class AppBundle(object): - shutil.copy(rsrc, os.path.join(rsrcpath, b)) - - # Extras -- shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg')) -+ # shutil.copy(os.path.join(options.binary_dir, 'MumbleOverlay.pkg'), os.path.join(rsrcpath, 'MumbleOverlay.pkg')) - - def copy_codecs(self): - ''' -@@ -275,7 +276,7 @@ def package_client(): - title = 'Mumble %s' % ver - - # Fix overlay installer package -- create_overlay_package() -+ # create_overlay_package() - if options.only_overlay: - sys.exit(0) diff --git a/pkgs/applications/networking/p2p/deluge/default.nix b/pkgs/applications/networking/p2p/deluge/default.nix index ef4bd7b5faef..b392057b53fc 100644 --- a/pkgs/applications/networking/p2p/deluge/default.nix +++ b/pkgs/applications/networking/p2p/deluge/default.nix @@ -5,6 +5,7 @@ libtorrent-rasterbar, python3Packages, gtk3, + libappindicator-gtk3, glib, gobject-introspection, librsvg, @@ -47,13 +48,14 @@ let six zope-interface dbus-python - pycairo - librsvg ] ++ optionals withGUI [ + pycairo + librsvg gtk3 gobject-introspection pygobject3 + libappindicator-gtk3 ]; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix deleted file mode 100644 index 22b7ea21154e..000000000000 --- a/pkgs/applications/networking/remote/citrix-workspace/default.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ lib, callPackage }: - -# For detailed information about the Citrix source-tarball, please refer to the OEM -# reference guide: https://developer-docs.citrix.com/en-us/citrix-workspace-app-for-linux/citrix-workspace-app-for-linux-oem-reference-guide - -let - supportedVersions = callPackage ./sources.nix { }; - - toAttrName = x: "citrix_workspace_${builtins.replaceStrings [ "." ] [ "_" ] x}"; -in -lib.mapAttrs' ( - attr: versionInfo: lib.nameValuePair (toAttrName attr) (callPackage ./generic.nix versionInfo) -) supportedVersions diff --git a/pkgs/applications/networking/remote/citrix-workspace/sources.nix b/pkgs/applications/networking/remote/citrix-workspace/sources.nix deleted file mode 100644 index 506b810333ad..000000000000 --- a/pkgs/applications/networking/remote/citrix-workspace/sources.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, lib }: - -let - mkVersionInfo = - _: - { - major, - minor, - patch, - hash, - suffix, - homepage, - }: - { - inherit hash homepage; - version = "${major}.${minor}.${patch}.${suffix}"; - }; - - # Attribute-set with all actively supported versions of the Citrix workspace app - # for Linux. - # - # The latest versions can be found at https://www.citrix.com/downloads/workspace-app/linux/ - supportedVersions = lib.mapAttrs mkVersionInfo { - "26.01.0" = { - major = "26"; - minor = "01"; - patch = "0"; - hash = "0avrf9jpqhijvp6w4jgs7xgp4gg1q2mdzak9h9klkqrbsgrvjr3p"; - suffix = "150"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; - }; - - "25.08.10" = { - major = "25"; - minor = "08"; - patch = "10"; - hash = "06hdwi5rd8z43nlpvym6yrw3snfz8jh6ic3g4pihn9ji22bw5pbd"; - suffix = "111"; - homepage = "https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html"; - }; - }; -in -supportedVersions diff --git a/pkgs/applications/office/activitywatch/default.nix b/pkgs/applications/office/activitywatch/default.nix index 8b291b54995b..50e158704a5d 100644 --- a/pkgs/applications/office/activitywatch/default.nix +++ b/pkgs/applications/office/activitywatch/default.nix @@ -40,7 +40,7 @@ rec { dependencies = with python3Packages; [ aw-client - xlib + python-xlib pynput ]; @@ -70,7 +70,7 @@ rec { dependencies = with python3Packages; [ aw-client - xlib + python-xlib ]; pythonRelaxDeps = [ diff --git a/pkgs/applications/office/beancount/bean-add.nix b/pkgs/applications/office/beancount/bean-add.nix index e3e80e2cbef5..91ed7e4894ef 100644 --- a/pkgs/applications/office/beancount/bean-add.nix +++ b/pkgs/applications/office/beancount/bean-add.nix @@ -3,11 +3,12 @@ stdenv, fetchFromGitHub, python3Packages, + installShellFiles, }: stdenv.mkDerivation { pname = "bean-add"; - version = "unstable-2018-01-08"; + version = "0-unstable-2018-01-08"; src = fetchFromGitHub { owner = "simon-v"; @@ -18,10 +19,10 @@ stdenv.mkDerivation { propagatedBuildInputs = with python3Packages; [ python ]; - installPhase = '' - mkdir -p $out/bin/ - cp bean-add $out/bin/bean-add - chmod +x $out/bin/bean-add + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installBin bean-add ''; meta = { diff --git a/pkgs/applications/office/beancount/beancount-ing-diba.nix b/pkgs/applications/office/beancount/beancount-ing-diba.nix index e734600ae8a5..c5abcf483e4f 100644 --- a/pkgs/applications/office/beancount/beancount-ing-diba.nix +++ b/pkgs/applications/office/beancount/beancount-ing-diba.nix @@ -12,7 +12,7 @@ python3.pkgs.buildPythonApplication rec { src = fetchFromGitHub { owner = "siddhantgoel"; - repo = "beancount-ing-diba"; + repo = "beancount-ing"; rev = "v${version}"; sha256 = "sha256-zjwajl+0ix4wnW0bf4MAuO9Lr9F8sBv87TIL5Ghmlxg="; }; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { ]; meta = { - homepage = "https://github.com/siddhantgoel/beancount-ing-diba"; + homepage = "https://github.com/siddhantgoel/beancount-ing"; description = "Beancount Importers for ING-DiBa (Germany) CSV Exports"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/applications/office/libreoffice/darwin/default.nix b/pkgs/applications/office/libreoffice/darwin/default.nix index 2798742204e2..eb613364c8f3 100644 --- a/pkgs/applications/office/libreoffice/darwin/default.nix +++ b/pkgs/applications/office/libreoffice/darwin/default.nix @@ -9,32 +9,18 @@ let appName = "LibreOffice.app"; scriptName = "soffice"; - version = "25.8.6"; + version = "26.2.4"; dist = { - aarch64-darwin = rec { - arch = "aarch64"; - archSuffix = arch; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "57ddee0f8ef2d06fd7a9b0e3cf191107e6cb97ec03f0a7f6b137f732e251fde2"; - }; - - x86_64-darwin = rec { - arch = "x86_64"; - archSuffix = "x86-64"; - url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/${arch}/LibreOffice_${version}_MacOS_${archSuffix}.dmg"; - sha256 = "017c64b6e2992db9cbb44f9b1fc3fd2ede3e332c8b481746b780b8a282f09692"; - }; + url = "https://download.documentfoundation.org/libreoffice/stable/${version}/mac/aarch64/LibreOffice_${version}_MacOS_aarch64.dmg"; + sha256 = "64e0ad05564554eeee639d49b08b20908a38d4722ec95f1620d05c99bcbe9fb1"; }; in stdenvNoCC.mkDerivation { inherit version; pname = "libreoffice"; src = fetchurl { - inherit - (dist.${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}") - ) + inherit (dist) url sha256 ; @@ -59,16 +45,13 @@ stdenvNoCC.mkDerivation { let defaultNixFile = toString ./default.nix; updateNix = toString ./update.nix; - aarch64Url = dist."aarch64-darwin".url; - x86_64Url = dist."x86_64-darwin".url; in writeScript "update-libreoffice.sh" '' #!/usr/bin/env nix-shell - #!nix-shell -i bash --argstr aarch64Url ${aarch64Url} --argstr x86_64Url ${x86_64Url} --argstr version ${version} ${updateNix} + #!nix-shell -i bash --argstr url ${dist.url} --argstr version ${version} ${updateNix} set -eou pipefail - update-source-version libreoffice-bin $newVersion $newAarch64Sha256 --file=${defaultNixFile} --system=aarch64-darwin --ignore-same-version - update-source-version libreoffice-bin $newVersion $newX86_64Sha256 --file=${defaultNixFile} --system=x86_64-darwin --ignore-same-version + update-source-version libreoffice-bin $newVersion $newSha256 --file=${defaultNixFile} --ignore-same-version ''; meta = { @@ -78,7 +61,6 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ tricktron ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/applications/office/libreoffice/darwin/update.nix b/pkgs/applications/office/libreoffice/darwin/update.nix index f3c5c758b428..17f4c69cf85e 100644 --- a/pkgs/applications/office/libreoffice/darwin/update.nix +++ b/pkgs/applications/office/libreoffice/darwin/update.nix @@ -1,7 +1,6 @@ # Impure functions, for passthru.updateScript runtime only { - aarch64Url, - x86_64Url, + url, version, pkgs ? import ../../../../../default.nix { }, }: @@ -14,6 +13,5 @@ in pkgs.mkShell rec { buildInputs = [ pkgs.common-updater-scripts ]; newVersion = getLatestStableVersion; - newAarch64Sha256 = getSha256 aarch64Url version newVersion; - newX86_64Sha256 = getSha256 x86_64Url version newVersion; + newSha256 = getSha256 url version newVersion; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 183c2c52ef41..839ec6db93d2 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -398,6 +398,34 @@ stdenv.mkDerivation (finalAttrs: { # Don't detect Qt paths from qmake, so our patched-in onese are used ./dont-detect-qt-paths-from-qmake.patch + + # Fix build with Poppler 26.02 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/25.8.7-2/fix_build_with_poppler_26.02.0.patch"; + hash = "sha256-IInhSoqTemDITB+AtkvVa9eGbodTbUGSpMMpC9N/mmg="; + }) + # Fix build with Poppler 26.04 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/25.8.7-2/fix_build_with_poppler_26.04.0.patch"; + hash = "sha256-I9owj/NTCTi6ISszuasH410NLlhunPn/Ig22tenu8tw="; + }) + # Fix build with Poppler 26.05 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/25.8.7-2/fix_build_with_poppler_26.05.0.patch"; + hash = "sha256-7wdiciTf/LrTk0MibBBYGliWRCvK1rtTGESgH7db1I4="; + }) + # Fix build with Poppler 26.06 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/25.8.7-3/fix_build_with_poppler_26.06.0.patch"; + hash = "sha256-j66IsrzaqQ55MRVzhlw25guuoDtxx1D4XeJsBhgWP2c="; + }) + ] + ++ lib.optionals (variant != "fresh") [ + # Fix build with Poppler 26.01 + (fetchpatch2 { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/libreoffice-still/-/raw/25.8.7-2/fix_build_with_poppler_26.01.0.patch"; + hash = "sha256-5JTTvJFIV5MG0Gz7y46wAr3q9tWdSVoZ9TJQlMJVqBc="; + }) ] ++ lib.optionals (variant != "collabora" && variant != "collabora-coda") [ # Revert part of https://github.com/LibreOffice/core/commit/6f60670877208612b5ea320b3677480ef6508abb that broke zlib linking diff --git a/pkgs/applications/office/paperwork/src.nix b/pkgs/applications/office/paperwork/src.nix index 84bd20231599..6418a53dfe41 100644 --- a/pkgs/applications/office/paperwork/src.nix +++ b/pkgs/applications/office/paperwork/src.nix @@ -27,6 +27,12 @@ rec { hash = "sha256-VUT86kF0ZHLGK457ZrrIBMeiZqg/rPRpbkBA/ua9rU8="; } ) + # remove usage of deprecated pkg_resources + # remove on next release + (fetchpatch { + url = "https://gitlab.gnome.org/World/OpenPaperwork/paperwork/-/commit/ab244d9c483b23f53e2548b73236d7fe4b94cb3f.patch"; + hash = "sha256-Wd6OK0BdyTcjLy1NhkLp9N2oOcQWB6geEPOlYDTBsHw="; + }) ]; }; diff --git a/pkgs/applications/office/softmaker/freeoffice.nix b/pkgs/applications/office/softmaker/freeoffice.nix index 39cf3351dace..85a079b218f8 100644 --- a/pkgs/applications/office/softmaker/freeoffice.nix +++ b/pkgs/applications/office/softmaker/freeoffice.nix @@ -6,9 +6,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. officeVersion ? { - version = "1220"; + version = "1234"; edition = "2024"; - hash = "sha256-F1Srm3/4UPifYls21MhjbpxSyLaT0gEVzEMQF0gIzi0="; + hash = "sha256-q5QUevkSxdh622ZMhwbO44HLJowpg0vwv9de7hdOUQQ="; }, ... diff --git a/pkgs/applications/office/softmaker/softmaker-office-nx.nix b/pkgs/applications/office/softmaker/softmaker-office-nx.nix index e6e4e1c33937..2cf897f78b5c 100644 --- a/pkgs/applications/office/softmaker/softmaker-office-nx.nix +++ b/pkgs/applications/office/softmaker/softmaker-office-nx.nix @@ -6,9 +6,9 @@ # overridable. This is useful when the upstream archive was replaced # and nixpkgs is not in sync yet. officeVersion ? { - version = "1230"; + version = "1234"; edition = ""; - hash = "sha256-/4qKFnLoou1ZuGkRt+2Yf/FPGOnYhx7fnE+8D3gutaY="; + hash = "sha256-00bscKt+4aE94x6wKGqXh6tE2GiDll6F4gWZZBEl2JE="; }, ... diff --git a/pkgs/applications/office/softmaker/softmaker-office.nix b/pkgs/applications/office/softmaker/softmaker-office.nix index e92103a3bd1a..db73e9d94c69 100644 --- a/pkgs/applications/office/softmaker/softmaker-office.nix +++ b/pkgs/applications/office/softmaker/softmaker-office.nix @@ -7,9 +7,9 @@ # Softmaker Office or when the upstream archive was replaced and # nixpkgs is not in sync yet. officeVersion ? { - version = "1230"; + version = "1234"; edition = "2024"; - hash = "sha256-xaXS22feHbRVPWP43vGbfptoT2S6jLUrGVFQ3xY7SJY="; + hash = "sha256-oIO/p52ASIU0qjQqxp/l9GVrUK+LQNQxX1wKheKHT3w="; }, ... diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix deleted file mode 100644 index d7215163a78b..000000000000 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch2, - pkg-config, - libglut, - gtk2, - gtkglext, - libjpeg_turbo, - libtheora, - libxmu, - lua, - libGLU, - libGL, - perl, - autoreconfHook, -}: - -stdenv.mkDerivation rec { - pname = "celestia"; - version = "1.6.4"; - - src = fetchFromGitHub { - owner = "CelestiaProject"; - repo = "Celestia"; - rev = version; - sha256 = "sha256-MkElGo1ZR0ImW/526QlDE1ePd+VOQxwkX7l+0WyZ6Vs="; - }; - - patches = [ - (fetchpatch2 { - url = "https://github.com/CelestiaProject/Celestia/commit/94894bed3bf98d41c5097e7829d491d8ff8d4a62.patch?full_index=1"; - hash = "sha256-hEZ6BhSEx6Qm+fLisc63xSCDT6GX92AHD0BuldOhzFk="; - }) - ]; - - postPatch = '' - substituteInPlace configure.ac \ - --replace-fail "dnl AM_GNU_GETTEXT_VERSION([0.15])" "AM_GNU_GETTEXT_VERSION([0.15])" - ''; - - nativeBuildInputs = [ - pkg-config - autoreconfHook - ]; - buildInputs = [ - libglut - gtk2 - gtkglext - lua - perl - libjpeg_turbo - libtheora - libxmu - libGLU - libGL - ]; - - configureFlags = [ - "--with-gtk" - "--with-lua=${lua}" - ]; - - enableParallelBuilding = true; - - meta = { - homepage = "https://celestiaproject.space/"; - description = "Real-time 3D simulation of space"; - mainProgram = "celestia"; - changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ - returntoreality - ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/applications/science/chemistry/quantum-espresso/default.nix b/pkgs/applications/science/chemistry/quantum-espresso/default.nix index 37c0a8133d1d..2e5bd1ebe4db 100644 --- a/pkgs/applications/science/chemistry/quantum-espresso/default.nix +++ b/pkgs/applications/science/chemistry/quantum-espresso/default.nix @@ -134,7 +134,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.costrouc ]; }; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index a5f7e9e861aa..39c8278a232e 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -19,7 +19,7 @@ ocamlPackages_4_10, ocamlPackages_4_12, ocamlPackages_4_14, - ocamlPackages_5_4, + ocamlPackages_5_5, rocqPackages, # for versions >= 9.0 that are transition shims on top of Rocq ncurses, buildIde ? null, # default is true for Coq < 8.14 and false for Coq >= 8.14 @@ -76,10 +76,11 @@ let "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s="; "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s="; + "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw="; }; releaseRev = v: "V${v}"; fetched = - import ../../../../build-support/coq/meta-fetch/default.nix + import ../../../../build-support/rocq/meta-fetch/default.nix { inherit lib @@ -105,11 +106,25 @@ let substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp" substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true" ''; + dune = + if lib.versions.isEq coq-version "8.20" then + args.dune.override { version = "3.21.1"; } + else + args.dune; ocamlPackages = if customOCamlPackages != null then customOCamlPackages else lib.switch coq-version [ + { + case = lib.versions.isEq "8.20"; + out = ocamlPackages_4_14.overrideScope ( + self: super: { + inherit dune; + dune_3 = dune; + } + ); + } { case = lib.versions.range "8.16" "9.1"; out = ocamlPackages_4_14; @@ -126,12 +141,15 @@ let case = lib.versions.range "8.7" "8.10"; out = ocamlPackages_4_09; } - ] ocamlPackages_5_4; + ] ocamlPackages_5_5; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib ] ++ lib.optional (coqAtLeast "8.14") dune; + ocamlBuildInputs = [ + ocamlPackages.findlib + ]; ocamlPropagatedBuildInputs = [ ] ++ lib.optional (!coqAtLeast "8.10") ocamlPackages.camlp5 @@ -211,6 +229,7 @@ let buildInputs = [ ncurses ] + ++ ocamlBuildInputs ++ lib.optionals buildIde ( if coqAtLeast "8.10" then [ @@ -314,11 +333,18 @@ let platforms = lib.platforms.unix; mainProgram = if buildIde then "coqide" else "coqtop"; }; + + # Things required by the CI + strictDeps = true; + __structuredAttrs = true; }; in if coqAtLeast "8.21" then self.overrideAttrs (o: { # coq-core is now a shim for rocq + nativeBuildInputs = o.nativeBuildInputs ++ [ + rocqPackages.rocq-core + ]; propagatedBuildInputs = o.propagatedBuildInputs ++ [ rocqPackages.rocq-core ]; diff --git a/pkgs/applications/science/logic/easycrypt/default.nix b/pkgs/applications/science/logic/easycrypt/default.nix index 878ebf6b8f8f..872960189af6 100644 --- a/pkgs/applications/science/logic/easycrypt/default.nix +++ b/pkgs/applications/science/logic/easycrypt/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "easycrypt"; - version = "2026.05"; + version = "2026.06"; src = fetchFromGitHub { owner = "easycrypt"; repo = "easycrypt"; tag = "r${finalAttrs.version}"; - hash = "sha256-+tVGJAfngTHpn7qFGwl36verbcxOqH21zwojgOxcuuY="; + hash = "sha256-+exP4UWfNGZauznLZTA/NkMOHJNstz4oaTqI0bSnkH8="; }; nativeBuildInputs = diff --git a/pkgs/applications/science/logic/rocq-core/default.nix b/pkgs/applications/science/logic/rocq-core/default.nix index 6f1c384d005f..68a2c3895e98 100644 --- a/pkgs/applications/science/logic/rocq-core/default.nix +++ b/pkgs/applications/science/logic/rocq-core/default.nix @@ -14,7 +14,7 @@ dune, customOCamlPackages ? null, ocamlPackages_4_14, - ocamlPackages_5_4, + ocamlPackages_5_5, ncurses, csdp ? null, version, @@ -29,10 +29,11 @@ let "9.1.0".sha256 = "sha256-+QL7I1/0BfT87n7lSaOmpHj2jJuDB4idWhAxwzvVQOE="; "9.1.1".sha256 = "sha256-aFsGsFzexyDnOVarHPKs35HjiV8uUCpeOKSl15wXZ4s="; "9.2.0".sha256 = "sha256-rVhv2GLImdVPgRwwTQ+wiWNtRUflMrES0ElIrdTIN1s="; + "9.3+rc1".sha256 = "sha256-vGJkRRzf8ur7i9IUpRA/sxVEQvZGnxfV/ex28Lt1kWw="; }; releaseRev = v: "V${v}"; fetched = - import ../../../../build-support/coq/meta-fetch/default.nix + import ../../../../build-support/rocq/meta-fetch/default.nix { inherit lib @@ -66,12 +67,15 @@ let in lib.switch rocq-version [ (case (range "9.0" "9.1") ocamlPackages_4_14) - ] ocamlPackages_5_4; + ] ocamlPackages_5_5; ocamlNativeBuildInputs = [ ocamlPackages.ocaml ocamlPackages.findlib dune ]; + ocamlBuildInputs = [ + ocamlPackages.findlib + ]; ocamlPropagatedBuildInputs = [ ocamlPackages.zarith ]; self = stdenv.mkDerivation { pname = "rocq"; @@ -130,7 +134,7 @@ let }; nativeBuildInputs = [ pkg-config ] ++ ocamlNativeBuildInputs; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses ] ++ ocamlBuildInputs; propagatedBuildInputs = ocamlPropagatedBuildInputs; @@ -196,6 +200,10 @@ let platforms = lib.platforms.unix; mainProgram = "rocq"; }; + + # Things required by the CI + strictDeps = true; + __structuredAttrs = true; }; in self diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index bfc42d8c06be..09cde5a9cdaf 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -110,7 +110,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals enableMpi [ mpi ] ++ lib.optionals enableCuda [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.libcufft cudaPackages.cuda_profiler_api diff --git a/pkgs/applications/video/kodi/addons/arteplussept/default.nix b/pkgs/applications/video/kodi/addons/arteplussept/default.nix index e6a700cd0a51..959698c9404f 100644 --- a/pkgs/applications/video/kodi/addons/arteplussept/default.nix +++ b/pkgs/applications/video/kodi/addons/arteplussept/default.nix @@ -12,11 +12,11 @@ buildKodiAddon rec { pname = "arteplussept"; namespace = "plugin.video.arteplussept"; - version = "1.4.4"; + version = "1.5.2"; src = fetchzip { url = "https://mirrors.kodi.tv/addons/${lib.toLower rel}/${namespace}/${namespace}-${version}.zip"; - hash = "sha256-jFIcLhglfOqkFLtlIJKB1o++mWfnpWKS3w1wD0S3+CE="; + hash = "sha256-kYIN9I+hSWBYbaUsFRDkcU3FngQRzxmGrjN7rnsWiaA="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix index d53b26671d3e..6c138f1f9f05 100644 --- a/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix +++ b/pkgs/applications/video/kodi/addons/controller-topology-project/default.nix @@ -35,7 +35,7 @@ let meta = { homepage = "https://github.com/kodi-game/controller-topology-project"; description = "Models how controllers connect to and map to each other for all gaming history"; - license = with lib.licenses; [ odbl ]; + license = lib.licenses.odbl; teams = [ lib.teams.kodi ]; }; }; diff --git a/pkgs/applications/video/kodi/addons/jellycon/default.nix b/pkgs/applications/video/kodi/addons/jellycon/default.nix index fee86e9c401b..9e8d421591a5 100644 --- a/pkgs/applications/video/kodi/addons/jellycon/default.nix +++ b/pkgs/applications/video/kodi/addons/jellycon/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellycon"; namespace = "plugin.video.jellycon"; - version = "0.9.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellycon"; rev = "v${version}"; - sha256 = "sha256-bSAzd0nKD0S3hNEM0azmCNPw9wHQK5XH6lbfcz3sW9o="; + sha256 = "sha256-dpH611GZ+BG63bSFypcZ9VUtNCA/tL8zgKuaU7cCRII="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/kodi/addons/jellyfin/default.nix b/pkgs/applications/video/kodi/addons/jellyfin/default.nix index 08bcc0b72d48..2566e092f884 100644 --- a/pkgs/applications/video/kodi/addons/jellyfin/default.nix +++ b/pkgs/applications/video/kodi/addons/jellyfin/default.nix @@ -17,13 +17,13 @@ in buildKodiAddon rec { pname = "jellyfin"; namespace = "plugin.video.jellyfin"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-kodi"; rev = "v${version}"; - sha256 = "sha256-xWLwtGeKu2W9u96jvLRRluSsnFjfad1/XSIcad00c3Y="; + sha256 = "sha256-S5LAIeYwApyGPsj999rotFgfAZmLxnJjuJD8CE4QDro="; }; nativeBuildInputs = [ python ]; diff --git a/pkgs/applications/video/kodi/addons/youtube/default.nix b/pkgs/applications/video/kodi/addons/youtube/default.nix index 83075ef1b028..72aecc71388c 100644 --- a/pkgs/applications/video/kodi/addons/youtube/default.nix +++ b/pkgs/applications/video/kodi/addons/youtube/default.nix @@ -10,13 +10,13 @@ buildKodiAddon rec { pname = "youtube"; namespace = "plugin.video.youtube"; - version = "7.4.3"; + version = "7.4.4"; src = fetchFromGitHub { owner = "anxdpanic"; repo = "plugin.video.youtube"; rev = "v${version}"; - hash = "sha256-FUfDUyaYHIeu9thCx19huLFnDO7Yl3RKIbfUH2I+SQI="; + hash = "sha256-epDKZhITQAv3bpS7CGN2Rj35/AamyZo5yzhkfu72ipw="; }; propagatedBuildInputs = [ diff --git a/pkgs/applications/video/kodi/unwrapped.nix b/pkgs/applications/video/kodi/unwrapped.nix index 7f21512e4bba..e430e42397d4 100644 --- a/pkgs/applications/video/kodi/unwrapped.nix +++ b/pkgs/applications/video/kodi/unwrapped.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, fetchzip, autoconf, automake, @@ -105,8 +106,6 @@ libxdmcp, dbusSupport ? true, dbus, - joystickSupport ? true, - cwiid, nfsSupport ? true, libnfs, pulseSupport ? true, @@ -254,6 +253,18 @@ stdenv.mkDerivation ( hash = "sha256-36wBAqGEDCRZ4t1ygTg03Pyk7Gg9quUTUGD3SBp6nCk="; }; + patches = [ + # TexturePacker has some conditionals on GIFLIB 5, which break with + # GIFLIB 6. This has been extended to support all versions >= 5 upstream, + # but has not yet made it into a release. + # https://github.com/xbmc/xbmc/pull/28016 + (fetchpatch { + name = "texturepacker-giflib-6.patch"; + url = "https://github.com/xbmc/xbmc/commit/29492cbd20d4c90a9c00a30ab525d4d0e81a968b.patch"; + hash = "sha256-WNaODPCtRfn30jVU5HbBnAO2Vl/MQp2CYmKOTTyDGZI="; + }) + ]; + # make derivations declared in the let binding available here, so # they can be overridden inherit @@ -361,7 +372,6 @@ stdenv.mkDerivation ( libxfixes ] ++ lib.optional dbusSupport dbus - ++ lib.optional joystickSupport cwiid ++ lib.optional nfsSupport libnfs ++ lib.optional pulseSupport libpulseaudio ++ lib.optional pipewireSupport pipewire diff --git a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix index e3ceeb3fbaf6..6c67d1757316 100644 --- a/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/advanced-scene-switcher/default.nix @@ -36,13 +36,13 @@ let in stdenv.mkDerivation rec { pname = "advanced-scene-switcher"; - version = "1.34.2"; + version = "1.35.1"; src = fetchFromGitHub { owner = "WarmUpTill"; repo = "SceneSwitcher"; rev = version; - hash = "sha256-BZYJ5ZZbla4nnpKdZAQPrqd+g1aeLMcsnAvyXfmm4yU="; + hash = "sha256-gfJtkX6OGqy+hUXvLXaOETvfIX+TRNEj0IwZnE9t81E="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/default.nix b/pkgs/applications/video/obs-studio/plugins/default.nix index 1d6eb5b49f79..fed1c01e922e 100644 --- a/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/default.nix @@ -108,6 +108,8 @@ obs-vnc = callPackage ./obs-vnc.nix { }; + obs-wayland-hotkeys = qt6Packages.callPackage ./obs-wayland-hotkeys { }; + obs-websocket = qt6Packages.callPackage ./obs-websocket.nix { }; # Websocket 4.x compatibility for OBS Studio 28+ pixel-art = callPackage ./pixel-art.nix { }; diff --git a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix index f24a89c61bc3..c223220a29f2 100644 --- a/pkgs/applications/video/obs-studio/plugins/distroav/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/distroav/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Network A/V plugin for OBS Studio (formerly obs-ndi)"; homepage = "https://github.com/DistroAV/DistroAV"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ globule655 ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix index d296352940d5..0f5090b0bed9 100644 --- a/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/droidcam-obs/default.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, obs-studio, ffmpeg, libjpeg, @@ -13,24 +12,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "droidcam-obs"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "dev47apps"; repo = "droidcam-obs-plugin"; tag = finalAttrs.version; - sha256 = "sha256-hxG/v15Q4D+6LU4BNV6ErSa1WvPk4kMPl07pIqiMcc4="; + hash = "sha256-JPAQoGZFzTIdBQ7GpCPaYUVPkkcBdCRFkVPU+nyRa7Q="; }; - patches = [ - # Fix build with ffmpeg 8 / libavcodec 62 - # TODO: Drop this once v2.4.3+ is released - (fetchpatch { - url = "https://github.com/dev47apps/droidcam-obs-plugin/commit/73ec2a01e234e6b2287866c25b4242dca6d9d2f6.patch"; - hash = "sha256-AI2Z9i3+KfvmpyVX9WwX3jcA1hyUZiFO7kWRsb+8/10="; - }) - ]; - preBuild = '' mkdir ./build ''; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix index 7ffa72461ef6..ab8036ac7eaf 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-hyperion/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { "-DUSE_SYSTEM_FLATBUFFERS_LIBS=ON" ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error" ]; preConfigure = '' rm -rf external/flatbuffers diff --git a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix index 9bc5f5683011..f4d4caa3ff46 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-source-record.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ obs-studio ]; - NIX_CFLAGS_COMPILE = [ "-Wno-error=deprecated-declarations" ]; + env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=deprecated-declarations" ]; cmakeFlags = [ "-DBUILD_OUT_OF_TREE=On" ]; diff --git a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix index 63d0fe98aeb2..db946836d538 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-teleport/default.nix @@ -30,8 +30,10 @@ buildGoModule rec { "-w" ]; - CGO_CFLAGS = "-I${obs-studio}/include/obs"; - CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api"; + env = { + CGO_CFLAGS = "-I${obs-studio}/include/obs"; + CGO_LDFLAGS = "-L${obs-studio}/lib -lobs -lobs-frontend-api"; + }; buildPhase = '' runHook preBuild diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix index fd7837eb5cc3..840c5a50ac76 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { # - We need "getLib" instead of default derivation, otherwise it brings gstreamer-bin; # - without gst-plugins-base it won't even show proper errors in logs; # - Without gst-plugins-bad it won't find element "vapostproc"; - # - gst-vaapi adds "VA-API" to "Encoder type"; # Tip: "could not link appsrc to videoconvert1" can mean a lot of things, enable GST_DEBUG=2 for help. passthru.obsWrapperArguments = let @@ -48,7 +47,6 @@ stdenv.mkDerivation rec { gstreamer gst-plugins-base gst-plugins-bad - gst-vaapi ]; # Fix output directory diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix index 097417f3c905..a77779df1335 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vertical-canvas.nix @@ -10,18 +10,15 @@ stdenv.mkDerivation rec { pname = "obs-vertical-canvas"; - version = "1.6.2"; + version = "1.6.4"; src = fetchFromGitHub { owner = "Aitum"; repo = "obs-vertical-canvas"; rev = version; - sha256 = "sha256-LaVDwC+L96cvq3OpNnD33bf+tV1RZ9AdUHjG4oIFzpY="; + sha256 = "sha256-cWiC4e+ZojTuNAaNwuBQ1pPlchdiuTsVhWMHvcyxx2A="; }; - # Remove after https://github.com/Aitum/obs-vertical-canvas/pull/26 is released :) - patches = [ ./obs-vertical-canvas.diff ]; - nativeBuildInputs = [ cmake ]; buildInputs = [ diff --git a/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix b/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix new file mode 100644 index 000000000000..d28807edc33f --- /dev/null +++ b/pkgs/applications/video/obs-studio/plugins/obs-wayland-hotkeys/default.nix @@ -0,0 +1,41 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + obs-studio, + pkg-config, + qtbase, +}: + +stdenv.mkDerivation (finalAttr: { + pname = "obs-wayland-hotkeys"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "leia-uwu"; + repo = "obs-wayland-hotkeys"; + tag = "v${finalAttr.version}"; + hash = "sha256-vOQfOEAnxn5vCaWpwDED1C107BB/d7T10kmKTXJ4k8k="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + obs-studio + qtbase + ]; + + dontWrapQtApps = true; + + meta = { + description = "OBS Studio plugin to integrate OBS hotkeys with the Wayland global shortcuts portal"; + homepage = "https://github.com/leia-uwu/obs-wayland-hotkeys"; + maintainers = with lib.maintainers; [ terrorw0lf ]; + license = lib.licenses.gpl2; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/applications/video/vdr/softhddevice/default.nix b/pkgs/applications/video/vdr/softhddevice/default.nix index b26be178e0d4..47332670d014 100644 --- a/pkgs/applications/video/vdr/softhddevice/default.nix +++ b/pkgs/applications/video/vdr/softhddevice/default.nix @@ -16,12 +16,12 @@ }: stdenv.mkDerivation rec { pname = "vdr-softhddevice"; - version = "2.4.8"; + version = "2.5.0"; src = fetchFromGitHub { owner = "ua0lnj"; repo = "vdr-plugin-softhddevice"; - sha256 = "sha256-pQ437Du++L6KhBCqkHpiYCoT713RAB+rnoGCXr5M0S4="; + sha256 = "sha256-vicHneEZZHTraffUek77QDZdv/xZGzN102nbr1Bkfzo="; rev = "v${version}"; }; diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 8435e824b843..42c78bea88a2 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -270,7 +270,6 @@ edk2.mkDerivation projectDscPath (finalAttrs: { platforms = metaPlatforms; maintainers = with lib.maintainers; [ adamcstephens - raitobezarius mjoerg sigmasquadron ]; diff --git a/pkgs/applications/virtualization/docker/buildx.nix b/pkgs/applications/virtualization/docker/buildx.nix index 64bc3b9885c5..10ec200adc03 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.31.1"; + version = "0.35.0"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - hash = "sha256-9O/vdgVQF3TPyN+WdUYAuVWjAa1ZRKGCCyQ6eZ+EZAs="; + hash = "sha256-Q4f7tejn0LO4eiEq+ske53WJ1oe5JxtCVZA2Im+7dv8="; }; doCheck = false; diff --git a/pkgs/applications/virtualization/docker/compose.nix b/pkgs/applications/virtualization/docker/compose.nix index 96820c023507..d4a785417e24 100644 --- a/pkgs/applications/virtualization/docker/compose.nix +++ b/pkgs/applications/virtualization/docker/compose.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "docker-compose"; - version = "5.1.4"; + version = "5.3.1"; src = fetchFromGitHub { owner = "docker"; repo = "compose"; tag = "v${version}"; - hash = "sha256-sdRxssZ6bRGRB/WPp2BiDTVHQ5LBmNGwXQYBdSpylQg="; + hash = "sha256-UNORlxZ/b4Jrp9v8pbsxTt8PrYq1/u4AjBU8+pfuG1k="; }; - vendorHash = "sha256-hgNboIZx5QOGjPadey4f2TKpPw+b2sja6mcwoMjINuY="; + vendorHash = "sha256-Ug6/hpuHgJ2CAUX87/+Tt3cHm4AbJF9oznx61kTVKI4="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 9969a1705be5..91be307654fe 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -420,18 +420,18 @@ in docker_29 = let - version = "29.5.3"; + version = "29.6.2"; in callPackage dockerGen { inherit version; cliRev = "v${version}"; - cliHash = "sha256-ZYfBWNVp7w8ZKdRA6bmDVQV4UEp+t8lWehInvtfysxM="; + cliHash = "sha256-WpPSePMCfWAVxCkX1nZyI+sra/Vug009ZPmnVKDaX0I="; mobyRev = "docker-v${version}"; - mobyHash = "sha256-D+XjHsKUFgMBCQsFI825JIGHEQmDt3NQCwpTdu6XSc8="; - runcRev = "v1.3.5"; - runcHash = "sha256-Swphxbu/OLkUrfRjLMZIVGwYb7AN0xHdyxm0ysAVam0="; - containerdRev = "v2.2.4"; - containerdHash = "sha256-F0lw7zh4V9JlFQGkE4RNT1VLX8WWLgZAAvbP12jnRMw="; + mobyHash = "sha256-zrvrZCRUuiZ2vixZNOUFeGmDehHzSI+FzDMzV1gMqMc="; + runcRev = "v1.3.6"; + runcHash = "sha256-cBMYZOElWHQ4OkF2NlYJSZrlW4833WD8CRJRkkXeKJc="; + containerdRev = "v2.2.6"; + containerdHash = "sha256-Ngo9x847cXFYPnj/0I+g7BeV7e1/5T2YXfA1zkIdiPg="; tiniRev = "369448a167e8b3da4ca5bca0b3307500c3371828"; tiniHash = "sha256-jCBNfoJAjmcTJBx08kHs+FmbaU82CbQcf0IVjd56Nuw="; }; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 449c2cbac455..91c93d19d0cf 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -72,9 +72,9 @@ let buildType = "release"; # Use maintainers/scripts/update.nix to update the version and all related hashes or # change the hashes in extpack.nix and guest-additions/default.nix as well manually. - virtualboxVersion = "7.2.8"; + virtualboxVersion = "7.2.12"; virtualboxSubVersion = ""; - virtualboxSha256 = "0642ed4a12b7204cd30c0abbc2c10c1cc7ad55ce1756a01e86a16d4b6b066592"; + virtualboxSha256 = "64a4843677e42010e7799e951883fbbefc56bf2bc162e4970edea04f142f8b25"; kvmPatchVboxVersion = "7.2.6"; kvmPatchVersion = "20260201"; diff --git a/pkgs/applications/virtualization/virtualbox/extpack.nix b/pkgs/applications/virtualization/virtualbox/extpack.nix index 841e58dab76b..c8580a091e6a 100644 --- a/pkgs/applications/virtualization/virtualbox/extpack.nix +++ b/pkgs/applications/virtualization/virtualbox/extpack.nix @@ -5,7 +5,7 @@ }: fetchurl rec { pname = "virtualbox-extpack"; - version = "7.2.8"; + version = "7.2.12"; name = "Oracle_VirtualBox_Extension_Pack-${version}.vbox-extpack"; url = "https://download.virtualbox.org/virtualbox/${version}/${name}"; sha256 = @@ -13,7 +13,7 @@ fetchurl rec { # Thus do not use `nix-prefetch-url` but instead plain old `sha256sum`. # Checksums can also be found at https://download.virtualbox.org/virtualbox/${version}/SHA256SUMS let - value = "d7301435ee207ff96c5ad372939dc46d39e0f9db2bcce487cf1e8f739a2e845b"; + value = "ac461d67462e06a9e16e8b96623c1b1a8c692c7f78e3566584b47e2d2e533f76"; in assert (builtins.stringLength value) == 64; value; diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix index dfb87074fc93..a1abd7a1b18f 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions-iso/default.nix @@ -5,7 +5,7 @@ }: fetchurl { url = "http://download.virtualbox.org/virtualbox/${virtualboxVersion}/VBoxGuestAdditions_${virtualboxVersion}.iso"; - sha256 = "169acb9361ade42d32500f51b48ad366fdfdb094b5e3fb422d640c1416a6b216"; + sha256 = "ae55a8a3b3934785a3a622f63483806e3228112eba57f86ca932958199b8f61b"; meta = { description = "Guest additions ISO for VirtualBox"; longDescription = '' diff --git a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix index 6a612b7e327b..fa4725a69a20 100644 --- a/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix +++ b/pkgs/applications/virtualization/virtualbox/guest-additions/default.nix @@ -18,9 +18,9 @@ libx11, }: let - virtualboxVersion = "7.2.8"; + virtualboxVersion = "7.2.12"; virtualboxSubVersion = ""; - virtualboxSha256 = "0642ed4a12b7204cd30c0abbc2c10c1cc7ad55ce1756a01e86a16d4b6b066592"; + virtualboxSha256 = "64a4843677e42010e7799e951883fbbefc56bf2bc162e4970edea04f142f8b25"; platform = if stdenv.hostPlatform.isAarch64 then @@ -68,8 +68,6 @@ let pkg = libxt; } ]; - - hasVboxVideo = lib.versionOlder kernel.version "7.0"; in stdenv.mkDerivation { pname = "VirtualBox-GuestAdditions"; @@ -135,10 +133,7 @@ stdenv.mkDerivation { # Install kernel modules. cd src/vboxguest-${virtualboxVersion}_NixOS - - INSTALL_TARGETS=(install-vboxguest install-vboxsf ${lib.optionalString hasVboxVideo "install-vboxvideo"}) - make INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers ''${INSTALL_TARGETS[@]} - + make install INSTALL_MOD_PATH=$out KBUILD_EXTRA_SYMBOLS=$PWD/vboxsf/Module.symvers cd ../.. # Install binaries diff --git a/pkgs/applications/window-managers/evilwm/default.nix b/pkgs/applications/window-managers/evilwm/default.nix index 832f7306bb6e..11bbebb5dcd6 100644 --- a/pkgs/applications/window-managers/evilwm/default.nix +++ b/pkgs/applications/window-managers/evilwm/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "evilwm"; - version = "1.4.3"; + version = "1.5"; src = fetchurl { url = "https://www.6809.org.uk/evilwm/evilwm-${version}.tar.gz"; - sha256 = "sha256-1ZRbILEskdskEvrA29o/ucPsjeu44bEJg4mSsrG75dQ="; + sha256 = "sha256-YQSFJBPm1QZpNh3K3aWiXTnisrDJWmOEAiyQWVeidA8="; }; buildInputs = [ diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix index 8cc7cec60189..9a1f00e07b0d 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hypr-darkwindow.nix @@ -7,13 +7,13 @@ mkHyprlandPlugin (finalAttrs: { pluginName = "hypr-darkwindow"; - version = "0.55.2"; + version = "0.55.4"; src = fetchFromGitHub { owner = "micha4w"; repo = "Hypr-DarkWindow"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Ht9yhlwOtDWFvL6VYlryNxyRethFqc0iWtBetP0xws="; + hash = "sha256-91l5TD46OMfvmhd1WqWxm42cEnjR1yAj2Qk/73mr3ks="; }; installPhase = '' diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix index 7d0fbc2f1e16..640e16bfd659 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprgrass.nix @@ -12,13 +12,13 @@ mkHyprlandPlugin { pluginName = "hyprgrass"; - version = "0.8.2-unstable-2025-10-08"; + version = "0.8.2-unstable-2026-06-10"; src = fetchFromGitHub { owner = "horriblename"; repo = "hyprgrass"; - rev = "fdfa60d464a18ae20b7a7bc63c0d2336f37c164b"; - hash = "sha256-2Y2D2wuNqSldprawq8BSca90gSYSR5ZKL5ZW2YAV2F8="; + rev = "d094a3e62f6ecaeb41515982d3e13edefaf8a4e7"; + hash = "sha256-tCt7FNc1RBHou/ym7B0XzoOqqNq8Df+dizEDkAgJ4U0="; }; nativeBuildInputs = [ @@ -34,7 +34,7 @@ mkHyprlandPlugin { doCheck = true; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { description = "Hyprland plugin for touch gestures"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix index 042337749148..f6ee4ff81dab 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprland-plugins.nix @@ -13,13 +13,13 @@ let mkHyprlandPlugin, }: let - version = "0.55.0"; + version = "0.56.0"; hyprland-plugins-src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland-plugins"; tag = "v${version}"; - hash = "sha256-WMUJ7tyw/9QbKUyRzLndEQSqX05fQLmFlRdMAmPD7tI="; + hash = "sha256-piRpwar7VZI3YviYo0a/UMFz9+rLesfv3nRLGKxjVGg="; }; in mkHyprlandPlugin { diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix index 4f8d170a5d7a..c8e6d07f48a5 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/hyprsplit.nix @@ -8,13 +8,13 @@ }: mkHyprlandPlugin (finalAttrs: { pluginName = "hyprsplit"; - version = "0.54.2"; + version = "0.54.3-unstable-2026-06-11"; src = fetchFromGitHub { owner = "shezdy"; repo = "hyprsplit"; - tag = "v${finalAttrs.version}"; - hash = "sha256-NFMLZmM6lM7v6WFcewOp7pKPlr6ampX/MB/kGxt/gPE="; + rev = "6b00b677d8905fb38779c91e12d6294e0e586a44"; + hash = "sha256-PaoUtmk+qIP/ESdxkxnY7mUMpMHjix88qu22R5GLQqE="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ mkHyprlandPlugin (finalAttrs: { ninja ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://github.com/shezdy/hyprsplit"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix index f7e387354ced..ff1811eb2b09 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix +++ b/pkgs/applications/window-managers/hyprwm/hyprland-plugins/imgborders.nix @@ -5,31 +5,22 @@ cmake, nix-update-script, }: -mkHyprlandPlugin (finalAttrs: { +mkHyprlandPlugin { pluginName = "imgborders"; - version = "1.0.1"; + version = "1.0.2-unstable-2026-05-17"; src = fetchFromCodeberg { owner = "zacoons"; repo = "imgborders"; - tag = finalAttrs.version; - hash = "sha256-fCzz4gh8pd7J6KQJB/avYcS0Z7NYpxjznPMtOwypPSQ="; + rev = "a20b4d36d01f82823ba3749db95c91743d26f656"; + hash = "sha256-e3PiaR7G6l/lMJ41xtSPcfMKhZcx8UHj13lr0u+8JAk="; }; nativeBuildInputs = [ cmake ]; - installPhase = '' - runHook preInstall - - mkdir -p $out/lib - mv imgborders.so $out/lib/libimgborders.so - - runHook postInstall - ''; - - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; meta = { homepage = "https://codeberg.org/zacoons/imgborders"; @@ -39,4 +30,4 @@ mkHyprlandPlugin (finalAttrs: { mrdev023 ]; }; -}) +} diff --git a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix index 27dc09810161..ce0d1ba5cf29 100644 --- a/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix +++ b/pkgs/applications/window-managers/hyprwm/xdg-desktop-portal-hyprland/default.nix @@ -7,6 +7,7 @@ pkg-config, wrapQtAppsHook, nix-update-script, + grim, hyprland, hyprland-protocols, hyprlang, @@ -27,13 +28,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "xdg-desktop-portal-hyprland"; - version = "1.3.12"; + version = "1.4.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "xdg-desktop-portal-hyprland"; tag = "v${finalAttrs.version}"; - hash = "sha256-B7nwX0PE0KBo1/ZtuwJtA7dBG6gdPW5tSBb0skY8DHA="; + hash = "sha256-nzm1lwk41EzFVYC6HX7YCFnjCGJ2Ac1n7xi47ajYu8Y="; }; depsBuildBuild = [ @@ -67,6 +68,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; dontStrip = debug; + separateDebugInfo = !debug; dontWrapQtApps = true; @@ -81,7 +83,12 @@ stdenv.mkDerivation (finalAttrs: { } wrapProgramShell $out/libexec/xdg-desktop-portal-hyprland \ - --prefix PATH ":" ${lib.makeBinPath [ (placeholder "out") ]} + --prefix PATH ":" ${ + lib.makeBinPath [ + (placeholder "out") + grim + ] + } ''; passthru = { diff --git a/pkgs/build-support/bintools-wrapper/setup-hook.sh b/pkgs/build-support/bintools-wrapper/setup-hook.sh index 93aa7825f9a9..1d67e65baf20 100644 --- a/pkgs/build-support/bintools-wrapper/setup-hook.sh +++ b/pkgs/build-support/bintools-wrapper/setup-hook.sh @@ -60,7 +60,8 @@ do if PATH=$_PATH type -p "@targetPrefix@${cmd}" > /dev/null then - export "${cmd^^}${role_post}=@targetPrefix@${cmd}"; + upper_case="$(echo "$cmd" | tr "a-z" "A-Z")" + export "${upper_case}${role_post}=@targetPrefix@${cmd}"; fi done diff --git a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix index 2c6a297cb7cb..b3406d062449 100644 --- a/pkgs/build-support/build-fhsenv-bubblewrap/default.nix +++ b/pkgs/build-support/build-fhsenv-bubblewrap/default.nix @@ -348,6 +348,8 @@ runCommandLocal name // { inherit nativeBuildInputs; + __structuredAttrs = true; + passthru = passthru // { env = runCommandLocal "${name}-shell-env" diff --git a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix b/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix deleted file mode 100644 index 194e77a67a43..000000000000 --- a/pkgs/build-support/build-fhsenv-chroot/chrootenv/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - stdenv, - meson, - ninja, - pkg-config, - glib, -}: - -stdenv.mkDerivation { - name = "chrootenv"; - src = ./src; - - nativeBuildInputs = [ - meson - ninja - pkg-config - ]; - buildInputs = [ glib ]; - - meta = { - description = "Setup mount/user namespace for FHS emulation"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c deleted file mode 100644 index c109d7297e17..000000000000 --- a/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/chrootenv.c +++ /dev/null @@ -1,169 +0,0 @@ -#define _GNU_SOURCE - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include - -#define fail(s, err) g_error("%s: %s: %s", __func__, s, g_strerror(err)) -#define fail_if(expr) \ - if (expr) \ - fail(#expr, errno); - -const gchar *bind_blacklist[] = {"bin", "etc", "host", "real-host", "usr", "lib", "lib64", "lib32", "sbin", "opt", NULL}; - -int pivot_root(const char *new_root, const char *put_old) { - return syscall(SYS_pivot_root, new_root, put_old); -} - -void mount_tmpfs(const gchar *target) { - fail_if(mount("none", target, "tmpfs", 0, NULL)); -} - -void bind_mount(const gchar *source, const gchar *target) { - fail_if(g_mkdir(target, 0755)); - fail_if(mount(source, target, NULL, MS_BIND | MS_REC, NULL)); -} - -const gchar *create_tmpdir() { - gchar *prefix = - g_build_filename(g_get_tmp_dir(), "chrootenvXXXXXX", NULL); - fail_if(!g_mkdtemp_full(prefix, 0755)); - return prefix; -} - -void pivot_host(const gchar *guest) { - g_autofree gchar *point = g_build_filename(guest, "host", NULL); - fail_if(g_mkdir(point, 0755)); - fail_if(pivot_root(guest, point)); -} - -void bind_mount_item(const gchar *host, const gchar *guest, const gchar *name) { - g_autofree gchar *source = g_build_filename(host, name, NULL); - g_autofree gchar *target = g_build_filename(guest, name, NULL); - - if (G_LIKELY(g_file_test(source, G_FILE_TEST_IS_DIR))) - bind_mount(source, target); -} - -void bind(const gchar *host, const gchar *guest) { - mount_tmpfs(guest); - - pivot_host(guest); - - g_autofree gchar *host_dir = g_build_filename("/host", host, NULL); - - g_autoptr(GError) err = NULL; - g_autoptr(GDir) dir = g_dir_open(host_dir, 0, &err); - - if (err != NULL) - fail("g_dir_open", errno); - - const gchar *item; - - while ((item = g_dir_read_name(dir))) - if (!g_strv_contains(bind_blacklist, item)) - bind_mount_item(host_dir, "/", item); -} - -void spit(const char *path, char *fmt, ...) { - va_list args; - va_start(args, fmt); - - FILE *f = g_fopen(path, "w"); - - if (f == NULL) - fail("g_fopen", errno); - - g_vfprintf(f, fmt, args); - fclose(f); -} - -int main(gint argc, gchar **argv) { - const gchar *self = *argv++; - - if (argc < 2) { - g_message("%s command [arguments...]", self); - return 1; - } - - g_autofree const gchar *prefix = create_tmpdir(); - - pid_t cpid = fork(); - - if (cpid < 0) - fail("fork", errno); - - else if (cpid == 0) { - uid_t uid = getuid(); - gid_t gid = getgid(); - - int namespaces = CLONE_NEWNS; - if (uid != 0) { - namespaces |= CLONE_NEWUSER; - } - if (unshare(namespaces) < 0) { - int unshare_errno = errno; - - g_message("Requires Linux version >= 3.19 built with CONFIG_USER_NS"); - if (g_file_test("/proc/sys/kernel/unprivileged_userns_clone", - G_FILE_TEST_EXISTS)) - g_message("Run: sudo sysctl -w kernel.unprivileged_userns_clone=1"); - - fail("unshare", unshare_errno); - } - - // hide all mounts we do from the parent - fail_if(mount(0, "/", 0, MS_SLAVE | MS_REC, 0)); - - if (uid != 0) { - spit("/proc/self/setgroups", "deny"); - spit("/proc/self/uid_map", "%d %d 1", uid, uid); - spit("/proc/self/gid_map", "%d %d 1", gid, gid); - } - - // If there is a /host directory, assume this is nested chrootenv and use it as host instead. - gboolean nested_host = g_file_test("/host", G_FILE_TEST_EXISTS | G_FILE_TEST_IS_DIR); - g_autofree const gchar *host = nested_host ? "/host" : "/"; - - bind(host, prefix); - - // Replace /host by an actual (inner) /host. - if (nested_host) { - fail_if(g_mkdir("/real-host", 0755)); - fail_if(mount("/host/host", "/real-host", NULL, MS_BIND | MS_REC, NULL)); - // For some reason umount("/host") returns EBUSY even immediately after - // pivot_root. We detach it at least to keep `/proc/mounts` from blowing - // up in nested cases. - fail_if(umount2("/host", MNT_DETACH)); - fail_if(mount("/real-host", "/host", NULL, MS_MOVE, NULL)); - fail_if(rmdir("/real-host")); - } - - fail_if(chdir("/")); - fail_if(execvp(*argv, argv)); - } - - else { - int status; - - fail_if(waitpid(cpid, &status, 0) != cpid); - fail_if(rmdir(prefix)); - - if (WIFEXITED(status)) - return WEXITSTATUS(status); - - else if (WIFSIGNALED(status)) - kill(getpid(), WTERMSIG(status)); - - return 1; - } -} diff --git a/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build b/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build deleted file mode 100644 index 6d0770a0dc4a..000000000000 --- a/pkgs/build-support/build-fhsenv-chroot/chrootenv/src/meson.build +++ /dev/null @@ -1,5 +0,0 @@ -project('chrootenv', 'c') - -glib = dependency('glib-2.0') - -executable('chrootenv', 'chrootenv.c', dependencies: [glib], install: true) diff --git a/pkgs/build-support/build-fhsenv-chroot/default.nix b/pkgs/build-support/build-fhsenv-chroot/default.nix deleted file mode 100644 index 10d2af55a7b0..000000000000 --- a/pkgs/build-support/build-fhsenv-chroot/default.nix +++ /dev/null @@ -1,87 +0,0 @@ -{ - lib, - callPackage, - runCommandLocal, - writeScript, - stdenv, - coreutils, -}: - -let - buildFHSEnv = callPackage ./env.nix { }; -in - -args@{ - name, - version ? null, - runScript ? "bash", - nativeBuildInputs ? [ ], - extraInstallCommands ? "", - meta ? { }, - passthru ? { }, - ... -}: - -let - env = buildFHSEnv ( - removeAttrs args [ - "version" - "runScript" - "extraInstallCommands" - "meta" - "passthru" - ] - ); - - chrootenv = callPackage ./chrootenv { }; - - init = - run: - writeScript "${name}-init" '' - #! ${stdenv.shell} - for i in ${env}/* /host/*; do - path="/''${i##*/}" - [ -e "$path" ] || ${coreutils}/bin/ln -s "$i" "$path" - done - - [ -d "$1" ] && [ -r "$1" ] && cd "$1" - shift - - source /etc/profile - exec ${run} "$@" - ''; - - versionStr = lib.optionalString (version != null) ("-" + version); - - nameAndVersion = name + versionStr; - -in -runCommandLocal nameAndVersion - { - inherit nativeBuildInputs meta; - - passthru = passthru // { - env = - runCommandLocal "${name}-shell-env" - { - shellHook = '' - exec ${chrootenv}/bin/chrootenv ${init runScript} "$(pwd)" - ''; - } - '' - echo >&2 "" - echo >&2 "*** User chroot 'env' attributes are intended for interactive nix-shell sessions, not for building! ***" - echo >&2 "" - exit 1 - ''; - }; - } - '' - mkdir -p $out/bin - cat <$out/bin/${name} - #! ${stdenv.shell} - exec ${chrootenv}/bin/chrootenv ${init runScript} "\$(pwd)" "\$@" - EOF - chmod +x $out/bin/${name} - ${extraInstallCommands} - '' diff --git a/pkgs/build-support/build-fhsenv-chroot/env.nix b/pkgs/build-support/build-fhsenv-chroot/env.nix deleted file mode 100644 index 1f774da847a7..000000000000 --- a/pkgs/build-support/build-fhsenv-chroot/env.nix +++ /dev/null @@ -1,290 +0,0 @@ -{ - stdenv, - lib, - buildEnv, - writeText, - pkgs, - pkgsi686Linux, -}: - -{ - name, - profile ? "", - targetPkgs ? pkgs: [ ], - multiPkgs ? pkgs: [ ], - nativeBuildInputs ? [ ], - extraBuildCommands ? "", - extraBuildCommandsMulti ? "", - extraOutputsToInstall ? [ ], -}: - -# HOWTO: -# All packages (most likely programs) returned from targetPkgs will only be -# installed once--matching the host's architecture (64bit on x86_64 and 32bit on -# x86). -# -# Packages (most likely libraries) returned from multiPkgs are installed -# once on x86 systems and twice on x86_64 systems. -# On x86 they are merged with packages from targetPkgs. -# On x86_64 they are added to targetPkgs and in addition their 32bit -# versions are also installed. The final directory structure looks as -# follows: -# /lib32 will include 32bit libraries from multiPkgs -# /lib64 will include 64bit libraries from multiPkgs and targetPkgs -# /lib will link to /lib32 - -let - is64Bit = stdenv.hostPlatform.parsed.cpu.bits == 64; - # multi-lib glibc is only supported on x86_64 - isMultiBuild = multiPkgs != null && stdenv.hostPlatform.system == "x86_64-linux"; - isTargetBuild = !isMultiBuild; - - # list of packages (usually programs) which are only be installed for the - # host's architecture - targetPaths = targetPkgs pkgs ++ (if multiPkgs == null then [ ] else multiPkgs pkgs); - - # list of packages which are installed for both x86 and x86_64 on x86_64 - # systems - multiPaths = multiPkgs pkgsi686Linux; - - # base packages of the chroot - # these match the host's architecture, glibc_multi is used for multilib - # builds. glibcLocales must be before glibc or glibc_multi as otherwiese - # the wrong LOCALE_ARCHIVE will be used where only C.UTF-8 is available. - basePkgs = with pkgs; [ - glibcLocales - (if isMultiBuild then glibc_multi else glibc) - (toString gcc.cc.lib) - bashInteractiveFHS - coreutils - less - shadow - su - gawk - diffutils - findutils - gnused - gnugrep - gnutar - gzip - bzip2 - xz - ]; - baseMultiPkgs = with pkgsi686Linux; [ - (toString gcc.cc.lib) - ]; - - etcProfile = writeText "profile" '' - export PS1='${name}-chrootenv:\u@\h:\w\$ ' - export LOCALE_ARCHIVE='/usr/lib/locale/locale-archive' - export LD_LIBRARY_PATH="/run/opengl-driver/lib:/run/opengl-driver-32/lib:/usr/lib:/usr/lib32''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" - export PATH="/run/wrappers/bin:/usr/bin:/usr/sbin:$PATH" - export TZDIR='/etc/zoneinfo' - - # XDG_DATA_DIRS is used by pressure-vessel (steam proton) and vulkan loaders to find the corresponding icd - export XDG_DATA_DIRS=$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/run/opengl-driver/share:/run/opengl-driver-32/share - - # Following XDG spec [1], XDG_DATA_DIRS should default to "/usr/local/share:/usr/share". - # In nix, it is commonly set without containing these values, so we add them as fallback. - # - # [1] - case ":$XDG_DATA_DIRS:" in - *:/usr/local/share:*) ;; - *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/local/share" ;; - esac - case ":$XDG_DATA_DIRS:" in - *:/usr/share:*) ;; - *) export XDG_DATA_DIRS="$XDG_DATA_DIRS''${XDG_DATA_DIRS:+:}/usr/share" ;; - esac - - # Force compilers and other tools to look in default search paths - unset NIX_ENFORCE_PURITY - export NIX_BINTOOLS_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 - export NIX_CC_WRAPPER_TARGET_HOST_${stdenv.cc.suffixSalt}=1 - export NIX_CFLAGS_COMPILE='-idirafter /usr/include' - export NIX_CFLAGS_LINK='-L/usr/lib -L/usr/lib32' - export NIX_LDFLAGS='-L/usr/lib -L/usr/lib32' - export PKG_CONFIG_PATH=/usr/lib/pkgconfig - export ACLOCAL_PATH=/usr/share/aclocal - - ${profile} - ''; - - # Compose /etc for the chroot environment - etcPkg = stdenv.mkDerivation { - name = "${name}-chrootenv-etc"; - buildCommand = '' - mkdir -p $out/etc - cd $out/etc - - # environment variables - ln -s ${etcProfile} profile - - # compatibility with NixOS - ln -s /host/etc/static static - - # symlink nix config - ln -s /host/etc/nix nix - - # symlink some NSS stuff - ln -s /host/etc/passwd passwd - ln -s /host/etc/group group - ln -s /host/etc/shadow shadow - ln -s /host/etc/hosts hosts - ln -s /host/etc/resolv.conf resolv.conf - ln -s /host/etc/nsswitch.conf nsswitch.conf - - # symlink user profiles - ln -s /host/etc/profiles profiles - - # symlink sudo and su stuff - ln -s /host/etc/login.defs login.defs - ln -s /host/etc/sudoers sudoers - ln -s /host/etc/sudoers.d sudoers.d - - # symlink other core stuff - ln -s /host/etc/localtime localtime - ln -s /host/etc/zoneinfo zoneinfo - ln -s /host/etc/machine-id machine-id - ln -s /host/etc/os-release os-release - - # symlink PAM stuff - ln -s /host/etc/pam.d pam.d - - # symlink fonts stuff - ln -s /host/etc/fonts fonts - - # symlink ALSA stuff - ln -s /host/etc/asound.conf asound.conf - ln -s /host/etc/alsa alsa - - # symlink SSL certs - mkdir -p ssl - ln -s /host/etc/ssl/certs ssl/certs - - # symlink /etc/mtab -> /proc/mounts (compat for old userspace progs) - ln -s /proc/mounts mtab - ''; - }; - - # Composes a /usr-like directory structure - staticUsrProfileTarget = buildEnv { - name = "${name}-usr-target"; - paths = [ etcPkg ] ++ basePkgs ++ targetPaths; - extraOutputsToInstall = [ - "out" - "lib" - "bin" - ] - ++ extraOutputsToInstall; - ignoreCollisions = true; - postBuild = '' - if [[ -d $out/share/gsettings-schemas/ ]]; then - # Recreate the standard schemas directory if its a symlink to make it writable - if [[ -L $out/share/glib-2.0 ]]; then - target=$(readlink $out/share/glib-2.0) - rm $out/share/glib-2.0 - mkdir $out/share/glib-2.0 - ln -fs $target/* $out/share/glib-2.0 - fi - - if [[ -L $out/share/glib-2.0/schemas ]]; then - target=$(readlink $out/share/glib-2.0/schemas) - rm $out/share/glib-2.0/schemas - mkdir $out/share/glib-2.0/schemas - ln -fs $target/* $out/share/glib-2.0/schemas - fi - - mkdir -p $out/share/glib-2.0/schemas - - for d in $out/share/gsettings-schemas/*; do - # Force symlink, in case there are duplicates - ln -fs $d/glib-2.0/schemas/*.xml $out/share/glib-2.0/schemas - ln -fs $d/glib-2.0/schemas/*.gschema.override $out/share/glib-2.0/schemas - done - - # and compile them - ${pkgs.glib.dev}/bin/glib-compile-schemas $out/share/glib-2.0/schemas - fi - ''; - }; - - staticUsrProfileMulti = buildEnv { - name = "${name}-usr-multi"; - paths = baseMultiPkgs ++ multiPaths; - extraOutputsToInstall = [ - "out" - "lib" - ] - ++ extraOutputsToInstall; - ignoreCollisions = true; - }; - - # setup library paths only for the targeted architecture - setupLibDirs_target = '' - # link content of targetPaths - cp -rsHf ${staticUsrProfileTarget}/lib lib - ln -s lib lib${if is64Bit then "64" else "32"} - ''; - - # setup /lib, /lib32 and /lib64 - setupLibDirs_multi = '' - mkdir -m0755 lib32 - mkdir -m0755 lib64 - ln -s lib64 lib - - # copy glibc stuff - cp -rsHf ${staticUsrProfileTarget}/lib/32/* lib32/ && chmod u+w -R lib32/ - - # copy content of multiPaths (32bit libs) - [ -d ${staticUsrProfileMulti}/lib ] && cp -rsHf ${staticUsrProfileMulti}/lib/* lib32/ && chmod u+w -R lib32/ - - # copy content of targetPaths (64bit libs) - cp -rsHf ${staticUsrProfileTarget}/lib/* lib64/ && chmod u+w -R lib64/ - - # symlink 32-bit ld-linux.so - ln -Ls ${staticUsrProfileTarget}/lib/32/ld-linux.so.2 lib/ - ''; - - setupLibDirs = if isTargetBuild then setupLibDirs_target else setupLibDirs_multi; - - # the target profile is the actual profile that will be used for the chroot - setupTargetProfile = '' - mkdir -m0755 usr - cd usr - ${setupLibDirs} - for i in bin sbin share include; do - if [ -d "${staticUsrProfileTarget}/$i" ]; then - cp -rsHf "${staticUsrProfileTarget}/$i" "$i" - fi - done - cd .. - - for i in var etc opt; do - if [ -d "${staticUsrProfileTarget}/$i" ]; then - cp -rsHf "${staticUsrProfileTarget}/$i" "$i" - fi - done - for i in usr/{bin,sbin,lib,lib32,lib64}; do - if [ -d "$i" ]; then - ln -s "$i" - fi - done - ''; - -in -stdenv.mkDerivation { - name = "${name}-fhs"; - inherit nativeBuildInputs; - buildCommand = '' - mkdir -p $out - cd $out - ${setupTargetProfile} - cd $out - ${extraBuildCommands} - cd $out - ${lib.optionalString isMultiBuild extraBuildCommandsMulti} - ''; - preferLocalBuild = true; - allowSubstitutes = false; -} diff --git a/pkgs/build-support/build-mozilla-mach/153-cbindgen-0.29.4-compat.patch b/pkgs/build-support/build-mozilla-mach/153-cbindgen-0.29.4-compat.patch new file mode 100644 index 000000000000..84238f025fc6 --- /dev/null +++ b/pkgs/build-support/build-mozilla-mach/153-cbindgen-0.29.4-compat.patch @@ -0,0 +1,36 @@ +commit c4aab1ba6aadd6985fcd271679d2118f094ec876 +Author: Emilio Cobos Álvarez +Date: Tue Jun 9 22:04:44 2026 +0000 + + Bug 2046162 - Remove some redundant pub qualifiers. r=gfx-reviewers,aosmond + + The enum is not public so this doesn't change behavior but a patch I'm + working on in cbindgen gets a bit confused with this. + + Differential Revision: https://phabricator.services.mozilla.com/D305678 + +diff --git a/gfx/wr/webrender/src/texture_cache.rs b/gfx/wr/webrender/src/texture_cache.rs +index e14c26bd3190..77e1f3a312ac 100644 +--- a/gfx/wr/webrender/src/texture_cache.rs ++++ b/gfx/wr/webrender/src/texture_cache.rs +@@ -273,9 +273,9 @@ enum BudgetType { + } + + impl BudgetType { +- pub const COUNT: usize = 7; ++ const COUNT: usize = 7; + +- pub const VALUES: [BudgetType; BudgetType::COUNT] = [ ++ const VALUES: [BudgetType; BudgetType::COUNT] = [ + BudgetType::SharedColor8Linear, + BudgetType::SharedColor8Nearest, + BudgetType::SharedColor8Glyphs, +@@ -285,7 +285,7 @@ impl BudgetType { + BudgetType::Standalone, + ]; + +- pub const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [ ++ const PRESSURE_COUNTERS: [usize; BudgetType::COUNT] = [ + profiler::ATLAS_COLOR8_LINEAR_PRESSURE, + profiler::ATLAS_COLOR8_NEAREST_PRESSURE, + profiler::ATLAS_COLOR8_GLYPHS_PRESSURE, diff --git a/pkgs/build-support/build-mozilla-mach/default.nix b/pkgs/build-support/build-mozilla-mach/default.nix index 67312aa0e186..09eef8b2496f 100644 --- a/pkgs/build-support/build-mozilla-mach/default.nix +++ b/pkgs/build-support/build-mozilla-mach/default.nix @@ -58,6 +58,7 @@ in pkg-config, pkgsCross, # wasm32 rlbox python3, + python313, runCommand, rustc, rust-cbindgen, @@ -144,7 +145,13 @@ in ), overrideCC, buildPackages, - pgoSupport ? (stdenv.hostPlatform.isLinux && stdenv.hostPlatform == stdenv.buildPlatform), + # PGO merges profile data with a 32-bit llvm-profdata, which runs out of + # address space on the huge libxul profile, so disable it on 32-bit. + pgoSupport ? ( + stdenv.hostPlatform.isLinux + && stdenv.hostPlatform == stdenv.buildPlatform + && stdenv.hostPlatform.is64bit + ), xvfb-run, elfhackSupport ? isElfhackPlatform stdenv && !(stdenv.hostPlatform.isMusl && stdenv.hostPlatform.isAarch64), @@ -303,6 +310,9 @@ buildStdenv.mkDerivation { inherit src unpackPhase; + __structuredAttrs = true; + strictDeps = true; + meta = meta // lib.optionalAttrs stdenv.hostPlatform.isDarwin { @@ -340,6 +350,11 @@ buildStdenv.mkDerivation { # https://bugzilla.mozilla.org/show_bug.cgi?id=1985509 ./140-bindgen-string-view.patch ] + ++ lib.optionals (lib.versionAtLeast version "140" && lib.versionOlder version "140.13") [ + # https://github.com/mozilla/cbindgen/issues/1165 + # https://bugzilla.mozilla.org/show_bug.cgi?id=2046162 + ./153-cbindgen-0.29.4-compat.patch + ] ++ extraPatches; postPatch = '' @@ -364,7 +379,7 @@ buildStdenv.mkDerivation { makeBinaryWrapper nodejs perl - python3 + (if lib.versionAtLeast version "143.0" then python3 else python313) rust-cbindgen rustPlatform.bindgenHook rustc diff --git a/pkgs/build-support/build-nim-package.nix b/pkgs/build-support/build-nim-package.nix index 1e8489212cd6..f953c108fd85 100644 --- a/pkgs/build-support/build-nim-package.nix +++ b/pkgs/build-support/build-nim-package.nix @@ -3,10 +3,8 @@ buildPackages, callPackage, stdenv, - nim1, - nim2, + nim, nim_builder, - defaultNimVersion ? 2, nimOverrides, buildNimPackage, }: @@ -15,7 +13,9 @@ let baseAttrs = { strictDeps = true; enableParallelBuilding = true; + __structuredAttrs = true; doCheck = true; + configurePhase = '' runHook preConfigure export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS @@ -37,7 +37,7 @@ let nim_builder --phase:install runHook postInstall ''; - meta = { inherit (nim2.meta) maintainers platforms; }; + meta = { inherit (nim.meta) maintainers platforms; }; }; fodFromLockEntry = @@ -107,30 +107,34 @@ let finalOverride = { - depsBuildBuild ? [ ], - nativeBuildInputs ? [ ], nimFlags ? [ ], - requiredNimVersion ? defaultNimVersion, passthru ? { }, + nativeBuildInputs ? [ ], + depsBuildBuild ? [ ], ... - }: + }@args: ( - if requiredNimVersion == 1 then - { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim1 ] ++ nativeBuildInputs; - } - else if requiredNimVersion == 2 then - { - depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; - nativeBuildInputs = [ nim2 ] ++ nativeBuildInputs; - } + #TODO: Remove at 26.11 + if args ? requiredNimVersion then + if args.requiredNimVersion == 2 then + lib.warn '' + `requiredNimVersion' is deprecated and will be removed in nixpkgs 26.11. + Please update your package to remove this. + '' + else + throw '' + `requiredNimVersion' ${toString args.requiredNimVersion} is not supported. + Ensure your package supports nim 2, and remove `requiredNimVersion'. + '' else - throw "requiredNimVersion ${toString requiredNimVersion} is not valid" + { } ) // { + nativeBuildInputs = [ nim ] ++ nativeBuildInputs; + depsBuildBuild = [ nim_builder ] ++ depsBuildBuild; nimFlags = lockFileNimFlags ++ nimFlags; passthru = passthru // { + # allow overriding the result of buildNimPackageArgs before this composition is applied # this allows overriding the lockFile for packages built using buildNimPackage # this is adapted from mkDerivationExtensible in stdenv.mkDerivation diff --git a/pkgs/build-support/build-typst-package.nix b/pkgs/build-support/build-typst-package.nix index 13e1ddd2537c..ead6d68a1395 100644 --- a/pkgs/build-support/build-typst-package.nix +++ b/pkgs/build-support/build-typst-package.nix @@ -40,6 +40,9 @@ lib.extendMkDerivation { { name = "typst-package-${finalAttrs.pname}-${finalAttrs.version}"; + strictDeps = true; + __structuredAttrs = true; + dontBuild = true; installPhase = diff --git a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh index 865e0d054820..d5515604c0bc 100644 --- a/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh +++ b/pkgs/build-support/cc-wrapper/add-clang-cc-cflags-before.sh @@ -36,6 +36,6 @@ elif [[ $0 != *cpp ]]; then fi fi -if [[ "@darwinMinVersion@" ]]; then +if [[ "@darwinMinVersion@" ]] && [ "@isFlang@" != 1 ]; then extraBefore+=(-Werror=unguarded-availability) fi diff --git a/pkgs/build-support/cc-wrapper/add-flags.sh b/pkgs/build-support/cc-wrapper/add-flags.sh index a86f65d03f97..4b9f71af4eab 100644 --- a/pkgs/build-support/cc-wrapper/add-flags.sh +++ b/pkgs/build-support/cc-wrapper/add-flags.sh @@ -11,6 +11,8 @@ var_templates_list=( NIX_CXXSTDLIB_COMPILE NIX_CXXSTDLIB_LINK NIX_GNATFLAGS_COMPILE + NIX_FFLAGS_COMPILE + NIX_FFLAGS_COMPILE_BEFORE ) var_templates_bool=( NIX_ENFORCE_NO_NATIVE diff --git a/pkgs/build-support/cc-wrapper/cc-wrapper.sh b/pkgs/build-support/cc-wrapper/cc-wrapper.sh index 246c1b1f65f6..2d36278b59fa 100644 --- a/pkgs/build-support/cc-wrapper/cc-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/cc-wrapper.sh @@ -44,7 +44,7 @@ while (( "$n" < "$nParams" )); do case "$p" in -[cSEM] | -MM) dontLink=1 ;; - -cc1) cc1=1 ;; + -cc1 | -fc1 ) cc1=1 ;; -nostdinc) cInclude=0 cxxInclude=0 ;; -nostdinc++) cxxInclude=0 ;; -nostdlib) cxxLibrary=0 ;; @@ -185,9 +185,19 @@ fi source @out@/nix-support/add-hardening.sh -# Add the flags for the C compiler proper. -extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_COMPILE_@suffixSalt@) -extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) +# Add the flags for the compiler proper. Flang reads its user-supplied +# flags from the Fortran-specific NIX_FFLAGS_COMPILE channel so that +# C-only flags injected by setup hooks (e.g. -frandom-seed= from +# reproducible-builds.sh, which Flang does not accept) never reach the +# Fortran driver. This mirrors the NIX_GNATFLAGS_COMPILE channel that +# the Ada/GNAT wrapper uses for the same reason. +if [ "@isFlang@" = 1 ]; then + extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_FFLAGS_COMPILE_@suffixSalt@) + extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_FFLAGS_COMPILE_BEFORE_@suffixSalt@) +else + extraAfter=(${hardeningCFlagsAfter[@]+"${hardeningCFlagsAfter[@]}"} $NIX_CFLAGS_COMPILE_@suffixSalt@) + extraBefore=(${hardeningCFlagsBefore[@]+"${hardeningCFlagsBefore[@]}"} $NIX_CFLAGS_COMPILE_BEFORE_@suffixSalt@) +fi if [ "$dontLink" != 1 ]; then linkType=$(checkLinkType $NIX_LDFLAGS_BEFORE_@suffixSalt@ "${params[@]}" ${NIX_CFLAGS_LINK_@suffixSalt@:-} $NIX_LDFLAGS_@suffixSalt@) diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index fd857d0c152d..bf079f1b0e53 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -26,6 +26,8 @@ nixSupport ? { }, isGNU ? false, isClang ? cc.isClang or false, + isFlang ? cc.isFlang or false, + isAlireGNAT ? false, isZig ? cc.isZig or false, isArocc ? cc.isArocc or false, isCcache ? cc.isCcache or false, @@ -314,6 +316,17 @@ let tune = if targetPlatform ? gcc.tune then findBestTuneApproximation targetPlatform.gcc.tune else null; + tlsDialect = + if + # Support status on non-Linux systems is a bit unclear. + targetPlatform.isLinux + # Support added in https://github.com/llvm/llvm-project/commit/36b4a9ccd9f7e04010476e6b2a311f2052a4ac20 (19.1.0) + && (isClang -> versionAtLeast ccVersion "19.1") + then + (if targetPlatform.isx86 then "gnu2" else null) + else + null; + # Machine flags. These are necessary to support # TODO: We should make a way to support miscellaneous machine @@ -351,7 +364,13 @@ let # TODO: clang on powerpcspe also needs a condition: https://github.com/llvm/llvm-project/issues/71356 # https://releases.llvm.org/18.1.6/tools/clang/docs/ReleaseNotes.html#loongarch-support ((targetPlatform.isLoongArch64 && isClang) -> versionAtLeast ccVersion "18.1") - ) "-mcmodel=${targetPlatform.gcc.cmodel}"; + ) "-mcmodel=${targetPlatform.gcc.cmodel}" + # Enable TLSDESC. This needs to be supported by the libc and bintools. + # See: https://maskray.me/blog/2021-02-14-all-about-thread-local-storage + # Aarch64 uses TLSDESC by default and the option is completely ignored (at least on LLVM). + # TODO: Enable by default in GCC via --with-tls since https://gcc.gnu.org/cgit/gcc/commit/?id=96a291c4bb0b8a00b0a125e6a60f60072ffe53a7 (GCC 16). + # No equivalent build-time option for LLVM yet. + ++ optional (tlsDialect != null) "-mtls-dialect=${tlsDialect}"; defaultHardeningFlags = bintools.defaultHardeningFlags or [ ]; @@ -387,19 +406,13 @@ let # # TODO: Drop `mangle-NIX_STORE-in-__FILE__.patch` from GCC and make # this unconditional once the upstream bug is fixed. - useMacroPrefixMap = !isGNU; + useMacroPrefixMap = !isGNU && !isFlang; + systemIncludeFlag = if isFlang || isArocc then "-I" else "-idirafter"; + fortifyIncludeFlag = if isFlang then "-I" else "-isystem"; in assert includeFortifyHeaders' -> fortify-headers != null; -# Ensure bintools matches -assert libc_bin == bintools.libc_bin; -assert libc_dev == bintools.libc_dev; -assert libc_lib == bintools.libc_lib; -assert nativeTools == bintools.nativeTools; -assert nativeLibc == bintools.nativeLibc; -assert nativePrefix == bintools.nativePrefix; - stdenvNoCC.mkDerivation { pname = targetPrefix + (if name != "" then name else "${ccName}-wrapper"); version = optionalString (cc != null) ccVersion; @@ -469,9 +482,21 @@ stdenvNoCC.mkDerivation { # This is a quick fix unblock builds broken by https://github.com/NixOS/nixpkgs/pull/370750. dontCheckForBrokenSymlinks = true; - unpackPhase = '' - src=$PWD - ''; + # Ensure bintools matches. This is done here rather than at top level + # so that evaluating the derivation's metadata (such as `name`) + # doesn't force the comparisons, which cause the outPaths of the + # compared derivations to be computed and thus .drv files to be + # written to the store. + unpackPhase = + assert libc_bin == bintools.libc_bin; + assert libc_dev == bintools.libc_dev; + assert libc_lib == bintools.libc_lib; + assert nativeTools == bintools.nativeTools; + assert nativeLibc == bintools.nativeLibc; + assert nativePrefix == bintools.nativePrefix; + '' + src=$PWD + ''; wrapper = ./cc-wrapper.sh; @@ -574,10 +599,18 @@ stdenvNoCC.mkDerivation { '' + optionalString cc.langFortran or false '' - wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran - ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 - ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 - export named_fc=${targetPrefix}gfortran + if [ -e $ccPath/${targetPrefix}gfortran ]; then + wrap ${targetPrefix}gfortran $wrapper $ccPath/${targetPrefix}gfortran + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}g77 + ln -sv ${targetPrefix}gfortran $out/bin/${targetPrefix}f77 + export named_fc=${targetPrefix}gfortran + elif [ -e $ccPath/${targetPrefix}flang ]; then + wrap ${targetPrefix}flang $wrapper $ccPath/${targetPrefix}flang + export named_fc=${targetPrefix}flang + elif [ -e $ccPath/flang ]; then + wrap ${targetPrefix}flang $wrapper $ccPath/flang + export named_fc=${targetPrefix}flang + fi '' + optionalString cc.langGo or false '' @@ -709,13 +742,11 @@ stdenvNoCC.mkDerivation { touch "$out/nix-support/libc-cflags" touch "$out/nix-support/libc-ldflags" '' - + optionalString (!isArocc) '' + + optionalString (!isArocc && !(isAlireGNAT && targetPlatform.isDarwin)) '' echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags '' + '' - include "-${ - if isArocc then "I" else "idirafter" - }" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags + include "${systemIncludeFlag}" "${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags '' + optionalString isGNU '' for dir in "${cc}"/lib/gcc/*/*/include-fixed; do @@ -723,9 +754,9 @@ stdenvNoCC.mkDerivation { done '' + optionalString (libc.w32api or null != null) '' - echo '-idirafter ${lib.getDev libc.w32api}${ + include "${systemIncludeFlag}" "${lib.getDev libc.w32api}${ libc.incdir or "/include/w32api" - }' >> $out/nix-support/libc-cflags + }" >> $out/nix-support/libc-cflags '' + '' @@ -740,7 +771,7 @@ stdenvNoCC.mkDerivation { # like option that forces the libc headers before all -idirafter, # hence -isystem here. + optionalString includeFortifyHeaders' '' - include -isystem "${fortify-headers}/include" >> $out/nix-support/libc-cflags + include "${fortifyIncludeFlag}" "${fortify-headers}/include" >> $out/nix-support/libc-cflags '' ) @@ -761,7 +792,7 @@ stdenvNoCC.mkDerivation { # already knows how to find its own libstdc++, and adding # additional -isystem flags will confuse gfortran (see # https://github.com/NixOS/nixpkgs/pull/209870#issuecomment-1500550903) - + optionalString (libcxx == null && isClang && (useGccForLibs && gccForLibs.langCC or false)) '' + + optionalString (libcxx == null && isClang && useGccForLibs && (cc.langCC or false)) '' for dir in ${gccForLibs}/include/c++/*; do include -cxx-isystem "$dir" >> $out/nix-support/libcxx-cxxflags done @@ -786,7 +817,9 @@ stdenvNoCC.mkDerivation { # ${cc_solib}/lib64 (even though it does actually search there...).. # This confuses libtool. So add it to the compiler tool search # path explicitly. - + optionalString (!nativeTools && !isArocc) '' + # Injecting CFlags and LDFlags causes duplicate rpath at linking + # stage for Alire GNAT. Skip adding flags here. + + optionalString (!nativeTools && !isArocc && !isAlireGNAT) '' ccLDFlags=() ccCFlags=() if [ -e "${cc_solib}/lib64" -a ! -L "${cc_solib}/lib64" ]; then @@ -801,7 +834,6 @@ stdenvNoCC.mkDerivation { touch "$out/nix-support/gnat-cflags" touch "$out/nix-support/gnat-ldflags" basePath=$(echo $cc/lib/*/*/*) - ccCFlags+=("-B$basePath" "-I$basePath/adainclude") gnatCFlags="-I$basePath/adainclude -I$basePath/adalib" echo "$gnatCFlags" >> $out/nix-support/gnat-cflags @@ -828,6 +860,7 @@ stdenvNoCC.mkDerivation { optionalString ( (cc.isClang or false) + && !isFlang && !(cc.isROCm or false) && !targetPlatform.isDarwin && !targetPlatform.isAndroid @@ -862,7 +895,8 @@ stdenvNoCC.mkDerivation { let enable_fp = !targetPlatform.isx86_32 && !targetPlatform.isS390; enable_leaf_fp = - enable_fp + !isFlang + && enable_fp && ( targetPlatform.isx86_64 || targetPlatform.isAarch64 @@ -928,7 +962,7 @@ stdenvNoCC.mkDerivation { # well with multi line flags, so make the flags single line again + '' for flags in "$out/nix-support"/*flags*; do - substituteInPlace "$flags" --replace $'\n' ' ' + substituteInPlace "$flags" --replace-quiet $'\n' ' ' done substituteAll ${./add-flags.sh} $out/nix-support/add-flags.sh @@ -974,6 +1008,7 @@ stdenvNoCC.mkDerivation { env = { inherit isClang; + inherit isFlang; # for substitution in utils.bash # TODO(@sternenseemann): invent something cleaner than passing in "" in case of absence diff --git a/pkgs/build-support/coq/default.nix b/pkgs/build-support/coq/default.nix deleted file mode 100644 index c649a493c8ff..000000000000 --- a/pkgs/build-support/coq/default.nix +++ /dev/null @@ -1,258 +0,0 @@ -{ - lib, - stdenv, - coqPackages, - coq, - which, - fetchzip, - fetchurl, - dune, -}@args: - -let - lib = import ./extra-lib.nix { - inherit (args) lib; - }; - - inherit (lib) - concatStringsSep - flip - foldl - isFunction - isString - optional - optionalAttrs - optionals - optionalString - pred - remove - switch - versions - ; - - inherit (lib.attrsets) removeAttrs; - inherit (lib.strings) match; - - isGitHubDomain = d: match "^github.*" d != null; - isGitLabDomain = d: match "^gitlab.*" d != null; -in - -{ - pname, - version ? null, - fetcher ? null, - owner ? "coq-community", - domain ? "github.com", - repo ? pname, - defaultVersion ? null, - releaseRev ? (v: v), - displayVersion ? { }, - release ? { }, - buildInputs ? [ ], - nativeBuildInputs ? [ ], - extraBuildInputs ? [ ], - extraNativeBuildInputs ? [ ], - overrideBuildInputs ? [ ], - overrideNativeBuildInputs ? [ ], - namePrefix ? [ "coq" ], - enableParallelBuilding ? true, - extraInstallFlags ? [ ], - setCOQBIN ? true, - mlPlugin ? false, - useMelquiondRemake ? null, - dropAttrs ? [ ], - keepAttrs ? [ ], - dropDerivationAttrs ? [ ], - useDuneifVersion ? (x: false), - useDune ? false, - opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), - ... -}@args: -let - args-to-remove = foldl (flip remove) ( - [ - "version" - "fetcher" - "repo" - "owner" - "domain" - "releaseRev" - "displayVersion" - "defaultVersion" - "useMelquiondRemake" - "release" - "buildInputs" - "nativeBuildInputs" - "extraBuildInputs" - "extraNativeBuildInputs" - "overrideBuildInputs" - "overrideNativeBuildInputs" - "namePrefix" - "meta" - "useDuneifVersion" - "useDune" - "opam-name" - "extraInstallFlags" - "setCOQBIN" - "mlPlugin" - "dropAttrs" - "dropDerivationAttrs" - "keepAttrs" - "enableParallelBuilding" - ] - ++ dropAttrs - ) keepAttrs; - fetch = - import ../coq/meta-fetch/default.nix - { - inherit - lib - stdenv - fetchzip - fetchurl - ; - } - ( - { - inherit release releaseRev; - location = { inherit domain owner repo; }; - } - // optionalAttrs (args ? fetcher) { inherit fetcher; } - ); - fetched = fetch (if version != null then version else defaultVersion); - display-pkg = - n: sep: v: - let - d = displayVersion.${n} or (if sep == "" then ".." else true); - in - n - + optionalString (v != "" && v != null) ( - switch d [ - { - case = true; - out = sep + v; - } - { - case = "."; - out = sep + versions.major v; - } - { - case = ".."; - out = sep + versions.majorMinor v; - } - { - case = "..."; - out = sep + versions.majorMinorPatch v; - } - { - case = isFunction; - out = optionalString (d v != "") (sep + d v); - } - { - case = isString; - out = optionalString (d != "") (sep + d); - } - ] "" - ) - + optionalString (v == null) "-broken"; - append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; - prefix-name = foldl append-version "" namePrefix; - useDune = args.useDune or (useDuneifVersion fetched.version); - coqlib-flags = - switch coq.coq-version - [ - { - case = v: versions.isLe "8.6" v && v != "dev"; - out = [ "COQLIB=$(out)/lib/coq/${coq.coq-version}/" ]; - } - ] - [ - "COQLIBINSTALL=$(out)/lib/coq/${coq.coq-version}/user-contrib" - "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" - ]; - docdir-flags = - switch coq.coq-version - [ - { - case = v: versions.isLe "8.6" v && v != "dev"; - out = [ "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ]; - } - ] - [ "COQDOCINSTALL=$(out)/share/coq/${coq.coq-version}/user-contrib" ]; -in - -stdenv.mkDerivation ( - removeAttrs ( - { - - name = prefix-name + (display-pkg pname "-" fetched.version); - - inherit (fetched) version src; - - nativeBuildInputs = - args.overrideNativeBuildInputs or ( - [ which ] - ++ optional useDune dune - ++ optionals (useDune || mlPlugin) [ - coq.ocamlPackages.ocaml - coq.ocamlPackages.findlib - ] - ++ (args.nativeBuildInputs or [ ]) - ++ extraNativeBuildInputs - ); - buildInputs = - args.overrideBuildInputs or ([ coq ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs); - enableParallelBuilding = - lib.warnIf (args ? enableParallelBuilding && args.enableParallelBuilding == true) - "mkCoqDerivation: enableParallelBuilding is enabled by default; remove the explicit setting" - enableParallelBuilding; - - meta = - ( - { - platforms = coq.meta.platforms; - } - // (switch domain [ - { - case = pred.union isGitHubDomain isGitLabDomain; - out = { - homepage = "https://${domain}/${owner}/${repo}"; - }; - } - ] { }) - // optionalAttrs (fetched.broken or false) { - coqFilter = true; - broken = true; - } - ) - // (args.meta or { }); - - } - // (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; }) - // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) { - installFlags = coqlib-flags ++ docdir-flags ++ extraInstallFlags; - }) - // (optionalAttrs useDune { - buildPhase = '' - runHook preBuild - dune build -p ${opam-name} ''${enableParallelBuilding:+-j $NIX_BUILD_CORES} - runHook postBuild - ''; - installPhase = '' - runHook preInstall - dune install --prefix=$out --libdir $OCAMLFIND_DESTDIR ${opam-name} - mkdir $out/lib/coq/ - mv $OCAMLFIND_DESTDIR/coq $out/lib/coq/${coq.coq-version} - runHook postInstall - ''; - }) - // (optionalAttrs (args ? useMelquiondRemake) rec { - COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib"; - preConfigurePhases = [ "autoconf" ]; - configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; - buildPhase = "./remake -j$NIX_BUILD_CORES"; - installPhase = "./remake install"; - }) - // (removeAttrs args args-to-remove) - ) dropDerivationAttrs -) diff --git a/pkgs/build-support/dlang/builddubpackage/default.nix b/pkgs/build-support/dlang/builddubpackage/default.nix index 8c9937ef50a9..9785e2f89c74 100644 --- a/pkgs/build-support/dlang/builddubpackage/default.nix +++ b/pkgs/build-support/dlang/builddubpackage/default.nix @@ -35,6 +35,7 @@ lib.extendMkDerivation { }; strictDeps = args.strictDeps or true; + __structuredAttrs = args.__structuredAttrs or true; nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ dubSetupHook @@ -58,10 +59,12 @@ lib.extendMkDerivation { preFixup = '' ${args.preFixup or ""} - find "$out" -type f -exec remove-references-to -t ${compiler} '{}' + + find "$out" -type f -exec remove-references-to ${ + lib.concatMapStringsSep " " (output: "-t ${output}") compiler.all + } '{}' + ''; - disallowedReferences = args.disallowedReferences or [ compiler ]; + disallowedReferences = args.disallowedReferences or compiler.all; meta = { platforms = dub.meta.platforms; diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index d8e9812c7bec..6e61677350fe 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -7,6 +7,7 @@ coreutils, devShellTools, e2fsprogs, + pkgsBuildBuild, proot, fakeNss, fakeroot, @@ -1246,7 +1247,7 @@ rec { # take images can know in advance how the image is supposed to be used. isExe = true; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ pkgsBuildBuild.makeWrapper ]; inherit meta; } '' diff --git a/pkgs/build-support/fetchcodeberg/default.nix b/pkgs/build-support/fetchcodeberg/default.nix index 4277e5a5613c..aac1f97a7fdb 100644 --- a/pkgs/build-support/fetchcodeberg/default.nix +++ b/pkgs/build-support/fetchcodeberg/default.nix @@ -1,2 +1,11 @@ { lib, fetchFromGitea }: -lib.makeOverridable (args: fetchFromGitea ({ domain = "codeberg.org"; } // args)) +lib.makeOverridable ( + args: + fetchFromGitea ( + { + domain = "codeberg.org"; + functionName = "fetchFromCodeberg"; + } + // args + ) +) diff --git a/pkgs/build-support/fetchgitea/default.nix b/pkgs/build-support/fetchgitea/default.nix index a7910b671e9b..cfa7c592db1f 100644 --- a/pkgs/build-support/fetchgitea/default.nix +++ b/pkgs/build-support/fetchgitea/default.nix @@ -3,7 +3,20 @@ { lib, fetchFromGitHub }: lib.makeOverridable ( - { domain, ... }@args: + { + domain, + functionName ? "fetchFromGitea", + ... + }@args: - fetchFromGitHub ((removeAttrs args [ "domain" ]) // { githubBase = domain; }) + fetchFromGitHub ( + (removeAttrs args [ + "domain" + "functionName" + ]) + // { + inherit functionName; + githubBase = domain; + } + ) ) diff --git a/pkgs/build-support/fetchgithub/default.nix b/pkgs/build-support/fetchgithub/default.nix index f21256f5d57b..27a19b53b18d 100644 --- a/pkgs/build-support/fetchgithub/default.nix +++ b/pkgs/build-support/fetchgithub/default.nix @@ -48,6 +48,7 @@ decorate ( repo, tag ? null, rev ? null, + functionName ? "fetchFromGitHub", # TODO(@ShamrockLee): Add back after reconstruction with lib.extendMkDerivation # name ? repoRevToNameMaybe finalAttrs.repo (lib.revOrTag finalAttrs.revCustom finalAttrs.tag) "github", private ? false, @@ -60,7 +61,7 @@ decorate ( assert ( lib.xor (tag == null) (rev == null) - || throw "fetchFromGitHub requires one of either `rev` or `tag` to be provided (not both)." + || throw "${functionName} requires one of either `rev` or `tag` to be provided (not both)." ); let @@ -115,6 +116,7 @@ decorate ( "repo" "tag" "rev" + "functionName" "private" "githubBase" "varPrefix" @@ -135,7 +137,7 @@ decorate ( in '' if [ -z "''$${varBase}USERNAME" -o -z "''$${varBase}PASSWORD" ]; then - echo "Error: Private fetchFromGitHub requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 + echo "Error: Private ${functionName} requires the nix building process (nix-daemon in multi user mode) to have the ${varBase}USERNAME and ${varBase}PASSWORD env vars set." >&2 exit 1 fi cat > netrc <&2 - exit 1 - fi + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; - export HOME="$TMPDIR" - export GIT_SSL_CAINFO="$NIX_SSL_CERT_FILE" + dontConfigure = true; - mkdir -p "$TMPDIR/packages" + buildPhase = '' + runHook preBuild - jq -c --argjson exclude ${lib.escapeShellArg (builtins.toJSON excludePackages)} \ - '.packages[] | select(.type == "git") | select(.name as $n | $exclude | index($n) | not)' \ - lake-manifest.json | while IFS= read -r pkg; do - name=$(echo "$pkg" | jq -r '.name') - url=$(echo "$pkg" | jq -r '.url') - rev=$(echo "$pkg" | jq -r '.rev') + if [ ! -f lake-manifest.json ]; then + echo "fetchLakeDeps: lake-manifest.json not found" >&2 + exit 1 + fi - echo "fetchLakeDeps: cloning $name ($url @ $rev)" + export HOME="$TMPDIR" + export GIT_SSL_CAINFO="$NIX_SSL_CERT_FILE" - git clone --filter=blob:none --no-checkout "$url" "$TMPDIR/packages/$name" - git -C "$TMPDIR/packages/$name" checkout "$rev" --quiet + mkdir -p "$TMPDIR/packages" - # Remove .git to make output deterministic - rm -rf "$TMPDIR/packages/$name/.git" - done + jq -c --argjson exclude ${lib.escapeShellArg (builtins.toJSON excludePackages)} \ + '.packages[] | select(.type == "git") | select(.name as $n | $exclude | index($n) | not)' \ + lake-manifest.json | while IFS= read -r pkg; do + name=$(echo "$pkg" | jq -r '.name') + url=$(echo "$pkg" | jq -r '.url') + rev=$(echo "$pkg" | jq -r '.rev') - runHook postBuild - ''; + echo "fetchLakeDeps: cloning $name ($url @ $rev)" - installPhase = '' - runHook preInstall - mv "$TMPDIR/packages" "$out" - runHook postInstall - ''; + git clone --filter=blob:none --no-checkout "$url" "$TMPDIR/packages/$name" + git -C "$TMPDIR/packages/$name" checkout "$rev" --quiet - dontFixup = true; + # Remove .git to make output deterministic + rm -rf "$TMPDIR/packages/$name/.git" + done - outputHashMode = "recursive"; - outputHash = hash; - outputHashAlgo = if hash == "" then "sha256" else null; + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mv "$TMPDIR/packages" "$out" + runHook postInstall + ''; + + dontFixup = true; + + outputHashMode = "recursive"; + outputHash = hash; + outputHashAlgo = if hash == "" then "sha256" else null; + }; } diff --git a/pkgs/build-support/make-startupitem/default.nix b/pkgs/build-support/make-startupitem/default.nix index 03677355b8d6..b1294a43a0f8 100644 --- a/pkgs/build-support/make-startupitem/default.nix +++ b/pkgs/build-support/make-startupitem/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { target=${name}.desktop cp ${package}/share/applications/${srcPrefix}${name}.desktop $target ${lib.optionalString (prependExtraArgs != [ ] || appendExtraArgs != [ ]) '' - sed -i -r "s/(Exec=)([^ \n]*) *(.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target + sed -i -r "s/^(Exec=)([^ \n]*) *(.*)/\1\2 ${prependArgs}\3${appendArgs}/" $target ''} chmod +rw $target echo "X-KDE-autostart-phase=${phase}" >> $target diff --git a/pkgs/build-support/node/fetch-pnpm-deps/default.nix b/pkgs/build-support/node/fetch-pnpm-deps/default.nix index 4669d4909b7f..fc1bafcb1b0c 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/default.nix +++ b/pkgs/build-support/node/fetch-pnpm-deps/default.nix @@ -49,13 +49,9 @@ in filterFlags = lib.map (package: "--filter=${package}") pnpmWorkspaces; - pnpm-fixup-state-db' = - if pnpm.nodejs-slim or null != null then - pnpm-fixup-state-db.override { - inherit (pnpm) nodejs-slim; - } - else - pnpm-fixup-state-db; + pnpm-fixup-state-db' = pnpm-fixup-state-db.override { + inherit (pnpm) nodejs-slim; + }; in assert fetcherVersion != null @@ -69,6 +65,10 @@ in builtins.elem fetcherVersion supportedFetcherVersions || throw "fetchPnpmDeps `fetcherVersion` is not set to a supported value (${lib.concatStringsSep ", " (map toString supportedFetcherVersions)}), see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."; + assert + !(fetcherVersion == 3 && lib.versionAtLeast pnpm.version "11.0.0") + || throw "fetchPnpmDeps `fetcherVersion = 3` is no longer supported for `pnpm_11`. Please upgrade to the latest, see https://nixos.org/manual/nixpkgs/stable/#javascript-pnpm-fetcherVersion."; + stdenvNoCC.mkDerivation ( finalAttrs: ( @@ -171,6 +171,13 @@ in if [[ ${toString fetcherVersion} -ge 4 ]]; then sqlite3 "$storePath/v11/index.db" .dump > "$storePath/v11/index.db.sql" rm "$storePath/v11/index.db" + ${lib.optionalString (lib.versionAtLeast sqlite.version "3.53.0") '' + # SQLite 3.53.0 refactored code around the dump generation, that changed + # BLOB data type representations from `X'...'` to `x'...'`, breaking existing hashes. + # This change was made in http://github.com/sqlite/sqlite/commit/d2424338b05f2766034f91c03009c8f0d78bc937 + # and the following command reverts the dump to the old format: + sed -i "s/,x'/,X'/g" "$storePath/v11/index.db.sql" + ''} fi fi @@ -209,10 +216,7 @@ in passthru = args.passthru or { } // { inherit fetcherVersion; - serve = callPackage ./serve.nix { - inherit pnpm; # from args - pnpmDeps = finalAttrs.finalPackage; - }; + serve = throw "fetchPnpmDeps: `serve` has been deprecated as it was removed in pnpm 11 and only had a niche use case."; # Added 2026-06-04 }; dontConfigure = true; diff --git a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh index 38f6eb97b56b..4a44775ab7b8 100644 --- a/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh +++ b/pkgs/build-support/node/fetch-pnpm-deps/pnpm-config-hook.sh @@ -118,4 +118,6 @@ pnpmConfigHook() { echo "Finished pnpmConfigHook" } -postConfigureHooks+=(pnpmConfigHook) +if [ -z "${dontPnpmConfigure-}" ]; then + postConfigureHooks+=(pnpmConfigHook) +fi diff --git a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix b/pkgs/build-support/node/fetch-pnpm-deps/serve.nix deleted file mode 100644 index 2c3292180d8f..000000000000 --- a/pkgs/build-support/node/fetch-pnpm-deps/serve.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - writeShellApplication, - pnpm, - pnpmDeps, - zstd, - lib, -}: - -writeShellApplication { - name = "serve-pnpm-store"; - - runtimeInputs = [ - pnpm - zstd - ]; - - text = '' - storePath=$(mktemp -d) - - clean() { - echo "Cleaning up temporary store at '$storePath'..." - - rm -rf "$storePath" - } - - echo "Copying pnpm store '${pnpmDeps}' to temporary store..." - - tar --zstd -xf "${pnpmDeps}/pnpm-store.tar.zst" -C "$storePath" - - chmod -R +w "$storePath" - - echo "Run 'pnpm install --store-dir \"$storePath\"' to install packages from this store." - - trap clean EXIT - - pnpm server start \ - --store-dir "$storePath" - ''; - - meta = { - broken = lib.versionAtLeast pnpm.version "11"; - }; -} diff --git a/pkgs/build-support/node/prefetch-npm-deps/default.nix b/pkgs/build-support/node/prefetch-npm-deps/default.nix index 12c56a58b6ec..eb73907343de 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/default.nix +++ b/pkgs/build-support/node/prefetch-npm-deps/default.nix @@ -195,6 +195,28 @@ hash = "sha256-QGObVDd9qVtf/U78+ayP6RHVWsU+HXhg70BFblQ1PZs="; }; + + # Test lockfiles with file: dependencies + fileDependenciesV1 = makeTest { + name = "file-dependencies-lockfile-v1"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/elbywan/wretch/970b19e0fcc3dd219b9f3fc247d8f34cc01979c6/package-lock.json"; + hash = "sha256-3vTMxc9M2TeiclUFYbG5eTzavSAXjAzz6N5v/1VM4Bc="; + }; + + hash = "sha256-4wTohTVWF49iQvdaUxNhwplfTVb53yFnAaUVA2xIXrc="; + }; + fileDependenciesV3 = makeTest { + name = "file-dependencies-lockfile-v3"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/alam00000/bentopdf/146e3f07d4111e309d0b29bb949e78e44454be3b/package-lock.json"; + hash = "sha256-9Ea5ctJYbClxStYNhSfSpsO/P99/4CQK58PLK5e6PoQ="; + }; + + hash = "sha256-1xWkzAzZXd9f4sY9xFHLfj482ZCs2oKFJ79C+Iy7RFY="; + }; }; meta = { diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs index 2882aee9ec20..b65db0492c3e 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/main.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/main.rs @@ -238,6 +238,7 @@ fn fixup_lockfile( .values_mut() { if let Some(Value::String(resolved)) = package.get("resolved") + && !resolved.starts_with("file:") && let Some(Value::String(integrity)) = package.get("integrity") { if resolved.starts_with("git+") { @@ -286,6 +287,7 @@ fn fixup_v1_deps( .as_object() .expect("v1 dep must be object") .get("resolved") + && !resolved.starts_with("file:") && let Some(Value::String(integrity)) = dep .as_object() .expect("v1 dep must be object") @@ -509,6 +511,10 @@ mod tests { "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", "integrity": "sha512-aaa" }, + "baz": { + "resolved": "file:baz.tar.gz", + "integrity": "sha512-bbb" + }, "foo-bad": { "resolved": "foo", "integrity": "sha1-foo" @@ -534,6 +540,10 @@ mod tests { "bar": { "resolved": "git+ssh://git@github.com/NixOS/nixpkgs.git", }, + "baz": { + "resolved": "file:baz.tar.gz", + "integrity": "sha512-bbb" + }, "foo-bad": { "resolved": "foo", "integrity": "sha512-foo" diff --git a/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs index 3e6f5019ea33..6f76dd7f59df 100644 --- a/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/prefetch-npm-deps/src/parse/mod.rs @@ -25,10 +25,10 @@ pub fn lockfile( let mut packages = lock::packages(content) .context("failed to extract packages from lockfile")? .into_par_iter() - .map(|p| { + .filter_map(|p| { let n = p.name.clone().unwrap(); - Package::from_lock(p).with_context(|| format!("failed to parse data for {n}")) + Package::from_lock(p).with_context(|| format!("failed to parse data for {n}")).transpose() }) .collect::>>()?; @@ -124,7 +124,7 @@ enum Specifics { } impl Package { - fn from_lock(pkg: lock::Package) -> anyhow::Result { + fn from_lock(pkg: lock::Package) -> anyhow::Result> { let mut resolved = match pkg .resolved .expect("at this point, packages should have URLs") @@ -133,6 +133,10 @@ impl Package { UrlOrString::String(_) => panic!("at this point, all packages should have URLs"), }; + if resolved.scheme() == "file" { + return Ok(None); + } + let specifics = match get_hosted_git_url(&resolved)? { Some(hosted) => { let body = util::get_url_body_with_retry(&hosted)?; @@ -174,12 +178,12 @@ impl Package { }, }; - Ok(Package { + Ok(Some(Package { name: pkg.name.unwrap(), version: pkg.version, url: resolved, specifics, - }) + })) } pub fn tarball(&self) -> anyhow::Result> { diff --git a/pkgs/build-support/rocq/default.nix b/pkgs/build-support/rocq/default.nix index 8b86867d67d4..6a25a171cb25 100644 --- a/pkgs/build-support/rocq/default.nix +++ b/pkgs/build-support/rocq/default.nix @@ -3,15 +3,16 @@ stdenv, rocqPackages, rocq-core, + coq, which, fetchzip, fetchurl, dune, -}@args: +}@args0: let lib = import ./extra-lib.nix { - inherit (args) lib; + inherit (args0) lib; }; inherit (lib) @@ -41,7 +42,7 @@ in pname, version ? null, fetcher ? null, - owner ? "coq-community", + owner ? "rocq-community", domain ? "github.com", repo ? pname, defaultVersion ? null, @@ -54,7 +55,7 @@ in extraNativeBuildInputs ? [ ], overrideBuildInputs ? [ ], overrideNativeBuildInputs ? [ ], - namePrefix ? [ "rocq-core" ], + namePrefix ? null, enableParallelBuilding ? true, extraInstallFlags ? [ ], setROCQBIN ? true, @@ -65,7 +66,9 @@ in dropDerivationAttrs ? [ ], useDuneifVersion ? (x: false), useDune ? false, - opam-name ? (concatStringsSep "-" (namePrefix ++ [ pname ])), + opam-name ? null, + useCoq ? false, + useCoqifVersion ? (x: false), ... }@args: let @@ -98,11 +101,14 @@ let "dropAttrs" "dropDerivationAttrs" "keepAttrs" + "env" + "useCoq" + "useCoqifVersion" ] ++ dropAttrs ) keepAttrs; fetch = - import ../coq/meta-fetch/default.nix + import ../rocq/meta-fetch/default.nix { inherit lib @@ -154,14 +160,24 @@ let ] "" ) + optionalString (v == null) "-broken"; - append-version = p: n: p + display-pkg n "" rocqPackages.${n}.version + "-"; - prefix-name = foldl append-version "" namePrefix; useDune = args.useDune or (useDuneifVersion fetched.version); + useCoq = args.useCoq or (useCoqifVersion fetched.version); + namePrefix = args.namePrefix or [ (if useCoq then "coq" else "rocq") ]; + append-version = + p: n: + let + version = if n == "rocq" then rocqPackages.rocq-core.version else rocqPackages.${n}.version; + in + p + display-pkg n "" version + "-"; + prefix-name = foldl append-version "" namePrefix; + opam-name = args.opam-name or (concatStringsSep "-" (namePrefix ++ [ pname ])); + rocq-core = if useCoq then coq // { rocq-version = coq.coq-version; } else args0.rocq-core; rocqlib-flags = [ "COQLIBINSTALL=$(out)/lib/coq/${rocq-core.rocq-version}/user-contrib" "COQPLUGININSTALL=$(OCAMLFIND_DESTDIR)" ]; docdir-flags = [ "COQDOCINSTALL=$(out)/share/coq/${rocq-core.rocq-version}/user-contrib" ]; + COQUSERCONTRIB = "$out/lib/coq/${rocq-core.rocq-version}/user-contrib"; in stdenv.mkDerivation ( @@ -187,6 +203,16 @@ stdenv.mkDerivation ( args.overrideBuildInputs or ([ rocq-core ] ++ (args.buildInputs or [ ]) ++ extraBuildInputs); inherit enableParallelBuilding; + env = + optionalAttrs (setROCQBIN && !useCoq) { + ROCQBIN = "${rocq-core}/bin/"; + } + // optionalAttrs (setROCQBIN && useCoq) { COQBIN = "${rocq-core}/bin/"; } + // optionalAttrs (args ? useMelquiondRemake) { + inherit COQUSERCONTRIB; + } + // (args.env or { }); + meta = ( { @@ -208,7 +234,6 @@ stdenv.mkDerivation ( // (args.meta or { }); } - // (optionalAttrs setROCQBIN { ROCQBIN = "${rocq-core}/bin/"; }) // (optionalAttrs (!args ? installPhase && !args ? useMelquiondRemake) { installFlags = rocqlib-flags ++ docdir-flags ++ extraInstallFlags; }) @@ -226,8 +251,7 @@ stdenv.mkDerivation ( runHook postInstall ''; }) - // (optionalAttrs (args ? useMelquiondRemake) rec { - COQUSERCONTRIB = "$out/lib/coq/${rocq-core.rocq-version}/user-contrib"; + // (optionalAttrs (args ? useMelquiondRemake) { preConfigurePhases = [ "autoconf" ]; configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; buildPhase = "./remake -j$NIX_BUILD_CORES"; diff --git a/pkgs/build-support/coq/meta-fetch/default.nix b/pkgs/build-support/rocq/meta-fetch/default.nix similarity index 100% rename from pkgs/build-support/coq/meta-fetch/default.nix rename to pkgs/build-support/rocq/meta-fetch/default.nix diff --git a/pkgs/build-support/rust/build-rust-crate/build-crate.nix b/pkgs/build-support/rust/build-rust-crate/build-crate.nix index 0322201cd666..7cfd5f021e68 100644 --- a/pkgs/build-support/rust/build-rust-crate/build-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/build-crate.nix @@ -9,6 +9,7 @@ { crateName, + version, dependencies, crateFeatures, crateRenames, @@ -25,6 +26,7 @@ buildTests, codegenUnits, capLints, + useClippy, }: let @@ -32,6 +34,20 @@ let (if release then "-C opt-level=3" else "-C debuginfo=2") "-C codegen-units=${toString codegenUnits}" "--remap-path-prefix=$NIX_BUILD_TOP=/" + # Map the unpacked source root to a stable, crate-identifying path. + # Sources from fetchCrate unpack to $NIX_BUILD_TOP/-, + # so the prefix above already yields /-/src/... and + # this remap is a no-op for them. Sources supplied via a custom `src` + # (lib.fileset.toSource, lib.cleanSource, a flake's `self`) all unpack to + # a fixed basename like `source`, so without this every such crate + # collapses to /source/src/... — losing crate identity in panic + # backtraces, file!() expansions, debuginfo, and coverage maps. rustc + # applies remaps last-match-wins, so this more-specific prefix wins + # for everything under the source root (including OUT_DIR, which + # configure-crate.nix places at $sourceRoot/target/build/); the + # broader $NIX_BUILD_TOP remap above remains as a fallback for any + # path that happens to fall outside $sourceRoot. + "--remap-path-prefix=$NIX_BUILD_TOP/$sourceRoot=/${crateName}-${version}" # When the rust-src component is present (common with rust-overlay # toolchains), rustc unvirtualises libstd source paths. Panic # locations from monomorphised generic std code then embed the @@ -94,6 +110,7 @@ in runHook preBuild # configure & source common build functions + RUSTC_DRIVER="${if useClippy then "clippy-driver" else "rustc"}" LIB_RUSTC_OPTS="${libRustcOpts}" BIN_RUSTC_OPTS="${binRustcOpts}" LIB_EXT="${stdenv.hostPlatform.extensions.library}" diff --git a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix index 060ce25df8db..6d7b530454d9 100644 --- a/pkgs/build-support/rust/build-rust-crate/configure-crate.nix +++ b/pkgs/build-support/rust/build-rust-crate/configure-crate.nix @@ -148,7 +148,7 @@ in export CARGO_CFG_TARGET_OS=${stdenv.hostPlatform.rust.platform.os} export CARGO_CFG_TARGET_FAMILY="unix" export CARGO_CFG_UNIX=1 - export CARGO_CFG_TARGET_ENV="gnu" + export CARGO_CFG_TARGET_ENV=${stdenv.hostPlatform.rust.platform.env} export CARGO_CFG_TARGET_ENDIAN=${ if stdenv.hostPlatform.parsed.cpu.significantByte.name == "littleEndian" then "little" else "big" } diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 0903096ed281..574af45c0575 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -12,6 +12,7 @@ pkgsBuildBuild, rustc, cargo, + clippy, jq, libiconv, # Controls codegen parallelization for all crates. @@ -155,14 +156,37 @@ crate_: lib.makeOverridable ( # The rust compiler to use. - # - # Default: pkgs.rustc { rust ? rustc, # The cargo package to use for getting some metadata. # # Default: pkgs.cargo cargo ? cargo, + # Whether to compile the crate's library, binary, and test targets with + # `clippy-driver` instead of `rustc`. Build scripts (`build.rs`) keep + # plain `rustc` — they are typically auto-generated and clippy findings + # there are not actionable. + # + # `clippy-driver` wraps `rustc_driver` with extra lint passes and emits + # link-compatible `.rlib`/`.rmeta`, so dependency crates built with plain + # `rustc` are still usable; only the crate being linted needs this flag. + # + # Note that the default `capLints` of `"allow"` suppresses ALL lints, + # including clippy's. Set `capLints = "warn"` (or `"forbid"`) or supply + # a `lints` table — otherwise `useClippy` is a silent no-op. Lint flags + # such as `-D warnings` or `-W clippy::pedantic` go through the regular + # `extraRustcOpts` (clippy-driver forwards rustc flags unchanged). + # + # Example: true + # Default: false + useClippy, + # The clippy package providing `clippy-driver`. Only consulted when + # `useClippy = true`. Override this together with `rust` when using a + # toolchain (rust-overlay, Fenix) that bundles its own `clippy-driver`, + # so the sysroot matches. + # + # Default: pkgs.clippy + clippy ? clippy, # Whether to build a release version (`true`) or a debug # version (`false`). Debug versions are faster to build # but might be much slower at runtime. @@ -198,6 +222,13 @@ lib.makeOverridable # Rust build dependencies, i.e. other libraries that were built # with buildRustCrate and are used by a build script. buildDependencies, + # Rust dev-dependencies, i.e. other libraries that were built + # with buildRustCrate and are linked only when `buildTests = true`. + # Mirrors Cargo's `[dev-dependencies]`: ignored for the regular + # lib/bin build, appended to `dependencies` for the test build. + # + # Default: [] + devDependencies, # Specify the "extern" name of a library if it differs from the library target. # See above for an extended explanation. # @@ -329,6 +360,7 @@ lib.makeOverridable crate = crate_ // (lib.attrByPath [ crate_.crateName ] (attr: { }) crateOverrides crate_); dependencies_ = dependencies; buildDependencies_ = buildDependencies; + devDependencies_ = devDependencies; processedAttrs = [ "src" "propagatedBuildInputs" @@ -340,6 +372,7 @@ lib.makeOverridable "libPath" "buildDependencies" "dependencies" + "devDependencies" "features" "crateRenames" "crateName" @@ -432,6 +465,7 @@ lib.makeOverridable cargo jq ] + ++ lib.optional useClippy clippy ++ lib.optionals stdenv.hasCC [ stdenv.cc ] ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] ++ (crate.nativeBuildInputs or [ ]) @@ -441,7 +475,10 @@ lib.makeOverridable ++ (crate.buildInputs or [ ]) ++ buildInputs_ ++ completePropagatedBuildInputs; - dependencies = map lib.getLib dependencies_; + # Dev-dependencies are only linked when building tests, mirroring + # Cargo. When buildTests is false this is a no-op, so the metadata + # hash and store path of normal lib/bin builds are unchanged. + dependencies = map lib.getLib (dependencies_ ++ lib.optionals buildTests_ devDependencies_); buildDependencies = map lib.getLib buildDependencies_; completeDeps = lib.unique (dependencies ++ lib.concatMap (dep: dep.completeDeps) dependencies); @@ -563,6 +600,7 @@ lib.makeOverridable buildPhase = buildCrate { inherit crateName + version dependencies crateFeatures crateRenames @@ -579,6 +617,7 @@ lib.makeOverridable buildTests codegenUnits capLints + useClippy ; }; dontStrip = !release; @@ -614,6 +653,8 @@ lib.makeOverridable { rust = crate_.rust or rustc; cargo = crate_.cargo or cargo; + useClippy = crate_.useClippy or false; + clippy = crate_.clippy or clippy; release = crate_.release or true; verbose = crate_.verbose or true; extraRustcOpts = [ ]; @@ -638,6 +679,7 @@ lib.makeOverridable postInstall = crate_.postInstall or ""; dependencies = crate_.dependencies or [ ]; buildDependencies = crate_.buildDependencies or [ ]; + devDependencies = crate_.devDependencies or [ ]; crateRenames = crate_.crateRenames or { }; buildTests = crate_.buildTests or false; } diff --git a/pkgs/build-support/rust/build-rust-crate/lib.sh b/pkgs/build-support/rust/build-rust-crate/lib.sh index 28da36666dad..23eb7640bbbf 100644 --- a/pkgs/build-support/rust/build-rust-crate/lib.sh +++ b/pkgs/build-support/rust/build-rust-crate/lib.sh @@ -10,7 +10,7 @@ build_lib() { lib_src=$1 echo_build_heading $lib_src ${libName} - noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \ + noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \ --crate-name $CRATE_NAME \ $lib_src \ --out-dir target/lib \ @@ -42,7 +42,7 @@ build_bin() { main_file=$2 fi echo_build_heading $crate_name $main_file - noisily env "${CARGO_BIN_EXE_ENV[@]}" rustc \ + noisily env "${CARGO_BIN_EXE_ENV[@]}" "${RUSTC_DRIVER:-rustc}" \ --crate-name $crate_name_ \ $main_file \ --crate-type bin \ diff --git a/pkgs/build-support/rust/build-rust-crate/test/default.nix b/pkgs/build-support/rust/build-rust-crate/test/default.nix index 7e05e49072ab..c7fe6f461d01 100644 --- a/pkgs/build-support/rust/build-rust-crate/test/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/test/default.nix @@ -404,6 +404,27 @@ rec { "test something ... ok" ]; }; + rustLibTestsWithDevDependency = + let + devDep = mkHostCrate { + crateName = "dev-dep"; + src = mkLib "src/lib.rs"; + }; + in + { + src = mkFile "src/lib.rs" '' + #[cfg(test)] + mod tests { + #[test] + fn uses_dev_dep() { + assert_eq!(dev_dep::test(), 23); + } + } + ''; + devDependencies = [ devDep ]; + buildTests = true; + expectedTestOutputs = [ "test tests::uses_dev_dep ... ok" ]; + }; rustBinTestsCombined = { src = symlinkJoin { name = "rust-bin-tests-combined"; @@ -1008,6 +1029,66 @@ rec { ]; }; + crateWasm32TargetEnv = assertOutputs { + name = "gnu64-crate-target-env"; + mkCrate = mkCrate pkgsCross.wasm32-unknown-none.buildRustCrate; + crateArgs = { + crateName = "wasm32-crate-target-env"; + crateBin = [ { name = "wasm32-crate-target-env"; } ]; + src = symlinkJoin { + name = "wasm32-crate-target-env-sources"; + paths = [ + (mkFile "build.rs" '' + fn main() { + assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("".to_string())); + } + '') + (mkFile "src/main.rs" '' + use std::env; + #[cfg(target_env = "")] + fn main() { + let name: String = env::args().nth(0).unwrap(); + println!("executed {}", name); + } + '') + ]; + }; + }; + expectedFiles = [ + "./bin/wasm32-crate-target-env.wasm" + ]; + }; + + crateGnu64TargetEnv = assertOutputs { + name = "gnu64-crate-target-env"; + mkCrate = mkCrate pkgsCross.gnu64.buildRustCrate; + crateArgs = { + crateName = "gnu64-crate-target-env"; + crateBin = [ { name = "gnu64-crate-target-env"; } ]; + src = symlinkJoin { + name = "gnu64-crate-target-env-sources"; + paths = [ + (mkFile "build.rs" '' + fn main() { + assert_eq!(std::env::var("CARGO_CFG_TARGET_ENV"), Ok("gnu".to_string())); + } + '') + (mkFile "src/main.rs" '' + use std::env; + #[cfg(target_env = "gnu")] + fn main() { + let name: String = env::args().nth(0).unwrap(); + println!("executed {}", name); + } + '') + ]; + }; + }; + expectedFiles = [ + "./bin/gnu64-crate-target-env" + ]; + }; + brotliTest = let pkg = brotliCrates.brotli_2_5_0 { }; @@ -1068,6 +1149,75 @@ rec { touch $out ''; + # `useClippy = true` plus a denied clippy lint should fail the build, + # proving clippy-driver (not plain rustc) compiled the crate. The + # `clippy::` prefix in the diagnostic is the fingerprint: rustc has no + # such lint group. + useClippyDenyFails = + let + crate = mkHostCrate { + crateName = "useClippyDenyFails"; + useClippy = true; + lints.clippy.eq_op = "deny"; + src = mkFile "src/lib.rs" '' + pub fn check() -> bool { + 1 == 1 + } + ''; + }; + failed = testers.testBuildFailure crate; + in + runCommand "assert-useClippyDenyFails" { inherit failed; } '' + grep -q 'clippy::eq.op' "$failed/testBuildFailure.log" + grep -q 'equal expressions' "$failed/testBuildFailure.log" + touch $out + ''; + + # `useClippy = true` with the default `capLints` (which resolves to + # `"allow"` when `lints` is empty) must still build: the cap silences + # clippy lints just like rustc lints. Same source as the failing test + # above — only the `lints` table differs. + useClippyDefaultCapAllows = mkHostCrate { + crateName = "useClippyDefaultCapAllows"; + useClippy = true; + src = mkFile "src/lib.rs" '' + pub fn check() -> bool { + 1 == 1 + } + ''; + }; + + # A library compiled by clippy-driver must produce an `.rlib` that a + # plain-rustc dependent can link against and run. This is the property + # that makes `useClippy` safe to flip per-crate. + useClippyRlibLinkCompat = + let + libCrate = mkHostCrate { + crateName = "clippylib"; + useClippy = true; + src = mkFile "src/lib.rs" '' + pub fn test() -> i32 { + 23 + } + ''; + }; + binCrate = mkHostCrate { + crateName = "clippybin"; + dependencies = [ libCrate ]; + src = mkBinExtern "src/main.rs" "clippylib"; + }; + in + runCommand "run-useClippyRlibLinkCompat" { nativeBuildInputs = [ binCrate ]; } ( + if stdenv.hostPlatform == stdenv.buildPlatform then + '' + ${binCrate}/bin/clippybin && touch $out + '' + else + '' + test -x '${binCrate}/bin/clippybin' && touch $out + '' + ); + rcgenTest = let pkg = rcgenCrates.rootCrate.build; diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index c28fe180c3e2..8e43bfa98173 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -15,6 +15,7 @@ fontconfig, foundationdb, freetype, + fuse3, gdk-pixbuf, glib, gmp, @@ -43,6 +44,7 @@ udev, webkitgtk_4_1, zlib, + zstd, buildPackages, ... }: @@ -146,6 +148,11 @@ buildInputs = [ freetype ]; }; + fuser = attrs: { + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ fuse3 ]; + }; + glib-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ glib ]; @@ -392,6 +399,12 @@ buildInputs = [ python3 ]; }; + zstd-sys = attrs: { + ZSTD_SYS_USE_PKG_CONFIG = true; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ zstd ]; + }; + atk-sys = attrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ atk ]; diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py b/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py deleted file mode 100644 index 5dc789c93ad9..000000000000 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util-v2.py +++ /dev/null @@ -1,416 +0,0 @@ -import functools -import hashlib -import json -import multiprocessing as mp -import re -import shutil -import subprocess -import sys -import tomllib -from os.path import islink, realpath -from pathlib import Path -from typing import Any, TypedDict, cast -from urllib.parse import unquote - -import requests -import tomli_w -from requests.adapters import HTTPAdapter, Retry - -eprint = functools.partial(print, file=sys.stderr) - - -def load_toml(path: Path) -> dict[str, Any]: - with open(path, "rb") as f: - return tomllib.load(f) - - -def get_lockfile_version(cargo_lock_toml: dict[str, Any]) -> int: - # lockfile v1 and v2 don't have the `version` key, so assume v2 - version = cargo_lock_toml.get("version", 2) - - # TODO: add logic for differentiating between v1 and v2 - - return version - - -def create_http_session() -> requests.Session: - retries = Retry( - total=5, - backoff_factor=0.5, - status_forcelist=[500, 502, 503, 504] - ) - session = requests.Session() - session.headers["User-Agent"] = "nixpkgs-fetchCargoVendor/2 (https://github.com/NixOS/nixpkgs)" - session.mount('http://', HTTPAdapter(max_retries=retries)) - session.mount('https://', HTTPAdapter(max_retries=retries)) - return session - - -def download_file_with_checksum(session: requests.Session, url: str, destination_path: Path) -> str: - sha256_hash = hashlib.sha256() - with session.get(url, stream=True) as response: - if not response.ok: - raise Exception(f"Failed to fetch file from {url}. Status code: {response.status_code}") - with open(destination_path, "wb") as file: - for chunk in response.iter_content(1024): # Download in chunks - if chunk: # Filter out keep-alive chunks - file.write(chunk) - sha256_hash.update(chunk) - - # Compute the final checksum - checksum = sha256_hash.hexdigest() - return checksum - - -def get_download_url_for_tarball(pkg: dict[str, Any]) -> str: - # TODO: support other registries - # maybe fetch config.json from the registry root and get the dl key - # See: https://doc.rust-lang.org/cargo/reference/registry-index.html#index-configuration - if pkg["source"] != "registry+https://github.com/rust-lang/crates.io-index": - raise Exception("Only the default crates.io registry is supported.") - - # Use static.crates.io (CDN) instead of crates.io/api to avoid the 1 req/sec - # rate limit on the API servers. - return f"https://static.crates.io/crates/{pkg["name"]}/{pkg["version"]}/download" - - -def download_tarball(session: requests.Session, pkg: dict[str, Any], out_dir: Path) -> None: - - url = get_download_url_for_tarball(pkg) - filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz" - - # TODO: allow legacy checksum specification, see importCargoLock for example - # also, don't forget about the other usage of the checksum - expected_checksum = pkg["checksum"] - - tarball_out_dir = out_dir / "tarballs" / filename - eprint(f"Fetching {url} -> tarballs/{filename}") - - calculated_checksum = download_file_with_checksum(session, url, tarball_out_dir) - - if calculated_checksum != expected_checksum: - raise Exception(f"Hash mismatch! File fetched from {url} had checksum {calculated_checksum}, expected {expected_checksum}.") - - -def download_git_tree(url: str, git_sha_rev: str, out_dir: Path) -> None: - - tree_out_dir = out_dir / "git" / git_sha_rev - eprint(f"Fetching {url}#{git_sha_rev} -> git/{git_sha_rev}") - - cmd = ["nix-prefetch-git", "--builder", "--quiet", "--fetch-submodules", "--url", url, "--rev", git_sha_rev, "--out", str(tree_out_dir)] - subprocess.check_output(cmd) - - -GIT_SOURCE_REGEX = re.compile("git\\+(?P[^?]+)(\\?(?Prev|tag|branch)=(?P.*))?#(?P.*)") - - -class GitSourceInfo(TypedDict): - url: str - type: str | None - value: str | None - git_sha_rev: str - - -def parse_git_source(source: str, lockfile_version: int) -> GitSourceInfo: - match = GIT_SOURCE_REGEX.match(source) - if match is None: - raise Exception(f"Unable to process git source: {source}.") - - source_info = cast(GitSourceInfo, match.groupdict(default=None)) - - # the source URL is URL-encoded in lockfile_version >=4 - # since we just used regex to parse it we have to manually decode the escaped branch/tag name - if lockfile_version >= 4 and source_info["value"] is not None: - source_info["value"] = unquote(source_info["value"]) - - return source_info - - -def create_vendor_staging(lockfile_path: Path, out_dir: Path) -> None: - cargo_lock_toml = load_toml(lockfile_path) - lockfile_version = get_lockfile_version(cargo_lock_toml) - - git_packages: list[dict[str, Any]] = [] - registry_packages: list[dict[str, Any]] = [] - - for pkg in cargo_lock_toml["package"]: - # ignore local dependenices - if "source" not in pkg.keys(): - eprint(f"Skipping local dependency: {pkg["name"]}") - continue - source = pkg["source"] - - if source.startswith("git+"): - git_packages.append(pkg) - elif source.startswith("registry+"): - registry_packages.append(pkg) - else: - raise Exception(f"Can't process source: {source}.") - - git_sha_rev_to_url: dict[str, str] = {} - for pkg in git_packages: - source_info = parse_git_source(pkg["source"], lockfile_version) - git_sha_rev_to_url[source_info["git_sha_rev"]] = source_info["url"] - - out_dir.mkdir(exist_ok=True) - shutil.copy(lockfile_path, out_dir / "Cargo.lock") - - # fetch git trees sequentially, since fetching concurrently leads to flaky behaviour - if len(git_packages) != 0: - (out_dir / "git").mkdir() - for git_sha_rev, url in git_sha_rev_to_url.items(): - download_git_tree(url, git_sha_rev, out_dir) - - # run tarball download jobs in parallel, with at most 5 concurrent download jobs - with mp.Pool(min(5, mp.cpu_count())) as pool: - if len(registry_packages) != 0: - (out_dir / "tarballs").mkdir() - session = create_http_session() - tarball_args_gen = ((session, pkg, out_dir) for pkg in registry_packages) - pool.starmap(download_tarball, tarball_args_gen) - - -def get_manifest_metadata(manifest_path: Path) -> dict[str, Any]: - cmd = ["cargo", "metadata", "--format-version", "1", "--no-deps", "--manifest-path", str(manifest_path)] - output = subprocess.check_output(cmd) - return json.loads(output) - - -def try_get_crate_manifest_path_from_manifest_path(manifest_path: Path, crate_name: str) -> Path | None: - try: - metadata = get_manifest_metadata(manifest_path) - except subprocess.CalledProcessError: - eprint(f"Warning: cargo metadata failed for {manifest_path}, skipping") - return None - - for pkg in metadata["packages"]: - if pkg["name"] == crate_name: - return Path(pkg["manifest_path"]) - - return None - - -def find_crate_manifest_in_tree(tree: Path, crate_name: str) -> Path: - # Scan all Cargo.toml files; sort by depth/path to make ordering deterministic - # and prefer less-nested manifests first. - manifest_paths = sorted( - tree.glob("**/Cargo.toml"), - key=lambda path: (len(path.parts), str(path)), - ) - - for manifest_path in manifest_paths: - res = try_get_crate_manifest_path_from_manifest_path(manifest_path, crate_name) - if res is not None: - return res - - raise Exception(f"Couldn't find manifest for crate {crate_name} inside {tree}.") - - -def copy_and_patch_git_crate_subtree(git_tree: Path, crate_name: str, crate_out_dir: Path) -> None: - - # This function will get called by copytree to decide which entries of a directory should be copied - # We'll copy everything except symlinks that are invalid - def ignore_func(dir_str: str, path_strs: list[str]) -> list[str]: - ignorelist: list[str] = [] - - dir = Path(realpath(dir_str, strict=True)) - - for path_str in path_strs: - path = dir / path_str - if not islink(path): - continue - - # Filter out cyclic symlinks and symlinks pointing at nonexistant files - try: - target_path = Path(realpath(path, strict=True)) - except OSError: - ignorelist.append(path_str) - eprint(f"Failed to resolve symlink, ignoring: {path}") - continue - - # Filter out symlinks that point outside of the current crate's base git tree - # This can be useful if the nix build sandbox is turned off and there is a symlink to a common absolute path - if not target_path.is_relative_to(git_tree): - ignorelist.append(path_str) - eprint(f"Symlink points outside of the crate's base git tree, ignoring: {path} -> {target_path}") - continue - - return ignorelist - - crate_manifest_path = find_crate_manifest_in_tree(git_tree, crate_name) - crate_tree = crate_manifest_path.parent - - eprint(f"Copying to {crate_out_dir}") - shutil.copytree(crate_tree, crate_out_dir, ignore=ignore_func) - crate_out_dir.chmod(0o755) - - with open(crate_manifest_path, "r") as f: - manifest_data = f.read() - - if "workspace" in manifest_data: - crate_manifest_metadata = get_manifest_metadata(crate_manifest_path) - workspace_root = Path(crate_manifest_metadata["workspace_root"]) - - root_manifest_path = workspace_root / "Cargo.toml" - manifest_path = crate_out_dir / "Cargo.toml" - - manifest_path.chmod(0o644) - eprint(f"Patching {manifest_path}") - - cmd = ["replace-workspace-values", str(manifest_path), str(root_manifest_path)] - subprocess.check_output(cmd) - - -def extract_crate_tarball_contents(tarball_path: Path, crate_out_dir: Path) -> None: - eprint(f"Unpacking to {crate_out_dir}") - crate_out_dir.mkdir() - cmd = ["tar", "xf", str(tarball_path), "-C", str(crate_out_dir), "--strip-components=1"] - subprocess.check_output(cmd) - - -def make_git_source_selector(source_info: GitSourceInfo) -> dict[str, str]: - selector = {} - selector["git"] = source_info["url"] - if source_info["type"] is not None: - selector[source_info["type"]] = source_info["value"] - return selector - - -def make_registry_source_selector(source: str) -> dict[str, str]: - registry = source[9:] if source.startswith("registry+") else source - selector = {} - selector["registry"] = registry - return selector - - -def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: - lockfile_path = vendor_staging_dir / "Cargo.lock" - out_dir.mkdir(exist_ok=True) - shutil.copy(lockfile_path, out_dir / "Cargo.lock") - - cargo_lock_toml = load_toml(lockfile_path) - lockfile_version = get_lockfile_version(cargo_lock_toml) - - source_to_ind: dict[str, str] = {} - source_config = {} - next_registry_ind = 0 - next_git_ind = 0 - - def add_source_replacement( - orig_key: str, - orig_selector: dict[str, str], - vendored_key: str, - vendored_dir: str - ) -> None: - source_config[vendored_key] = {} - source_config[vendored_key]["directory"] = vendored_dir - source_config[orig_key] = orig_selector - source_config[orig_key]["replace-with"] = vendored_key - - # we reserve registry index 0 for crates-io - source_to_ind["registry+https://github.com/rust-lang/crates.io-index"] = "registry-0" - source_to_ind["sparse+https://index.crates.io/"] = "registry-0" - add_source_replacement( - orig_key="crates-io", - orig_selector={}, # there is an internal selector defined for the `crates-io` source - vendored_key="vendored-source-registry-0", - vendored_dir="@vendor@/source-registry-0" - ) - next_registry_ind += 1 - - for pkg in cargo_lock_toml["package"]: - # ignore local dependencies - if "source" not in pkg.keys(): - continue - source: str = pkg["source"] - if source in source_to_ind: - continue - - if source.startswith("git+"): - ind = f"git-{next_git_ind}" - next_git_ind += 1 - source_info = parse_git_source(source, lockfile_version) - selector = make_git_source_selector(source_info) - elif source.startswith("registry+") or source.startswith("sparse+"): - ind = f"registry-{next_registry_ind}" - next_registry_ind += 1 - selector = make_registry_source_selector(source) - else: - raise Exception(f"Can't process source: {source}.") - - source_to_ind[source] = ind - add_source_replacement( - orig_key=f"original-source-{ind}", - orig_selector=selector, - vendored_key=f"vendored-source-{ind}", - vendored_dir=f"@vendor@/source-{ind}" - ) - - config_path = out_dir / ".cargo" / "config.toml" - config_path.parent.mkdir() - - with open(config_path, "wb") as config_file: - tomli_w.dump({"source": source_config}, config_file) - - for pkg in cargo_lock_toml["package"]: - - # ignore local dependenices - if "source" not in pkg.keys(): - continue - - source: str = pkg["source"] - source_ind = source_to_ind[source] - crate_dir_name = f"{pkg["name"]}-{pkg["version"]}" - source_dir_name = f"source-{source_ind}" - crate_out_dir = out_dir / source_dir_name / crate_dir_name - crate_out_dir.parent.mkdir(exist_ok=True) - - if source.startswith("git+"): - - source_info = parse_git_source(source, lockfile_version) - - git_sha_rev = source_info["git_sha_rev"] - git_tree = vendor_staging_dir / "git" / git_sha_rev - - copy_and_patch_git_crate_subtree(git_tree, pkg["name"], crate_out_dir) - - # git based crates allow having no checksum information - with open(crate_out_dir / ".cargo-checksum.json", "w") as f: - json.dump({"files": {}}, f) - - elif source.startswith("registry+") or source.startswith("sparse+"): - filename = f"{pkg["name"]}-{pkg["version"]}.tar.gz" - - # TODO: change this when non-crates-io registries are supported - dir_name = "tarballs" - - tarball_path = vendor_staging_dir / dir_name / filename - - extract_crate_tarball_contents(tarball_path, crate_out_dir) - - # non-git based crates need the package checksum at minimum - with open(crate_out_dir / ".cargo-checksum.json", "w") as f: - json.dump({"files": {}, "package": pkg["checksum"]}, f) - - else: - raise Exception(f"Can't process source: {source}.") - - -def main() -> None: - subcommand = sys.argv[1] - - subcommand_func_dict = { - "create-vendor-staging": lambda: create_vendor_staging(lockfile_path=Path(sys.argv[2]), out_dir=Path(sys.argv[3])), - "create-vendor": lambda: create_vendor(vendor_staging_dir=Path(sys.argv[2]), out_dir=Path(sys.argv[3])) - } - - subcommand_func = subcommand_func_dict.get(subcommand) - - if subcommand_func is None: - raise Exception(f"Unknown subcommand: '{subcommand}'. Must be one of {list(subcommand_func_dict.keys())}") - - subcommand_func() - - -if __name__ == "__main__": - main() diff --git a/pkgs/build-support/rust/fetch-cargo-vendor-util.py b/pkgs/build-support/rust/fetch-cargo-vendor-util.py index 3bee7e150c8e..825f07b175ee 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor-util.py +++ b/pkgs/build-support/rust/fetch-cargo-vendor-util.py @@ -40,6 +40,7 @@ def create_http_session() -> requests.Session: status_forcelist=[500, 502, 503, 504] ) session = requests.Session() + session.headers["User-Agent"] = "nixpkgs-fetchCargoVendor/2 (https://github.com/NixOS/nixpkgs)" session.mount('http://', HTTPAdapter(max_retries=retries)) session.mount('https://', HTTPAdapter(max_retries=retries)) return session @@ -68,7 +69,9 @@ def get_download_url_for_tarball(pkg: dict[str, Any]) -> str: if pkg["source"] != "registry+https://github.com/rust-lang/crates.io-index": raise Exception("Only the default crates.io registry is supported.") - return f"https://crates.io/api/v1/crates/{pkg["name"]}/{pkg["version"]}/download" + # Use static.crates.io (CDN) instead of crates.io/api to avoid the 1 req/sec + # rate limit on the API servers. + return f"https://static.crates.io/crates/{pkg["name"]}/{pkg["version"]}/download" def download_tarball(session: requests.Session, pkg: dict[str, Any], out_dir: Path) -> None: @@ -289,6 +292,7 @@ def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: lockfile_version = get_lockfile_version(cargo_lock_toml) source_to_ind: dict[str, str] = {} + selector_to_ind: dict[tuple, str] = {} source_config = {} next_registry_ind = 0 next_git_ind = 0 @@ -324,24 +328,35 @@ def create_vendor(vendor_staging_dir: Path, out_dir: Path) -> None: continue if source.startswith("git+"): - ind = f"git-{next_git_ind}" - next_git_ind += 1 source_info = parse_git_source(source, lockfile_version) selector = make_git_source_selector(source_info) + selector_key = (source_info["url"], source_info["type"], source_info["value"]) + if selector_key in selector_to_ind: + ind = selector_to_ind[selector_key] + else: + ind = f"git-{next_git_ind}" + next_git_ind += 1 + selector_to_ind[selector_key] = ind + add_source_replacement( + orig_key=f"original-source-{ind}", + orig_selector=selector, + vendored_key=f"vendored-source-{ind}", + vendored_dir=f"@vendor@/source-{ind}" + ) elif source.startswith("registry+") or source.startswith("sparse+"): ind = f"registry-{next_registry_ind}" next_registry_ind += 1 selector = make_registry_source_selector(source) + add_source_replacement( + orig_key=f"original-source-{ind}", + orig_selector=selector, + vendored_key=f"vendored-source-{ind}", + vendored_dir=f"@vendor@/source-{ind}" + ) else: raise Exception(f"Can't process source: {source}.") source_to_ind[source] = ind - add_source_replacement( - orig_key=f"original-source-{ind}", - orig_selector=selector, - vendored_key=f"vendored-source-{ind}", - vendored_dir=f"@vendor@/source-{ind}" - ) config_path = out_dir / ".cargo" / "config.toml" config_path.parent.mkdir() diff --git a/pkgs/build-support/rust/fetch-cargo-vendor.nix b/pkgs/build-support/rust/fetch-cargo-vendor.nix index 2802bf9e73f1..37a37f7b7bd2 100644 --- a/pkgs/build-support/rust/fetch-cargo-vendor.nix +++ b/pkgs/build-support/rust/fetch-cargo-vendor.nix @@ -3,7 +3,7 @@ stdenvNoCC, runCommand, writers, - python3Packages, + python3, cargo, gitMinimal, nix-prefetch-git, @@ -11,6 +11,16 @@ }: let + python = python3.override { + self = python; + packageOverrides = final: prev: { + # The ast-serialize package, a dependency for mypy, depends on + # fetchCargoVendor and is part of the bootstrap chain for requests. + charset-normalizer = prev.charset-normalizer.override { withMypyc = false; }; + }; + }; + python3Packages = python.pkgs; + replaceWorkspaceValues = writers.writePython3Bin "replace-workspace-values" { libraries = with python3Packages; [ tomli @@ -37,29 +47,18 @@ let "hash" ]; - mkFetchCargoVendorUtil = - name: src: - writers.writePython3Bin name { - libraries = - with python3Packages; - [ - requests - tomli-w - ] - ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests - flakeIgnore = [ - "E501" - ]; - } (builtins.readFile src); - - # Separate util used only by the FOD `vendorStaging` stage below. Kept - # distinct from fetchCargoVendorUtil so that changes to the network-facing - # bits (User-Agent, download URL) don't invalidate the input-addressed - # `-vendor` stage and force a mass rebuild of every Rust package in nixpkgs. - # vendorStaging is an FOD, so swapping its util is free for consumers. - # TODO: unify with fetchCargoVendorUtil on the next `staging` cycle. - fetchCargoVendorUtilV2 = mkFetchCargoVendorUtil "fetch-cargo-vendor-util-v2" ./fetch-cargo-vendor-util-v2.py; - fetchCargoVendorUtil = mkFetchCargoVendorUtil "fetch-cargo-vendor-util" ./fetch-cargo-vendor-util.py; + fetchCargoVendorUtil = writers.writePython3Bin "fetch-cargo-vendor-util" { + libraries = + with python3Packages; + [ + requests + tomli-w + ] + ++ requests.optional-dependencies.socks; # to support socks proxy envs like ALL_PROXY in requests + flakeIgnore = [ + "E501" + ]; + } (builtins.readFile ./fetch-cargo-vendor-util.py); in { @@ -79,7 +78,7 @@ let impureEnvVars = lib.fetchers.proxyImpureEnvVars; nativeBuildInputs = [ - fetchCargoVendorUtilV2 + fetchCargoVendorUtil cacert nix-prefetch-git' ] @@ -92,7 +91,7 @@ let cd "$cargoRoot" fi - fetch-cargo-vendor-util-v2 create-vendor-staging ./Cargo.lock "$out" + fetch-cargo-vendor-util create-vendor-staging ./Cargo.lock "$out" runHook postBuild ''; diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 0fb5aac50a7a..023ae4ce1a8c 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -3,6 +3,8 @@ # assertExecutable FILE assertExecutable() { local file="$1" + [[ -e "$file" ]] || \ + die "Cannot wrap '$file' because it does not exist" [[ -f "$file" && -x "$file" ]] || \ die "Cannot wrap '$file' because it is not an executable file" } diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix index 73c2782cfe07..7212578e7405 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/default.nix @@ -76,7 +76,136 @@ makeSetupHook { ]; }; - # The wrapper for executable files should add path to dconf GIO module. + # Simple derivation containing a program and a daemon, but split over multiple outputs. + basic-multiple-outputs = stdenv.mkDerivation { + name = "basic-multiple-outputs"; + + src = sample-project; + + outputs = [ + "out" + "lib" + ]; + + strictDeps = true; + nativeBuildInputs = [ wrapGAppsHook3 ]; + + installFlags = [ + "bin-foo" + "libexec-bar" + ]; + + postInstall = '' + mkdir -p $lib + mv $out/libexec $lib + # Wrapper will want to append this to XDG_DATA_DIRS, but should not cause a cyclic dependency; + # i.e. only "out" will be wrapped. + mkdir -p $out/share + ''; + }; + + # Simple derivation containing a program and a daemon, but using a non-default output + # Executables in "bin" should be handled correctly automatically + basic-bin-output = stdenv.mkDerivation { + name = "basic-bin-output"; + + src = sample-project; + + outputs = [ + "bin" + "dev" + "lib" + "out" + ]; + + strictDeps = true; + nativeBuildInputs = [ wrapGAppsHook3 ]; + + installFlags = [ + "bin-foo" + "libexec-bar" + ]; + + postInstall = '' + mkdir -p $lib + mv $out/libexec $lib + mkdir -p $bin + mv $out/bin $bin + ''; + }; + + # Simple derivation containing a program and a daemon, but using a non-default output + basic-other-outputs = stdenv.mkDerivation { + name = "basic-other-outputs"; + + src = sample-project; + + outputs = [ + "dev" + "lib" + "out" + ]; + + strictDeps = true; + nativeBuildInputs = [ wrapGAppsHook3 ]; + + installFlags = [ + "bin-foo" + "libexec-bar" + ]; + + wrapGAppsInOutputs = [ + "dev" + "lib" + ]; + + postInstall = '' + mkdir -p $lib + mv $out/libexec $lib + mkdir -p $dev + mv $out/bin $dev + ''; + }; + + # Simple derivation containing a program and a daemon, but using non-default outputs + # that are explicitly referenced via wrapGAppsInOutputs + basic-other-outputs-structuredattrs = stdenv.mkDerivation { + name = "basic-other-outputs-structuredAttrs"; + + __structuredAttrs = true; + + src = sample-project; + + outputs = [ + "dev" + "lib" + "out" + ]; + + strictDeps = true; + nativeBuildInputs = [ wrapGAppsHook3 ]; + + installFlags = [ + "bin-foo" + "libexec-bar" + ]; + + wrapGAppsInOutputs = [ + "dev" + "lib" + ]; + + postInstall = '' + mkdir -p $lib + mv $out/libexec $lib + mkdir -p $dev + mv $out/bin $dev + ''; + }; + + # Simple derivation containing a program and a daemon, but using non-default outputs + # that are explicitly referenced via wrapGAppsInOutputs, while structuredAttrs are enabled + # so that it is a proper array. basic-contains-dconf = let tested = basic; @@ -92,6 +221,64 @@ makeSetupHook { '' ); + # The wrapper for executable files should add path to dconf GIO module. + basic-multiple-outputs-contains-dconf = + let + tested = basic-multiple-outputs; + in + testLib.runTest "basic-multiple-outputs-contains-dconf" ( + testLib.skip stdenv.hostPlatform.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + '' + ); + + # The wrapper for executable files should add path to dconf GIO module. + basic-bin-output-contains-dconf = + let + tested = basic-bin-output; + in + testLib.runTest "basic-bin-output-contains-dconf" ( + testLib.skip stdenv.hostPlatform.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested}/bin/foo" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + '' + ); + + # The wrapper for executable files should add path to dconf GIO module. + basic-other-outputs-contains-dconf = + let + tested = basic-other-outputs; + in + testLib.runTest "basic-other-outputs-contains-dconf" ( + testLib.skip stdenv.hostPlatform.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested.dev}/bin/foo" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + ${expectSomeLineContainingYInFileXToMentionZ "${tested.lib}/libexec/bar" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + '' + ); + + # The wrapper for executable files should add path to dconf GIO module. + basic-other-outputs-contains-dconf-structuredattrs = + let + tested = basic-other-outputs-structuredattrs; + in + testLib.runTest "basic-other-outputs-structuredattrs-contains-dconf" ( + testLib.skip stdenv.hostPlatform.isDarwin '' + ${expectSomeLineContainingYInFileXToMentionZ "${tested.dev}/bin/foo" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + ${expectSomeLineContainingYInFileXToMentionZ "${tested.lib}/libexec/bar" "GIO_EXTRA_MODULES" + "${dconf.lib}/lib/gio/modules" + } + '' + ); + basic-contains-gdk-pixbuf = let tested = basic; diff --git a/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh index 7487dabd5aad..ef2c02dff02e 100644 --- a/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh +++ b/pkgs/build-support/setup-hooks/wrap-gapps-hook/wrap-gapps-hook.sh @@ -42,13 +42,36 @@ wrapGApp() { wrapProgram "$program" "${gappsWrapperArgs[@]}" "$@" } +_wrapGAppsHookMayRunForOutput() { + local -r output="$1" + if [[ -v wrapGAppsInOutputs ]]; then + local allowedOutput + # Support both structuredAttrs on and off + local -a allowedOutputs + concatTo allowedOutputs wrapGAppsInOutputs + for allowedOutput in "${allowedOutputs[@]}"; do + [ "$allowedOutput" = "$output" ] && return 0 + done + else + [ "$outputBin" = "$output" ] && return 0 + fi + return 1 + } + +declare -gA wrapGAppsHookHasRunForOutput + # Note: $gappsWrapperArgs still gets defined even if ${dontWrapGApps-} is set. +# $output is brought into scope via fixupPhase() in pkgs/stdenv/generic/setup.sh wrapGAppsHook() { - # guard against running multiple times (e.g. due to propagation) - [ -z "$wrapGAppsHookHasRun" ] || return 0 - wrapGAppsHookHasRun=1 + # guard against running multiple times for the same output (e.g. due to propagation) + [ "${wrapGAppsHookHasRunForOutput["$output"]:-}" = 1 ] && return 0 + wrapGAppsHookHasRunForOutput["$output"]=1 + # guard against running for outputs we don't want to run it for + _wrapGAppsHookMayRunForOutput "$output" || return 0 if [[ -z "${dontWrapGApps:-}" ]]; then + local targetDirsThatExist targetDirsRealPath targetDirs targetDir + targetDirsThatExist=() targetDirsRealPath=() @@ -69,6 +92,7 @@ wrapGAppsHook() { # wrap links to binaries that point outside targetDirs # Note: links to binaries within targetDirs do not need # to be wrapped as the binaries have already been wrapped + local linkPathReal targetPath if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 | while IFS= read -r -d '' linkPath; do diff --git a/pkgs/build-support/teleport/default.nix b/pkgs/build-support/teleport/default.nix index d696a6243627..8d51876e536a 100644 --- a/pkgs/build-support/teleport/default.nix +++ b/pkgs/build-support/teleport/default.nix @@ -10,7 +10,7 @@ nodejs, openssl, pkg-config, - pnpm_10_29_2, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, rustc, @@ -81,7 +81,7 @@ let pname version ; - pnpm = pnpm_10_29_2; + pnpm = pnpm_10; fetcherVersion = 3; hash = pnpmHash; }; @@ -91,7 +91,7 @@ let cargo nodejs pnpmConfigHook - pnpm_10_29_2 + pnpm_10 rustc rustc.llvmPackages.lld rustPlatform.cargoSetupHook diff --git a/pkgs/build-support/testers/default.nix b/pkgs/build-support/testers/default.nix index 4dca26274747..5d9f568d2ed3 100644 --- a/pkgs/build-support/testers/default.nix +++ b/pkgs/build-support/testers/default.nix @@ -260,4 +260,6 @@ shellcheck = callPackage ./shellcheck/tester.nix { }; shfmt = callPackage ./shfmt { }; + + modularServiceCompliance = callPackage ./modular-service-compliance.nix { }; } diff --git a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix index b0053820a3d2..b0b76f1e70d0 100644 --- a/pkgs/build-support/testers/hasPkgConfigModules/tester.nix +++ b/pkgs/build-support/testers/hasPkgConfigModules/tester.nix @@ -30,7 +30,7 @@ runCommand testName broken = throw "unused"; insecure = throw "unused"; license = throw "unused"; - maintainers = throw "unused"; + nonTeamMaintainers = throw "unused"; teams = throw "unused"; platforms = throw "unused"; unfree = throw "unused"; diff --git a/pkgs/build-support/testers/modular-service-compliance.nix b/pkgs/build-support/testers/modular-service-compliance.nix new file mode 100644 index 000000000000..2349e9e96a8f --- /dev/null +++ b/pkgs/build-support/testers/modular-service-compliance.nix @@ -0,0 +1,371 @@ +{ + lib, + coreutils, + gnugrep, + writeShellScript, + writeShellApplication, + stdenvNoCC, +}: + +/** + See https://nixos.org/manual/nixpkgs/unstable/#tester-modularServiceCompliance + or doc/build-helpers/testers.chapter.md +*/ +{ + evalConfig, + mkTest, + sharedDir, + callReload, + namePrefix ? "modular-service-compliance", +}: + +let + + /** + A successful evaluation to be probed by evalTestDefs + */ + # Try use only few evalConfig calls for performance. + evalResult = evalConfig { + services = { + svc = { + process.argv = [ "${coreutils}/bin/true" ]; + assertions = [ + { + assertion = true; + message = "compliance test assertion"; + } + ]; + warnings = [ "compliance test warning" ]; + services.child = { + process.argv = [ "${coreutils}/bin/true" ]; + assertions = [ + { + assertion = true; + message = "compliance child assertion"; + } + ]; + warnings = [ "compliance child warning" ]; + }; + # A sub-service exercising reload derivation from a reload signal. + services.reloadee = { + process.argv = [ "${coreutils}/bin/true" ]; + process.reloadSignal = "HUP"; + }; + }; + }; + }; + + evalTestDefs = + let + c = evalResult.config.svc; + in + { + testProcessArgv = { + expr = c.process.argv; + expected = [ "${coreutils}/bin/true" ]; + }; + + testSubServiceArgv = { + expr = c.services.child.process.argv; + expected = [ "${coreutils}/bin/true" ]; + }; + + testAssertions = { + expr = lib.elem { + assertion = true; + message = "compliance test assertion"; + } c.assertions; + expected = true; + }; + + testWarnings = { + expr = lib.elem "compliance test warning" c.warnings; + expected = true; + }; + + testSubServiceAssertions = { + expr = lib.elem { + assertion = true; + message = "compliance child assertion"; + } c.services.child.assertions; + expected = true; + }; + + testSubServiceWarnings = { + expr = lib.elem "compliance child warning" c.services.child.warnings; + expected = true; + }; + + # The reload-conflict assertion must not fire (its `assertion` must hold) for a + # service that sets only reloadSignal (guards the inverted-assertion fix, and the + # priority-aware conflict detection: reloadSignal derives reloadCommand internally, + # which must not be mistaken for a user-set conflict). + testNoReloadConflict = { + expr = lib.any ( + a: + a.message + == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand." + && !a.assertion + ) c.services.reloadee.assertions; + expected = false; + }; + + # Setting process.reloadSignal derives process.reloadCommand + # (guards the misplaced-paren mkIf fix). + testReloadSignalDerivesCommand = { + expr = c.services.reloadee.process.reloadCommand; + expected = "${coreutils}/bin/kill -HUP $MAINPID"; + }; + + # notificationProtocol submodule bools default to false. + testNotificationProtocolSystemdDefault = { + expr = c.notificationProtocol.systemd; + expected = false; + }; + + testNotificationProtocolS6Default = { + expr = c.notificationProtocol.s6; + expected = false; + }; + + # Setting both reloadSignal and reloadCommand explicitly is a genuine conflict, + # so the assertion must fire. Separate eval: checkDrv would fail on this. + testReloadConflictFires = { + expr = lib.any ( + a: + a.message + == "reloadSignal conflicts with reloadCommand. Please either use reloadSignal or reloadCommand." + && !a.assertion + ) conflictEval.config.conflict.assertions; + expected = true; + }; + + # Separate eval for a failing assertion — checkDrv would fail here, + # so we only access config. + testFailingAssertionValue = { + expr = lib.elem { + assertion = false; + message = "compliance failing assertion"; + } failingEval.config.failing.assertions; + expected = true; + }; + }; + + conflictEval = evalConfig { + services = { + conflict = { + process.argv = [ "${coreutils}/bin/true" ]; + process.reloadSignal = "HUP"; + process.reloadCommand = "${coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; + + failingEval = evalConfig { + services = { + failing = { + process.argv = [ "${coreutils}/bin/true" ]; + assertions = [ + { + assertion = false; + message = "compliance failing assertion"; + } + ]; + }; + }; + }; + + /** + A service script that records its received arguments, then sleeps forever. + The first argument is a service identifier used to namespace its comms + subdirectory; the remaining arguments are recorded as the service's args. + */ + svc = writeShellScript "${namePrefix}-svc" '' + id="$1"; shift + dir="${sharedDir}/$id" + mkdir -p "$dir" + echo "$$" > "$dir/pid" + printf '%s\n' "$@" > "$dir/args" + exec "${coreutils}/bin/sleep" infinity + ''; + + /** + A reloadable service script. Like `svc`, it namespaces a comms subdirectory + by its first argument and records the remaining arguments. It traps SIGHUP + and appends a marker line to `$dir/reloads` on each reload, then stays alive + as the trapping shell itself (no `exec`, so the trap and MAINPID are kept). + */ + reloadableSvc = writeShellScript "${namePrefix}-reloadable-svc" '' + id="$1"; shift + dir="${sharedDir}/$id" + mkdir -p "$dir" + : > "$dir/reloads" + reload() { printf 'reloaded\n' >> "$dir/reloads"; } + trap reload HUP + echo "$$" > "$dir/pid" + printf '%s\n' "$@" > "$dir/args" + while true; do "${coreutils}/bin/sleep" 1; done + ''; + + mkArgv = + id: extraArgs: + [ + svc + id + ] + ++ extraArgs; + + /** + Shell snippet: wait for a service to write its pid file, verify the + process is still alive, then check that each expected argument appears + in the recorded args file. + */ + waitAndCheck = + id: expectedArgs: + '' + echo "waiting for ${id}..." + timeout=30; elapsed=0 + while [ ! -f "${sharedDir}/${id}/pid" ] && [ "$elapsed" -lt "$timeout" ]; do + sleep 1; elapsed=$((elapsed + 1)) + done + test -f "${sharedDir}/${id}/pid" || { echo "${id}: no pid file after ''${timeout}s"; exit 1; } + pid=$(cat "${sharedDir}/${id}/pid") + kill -0 "$pid" || { echo "${id}: pid $pid is not running"; exit 1; } + echo "${id}: started (pid $pid)" + '' + + lib.concatMapStrings (arg: '' + grep -qxF -- ${lib.escapeShellArg arg} "${sharedDir}/${id}/args" \ + || { echo "${id}: expected arg ${lib.escapeShellArg arg} not found"; cat "${sharedDir}/${id}/args"; exit 1; } + '') expectedArgs; + + mkTestScript = + name: text: + lib.getExe (writeShellApplication { + name = "${namePrefix}-${name}"; + runtimeInputs = [ + coreutils + gnugrep + ]; + inherit text; + }); + + # The reload runtime test's service tree. The reloadable unit is the *sub*-service, + # so its name path `[ "reload" "inner" ]` handed to `callReload` exercises the + # integration's nested unit naming (NixOS dash-joins to `reload-inner.service`). + reloadServices = { + reload = { + # Parent must run something; a bare keep-alive is enough. + process.argv = [ + reloadableSvc + "reload-parent" + ]; + services.inner.process = { + argv = [ + reloadableSvc + "reload-inner" + ]; + # The script traps SIGHUP; reloadSignal derives the manager's reload command. + reloadSignal = "HUP"; + }; + }; + }; + +in +{ + # Eval-level tests: config structure, evaluated in the integration's + # full context (one whole-system eval). + # TODO: generalize with + # - pkgs/test/buildenv.nix + # - pkgs/test/overriding.nix + eval = stdenvNoCC.mkDerivation (finalAttrs: { + __structuredAttrs = true; + name = "${namePrefix}-eval-report"; + # Depend on the integration's representative derivation to prove that + # the system builds with these services. + representative = evalResult.checkDrv; + passthru = { + tests = evalTestDefs; + failures = lib.runTests finalAttrs.finalPackage.tests; + }; + testResults = lib.mapAttrs (_: test: test.expr == test.expected) finalAttrs.finalPackage.tests; + buildCommand = '' + touch $out + for testName in "''${!testResults[@]}"; do + if [[ -n "''${testResults[$testName]}" ]]; then + echo "PASS $testName" + else + echo "FAIL $testName" + fi + done + '' + + lib.optionalString (lib.any (v: !v) (lib.attrValues finalAttrs.testResults)) '' + { + echo "" + echo "Eval-level compliance failures:" + for testName in "''${!testResults[@]}"; do + if [[ -z "''${testResults[$testName]}" ]]; then + echo "- $testName" + fi + done + echo "" + echo 'Inspect with: nix eval .#.tests.''${testName}' + } >&2 + exit 1 + ''; + }); + + # Integration tests: verify that services actually run. + + basic-argv = mkTest { + name = "${namePrefix}-basic-argv"; + services.test.process.argv = mkArgv "test" [ + "--greeting" + "hello" + ]; + testExe = mkTestScript "basic-argv" ( + waitAndCheck "test" [ + "--greeting" + "hello" + ] + ); + }; + + sub-services = mkTest { + name = "${namePrefix}-sub-services"; + services.a = { + process.argv = mkArgv "a" [ "--depth=0" ]; + services.b = { + process.argv = mkArgv "b" [ "--depth=1" ]; + services.c.process.argv = mkArgv "c" [ "--depth=2" ]; + }; + }; + testExe = mkTestScript "sub-services" '' + ${waitAndCheck "a" [ "--depth=0" ]} + ${waitAndCheck "b" [ "--depth=1" ]} + ${waitAndCheck "c" [ "--depth=2" ]} + ''; + }; + + # Runtime reload: start a reloadable service, ask the integration to reload it, + # and assert the service observed the reload (recorded a SIGHUP marker). + reload = mkTest { + name = "${namePrefix}-reload"; + services = reloadServices; + testExe = mkTestScript "reload" '' + ${waitAndCheck "reload-inner" [ ]} + ${callReload [ + "reload" + "inner" + ]} + timeout=30; elapsed=0 + while ! grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" && [ "$elapsed" -lt "$timeout" ]; do + sleep 1; elapsed=$((elapsed + 1)) + done + grep -qx "reloaded" "${sharedDir}/reload-inner/reloads" \ + || { echo "reload: no reload recorded after ''${timeout}s"; cat "${sharedDir}/reload-inner/reloads"; exit 1; } + echo "reload: reload observed" + ''; + }; + + # See also the manual compliance items in doc/build-helpers/testers.chapter.md. +} diff --git a/pkgs/build-support/trivial-builders/test/symlink-join.nix b/pkgs/build-support/trivial-builders/test/symlink-join.nix index 4750d9680d4a..30556add3119 100644 --- a/pkgs/build-support/trivial-builders/test/symlink-join.nix +++ b/pkgs/build-support/trivial-builders/test/symlink-join.nix @@ -1,7 +1,7 @@ { symlinkJoin, writeTextFile, - runCommand, + runCommandLocal, testers, }: @@ -31,7 +31,7 @@ let text = "qux"; }; - emulatedSymlinkJoinFooBarStrip = runCommand "symlinkJoin-strip-foo-bar" { } '' + emulatedSymlinkJoinFooBarStrip = runCommandLocal "symlinkJoin-strip-foo-bar" { } '' mkdir $out ln -s ${foo}/etc/test.d/foo $out/ ln -s ${bar}/etc/test.d/bar $out/ @@ -48,7 +48,7 @@ in baz ]; }; - expected = runCommand "symlinkJoin-foo-bar-baz" { } '' + expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } '' mkdir -p $out/{var/lib/arbitrary,etc/test.d} ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/ @@ -66,7 +66,7 @@ in baz ]; }; - expected = runCommand "symlinkJoin-foo-bar-baz" { } '' + expected = runCommandLocal "symlinkJoin-foo-bar-baz" { } '' mkdir -p $out/{var/lib/arbitrary,etc/test.d} ln -s {${foo},${bar}}/etc/test.d/* $out/etc/test.d ln -s ${baz}/var/lib/arbitrary/baz $out/var/lib/arbitrary/ @@ -115,7 +115,7 @@ in }; symlinkJoin-fails-on-missing = - runCommand "symlinkJoin-fails-on-missing" + runCommandLocal "symlinkJoin-fails-on-missing" { failed = testBuildFailure (symlinkJoin { name = "symlinkJoin-fail"; @@ -134,7 +134,7 @@ in ''; symlinkJoin-fails-on-file = - runCommand "symlinkJoin-fails-on-file" + runCommandLocal "symlinkJoin-fails-on-file" { failed = testBuildFailure (symlinkJoin { name = "symlinkJoin-fail"; diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index b508dba83f33..fdd10e2b5b7b 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -873,7 +873,7 @@ let ;; esac '') packagesLists} - perl -w ${rpm/rpm-closure.pl} \ + perl -w ${./rpm/rpm-closure.pl} \ ${ lib.concatImapStrings (i: pl: "./packages_${toString i}.xml ${pl.snd} ") ( lib.zipLists packagesLists urlPrefixes @@ -973,7 +973,7 @@ let esac done - perl -w ${deb/deb-closure.pl} \ + perl -w ${./deb/deb-closure.pl} \ ./Packages ${urlPrefix} ${toString packages} > $out nixfmt $out ''; diff --git a/pkgs/build-support/writers/scripts.nix b/pkgs/build-support/writers/scripts.nix index 01afb249d407..5b6a2b2640fc 100644 --- a/pkgs/build-support/writers/scripts.nix +++ b/pkgs/build-support/writers/scripts.nix @@ -6,6 +6,7 @@ makeBinaryWrapper, mkNugetDeps, mkNugetSource, + nginx-config-formatter, pkgs, stdenv, }: @@ -798,7 +799,7 @@ rec { ## `pkgs.writers.writeNim` usage example ```nix - writeNim "hello-nim" { nim = pkgs.nim2; } '' + writeNim "hello-nim" { nim = pkgs.nim; } '' echo "hello nim" ''; ``` @@ -808,7 +809,7 @@ rec { name: { makeWrapperArgs ? [ ], - nim ? pkgs.nim2, + nim ? pkgs.nim, nimCompileOptions ? { }, strip ? true, }: @@ -1101,11 +1102,14 @@ rec { { inherit text; __structuredAttrs = true; - nativeBuildInputs = [ gixy ]; + nativeBuildInputs = [ + gixy + nginx-config-formatter + ]; } # sh '' - printf "%s" "$text" | ${lib.getExe pkgs.nginx-config-formatter} --max-empty-lines 0 - > $out - ${lib.getExe pkgs.gnused} -i 's/ ;/;/g' $out + printf "%s" "$text" | nginxfmt --max-empty-lines 0 - > $out + sed -i 's/ ;/;/g' $out gixy $out || (echo "\n\nThis can be caused by combining multiple incompatible services on the same hostname.\n\nFull merged config:\n\n"; cat $out; exit 1) ''; @@ -1192,15 +1196,12 @@ rec { ]) // { interpreter = - if pythonPackages != pkgs.pypy2Packages || pythonPackages != pkgs.pypy3Packages then - if libraries == [ ] then - python.interpreter - else if (lib.isFunction libraries) then - (python.withPackages libraries).interpreter - else - (python.withPackages (ps: libraries)).interpreter + if libraries == [ ] then + python.interpreter + else if (lib.isFunction libraries) then + (python.withPackages libraries).interpreter else - python.interpreter; + (python.withPackages (ps: libraries)).interpreter; check = optionalString (python.isPy3k && doCheck) ( writeDash "pythoncheck.sh" '' exec ${buildPythonPackages.flake8}/bin/flake8 --show-source ${ignoreAttribute} "$1" diff --git a/pkgs/by-name/_0/_010editor/package.nix b/pkgs/by-name/_0/_010editor/package.nix index a74d0473c291..198f52aaea37 100644 --- a/pkgs/by-name/_0/_010editor/package.nix +++ b/pkgs/by-name/_0/_010editor/package.nix @@ -91,11 +91,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-M1D2Bmi45sYiB0Ci+0X0AxyIeR+On60xt4jP1Jsy5tA="; }; - x86_64-darwin = fetchurl { - url = "https://download.sweetscape.com/010EditorMac64Installer${finalAttrs.version}.dmg"; - hash = "sha256-vsI0VgcJGleJTQ5C1JaiCkELfWfwgFhyCx+6j5mldIk="; - }; - aarch64-darwin = fetchurl { url = "https://download.sweetscape.com/010EditorMacARM64Installer${finalAttrs.version}.dmg"; hash = "sha256-+yU5JdPNS2BfiZLsBLyyC+ieVNqbIWba3teBlTIDWtk="; @@ -124,7 +119,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ eljamm ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/_1/_1oom/package.nix b/pkgs/by-name/_1/_1oom/package.nix index 353a3813eb69..96e1c4c3d1c8 100644 --- a/pkgs/by-name/_1/_1oom/package.nix +++ b/pkgs/by-name/_1/_1oom/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchFromGitHub, + fetchgit, gitUpdater, autoreconfHook, allegro, @@ -14,18 +14,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "1oom"; - version = "1.11.8"; + version = "1.11.9"; outputs = [ "out" "doc" ]; - src = fetchFromGitHub { - owner = "1oom-fork"; - repo = "1oom"; + src = fetchgit { + url = "https://git@git.sourcecraft.dev/fork1oom/1oom.git"; tag = "v${finalAttrs.version}"; - hash = "sha256-Y29Xc8ylXhpQO7dDl7z7XC7+RB4UOIRksZ8RtfaCiEc="; + hash = "sha256-tU396z/7qpnhDEFqj/S55e/zeXa5jZFUi2VG3O6SJdY="; }; nativeBuildInputs = [ @@ -42,19 +41,19 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + __structuredAttrs = true; enableParallelBuilding = true; postInstall = '' - install -d $doc/share/doc/1oom - install -t $doc/share/doc/1oom \ + install -Dm644 -t $doc/share/doc/1oom \ HACKING NEWS PHILOSOPHY README.md doc/*.txt ''; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { - homepage = "https://github.com/1oom-fork/1oom"; - changelog = "https://github.com/1oom-fork/1oom/releases/tag/v${finalAttrs.version}"; + homepage = "https://fork1oom.sourcecraft.site/"; + changelog = "https://sourcecraft.dev/fork1oom/1oom/releases/v${finalAttrs.version}"; description = "Master of Orion (1993) game engine recreation; a more updated fork"; license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/_1/_1password-cli/package.nix b/pkgs/by-name/_1/_1password-cli/package.nix index f9c70c26f423..6595b170e8e3 100644 --- a/pkgs/by-name/_1/_1password-cli/package.nix +++ b/pkgs/by-name/_1/_1password-cli/package.nix @@ -25,14 +25,13 @@ let pname = "1password-cli"; version = "2.34.1"; - sources = rec { + sources = { aarch64-linux = fetch "linux_arm64" "sha256-uEukRq71eeayvNguD9XepvP1Br5AkE2Ag/Chv2idf4A=" "zip"; i686-linux = fetch "linux_386" "sha256-p/F3YZLJnlimrVE2qxTHvIB4m47kuwhoCWTC40VIvMs=" "zip"; x86_64-linux = fetch "linux_amd64" "sha256-oAABMlwwv5X91TT6FK2aPpg+e2CvmHT1rqIVRTjQNCQ=" "zip"; aarch64-darwin = fetch "apple_universal" "sha256-vp1Y1M6DUanx1CAVhLrqgBovwws6Y/5jOgnwTZE8Hhc=" "pkg"; - x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; mainProgram = "op"; diff --git a/pkgs/by-name/_1/_1password-gui/package.nix b/pkgs/by-name/_1/_1password-gui/package.nix index 2b569843f718..260e1ad7ecf2 100644 --- a/pkgs/by-name/_1/_1password-gui/package.nix +++ b/pkgs/by-name/_1/_1password-gui/package.nix @@ -37,7 +37,6 @@ let ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/_1/_1password-gui/sources.json b/pkgs/by-name/_1/_1password-gui/sources.json index cd08c04e54c3..7ab8898f017c 100644 --- a/pkgs/by-name/_1/_1password-gui/sources.json +++ b/pkgs/by-name/_1/_1password-gui/sources.json @@ -1,56 +1,56 @@ { "stable": { "linux": { - "version": "8.12.22", + "version": "8.12.28", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.22.x64.tar.gz", - "hash": "sha256-dec+oqixlPAbHYWqOBEBNB9IU8+Hfz2W4bm1y6/CbuM=" + "url": "https://downloads.1password.com/linux/tar/stable/x86_64/1password-8.12.28.x64.tar.gz", + "hash": "sha256-JpXXLpjAOfBh+oc1YIBxqBZha02IuzclVhQRiF29V6c=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.22.arm64.tar.gz", - "hash": "sha256-qPQbEkXZs0/D/PgDbepUWm5po/Jg42YvxT0a2A+9mOk=" + "url": "https://downloads.1password.com/linux/tar/stable/aarch64/1password-8.12.28.arm64.tar.gz", + "hash": "sha256-lbiIXeyexz6XpXD7/57U/T//JDEBDikm9HaNR1t7cps=" } } }, "darwin": { - "version": "8.12.22", + "version": "8.12.28", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.22-x86_64.zip", - "hash": "sha256-UR1urZS2WuTRrE3Tn3P/QaXKze6Wjrw0ZKEZc06Up8I=" + "url": "https://downloads.1password.com/mac/1Password-8.12.28-x86_64.zip", + "hash": "sha256-ONY0M48v4wJe9LBlvjJY4BqfbQf5evtRijbbSDGQFpE=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.22-aarch64.zip", - "hash": "sha256-Rbac0JcB2kbH6EfEGkuKwhaIW0Bgkhyw7olSjqe1euE=" + "url": "https://downloads.1password.com/mac/1Password-8.12.28-aarch64.zip", + "hash": "sha256-utESL4dUIe/jD9gu3YIF+HWnGUlWr54tSI1Jtrruxsc=" } } } }, "beta": { "linux": { - "version": "8.12.24-24.BETA", + "version": "8.12.26-31.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.24-24.BETA.x64.tar.gz", - "hash": "sha256-2pdVY7X2qfSkxhSEIKod9+8zGsJ91r9rY3ODTjA4Bw8=" + "url": "https://downloads.1password.com/linux/tar/beta/x86_64/1password-8.12.26-31.BETA.x64.tar.gz", + "hash": "sha256-jlBvt2QEOgoisC1u8WY7cEXuCgk3wKcgQ1owu02rEio=" }, "aarch64": { - "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.24-24.BETA.arm64.tar.gz", - "hash": "sha256-HIFlrclzIHZftUtYKyMRX9s1UjS//sibTFyhi0NU4pE=" + "url": "https://downloads.1password.com/linux/tar/beta/aarch64/1password-8.12.26-31.BETA.arm64.tar.gz", + "hash": "sha256-jCI5G9xGdXChGW8388BMpMfyYwxzNxYNoV2sYBj8eV4=" } } }, "darwin": { - "version": "8.12.24-24.BETA", + "version": "8.12.26-31.BETA", "sources": { "x86_64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-x86_64.zip", - "hash": "sha256-KXgqH7bFCIMdmruqnCel7tCWa8YdwKtajFv/HGxb7AE=" + "url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-x86_64.zip", + "hash": "sha256-TBNhnCrKVZD1CVeBZ3dZ0TVeldrRotUpXEycFnvPfZo=" }, "aarch64": { - "url": "https://downloads.1password.com/mac/1Password-8.12.24-24.BETA-aarch64.zip", - "hash": "sha256-u8uRcR7z65Hs0jq3dXz4HNgI4UH4+AJjtPBH2keUXZI=" + "url": "https://downloads.1password.com/mac/1Password-8.12.26-31.BETA-aarch64.zip", + "hash": "sha256-8+H9+Z7/uqlnMP2eUm7z493S6ZCEV0a5Sorw3AGTDCc=" } } } diff --git a/pkgs/by-name/_4/_4d-minesweeper/package.nix b/pkgs/by-name/_4/_4d-minesweeper/package.nix index 27b16a398887..ad9e71aae8b0 100644 --- a/pkgs/by-name/_4/_4d-minesweeper/package.nix +++ b/pkgs/by-name/_4/_4d-minesweeper/package.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation { version = "2.0"; src = fetchFromGitHub { - owner = "gapophustu"; - repo = "4D-Minesweeper"; + owner = "Alzager"; + repo = "4D-Minesweeper-Archived"; rev = "db176d8aa5981a597bbae6a1a74aeebf0f376df4"; hash = "sha256-A5QKqCo9TTdzmK13WRSAfkrkeUqHc4yQCzy4ZZ9uX2M="; }; @@ -80,7 +80,7 @@ stdenv.mkDerivation { dontStrip = true; meta = { - homepage = "https://github.com/gapophustu/4D-Minesweeper"; + homepage = "https://github.com/Alzager/4D-Minesweeper-Archived"; description = "4D Minesweeper game written in Godot"; license = lib.licenses.mpl20; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/_4/_4ti2/package.nix b/pkgs/by-name/_4/_4ti2/package.nix index 775a034e64e0..989042f52e41 100644 --- a/pkgs/by-name/_4/_4ti2/package.nix +++ b/pkgs/by-name/_4/_4ti2/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "4ti2"; - version = "1.6.14"; + version = "1.6.15"; src = fetchFromGitHub { owner = "4ti2"; repo = "4ti2"; tag = "Release_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-bFvq90hLLGty7p6NLxOARVvKdizg3bp2NkP9nZpVFzQ="; + hash = "sha256-6X8zNp68KlKxplg1rdcotmXyIZE27POJs9/3n2BZLZE="; }; postPatch = '' @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://4ti2.github.io/"; description = "Software package for algebraic, geometric and combinatorial problems on linear spaces"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ coolcuber ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/_6/_64gram/package.nix b/pkgs/by-name/_6/_64gram/package.nix index 0e3db0701cb7..c87d829cb39d 100644 --- a/pkgs/by-name/_6/_64gram/package.nix +++ b/pkgs/by-name/_6/_64gram/package.nix @@ -10,13 +10,13 @@ telegram-desktop.override { inherit withWebkit; unwrapped = telegram-desktop.unwrapped.overrideAttrs (old: rec { pname = "64gram-unwrapped"; - version = "1.2.2"; + version = "1.2.5"; src = fetchFromGitHub { owner = "TDesktop-x64"; repo = "tdesktop"; tag = "v${version}"; - hash = "sha256-qT7GQCqIaEZmbtFeoWMChUX6J8uqs/+UZYi0YoBIYDY="; + hash = "sha256-CcYcdSgeVEbGKOzim+Q/gIxMIfDGaSStF4cLLttA+SM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/_7/_7zip-zstd/package.nix b/pkgs/by-name/_7/_7zip-zstd/package.nix index 2614b4b43472..90af4468662d 100644 --- a/pkgs/by-name/_7/_7zip-zstd/package.nix +++ b/pkgs/by-name/_7/_7zip-zstd/package.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "7zip-zstd"; - version = "25.01-v1.5.7-R4"; + version = "26.02-v1.5.7-R2"; src = fetchFromGitHub { owner = "mcmilk"; @@ -24,9 +24,9 @@ stdenv.mkDerivation (finalAttrs: { tag = "v${finalAttrs.version}"; hash = if enableUnfree then - "sha256-qP4L5PIG7CHsmYbRock+cbCOGdgujUFG4LHenvvlqzw=" + "sha256-Y1l+PiZyHZX4KnqANogn4iVhhEjsezGckkeXtO0RHDY=" else - "sha256-R9AUWL35TPh0anyRDhnF28ZYG9FeOxntVIwnnW9e2xA="; + "sha256-0m4Q4920/tIatY28E5d89hYvp6Z0zE2v55rUSwig1+0="; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks diff --git a/pkgs/by-name/_7/_7zz-rar/package.nix b/pkgs/by-name/_7/_7zz-rar/package.nix new file mode 100644 index 000000000000..5a1cf62bda75 --- /dev/null +++ b/pkgs/by-name/_7/_7zz-rar/package.nix @@ -0,0 +1,6 @@ +{ + _7zz, +}: +_7zz.override { + enableUnfree = true; +} diff --git a/pkgs/by-name/_7/_7zz/package.nix b/pkgs/by-name/_7/_7zz/package.nix index fe3878f417aa..6923d10979d1 100644 --- a/pkgs/by-name/_7/_7zz/package.nix +++ b/pkgs/by-name/_7/_7zz/package.nix @@ -1,7 +1,9 @@ { stdenv, lib, - fetchzip, + fetchFromGitHub, + _experimental-update-script-combinators, + nix-update-script, # Free MASM-compatible assembler asmc-linux, @@ -43,17 +45,17 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "7zz"; - version = "26.01"; + version = "26.02"; - src = fetchzip { - url = "https://7-zip.org/a/7z${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}-src.tar.xz"; + src = fetchFromGitHub { + owner = "ip7z"; + repo = "7zip"; + tag = finalAttrs.version; hash = - { - free = "sha256-52+Gg66MOFmwYUVB0OO4PAtZJtQOkoVpxV7F9xBGy58="; - unfree = "sha256-w0fk8EDusUYiOfrmIiUq+xevlwfQxMhjdPzfkHkOkR8="; - } - .${if enableUnfree then "unfree" else "free"}; - stripRoot = false; + if enableUnfree then + "sha256-MmnsCM4guQ5DuWDE5MslI8QIIbkUtZnddVPgAuCRWQU=" + else + "sha256-prKxsT7y7iHbzduM+xqz1yQMEbJ8IjnsmafzC2mOwr4="; # remove the unRAR related code from the src drv # > the license requires that you agree to these use restrictions, # > or you must remove the software (source and binary) from your hard disks @@ -138,7 +140,16 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = ./update.sh; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "_7zz"; + extraArgs = [ "--use-github-releases" ]; + }) + (nix-update-script { + attrPath = "_7zz-rar"; + extraArgs = [ "--version=skip" ]; + }) + ]; tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "7zz --help"; diff --git a/pkgs/by-name/_7/_7zz/update.sh b/pkgs/by-name/_7/_7zz/update.sh deleted file mode 100755 index 1128cedd5491..000000000000 --- a/pkgs/by-name/_7/_7zz/update.sh +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p curl xq-xml common-updater-scripts -set -euo pipefail - -OLD_VERSION="$(nix-instantiate --eval --json --expr 'let pkgs = import ./. {}; in pkgs._7zz.version' | sed 's/"//g')" -NEW_VERSION="$(curl -H 'Accept: application/rss+xml' 'https://sourceforge.net/projects/sevenzip/rss?path=/7-Zip' | xq -x "substring((/rss/channel/item[link[contains(., 'src.tar.xz')]])[1]/title, 8, 5)")" - -echo "comparing versions $OLD_VERSION => $NEW_VERSION" -if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then - echo "Already up to date! Doing nothing" - exit 0 -fi - -update-source-version _7zz "$NEW_VERSION" -update-source-version _7zz-rar "$NEW_VERSION" --ignore-same-version diff --git a/pkgs/by-name/aa/aaa/package.nix b/pkgs/by-name/aa/aaa/package.nix index 6eba8543a067..64bf894ee5a4 100644 --- a/pkgs/by-name/aa/aaa/package.nix +++ b/pkgs/by-name/aa/aaa/package.nix @@ -6,20 +6,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aaa"; - version = "1.1.1"; + version = "2.1.0"; src = fetchFromGitHub { - owner = "DomesticMoth"; + owner = "asciimoth"; repo = "aaa"; - tag = "v${finalAttrs.version}"; - sha256 = "sha256-gIOlPjZOcmVLi9oOn4gBv6F+3Eq6t5b/3fKzoFqxclw="; + tag = "${finalAttrs.version}"; + sha256 = "sha256-z8PXkX6Bh3oD8tRf+tsLJHbx5wIz2mBYhJSEL88hBDc="; }; - cargoHash = "sha256-CHX+Ugy4ND36cpxNEFpnqid6ALHMPXmfXi+D4aktPRk="; + cargoHash = "sha256-dt3nbVS8i075O8m9x+FsDi3VeihVKVIV0wnPqyYUaIk="; meta = { - description = "Terminal viewer for 3a format"; - homepage = "https://github.com/DomesticMoth/aaa"; + description = "Swiss Army knife for animated ascii art"; + homepage = "https://github.com/asciimoth/aaa"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ asciimoth ]; mainProgram = "aaa"; diff --git a/pkgs/by-name/aa/aardvark-dns/package.nix b/pkgs/by-name/aa/aardvark-dns/package.nix index 5515f8b50a53..d4ae035f8518 100644 --- a/pkgs/by-name/aa/aardvark-dns/package.nix +++ b/pkgs/by-name/aa/aardvark-dns/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aardvark-dns"; - version = "1.17.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "containers"; repo = "aardvark-dns"; tag = "v${finalAttrs.version}"; - hash = "sha256-gd04T+GK/+gCWGMnNfFzCcTBPbjU8e5mWjFf7uvob38="; + hash = "sha256-w+qHHq/4jdkEzyoxfy1h6Vb+55uWLJhirbBSZHxLxTU="; }; - cargoHash = "sha256-19EisvHJZJ1L3f0+pE6wgfChkRoYU8W/iaAppwbjbdQ="; + cargoHash = "sha256-rpflZfMYNlrn13Cv3znkS2Jp9peyIJDQrXVnVnVuy9g="; passthru.tests = { inherit (nixosTests) podman; }; diff --git a/pkgs/by-name/aa/aasvg/package.nix b/pkgs/by-name/aa/aasvg/package.nix index f246283723b5..a05fac08a9a3 100644 --- a/pkgs/by-name/aa/aasvg/package.nix +++ b/pkgs/by-name/aa/aasvg/package.nix @@ -8,13 +8,13 @@ buildNpmPackage (finalAttrs: { pname = "aasvg"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "martinthomson"; repo = "aasvg"; tag = "v${finalAttrs.version}"; - hash = "sha256-Le6ZbJY7ZkqblZx4TkHWIiRKn1foi8jB+rldhu95NQ0="; + hash = "sha256-D3ompmRt9Mxmzr0TxFLBrSl/dNE986TZbOvfuyk9rJo="; }; # the project has no dependencies diff --git a/pkgs/by-name/ab/ab-av1/package.nix b/pkgs/by-name/ab/ab-av1/package.nix index 04446daddba3..63c70c0afbb2 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 (finalAttrs: { pname = "ab-av1"; - version = "0.11.3"; + version = "0.11.4"; src = fetchFromGitHub { owner = "alexheretic"; repo = "ab-av1"; tag = "v${finalAttrs.version}"; - hash = "sha256-lLZAECwF8V19Qx/FugbjLeVns7lhVlwWDTK9cdYb0xo="; + hash = "sha256-830STu0YfEhsYr4EU3ATF6kgH5J/tUEhm4b47VOwMEQ="; }; - cargoHash = "sha256-AONJz1BoDi6weHT7W9DmzwoPW5khfgYjDqLNl7OM5bY="; + cargoHash = "sha256-mKtP+QoG0MjbBB4kMLlioyxshlgVyhqLH4C5GKx9Hes="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ab/abc-verifier/package.nix b/pkgs/by-name/ab/abc-verifier/package.nix index d88b202e3419..f992190b36b0 100644 --- a/pkgs/by-name/ab/abc-verifier/package.nix +++ b/pkgs/by-name/ab/abc-verifier/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Tool for sequential logic synthesis and formal verification"; homepage = "https://people.eecs.berkeley.edu/~alanmi/abc"; - license = lib.licenses.mit; + license = lib.licenses.mit-modern; maintainers = with lib.maintainers; [ thoughtpolice Luflosi diff --git a/pkgs/by-name/ab/abcmidi/package.nix b/pkgs/by-name/ab/abcmidi/package.nix index 29deb4b5181d..cb4be65be820 100644 --- a/pkgs/by-name/ab/abcmidi/package.nix +++ b/pkgs/by-name/ab/abcmidi/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "abcmidi"; - version = "2026.06.06"; + version = "2026.06.16"; src = fetchFromGitHub { owner = "sshlien"; repo = "abcmidi"; tag = finalAttrs.version; - hash = "sha256-2XPtLjvj+gyXTOOvUWzAO0magnjF3CWC7ZDCCuYN6vE="; + hash = "sha256-GkCvIZSspqwV3Q0+GZh08pQt5RFgPTdJ4fS9OaV+jXs="; }; # TODO: remove once https://github.com/sshlien/abcmidi/pull/15 merged diff --git a/pkgs/applications/science/logic/abella/default.nix b/pkgs/by-name/ab/abella/package.nix similarity index 93% rename from pkgs/applications/science/logic/abella/default.nix rename to pkgs/by-name/ab/abella/package.nix index 210211a6b948..5902450717b6 100644 --- a/pkgs/applications/science/logic/abella/default.nix +++ b/pkgs/by-name/ab/abella/package.nix @@ -13,10 +13,11 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "http://abella-prover.org/distributions/abella-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; + hash = "sha256-80b/RUpE3KRY0Qu8eeTxAbk6mwGG6jVTPOP0qFjyj2M="; }; strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ rsync diff --git a/pkgs/by-name/ab/abseil-cpp_202505/package.nix b/pkgs/by-name/ab/abseil-cpp_202505/package.nix index cb354cd50a3d..9dd41332758e 100644 --- a/pkgs/by-name/ab/abseil-cpp_202505/package.nix +++ b/pkgs/by-name/ab/abseil-cpp_202505/package.nix @@ -6,6 +6,8 @@ gtest, static ? stdenv.hostPlatform.isStatic, cxxStandard ? null, + testers, + validatePkgConfig, }: stdenv.mkDerivation (finalAttrs: { @@ -30,10 +32,19 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; buildInputs = [ gtest ]; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + }; + }; + meta = { description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; @@ -41,5 +52,208 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = [ lib.maintainers.GaetanLepage ]; + pkgConfigModules = [ + "absl_log_internal_check_op" + "absl_absl_check" + "absl_strerror" + "absl_common_policy_traits" + "absl_graphcycles_internal" + "absl_raw_hash_set" + "absl_random_internal_entropy_pool" + "absl_time_zone" + "absl_prefetch" + "absl_compressed_tuple" + "absl_nullability" + "absl_vlog_is_on" + "absl_utf8_for_code_point" + "absl_base_internal" + "absl_bad_variant_access" + "absl_flags_parse" + "absl_exponential_biased" + "absl_log_internal_nullstream" + "absl_log_internal_structured_proto" + "absl_log_internal_check_impl" + "absl_tracing_internal" + "absl_random_bit_gen_ref" + "absl_meta" + "absl_random_distributions" + "absl_numeric" + "absl_flat_hash_set" + "absl_random_internal_randen_hwaes_impl" + "absl_malloc_internal" + "absl_layout" + "absl_type_traits" + "absl_random_internal_mock_helpers" + "absl_log_streamer" + "absl_function_ref" + "absl_log" + "absl_dynamic_annotations" + "absl_non_temporal_memcpy" + "absl_random_internal_randen" + "absl_stacktrace" + "absl_log_internal_globals" + "absl_log_internal_strip" + "absl_atomic_hook" + "absl_flags_usage_internal" + "absl_log_internal_voidify" + "absl_synchronization" + "absl_debugging_internal" + "absl_bind_front" + "absl_crc_internal" + "absl_random_internal_platform" + "absl_flags_path_util" + "absl_hash_testing" + "absl_flags_commandlineflag_internal" + "absl_hashtable_debug" + "absl_hashtablez_sampler" + "absl_random_internal_randen_engine" + "absl_log_globals" + "absl_optional" + "absl_crc_cpu_detect" + "absl_demangle_internal" + "absl_node_hash_map" + "absl_core_headers" + "absl_statusor" + "absl_str_format_internal" + "absl_crc32c" + "absl_cordz_update_scope" + "absl_cordz_handle" + "absl_log_internal_nullguard" + "absl_numeric_representation" + "absl_log_internal_log_impl" + "absl_raw_hash_set_resize_impl" + "absl_random_internal_distribution_test_util" + "absl_kernel_timeout_internal" + "absl_random_internal_uniform_helper" + "absl_random_seed_sequences" + "absl_cordz_info" + "absl_spy_hash_state" + "absl_vlog_config_internal" + "absl_flags_program_name" + "absl_hashtable_debug_hooks" + "absl_crc_cord_state" + "absl_decode_rust_punycode" + "absl_debugging" + "absl_overload" + "absl_config" + "absl_random_internal_fast_uniform_bits" + "absl_raw_hash_map" + "absl_random_internal_randen_hwaes" + "absl_bad_any_cast" + "absl_variant" + "absl_has_ostream_operator" + "absl_span" + "absl_btree" + "absl_random_internal_distribution_caller" + "absl_failure_signal_handler" + "absl_any" + "absl_poison" + "absl_str_format" + "absl_cord" + "absl_random_internal_wide_multiply" + "absl_random_internal_pcg_engine" + "absl_flags_internal" + "absl_check" + "absl_random_internal_seed_material" + "absl_log_flags" + "absl_no_destructor" + "absl_low_level_hash" + "absl_hashtable_control_bytes" + "absl_periodic_sampler" + "absl_log_internal_format" + "absl_log_initialize" + "absl_random_internal_generate_real" + "absl_raw_logging_internal" + "absl_inlined_vector" + "absl_log_internal_log_sink_set" + "absl_log_internal_flags" + "absl_flat_hash_map" + "absl_scoped_mock_log" + "absl_cordz_functions" + "absl_random_mocking_bit_gen" + "absl_fast_type_id" + "absl_sample_recorder" + "absl_log_internal_message" + "absl_bits" + "absl_random_seed_gen_exception" + "absl_log_sink_registry" + "absl_flags_marshalling" + "absl_leak_check" + "absl_examine_stack" + "absl_status_matchers" + "absl_flags_commandlineflag" + "absl_absl_vlog_is_on" + "absl_any_invocable" + "absl_cleanup_internal" + "absl_log_severity" + "absl_random_internal_salted_seed_seq" + "absl_flags_config" + "absl_log_structured" + "absl_die_if_null" + "absl_fixed_array" + "absl_cord_internal" + "absl_endian" + "absl_strings_internal" + "absl_symbolize" + "absl_log_internal_config" + "absl_absl_log" + "absl_memory" + "absl_container_common" + "absl_compare" + "absl_civil_time" + "absl_int128" + "absl_log_internal_append_truncated" + "absl_cordz_statistics" + "absl_log_internal_fnmatch" + "absl_flags" + "absl_non_temporal_arm_intrinsics" + "absl_random_internal_traits" + "absl_base" + "absl_algorithm_container" + "absl_hash" + "absl_log_internal_conditions" + "absl_time" + "absl_node_slot_policy" + "absl_errno_saver" + "absl_random_internal_randen_slow" + "absl_charset" + "absl_bounded_utf8_length_sequence" + "absl_city" + "absl_bad_optional_access" + "absl_random_internal_nonsecure_base" + "absl_flags_usage" + "absl_utility" + "absl_iterator_traits_internal" + "absl_spinlock_wait" + "absl_pretty_function" + "absl_algorithm" + "absl_log_sink" + "absl_status" + "absl_demangle_rust" + "absl_node_hash_set" + "absl_hash_policy_traits" + "absl_flags_private_handle_accessor" + "absl_cord_test_helpers" + "absl_strings" + "absl_log_internal_proto" + "absl_inlined_vector_internal" + "absl_iterator_traits_test_helper_internal" + "absl_random_random" + "absl_flags_reflection" + "absl_scoped_set_env" + "absl_throw_delegate" + "absl_hash_function_defaults" + "absl_weakly_mixed_integer" + "absl_cleanup" + "absl_random_internal_iostream_state_saver" + "absl_cordz_sample_token" + "absl_cordz_update_tracker" + "absl_string_view" + "absl_hash_container_defaults" + "absl_random_internal_fastmath" + "absl_log_internal_structured" + "absl_container_memory" + "absl_log_entry" + ]; }; }) diff --git a/pkgs/by-name/ab/abseil-cpp_202508/package.nix b/pkgs/by-name/ab/abseil-cpp_202508/package.nix index 47079240bfac..4c5a7b415cfe 100644 --- a/pkgs/by-name/ab/abseil-cpp_202508/package.nix +++ b/pkgs/by-name/ab/abseil-cpp_202508/package.nix @@ -6,6 +6,8 @@ gtest, static ? stdenv.hostPlatform.isStatic, cxxStandard ? null, + testers, + validatePkgConfig, }: stdenv.mkDerivation (finalAttrs: { @@ -35,10 +37,19 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + validatePkgConfig + ]; buildInputs = [ gtest ]; + passthru.tests = { + pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage.dev; + }; + }; + meta = { description = "Open-source collection of C++ code designed to augment the C++ standard library"; homepage = "https://abseil.io/"; @@ -46,5 +57,99 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = lib.platforms.all; maintainers = [ lib.maintainers.GaetanLepage ]; + pkgConfigModules = [ + "absl_base" + "absl_city" + "absl_civil_time" + "absl_cord_internal" + "absl_cord" + "absl_cordz_functions" + "absl_cordz_handle" + "absl_cordz_info" + "absl_cordz_sample_token" + "absl_crc_cord_state" + "absl_crc_cpu_detect" + "absl_crc_internal" + "absl_crc32c" + "absl_debugging_internal" + "absl_decode_rust_punycode" + "absl_demangle_internal" + "absl_demangle_rust" + "absl_die_if_null" + "absl_examine_stack" + "absl_exponential_biased" + "absl_failure_signal_handler" + "absl_flags_commandlineflag_internal" + "absl_flags_commandlineflag" + "absl_flags_config" + "absl_flags_internal" + "absl_flags_marshalling" + "absl_flags_parse" + "absl_flags_private_handle_accessor" + "absl_flags_program_name" + "absl_flags_reflection" + "absl_flags_usage_internal" + "absl_flags_usage" + "absl_graphcycles_internal" + "absl_hash" + "absl_hashtable_profiler" + "absl_hashtablez_sampler" + "absl_int128" + "absl_kernel_timeout_internal" + "absl_leak_check" + "absl_log_entry" + "absl_log_flags" + "absl_log_globals" + "absl_log_initialize" + "absl_log_internal_check_op" + "absl_log_internal_conditions" + "absl_log_internal_fnmatch" + "absl_log_internal_format" + "absl_log_internal_globals" + "absl_log_internal_log_sink_set" + "absl_log_internal_message" + "absl_log_internal_nullguard" + "absl_log_internal_proto" + "absl_log_internal_structured_proto" + "absl_log_severity" + "absl_log_sink" + "absl_malloc_internal" + "absl_periodic_sampler" + "absl_poison" + "absl_profile_builder" + "absl_random_distributions" + "absl_random_internal_distribution_test_util" + "absl_random_internal_entropy_pool" + "absl_random_internal_platform" + "absl_random_internal_randen_hwaes_impl" + "absl_random_internal_randen_hwaes" + "absl_random_internal_randen_slow" + "absl_random_internal_randen" + "absl_random_internal_seed_material" + "absl_random_seed_gen_exception" + "absl_random_seed_sequences" + "absl_raw_hash_set" + "absl_raw_logging_internal" + "absl_scoped_mock_log" + "absl_scoped_set_env" + "absl_spinlock_wait" + "absl_stacktrace" + "absl_status_matchers" + "absl_status" + "absl_statusor" + "absl_str_format_internal" + "absl_strerror" + "absl_string_view" + "absl_strings_internal" + "absl_strings" + "absl_symbolize" + "absl_synchronization" + "absl_throw_delegate" + "absl_time_zone" + "absl_time" + "absl_tracing_internal" + "absl_utf8_for_code_point" + "absl_vlog_config_internal" + ]; }; }) diff --git a/pkgs/by-name/ab/absolute/package.nix b/pkgs/by-name/ab/absolute/package.nix new file mode 100644 index 000000000000..b1f3a53cb152 --- /dev/null +++ b/pkgs/by-name/ab/absolute/package.nix @@ -0,0 +1,18 @@ +{ lib, ocamlPackages }: + +let + inherit (ocamlPackages) buildDunePackage libabsolute; +in + +buildDunePackage { + pname = "absolute"; + inherit (libabsolute) src version; + + __structuredAttrs = true; + + buildInputs = [ libabsolute ]; + + meta = libabsolute.meta // { + description = "A constraint solver based on abstract domains from the theory of abstract interpretation"; + }; +} diff --git a/pkgs/by-name/ab/abtop/package.nix b/pkgs/by-name/ab/abtop/package.nix new file mode 100644 index 000000000000..9d4b703b9b6a --- /dev/null +++ b/pkgs/by-name/ab/abtop/package.nix @@ -0,0 +1,36 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "abtop"; + version = "0.5.3"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "graykode"; + repo = "abtop"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LvN+q7JwmvtbroocoRBEug/J5OZTXwHEPAiaRkj16lM="; + }; + + cargoHash = "sha256-o5ZHURx+OAQkd7S0TzkLQG5ZsR5HMaqfl8sp639axbg="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Like htop, but for AI coding agents"; + homepage = "https://github.com/graykode/abtop"; + changelog = "https://github.com/graykode/abtop/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "abtop"; + }; +}) diff --git a/pkgs/by-name/ab/abuild/package.nix b/pkgs/by-name/ab/abuild/package.nix index 9b083eb24d73..d5eb80d3ccfa 100644 --- a/pkgs/by-name/ab/abuild/package.nix +++ b/pkgs/by-name/ab/abuild/package.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "abuild"; - version = "3.15.0"; + version = "3.17.0"; src = fetchFromGitLab { domain = "gitlab.alpinelinux.org"; owner = "alpine"; repo = "abuild"; tag = finalAttrs.version; - hash = "sha256-vHRh36igfb6WZ8JdtxW8OOqgiVBAXreTy+QOOKaWEwA="; + hash = "sha256-CiKOvYEidpykufpEwZLvLys97VRhpEabiVEJ6NJexb4="; }; buildInputs = [ @@ -84,7 +84,9 @@ stdenv.mkDerivation (finalAttrs: { done ''; - passthru.updateScript = gitUpdater { }; + passthru.updateScript = gitUpdater { + ignoredVersions = "_rc"; + }; meta = { description = "Alpine Linux build tools"; diff --git a/pkgs/by-name/ac/account-utils/package.nix b/pkgs/by-name/ac/account-utils/package.nix new file mode 100644 index 000000000000..b1c1595689a9 --- /dev/null +++ b/pkgs/by-name/ac/account-utils/package.nix @@ -0,0 +1,79 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + linux-pam, + systemdLibs, + libcap, + libxcrypt, + libeconf, + libselinux, + docbook-xsl-ns, + libxslt, + nixosTests, +}: +let + selinuxSupport = lib.meta.availableOn stdenv.hostPlatform libselinux; +in +stdenv.mkDerivation (finalAttrs: { + pname = "account-utils"; + version = "1.4.0"; + + src = fetchFromGitHub { + owner = "thkukuk"; + repo = "account-utils"; + tag = "v${finalAttrs.version}"; + hash = "sha256-F0jM7qEpUjDjf0FTMfTNbD3WDoBShE0SyhDKzgI2K0k="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + libxslt + docbook-xsl-ns + ]; + + buildInputs = [ + linux-pam + systemdLibs + libxcrypt + libeconf + libcap + ] + ++ lib.optional selinuxSupport libselinux; + + mesonFlags = [ + (lib.mesonEnable "selinux" selinuxSupport) + (lib.mesonOption "c_args" "-ffat-lto-objects") + ]; + + doCheck = true; + + passthru.tests = { + inherit (nixosTests) login-nosuid; + }; + + meta = { + description = "Services, utilities and PAM modules, which allow authentication and account management on systems with the NoNewPrivs flag set (no setuid/setgid binaries)"; + homepage = "https://github.com/thkukuk/account-utils"; + changelog = "https://github.com/thkukuk/account-utils/releases/tag/v${finalAttrs.version}"; + license = + with lib.licenses; + AND [ + gpl2Plus + lgpl21Plus + bsd2 + ]; + maintainers = with lib.maintainers; [ grimmauld ]; + platforms = lib.platforms.linux; + # take precedence over shadow + priority = -1; + }; +}) diff --git a/pkgs/by-name/ac/accountsservice/fix-paths.patch b/pkgs/by-name/ac/accountsservice/fix-paths.patch index 19c4744e17d0..c512b35bef89 100644 --- a/pkgs/by-name/ac/accountsservice/fix-paths.patch +++ b/pkgs/by-name/ac/accountsservice/fix-paths.patch @@ -78,15 +78,6 @@ index da6428c..682842d 100644 argv[1] = "-s"; argv[2] = shell; argv[3] = "--"; -@@ -3163,7 +3163,7 @@ user_change_icon_file_classic_authorized_cb (Daemon *daemon, - return; - } - -- argv[0] = "/bin/cat"; -+ argv[0] = "@coreutils@/bin/cat"; - argv[1] = filename; - argv[2] = NULL; - @@ -3279,7 +3279,7 @@ user_change_locked_authorized_cb (Daemon *daemon, } else { const gchar *argv[5]; diff --git a/pkgs/by-name/ac/accountsservice/package.nix b/pkgs/by-name/ac/accountsservice/package.nix index b184e5d0299e..3eb9907c5487 100644 --- a/pkgs/by-name/ac/accountsservice/package.nix +++ b/pkgs/by-name/ac/accountsservice/package.nix @@ -9,7 +9,6 @@ gobject-introspection, polkit, systemdLibs, - coreutils, meson, mesonEmulatorHook, dbus, @@ -19,11 +18,12 @@ vala, gettext, libxcrypt, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "accountsservice"; - version = "26.13.3"; + version = "26.27.3"; outputs = [ "out" @@ -35,13 +35,13 @@ stdenv.mkDerivation (finalAttrs: { owner = "accountsservice"; repo = "accountsservice"; tag = finalAttrs.version; - hash = "sha256-ZIfkBlEaITX2rDcV5al4e2IFP238MXOlWeGoh+3+DoQ="; + hash = "sha256-/n0YCPZaf1SsTScidFUZcxfJkpv/+Bnb6Z7oKL+clgE="; }; patches = [ # Hardcode dependency paths. (replaceVars ./fix-paths.patch { - inherit shadow coreutils; + inherit shadow; }) # Do not try to create directories in /var, that will not work in Nix sandbox. @@ -107,6 +107,8 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "run_command(['./generate-version.sh'], check: true).stdout().strip()" "'${finalAttrs.version}'" ''; + passthru.tests = { inherit (nixosTests) accountsservice; }; + meta = { changelog = "https://gitlab.freedesktop.org/accountsservice/accountsservice/-/releases/${finalAttrs.src.tag}"; description = "D-Bus interface for user account query and manipulation"; diff --git a/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch b/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch new file mode 100644 index 000000000000..0e2d0a63aee8 --- /dev/null +++ b/pkgs/by-name/ac/ace-of-penguins/fix-wayland-segfault.patch @@ -0,0 +1,16 @@ +diff --git a/lib/help.c b/lib/help.c +--- a/lib/help.c ++++ b/lib/help.c +@@ -177,8 +177,12 @@ + for (i=0; i<17; i++) + { + if (!fonts[i]) + fonts[i] = XLoadQueryFont(display, i & STYLE_TT ? "fixed" : "variable"); ++ if (!fonts[i]) ++ fonts[i] = XLoadQueryFont(display, "fixed"); ++ if (!fonts[i]) ++ return; + thin_space[i] = XTextWidth(fonts[i], " ", 1); + } + for (i=0; i str: if "darwin_amd64" in url: - return "x86_64-darwin" + return None elif "darwin_arm64" in url: return "aarch64-darwin" elif "linux_amd64" in url: @@ -57,9 +57,8 @@ def parse_and_check(content): ) for url, hex_sha in matches: - key = get_arch_os_key(url) - - data["sources"][key] = {"url": url, "sha256": hex_sha} + if key := get_arch_os_key(url): + data["sources"][key] = {"url": url, "sha256": hex_sha} data["sources"] = dict(sorted(data["sources"].items())) diff --git a/pkgs/by-name/ac/acme-sh/package.nix b/pkgs/by-name/ac/acme-sh/package.nix index 0b7260e51ee5..daddea57ed14 100644 --- a/pkgs/by-name/ac/acme-sh/package.nix +++ b/pkgs/by-name/ac/acme-sh/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acme.sh"; - version = "3.1.2"; + version = "3.1.4"; src = fetchFromGitHub { owner = "acmesh-official"; repo = "acme.sh"; tag = finalAttrs.version; - hash = "sha256-eTNligdr4LV+yer+D2GJ1tdv2APP3I4Revjw1q8WrH0="; + hash = "sha256-xw10M4C6bqnxLxPeXE9dbFP/ajkpO2SQUJp56CeYysk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ac/acme/package.nix b/pkgs/by-name/ac/acme/package.nix index 8131a6dcdd99..bc3ea21358e7 100644 --- a/pkgs/by-name/ac/acme/package.nix +++ b/pkgs/by-name/ac/acme/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "acme"; - version = "unstable-2021-11-05"; + version = "0.97-unstable-2021-11-05"; src = fetchsvn { url = "svn://svn.code.sf.net/p/acme-crossass/code-0/trunk"; diff --git a/pkgs/by-name/ac/acr/package.nix b/pkgs/by-name/ac/acr/package.nix index b792eab73932..c36a415c2442 100644 --- a/pkgs/by-name/ac/acr/package.nix +++ b/pkgs/by-name/ac/acr/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "acr"; - version = "2.2.6"; + version = "2.2.8"; src = fetchFromGitHub { owner = "radareorg"; repo = "acr"; rev = finalAttrs.version; - hash = "sha256-fV4aBc/PZD1Grtq/KugTuzYAu/nsOntgDwsnFuAvHMc="; + hash = "sha256-uhjvtwDHXClYNqQVu7ATekWe6Xcy7DvNChlOf0au6T8="; }; preConfigure = '' diff --git a/pkgs/by-name/ac/actiona/disable-tts.patch b/pkgs/by-name/ac/actiona/disable-tts.patch index ec36dff532a5..6c39b65558b7 100644 --- a/pkgs/by-name/ac/actiona/disable-tts.patch +++ b/pkgs/by-name/ac/actiona/disable-tts.patch @@ -1,8 +1,8 @@ diff --git a/actexec/CMakeLists.txt b/actexec/CMakeLists.txt -index 49d8128..e8bfa16 100644 +index e7c1e38..bfa1a9c 100644 --- a/actexec/CMakeLists.txt +++ b/actexec/CMakeLists.txt -@@ -40,7 +40,7 @@ endif() +@@ -41,7 +41,7 @@ endif() setup_target(${PROJECT}) @@ -11,7 +11,7 @@ index 49d8128..e8bfa16 100644 target_link_directories(${PROJECT} PRIVATE -@@ -75,7 +75,6 @@ target_link_libraries( +@@ -76,7 +76,6 @@ target_link_libraries( Qt6::Widgets Qt6::Core5Compat Qt6::Multimedia @@ -20,10 +20,10 @@ index 49d8128..e8bfa16 100644 ) diff --git a/actiona/CMakeLists.txt b/actiona/CMakeLists.txt -index d03d650..222b2f9 100644 +index fe9e49c..922bec2 100644 --- a/actiona/CMakeLists.txt +++ b/actiona/CMakeLists.txt -@@ -125,7 +125,7 @@ endif() +@@ -126,7 +126,7 @@ endif() setup_target(${PROJECT}) @@ -32,7 +32,7 @@ index d03d650..222b2f9 100644 target_link_directories(${PROJECT} PRIVATE -@@ -162,7 +162,6 @@ target_link_libraries( +@@ -163,7 +163,6 @@ target_link_libraries( Qt6::Widgets Qt6::Core5Compat Qt6::Multimedia @@ -41,7 +41,7 @@ index d03d650..222b2f9 100644 ${LIBX11_LIBRARIES} $<$:shlwapi> diff --git a/actions/system/CMakeLists.txt b/actions/system/CMakeLists.txt -index a3019b1..6d9430c 100644 +index cf99ca9..90949db 100644 --- a/actions/system/CMakeLists.txt +++ b/actions/system/CMakeLists.txt @@ -67,8 +67,6 @@ set(HEADERS @@ -50,10 +50,10 @@ index a3019b1..6d9430c 100644 ${HEADERS_PREFIX}/actions/systeminstance.hpp - ${HEADERS_PREFIX}/actions/texttospeechdefinition.hpp - ${HEADERS_PREFIX}/actions/texttospeechinstance.hpp - ${HEADERS_PREFIX}/code/mediaplaylist.hpp + ${HEADERS_PREFIX}/code/mediaplayer.hpp ${HEADERS_PREFIX}/code/notify.hpp ${HEADERS_PREFIX}/code/process.hpp -@@ -140,7 +138,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS +@@ -141,7 +139,6 @@ find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS DBus Multimedia MultimediaWidgets @@ -61,16 +61,16 @@ index a3019b1..6d9430c 100644 REQUIRED) target_link_directories(${PROJECT} -@@ -167,7 +164,6 @@ target_link_libraries(${PROJECT} +@@ -168,7 +165,6 @@ target_link_libraries(${PROJECT} Qt6::DBus Qt6::Multimedia Qt6::MultimediaWidgets - Qt6::TextToSpeech ${LIBNOTIFY_LIBRARIES} ${BLUEZ_LIBRARIES} - $<$:Bthprops> + $<$:Advapi32> diff --git a/actions/system/src/actionpacksystem.hpp b/actions/system/src/actionpacksystem.hpp -index ea045e3..a5af35a 100644 +index 9214c00..3b13ea1 100644 --- a/actions/system/src/actionpacksystem.hpp +++ b/actions/system/src/actionpacksystem.hpp @@ -32,10 +32,6 @@ @@ -82,7 +82,7 @@ index ea045e3..a5af35a 100644 -#endif - #include "code/system.hpp" - #include "code/mediaplaylist.hpp" + #include "code/mediaplayer.hpp" #include "code/notify.hpp" @@ -64,9 +60,6 @@ public: addActionDefinition(new Actions::DetachedCommandDefinition(this)); diff --git a/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff b/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff deleted file mode 100644 index 476272f1b911..000000000000 --- a/pkgs/by-name/ac/actiona/fix-qt6-10-private-targets.diff +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/actiontools/CMakeLists.txt b/actiontools/CMakeLists.txt -index 94c809c4..eb3d7e8c 100644 ---- a/actiontools/CMakeLists.txt -+++ b/actiontools/CMakeLists.txt -@@ -292,7 +292,7 @@ target_compile_definitions(${PROJECT} PRIVATE ACTIONTOOLS_LIBRARY) - setup_target(${PROJECT}) - - find_package(OpenCV REQUIRED core imgproc) --find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml REQUIRED) -+find_package(Qt6 ${ACT_MINIMUM_QT_VERSION} COMPONENTS Widgets Qml QmlPrivate REQUIRED) - - ExternalProject_Add(external_qtjsapi - SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty/qtjsapi diff --git a/pkgs/by-name/ac/actiona/package.nix b/pkgs/by-name/ac/actiona/package.nix index b0013c50ecb7..5f32ed6cf058 100644 --- a/pkgs/by-name/ac/actiona/package.nix +++ b/pkgs/by-name/ac/actiona/package.nix @@ -18,21 +18,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "actiona"; - version = "3.11.1"; + version = "3.11.4"; src = fetchFromGitHub { owner = "Jmgr"; repo = "actiona"; tag = "v${finalAttrs.version}"; - hash = "sha256-sJlzrrpmo2CbzChCtiyxqDtjoN58BN4Ptjm4sH83zAw="; + hash = "sha256-PQNbbIErw/fnEyIy80+300g3YC4pEqUB/m9l1dXvORU="; fetchSubmodules = true; }; - patches = [ - # Meet Qt 6.10 requirement for explicit find_package of private targets - ./fix-qt6-10-private-targets.diff - ] - ++ lib.optionals (!textToSpeechSupport) [ + patches = lib.optionals (!textToSpeechSupport) [ # Removes TTS support ./disable-tts.patch ]; diff --git a/pkgs/by-name/ac/actionlint/package.nix b/pkgs/by-name/ac/actionlint/package.nix index 06008b257a97..0b0b0e8b388d 100644 --- a/pkgs/by-name/ac/actionlint/package.nix +++ b/pkgs/by-name/ac/actionlint/package.nix @@ -53,7 +53,7 @@ buildGoModule (finalAttrs: { description = "Static checker for GitHub Actions workflow files"; changelog = "https://github.com/rhysd/actionlint/raw/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "actionlint"; }; }) diff --git a/pkgs/by-name/ac/actool/package.nix b/pkgs/by-name/ac/actool/package.nix index a33cf769d26a..92e38b436951 100644 --- a/pkgs/by-name/ac/actool/package.nix +++ b/pkgs/by-name/ac/actool/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Apple's actool reimplementation"; homepage = "https://github.com/viraptor/actool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "actool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ac/actual-server/missing-hashes.json b/pkgs/by-name/ac/actual-server/missing-hashes.json index a0d80d456a76..9b2f64c6f2bb 100644 --- a/pkgs/by-name/ac/actual-server/missing-hashes.json +++ b/pkgs/by-name/ac/actual-server/missing-hashes.json @@ -1,55 +1,55 @@ { - "@esbuild/aix-ppc64@npm:0.25.10": "6ed1afe8ab7e186e94ca26c359c685d11394deb101f0d61d62ce00f1d29147edf04a441b532f2fd683484cd980973e41e0d9bca7a71fdf2d1bcf767d45d28d18", + "@esbuild/aix-ppc64@npm:0.25.12": "b2cc7e0cd348bc315907f6ce090ee545d4157a19fc44327ff0262ba9296f0fad19c57dd679b1b526a0a18f34f1971b128e15b41bca794c74a9b2c32238fdd537", "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7", - "@esbuild/android-arm64@npm:0.25.10": "3e2d57893179a673aebeeff8779e96532da0a9f204bd018f94fb7db258d65d1324e47c621a7d5399f5ae0a51337a44897e8e003d940d4120d749e57fb3b139f5", + "@esbuild/android-arm64@npm:0.25.12": "f770937988ec42e289277abc03800ccf88902684dbda3013a8ab274bb9eca36d35619a75f0f0510e225bdb4c7cf9a426218c7d2641a98fed74287a52d60d8865", "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2", - "@esbuild/android-arm@npm:0.25.10": "c0785d963c24bab19a8a07cfa47c174d7be7bf46e329726686d743a14604b096f3a85f42807ff72dd918094d117396d3005ae88a20f15b2304691fa7d8d6b7fd", + "@esbuild/android-arm@npm:0.25.12": "7a5d507aa717d85470c595e11f3c03fbf4f0bffdd10d30f49e1a3f14c2553191f156b214eacd6911fa36719faef23c28be7d88ac876ec300995987964ea16e99", "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3", - "@esbuild/android-x64@npm:0.25.10": "f49fbfeb6f95589ecc152668266a28ce37cc24c10756c203898be07af127b09eaf077428cef86dbcbd6f207706e8917dc6d354558afcf5cf7c532ea882b13779", + "@esbuild/android-x64@npm:0.25.12": "cd459b0433b0541bae9ffafd274c57529125719a5b78f4ee92aa9f8a1f54b002a18d889bee19084a503c114412269ef4e740d21b4a2de811ec2a076e96b35f48", "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa", - "@esbuild/darwin-arm64@npm:0.25.10": "2d049309a05272607dda18f59ce0b262ec1ae383133697b7a0c013c0835ec72910f61fd17a1be744c17562a092b1fa0a945ee1bd2cdcd029922c6401727a46b0", + "@esbuild/darwin-arm64@npm:0.25.12": "067f4588b9b64c93742c4a8cec35282dd076583006ce8089aae3095fcae5b606a2f60d86caf0527be6009be234178fb83d360af82698e2017a6f9fb9345e084d", "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659", - "@esbuild/darwin-x64@npm:0.25.10": "4eae1ae1486307a9cdc521e0416f28dff3f2693d051c81de15378bb100aef809f862526cb9c03360db69aa6832762b01b955f0a8bbcf8adc191af87d9f0e4e4f", + "@esbuild/darwin-x64@npm:0.25.12": "c29947d07adacadcb29092860b69d1b668d9c5abfaf525e2a7f3ece61c3f4e72a95c1c66ad0e80fbf31d01210ae4e8330d4ae6d9c6c9ad2b8aa159eb115f9a8d", "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910", - "@esbuild/freebsd-arm64@npm:0.25.10": "f4915a93ba262028f30fe5d87210ef84e1fa725cb76fbc4ab9c72c4d6a862d79c6ac2c54f6e606a8a53ab1ecf53c21fb5064571147e8a9a10aabf1a7d95f32f6", + "@esbuild/freebsd-arm64@npm:0.25.12": "c51691aeb04e41c554a59cbb5ab8d917446f352aeec70e3d5a7f25409e9115ff2db930589052df3e7d60f03eff4c298bda89db62f2408d1a49b6a70e69c5d4a0", "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee", - "@esbuild/freebsd-x64@npm:0.25.10": "94628bffea4936e26570450348be6629b1872ad73cc4af7efdc2bd29ba95a6f3bcfd87b3ce0371f61fee22bbfa5e6f9e148a6c6b8c62c5b32a0786ec4ba7b789", + "@esbuild/freebsd-x64@npm:0.25.12": "9b84c48176350811690751c34d1513005290641923a161f96cb433cbcbb8c072ecb92cef39ba641f48032071f74c6119e5f081b5788242109426c54f3ef1a01e", "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267", - "@esbuild/linux-arm64@npm:0.25.10": "ec1d900010bba313b403a7350a87e10ad0eb390373b290158e98902cb3ad15738596af7ad188942db1fec027b9e73336f193d8bce821097d13c224ecaa832550", + "@esbuild/linux-arm64@npm:0.25.12": "1e9cc29569890f5944e7dbe2e597eb19d76e85fe07aef6253129b16800ccb5b33a79cea17873d7debdf681d34adf77e06ae99742fe06cab095f3db441b741b1e", "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b", - "@esbuild/linux-arm@npm:0.25.10": "5459fc95b966199b27060a0926d5a1822d4c7f4132150fbbdee99eb3960b8cef8314c451c4f8c4d02e39c12b36267bbd59f030fda8a9b512ca2bd44dbb4bafe7", + "@esbuild/linux-arm@npm:0.25.12": "fcf091d6a51834c9a942ee33b568342990c7fa29d2ff338ce628a41bc415696d09bca7ef502c2b04518973010f73ab3d13e37096030db9c8d393ab29408f104b", "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702", - "@esbuild/linux-ia32@npm:0.25.10": "283430e003d45a698a3d5a4e1ccb243f0134679fdb839c4ef1b48c79b2d975969fa676e261a772eaa3042a9870f7392930974cca0a779ee9950698607d174c48", + "@esbuild/linux-ia32@npm:0.25.12": "ccd563c3189e5f651b479dd80d3bebd9d5c4747ce7448bb80266c804c3141eb3514b8c70445d77301899c54c1ff8c74614f8423704fde475a5c67efe86713235", "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac", - "@esbuild/linux-loong64@npm:0.25.10": "c8ae07926c5d31f66ae81db3267ae62c4f844abb87188a901c91f9ab7b8a88d381152a59a89c1bfef61459dafc0a066f722b3c410ef07801d2570c1497477b44", + "@esbuild/linux-loong64@npm:0.25.12": "6df2710d99d84006ad8151a9ca26861dbb97524a15e61f56eb1a5a76786865ad03be838fe3d414a72b239262364964528f3136c2965b3c442c7ed85090b145c4", "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d", - "@esbuild/linux-mips64el@npm:0.25.10": "cc3828db4e00fe8ab932c896628cd193aa40dcfb03584f776d3b6be141691f2b0379b5a3070cba56375b00181a13ed955d70e2f2f3c828a5a794ac9eb06f6a07", + "@esbuild/linux-mips64el@npm:0.25.12": "883bd8c4afd70b8e372db8a6bdb429d419ae30253a63987ff824994958d8431b6e51ead05e6372b2a233e025ea57f6f65b04ebaff8308e39acf54bfa73a5cae2", "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf", - "@esbuild/linux-ppc64@npm:0.25.10": "7f2995c79a76ed739fe85773cd9933f90ef50c003b3cd340db9c738e714e05698d48b355d0495ffef92f7444018454c1c7072992e5411e9466856388b24c1417", + "@esbuild/linux-ppc64@npm:0.25.12": "71f8544a3b99b4c95d49604b66d144e9617ae9925914c1bd5bc6731d15d4e48e7f8e9bffd85835e1c93a88c3537b53f3e99b500e4dd2533af9483055b02f9d38", "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff", - "@esbuild/linux-riscv64@npm:0.25.10": "3cba9a06e732e4c86f943699e47a2ac7dcbd225b753d2d004179069c860013a340033f1c7990e5adb62fd0930d6982baf43ce4f4e85a2cbd0d11eda30d7fdb54", + "@esbuild/linux-riscv64@npm:0.25.12": "fe8048262c5c6a040c047a9b7ab8547b0e7a32ce50f622ea8dadc3ec22065676efbc9b36896ca96959f77839757319633a2d05af5f2de7b32389a03b80f027f1", "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6", - "@esbuild/linux-s390x@npm:0.25.10": "b3e46636050ef3fbd80696545c84fae1969c3f58b0004af07044051b88623601da280d32d146d1f7f2b534ddff764e26dfd0baa6fa098e4379d8b7c476d7b631", + "@esbuild/linux-s390x@npm:0.25.12": "e5c023be1dfd75c915453763f944db8ab3da4f60a00c2b0e6f3b9349bc6c51e5ac5ce928db56e8f316e910213adf2172efd1b37abe070f6cda0c28583d770bab", "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469", - "@esbuild/linux-x64@npm:0.25.10": "c677043cba5cf7c1953429d09ed5efa23d6cad209feae2080c3ab14b2f30d56a926ea4a5bc3cd3fa20cfdc3e2c6bca2eaa68e91ee92608819d02aba6c6beacbd", + "@esbuild/linux-x64@npm:0.25.12": "8b2c7f5e00c40058f5c150df267cd303eae5907822f196902cd8e64af70475e800a7f132ac6388aa2b77b877d6314147e67f3fb67d97c867adccd54a2a6caaf6", "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf", - "@esbuild/netbsd-arm64@npm:0.25.10": "28049c2ad9a67b366a843931742d6a5bf535deebc0b5f6918ee69980ee35a4f16d38f1e4dc2bbb1ac00e852bebb5268fff9c41939ad81bc28e4d65ad9143e51b", + "@esbuild/netbsd-arm64@npm:0.25.12": "19bc5a1295697aa8787929472323494302d117ea1e592f17cfae443525c1e5917a5f77e6582fc1ec9de3a11a9e296bc12749c6b12cde0aab10695b5c25f29f73", "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687", - "@esbuild/netbsd-x64@npm:0.25.10": "36d4e9ab1b9fc28b26e571b72ec4baeb639e3596a2ac7cddb86c9c812c550fbe8f860abf4915f1053280b904f1a99fd26b2d1cde3c899ba33d394b6d0bdc383a", + "@esbuild/netbsd-x64@npm:0.25.12": "8eb2ff51aa39b43a021e4b51411789b6299fd0dc38b3896719684333e32fd42ed4508ab67dcc88435631e5333573a4848dbfeec12569de46c2318dcdb39ad3ab", "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240", - "@esbuild/openbsd-arm64@npm:0.25.10": "d477b47a4c4201c5c4b53d14299abace47f54d3f9311534bf667b14f3935cb9bfe40724e758c1ad595e29b8e8b2cd331de0d7c4a84da290261f6a48f94eb489e", + "@esbuild/openbsd-arm64@npm:0.25.12": "5ff26a012d0d35673bc3800d28f284a62c310801a68c55b2d1ed8a7e09ef7568117fb8ab2d7ec7a6e7d73ce6a9e05150ee07335fc6447ba98658469b9da1cb2e", "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c", - "@esbuild/openbsd-x64@npm:0.25.10": "15f4560420b57e548f26913d1bdbd00ae6535d912ce87b7e8e1a366b754511581fbfdf192c5622b1757bb56b082b316336853dfd6f6140a2b4c002c4ceaaff5d", + "@esbuild/openbsd-x64@npm:0.25.12": "41dce65493548bc0dc411a6175e9fb109a93bbbf370ef444d1459698226ad2a3096ab7edd420c27eb3d15e6bbd0bc79357bd7c0a59c5527ace0fefac181638f8", "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96", - "@esbuild/openharmony-arm64@npm:0.25.10": "3dd9f05a63e4bcb67a9097663c03b7d917bd1ae8338bafcd2f0cd788d672d729451ad41b993567ef067c49acf8581fb2bb949a4434e48b9492b6087c2a28032c", + "@esbuild/openharmony-arm64@npm:0.25.12": "b3e0502067e760e5b92d3180e20372cbb2dba8267fbb56206d50bdeccd8895feb408020b98c3f17054eea0f1fba365385850cb91d1f79a25dfa3751032278825", "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56", - "@esbuild/sunos-x64@npm:0.25.10": "1733bda6f4f5e13aa764ff27e454f5876ff72ed36bf94600a98791c678831c736f66130d527fa330b7f6cbea3d982491e8454f65a84583eb5da85588dec260fb", + "@esbuild/sunos-x64@npm:0.25.12": "50ed9767e00ff74a1d98d94c5fe6027bc5e9e095a64735d1d0676ec72adc4b15b0095e97f5ac71602f2c5fcdcf3e9f6cfe005315e998d9d3e12ca93a2076b639", "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6", - "@esbuild/win32-arm64@npm:0.25.10": "16fce99202539f6319f439a0db7b078b95ac4f18c1d9736a6fe0cbea1e88faf725e798af2f1a5ff3f39f9b47eb2fc70ec78b1b5dae35d06682748b245096a2e8", + "@esbuild/win32-arm64@npm:0.25.12": "4969d20da28a0c783ada6116724f51a542fad81dab043c4f6f9b7c8f4a68be558f03beb29d75bd550ab6e63f720535ebacb9ce1760099be7a63d4e1ec8351e2b", "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73", - "@esbuild/win32-ia32@npm:0.25.10": "c6db22bb001c8da006ee83b622b2ae2403583f1bc8e11ae88190801fb19e1c16da6e2356a15b0534463aac1170d6208a230a5aa26cacad4e85fda9991b77a389", + "@esbuild/win32-ia32@npm:0.25.12": "60ce7d21c5e01c8b0c8c2c4660ff6d890a32b1acf09f5499f950a86bc5c6da17eee760c6bb7a720a0429f7633bbb38b2db517e444408d8a6ff6fc76157310980", "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f", - "@esbuild/win32-x64@npm:0.25.10": "ec3c325501843d502292cc36a6ddb08ce13fdf5accc5c73b3c2084e6862a757edc4f46677ae5c9c32a0087fcbff2a894181b7e1881137641cc91a2ca146d7cc2", + "@esbuild/win32-x64@npm:0.25.12": "bbdc69d57d85a6b8af85731c0979186aba54eb34c8d1de5eab4aa1d8fd45e3b38b5426c287cedf43228bb0794a741d9b2c55284c7db7d79335bc33dc389e7bb3", "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2", "@node-rs/jieba-android-arm-eabi@npm:1.10.4": "60a55caf33f914d1b6b2947c88ea5fa9a58a84d2bedfccb8639162991b9092ec86964b64979c0ca0cf0d5e5be2766236a612b67ea03b3b3c4ec4d608dde2475a", "@node-rs/jieba-android-arm64@npm:1.10.4": "e54d5d1c8fab348ef86c1e0aaf4aea8e2e52924ac1c4bed6ef76588b7446122c332b593e4b471b3268eae4386ab991e9eb0337962b8f17bd2dafa1baf1b7c755", @@ -65,6 +65,84 @@ "@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", + "@oxc-parser/binding-android-arm-eabi@npm:0.127.0": "e7fd819437dbd74cf322c152800bf88bf791e181c6c95e027f709e8447bdad718abe8cd6281dfc8abdadc54201a63040d44ec9c08931dc06f2671656fa9bdbac", + "@oxc-parser/binding-android-arm-eabi@npm:0.135.0": "a47a390b49484c5f235298caf5a1392e7c2394e39fd08c320574902c85684ed53ac0e8303e273cf387f023c47ecd24afed6b5f7bb961bcf7c88d56a5f470ad52", + "@oxc-parser/binding-android-arm64@npm:0.127.0": "2eee0c6fca35fe0119d0870e2f97e1bb6deab419c5f50216a3c449047597639312e7b60485bf8a21c5268049d54296757c3c52583dacd2503e8f4d669dafddce", + "@oxc-parser/binding-android-arm64@npm:0.135.0": "09662b6d3753b2f3fbdad4396ae6b33be036062c238347412d9c7f1edfd2cad310358f8969ddb1347c70978161bcae661def6ee832d6242010167143d464367d", + "@oxc-parser/binding-darwin-arm64@npm:0.127.0": "1da8651d064bafe012ef049d8b79cadb923246a0ef3e58b90cdc98eb40a11af4bc23d64606ee292a8c0edcb1e70a6057322c8aa52a9d7a5d640697917bed262f", + "@oxc-parser/binding-darwin-arm64@npm:0.135.0": "67589e5ca2b81b03250dd6723b80fa84b5c0ad66d13b7f7a1f5d6eac075a957f5214b85f01147c1eb01c1f35488e5e9ab92c43748d2ab9b852150de64f0abb31", + "@oxc-parser/binding-darwin-x64@npm:0.127.0": "0c56f6bd4b853643b5827579b98a0786bdb3bffaa7dd3486f9b24c3f2f2d5357956ad9e9de79803ccc183293f54710360fcc85255dae0db70ddb36345d1c8cfb", + "@oxc-parser/binding-darwin-x64@npm:0.135.0": "bfec48010a9cc9d9ac66b8e33f40e68592945eb2d4a26a017f8d0e17a9ccd336602ed7c9f160ce630b9c23d13ccb84daa4a781fe00092a3804bbaf0247f3124f", + "@oxc-parser/binding-freebsd-x64@npm:0.127.0": "94ed852d51f194a573b17a1f91a962f8fb200cda46e1d5adc14d0e6c5f8d3d941521f596d5ebd5addff7002eb0983924ea36d0120618340b01e1a0830147883e", + "@oxc-parser/binding-freebsd-x64@npm:0.135.0": "b4401dc37384b237002cdaae6dd49cd1472bd6bd6385af66c3fa0b951da2bb2bb70b01f734ec06ade2bc8b129eb540764e80309e9842b2f8f1115b73712b1b74", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.127.0": "bdef00b9048e6ed29c8ebea9eb6b4a155bdf08d2eaf7dee2634fd3a456db7c3faedd3d9c0e51bf040caac86a01b1fb9b224447ba435324e5e35b10341ca40294", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.135.0": "2e3c4132e91ffa76f54f721ca0ae18d24529f5bf3886dc2737ee10b4bf47d0bd954187a3d68c861754ea339b0fe4384861cb6b42e681f8255c1b7d7d487fbb35", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.127.0": "4574976e4dc88000417299adfe886a527e5ad65e307d7ccb527371d74e7c39bcdb647802047853557e0be92a270096d520bd36af4ea152b675bd27ae701b4ef2", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.135.0": "6c21ba9e714d0c7af7c835bb574c20cf19eb7a82469a8c123c703a1ca04afb883d6dc87fc5a217f6e69b23fb7e5ecdd18b23c81195bec3e4f9a1654c31be91e1", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.127.0": "66aa5cacd1aec33b65f09d13fb32376ee297211cf1ba93c03f274e98a24f1ea41563fa73f3241c43af7813e301f11f65fe4cd759eb05efcca64955457d71bcb9", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.135.0": "f840e428a5afe3b3a18077c1e22210483aa67c0f2e7675471c2829eb8d2ecdea8082e4459b0e3219616c9f760fb5e15e4687a1455b8f4ce1b7807026e9c0bc65", + "@oxc-parser/binding-linux-arm64-musl@npm:0.127.0": "8e7146df02d2d2efb7549301ab0c31ac06cf779561db874c8c3b3fa1f2dc2cabbc8cb31e544da8128605a128c688399ada59000ff670bb03e5ff709156df0091", + "@oxc-parser/binding-linux-arm64-musl@npm:0.135.0": "86fe9381f2cdb52f81345fd3152e00b76fce57e41383277bf5071cb2eabf389dc17c4de91ca695eec1eba00a6cc2f63664332f9a4ba58e0187362b0b669e2d8b", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.127.0": "c0986057e6787120cc7f60f67ae61563b2873cbccb038ec880f969a43e7e7007c375971d1775b3694485d40e3216d5845f966c8f719fe87c5abcebe40149ee07", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.135.0": "50fc74f6aec424d34654ea2a553ffdf5bb765dc36ff05fee078bb063ac39defaba595c484c689a27d04312f0b0504a032067c6243a4ea4137cd4aeed74b7d636", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.127.0": "a4b39d58ce024a967a34cdf9af53c85ee8cad9f9bc7503eb7436a00428c80da6e30a383a224237e4b37d05d40ab2136c3f9ed532220bddff5203361a04234672", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.135.0": "410920d4cf238c469de0f5410893372caff906e178de243aca65302be9a248c6930c59c62151a09edc4b8303b097d16431ec9c9a42d0a040fd4b8085f7f3a98a", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.127.0": "1c1345817a5830c8b896e5283dd99caae5f6af03da50a14adb7a2060057ee6cc279cbdc665622f67234d2a84047672c2742288fa5a52359323a78fd1aa065740", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.135.0": "823e9f54ea425644ea12a95cc427ddfaa369027f6a2019a4fcffa7dc9eb6baf0f3c1589d3da60518c3429cdf752d427670ee938f9553366fb153522e316c0581", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.127.0": "d70bc89961b303494e8dc574b3ee4c64563e1217f32e60d9823bbe51421d19d713097607e12d588659b8ed79258b196b1809e085db52f6b3831613f64d9324d5", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.135.0": "2057e3b0a9397dbae5266704d0e1312d9f771c06602fc9c32952e15a8218cb7a1b1e8e2a1a4ad29a71f8975c8f922304bbf7d1bb00c9b8aa1a34c2fc6b80214a", + "@oxc-parser/binding-linux-x64-gnu@npm:0.127.0": "481f7a1f8757c987f578a75e8325a1bed03e89b8942455a6fe574b9d8adcb4079b7659fc9e58a000887dd0f5c4740ae2ac44269707e0a3d205cbceddcc75549c", + "@oxc-parser/binding-linux-x64-gnu@npm:0.135.0": "49b0e1e7b6f88cc5f4be698f6837209b0d6bb833ed7d35b0ff0e29a54c65ae65a821173945737fc1521cf27f8142b42f2a09794c5831630da84b414de272959d", + "@oxc-parser/binding-linux-x64-musl@npm:0.127.0": "6d16c6827c1ad4a275357717ffafbe3a3e59607f63ceeb6f36cbeecdc0aba6071d4ce6aadb5f9c7b8f77d2520f13388663d967ceb26ff93089aa117bf686889e", + "@oxc-parser/binding-linux-x64-musl@npm:0.135.0": "c1e44c559a5a49bd95ad15221b11f08756492bc70987d4492afa63f68874f8c5ec8dbcea84acdda655d96c9d60370954f68977d712f15ca59422591f47c61fe5", + "@oxc-parser/binding-openharmony-arm64@npm:0.127.0": "cbf640b4c9a7a491a7d8a5d2585842da84d306a23565ec6f079d845bdf3893cf9f1fe50e22e6d26e9ab98f8231606e49fb94aa346407eedf680d92716142ef4e", + "@oxc-parser/binding-openharmony-arm64@npm:0.135.0": "12364a2ce9c3adf119b85df4c922a83b220ca64f5fc77ed1c9504a1fb685b145edc67c46b3f9136d81b3b977552ff3dcd5262620a2a1579f54c7f9529ffcb35c", + "@oxc-parser/binding-wasm32-wasi@npm:0.127.0": "44cee540065e94ef484565a29cad59077cc065ac882cde5da8bfff3fc96e012f284f6c2cdaa5da62a646639850a7326a876bef4b8d402f1e50401b062bfe1426", + "@oxc-parser/binding-wasm32-wasi@npm:0.135.0": "6e67ad18fddbec5666a795596a56cee518726bd1b02c5e3158191a7503e697831c4cf4f53424230ce0a589b73203e89604e2ae55b06e3e021cf3e882f6938602", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.127.0": "998315e47c7ae648d512530e84cd248d6f74e3921573e1e9b14a73b70b3848d826e52fbe28022c7596fec02b055731a9a480b60a89c5e6f6f38dfbf13ec03524", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.135.0": "9b15a6109561fdd52a199c87c2808687494ad0848f6fab777dd1ad8f07103b2a8fa430344891bc572931b967820a6ebdf63d122ad45bd3cf87064992d84ea3ee", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.127.0": "d78eef92eb0203a7bb38cacaebb1364dd9c285365ffa204c29062e6f850e519be66b72b6d4cf9899084645906b8b9026d2957c6dab4bc2a20ba70c1e9790c3d9", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.135.0": "fb5f6271f619fb6606070fed933dbc6bd58564d5c89ee53e54dce6a5107c360c4490c786b1a39ebcfa0e405546496e2371348a81377c2ad16cc03864dc9328f0", + "@oxc-parser/binding-win32-x64-msvc@npm:0.127.0": "ab53173be7f2202ca31dbdbeb990b46983e8a2b8a7c643a8242d3e9d32f627160ca7f35dbb2c0a3d7b2709e7c94176239501712e5929835f5c758324655918c4", + "@oxc-parser/binding-win32-x64-msvc@npm:0.135.0": "ea5bdb283739cce9acba051f52aea7df8eb73fcd1e9ba8d7bedff31af101bf07398726e722930ef268781983a6e010914ef33f4fe540ba47ebd1c2d6cc7a0cd6", + "@oxc-resolver/binding-android-arm-eabi@npm:11.20.0": "869d3813513bae96b2f33c3acb13a2cd0af94c929b668f1bfab7380fa1610db28c66b6ef1859012d80ef81ebccdef3f8b65cfcb98002812eec8e20fac62714c1", + "@oxc-resolver/binding-android-arm-eabi@npm:11.21.3": "7753c5536f77492993647d75ecf63997fc2c28cc0f19526f714d187c326f28fcbdc41356cd0558b889fb5e002957e66ee4d9584b84a135f0ecb5b83a64077404", + "@oxc-resolver/binding-android-arm64@npm:11.20.0": "7fc6c58c43b0d45b3d1c5bea9c6da3c42efc1a33c1e5ec928f2abc4c745b6a2a0a1875fa785c97a99a59f7bdc81db9977870f47a5530075cef2ed398ba23687a", + "@oxc-resolver/binding-android-arm64@npm:11.21.3": "2283884a7140ad0fa625eaecaf1f7b3f89a5c605d2ba38f66336772f3acbd6035f437ee1b338fa22119fb79792f03a67a046c81d6affe0b3b397de6c19b03406", + "@oxc-resolver/binding-darwin-arm64@npm:11.20.0": "bbb1080d8ae8cc92ecc5c8bcf323c807ff00203cf1fdad7b8c66792445d270e6427f5795dd2bf54482a7fb72801e52eb8bb5ee861c052b27bb8ee845e7b5d1ae", + "@oxc-resolver/binding-darwin-arm64@npm:11.21.3": "aef8175b317e31d7f07dc67382be8deb44a4380aa8f905b4db80b6d919d91612aebd7f67a55fd65183c82d23af183c447254c2828a2529b673e49a2f18521060", + "@oxc-resolver/binding-darwin-x64@npm:11.20.0": "c470e8d3ace09e87ddba732d4c26b8066c00b5e3db235afeb01331ccfe369b2736ffee349db4d5141063ff3bf578839e4f22a08facd49d214874f789736334ea", + "@oxc-resolver/binding-darwin-x64@npm:11.21.3": "fd7f96fa2e7e29e3a9e73394e79a988b2ba91243e193d379aff8cdbf0a2f2f3222b9ff4226b5dbcac6ccb401541e9899262ed1e4418bc69de980d63acaaec82c", + "@oxc-resolver/binding-freebsd-x64@npm:11.20.0": "433c3692f2b8b67e787af9f24172c579a100863644896d4676ca58f32211e8d5a519a4e516c2eaab4dcbc4e7b6f384bb0b8e8bb044e2805a4e773e14d56d96fc", + "@oxc-resolver/binding-freebsd-x64@npm:11.21.3": "67f3c8791ee8d202c9c9bddc45ff82af26d10f8718dc70090525faa6083c04d78aaadedc1b19e71757c0c38f2010d9f9ce5c40ced3a43cd6c6b6aaa4b671858b", + "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.20.0": "71c57f90a16796a231184fec52caac9b6e7e22c39c81af9fbcf408a430c30852cefbd8658f7f523626bb43314ff300c92fe1080d994c9e90da4a3e21b271a5b7", + "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.21.3": "343434f09025f7f7f80c26bb1e6b34ee5704c9d81e7e5582cab8a18055887fa2e6a7c1d560cea3aee8cfd18180f65d622510186ebfdc0a270842c6290252c935", + "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.20.0": "76efe95e9b857d3207d8c711077eb2b60a919ade7e1778aa82463beaeac638fe4a002116f234aa0edec8f4fb7399bacb9b6f89ea4b490d2ae801e93973481638", + "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.21.3": "0680fed46aa5db6e8339e2436ad7382493bb701bb4d5481f6cf3056e0a6571ea3682b11e1c990ff24900c6418d3ac424ace2b0a43a660e33f32bbd9b0b6f56d9", + "@oxc-resolver/binding-linux-arm64-gnu@npm:11.20.0": "7650a239e45f488e1598296572c1050ca8e2278731bbb571a92f70cd524fe760a47ae3272c6fec65170c408789dccdbb0f1974064d11a17a27e08fffc00a7517", + "@oxc-resolver/binding-linux-arm64-gnu@npm:11.21.3": "664db26300f8fdcb5de559b883a59517e725e46c9a018c9de187bd360e4229be11d86ed942d214c8110c0c7c3fa6ed35b3c832dc07b12eeca11eb6ddcade59a4", + "@oxc-resolver/binding-linux-arm64-musl@npm:11.20.0": "1729fb7810c9a9a118ee5ebc49006491969c0785300808d6869c331cc2ea054fe2e49e0d7e9e433e6e12baefd20cd8b60cba5b29f1ac92192a20f7620493788a", + "@oxc-resolver/binding-linux-arm64-musl@npm:11.21.3": "20c8322222a1ffd162b9ebcc390bc6de3705e0f3efef259b87d21e502cf448911da289e0eaeb49aa1173c6e86580c06e824e711c7ada637a055e01095329dbe3", + "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.20.0": "607683f3bed552b1ac4b83fed81b4bc9dcae0b9b58c863573c95e791261ecffb13625b557c6c9e1bef3da5c1df79f041f5a7c8f93aed43b4b3ca1df33755ba6e", + "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.21.3": "5962128b365fba91c53dbe0d0c2898d48357d86799d9286255ddf23756480963ad51db5e1fa9acfabcfe30c742c37800450ad46d7b150b040f7caf4e54d6825c", + "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.20.0": "4a58183ecbccb76355582482dc052a8e92f25de4811f5d574c3d6b5169443d403d18f74e3f1373da0aa211b854072ed9ca765124f669a53ab1e8599d257b27dc", + "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.21.3": "cfc933789d035737e6ade6b229c4a09a6e35370c9f4b6b7f0f6631074fda83dce9739a918a904beec14eee874ff400e79d3c9003c4a9b733a30bf19122702ae8", + "@oxc-resolver/binding-linux-riscv64-musl@npm:11.20.0": "0d1e8bcc0c077f01305fa0f85d462a10d4bb09b25f3de8c077acfd6bae8f898989087b7b451a6b05978bcc8cf386fd5453074cc3c64e08b8465fdd99b795e131", + "@oxc-resolver/binding-linux-riscv64-musl@npm:11.21.3": "c2c3e4632a75307aa1c818e154713d993a862cc117ac6f498a80b713dd03558d90b6425650a38ff403e8a0bdab04632524777e4d5449b9c58c9557cae095533b", + "@oxc-resolver/binding-linux-s390x-gnu@npm:11.20.0": "4e81f672700db7c5f33c583f04851c62dcc5826c2ad7a366794e3aae21e4a1e4655dae0f563660a9883084da98f5998650b5fe3e1bb10b0d1817670d2060bb22", + "@oxc-resolver/binding-linux-s390x-gnu@npm:11.21.3": "034fb6020a70acbdec5ace9230fdfd8fe29f58767493884ebe8beb2f261a78cfa908fc2da9e52db1547c9d6535e9093d073a5b47ccecf61660faee90230d3875", + "@oxc-resolver/binding-linux-x64-gnu@npm:11.20.0": "9bcc10d91d411e1e3c22c8c5502edea1e95043101da2c1e28d06b046368055bd0524a51f16976003d453f0962626cabb232def1a94737e43ace6767ce06cb189", + "@oxc-resolver/binding-linux-x64-gnu@npm:11.21.3": "095e91519ad47c8fd190d3b7429a34f89d45044ed61e5356ddcdcfd3366ef8581dc5ce6c84daefe0acfb48bc6860853c46d04906095617a3a9d68e0459ef6d70", + "@oxc-resolver/binding-linux-x64-musl@npm:11.20.0": "89daa69818f1c7d6fbe53402589ef81b76e52d46d3fd45bf4f7139930a7bb2e3f9506017fa32baf22c30cc308737a57858777c00fd0f882fd6911f2a9ef90467", + "@oxc-resolver/binding-linux-x64-musl@npm:11.21.3": "855a3c0b7bd5fe86f6544d7a6780009f0513229d38c38f59c09087771c01b03c14380f168e8f4f45619ce1a93cab669096b06b1029ba7c3881c16bd85777a0f1", + "@oxc-resolver/binding-openharmony-arm64@npm:11.20.0": "d6e3767f86b203e07b51fe1750b29a2c7b7a9fb3ef73c5bc4f1f1e2991374d53ae1705e81c035cc48955bf47a24911e5f36d50ed45e43d318ae010345e00f8cf", + "@oxc-resolver/binding-openharmony-arm64@npm:11.21.3": "bb4ae4c1904799c5c522ab391d192ed6ae99d3c2589c885dad31a056a87e22391e3f83d7336c23aef87d43a26fe9fa823126048c15b5038382d0748f3c937891", + "@oxc-resolver/binding-wasm32-wasi@npm:11.20.0": "f748fd1c0e8c8ce47b4773e1fd93ea2386e0d605ee099e0a665637b4113dea286d2786a00b74958671c657c243fe1e7811ad798ff64baa899fe4347240718838", + "@oxc-resolver/binding-wasm32-wasi@npm:11.21.3": "58838221e4b4218454e2106d064734aee24a704f6cba39fd936762ab4d4a3a832c075e75ee617172bd5c61f55208793c36d4c73b94eda66ef08566a712bce719", + "@oxc-resolver/binding-win32-arm64-msvc@npm:11.20.0": "58cbeb0cf65845ab163a7bd53b6aea93e1d9a600028b87e018bf6a5bfd55756fcca88a961c9ef6e588c11d8bcfe8690347dd5e263f36a7336e4f034ac97dfbdd", + "@oxc-resolver/binding-win32-arm64-msvc@npm:11.21.3": "c3f631b772bcc242a32d4206172f9a8ade522fe957d6fdad5525f172b7ffad9e65bb92ed81b881f8b2a709a57ad55dc63d2caa4ddc0d791ab9f66bd9d8b6aa33", + "@oxc-resolver/binding-win32-x64-msvc@npm:11.20.0": "7b0973006a664c089a9feb7ccf9224a2d6a91c38e9e83e8e874bfd3ab1bc3e9d81c16bf68238455ee576a78441865e88f20d31439d538bfc916bd773ac6a98c8", + "@oxc-resolver/binding-win32-x64-msvc@npm:11.21.3": "499b5ae8adcc42957aeaca8068721dcc2d728940cd07bbe00a0d4bbebcebda88b1d36f7e28bc0f452747d06404bc7e3fc7c48a8f02a0ae42abb981e6d86807e5", "@oxfmt/binding-android-arm-eabi@npm:0.44.0": "f2b29210336a7a06da7b20dd7b793b3e5f0fb1785af1deb7ecce7a8360a694d20998cec5cdfa6ef97cf6d3ed964f7771c32ace3c762b091e4ff716663d153f40", "@oxfmt/binding-android-arm64@npm:0.44.0": "08581f63c72281f9abb02c8414803eb352c2b0b59d6a16ad525ae14c1f94cadec7986cfa3f1caf1f1ef6f35811c18f070b409fb087878c413d740d4da271373b", "@oxfmt/binding-darwin-arm64@npm:0.44.0": "e77c7798f60ac34847d861e7e26973c434d00de3ba8bcc789a9658bd55173dce42fbe2db7fa33535f77a6f3d806f95ed18a177ca1fd24035298aeec7d76ae5c0", @@ -84,31 +162,31 @@ "@oxfmt/binding-win32-arm64-msvc@npm:0.44.0": "d9aa3808de1a6e910e463235674cad17f90f015883bd1a74bdf9a1eb17b9ff0733f39f4d0a3af9b005fd55ec5584393fd1a6effb2858bd677aa205a2b8ed153c", "@oxfmt/binding-win32-ia32-msvc@npm:0.44.0": "b441cb9974a64d1e6dbca885000aaa76e36e6bf99020bd7172238b60c165587de737c6715259b19ac982bb5f3d008a1cf7088f8be06e4343c4acac7702da88f3", "@oxfmt/binding-win32-x64-msvc@npm:0.44.0": "35e4722f8594092dde9b5ee51693766928205c7bbab44e25710584ac13ae71460bf3dfe34d7222eba5d24d8bfb58700cf551873bea876858c1cb3fdb355f9945", - "@oxlint-tsgolint/darwin-arm64@npm:0.20.0": "34285104efbf3569d3c9dcbb4ce65c33970377fa2f5133bdc58a0b8dcedca269be03dac054c031f594782487b97a59b93084ea525e4acba5c4e45d10299f813a", - "@oxlint-tsgolint/darwin-x64@npm:0.20.0": "d5f5f6aeeb1bc08f1c74a7952450da97eeb4a8970bcb28645121cff9c9ce3cdce03da60c4814769f355ec9cc1c8e2b70f0ed268117cc383569c7c3b4da617d24", - "@oxlint-tsgolint/linux-arm64@npm:0.20.0": "93d1bad95440a976e8c241c1e233151bbe4bc8780bc65ea3605fb19851c59b8f7cc45fa0797398620c31b6b93c261964696bc9ab8fddf6ae625d2ba4981f171d", - "@oxlint-tsgolint/linux-x64@npm:0.20.0": "09a6529dbc46cd4b1f4f650beff905d306c264638a27ad36c46ef8631f64f689d660acdb1ced87c72406fd380b9aaa95599e6b99c73438eabc1854fd920cf6ea", - "@oxlint-tsgolint/win32-arm64@npm:0.20.0": "422cc8a91a65cb4bf39306da2809e963cb15fccd7600b7d99a6ada0f10cb6934ae1b6f25c881c27a2651e0bd601417f7cf6dbe65dd32f9bd862b5a76d8227a99", - "@oxlint-tsgolint/win32-x64@npm:0.20.0": "547630cebd56abeacae7af89df6fa46b9165732b34b72e6a0c95f2d619db9307bb0d4a7bae8039426a34c3412681962f6ee8cdd1db0bd333e287da6322b91766", - "@oxlint/binding-android-arm-eabi@npm:1.59.0": "fd7147e2bc930ffe34b5de0de3195e20372ce9a392bd0782f9d96ebe19e63cf7969da89cf7060d7f43ce1bc429ee14bd5b8dc8874fda3a5d0bc782d1cdd0662f", - "@oxlint/binding-android-arm64@npm:1.59.0": "f674440a9751e274d0ab588539cc13e5abe0c6464abdd423968572b034ff3e54c6f2a173d22df0425e16c997caf69b84b955f8457cacc908f331f54df6de2821", - "@oxlint/binding-darwin-arm64@npm:1.59.0": "29484896b54454e73932476adb9740c5bbac166c9fe138a6df921659efdca0b679822e463dae8b0baad54a30b0deb9038b0677ddcbc11680defac9df42b644cb", - "@oxlint/binding-darwin-x64@npm:1.59.0": "b16f0e20b766b66e71088ef484051ea266c9f730358aa1e41e20f02ca2a1455eed8133c3f7d79486ad0aab1930915bfe75426c2c16b8204d3e10f9a489cd0d5f", - "@oxlint/binding-freebsd-x64@npm:1.59.0": "5c00690cbe3fcdf6634e2e5424d1a415fc455cbd1bae264b3a0ce3ee3eed0eb8a0b825a2fd016c04afe79c863574557eed74734c5fecbd8643d62aa1d74219fc", - "@oxlint/binding-linux-arm-gnueabihf@npm:1.59.0": "a55e2a9ac39526a5a432fc4bc69f056e5507ad7344b082dde448e70fbeb7c180b1edcb62c377d38a99710662d8b935ecf2bdeb75ebf2b9e9425e6179616fc7a1", - "@oxlint/binding-linux-arm-musleabihf@npm:1.59.0": "5068f1da0497ec448e87cdc1c5ee99bfde09a050ba989b8dd3df445199360bde081eae327f52f4b37572ce300f3295444ba25a39108c19c93fa5859b9d1c8e5c", - "@oxlint/binding-linux-arm64-gnu@npm:1.59.0": "5a3a974a344731db64951c3aa3d591f82a2c69926bfaec1d42338aaa0a65cea97c94a68121d22441b655d80bfc0e8dfa81944136ed5a0abfb1353a46105d8478", - "@oxlint/binding-linux-arm64-musl@npm:1.59.0": "a2158b760c37796f5f416a2be77110935329a55788752073ac257de8d874a57cf954b90740dd1952c2f63c6d3958dad0077681de098406d4c3586ca92061804a", - "@oxlint/binding-linux-ppc64-gnu@npm:1.59.0": "88feb1b571f3c0eed7f020c5f06d729087571e9515a309eb3a54b25630ef0f951c07f81495598d634b0edc75abad07f1c1e595e2f42b5849fc82c90acf98825c", - "@oxlint/binding-linux-riscv64-gnu@npm:1.59.0": "88805ce56f0aef2dd0bc943bda3f1d2a4ca4e68765478714c26dbe95c42a7c3c8087b2658501ea36d1303b8f2aabb9c0d68586124cc0a20f8fca70bddfd598c4", - "@oxlint/binding-linux-riscv64-musl@npm:1.59.0": "1d99bb0491a1b02f2b2a71707d73527b1e43d18d0a5b1d964d6752af748f1e6ea73eb60d66dbce1681feba48152c636639949e9d3ab558e2c76ba58372ce280e", - "@oxlint/binding-linux-s390x-gnu@npm:1.59.0": "d5c3a9da18eb31597c59c17bb03eed3ca77360c0a8609097bf367f1fdcd33cf0c1a604cdec46376ff63c7741c723df060fc5b78adb256913f567a424996f665b", - "@oxlint/binding-linux-x64-gnu@npm:1.59.0": "963388bfd60e5497ec0f3e6d05b4567ed795f132f47cc7c112acc18231225403361e6d4f8b35923bbead94d9864e6c76754014dd6ef779dd85d4f9070605dd14", - "@oxlint/binding-linux-x64-musl@npm:1.59.0": "782a7fa5b28a87c2fb96fdce112625906c78df953b141f0d43e7c064eadbe4694535cddcc2bd05c7312eed0147002f4c45faabb1990e282cc0471de8e841628a", - "@oxlint/binding-openharmony-arm64@npm:1.59.0": "2a6bfe67c9b1ea1cd202bb84a7dd938343735afedcd2ef975f11879a0cb24a1fb7969ef47c9aa1d3f4255134483254ea83dfed7c1c674eaf9e0412371fa69b1e", - "@oxlint/binding-win32-arm64-msvc@npm:1.59.0": "2d8a5052bc2d959ddc57ce3ccaba237e4976e91a8bfaa0b3a658c05ba7b771f44098b406bfc610e0a2b25252d0b11f6d6240af9f095850e49d5252cd628914ba", - "@oxlint/binding-win32-ia32-msvc@npm:1.59.0": "1f17010c128674db9782107427e6db331aa53f437bc9fe2e97a9d37d8b25f9a011b709981af0ec1e0af7375840ffa4e3dbe9e10494c2aac949b71206cc934a63", - "@oxlint/binding-win32-x64-msvc@npm:1.59.0": "7d0562b3977c612e1278f8a2ed06e7e3f19a1242ba50510a68ca6adec5e6fa0d5e2aca50dbdbce69088991b233598aa8c514c5d84f5a5c1fa039b29bb453d49a", + "@oxlint-tsgolint/darwin-arm64@npm:0.23.0": "ab24b6a39b1f7f92307de7bbd84246836599f53da25ec45c7b35159dd7c5ec8cdd3cdfa3b73b8a0ea9a85d64af267be093232f633aafa184739b9822c14fdd95", + "@oxlint-tsgolint/darwin-x64@npm:0.23.0": "1ac3825249c7b7af11a3d854a98067cdeb37aba2ae63220861e5a4afb15fa01d3e5b565d9f726810d1d7ee04441917ac10b94180e2d2346c8969a3f16a11adff", + "@oxlint-tsgolint/linux-arm64@npm:0.23.0": "fac741be0b6ab3ba0b815cf1d0b37e0c878c374618d1baa19672780ecab79fe5f3dc993d6f70aa9cbf2aa5266fade4278563931d1d5d6a2c55d31fc9871010db", + "@oxlint-tsgolint/linux-x64@npm:0.23.0": "bb5fd89a2aeb1c859ae0f97ae81039616f95ac92e04efd88dd378703d88264117b935bcc824a25942b32f83bd05884103c02b1ea5bb91252df815327f8c42bea", + "@oxlint-tsgolint/win32-arm64@npm:0.23.0": "20bfa7f5a28d31ae3fae61c0cdb713c3c47854c7c9aafddf2881520902b2e66a5e0fbe617669b07e6fa613cd78af8a3b11378d02a927193933b3fbfb5cdb32e8", + "@oxlint-tsgolint/win32-x64@npm:0.23.0": "245a0c1cfb78a81dea25975397ad2634c74e9fcbc53206482e3f81d244620c865da7025375952a64a06bef590fc558fe33ecedb1db5d54a15d76ab5765091b22", + "@oxlint/binding-android-arm-eabi@npm:1.69.0": "e8cffa63f160db2a14c8bf5c715b51abbd84b8c0adc400b1ad21bb9db2bb0900ae1e0ddd77f81d99838ae1515dd4df4a7d0de37f429f11f6269ac2db1ceb1441", + "@oxlint/binding-android-arm64@npm:1.69.0": "5f3802330b9968ab061541f7b92080a06ce454eff6683ce224ea290d4decc1dcec3c809e8984bbb598e6c1f10ca532479f900d13b9627152cb43401526095eef", + "@oxlint/binding-darwin-arm64@npm:1.69.0": "04f32a6f25736a2a4543a213aeeeb0bc7ecbbeb030489fd2f52fdfe330aa245a1806e124e15c8ec9fb86d75f73545a46d3425d43cb1c7720e9bc5c23542c94e5", + "@oxlint/binding-darwin-x64@npm:1.69.0": "a788cb404b79772d825c46ee7730e97985ed39585d8434b48b249d02c8a2a44e2873d19f7b4d4da12a6abd4a2cd7a0120b385c87146437ec043a260743704187", + "@oxlint/binding-freebsd-x64@npm:1.69.0": "2bc52185fb3af1ace5dbba6eb1717a14631bd3981733fd10aa36e5d8fe825f0685cfda1ddfe477a63a530a95344fa6fa4e0e94ca1aea00feb19fb13f5fc687bc", + "@oxlint/binding-linux-arm-gnueabihf@npm:1.69.0": "06605e4dc6514100109bc66e6ab478c4d5d926d4238e712910837d05f423ae1d25eaa9f5cbf329f38dfa5e07d7031916c1e4345995efa2a4dd26a5a80ee97f99", + "@oxlint/binding-linux-arm-musleabihf@npm:1.69.0": "670147842e6d0eea03543f7b8e8bfd291876c597839eecb237493c37e21e14aea623e956e600e0766922f168cbb7fadbf7042e2aff381172baf8906a6e5ab75e", + "@oxlint/binding-linux-arm64-gnu@npm:1.69.0": "efb547265545d058acd31fd7e40d18f4e888da8b9a386f7f37f1179cc651da0db5c7ff4cbab1099b58656dbceaf3f6de951f97aba6cd206042df615a0efbfd34", + "@oxlint/binding-linux-arm64-musl@npm:1.69.0": "78d8e8b8bccc8c7a8e0afcd049f6705bc25b66a5d8fc509ea8be27f21f8ba6ecc683f87a7c468365d29c9ab41ba4471d0c453f98a4e581f06c09c4ae374766b0", + "@oxlint/binding-linux-ppc64-gnu@npm:1.69.0": "b5e8a95793baf3f83f291fcedd01538e672e557e7ddcf8057211e64276a53dc7081756c2b873610cb348fcf2a6efc1d751e518def65eee36277b92c294e33852", + "@oxlint/binding-linux-riscv64-gnu@npm:1.69.0": "5227ec211e9944530b9b05bd54ef36f7de9270f39018214ebc3832ced03617b84dd3086f588ac25e45a6e06bd21066a303ad207f8b6611592a144f9c09364115", + "@oxlint/binding-linux-riscv64-musl@npm:1.69.0": "45ac0756d43fdfdd9a4ae68ebc9c15385198f011d661db07b66552ae752a99f9bdc5b4efd00891c423bf5fe66de94088fe23c02427f44f6917ad9180a3bfa846", + "@oxlint/binding-linux-s390x-gnu@npm:1.69.0": "83f31f3a9a43c6a15b8e0a1008313d541db5357a2efa411f1e164362aaa79c468fba2e561c159edde35ebdd9d52137bde01ab40a18f48fccd9eaba573b659fe1", + "@oxlint/binding-linux-x64-gnu@npm:1.69.0": "7ca4469f595966587e967c23aa8cc54e330455ae6da4430888d8760972644469b8d4c2d74e092b923799b95a0b7149a38107b2473bb22741b9065fdd8bc7c72b", + "@oxlint/binding-linux-x64-musl@npm:1.69.0": "ab396a701dc3fd87e2ace55e97da092f5679b9721276a611d1e0843cf4d782cb25fe67392a2b1b59013f88ca6748a9c4b26ba5fe09a5cfba24d5c1b56ea895e2", + "@oxlint/binding-openharmony-arm64@npm:1.69.0": "987e1e3e1e42e41afc3e62744b674a13bc467f1683e41d40429d773fb5faea275ae74c12891186b4869de5315e51960be13c9a98ce8d044e1666a09505204cd8", + "@oxlint/binding-win32-arm64-msvc@npm:1.69.0": "d409472b8aa3784a18e79aa4d98b2acad9e6c483629a902f34acb47895b5fa36de31438dc880b6509fe815a0103a321b72729267698a7f29c14f10d4e8abf027", + "@oxlint/binding-win32-ia32-msvc@npm:1.69.0": "13b7b5702b644031e106d452f837dcd0aae4da21c6b1c770567886ed64fa834fbf9819e853fe61b9c582c2e726eaf7d4d666520c681e4fc10b8391a3fe10f3b1", + "@oxlint/binding-win32-x64-msvc@npm:1.69.0": "d25bc3ba61e59ab530e6d056727b0e805a4cadf22176ba383a851455bf0a08408ecf8ae51641ed0d0b78984fd8e1f52c06d56d386263f60c4667a1989d6e3db0", "@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", @@ -122,41 +200,61 @@ "@parcel/watcher-win32-arm64@npm:2.5.1": "0f467a731cf9403b8bc7d35418d991596cf5e7898029796b4c769bcbb38cd07ae6ec05ef0f19298e5f11e73ec5198bc474d79b056bdfbaea513525725103d7dd", "@parcel/watcher-win32-ia32@npm:2.5.1": "9ab5f3e9849a6077c8c2aba7bdf9030dea38f0ab9180792ecd30094520cddf16f3b68006f666845b86c5ef0e05c648364475c9ba151e0269561891ca3e276667", "@parcel/watcher-win32-x64@npm:2.5.1": "e588d87d5b892484d252ac8e1ec3f4bf7a664d91f0d03dd93764be8db2c35f81879275908dcbec42b0e43bc99c7afdfd29fe687ec022bb2c8c4bc7edd29eaa15", - "@rolldown/binding-android-arm64@npm:1.0.0-rc.15": "d93872015985b19d82db7a99deddfd1bc65c3eed7928004c36cec11b70e405b82907250c183367b47ebfa2bec83582b3369b91d288ad5308152ceff860ec2a8f", - "@rolldown/binding-darwin-arm64@npm:1.0.0-rc.15": "1b8240d7b1f0601d6efa84d48a232e8b0e6239477634c1b7af5b27055a10aacb893522ceb08fea8800e7ce5ec882307e069077ec8626039684a323a815ea1639", - "@rolldown/binding-darwin-x64@npm:1.0.0-rc.15": "a73ed937b8e7dde059cd600612c359ba02dd4ef3ebcd0df3e5a2e5c0e1a7e4c8360fbfd40c066de9a6f2af471b8322b49471a6261bd322417e9c7f955eb52335", - "@rolldown/binding-freebsd-x64@npm:1.0.0-rc.15": "f7c48373838b49a1f3ca592299c9e21b829e4efae62e9980a097655c01c9ca65f079e0d04bb5604887b09660d71ed6c83115dfeb94cd7d7cbcd67000a4e84edf", - "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.0-rc.15": "0681132aee29f8ffca4f436034f4bd6ebc4ac9ef15ac9857be09f991e9a1367f3e97d98f88e136659b5a5cab520f5a304e0551cb0f08320426f718c6475e64db", - "@rolldown/binding-linux-arm64-gnu@npm:1.0.0-rc.15": "9f1be6a7f61d913d678d77b21c499dce756d5b4d496c7665eb5015a7f9b0e52038121ab313b223448502a1f23f39f4952ccaf4651d65821ef8d0428730dc5d43", - "@rolldown/binding-linux-arm64-musl@npm:1.0.0-rc.15": "c13142d79451dfe6c38cc18f1ec170b87ef95546f45a465b9965b6f8ae8b162d278c77654400e69c9af7c09c8eb84c59edce6f741bc08e2f3553b019c40f51ae", - "@rolldown/binding-linux-ppc64-gnu@npm:1.0.0-rc.15": "10a94ad784a1997f5fb3756e44282b33524b32cfc52c622e81bcc1c178fcda3ca44734bd2562dae900e0637233bccc94f298764fd43acd5037c4b66aafab7651", - "@rolldown/binding-linux-s390x-gnu@npm:1.0.0-rc.15": "ef16b67d35aea455ae16c07dee6e58ec5515e2dee2b9ce0fa38752e15d12b2398f3e032485041e6234028d8ed85028c1072d73d2b0a912e0de5082ea89144cc6", - "@rolldown/binding-linux-x64-gnu@npm:1.0.0-rc.15": "8eb51515e2a1bd05120ff74728e972aa563b0c6d6968f78a79a9949b008c9826875c4fb74aadc7c2a1bff065d91970b706290a973128066c076007f471940f31", - "@rolldown/binding-linux-x64-musl@npm:1.0.0-rc.15": "1169f12fb17b8a58d5085a9968e4bd92b63bd05a9a693b9113b15b01d53c482150bdfa2226790d59c398f49e58d93200aa7a297a7994a31cd343152303a000de", - "@rolldown/binding-openharmony-arm64@npm:1.0.0-rc.15": "c34353635835a2fae1e637f7a02266204767901211438bd85c8d887bf741b81367ed3b5eed595f3cd707fe3b8af14a7ff53ad211f2a944e6e9e74dd4ca09d73c", - "@rolldown/binding-wasm32-wasi@npm:1.0.0-rc.15": "429df3739d6257244ab5d481fcc4b575c6c3f50bba7afdd9f3515832e7ae5175a215dbf591eade537fb2e6f7af38bc8022bc55bfffabfe650048563d65151304", - "@rolldown/binding-win32-arm64-msvc@npm:1.0.0-rc.15": "3cf2f7babe9e9b02b0dfa58b3eb8204753b4ed1eaa1e8567a932d21a5d90003dbb4b6279c928f15dfd9247dcbc8aca36fa6cae7790f25cffb91c3d4eacb7c0e1", - "@rolldown/binding-win32-x64-msvc@npm:1.0.0-rc.15": "cb262337da8a42a84b53430c101407a72c142b947a4588e55d6d1ff667e853fc704269436703761b127bf4895c1e205ab33b4630e603b8b5bef35aebe2c36afe", - "@rollup/rollup-android-arm-eabi@npm:4.40.1": "24131de0516010cd1c52d399fb17dbbe93b3ed6a981b57d82f363b9102a04083d470d0d7ead324fcc16e0eee7d54b7300ed3ce72bf43a4d277b959eb79f7490c", - "@rollup/rollup-android-arm64@npm:4.40.1": "6b02d5c1a8e5cb045ea9d382d71a9bfcd81da1d508ebeddf5c5118f99ce13b431af357a0458d922c03b26a00ca6ea72a861b1e15b370f20275ee73eff91fd7ce", - "@rollup/rollup-darwin-arm64@npm:4.40.1": "2c47b17a3670ff37a3a4ba6615f1514284317adedbf629b9d989f879f2ccd0c299f69c7733727150206b1edd96605ab9d94b6f0eae70cd7556542b436111d5c6", - "@rollup/rollup-darwin-x64@npm:4.40.1": "91ab2e444f00b9b98be9bc4d5bad1f1f180c3393ee6826417b1f50c5eb7cbca2b50a8fae08bfc920cff9a39b40d39ff5a06a0103598290bbe14d28caab8f2d4f", - "@rollup/rollup-freebsd-arm64@npm:4.40.1": "55486a57a0b2d276ba845d83b7d2423bcb4e16d47f7efb49d18d70c8bcda7f065750ce2754d2fcd3d6f038bf0fbf549e7a865cdad757fcbaee80681fc5b0cf31", - "@rollup/rollup-freebsd-x64@npm:4.40.1": "44d31a11edeea74bd271f929524c2b2adaa4d86912dab16bc8df19c7f36e373cec9ad8099a8784f8489d078a05b4a63d04988e7d2ff2473ee517f7703ed914a3", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.40.1": "7449ef4aec80aed3935126964bbe4f571e7f270da02cf0f52bb8c039f4f7d81060a709a4b075bf4fd7b4edb4098d51644bc69c1228edadd24deeb1fb57061174", - "@rollup/rollup-linux-arm-musleabihf@npm:4.40.1": "548823023482bc71faf8ea6e9a3a2ee818d7011fd09fe70a5d2923cf2d395f9b5a3f59acfa44e3bcf20c2da947375ddb4bd83ffa81c21ca32c625bd2eddfe16b", - "@rollup/rollup-linux-arm64-gnu@npm:4.40.1": "04c11ce49644b0fbeefdb6d61ee98cb55a3ff657f89bd610f14b45d6add78ac45f53d5bfbc48edfc19b979a60c127f4619a6d7aa42122db9a60ea638a672b5aa", - "@rollup/rollup-linux-arm64-musl@npm:4.40.1": "4d257c6f80178e59a889c0df9f1d6dc8b04f28e0c7d5ff7fc8ec8037bbeed7df55c928815f654553579c8fe2c1b7030dfa4f0c46db80b5e54df68141c1dcc04d", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.40.1": "e4d6fcc868ce49cc80dd3975b049998ac171a6c6faf10eec9409914bd49fd536a28c215e7d9f553af5107aa729bd1a8f524a0ba7eecaf4237368aaca555a7451", - "@rollup/rollup-linux-powerpc64le-gnu@npm:4.40.1": "3b4e4bcb11fac1048a3c93304a0efb0f84fa960b638eed465e17235a4d4d3b6710035b6b628936eefd37ba8d965773d81a27ba646952f50232ab94fc498ba7aa", - "@rollup/rollup-linux-riscv64-gnu@npm:4.40.1": "b83775740d1164c3bd07fea0c999f4a1d32c83769ee869905af24e91ba53b89a77000a78e76dcbe2210b30dce423bf4464c4d6a985b66d6c395d551745eb167e", - "@rollup/rollup-linux-riscv64-musl@npm:4.40.1": "ca1b09e4b0a34e85de5d82eb72a11604daa53c7a3612fe06110516770d31841885e54ec3cd9cd7233718616c286f81172e3a6840d958b63136826e91a8a75c68", - "@rollup/rollup-linux-s390x-gnu@npm:4.40.1": "e062f33b545d66baa4d794f96a7bdd6852db9f0749781fd5fe21f1c7348724b144ea1b0b92ea134edb6a7b02abbdeec36632147a77c2cfff2981836645b045aa", - "@rollup/rollup-linux-x64-gnu@npm:4.40.1": "4fe6c9ac21a6714f119934474f1f7553b84597569e4459d47469099479a1aab5f7384f59ff7e729d615883ce3454976a890d15eb6a372f747ba429fcde05b62d", - "@rollup/rollup-linux-x64-musl@npm:4.40.1": "61f05aa8f6df44385bc5c99850a95f791e14f63fa0e11a7f7351b3a4b45f7e719a4c5ae9562f772f3e08ce61ba887741e0564ae66e1c496aba2fde3e1cf97ec1", - "@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", + "@rolldown/binding-android-arm64@npm:1.0.3": "c73fbb421576421485f0d0f708df38938addbf48a237f08e8a4a46bad876cadf445c74c93008b3cea8c1be07a32a390a6067b0220aa838912b6a530f53f1338b", + "@rolldown/binding-android-arm64@npm:1.1.1": "7a6a6682dbccfa55cdc8653d1a1e92bdca1970616acb347dad8ff5f2495fb4ad8d1f7f5fce064ecfd72fa0df72dc10fadd962bf500a1a5c399d1c9dcbae2b749", + "@rolldown/binding-darwin-arm64@npm:1.0.3": "f140da4f3132f341a3f9c79e98d3baa6cac0034cbf4980b44ac37c67c523114feadacb5be451262923a0426c6523f5ba6f207d7fbdf4e95ac978add1ad829f96", + "@rolldown/binding-darwin-arm64@npm:1.1.1": "4aea3a7c56af47fd7e128f2e1038a83c3a6dab6ac6db181b30a9815b40bf8a2ffd676f43dfa690cd08092ca0d0c922705e3be98c0f81819cae9223bb7b64435c", + "@rolldown/binding-darwin-x64@npm:1.0.3": "ff7845f382344709fc166f7f87bea55eccf3400c2e3d7d70889c5be72640cfa7f7e2880893f8687776254cace09076767bb95ac7ed816547495e7d894f747651", + "@rolldown/binding-darwin-x64@npm:1.1.1": "c01c865bcf09162e3ab1c5c9bfaa461307b687708e1fda46c763ade305b4fcb79691501173670d12010c247bb671cb9682a6449c658d24b6e0388fa5a9bb65b0", + "@rolldown/binding-freebsd-x64@npm:1.0.3": "d6c401dfa68b6840a9a56e879198267ce8406f16108679caf6e6eb709c8ee0f2641c55d250b51ce47097000626c604bee7e7e2d9e2d70f71109b38e35fe4b836", + "@rolldown/binding-freebsd-x64@npm:1.1.1": "32fcac299ac43b09dfc17e478e7d0b13af742ef38dda5c4b41a5289c0b54479aca8e1c17982a8e5aa9f9a8ee8650bd145c0ac0f71ff3e19409063edb5d3504ef", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "8843aad46237e6a0569196eb605e29afaaf449c06ca4ed1a02e8083c86264f7cc940b085aafe6349f2011b2a44f6dfa8d58b55803e09561f12ea110bd3cb53ff", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.1.1": "b9354e847db640142a757470c3017253ec4f8ce65cf118bfe2e437fea5f30aaea98d7e416d04a8c8a2763f777fe20e982dfa2dc4cba2d498de050d03b7141515", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "dc34425af444478f539854b02683b14ceef88520634a1dfefbc12c6a2c403c9879c8697ff87188aef199d692508d1109d69f545d6cc3414bd409202fd7f5ca1c", + "@rolldown/binding-linux-arm64-gnu@npm:1.1.1": "7dfcf379e0a37fc31a5ec908be9a7821d58f5f93bc7a7d2c0209eb4c7908e4f0e1b6c3ec65619ce60b779019f3a75eafa61558667fd7e101cbeea20d143b6476", + "@rolldown/binding-linux-arm64-musl@npm:1.0.3": "f04750497d329d71e17b86cacbc64cc78c7bf8eea0653f40a12f6b07e0baf70054feb8418538937ebb7e909f3b8a730f34e06370d6dc9188a4ea00fd3a947545", + "@rolldown/binding-linux-arm64-musl@npm:1.1.1": "b558ea9c6a420be7ad757ee05c77c86107915930396b100ae6b687fc4a4aac2cb01603c8678674472f98d1c3c96a025f930b61ba8921065f2770a0b1bc3a1ef9", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "289963b6842c40d2a30457d6da2b824ecf4e502ae85e3ca7f48c45071b94a0759e327df7687b6930e418c71f7e6716ba43d061dcb9ff30e330708b4031b521eb", + "@rolldown/binding-linux-ppc64-gnu@npm:1.1.1": "f3269b611a8fe5b940ba9e233216f699fe5e04663cb51bd7ae6b2e6f2a3da00368851e9c4b159b2c52b029fc194768365afb808d85262fe97d3c819c988737b9", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "df6ef349cc8a8b8a6089726627f0c0db089ea57a4980bed6fae5e0246cdbbd2dbfa4e322ad90493a685ad895b21dfd982ebbebee159a7e50e873eabdc52fca8a", + "@rolldown/binding-linux-s390x-gnu@npm:1.1.1": "d6e516087d3dadbc14aa5e603985acb5db40f30968238d7c331a6165880f5851f4969bda1f7e8100f119d90bf6172d26f3f1987a68c7a471552be569000e6deb", + "@rolldown/binding-linux-x64-gnu@npm:1.0.3": "5d8faa3524898d23161a79ba6ad6fdeac8774c1a15c876a0eaadce582bcc584ec463ac8c2d685de509d04098202b67c8dfad515fcf0a614542af2b4260909597", + "@rolldown/binding-linux-x64-gnu@npm:1.1.1": "1126f59382a45e2b25754f9f834b66fb0cbba08b6cdc3fe88d63cfae56c7b753a995483c834326645963705f196fa710e9d1a2f5af7eaff6cfb39bd4afb0decf", + "@rolldown/binding-linux-x64-musl@npm:1.0.3": "a0cbdbba526790dd69f8de7810a90ee944f4a920f01326cff331702527b4dbf1377afd1dd9d65ded169f12fb3a1f0ec6d77c931a27e03cafcab453b2bfd3c317", + "@rolldown/binding-linux-x64-musl@npm:1.1.1": "6733c08cde69e0c471fb61d1ea9a128063da40612a1f028da325949800c9d1ea49bdae7eacbffb5fe95bbe1a651fef6f3f2466774e639a0016ad04bec3296f7c", + "@rolldown/binding-openharmony-arm64@npm:1.0.3": "ab0ca503f2b342e25f466dc65bd35d509ff629996086f480fefdfc7e54c0958d8f51daf51204a485f3c23b1405c824387524dd83a634f5a1304bf0c4722e0995", + "@rolldown/binding-openharmony-arm64@npm:1.1.1": "b977df43a86cd2a84a02cc857da9449b6ad1d98b59b6a951efce880672eef4f4d41547e71fc180d33d7cb452c40ee999d882a66568ffceba693342d3cea51dce", + "@rolldown/binding-wasm32-wasi@npm:1.0.3": "f540fdaebd7747dc436271fb8e22a60d08deac0b125e02f63cf0fd29cc0d228969d6ee6d49e150d9fd4f8bcd24795c116f86949bedce3cff505402ab2f4455a2", + "@rolldown/binding-wasm32-wasi@npm:1.1.1": "8d2b40ee92ccd7bb368cf73469825a36d00f0fd29b47fd895699efb1a1ecdb616f9459076e99b4c2d5f9e5ecf3f072405b8f2488c4392505749beef57f6ba4ef", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "b85acf5cd1065ae5260ebd43586eea6dca66675b8346fe42a14c3a95e46943f290684b36cf359c0f01c38256558e819c74571945c13adfcbdc6238ef018ad877", + "@rolldown/binding-win32-arm64-msvc@npm:1.1.1": "d3b31389f7354b0589fb7b1b2d4aabc76508ae6ac85648567792b32c66d80a683ced8ee02af9165f3fcfe0fa094996f69f3a1ea37c2d1d5b404c0f83ca890934", + "@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d76ebc4fb315deddce845b82eaa07eedf88bb5f9500fa50d241805055dea593ddfcbd762d59116f35ecd6b4bcef3dba5e513180e8d9301486eac272904ce91cf", + "@rolldown/binding-win32-x64-msvc@npm:1.1.1": "6e7cea53c2d7c5d14479dad8b1dfb29d761ac4a1eee34e4a0afaef470afa7e8aeb4442f127b25ca5763597902d3a26e21f431d6676d5d45088b0ae8c47e56ccf", + "@rollup/rollup-android-arm-eabi@npm:4.61.1": "fd5cd7af9a2046adba5537f304ce3655cbe260ef5b362ac618223c0bbe1a28751077daf86c087cb5b3955ab19881ac2a79ead2f3e5122b284f43ff9228db2124", + "@rollup/rollup-android-arm64@npm:4.61.1": "be6b2f5f56f41e540ebb73640ca0d370e530d54bf0c18920e22ec5f6671780d3c6a4235d2257b06189aefd6e26962aeb93f8c4a2fc94f9b3dd4ca2137f40cd68", + "@rollup/rollup-darwin-arm64@npm:4.61.1": "29ccb594a4430bdc3ea218d1bdb46f88e1a905a54be392149fb362041c6970a916a6dfc87205933fd7eb4ef28be59b1e5404e6bae668722437c09e84a31a7392", + "@rollup/rollup-darwin-x64@npm:4.61.1": "f41ea58bb11199edccc0f5dd8bb5345761b4c699471b2203dd5a1d8adcc941992f483af6ecae2392ecc62035326c92d75a1afc6fb4f042d36f66a7ca596bcb89", + "@rollup/rollup-freebsd-arm64@npm:4.61.1": "72bdcdc77e678b14ce7cc28e94cab6661dcf1996dea4429c3d2466d2144594fb07696c95712915f8152b2dd2e1882ac02cfad9a3f8c7ba76fc7f846a89690262", + "@rollup/rollup-freebsd-x64@npm:4.61.1": "a238708436561e52676b7074832d8b931b12a44ef2f54e552b595bc2983de2f60e0ea2052181e8f06c957c3f34fff8f1c2ced0cba4e52f48728a339b4a345578", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.61.1": "c802eaba8a15f09e32e30ba12e9dcf83e730252cfc708dc123974fdbb937b3f980df99a18f402e06f17fedd65592e80e185506630dbe9339c3611ff19be1f490", + "@rollup/rollup-linux-arm-musleabihf@npm:4.61.1": "20df453fd690bd797a249ab533a0197d0ec2dccacb9936708e7d2657ce5ac8ddea437d82c107fcba589da9cf3b5ca71398678623c8a6140f295350db4ef08c22", + "@rollup/rollup-linux-arm64-gnu@npm:4.61.1": "a850f2f536b531392bb5bc13fc1bb44d26fdb423b2178978d500a7658ad58dae21e37e3a6df3f66628cb6eca9edeccd88d72bf51d2e9e0a2aacedf1406e381fe", + "@rollup/rollup-linux-arm64-musl@npm:4.61.1": "e807e807f3207410e70578e1e83dbde94c1d2b094890d0a460d2bc689efd27dce73109a9e7b69d9feb8152143eee372045d7e8debfa8a58f3acfd76e68f519a7", + "@rollup/rollup-linux-loong64-gnu@npm:4.61.1": "cfe726d4f4f48020c40188d7261a7b5a630aa42d05c968caf3af0fa9418e08d81aae3a8c49104b99122c604190de05960da327214801541ac8adb207e1e1fcea", + "@rollup/rollup-linux-loong64-musl@npm:4.61.1": "0864a9a351ef3f6a98bf83316c4c4f7a80a3d5ec783abbb8ab279d879c420a2c42aa053477f8745ac38adf9797bb9bd60230920de44462e908713022aa32a01a", + "@rollup/rollup-linux-ppc64-gnu@npm:4.61.1": "934159e0082c1a8cfbfa4826b0b6917dba511e41910a0b8fa2c131d155e058950ffb278e0ffddb01202d8cd13eea197df1beec2df0ecba7f695336d014c3726b", + "@rollup/rollup-linux-ppc64-musl@npm:4.61.1": "0b914ba577ac83dff0e8e5a7cf3ed7ab2a8e1c0fbae040e300be2324b34252a98c703623fdd2ddbdf7d95ce8dda4167056e7b4946e615211e8866500aef206f0", + "@rollup/rollup-linux-riscv64-gnu@npm:4.61.1": "f48f9cb2defc84c2d4e65ef13537dc75e71cd6d8496e2c7c5506fde5af517dd6386eff3ec05422c154f408e58e57a986f4e36436709cee26a6a33931a88df246", + "@rollup/rollup-linux-riscv64-musl@npm:4.61.1": "0130e81563fb9557a036ca86f6fdeacfc507ae46d2fa012930f19cd223f9fe1babdba9784a2031f5b1be2cfca246cfb5484729e90e0394288f6d4e8514abe81c", + "@rollup/rollup-linux-s390x-gnu@npm:4.61.1": "8a01d73269e2e94628e963418f61fa03102f3d88e48cb3e529a2d7420e651f69ae556726f5727d7a57eb13c7c29a5f4f7ca316a010c2f6dd88ccab23bd3ed8be", + "@rollup/rollup-linux-x64-gnu@npm:4.61.1": "5aca669c49417c9eba5d1286e6d790ca418ca936cc7192f8477a91b9b07f8ec89f6c3af54bfe77544e71dc35d6f0036728939d99b20b48afdfee51d5d8ed345c", + "@rollup/rollup-linux-x64-musl@npm:4.61.1": "652f1b656ced1b4740390c4e96576c34c315feaef2e53d4518bccb6a99f65a038d09ec84368b929536ea98825aaeeac063f0659135587b2d3a1eb2f7393ced97", + "@rollup/rollup-openbsd-x64@npm:4.61.1": "591cd3849455b60ef63630c0d81b5063e371f5aa66ec1079e284852923891a83b4da79df3b76fecaf5d88fdc35eb8562846ab8de795c0693b31549db07f26e24", + "@rollup/rollup-openharmony-arm64@npm:4.61.1": "447d233e8013e67a0eba11213dc3d5479bb1e033cac5a7c7b542317e56ca4cbcb36acd22c3e01647097b499757d4b903045ba1b8163896db783414acf97738c9", + "@rollup/rollup-win32-arm64-msvc@npm:4.61.1": "182fd287aaf581def8fe46473de970deb11dc0b1afce31591fca78b2cc0b1bd7812a774009ad648263918f83a4ec22845d531495d4b38e76450ceea9928a6293", + "@rollup/rollup-win32-ia32-msvc@npm:4.61.1": "b74b7dce07f245137416d6cd90eec78e3bb6302d43e80cf970ec2193feccb729ce507f2120607d9696348a81cb704834396de62b13121b047e05b414bd4a55c9", + "@rollup/rollup-win32-x64-gnu@npm:4.61.1": "b4313203bf739d6ad57ae9af9a339ad05b5e5419c26a935d66526e557e6203befe280e68e3b81adf817b923bc40133486ebcf092f5668a4ee05c1835c3a58a86", + "@rollup/rollup-win32-x64-msvc@npm:4.61.1": "66cbe576533a7702b0ce88d0191980a631293d0a9f4a722a7e8d3df1efbd80a63a7a68fa512f4067a7685da075bd85af157b07c4108671a969e8d566662a64e2", "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260421.2": "12273bab953bbacf429e4895db7ac5e40b05f3e1511b7053119eafad99af9241f893e975e29735403f7247a4a1a22f56a5eca0d84ec300dc705c77ebc4292b61", "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260421.2": "711451bef67dbe18e0a7fdfd5915f74935d76c8d22ac1f0bc74df55af66d6a782f7b91f3cdc7ff4773f02c5c84fbd3c79061e3888707735089d45148dc262910", "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260421.2": "b1ffbf30be075be6cf8ed9da314326ca4050a31ed33fde3daa90fddc37518d62695abbbc1b1f212cbf160c22fff760fa2ee9b447a16fe6e14fcf36329df9bad5", diff --git a/pkgs/by-name/ac/actual-server/package.nix b/pkgs/by-name/ac/actual-server/package.nix index 65403cf8824b..d0d4ebb7270e 100644 --- a/pkgs/by-name/ac/actual-server/package.nix +++ b/pkgs/by-name/ac/actual-server/package.nix @@ -15,13 +15,13 @@ let nodejs = nodejs_22; yarn-berry = yarn-berry_4.override { inherit nodejs; }; - version = "26.6.0"; + version = "26.7.0"; src = fetchFromGitHub { name = "actualbudget-actual-source"; owner = "actualbudget"; repo = "actual"; tag = "v${version}"; - hash = "sha256-Ulz3M5z78mJQRr+te7qwVCeULCgEfE17NECSBagbI88="; + hash = "sha256-KePWt08rAhLZUrgyN7tdFUQXR/5y0TvakReji4eMwxg="; }; translations = fetchFromGitHub { name = "actualbudget-translations-source"; @@ -115,7 +115,7 @@ stdenv.mkDerivation (finalAttrs: { missingHashes = ./missing-hashes.json; offlineCache = yarn-berry.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes patches; - hash = "sha256-lC9+B9agqwVARfMhXSTjb6cBj23PQz+RpZZ700jypF4="; + hash = "sha256-eZxQAf2AfNd+0wrSEmE9kg5XWdqhE3Dlf6OGc1bZhXA="; }; pname = "actual-server"; diff --git a/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch b/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch index bc1a646f3774..36a538d849e4 100644 --- a/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch +++ b/pkgs/by-name/ac/actual-server/yarn-4.14-support.patch @@ -1,26 +1,32 @@ diff --git a/.yarnrc.yml b/.yarnrc.yml +index 597597bbc..0ff5d2399 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml -@@ -6,8 +6,9 @@ enableTransparentWorkspaces: false - +@@ -6,11 +6,12 @@ enableTransparentWorkspaces: false + nodeLinker: node-modules - + -yarnPath: .yarn/releases/yarn-4.13.0.cjs +approvedGitRepositories: + - "**" - + # Secure default: don't run postinstall scripts. # If a new package requires them, add it to dependenciesMeta in package.json. -enableScripts: false +enableScripts: true + + # Supply-chain defense: don't install package versions published less than 3 + # days ago, giving the community time to catch compromised releases. Trusted diff --git a/yarn.lock b/yarn.lock +index 479cebb2c..9d78fba85 100644 --- a/yarn.lock +++ b/yarn.lock -@@ -2,6 +2,6 @@ +@@ -2,7 +2,7 @@ # Manual changes might be lost - proceed with caution! - + __metadata: - version: 8 + version: 9 cacheKey: 10 - + + "7zip-bin@npm:~5.2.0": diff --git a/pkgs/by-name/ad/adbtuifm/package.nix b/pkgs/by-name/ad/adbtuifm/package.nix index 233bb5a818d3..3fa01b1e20b2 100644 --- a/pkgs/by-name/ad/adbtuifm/package.nix +++ b/pkgs/by-name/ad/adbtuifm/package.nix @@ -17,7 +17,7 @@ buildGoModule (finalAttrs: { description = "TUI-based file manager for the Android Debug Bridge"; homepage = "https://github.com/darkhz/adbtuifm"; changelog = "https://github.com/darkhz/adbtuifm/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "adbtuifm"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/build-support/setup-hooks/add-bin-to-path.sh b/pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh similarity index 100% rename from pkgs/build-support/setup-hooks/add-bin-to-path.sh rename to pkgs/by-name/ad/addBinToPathHook/add-bin-to-path.sh diff --git a/pkgs/by-name/ad/addBinToPathHook/package.nix b/pkgs/by-name/ad/addBinToPathHook/package.nix new file mode 100644 index 000000000000..e8a208611c52 --- /dev/null +++ b/pkgs/by-name/ad/addBinToPathHook/package.nix @@ -0,0 +1,9 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "add-bin-to-path-hook"; + meta.license = lib.licenses.mit; +} ./add-bin-to-path.sh diff --git a/pkgs/by-name/ad/addchain/package.nix b/pkgs/by-name/ad/addchain/package.nix new file mode 100644 index 000000000000..03a03ebe70f2 --- /dev/null +++ b/pkgs/by-name/ad/addchain/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: +buildGoModule rec { + pname = "addchain"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "mmcloughlin"; + repo = "addchain"; + tag = "v${version}"; + fetchSubmodules = false; + hash = "sha256-msuZgNYqN1QldrbXJJ4BFXYhUsllAPt8W0KRrr8p6TM="; + }; + + vendorHash = "sha256-qxlVGkbm95WFmH0+48XRXwrF7HRUWFxYHFzmFOaj4GA="; + + ldflags = [ + "-s" + "-w" + "-X github.com/mmcloughlin/addchain/meta.buildversion=${version}" + ]; + + passthru = { + updateScript = nix-update-script { }; + }; + + subPackages = [ "cmd/addchain" ]; + + __structuredAttrs = true; + + meta = { + description = "addchain generates short addition chains for exponents of cryptographic interest with results rivaling the best hand-optimized chains"; + homepage = "https://github.com/mmcloughlin/addchain"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ + ambiso + ]; + mainProgram = "addchain"; + }; +} diff --git a/pkgs/by-name/ad/adenum/package.nix b/pkgs/by-name/ad/adenum/package.nix index c44a4e2d37bf..ca4b5d811ce8 100644 --- a/pkgs/by-name/ad/adenum/package.nix +++ b/pkgs/by-name/ad/adenum/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication { description = "Tool to find misconfiguration through LDAP"; mainProgram = "adenum"; homepage = "https://github.com/SecuProject/ADenum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ad/adif-multitool/package.nix b/pkgs/by-name/ad/adif-multitool/package.nix index 0d080ee66a17..67e9f9ef4282 100644 --- a/pkgs/by-name/ad/adif-multitool/package.nix +++ b/pkgs/by-name/ad/adif-multitool/package.nix @@ -5,15 +5,17 @@ }: buildGoModule (finalAttrs: { pname = "adif-multitool"; - version = "0.1.20"; + version = "0.1.22"; - vendorHash = "sha256-U9BpTDHjUZicMjKeyxyM/eOxJeAY2DMQMHOEMiCeN/U="; + vendorHash = "sha256-Fin0DUvpNPqKXpbDVekvWZYghJIpMLY9IRr2wdbZczc="; + + proxyVendor = true; src = fetchFromGitHub { owner = "flwyd"; repo = "adif-multitool"; tag = "v${finalAttrs.version}"; - hash = "sha256-qeAH8UTyEZn8As3wTjluONpjeT/5l9zicN5+8uwnbLo="; + hash = "sha256-UYnm4S4DP0c2ZkPkPScUHXdKiAz6JY9Lzdu4mAO49Dc="; }; meta = { diff --git a/pkgs/by-name/ad/adminneo/package.nix b/pkgs/by-name/ad/adminneo/package.nix index 6f4760666a89..00b4aa13d4a2 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.3.0"; + version = "5.4.1"; src = fetchFromGitHub { owner = "adminneo-org"; repo = "adminneo"; tag = "v${finalAttrs.version}"; - hash = "sha256-hJwqI8zT2ZAapJMpUZ+izJo3DF5I5NlO5HhPyxoM9b0="; + hash = "sha256-vnvLRPMiVuSEAQJSPBGM63LppQ7pZv6ZaQnUTpUw9W0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ad/adreaper/package.nix b/pkgs/by-name/ad/adreaper/package.nix index 806fd1a78eda..29f7e2641905 100644 --- a/pkgs/by-name/ad/adreaper/package.nix +++ b/pkgs/by-name/ad/adreaper/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/m0n1x90/ADReaper/releases/tag/ADReaperv${finalAttrs.version}"; # Upstream doesn't have a license yet # https://github.com/AidenPearce369/ADReaper/issues/2 - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ fab ]; mainProgram = "ADReaper"; }; diff --git a/pkgs/by-name/ad/adrs/package.nix b/pkgs/by-name/ad/adrs/package.nix index 5a07f2c0482d..9617d8aa9746 100644 --- a/pkgs/by-name/ad/adrs/package.nix +++ b/pkgs/by-name/ad/adrs/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "adrs"; - version = "0.7.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "joshrotenberg"; repo = "adrs"; tag = "v${finalAttrs.version}"; - hash = "sha256-JtYj30XGs+SbbbSy1aHbyZFlwQ/rkZ3JPrvRm4hicxg="; + hash = "sha256-sYeJ+5gAZXjKiwHLcS2iiBM3OZUWXo6lS0OxiNLtBXM="; }; - cargoHash = "sha256-uvgadUtRmHoa3piEiTaLhVKEeGA/YIl6AMRPHNubYhQ="; + cargoHash = "sha256-jI0FAZ+QzqTTiRKcnfo1Uh0J1rFWNqNvSLQU/GIjLbc="; meta = { description = "Command-line tool for managing Architectural Decision Records"; diff --git a/pkgs/by-name/ad/adscan/package.nix b/pkgs/by-name/ad/adscan/package.nix index 9de29420fe0e..7cf5a8c46657 100644 --- a/pkgs/by-name/ad/adscan/package.nix +++ b/pkgs/by-name/ad/adscan/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "adscan"; - version = "9.1.0"; + version = "9.2.1"; pyproject = true; __structuredAttrs = true; @@ -16,7 +16,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "ADScanPro"; repo = "adscan"; tag = "v${finalAttrs.version}"; - hash = "sha256-YsJFOJtf2rubfAXHWlu6c7ZLX8QE1KZFcFof56MsPVo="; + hash = "sha256-gBlS5co1LUu07Xz+JZWi4zNOPtPHGfl+StpFPauOFG4="; }; pythonRelaxDeps = [ "credsweeper" ]; diff --git a/pkgs/by-name/ad/adslib/package.nix b/pkgs/by-name/ad/adslib/package.nix index 72f9602714ac..d5ea2a987392 100644 --- a/pkgs/by-name/ad/adslib/package.nix +++ b/pkgs/by-name/ad/adslib/package.nix @@ -5,18 +5,17 @@ meson, ninja, pkg-config, - unstableGitUpdater, }: stdenv.mkDerivation (finalAttrs: { pname = "adslib"; - version = "0-unstable-2026-04-27"; + version = "113.0.34-1"; src = fetchFromGitHub { owner = "stlehmann"; repo = "ADS"; - rev = "77953d58f2690436e82db9954e2e55878c5edaa4"; - hash = "sha256-UDPuzqD1krEZa7436k1NvE0lJUmNYG4kiP5fstoRDMc="; + tag = finalAttrs.version; + hash = "sha256-Kh8BDioZdwSdATHPgZ7Ar3/E0y3eRRpG/38/2uHZEEQ="; }; nativeBuildInputs = [ @@ -27,12 +26,10 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' # Downstream consumers (e.g. pyads) load the shared library as - # `adslib.so` rather than the meson default `libadslib.so`. - ln -s libadslib.so $out/lib/adslib.so + # `adslib.so` rather than the meson default `libAdsLib.so`. + ln -s libAdsLib.so $out/lib/adslib.so ''; - passthru.updateScript = unstableGitUpdater { }; - meta = { description = "Beckhoff protocol to communicate with TwinCAT devices"; homepage = "https://github.com/stlehmann/ADS"; diff --git a/pkgs/by-name/ad/adw-bluetooth/package.nix b/pkgs/by-name/ad/adw-bluetooth/package.nix index fde7d2367c9a..2052e675c892 100644 --- a/pkgs/by-name/ad/adw-bluetooth/package.nix +++ b/pkgs/by-name/ad/adw-bluetooth/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + buildGoModule, meson, ninja, pkg-config, @@ -13,17 +14,27 @@ libadwaita, }: -stdenv.mkDerivation (finalAttrs: { - pname = "adw-bluetooth"; - version = "1.0.0"; +let + version = "1.1.2"; src = fetchFromGitHub { owner = "ezratweaver"; repo = "adw-bluetooth"; - tag = finalAttrs.version; - hash = "sha256-/KJpB9i6tFDnB3C0tPtJtt8tTDfNftIkHmP1JSVSZNY="; + tag = version; + hash = "sha256-0rySzx03KeKeqtl0yrbnj/tVbpVPBAKDz+1qLQ5kZRc="; }; + daemon = buildGoModule { + pname = "adw-bluetooth-daemon"; + inherit version; + src = src + "/daemon"; + vendorHash = "sha256-7tiSwNhq6e4LEh4lUkfh2i4tEdWWL6TxQpYYwYKsfog="; + }; +in +stdenv.mkDerivation (finalAttrs: { + pname = "adw-bluetooth"; + inherit version src; + nativeBuildInputs = [ meson ninja @@ -39,6 +50,13 @@ stdenv.mkDerivation (finalAttrs: { libadwaita ]; + mesonFlags = [ "-Dbuild_daemon=false" ]; + + postInstall = '' + mkdir -p $out/libexec + ln -s ${daemon}/bin/daemon $out/libexec/adw-bluetooth-daemon + ''; + meta = { description = "GNOME Inspired LibAdwaita Bluetooth Applet"; homepage = "https://github.com/ezratweaver/adw-bluetooth"; diff --git a/pkgs/by-name/ae/aemu/package.nix b/pkgs/by-name/ae/aemu/package.nix index 1db8ebbad7b3..f7e3d10209c7 100644 --- a/pkgs/by-name/ae/aemu/package.nix +++ b/pkgs/by-name/ae/aemu/package.nix @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ae/aerion-creds/package.nix b/pkgs/by-name/ae/aerion-creds/package.nix new file mode 100644 index 000000000000..1a35d0db6abe --- /dev/null +++ b/pkgs/by-name/ae/aerion-creds/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchurl, +}: + +let + version = "0.3.2"; + + archMap = { + "x86_64-linux" = "x86_64"; + "aarch64-linux" = "aarch64"; + }; + sysArch = + archMap.${stdenv.hostPlatform.system} + or (throw "Unsupported architecture: ${stdenv.hostPlatform.system}"); + + shimHashes = { + "x86_64" = "sha256-8WvuQgWTJNe4UpmS6uSYDYm46sIqxJbwVZ/J3CRz0OI="; + "aarch64" = "sha256-4RvFbxJGwM70huziY2ELoCouTrtMasgoqFUncBeBFvU="; + }; +in +stdenv.mkDerivation { + pname = "aerion-creds"; + inherit version; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/hkdb/aerion/releases/download/v${version}/flathub-build-env-v${version}-linux-${sysArch}"; + hash = shimHashes.${sysArch}; + }; + + dontUnpack = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp $src $out/bin/aerion-creds + chmod +x $out/bin/aerion-creds + + runHook postInstall + ''; + + meta = { + description = "OAuth credentials shim for Aerion"; + homepage = "https://github.com/hkdb/aerion"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ curious ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ae/aerion/package.nix b/pkgs/by-name/ae/aerion/package.nix new file mode 100644 index 000000000000..d4325f5ce8b6 --- /dev/null +++ b/pkgs/by-name/ae/aerion/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + pkg-config, + wrapGAppsHook3, + gtk3, + webkitgtk_4_1, + glib, + + aerion-creds, + withOAuth ? false, +}: + +let + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "hkdb"; + repo = "aerion"; + rev = "v${version}"; + hash = "sha256-elmk4huz4mvc7t+5/ZM5AK2R4pSKrLsZM0HxWFmQldE="; + }; + + frontend = buildNpmPackage { + pname = "aerion-frontend"; + inherit version src; + + sourceRoot = "${src.name}/frontend"; + + npmDepsHash = "sha256-dC+xGwSqdzItIfDipAVIVnbUJHiFkmzanjV/5xFsbkc="; + + buildPhase = '' + npm run build + ''; + + installPhase = '' + mkdir -p $out + cp -r dist/* $out/ + ''; + }; + +in +buildGoModule { + pname = "aerion"; + inherit version src; + + __structuredAttrs = true; + + vendorHash = "sha256-ptsrOpJo3i+yRSCGuHynbzi+C+GD/mBmPuHqWSVV/+4="; + + nativeBuildInputs = [ + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook3 + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gtk3 + webkitgtk_4_1 + glib + ]; + + tags = [ + "production" + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "desktop" + "webkit2_41" + ]; + + preBuild = '' + mkdir -p frontend/dist + cp -r ${frontend}/* frontend/dist/ + ''; + + postInstall = lib.optionalString stdenv.hostPlatform.isLinux ( + '' + install -Dm644 build/linux/aerion.png $out/share/pixmaps/io.github.hkdb.Aerion.png + install -Dm644 build/linux/aerion.desktop $out/share/applications/io.github.hkdb.Aerion.desktop + '' + + lib.optionalString withOAuth '' + rm -f $out/bin/aerion-creds + ln -s ${aerion-creds}/bin/aerion-creds $out/bin/aerion-creds + '' + ); + + passthru = { + inherit frontend; + updateScript = ./update.sh; + }; + + meta = { + description = "An Open Source Lightweight E-Mail Client"; + homepage = "https://github.com/hkdb/aerion"; + license = lib.licenses.asl20; + mainProgram = "aerion"; + maintainers = with lib.maintainers; [ curious ]; + }; +} diff --git a/pkgs/by-name/ae/aerion/update.sh b/pkgs/by-name/ae/aerion/update.sh new file mode 100755 index 000000000000..b07f4e73f5ed --- /dev/null +++ b/pkgs/by-name/ae/aerion/update.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix nix-update nix-prefetch-scripts common-updater-scripts + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel)" +aerion_creds_file="$nixpkgs/pkgs/by-name/ae/aerion-creds/package.nix" + +version=$(list-git-tags --url=https://github.com/hkdb/aerion \ + | grep -oP '^v\d+\.\d+\.\d+$' \ + | sed 's/^v//' \ + | sort -V \ + | tail -1) + +echo "Updating aerion and aerion-creds to v$version" + +# Update version in creds file +sed -i "s/version = \".*\";/version = \"$version\";/" "$aerion_creds_file" + +# Update creds binary hashes +for arch in x86_64 aarch64; do + url="https://github.com/hkdb/aerion/releases/download/v$version/flathub-build-env-v$version-linux-$arch" + echo " Fetching creds hash for $arch..." + hash=$(nix-prefetch-url --type sha256 "$url") + sri_hash=$(nix-hash --to-sri --type sha256 "$hash") + sed -i "s|\"$arch\" = \"sha256-[^\"]*\";|\"$arch\" = \"$sri_hash\";|" "$aerion_creds_file" +done + +# Update main package (handles version, source hash, npmDepsHash, vendorHash) +cd "$nixpkgs" +nix-update --version="$version" --subpackage frontend aerion + +echo "Done!" diff --git a/pkgs/by-name/ae/aeron-cpp/package.nix b/pkgs/by-name/ae/aeron-cpp/package.nix index e5bb023800d3..9ba047aae9f3 100644 --- a/pkgs/by-name/ae/aeron-cpp/package.nix +++ b/pkgs/by-name/ae/aeron-cpp/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation { inherit version; src = fetchFromGitHub { - owner = "real-logic"; + owner = "aeron-io"; repo = "aeron"; tag = version; hash = "sha256-sROEZVOfScrlqMLbfrPtw3LQCQ5TfMcrLiP6j/Z9rSM="; diff --git a/pkgs/by-name/ae/aeron/package.nix b/pkgs/by-name/ae/aeron/package.nix index 43d8756ad455..1f949476e33d 100644 --- a/pkgs/by-name/ae/aeron/package.nix +++ b/pkgs/by-name/ae/aeron/package.nix @@ -2,676 +2,29 @@ lib, stdenv, fetchMavenArtifact, - jdk11, + jdk17, makeWrapper, }: let pname = "aeron"; - version = "1.49.0"; + version = "1.50.2"; groupId = "io.aeron"; - aeronAll_1_49_0 = fetchMavenArtifact { + aeronAll = fetchMavenArtifact { inherit groupId; + inherit version; artifactId = "aeron-all"; - version = "1.49.0"; - hash = "sha256-n3qoLs+iYzrb95skr29DrpQPHsWBZL6IygnayNJ1s6Q="; + hash = "sha256-+H43UbfLvDcjYS5VRYea8v5PA3/d8SPYivd/aasv4wQ="; }; - aeronSamples_1_49_0 = fetchMavenArtifact { + aeronSamples = fetchMavenArtifact { inherit groupId; - version = "1.49.0"; + inherit version; artifactId = "aeron-samples"; - hash = "sha256-ePhAUBebeZP5exfBOGpUTTntAeZIdsolPuyhpbv0GVo="; + hash = "sha256-mn07b6P8HcNuwRUcbzfXkCpP/7cPChZJVx5VbyT5xrw="; }; - aeronAll_1_48_6 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.6"; - hash = "sha256-IWURDka8Qudit1nN/aHi4DHOAxpj++/1iSAbI5QNaBg="; - }; - - aeronSamples_1_48_6 = fetchMavenArtifact { - inherit groupId; - version = "1.48.6"; - artifactId = "aeron-samples"; - hash = "sha256-L5DFzZSfBRSGZOxDkfX1CTYyRNawd8tJLQaLZzYQTew="; - }; - - aeronAll_1_48_5 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.5"; - hash = "sha256-yPLTh8bYBRwG0y5Tc+Z9TSSoYZSe55RQOb22LbBL804="; - }; - - aeronSamples_1_48_5 = fetchMavenArtifact { - inherit groupId; - version = "1.48.5"; - artifactId = "aeron-samples"; - hash = "sha256-poxiGXdA2SWJQ1oFe8kh2q5T5GOytrxcAhkNv5k64Qo="; - }; - - aeronAll_1_48_4 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.4"; - hash = "sha256-6a8rgdNPkbYqo8N/7tSS4LxDF1j0s4JvDlYNSUSgrog="; - }; - - aeronSamples_1_48_4 = fetchMavenArtifact { - inherit groupId; - version = "1.48.4"; - artifactId = "aeron-samples"; - hash = "sha256-nB5YqF+jd2C8f++1pH36aZNtuscfP5ZMKx/6W3iiz4I="; - }; - - aeronAll_1_48_3 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.3"; - hash = "sha256-VEyowi5J7mJWQ+Xj8dO7iL2cHLkeEzcJZkk5yyuDeuU="; - }; - - aeronSamples_1_48_3 = fetchMavenArtifact { - inherit groupId; - version = "1.48.3"; - artifactId = "aeron-samples"; - hash = "sha256-/E7fF8Np8D3/DYHYLeRjLPkP3AQJ5kTYvZRsQmyUBzk="; - }; - - aeronAll_1_48_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.2"; - hash = "sha256-PQFlitiG43NO8zx/JfXiu7R5x/cYU/o5/x9U4/CioEw="; - }; - - aeronSamples_1_48_2 = fetchMavenArtifact { - inherit groupId; - version = "1.48.2"; - artifactId = "aeron-samples"; - hash = "sha256-nQ4kv/nQV0zkDgCL716AtRzEK/FDenHZMFNOhgVkd3s="; - }; - - aeronAll_1_48_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.1"; - hash = "sha256-ZRf4YZLxF1O6GhWpCFS/PJqIHyti3dHCXPoxuuiJEz0="; - }; - - aeronSamples_1_48_1 = fetchMavenArtifact { - inherit groupId; - version = "1.48.1"; - artifactId = "aeron-samples"; - hash = "sha256-wtCOtwtp6hQUm7SfCV5yP4bwxufs8kRgA4V9/LRoAls="; - }; - - aeronAll_1_48_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.48.0"; - hash = "sha256-eUc9tdR6iOGivovzX00VxLuHvEcXMFKxs2oJqug+ayA="; - }; - - aeronSamples_1_48_0 = fetchMavenArtifact { - inherit groupId; - version = "1.48.0"; - artifactId = "aeron-samples"; - hash = "sha256-31WO354XNsR2sZNPoh9kCNfSTz/ZM44IoRnmsx1iwMU="; - }; - - aeronAll_1_47_7 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.7"; - hash = "sha256-8j2nKjAjZ3tpGbCPtQ3opGL4y3vVR2kC5Wh8xQvVG8Q="; - }; - - aeronSamples_1_47_7 = fetchMavenArtifact { - inherit groupId; - version = "1.47.7"; - artifactId = "aeron-samples"; - hash = "sha256-zKan26LpNFOAst78qN0S9tmG59oKKowVphCYKfMu1lg="; - }; - - aeronAll_1_47_5 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.5"; - hash = "sha256-Hi7I/N+L4l05rNjfqPf4fUEFOAzt8FWx5T9UDAdVOLI="; - }; - - aeronSamples_1_47_5 = fetchMavenArtifact { - inherit groupId; - version = "1.47.5"; - artifactId = "aeron-samples"; - hash = "sha256-VFFfZKosTfMx1/C8qgSZNpYGP9oqN2y+rcbyTNH7vYE="; - }; - - aeronAll_1_47_4 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.4"; - hash = "sha256-PHc3vcRYI1rIJanrNyz7wCFE9znzPZMprPGO+oO8Tgc="; - }; - - aeronSamples_1_47_4 = fetchMavenArtifact { - inherit groupId; - version = "1.47.4"; - artifactId = "aeron-samples"; - hash = "sha256-z/FubK2sIDm8KtlaNwrO1nTlZrw+PC9tjGoiWbe7wBE="; - }; - - aeronAll_1_47_3 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.3"; - hash = "sha256-K5pVvHY0jltueoEjTv8tr9z/EtTwkhLjgE9Qw+mtN50="; - }; - - aeronSamples_1_47_3 = fetchMavenArtifact { - inherit groupId; - version = "1.47.3"; - artifactId = "aeron-samples"; - hash = "sha256-6HU7ykfDXlrQCdB5hYjZsQV+s0yFybXKqN8QHkEqSrw="; - }; - - aeronAll_1_47_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.2"; - hash = "sha256-qQAp3YcuIoxIJKgxoZ1ahNGRjS+b+Vr6PicN3S4xYUw="; - }; - - aeronSamples_1_47_2 = fetchMavenArtifact { - inherit groupId; - version = "1.47.2"; - artifactId = "aeron-samples"; - hash = "sha256-GVmAxQQZrfixMqylDh/TNXJk4cF0Z1Tg/iTaeohRrdw="; - }; - - aeronAll_1_47_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.1"; - hash = "sha256-QoKJxdkrZ8P7JwCFUGZ1lukG/Q4MgwksAp1R5RdVea0="; - }; - - aeronSamples_1_47_1 = fetchMavenArtifact { - inherit groupId; - version = "1.47.1"; - artifactId = "aeron-samples"; - hash = "sha256-FPkDrp0vyStm62Kf+F160KTXhNu5CdaQaB48uJkNC78="; - }; - - aeronAll_1_47_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.47.0"; - hash = "sha256-CfWsJBpk637o+CKkvpAMS+muEY/8tCh4SkEML8kYY1k="; - }; - - aeronSamples_1_47_0 = fetchMavenArtifact { - inherit groupId; - version = "1.47.0"; - artifactId = "aeron-samples"; - hash = "sha256-QVlBif/EmzFTB3XPLWXRdZME46Ipky+O300AH+kd9+M="; - }; - - aeronAll_1_46_9 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.9"; - hash = "sha256-HlIZfQHb3lKE773cE3bWZfAmkUkHD9qhUqHwlPLSvrw="; - }; - - aeronSamples_1_46_9 = fetchMavenArtifact { - inherit groupId; - version = "1.46.9"; - artifactId = "aeron-samples"; - hash = "sha256-o1PcXx8/z+rDHzTP/zSK2LjLM1TRmqSxW/KtCNBzsuc="; - }; - - aeronAll_1_46_8 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.8"; - hash = "sha256-+Y6kz+rvnzw4Q/K00Y1us3XQAkHpUSoe1nAS9yS6U4I="; - }; - - aeronSamples_1_46_8 = fetchMavenArtifact { - inherit groupId; - version = "1.46.8"; - artifactId = "aeron-samples"; - hash = "sha256-7kT+Ueg9RxrjKmLSfuUMpqbhUkGwGq0P3fpw2J1ruyg="; - }; - - aeronAll_1_46_7 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.7"; - hash = "sha256-3tLtPFtzmR4xxDmnViopTl1VZvlVw6noEImiimtbnVU="; - }; - - aeronSamples_1_46_7 = fetchMavenArtifact { - inherit groupId; - version = "1.46.7"; - artifactId = "aeron-samples"; - hash = "sha256-XaG8r2a2xXRUqdgK491KOSlptSu7dM3vzEHAh91aBqI="; - }; - - aeronAll_1_46_6 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.6"; - hash = "sha256-PMcXyzpjBkBC4qnb76D+22qPdgs7mhagZDWvGt9CXwk="; - }; - - aeronSamples_1_46_6 = fetchMavenArtifact { - inherit groupId; - version = "1.46.6"; - artifactId = "aeron-samples"; - hash = "sha256-JBf5531tiRY8w1lSPfic2TnepNln6CJ3PC9S56Fi68Q="; - }; - - aeronAll_1_46_5 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.5"; - hash = "sha256-ozFVbbNqqYb+giORCtTkNBcn06F0Lfu12Eyd5r/E370="; - }; - - aeronSamples_1_46_5 = fetchMavenArtifact { - inherit groupId; - version = "1.46.5"; - artifactId = "aeron-samples"; - hash = "sha256-0U/Ye9VcCeCtpBdBE7JUaEHe4wsE+yoa+ndLPVJiuBs="; - }; - - aeronAll_1_46_4 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.4"; - hash = "sha256-9TMGUZ9NUYMXihSFElifeqpJc0Sz7ks9NOcvjUSofaM="; - }; - - aeronSamples_1_46_4 = fetchMavenArtifact { - inherit groupId; - version = "1.46.4"; - artifactId = "aeron-samples"; - hash = "sha256-qo+HRhsdK/LLpAcZz4M4gxlngnokYIaJc1F/KMX8sDQ="; - }; - - aeronAll_1_46_3 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.3"; - hash = "sha256-lToJIeTM84rAA/oiNqRNdYs5Ropfuw9WJ08Nb0m87MQ="; - }; - - aeronSamples_1_46_3 = fetchMavenArtifact { - inherit groupId; - version = "1.46.3"; - artifactId = "aeron-samples"; - hash = "sha256-MRNGUCOW3w7gctNLsle39Zus89RBS1ukc34o4pzHOnU="; - }; - - aeronAll_1_46_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.2"; - hash = "sha256-2iwmx1X1gbjUabRyCR6Ek6iuDKhtvgEonwBdbF0h3MY="; - }; - - aeronSamples_1_46_2 = fetchMavenArtifact { - inherit groupId; - version = "1.46.2"; - artifactId = "aeron-samples"; - hash = "sha256-jv8tWpuuRnCQSlGGtd9ger562IF/5x0wSEtrlM1s1Ks="; - }; - - aeronAll_1_46_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.1"; - hash = "sha256-KH2mt64ewpdwLOM7q95l0j3ftLOCu3uICcaVUXe/vyY="; - }; - - aeronSamples_1_46_1 = fetchMavenArtifact { - inherit groupId; - version = "1.46.1"; - artifactId = "aeron-samples"; - hash = "sha256-IF9dRX/EUUF8An/baMxb9iEXq/wZlvvgdzKIk2c8+aA="; - }; - - aeronAll_1_46_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.46.0"; - hash = "sha256-ngFeYSDJxxqxawtGrALZrsjRO9WlPdnhdO9NuZKhPr8="; - }; - - aeronSamples_1_46_0 = fetchMavenArtifact { - inherit groupId; - version = "1.46.0"; - artifactId = "aeron-samples"; - hash = "sha256-arnWZD5znkrnn4usKG2R3gdUXljYKvoibFQ0b466iks="; - }; - - aeronAll_1_45_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.45.2"; - hash = "sha256-m1FJwC+1ZZlCPTU9KksLq7ozP3X1v7/kZaCb/vFwveQ="; - }; - - aeronSamples_1_45_2 = fetchMavenArtifact { - inherit groupId; - version = "1.45.2"; - artifactId = "aeron-samples"; - hash = "sha256-RB51I7WjV19pT7FCUH9FVrcbt64vjPIjMjRxgLIzEjw="; - }; - - aeronAll_1_45_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.45.1"; - hash = "sha256-cD50jk95OAcdPKJuc45t1O6WVRgM2j1gMZ5IudbL4U8="; - }; - - aeronSamples_1_45_1 = fetchMavenArtifact { - inherit groupId; - version = "1.45.1"; - artifactId = "aeron-samples"; - hash = "sha256-QSC5Yp35eJjUHByShdQWDP14jW1Y3pL3osLDGLsxsqg="; - }; - - aeronAll_1_45_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.45.0"; - hash = "sha256-gImfORn61k1fVyqPfr5Uk2Hu5yPfnShCXIUB3qSuFnI="; - }; - - aeronSamples_1_45_0 = fetchMavenArtifact { - inherit groupId; - version = "1.45.0"; - artifactId = "aeron-samples"; - hash = "sha256-7o37/YzQHTBguTlpoIXFa8JNFtyG7zKKnVdijIqAeDY="; - }; - - aeronAll_1_44_7 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.7"; - hash = "sha256-ZbM17fXbCZQWYjE1QG6MO506sMqth9ukD1an3RbxypA="; - }; - - aeronSamples_1_44_7 = fetchMavenArtifact { - inherit groupId; - version = "1.44.7"; - artifactId = "aeron-samples"; - hash = "sha256-vBtx5bN4JtOhvQwoHAof1Y7uLPiadQCNscw5eiaYDec="; - }; - - aeronAll_1_44_6 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.6"; - hash = "sha256-FJSPOvjXgcuqQQn8VuXz87sj4qfN7Ayt0CHg6CE2uHA="; - }; - - aeronSamples_1_44_6 = fetchMavenArtifact { - inherit groupId; - version = "1.44.6"; - artifactId = "aeron-samples"; - hash = "sha256-9NKudRW06/Q7xg/tDaVixBy1J0Pv3Y6FGOq0oG/IXO0="; - }; - - aeronAll_1_44_5 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.5"; - hash = "sha256-s9Jo2sU4obp6OrfLZjJvRlXYpyg3gsVnYH5xNQSjQSQ="; - }; - - aeronSamples_1_44_5 = fetchMavenArtifact { - inherit groupId; - version = "1.44.5"; - artifactId = "aeron-samples"; - hash = "sha256-hvRBaMoEM2KTHDXLruRnrUMi7VQH8QdDr79y1pLk/PA="; - }; - - aeronAll_1_44_4 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.4"; - hash = "sha256-CfoB7zJ4ZWZXOvy7fZoCg5zCiHI+6CTxLd7UgWslC5I="; - }; - - aeronSamples_1_44_4 = fetchMavenArtifact { - inherit groupId; - version = "1.44.4"; - artifactId = "aeron-samples"; - hash = "sha256-ZGkYlQCV60R1Ua3ecqBkCD3CN2r+/opx1oI1lKsqC7w="; - }; - - aeronAll_1_44_3 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.3"; - hash = "sha256-uqjLQUE6IEvGMwZqUOocL0NfK+dPIaQAJTAILIK6Kao="; - }; - - aeronSamples_1_44_3 = fetchMavenArtifact { - inherit groupId; - version = "1.44.3"; - artifactId = "aeron-samples"; - hash = "sha256-EfkhMx4iQIDqk3jnVf1oEvb21sN9GyLwJJjok619YW0="; - }; - - aeronAll_1_44_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.2"; - hash = "sha256-C3xr8OeVVpnmE70j+5meawWg+56/FhIBqQm9BTwbOj4="; - }; - - aeronSamples_1_44_2 = fetchMavenArtifact { - inherit groupId; - version = "1.44.2"; - artifactId = "aeron-samples"; - hash = "sha256-laY1xdgaBwwCVdAUrJtrFW2rduguRdcpTaglcWa0jB0="; - }; - - aeronAll_1_44_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.1"; - hash = "sha256-O80bWp7F6mRh3me1znzpfFfFEpvvMVjL4PrAt7+3Fq0="; - }; - - aeronSamples_1_44_1 = fetchMavenArtifact { - inherit groupId; - version = "1.44.1"; - artifactId = "aeron-samples"; - hash = "sha256-ZSuTed45BRzr4JJuGeXghUgEifv/FpnCzTNJWa+nwjo="; - }; - - aeronAll_1_44_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.44.0"; - hash = "sha256-j7WXJaIQZPKOTLmZg+nGxLUowYAuZYj062pmxS0ycnk="; - }; - - aeronSamples_1_44_0 = fetchMavenArtifact { - inherit groupId; - version = "1.44.0"; - artifactId = "aeron-samples"; - hash = "sha256-DXsYKnFvQT2BRGZyLXIfLBxglZMFRKBG3VDXD0UITLU="; - }; - - aeronAll_1_43_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.43.0"; - hash = "sha512-ZKjUA1Kp++RLnCNUOi2K/iGc4zIIR4pC4j8qPfO+rcgp7ghZfgsXO8sB+JD307kzeikUXnPFX7ef28DlzI8s8Q=="; - }; - - aeronSamples_1_43_0 = fetchMavenArtifact { - inherit groupId; - version = "1.43.0"; - artifactId = "aeron-samples"; - hash = "sha512-a/ti4Kd8WwzOzDGMgdYk0pxsu8vRA4kRD9cm4D3S+r6xc/rL8ECHVoogOMDeabDd1EYSIbx/sKE01BJOW7BVsg=="; - }; - - aeronAll_1_42_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.42.1"; - hash = "sha512-pjX+JopK6onDwElMIroj+ZXrKwdPj5H2uPg08XgNlrK1rAkHo9MUT8weBGbuFVFDLeqOZrHj0bt1wJ9XgYY5aA=="; - }; - - aeronSamples_1_42_1 = fetchMavenArtifact { - inherit groupId; - version = "1.42.1"; - artifactId = "aeron-samples"; - hash = "sha512-4JnHn22vJf2lmOg6ev5PD+/YiaL3KgfuyWAK92djX3KBVXO7ERMY2kH79dveVCJG1rbekvE1j1pnjaAIxwJcqg=="; - }; - - aeronAll_1_42_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.42.0"; - hash = "sha256-rcUKHUh2rsBvO8kn2x+wYFRuM9XV21hINwFG7ej6uyw="; - }; - - aeronSamples_1_42_0 = fetchMavenArtifact { - inherit groupId; - version = "1.42.0"; - artifactId = "aeron-samples"; - hash = "sha256-dmLEuEcgUuoEBEM0zW+c+0o6oOpIk+5FCzZgP5j1jXk="; - }; - - aeronAll_1_41_6 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.6"; - hash = "sha256-YUfQ98lGEeGjl1LB12tP9fON+KycMUJFI7ntqsYa3O8="; - }; - - aeronSamples_1_41_6 = fetchMavenArtifact { - inherit groupId; - version = "1.41.6"; - artifactId = "aeron-samples"; - hash = "sha256-vaO2meykLq5aK6Y0DINcVCq920Qns8GCFu18CavCvis="; - }; - - aeronAll_1_41_5 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.5"; - hash = "sha256-+yYOBwRsWgAtmDplB9dltU76wTX650KharSkMjWlG6M="; - }; - - aeronSamples_1_41_5 = fetchMavenArtifact { - inherit groupId; - version = "1.41.5"; - artifactId = "aeron-samples"; - hash = "sha256-1RHFDMtaAJHKNdz32Aeo6YplvoMDJerQRi10NUyp/OI="; - }; - - aeronAll_1_41_4 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.4"; - hash = "sha256-Z06nAaCO1LU6ChNm4YnipuUNgusY7iY6WhV8AeBPRoE="; - }; - - aeronSamples_1_41_4 = fetchMavenArtifact { - inherit groupId; - version = "1.41.4"; - artifactId = "aeron-samples"; - hash = "sha256-9gyKDu7R/Q8HtkCR5D1ohZnVa1jIOv5Z0lgOcRIumCw="; - }; - - aeronAll_1_41_3 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.3"; - hash = "sha256-aQ+oZ6oqi853fZfwRcGpgRsuEAfP7AJsu5C0pfwxlzU="; - }; - - aeronSamples_1_41_3 = fetchMavenArtifact { - inherit groupId; - version = "1.41.3"; - artifactId = "aeron-samples"; - hash = "sha256-FTiz5IrPoE1zWNjAym4ynjvny0p8uP7QzizK1jCJKgM="; - }; - - aeronAll_1_41_2 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.2"; - hash = "sha256-0XSoKbFnhEwOlx0+9cJj/Qf6XAUjtskun9BwIq/WxW8="; - }; - - aeronSamples_1_41_2 = fetchMavenArtifact { - inherit groupId; - version = "1.41.2"; - artifactId = "aeron-samples"; - hash = "sha256-7ht2Jklvx3cfk2PopRjUVDQ0Uo+5M5262SI91ItS9Ow="; - }; - - aeronAll_1_41_1 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.1"; - hash = "sha256-/JufYICrSefm9nGlVcfQHcUkYMnzrZcNDjB8fAfSKGE="; - }; - - aeronSamples_1_41_1 = fetchMavenArtifact { - inherit groupId; - version = "1.41.1"; - artifactId = "aeron-samples"; - hash = "sha256-6/o1t6/ehYYhMqU6pYQ0uScZhsZTuowr0uwJ3TbmtHk="; - }; - - aeronAll_1_41_0 = fetchMavenArtifact { - inherit groupId; - artifactId = "aeron-all"; - version = "1.41.0"; - hash = "sha256-g2dFf+htF72ByJCcjKuHtLuehLtjjjpqjvWq1rTkmYg="; - }; - - aeronSamples_1_41_0 = fetchMavenArtifact { - inherit groupId; - version = "1.41.0"; - artifactId = "aeron-samples"; - hash = "sha256-nUX9JM0p06m0XyH4ugPXQ0+Fc9ydmhJlaND+VUCZ788="; - }; - - aeronAll_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-all"; - hash = "sha512-NyhYaQqOWcSBwzwpje6DMAp36CEgGSNXBSdaRrDyP+Fn2Z0nvh5o2czog6GKKtbjH9inYfyyF/21gehfgLF6qA=="; - }; - - aeronSamples_1_40_0 = fetchMavenArtifact { - inherit groupId; - version = "1.40.0"; - artifactId = "aeron-samples"; - hash = "sha512-vyAq4mfLDDyaVk7wcIpPvPcxSt92Ek8mxfuuZwaX+0Wu9oJCpwbnjvS9+bvzcE4qSGxzY6eJIIX6nMdw0LkACg=="; - }; - - aeronAll = aeronAll_1_49_0; - aeronSamples = aeronSamples_1_49_0; - in stdenv.mkDerivation { @@ -702,7 +55,7 @@ stdenv.mkDerivation { postFixup = '' function wrap { - makeWrapper "${jdk11}/bin/java" "$out/bin/$1" \ + makeWrapper "${jdk17}/bin/java" "$out/bin/$1" \ --add-flags "--add-opens java.base/sun.nio.ch=ALL-UNNAMED" \ --add-flags "--class-path ${aeronAll.jar}" \ --add-flags "$2" diff --git a/pkgs/by-name/ae/aerospace/package.nix b/pkgs/by-name/ae/aerospace/package.nix index ee4fb336823e..1094fbb0c83d 100644 --- a/pkgs/by-name/ae/aerospace/package.nix +++ b/pkgs/by-name/ae/aerospace/package.nix @@ -9,7 +9,7 @@ let appName = "AeroSpace.app"; - version = "0.20.3-Beta"; + version = "0.21.2-Beta"; in stdenv.mkDerivation { pname = "aerospace"; @@ -18,7 +18,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/nikitabobko/AeroSpace/releases/download/v${version}/AeroSpace-v${version}.zip"; - sha256 = "sha256-wrBcslp1W/lOmudMcW+SREL9LZY+wTwidh6Hot5ShGE="; + sha256 = "sha256-+4n9di1NbPs5pttSEHPDzpHinfuSyWSx5CjNA9IOH+Q="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/af/afew/package.nix b/pkgs/by-name/af/afew/package.nix index 00349a77af67..b05832844862 100644 --- a/pkgs/by-name/af/afew/package.nix +++ b/pkgs/by-name/af/afew/package.nix @@ -3,24 +3,26 @@ python3Packages, fetchPypi, pkgs, - testers, - afew, + versionCheckHook, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "afew"; - version = "3.0.1"; + version = "4.0.2"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - sha256 = "0wpfqbqjlfb9z0hafvdhkm7qw56cr9kfy6n8vb0q42dwlghpz1ff"; + hash = "sha256-gsfqyoVD6CXXd14MiyA5nq0e7wE6yymW9Ssmxpu6+E4="; }; - nativeBuildInputs = with python3Packages; [ - sphinxHook - setuptools - setuptools-scm + build-system = [ + python3Packages.setuptools + python3Packages.setuptools-scm + ]; + + nativeBuildInputs = [ + python3Packages.sphinxHook ]; sphinxBuilders = [ @@ -28,15 +30,15 @@ python3Packages.buildPythonApplication (finalAttrs: { "man" ]; - propagatedBuildInputs = with python3Packages; [ - chardet - dkimpy - notmuch - setuptools + dependencies = [ + python3Packages.chardet + python3Packages.dkimpy + python3Packages.notmuch2 ]; nativeCheckInputs = [ pkgs.notmuch + versionCheckHook ] ++ (with python3Packages; [ freezegun @@ -53,12 +55,6 @@ python3Packages.buildPythonApplication (finalAttrs: { "man" ]; - passthru.tests = { - version = testers.testVersion { - package = afew; - }; - }; - meta = { homepage = "https://github.com/afewmail/afew"; description = "Initial tagging script for notmuch mail"; diff --git a/pkgs/by-name/af/affine-bin/package.nix b/pkgs/by-name/af/affine-bin/package.nix index 804f31d6339e..f26a395c878e 100644 --- a/pkgs/by-name/af/affine-bin/package.nix +++ b/pkgs/by-name/af/affine-bin/package.nix @@ -43,12 +43,10 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.mit; maintainers = with lib.maintainers; [ richar - redyf xiaoxiangmoe ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/af/affine/package.nix b/pkgs/by-name/af/affine/package.nix index 9c5fb55b894e..43b532795f8c 100644 --- a/pkgs/by-name/af/affine/package.nix +++ b/pkgs/by-name/af/affine/package.nix @@ -257,7 +257,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.fromSource ]; diff --git a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix index f1b49b82d9fe..5c8cfad15f1f 100644 --- a/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix +++ b/pkgs/by-name/ag/age-plugin-openpgp-card/package.nix @@ -33,7 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "age-plugin-openpgp-card"; diff --git a/pkgs/by-name/ag/agent-safehouse/package.nix b/pkgs/by-name/ag/agent-safehouse/package.nix new file mode 100644 index 000000000000..c07c75768503 --- /dev/null +++ b/pkgs/by-name/ag/agent-safehouse/package.nix @@ -0,0 +1,55 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +stdenvNoCC.mkDerivation rec { + pname = "safehouse"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "eugene1g"; + repo = "agent-safehouse"; + rev = "v" + version; + hash = "sha256-2GWxh5J9qqudc2QM/CACXpqJLcNULKSfTAHBzR++UAE="; + }; + + postPatch = "patchShebangs scripts bin"; + + strictDeps = true; + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + buildPhase = '' + runHook preBuild + scripts/generate-dist.sh + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 dist/safehouse.sh $out/bin/safehouse + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Sandbox your local AI agents so they can read/write only what they need"; + homepage = "https://github.com/eugene1g/agent-safehouse"; + mainProgram = "safehouse"; + license = lib.licenses.asl20; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ + myzel394 + Br1ght0ne + ]; + }; +} diff --git a/pkgs/by-name/ag/agi/package.nix b/pkgs/by-name/ag/agi/package.nix index 2b4f1c180195..e6476419c846 100644 --- a/pkgs/by-name/ag/agi/package.nix +++ b/pkgs/by-name/ag/agi/package.nix @@ -13,13 +13,13 @@ android-tools, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "agi"; version = "3.3.1"; src = fetchzip { - url = "https://github.com/google/agi/releases/download/${version}/agi-${version}-linux.zip"; - sha256 = "sha256-Yawl6InBYSWNw3clHyGAeC2PVfXEzWmbd6vcYrqAPO0="; + url = "https://github.com/google/agi/releases/download/${finalAttrs.version}/agi-${finalAttrs.version}-linux.zip"; + hash = "sha256-Yawl6InBYSWNw3clHyGAeC2PVfXEzWmbd6vcYrqAPO0="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation rec { cp -r lib $out for i in 16 32 48 64 96 128 256 512 1024; do - install -D ${src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png + install -D ${finalAttrs.src}/icon.png $out/share/icons/hicolor/''${i}x$i/apps/agi.png done runHook postInstall @@ -71,7 +71,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Android GPU Inspector"; homepage = "https://gpuinspector.dev"; - changelog = "https://github.com/google/agi/releases/tag/v${version}"; + changelog = "https://github.com/google/agi/releases/tag/v${finalAttrs.version}"; platforms = [ "x86_64-linux" ]; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kashw2 ]; @@ -80,4 +80,4 @@ stdenvNoCC.mkDerivation rec { binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/ag/ags/package.nix b/pkgs/by-name/ag/ags/package.nix index db7d52b8fdfe..6db1aab7991b 100644 --- a/pkgs/by-name/ag/ags/package.nix +++ b/pkgs/by-name/ag/ags/package.nix @@ -105,7 +105,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/Aylur/ags/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ - PerchunPak johnrtitor ]; mainProgram = "ags"; diff --git a/pkgs/by-name/ai/aiken/package.nix b/pkgs/by-name/ai/aiken/package.nix index fbcd408e3ae3..2918f02a8278 100644 --- a/pkgs/by-name/ai/aiken/package.nix +++ b/pkgs/by-name/ai/aiken/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "aiken"; - version = "1.1.22"; + version = "1.1.23"; src = fetchFromGitHub { owner = "aiken-lang"; repo = "aiken"; tag = "v${finalAttrs.version}"; - hash = "sha256-mq/NwfSjqykYwyKq63jDs7u21uWxzAtwDKbZ9Fn3i90="; + hash = "sha256-9CPwIqUoOih4711vSEeV3AX1T1GGQ/AeYj7HnWI5UO8="; }; - cargoHash = "sha256-WzaprYYTFLaM6TKzUG6JadQNLBHjgoM3FwRUfMTmiHA="; + cargoHash = "sha256-98oyeVo3z49DGikhSBMB7QSiz6+I7GkvqJIpOusuEz4="; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/ai/aiodnsbrute/package.nix b/pkgs/by-name/ai/aiodnsbrute/package.nix index 63b463daa275..6477b8e65f23 100644 --- a/pkgs/by-name/ai/aiodnsbrute/package.nix +++ b/pkgs/by-name/ai/aiodnsbrute/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "aiodnsbrute"; homepage = "https://github.com/blark/aiodnsbrute"; changelog = "https://github.com/blark/aiodnsbrute/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ai/air-formatter/package.nix b/pkgs/by-name/ai/air-formatter/package.nix index 14ea7346f1d0..67317248a1b0 100644 --- a/pkgs/by-name/ai/air-formatter/package.nix +++ b/pkgs/by-name/ai/air-formatter/package.nix @@ -4,19 +4,21 @@ fetchFromGitHub, versionCheckHook, nix-update-script, + installShellFiles, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "air-formatter"; - version = "0.9.0"; + version = "0.11.0"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "posit-dev"; repo = "air"; tag = finalAttrs.version; - hash = "sha256-9itu/coUlYNdH2go1AmMff1pMozv6nGeOEZKTwBqA8M="; + hash = "sha256-BWtQLgNFf/kULGvet33k3T1k2oL1hbDn2VPCj0JxrX4="; }; - cargoHash = "sha256-R7rUXx+I1bmdP6fvbXyKulaWQZQxBcngJihCg0SVFY0="; + cargoHash = "sha256-xcNVioDbejCLrWMaUA06r9GK5KEIPq6w0W7G7290kOU="; useNextest = true; @@ -25,12 +27,22 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doInstallCheck = true; - cargoBuildFlags = [ "-p air" ]; + cargoBuildFlags = [ "--package=air" ]; passthru = { updateScript = nix-update-script { }; }; + nativeBuildInputs = [ installShellFiles ]; + # TODO: Upstream also provides Elvish and PowerShell completions, + # but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment. + postInstall = '' + installShellCompletion --cmd air-formatter \ + --bash <($out/bin/air generate-shell-completion bash) \ + --fish <($out/bin/air generate-shell-completion fish) \ + --zsh <($out/bin/air generate-shell-completion zsh) + ''; + meta = { description = "Extremely fast R code formatter"; homepage = "https://posit-dev.github.io/air"; diff --git a/pkgs/by-name/ai/air/package.nix b/pkgs/by-name/ai/air/package.nix index 70569d3b0fb5..cd7d2f11f03a 100644 --- a/pkgs/by-name/ai/air/package.nix +++ b/pkgs/by-name/ai/air/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "air"; - version = "1.65.3"; + version = "1.66.0"; src = fetchFromGitHub { owner = "air-verse"; repo = "air"; tag = "v${finalAttrs.version}"; - hash = "sha256-w3UJ6ezvud0KJYeModGueXx0gp9zTxo6R+BoZPH4Bpo="; + hash = "sha256-1JKzskbxLaCNRRXBjHwmYGJVLhIU6aO9IS7KD65SgwQ="; }; vendorHash = "sha256-03xZ3P/7xjznYdM9rv+8ZYftQlnjJ6ZTq0HdSvGpaWw="; diff --git a/pkgs/by-name/ai/airbuddy/package.nix b/pkgs/by-name/ai/airbuddy/package.nix index 50c5a10791af..706f9946c238 100644 --- a/pkgs/by-name/ai/airbuddy/package.nix +++ b/pkgs/by-name/ai/airbuddy/package.nix @@ -42,12 +42,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; homepage = "https://v2.airbuddy.app"; changelog = "https://support.airbuddy.app/articles/airbuddy-2-changelog"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ai/airspyhf/package.nix b/pkgs/by-name/ai/airspyhf/package.nix index 8170b10373d3..3242ce56bcee 100644 --- a/pkgs/by-name/ai/airspyhf/package.nix +++ b/pkgs/by-name/ai/airspyhf/package.nix @@ -9,12 +9,14 @@ stdenv.mkDerivation { pname = "airspyhf"; - version = "1.6.8-unstable-2025-07-12"; + version = "1.8.1"; src = fetchFromGitHub { owner = "airspy"; repo = "airspyhf"; - rev = "87cf12a30f3a0f10f313aab8e54999ca69b753af"; + # Not clear why upstream won't tag releases. See: + # https://github.com/airspy/airspyhf/commit/c0bb66dd8976651c53884ccec3d70a108f1e50e1#r193607536 + rev = "c0bb66dd8976651c53884ccec3d70a108f1e50e1"; hash = "sha256-7bXBv4YTOaWRFI6Svb9/lSBEAssUgJMqxKM5zHk1swM="; }; diff --git a/pkgs/by-name/ai/airwave/package.nix b/pkgs/by-name/ai/airwave/package.nix index e356bc9198de..3c53d3f8f9b9 100644 --- a/pkgs/by-name/ai/airwave/package.nix +++ b/pkgs/by-name/ai/airwave/package.nix @@ -19,7 +19,7 @@ multiStdenv.mkDerivation (finalAttrs: { version = "1.3.3"; src = fetchFromGitHub { - owner = "phantom-code"; + owner = "psycha0s"; repo = "airwave"; tag = finalAttrs.version; hash = "sha256-mvT0b0auKiu1T8cbR9RoBT94hKSnXDamqkIQPnUqVq0="; @@ -55,7 +55,7 @@ multiStdenv.mkDerivation (finalAttrs: { # shrinking. dontPatchELF = true; - # Cf. https://github.com/phantom-code/airwave/issues/57 + # Cf. https://github.com/psycha0s/airwave/issues/57 hardeningDisable = [ "format" ]; cmakeFlags = [ "-DVSTSDK_PATH=${vst2-sdk}" ]; @@ -78,7 +78,7 @@ multiStdenv.mkDerivation (finalAttrs: { protocol to correctly embed the plugin editor into the host window. ''; - homepage = "https://github.com/phantom-code/airwave"; + homepage = "https://github.com/psycha0s/airwave"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ michalrus ]; diff --git a/pkgs/by-name/ak/aks-mcp-server/package.nix b/pkgs/by-name/ak/aks-mcp-server/package.nix index f8fbc33a5459..49cee658330d 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.18"; + version = "0.0.19"; src = fetchFromGitHub { owner = "Azure"; repo = "aks-mcp"; rev = "v${finalAttrs.version}"; - hash = "sha256-h/zLbnc2ffcQkx+KE6vglaSG6QAySZSg8EB4zyqH4sg="; + hash = "sha256-Zu/caWrTuyzS4ejJ5LTOCyLTsmJOFrkX0kUGM0zDfFs="; }; - vendorHash = "sha256-HYIEGnQOVNNVJxzoOiLTXwRFOBvCwikAwqky18VqFSQ="; + vendorHash = "sha256-eipcHVKKHBOey2fUGB4lf2pE/wdwGgsbYvCrvDG1JK8="; subPackages = [ "cmd/aks-mcp" ]; diff --git a/pkgs/by-name/al/alac/package.nix b/pkgs/by-name/al/alac/package.nix index e46b5443477c..bb2d20b84405 100644 --- a/pkgs/by-name/al/alac/package.nix +++ b/pkgs/by-name/al/alac/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "alac"; - version = "0.0.7-unstable-2024-10-16"; + version = "0.0.7-unstable-2026-04-10"; outputs = [ "out" @@ -18,8 +18,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "mikebrady"; repo = "alac"; - rev = "1832544d27d01335d823d639b176d1cae25ecfd4"; - hash = "sha256-xRWDeqyJ/BEaSWVlDXgaKIKJuBwM8kJDIATVTVaMn2k="; + rev = "5d8c5db0dfcadd5872f28e665cf4f4303447352a"; + hash = "sha256-Wb6I5YHGvBVjVgOutICbRKH96odR3ZgmNS6HQedVahk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/al/alacritty-theme/package.nix b/pkgs/by-name/al/alacritty-theme/package.nix index 9ffd9a2cf597..15713eea5f6a 100644 --- a/pkgs/by-name/al/alacritty-theme/package.nix +++ b/pkgs/by-name/al/alacritty-theme/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alacritty-theme"; - version = "0-unstable-2026-05-01"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "alacritty"; repo = "alacritty-theme"; - rev = "2749b407b597790e6f08b218c2bc2acdf66210a0"; - hash = "sha256-vcacyCQ8XqnDUQ/rx+FBdcKHDfvkxUszIJRZZsvauag="; + rev = "03cce642656759f440c97bb99ce65fc1c5b064a1"; + hash = "sha256-JfvBUsmw3lRxOj2lb9yVmkRwfUpjJwjBujwztoXtgMY="; sparseCheckout = [ "themes" ]; }; diff --git a/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix b/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix new file mode 100644 index 000000000000..f3fea0ce372a --- /dev/null +++ b/pkgs/by-name/al/albyhub/bark-ffi-go/default.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitLab, + protobuf, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bark-ffi-go"; + version = "0.2.3"; + + src = fetchFromGitLab { + owner = "ark-bitcoin"; + repo = "bark-ffi-bindings"; + rev = "3c626a43d7523c4d19e867bd453ec80c541780c7"; + hash = "sha256-PbGTbVMO2L+gQpZQewkR0uo6fxqrVUjT/eAsnz2o/u4="; + }; + + sourceRoot = "${finalAttrs.src.name}/golang/rust"; + + cargoHash = "sha256-OED+NqNt71771UDZ1M8Ks/Yfx8YNjfL246FKMeLFfLg="; + + cargoBuildFlags = [ "--lib" ]; + + doCheck = false; + + nativeBuildInputs = [ + protobuf + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 target/*/release/libbark_ffi_go.a \ + $out/lib/libbark_ffi_go.a + + runHook postInstall + ''; + + meta = { + description = "Go bindings static library for Bark"; + homepage = "https://gitlab.com/ark-bitcoin/bark-ffi-bindings"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ bleetube ]; + }; +}) diff --git a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix index 6e0330a0257e..d50b31b72d54 100644 --- a/pkgs/by-name/al/albyhub/ldk-node-go/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node-go/default.nix @@ -7,13 +7,13 @@ buildGoModule { pname = "ldk-node-go"; - version = "0-unstable-2026-04-24"; + version = "0-unstable-2026-06-08"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node-go"; - rev = "3690cdb3031c75f0ee0a67222c2db3c69fea8f2c"; - hash = "sha256-OlJGHhal5fkR0r0FtsVbG1aILZSTLsSRcqrZ84pIRLU="; + rev = "5ba22268f000c78baa5cf57329eb0b1c07bd91d7"; + hash = "sha256-+fuCvc2SuxBLXiacfc+0oNzAsBgFjUJgZ0+5B4Sy4vs="; }; vendorHash = null; diff --git a/pkgs/by-name/al/albyhub/ldk-node/default.nix b/pkgs/by-name/al/albyhub/ldk-node/default.nix index 938f86f2b66a..d1ae446b85bf 100644 --- a/pkgs/by-name/al/albyhub/ldk-node/default.nix +++ b/pkgs/by-name/al/albyhub/ldk-node/default.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ldk-node"; - version = "0-unstable-2026-04-24"; + version = "0-unstable-2026-06-08"; src = fetchFromGitHub { owner = "getAlby"; repo = "ldk-node"; - rev = "6d5546ec5fff10d4e560188cfcff6f294944c16e"; - hash = "sha256-k3AZ1k/hV4Bh+RfOqmpo22wRQ5sdDaFR4bcnw58iwNI="; + rev = "549107b4d731bc9af06b81fbcd65463e3055df16"; + hash = "sha256-7S/+po+a6DkUCnfCrwBMfMnsHzbLcvSiPxEmQc2Hzr0="; }; buildFeatures = [ "uniffi" ]; diff --git a/pkgs/by-name/al/albyhub/package.nix b/pkgs/by-name/al/albyhub/package.nix index 7eb309745360..b7b200b5e9f5 100644 --- a/pkgs/by-name/al/albyhub/package.nix +++ b/pkgs/by-name/al/albyhub/package.nix @@ -8,10 +8,12 @@ yarn, stdenv, makeWrapper, + runCommand, callPackage, }: let + barkFfiGo = callPackage ./bark-ffi-go { }; ldkNode = callPackage ./ldk-node { }; ldkNodeGo = callPackage ./ldk-node-go { inherit ldkNode; @@ -21,18 +23,25 @@ in buildGoModule (finalAttrs: { pname = "albyhub"; - version = "1.22.2"; + version = "1.23.0"; src = fetchFromGitHub { owner = "getAlby"; repo = "hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-xP/J9zdh4sZ1x+JUpOf12ft8f2II2Mn1Q7/gnMuFzy8="; + hash = "sha256-1mdpsctrQN012+HAWSgorzlN2UBA5D4+sZIIVYCq8k8="; }; - vendorHash = "sha256-nzdHXY14o4D8NrcXu2JvDagvIfemfVAaGU3IDifhyW0="; + vendorHash = "sha256-xQkQIWBrbrXzU9/5BMD3/+KKR847gh4XQrwj/CDoml0="; proxyVendor = true; # needed for secp256k1-zkp CGO bindings + postPatch = '' + cp -r ${barkFfiGo.src}/golang bark-ffi-bindings-golang + chmod -R u+w bark-ffi-bindings-golang + rm -r bark-ffi-bindings-golang/lib + go mod edit -replace gitlab.com/ark-bitcoin/bark-ffi-bindings/golang=./bark-ffi-bindings-golang + ''; + nativeBuildInputs = [ fixup-yarn-lock nodejs @@ -41,16 +50,21 @@ buildGoModule (finalAttrs: { ]; buildInputs = [ + barkFfiGo ldkNodeGo (lib.getLib stdenv.cc.cc) ]; frontendYarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/frontend/yarn.lock"; - hash = "sha256-BeuTBLJ/Iakd4jhIkI2+oHc4MFy6DSn8QcygTHEMmQo="; + hash = "sha256-VI4FRe1kzVMqqcZ68nZmZqmXW7FOQMbJ0z8QqZoLYEA="; }; preBuild = '' + mkdir -p bark-ffi-bindings-golang/lib/linux_${stdenv.hostPlatform.go.GOARCH} + cp ${barkFfiGo}/lib/libbark_ffi_go.a \ + bark-ffi-bindings-golang/lib/linux_${stdenv.hostPlatform.go.GOARCH}/libbark_ffi_go.a + export HOME=$TMPDIR pushd frontend fixup-yarn-lock yarn.lock @@ -85,6 +99,41 @@ buildGoModule (finalAttrs: { } $out/bin/albyhub ''; + passthru.tests.startup = runCommand "${finalAttrs.pname}-startup-test" { } '' + export HOME="$TMPDIR" + export AUTO_LINK_ALBY_ACCOUNT=false + export WORK_DIR="$TMPDIR/albyhub" + export DATABASE_URI="$WORK_DIR/nwc.db" + export PORT=8099 + export LDK_LOG_LEVEL=2 + export LOG_LEVEL=5 + + mkdir -p "$WORK_DIR" + + ${lib.getExe finalAttrs.finalPackage} > "$TMPDIR/albyhub.log" 2>&1 & + pid=$! + trap 'kill "$pid" 2>/dev/null || true' EXIT + + for _ in $(seq 1 30); do + if grep -q "http server started" "$TMPDIR/albyhub.log"; then + touch "$out" + exit 0 + fi + + if ! kill -0 "$pid" 2>/dev/null; then + echo "albyhub exited before startup" >&2 + cat "$TMPDIR/albyhub.log" >&2 + exit 1 + fi + + sleep 1 + done + + echo "timed out waiting for albyhub to start" >&2 + cat "$TMPDIR/albyhub.log" >&2 + exit 1 + ''; + meta = { description = "Control lightning wallets over nostr"; homepage = "https://github.com/getAlby/hub"; diff --git a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch b/pkgs/by-name/al/alcom/disable-updater-artifacts.patch deleted file mode 100644 index 17e739d312c6..000000000000 --- a/pkgs/by-name/al/alcom/disable-updater-artifacts.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/vrc-get-gui/Tauri.toml b/vrc-get-gui/Tauri.toml -index cd180da8..66a81aa9 100644 ---- a/vrc-get-gui/Tauri.toml -+++ b/vrc-get-gui/Tauri.toml -@@ -34,8 +34,6 @@ icon = [ - resources = [] - publisher = "anatawa12" - --createUpdaterArtifacts = "v1Compatible" # remove if ci # we do not generate updater artifacts in CI -- - [[bundle.fileAssociations]] - # note: for macOS we directory use info.plist for registering file association. - description = "ALCOM Project Template" diff --git a/pkgs/by-name/al/alcom/package.nix b/pkgs/by-name/al/alcom/package.nix index fb58e6d60d59..b8dede7d42c8 100644 --- a/pkgs/by-name/al/alcom/package.nix +++ b/pkgs/by-name/al/alcom/package.nix @@ -17,25 +17,18 @@ webkitgtk_4_1, }: let + subdir = "vrc-get-gui"; +in +rustPlatform.buildRustPackage (finalAttrs: { pname = "alcom"; - version = "1.1.5"; - + version = "1.1.8"; src = fetchFromGitHub { owner = "vrc-get"; repo = "vrc-get"; - tag = "gui-v${version}"; - hash = "sha256-xucU8nXskniHOiuwrtVoZM2FIKNKU45i4DNo6iLjZvM="; + tag = "gui-v${finalAttrs.version}"; + hash = "sha256-86oR2+qKCmgkQMROq/RZDsSYINzdG5U08dmPznzMSzg="; }; - subdir = "vrc-get-gui"; -in -rustPlatform.buildRustPackage { - inherit pname version src; - - patches = [ - ./disable-updater-artifacts.patch - ]; - nativeBuildInputs = [ cargo-about cargo-tauri.hook @@ -55,13 +48,22 @@ rustPlatform.buildRustPackage { webkitgtk_4_1 ]; - cargoHash = "sha256-MeCx3BoEXckMZfecyBcwwVE8+6V9Di6ULkIhUvUFZIA="; + cargoHash = "sha256-z3VLIRTyS127TS+jdGTdlt1xmMHdwFAsMzkkuVc78lU="; + buildFeatures = [ "no-self-updater" ]; buildAndTestSubdir = subdir; + postInstall = '' + install -Dm644 ${subdir}/icons/icon.png $out/share/icons/hicolor/512x512/apps/ALCOM.png + for size in 32x32 64x64 128x128 128x128@2x; do + install -Dm644 ${subdir}/icons/$size.png $out/share/icons/hicolor/''${size%x}/apps/ALCOM.png + done + ''; + npmDeps = fetchNpmDeps { - inherit src; - sourceRoot = "${src.name}/${subdir}"; - hash = "sha256-snXOfAtanLPhQNo0mg/r8UUXJua2X+52t7+7QS1vOkI="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${subdir}"; + hash = "sha256-flWM2ctaGak/KaTZ5sCj3Z28vIqOeiX8VJMTaIxg2fw="; }; npmRoot = subdir; @@ -69,8 +71,11 @@ rustPlatform.buildRustPackage { description = "Experimental GUI application to manage VRChat Unity Projects"; homepage = "https://github.com/vrc-get/vrc-get"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ Scrumplex ]; + maintainers = with lib.maintainers; [ + Scrumplex + ImSapphire + ]; broken = stdenv.hostPlatform.isDarwin; mainProgram = "ALCOM"; }; -} +}) diff --git a/pkgs/by-name/al/aldente/package.nix b/pkgs/by-name/al/aldente/package.nix index 6d41225a7fde..aae7dc51b192 100644 --- a/pkgs/by-name/al/aldente/package.nix +++ b/pkgs/by-name/al/aldente/package.nix @@ -43,7 +43,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/al/alephone/package.nix b/pkgs/by-name/al/alephone/package.nix index 42fb25a838dc..a0d7cb135ba0 100644 --- a/pkgs/by-name/al/alephone/package.nix +++ b/pkgs/by-name/al/alephone/package.nix @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Aleph One is the open source continuation of Bungie’s Marathon 2 game engine"; mainProgram = "alephone"; homepage = "https://alephone.lhowon.org/"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/al/alerta-server/package.nix b/pkgs/by-name/al/alerta-server/package.nix index a8109b35fd33..0c83ccd4fbc6 100644 --- a/pkgs/by-name/al/alerta-server/package.nix +++ b/pkgs/by-name/al/alerta-server/package.nix @@ -7,14 +7,16 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "alerta-server"; version = "9.0.1"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-v4+0l5Sx9RTxmNFnKCoKrWFl1xu1JIRZ/kiI6zi/y0I="; }; - propagatedBuildInputs = with python3.pkgs; [ + build-system = [ python3.pkgs.setuptools_80 ]; + + dependencies = with python3.pkgs; [ bcrypt blinker cryptography diff --git a/pkgs/by-name/al/alexandria/package.nix b/pkgs/by-name/al/alexandria/package.nix deleted file mode 100644 index 7ada5f42977e..000000000000 --- a/pkgs/by-name/al/alexandria/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - rustPlatform, - lib, - fetchFromGitHub, - pkg-config, - # webkitgtk_4_0, - openssl, - nodejs, - npmHooks, - fetchNpmDeps, - gtk3, - wrapGAppsHook3, - cargo-tauri_1, - librsvg, - libappindicator-gtk3, -}: - -rustPlatform.buildRustPackage rec { - pname = "alexandria"; - version = "0.13.1"; - - src = fetchFromGitHub { - owner = "btpf"; - repo = "Alexandria"; - tag = "v${version}"; - hash = "sha256-18i3/HLTfhBSa9/c55dCOfFal+V40wcHcLoYt1dU+d0="; - fetchSubmodules = true; - }; - - npmDeps = fetchNpmDeps { - inherit src; - hash = "sha256-6r9bEY7e1Eef/0/CJ26ITpFJcCVUEKLrFx+TNEomLPE="; - }; - - cargoRoot = "src-tauri"; - buildAndTestSubdir = "src-tauri"; - - cargoHash = "sha256-VX/G4dF9DhlGfifp4xf9xkXli7BHFtKY2+HaMHqqPiA="; - - env = { - OPENSSL_NO_VENDOR = 1; - }; - - nativeBuildInputs = [ - cargo-tauri_1.hook - nodejs - npmHooks.npmConfigHook - pkg-config - rustPlatform.bindgenHook - wrapGAppsHook3 - ]; - - buildInputs = [ - openssl - # webkitgtk_4_0 - gtk3 - librsvg - libappindicator-gtk3 - ]; - - meta = { - # webkitgtk_4_0 was removed - broken = true; - homepage = "https://github.com/btpf/Alexandria"; - changelog = "https://github.com/btpf/Alexandria/releases/tag/v${version}"; - description = "Minimalistic cross-platform eBook reader"; - maintainers = with lib.maintainers; [ bot-wxt1221 ]; - mainProgram = "alexandria"; - platforms = [ - "x86_64-linux" - "aarch64-darwin" - "x86_64-darwin" - ]; - license = lib.licenses.gpl3Plus; - }; -} diff --git a/pkgs/by-name/al/algia/package.nix b/pkgs/by-name/al/algia/package.nix index dce0559cd5ab..f3d10cdafe20 100644 --- a/pkgs/by-name/al/algia/package.nix +++ b/pkgs/by-name/al/algia/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "algia"; - version = "0.0.122"; + version = "0.0.131"; src = fetchFromGitHub { owner = "mattn"; repo = "algia"; tag = "v${finalAttrs.version}"; - hash = "sha256-G6FEmLmZRUYVpj1ipNtMNi166GKUapIl/hAkPyvFLN0="; + hash = "sha256-ywpaMeJ7vyf4uwoUHyZf7kK3/em7vj86AvfdC2T/UwQ="; }; - vendorHash = "sha256-JTTWVs0KwceiLy6tpyd48zORiXLc18zwgG1c+ceivKU="; + vendorHash = "sha256-mim8EImPFHF2vf1vCi9jgECbVAOB32oXxsPMgUwYDBA="; meta = { description = "CLI application for nostr"; diff --git a/pkgs/by-name/al/algolia-cli/package.nix b/pkgs/by-name/al/algolia-cli/package.nix index 00061b1b3f7e..ce2c6b3f0da1 100644 --- a/pkgs/by-name/al/algolia-cli/package.nix +++ b/pkgs/by-name/al/algolia-cli/package.nix @@ -43,6 +43,6 @@ buildGoModule { mainProgram = "algolia"; homepage = "https://algolia.com/doc/tools/cli/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/al/aliae/package.nix b/pkgs/by-name/al/aliae/package.nix index 42dc084574f5..5a14624dab5b 100644 --- a/pkgs/by-name/al/aliae/package.nix +++ b/pkgs/by-name/al/aliae/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "aliae"; - version = "0.26.6"; + version = "1.1.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = "aliae"; tag = "v${finalAttrs.version}"; - hash = "sha256-W/jj2YQc6M0ro4groCynly2stjv2FLAMvIopnQYCngY="; + hash = "sha256-/n20oNQGcfji2whdl/DaUUf2kgiVZMB73veUfOr9EqU="; }; - vendorHash = "sha256-8YTyhjF0p2l76sowq92ts5TjjcARToOfJN9nlFu19L4="; + vendorHash = "sha256-qY12bkwa8lyHtS7AdvkKuAmwDRyn5am2aU6wy8GE4Wk="; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/al/aliyun-cli/package.nix b/pkgs/by-name/al/aliyun-cli/package.nix index 63db6cc78bab..e18eb1595c6d 100644 --- a/pkgs/by-name/al/aliyun-cli/package.nix +++ b/pkgs/by-name/al/aliyun-cli/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "aliyun-cli"; - version = "3.3.23"; + version = "3.4.7"; src = fetchFromGitHub { owner = "aliyun"; repo = "aliyun-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-0AsrdD9ans1CmyJVK9tcAKGLeptpxdNAtOUuSv4i4zU="; + hash = "sha256-h/69/noEMV4Yz9vl91Sqc1DMnQ4CBopeowfmPAM94i4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/al/aliyunpan/package.nix b/pkgs/by-name/al/aliyunpan/package.nix index 19db0849ad03..cd31873aaf9f 100644 --- a/pkgs/by-name/al/aliyunpan/package.nix +++ b/pkgs/by-name/al/aliyunpan/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "aliyunpan"; - version = "0.3.9"; + version = "0.4.0"; src = fetchFromGitHub { owner = "tickstep"; repo = "aliyunpan"; tag = "v${finalAttrs.version}"; - hash = "sha256-inkden/ZiIxJVZLhM6OVTV4qbesEPJbX2sn4LNZF+FE="; + hash = "sha256-xsDo/I40gNeDjtKRAJCpKL+2SNSKODiygMo97InMB4E="; }; vendorHash = "sha256-PKx40HqXm1nyqjNBSJdW5ucRAkMj9w3fbQYjAGALM1k="; 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 ea0089621d8b..3908ee82c0cc 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.2469"; + version = "2.0.2503"; src = fetchFromGitHub { owner = "nice-registry"; repo = "all-the-package-names"; tag = "v${version}"; - hash = "sha256-niA8ruXOnYXrjJcciwtl1oYTuYze7ii78XxBviTJ4LE="; + hash = "sha256-UtwbQXhX8dmmA6dVuVFcMQkM98kOt/U//OAVMGBImDU="; }; - npmDepsHash = "sha256-DXm6gsQltoqo7A2rRwRO6d7XtlHVf1hotAZ1BYvOqSA="; + npmDepsHash = "sha256-V7MWSEJT2RtYE1iYJHj2ltrfzke+GO1PfT/wo+MqlZk="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/al/allmytoes/package.nix b/pkgs/by-name/al/allmytoes/package.nix new file mode 100644 index 000000000000..6db99b1f0baf --- /dev/null +++ b/pkgs/by-name/al/allmytoes/package.nix @@ -0,0 +1,39 @@ +{ + lib, + nix-update-script, + rustPlatform, + makeWrapper, + shared-mime-info, + fetchFromGitLab, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "allmytoes"; + version = "0.5.1"; + + src = fetchFromGitLab { + owner = "allmytoes"; + repo = "allmytoes"; + tag = finalAttrs.version; + hash = "sha256-BYKcDJN/uKESj0pnb2xvrx1lO6rOGdi+PVT6ywZqjbQ="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + cargoHash = "sha256-Pzbruv1E4mMohw//lf1JBoK+4BHDJVr4/9xXE4FrWbA=="; + + postInstall = '' + wrapProgram "$out/bin/allmytoes" --prefix XDG_DATA_DIRS : "${shared-mime-info}/share" + ''; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + + meta = { + description = "Provides thumbnails by using the freedesktop-specified thumbnail database (aka XDG standard)"; + homepage = "https://gitlab.com/allmytoes/allmytoes"; + mainProgram = "allmytoes"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ luminarleaf ]; + }; +}) diff --git a/pkgs/by-name/al/allure/package.nix b/pkgs/by-name/al/allure/package.nix index 9e64f10b90aa..3f265620777a 100644 --- a/pkgs/by-name/al/allure/package.nix +++ b/pkgs/by-name/al/allure/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "allure"; - version = "2.42.1"; + version = "2.44.0"; src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${finalAttrs.version}/allure-${finalAttrs.version}.tgz"; - hash = "sha256-+Pc79LvSz1uO7lHSdIeu9VydLyZQ2xEaUvqBCIZrqGw="; + hash = "sha256-cCGpCCjADNbsmSAnzOSOipS9h/rUPQwtysR5XK3BeNc="; }; dontConfigure = true; diff --git a/pkgs/by-name/al/almo/package.nix b/pkgs/by-name/al/almo/package.nix index 818dec23a5ef..897886a97d85 100644 --- a/pkgs/by-name/al/almo/package.nix +++ b/pkgs/by-name/al/almo/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.all; homepage = "https://github.com/abap34/almo"; changelog = "https://github.com/abap34/almo/releases/tag/${finalAttrs.src.tag}"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "almo"; }; }) diff --git a/pkgs/by-name/al/alock/package.nix b/pkgs/by-name/al/alock/package.nix index 960db2976c65..6b5b1b490efd 100644 --- a/pkgs/by-name/al/alock/package.nix +++ b/pkgs/by-name/al/alock/package.nix @@ -64,7 +64,6 @@ stdenv.mkDerivation (finalAttrs: { ''; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ - ftrvxmtrx chris-martin ]; license = lib.licenses.mit; diff --git a/pkgs/by-name/al/alot/package.nix b/pkgs/by-name/al/alot/package.nix index 1651b1bfe8eb..96edc5a08021 100644 --- a/pkgs/by-name/al/alot/package.nix +++ b/pkgs/by-name/al/alot/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ configobj - gpgme + gpg notmuch2 python-magic standard-mailcap diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix index ee8e76566a76..db1e4ab9bca0 100644 --- a/pkgs/by-name/al/alpaca/package.nix +++ b/pkgs/by-name/al/alpaca/package.nix @@ -33,14 +33,14 @@ let in pythonPackages.buildPythonApplication rec { pname = "alpaca"; - version = "9.2.3"; + version = "9.2.4"; pyproject = false; # Built with meson src = fetchFromGitHub { owner = "Jeffser"; repo = "Alpaca"; tag = version; - hash = "sha256-SwZcycyY2S4GcB6mMcP6JdzMsBlN5Xr6I9kaKKqnb/8="; + hash = "sha256-rZ1H4QfxkBo+fVFCDODaio+1NEwRVjIY388Q9sR8qO4="; }; postPatch = '' diff --git a/pkgs/by-name/al/alps/package.nix b/pkgs/by-name/al/alps/package.nix index bdefa56e2e5b..5506537156bb 100644 --- a/pkgs/by-name/al/alps/package.nix +++ b/pkgs/by-name/al/alps/package.nix @@ -1,61 +1,86 @@ { lib, buildGoModule, - fetchFromSourcehut, - fetchpatch, + buildNpmPackage, + fetchFromGitHub, nixosTests, + util-linux, + versionCheckHook, }: - -buildGoModule { +buildGoModule (finalAttrs: { pname = "alps"; - version = "2022-10-18"; + version = "1"; + __structuredAttrs = true; - src = fetchFromSourcehut { - owner = "~migadu"; + src = fetchFromGitHub { + owner = "migadu"; repo = "alps"; - rev = "f01fbcbc48db5e65d69a0ebd9d7cb0deb378cf13"; - hash = "sha256-RSug3YSiqYLGs05Bee4NoaoCyPvUZ7IqlKWI1hmxbiA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uzr0N50qKpIoOr7YFfuhnJ/CTaMvcP7TZujM5YpklMs="; }; - vendorHash = "sha256-QsGfINktk+rBj4b5h+NBVS6XV1SVz+9fDL1vtUqcKEU="; + postPatch = '' + substituteInPlace dist/alps.service \ + --replace-fail /usr/local/bin "$out/bin" \ + --replace-fail /bin/kill "${lib.getExe' util-linux "kill"}" + + rm -r frontend/dist + cp -r ${finalAttrs.passthru.frontend} frontend/dist + ''; + + vendorHash = "sha256-Nm9TC0j/PSraO1AtxUJmFQWdhdLzeLP0CXY0FZZ6pV8="; + + subPackages = [ "cmd/alps" ]; ldflags = [ "-s" - "-w" - "-X main.themesPath=${placeholder "out"}/share/alps/themes" - "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" + "-X main.version=${finalAttrs.version}" ]; - patches = [ - (fetchpatch { - name = "Issue-160-Alps-theme-has-a-enormous-move-to-list-sel"; - url = "https://lists.sr.ht/~migadu/alps-devel/patches/30096/mbox"; - hash = "sha256-Sz/SCkrrXZWrmJzjfPXi+UfCcbwsy6QiA7m34iiEFX0="; - }) - ]; - - postPatch = '' - substituteInPlace plugin.go --replace "const PluginDir" "var PluginDir" - ''; - postInstall = '' - mkdir -p "$out/share/alps" - cp -r themes plugins "$out/share/alps/" + install -Dm644 -t "$out/lib/systemd/system/" dist/alps.service ''; - proxyVendor = true; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "-version"; - passthru.tests = { inherit (nixosTests) alps; }; + passthru = { + frontend = buildNpmPackage (finalAttrs': { + pname = "${finalAttrs.pname}-frontend"; + inherit (finalAttrs) version src; + sourceRoot = "${finalAttrs'.src.name}/frontend"; + + npmDepsHash = "sha256-gR9leLQSPo/qBNf6Yy1b2klawwuhKIvofCSPYkHOJKk="; + + postPatch = '' + rm -r dist + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -r dist/. "$out" + + runHook postInstall + ''; + }); + tests = { inherit (nixosTests) alps; }; + }; meta = { description = "Simple and extensible webmail"; - homepage = "https://git.sr.ht/~migadu/alps"; + homepage = "https://github.com/migadu/alps"; + downloadPage = "https://github.com/migadu/alps/releases"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ booklearner madonius hmenke + prince213 ]; + teams = with lib.teams; [ ngi ]; mainProgram = "alps"; }; -} +}) diff --git a/pkgs/by-name/al/alsa-lib/package.nix b/pkgs/by-name/al/alsa-lib/package.nix index 8d0bffd2b12f..398edd5f40fe 100644 --- a/pkgs/by-name/al/alsa-lib/package.nix +++ b/pkgs/by-name/al/alsa-lib/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, alsa-topology-conf, alsa-ucm-conf, testers, @@ -11,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "alsa-lib"; - version = "1.2.15.3"; + version = "1.2.16.1"; src = fetchurl { url = "mirror://alsa/lib/alsa-lib-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ewedYU1YLK3nq42yNk5lJx0Id6N9+HV6xKwMiXC+hh4="; + hash = "sha256-90Dbf0iCVZRP/UQoQW7jOQqWdChWkWQz30aMKBQ2SA4="; }; patches = [ @@ -24,11 +23,6 @@ stdenv.mkDerivation (finalAttrs: { # "libs" field to declare locations for both native and 32bit plugins, in # order to support apps with 32bit sound running on x86_64 architecture. ./alsa-plugin-conf-multilib.patch - (fetchpatch { - name = "CVE-2026-25068.patch"; - url = "https://github.com/alsa-project/alsa-lib/commit/5f7fe33002d2d98d84f72e381ec2cccc0d5d3d40.patch"; - hash = "sha256-4memtcg+FDOctX6wgiCdmnlG+IUS+5rL1f3LcsWS5lw="; - }) ]; enableParallelBuilding = true; @@ -52,6 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.alsa-project.org/"; + changelog = "https://github.com/alsa-project/alsa-lib/releases/tag/v${finalAttrs.version}"; description = "ALSA, the Advanced Linux Sound Architecture libraries"; mainProgram = "aserver"; @@ -66,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { "alsa-topology" ]; platforms = with lib.platforms; linux ++ freebsd; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; }; }) diff --git a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix index ba4df31df4ea..f52781a1dbe2 100644 --- a/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf-asahi/package.nix @@ -9,13 +9,13 @@ let alsa-ucm-conf-asahi = stdenvNoCC.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf-asahi"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "alsa-ucm-conf-asahi"; tag = "v${finalAttrs.version}"; - hash = "sha256-FPrAzscc1ICSCQSqULaGLqG4UCq8GZU9XLV7TUSBBRM="; + hash = "sha256-F+NiEP4EKLUVV2oHSVY+fkXlzXcLyywNOolUy9DO8sI="; }; installPhase = '' diff --git a/pkgs/by-name/al/alsa-ucm-conf/package.nix b/pkgs/by-name/al/alsa-ucm-conf/package.nix index 5f0e2130bb84..261b09ad78a6 100644 --- a/pkgs/by-name/al/alsa-ucm-conf/package.nix +++ b/pkgs/by-name/al/alsa-ucm-conf/package.nix @@ -1,7 +1,6 @@ { directoryListingUpdater, fetchurl, - fetchpatch, lib, stdenvNoCC, coreutils, @@ -10,19 +9,15 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "alsa-ucm-conf"; - version = "1.2.15.3"; + version = "1.2.16.1"; src = fetchurl { url = "mirror://alsa/lib/alsa-ucm-conf-${finalAttrs.version}.tar.bz2"; - hash = "sha256-n3noE8CPyGz6Rt11xPzaGkpRtILbJgfh/PqvuS9YijE="; + hash = "sha256-zz0cB+CJqDxOziwg8F3WqKq3/NEIdow4gROGiAV1SSs="; }; patches = [ - # fix for typo in 1.2.15.3 – remove with subsequent release - (fetchpatch { - url = "https://github.com/alsa-project/alsa-ucm-conf/commit/95377000e849259764f37295e0ddd58fd8a55a76.patch"; - hash = "sha256-o2qR69jiGXFWM0mxeIhXd+tCvGikYqnoalce1UOVppw="; - }) + ]; dontBuild = true; @@ -52,6 +47,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://www.alsa-project.org/"; + changelog = "https://github.com/alsa-project/alsa-ucm-conf/releases/tag/v${finalAttrs.version}"; description = "ALSA Use Case Manager configuration"; longDescription = '' @@ -63,6 +59,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ roastiek mvs + nick-linux ]; platforms = lib.platforms.linux ++ lib.platforms.freebsd; diff --git a/pkgs/by-name/al/alsa-utils/package.nix b/pkgs/by-name/al/alsa-utils/package.nix index ff627a73cc83..91653a4848b6 100644 --- a/pkgs/by-name/al/alsa-utils/package.nix +++ b/pkgs/by-name/al/alsa-utils/package.nix @@ -32,11 +32,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "alsa-utils"; - version = "1.2.15.2"; + version = "1.2.16"; src = fetchurl { url = "mirror://alsa/utils/alsa-utils-${finalAttrs.version}.tar.bz2"; - hash = "sha256-eqqvv7AZQhE+wMMeUfcFkQ6BB5IFCIyi+PE3o4aeGjo="; + hash = "sha256-CSOZ1eh0mh1eGI45MVdSHOxLdWk7YOu3m7znKM/yIyw="; }; nativeBuildInputs = [ @@ -85,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.alsa-project.org/"; + changelog = "https://github.com/alsa-project/alsa-utils/releases/tag/v${finalAttrs.version}"; description = "ALSA, the Advanced Linux Sound Architecture utils"; longDescription = '' The Advanced Linux Sound Architecture (ALSA) provides audio and @@ -98,6 +99,8 @@ stdenv.mkDerivation (finalAttrs: { ]; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + nick-linux + ]; }; }) diff --git a/pkgs/by-name/al/alt-tab-macos/0001-replace-count-where-with-filter-.count-for-Swift-5.1.patch b/pkgs/by-name/al/alt-tab-macos/0001-replace-count-where-with-filter-.count-for-Swift-5.1.patch new file mode 100644 index 000000000000..3d26fdb7a744 --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/0001-replace-count-where-with-filter-.count-for-Swift-5.1.patch @@ -0,0 +1,39 @@ +From 85a2e0440f8af42ae02cf7fee1119255b2459016 Mon Sep 17 00:00:00 2001 +From: nixpkgs +Date: Fri, 10 Jul 2026 12:21:11 +0300 +Subject: [PATCH 1/4] replace count(where:) with filter{}.count for Swift 5.10 + +--- + src/events/TrackpadEvents.swift | 2 +- + src/switcher/main-window/StatusIconsView.swift | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/events/TrackpadEvents.swift b/src/events/TrackpadEvents.swift +index 2f1909df..5e187064 100644 +--- a/src/events/TrackpadEvents.swift ++++ b/src/events/TrackpadEvents.swift +@@ -76,7 +76,7 @@ class TrackpadEvents { + // on macOS, the finger contact surface is not exposed in NSTouch, so we can't detect big contact == palm, for example + // the closest thing we can do to detect resting inputs is remove touches which have .phase == .stationary + let activeTouches = touches.filter { !$0.isResting && ($0.phase == .began || $0.phase == .moved) } +- let fingersDown = touches.count { $0.phase == .began || $0.phase == .moved || $0.phase == .stationary } ++ let fingersDown = touches.filter { $0.phase == .began || $0.phase == .moved || $0.phase == .stationary }.count + let requiredFingers = Preferences.nextWindowGesture.isThreeFinger() ? 3 : 4 + if SwitcherSession.isActive { + handleEventIfAppIsBeingUsed(fingersDown, activeTouches, requiredFingers) +diff --git a/src/switcher/main-window/StatusIconsView.swift b/src/switcher/main-window/StatusIconsView.swift +index beeb2a54..2f35bddc 100644 +--- a/src/switcher/main-window/StatusIconsView.swift ++++ b/src/switcher/main-window/StatusIconsView.swift +@@ -76,7 +76,7 @@ class StatusIconsView: FlippedView { + icons[Self.fullscreenIdx].visible = isFullscreen + icons[Self.minimizedIdx].visible = isMinimized + icons[Self.spaceIdx].visible = showSpace +- visibleCount = icons.count(where: { $0.visible }) ++ visibleCount = icons.filter { $0.visible }.count + } + + func setSpaceStar() { +-- +2.55.0 + diff --git a/pkgs/by-name/al/alt-tab-macos/0002-replace-.extraLarge-with-.large-for-macOS-14-SDK.patch b/pkgs/by-name/al/alt-tab-macos/0002-replace-.extraLarge-with-.large-for-macOS-14-SDK.patch new file mode 100644 index 000000000000..15e284d6611f --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/0002-replace-.extraLarge-with-.large-for-macOS-14-SDK.patch @@ -0,0 +1,39 @@ +From 7313d220616e756c4bb4f2c8cc5cf6b6b2e4789c Mon Sep 17 00:00:00 2001 +From: nixpkgs +Date: Fri, 10 Jul 2026 12:21:11 +0300 +Subject: [PATCH 2/4] replace .extraLarge with .large for macOS 14 SDK + +--- + src/preferences/settings-window/SettingsWindow.swift | 2 +- + src/switcher/main-window/TilesView.swift | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/preferences/settings-window/SettingsWindow.swift b/src/preferences/settings-window/SettingsWindow.swift +index 866329ea..44f1da76 100644 +--- a/src/preferences/settings-window/SettingsWindow.swift ++++ b/src/preferences/settings-window/SettingsWindow.swift +@@ -462,7 +462,7 @@ class SettingsWindow: NSWindow { + searchField.sendsWholeSearchString = true + searchField.bezelStyle = .roundedBezel + if #available(macOS 26.0, *) { +- searchField.controlSize = .extraLarge ++ searchField.controlSize = .large + } else if #available(macOS 13.0, *) { + searchField.controlSize = .large + } +diff --git a/src/switcher/main-window/TilesView.swift b/src/switcher/main-window/TilesView.swift +index d6c7fb69..b6f374c9 100644 +--- a/src/switcher/main-window/TilesView.swift ++++ b/src/switcher/main-window/TilesView.swift +@@ -142,7 +142,7 @@ class TilesView { + searchField.sendsWholeSearchString = true + searchField.bezelStyle = .roundedBezel + if #available(macOS 26.0, *) { +- searchField.controlSize = .extraLarge ++ searchField.controlSize = .large + } else if #available(macOS 13.0, *) { + searchField.controlSize = .large + } else { +-- +2.55.0 + diff --git a/pkgs/by-name/al/alt-tab-macos/0003-use-runtime-dispatch-for-Liquid-Glass-with-SDK-14.patch b/pkgs/by-name/al/alt-tab-macos/0003-use-runtime-dispatch-for-Liquid-Glass-with-SDK-14.patch new file mode 100644 index 000000000000..ebd914a0bd0e --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/0003-use-runtime-dispatch-for-Liquid-Glass-with-SDK-14.patch @@ -0,0 +1,193 @@ +From 727f4c5aed5960bb429c7df0bbc3a547e05db7dd Mon Sep 17 00:00:00 2001 +From: nixpkgs +Date: Fri, 10 Jul 2026 12:21:12 +0300 +Subject: [PATCH 3/4] use runtime dispatch for Liquid Glass with SDK 14 + +--- + src/switcher/Appearance.swift | 2 +- + .../TilesPanelBackgroundView.swift | 122 +++++++++++------- + 2 files changed, 77 insertions(+), 47 deletions(-) + +diff --git a/src/switcher/Appearance.swift b/src/switcher/Appearance.swift +index dd033fa4..efb70c77 100644 +--- a/src/switcher/Appearance.swift ++++ b/src/switcher/Appearance.swift +@@ -83,7 +83,7 @@ class Appearance { + lightTheme() + } + // for Liquid Glass, we don't want a shadow around the panel +- if #available(macOS 26.0, *), currentStyle == .appIcons && LiquidGlass.canUsePrivateLook { ++ if #available(macOS 26.0, *), currentStyle == .appIcons && LiquidGlassEffectView.canUsePrivateLook { + enablePanelShadow = false + } else { + enablePanelShadow = true +diff --git a/src/switcher/main-window/TilesPanelBackgroundView.swift b/src/switcher/main-window/TilesPanelBackgroundView.swift +index cea0819c..99d12b06 100644 +--- a/src/switcher/main-window/TilesPanelBackgroundView.swift ++++ b/src/switcher/main-window/TilesPanelBackgroundView.swift +@@ -7,12 +7,81 @@ protocol EffectView: NSView { + } + + @available(macOS 26.0, *) +-extension NSGlassEffectView: EffectView { +- func updateAppearance() { +- cornerRadius = Appearance.windowCornerRadius ++class LiquidGlassEffectView: NSView, EffectView { ++ private typealias SetIntType = @convention(c) (AnyObject, Selector, Int) -> Void ++ private typealias SetCGFloatType = @convention(c) (AnyObject, Selector, CGFloat) -> Void ++ private typealias SetObjectType = @convention(c) (AnyObject, Selector, AnyObject) -> Void ++ private static let setVariantSelector = NSSelectorFromString("set_variant:") ++ private static let setStyleSelector = NSSelectorFromString("setStyle:") ++ private static let setCornerRadiusSelector = NSSelectorFromString("setCornerRadius:") ++ private static let setContentViewSelector = NSSelectorFromString("setContentView:") ++ private static let glassClass: AnyClass? = NSClassFromString("NSGlassEffectView") ++ ++ static let canUsePrivateLook: Bool = { ++ guard let cls = glassClass else { return false } ++ return class_getInstanceMethod(cls, setVariantSelector) != nil ++ }() ++ ++ private var glassView: NSView? ++ private var contentHost: NSView! ++ ++ var hostView: NSView { contentHost } ++ ++ convenience init(clear: Bool) { ++ self.init(frame: .zero) ++ wantsLayer = true ++ layer!.masksToBounds = true ++ ++ let glass: NSView ++ if let cls = Self.glassClass as? NSView.Type { ++ glass = cls.init(frame: .zero) ++ } else { ++ glass = NSView(frame: .zero) ++ } ++ glass.translatesAutoresizingMaskIntoConstraints = false ++ addSubview(glass) ++ NSLayoutConstraint.activate([ ++ glass.leadingAnchor.constraint(equalTo: leadingAnchor), ++ glass.trailingAnchor.constraint(equalTo: trailingAnchor), ++ glass.topAnchor.constraint(equalTo: topAnchor), ++ glass.bottomAnchor.constraint(equalTo: bottomAnchor), ++ ]) ++ glassView = glass ++ ++ // NSGlassEffectView.Style: regular = 0, clear = 1 ++ Self.invokeIntSetter(glass, Self.setStyleSelector, clear ? 1 : 0) ++ if clear { ++ Self.invokeIntSetter(glass, Self.setVariantSelector, 3) ++ } ++ contentHost = NSView(frame: .zero) ++ Self.invokeObjectSetter(glass, Self.setContentViewSelector, contentHost) ++ updateAppearance() ++ } ++ ++ private static func invokeIntSetter(_ target: AnyObject, _ selector: Selector, _ value: Int) { ++ guard let method = class_getInstanceMethod(object_getClass(target), selector) else { return } ++ let function = unsafeBitCast(method_getImplementation(method), to: SetIntType.self) ++ function(target, selector, value) + } + +- var hostView: NSView { contentView! } ++ private static func invokeCGFloatSetter(_ target: AnyObject, _ selector: Selector, _ value: CGFloat) { ++ guard let method = class_getInstanceMethod(object_getClass(target), selector) else { return } ++ let function = unsafeBitCast(method_getImplementation(method), to: SetCGFloatType.self) ++ function(target, selector, value) ++ } ++ ++ private static func invokeObjectSetter(_ target: AnyObject, _ selector: Selector, _ value: AnyObject) { ++ guard let method = class_getInstanceMethod(object_getClass(target), selector) else { return } ++ let function = unsafeBitCast(method_getImplementation(method), to: SetObjectType.self) ++ function(target, selector, value) ++ } ++ ++ func updateAppearance() { ++ let radius = Appearance.windowCornerRadius ++ layer?.cornerRadius = radius ++ guard let glass = glassView else { return } ++ Self.invokeCGFloatSetter(glass, Self.setCornerRadiusSelector, radius) ++ } + } + + class FrostedGlassEffectView: NSVisualEffectView, EffectView { +@@ -51,28 +120,6 @@ class FrostedGlassEffectView: NSVisualEffectView, EffectView { + } + } + +-/// The App Icons style uses the private `set_variant:` on `NSGlassEffectView` to get the macOS +-/// Cmd-Tab-like clear glass look. `style = .clear` alone renders nearly fully transparent, so the +-/// variant is what makes the panel visible. Lives here as a free helper (no NSGlassEffectView subclass). +-enum LiquidGlass { +- private static let setVariantSelector = NSSelectorFromString("set_variant:") +- private typealias SetVariantFn = @convention(c) (AnyObject, Selector, Int) -> Void +- +- static let canUsePrivateLook: Bool = { +- if #available(macOS 26.0, *) { +- return class_getInstanceMethod(object_getClass(NSGlassEffectView()), setVariantSelector) != nil +- } +- return false +- }() +- +- @available(macOS 26.0, *) +- static func applyClearVariant(_ view: NSGlassEffectView) { +- guard let method = class_getInstanceMethod(object_getClass(view), setVariantSelector) else { return } +- let f = unsafeBitCast(method_getImplementation(method), to: SetVariantFn.self) +- f(view, setVariantSelector, 3) +- } +-} +- + enum EffectViewKind { + case frosted + case liquidGlassRegular +@@ -82,7 +129,7 @@ enum EffectViewKind { + func requiredEffectViewKind() -> EffectViewKind { + if #available(macOS 26.0, *) { + if Preferences.effectiveAppearanceStyle(SwitcherSession.activeShortcutIndex) == .appIcons, +- LiquidGlass.canUsePrivateLook { ++ LiquidGlassEffectView.canUsePrivateLook { + return .liquidGlassClear + } + return .liquidGlassRegular +@@ -90,28 +137,11 @@ func requiredEffectViewKind() -> EffectViewKind { + return .frosted + } + +-@available(macOS 26.0, *) +-private func makeGlassEffectView(clear: Bool) -> NSGlassEffectView { +- let glass = NSGlassEffectView() +- glass.style = clear ? .clear : .regular +- if clear { +- LiquidGlass.applyClearVariant(glass) +- } +- // NSGlassEffectView only renders views embedded in `contentView`; this single host holds the +- // scroll view, search field and empty-state label so they all sit inside the glass. +- glass.contentView = NSView() +- glass.updateAppearance() +- // without this, there are weird shadows around the corners (most visible with .regular glass) +- glass.wantsLayer = true +- glass.layer!.masksToBounds = true +- return glass +-} +- + func makeEffectView(for kind: EffectViewKind) -> EffectView { + if #available(macOS 26.0, *) { + switch kind { + case .liquidGlassClear: +- return makeGlassEffectView(clear: true) ++ return LiquidGlassEffectView(clear: true) + case .liquidGlassRegular: + if Preferences.effectiveAppearanceStyle(SwitcherSession.activeShortcutIndex) == .appIcons { + Logger.error { +@@ -119,7 +149,7 @@ func makeEffectView(for kind: EffectViewKind) -> EffectView { + return "Private API set_variant is no longer available. macOS version: \(os.majorVersion).\(os.minorVersion).\(os.patchVersion)" + } + } +- return makeGlassEffectView(clear: false) ++ return LiquidGlassEffectView(clear: false) + case .frosted: + break + } +-- +2.55.0 + diff --git a/pkgs/by-name/al/alt-tab-macos/0004-hide-settings-for-disabled-services.patch b/pkgs/by-name/al/alt-tab-macos/0004-hide-settings-for-disabled-services.patch new file mode 100644 index 000000000000..11608646cf18 --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/0004-hide-settings-for-disabled-services.patch @@ -0,0 +1,43 @@ +From cb68a038f6a0fc79cb60570bbec7bf3c45a5d8d2 Mon Sep 17 00:00:00 2001 +From: nixpkgs +Date: Fri, 10 Jul 2026 13:52:57 +0300 +Subject: [PATCH 4/4] hide settings for disabled services + +--- + .../settings-window/tabs/GeneralTab.swift | 13 ------------- + 1 file changed, 13 deletions(-) + +diff --git a/src/preferences/settings-window/tabs/GeneralTab.swift b/src/preferences/settings-window/tabs/GeneralTab.swift +index ab64ea9c..19dbef5e 100644 +--- a/src/preferences/settings-window/tabs/GeneralTab.swift ++++ b/src/preferences/settings-window/tabs/GeneralTab.swift +@@ -20,12 +20,6 @@ class GeneralTab { + ]) + let language = TableGroupView.Row(leftTitle: NSLocalizedString("Language", comment: ""), + rightViews: [LabelAndControl.makeDropdown("language", LanguagePreference.allCases, extraAction: setLanguageCallback)]) +- updatesPolicyDropdown = LabelAndControl.makeDropdown("updatePolicy", UpdatePolicyPreference.allCases) +- let checkForUpdates = NSButton(title: NSLocalizedString("Check for updates now…", comment: ""), target: nil, action: nil) +- checkForUpdates.onAction = { control in checkForUpdatesNow(control) } +- crashPolicyDropdown = LabelAndControl.makeDropdown("crashPolicy", CrashPolicyPreference.allCases) +- let crashPolicy = TableGroupView.Row(leftTitle: NSLocalizedString("Crash reports policy", comment: ""), +- rightViews: [crashPolicyDropdown!]) + for i in 0..` link order. + # + # Build shapes (exactly one of): + # stubSrc: single-file Swift stub (+ optional stubExtraFlags) + # objc = { ... }: Objective-C framework; see buildObjcFramework for keys + # + # Install extras (all optional): + # plistOverrides: extra CFBundle* keys merged into the framework Info.plist + # localizations: directory to scan for *.lproj dirs to copy into Resources + # xcassets: .xcassets directory compiled with actool into Assets.car + frameworks = [ + { + name = "ShortcutRecorder"; + objc = { + moduleMap = ./stubs/ShortcutRecorder.modulemap; + headerGlob = ''"${shortcutRecorderDir}"/include/ShortcutRecorder/*.h''; + sourceGlob = ''"${shortcutRecorderDir}"/*.m''; + includes = [ + "${shortcutRecorderDir}/include" + "${shortcutRecorderDir}/include/ShortcutRecorder" + ]; + sysFrameworks = [ + "Carbon" + "AppKit" + "Foundation" + "CoreData" + ]; + }; + # ShortcutRecorder looks up its own bundle via SRBundle() by identifier + plistOverrides = { + CFBundleIdentifier = "com.kulakov.ShortcutRecorder"; + CFBundleVersion = "3.1"; + CFBundleShortVersionString = "3.1"; + }; + localizations = shortcutRecorderDir; + xcassets = "${shortcutRecorderDir}/Images.xcassets"; + } + # Updates are managed by Nix, and upstream's AppCenter package depends on + # a prebuilt PLCrashReporter xcframework. API-compatible stubs keep both + # network-facing services disabled while preserving a source-only build. + { + name = "Sparkle"; + stubSrc = ./stubs/SparkleStub.swift; + } + { + name = "AppCenter"; + stubSrc = ./stubs/AppCenterStub.swift; + } + { + name = "AppCenterCrashes"; + stubSrc = ./stubs/AppCenterCrashesStub.swift; + stubExtraFlags = [ + "-I" + "$buildDir" + "-L" + "$buildDir" + "-lAppCenter" + ]; + } + ]; + + allFrameworks = lib.catAttrs "name" frameworks; + objcFrameworks = lib.filter (fw: fw ? objc) frameworks; + + # apple-sdk_26 cannot be used here because swiftPackages compiles its own modules + # against apple-sdk_14; adding it to buildInputs redirects SDKROOT and breaks Swift's + # foundational modules + commonSwiftFlags = [ + "-O" + "-swift-version" + "5" + "-disable-bridging-pch" + "-Xlinker" + "-platform_version" + "-Xlinker" + "macos" + "-Xlinker" + deploymentTarget + "-Xlinker" + sdkVersion + ]; + + # These are the non-localized files in upstream's PBXResourcesBuildPhase. + appResources = [ + "resources/icons/app/app.icns" + "resources/icons/menubar/*.pdf" + "resources/illustrations/*.heic" + "resources/*.otf" + "docs/contributors.md" + "docs/acknowledgments.md" + ]; + + infoPlistSubstitutions = version: { + API_DOMAIN = "alt-tab.app/api"; + APPCENTER_SECRET = ""; + CURRENT_PROJECT_VERSION = version; + DOMAIN = "alt-tab.app"; + EXECUTABLE_NAME = "AltTab"; + MACOSX_DEPLOYMENT_TARGET = deploymentTarget; + PRODUCT_BUNDLE_IDENTIFIER = "com.lwouis.alt-tab-macos"; + PRODUCT_NAME = "AltTab"; }; - sourceRoot = "."; + substitutePlistVariables = + substitutions: + lib.concatStringsSep " \\\n " ( + lib.mapAttrsToList ( + name: value: "--replace-fail ${lib.escapeShellArg "$(${name})"} ${lib.escapeShellArg value}" + ) substitutions + ); - nativeBuildInputs = [ unzip ]; + frameworkPlist = + name: extra: + toPlist ( + { + CFBundleExecutable = name; + CFBundleIdentifier = "com.lwouis.alt-tab-macos.${name}"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = name; + CFBundlePackageType = "FMWK"; + CFBundleVersion = "1"; + } + // extra + ); + + # Shared swiftc invocation for emitting a dylib + swiftmodule for . + # `sourcesExpr` is inlined into the swiftc command line: either a single + # path (stub), or a bash array expansion like "${foo[@]}" (glob output). + swiftFrameworkLink = + { + name, + sourcesExpr, + extraFlags ? [ ], + }: + '' + swiftc "''${commonSwiftFlags[@]}" \ + -emit-module -emit-library \ + -module-name ${name} -module-link-name ${name} \ + -emit-module-path "$buildDir/${name}.swiftmodule" \ + ${lib.concatStringsSep " " extraFlags} \ + -Xlinker -install_name -Xlinker "@rpath/${name}.framework/${name}" \ + ${sourcesExpr} -o "$buildDir/lib${name}.dylib" + ''; + + # Build a single-file Swift stub framework. + buildSwiftStubFramework = fw: '' + nixLog "Building ${fw.name} (stub)" + ${swiftFrameworkLink { + inherit (fw) name; + sourcesExpr = "${fw.stubSrc}"; + extraFlags = fw.stubExtraFlags or [ ]; + }} + ''; + + # Build an Objective-C dynamic framework: symlink headers + modulemap under + # $buildDir/_headers//, compile each .m to .o, then link a dylib. + # moduleMap: path to a .modulemap file (copied in place) + # headerGlob: bash expression expanding to header paths (for ln -s) + # sourceGlob: bash expression expanding to .m paths (one .o per source) + # arc: enable -fobjc-arc (default true) + # includes: extra -I paths passed to clang + # sysFrameworks: macOS system frameworks to link + buildObjcFramework = + fw: + let + o = fw.objc; + arc = o.arc or true; + arcFlag = if arc then "-fobjc-arc" else "-fno-objc-arc"; + includeFlags = lib.concatMapStringsSep " " (p: ''-I "${p}"'') (o.includes or [ ]); + sysFrameworkFlags = lib.concatMapStringsSep " " (f: "-framework ${f}") (o.sysFrameworks or [ ]); + in + '' + ( + nixLog "Building ${fw.name}" + hdrDir="$buildDir/${fw.name}_headers/${fw.name}" + mkdir -p "$hdrDir" + for h in ${o.headerGlob}; do + ln -s "$(realpath "$h")" "$hdrDir/$(basename "$h")" + done + cp ${o.moduleMap} "$hdrDir/module.modulemap" + + objs=() + for f in ${o.sourceGlob}; do + obj="$buildDir/${fw.name}_$(basename "$f" .m).o" + clang ${arcFlag} -O2 -Wno-deprecated-declarations \ + -I "$buildDir/${fw.name}_headers" ${includeFlags} \ + -c "$f" -o "$obj" + objs+=("$obj") + done + + clang -fuse-ld=lld -dynamiclib ${lib.optionalString arc "-fobjc-arc"} "''${objs[@]}" \ + ${sysFrameworkFlags} \ + -install_name "@rpath/${fw.name}.framework/${fw.name}" \ + -o "$buildDir/lib${fw.name}.dylib" + ) + ''; + + # Dispatch to the right builder based on descriptor shape. + buildFramework = + fw: + if fw ? stubSrc then + buildSwiftStubFramework fw + else if fw ? objc then + buildObjcFramework fw + else + throw "framework ${fw.name} has no build descriptor"; + + # Module-map flags for the final AltTab swiftc invocation, so Swift code can + # `import `. Flat single line so the surrounding `\` + # continuation in the swiftc call stays intact. + objcModuleMapFlags = lib.concatMapStringsSep " " ( + fw: + ''-Xcc -fmodule-map-file="$buildDir/${fw.name}_headers/${fw.name}/module.modulemap" -Xcc -I"$buildDir/${fw.name}_headers"'' + ) objcFrameworks; + + # Compile an xcassets catalog into Assets.car in destDir + compileAssetCatalog = + { destDir, catalog }: + '' + actool --compile "${destDir}" \ + --platform macosx --minimum-deployment-target ${deploymentTarget} \ + --output-partial-info-plist /dev/null \ + "${catalog}" + ''; + + # Assemble one framework bundle: dylib + Info.plist + optional resources. + # Runs in the install phase where $app and $buildDir are set. + installFramework = fw: '' + fwDir="$app/Contents/Frameworks/${fw.name}.framework" + mkdir -p "$fwDir/Resources" + cp "$buildDir/lib${fw.name}.dylib" "$fwDir/${fw.name}" + printf '%s' ${ + lib.escapeShellArg (frameworkPlist fw.name (fw.plistOverrides or { })) + } > "$fwDir/Resources/Info.plist" + ${lib.optionalString (fw ? localizations) '' + cp -R "${fw.localizations}"/*.lproj "$fwDir/Resources/" + ''} + ${lib.optionalString (fw ? xcassets) (compileAssetCatalog { + destDir = "$fwDir/Resources"; + catalog = fw.xcassets; + })} + ''; +in +stdenv.mkDerivation (finalAttrs: { + pname = "alt-tab-macos"; + version = "11.4.3"; + + src = fetchFromGitHub { + owner = "lwouis"; + repo = "alt-tab-macos"; + tag = "v${finalAttrs.version}"; + hash = "sha256-izPiRGV8bD67rvOyNWShcpTbUujn6WHnzenPAMAlKoU="; + }; + + nativeBuildInputs = [ + swift + actool + lld + makeWrapper + rcodesign + ]; + + patches = [ + # Swift 5.10 compatibility: count(where:), .extraLarge, Liquid Glass + ./0001-replace-count-where-with-filter-.count-for-Swift-5.1.patch + ./0002-replace-.extraLarge-with-.large-for-macOS-14-SDK.patch + ./0003-use-runtime-dispatch-for-Liquid-Glass-with-SDK-14.patch + # Don't offer preferences for services disabled by the source-only stubs. + ./0004-hide-settings-for-disabled-services.patch + ]; + + # Remove trailing comma incompatible with Swift 5.10 + postPatch = '' + substituteInPlace Info.plist \ + ${substitutePlistVariables (infoPlistSubstitutions finalAttrs.version)} + + substituteInPlace src/secondary-windows/permission-window/PermissionsWindow.swift \ + --replace-fail \ + '"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility",' \ + '"x-apple.systempreferences:com.apple.preference.security?Privacy_Accessibility"' + + # Swift 5.10 compat: additional call site using trailing-closure + # sugar for count(where:). See 0001-replace-count-where-...patch. + substituteInPlace src/util/UsageStats.swift \ + --replace-fail \ + 'getTimestamps(key).count { $0 >= threshold }' \ + 'getTimestamps(key).filter { $0 >= threshold }.count' + ''; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + buildDir="$PWD/build" + mkdir -p "$buildDir" + + ${lib.toShellVars { inherit commonSwiftFlags; }} + + ${lib.concatMapStringsSep "\n" buildFramework frameworks} + + nixLog "Compiling AppCenterApplication" + clang -fobjc-arc -fmodules -fmodules-cache-path="$buildDir/module-cache" -O2 \ + -c ${./stubs/AppCenterApplication.m} -o "$buildDir/AppCenterApplication.o" + + nixLog "Compiling ObjCExceptionCatcher" + clang -fobjc-arc -fmodules -fmodules-cache-path="$buildDir/module-cache" -O2 \ + -c src/vendors/ObjCExceptionCatcher.m -o "$buildDir/ObjCExceptionCatcher.o" + + nixLog "Building AltTab" + mapfile -d ''' files < <(find src -name '*.swift' \ + -not -name '*Tests.swift' \ + -not -path '*/_test-support/*' \ + -not -path '*/experimentations/*' \ + -print0) + + swiftc "''${commonSwiftFlags[@]}" \ + -emit-executable -module-name AltTab \ + -import-objc-header alt-tab-macos-Bridging-Header.h \ + -Xcc -Isrc/ui \ + -Xcc -Isrc/vendors \ + -I "$buildDir" -L "$buildDir" \ + ${objcModuleMapFlags} \ + ${lib.concatMapStringsSep " " (fw: "-l${fw}") allFrameworks} \ + -F /System/Library/PrivateFrameworks \ + -framework SkyLight -framework Carbon -framework AppKit -framework Cocoa \ + -framework ScreenCaptureKit -framework ApplicationServices \ + -framework CoreGraphics -framework CoreText \ + -Xlinker -rpath -Xlinker "@executable_path/../Frameworks" \ + "$buildDir/AppCenterApplication.o" \ + "$buildDir/ObjCExceptionCatcher.o" \ + "''${files[@]}" -o "$buildDir/AltTab" + + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p $out/Applications - cp -r *.app $out/Applications + app="$out/Applications/AltTab.app" + mkdir -p "$app/Contents/"{MacOS,Frameworks,Resources} + + cp "$buildDir/AltTab" "$app/Contents/MacOS/AltTab" + + # Install each framework: dylib + Info.plist + optional resources + ${lib.concatMapStringsSep "\n" installFramework frameworks} + + cp Info.plist "$app/Contents/Info.plist" + printf 'APPL????' > "$app/Contents/PkgInfo" + + # Xcode flattens these PBXGroup resources into Contents/Resources. + cp ${lib.concatStringsSep " " appResources} "$app/Contents/Resources/" + cp -R resources/l10n/*.lproj "$app/Contents/Resources/" + + makeWrapper "$app/Contents/MacOS/AltTab" "$out/bin/alt-tab" runHook postInstall ''; + # Sign the complete app rather than each Mach-O independently, so its nested + # frameworks and resources are sealed as one valid bundle. Match upstream's + # hardened-runtime flags and entitlements on the main executable. This must + # remain ad-hoc: a stable designated requirement needs a private signing + # identity, which cannot be embedded in a public, sandboxed Nix build. + postFixup = '' + ${lib.getExe rcodesign} sign \ + --code-signature-flags runtime \ + --entitlements-xml-file ${finalAttrs.src}/alt_tab_macos.entitlements \ + "$out/Applications/AltTab.app" + ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Windows alt-tab on macOS"; - homepage = "https://alt-tab-macos.netlify.app"; - license = lib.licenses.gpl3Plus; + homepage = "https://alt-tab.app"; + license = with lib.licenses; [ + gpl3Plus + cc-by-40 # ShortcutRecorder + ]; + mainProgram = "alt-tab"; maintainers = with lib.maintainers; [ - FlameFlag + _4evy emilytrau + Br1ght0ne ]; platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; }) diff --git a/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterApplication.m b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterApplication.m new file mode 100644 index 000000000000..497e8f107ab6 --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterApplication.m @@ -0,0 +1,7 @@ +#import + +@interface AppCenterApplication : NSApplication +@end + +@implementation AppCenterApplication +@end diff --git a/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterCrashesStub.swift b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterCrashesStub.swift new file mode 100644 index 000000000000..c7f270eb304d --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterCrashesStub.swift @@ -0,0 +1,25 @@ +import Foundation + +@objc public enum UserConfirmation: UInt { + case send = 0 + case dontSend = 1 + case always = 2 +} + +@objc public class ErrorReport: NSObject {} + +@objc public class ErrorAttachmentLog: NSObject { + @objc public class func attachment(withText text: String, filename: String) -> ErrorAttachmentLog? { + return ErrorAttachmentLog() + } +} + +@objc public protocol CrashesDelegate: NSObjectProtocol { + @objc optional func attachments(with crashes: Crashes, for errorReport: ErrorReport) -> [ErrorAttachmentLog]? +} + +@objc public class Crashes: NSObject { + @objc public static weak var delegate: CrashesDelegate? + @objc public static var userConfirmationHandler: (([ErrorReport]) -> Bool)? + @objc public static func notify(with confirmation: UserConfirmation) {} +} diff --git a/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterStub.swift b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterStub.swift new file mode 100644 index 000000000000..19ddf7d259ae --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/stubs/AppCenterStub.swift @@ -0,0 +1,6 @@ +import Foundation + +@objc public class AppCenter: NSObject { + @objc public static var networkRequestsAllowed: Bool = false + @objc public static func start(withAppSecret appSecret: String, services: [AnyClass]) {} +} diff --git a/pkgs/by-name/al/alt-tab-macos/stubs/ShortcutRecorder.modulemap b/pkgs/by-name/al/alt-tab-macos/stubs/ShortcutRecorder.modulemap new file mode 100644 index 000000000000..d81d400a5cee --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/stubs/ShortcutRecorder.modulemap @@ -0,0 +1,5 @@ +module ShortcutRecorder { + umbrella header "ShortcutRecorder.h" + export * + module * { export * } +} diff --git a/pkgs/by-name/al/alt-tab-macos/stubs/SparkleStub.swift b/pkgs/by-name/al/alt-tab-macos/stubs/SparkleStub.swift new file mode 100644 index 000000000000..2645dd9b3aa9 --- /dev/null +++ b/pkgs/by-name/al/alt-tab-macos/stubs/SparkleStub.swift @@ -0,0 +1,59 @@ +import Foundation +import AppKit + +@objc public protocol SPUUpdaterDelegate: NSObjectProtocol { + @objc optional func updaterDidNotFindUpdate(_ updater: SPUUpdater) +} + +@objc public class SUAppcastItem: NSObject { + @objc public var displayVersionString: String + + @objc public init(displayVersionString: String = "") { + self.displayVersionString = displayVersionString + } +} + +@objc public class SPUUpdater: NSObject { + private weak var delegate: SPUUpdaterDelegate? + @objc public var automaticallyDownloadsUpdates: Bool = false + @objc public var automaticallyChecksForUpdates: Bool = false + @objc public var sessionInProgress: Bool = false + + @objc public init(delegate: SPUUpdaterDelegate? = nil) { + self.delegate = delegate + } + + @objc public func checkForUpdateInformation() { + delegate?.updaterDidNotFindUpdate?(self) + } +} + +@objc public class SPUStandardUpdaterController: NSObject { + @objc public let updater: SPUUpdater + + @objc public init(startingUpdater: Bool, updaterDelegate: SPUUpdaterDelegate?, userDriverDelegate: Any?) { + updater = SPUUpdater(delegate: updaterDelegate) + } + @objc public func startUpdater() {} + @objc public func checkForUpdates(_ sender: Any?) { + updater.checkForUpdateInformation() + showNixUpdateMessage() + } +} + +@objc public class SUUpdater: NSObject { + private static let instance = SUUpdater() + @objc public class func shared() -> SUUpdater { return instance } + @objc public var automaticallyDownloadsUpdates: Bool = false + @objc public var automaticallyChecksForUpdates: Bool = false + @objc public func checkForUpdates(_ sender: Any?) { + showNixUpdateMessage() + } +} + +private func showNixUpdateMessage() { + let alert = NSAlert() + alert.messageText = "Updates are managed by Nix" + alert.informativeText = "Update AltTab through the Nix profile or system configuration that installed it." + alert.runModal() +} diff --git a/pkgs/by-name/al/althttpd/package.nix b/pkgs/by-name/al/althttpd/package.nix index d9302fb2669a..001d2cdea7e2 100644 --- a/pkgs/by-name/al/althttpd/package.nix +++ b/pkgs/by-name/al/althttpd/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation { pname = "althttpd"; - version = "0-unstable-2026-03-20"; + version = "0-unstable-2026-06-03"; src = fetchfossil { url = "https://sqlite.org/althttpd/"; - rev = "a8fac0faaab1f43f"; - hash = "sha256-Z4kZgCvqY7Kroc6A98s5UH4N8CEUzF+xmdXDRw2Lxtw="; + rev = "641e31f18cff7215"; + hash = "sha256-AMOb1GHI99Plxdry89ynoLNpvFVpUzkdwffKLhJBKYw="; }; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/al/altus/package.nix b/pkgs/by-name/al/altus/package.nix index c0ed153c0a47..c8e89b4e075f 100644 --- a/pkgs/by-name/al/altus/package.nix +++ b/pkgs/by-name/al/altus/package.nix @@ -7,12 +7,12 @@ let pname = "altus"; - version = "5.7.2"; + version = "5.8.1"; src = fetchurl { name = "altus-${version}.AppImage"; url = "https://github.com/amanharwara/altus/releases/download/${version}/Altus-${version}.AppImage"; - hash = "sha256-sB4ONFLTNN2Dd3LIVtpXIGTyHDFcXako7nlKxzNEOtA="; + hash = "sha256-FSyXs9thTQ5T5bvCfg/+QXBZMIOyoijAw0dUsvLRGH8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/am/amarok/package.nix b/pkgs/by-name/am/amarok/package.nix index ff187b8d3618..3a912fb74fda 100644 --- a/pkgs/by-name/am/amarok/package.nix +++ b/pkgs/by-name/am/amarok/package.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "amarok"; - version = "3.3.1"; + version = "3.3.3"; src = fetchurl { url = "mirror://kde/stable/amarok/${finalAttrs.version}/amarok-${finalAttrs.version}.tar.xz"; - hash = "sha256-OW8uqToH25XI+762gNeAai5ZVKUgxSwFZIXBHeYznAE="; + hash = "sha256-aOnoPX2MDL3UcJWOdogV9XPWHzzjK+e8G4f7VtYiQ24="; }; outputs = [ diff --git a/pkgs/by-name/am/amass/package.nix b/pkgs/by-name/am/amass/package.nix index 00893b5cb316..e6bd8dc65538 100644 --- a/pkgs/by-name/am/amass/package.nix +++ b/pkgs/by-name/am/amass/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { buildInputs = [ libpostalWithData ]; src = fetchFromGitHub { - owner = "OWASP"; + owner = "owasp-amass"; repo = "Amass"; tag = "v${finalAttrs.version}"; hash = "sha256-d4zy64W5cIseOVAaekN5Q4I5WuLz+M/cP7FXQ3CQ+mk="; @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-3MpE61ixMps4IRIZkqjzG225zk4fsERkssoNoItUXbQ="; - # https://github.com/OWASP/Amass/issues/640 + # https://github.com/owasp-amass/amass/issues/640 doCheck = false; meta = { @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { target networks. ''; homepage = "https://owasp.org/www-project-amass/"; - changelog = "https://github.com/OWASP/Amass/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/owasp-amass/amass/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ kalbasit diff --git a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix index 12d808516bca..fe9f8fa7216a 100644 --- a/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix +++ b/pkgs/by-name/am/amazon-cloudwatch-agent/package.nix @@ -11,16 +11,17 @@ buildGoModule (finalAttrs: { pname = "amazon-cloudwatch-agent"; - version = "1.300069.0"; + version = "1.300070.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-cloudwatch-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-A9UASdKERo/vg3K8EDu//r6SqQjskhmVKeBlbqqpdDM="; + hash = "sha256-w0/y4qW109MjgO1/HWcBfPQ3zhIQb8lzZLCnoDMM99c="; }; - vendorHash = "sha256-Qlwy0wz79TgYlBcsdHLzZA3OWbSIg6reK6KGSKsMlzI="; + proxyVendor = true; # darwin/linux hash mismatch + vendorHash = "sha256-ilpoDtOLVh4i/pGv8a90meCqw4DU3CeuAqDZyA/bgXE="; # See the list in https://github.com/aws/amazon-cloudwatch-agent/blob/v1.300049.1/Makefile#L68-L77. subPackages = [ diff --git a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch b/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch deleted file mode 100644 index ec73631eccae..000000000000 --- a/pkgs/by-name/am/amber-lang/fix_word_boundaries.patch +++ /dev/null @@ -1,38 +0,0 @@ -From efdbecaf721ccb217ece34a5105eaac68e27aa51 Mon Sep 17 00:00:00 2001 -From: Max Karou -Date: Sun, 4 Jan 2026 01:47:51 +0100 -Subject: [PATCH] sed_version: remove word boundary assertions - -Word boundary assertions (\b) are GNU regex extensions that may fail -on systems using non-glibc C libraries (e.g., musl, macOS). - -This was previously fixed in replace_regex() via NixOS/nixpkgs#388412, -which was subsequently upstreamed in amber-lang/amber#686. - -Changes in amber-lang/amber#717 reintroduced the same portability issue. ---- - src/std/text.ab | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/src/std/text.ab b/src/std/text.ab -index 5f2d935..a5dac3f 100644 ---- a/src/std/text.ab -+++ b/src/std/text.ab -@@ -51,12 +51,12 @@ const SED_VERSION_BUSYBOX = 2 - fun sed_version(): Int { - // We can't match against a word "GNU" because - // alpine's busybox sed returns "This is not GNU sed version" -- trust $ re='\bCopyright\b.+\bFree Software Foundation\b'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $ -+ trust $ re='Copyright.+Free Software Foundation'; [[ \$(sed --version 2>/dev/null) =~ \$re ]] $ - if status == 0 { - return SED_VERSION_GNU - } - // On BSD single `sed` waits for stdin. We must use `sed --help` to avoid this. -- trust $ re='\bBusyBox\b'; [[ \$(sed --help 2>&1) =~ \$re ]] $ -+ trust $ re='BusyBox'; [[ \$(sed --help 2>&1) =~ \$re ]] $ - if status == 0 { - return SED_VERSION_BUSYBOX - } --- -2.51.2 - diff --git a/pkgs/by-name/am/amber-lang/package.nix b/pkgs/by-name/am/amber-lang/package.nix index a704fbd47fa1..f35e9b533e2f 100644 --- a/pkgs/by-name/am/amber-lang/package.nix +++ b/pkgs/by-name/am/amber-lang/package.nix @@ -4,38 +4,30 @@ rustPlatform, bc, util-linux, - gnused, makeWrapper, installShellFiles, + versionCheckHook, stdenv, runCommand, amber-lang, nix-update-script, + bash, + ksh, + zsh, }: rustPlatform.buildRustPackage rec { pname = "amber-lang"; - version = "0.5.1-alpha"; + version = "0.6.0-alpha"; src = fetchFromGitHub { owner = "amber-lang"; repo = "amber"; tag = version; - hash = "sha256-v1uJe3vVGKXaZcQzdoYzu/bJKMQnS4IYET4QLPW+J8Y="; + hash = "sha256-pyMsxb9XPtseroH2MORhMOg9+iaLyoxmgpUTCej+i+Y="; }; - patches = [ - # Upstreamed in #995, can be removed in >= 0.5.2 - # github.com/amber-lang/amber/pull/995 - ./fix_word_boundaries.patch - ]; - - cargoHash = "sha256-aXcxlmmDYLFbyRJYyGE1gbQMbdysHx4iWXsrUj10Eco="; - - preConfigure = '' - substituteInPlace src/compiler.rs \ - --replace-fail 'Command::new("/usr/bin/env")' 'Command::new("env")' - ''; + cargoHash = "sha256-7TZIRg4NK2uOivUUg09T5mbxrNlRmmVyec2xhmzSNvY="; nativeBuildInputs = [ makeWrapper @@ -43,15 +35,23 @@ rustPlatform.buildRustPackage rec { ]; nativeCheckInputs = [ + bash bc # 'rev' in generated bash script of test # tests::validity::variable_ref_function_invocation util-linux ]; + preCheck = '' + substituteInPlace src/tests/cli.rs \ + --replace-fail 'Command::new(amber_bin())' "Command::new(\"target/${stdenv.targetPlatform.rust.cargoShortTarget}/$cargoBuildType/amber\")" + substituteInPlace src/tests/cli.rs \ + --replace-fail 'cmd.env("AMBER_SHELL", "/bin/bash")' 'cmd.env("AMBER_SHELL", "bash")' + ''; + checkFlags = [ "--skip=tests::extra::download" - "--skip=tests::formatter::all_exist" + "--skip=tests::stdlib::test_stdlib_src_tests_stdlib_http_fetch_ab" ]; postInstall = '' @@ -62,23 +62,46 @@ rustPlatform.buildRustPackage rec { --bash <($out/bin/amber completion) ''; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + passthru = { - updateScript = nix-update-script { }; - tests.run = runCommand "amber-lang-eval-test" { nativeBuildInputs = [ amber-lang ]; } '' - diff -U3 --color=auto <(amber eval 'echo "Hello, World"') <(echo 'Hello, World') - touch $out - ''; + updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + tests = + let + testHelloWorld = + type: pkg: + runCommand "amber-lang-test-eval-hello-world-${type}" + { + nativeBuildInputs = [ + amber-lang + pkg + ]; + } + '' + diff -U3 --color=auto <(amber eval --target ${type} 'echo("Hello, World")') <(echo 'Hello, World') + touch $out + ''; + in + { + eval-hello-world-bash = testHelloWorld "bash" bash; + eval-hello-world-bash-3_2 = testHelloWorld "bash-3.2" bash; + eval-hello-world-ksh = testHelloWorld "ksh" ksh; + eval-hello-world-zsh = testHelloWorld "zsh" zsh; + }; }; meta = { description = "Programming language compiled to bash"; homepage = "https://amber-lang.com"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.lgpl3Only; mainProgram = "amber"; maintainers = with lib.maintainers; [ cafkafk aleksana + ilai-deutel ]; - platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/am/amber/package.nix b/pkgs/by-name/am/amber/package.nix index ada5d438294a..fbf9a722854a 100644 --- a/pkgs/by-name/am/amber/package.nix +++ b/pkgs/by-name/am/amber/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Code search-and-replace tool"; homepage = "https://github.com/dalance/amber"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.bdesham ]; }; }) diff --git a/pkgs/by-name/am/amd-debug-tools/package.nix b/pkgs/by-name/am/amd-debug-tools/package.nix index 309eb68b0593..226caa0d22ba 100644 --- a/pkgs/by-name/am/amd-debug-tools/package.nix +++ b/pkgs/by-name/am/amd-debug-tools/package.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "amd-debug-tools"; - version = "0.2.18"; + version = "0.2.20"; pyproject = true; src = fetchgit { url = "https://git.kernel.org/pub/scm/linux/kernel/git/superm1/amd-debug-tools.git"; tag = finalAttrs.version; - hash = "sha256-qBgQFjiWFRKVTsIx0aLZC9AQWsVzgbJGOPGG6ojKoDE="; + hash = "sha256-JDacCakZC+4N4IDAODWLSuensAtFArl052I4weK/zJQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/am/amf-headers/package.nix b/pkgs/by-name/am/amf-headers/package.nix index b1f1dcc0e174..a03ba327914d 100644 --- a/pkgs/by-name/am/amf-headers/package.nix +++ b/pkgs/by-name/am/amf-headers/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "amf-headers"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "GPUOpen-LibrariesAndSDKs"; repo = "AMF"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-ZVC1e4S5CNpfl3ewHR9aVfYwxDBE7/BJ6OyH2kF00fQ="; + sha256 = "sha256-+jVYm/Zmt+1bzKnKTiClgoMRsyhqpuKZj79DvGHpPTM="; }; installPhase = '' diff --git a/pkgs/by-name/am/amfora/package.nix b/pkgs/by-name/am/amfora/package.nix index 6733bff81d39..a82f3c7446db 100644 --- a/pkgs/by-name/am/amfora/package.nix +++ b/pkgs/by-name/am/amfora/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { description = "Fancy terminal browser for the Gemini protocol"; mainProgram = "amfora"; homepage = "https://github.com/makew0rld/amfora"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ deifactor ]; changelog = "https://github.com/makew0rld/amfora/blob/v${finalAttrs.version}/CHANGELOG.md"; }; diff --git a/pkgs/by-name/am/amnezia-vpn-bin/package.nix b/pkgs/by-name/am/amnezia-vpn-bin/package.nix index 3b20917737ae..7bece2028abe 100644 --- a/pkgs/by-name/am/amnezia-vpn-bin/package.nix +++ b/pkgs/by-name/am/amnezia-vpn-bin/package.nix @@ -29,13 +29,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn-bin"; - version = "4.8.16.0"; + version = "4.8.19.0"; __structuredAttrs = true; src = fetchzip { url = "https://github.com/amnezia-vpn/amnezia-client/releases/download/${finalAttrs.version}/AmneziaVPN_${finalAttrs.version}_linux_x64.tar"; - hash = "sha256-0gffxBD0pNsyTvqAFdYdjI8rzCkyaXHOApSCu4waP7s="; + hash = "sha256-2bCP5yeaH0yQcjgwnrCgSnF1vafhrf+AlGyVPPgbK0k="; }; strictDeps = true; diff --git a/pkgs/by-name/am/amnezia-vpn/package.nix b/pkgs/by-name/am/amnezia-vpn/package.nix index 6cad55ecd001..c1bcad8b13f6 100644 --- a/pkgs/by-name/am/amnezia-vpn/package.nix +++ b/pkgs/by-name/am/amnezia-vpn/package.nix @@ -81,7 +81,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "amnezia-vpn"; - version = "4.8.18.0"; + version = "4.8.21.0"; __structuredAttrs = true; @@ -89,7 +89,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "amnezia-vpn"; repo = "amnezia-client"; tag = finalAttrs.version; - hash = "sha256-/A1juZzNWjdShdg41M1nfO3pMukMFzyBjQaZvZjYaJs="; + hash = "sha256-xNmbXLl+71DhzbGdSobkV1aYbj1XqC9A/3VPjDLsF7A="; fetchSubmodules = true; }; @@ -109,6 +109,13 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "int nVersion = 1;" "int nVersion = 0;" substituteInPlace client/ui/qautostart.cpp \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "AmneziaVPN" + # https://github.com/amnezia-vpn/amnezia-client/pull/2372 + substituteInPlace client/ui/systemtray_notificationhandler.cpp \ + --replace-fail 'm_systemTrayIcon.show();' ''' \ + --replace-fail 'setTrayState(Vpn::ConnectionState::Disconnected);' 'setTrayState(Vpn::ConnectionState::Disconnected); m_systemTrayIcon.show();' + substituteInPlace client/main.cpp \ + --replace-fail '#include "version.h"' $'#include "version.h"\n#include ' \ + --replace-fail 'app.setApplicationDisplayName(APPLICATION_NAME);' $'app.setApplicationDisplayName(APPLICATION_NAME);\n app.setWindowIcon(QIcon::fromTheme("AmneziaVPN"));' substituteInPlace deploy/installer/config/AmneziaVPN.desktop.in \ --replace-fail "/usr/share/pixmaps/AmneziaVPN.png" "$out/share/icons/hicolor/512x512/apps/AmneziaVPN.png" substituteInPlace deploy/data/linux/AmneziaVPN.service \ diff --git a/pkgs/by-name/am/amneziawg-go/package.nix b/pkgs/by-name/am/amneziawg-go/package.nix index 673059093dde..054f4f2d6642 100644 --- a/pkgs/by-name/am/amneziawg-go/package.nix +++ b/pkgs/by-name/am/amneziawg-go/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "amneziawg-go"; - version = "0.2.18"; + version = "0.2.19"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amneziawg-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-zuP8j3Khw8RbpBlJxoKmTAm3V8Y+c2aL4dNuRIrxWjU="; + hash = "sha256-3Uy/zsdmNpcOpohwewPbSNBOzLpyV+zoTdZJJm7XxKI="; }; postPatch = '' diff --git a/pkgs/by-name/am/amneziawg-tools/package.nix b/pkgs/by-name/am/amneziawg-tools/package.nix index 37b4c39de878..b0c0e7968df8 100644 --- a/pkgs/by-name/am/amneziawg-tools/package.nix +++ b/pkgs/by-name/am/amneziawg-tools/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "amneziawg-tools"; - version = "1.0.20260223"; + version = "1.0.20260618-2"; src = fetchFromGitHub { owner = "amnezia-vpn"; repo = "amneziawg-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-pHmuxlrbTqjwRrB7BShdC4ENw3iVQRRLH+Z2w8x+KeE="; + hash = "sha256-b/ol1OovcZm0OFzz29GVO6EzxGvDDeixaABwGLaR3O0="; }; sourceRoot = "${finalAttrs.src.name}/src"; diff --git a/pkgs/by-name/am/amp-cli/package.nix b/pkgs/by-name/am/amp-cli/package.nix index 1e95356b3f79..4363672fa3d3 100644 --- a/pkgs/by-name/am/amp-cli/package.nix +++ b/pkgs/by-name/am/amp-cli/package.nix @@ -20,14 +20,13 @@ let # supported x86_64 CPUs instead of depending on the build user's CPU flags. x86_64-linux = "linux-x64-baseline"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; }; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "amp-cli"; - version = "0.0.1780564400-g2007df"; + version = "0.0.1784391370-g49c6a1"; src = finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system}; @@ -78,10 +77,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://static.ampcode.com/cli/${finalAttrs.version}/amp-${platform}.gz"; hash = { - x86_64-linux = "sha256-7hUa1Qs1pNH2+31rrc9T99eDQ9Vq+CSwxROISyPqogY="; - aarch64-linux = "sha256-ThT2J1YBoZM5+YanRbL40GyxYQtK/xyDqac8fv0gfZs="; - x86_64-darwin = "sha256-VnuMqXVzqge5jgduxB+woYLVZkFtu92MEsEsrh4tJgE="; - aarch64-darwin = "sha256-gYAI+eQitglQTBtuilHkHKd8rsYsJ7s2QKoFQR85l6o="; + x86_64-linux = "sha256-x7p8BIQbu/ylyCkE63NZQUYfOn5nzwvwqXRWYbW4Q8w="; + aarch64-linux = "sha256-X2xQzlu2VfucXii92mFWsp1Ab8blBORtT/BE0kcZi6g="; + aarch64-darwin = "sha256-8jj4+dtc54eaFHVlCYKdX9F3s/qrCVICgi5Dyi+n3cg="; } .${system'}; } diff --git a/pkgs/by-name/am/amp-cli/update.sh b/pkgs/by-name/am/amp-cli/update.sh index 86b348d857a2..d795637ef432 100755 --- a/pkgs/by-name/am/amp-cli/update.sh +++ b/pkgs/by-name/am/amp-cli/update.sh @@ -10,7 +10,6 @@ cd "$(dirname "${BASH_SOURCE[0]}")/../../../.." for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin do update-source-version amp-cli "$version" \ diff --git a/pkgs/by-name/am/amphetype/package.nix b/pkgs/by-name/am/amphetype/package.nix index c3e8dd6d6508..871eca26ea16 100644 --- a/pkgs/by-name/am/amphetype/package.nix +++ b/pkgs/by-name/am/amphetype/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, copyDesktopItems, fetchFromGitLab, makeDesktopItem, @@ -28,7 +29,8 @@ python3Packages.buildPythonApplication { qt5.wrapQtAppsHook ]; - buildInputs = [ + # qtwayland is a Linux-only Qt platform plugin; it is unsupported on Darwin. + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ qt5.qtwayland ]; diff --git a/pkgs/by-name/am/amule-cmd/package.nix b/pkgs/by-name/am/amule-cmd/package.nix new file mode 100644 index 000000000000..46f02a3d16db --- /dev/null +++ b/pkgs/by-name/am/amule-cmd/package.nix @@ -0,0 +1,13 @@ +{ + amule, + ... +}@args: + +amule.override ( + { + monolithic = false; + textClient = true; + mainProgram = "amulecmd"; + } + // removeAttrs args [ "amule" ] +) diff --git a/pkgs/by-name/am/amule/package.nix b/pkgs/by-name/am/amule/package.nix index 680b56d16165..d3003981d726 100644 --- a/pkgs/by-name/am/amule/package.nix +++ b/pkgs/by-name/am/amule/package.nix @@ -3,94 +3,146 @@ enableDaemon ? false, # build amule daemon httpServer ? false, # build web interface for the daemon client ? false, # build amule remote gui + textClient ? false, # build amule remote command line client mainProgram ? "amule", fetchFromGitHub, - fetchpatch, stdenv, lib, cmake, zlib, wxwidgets_3_2, - perl, + curl, cryptopp, libupnp, - boost186, # Not using boost leads to crashes with gtk3 + boost, gettext, + glib, + libintl, + gtk3, + libayatana-appindicator, + libsysprof-capture, + libmaxminddb, libpng, pkg-config, - makeWrapper, + readline, + nix-update-script, + writeShellScript, + xcbuild, libx11, }: -# daemon and client are not build monolithic -assert monolithic || (!monolithic && (enableDaemon || client || httpServer)); +let + # MacOS's plutil lives under /usr/bin, which the build sandbox blocks + # so we use `xcbuild`'s pure reimplementation instead. + # CMake generates the bundle plist read-only, so we make i + # writable before plutil rewrites it in place. + plutil = writeShellScript "amule-plutil" '' + for plist; do :; done + chmod u+w "$plist" + exec ${lib.getExe' xcbuild "plutil"} "$@" + ''; +in + +# daemon, clients and web interface are not built monolithic +assert monolithic || (!monolithic && (enableDaemon || client || textClient || httpServer)); stdenv.mkDerivation (finalAttrs: { pname = "amule" + lib.optionalString httpServer "-web" + lib.optionalString enableDaemon "-daemon" - + lib.optionalString client "-gui"; - version = "2.3.3"; + + lib.optionalString client "-gui" + + lib.optionalString textClient "-cmd"; + version = "3.0.1"; src = fetchFromGitHub { - owner = "amule-project"; + owner = "amule-org"; repo = "amule"; tag = finalAttrs.version; - sha256 = "1nm4vxgmisn1b6l3drmz0q04x067j2i8lw5rnf0acaapwlp8qwvi"; + hash = "sha256-zLd8mt+dYEilGcFn3qspZv5EkZ4TmBbKgvgcuSvswFk="; }; - patches = [ - (fetchpatch { - url = "https://sources.debian.org/data/main/a/amule/1%3A2.3.3-3/debian/patches/wx3.2.patch"; - hash = "sha256-OX5Ef80bL+dQqHo2OBLZvzMUrU6aOHfsF7AtoE1r7rs="; - }) - ]; + __structuredAttrs = true; + strictDeps = true; nativeBuildInputs = [ cmake gettext - makeWrapper pkg-config ]; + postPatch = + lib.optionalString (stdenv.hostPlatform.isDarwin && (monolithic || client)) '' + substituteInPlace src/CMakeLists.txt \ + --replace-fail "/usr/bin/plutil" "${plutil}" + '' + # The __WXMAC__ branch casts to the pre-libedit-3.0 `Function` typedef, + # which neither the modern SDK libedit headers nor GNU readline 8.3 + # provide; both declare rl_completion_entry_function with the typedef + # used here. + + lib.optionalString (stdenv.hostPlatform.isDarwin && (textClient || httpServer)) '' + substituteInPlace src/ExternalConnector.cpp \ + --replace-fail "(Function *)&command_completion" "(rl_compentry_func_t *)&command_completion" + ''; + buildInputs = [ zlib wxwidgets_3_2 - perl cryptopp.dev libupnp - boost186 + boost + ] + # the GUI and daemon bind the Wayland app_id/X11 WM_CLASS via g_set_prgname(); + # libsysprof-capture satisfies glib-2.0.pc's Requires.private so the + # pkg-config checks resolve cleanly + ++ lib.optionals (stdenv.hostPlatform.isLinux && (monolithic || enableDaemon || client)) [ + glib + libsysprof-capture + ] + # CURLOPT tuning (NOSIGNAL/CONNECTTIMEOUT) on wxWebRequest's curl backend + ++ lib.optional stdenv.hostPlatform.isLinux curl + # StatusNotifierItem tray icon; without it aMule falls back to the legacy + # GtkStatusIcon, invisible on modern GNOME/wlroots. gtk3 brings the + # gtk+-3.0.pc that ayatana-appindicator3-0.1.pc requires + ++ lib.optionals (stdenv.hostPlatform.isLinux && monolithic) [ + gtk3 + libayatana-appindicator ] ++ lib.optional httpServer libpng + ++ lib.optional (monolithic || enableDaemon || client) libmaxminddb + # gettext runtime for NLS; on glibc libintl is part of libc + ++ lib.optional (!stdenv.hostPlatform.isGnu) libintl + # line editing in the interactive consoles of amulecmd and amuleweb + ++ lib.optional (textClient || httpServer) readline ++ lib.optional client libx11; cmakeFlags = [ - "-DBUILD_MONOLITHIC=${if monolithic then "ON" else "OFF"}" - "-DBUILD_DAEMON=${if enableDaemon then "ON" else "OFF"}" - "-DBUILD_REMOTEGUI=${if client then "ON" else "OFF"}" - "-DBUILD_WEBSERVER=${if httpServer then "ON" else "OFF"}" - # building only the daemon fails when these are not set... this is - # due to mistakes in the Amule cmake code, but it does not cause - # extra code to be built... - "-Dwx_NEED_GUI=ON" - "-Dwx_NEED_ADV=ON" - "-Dwx_NEED_NET=ON" + (lib.cmakeBool "BUILD_MONOLITHIC" monolithic) + (lib.cmakeBool "BUILD_DAEMON" enableDaemon) + (lib.cmakeBool "BUILD_REMOTEGUI" client) + (lib.cmakeBool "BUILD_AMULECMD" textClient) + (lib.cmakeBool "BUILD_WEBSERVER" httpServer) + # with strictDeps FindwxWidgets cannot find wx-config in PATH + # the script runs on the build machine even when wxwidgets is a host dependency + (lib.cmakeFeature "wxWidgets_CONFIG_EXECUTABLE" ( + lib.getExe' (lib.getDev wxwidgets_3_2) "wx-config" + )) ]; - postPatch = '' - echo "find_package(Threads)" >> cmake/options.cmake - - substituteInPlace src/libs/ec/abstracts/CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED (VERSION 2.8)" "CMAKE_MINIMUM_REQUIRED (VERSION 3.10)" + # On darwin the GUIs are installed as app bundles in $out + # move them to $out/Applications and expose the inner binaries in $out/bin + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + for app in "$out"/*.app; do + [ -e "$app" ] || continue + mkdir -p "$out/Applications" "$out/bin" + mv "$app" "$out/Applications/" + name=$(basename "$app" .app) + ln -s "$out/Applications/$name.app/Contents/MacOS/$name" \ + "$out/bin/$(echo "$name" | tr '[:upper:]' '[:lower:]')" + done ''; - # aMule will try to `dlopen' libupnp and libixml, so help it - # find them. - postInstall = lib.optionalString monolithic '' - wrapProgram $out/bin/amule \ - --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libupnp ]} - ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Peer-to-peer client for the eD2K and Kademlia networks"; @@ -104,12 +156,11 @@ stdenv.mkDerivation (finalAttrs: { no adware or spyware as is often found in proprietary P2P applications. ''; - homepage = "https://github.com/amule-project/amule"; + homepage = "https://amule-org.github.io/"; + changelog = "https://github.com/amule-org/amule/releases/tag/${finalAttrs.version}"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ aciceri ]; inherit mainProgram; platforms = lib.platforms.unix; - # Undefined symbols for architecture arm64: "_FSFindFolder" - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/an/ananicy-cpp/package.nix b/pkgs/by-name/an/ananicy-cpp/package.nix index 1ce7a6228d1b..d9459897ecbd 100644 --- a/pkgs/by-name/an/ananicy-cpp/package.nix +++ b/pkgs/by-name/an/ananicy-cpp/package.nix @@ -85,7 +85,6 @@ clangStdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ artturin johnrtitor - diniamo ]; mainProgram = "ananicy-cpp"; }; diff --git a/pkgs/by-name/an/ananicy-rules-cachyos/package.nix b/pkgs/by-name/an/ananicy-rules-cachyos/package.nix index b3d263bd6fc8..aec7d3356471 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-2026-06-03"; + version = "0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "CachyOS"; repo = "ananicy-rules"; - rev = "422e807d3376dc9d07e7acfa82b62b5d62275486"; - hash = "sha256-wDlAbb9O0I7WXsvQ+xLBPRt+haKJjvCJR56TGRC9auA="; + rev = "e2db7f7db42e1a47fd8317bb861dea6d5d38ca7e"; + hash = "sha256-D26Kba5fNdufL+QGiJRn0Nn8Haw+YHyhRKJa6ymEvLs="; }; dontConfigure = true; diff --git a/pkgs/by-name/an/anchor/package.nix b/pkgs/by-name/an/anchor/package.nix index d954b6a130b8..bd8e0316c6da 100644 --- a/pkgs/by-name/an/anchor/package.nix +++ b/pkgs/by-name/an/anchor/package.nix @@ -2,21 +2,33 @@ lib, rustPlatform, fetchFromGitHub, + fetchpatch, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "anchor"; - version = "1.0.2"; + version = "1.1.2"; src = fetchFromGitHub { - owner = "solana-foundation"; + owner = "otter-sec"; repo = "anchor"; tag = "v${finalAttrs.version}"; - hash = "sha256-J8q+oNT6x36LlTO/szlkxIcT5oFJ3y8b3YyqwBjDYX8="; + hash = "sha256-/aDNw+Up48NZZIjEKXj4M2UIbcCt766Tv0eOlFau2gQ="; fetchSubmodules = true; }; - cargoHash = "sha256-c+xhJas+SnnUshhpLx+C/4SH0uow/QG/1NlAbz9ePDc="; + cargoHash = "sha256-oEgWfklxjP8+TxrhDKJgcTsanpqJpEiHXJyir8neYj8="; + + # Upstream patch to fix cargo metadata discovery on macOS Nix sandboxes. + # Replaces fragile subprocess-cwd approach with in-process manifest path + # resolution. Remove on next version bump (included in v1.1.3+). + # See: https://github.com/otter-sec/anchor/pull/4757 + patches = [ + (fetchpatch { + url = "https://github.com/otter-sec/anchor/commit/25bf2112b67d84e5bc406d7eac2919c90d8e54ed.patch"; + hash = "sha256-q5OGNoUGPuCNHgaZNo9fmUxqQnFH2MhRW4ZefX+Of0Y="; + }) + ]; # Only build the anchor-cli package cargoBuildFlags = [ @@ -32,8 +44,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Solana Sealevel Framework"; - homepage = "https://github.com/solana-foundation/anchor"; - changelog = "https://github.com/solana-foundation/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://github.com/otter-sec/anchor"; + changelog = "https://github.com/otter-sec/anchor/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ Denommus diff --git a/pkgs/by-name/an/anda/package.nix b/pkgs/by-name/an/anda/package.nix index 949f0b0ba872..fe2e1df29e34 100644 --- a/pkgs/by-name/an/anda/package.nix +++ b/pkgs/by-name/an/anda/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "anda"; - version = "0.7.0"; + version = "0.7.8"; src = fetchFromGitHub { owner = "FyraLabs"; repo = "anda"; tag = finalAttrs.version; - hash = "sha256-bnjTXLxFDc/blyu2Ns8EV5ZCh97RLJpQsGtavxP9W+4="; + hash = "sha256-/1N3ivvnlSBK9qYOAiH96tE/k+S3+EBfsycN2QV8o70="; }; - cargoHash = "sha256-GWPl91Y2DDrFMvsUAZBYburNpPgl2O/ZLeYy0ivclOA="; + cargoHash = "sha256-keS3z1Kyx6TKObAneQ/+qCp/1ueYQOdepdnAPiJs9qI="; __structuredAttrs = true; diff --git a/pkgs/by-name/an/andagii/package.nix b/pkgs/by-name/an/andagii/package.nix index 4d7a886ac548..8a6dd0c13ebb 100644 --- a/pkgs/by-name/an/andagii/package.nix +++ b/pkgs/by-name/an/andagii/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: stdenvNoCC.mkDerivation { @@ -14,14 +15,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-U7wC55G8jIvMMyPcEiJQ700A7nkWdgWK1LM0F/wgDCg="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp -v ANDAGII_.TTF $out/share/fonts/truetype/andagii.ttf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "http://www.i18nguy.com/unicode/unicode-font.html"; diff --git a/pkgs/by-name/an/andcli/package.nix b/pkgs/by-name/an/andcli/package.nix index cc2d1bd4dfcb..f06566d534fc 100644 --- a/pkgs/by-name/an/andcli/package.nix +++ b/pkgs/by-name/an/andcli/package.nix @@ -11,6 +11,8 @@ buildGoModule (finalAttrs: { pname = "andcli"; version = "2.7.0"; + __structuredAttrs = true; + subPackages = [ "cmd/andcli" ]; src = fetchFromGitHub { diff --git a/pkgs/by-name/an/androguard/package.nix b/pkgs/by-name/an/androguard/package.nix index a9e9965f5dfd..0b44d5f84620 100644 --- a/pkgs/by-name/an/androguard/package.nix +++ b/pkgs/by-name/an/androguard/package.nix @@ -2,11 +2,4 @@ python3Packages, }: -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - sqlalchemy = self.sqlalchemy_1_4; - } - ); -in -pythonPackages.toPythonApplication pythonPackages.androguard +python3Packages.toPythonApplication python3Packages.androguard diff --git a/pkgs/by-name/an/android-cli/package.nix b/pkgs/by-name/an/android-cli/package.nix index 2e289159937b..95dd81c5cea8 100644 --- a/pkgs/by-name/an/android-cli/package.nix +++ b/pkgs/by-name/an/android-cli/package.nix @@ -14,10 +14,6 @@ let url = "https://dl.google.com/android/cli/${version}/linux_x86_64/android-cli"; hash = "sha256-TmwLwLKqnMCxWwtX8m50KflmisfeG3PjZsBs7z9vccU="; }; - x86_64-darwin = { - url = "https://dl.google.com/android/cli/${version}/darwin_x86_64/android-cli"; - hash = "sha256-ThBobULyevoKlp/22tdUqnBBccX6FbPDNrSwwuK4wnw="; - }; aarch64-darwin = { url = "https://dl.google.com/android/cli/${version}/darwin_arm64/android-cli"; hash = "sha256-E3PC0Ivf6MoYRQu56dSD/49LI8DJZhXL27/o6daH0Sg="; @@ -75,7 +71,6 @@ stdenv.mkDerivation { teams = with teams; [ android ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "android"; diff --git a/pkgs/by-name/an/android-studio-tools/package.nix b/pkgs/by-name/an/android-studio-tools/package.nix index a461d9b81ec7..ea2d93edd66f 100644 --- a/pkgs/by-name/an/android-studio-tools/package.nix +++ b/pkgs/by-name/an/android-studio-tools/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation { pname = "android-studio-tools"; - version = "14742923"; + version = "15859902"; src = fetchzip { # The only difference between the Linux and Mac versions is a single comment at the top of all the scripts # Therefore, we will use the Linux version and just patch the comment - url = "https://dl.google.com/android/repository/commandlinetools-linux-14742923_latest.zip"; - hash = "sha256-oimC4ToDFIa8Rlv+5RB+swl8M5PHdX4omlrMZMQEx8M="; + url = "https://dl.google.com/android/repository/commandlinetools-linux-15859902_latest.zip"; + hash = "sha256-tCbccw7qa7ncHGyWPWjwQOpaisN3QMRYXRpK7WtyjWY="; }; postPatch = '' diff --git a/pkgs/by-name/an/angle-grinder/package.nix b/pkgs/by-name/an/angle-grinder/package.nix index c73c81853f80..09bd209626a7 100644 --- a/pkgs/by-name/an/angle-grinder/package.nix +++ b/pkgs/by-name/an/angle-grinder/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "angle-grinder"; - version = "0.19.4"; + version = "0.19.6"; src = fetchFromGitHub { owner = "rcoh"; repo = "angle-grinder"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-1SZho04qJcNi84ZkDmxoVkLx9VJX04QINZQ6ZEoCq+c="; + sha256 = "sha256-CkDDX9U3e57fbKA9hwdy1AZ/ZDNpIFe6uvemmc6DcKA="; }; - cargoHash = "sha256-B7JFwFzE8ZvbTjCUZ6IEtjavPGkx3Nb9FMSPbNFqiuU="; + cargoHash = "sha256-w1+wdvl4wmxOynsg7SmL5lSASd4Cl4OkMJoIBUmuKGY="; passthru = { updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/an/angle/package.nix b/pkgs/by-name/an/angle/package.nix index 92913aa506a0..0d6a2329e6a9 100644 --- a/pkgs/by-name/an/angle/package.nix +++ b/pkgs/by-name/an/angle/package.nix @@ -27,6 +27,7 @@ let triplet = lib.getAttr arch { "x86_64" = "x86_64-unknown-linux-gnu"; "aarch64" = "aarch64-unknown-linux-gnu"; + "riscv64" = "riscv64-unknown-linux-gnu"; }; clang = symlinkJoin { @@ -100,6 +101,10 @@ stdenv.mkDerivation (finalAttrs: { # On darwin during linking: # clang++: error: argument unused during compilation: '-stdlib=libc++' "treat_warnings_as_errors=false" + ] + ++ lib.optionals stdenv.hostPlatform.isRiscV64 [ + # Force clang on riscv64 because default gcc toolchain is unavailable. + "is_clang=true" ]; env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-headerpad_max_install_names"; diff --git a/pkgs/by-name/an/angrr/package.nix b/pkgs/by-name/an/angrr/package.nix index c40bf8caadba..c100ef488f36 100644 --- a/pkgs/by-name/an/angrr/package.nix +++ b/pkgs/by-name/an/angrr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "angrr"; - version = "0.2.3"; + version = "0.2.6"; src = fetchFromGitHub { owner = "linyinfeng"; repo = "angrr"; tag = "v${finalAttrs.version}"; - hash = "sha256-8UrQ9e+gx7AR6ASNX94P2K3SvNOzvR98U3ub/odqybM="; + hash = "sha256-Sj7aaKC7rtIzIz3UiVfmLjr4O7hWXrEC3wkKaPra/3A="; }; - cargoHash = "sha256-pVFIsFIdOIgBilBRYtGZdjVOyaERrfiJJT2WT/YoXeQ="; + cargoHash = "sha256-LspQncUrWfou41G37L3O1GbeiaoQpAC/RAu3EAPVrRU="; buildAndTestSubdir = "angrr"; @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Auto Nix GC Root Retention"; homepage = "https://github.com/linyinfeng/angrr"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yinfeng ]; platforms = with lib.platforms; linux ++ darwin; mainProgram = "angrr"; diff --git a/pkgs/by-name/an/ani-cli/package.nix b/pkgs/by-name/an/ani-cli/package.nix index 79b1d8bdab15..d53722be88dd 100644 --- a/pkgs/by-name/an/ani-cli/package.nix +++ b/pkgs/by-name/an/ani-cli/package.nix @@ -66,10 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://github.com/pystardust/ani-cli"; description = "Cli tool to browse and play anime"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ - skykanin - diniamo - ]; + maintainers = with lib.maintainers; [ skykanin ]; platforms = lib.platforms.unix; mainProgram = "ani-cli"; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/by-name/an/ani-skip/package.nix b/pkgs/by-name/an/ani-skip/package.nix index a42bac4297a8..aee0d02e5436 100644 --- a/pkgs/by-name/an/ani-skip/package.nix +++ b/pkgs/by-name/an/ani-skip/package.nix @@ -10,13 +10,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "ani-skip"; - version = "1.0.1"; + version = "1.2.1"; src = fetchFromGitHub { owner = "synacktraa"; repo = "ani-skip"; tag = finalAttrs.version; - hash = "sha256-VEEG3d6rwTAS7/+gBKHFKIg9zFfBu5eBOu6Z23621gM="; + hash = "sha256-8EXJIY/YqTe2H0JDX/feMISCnHl2zs1LnvBkEk7Sss0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -D skip.lua $out/share/mpv/scripts/skip.lua + install -D integrations/mpv.lua $out/share/mpv/scripts/skip.lua install -Dm 755 ani-skip $out/bin/ani-skip runHook postInstall @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Automated solution to bypassing anime opening and ending sequences"; mainProgram = "ani-skip"; license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.diniamo ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch similarity index 100% rename from pkgs/by-name/an/anilibria-winmaclinux/0002-disable-version-check.patch rename to pkgs/by-name/an/anilibria-winmaclinux/0001-disable-version-check.patch diff --git a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch b/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch deleted file mode 100644 index 14f9799e46bd..000000000000 --- a/pkgs/by-name/an/anilibria-winmaclinux/0001-fix-installation-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/AniLibria.pro b/AniLibria.pro -index 3eb7213..ea571ff 100644 ---- a/AniLibria.pro -+++ b/AniLibria.pro -@@ -271,17 +271,8 @@ QML_IMPORT_PATH = - # Additional import path used to resolve QML modules just for Qt Quick Designer - QML_DESIGNER_IMPORT_PATH = - --# Default rules for deployment. --!flatpak{ -- qnx: target.path = /tmp/$${TARGET}/bin -- else: unix:!android: target.path = /opt/$${TARGET}/bin --}else{ -- target.path = $$PREFIX/bin --} --!isEmpty(target.path) { -- unix: INSTALLS += target desktop $${UNIX_ICONS} -- else:macx: INSTALLS += target --} -+target.path = $$PREFIX/bin -+INSTALLS += target $${UNIX_ICONS} - - flatpak { - metadata.path = $$PREFIX/share/metainfo diff --git a/pkgs/by-name/an/anilibria-winmaclinux/package.nix b/pkgs/by-name/an/anilibria-winmaclinux/package.nix index 86d515120c9c..c3a52822ac43 100644 --- a/pkgs/by-name/an/anilibria-winmaclinux/package.nix +++ b/pkgs/by-name/an/anilibria-winmaclinux/package.nix @@ -2,47 +2,40 @@ lib, stdenv, fetchFromGitHub, - libsForQt5, + fetchpatch, + cmake, + qt6Packages, + ninja, pkg-config, gst_all_1, makeDesktopItem, copyDesktopItems, - - withVLC ? true, - libvlc, - withMPV ? true, mpv-unwrapped, }: stdenv.mkDerivation (finalAttrs: { pname = "anilibria-winmaclinux"; - version = "2.2.35"; + version = "2.2.36"; src = fetchFromGitHub { owner = "anilibria"; repo = "anilibria-winmaclinux"; tag = finalAttrs.version; - hash = "sha256-3tiCfL6j2yhhL16mG1LYD41G6nbomwmqZOwgm4bEHTs="; + hash = "sha256-2fwpLHEH1jlxl7r7QiVTHZniBO5k0GWaloNBynZJlTw="; }; sourceRoot = "${finalAttrs.src.name}/src"; - qmakeFlags = [ - "PREFIX=${placeholder "out"}" - ] - ++ lib.optionals withVLC [ "CONFIG+=unixvlc" ] - ++ lib.optionals withMPV [ "CONFIG+=unixmpv" ]; - patches = [ - ./0001-fix-installation-paths.patch - ./0002-disable-version-check.patch + ./0001-disable-version-check.patch + (fetchpatch { + name = "0002-fixed-qt6-folder-modal.patch"; + url = "https://github.com/anilibria/anilibria-winmaclinux/commit/adb4f7e5447d733fc3042f4bff25224ed726f3e6.patch"; + hash = "sha256-6/oXAObmXS+GKjjLNneMIj2gtKNvz6zHshWDYPv4agY="; + stripLen = 1; + }) ]; - preConfigure = '' - substituteInPlace AniLibria.pro \ - --replace "\$\$PREFIX" '${placeholder "out"}' - ''; - qtWrapperArgs = [ "--prefix GST_PLUGIN_PATH : ${ ( @@ -59,17 +52,18 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ - libsForQt5.qmake + cmake pkg-config - libsForQt5.wrapQtAppsHook + ninja + qt6Packages.wrapQtAppsHook copyDesktopItems ]; buildInputs = [ - libsForQt5.qtbase - libsForQt5.qtquickcontrols2 - libsForQt5.qtwebsockets - libsForQt5.qtmultimedia + qt6Packages.qtbase + qt6Packages.qtwebsockets + qt6Packages.qtmultimedia + mpv-unwrapped.dev ] ++ (with gst_all_1; [ gst-plugins-bad @@ -77,34 +71,34 @@ stdenv.mkDerivation (finalAttrs: { gst-plugins-base gst-libav gstreamer - ]) - ++ lib.optionals withVLC [ libvlc ] - ++ lib.optionals withMPV [ mpv-unwrapped.dev ]; + ]); desktopItems = [ (makeDesktopItem { - name = "AniLibria"; - desktopName = "AniLibria"; - icon = "anilibria"; + name = "AniLiberty"; + desktopName = "AniLiberty"; + icon = "aniliberty"; comment = finalAttrs.meta.description; - genericName = "AniLibria desktop client"; + genericName = "AniLiberty (ex AniLibria) desktop client"; categories = [ "Qt" + "Audio" + "Video" "AudioVideo" "Player" ]; keywords = [ "anime" ]; - exec = "AniLibria"; + exec = finalAttrs.meta.mainProgram; terminal = false; }) ]; meta = { homepage = "https://github.com/anilibria/anilibria-winmaclinux"; - description = "AniLibria cross platform desktop client"; + description = "AniLiberty (ex AniLibria) cross platform desktop client, an anime theater for any computer you own"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ _3JlOy-PYCCKUi ]; - inherit (libsForQt5.qtbase.meta) platforms; - mainProgram = "AniLibria"; + inherit (qt6Packages.qtbase.meta) platforms; + mainProgram = "AniLiberty"; }; }) diff --git a/pkgs/by-name/an/animatch/package.nix b/pkgs/by-name/an/animatch/package.nix index e727a92f87b0..332be7b42c7a 100644 --- a/pkgs/by-name/an/animatch/package.nix +++ b/pkgs/by-name/an/animatch/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/HolyPangolin/animatch/"; description = "Cute match three game for the Librem 5 smartphone"; mainProgram = "animatch"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ colinsane ]; }; }) diff --git a/pkgs/by-name/an/ankama-launcher/package.nix b/pkgs/by-name/an/ankama-launcher/package.nix index 8b7510c8831e..c0791db9e72e 100644 --- a/pkgs/by-name/an/ankama-launcher/package.nix +++ b/pkgs/by-name/an/ankama-launcher/package.nix @@ -5,15 +5,15 @@ }: let pname = "ankama-launcher"; - version = "3.14.8"; + version = "3.14.14"; # The original URL for the launcher is: # https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage # As it does not encode the version, we use the wayback machine (web.archive.org) to get a fixed URL. # To update the client, head to web.archive.org and create a new snapshot of the download page. src = fetchurl { - url = "https://web.archive.org/web/20260413125512/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; - hash = "sha256-wHLzF30ZeTgBG1TFlkSt0Tsm82cNb/C/eTUZjjYsgVE="; + url = "https://web.archive.org/web/20260605015300/https://launcher.cdn.ankama.com/installers/production/Ankama%20Launcher-Setup-x86_64.AppImage"; + hash = "sha256-9w1ho9DZvDHXQbXjpMY1wnWDwYlMKO1igrJcCahQkVQ="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/an/anki-bin/package.nix b/pkgs/by-name/an/anki-bin/package.nix index 8850e149e682..22846bba8568 100644 --- a/pkgs/by-name/an/anki-bin/package.nix +++ b/pkgs/by-name/an/anki-bin/package.nix @@ -15,22 +15,26 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "25.02.5"; + version = "26.05"; sources = { - linux = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - hash = "sha256-wYFqT1g+rtoqOR7+Bb5mIJLZ5JdT2M1kcHqJUCuNElA="; + linux-aarch64 = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-aarch64.tar.zst"; + hash = "sha256-z/w7+TKLW+xi/iJMXGOp50Yjwnv7FD5O0lNsu31dfqo="; + }; + linux-x86_64 = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-x86_64.tar.zst"; + hash = "sha256-YiPXBVY/catAzgcqXZajkZxUbV3eHkxJ3CeXXnAGcnQ="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - hash = "sha256-PDlu+oFKWHraPdTuGDCUkO0bhPtkNVibo11B1QkCICw="; + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel.dmg"; + hash = "sha256-L/TXKh0cmTop7/ROA9YC4dyBz9iAFRhpXuNRbR3wwYk="; }; darwin-aarch64 = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - hash = "sha256-RqcGHXN29GDGGuFbrQCBmj3cctzoRQZ8svR5hMYPhxs="; + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple.dmg"; + hash = "sha256-c5NZf0uWNB7XQDYBDtgrtCU+A5Cuck0rJ1xFG8hY0Sc="; }; }; @@ -38,7 +42,7 @@ let inherit pname version; nativeBuildInputs = [ zstd ]; - src = sources.linux; + src = if stdenv.hostPlatform.isAarch64 then sources.linux-aarch64 else sources.linux-x86_64; installPhase = '' runHook preInstall @@ -64,7 +68,7 @@ let ; platforms = [ "x86_64-linux" - "x86_64-darwin" + "aarch64-linux" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/an/anki-sync-server/package.nix b/pkgs/by-name/an/anki-sync-server/package.nix index 826ff0c21135..994e798115ce 100644 --- a/pkgs/by-name/an/anki-sync-server/package.nix +++ b/pkgs/by-name/an/anki-sync-server/package.nix @@ -44,7 +44,7 @@ rustPlatform.buildRustPackage { meta = { description = "Standalone official anki sync server"; homepage = "https://apps.ankiweb.net"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ martinetd ]; mainProgram = "anki-sync-server"; }; diff --git a/pkgs/by-name/an/anki/addons/advanced-browser/default.nix b/pkgs/by-name/an/anki/addons/advanced-browser/default.nix new file mode 100644 index 000000000000..6b1871240da2 --- /dev/null +++ b/pkgs/by-name/an/anki/addons/advanced-browser/default.nix @@ -0,0 +1,28 @@ +{ + lib, + anki-utils, + fetchFromGitHub, + nix-update-script, +}: +anki-utils.buildAnkiAddon (finalAttrs: { + pname = "advanced-browser"; + version = "4.5"; + src = fetchFromGitHub { + owner = "AnKing-VIP"; + repo = "advanced-browser"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oVL+Y96/d+uD8s6yjz6L7zWV2G6PgP7ZfIiEAAZR2T4="; + }; + passthru.updateScript = nix-update-script { }; + meta = { + description = "Adds more sorting options to the browser"; + longDescription = '' + A general overview of the functionality can be found [here](https://ankiweb.net/shared/info/874215009). + The options to configure this add-on can be found [here](https://github.com/AnKing-VIP/advanced-browser/blob/v${finalAttrs.version}/advancedbrowser/config.md). + ''; + homepage = "https://ankiweb.net/shared/info/874215009"; + downloadPage = "https://github.com/AnKing-VIP/advanced-browser"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ n0pl4c3 ]; + }; +}) diff --git a/pkgs/by-name/an/anki/addons/default.nix b/pkgs/by-name/an/anki/addons/default.nix index 7aadfabde19d..7645d7a9967a 100644 --- a/pkgs/by-name/an/anki/addons/default.nix +++ b/pkgs/by-name/an/anki/addons/default.nix @@ -4,6 +4,8 @@ { adjust-sound-volume = callPackage ./adjust-sound-volume { }; + advanced-browser = callPackage ./advanced-browser { }; + ajt-card-management = callPackage ./ajt-card-management { }; anki-connect = callPackage ./anki-connect { }; diff --git a/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix b/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix index 00b44473f34f..0def2c12142d 100644 --- a/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix +++ b/pkgs/by-name/an/anki/addons/fsrs4anki-helper/default.nix @@ -8,13 +8,13 @@ anki-utils.buildAnkiAddon (finalAttrs: { pname = "fsrs4anki-helper"; - version = "24.06.3-unstable-2026-04-14"; + version = "26.06.12-unstable-2026-06-08"; src = fetchFromGitHub { owner = "open-spaced-repetition"; repo = "fsrs4anki-helper"; - rev = "703c99f009fa0465237df248e2c83e43851d95b4"; - hash = "sha256-yF0hTPdipFwhV1CcEmRRXezxc4754XCnX0HINrCgScQ="; + rev = "29208f220f21ff994c199712a6aaac47636773bf"; + hash = "sha256-qoOV6cxA+oidHaKtBPVJpoc+/hitoihMRp15+IYcRnw="; }; postFixup = '' diff --git a/pkgs/by-name/an/ansel/package.nix b/pkgs/by-name/an/ansel/package.nix index eeb84381981b..0a468b21734e 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-2026-06-04"; + version = "0-unstable-2026-06-13"; src = fetchFromGitHub { owner = "aurelienpierreeng"; repo = "ansel"; - rev = "05dc2ee4269f59143596f368acb83efd4c9da604"; - hash = "sha256-1lR+xSBsq9N3R9gVJ+mvZxiPIQKFpFTybjQym/YJfqo="; + rev = "2a9850bdc393d88f799b2cb3d80f22757d467d3e"; + hash = "sha256-hCleHtaqH9dRHDtOVuKN16L1jPMeYJbr4qSwVPLIgL8="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/an/ansi/package.nix b/pkgs/by-name/an/ansi/package.nix index 5441ac127b4a..41a314206716 100644 --- a/pkgs/by-name/an/ansi/package.nix +++ b/pkgs/by-name/an/ansi/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ansi-escape-sequences-cli"; - version = "0.2.2"; + version = "0.2.3"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-55CdEw1bVgabWRbZIRe9jytwDf70Y92nITwDRQaTXaQ="; + hash = "sha256-/dyvhgNUPitSUGtQSEMPGqHED1YNGSKumIY6Rj0hnH0="; }; - cargoHash = "sha256-g+FP98lcC3EeQtcGO0kE+g6Z9tUgrlieTlVJYKs/ig4="; + cargoHash = "sha256-vAJmpILjzj9pqW2M9gIkQiKAntwvhwsHLCSbvHJ4Fug="; meta = { description = "Quickly get ANSI escape sequences"; @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { the colors and styles, such as bold or italic. ''; homepage = "https://github.com/phip1611/ansi-escape-sequences-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "ansi"; }; diff --git a/pkgs/by-name/an/ansible-doctor/package.nix b/pkgs/by-name/an/ansible-doctor/package.nix index c1d081652abf..b6c841af5d96 100644 --- a/pkgs/by-name/an/ansible-doctor/package.nix +++ b/pkgs/by-name/an/ansible-doctor/package.nix @@ -9,14 +9,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-doctor"; - version = "8.3.1"; + version = "8.3.3"; pyproject = true; src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; tag = "v${finalAttrs.version}"; - hash = "sha256-wv5iSY5p/PZUwgxwknoZgB4f5ERvsvA3hrUbdSAYwxQ="; + hash = "sha256-3xdMTuy6Rtb2VwfzN6SV73UZmp+9fmU9SfPySHCayJg="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/ansible-navigator/package.nix b/pkgs/by-name/an/ansible-navigator/package.nix index bfb85e2c32c8..b0fa00076589 100644 --- a/pkgs/by-name/an/ansible-navigator/package.nix +++ b/pkgs/by-name/an/ansible-navigator/package.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ansible-navigator"; - version = "26.4.0"; + version = "26.6.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "ansible_navigator"; - hash = "sha256-FpDFWyNnlt28wAG6OgJjwvK+UMCEDyH4P9fQ+t5J8FQ="; + hash = "sha256-WyazCoFg4uPx0jLAG8u19l4dr806pQFzbYFadJwYfTM="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/an/ante/package.nix b/pkgs/by-name/an/ante/package.nix index 0368755b9997..f0f678af344a 100644 --- a/pkgs/by-name/an/ante/package.nix +++ b/pkgs/by-name/an/ante/package.nix @@ -70,7 +70,7 @@ rustPlatform.buildRustPackage { homepage = "https://antelang.org/"; description = "Low-level functional language for exploring refinement types, lifetime inference, and algebraic effects"; mainProgram = "ante"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ehllie ]; }; } diff --git a/pkgs/by-name/an/antigravity-cli/package.nix b/pkgs/by-name/an/antigravity-cli/package.nix index d26b21016e85..790ea78b87b7 100644 --- a/pkgs/by-name/an/antigravity-cli/package.nix +++ b/pkgs/by-name/an/antigravity-cli/package.nix @@ -6,27 +6,24 @@ versionCheckHook, }: let - wholeVersion = "1.0.8-6513509081677824"; # unfortunately this has dumb versioning - version = builtins.head (lib.splitString "-" wholeVersion); + version = "1.1.4"; + buildId = "5165726265376768"; + wholeVersion = "${version}-${buildId}"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; sourceData = { x86_64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-x64/cli_linux_x64.tar.gz"; - hash = "sha256-/BxcglSN6NqZdEbq50MypFW4bv2bCN37L0PqcuYz+e4="; + hash = "sha256-qHY/CIE65zGFDg2CfMbm06f4xn3mvLIUUhCj7Bh37tE="; }; aarch64-linux = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/linux-arm/cli_linux_arm64.tar.gz"; - hash = "sha256-QWQevvVezRdubRbG3V64C/XMHunfDsdA1OM8yhHoCHA="; + hash = "sha256-9dlI6XbTTLuhRdo+32gE39DWGcMIhikd45kkAj3oGO8="; }; aarch64-darwin = fetchurl { url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-arm/cli_mac_arm64.tar.gz"; - hash = "sha256-j+/brIYCKjIOa0KSGZHt4Ic4tjTzOrfPtA4J8iY9tHE="; - }; - x86_64-darwin = fetchurl { - url = "https://storage.googleapis.com/antigravity-public/antigravity-cli/${wholeVersion}/darwin-x64/cli_mac_x64.tar.gz"; - hash = "sha256-0Cp76whEYtBdZS6GOnC+qqICGoqexX+v3KCFJmfaFAU="; + hash = "sha256-qhfFyMNvppzI01rjcpq/xUUTYiTsP38Y5ZpqkZMCSJs="; }; }; in diff --git a/pkgs/by-name/an/antigravity-cli/update.sh b/pkgs/by-name/an/antigravity-cli/update.sh index 746a57dd87e7..61ca43ac4483 100755 --- a/pkgs/by-name/an/antigravity-cli/update.sh +++ b/pkgs/by-name/an/antigravity-cli/update.sh @@ -3,6 +3,7 @@ set -euo pipefail +packageFile=pkgs/by-name/an/antigravity-cli/package.nix baseUrl=https://storage.googleapis.com/antigravity-public/antigravity-cli currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.version or (lib.getVersion antigravity-cli)") @@ -15,15 +16,17 @@ fi # urls unfortunately include a weird buildid that make it hard to get latestWholeVersion=$(curl $baseUrl/$latestVersion/manifest.json | jq -r '.platforms."linux-x64".url' | cut -d/ -f6) +latestBuildId=${latestWholeVersion#*-} +currentBuildId=$(sed -n 's/.*buildId = "\([^"]*\)";.*/\1/p' "$packageFile") -update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion || true +sed -i "s/buildId = \"$currentBuildId\";/buildId = \"$latestBuildId\";/" "$packageFile" +update-source-version --version-key=version antigravity-cli $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix store prefetch-file --json --hash-type sha256 \ $(nix-instantiate --eval --raw -E "with import ./. {}; antigravity-cli.src.url" --system "$system") | jq -r '.hash') - update-source-version --version-key=wholeVersion antigravity-cli $latestWholeVersion $hash --system=$system --ignore-same-version + update-source-version --version-key=version antigravity-cli $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/an/antigravity-ide/information.json b/pkgs/by-name/an/antigravity-ide/information.json new file mode 100644 index 000000000000..3b25a0456a2e --- /dev/null +++ b/pkgs/by-name/an/antigravity-ide/information.json @@ -0,0 +1,18 @@ +{ + "version": "2.1.1", + "vscodeVersion": "1.107.0", + "sources": { + "x86_64-linux": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-x64/Antigravity%20IDE.tar.gz", + "sha256": "5b2cebf7d33a68d003fd8f1fa988d1600905ace22504a085e5384214290878bd" + }, + "aarch64-linux": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/linux-arm/Antigravity%20IDE.tar.gz", + "sha256": "c6b6fef97cfc078ae7f92d02f9483a12437b6602c7d322a7d445668c2f0c16a6" + }, + "aarch64-darwin": { + "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/2.1.1-6123990880747520/darwin-arm/Antigravity%20IDE.zip", + "sha256": "3491f5bc9faad111e5be6d9126bf5d566a0c591bd159a61ef0dcdd30c58672aa" + } + } +} diff --git a/pkgs/by-name/an/antigravity/package.nix b/pkgs/by-name/an/antigravity-ide/package.nix similarity index 72% rename from pkgs/by-name/an/antigravity/package.nix rename to pkgs/by-name/an/antigravity-ide/package.nix index a0d5cd05a137..e9a3670ad258 100644 --- a/pkgs/by-name/an/antigravity/package.nix +++ b/pkgs/by-name/an/antigravity-ide/package.nix @@ -14,22 +14,22 @@ let information = (lib.importJSON ./information.json); source = information.sources."${hostPlatform.system}" - or (throw "antigravity: unsupported system ${hostPlatform.system}"); + or (throw "antigravity-ide: unsupported system ${hostPlatform.system}"); in buildVscode { inherit commandLineArgs useVSCodeRipgrep; inherit (information) version vscodeVersion; - pname = "antigravity"; + pname = "antigravity-ide"; - executableName = "antigravity"; - longName = "Antigravity"; - shortName = "Antigravity"; - libraryName = "antigravity"; - iconName = "antigravity"; + executableName = "antigravity-ide"; + longName = "Antigravity IDE"; + shortName = "Antigravity IDE"; + libraryName = "antigravity-ide"; + iconName = "antigravity-ide"; src = fetchurl { inherit (source) url sha256; }; - sourceRoot = if hostPlatform.isDarwin then "Antigravity.app" else "Antigravity"; + sourceRoot = if hostPlatform.isDarwin then "Antigravity IDE.app" else "Antigravity IDE"; tests = { }; updateScript = ./update.js; @@ -44,7 +44,7 @@ buildVscode { extraBuildCommands = (args.extraBuildCommands or "") + '' mkdir -p "$out/opt/google/chrome" ''; - runScript = writeShellScript "antigravity-wrapper" '' + runScript = writeShellScript "antigravity-ide-wrapper" '' for candidate in google-chrome-stable google-chrome chromium-browser chromium; do if target=$(command -v "$candidate"); then ${coreutils}/bin/ln -sf "$target" /opt/google/chrome/chrome @@ -56,22 +56,22 @@ buildVscode { }; meta = { - mainProgram = "antigravity"; + mainProgram = "antigravity-ide"; description = "Agentic development platform, evolving the IDE into the agent-first era"; - homepage = "https://antigravity.google"; - downloadPage = "https://antigravity.google/download"; + homepage = "https://antigravity.google/product/antigravity-ide"; + downloadPage = "https://antigravity.google/download#antigravity-ide"; changelog = "https://antigravity.google/changelog"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ xiaoxiangmoe Zaczero + schembriaiden ]; }; } diff --git a/pkgs/by-name/an/antigravity/update.js b/pkgs/by-name/an/antigravity-ide/update.js similarity index 79% rename from pkgs/by-name/an/antigravity/update.js rename to pkgs/by-name/an/antigravity-ide/update.js index 45bf250a2fd5..e91132026d11 100755 --- a/pkgs/by-name/an/antigravity/update.js +++ b/pkgs/by-name/an/antigravity-ide/update.js @@ -13,21 +13,22 @@ import * as path from "node:path"; * @property {string} sha256hash SHA256 hash of the download file, example: "8eb01462dc4f26aba45be4992bda0b145d1ec210c63a6272578af27e59f23bef" * @property {string} url Download URL, example: "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/linux-arm/Antigravity.tar.gz", "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.11.2-6251250307170304/darwin-x64/Antigravity.zip" */ -/** @typedef {"x86_64-linux" | "aarch64-linux" | "x86_64-darwin" | "aarch64-darwin"} Platform */ +/** @typedef {"x86_64-linux" | "aarch64-linux" | "aarch64-darwin"} Platform */ /** @typedef {{ version: string; vscodeVersion: string; sources: Record }} Information */ let version = ""; let vscodeVersion = ""; -async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64" | "darwin"} */ targetSystem) { +async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "darwin-arm64"} */ targetSystem) { /** @type {UpdateInfo} */ - const latestInfo = await (await fetch(`https://antigravity-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); + const latestInfo = await (await fetch(`https://antigravity-ide-auto-updater-974169037036.us-central1.run.app/api/update/${targetSystem}/stable/latest`)).json(); const newVersion = /\/antigravity\/stable\/([\d.]+)-[\d]+/.exec(latestInfo.url)?.[1] ?? ""; // Current API lack version field now, we need to parse it from the URL temporarily. + assert(newVersion !== "", `Could not parse Antigravity IDE version from ${latestInfo.url}`); assert(version === '' || version === newVersion, `Version mismatch: ${version}(linux-x64) != ${newVersion}(${targetSystem})`); version = newVersion; assert(vscodeVersion === '' || vscodeVersion === latestInfo.productVersion, `VSCode version mismatch: ${vscodeVersion}(linux-x64) != ${latestInfo.productVersion}(${targetSystem})`); vscodeVersion = latestInfo.productVersion; return { - url: latestInfo.url, + url: latestInfo.url.replaceAll(" ", "%20"), sha256: latestInfo.sha256hash, }; } @@ -35,10 +36,9 @@ async function getLatestInformation(/** @type {"linux-x64" | "linux-arm64" | "da const sources = { "x86_64-linux": await getLatestInformation("linux-x64"), "aarch64-linux": await getLatestInformation("linux-arm64"), - "x86_64-darwin": await getLatestInformation("darwin"), "aarch64-darwin": await getLatestInformation("darwin-arm64"), }; /** @type {Information} */ const information = { version, vscodeVersion, sources }; fs.writeFileSync(path.join(import.meta.dirname, "./information.json"), JSON.stringify(information, null, 2) + "\n", "utf-8"); -console.log(`[update] Updating Antigravity complete, version: ${version}, vscodeVersion: ${vscodeVersion}`); +console.log(`[update] Updating Antigravity IDE complete, version: ${version}, vscodeVersion: ${vscodeVersion}`); diff --git a/pkgs/by-name/an/antigravity/information.json b/pkgs/by-name/an/antigravity/information.json deleted file mode 100644 index 79cbe4f69f9a..000000000000 --- a/pkgs/by-name/an/antigravity/information.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "1.23.2", - "vscodeVersion": "1.107.0", - "sources": { - "x86_64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-x64/Antigravity.tar.gz", - "sha256": "5232a4048ff4fa15685d9a981ba4fba573e297f3efc9b76f638e794baf775725" - }, - "aarch64-linux": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/linux-arm/Antigravity.tar.gz", - "sha256": "64d11085f17edc691adbe8952d59887f257d58448705dc2a19dfa23890d36df1" - }, - "x86_64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-x64/Antigravity.zip", - "sha256": "86437909f7e1c85d987b02130d3464b3d004d07904d5c893989ac3c924d11357" - }, - "aarch64-darwin": { - "url": "https://edgedl.me.gvt1.com/edgedl/release2/j0qc3/antigravity/stable/1.23.2-4781536860569600/darwin-arm/Antigravity.zip", - "sha256": "4a8a90feed7078dae30d1dbcb268a0497c103ba76df7012a4467587aa7cffdf8" - } - } -} diff --git a/pkgs/by-name/an/antimatter-dimensions/package.nix b/pkgs/by-name/an/antimatter-dimensions/package.nix index bcff103c86ed..7a7b0dbbbf61 100644 --- a/pkgs/by-name/an/antimatter-dimensions/package.nix +++ b/pkgs/by-name/an/antimatter-dimensions/package.nix @@ -19,12 +19,12 @@ let in buildNpmPackage rec { pname = "antimatter-dimensions"; - version = "0-unstable-2025-11-20"; + version = "0-unstable-2026-07-17"; src = fetchFromGitHub { owner = "IvarK"; repo = "AntimatterDimensionsSourceCode"; - rev = "8ae221fcb07db667b3d04114c2b977175966611d"; - hash = "sha256-IseAfEz+nSzY2XD15HbJWeLmYFMvAYO33bPItXJCy58="; + rev = "5409e320cecef96a917cca1dfb68f1f183e499ca"; + hash = "sha256-kWKa2SUXVLxeSFerApyXhZBeRtHmJnHxklFSz6g4Ok8="; }; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/an/antiprism/package.nix b/pkgs/by-name/an/antiprism/package.nix index afe7bb297fd5..2ae40853178a 100644 --- a/pkgs/by-name/an/antiprism/package.nix +++ b/pkgs/by-name/an/antiprism/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.antiprism.com"; description = "Collection of programs for generating, manipulating, transforming and viewing polyhedra"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/an/anup/package.nix b/pkgs/by-name/an/anup/package.nix index 85128dfc78b2..011e879aa765 100644 --- a/pkgs/by-name/an/anup/package.nix +++ b/pkgs/by-name/an/anup/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage rec { version = "0.4.0"; src = fetchFromGitHub { - owner = "Acizza"; + owner = "jonathanlmc"; repo = "anup"; tag = version; hash = "sha256-4pXF4p4K8+YihVB9NdgT6bOidmQEgWXUbcbvgXJ0IDA="; @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage rec { ]; meta = { - homepage = "https://github.com/Acizza/anup"; + homepage = "https://github.com/jonathanlmc/anup"; description = "Anime tracker for AniList featuring a TUI"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ natto1784 ]; diff --git a/pkgs/by-name/an/anydesk/package.nix b/pkgs/by-name/an/anydesk/package.nix index 5e0d5804dbf2..28c2e9e83788 100644 --- a/pkgs/by-name/an/anydesk/package.nix +++ b/pkgs/by-name/an/anydesk/package.nix @@ -4,8 +4,8 @@ fetchurl, makeWrapper, makeDesktopItem, - genericUpdater, writeShellScript, + jq, atk, cairo, gdk-pixbuf, @@ -164,24 +164,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = genericUpdater { - versionLister = - let - arch = - if system == "x86_64-linux" then - "amd64" - else if system == "aarch64-linux" then - "arm64" - else - throw "cannot update AnyDesk on ${system}"; - in - writeShellScript "anydesk-versionLister" '' - curl -s https://anydesk.com/en/downloads/linux \ - | grep "https://[a-z0-9._/-]*-${arch}.tar.gz" -o \ - | uniq \ - | sed 's,.*/anydesk-\(.*\)-${arch}.tar.gz,\1,g' - ''; - }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/an/anydesk/pin.json b/pkgs/by-name/an/anydesk/pin.json index be59d275a145..943ff7bee6d9 100644 --- a/pkgs/by-name/an/anydesk/pin.json +++ b/pkgs/by-name/an/anydesk/pin.json @@ -1,5 +1,5 @@ { - "version": "8.0.2", - "x86_64-linux": "sha256-6noMPfe0x6kx/whyd66qcmk7WhEivx3xK5q58Se9Ij0=", - "aarch64-linux": "sha256-wfY+OCx9OyLCmiA29RjnYzcg/pApMIXWT5UrcdcyRYM=" + "version": "8.0.4", + "x86_64-linux": "sha256-fg3sLcushu5zDvsBakHLP/FRqhvauICx86rlpK4YkW8=", + "aarch64-linux": "sha256-TFV1VQdFIlGYIf4iYtAw42cVkaiWvsdCcSjdS/qugX0=" } diff --git a/pkgs/by-name/an/anydesk/update.sh b/pkgs/by-name/an/anydesk/update.sh new file mode 100755 index 000000000000..166540cf7b8b --- /dev/null +++ b/pkgs/by-name/an/anydesk/update.sh @@ -0,0 +1,39 @@ +#!/usr/bin/env -S nix shell nixpkgs#curl nixpkgs#jq nixpkgs#nix --command bash + +set -euo pipefail + +directory="$(dirname $0 | xargs realpath)" + +new_version=$( + curl -s https://rpm.anydesk.com/rhel/x86_64/Packages/ \ + | grep -oP 'anydesk_\K[0-9]+\.[0-9]+\.[0-9]+(?=-[0-9]+_x86_64\.rpm)' \ + | sort -V \ + | tail -1 +) + +old_version=$(jq -r '.version' "$directory/pin.json") + +if [[ "$new_version" == "$old_version" ]]; then + echo "anydesk is already up to date ($old_version)" + exit 0 +fi + +echo "Updating anydesk: $old_version -> $new_version" + +hash_amd64=$(nix hash to-sri --type sha256 \ + "$(nix-prefetch-url --type sha256 \ + "https://download.anydesk.com/linux/anydesk-${new_version}-amd64.tar.gz")") + +hash_arm64=$(nix hash to-sri --type sha256 \ + "$(nix-prefetch-url --type sha256 \ + "https://download.anydesk.com/rpi/anydesk-${new_version}-arm64.tar.gz")") + +cat > "$directory/pin.json" << EOF +{ + "version": "$new_version", + "x86_64-linux": "$hash_amd64", + "aarch64-linux": "$hash_arm64" +} +EOF + +cat "$directory/pin.json" diff --git a/pkgs/by-name/an/anyk/package.nix b/pkgs/by-name/an/anyk/package.nix index 962e55cc5dea..b9b453d61c03 100644 --- a/pkgs/by-name/an/anyk/package.nix +++ b/pkgs/by-name/an/anyk/package.nix @@ -36,7 +36,7 @@ let src = lib.sources.sourceFilesBySuffices ./. [ "pom.xml" ]; - mvnHash = "sha256-4keHPzS8pbIIwODmBUMofJt27n5WqYh+IGqE6d9od7k="; + mvnHash = "sha256-6pezqcTIPR5NYFQUmLZ5Y3TOd+XRcB/eRmNSAEoBmls="; installPhase = '' mkdir -p $out/share/java diff --git a/pkgs/by-name/an/anytone-emu/package.nix b/pkgs/by-name/an/anytone-emu/package.nix index 91099171ca78..1b9779a6b608 100644 --- a/pkgs/by-name/an/anytone-emu/package.nix +++ b/pkgs/by-name/an/anytone-emu/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "anytone-emu"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "dmr-tools"; repo = "anytone-emu"; tag = "v${finalAttrs.version}"; - hash = "sha256-RTYLtVCKP2TW7Ery51POEZuCtyRhkgKhoDhJPe18y80="; + hash = "sha256-MdxnToDWnF7bLEv9wQpHUCo58RJi54q2tn2ToXOB954="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/an/anytype-cli/package.nix b/pkgs/by-name/an/anytype-cli/package.nix index b8eacca1f8e7..271bdc067508 100644 --- a/pkgs/by-name/an/anytype-cli/package.nix +++ b/pkgs/by-name/an/anytype-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { __structuredAttrs = true; pname = "anytype-cli"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "anyproto"; repo = "anytype-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-+GVV5HiOB/589IKRs+uJaK8X29MCg5cv0C8u6spb7Jg="; + hash = "sha256-T/mdF+pzApm15Cg2g1ybgU7pEHLsTC4jD7WuXzNqM2M="; }; - vendorHash = "sha256-uxKDO55CQYn50XpnlP5tv5Rcl6+fq7nsOD7/2foRZX8="; + vendorHash = "sha256-S6Xb2XYAn/cTC++1WK5cmXcC6QCZpPoYMRrjk/IPKas="; proxyVendor = true; env.CGO_ENABLED = 1; diff --git a/pkgs/by-name/an/anytype-heart/package.nix b/pkgs/by-name/an/anytype-heart/package.nix index 5b11214a178c..c03e7d4ff88e 100644 --- a/pkgs/by-name/an/anytype-heart/package.nix +++ b/pkgs/by-name/an/anytype-heart/package.nix @@ -15,7 +15,6 @@ let # https://github.com/anyproto/anytype-heart/blob/f33a6b09e9e4e597f8ddf845fc4d6fe2ef335622/pkg/lib/localstore/ftsearch/ftsearchtantivy.go#L3 x86_64-linux = "linux-amd64-musl"; aarch64-linux = "linux-arm64-musl"; - x86_64-darwin = "darwin-amd64"; aarch64-darwin = "darwin-arm64"; } .${stdenv.hostPlatform.system} @@ -89,7 +88,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/an/anytype/package.nix b/pkgs/by-name/an/anytype/package.nix index 5a5739564494..310f4f6bb6bf 100644 --- a/pkgs/by-name/an/anytype/package.nix +++ b/pkgs/by-name/an/anytype/package.nix @@ -93,6 +93,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # used upstream for builds: https://github.com/anyproto/anytype-ts/blob/5d66657f764c0649410e37c9e9c06e3ff18487ee/.github/workflows/build.yml#L192. + NODE_OPTIONS = "--max-old-space-size=8192"; }; nativeBuildInputs = [ @@ -141,6 +143,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { substituteInPlace scripts/generate-protos.sh \ --replace-fail "/usr/bin/env" "${coreutils}/bin/env" + substituteInPlace package.json \ + --replace-fail \ + '"build:nmh": "go build -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' \ + '"build:nmh": "go build -trimpath -ldflags=-buildid= -o dist/nativeMessagingHost ./go/nativeMessagingHost.go"' + cp -r ${anytype-heart}/lib dist/ cp -r ${anytype-heart}/bin/anytypeHelper dist/ @@ -166,7 +173,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { # remove unnecessary files preInstall = '' chmod u+w -R dist node_modules - find -type f \( -name "*.ts" -o -name "*.map" \) -exec rm -rf {} + + find dist node_modules -type f \( -name '*.ts' -o -name '*.map' \) -delete + rm -f node_modules/keytar/build/{Makefile,binding.Makefile,config.gypi,keytar.target.mk} + rm -rf node_modules/keytar/build/Release/{.deps,obj.target} ''; installPhase = '' @@ -229,7 +238,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/ao/ao3downloader/package.nix b/pkgs/by-name/ao/ao3downloader/package.nix index ea655ebb1722..3cfc39a324d2 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 (finalAttrs: { pname = "ao3downloader"; - version = "2026.4.9"; + version = "2026.7.0"; pyproject = true; src = fetchFromGitHub { owner = "nianeyna"; repo = "ao3downloader"; tag = "v${finalAttrs.version}"; - hash = "sha256-StaF62Ho/xz8kKE5NrLo8G5PdBv493VBshR6gdK9J20="; + hash = "sha256-cyn4bWHKKfRGade8A1kAJRJzdcXCY46nGgVw5i0OUyQ="; }; build-system = with python312Packages; [ diff --git a/pkgs/by-name/ao/aonsoku/package.nix b/pkgs/by-name/ao/aonsoku/package.nix index dc708ce30d79..030d19faa23c 100644 --- a/pkgs/by-name/ao/aonsoku/package.nix +++ b/pkgs/by-name/ao/aonsoku/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nodejs, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, makeWrapper, @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aonsoku"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "victoralvesf"; repo = "aonsoku"; tag = "v${finalAttrs.version}"; - hash = "sha256-Rbte0qYcZQ70E6ib8rj0YsNP5SMNO8eC3MEvWcT7N08="; + hash = "sha256-zHYr50FBV7sSdNz6j07SdlMbVaXKj1SnJHmtjmsnBdY="; }; patches = [ @@ -31,14 +31,14 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-oBwqYOx2KEtF0qdMKEIgdArZ4xs/AyeOqFoU4nHl3xY="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-YV3ZpXBSX9EEDUfWmk1aNbwGQI+5zNQ3eoXvNg7k0yQ="; }; nativeBuildInputs = [ nodejs - pnpm_9 + pnpm_11 pnpmConfigHook makeWrapper electron diff --git a/pkgs/by-name/ap/apache-airflow/providers.nix b/pkgs/by-name/ap/apache-airflow/providers.nix index db03b3269823..428e1394bb9a 100644 --- a/pkgs/by-name/ap/apache-airflow/providers.nix +++ b/pkgs/by-name/ap/apache-airflow/providers.nix @@ -6,16 +6,25 @@ "airflow.providers.airbyte" "airflow.providers.airbyte.get_provider_info" ]; - version = "5.3.3"; + version = "5.5.1"; + }; + + akeyless = { + deps = [ ]; + imports = [ + "airflow.providers.akeyless" + "airflow.providers.akeyless.get_provider_info" + ]; + version = "0.2.0"; }; alibaba = { - deps = [ "oss2" ]; + deps = [ "alibabacloud-tea-openapi" ]; imports = [ "airflow.providers.alibaba" "airflow.providers.alibaba.get_provider_info" ]; - version = "3.3.5"; + version = "3.3.9"; }; amazon = { @@ -41,7 +50,7 @@ "airflow.providers.amazon" "airflow.providers.amazon.get_provider_info" ]; - version = "9.23.0"; + version = "9.31.0"; }; apache_beam = { @@ -63,7 +72,7 @@ "airflow.providers.apache.cassandra" "airflow.providers.apache.cassandra.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; apache_drill = { @@ -72,7 +81,7 @@ "airflow.providers.apache.drill" "airflow.providers.apache.drill.get_provider_info" ]; - version = "3.3.0"; + version = "3.3.3"; }; apache_druid = { @@ -81,7 +90,7 @@ "airflow.providers.apache.druid" "airflow.providers.apache.druid.get_provider_info" ]; - version = "4.5.0"; + version = "4.5.2"; }; apache_flink = { @@ -90,7 +99,7 @@ "airflow.providers.apache.flink" "airflow.providers.apache.flink.get_provider_info" ]; - version = "1.8.3"; + version = "1.8.5"; }; apache_hdfs = { @@ -103,7 +112,7 @@ "airflow.providers.apache.hdfs" "airflow.providers.apache.hdfs.get_provider_info" ]; - version = "4.11.3"; + version = "4.12.1"; }; apache_hive = { @@ -117,16 +126,16 @@ "airflow.providers.apache.hive" "airflow.providers.apache.hive.get_provider_info" ]; - version = "9.4.0"; + version = "9.5.0"; }; apache_iceberg = { - deps = [ ]; + deps = [ "pyiceberg" ]; imports = [ "airflow.providers.apache.iceberg" "airflow.providers.apache.iceberg.get_provider_info" ]; - version = "2.0.0"; + version = "2.0.3"; }; apache_impala = { @@ -138,7 +147,7 @@ "airflow.providers.apache.impala" "airflow.providers.apache.impala.get_provider_info" ]; - version = "1.9.0"; + version = "1.9.3"; }; apache_kafka = { @@ -150,7 +159,7 @@ "airflow.providers.apache.kafka" "airflow.providers.apache.kafka.get_provider_info" ]; - version = "1.13.0"; + version = "1.14.0"; }; apache_kylin = { @@ -159,7 +168,7 @@ "airflow.providers.apache.kylin" "airflow.providers.apache.kylin.get_provider_info" ]; - version = "3.10.2"; + version = "3.10.5"; }; apache_livy = { @@ -168,7 +177,7 @@ "airflow.providers.apache.livy" "airflow.providers.apache.livy.get_provider_info" ]; - version = "4.5.3"; + version = "4.5.7"; }; apache_pig = { @@ -177,7 +186,7 @@ "airflow.providers.apache.pig" "airflow.providers.apache.pig.get_provider_info" ]; - version = "4.8.2"; + version = "4.8.5"; }; apache_pinot = { @@ -186,19 +195,21 @@ "airflow.providers.apache.pinot" "airflow.providers.apache.pinot.get_provider_info" ]; - version = "4.10.0"; + version = "4.10.3"; }; apache_spark = { deps = [ "grpcio-status" "pyspark" + "requests" + "tenacity" ]; imports = [ "airflow.providers.apache.spark" "airflow.providers.apache.spark.get_provider_info" ]; - version = "5.6.0"; + version = "6.2.0"; }; apache_tinkerpop = { @@ -207,7 +218,7 @@ "airflow.providers.apache.tinkerpop" "airflow.providers.apache.tinkerpop.get_provider_info" ]; - version = "1.1.1"; + version = "1.1.4"; }; apprise = { @@ -216,7 +227,7 @@ "airflow.providers.apprise" "airflow.providers.apprise.get_provider_info" ]; - version = "2.3.1"; + version = "2.3.4"; }; arangodb = { @@ -225,7 +236,7 @@ "airflow.providers.arangodb" "airflow.providers.arangodb.get_provider_info" ]; - version = "2.9.2"; + version = "2.9.5"; }; asana = { @@ -234,7 +245,7 @@ "airflow.providers.asana" "airflow.providers.asana.get_provider_info" ]; - version = "2.11.1"; + version = "2.11.4"; }; atlassian_jira = { @@ -243,7 +254,7 @@ "airflow.providers.atlassian.jira" "airflow.providers.atlassian.jira.get_provider_info" ]; - version = "3.3.1"; + version = "3.3.4"; }; celery = { @@ -255,7 +266,16 @@ "airflow.providers.celery" "airflow.providers.celery.get_provider_info" ]; - version = "3.17.1"; + version = "3.20.0"; + }; + + clickhousedb = { + deps = [ "clickhouse-connect" ]; + imports = [ + "airflow.providers.clickhousedb" + "airflow.providers.clickhousedb.get_provider_info" + ]; + version = "1.0.0"; }; cloudant = { @@ -264,7 +284,7 @@ "airflow.providers.cloudant" "airflow.providers.cloudant.get_provider_info" ]; - version = "4.3.2"; + version = "4.3.5"; }; cncf_kubernetes = { @@ -280,7 +300,7 @@ "airflow.providers.cncf.kubernetes" "airflow.providers.cncf.kubernetes.get_provider_info" ]; - version = "10.14.0"; + version = "10.18.1"; }; cohere = { @@ -292,19 +312,27 @@ "airflow.providers.cohere" "airflow.providers.cohere.get_provider_info" ]; - version = "1.6.3"; + version = "1.6.6"; }; common_ai = { deps = [ + "fastavro" + "langchain" + "llama-index-core" + "llama-index-embeddings-openai" + "llama-index-llms-openai" + "pyarrow" "pydantic-ai-slim" + "pypdf" + "python-docx" "sqlglot" ]; imports = [ "airflow.providers.common.ai" "airflow.providers.common.ai.get_provider_info" ]; - version = "0.0.1"; + version = "0.5.0"; }; common_compat = { @@ -313,7 +341,7 @@ "airflow.providers.common.compat" "airflow.providers.common.compat.get_provider_info" ]; - version = "1.14.1"; + version = "1.15.0"; }; common_io = { @@ -322,7 +350,7 @@ "airflow.providers.common.io" "airflow.providers.common.io.get_provider_info" ]; - version = "1.7.1"; + version = "1.7.3"; }; common_messaging = { @@ -331,7 +359,7 @@ "airflow.providers.common.messaging" "airflow.providers.common.messaging.get_provider_info" ]; - version = "2.0.2"; + version = "2.0.4"; }; common_sql = { @@ -349,7 +377,7 @@ "airflow.providers.common.sql" "airflow.providers.common.sql.get_provider_info" ]; - version = "1.33.0"; + version = "2.0.1"; }; databricks = { @@ -368,7 +396,7 @@ "airflow.providers.databricks" "airflow.providers.databricks.get_provider_info" ]; - version = "7.11.0"; + version = "7.16.1"; }; datadog = { @@ -377,7 +405,7 @@ "airflow.providers.datadog" "airflow.providers.datadog.get_provider_info" ]; - version = "3.10.2"; + version = "3.10.5"; }; dbt_cloud = { @@ -390,7 +418,7 @@ "airflow.providers.dbt.cloud" "airflow.providers.dbt.cloud.get_provider_info" ]; - version = "4.7.0"; + version = "4.9.2"; }; dingding = { @@ -399,7 +427,7 @@ "airflow.providers.dingding" "airflow.providers.dingding.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; discord = { @@ -408,7 +436,7 @@ "airflow.providers.discord" "airflow.providers.discord.get_provider_info" ]; - version = "3.12.0"; + version = "3.12.3"; }; docker = { @@ -420,7 +448,7 @@ "airflow.providers.docker" "airflow.providers.docker.get_provider_info" ]; - version = "4.5.3"; + version = "4.5.7"; }; edge3 = { @@ -434,16 +462,19 @@ "airflow.providers.edge3" "airflow.providers.edge3.get_provider_info" ]; - version = "3.2.0"; + version = "4.0.0"; }; elasticsearch = { - deps = [ "elasticsearch" ]; + deps = [ + "elasticsearch" + "polars" + ]; imports = [ "airflow.providers.elasticsearch" "airflow.providers.elasticsearch.get_provider_info" ]; - version = "6.5.0"; + version = "6.7.0"; }; exasol = { @@ -455,11 +486,12 @@ "airflow.providers.exasol" "airflow.providers.exasol.get_provider_info" ]; - version = "4.10.0"; + version = "4.10.3"; }; fab = { deps = [ + "authlib" "blinker" "cachetools" "flask" @@ -481,7 +513,7 @@ "airflow.providers.fab" "airflow.providers.fab.get_provider_info" ]; - version = "3.5.0"; + version = "3.7.0"; }; facebook = { @@ -490,7 +522,7 @@ "airflow.providers.facebook" "airflow.providers.facebook.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; ftp = { @@ -499,7 +531,7 @@ "airflow.providers.ftp" "airflow.providers.ftp.get_provider_info" ]; - version = "3.14.1"; + version = "3.15.1"; }; git = { @@ -508,7 +540,7 @@ "airflow.providers.git" "airflow.providers.git.get_provider_info" ]; - version = "0.2.4"; + version = "0.4.0"; }; github = { @@ -517,7 +549,7 @@ "airflow.providers.github" "airflow.providers.github.get_provider_info" ]; - version = "2.11.0"; + version = "2.11.3"; }; google = { @@ -563,6 +595,7 @@ "plyvel" "proto-plus" "pyarrow" + "pydantic" "python-slugify" "ray" "tenacity" @@ -572,7 +605,7 @@ "airflow.providers.google" "airflow.providers.google.get_provider_info" ]; - version = "21.0.0"; + version = "22.2.0"; }; grpc = { @@ -585,7 +618,7 @@ "airflow.providers.grpc" "airflow.providers.grpc.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; hashicorp = { @@ -597,13 +630,14 @@ "airflow.providers.hashicorp" "airflow.providers.hashicorp.get_provider_info" ]; - version = "4.5.0"; + version = "4.7.1"; }; http = { deps = [ "aiohttp" "asgiref" + "pydantic" "requests" "requests-toolbelt" ]; @@ -611,7 +645,16 @@ "airflow.providers.http" "airflow.providers.http.get_provider_info" ]; - version = "6.0.0"; + version = "6.0.4"; + }; + + ibm_mq = { + deps = [ "asgiref" ]; + imports = [ + "airflow.providers.ibm.mq" + "airflow.providers.ibm.mq.get_provider_info" + ]; + version = "0.1.0"; }; imap = { @@ -620,28 +663,29 @@ "airflow.providers.imap" "airflow.providers.imap.get_provider_info" ]; - version = "3.11.0"; + version = "3.11.3"; }; influxdb = { deps = [ "influxdb-client" + "influxdb3-python" "requests" ]; imports = [ "airflow.providers.influxdb" "airflow.providers.influxdb.get_provider_info" ]; - version = "2.10.2"; + version = "2.11.0"; }; informatica = { - deps = [ ]; + deps = [ "sqlglot" ]; imports = [ "airflow.providers.informatica" "airflow.providers.informatica.get_provider_info" ]; - version = "0.1.1"; + version = "0.2.0"; }; jdbc = { @@ -653,7 +697,7 @@ "airflow.providers.jdbc" "airflow.providers.jdbc.get_provider_info" ]; - version = "5.4.1"; + version = "5.5.0"; }; jenkins = { @@ -662,7 +706,7 @@ "airflow.providers.jenkins" "airflow.providers.jenkins.get_provider_info" ]; - version = "4.2.3"; + version = "4.2.6"; }; keycloak = { @@ -671,7 +715,7 @@ "airflow.providers.keycloak" "airflow.providers.keycloak.get_provider_info" ]; - version = "0.6.0"; + version = "0.8.0"; }; microsoft_azure = { @@ -709,7 +753,7 @@ "airflow.providers.microsoft.azure" "airflow.providers.microsoft.azure.get_provider_info" ]; - version = "13.0.1"; + version = "13.5.0"; }; microsoft_mssql = { @@ -721,7 +765,7 @@ "airflow.providers.microsoft.mssql" "airflow.providers.microsoft.mssql.get_provider_info" ]; - version = "4.5.0"; + version = "4.7.0"; }; microsoft_psrp = { @@ -730,7 +774,7 @@ "airflow.providers.microsoft.psrp" "airflow.providers.microsoft.psrp.get_provider_info" ]; - version = "3.2.3"; + version = "3.2.6"; }; microsoft_winrm = { @@ -739,7 +783,7 @@ "airflow.providers.microsoft.winrm" "airflow.providers.microsoft.winrm.get_provider_info" ]; - version = "3.14.0"; + version = "3.14.3"; }; mongo = { @@ -751,12 +795,13 @@ "airflow.providers.mongo" "airflow.providers.mongo.get_provider_info" ]; - version = "5.3.3"; + version = "5.4.0"; }; mysql = { deps = [ "aiomysql" + "mysql-connector-python" "mysqlclient" "pymysql" ]; @@ -764,7 +809,7 @@ "airflow.providers.mysql" "airflow.providers.mysql.get_provider_info" ]; - version = "6.5.0"; + version = "6.6.1"; }; neo4j = { @@ -773,7 +818,7 @@ "airflow.providers.neo4j" "airflow.providers.neo4j.get_provider_info" ]; - version = "3.11.3"; + version = "3.11.6"; }; odbc = { @@ -782,7 +827,7 @@ "airflow.providers.odbc" "airflow.providers.odbc.get_provider_info" ]; - version = "4.12.0"; + version = "4.12.3"; }; openai = { @@ -791,7 +836,7 @@ "airflow.providers.openai" "airflow.providers.openai.get_provider_info" ]; - version = "1.7.2"; + version = "1.7.5"; }; openfaas = { @@ -800,7 +845,7 @@ "airflow.providers.openfaas" "airflow.providers.openfaas.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; openlineage = { @@ -812,7 +857,7 @@ "airflow.providers.openlineage" "airflow.providers.openlineage.get_provider_info" ]; - version = "2.12.0"; + version = "2.18.1"; }; opensearch = { @@ -821,7 +866,7 @@ "airflow.providers.opensearch" "airflow.providers.opensearch.get_provider_info" ]; - version = "1.8.4"; + version = "1.10.0"; }; opsgenie = { @@ -830,7 +875,7 @@ "airflow.providers.opsgenie" "airflow.providers.opsgenie.get_provider_info" ]; - version = "5.10.1"; + version = "5.10.4"; }; oracle = { @@ -842,7 +887,7 @@ "airflow.providers.oracle" "airflow.providers.oracle.get_provider_info" ]; - version = "4.5.1"; + version = "4.6.1"; }; pagerduty = { @@ -851,7 +896,7 @@ "airflow.providers.pagerduty" "airflow.providers.pagerduty.get_provider_info" ]; - version = "5.2.3"; + version = "5.2.6"; }; papermill = { @@ -865,7 +910,7 @@ "airflow.providers.papermill" "airflow.providers.papermill.get_provider_info" ]; - version = "3.12.1"; + version = "3.13.1"; }; pgvector = { @@ -874,7 +919,7 @@ "airflow.providers.pgvector" "airflow.providers.pgvector.get_provider_info" ]; - version = "1.7.0"; + version = "1.7.2"; }; pinecone = { @@ -883,7 +928,7 @@ "airflow.providers.pinecone" "airflow.providers.pinecone.get_provider_info" ]; - version = "2.4.2"; + version = "2.4.5"; }; postgres = { @@ -899,7 +944,7 @@ "airflow.providers.postgres" "airflow.providers.postgres.get_provider_info" ]; - version = "6.6.1"; + version = "6.8.0"; }; presto = { @@ -913,7 +958,7 @@ "airflow.providers.presto" "airflow.providers.presto.get_provider_info" ]; - version = "5.11.0"; + version = "5.12.0"; }; qdrant = { @@ -922,7 +967,7 @@ "airflow.providers.qdrant" "airflow.providers.qdrant.get_provider_info" ]; - version = "1.5.3"; + version = "1.5.6"; }; redis = { @@ -931,7 +976,7 @@ "airflow.providers.redis" "airflow.providers.redis.get_provider_info" ]; - version = "4.4.2"; + version = "4.5.0"; }; salesforce = { @@ -943,7 +988,7 @@ "airflow.providers.salesforce" "airflow.providers.salesforce.get_provider_info" ]; - version = "5.12.3"; + version = "5.14.1"; }; samba = { @@ -952,7 +997,7 @@ "airflow.providers.samba" "airflow.providers.samba.get_provider_info" ]; - version = "4.12.3"; + version = "4.12.6"; }; segment = { @@ -961,23 +1006,21 @@ "airflow.providers.segment" "airflow.providers.segment.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.5"; }; sendgrid = { - deps = [ - "sendgrid" - "werkzeug" - ]; + deps = [ "sendgrid" ]; imports = [ "airflow.providers.sendgrid" "airflow.providers.sendgrid.get_provider_info" ]; - version = "4.2.1"; + version = "4.2.4"; }; sftp = { deps = [ + "aiofiles" "asyncssh" "paramiko" "pysftp" @@ -987,7 +1030,7 @@ "airflow.providers.sftp" "airflow.providers.sftp.get_provider_info" ]; - version = "5.7.1"; + version = "5.8.2"; }; singularity = { @@ -996,11 +1039,12 @@ "airflow.providers.singularity" "airflow.providers.singularity.get_provider_info" ]; - version = "3.9.2"; + version = "3.9.4"; }; slack = { deps = [ + "aiohttp" "asgiref" "slack-sdk" ]; @@ -1008,7 +1052,7 @@ "airflow.providers.slack" "airflow.providers.slack.get_provider_info" ]; - version = "9.8.0"; + version = "9.10.2"; }; smtp = { @@ -1017,7 +1061,7 @@ "airflow.providers.smtp" "airflow.providers.smtp.get_provider_info" ]; - version = "2.4.3"; + version = "3.0.1"; }; snowflake = { @@ -1032,7 +1076,7 @@ "airflow.providers.snowflake" "airflow.providers.snowflake.get_provider_info" ]; - version = "6.11.0"; + version = "6.14.0"; }; sqlite = { @@ -1041,20 +1085,19 @@ "airflow.providers.sqlite" "airflow.providers.sqlite.get_provider_info" ]; - version = "4.3.0"; + version = "4.3.3"; }; ssh = { deps = [ "asyncssh" "paramiko" - "sshtunnel" ]; imports = [ "airflow.providers.ssh" "airflow.providers.ssh.get_provider_info" ]; - version = "4.3.2"; + version = "5.0.3"; }; standard = { @@ -1063,7 +1106,7 @@ "airflow.providers.standard" "airflow.providers.standard.get_provider_info" ]; - version = "1.12.1"; + version = "1.15.0"; }; tableau = { @@ -1072,7 +1115,7 @@ "airflow.providers.tableau" "airflow.providers.tableau.get_provider_info" ]; - version = "5.3.3"; + version = "5.5.0"; }; telegram = { @@ -1081,7 +1124,7 @@ "airflow.providers.telegram" "airflow.providers.telegram.get_provider_info" ]; - version = "4.9.2"; + version = "4.9.5"; }; teradata = { @@ -1090,7 +1133,7 @@ "airflow.providers.teradata" "airflow.providers.teradata.get_provider_info" ]; - version = "3.5.0"; + version = "3.6.0"; }; trino = { @@ -1099,7 +1142,7 @@ "airflow.providers.trino" "airflow.providers.trino.get_provider_info" ]; - version = "6.5.0"; + version = "6.6.0"; }; vertica = { @@ -1111,7 +1154,16 @@ "airflow.providers.vertica" "airflow.providers.vertica.get_provider_info" ]; - version = "4.3.0"; + version = "4.4.0"; + }; + + vespa = { + deps = [ ]; + imports = [ + "airflow.providers.vespa" + "airflow.providers.vespa.get_provider_info" + ]; + version = "0.1.1"; }; weaviate = { @@ -1124,7 +1176,7 @@ "airflow.providers.weaviate" "airflow.providers.weaviate.get_provider_info" ]; - version = "3.3.1"; + version = "3.3.5"; }; yandex = { @@ -1133,7 +1185,7 @@ "airflow.providers.yandex" "airflow.providers.yandex.get_provider_info" ]; - version = "4.4.0"; + version = "4.5.0"; }; ydb = { @@ -1142,7 +1194,7 @@ "airflow.providers.ydb" "airflow.providers.ydb.get_provider_info" ]; - version = "2.5.0"; + version = "2.5.3"; }; zendesk = { @@ -1151,7 +1203,7 @@ "airflow.providers.zendesk" "airflow.providers.zendesk.get_provider_info" ]; - version = "4.11.1"; + version = "4.12.0"; }; } diff --git a/pkgs/by-name/ap/apache-airflow/python-package.nix b/pkgs/by-name/ap/apache-airflow/python-package.nix index 5dba14a2e683..0a00fe496460 100644 --- a/pkgs/by-name/ap/apache-airflow/python-package.nix +++ b/pkgs/by-name/ap/apache-airflow/python-package.nix @@ -36,6 +36,7 @@ hatchling, httpx, importlib-metadata, + isoduration, itsdangerous, jinja2, jsonschema, @@ -88,355 +89,355 @@ enabledProviders, }: -let - version = "3.2.2"; +buildPythonPackage ( + finalAttrs: + let + inherit (finalAttrs) src version; - src = fetchFromGitHub { - owner = "apache"; - repo = "airflow"; - tag = version; - hash = "sha256-nAFSLdcKmP2CNm3rx+/fwIsJnpju7wBl+fYWQV8p+sU="; - }; + airflowUi = stdenv.mkDerivation (uiAttrs: { + pname = "airflow-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; - pnpm = pnpm_10; + # vite build resolves "localhost" during the build, which the darwin + # sandbox blocks by default (getaddrinfo ENOTFOUND localhost). + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; - airflowUi = stdenv.mkDerivation rec { - pname = "airflow-ui-assets"; - inherit src version; - sourceRoot = "${src.name}/airflow-core/src/airflow/ui"; + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + ]; - # vite build resolves "localhost" during the build, which the darwin - # sandbox blocks by default (getaddrinfo ENOTFOUND localhost). - __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + pnpmDeps = fetchPnpmDeps { + pname = "airflow-ui"; + inherit src version; + pnpm = pnpm_10; + sourceRoot = uiAttrs.sourceRoot; + fetcherVersion = 3; + hash = "sha256-bKdZ4Y+enrXYuSpJ85eFHl2EM+QfZsMTGqQZ9yLfGEc="; + }; - nativeBuildInputs = [ - nodejs - pnpm - pnpmConfigHook + buildPhase = '' + pnpm install + pnpm build + ''; + + installPhase = '' + mkdir -p $out/share/airflow/ui + cp -r dist $out/share/airflow/ui/ + ''; + }); + + airflowSimpleAuthUi = stdenv.mkDerivation (simpleUiAttrs: { + pname = "airflow-simple-ui-assets"; + inherit src version; + sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + + __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + pname = "simple-auth-manager-ui"; + inherit src version; + pnpm = pnpm_10; + sourceRoot = simpleUiAttrs.sourceRoot; + fetcherVersion = 3; + hash = "sha256-Ye8jRs9jgsf3YUd3JPldEcTzQFmgS4cvkOVP6tuZw+8="; + }; + + buildPhase = '' + pnpm install + pnpm build + ''; + + installPhase = '' + mkdir -p $out/share/airflow/simple-ui + cp -r dist $out/share/airflow/simple-ui/ + ''; + }); + + requiredProviders = [ + "common_compat" + "common_io" + "common_sql" + "smtp" + "standard" ]; - pnpmDeps = fetchPnpmDeps { - pname = "airflow-ui"; - inherit - sourceRoot - src - version - pnpm - ; - fetcherVersion = 3; - hash = "sha256-wJ2u+y3umecL4IeVW/29/yDgYZ77ffOBQLHeplD3XlQ="; - }; + providers = import ./providers.nix; - buildPhase = '' - pnpm install - pnpm build - ''; + buildProvider = + provider: + buildPythonPackage { + pname = "apache-airflow-providers-${provider}"; + version = providers.${provider}.version; + pyproject = true; - installPhase = '' - mkdir -p $out/share/airflow/ui - cp -r dist $out/share/airflow/ui/ - ''; - }; + inherit src; + sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}"; - airflowSimpleAuthUi = stdenv.mkDerivation rec { - pname = "airflow-simple-ui-assets"; - inherit src version; - sourceRoot = "${src.name}/airflow-core/src/airflow/api_fastapi/auth/managers/simple/ui"; + buildInputs = [ flit-core ]; - __darwinAllowLocalNetworking = stdenv.hostPlatform.isDarwin; + dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps; - nativeBuildInputs = [ - nodejs - pnpm - pnpmConfigHook - ]; + pythonRemoveDeps = [ + "apache-airflow" + ]; - pnpmDeps = fetchPnpmDeps { - pname = "simple-auth-manager-ui"; - inherit - sourceRoot - src - version - pnpm - ; - fetcherVersion = 3; - hash = "sha256-AKaafmDjIlg4eFJT1JGyelXVjcId8f0iXTR3JK4ZMq0="; - }; + pythonRelaxDeps = [ + "flit-core" + ]; + }; - buildPhase = '' - pnpm install - pnpm build - ''; - - installPhase = '' - mkdir -p $out/share/airflow/simple-ui - cp -r dist $out/share/airflow/simple-ui/ - ''; - }; - - requiredProviders = [ - "common_compat" - "common_io" - "common_sql" - "smtp" - "standard" - ]; - - providers = import ./providers.nix; - - buildProvider = - provider: - buildPythonPackage { - pname = "apache-airflow-providers-${provider}"; - version = providers.${provider}.version; + taskSdk = buildPythonPackage { + pname = "task-sdk"; + inherit src version; pyproject = true; - inherit src; - sourceRoot = "${src.name}/providers/${lib.replaceStrings [ "_" ] [ "/" ] provider}"; + sourceRoot = "${src.name}/task-sdk"; - buildInputs = [ flit-core ]; + postPatch = '' + # resolve cyclic dependency + sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml - dependencies = map (dep: python.pkgs.${dep}) providers.${provider}.deps; + # relax dependencies + sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml + sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml + sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml + sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - pythonRemoveDeps = [ - "apache-airflow" + # task-sdk needs config.yml from core subpackage + mkdir -p src/airflow/config_templates + cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/ + ''; + + build-system = [ + hatchling ]; - pythonRelaxDeps = [ - "flit-core" + dependencies = [ + asgiref + attrs + babel + colorlog + fsspec + greenback + httpx + isoduration + jinja2 + jsonschema + methodtools + msgspec + opentelemetry-api + pendulum + psutil + pydantic + pygtrie + python-dateutil + requests + retryhttp + structlog + tenacity + types-requests ]; }; - airflowCore = buildPythonPackage { - pname = "apache-airflow-core"; - inherit src version; + airflowCore = buildPythonPackage { + pname = "apache-airflow-core"; + inherit src version; + pyproject = true; + + sourceRoot = "${src.name}/airflow-core"; + + postPatch = '' + # remove cyclic dependency + sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml + + # relax dependencies + sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml + sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml + sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml + sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml + sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml + sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml + + # Copy built UI assets + cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/ + cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/ + ''; + + build-system = [ + gitdb + gitpython + hatchling + packaging + smmap + tomli + trove-classifiers + ]; + + dependencies = [ + a2wsgi + aiosqlite + alembic + argcomplete + asgiref + attrs + cachetools + cadwyn + colorlog + cron-descriptor + croniter + cryptography + deprecated + dill + fastapi + httpx + importlib-metadata + itsdangerous + jinja2 + jsonschema + lazy-object-proxy + libcst + linkify-it-py + lockfile + methodtools + msgspec + natsort + opentelemetry-api + opentelemetry-exporter-otlp + packaging + pathspec + pendulum + pluggy + psutil + pydantic + pygments + pygtrie + pyjwt + python-daemon + python-dateutil + python-slugify + pyyaml + requests + rich + rich-argparse + rich-click + setproctitle + sqlalchemy + sqlalchemy-jsonfield + sqlalchemy-utils + starlette + structlog + svcs + tabulate + taskSdk + tenacity + termcolor + typing-extensions + universal-pathlib + uuid6 + uvicorn + ] + ++ (map buildProvider requiredProviders); + + pythonRelaxDeps = [ "starlette" ]; + }; + in + { + pname = "apache-airflow"; + version = "3.3.0"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "airflow"; + tag = finalAttrs.version; + hash = "sha256-1DRaJCJ488BKUOEFaFMGnZjS2yxBx4pwHvIP67juu54="; + }; + pyproject = true; - sourceRoot = "${src.name}/airflow-core"; - postPatch = '' - # remove cyclic dependency - sed -i -E 's/"apache-airflow-task-sdk[^"]+",//' pyproject.toml - # relax dependencies sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"GitPython==[^"]+"/"GitPython"/' pyproject.toml sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"smmap==[^"]+"/"smmap"/' pyproject.toml sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - - # Copy built UI assets - cp -r ${airflowUi}/share/airflow/ui/dist src/airflow/ui/ - cp -r ${airflowSimpleAuthUi}/share/airflow/simple-ui/dist src/airflow/api_fastapi/auth/managers/simple/ui/ ''; + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + build-system = [ gitdb gitpython hatchling packaging + pathspec + pluggy smmap tomli trove-classifiers ]; dependencies = [ - a2wsgi - aiosqlite - alembic - argcomplete - asgiref - attrs - cachetools - cadwyn - colorlog - cron-descriptor - croniter - cryptography - deprecated - dill - fastapi - httpx - importlib-metadata - itsdangerous - jinja2 - jsonschema - lazy-object-proxy - libcst - linkify-it-py - lockfile - methodtools - msgspec - natsort - opentelemetry-api - opentelemetry-exporter-otlp - packaging - pathspec - pendulum - pluggy - psutil - pydantic - pygments - pygtrie - pyjwt - python-daemon - python-dateutil - python-slugify - pyyaml - requests - rich - rich-argparse - rich-click - setproctitle - sqlalchemy - sqlalchemy-jsonfield - sqlalchemy-utils - starlette - structlog - svcs - tabulate - taskSdk - tenacity - termcolor - typing-extensions - universal-pathlib - uuid6 - uvicorn + airflowCore # subpackage from airflow src + taskSdk # subpackage from airflow src ] - ++ (map buildProvider requiredProviders); + ++ (map buildProvider enabledProviders); - pythonRelaxDeps = [ "starlette" ]; - }; - - taskSdk = buildPythonPackage { - pname = "task-sdk"; - inherit src version; - pyproject = true; - - sourceRoot = "${src.name}/task-sdk"; - - postPatch = '' - # resolve cyclic dependency - sed -i -E 's/"apache-airflow-core[^"]+",//' pyproject.toml - - # relax dependencies - sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml - sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - - # task-sdk needs config.yml from core subpackage - mkdir -p src/airflow/config_templates - cp ../airflow-core/src/airflow/config_templates/* src/airflow/config_templates/ + postInstall = '' + # Create a symlink to the airflow-core package + mkdir -p $out/bin + ln -s ${airflowCore}/bin/airflow $out/bin/airflow ''; - build-system = [ - hatchling - ]; + installCheckPhase = '' + runHook preInstallCheck - dependencies = [ - asgiref - attrs - babel - colorlog - fsspec - greenback - httpx - jinja2 - jsonschema - methodtools - msgspec - pendulum - psutil - pydantic - pygtrie - python-dateutil - requests - retryhttp - structlog - tenacity - types-requests - ]; - }; + $out/bin/airflow version + $out/bin/airflow db reset -y -in -buildPythonPackage rec { - pname = "apache-airflow"; - inherit src version; - pyproject = true; + runHook postInstallCheck + ''; - postPatch = '' - # relax dependencies - sed -i -E 's/"hatchling==[^"]+"/"hatchling"/' pyproject.toml - sed -i -E 's/"packaging==[^"]+"/"packaging"/' pyproject.toml - sed -i -E 's/"trove-classifiers==[^"]+"/"trove-classifiers"/' pyproject.toml - sed -i -E 's/"pathspec==[^"]+"/"pathspec"/' pyproject.toml - ''; + pythonImportsCheck = [ + "airflow" + ] + ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders); - nativeBuildInputs = [ writableTmpDirAsHomeHook ]; + passthru.updateScript = ./update.sh; + passthru.airflowUi = airflowUi; + passthru.airflowSimpleAuthUi = airflowSimpleAuthUi; - build-system = [ - gitdb - gitpython - hatchling - packaging - pathspec - pluggy - smmap - tomli - trove-classifiers - ]; + # Note on testing the web UI: + # You can (manually) test the web UI as follows: + # + # nix shell .#apache-airflow + # airflow version + # airflow db reset # WARNING: this will wipe any existing db state you might have! + # airflow standalone + # + # Then navigate to the localhost URL using the credentials printed, try + # triggering the 'example_bash_operator' DAG and see if it reports success. - dependencies = [ - airflowCore # subpackage from airflow src - taskSdk # subpackage from airflow src - ] - ++ (map buildProvider enabledProviders); - - postInstall = '' - # Create a symlink to the airflow-core package - mkdir -p $out/bin - ln -s ${airflowCore}/bin/airflow $out/bin/airflow - ''; - - installCheckPhase = '' - runHook preInstallCheck - - $out/bin/airflow version - $out/bin/airflow db reset -y - - runHook postInstallCheck - ''; - - pythonImportsCheck = [ - "airflow" - ] - ++ lib.concatMap (provider: providers.${provider}.imports) (requiredProviders ++ enabledProviders); - - passthru.updateScript = ./update.sh; - passthru.airflowUi = airflowUi; - passthru.airflowSimpleAuthUi = airflowSimpleAuthUi; - - # Note on testing the web UI: - # You can (manually) test the web UI as follows: - # - # nix shell .#apache-airflow - # airflow version - # airflow db reset # WARNING: this will wipe any existing db state you might have! - # airflow standalone - # - # Then navigate to the localhost URL using the credentials printed, try - # triggering the 'example_bash_operator' DAG and see if it reports success. - - meta = { - description = "Platform to programmatically author, schedule and monitor workflows"; - homepage = "https://airflow.apache.org/"; - changelog = "https://airflow.apache.org/docs/apache-airflow/${version}/release_notes.html"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - taranarmo - ]; - mainProgram = "airflow"; - }; -} + meta = { + description = "Platform to programmatically author, schedule and monitor workflows"; + homepage = "https://airflow.apache.org/"; + changelog = "https://airflow.apache.org/docs/apache-airflow/${finalAttrs.version}/release_notes.html"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + taranarmo + ]; + mainProgram = "airflow"; + }; + } +) diff --git a/pkgs/by-name/ap/apache-airflow/update-providers.py b/pkgs/by-name/ap/apache-airflow/update-providers.py index 53293d9e60fa..e956992b566b 100755 --- a/pkgs/by-name/ap/apache-airflow/update-providers.py +++ b/pkgs/by-name/ap/apache-airflow/update-providers.py @@ -27,6 +27,7 @@ PKG_PREFERENCES = { "protobuf": "protobuf", "pydantic": "pydantic", "requests_toolbelt": "requests-toolbelt", + "setuptools": "setuptools", "sqlalchemy": "sqlalchemy", } diff --git a/pkgs/by-name/ap/apache-flex-sdk/package.nix b/pkgs/by-name/ap/apache-flex-sdk/package.nix index 4c5b18d5abe0..5d603721f3bb 100644 --- a/pkgs/by-name/ap/apache-flex-sdk/package.nix +++ b/pkgs/by-name/ap/apache-flex-sdk/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Flex SDK for Adobe Flash / ActionScript"; homepage = "https://flex.apache.org/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dywedir ]; }; }) diff --git a/pkgs/tools/networking/apc-temp-fetch/default.nix b/pkgs/by-name/ap/apc-temp-fetch/package.nix similarity index 73% rename from pkgs/tools/networking/apc-temp-fetch/default.nix rename to pkgs/by-name/ap/apc-temp-fetch/package.nix index 887421233df2..a1b4d2a48e5d 100644 --- a/pkgs/tools/networking/apc-temp-fetch/default.nix +++ b/pkgs/by-name/ap/apc-temp-fetch/package.nix @@ -1,27 +1,25 @@ { lib, - buildPythonApplication, + python3Packages, fetchPypi, - requests, - setuptools, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "apc-temp-fetch"; version = "0.0.2"; pyproject = true; src = fetchPypi { pname = "APC-Temp-fetch"; - inherit version; + inherit (finalAttrs) version; hash = "sha256-lXGj/xrOkdMMYvuyVVSCojjQlzISFUT14VTn//iOARo="; }; - build-system = [ + build-system = with python3Packages; [ setuptools ]; - dependencies = [ + dependencies = with python3Packages; [ requests ]; @@ -35,4 +33,4 @@ buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ap/apfel-llm/package.nix b/pkgs/by-name/ap/apfel-llm/package.nix index 9bbf1068d986..16c1143b869f 100644 --- a/pkgs/by-name/ap/apfel-llm/package.nix +++ b/pkgs/by-name/ap/apfel-llm/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "apfel-llm"; - version = "1.0.5"; + version = "1.8.4"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1 src = fetchurl { url = "https://github.com/Arthur-Ficial/apfel/releases/download/v${finalAttrs.version}/apfel-${finalAttrs.version}-arm64-macos.tar.gz"; - hash = "sha256-etEOYkYVPm08SRE3nuKcDigS7lCkUUgMacOl/sLv/1A="; + hash = "sha256-farvPPo3VU2qUat+72qaiMpcd9LwFO7kqzGGKKtPwGE="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ap/apftool-rs/package.nix b/pkgs/by-name/ap/apftool-rs/package.nix index e081bd0ade2c..5524b8dcf583 100644 --- a/pkgs/by-name/ap/apftool-rs/package.nix +++ b/pkgs/by-name/ap/apftool-rs/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "suyulin"; - repo = "apftool-rs"; + repo = "afptool-rs"; tag = "v${finalAttrs.version}"; hash = "sha256-bcXZIY0CDyWE3vh04IU3kXRxi/uUm5TD8ifA0jq47rc="; }; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "About Tools for Rockchip image unpack tool"; mainProgram = "apftool-rs"; - homepage = "https://github.com/suyulin/apftool-rs"; + homepage = "https://github.com/suyulin/afptool-rs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ colemickens ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ap/apg/package.nix b/pkgs/by-name/ap/apg/package.nix index 6e9f75e175fe..cff5c824551c 100644 --- a/pkgs/by-name/ap/apg/package.nix +++ b/pkgs/by-name/ap/apg/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation { pname = "apg"; - version = "unstable-2015-01-29"; + version = "2.3.0b-unstable-2015-01-29"; src = fetchFromGitHub { owner = "wilx"; diff --git a/pkgs/by-name/ap/apidog/package.nix b/pkgs/by-name/ap/apidog/package.nix index 31e2af072ddc..2fe2cfde48be 100644 --- a/pkgs/by-name/ap/apidog/package.nix +++ b/pkgs/by-name/ap/apidog/package.nix @@ -7,11 +7,11 @@ let pname = "apidog"; - version = "2.8.33"; + version = "2.8.38"; src = fetchurl { url = "https://file-assets.apidog.com/download/${version}/Apidog-${version}.AppImage"; - hash = "sha256-RimlzPkIAFmsTgtSBocZy4g2S3eCvGq/r993u0Gjj/4="; + hash = "sha256-7wKTMshEYwBCqQ4BQzETclSd3+26PN0SySyLzMgcO1U="; }; appimageContents = appimageTools.extract { diff --git a/pkgs/by-name/ap/apko/package.nix b/pkgs/by-name/ap/apko/package.nix index ba7921c90dc8..dc213d4ae94b 100644 --- a/pkgs/by-name/ap/apko/package.nix +++ b/pkgs/by-name/ap/apko/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "apko"; - version = "1.2.16"; + version = "1.2.27"; src = fetchFromGitHub { owner = "chainguard-dev"; repo = "apko"; tag = "v${finalAttrs.version}"; - hash = "sha256-RsUoolJ2WOs3wpQilAs6RfpR3YzOhzTvDaxuweErIKs="; + hash = "sha256-yu7DGFscciEVRshiUYHNo9QEggljbSOFLX/dl2LYsFU="; # 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 (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-cp29oB3YcqQljeLq4ySOMhV+CXYnQ+ZnDljHn0UzmWs="; + vendorHash = "sha256-4aQAnmmnwEPAZE/ph/xyQWcW+thfVX42dpFQq296Hf4="; excludedPackages = [ "internal/gen-jsonschema" diff --git a/pkgs/by-name/ap/apksigcopier/package.nix b/pkgs/by-name/ap/apksigcopier/package.nix index cd8aafdff6d3..ba13328dafff 100644 --- a/pkgs/by-name/ap/apksigcopier/package.nix +++ b/pkgs/by-name/ap/apksigcopier/package.nix @@ -76,7 +76,7 @@ python3.pkgs.buildPythonApplication rec { * compare two APKs with different signatures (requires apksigner) ''; homepage = "https://github.com/obfusk/apksigcopier"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ obfusk ]; }; } diff --git a/pkgs/by-name/ap/apm-cli/package.nix b/pkgs/by-name/ap/apm-cli/package.nix index d04b256b65e9..4730ddb4720a 100644 --- a/pkgs/by-name/ap/apm-cli/package.nix +++ b/pkgs/by-name/ap/apm-cli/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "apm-cli"; - version = "0.18.0"; + version = "0.21.0"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "microsoft"; repo = "apm"; tag = "v${finalAttrs.version}"; - hash = "sha256-mHu5r08y3OUTJjnl5Xvb23yhoJu9DupoZhkhL74K6UE="; + hash = "sha256-Wotyqsg/1nbjttMk+4wpGK76+kaL7j6oMH61NwsTuNc="; }; postPatch = '' diff --git a/pkgs/applications/graphics/apngasm/default.nix b/pkgs/by-name/ap/apngasm/package.nix similarity index 100% rename from pkgs/applications/graphics/apngasm/default.nix rename to pkgs/by-name/ap/apngasm/package.nix diff --git a/pkgs/applications/graphics/apngasm/2.nix b/pkgs/by-name/ap/apngasm_2/package.nix similarity index 94% rename from pkgs/applications/graphics/apngasm/2.nix rename to pkgs/by-name/ap/apngasm_2/package.nix index 0435ec6236a8..1699357fc5b0 100644 --- a/pkgs/applications/graphics/apngasm/2.nix +++ b/pkgs/by-name/ap/apngasm_2/package.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { env.NIX_CFLAGS_LINK = "-lzopfli"; installPhase = '' + runHook preInstall install -Dt $out/bin apngasm + runHook postInstall ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/ap/app2unit/package.nix b/pkgs/by-name/ap/app2unit/package.nix index 9208ca0f7e1f..97fea036f6a9 100644 --- a/pkgs/by-name/ap/app2unit/package.nix +++ b/pkgs/by-name/ap/app2unit/package.nix @@ -11,13 +11,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "app2unit"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Vladimir-csp"; repo = "app2unit"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-upYW+aTJ6LCHrI0+IOYnA98uDLKPxu/wCi7uUWe/Geg="; + sha256 = "sha256-jUAjcpR4IszvmqWAIjZo0rWZt9yydCe3xH4X+mJ5O8k="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch new file mode 100644 index 000000000000..0e43f12bcecb --- /dev/null +++ b/pkgs/by-name/ap/apparmor-init/fix-rc-apparmor-functions-FHS.patch @@ -0,0 +1,34 @@ +diff --git a/rc.apparmor.functions b/rc.apparmor.functions +index 96cb23d33..4401fc420 100644 +--- a/rc.apparmor.functions ++++ b/rc.apparmor.functions +@@ -31,7 +31,10 @@ + + # Some nice defines that we use + +-PARSER=/sbin/apparmor_parser ++PATH="@PATH@${PATH:+:$PATH}" ++export PATH ++ ++PARSER=$(command -v apparmor_parser) + PARSER_OPTS= + # Suppress warnings when booting in quiet mode + if [ "${QUIET:-no}" = yes ] || [ "${quiet:-n}" = y ]; then +@@ -50,7 +53,7 @@ ADDITIONAL_PROFILE_DIR= + if [ -n "$ADDITIONAL_PROFILE_DIR" ] && [ -d "$ADDITIONAL_PROFILE_DIR" ]; then + PROFILE_DIRS="$PROFILE_DIRS $ADDITIONAL_PROFILE_DIR" + fi +-AA_STATUS=/usr/sbin/aa-status ++AA_STATUS=$(command -v aa-status) + SECURITYFS=/sys/kernel/security + SFS_MOUNTPOINT="${SECURITYFS}/apparmor" + +@@ -91,7 +94,7 @@ is_container_with_internal_policy() { + local ns_name + + # WSL needs to be detected explicitly +- if [ -x /usr/bin/systemd-detect-virt ] && \ ++ if command -v systemd-detect-virt >/dev/null 2>&1 && \ + [ "$(systemd-detect-virt --container)" = "wsl" ]; then + return 0 + fi diff --git a/pkgs/by-name/ap/apparmor-init/package.nix b/pkgs/by-name/ap/apparmor-init/package.nix new file mode 100644 index 000000000000..0e95a3f13b47 --- /dev/null +++ b/pkgs/by-name/ap/apparmor-init/package.nix @@ -0,0 +1,94 @@ +{ + lib, + stdenv, + which, + replaceVars, + perl, + buildPackages, + runtimeShellPackage, + + # apparmor deps + libapparmor, + apparmor-bin-utils, + apparmor-parser, + + # runtime deps + gnused, + gnugrep, + systemd, + coreutils, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "apparmor-init"; + inherit (libapparmor) version src; + + sourceRoot = "${finalAttrs.src.name}/init"; + + patches = [ + (replaceVars ./fix-rc-apparmor-functions-FHS.patch { + PATH = lib.makeBinPath [ + # bash script needs a bunch of binaries, but we can't wrapProgram because it is more a library that will be used with `source` + apparmor-bin-utils + apparmor-parser + coreutils + gnused + gnugrep + systemd + ]; + }) + ]; + + postPatch = '' + patchShebangs . + + substituteInPlace apparmor.service \ + --replace-fail "/bin/true" "${lib.getExe' coreutils "true"}" + + # the various provided scripts hardcode /lib/apparmor + for FILE in aa-teardown apparmor.service apparmor.systemd profile-load + do + substituteInPlace "$FILE" \ + --replace-fail "/lib/apparmor" "$out/lib/apparmor" + done + ''; + + nativeBuildInputs = [ + which + perl + ]; + + buildInputs = [ + runtimeShellPackage + ]; + + makeFlags = [ + "POD2MAN=${lib.getExe' buildPackages.perl "pod2man"}" + "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" + "MANDIR=share/man" + ]; + + installFlags = [ + "DESTDIR=${placeholder "out"}" + "DISTRO=unknown" + "USR_SBINDIR=${placeholder "out"}/bin" + "SBINDIR=${placeholder "out"}/bin" + "LOCALEDIR=${placeholder "out"}/share/locale" + "SYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd/system" + ]; + + doCheck = true; + + installTargets = [ + "install" + # Likely not very useful for NixOS, as this is missing some NixOS awareness such as loading declarative profiles from the store + # However, the cost is low, it may be useful in the future or on non-NixOS systems, so install the systemd service too. + "install-systemd" + ]; + + strictDeps = true; + __structuredAttrs = true; + + meta = libapparmor.meta // { + description = "Mandatory access control system - init files"; + }; +}) diff --git a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh b/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh deleted file mode 100644 index ebc1baaa92d4..000000000000 --- a/pkgs/by-name/ap/apparmor-parser/fix-rc.apparmor.functions.sh +++ /dev/null @@ -1,32 +0,0 @@ -aa_action() { - STRING=$1 - shift - $* - rc=$? - if [ $rc -eq 0 ] ; then - aa_log_success_msg $"$STRING " - else - aa_log_failure_msg $"$STRING " - fi - return $rc -} - -aa_log_success_msg() { - [ -n "$1" ] && echo -n $1 - echo ": done." -} - -aa_log_warning_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Warning." -} - -aa_log_failure_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Failed." -} - -aa_log_skipped_msg() { - [ -n "$1" ] && echo -n $1 - echo ": Skipped." -} diff --git a/pkgs/by-name/ap/apparmor-parser/package.nix b/pkgs/by-name/ap/apparmor-parser/package.nix index 47927ab6477b..54076f01d675 100644 --- a/pkgs/by-name/ap/apparmor-parser/package.nix +++ b/pkgs/by-name/ap/apparmor-parser/package.nix @@ -6,10 +6,11 @@ bison, linuxHeaders ? stdenv.cc.libc.linuxHeaders, buildPackages, + zstd, + fetchpatch, # apparmor deps libapparmor, - apparmor-bin-utils, runtimeShellPackage, # testing @@ -27,11 +28,6 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace Makefile \ --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" - substituteInPlace rc.apparmor.functions \ - --replace-fail "/sbin/apparmor_parser" "$out/bin/apparmor_parser" # FIXME - substituteInPlace rc.apparmor.functions \ - --replace-fail "/usr/sbin/aa-status" "${lib.getExe' apparmor-bin-utils "aa-status"}" - sed -i rc.apparmor.functions -e '2i . ${./fix-rc.apparmor.functions.sh}' ''; nativeBuildInputs = [ @@ -42,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libapparmor + zstd runtimeShellPackage ]; @@ -54,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { "POD2HTML=${lib.getExe' buildPackages.perl "pod2html"}" "MANDIR=share/man" ] - ++ lib.optional finalAttrs.doCheck "PROVE=${lib.getExe' perl "prove"}"; + ++ lib.optional finalAttrs.finalPackage.doCheck "PROVE=${lib.getExe' perl "prove"}"; installFlags = [ "DESTDIR=$(out)" diff --git a/pkgs/by-name/ap/apparmor-profiles/package.nix b/pkgs/by-name/ap/apparmor-profiles/package.nix index db3c21009b4c..7ecb3ba5cb3c 100644 --- a/pkgs/by-name/ap/apparmor-profiles/package.nix +++ b/pkgs/by-name/ap/apparmor-profiles/package.nix @@ -1,7 +1,9 @@ { + lib, stdenv, which, callPackage, + python3, # apparmor deps libapparmor, @@ -28,9 +30,16 @@ stdenv.mkDerivation { apparmor-utils ]; + checkInputs = [ + python3 + ]; + preCheck = '' export USE_SYSTEM=1 export LOGPROF="aa-logprof --configdir ${callPackage ./test_config.nix { }} --no-check-mountpoint" + patchShebangs ../parser/tst + substituteInPlace ../parser/tst/test_profile.py \ + --replace-fail '../parser/apparmor_parser' '${lib.getExe apparmor-parser}' ''; doCheck = true; diff --git a/pkgs/by-name/ap/apparmor-teardown/package.nix b/pkgs/by-name/ap/apparmor-teardown/package.nix deleted file mode 100644 index f5c299b24d76..000000000000 --- a/pkgs/by-name/ap/apparmor-teardown/package.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ - writeShellApplication, - coreutils, - gnused, - gnugrep, - which, - - # apparmor deps - apparmor-parser, - apparmor-bin-utils, - libapparmor, -}: -writeShellApplication { - name = "apparmor-teardown"; - runtimeInputs = [ - apparmor-parser - apparmor-bin-utils - coreutils - gnused - gnugrep - which - ]; - - text = '' - set +e # the imported script tries to `read` an empty line - # shellcheck source=/dev/null - . ${apparmor-parser}/lib/apparmor/rc.apparmor.functions - remove_profiles - exit 0 - ''; - - inherit (libapparmor) meta; -} diff --git a/pkgs/by-name/ap/apparmor-utils/package.nix b/pkgs/by-name/ap/apparmor-utils/package.nix index ea1c275bdeb3..3ec57fde8ebe 100644 --- a/pkgs/by-name/ap/apparmor-utils/package.nix +++ b/pkgs/by-name/ap/apparmor-utils/package.nix @@ -11,8 +11,7 @@ buildPackages, # apparmor deps - apparmor-parser, - apparmor-teardown, + apparmor-init, }: let inherit (python3Packages) libapparmor; @@ -26,7 +25,7 @@ python3Packages.buildPythonApplication { cd utils substituteInPlace aa-remove-unknown \ - --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-parser}/lib/apparmor/rc.apparmor.functions" + --replace-fail "/lib/apparmor/rc.apparmor.functions" "${apparmor-init}/lib/apparmor/rc.apparmor.functions" substituteInPlace Makefile \ --replace-fail "/usr/include/linux/capability.h" "${linuxHeaders}/include/linux/capability.h" sed -i -E 's/^(DESTDIR|BINDIR|PYPREFIX)=.*//g' Makefile @@ -75,8 +74,6 @@ python3Packages.buildPythonApplication { postInstall = '' wrapProgram $out/bin/aa-remove-unknown \ --prefix PATH : ${lib.makeBinPath [ gawk ]} - - ln -s ${lib.getExe apparmor-teardown} $out/bin/aa-teardown ''; meta = libapparmor.meta // { diff --git a/pkgs/by-name/ap/appfire-cli/package.nix b/pkgs/by-name/ap/appfire-cli/package.nix index a4519d548f3d..3514e508ffa3 100644 --- a/pkgs/by-name/ap/appfire-cli/package.nix +++ b/pkgs/by-name/ap/appfire-cli/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { shellNames = { "x86_64-linux" = "bin/shell-linux-amd64"; "aarch64-linux" = "bin/shell-linux-arm64"; - "x86_64-darwin" = "bin/shell-macos-amd64"; "aarch64-darwin" = "bin/shell-macos-arm64"; }; # versionCheckHook cannot be used because appfire-cli requires $HOME to be set diff --git a/pkgs/by-name/ap/appflowy/package.nix b/pkgs/by-name/ap/appflowy/package.nix index fb368880b132..fd19b3534667 100644 --- a/pkgs/by-name/ap/appflowy/package.nix +++ b/pkgs/by-name/ap/appflowy/package.nix @@ -24,16 +24,15 @@ let dist = - rec { + { x86_64-linux = { urlSuffix = "linux-x86_64.tar.gz"; hash = "sha256-A8JUYzEMQH1sEKYrKZ84QZAgYbz0OvpHa3t9RIUVE9c="; }; - x86_64-darwin = { + aarch64-darwin = { urlSuffix = "macos-universal.zip"; hash = "sha256-LSNvFL1ud/FkzNSGk17ZqN2debnqsjlVDHd4NBjTds0="; }; - aarch64-darwin = x86_64-darwin; } ."${stdenvNoCC.hostPlatform.system}" or (throw "appflowy: No source for system: ${stdenvNoCC.hostPlatform.system}"); diff --git a/pkgs/by-name/ap/appgate-sdp/package.nix b/pkgs/by-name/ap/appgate-sdp/package.nix index baf8eca6ddf2..007ea35ad2e9 100644 --- a/pkgs/by-name/ap/appgate-sdp/package.nix +++ b/pkgs/by-name/ap/appgate-sdp/package.nix @@ -99,11 +99,11 @@ let in stdenv.mkDerivation rec { pname = "appgate-sdp"; - version = "6.4.2"; + version = "6.5.4"; src = fetchurl { url = "https://bin.appgate-sdp.com/${lib.versions.majorMinor version}/client/appgate-sdp_${version}_amd64.deb"; - sha256 = "sha256-xFpBC6X95C01wUfzJ3a0kMz898k6BItkpJLcUmfd7oY="; + sha256 = "sha256-tVHGAP90C4Jxz+Ur1hmlCmQ2tOtaSuIvAUQAqu6BKRw="; }; # just patch interpreter diff --git a/pkgs/by-name/ap/appindicator-sharp/package.nix b/pkgs/by-name/ap/appindicator-sharp/package.nix index f5f512103ecc..b61efe3c3176 100644 --- a/pkgs/by-name/ap/appindicator-sharp/package.nix +++ b/pkgs/by-name/ap/appindicator-sharp/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { version = "0-unstable-2016-01-18"; src = fetchFromGitHub { - owner = "stsundermann"; + owner = "sundermann"; repo = "appindicator-sharp"; rev = "5a79cde93da6d68a4b1373f1ce5796c3c5fe1b37"; sha256 = "sha256:1i0vqbp05l29f5v9ygp7flm4s05pcnn5ivl578mxmhb51s7ncw6l"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { meta = { description = "Bindings for appindicator using gobject-introspection"; - homepage = "https://github.com/stsundermann/appindicator-sharp"; + homepage = "https://github.com/sundermann/appindicator-sharp"; license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ kevincox ]; }; diff --git a/pkgs/by-name/ap/appium-inspector/package.nix b/pkgs/by-name/ap/appium-inspector/package.nix index 16cc3002081a..13616599a684 100644 --- a/pkgs/by-name/ap/appium-inspector/package.nix +++ b/pkgs/by-name/ap/appium-inspector/package.nix @@ -2,19 +2,23 @@ lib, buildNpmPackage, copyDesktopItems, - electron_40, + electron_41, fetchFromGitHub, makeDesktopItem, makeWrapper, nix-update-script, + _experimental-update-script-combinators, + writeShellApplication, + nix, + jq, }: let - electron = electron_40; - version = "2026.2.1"; + electron = electron_41; + version = "2026.5.1"; in -buildNpmPackage { +buildNpmPackage (finalAttrs: { pname = "appium-inspector"; inherit version; @@ -22,10 +26,10 @@ buildNpmPackage { owner = "appium"; repo = "appium-inspector"; tag = "v${version}"; - hash = "sha256-89u8MifBPh5AwaMFp+aGSzsiwp75Skca/t6OyDSzrGo="; + hash = "sha256-SJlTTVTZ/zGIK7Nf35cZ62tdhevXC95MsbiQJCLiVtk="; }; - npmDepsHash = "sha256-mwNn7TllWCtr4sif9Wc3FDtK2Icu72/iI+IllhBswHQ="; + npmDepsHash = "sha256-2rjgKS1mIrjOg+YXuMaqKyEQt0utLA4DGxOs0oI4BaQ="; npmFlags = [ "--ignore-scripts" ]; nativeBuildInputs = [ @@ -75,7 +79,25 @@ buildNpmPackage { }) ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { }) + (lib.getExe (writeShellApplication { + name = "${finalAttrs.pname}-electron-updater"; + runtimeInputs = [ + nix + jq + ]; + runtimeEnv = { + PNAME = finalAttrs.pname; + PKG_FILE = toString ./package.nix; + }; + text = '' + new_src="$(nix-build --attr "pkgs.$PNAME.src" --no-out-link)" + new_electron_major="$(jq -r '.devDependencies.electron | split(".")[0] | tonumber' "$new_src/package.json")" + sed -i -E "s/electron_[0-9]+/electron_$new_electron_major/g" "$PKG_FILE" + ''; + })) + ]; meta = { description = "GUI inspector for the appium UI automation tool"; @@ -86,4 +108,4 @@ buildNpmPackage { maintainers = with lib.maintainers; [ marie ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ap/apple-sdk/common/plists.nix b/pkgs/by-name/ap/apple-sdk/common/plists.nix index a79581e7767d..304f02c6ee4d 100644 --- a/pkgs/by-name/ap/apple-sdk/common/plists.nix +++ b/pkgs/by-name/ap/apple-sdk/common/plists.nix @@ -28,26 +28,24 @@ let # These files are all based off of Xcode spec files found in # /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/Library/Xcode/PrivatePlugIns/IDEOSXSupportCore.ideplugin/Contents/Resources. - # Based off of the "MacOSX Architectures.xcspec" file. All i386 stuff - # is removed because NixPkgs only supports darwin-x86_64 and darwin-arm64. + # Based off of the "MacOSX Architectures.xcspec" file. All x86 stuff + # is removed because Nixpkgs only supports aarch64-darwin. Architectures = [ { Identifier = "Standard"; Type = "Architecture"; - Name = "Standard Architectures (Apple Silicon, 64-bit Intel)"; + Name = "Standard Architectures (Apple Silicon)"; RealArchitectures = [ "arm64" - "x86_64" ]; ArchitectureSetting = "ARCHS_STANDARD"; } { Identifier = "Universal"; Type = "Architecture"; - Name = "Universal (Apple Silicon, 64-bit Intel)"; + Name = "Universal (Apple Silicon)"; RealArchitectures = [ "arm64" - "x86_64" ]; ArchitectureSetting = "ARCHS_STANDARD_32_64_BIT"; } @@ -60,17 +58,16 @@ let { Identifier = "Standard64bit"; Type = "Architecture"; - Name = "Apple Silicon, 64-bit Intel"; + Name = "Apple Silicon"; RealArchitectures = [ "arm64" - "x86_64" ]; ArchitectureSetting = "ARCHS_STANDARD_64_BIT"; } { Identifier = stdenvNoCC.hostPlatform.darwinArch; Type = "Architecture"; - Name = "Apple Silicon or Intel 64-bit"; + Name = "Apple Silicon"; } { Identifier = "Standard_Including_64_bit"; @@ -78,7 +75,6 @@ let Name = "Standard Architectures (including 64-bit)"; RealArchitectures = [ "arm64" - "x86_64" ]; ArchitectureSetting = "ARCHS_STANDARD_INCLUDING_64_BIT"; } diff --git a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix index f9551b5b9bad..f6e9cf4e2ef2 100644 --- a/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix +++ b/pkgs/by-name/ap/apple-sdk/common/propagate-inputs.nix @@ -48,17 +48,13 @@ in self: super: { # These packages are propagated only because other platforms include them in their libc (or otherwise by default). # Reducing the number of special cases required to support Darwin makes supporting it easier for package authors. - propagatedBuildInputs = - super.propagatedBuildInputs or [ ] - ++ [ - libiconv - darwin.libresolv - darwin.libsbuf - # Shipped with the SDK only as a library with no headers - (lib.getLib darwin.libutil) - ] - # x86_64-darwin links the object files from Csu when targeting very old releases - ++ lib.optionals stdenvNoCC.hostPlatform.isx86_64 [ darwin.Csu ]; + propagatedBuildInputs = super.propagatedBuildInputs or [ ] ++ [ + libiconv + darwin.libresolv + darwin.libsbuf + # Shipped with the SDK only as a library with no headers + (lib.getLib darwin.libutil) + ]; # The Darwin module for Swift requires certain headers to be included in the SDK (and not just be propagated). buildPhase = super.buildPhase or "" + '' diff --git a/pkgs/by-name/ap/apple-sdk/metadata/versions.json b/pkgs/by-name/ap/apple-sdk/metadata/versions.json index 3002a9226cc5..d655c7ebada9 100644 --- a/pkgs/by-name/ap/apple-sdk/metadata/versions.json +++ b/pkgs/by-name/ap/apple-sdk/metadata/versions.json @@ -17,10 +17,10 @@ }, "26": { "urls": [ - "https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg", - "https://web.archive.org/web/20260406133131/https://swcdn.apple.com/content/downloads/32/53/047-96692-A_OAHIHT53YB/ybtshxmrcju8m2qvw3w5elr4rajtg1x3y3/CLTools_macOSNMOS_SDK.pkg" + "https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg", + "https://web.archive.org/web/20260512015547/https://swcdn.apple.com/content/downloads/09/08/047-91568-A_Y1CFZWQCD4/4xekpyz43i26dbp4enxfro8eb1q7wiujh5/CLTools_macOSNMOS_SDK.pkg" ], - "version": "26.4", - "hash": "sha256-7nrbCv1pNlpzEqwZWVfUPCvDfXEJJNOl7ApkeFpIOC0=" + "version": "26.5", + "hash": "sha256-IkDNtiO7PP4GI6OszCNWE1Xb4iepCUKwQHYUyc9NgNA=" } } diff --git a/pkgs/by-name/ap/application-title-bar/package.nix b/pkgs/by-name/ap/application-title-bar/package.nix index 9e9d47d7e283..7bbec0256a79 100644 --- a/pkgs/by-name/ap/application-title-bar/package.nix +++ b/pkgs/by-name/ap/application-title-bar/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "application-title-bar"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "antroids"; repo = "application-title-bar"; tag = "v${finalAttrs.version}"; - hash = "sha256-UsAZaYA088nJWnVkT7Awcib3G3JUNTY0mA8ao+9m4d0="; + hash = "sha256-Zph+TwPXyf2r3PpJqWSdR0V9fFt2b2XWVfsAzuY3bP4="; }; propagatedUserEnvPkgs = with kdePackages; [ kconfig ]; diff --git a/pkgs/by-name/ap/apriltag/package.nix b/pkgs/by-name/ap/apriltag/package.nix index 8eddce4d34db..6438f8e3bac8 100644 --- a/pkgs/by-name/ap/apriltag/package.nix +++ b/pkgs/by-name/ap/apriltag/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "AprilRobotics"; - repo = "AprilTags"; + repo = "apriltag"; tag = "v${finalAttrs.version}"; hash = "sha256-pBUjRKfP884+bNgV5B4b8TiuhyZ9p/jIluxs+idv/28="; }; diff --git a/pkgs/by-name/ap/apt-offline/package.nix b/pkgs/by-name/ap/apt-offline/package.nix index 86a1be8b6343..e5fadb2c6740 100644 --- a/pkgs/by-name/ap/apt-offline/package.nix +++ b/pkgs/by-name/ap/apt-offline/package.nix @@ -55,7 +55,7 @@ python3Packages.buildPythonApplication { meta = { homepage = "https://github.com/rickysarraf/apt-offline"; description = "Offline APT package manager"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "apt-offline"; maintainers = [ ]; }; diff --git a/pkgs/by-name/ap/apt-swarm/package.nix b/pkgs/by-name/ap/apt-swarm/package.nix index a6e2617b87a4..c15d3ea6a693 100644 --- a/pkgs/by-name/ap/apt-swarm/package.nix +++ b/pkgs/by-name/ap/apt-swarm/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kpcyrd/apt-swarm"; changelog = "https://github.com/kpcyrd/apt-swarm/releases/tag/v${finalAttrs.version}"; mainProgram = "apt-swarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ kpcyrd ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ap/apt/package.nix b/pkgs/by-name/ap/apt/package.nix index ee0a854d6c20..670b90d7d8ff 100644 --- a/pkgs/by-name/ap/apt/package.nix +++ b/pkgs/by-name/ap/apt/package.nix @@ -108,7 +108,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://salsa.debian.org/apt-team/apt"; description = "Command-line package management tools used on Debian-based systems"; changelog = "https://salsa.debian.org/apt-team/apt/-/raw/${finalAttrs.version}/debian/changelog"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "apt"; maintainers = with lib.maintainers; [ VZstless ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ap/aptly/package.nix b/pkgs/by-name/ap/aptly/package.nix index 170332fc2c95..dfbd7332551b 100644 --- a/pkgs/by-name/ap/aptly/package.nix +++ b/pkgs/by-name/ap/aptly/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "aptly"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "aptly-dev"; repo = "aptly"; tag = "v${finalAttrs.version}"; - hash = "sha256-Jkljg05C4GJ4F9l6mKAU4JCH8I0/bjzfb74X714z4UI="; + hash = "sha256-fjNN8EffY9G8YX/uME5ehs2zZj/YRA62y/muqigWSnE="; }; - vendorHash = "sha256-3pFVAVvIpJut2YYxvnCQbBpdwwmUbZIyrx0WoQrU+nQ="; + vendorHash = "sha256-QPYKdiEiV1iS3xJ3A66ILUXAlj0TGXuGf11wzdX3Z7Y="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/aq/aquamarine/package.nix b/pkgs/by-name/aq/aquamarine/package.nix index 85cf20cc708b..70eabcf2a3fc 100644 --- a/pkgs/by-name/aq/aquamarine/package.nix +++ b/pkgs/by-name/aq/aquamarine/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, fetchFromGitHub, hwdata, @@ -21,15 +21,15 @@ wayland-protocols, wayland-scanner, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "aquamarine"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "aquamarine"; tag = "v${finalAttrs.version}"; - hash = "sha256-cUQENbJn0PHQUttXame5+PbGGew+BckHZFTfpb8XGI8="; + hash = "sha256-zF1iJkBQSDWmRO4/LEeHR1SpKY0lqZaxkoQJpPS9K9U="; }; nativeBuildInputs = [ @@ -63,6 +63,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { ]; cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch b/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch index 7d214afb41f2..7c79bb5538c4 100644 --- a/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch +++ b/pkgs/by-name/ar/arandr/gzip-timestamp-fix.patch @@ -1,7 +1,8 @@ ---- setup.py 2025-04-01 11:24:54.530984662 +0000 -+++ setup.py 2025-04-01 13:54:46.961341548 +0000 - -@@ -111,9 +111,11 @@ +diff --git a/setup.py b/setup.py +index 6e295c8..048db19 100755 +--- a/setup.py ++++ b/setup.py +@@ -111,9 +111,11 @@ class build_man(NoOptionCommand): info('compressing man page to %s', gzfile) if not self.dry_run: @@ -13,3 +14,6 @@ + compressed.write(manpage) + compressed.close() + file.close() + + class update_translator_credits(NoOptionCommand): + description = 'Examine the git history to produce an updated metadata file.' diff --git a/pkgs/by-name/ar/arandr/package.nix b/pkgs/by-name/ar/arandr/package.nix index f6216fb4f820..62a8233f73dc 100644 --- a/pkgs/by-name/ar/arandr/package.nix +++ b/pkgs/by-name/ar/arandr/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitLab, + fetchpatch, python3Packages, gobject-introspection, gsettings-desktop-schemas, @@ -30,19 +31,23 @@ buildPythonApplication (finalAttrs: { hash = "sha256-nQtfOKAnWKsy2DmvtRGJa4+Y9uGgX41BeHpd9m4d9YA="; }; - # patch to set mtime=0 on setup.py - patches = [ ./gzip-timestamp-fix.patch ]; - patchFlags = [ "-p0" ]; + patches = [ + # patch to set mtime=0 on setup.py + ./gzip-timestamp-fix.patch + + # fixes build with setuptools 81+, while keeping it backwards compatible + (fetchpatch { + name = "arandr-0.1.11-setuptools-81.patch"; + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/x11-misc/arandr/files/arandr-0.1.11-setuptools-81.patch"; + hash = "sha256-b9U8b4rdkN5lWDVpv50szaVS0rAZVSy7q6IXNVLvq3A="; + }) + ]; nativeBuildInputs = [ gobject-introspection wrapGAppsHook3 ]; - propagatedBuildInputs = [ - xrandr - ]; - buildInputs = [ gsettings-desktop-schemas gtk3 @@ -64,9 +69,13 @@ buildPythonApplication (finalAttrs: { dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") - ''; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ xrandr ]) + "\${gappsWrapperArgs[@]}" + ]; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/ar/aranym/package.nix b/pkgs/by-name/ar/aranym/package.nix index 3585c8938eb8..58ffd92cc258 100644 --- a/pkgs/by-name/ar/aranym/package.nix +++ b/pkgs/by-name/ar/aranym/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { and direct access to various host resources including sound, disk drives, optical storage devices (CD/DVD-ROMs), parallel port and more. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "aranym"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ar/arcanist/dont-require-python3-in-path.patch b/pkgs/by-name/ar/arcanist/dont-require-python3-in-path.patch new file mode 100644 index 000000000000..5bcecbf7961b --- /dev/null +++ b/pkgs/by-name/ar/arcanist/dont-require-python3-in-path.patch @@ -0,0 +1,26 @@ +Don't require python3 in PATH + +Once packaged, the arcanoid.py script has an absolute path shebang to +python3, so there is no need to also require python3 in PATH. + +This prevents leaking in a python3 in PATH in the environment which arc +runs linters etc. + +Author: bjorn.forsman@gmail.com +diff -uNr arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php arcanist.new/src/workflow/ArcanistAnoidWorkflow.php +--- arcanist.orig/src/workflow/ArcanistAnoidWorkflow.php 2022-03-31 13:23:30.865095192 +0200 ++++ arcanist.new/src/workflow/ArcanistAnoidWorkflow.php 2022-04-01 12:19:15.644159639 +0200 +@@ -24,13 +24,6 @@ + } + + protected function runWorkflow() { +- if (!Filesystem::binaryExists('python3')) { +- throw new PhutilArgumentUsageException( +- pht( +- 'The "arc anoid" workflow requires "python3" to be available '. +- 'in your $PATH.')); +- } +- + $support_dir = phutil_get_library_root('arcanist'); + $support_dir = dirname($support_dir); + $support_dir = $support_dir.'/support/'; diff --git a/pkgs/by-name/ar/arcanist/package.nix b/pkgs/by-name/ar/arcanist/package.nix new file mode 100644 index 000000000000..4c76f60e4fb6 --- /dev/null +++ b/pkgs/by-name/ar/arcanist/package.nix @@ -0,0 +1,102 @@ +{ + bison, + cacert, + fetchFromGitHub, + flex, + php, + lib, + stdenv, + installShellFiles, + which, + python3, +}: + +# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being +# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but +# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance +# anyway... So just do everything at once. +let + makeArcWrapper = toolset: '' + cat << WRAPPER > $out/bin/${toolset} + #!$shell -e + export PATH='${php}/bin:${which}/bin'\''${PATH:+':'}\$PATH + exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" + WRAPPER + chmod +x $out/bin/${toolset} + ''; + +in +stdenv.mkDerivation { + pname = "arcanist"; + version = "0-unstable-2026-07-19"; + + # The phorgeit fork is the maintained continuation of the upstream + # (archived) phacility/arcanist. + src = fetchFromGitHub { + owner = "phorgeit"; + repo = "arcanist"; + rev = "b084cd508f587aaa2ed6fef5e2cee163b4bdd259"; + hash = "sha256-8QxRCYF4gnuuOBO2lZm9bbfj0ApeqUobPy/MXfhH8zE="; + }; + + patches = [ + ./dont-require-python3-in-path.patch + ]; + + strictDeps = true; + __structuredAttrs = true; + + # python3 stays in buildInputs so patchShebangs resolves the + # arcanoid.py shebang; php also runs at build time (xhpast codegen). + buildInputs = [ python3 ]; + + nativeBuildInputs = [ + bison + flex + installShellFiles + php + ]; + + postPatch = lib.optionalString stdenv.isAarch64 '' + substituteInPlace support/xhpast/Makefile \ + --replace "-minline-all-stringops" "" + ''; + + buildPhase = '' + runHook preBuild + make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + make xhpast -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/bin $out/libexec + make install -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + make cleanall -C support/xhpast $makeFlags "''${makeFlagsArray[@]}" -j $NIX_BUILD_CORES + cp -R . $out/libexec/arcanist + ln -sf ${cacert}/etc/ssl/certs/ca-bundle.crt $out/libexec/arcanist/resources/ssl/default.pem + + ${makeArcWrapper "arc"} + ${makeArcWrapper "phage"} + + $out/bin/arc shell-complete --generate -- + installShellCompletion --cmd arc --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh + installShellCompletion --cmd phage --bash $out/libexec/arcanist/support/shell/rules/bash-rules.sh + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/arc help diff -- > /dev/null + $out/bin/phage help alias -- > /dev/null + ''; + + meta = { + description = "Command line interface to Phorge and Phabricator"; + homepage = "https://we.phorge.it/"; + license = lib.licenses.asl20; + platforms = lib.platforms.unix; + mainProgram = "arc"; + }; +} diff --git a/pkgs/by-name/ar/arcdps-log-manager/package.nix b/pkgs/by-name/ar/arcdps-log-manager/package.nix index 1ccbe05a2b3c..25243b0352c0 100644 --- a/pkgs/by-name/ar/arcdps-log-manager/package.nix +++ b/pkgs/by-name/ar/arcdps-log-manager/package.nix @@ -13,13 +13,13 @@ }: buildDotnetModule (finalAttrs: { pname = "arcdps-log-manager"; - version = "1.15.1"; + version = "1.16"; src = fetchFromGitHub { owner = "gw2scratch"; repo = "evtc"; tag = "manager-v${finalAttrs.version}"; - hash = "sha256-JevVLlWcPu0/inLjzsxyNCcwOTp1jwNMp/rZH9h1wO0="; + hash = "sha256-AiIWYb3hwkE20NdmAHlSt55QJ/d3NnQt3ZeX1COUG7k="; }; nugetDeps = ./deps.json; diff --git a/pkgs/by-name/ar/archisteamfarm/deps.json b/pkgs/by-name/ar/archisteamfarm/deps.json index 8cb93b2e0a54..472ce7eaee05 100644 --- a/pkgs/by-name/ar/archisteamfarm/deps.json +++ b/pkgs/by-name/ar/archisteamfarm/deps.json @@ -281,8 +281,8 @@ }, { "pname": "Markdig.Signed", - "version": "1.1.3", - "hash": "sha256-luLhgpC0d2ZTtvoSvaH/yaIc/IDppyf4P8M7sGbExJw=" + "version": "1.2.0", + "hash": "sha256-dC75KeDfJOretrOkaH1Ai/uEYWvxjBosn4NMEhD+LCo=" }, { "pname": "Microsoft.ApplicationInsights", @@ -291,8 +291,8 @@ }, { "pname": "Microsoft.AspNetCore.OpenApi", - "version": "10.0.7", - "hash": "sha256-WlAW49otxYzgrmuqHewUoBsjDcAZwhNz5WVbCT4EiIA=" + "version": "10.0.8", + "hash": "sha256-v2E7nwc4Nac8Ns5cQ2KmzLash9AEMbfQbMo2bFy7oZM=" }, { "pname": "Microsoft.CodeAnalysis.ResxSourceGenerator", @@ -431,23 +431,23 @@ }, { "pname": "Microsoft.Testing.Extensions.Telemetry", - "version": "2.2.2", - "hash": "sha256-4rXpgfroh8MnLWjYxUtYo/VcErYe9gpCaz80np3r1CI=" + "version": "2.2.3", + "hash": "sha256-e70IRoXt5Aiwhxwd6nay0SBQD3ESXcAGh0lCucNtCAE=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport", - "version": "2.2.2", - "hash": "sha256-IOgroCb3Wvwas4z2Xxy4ils5AswZpKT/wvjQM5e95ig=" + "version": "2.2.3", + "hash": "sha256-guXkeZ4AcbP9uu87/9IpSuZZdt03mFxShU/z2avv3oY=" }, { "pname": "Microsoft.Testing.Extensions.TrxReport.Abstractions", - "version": "2.2.2", - "hash": "sha256-aP+mw/Q5U6lfNmMJCzLqVMpZ+TnBMTqXH0VGhR2FvbI=" + "version": "2.2.3", + "hash": "sha256-eLb2Sm0lzQkgkdFdcZ76aIGShIf4lRPmpcMauUWN5QE=" }, { "pname": "Microsoft.Testing.Extensions.VSTestBridge", - "version": "2.2.2", - "hash": "sha256-rtyA0w70swCKfz+ly6ev/BlNXH8WUHurfxsaWoo1LbA=" + "version": "2.2.3", + "hash": "sha256-bSNPv1gAWEU7DVtqYS1qjbBN3lu9TTh6+/nDQCcIIHk=" }, { "pname": "Microsoft.Testing.Platform", @@ -456,13 +456,13 @@ }, { "pname": "Microsoft.Testing.Platform", - "version": "2.2.2", - "hash": "sha256-azYgL1c9oVE1JDYs0HUWTClaIumw1xvxgmNz4Mx0q30=" + "version": "2.2.3", + "hash": "sha256-Mz///qqkbdQsgpIjjAiHf/ptvjeQIsO6S99+tg+F8Fw=" }, { "pname": "Microsoft.Testing.Platform.MSBuild", - "version": "2.2.2", - "hash": "sha256-uuhiI0aGFpM+I2ASh99rsfsRhKf8b/JUNx4Hcd2Ac6Q=" + "version": "2.2.3", + "hash": "sha256-mwt+i2y8UV30JrssGCx9kgjcZ+upWhAxEBs5fCXA/6k=" }, { "pname": "Microsoft.TestPlatform.ObjectModel", @@ -476,23 +476,23 @@ }, { "pname": "MSTest", - "version": "4.2.2", - "hash": "sha256-hTD140FHBWOoUxKmCkmL261gvwgJRXnzAwSl37sp6XI=" + "version": "4.2.3", + "hash": "sha256-G6agMAoiK8oMPTpq25i7zsUXXCDxGMP/UBU72Wky9t0=" }, { "pname": "MSTest.Analyzers", - "version": "4.2.2", - "hash": "sha256-m6FRWUdYM9tuNnm7ehY+j1wIr2i12+0LeK5JcpJdp5M=" + "version": "4.2.3", + "hash": "sha256-XlSqWrZVG1nC/qDjNuSs51pM90nQ9QlQtwDKJQVsMPg=" }, { "pname": "MSTest.TestAdapter", - "version": "4.2.2", - "hash": "sha256-QFjHNHVyijmuq29MuhUNMnaWEcJWPWGVp21BQj0Hb7M=" + "version": "4.2.3", + "hash": "sha256-ckBpU7gg4LY2ZBPljRWz2yCj33vRf93Qm/JY7uGfeOs=" }, { "pname": "MSTest.TestFramework", - "version": "4.2.2", - "hash": "sha256-+yrzh3fmkvOMnqk+eYKQTC1267uKeUDcS3TV1+3Gnck=" + "version": "4.2.3", + "hash": "sha256-og5IO5g/fXm1y9hSNkqZ+libfD9o0dRm/8I9CF0J2So=" }, { "pname": "Newtonsoft.Json", @@ -586,8 +586,8 @@ }, { "pname": "Scalar.AspNetCore", - "version": "2.14.11", - "hash": "sha256-NOH8fyTW+uuvggup1581IwO1Gv1FyvpCQMsPWItBlwA=" + "version": "2.14.14", + "hash": "sha256-/9lh1yFvp8/ROxdQcJEhEtFwrpOCdRNwFfz8B53epVk=" }, { "pname": "SteamKit2", @@ -596,33 +596,33 @@ }, { "pname": "System.Composition", - "version": "10.0.7", - "hash": "sha256-+D0uPBsF3vIl1IU3DZ1aCWpdQompwSvyFLvxprUErAE=" + "version": "10.0.8", + "hash": "sha256-sp1IzwdxzVZwEF3mOCkobc5SYUGm/u3FDZUPkekoxZs=" }, { "pname": "System.Composition.AttributedModel", - "version": "10.0.7", - "hash": "sha256-PxE1IuviKGncIzrCFNqhqFMNzEdnN5/A9kFHSyvg4P4=" + "version": "10.0.8", + "hash": "sha256-6iUFdykgMj6yOG10qR3TOz6mrQnfDGsr4Q8WP65hBFU=" }, { "pname": "System.Composition.Convention", - "version": "10.0.7", - "hash": "sha256-oPAOsNnNF0tOXHZoxnQt7PC2R4f+iqmzYKg++zPCdaA=" + "version": "10.0.8", + "hash": "sha256-MIQePJ3OkWpA07U+xH1PwiV88WtSGBaTxUrA1j4hD6Y=" }, { "pname": "System.Composition.Hosting", - "version": "10.0.7", - "hash": "sha256-bBoobvUuurRqog2nqchZKTwkIn7Weq7M3auboVgwALA=" + "version": "10.0.8", + "hash": "sha256-SOAD0Yz8A/XJ8tEi7Q8DL9H7FzTcgg8HAbnZYKiyZNk=" }, { "pname": "System.Composition.Runtime", - "version": "10.0.7", - "hash": "sha256-sZTjqpSbbEy4KsRMDoEKvvfjHkl7IL9pcD2N8kFVWro=" + "version": "10.0.8", + "hash": "sha256-hRkoJ8S1oD4FKjnaDYwfzX2Pys6QvGiiX6YxrdGgAyA=" }, { "pname": "System.Composition.TypedParts", - "version": "10.0.7", - "hash": "sha256-gqDp0guxUnnEJaB6I/9PSgxXWDbE5YhyrTa9Yu4s0OM=" + "version": "10.0.8", + "hash": "sha256-NYo2dvMJ9WU0BKIGDkuIpFQHkbZE1sGJAtY8fINFpqo=" }, { "pname": "System.IO.Hashing", @@ -631,8 +631,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "10.0.7", - "hash": "sha256-IhiXDRoBQil9KAVV97PiCOhiIQCSTIJuKQOOfBECSz0=" + "version": "10.0.8", + "hash": "sha256-GYRQSkRnDWytMIQcoNrAVbJda5nzfbtg1HJuwRZVxH0=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/ar/archisteamfarm/package.nix b/pkgs/by-name/ar/archisteamfarm/package.nix index 6c2e113d99b5..81e766c324da 100644 --- a/pkgs/by-name/ar/archisteamfarm/package.nix +++ b/pkgs/by-name/ar/archisteamfarm/package.nix @@ -21,13 +21,13 @@ in buildDotnetModule rec { pname = "archisteamfarm"; # nixpkgs-update: no auto update - version = "6.3.6.0"; + version = "6.3.6.1"; src = fetchFromGitHub { owner = "JustArchiNET"; repo = "ArchiSteamFarm"; - rev = version; - hash = "sha256-S2T741eOO0s8a3pikHz0hy/PBPpw5fmtpzGv0cmRk0I="; + tag = version; + hash = "sha256-C0n3e/t1Bq02vlrF/KyT7vlhtNDIbAsg9zAk9aKZ5/g="; }; dotnet-runtime = dotnetCorePackages.aspnetcore_10_0; @@ -103,6 +103,7 @@ buildDotnetModule rec { meta = { description = "Application with primary purpose of idling Steam cards from multiple accounts simultaneously"; + changelog = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/tag/${src.tag}"; homepage = "https://github.com/JustArchiNET/ArchiSteamFarm"; license = lib.licenses.asl20; mainProgram = "ArchiSteamFarm"; diff --git a/pkgs/by-name/ar/archon-lite/package.nix b/pkgs/by-name/ar/archon-lite/package.nix new file mode 100644 index 000000000000..adc73facd7ad --- /dev/null +++ b/pkgs/by-name/ar/archon-lite/package.nix @@ -0,0 +1,47 @@ +{ + lib, + appimageTools, + fetchurl, + nix-update-script, +}: +let + pname = "archon-lite"; + version = "9.4.36"; + src = fetchurl { + url = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/download/v${version}/archon-lite-v${version}.AppImage"; + hash = "sha256-th48nSDIi2iugtiqjgkI7/QZtBq+BRQjRs1pKweDArI="; + }; + + extracted = appimageTools.extractType2 { inherit pname version src; }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/512x512/apps + cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'Archon App Lite.png' $out/share/icons/hicolor/512x512/apps/archon-lite.png + chmod -R +w $out/share/ + test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294 + cp ${extracted}/'Archon App Lite.desktop' $out/share/applications/archon-lite.desktop + substituteInPlace $out/share/applications/archon-lite.desktop \ + --replace-fail "Exec=AppRun --no-sandbox" "Exec=archon-lite" \ + --replace-fail "Icon=Archon App Lite" "Icon=archon-lite" + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Application for uploading MMORPG combat logs"; + homepage = "https://www.archon.gg/download"; + downloadPage = "https://github.com/RPGLogs/Uploaders-archon-lite/releases/tag/v${version}"; + license = lib.licenses.unfree; # no license listed + mainProgram = "archon-lite"; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + hekazu + sophiebsw + ]; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +} diff --git a/pkgs/by-name/ar/ardour/package.nix b/pkgs/by-name/ar/ardour/package.nix index 43de40a561a9..0659af469370 100644 --- a/pkgs/by-name/ar/ardour/package.nix +++ b/pkgs/by-name/ar/ardour/package.nix @@ -2,18 +2,22 @@ lib, stdenv, fetchgit, + fetchpatch, fetchzip, alsa-lib, + apple-sdk, aubio, boost, cairomm, cppunit, curl, + darwin, dbus, doxygen, ffmpeg, fftw, fftwSinglePrec, + fixDarwinDylibNames, flac, fluidsynth, glibc, @@ -21,6 +25,7 @@ graphviz, harvid, hidapi, + installShellFiles, itstool, kissfft, libarchive, @@ -59,6 +64,8 @@ taglib, vamp-plugin-sdk, wafHook, + which, + writableTmpDirAsHomeHook, xjadeo, libxrandr, libxinerama, @@ -66,12 +73,20 @@ optimize ? true, # disable to print Lua DSP script output to stdout videoSupport ? true, }: -stdenv.mkDerivation ( - finalAttrs: - let - majorVersion = lib.versions.major finalAttrs.version; - in - { +let + videoInputs = [ + harvid + xjadeo + ]; + + bundledContent = fetchzip { + url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip"; + hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A="; + # archive does not contain a single folder at the root + stripRoot = false; + }; + + generic = stdenv.mkDerivation (finalAttrs: { pname = "ardour"; version = "9.7"; @@ -83,13 +98,6 @@ stdenv.mkDerivation ( hash = "sha256-6gtlnk/oPXWJcN5tcb1r7dXyLpHPTSJwd8VfOjjFnWQ="; }; - bundledContent = fetchzip { - url = "https://web.archive.org/web/20221026200824/http://stuff.ardour.org/loops/ArdourBundledMedia.zip"; - hash = "sha256-IbPQWFeyMuvCoghFl1ZwZNNcSvLNsH84rGArXnw+t7A="; - # archive does not contain a single folder at the root - stripRoot = false; - }; - patches = [ # AS=as in the environment causes build failure https://tracker.ardour.org/view.php?id=8096 ./as-flags.patch @@ -100,16 +108,21 @@ stdenv.mkDerivation ( # Since they are not, let's generate the file manually. postPatch = '' printf '#include "libs/ardour/ardour/revision.h"\nnamespace ARDOUR { const char* revision = "${finalAttrs.version}"; const char* date = ""; }\n' > libs/ardour/revision.cc - sed 's|/usr/include/libintl.h|${glibc.dev}/include/libintl.h|' -i wscript patchShebangs ./tools/ substituteInPlace libs/ardour/video_tools_paths.cc \ - --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${ffmpeg}/bin/ffmpeg");' \ - --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${ffmpeg}/bin/ffprobe");' + --replace-fail 'ffmpeg_exe = X_("");' 'ffmpeg_exe = X_("${lib.getExe ffmpeg}");' \ + --replace-fail 'ffprobe_exe = X_("");' 'ffprobe_exe = X_("${lib.getExe' ffmpeg "ffprobe"}");' + '' + + lib.optionalString videoSupport '' + substituteInPlace libs/ardour/video_tools_paths.cc \ + --replace-fail 'harvid_exe = "";' 'harvid_exe ="${lib.getExe harvid}";' \ + --replace-fail 'xjadeo_exe = X_("");' 'xjadeo_exe = X_("${lib.getExe' xjadeo "xjremote"}");' ''; nativeBuildInputs = [ doxygen graphviz # for dot + installShellFiles itstool makeWrapper perl @@ -119,13 +132,11 @@ stdenv.mkDerivation ( ]; buildInputs = [ - alsa-lib aubio boost cairomm cppunit curl - dbus ffmpeg fftw fftwSinglePrec @@ -137,10 +148,10 @@ stdenv.mkDerivation ( kissfft libarchive libjack2 + libjpeg liblo libltc libogg - libpulseaudio librdf_rasqal libsamplerate libsigcxx @@ -148,7 +159,6 @@ stdenv.mkDerivation ( libusb1 libuv libwebsockets - libxi libxml2 libxslt lilv @@ -168,23 +178,14 @@ stdenv.mkDerivation ( suil taglib vamp-plugin-sdk - libxinerama - libjpeg - libxrandr ] - ++ lib.optionals videoSupport [ - harvid - xjadeo - ]; + ++ lib.optionals videoSupport videoInputs; wafConfigureFlags = [ "--cxx17" "--docs" - "--freedesktop" "--no-phone-home" "--ptformat" - "--run-tests" - "--test" # since we don't have https://github.com/agfline/LibAAF yet, # we need to use some of ardours internal libs, see: # https://discourse.ardour.org/t/ardour-8-2-released/109615/6 @@ -192,50 +193,36 @@ stdenv.mkDerivation ( # https://discourse.ardour.org/t/ardour-8-2-released/109615/8 # "--use-external-libs" ] + ++ lib.optional finalAttrs.finalPackage.doCheck "--test" ++ lib.optional optimize "--optimize"; env = { NIX_CFLAGS_COMPILE = toString [ # 'ioprio_set' syscall support: - "-D_GNU_SOURCE" # compiler doesn't find headers without these: - "-I${lib.getDev serd}/include/serd-0" - "-I${lib.getDev sratom}/include/sratom-0" - "-I${lib.getDev sord}/include/sord-0" + "-I${lib.getInclude serd}/include/serd-0" + "-I${lib.getInclude sratom}/include/sratom-0" + "-I${lib.getInclude sord}/include/sord-0" ]; LINKFLAGS = "-lpthread"; }; postInstall = '' - # wscript does not install these for some reason - install -vDm 644 "build/gtk2_ardour/ardour.xml" \ - -t "$out/share/mime/packages" - install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \ - -t "$out/share/applications" - for size in 16 22 32 48 256 512; do - install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ - "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png" - done - install -vDm 644 "ardour.1"* -t "$out/share/man/man1" + installManPage ardour.1 + ''; - # install additional bundled beats, chords and progressions - cp -rp "${finalAttrs.bundledContent}"/* "$out/share/ardour${majorVersion}/media" - '' - + lib.optionalString videoSupport '' - # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. - wrapProgram "$out/bin/ardour${majorVersion}" \ - --prefix PATH : "${ - lib.makeBinPath [ - harvid - xjadeo - ] - }" + doCheck = true; + + checkPhase = '' + runHook preHook + ./waf test + runHook postHook ''; meta = { description = "Multi-track hard disk recording software"; longDescription = '' - Ardour is a digital audio workstation (DAW), You can use it to + Ardour is a digital audio workstation (DAW), you can use it to record, edit and mix multi-track audio and midi. Produce your own CDs. Mix video soundtracks. Experiment with new ideas about music and sound. @@ -246,12 +233,148 @@ stdenv.mkDerivation ( homepage = "https://ardour.org/"; license = lib.licenses.gpl2Plus; mainProgram = "ardour9"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ magnetophon mitchmindtree ryand56 ]; }; - } -) + }); + + linux = generic.overrideAttrs ( + finalAttrs: + let + majorVersion = lib.versions.major finalAttrs.version; + in + { + postPatch = finalAttrs.postPatch + '' + sed 's|/usr/include/libintl.h|${lib.getInclude glibc.dev}/include/libintl.h|' -i wscript + ''; + + buildInputs = generic.buildInputs ++ [ + alsa-lib + dbus + libpulseaudio + libxi + libxinerama + libxrandr + ]; + + wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--freedesktop" ]; + env.NIX_CFLAGS_COMPILE = finalAttrs.env.NIX_CFLAGS_COMPILE + "-D_GNU_SOURCE"; + + postInstall = + finalAttrs.postInstall + + '' + # wscript does not install these for some reason + install -vDm 644 "build/gtk2_ardour/ardour.xml" \ + -t "$out/share/mime/packages" + install -vDm 644 "build/gtk2_ardour/ardour${majorVersion}.desktop" \ + -t "$out/share/applications" + for size in 16 22 32 48 256 512; do + install -vDm 644 "gtk2_ardour/resources/Ardour-icon_''${size}px.png" \ + "$out/share/icons/hicolor/''${size}x''${size}/apps/ardour${majorVersion}.png" + done + + # install additional bundled beats, chords and progressions + cp -rp "${bundledContent}"/* "$out/share/ardour${majorVersion}/media" + '' + + lib.optionalString videoSupport '' + # `harvid` and `xjadeo` must be accessible in `PATH` for video to work. + wrapProgram "$out/bin/ardour${majorVersion}" \ + --prefix PATH : "${lib.makeBinPath videoInputs}" + ''; + } + ); + + darwin' = generic.overrideAttrs ( + finalAttrs: + let + majorVersion = lib.versions.major finalAttrs.version; + in + { + patches = finalAttrs.patches ++ [ + (fetchpatch { + # TODO: Remove with the next release of Ardour + url = "https://github.com/Ardour/ardour/commit/bff1ebbca2f50f1a0d2285efcf6e0c8237a07d8f.diff"; + hash = "sha256-Ye22S2bmRt+c/GrrvgWCDlzUqSwaOdAh5vFuJb/BqV8="; + name = "fix-path-to-mo-files.diff"; + }) + ]; + + postPatch = finalAttrs.postPatch + '' + substituteInPlace wscript \ + --replace-fail '-DMAC_OS_X_VERSION_MAX_ALLOWED=110000' '-DMAC_OS_X_VERSION_MAX_ALLOWED=140000' \ + --replace-fail '-mmacosx-version-min=11.0' '-mmacosx-version-min=14' + + substituteInPlace libs/tk/y{d,t}k/wscript \ + --replace-fail "'-xobjective-c'" "'-xobjective-c', '-DDISABLE_VISIBILITY'" + + substituteInPlace tools/osx_packaging/osx_build \ + --replace-fail 'WITH_HARRISON_LV2=1' 'WITH_HARRISON_LV2=' \ + --replace-fail 'WITH_GMSYNTH=1' 'WITH_GMSYNTH=' \ + --replace-fail 'WITH_HARVID=1' 'WITH_HARVID=' \ + --replace-fail 'WITH_XJADEO=1' 'WITH_XJADEO=' \ + --replace-fail '`hostname`' 'localhost' \ + --replace-fail '`whoami`' 'nixbld' \ + --replace-fail '../../build' "$PWD/build" \ + --replace-fail 'echo "Building DMG ..."' 'exit 0' + ''; + + nativeBuildInputs = finalAttrs.nativeBuildInputs ++ [ + darwin.DarwinTools + fixDarwinDylibNames + which + writableTmpDirAsHomeHook + ]; + + buildInputs = finalAttrs.buildInputs ++ [ + apple-sdk + ]; + + wafBuildTargets = [ + "build" + "i18n" + ]; + + wafConfigureFlags = finalAttrs.wafConfigureFlags ++ [ "--with-backends=coreaudio,jack,dummy" ]; + + postBuild = '' + # NOTE: The .so files are symlinks to the actual .dylib files. + install_name_tool \ + -change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \ + -change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \ + "build/gtk2_ardour/ardour-${finalAttrs.version}.0" + + ( + cd tools/osx_packaging + ./osx_build --public + ) + ''; + + preCheck = '' + # NOTE: The .so files are symlinks to the actual .dylib files. + install_name_tool \ + -change libvamp-sdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-sdk.so" \ + -change libvamp-hostsdk.so "${lib.getLib vamp-plugin-sdk}/lib/libvamp-hostsdk.so" \ + "build/libs/audiographer/run-tests" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out"/{Applications,bin} + mv "tools/osx_packaging/Ardour/Ardour${majorVersion}.app/" "$out/Applications/" + ln -s "$out/Applications/Ardour${majorVersion}.app/Contents/MacOS/Ardour${majorVersion}" \ + "$out/bin/ardour${majorVersion}" + + # install additional bundled beats, chords and progressions + cp -rp "${bundledContent}"/* "$out/Applications/Ardour${majorVersion}.app/Contents/Resources/media" + + runHook postInstall + ''; + } + ); +in +if stdenv.hostPlatform.isLinux then linux else darwin' diff --git a/pkgs/by-name/ar/arduino-cli/package.nix b/pkgs/by-name/ar/arduino-cli/package.nix index e13ab6f12ba1..59ae9d870d4d 100644 --- a/pkgs/by-name/ar/arduino-cli/package.nix +++ b/pkgs/by-name/ar/arduino-cli/package.nix @@ -5,25 +5,28 @@ fetchFromGitHub, buildFHSEnv, installShellFiles, + makeWrapper, writableTmpDirAsHomeHook, go-task, + python3, }: let pkg = buildGoModule (finalAttrs: { pname = "arduino-cli"; - version = "1.4.1"; + version = "1.5.1"; src = fetchFromGitHub { owner = "arduino"; repo = "arduino-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-2m0V7yj6C7Lvlu9RaM54pbGKSwrek6WYuwH1yqYHdB0="; + hash = "sha256-MZX6ERZwmfiJMqx6mQ0qAfv1dbXunTYHRbdzyoinOJY="; }; nativeBuildInputs = [ installShellFiles + makeWrapper writableTmpDirAsHomeHook ]; @@ -31,7 +34,7 @@ let subPackages = [ "." ]; - vendorHash = "sha256-5bkaHEzQ2gLV1epkScbCf1qv5XeuewLwqNcpPCSdbh4="; + vendorHash = "sha256-j5SpZnBWcC8K8lHgc5HOCbGD3DdHr9tVtEhXWTCCogk="; postPatch = let @@ -67,7 +70,10 @@ let ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "-extldflags '-static'" ]; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + postInstall = '' + wrapProgram $out/bin/arduino-cli --prefix PATH : ${lib.makeBinPath [ python3 ]} + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd arduino-cli \ --bash <($out/bin/arduino-cli completion bash) \ --zsh <($out/bin/arduino-cli completion zsh) \ diff --git a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix index b450b1137833..67722d2b081a 100644 --- a/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix +++ b/pkgs/by-name/ar/arduino-core-unwrapped/downloads.nix @@ -156,29 +156,6 @@ }; } -// optionalAttrs (system == "x86_64-darwin") { - "build/arduino-builder-macosx-1.6.1-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduino-builder-macosx-1.6.1-signed.tar.bz2"; - sha256 = "sha256-icMXwovzT2UQAKry9sWyRvcNxPXaFdltAPyW/DDVEFA="; - }; - "build/macosx/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avr-gcc-7.3.0-atmel3.6.1-arduino5-x86_64-apple-darwin14-signed.tar.bz2"; - sha256 = "0lcnp525glnc2chcynnz2nllm4q6ar4n9nrjqd1jbj4m706zbv67"; - }; - "build/macosx/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/avrdude-6.3.0-arduino17-x86_64-apple-darwin12-signed.tar.bz2"; - sha256 = "1m24dci8mjf70yrf033mp1834pbp870m8sns2jxs3iy2i4qviiki"; - }; - "build/linux/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2" = fetchurl { - url = "https://downloads.arduino.cc/tools/arduinoOTA-1.3.0-darwin_amd64-signed.tar.bz2"; - sha256 = "12pwfnikq3z3ji5wgjhzx1mfyaha5cym7mr63r8kfl5a85fhk8nz"; - }; - "build/macosx/appbundler/appbundler-1.0ea-arduino5.jar.zip" = fetchurl { - url = "https://downloads.arduino.cc/appbundler-1.0ea-arduino5.jar.zip"; - sha256 = "1ims951z7ajprqms7yd8ll83c79n7krhd9ljw30yn61f6jk46x82"; - }; -} - // optionalAttrs (system == "aarch64-linux") { "build/arduino-builder-linuxaarch64-1.6.1.tar.bz2" = fetchurl { url = "https://downloads.arduino.cc/tools/arduino-builder-linuxaarch64-1.6.1.tar.bz2"; diff --git a/pkgs/by-name/ar/arftracksat/package.nix b/pkgs/by-name/ar/arftracksat/package.nix index 38c1f53cd6c7..dfcd43bfab62 100644 --- a/pkgs/by-name/ar/arftracksat/package.nix +++ b/pkgs/by-name/ar/arftracksat/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation { pname = "arftracksat"; - version = "unstable-2025-09-15"; + version = "1.0-unstable-2026-02-19"; src = fetchFromGitHub { owner = "arf20"; repo = "arftracksat"; - rev = "5c9b3866b6fcd95382ff56c68cdd38f3d08c1372"; - hash = "sha256-inCgsxrJkBNGmdGPd28XnOJYCiatL35TxDcfvZjA2cY="; + rev = "a9b86878e2ee6f332dc1df07685b7d20970c2f7e"; + hash = "sha256-guDgy4H0pnQCihYwG7HoKApOlEcDtcaRaj6fRuVdLlc="; }; nativeBuildInputs = [ @@ -35,11 +35,13 @@ stdenv.mkDerivation { buildInputs = [ curl nlohmann_json + curlpp + glm + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ freeglut libGL libGLU - curlpp - glm ]; meta = { diff --git a/pkgs/by-name/ar/argc/package.nix b/pkgs/by-name/ar/argc/package.nix index 845c341a2a5f..f038fec73678 100644 --- a/pkgs/by-name/ar/argc/package.nix +++ b/pkgs/by-name/ar/argc/package.nix @@ -42,9 +42,9 @@ rustPlatform.buildRustPackage (finalAttrs: { env = { LANG = "C.UTF-8"; - } - // lib.optionalAttrs (glibcLocales != null) { - LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + LOCALE_ARCHIVE = lib.optionalString ( + finalAttrs.finalPackage.doInstallCheck && glibcLocales != null + ) "${glibcLocales}/lib/locale/locale-archive"; }; doInstallCheck = true; @@ -55,14 +55,7 @@ rustPlatform.buildRustPackage (finalAttrs: { updateScript = nix-update-script { }; tests = { cross = - ( - if stdenv.hostPlatform.isDarwin then - if stdenv.hostPlatform.isAarch64 then pkgsCross.x86_64-darwin else pkgsCross.aarch64-darwin - else if stdenv.hostPlatform.isAarch64 then - pkgsCross.gnu64 - else - pkgsCross.aarch64-multiplatform - ).argc; + (if stdenv.hostPlatform.isAarch64 then pkgsCross.gnu64 else pkgsCross.aarch64-multiplatform).argc; }; }; diff --git a/pkgs/by-name/ar/argo-rollouts/package.nix b/pkgs/by-name/ar/argo-rollouts/package.nix index 0198edfeb7b6..3efd79cde0b3 100644 --- a/pkgs/by-name/ar/argo-rollouts/package.nix +++ b/pkgs/by-name/ar/argo-rollouts/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "argo-rollouts"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-rollouts"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-qpTilslCu9rmBVMo73lHnKD8NPxLHSzeBwkWhEB4If4="; + sha256 = "sha256-DQD4tQ3NrmTujHlf23PHW88z0cY3gM5GCkv3s4/D6wg="; }; - vendorHash = "sha256-bF4jIEEG5DFhtDdy8LwK6SfE5OdyUsDjOIbAddvb5V8="; + vendorHash = "sha256-HFpleG5e+F0cclAY37mJnf+g188WlOl6sQaINhuuToE="; # Disable tests since some test fail because of missing test data doCheck = false; diff --git a/pkgs/by-name/ar/argocd/package.nix b/pkgs/by-name/ar/argocd/package.nix index 4b2c2e630c48..b39cc55f242b 100644 --- a/pkgs/by-name/ar/argocd/package.nix +++ b/pkgs/by-name/ar/argocd/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "argocd"; - version = "3.3.6"; + version = "3.4.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; tag = "v${finalAttrs.version}"; - hash = "sha256-84GlX9m1+Af9EPPdvLJcZIqhw7a1DBj1xKmUpNnngbk="; + hash = "sha256-hM7ss948dr7KntUGwiFDhr1OrbI+LAJlDgUMnegm+es="; }; ui = stdenv.mkDerivation { @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/ui/yarn.lock"; - hash = "sha256-kqBolkQiwZUBic0f+Ek5HwYsOmro1+FStkDLXAre79o="; + hash = "sha256-/B7FviD0a3VDmbbM59Ksmr8apuTRHrRbTtfX4QgO8JM="; }; nativeBuildInputs = [ @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-ABhvLf1wZm/2WdkzMOBBK/mycSjX+6/kKc0VcUhxvok="; + vendorHash = "sha256-yzVSMdupFdrYUWMCPFhiYTnjCDGZo4Se0osXbCvB7gM="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile diff --git a/pkgs/by-name/ar/ariang/package.nix b/pkgs/by-name/ar/ariang/package.nix index 45ec0b597869..2b7b512c648f 100644 --- a/pkgs/by-name/ar/ariang/package.nix +++ b/pkgs/by-name/ar/ariang/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + nodejs_22, buildNpmPackage, copyDesktopItems, imagemagick, @@ -10,16 +11,18 @@ buildNpmPackage rec { pname = "ariang"; - version = "1.3.13"; + version = "1.3.14"; src = fetchFromGitHub { owner = "mayswind"; repo = "AriaNg"; tag = version; - hash = "sha256-u4MnjGMvnnb9EGHwK2QYpW7cuX1e1+6z2/1X1baR8iA="; + hash = "sha256-wPFZGNqVveDj9Dh0QSxyy93K7G91CACD4RzmgjaRxjI="; }; - npmDepsHash = "sha256-kxoSEdM8H7M9s6U2dtCdfuvqVROEk35jAkO7MgyVVRg="; + nodejs = nodejs_22; + + npmDepsHash = "sha256-D+yqIDeJki0h6bT8eia8W8Xbokjgl4nlBXLApfhMwVc="; makeCacheWritable = true; diff --git a/pkgs/by-name/ar/aritim-dark/package.nix b/pkgs/by-name/ar/aritim-dark/package.nix index e57692cddc64..eef426f95c26 100644 --- a/pkgs/by-name/ar/aritim-dark/package.nix +++ b/pkgs/by-name/ar/aritim-dark/package.nix @@ -6,7 +6,7 @@ stdenvNoCC.mkDerivation { pname = "aritim-dark"; - version = "unstable-2021-12-29"; + version = "0.7-unstable-2021-12-29"; src = fetchFromGitHub { owner = "Mrcuve0"; @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dark theme deeply inspired by the Ayu Dark color palette"; homepage = "https://github.com/Mrcuve0/Aritim-Dark"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.pasqui23 ]; }; diff --git a/pkgs/by-name/ar/ark-pixel-font/package.nix b/pkgs/by-name/ar/ark-pixel-font/package.nix index 57222b4739ea..e458a9c6ca95 100644 --- a/pkgs/by-name/ar/ark-pixel-font/package.nix +++ b/pkgs/by-name/ar/ark-pixel-font/package.nix @@ -1,11 +1,11 @@ { lib, - python312Packages, + python3Packages, fetchFromGitHub, nix-update-script, }: -python312Packages.buildPythonPackage rec { +python3Packages.buildPythonApplication rec { pname = "ark-pixel-font"; version = "2025.08.24"; pyproject = false; @@ -17,7 +17,7 @@ python312Packages.buildPythonPackage rec { hash = "sha256-kxct994UmZhJBMlXZmayN24eiKqeG9T7GdyfsjBYpn0="; }; - dependencies = with python312Packages; [ + dependencies = with python3Packages; [ pixel-font-builder pixel-font-knife unidata-blocks diff --git a/pkgs/by-name/ar/ark/package.nix b/pkgs/by-name/ar/ark/package.nix new file mode 100644 index 000000000000..fbdbed890c23 --- /dev/null +++ b/pkgs/by-name/ar/ark/package.nix @@ -0,0 +1,55 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cmake, + makeBinaryWrapper, + R, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ark"; + version = "0.1.252"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "posit-dev"; + repo = "ark"; + rev = finalAttrs.version; + hash = "sha256-AI8i15UMI+KSmweXkS/UYITZBOEDx/knjpK9SA2M+Ns="; + }; + + cargoHash = "sha256-z9l0dgmZO6f63I/2pms4VMXMxO/9SAZSq1OFubGHIpw="; + + # The amalthea crate bundles libzmq via the zeromq-src crate, which builds it + # with CMake. + nativeBuildInputs = [ + cmake + makeBinaryWrapper + ]; + + # Only build the `ark` binary, not the whole workspace's test/dev crates. + cargoBuildFlags = [ + "--package" + "ark" + ]; + + # Tests require a running R installation and network access. + doCheck = false; + + # Ark loads R dynamically at runtime, locating it via `R_HOME` or by running + # `R RHOME`. Put R on PATH so the kernel works out of the box. + postInstall = '' + wrapProgram $out/bin/ark \ + --suffix PATH : ${lib.makeBinPath [ R ]} + ''; + + meta = { + description = "R kernel for Jupyter applications, powering Positron's R support"; + homepage = "https://github.com/posit-dev/ark"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thomasjm ]; + mainProgram = "ark"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ar/arkade/package.nix b/pkgs/by-name/ar/arkade/package.nix index 4dd3a215bf2f..6ce53bb48d26 100644 --- a/pkgs/by-name/ar/arkade/package.nix +++ b/pkgs/by-name/ar/arkade/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "arkade"; - version = "0.11.95"; + version = "0.11.113"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; tag = finalAttrs.version; - hash = "sha256-iVWpSXCVK+FMTQiJC0Ar9HlL/7RA8pWv/UHN+TBQJGg="; + hash = "sha256-8T7gYaT52L4Xnbuxvi9GayQ1qfI5U2cphSIkRGqx5Go="; }; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ar/armitage/package.nix b/pkgs/by-name/ar/armitage/package.nix index 1d384ca08e51..286fc11eacb0 100644 --- a/pkgs/by-name/ar/armitage/package.nix +++ b/pkgs/by-name/ar/armitage/package.nix @@ -15,7 +15,7 @@ let pname = "armitage"; - version = "unstable-2022-12-05"; + version = "1.0-unstable-2022-12-05"; src = fetchFromGitHub { owner = "r00t0v3rr1d3"; diff --git a/pkgs/by-name/ar/arnis/package.nix b/pkgs/by-name/ar/arnis/package.nix index 71ce5b416a5e..90295a807a89 100644 --- a/pkgs/by-name/ar/arnis/package.nix +++ b/pkgs/by-name/ar/arnis/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "arnis"; - version = "2.8.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "louis-e"; repo = "arnis"; tag = "v${finalAttrs.version}"; - hash = "sha256-hNVECK6+I3ML/knsBdvEx2Uz1w4jXHynanlQfgrM9oM="; + hash = "sha256-mdBicZIHonfVs2r6eNRNdpr8saZ54k1m0czWRqBYvq4="; }; - cargoHash = "sha256-Kff+76lZ6hsSbssYhrupmE2xAt1gwia8sMZR15ReqgU="; + cargoHash = "sha256-G0lEKjF9xNF4zs/+yf/8fvZTRZOH6IGud0tpEB86IXE="; nativeBuildInputs = [ cargo-tauri.hook diff --git a/pkgs/by-name/ar/arouteserver/package.nix b/pkgs/by-name/ar/arouteserver/package.nix index 465367e1db1b..3a5999b6ead6 100644 --- a/pkgs/by-name/ar/arouteserver/package.nix +++ b/pkgs/by-name/ar/arouteserver/package.nix @@ -60,7 +60,7 @@ python3Packages.buildPythonPackage rec { mainProgram = "arouteserver"; homepage = "https://github.com/pierky/arouteserver"; changelog = "https://github.com/pierky/arouteserver/blob/v${version}/CHANGES.rst"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ marcel johannwagner diff --git a/pkgs/by-name/ar/arpa2-leaf/package.nix b/pkgs/by-name/ar/arpa2-leaf/package.nix index 3881c6094014..1b8f9157e0a7 100644 --- a/pkgs/by-name/ar/arpa2-leaf/package.nix +++ b/pkgs/by-name/ar/arpa2-leaf/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + gitUpdater, cmake, arpa2cm, quickder, @@ -14,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { # leaf is already used pname = "arpa2-leaf"; - version = "0.2"; + version = "0.3"; src = fetchFromGitLab { owner = "arpa2"; repo = "leaf"; tag = "v${finalAttrs.version}"; - hash = "sha256-s52gtxM+BmG7oVrB5F0ORjkb4F3fWONiOxIWdDn2P5k="; + hash = "sha256-I2fJ3QkVFRRk9VVSQd0UKl01NDTYo9UGVhrL/mdy0vE="; }; strictDeps = true; @@ -37,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { lillydap ]; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { description = "LDAP Extended Attribute Filter"; diff --git a/pkgs/by-name/ar/arping/package.nix b/pkgs/by-name/ar/arping/package.nix index ccd012595cdd..061f16a80645 100644 --- a/pkgs/by-name/ar/arping/package.nix +++ b/pkgs/by-name/ar/arping/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "arping"; - version = "2.28"; + version = "2.29"; src = fetchFromGitHub { owner = "ThomasHabets"; repo = "arping"; tag = "arping-${finalAttrs.version}"; - hash = "sha256-SS4z/aGu1qpTG1k4Cbj1TlC2kHRrP+7HRQyrIX2Xc/E="; + hash = "sha256-ClbSrV+TjdkvJ2KfchDkjG8c3KotqNkGnoRBy33Bx1o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ar/arpoison/package.nix b/pkgs/by-name/ar/arpoison/package.nix index c75964942e7b..7f3228a9888b 100644 --- a/pkgs/by-name/ar/arpoison/package.nix +++ b/pkgs/by-name/ar/arpoison/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "UNIX arp cache update utility"; homepage = "http://www.arpoison.net/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.unix; mainProgram = "arpoison"; diff --git a/pkgs/by-name/ar/arrow-adbc/package.nix b/pkgs/by-name/ar/arrow-adbc/package.nix new file mode 100644 index 000000000000..eb631d4b920c --- /dev/null +++ b/pkgs/by-name/ar/arrow-adbc/package.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + fetchFromGitHub, + buildGoModule, + + # nativeBuildInputs + cmake, + pkg-config, + + # buildInputs + nanoarrow, + fmt, + gtest, + libpq, + sqlite, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "arrow-adbc"; + version = "23"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "arrow-adbc"; + tag = "apache-arrow-adbc-${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-33JUx4ZI+BHIZMvlCO43mjU34zShJZGQpAkqRrvgl2w="; + }; + + vendorHash = "sha256-uGxCTllRNtXkrl31d88TOK36X09ylo++gtorx0uFR8A="; + + # We are building the C project + preConfigure = '' + cd c/ + ''; + # Upstream's build invoces a custom `go build` command to build one of the + # targets. We use buildGoModule's engineering to supply it the offline + # `goModules` path and other GO[A-Z] environment variables. Ideally, there + # should be setup hooks for the mechanisms of buildGoModule, that would make + # it easier. + modRoot = "../../go/adbc"; + inherit (finalAttrs.finalPackage.passthru.bigquery-go-package) goModules; + preBuild = + (lib.pipe finalAttrs.finalPackage.passthru.bigquery-go-package.configurePhase [ + # Make that this configure phase doesn't run our configure hooks. + (lib.replaceString "runHook preConfigure" "") + (lib.replaceString "runHook postConfigure" "") + ]) + # Return to original meson build directory. + + '' + cd ../../c/build + ''; + + nativeBuildInputs = [ + # NOTE that the meson build system has a bug that it puts a few shared + # objects in $out and not in $out/lib. + cmake + pkg-config + finalAttrs.finalPackage.passthru.bigquery-go-package.passthru.go + ]; + + cmakeFlags = map (driver: lib.cmakeBool "ADBC_DRIVER_${driver}" true) [ + "BIGQUERY" + "FLIGHTSQL" + "MANAGER" + "POSTGRESQL" + "SNOWFLAKE" + "SQLITE" + ]; + + buildInputs = [ + fmt + gtest + libpq + nanoarrow + sqlite + ]; + + passthru = { + bigquery-go-package = buildGoModule (finalGoAttrs: { + inherit (finalAttrs) + pname + version + src + vendorHash + ; + sourceRoot = "${finalAttrs.src.name}/go/adbc"; + # This derivation is not really evaluated anyway, but it is used to + # update the vendorHash... TODO: Check that nix-update is capable of + # updating vendorHash automatically. + dontBuild = true; + dontInstall = true; + }); + }; + + meta = { + description = "Database connectivity API standard and libraries for Apache Arrow"; + homepage = "https://arrow.apache.org/adbc/"; + changelog = "https://github.com/apache/arrow-adbc/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.afl20; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ar/arrow-cpp/package.nix b/pkgs/by-name/ar/arrow-cpp/package.nix index e675f1a55df8..3becc5f51f39 100644 --- a/pkgs/by-name/ar/arrow-cpp/package.nix +++ b/pkgs/by-name/ar/arrow-cpp/package.nix @@ -80,7 +80,7 @@ let hash = "sha256-Xd6o3RT6Q0tPutV77J0P1x3F6U3RHdCBOKGUKtkQCKk="; }; - version = "23.0.0"; + version = "24.0.0"; in stdenv.mkDerivation (finalAttrs: { pname = "arrow-cpp"; @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apache"; repo = "arrow"; rev = "apache-arrow-${version}"; - hash = "sha256-BluUlbtGJwvlrpN/c/KziOfFh5dvzZyuCy4JZkkFea4="; + hash = "sha256-qTdkzZegANNvtO7nbqXVC8hc7BexvmeFF/0l5VzRb8g="; }; sourceRoot = "${finalAttrs.src.name}/cpp"; @@ -305,6 +305,8 @@ stdenv.mkDerivation (finalAttrs: { "arrow-flight-integration-test" # File already exists in database: orc_proto.proto "arrow-orc-adapter-test" + # missing test fixture + "parquet-encryption-test" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ # https://github.com/NixOS/nixpkgs/issues/460687 diff --git a/pkgs/by-name/ar/arsenal/package.nix b/pkgs/by-name/ar/arsenal/package.nix index cbf26e54ed2b..ac65eb8721b2 100644 --- a/pkgs/by-name/ar/arsenal/package.nix +++ b/pkgs/by-name/ar/arsenal/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to generate commands for security and network tools"; homepage = "https://github.com/Orange-Cyberdefense/arsenal"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "arsenal"; }; diff --git a/pkgs/by-name/ar/art/package.nix b/pkgs/by-name/ar/art/package.nix index b2daeeac12d2..87f4cbc96fc9 100644 --- a/pkgs/by-name/ar/art/package.nix +++ b/pkgs/by-name/ar/art/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "art"; - version = "1.26.5"; + version = "1.26.7"; src = fetchFromGitHub { - owner = "artpixls"; + owner = "artraweditor"; repo = "ART"; tag = finalAttrs.version; - hash = "sha256-kNe+1jwMJ8RVm4dBUg6/ik3TJRZVuGbZt5Wtx8qVbvk="; + hash = "sha256-HuXDdrfb3r8B5u4Ifvb3EfbF/b1mMbDAunOIBtEaKtk="; }; # Fix the build with CMake 4. diff --git a/pkgs/by-name/ar/artalk/package.nix b/pkgs/by-name/ar/artalk/package.nix index dae963ad3d85..335492c06806 100644 --- a/pkgs/by-name/ar/artalk/package.nix +++ b/pkgs/by-name/ar/artalk/package.nix @@ -3,7 +3,7 @@ buildGoModule, fetchFromGitHub, nodejs, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, installShellFiles, @@ -31,14 +31,14 @@ let nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm_10 ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-HypDGYb0MRCIDBHY8pVgwFoZQWC8us44cunORZRk3RM="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-RSz/bx8/BAqLZH3/yQ6/H/nnwGvcCg8EzIEJ4/xkQgQ="; }; buildPhase = '' diff --git a/pkgs/by-name/ar/artha/package.nix b/pkgs/by-name/ar/artha/package.nix deleted file mode 100644 index 85d7a879b094..000000000000 --- a/pkgs/by-name/ar/artha/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - stdenv, - autoreconfHook, - fetchurl, - dbus-glib, - gtk2, - pkg-config, - wordnet, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "artha"; - version = "1.0.5"; - - src = fetchurl { - url = "mirror://sourceforge/artha/${finalAttrs.version}/artha-${finalAttrs.version}.tar.bz2"; - sha256 = "034r7vfk5y7705k068cdlq52ikp6ip10w6047a5zjdakbn55c3as"; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - ]; - buildInputs = [ - dbus-glib - gtk2 - wordnet - ]; - - meta = { - description = "Offline thesaurus based on WordNet"; - homepage = "https://artha.sourceforge.net"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - mainProgram = "artha"; - }; -}) diff --git a/pkgs/by-name/ar/arti/package.nix b/pkgs/by-name/ar/arti/package.nix index e01cc45f7814..dfd0f5284b8a 100644 --- a/pkgs/by-name/ar/arti/package.nix +++ b/pkgs/by-name/ar/arti/package.nix @@ -3,7 +3,6 @@ stdenv, rustPlatform, fetchFromGitLab, - fetchpatch, pkg-config, sqlite, openssl, @@ -14,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "arti"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitLab { domain = "gitlab.torproject.org"; @@ -22,29 +21,18 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "core"; repo = "arti"; tag = "arti-v${finalAttrs.version}"; - hash = "sha256-YLOdrHstmN2pLl75uclkbpN5h3iBs3xpraZ8XN6R/+Q="; + hash = "sha256-jOCFXlBI2xAzgpb7Fa8ap53SpDF6kcRGYnBXcu3vpk4="; }; - patches = [ - # Fixes a panic that could allow malicious directory caches to crash - # clients. - # https://gitlab.torproject.org/tpo/core/arti/-/merge_requests/4062 - (fetchpatch { - name = "TROVE-2026-024.patch"; - url = "https://gitlab.torproject.org/tpo/core/arti/-/commit/f69be8c70561629e63004788f0aa4bf898025f93.patch"; - hash = "sha256-P0sXTKOBW7ulqQZwmTVJfrpLksLyaonuDpxGF2keDqE="; - }) - ]; - # Working around a bug in cargo that appears with cargo-auditable, see # https://github.com/rust-secure-code/cargo-auditable/issues/124. postPatch = '' substituteInPlace crates/arti/Cargo.toml \ - --replace-fail '"tor-rpcbase"' '"dep:tor-rpcbase"' + --replace-fail '"tokio-util"' '"dep:tokio-util"' ''; buildAndTestSubdir = "crates/arti"; - cargoHash = "sha256-7X3JJbt0/jxaMvBR3XQvguR7tqd96kiqX66G2byvPjM="; + cargoHash = "sha256-JK6ubp697jZ98ErNrZdFe0mXIez3lUZ5SmAHkyD97WQ="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config ]; diff --git a/pkgs/by-name/as/as-tree/package.nix b/pkgs/by-name/as/as-tree/package.nix index 150cd1d3c079..e8f8cde8739e 100644 --- a/pkgs/by-name/as/as-tree/package.nix +++ b/pkgs/by-name/as/as-tree/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage { meta = { description = "Print a list of paths as a tree of paths"; homepage = "https://github.com/jez/as-tree"; - license = with lib.licenses; [ blueOak100 ]; + license = lib.licenses.blueOak100; maintainers = with lib.maintainers; [ jshholland ]; mainProgram = "as-tree"; }; diff --git a/pkgs/by-name/as/asahi-audio/package.nix b/pkgs/by-name/as/asahi-audio/package.nix index edfe3364b1ba..c256a4221570 100644 --- a/pkgs/by-name/as/asahi-audio/package.nix +++ b/pkgs/by-name/as/asahi-audio/package.nix @@ -9,13 +9,13 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "asahi-audio"; - version = "3.4"; + version = "4.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "asahi-audio"; tag = "v${finalAttrs.version}"; - hash = "sha256-7AuPkR/M1a4zB9+dJuOuv9uTp+kIqPlxVOXipsyGGz8="; + hash = "sha256-Tp+yL7SbzowYcCrfI7UU+5GeIJtyBMuE7KhcYmA1+hw="; }; makeFlags = [ diff --git a/pkgs/by-name/as/ascii-image-converter/package.nix b/pkgs/by-name/as/ascii-image-converter/package.nix index b968f64cfb46..9af4b4cecf33 100644 --- a/pkgs/by-name/as/ascii-image-converter/package.nix +++ b/pkgs/by-name/as/ascii-image-converter/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Convert images into ASCII art on the console"; homepage = "https://github.com/TheZoraiz/ascii-image-converter#readme"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ danth ]; + maintainers = [ ]; mainProgram = "ascii-image-converter"; }; }) diff --git a/pkgs/by-name/as/asciimol/package.nix b/pkgs/by-name/as/asciimol/package.nix new file mode 100644 index 000000000000..07787916cb49 --- /dev/null +++ b/pkgs/by-name/as/asciimol/package.nix @@ -0,0 +1,38 @@ +{ + fetchPypi, + lib, + nix-update-script, + python3Packages, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "asciimol"; + version = "1.2.7"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-SqwViOnVx1TcpY8Kd5VQCg1A8KQnBhL8aq9Gsrwer3k="; + }; + + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ + numpy + ase + rdkit + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Curses based ASCII molecule viewer for terminals"; + license = lib.licenses.bsd2; + homepage = "https://github.com/dewberryants/asciimol"; + downloadPage = "https://pypi.org/project/asciimol/"; + maintainers = with lib.maintainers; [ tomasrivera ]; + mainProgram = "asciimol"; + }; +}) diff --git a/pkgs/by-name/as/asciinema-scenario/package.nix b/pkgs/by-name/as/asciinema-scenario/package.nix index 4b4e869f0119..475a5c480686 100644 --- a/pkgs/by-name/as/asciinema-scenario/package.nix +++ b/pkgs/by-name/as/asciinema-scenario/package.nix @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create asciinema videos from a text file"; homepage = "https://github.com/garbas/asciinema-scenario/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "asciinema-scenario"; }; }) diff --git a/pkgs/by-name/as/asciinema/package.nix b/pkgs/by-name/as/asciinema/package.nix index 5d93445c8101..4f4fab462d49 100644 --- a/pkgs/by-name/as/asciinema/package.nix +++ b/pkgs/by-name/as/asciinema/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "asciinema"; - version = "3.2.0"; + version = "3.2.1"; src = fetchFromGitHub { owner = "asciinema"; repo = "asciinema"; tag = "v${finalAttrs.version}"; - hash = "sha256-03olFWB/6O7V/B9gz6QACMxugrIx560fpp81IGVWv58="; + hash = "sha256-MZMc1YypMP2JEbpDmsGj+Sm+y3mfr50DnoCN04rY9xY="; }; - cargoHash = "sha256-B6s3uUPGL8m076dl3P26j+frHWLi+wzED41BQ/rQAM8="; + cargoHash = "sha256-Qzxlp/c5VowlZplu7iMVh0a3+raQXsYmO8OEC45dSl4="; env.ASCIINEMA_GEN_DIR = "gendir"; @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { computer users working with the command-line, such as developers or system administrators. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "asciinema"; maintainers = with lib.maintainers; [ jiriks74 diff --git a/pkgs/by-name/as/asciiquarium-transparent/package.nix b/pkgs/by-name/as/asciiquarium-transparent/package.nix index 85ee2cb78c7c..bc18abe19e21 100644 --- a/pkgs/by-name/as/asciiquarium-transparent/package.nix +++ b/pkgs/by-name/as/asciiquarium-transparent/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "asciiquarium-transparent"; - version = "1.4"; + version = "1.6"; src = fetchFromGitHub { owner = "nothub"; repo = "asciiquarium"; rev = "v${finalAttrs.version}"; - hash = "sha256-lUNPg+/R/UwnHxjVXROMjvQxBZuCPBrYWB546OHplJM="; + hash = "sha256-p9P9sJZhcNdlIxyz5ulFXFrwJaE7b48D4aWeoTWmIgk="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/as/asdf-vm/package.nix b/pkgs/by-name/as/asdf-vm/package.nix index f50ad776b394..25c6b0934e4c 100644 --- a/pkgs/by-name/as/asdf-vm/package.nix +++ b/pkgs/by-name/as/asdf-vm/package.nix @@ -8,18 +8,18 @@ }: buildGoModule (finalAttrs: { pname = "asdf-vm"; - version = "0.18.1"; + version = "0.20.0"; src = fetchFromGitHub { owner = "asdf-vm"; repo = "asdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-nc9fsahzOKlGtg1oA/0hnBUEkQ0BPeDWyPpl3KoDjqA="; + hash = "sha256-qq1HJidVBqHyfk2OZ439fnkJKRq1xglqOrF3GVvWeXY="; }; - vendorHash = "sha256-ru0/VvtoUMw9beycgh+TOO/FN2kqszynT4I4iDuS1Lo="; + vendorHash = "sha256-Rv5p63opBTlyRlRDisgYX5fVJFny1clDn7b/zumV83M="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/as/ashuffle/package.nix b/pkgs/by-name/as/ashuffle/package.nix index fbcb48a746e4..7f0c11480197 100644 --- a/pkgs/by-name/as/ashuffle/package.nix +++ b/pkgs/by-name/as/ashuffle/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/joshkunz/ashuffle"; description = "Automatic library-wide shuffle for mpd"; - maintainers = [ lib.maintainers.tcbravo ]; + maintainers = [ ]; platforms = lib.platforms.unix; license = lib.licenses.mit; mainProgram = "ashuffle"; diff --git a/pkgs/by-name/as/asn/package.nix b/pkgs/by-name/as/asn/package.nix index e809b7c29697..860a90dab0d5 100644 --- a/pkgs/by-name/as/asn/package.nix +++ b/pkgs/by-name/as/asn/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/nitefood/asn"; changelog = "https://github.com/nitefood/asn/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ devhell ]; mainProgram = "asn"; }; diff --git a/pkgs/by-name/as/asn1c/package.nix b/pkgs/by-name/as/asn1c/package.nix index 1072090c2112..9f07efcb9169 100644 --- a/pkgs/by-name/as/asn1c/package.nix +++ b/pkgs/by-name/as/asn1c/package.nix @@ -1,39 +1,64 @@ { lib, stdenv, - fetchurl, + autoreconfHook, + versionCheckHook, + fetchFromGitHub, perl, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "asn1c"; - version = "0.9.28"; + version = "0.9.29"; - src = fetchurl { - url = "https://lionet.info/soft/asn1c-${finalAttrs.version}.tar.gz"; - hash = "sha256-gAdEC2R+8t2ftz2THDOsEXZOavskN9vmOLtOX8gjhrk="; + src = fetchFromGitHub { + owner = "vlm"; + repo = "asn1c"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ms4+tzlVdV0pVGhdBod8sepjHGS4OVxJb3HdrFKv9Cc="; }; outputs = [ "out" "doc" "man" + + # for the one perl utility + "crfc2asn1" + ]; + + postPatch = '' + patchShebangs examples/crfc2asn1.pl + ''; + + nativeBuildInputs = [ + autoreconfHook + versionCheckHook ]; buildInputs = [ perl ]; - preConfigure = '' - patchShebangs examples/crfc2asn1.pl - ''; + enableParallelBuilding = true; postInstall = '' cp -r skeletons/standard-modules $out/share/asn1c ''; - doCheck = true; + # Barely anyone uses this, so make it a split-output + # so we don't carry the dependency on perl into bin. + postFixup = '' + mkdir -p $crfc2asn1/bin + mv $out/bin/crfc2asn1.pl $crfc2asn1/bin/crfc2asn1 + ''; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { - homepage = "http://lionet.info/asn1c/compiler.html"; + mainProgram = "asn1c"; + homepage = "https://lionet.info/asn1c/compiler.html"; description = "Open Source ASN.1 Compiler"; license = lib.licenses.bsd2; platforms = lib.platforms.unix; diff --git a/pkgs/development/tools/asn2quickder/default.nix b/pkgs/by-name/as/asn2quickder/package.nix similarity index 100% rename from pkgs/development/tools/asn2quickder/default.nix rename to pkgs/by-name/as/asn2quickder/package.nix diff --git a/pkgs/by-name/as/assetfinder/package.nix b/pkgs/by-name/as/assetfinder/package.nix index 3dc1ceeca593..66122ca9293f 100644 --- a/pkgs/by-name/as/assetfinder/package.nix +++ b/pkgs/by-name/as/assetfinder/package.nix @@ -31,6 +31,6 @@ buildGoModule (finalAttrs: { fromSource binaryNativeCode ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/as/assh/package.nix b/pkgs/by-name/as/assh/package.nix index c7e988f70bd5..fcc73d99955a 100644 --- a/pkgs/by-name/as/assh/package.nix +++ b/pkgs/by-name/as/assh/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { version = "2.17.2"; src = fetchFromGitHub { - repo = "advanced-ssh-config"; + repo = "assh"; owner = "moul"; tag = "v${finalAttrs.version}"; hash = "sha256-/w4RluA7py6d75S04czNsgHpmR5rmAUZx8OnZfu9oNg="; diff --git a/pkgs/by-name/as/assimp/package.nix b/pkgs/by-name/as/assimp/package.nix index 717fd1a0746f..24769c4a231c 100644 --- a/pkgs/by-name/as/assimp/package.nix +++ b/pkgs/by-name/as/assimp/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "assimp"; - version = "6.0.4"; + version = "6.0.5"; outputs = [ "out" "lib" @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "assimp"; repo = "assimp"; tag = "v${finalAttrs.version}"; - hash = "sha256-ryTgsN0z9BZBz7i9aUMKuneN5oqfxpduwJlb+Q0q3Mk="; + hash = "sha256-QWBi1pl5C76UtPhB6SmFipm9oEdnfhELMT3MqfV6oxg="; }; postPatch = '' diff --git a/pkgs/by-name/as/ast-grep/package.nix b/pkgs/by-name/as/ast-grep/package.nix index 9b7f2886b605..18ac78422a2c 100644 --- a/pkgs/by-name/as/ast-grep/package.nix +++ b/pkgs/by-name/as/ast-grep/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ast-grep"; - version = "0.43.0"; + version = "0.44.1"; src = fetchFromGitHub { owner = "ast-grep"; repo = "ast-grep"; tag = finalAttrs.version; - hash = "sha256-qQkG04aGaw3U/FFP1omlsoAKfNsVKafgJlVzAxvHkcA="; + hash = "sha256-C6JwLx6z+/xSm9kMF48hfd3WTRax8Bdy3zgGeYxGyg8="; }; # error: linker `aarch64-linux-gnu-gcc` not found @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm .cargo/config.toml ''; - cargoHash = "sha256-YL76pCvCco9u8nAGIuiEciQrgUgaPx1s8hHyu2x3KmI="; + cargoHash = "sha256-waeAXcxnvTWbuAhVWdA5wPdWvS1aSSptGerFoGEtFUE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/as/astc-encoder/package.nix b/pkgs/by-name/as/astc-encoder/package.nix index cd0ad68a83b2..290c4fe82122 100644 --- a/pkgs/by-name/as/astc-encoder/package.nix +++ b/pkgs/by-name/as/astc-encoder/package.nix @@ -47,13 +47,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "astc-encoder"; - version = "5.4.0"; + version = "5.6.0"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; tag = finalAttrs.version; - hash = "sha256-mpaLSf1K+SsxkQm/b+QIWU34TzHQ7CAkyDNczBrcmBo="; + hash = "sha256-2/3m5G7rMoc/qZ9wPN3kn7O/CdQbWnKyU5OvAIxx97A="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/as/astroterm/package.nix b/pkgs/by-name/as/astroterm/package.nix index 924bc301471e..37364e45b8a0 100644 --- a/pkgs/by-name/as/astroterm/package.nix +++ b/pkgs/by-name/as/astroterm/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "astroterm"; - version = "1.0.10"; + version = "1.2.0"; src = fetchFromGitHub { owner = "da-luce"; repo = "astroterm"; tag = "v${finalAttrs.version}"; - hash = "sha256-z9KblIAoXk///NnRFHCSAFNDuNiPxDuuiliajcsyJM0="; + hash = "sha256-u0UKYoZCDClRmG12czmm0rmOcy3nruarSyjdh8Lu2dw="; }; bsc5File = fetchurl { diff --git a/pkgs/by-name/as/astyle/package.nix b/pkgs/by-name/as/astyle/package.nix index 3ed7b28e6e69..b66ae5e90a59 100644 --- a/pkgs/by-name/as/astyle/package.nix +++ b/pkgs/by-name/as/astyle/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "astyle"; - version = "3.6.16"; + version = "3.6.17"; src = fetchurl { url = "mirror://sourceforge/astyle/astyle-${finalAttrs.version}.tar.bz2"; - hash = "sha256-QU6dpM/e6zXY98Fw4V70OvX6AGbJ9ZKnRvcHHzVuzac="; + hash = "sha256-7cg5uAB35g7VeGtjlNRCtOsQFWzL3VlEtLNg4SWvs+E="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/as/asunder/package.nix b/pkgs/by-name/as/asunder/package.nix index 3299b9ef16d5..31bb09cb0179 100644 --- a/pkgs/by-name/as/asunder/package.nix +++ b/pkgs/by-name/as/asunder/package.nix @@ -1,9 +1,10 @@ { lib, stdenv, - fetchurl, + autoreconfHook, + fetchFromGitHub, makeWrapper, - gtk2, + gtk3, libcddb, intltool, pkg-config, @@ -36,20 +37,24 @@ let in stdenv.mkDerivation (finalAttrs: { - version = "3.0.2"; pname = "asunder"; - src = fetchurl { - url = "http://littlesvr.ca/asunder/releases/asunder-${finalAttrs.version}.tar.bz2"; - hash = "sha256-txNB10bM9WqnexeFxq+BqmQdCErD00t4vrU3YYhItks="; + version = "3.1.0-unstable-2025-03-24"; + + src = fetchFromGitHub { + owner = "rizalmart"; + repo = "asunder-gtk3"; + rev = "e3676704f7c7912e61ad7d78fe19015c102a27e1"; + hash = "sha256-bJVrSbjOUkmrF76e6euM5VPwbvvRrA5ZLPzZGjEep98="; }; nativeBuildInputs = [ + autoreconfHook intltool makeWrapper pkg-config ]; buildInputs = [ - gtk2 + gtk3 libcddb ]; @@ -61,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphical Audio CD ripper and encoder for Linux"; mainProgram = "asunder"; - homepage = "http://littlesvr.ca/asunder/index.php"; + homepage = "https://github.com/rizalmart/asunder-gtk3"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ mudri ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/as/asusctl/package.nix b/pkgs/by-name/as/asusctl/package.nix index 5f30f1d4b308..85fef9f9b827 100644 --- a/pkgs/by-name/as/asusctl/package.nix +++ b/pkgs/by-name/as/asusctl/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitLab, + fetchFromGitHub, systemd, coreutils, gnugrep, @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "asusctl"; version = "6.3.8"; - src = fetchFromGitLab { - owner = "asus-linux"; + src = fetchFromGitHub { + owner = "OpenGamingCollective"; repo = "asusctl"; tag = finalAttrs.version; hash = "sha256-DXpuKZmjYKiQp8ULH39EYtY75muZ77YzwYmE/yF1wEY="; @@ -103,7 +103,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Control daemon, CLI tools, and a collection of crates for interacting with ASUS ROG laptops"; - homepage = "https://gitlab.com/asus-linux/asusctl"; + homepage = "https://github.com/OpenGamingCollective/asusctl"; license = lib.licenses.mpl20; platforms = [ "x86_64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/as/async-profiler/package.nix b/pkgs/by-name/as/async-profiler/package.nix index dbe0d483fa63..853007379864 100644 --- a/pkgs/by-name/as/async-profiler/package.nix +++ b/pkgs/by-name/as/async-profiler/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "4.3"; src = fetchFromGitHub { - owner = "jvm-profiling-tools"; + owner = "async-profiler"; repo = "async-profiler"; tag = "v${finalAttrs.version}"; hash = "sha256-wysOjirCfxm0SmwDW7GS+S73lAT8/0g4avu7T5+qy2Q="; @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Low overhead sampling profiler for Java that does not suffer from Safepoint bias problem"; - homepage = "https://github.com/jvm-profiling-tools/async-profiler"; + homepage = "https://github.com/async-profiler/async-profiler"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mschuwalow ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/at/at-spi2-core/package.nix b/pkgs/by-name/at/at-spi2-core/package.nix index dd5e8f9e4ce1..c20443184374 100644 --- a/pkgs/by-name/at/at-spi2-core/package.nix +++ b/pkgs/by-name/at/at-spi2-core/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "at-spi2-core"; - version = "2.60.1"; + version = "2.60.4"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/at-spi2-core/${lib.versions.majorMinor finalAttrs.version}/at-spi2-core-${finalAttrs.version}.tar.xz"; - hash = "sha256-+ZuH48FnT1+8QXzJwdniYcDymqsFUK1jaYBQMdEvaFI="; + hash = "sha256-Gh9bqYBZF/QfxqpoI9z4h6KR1gekJ+LVr7a136ZQcMc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/at/at/package.nix b/pkgs/by-name/at/at/package.nix index cd1a7ea6dfcb..7c5014ad90e6 100644 --- a/pkgs/by-name/at/at/package.nix +++ b/pkgs/by-name/at/at/package.nix @@ -32,17 +32,16 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' # Remove chown commands and setuid bit substituteInPlace Makefile.in \ - --replace ' -o root ' ' ' \ - --replace ' -g root ' ' ' \ - --replace ' -o $(DAEMON_USERNAME) ' ' ' \ - --replace ' -o $(DAEMON_GROUPNAME) ' ' ' \ - --replace ' -g $(DAEMON_GROUPNAME) ' ' ' \ - --replace '$(DESTDIR)$(etcdir)' "$out/etc" \ - --replace '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \ - --replace '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \ - --replace '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \ - --replace 'chown' '# skip chown' \ - --replace '6755' '0755' + --replace-fail ' -o root ' ' ' \ + --replace-fail ' -g root ' ' ' \ + --replace-fail ' -o $(DAEMON_USERNAME) ' ' ' \ + --replace-fail ' -g $(DAEMON_GROUPNAME) ' ' ' \ + --replace-fail '$(DESTDIR)$(etcdir)' "$out/etc" \ + --replace-fail '$(DESTDIR)$(ATJOB_DIR)' "$out/var/spool/atjobs" \ + --replace-fail '$(DESTDIR)$(ATSPOOL_DIR)' "$out/var/spool/atspool" \ + --replace-fail '$(DESTDIR)$(LFILE)' "$out/var/spool/atjobs/.SEQ" \ + --replace-fail 'chown' '# skip chown' \ + --replace-fail '6755' '0755' ''; nativeBuildInputs = [ @@ -57,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { export SENDMAIL=${sendmailPath} # Purity: force atd.pid to be placed in /var/run regardless of # whether it exists now. - substituteInPlace ./configure --replace "test -d /var/run" "true" + substituteInPlace ./configure --replace-fail "test -d /var/run" "true" ''; configureFlags = [ diff --git a/pkgs/by-name/at/atari800/package.nix b/pkgs/by-name/at/atari800/package.nix index e19b8730b8a0..43f567993849 100644 --- a/pkgs/by-name/at/atari800/package.nix +++ b/pkgs/by-name/at/atari800/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { WinCE, Sega Dreamcast, Android and other systems supported by the SDL library. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/at/ataripp/package.nix b/pkgs/by-name/at/ataripp/package.nix index fde9cae8f43a..34e3bd45e998 100644 --- a/pkgs/by-name/at/ataripp/package.nix +++ b/pkgs/by-name/at/ataripp/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { will compile on a variety of systems (Linux, Solaris, Irix). ''; maintainers = [ ]; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/at/athens/package.nix b/pkgs/by-name/at/athens/package.nix index fdd5cbab063c..5083ba23fcfe 100644 --- a/pkgs/by-name/at/athens/package.nix +++ b/pkgs/by-name/at/athens/package.nix @@ -10,14 +10,14 @@ buildGo126Module (finalAttrs: { pname = "athens"; - version = "0.17.1"; + version = "0.18.0"; src = applyPatches { src = fetchFromGitHub { owner = "gomods"; repo = "athens"; tag = "v${finalAttrs.version}"; - hash = "sha256-hNk0hW7R7HdE4Wt1KuKSIUarRGKbtbFqQbfls1HXTqI="; + hash = "sha256-sFNxAG0hIxsoKCuef/ROy2MOjA7iC5ehXRvnUr20U0Y="; }; # Trim the patch version, not needed anyway. postPatch = '' @@ -25,7 +25,7 @@ buildGo126Module (finalAttrs: { ''; }; - vendorHash = "sha256-he7GNkCfqLgOXuCTahvqOnwW5TpbYjlCMfMGfKGwYZ4="; + vendorHash = "sha256-nTkrma32+JR+5a5u/XM+EFh9o7YwKMvZJ9cz4evo7Ec="; env.CGO_ENABLED = "0"; ldflags = [ diff --git a/pkgs/by-name/at/atlantis/package.nix b/pkgs/by-name/at/atlantis/package.nix index d7cbb985ef41..b42a8e9cd24a 100644 --- a/pkgs/by-name/at/atlantis/package.nix +++ b/pkgs/by-name/at/atlantis/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "atlantis"; - version = "0.44.0"; + version = "0.46.0"; src = fetchFromGitHub { owner = "runatlantis"; repo = "atlantis"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZHd/RSzFXbcZ7324Bbgtx681zwdHi5xYgqVlTR4glHY="; + hash = "sha256-4twWPp+ZgK6YmNL5RJmLKhtxe33T1GDCu1qejUbqXkA="; }; ldflags = [ @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { "-X=main.date=1970-01-01T00:00:00Z" ]; - vendorHash = "sha256-hxgujZGbcEelOpoy7eCnbrypXraN7aPe8Ox81kkg3gs="; + vendorHash = "sha256-/PnEQvaqADxwFvrHWOPFopQwdyUXBa6cf/H7a/RaHcg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/at/atlas/package.nix b/pkgs/by-name/at/atlas/package.nix index b17feb561d73..8ac36b85e054 100644 --- a/pkgs/by-name/at/atlas/package.nix +++ b/pkgs/by-name/at/atlas/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "atlas"; - version = "1.2.2"; + version = "1.2.3"; src = fetchFromGitHub { owner = "ariga"; repo = "atlas"; tag = "v${finalAttrs.version}"; - hash = "sha256-2wmmvNezi/AJ86r5m0rZOskqxfaT49870Pe615QycHg="; + hash = "sha256-Ox/EgTSz0ONEJqLyiJsvpgUNfHyV2rQYXrIAImDwrLo="; }; modRoot = "cmd/atlas"; diff --git a/pkgs/by-name/at/atlauncher/package.nix b/pkgs/by-name/at/atlauncher/package.nix index 523c3b8bd504..94a40224ff51 100644 --- a/pkgs/by-name/at/atlauncher/package.nix +++ b/pkgs/by-name/at/atlauncher/package.nix @@ -27,13 +27,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "atlauncher"; - version = "3.4.40.4"; + version = "3.4.41.1"; src = fetchFromGitHub { owner = "ATLauncher"; repo = "ATLauncher"; rev = "v${finalAttrs.version}"; - hash = "sha256-pRYXzFUbVXYwD7edhBoVcVo/QDo6QSJJQd58Hf3rBGo="; + hash = "sha256-jxI1x4AoEbVJ7SxUcXK7+ViU6M208yRyDkl7a8iIMyE="; }; patches = [ diff --git a/pkgs/by-name/at/atomgit-cli/package.nix b/pkgs/by-name/at/atomgit-cli/package.nix new file mode 100644 index 000000000000..39bcf62fbe39 --- /dev/null +++ b/pkgs/by-name/at/atomgit-cli/package.nix @@ -0,0 +1,67 @@ +{ + lib, + stdenv, + buildGoModule, + fetchgit, + gitMinimal, + makeWrapper, + versionCheckHook, + writableTmpDirAsHomeHook, + xdg-utils, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + + pname = "atomgit-cli"; + version = "0.5.0"; + + src = fetchgit { + url = "https://atomgit.com/hust-open-atom-club/atomgit-cli.git"; + rev = "11f1ff216053bf47c0a3baaed6698c9222f1ce77"; + hash = "sha256-ZvQ8S0f1jUfN48UE/U+JnTTrtoWYZfwhDPDBbKKLlC0="; + }; + + vendorHash = "sha256-7K17JaXFsjf163g5PXCb5ng2gYdotnZ2IDKk8KFjNj0="; + + subPackages = [ "cmd/ag" ]; + + preCheck = '' + # Test all packages, not only cmd/ag. + unset subPackages + ''; + + ldflags = [ + "-s" + "-w" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Version=v${finalAttrs.version}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.Commit=${finalAttrs.src.rev}" + "-X atomgit.com/hust-open-atom-club/atomgit-cli/internal/version.BuildDate=2026-07-13T07:53:45Z" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postFixup = '' + wrapProgram $out/bin/ag \ + --prefix PATH : ${ + lib.makeBinPath ([ gitMinimal ] ++ lib.optionals stdenv.hostPlatform.isLinux [ xdg-utils ]) + } + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + doInstallCheck = true; + + meta = { + description = "Command-line interface for AtomGit"; + homepage = "https://atomgit.com/hust-open-atom-club/atomgit-cli"; + changelog = "https://atomgit.com/hust-open-atom-club/atomgit-cli/tags/v${finalAttrs.version}"; + license = lib.licenses.mulan-psl2; + mainProgram = "ag"; + maintainers = [ lib.maintainers.silicalet ]; + }; +}) diff --git a/pkgs/by-name/at/atomic-swap/package.nix b/pkgs/by-name/at/atomic-swap/package.nix index 37c1125600bb..81b630af0585 100644 --- a/pkgs/by-name/at/atomic-swap/package.nix +++ b/pkgs/by-name/at/atomic-swap/package.nix @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/AthanorLabs/atomic-swap"; changelog = "https://github.com/AthanorLabs/atomic-swap/releases/tag/v${finalAttrs.version}"; description = "ETH-XMR atomic swap implementation"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; maintainers = with lib.maintainers; [ happysalada lord-valen diff --git a/pkgs/by-name/at/atril/package.nix b/pkgs/by-name/at/atril/package.nix index a985a62bb7f3..3b735d94df78 100644 --- a/pkgs/by-name/at/atril/package.nix +++ b/pkgs/by-name/at/atril/package.nix @@ -88,6 +88,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + postInstall = '' + substituteInPlace $out/share/thumbnailers/atril.thumbnailer \ + --replace-fail "TryExec=atril-thumbnailer" "TryExec=$out/bin/atril-thumbnailer" \ + --replace-fail "Exec=atril-thumbnailer" "Exec=$out/bin/atril-thumbnailer" + ''; + passthru.updateScript = gitUpdater { rev-prefix = "v"; odd-unstable = true; diff --git a/pkgs/applications/misc/ape/clex.nix b/pkgs/by-name/at/attemptoClex/package.nix similarity index 100% rename from pkgs/applications/misc/ape/clex.nix rename to pkgs/by-name/at/attemptoClex/package.nix diff --git a/pkgs/by-name/at/attic-client/package.nix b/pkgs/by-name/at/attic-client/package.nix index 2488f2473f25..38a5ca86c26e 100644 --- a/pkgs/by-name/at/attic-client/package.nix +++ b/pkgs/by-name/at/attic-client/package.nix @@ -16,18 +16,18 @@ let # Only the attic-client crate builds against the Nix C++ libs # This derivation is also used to build the server needNixInclude = lib.elem "attic-client" crates; - nix = nixVersions.nix_2_28; + nix = nixVersions.nix_2_34; in rustPlatform.buildRustPackage { pname = "attic"; - version = "0-unstable-2025-09-24"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "zhaofengli"; repo = "attic"; - rev = "12cbeca141f46e1ade76728bce8adc447f2166c6"; - hash = "sha256-0nZlCCDC5PfndsQJXXtcyrtrfW49I3KadGMDlutzaGU="; + rev = "7a19204df10d606c5070e6bb72615c3461900c05"; + hash = "sha256-AyXLhsc2drC+lunm+TB6Xs6XMMJ/m4B1YjMM1N8JXhU="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage { buildInputs = lib.optional needNixInclude nix ++ [ boost ]; cargoBuildFlags = lib.concatMapStrings (c: "-p ${c} ") crates; - cargoHash = "sha256-h041o0s+bciXnvSuk4j+/uCY/sRRQWDVf+WEb9GEYeY="; + cargoHash = "sha256-UGgM78QEWJ2QgbQhxEI+yLYXH6T4ey+1oenPTMlJ3GU="; env = { ATTIC_DISTRIBUTOR = "nixpkgs"; diff --git a/pkgs/by-name/at/attyx/package.nix b/pkgs/by-name/at/attyx/package.nix index 81fe0f14851d..e28b6af86a0b 100644 --- a/pkgs/by-name/at/attyx/package.nix +++ b/pkgs/by-name/at/attyx/package.nix @@ -18,13 +18,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "attyx"; - version = "0.4.5"; + version = "0.4.15"; src = fetchFromGitHub { owner = "semos-labs"; repo = "attyx"; tag = "v${finalAttrs.version}"; - hash = "sha256-9/Zl6IrgrT8vHYllCKb977Ar5QRYQiXDmK/g+4YWcqM="; + hash = "sha256-WB3qMFmVmv/FkZX60MTKFewk3kEA3yDEoaUFL2LY1bQ="; }; deps = callPackage ./build.zig.zon.nix { }; diff --git a/pkgs/by-name/at/atuin-desktop/package.nix b/pkgs/by-name/at/atuin-desktop/package.nix index 8c314c465018..a375364af645 100644 --- a/pkgs/by-name/at/atuin-desktop/package.nix +++ b/pkgs/by-name/at/atuin-desktop/package.nix @@ -80,7 +80,6 @@ rustPlatform.buildRustPackage (finalAttrs: { { aarch64-darwin = "sha256-YbjDAa2KG8U0ODqIYc5h7iNr5px+6+iforDrPomOVDo="; aarch64-linux = "sha256-JoUPAfBF4xdQxtx+J/VNpYomBACNsL7Wes0XXuGByGk="; - x86_64-darwin = "sha256-YzxQyZPfcQci8QsGEDRTcc2A9tmvem3cHkv/OBFlWDQ="; x86_64-linux = "sha256-w8fMS6f+F+23EtMjjl0RsHMm6b5jOXSwUDAc21vqLAg="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/at/atuin/package.nix b/pkgs/by-name/at/atuin/package.nix index 588b55191b10..a8293ea24ca9 100644 --- a/pkgs/by-name/at/atuin/package.nix +++ b/pkgs/by-name/at/atuin/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "atuin"; - version = "18.16.1"; + version = "18.17.1"; src = fetchFromGitHub { owner = "atuinsh"; repo = "atuin"; tag = "v${finalAttrs.version}"; - hash = "sha256-XrJFetPs7TsbX5Cxekj+h3hlmQLoOpB7U+c36NM/jeA="; + hash = "sha256-9wfeAqtE6HLNvQHdGlLX6Kv1kakmojgY14RVW/WpOSs="; }; - cargoHash = "sha256-eqxeE7+UxBTdaYjlonOz6pYQ3mar8lNUd/K0CSuzquc="; + cargoHash = "sha256-l2TX8thT+MnWhrTyD4ryapJkDg43mb2IurGDnyk2b74="; # atuin's default features include 'check-updates', which do not make sense # for distribution builds. List all other default features. diff --git a/pkgs/by-name/au/aube/package.nix b/pkgs/by-name/au/aube/package.nix index 5a0aae0299f2..ba47a1f2ba78 100644 --- a/pkgs/by-name/au/aube/package.nix +++ b/pkgs/by-name/au/aube/package.nix @@ -2,48 +2,67 @@ lib, fetchFromGitHub, rustPlatform, + cacert, cmake, gitMinimal, + writableTmpDirAsHomeHook, versionCheckHook, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "aube"; - version = "1.9.1"; + version = "1.29.1"; src = fetchFromGitHub { - owner = "endevco"; + owner = "jdx"; repo = "aube"; tag = "v${finalAttrs.version}"; - hash = "sha256-uwOEou6DH+bePNupYKmTc82xQV9T08bDmSPG9RU9yBk="; + hash = "sha256-87r9qltKUhjnYG9O484OUzKFiO8Xoge9VZ13l6RgrdA="; }; - cargoHash = "sha256-CBI44O2iMwdMym+ZOO9MvJQ73n+12J6FjzIXAOQTGT0="; + cargoHash = "sha256-Cy5Ea/rF2IJ5WppKKI7E1toy9N+bQEArVW9o2pHzBMc="; nativeBuildInputs = [ cmake ]; # libz-ng-sys - nativeCheckInputs = [ gitMinimal ]; + nativeCheckInputs = [ + gitMinimal + writableTmpDirAsHomeHook + ]; postInstall = '' - rm -f $out/bin/generate-settings-docs + rm -f $out/bin/generate-{error-codes,settings}-docs ''; + checkFlags = [ + # failed on x86_64-linux + "--skip=http::ticket_cache::tests::max_per_host_evicts_oldest" + "--skip=http::ticket_cache::tests::invalidate_removes_all_for_host" + # require network access + "--skip=http::ticket_cache::tests::roundtrip_persists_across_open" + ]; + __darwinAllowLocalNetworking = true; + env.SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + strictDeps = true; __structuredAttrs = true; meta = { description = "Fast Node.js package manager"; - homepage = "https://github.com/endevco/aube"; - changelog = "https://github.com/endevco/aube/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/jdx/aube"; + changelog = "https://github.com/jdx/aube/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ chillcicada ]; + maintainers = with lib.maintainers; [ + chillcicada + Br1ght0ne + ]; mainProgram = "aube"; }; }) diff --git a/pkgs/by-name/au/aubio/package.nix b/pkgs/by-name/au/aubio/package.nix index 26dc445bacd2..362eec53198e 100644 --- a/pkgs/by-name/au/aubio/package.nix +++ b/pkgs/by-name/au/aubio/package.nix @@ -27,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: { wafHook ]; buildInputs = [ - alsa-lib fftw libjack2 libsamplerate libsndfile + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib ]; strictDeps = true; @@ -51,6 +53,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ fpletz ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/au/audacious-plugins/package.nix b/pkgs/by-name/au/audacious-plugins/package.nix index b954bcdef991..e46343068b56 100644 --- a/pkgs/by-name/au/audacious-plugins/package.nix +++ b/pkgs/by-name/au/audacious-plugins/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchFromGitHub, + fetchpatch, alsa-lib, audacious-bare, curl, @@ -24,6 +25,7 @@ libogg, libopenmpt, libpulseaudio, + libresidfp, libsamplerate, libsidplayfp, libsndfile, @@ -54,7 +56,21 @@ stdenv.mkDerivation rec { hash = "sha256-HfO59DOIYsEpBzUyaLYh/gXfz+zvH8lIY2yBVCn3wks="; }; - patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; + patches = [ + ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch + + # Remove when version >= 4.6 + (fetchpatch { + name = "0001-audacious-plugins-sid-Use-new-sidplayfp-API.patch"; + url = "https://github.com/audacious-media-player/audacious-plugins/commit/42c05763a136d6523d611473ff3701e2d9e30bec.patch"; + hash = "sha256-bTC9nZFNwyo4PsGrLyDiQJDOrHTUDHUQaxEFe/wFPME="; + }) + (fetchpatch { + name = "0002-audacious-plugins-sid-Support-version-3.0-of-libsidplayfp-version.patch"; + url = "https://github.com/audacious-media-player/audacious-plugins/commit/2aaf45bd3840858e23b75d5863129a510299abd6.patch"; + hash = "sha256-FbGLd3aiKeoJXKgTMIdI/oBEx5EzcqyhL0jWhG6Fyfw="; + }) + ]; nativeBuildInputs = [ meson @@ -85,6 +101,7 @@ stdenv.mkDerivation rec { libnotify libogg libpulseaudio + libresidfp libsamplerate libsidplayfp libsndfile diff --git a/pkgs/by-name/au/audacity/package.nix b/pkgs/by-name/au/audacity/package.nix index 272310aadca4..ff0bd1ae1e67 100644 --- a/pkgs/by-name/au/audacity/package.nix +++ b/pkgs/by-name/au/audacity/package.nix @@ -31,7 +31,7 @@ libid3tag, libopus, libuuid, - ffmpeg_7, + ffmpeg_8, soundtouch, portaudio, # given up fighting their portaudio.patch? portmidi, @@ -59,17 +59,17 @@ # 1. detach sbsms let - ffmpeg = ffmpeg_7; + ffmpeg = ffmpeg_8; in stdenv.mkDerivation (finalAttrs: { pname = "audacity"; - version = "3.7.7"; + version = "3.7.8"; src = fetchFromGitHub { owner = "audacity"; repo = "audacity"; rev = "Audacity-${finalAttrs.version}"; - hash = "sha256-UyQffN9vOSD3uDk4jpYGsjH577pU4V7FpFAu0xdsXUA="; + hash = "sha256-Vp3Nx3LuNu5fqeLF6dvZ9/hhkoUCu0eCAdIEDtS1IwU="; }; patches = [ diff --git a/pkgs/by-name/au/audiness/package.nix b/pkgs/by-name/au/audiness/package.nix index 1db6cc238282..80fd8022434d 100644 --- a/pkgs/by-name/au/audiness/package.nix +++ b/pkgs/by-name/au/audiness/package.nix @@ -10,13 +10,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "audiusGmbH"; + owner = "audius"; repo = "audiness"; tag = finalAttrs.version; hash = "sha256-zru37eNQyY9AcbALge1qlINuxzVKq3RTNypm5Pyhkz8="; }; pythonRelaxDeps = [ + "pytenable" "typer" "validators" ]; diff --git a/pkgs/by-name/au/audit/package.nix b/pkgs/by-name/au/audit/package.nix index 197df3501597..3b2389e7843c 100644 --- a/pkgs/by-name/au/audit/package.nix +++ b/pkgs/by-name/au/audit/package.nix @@ -30,13 +30,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "audit"; - version = "4.1.2-unstable-2025-09-06"; # fixes to non-static builds right after 4.1.2 release + version = "4.1.4"; src = fetchFromGitHub { owner = "linux-audit"; repo = "audit-userspace"; - rev = "cb13fe75ee2c36d5c525ed9de22aae10dbc8caf4"; - hash = "sha256-NX0TWA+LtcZgbM9aQfokWv2rGNAAb3ksGqAH8URAkYM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-GdJ9nzlDAdOazOHH/YWuEoELrJh+G5ZJUKwIqAKAzpo="; }; postPatch = '' @@ -132,10 +132,6 @@ stdenv.mkDerivation (finalAttrs: { # Instead, we load audit rules in a dedicated module. postFixup = '' moveToOutput bin/augenrules $scripts - substituteInPlace $scripts/bin/augenrules \ - --replace-fail "/sbin/auditctl -R" "$bin/bin/auditctl -R" \ - --replace-fail "auditctl -s" "$bin/bin/auditctl -s" \ - --replace-fail "/bin/ls" "ls" wrapProgram $scripts/bin/augenrules \ --prefix PATH : ${ lib.makeBinPath [ diff --git a/pkgs/by-name/au/auge/package.nix b/pkgs/by-name/au/auge/package.nix new file mode 100644 index 000000000000..fdd1d1f07acc --- /dev/null +++ b/pkgs/by-name/au/auge/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchurl, + versionCheckHook, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "auge"; + version = "1.9.0"; + + __structuredAttrs = true; + strictDeps = true; + + # Building from source requires swift 6.3.0 while nixpkgs only has 5.10.1 + src = fetchurl { + url = "https://github.com/Arthur-Ficial/auge/releases/download/v${finalAttrs.version}/auge-${finalAttrs.version}-arm64-macos.tar.gz"; + hash = "sha256-hL3kq1/hFo4rlq2nz4iaRLqoErLiF032ovqwl5Rwqso="; + }; + + sourceRoot = "."; + + dontBuild = true; + dontConfigure = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp auge $out/bin/ + chmod +x $out/bin/auge + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "On-device Apple Vision framework CLI"; + homepage = "https://github.com/Arthur-Ficial/auge"; + changelog = "https://github.com/Arthur-Ficial/auge/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + platforms = [ "aarch64-darwin" ]; + mainProgram = "auge"; + sourceProvenance = [ + lib.sourceTypes.binaryNativeCode + ]; + }; +}) diff --git a/pkgs/by-name/au/aurea/package.nix b/pkgs/by-name/au/aurea/package.nix index 903190036cf1..0bad074fe21a 100644 --- a/pkgs/by-name/au/aurea/package.nix +++ b/pkgs/by-name/au/aurea/package.nix @@ -63,7 +63,7 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://github.com/CleoMenezesJr/Aurea"; mainProgram = "aurea"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/au/aurulent-sans/package.nix b/pkgs/by-name/au/aurulent-sans/package.nix index 162664f9f879..6ffa590a1c8f 100644 --- a/pkgs/by-name/au/aurulent-sans/package.nix +++ b/pkgs/by-name/au/aurulent-sans/package.nix @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation rec { description = "Aurulent Sans"; longDescription = "Aurulent Sans is a humanist sans serif intended to be used as an interface font."; homepage = "http://delubrum.org/"; - maintainers = with lib.maintainers; [ deepfire ]; + maintainers = with lib.maintainers; [ pancaek ]; license = lib.licenses.ofl; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/au/ausweisapp/package.nix b/pkgs/by-name/au/ausweisapp/package.nix index 1392c62ec91e..02c0b05123f4 100644 --- a/pkgs/by-name/au/ausweisapp/package.nix +++ b/pkgs/by-name/au/ausweisapp/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ausweisapp"; - version = "2.5.1"; + version = "2.5.3"; src = fetchFromGitHub { owner = "Governikus"; - repo = "AusweisApp2"; + repo = "AusweisApp"; rev = finalAttrs.version; - hash = "sha256-R+2swDzIHlgE0kVonoYQih8r8p38RN7bqkbb+WB1hCc="; + hash = "sha256-pr41KbejZCOvfXH2uHO5MA/VklSNU38EL6AgznvGqeY="; }; postPatch = '' @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Official authentication app for German ID card and residence permit"; - downloadPage = "https://github.com/Governikus/AusweisApp2/releases"; + downloadPage = "https://github.com/Governikus/AusweisApp/releases"; homepage = "https://www.ausweisapp.bund.de/open-source-software"; license = lib.licenses.eupl12; mainProgram = "AusweisApp"; diff --git a/pkgs/by-name/au/auth0-cli/package.nix b/pkgs/by-name/au/auth0-cli/package.nix index 79aa36b252e0..b38c11bd34ee 100644 --- a/pkgs/by-name/au/auth0-cli/package.nix +++ b/pkgs/by-name/au/auth0-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "auth0-cli"; - version = "1.31.0"; + version = "1.32.0"; src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-6+AMU77eHYy0AwPsHt/tgtzTQkyPfvZZw1yzvWXQX0s="; + hash = "sha256-tRr0bCzijVG3+2n67jo7SNe4Oxxci0sRXhQct2645cI="; }; - vendorHash = "sha256-MzvoHXO8gDIzNqhQGgDEd8xXWF7971JLTKWt8TCldKI="; + vendorHash = "sha256-ZwGIYjaCQikHMoy3bSnvNEk+REnKO6JdCiiSh8L0SDg="; ldflags = [ "-s" diff --git a/pkgs/by-name/au/authelia/sources.nix b/pkgs/by-name/au/authelia/sources.nix index d234fad15cfa..f5aa7aacb94c 100644 --- a/pkgs/by-name/au/authelia/sources.nix +++ b/pkgs/by-name/au/authelia/sources.nix @@ -10,5 +10,5 @@ rec { hash = "sha256-JjpfNQsqtmSKXj14fQUJsiTgfkAlSHDfqUC/x+bE+fc="; }; vendorHash = "sha256-dZjsYqw/ABEn1y6tZgSjbmqamO4U20Ljj/dQMFruVjU="; - pnpmDepsHash = "sha256-syfPg62JrTh496xi39xW/CnIwpJYo+iU5sCPP3bD2Ys="; + pnpmDepsHash = "sha256-JeRolDKVf2EInZVAt/HpkurzgDcE592jF5stJ+qZY9U="; } diff --git a/pkgs/by-name/au/authelia/web.nix b/pkgs/by-name/au/authelia/web.nix index ca8a276e5e31..0cb4a5747a5d 100644 --- a/pkgs/by-name/au/authelia/web.nix +++ b/pkgs/by-name/au/authelia/web.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot ; inherit pnpm; # This may be different than pkgs.pnpm - fetcherVersion = 3; + fetcherVersion = 4; hash = pnpmDepsHash; }; @@ -62,4 +62,8 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + + # (node:24500) Warning: File descriptor 19 closed but not opened in unmanaged mode + # (node:24500) Warning: File descriptor 19 opened in unmanaged mode twice + meta.broken = stdenv.hostPlatform.isDarwin; }) diff --git a/pkgs/by-name/au/authentik/client-go-config.patch b/pkgs/by-name/au/authentik/client-go-config.patch deleted file mode 100644 index 8398b16160c7..000000000000 --- a/pkgs/by-name/au/authentik/client-go-config.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff --git a/config.yaml b/config.yaml -index 2f07ea7..0f90432 100644 ---- a/config.yaml -+++ b/config.yaml -@@ -4,3 +4,4 @@ additionalProperties: - packageName: api - enumClassPrefix: true - useOneOfDiscriminatorLookup: true -+ disallowAdditionalPropertiesIfNotPresent: false diff --git a/pkgs/by-name/au/authentik/package.nix b/pkgs/by-name/au/authentik/package.nix index ac0f05e63f4a..13b363cbded6 100644 --- a/pkgs/by-name/au/authentik/package.nix +++ b/pkgs/by-name/au/authentik/package.nix @@ -3,14 +3,19 @@ stdenvNoCC, callPackages, cacert, + clangStdenv, + cmake, fetchFromGitHub, buildGoModule, + buildNpmPackage, bash, chromedriver, nodejs_24, - python3, + python314, makeWrapper, openapi-generator-cli, + perl, + rustPlatform, go, typescript, makeSetupHook, @@ -20,13 +25,18 @@ let nodejs = nodejs_24; - version = "2025.12.5"; + version = "2026.5.3"; + + cargoPackageFlags = [ + "--package" + "authentik" + ]; src = fetchFromGitHub { owner = "goauthentik"; repo = "authentik"; tag = "version/${version}"; - hash = "sha256-LPGAhbtmuztDQ4CVhUXb+vBU5HjvNZ7JicI5r3lr1QQ="; + hash = "sha256-nmAX8nwZpdDcFAPvC9hAEp0x43RnFtGLUTAm7NcvNZo="; }; meta = { @@ -46,24 +56,9 @@ let client-go = stdenvNoCC.mkDerivation { pname = "authentik-client-go"; - version = "3.${version}"; - inherit meta; + inherit version src meta; - src = fetchFromGitHub { - owner = "goauthentik"; - repo = "client-go"; - tag = "v3.2025.12.4"; - hash = "sha256-+/CfOE2HkBU+ZddvdXGenB/z8xNFk8cujpZpMXyh3cY="; - }; - - patches = [ - ./client-go-config.patch - ]; - - postPatch = '' - substituteInPlace ./config.yaml \ - --replace-fail '/local' "$(pwd)" - ''; + sourceRoot = "${src.name}/packages/client-go"; nativeBuildInputs = [ openapi-generator-cli @@ -86,10 +81,9 @@ let installPhase = '' runHook preInstall - cp go.mod go.sum $out - cd $out rm -rf test + rm -f go.mod go.sum rm -f .travis.yml git_push.sh runHook postInstall @@ -101,8 +95,8 @@ let inherit version src meta; postPatch = '' - substituteInPlace ./scripts/api/ts-config.yaml \ - --replace-fail '/local' "$(pwd)" + substituteInPlace ./packages/client-ts/config.yaml \ + --replace-fail '/local' "$(pwd)/packages/client-ts" ''; nativeBuildInputs = [ @@ -117,7 +111,7 @@ let openapi-generator-cli generate \ -i ./schema.yml -o $out \ -g typescript-fetch \ - -c ./scripts/api/ts-config.yaml \ + -c ./packages/client-ts/config.yaml \ --additional-properties=npmVersion=${version} \ --git-repo-id authentik --git-user-id goauthentik @@ -128,32 +122,19 @@ let ''; }; - # prefetch-npm-deps does not save all dependencies even though the lockfile is fine - website-deps = stdenvNoCC.mkDerivation { + website-deps = buildNpmPackage { pname = "authentik-website-deps"; inherit src version meta; sourceRoot = "${src.name}/website"; - outputHash = - { - "aarch64-linux" = "sha256-smm9x29z7gOI7Wq0NvP45KHtBbT6p1lH6IjEf9LRuGs="; - "x86_64-linux" = "sha256-K86wnn50svP+QG3i0mggH8RQgfoIqEmyQTouz35xzw8="; - } - .${stdenvNoCC.hostPlatform.system} or (throw "authentik-website-deps: unsupported host platform"); - - outputHashMode = "recursive"; - - nativeBuildInputs = [ - nodejs - cacert - ]; - - buildPhase = '' - npm ci --cache ./cache - - rm -r ./cache node_modules/.package-lock.json - ''; + inherit nodejs; + npmDepsHash = "sha256-SkIZF+wQPgoZOGJc0YR8Ot07KCsAdA1985SLQaoibfA="; + npmDepsFetcherVersion = 2; + makeCacheWritable = true; + npmInstallFlags = [ "--legacy-peer-deps" ]; + npmRebuildFlags = [ "--ignore-scripts" ]; + dontNpmBuild = true; # dependencies of workspace projects are installed into separate node_modules folders with # symlinks between them, so we have to copy all of them @@ -208,8 +189,8 @@ let outputHash = { - "aarch64-linux" = "sha256-J9wGQe7iMfKznNk3woqi0VNVNA/dE6TGi2f44DOlG1c="; - "x86_64-linux" = "sha256-9Q590Rw0mk3q5osxOKGWU7+XtKwkTyA+CLC2LxAA/3g="; + "aarch64-linux" = "sha256-41xZEfLul92vJATZqyVnd7Pp++NzLL/u8NeJJPHpXrw="; + "x86_64-linux" = "sha256-p6xjAinU2Isl/uYgoJuacqHN7jBnbWam40J6AQudbtQ="; } .${stdenvNoCC.hostPlatform.system} or (throw "authentik-webui-deps: unsupported host platform"); outputHashMode = "recursive"; @@ -220,6 +201,7 @@ let ]; buildPhase = '' + chmod -R +w . ../packages/client-ts npm ci --cache ./cache --ignore-scripts rm -r ./cache node_modules/.package-lock.json @@ -295,7 +277,7 @@ let ]; }; - python = python3.override { + python = python314.override { self = python; packageOverrides = final: prev: { # https://github.com/goauthentik/authentik/pull/16324 @@ -325,7 +307,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ channels @@ -347,7 +333,11 @@ let build-system = with final; [ hatchling ]; - propagatedBuildInputs = + pythonRelaxDeps = [ + "structlog" + ]; + + dependencies = with final; [ cron-converter @@ -376,62 +366,6 @@ let ]; }; - # Running authentik currently requires a custom version. - # Look in `pyproject.toml` for changes to the rev in the `[tool.uv.sources]` section. - # See https://github.com/goauthentik/authentik/pull/14057 for latest version bump. - djangorestframework = final.buildPythonPackage { - pname = "djangorestframework"; - version = "3.16.0"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "authentik-community"; - repo = "django-rest-framework"; - rev = "896722bab969fabc74a08b827da59409cf9f1a4e"; - hash = "sha256-YrEDEU3qtw/iyQM3CoB8wYx57zuPNXiJx6ZjrIwnCNU="; - }; - - propagatedBuildInputs = with final; [ - django - pytz - ]; - - nativeCheckInputs = with final; [ - pytest-django - pytest7CheckHook - - # optional tests - coreapi - django-guardian - inflection - pyyaml - uritemplate - ]; - - disabledTests = [ - "test_ignore_validation_for_unchanged_fields" - "test_invalid_inputs" - "test_shell_code_example_rendering" - "test_unique_together_condition" - "test_unique_together_with_source" - ]; - - pythonImportsCheck = [ "rest_framework" ]; - }; - - # authentik is currently not compatible with v1.18 and fails with the following error: - # > AttributeError: 'Namespace' object has no attribute 'worker_fork_timeout'. Did you mean: 'worker_shutdown_timeout'? - dramatiq = prev.dramatiq.overrideAttrs (_: rec { - version = "1.17.1"; - - src = fetchFromGitHub { - owner = "Bogdanp"; - repo = "dramatiq"; - tag = "v${version}"; - hash = "sha256-NeUGhG+H6r+JGd2qnJxRUbQ61G7n+3tsuDugTin3iJ4="; - }; - }); - authentik-django = final.buildPythonPackage { pname = "authentik-django"; inherit version src meta; @@ -548,7 +482,32 @@ let inherit (python.pkgs) authentik-django; - # Provide a setup-hook to configure the Go vendor directory with up-to-date API bindings. + worker = (rustPlatform.buildRustPackage.override { stdenv = clangStdenv; }) { + pname = "authentik-worker"; + inherit version src meta; + + cargoHash = "sha256-KExlNyT9G3R5rnt99beT2pYrWxezMLhGw+Q9T1X2kj4="; + + nativeBuildInputs = [ + cmake + go + perl + ]; + + buildInputs = [ python ]; + + env = { + PYO3_PYTHON = lib.getExe python; + RUSTFLAGS = "--cfg tokio_unstable"; + }; + + cargoBuildFlags = cargoPackageFlags; + + # Upstream currently has no Rust tests in this package. + doCheck = false; + }; + + # Provide a setup-hook to configure the Go source tree with up-to-date API bindings. # This is done to avoid the `vendorHash` depending on anything in the `client-go` build (e.g. # openapi-generator-cli version updates changing the produced content) and invalidating the hash. apiGoVendorHook = @@ -559,9 +518,10 @@ let ( writeShellScript "authentik-api-go-vendor-hook" '' authentikApiGoVendorHook() { - chmod -R +w vendor/goauthentik.io/api - rm -rf vendor/goauthentik.io/api/v3 - cp -r ${client-go} vendor/goauthentik.io/api/v3 + chmod -R +w packages/client-go + rm -rf packages/client-go + cp -r ${client-go} packages/client-go + chmod -R +w packages/client-go echo "Finished authentikApiGoVendorHook" } @@ -593,10 +553,11 @@ let # calculate the vendorHash without other dependencies, so it is only based on the `go.sum` file overrideModAttrs.postPatch = ""; - vendorHash = "sha256-pdQg02f1K4nOhsnadoplQYOhEybqZxn+yDQRN5RNygM="; + vendorHash = "sha256-EVDOZ4USaJoIBDB8mM4ZSBfsSc1d/NOm1Qv/hUJ+8f4="; postInstall = '' - mv $out/bin/server $out/bin/authentik + mv $out/bin/server $out/bin/authentik-server + ln -s authentik-server $out/bin/authentik ''; subPackages = [ "cmd/server" ]; @@ -612,11 +573,6 @@ stdenvNoCC.mkDerivation { postPatch = '' rm Makefile patchShebangs lifecycle/ak - - # This causes issues in systemd services - substituteInPlace lifecycle/ak \ - --replace-fail 'printf' '>&2 printf' \ - --replace-fail '>/dev/stderr' "" ''; installPhase = '' @@ -627,8 +583,9 @@ stdenvNoCC.mkDerivation { wrapProgram $out/bin/ak \ --prefix PATH : ${ lib.makeBinPath [ - (python.withPackages (ps: [ ps.authentik-django ])) + worker proxy + (python.withPackages (ps: [ ps.authentik-django ])) ] } \ --set TMPDIR /dev/shm \ @@ -638,7 +595,7 @@ stdenvNoCC.mkDerivation { ''; passthru = { - inherit proxy apiGoVendorHook; + inherit proxy worker apiGoVendorHook; outposts = callPackages ./outposts.nix { inherit (proxy) vendorHash; inherit apiGoVendorHook; diff --git a/pkgs/by-name/au/auto-editor/package.nix b/pkgs/by-name/au/auto-editor/package.nix index 2d66a987d949..e4f4af57f247 100644 --- a/pkgs/by-name/au/auto-editor/package.nix +++ b/pkgs/by-name/au/auto-editor/package.nix @@ -1,7 +1,5 @@ { lib, - stdenv, - config, buildNimPackage, fetchFromGitHub, @@ -9,9 +7,9 @@ yt-dlp, lame, libopus, - libvpx, x264, dav1d, + zlib, python3, python3Packages, @@ -19,13 +17,13 @@ buildNimPackage rec { pname = "auto-editor"; - version = "30.4.0"; + version = "31.0.0"; src = fetchFromGitHub { owner = "WyattBlue"; repo = "auto-editor"; tag = version; - hash = "sha256-AzUTDOWzyhZLrwqO9HfZ/Ke72LElJAMzVoDydBfYKwg="; + hash = "sha256-25xzVaG9seu4hE5rc776lvNucf8lsEDvjkQPbFzjgII="; }; lockFile = ./lock.json; @@ -36,6 +34,7 @@ buildNimPackage rec { libopus x264 dav1d + zlib ]; env = { @@ -61,19 +60,6 @@ buildNimPackage rec { python3Packages.av ]; - checkPhase = '' - runHook preCheck - - eval "nim r --nimcache:$NIX_BUILD_TOP/nimcache $nimFlags $src/tests/unit.nim" - - substituteInPlace tests/test.py \ - --replace-fail '"./auto-editor"' "\"$out/bin/main\"" - - python3 tests/test.py - - runHook postCheck - ''; - postInstall = '' mv $out/bin/main $out/bin/auto-editor ''; diff --git a/pkgs/by-name/au/auto-patchelf/package.nix b/pkgs/by-name/au/auto-patchelf/package.nix index adff3a5e40c0..7823a55c72e5 100644 --- a/pkgs/by-name/au/auto-patchelf/package.nix +++ b/pkgs/by-name/au/auto-patchelf/package.nix @@ -38,6 +38,9 @@ stdenv.mkDerivation { mainProgram = "auto-patchelf"; license = lib.licenses.mit; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ Scrumplex ]; + maintainers = with lib.maintainers; [ + Scrumplex + layus + ]; }; } diff --git a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py index 33813168f560..bda5329a1df3 100644 --- a/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py +++ b/pkgs/by-name/au/auto-patchelf/source/auto-patchelf.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 import argparse +import errno import os import pprint import subprocess @@ -195,6 +196,12 @@ def populate_cache(initial: list[Path], recursive: bool =False) -> None: except ELFError: # Not an ELF file in the right format pass + except OSError as e: + if e.errno == errno.EINVAL: + # pyelftools can raise EINVAL for certain compressed sections. + pass + else: + raise def find_dependency(soname: str, soarch: str, soabi: str) -> Optional[Path]: @@ -343,6 +350,10 @@ def auto_patchelf_file(logger: Logger, path: Path, runtime_deps: list[Path], app except ELFError: return [] + except OSError as e: + if e.errno == errno.EINVAL: + return [] + raise # these platforms are packaged in nixpkgs with ld.so in a separate derivation # than libc.so and friends. keep_libc is mandatory. diff --git a/pkgs/build-support/setup-hooks/auto-patchelf.sh b/pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh similarity index 100% rename from pkgs/build-support/setup-hooks/auto-patchelf.sh rename to pkgs/by-name/au/autoPatchelfHook/auto-patchelf.sh diff --git a/pkgs/by-name/au/autoPatchelfHook/package.nix b/pkgs/by-name/au/autoPatchelfHook/package.nix new file mode 100644 index 000000000000..c537f113afcf --- /dev/null +++ b/pkgs/by-name/au/autoPatchelfHook/package.nix @@ -0,0 +1,21 @@ +{ + lib, + makeSetupHook, + auto-patchelf, + bintools, + stdenv, +}: + +makeSetupHook { + name = "auto-patchelf-hook"; + propagatedBuildInputs = [ + auto-patchelf + bintools + ]; + substitutions = { + hostPlatform = stdenv.hostPlatform.config; + }; + meta = { + maintainers = with lib.maintainers; [ layus ]; + }; +} ./auto-patchelf.sh diff --git a/pkgs/by-name/au/autobrr/package.nix b/pkgs/by-name/au/autobrr/package.nix index 9881bb6ee8bf..7da263486503 100644 --- a/pkgs/by-name/au/autobrr/package.nix +++ b/pkgs/by-name/au/autobrr/package.nix @@ -16,12 +16,12 @@ let pname = "autobrr"; - version = "1.80.0"; + version = "1.82.1"; src = fetchFromGitHub { owner = "autobrr"; repo = "autobrr"; tag = "v${version}"; - hash = "sha256-LWnax0/BNPDZeaH+KG1Fi8qrAvHhr1Oo8XNQWkO5pvM="; + hash = "sha256-dB/lk05v9L8GAF//N1We3byhsK+156rzRT+r9Q+EVD4="; }; autobrr-web = stdenvNoCC.mkDerivation { @@ -46,7 +46,7 @@ let ; pnpm = pnpm_11; fetcherVersion = 4; - hash = "sha256-jkPm7SySkzriOTcLpibJazNAzUKE48s6vBEzY7+ypBU="; + hash = "sha256-wlikd38tAfgaSSD9L7DiSXRQFYcfVq5YA1eWs5NE4n8="; }; postBuild = '' @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { src ; - vendorHash = "sha256-9lvzU0tCuiYr0GsLtgG58pxNxoiyj0sT2R8UmYuRD8Y="; + vendorHash = "sha256-tsGl0uiQV25aemEQvedZUISrlO4IPE+V87nl31m8hZI="; preBuild = '' cp -r ${finalAttrs.passthru.autobrr-web}/* web/dist diff --git a/pkgs/by-name/au/autokey/package.nix b/pkgs/by-name/au/autokey/package.nix index 99e85f089f4b..4722e7557404 100644 --- a/pkgs/by-name/au/autokey/package.nix +++ b/pkgs/by-name/au/autokey/package.nix @@ -67,7 +67,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ dbus-python pyinotify - xlib + python-xlib pygobject3 packaging standard-imghdr @@ -96,7 +96,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Desktop automation utility for Linux and X11"; homepage = "https://github.com/autokey/autokey"; changelog = "https://github.com/autokey/autokey/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ iamanaws ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/au/autologin/package.nix b/pkgs/by-name/au/autologin/package.nix index fb7033aab148..65fa96a4b7a5 100644 --- a/pkgs/by-name/au/autologin/package.nix +++ b/pkgs/by-name/au/autologin/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Run a command inside of a new PAM user session"; - homepage = "https://sr.ht/~kennylevinsen/autologin"; + homepage = "https://git.sr.ht/~kennylevinsen/autologin"; changelog = "https://git.sr.ht/~kennylevinsen/autologin/refs/${finalAttrs.version}"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/au/automatic-timezoned/package.nix b/pkgs/by-name/au/automatic-timezoned/package.nix index a9a0557fbcdc..b77dc283face 100644 --- a/pkgs/by-name/au/automatic-timezoned/package.nix +++ b/pkgs/by-name/au/automatic-timezoned/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "automatic-timezoned"; - version = "2.0.126"; + version = "2.0.143"; src = fetchFromGitHub { owner = "maxbrunet"; repo = "automatic-timezoned"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-e6r8XfzwIdcGlQwN64bfSQ481b1ViLI+9jTxUYNsA3w="; + sha256 = "sha256-bbdhvQ9THiBRf1rLExXQiwlrkgZBFZlaV2CUszDmwo4="; }; - cargoHash = "sha256-0iUBZXybkK6y19RsZXSibcSRh4jEYwSSYUDyCI3ihOc="; + cargoHash = "sha256-J7h1hVp8wK6UlkstcLCq4uMKJ9ZyLwGR75tcxpWnHT8="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/au/autoprefixer/package.nix b/pkgs/by-name/au/autoprefixer/package.nix index 35ea1a5adc2c..76efe7f2cd45 100644 --- a/pkgs/by-name/au/autoprefixer/package.nix +++ b/pkgs/by-name/au/autoprefixer/package.nix @@ -11,13 +11,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "autoprefixer"; - version = "10.5.0"; + version = "10.5.3"; src = fetchFromGitHub { owner = "postcss"; repo = "autoprefixer"; tag = finalAttrs.version; - hash = "sha256-s152v9sIuQLvhfPsZvQa+O9UhoASgm/e8dnz0t4pP3A="; + hash = "sha256-hjckcgWojItp2gseQI18zzxizjw/HxQPiTb/JegSCcs="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-Sxt4vtdlMdXxXqt22hfZJskj8mkB5t85IZ5BsbCoDF4="; + hash = "sha256-diOgX9lXKOwCx9V737mmmtrhqDg5beXJH/PjlJHFpto="; }; installPhase = '' diff --git a/pkgs/by-name/au/autopush-rs/package.nix b/pkgs/by-name/au/autopush-rs/package.nix index 08c946b5d6a4..2fcc3e9db310 100644 --- a/pkgs/by-name/au/autopush-rs/package.nix +++ b/pkgs/by-name/au/autopush-rs/package.nix @@ -47,7 +47,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "autopush"; - version = "1.81.3"; + version = "1.82.2"; __structuredAttrs = true; strictDeps = true; @@ -61,10 +61,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "mozilla-services"; repo = "autopush-rs"; tag = finalAttrs.version; - hash = "sha256-DP02mcEMoQoJqi5rw5eSuep0i7zeJ0LLYsakikt9hho="; + hash = "sha256-do0EllSpXlJtPM9FnIWgwKemXHhDcj0P+aH6rnt4poE="; }; - cargoHash = "sha256-LqmuUtFF30TO6iw7LPFB7yJGrzrhh7R0OKCWMhe/OjU="; + cargoHash = "sha256-tXkNjgHW4sVWNCQehumbDW1H2azelqyqp5Wxk8M6sPc="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/au/autopush-rs/service-autoconnect.nix b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix index eca44eee4b87..a7fc8c429f31 100644 --- a/pkgs/by-name/au/autopush-rs/service-autoconnect.nix +++ b/pkgs/by-name/au/autopush-rs/service-autoconnect.nix @@ -24,7 +24,7 @@ in description = "Endpoint of the database server."; type = lib.types.str; default = ""; - example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}"; + example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}"; }; }; }; diff --git a/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix index d4c87dff54a7..beaf6060b901 100644 --- a/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix +++ b/pkgs/by-name/au/autopush-rs/service-autoendpoint.nix @@ -25,7 +25,7 @@ in description = "Endpoint of the database server."; type = lib.types.str; default = ""; - example = lib.literalExpression "redis+socket://${config.services.redis.servers.autopush-rs.unixSocket}"; + example = lib.literalExpression "redis+socket://\${config.services.redis.servers.autopush-rs.port}"; }; }; }; diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/by-name/au/autoreconfHook/autoreconf.sh similarity index 100% rename from pkgs/build-support/setup-hooks/autoreconf.sh rename to pkgs/by-name/au/autoreconfHook/autoreconf.sh diff --git a/pkgs/by-name/au/autoreconfHook/package.nix b/pkgs/by-name/au/autoreconfHook/package.nix new file mode 100644 index 000000000000..b3f1eefbb247 --- /dev/null +++ b/pkgs/by-name/au/autoreconfHook/package.nix @@ -0,0 +1,18 @@ +{ + lib, + makeSetupHook, + autoconf, + automake, + gettext, + libtool, +}: +makeSetupHook { + name = "autoreconf-hook"; + propagatedBuildInputs = [ + autoconf + automake + gettext + libtool + ]; + meta.license = lib.licenses.mit; +} ./autoreconf.sh diff --git a/pkgs/by-name/au/autosuspend/package.nix b/pkgs/by-name/au/autosuspend/package.nix index fe75c939e0d2..12f264b4f860 100644 --- a/pkgs/by-name/au/autosuspend/package.nix +++ b/pkgs/by-name/au/autosuspend/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "autosuspend"; - version = "10.1.0"; + version = "11.3.0"; pyproject = true; outputs = [ @@ -24,7 +24,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { owner = "languitar"; repo = "autosuspend"; tag = "v${finalAttrs.version}"; - hash = "sha256-4mByuJ75hd5TEoKxVglAHlYXZSlbAldMwnIianSw8O4="; + hash = "sha256-KG1Cv3Fmdf3VDdZR+k0SeA97g6R+oI6+NgtaWHWPVUQ="; }; postPatch = '' @@ -51,10 +51,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { icalendar jsonpath-ng lxml - mpd2 psutil pygobject3 python-dateutil + python-mpd2 requests requests-file tzdata @@ -100,6 +100,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { maintainers = with lib.maintainers; [ bzizou anthonyroussel + adamcstephens ]; mainProgram = "autosuspend"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/au/autotiling/package.nix b/pkgs/by-name/au/autotiling/package.nix index 5cf5011fb4e1..bdf1288a7523 100644 --- a/pkgs/by-name/au/autotiling/package.nix +++ b/pkgs/by-name/au/autotiling/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "autotiling"; - version = "1.9.3"; + version = "1.9.4"; pyproject = true; src = fetchFromGitHub { owner = "nwg-piotr"; repo = "autotiling"; tag = "v${finalAttrs.version}"; - hash = "sha256-k+UiAGMB/fJiE+C737yGdyTpER1ciZrMkZezkcn/4yk="; + hash = "sha256-iD5ids+tmb/QFbsGa3QhfxXVCEBQZTG3ZAweOwdGfeE="; }; build-system = [ diff --git a/pkgs/by-name/av/avahi/package.nix b/pkgs/by-name/av/avahi/package.nix index 4a8a1f29cea2..dc9b7fee4dc6 100644 --- a/pkgs/by-name/av/avahi/package.nix +++ b/pkgs/by-name/av/avahi/package.nix @@ -11,6 +11,7 @@ expat, gettext, glib, + autoconf-archive, autoreconfHook, libiconv, libevent, @@ -180,6 +181,12 @@ stdenv.mkDerivation rec { ]; + postPatch = '' + # Remove the vendored ACX_PTHREAD macro in favor of the more up-to-date + # implementation from autoconf-archive, especially to support static builds. + rm common/acx_pthread.m4 + ''; + depsBuildBuild = [ pkg-config ]; @@ -188,6 +195,7 @@ stdenv.mkDerivation rec { pkg-config gettext glib + autoconf-archive autoreconfHook ]; diff --git a/pkgs/by-name/av/avalonia/package.nix b/pkgs/by-name/av/avalonia/package.nix index 91460fe1cc90..e017df48942d 100644 --- a/pkgs/by-name/av/avalonia/package.nix +++ b/pkgs/by-name/av/avalonia/package.nix @@ -203,7 +203,7 @@ stdenvNoCC.mkDerivation ( meta = { homepage = "https://avaloniaui.net/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ corngood ]; description = "Cross-platform UI framework for dotnet"; sourceProvenance = with lib.sourceTypes; [ diff --git a/pkgs/by-name/av/avdl/package.nix b/pkgs/by-name/av/avdl/package.nix index 73fc9d463746..a9ef6507d626 100644 --- a/pkgs/by-name/av/avdl/package.nix +++ b/pkgs/by-name/av/avdl/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "avdl"; - version = "0.1.9+1.12.1"; + version = "0.1.10+1.12.1"; src = fetchFromGitHub { owner = "jonhoo"; repo = "avdl"; rev = "v${finalAttrs.version}"; - hash = "sha256-HfcDSv3RzmoFbwt7iAP/UXdeJupfng8oeaeerUwW1Ik="; + hash = "sha256-DGRBLXE8YMZs1fBBuTtUuhsc490IJB3G9Khddk3l8gw="; fetchSubmodules = true; }; - cargoHash = "sha256-5ftBXywOUQKzIwjaQVHtxO/6A1bb1jGZAxYYY7GttCg="; + cargoHash = "sha256-wTiQ1Ssn6Q1ZjR52a4+qyDrQqVUcP+/4paOjKKPJuII="; meta = { description = "Rust port of avro-tools' IDL tooling"; diff --git a/pkgs/by-name/av/avell-unofficial-control-center/package.nix b/pkgs/by-name/av/avell-unofficial-control-center/package.nix index 7802f3057deb..47c7961d686f 100644 --- a/pkgs/by-name/av/avell-unofficial-control-center/package.nix +++ b/pkgs/by-name/av/avell-unofficial-control-center/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication { pname = "avell-unofficial-control-center"; version = "1.0.4"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "rodgomesc"; @@ -17,14 +17,16 @@ python3Packages.buildPythonApplication { sha256 = "1qz1kv7p09nxffndzz9jlkzpfx26ppz66f8603zyamjq9dqdmdin"; }; - # No tests included - doCheck = false; + build-system = with python3Packages; [ setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ pyusb elevate ]; + # No tests included + doCheck = false; + meta = { homepage = "https://github.com/rodgomesc/avell-unofficial-control-center"; description = "Software for controlling RGB keyboard lights on some gaming laptops that use ITE Device(8291) Rev 0.03"; diff --git a/pkgs/by-name/av/aver/package.nix b/pkgs/by-name/av/aver/package.nix new file mode 100644 index 000000000000..ab28492ef5f7 --- /dev/null +++ b/pkgs/by-name/av/aver/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + lld, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "aver"; + version = "0.27.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jasisz"; + repo = "aver"; + tag = "v${finalAttrs.version}"; + hash = "sha256-jVXkHdTSTvHVKHe1jIYqISvm2oUolBWNLBxHt3KDpWk="; + }; + + cargoHash = "sha256-3ekeWs2o2TVe2SZgMKTGANTucSiR3aXaqOzJIaoAuK4="; + + cargoBuildFlags = [ + "--workspace" + "--bin=aver" + "--bin=aver-lsp" + ]; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ lld ]; + + # some tests are generated, some take a long time, some need to be skipped + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Programming language for auditable AI-written code"; + homepage = "https://github.com/jasisz/aver"; + changelog = "https://github.com/jasisz/aver/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "aver"; + }; +}) diff --git a/pkgs/by-name/av/avizo/package.nix b/pkgs/by-name/av/avizo/package.nix index b7e53f49079c..cbf8dde57f9f 100644 --- a/pkgs/by-name/av/avizo/package.nix +++ b/pkgs/by-name/av/avizo/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { version = "1.3-unstable-2024-11-03"; src = fetchFromGitHub { - owner = "misterdanb"; + owner = "heyjuvi"; repo = "avizo"; rev = "5efaa22968b2cc1a3c15a304cac3f22ec2727b17"; sha256 = "sha256-KYQPHVxjvqKt4d7BabplnrXP30FuBQ6jQ1NxzR5U7qI="; @@ -56,7 +56,7 @@ stdenv.mkDerivation { meta = { description = "Neat notification daemon for Wayland"; - homepage = "https://github.com/misterdanb/avizo"; + homepage = "https://github.com/heyjuvi/avizo"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ diff --git a/pkgs/by-name/av/avml/package.nix b/pkgs/by-name/av/avml/package.nix index bfa33693cb21..bcb3d53c666a 100644 --- a/pkgs/by-name/av/avml/package.nix +++ b/pkgs/by-name/av/avml/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "avml"; - version = "0.18.0"; + version = "0.20.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "avml"; tag = "v${finalAttrs.version}"; - hash = "sha256-d8H+UPCH3yyBNndlGzamgaPlhmvP4rcUSAywx8vYky0="; + hash = "sha256-ziK2s4Wwy+WB45O7OU3TKyTujrLsQV6hRUSm5Jr4NO4="; }; - cargoHash = "sha256-LxoyvjFVn69s9Wf8pF+9wBgOV4fJ/th6GPzLW6hbz0E="; + cargoHash = "sha256-72c2914higGji0vDUwjtQoil/LdEaECv+HqANTcSRdE="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; diff --git a/pkgs/by-name/av/avrdude/package.nix b/pkgs/by-name/av/avrdude/package.nix index c7b2bc61b4f5..98f2afbcbb61 100644 --- a/pkgs/by-name/av/avrdude/package.nix +++ b/pkgs/by-name/av/avrdude/package.nix @@ -31,13 +31,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "avrdude"; - version = "8.1"; + version = "8.2"; src = fetchFromGitHub { owner = "avrdudes"; repo = "avrdude"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-i1q0NQKVd/wiOm1Amop3hW+FWuefFOQCCivuEtEH38k="; + sha256 = "sha256-wUKUlJYbBo3oBUs/hWWN2epj4ji/9gsOGr5wrF9kz34="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/av/avro-tools/package.nix b/pkgs/by-name/av/avro-tools/package.nix index 962349c2119f..eb01fac8f562 100644 --- a/pkgs/by-name/av/avro-tools/package.nix +++ b/pkgs/by-name/av/avro-tools/package.nix @@ -36,6 +36,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "avro-tools"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix index c36e4dc538ce..15bc32e38af4 100644 --- a/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix +++ b/pkgs/by-name/aw/aw-watcher-window-wayland/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "aw-watcher-window-wayland"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-06-29"; src = fetchFromGitHub { owner = "ActivityWatch"; repo = "aw-watcher-window-wayland"; - rev = "c14e6fbaf1b811a46ec6b5c27d8656f0976a1850"; - hash = "sha256-U1tFdglzO5YcGPfzVAprol8bdQ1mO7OP1Q6gShG/fbk="; + rev = "24aecc62973a0bae784c7c4f3e179a50c989892b"; + hash = "sha256-LJ+8snTq/l1Pstw686jxNSFaq3hXloWtODgh7+YsdwU="; }; cargoHash = "sha256-WWT8tOrHPf5x3bXsVPt32VKut4qK+K8gickBfEc0zmk="; diff --git a/pkgs/by-name/aw/await/package.nix b/pkgs/by-name/aw/await/package.nix index ff467f90fb03..228037dc0ccc 100644 --- a/pkgs/by-name/aw/await/package.nix +++ b/pkgs/by-name/aw/await/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "await"; - version = "2.4.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "slavaGanzin"; repo = "await"; tag = finalAttrs.version; - hash = "sha256-MpdP4OJvxjF8zbKQ1YGVrtcC8RKxDNHDA90tWvLDQbU="; + hash = "sha256-dtFwlGFjuaUdbggcFviLTnv2zBY6ktK8BASiz4XUeoE="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/aw/awatcher/package.nix b/pkgs/by-name/aw/awatcher/package.nix index e536a00b6423..d70a02326c02 100644 --- a/pkgs/by-name/aw/awatcher/package.nix +++ b/pkgs/by-name/aw/awatcher/package.nix @@ -4,24 +4,28 @@ fetchFromGitHub, openssl, pkg-config, + libxkbcommon, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "awatcher"; - version = "0.3.1"; + version = "0.3.3"; src = fetchFromGitHub { owner = "2e3s"; repo = "awatcher"; rev = "v${finalAttrs.version}"; - hash = "sha256-bxFc6oM+evIQTjrsWmb7dXOUlSjurjc4CzHpxB+667c="; + hash = "sha256-wxnbyWkfRFN+aWa7rrSIv5PdNHNU/D/w7y/VIwzxxaI="; }; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ + openssl + libxkbcommon + ]; doCheck = false; - cargoHash = "sha256-pUqwg7jblSWRLPcsUDqkir/asSM8zY0jrvrre4OIeZc="; + cargoHash = "sha256-/dI0gaTRElAQnZNRo2sKMUc33fphubcG/fXOflPHXWs="; meta = { description = "Activity and idle watchers"; diff --git a/pkgs/by-name/aw/aws-c-http/package.nix b/pkgs/by-name/aw/aws-c-http/package.nix index 01b333b01b35..9f0fd8c16f04 100644 --- a/pkgs/by-name/aw/aws-c-http/package.nix +++ b/pkgs/by-name/aw/aws-c-http/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-c-http"; # nixpkgs-update: no auto update - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-http"; rev = "v${finalAttrs.version}"; - hash = "sha256-t9PoxOjgV9qLris+C18SaEwXodBGcgK591LZl0dajxU="; + hash = "sha256-SCdZfGIIHU6f0OArygZm0yY0wE6Hdx/JWvHZcK1DQOw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/aws-c-io/package.nix b/pkgs/by-name/aw/aws-c-io/package.nix index 590195761664..960d79c9a43d 100644 --- a/pkgs/by-name/aw/aws-c-io/package.nix +++ b/pkgs/by-name/aw/aws-c-io/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "aws-c-io"; # nixpkgs-update: no auto update - version = "0.22.0"; + version = "0.27.2"; src = fetchFromGitHub { owner = "awslabs"; repo = "aws-c-io"; rev = "v${finalAttrs.version}"; - hash = "sha256-NOEjXk4s/FV4CdmyXOr4Oh2y+pFNrUMP/Sy+X+fVQc4="; + hash = "sha256-0vzuSvJ/4you0YYnizjctKP5AcLm5sJieDOSCHwm1HM="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json new file mode 100644 index 000000000000..d4e3201c1a22 --- /dev/null +++ b/pkgs/by-name/aw/aws-cdk-cli/missing-hashes.json @@ -0,0 +1,57 @@ +{ + "@esbuild/aix-ppc64@npm:0.28.1": "9b01eaa9c57542436436de762466b9a348b4596aa53dffa6e7034e4180691e1948d33fe34ec302239ab04c280e5166248880f24531011ff419fbec6986a265f3", + "@esbuild/android-arm64@npm:0.28.1": "7c977c8d4cea5126df4b298d5c31c3df8d14aa05d7477aa11c4147ec7baff17d25542234eea0134f279191b59cb1af18fee49c6916afda554484464129e4f9c3", + "@esbuild/android-arm@npm:0.28.1": "44baed9765216202f71b6aae8d9ddb930efa671d34f63f4220d980662b3df4da7972e965c0a0f12922147aa8428083686f6cb23cd9a4f140eaf922ae0b59c2a0", + "@esbuild/android-x64@npm:0.28.1": "1b8183640bef23f41a91598d898a04a6a8e3ca31d0100207c7e75928ee885878c04e3bcf31f27ed9c655d6d8a7c08e35e3afef035aee649488cb2d68e51abf1e", + "@esbuild/darwin-arm64@npm:0.28.1": "8ed80a99836df196c2b7996448eabb2d503ec8c71d0a8be59af4eed457b858fa5fd9292528b1967f0e106d2a045387e375207a2cc262cd45f89596681e94e7fd", + "@esbuild/darwin-x64@npm:0.28.1": "952b23f33c24aea13f5a78fd41731e06e8c7fa732e10995327fa1289115da6b4123899ca0cdb0cf0a56add29efcb9f7891ad6fda0bfb94541347275537a71e77", + "@esbuild/freebsd-arm64@npm:0.28.1": "cc2c4f1f13230607807c3f128680d789e85d4b93309501c4f8d84ed0674f4a2a3e60e279e3b997ee9f797047c1c5b906b25e4fe37de62d19634e4470bcb16f32", + "@esbuild/freebsd-x64@npm:0.28.1": "5b99b980599567ee931520a019beaeea4c7ae2874d0bfab79ee4bd6373a869251d2175946478c527490ce155d10a5bcc795e8c986dceb4a36fb6e813513fc54c", + "@esbuild/linux-arm64@npm:0.28.1": "9348c6bfc2d878e6213cffe482d4455d817b9e56b3c581a9f68b94aac720cddea5733d963dec57ca273039f3a7ca1714f1ac8e39e2e0f85f1af42f5d05e3ed00", + "@esbuild/linux-arm@npm:0.28.1": "654d7af59b4be40f585455e42ecb389657c6f11b1f2be2d5ab04caeac0514574d8b2a28b9f0f9805d92e266a44a5627c5acc8151b0d0379f75ac1490fecc013d", + "@esbuild/linux-ia32@npm:0.28.1": "cce27fbd8d74f34bb5507a5db8c0119aa377c7a070fd0be3881a8efddcdb8adeebe24dc97d55784d74a8bf4a60fb55b48899f41b5e931acaa3eb9f90ecc94a01", + "@esbuild/linux-loong64@npm:0.28.1": "47c3215d378f5da750300694b273b83db26d3e9ed36553696a1769da6d467e7557e289b46d211c93ab7a2978348b7415b66c7fec31658622f5bd356332b9d5b0", + "@esbuild/linux-mips64el@npm:0.28.1": "166d8888e731bdeba0c657382d429c0a979af2136100ee2491ec47b2e2ec55f6924fe2045880b48a6cdaeb3dcc44fc495f3f4b9a5aa3bb8c418d1f53f86b2ba1", + "@esbuild/linux-ppc64@npm:0.28.1": "a8eecb9e43a26dcb70a9805e685dec9f0caff0a8bac691b06a6db7c14ba0a69980ef0c01cb3fc1377ad63e2c4945f396fbbeaf008588bb232e9c0c37dcdb557b", + "@esbuild/linux-riscv64@npm:0.28.1": "cfde883f336e1811fee019a1df402000c7a8e6dc5a2b3577679fd0d9711d1a774c1faa194cc8954b18ca11f3a380ef32905ea90c241803831b61017d8a667c3b", + "@esbuild/linux-s390x@npm:0.28.1": "ea121d2fb6c8f6161312e0239258b584c431b4d23f320ace7cbc18da77034aac5ed383658d2a48fdfa32e38be07126a14aa26802b8e04d0e958e82646fb87f41", + "@esbuild/linux-x64@npm:0.28.1": "9b5458cf012247e31c6bf465e37553f2fc5aef3fccc6593bb30fee0c547958f9f00fbedd44e5bc076cf68d6791a4af2ce8714260fe341cb16843a78643773e3d", + "@esbuild/netbsd-arm64@npm:0.28.1": "86b5cf33fbad27ea5e7345601e711a26717bdf5ad119efa0b1bb9ad6a75f7cb2658c57ffb80f19491e3c7105f4698e76358ee2b6d57f48c9a230de9f588589c7", + "@esbuild/netbsd-x64@npm:0.28.1": "ff24c209715f7f122c711d3c51af099de27659837d3f7bd4cbea9a8868fa99a10b7af785058d18a1e32b2132989d1d1d82b8768df77ff25ab6cf19d58be3697d", + "@esbuild/openbsd-arm64@npm:0.28.1": "fe6590621116132baa0a2b9c2dc95c6342f146170ec1ffb343c29936580c369a69061676bef4e654ee27bad6491f531af3ba985aed7133eb16b758fffae6a445", + "@esbuild/openbsd-x64@npm:0.28.1": "2600c51c394945654f99b096fccba95e1d34fa3ecf4e78f40a7aee4573bf21dd955c274e0586768e9ebef3bff145ffe30231f1cb281ef5e679f7aa78dcc86687", + "@esbuild/openharmony-arm64@npm:0.28.1": "be9e1d1e4af478778ce847e28809fba0b754340a699e37ec03bc1a3cd4e84e4fde30ffea62099757877229b024d50331efd6270580492aa6be38eb2353ef5646", + "@esbuild/sunos-x64@npm:0.28.1": "349b9c7d879496456b2eb28f7bb3decc12a906007bb7fb24cb2b269f6b3e5138af109045b216bd0396762e63b802f0233408cc3dce802be5fcf242d4835b6bc8", + "@esbuild/win32-arm64@npm:0.28.1": "551ada5396e1f10e3d3592dd60a148a7257af1ab2317bba09e9ed18a6d7ee7e5961c68eb1fbaee4e8c1961b504807493e1b8f5c700dd1fb990f0cb36b240ad57", + "@esbuild/win32-ia32@npm:0.28.1": "2676ace6b4d63721da34873974152e869aed9fc8bd9fdff4b8df14a3a3e68b78a9b4566e643b90b948b4e85773cbf288a33a59d13979caaadd43b5adad68312c", + "@esbuild/win32-x64@npm:0.28.1": "8d658b74ed9b7494b3799093551d4c928a7916865ed42d00a135156cbd08612b53072e9e424f0687c10a93a444d30d6b0294b6a1d5fdba78078d706646ba558f", + "@nx/nx-darwin-arm64@npm:22.7.6": "b336dcf04ce9c07d4bfe908fadb6bf5cc791342b4991439f5a7c0075d587c3d4570696c44b5d595735accda2bdf29c04a56dd0705b499f6a6b70f9886d833097", + "@nx/nx-darwin-x64@npm:22.7.6": "391780c2f14249c92a32b1245099e3d98241719f2cdf0b81289dc28948d011f18089ba94e272394b28aa2fbe5904119b954a633fc8bf82e8250bb00821e06d28", + "@nx/nx-freebsd-x64@npm:22.7.6": "bebebd506d74cbb62e3cbf3afbcb66e125e2ad3e3cd346e1ee51bf11167561649c6e60db751292e64f3b3a8c8a424d803979392c78a191c08ef510093ff93ab0", + "@nx/nx-linux-arm-gnueabihf@npm:22.7.6": "56d67d7536b0e89c08949bba7f94c071ced817195c37f3d947113888e0f624a8b21d31aad13107c86ac2225705298112ac593c359675540fcc47f74adb25f6eb", + "@nx/nx-linux-arm64-gnu@npm:22.7.6": "e61ff5c461d96294182c0ee823f627c37e925972a50375a4499b3089dcbadd9249cdbc995d5f573271a5aa7cb7a82690575a4ee51e149b6e3959559172d390ff", + "@nx/nx-linux-arm64-musl@npm:22.7.6": "0c0e5ba1583a49063779edd776555e11dbaf85f11600756b62774283ca1d8c2a84ddfdfe7c0f175275d0401a6aedc84deac831534bb3e5588841d719429477ee", + "@nx/nx-linux-x64-gnu@npm:22.7.6": "d65682bc14813e0f1e8e1bc5356081b6ecfde7a2fc3236e1d813f0da8ffc712b3b1641c8ebd4389e577348db549757efa2084fd16119fc6393e242331b2bad9e", + "@nx/nx-linux-x64-musl@npm:22.7.6": "924ed33a107b6647abe10acd77fe41f113e82dd83961b05d73c8b3a3c7c85d60cb35cae3a976497a8ef4fd48ab574d4ae5b683efd225fd4c404408b0ab87c1f9", + "@nx/nx-win32-arm64-msvc@npm:22.7.6": "feda72abfa06e7143a795993888ff2da73936a3bab4e2ca787b102322494abb3b3f24a944dd51c1de409afc19e921c6c98879d80f27921e848254d2a432cdc09", + "@nx/nx-win32-x64-msvc@npm:22.7.6": "5066816d70bcb55051259fc3acde32fef67f9359e15810e64dd3c93e11db40632e11a517dd3b1993a468632a8d75335ce550499711a23b5e7166f3130175bcda", + "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", + "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", + "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", + "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "3aeff9aaf4ef6d786c517d9017b5c41b0af180cdbaf705d08e6e5b5ba9d5410d28ef6754c5f8a865f0bb5efd460dc1c4156b5e2201032c0a604a6c734ddbc848", + "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "b9f7a3e03db9edfc3480db056dd25229f901f21840ee768b69f349b66676a995a404e60617b3bcbd984f57f2199eb352dd6fad0f4420c3084ceef5e3293cdad5", + "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "4d03b8bcef5a90586a846d6d332f39cee211f3d330b6e10036969894b6ecfb70b047265e985d572def93b84f38621dec30e4b4bb42699dd784adbae3ca5e7bea", + "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "9f3a3c2e5e6418a5a78294fa042824f5c270e993c1a99e82dd6b0ee0d2869929bb62dd154a0acc1e4ef16273e8073e0e257901208c062e6bdd49d586d07bb419", + "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "05228d6fd669f404f0e3164ccf2430a52cc7b3bbd211367527b5d726b1220a1816bab70159bed55694d9b7543553f6002379e7e186c605d7055c5156977da022", + "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "8115802143396d4992bb2f6f0acb6e8bc141a57864c5fd84cbc70577c25784cb08dd163b753b1fc0decc02582cf4cb1e30d04faaf763048babbbe706bdfa26ea", + "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "50f9f54b2eafb1ea023671cc3070692b2b15f6e49105b08b3f588033e65e8de4183f76e080b798de710f9c41df1bf5515c01868866a21cbd35db179b4ac9f23b", + "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "8f8222f938cc2025ed3971e0e303f4ff5aa5df74474b835442830ebe942d050ba3f8bbb67095da64099e6fc69bb5bb73ca63db54e059c95e51aa8909880fb207", + "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "5c8987f7dcaf38ef27ec67dcf118141502d5ac75d28429da6d1b7037f3e5a5351f32f55094472fde11784e65d01f1da4dafd7c0fdca28423fbc8de2c2c51d16c", + "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "17aed6472880a82e5a05147a55efb6f0d968f5dcb584845addf89acec3824534ee741d4b162686124d17daf9131373c469c57843996a5ee2db4f1b1b55e1d11e", + "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "9495c08fc42f2d4a33e33c64adbcbf51588cd7ea07478eacb2e9143d955a760122440f4a3ac48b086cc2563ca2b2464d72ed0336fcc20c0a89ddc356f956eda8", + "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "c84fadfee66eeebd16eb7cce7c4b5a1ec90260c724d0064111e9f43a1341ebfede61627cb68fd3a9735e4c10b25606fb472a4d13143cc569867b80d85c4a9824", + "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5", + "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9", + "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854", + "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940" +} diff --git a/pkgs/by-name/aw/aws-cdk-cli/package.nix b/pkgs/by-name/aw/aws-cdk-cli/package.nix index 7124ccac6707..7a9edef0e3fc 100644 --- a/pkgs/by-name/aw/aws-cdk-cli/package.nix +++ b/pkgs/by-name/aw/aws-cdk-cli/package.nix @@ -2,40 +2,41 @@ lib, stdenv, fetchFromGitHub, - fetchYarnDeps, nodejs, - yarnBuildHook, - yarnConfigHook, - yarnInstallHook, + yarn-berry_4, diffutils, zip, jq, + python3, unzip, testers, - nix-update-script, }: +let + yarn-berry = yarn-berry_4; +in stdenv.mkDerivation (finalAttrs: { pname = "aws-cdk-cli"; - version = "2.1116.0"; + version = "2.1131.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-cdk-cli"; tag = "cdk@v${finalAttrs.version}"; - hash = "sha256-mRr5G42RrO87AdJOTLaM+EPprTFCI7eVxzUhafrGOxA="; + hash = "sha256-66kMwa9IJN0Culc+oAUazKBlXE3nRoPJ2/0/OaTRxjI="; }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-cjJBaq65sNWOFMFB1HAgGScxJlBZKnwkGipDd4aXhDE="; + missingHashes = ./missing-hashes.json; + offlineCache = yarn-berry.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-BVjva74w/6zHv6JKAPCBt5Pu72ztGSJYX5h4QffABkk="; }; nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook - yarnInstallHook + yarn-berry + yarn-berry.yarnBerryConfigHook nodejs + python3 zip jq # tests @@ -49,6 +50,7 @@ stdenv.mkDerivation (finalAttrs: { NX_VERBOSE_LOGGING = "true"; # Needed to properly embed version info CODEBUILD_RESOLVED_SOURCE_VERSION = finalAttrs.version; + YARN_LOCKFILE_VERSION_OVERRIDE = "8"; }; # Regular "build" is very heavy and does things we don't need. @@ -62,6 +64,13 @@ stdenv.mkDerivation (finalAttrs: { in '' echo '${cliVersionJson}' > packages/@aws-cdk/cloud-assembly-schema/cli-version.json + cat >> .yarnrc.yml <<'EOF' + approvedGitRepositories: + - "**" + enableScripts: true + enableNetwork: false + enableHardenedMode: false + EOF ''; preBuild = '' @@ -76,10 +85,27 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + buildPhase = '' + runHook preBuild + + yarn "$yarnBuildScript" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/node_modules/aws-cdk-cli + cp -r . $out/lib/node_modules/aws-cdk-cli + + runHook postInstall + ''; + postInstall = '' # Manually bundle non-bundled dependencies - cp -r packages/@aws-cdk/cloud-assembly-schema/node_modules/jsonschema $out/lib/node_modules/aws-cdk-cli/node_modules/jsonschema - cp -r packages/aws-cdk/node_modules/decamelize $out/lib/node_modules/aws-cdk-cli/node_modules/decamelize + cp -r node_modules/jsonschema $out/lib/node_modules/aws-cdk-cli/node_modules/jsonschema + cp -r node_modules/decamelize $out/lib/node_modules/aws-cdk-cli/node_modules/decamelize patchShebangs "$out/lib/node_modules/aws-cdk-cli/node_modules/aws-cdk/bin" ln -s "$out/lib/node_modules/aws-cdk-cli/node_modules/aws-cdk/bin" "$out/bin" @@ -102,12 +128,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; - updateScript = nix-update-script { - extraArgs = [ - "--version-regex" - "cdk@v(.*)" - ]; - }; + updateScript = ./update.sh; }; meta = { diff --git a/pkgs/by-name/aw/aws-cdk-cli/update.sh b/pkgs/by-name/aw/aws-cdk-cli/update.sh new file mode 100755 index 000000000000..e035b03d31b2 --- /dev/null +++ b/pkgs/by-name/aw/aws-cdk-cli/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p coreutils nix nix-update yarn-berry_4.yarn-berry-fetcher + +set -euo pipefail + +package_dir=$(realpath "$(dirname "$0")") + +# Update the source first. offlineCache cannot be updated until the hashes +# missing from the new yarn.lock have been regenerated below. +nix-update "$UPDATE_NIX_PNAME" --src-only --version-regex 'cdk@v(.*)' "$@" + +updated_version=$(nix-instantiate --eval --strict --attr "$UPDATE_NIX_PNAME.version" --raw) + +if [[ "$updated_version" == "$UPDATE_NIX_OLD_VERSION" ]]; then + echo "Package is already up to date: $updated_version" + exit 0 +fi + +src_path=$(nix-build --attr "$UPDATE_NIX_PNAME.src" --no-link) +yarn-berry-fetcher missing-hashes "$src_path/yarn.lock" >"$package_dir/missing-hashes.json" + +# Regenerate the hash of the Yarn offline cache after updating its missing hashes. +nix-update "$UPDATE_NIX_PNAME" --version skip diff --git a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix index ec8534cb4adc..242bb9a21f90 100644 --- a/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix +++ b/pkgs/by-name/aw/aws-codeartifact-proxy/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "aws-codeartifact-proxy"; - version = "1.0.0"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sktan"; repo = "aws-codeartifact-proxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-dcUJ2r0VBUNk8kKY1fPkUHoJi1fhAQbd2K+9MC/ddGE="; + hash = "sha256-iCUnlpQBXMI99gYE/YqNHq0pMsjHaB8BR2HV5GZwPi4="; }; sourceRoot = "${finalAttrs.src.name}/src"; - vendorHash = "sha256-5D/aKNU7ZtDMJW+KImBwN4bhpSexsldtCtA3IIHJrQU="; + vendorHash = "sha256-pBKVg4h2Ta99ekQHNwaVjlTp6YhKa5tsq3zw1y4/IU0="; meta = { description = "AWS CodeArtifact proxy to allow unauthenticated read access"; diff --git a/pkgs/by-name/aw/aws-lc/package.nix b/pkgs/by-name/aw/aws-lc/package.nix index 82c9506c9ca5..b25568341333 100644 --- a/pkgs/by-name/aw/aws-lc/package.nix +++ b/pkgs/by-name/aw/aws-lc/package.nix @@ -4,20 +4,22 @@ cmakeMinimal, fetchFromGitHub, ninja, + rust-bindgen, testers, aws-lc, nix-update-script, useSharedLibraries ? !stdenv.hostPlatform.isStatic, + withRustBindings ? true, }: stdenv.mkDerivation (finalAttrs: { pname = "aws-lc"; - version = "1.69.0"; + version = "5.0.0"; src = fetchFromGitHub { owner = "aws"; repo = "aws-lc"; rev = "v${finalAttrs.version}"; - hash = "sha256-ykpPbMONAJK6rEANOn0O7JfIkXPSoPXs1Zr4Bv+eXqQ="; + hash = "sha256-Dvy6mzEfKgimxCGp7q2fPk9urBMJMU6gZmaZXwdZfWw="; }; outputs = [ @@ -29,10 +31,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmakeMinimal ninja + ] + ++ lib.optionals withRustBindings [ + rust-bindgen ]; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" useSharedLibraries) + (lib.cmakeBool "GENERATE_RUST_BINDINGS" withRustBindings) "-GNinja" "-DDISABLE_GO=ON" "-DDISABLE_PERL=ON" @@ -47,6 +53,14 @@ stdenv.mkDerivation (finalAttrs: { runHook postCheck ''; + postInstall = '' + moveToOutput lib/crypto/cmake "$dev" + moveToOutput lib/ssl/cmake "$dev" + '' + + lib.optionalString withRustBindings '' + moveToOutput share/rust "$dev" + ''; + env.NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ # Needed with GCC 12 but breaks on darwin (with clang) diff --git a/pkgs/by-name/aw/aws-nuke/package.nix b/pkgs/by-name/aw/aws-nuke/package.nix index a757ad757c40..08dc434e2a7b 100644 --- a/pkgs/by-name/aw/aws-nuke/package.nix +++ b/pkgs/by-name/aw/aws-nuke/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "aws-nuke"; - version = "3.65.0"; + version = "3.66.0"; src = fetchFromGitHub { owner = "ekristen"; repo = "aws-nuke"; tag = "v${finalAttrs.version}"; - hash = "sha256-1C7vA/5fUw+RHK1m3MvxY6bTzG1m3PpsXTNow4mkWL4="; + hash = "sha256-usVPWopc+sNu1YcalVfHzJ+sN13yuOXbS+KAEISgaiU="; }; - vendorHash = "sha256-q1ASHG4KWlU8tLjHireMqmkW33Q2hy+ikOTWQPOYIXo="; + vendorHash = "sha256-Cm6cevKjg7nsWKtZKSMDZGrjRE7VimBVoX8gfBWf1cM="; subPackages = [ "." ]; diff --git a/pkgs/by-name/aw/aws-ofi-nccl/package.nix b/pkgs/by-name/aw/aws-ofi-nccl/package.nix new file mode 100644 index 000000000000..f2ad5f562812 --- /dev/null +++ b/pkgs/by-name/aw/aws-ofi-nccl/package.nix @@ -0,0 +1,71 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + autoAddDriverRunpath, + autoreconfHook, + numactl, + libuuid, + rdma-core, + libfabric, + hwloc, + cudaPackages, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "aws-ofi-nccl"; + version = "1.20.0"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "aws"; + repo = "aws-ofi-nccl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-QQlimX5sbdR+0PpQ3dLXcDqY5TthXF7Z5dtj6wIm+UQ="; + }; + + nativeBuildInputs = [ + autoAddDriverRunpath + autoreconfHook + ]; + + buildInputs = [ + numactl + libuuid + rdma-core + libfabric + hwloc + ] + ++ (with cudaPackages; [ + cuda_cudart + nccl + ]); + + postPatch = '' + patchShebangs m4 + echo "$version" > .release_version + ''; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = [ + "--enable-platform-aws" + "--with-cuda=${cudaPackages.cuda_nvcc}" + "--with-libfabric=${libfabric}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "This is a plugin which lets EC2 developers use libfabric as network provider while running NCCL applications"; + homepage = "https://github.com/aws/aws-ofi-nccl"; + changelog = "https://github.com/aws/aws-ofi-nccl/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jlesquembre ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/aw/aws-rotate-key/package.nix b/pkgs/by-name/aw/aws-rotate-key/package.nix index 86ecc79b1e7b..aad03a7e5992 100644 --- a/pkgs/by-name/aw/aws-rotate-key/package.nix +++ b/pkgs/by-name/aw/aws-rotate-key/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { version = "1.2.0"; src = fetchFromGitHub { - owner = "Fullscreen"; + owner = "stefansundin"; repo = "aws-rotate-key"; rev = "v${finalAttrs.version}"; sha256 = "sha256-fYpgHHOw0k/8WLGhq+uVOvoF4Wff6wzTXuN8r4D+TmU="; @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { meta = { description = "Easily rotate your AWS key"; - homepage = "https://github.com/Fullscreen/aws-rotate-key"; + homepage = "https://github.com/stefansundin/aws-rotate-key"; license = lib.licenses.mit; maintainers = [ lib.maintainers.mbode ]; mainProgram = "aws-rotate-key"; diff --git a/pkgs/by-name/aw/aws-sam-cli/package.nix b/pkgs/by-name/aw/aws-sam-cli/package.nix index a51ca8ee3066..bddeaeb6d778 100644 --- a/pkgs/by-name/aw/aws-sam-cli/package.nix +++ b/pkgs/by-name/aw/aws-sam-cli/package.nix @@ -11,14 +11,14 @@ python3.pkgs.buildPythonApplication rec { pname = "aws-sam-cli"; - version = "1.160.0"; + version = "1.163.0"; pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-sam-cli"; tag = "v${version}"; - hash = "sha256-IBxnBIgTSpPUNb/4yx3OqA7WFzudzRKgkKCFsJeyx08="; + hash = "sha256-ydyuQHdLWet5+HkPCmHiKqTFY8+nVOXTlPFfOckzOXE="; }; build-system = with python3.pkgs; [ setuptools ]; @@ -135,6 +135,8 @@ python3.pkgs.buildPythonApplication rec { # Tests are failing "tests/unit/commands/local/lib/" "tests/unit/local/lambda_service/test_local_lambda_http_service.py" + "tests/unit/local/apigw/test_local_apigw_service.py" + "tests/unit/local/apigw/test_event_constructor.py" ]; disabledTests = [ @@ -145,6 +147,8 @@ python3.pkgs.buildPythonApplication rec { "test_import_should_succeed_for_a_defined_hidden_package_540_pkg_resources_py2_warn" "test_updates_imageuri_when_pointing_to_local_archive" "test_subcommand_help_0_invoke" + "TestCli" + "TestImportModuleProxy" ]; pythonImportsCheck = [ "samcli" ]; diff --git a/pkgs/by-name/aw/aws-sso-cli/package.nix b/pkgs/by-name/aw/aws-sso-cli/package.nix index d553183cd34d..b643b6cbe685 100644 --- a/pkgs/by-name/aw/aws-sso-cli/package.nix +++ b/pkgs/by-name/aw/aws-sso-cli/package.nix @@ -6,19 +6,20 @@ lib, makeWrapper, stdenv, + writableTmpDirAsHomeHook, xdg-utils, }: buildGoModule (finalAttrs: { pname = "aws-sso-cli"; - version = "2.2.4"; + version = "2.3.1"; src = fetchFromGitHub { owner = "synfinatic"; repo = "aws-sso-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-JkCHzIbIeFvmXrIkQaybjUtPDzmZ2XPv6tz3fA6ni44="; + hash = "sha256-JFaCTgvH6qzQ8gMt5QgqAPBal2m8FZEemTgbqyECFck="; }; - vendorHash = "sha256-euqhgbyz8H/fQ1RAP0k4GMOjOu7gVeYzQv75tjCh5z0="; + vendorHash = "sha256-f9qSnEOUw8QWbc0rgStyzuL6lWtfy3UFhjqDAnJkKJA="; nativeBuildInputs = [ makeWrapper @@ -41,7 +42,14 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/aws-sso setup completions --source --shell=zsh) ''; - nativeCheckInputs = [ getent ]; + nativeCheckInputs = [ + getent + writableTmpDirAsHomeHook + ]; + + preCheck = '' + mkdir -p "$HOME/.config/aws-sso" + ''; checkFlags = let @@ -51,6 +59,7 @@ buildGoModule (finalAttrs: { "TestAWSConsoleUrlEU" "TestAWSConsoleUrlUSEast" "TestAWSConsoleUrlUSGov" + "TestGetScriptsAutoDetect" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "TestDetectShellBash" ]; in diff --git a/pkgs/by-name/aw/aws-vault/package.nix b/pkgs/by-name/aw/aws-vault/package.nix index c368c38e6a43..d9943b6f1cf4 100644 --- a/pkgs/by-name/aw/aws-vault/package.nix +++ b/pkgs/by-name/aw/aws-vault/package.nix @@ -10,17 +10,17 @@ }: buildGoModule (finalAttrs: { pname = "aws-vault"; - version = "7.11.1"; + version = "7.13.0"; src = fetchFromGitHub { owner = "ByteNess"; repo = "aws-vault"; rev = "v${finalAttrs.version}"; - hash = "sha256-GsE8UtER5KDIlVA36uFVoKPsX2pJNwotKtaizZH33t0="; + hash = "sha256-afmApbIydrouoXmu3inLE9EvwFqOJxVkNcVSDjZUcXY="; }; proxyVendor = true; - vendorHash = "sha256-spGYYxSeAfbOy+ze854IBBxxv07jnmE9rNGGqenkkCw="; + vendorHash = "sha256-I+yKJO+MOCd+wZn4uQt+Xg18b/PWYPm6qxzGEOsCACo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index 68c4209fb501..abaafeacb44e 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -12,6 +12,7 @@ awscli2, addBinToPathHook, writableTmpDirAsHomeHook, + cacert, }: let @@ -54,14 +55,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.34.24"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.35.11"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; tag = version; - hash = "sha256-PDoztQYKfH6FjdSyMQGsT8No3LB56naQ/AxTPN/dslQ="; + hash = "sha256-sjbuzDRFvqTD087vSwOM2IyG++El3NaDNCqHlyQwsxo="; }; postPatch = '' @@ -74,6 +75,7 @@ py.pkgs.buildPythonApplication rec { --replace-fail 'prompt-toolkit>=3.0.24,<3.0.52' 'prompt-toolkit>=3.0.24' \ --replace-fail 'ruamel_yaml>=0.15.0,<=0.19.1' 'ruamel_yaml>=0.15.0' \ --replace-fail 'ruamel_yaml_clib>=0.2.0,<=0.2.15' 'ruamel_yaml_clib>=0.2.0' \ + --replace-fail 'urllib3>=1.25.4,<=2.6.3' 'urllib3>=1.25.4' \ --replace-fail 'wcwidth<0.3.0' 'wcwidth>=0.3.0' substituteInPlace requirements-base.txt \ @@ -83,6 +85,8 @@ py.pkgs.buildPythonApplication rec { # with a configure script, but we don't as we provide all of the packages # through PYTHONPATH sed -i '/pip>=/d' requirements/bootstrap.txt + + ln -sf ${cacert}/etc/ssl/certs/ca-no-trust-rules-bundle.crt awscli/botocore/cacert.pem ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/aw/awsebcli/package.nix b/pkgs/by-name/aw/awsebcli/package.nix index 580885fb4d06..6efd8d221e81 100644 --- a/pkgs/by-name/aw/awsebcli/package.nix +++ b/pkgs/by-name/aw/awsebcli/package.nix @@ -27,7 +27,7 @@ in python.pkgs.buildPythonApplication (finalAttrs: { pname = "awsebcli"; - version = "3.27.2"; + version = "3.27.3"; pyproject = true; doInstallCheck = true; @@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { owner = "aws"; repo = "aws-elastic-beanstalk-cli"; tag = finalAttrs.version; - hash = "sha256-hTRgNqccwbXxpS4F+JD2h19N/U671NjCBEMiDp6Jbio="; + hash = "sha256-p7W9HoFND28jcqrMp7cFOzmarxvcA3wFhrOCHyvoj5E="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix index b678721ec1d3..94d6b865126e 100644 --- a/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-datetime/package.nix @@ -37,13 +37,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "${if enableLomiriFeatures then "lomiri" else "ayatana"}-indicator-datetime"; - version = "25.4.0"; + version = "26.6.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-datetime"; tag = finalAttrs.version; - hash = "sha256-8E9ucy8I0w9DDzsLtzJgICz/e0TNqOHgls9LrgA5nk4="; + hash = "sha256-zjAQjd5kFho8YfcoWRGbQbzzAJT0id5nh7zQoZXB1Uk="; }; postPatch = '' @@ -131,6 +131,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "GSETTINGS_LOCALINSTALL" true) (lib.cmakeBool "GSETTINGS_COMPILE" true) (lib.cmakeBool "ENABLE_LOMIRI_FEATURES" enableLomiriFeatures) + (lib.cmakeBool "ENABLE_MKCAL" enableLomiriFeatures) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) ] ++ lib.optionals enableLomiriFeatures [ diff --git a/pkgs/by-name/ay/ayatana-indicator-display/package.nix b/pkgs/by-name/ay/ayatana-indicator-display/package.nix index cb5970285cd3..5887c3ce1aa8 100644 --- a/pkgs/by-name/ay/ayatana-indicator-display/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-display/package.nix @@ -30,23 +30,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-display"; - version = "24.5.2"; + version = "26.6.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-display"; tag = finalAttrs.version; - hash = "sha256-rsZjEfAiz1HC5XMjPume1Y6miNAv1kmPFP4J/+NKlsA="; + hash = "sha256-A4v2cdsFgR50b8BGAMpR9DrHxlVlahaM8Fii+eQ3UcA="; }; - patches = [ - # This should be dropped once the issue is fixed upstream. - # https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/108 - ./patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch - ./patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch - ./patches/0003-Fix-cppcheck-warning-has-no-initializer.patch - ]; - postPatch = '' # Replace systemd prefix in pkg-config query, use GNUInstallDirs location for /etc substituteInPlace data/CMakeLists.txt \ diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch deleted file mode 100644 index 3c460a90236a..000000000000 --- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0001-service.cpp-Mark-create_phone_menu-as-static.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5a1ce0ea5fd630efc7d85d681dacb562c356c3a3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= -Date: Sun, 29 Mar 2026 21:49:07 -0700 -Subject: [PATCH 1/3] service.cpp: Mark create_phone_menu as static - -to satisfy cppcheck ---- - src/service.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/service.cpp b/src/service.cpp -index d6b4ed7..ced370c 100644 ---- a/src/service.cpp -+++ b/src/service.cpp -@@ -1058,7 +1058,7 @@ private: - static_cast(gself)->update_phone_header(); - } - -- GMenuModel* create_phone_menu() -+ static GMenuModel* create_phone_menu() - { - GMenu* menu; - GMenu* section; --- -2.43.0 - diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch deleted file mode 100644 index 8626f610b2d5..000000000000 --- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0002-cppcheck-Workaround-undefined-function-like-macro-fo.patch +++ /dev/null @@ -1,49 +0,0 @@ -From 3f30df763c2b0ac84b1c754faaedc69107539508 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= -Date: Sun, 29 Mar 2026 17:02:56 -0700 -Subject: [PATCH 2/3] cppcheck: Workaround undefined function-like macro for - GLIB_CHECK_VERSION - -Copy a snippet from gtk.cfg. - -I didn't include gtk.cfg directly because its config triggers -additional failures, so only copy the one line that we need - -https://github.com/danmar/cppcheck/commit/8c762adcdd9e - -https://bugs.debian.org/1125642 - -Closes: #106 ---- - tests/CMakeLists.txt | 2 +- - tests/ayatana.cfg | 5 +++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - create mode 100644 tests/ayatana.cfg - -diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index bdc074f..97d6be0 100644 ---- a/tests/CMakeLists.txt -+++ b/tests/CMakeLists.txt -@@ -28,7 +28,7 @@ endif() - - add_compile_options(${CXX_WARNING_ARGS}) - --add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride) -+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --check-level=exhaustive --error-exitcode=2 --inline-suppr --library=qt --library=${CMAKE_SOURCE_DIR}/tests/ayatana.cfg -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter --suppress=constParameterCallback --suppress=unusedFunction --suppress=uselessOverride) - - add_subdirectory (unit) - -diff --git a/tests/ayatana.cfg b/tests/ayatana.cfg -new file mode 100644 -index 0000000..035020a ---- /dev/null -+++ b/tests/ayatana.cfg -@@ -0,0 +1,5 @@ -+ -+ -+ -+ -+ --- -2.43.0 - diff --git a/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch b/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch deleted file mode 100644 index 918bc200a5ed..000000000000 --- a/pkgs/by-name/ay/ayatana-indicator-display/patches/0003-Fix-cppcheck-warning-has-no-initializer.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 172bf8a7d8e232d31a85ef61d21ee54b6c2eab7c Mon Sep 17 00:00:00 2001 -From: fliiiix -Date: Tue, 9 Jun 2026 15:33:29 +0200 -Subject: [PATCH 3/3] Fix cppcheck warning has no initializer - -cppcheck 2.21.0 ---- - src/service.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/service.cpp b/src/service.cpp -index ced370c..251df5b 100644 ---- a/src/service.cpp -+++ b/src/service.cpp -@@ -50,9 +50,9 @@ extern "C" - - typedef struct - { -- guint nTempLow; -- guint nTempHigh; -- const gchar *sName; -+ guint nTempLow{}; -+ guint nTempHigh{}; -+ const gchar *sName = nullptr; - } TempProfile; - - TempProfile m_lTempProfiles[] = --- -2.43.0 - diff --git a/pkgs/by-name/ay/ayatana-indicator-power/package.nix b/pkgs/by-name/ay/ayatana-indicator-power/package.nix index 90674e4fd631..b1aa6fed05fa 100644 --- a/pkgs/by-name/ay/ayatana-indicator-power/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-power/package.nix @@ -13,7 +13,7 @@ libayatana-common, libnotify, librda, - lomiri, + lomiri-qt6, pkg-config, python3, systemd, @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-power"; - version = "24.5.2"; + version = "26.6.0"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-power"; tag = finalAttrs.version; - hash = "sha256-A9Kbs+qH01rkuLt8GINdPI2vCu0bCO+/g4kZhDj8GsY="; + hash = "sha256-3Jw3MrKHiyGw511GucAtV790UP43EuAC89Q1TMfytyY="; }; postPatch = '' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { # Path needed for build-time codegen substituteInPlace src/CMakeLists.txt \ - --replace-fail '/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' '${lomiri.lomiri-schemas}/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' + --replace-fail '/usr/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' '${lomiri-qt6.lomiri-schemas}/share/accountsservice/interfaces/com.lomiri.touch.AccountsService.Sound.xml' ''; strictDeps = true; @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { librda systemd ] - ++ (with lomiri; [ + ++ (with lomiri-qt6; [ cmake-extras deviceinfo lomiri-schemas diff --git a/pkgs/by-name/ay/ayatana-indicator-session/package.nix b/pkgs/by-name/ay/ayatana-indicator-session/package.nix index 39a05c6e5d03..9b48ca33f5a9 100644 --- a/pkgs/by-name/ay/ayatana-indicator-session/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-session/package.nix @@ -13,7 +13,7 @@ intltool, libayatana-common, librda, - lomiri, + lomiri-qt6, mate-settings-daemon, pkg-config, systemd, @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-session"; - version = "24.5.1"; + version = "26.6.1"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-session"; tag = finalAttrs.version; - hash = "sha256-jqcgQTsC4VBit3wwtKKTdEG71CUPJpeMtpzikE4IGhE="; + hash = "sha256-rrjtLiZ+qaqB1QowGqp3SfWsgzqIYHYEzEzAERiLLBs="; }; postPatch = '' @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - lomiri.cmake-extras + lomiri-qt6.cmake-extras glib gsettings-desktop-schemas libayatana-common diff --git a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix index 67a1e24a152e..f73be0485ca3 100644 --- a/pkgs/by-name/ay/ayatana-indicator-sound/package.nix +++ b/pkgs/by-name/ay/ayatana-indicator-sound/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ayatana-indicator-sound"; - version = "24.5.2"; + version = "24.5.3"; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-indicator-sound"; tag = finalAttrs.version; - hash = "sha256-qdvte+Mm64O/JhI0luJAGAWoCgukKCbPrp5k8SIDuwM="; + hash = "sha256-6KrBlAh8do6O7CGb3mO25y1188w2cVwRxplQe8TBlQ4="; }; postPatch = '' diff --git a/pkgs/by-name/ay/ayatana-webmail/package.nix b/pkgs/by-name/ay/ayatana-webmail/package.nix index 23ba69a03fc0..72a55038f7fa 100644 --- a/pkgs/by-name/ay/ayatana-webmail/package.nix +++ b/pkgs/by-name/ay/ayatana-webmail/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ayatana-webmail"; - version = "24.5.17"; + version = "26.6.13"; pyproject = true; src = fetchFromGitHub { owner = "AyatanaIndicators"; repo = "ayatana-webmail"; tag = finalAttrs.version; - hash = "sha256-k557FWKGq2MXODVxVzOetC5kkwTNYOoLO8msCOabais="; + hash = "sha256-AVH4SQ2yoC2SXuKt8MJVGAgB32cTOD7mCVxcBZn/PPM="; }; postConfigure = '' # Fix fhs paths diff --git a/pkgs/by-name/az/azahar/package.nix b/pkgs/by-name/az/azahar/package.nix index a1ea6783dc58..196212ee1ae8 100644 --- a/pkgs/by-name/az/azahar/package.nix +++ b/pkgs/by-name/az/azahar/package.nix @@ -61,7 +61,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "azahar"; - version = "2125.1.2"; + version = "2125.1.3"; src = fetchFromGitHub { owner = "azahar-emu"; @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { echo "${finalAttrs.version}" > "$out/GIT-TAG" git -C "$out" rev-parse HEAD > "$out/GIT-COMMIT" ''; - hash = "sha256-B3mReLoVqFCqUeunst95AX0veGlZJNyeBBdDIFbf4HI="; + hash = "sha256-jn5Ib5jM/6zHuCjWoMkTvs0nR29mAbTlvID5aYZLw5o="; }; strictDeps = true; diff --git a/pkgs/by-name/az/azimuth/package.nix b/pkgs/by-name/az/azimuth/package.nix index 4b54eee406df..ab5634674e8e 100644 --- a/pkgs/by-name/az/azimuth/package.nix +++ b/pkgs/by-name/az/azimuth/package.nix @@ -3,44 +3,49 @@ stdenv, fetchFromGitHub, libGL, - SDL, + SDL2, which, + pkg-config, installTool ? false, }: stdenv.mkDerivation (finalAttrs: { pname = "azimuth"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "mdsteele"; repo = "azimuth"; - rev = "v${finalAttrs.version}"; - sha256 = "1znfvpmqiixd977jv748glk5zc4cmhw5813zp81waj07r9b0828r"; + tag = "v${finalAttrs.version}"; + hash = "sha256-N5Ahetw/zOXDrEiR1umQNF6i3yeawavoLceiU+xD//g="; }; - nativeBuildInputs = [ which ]; + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + pkg-config + which + ]; + buildInputs = [ libGL - SDL + SDL2 ]; env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=maybe-uninitialized" ]; - preConfigure = '' - substituteInPlace data/azimuth.desktop \ - --replace Exec=azimuth "Exec=$out/bin/azimuth" \ - --replace "Version=%AZ_VERSION_NUMBER" "Version=${finalAttrs.version}" - ''; - makeFlags = [ "BUILDTYPE=release" - "INSTALLDIR=$(out)" - ] - ++ (if installTool then [ "INSTALLTOOL=true" ] else [ "INSTALLTOOL=false" ]); + "PREFIX=${placeholder "out"}" + "INSTALLTOOL=${if installTool then "true" else "false"}" + ]; enableParallelBuilding = true; + doCheck = true; + checkTarget = "test"; + meta = { description = "Metroidvania game using only vectorial graphic"; mainProgram = "azimuth"; diff --git a/pkgs/by-name/az/azure-cli/extensions-generated.json b/pkgs/by-name/az/azure-cli/extensions-generated.json index 9b8e401f8b39..f3553e66b0e4 100644 --- a/pkgs/by-name/az/azure-cli/extensions-generated.json +++ b/pkgs/by-name/az/azure-cli/extensions-generated.json @@ -36,9 +36,9 @@ }, "aem": { "pname": "aem", - "version": "1.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-1.0.1-py2.py3-none-any.whl", - "hash": "sha256-QDkq7GjOpqZSUFXkxrL5OjJwSnGHmRH/8r6N/Amriq0=", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aem-1.0.2-py2.py3-none-any.whl", + "hash": "sha256-dviicXq9CP0j6YiMH9HLggxOphg4S7WqFZcSzBspUCM=", "description": "Manage Azure Enhanced Monitoring Extensions for SAP" }, "ai-examples": { @@ -50,9 +50,9 @@ }, "aks-preview": { "pname": "aks-preview", - "version": "20.0.0b8", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-20.0.0b8-py2.py3-none-any.whl", - "hash": "sha256-ugLew461nhWWg73OZJW7g/xblclV5IfNHKm1it6j+Dc=", + "version": "21.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/aks_preview-21.0.0b8-py2.py3-none-any.whl", + "hash": "sha256-qjmGi1RBxlmvwR0GnvQr1I272G0lcFinbftVLcJ0h2M=", "description": "Provides a preview for upcoming AKS features" }, "alb": { @@ -71,9 +71,9 @@ }, "amg": { "pname": "amg", - "version": "2.8.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-2.8.1-py3-none-any.whl", - "hash": "sha256-nsp7EJIf9/hfpbbpAlNQBQ//U2oR0zWV+LqJtlyCoLM=", + "version": "3.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/amg-3.0.0-py3-none-any.whl", + "hash": "sha256-dTenG/ZarhJyREsCBigfy3zCpQ7VmK3Z4feLU4CzFtk=", "description": "Microsoft Azure Command-Line Tools Azure Managed Grafana Extension" }, "amlfs": { @@ -97,13 +97,6 @@ "hash": "sha256-JGt61AOwZxk4oxZh4ohktQQH73cBnuHyHwvreev+xH0=", "description": "Azure CLI commands for working with Azure Kubernetes Application Network resources" }, - "appservice-kube": { - "pname": "appservice-kube", - "version": "0.1.11", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/appservice_kube-0.1.11-py2.py3-none-any.whl", - "hash": "sha256-gTI/rjFHJ8mx1QfWeWgJStemOubwqEPqKuS3jCPnuKI=", - "description": "Microsoft Azure Command-Line Tools App Service on Kubernetes Extension" - }, "arcgateway": { "pname": "arcgateway", "version": "1.0.0b1", @@ -155,9 +148,9 @@ }, "azure-changesafety": { "pname": "azure-changesafety", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b1-py3-none-any.whl", - "hash": "sha256-ZR2Bm9U9C4rXrCfPVGRu65MBFjZ4iUtXS44l+ClJXsY=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/azure_changesafety-1.0.0b2-py3-none-any.whl", + "hash": "sha256-HTnRKs0YDqHH1tNgrbHdMOFChY7+G6Q4duHTD3KWtPA=", "description": "Microsoft Azure Command-Line Tools ChangeSafety Extension" }, "azure-firewall": { @@ -197,9 +190,9 @@ }, "blueprint": { "pname": "blueprint", - "version": "1.0.0b2", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b2-py3-none-any.whl", - "hash": "sha256-KVtkhYL1+HnnJnmZt7AtZpfFvve/hcpmFw2EfzSHGLc=", + "version": "1.0.0b3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/blueprint-1.0.0b3-py3-none-any.whl", + "hash": "sha256-ZCw3lQztIN8b5Yk5DwGLUl4AMzVVyh+ZWnXAZLYAthY=", "description": "Microsoft Azure Command-Line Tools Blueprint Extension" }, "carbon": { @@ -223,6 +216,13 @@ "hash": "sha256-SfF2Ghsa0pFpry7NV5PhDd7Hl+uyYQ58cOGxqyt1Emo=", "description": "Microsoft Azure Command-Line Tools ChangeAnalysis Extension" }, + "chaos": { + "pname": "chaos", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/chaos-1.0.0b1-py3-none-any.whl", + "hash": "sha256-xRPEXb3ukZUJrgWlC8lSQvSrbFXmce57e+yskfN1Xkg=", + "description": "Support for Azure Chaos Studio v2 workspaces, scenario configuration, and fault-injection run management" + }, "cli-translator": { "pname": "cli-translator", "version": "0.3.0", @@ -239,9 +239,9 @@ }, "computelimit": { "pname": "computelimit", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0b1-py3-none-any.whl", - "hash": "sha256-Om6Hp12RxcajwQDUL/APXQpNjZNsJin/ad93hPfTOCg=", + "version": "1.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/computelimit-1.0.0-py3-none-any.whl", + "hash": "sha256-/jvHC7wLD7BVVgFIu2souEQs/o6Uaw9qsqXnoWt632E=", "description": "Microsoft Azure Command-Line Tools Computelimit Extension" }, "computeschedule": { @@ -281,9 +281,9 @@ }, "cosmosdb-preview": { "pname": "cosmosdb-preview", - "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=", + "version": "1.7.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/cosmosdb_preview-1.7.0-py2.py3-none-any.whl", + "hash": "sha256-c04+FafVc2kwPFiA2IAMJjfEnblXvZMfEZEG1RGMFe0=", "description": "Microsoft Azure Command-Line Tools Cosmosdb-preview Extension" }, "costmanagement": { @@ -351,9 +351,9 @@ }, "dataprotection": { "pname": "dataprotection", - "version": "1.10.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.10.0-py3-none-any.whl", - "hash": "sha256-cssrKqmWbQv3qlr8A3GUNklnIGOQ9V2x3e+YWpXeCvQ=", + "version": "1.11.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/dataprotection-1.11.3-py3-none-any.whl", + "hash": "sha256-JAN0/BvOEKSqVcby0NoLBdPTz/Sc+RQx4jZgxYsujJQ=", "description": "Microsoft Azure Command-Line Tools DataProtectionClient Extension" }, "datashare": { @@ -435,9 +435,9 @@ }, "durabletask": { "pname": "durabletask", - "version": "1.0.0b7", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b7-py3-none-any.whl", - "hash": "sha256-31AvidVj3oZtfgTcEo5qrf5+x4tOQiuq6aavoTKsquI=", + "version": "1.0.0b8", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/durabletask-1.0.0b8-py3-none-any.whl", + "hash": "sha256-ntQnvbQ9GemjMaN6Id2MWWqFxdGUXBC2P30E6r7zn38=", "description": "Microsoft Azure Command-Line Tools Durabletask Extension" }, "dynatrace": { @@ -496,12 +496,12 @@ "hash": "sha256-x1mbd/Y28BcYqEf+T1rZcOHT8wrq9VnWnCfw9rBnl80=", "description": "Microsoft Azure Command-Line Tools ExpressRouteCrossConnection Extension" }, - "fileshares": { - "pname": "fileshares", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshares-1.0.0b1-py3-none-any.whl", - "hash": "sha256-IrJwPQaMuX9VItIEkJzK3cmANHzU50fIaWn2s32nDVk=", - "description": "Commands for managing Azure file shares, snapshots, and private endpoint connections" + "fileshare": { + "pname": "fileshare", + "version": "1.0.2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fileshare-1.0.2-py3-none-any.whl", + "hash": "sha256-Oxrgvsm6K2msHxNUZ5S4FUz7BPucrxHpyLdGf5ucKkA=", + "description": "Microsoft Azure Command-Line Tools Fileshare Extension" }, "firmwareanalysis": { "pname": "firmwareanalysis", @@ -512,9 +512,9 @@ }, "fleet": { "pname": "fleet", - "version": "1.10.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.0-py3-none-any.whl", - "hash": "sha256-hgAwdLExAvKR0G9Ey81rTSa2QLxeoMnUZ7KRaCYhfM8=", + "version": "1.10.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/fleet-1.10.1-py3-none-any.whl", + "hash": "sha256-MEtlIj9z69GM/vktWbethZEr6hXyBpH310PT9A5Rtk8=", "description": "Microsoft Azure Command-Line Tools Fleet Extension" }, "fluid-relay": { @@ -533,9 +533,9 @@ }, "front-door": { "pname": "front-door", - "version": "2.2.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.2.0-py3-none-any.whl", - "hash": "sha256-5vj/OzbfMmv/SI8qS659o+QiMfPofoBCJR/mQV3XZNE=", + "version": "2.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/front_door-2.3.0-py3-none-any.whl", + "hash": "sha256-+Uq7J4afgPBzdZ1mt+ryCt/zeqqxQjS16nbVfjwGleU=", "description": "Manage networking Front Doors" }, "fzf": { @@ -580,6 +580,13 @@ "hash": "sha256-rEoQ4sxkpNCBjkj/vN3+tDB91WuIdbwBwCaH1HPJ/ps=", "description": "Microsoft Azure Command-Line Tools AzureDedicatedHSMResourceProvider Extension" }, + "health-models": { + "pname": "health-models", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/health_models-1.0.0b2-py3-none-any.whl", + "hash": "sha256-VNI/jJwfS0iaEYDW+jOZx8t/Os6mbZ1O017Amuo/d5E=", + "description": "Support for managing Azure Monitor health models, including entities, signals, relationships, authentication settings, and discovery rules" + }, "healthbot": { "pname": "healthbot", "version": "1.1.0", @@ -596,9 +603,9 @@ }, "horizondb": { "pname": "horizondb", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b1-py2.py3-none-any.whl", - "hash": "sha256-bvjD6FSGjkuMjnc1XYnglbzd2cLMDuwRiPW9+7n6efA=", + "version": "1.0.0b4", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/horizondb-1.0.0b4-py2.py3-none-any.whl", + "hash": "sha256-2p6sKyNhoBsrwneo7TUwr+MyE/6fhTxFP9apfqexP7Q=", "description": "Microsoft Azure Command-Line Tools HorizonDB Extension" }, "hpc-cache": { @@ -797,6 +804,13 @@ "hash": "sha256-q5tuqnN94FS1opr9oLx2LHFYuFX6PTDaBmuvrByXTsI=", "description": "Microsoft Azure Command-Line Tools MulticloudConnector Extension" }, + "napster": { + "pname": "napster", + "version": "1.0.0b1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/napster-1.0.0b1-py3-none-any.whl", + "hash": "sha256-gwnA5Wly3q12ylnbvkVOTEm/vxVJTEIgUVoS5j8Mzgk=", + "description": "Microsoft Azure Command-Line Tools Napster Extension" + }, "network-analytics": { "pname": "network-analytics", "version": "1.0.0b1", @@ -806,10 +820,10 @@ }, "networkcloud": { "pname": "networkcloud", - "version": "5.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b1-py3-none-any.whl", - "hash": "sha256-q6F3dUqkhngm6/8Xe7Aki6OUTKbCpGCwy/bIcoPpmlM=", - "description": "Support for Azure Operator Nexus network cloud commands based on 2026-01-01-preview API version" + "version": "5.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/networkcloud-5.0.0b2-py3-none-any.whl", + "hash": "sha256-npgLkxwwn3FL7w4q5bpUq2Gghuy/4zsmikW7qs86Fe0=", + "description": "Support for Azure Operator Nexus network cloud commands based on 2026-05-01-preview API version" }, "new-relic": { "pname": "new-relic", @@ -855,9 +869,9 @@ }, "oracle-database": { "pname": "oracle-database", - "version": "2.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.1-py3-none-any.whl", - "hash": "sha256-VlKOK9xP9e3NfPTO8jiqjdhJMkKzRpR8IWZ1hh0Z86Y=", + "version": "2.0.3", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/oracle_database-2.0.3-py3-none-any.whl", + "hash": "sha256-Qd9WtF7opKFbotazhgJsCb6CdGO/xQ1/5De+LcIaAiY=", "description": "Microsoft Azure Command-Line Tools OracleDatabase Extension" }, "orbital": { @@ -925,16 +939,16 @@ }, "quantum": { "pname": "quantum", - "version": "1.0.0b13", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b13-py3-none-any.whl", - "hash": "sha256-zNyvYvtJY2AgASUoMvN/cCXWIOJ1d3JEQ7G/tuyV/o4=", + "version": "1.0.0b16", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/quantum-1.0.0b16-py3-none-any.whl", + "hash": "sha256-hhDQzA4jtmPyLbd703EYDCmBDjJS2rBTj7Qgx4T4dxQ=", "description": "Microsoft Azure Command-Line Tools Quantum Extension" }, "qumulo": { "pname": "qumulo", - "version": "2.0.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-2.0.1-py3-none-any.whl", - "hash": "sha256-HlMtkVEYvu86KqPPVBG/3i0zPg0S1P4qBedSnJwjIgg=", + "version": "3.0.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/qumulo-3.0.0-py3-none-any.whl", + "hash": "sha256-Gu30eY0y0Xr53UatKDPXK+3Mb5Y1EoxSAYCZoWbznJ8=", "description": "Microsoft Azure Command-Line Tools Qumulo Extension" }, "quota": { @@ -1023,9 +1037,9 @@ }, "site": { "pname": "site", - "version": "1.0.0b1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b1-py3-none-any.whl", - "hash": "sha256-OZ2569Gt1U+UzNHe4jsO3nTMUjipqGaCKoKbN0PDXpA=", + "version": "1.0.0b2", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/site-1.0.0b2-py3-none-any.whl", + "hash": "sha256-soEnNlH5/Mvzgj++o6LvpIheUrV13ZSQfWS4hNJZaeI=", "description": "Microsoft Azure Command-Line Tools Site Extension" }, "site-recovery": { @@ -1058,9 +1072,9 @@ }, "staticwebapp": { "pname": "staticwebapp", - "version": "1.0.0", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-1.0.0-py3-none-any.whl", - "hash": "sha256-+x3Nh2/C2CnMehzFRelEU2TUM1fYiLs97rNqcWuAVxc=", + "version": "1.0.1", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/staticwebapp-1.0.1-py3-none-any.whl", + "hash": "sha256-7zEAwfO2Q6ySSBZrgJmTejeP6ntSd+jAmxfvdQ5dCCU=", "description": "Microsoft Azure Command-Line Tools Staticwebapp Extension" }, "storage-actions": { @@ -1086,9 +1100,9 @@ }, "storage-mover": { "pname": "storage-mover", - "version": "1.2.1", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.2.1-py3-none-any.whl", - "hash": "sha256-CWybGBqh6g8/+EsrqkFXlAZfkUMqrmKSAhq4d05WG/0=", + "version": "1.3.0", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/storage_mover-1.3.0-py3-none-any.whl", + "hash": "sha256-gPJWrRTS7q4cig11lCpnueSzO/EqjW++YW3yqa/U3oA=", "description": "Microsoft Azure Command-Line Tools StorageMover Extension" }, "storagesync": { @@ -1100,9 +1114,9 @@ }, "stream-analytics": { "pname": "stream-analytics", - "version": "1.0.3", - "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.3-py3-none-any.whl", - "hash": "sha256-FFRNCsg9Put3GcARODA6HpwGXbWfD1kb7qDvc+/TAkg=", + "version": "1.0.5", + "url": "https://azcliprod.blob.core.windows.net/cli-extensions/stream_analytics-1.0.5-py3-none-any.whl", + "hash": "sha256-uIGEQu77eRFuo2J7WRhEmytTPO9LJQ4F3Uy+qcbDxQE=", "description": "Microsoft Azure Command-Line Tools StreamAnalyticsManagementClient Extension" }, "subscription": { diff --git a/pkgs/by-name/az/azure-cli/extensions-manual.nix b/pkgs/by-name/az/azure-cli/extensions-manual.nix index fd4544d648b8..92d95ced7137 100644 --- a/pkgs/by-name/az/azure-cli/extensions-manual.nix +++ b/pkgs/by-name/az/azure-cli/extensions-manual.nix @@ -125,9 +125,9 @@ azure-devops = mkAzExtension rec { pname = "azure-devops"; - version = "1.0.4"; + version = "1.0.6"; url = "https://github.com/Azure/azure-cli-extensions/releases/download/azure-devops-${version}/azure_devops-${version}-py2.py3-none-any.whl"; - hash = "sha256-MYW8CnDfBnBi/dfOgSsI+yT605M8uSxvfjEkEdqYVSo="; + hash = "sha256-+neeH9bm4bcmw2VrahloU3wggEHGr1TSp0dnctiWs0s="; description = "Tools for managing Azure DevOps"; propagatedBuildInputs = with python3Packages; [ distro ]; meta.maintainers = with lib.maintainers; [ katexochen ]; @@ -247,6 +247,11 @@ url = "https://azcliprod.blob.core.windows.net/cli-extensions/interactive-1.0.0b1-py2.py3-none-any.whl"; hash = "sha256-COvHDhvsigEEMYlMQ2hHFKzjX7WwdkwfT9id6z+Sj7w="; description = "Microsoft Azure Command-Line Interactive Shell"; + # The wheel contains Requires-Dist entries for both spellings. + pythonRelaxDeps = [ + "prompt_toolkit" + "prompt-toolkit" + ]; propagatedBuildInputs = with python3Packages; [ prompt-toolkit ]; @@ -313,9 +318,9 @@ ssh = mkAzExtension rec { pname = "ssh"; - version = "2.0.8"; + version = "2.0.9"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/ssh-${version}-py3-none-any.whl"; - hash = "sha256-eX42Pr1rTPWqUna4nvNMv7sWtIGcXyc/CbmhwRjQxoM="; + hash = "sha256-OdE4FZckAeM0eFI5/QPBtLJnCIs7fQF/M47B7ULqxFY="; description = "SSH into Azure VMs using RBAC and AAD OpenSSH Certificates"; propagatedBuildInputs = with python3Packages; [ oras @@ -340,9 +345,9 @@ vm-repair = mkAzExtension rec { pname = "vm-repair"; - version = "2.2.0"; + version = "2.2.1"; url = "https://azcliprod.blob.core.windows.net/cli-extensions/vm_repair-${version}-py2.py3-none-any.whl"; - hash = "sha256-ppsK4rJa/nFFkO2XJvjnK0PIRp9/haVwWfqfF7oN5WQ="; + hash = "sha256-k/6ATtYT2YXaHm5nbb0Tf7xE98Oz9svRlbjodCOOuo8="; description = "Support for repairing Azure Virtual Machines"; propagatedBuildInputs = with python3Packages; [ opencensus ]; meta.maintainers = [ ]; @@ -374,12 +379,14 @@ # Removed extensions adp = throw "The 'adp' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8038 akshybrid = throw "The 'akshybrid' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8955 + appservice-kube = throw "The 'appservice-kube' extensions for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/10036 azurestackhci = throw "The 'azurestackhci' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8898 blockchain = throw "The 'blockchain' extension for azure-cli was deprecated upstream"; # Added 2024-04-26, https://github.com/Azure/azure-cli-extensions/pull/7370 compute-diagnostic-rp = throw "The 'compute-diagnostic-rp' extension for azure-cli was deprecated upstream"; # Added 2024-11-12, https://github.com/Azure/azure-cli-extensions/pull/8240 connection-monitor-preview = throw "The 'connection-monitor-preview' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8194 csvmware = throw "The 'csvmware' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8931 deidservice = throw "The 'deidservice' extension for azure-cli was moved under healthcareapis"; # Added 2024-11-19, https://github.com/Azure/azure-cli-extensions/pull/8224 + fileshares = throw "The 'fileshares' extensions for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/9910 hdinsightonaks = throw "The 'hdinsightonaks' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/8956 logz = throw "The 'logz' extension for azure-cli was deprecated upstream"; # Added 2024-11-02, https://github.com/Azure/azure-cli-extensions/pull/8459 mobile-network = throw "The 'mobile-network' extension for azure-cli was removed upstream"; # https://github.com/Azure/azure-cli-extensions/pull/9453 @@ -389,5 +396,5 @@ sap-hana = throw "The 'sap-hana' extension for azure-cli was deprecated upstream"; # Added 2025-07-01, https://github.com/Azure/azure-cli-extensions/pull/8904 spring = throw "The 'spring' extension for azure-cli was deprecated upstream"; # Added 2025-05-07, https://github.com/Azure/azure-cli-extensions/pull/8652 spring-cloud = throw "The 'spring-cloud' extension for azure-cli was deprecated upstream"; # Added 2025-07-01 https://github.com/Azure/azure-cli-extensions/pull/8897 - weights-and-biases = throw "The 'weights-and-biases' was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764 + weights-and-biases = throw "The 'weights-and-biases' extension for azure-cli was removed upstream"; # Added 2025-06-03, https://github.com/Azure/azure-cli-extensions/pull/8764 } diff --git a/pkgs/by-name/az/azure-cli/package.nix b/pkgs/by-name/az/azure-cli/package.nix index 01c2a4516808..5a54e47c1eb3 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.86.0"; + version = "2.88.0"; src = fetchFromGitHub { name = "azure-cli-${version}-src"; owner = "Azure"; repo = "azure-cli"; tag = "azure-cli-${version}"; - hash = "sha256-3C39e9C3m9M0faGUgOEWo66fFGDytfGohgUYX55VN8g="; + hash = "sha256-9lDDzUuON1fkZzvV6oAzUOZcf+t7biDzPFufZIYQrAY="; }; # put packages that needs to be overridden in the py package scope @@ -192,6 +192,7 @@ py.pkgs.toPythonApplication ( azure-mgmt-cosmosdb azure-mgmt-datalake-store azure-mgmt-datamigration + azure-mgmt-domainregistration azure-mgmt-eventgrid azure-mgmt-eventhub azure-mgmt-extendedlocation diff --git a/pkgs/by-name/az/azure-cli/python-packages.nix b/pkgs/by-name/az/azure-cli/python-packages.nix index 5778f17c2bee..f91c7f620e21 100644 --- a/pkgs/by-name/az/azure-cli/python-packages.nix +++ b/pkgs/by-name/az/azure-cli/python-packages.nix @@ -257,16 +257,6 @@ let overrideAzureMgmtPackage super.azure-mgmt-synapse "2.1.0b5" "zip" "sha256-5E6Yf1GgNyNVjd+SeFDbhDxnOA6fOAG6oojxtCP4m+k="; - # ModuleNotFoundError: No module named 'azure.mgmt.web.v2024_11_01' - azure-mgmt-web = super.azure-mgmt-web.overridePythonAttrs (attrs: rec { - version = "9.0.0"; - src = fetchPypi { - pname = "azure_mgmt_web"; - inherit version; - hash = "sha256-RFXs07SYV3CFwZBObRcTklTjWLoH/mxINaiRu697BsI="; - }; - }); - # Attribute virtual_machines does not exist - nixpkgs has 37.x but azure-cli 2.82.0 requires ~=34.1.0 azure-mgmt-compute = super.azure-mgmt-compute.overridePythonAttrs (attrs: rec { version = "34.1.0"; diff --git a/pkgs/by-name/az/azure-functions-core-tools/package.nix b/pkgs/by-name/az/azure-functions-core-tools/package.nix index 27eaa122b9c4..f37cc27ae3d8 100644 --- a/pkgs/by-name/az/azure-functions-core-tools/package.nix +++ b/pkgs/by-name/az/azure-functions-core-tools/package.nix @@ -66,7 +66,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/az/azure-static-sites-client/package.nix b/pkgs/by-name/az/azure-static-sites-client/package.nix index eec2fbc63e62..51bb767bfabf 100644 --- a/pkgs/by-name/az/azure-static-sites-client/package.nix +++ b/pkgs/by-name/az/azure-static-sites-client/package.nix @@ -16,24 +16,15 @@ let versions = lib.importJSON ./versions.json; flavor = lib.head (lib.filter (x: x.version == versionFlavor) versions); - fetchBinary = - runtimeId: - fetchurl { - url = flavor.files.${runtimeId}.url; - sha256 = flavor.files.${runtimeId}.sha; - }; - sources = { - "x86_64-linux" = fetchBinary "linux-x64"; - "x86_64-darwin" = fetchBinary "osx-x64"; - }; in stdenv.mkDerivation { pname = "StaticSitesClient-${versionFlavor}"; version = flavor.buildId; - src = - sources.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + src = fetchurl { + url = flavor.files.linux-x64.url; + sha256 = flavor.files.linux-x64.sha; + }; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/az/azurehound/package.nix b/pkgs/by-name/az/azurehound/package.nix index ab84c1aefac3..b1dd9f8fb4c4 100644 --- a/pkgs/by-name/az/azurehound/package.nix +++ b/pkgs/by-name/az/azurehound/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "azurehound"; - version = "2.12.1"; + version = "2.12.2"; src = fetchFromGitHub { owner = "SpecterOps"; repo = "AzureHound"; tag = "v${finalAttrs.version}"; - hash = "sha256-qJ7mzG1G9ck4xM9dB9rcpojGCAbUoZ8bKZwuZV5bhjA="; + hash = "sha256-w8PmSt+QvU0HELkgdYLfIUgK3R5vCYzlPbMyrHztiPw="; }; vendorHash = "sha256-WF46wXaNU/Em0KpF6hkuuJ+7K1IKLGqpNS/HxpxX5WY="; diff --git a/pkgs/by-name/ba/babashka/package.nix b/pkgs/by-name/ba/babashka/package.nix index cfdfc0910b6b..64e5a1694f03 100644 --- a/pkgs/by-name/ba/babashka/package.nix +++ b/pkgs/by-name/ba/babashka/package.nix @@ -1,22 +1,11 @@ { stdenvNoCC, - lib, babashka-unwrapped, callPackage, makeWrapper, installShellFiles, - rlwrap, clojureToolsBabashka ? callPackage ./clojure-tools.nix { }, jdkBabashka ? clojureToolsBabashka.jdk, - - # rlwrap is a small utility to allow the editing of keyboard input, see - # https://book.babashka.org/#_repl - # - # NOTE In some cases, rlwrap prints some extra empty lines. That behavior can - # break some babashka scripts. For this reason, it is disabled by default. See: - # https://github.com/NixOS/nixpkgs/issues/246839 - # https://github.com/NixOS/nixpkgs/pull/248207 - withRlwrap ? false, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "babashka"; @@ -30,28 +19,20 @@ stdenvNoCC.mkDerivation (finalAttrs: { installShellFiles ]; - installPhase = - let - unwrapped-bin = "${babashka-unwrapped}/bin/bb"; - in - '' - mkdir -p $out/clojure_tools - ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn - ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/* + installPhase = '' + mkdir -p $out/clojure_tools + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/*.edn + ln -s -t $out/clojure_tools ${clojureToolsBabashka}/libexec/* - makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ - --inherit-argv0 \ - --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ - --set-default JAVA_HOME ${jdkBabashka} + makeWrapper "${babashka-unwrapped}/bin/bb" "$out/bin/bb" \ + --inherit-argv0 \ + --set-default DEPS_CLJ_TOOLS_DIR $out/clojure_tools \ + --set-default JAVA_HOME ${jdkBabashka} - installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash - installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb - installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish - '' - + lib.optionalString withRlwrap '' - substituteInPlace $out/bin/bb \ - --replace '"${unwrapped-bin}"' '"${rlwrap}/bin/rlwrap" "${unwrapped-bin}"' - ''; + installShellCompletion --cmd bb --bash ${babashka-unwrapped}/share/bash-completion/completions/bb.bash + installShellCompletion --cmd bb --zsh ${babashka-unwrapped}/share/zsh/site-functions/_bb + installShellCompletion --cmd bb --fish ${babashka-unwrapped}/share/fish/vendor_completions.d/bb.fish + ''; installCheckPhase = '' ${babashka-unwrapped.installCheckPhase} diff --git a/pkgs/by-name/ba/babeld/package.nix b/pkgs/by-name/ba/babeld/package.nix index 63592e1ddb78..63e0d2061451 100644 --- a/pkgs/by-name/ba/babeld/package.nix +++ b/pkgs/by-name/ba/babeld/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "babeld"; - version = "1.13.1"; + version = "1.14"; src = fetchurl { url = "https://www.irif.fr/~jch/software/files/babeld-${finalAttrs.version}.tar.gz"; - hash = "sha256-FfJNJtoMz8Bzq83vAwnygeRoTyqnESb4JlcsTIRejdk="; + hash = "sha256-xO0TwEiAzMOoWplkXctkE0vqyKsGB/4ypNB+EFetc7c="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/ba/backgroundremover/package.nix b/pkgs/by-name/ba/backgroundremover/package.nix index 6b59dea21ab1..a43c97fcd594 100644 --- a/pkgs/by-name/ba/backgroundremover/package.nix +++ b/pkgs/by-name/ba/backgroundremover/package.nix @@ -12,7 +12,7 @@ let p = python3.pkgs; self = p.buildPythonApplication rec { pname = "backgroundremover"; - version = "0.3.4"; + version = "0.4.4"; pyproject = true; build-system = [ @@ -23,7 +23,7 @@ let owner = "nadermx"; repo = "backgroundremover"; tag = "v${version}"; - hash = "sha256-7C31wlokX3M4csZ4ZbOqxowQvh8DMQJJcENKgQWNTa8="; + hash = "sha256-S6irFkNw+5HHr3ziMRxaeg3QoXWe1qqf10CGTTHKpb4="; }; models = runCommand "background-remover-models" { } '' @@ -51,12 +51,14 @@ let p.ffmpeg-python p.filelock p.filetype + p.flask p.hsh p.idna p.more-itertools p.moviepy p.numpy p.pillow + p.pillow-heif p.pymatting p.pysocks p.requests @@ -107,7 +109,7 @@ let homepage = "https://BackgroundRemoverAI.com"; downloadPage = "https://github.com/nadermx/backgroundremover/releases"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; }; }; in diff --git a/pkgs/by-name/ba/backintime-common/package.nix b/pkgs/by-name/ba/backintime-common/package.nix index e9fb6e0d9025..a51e3d091ef4 100644 --- a/pkgs/by-name/ba/backintime-common/package.nix +++ b/pkgs/by-name/ba/backintime-common/package.nix @@ -9,12 +9,14 @@ cron, openssh, sshfs-fuse, + fuse3, gocryptfs, which, ps, gnugrep, man, asciidoctor, + bashNonInteractive, }: let @@ -46,15 +48,25 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-/33Lx62S/9RcqrfJumE6/o3KnAObBa3DcmuGkcOXIQE="; }; + __structuredAttrs = true; + strictDeps = true; + enableParallelBuilding = true; + outputs = [ + "out" + "man" + "doc" + ]; + nativeBuildInputs = [ makeWrapper gettext + asciidoctor + man ]; buildInputs = [ python' - man - asciidoctor + bashNonInteractive ]; installFlags = [ "DEST=$(out)" ]; @@ -73,13 +85,16 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail "share" "${python'.sitePackages}" substituteInPlace "schedule.py" \ - --replace-fail "'crontab'" "'${cron}/bin/crontab'" \ + --replace-fail "'crontab'" "'${lib.getExe' cron "crontab"}'" \ --replace-fail "'which'" "'${lib.getExe which}'" \ --replace-fail "'ps'" "'${lib.getExe ps}'" \ --replace-fail "'grep'" "'${lib.getExe gnugrep}'" \ + substituteInPlace mount.py \ + --replace-fail "'fusermount'" "'${lib.getExe' fuse3 "fusermount3"}'" + substituteInPlace "bitlicense.py" \ - --replace-fail "/usr/share/doc" "$out/share/doc" \ + --replace-fail "/usr/share/doc" "$doc/share/doc" \ ''; dontAddPrefix = true; diff --git a/pkgs/by-name/ba/backintime-qt/package.nix b/pkgs/by-name/ba/backintime-qt/package.nix index 52a2ff52452a..d3336c2183c6 100644 --- a/pkgs/by-name/ba/backintime-qt/package.nix +++ b/pkgs/by-name/ba/backintime-qt/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation { version src installFlags - meta dontAddPrefix ; @@ -105,4 +104,15 @@ stdenv.mkDerivation { wrapProgram "$out/bin/backintime-qt_polkit" \ --prefix PATH : "${lib.getBin polkit}/bin:$PATH" ''; + + meta = { + inherit (backintime-common.meta) + homepage + description + license + maintainers + platforms + longDescription + ; + }; } diff --git a/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch b/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch new file mode 100644 index 000000000000..2212a241e92d --- /dev/null +++ b/pkgs/by-name/ba/backrest/0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch @@ -0,0 +1,52 @@ +From c2d19683ba90d7cd3919ca3ea21ae4332d3ea82b Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 12 Jul 2026 14:39:09 +0530 +Subject: [PATCH 1/3] fix: rm deprecated import + github.com/ncruces/go-sqlite3/embed + +Signed-off-by: phanirithvij +--- + internal/kvstore/sqlitekvstore.go | 1 - + internal/logstore/logstore.go | 1 - + internal/oplog/sqlitestore/sqlitestore.go | 1 - + 3 files changed, 3 deletions(-) + +diff --git a/internal/kvstore/sqlitekvstore.go b/internal/kvstore/sqlitekvstore.go +index 9453228..e360a2c 100644 +--- a/internal/kvstore/sqlitekvstore.go ++++ b/internal/kvstore/sqlitekvstore.go +@@ -8,7 +8,6 @@ import ( + "strings" + + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + ) + + var ErrNotExist = errors.New("key does not exist") +diff --git a/internal/logstore/logstore.go b/internal/logstore/logstore.go +index 48e0509..dd6ac17 100644 +--- a/internal/logstore/logstore.go ++++ b/internal/logstore/logstore.go +@@ -17,7 +17,6 @@ import ( + + "github.com/hashicorp/go-multierror" + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + "go.uber.org/zap" + ) + +diff --git a/internal/oplog/sqlitestore/sqlitestore.go b/internal/oplog/sqlitestore/sqlitestore.go +index 41b12ac..08a53e0 100644 +--- a/internal/oplog/sqlitestore/sqlitestore.go ++++ b/internal/oplog/sqlitestore/sqlitestore.go +@@ -27,7 +27,6 @@ import ( + + "github.com/gofrs/flock" + _ "github.com/ncruces/go-sqlite3/driver" +- _ "github.com/ncruces/go-sqlite3/embed" + "github.com/ncruces/go-sqlite3/vfs" + "github.com/ncruces/go-sqlite3/vfs/memdb" + _ "github.com/ncruces/go-sqlite3/vfs/memdb" +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch new file mode 100644 index 000000000000..d78462d64dde --- /dev/null +++ b/pkgs/by-name/ba/backrest/0002-fix-exit-after-printing-version.patch @@ -0,0 +1,26 @@ +From 2d84683ee874d9f7ca506c61f810aaf4bdc06e63 Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 12 Jul 2026 15:12:39 +0530 +Subject: [PATCH 2/3] fix: exit after printing version + +Signed-off-by: phanirithvij +--- + cmd/backrest/backrest.go | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cmd/backrest/backrest.go b/cmd/backrest/backrest.go +index dd59512..9c0ca7e 100644 +--- a/cmd/backrest/backrest.go ++++ b/cmd/backrest/backrest.go +@@ -58,7 +58,7 @@ func runApp() { + flag.Parse() + if *printVersion { + fmt.Printf("backrest version: %s, commit: %s\n", version, commit) +- return ++ os.Exit(0) + } + installLoggers(version, commit) + +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch new file mode 100644 index 000000000000..6137bd5136b0 --- /dev/null +++ b/pkgs/by-name/ba/backrest/0003-fix-quit-tray-on-graceful-shutdown.patch @@ -0,0 +1,28 @@ +From 809a1e95a2d322ac2c00f95a274b639860d3b5bc Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 12 Jul 2026 16:07:29 +0530 +Subject: [PATCH 3/3] fix: quit tray on graceful shutdown + +--- + cmd/backrest/tray.go | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/cmd/backrest/tray.go b/cmd/backrest/tray.go +index 68db4f2..cca1b36 100644 +--- a/cmd/backrest/tray.go ++++ b/cmd/backrest/tray.go +@@ -16,7 +16,10 @@ func startTray() { + status := newTrayStatus() + // Observe oplog status in-process so the icon can reflect backup state. + onOpLogReady = status.attach +- go runApp() ++ go func() { ++ runApp() ++ systray.Quit() ++ }() + systray.Run(func() { onReady(status) }, func() {}) + } + +-- +2.54.0 + diff --git a/pkgs/by-name/ba/backrest/inlang-plugins.json b/pkgs/by-name/ba/backrest/inlang-plugins.json new file mode 100644 index 000000000000..dca8065f7b93 --- /dev/null +++ b/pkgs/by-name/ba/backrest/inlang-plugins.json @@ -0,0 +1,10 @@ +{ + "https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4/dist/index.js": { + "url": "https://cdn.jsdelivr.net/npm/@inlang/plugin-message-format@4.4.0/dist/index.js", + "hash": "sha256-lIZViAHAjrsBgiPFHCBEtsPCP8KowOeJSleIKzT+tso=" + }, + "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2/dist/index.js": { + "url": "https://cdn.jsdelivr.net/npm/@inlang/plugin-m-function-matcher@2.2.9/dist/index.js", + "hash": "sha256-hYYvYwV5O1a/2a/lNosJbmP7Kuqzi3eZwFFRe+NJnAs=" + } +} diff --git a/pkgs/by-name/ba/backrest/package.nix b/pkgs/by-name/ba/backrest/package.nix index 5e0c610ead51..9157c8e337a5 100644 --- a/pkgs/by-name/ba/backrest/package.nix +++ b/pkgs/by-name/ba/backrest/package.nix @@ -2,47 +2,79 @@ buildGoModule, fetchFromGitHub, gzip, + fetchurl, iana-etc, lib, libredirect, nodejs, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, restic, stdenv, util-linux, makeBinaryWrapper, + versionCheckHook, + nix-update-script, + _experimental-update-script-combinators, }: let + pnpm = pnpm_11; + pname = "backrest"; - version = "1.10.1"; + version = "1.14.1"; src = fetchFromGitHub { owner = "garethgeorge"; repo = "backrest"; tag = "v${version}"; - hash = "sha256-8WWs7XEVKAc/XmeL+dsw25azfLjUbHKp2MsB6Be14VE="; + hash = "sha256-RxjPjvnKy8UM1OXRklJF/HSZ6FMiHWYQBsZ6owMJMF0="; + leaveDotGit = true; + postFetch = '' + cd "$out" + git rev-parse HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; + # we need to pin the inlang plugins to specific versions because + # the remote ones are not pinned and we can't fetch them in the sandbox. + inlang-plugins = lib.mapAttrs (remote: info: fetchurl { inherit (info) url hash; }) ( + lib.importJSON ./inlang-plugins.json + ); + frontend = stdenv.mkDerivation (finalAttrs: { - inherit version; - pname = "${pname}-webui"; - src = "${src}/webui"; + inherit version src; + pname = "backrest-webui"; + sourceRoot = "${finalAttrs.src.name}/webui"; + + __structuredAttrs = true; + strictDeps = true; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-9wzPNZxLE0l/AJ8SyE0SkhkBImiibhqJgsG3UrGj3aA="; + inherit pnpm; + sourceRoot = "${finalAttrs.src.name}/webui"; + fetcherVersion = 4; + hash = "sha256-y6NYFPepibiTuvPMwyc5cN3TwAc2W7RtPbCmzWDozNQ="; }; + postPatch = '' + # Replace remote inlang plugins with local ones + ${lib.concatStringsSep "\n" ( + lib.mapAttrsToList (remote: local: '' + substituteInPlace project.inlang/settings.json \ + --replace-fail "${remote}" "${local}" + '') inlang-plugins + )} + ''; + buildPhase = '' runHook preBuild export BACKREST_BUILD_VERSION=${version} @@ -52,14 +84,29 @@ let installPhase = '' runHook preInstall - mkdir $out - cp -r dist/* $out + mv dist $out runHook postInstall ''; }); in -buildGoModule { - inherit pname src version; +buildGoModule (finalAttrs: { + inherit + pname + src + version + ; + + __structuredAttrs = true; + strictDeps = true; + + patches = [ + # https://github.com/garethgeorge/backrest/pull/1293 + ./0001-fix-rm-deprecated-import-github.com-ncruces-go-sqlit.patch + # https://github.com/garethgeorge/backrest/pull/1294 + ./0002-fix-exit-after-printing-version.patch + # https://github.com/garethgeorge/backrest/pull/1295 + ./0003-fix-quit-tray-on-graceful-shutdown.patch + ]; postPatch = '' sed -i -e \ @@ -68,16 +115,28 @@ buildGoModule { internal/resticinstaller/resticinstaller.go ''; - vendorHash = "sha256-cYqK/sddLI38K9bzCpnomcZOYbSRDBOEru4Y26rBLFw="; + proxyVendor = true; + vendorHash = "sha256-yadRulgtcDPthWLeTydcMol/vwriflKvDu7zgoehZCM="; + + subPackages = [ "cmd/backrest" ]; nativeBuildInputs = [ gzip makeBinaryWrapper ]; + tags = [ "tray" ]; + + ldflags = [ + "-s" + "-X main.version=${finalAttrs.version}" + ]; + preBuild = '' + ldflags+=" -X main.commit=$(cat COMMIT)" + mkdir -p ./webui/dist - cp -r ${frontend}/* ./webui/dist + cp -r ${finalAttrs.passthru.frontend}/* ./webui/dist go generate -skip="npm" ./... ''; @@ -102,9 +161,9 @@ buildGoModule { in [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + # Use restic from nixpkgs, otherwise download fails in sandbox preCheck = '' - # Use restic from nixpkgs, otherwise download fails in sandbox - export BACKREST_RESTIC_COMMAND="${restic}/bin/restic" + export BACKREST_RESTIC_COMMAND="${lib.getExe restic}" export HOME=$(pwd) '' + lib.optionalString (stdenv.hostPlatform.isDarwin) '' @@ -116,15 +175,38 @@ buildGoModule { postInstall = '' wrapProgram $out/bin/backrest \ --set-default BACKREST_RESTIC_COMMAND "${lib.getExe restic}" + makeBinaryWrapper $out/bin/backrest $out/bin/backrest-tray \ + --add-flags "-tray" ''; + doInstallCheck = true; + versionCheckProgramArg = "-version"; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru = { + inherit frontend inlang-plugins; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + extraArgs = [ + "--subpackage" + "frontend" + ]; + }) + ./update-inlang-plugins.sh + ]; + }; + meta = { description = "Web UI and orchestrator for restic backup"; homepage = "https://github.com/garethgeorge/backrest"; - changelog = "https://github.com/garethgeorge/backrest/releases/tag/v${version}"; + changelog = "https://github.com/garethgeorge/backrest/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ iedame ]; + maintainers = with lib.maintainers; [ + iedame + alexandru0-dev + phanirithvij + ]; mainProgram = "backrest"; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/backrest/update-inlang-plugins.sh b/pkgs/by-name/ba/backrest/update-inlang-plugins.sh new file mode 100755 index 000000000000..cf85d67e74ec --- /dev/null +++ b/pkgs/by-name/ba/backrest/update-inlang-plugins.sh @@ -0,0 +1,55 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p jq curl common-updater-scripts + +set -exuo pipefail + +SCRIPT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &> /dev/null && pwd) + +SETTINGS_FILE="$(nix-build -A "backrest.src")/webui/project.inlang/settings.json" + +MODULES=$(cat "$SETTINGS_FILE" | jq -r '.modules[]') + +# Initialize an empty JSON object +PLUGINS_JSON="{}" + +for remote_url in $MODULES; do + echo "Processing $remote_url..." >&2 + + final_url="$remote_url" + + # Matches: https://cdn.jsdelivr.net/npm/((@[^/]+/[^@/]+|[^@/]+)@([^/]+))(/.*)?$ + # Group 1: Full identifier (e.g. @scope/pkg@1) + # Group 2: Package name (e.g. @scope/pkg or pkg) + # Group 3: Version/Tag/Alias (e.g. 4 or latest) + # Group 4: Sub-path (e.g. /dist/index.js) + if [[ $remote_url =~ ^https://cdn.jsdelivr.net/npm/((@[^/]+/[^@/]+|[^@/]+)@([^/]+))(/.*)?$ ]]; then + pkg_full="${BASH_REMATCH[1]}" + pkg_name="${BASH_REMATCH[2]}" + current_ver="${BASH_REMATCH[3]}" + path="${BASH_REMATCH[4]}" + + # Construct package.json URL to find the exact version + PKG_JSON_URL="https://cdn.jsdelivr.net/npm/$pkg_name@$current_ver/package.json" + # echo " Fetching package.json from $PKG_JSON_URL" >&2 + + RESOLVED_VERSION=$(curl -s "$PKG_JSON_URL" | jq -r .version || true) + + if [[ -n "$RESOLVED_VERSION" && "$RESOLVED_VERSION" != "null" ]]; then + final_url="https://cdn.jsdelivr.net/npm/$pkg_name@$RESOLVED_VERSION$path" + echo " Resolved version $RESOLVED_VERSION from package.json" >&2 + fi + fi + + echo " Pinned to $final_url" >&2 + + hash=$(nix-prefetch-url "$final_url") + sri=$(nix hash convert --hash-algo sha256 --to sri "$hash") + + # Add to JSON object using jq + PLUGINS_JSON=$(echo "$PLUGINS_JSON" | jq --arg remote "$remote_url" --arg url "$final_url" --arg hash "$sri" \ + '. + {($remote): {url: $url, hash: $hash}}') +done + +echo "$PLUGINS_JSON" | jq . > "$SCRIPT_DIR/inlang-plugins.json" + +echo "Updated $SCRIPT_DIR/inlang-plugins.json" diff --git a/pkgs/by-name/ba/bacnet-stack/package.nix b/pkgs/by-name/ba/bacnet-stack/package.nix index 5f5e744a2f33..a97343ea89a9 100644 --- a/pkgs/by-name/ba/bacnet-stack/package.nix +++ b/pkgs/by-name/ba/bacnet-stack/package.nix @@ -2,35 +2,42 @@ lib, stdenv, fetchFromGitHub, + cmake, }: stdenv.mkDerivation (finalAttrs: { pname = "bacnet-stack"; - version = "1.3.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "bacnet-stack"; repo = "bacnet-stack"; - rev = "bacnet-stack-${finalAttrs.version}"; - sha256 = "sha256-Iwo0bNulKdFNwNU2xj6Uin+5hQt1I3N6+zso5BHrIOU="; + tag = "bacnet-stack-${finalAttrs.version}"; + hash = "sha256-CJmEEIGT6u2nsnl3btWL/JJPxQM53JF6l+mLBSF+Q8Q="; }; - hardeningDisable = [ "all" ]; + nativeBuildInputs = [ cmake ]; - buildPhase = '' - make BUILD=debug BACNET_PORT=linux BACDL_DEFINE=-DBACDL_BIP=1 BACNET_DEFINES=" -DPRINT_ENABLED=1 -DBACFILE -DBACAPP_ALL -DBACNET_PROPERTY_LISTS" - ''; - - installPhase = '' - mkdir $out - cp -r bin $out/bin + # bacnet-stack's CMakeLists builds the apps via add_executable() but never + # adds install(TARGETS ...) rules for them, so `make install` skips them. + # Copy them out of the CMake build tree manually. + postInstall = '' + mkdir -p $out/bin + find . -maxdepth 2 -type f -executable -not -name '*.so*' -not -name '*.a' \ + -exec cp -t $out/bin {} + ''; meta = { description = "BACnet open source protocol stack for embedded systems, Linux, and Windows"; homepage = "https://github.com/bacnet-stack/bacnet-stack"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl2Plus; + changelog = "https://github.com/bacnet-stack/bacnet-stack/blob/bacnet-stack-${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + gpl2Plus # Core stack (WITH GCC-exception-2.0) + mit # Examples and applications + asl20 # Auxiliary files (SPDX identified) + bsd3 # Auxiliary files (SPDX identified) + ]; maintainers = with lib.maintainers; [ WhittlesJr ]; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ba/bacon/package.nix b/pkgs/by-name/ba/bacon/package.nix index 13dfbfbebd45..196e4c34e011 100644 --- a/pkgs/by-name/ba/bacon/package.nix +++ b/pkgs/by-name/ba/bacon/package.nix @@ -27,17 +27,17 @@ in rustPlatform.buildRustPackage (finalAttrs: { pname = "bacon"; - version = "3.23.0"; + version = "3.24.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Canop"; repo = "bacon"; tag = "v${finalAttrs.version}"; - hash = "sha256-HMHZQP9GY9iMm+vDeIhavv4akmM0IUbpDtWHyzHG7KE="; + hash = "sha256-rfbK5MrCytBVISXVkazBDnZZxjZQ3ze348mlTyanTWM="; }; - cargoHash = "sha256-zlxhlgcTtSYvvGqSpQIg6f10cQZhF6s4UNrCZr8RIdY="; + cargoHash = "sha256-s49qZMD922l6KKSFRhVIGp6+7E0S+q7McV9PT2F0RQc="; buildFeatures = lib.optionals withSound [ "sound" diff --git a/pkgs/by-name/ba/baddns/package.nix b/pkgs/by-name/ba/baddns/package.nix index 543036b7291e..260ec8e05a65 100644 --- a/pkgs/by-name/ba/baddns/package.nix +++ b/pkgs/by-name/ba/baddns/package.nix @@ -5,28 +5,26 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "baddns"; - version = "1.12.294"; + version = "2.4.1"; pyproject = true; src = fetchFromGitHub { owner = "blacklanternsecurity"; repo = "baddns"; - tag = version; - hash = "sha256-HAVoCyI7yxCdAR4qq7yXJz3YxkPnhBdeXLJZmzZpwF4="; + tag = finalAttrs.version; + hash = "sha256-3SKR94/KBjTxk7swPKaIn2zzAjYMSEqqLALeCBjwMFg="; }; - pythonRelaxDeps = true; - - build-system = with python3.pkgs; [ - poetry-core - poetry-dynamic-versioning - ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ colorama + cloudcheck dnspython + blastdns + blasthttp httpx python-dateutil python-whois @@ -49,23 +47,34 @@ python3.pkgs.buildPythonApplication rec { disabledTests = [ # Tests require network access "test_cli_cname_http" + "test_cli_cname_nxdomain" "test_cli_direct" "test_cli_validation_customnameservers_valid" "test_cname_http_bigcartel_match" "test_cname_whois_unregistered_baddata" "test_cname_whois_unregistered_match" "test_cname_whois_unregistered_missingdata" + "test_custom_signatures_dir" + "test_debug_mode" + "test_default_resolver" + "test_dmarc" + "test_min_confidence_confirmed_excludes_high" + "test_min_confidence_filters_findings" + "test_min_severity_critical_excludes_medium" + "test_min_severity_low_includes_medium" "test_modules_customnameservers" "test_references_cname_css" "test_references_cname_js" + "test_silent_mode" + "test_spf" ]; meta = { description = "Tool to check subdomains for subdomain takeovers and other DNS issues"; homepage = "https://github.com/blacklanternsecurity/baddns/"; - changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${src.tag}"; + changelog = "https://github.com/blacklanternsecurity/baddns/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "baddns"; }; -} +}) diff --git a/pkgs/by-name/ba/badgemagic-app/package.nix b/pkgs/by-name/ba/badgemagic-app/package.nix index 09f219b86173..c914b0cdec1e 100644 --- a/pkgs/by-name/ba/badgemagic-app/package.nix +++ b/pkgs/by-name/ba/badgemagic-app/package.nix @@ -23,7 +23,7 @@ flutter338.buildFlutterApplication { meta = { description = "Badge Magic with LEDs - mobile and desktop app"; homepage = "https://github.com/fossasia/badgemagic-app"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = [ "aarch64-linux" diff --git a/pkgs/by-name/ba/badger/package.nix b/pkgs/by-name/ba/badger/package.nix index 90643e18ae4d..d574e5839dce 100644 --- a/pkgs/by-name/ba/badger/package.nix +++ b/pkgs/by-name/ba/badger/package.nix @@ -6,26 +6,29 @@ buildGoModule (finalAttrs: { pname = "badger"; - version = "4.9.1"; + version = "4.9.4"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "badger"; tag = "v${finalAttrs.version}"; - hash = "sha256-BsKFi4oMNJE09PBjFmqNhbMcQcHk5uR5QssbwN2ZNCk="; + hash = "sha256-v/E53imP3wxf7n1nlA0izjdSDkq1mwx7//BcLDPugY4="; }; - vendorHash = "sha256-+rXXCVH2xuULPzdM0KVPwYht+tu0qyxPjLLaBMWVIuI="; + vendorHash = "sha256-KDIwEH83nPMJPJGTN3UgO00pjYwR17XqGdPXioP1YcY="; subPackages = [ "badger" ]; doCheck = false; + __structuredAttrs = true; + meta = { + changelog = "https://github.com/dgraph-io/badger/releases/tag/${finalAttrs.src.tag}"; description = "Fast key-value DB in Go"; - homepage = "https://github.com/dgraph-io/badger"; + homepage = "https://dgraph-io.github.io/badger"; license = lib.licenses.asl20; mainProgram = "badger"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; }; }) diff --git a/pkgs/by-name/ba/badrobot/package.nix b/pkgs/by-name/ba/badrobot/package.nix index 628c41978e11..6cc9b8a2af68 100644 --- a/pkgs/by-name/ba/badrobot/package.nix +++ b/pkgs/by-name/ba/badrobot/package.nix @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { likelihood that a compromised Operator would be able to obtain full cluster permissions. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jk ]; diff --git a/pkgs/by-name/ba/bambu-studio/package.nix b/pkgs/by-name/ba/bambu-studio/package.nix index de5cdb840016..a1ecd28f0552 100644 --- a/pkgs/by-name/ba/bambu-studio/package.nix +++ b/pkgs/by-name/ba/bambu-studio/package.nix @@ -6,6 +6,7 @@ ninja, pkg-config, wrapGAppsHook3, + assimp, boost183, cacert, cereal, @@ -27,6 +28,7 @@ libpng, libsecret, makeFontsConf, + libnoise, mpfr, nanum, nlopt, @@ -39,6 +41,7 @@ webkitgtk_4_1, wxwidgets_3_1, libx11, + libharu, withSystemd ? stdenv.hostPlatform.isLinux, # 3D viewport blank on NVIDIA proprietary GL; routes through Mesa + zink. # https://github.com/NixOS/nixpkgs/issues/498311 @@ -66,13 +69,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "bambu-studio"; - version = "02.05.00.67"; + version = "02.08.00.50"; src = fetchFromGitHub { owner = "bambulab"; repo = "BambuStudio"; tag = "v${finalAttrs.version}"; - hash = "sha256-jLaSUs6OmoD0yw1hOcJarYKfr1rbhB2TwRiBBU0utEI="; + hash = "sha256-zIizozfZkaXo5wymuBFBCUu/lu+FyYTpa4+3SoC2x7k="; }; nativeBuildInputs = [ @@ -83,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + assimp boost183 cereal cgal_5 @@ -104,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { hicolor-icon-theme libpng libsecret + libnoise mpfr nlopt opencascade-occt_7_6 @@ -113,6 +118,7 @@ stdenv.mkDerivation (finalAttrs: { webkitgtk_4_1 wxGTK' libx11 + libharu opencv ] ++ lib.optionals withSystemd [ systemd ] @@ -129,8 +135,25 @@ stdenv.mkDerivation (finalAttrs: { ./patches/no-cereal.patch # Cmake 4 support ./patches/cmake.patch + # Disable nodejs + ./patches/no-device-web-node-download.patch ]; + postPatch = + # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx + # now seems to be integrated into the main lib. + '' + substituteInPlace cmake/modules/FindNLopt.cmake \ + --replace-fail "nlopt_cxx" "nlopt" + '' + # Fix libharu include + + '' + substituteInPlace src/slic3r/GUI/Overview/AssemblyStepsUtils.cpp \ + --replace-fail \ + "#include " \ + "#include " + ''; + doCheck = true; checkInputs = [ gtest ]; @@ -156,13 +179,6 @@ stdenv.mkDerivation (finalAttrs: { NIX_LDFLAGS = lib.optionalString withSystemd "-ludev" + " -L${opencv}/lib -lopencv_imgcodecs"; }; - # TODO: macOS - prePatch = '' - # Since version 2.5.0 of nlopt we need to link to libnlopt, as libnlopt_cxx - # now seems to be integrated into the main lib. - sed -i 's|nlopt_cxx|nlopt|g' cmake/modules/FindNLopt.cmake - ''; - cmakeFlags = [ (lib.cmakeBool "SLIC3R_STATIC" false) (lib.cmakeBool "SLIC3R_FHS" true) @@ -177,6 +193,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "DEP_WX_GTK3" true) (lib.cmakeBool "SLIC3R_BUILD_TESTS" false) (lib.cmakeFeature "CMAKE_CXX_FLAGS" "-DBOOST_LOG_DYN_LINK") + + (lib.cmakeFeature "LIBNOISE_INCLUDE_DIR" "${lib.getInclude libnoise}/include/noise") + (lib.cmakeFeature "LIBNOISE_LIBRARY" "${lib.getLib libnoise}/lib/libnoise-static.a") ]; preFixup = '' diff --git a/pkgs/by-name/ba/bambu-studio/patches/dont-link-opencv-world-bambu.patch b/pkgs/by-name/ba/bambu-studio/patches/dont-link-opencv-world-bambu.patch index cb7e212144ac..39325d7bfbf1 100644 --- a/pkgs/by-name/ba/bambu-studio/patches/dont-link-opencv-world-bambu.patch +++ b/pkgs/by-name/ba/bambu-studio/patches/dont-link-opencv-world-bambu.patch @@ -1,14 +1,14 @@ diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt -index 2cdc525..44e6602 100644 +index 2315928..55a2f1b 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt -@@ -533,7 +533,8 @@ target_link_libraries(libslic3r +@@ -627,7 +627,8 @@ target_link_libraries(libslic3r ${OCCT_LIBS} Clipper2 mcut - opencv_world + opencv_core + opencv_imgproc + ${_cgal_tgt} + assimp::assimp ) - - if(NOT WIN32) \ No newline at end of file diff --git a/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch index b1c591a58d0e..38cd16047b52 100644 --- a/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch +++ b/pkgs/by-name/ba/bambu-studio/patches/no-cereal.patch @@ -1,22 +1,22 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 0b4b9a8..8c22f60 100644 +index 1f12e26..ffd7888 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -125,7 +125,7 @@ if (NOT WIN32 AND NOT APPLE) +@@ -128,7 +128,7 @@ if (NOT WIN32 AND NOT APPLE) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/platform/unix/BuildLinuxImage.sh.in ${CMAKE_CURRENT_BINARY_DIR}/BuildLinuxImage.sh @ONLY) endif () - + -target_link_libraries(BambuStudio libslic3r cereal) +target_link_libraries(BambuStudio libslic3r) if (APPLE) # add_compile_options(-stdlib=libc++) # add_definitions(-DBOOST_THREAD_DONT_USE_CHRONO -DBOOST_NO_CXX11_RVALUE_REFERENCES -DBOOST_THREAD_USES_MOVE) diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt -index 4481362..7d41af3 100644 +index 2315928..f89b770 100644 --- a/src/libslic3r/CMakeLists.txt +++ b/src/libslic3r/CMakeLists.txt -@@ -574,7 +574,6 @@ set(OCCT_LIBS - target_link_libraries(libslic3r +@@ -608,7 +608,6 @@ target_link_libraries(libslic3r + noise::noise libnest2d admesh - cereal @@ -24,17 +24,19 @@ index 4481362..7d41af3 100644 miniz boost_libs diff --git a/src/slic3r/CMakeLists.txt b/src/slic3r/CMakeLists.txt -index 0a852a4..2da0533 100644 +index 63671a0..0b77a9f 100644 --- a/src/slic3r/CMakeLists.txt +++ b/src/slic3r/CMakeLists.txt -@@ -671,8 +671,8 @@ source_group(TREE ${CMAKE_CURRENT_SOURCE_DIR} FILES ${SLIC3R_GUI_SOURCES}) - - encoding_check(libslic3r_gui) - --target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto) +@@ -743,10 +743,10 @@ else () + find_library(HPDF_LIBRARY NAMES hpdf) + endif () + +-target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ++target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi + ${HPDF_LIBRARY} + ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto) -#target_link_libraries(libslic3r_gui libslic3r cereal imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw) -+target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi ${wxWidgets_LIBRARIES} glfw libcurl OpenSSL::SSL OpenSSL::Crypto) +#target_link_libraries(libslic3r_gui libslic3r imgui imguizmo minilzo GLEW::GLEW OpenGL::GL hidapi libcurl OpenSSL::SSL OpenSSL::Crypto ${wxWidgets_LIBRARIES} glfw) - + if (MSVC) - target_link_libraries(libslic3r_gui Setupapi.lib) + target_link_libraries(libslic3r_gui Setupapi.lib dwmapi.lib) \ No newline at end of file diff --git a/pkgs/by-name/ba/bambu-studio/patches/no-device-web-node-download.patch b/pkgs/by-name/ba/bambu-studio/patches/no-device-web-node-download.patch new file mode 100644 index 000000000000..78c2976b0125 --- /dev/null +++ b/pkgs/by-name/ba/bambu-studio/patches/no-device-web-node-download.patch @@ -0,0 +1,235 @@ +diff --git a/src/slic3r/GUI/DeviceWeb/CMakeLists.txt b/src/slic3r/GUI/DeviceWeb/CMakeLists.txt +index bb65ab0..06684d4 100644 +--- a/src/slic3r/GUI/DeviceWeb/CMakeLists.txt ++++ b/src/slic3r/GUI/DeviceWeb/CMakeLists.txt +@@ -3,225 +3,11 @@ + # date -- 2025.01.01 + # status -- Building + +-# ==================== Node.js/pnpm 环境准备(仅用于 deviceweb 构建)==================== +- +-function(prepare_node_env) +- # 定义版本号 +- set(NODE_VERSION "22.22.2") +- set(PNPM_VERSION "10.12.1") +- +- # 定义本地缓存目录(放在项目同级目录,clean build 后不会丢失) +- set(NODE_CACHE_DIR "${CMAKE_SOURCE_DIR}/../node-cache") +- +- # 根据平台确定下载 URL、文件名和 hash 值 +- if(WIN32) +- set(NODE_URL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-win-x64.zip") +- set(NODE_ARCHIVE_NAME "node-v${NODE_VERSION}-win-x64.zip") +- set(NODE_BIN_DIR "node-v${NODE_VERSION}-win-x64") +- set(NODE_EXEC "node.exe") +- set(NODE_HASH "7c93e9d92bf68c07182b471aa187e35ee6cd08ef0f24ab060dfff605fcc1c57c") +- set(PNPM_URL "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-win-x64.exe") +- set(PNPM_EXEC_NAME "pnpm.exe") +- set(PNPM_HASH "9b802759436b3bccfe0a78cb0b86e937ac44902ec16597260f59d5394602f092") +- elseif(APPLE) +- if(CMAKE_SYSTEM_PROCESSOR STREQUAL "arm64") +- set(NODE_URL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-darwin-arm64.tar.gz") +- set(NODE_ARCHIVE_NAME "node-v${NODE_VERSION}-darwin-arm64.tar.gz") +- set(NODE_BIN_DIR "node-v${NODE_VERSION}-darwin-arm64/bin") +- set(NODE_HASH "db4b275b83736df67533529a18cc55de2549a8329ace6c7bcc68f8d22d3c9000") +- +- set(PNPM_URL "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-macos-arm64") +- set(PNPM_HASH "8b39b2129a19eeec9511eb7cdde2450b604e389551d59ad738167f7495b56d52") +- else() +- set(NODE_URL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-darwin-x64.tar.gz") +- set(NODE_ARCHIVE_NAME "node-v${NODE_VERSION}-darwin-x64.tar.gz") +- set(NODE_BIN_DIR "node-v${NODE_VERSION}-darwin-x64/bin") +- set(NODE_HASH "12a6abb9c2902cf48a21120da13f87fde1ed1b71a13330712949e8db818708ba") +- +- set(PNPM_URL "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-macos-x64") +- set(PNPM_HASH "4c78e34022bfecfae60c041148a8022858b80b50e3b31c8fa8ba7b2b6259dd4a") +- endif() +- set(NODE_EXEC "node") +- set(PNPM_EXEC_NAME "pnpm") +- else() +- set(NODE_URL "https://nodejs.org/dist/v${NODE_VERSION}/node-v${NODE_VERSION}-linux-x64.tar.xz") +- set(NODE_ARCHIVE_NAME "node-v${NODE_VERSION}-linux-x64.tar.xz") +- set(NODE_BIN_DIR "node-v${NODE_VERSION}-linux-x64/bin") +- set(NODE_EXEC "node") +- set(NODE_HASH "88fd1ce767091fd8d4a99fdb2356e98c819f93f3b1f8663853a2dee9b438068a") +- +- set(PNPM_URL "https://github.com/pnpm/pnpm/releases/download/v${PNPM_VERSION}/pnpm-linux-x64") +- set(PNPM_EXEC_NAME "pnpm") +- set(PNPM_HASH "eb2dc1f109bca046ce734d062c8dd8f34db2b58a115992f9b086456efd7b2305") +- endif() +- +- # 定义最终的可执行文件路径 +- set(NODE_EXECUTABLE "${NODE_CACHE_DIR}/${NODE_BIN_DIR}/${NODE_EXEC}") +- # pnpm 放到 node 同目录,这样执行 pnpm 时 PATH 中天然能找到 node +- set(PNPM_EXECUTABLE "${NODE_CACHE_DIR}/${NODE_BIN_DIR}/${PNPM_EXEC_NAME}") +- +- # ============ Node.js 下载 + 解压 ============ +- if(NOT EXISTS "${NODE_EXECUTABLE}") +- message(STATUS "Downloading Node.js v${NODE_VERSION} from ${NODE_URL}") +- file(MAKE_DIRECTORY "${NODE_CACHE_DIR}") +- +- file(DOWNLOAD +- ${NODE_URL} +- "${NODE_CACHE_DIR}/${NODE_ARCHIVE_NAME}" +- SHOW_PROGRESS +- STATUS node_dl_status +- EXPECTED_HASH SHA256=${NODE_HASH} +- TLS_VERIFY OFF +- ) +- list(GET node_dl_status 0 node_dl_code) +- list(GET node_dl_status 1 node_dl_msg) +- if(NOT node_dl_code EQUAL 0) +- file(REMOVE "${NODE_CACHE_DIR}/${NODE_ARCHIVE_NAME}") +- message(FATAL_ERROR "Failed to download Node.js: ${node_dl_msg}") +- endif() +- +- message(STATUS "Extracting Node.js...") +- if(WIN32) +- execute_process( +- COMMAND powershell -NoProfile -Command +- "Expand-Archive -Path '${NODE_CACHE_DIR}/${NODE_ARCHIVE_NAME}' -DestinationPath '${NODE_CACHE_DIR}' -Force" +- WORKING_DIRECTORY "${NODE_CACHE_DIR}" +- RESULT_VARIABLE extract_result +- OUTPUT_VARIABLE extract_output +- ERROR_VARIABLE extract_error +- ) +- else() +- execute_process( +- COMMAND tar -xf "${NODE_ARCHIVE_NAME}" +- WORKING_DIRECTORY "${NODE_CACHE_DIR}" +- RESULT_VARIABLE extract_result +- OUTPUT_VARIABLE extract_output +- ERROR_VARIABLE extract_error +- ) +- endif() +- +- if(NOT extract_result EQUAL 0) +- message(FATAL_ERROR "Failed to extract Node.js archive: ${extract_error}") +- endif() +- +- # 清理压缩包(节省空间) +- file(REMOVE "${NODE_CACHE_DIR}/${NODE_ARCHIVE_NAME}") +- +- if(NOT EXISTS "${NODE_EXECUTABLE}") +- message(FATAL_ERROR "Node.js extraction finished but executable not found: ${NODE_EXECUTABLE}") +- endif() +- +- message(STATUS "Node.js extracted to: ${NODE_EXECUTABLE}") +- else() +- message(STATUS "Found cached Node.js: ${NODE_EXECUTABLE}") +- endif() +- +- # ============ pnpm 独立二进制下载 ============ +- if(NOT EXISTS "${PNPM_EXECUTABLE}") +- message(STATUS "Downloading pnpm v${PNPM_VERSION} from ${PNPM_URL}") +- +- file(DOWNLOAD +- ${PNPM_URL} +- "${PNPM_EXECUTABLE}" +- SHOW_PROGRESS +- STATUS pnpm_dl_status +- EXPECTED_HASH SHA256=${PNPM_HASH} +- TLS_VERIFY OFF +- ) +- list(GET pnpm_dl_status 0 pnpm_dl_code) +- list(GET pnpm_dl_status 1 pnpm_dl_msg) +- if(NOT pnpm_dl_code EQUAL 0) +- file(REMOVE "${PNPM_EXECUTABLE}") +- message(FATAL_ERROR "Failed to download pnpm: ${pnpm_dl_msg}") +- endif() +- +- if(NOT WIN32) +- execute_process( +- COMMAND chmod +x "${PNPM_EXECUTABLE}" +- RESULT_VARIABLE chmod_result +- ERROR_VARIABLE chmod_error +- ) +- if(NOT chmod_result EQUAL 0) +- message(FATAL_ERROR "Failed to chmod +x pnpm: ${chmod_error}") +- endif() +- endif() +- +- message(STATUS "pnpm installed: ${PNPM_EXECUTABLE}") +- else() +- message(STATUS "Found cached pnpm: ${PNPM_EXECUTABLE}") +- endif() +- +- # 设置输出变量(使用绝对路径) +- set(NODE_EXECUTABLE "${NODE_EXECUTABLE}" PARENT_SCOPE) +- set(PNPM_EXECUTABLE "${PNPM_EXECUTABLE}" PARENT_SCOPE) +-endfunction() +- +-# 执行环境准备(在 config 阶段执行) +-prepare_node_env() +- +-# ==================== 前端工程构建 ==================== +- +-set(DEVICE_PAGE_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/device_page") +-set(DEVICE_PAGE_DIST_DIR "${DEVICE_PAGE_SRC_DIR}/dist") +-set(DEVICE_PAGE_TARGET_DIR "${CMAKE_SOURCE_DIR}/resources/web/device_page/dist") +- +-get_filename_component(NODE_BIN_PATH "${NODE_EXECUTABLE}" DIRECTORY) +- +-if(WIN32) +- # 原本PATH末尾的\会影响后续的分隔符,需要处理 +- set(DEVICE_PAGE_PATH_UNESCAPED "${NODE_BIN_PATH};$ENV{PATH}") +- string(REPLACE "\;" ";" DEVICE_PAGE_PATH "${DEVICE_PAGE_PATH_UNESCAPED}") +-else() +- # Unix PATH 分隔符是 : +- set(DEVICE_PAGE_PATH "${NODE_BIN_PATH}:$ENV{PATH}") +-endif() +- +-set(PNPM_STORE_DIR "${CMAKE_CURRENT_BINARY_DIR}/.pnpm-store") +-file(MAKE_DIRECTORY "${PNPM_STORE_DIR}") +- +-set(DEVICE_PAGE_BUILD_STAMP "${CMAKE_CURRENT_BINARY_DIR}/device_page.stamp") +- +-file(GLOB_RECURSE DEVICE_PAGE_SRC_FILES CONFIGURE_DEPENDS +- "${DEVICE_PAGE_SRC_DIR}/src/*" +-) +-file(GLOB_RECURSE DEVICE_PAGE_LOCALE_FILES CONFIGURE_DEPENDS +- "${DEVICE_PAGE_SRC_DIR}/locales/*" +-) +-file(GLOB_RECURSE DEVICE_PAGE_PUBLIC_FILES CONFIGURE_DEPENDS +- "${DEVICE_PAGE_SRC_DIR}/public/*" +-) +- +-set(DEVICE_PAGE_BUILD_INPUTS +- ${DEVICE_PAGE_SRC_FILES} +- ${DEVICE_PAGE_LOCALE_FILES} +- ${DEVICE_PAGE_PUBLIC_FILES} +- "${DEVICE_PAGE_SRC_DIR}/index.html" +- "${DEVICE_PAGE_SRC_DIR}/package.json" +- "${DEVICE_PAGE_SRC_DIR}/pnpm-lock.yaml" +- "${DEVICE_PAGE_SRC_DIR}/vite.config.ts" +- "${DEVICE_PAGE_SRC_DIR}/tsconfig.json" +- "${DEVICE_PAGE_SRC_DIR}/tsconfig.app.json" +- "${DEVICE_PAGE_SRC_DIR}/tsconfig.node.json" +- "${DEVICE_PAGE_SRC_DIR}/eslint.config.js" +- "${DEVICE_PAGE_SRC_DIR}/i18next-parser.config.js" +-) +- +-add_custom_command( +- OUTPUT "${DEVICE_PAGE_BUILD_STAMP}" +- COMMAND ${CMAKE_COMMAND} -E env "PATH=${DEVICE_PAGE_PATH}" "PNPM_STORE_DIR=${PNPM_STORE_DIR}" ${PNPM_EXECUTABLE} install +- COMMAND ${CMAKE_COMMAND} -E env "PATH=${DEVICE_PAGE_PATH}" "PNPM_STORE_DIR=${PNPM_STORE_DIR}" ${PNPM_EXECUTABLE} run build +- COMMAND ${CMAKE_COMMAND} -E remove_directory "${DEVICE_PAGE_TARGET_DIR}" +- COMMAND ${CMAKE_COMMAND} -E make_directory "${DEVICE_PAGE_TARGET_DIR}" +- COMMAND ${CMAKE_COMMAND} -E copy_directory "${DEVICE_PAGE_DIST_DIR}" "${DEVICE_PAGE_TARGET_DIR}" +- COMMAND ${CMAKE_COMMAND} -E touch "${DEVICE_PAGE_BUILD_STAMP}" +- DEPENDS ${DEVICE_PAGE_BUILD_INPUTS} +- WORKING_DIRECTORY ${DEVICE_PAGE_SRC_DIR} +- COMMENT "Building device_page web bundle when sources change..." +- VERBATIM +-) +- +-# Not ALL: rebuilt only when a dependent target (libslic3r_gui / BambuStudio) is built. +-add_custom_target(device_page_build DEPENDS "${DEVICE_PAGE_BUILD_STAMP}") ++# NOTE (nixpkgs): the device_page frontend build has been removed. ++# Upstream downloads Node.js + pnpm at configure time and runs `pnpm install` ++# and `pnpm run build` at build time, none of which works in the offline Nix ++# sandbox. The C++ GUI sources below are still compiled; only the web resource ++# bundle (resources/web/device_page/dist) is not produced. + + list(APPEND SLIC3R_GUI_SOURCES + GUI/DeviceWeb/DeviceHttpServer.cpp diff --git a/pkgs/by-name/ba/bambuddy/package.nix b/pkgs/by-name/ba/bambuddy/package.nix new file mode 100644 index 000000000000..f18e9781c66f --- /dev/null +++ b/pkgs/by-name/ba/bambuddy/package.nix @@ -0,0 +1,121 @@ +{ + fetchFromGitHub, + buildNpmPackage, + python3, + stdenv, + makeWrapper, + lib, + ffmpeg, +}: +let + version = "0.2.4.8"; + + src = fetchFromGitHub { + owner = "maziggy"; + repo = "bambuddy"; + tag = "v${version}"; + hash = "sha256-6qeIidvi62NUok7I9UQ8DblT0/Wscju4FMnVuPXzMdM="; + }; + + frontend = buildNpmPackage { + pname = "bambuddy-frontend"; + inherit version src; + + sourceRoot = "${src.name}/frontend"; + npmDepsHash = "sha256-/22FkXus5f3wYivyadZWU6ZKPYFLF8xA8mkVGxvdXm0="; + + preBuild = "chmod -R u+w ../static"; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r ../static/. $out/ + + runHook postInstall + ''; + }; + + # https://github.com/maziggy/bambuddy/blob/main/requirements.txt + python = python3.withPackages ( + ps: with ps; [ + aiofiles + aioftp + aiosqlite + asyncpg + asyncssh + bcrypt + cryptography + curl-cffi + defusedxml + fastapi + fast-simplification + greenlet + httpx + ldap3 + lxml + matplotlib + networkx + numpy + opencv4 + openpyxl + paho-mqtt + passlib + pillow + psutil + pydantic + pydantic-settings + pyftpdlib + pyjwt + pyopenssl + pyotp + python-multipart + pywebpush + qrcode + reportlab + sqlalchemy + trimesh + uvicorn + websockets + ] + ); +in +stdenv.mkDerivation { + pname = "bambuddy"; + inherit version src; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/bambuddy + cp -r . $out/lib/bambuddy/ + + rm -rf $out/lib/bambuddy/static + ln -s ${frontend} $out/lib/bambuddy/static + + mkdir -p $out/bin + + makeWrapper ${lib.getExe' python "uvicorn"} $out/bin/bambuddy \ + --chdir "$out/lib/bambuddy" \ + --prefix PYTHONPATH : "$out/lib/bambuddy" \ + --prefix PATH : ${ffmpeg}/bin \ + --add-flags "backend.app.main:app" + + runHook postInstall + ''; + + meta = { + description = "Self-hosted command center for Bambu Lab"; + homepage = "https://bambuddy.cool/"; + changelog = "https://github.com/maziggy/bambuddy/blob/v${version}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ onatustun ]; + mainProgram = "bambuddy"; + platforms = with lib.platforms; linux ++ darwin; + }; +} diff --git a/pkgs/by-name/ba/bandcampsync/package.nix b/pkgs/by-name/ba/bandcampsync/package.nix new file mode 100644 index 000000000000..3a598bfd55bf --- /dev/null +++ b/pkgs/by-name/ba/bandcampsync/package.nix @@ -0,0 +1,38 @@ +{ + lib, + python3, + fetchFromGitHub, +}: + +python3.pkgs.buildPythonApplication (finalAttrs: { + pname = "bandcampsync"; + version = "0.8.0"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "meeb"; + repo = "bandcampsync"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j370Kn95CQuGjwOoFMXNNQZ5odlR/0uiw02hN/UVAb8="; + }; + + build-system = with python3.pkgs; [ setuptools ]; + + dependencies = with python3.pkgs; [ + beautifulsoup4 + curl-cffi + ]; + + pythonImportsCheck = [ "bandcampsync" ]; + + meta = { + description = "Download your Bandcamp purchases automatically"; + homepage = "https://github.com/meeb/bandcampsync"; + changelog = "https://github.com/meeb/bandcampsync/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.bsd3; + maintainers = [ lib.maintainers.haylin ]; + mainProgram = "bandcampsync"; + }; +}) diff --git a/pkgs/by-name/ba/bant/package.nix b/pkgs/by-name/ba/bant/package.nix index e5a72fca577d..483a5596f221 100644 --- a/pkgs/by-name/ba/bant/package.nix +++ b/pkgs/by-name/ba/bant/package.nix @@ -20,13 +20,13 @@ let in buildBazelPackage rec { pname = "bant"; - version = "0.2.10"; + version = "0.3.0"; src = fetchFromGitHub { owner = "hzeller"; repo = "bant"; rev = "v${version}"; - hash = "sha256-jFUPCNVoX4I69ibH+w6c41Gqlu8HosQ3DXQWa3lqUsc="; + hash = "sha256-T/BQRYCFAHkaGi5T485I9vbr3g7PzgIEHC27w6mg/3A="; }; bazelFlags = [ diff --git a/pkgs/by-name/ba/baresip/package.nix b/pkgs/by-name/ba/baresip/package.nix index 59751155f417..e0fdf5a9fb0e 100644 --- a/pkgs/by-name/ba/baresip/package.nix +++ b/pkgs/by-name/ba/baresip/package.nix @@ -31,14 +31,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.8.0"; + version = "4.9.0"; pname = "baresip"; src = fetchFromGitHub { owner = "baresip"; repo = "baresip"; rev = "v${finalAttrs.version}"; - hash = "sha256-QAlpOikf6T/YfAtvrOJy0lJX3vRGLCBa+g2sYBcGmt0="; + hash = "sha256-eEDiv/yBKWVvKTAeelqVSAQp2xHhXRJVkK2x0FZ9tOE="; }; patches = [ diff --git a/pkgs/by-name/ba/barman/package.nix b/pkgs/by-name/ba/barman/package.nix index 0390432c052e..df7e38409bd7 100644 --- a/pkgs/by-name/ba/barman/package.nix +++ b/pkgs/by-name/ba/barman/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "barman"; - version = "3.19.0"; + version = "3.19.1"; pyproject = true; src = fetchFromGitHub { owner = "EnterpriseDB"; repo = "barman"; tag = "release/${finalAttrs.version}"; - hash = "sha256-qjde8NdI+/2BH4L3LoxoYqdVwsaBXw1IcxYBx6sYqG8="; + hash = "sha256-7K7ibg2/hr5wBzGR8cW5FZNtPPFEBA7xPwmOl2c1fOU="; }; patches = [ diff --git a/pkgs/by-name/ba/barrage/package.nix b/pkgs/by-name/ba/barrage/package.nix index 93ad9db5a828..ebbe395f37cf 100644 --- a/pkgs/by-name/ba/barrage/package.nix +++ b/pkgs/by-name/ba/barrage/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/Barrage/"; description = "Destructive action game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "barrage"; maintainers = [ ]; inherit (SDL.meta) platforms; diff --git a/pkgs/by-name/ba/bartender/package.nix b/pkgs/by-name/ba/bartender/package.nix index 67a14d429c5c..3b62a9c9020e 100644 --- a/pkgs/by-name/ba/bartender/package.nix +++ b/pkgs/by-name/ba/bartender/package.nix @@ -62,7 +62,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://downloads.macbartender.com/B2/updates/${ builtins.replaceStrings [ "." ] [ "-" ] finalAttrs.version }/rnotes.html"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd diff --git a/pkgs/by-name/ba/basalt/package.nix b/pkgs/by-name/ba/basalt/package.nix index aeed0a7d20cc..79ba8402ca3d 100644 --- a/pkgs/by-name/ba/basalt/package.nix +++ b/pkgs/by-name/ba/basalt/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "basalt"; - version = "0.12.4"; + version = "0.12.6"; src = fetchFromGitHub { owner = "erikjuhani"; repo = "basalt"; tag = "basalt/v${finalAttrs.version}"; - hash = "sha256-fijpPGPeF3f81WMWj1tIc0ht8hUIubAe19ja3iBNOh0="; + hash = "sha256-MlKrVxNU9PNakIA9hiv5ll7ImkPDekQnassWFO/smkE="; }; - cargoHash = "sha256-jY3EDM+jYwCsMpd5cA5WKzmhdS4rVCLz3h5gfshzhOQ="; + cargoHash = "sha256-sTU0AUwR5xdnqLvrRycxuMk+KNcsEcYU3XvyODKT1Ns="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ba/basedpyright/package.nix b/pkgs/by-name/ba/basedpyright/package.nix index 4196aae7a9ee..be04a3cc04a8 100644 --- a/pkgs/by-name/ba/basedpyright/package.nix +++ b/pkgs/by-name/ba/basedpyright/package.nix @@ -18,13 +18,13 @@ buildNpmPackage rec { pname = "basedpyright"; - version = "1.39.7"; + version = "1.39.8"; src = fetchFromGitHub { owner = "detachhead"; repo = "basedpyright"; tag = "v${version}"; - hash = "sha256-E4TR5deuPSf2YinrEzpP79Rq8zZHLJQUKiEsfUdMDOE="; + hash = "sha256-8S83CTd/td7USKxfCI0cXd2gPBMivi4QMRQwVgxhs6w="; }; npmDepsHash = "sha256-humpJB+fv3+PITcPCz3uY2jNANb3P7sXy0lFP8Eg58I="; @@ -49,6 +49,8 @@ buildNpmPackage rec { mv "$out/bin/pyright-langserver" "$out/bin/basedpyright-langserver" # Remove dangling symlinks created during installation (remove -delete to just see the files, or -print '%l\n' to see the target find -L $out -type l -print -delete + # Remove native module build artifacts that reference nodejs source + rm -rf "$out/lib/node_modules/pyright-root/node_modules/keytar/build" ''; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ba/bash-completion/package.nix b/pkgs/by-name/ba/bash-completion/package.nix index f7c9b961c948..306014c22dde 100644 --- a/pkgs/by-name/ba/bash-completion/package.nix +++ b/pkgs/by-name/ba/bash-completion/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bash-completion"; - version = "2.17.0"; + version = "2.18.0"; # Using fetchurl because fetchGithub or fetchzip will have trouble on # e.g. APFS filesystems (macOS) because of non UTF-8 characters in some of the @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { # See discussion in https://github.com/NixOS/nixpkgs/issues/107768 src = fetchurl { url = "https://github.com/scop/bash-completion/releases/download/${finalAttrs.version}/bash-completion-${finalAttrs.version}.tar.xz"; - hash = "sha256-3Z2CXklkNfs766Oue+qfd+gh6JRmfQdDHR1MjFcLnlg="; + hash = "sha256-iLz4UST3f3Ty8vi80WrEOC2AeoJ+3nQqZJQMcRauoz8="; }; postPatch = '' diff --git a/pkgs/by-name/ba/bash-my-aws/package.nix b/pkgs/by-name/ba/bash-my-aws/package.nix index fe9655631632..31dab3aea160 100644 --- a/pkgs/by-name/ba/bash-my-aws/package.nix +++ b/pkgs/by-name/ba/bash-my-aws/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { version = "0-unstable-2025-01-22"; src = fetchFromGitHub { - owner = "bash-my-aws"; + owner = "mbailey"; repo = "bash-my-aws"; rev = "d338b43cc215719c1853ec500c946db6b9caaa11"; sha256 = "sha256-PR52T6XCrakQsBOJXf0PaYpYE5oMcIz5UDA4I9B7C38="; diff --git a/pkgs/by-name/ba/bashate/package.nix b/pkgs/by-name/ba/bashate/package.nix index e405b8f66799..d0ee31928130 100644 --- a/pkgs/by-name/ba/bashate/package.nix +++ b/pkgs/by-name/ba/bashate/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication rec { description = "Style enforcement for bash programs"; mainProgram = "bashate"; homepage = "https://opendev.org/openstack/bashate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; teams = [ lib.teams.openstack ]; }; diff --git a/pkgs/by-name/ba/bashmount/package.nix b/pkgs/by-name/ba/bashmount/package.nix index 2b8f6ca3c366..336d31a5b14b 100644 --- a/pkgs/by-name/ba/bashmount/package.nix +++ b/pkgs/by-name/ba/bashmount/package.nix @@ -2,6 +2,15 @@ lib, stdenv, fetchFromGitHub, + makeWrapper, + coreutils, + cryptsetup, + eject, + gnugrep, + gnused, + less, + udisks, + util-linux, }: stdenv.mkDerivation (finalAttrs: { @@ -15,6 +24,8 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1irw47s6i1qwxd20cymzlfw5sv579cw877l27j3p66qfhgadwxrl"; }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' mkdir -p $out/bin cp bashmount $out/bin @@ -31,6 +42,22 @@ stdenv.mkDerivation (finalAttrs: { cp NEWS $out/share/doc/bashmount ''; + postFixup = '' + wrapProgram $out/bin/bashmount \ + --prefix PATH : ${ + lib.makeBinPath [ + coreutils + cryptsetup + eject + gnugrep + gnused + less + udisks + util-linux + ] + } + ''; + meta = { homepage = "https://github.com/jamielinux/bashmount"; description = "Menu-driven bash script for the management of removable media with udisks"; diff --git a/pkgs/by-name/ba/bashunit/package.nix b/pkgs/by-name/ba/bashunit/package.nix index 74d68aa0b1ec..70cf5986acd0 100644 --- a/pkgs/by-name/ba/bashunit/package.nix +++ b/pkgs/by-name/ba/bashunit/package.nix @@ -17,13 +17,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "bashunit"; - version = "0.39.1"; + version = "0.40.0"; src = fetchFromGitHub { owner = "TypedDevs"; repo = "bashunit"; tag = finalAttrs.version; - hash = "sha256-yMzi2SFEMSNNFztapWavMmbueWwVK0GWjyFR3cJZmTg="; + hash = "sha256-7KH0zcoRPbY56h8FtJ0WbCqM2dSn/bklAPIthnktkpI="; forceFetchGit = true; # needed to include the tests directory for the check phase }; diff --git a/pkgs/by-name/ba/basiliskii/package.nix b/pkgs/by-name/ba/basiliskii/package.nix index 256055aa1ca4..061f9be79724 100644 --- a/pkgs/by-name/ba/basiliskii/package.nix +++ b/pkgs/by-name/ba/basiliskii/package.nix @@ -11,15 +11,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "basiliskii"; - version = "unstable-2025-07-16"; + version = "unstable-2026-06-30"; # This src is also used to build pkgs/os-specific/linux/sheep-net # Therefore changes to it may effect the sheep-net package src = fetchFromGitHub { owner = "kanjitalk755"; repo = "macemu"; - rev = "030599cf8d31cb80afae0e1b086b5706dbdd2eea"; - sha256 = "sha256-gxaj+2ymelH6uWmjMLXi64xMNrToo6HZcJ7RW7sVMzo="; + rev = "51b5255eead47203ae78636796a6e6d5713e6705"; + sha256 = "sha256-/8k5NNnfl3PZWFXECtiNdLi2CwACp2b5uiIpSOmWcDI="; }; sourceRoot = "${finalAttrs.src.name}/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; diff --git a/pkgs/by-name/ba/batticonplus/package.nix b/pkgs/by-name/ba/batticonplus/package.nix index 6794b2346788..b54560eb354b 100644 --- a/pkgs/by-name/ba/batticonplus/package.nix +++ b/pkgs/by-name/ba/batticonplus/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.0.1"; src = fetchFromGitHub { - owner = "artist4xlibre"; + owner = "artist4artixlinux"; repo = "batticonplus"; tag = "v${finalAttrs.version}"; hash = "sha256-H9ZoiQ5zWMIoWWol2a6f9Z8g4o9DIHYdF+/nEsBfuzc="; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight battery status icon for the system tray and notifier (based on cbatticon)"; mainProgram = "batticonplus"; - homepage = "https://github.com/artist4xlibre/batticonplus"; + homepage = "https://github.com/artist4artixlinux/batticonplus"; license = lib.licenses.gpl2; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ yechielw ]; diff --git a/pkgs/by-name/ba/bazaar/package.nix b/pkgs/by-name/ba/bazaar/package.nix index 5ef3c44b4f71..0300802cf929 100644 --- a/pkgs/by-name/ba/bazaar/package.nix +++ b/pkgs/by-name/ba/bazaar/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bazaar"; - version = "0.8.3"; + version = "0.9.1"; __structuredAttrs = true; strictDeps = true; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "bazaar-org"; repo = "bazaar"; tag = "v${finalAttrs.version}"; - hash = "sha256-s0l548kuVD+eNAxA3BnbpuMHD1alq0/xGBIkXb7WpC0="; + hash = "sha256-9J+XI5JnV8Yfk3xRI/VM5RSG4eMafbw2rBRpPMIu5yA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ba/bazarr/package.nix b/pkgs/by-name/ba/bazarr/package.nix index f029fa8f1453..3b531409b618 100644 --- a/pkgs/by-name/ba/bazarr/package.nix +++ b/pkgs/by-name/ba/bazarr/package.nix @@ -1,75 +1,112 @@ { - stdenv, lib, - fetchzip, - makeWrapper, - python3, - unar, + stdenv, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + dart-sass, + makeBinaryWrapper, + python313, ffmpeg, + unar, nixosTests, + nix-update-script, }: - let - runtimeProgDeps = [ - ffmpeg - unar - ]; + python = python313.withPackages (ps: [ + ps.lxml + ps.numpy + ps.pillow + ps.psycopg2 + ps.setuptools + ps.webrtcvad + ]); in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "bazarr"; - version = "1.5.6"; + version = "1.6.0"; - src = fetchzip { - url = "https://github.com/morpheus65535/bazarr/releases/download/v${version}/bazarr.zip"; - hash = "sha256-S3idNH9Wm9f6aNj69dERmeks1rLvUeQJYFebXa5cWQo="; - stripRoot = false; + src = fetchFromGitHub { + owner = "morpheus65535"; + repo = "bazarr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-r3H0JEcGYzQOTHVR/zONmtOIF+LnJd+qn2pcAj8vdOA="; }; - nativeBuildInputs = [ makeWrapper ]; + npmRoot = "frontend"; + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/frontend"; + hash = "sha256-cb++eqVtKZer9B1rwJ9WR4mZImnASeFU2MojgXAPWf4="; + }; - buildInputs = [ - (python3.withPackages (ps: [ - ps.lxml - ps.numpy - ps.gevent - ps.gevent-websocket - ps.pillow - ps.setuptools - ps.psycopg2 - ps.webrtcvad - ])) - ] - ++ runtimeProgDeps; + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + dart-sass + makeBinaryWrapper + ]; + + buildPhase = '' + runHook preBuild + pushd frontend + # sass-embedded's bundled Dart compiler won't run in the sandbox; use nixpkgs' dart-sass. + # https://github.com/sass/embedded-host-node/issues/334 + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' + npm run build + popd + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p "$out"/{bin,share/${pname}} - cp -r * "$out/share/${pname}" + mkdir -p $out/share/bazarr/frontend + cp -r bazarr bazarr.py custom_libs libs migrations $out/share/bazarr/ + cp -r frontend/build $out/share/bazarr/frontend/build - # Add missing shebang and execute perms so that patchShebangs can do its - # thing. - sed -i "1i #!/usr/bin/env python3" "$out/share/${pname}/bazarr.py" - chmod +x "$out/share/${pname}/bazarr.py" + printf '%s' "${finalAttrs.version}" > $out/share/bazarr/VERSION - makeWrapper "$out/share/${pname}/bazarr.py" \ - "$out/bin/bazarr" \ - --suffix PATH : ${lib.makeBinPath runtimeProgDeps} + printf '%s' "${ + lib.generators.toKeyValue { } { + updatemethod = "External"; + updatemethodmessage = "Bazarr is managed by Nix. Update it through your system configuration."; + packageversion = finalAttrs.version; + packageauthor = "nixpkgs"; + } + }" > $out/share/bazarr/package_info + + makeWrapper ${lib.getExe python} $out/bin/bazarr \ + --add-flags $out/share/bazarr/bazarr.py \ + --prefix PATH : ${ + lib.makeBinPath [ + ffmpeg + unar + ] + } runHook postInstall ''; - passthru.tests = { - smoke-test = nixosTests.bazarr; + passthru = { + tests.smoke-test = nixosTests.bazarr; + updateScript = nix-update-script { }; }; meta = { description = "Subtitle manager for Sonarr and Radarr"; homepage = "https://www.bazarr.media/"; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + changelog = "https://github.com/morpheus65535/bazarr/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ diogotcorreia ]; + maintainers = with lib.maintainers; [ + connor-grady + diogotcorreia + ]; mainProgram = "bazarr"; - platforms = lib.platforms.all; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ba/bazel-buildtools/package.nix b/pkgs/by-name/ba/bazel-buildtools/package.nix index 8426f09a67a3..5078b9aafe7d 100644 --- a/pkgs/by-name/ba/bazel-buildtools/package.nix +++ b/pkgs/by-name/ba/bazel-buildtools/package.nix @@ -39,9 +39,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/bazelbuild/buildtools"; changelog = "https://github.com/bazelbuild/buildtools/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - elasticdog - ]; teams = [ lib.teams.bazel ]; }; }) diff --git a/pkgs/by-name/ba/bazel-gazelle/package.nix b/pkgs/by-name/ba/bazel-gazelle/package.nix index a6d180098248..24e3c6c62f0e 100644 --- a/pkgs/by-name/ba/bazel-gazelle/package.nix +++ b/pkgs/by-name/ba/bazel-gazelle/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "bazel-gazelle"; - version = "0.47.0"; + version = "0.51.3"; src = fetchFromGitHub { - owner = "bazelbuild"; + owner = "bazel-contrib"; repo = "bazel-gazelle"; - rev = "v${finalAttrs.version}"; - hash = "sha256-rnJ8rht7ccAI8ceOv3B0mlcY0fQg9Nfy+hu+/pmQQqE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-ooqk4xutkjXoy9Irikos/53+6Mhdh3+WmJF7vo3JVFw="; }; vendorHash = null; @@ -22,14 +22,18 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/gazelle" ]; meta = { - homepage = "https://github.com/bazelbuild/bazel-gazelle"; + changelog = "https://github.com/bazel-contrib/bazel-gazelle/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/bazel-contrib/bazel-gazelle"; description = '' Gazelle is a Bazel build file generator for Bazel projects. It natively supports Go and protobuf, and it may be extended to support new languages and custom rule sets. ''; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ kalbasit ]; + maintainers = with lib.maintainers; [ + kalbasit + hythera + ]; mainProgram = "gazelle"; }; }) diff --git a/pkgs/by-name/ba/bazel-watcher/package.nix b/pkgs/by-name/ba/bazel-watcher/package.nix index 3017531eecb0..3bb61a93afcd 100644 --- a/pkgs/by-name/ba/bazel-watcher/package.nix +++ b/pkgs/by-name/ba/bazel-watcher/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "bazel-watcher"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazel-watcher"; rev = "v${finalAttrs.version}"; - hash = "sha256-ssG2BFd2utB9xu9zYdcvZYLq+XF9ZOctxNGtpbrhLG8="; + hash = "sha256-5W39lT66Jid8qzeUADcuDPKR7UkTxtEOwaKUO6oHWtk="; }; vendorHash = "sha256-u1Zg/M9DSkwscy49qtPQygk1gyxKaPbhlFDYNtBQ9NY="; diff --git a/pkgs/by-name/ba/bazel_8/examples.nix b/pkgs/by-name/ba/bazel_8/examples.nix index 689bb9c0a753..38cc4da6ff97 100644 --- a/pkgs/by-name/ba/bazel_8/examples.nix +++ b/pkgs/by-name/ba/bazel_8/examples.nix @@ -49,7 +49,6 @@ in { aarch64-darwin = "sha256-FwHsg9P65Eu/n8PV7UW90bvBNG+U67zizRy6Krk32Yg="; aarch64-linux = "sha256-W8h2tCIauGnEvPpXje19bZUE/izHaCQ0Wj4nMaP3nkc="; - x86_64-darwin = "sha256-XIrGRmYDDRN3Kkt1dFWex1bPRMeIHAR+XWLqB/PpOAM="; x86_64-linux = "sha256-VBckTQAK5qeyi2ublk+Dcga5O5XZg3bfHR6Yaw6vSp0="; } .${stdenv.hostPlatform.system}; @@ -79,7 +78,6 @@ in { aarch64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; aarch64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; - x86_64-darwin = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; x86_64-linux = "sha256-l6qJU0zGIKl12TYYsG5b+upswUA0hGE+VtQ9QnKpBh8="; } .${stdenv.hostPlatform.system}; @@ -108,10 +106,9 @@ in bazelVendorDepsFOD = { outputHash = { - aarch64-darwin = "sha256-wjVwHQEtIoApY01s9AEVExmRhy+LLQv0/B2vAxmXz+o="; - aarch64-linux = "sha256-Z7Y8bBEaPgp9y6RZoC5Ewqvzi//vnamkpeHXGpoBFAQ="; - x86_64-darwin = "sha256-aUTfOrsa59zUE0Wb+u5TORQR0nAGQ/7MWSRHc2hcXoo="; - x86_64-linux = "sha256-yrXIJocCGq4NYW0jg5s2cMDEvknrtjtBQo6cZFbz8CE="; + aarch64-darwin = "sha256-50cAS1okGT1Mq3+TNLk2dk6OdBOAF2LdcskcYuVNOSY="; + aarch64-linux = "sha256-2Oia7+2nzLrWeo/bK/5L7du5Y30DY+S0jit6e1ixJXw="; + x86_64-linux = "sha256-kBnSlFRfYsotZTRMrTNhk8/106+BLzwuU6MIRXlD1jE="; } .${stdenv.hostPlatform.system}; outputHashAlgo = "sha256"; diff --git a/pkgs/by-name/ba/bazel_8/package.nix b/pkgs/by-name/ba/bazel_8/package.nix index 7ea81a4c92d3..eb4388d842a1 100644 --- a/pkgs/by-name/ba/bazel_8/package.nix +++ b/pkgs/by-name/ba/bazel_8/package.nix @@ -31,7 +31,7 @@ cctools, # Allow to independently override the jdks used to build and run respectively jdk_headless, - version ? "8.6.0", + version ? "8.7.0", }: let @@ -45,7 +45,7 @@ let src = fetchzip { url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; - hash = "sha256-W22eB0IzHNZe3xaF8AZOkUTDCic3NXkypdqSDY61Su0="; + hash = "sha256-bm+gkkrAVepJWZddDEV1+jX4jRdD+tZ1TH2YG9adIyk="; stripRoot = false; }; diff --git a/pkgs/by-name/ba/bazel_9/examples.nix b/pkgs/by-name/ba/bazel_9/examples.nix index 27f848282eb4..97b262d983b5 100644 --- a/pkgs/by-name/ba/bazel_9/examples.nix +++ b/pkgs/by-name/ba/bazel_9/examples.nix @@ -64,7 +64,6 @@ in { aarch64-darwin = "sha256-Jth981+r20azC/CqoWN3LK5USm8zUIpL9Xt88+TcL1o="; aarch64-linux = "sha256-4E/QCSOXTN/dW65xz/n47tXW0PlHUOP1UP+TwJfMueI="; - x86_64-darwin = "sha256-t4JP4o3O9C9BehidQPVu4EATnUZodhFh1/ctITxD6JA="; x86_64-linux = "sha256-HzgFpbEBZ8efA5pwUsGZjt9bKiAXslB17OZQcm3cspc="; } .${stdenv.hostPlatform.system}; @@ -102,7 +101,6 @@ in { aarch64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; aarch64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; - x86_64-darwin = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; x86_64-linux = "sha256-CbA4Kcn6656xnK6DkN4TZ7u1/mizA49Im9hRCU86TGs="; } .${stdenv.hostPlatform.system}; @@ -141,7 +139,6 @@ in { aarch64-darwin = "sha256-uUl7PpR3jAKvj6VWspPE3IR4Gr/V2VrBv1MlTzOIZJs="; aarch64-linux = "sha256-uhcIwDk8NAZDBynzxWk+0fLP/2XadKQRl5BlFPjf4/8="; - x86_64-darwin = "sha256-vi3+/ps+dhDjqYHxWSnWOXhh1jWJWwb5ifUUhN4vxrg="; x86_64-linux = "sha256-YURF8Zjueq3BN5GfEx5L+C4hGmr5qfJc7OngqZ17384="; } .${stdenv.hostPlatform.system}; diff --git a/pkgs/by-name/ba/bazelisk/package.nix b/pkgs/by-name/ba/bazelisk/package.nix index 9244fbbb5eaf..31ce4fda2dc3 100644 --- a/pkgs/by-name/ba/bazelisk/package.nix +++ b/pkgs/by-name/ba/bazelisk/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "bazelisk"; - version = "1.28.1"; + version = "1.29.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "bazelisk"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-iKU8B8yOT8cPvZhuor8ZVRsHQDoXq1ja1mr60XqHoEs="; + tag = "v${finalAttrs.version}"; + hash = "sha256-NijRYjJyWOqSkfDKOdki3nrc1OIhfooKLhusuiMY/Js="; }; - vendorHash = "sha256-PWqKq/2DFopeiecUL0iWnut8Kd/52U32sNSVGj3Ae5g="; + vendorHash = "sha256-oycCqzUAn/lNFjeLjM+PQfYNscaTi5E9D7Pnv8jrO8M="; ldflags = [ "-s" @@ -30,8 +30,10 @@ buildGoModule (finalAttrs: { BEWARE: This package does not work on NixOS. ''; homepage = "https://github.com/bazelbuild/bazelisk"; - changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/bazelbuild/bazelisk/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ elasticdog ]; + maintainers = with lib.maintainers; [ + hythera + ]; }; }) diff --git a/pkgs/by-name/bb/bbot/package.nix b/pkgs/by-name/bb/bbot/package.nix index 5359e79cbf97..86132aedd05e 100644 --- a/pkgs/by-name/bb/bbot/package.nix +++ b/pkgs/by-name/bb/bbot/package.nix @@ -6,20 +6,25 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "bbot"; - version = "2.7.2"; + version = "2.8.6"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-vpKezG1nJVxQE4Qijf8feeRFD4hjy98HznVDXL+MBkE="; + hash = "sha256-u8F995BD1l6nPWYckMIYSgErSO3fBcU2IyBFU1WZjF8="; }; pythonRelaxDeps = [ "dnspython" + "idna" + "lxml" "radixtarget" "regex" "tabulate" "websockets" + "yara-python" + "pyjwt" + "cloudcheck" ]; build-system = with python3.pkgs; [ @@ -60,7 +65,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { xmltojson xxhash yara-python - + starlette + tornado ]; # Project has no tests diff --git a/pkgs/by-name/bb/bbrew/package.nix b/pkgs/by-name/bb/bbrew/package.nix new file mode 100644 index 000000000000..6c0ed0daf9d2 --- /dev/null +++ b/pkgs/by-name/bb/bbrew/package.nix @@ -0,0 +1,45 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "bbrew"; + version = "2.3.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Valkyrie00"; + repo = "bold-brew"; + tag = "v${finalAttrs.version}"; + hash = "sha256-g74rBvBlw/rlLmZdJtIeIp0sba0Q6kFyhlHTwegOA+0="; + }; + + vendorHash = "sha256-5gFyfyerRKfq0uGkyIJ1W4XLhyRR5qPyhc/f2Y2skrI="; + + subPackages = [ "cmd/bbrew" ]; + + ldflags = [ + "-s" + "-w" + "-X bbrew/internal/services.AppVersion=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "TUI for managing Homebrew, Flatpak, and Mac App Store packages"; + homepage = "https://bold-brew.com"; + changelog = "https://github.com/Valkyrie00/bold-brew/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ tyceherrman ]; + platforms = lib.platforms.unix; + mainProgram = "bbrew"; + }; +}) diff --git a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix index ad9e4a9c5483..6310280b1dec 100644 --- a/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix +++ b/pkgs/by-name/bc/bcachefs-tools/kernel-module.nix @@ -4,6 +4,7 @@ bcachefs-tools: stdenv, kernelModuleMakeFlags, kernel, + rustPlatform, }: stdenv.mkDerivation { @@ -11,9 +12,15 @@ stdenv.mkDerivation { version = "${kernel.version}-${bcachefs-tools.version}"; __structuredAttrs = true; + strictDeps = true; src = bcachefs-tools.dkms; + postPatch = '' + substituteInPlace src/fs/bcachefs/Makefile \ + --replace-fail '$(objtree)/vmlinux' '${kernel.dev}/vmlinux' + ''; + nativeBuildInputs = kernel.moduleBuildDependencies; enableParallelBuilding = true; @@ -21,6 +28,7 @@ stdenv.mkDerivation { makeFlags = kernelModuleMakeFlags ++ [ "KDIR=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" "INSTALL_MOD_PATH=${placeholder "out"}" + "RUST_LIB_SRC=${rustPlatform.rustLibSrc}" ]; installPhase = '' @@ -44,6 +52,6 @@ stdenv.mkDerivation { platforms ; - broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.1"); + broken = !(lib.versionAtLeast kernel.version "6.16" && lib.versionOlder kernel.version "7.3"); }; } diff --git a/pkgs/by-name/bc/bcachefs-tools/package.nix b/pkgs/by-name/bc/bcachefs-tools/package.nix index 0687bcbf00c9..887fe38cecdf 100644 --- a/pkgs/by-name/bc/bcachefs-tools/package.nix +++ b/pkgs/by-name/bc/bcachefs-tools/package.nix @@ -19,6 +19,7 @@ cargo, rustc, rustPlatform, + rust-bindgen, makeWrapper, nix-update-script, versionCheckHook, @@ -30,18 +31,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "bcachefs-tools"; - version = "1.38.5"; + version = "1.38.8"; src = fetchFromGitHub { owner = "koverstreet"; repo = "bcachefs-tools"; tag = "v${finalAttrs.version}"; - hash = "sha256-EXd+BOTAFUddK/4Vwi7GqRqndi2x4bb5gs7IIkMX6HU="; + hash = "sha256-9sDE7ua3WMCfV9ZbwQdAbpatv2IhvcwHzzPr+/l2au0="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-6uwvwOVPYtegXTPwz2SEeQPC6OrKoFWZrH4Nx+ZVa5A="; + hash = "sha256-F1+FeAlYSqOxeWJI8vHShpXrOZqYXjNGvty/s6f6u8w="; }; postPatch = '' @@ -58,6 +59,7 @@ stdenv.mkDerivation (finalAttrs: { rustc rustPlatform.cargoSetupHook rustPlatform.bindgenHook + rust-bindgen makeWrapper installShellFiles ]; diff --git a/pkgs/by-name/bc/bcompare/package.nix b/pkgs/by-name/bc/bcompare/package.nix index 234f66ac031e..906a9d87def9 100644 --- a/pkgs/by-name/bc/bcompare/package.nix +++ b/pkgs/by-name/bc/bcompare/package.nix @@ -4,10 +4,13 @@ bzip2, fetchurl, glibc, + gobject-introspection, kdePackages, + python3, stdenv, runtimeShell, unzip, + wrapGAppsHook3, }: let @@ -22,63 +25,76 @@ let sha256 = "sha256-CCSRNGWIYVKAoQVVJ8McDUtc45nK0S4CdamcT5uVlQM="; }; - x86_64-darwin = fetchurl { + aarch64-darwin = fetchurl { url = "https://www.scootersoftware.com/files/BCompareOSX-${version}.zip"; sha256 = "sha256-R+G2Zlr074i2W4GaEDweK0c0q8tnzjs6M0N106WVAlg="; }; - - aarch64-darwin = srcs.x86_64-darwin; }; src = srcs.${stdenv.hostPlatform.system} or throwSystem; - linux = stdenv.mkDerivation { - inherit - pname - version - src - meta - ; - unpackPhase = '' - ar x $src - tar xfz data.tar.gz - ''; + linux = + let + python = python3.withPackages ( + pp: with pp; [ + pygobject3 + ] + ); + in + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; + unpackPhase = '' + ar x $src + tar xfz data.tar.gz + ''; - installPhase = '' - mkdir -p $out/{bin,lib,share} + installPhase = '' + mkdir -p $out/{bin,lib,share} - cp -R usr/{bin,lib,share} $out/ + cp -R usr/{bin,lib,share} $out/ - # Remove library that refuses to be autoPatchelf'ed - # - bcompare_ext_kde.amd64.so is linked with Qt4 - # - bcompare_ext_kde5.amd64.so is linked with Qt5 - rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so - rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so + # Remove library that refuses to be autoPatchelf'ed + # - bcompare_ext_kde.amd64.so is linked with Qt4 + # - bcompare_ext_kde5.amd64.so is linked with Qt5 + rm $out/lib/beyondcompare/ext/bcompare_ext_kde.amd64.so + rm $out/lib/beyondcompare/ext/bcompare_ext_kde5.amd64.so - substituteInPlace $out/bin/bcompare \ - --replace "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ - --replace "ldd" "${glibc.bin}/bin/ldd" \ - --replace "/bin/bash" "${runtimeShell}" - ''; + substituteInPlace $out/bin/bcompare \ + --replace-fail "/usr/lib/beyondcompare" "$out/lib/beyondcompare" \ + --replace-fail "ldd" "${glibc.bin}/bin/ldd" \ + --replace-fail "/bin/bash" "${runtimeShell}" - nativeBuildInputs = [ autoPatchelfHook ]; + substituteInPlace $out/lib/beyondcompare/bcmount.sh \ + --replace-fail "python3" "${python.interpreter}" + ''; - buildInputs = [ - (lib.getLib stdenv.cc.cc) - kdePackages.kio - kdePackages.kservice - kdePackages.ki18n - kdePackages.kcoreaddons - bzip2 - ]; + nativeBuildInputs = [ + autoPatchelfHook + gobject-introspection + wrapGAppsHook3 + ]; - dontBuild = true; - dontConfigure = true; - dontWrapQtApps = true; + buildInputs = [ + (lib.getLib stdenv.cc.cc) + kdePackages.kio + kdePackages.kservice + kdePackages.ki18n + kdePackages.kcoreaddons + bzip2 + ]; - __structuredAttrs = true; - strictDeps = true; - }; + dontBuild = true; + dontConfigure = true; + dontWrapQtApps = true; + + __structuredAttrs = true; + strictDeps = true; + }; darwin = stdenv.mkDerivation { inherit @@ -111,6 +127,7 @@ let maintainers = with lib.maintainers; [ ktor arkivm + barsikus007 ]; platforms = builtins.attrNames srcs; mainProgram = "bcompare"; diff --git a/pkgs/by-name/bd/bdep/package.nix b/pkgs/by-name/bd/bdep/package.nix index 5fd388204d1a..3c5509f76b7f 100644 --- a/pkgs/by-name/bd/bdep/package.nix +++ b/pkgs/by-name/bd/bdep/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bdep"; - version = "0.17.0"; + version = "0.18.0"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bdep-${finalAttrs.version}.tar.gz"; - hash = "sha256-+2Hl5kanxWJmOpfePAvvSBSmG3kZLQv/kYIkT4J+kaQ="; + hash = "sha256-7pfGiIelaHQydpZqd6KiF7gwCqC9oJspig87BrKz6QU="; }; strictDeps = true; diff --git a/pkgs/by-name/be/beadwork/package.nix b/pkgs/by-name/be/beadwork/package.nix index aee9068b0f38..31e78142d75d 100644 --- a/pkgs/by-name/be/beadwork/package.nix +++ b/pkgs/by-name/be/beadwork/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "beadwork"; - version = "0.13.1"; + version = "0.13.2"; src = fetchFromGitHub { owner = "jallum"; repo = "beadwork"; rev = "v${finalAttrs.version}"; - hash = "sha256-NlmnoFz4gYIB3g3C/7rmgKhUkh8q/Vn1drhHIuUScTg="; + hash = "sha256-OVwr/AUIx6k5QF2rZf25BWD+3UHYqN8tziJTa8tgDYU="; }; vendorHash = "sha256-LjqZSI7F3C8GyNrPK/BwG9QTmNg89hFAvhUuBjmbHTU="; diff --git a/pkgs/by-name/be/beancount-language-server/package.nix b/pkgs/by-name/be/beancount-language-server/package.nix index 882f15ea9ebb..2f34771dceb8 100644 --- a/pkgs/by-name/be/beancount-language-server/package.nix +++ b/pkgs/by-name/be/beancount-language-server/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Language Server Protocol (LSP) for beancount files"; mainProgram = "beancount-language-server"; homepage = "https://github.com/polarmutex/beancount-language-server"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ polarmutex ]; }; }) diff --git a/pkgs/by-name/be/bee/package.nix b/pkgs/by-name/be/bee/package.nix index d1e380341837..4a59f8d2bf50 100644 --- a/pkgs/by-name/be/bee/package.nix +++ b/pkgs/by-name/be/bee/package.nix @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { Bee is a Swarm node implementation, written in Go. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/be/beekeeper-studio/package.nix b/pkgs/by-name/be/beekeeper-studio/package.nix index c5da0de573aa..d905565eec37 100644 --- a/pkgs/by-name/be/beekeeper-studio/package.nix +++ b/pkgs/by-name/be/beekeeper-studio/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { asset = selectSystem { x86_64-linux = "beekeeper-studio_${finalAttrs.version}_amd64.deb"; aarch64-linux = "beekeeper-studio_${finalAttrs.version}_arm64.deb"; - x86_64-darwin = "Beekeeper-Studio-${finalAttrs.version}-mac.zip"; aarch64-darwin = "Beekeeper-Studio-${finalAttrs.version}-arm64-mac.zip"; }; in @@ -56,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { hash = selectSystem { x86_64-linux = "sha256-e5y7uBzdbDSUQKpxRjho+2kU3wx23spdSv1PwmJ30gA="; aarch64-linux = "sha256-iuZDeSYljiSRUqtLIA1BcrRaYoqg9dnlbRDLsetVkMQ="; - x86_64-darwin = "sha256-7iW40NPAU4C+gDZb7YmGFmTOnmg5V/yb9+6EW6MlyXU="; aarch64-darwin = "sha256-Jnm4Vfm9+6dXmjnI5gYpYW1g7Anl9xhIKXbQA2SGUDE="; }; }; @@ -158,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/be/beeper-bridge-manager/package.nix b/pkgs/by-name/be/beeper-bridge-manager/package.nix index b32d50706438..0590b8b3db19 100644 --- a/pkgs/by-name/be/beeper-bridge-manager/package.nix +++ b/pkgs/by-name/be/beeper-bridge-manager/package.nix @@ -8,20 +8,20 @@ buildGoModule (finalAttrs: { pname = "bbctl"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "beeper"; repo = "bridge-manager"; tag = "v${finalAttrs.version}"; - hash = "sha256-bNnansZNshWp70LQQsa6+bS+LJxpCzdTkL2pX+ksrP0="; + hash = "sha256-sajgG0Ep6CDlAQRNzgRFHDMX3N1PyCZr6DI+3EkZxzg="; }; nativeBuildInputs = [ makeWrapper ]; - vendorHash = "sha256-yTNUxwnulQ+WbHdQbeNDghH4RPXurQMIgKDyXfrMxG8="; + vendorHash = "sha256-U3RwcMAeLVob4K5YAM5w4rqNA2hSX1uIXwFmpYKxzIU="; postInstall = '' wrapProgram $out/bin/bbctl \ diff --git a/pkgs/by-name/be/beeper/package.nix b/pkgs/by-name/be/beeper/package.nix index 099714c8de11..34d47709b99e 100644 --- a/pkgs/by-name/be/beeper/package.nix +++ b/pkgs/by-name/be/beeper/package.nix @@ -1,5 +1,7 @@ { lib, + stdenv, + runCommand, fetchurl, appimageTools, makeWrapper, @@ -10,13 +12,34 @@ }: let pname = "beeper"; - version = "4.2.892"; - src = fetchurl { - url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; - hash = "sha256-kTX0VrfJb7UnQ6JVfRIgjLlIsDgzDVgTnx7twlYMf9k="; + version = "4.2.985"; + + inherit (stdenv.hostPlatform) system; + + sources = { + x86_64-linux = fetchurl { + url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-x86_64.AppImage"; + hash = "sha256-oWJdpZL+Q8/jaI/WJfgXUisPASuvHkxU6rOeJkedHSM="; + }; + aarch64-linux = fetchurl { + url = "https://beeper-desktop.download.beeper.com/builds/Beeper-${version}-arm64.AppImage"; + hash = "sha256-rY302fiRG2c6dwZ+a8e43DjDUklfR0j78XTixhPkvwY="; + }; }; + + src = sources.${system} or (throw "beeper is not supported on ${system}"); + + # Beeper 4.2.985+ ships AppImages without the type-2 magic bytes + # (ASCII "AI" + 0x02 at ELF offset 8) that appimageTools.extract requires. + linuxSrc = runCommand "Beeper-${version}-appimage" { inherit src; } '' + cp $src $out + chmod +w $out + printf 'AI\x02' | dd of=$out bs=1 seek=8 conv=notrunc status=none + ''; + appimageContents = appimageTools.extract { - inherit pname version src; + inherit pname version; + src = linuxSrc; postExtract = '' appRoot="$out/resources/app" @@ -35,7 +58,6 @@ let # hide version status element on about page otherwise an error message is shown sed -i '$ a\.subview-prefs-about > div:nth-child(2) {display: none;}' $appRoot/build-browser/*.css - ''; }; in @@ -59,6 +81,7 @@ appimageTools.wrapAppImage { ''; passthru = { + inherit sources; updateScript = lib.getExe (writeShellApplication { name = "update-beeper"; runtimeInputs = [ @@ -69,12 +92,11 @@ appimageTools.wrapAppImage { set -o errexit latestLinux="$(curl --silent --output /dev/null --write-out "%{redirect_url}\n" https://api.beeper.com/desktop/download/linux/x64/stable/com.automattic.beeper.desktop)" version="$(echo "$latestLinux" | grep --only-matching --extended-regexp '[0-9]+\.[0-9]+\.[0-9]+')" - update-source-version beeper "$version" + for platform in ${lib.escapeShellArgs (lib.attrNames sources)}; do + update-source-version beeper "$version" --ignore-same-version --source-key="passthru.sources.$platform" + done ''; }); - - # needed for nix-update - inherit src; }; meta = { @@ -89,7 +111,10 @@ appimageTools.wrapAppImage { maintainers = with lib.maintainers; [ jshcmpbll zh4ngx + aspauldingcode ]; - platforms = [ "x86_64-linux" ]; + platforms = lib.attrNames sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "beeper"; }; } diff --git a/pkgs/by-name/be/bees/package.nix b/pkgs/by-name/be/bees/package.nix index a3bf6614a5fb..c29b5c0545fa 100644 --- a/pkgs/by-name/be/bees/package.nix +++ b/pkgs/by-name/be/bees/package.nix @@ -79,6 +79,6 @@ stdenv.mkDerivation (finalAttrs: { longDescription = "Best-Effort Extent-Same: bees finds not just identical files, but also identical extents within files that differ"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ chaduffy ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/be/beidconnect/package.nix b/pkgs/by-name/be/beidconnect/package.nix index 00550fd21155..cd6cda7aa18f 100644 --- a/pkgs/by-name/be/beidconnect/package.nix +++ b/pkgs/by-name/be/beidconnect/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "beidconnect"; - version = "2.11"; + version = "2.12"; src = fetchFromGitHub { owner = "Fedict"; repo = "fts-beidconnect"; rev = finalAttrs.version; - hash = "sha256-4eKO2yw2Ipfu1PvebgOR+BihsLlnWIJejGWqjztPA2I="; + hash = "sha256-ZFxq/rJP0/KSsi2qsXyKY9Fmb+JxeakTdso5FsVu1/c="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/be/bellepoule/package.nix b/pkgs/by-name/be/bellepoule/package.nix index 5b8384bce711..4e11246f990f 100644 --- a/pkgs/by-name/be/bellepoule/package.nix +++ b/pkgs/by-name/be/bellepoule/package.nix @@ -2,9 +2,9 @@ lib, stdenv, fetchgit, - goocanvas_1, + goocanvas_2, pkg-config, - gtk2, + gtk3, libxml2, curl, libmicrohttpd, @@ -19,13 +19,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "bellepoule"; - version = "5.5"; + version = "5.7"; src = (fetchgit { url = "https://git.launchpad.net/bellepoule"; - rev = finalAttrs.version; - hash = "sha256-SNL6yaaKk/GU8+EvHki4ysMuCHEQxFjPd3iwVIdJtCs="; + # No tag available on launchpad for this version + rev = "06516d698fde9662d95cf6a8758eb1fbcc89e983"; + hash = "sha256-9bbFzi9JPryJK2zv4O1TUDaeoB9GVV7LRNn6Xl8lajg="; }).overrideAttrs (oldAttrs: { env = oldAttrs.env or { } // { @@ -38,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - gtk2 + gtk3 libxml2 curl libmicrohttpd - goocanvas_1 + goocanvas_2 qrencode openssl json-glib @@ -58,17 +59,27 @@ stdenv.mkDerivation (finalAttrs: { "DESTDIR=$(out)" ]; - # Use system php - # Disable git soft depend - # Disable dch changelog generation - # FixUp `install` phase output postPatch = '' + # Use system php substituteInPlace ./sources/common/network/web_server.cpp --replace-fail "php7.4" "${php}/bin/php" + + # FixUp desktop templates to point to our own output substituteInPlace ./build/BellePoule/debian/bellepoule.desktop.template --replace-fail "/usr" "$out" + + # FixUp erroneous properties in glade files tripping-up GTK2 -> GTK3 upgrade (identation is intentional here) + # Such as https://git.launchpad.net/bellepoule/tree/resources/glade/contest.glade?h=5.0/master#n197 + substituteInPlace ./resources/glade/*.glade --replace " True" "" + + # Disable git soft depend + # Disable dch changelog generation + # FixUp output path + # Upgrade GTK2 -> GTK3, goocanvas1 -> goocanvas2 substituteInPlace ./build/BellePoule/Makefile \ --replace-fail "git" "#git" \ --replace-fail "dch" "echo Ignoring: dch" \ - --replace-fail "/usr" "" + --replace-fail "/usr" "" \ + --replace-fail "gtk+-2.0" "gtk+-3.0" \ + --replace-fail "GOO = goocanvas" "GOO = goocanvas-2.0" ''; # Prepare release directory for buildPhase diff --git a/pkgs/by-name/be/bencher-cli/package.nix b/pkgs/by-name/be/bencher-cli/package.nix new file mode 100644 index 000000000000..9286c19960cd --- /dev/null +++ b/pkgs/by-name/be/bencher-cli/package.nix @@ -0,0 +1,80 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + mold, + nix-update-script, + versionCheckHook, + rustc, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bencher-cli"; + version = "0.6.10"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "bencherdev"; + repo = "bencher"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0RP1Q5tsN+2PMT+EfdgkDrOAqPZiHiKXR83VyjojyNU="; + }; + + cargoHash = "sha256-Hk6bnEoAXUDXts1tj6QgYvr7GVw3d6FleeLN4MWBRgw="; + + nativeBuildInputs = [ mold ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + cargoBuildFlags = [ "--package=bencher_cli" ]; + cargoTestFlags = [ "--package=bencher_cli" ]; + # Build the open-source version + buildNoDefaultFeatures = true; + checkNoDefaultFeatures = finalAttrs.buildNoDefaultFeatures; + + postPatch = lib.optionalString finalAttrs.buildNoDefaultFeatures '' + # Replaces the proprietary Rust files with empty files + # This is just a safeguard, the build shouldn't touch these files anyways + echo "find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} +" + find . -path '*/plus/*' -type f ! -name Cargo.toml -exec truncate -s 0 {} + + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command-Line interface for the Bencher continuous benchmarking platform"; + mainProgram = "bencher"; + longDescription = '' + Bencher is a suite of continuous benchmarking tools. + Bencher allows you to detect and prevent performance regressions + *before* they hit production. + + - Run: Run your benchmarks locally or in CI using your favorite + benchmarking tools. The bencher CLI simply wraps your existing + benchmark harness and stores its results. + - Track: Track the results of your benchmarks over time. Monitor, query, + and graph the results using the Bencher web console based on the source + branch, testbed, benchmark, and measure. + - Catch: Catch performance regressions in CI. Bencher uses state of the + art, customizable analytics to detect performance regressions before + they make it to production. + + Bencher's source repo includes non-free features, included in the build + as the Cargo feature "plus". + Files in the plus directories are proprietary, while the other files + are dual Apache-2.0/MIT licensed. + The Nix derivation does not compile the proprietary features. + ''; + homepage = "https://bencher.dev"; + license = + if finalAttrs.buildNoDefaultFeatures then + lib.licenses.OR [ + lib.licenses.asl20 + lib.licenses.mit + ] + else + lib.licenses.unfree; + platforms = rustc.meta.platforms; + maintainers = [ lib.maintainers.skyesoss ]; + }; +}) diff --git a/pkgs/by-name/be/bento/package.nix b/pkgs/by-name/be/bento/package.nix index 40edff2db2fa..430416e810ea 100644 --- a/pkgs/by-name/be/bento/package.nix +++ b/pkgs/by-name/be/bento/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "bento"; - version = "1.18.0"; + version = "1.18.1"; src = fetchFromGitHub { owner = "warpstreamlabs"; repo = "bento"; tag = "v${finalAttrs.version}"; - hash = "sha256-fCRy9iTK34nqEWnsl1amdxYaCgaVmvqaPDS6Z7MuFbk="; + hash = "sha256-KIlCHOAHShOwrxO9F414PQ07+SzCWhpo8auhyjkuNZA="; }; proxyVendor = true; - vendorHash = "sha256-jJI2MGKqGkZjuyRcwUupajBq9Vf5a/Cf5V6A/pT4XDs="; + vendorHash = "sha256-uzB98AiJKw9TCbKSdQDiztfw7nIT0mVt80JALAPp2Aw="; subPackages = [ "cmd/bento" diff --git a/pkgs/by-name/be/bentopdf/package.nix b/pkgs/by-name/be/bentopdf/package.nix index 9032644598ab..5054b1076431 100644 --- a/pkgs/by-name/be/bentopdf/package.nix +++ b/pkgs/by-name/be/bentopdf/package.nix @@ -2,23 +2,22 @@ lib, buildNpmPackage, fetchFromGitHub, + nix-update-script, nixosTests, simpleMode ? true, }: buildNpmPackage (finalAttrs: { pname = "bentopdf"; - # We intentionally don't update the version, due to: - # https://github.com/NixOS/nixpkgs/issues/484067 - # nixpkgs-update: no auto update - version = "1.11.2"; + version = "2.8.6"; src = fetchFromGitHub { owner = "alam00000"; repo = "bentopdf"; tag = "v${finalAttrs.version}"; - hash = "sha256-br4My0Q4zoA+ZIrXM4o4oQjZ7IpSdwg+iKiAUdc2B/s="; + hash = "sha256-rbThEonDXFGcudgdMtDrQHq84Wh4IvOZZBn4kXvrhoI="; }; - npmDepsHash = "sha256-UNNNYO7e7qdumI0/ka2ieFZzKURPl1V3981vHCPcVfY="; + npmDepsHash = "sha256-RT6ifx24mNfNS8oO93vyW+zbKQGCx21RqBQrAXK8dAY="; + npmDepsFetcherVersion = 2; npmBuildFlags = [ "--" @@ -37,8 +36,11 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; - passthru.tests = { - inherit (nixosTests.bentopdf) caddy nginx; + passthru = { + tests = { + inherit (nixosTests.bentopdf) caddy nginx; + }; + updateScript = nix-update-script { }; }; meta = { diff --git a/pkgs/by-name/be/bespokesynth/package.nix b/pkgs/by-name/be/bespokesynth/package.nix index 36ed0ff97e27..4c2181fe9523 100644 --- a/pkgs/by-name/be/bespokesynth/package.nix +++ b/pkgs/by-name/be/bespokesynth/package.nix @@ -163,7 +163,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software modular synth with controllers support, scripting and VST"; homepage = "https://www.bespokesynth.com/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ astro tobiasBora diff --git a/pkgs/by-name/be/betteralign/package.nix b/pkgs/by-name/be/betteralign/package.nix index b4b16a895d63..c7efd14543a8 100644 --- a/pkgs/by-name/be/betteralign/package.nix +++ b/pkgs/by-name/be/betteralign/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "betteralign"; - version = "0.11.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "dkorunic"; repo = "betteralign"; tag = "v${finalAttrs.version}"; - hash = "sha256-deKu4ZTaLhmqbNZRD/fyhNN8dDikQTS+PHSHhmSNUJQ="; + hash = "sha256-H6KjYk90GhBzLcv2gN5gfv8Y4MY2VH3EFCq8Zf7xHI0="; # Trick for getting accurate commit, source date and timestamp for ldflags # Required by upstream https://github.com/dkorunic/betteralign/blob/346baa9c9dd024bfe55302c9d7d0ca46b2734c1c/.goreleaser.yml @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-JIInHtRrdCA0sevYpjVbljvEhTZLbC+Le3NEj9ULICg="; + vendorHash = "sha256-K2n418V0LBM3Q9UcWS59v915RgiCnhQ5pNRy9P9OBTg="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/be/bettercap/package.nix b/pkgs/by-name/be/bettercap/package.nix index 2cbeff80b3a8..394cf90956a9 100644 --- a/pkgs/by-name/be/bettercap/package.nix +++ b/pkgs/by-name/be/bettercap/package.nix @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { in realtime, sniff for credentials and much more. ''; homepage = "https://www.bettercap.org/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "bettercap"; # Broken on darwin for Go toolchain > 1.22, with error: # 'link: golang.org/x/net/internal/socket: invalid reference to syscall.recvmsg' diff --git a/pkgs/by-name/be/betterdisplay/package.nix b/pkgs/by-name/be/betterdisplay/package.nix index de3ea22f032d..38f5ca39b283 100644 --- a/pkgs/by-name/be/betterdisplay/package.nix +++ b/pkgs/by-name/be/betterdisplay/package.nix @@ -50,7 +50,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Unlock your displays on your Mac! Flexible HiDPI scaling, XDR/HDR extra brightness, virtual screens, DDC control, extra dimming, PIP/streaming, EDID override and lots more"; homepage = "https://betterdisplay.pro/"; changelog = "https://github.com/waydabber/BetterDisplay/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/be/betterleaks/package.nix b/pkgs/by-name/be/betterleaks/package.nix index 77fc4f3db840..f6c4d9b3b4d2 100644 --- a/pkgs/by-name/be/betterleaks/package.nix +++ b/pkgs/by-name/be/betterleaks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "betterleaks"; - version = "1.4.1"; + version = "1.6.1"; src = fetchFromGitHub { owner = "betterleaks"; repo = "betterleaks"; tag = "v${finalAttrs.version}"; - hash = "sha256-Eq0U4KiL91NW2lxizQ0tZuXxkNnTuSb/pvNSY/+3DZQ="; + hash = "sha256-2VjvTS2qOUH8W+hFm4xA3xCGZZs+oP1KQOSq6FBLjaw="; }; - vendorHash = "sha256-zlZNay6srObMfm4iweCezsr/EImCN9rl03DH8qJU/rc="; + vendorHash = "sha256-UBzobzZeIYzP+mU3+9GRF4lAs+cpqkIt+3mBpTN1BN8="; ldflags = [ "-s" diff --git a/pkgs/by-name/bf/bfetch/package.nix b/pkgs/by-name/bf/bfetch/package.nix index 27e52cdf554a..c8e8ee8c873e 100644 --- a/pkgs/by-name/bf/bfetch/package.nix +++ b/pkgs/by-name/bf/bfetch/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation { pname = "bfetch"; - version = "unstable-2021-05-21"; + version = "1.0.1-unstable-2021-05-21"; src = fetchFromGitHub { owner = "NNBnh"; diff --git a/pkgs/by-name/bi/bibata-cursors-translucent/package.nix b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix index 97798aeeaea9..ed1f4b8457a3 100644 --- a/pkgs/by-name/bi/bibata-cursors-translucent/package.nix +++ b/pkgs/by-name/bi/bibata-cursors-translucent/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec { version = "1.1.2"; src = fetchFromGitHub { - owner = "Silicasandwhich"; + owner = "silica-dev"; repo = "Bibata_Cursor_Translucent"; rev = "v${version}"; sha256 = "sha256-RroynJfdFpu+Wl9iw9NrAc9wNZsSxWI+heJXUTwEe7s="; @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Translucent Varient of the Material Based Cursor"; - homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; + homepage = "https://github.com/silica-dev/Bibata_Cursor_Translucent"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/bi/bic/package.nix b/pkgs/by-name/bi/bic/package.nix index 2279faf537e1..130894cd6d09 100644 --- a/pkgs/by-name/bi/bic/package.nix +++ b/pkgs/by-name/bi/bic/package.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation { bic This a project that allows developers to explore and test C-APIs using a read eval print loop, also known as a REPL. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://github.com/hexagonal-sun/bic"; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/bi/bichon/package.nix b/pkgs/by-name/bi/bichon/package.nix new file mode 100644 index 000000000000..48ac631c8013 --- /dev/null +++ b/pkgs/by-name/bi/bichon/package.nix @@ -0,0 +1,78 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + fetchPnpmDeps, + pnpm, + pnpmConfigHook, + nodejs, + openssl, + pkg-config, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "bichon"; + version = "1.6.2"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "rustmailer"; + repo = "bichon"; + tag = finalAttrs.version; + hash = "sha256-a8BAO93eI2eiFwmvMqUsgL1KZ11X3qg/r/Iw6ckMSTs="; + }; + + cargoHash = "sha256-GC/2bswme76bAFRCsBHFi3lWnYx5x5H58emCmkiyKfE="; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + sourceRoot = "${finalAttrs.src.name}/web"; + fetcherVersion = 4; + hash = "sha256-Ax8z1sjt8v6XOenhw7eRuEEo0huPv9fbcfzqc8RxJEc="; + }; + pnpmRoot = "web"; + + nativeBuildInputs = [ + nodejs + pnpmConfigHook + pnpm + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + env.GIT_HASH = finalAttrs.src.rev; + + preBuild = '' + # Build web frontend before rust build + pushd web + pnpm run build + popd + + # Just sets the GIT_HASH variable for builds, we set it above so we don't need git + rm crates/server/build.rs + ''; + + # The tests are flaky and some require the network + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + # `bichon-server` doesn't have a `--version` option but `bichon-cli` does. + versionCheckProgram = "${placeholder "out"}/bin/bichon-cli"; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/rustmailer/bichon/releases/tag/${finalAttrs.version}"; + description = "Lightweight, high-performance Rust email archiver with WebUI"; + homepage = "https://github.com/rustmailer/bichon"; + license = with lib.licenses; [ agpl3Only ]; + maintainers = with lib.maintainers; [ pyrox0 ]; + mainProgram = "bichon-server"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/bi/bilibili-tui/package.nix b/pkgs/by-name/bi/bilibili-tui/package.nix index c582a809336d..258f6f9a9549 100644 --- a/pkgs/by-name/bi/bilibili-tui/package.nix +++ b/pkgs/by-name/bi/bilibili-tui/package.nix @@ -5,8 +5,9 @@ nix-update-script, stdenv, pkg-config, - makeWrapper, + makeBinaryWrapper, openssl, + cacert, mpv-unwrapped, yt-dlp-light, @@ -14,23 +15,28 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "bilibili-tui"; - version = "1.0.9"; + version = "1.0.12"; src = fetchFromGitHub { owner = "MareDevi"; repo = "bilibili-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-LACNDpVhlYEgT3fN+Ff2MVipblUqPlqwOUpTLaXSCbk="; + hash = "sha256-G2aoPw8SMu3ytHbxcQrf1iH6i+b9viM+/EYorv6j5bg="; }; - cargoHash = "sha256-q3jRjmzQA64sZjVShoEmu1x2CFOAgBGgZYyTq7Lg4is="; + cargoHash = "sha256-ojAN98of7vZp/F1n0a/88e6k4nBPG9HPKyTO1xc8o4Q="; - nativeBuildInputs = [ makeWrapper ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ pkg-config ]; + nativeBuildInputs = [ + makeBinaryWrapper + ] + ++ lib.optional (!stdenv.hostPlatform.isDarwin) pkg-config; - buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ openssl ]; + buildInputs = lib.optional (!stdenv.hostPlatform.isDarwin) openssl; env.OPENSSL_NO_VENDOR = true; + nativeCheckInputs = [ cacert ]; + # Wrap mpv as fallback; users should prefer their system's mpv in PATH postInstall = lib.optionalString withMpv '' wrapProgram $out/bin/bilibili-tui \ diff --git a/pkgs/by-name/bi/bilibili/sources.nix b/pkgs/by-name/bi/bilibili/sources.nix index 2a869721785f..83d75eb7368e 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.6-2"; - arm64-hash = "sha256-uJjVcwkbYiTdV9Ki/ur1/xZuKUCUFefRXIPSRlgRaoA="; - x86_64-hash = "sha256-vAKAYCbwS92Nqk0W+dN/GeYOcori4MY5e16mMDLfXPk="; + version = "1.17.9-1"; + arm64-hash = "sha256-xTRGaplSpW+ax7/hJHxGq/8W3vbJF0uYbXsW1Dl04Bk="; + x86_64-hash = "sha256-ek7XkwWBr6dx7lV9xy/+Sl4INEbSu5g/WaPEHU4FGH4="; } diff --git a/pkgs/by-name/bi/bind/package.nix b/pkgs/by-name/bi/bind/package.nix index 2f12ebf30ea0..1da6cba11479 100644 --- a/pkgs/by-name/bi/bind/package.nix +++ b/pkgs/by-name/bi/bind/package.nix @@ -9,6 +9,7 @@ libidn2, libtool, libxml2, + json_c, openssl, liburcu, libuv, @@ -29,11 +30,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "bind"; - version = "9.20.23"; + version = "9.20.24"; src = fetchurl { url = "https://downloads.isc.org/isc/bind9/${finalAttrs.version}/bind-${finalAttrs.version}.tar.xz"; - hash = "sha256-XUR1rtP55QDvVUsrFNlyvbg9M94hSps76SkY6kaQg3E="; + hash = "sha256-mJ/vH8iOpZ0EzYb4VNylpGFqIKmWi83ePBo2aKs2vgg="; }; outputs = [ @@ -59,6 +60,7 @@ stdenv.mkDerivation (finalAttrs: { libidn2 libtool libxml2 + json_c openssl liburcu libuv diff --git a/pkgs/by-name/bi/biome/package.nix b/pkgs/by-name/bi/biome/package.nix index b04b388ca36e..0a577ee4ef5e 100644 --- a/pkgs/by-name/bi/biome/package.nix +++ b/pkgs/by-name/bi/biome/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "biome"; - version = "2.4.16"; + version = "2.5.4"; src = fetchFromGitHub { owner = "biomejs"; repo = "biome"; rev = "@biomejs/biome@${finalAttrs.version}"; - hash = "sha256-YfPaSSNESFdGjJjB3C3rubydZW/U7NQ/HtTlXtH7VB4="; + hash = "sha256-x8oMtugVmN8Z7obBsiZxLZ5Ikj/oGPXEgg/8M8dsRvc="; }; - cargoHash = "sha256-N5rKXNrLs/J4uDHYVDMl+jSRowB8ipjvJdIHNvJvAUU="; + cargoHash = "sha256-yV+lvPLPGtWCtbA39NVH1T1Sl1qn1MTsQIVRo3c9+Dg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/bi/bird-lg/package.nix b/pkgs/by-name/bi/bird-lg/package.nix index 5e3b73e76218..a2b08f8e8b4b 100644 --- a/pkgs/by-name/bi/bird-lg/package.nix +++ b/pkgs/by-name/bi/bird-lg/package.nix @@ -10,13 +10,13 @@ let { modRoot, vendorHash }: buildGoModule rec { pname = "bird-lg-${modRoot}"; - version = "1.4.5"; + version = "1.4.7"; src = fetchFromGitHub { owner = "xddxdd"; repo = "bird-lg-go"; rev = "v${version}"; - hash = "sha256-xKDpaGnMv8e2OKV3547d7Jsq3VFNwayhCL2dGKVYSZM="; + hash = "sha256-Ca+wMiIMcknqhn+p8Cb00ibvsrsFXyFxvGhqOWrzZcA="; }; doDist = false; @@ -42,12 +42,12 @@ let bird-lg-frontend = generic { modRoot = "frontend"; - vendorHash = "sha256-tqpDH7KfpwPuOvIfx3vVclMGOMNFroiBcNb1lN0PtQc="; + vendorHash = "sha256-SmpCCvOP9HQh+Niqa3EhRGj1a7EXQgwRW2hTJgv+oIw="; }; bird-lg-proxy = generic { modRoot = "proxy"; - vendorHash = "sha256-9BpsRIIidBEm+ivwFIo00H9MTH4R3kkze/W/HaH8124="; + vendorHash = "sha256-LRj5OvCu0e0iNW8nEUmbnKhhvaUXOVNIYGv0Lmai28g="; }; in symlinkJoin { diff --git a/pkgs/by-name/bi/biscuit-cli/package.nix b/pkgs/by-name/bi/biscuit-cli/package.nix index e3d4d3e5bba4..f348b027fff4 100644 --- a/pkgs/by-name/bi/biscuit-cli/package.nix +++ b/pkgs/by-name/bi/biscuit-cli/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.6.0"; src = fetchFromGitHub { - owner = "biscuit-auth"; + owner = "eclipse-biscuit"; repo = "biscuit-cli"; tag = finalAttrs.version; sha256 = "sha256-s4Y4MhM79Z+4VxB03+56OqRQJaSHj2VQEJcL6CsT+2k="; diff --git a/pkgs/by-name/bi/bisq1/package.nix b/pkgs/by-name/bi/bisq1/package.nix new file mode 100644 index 000000000000..e5ca6ad35ec8 --- /dev/null +++ b/pkgs/by-name/bi/bisq1/package.nix @@ -0,0 +1,263 @@ +{ + stdenv, + lib, + makeBinaryWrapper, + fetchurl, + writeShellScript, + makeDesktopItem, + copyDesktopItems, + imagemagick, + zulu21, + dpkg, + zip, + xz, + gnupg, + coreutils, + tor, + + # Native libraries required by the JavaFX natives that Bisq extracts from its bundled + # javafx-graphics jar into ~/.openjfx/cache at runtime. Those .so files are + # bare (no rpath), so every direct needed library must be on LD_LIBRARY_PATH. + # The set below is exactly the verified closure (readelf NEEDED + ldd not_found=0). + gtk3, + glib, + cairo, + pango, + atk, + gdk-pixbuf, + harfbuzz, + freetype, + fontconfig, + libGL, + libglvnd, + libx11, + libxtst, + libxxf86vm, +}: + +let + # This is separated into its own file so it's easier for `update.sh`. + sources = import ./sources.nix; + + version = sources.version; + + # JDK 21 is the toolchain required by docs/build.md. enableJavaFX is not + # strictly required (Bisq bundles its own JavaFX jars), but mirrors the + # sibling bisq2 package and gives a JDK that can host JavaFX. + jdk = zulu21.override { + enableJavaFX = true; + }; + + # JVM arguments sourced from bisq/desktop/build.gradle, applicationDefaultJvmArgs + bisqJvmArgs = lib.concatStringsSep " " [ + "-XX:MaxRAM=8g" + "-Xss1280k" + "-XX:+UseG1GC" + "-XX:MaxHeapFreeRatio=10" + "-XX:MinHeapFreeRatio=5" + "-XX:+UseStringDeduplication" + "-Djava.net.preferIPv4Stack=true" + "--add-opens=javafx.controls/javafx.scene.control.skin=ALL-UNNAMED" + ]; + + # JVM arguments added for nixpkgs, not present in the bisq source tree. + nixpkgsJvmArgs = lib.concatStringsSep " " [ + # solving this error at application startup: + # > class com.jfoenix.skins.JFXSpinnerSkin (in unnamed module @0x77ec78b9) cannot access class com.sun.javafx.scene.NodeHelper (in module javafx.graphics) because module javafx.graphics does not export com.sun.javafx.scene to unnamed module @0x77ec78b9 + "--add-exports=javafx.graphics/com.sun.javafx.scene=ALL-UNNAMED" + + # solving this error at application startup: + # > class com.jfoenix.skins.JFXTabPaneSkin$TabHeaderContainer (in unnamed module @0x77ec78b9) cannot access class com.sun.javafx.scene.control.LambdaMultiplePropertyChangeListenerHandler (in module javafx.controls) because module javafx.controls does not export com.sun.javafx.scene.control to unnamed module @0x77ec78b9 + "--add-exports=javafx.controls/com.sun.javafx.scene.control=ALL-UNNAMED" + + # solving this error at application startup: + # > class com.jfoenix.skins.JFXTabPaneSkin (in unnamed module @0x77ec78b9) cannot access class com.sun.javafx.scene.control.behavior.TabPaneBehavior (in module javafx.controls) because module javafx.controls does not export com.sun.javafx.scene.control.behavior to unnamed module @0x77ec78b9 + "--add-exports=javafx.controls/com.sun.javafx.scene.control.behavior=ALL-UNNAMED" + ]; + + bisq-launcher = + args: + writeShellScript "bisq-launcher" '' + exec "${lib.getExe jdk}" \ + ${bisqJvmArgs} \ + ${nixpkgsJvmArgs} \ + -classpath @out@/lib/app/desktop.jar:@out@/lib/app/* \ + ${args} bisq.desktop.app.BisqAppMain "$@" + ''; + + # keys taken from bisq/docs/release-process.md + publicKey = { + "E222AA02" = fetchurl { + url = "https://github.com/bisq-network/bisq/releases/download/v${version}/E222AA02.asc"; + hash = sources."key-E222AA02-hash"; + }; + + "4A133008" = fetchurl { + url = "https://github.com/bisq-network/bisq/releases/download/v${version}/4A133008.asc"; + hash = sources."key-4A133008-hash"; + }; + + "387C8307" = fetchurl { + url = "https://github.com/bisq-network/bisq/releases/download/v${version}/387C8307.asc"; + hash = sources."key-387C8307-hash"; + }; + }; + + binPath = lib.makeBinPath [ + coreutils + tor + ]; + + libraryPath = lib.makeLibraryPath [ + gtk3 + glib + cairo + pango + atk + gdk-pixbuf + harfbuzz + freetype + fontconfig + libGL + libglvnd + libx11 + libxtst + libxxf86vm + stdenv.cc.cc + ]; +in +stdenv.mkDerivation (finalAttrs: { + inherit version; + + pname = "bisq1"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb"; + hash = sources."deb-hash"; + + # Verify the upstream Debian package's detached PGP signature prior to use. + # This ensures that a successful build of this Nix package requires the + # signed Debian package to pass verification, preserving Bisq's trust model. + nativeBuildInputs = [ gnupg ]; + downloadToTemp = true; + + postFetch = '' + pushd $(mktemp -d) + export GNUPGHOME=./gnupg + mkdir -m 700 -p $GNUPGHOME + ln -s $downloadedFile ./Bisq-64bit-${version}.deb + ln -s ${finalAttrs.signature} ./signature.asc + gpg --import ${publicKey."E222AA02"} + gpg --import ${publicKey."4A133008"} + gpg --import ${publicKey."387C8307"} + gpg --batch --verify signature.asc Bisq-64bit-${version}.deb + popd + mv $downloadedFile $out + ''; + }; + + signature = fetchurl { + url = "https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb.asc"; + hash = sources."sig-hash"; + }; + + nativeBuildInputs = [ + copyDesktopItems + dpkg + imagemagick + makeBinaryWrapper + zip + xz + gnupg + ]; + + desktopItems = [ + (makeDesktopItem { + name = "bisq"; + exec = "bisq"; + icon = "bisq"; + desktopName = "Bisq"; + genericName = "Decentralized bitcoin exchange"; + categories = [ + "Network" + "P2P" + ]; + }) + + (makeDesktopItem { + name = "bisq-hidpi"; + exec = "bisq-hidpi"; + icon = "bisq"; + desktopName = "Bisq (HiDPI)"; + genericName = "Decentralized bitcoin exchange"; + categories = [ + "Network" + "P2P" + ]; + }) + ]; + + unpackPhase = '' + runHook preUnpack + dpkg -x $src . + runHook postUnpack + ''; + + buildPhase = '' + runHook preBuild + + # Replace the Tor binary bundled in tor-binary-linux64-*.jar + # (native/linux/x64/tor.tar.xz) with the Tor binary from Nixpkgs. The + # bundled tor is a dynamically-linked ELF expecting the + # /lib64/ld-linux-x86-64.so.2 interpreter, which does not exist on NixOS. + makeWrapper ${lib.getExe' tor "tor"} ./tor + mkdir -p native/linux/x64 + tar -cf - ./tor | xz > native/linux/x64/tor.tar.xz + zip opt/bisq/lib/app/tor-binary-linux64-*.jar native/linux/x64/tor.tar.xz >/dev/null + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib $out/bin + cp -r opt/bisq/lib/app $out/lib + + install -D -m 777 ${bisq-launcher ""} $out/bin/bisq + substituteAllInPlace $out/bin/bisq + wrapProgram $out/bin/bisq --prefix PATH : ${binPath} --prefix LD_LIBRARY_PATH : ${libraryPath} + + install -D -m 777 ${bisq-launcher "-Dglass.gtk.uiScale=2.0"} $out/bin/bisq-hidpi + substituteAllInPlace $out/bin/bisq-hidpi + wrapProgram $out/bin/bisq-hidpi --prefix PATH : ${binPath} --prefix LD_LIBRARY_PATH : ${libraryPath} + + for n in 16 24 32 48 64 96 128 256; do + size=$n"x"$n + magick opt/bisq/lib/Bisq.png -resize $size bisq.png + install -Dm644 -t $out/share/icons/hicolor/$size/apps bisq.png + done + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Decentralized bitcoin exchange network (Bisq 1)"; + homepage = "https://bisq.network"; + mainProgram = "bisq"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ pmw ]; + platforms = [ + "x86_64-linux" + ]; + }; +}) diff --git a/pkgs/by-name/bi/bisq1/sources.nix b/pkgs/by-name/bi/bisq1/sources.nix new file mode 100644 index 000000000000..8b9f276e8cf1 --- /dev/null +++ b/pkgs/by-name/bi/bisq1/sources.nix @@ -0,0 +1,9 @@ +# Generated by ./update.sh - do not update manually! +{ + version = "1.10.3"; + deb-hash = "sha256-kzLtadq8gfX6j9XU3PD5kNV43wLDoICPlXdJqULkAWE="; + sig-hash = "sha256-+51j+SBp7buukop1T4Gz0YDUga6540BVxDRoU2YE3pY="; + key-E222AA02-hash = "sha256-Ue/UmS6F440/ybEEIAR+pdPEIksAt6QSMN6G5TZVWzc="; + key-4A133008-hash = "sha256-UijG3DkJNNTakVJd2wl30mDepa27n6R/Xxfl4sjt0sk="; + key-387C8307-hash = "sha256-PrRYZLT0xv82dUscOBgQGKNf6zwzWUDhriAffZbNpmI="; +} diff --git a/pkgs/by-name/bi/bisq1/update.sh b/pkgs/by-name/bi/bisq1/update.sh new file mode 100755 index 000000000000..c162a4e6190b --- /dev/null +++ b/pkgs/by-name/bi/bisq1/update.sh @@ -0,0 +1,79 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash --pure --keep GITHUB_TOKEN -p nix git curl cacert jq + +set -euo pipefail + +cd "$(dirname "${BASH_SOURCE[0]}")" + +# Fetch the latest release version from GitHub +payload=$(curl -sL https://api.github.com/repos/bisq-network/bisq/releases/latest) +version=$(jq -r .tag_name <<< "$payload" | sed 's/^v//') + +echo "Updating bisq1 to version $version" + +# URLs for the new version +deb_url="https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb" +sig_url="https://github.com/bisq-network/bisq/releases/download/v${version}/Bisq-64bit-${version}.deb.asc" + +# Fetch and compute hashes using nix-prefetch-url and convert to SRI format +echo "Prefetching .deb package..." +deb_hash_raw=$(nix-prefetch-url "$deb_url" 2>/dev/null) +deb_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$deb_hash_raw") +echo " deb hash: $deb_hash" + +echo "Prefetching signature..." +sig_hash_raw=$(nix-prefetch-url "$sig_url" 2>/dev/null) +sig_hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$sig_hash_raw") +echo " signature hash: $sig_hash" + +# Fetch and compute hashes for public keys (these may not exist in all releases) +get_key_hash() { + local key_name=$1 + local url="https://github.com/bisq-network/bisq/releases/download/v${version}/${key_name}.asc" + local hash_raw + if hash_raw=$(nix-prefetch-url "$url" 2>/dev/null); then + nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$hash_raw" + else + echo "" # Return empty if key doesn't exist + fi +} + +echo "Prefetching public keys..." +key_E222AA02_hash=$(get_key_hash "E222AA02") +if [ -n "$key_E222AA02_hash" ]; then + echo " E222AA02 hash: $key_E222AA02_hash" +else + echo " E222AA02: not found in this release, keeping old hash" + key_E222AA02_hash=$(grep 'key-E222AA02-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +key_4A133008_hash=$(get_key_hash "4A133008") +if [ -n "$key_4A133008_hash" ]; then + echo " 4A133008 hash: $key_4A133008_hash" +else + echo " 4A133008: not found in this release, keeping old hash" + key_4A133008_hash=$(grep 'key-4A133008-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +key_387C8307_hash=$(get_key_hash "387C8307") +if [ -n "$key_387C8307_hash" ]; then + echo " 387C8307 hash: $key_387C8307_hash" +else + echo " 387C8307: not found in this release, keeping old hash" + key_387C8307_hash=$(grep 'key-387C8307-hash' sources.nix | sed 's/.*= "\(.*\)".*/\1/') +fi + +# Write sources.nix (only include keys that exist) +cat >sources.nix <=3.0a0,<3.1a0'] + " "" \ - --replace-fail "use_pyscaffold=True" "" - substituteInPlace src/bkyml/__init__.py \ - --replace-fail "from pkg_resources" "# from pkg_resources" \ - --replace-fail "get_distribution(dist_name).version" '"${finalAttrs.version}"' - ''; - - build-system = with python3.pkgs; [ - setuptools - ]; - - dependencies = with python3.pkgs; [ - ruamel-yaml - ]; - - # Don't run tests because they are broken when run within - # buildPythonApplication for reasons I don't quite understand. - doCheck = false; - - pythonImportsCheck = [ "bkyml" ]; - - meta = { - homepage = "https://github.com/joscha/bkyml"; - description = "CLI tool to generate a pipeline.yaml file for Buildkite on the fly"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ olebedev ]; - }; -}) diff --git a/pkgs/by-name/bl/blackfire/package.nix b/pkgs/by-name/bl/blackfire/package.nix index 923a0e46d950..07e82ae20747 100644 --- a/pkgs/by-name/bl/blackfire/package.nix +++ b/pkgs/by-name/bl/blackfire/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "blackfire"; - version = "2.29.7"; + version = "2026.7.0"; src = passthru.sources.${stdenv.hostPlatform.system} @@ -60,23 +60,19 @@ stdenv.mkDerivation rec { sources = { "x86_64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_amd64.deb"; - sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + hash = "sha256-GzhcK+7NrQEP48XFmOQ9PVrvvsUzrCy/VRcshTSic9E="; }; "i686-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_i386.deb"; - sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + hash = "sha256-F6U7YHSBE5Ogie2yBSGGUKt0XsE8jogKi2GP28H1Eeo="; }; "aarch64-linux" = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire/blackfire_${version}_arm64.deb"; - sha256 = "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU="; + hash = "sha256-eDJAjd/5omgUJ6sw5kCqxu7Ok2AYei/WGlXV96Ynd/U="; }; "aarch64-darwin" = fetchurl { url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_arm64.pkg.tar.gz"; - sha256 = "TvxIm4plE7nnTIkJNfCzxzr2r0B2Aqlxdveb1M+sqL4="; - }; - "x86_64-darwin" = fetchurl { - url = "https://packages.blackfire.io/blackfire/${version}/blackfire-darwin_amd64.pkg.tar.gz"; - sha256 = "oNDNIPBqvaARz9W967bxuvo2bpPORiHci3sryGqznsU="; + hash = "sha256-xzWw6us+9/r8lMMHZTgE++rX7ZZShAL7L7fOneALA4Q="; }; }; @@ -112,7 +108,6 @@ stdenv.mkDerivation rec { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bl/blackfire/php-probe.nix b/pkgs/by-name/bl/blackfire/php-probe.nix index d6eedd99df7a..a53bad84506b 100644 --- a/pkgs/by-name/bl/blackfire/php-probe.nix +++ b/pkgs/by-name/bl/blackfire/php-probe.nix @@ -16,57 +16,47 @@ let phpMajor = lib.versions.majorMinor php.version; inherit (stdenv.hostPlatform) system; - version = "2026.5.0"; + version = "2026.7.1"; hashes = { "x86_64-linux" = { system = "amd64"; hash = { - "8.1" = "sha256-FQzmRL1Dk4HBnrfbfOclDWGvqflFXTUMK8b1NLIb880="; - "8.2" = "sha256-e2+hVsoBXt8gURRvGC4bgAkLpB1GriefokAjFFUuO8c="; - "8.3" = "sha256-C/NsbJ8XlkBPlZ0lPeNL4SWxfVWSLxvQYDxTVf2PfyA="; - "8.4" = "sha256-gqEV9thI/oe38/dyrGZxhPtv4+ufzMDXJL0zgt8IbOA="; - "8.5" = "sha256-kw57CBFOcRpaToXD/V2veXjcQnVaM3uTLC3tgrKyNzc="; + "8.1" = "sha256-nkLVqnzw63ZftmVE1KWDPDSaiNkk8v9I+D1EipS6eYA="; + "8.2" = "sha256-PbZrm6fV28D4oyUW+OgRINK5ySJdnXO/ZBTliPtb4c8="; + "8.3" = "sha256-Yhl0UTQyQaUbMD3XAmzxqsmjxMRl2gr9S17SpFrTGto="; + "8.4" = "sha256-nR/um5sD0qrU91FCB3uYMqBc50IKGwsBwenJ9mSFpRA="; + "8.5" = "sha256-QzvH/VZ2SFSw5wioKMcM1nqcyOZq2Z1q6z3z0H/l3KE="; }; }; "i686-linux" = { system = "i386"; hash = { - "8.1" = "sha256-Cccapa4s6Wvo/MOjReCbbJY4H1HNe5uF8Fe4UX8ftFs="; - "8.2" = "sha256-1k8m4Mram806XIbR4x0Kf6IH7rvhbLbaqPgM9v1SHS4="; - "8.3" = "sha256-Si0boOO5BRDKARZbAbPPrxRIaUjwViQLepZ5tNvkjGk="; - "8.4" = "sha256-BOjlJy48fS2SWK28Lcd9/MVhciDEaBJe6mRIhTa9JhI="; - "8.5" = "sha256-OBySA7eGI+YqvMnsOlr7p6RznqYq7DJptnYjhMfqk2Q="; + "8.1" = "sha256-MQBYuc3KSozbI4WPslsqWC8XwHeOOAZ46OlVxqwsNdk="; + "8.2" = "sha256-bJiDWWZlnHtXNg67bWjgpew5o8LIuFEPGvI5Ziooi+U="; + "8.3" = "sha256-WpRKROLWscmr7+IDqFpvEheaW5l2AEtCFfy46JTdHPw="; + "8.4" = "sha256-mMLPqB7U8iUtJbFxAOGU6ZEUd2AzFd0EeDScy1zmfwk="; + "8.5" = "sha256-472Bm0y/kJT75IEfno2LSG+dPDF6ODKEJURWWTQg0Fo="; }; }; "aarch64-linux" = { system = "arm64"; hash = { - "8.1" = "sha256-Od+c9X4yg4xW9aAI0x1CacUNp7PdJl1KRIi++m4DLY8="; - "8.2" = "sha256-ZI2n0lXkwUg8BvpjdhqHz1F3Z7dlX+oGv6IsjRVzzWA="; - "8.3" = "sha256-6NMvylxdwPpbmIN5EDVcBuplP2kEQDyY+fD23k89k48="; - "8.4" = "sha256-356ECFSrqu5kJX/qP+SNtKl7bsGGD/ROJd9vgEX5wSM="; - "8.5" = "sha256-z7GMQ9wqIr2/BKi3G2Wf3cZBtU/ZC+uKMcbnmYfmm8w="; + "8.1" = "sha256-16A1dICRcNMorBAKHvD9YK6oddmrfiOy3hrHpW2KfpA="; + "8.2" = "sha256-Y1+CEIGQHWPNfaXevTNNiOyeV2HwX+od277s+FNsTiM="; + "8.3" = "sha256-PrFcGI8RlhO54jDgqpdl+he8ly+nSUVHbX6zQDLuKtA="; + "8.4" = "sha256-HETb8SSeDITKaeazk8K0acZkEQUzIqVnS6F6ZBqbSSo="; + "8.5" = "sha256-cyuHH9X3w9d4tCSKDUqaYz8Cq0z0nQFZHIR9U1CMQl4="; }; }; "aarch64-darwin" = { system = "arm64"; hash = { - "8.1" = "sha256-vlb6HCz9KqSL+bSuVixiHVgVVkEAuCaoR7ww0/ZSdR8="; - "8.2" = "sha256-3XVHonZ7UW3LENuKgywyZ5q3Mo/6XBhnbiuARRGqPAg="; - "8.3" = "sha256-Dw+L0Bo/6BeFi+w3sm5kekR0mXoMUcsCuEksCdFpVA0="; - "8.4" = "sha256-i5R+vUn08yNWvPaJGRRHBPAbpxdqDmvPq3l9NPCuqxg="; - "8.5" = "sha256-vyBbyS8Y1mD+zFO01bMbim8Riq45+ns9YA4k41KQup8="; - }; - }; - "x86_64-darwin" = { - system = "amd64"; - hash = { - "8.1" = "sha256-0xf09E58+kOGZbfpUeaCNdeeJx/Sv4QazfgcdV3Fqho="; - "8.2" = "sha256-BU3INTjuVXJ+WB16Q/6I1I5y0k+7sR158vKOiuh6H4w="; - "8.3" = "sha256-TBTuabrEpQR7ff+ULjZCD99a1xX4KNjTWlMQTJ1l6NU="; - "8.4" = "sha256-45R0CrE6MZ4RU4HslaF5/jbMOz32fCMnzj8R1F9tu34="; - "8.5" = "sha256-40+kki7h6DLQemLyoKOSdd8hmQXJE+Yt4rcC4V706vs="; + "8.1" = "sha256-IYKuYK4jLavOEmtvt/21m5u/BNuWQKQvqPcVYx4XEmE="; + "8.2" = "sha256-uitcd/WSs089ADBd5oEyJS7HObTY2N+e7CGrVy72fSE="; + "8.3" = "sha256-z6vDJ/k9acNM9HnQOL4OeaaQpjf/g9F85iwKHZdeCkw="; + "8.4" = "sha256-BzNouJIeKGzHG3rxf8u4TUOH/3mfjl4oJAdtkQbxu3Q="; + "8.5" = "sha256-XGgRPF4PpgOa3ZjGVIyYTZXrd0bOayek+zK6L9ZUyv4="; }; }; }; @@ -166,7 +156,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blackhole/package.nix b/pkgs/by-name/bl/blackhole/package.nix index b84a1a42b8b1..fa3f1a861c34 100644 --- a/pkgs/by-name/bl/blackhole/package.nix +++ b/pkgs/by-name/bl/blackhole/package.nix @@ -7,15 +7,18 @@ nix-update-script, channel ? "256ch", }: +let + numChannels = lib.toIntBase10 (lib.removeSuffix "ch" channel); +in stdenv.mkDerivation (finalAttrs: { pname = "blackhole"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "existentialaudio"; repo = "BlackHole"; tag = "v${finalAttrs.version}"; - hash = "sha256-jFKi5LJdTOMFa1mErH6WsjgCtLCKzwpgn2+T3Fp9MtQ="; + hash = "sha256-kuIaoXA0K7SFPXKFHqcilTbf1zn9Ol3JYVpnkFuQEZg="; }; nativeBuildInputs = [ @@ -31,14 +34,14 @@ stdenv.mkDerivation (finalAttrs: { "-configuration" "Release" "PRODUCT_BUNDLE_IDENTIFIER=${finalAttrs.bundleId}" - "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kDriver_Name=\\\"blackhole${channel}\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" + "GCC_PREPROCESSOR_DEFINITIONS=$GCC_PREPROCESSOR_DEFINITIONS kNumber_Of_Channels=${toString numChannels} kDriver_Name=\\\"BlackHole\\\" kPlugIn_BundleID=\\\"${finalAttrs.bundleId}\\\" kPlugIn_Icon=\\\"BlackHole.icns\\\"" ]; installPhase = '' runHook preInstall mkdir -p $out/Library/Audio/Plug-Ins/HAL - mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/Blackhole${channel}.driver + mv Products/Release/BlackHole.driver $out/Library/Audio/Plug-Ins/HAL/BlackHole${channel}.driver runHook postInstall ''; diff --git a/pkgs/by-name/bl/blas/package.nix b/pkgs/by-name/bl/blas/package.nix index 01ad1839c339..c0023957bcea 100644 --- a/pkgs/by-name/bl/blas/package.nix +++ b/pkgs/by-name/bl/blas/package.nix @@ -3,6 +3,7 @@ stdenv, lapack-reference, openblas, + checkPhaseThreadLimitHook, isILP64 ? false, blasProvider ? openblas, }: @@ -186,6 +187,10 @@ stdenv.mkDerivation { "dev" ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + meta = (blasProvider'.meta or { }) // { description = "${lib.getName blasProvider} with just the BLAS C and FORTRAN ABI"; }; diff --git a/pkgs/by-name/bl/blast-bin/package.nix b/pkgs/by-name/bl/blast-bin/package.nix index 7436773c178f..a6a5151ac050 100644 --- a/pkgs/by-name/bl/blast-bin/package.nix +++ b/pkgs/by-name/bl/blast-bin/package.nix @@ -26,10 +26,6 @@ let url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-linux.tar.gz"; hash = "sha256-1EeiMu08R9Glq8qRky4OTT5lQPLJcM7iaqUrmUOS4MI="; }; - x86_64-darwin = fetchurl { - url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-x64-macosx.tar.gz"; - hash = "sha256-fu4edyD12q8G452ckrEl2Qct5+uB9JnABd7bCLkyMkw="; - }; aarch64-darwin = fetchurl { url = "https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${version}/ncbi-blast-${version}+-aarch64-macosx.tar.gz"; hash = "sha256-6NpPNLBCHaBRscLZ5fjh5Dv3bjjPk2Gh2+L7xEtiJNs="; @@ -72,7 +68,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/bl/blastem/package.nix b/pkgs/by-name/bl/blastem/package.nix index 2881fe114b73..b58c6bb6101a 100644 --- a/pkgs/by-name/bl/blastem/package.nix +++ b/pkgs/by-name/bl/blastem/package.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/bl/blaze/package.nix b/pkgs/by-name/bl/blaze/package.nix index 2901db3175cd..345e5d6912b0 100644 --- a/pkgs/by-name/bl/blaze/package.nix +++ b/pkgs/by-name/bl/blaze/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance C++ math library"; homepage = "https://bitbucket.org/blaze-lib/blaze"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/bl/blazesym-c/package.nix b/pkgs/by-name/bl/blazesym-c/package.nix index c9f0035b5495..9fdddf6c7090 100644 --- a/pkgs/by-name/bl/blazesym-c/package.nix +++ b/pkgs/by-name/bl/blazesym-c/package.nix @@ -9,24 +9,27 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "blazesym-c"; - version = "0.1.8"; + version = "0.1.9"; src = fetchFromGitHub { owner = "libbpf"; repo = "blazesym"; tag = "capi-v${finalAttrs.version}"; - hash = "sha256-IdeY9FCGziYN9glnvQJu2oa5ogdXb6D9QcY2MRnq7vA="; + hash = "sha256-gaDNRVcoI6Nc1zWEwS49FhKPep4uI5560t3AaIRCYfw="; }; - cargoHash = "sha256-fsvdhahTKxjrrH9z6m1k3cTkXfMUZXZNZlYRi3tgTlA="; + cargoHash = "sha256-ZLGtskOe38fBP8o8zIezzsNwY4Xwr7UnVrbx1KysEis="; cargoBuildFlags = [ "--package" "blazesym-c" ]; - nativeCheckInputs = [ + nativeBuildInputs = [ pkg-config + ]; + + buildInputs = [ elfutils zlib ]; diff --git a/pkgs/by-name/bl/bleep/package.nix b/pkgs/by-name/bl/bleep/package.nix index 2ed661c7138e..3aa0a27072e9 100644 --- a/pkgs/by-name/bl/bleep/package.nix +++ b/pkgs/by-name/bl/bleep/package.nix @@ -12,14 +12,12 @@ let platform = { x86_64-linux = "x86_64-pc-linux"; - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "arm64-apple-darwin"; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); hash = { x86_64-linux = "sha256-SGV0fEuwmGwpqmD42a+x0fIK50RWSHEYDesH4obgRhg="; - x86_64-darwin = "sha256-fOeYUchUE1Jj4xSrYjljEUpGrW8cvev7d/qywc81vFo="; aarch64-darwin = "sha256-qL0hjEdfkN62NDvhlzVgW4TYWv0IReo2Fo5eVhUaOrI="; } ."${stdenvNoCC.system}" or (throw "unsupported system ${stdenvNoCC.hostPlatform.system}"); @@ -73,7 +71,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "bleep"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ kristianan ]; diff --git a/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch b/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch deleted file mode 100644 index ff75af489244..000000000000 --- a/pkgs/by-name/bl/blender/fix-quite-clog-warning.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/source/blender/gpu/vulkan/vk_texture_pool.cc b/source/blender/gpu/vulkan/vk_texture_pool.cc -index 850e7808ae7..3478d4907f2 100644 ---- a/source/blender/gpu/vulkan/vk_texture_pool.cc -+++ b/source/blender/gpu/vulkan/vk_texture_pool.cc -@@ -554,7 +554,7 @@ void VKTexturePool::log_usage_data() - log_message += std::format(" ({} cached VkImages)", current_usage_data_.image_cache_size); - } - -- CLOG_TRACE(&LOG, log_message.c_str()); -+ CLOG_TRACE(&LOG, "%s", log_message.c_str()); - } - - } // namespace gpu diff --git a/pkgs/by-name/bl/blender/hiprt-3-compat.patch b/pkgs/by-name/bl/blender/hiprt-3-compat.patch deleted file mode 100644 index ab42ff8ae27b..000000000000 --- a/pkgs/by-name/bl/blender/hiprt-3-compat.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/extern/hipew/src/hipew.c b/extern/hipew/src/hipew.c -index e72ccde6..138e1efc 100644 ---- a/extern/hipew/src/hipew.c -+++ b/extern/hipew/src/hipew.c -@@ -241,13 +241,13 @@ static int hipewHipInit(void) { - /* ROCm 6 changes paths from /opt/rocm/hip/lib to /opt/rocm/lib, so - * search for libraries there. */ - -- const char* hip_paths[] = { "libamdhip64.so", -+ const char* hip_paths[] = { "libamdhip64.so.7", -+ "/opt/rocm/lib/libamdhip64.so.7", -+ "/opt/rocm/hip/lib/libamdhip64.so.7", - "libamdhip64.so.6", - "/opt/rocm/lib/libamdhip64.so.6", - "/opt/rocm/hip/lib/libamdhip64.so.6", -- "libamdhip64.so.7", -- "/opt/rocm/lib/libamdhip64.so.7", -- "/opt/rocm/hip/lib/libamdhip64.so.7", -+ "libamdhip64.so", - NULL }; - #endif - static int initialized = 0; -diff --git a/intern/cycles/kernel/device/hiprt/CMakeLists.txt b/intern/cycles/kernel/device/hiprt/CMakeLists.txt -index 9f48fb9be3..01e05159c9 100644 ---- a/intern/cycles/kernel/device/hiprt/CMakeLists.txt -+++ b/intern/cycles/kernel/device/hiprt/CMakeLists.txt -@@ -30,13 +30,13 @@ - set(SRC_KERNEL_DEVICE_HIPRT_SDK - hiprt/impl/Aabb.h - hiprt/impl/BvhNode.h -- hiprt/impl/Geometry.h -+ hiprt/impl/Header.h - hiprt/impl/hiprt_device_impl.h - hiprt/impl/hiprt_kernels_bitcode.h - hiprt/impl/Instance.h -+ hiprt/impl/Obb.h - hiprt/impl/QrDecomposition.h - hiprt/impl/Quaternion.h -- hiprt/impl/Scene.h - hiprt/impl/Transform.h - hiprt/impl/Triangle.h - ) diff --git a/pkgs/by-name/bl/blender/package.nix b/pkgs/by-name/bl/blender/package.nix index 224139c850af..f8ac2e9b512d 100644 --- a/pkgs/by-name/bl/blender/package.nix +++ b/pkgs/by-name/bl/blender/package.nix @@ -9,9 +9,11 @@ ceres-solver, cmake, config, + cudaArches ? cudaPackages.flags.realArches, cudaPackages, cudaSupport ? config.cudaSupport, dbus, + draco, embree, fetchFromGitHub, fetchzip, @@ -49,6 +51,7 @@ makeWrapper, manifold, mesa, + meshoptimizer, nix-update-script, onetbb, openal, @@ -116,12 +119,12 @@ in stdenv'.mkDerivation (finalAttrs: { pname = "blender"; - version = "5.1.1"; + version = "5.2.0"; src = fetchzip { name = "source"; url = "https://download.blender.org/source/blender-${finalAttrs.version}.tar.xz"; - hash = "sha256-iJolR8iS2go0doO96ibyseCeMunFL+XPoQ25NbX6oOA="; + hash = "sha256-V2+Oc7GT31JvWccffzUaingEs8CtSFaazgQ+YdZUB7M="; }; patches = [ @@ -129,36 +132,33 @@ stdenv'.mkDerivation (finalAttrs: { # ceres-solver dependency propagates eigen 3 and appears to be incompatible # with more recent versions. ./eigen-3-compat.patch - # Required due to `-Werror=format-security` in nixpkgs - # https://projects.blender.org/blender/blender/commit/470127ede2448de50a6936b8484b3c382c76d596 - ./fix-quite-clog-warning.patch - ] - # Minimal backport of hiprt 3.x support from https://projects.blender.org/blender/blender/pulls/144889 - ++ lib.optionals rocmSupport [ - ./hiprt-3-compat.patch ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ ./darwin.patch ]; - postPatch = - (lib.optionalString stdenv.hostPlatform.isDarwin '' - : > build_files/cmake/platform/platform_apple_xcode.cmake - substituteInPlace source/creator/CMakeLists.txt \ - --replace-fail '${"$"}{LIBDIR}/python' \ - '${python3}' \ - --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/' - substituteInPlace build_files/cmake/platform/platform_apple.cmake \ - --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ - '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ - --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \ - '${lib.getLib brotli}/lib/libbrotlidec.dylib' - '') - + (lib.optionalString rocmSupport '' - substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"' - substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' - substituteInPlace extern/hipew/src/hiprtew.cc --replace-fail '"/opt/rocm/lib/libhiprt64.so"' '"${rocmPackages.hiprt}/lib/libhiprt64.so"' - ''); + postPatch = '' + substituteInPlace intern/ghost/intern/GHOST_SystemPathsUnix.cc \ + --replace-fail \ + 'static const char *static_libs_path = PREFIX "/" BLENDER_INSTALL_LIBDIR;' \ + 'static const char *static_libs_path = BLENDER_INSTALL_LIBDIR;' + '' + + (lib.optionalString stdenv.hostPlatform.isDarwin '' + : > build_files/cmake/platform/platform_apple_xcode.cmake + substituteInPlace source/creator/CMakeLists.txt \ + --replace-fail '${"$"}{LIBDIR}/python' \ + '${python3}' \ + --replace-fail '${"$"}{LIBDIR}/materialx/' '${python3Packages.materialx}/' + substituteInPlace build_files/cmake/platform/platform_apple.cmake \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlicommon-static.a' \ + '${lib.getLib brotli}/lib/libbrotlicommon.dylib' \ + --replace-fail '${"$"}{LIBDIR}/brotli/lib/libbrotlidec-static.a' \ + '${lib.getLib brotli}/lib/libbrotlidec.dylib' + '') + + (lib.optionalString rocmSupport '' + substituteInPlace extern/hipew/src/hipew.c --replace-fail '"/opt/rocm/hip/lib/libamdhip64.so.${lib.versions.major rocmPackages.clr.version}"' '"${rocmPackages.clr}/lib/libamdhip64.so"' + substituteInPlace extern/hipew/src/hipew.c --replace-fail '"opt/rocm/hip/bin"' '"${rocmPackages.clr}/bin"' + ''); env.NIX_CFLAGS_COMPILE = "-I${python3}/include/${python3.libPrefix}"; @@ -201,12 +201,12 @@ stdenv'.mkDerivation (finalAttrs: { (lib.cmakeFeature "ALEMBIC_LIBRARY" "${lib.getLib alembic}/lib/libAlembic${stdenv.hostPlatform.extensions.sharedLibrary}") ] ++ lib.optionals cudaSupport [ + (lib.cmakeFeature "CYCLES_CUDA_BINARIES_ARCH" (lib.concatStringsSep ";" cudaArches)) (lib.cmakeFeature "OPTIX_ROOT_DIR" "${optix}") (lib.cmakeBool "WITH_CYCLES_CUDA_BINARIES" true) ] ++ lib.optionals rocmSupport [ - (lib.cmakeFeature "HIPRT_INCLUDE_DIR" "${rocmPackages.hiprt}/include") - (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" true) + (lib.cmakeBool "WITH_CYCLES_DEVICE_HIPRT" false) (lib.cmakeBool "WITH_CYCLES_HIP_BINARIES" true) ] ++ lib.optionals waylandSupport [ @@ -253,6 +253,7 @@ stdenv'.mkDerivation (finalAttrs: { alembic boost ceres-solver + draco ffmpeg_7 fftw fftwFloat @@ -270,6 +271,7 @@ stdenv'.mkDerivation (finalAttrs: { libtiff libwebp manifold + meshoptimizer opencolorio openexr openimageio @@ -337,6 +339,7 @@ stdenv'.mkDerivation (finalAttrs: { ps = python3Packages; in [ + ps.cattrs ps.materialx ps.numpy ps.openshadinglanguage @@ -453,7 +456,6 @@ stdenv'.mkDerivation (finalAttrs: { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bl/blendfarm/package.nix b/pkgs/by-name/bl/blendfarm/package.nix index de227c59e8d6..a96e67f8f949 100644 --- a/pkgs/by-name/bl/blendfarm/package.nix +++ b/pkgs/by-name/bl/blendfarm/package.nix @@ -134,7 +134,7 @@ buildDotnetModule rec { meta = { description = "Open-source, cross-platform, stand-alone, Network Renderer for Blender"; homepage = "https://github.com/LogicReinc/LogicReinc.BlendFarm"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ gador ]; mainProgram = "blendfarm-nix"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch new file mode 100644 index 000000000000..1fa4803f3156 --- /dev/null +++ b/pkgs/by-name/bl/blesh/fix-cache-invalidation.patch @@ -0,0 +1,11 @@ +--- a/ble.pp ++++ b/ble.pp +@@ -2063,7 +2063,7 @@ + return 1 + fi + +- local ver=${BLE_VERSINFO[0]}.${BLE_VERSINFO[1]} ++ local ver=$BLE_VERSION + ble/base/.create-user-directory _ble_base_cache "$cache_dir/blesh/$ver" + } + function ble/base/initialize-cache-directory { diff --git a/pkgs/by-name/bl/blesh/package.nix b/pkgs/by-name/bl/blesh/package.nix index 3fa018822f68..78d9aca9f693 100644 --- a/pkgs/by-name/bl/blesh/package.nix +++ b/pkgs/by-name/bl/blesh/package.nix @@ -1,36 +1,57 @@ { lib, stdenvNoCC, - fetchzip, - runtimeShell, + fetchFromGitHub, bashInteractive, - glibcLocales, + gawk, + runtimeShell, + unstableGitUpdater, }: -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "blesh"; - version = "0.4.0-devel3-unstable-2026-03-10"; + version = "0.4.0-devel3-unstable-2026-07-11"; - src = fetchzip { - url = "https://github.com/akinomyoga/ble.sh/releases/download/nightly/ble-nightly-20260310%2Bb99cadb.tar.xz"; - name = "ble-nightly-20260310+b99cadb.tar.xz"; - sha256 = "sha256-rJnSEY7J4wfy8dnL9Bg59u0epPe0HL1J7piPbkNyes0="; + src = fetchFromGitHub { + owner = "akinomyoga"; + repo = "ble.sh"; + rev = "d69e4d549a1881a37300fe6b4a05478bd9157dfc"; + fetchSubmodules = true; + hash = "sha256-w2d7JCa/cBpe8x+pnGWq+h6cpUVJCNyHZymgbKKPDQE="; }; - dontBuild = true; + nativeBuildInputs = [ + gawk + ]; + + patches = [ + # Fix the cache invalidation not working; see + # https://github.com/NixOS/nixpkgs/pull/521218#issuecomment-4641313131 + ./fix-cache-invalidation.patch + ]; + + # ble.sh embeds the commit id, normally read from .git, which fetchFromGitHub omits. + makeFlags = [ + "PREFIX=$(out)" + "BLE_GIT_COMMIT_ID=${builtins.substring 0 7 finalAttrs.src.rev}" + "BLE_GIT_BRANCH=master" + ]; + + postPatch = '' + patchShebangs --build make_command.sh make + ''; doCheck = true; - nativeCheckInputs = [ - bashInteractive - glibcLocales - ]; - preCheck = "export LC_ALL=en_US.UTF-8"; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/blesh/lib" + # auto-detection runs `make -n check` without makeFlags, which fails without BLE_GIT_COMMIT_ID + checkTarget = "check"; + nativeCheckInputs = [ bashInteractive ]; + preCheck = '' + export HOME=$TMPDIR + # upstream skips its flaky sleep-timing tests under GitHub CI + export CI=true GITHUB_ACTION=nix + ''; + postInstall = '' cat <"$out/share/blesh/lib/_package.sh" _ble_base_package_type=nix @@ -40,12 +61,6 @@ stdenvNoCC.mkDerivation { } EOF - cp -rv $src/* $out/share/blesh - - runHook postInstall - ''; - - postInstall = '' mkdir -p "$out/bin" cat <"$out/bin/blesh-share" #!${runtimeShell} @@ -54,8 +69,18 @@ stdenvNoCC.mkDerivation { echo "$out/share/blesh" EOF chmod +x "$out/bin/blesh-share" + + rm -rf "$out/share/blesh/cache.d" "$out/share/blesh/run" ''; + # tagFormat skips the "nightly"/"spike-*" tags; the newest tag is too far + # behind HEAD for shallow deepening, so clone fully. + passthru.updateScript = unstableGitUpdater { + tagPrefix = "v"; + tagFormat = "v*"; + shallowClone = false; + }; + meta = { homepage = "https://github.com/akinomyoga/ble.sh"; description = "Bash Line Editor -- a full-featured line editor written in pure Bash"; @@ -68,4 +93,4 @@ stdenvNoCC.mkDerivation { ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/bl/blink-qt/fix-none-account.patch b/pkgs/by-name/bl/blink-qt/fix-none-account.patch new file mode 100644 index 000000000000..d766d24ea265 --- /dev/null +++ b/pkgs/by-name/bl/blink-qt/fix-none-account.patch @@ -0,0 +1,25 @@ +From 6e438d1ab9f9da5e55b0cc96ea81fbac1f1a871b Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sun, 5 Jul 2026 19:40:36 +0530 +Subject: [PATCH] fix: handle None default_account on startup + +--- + blink/mainwindow.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/blink/mainwindow.py b/blink/mainwindow.py +index d0baa21..77c67e8 100644 +--- a/blink/mainwindow.py ++++ b/blink/mainwindow.py +@@ -1109,7 +1109,7 @@ class MainWindow(base_class, ui_class): + + def _NH_SIPAccountManagerDidStart(self, notification): + account = notification.sender.default_account +- if account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized): ++ if account is not None and account is not BonjourAccount() and account.sms.enable_pgp and account.sms.private_key is not None and os.path.exists(account.sms.private_key.normalized): + self.export_pgp_key_action.setEnabled(True) + + def _NH_SIPAccountManagerDidRemoveAccount(self, notification): +-- +2.54.0 + diff --git a/pkgs/by-name/bl/blink-qt/package.nix b/pkgs/by-name/bl/blink-qt/package.nix index 45da889affe8..395bffbe4d39 100644 --- a/pkgs/by-name/bl/blink-qt/package.nix +++ b/pkgs/by-name/bl/blink-qt/package.nix @@ -5,26 +5,24 @@ python3Packages, qt6Packages, libvncserver, + stdenv, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "blink-qt"; - version = "6.0.4"; + version = "6.0.6"; pyproject = true; src = fetchFromGitHub { owner = "AGProjects"; repo = "blink-qt"; tag = finalAttrs.version; - hash = "sha256-QESg9yo5oddYqSKuFLSMI2Oju3FCq97+j0uJDK85Yy8="; + hash = "sha256-0hsuAYYp7KvfxErAcN4EX8G3goirGRmpijJfAMvbZJQ="; }; patches = [ - # Remove when version > 6.0.4 - (fetchpatch2 { - url = "https://github.com/AGProjects/blink-qt/commit/45343c90ae0680a3d03589fa8a12ac1eb85a6925.patch"; - hash = "sha256-XwV5L3r0IqWkhlaJypS2cHkDCcoumOgEEqDpdcaTviE="; - }) + # Remove once https://github.com/AGProjects/blink-qt/pull/7 is mereged and tagged + ./fix-none-account.patch ]; nativeBuildInputs = [ qt6Packages.wrapQtAppsHook ]; @@ -40,26 +38,31 @@ python3Packages.buildPythonApplication (finalAttrs: { qt6Packages.qtsvg ]; - dependencies = with python3Packages; [ - dateutils - dnspython - google-api-python-client - lxml - lxml-html-clean - msrplib - oauth2client - otr - pgpy - pyqt6 - pyqt6-webengine - python3-application - python3-eventlib - python3-gnutls - python3-sipsimple - sqlobject - standard-imghdr - xcaplib - ]; + dependencies = + with python3Packages; + [ + dateutils + dnspython + google-auth-oauthlib + google-api-python-client + lxml + lxml-html-clean + msrplib + otr + pgpy + pyqt6 + pyqt6-webengine + python3-application + python3-eventlib + python3-gnutls + python3-sipsimple + sqlobject + standard-imghdr + xcaplib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + numpy + ]; dontWrapQtApps = true; diff --git a/pkgs/by-name/bl/blink1-tool/package.nix b/pkgs/by-name/bl/blink1-tool/package.nix index a039cb325f3f..36ddfee0a476 100644 --- a/pkgs/by-name/bl/blink1-tool/package.nix +++ b/pkgs/by-name/bl/blink1-tool/package.nix @@ -8,23 +8,30 @@ stdenv.mkDerivation (finalAttrs: { pname = "blink1"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "todbot"; repo = "blink1-tool"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-9kbWZ0vq+A3y8IeqvK1HnWWgxXaieu1eU8l+om5F2/w="; + hash = "sha256-i3DtDPAKvJ53HTgNnnf2iSGmayxg/++Kk3/4cEnD+Sk="; }; postPatch = '' substituteInPlace Makefile \ --replace "@git submodule update --init" "true" + substituteInPlace Makefile \ + --replace-fail "INSTALL = install''\n" "INSTALL = install -D''\n" + '' + # Drop the hardcoded universal-binary flags so we build a single-arch. + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace Makefile \ + --replace-fail "-arch x86_64 -arch arm64" "" ''; nativeBuildInputs = [ pkg-config ]; - buildInputs = [ libusb1 ]; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libusb1 ]; makeFlags = [ "GIT_TAG_RAW=v${finalAttrs.version}" @@ -40,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Command line client for the blink(1) notification light"; homepage = "https://blink1.thingm.com/"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ cransom ]; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; mainProgram = "blink1-tool"; }; }) diff --git a/pkgs/by-name/bl/blis/package.nix b/pkgs/by-name/bl/blis/package.nix index 0002f7c3c3ee..43b1e17c59ed 100644 --- a/pkgs/by-name/bl/blis/package.nix +++ b/pkgs/by-name/bl/blis/package.nix @@ -5,6 +5,12 @@ perl, python3, + # sets BLIS_NUM_THREADS and OMP_NUM_THREADS for packages + # invoking blis during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://github.com/flame/blis/blob/b8b75b4e19459f5d618b57aa814ca38b1d82eb82/docs/Multithreading.md#specifying-multithreading + checkPhaseThreadLimitHook, + # Enable BLAS interface with 64-bit integer width. blas64 ? false, @@ -20,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "blis"; - version = "2.0"; + version = "2.1"; src = fetchFromGitHub { owner = "flame"; repo = "blis"; tag = finalAttrs.version; - sha256 = "sha256-+n8SbiiEJDN4j1IPmZfI5g1i2J+jWrUXh7S48JEDTAE="; + sha256 = "sha256-eEwqM+3+Cfm0oKog+hg29bf5DUZqJ4YsCpjl4v/8Aw0="; }; inherit blas64; @@ -36,6 +42,10 @@ stdenv.mkDerivation (finalAttrs: { python3 ]; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/by-name/bl/blitz/package.nix b/pkgs/by-name/bl/blitz/package.nix index baecb22da069..6c05d937b410 100644 --- a/pkgs/by-name/bl/blitz/package.nix +++ b/pkgs/by-name/bl/blitz/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation rec { lgpl3Plus ]; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; longDescription = '' Blitz++ is a C++ class library for scientific computing which provides performance on par with Fortran 77/90. It uses template techniques to diff --git a/pkgs/by-name/bl/bloaty/package.nix b/pkgs/by-name/bl/bloaty/package.nix index 08cb16425ec1..6ecf4c54d756 100644 --- a/pkgs/by-name/bl/bloaty/package.nix +++ b/pkgs/by-name/bl/bloaty/package.nix @@ -3,6 +3,7 @@ stdenv, cmake, zlib, + zstd, fetchFromGitHub, re2, abseil-cpp, @@ -18,19 +19,19 @@ let demumble = fetchFromGitHub { owner = "nico"; repo = "demumble"; - rev = "01098eab821b33bd31b9778aea38565cd796aa85"; - hash = "sha256-605SsXd7TSdm3BH854ChHIZbOXcHI/n8RN+pFMz4Ex4="; + rev = "10e00fb708a3d24c1bb16682cac76925ffb76af5"; + hash = "sha256-JNSSvYE5bh/9RVLQXVNmWRKAzidg4ktmqLI7pcUATDs="; }; in stdenv.mkDerivation { pname = "bloaty"; - version = "1.1-unstable-2024-09-23"; + version = "1.1-unstable-2026-05-31"; src = fetchFromGitHub { owner = "google"; repo = "bloaty"; - rev = "0c89acd7e8b9d91fd1e9c8c129be627b4e47f1ea"; - hash = "sha256-txZDPytWnkjkiVkPL2SWLwCPEtVvqoI/MVRvbJ2kBGw="; + rev = "4a601b636e2347322d0371c8bf8ca5eaeaca4bac"; + hash = "sha256-16Ic2x5JctSCuHJZjK96xkgJw8qyy8GqFupwWuc2U/k="; }; cmakeFlags = [ @@ -43,7 +44,6 @@ stdenv.mkDerivation { # Build system relies on some of those source files rm -rf third_party/googletest third_party/abseil-cpp third_party/demumble ln -s ${gtest.src} third_party/googletest - ln -s ${abseil-cpp.src} third_party/abseil-cpp ln -s ${demumble} third_party/demumble substituteInPlace CMakeLists.txt \ --replace "find_package(Python COMPONENTS Interpreter)" "" \ @@ -60,6 +60,7 @@ stdenv.mkDerivation { buildInputs = [ zlib + zstd re2 abseil-cpp protobuf @@ -86,6 +87,6 @@ stdenv.mkDerivation { homepage = "https://github.com/google/bloaty"; license = lib.licenses.asl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/bl/blockattack/package.nix b/pkgs/by-name/bl/blockattack/package.nix index aafab547514c..0d8d99da8cc9 100644 --- a/pkgs/by-name/bl/blockattack/package.nix +++ b/pkgs/by-name/bl/blockattack/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source clone of Panel de Pon (aka Tetris Attack)"; broken = stdenv.hostPlatform.isDarwin; changelog = "https://github.com/blockattack/blockattack-game/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "blockattack"; maintainers = [ ]; inherit (SDL2.meta) platforms; diff --git a/pkgs/by-name/bl/blockbench/package.nix b/pkgs/by-name/bl/blockbench/package.nix index 0d31dc1f86b4..e32e73329fe8 100644 --- a/pkgs/by-name/bl/blockbench/package.nix +++ b/pkgs/by-name/bl/blockbench/package.nix @@ -12,13 +12,13 @@ buildNpmPackage rec { pname = "blockbench"; - version = "5.1.4"; + version = "5.1.5"; src = fetchFromGitHub { owner = "JannisX11"; repo = "blockbench"; tag = "v${version}"; - hash = "sha256-lYsd8KegoO4amtRL5o3JPXW4vu4z3p/dXlOVn3zKgeA="; + hash = "sha256-1OCT128gEk/f1boaHfNuBX/J3xhvl7h3CQQT87eXL3I="; }; patches = [ @@ -36,7 +36,7 @@ buildNpmPackage rec { copyDesktopItems ]; - npmDepsHash = "sha256-RmUUdHSVrZYc4F1Qtkbvn/2oKspM/3SnCuT3McKlMn0="; + npmDepsHash = "sha256-EYtpxi9sTpn5Xpvf84UGAFkqJS+/p9vHwNUu/Vve4pg="; makeCacheWritable = true; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; diff --git a/pkgs/by-name/bl/blocky/package.nix b/pkgs/by-name/bl/blocky/package.nix index 7d0cb1fae802..e981cbb3d375 100644 --- a/pkgs/by-name/bl/blocky/package.nix +++ b/pkgs/by-name/bl/blocky/package.nix @@ -7,20 +7,20 @@ buildGoModule (finalAttrs: { pname = "blocky"; - version = "0.30.0"; + version = "0.33.0"; src = fetchFromGitHub { owner = "0xERR0R"; repo = "blocky"; rev = "v${finalAttrs.version}"; - hash = "sha256-SZpAPX+MIQA0HRUUmjXi7g+DEJ+jyub4rlyc0RLclew="; + hash = "sha256-mVHPnff6NEAgehEgrrIsGBeR05fHlzRMpXWCs6jsUz0="; }; # needs network connection and fails at # https://github.com/0xERR0R/blocky/blob/development/resolver/upstream_resolver_test.go doCheck = false; - vendorHash = "sha256-DahHFf0w0ksQniuVByX45/fLcqpAga23qMjAGnZTjjY="; + vendorHash = "sha256-fIbykVKC7CiVRh/SIaLpSkV1emVchrvFwRFotTpOInQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/bl/bloop/package.nix b/pkgs/by-name/bl/bloop/package.nix index d5421084db2e..0fb6d58c68c8 100644 --- a/pkgs/by-name/bl/bloop/package.nix +++ b/pkgs/by-name/bl/bloop/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { pname = "bloop"; - version = "2.1.0"; + version = "2.1.1"; platform = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then @@ -42,11 +42,11 @@ stdenv.mkDerivation rec { url = "https://github.com/scalacenter/bloop/releases/download/v${version}/bloop-${platform}"; sha256 = if stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isx86_64 then - "sha256-yZEN3w2pvCmDRcvwE3KjUaJOVbUSDvVthMmlRSY2cSY=" + "sha256-F5wRihAwf/TNBSYortTCoK9qKqTI+1N5InJ+rqLFp8A=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64 then - "sha256-U1rPA1h0xVjAsuDFfaFvy7n6L+yRNKgqS9OQYvZH8MM=" + "sha256-wQXAldzU6Typ6pZB8k3dfX7g+aaVF7jXvd0pnuk5gZU=" else if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "sha256-1MO14ChMnn/cDSEl1qiwDhzgX3pQjsSN8ksp4WkPDMk=" + "sha256-OrONKbC2l0jjfmguDmoiyEaJWdTrKBiP0ZEa5rhizDM=" else throw "unsupported platform"; }; @@ -86,7 +86,6 @@ stdenv.mkDerivation rec { mainProgram = "bloop"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/bl/bluebubbles/CMakeLists.patch b/pkgs/by-name/bl/bluebubbles/CMakeLists.patch index 386a8aa4cfa3..5c1b8fd1a4e0 100644 --- a/pkgs/by-name/bl/bluebubbles/CMakeLists.patch +++ b/pkgs/by-name/bl/bluebubbles/CMakeLists.patch @@ -7,7 +7,7 @@ -# ---------------------------------------------------------------------- -# Download and add objectbox-c prebuilt library. - --set(OBJECTBOX_VERSION 4.0.2) +-set(OBJECTBOX_VERSION 4.3.0) - -set(OBJECTBOX_ARCH ${CMAKE_SYSTEM_PROCESSOR}) -if (${OBJECTBOX_ARCH} MATCHES "x86_64") diff --git a/pkgs/by-name/bl/bluebubbles/objectbox_flutter_libs.nix b/pkgs/by-name/bl/bluebubbles/objectbox_flutter_libs.nix index 3a09565f824c..39133967d238 100644 --- a/pkgs/by-name/bl/bluebubbles/objectbox_flutter_libs.nix +++ b/pkgs/by-name/bl/bluebubbles/objectbox_flutter_libs.nix @@ -19,11 +19,11 @@ let }; objectbox-c = fetchzip { - name = "objectbox-linux-4.0.2"; - url = "https://github.com/objectbox/objectbox-c/releases/download/v4.0.2/objectbox-linux-${arch}.tar.gz"; + name = "objectbox-linux-4.3.0"; + url = "https://github.com/objectbox/objectbox-c/releases/download/v4.3.0/objectbox-linux-${arch}.tar.gz"; hash = selectSystem { - x86_64-linux = "sha256-v51/m+v/FjryZuJphVb35jKgQk6DtEu+uHEzUzmeKMo="; - aarch64-linux = "sha256-trpF71hpJA6+DFQ3cTKOyyjtLKf8aFHf6JWb6Jxm4eo="; + x86_64-linux = "sha256-VaDUQcTk0ArmeKFpdKN35WEGL8QX89k8KPHTRP9xadI="; + aarch64-linux = "sha256-vnsxkNiYoZIBfw6IcYg4cFgsdRyHGDbyA0y8J4NuYE0="; }; stripRoot = false; meta.license = lib.licenses.unfree; # the release tarball has a proprietary shared library diff --git a/pkgs/by-name/bl/bluebubbles/package.nix b/pkgs/by-name/bl/bluebubbles/package.nix index c238286763f8..a5426ebfe2a4 100644 --- a/pkgs/by-name/bl/bluebubbles/package.nix +++ b/pkgs/by-name/bl/bluebubbles/package.nix @@ -13,13 +13,13 @@ flutter329.buildFlutterApplication rec { pname = "bluebubbles"; - version = "1.15.4"; + version = "1.15.7"; src = fetchFromGitHub { owner = "BlueBubblesApp"; repo = "bluebubbles-app"; - tag = "v${version}+73-desktop"; - hash = "sha256-+JCj4EuwFbzE4u+7iJ+v9FQuLVt1tozwBufw+eL5usk="; + tag = "v${version}+76-desktop"; + hash = "sha256-KmIoJHQAF4DQQ78SJ5Vra7ubfvqTjmK4lf8tGJDJNTs="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; @@ -27,13 +27,14 @@ flutter329.buildFlutterApplication rec { customSourceBuilders.objectbox_flutter_libs = callPackage ./objectbox_flutter_libs.nix { }; gitHashes = { - desktop_webview_auth = "sha256-n3lvYFUzm/1sCwQBJ3Ovup4Mq7lqGJ17ktk3TJrHhKE="; + desktop_webview_auth = "sha256-G6xrC6Jz3kYAysHI6w/8ahzXTvX7k6QW3GB3b8Uh+RQ="; disable_battery_optimization = "sha256-IsfclmbdLvju+0VWElFz9brdVntRESFB+PF8UPJBL2E="; firebase_dart = "sha256-jq4Y5ApGPrXcLN3gwC9NuGN/EQkl5u64iMzL8KG02Sc="; gesture_x_detector = "sha256-H3OJxDhESWwnpRky9jS9RIBiZ7gSqWQ/j0x/1VvRb5M="; - local_notifier = "sha256-0vajd2XNGpV9aqywbCUvDC2SLjwxh1LmshTa5yttQUI="; + local_notifier = "sha256-OvJKZXa2qmEgKV0Z3Ptdg0e/abWFAmH0z/DZFgW2TIQ="; permission_handler_windows = "sha256-9h0wEOgY6gtqaSyH9x2fbvH8Y0EfoVs/qNqwwI5d18k="; video_thumbnail = "sha256-7IbKg6bBA5D8ODwMNwJqIohTCbAox56TMgoI07CbrPw="; + flutter_map = "sha256-JsVh7wwyehhAkE+TIvThQ8iYx7icY76qm2Pwf/k0Z7M="; }; nativeBuildInputs = [ autoPatchelfHook ]; diff --git a/pkgs/by-name/bl/bluebubbles/pubspec.lock.json b/pkgs/by-name/bl/bluebubbles/pubspec.lock.json index 1f9cc645fdcd..adeb5b995349 100644 --- a/pkgs/by-name/bl/bluebubbles/pubspec.lock.json +++ b/pkgs/by-name/bl/bluebubbles/pubspec.lock.json @@ -1,4405 +1 @@ -{ - "packages": { - "_discoveryapis_commons": { - "dependency": "transitive", - "description": { - "name": "_discoveryapis_commons", - "sha256": "113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.7" - }, - "_fe_analyzer_shared": { - "dependency": "transitive", - "description": { - "name": "_fe_analyzer_shared", - "sha256": "16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "76.0.0" - }, - "_macros": { - "dependency": "transitive", - "description": "dart", - "source": "sdk", - "version": "0.3.3" - }, - "adaptive_theme": { - "dependency": "direct main", - "description": { - "name": "adaptive_theme", - "sha256": "caa49b4c73b681bf12a641dff77aa1383262a00cf38b9d1a25b180e275ba5ab9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.0" - }, - "analyzer": { - "dependency": "transitive", - "description": { - "name": "analyzer", - "sha256": "1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.11.0" - }, - "animated_size_and_fade": { - "dependency": "direct main", - "description": { - "name": "animated_size_and_fade", - "sha256": "1a013cb7cd9e1751d6b8a38e34e4d0732f010c2d6021acd2176a455ee3df4664", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "animated_stack_widget": { - "dependency": "transitive", - "description": { - "name": "animated_stack_widget", - "sha256": "ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.4" - }, - "animations": { - "dependency": "direct main", - "description": { - "name": "animations", - "sha256": "d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.11" - }, - "ansicolor": { - "dependency": "transitive", - "description": { - "name": "ansicolor", - "sha256": "50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "app_install_date": { - "dependency": "direct main", - "description": { - "name": "app_install_date", - "sha256": "0860b8feb129a97a2dae58e5d2dcfc274418ad803a80be35af83ad590daa4fe3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, - "app_links": { - "dependency": "direct main", - "description": { - "name": "app_links", - "sha256": "85ed8fc1d25a76475914fff28cc994653bd900bc2c26e4b57a49e097febb54ba", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.4.0" - }, - "app_links_linux": { - "dependency": "transitive", - "description": { - "name": "app_links_linux", - "sha256": "f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.3" - }, - "app_links_platform_interface": { - "dependency": "transitive", - "description": { - "name": "app_links_platform_interface", - "sha256": "05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "app_links_web": { - "dependency": "transitive", - "description": { - "name": "app_links_web", - "sha256": "af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "archive": { - "dependency": "direct main", - "description": { - "name": "archive", - "sha256": "0c64e928dcbefddecd234205422bcfc2b5e6d31be0b86fef0d0dd48d7b4c9742", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.4" - }, - "args": { - "dependency": "transitive", - "description": { - "name": "args", - "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.0" - }, - "asn1lib": { - "dependency": "transitive", - "description": { - "name": "asn1lib", - "sha256": "1c296cd268f486cabcc3930e9b93a8133169305f18d722916e675959a88f6d2c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.9" - }, - "async": { - "dependency": "transitive", - "description": { - "name": "async", - "sha256": "947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.11.0" - }, - "async_extension": { - "dependency": "transitive", - "description": { - "name": "async_extension", - "sha256": "1b8b3a7f3822a87bf804bcef5ef614effa0357d3ea69de35ff431f1007eb8ca9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.14" - }, - "async_task": { - "dependency": "direct main", - "description": { - "name": "async_task", - "sha256": "a0effde412fdb5d0b08d4329a75967a26d67e4b20055f928fe6e7ad8697222cd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "audio_waveforms": { - "dependency": "direct main", - "description": { - "name": "audio_waveforms", - "sha256": "658fef41bbab299184b65ba2fd749e8ec658c1f7d54a21f7cf97fa96b173b4ce", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "auto_size_text": { - "dependency": "direct main", - "description": { - "name": "auto_size_text", - "sha256": "3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "barcode": { - "dependency": "transitive", - "description": { - "name": "barcode", - "sha256": "7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.9" - }, - "bidi": { - "dependency": "transitive", - "description": { - "name": "bidi", - "sha256": "9a712c7ddf708f7c41b1923aa83648a3ed44cfd75b04f72d598c45e5be287f9d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.12" - }, - "bitsdojo_window": { - "dependency": "direct main", - "description": { - "name": "bitsdojo_window", - "sha256": "88ef7765dafe52d97d7a3684960fb5d003e3151e662c18645c1641c22b873195", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.6" - }, - "bitsdojo_window_linux": { - "dependency": "transitive", - "description": { - "name": "bitsdojo_window_linux", - "sha256": "9519c0614f98be733e0b1b7cb15b827007886f6fe36a4fb62cf3d35b9dd578ab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.4" - }, - "bitsdojo_window_macos": { - "dependency": "transitive", - "description": { - "name": "bitsdojo_window_macos", - "sha256": "f7c5be82e74568c68c5b8449e2c5d8fd12ec195ecd70745a7b9c0f802bb0268f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.4" - }, - "bitsdojo_window_platform_interface": { - "dependency": "transitive", - "description": { - "name": "bitsdojo_window_platform_interface", - "sha256": "65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2" - }, - "bitsdojo_window_windows": { - "dependency": "transitive", - "description": { - "name": "bitsdojo_window_windows", - "sha256": "fa982cf61ede53f483e50b257344a1c250af231a3cdc93a7064dd6dc0d720b68", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.6" - }, - "boolean_selector": { - "dependency": "transitive", - "description": { - "name": "boolean_selector", - "sha256": "6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "build": { - "dependency": "transitive", - "description": { - "name": "build", - "sha256": "cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.2" - }, - "build_cli_annotations": { - "dependency": "transitive", - "description": { - "name": "build_cli_annotations", - "sha256": "b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "build_config": { - "dependency": "transitive", - "description": { - "name": "build_config", - "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "build_daemon": { - "dependency": "transitive", - "description": { - "name": "build_daemon", - "sha256": "8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.4" - }, - "build_resolvers": { - "dependency": "transitive", - "description": { - "name": "build_resolvers", - "sha256": "b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.4" - }, - "build_runner": { - "dependency": "direct dev", - "description": { - "name": "build_runner", - "sha256": "058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.15" - }, - "build_runner_core": { - "dependency": "transitive", - "description": { - "name": "build_runner_core", - "sha256": "22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.0.0" - }, - "build_verify": { - "dependency": "direct dev", - "description": { - "name": "build_verify", - "sha256": "abbb9b9eda076854ac1678d284c053a5ec608e64da741d0801f56d4bbea27e23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0" - }, - "built_collection": { - "dependency": "transitive", - "description": { - "name": "built_collection", - "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "built_value": { - "dependency": "transitive", - "description": { - "name": "built_value", - "sha256": "ea90e81dc4a25a043d9bee692d20ed6d1c4a1662a28c03a96417446c093ed6b4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.9.5" - }, - "characters": { - "dependency": "transitive", - "description": { - "name": "characters", - "sha256": "04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "charcode": { - "dependency": "transitive", - "description": { - "name": "charcode", - "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, - "checked_yaml": { - "dependency": "transitive", - "description": { - "name": "checked_yaml", - "sha256": "feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "chunked_stream": { - "dependency": "direct main", - "description": { - "name": "chunked_stream", - "sha256": "b2fde5f81d780f0c1699b8347cae2e413412ae947fc6e64727cc48c6bb54c95c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.2" - }, - "cli_util": { - "dependency": "transitive", - "description": { - "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.2" - }, - "clock": { - "dependency": "transitive", - "description": { - "name": "clock", - "sha256": "cb6d7f03e1de671e34607e909a7213e31d7752be4fb66a86d29fe1eb14bfb5cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "code_builder": { - "dependency": "transitive", - "description": { - "name": "code_builder", - "sha256": "0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.10.1" - }, - "collection": { - "dependency": "direct main", - "description": { - "name": "collection", - "sha256": "a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.19.0" - }, - "confetti": { - "dependency": "direct main", - "description": { - "name": "confetti", - "sha256": "79376a99648efbc3f23582f5784ced0fe239922bd1a0fb41f582051eba750751", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.0" - }, - "connectivity_plus": { - "dependency": "direct main", - "description": { - "name": "connectivity_plus", - "sha256": "04bf81bb0b77de31557b58d052b24b3eee33f09a6e7a8c68a3e247c7df19ec27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.3" - }, - "connectivity_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "connectivity_plus_platform_interface", - "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "console": { - "dependency": "transitive", - "description": { - "name": "console", - "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, - "convert": { - "dependency": "transitive", - "description": { - "name": "convert", - "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.2" - }, - "coverage": { - "dependency": "transitive", - "description": { - "name": "coverage", - "sha256": "e3493833ea012784c740e341952298f1cc77f1f01b1bbc3eb4eecf6984fb7f43", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.11.1" - }, - "cronet_http": { - "dependency": "transitive", - "description": { - "name": "cronet_http", - "sha256": "3af9c4d57bf07ef4b307e77b22be4ad61bea19ee6ff65e62184863f3a09f1415", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.2" - }, - "crop_your_image": { - "dependency": "direct main", - "description": { - "name": "crop_your_image", - "sha256": "14c8977b11a009dc5e73e0f6522970f93363e38183f1b2ffefe1676dc9c3f49d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "cross_file": { - "dependency": "transitive", - "description": { - "name": "cross_file", - "sha256": "7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.4+2" - }, - "crypto": { - "dependency": "transitive", - "description": { - "name": "crypto", - "sha256": "1e445881f28f22d6140f181e07737b22f1e099a5e1ff94b0af2f9e4a463f4855", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.6" - }, - "crypto_keys": { - "dependency": "transitive", - "description": { - "name": "crypto_keys", - "sha256": "acc19abf34623d990a0e8aec69463d74a824c31f137128f42e2810befc509ad0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0+1" - }, - "csslib": { - "dependency": "direct main", - "description": { - "name": "csslib", - "sha256": "09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "csv": { - "dependency": "transitive", - "description": { - "name": "csv", - "sha256": "c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "cupertino_http": { - "dependency": "transitive", - "description": { - "name": "cupertino_http", - "sha256": "5a043ec21fd7f56b24c549fd293a7fc60bba899509246cd0ffc2a91cb78c9be2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "cupertino_icons": { - "dependency": "direct main", - "description": { - "name": "cupertino_icons", - "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.8" - }, - "dart_earcut": { - "dependency": "transitive", - "description": { - "name": "dart_earcut", - "sha256": "e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "dart_ping": { - "dependency": "transitive", - "description": { - "name": "dart_ping", - "sha256": "2f5418d0a5c64e53486caaac78677b25725b1e13c33c5be834ce874ea18bd24f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.0.1" - }, - "dart_style": { - "dependency": "transitive", - "description": { - "name": "dart_style", - "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.8" - }, - "dbus": { - "dependency": "transitive", - "description": { - "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.11" - }, - "defer_pointer": { - "dependency": "direct main", - "description": { - "name": "defer_pointer", - "sha256": "d69e6f8c1d0f052d2616cc1db3782e0ea73f42e4c6f6122fd1a548dfe79faf02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.2" - }, - "desktop_webview_auth": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "webkit2gtk-4.1", - "resolved-ref": "7210ff6a4975d1e877c9ccfaa6ecb7a18013f0b7", - "url": "https://github.com/BlueBubblesApp/flutter_desktop_webview_auth.git" - }, - "source": "git", - "version": "0.0.15" - }, - "device_info_plus": { - "dependency": "direct main", - "description": { - "name": "device_info_plus", - "sha256": "72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.3.0" - }, - "device_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "device_info_plus_platform_interface", - "sha256": "0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.2" - }, - "dice_bear": { - "dependency": "direct main", - "description": { - "name": "dice_bear", - "sha256": "4dde957ee3838f1de82aeff43c68f8e976f102ed9b5cb3be2ba1abe243a109af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.7" - }, - "dio": { - "dependency": "direct main", - "description": { - "name": "dio", - "sha256": "253a18bbd4851fecba42f7343a1df3a9a4c1d31a2c1b37e221086b4fa8c8dbc9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.0+1" - }, - "dio_web_adapter": { - "dependency": "transitive", - "description": { - "name": "dio_web_adapter", - "sha256": "7586e476d70caecaf1686d21eee7247ea43ef5c345eab9e0cc3583ff13378d78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "disable_battery_optimization": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "996c83bf5f58522ba8da3ce6f44952be7b68171c", - "resolved-ref": "996c83bf5f58522ba8da3ce6f44952be7b68171c", - "url": "https://github.com/BlueBubblesApp/Disable-Battery-Optimizations.git" - }, - "source": "git", - "version": "1.1.1" - }, - "dlibphonenumber": { - "dependency": "direct main", - "description": { - "name": "dlibphonenumber", - "sha256": "8d6ebe4e941a43268ed977c2f7d331e6d8d0d2fb92a4236efcc5e38c0b1cd964", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.34" - }, - "dynamic_color": { - "dependency": "direct main", - "description": { - "name": "dynamic_color", - "sha256": "eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.7.0" - }, - "easy_debounce": { - "dependency": "direct main", - "description": { - "name": "easy_debounce", - "sha256": "f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "emoji_picker_flutter": { - "dependency": "direct main", - "description": { - "name": "emoji_picker_flutter", - "sha256": "9a44c102079891ea5877f78c70f2e3c6e9df7b7fe0a01757d31f1046eeaa016d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.3.0" - }, - "encrypt": { - "dependency": "direct main", - "description": { - "name": "encrypt", - "sha256": "62d9aa4670cc2a8798bab89b39fc71b6dfbacf615de6cf5001fb39f7e4a996a2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.3" - }, - "equatable": { - "dependency": "transitive", - "description": { - "name": "equatable", - "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.7" - }, - "exif": { - "dependency": "direct main", - "description": { - "name": "exif", - "sha256": "a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.0" - }, - "expressions": { - "dependency": "transitive", - "description": { - "name": "expressions", - "sha256": "308a621b602923dd8a0cf3072793b24850d06453eb49c6b698cbda41a282e904", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.5+2" - }, - "extended_image": { - "dependency": "transitive", - "description": { - "name": "extended_image", - "sha256": "69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.3.1" - }, - "extended_image_library": { - "dependency": "transitive", - "description": { - "name": "extended_image_library", - "sha256": "e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.6" - }, - "fake_async": { - "dependency": "transitive", - "description": { - "name": "fake_async", - "sha256": "511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "faker": { - "dependency": "direct main", - "description": { - "name": "faker", - "sha256": "544c34e9e1d322824156d5a8d451bc1bb778263b892aded24ec7ba77b0706624", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "fast_contacts": { - "dependency": "direct main", - "description": { - "name": "fast_contacts", - "sha256": "69b7c2208f9da3666c1577191b3d8f6193c90567eb0a9dfead8e59607caebe87", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "ffi": { - "dependency": "transitive", - "description": { - "name": "ffi", - "sha256": "16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.3" - }, - "file": { - "dependency": "transitive", - "description": { - "name": "file", - "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.1" - }, - "file_picker": { - "dependency": "direct main", - "description": { - "name": "file_picker", - "sha256": "8d938fd5c11dc81bf1acd4f7f0486c683fe9e79a0b13419e27730f9ce4d8a25b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.2.1" - }, - "file_selector_linux": { - "dependency": "transitive", - "description": { - "name": "file_selector_linux", - "sha256": "54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.3+2" - }, - "file_selector_macos": { - "dependency": "transitive", - "description": { - "name": "file_selector_macos", - "sha256": "271ab9986df0c135d45c3cdb6bd0faa5db6f4976d3e4b437cf7d0f258d941bfc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.4+2" - }, - "file_selector_platform_interface": { - "dependency": "transitive", - "description": { - "name": "file_selector_platform_interface", - "sha256": "a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.6.2" - }, - "file_selector_windows": { - "dependency": "transitive", - "description": { - "name": "file_selector_windows", - "sha256": "320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.3+4" - }, - "firebase_dart": { - "dependency": "direct main", - "description": { - "path": "packages/firebase_dart", - "ref": "beb79f70a2bb0e96e6bb9fdebac2ff452f138950", - "resolved-ref": "beb79f70a2bb0e96e6bb9fdebac2ff452f138950", - "url": "https://github.com/appsup-dart/firebase_dart.git" - }, - "source": "git", - "version": "1.0.11" - }, - "fixnum": { - "dependency": "transitive", - "description": { - "name": "fixnum", - "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "flat_buffers": { - "dependency": "transitive", - "description": { - "name": "flat_buffers", - "sha256": "380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "23.5.26" - }, - "flex_color_picker": { - "dependency": "direct main", - "description": { - "name": "flex_color_picker", - "sha256": "c083b79f1c57eaeed9f464368be376951230b3cb1876323b784626152a86e480", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.7.0" - }, - "flex_color_scheme": { - "dependency": "direct main", - "description": { - "name": "flex_color_scheme", - "sha256": "ae638050fceb35b6040a43cf67892f9b956022068e736284919d93322fdd4ba2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.1.1" - }, - "flex_seed_scheme": { - "dependency": "transitive", - "description": { - "name": "flex_seed_scheme", - "sha256": "b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.5.1" - }, - "flutter": { - "dependency": "direct main", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_acrylic": { - "dependency": "direct main", - "description": { - "name": "flutter_acrylic", - "sha256": "b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.4" - }, - "flutter_audio_waveforms": { - "dependency": "direct main", - "description": { - "name": "flutter_audio_waveforms", - "sha256": "425dda9ee5ef9bb2ff2a2000b19ec595593b3baba6a1274da8d1d729846a144b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1+8" - }, - "flutter_displaymode": { - "dependency": "direct main", - "description": { - "name": "flutter_displaymode", - "sha256": "42c5e9abd13d28ed74f701b60529d7f8416947e58256e6659c5550db719c57ef", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "flutter_dotenv": { - "dependency": "direct main", - "description": { - "name": "flutter_dotenv", - "sha256": "b7c7be5cd9f6ef7a78429cabd2774d3c4af50e79cb2b7593e3d5d763ef95c61b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.2.1" - }, - "flutter_image_compress": { - "dependency": "direct main", - "description": { - "name": "flutter_image_compress", - "sha256": "51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "flutter_image_compress_common": { - "dependency": "transitive", - "description": { - "name": "flutter_image_compress_common", - "sha256": "c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.6" - }, - "flutter_image_compress_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_image_compress_macos", - "sha256": "20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.3" - }, - "flutter_image_compress_ohos": { - "dependency": "transitive", - "description": { - "name": "flutter_image_compress_ohos", - "sha256": "e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.3" - }, - "flutter_image_compress_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_image_compress_platform_interface", - "sha256": "579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "flutter_image_compress_web": { - "dependency": "transitive", - "description": { - "name": "flutter_image_compress_web", - "sha256": "b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, - "flutter_improved_scrolling": { - "dependency": "direct main", - "description": { - "name": "flutter_improved_scrolling", - "sha256": "46aec4599cdec31f1cd481d6614a9de98a6d6bff865f1d5fae3d7de9b5b7f74f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.3" - }, - "flutter_isolate": { - "dependency": "direct main", - "description": { - "name": "flutter_isolate", - "sha256": "36a84e1a22371d8092ea2121145b330c24fb272acb951fb30c60ba44926b8fb3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "flutter_keyboard_visibility": { - "dependency": "direct main", - "description": { - "name": "flutter_keyboard_visibility", - "sha256": "98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "flutter_keyboard_visibility_linux": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_linux", - "sha256": "6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_keyboard_visibility_macos": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_macos", - "sha256": "c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_keyboard_visibility_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_platform_interface", - "sha256": "e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "flutter_keyboard_visibility_web": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_web", - "sha256": "d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "flutter_keyboard_visibility_windows": { - "dependency": "transitive", - "description": { - "name": "flutter_keyboard_visibility_windows", - "sha256": "fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_launcher_icons": { - "dependency": "direct dev", - "description": { - "name": "flutter_launcher_icons", - "sha256": "bfa04787c85d80ecb3f8777bde5fc10c3de809240c48fa061a2c2bf15ea5211c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.14.3" - }, - "flutter_lints": { - "dependency": "direct dev", - "description": { - "name": "flutter_lints", - "sha256": "5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.0" - }, - "flutter_local_notifications": { - "dependency": "direct main", - "description": { - "name": "flutter_local_notifications", - "sha256": "d59eeafd6df92174b1d5f68fc9d66634c97ce2e7cfe2293476236547bb19bbbd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "19.0.0" - }, - "flutter_local_notifications_linux": { - "dependency": "transitive", - "description": { - "name": "flutter_local_notifications_linux", - "sha256": "e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "flutter_local_notifications_platform_interface": { - "dependency": "transitive", - "description": { - "name": "flutter_local_notifications_platform_interface", - "sha256": "2569b973fc9d1f63a37410a9f7c1c552081226c597190cb359ef5d5762d1631c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.0.0" - }, - "flutter_local_notifications_windows": { - "dependency": "transitive", - "description": { - "name": "flutter_local_notifications_windows", - "sha256": "f8fc0652a601f83419d623c85723a3e82ad81f92b33eaa9bcc21ea1b94773e6e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "flutter_map": { - "dependency": "direct main", - "description": { - "name": "flutter_map", - "sha256": "2ecb34619a4be19df6f40c2f8dce1591675b4eff7a6857bd8f533706977385da", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.2" - }, - "flutter_map_marker_popup": { - "dependency": "direct main", - "description": { - "name": "flutter_map_marker_popup", - "sha256": "a7540538114b5d1627ab67b498273d66bc36090385412ae49ef215af4a2861c5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "flutter_markdown": { - "dependency": "direct main", - "description": { - "name": "flutter_markdown", - "sha256": "e7bbc718adc9476aa14cfddc1ef048d2e21e4e8f18311aaac723266db9f9e7b5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.6+2" - }, - "flutter_native_splash": { - "dependency": "direct dev", - "description": { - "name": "flutter_native_splash", - "sha256": "7062602e0dbd29141fb8eb19220b5871ca650be5197ab9c1f193a28b17537bc7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.4" - }, - "flutter_plugin_android_lifecycle": { - "dependency": "transitive", - "description": { - "name": "flutter_plugin_android_lifecycle", - "sha256": "5a1e6fb2c0561958d7e4c33574674bda7b77caaca7a33b758876956f2902eea3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.27" - }, - "flutter_slidable": { - "dependency": "direct main", - "description": { - "name": "flutter_slidable", - "sha256": "ab7dbb16f783307c9d7762ede2593ce32c220ba2ba0fd540a3db8e9a3acba71a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "flutter_sliding_up_panel": { - "dependency": "direct main", - "description": { - "name": "flutter_sliding_up_panel", - "sha256": "94f928973d83e146bbc52051e2d9f2a7ed7a5c9e7f04b54d835fff2e41d6cb99", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "flutter_staggered_grid_view": { - "dependency": "direct main", - "description": { - "name": "flutter_staggered_grid_view", - "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "flutter_svg": { - "dependency": "direct main", - "description": { - "name": "flutter_svg", - "sha256": "c200fd79c918a40c5cd50ea0877fa13f81bdaf6f0a5d3dbcc2a13e3285d6aa1b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.17" - }, - "flutter_test": { - "dependency": "direct dev", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "flutter_timezone": { - "dependency": "direct main", - "description": { - "name": "flutter_timezone", - "sha256": "bc286cecb0366d88e6c4644e3962ebd1ce1d233abc658eb1e0cd803389f84b64", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, - "flutter_web_plugins": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "frontend_server_client": { - "dependency": "transitive", - "description": { - "name": "frontend_server_client", - "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "geolocator": { - "dependency": "direct main", - "description": { - "name": "geolocator", - "sha256": "afebc912cbe6496e8823e064ca519afb5610072bb9c4a9feea715f6feb4f7f28", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "13.0.3" - }, - "geolocator_android": { - "dependency": "transitive", - "description": { - "name": "geolocator_android", - "sha256": "fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.6.2" - }, - "geolocator_apple": { - "dependency": "transitive", - "description": { - "name": "geolocator_apple", - "sha256": "419e50f754281d3606750af07b198ecfe938e8648d3e30a898d3ac342ab717e6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.12" - }, - "geolocator_platform_interface": { - "dependency": "transitive", - "description": { - "name": "geolocator_platform_interface", - "sha256": "722db30c0a2caa82a59d6655f04ef0a492da003036b880342cc67e6f1abc188f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.2.5" - }, - "geolocator_web": { - "dependency": "transitive", - "description": { - "name": "geolocator_web", - "sha256": "e54434b2ce9c677759a188d7e32e950802f79a9e9f45728239404bece0f1bd8d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "geolocator_windows": { - "dependency": "transitive", - "description": { - "name": "geolocator_windows", - "sha256": "4862e798b8a84ec300531888e7acd137b74637636069df230d79fabd110e2734", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.4" - }, - "gesture_x_detector": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "7de6e023ff68f67af1d83f7c1303d8b973f84944", - "resolved-ref": "7de6e023ff68f67af1d83f7c1303d8b973f84944", - "url": "https://github.com/BlueBubblesApp/xgesture_flutter.git" - }, - "source": "git", - "version": "1.1.1" - }, - "get": { - "dependency": "direct main", - "description": { - "name": "get", - "sha256": "c79eeb4339f1f3deffd9ec912f8a923834bec55f7b49c9e882b8fef2c139d425", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.7.2" - }, - "get_it": { - "dependency": "transitive", - "description": { - "name": "get_it", - "sha256": "d85128a5dae4ea777324730dc65edd9c9f43155c109d5cc0a69cab74139fbac1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.7.0" - }, - "git": { - "dependency": "transitive", - "description": { - "name": "git", - "sha256": "de678c6f0d5e2761c2c3643d31b1010883cc4d3e352949ef7c15f98f27d676ea", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.1" - }, - "github": { - "dependency": "direct main", - "description": { - "name": "github", - "sha256": "57f6ad78591f9638e903409977443093f862d25062a6b582a3c89e4ae44e4814", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.24.0" - }, - "glob": { - "dependency": "transitive", - "description": { - "name": "glob", - "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.3" - }, - "globbing": { - "dependency": "transitive", - "description": { - "name": "globbing", - "sha256": "4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "google_fonts": { - "dependency": "direct main", - "description": { - "name": "google_fonts", - "sha256": "b1ac0fe2832c9cc95e5e88b57d627c5e68c223b9657f4b96e1487aa9098c7b82", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.1" - }, - "google_identity_services_web": { - "dependency": "transitive", - "description": { - "name": "google_identity_services_web", - "sha256": "55580f436822d64c8ff9a77e37d61f5fb1e6c7ec9d632a43ee324e2a05c3c6c9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.3" - }, - "google_ml_kit": { - "dependency": "direct main", - "description": { - "name": "google_ml_kit", - "sha256": "52a89712eeccb80a42a7de78d813ca7cc1988fb21d6e7011403ac627ce104eab", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.19.0" - }, - "google_mlkit_barcode_scanning": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_barcode_scanning", - "sha256": "5852d1daa007a05b33f99e3e3fa34227c49d9c41bc92a85d820666a57fd5c35f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.0" - }, - "google_mlkit_commons": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_commons", - "sha256": "7e9a6d6e66b44aa8cfe944bda9bc3346c52486dd890ca49e5bc98845cda40d7f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0" - }, - "google_mlkit_digital_ink_recognition": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_digital_ink_recognition", - "sha256": "11ea94f71062ad2a784aeda7716b16a0e641878b0ddfaa930be23bcff90a6bd7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.0" - }, - "google_mlkit_entity_extraction": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_entity_extraction", - "sha256": "36e1f5b053c56a4d2919931d75bd73dc37e4c8b68f8e8ebeb2aa99b1bdba4de2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.14.0" - }, - "google_mlkit_face_detection": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_face_detection", - "sha256": "65988405c884fd84a4ccc8bded7b5e3e4c33362f6f4eaaa94818bdaaba7bab7d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.0" - }, - "google_mlkit_face_mesh_detection": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_face_mesh_detection", - "sha256": "aa2659c03f46cf69510a998e0bd14f23b9d3c7b0c9b1fe1050656ad80d6e24bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0" - }, - "google_mlkit_image_labeling": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_image_labeling", - "sha256": "9251c91c9281378a4716bb96dc0d3c9f54c0f809577aaba47ef24c52941dc859", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.0" - }, - "google_mlkit_language_id": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_language_id", - "sha256": "80446a42cf5f9daf39f28489b2b38ce883aa9e3daadd73e1fe1591022507248a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.0" - }, - "google_mlkit_object_detection": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_object_detection", - "sha256": "56f196c03a1a7b0986efac0e48ab4b82a35645de3f1f2eebc08e308ad93db469", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.14.0" - }, - "google_mlkit_pose_detection": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_pose_detection", - "sha256": "05c4a6eaab12e575a55c83b357d76c1f694be5caf1dc8d5229a18327712f6685", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.13.0" - }, - "google_mlkit_selfie_segmentation": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_selfie_segmentation", - "sha256": "f2ff57b9d5ea0029a31ec14d038ff64d35c19b15de3b01bd517513f8c23cb779", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0" - }, - "google_mlkit_smart_reply": { - "dependency": "direct main", - "description": { - "name": "google_mlkit_smart_reply", - "sha256": "5a54de1b38e65a476c05605440691043befd3444570457d85f744c71154ef038", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.0" - }, - "google_mlkit_text_recognition": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_text_recognition", - "sha256": "e7609cec8de3022680a36ead8a8bafa9fd2360ea018a728feaad12dcb0e3c177", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.14.0" - }, - "google_mlkit_translation": { - "dependency": "transitive", - "description": { - "name": "google_mlkit_translation", - "sha256": "826cfe74fbee8f455d987949782e1873f50d79c1f2a971848e3f8dde851290d4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.0" - }, - "google_sign_in": { - "dependency": "direct main", - "description": { - "name": "google_sign_in", - "sha256": "d0a2c3bcb06e607bb11e4daca48bd4b6120f0bbc4015ccebbe757d24ea60ed2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "google_sign_in_android": { - "dependency": "transitive", - "description": { - "name": "google_sign_in_android", - "sha256": "4e52c64366bdb3fe758f683b088ee514cc7a95e69c52b5ee9fc5919e1683d21b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.2.0" - }, - "google_sign_in_ios": { - "dependency": "transitive", - "description": { - "name": "google_sign_in_ios", - "sha256": "29cd125f58f50ceb40e8253d3c0209e321eee3e5df16cd6d262495f7cad6a2bd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.8.1" - }, - "google_sign_in_platform_interface": { - "dependency": "transitive", - "description": { - "name": "google_sign_in_platform_interface", - "sha256": "5f6f79cf139c197261adb6ac024577518ae48fdff8e53205c5373b5f6430a8aa", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.0" - }, - "google_sign_in_web": { - "dependency": "transitive", - "description": { - "name": "google_sign_in_web", - "sha256": "460547beb4962b7623ac0fb8122d6b8268c951cf0b646dd150d60498430e4ded", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.4+4" - }, - "googleapis": { - "dependency": "transitive", - "description": { - "name": "googleapis", - "sha256": "dfea9984f0785ed445ba78e2aa8c55dadd86d6a60ea9e0ffbadad51edb5e7e36", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.2.0" - }, - "googleapis_auth": { - "dependency": "transitive", - "description": { - "name": "googleapis_auth", - "sha256": "befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.0" - }, - "graphs": { - "dependency": "transitive", - "description": { - "name": "graphs", - "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "gtk": { - "dependency": "transitive", - "description": { - "name": "gtk", - "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "hand_signature": { - "dependency": "direct main", - "description": { - "name": "hand_signature", - "sha256": "e007153776b9558234761150b6b3ae98a6b3008e9b824da9911475794a982994", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.3" - }, - "hashcodes": { - "dependency": "transitive", - "description": { - "name": "hashcodes", - "sha256": "80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "hive": { - "dependency": "transitive", - "description": { - "name": "hive", - "sha256": "8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.3" - }, - "html": { - "dependency": "transitive", - "description": { - "name": "html", - "sha256": "1fc58edeaec4307368c60d59b7e15b9d658b57d7f3125098b6294153c75337ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.5" - }, - "http": { - "dependency": "direct overridden", - "description": { - "name": "http", - "sha256": "fe7ab022b76f3034adc518fb6ea04a82387620e19977665ea18d30a1cf43442f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "http_client_helper": { - "dependency": "transitive", - "description": { - "name": "http_client_helper", - "sha256": "8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "http_multi_server": { - "dependency": "transitive", - "description": { - "name": "http_multi_server", - "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, - "http_parser": { - "dependency": "transitive", - "description": { - "name": "http_parser", - "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.2" - }, - "http_profile": { - "dependency": "transitive", - "description": { - "name": "http_profile", - "sha256": "7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0" - }, - "idb_shim": { - "dependency": "direct main", - "description": { - "name": "idb_shim", - "sha256": "9e7ec816139bfafb69ae4b3668ad29dbd43c53428d6eb31f9332d42bd4fa7205", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.6.1+7" - }, - "image": { - "dependency": "direct main", - "description": { - "name": "image", - "sha256": "13d3349ace88f12f4a0d175eb5c12dcdd39d35c4c109a8a13dfeb6d0bd9e31c3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.3" - }, - "image_picker": { - "dependency": "direct main", - "description": { - "name": "image_picker", - "sha256": "021834d9c0c3de46bf0fe40341fa07168407f694d9b2bb18d532dc1261867f7a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "image_picker_android": { - "dependency": "transitive", - "description": { - "name": "image_picker_android", - "sha256": "8bd392ba8b0c8957a157ae0dc9fcf48c58e6c20908d5880aea1d79734df090e9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.12+22" - }, - "image_picker_for_web": { - "dependency": "transitive", - "description": { - "name": "image_picker_for_web", - "sha256": "717eb042ab08c40767684327be06a5d8dbb341fe791d514e4b92c7bbe1b7bb83", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.6" - }, - "image_picker_ios": { - "dependency": "transitive", - "description": { - "name": "image_picker_ios", - "sha256": "05da758e67bc7839e886b3959848aa6b44ff123ab4b28f67891008afe8ef9100", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.8.12+2" - }, - "image_picker_linux": { - "dependency": "transitive", - "description": { - "name": "image_picker_linux", - "sha256": "34a65f6740df08bbbeb0a1abd8e6d32107941fd4868f67a507b25601651022c9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+2" - }, - "image_picker_macos": { - "dependency": "transitive", - "description": { - "name": "image_picker_macos", - "sha256": "1b90ebbd9dcf98fb6c1d01427e49a55bd96b5d67b8c67cf955d60a5de74207c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+2" - }, - "image_picker_platform_interface": { - "dependency": "transitive", - "description": { - "name": "image_picker_platform_interface", - "sha256": "886d57f0be73c4b140004e78b9f28a8914a09e50c2d816bdd0520051a71236a0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.10.1" - }, - "image_picker_windows": { - "dependency": "transitive", - "description": { - "name": "image_picker_windows", - "sha256": "6ad07afc4eb1bc25f3a01084d28520496c4a3bb0cb13685435838167c9dcedeb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.1+1" - }, - "image_size_getter": { - "dependency": "direct main", - "description": { - "name": "image_size_getter", - "sha256": "9a299e3af2ebbcfd1baf21456c3c884037ff524316c97d8e56035ea8fdf35653", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "in_app_review": { - "dependency": "direct main", - "description": { - "name": "in_app_review", - "sha256": "36a06771b88fb0e79985b15e7f2ac0f1142e903fe72517f3c055d78bc3bc1819", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.10" - }, - "in_app_review_platform_interface": { - "dependency": "transitive", - "description": { - "name": "in_app_review_platform_interface", - "sha256": "fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.5" - }, - "infinite_listview": { - "dependency": "transitive", - "description": { - "name": "infinite_listview", - "sha256": "f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "internet_connection_checker_plus": { - "dependency": "direct main", - "description": { - "name": "internet_connection_checker_plus", - "sha256": "eb3a6f03e7b1641589f580993d29aee0b3c4920fc618f7556de359fedb87b02e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.1" - }, - "intl": { - "dependency": "direct main", - "description": { - "name": "intl", - "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.20.2" - }, - "io": { - "dependency": "transitive", - "description": { - "name": "io", - "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "irondash_engine_context": { - "dependency": "transitive", - "description": { - "name": "irondash_engine_context", - "sha256": "cd7b769db11a2b5243b037c8a9b1ecaef02e1ae27a2d909ffa78c1dad747bb10", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.4" - }, - "irondash_message_channel": { - "dependency": "transitive", - "description": { - "name": "irondash_message_channel", - "sha256": "b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.0" - }, - "jni": { - "dependency": "transitive", - "description": { - "name": "jni", - "sha256": "f377c585ea9c08d48b427dc2e03780af2889d1bb094440da853c6883c1acba4b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.1" - }, - "jose": { - "dependency": "transitive", - "description": { - "name": "jose", - "sha256": "7955ec5d131960104e81fbf151abacb9d835c16c9e793ed394b2809f28b2198d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.4" - }, - "js": { - "dependency": "direct overridden", - "description": { - "name": "js", - "sha256": "53385261521cc4a0c4658fd0ad07a7d14591cf8fc33abbceae306ddb974888dc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.2" - }, - "json_annotation": { - "dependency": "transitive", - "description": { - "name": "json_annotation", - "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.9.0" - }, - "languagetool_textfield": { - "dependency": "direct main", - "description": { - "name": "languagetool_textfield", - "sha256": "53ae4016e0544daadae3594cb4a55e2c40fc3d533b6a64df9d0df1ede55c4437", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, - "latlong2": { - "dependency": "transitive", - "description": { - "name": "latlong2", - "sha256": "98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.1" - }, - "launch_at_startup": { - "dependency": "direct main", - "description": { - "name": "launch_at_startup", - "sha256": "1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "leak_tracker": { - "dependency": "transitive", - "description": { - "name": "leak_tracker", - "sha256": "7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.0.7" - }, - "leak_tracker_flutter_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_flutter_testing", - "sha256": "9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.8" - }, - "leak_tracker_testing": { - "dependency": "transitive", - "description": { - "name": "leak_tracker_testing", - "sha256": "6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "lints": { - "dependency": "transitive", - "description": { - "name": "lints", - "sha256": "c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.1" - }, - "lists": { - "dependency": "transitive", - "description": { - "name": "lists", - "sha256": "4ca5c19ae4350de036a7e996cdd1ee39c93ac0a2b840f4915459b7d0a7d4ab27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "local_auth": { - "dependency": "direct main", - "description": { - "name": "local_auth", - "sha256": "434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "local_auth_android": { - "dependency": "transitive", - "description": { - "name": "local_auth_android", - "sha256": "0abe4e72f55c785b28900de52a2522c86baba0988838b5dc22241b072ecccd74", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.48" - }, - "local_auth_darwin": { - "dependency": "transitive", - "description": { - "name": "local_auth_darwin", - "sha256": "630996cd7b7f28f5ab92432c4b35d055dd03a747bc319e5ffbb3c4806a3e50d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.3" - }, - "local_auth_platform_interface": { - "dependency": "transitive", - "description": { - "name": "local_auth_platform_interface", - "sha256": "1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.10" - }, - "local_auth_windows": { - "dependency": "transitive", - "description": { - "name": "local_auth_windows", - "sha256": "bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.11" - }, - "local_notifier": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "838278324c1ce007303e45111e57c4a9b3ac01f1", - "resolved-ref": "838278324c1ce007303e45111e57c4a9b3ac01f1", - "url": "https://github.com/BlueBubblesApp/local_notifier.git" - }, - "source": "git", - "version": "0.1.6" - }, - "logger": { - "dependency": "direct main", - "description": { - "name": "logger", - "sha256": "be4b23575aac7ebf01f225a241eb7f6b5641eeaf43c6a8613510fc2f8cf187d1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.0" - }, - "logging": { - "dependency": "transitive", - "description": { - "name": "logging", - "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "macos_window_utils": { - "dependency": "transitive", - "description": { - "name": "macos_window_utils", - "sha256": "3534f2af024f2f24112ca28789a44e6750083f8c0065414546c6593ee48a5009", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.6.1" - }, - "macros": { - "dependency": "transitive", - "description": { - "name": "macros", - "sha256": "1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3-main.0" - }, - "maps_launcher": { - "dependency": "direct main", - "description": { - "name": "maps_launcher", - "sha256": "dac4c609720211fa6336b5903d917fe45e545c6b5665978efc3db2a3f436b1ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0+1" - }, - "markdown": { - "dependency": "transitive", - "description": { - "name": "markdown", - "sha256": "935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.3.0" - }, - "matcher": { - "dependency": "transitive", - "description": { - "name": "matcher", - "sha256": "d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.12.16+1" - }, - "material_color_utilities": { - "dependency": "direct main", - "description": { - "name": "material_color_utilities", - "sha256": "f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.11.1" - }, - "media_kit": { - "dependency": "direct main", - "description": { - "name": "media_kit", - "sha256": "1f1deee148533d75129a6f38251ff8388e33ee05fc2d20a6a80e57d6051b7b62", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.11" - }, - "media_kit_libs_android_video": { - "dependency": "direct main", - "description": { - "name": "media_kit_libs_android_video", - "sha256": "9dd8012572e4aff47516e55f2597998f0a378e3d588d0fad0ca1f11a53ae090c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.6" - }, - "media_kit_libs_linux": { - "dependency": "direct main", - "description": { - "name": "media_kit_libs_linux", - "sha256": "e186891c31daa6bedab4d74dcdb4e8adfccc7d786bfed6ad81fe24a3b3010310", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "media_kit_libs_windows_video": { - "dependency": "direct main", - "description": { - "name": "media_kit_libs_windows_video", - "sha256": "32654572167825c42c55466f5d08eee23ea11061c84aa91b09d0e0f69bdd0887", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.10" - }, - "media_kit_native_event_loop": { - "dependency": "direct main", - "description": { - "name": "media_kit_native_event_loop", - "sha256": "7d82e3b3e9ded5c35c3146c5ba1da3118d1dd8ac3435bac7f29f458181471b40", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.9" - }, - "media_kit_video": { - "dependency": "direct main", - "description": { - "name": "media_kit_video", - "sha256": "2cc3b966679963ba25a4ce5b771e532a521ebde7c6aa20e9802bec95d9916c8f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.5" - }, - "menu_base": { - "dependency": "transitive", - "description": { - "name": "menu_base", - "sha256": "820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.1" - }, - "meta": { - "dependency": "transitive", - "description": { - "name": "meta", - "sha256": "bdb68674043280c3428e9ec998512fb681678676b3c54e773629ffe74419f8c7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.15.0" - }, - "metadata_fetch": { - "dependency": "direct main", - "description": { - "name": "metadata_fetch", - "sha256": "24a713eaddbebea3dc3036a6c1d6f7c57e187fff5f0ef07be3e3ebbb7820c3e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.2" - }, - "mgrs_dart": { - "dependency": "transitive", - "description": { - "name": "mgrs_dart", - "sha256": "fb89ae62f05fa0bb90f70c31fc870bcbcfd516c843fb554452ab3396f78586f7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "mime": { - "dependency": "transitive", - "description": { - "name": "mime", - "sha256": "41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "mime_type": { - "dependency": "direct main", - "description": { - "name": "mime_type", - "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "mobile_scanner": { - "dependency": "direct main", - "description": { - "name": "mobile_scanner", - "sha256": "9cb9e371ee9b5b548714f9ab5fd33b530d799745c83d5729ecd1e8ab2935dbd1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.7" - }, - "msix": { - "dependency": "direct main", - "description": { - "name": "msix", - "sha256": "c50d6bd1aafe0d071a3c1e5a5ccb056404502935cb0a549e3178c4aae16caf33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.16.8" - }, - "multi_value_listenable_builder": { - "dependency": "direct main", - "description": { - "name": "multi_value_listenable_builder", - "sha256": "5d073a5ab4935c3eab7134dec939544467bdf8a71ab24d01f0dcc3f94f03a71e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.2" - }, - "multicast_dns": { - "dependency": "transitive", - "description": { - "name": "multicast_dns", - "sha256": "0a568c8411ab0979ab8cd4af1c29b6d316d854ab81592463ccceb92b35fde813", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2+8" - }, - "native_dio_adapter": { - "dependency": "direct main", - "description": { - "name": "native_dio_adapter", - "sha256": "7420bc9517b2abe09810199a19924617b45690a44ecfb0616ac9babc11875c03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, - "nested": { - "dependency": "transitive", - "description": { - "name": "nested", - "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "network_info_plus": { - "dependency": "direct main", - "description": { - "name": "network_info_plus", - "sha256": "08f4166bbb77da9e407edef6322a33f87b18c0ca46483fb25606cb3d2bfcdd2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.3" - }, - "network_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "network_info_plus_platform_interface", - "sha256": "7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "network_tools": { - "dependency": "direct main", - "description": { - "name": "network_tools", - "sha256": "c48cb49b0e20e968c83147725e1d941544296b8414987a8a4bb7dd9dd664d443", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.6" - }, - "nm": { - "dependency": "transitive", - "description": { - "name": "nm", - "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.0" - }, - "node_preamble": { - "dependency": "transitive", - "description": { - "name": "node_preamble", - "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "numberpicker": { - "dependency": "direct main", - "description": { - "name": "numberpicker", - "sha256": "4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "objectbox": { - "dependency": "direct main", - "description": { - "name": "objectbox", - "sha256": "ea823f4bf1d0a636e7aa50b43daabb64dd0fbd80b85a033016ccc1bc4f76f432", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.3" - }, - "objectbox_flutter_libs": { - "dependency": "direct main", - "description": { - "name": "objectbox_flutter_libs", - "sha256": "c91350bbbce5e6c2038255760b5be988faead004c814f833c2cd137445c6ae70", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.3" - }, - "objectbox_generator": { - "dependency": "direct dev", - "description": { - "name": "objectbox_generator", - "sha256": "96da521f2cef455cd524f8854e31d64495c50711ad5f1e2cf3142a8e527bc75f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.3" - }, - "objective_c": { - "dependency": "transitive", - "description": { - "name": "objective_c", - "sha256": "49e569fac1202d7fee1655fbbdfbf228840e11416be592bce2a6797b23de8231", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "on_exit": { - "dependency": "direct main", - "description": { - "name": "on_exit", - "sha256": "5a4c625374ddc9146b5dc6617e5c9885e326d0e876cf6554875f9961f564bd96", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.0" - }, - "open_filex": { - "dependency": "direct main", - "description": { - "name": "open_filex", - "sha256": "9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.7.0" - }, - "openid_client": { - "dependency": "transitive", - "description": { - "name": "openid_client", - "sha256": "1d39a829dc770947bf8ec8684a3456743ef0205a777371efe16773a44163eb6a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.9" - }, - "package_config": { - "dependency": "transitive", - "description": { - "name": "package_config", - "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "package_info_plus": { - "dependency": "direct main", - "description": { - "name": "package_info_plus", - "sha256": "7976bfe4c583170d6cdc7077e3237560b364149fcd268b5f53d95a991963b191", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "8.3.0" - }, - "package_info_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "package_info_plus_platform_interface", - "sha256": "6c935fb612dff8e3cc9632c2b301720c77450a126114126ffaafe28d2e87956c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.0" - }, - "particles_flutter": { - "dependency": "direct main", - "description": { - "name": "particles_flutter", - "sha256": "35a010675a4d07d89501d555e1a477b39d32a1fb1ad1e16e6cd85f25149d8f53", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "pasteboard": { - "dependency": "direct main", - "description": { - "name": "pasteboard", - "sha256": "7bf733f3a00c7188ec1f2c6f0612854248b302cf91ef3611a2b7bb141c0f9d55", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.0" - }, - "path": { - "dependency": "direct main", - "description": { - "name": "path", - "sha256": "087ce49c3f0dc39180befefc60fdb4acd8f8620e5682fe2476afd0b3688bb4af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.9.0" - }, - "path_parsing": { - "dependency": "transitive", - "description": { - "name": "path_parsing", - "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "path_provider": { - "dependency": "direct main", - "description": { - "name": "path_provider", - "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.5" - }, - "path_provider_android": { - "dependency": "transitive", - "description": { - "name": "path_provider_android", - "sha256": "0ca7359dad67fd7063cb2892ab0c0737b2daafd807cf1acecd62374c8fae6c12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.16" - }, - "path_provider_foundation": { - "dependency": "transitive", - "description": { - "name": "path_provider_foundation", - "sha256": "4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "path_provider_linux": { - "dependency": "transitive", - "description": { - "name": "path_provider_linux", - "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.1" - }, - "path_provider_platform_interface": { - "dependency": "transitive", - "description": { - "name": "path_provider_platform_interface", - "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "path_provider_windows": { - "dependency": "transitive", - "description": { - "name": "path_provider_windows", - "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "pdf": { - "dependency": "direct main", - "description": { - "name": "pdf", - "sha256": "28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.11.3" - }, - "pdf_widget_wrapper": { - "dependency": "transitive", - "description": { - "name": "pdf_widget_wrapper", - "sha256": "c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.4" - }, - "peanut": { - "dependency": "direct dev", - "description": { - "name": "peanut", - "sha256": "b7e5fffabc97c4f0bfcce723a1a437202d33ae9f8a1c5962c68834315b56c737", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.0" - }, - "permission_handler": { - "dependency": "direct main", - "description": { - "name": "permission_handler", - "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "11.4.0" - }, - "permission_handler_android": { - "dependency": "transitive", - "description": { - "name": "permission_handler_android", - "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "12.1.0" - }, - "permission_handler_apple": { - "dependency": "transitive", - "description": { - "name": "permission_handler_apple", - "sha256": "f84a188e79a35c687c132a0a0556c254747a08561e99ab933f12f6ca71ef3c98", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "9.4.6" - }, - "permission_handler_html": { - "dependency": "transitive", - "description": { - "name": "permission_handler_html", - "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3+5" - }, - "permission_handler_platform_interface": { - "dependency": "direct overridden", - "description": { - "name": "permission_handler_platform_interface", - "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.3.0" - }, - "permission_handler_windows": { - "dependency": "direct overridden", - "description": { - "path": "permission_handler_windows", - "ref": "251a9475644f64784efedff4b3a8bd5c99d3884d", - "resolved-ref": "251a9475644f64784efedff4b3a8bd5c99d3884d", - "url": "https://github.com/BlueBubblesApp/flutter-permission-handler.git" - }, - "source": "git", - "version": "0.2.1" - }, - "petitparser": { - "dependency": "transitive", - "description": { - "name": "petitparser", - "sha256": "c15605cd28af66339f8eb6fbe0e541bfe2d1b72d5825efc6598f3e0a31b9ad27", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.2" - }, - "photo_manager": { - "dependency": "direct main", - "description": { - "name": "photo_manager", - "sha256": "0bc7548fd3111eb93a3b0abf1c57364e40aeda32512c100085a48dade60e574f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.6.4" - }, - "photo_view": { - "dependency": "direct main", - "description": { - "name": "photo_view", - "sha256": "1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.15.0" - }, - "pixel_snap": { - "dependency": "transitive", - "description": { - "name": "pixel_snap", - "sha256": "677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.5" - }, - "platform": { - "dependency": "transitive", - "description": { - "name": "platform", - "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.6" - }, - "plugin_platform_interface": { - "dependency": "transitive", - "description": { - "name": "plugin_platform_interface", - "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.8" - }, - "pointer_interceptor": { - "dependency": "transitive", - "description": { - "name": "pointer_interceptor", - "sha256": "57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.1+2" - }, - "pointer_interceptor_ios": { - "dependency": "transitive", - "description": { - "name": "pointer_interceptor_ios", - "sha256": "a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.1" - }, - "pointer_interceptor_platform_interface": { - "dependency": "transitive", - "description": { - "name": "pointer_interceptor_platform_interface", - "sha256": "0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.0+1" - }, - "pointer_interceptor_web": { - "dependency": "transitive", - "description": { - "name": "pointer_interceptor_web", - "sha256": "7a7087782110f8c1827170660b09f8aa893e0e9a61431dbbe2ac3fc482e8c044", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.2+1" - }, - "pointycastle": { - "dependency": "transitive", - "description": { - "name": "pointycastle", - "sha256": "4be0097fcf3fd3e8449e53730c631200ebc7b88016acecab2b0da2f0149222fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.9.1" - }, - "polylabel": { - "dependency": "transitive", - "description": { - "name": "polylabel", - "sha256": "41b9099afb2aa6c1730bdd8a0fab1400d287694ec7615dd8516935fa3144214b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.1" - }, - "pool": { - "dependency": "transitive", - "description": { - "name": "pool", - "sha256": "20fe868b6314b322ea036ba325e6fc0711a22948856475e2c2b6306e8ab39c2a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.1" - }, - "posix": { - "dependency": "transitive", - "description": { - "name": "posix", - "sha256": "a0117dc2167805aa9125b82eee515cc891819bac2f538c83646d355b16f58b9a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.0.1" - }, - "printing": { - "dependency": "direct main", - "description": { - "name": "printing", - "sha256": "482cd5a5196008f984bb43ed0e47cbfdca7373490b62f3b27b3299275bf22a93", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.14.2" - }, - "process_run": { - "dependency": "transitive", - "description": { - "name": "process_run", - "sha256": "a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2+1" - }, - "proj4dart": { - "dependency": "transitive", - "description": { - "name": "proj4dart", - "sha256": "c8a659ac9b6864aa47c171e78d41bbe6f5e1d7bd790a5814249e6b68bc44324e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.0" - }, - "protobuf": { - "dependency": "transitive", - "description": { - "name": "protobuf", - "sha256": "68645b24e0716782e58948f8467fd42a880f255096a821f9e7d0ec625b00c84d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.0" - }, - "provider": { - "dependency": "transitive", - "description": { - "name": "provider", - "sha256": "c8a055ee5ce3fd98d6fc872478b03823ffdb448699c6ebdbbc71d59b596fd48c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.1.2" - }, - "pub_semver": { - "dependency": "transitive", - "description": { - "name": "pub_semver", - "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.0" - }, - "pubspec_parse": { - "dependency": "transitive", - "description": { - "name": "pubspec_parse", - "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "pull_down_button": { - "dependency": "direct main", - "description": { - "name": "pull_down_button", - "sha256": "12cdd8ff187a3150ebdf075e5074299f085579b158d2b4e655ccbafccf95f25b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.2" - }, - "qr": { - "dependency": "transitive", - "description": { - "name": "qr", - "sha256": "5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "qr_flutter": { - "dependency": "direct main", - "description": { - "name": "qr_flutter", - "sha256": "5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, - "quiver": { - "dependency": "transitive", - "description": { - "name": "quiver", - "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, - "receive_intent": { - "dependency": "direct main", - "description": { - "name": "receive_intent", - "sha256": "8e6b6edd1f4127265c1f19bfd53e8e92dd65f32cc9b377247bb7876a655479c8", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.7" - }, - "record": { - "dependency": "direct main", - "description": { - "name": "record", - "sha256": "2e3d56d196abcd69f1046339b75e5f3855b2406fc087e5991f6703f188aa03a6", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.2.1" - }, - "record_android": { - "dependency": "transitive", - "description": { - "name": "record_android", - "sha256": "36e009c3b83e034321a44a7683d95dd055162a231f95600f7da579dcc79701f9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.1" - }, - "record_darwin": { - "dependency": "transitive", - "description": { - "name": "record_darwin", - "sha256": "e487eccb19d82a9a39cd0126945cfc47b9986e0df211734e2788c95e3f63c82c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2" - }, - "record_linux": { - "dependency": "transitive", - "description": { - "name": "record_linux", - "sha256": "74d41a9ebb1eb498a38e9a813dd524e8f0b4fdd627270bda9756f437b110a3e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.2" - }, - "record_platform_interface": { - "dependency": "transitive", - "description": { - "name": "record_platform_interface", - "sha256": "8a575828733d4c3cb5983c914696f40db8667eab3538d4c41c50cbb79e722ef4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.0" - }, - "record_web": { - "dependency": "transitive", - "description": { - "name": "record_web", - "sha256": "ef6f5c7760f22d6785ee8d97a2133ff14cb839c65e525ad831eb7f891d83f592", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.5" - }, - "record_windows": { - "dependency": "transitive", - "description": { - "name": "record_windows", - "sha256": "26bfebc8899f4fa5b6b044089887dc42115820cd6a907bdf40c16e909e87de0a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.5" - }, - "reorderables": { - "dependency": "direct main", - "description": { - "name": "reorderables", - "sha256": "004a886e4878df1ee27321831c838bc1c976311f4ca6a74ce7d561e506540a77", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.0" - }, - "rxdart": { - "dependency": "direct overridden", - "description": { - "name": "rxdart", - "sha256": "5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.28.0" - }, - "safe_local_storage": { - "dependency": "transitive", - "description": { - "name": "safe_local_storage", - "sha256": "ede4eb6cb7d88a116b3d3bf1df70790b9e2038bc37cb19112e381217c74d9440", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "saver_gallery": { - "dependency": "direct main", - "description": { - "name": "saver_gallery", - "sha256": "bf59475e50b73d666630bed7a5fdb621fed92d637f64e3c61ce81653ec6a833c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.1" - }, - "screen_brightness": { - "dependency": "transitive", - "description": { - "name": "screen_brightness", - "sha256": "ed8da4a4511e79422fc1aa88138e920e4008cd312b72cdaa15ccb426c0faaedd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.2+1" - }, - "screen_brightness_android": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_android", - "sha256": "3df10961e3a9e968a5e076fe27e7f4741fa8a1d3950bdeb48cf121ed529d0caf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0+2" - }, - "screen_brightness_ios": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_ios", - "sha256": "99adc3ca5490b8294284aad5fcc87f061ad685050e03cf45d3d018fe398fd9a2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0" - }, - "screen_brightness_macos": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_macos", - "sha256": "64b34e7e3f4900d7687c8e8fb514246845a73ecec05ab53483ed025bd4a899fd", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0+1" - }, - "screen_brightness_platform_interface": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_platform_interface", - "sha256": "b211d07f0c96637a15fb06f6168617e18030d5d74ad03795dd8547a52717c171", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.0" - }, - "screen_brightness_windows": { - "dependency": "transitive", - "description": { - "name": "screen_brightness_windows", - "sha256": "9261bf33d0fc2707d8cf16339ce25768100a65e70af0fcabaf032fc12408ba86", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.3" - }, - "screen_retriever": { - "dependency": "direct main", - "description": { - "name": "screen_retriever", - "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_linux": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_linux", - "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_macos": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_macos", - "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_platform_interface": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_platform_interface", - "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "screen_retriever_windows": { - "dependency": "transitive", - "description": { - "name": "screen_retriever_windows", - "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.0" - }, - "scroll_to_index": { - "dependency": "direct main", - "description": { - "name": "scroll_to_index", - "sha256": "b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "secure_application": { - "dependency": "direct main", - "description": { - "name": "secure_application", - "sha256": "1476f2a8df44ed9617bf42f51a1fce2ab0b83bfd4ea58983a5f7d3748b356ef3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.1.0" - }, - "sembast": { - "dependency": "transitive", - "description": { - "name": "sembast", - "sha256": "9026ea34aa3a0f26a966529ef80b57b6fe40f810cadeadd1b208202d1bf153e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.8.3" - }, - "share_plus": { - "dependency": "direct main", - "description": { - "name": "share_plus", - "sha256": "fce43200aa03ea87b91ce4c3ac79f0cecd52e2a7a56c7a4185023c271fbfa6da", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "10.1.4" - }, - "share_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "share_plus_platform_interface", - "sha256": "cc012a23fc2d479854e6c80150696c4a5f5bb62cb89af4de1c505cf78d0a5d0b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "shared_preferences": { - "dependency": "direct main", - "description": { - "name": "shared_preferences", - "sha256": "846849e3e9b68f3ef4b60c60cf4b3e02e9321bc7f4d8c4692cf87ffa82fc8a3a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.2" - }, - "shared_preferences_android": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_android", - "sha256": "3ec7210872c4ba945e3244982918e502fa2bfb5230dff6832459ca0e1879b7ad", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.8" - }, - "shared_preferences_foundation": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_foundation", - "sha256": "6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.5.4" - }, - "shared_preferences_linux": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_linux", - "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_platform_interface": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_platform_interface", - "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shared_preferences_web": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_web", - "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.3" - }, - "shared_preferences_windows": { - "dependency": "transitive", - "description": { - "name": "shared_preferences_windows", - "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.1" - }, - "shelf": { - "dependency": "transitive", - "description": { - "name": "shelf", - "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.2" - }, - "shelf_packages_handler": { - "dependency": "transitive", - "description": { - "name": "shelf_packages_handler", - "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "shelf_static": { - "dependency": "transitive", - "description": { - "name": "shelf_static", - "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.3" - }, - "shelf_web_socket": { - "dependency": "transitive", - "description": { - "name": "shelf_web_socket", - "sha256": "cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "shimmer": { - "dependency": "direct main", - "description": { - "name": "shimmer", - "sha256": "5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.0" - }, - "shortid": { - "dependency": "transitive", - "description": { - "name": "shortid", - "sha256": "d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.2" - }, - "simple_animations": { - "dependency": "direct main", - "description": { - "name": "simple_animations", - "sha256": "6c0f1d53d351a2187da979cc6883322eb9e76f1147c1aecc1937c498eaa9abff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.1.0" - }, - "skeletonizer": { - "dependency": "direct main", - "description": { - "name": "skeletonizer", - "sha256": "0dcacc51c144af4edaf37672072156f49e47036becbc394d7c51850c5c1e884b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.3" - }, - "sky_engine": { - "dependency": "transitive", - "description": "flutter", - "source": "sdk", - "version": "0.0.0" - }, - "sliding_up_panel2": { - "dependency": "direct main", - "description": { - "name": "sliding_up_panel2", - "sha256": "7c2aac81c03e74fcd070799c5e2011f1c5de7026bd22a76164e81e23a49f2bdb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.0+1" - }, - "slugify": { - "dependency": "direct main", - "description": { - "name": "slugify", - "sha256": "b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "smooth_page_indicator": { - "dependency": "direct main", - "description": { - "name": "smooth_page_indicator", - "sha256": "b21ebb8bc39cf72d11c7cfd809162a48c3800668ced1c9da3aade13a32cf6c1c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "socket_io_client": { - "dependency": "direct main", - "description": { - "name": "socket_io_client", - "sha256": "180fdbc7685e32a849511bbf8b1c7bcc46ab0ff116f7024aa204b425bb3a1ffe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "socket_io_common": { - "dependency": "transitive", - "description": { - "name": "socket_io_common", - "sha256": "a914df90f25003fea62dbd0b186d98b745b1b72c16be87418e15a2511d25dadb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "sortedmap": { - "dependency": "transitive", - "description": { - "name": "sortedmap", - "sha256": "f000f40804e15fad5e3ad429164291c06cf7fcf8cc982006cf482852b912c3cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.5.4" - }, - "source_gen": { - "dependency": "transitive", - "description": { - "name": "source_gen", - "sha256": "14658ba5f669685cd3d63701d01b31ea748310f7ab854e471962670abcf57832", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.5.0" - }, - "source_map_stack_trace": { - "dependency": "transitive", - "description": { - "name": "source_map_stack_trace", - "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "source_maps": { - "dependency": "transitive", - "description": { - "name": "source_maps", - "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.13" - }, - "source_span": { - "dependency": "transitive", - "description": { - "name": "source_span", - "sha256": "53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.10.0" - }, - "sprintf": { - "dependency": "transitive", - "description": { - "name": "sprintf", - "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "7.0.0" - }, - "sprung": { - "dependency": "direct main", - "description": { - "name": "sprung", - "sha256": "54322638f5e393d2b808175f7eadbaa4836a4425456e98d93c3d676dc56ebdf1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.1" - }, - "stack_trace": { - "dependency": "transitive", - "description": { - "name": "stack_trace", - "sha256": "9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.12.0" - }, - "store_checker": { - "dependency": "direct main", - "description": { - "name": "store_checker", - "sha256": "f191b6f1035caff62137c365cba21ad1a3c82c0369b522639052cd29fb48720f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.8.0" - }, - "stream_channel": { - "dependency": "transitive", - "description": { - "name": "stream_channel", - "sha256": "ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.2" - }, - "stream_transform": { - "dependency": "transitive", - "description": { - "name": "stream_transform", - "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "string_scanner": { - "dependency": "transitive", - "description": { - "name": "string_scanner", - "sha256": "688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.3.0" - }, - "string_validator": { - "dependency": "transitive", - "description": { - "name": "string_validator", - "sha256": "a278d038104aa2df15d0e09c47cb39a49f907260732067d0034dc2f2e4e2ac94", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "super_clipboard": { - "dependency": "transitive", - "description": { - "name": "super_clipboard", - "sha256": "5203c881d24033c3e6154c2ae01afd94e7f0a3201280373f28e540f1defa3f40", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0-dev.6" - }, - "super_drag_and_drop": { - "dependency": "direct main", - "description": { - "name": "super_drag_and_drop", - "sha256": "36e00943b14303b03a5d689659cab87a02d9c8265efb189abb98db9c946368ae", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0-dev.6" - }, - "super_native_extensions": { - "dependency": "transitive", - "description": { - "name": "super_native_extensions", - "sha256": "09ccc40c475e6f91770eaeb2553bf4803812d7beadc3759aa57d643370619c86", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.9.0-dev.6" - }, - "supercharged": { - "dependency": "direct main", - "description": { - "name": "supercharged", - "sha256": "ab49c848b33e28243f5ce82b976736de17d0852b71d0dfbde53fbb5e2ecca7cb", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "supercharged_dart": { - "dependency": "transitive", - "description": { - "name": "supercharged_dart", - "sha256": "cb95edda32eacd27664089700a750120be41daa84aa6cd2aeded46227c16b867", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.1" - }, - "synchronized": { - "dependency": "direct main", - "description": { - "name": "synchronized", - "sha256": "69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.3.0+3" - }, - "system_info2": { - "dependency": "direct main", - "description": { - "name": "system_info2", - "sha256": "65206bbef475217008b5827374767550a5420ce70a04d2d7e94d1d2253f3efc9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.0" - }, - "system_tray": { - "dependency": "direct main", - "description": { - "name": "system_tray", - "sha256": "40444e5de8ed907822a98694fd031b8accc3cb3c0baa547634ce76189cf3d9cf", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.3" - }, - "tenor_dart": { - "dependency": "transitive", - "description": { - "name": "tenor_dart", - "sha256": "ef48b584ef3897ed973b769a90ada76ea7ff70bd8194fadd21d588f73f515120", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.2" - }, - "tenor_flutter": { - "dependency": "direct main", - "description": { - "name": "tenor_flutter", - "sha256": "b7d7f8586111e61e32ba7e13bea817d89835117b7aa791662d928671fae4ac81", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.0.5" - }, - "term_glyph": { - "dependency": "transitive", - "description": { - "name": "term_glyph", - "sha256": "a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "test": { - "dependency": "transitive", - "description": { - "name": "test", - "sha256": "713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.25.8" - }, - "test_api": { - "dependency": "transitive", - "description": { - "name": "test_api", - "sha256": "664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.7.3" - }, - "test_core": { - "dependency": "transitive", - "description": { - "name": "test_core", - "sha256": "12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.6.5" - }, - "throttling": { - "dependency": "transitive", - "description": { - "name": "throttling", - "sha256": "e48a4c681b1838b8bf99c1a4f822efe43bb69132f9a56091cd5b7d931c862255", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.1" - }, - "timezone": { - "dependency": "transitive", - "description": { - "name": "timezone", - "sha256": "ffc9d5f4d1193534ef051f9254063fa53d588609418c84299956c3db9383587d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.10.0" - }, - "timing": { - "dependency": "transitive", - "description": { - "name": "timing", - "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "tray_manager": { - "dependency": "direct main", - "description": { - "name": "tray_manager", - "sha256": "80be6c508159a6f3c57983de795209ac13453e9832fd574143b06dceee188ed2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.2" - }, - "try_catch": { - "dependency": "transitive", - "description": { - "name": "try_catch", - "sha256": "3e0f62abdd51ea40f59c0e5958cfac7d6b92faec5a9faf85f174c6cc34c018af", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "tuple": { - "dependency": "direct main", - "description": { - "name": "tuple", - "sha256": "a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "typed_data": { - "dependency": "transitive", - "description": { - "name": "typed_data", - "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.4.0" - }, - "unicode": { - "dependency": "transitive", - "description": { - "name": "unicode", - "sha256": "0f69e46593d65245774d4f17125c6084d2c20b4e473a983f6e21b7d7762218f1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.3.1" - }, - "unicode_emojis": { - "dependency": "direct main", - "description": { - "name": "unicode_emojis", - "sha256": "2f86d695420086dcf6f41c35bd81c33ef75c8e5fc0431fd9ca54066060086d19", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.0" - }, - "unifiedpush": { - "dependency": "direct main", - "description": { - "name": "unifiedpush", - "sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.0.2" - }, - "unifiedpush_android": { - "dependency": "transitive", - "description": { - "name": "unifiedpush_android", - "sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.0" - }, - "unifiedpush_platform_interface": { - "dependency": "transitive", - "description": { - "name": "unifiedpush_platform_interface", - "sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "universal_html": { - "dependency": "direct main", - "description": { - "name": "universal_html", - "sha256": "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.4" - }, - "universal_io": { - "dependency": "direct main", - "description": { - "name": "universal_io", - "sha256": "1722b2dcc462b4b2f3ee7d188dad008b6eb4c40bbd03a3de451d82c78bba9aad", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.2.2" - }, - "universal_platform": { - "dependency": "transitive", - "description": { - "name": "universal_platform", - "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "uri_parser": { - "dependency": "transitive", - "description": { - "name": "uri_parser", - "sha256": "6543c9fd86d2862fac55d800a43e67c0dcd1a41677cb69c2f8edfe73bbcf1835", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.2" - }, - "url_launcher": { - "dependency": "direct main", - "description": { - "name": "url_launcher", - "sha256": "9d06212b1362abc2f0f0d78e6f09f726608c74e3b9462e8368bb03314aa8d603", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.1" - }, - "url_launcher_android": { - "dependency": "transitive", - "description": { - "name": "url_launcher_android", - "sha256": "1d0eae19bd7606ef60fe69ef3b312a437a16549476c42321d5dc1506c9ca3bf4", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.15" - }, - "url_launcher_ios": { - "dependency": "transitive", - "description": { - "name": "url_launcher_ios", - "sha256": "16a513b6c12bb419304e72ea0ae2ab4fed569920d1c7cb850263fe3acc824626", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.2" - }, - "url_launcher_linux": { - "dependency": "transitive", - "description": { - "name": "url_launcher_linux", - "sha256": "4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.1" - }, - "url_launcher_macos": { - "dependency": "transitive", - "description": { - "name": "url_launcher_macos", - "sha256": "17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.2.2" - }, - "url_launcher_platform_interface": { - "dependency": "transitive", - "description": { - "name": "url_launcher_platform_interface", - "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.2" - }, - "url_launcher_web": { - "dependency": "transitive", - "description": { - "name": "url_launcher_web", - "sha256": "3ba963161bd0fe395917ba881d320b9c4f6dd3c4a233da62ab18a5025c85f1e9", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "url_launcher_windows": { - "dependency": "transitive", - "description": { - "name": "url_launcher_windows", - "sha256": "3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.4" - }, - "uuid": { - "dependency": "direct overridden", - "description": { - "name": "uuid", - "sha256": "a5be9ef6618a7ac1e964353ef476418026db906c4facdedaa299b7a2e71690ff", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.5.1" - }, - "vcf_dart": { - "dependency": "direct main", - "description": { - "name": "vcf_dart", - "sha256": "971c143ce2e2029bd8cf0544f82a718408587ba304be70e85a02998a2b4c13a1", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.0.2" - }, - "vector_graphics": { - "dependency": "transitive", - "description": { - "name": "vector_graphics", - "sha256": "44cc7104ff32563122a929e4620cf3efd584194eec6d1d913eb5ba593dbcf6de", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.18" - }, - "vector_graphics_codec": { - "dependency": "transitive", - "description": { - "name": "vector_graphics_codec", - "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.13" - }, - "vector_graphics_compiler": { - "dependency": "transitive", - "description": { - "name": "vector_graphics_compiler", - "sha256": "1b4b9e706a10294258727674a340ae0d6e64a7231980f9f9a3d12e4b42407aad", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.16" - }, - "vector_math": { - "dependency": "transitive", - "description": { - "name": "vector_math", - "sha256": "80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.1.4" - }, - "version": { - "dependency": "direct main", - "description": { - "name": "version", - "sha256": "3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.0.2" - }, - "video_player": { - "dependency": "direct main", - "description": { - "name": "video_player", - "sha256": "48941c8b05732f9582116b1c01850b74dbee1d8520cd7e34ad4609d6df666845", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.9.3" - }, - "video_player_android": { - "dependency": "transitive", - "description": { - "name": "video_player_android", - "sha256": "ae7d4f1b41e3ac6d24dd9b9d5d6831b52d74a61bdd90a7a6262a33d8bb97c29a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.8.2" - }, - "video_player_avfoundation": { - "dependency": "transitive", - "description": { - "name": "video_player_avfoundation", - "sha256": "84b4752745eeccb6e75865c9aab39b3d28eb27ba5726d352d45db8297fbd75bc", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.7.0" - }, - "video_player_platform_interface": { - "dependency": "transitive", - "description": { - "name": "video_player_platform_interface", - "sha256": "df534476c341ab2c6a835078066fc681b8265048addd853a1e3c78740316a844", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.3.0" - }, - "video_player_web": { - "dependency": "transitive", - "description": { - "name": "video_player_web", - "sha256": "3ef40ea6d72434edbfdba4624b90fd3a80a0740d260667d91e7ecd2d79e13476", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.3.4" - }, - "video_thumbnail": { - "dependency": "direct main", - "description": { - "path": ".", - "ref": "master", - "resolved-ref": "adfeff44e1bb7d11fd4f63c420d46cff5ae687f9", - "url": "https://github.com/BlueBubblesApp/video_thumbnail.git" - }, - "source": "git", - "version": "0.5.3" - }, - "vm_service": { - "dependency": "transitive", - "description": { - "name": "vm_service", - "sha256": "f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "14.3.0" - }, - "volume_controller": { - "dependency": "transitive", - "description": { - "name": "volume_controller", - "sha256": "c71d4c62631305df63b72da79089e078af2659649301807fa746088f365cb48e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.8" - }, - "wakelock_plus": { - "dependency": "transitive", - "description": { - "name": "wakelock_plus", - "sha256": "36c88af0b930121941345306d259ec4cc4ecca3b151c02e3a9e71aede83c615e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.10" - }, - "wakelock_plus_platform_interface": { - "dependency": "transitive", - "description": { - "name": "wakelock_plus_platform_interface", - "sha256": "70e780bc99796e1db82fe764b1e7dcb89a86f1e5b3afb1db354de50f2e41eb7a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.2" - }, - "watcher": { - "dependency": "transitive", - "description": { - "name": "watcher", - "sha256": "69da27e49efa56a15f8afe8f4438c4ec02eff0a117df1b22ea4aad194fe1c104", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "web": { - "dependency": "transitive", - "description": { - "name": "web", - "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.1" - }, - "web_socket": { - "dependency": "transitive", - "description": { - "name": "web_socket", - "sha256": "3c12d96c0c9a4eec095246debcea7b86c0324f22df69893d538fcc6f1b8cce83", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.1.6" - }, - "web_socket_channel": { - "dependency": "transitive", - "description": { - "name": "web_socket_channel", - "sha256": "d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.4.0" - }, - "webkit_inspection_protocol": { - "dependency": "transitive", - "description": { - "name": "webkit_inspection_protocol", - "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.2.1" - }, - "win32": { - "dependency": "direct main", - "description": { - "name": "win32", - "sha256": "daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "5.10.1" - }, - "win32_registry": { - "dependency": "transitive", - "description": { - "name": "win32_registry", - "sha256": "21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.5" - }, - "window_manager": { - "dependency": "direct main", - "description": { - "name": "window_manager", - "sha256": "732896e1416297c63c9e3fb95aea72d0355f61390263982a47fd519169dc5059", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.4.3" - }, - "windows_taskbar": { - "dependency": "direct main", - "description": { - "name": "windows_taskbar", - "sha256": "204edfdb280a7053febdf50fc9b49b3c007255bd8a83c082d10c174ec6548f33", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.2" - }, - "wkt_parser": { - "dependency": "transitive", - "description": { - "name": "wkt_parser", - "sha256": "8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "2.0.0" - }, - "x509": { - "dependency": "transitive", - "description": { - "name": "x509", - "sha256": "cbd1a63846884afd273cda247b0365284c8d85a365ca98e110413f93d105b935", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "0.2.4+3" - }, - "xdg_directories": { - "dependency": "transitive", - "description": { - "name": "xdg_directories", - "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "1.1.0" - }, - "xml": { - "dependency": "transitive", - "description": { - "name": "xml", - "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "6.5.0" - }, - "yaml": { - "dependency": "transitive", - "description": { - "name": "yaml", - "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.1.3" - } - }, - "sdks": { - "dart": ">=3.6.0 <3.29.0", - "flutter": ">=3.27.0" - } -} +{"packages":{"_discoveryapis_commons":{"dependency":"transitive","description":{"name":"_discoveryapis_commons","sha256":"113c4100b90a5b70a983541782431b82168b3cae166ab130649c36eb3559d498","url":"https://pub.dev"},"source":"hosted","version":"1.0.7"},"_fe_analyzer_shared":{"dependency":"transitive","description":{"name":"_fe_analyzer_shared","sha256":"16e298750b6d0af7ce8a3ba7c18c69c3785d11b15ec83f6dcd0ad2a0009b3cab","url":"https://pub.dev"},"source":"hosted","version":"76.0.0"},"_macros":{"dependency":"transitive","description":"dart","source":"sdk","version":"0.3.3"},"adaptive_theme":{"dependency":"direct main","description":{"name":"adaptive_theme","sha256":"5caccff82e40ef6d3ebb28caaa091ab1865b0e35bd2ab2ddccf49cd336331012","url":"https://pub.dev"},"source":"hosted","version":"3.7.2"},"analyzer":{"dependency":"transitive","description":{"name":"analyzer","sha256":"1f14db053a8c23e260789e9b0980fa27f2680dd640932cae5e1137cce0e46e1e","url":"https://pub.dev"},"source":"hosted","version":"6.11.0"},"animated_size_and_fade":{"dependency":"direct main","description":{"name":"animated_size_and_fade","sha256":"1a013cb7cd9e1751d6b8a38e34e4d0732f010c2d6021acd2176a455ee3df4664","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"animated_stack_widget":{"dependency":"transitive","description":{"name":"animated_stack_widget","sha256":"ce4788dd158768c9d4388354b6fb72600b78e041a37afc4c279c63ecafcb9408","url":"https://pub.dev"},"source":"hosted","version":"0.0.4"},"animations":{"dependency":"direct main","description":{"name":"animations","sha256":"d3d6dcfb218225bbe68e87ccf6378bbb2e32a94900722c5f81611dad089911cb","url":"https://pub.dev"},"source":"hosted","version":"2.0.11"},"ansicolor":{"dependency":"transitive","description":{"name":"ansicolor","sha256":"50e982d500bc863e1d703448afdbf9e5a72eb48840a4f766fa361ffd6877055f","url":"https://pub.dev"},"source":"hosted","version":"2.0.3"},"app_install_date":{"dependency":"direct main","description":{"name":"app_install_date","sha256":"0860b8feb129a97a2dae58e5d2dcfc274418ad803a80be35af83ad590daa4fe3","url":"https://pub.dev"},"source":"hosted","version":"0.1.5"},"app_links":{"dependency":"direct main","description":{"name":"app_links","sha256":"5f88447519add627fe1cbcab4fd1da3d4fed15b9baf29f28b22535c95ecee3e8","url":"https://pub.dev"},"source":"hosted","version":"6.4.1"},"app_links_linux":{"dependency":"transitive","description":{"name":"app_links_linux","sha256":"f5f7173a78609f3dfd4c2ff2c95bd559ab43c80a87dc6a095921d96c05688c81","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"app_links_platform_interface":{"dependency":"transitive","description":{"name":"app_links_platform_interface","sha256":"05f5379577c513b534a29ddea68176a4d4802c46180ee8e2e966257158772a3f","url":"https://pub.dev"},"source":"hosted","version":"2.0.2"},"app_links_web":{"dependency":"transitive","description":{"name":"app_links_web","sha256":"af060ed76183f9e2b87510a9480e56a5352b6c249778d07bd2c95fc35632a555","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"archive":{"dependency":"direct main","description":{"name":"archive","sha256":"a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff","url":"https://pub.dev"},"source":"hosted","version":"4.0.9"},"args":{"dependency":"transitive","description":{"name":"args","sha256":"d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04","url":"https://pub.dev"},"source":"hosted","version":"2.7.0"},"asn1lib":{"dependency":"transitive","description":{"name":"asn1lib","sha256":"9a8f69025044eb466b9b60ef3bc3ac99b4dc6c158ae9c56d25eeccf5bc56d024","url":"https://pub.dev"},"source":"hosted","version":"1.6.5"},"async":{"dependency":"transitive","description":{"name":"async","sha256":"947bfcf187f74dbc5e146c9eb9c0f10c9f8b30743e341481c1e2ed3ecc18c20c","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"async_extension":{"dependency":"transitive","description":{"name":"async_extension","sha256":"bfc1e4dc894f5d761ef3fb35e004678b6171d44f1170a84749ce8d2ee8cacb74","url":"https://pub.dev"},"source":"hosted","version":"1.2.22"},"async_task":{"dependency":"direct main","description":{"name":"async_task","sha256":"a0effde412fdb5d0b08d4329a75967a26d67e4b20055f928fe6e7ad8697222cd","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"audio_waveforms":{"dependency":"direct main","description":{"name":"audio_waveforms","sha256":"658fef41bbab299184b65ba2fd749e8ec658c1f7d54a21f7cf97fa96b173b4ce","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"auto_size_text":{"dependency":"direct main","description":{"name":"auto_size_text","sha256":"3f5261cd3fb5f2a9ab4e2fc3fba84fd9fcaac8821f20a1d4e71f557521b22599","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"barcode":{"dependency":"transitive","description":{"name":"barcode","sha256":"7b6729c37e3b7f34233e2318d866e8c48ddb46c1f7ad01ff7bb2a8de1da2b9f4","url":"https://pub.dev"},"source":"hosted","version":"2.2.9"},"bidi":{"dependency":"transitive","description":{"name":"bidi","sha256":"77f475165e94b261745cf1032c751e2032b8ed92ccb2bf5716036db79320637d","url":"https://pub.dev"},"source":"hosted","version":"2.0.13"},"bitsdojo_window":{"dependency":"direct main","description":{"name":"bitsdojo_window","sha256":"88ef7765dafe52d97d7a3684960fb5d003e3151e662c18645c1641c22b873195","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"bitsdojo_window_linux":{"dependency":"transitive","description":{"name":"bitsdojo_window_linux","sha256":"9519c0614f98be733e0b1b7cb15b827007886f6fe36a4fb62cf3d35b9dd578ab","url":"https://pub.dev"},"source":"hosted","version":"0.1.4"},"bitsdojo_window_macos":{"dependency":"transitive","description":{"name":"bitsdojo_window_macos","sha256":"f7c5be82e74568c68c5b8449e2c5d8fd12ec195ecd70745a7b9c0f802bb0268f","url":"https://pub.dev"},"source":"hosted","version":"0.1.4"},"bitsdojo_window_platform_interface":{"dependency":"transitive","description":{"name":"bitsdojo_window_platform_interface","sha256":"65daa015a0c6dba749bdd35a0f092e7a8ba8b0766aa0480eb3ef808086f6e27c","url":"https://pub.dev"},"source":"hosted","version":"0.1.2"},"bitsdojo_window_windows":{"dependency":"transitive","description":{"name":"bitsdojo_window_windows","sha256":"fa982cf61ede53f483e50b257344a1c250af231a3cdc93a7064dd6dc0d720b68","url":"https://pub.dev"},"source":"hosted","version":"0.1.6"},"boolean_selector":{"dependency":"transitive","description":{"name":"boolean_selector","sha256":"6cfb5af12253eaf2b368f07bacc5a80d1301a071c73360d746b7f2e32d762c66","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"build":{"dependency":"transitive","description":{"name":"build","sha256":"cef23f1eda9b57566c81e2133d196f8e3df48f244b317368d65c5943d91148f0","url":"https://pub.dev"},"source":"hosted","version":"2.4.2"},"build_cli_annotations":{"dependency":"transitive","description":{"name":"build_cli_annotations","sha256":"b59d2769769efd6c9ff6d4c4cede0be115a566afc591705c2040b707534b1172","url":"https://pub.dev"},"source":"hosted","version":"2.1.0"},"build_config":{"dependency":"transitive","description":{"name":"build_config","sha256":"4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"build_daemon":{"dependency":"transitive","description":{"name":"build_daemon","sha256":"8e928697a82be082206edb0b9c99c5a4ad6bc31c9e9b8b2f291ae65cd4a25daa","url":"https://pub.dev"},"source":"hosted","version":"4.0.4"},"build_resolvers":{"dependency":"transitive","description":{"name":"build_resolvers","sha256":"b9e4fda21d846e192628e7a4f6deda6888c36b5b69ba02ff291a01fd529140f0","url":"https://pub.dev"},"source":"hosted","version":"2.4.4"},"build_runner":{"dependency":"direct dev","description":{"name":"build_runner","sha256":"058fe9dce1de7d69c4b84fada934df3e0153dd000758c4d65964d0166779aa99","url":"https://pub.dev"},"source":"hosted","version":"2.4.15"},"build_runner_core":{"dependency":"transitive","description":{"name":"build_runner_core","sha256":"22e3aa1c80e0ada3722fe5b63fd43d9c8990759d0a2cf489c8c5d7b2bdebc021","url":"https://pub.dev"},"source":"hosted","version":"8.0.0"},"build_verify":{"dependency":"direct dev","description":{"name":"build_verify","sha256":"3b17b59b6d66f9d3e6014996f089902d56cec5760e051c353cc387b9da577652","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"built_collection":{"dependency":"transitive","description":{"name":"built_collection","sha256":"376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"built_value":{"dependency":"transitive","description":{"name":"built_value","sha256":"0730c18c770d05636a8f945c32a4d7d81cb6e0f0148c8db4ad12e7748f7e49af","url":"https://pub.dev"},"source":"hosted","version":"8.12.5"},"characters":{"dependency":"transitive","description":{"name":"characters","sha256":"04a925763edad70e8443c99234dc3328f442e811f1d8fd1a72f1c8ad0f69a605","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"charcode":{"dependency":"transitive","description":{"name":"charcode","sha256":"fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"checked_yaml":{"dependency":"transitive","description":{"name":"checked_yaml","sha256":"feb6bed21949061731a7a75fc5d2aa727cf160b91af9a3e464c5e3a32e28b5ff","url":"https://pub.dev"},"source":"hosted","version":"2.0.3"},"chunked_stream":{"dependency":"direct main","description":{"name":"chunked_stream","sha256":"b2fde5f81d780f0c1699b8347cae2e413412ae947fc6e64727cc48c6bb54c95c","url":"https://pub.dev"},"source":"hosted","version":"1.4.2"},"cli_config":{"dependency":"transitive","description":{"name":"cli_config","sha256":"ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"cli_util":{"dependency":"transitive","description":{"name":"cli_util","sha256":"ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"clock":{"dependency":"direct overridden","description":{"name":"clock","sha256":"fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"code_builder":{"dependency":"transitive","description":{"name":"code_builder","sha256":"0ec10bf4a89e4c613960bf1e8b42c64127021740fb21640c29c909826a5eea3e","url":"https://pub.dev"},"source":"hosted","version":"4.10.1"},"collection":{"dependency":"direct main","description":{"name":"collection","sha256":"a1ace0a119f20aabc852d165077c036cd864315bd99b7eaa10a60100341941bf","url":"https://pub.dev"},"source":"hosted","version":"1.19.0"},"confetti":{"dependency":"direct main","description":{"name":"confetti","sha256":"79376a99648efbc3f23582f5784ced0fe239922bd1a0fb41f582051eba750751","url":"https://pub.dev"},"source":"hosted","version":"0.8.0"},"connectivity_plus":{"dependency":"direct main","description":{"name":"connectivity_plus","sha256":"b8fe52979ff12432ecf8f0abf6ff70410b1bb734be1c9e4f2f86807ad7166c79","url":"https://pub.dev"},"source":"hosted","version":"7.1.0"},"connectivity_plus_platform_interface":{"dependency":"transitive","description":{"name":"connectivity_plus_platform_interface","sha256":"3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed","url":"https://pub.dev"},"source":"hosted","version":"2.1.0"},"console":{"dependency":"transitive","description":{"name":"console","sha256":"e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"convert":{"dependency":"direct main","description":{"name":"convert","sha256":"b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68","url":"https://pub.dev"},"source":"hosted","version":"3.1.2"},"coverage":{"dependency":"transitive","description":{"name":"coverage","sha256":"5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d","url":"https://pub.dev"},"source":"hosted","version":"1.15.0"},"cronet_http":{"dependency":"transitive","description":{"name":"cronet_http","sha256":"07bfb4c6158aef72f8004631826abaeecdeaa2b6042f5f8916b8db20e1d01b4a","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"crop_your_image":{"dependency":"direct main","description":{"name":"crop_your_image","sha256":"14c8977b11a009dc5e73e0f6522970f93363e38183f1b2ffefe1676dc9c3f49d","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"cross_file":{"dependency":"transitive","description":{"name":"cross_file","sha256":"7caf6a750a0c04effbb52a676dce9a4a592e10ad35c34d6d2d0e4811160d5670","url":"https://pub.dev"},"source":"hosted","version":"0.3.4+2"},"crypto":{"dependency":"direct main","description":{"name":"crypto","sha256":"c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf","url":"https://pub.dev"},"source":"hosted","version":"3.0.7"},"crypto_keys":{"dependency":"transitive","description":{"name":"crypto_keys","sha256":"2ed305a11a3e5d16dd7f489121c956fd19b9816938bb68bc7ed3a379827a304e","url":"https://pub.dev"},"source":"hosted","version":"0.3.0+2"},"csslib":{"dependency":"direct main","description":{"name":"csslib","sha256":"09bad715f418841f976c77db72d5398dc1253c21fb9c0c7f0b0b985860b2d58e","url":"https://pub.dev"},"source":"hosted","version":"1.0.2"},"csv":{"dependency":"transitive","description":{"name":"csv","sha256":"c6aa2679b2a18cb57652920f674488d89712efaf4d3fdf2e537215b35fc19d6c","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"cupertino_http":{"dependency":"transitive","description":{"name":"cupertino_http","sha256":"72187f715837290a63479a5b0ae709f4fedad0ed6bd0441c275eceaa02d5abae","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"cupertino_icons":{"dependency":"direct main","description":{"name":"cupertino_icons","sha256":"ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6","url":"https://pub.dev"},"source":"hosted","version":"1.0.8"},"dart_earcut":{"dependency":"transitive","description":{"name":"dart_earcut","sha256":"e485001bfc05dcbc437d7bfb666316182e3522d4c3f9668048e004d0eb2ce43b","url":"https://pub.dev"},"source":"hosted","version":"1.2.0"},"dart_ping":{"dependency":"transitive","description":{"name":"dart_ping","sha256":"2f5418d0a5c64e53486caaac78677b25725b1e13c33c5be834ce874ea18bd24f","url":"https://pub.dev"},"source":"hosted","version":"9.0.1"},"dart_polylabel2":{"dependency":"transitive","description":{"name":"dart_polylabel2","sha256":"7eeab15ce72894e4bdba6a8765712231fc81be0bd95247de4ad9966abc57adc6","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"dart_style":{"dependency":"transitive","description":{"name":"dart_style","sha256":"27eb0ae77836989a3bc541ce55595e8ceee0992807f14511552a898ddd0d88ac","url":"https://pub.dev"},"source":"hosted","version":"3.0.1"},"dbus":{"dependency":"transitive","description":{"name":"dbus","sha256":"d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270","url":"https://pub.dev"},"source":"hosted","version":"0.7.12"},"defer_pointer":{"dependency":"direct main","description":{"name":"defer_pointer","sha256":"d69e6f8c1d0f052d2616cc1db3782e0ea73f42e4c6f6122fd1a548dfe79faf02","url":"https://pub.dev"},"source":"hosted","version":"0.0.2"},"desktop_webview_auth":{"dependency":"direct main","description":{"path":".","ref":"webkit2gtk-4.1","resolved-ref":"4e1a29541a7356e23c53eb079cd3643899fc6fd4","url":"https://github.com/BlueBubblesApp/flutter_desktop_webview_auth.git"},"source":"git","version":"0.0.16"},"device_info_plus":{"dependency":"direct main","description":{"name":"device_info_plus","sha256":"72d146c6d7098689ff5c5f66bcf593ac11efc530095385356e131070333e64da","url":"https://pub.dev"},"source":"hosted","version":"11.3.0"},"device_info_plus_platform_interface":{"dependency":"transitive","description":{"name":"device_info_plus_platform_interface","sha256":"0b04e02b30791224b31969eb1b50d723498f402971bff3630bca2ba839bd1ed2","url":"https://pub.dev"},"source":"hosted","version":"7.0.2"},"dice_bear":{"dependency":"direct main","description":{"name":"dice_bear","sha256":"4dde957ee3838f1de82aeff43c68f8e976f102ed9b5cb3be2ba1abe243a109af","url":"https://pub.dev"},"source":"hosted","version":"0.1.7"},"dio":{"dependency":"direct main","description":{"name":"dio","sha256":"aff32c08f92787a557dd5c0145ac91536481831a01b4648136373cddb0e64f8c","url":"https://pub.dev"},"source":"hosted","version":"5.9.2"},"dio_web_adapter":{"dependency":"transitive","description":{"name":"dio_web_adapter","sha256":"2f9e64323a7c3c7ef69567d5c800424a11f8337b8b228bad02524c9fb3c1f340","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"disable_battery_optimization":{"dependency":"direct main","description":{"path":".","ref":"996c83bf5f58522ba8da3ce6f44952be7b68171c","resolved-ref":"996c83bf5f58522ba8da3ce6f44952be7b68171c","url":"https://github.com/BlueBubblesApp/Disable-Battery-Optimizations.git"},"source":"git","version":"1.1.1"},"dlibphonenumber":{"dependency":"direct main","description":{"name":"dlibphonenumber","sha256":"ae6ee5e852008986e31b50cf87619033cefd9257b0e42596a6779bd2d2ed7688","url":"https://pub.dev"},"source":"hosted","version":"1.1.48"},"dynamic_color":{"dependency":"direct main","description":{"name":"dynamic_color","sha256":"eae98052fa6e2826bdac3dd2e921c6ce2903be15c6b7f8b6d8a5d49b5086298d","url":"https://pub.dev"},"source":"hosted","version":"1.7.0"},"easy_debounce":{"dependency":"direct main","description":{"name":"easy_debounce","sha256":"f082609cfb8f37defb9e37fc28bc978c6712dedf08d4c5a26f820fa10165a236","url":"https://pub.dev"},"source":"hosted","version":"2.0.3"},"emoji_picker_flutter":{"dependency":"direct main","description":{"name":"emoji_picker_flutter","sha256":"984d3e9b9cf3175df9a868ce4a2d9611491e80e5d3b8e2b1e8991a4998972885","url":"https://pub.dev"},"source":"hosted","version":"4.4.0"},"encrypter_plus":{"dependency":"direct main","description":{"name":"encrypter_plus","sha256":"6f6f3c73e26058af4fd138369a928ccae667e45d254cf6ded6301a2d99551a67","url":"https://pub.dev"},"source":"hosted","version":"5.1.0"},"equatable":{"dependency":"transitive","description":{"name":"equatable","sha256":"3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b","url":"https://pub.dev"},"source":"hosted","version":"2.0.8"},"exif":{"dependency":"direct main","description":{"name":"exif","sha256":"a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172","url":"https://pub.dev"},"source":"hosted","version":"3.3.0"},"expressions":{"dependency":"transitive","description":{"name":"expressions","sha256":"f3b0e99563a9a1bde1138e728eb722f292cc7d2aec55d28136c49b1a370306c5","url":"https://pub.dev"},"source":"hosted","version":"0.2.5+3"},"extended_image":{"dependency":"transitive","description":{"name":"extended_image","sha256":"69d4299043334ecece679996e47d0b0891cd8c29d8da0034868443506f1d9a78","url":"https://pub.dev"},"source":"hosted","version":"8.3.1"},"extended_image_library":{"dependency":"transitive","description":{"name":"extended_image_library","sha256":"e61dafd94400fff6ef7ed1523d445ff3af137f198f3228e4a3107bc5b4bec5d1","url":"https://pub.dev"},"source":"hosted","version":"4.0.6"},"fake_async":{"dependency":"transitive","description":{"name":"fake_async","sha256":"511392330127add0b769b75a987850d136345d9227c6b94c96a04cf4a391bf78","url":"https://pub.dev"},"source":"hosted","version":"1.3.1"},"faker":{"dependency":"direct main","description":{"name":"faker","sha256":"544c34e9e1d322824156d5a8d451bc1bb778263b892aded24ec7ba77b0706624","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"fast_contacts":{"dependency":"direct main","description":{"name":"fast_contacts","sha256":"e190397dc23dcf3c29fc11f2c7ca9c9ac420a50d183834bb60287c4624342f9b","url":"https://pub.dev"},"source":"hosted","version":"5.0.1"},"ffi":{"dependency":"transitive","description":{"name":"ffi","sha256":"16ed7b077ef01ad6170a3d0c57caa4a112a38d7a2ed5602e0aca9ca6f3d98da6","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"file":{"dependency":"transitive","description":{"name":"file","sha256":"a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4","url":"https://pub.dev"},"source":"hosted","version":"7.0.1"},"file_picker":{"dependency":"direct main","description":{"name":"file_picker","sha256":"57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343","url":"https://pub.dev"},"source":"hosted","version":"10.3.10"},"file_selector_linux":{"dependency":"transitive","description":{"name":"file_selector_linux","sha256":"54cbbd957e1156d29548c7d9b9ec0c0ebb6de0a90452198683a7d23aed617a33","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+2"},"file_selector_macos":{"dependency":"transitive","description":{"name":"file_selector_macos","sha256":"8c9250b2bd2d8d4268e39c82543bacbaca0fda7d29e0728c3c4bbb7c820fd711","url":"https://pub.dev"},"source":"hosted","version":"0.9.4+3"},"file_selector_platform_interface":{"dependency":"transitive","description":{"name":"file_selector_platform_interface","sha256":"a3994c26f10378a039faa11de174d7b78eb8f79e4dd0af2a451410c1a5c3f66b","url":"https://pub.dev"},"source":"hosted","version":"2.6.2"},"file_selector_windows":{"dependency":"transitive","description":{"name":"file_selector_windows","sha256":"320fcfb6f33caa90f0b58380489fc5ac05d99ee94b61aa96ec2bff0ba81d3c2b","url":"https://pub.dev"},"source":"hosted","version":"0.9.3+4"},"firebase_dart":{"dependency":"direct main","description":{"path":"packages/firebase_dart","ref":"beb79f70a2bb0e96e6bb9fdebac2ff452f138950","resolved-ref":"beb79f70a2bb0e96e6bb9fdebac2ff452f138950","url":"https://github.com/appsup-dart/firebase_dart.git"},"source":"git","version":"1.0.11"},"fixnum":{"dependency":"transitive","description":{"name":"fixnum","sha256":"b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"flat_buffers":{"dependency":"transitive","description":{"name":"flat_buffers","sha256":"380bdcba5664a718bfd4ea20a45d39e13684f5318fcd8883066a55e21f37f4c3","url":"https://pub.dev"},"source":"hosted","version":"23.5.26"},"flex_color_picker":{"dependency":"direct main","description":{"name":"flex_color_picker","sha256":"8f753a1a026a13ea5cc5eddbae3ceb886f2537569ab2e5208efb1e3bb5af72ff","url":"https://pub.dev"},"source":"hosted","version":"3.7.1"},"flex_color_scheme":{"dependency":"direct main","description":{"name":"flex_color_scheme","sha256":"ae638050fceb35b6040a43cf67892f9b956022068e736284919d93322fdd4ba2","url":"https://pub.dev"},"source":"hosted","version":"8.1.1"},"flex_seed_scheme":{"dependency":"transitive","description":{"name":"flex_seed_scheme","sha256":"b06d8b367b84cbf7ca5c5603c858fa5edae88486c4e4da79ac1044d73b6c62ec","url":"https://pub.dev"},"source":"hosted","version":"3.5.1"},"flutter":{"dependency":"direct main","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_acrylic":{"dependency":"direct main","description":{"name":"flutter_acrylic","sha256":"b3996dbde5abf5823cc9ead4cf2e5267c3181f15585fe47ce4dc4472e7ec827a","url":"https://pub.dev"},"source":"hosted","version":"1.1.4"},"flutter_audio_waveforms":{"dependency":"direct main","description":{"name":"flutter_audio_waveforms","sha256":"425dda9ee5ef9bb2ff2a2000b19ec595593b3baba6a1274da8d1d729846a144b","url":"https://pub.dev"},"source":"hosted","version":"1.2.1+8"},"flutter_displaymode":{"dependency":"direct main","description":{"name":"flutter_displaymode","sha256":"ecd44b1e902b0073b42ff5b55bf283f38e088270724cdbb7f7065ccf54aa60a8","url":"https://pub.dev"},"source":"hosted","version":"0.7.0"},"flutter_dotenv":{"dependency":"direct main","description":{"name":"flutter_dotenv","sha256":"d4130c4a43e0b13fefc593bc3961f2cb46e30cb79e253d4a526b1b5d24ae1ce4","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_image_compress":{"dependency":"direct main","description":{"name":"flutter_image_compress","sha256":"51d23be39efc2185e72e290042a0da41aed70b14ef97db362a6b5368d0523b27","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"flutter_image_compress_common":{"dependency":"transitive","description":{"name":"flutter_image_compress_common","sha256":"c5c5d50c15e97dd7dc72ff96bd7077b9f791932f2076c5c5b6c43f2c88607bfb","url":"https://pub.dev"},"source":"hosted","version":"1.0.6"},"flutter_image_compress_macos":{"dependency":"transitive","description":{"name":"flutter_image_compress_macos","sha256":"20019719b71b743aba0ef874ed29c50747461e5e8438980dfa5c2031898f7337","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"flutter_image_compress_ohos":{"dependency":"transitive","description":{"name":"flutter_image_compress_ohos","sha256":"e76b92bbc830ee08f5b05962fc78a532011fcd2041f620b5400a593e96da3f51","url":"https://pub.dev"},"source":"hosted","version":"0.0.3"},"flutter_image_compress_platform_interface":{"dependency":"transitive","description":{"name":"flutter_image_compress_platform_interface","sha256":"579cb3947fd4309103afe6442a01ca01e1e6f93dc53bb4cbd090e8ce34a41889","url":"https://pub.dev"},"source":"hosted","version":"1.0.5"},"flutter_image_compress_web":{"dependency":"transitive","description":{"name":"flutter_image_compress_web","sha256":"b9b141ac7c686a2ce7bb9a98176321e1182c9074650e47bb140741a44b6f5a96","url":"https://pub.dev"},"source":"hosted","version":"0.1.5"},"flutter_improved_scrolling":{"dependency":"direct main","description":{"name":"flutter_improved_scrolling","sha256":"e4b5184b63a2cacf93c6ccc22139cfc8e32c40861e88af3c890a631511259822","url":"https://pub.dev"},"source":"hosted","version":"0.0.4"},"flutter_isolate":{"dependency":"direct main","description":{"name":"flutter_isolate","sha256":"36a84e1a22371d8092ea2121145b330c24fb272acb951fb30c60ba44926b8fb3","url":"https://pub.dev"},"source":"hosted","version":"2.1.0"},"flutter_keyboard_visibility":{"dependency":"direct main","description":{"name":"flutter_keyboard_visibility","sha256":"98664be7be0e3ffca00de50f7f6a287ab62c763fc8c762e0a21584584a3ff4f8","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_keyboard_visibility_linux":{"dependency":"transitive","description":{"name":"flutter_keyboard_visibility_linux","sha256":"6fba7cd9bb033b6ddd8c2beb4c99ad02d728f1e6e6d9b9446667398b2ac39f08","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"flutter_keyboard_visibility_macos":{"dependency":"transitive","description":{"name":"flutter_keyboard_visibility_macos","sha256":"c5c49b16fff453dfdafdc16f26bdd8fb8d55812a1d50b0ce25fc8d9f2e53d086","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"flutter_keyboard_visibility_platform_interface":{"dependency":"transitive","description":{"name":"flutter_keyboard_visibility_platform_interface","sha256":"e43a89845873f7be10cb3884345ceb9aebf00a659f479d1c8f4293fcb37022a4","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"flutter_keyboard_visibility_web":{"dependency":"transitive","description":{"name":"flutter_keyboard_visibility_web","sha256":"d3771a2e752880c79203f8d80658401d0c998e4183edca05a149f5098ce6e3d1","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"flutter_keyboard_visibility_windows":{"dependency":"transitive","description":{"name":"flutter_keyboard_visibility_windows","sha256":"fc4b0f0b6be9b93ae527f3d527fb56ee2d918cd88bbca438c478af7bcfd0ef73","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"flutter_launcher_icons":{"dependency":"direct dev","description":{"name":"flutter_launcher_icons","sha256":"10f13781741a2e3972126fae08393d3c4e01fa4cd7473326b94b72cf594195e7","url":"https://pub.dev"},"source":"hosted","version":"0.14.4"},"flutter_lints":{"dependency":"direct dev","description":{"name":"flutter_lints","sha256":"5398f14efa795ffb7a33e9b6a08798b26a180edac4ad7db3f231e40f82ce11e1","url":"https://pub.dev"},"source":"hosted","version":"5.0.0"},"flutter_local_notifications":{"dependency":"direct main","description":{"name":"flutter_local_notifications","sha256":"19ffb0a8bb7407875555e5e98d7343a633bb73707bae6c6a5f37c90014077875","url":"https://pub.dev"},"source":"hosted","version":"19.5.0"},"flutter_local_notifications_linux":{"dependency":"transitive","description":{"name":"flutter_local_notifications_linux","sha256":"e3c277b2daab8e36ac5a6820536668d07e83851aeeb79c446e525a70710770a5","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"flutter_local_notifications_platform_interface":{"dependency":"transitive","description":{"name":"flutter_local_notifications_platform_interface","sha256":"277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe","url":"https://pub.dev"},"source":"hosted","version":"9.1.0"},"flutter_local_notifications_windows":{"dependency":"transitive","description":{"name":"flutter_local_notifications_windows","sha256":"8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"flutter_map":{"dependency":"direct overridden","description":{"path":".","ref":"67cca68e9f6db59649af56b6454e5f58efcedbbe","resolved-ref":"67cca68e9f6db59649af56b6454e5f58efcedbbe","url":"https://github.com/BlueBubblesApp/flutter_map.git"},"source":"git","version":"8.2.2"},"flutter_map_marker_popup":{"dependency":"direct main","description":{"name":"flutter_map_marker_popup","sha256":"982b38455e739fe04abf05066340e0ce5883c40fb08b121cc8c60f5ee2c664a3","url":"https://pub.dev"},"source":"hosted","version":"8.1.0"},"flutter_markdown_plus":{"dependency":"direct main","description":{"name":"flutter_markdown_plus","sha256":"039177906850278e8fb1cd364115ee0a46281135932fa8ecea8455522166d2de","url":"https://pub.dev"},"source":"hosted","version":"1.0.7"},"flutter_native_splash":{"dependency":"direct dev","description":{"name":"flutter_native_splash","sha256":"8321a6d11a8d13977fa780c89de8d257cce3d841eecfb7a4cadffcc4f12d82dc","url":"https://pub.dev"},"source":"hosted","version":"2.4.6"},"flutter_plugin_android_lifecycle":{"dependency":"transitive","description":{"name":"flutter_plugin_android_lifecycle","sha256":"6382ce712ff69b0f719640ce957559dde459e55ecd433c767e06d139ddf16cab","url":"https://pub.dev"},"source":"hosted","version":"2.0.29"},"flutter_slidable":{"dependency":"direct main","description":{"name":"flutter_slidable","sha256":"ea369262929d3cc6ebf9d8a00c196127966f117fe433a5e5cb47fb08008ca203","url":"https://pub.dev"},"source":"hosted","version":"4.0.3"},"flutter_sliding_up_panel":{"dependency":"direct main","description":{"name":"flutter_sliding_up_panel","sha256":"94f928973d83e146bbc52051e2d9f2a7ed7a5c9e7f04b54d835fff2e41d6cb99","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"flutter_staggered_grid_view":{"dependency":"direct main","description":{"name":"flutter_staggered_grid_view","sha256":"19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395","url":"https://pub.dev"},"source":"hosted","version":"0.7.0"},"flutter_svg":{"dependency":"direct main","description":{"name":"flutter_svg","sha256":"cd57f7969b4679317c17af6fd16ee233c1e60a82ed209d8a475c54fd6fd6f845","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"flutter_test":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"flutter_timezone":{"dependency":"direct main","description":{"name":"flutter_timezone","sha256":"13b2109ad75651faced4831bf262e32559e44aa549426eab8a597610d385d934","url":"https://pub.dev"},"source":"hosted","version":"4.1.1"},"flutter_web_plugins":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"frontend_server_client":{"dependency":"transitive","description":{"name":"frontend_server_client","sha256":"f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694","url":"https://pub.dev"},"source":"hosted","version":"4.0.0"},"geolocator":{"dependency":"direct main","description":{"name":"geolocator","sha256":"f62bcd90459e63210bbf9c35deb6a51c521f992a78de19a1fe5c11704f9530e2","url":"https://pub.dev"},"source":"hosted","version":"13.0.4"},"geolocator_android":{"dependency":"transitive","description":{"name":"geolocator_android","sha256":"fcb1760a50d7500deca37c9a666785c047139b5f9ee15aa5469fae7dbbe3170d","url":"https://pub.dev"},"source":"hosted","version":"4.6.2"},"geolocator_apple":{"dependency":"transitive","description":{"name":"geolocator_apple","sha256":"dbdd8789d5aaf14cf69f74d4925ad1336b4433a6efdf2fce91e8955dc921bf22","url":"https://pub.dev"},"source":"hosted","version":"2.3.13"},"geolocator_platform_interface":{"dependency":"transitive","description":{"name":"geolocator_platform_interface","sha256":"30cb64f0b9adcc0fb36f628b4ebf4f731a2961a0ebd849f4b56200205056fe67","url":"https://pub.dev"},"source":"hosted","version":"4.2.6"},"geolocator_web":{"dependency":"transitive","description":{"name":"geolocator_web","sha256":"b1ae9bdfd90f861fde8fd4f209c37b953d65e92823cb73c7dee1fa021b06f172","url":"https://pub.dev"},"source":"hosted","version":"4.1.3"},"geolocator_windows":{"dependency":"transitive","description":{"name":"geolocator_windows","sha256":"175435404d20278ffd220de83c2ca293b73db95eafbdc8131fe8609be1421eb6","url":"https://pub.dev"},"source":"hosted","version":"0.2.5"},"gesture_x_detector":{"dependency":"direct main","description":{"path":".","ref":"7de6e023ff68f67af1d83f7c1303d8b973f84944","resolved-ref":"7de6e023ff68f67af1d83f7c1303d8b973f84944","url":"https://github.com/BlueBubblesApp/xgesture_flutter.git"},"source":"git","version":"1.1.1"},"get":{"dependency":"direct main","description":{"name":"get","sha256":"5ed34a7925b85336e15d472cc4cfe7d9ebf4ab8e8b9f688585bf6b50f4c3d79a","url":"https://pub.dev"},"source":"hosted","version":"4.7.3"},"get_it":{"dependency":"transitive","description":{"name":"get_it","sha256":"ae78de7c3f2304b8d81f2bb6e320833e5e81de942188542328f074978cc0efa9","url":"https://pub.dev"},"source":"hosted","version":"8.3.0"},"git":{"dependency":"transitive","description":{"name":"git","sha256":"46556ed28a3b25b1be9bcde0291d84a57b206a899f8b37bf7ab335d8fb640e84","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"github":{"dependency":"direct main","description":{"name":"github","sha256":"c88cd9f11e131a05b1910e1c742c80e6dc7708701884d1fcf28147fc95933aa8","url":"https://pub.dev"},"source":"hosted","version":"9.25.0"},"glob":{"dependency":"transitive","description":{"name":"glob","sha256":"c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de","url":"https://pub.dev"},"source":"hosted","version":"2.1.3"},"globbing":{"dependency":"transitive","description":{"name":"globbing","sha256":"4f89cfaf6fa74c9c1740a96259da06bd45411ede56744e28017cc534a12b6e2d","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"google_fonts":{"dependency":"direct main","description":{"name":"google_fonts","sha256":"df9763500dadba0155373e9cb44e202ce21bd9ed5de6bdbd05c5854e86839cb8","url":"https://pub.dev"},"source":"hosted","version":"6.3.0"},"google_identity_services_web":{"dependency":"transitive","description":{"name":"google_identity_services_web","sha256":"5d187c46dc59e02646e10fe82665fc3884a9b71bc1c90c2b8b749316d33ee454","url":"https://pub.dev"},"source":"hosted","version":"0.3.3+1"},"google_ml_kit":{"dependency":"direct main","description":{"name":"google_ml_kit","sha256":"a2da12a62353a6cad71534b52ada3af14a5b842e6c9b1014ce4d243652b30f4b","url":"https://pub.dev"},"source":"hosted","version":"0.20.0"},"google_mlkit_barcode_scanning":{"dependency":"transitive","description":{"name":"google_mlkit_barcode_scanning","sha256":"b38505df2d3fdf7830979d60fee55039c2f442d189b2e06fcb2fe494ba65d0db","url":"https://pub.dev"},"source":"hosted","version":"0.14.1"},"google_mlkit_commons":{"dependency":"transitive","description":{"name":"google_mlkit_commons","sha256":"8f40fbac10685cad4715d11e6a0d86837d9ad7168684dfcad29610282a88e67a","url":"https://pub.dev"},"source":"hosted","version":"0.11.0"},"google_mlkit_digital_ink_recognition":{"dependency":"transitive","description":{"name":"google_mlkit_digital_ink_recognition","sha256":"8d2b89401bdeeba97158377167429dbc5cb339ebbd21e0889dca773f1c79a884","url":"https://pub.dev"},"source":"hosted","version":"0.14.1"},"google_mlkit_entity_extraction":{"dependency":"transitive","description":{"name":"google_mlkit_entity_extraction","sha256":"145bc26422b7e62d50cc4eca1ac394d13ac6a97e4c09b8baf7ff058b64d2f9cc","url":"https://pub.dev"},"source":"hosted","version":"0.15.1"},"google_mlkit_face_detection":{"dependency":"transitive","description":{"name":"google_mlkit_face_detection","sha256":"f336737d5b8a86797fd4368f42a5c26aeaa9c6dcc5243f0a16b5f6f663cfb70a","url":"https://pub.dev"},"source":"hosted","version":"0.13.1"},"google_mlkit_face_mesh_detection":{"dependency":"transitive","description":{"name":"google_mlkit_face_mesh_detection","sha256":"3683daed2463d9631c7f01b31bfc40d22a1fd4c0392d82a24ce275af06bc811f","url":"https://pub.dev"},"source":"hosted","version":"0.4.1"},"google_mlkit_image_labeling":{"dependency":"transitive","description":{"name":"google_mlkit_image_labeling","sha256":"2cac5f7a02dcc23cd3357f89bf1a79df793ae3afce5035a896de467ffa0192e8","url":"https://pub.dev"},"source":"hosted","version":"0.14.1"},"google_mlkit_language_id":{"dependency":"transitive","description":{"name":"google_mlkit_language_id","sha256":"fc57bca69cb1dcd8ef67b929f0315e9a8baa80c03c75f7a1226becd7ad2529ff","url":"https://pub.dev"},"source":"hosted","version":"0.13.0"},"google_mlkit_object_detection":{"dependency":"transitive","description":{"name":"google_mlkit_object_detection","sha256":"0f740f046d74faf81d9c44cdbe4accf33888ed9f877e30efbfad4578d45ebfcd","url":"https://pub.dev"},"source":"hosted","version":"0.15.0"},"google_mlkit_pose_detection":{"dependency":"transitive","description":{"name":"google_mlkit_pose_detection","sha256":"5ff5fe2a325427c49c02a884a2a888d2d10cbfe414f7ebf2af9777a5155171eb","url":"https://pub.dev"},"source":"hosted","version":"0.14.0"},"google_mlkit_selfie_segmentation":{"dependency":"transitive","description":{"name":"google_mlkit_selfie_segmentation","sha256":"e05fc255265595a0fb11cd6a6a5393f106d6ec4d3a40cbc57ff22894eef235f1","url":"https://pub.dev"},"source":"hosted","version":"0.10.0"},"google_mlkit_smart_reply":{"dependency":"direct main","description":{"name":"google_mlkit_smart_reply","sha256":"0c3d737e46f20aa4d4953860ee5757e5250e58f90351f8e2afdeb1d609c7047e","url":"https://pub.dev"},"source":"hosted","version":"0.13.0"},"google_mlkit_text_recognition":{"dependency":"transitive","description":{"name":"google_mlkit_text_recognition","sha256":"96173ad4dd7fd06c660e22ac3f9e9f1798a517fe7e48bee68eeec83853224224","url":"https://pub.dev"},"source":"hosted","version":"0.15.0"},"google_mlkit_translation":{"dependency":"transitive","description":{"name":"google_mlkit_translation","sha256":"7287444a0abd994087a0b354dee952fcd198e57619ded4bba65496d418c9d84b","url":"https://pub.dev"},"source":"hosted","version":"0.13.0"},"google_sign_in":{"dependency":"direct main","description":{"name":"google_sign_in","sha256":"939a8b58f84c4053811b8c1bc9adbcb59449a15b37958264bbf60020698cca0e","url":"https://pub.dev"},"source":"hosted","version":"7.1.1"},"google_sign_in_android":{"dependency":"transitive","description":{"name":"google_sign_in_android","sha256":"f256b8f0e6c09d135c166fe20b25256e24d60fe1a72e6bdc112a200bd0d555b4","url":"https://pub.dev"},"source":"hosted","version":"7.0.3"},"google_sign_in_ios":{"dependency":"transitive","description":{"name":"google_sign_in_ios","sha256":"c7ee744ebbcd98353966dbdee735d4fca085226f6bf725c6bea8a5c8fe0055bc","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"google_sign_in_platform_interface":{"dependency":"transitive","description":{"name":"google_sign_in_platform_interface","sha256":"8736443134d2cccadd4f228d600177cb3947e36683466a6ab96877ce6932885a","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"google_sign_in_web":{"dependency":"transitive","description":{"name":"google_sign_in_web","sha256":"09ac306b2787b48f19c857b9f93375b654f774643c75bd6a1a078c85f4f7b468","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"googleapis":{"dependency":"transitive","description":{"name":"googleapis","sha256":"dfea9984f0785ed445ba78e2aa8c55dadd86d6a60ea9e0ffbadad51edb5e7e36","url":"https://pub.dev"},"source":"hosted","version":"9.2.0"},"googleapis_auth":{"dependency":"transitive","description":{"name":"googleapis_auth","sha256":"befd71383a955535060acde8792e7efc11d2fccd03dd1d3ec434e85b68775938","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"graphs":{"dependency":"transitive","description":{"name":"graphs","sha256":"741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"gtk":{"dependency":"transitive","description":{"name":"gtk","sha256":"e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c","url":"https://pub.dev"},"source":"hosted","version":"2.1.0"},"hand_signature":{"dependency":"direct main","description":{"name":"hand_signature","sha256":"05b40d3b2d1885a5dda126f26db386660aa46e497b63c96feb91d3198a667eea","url":"https://pub.dev"},"source":"hosted","version":"3.1.0+2"},"hashcodes":{"dependency":"transitive","description":{"name":"hashcodes","sha256":"80f9410a5b3c8e110c4b7604546034749259f5d6dcca63e0d3c17c9258f1a651","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"hive":{"dependency":"transitive","description":{"name":"hive","sha256":"8dcf6db979d7933da8217edcec84e9df1bdb4e4edc7fc77dbd5aa74356d6d941","url":"https://pub.dev"},"source":"hosted","version":"2.2.3"},"html":{"dependency":"direct main","description":{"name":"html","sha256":"6d1264f2dffa1b1101c25a91dff0dc2daee4c18e87cd8538729773c073dbf602","url":"https://pub.dev"},"source":"hosted","version":"0.15.6"},"http":{"dependency":"direct overridden","description":{"name":"http","sha256":"87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"http_client_helper":{"dependency":"transitive","description":{"name":"http_client_helper","sha256":"8a9127650734da86b5c73760de2b404494c968a3fd55602045ffec789dac3cb1","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"http_multi_server":{"dependency":"transitive","description":{"name":"http_multi_server","sha256":"aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"http_parser":{"dependency":"transitive","description":{"name":"http_parser","sha256":"178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571","url":"https://pub.dev"},"source":"hosted","version":"4.1.2"},"http_profile":{"dependency":"transitive","description":{"name":"http_profile","sha256":"7e679e355b09aaee2ab5010915c932cce3f2d1c11c3b2dc177891687014ffa78","url":"https://pub.dev"},"source":"hosted","version":"0.1.0"},"idb_shim":{"dependency":"direct main","description":{"name":"idb_shim","sha256":"9e7ec816139bfafb69ae4b3668ad29dbd43c53428d6eb31f9332d42bd4fa7205","url":"https://pub.dev"},"source":"hosted","version":"2.6.1+7"},"image":{"dependency":"direct main","description":{"name":"image","sha256":"4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928","url":"https://pub.dev"},"source":"hosted","version":"4.5.4"},"image_picker":{"dependency":"direct main","description":{"name":"image_picker","sha256":"736eb56a911cf24d1859315ad09ddec0b66104bc41a7f8c5b96b4e2620cf5041","url":"https://pub.dev"},"source":"hosted","version":"1.2.0"},"image_picker_android":{"dependency":"transitive","description":{"name":"image_picker_android","sha256":"e83b2b05141469c5e19d77e1dfa11096b6b1567d09065b2265d7c6904560050c","url":"https://pub.dev"},"source":"hosted","version":"0.8.13"},"image_picker_for_web":{"dependency":"transitive","description":{"name":"image_picker_for_web","sha256":"40c2a6a0da15556dc0f8e38a3246064a971a9f512386c3339b89f76db87269b6","url":"https://pub.dev"},"source":"hosted","version":"3.1.0"},"image_picker_ios":{"dependency":"transitive","description":{"name":"image_picker_ios","sha256":"eb06fe30bab4c4497bad449b66448f50edcc695f1c59408e78aa3a8059eb8f0e","url":"https://pub.dev"},"source":"hosted","version":"0.8.13"},"image_picker_linux":{"dependency":"transitive","description":{"name":"image_picker_linux","sha256":"1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4","url":"https://pub.dev"},"source":"hosted","version":"0.2.2"},"image_picker_macos":{"dependency":"transitive","description":{"name":"image_picker_macos","sha256":"d58cd9d67793d52beefd6585b12050af0a7663c0c2a6ece0fb110a35d6955e04","url":"https://pub.dev"},"source":"hosted","version":"0.2.2"},"image_picker_platform_interface":{"dependency":"transitive","description":{"name":"image_picker_platform_interface","sha256":"9f143b0dba3e459553209e20cc425c9801af48e6dfa4f01a0fcf927be3f41665","url":"https://pub.dev"},"source":"hosted","version":"2.11.0"},"image_picker_windows":{"dependency":"transitive","description":{"name":"image_picker_windows","sha256":"d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae","url":"https://pub.dev"},"source":"hosted","version":"0.2.2"},"image_size_getter":{"dependency":"direct main","description":{"name":"image_size_getter","sha256":"7c26937e0ae341ca558b7556591fd0cc456fcc454583b7cb665d2f03e93e590f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"in_app_review":{"dependency":"direct main","description":{"name":"in_app_review","sha256":"ab26ac54dbd802896af78c670b265eaeab7ecddd6af4d0751e9604b60574817f","url":"https://pub.dev"},"source":"hosted","version":"2.0.11"},"in_app_review_platform_interface":{"dependency":"transitive","description":{"name":"in_app_review_platform_interface","sha256":"fed2c755f2125caa9ae10495a3c163aa7fab5af3585a9c62ef4a6920c5b45f10","url":"https://pub.dev"},"source":"hosted","version":"2.0.5"},"infinite_listview":{"dependency":"transitive","description":{"name":"infinite_listview","sha256":"f6062c1720eb59be553dfa6b89813d3e8dd2f054538445aaa5edaddfa5195ce6","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"internet_connection_checker_plus":{"dependency":"direct main","description":{"name":"internet_connection_checker_plus","sha256":"ef43530f24de6309f99802358f8a543ea1f2babc153effc84a75133751716892","url":"https://pub.dev"},"source":"hosted","version":"2.9.1+2"},"intl":{"dependency":"direct main","description":{"name":"intl","sha256":"3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5","url":"https://pub.dev"},"source":"hosted","version":"0.20.2"},"io":{"dependency":"direct main","description":{"name":"io","sha256":"dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b","url":"https://pub.dev"},"source":"hosted","version":"1.0.5"},"irondash_engine_context":{"dependency":"transitive","description":{"name":"irondash_engine_context","sha256":"2bb0bc13dfda9f5aaef8dde06ecc5feb1379f5bb387d59716d799554f3f305d7","url":"https://pub.dev"},"source":"hosted","version":"0.5.5"},"irondash_message_channel":{"dependency":"transitive","description":{"name":"irondash_message_channel","sha256":"b4101669776509c76133b8917ab8cfc704d3ad92a8c450b92934dd8884a2f060","url":"https://pub.dev"},"source":"hosted","version":"0.7.0"},"jni":{"dependency":"transitive","description":{"name":"jni","sha256":"d2c361082d554d4593c3012e26f6b188f902acd291330f13d6427641a92b3da1","url":"https://pub.dev"},"source":"hosted","version":"0.14.2"},"jose":{"dependency":"transitive","description":{"name":"jose","sha256":"a0a339d0a0652dc1bd89f8b92d38479e07e16db83858fb55fa57212479f323f7","url":"https://pub.dev"},"source":"hosted","version":"0.3.5+2"},"js":{"dependency":"transitive","description":{"name":"js","sha256":"f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3","url":"https://pub.dev"},"source":"hosted","version":"0.6.7"},"json_annotation":{"dependency":"transitive","description":{"name":"json_annotation","sha256":"1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1","url":"https://pub.dev"},"source":"hosted","version":"4.9.0"},"languagetool_textfield":{"dependency":"direct main","description":{"name":"languagetool_textfield","sha256":"53ae4016e0544daadae3594cb4a55e2c40fc3d533b6a64df9d0df1ede55c4437","url":"https://pub.dev"},"source":"hosted","version":"0.1.1"},"latlong2":{"dependency":"direct main","description":{"name":"latlong2","sha256":"98227922caf49e6056f91b6c56945ea1c7b166f28ffcd5fb8e72fc0b453cc8fe","url":"https://pub.dev"},"source":"hosted","version":"0.9.1"},"launch_at_startup":{"dependency":"direct main","description":{"name":"launch_at_startup","sha256":"1f8a75520913d1038630049e6c44a2575a23ffd28cc8b14fdf37401d1d21de84","url":"https://pub.dev"},"source":"hosted","version":"0.3.1"},"leak_tracker":{"dependency":"transitive","description":{"name":"leak_tracker","sha256":"7bb2830ebd849694d1ec25bf1f44582d6ac531a57a365a803a6034ff751d2d06","url":"https://pub.dev"},"source":"hosted","version":"10.0.7"},"leak_tracker_flutter_testing":{"dependency":"transitive","description":{"name":"leak_tracker_flutter_testing","sha256":"9491a714cca3667b60b5c420da8217e6de0d1ba7a5ec322fab01758f6998f379","url":"https://pub.dev"},"source":"hosted","version":"3.0.8"},"leak_tracker_testing":{"dependency":"transitive","description":{"name":"leak_tracker_testing","sha256":"6ba465d5d76e67ddf503e1161d1f4a6bc42306f9d66ca1e8f079a47290fb06d3","url":"https://pub.dev"},"source":"hosted","version":"3.0.1"},"lints":{"dependency":"transitive","description":{"name":"lints","sha256":"c35bb79562d980e9a453fc715854e1ed39e24e7d0297a880ef54e17f9874a9d7","url":"https://pub.dev"},"source":"hosted","version":"5.1.1"},"local_auth":{"dependency":"direct main","description":{"name":"local_auth","sha256":"434d854cf478f17f12ab29a76a02b3067f86a63a6d6c4eb8fbfdcfe4879c1b7b","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"local_auth_android":{"dependency":"transitive","description":{"name":"local_auth_android","sha256":"316503f6772dea9c0c038bb7aac4f68ab00112d707d258c770f7fc3c250a2d88","url":"https://pub.dev"},"source":"hosted","version":"1.0.51"},"local_auth_darwin":{"dependency":"transitive","description":{"name":"local_auth_darwin","sha256":"0e9706a8543a4a2eee60346294d6a633dd7c3ee60fae6b752570457c4ff32055","url":"https://pub.dev"},"source":"hosted","version":"1.6.0"},"local_auth_platform_interface":{"dependency":"transitive","description":{"name":"local_auth_platform_interface","sha256":"1b842ff177a7068442eae093b64abe3592f816afd2a533c0ebcdbe40f9d2075a","url":"https://pub.dev"},"source":"hosted","version":"1.0.10"},"local_auth_windows":{"dependency":"transitive","description":{"name":"local_auth_windows","sha256":"bc4e66a29b0fdf751aafbec923b5bed7ad6ed3614875d8151afe2578520b2ab5","url":"https://pub.dev"},"source":"hosted","version":"1.0.11"},"local_notifier":{"dependency":"direct main","description":{"path":".","ref":"1483ded842d728f438310ab38765dcda6b9926e7","resolved-ref":"1483ded842d728f438310ab38765dcda6b9926e7","url":"https://github.com/BlueBubblesApp/local_notifier.git"},"source":"git","version":"0.1.6"},"logger":{"dependency":"direct main","description":{"name":"logger","sha256":"25aee487596a6257655a1e091ec2ae66bc30e7af663592cc3a27e6591e05035c","url":"https://pub.dev"},"source":"hosted","version":"2.7.0"},"logging":{"dependency":"transitive","description":{"name":"logging","sha256":"c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"macos_window_utils":{"dependency":"transitive","description":{"name":"macos_window_utils","sha256":"cb918e1ff0b31fdaa5cd8631eded7c24bd72e1025cf1f95c819e483f0057c652","url":"https://pub.dev"},"source":"hosted","version":"1.9.1"},"macros":{"dependency":"transitive","description":{"name":"macros","sha256":"1d9e801cd66f7ea3663c45fc708450db1fa57f988142c64289142c9b7ee80656","url":"https://pub.dev"},"source":"hosted","version":"0.1.3-main.0"},"maps_launcher":{"dependency":"direct main","description":{"name":"maps_launcher","sha256":"dac4c609720211fa6336b5903d917fe45e545c6b5665978efc3db2a3f436b1ae","url":"https://pub.dev"},"source":"hosted","version":"3.0.0+1"},"markdown":{"dependency":"transitive","description":{"name":"markdown","sha256":"935e23e1ff3bc02d390bad4d4be001208ee92cc217cb5b5a6c19bc14aaa318c1","url":"https://pub.dev"},"source":"hosted","version":"7.3.0"},"matcher":{"dependency":"transitive","description":{"name":"matcher","sha256":"d2323aa2060500f906aa31a895b4030b6da3ebdcc5619d14ce1aada65cd161cb","url":"https://pub.dev"},"source":"hosted","version":"0.12.16+1"},"material_color_utilities":{"dependency":"direct main","description":{"name":"material_color_utilities","sha256":"f7142bb1154231d7ea5f96bc7bde4bda2a0945d2806bb11670e30b850d56bdec","url":"https://pub.dev"},"source":"hosted","version":"0.11.1"},"media_kit":{"dependency":"direct main","description":{"name":"media_kit","sha256":"ae9e79597500c7ad6083a3c7b7b7544ddabfceacce7ae5c9709b0ec16a5d6643","url":"https://pub.dev"},"source":"hosted","version":"1.2.6"},"media_kit_libs_android_video":{"dependency":"transitive","description":{"name":"media_kit_libs_android_video","sha256":"3f6274e5ab2de512c286a25c327288601ee445ed8ac319e0ef0b66148bd8f76c","url":"https://pub.dev"},"source":"hosted","version":"1.3.8"},"media_kit_libs_ios_video":{"dependency":"transitive","description":{"name":"media_kit_libs_ios_video","sha256":"b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991","url":"https://pub.dev"},"source":"hosted","version":"1.1.4"},"media_kit_libs_linux":{"dependency":"transitive","description":{"name":"media_kit_libs_linux","sha256":"2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"media_kit_libs_macos_video":{"dependency":"transitive","description":{"name":"media_kit_libs_macos_video","sha256":"f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d","url":"https://pub.dev"},"source":"hosted","version":"1.1.4"},"media_kit_libs_video":{"dependency":"direct main","description":{"name":"media_kit_libs_video","sha256":"2b235b5dac79c6020e01eef5022c6cc85fedc0df1738aadc6ea489daa12a92a9","url":"https://pub.dev"},"source":"hosted","version":"1.0.7"},"media_kit_libs_windows_video":{"dependency":"transitive","description":{"name":"media_kit_libs_windows_video","sha256":"dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab","url":"https://pub.dev"},"source":"hosted","version":"1.0.11"},"media_kit_video":{"dependency":"direct main","description":{"name":"media_kit_video","sha256":"afaa509e7b7e0bf247557a3a740cde903a52c34ace9810f94500e127bd7b043d","url":"https://pub.dev"},"source":"hosted","version":"2.0.1"},"menu_base":{"dependency":"transitive","description":{"name":"menu_base","sha256":"820368014a171bd1241030278e6c2617354f492f5c703d7b7d4570a6b8b84405","url":"https://pub.dev"},"source":"hosted","version":"0.1.1"},"meta":{"dependency":"direct overridden","description":{"name":"meta","sha256":"23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394","url":"https://pub.dev"},"source":"hosted","version":"1.17.0"},"metadata_fetch":{"dependency":"direct main","description":{"name":"metadata_fetch","sha256":"24a713eaddbebea3dc3036a6c1d6f7c57e187fff5f0ef07be3e3ebbb7820c3e7","url":"https://pub.dev"},"source":"hosted","version":"0.4.2"},"mgrs_dart":{"dependency":"transitive","description":{"name":"mgrs_dart","sha256":"385e7168ecc77eb545220223c49eef8ab249da7bf57f22781c40a04d23fb196f","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"mime":{"dependency":"transitive","description":{"name":"mime","sha256":"41a20518f0cb1256669420fdba0cd90d21561e560ac240f26ef8322e45bb7ed6","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"mime_type":{"dependency":"direct main","description":{"name":"mime_type","sha256":"d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"mobile_scanner":{"dependency":"direct main","description":{"name":"mobile_scanner","sha256":"0b466a0a8a211b366c2e87f3345715faef9b6011c7147556ad22f37de6ba3173","url":"https://pub.dev"},"source":"hosted","version":"6.0.11"},"msix":{"dependency":"direct main","description":{"name":"msix","sha256":"f88033fcb9e0dd8de5b18897cbebbd28ea30596810f4a7c86b12b0c03ace87e5","url":"https://pub.dev"},"source":"hosted","version":"3.16.12"},"multi_value_listenable_builder":{"dependency":"direct main","description":{"name":"multi_value_listenable_builder","sha256":"5d073a5ab4935c3eab7134dec939544467bdf8a71ab24d01f0dcc3f94f03a71e","url":"https://pub.dev"},"source":"hosted","version":"0.0.2"},"multicast_dns":{"dependency":"transitive","description":{"name":"multicast_dns","sha256":"de72ada5c3db6fdd6ad4ae99452fe05fb403c4bb37c67ceb255ddd37d2b5b1eb","url":"https://pub.dev"},"source":"hosted","version":"0.3.3"},"native_dio_adapter":{"dependency":"direct main","description":{"name":"native_dio_adapter","sha256":"9bbfa5221fd287eb063962bbe6534290e5f87933e576fac210149fb80253b89a","url":"https://pub.dev"},"source":"hosted","version":"1.5.1"},"nested":{"dependency":"transitive","description":{"name":"nested","sha256":"03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"network_info_plus":{"dependency":"direct main","description":{"name":"network_info_plus","sha256":"2866dadcbee2709e20d67737a1556f5675b8b0cdcf2c1659ba74bc21bffede4f","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"network_info_plus_platform_interface":{"dependency":"transitive","description":{"name":"network_info_plus_platform_interface","sha256":"7e7496a8a9d8136859b8881affc613c4a21304afeb6c324bcefc4bd0aff6b94b","url":"https://pub.dev"},"source":"hosted","version":"2.0.2"},"network_tools":{"dependency":"direct main","description":{"name":"network_tools","sha256":"c48cb49b0e20e968c83147725e1d941544296b8414987a8a4bb7dd9dd664d443","url":"https://pub.dev"},"source":"hosted","version":"5.0.6"},"nm":{"dependency":"transitive","description":{"name":"nm","sha256":"2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254","url":"https://pub.dev"},"source":"hosted","version":"0.5.0"},"node_preamble":{"dependency":"transitive","description":{"name":"node_preamble","sha256":"6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db","url":"https://pub.dev"},"source":"hosted","version":"2.0.2"},"numberpicker":{"dependency":"direct main","description":{"name":"numberpicker","sha256":"4c129154944b0f6b133e693f8749c3f8bfb67c4d07ef9dcab48b595c22d1f156","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"objectbox":{"dependency":"direct main","description":{"name":"objectbox","sha256":"25c2e24b417d938decb5598682dc831bc6a21856eaae65affbc57cfad326808d","url":"https://pub.dev"},"source":"hosted","version":"4.3.0"},"objectbox_flutter_libs":{"dependency":"direct main","description":{"name":"objectbox_flutter_libs","sha256":"574b0233ba79a7159fca9049c67974f790a2180b6141d4951112b20bd146016a","url":"https://pub.dev"},"source":"hosted","version":"4.3.0"},"objectbox_generator":{"dependency":"direct dev","description":{"name":"objectbox_generator","sha256":"1b17e9168d03706b5bb895b5f36f4301aa7c973ac30ff761b205b1ca3e2e3865","url":"https://pub.dev"},"source":"hosted","version":"4.3.0"},"objective_c":{"dependency":"transitive","description":{"name":"objective_c","sha256":"9f034ba1eeca53ddb339bc8f4813cb07336a849cd735559b60cdc068ecce2dc7","url":"https://pub.dev"},"source":"hosted","version":"7.1.0"},"on_exit":{"dependency":"direct main","description":{"name":"on_exit","sha256":"5a4c625374ddc9146b5dc6617e5c9885e326d0e876cf6554875f9961f564bd96","url":"https://pub.dev"},"source":"hosted","version":"1.0.0"},"open_filex":{"dependency":"direct main","description":{"name":"open_filex","sha256":"9976da61b6a72302cf3b1efbce259200cd40232643a467aac7370addf94d6900","url":"https://pub.dev"},"source":"hosted","version":"4.7.0"},"openid_client":{"dependency":"transitive","description":{"name":"openid_client","sha256":"5cf6fee07fc6ac855172738d450b6f1b68b34d08faf312c0e741e2199411aa71","url":"https://pub.dev"},"source":"hosted","version":"0.4.10"},"package_config":{"dependency":"transitive","description":{"name":"package_config","sha256":"f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"package_info_plus":{"dependency":"direct main","description":{"name":"package_info_plus","sha256":"16eee997588c60225bda0488b6dcfac69280a6b7a3cf02c741895dd370a02968","url":"https://pub.dev"},"source":"hosted","version":"8.3.1"},"package_info_plus_platform_interface":{"dependency":"transitive","description":{"name":"package_info_plus_platform_interface","sha256":"202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"particles_flutter":{"dependency":"direct main","description":{"name":"particles_flutter","sha256":"35a010675a4d07d89501d555e1a477b39d32a1fb1ad1e16e6cd85f25149d8f53","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"pasteboard":{"dependency":"direct main","description":{"name":"pasteboard","sha256":"9ff73ada33f79a59ff91f6c01881fd4ed0a0031cfc4ae2d86c0384471525fca1","url":"https://pub.dev"},"source":"hosted","version":"0.4.0"},"path":{"dependency":"direct overridden","description":{"name":"path","sha256":"75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5","url":"https://pub.dev"},"source":"hosted","version":"1.9.1"},"path_parsing":{"dependency":"transitive","description":{"name":"path_parsing","sha256":"883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"path_provider":{"dependency":"direct main","description":{"name":"path_provider","sha256":"50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd","url":"https://pub.dev"},"source":"hosted","version":"2.1.5"},"path_provider_android":{"dependency":"transitive","description":{"name":"path_provider_android","sha256":"d0d310befe2c8ab9e7f393288ccbb11b60c019c6b5afc21973eeee4dda2b35e9","url":"https://pub.dev"},"source":"hosted","version":"2.2.17"},"path_provider_foundation":{"dependency":"transitive","description":{"name":"path_provider_foundation","sha256":"4843174df4d288f5e29185bd6e72a6fbdf5a4a4602717eed565497429f179942","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"path_provider_linux":{"dependency":"transitive","description":{"name":"path_provider_linux","sha256":"f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279","url":"https://pub.dev"},"source":"hosted","version":"2.2.1"},"path_provider_platform_interface":{"dependency":"transitive","description":{"name":"path_provider_platform_interface","sha256":"88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"path_provider_windows":{"dependency":"transitive","description":{"name":"path_provider_windows","sha256":"bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"pdf":{"dependency":"direct main","description":{"name":"pdf","sha256":"28eacad99bffcce2e05bba24e50153890ad0255294f4dd78a17075a2ba5c8416","url":"https://pub.dev"},"source":"hosted","version":"3.11.3"},"pdf_widget_wrapper":{"dependency":"transitive","description":{"name":"pdf_widget_wrapper","sha256":"c930860d987213a3d58c7ec3b7ecf8085c3897f773e8dc23da9cae60a5d6d0f5","url":"https://pub.dev"},"source":"hosted","version":"1.0.4"},"peanut":{"dependency":"direct dev","description":{"name":"peanut","sha256":"b7e5fffabc97c4f0bfcce723a1a437202d33ae9f8a1c5962c68834315b56c737","url":"https://pub.dev"},"source":"hosted","version":"6.0.0"},"permission_handler":{"dependency":"direct main","description":{"name":"permission_handler","sha256":"bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1","url":"https://pub.dev"},"source":"hosted","version":"12.0.1"},"permission_handler_android":{"dependency":"transitive","description":{"name":"permission_handler_android","sha256":"1e3bc410ca1bf84662104b100eb126e066cb55791b7451307f9708d4007350e6","url":"https://pub.dev"},"source":"hosted","version":"13.0.1"},"permission_handler_apple":{"dependency":"transitive","description":{"name":"permission_handler_apple","sha256":"f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023","url":"https://pub.dev"},"source":"hosted","version":"9.4.7"},"permission_handler_html":{"dependency":"transitive","description":{"name":"permission_handler_html","sha256":"38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24","url":"https://pub.dev"},"source":"hosted","version":"0.1.3+5"},"permission_handler_platform_interface":{"dependency":"direct overridden","description":{"name":"permission_handler_platform_interface","sha256":"eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878","url":"https://pub.dev"},"source":"hosted","version":"4.3.0"},"permission_handler_windows":{"dependency":"direct overridden","description":{"path":"permission_handler_windows","ref":"251a9475644f64784efedff4b3a8bd5c99d3884d","resolved-ref":"251a9475644f64784efedff4b3a8bd5c99d3884d","url":"https://github.com/BlueBubblesApp/flutter-permission-handler.git"},"source":"git","version":"0.2.1"},"petitparser":{"dependency":"transitive","description":{"name":"petitparser","sha256":"07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"photo_manager":{"dependency":"direct main","description":{"name":"photo_manager","sha256":"fb3bc8ea653370f88742b3baa304700107c83d12748aa58b2b9f2ed3ef15e6c2","url":"https://pub.dev"},"source":"hosted","version":"3.9.0"},"photo_view":{"dependency":"direct main","description":{"name":"photo_view","sha256":"1fc3d970a91295fbd1364296575f854c9863f225505c28c46e0a03e48960c75e","url":"https://pub.dev"},"source":"hosted","version":"0.15.0"},"pixel_snap":{"dependency":"transitive","description":{"name":"pixel_snap","sha256":"677410ea37b07cd37ecb6d5e6c0d8d7615a7cf3bd92ba406fd1ac57e937d1fb0","url":"https://pub.dev"},"source":"hosted","version":"0.1.5"},"platform":{"dependency":"transitive","description":{"name":"platform","sha256":"5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984","url":"https://pub.dev"},"source":"hosted","version":"3.1.6"},"plugin_platform_interface":{"dependency":"transitive","description":{"name":"plugin_platform_interface","sha256":"4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02","url":"https://pub.dev"},"source":"hosted","version":"2.1.8"},"pointer_interceptor":{"dependency":"transitive","description":{"name":"pointer_interceptor","sha256":"57210410680379aea8b1b7ed6ae0c3ad349bfd56fe845b8ea934a53344b9d523","url":"https://pub.dev"},"source":"hosted","version":"0.10.1+2"},"pointer_interceptor_ios":{"dependency":"transitive","description":{"name":"pointer_interceptor_ios","sha256":"a6906772b3205b42c44614fcea28f818b1e5fdad73a4ca742a7bd49818d9c917","url":"https://pub.dev"},"source":"hosted","version":"0.10.1"},"pointer_interceptor_platform_interface":{"dependency":"transitive","description":{"name":"pointer_interceptor_platform_interface","sha256":"0597b0560e14354baeb23f8375cd612e8bd4841bf8306ecb71fcd0bb78552506","url":"https://pub.dev"},"source":"hosted","version":"0.10.0+1"},"pointer_interceptor_web":{"dependency":"transitive","description":{"name":"pointer_interceptor_web","sha256":"460b600e71de6fcea2b3d5f662c92293c049c4319e27f0829310e5a953b3ee2a","url":"https://pub.dev"},"source":"hosted","version":"0.10.3"},"pointycastle":{"dependency":"direct overridden","description":{"name":"pointycastle","sha256":"92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5","url":"https://pub.dev"},"source":"hosted","version":"4.0.0"},"pool":{"dependency":"transitive","description":{"name":"pool","sha256":"978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d","url":"https://pub.dev"},"source":"hosted","version":"1.5.2"},"posix":{"dependency":"transitive","description":{"name":"posix","sha256":"185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"printing":{"dependency":"direct main","description":{"name":"printing","sha256":"689170c9ddb1bda85826466ba80378aa8993486d3c959a71cd7d2d80cb606692","url":"https://pub.dev"},"source":"hosted","version":"5.14.3"},"process_run":{"dependency":"transitive","description":{"name":"process_run","sha256":"a68fa9727392edad97a2a96a77ce8b0c17d28336ba1b284b1dfac9595a4299ea","url":"https://pub.dev"},"source":"hosted","version":"1.2.2+1"},"proj4dart":{"dependency":"transitive","description":{"name":"proj4dart","sha256":"ddcedc1f7876e62717de43ab3491e2829bdad0b028261805f94aa080967e5859","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"protobuf":{"dependency":"transitive","description":{"name":"protobuf","sha256":"579fe5557eae58e3adca2e999e38f02441d8aa908703854a9e0a0f47fa857731","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"provider":{"dependency":"transitive","description":{"name":"provider","sha256":"4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272","url":"https://pub.dev"},"source":"hosted","version":"6.1.5+1"},"pub_semver":{"dependency":"transitive","description":{"name":"pub_semver","sha256":"5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585","url":"https://pub.dev"},"source":"hosted","version":"2.2.0"},"pubspec_parse":{"dependency":"transitive","description":{"name":"pubspec_parse","sha256":"0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082","url":"https://pub.dev"},"source":"hosted","version":"1.5.0"},"pull_down_button":{"dependency":"direct main","description":{"name":"pull_down_button","sha256":"12cdd8ff187a3150ebdf075e5074299f085579b158d2b4e655ccbafccf95f25b","url":"https://pub.dev"},"source":"hosted","version":"0.10.2"},"qr":{"dependency":"transitive","description":{"name":"qr","sha256":"5a1d2586170e172b8a8c8470bbbffd5eb0cd38a66c0d77155ea138d3af3a4445","url":"https://pub.dev"},"source":"hosted","version":"3.0.2"},"qr_flutter":{"dependency":"direct main","description":{"name":"qr_flutter","sha256":"5095f0fc6e3f71d08adef8feccc8cea4f12eec18a2e31c2e8d82cb6019f4b097","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"quiver":{"dependency":"transitive","description":{"name":"quiver","sha256":"ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"receive_intent":{"dependency":"direct main","description":{"name":"receive_intent","sha256":"8e6b6edd1f4127265c1f19bfd53e8e92dd65f32cc9b377247bb7876a655479c8","url":"https://pub.dev"},"source":"hosted","version":"0.2.7"},"record":{"dependency":"direct main","description":{"name":"record","sha256":"d5b6b334f3ab02460db6544e08583c942dbf23e3504bf1e14fd4cbe3d9409277","url":"https://pub.dev"},"source":"hosted","version":"6.2.0"},"record_android":{"dependency":"transitive","description":{"name":"record_android","sha256":"94783f08403aed33ffb68797bf0715b0812eb852f3c7985644c945faea462ba1","url":"https://pub.dev"},"source":"hosted","version":"1.5.1"},"record_ios":{"dependency":"transitive","description":{"name":"record_ios","sha256":"8df7c136131bd05efc19256af29b2ba6ccc000ccc2c80d4b6b6d7a8d21a3b5a9","url":"https://pub.dev"},"source":"hosted","version":"1.2.0"},"record_linux":{"dependency":"transitive","description":{"name":"record_linux","sha256":"c31a35cc158cd666fc6395f7f56fc054f31685571684be6b97670a27649ce5c7","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"record_macos":{"dependency":"transitive","description":{"name":"record_macos","sha256":"084902e63fc9c0c224c29203d6c75f0bdf9b6a40536c9d916393c8f4c4256488","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"record_platform_interface":{"dependency":"transitive","description":{"name":"record_platform_interface","sha256":"8a81dbc4e14e1272a285bbfef6c9136d070a47d9b0d1f40aa6193516253ee2f6","url":"https://pub.dev"},"source":"hosted","version":"1.5.0"},"record_web":{"dependency":"transitive","description":{"name":"record_web","sha256":"7e9846981c1f2d111d86f0ae3309071f5bba8b624d1c977316706f08fc31d16d","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"record_windows":{"dependency":"transitive","description":{"name":"record_windows","sha256":"223258060a1d25c62bae18282c16783f28581ec19401d17e56b5205b9f039d78","url":"https://pub.dev"},"source":"hosted","version":"1.0.7"},"reorderables":{"dependency":"direct main","description":{"name":"reorderables","sha256":"004a886e4878df1ee27321831c838bc1c976311f4ca6a74ce7d561e506540a77","url":"https://pub.dev"},"source":"hosted","version":"0.6.0"},"rxdart":{"dependency":"direct overridden","description":{"name":"rxdart","sha256":"5c3004a4a8dbb94bd4bf5412a4def4acdaa12e12f269737a5751369e12d1a962","url":"https://pub.dev"},"source":"hosted","version":"0.28.0"},"safe_local_storage":{"dependency":"transitive","description":{"name":"safe_local_storage","sha256":"287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755","url":"https://pub.dev"},"source":"hosted","version":"2.0.3"},"saver_gallery":{"dependency":"direct main","description":{"name":"saver_gallery","sha256":"3f983d4be63aff52523c3e097a9b00ce9ab8444f9a982c878cde9d0359f4681d","url":"https://pub.dev"},"source":"hosted","version":"4.1.1"},"screen_retriever":{"dependency":"direct main","description":{"name":"screen_retriever","sha256":"570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_linux":{"dependency":"transitive","description":{"name":"screen_retriever_linux","sha256":"f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_macos":{"dependency":"transitive","description":{"name":"screen_retriever_macos","sha256":"71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_platform_interface":{"dependency":"transitive","description":{"name":"screen_retriever_platform_interface","sha256":"ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"screen_retriever_windows":{"dependency":"transitive","description":{"name":"screen_retriever_windows","sha256":"449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13","url":"https://pub.dev"},"source":"hosted","version":"0.2.0"},"scroll_to_index":{"dependency":"direct main","description":{"name":"scroll_to_index","sha256":"b707546e7500d9f070d63e5acf74fd437ec7eeeb68d3412ef7b0afada0b4f176","url":"https://pub.dev"},"source":"hosted","version":"3.0.1"},"secure_application":{"dependency":"direct main","description":{"name":"secure_application","sha256":"1476f2a8df44ed9617bf42f51a1fce2ab0b83bfd4ea58983a5f7d3748b356ef3","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"sembast":{"dependency":"transitive","description":{"name":"sembast","sha256":"9026ea34aa3a0f26a966529ef80b57b6fe40f810cadeadd1b208202d1bf153e7","url":"https://pub.dev"},"source":"hosted","version":"3.8.3"},"share_plus":{"dependency":"direct main","description":{"name":"share_plus","sha256":"223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa","url":"https://pub.dev"},"source":"hosted","version":"12.0.2"},"share_plus_platform_interface":{"dependency":"transitive","description":{"name":"share_plus_platform_interface","sha256":"88023e53a13429bd65d8e85e11a9b484f49d4c190abbd96c7932b74d6927cc9a","url":"https://pub.dev"},"source":"hosted","version":"6.1.0"},"shared_preferences":{"dependency":"direct main","description":{"name":"shared_preferences","sha256":"6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5","url":"https://pub.dev"},"source":"hosted","version":"2.5.3"},"shared_preferences_android":{"dependency":"transitive","description":{"name":"shared_preferences_android","sha256":"5bcf0772a761b04f8c6bf814721713de6f3e5d9d89caf8d3fe031b02a342379e","url":"https://pub.dev"},"source":"hosted","version":"2.4.11"},"shared_preferences_foundation":{"dependency":"transitive","description":{"name":"shared_preferences_foundation","sha256":"6a52cfcdaeac77cad8c97b539ff688ccfc458c007b4db12be584fbe5c0e49e03","url":"https://pub.dev"},"source":"hosted","version":"2.5.4"},"shared_preferences_linux":{"dependency":"transitive","description":{"name":"shared_preferences_linux","sha256":"580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_platform_interface":{"dependency":"transitive","description":{"name":"shared_preferences_platform_interface","sha256":"57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shared_preferences_web":{"dependency":"transitive","description":{"name":"shared_preferences_web","sha256":"c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019","url":"https://pub.dev"},"source":"hosted","version":"2.4.3"},"shared_preferences_windows":{"dependency":"transitive","description":{"name":"shared_preferences_windows","sha256":"94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"shelf":{"dependency":"transitive","description":{"name":"shelf","sha256":"e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12","url":"https://pub.dev"},"source":"hosted","version":"1.4.2"},"shelf_packages_handler":{"dependency":"transitive","description":{"name":"shelf_packages_handler","sha256":"89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e","url":"https://pub.dev"},"source":"hosted","version":"3.0.2"},"shelf_static":{"dependency":"transitive","description":{"name":"shelf_static","sha256":"c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3","url":"https://pub.dev"},"source":"hosted","version":"1.1.3"},"shelf_web_socket":{"dependency":"transitive","description":{"name":"shelf_web_socket","sha256":"cc36c297b52866d203dbf9332263c94becc2fe0ceaa9681d07b6ef9807023b67","url":"https://pub.dev"},"source":"hosted","version":"2.0.1"},"shimmer":{"dependency":"direct main","description":{"name":"shimmer","sha256":"5f88c883a22e9f9f299e5ba0e4f7e6054857224976a5d9f839d4ebdc94a14ac9","url":"https://pub.dev"},"source":"hosted","version":"3.0.0"},"shortid":{"dependency":"transitive","description":{"name":"shortid","sha256":"d0b40e3dbb50497dad107e19c54ca7de0d1a274eb9b4404991e443dadb9ebedb","url":"https://pub.dev"},"source":"hosted","version":"0.1.2"},"simple_animations":{"dependency":"direct main","description":{"name":"simple_animations","sha256":"6c0f1d53d351a2187da979cc6883322eb9e76f1147c1aecc1937c498eaa9abff","url":"https://pub.dev"},"source":"hosted","version":"5.1.0"},"simple_sparse_list":{"dependency":"transitive","description":{"name":"simple_sparse_list","sha256":"aa648fd240fa39b49dcd11c19c266990006006de6699a412de485695910fbc1f","url":"https://pub.dev"},"source":"hosted","version":"0.1.4"},"skeletonizer":{"dependency":"direct main","description":{"name":"skeletonizer","sha256":"0dcacc51c144af4edaf37672072156f49e47036becbc394d7c51850c5c1e884b","url":"https://pub.dev"},"source":"hosted","version":"1.4.3"},"sky_engine":{"dependency":"transitive","description":"flutter","source":"sdk","version":"0.0.0"},"sliding_up_panel2":{"dependency":"direct main","description":{"name":"sliding_up_panel2","sha256":"7c2aac81c03e74fcd070799c5e2011f1c5de7026bd22a76164e81e23a49f2bdb","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+1"},"slugify":{"dependency":"direct main","description":{"name":"slugify","sha256":"b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"smooth_page_indicator":{"dependency":"direct main","description":{"name":"smooth_page_indicator","sha256":"b21ebb8bc39cf72d11c7cfd809162a48c3800668ced1c9da3aade13a32cf6c1c","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"socket_io_client":{"dependency":"direct main","description":{"name":"socket_io_client","sha256":"ef6c989e5eee8d04baf18482ec3d7699b91bc41e279794a99d8e3bef897b074a","url":"https://pub.dev"},"source":"hosted","version":"3.1.4"},"socket_io_common":{"dependency":"transitive","description":{"name":"socket_io_common","sha256":"162fbaecbf4bf9a9372a62a341b3550b51dcef2f02f3e5830a297fd48203d45b","url":"https://pub.dev"},"source":"hosted","version":"3.1.1"},"sortedmap":{"dependency":"transitive","description":{"name":"sortedmap","sha256":"f000f40804e15fad5e3ad429164291c06cf7fcf8cc982006cf482852b912c3cf","url":"https://pub.dev"},"source":"hosted","version":"0.5.4"},"source_gen":{"dependency":"transitive","description":{"name":"source_gen","sha256":"35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"source_map_stack_trace":{"dependency":"transitive","description":{"name":"source_map_stack_trace","sha256":"c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"source_maps":{"dependency":"transitive","description":{"name":"source_maps","sha256":"190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812","url":"https://pub.dev"},"source":"hosted","version":"0.10.13"},"source_span":{"dependency":"transitive","description":{"name":"source_span","sha256":"53e943d4206a5e30df338fd4c6e7a077e02254531b138a15aec3bd143c1a8b3c","url":"https://pub.dev"},"source":"hosted","version":"1.10.0"},"sprintf":{"dependency":"transitive","description":{"name":"sprintf","sha256":"1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23","url":"https://pub.dev"},"source":"hosted","version":"7.0.0"},"sprung":{"dependency":"direct main","description":{"name":"sprung","sha256":"54322638f5e393d2b808175f7eadbaa4836a4425456e98d93c3d676dc56ebdf1","url":"https://pub.dev"},"source":"hosted","version":"3.0.1"},"stack_trace":{"dependency":"transitive","description":{"name":"stack_trace","sha256":"9f47fd3630d76be3ab26f0ee06d213679aa425996925ff3feffdec504931c377","url":"https://pub.dev"},"source":"hosted","version":"1.12.0"},"store_checker":{"dependency":"direct main","description":{"name":"store_checker","sha256":"f191b6f1035caff62137c365cba21ad1a3c82c0369b522639052cd29fb48720f","url":"https://pub.dev"},"source":"hosted","version":"1.8.0"},"stream_channel":{"dependency":"transitive","description":{"name":"stream_channel","sha256":"ba2aa5d8cc609d96bbb2899c28934f9e1af5cddbd60a827822ea467161eb54e7","url":"https://pub.dev"},"source":"hosted","version":"2.1.2"},"stream_transform":{"dependency":"transitive","description":{"name":"stream_transform","sha256":"ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"string_scanner":{"dependency":"transitive","description":{"name":"string_scanner","sha256":"688af5ed3402a4bde5b3a6c15fd768dbf2621a614950b17f04626c431ab3c4c3","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"string_validator":{"dependency":"transitive","description":{"name":"string_validator","sha256":"240f4c98027dfbe8639c8271ef18cc9de735b47067aa15a720cfed9576a512b1","url":"https://pub.dev"},"source":"hosted","version":"1.2.0"},"super_clipboard":{"dependency":"transitive","description":{"name":"super_clipboard","sha256":"e73f3bb7e66cc9260efa1dc507f979138e7e106c3521e2dda2d0311f6d728a16","url":"https://pub.dev"},"source":"hosted","version":"0.9.1"},"super_drag_and_drop":{"dependency":"direct main","description":{"name":"super_drag_and_drop","sha256":"8946913a021cb617c35e36cfe57e8b817335643d7ee9bbc83d6e11760136bd1c","url":"https://pub.dev"},"source":"hosted","version":"0.9.1"},"super_native_extensions":{"dependency":"transitive","description":{"name":"super_native_extensions","sha256":"b9611dcb68f1047d6f3ef11af25e4e68a21b1a705bbcc3eb8cb4e9f5c3148569","url":"https://pub.dev"},"source":"hosted","version":"0.9.1"},"supercharged":{"dependency":"direct main","description":{"name":"supercharged","sha256":"ab49c848b33e28243f5ce82b976736de17d0852b71d0dfbde53fbb5e2ecca7cb","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"supercharged_dart":{"dependency":"transitive","description":{"name":"supercharged_dart","sha256":"cb95edda32eacd27664089700a750120be41daa84aa6cd2aeded46227c16b867","url":"https://pub.dev"},"source":"hosted","version":"2.1.1"},"synchronized":{"dependency":"direct main","description":{"name":"synchronized","sha256":"69fe30f3a8b04a0be0c15ae6490fc859a78ef4c43ae2dd5e8a623d45bfcf9225","url":"https://pub.dev"},"source":"hosted","version":"3.3.0+3"},"system_info2":{"dependency":"direct main","description":{"name":"system_info2","sha256":"b937736ecfa63c45b10dde1ceb6bb30e5c0c340e14c441df024150679d65ac43","url":"https://pub.dev"},"source":"hosted","version":"4.1.0"},"system_tray":{"dependency":"direct main","description":{"name":"system_tray","sha256":"40444e5de8ed907822a98694fd031b8accc3cb3c0baa547634ce76189cf3d9cf","url":"https://pub.dev"},"source":"hosted","version":"2.0.3"},"tenor_dart":{"dependency":"transitive","description":{"name":"tenor_dart","sha256":"2d8a51dce74b21093844a5915794ee49d0260c3bd48d4b9a8bcd6fb0150057e9","url":"https://pub.dev"},"source":"hosted","version":"0.0.6"},"tenor_flutter":{"dependency":"direct main","description":{"name":"tenor_flutter","sha256":"b7d7f8586111e61e32ba7e13bea817d89835117b7aa791662d928671fae4ac81","url":"https://pub.dev"},"source":"hosted","version":"0.0.5"},"term_glyph":{"dependency":"transitive","description":{"name":"term_glyph","sha256":"a29248a84fbb7c79282b40b8c72a1209db169a2e0542bce341da992fe1bc7e84","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"test":{"dependency":"transitive","description":{"name":"test","sha256":"713a8789d62f3233c46b4a90b174737b2c04cb6ae4500f2aa8b1be8f03f5e67f","url":"https://pub.dev"},"source":"hosted","version":"1.25.8"},"test_api":{"dependency":"transitive","description":{"name":"test_api","sha256":"664d3a9a64782fcdeb83ce9c6b39e78fd2971d4e37827b9b06c3aa1edc5e760c","url":"https://pub.dev"},"source":"hosted","version":"0.7.3"},"test_core":{"dependency":"transitive","description":{"name":"test_core","sha256":"12391302411737c176b0b5d6491f466b0dd56d4763e347b6714efbaa74d7953d","url":"https://pub.dev"},"source":"hosted","version":"0.6.5"},"throttling":{"dependency":"transitive","description":{"name":"throttling","sha256":"e48a4c681b1838b8bf99c1a4f822efe43bb69132f9a56091cd5b7d931c862255","url":"https://pub.dev"},"source":"hosted","version":"2.0.1"},"timezone":{"dependency":"direct main","description":{"name":"timezone","sha256":"dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1","url":"https://pub.dev"},"source":"hosted","version":"0.10.1"},"timing":{"dependency":"transitive","description":{"name":"timing","sha256":"62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe","url":"https://pub.dev"},"source":"hosted","version":"1.0.2"},"tray_manager":{"dependency":"direct main","description":{"name":"tray_manager","sha256":"c5fd83b0ae4d80be6eaedfad87aaefab8787b333b8ebd064b0e442a81006035b","url":"https://pub.dev"},"source":"hosted","version":"0.5.2"},"try_catch":{"dependency":"transitive","description":{"name":"try_catch","sha256":"3e0f62abdd51ea40f59c0e5958cfac7d6b92faec5a9faf85f174c6cc34c018af","url":"https://pub.dev"},"source":"hosted","version":"1.0.2"},"tuple":{"dependency":"direct main","description":{"name":"tuple","sha256":"a97ce2013f240b2f3807bcbaf218765b6f301c3eff91092bcfa23a039e7dd151","url":"https://pub.dev"},"source":"hosted","version":"2.0.2"},"typed_data":{"dependency":"transitive","description":{"name":"typed_data","sha256":"f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006","url":"https://pub.dev"},"source":"hosted","version":"1.4.0"},"unicode":{"dependency":"transitive","description":{"name":"unicode","sha256":"a6f7bcfc8ea1d5ce1f6c0b1c39117a9919f4953edd9fd7a64090a9796c499b57","url":"https://pub.dev"},"source":"hosted","version":"1.1.9"},"unicode_emojis":{"dependency":"direct main","description":{"name":"unicode_emojis","sha256":"f97d3ebb5d525f2a6334b0d2e975d26b3b7ca2df6674bf9ff9708022a7a21b88","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"unifiedpush":{"dependency":"direct main","description":{"name":"unifiedpush","sha256":"6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f","url":"https://pub.dev"},"source":"hosted","version":"5.0.2"},"unifiedpush_android":{"dependency":"transitive","description":{"name":"unifiedpush_android","sha256":"7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"unifiedpush_platform_interface":{"dependency":"transitive","description":{"name":"unifiedpush_platform_interface","sha256":"dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d","url":"https://pub.dev"},"source":"hosted","version":"2.0.2"},"universal_html":{"dependency":"direct main","description":{"name":"universal_html","sha256":"c0bcae5c733c60f26c7dfc88b10b0fd27cbcc45cb7492311cdaa6067e21c9cd4","url":"https://pub.dev"},"source":"hosted","version":"2.3.0"},"universal_io":{"dependency":"direct main","description":{"name":"universal_io","sha256":"f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2","url":"https://pub.dev"},"source":"hosted","version":"2.3.1"},"universal_platform":{"dependency":"transitive","description":{"name":"universal_platform","sha256":"64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"uri_parser":{"dependency":"transitive","description":{"name":"uri_parser","sha256":"051c62e5f693de98ca9f130ee707f8916e2266945565926be3ff20659f7853ce","url":"https://pub.dev"},"source":"hosted","version":"3.0.2"},"url_launcher":{"dependency":"direct main","description":{"name":"url_launcher","sha256":"f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8","url":"https://pub.dev"},"source":"hosted","version":"6.3.2"},"url_launcher_android":{"dependency":"transitive","description":{"name":"url_launcher_android","sha256":"0aedad096a85b49df2e4725fa32118f9fa580f3b14af7a2d2221896a02cd5656","url":"https://pub.dev"},"source":"hosted","version":"6.3.17"},"url_launcher_ios":{"dependency":"transitive","description":{"name":"url_launcher_ios","sha256":"7f2022359d4c099eea7df3fdf739f7d3d3b9faf3166fb1dd390775176e0b76cb","url":"https://pub.dev"},"source":"hosted","version":"6.3.3"},"url_launcher_linux":{"dependency":"transitive","description":{"name":"url_launcher_linux","sha256":"4e9ba368772369e3e08f231d2301b4ef72b9ff87c31192ef471b380ef29a4935","url":"https://pub.dev"},"source":"hosted","version":"3.2.1"},"url_launcher_macos":{"dependency":"transitive","description":{"name":"url_launcher_macos","sha256":"17ba2000b847f334f16626a574c702b196723af2a289e7a93ffcb79acff855c2","url":"https://pub.dev"},"source":"hosted","version":"3.2.2"},"url_launcher_platform_interface":{"dependency":"transitive","description":{"name":"url_launcher_platform_interface","sha256":"552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029","url":"https://pub.dev"},"source":"hosted","version":"2.3.2"},"url_launcher_web":{"dependency":"transitive","description":{"name":"url_launcher_web","sha256":"4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2","url":"https://pub.dev"},"source":"hosted","version":"2.4.1"},"url_launcher_windows":{"dependency":"transitive","description":{"name":"url_launcher_windows","sha256":"3284b6d2ac454cf34f114e1d3319866fdd1e19cdc329999057e44ffe936cfa77","url":"https://pub.dev"},"source":"hosted","version":"3.1.4"},"uuid":{"dependency":"direct overridden","description":{"name":"uuid","sha256":"1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489","url":"https://pub.dev"},"source":"hosted","version":"4.5.3"},"vcf_dart":{"dependency":"direct main","description":{"name":"vcf_dart","sha256":"339e214cfdd3ff4b1a55b963bfe9e53b2617cb65bc54ee3cd0b08b4e03450cbb","url":"https://pub.dev"},"source":"hosted","version":"1.0.3"},"vector_graphics":{"dependency":"transitive","description":{"name":"vector_graphics","sha256":"a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6","url":"https://pub.dev"},"source":"hosted","version":"1.1.19"},"vector_graphics_codec":{"dependency":"transitive","description":{"name":"vector_graphics_codec","sha256":"99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146","url":"https://pub.dev"},"source":"hosted","version":"1.1.13"},"vector_graphics_compiler":{"dependency":"transitive","description":{"name":"vector_graphics_compiler","sha256":"ca81fdfaf62a5ab45d7296614aea108d2c7d0efca8393e96174bf4d51e6725b0","url":"https://pub.dev"},"source":"hosted","version":"1.1.18"},"vector_math":{"dependency":"transitive","description":{"name":"vector_math","sha256":"80b3257d1492ce4d091729e3a67a60407d227c27241d6927be0130c98e741803","url":"https://pub.dev"},"source":"hosted","version":"2.1.4"},"version":{"dependency":"direct main","description":{"name":"version","sha256":"3d4140128e6ea10d83da32fef2fa4003fccbf6852217bb854845802f04191f94","url":"https://pub.dev"},"source":"hosted","version":"3.0.2"},"video_player":{"dependency":"direct main","description":{"name":"video_player","sha256":"0d55b1f1a31e5ad4c4967bfaa8ade0240b07d20ee4af1dfef5f531056512961a","url":"https://pub.dev"},"source":"hosted","version":"2.10.0"},"video_player_android":{"dependency":"transitive","description":{"name":"video_player_android","sha256":"28dcc4122079f40f93a0965b3679aff1a5f4251cf79611bd8011f937eb6b69de","url":"https://pub.dev"},"source":"hosted","version":"2.8.4"},"video_player_avfoundation":{"dependency":"transitive","description":{"name":"video_player_avfoundation","sha256":"f9a780aac57802b2892f93787e5ea53b5f43cc57dc107bee9436458365be71cd","url":"https://pub.dev"},"source":"hosted","version":"2.8.4"},"video_player_platform_interface":{"dependency":"transitive","description":{"name":"video_player_platform_interface","sha256":"cf2a1d29a284db648fd66cbd18aacc157f9862d77d2cc790f6f9678a46c1db5a","url":"https://pub.dev"},"source":"hosted","version":"6.4.0"},"video_player_web":{"dependency":"transitive","description":{"name":"video_player_web","sha256":"9f3c00be2ef9b76a95d94ac5119fb843dca6f2c69e6c9968f6f2b6c9e7afbdeb","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"video_thumbnail":{"dependency":"direct main","description":{"name":"video_thumbnail","sha256":"181a0c205b353918954a881f53a3441476b9e301641688a581e0c13f00dc588b","url":"https://pub.dev"},"source":"hosted","version":"0.5.6"},"vm_service":{"dependency":"transitive","description":{"name":"vm_service","sha256":"f6be3ed8bd01289b34d679c2b62226f63c0e69f9fd2e50a6b3c1c729a961041b","url":"https://pub.dev"},"source":"hosted","version":"14.3.0"},"wakelock_plus":{"dependency":"transitive","description":{"name":"wakelock_plus","sha256":"61713aa82b7f85c21c9f4cd0a148abd75f38a74ec645fcb1e446f882c82fd09b","url":"https://pub.dev"},"source":"hosted","version":"1.3.3"},"wakelock_plus_platform_interface":{"dependency":"transitive","description":{"name":"wakelock_plus_platform_interface","sha256":"036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2","url":"https://pub.dev"},"source":"hosted","version":"1.3.0"},"watcher":{"dependency":"transitive","description":{"name":"watcher","sha256":"1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"web":{"dependency":"transitive","description":{"name":"web","sha256":"868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a","url":"https://pub.dev"},"source":"hosted","version":"1.1.1"},"web_socket":{"dependency":"transitive","description":{"name":"web_socket","sha256":"34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c","url":"https://pub.dev"},"source":"hosted","version":"1.0.1"},"web_socket_channel":{"dependency":"transitive","description":{"name":"web_socket_channel","sha256":"d88238e5eac9a42bb43ca4e721edba3c08c6354d4a53063afaa568516217621b","url":"https://pub.dev"},"source":"hosted","version":"2.4.0"},"webkit_inspection_protocol":{"dependency":"transitive","description":{"name":"webkit_inspection_protocol","sha256":"87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572","url":"https://pub.dev"},"source":"hosted","version":"1.2.1"},"win32":{"dependency":"direct main","description":{"name":"win32","sha256":"daf97c9d80197ed7b619040e86c8ab9a9dad285e7671ee7390f9180cc828a51e","url":"https://pub.dev"},"source":"hosted","version":"5.10.1"},"win32_registry":{"dependency":"transitive","description":{"name":"win32_registry","sha256":"21ec76dfc731550fd3e2ce7a33a9ea90b828fdf19a5c3bcf556fa992cfa99852","url":"https://pub.dev"},"source":"hosted","version":"1.1.5"},"window_manager":{"dependency":"direct main","description":{"name":"window_manager","sha256":"7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd","url":"https://pub.dev"},"source":"hosted","version":"0.5.1"},"windows_taskbar":{"dependency":"direct main","description":{"name":"windows_taskbar","sha256":"204edfdb280a7053febdf50fc9b49b3c007255bd8a83c082d10c174ec6548f33","url":"https://pub.dev"},"source":"hosted","version":"1.1.2"},"wkt_parser":{"dependency":"transitive","description":{"name":"wkt_parser","sha256":"8a555fc60de3116c00aad67891bcab20f81a958e4219cc106e3c037aa3937f13","url":"https://pub.dev"},"source":"hosted","version":"2.0.0"},"x509":{"dependency":"transitive","description":{"name":"x509","sha256":"cbd1a63846884afd273cda247b0365284c8d85a365ca98e110413f93d105b935","url":"https://pub.dev"},"source":"hosted","version":"0.2.4+3"},"xdg_directories":{"dependency":"transitive","description":{"name":"xdg_directories","sha256":"7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15","url":"https://pub.dev"},"source":"hosted","version":"1.1.0"},"xml":{"dependency":"transitive","description":{"name":"xml","sha256":"b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226","url":"https://pub.dev"},"source":"hosted","version":"6.5.0"},"yaml":{"dependency":"transitive","description":{"name":"yaml","sha256":"b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce","url":"https://pub.dev"},"source":"hosted","version":"3.1.3"}},"sdks":{"dart":">=3.6.0 <4.0.0","flutter":">=3.27.1"}} diff --git a/pkgs/by-name/bl/blueman/package.nix b/pkgs/by-name/bl/blueman/package.nix index ade77c4c9872..04c99c31bff2 100644 --- a/pkgs/by-name/bl/blueman/package.nix +++ b/pkgs/by-name/bl/blueman/package.nix @@ -76,6 +76,8 @@ stdenv.mkDerivation rec { (lib.enableFeature withPulseAudio "pulseaudio") ]; + dontWrapGApps = true; + makeWrapperArgs = [ "--prefix PATH ':' ${ lib.makeBinPath [ @@ -85,6 +87,7 @@ stdenv.mkDerivation rec { ] }" "--suffix PATH ':' ${lib.makeBinPath [ xdg-utils ]}" + "\${gappsWrapperArgs[@]}" ]; postFixup = '' diff --git a/pkgs/by-name/bl/bluesky-pds/package.nix b/pkgs/by-name/bl/bluesky-pds/package.nix index 3c990477451a..c9db0432d2d5 100644 --- a/pkgs/by-name/bl/bluesky-pds/package.nix +++ b/pkgs/by-name/bl/bluesky-pds/package.nix @@ -4,7 +4,7 @@ removeReferencesTo, srcOnly, python3, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, fetchFromGitHub, @@ -15,6 +15,7 @@ lib, nix-update-script, cctools, + fetchpatch2, }: let @@ -22,22 +23,30 @@ let nodejs = nodejs_24; nodeSources = srcOnly nodejs; pythonEnv = python3.withPackages (p: [ p.setuptools ]); - pnpm = pnpm_9; + pnpm = pnpm_10; in stdenv.mkDerivation (finalAttrs: { pname = "pds"; - version = "0.4.5001"; + version = "0.4.5009"; src = fetchFromGitHub { owner = "bluesky-social"; repo = "pds"; tag = "v${finalAttrs.version}"; - hash = "sha256-j7XNZYZHHj5HdtEuTAhNU9TD7S7eMILMflZJn0nDVaY="; + hash = "sha256-3IEbVn7ThiVL7E2fXMHzsRSLT7Tm1eiX8bPQ88rJCvs="; }; sourceRoot = "${finalAttrs.src.name}/service"; + patchFlags = [ "-p2" ]; + patches = [ + (fetchpatch2 { + url = "https://github.com/bluesky-social/pds/commit/f8de5f08900c42023b01a4d10995556f16d05145.patch?full_index=1"; + hash = "sha256-E0mWvLWQ4lFjkFgqtmMIESpNH7PSAB/QpSqxIwsj6Q8="; + }) + ]; + nativeBuildInputs = [ makeBinaryWrapper nodejs @@ -60,10 +69,12 @@ stdenv.mkDerivation (finalAttrs: { version src sourceRoot + patchFlags + patches ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-3/gjhQIMxI/mwqmKV1wZ6oMiCGHutXuDY2CFSN3QnE4="; + hash = "sha256-BTSMmGhLpQ6KrI7/XfinRwe8ap7btIrPa55f6HB63M8="; }; buildPhase = '' diff --git a/pkgs/applications/misc/bluetooth_battery/default.nix b/pkgs/by-name/bl/bluetooth_battery/package.nix similarity index 100% rename from pkgs/applications/misc/bluetooth_battery/default.nix rename to pkgs/by-name/bl/bluetooth_battery/package.nix diff --git a/pkgs/by-name/bl/bluetuith/package.nix b/pkgs/by-name/bl/bluetuith/package.nix index 1a6e1b1b46dc..f2584cfdeb8f 100644 --- a/pkgs/by-name/bl/bluetuith/package.nix +++ b/pkgs/by-name/bl/bluetuith/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bluetuith"; - version = "0.2.6"; + version = "0.2.7"; src = fetchFromGitHub { owner = "bluetuith-org"; repo = "bluetuith"; tag = "v${finalAttrs.version}"; - hash = "sha256-jxN4FLefv+edlpBnwDN/pBxZ7sHkv2w+R2tUeNCI6Tw="; + hash = "sha256-FoFmkc6/sPxssEkWHgwM+jtvwJzpDsTJ4T3dzYcxcVc="; }; - vendorHash = "sha256-baSiOHiB02hfqDt95ldeKwz+tJgunXheTvREznxPUSc="; + vendorHash = "sha256-38yPy0dhZ99smFQK0tvQLHah+Sn6DsXvNrh8nQaR5qk="; subPackages = [ "." ]; diff --git a/pkgs/by-name/bl/bluez-alsa/package.nix b/pkgs/by-name/bl/bluez-alsa/package.nix index 3bdce7e545e1..41fe72114c04 100644 --- a/pkgs/by-name/bl/bluez-alsa/package.nix +++ b/pkgs/by-name/bl/bluez-alsa/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation (finalAttrs: { BluezALSA if you disable `bluetooth-discover` and `bluez5-discover` modules in PA and configure it to play/capture sound over `bluealsa` PCM. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "bluealsa"; maintainers = with lib.maintainers; [ oxij ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bl/bluez-tools/package.nix b/pkgs/by-name/bl/bluez-tools/package.nix index 66ddbe928818..e252d03e6278 100644 --- a/pkgs/by-name/bl/bluez-tools/package.nix +++ b/pkgs/by-name/bl/bluez-tools/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/khvzak/bluez-tools"; description = "Set of tools to manage bluetooth devices for linux"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "bt-agent"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/bl/bluez/package.nix b/pkgs/by-name/bl/bluez/package.nix index 20a9bcce09da..81ec00b045ca 100644 --- a/pkgs/by-name/bl/bluez/package.nix +++ b/pkgs/by-name/bl/bluez/package.nix @@ -44,6 +44,11 @@ stdenv.mkDerivation (finalAttrs: { url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=21e13976f2e375d701b8b7032ba5c1b2e56c305f"; hash = "sha256-JrdmYiC+U0KeMP8oVg12Z8CvkMEKWBVgiiUACx0E7dY="; }) + (fetchpatch2 { + name = "support-libical-4.0.patch"; + url = "https://git.kernel.org/pub/scm/bluetooth/bluez.git/patch/?id=e60d07255327db3fc4e3a28d7fcc792cd42c34d0"; + hash = "sha256-1uw+5nTjh+t1/L++fRNIlQWblwDwTJifH0EvAn3dym8="; + }) ./lreadline.patch ]; diff --git a/pkgs/by-name/bm/bmake/package.nix b/pkgs/by-name/bm/bmake/package.nix index c6bede970944..5d8675628527 100644 --- a/pkgs/by-name/bm/bmake/package.nix +++ b/pkgs/by-name/bm/bmake/package.nix @@ -67,6 +67,8 @@ stdenv.mkDerivation (finalAttrs: { ) "export" ); + __structuredAttrs = true; + strictDeps = true; doCheck = true; @@ -93,7 +95,11 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - ./boot-strap --prefix=$out -o . op=install + # `boot-strap op=install` runs the built bmake, which breaks cross builds. + install -Dm755 bmake $out/bin/bmake + install -Dm644 bmake.1 $man/share/man/man1/bmake.1 + install -Dm755 -d $out/share/mk + sh mk/install-mk -v -m 444 $out/share/mk runHook postInstall ''; diff --git a/pkgs/by-name/bo/boat-cli/package.nix b/pkgs/by-name/bo/boat-cli/package.nix new file mode 100644 index 000000000000..be2f87efc790 --- /dev/null +++ b/pkgs/by-name/bo/boat-cli/package.nix @@ -0,0 +1,43 @@ +{ + lib, + fetchFromGitHub, + writableTmpDirAsHomeHook, + rustPlatform, + sqlite, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "boat-cli"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "coko7"; + repo = "boat-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oS+NfEQKAcfZwYQkftMJAUz7fG1nleruAROMUUbBP3Y="; + }; + + cargoHash = "sha256-mHqXIFI2KJOMnxdG3X4DHDozFDPmqw4f//ori3Dc7us="; + + nativeBuildInputs = [ + writableTmpDirAsHomeHook + ]; + + buildInputs = [ + sqlite + ]; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Basic Opinionated Activity Tracker, a command line interface inspired by bartib."; + homepage = "https://github.com/coko7/boat-cli"; + changelog = "https://github.com/coko7/boat-cli/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ tgi74 ]; + mainProgram = "boat"; + }; +}) diff --git a/pkgs/by-name/bo/bobby/package.nix b/pkgs/by-name/bo/bobby/package.nix new file mode 100644 index 000000000000..5b61c8e5ffb9 --- /dev/null +++ b/pkgs/by-name/bo/bobby/package.nix @@ -0,0 +1,84 @@ +{ + cargo, + desktop-file-utils, + fetchFromGitHub, + glib, + gtk4, + lib, + libadwaita, + meson, + ninja, + nix-update-script, + pkg-config, + rustc, + rustPlatform, + sqlite, + stdenv, + wrapGAppsHook4, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "bobby"; + version = "50.0.2"; + + src = fetchFromGitHub { + owner = "hbons"; + repo = "bobby"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/N7CmzPwUdGkHIZujCGW3LvsGM6DdXrcm2kH6XlVGDA="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-TT3ceAy44sfyKZ7wmH3C4nj5TyfiJlu4vBWAaGs+pGg="; + }; + + buildInputs = [ + glib + gtk4 + libadwaita + sqlite + ]; + + # favor sqlite from nixpkgs instead of a vendored variant in rusqlite + postPatch = '' + substituteInPlace Cargo.toml \ + --replace-fail ', features = ["bundled"]' "" + ''; + + nativeBuildInputs = [ + cargo + desktop-file-utils # for `update-desktop-database` + gtk4 # for `gtk-update-icon-cache` + meson + ninja + pkg-config + rustc + rustPlatform.cargoSetupHook + wrapGAppsHook4 # fix error: GLib-GIO-ERROR **: No GSettings schemas are installed on the system + ]; + + mesonCheckFlags = [ + "--print-errorlogs" + ]; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + changelog = "https://github.com/hbons/Bobby/blob/${finalAttrs.src.tag}/data/studio.planetpeanut.Bobby.metainfo.xml"; + description = "Browse SQLite files"; + donationPage = "https://planetpeanut.studio/sponsors"; + homepage = "https://apps.gnome.org/Bobby/"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + aiyion + ]; + teams = [ lib.teams.gnome-circle ]; + mainProgram = "bobby"; + }; +}) diff --git a/pkgs/by-name/bo/bobgen/package.nix b/pkgs/by-name/bo/bobgen/package.nix index fdccbda4ef39..76cb9d6e61a4 100644 --- a/pkgs/by-name/bo/bobgen/package.nix +++ b/pkgs/by-name/bo/bobgen/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "bobgen"; - version = "0.45.0"; + version = "0.48.0"; src = fetchFromGitHub { owner = "stephenafamo"; repo = "bob"; tag = "v${finalAttrs.version}"; - hash = "sha256-dmZ9aOiVn0QEBvPwulvFEisZRw0PIid7NH22gD3Yzuc="; + hash = "sha256-iD9GPYBt1s6xx4vNRlArERmv5AyBR6Q4mLLDNDWy1qY="; }; - vendorHash = "sha256-WzSUUgfWGz5XXq3iQrtpF91yOEr0QypTWq1rOJMntGQ="; + vendorHash = "sha256-tL6f8XkAsBL76idEVxlAAcdYyzo9Rh9fEHy6ysfZWG8="; subPackages = [ "gen/bobgen-sql" diff --git a/pkgs/by-name/bo/bolt-launcher/package.nix b/pkgs/by-name/bo/bolt-launcher/package.nix index d1e0ff92eee9..97525b2def80 100644 --- a/pkgs/by-name/bo/bolt-launcher/package.nix +++ b/pkgs/by-name/bo/bolt-launcher/package.nix @@ -136,7 +136,7 @@ buildFHSEnv { with pkgs; [ gtk2-x11 - openssl_1_1 + # openssl_1_1 ] ); @@ -166,5 +166,8 @@ buildFHSEnv { ]; platforms = lib.platforms.linux; mainProgram = "bolt-launcher"; - }; + } + // (lib.optionalAttrs enableRS3 { + problems.broken.message = "OpenSSL 1.1 has been end of life since 2023 and will be removed soon."; + }); } diff --git a/pkgs/by-name/bo/boltbrowser/package.nix b/pkgs/by-name/bo/boltbrowser/package.nix index 85393e32c2ae..7b152f3fb3b0 100644 --- a/pkgs/by-name/bo/boltbrowser/package.nix +++ b/pkgs/by-name/bo/boltbrowser/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI Browser for BoltDB files"; homepage = "https://github.com/br0xen/boltbrowser"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "boltbrowser"; }; diff --git a/pkgs/by-name/bo/bomly/package.nix b/pkgs/by-name/bo/bomly/package.nix new file mode 100644 index 000000000000..02667684cf59 --- /dev/null +++ b/pkgs/by-name/bo/bomly/package.nix @@ -0,0 +1,66 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + grype, + makeBinaryWrapper, + nix-update-script, + syft, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "bomly"; + version = "0.18.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "bomly-dev"; + repo = "bomly-cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-U7h9U4wiKohJQUauD8lmTScEWpT0kHZobJnJp8u0VbI="; + }; + + vendorHash = "sha256-rO1hymsyc6Ar7PtNLymP66tKK6X6mwVz4kQt4UzzwDI="; + + # .gitattributes excludes all testdata from the GitHub tarball + postPatch = '' + mkdir -p internal/benchmark/testdata + cp ${./scan_targets.json} internal/benchmark/testdata/scan_targets.json + ''; + + buildInputs = [ makeBinaryWrapper ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + # testdata directories are excluded from the GitHub tarball via .gitattributes + doCheck = false; + + ldflags = [ + "-s" + "-X=main.version=${finalAttrs.version}" + ]; + + postFixup = '' + wrapProgram $out/bin/bomly --prefix PATH : "${ + lib.makeBinPath [ + grype + syft + ] + }" + ''; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "CLI for dependency intelligence, SBOMs, vulnerability auditing, and CI policy gates"; + homepage = "https://github.com/bomly-dev/bomly-cli"; + changelog = "https://github.com/bomly-dev/bomly-cli/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "bomly"; + }; +}) diff --git a/pkgs/by-name/bo/bomly/scan_targets.json b/pkgs/by-name/bo/bomly/scan_targets.json new file mode 100644 index 000000000000..95f0279f4b60 --- /dev/null +++ b/pkgs/by-name/bo/bomly/scan_targets.json @@ -0,0 +1,160 @@ +[ + { + "name": "scan-go", + "url": "https://github.com/bomly-dev/example-go-gomod", + "ref": "v1.0.0", + "ecosystem": "go", + "tools": ["go"], + "benchmark_enabled": true + }, + { + "name": "scan-npm", + "url": "https://github.com/bomly-dev/example-javascript-npm", + "ref": "v1.0.0", + "ecosystem": "npm", + "tools": ["npm"], + "benchmark_enabled": true + }, + { + "name": "scan-maven", + "url": "https://github.com/bomly-dev/example-java-maven", + "ref": "v1.0.0", + "ecosystem": "maven", + "tools": ["mvn"], + "benchmark_enabled": true + }, + { + "name": "scan-python-pip", + "url": "https://github.com/bomly-dev/example-python-pip", + "ref": "fe04c758134b95dab102e1fce10275f7d18c0cf2", + "ecosystem": "python", + "tools": ["pip"], + "benchmark_enabled": true + }, + { + "name": "scan-composer", + "url": "https://github.com/bomly-dev/example-php-composer", + "ref": "v1.0.0", + "ecosystem": "php", + "benchmark_enabled": true + }, + { + "name": "scan-bundler", + "url": "https://github.com/bomly-dev/example-ruby-bundler", + "ref": "v1.0.0", + "ecosystem": "ruby", + "benchmark_enabled": true + }, + { + "name": "scan-github-actions", + "url": "https://github.com/bomly-dev/example-github-actions", + "ref": "v1.0.0", + "ecosystem": "github-actions", + "benchmark_enabled": true + }, + { + "name": "scan-nuget", + "url": "https://github.com/bomly-dev/example-dotnet-nuget", + "ref": "v1.0.0", + "ecosystem": "dotnet", + "benchmark_enabled": true + }, + { + "name": "scan-cargo", + "url": "https://github.com/bomly-dev/example-rust-cargo", + "ref": "v1.0.0", + "ecosystem": "rust", + "benchmark_enabled": true + }, + { + "name": "scan-pub", + "url": "https://github.com/bomly-dev/example-dart-pub", + "ref": "v1.0.0", + "ecosystem": "dart", + "benchmark_enabled": true + }, + { + "name": "scan-cocoapods", + "url": "https://github.com/bomly-dev/example-swift-cocoapods", + "ref": "v1.0.0", + "ecosystem": "swift", + "benchmark_enabled": true + }, + { + "name": "scan-mix", + "url": "https://github.com/bomly-dev/example-elixir-mix", + "ref": "v1.0.0", + "ecosystem": "elixir", + "benchmark_enabled": true + }, + { + "name": "scan-swiftpm", + "url": "https://github.com/bomly-dev/example-swift-swiftpm", + "ref": "v1.0.0", + "ecosystem": "swift", + "benchmark_enabled": true + }, + { + "name": "scan-sbt", + "url": "https://github.com/bomly-dev/example-scala-sbt", + "ref": "v1.0.0", + "ecosystem": "scala", + "benchmark_enabled": true + }, + { + "name": "scan-yarn", + "url": "https://github.com/bomly-dev/example-javascript-yarn", + "ref": "v1.0.0", + "ecosystem": "npm", + "tools": ["npm"], + "benchmark_enabled": true + }, + { + "name": "scan-pnpm", + "url": "https://github.com/bomly-dev/example-javascript-pnpm", + "ref": "v1.0.0", + "ecosystem": "npm", + "tools": ["npm"], + "benchmark_enabled": true + }, + { + "name": "scan-gradle", + "url": "https://github.com/bomly-dev/example-java-gradle", + "ref": "v1.0.0", + "ecosystem": "maven", + "benchmark_enabled": true + }, + { + "name": "scan-python-pipenv", + "url": "https://github.com/bomly-dev/example-python-pipenv", + "ref": "v1.0.0", + "ecosystem": "python", + "args": ["--install-first"], + "tools": ["pipenv"], + "benchmark_enabled": true + }, + { + "name": "scan-python-poetry", + "url": "https://github.com/bomly-dev/example-python-poetry", + "ref": "v1.0.0", + "ecosystem": "python", + "tools": ["poetry"], + "benchmark_enabled": true + }, + { + "name": "scan-python-uv", + "url": "https://github.com/bomly-dev/example-python-uv", + "ref": "v1.0.0", + "ecosystem": "python", + "args": ["--install-first"], + "tools": ["uv"], + "benchmark_enabled": true + }, + { + "name": "scan-cpp-conan", + "url": "https://github.com/bomly-dev/example-cpp-conan", + "ref": "v1.0.0", + "ecosystem": "cpp", + "benchmark_enabled": true + } +] diff --git a/pkgs/by-name/bo/bookstack/package.nix b/pkgs/by-name/bo/bookstack/package.nix index e039d2c5f30d..dc23a741a899 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 = "26.05.1"; + version = "26.05.2"; src = fetchFromGitHub { owner = "bookstackapp"; repo = "bookstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-g68wTZ5jRwXEKvAF9nLfKfWGf1FDD15msSkXzzJkVDQ="; + hash = "sha256-AYOl84DY13A5HnyUVY97kelYgoTJyq8nzeaHoksWXtI="; }; - vendorHash = "sha256-YJwJp+OtrCDgGFsZAjdlSx0LoxQFbylqCNW90MF8Kzo="; + vendorHash = "sha256-m98QXFqvdomVEVs2P8gnoKaYEBNYe/CchSvBEc448ko="; passthru = { phpPackage = php83; diff --git a/pkgs/by-name/bo/bookworm/package.nix b/pkgs/by-name/bo/bookworm/package.nix index d615ff72fae2..3378df6a5ef3 100644 --- a/pkgs/by-name/bo/bookworm/package.nix +++ b/pkgs/by-name/bo/bookworm/package.nix @@ -24,19 +24,19 @@ unar, unzip, vala, - # webkitgtk_4_0, + webkitgtk_4_1, wrapGAppsHook3, }: stdenv.mkDerivation { pname = "bookworm"; - version = "unstable-2022-01-09"; + version = "1.1.2-unstable-2026-05-28"; src = fetchFromGitHub { owner = "babluboy"; repo = "bookworm"; - rev = "f3df858ce748a6bbc43f03a6e261ff76a6d7d303"; - hash = "sha256-mLyJfblF5WnWBV3rX1ZRupccou4t5mBpo3W7+ECNMVI="; + rev = "fa06f1b80bb2372c1f20b0cfb21dc88eed410e29"; + hash = "sha256-xml6jOE0tJBz1CwE+0ecSbiGAajh398bw+leFapctiE="; }; nativeBuildInputs = [ @@ -60,12 +60,18 @@ stdenv.mkDerivation { poppler python3 sqlite - # webkitgtk_4_0 + webkitgtk_4_1 ]; postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py + substituteInPlace meson.build \ + --replace-fail "webkit2gtk-4.0" "webkit2gtk-4.1" + substituteInPlace src/window.vala \ + --replace-fail "Soup.URI.decode" "Uri.unescape_string" + substituteInPlace src/utils.vala \ + --replace-fail "Soup.URI.decode" "Uri.unescape_string" ''; # These programs are expected in PATH from the source code and scripts @@ -92,8 +98,6 @@ stdenv.mkDerivation { ''; meta = { - # webkitgtk_4_0 was removed - broken = true; description = "Simple, focused eBook reader"; mainProgram = "com.github.babluboy.bookworm"; longDescription = '' diff --git a/pkgs/by-name/bo/boost-build/package.nix b/pkgs/by-name/bo/boost-build/package.nix index aec23ef6a32e..de41ba27871a 100644 --- a/pkgs/by-name/bo/boost-build/package.nix +++ b/pkgs/by-name/bo/boost-build/package.nix @@ -35,7 +35,9 @@ stdenv.mkDerivation { patches = useBoost.boostBuildPatches or [ ] ++ lib.optional ( - useBoost ? version && lib.versionAtLeast useBoost.version "1.81" + useBoost ? version + && lib.versionAtLeast useBoost.version "1.81" + && lib.versionOlder useBoost.version "1.88" ) ./fix-clang-target.patch; postPatch = diff --git a/pkgs/by-name/bo/borgbackup/package.nix b/pkgs/by-name/bo/borgbackup/package.nix index 9300650bace2..53e46ade8c4b 100644 --- a/pkgs/by-name/bo/borgbackup/package.nix +++ b/pkgs/by-name/bo/borgbackup/package.nix @@ -4,6 +4,7 @@ acl, e2fsprogs, fetchFromGitHub, + fetchpatch, libb2, lz4, openssh, @@ -32,6 +33,26 @@ python.pkgs.buildPythonApplication (finalAttrs: { hash = "sha256-pMZr9cVr84b948b5Iuevpy6AtMeYo/Ma8uFLuagAYy4="; }; + patches = [ + (fetchpatch { + name = "msgspec-1.2.0-compat.patch"; + url = "https://github.com/borgbackup/borg/commit/364438f58c86aebd157b55bd2202afaf5945e008.patch"; + excludes = [ "docs/changes.rst" ]; + hash = "sha256-YhZDD6i2cn7p00Dgmpqi8uGJzFZzixMZmHPcZroB1sE="; + }) + (fetchpatch { + name = "msgspec-1.2.1-compat.patch"; + url = "https://github.com/borgbackup/borg/commit/8abdd3b8bf065dceecd52d2b22d92b3c407a7c1d.patch"; + excludes = [ "docs/changes.rst" ]; + hash = "sha256-bvSRxEzNvejG6PQFkeNDuQB7Zd4/EYPEZkrgjpgQ9Ss="; + }) + (fetchpatch { + name = "msgspec-1.2.1-unpacker-compat.patch"; + url = "https://github.com/borgbackup/borg/commit/b09bbed3de095d6ac9d69a42a486ec18523046dc.patch"; + hash = "sha256-F8CIqOcQOLdYn7srsev2op0pgkgt8zdkc5DQUH1c6xg="; + }) + ]; + postPatch = '' # sandbox does not support setuid/setgid/sticky bits substituteInPlace src/borg/testsuite/archiver.py \ @@ -103,7 +124,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { py pytest-benchmark pytest-xdist - pytestCheckHook + pytest9_0CheckHook versionCheckHook ]; diff --git a/pkgs/by-name/bo/borgmatic/package.nix b/pkgs/by-name/bo/borgmatic/package.nix index 682d8808520e..114dbdad8a3d 100644 --- a/pkgs/by-name/bo/borgmatic/package.nix +++ b/pkgs/by-name/bo/borgmatic/package.nix @@ -15,7 +15,7 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "borgmatic"; - version = "2.1.5"; + version = "2.1.6"; pyproject = true; strictDeps = true; @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication (finalAttrs: { src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-T0+E6opyfr7zxfP44OlNuhqsdQyi7OdIXiE5r310LaU="; + hash = "sha256-Mgx8PnGfTa5j6+53RVntPHa5EDJAY2NQC3fvmyRj24Y="; }; passthru.updateScript = nix-update-script { }; @@ -33,13 +33,17 @@ python3Packages.buildPythonApplication (finalAttrs: { [ flexmock pytestCheckHook + pytest-asyncio pytest-cov-stub pytest-timeout ] - ++ finalAttrs.passthru.optional-dependencies.apprise; + ++ finalAttrs.passthru.optional-dependencies.apprise + ++ finalAttrs.passthru.optional-dependencies.browse; # - test_borgmatic_version_matches_news_version - # NEWS file not available on the pypi source + # NEWS file is available on the pypi source, but the test requires a + # borgmatic executable. Which it can't find in difference to all the + # other tests. # - test_log_outputs_includes_error_output_in_exception # TOCTOU race in log_outputs(): process.poll() returns None in # raise_for_process_errors but non-None in the while-loop exit check, @@ -51,6 +55,8 @@ python3Packages.buildPythonApplication (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; + build-system = [ python3Packages.setuptools ]; + dependencies = with python3Packages; [ borgbackup colorama @@ -58,11 +64,14 @@ python3Packages.buildPythonApplication (finalAttrs: { packaging requests ruamel-yaml - setuptools ]; optional-dependencies = { apprise = [ python3Packages.apprise ]; + browse = with python3Packages; [ + binaryornot + textual + ]; }; postInstall = @@ -93,6 +102,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Simple, configuration-driven backup software for servers and workstations"; homepage = "https://torsion.org/borgmatic/"; + changelog = "https://projects.torsion.org/borgmatic-collective/borgmatic/src/tag/${finalAttrs.version}/NEWS"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; mainProgram = "borgmatic"; diff --git a/pkgs/by-name/bo/boring/package.nix b/pkgs/by-name/bo/boring/package.nix index ab25fc9021b5..c405fe9eb56a 100644 --- a/pkgs/by-name/bo/boring/package.nix +++ b/pkgs/by-name/bo/boring/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "boring"; - version = "0.15.0"; + version = "0.16.1"; src = fetchFromGitHub { owner = "alebeck"; repo = "boring"; tag = "v${finalAttrs.version}"; - hash = "sha256-WdohrSeq2N1zDQlYnwIMn1FF3IIb3zAiLSuOOf2GioU="; + hash = "sha256-Llc/zxra07DD3pxsUZGAKN2ltegCeTMTI/jSg76gn3U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bo/boringtun/package.nix b/pkgs/by-name/bo/boringtun/package.nix index 450e6c6a62f4..f1215d73a69d 100644 --- a/pkgs/by-name/bo/boringtun/package.nix +++ b/pkgs/by-name/bo/boringtun/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "boringtun"; - version = "0.6.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "cloudflare"; repo = "boringtun"; tag = "boringtun-${finalAttrs.version}"; - hash = "sha256-QrgKO0SVU4Z9GlNtZZmOV+Xcm1PonzLbUTGAFFOV/BM="; + hash = "sha256-IilQNWcN4cyTRiHppQzFxLPZvz0ep4nrvCrP2FWXerM="; }; - cargoHash = "sha256-j1I16QC46MMxcK7rbZJgI8KiKJvF29hkuGKiYLc6uW0="; + cargoHash = "sha256-Sm46l+/6QBa54PdTCNcWltRM9bMkzASYbEvuKsM6zHk="; # Testing this project requires sudo, Docker and network access, etc. doCheck = false; diff --git a/pkgs/by-name/bo/bosh-cli/package.nix b/pkgs/by-name/bo/bosh-cli/package.nix index 3ddf555f1eb5..f0e64bbdf72d 100644 --- a/pkgs/by-name/bo/bosh-cli/package.nix +++ b/pkgs/by-name/bo/bosh-cli/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "bosh-cli"; - version = "7.9.18"; + version = "7.10.7"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "bosh-cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-8bB1wOs4Ef6nR0d5Z6cmby6AiYSO90uBF6Hw6Q1UiWY="; + sha256 = "sha256-hWaJcB+H907QRw5A+xJzy4Dr22NufKNDEAJTtLNYqqg="; }; vendorHash = null; diff --git a/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch b/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch deleted file mode 100644 index 39b9aae8514c..000000000000 --- a/pkgs/by-name/bo/botamusique/catch-invalid-versions.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/mumbleBot.py b/mumbleBot.py -index 11bc480..7395f41 100644 ---- a/mumbleBot.py -+++ b/mumbleBot.py -@@ -188,11 +188,14 @@ class MumbleBot: - th.start() - - last_startup_version = var.db.get("bot", "version", fallback=None) -- if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version): -- var.db.set("bot", "version", self.version) -- if var.config.getboolean("bot", "auto_check_update"): -- changelog = util.fetch_changelog() -- self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog)) -+ try: -+ if not last_startup_version or version.parse(last_startup_version) < version.parse(self.version): -+ var.db.set("bot", "version", self.version) -+ if var.config.getboolean("bot", "auto_check_update"): -+ changelog = util.fetch_changelog() -+ self.send_channel_msg(tr("update_successful", version=self.version, changelog=changelog)) -+ except version.InvalidVersion: -+ pass - - # Set the CTRL+C shortcut - def ctrl_caught(self, signal, frame): diff --git a/pkgs/by-name/bo/botamusique/no-runtime-update.patch b/pkgs/by-name/bo/botamusique/no-runtime-update.patch deleted file mode 100644 index 8fc8580fce83..000000000000 --- a/pkgs/by-name/bo/botamusique/no-runtime-update.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/util.py b/util.py -index bfec1ed..5147757 100644 ---- a/util.py -+++ b/util.py -@@ -132,6 +132,7 @@ def check_update(current_version): - - - def update(current_version): -+ return "Can't update Nix installation at runtime" - global log - - target = var.config.get('bot', 'target_version') diff --git a/pkgs/by-name/bo/botamusique/package.nix b/pkgs/by-name/bo/botamusique/package.nix deleted file mode 100644 index 8d86a367d3ee..000000000000 --- a/pkgs/by-name/bo/botamusique/package.nix +++ /dev/null @@ -1,167 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - python3Packages, - ffmpeg-headless, - makeWrapper, - nixosTests, - nodejs, - npmHooks, - fetchNpmDeps, - - # For the update script - coreutils, - curl, - nix-prefetch-git, - prefetch-npm-deps, - jq, - writeShellScript, -}: -let - srcJson = lib.importJSON ./src.json; - src = fetchFromGitHub { - owner = "azlux"; - repo = "botamusique"; - inherit (srcJson) rev sha256; - }; - - # Python needed to instantiate the html templates - buildPython = python3Packages.python.withPackages (ps: [ ps.jinja2 ]); -in - -stdenv.mkDerivation rec { - pname = "botamusique"; - version = srcJson.version; - - inherit src; - - npmDeps = fetchNpmDeps { - src = "${src}/web"; - hash = srcJson.npmDepsHash; - }; - - npmRoot = "web"; - - patches = [ - # botamusique by default resolves relative state paths by first checking - # whether it exists in the working directory, then falls back to using the - # installation directory. With Nix however, the installation directory is - # not writable, so that won't work. So we change this so that it uses - # relative paths unconditionally, whether they exist or not. - ./unconditional-relative-state-paths.patch - - # We can't update the package at runtime with NixOS, so this patch makes - # the !update command mention that - ./no-runtime-update.patch - - # Fix passing of invalid "git" version into version.parse, which results - # in an InvalidVersion exception. The upstream fix is insufficient, so - # we carry the correct patch downstream for now. - ./catch-invalid-versions.patch - ]; - - postPatch = '' - # However, the function that's patched above is also used for - # configuration.default.ini, which is in the installation directory - # after all. So we need to counter-patch it here so it can find it absolutely - substituteInPlace mumbleBot.py \ - --replace "configuration.default.ini" "$out/share/botamusique/configuration.default.ini" \ - --replace "version = 'git'" "version = '${version}'" - ''; - - env.NODE_OPTIONS = "--openssl-legacy-provider"; - - nativeBuildInputs = [ - makeWrapper - nodejs - npmHooks.npmConfigHook - python3Packages.wrapPython - ]; - - pythonPath = with python3Packages; [ - audioop-lts - flask - magic - mutagen - packaging - pillow - pymumble - pyradios - requests - yt-dlp - ]; - - buildPhase = '' - runHook preBuild - - # Generates artifacts in ./static - ( - cd web - npm run build - ) - - # Fills out http templates - ${buildPython}/bin/python scripts/translate_templates.py --lang-dir lang/ --template-dir templates/ - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/share $out/bin - cp -r . $out/share/botamusique - chmod +x $out/share/botamusique/mumbleBot.py - wrapPythonProgramsIn $out/share/botamusique "$out ''${pythonPath[*]}" - - # Convenience binary and wrap with ffmpeg dependency - makeWrapper $out/share/botamusique/mumbleBot.py $out/bin/botamusique \ - --prefix PATH : ${lib.makeBinPath [ ffmpeg-headless ]} - - runHook postInstall - ''; - - passthru.updateScript = writeShellScript "botamusique-updater" '' - export PATH=${ - lib.makeBinPath [ - coreutils - curl - nix-prefetch-git - jq - prefetch-npm-deps - ] - } - set -ex - - OWNER=azlux - REPO=botamusique - VERSION="$(curl https://api.github.com/repos/$OWNER/$REPO/releases/latest | jq -r '.tag_name')" - - nix-prefetch-git --rev "$VERSION" --url https://github.com/$OWNER/$REPO | \ - jq > "${toString ./src.json}" \ - --arg version "$VERSION" \ - '.version |= $version' - path="$(jq '.path' -r < "${toString ./src.json}")" - - tmp="$(mktemp -d)" - trap 'rm -rf "$tmp"' exit - - npmHash="$(prefetch-npm-deps $path/web/package-lock.json)" - jq '. + { npmDepsHash: "'"$npmHash"'" }' < "${toString ./src.json}" > "$tmp/src.json" - mv "$tmp/src.json" "${toString ./src.json}" - ''; - - passthru.tests = { - inherit (nixosTests) botamusique; - }; - - meta = { - description = "Bot to play youtube / soundcloud / radio / local music on Mumble"; - homepage = "https://github.com/azlux/botamusique"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = [ ]; - mainProgram = "botamusique"; - }; -} diff --git a/pkgs/by-name/bo/botamusique/src.json b/pkgs/by-name/bo/botamusique/src.json deleted file mode 100644 index 034129ab9956..000000000000 --- a/pkgs/by-name/bo/botamusique/src.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "url": "https://github.com/azlux/botamusique", - "rev": "9b9b4e40ce7b077ebfa3b9be08d32025d1e43bc3", - "date": "2021-10-27T02:29:59+02:00", - "path": "/nix/store/9gxn2bw0757yrmx0xhhwq642lixyy88x-botamusique", - "sha256": "07n6nyi84ddqp2x8xrds7q83yfqapl5qhkcprzjsmvxhv4a3ar8q", - "fetchLFS": false, - "fetchSubmodules": false, - "deepClone": false, - "leaveDotGit": false, - "version": "7.2.2", - "npmDepsHash": "sha256-IzEO7TFqIZUkhNGf0pnHbK/WFexF27RPD9lkYvmFmDw=" -} diff --git a/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch b/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch deleted file mode 100644 index 3642a034fc88..000000000000 --- a/pkgs/by-name/bo/botamusique/unconditional-relative-state-paths.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/util.py b/util.py -index bfec1ed..0546772 100644 ---- a/util.py -+++ b/util.py -@@ -22,16 +22,7 @@ log = logging.getLogger("bot") - - - def solve_filepath(path): -- if not path: -- return '' -- -- if path[0] == '/': -- return path -- elif os.path.exists(path): -- return path -- else: -- mydir = os.path.dirname(os.path.realpath(__file__)) -- return mydir + '/' + path -+ return path - - - def get_recursive_file_list_sorted(path): diff --git a/pkgs/by-name/bo/bottom/package.nix b/pkgs/by-name/bo/bottom/package.nix index 34bae025e153..8d0d0c7d0fa3 100644 --- a/pkgs/by-name/bo/bottom/package.nix +++ b/pkgs/by-name/bo/bottom/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bottom"; - version = "0.12.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "ClementTsang"; repo = "bottom"; tag = finalAttrs.version; - hash = "sha256-arbVp0UjapM8SQ99XQCP7c+iGInyuxxx6LMEONRVl6o="; + hash = "sha256-axzZEviUVosXo5XzQB32A2+sUdiLzEtjZg52Z6hp4lM="; }; - cargoHash = "sha256-miSMcqy4OFZFhAs9M+zdv4OzYgFxN2/uBo6V/kJql90="; + cargoHash = "sha256-RUFlv95VoRhfHeIXWFWWtbwn71uJnEYoi2NozU4ybK8="; nativeBuildInputs = [ autoAddDriverRunpath diff --git a/pkgs/by-name/bo/boundary/package.nix b/pkgs/by-name/bo/boundary/package.nix index 11e55fb718c3..c0c2ead360fc 100644 --- a/pkgs/by-name/bo/boundary/package.nix +++ b/pkgs/by-name/bo/boundary/package.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "boundary"; - version = "0.19.0"; + version = "0.21.2"; src = let @@ -15,14 +15,12 @@ stdenv.mkDerivation rec { suffix = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-tqgY0308n3F/ZYGhn3bAsHa4cBdFz0oGgSHI6y6J1LY="; - aarch64-linux = "sha256-vvc8rOpyOd91crZTQQofj3RixUuWHe7SbMM0BZDkdRw="; - x86_64-darwin = "sha256-wsI8hqULVN+W6zwQsXcWQHbxmocrijsl5eUJgUxLxf8="; - aarch64-darwin = "sha256-S0QXBBiO2qgSazjtwd1bWgL/6gJUimKYPv369L419UU="; + x86_64-linux = "sha256-S5wt4Wy2SfO+36YwxQo86vnSIv4I0tMdfXro3i2qS6k="; + aarch64-linux = "sha256-bu+tYL5uHs67JG1MxCUDIQ9xwYxArbz/FElN0QCXNU4="; + aarch64-darwin = "sha256-PEaxwEKCidLvDbMSfXZ2ehWOwblLjzU+yy9Qq9tavtw="; }; in fetchzip { diff --git a/pkgs/by-name/bo/boundary/update.sh b/pkgs/by-name/bo/boundary/update.sh index 660f44964a95..a163881d604c 100644 --- a/pkgs/by-name/bo/boundary/update.sh +++ b/pkgs/by-name/bo/boundary/update.sh @@ -26,13 +26,11 @@ replace_sha() { BOUNDARY_VER=$(curl -Ls -w "%{url_effective}" -o /dev/null https://github.com/hashicorp/boundary/releases/latest | awk -F'/' '{print $NF}' | sed 's/v//') BOUNDARY_LINUX_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_amd64") -BOUNDARY_DARWIN_X64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_amd64") BOUNDARY_LINUX_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "linux_arm64") BOUNDARY_DARWIN_AARCH64_SHA256=$(calc_hash "$BOUNDARY_VER" "darwin_arm64") sed -i "s/version = \".*\"/version = \"$BOUNDARY_VER\"/" "$NIX_DRV" replace_sha "x86_64-linux" "$BOUNDARY_LINUX_X64_SHA256" -replace_sha "x86_64-darwin" "$BOUNDARY_DARWIN_X64_SHA256" replace_sha "aarch64-linux" "$BOUNDARY_LINUX_AARCH64_SHA256" replace_sha "aarch64-darwin" "$BOUNDARY_DARWIN_AARCH64_SHA256" diff --git a/pkgs/by-name/bo/bounty/package.nix b/pkgs/by-name/bo/bounty/package.nix index 3f2a43d4e5ad..d16d4c6dc29d 100644 --- a/pkgs/by-name/bo/bounty/package.nix +++ b/pkgs/by-name/bo/bounty/package.nix @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage { meta = { description = "CLI tool for bountybot.dev"; homepage = "https://github.com/ghbountybot/cli"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ andrewgazelka ]; mainProgram = "bounty"; }; diff --git a/pkgs/by-name/bo/box-cli/package.nix b/pkgs/by-name/bo/box-cli/package.nix new file mode 100644 index 000000000000..4e245d062f8c --- /dev/null +++ b/pkgs/by-name/bo/box-cli/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchurl, + installShellFiles, +}: + +let + sources = lib.importJSON ./sources.json; + platform = + sources.platforms.${stdenv.hostPlatform.system} + or (throw "Unsupported platform: ${stdenv.hostPlatform.system}"); +in + +stdenv.mkDerivation (finalAttrs: { + pname = "box-cli"; + inherit (sources) version; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/ariana-dot-dev/agent-server/releases/download/${sources.tag}/${platform.filename}"; + inherit (platform) hash; + }; + + dontUnpack = true; + + nativeBuildInputs = [ installShellFiles ]; + + installPhase = '' + runHook preInstall + + install -Dm755 $src $out/bin/box + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "CLI for Ascii Box cloud sandboxes"; + homepage = "https://ascii.dev"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ pwnwriter ]; + mainProgram = "box"; + platforms = lib.attrNames sources.platforms; + }; +}) diff --git a/pkgs/by-name/bo/box-cli/sources.json b/pkgs/by-name/bo/box-cli/sources.json new file mode 100644 index 000000000000..5b805dbf81e9 --- /dev/null +++ b/pkgs/by-name/bo/box-cli/sources.json @@ -0,0 +1,18 @@ +{ + "version": "0.1.112", + "tag": "box-cli-v0.1.112-ascii-prod1", + "platforms": { + "x86_64-linux": { + "filename": "box-linux-x64", + "hash": "sha256-DWQNenz/pmFVH5QM554lBk6+RwgOCjCBe7p+ZkHADTI=" + }, + "aarch64-linux": { + "filename": "box-linux-arm64", + "hash": "sha256-V2Sk6C1ZTRWlYQ2bVQTvK6PU8BkBPkmJMjUAo2Ul6+Q=" + }, + "aarch64-darwin": { + "filename": "box-darwin-arm64", + "hash": "sha256-cyjMUGkWfNOggvtBfVqCijmcAj0P2SuFQORwg9EWbn0=" + } + } +} diff --git a/pkgs/by-name/bo/box-cli/update.sh b/pkgs/by-name/bo/box-cli/update.sh new file mode 100755 index 000000000000..093689c68b3f --- /dev/null +++ b/pkgs/by-name/bo/box-cli/update.sh @@ -0,0 +1,56 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nix + +set -euo pipefail + +cd "$(dirname "$0")" + +channel="ascii-prod" +repo="ariana-dot-dev/agent-server" + +old_version=$(jq -r ".version" sources.json) + +tag=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} \ + "https://api.github.com/repos/${repo}/git/refs/tags/box-cli-v" \ + | jq -r --arg channel "$channel" \ + '[.[].ref | select(test($channel)) | ltrimstr("refs/tags/")] | sort_by(split(".")[2] | tonumber) | last') + +if [[ -z "$tag" || "$tag" == "null" ]]; then + echo "No box-cli release found for channel $channel" + exit 1 +fi + +version=$(echo "$tag" | sed -n 's/^box-cli-v\([0-9.]*\)-.*/\1/p') + +if [[ "$old_version" == "$version" ]]; then + echo "box-cli is already up to date at $version" + exit 0 +fi + +echo "Updating box-cli from $old_version to $version" + +declare -A platforms=( + [x86_64-linux]="box-linux-x64" + [aarch64-linux]="box-linux-arm64" + [aarch64-darwin]="box-darwin-arm64" +) + +sources_tmp="$(mktemp)" +jq -n --arg v "$version" --arg t "$tag" '{version: $v, tag: $t, platforms: {}}' > "$sources_tmp" + +for platform in "${!platforms[@]}"; do + filename="${platforms[$platform]}" + url="https://github.com/${repo}/releases/download/${tag}/${filename}" + echo "Fetching hash for $platform ($filename)..." + sha256hash="$(nix-prefetch-url --type sha256 "$url")" + hash="$(nix hash convert --to sri --hash-algo sha256 "$sha256hash")" + jq --arg platform "$platform" \ + --arg filename "$filename" \ + --arg hash "$hash" \ + '.platforms += {($platform): {filename: $filename, hash: $hash}}' \ + "$sources_tmp" > "${sources_tmp}.tmp" && mv "${sources_tmp}.tmp" "$sources_tmp" +done + +mv "$sources_tmp" sources.json + +echo "Updated box-cli to $version (tag: $tag)" diff --git a/pkgs/by-name/bp/bpf-linker/package.nix b/pkgs/by-name/bp/bpf-linker/package.nix index 166b7f8e8674..e38fc2492211 100644 --- a/pkgs/by-name/bp/bpf-linker/package.nix +++ b/pkgs/by-name/bp/bpf-linker/package.nix @@ -13,16 +13,16 @@ }: rustPlatform.buildRustPackage rec { pname = "bpf-linker"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { owner = "aya-rs"; repo = "bpf-linker"; tag = "v${version}"; - hash = "sha256-QqJtiKQgU1rgiQOTw5kn0LhxiGrGz65y9wzMMpqEBz8="; + hash = "sha256-W1ZrKSkAHH1CBFNhyD5qfVJuf9mhwzZuzkdWGX4prnI="; }; - cargoHash = "sha256-zA3R34QS3wAALEIo7k37BjDgyfzqg0n12Z0rZ/GTIIk="; + cargoHash = "sha256-jgVuJ5xq/M2Bq1B1u8BnULqSsbwxXpSsIFhVU8ehDZM="; buildNoDefaultFeatures = true; buildFeatures = [ "llvm-${lib.versions.major llvmPackagesForLinker.llvm.version}" ]; diff --git a/pkgs/by-name/bp/bpftop/package.nix b/pkgs/by-name/bp/bpftop/package.nix index a14cf703bc75..2f0fdc1f1417 100644 --- a/pkgs/by-name/bp/bpftop/package.nix +++ b/pkgs/by-name/bp/bpftop/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { version = "0.9.0"; src = fetchFromGitHub { - owner = "Netflix"; + owner = "jfernandez"; repo = "bpftop"; tag = "v${finalAttrs.version}"; hash = "sha256-QukcBq80tASPSHRg1yRouYiZqvca+ipp6RGzXqP2CwA="; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage.override { stdenv = clangStdenv; } (finalAttrs: { meta = { description = "Dynamic real-time view of running eBPF programs"; - homepage = "https://github.com/Netflix/bpftop"; + homepage = "https://github.com/jfernandez/bpftop"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ _0x4A6F diff --git a/pkgs/by-name/bp/bpkg/package.nix b/pkgs/by-name/bp/bpkg/package.nix index 7265bb38ce28..cf4f45450711 100644 --- a/pkgs/by-name/bp/bpkg/package.nix +++ b/pkgs/by-name/bp/bpkg/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "bpkg"; - version = "0.17.0"; + version = "0.18.0"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/bpkg-${finalAttrs.version}.tar.gz"; - hash = "sha256-Yw6wvTqO+VfCo91B2BUT0A8OIN0MVhGK1USYM7hgGMs="; + hash = "sha256-EcDxvQ3P182gkZWkE3qI586vIlJXlDrYC2DoU0Out18="; }; strictDeps = true; diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index 497820c9f4cf..fd018d50a3d5 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -307,7 +307,6 @@ stdenv.mkDerivation { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "brave"; }; diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 508e2f4d5612..2ef60eda0800 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,24 +3,20 @@ let pname = "brave"; - version = "1.91.168"; + version = "1.92.143"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-lH1AvdAkhpQtaGdMtbKfnm8bA4w5DpgM7fEEWsSVcoA="; + hash = "sha256-IHBJm9uow2d/X4Z9e117aGdP1Y+3R1ApWu40sPtdbr8="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-5xW0HhDM9cgh7h0hQ+B0NxaHw7DObLSXzgwixo+jNtc="; + hash = "sha256-jaxNneurduBiw3jho5Fp7gXnBfSpLB5hlE06i/JK+ic="; }; aarch64-darwin = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-arm64.zip"; - hash = "sha256-kE4/GSEL4dDTy4aqqg6JqyzNIlCcIDGdPxAgCAPEN3Q="; - }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-v${version}-darwin-x64.zip"; - hash = "sha256-ocRwDMegXcGMFRQSVVTNjT/OlHlNiTHYCjHWJSaz1Z8="; + hash = "sha256-EvfZgO8FAijof1Ml6gqSOyRndL8KYFdT0MNmVmuxAnU="; }; }; diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index f806154aa9dc..ccb7c9b826b0 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -8,7 +8,6 @@ latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://ap hashAarch64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_arm64.deb")")" hashAmd64="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-browser_${latestVersion}_amd64.deb")")" hashAarch64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-arm64.zip")")" -hashAmd64Darwin="$(nix-hash --to-sri --type sha256 "$(nix-prefetch-url --type sha256 "https://github.com/brave/brave-browser/releases/download/v${latestVersion}/brave-v${latestVersion}-darwin-x64.zip")")" cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! @@ -31,10 +30,6 @@ let url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-arm64.zip"; hash = "${hashAarch64Darwin}"; }; - x86_64-darwin = { - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-v\${version}-darwin-x64.zip"; - hash = "${hashAmd64Darwin}"; - }; }; archive = diff --git a/pkgs/by-name/br/breakpad/package.nix b/pkgs/by-name/br/breakpad/package.nix index b6785405496c..9853e94d8975 100644 --- a/pkgs/by-name/br/breakpad/package.nix +++ b/pkgs/by-name/br/breakpad/package.nix @@ -13,17 +13,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "breakpad"; - version = "2024.02.16"; + __structuredAttrs = true; + src = fetchgit { url = "https://chromium.googlesource.com/breakpad/breakpad"; rev = "v${finalAttrs.version}"; hash = "sha256-yk+TSzjmAr9QMTYduKVe/Aizph/NNmSS385pvGJckiQ="; }; + strictDeps = true; + + enableParallelBuilding = true; + buildInputs = [ zlib ]; + configureFlags = lib.optionals stdenv.hostPlatform.isMusl [ "--disable-tools" ]; + postUnpack = '' ln -s ${lss} $sourceRoot/src/third_party/lss ''; diff --git a/pkgs/by-name/br/breaktimer/disable-auto-update.patch b/pkgs/by-name/br/breaktimer/disable-auto-update.patch new file mode 100644 index 000000000000..2af3ab9a14e3 --- /dev/null +++ b/pkgs/by-name/br/breaktimer/disable-auto-update.patch @@ -0,0 +1,89 @@ +diff --git a/app/main/index.ts b/app/main/index.ts +index 96921cb..f6ce034 100644 +--- a/app/main/index.ts ++++ b/app/main/index.ts +@@ -1,11 +1,9 @@ +-import { app, shell } from "electron"; ++import { app } from "electron"; + import electronDebug from "electron-debug"; + import log from "electron-log"; +-import { autoUpdater } from "electron-updater"; + import { setAutoLauch } from "./lib/auto-launch"; + import { initBreaks } from "./lib/breaks"; + import "./lib/ipc"; +-import { showNotification } from "./lib/notifications"; + import { getAppInitialized } from "./lib/store"; + import { initTray } from "./lib/tray"; + import { createSettingsWindow, createSoundsWindow } from "./lib/windows"; +@@ -29,62 +27,6 @@ if (!gotTheLock) { + app.exit(); + } + +-function getDownloadUrl(): string { +- switch (process.platform) { +- case "win32": +- return "https://github.com/tom-james-watson/breaktimer-app/releases/latest/download/BreakTimer.exe"; +- case "linux": +- return "https://github.com/tom-james-watson/breaktimer-app/releases/latest"; +- default: +- throw new Error("Download URL should not be called for macOS"); +- } +-} +- +-function shouldAutoInstall(): boolean { +- const isMac = process.platform === "darwin"; +- const isLinux = process.platform === "linux"; +- +- return isMac || isLinux; +-} +- +-function checkForUpdates(): void { +- log.info("Checking for updates..."); +- autoUpdater.logger = log; +- +- autoUpdater.on("error", (error) => { +- log.error(`Auto updater error: ${error}`); +- }); +- +- if (shouldAutoInstall()) { +- autoUpdater.checkForUpdatesAndNotify().catch((error) => { +- log.error(`Unable to run auto updater: ${error}`); +- }); +- } else { +- autoUpdater.autoDownload = false; +- +- autoUpdater.on("update-available", (info) => { +- log.info("Update available:", info); +- +- const downloadUrl = getDownloadUrl(); +- +- showNotification( +- "Update Available", +- "A new version of BreakTimer is available. Click to download.", +- () => { +- shell.openExternal(downloadUrl).catch((error) => { +- log.error(`Failed to open download URL: ${error}`); +- }); +- }, +- false, +- ); +- }); +- +- autoUpdater.checkForUpdates().catch((error) => { +- log.error(`Unable to check for updates: ${error}`); +- }); +- } +-} +- + if (process.env.NODE_ENV === "production") { + const sourceMapSupport = require("source-map-support"); + sourceMapSupport.install(); +@@ -146,8 +88,4 @@ app.on("ready", async () => { + initBreaks(); + initTray(); + createSoundsWindow(); +- +- if (process.env.NODE_ENV !== "development") { +- checkForUpdates(); +- } + }); diff --git a/pkgs/by-name/br/breaktimer/package.nix b/pkgs/by-name/br/breaktimer/package.nix new file mode 100644 index 000000000000..361ce8d7e8be --- /dev/null +++ b/pkgs/by-name/br/breaktimer/package.nix @@ -0,0 +1,133 @@ +{ + lib, + stdenv, + buildNpmPackage, + copyDesktopItems, + electron_41, + fetchFromGitHub, + jq, + makeDesktopItem, + makeWrapper, + nix-update-script, + nodejs_24, +}: + +let + electron = electron_41; + nodejs = nodejs_24; + description = "Cross-platform desktop app for managing periodic breaks"; +in +buildNpmPackage rec { + pname = "breaktimer"; + version = "2.1.0"; + + src = fetchFromGitHub { + owner = "tom-james-watson"; + repo = "breaktimer-app"; + tag = "v${version}"; + hash = "sha256-STDb6+brlVk/ZPUbw3cQOpe2r03WlFKEBgVLqJrsrHI="; + }; + + strictDeps = true; + __structuredAttrs = true; + + # electron-updater's auto-install path tries to download a new release + # from GitHub and overwrite the nix-store binary, which is read-only. + # Updates come via nix instead. + patches = [ ./disable-auto-update.patch ]; + + # The package ships a lockfile (package-lock.json) but the default + # `npm run build` is run via `concurrently`; we drive the build manually. + dontNpmBuild = true; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmDepsHash = "sha256-UL8e0UKZKhHHC+JvRpmcdBvFHlCdn3YknceVJ+knMgg="; + + nativeBuildInputs = [ + jq + nodejs + makeWrapper + copyDesktopItems + ]; + + buildPhase = '' + runHook preBuild + + npm run build + + # electron-builder needs to mutate the copied Electron.app, which is + # read-only in the nix store. Copy it to a writable location first. + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + # Produce an unpacked Electron app without code-signing / notarisation. + npm exec electron-builder -- \ + --dir \ + --c.electronDist=electron-dist \ + --c.electronVersion=${electron.version} \ + --c.mac.identity=null \ + --c.mac.notarize=false + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + unpacked="release/linux-${lib.optionalString stdenv.hostPlatform.isAarch64 "arm64-"}unpacked" + + mkdir -p "$out/share/lib/breaktimer" + cp -r "$unpacked"/{locales,resources{,.pak}} "$out/share/lib/breaktimer" + + makeWrapper '${lib.getExe electron}' "$out/bin/breaktimer" \ + --add-flags "$out/share/lib/breaktimer/resources/app.asar" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=UseOzonePlatform,WaylandWindowDecorations,WebRTCPipeWireCapturer}}" \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + install -Dm644 resources/icon.png \ + "$out/share/icons/hicolor/512x512/apps/breaktimer.png" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/Applications" + cp -R release/mac-*/BreakTimer.app "$out/Applications/" + + mkdir -p "$out/bin" + makeWrapper \ + "$out/Applications/BreakTimer.app/Contents/MacOS/BreakTimer" \ + "$out/bin/breaktimer" \ + --set-default ELECTRON_IS_DEV 0 + '' + + '' + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "breaktimer"; + exec = "breaktimer"; + icon = "breaktimer"; + comment = description; + desktopName = "BreakTimer"; + genericName = "Break Reminder"; + categories = [ + "Utility" + "Office" + ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + inherit description; + homepage = "https://github.com/tom-james-watson/breaktimer-app"; + changelog = "https://github.com/tom-james-watson/breaktimer-app/releases/tag/v${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ proitheus ]; + mainProgram = "breaktimer"; + platforms = electron.meta.platforms; + }; +} diff --git a/pkgs/by-name/br/breitbandmessung/package.nix b/pkgs/by-name/br/breitbandmessung/package.nix index 9b8e37db0735..a696d13904a1 100644 --- a/pkgs/by-name/br/breitbandmessung/package.nix +++ b/pkgs/by-name/br/breitbandmessung/package.nix @@ -18,7 +18,7 @@ let sources = import ./sources.nix; systemArgs = - rec { + { x86_64-linux = { src = fetchurl sources.x86_64-linux; @@ -57,8 +57,8 @@ let ''; }; - x86_64-darwin = { - src = fetchurl sources.x86_64-darwin; + aarch64-darwin = { + src = fetchurl sources.aarch64-darwin; nativeBuildInputs = [ undmg ]; @@ -74,8 +74,6 @@ let runHook postInstall ''; }; - - aarch64-darwin = x86_64-darwin; } .${system} or { src = throw "Unsupported system: ${system}"; @@ -97,7 +95,6 @@ stdenv.mkDerivation ( maintainers = with lib.maintainers; [ b4dm4n ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/br/breitbandmessung/sources.nix b/pkgs/by-name/br/breitbandmessung/sources.nix index cb27fc7b61c6..48d21c728e1a 100644 --- a/pkgs/by-name/br/breitbandmessung/sources.nix +++ b/pkgs/by-name/br/breitbandmessung/sources.nix @@ -4,7 +4,7 @@ url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-linux.deb"; sha256 = "sha256-kNuR+zcKEdZ9p0HEajmFQ3TIUz1z2Ao098QNCK6x5lg="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-3.11.0-mac.dmg"; sha256 = "sha256-pKI4Kg4ngXYzyZnzmlijIxmzoCKshdQao1v9JWaAV50="; }; diff --git a/pkgs/by-name/br/breitbandmessung/update.sh b/pkgs/by-name/br/breitbandmessung/update.sh index da982adf933b..88dc7b6e2b36 100755 --- a/pkgs/by-name/br/breitbandmessung/update.sh +++ b/pkgs/by-name/br/breitbandmessung/update.sh @@ -20,7 +20,7 @@ if [[ $current != $latest ]]; then url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-linux.deb"; sha256 = "${linux_hash}"; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://download.breitbandmessung.de/bbm/Breitbandmessung-${latest}-mac.dmg"; sha256 = "${darwin_hash}"; }; diff --git a/pkgs/by-name/br/breseq/package.nix b/pkgs/by-name/br/breseq/package.nix new file mode 100644 index 000000000000..589c5ddeed20 --- /dev/null +++ b/pkgs/by-name/br/breseq/package.nix @@ -0,0 +1,94 @@ +{ + stdenv, + lib, + fetchFromGitHub, + callPackage, + nix-update-script, + libz, + libtool, + perl, + R, + bowtie2, + which, + ghostscript, + makeWrapper, + autoreconfHook, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "breseq"; + version = "0.39.0"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "barricklab"; + repo = "breseq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DsDX2oGn7Ex50Wnp1phJjCziCzZIeeZOHriUGJbejsk="; + }; + + buildInputs = [ + perl + libz + libtool + ]; + + nativeBuildInputs = [ + makeWrapper + autoreconfHook + ]; + + postInstall = '' + # Make wrappers + wrapProgram $out/bin/breseq --prefix PATH : ${ + lib.makeBinPath [ + which + ghostscript + bowtie2 + R + ] + } + wrapProgram $out/bin/gdtools --prefix PATH : ${ + lib.makeBinPath [ + which + ghostscript + bowtie2 + R + ] + } + # Copy over tests (incl necessary datasets) and license + cp LICENSE $out/license + mkdir $out/tests + mkdir $out/tests/data + cp tests/data/tmv_plasmid $out/tests/data/tmv_plasmid -r + cp tests/data/lambda $out/tests/data/lambda -r + cp tests/common.sh $out/tests/common.sh + cp tests/tmv_plasmid_circular_deletion $out/tests/tmv_plasmid_circular_deletion -r + cp tests/gdtools_compare_1 $out/tests/gdtools_compare_1 -r + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru.tests = { + breseq_works = callPackage ./tests/breseq.nix { }; + gdtools_works = callPackage ./tests/gdtools.nix { }; + }; + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Computational pipeline for finding mutations relative to a reference sequence in short-read DNA re-sequencing data"; + mainProgram = "breseq"; + homepage = "https://github.com/barricklab/breseq"; + license = with lib.licenses; [ + gpl2Plus # See barricklab/breseq#398 + ]; + maintainers = with lib.maintainers; [ croots ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/br/breseq/tests/breseq.nix b/pkgs/by-name/br/breseq/tests/breseq.nix new file mode 100644 index 000000000000..0b0975206373 --- /dev/null +++ b/pkgs/by-name/br/breseq/tests/breseq.nix @@ -0,0 +1,21 @@ +{ + runCommand, + breseq, +}: + +let + inherit (breseq) pname version; +in + +runCommand "breseq-tests" { meta.timeout = 60; } '' + echo "Testing breseq - breseq executable" + export TESTBINPREFIX=${breseq}/bin + cp ${breseq}/tests $PWD/breseqtests -r + chmod -R +w $PWD/breseqtests + output=$($PWD/breseqtests/tmv_plasmid_circular_deletion/testcmd.sh 2>&1) || { + echo "$output" + echo "Error testing breseq - breseq executable" + exit 1 + } + touch $out +'' diff --git a/pkgs/by-name/br/breseq/tests/gdtools.nix b/pkgs/by-name/br/breseq/tests/gdtools.nix new file mode 100644 index 000000000000..fbb78e221d97 --- /dev/null +++ b/pkgs/by-name/br/breseq/tests/gdtools.nix @@ -0,0 +1,21 @@ +{ + runCommand, + breseq, +}: + +let + inherit (breseq) pname version; +in + +runCommand "breseq-tests" { meta.timeout = 60; } '' + echo "Testing breseq - gdtools executable" + export TESTBINPREFIX=${breseq}/bin + cp ${breseq}/tests $PWD/breseqtests -r + chmod -R +w $PWD/breseqtests + output=$($PWD/breseqtests/gdtools_compare_1/testcmd.sh 2>&1) || { + echo "$output" + echo "Error testing breseq - gdtools executable" + exit 1 + } + touch $out +'' diff --git a/pkgs/by-name/br/brewtarget/package.nix b/pkgs/by-name/br/brewtarget/package.nix index af314d2e8e0d..cffed27593d7 100644 --- a/pkgs/by-name/br/brewtarget/package.nix +++ b/pkgs/by-name/br/brewtarget/package.nix @@ -16,16 +16,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "brewtarget"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "Brewtarget"; repo = "brewtarget"; tag = "v${finalAttrs.version}"; - hash = "sha256-CVFj/tsOOFj/LpkmMy4h9dnCBTOq9WGkXFUr/yJdcK0="; + hash = "sha256-1baUFgw3L+q2Ig/xvakP14mzk3Uop+NZy53YHhJLkR8="; fetchSubmodules = true; }; + __structuredAttrs = true; + strictDeps = true; + postPatch = '' # 3 sed statements from below derived from AUR # Disable boost-stacktrace_backtrace, requires an optional boost lib that's only built in Debianland @@ -41,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { cmake ninja pkg-config + qt6.qttools qt6.wrapQtAppsHook wrapGAppsHook3 pandoc @@ -51,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { qt6.qtbase qt6.qtmultimedia qt6.qtsvg - qt6.qttools xercesc xalanc ]; @@ -66,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Open source beer recipe creation tool"; mainProgram = "brewtarget"; homepage = "https://www.brewtarget.beer"; + changelog = "https://github.com/Brewtarget/brewtarget/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/br/brioche/librusty_v8.nix b/pkgs/by-name/br/brioche/librusty_v8.nix index 00cbd562c0ae..a15d2d5b2e14 100644 --- a/pkgs/by-name/br/brioche/librusty_v8.nix +++ b/pkgs/by-name/br/brioche/librusty_v8.nix @@ -7,7 +7,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "167yh6wabn154axrylam4p76n5a411rqjdgaza4dwsfc5cg2zvv2"; aarch64-linux = "1lmpqndmv9lyzsca1sx4prw76fsnk63cr1i15jdmk764j3zyyki6"; - x86_64-darwin = "1zdlwgq3kgd931ppd9afvqkn45vg8gjsz6k8jb2vnbwzf03grsv0"; aarch64-darwin = "0hm2wdkd5palsxdw0r9y5365gdww7f37g5z9260sa639211lipp4"; }; } diff --git a/pkgs/by-name/br/brioche/package.nix b/pkgs/by-name/br/brioche/package.nix index e6597a43eebe..526d752ba59f 100644 --- a/pkgs/by-name/br/brioche/package.nix +++ b/pkgs/by-name/br/brioche/package.nix @@ -64,5 +64,10 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "brioche"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; }; }) diff --git a/pkgs/by-name/br/brioche/update-librusty.sh b/pkgs/by-name/br/brioche/update-librusty.sh index 0ba452c803f5..575755a3c110 100755 --- a/pkgs/by-name/br/brioche/update-librusty.sh +++ b/pkgs/by-name/br/brioche/update-librusty.sh @@ -36,7 +36,6 @@ fetchLibrustyV8 { # NOTE; Follows supported platforms of package (see meta.platforms attribute)! x86_64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz)"; aarch64-linux = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz)"; - x86_64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_x86_64-apple-darwin.a.gz)"; aarch64-darwin = "$(nix-prefetch-url --type sha256 https://github.com/denoland/rusty_v8/releases/download/v"$NEW_VERSION"/librusty_v8_release_aarch64-apple-darwin.a.gz)"; }; } diff --git a/pkgs/by-name/br/brlcad/package.nix b/pkgs/by-name/br/brlcad/package.nix index 9629fc86897e..fde53331be81 100644 --- a/pkgs/by-name/br/brlcad/package.nix +++ b/pkgs/by-name/br/brlcad/package.nix @@ -227,7 +227,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BRLCAD_ENABLE_STRICT" false) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BRLCAD_ENABLE_QT" enableQt) (lib.cmakeFeature "GTE_INCLUDE_DIR" "${gtmathematics}/include/gtmathematics") (lib.cmakeFeature "LMDB_LIBRARY" "${lmdb.out}/lib/liblmdb${stdenv.hostPlatform.extensions.sharedLibrary}") diff --git a/pkgs/by-name/br/brook/package.nix b/pkgs/by-name/br/brook/package.nix index afbf3e191c48..7e8f9e8b7f6f 100644 --- a/pkgs/by-name/br/brook/package.nix +++ b/pkgs/by-name/br/brook/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/txthinking/brook"; description = "Cross-platform Proxy/VPN software"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ xrelkd ]; mainProgram = "brook"; }; diff --git a/pkgs/by-name/br/broot/package.nix b/pkgs/by-name/br/broot/package.nix index 2dc1d3488e50..bc3dc200e630 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.57.0"; + version = "1.58.0"; src = fetchFromGitHub { owner = "Canop"; repo = "broot"; tag = "v${finalAttrs.version}"; - hash = "sha256-uRMa8zaXXM8KWUplYMyOLic/WITLU0eAbZ2VDgM/PBw="; + hash = "sha256-cvrqIgxR96GVD5HpDTjswnuiwuzfJNW0evJIwYTI2lQ="; }; - cargoHash = "sha256-p4R8+PcRmjy/2q7lpfUevuYROPrCQEffmXx5vRrjwKs="; + cargoHash = "sha256-eel+0H5wYk4j/yB3E0M4+iqQXF7tLXm6gxv59rW2e1o="; nativeBuildInputs = [ installShellFiles @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://dystroy.org/broot/"; changelog = "https://github.com/Canop/broot/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ dywedir ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "broot"; }; }) diff --git a/pkgs/by-name/br/brotab/package.nix b/pkgs/by-name/br/brotab/package.nix index 5d72cf7c057a..10c698ecef3e 100644 --- a/pkgs/by-name/br/brotab/package.nix +++ b/pkgs/by-name/br/brotab/package.nix @@ -1,10 +1,11 @@ { lib, fetchFromGitHub, - python3Packages, + # https://github.com/balta2ar/brotab/issues/138 + python313Packages, }: -python3Packages.buildPythonApplication (finalAttrs: { +python313Packages.buildPythonApplication (finalAttrs: { pname = "brotab"; version = "1.5.0"; pyproject = true; @@ -16,11 +17,11 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-Pv5tEDL11brc/n3TuFcad9kTr7Jb/Bt7JFb29HuX/28="; }; - build-system = with python3Packages; [ + build-system = with python313Packages; [ setuptools ]; - dependencies = with python3Packages; [ + dependencies = with python313Packages; [ flask psutil requests @@ -50,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: { __darwinAllowLocalNetworking = true; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python313Packages; [ pytestCheckHook ]; diff --git a/pkgs/by-name/br/brscan5/package.nix b/pkgs/by-name/br/brscan5/package.nix index 688d12caa454..67fc343b3148 100644 --- a/pkgs/by-name/br/brscan5/package.nix +++ b/pkgs/by-name/br/brscan5/package.nix @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { makeWrapper \ "$out/$PATH_TO_BRSCAN5/brsaneconfig5" \ "$out/bin/brsaneconfig5" \ - --suffix-each NIX_REDIRECT ":" "/etc/opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5 /opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5" \ + --suffix-each NIX_REDIRECTS ":" "/etc/opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5 /opt/brother/scanner/brscan5=$out/opt/brother/scanner/brscan5" \ --set LD_PRELOAD ${libredirect}/lib/libredirect.so mkdir -p $out/etc/sane.d/dll.d diff --git a/pkgs/by-name/br/bruijn/generated.nix b/pkgs/by-name/br/bruijn/generated.nix index ee0fd9289b90..d96ef096eee4 100644 --- a/pkgs/by-name/br/bruijn/generated.nix +++ b/pkgs/by-name/br/bruijn/generated.nix @@ -22,10 +22,10 @@ }: mkDerivation { pname = "bruijn"; - version = "0-unstable-2026-05-02"; + version = "0-unstable-2026-07-16"; src = fetchzip { - url = "https://github.com/marvinborner/bruijn/archive/8a88445d1f0d970c88cdb0e1b97a04ba02019a94.tar.gz"; - sha256 = "12s2sa9zg6sxia36mm0z8fq7f3kd86g96gcwd8xnb8dl49x8qbd5"; + url = "https://github.com/marvinborner/bruijn/archive/9f1ac8856d09666a7444874f80b91b876929eecf.tar.gz"; + sha256 = "18mcwp2xn7wgr81mgqr38irvkf24rf0nvwzi8janasq5favim0vy"; }; isLibrary = true; isExecutable = true; diff --git a/pkgs/by-name/br/bruno-cli/package.nix b/pkgs/by-name/br/bruno-cli/package.nix index 8f9c54f3e414..3feb18f23ddf 100644 --- a/pkgs/by-name/br/bruno-cli/package.nix +++ b/pkgs/by-name/br/bruno-cli/package.nix @@ -119,7 +119,6 @@ buildNpmPackage { maintainers = with lib.maintainers; [ gepbird kashw2 - lucasew mattpolzin water-sucks ]; diff --git a/pkgs/by-name/br/bruno/package.nix b/pkgs/by-name/br/bruno/package.nix index ba007dc0a2c2..63153baf9f0f 100644 --- a/pkgs/by-name/br/bruno/package.nix +++ b/pkgs/by-name/br/bruno/package.nix @@ -21,13 +21,13 @@ buildNpmPackage rec { pname = "bruno"; - version = "3.4.2"; + version = "3.5.2"; src = fetchFromGitHub { owner = "usebruno"; repo = "bruno"; tag = "v${version}"; - hash = "sha256-eDLHXOKhQBdRWZ9QGAVk4nky8vywYFAjUXCskFTunUo="; + hash = "sha256-Lll/ywDkHv0xvLk8iiBEySek7A3dBmfO4V/q2xaNtBQ="; postFetch = '' ${lib.getExe npm-lockfile-fix} $out/package-lock.json @@ -36,7 +36,7 @@ buildNpmPackage rec { nodejs = nodejs_22; - npmDepsHash = "sha256-+wr86nNT9cT7Qy0gUfkFq0xFQaaWCrDTc1tg7A80pk4="; + npmDepsHash = "sha256-4VsSXiHj/INCu4ryZ+JxPbfDpsgIb5eYvOUYz+gbKEE="; npmFlags = [ "--legacy-peer-deps" ]; nativeBuildInputs = [ @@ -196,9 +196,7 @@ buildNpmPackage rec { maintainers = with lib.maintainers; [ gepbird kashw2 - lucasew mattpolzin - redyf water-sucks starsep ]; diff --git a/pkgs/by-name/br/brutespray/package.nix b/pkgs/by-name/br/brutespray/package.nix index 3bebcc60e1c8..cbf5732b20db 100644 --- a/pkgs/by-name/br/brutespray/package.nix +++ b/pkgs/by-name/br/brutespray/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "brutespray"; - version = "2.6.1"; + version = "2.6.3"; src = fetchFromGitHub { owner = "x90skysn3k"; repo = "brutespray"; tag = "v${finalAttrs.version}"; - hash = "sha256-3CDvsYCiVuWr+Hp2NSzecmHl69Xf9Mcl1umqKW09OlQ="; + hash = "sha256-Da43ngdqRsJW8Ippbu1vZ1vT0ushwg3h/3Ep5BQmoR0="; }; - vendorHash = "sha256-odRe6Jd0MIOyahoMfZJgSbv+AHeUUvWLeENaQFmT9R4="; + vendorHash = "sha256-zmNhYW+r5WBgv2sEZgnvTEO/yfqfQuHX26kvIwJ7ygs="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/br/brutus/package.nix b/pkgs/by-name/br/brutus/package.nix index f4bd5ee04df1..bb38e4e4b14b 100644 --- a/pkgs/by-name/br/brutus/package.nix +++ b/pkgs/by-name/br/brutus/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "brutus"; - version = "1.5.1"; + version = "1.9.0"; src = fetchFromGitHub { owner = "praetorian-inc"; repo = "brutus"; tag = "v${finalAttrs.version}"; - hash = "sha256-Jk4O0euYvW7e8iwS0zmKAmw4yXMNU0ABovznzv5tXVM="; + hash = "sha256-tHTgKeQ37DsrrucrI8ZfgvdGy8Xrqs1RtOt/GLrmOk0="; }; - vendorHash = "sha256-YdnKRxPagV6h22QEEOpC/HNUGfyFyWwIsh2LxMUmMrk="; + vendorHash = "sha256-scgSyLQvkTzG5bdW56bPO4raE+rLULHxOaFCu+DjyEE="; ldflags = [ "-s" diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix index da2e6bbea66c..a093c2041d3a 100644 --- a/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/default.nix @@ -7,19 +7,19 @@ buildDotnetModule { pname = "depotdownloader"; - version = "2.7.4-unstable-2024-12-01"; + version = "3.4.0-unstable-2026-05-14"; src = fetchFromGitHub { owner = "Iluhadesu"; repo = "DepotDownloader"; - rev = "a9f58e5513b72bd00b623a83e1460b3c5db49248"; - hash = "sha256-+QfwKQJzyXqUvTn8kKP7lYHvbtRtdJ7jc/W7E87tV7w="; + rev = "0ab6676c51f27d3b9e63278e3c18484d4d2bf063"; + hash = "sha256-qC9EakT1tu8NNwbmj7HmYgcIoEUlMRRHNGnKggVNDgk="; }; projectFile = "DepotDownloader.sln"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_9_0; + dotnet-runtime = dotnetCorePackages.runtime_9_0; meta = { description = "Fork of DepotDownloader to be used by BSManager"; @@ -27,7 +27,6 @@ buildDotnetModule { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json b/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json index 85d09e76a9de..3acb3405227e 100644 --- a/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json +++ b/pkgs/by-name/bs/bs-manager/depotdownloader/deps.json @@ -11,8 +11,8 @@ }, { "pname": "Microsoft.Windows.CsWin32", - "version": "0.3.106", - "hash": "sha256-S1uQa684taPb6uh69784ebVpXoirMoX+pxBRA+Rrzlg=" + "version": "0.3.275", + "hash": "sha256-sqIFj1dNatchuS9R7sk0Os6vSoSXFjm20qppvnnw78c=" }, { "pname": "Microsoft.Windows.SDK.Win32Docs", @@ -21,38 +21,38 @@ }, { "pname": "Microsoft.Windows.SDK.Win32Metadata", - "version": "60.0.34-preview", - "hash": "sha256-KdRe73sXipzMvm2BLmwwBZGh+l9isZDC9l8WFyUR1zM=" + "version": "63.0.31-preview", + "hash": "sha256-MMvQoyVT15IU93EKZ46rhP/hyx3wV452vuFnf8OTd60=" + }, + { + "pname": "Microsoft.Windows.SDK.Win32Metadata", + "version": "70.0.11-preview", + "hash": "sha256-JRcTFlzV+sDfgUKPtn0oOn25SdNivmhbS8+0HcAozu8=" }, { "pname": "Microsoft.Windows.WDK.Win32Metadata", - "version": "0.11.4-experimental", - "hash": "sha256-b3oKUKbr+3Udfl7RWzUY9BR/XWNsN+VmEkBxk6KiFo0=" + "version": "0.13.25-experimental", + "hash": "sha256-eQeaRJ2PYhBSvK8TA55BHRwbd67EqJzwTZZRjQphlhc=" }, { "pname": "protobuf-net", - "version": "3.2.30", - "hash": "sha256-keRy5OWT+/tlZt3D7x+9PEdjTvEJcZdYsf/i1ZBtciE=" + "version": "3.2.56", + "hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E=" }, { "pname": "protobuf-net.Core", - "version": "3.2.30", - "hash": "sha256-GMpJNecoBfrV2VgpYOhcZnKZaLFDObNLcX2LBTThrwY=" + "version": "3.2.56", + "hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc=" }, { "pname": "SteamKit2", - "version": "3.0.0-beta.4", - "hash": "sha256-7cXlpCuUD8ZuTMtqsT5MdklkZb+XIGBdoI28anjUXtg=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" + "version": "3.3.1", + "hash": "sha256-f6kc15RKNxCSIlynlVHU8fBqQ7N8nG1xV3DNbBlRmvo=" }, { "pname": "System.IO.Hashing", - "version": "8.0.0", - "hash": "sha256-szOGt0TNBo6dEdC3gf6H+e9YW3Nw0woa6UnCGGGK5cE=" + "version": "9.0.8", + "hash": "sha256-Jj1XwumBjBa5LJqSVTN2naQJ0FM4wwPvZS8NxGd5Hnw=" }, { "pname": "System.Security.AccessControl", @@ -63,5 +63,10 @@ "pname": "System.Security.Principal.Windows", "version": "5.0.0", "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" + }, + { + "pname": "ZstdSharp.Port", + "version": "0.8.6", + "hash": "sha256-rc3YWP80fykqujDsD72SXOA1tBDoy2KrvVETOC8eTx8=" } ] diff --git a/pkgs/by-name/bs/bsky-cli/package.nix b/pkgs/by-name/bs/bsky-cli/package.nix index 9d0ec625ec3d..154f6c686220 100644 --- a/pkgs/by-name/bs/bsky-cli/package.nix +++ b/pkgs/by-name/bs/bsky-cli/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "bsky-cli"; - version = "0.0.79"; + version = "0.0.81"; src = fetchFromGitHub { owner = "mattn"; repo = "bsky"; tag = "v${finalAttrs.version}"; - hash = "sha256-id7+g9NMCSicPbDoDSqnc7OwEMIVXbXw3O8TkeQjfmg="; + hash = "sha256-Su2AhHaIozuqTzK1vyAjZR/a01j0dnlayV14Q7hTcCU="; }; - vendorHash = "sha256-m4kth6r13++53fbceWjKYu4D297meAwnkaSsCiu5zS8="; + vendorHash = "sha256-jGeKaAR0rAqrhoUx/FqdDwdOxA/WioppFjGyi/PsIQs="; buildInputs = [ libpcap diff --git a/pkgs/by-name/bt/btcd/package.nix b/pkgs/by-name/bt/btcd/package.nix index ea2232a0cfd7..f24787eec57a 100644 --- a/pkgs/by-name/bt/btcd/package.nix +++ b/pkgs/by-name/bt/btcd/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "btcd"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "btcsuite"; repo = "btcd"; rev = "v${finalAttrs.version}"; - hash = "sha256-redoqqbiVdwgNLxDzBccqRBZGwhRTIY5nE9Gx6+4POc="; + hash = "sha256-08Ce66iSVCVzhSQ4fouWiXmld7e7jFU+Y1o8HdtsaDE="; }; - vendorHash = "sha256-qXfZKVoTvq7gNm0G4KKSL8anB8FUt/TxoxbOtH240cc="; + vendorHash = "sha256-vXQSFh9lD7iNjgUwhA4AMZ2miq/1pV8Y8QT7rcvgdCE="; subPackages = [ "." diff --git a/pkgs/by-name/bt/btfdump/package.nix b/pkgs/by-name/bt/btfdump/package.nix index f90f3fa12b1c..f7b97a1c6d83 100644 --- a/pkgs/by-name/bt/btfdump/package.nix +++ b/pkgs/by-name/bt/btfdump/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { description = "BTF introspection tool"; mainProgram = "btf"; homepage = "https://github.com/anakryiko/btfdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; }; } diff --git a/pkgs/by-name/bt/btor2tools/package.nix b/pkgs/by-name/bt/btor2tools/package.nix index 1ca0da27c480..df035412163a 100644 --- a/pkgs/by-name/bt/btor2tools/package.nix +++ b/pkgs/by-name/bt/btor2tools/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "0-unstable-2025-09-18"; src = fetchFromGitHub { - owner = "boolector"; + owner = "hwmcc"; repo = "btor2tools"; rev = "d33c73ff1d173f1bfac8ba6b1c6d68ba62c55f8e"; sha256 = "sha256-RVjZ5HM2yQ3eAICFuzwvNeQDXzWzzSiCCslIWMJi6U8="; @@ -54,7 +54,7 @@ stdenv.mkDerivation { meta = { description = "Generic parser and tool package for the BTOR2 format"; - homepage = "https://github.com/Boolector/btor2tools"; + homepage = "https://github.com/hwmcc/btor2tools"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thoughtpolice ]; diff --git a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix index b31fb3f9b475..698860a09c49 100644 --- a/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix +++ b/pkgs/by-name/bt/btrfs-auto-snapshot/package.nix @@ -14,14 +14,14 @@ }: assert syslogSupport -> util-linux != null; stdenv.mkDerivation rec { - version = "2.0.4"; + version = "2.1.1"; pname = "btrfs-auto-snapshot"; src = fetchFromGitHub { owner = "hunleyd"; repo = "btrfs-auto-snapshot"; rev = "v${version}"; - hash = "sha256-QpuwkGaYAkpu5hYyb360Mr5tHsZc2LzMlKtpS8CyyhI="; + hash = "sha256-QpXD0u593BYONjscXSc7oZGUydygs/Hfk3A7MOpn8jQ="; }; dontBuild = true; diff --git a/pkgs/by-name/bt/btrfs-heatmap/package.nix b/pkgs/by-name/bt/btrfs-heatmap/package.nix index 4222c249c9ca..ed564093f822 100644 --- a/pkgs/by-name/bt/btrfs-heatmap/package.nix +++ b/pkgs/by-name/bt/btrfs-heatmap/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "knorrie"; repo = "btrfs-heatmap"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; sha256 = "sha256-yCkuZqWwxrs2eS7EXY6pAOVVVSq7dAMxJtf581gX8vg="; }; @@ -40,12 +40,18 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; + strictDeps = true; + __structuredAttrs = true; + enableParallelBuilding = true; + meta = { description = "Visualize the layout of a mounted btrfs"; mainProgram = "btrfs-heatmap"; homepage = "https://github.com/knorrie/btrfs-heatmap"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + sandarukasa + ]; }; }) diff --git a/pkgs/by-name/bu/buck2/hashes.json b/pkgs/by-name/bu/buck2/hashes.json index 1f897e49538a..cbf18a92f293 100644 --- a/pkgs/by-name/bu/buck2/hashes.json +++ b/pkgs/by-name/bu/buck2/hashes.json @@ -1,21 +1,17 @@ { "aarch64-darwin": { - "buck2": "sha256-zBZ2gEPRxyaBYmnRfYfhYDqswqfiXvxYDHrUI92Z1UQ=", - "rust-project": "sha256-K86j0E32w0DUwzpPT0NBUiL3rV4Ze8hzfbKDkpy9JXo=" - }, - "x86_64-linux": { - "buck2": "sha256-IqDsyQ7Omy7QujT85oKrWwyirG7gwfupdxzvRoMRmQs=", - "rust-project": "sha256-iFSko4FTvAVlKUxJE/6FzR6H7V2SryRfEi7nRhfyhxQ=" - }, - "x86_64-darwin": { - "buck2": "sha256-G/xarAld9dXanZl7Ivcuoer3YsytmFXWED44u2U4q8g=", - "rust-project": "sha256-jbvvqPI7+qpONhk8UZfSiFpMGCGWRr85BocA58d+C7Y=" + "buck2": "sha256-CIysxyxAD6Q4vkBSw2eC9Wsq+GKHqt8T7OXpdy1yRVw=", + "rust-project": "sha256-o5m58wQ9zKkpa5GzgLpcLUV9LpA+n+MxVa/9hH9Tr40=" }, "aarch64-linux": { - "buck2": "sha256-VKV1vltATu3tAPmMiifba7MV9kNFH754FDda6i8cQrU=", - "rust-project": "sha256-oqxHdbNzQn1KHObboAd4/LTbilIJgLqMiWCgHLaPFrc=" + "buck2": "sha256-4jm/cvQKeYfbkCTrbV4yVkL2SWxYnexr5UwQCNJhihk=", + "rust-project": "sha256-vGSOwVETwYqwBhkxlSTDJlVcMfbAIzYwDhEKbqz+6ok=" }, - "version": "2026-04-15", - "preludeGit": "f0896771c4cc1ab8f87e032c5293376c89e5096b", - "preludeFod": "sha256-Ga4q9zzifgFDGx0TbcbBoDN29H3A4s1BZnSwwv9Mix0=" + "x86_64-linux": { + "buck2": "sha256-7MPYB90LD+/xpCNoi9WYJjuDOdIj5oVXiocZZFbBnZU=", + "rust-project": "sha256-de0SbH6cbjdDhcPpDTjxBo5HgQ8yS1eokQYjQrHKIDY=" + }, + "version": "2026-07-15", + "preludeGit": "caed0b8c0ee137c4e5e1f800a5054df151f490c2", + "preludeFod": "sha256-nMHnBf4vQJIxPgarmLPY38b15DFW2FlAQxDCzJgB+w8=" } diff --git a/pkgs/by-name/bu/buck2/package.nix b/pkgs/by-name/bu/buck2/package.nix index 18eb89e75acc..3ac1d273c089 100644 --- a/pkgs/by-name/bu/buck2/package.nix +++ b/pkgs/by-name/bu/buck2/package.nix @@ -33,7 +33,7 @@ # # from the root of the nixpkgs git repository, run: # -# nix-shell maintainers/scripts/update.nix --argstr commit true --argstr package buck2 +# nix-shell maintainers/scripts/update.nix --arg commit true --argstr package buck2 let @@ -47,7 +47,6 @@ let # NOTE (aseipp): must be synchronized with update.nu! platform-suffix = { - x86_64-darwin = "x86_64-apple-darwin"; aarch64-darwin = "aarch64-apple-darwin"; x86_64-linux = "x86_64-unknown-linux-gnu"; aarch64-linux = "aarch64-unknown-linux-gnu"; @@ -56,19 +55,19 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "buck2"; - version = "unstable-${buildHashes.version}"; # TODO (aseipp): kill 'unstable' once a non-prerelease is made + version = buildHashes.version; srcs = [ # the platform-specific binary — which is also # zstd-compressed (fetchurl { - url = "https://github.com/facebook/buck2/releases/download/${lib.removePrefix "unstable-" finalAttrs.version}/buck2-${platform-suffix}.zst"; + url = "https://github.com/facebook/buck2/releases/download/${finalAttrs.version}/buck2-${platform-suffix}.zst"; hash = archHashes.buck2; }) # rust-project, which is used to provide IDE integration Buck2 Rust projects, # is part of the official distribution (fetchurl { - url = "https://github.com/facebook/buck2/releases/download/${lib.removePrefix "unstable-" finalAttrs.version}/rust-project-${platform-suffix}.zst"; + url = "https://github.com/facebook/buck2/releases/download/${finalAttrs.version}/rust-project-${platform-suffix}.zst"; hash = archHashes.rust-project; }) ]; @@ -135,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Fast, hermetic, multi-language build system"; homepage = "https://buck2.build"; - changelog = "https://github.com/facebook/buck2/releases/tag/${lib.removePrefix "unstable-" finalAttrs.version}"; + changelog = "https://github.com/facebook/buck2/releases/tag/${finalAttrs.version}"; license = with lib.licenses; [ asl20 # or mit @@ -150,7 +149,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/bu/buck2/update.nu b/pkgs/by-name/bu/buck2/update.nu index dd43e7b834b6..57188e797bee 100755 --- a/pkgs/by-name/bu/buck2/update.nu +++ b/pkgs/by-name/bu/buck2/update.nu @@ -5,7 +5,6 @@ const ARCHES = [ { name: "x86_64-linux", target: "x86_64-unknown-linux-gnu" }, - { name: "x86_64-darwin", target: "x86_64-apple-darwin" }, { name: "aarch64-linux", target: "aarch64-unknown-linux-gnu" }, { name: "aarch64-darwin", target: "aarch64-apple-darwin" }, ]; diff --git a/pkgs/by-name/bu/buddy/package.nix b/pkgs/by-name/bu/buddy/package.nix index 6abc5dda3439..ac5845e6303b 100644 --- a/pkgs/by-name/bu/buddy/package.nix +++ b/pkgs/by-name/bu/buddy/package.nix @@ -32,10 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sourceforge.net/projects/buddy/"; description = "Binary decision diagram package"; - license = { - url = "https://sourceforge.net/p/buddy/gitcode/ci/master/tree/README"; - fullName = "Buddy License"; - }; + license = lib.licenses.buddy; platforms = lib.platforms.unix; # Once had cygwin problems }; diff --git a/pkgs/by-name/bu/budget-tracker-tui/package.nix b/pkgs/by-name/bu/budget-tracker-tui/package.nix index ad6125fbebfe..c4cf146c31af 100644 --- a/pkgs/by-name/bu/budget-tracker-tui/package.nix +++ b/pkgs/by-name/bu/budget-tracker-tui/package.nix @@ -6,7 +6,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "budget-tracker-tui"; - version = "1.4.0"; + version = "1.4.1"; __structuredAttrs = true; @@ -14,9 +14,9 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Feromond"; repo = "budget_tracker_tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-rVNAYMfTGYRepeNSlm+d/bJq11lRNFZjpoQjQpclSzY="; + hash = "sha256-vNpnW9SIjuSnvNtBW8wzDNCCVpw3z/2nv9bremTMqww="; }; - cargoHash = "sha256-u9XlckBJCRzpmY+Hs5x9cBWtxIN1zwMuIYMCuS7i6rQ="; + cargoHash = "sha256-eMzqi2uEaLmHEQtegiT2aWOJCq0tIdywtv1rl99kyys="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/bu/buf/package.nix b/pkgs/by-name/bu/buf/package.nix index 9cf5f276fa98..54f93cb93ed0 100644 --- a/pkgs/by-name/bu/buf/package.nix +++ b/pkgs/by-name/bu/buf/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "buf"; - version = "1.70.0"; + version = "1.72.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = "buf"; tag = "v${finalAttrs.version}"; - hash = "sha256-C06/5a4icjgI35ADQKvlZ6JmCCyW/9e0aF9VIpLCqn0="; + hash = "sha256-cnCwaa9vzoaqUmrFWqmHPiO/7UjeIburisIiLJZUpl4="; }; - vendorHash = "sha256-Vveg7rBno66IPinVs9RJtzVJdtAJE55QZfWA3WIXGDQ="; + vendorHash = "sha256-8LTi/+ODA8Tyd5mp5OeTDECjp6+bmNFFHxxCi6RtzTs="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/pkgs/by-name/bu/bugdom/package.nix b/pkgs/by-name/bu/bugdom/package.nix index c2f40e2c262e..abb1511068bb 100644 --- a/pkgs/by-name/bu/bugdom/package.nix +++ b/pkgs/by-name/bu/bugdom/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Port of Bugdom, a 1999 Macintosh game by Pangea Software, for modern operating systems"; homepage = "https://github.com/jorio/Bugdom"; - license = with lib.licenses; [ cc-by-sa-40 ]; + license = lib.licenses.cc-by-sa-40; maintainers = with lib.maintainers; [ lux ]; mainProgram = "Bugdom"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch b/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch index 4a1013f16e01..f4ed117cc497 100644 --- a/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch +++ b/pkgs/by-name/bu/build2-bootstrap/nix-ldflags-sysdirs.patch @@ -1,8 +1,6 @@ -diff --git a/libbuild2/cc/common.cxx b/libbuild2/cc/common.cxx -index f848003c..0f14f9a5 100644 --- a/libbuild2/cc/common.cxx +++ b/libbuild2/cc/common.cxx -@@ -966,6 +966,17 @@ namespace build2 +@@ -1806,6 +1806,17 @@ namespace build2 void msvc_extract_library_search_dirs (const strings&, dir_paths&); // msvc.cxx @@ -20,11 +18,8 @@ index f848003c..0f14f9a5 100644 dir_paths common:: extract_library_search_dirs (const scope& bs) const { -@@ -987,8 +998,19 @@ namespace build2 - msvc_extract_library_search_dirs (v, r); - else +@@ -1829,6 +1840,16 @@ namespace build2 gcc_extract_library_search_dirs (v, r); -+ }; + // NIX_LDFLAGS are implicitly used when linking, diff --git a/pkgs/by-name/bu/build2-bootstrap/package.nix b/pkgs/by-name/bu/build2-bootstrap/package.nix index f6002a9b8385..7b57124f9e93 100644 --- a/pkgs/by-name/bu/build2-bootstrap/package.nix +++ b/pkgs/by-name/bu/build2-bootstrap/package.nix @@ -8,20 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "build2-bootstrap"; - version = "0.17.0"; + version = "0.18.1"; src = fetchurl { url = "https://download.build2.org/${finalAttrs.version}/build2-toolchain-${finalAttrs.version}.tar.xz"; - hash = "sha256-NyKonqht90JTnQ+Ru0Qp/Ua79mhVOjUHgKY0EbZIv10="; + hash = "sha256-pfPqudRSK8InBImVk91scBM0mhuMNyeMiyMhBz4l/xY="; }; patches = [ # Pick up sysdirs from NIX_LDFLAGS ./nix-ldflags-sysdirs.patch - # Fix build on newer clang/libcpp - (fetchpatch { - name = "new-libcpp-fix.patch"; - url = "https://github.com/build2/build2/commit/7cf9cece1d88cd1be283ab309f9a851bd02b43d0.patch"; - hash = "sha256-PTo1C6Aa1L9fvjiJ08KtGgVqHMw2ZlW5LSKoripL22g="; - }) ]; sourceRoot = "build2-toolchain-${finalAttrs.version}/build2"; @@ -43,13 +37,13 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; checkPhase = '' runHook preCheck - build2/b-boot --version + b/b-boot --version runHook postCheck ''; installPhase = '' runHook preInstall - install -D build2/b-boot $out/bin/b + install -D b/b-boot $out/bin/b runHook postInstall ''; diff --git a/pkgs/by-name/bu/build2/package.nix b/pkgs/by-name/bu/build2/package.nix index 8c0391dc4f75..7e70389f408e 100644 --- a/pkgs/by-name/bu/build2/package.nix +++ b/pkgs/by-name/bu/build2/package.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "build2"; - version = "0.17.0"; + version = "0.18.1"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/build2-${finalAttrs.version}.tar.gz"; - hash = "sha256-Kx5X/GV3GjFSbjo1mzteiHnnm4mr6+NAKIR/mEE+IdA="; + hash = "sha256-BLMBd/1kofVuB2MalPyuj4lXNMi3p5uuzVIJUzQv3A0="; }; patches = [ diff --git a/pkgs/by-name/bu/build2/remove-config-store-paths.patch b/pkgs/by-name/bu/build2/remove-config-store-paths.patch index 6eeed0eb061b..ec29b7af77c0 100644 --- a/pkgs/by-name/bu/build2/remove-config-store-paths.patch +++ b/pkgs/by-name/bu/build2/remove-config-store-paths.patch @@ -1,14 +1,14 @@ --- a/libbuild2/buildfile +++ b/libbuild2/buildfile -@@ -86,8 +86,11 @@ build2_config_lines = [strings] - host_config_lines = [strings] +@@ -109,8 +109,11 @@ host_config_no_warnings_lines = [strings] + build2_config_no_warnings_lines = [strings] - for l: $regex.replace_lines( \ -+ $regex.replace_lines( \ - $config.save(), \ - '^( *(#|(config\.(test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \ -+ [null], return_lines), \ -+ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \ + for l: $regex.replace_lines( \ ++ $regex.replace_lines( \ + $config.save(), \ + '^( *(#|(config\.(build2\.|test[. ]|dist\.|install\.chroot|config\.hermetic))).*|)$', \ ++ [null], return_lines), \ ++ '^.*'$getenv(NIX_STORE)'/[a-z0-9]{32}-.*$', \ [null]) { - build2_config_lines += $l + if ($defined(config.build2.host_c) && $regex.match($l, ' *config\.c[ =].*')) diff --git a/pkgs/by-name/bu/buildah-unwrapped/package.nix b/pkgs/by-name/bu/buildah-unwrapped/package.nix index 079a9ed5233a..9ebd8a0799b1 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.44.0"; + version = "1.44.1"; src = fetchFromGitHub { - owner = "containers"; + owner = "podman-container-tools"; repo = "buildah"; tag = "v${finalAttrs.version}"; - hash = "sha256-/Rv5la54ikmP4qVT19tg0sv0kM+xpQO6w9XU1PpGFk4="; + hash = "sha256-EGoH+PvePNw7I28Vq1kH9W0x4lYuUTSa1Rd+fEE8fkc="; }; outputs = [ @@ -80,7 +80,7 @@ buildGoModule (finalAttrs: { description = "Tool which facilitates building OCI images"; mainProgram = "buildah"; homepage = "https://buildah.io/"; - changelog = "https://github.com/containers/buildah/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/podman-container-tools/buildah/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; teams = [ lib.teams.podman ]; }; diff --git a/pkgs/by-name/bu/buildbox/package.nix b/pkgs/by-name/bu/buildbox/package.nix index 2a45605a0fcf..f54283ede299 100644 --- a/pkgs/by-name/bu/buildbox/package.nix +++ b/pkgs/by-name/bu/buildbox/package.nix @@ -23,13 +23,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "buildbox"; - version = "1.4.8"; + version = "1.4.13"; src = fetchFromGitLab { owner = "BuildGrid"; repo = "buildbox/buildbox"; tag = finalAttrs.version; - hash = "sha256-P7CFgK5CkHAf5gddmm0SBGIkC/AAdCO5pkya/XNuby0="; + hash = "sha256-W/QV65A7zm2vUdvJRrR+bxe8O3Zogzrx86RmqFVCY84="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/bu/buildkit/package.nix b/pkgs/by-name/bu/buildkit/package.nix index d5eaa20bfdf4..65f9ab3f1884 100644 --- a/pkgs/by-name/bu/buildkit/package.nix +++ b/pkgs/by-name/bu/buildkit/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "buildkit"; - version = "0.30.0"; + version = "0.31.2"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${finalAttrs.version}"; - hash = "sha256-7QyfQew0RuL/EpJlKuY5CXdCiFwIS2Z4i1Fd4yUTx7g="; + hash = "sha256-VAEZr2KerCKTeULZWM50n7P7qPjk9X9oTgpuK7+oWfU="; }; vendorHash = null; diff --git a/pkgs/by-name/bu/buildkite-agent/package.nix b/pkgs/by-name/bu/buildkite-agent/package.nix index 18d0887a5638..1ff9748cd993 100644 --- a/pkgs/by-name/bu/buildkite-agent/package.nix +++ b/pkgs/by-name/bu/buildkite-agent/package.nix @@ -14,16 +14,16 @@ }: buildGoModule (finalAttrs: { pname = "buildkite-agent"; - version = "3.127.2"; + version = "3.129.0"; src = fetchFromGitHub { owner = "buildkite"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-dSG/F/KtV4nBpm2EeXjGI/2uM2/CgRkjYq5uq7+vZVw="; + hash = "sha256-k1q/7KRaIv5SE7CYFAzV8JB+czmX/bvwBp8JY9t77tI="; }; - vendorHash = "sha256-N4m7Dak0EBkbJtOjatv0GQKsdxt0B/fZn08T9HpAXDA="; + vendorHash = "sha256-lRh5cAbg2yr+nvIaSRg3tG0tLvl7aDjyIoIjS1BvXNM="; postPatch = '' substituteInPlace clicommand/agent_start.go --replace /bin/bash ${bash}/bin/bash diff --git a/pkgs/by-name/bu/buildpack/package.nix b/pkgs/by-name/bu/buildpack/package.nix index a3ac52c26266..9cc9b7fc1cc1 100644 --- a/pkgs/by-name/bu/buildpack/package.nix +++ b/pkgs/by-name/bu/buildpack/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "pack"; - version = "0.40.3"; + version = "0.40.8"; src = fetchFromGitHub { owner = "buildpacks"; repo = "pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-KKgF05oJDgMQExJtsAc6weor4OxUZl4xNIFY0VoQfs4="; + hash = "sha256-mD32ZQ/PxiWnOvCdDFlNx1NIevhfgPcg9+ToUmfM6jo="; }; - vendorHash = "sha256-sRITmNcCwJw4aXLv/wKYOTZai95YY/DY87F4P2+7b5A="; + vendorHash = "sha256-0cyxhyEt4P+sd0FmN177rsTugWM0x2Ebk1LEHtX9wZE="; nativeBuildInputs = [ installShellFiles ]; @@ -42,6 +42,6 @@ buildGoModule (finalAttrs: { description = "CLI for building apps using Cloud Native Buildpacks"; mainProgram = "pack"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/bu/bulloak/package.nix b/pkgs/by-name/bu/bulloak/package.nix index 39bd57007466..863802b9fa05 100644 --- a/pkgs/by-name/bu/bulloak/package.nix +++ b/pkgs/by-name/bu/bulloak/package.nix @@ -15,10 +15,6 @@ let url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/linux-amd64/list.json"; hash = "sha256-H6D6XbIw5sDZlbc2c51vIMRmOqs2nDIcaNzCaOvnLsw="; }; - x86_64-darwin = fetchurl { - url = "https://raw.githubusercontent.com/ethereum/solc-bin/bdd7dd3fda6e4a00c0697d891a1a7ae9f2b3a5fd/macosx-amd64/list.json"; - hash = "sha256-A3A6gtNb129tD5KC0tCXvlzQ11t5SrNrX8tQeq73+mY="; - }; aarch64-linux = fetchurl { url = "https://raw.githubusercontent.com/nikitastupin/solc/99b5867237b37952d372e0dab400d6788feda315/linux/aarch64/list.json"; hash = "sha256-u6WRAcnR9mN9ERfFdLOxxSc9ASQIQvmS8uG+Z4H6OAU="; diff --git a/pkgs/by-name/bu/bumblebee-status/plugins.nix b/pkgs/by-name/bu/bumblebee-status/plugins.nix index 58ca8ddb2899..62af4f8cd933 100644 --- a/pkgs/by-name/bu/bumblebee-status/plugins.nix +++ b/pkgs/by-name/bu/bumblebee-status/plugins.nix @@ -118,7 +118,7 @@ in }; # NOTE: Yes, there is also a plugin named `layout-xkbswitch` with a dash. layout_xkbswitch.propagatedBuildInputs = [ pkgs.xkb-switch ]; - libvirtvms.propagatedBuildInputs = [ py.libvirt ]; + libvirtvms.propagatedBuildInputs = [ py.libvirt-python ]; load.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; memory.propagatedBuildInputs = [ pkgs.gnome-system-monitor ]; messagereceiver = { }; diff --git a/pkgs/by-name/bu/bumpver/package.nix b/pkgs/by-name/bu/bumpver/package.nix index 2c503ecce5a0..045173383159 100644 --- a/pkgs/by-name/bu/bumpver/package.nix +++ b/pkgs/by-name/bu/bumpver/package.nix @@ -8,12 +8,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "bumpver"; - version = "2021.1110"; + version = "2026.1132"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - sha256 = "b6a0ddb78db7e00ae7ffe895bf8ef97f91e6310dfc1c4721896bdfd044b1cb03"; + sha256 = "sha256-gLIjwj/Km8ndVpt6RGgJSdNL7iOnOIYNmps28avjsOA="; }; prePatch = '' @@ -21,6 +21,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { --replace-fail "if any(arg.startswith(\"bdist\") for arg in sys.argv):" ""\ --replace-fail "import lib3to6" ""\ --replace-fail "package_dir = lib3to6.fix(package_dir)" "" + + patchShebangs test/fixtures/hooks ''; build-system = with python3.pkgs; [ @@ -28,12 +30,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; dependencies = with python3.pkgs; [ - pathlib2 click toml lexid colorama - setuptools ]; nativeCheckInputs = [ @@ -42,11 +42,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mercurial ]; - disabledTests = [ - # fails due to more aggressive setuptools version specifier validation - "test_parse_default_pattern" - ]; - meta = { description = "Bump version numbers in project files"; homepage = "https://pypi.org/project/bumpver/"; diff --git a/pkgs/by-name/bu/bun/package.nix b/pkgs/by-name/bu/bun/package.nix index 928ec621b10e..2ead9ba2e839 100644 --- a/pkgs/by-name/bu/bun/package.nix +++ b/pkgs/by-name/bu/bun/package.nix @@ -27,7 +27,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { sourceRoot = { aarch64-darwin = "bun-darwin-aarch64"; - x86_64-darwin = "bun-darwin-x64-baseline"; } .${stdenvNoCC.hostPlatform.system} or null; @@ -59,23 +58,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/bin/bun '' - # We currently cannot generate completions for x86_64-darwin because bun requires avx support to run, which is: - # 1. Not currently supported by the version of Rosetta on our aarch64 builders - # 2. Is not correctly detected even on macOS 15+, where it is available through Rosetta - # - # The baseline builds are no longer an option because they too now require avx support. - + - lib.optionalString - ( - stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform - && !(stdenvNoCC.hostPlatform.isDarwin && stdenvNoCC.hostPlatform.isx86_64) - ) - '' - installShellCompletion --cmd bun \ - --bash <(SHELL="bash" $out/bin/bun completions) \ - --zsh <(SHELL="zsh" $out/bin/bun completions) \ - --fish <(SHELL="fish" $out/bin/bun completions) - ''; + + lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd bun \ + --bash <(SHELL="bash" $out/bin/bun completions) \ + --zsh <(SHELL="zsh" $out/bin/bun completions) \ + --fish <(SHELL="fish" $out/bin/bun completions) + ''; passthru = { sources = { @@ -87,10 +75,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-aarch64.zip"; hash = "sha256-cLrkGzkIsKEg4eWMXIrzDnSvrjuNEbDT/djnh937SyI="; }; - "x86_64-darwin" = fetchurl { - url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-darwin-x64-baseline.zip"; - hash = "sha256-qYumpIDyL9qbNDYmuQak4mqlNhi/hdK8WSjs8rpF8O0="; - }; "x86_64-linux" = fetchurl { url = "https://github.com/oven-sh/bun/releases/download/bun-v${finalAttrs.version}/bun-linux-x64.zip"; hash = "sha256-ecB3H6i5LDOq5B4VoODTB+qZ0OLwAxfHHGxTI3p44lo="; @@ -139,8 +123,5 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Broken for Musl at 2024-01-13, tracking issue: # https://github.com/NixOS/nixpkgs/issues/280716 broken = stdenvNoCC.hostPlatform.isMusl; - - # Hangs when run via Rosetta 2 on Apple Silicon - hydraPlatforms = lib.lists.remove "x86_64-darwin" lib.platforms.all; }; }) diff --git a/pkgs/by-name/bu/bunbun/package.nix b/pkgs/by-name/bu/bunbun/package.nix index b5f8b95d8c20..0f99bb71389f 100644 --- a/pkgs/by-name/bu/bunbun/package.nix +++ b/pkgs/by-name/bu/bunbun/package.nix @@ -8,16 +8,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "bunbun"; - version = "1.5.0"; + version = "1.6.1"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "devraza"; repo = "bunbun"; - tag = "v${finalAttrs.version}"; - hash = "sha256-3f/G0Vx1uXeH3QMDVUAHWi4Pf/B88/4F+4XywVsp3/4="; + # There is no 1.6.1 tag on github. This corresponds to the commit of the release. + rev = "595857b1cd03b907e97c7eb0effc29fe973821bf"; + hash = "sha256-TaAlEST6WLPTlYADzAA4i46dr4Bo+fButu65g43EvWo"; }; - cargoHash = "sha256-2pgQB2myEnLvrU3ApNL/bwaVcGku+X/TjR6YBqXD7Xg="; + cargoHash = "sha256-tL70RQ8YOSHyyTnPjg7IiuCEhb4EF4xIkT8HMMXhc9g"; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/bu/bundletool/package.nix b/pkgs/by-name/bu/bundletool/package.nix index befdb021fcb1..e9762efa20d8 100644 --- a/pkgs/by-name/bu/bundletool/package.nix +++ b/pkgs/by-name/bu/bundletool/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://developer.android.com/studio/command-line/bundletool"; changelog = "https://github.com/google/bundletool/releases/tag/${finalAttrs.version}"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; platforms = jre_headless.meta.platforms; license = lib.licenses.asl20; }; diff --git a/pkgs/by-name/bu/burn-central-cli/package.nix b/pkgs/by-name/bu/burn-central-cli/package.nix index 793b429274dc..03cf302a4dfa 100644 --- a/pkgs/by-name/bu/burn-central-cli/package.nix +++ b/pkgs/by-name/bu/burn-central-cli/package.nix @@ -10,13 +10,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "burn-central-cli"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "tracel-ai"; - repo = "burn-central-cli"; + repo = "tracel-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wXLfmCV6aElnYnhOCScr/3+4I6oOfNPrZ8+0t4TPDOA="; + hash = "sha256-1QXlN1cq5MKZAPgGx5mnf8Jy7o4CnKJDKi0sSith6n0="; }; strictDeps = true; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildAndTestSubdir = "crates/burn-central-cli"; - cargoHash = "sha256-MeDIYFXkyJdxierq9iVIAvEIc8JU13szrbSTfKyUkJk="; + cargoHash = "sha256-c0DfH5wtm/aiK8Mcf7xqVqnFzByMKkbspF1reeGZNJw="; nativeBuildInputs = [ pkg-config @@ -45,8 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: { with Burn Central, the centralized platform for experiment tracking, model sharing, and deployment for Burn users. ''; - homepage = "https://github.com/tracel-ai/burn-central-cli"; - changelog = "https://github.com/tracel-ai/burn-central-cli/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/tracel-ai/tracel-cli"; + changelog = "https://github.com/tracel-ai/tracel-cli/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ mit asl20 diff --git a/pkgs/by-name/bu/burp/package.nix b/pkgs/by-name/bu/burp/package.nix index 330974ba70b9..ac3d6f974dd4 100644 --- a/pkgs/by-name/bu/burp/package.nix +++ b/pkgs/by-name/bu/burp/package.nix @@ -2,65 +2,52 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, autoreconfHook, pkg-config, acl, librsync, ncurses, - openssl_legacy, + openssl, zlib, uthash, }: stdenv.mkDerivation (finalAttrs: { pname = "burp"; - version = "2.4.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "grke"; repo = "burp"; tag = finalAttrs.version; - hash = "sha256-y6kRd1jD6t+Q6d5t7W9MDuk+m2Iq1THQkP50PJwI7Nc="; + hash = "sha256-jZSrHq3dL9Za71E2k4UDTHe10ESAgkBy5bogY2AqtnM="; }; - patches = [ - # Pull upstream fix for ncurses-6.3 support - (fetchpatch { - name = "ncurses-6.3.patch"; - url = "https://github.com/grke/burp/commit/1d6c931af7c11f164cf7ad3479781e8f03413496.patch"; - hash = "sha256-dJn9YhFQWggoqD3hce7F1d5qHYogbPP6+NMqCpVbTpM="; - }) - # Pull upstream fix for backup resuming - (fetchpatch { - name = "fix-resume.patch"; - url = "https://github.com/grke/burp/commit/b5ed667f73805b5af9842bb0351f5af95d4d50b3.patch"; - hash = "sha256-MT9D2thLgV4nT3LsIDHZp8sWQF2GlOENj0nkOQXZKuk="; - }) - ]; - nativeBuildInputs = [ autoreconfHook pkg-config ]; - # use openssl_legacy due to burp-2.4.0 not supporting file encryption with openssl 3.0 - # replace with 'openssl' once burp-3.x has been declared stable and this package upgraded + buildInputs = [ librsync ncurses - openssl_legacy + openssl zlib uthash ] ++ lib.optional (!stdenv.hostPlatform.isDarwin) acl; - configureFlags = [ "--localstatedir=/var" ]; + configureFlags = [ + "--sysconfdir=/etc/burp" + "--localstatedir=/var" + ]; installFlags = [ "localstatedir=/tmp" ]; meta = { - description = "BackUp and Restore Program"; + description = "Backup and restore Program"; homepage = "https://burp.grke.org"; + changelog = "https://github.com/grke/burp/blob/${finalAttrs.version}/CHANGELOG"; license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ arjan-s ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/bu/burpsuite/package.nix b/pkgs/by-name/bu/burpsuite/package.nix index 84beffd4400f..3a25ac5aff20 100644 --- a/pkgs/by-name/bu/burpsuite/package.nix +++ b/pkgs/by-name/bu/burpsuite/package.nix @@ -15,7 +15,7 @@ assert lib.assertMsg ( let pname = "burpsuite"; - version = "2026.4.3"; + version = "2026.7"; src = fetchurl { name = "burpsuite.jar"; @@ -24,7 +24,7 @@ let "https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?product=desktop&version=${version}&type=Jar" ]; - hash = "sha256-mewbN1uZAFCsxAiXsrNKJ/AexCccVcza40DjxMDbrlM="; + hash = "sha256-vZcCNFVEHg1zkhAjSqc6vVzFaU0YdZ27AF+eHLfLazs="; }; description = "Integrated platform for performing security testing of web applications"; diff --git a/pkgs/by-name/bu/butane/package.nix b/pkgs/by-name/bu/butane/package.nix index 82608d31e5d5..7897a9b2d95d 100644 --- a/pkgs/by-name/bu/butane/package.nix +++ b/pkgs/by-name/bu/butane/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "butane"; - version = "0.28.0"; + version = "0.29.0"; src = fetchFromGitHub { owner = "coreos"; repo = "butane"; rev = "v${finalAttrs.version}"; - hash = "sha256-Cej00ugyOtjPys0E67z0oapwABdQxRuN4lOGu1qrtf8="; + hash = "sha256-lijMfxhUBopwbfEP4fEgszXh7zaRz7Xy1Y8PmatXXTE="; }; vendorHash = null; diff --git a/pkgs/by-name/bw/bws/package.nix b/pkgs/by-name/bw/bws/package.nix index 51a2efbf458c..2af6f2f6a3bb 100644 --- a/pkgs/by-name/bw/bws/package.nix +++ b/pkgs/by-name/bw/bws/package.nix @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "bitwarden"; - repo = "sdk"; + repo = "sdk-sm"; tag = "bws-v${finalAttrs.version}"; hash = "sha256-cdiTdgNvUDN0/KzMDEiHo+GIYkUaWEZTAnWahBrMZ4I="; }; diff --git a/pkgs/by-name/by/byacc/package.nix b/pkgs/by-name/by/byacc/package.nix index 8da6559f602b..12b19dd74a14 100644 --- a/pkgs/by-name/by/byacc/package.nix +++ b/pkgs/by-name/by/byacc/package.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "byacc"; - version = "20241231"; + version = "20260126"; src = fetchurl { urls = [ "https://invisible-mirror.net/archives/byacc/byacc-${finalAttrs.version}.tgz" "https://invisible-island.net/archives/byacc/byacc-${finalAttrs.version}.tgz" ]; - hash = "sha256-GSwvrgSNTn9RS6RRYn+cTmEnZQmfgZwZGR+f3j5glnM="; + hash = "sha256-thjF+0TC9fBIhD25D30bJPePR7B5E8jHuoyULT6ySwA="; }; configureFlags = [ diff --git a/pkgs/by-name/by/byedpi/package.nix b/pkgs/by-name/by/byedpi/package.nix index 83c7ac8538a4..5237da5b7995 100644 --- a/pkgs/by-name/by/byedpi/package.nix +++ b/pkgs/by-name/by/byedpi/package.nix @@ -30,8 +30,11 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/hufrea/byedpi"; changelog = "https://github.com/hufrea/byedpi/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ averyanalex ]; - platforms = with lib.platforms; linux ++ windows; + maintainers = with lib.maintainers; [ + averyanalex + hadal84 + ]; + platforms = with lib.platforms; linux ++ windows ++ darwin; mainProgram = "ciadpi"; }; }) diff --git a/pkgs/by-name/by/byobu/package.nix b/pkgs/by-name/by/byobu/package.nix index 95db27a77ca8..926b82cd66cc 100644 --- a/pkgs/by-name/by/byobu/package.nix +++ b/pkgs/by-name/by/byobu/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "byobu"; - version = "6.13"; + version = "6.15"; src = fetchFromGitHub { owner = "dustinkirkland"; repo = "byobu"; - rev = finalAttrs.version; - hash = "sha256-h+3BEMfBRozmpqFNRyfKzjKgevaYm8v7DsJMwkhiCQ4="; + tag = finalAttrs.version; + hash = "sha256-QovoXH8cm8CZMSYGjI7FgynHtJjahpe9R2s62F7aZvo="; }; nativeBuildInputs = [ @@ -103,9 +103,9 @@ stdenv.mkDerivation (finalAttrs: { Tmux terminal multiplexer, and works on most Linux, BSD, and Mac distributions. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "byobu"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ cbrxyz ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/by/bytecode-viewer/package.nix b/pkgs/by-name/by/bytecode-viewer/package.nix index dfcbb86ecf0b..2fc9eef6c4d4 100644 --- a/pkgs/by-name/by/bytecode-viewer/package.nix +++ b/pkgs/by-name/by/bytecode-viewer/package.nix @@ -79,6 +79,6 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; }; } diff --git a/pkgs/by-name/c-/c-ares/package.nix b/pkgs/by-name/c-/c-ares/package.nix index 4e7a3b2e97ba..d26bcba991fd 100644 --- a/pkgs/by-name/c-/c-ares/package.nix +++ b/pkgs/by-name/c-/c-ares/package.nix @@ -18,12 +18,15 @@ stdenv.mkDerivation rec { pname = "c-ares"; - version = "1.34.6"; + version = "1.34.8"; + + strictDeps = true; + __structuredAttrs = true; src = fetchurl { # Note: tag name varies in some versions, e.g. v1.30.0, c-ares-1_17_0. url = "https://github.com/c-ares/c-ares/releases/download/v${version}/c-ares-${version}.tar.gz"; - hash = "sha256-kS3XzDs+innFL9f7nA9Ozwqqc+Re/aiAJmotbia4TvU="; + hash = "sha256-wiK21oEJb5RE0sSGPSwRdAGeJ8rMoKSlwRTTbdfXv3g="; }; outputs = [ diff --git a/pkgs/by-name/c2/c2fmzq/package.nix b/pkgs/by-name/c2/c2fmzq/package.nix index f281bf221466..da8bb319ff6e 100644 --- a/pkgs/by-name/c2/c2fmzq/package.nix +++ b/pkgs/by-name/c2/c2fmzq/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "c2FmZQ"; - version = "0.5.6"; + version = "0.5.7"; src = fetchFromGitHub { owner = "c2FmZQ"; - repo = "c2FmZQ"; + repo = "photos"; rev = "v${finalAttrs.version}"; - hash = "sha256-qIJnrMqsaa7GcsJpyWHhi6nea72XCQy5BaGWBtQKzFo="; + hash = "sha256-7Jguv2T6x3zKRWcp7XGzmVakwXcsVz2BWcY6uADGPsg="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { sourceRoot = "${finalAttrs.src.name}/c2FmZQ"; - vendorHash = "sha256-hJHnbG/NlhibY8e59hk0u5vi50x4s4mH/awPdCRkDFk="; + vendorHash = "sha256-6rKFgCKhJQSquMhv7iuzMsm+84qz3V0ynIyB4rv2Kk8="; subPackages = [ "c2FmZQ-client" @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { meta = { description = "Securely encrypt, store, and share files, including but not limited to pictures and videos"; - homepage = "https://github.com/c2FmZQ/c2FmZQ"; + homepage = "https://github.com/c2FmZQ/photos"; license = lib.licenses.gpl3Only; mainProgram = "c2FmZQ-server"; maintainers = with lib.maintainers; [ hmenke ]; diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index c6c188658b82..5bf0118ce675 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.62"; + version = "0.26.72"; src = fetchFromGitHub { owner = "contentauth"; repo = "c2pa-rs"; tag = "c2patool-v${finalAttrs.version}"; - hash = "sha256-OcZQ8z/hQh5oqXf6JTZ7qN4OSQAyewaBKHwID38aWmc="; + hash = "sha256-miK2AphIhpnbIsWa8eWrEPrdngEn6VVeq7k2m9zOGzk="; }; - cargoHash = "sha256-x5QH1iysCdez5V4OQE2xqVXFBpxDygqCrs3MiXNTfTw="; + cargoHash = "sha256-/bJjrfvWNowFsf2d7vWAi7+3I/0TFMnQw7DKMyYOnNY="; # 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 ee4d24d771d9..761b7d9bd695 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.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "c3lang"; repo = "c3c"; tag = "v${finalAttrs.version}"; - hash = "sha256-HPPeedpbEgG6Zx6a+eV8CBO3rxMXMstLa4kx2NkNYnM="; + hash = "sha256-6XUMlF9SRQ9aqVRl5BQdELVsj/DyXhCnH85QrbK8Xxo="; }; cmakeBuildType = if debug then "Debug" else "Release"; @@ -59,7 +59,6 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { doCheck = lib.elem llvmPackages.stdenv.system [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ] && checks; diff --git a/pkgs/by-name/ca/cabextract/package.nix b/pkgs/by-name/ca/cabextract/package.nix index 0ac72b30e80a..ac680716f591 100644 --- a/pkgs/by-name/ca/cabextract/package.nix +++ b/pkgs/by-name/ca/cabextract/package.nix @@ -13,6 +13,11 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-tVRtsRVeTHGP89SyeFc2BPMN1kw8W/1GV80Im4I6OsY="; }; + # Remove vendored getopt.h in favor of stdenv's to fix non-gnu builds. + postPatch = '' + rm getopt.h + ''; + # Let's assume that fnmatch works for cross-compilation, otherwise it gives an error: # undefined reference to `rpl_fnmatch'. configureFlags = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ diff --git a/pkgs/by-name/ca/cacert/package.nix b/pkgs/by-name/ca/cacert/package.nix index 8dd727f6ded3..df6b082a92bc 100644 --- a/pkgs/by-name/ca/cacert/package.nix +++ b/pkgs/by-name/ca/cacert/package.nix @@ -20,7 +20,7 @@ let lib.concatStringsSep "\n\n" extraCertificateStrings ); - version = "3.123"; + version = "3.125"; meta = { homepage = "https://firefox-source-docs.mozilla.org/security/nss/runbooks/rootstore.html#root-store-consumers"; description = "Bundle of X.509 certificates of public Certificate Authorities (CA)"; @@ -52,7 +52,7 @@ stdenv.mkDerivation { "https://hg-edge.mozilla.org/projects/nss/raw-file/${tag}/${file}" "https://raw.githubusercontent.com/nss-dev/nss/refs/tags/${tag}/${file}" ]; - hash = "sha256-dxMO+RITdyhEVh+9OqMdQTslwqx/V2/qO8O7/375NIk="; + hash = "sha256-5XkSgI2u97Kw+k3yzPF+R66vJsg5o4+Fx2AD66/YZr0="; }; unpackPhase = '' diff --git a/pkgs/by-name/ca/caddy/package.nix b/pkgs/by-name/ca/caddy/package.nix index 029ace9f9d28..0f544a4b22e9 100644 --- a/pkgs/by-name/ca/caddy/package.nix +++ b/pkgs/by-name/ca/caddy/package.nix @@ -3,6 +3,7 @@ buildGoModule, callPackage, fetchFromGitHub, + testers, nixosTests, caddy, installShellFiles, @@ -10,23 +11,18 @@ writableTmpDirAsHomeHook, versionCheckHook, }: -let - version = "2.11.4"; - dist = fetchFromGitHub { - owner = "caddyserver"; - repo = "dist"; - tag = "v${version}"; - hash = "sha256-oRQfQH1GKjAjVMj+dZo1f1+HOaOdJIyEfod0iGLYcc8="; - }; -in + buildGoModule (finalAttrs: { pname = "caddy"; - inherit version; + version = "2.11.4"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "caddyserver"; repo = "caddy"; tag = "v${finalAttrs.version}"; + # remember to update hashes for `dist` and `plugins` test! hash = "sha256-wzk8KRZfDCbbjRlBwkoKAoMjOhV4xF3yuXUueqtl1xM="; }; @@ -52,7 +48,7 @@ buildGoModule (finalAttrs: { __darwinAllowLocalNetworking = true; postInstall = '' - install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system + install -Dm644 ${finalAttrs.passthru.dist}/init/caddy.service ${finalAttrs.passthru.dist}/init/caddy-api.service -t $out/lib/systemd/system substituteInPlace $out/lib/systemd/system/caddy.service \ --replace-fail "/usr/bin/caddy" "$out/bin/caddy" @@ -72,20 +68,29 @@ buildGoModule (finalAttrs: { --zsh <($out/bin/caddy completion zsh) ''; - passthru = { - tests = { - inherit (nixosTests) caddy; - acme-integration = nixosTests.acme.caddy; - }; - withPlugins = callPackage ./plugins.nix { inherit caddy; }; - }; - + doInstallCheck = true; nativeInstallCheckInputs = [ writableTmpDirAsHomeHook versionCheckHook ]; versionCheckKeepEnvironment = [ "HOME" ]; - doInstallCheck = true; + + passthru = { + withPlugins = callPackage ./plugins.nix { inherit caddy; }; + + dist = fetchFromGitHub { + owner = "caddyserver"; + repo = "dist"; + tag = "v${finalAttrs.version}"; + hash = "sha256-oRQfQH1GKjAjVMj+dZo1f1+HOaOdJIyEfod0iGLYcc8="; + }; + + tests = { + inherit (nixosTests) caddy; + plugins = testers.runNixOSTest ./plugins.test.nix; + acme-integration = nixosTests.acme.caddy; + }; + }; meta = { homepage = "https://caddyserver.com"; diff --git a/pkgs/by-name/ca/caddy/plugins.test.nix b/pkgs/by-name/ca/caddy/plugins.test.nix new file mode 100644 index 000000000000..7c223c860436 --- /dev/null +++ b/pkgs/by-name/ca/caddy/plugins.test.nix @@ -0,0 +1,36 @@ +{ lib, ... }: + +{ + name = "caddy-plugins"; + meta.maintainers = with lib.maintainers; [ + stepbrobd + ]; + + nodes.machine = + { pkgs, ... }: + { + services.caddy = { + enable = true; + + package = pkgs.caddy.withPlugins { + plugins = [ "github.com/caddyserver/replace-response@v0.0.0-20250618171559-80962887e4c6" ]; + hash = "sha256-oj0IpspxslpNZbJFsexh0W2Sja19XRUsbShoCuY6qkQ="; + }; + + globalConfig = '' + order replace after encode + ''; + + virtualHosts."localhost:80".extraConfig = '' + respond "hello world" + replace world nixos + ''; + }; + }; + + testScript = '' + machine.wait_for_unit("caddy") + machine.wait_for_open_port(80) + machine.succeed("curl http://localhost | grep nixos") + ''; +} diff --git a/pkgs/by-name/ca/caddyfile-language-server/package.nix b/pkgs/by-name/ca/caddyfile-language-server/package.nix deleted file mode 100644 index de354fbb2d1e..000000000000 --- a/pkgs/by-name/ca/caddyfile-language-server/package.nix +++ /dev/null @@ -1,73 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchPnpmDeps, - pnpm_8, - nodejs, - pnpmConfigHook, - makeBinaryWrapper, -}: -stdenv.mkDerivation (finalAttrs: { - pname = "caddyfile-language-server"; - version = "0.4.0"; - - src = fetchFromGitHub { - owner = "caddyserver"; - repo = "vscode-caddyfile"; - tag = "v${finalAttrs.version}"; - hash = "sha256-IusP9Z3e8mQ0mEhI1o1zIqPDB/i0pqlMfnt6M8bzb2w="; - }; - - pnpmWorkspaces = [ "@caddyserver/caddyfile-language-server" ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) - pname - version - src - pnpmWorkspaces - ; - pnpm = pnpm_8; - fetcherVersion = 3; - hash = "sha256-D9kYFkmFlvg4r6vR9PHHAwF0qglHsTuRae0Z7CzDq1M="; - }; - - nativeBuildInputs = [ - pnpm_8 - pnpmConfigHook - nodejs - makeBinaryWrapper - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter=@caddyserver/caddyfile-language-server run build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - rm -rf node_modules packages/server/node_modules - pnpm install --production --offline --force --filter=@caddyserver/caddyfile-language-server - mkdir -p $out/lib/node_modules/caddyfile-language-server/ - mv packages/server/dist/* $out/lib/node_modules/caddyfile-language-server/ - - makeWrapper ${lib.getExe nodejs} $out/bin/caddyfile-language-server \ - --add-flags "$out/lib/node_modules/caddyfile-language-server/index.js" - - runHook postInstall - ''; - - meta = { - changelog = "https://github.com/caddyserver/vscode-caddyfile/releases/tag/v${finalAttrs.version}"; - description = "Basic language server for caddyfile"; - homepage = "https://github.com/caddyserver/vscode-caddyfile"; - mainProgram = "caddyfile-language-server"; - maintainers = with lib.maintainers; [ pyrox0 ]; - platforms = lib.platforms.all; - }; -}) diff --git a/pkgs/by-name/ca/caerbannog/package.nix b/pkgs/by-name/ca/caerbannog/package.nix index 0ddb78a0006c..48b662b2fba8 100644 --- a/pkgs/by-name/ca/caerbannog/package.nix +++ b/pkgs/by-name/ca/caerbannog/package.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { propagatedBuildInputs = with python3.pkgs; [ anytree fuzzyfinder - gpgme + gpg pygobject3 ]; diff --git a/pkgs/by-name/ca/caesura/package.nix b/pkgs/by-name/ca/caesura/package.nix index d78a643d4778..ff1ef9060abe 100644 --- a/pkgs/by-name/ca/caesura/package.nix +++ b/pkgs/by-name/ca/caesura/package.nix @@ -1,7 +1,10 @@ { lib, fetchFromGitHub, + fetchpatch2, rustPlatform, + cacert, + writableTmpDirAsHomeHook, flac, lame, makeBinaryWrapper, @@ -16,24 +19,37 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "caesura"; - version = "0.27.2"; + version = "0.31.0"; src = fetchFromGitHub { owner = "RogueOneEcho"; repo = "caesura"; tag = "v${finalAttrs.version}"; - hash = "sha256-ifaZ+rmMmWhn8HM25sRPXJKuXvWE5VG+5hFMi9hqxA0="; + hash = "sha256-+REt+MKImO7fnYWJ32P6mKzulGJTnxc+9ednVF5aCJU="; }; - cargoHash = "sha256-g8Duhl5nZ6umIrAafW7s4vtDS+f06CWnFLoLSw0wa4o="; + patches = [ + (fetchpatch2 { + name = "normalize-sox-dependent-full-spectrogram-widths.patch"; + url = "https://github.com/RogueOneEcho/caesura/commit/3af818ae35a3e18f444c889d9d3b88294f4f110f.patch?full_index=1"; + hash = "sha256-znAbk6hFVj198BUUwwDo76SWei0cKINeXzlYEFvTwHA="; + }) + ]; + + cargoHash = "sha256-0+vZma8AC44XqVHzmJT/roV7sy8w6DYhujRK9N91J5c="; nativeBuildInputs = [ makeBinaryWrapper ]; - nativeCheckInputs = runtimeDeps; + nativeCheckInputs = [ + cacert + writableTmpDirAsHomeHook + ] + ++ runtimeDeps; env = { CAESURA_NIX = "1"; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; }; postPatch = '' diff --git a/pkgs/by-name/ca/caffeine-ng/fix-build.patch b/pkgs/by-name/ca/caffeine-ng/fix-build.patch index cf075451138f..5600731771d7 100644 --- a/pkgs/by-name/ca/caffeine-ng/fix-build.patch +++ b/pkgs/by-name/ca/caffeine-ng/fix-build.patch @@ -13,12 +13,3 @@ index 3e4f9ea..5b82861 100644 ) dependency('pygobject-3.0') -@@ -82,7 +78,7 @@ configure_file( - - install_data( - 'share/applications/caffeine.desktop', -- install_dir: '/etc/xdg/autostart', -+ install_dir: join_paths(get_option('sysconfdir'), 'xdg/autostart'), - ) - - install_data( diff --git a/pkgs/by-name/ca/caffeine-ng/package.nix b/pkgs/by-name/ca/caffeine-ng/package.nix index 25db55074f19..481aa8870161 100644 --- a/pkgs/by-name/ca/caffeine-ng/package.nix +++ b/pkgs/by-name/ca/caffeine-ng/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "caffeine-ng"; - version = "4.2.0"; + version = "4.3.2"; pyproject = false; src = fetchFromCodeberg { owner = "WhyNotHugo"; repo = "caffeine-ng"; rev = "v${finalAttrs.version}"; - hash = "sha256-uYzLRZ+6ZgIwhSuJWRBpLYHgonX7sFXgUZid0V26V0Q="; + hash = "sha256-eJ/0lzE5X1WFhgTAgI/SOmtxPbK7ppTk90RWobPZk2o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/caffeine/package.nix b/pkgs/by-name/ca/caffeine/package.nix index 881d85276502..195baaae0a5c 100644 --- a/pkgs/by-name/ca/caffeine/package.nix +++ b/pkgs/by-name/ca/caffeine/package.nix @@ -57,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ emilytrau ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ca/cage/package.nix b/pkgs/by-name/ca/cage/package.nix index d787ee6dbb18..f7cd7cd98cd8 100644 --- a/pkgs/by-name/ca/cage/package.nix +++ b/pkgs/by-name/ca/cage/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cage"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "cage-kiosk"; repo = "cage"; tag = "v${finalAttrs.version}"; - hash = "sha256-NLoz11bfeZwesmwLmyytuB6/vSwIsnDWKzyAXFe+YZ0="; + hash = "sha256-FHIOicRBL881Kvvui4HTKy0g7K9HcQ0ineLECh6MqFI="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/ca/cagent/package.nix b/pkgs/by-name/ca/cagent/package.nix index 2dc3bc531adf..9d78f5b954e0 100644 --- a/pkgs/by-name/ca/cagent/package.nix +++ b/pkgs/by-name/ca/cagent/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "docker"; - repo = "cagent"; + repo = "docker-agent"; tag = "v${finalAttrs.version}"; hash = "sha256-jcJxzdtU0Zzov7EKvJCxgbrfwMcI4k7OgHVrb5S4fs8="; }; @@ -44,9 +44,9 @@ buildGoModule (finalAttrs: { orchestrates AI agents with specialized capabilities and tools, and the interactions between agents. ''; - homepage = "https://github.com/docker/cagent"; - changelog = "https://github.com/docker/cagent/releases/tag/v${finalAttrs.version}"; - downloadPage = "https://github.com/docker/cagent/releases"; + homepage = "https://github.com/docker/docker-agent"; + changelog = "https://github.com/docker/docker-agent/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://github.com/docker/docker-agent/releases"; license = lib.licenses.asl20; mainProgram = "cagent"; maintainers = with lib.maintainers; [ MH0386 ]; diff --git a/pkgs/by-name/ca/cai/package.nix b/pkgs/by-name/ca/cai/package.nix new file mode 100644 index 000000000000..2bc457a2ccfd --- /dev/null +++ b/pkgs/by-name/ca/cai/package.nix @@ -0,0 +1,131 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, + writableTmpDirAsHomeHook, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "cai"; + version = "1.1.5-unstable-2026-06-05"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "aliasrobotics"; + repo = "cai"; + rev = "1c79507140845d0c57455e3b623e489680fd80e8"; + hash = "sha256-LcU9GoUulpeAaaBZr2Mg/C+UmjZ74UL+SGqdB0P9JtA="; + }; + + pythonRemoveDeps = [ + "cryptography" + "dotenv" + "openinference-instrumentation-openai" + "pypdf2" + ]; + + pythonRelaxDeps = [ "openai" ]; + + build-system = with python3Packages; [ hatchling ]; + + dependencies = with python3Packages; [ + cryptography + curl-cffi + dnspython + docker + fastapi + flask + folium + graphviz + griffe + litellm + mako + matplotlib + mcp + mkdocs + mkdocs-material + nest-asyncio + networkx + numpy + numpy + openai + openinference-instrumentation-openai + pandas + paramiko + prompt-toolkit + pydantic + pypdf + python-dotenv + questionary + requests + rich + textual + trafilatura + types-requests + typing-extensions + wasabi + websockets + ]; + + nativeInstallCheckInputs = with python3Packages; [ + inline-snapshot + litellm + pytest-asyncio + pytestCheckHook + writableTmpDirAsHomeHook + ]; + + pythonImportsCheck = [ "cai" ]; + + disabledTestPaths = [ + # Exclude examples + "examples/" + # API key is required + "tests/agents/test_agent_inference.py" + "tests/agents/test_agent_one_tool.py" + "tests/agents/test_blue_teamer_gctr.py" + "tests/api/test_api.py" + "tests/cli/test_cli_headless_cancellation.py" + "tests/commands/" + "tests/integration/" + "tests/refusals/" + "tests/test_unified_pattern.py" + "tools/tpm_test.py" + # openai 2.x API changes + "tests/cli/test_cli_streaming.py" + "tests/core/test_openai_chatcompletions.py" + "tests/core/test_openai_chatcompletions_stream.py" + "tests/mcp/test_runner_calls_mcp.py" + "tests/tracing/test_agent_tracing.py" + "tests/tracing/test_responses_tracing.py" + "tests/tracing/test_tracing.py" + "tests/tracing/test_tracing_errors.py" + "tests/tracing/test_tracing_errors_streamed.py" + "tests/voice/test_workflow.py" + # Missing symbols (version mismatch) + "tests/core/test_auto_compact.py" + "tests/core/test_context_optimization.py" + # Probing the live interpreter outside sandbox + "tests/continuous_ops/test_wizard_worker_python_bin.py" + # Tests requires live CTF infrastructure + "tests/ctfs/test_ctf.py" + # Other error + "tests/test_cli_print_deduplication.py" + "tests/tools/test_output_tool.py" + "tests/util/test_wait_hints_compact.py" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Framework for AI Security"; + homepage = "https://github.com/aliasrobotics/cai"; + changelog = "https://github.com/aliasrobotics/cai/releases/tag/${finalAttrs.src.rev}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "cai"; + }; +}) diff --git a/pkgs/by-name/ca/caido-cli/package.nix b/pkgs/by-name/ca/caido-cli/package.nix index f566af5e5cd4..bf9c1a9fb4ae 100644 --- a/pkgs/by-name/ca/caido-cli/package.nix +++ b/pkgs/by-name/ca/caido-cli/package.nix @@ -9,25 +9,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "caido-cli"; - version = "0.56.2"; + version = "0.57.0"; src = fetchurl ( { x86_64-linux = { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-x86_64.tar.gz"; - hash = "sha256-SUkysiFdH4ilA6MKYMiSqC80NkYZ9YVO/7CT0hQY++Q="; + hash = "sha256-ujpGYERNceUPartkgx4o38xUfPwWvnmiEnjkvmEbybA="; }; aarch64-linux = { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-linux-aarch64.tar.gz"; - hash = "sha256-rYRzo3iYjWAvRGm1+wBLGkr3eUoAGbi71+AX0qmoIXs="; - }; - x86_64-darwin = { - url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-x86_64.zip"; - hash = "sha256-mMWivNwgAmMYitERwnP/lAzgzua/2UDDDffSbgZXlr4="; + hash = "sha256-d1xzF0N6emShCQpotFiQEj1wV3hdt1DK7R+6Smlxrmg="; }; aarch64-darwin = { url = "https://caido.download/releases/v${finalAttrs.version}/caido-cli-v${finalAttrs.version}-mac-aarch64.zip"; - hash = "sha256-19eEV79yk6PCHdl7oTw4Gqt10B7rYnZCJxBebDssFZc="; + hash = "sha256-FwbKLEwjiFzZWdBS6RgsDtc/EkI9AT2CBGwdmgEdDnw="; }; } .${stdenv.hostPlatform.system} @@ -62,7 +58,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/caido-desktop/package.nix b/pkgs/by-name/ca/caido-desktop/package.nix index 2b7b546ba6e2..cedb8a7c3e42 100644 --- a/pkgs/by-name/ca/caido-desktop/package.nix +++ b/pkgs/by-name/ca/caido-desktop/package.nix @@ -9,24 +9,20 @@ let pname = "caido-desktop"; - version = "0.56.2"; + version = "0.57.0"; sources = { x86_64-linux = { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-x86_64.AppImage"; - hash = "sha256-GW8prdvR9+WNO7bdz9ok27Aqra9+jgpZyBnYIM+G5Ys="; + hash = "sha256-a+WHhJ+TvwhOqHOxU7Y5LXeXAJ6T8hk71meFuTR+ra8="; }; aarch64-linux = { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-linux-aarch64.AppImage"; - hash = "sha256-mN5wf9RUllfbR/CfLTE6Ywzoj8wKmEG1clVCKRqPUtU="; - }; - x86_64-darwin = { - url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-x86_64.dmg"; - hash = "sha256-4B3DQJL8M6otnLpFjr4haZA4EWHpgVADQW4DcwsDhIM="; + hash = "sha256-B7dw9uoG++AqT264ZlyHxGpv68fH5SlYzDKUaIM8c14="; }; aarch64-darwin = { url = "https://caido.download/releases/v${version}/caido-desktop-v${version}-mac-aarch64.dmg"; - hash = "sha256-kZdfcZueMmgEHpNTIPANsN7X4lnVOfZXbKHxComaalM="; + hash = "sha256-GmpMnaGR7gYz1RvSO5xj9AA3xU1mn2IBInakmVkuG7A="; }; }; @@ -49,7 +45,6 @@ let platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/ca/cairo-lang/package.nix b/pkgs/by-name/ca/cairo-lang/package.nix index ff4acf1e2755..1176e47956e4 100644 --- a/pkgs/by-name/ca/cairo-lang/package.nix +++ b/pkgs/by-name/ca/cairo-lang/package.nix @@ -45,6 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Turing-complete language for creating provable programs for general computation"; homepage = "https://github.com/starkware-libs/cairo"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/branding.desc b/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/branding.desc index 60ae1d18ef67..d8773478806f 100644 --- a/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/branding.desc +++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/branding.desc @@ -157,10 +157,10 @@ strings: # These filenames can also use substitutions from os-release (see above). images: # productBanner: "banner.png" - productIcon: "nix-snowflake.svg" + productIcon: "nixos-logomark-default-flat-none.svg" productLogo: "white.png" # productWallpaper: "wallpaper.png" - productWelcome: "nix-snowflake.svg" + productWelcome: "nixos-logomark-default-flat-none.svg" # Colors for text and background components. # diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nix-snowflake.svg b/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nix-snowflake.svg deleted file mode 100644 index 9a70a1473953..000000000000 --- a/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nix-snowflake.svg +++ /dev/null @@ -1,513 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nixos-logomark-default-flat-none.svg b/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nixos-logomark-default-flat-none.svg new file mode 100644 index 000000000000..a688ce75a608 --- /dev/null +++ b/pkgs/by-name/ca/calamares-nixos-extensions/src/branding/nixos/nixos-logomark-default-flat-none.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/pkgs/by-name/ca/calceph/package.nix b/pkgs/by-name/ca/calceph/package.nix index d72a3a3da734..9d36197cd626 100644 --- a/pkgs/by-name/ca/calceph/package.nix +++ b/pkgs/by-name/ca/calceph/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "calceph"; - version = "4.0.5"; + version = "5.0.0"; src = fetchFromGitLab { domain = "gitlab.obspm.fr"; owner = "imcce_calceph"; repo = "calceph"; tag = "calceph_${builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-V4Hh3FItBv3zYerNqNPeRJ5Afj3QTfdG3Ps5xeiDASg="; + hash = "sha256-bSgHRVPo0M8SIlw5uqZ0nyt5cVyg3WmxcHistV1FugY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ca/calendar-cli/package.nix b/pkgs/by-name/ca/calendar-cli/package.nix index 78399f5cfd44..6da8f19570e0 100644 --- a/pkgs/by-name/ca/calendar-cli/package.nix +++ b/pkgs/by-name/ca/calendar-cli/package.nix @@ -12,29 +12,25 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "calendar-cli"; - version = "1.0.2"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "pycalendar"; repo = "calendar-cli"; - # https://github.com/pycalendar/calendar-cli/pull/113#issuecomment-3977892432 - tag = "v0.15.0"; - hash = "sha256-P6ClvX6C5VargAvudgSvBwObIUouTRg7SQ62KxhcKiE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5qPBHwOPW/HsmO/jBMyq6ROb23JYfJ/XLWmHwgb5kPY="; }; postPatch = '' - substituteInPlace calendar_cli/metadata.py \ - --replace-fail '"version": "1.0.1"' '"version": "${finalAttrs.version}"' - 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" + --replace-fail "../bin/calendar-cli.py" "$out/bin/calendar-cli" ''; build-system = with python3.pkgs; [ - setuptools + hatch-vcs + hatchling ]; dependencies = with python3.pkgs; [ @@ -45,7 +41,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { tzlocal click six - urllib3 vobject ]; diff --git a/pkgs/by-name/ca/calibre-web/package.nix b/pkgs/by-name/ca/calibre-web/package.nix index 4f67ba476f80..e857a3ccb0db 100644 --- a/pkgs/by-name/ca/calibre-web/package.nix +++ b/pkgs/by-name/ca/calibre-web/package.nix @@ -127,6 +127,8 @@ python3Packages.buildPythonApplication rec { pythonRelaxDeps = [ "apscheduler" "bleach" + "certifi" + "chardet" "cryptography" "flask" "flask-limiter" diff --git a/pkgs/by-name/ca/calibre/package.nix b/pkgs/by-name/ca/calibre/package.nix index 80c72740c555..2b71eee9f958 100644 --- a/pkgs/by-name/ca/calibre/package.nix +++ b/pkgs/by-name/ca/calibre/package.nix @@ -40,11 +40,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "calibre"; - version = "9.9.0"; + version = "9.11.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${finalAttrs.version}/calibre-${finalAttrs.version}.tar.xz"; - hash = "sha256-ozwoRlJThVLiFmaR0fXdfxLDTEF4935rQGLZ+MzwXLk="; + hash = "sha256-UNQuOzLsURb2sd8JlTf0vsrza/7ez59YG3Q/Edi2yzY="; }; patches = @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { (fetchpatch { name = "0007-Hardening-Qt-code-${debian-tag}.patch"; url = "https://github.com/debian-calibre/calibre/raw/refs/tags/debian/${debian-tag}/debian/patches/hardening/0007-Hardening-Qt-code.patch"; - hash = "sha256-lKp/omNicSBiQUIK+6OOc8ysM6LImn5GxWhpXr4iX+U="; + hash = "sha256-/xXkxFJNRnjH8RmXcotrPI6rZ+I1ENjikl1eLU0NEjQ="; }) ] ++ lib.optional (!unrarSupport) ./dont_build_unrar_plugin.patch; diff --git a/pkgs/by-name/ca/camera-streamer/package.nix b/pkgs/by-name/ca/camera-streamer/package.nix new file mode 100644 index 000000000000..25503cf16bcb --- /dev/null +++ b/pkgs/by-name/ca/camera-streamer/package.nix @@ -0,0 +1,80 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + makeWrapper, + pkg-config, + which, + xxd, + ffmpeg, + libcamera, + live555, + openssl, + v4l-utils, +}: +stdenv.mkDerivation rec { + pname = "camera-streamer"; + version = "0.4.2"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "ayufan"; + repo = "camera-streamer"; + tag = "v${version}"; + hash = "sha256-umU8Rp8+wUvQCNK8OpgND/6gPD013SB6sdXSLy5UGAQ="; + fetchSubmodules = true; + }; + + # not sure why the -Werror isn't being an issue for the project maintainer + # my best guess is it's because the project README specifices + # "Debian Bookworm" as a requirement which provides gcc12 by default + postPatch = '' + sed -i 's|git submodule update.*||' Makefile + substituteInPlace Makefile --replace-warn "-Werror" "" + ''; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + which + xxd + ]; + + buildInputs = [ + ffmpeg + libcamera + live555 + openssl + ]; + + dontUseCmakeConfigure = true; + + makeFlags = [ + "GIT_VERSION=${src.tag}" + "GIT_REVISION=${src.rev}" + ]; + + installPhase = '' + runHook preInstall + + install -D camera-streamer $out/bin/camera-streamer + wrapProgram $out/bin/camera-streamer --prefix PATH : ${lib.makeBinPath [ v4l-utils ]} + + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/ayufan/camera-streamer"; + changelog = "https://github.com/ayufan/camera-streamer/releases/tag/v${version}"; + description = "High-performance low-latency camera streamer for Raspberry PI's"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ _30350n ]; + platforms = lib.platforms.linux; + mainProgram = "camera-streamer"; + }; +} diff --git a/pkgs/by-name/ca/cameradar/package.nix b/pkgs/by-name/ca/cameradar/package.nix index 12d7eada0d08..6709ee32572c 100644 --- a/pkgs/by-name/ca/cameradar/package.nix +++ b/pkgs/by-name/ca/cameradar/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "cameradar"; - version = "6.1.1"; + version = "6.2.0"; src = fetchFromGitHub { owner = "Ullaakut"; repo = "cameradar"; tag = "v${finalAttrs.version}"; - hash = "sha256-wJiHCJHG8S+iGFd9jFyavyxAtJ5FGlbvfFcGQfwpi9Y="; + hash = "sha256-NgzTZpRrFLoFNn3xiR5ysORTO9Yj2kn2aPSwSa441t0="; }; - vendorHash = "sha256-1jqGRwgbfcOq6fE3h9RJSeLRlFkd4w4L/2RwscA0zZ0="; + vendorHash = "sha256-NljQGN/B/+gdMGmE1pI2rJPfZNY3xBHYLf+xPxzuh3w="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/camunda-modeler/package.nix b/pkgs/by-name/ca/camunda-modeler/package.nix index c130359ca97a..ea539768df3e 100644 --- a/pkgs/by-name/ca/camunda-modeler/package.nix +++ b/pkgs/by-name/ca/camunda-modeler/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "camunda-modeler"; - version = "5.48.0"; + version = "5.49.0"; src = fetchurl { url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; - hash = "sha256-92KWs2mLcKMhM/v3GRkX5CFcRrtPA1viczZVFkAdVLQ="; + hash = "sha256-HHaw+k5QwcjrxpsYyqTg6EkQlGDg16gbcuRl9y31aqU="; }; sourceRoot = "camunda-modeler-${version}-linux-x64"; diff --git a/pkgs/by-name/ca/cano/package.nix b/pkgs/by-name/ca/cano/package.nix index a72f49c789d1..05c97651f73f 100644 --- a/pkgs/by-name/ca/cano/package.nix +++ b/pkgs/by-name/ca/cano/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.2.0-alpha"; src = fetchFromGitHub { - owner = "CobbCoding1"; + owner = "Cano-Projects"; repo = "Cano"; tag = "v${finalAttrs.version}"; hash = "sha256-OaWj0AKw3+sEhcAbIjgOLfxwCKRG6O1k+zSp0GnnFn8="; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Text Editor Written In C Using ncurses"; - homepage = "https://github.com/CobbCoding1/Cano"; + homepage = "https://github.com/Cano-Projects/Cano"; license = lib.licenses.asl20; mainProgram = "Cano"; maintainers = with lib.maintainers; [ sigmanificient ]; diff --git a/pkgs/by-name/ca/cantoolz/package.nix b/pkgs/by-name/ca/cantoolz/package.nix index a037c3ebcd63..03216ec9042e 100644 --- a/pkgs/by-name/ca/cantoolz/package.nix +++ b/pkgs/by-name/ca/cantoolz/package.nix @@ -70,7 +70,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { implemented with a new module. ''; homepage = "https://github.com/CANToolz/CANToolz"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ca/cantus/package.nix b/pkgs/by-name/ca/cantus/package.nix index aa04acf08257..104def316ece 100644 --- a/pkgs/by-name/ca/cantus/package.nix +++ b/pkgs/by-name/ca/cantus/package.nix @@ -12,16 +12,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cantus"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "CodedNil"; repo = "cantus"; tag = finalAttrs.version; - hash = "sha256-JoxGn3AaILLW2vWwPZ06Dr+JF0Cc1P0X7BeJBNGJBuI="; + hash = "sha256-TRqWhoRlinNzLdxODs4bR5IgJR6ELKs4SOOpvtoFNFA="; }; - cargoHash = "sha256-GIB/QWBjlpkyxeTz15Hf4mr660R++mSf1J+K4JZ+YXY="; + cargoHash = "sha256-YUXEgeZn0UXh34RnCaqLhhK0QSPz3Y8XJuR2oMa4rIU="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/capacities/package.nix b/pkgs/by-name/ca/capacities/package.nix index de649f7157d2..31640eae43bb 100644 --- a/pkgs/by-name/ca/capacities/package.nix +++ b/pkgs/by-name/ca/capacities/package.nix @@ -7,11 +7,11 @@ }: let pname = "capacities"; - version = "1.64.6"; + version = "1.65.13"; src = fetchurl { - url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.64.6.AppImage"; - hash = "sha256-RCWzvoOhX14FRoPpoAJXMgMjmIevISDzzieiwGnX7uc="; + url = "https://web.archive.org/web/20260518194627/https://2vks4.upcloudobjects.com/capacities-desktop-app/Capacities-1.65.13.AppImage"; + hash = "sha256-ATiX1h9hXmKMFtY6OEyZEoJ/SxJGgbj5/QZwFF1sfFQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/ca/capnproto-rust/package.nix b/pkgs/by-name/ca/capnproto-rust/package.nix index 2ea8cc258a94..ad3048c15ee6 100644 --- a/pkgs/by-name/ca/capnproto-rust/package.nix +++ b/pkgs/by-name/ca/capnproto-rust/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "capnproto-rust"; - version = "0.25.3"; + version = "0.26.0"; src = fetchCrate { crateName = "capnpc"; inherit (finalAttrs) version; - hash = "sha256-jDdsGy/T41R4duclyMpPmPZeflXg+Zp7wdBxbR527ZM="; + hash = "sha256-zMaOGwbCnczEY9V2xh3pXuDPYtr91sRblDwSjH/2f0s="; }; - cargoHash = "sha256-egb4Jpwzkj3PSVStqCX5ZLKgrH7nGHgZUCIleZcWIeI="; + cargoHash = "sha256-PgMj+sEvvkkySkL25sgfKzZiKYQX+U0Pt8gJOkZwRzA="; postInstall = '' mkdir -p $out/include/capnp diff --git a/pkgs/by-name/ca/captive-browser/package.nix b/pkgs/by-name/ca/captive-browser/package.nix index 7f6f740261e7..927a560c78ea 100644 --- a/pkgs/by-name/ca/captive-browser/package.nix +++ b/pkgs/by-name/ca/captive-browser/package.nix @@ -2,34 +2,25 @@ lib, fetchFromGitHub, buildGoModule, - fetchpatch, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "captive-browser"; - version = "0-unstable-2021-08-01"; + version = "0-unstable-2025-11-05"; src = fetchFromGitHub { - owner = "FiloSottile"; + owner = "pacoorozco"; repo = "captive-browser"; - rev = "9c707dc32afc6e4146e19b43a3406329c64b6f3c"; - sha256 = "sha256-65lPo5tpE0M/VyyvlzlcVSuHX4AhhVuqK0UF4BIAH/Y="; + rev = "ca6f74e132ecf298c87936d4c946fd551aefbbf7"; + sha256 = "sha256-wojx28GFg9whfkNxUbOVDVNHp8M7SLsmRBTP/Jh8nLQ="; }; - vendorHash = "sha256-2MFdQ2GIDAdLPuwAiGPO9wU3mm2BDXdyTwoVA1xVlcQ="; - deleteVendor = true; - - patches = [ - # Add go modules support - (fetchpatch { - url = "https://github.com/FiloSottile/captive-browser/commit/ef50837778ef4eaf38b19887e79c8b6fa830c342.patch"; - hash = "sha256-w+jDFeO94pMu4ir+G5CzqYlXxYOm9+YfyzbU3sbTyiY="; - }) - ]; + vendorHash = "sha256-8FMFgCJUTalJ45GR5UnyXqN6s0gVFtiy6zjugbngDYQ="; ldflags = [ "-s" "-w" + "-X main.Version=${finalAttrs.version}" ]; meta = { @@ -38,4 +29,4 @@ buildGoModule { license = lib.licenses.mit; maintainers = with lib.maintainers; [ ma27 ]; }; -} +}) diff --git a/pkgs/by-name/ca/carapace-bridge/package.nix b/pkgs/by-name/ca/carapace-bridge/package.nix index 64223f725e77..edfe49711259 100644 --- a/pkgs/by-name/ca/carapace-bridge/package.nix +++ b/pkgs/by-name/ca/carapace-bridge/package.nix @@ -8,19 +8,19 @@ buildGoModule (finalAttrs: { pname = "carapace-bridge"; - version = "1.5.3"; + version = "1.6.2"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-URIRdoG/P6YrcuOdZmQHD1cvcpYg++JS39fj/wJdLWY="; + hash = "sha256-QlYRbGw7QRwMqJRJea0OoHCDQpYK7Uq6eFgc1JahEiI="; }; # buildGoModule tries to run `go mod vendor` instead of `go work vendor` on # the workspace if proxyVendor is off proxyVendor = true; - vendorHash = "sha256-1TTo5Maka7lp20ZC7/Sebt+/stUQSheRXrEuhykbLN0="; + vendorHash = "sha256-YB8rBIrFgOBzdBLAXf5FjzB0d0dZmNEq8vXFZg1Rd10="; postPatch = '' substituteInPlace cmd/carapace-bridge/main.go \ diff --git a/pkgs/by-name/ca/carapace/package.nix b/pkgs/by-name/ca/carapace/package.nix index 244dc57c2c56..d9f24a312b73 100644 --- a/pkgs/by-name/ca/carapace/package.nix +++ b/pkgs/by-name/ca/carapace/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "carapace"; - version = "1.6.3"; + version = "1.7.1"; src = fetchFromGitHub { owner = "carapace-sh"; repo = "carapace-bin"; tag = "v${finalAttrs.version}"; - hash = "sha256-k6fWtwDTNc2qcr9ryL7wMVy744fiP8NrLqm4crVr+EI="; + hash = "sha256-wIRBz1WjN4Sy5hkRvAWHWRrtcTpVdY7BOLp1KF8UC5A="; }; - vendorHash = "sha256-5AqoM16M5pPfRYxqa72LrHJRRatK2qnZK3pQIoFXG9g="; + vendorHash = "sha256-s6Wq7+2S7hxAhU2OJ8TCkSG5H9dJjwlDy5G02Uqnzm4="; proxyVendor = true; diff --git a/pkgs/by-name/ca/cardinal/package.nix b/pkgs/by-name/ca/cardinal/package.nix index 1f2024e71be9..37f93ea83b28 100644 --- a/pkgs/by-name/ca/cardinal/package.nix +++ b/pkgs/by-name/ca/cardinal/package.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, + carla, cmake, dbus, fftwFloat, @@ -37,6 +38,14 @@ stdenv.mkDerivation (finalAttrs: { prePatch = '' patchShebangs ./dpf/utils/generate-ttl.sh + + substituteInPlace plugins/Cardinal/src/Carla.cpp \ + --replace-fail "/usr/lib/carla" "${carla}/bin" \ + --replace-fail "/usr/share/carla/resources" "${carla}/share" + + substituteInPlace plugins/Cardinal/src/Ildaeil.cpp \ + --replace-fail "/usr/lib/carla" "${carla}/bin" \ + --replace-fail "/usr/share/carla/resources" "${carla}/share" ''; dontUseCmakeConfigure = true; diff --git a/pkgs/by-name/ca/cardpeek/package.nix b/pkgs/by-name/ca/cardpeek/package.nix index 895415be4780..15716189d1be 100644 --- a/pkgs/by-name/ca/cardpeek/package.nix +++ b/pkgs/by-name/ca/cardpeek/package.nix @@ -52,6 +52,13 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isLinux pcsclite; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # macOS iconv implementation is slightly broken since Sonoma + # https://github.com/Homebrew/homebrew-core/pull/199639 + # https://savannah.gnu.org/bugs/index.php?66541 + am_cv_func_iconv_works = "yes"; + }; + enableParallelBuilding = true; meta = { diff --git a/pkgs/by-name/ca/cargo-audit/package.nix b/pkgs/by-name/ca/cargo-audit/package.nix index d7827e46db66..e48d3efa5a42 100644 --- a/pkgs/by-name/ca/cargo-audit/package.nix +++ b/pkgs/by-name/ca/cargo-audit/package.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-audit"; - version = "0.22.1"; + version = "0.22.2"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-/K84iYr3mRNH8lbqHHa7Tsh7M3ykQ2hs6T1k/qrSsnA="; + hash = "sha256-hrkkDRJvXe2fltWjEW2A0/uKVFWq+9O+wRphsJjT1tE="; }; - cargoHash = "sha256-Hr3CliJeb9ljHylx8mjkGyf4ybX79Fmt6CaFb6FMRts="; + cargoHash = "sha256-pdFoawDRzJ8gPYAAQHwrCVYeaa1ShSqYA8nwpCAnS1s="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-auditable/builder.nix b/pkgs/by-name/ca/cargo-auditable/builder.nix index 348ff29ef61a..1f3034e511c6 100644 --- a/pkgs/by-name/ca/cargo-auditable/builder.nix +++ b/pkgs/by-name/ca/cargo-auditable/builder.nix @@ -16,11 +16,14 @@ lib.extendMkDerivation { auditable ? true, hash ? "", cargoHash ? "", + passthru ? { }, ... }: { inherit auditable pname; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "rust-secure-code"; repo = "cargo-auditable"; @@ -39,13 +42,17 @@ lib.extendMkDerivation { # https://github.com/rust-secure-code/cargo-auditable/issues/235 "--skip=test_proc_macro" "--skip=test_self_hosting" + # Expects `linker = "rust-lld"` to work. + "--skip=test_bare_linker" ]; postInstall = '' installManPage cargo-auditable/cargo-auditable.1 ''; - passthru.bootstrap = auditable-bootstrap; + passthru = passthru // { + bootstrap = auditable-bootstrap; + }; meta = { description = "Tool to make production Rust binaries auditable"; diff --git a/pkgs/by-name/ca/cargo-auditable/package.nix b/pkgs/by-name/ca/cargo-auditable/package.nix index b74e0abbd515..064df430d374 100644 --- a/pkgs/by-name/ca/cargo-auditable/package.nix +++ b/pkgs/by-name/ca/cargo-auditable/package.nix @@ -2,6 +2,7 @@ buildPackages, callPackage, makeRustPlatform, + nix-update-script, }: let # Need to use the build platform rustc and Cargo so that @@ -18,9 +19,9 @@ let auditable-bootstrap = bootstrap; }; - version = "0.7.2"; - hash = "sha256-hR6PjTOps8JSM7UbfGlCoZmmwtWExVqYwh4lxDiFWdc="; - cargoHash = "sha256-JEfnUJ9J6Xak3AOCwQCnu+v+3Wl3QbXX20qVFWB6040="; + version = "0.7.5"; + hash = "sha256-0VONJCv/msLcGenItWMLJ7DH79RTD6vsU9gX/nphh1g="; + cargoHash = "sha256-/iAYib+xDQSJ8B559/V7b994ErSUGsPSDx64jFF5B6I="; # cargo-auditable cannot be built with cargo-auditable until cargo-auditable is built bootstrap = auditableBuilder { @@ -32,4 +33,5 @@ in auditableBuilder { inherit version hash cargoHash; auditable = true; + passthru.updateScript = nix-update-script { }; } diff --git a/pkgs/by-name/ca/cargo-binstall/package.nix b/pkgs/by-name/ca/cargo-binstall/package.nix index 24d3c533228f..92faf3a87a94 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 (finalAttrs: { pname = "cargo-binstall"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "cargo-bins"; repo = "cargo-binstall"; tag = "v${finalAttrs.version}"; - hash = "sha256-EnHBXdaER23fvYJ3iW4JqpE1Qap/sQottkqllNA2n18="; + hash = "sha256-6msYAVCN1i2srA4DquqcdJxUrJP1jub34c/a/4RbWCg="; }; - cargoHash = "sha256-p/IfFnFB7vJPVJH2SvnLagXh9zxLgNxEcZILQcIqnVo="; + cargoHash = "sha256-r9iGWxrLlD83QtvZuWXIxjI2S0RO1GNwOed531FVvJk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix index b0af91dd96d8..01e38d1d5c27 100644 --- a/pkgs/by-name/ca/cargo-bisect-rustc/package.nix +++ b/pkgs/by-name/ca/cargo-bisect-rustc/package.nix @@ -62,10 +62,12 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Bisects rustc, either nightlies or CI artifacts"; mainProgram = "cargo-bisect-rustc"; homepage = "https://github.com/rust-lang/cargo-bisect-rustc"; - license = with lib.licenses; [ - asl20 - mit - ]; + license = + with lib.licenses; + OR [ + asl20 + mit + ]; maintainers = with lib.maintainers; [ sandarukasa ]; }; }) diff --git a/pkgs/by-name/ca/cargo-bolero/package.nix b/pkgs/by-name/ca/cargo-bolero/package.nix index 55e26723c9c4..1c51065e51ad 100644 --- a/pkgs/by-name/ca/cargo-bolero/package.nix +++ b/pkgs/by-name/ca/cargo-bolero/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fuzzing and property testing front-end framework for Rust"; mainProgram = "cargo-bolero"; homepage = "https://github.com/camshaft/bolero"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ekleog ]; }; }) diff --git a/pkgs/by-name/ca/cargo-bump/package.nix b/pkgs/by-name/ca/cargo-bump/package.nix index 91920e40d5cf..9894060b4f45 100644 --- a/pkgs/by-name/ca/cargo-bump/package.nix +++ b/pkgs/by-name/ca/cargo-bump/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Increments the version number of the current project"; mainProgram = "cargo-bump"; homepage = "https://github.com/wraithan/cargo-bump"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ cafkafk ]; }; }) diff --git a/pkgs/by-name/ca/cargo-c/package.nix b/pkgs/by-name/ca/cargo-c/package.nix index effa2325438f..159334080752 100644 --- a/pkgs/by-name/ca/cargo-c/package.nix +++ b/pkgs/by-name/ca/cargo-c/package.nix @@ -12,19 +12,19 @@ let # this version may need to be updated along with package version - cargoVersion = "0.93.0"; + cargoVersion = "0.96.0"; in rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-c"; - version = "0.10.19"; + version = "0.10.22"; src = fetchCrate { inherit (finalAttrs) pname; version = "${finalAttrs.version}+cargo-${cargoVersion}"; - hash = "sha256-PrBmB+0tmU2MAUnRr+wx4g9hu0Y9i6WfR8U89bwiLVY="; + hash = "sha256-yqSrpBZUa0NmsPawYKKgywmbbG4zgguwfDF667s7zdo="; }; - cargoHash = "sha256-EM/vAfW/ucOfK/XmAQn9Zk75eFb7pp8uZoByKbALCyo="; + cargoHash = "sha256-yeJWZtkgCRB0ipyTslsGcJi9Fi/XoWziuv74exRhAIk="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-codspeed/package.nix b/pkgs/by-name/ca/cargo-codspeed/package.nix index 98be35c90296..3d276079ccb8 100644 --- a/pkgs/by-name/ca/cargo-codspeed/package.nix +++ b/pkgs/by-name/ca/cargo-codspeed/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-codspeed"; - version = "4.7.0"; + version = "5.0.1"; src = fetchFromGitHub { owner = "CodSpeedHQ"; repo = "codspeed-rust"; tag = "v${finalAttrs.version}"; - hash = "sha256-6XSKAPLcxgnshkMuiSmw13tsE4keJ9h5DpxwidqMLbg="; + hash = "sha256-Zu5PltGimy+8JYTEh8fTflW/L4zTW94IKgldT5kzPjA="; }; - cargoHash = "sha256-1AjODDI114CL/L8ZDFWDfPwxxxY9vgT/miSVsMLLSgE="; + cargoHash = "sha256-hihwHbyNAJcl/mUy9obh2UDZfUA9Lq64c1TRZbUr+L0="; nativeBuildInputs = [ curl diff --git a/pkgs/by-name/ca/cargo-deny/package.nix b/pkgs/by-name/ca/cargo-deny/package.nix index 556eda676e08..4fef3a52f933 100644 --- a/pkgs/by-name/ca/cargo-deny/package.nix +++ b/pkgs/by-name/ca/cargo-deny/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-deny"; - version = "0.19.8"; + version = "0.20.2"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = "cargo-deny"; tag = finalAttrs.version; - hash = "sha256-pcF/SYtlydu09ZXQ5/1Wm2gwttFBulEt27SCEY1+kNU="; + hash = "sha256-sYxRQvJVbVmzajGJdAHnuvJDELv0cyDCCU8cRU0U0oQ="; }; - cargoHash = "sha256-I2BHVcpULObHtsqBxzTvEPevZa/CkhlC/gj0ldofDwA="; + cargoHash = "sha256-Zb6vQCnhhhL9Ducn9eh5P8Gfopl0lQPTXWW8Q0Y5xBQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-diet/package.nix b/pkgs/by-name/ca/cargo-diet/package.nix index fc5f821f6f60..3c55e294ef75 100644 --- a/pkgs/by-name/ca/cargo-diet/package.nix +++ b/pkgs/by-name/ca/cargo-diet/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-diet"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "the-lean-crate"; repo = "cargo-diet"; rev = "v${finalAttrs.version}"; - hash = "sha256-YjUO8UUXWZvZZZ2Y0py5LQdVBpq8jjwvGimVAWC8Gr8="; + hash = "sha256-/f5GbNWkx/pOQgsaxg+HeI4Z9joX3pCL8u4Pu7VZg08="; }; - cargoHash = "sha256-CnaeS7mh+QDPcQgeKzNV5Vey3zsiD10NdlfdQ1kcDB8="; + cargoHash = "sha256-PK5Ru/Slz1MTD9DxVY0zratzAeXAokJZ+Kz/MznaeB0="; meta = { description = "Help computing optimal include directives for your Cargo.toml manifest"; diff --git a/pkgs/by-name/ca/cargo-edit/package.nix b/pkgs/by-name/ca/cargo-edit/package.nix index 314d7c62b8ec..b9714260fc49 100644 --- a/pkgs/by-name/ca/cargo-edit/package.nix +++ b/pkgs/by-name/ca/cargo-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-edit"; - version = "0.13.11"; + version = "0.13.13"; src = fetchFromGitHub { owner = "killercup"; repo = "cargo-edit"; rev = "v${finalAttrs.version}"; - hash = "sha256-u4mjbIs9rLZOZ4MUITc4QYnfEcTyZT5aXt6U7fwefoo="; + hash = "sha256-yaY6krZ+kt2g3Wnnzsw4P3xnpsaZuNwFfRk9GLvwps8="; }; - cargoHash = "sha256-1PCncmiY+olGGMOT2AfIbGY5sup4ysPVqdBmuecDWk0="; + cargoHash = "sha256-Q4GDA81w0JR9rcpKSPe9Y+9HPpFdAvYP2RI+91R4NWE="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ca/cargo-expand/package.nix b/pkgs/by-name/ca/cargo-expand/package.nix index 07b9e98b45c4..cfbc7a4b2abf 100644 --- a/pkgs/by-name/ca/cargo-expand/package.nix +++ b/pkgs/by-name/ca/cargo-expand/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-expand"; - version = "1.0.122"; + version = "1.0.124"; src = fetchFromGitHub { owner = "dtolnay"; repo = "cargo-expand"; tag = finalAttrs.version; - hash = "sha256-GhlVBpTkh4uCpfQdBl5ACbkXpH5UO5w/an/w9FA4dT4="; + hash = "sha256-deGIcij3Tczsqc0HTBGUbncdUXKP+FGj5R+2fevQULA="; }; - cargoHash = "sha256-CV+lfWLcyXoXPv8KLutJ819YIaKf3BHOZrj1eP3VMzo="; + cargoHash = "sha256-MYaKNoz8h5bt0/Z+8PwLKZDvIWUUCfsvB5vibMaDmf4="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/ca/cargo-feature-combinations/package.nix b/pkgs/by-name/ca/cargo-feature-combinations/package.nix index 385ac9d6ac58..29d9742b1000 100644 --- a/pkgs/by-name/ca/cargo-feature-combinations/package.nix +++ b/pkgs/by-name/ca/cargo-feature-combinations/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "cargo-feature-combinations"; - version = "0.0.53"; + version = "0.3.0"; src = fetchFromGitHub { owner = "romnn"; repo = "cargo-feature-combinations"; tag = "v${finalAttrs.version}"; - hash = "sha256-t6WSqE3h62liesjH8UAcTeY/X61gQt+TO0eYmxjBtKc="; + hash = "sha256-PneHMWX7IRoX4oSm8iePeI+pEPs8n3F2PW06ZWKDFcc="; }; - cargoHash = "sha256-e4w98y3t+b1PZsbGuygzwNQIBRTUviEJke6MS0b/uMA="; + cargoHash = "sha256-DCfO2N6ml1a1P2hFs3gxRE9k+WYv8eqMzwL+cionwYE="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ca/cargo-hack/package.nix b/pkgs/by-name/ca/cargo-hack/package.nix index ef1c22deebbf..8b820ec01132 100644 --- a/pkgs/by-name/ca/cargo-hack/package.nix +++ b/pkgs/by-name/ca/cargo-hack/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-hack"; - version = "0.6.44"; + version = "0.6.45"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-f45zkLoj4gZ7U+2B560lLEpYYrGyXjiaMd6XMEzF2NE="; + hash = "sha256-WehLSSE1g6mu8GNJQzyVeu80pqswE+SModgwOAP//bE="; }; - cargoHash = "sha256-dG5MTWPcBGnOBthF1V8jbcOLXSb/O34N8slpIXR+2c8="; + cargoHash = "sha256-YlM89NaI+9iDb4KiTYAhCJtN3G+j6q44xo79ZcyKr6M="; # some necessary files are absent in the crate version doCheck = false; diff --git a/pkgs/by-name/ca/cargo-hf2/package.nix b/pkgs/by-name/ca/cargo-hf2/package.nix index 9127e8b0e084..b22742de046a 100644 --- a/pkgs/by-name/ca/cargo-hf2/package.nix +++ b/pkgs/by-name/ca/cargo-hf2/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo Subcommand for Microsoft HID Flashing Library for UF2 Bootloaders"; mainProgram = "cargo-hf2"; homepage = "https://lib.rs/crates/cargo-hf2"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ astrobeastie ]; }; }) diff --git a/pkgs/by-name/ca/cargo-leptos/package.nix b/pkgs/by-name/ca/cargo-leptos/package.nix index 1dd81c9405df..c76f676ff335 100644 --- a/pkgs/by-name/ca/cargo-leptos/package.nix +++ b/pkgs/by-name/ca/cargo-leptos/package.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-leptos"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "leptos-rs"; repo = "cargo-leptos"; rev = "v${finalAttrs.version}"; - hash = "sha256-Y81cCy1w4FoWRyTN15BuC9Z8FSVPJxYObXms0rJHxwM="; + hash = "sha256-w1kd/eOjNHYAramUvHdgj0ogFqgHDQ1P+ItKTTLL9hU="; }; - cargoHash = "sha256-Wv1gsrcrsJ3izYYFCPMO4ds1w6RQcIlWh+GcsckoKM4="; + cargoHash = "sha256-p0mku5B9RtU0E7ny1Izhr2diBLgDH8HR2/B92MvBfws="; nativeBuildInputs = [ pkg-config ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-leptos"; homepage = "https://github.com/leptos-rs/cargo-leptos"; changelog = "https://github.com/leptos-rs/cargo-leptos/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ benwis ]; }; }) diff --git a/pkgs/by-name/ca/cargo-license/package.nix b/pkgs/by-name/ca/cargo-license/package.nix index ff18e5aaa5f2..0fa1ba42cf61 100644 --- a/pkgs/by-name/ca/cargo-license/package.nix +++ b/pkgs/by-name/ca/cargo-license/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Cargo subcommand to see license of dependencies"; mainProgram = "cargo-license"; homepage = "https://github.com/onur/cargo-license"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ basvandijk matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-limit/package.nix b/pkgs/by-name/ca/cargo-limit/package.nix index 67423af6955c..e0121e37ba44 100644 --- a/pkgs/by-name/ca/cargo-limit/package.nix +++ b/pkgs/by-name/ca/cargo-limit/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.0.10"; src = fetchFromGitHub { - owner = "alopatindev"; + owner = "cargo-limit"; repo = "cargo-limit"; tag = finalAttrs.version; sha256 = "sha256-joWDB9fhCsYVZFZdr+Gfm4JaRlm5kj+CHp34Sx5iQYk="; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cargo subcommand \"limit\": reduces the noise of compiler messages"; - homepage = "https://github.com/alopatindev/cargo-limit"; + homepage = "https://github.com/cargo-limit/cargo-limit"; license = with lib.licenses; [ asl20 # or mit diff --git a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock index 4f2c0388d604..a9c07eec84e6 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock +++ b/pkgs/by-name/ca/cargo-llvm-cov/Cargo.lock @@ -13,31 +13,31 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.102" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "bitflags" -version = "2.11.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "b588b76d00fde79687d7646a9b5bdf3cc0f655e0bbd080335a95d7e96f3587da" [[package]] name = "bstr" -version = "1.12.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63044e1ae8e69f3b5a92c736ca6269b8d12fa7efe39bf34ddb06d102cf0e2cab" +checksum = "1f7dc094d718f2e1c1559ad110e27eeaae14a5465d3d56dd6dbd793079fbd530" dependencies = [ "memchr", "regex-automata", - "serde", + "serde_core", ] [[package]] @@ -48,25 +48,24 @@ checksum = "ebb068a5ba5b65a7cdba869497ca2a352e88e6093c4909ddf4d12d9d3151ee9c" [[package]] name = "camino" -version = "1.2.2" +version = "1.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629a66d692cb9ff1a1c664e41771b3dcaf961985a9774c0eb0bd1b51cf60a48" +checksum = "5f2d30e4173c4026932d51d31d6b0613b1fd3014bf3f9f8943d4ba139c437ba0" [[package]] name = "cargo-config2" -version = "0.1.43" +version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f7dacdd4a7586d602c2543e0217304bebc6502bde82154209cd8f09f24a7718" +checksum = "25ada53f7339c78084fb37d7e17f34e76537541c4fbb02fa3a2baa14b8faad37" dependencies = [ "serde", "serde_derive", "toml", - "windows-sys 0.61.2", ] [[package]] name = "cargo-llvm-cov" -version = "0.8.5" +version = "0.8.7" dependencies = [ "anyhow", "build-context", @@ -123,26 +122,25 @@ dependencies = [ [[package]] name = "fastrand" -version = "2.3.0" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" +checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "filetime" -version = "0.2.27" +version = "0.2.29" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f98844151eee8917efc50bd9e8318cb963ae8b297431495d3f758616ea5c57db" +checksum = "5c287a33c7f0a620c38e641e7f60827713987b3c0f26e8ddc9462cc69cf75759" dependencies = [ "cfg-if", "libc", - "libredox", ] [[package]] name = "fs-err" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0" +checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a" dependencies = [ "autocfg", ] @@ -179,21 +177,9 @@ checksum = "803ec87c9cfb29b9d2633f20cba1f488db3fd53f2158b1024cbefb47ba05d413" [[package]] name = "libc" -version = "0.2.183" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5b646652bf6661599e1da8901b3b9522896f01e736bad5f723fe7a3a27f899d" - -[[package]] -name = "libredox" -version = "0.1.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1744e39d1d6a9948f4f388969627434e31128196de472883b39f148769bfe30a" -dependencies = [ - "bitflags", - "libc", - "plain", - "redox_syscall", -] +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "linux-raw-sys" @@ -203,15 +189,15 @@ checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "cf8baf1c55e62ffcace7a9f06f4bd9cd3f0c4beb022d3b367256b91b87513d98" [[package]] name = "normpath" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf23ab2b905654b4cb177e30b629937b3868311d4e1cba859f899c041046e69b" +checksum = "b9985ef7269fa99f3b12437bb698381da2428743ab90f20393f399fa14cab21a" dependencies = [ "windows-sys 0.61.2", ] @@ -224,9 +210,9 @@ checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" [[package]] name = "opener" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2fa337e0cf13357c13ef1dc108df1333eb192f75fc170bea03fcf1fd404c2ee" +checksum = "b2b03ff07a220d0d0ec9a1f0f238951b7967a5a2e96aefcd21a117b1083415e9" dependencies = [ "bstr", "normpath", @@ -243,12 +229,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "plain" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" - [[package]] name = "proc-macro2" version = "1.0.106" @@ -260,36 +240,27 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.39.2" +version = "0.39.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958f21e8e7ceb5a1aa7fa87fab28e7c75976e0bfe7e23ff069e0a260f894067d" +checksum = "cdcc8dd4e2f670d309a5f0e83fe36dfdc05af317008fea29144da1a2ac858e5e" dependencies = [ "memchr", ] [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] -[[package]] -name = "redox_syscall" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce70a74e890531977d37e532c34d45e9055d2409ed08ddba14529471ed0be16" -dependencies = [ - "bitflags", -] - [[package]] name = "regex" -version = "1.12.3" +version = "1.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "f020237b6c8eed93db2e2cb53c00c60a8e1bc73da7d073199a1180401450218d" dependencies = [ "aho-corasick", "memchr", @@ -299,9 +270,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.14" +version = "0.4.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e1dd4122fc1595e8162618945476892eefca7b88c52820e74af6262213cae8f" +checksum = "8fcfdb36bda0c880c5931cdc7a2bcdc8ba4556847b9d912bca70bc94708711ad" dependencies = [ "aho-corasick", "memchr", @@ -310,15 +281,15 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "rustc-demangle" -version = "0.1.27" +version = "0.1.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b50b8869d9fc858ce7266cce0194bd74df58b9d0e3f6df3a9fc8eb470d95c09d" +checksum = "b74b56ffa8bb2830709a538c2cbcae9aa062db0d2a42563bfb09bdaae44020eb" [[package]] name = "rustix" @@ -335,15 +306,15 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +checksum = "cf54715a573b99ac80df0bc206da022bcd442c974952c7b9720069370852e21f" [[package]] name = "ruzstd" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ff0cc5e135c8870a775d3320910cd9b564ec036b4dc0b8741629020be63f01" +checksum = "a7c1c839d570d835527c9a5e4db7cb2198683a988cb9d7293fc8674e6bd58fc8" [[package]] name = "same-file" @@ -385,9 +356,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -398,9 +369,9 @@ dependencies = [ [[package]] name = "serde_spanned" -version = "1.0.4" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8bbf91e5a4d6315eee45e704372590b30e260ee83af6639d64557f51b067776" +checksum = "6662b5879511e06e8999a8a235d848113e942c9124f211511b16466ee2995f26" dependencies = [ "serde_core", ] @@ -429,9 +400,9 @@ checksum = "45bb67a18fa91266cc7807181f62f9178a6873bfad7dc788c42e6430db40184f" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.119" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "872831b642d1a07999a962a351ed35b955ea2cfc8f3862091e2a240a84f17297" dependencies = [ "proc-macro2", "quote", @@ -440,9 +411,9 @@ dependencies = [ [[package]] name = "tar" -version = "0.4.45" +version = "0.4.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22692a6476a21fa75fdfc11d452fda482af402c008cdbaf3476414e122040973" +checksum = "3f6221d9a6003c78398e3b239969f352578258df48c8eb051caadae0015bc840" dependencies = [ "filetime", "libc", @@ -480,9 +451,9 @@ dependencies = [ [[package]] name = "toml" -version = "1.0.7+spec-1.1.0" +version = "1.1.3+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd28d57d8a6f6e458bc0b8784f8fdcc4b99a437936056fa122cb234f18656a96" +checksum = "53c96ecdfa941c8fc4fcaed14f99ada8ebed502eef533015095a07e3301d4c3c" dependencies = [ "serde_core", "serde_spanned", @@ -493,18 +464,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.1+spec-1.1.0" +version = "1.1.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" +checksum = "3165f65f62e28e0115a00b2ebdd37eb6f3b641855f9d636d3cd4103767159ad7" dependencies = [ "serde_core", ] [[package]] name = "toml_parser" -version = "1.0.10+spec-1.1.0" +version = "1.1.2+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" +checksum = "a2abe9b86193656635d2411dc43050282ca48aa31c2451210f4202550afb7526" dependencies = [ "winnow", ] @@ -625,9 +596,9 @@ checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" -version = "1.0.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" +checksum = "23b97319f7b8343df12cc98938e5c3eb436064524c8d2b4e30a1d3a36eecdf81" [[package]] name = "xattr" @@ -641,6 +612,6 @@ dependencies = [ [[package]] name = "zmij" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" +checksum = "29666d0abbfad1e3dc4dcf6144730dd3a3ab225bbbdac83319345b1b44ccfc1b" diff --git a/pkgs/by-name/ca/cargo-llvm-cov/package.nix b/pkgs/by-name/ca/cargo-llvm-cov/package.nix index 853476334d0d..74e2d855cce3 100644 --- a/pkgs/by-name/ca/cargo-llvm-cov/package.nix +++ b/pkgs/by-name/ca/cargo-llvm-cov/package.nix @@ -25,7 +25,7 @@ let pname = "cargo-llvm-cov"; - version = "0.8.5"; + version = "0.8.7"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { inherit owner; repo = "cargo-llvm-cov"; rev = "v${version}"; - sha256 = "sha256-acd2qauvcVPxDjMuFXkaUxDL4kXoDSCVKDG7ki2pK/Y="; + sha256 = "sha256-flHZfjwEEIBEJHYGozlRgH9OHTJHgAR+OZxYJS/vHpQ="; }; # Upstream doesn't include the lockfile so we need to add it back diff --git a/pkgs/by-name/ca/cargo-nextest/package.nix b/pkgs/by-name/ca/cargo-nextest/package.nix index 4d58e9f6bd06..6a8a107d883a 100644 --- a/pkgs/by-name/ca/cargo-nextest/package.nix +++ b/pkgs/by-name/ca/cargo-nextest/package.nix @@ -5,16 +5,15 @@ fetchFromGitHub, nix-update-script, }: - rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-nextest"; - version = "0.9.137"; + version = "0.9.140"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; tag = "cargo-nextest-${finalAttrs.version}"; - hash = "sha256-Ad5QXVkPwJk2wMHbCbYVwgua0DfmUwBLmfG9bSt1dbA="; + hash = "sha256-BPepunROy+2a31mXRn19perolZLWCTg0kseu0xqRbmU="; }; # FIXME: we don't support dtrace probe generation on macOS until we have a dtrace build: https://github.com/NixOS/nixpkgs/pull/392918 @@ -22,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./no-dtrace-macos.patch ]; - cargoHash = "sha256-7ISzQ9jt/ekrO7Z4B09YbNLZkNDwS13ljl2tpEQdthU="; + cargoHash = "sha256-uqEIv6zkYuL4cOXuGfN7VxCakvJ3z49eqRUZiTgD9Tk="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ca/cargo-pgo/package.nix b/pkgs/by-name/ca/cargo-pgo/package.nix index a687cb48b53b..c6804f22d59b 100644 --- a/pkgs/by-name/ca/cargo-pgo/package.nix +++ b/pkgs/by-name/ca/cargo-pgo/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cargo subcommand for optimizing Rust binaries/libraries with PGO and BOLT"; homepage = "https://github.com/kobzol/cargo-pgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/ca/cargo-psp/package.nix b/pkgs/by-name/ca/cargo-psp/package.nix index 03957e7599a3..151bf0c4aee1 100644 --- a/pkgs/by-name/ca/cargo-psp/package.nix +++ b/pkgs/by-name/ca/cargo-psp/package.nix @@ -7,14 +7,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-psp"; - version = "0.2.8"; + version = "0.2.9"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-Jud89nYJq4xZn2HudmSA82hOYwItrrTblhIfeqqIqm8="; + hash = "sha256-zifaXT7Yzo1tG11PrwIIopOul83jBR2Nbdb02l6M0rk="; }; - cargoHash = "sha256-oL2KbhpqvPhtN7hpAuR6a383pPKlW1XuXkoew0ZvPUo="; + cargoHash = "sha256-M7dBm5a+xAVORvX6sSTZ5JBSNsImi5OTXr+JPFq0DtU="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ca/cargo-rdme/package.nix b/pkgs/by-name/ca/cargo-rdme/package.nix index 6faadf48ad67..6cea4afc2800 100644 --- a/pkgs/by-name/ca/cargo-rdme/package.nix +++ b/pkgs/by-name/ca/cargo-rdme/package.nix @@ -6,21 +6,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-rdme"; - version = "1.5.1"; + version = "2.1.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-d3WughXxh9cBzy33s3iB75paldZFokGGI1L9yTLGYoc="; + hash = "sha256-U5JD3VMuIagaMKxHoRRhbFyl7keuaJ0zNzD3Hjhxe/Y="; }; - cargoHash = "sha256-26Poh5lUCYi+a+/E7pOYwilKX+eqRmbRNYRFdVfRSCw="; + cargoHash = "sha256-Es1K4MmThAS9whsfSQ8dUtjPjunCDCQc5FU8vsbeJPw="; meta = { description = "Cargo command to create the README.md from your crate's documentation"; mainProgram = "cargo-rdme"; homepage = "https://github.com/orium/cargo-rdme"; changelog = "https://github.com/orium/cargo-rdme/blob/v${finalAttrs.version}/release-notes.md"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ GoldsteinE chrjabs diff --git a/pkgs/by-name/ca/cargo-readme/package.nix b/pkgs/by-name/ca/cargo-readme/package.nix index 6de86e184a61..902158b60907 100644 --- a/pkgs/by-name/ca/cargo-readme/package.nix +++ b/pkgs/by-name/ca/cargo-readme/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-readme"; - version = "3.3.2"; + version = "3.3.3"; src = fetchFromGitHub { owner = "webern"; repo = "cargo-readme"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-p8QQNACU9lFig0vBQrb1u2T44Icwk10OBjGzaVLj7kk="; + sha256 = "sha256-Urp5OvM6LzLb8SY49u2Dc57NFJtyxpMkvCbb6hTUDMs="; }; - cargoHash = "sha256-kfXDMBqS4/QC+khQhQ2Jrer8TuFKlnZFS3IZ2lcVOR8="; + cargoHash = "sha256-CmYJ8acmcaWregM0zroaTFaPFV6cnS2KWf5Y4LXMcyk="; # disable doc tests cargoTestFlags = [ @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 ]; maintainers = with lib.maintainers; [ - baloo matthiasbeyer + sshine ]; }; }) diff --git a/pkgs/by-name/ca/cargo-release/package.nix b/pkgs/by-name/ca/cargo-release/package.nix index cd45c51a4715..5f9f688ce43b 100644 --- a/pkgs/by-name/ca/cargo-release/package.nix +++ b/pkgs/by-name/ca/cargo-release/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-release"; - version = "1.1.2"; + version = "1.1.3"; src = fetchFromGitHub { owner = "crate-ci"; repo = "cargo-release"; tag = "v${finalAttrs.version}"; - hash = "sha256-xil5k+AyJHpDLVvSbtPJOuADRXvdLrHLlC7GRSE4z4s="; + hash = "sha256-5fe+iIPZAKi8aQW2PfanO7U2d70Oc3KvL/RZTV9/ZU8="; }; - cargoHash = "sha256-WLDRJQvzkL1FxD0eXsJmH5wh9QkReaQBBxe7ZFQMWUM="; + cargoHash = "sha256-abTQuKpVcjorr6RQ1t9sAzqvS39XT6lg4fALAqO68YI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-risczero/package.nix b/pkgs/by-name/ca/cargo-risczero/package.nix index 579345d9b265..275fae3c4e6b 100644 --- a/pkgs/by-name/ca/cargo-risczero/package.nix +++ b/pkgs/by-name/ca/cargo-risczero/package.nix @@ -1,6 +1,5 @@ { lib, - stdenv, fetchCrate, fetchurl, rustPlatform, @@ -8,28 +7,31 @@ openssl, nix-update-script, }: +let + # That is from cargoDeps/risc0-circuit-recursion/build.rs + src-recursion-hash = "744b999f0a35b3c86753311c7efb2a0054be21727095cf105af6ee7d3f4d8849"; + src-recursion = fetchurl { + name = "cargo-risczero-recursion-source"; + url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip"; + outputHash = src-recursion-hash; # This hash should be the same as src-recuresion-hash + outputHashAlgo = "sha256"; + }; +in -rustPlatform.buildRustPackage rec { +rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-risczero"; - version = "1.1.2"; + version = "3.0.5"; src = fetchCrate { - inherit pname version; - hash = "sha256-YZ3yhj1VLxl3Fg/yWhqrZXxIQ7oK6Gdo0NU39oDvoo8="; - }; - - src-recursion-hash = "28e4eeff7a8f73d27408d99a1e3e8842c79a5f4353e5117ec0b7ffaa7c193612"; # That is from cargoDeps/risc0-circuit-recursion/build.rs - - src-recursion = fetchurl { - url = "https://risc0-artifacts.s3.us-west-2.amazonaws.com/zkr/${src-recursion-hash}.zip"; - hash = "sha256-KOTu/3qPc9J0CNmaHj6IQseaX0NT5RF+wLf/qnwZNhI="; # This hash should be the same as src-recuresion-hash + inherit (finalAttrs) pname version; + hash = "sha256-1tuY+XoZpilak9gc5vDnRDEB1SK+itBWoGNxwefT6xo="; }; env = { RECURSION_SRC_PATH = src-recursion; }; - cargoHash = "sha256-r2bs1MT2jBK4ATUKyRGLEAFCHNaGnnQ4jbQOKbQbldY="; + cargoHash = "sha256-ayKQvhjYawPEl9ryVmDx4J93/EGPSeKds0mOnkRI2Fo="; nativeBuildInputs = [ pkg-config @@ -39,16 +41,13 @@ rustPlatform.buildRustPackage rec { openssl ]; - # The tests require network access which is not available in sandboxed Nix builds. - doCheck = false; - passthru.updateScript = nix-update-script { }; meta = { description = "Cargo extension to help create, manage, and test RISC Zero projects"; mainProgram = "cargo-risczero"; homepage = "https://risczero.com"; - license = with lib.licenses; [ asl20 ]; - maintainers = with lib.maintainers; [ cameronfyfe ]; + license = lib.licenses.asl20; + maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ca/cargo-rr/package.nix b/pkgs/by-name/ca/cargo-rr/package.nix index f5bed75d5018..df879f130c1e 100644 --- a/pkgs/by-name/ca/cargo-rr/package.nix +++ b/pkgs/by-name/ca/cargo-rr/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.3.0"; src = fetchFromGitHub { - owner = "danielzfranklin"; + owner = "dzfranklin"; repo = "cargo-rr"; rev = "v${finalAttrs.version}"; sha256 = "sha256-t8pRqeOdaRVG0titQhxezT2aDjljSs//MnRTTsJ73Yo="; @@ -33,8 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Cargo subcommand \"rr\": a light wrapper around rr, the time-travelling debugger"; mainProgram = "cargo-rr"; - homepage = "https://github.com/danielzfranklin/cargo-rr"; - license = with lib.licenses; [ mit ]; + homepage = "https://github.com/dzfranklin/cargo-rr"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio matthiasbeyer diff --git a/pkgs/by-name/ca/cargo-sbom/package.nix b/pkgs/by-name/ca/cargo-sbom/package.nix index de854436a5fb..3e6a9514067e 100644 --- a/pkgs/by-name/ca/cargo-sbom/package.nix +++ b/pkgs/by-name/ca/cargo-sbom/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Create software bill of materials (SBOM) for Rust"; homepage = "https://github.com/psastras/sbom-rs"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/ca/cargo-seek/package.nix b/pkgs/by-name/ca/cargo-seek/package.nix index 40c2fe80f0fe..3528637eed59 100644 --- a/pkgs/by-name/ca/cargo-seek/package.nix +++ b/pkgs/by-name/ca/cargo-seek/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-seek"; - version = "0.1.0"; + version = "0.2.0"; src = fetchFromGitHub { owner = "tareqimbasher"; repo = "cargo-seek"; tag = "v${finalAttrs.version}"; - hash = "sha256-SDVAi4h+/ebGX+8M66Oyd0LfQn+J7/QhDW97ZBdoN14="; + hash = "sha256-WL1S2oU3/T9pEI4rgzT2dJ/ZTiwS/BgraW1MmZ5MQl0="; }; - cargoHash = "sha256-DyXRbtvCJte7mCQKusipeikr981vMHPEVYcGSwVI5Kg="; + cargoHash = "sha256-cXZvuMcNGNWU61ll2dAFxPKWujJNzXpC8aP5vxDONkY="; nativeBuildInputs = [ pkg-config ]; @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/tareqimbasher/cargo-seek"; changelog = "https://github.com/tareqimbasher/cargo-seek/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ yvnth ]; mainProgram = "cargo-seek"; }; }) diff --git a/pkgs/by-name/ca/cargo-shear/package.nix b/pkgs/by-name/ca/cargo-shear/package.nix index 08e8f65954c8..d0ee4ba4e9fd 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.12.4"; + version = "1.13.2"; src = fetchCrate { pname = "cargo-shear"; version = finalAttrs.version; - hash = "sha256-nYAZfUh0ZMU0H+Eb5DOHvENCtDWiCLhzuEB3MFAKWpc="; + hash = "sha256-69OwhT4vc4xwvuVxZ0C7F/Us01TsuYJnnTKT6PHsOF8="; }; - cargoHash = "sha256-xJGITXhC02nOky5P5gzUHAmVyiolchcVofDiaHEX14o="; + cargoHash = "sha256-x0lZ8E/P9IaPSdzUo2O3t5qR2I3959So9uaAm4PBM4E="; env = { # https://github.com/Boshen/cargo-shear/blob/v1.6.2/src/lib.rs#L51-L54 @@ -42,7 +42,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "cargo-shear"; homepage = "https://github.com/Boshen/cargo-shear"; changelog = "https://github.com/Boshen/cargo-shear/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.cathalmullan ]; }; }) diff --git a/pkgs/by-name/ca/cargo-show-asm/package.nix b/pkgs/by-name/ca/cargo-show-asm/package.nix index 5714316129c1..039fa3861b06 100644 --- a/pkgs/by-name/ca/cargo-show-asm/package.nix +++ b/pkgs/by-name/ca/cargo-show-asm/package.nix @@ -10,14 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-show-asm"; - version = "0.2.59"; + version = "0.2.62"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-5RNfokTD86OFGzWRUyY29+d5P3sWWHmzGCGdIkzIK/g="; + hash = "sha256-gR1+Daz3EY6HtijWqbaCg6nD2B8gi6EYMYFspW39nlw="; }; - cargoHash = "sha256-EcnxozYMjxFHwLpeYwh5dP18+1tiPsY6uQBie3SCg18="; + cargoHash = "sha256-QpitYFYRkzntVW15PJimVIX6AaIU+qVY7g3Y88GnKkA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ca/cargo-sonar/package.nix b/pkgs/by-name/ca/cargo-sonar/package.nix index 1732402c8734..bd53a609c21d 100644 --- a/pkgs/by-name/ca/cargo-sonar/package.nix +++ b/pkgs/by-name/ca/cargo-sonar/package.nix @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Utility to produce some Sonar-compatible format from different Rust tools like cargo-clippy cargo-audit or cargo-outdated"; mainProgram = "cargo-sonar"; homepage = "https://gitlab.com/woshilapin/cargo-sonar"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.jonboh ]; }; }) diff --git a/pkgs/by-name/ca/cargo-sort-derives/package.nix b/pkgs/by-name/ca/cargo-sort-derives/package.nix index 259010fa1538..59e64b6c92aa 100644 --- a/pkgs/by-name/ca/cargo-sort-derives/package.nix +++ b/pkgs/by-name/ca/cargo-sort-derives/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-sort-derives"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "cargo-sort-derives"; tag = "v${finalAttrs.version}"; - hash = "sha256-91sfRTMcI2/MyTrv+uJmhqfL4KUAc6//yzRR9FxvPHo="; + hash = "sha256-o92jmQ+AYZIadVUMqsZdAq7x1Y4HneWx3RYEVKTVJyM="; }; - cargoHash = "sha256-kQTAYBb/xhrfO3PSJvnZrZKr6B3fgtlElf1mNCSf7eg="; + cargoHash = "sha256-DPjwCzP7nsqJjsERHO3YMUEXbU7TjUTZc8Jo1R9XThg="; meta = { description = "Cargo subcommand to sort derive attributes"; diff --git a/pkgs/by-name/ca/cargo-tally/package.nix b/pkgs/by-name/ca/cargo-tally/package.nix index 78bce4e915c5..202f67d8e835 100644 --- a/pkgs/by-name/ca/cargo-tally/package.nix +++ b/pkgs/by-name/ca/cargo-tally/package.nix @@ -6,14 +6,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tally"; - version = "1.0.74"; + version = "1.0.75"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-JZtELsvxOx6FFQ+l8fbhPnR8Tt+sQWV4fGsoS8ue4QY="; + hash = "sha256-X3VJfzIXxwHPu31wYo79Ei6+S970UHlPPTADlB4CwjI="; }; - cargoHash = "sha256-Vn5OSJNpwE3rjs+tYX784o1Khrcf4f21dvb8Yn/c9bY="; + cargoHash = "sha256-86V96i5DvydXu1mzxRP6hWW3TA25piubcGRYVJIi/x0="; meta = { description = "Graph the number of crates that depend on your crate over time"; diff --git a/pkgs/by-name/ca/cargo-tarpaulin/package.nix b/pkgs/by-name/ca/cargo-tarpaulin/package.nix index 3945643395b6..81118bd6fdd6 100644 --- a/pkgs/by-name/ca/cargo-tarpaulin/package.nix +++ b/pkgs/by-name/ca/cargo-tarpaulin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-tarpaulin"; - version = "0.35.4"; + version = "0.37.0"; src = fetchFromGitHub { owner = "xd009642"; repo = "tarpaulin"; tag = finalAttrs.version; - hash = "sha256-fm9q3VTZh5QKXXw4+t4xngz5gyiZqKpUHShpz0nf2Is="; + hash = "sha256-8LD4huR6xcksxkxF3Axoh5tx3FQgzE8nYVSpeSdY7us="; }; - cargoHash = "sha256-4og97E5zdRIO7swsfgh87MdWh4E4onMIcrCb1/KCJEc="; + cargoHash = "sha256-FH0skHQ0eR9qgoCqDqO+NZZLzBw8U/ijNUupTYexIGI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ca/cargo-tauri/package.nix b/pkgs/by-name/ca/cargo-tauri/package.nix index 997b3d788980..af2ab9087fed 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.11.2"; + version = "2.11.4"; src = fetchFromGitHub { owner = "tauri-apps"; repo = "tauri"; tag = "tauri-cli-v${finalAttrs.version}"; - hash = "sha256-BH/tQlrmCMAab5LqQ/xl9+A5nCnN8sk6mavvAkajYHM="; + hash = "sha256-bYkooyO8msGlewK4zU8NSgGQwAKzc5xfboMakugukBc="; }; - cargoHash = "sha256-QX151ckeSxbZgbFO88zhsvnNnjZffLpR5dDp1Dv1Wlo="; + cargoHash = "sha256-S1t4GsBQ4/ktSvLitb8FufnXwZfwVc9r8z9tCLRDy8Y="; nativeBuildInputs = lib.optionals (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) [ pkg-config diff --git a/pkgs/by-name/ca/cargo-tauri_1/package.nix b/pkgs/by-name/ca/cargo-tauri_1/package.nix deleted file mode 100644 index 167596c9f2fc..000000000000 --- a/pkgs/by-name/ca/cargo-tauri_1/package.nix +++ /dev/null @@ -1,68 +0,0 @@ -{ - lib, - stdenv, - bzip2, - pkg-config, - rustPlatform, - xz, - zstd, - cargo-tauri, -}: - -cargo-tauri.overrideAttrs ( - finalAttrs: oldAttrs: { - version = "1.6.6"; - - src = oldAttrs.src.override { - hash = "sha256-UE/mJ0WdbVT4E1YuUCtu80UB+1WR+KRWs+4Emy3Nclc="; - }; - - patches = [ ]; - - postPatch = ""; - - # Manually specify the sourceRoot since this crate depends on other crates in the workspace. Relevant info at - # https://discourse.nixos.org/t/difficulty-using-buildrustpackage-with-a-src-containing-multiple-cargo-workspaces/10202 - sourceRoot = "${finalAttrs.src.name}/tooling/cli"; - - cargoDeps = rustPlatform.fetchCargoVendor { - inherit (finalAttrs) - pname - version - src - sourceRoot - ; - hash = "sha256-kAaq6Kam3e5n8569Y4zdFEiClI8q97XFX1hBD7NkUqw="; - }; - - nativeBuildInputs = oldAttrs.nativeBuildInputs or [ ] ++ [ pkg-config ]; - - buildInputs = [ - # Required by `zip` in `tauri-bundler` - bzip2 - zstd - ] - # Required by `rpm` in `tauri-bundler` - ++ lib.optionals stdenv.hostPlatform.isLinux [ xz ]; - - env = { - ZSTD_SYS_USE_PKG_CONFIG = true; - }; - - passthru = { - inherit (oldAttrs.passthru) hook gst-plugin; - tests = { inherit (oldAttrs.passthru.tests) version; }; - }; - - meta = { - inherit (oldAttrs.meta) - description - homepage - changelog - license - maintainers - mainProgram - ; - }; - } -) diff --git a/pkgs/by-name/ca/cargo-temp/package.nix b/pkgs/by-name/ca/cargo-temp/package.nix index ce9a144b87b9..186eda0ad93d 100644 --- a/pkgs/by-name/ca/cargo-temp/package.nix +++ b/pkgs/by-name/ca/cargo-temp/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-temp"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "yozhgoor"; repo = "cargo-temp"; rev = "v${finalAttrs.version}"; - hash = "sha256-F7KIYEWZN4KAVoBRquL7/VH0p+MSFGO0n2PkbXljyPM="; + hash = "sha256-5GTsVqQOS0HL2q++t4ms9srFx1t1DJkdyUx150H6CT0="; }; - cargoHash = "sha256-ho5HriiViW2FxxPz4RA1nCkmlG7cdt5VuhVrSdGzzuY="; + cargoHash = "sha256-wiFEsnBHFaQH7WyJv5FEEWXPiRfFFWm8NUjd0ea05Ko="; meta = { description = "CLI tool that allow you to create a temporary new Rust project using cargo with already installed dependencies"; diff --git a/pkgs/by-name/ca/cargo-typify/package.nix b/pkgs/by-name/ca/cargo-typify/package.nix index b292a4632890..74b0a06aadeb 100644 --- a/pkgs/by-name/ca/cargo-typify/package.nix +++ b/pkgs/by-name/ca/cargo-typify/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "JSON Schema to Rust type converter"; homepage = "https://github.com/oxidecomputer/typify"; changelog = "https://github.com/oxidecomputer/typify/blob/${finalAttrs.src.tag}/CHANGELOG.adoc"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "cargo-typify"; }; diff --git a/pkgs/by-name/ca/cargo-update/package.nix b/pkgs/by-name/ca/cargo-update/package.nix index c06c8718e1bc..3edff871f022 100644 --- a/pkgs/by-name/ca/cargo-update/package.nix +++ b/pkgs/by-name/ca/cargo-update/package.nix @@ -16,14 +16,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-update"; - version = "20.0.1"; + version = "22.0.0"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-wV1R95TBPLXzCmE9sjztxJdvwvWxedEQPI5TxZEGUqA="; + hash = "sha256-7SjJ+v+6PzwV8dTXxSVxKrj4/yUlyGVJtt0A+WaWNc8="; }; - cargoHash = "sha256-LsqDwGboCPGrRmpFqy13anszrwE8+VoqRqfm5K3VgM8="; + cargoHash = "sha256-xRjPnZPewo/5pCDUem8+9Ko0XJ1p5HJtLLmErtZQb8w="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ca/cargo-wipe/package.nix b/pkgs/by-name/ca/cargo-wipe/package.nix index 37c4c4ad8273..f93ade472283 100644 --- a/pkgs/by-name/ca/cargo-wipe/package.nix +++ b/pkgs/by-name/ca/cargo-wipe/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = ''Cargo subcommand "wipe": recursively finds and optionally wipes all "target" or "node_modules" folders''; mainProgram = "cargo-wipe"; homepage = "https://github.com/mihai-dinculescu/cargo-wipe"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ otavio ]; }; }) diff --git a/pkgs/by-name/ca/cargo-xwin/package.nix b/pkgs/by-name/ca/cargo-xwin/package.nix index 0cfaa744dda1..4786535a02d2 100644 --- a/pkgs/by-name/ca/cargo-xwin/package.nix +++ b/pkgs/by-name/ca/cargo-xwin/package.nix @@ -6,22 +6,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-xwin"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-xwin"; rev = "v${finalAttrs.version}"; - hash = "sha256-lJu/TyzKDj0yHCP83ouc6e52E48taOTQ9WpWAiqUxl4="; + hash = "sha256-pWaJKk4XgBeY4llRTHvuMg0mAfEV4GFpeWGaM8eYsN4="; }; - cargoHash = "sha256-k3PuEjiew012+m4RRVKNOdxKvFPWIxKHgG/SrBjM2WM="; + cargoHash = "sha256-iO0uAYdi8Vy9gi7lHsGRmhDsVNQCqo4E/nbTfI32jDs="; meta = { description = "Cross compile Cargo project to Windows MSVC target with ease"; mainProgram = "cargo-xwin"; homepage = "https://github.com/rust-cross/cargo-xwin"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ shivaraj-bh ]; }; }) diff --git a/pkgs/by-name/ca/cargo-zigbuild/package.nix b/pkgs/by-name/ca/cargo-zigbuild/package.nix index 115ef44c1b23..e8327d1ba95f 100644 --- a/pkgs/by-name/ca/cargo-zigbuild/package.nix +++ b/pkgs/by-name/ca/cargo-zigbuild/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cargo-zigbuild"; - version = "0.22.3"; + version = "0.23.0"; src = fetchFromGitHub { owner = "rust-cross"; repo = "cargo-zigbuild"; tag = "v${finalAttrs.version}"; - hash = "sha256-f9jmt3UXniXVeX2NyuRx30DrpRtczLO7ZioNi4TI3Zk="; + hash = "sha256-Y73aPGsrSAZVxNJ1r1lS9uXmfpAwthq6NW4urKS8ab0="; }; - cargoHash = "sha256-7ZQpAePAIqSNiKM8bTAhyx4QyDQda1J8TSnZX0W2tfY="; + cargoHash = "sha256-dt2s18B9RVwEBlun5cegoqfW1KYXFqjdScdc/Q2aDlI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix index c74f13db2708..09b794d61339 100644 --- a/pkgs/by-name/ca/cassandra-cpp-driver/package.nix +++ b/pkgs/by-name/ca/cassandra-cpp-driver/package.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation (finalAttrs: { version = "2.17.1"; src = fetchFromGitHub { - owner = "datastax"; - repo = "cpp-driver"; + owner = "apache"; + repo = "cassandra-cpp-driver"; tag = finalAttrs.version; sha256 = "sha256-GuvmKHJknudyn7ahrn/8+kKUA4NW5UjCfkYoX3aTE+Q="; }; @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { library for Apache Cassandra 2.1+ using exclusively Cassandra’s binary protocol and Cassandra Query Language v3. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.x86_64; homepage = "https://docs.datastax.com/en/developer/cpp-driver/"; maintainers = [ lib.maintainers.npatsakula ]; diff --git a/pkgs/by-name/ca/castsponsorskip/package.nix b/pkgs/by-name/ca/castsponsorskip/package.nix new file mode 100644 index 000000000000..457c3f36e7d4 --- /dev/null +++ b/pkgs/by-name/ca/castsponsorskip/package.nix @@ -0,0 +1,40 @@ +{ + fetchFromGitHub, + buildGoModule, + lib, +}: + +buildGoModule (finalAttrs: { + pname = "castsponsorskip"; + version = "0.8.3"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "gabe565"; + repo = "CastSponsorSkip"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qPn753aSKlMdSEEN1QYuS3hDYtjL4Pm07mEKY1kI5Ak="; + }; + + vendorHash = "sha256-ph6rwr4FxuNpFF5DedsrMEnm28xR11bC7EcaNQJcyug="; + + checkFlags = + let + skippedTests = [ + "Test_completeCategories" # Requires network access + ]; + in + [ "-skip=^${builtins.concatStringsSep "$|^" skippedTests}$" ]; + + meta = { + description = "Skip YouTube sponsorships (and sometimes ads) on all local Google Cast devices"; + homepage = "https://github.com/gabe565/CastSponsorSkip"; + mainProgram = "castsponsorskip"; + changelog = "https://github.com/gabe565/CastSponsorSkip/releases"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ + wariuccio + ]; + }; +}) diff --git a/pkgs/by-name/ca/casync/package.nix b/pkgs/by-name/ca/casync/package.nix index 9a1c009ab9b3..0bd0fe6abf62 100644 --- a/pkgs/by-name/ca/casync/package.nix +++ b/pkgs/by-name/ca/casync/package.nix @@ -9,12 +9,10 @@ sphinx, acl, curl, - fuse, libselinux, udev, xz, zstd, - fuseSupport ? true, selinuxSupport ? true, udevSupport ? true, glibcLocales, @@ -39,7 +37,6 @@ stdenv.mkDerivation { xz zstd ] - ++ lib.optionals fuseSupport [ fuse ] ++ lib.optionals selinuxSupport [ libselinux ] ++ lib.optionals udevSupport [ udev ]; nativeBuildInputs = [ @@ -66,10 +63,12 @@ stdenv.mkDerivation { env.PKG_CONFIG_UDEV_UDEVDIR = "lib/udev"; - mesonFlags = - lib.optionals (!fuseSupport) [ "-Dfuse=false" ] - ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] - ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; + mesonFlags = [ + # fuse2 only, https://github.com/systemd/casync/issues/269 + "-Dfuse=false" + ] + ++ lib.optionals (!udevSupport) [ "-Dudev=false" ] + ++ lib.optionals (!selinuxSupport) [ "-Dselinux=false" ]; doCheck = true; preCheck = '' diff --git a/pkgs/by-name/ca/cat9/package.nix b/pkgs/by-name/ca/cat9/package.nix index a06a11131ab4..58c97ca231fd 100644 --- a/pkgs/by-name/ca/cat9/package.nix +++ b/pkgs/by-name/ca/cat9/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/letoram/cat9"; description = "User shell for LASH"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catboost/package.nix b/pkgs/by-name/ca/catboost/package.nix index 197137aa33d9..347904227bf2 100644 --- a/pkgs/by-name/ca/catboost/package.nix +++ b/pkgs/by-name/ca/catboost/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.libcublas ]; diff --git a/pkgs/by-name/ca/catch2_3/package.nix b/pkgs/by-name/ca/catch2_3/package.nix index 525a410dbcba..a00e75d4a29f 100644 --- a/pkgs/by-name/ca/catch2_3/package.nix +++ b/pkgs/by-name/ca/catch2_3/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "catch2"; - version = "3.14.0"; + version = "3.15.2"; src = fetchFromGitHub { owner = "catchorg"; repo = "Catch2"; tag = "v${version}"; - hash = "sha256-tegAa+cNF7pJcW33B+VZ86ZlDG7dwS3o6QnN/XvTI2A="; + hash = "sha256-Fb8dnuaKQwLxYmGDZy38ZsCKk6RwE4PSidD1xmnb1rU="; }; patches = lib.optionals stdenv.cc.isClang [ diff --git a/pkgs/by-name/ca/catdocx/package.nix b/pkgs/by-name/ca/catdocx/package.nix index 69be98201e9d..5c2de4fb9c35 100644 --- a/pkgs/by-name/ca/catdocx/package.nix +++ b/pkgs/by-name/ca/catdocx/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "Extracts plain text from docx files"; mainProgram = "catdocx"; homepage = "https://github.com/jncraton/catdocx"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.michalrus ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ca/catdvi/package.nix b/pkgs/by-name/ca/catdvi/package.nix index 7433873ed170..298fff300310 100644 --- a/pkgs/by-name/ca/catdvi/package.nix +++ b/pkgs/by-name/ca/catdvi/package.nix @@ -19,6 +19,10 @@ in stdenv.mkDerivation (finalAttrs: { pname = "catdvi"; version = "0.14"; + + __structuredAttrs = true; + strictDeps = true; + src = fetchurl { url = with finalAttrs; "http://downloads.sourceforge.net/catdvi/catdvi-${version}.tar.bz2"; hash = "sha256-orVQVdQuRXp//OGkA7xRidNi4+J+tkw398LPZ+HX+k8="; @@ -51,13 +55,9 @@ stdenv.mkDerivation (finalAttrs: { '') buildPlatformTools ); - nativeBuildInputs = [ - texlive.bin.core - texlive.bin.core.dev - ]; - buildInputs = [ tex + texlive.bin.core ]; makeFlags = [ diff --git a/pkgs/by-name/ca/catppuccin-gtk/package.nix b/pkgs/by-name/ca/catppuccin-gtk/package.nix index 256f5d549fe3..f0b16b2eb9b2 100644 --- a/pkgs/by-name/ca/catppuccin-gtk/package.nix +++ b/pkgs/by-name/ca/catppuccin-gtk/package.nix @@ -75,7 +75,10 @@ lib.checkListOfEnum "${pname}: theme accent" validAccents accents lib.checkListO hash = "sha256-q5/VcFsm3vNEw55zq/vcM11eo456SYE5TQA3g2VQjGc="; }; - patches = [ ./fix-inconsistent-theme-name.patch ]; + patches = [ + ./fix-inconsistent-theme-name.patch + ./python-3.14.patch # Fix build with python 3.14+ + ]; nativeBuildInputs = [ gtk3 diff --git a/pkgs/by-name/ca/catppuccin-gtk/python-3.14.patch b/pkgs/by-name/ca/catppuccin-gtk/python-3.14.patch new file mode 100644 index 000000000000..93b4cc868349 --- /dev/null +++ b/pkgs/by-name/ca/catppuccin-gtk/python-3.14.patch @@ -0,0 +1,20 @@ +diff --git a/sources/build/args.py b/sources/build/args.py +index 38a0a12..9221dec 100644 +--- a/sources/build/args.py ++++ b/sources/build/args.py +@@ -84,7 +84,6 @@ def parse_args(): + parser.add_argument( + "--zip", + help="Whether to bundle the theme into a zip", +- type=bool, + default=False, + action=argparse.BooleanOptionalAction, + ) +@@ -92,7 +91,6 @@ def parse_args(): + parser.add_argument( + "--patch", + help="Whether to patch the colloid submodule", +- type=bool, + default=True, + action=argparse.BooleanOptionalAction, + ) diff --git a/pkgs/by-name/ca/catppuccin/package.nix b/pkgs/by-name/ca/catppuccin/package.nix index d38502cc5d7f..7f35e06af773 100644 --- a/pkgs/by-name/ca/catppuccin/package.nix +++ b/pkgs/by-name/ca/catppuccin/package.nix @@ -4,6 +4,7 @@ let "bat" "bottom" "btop" + "delta" "element" "grub" "hyprland" @@ -90,6 +91,14 @@ let hash = "sha256-mEGZwScVPWGu+Vbtddc/sJ+mNdD2kKienGZVUcTSl+c="; }; + delta = fetchFromGitHub { + name = "delta"; + owner = "catppuccin"; + repo = "delta"; + rev = "011516f5d14f66b771b3e716f29c77231e008c74"; + hash = "sha256-lztkxX9O41YossvRzpR7tqxMhDNT1Efy2JvkCwtsiXQ="; + }; + element = fetchFromGitHub { name = "element"; owner = "catppuccin"; @@ -268,6 +277,11 @@ lib.checkListOfEnum "${pname}: variant" validVariants [ variant ] lib.checkListO mkdir -p "$out/bottom" cp "${sources.bottom}/themes/${variant}.toml" "$out/bottom" + '' + + lib.optionalString (lib.elem "delta" themeList) '' + mkdir -p "$out/delta" + cp "${sources.delta}/catppuccin.gitconfig" "$out/delta" + '' + lib.optionalString (lib.elem "element" themeList) '' mkdir -p "$out/element" diff --git a/pkgs/by-name/cb/cbconvert/package.nix b/pkgs/by-name/cb/cbconvert/package.nix index 90ce62162bf3..6cdc7255a448 100644 --- a/pkgs/by-name/cb/cbconvert/package.nix +++ b/pkgs/by-name/cb/cbconvert/package.nix @@ -54,7 +54,7 @@ buildGoModule (finalAttrs: { description = "Comic Book converter"; homepage = "https://github.com/gen2brain/cbconvert"; changelog = "https://github.com/gen2brain/cbconvert/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ jwillikers ]; mainProgram = "cbconvert"; diff --git a/pkgs/by-name/cb/cbmc/package.nix b/pkgs/by-name/cb/cbmc/package.nix index ee3d677c0063..192a42a18d6d 100644 --- a/pkgs/by-name/cb/cbmc/package.nix +++ b/pkgs/by-name/cb/cbmc/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cbmc"; - version = "6.9.0"; + version = "6.10.0"; src = fetchFromGitHub { owner = "diffblue"; repo = "cbmc"; tag = "cbmc-${finalAttrs.version}"; - hash = "sha256-SMJBnzoyTwcwJa9L2X1iX2W4Z/Mwoirf8EXfoyG0dRI="; + hash = "sha256-GCagpb2TFhOEH+lzMth+PWiJxlEw0L+H1DYUEQoMF3g="; }; srcglucose = fetchFromGitHub { diff --git a/pkgs/by-name/cb/cbonsai/package.nix b/pkgs/by-name/cb/cbonsai/package.nix index ef13aaee2050..104b3045a3a1 100644 --- a/pkgs/by-name/cb/cbonsai/package.nix +++ b/pkgs/by-name/cb/cbonsai/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Grow bonsai trees in your terminal"; mainProgram = "cbonsai"; homepage = "https://gitlab.com/jallbrit/cbonsai"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cc/cc-switch/package.nix b/pkgs/by-name/cc/cc-switch/package.nix index 902b3fbdc363..610ac757c695 100644 --- a/pkgs/by-name/cc/cc-switch/package.nix +++ b/pkgs/by-name/cc/cc-switch/package.nix @@ -4,9 +4,10 @@ rustPlatform, fetchFromGitHub, - copyDesktopItems, + cargo-tauri, jq, - makeDesktopItem, + makeBinaryWrapper, + moreutils, nodejs, pkg-config, pnpm_10, @@ -25,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cc-switch"; - version = "3.16.1"; + version = "3.16.5"; __structuredAttrs = true; strictDeps = true; @@ -34,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "farion1231"; repo = "cc-switch"; tag = "v${finalAttrs.version}"; - hash = "sha256-9X7/5/6YPDGr31ZUwx+ZzujFCRiTlKN8Y/qOTtj7OyE="; + hash = "sha256-CrUoTfGAy+gi3gdcSlNyjwM2Rm4nahqDWdM6I9OQgPc="; }; pnpmDeps = fetchPnpmDeps { @@ -48,7 +49,17 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-Vs+/KLICqciF7dnC3iRH9TFzNCtXDgOkWFPLxdwA0rE="; }; - postPatch = lib.optionalString (!stdenv.hostPlatform.isDarwin) '' + postPatch = '' + jq ' + del(.build.beforeBuildCommand) | + .bundle.createUpdaterArtifacts = false | + .plugins.updater.endpoints = [] + ' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + jq '.bundle.macOS.signingIdentity = null' src-tauri/tauri.conf.json | sponge src-tauri/tauri.conf.json + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' # libappindicator-sys dlopens libayatana-appindicator3.so.1 at runtime; autoPatchelf can't catch it. substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ --replace-fail "libayatana-appindicator3.so.1" "${libayatana-appindicator}/lib/libayatana-appindicator3.so.1" @@ -57,21 +68,25 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-Uy85VwcPv3NVxGDe4ojfArHg5kgOe4cjrHdmgnD/eiM="; + cargoHash = "sha256-gX32xCiVKHQ0BIIB9GyWHessIW30zbTcMZLtPJycxn8="; nativeBuildInputs = [ + cargo-tauri.hook jq + moreutils nodejs pnpmConfigHook pnpm_10 ] - ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ - copyDesktopItems + ++ lib.optionals stdenv.hostPlatform.isLinux [ pkg-config wrapGAppsHook3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeBinaryWrapper ]; - buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glib-networking libayatana-appindicator libsoup_3 @@ -80,49 +95,26 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; # tauri-build embeds frontendDist (../dist) at compile time; populate it - # before cargo build runs. + # before cargo tauri build runs (beforeBuildCommand is stripped in postPatch). preBuild = '' pnpm run build:renderer ''; - # cc_switch_lib is an internal staticlib+cdylib+rlib; only the binary is needed. - # tauri/custom-protocol enables embedded-asset serving via `tauri://localhost/`; - # without it, WKWebView/webkit2gtk fall through to devUrl (http://localhost:3000) - # and blank-screen with NSURLErrorCannotConnectToHost. - cargoBuildFlags = [ - "--bin" - "cc-switch" - "--features=tauri/custom-protocol" - ]; + # Upstream Cargo.lock resolves newer tauri crates than the pinned npm packages + # (e.g. tauri 2.10 vs @tauri-apps/api 2.8). cargo tauri build errors on that; + # the previous cargo-only packaging already shipped this combination. + tauriBuildFlags = [ "--ignore-version-mismatches" ]; # Proxy startup test binds to a local address, which the darwin sandbox blocks. checkFlags = lib.optionals stdenv.hostPlatform.isDarwin [ "--skip=services::provider::tests::update_current_claude_provider_syncs_live_when_proxy_takeover_detected_without_backup" ]; - postInstall = '' - rm -rf $out/lib - install -Dm644 src-tauri/icons/32x32.png $out/share/icons/hicolor/32x32/apps/cc-switch.png - install -Dm644 src-tauri/icons/128x128.png $out/share/icons/hicolor/128x128/apps/cc-switch.png - install -Dm644 src-tauri/icons/128x128@2x.png $out/share/icons/hicolor/256x256/apps/cc-switch.png + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$out/bin" + makeWrapper "$out/Applications/CC Switch.app/Contents/MacOS/cc-switch" "$out/bin/cc-switch" ''; - desktopItems = [ - (makeDesktopItem { - name = "cc-switch"; - desktopName = "CC Switch"; - exec = finalAttrs.meta.mainProgram; - icon = "cc-switch"; - comment = finalAttrs.meta.description; - categories = [ - "Development" - "Utility" - ]; - mimeTypes = [ "x-scheme-handler/ccswitch" ]; - startupWMClass = "cc-switch"; - }) - ]; - passthru.updateScript = nix-update-script { }; meta = { @@ -132,7 +124,10 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/farion1231/cc-switch/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; mainProgram = "cc-switch"; - maintainers = with lib.maintainers; [ imcvampire ]; - platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ + imcvampire + kenis1108 + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/cc/cc-token/package.nix b/pkgs/by-name/cc/cc-token/package.nix index 8b45cad9987c..f8b55eed206d 100644 --- a/pkgs/by-name/cc/cc-token/package.nix +++ b/pkgs/by-name/cc/cc-token/package.nix @@ -7,7 +7,7 @@ buildGoModule { pname = "cc-token"; - version = "unstable-2025-12-04"; + version = "1.1.2-unstable-2025-12-04"; src = fetchFromGitHub { owner = "iota-uz"; diff --git a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch b/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch deleted file mode 100644 index c000d1eed8a9..000000000000 --- a/pkgs/by-name/cc/ccextractor/fix-avcodec-close.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/lib_ccx/hardsubx.c b/src/lib_ccx/hardsubx.c -index 20b4388..fa6b5fa 100644 ---- a/src/lib_ccx/hardsubx.c -+++ b/src/lib_ccx/hardsubx.c -@@ -125,7 +125,7 @@ int hardsubx_process_data(struct lib_hardsubx_ctx *ctx, struct lib_ccx_ctx *ctx_ - if (ctx->frame) - av_frame_free(&ctx->frame); - if (ctx->rgb_frame) - av_frame_free(&ctx->rgb_frame); -- avcodec_close(ctx->codec_ctx); -+ avcodec_free_context(&ctx->codec_ctx); - avformat_close_input(&ctx->format_ctx); - } diff --git a/pkgs/by-name/cc/ccextractor/package.nix b/pkgs/by-name/cc/ccextractor/package.nix index 0db6e5fc7165..6a9502ee0b17 100644 --- a/pkgs/by-name/cc/ccextractor/package.nix +++ b/pkgs/by-name/cc/ccextractor/package.nix @@ -31,24 +31,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "ccextractor"; - version = "0.94-unstable-2025-05-20"; + version = "0.96.6"; src = fetchFromGitHub { owner = "CCExtractor"; repo = "ccextractor"; - rev = "407d0f4e93611c5b0ceb14b7fc01d4a4c2e90433"; - hash = "sha256-BfsQmCNB4HRafqJ3pC2ECiwhOgwKuIqiLjr2/bvHr7Q="; + rev = "v${finalAttrs.version}"; + hash = "sha256-nvfQX+1pM16ll7ruXcB22fWn2zQvmpUzKhD3vznEcbI="; }; patches = [ - ./remove-default-commit-hash.patch ./remove-vendored-libraries.patch - ./fix-avcodec-close.patch - (fetchpatch { - name = "CVE-2026-2245.patch"; - url = "https://github.com/CCExtractor/ccextractor/commit/fd7271bae238ccb3ae8a71304ea64f0886324925.patch"; - hash = "sha256-wZiJob5v4SVa5YBmiHuNvgphSi4PhTTb3hg4vs1lhVg="; - }) ] ++ finalAttrs.cargoDeps.vendorStaging.patches; @@ -58,8 +51,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src cargoRoot; - patches = [ ./use-rsmpeg-0.15.patch ]; - hash = "sha256-68Y8nzPHxhVIRHoPXOy9tc71177lCBuOf//z3cqyDGQ="; + hash = "sha256-0FPxU3rUoT3/Xy3mQjjQGmxkNjs++sQxjCJ1/UuRQlc="; }; nativeBuildInputs = [ @@ -94,10 +86,6 @@ stdenv.mkDerivation (finalAttrs: { # The tests are all part of one `cargo test` invocation, so let’s # get the output from it. (lib.cmakeFeature "CMAKE_CTEST_ARGUMENTS" "--verbose") - - # TODO: This (and the corresponding patch) should probably be - # removed for the next stable release. - (lib.cmakeFeature "GIT_COMMIT_HASH" finalAttrs.src.rev) ] ++ lib.optionals enableOcr [ (lib.cmakeBool "WITH_OCR" true) @@ -140,7 +128,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = lib.optionalString enableOcr '' substituteInPlace src/lib_ccx/ocr.c \ - --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share"' + --replace-fail 'getenv("TESSDATA_PREFIX")' '"${tesseract}/share/"' ''; meta = { diff --git a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch b/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch deleted file mode 100644 index 07872941084e..000000000000 --- a/pkgs/by-name/cc/ccextractor/remove-default-commit-hash.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index d7fdda02e3...2738cab631 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -24,9 +24,6 @@ - OUTPUT_VARIABLE GIT_COMMIT_HASH - OUTPUT_STRIP_TRAILING_WHITESPACE - ) --ELSE(EXISTS "${BASE_PROJ_DIR}/.git") -- set(GIT_BRANCH "Unknown") -- set(GIT_COMMIT_HASH "Unknown") - ENDIF(EXISTS "${BASE_PROJ_DIR}/.git") - - #Get the date diff --git a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch index 122707c7f21e..a5f2090ae42e 100644 --- a/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch +++ b/pkgs/by-name/cc/ccextractor/remove-vendored-libraries.patch @@ -1,13 +1,12 @@ diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 2738cab631...5bb2b7d17a 100644 +index 95e27199..a1695a3f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -48,93 +48,20 @@ +@@ -49,74 +49,14 @@ endif() include_directories(${PROJECT_SOURCE_DIR}) include_directories(${PROJECT_SOURCE_DIR}/lib_ccx) include_directories(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi) -include_directories(${PROJECT_SOURCE_DIR}/thirdparty) --include_directories(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c) include_directories(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash) -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/libpng) @@ -27,13 +26,11 @@ index 2738cab631...5bb2b7d17a 100644 -include_directories(${PROJECT_SOURCE_DIR}/thirdparty/freetype/include) aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/lib_hash/ SOURCEFILE) -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/libpng/ SOURCEFILE) --aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/ SOURCEFILE) -aux_source_directory(${PROJECT_SOURCE_DIR}/thirdparty/zlib/ SOURCEFILE) aux_source_directory(${PROJECT_SOURCE_DIR}/lib_ccx/zvbi/ SOURCEFILE) -set(UTF8PROC_SOURCE ${PROJECT_SOURCE_DIR}/thirdparty/utf8proc/utf8proc.c) -+set(UTF8PROC_SOURCE) - +- -set(FREETYPE_SOURCE - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/autofit/autofit.c - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/base/ftbase.c @@ -77,10 +74,13 @@ index 2738cab631...5bb2b7d17a 100644 - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/type42/type42.c - ${PROJECT_SOURCE_DIR}/thirdparty/freetype/winfonts/winfnt.c - ) ++set(UTF8PROC_SOURCE) ++ +set(FREETYPE_SOURCE) #Windows specific libraries and linker flags if(WIN32) - include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_spec_incld/") + if(NOT MINGW) +@@ -125,17 +65,6 @@ if(WIN32) include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/") aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/win_iconv/" SOURCEFILE) set (EXTRA_LIBS ${EXTRA_LIBS} ws2_32 winmm Bcrypt) @@ -98,21 +98,11 @@ index 2738cab631...5bb2b7d17a 100644 endif(WIN32) if(MSVC) -@@ -212,9 +139,6 @@ - pkg_check_modules (NANOMSG REQUIRED libnanomsg) - set (EXTRA_LIBS ${EXTRA_LIBS} ${NANOMSG_STATIC_LIBRARIES}) - -- include_directories ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/") -- aux_source_directory ("${PROJECT_SOURCE_DIR}/thirdparty/protobuf-c/" SOURCEFILE) -- - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_SHARING") - endif (PKG_CONFIG_FOUND AND WITH_SHARING) - diff --git a/src/lib_ccx/CMakeLists.txt b/src/lib_ccx/CMakeLists.txt -index 4f329bcaab...a334d20c4d 100644 +index a891560b..154c1c15 100644 --- a/src/lib_ccx/CMakeLists.txt +++ b/src/lib_ccx/CMakeLists.txt -@@ -13,9 +13,39 @@ +@@ -13,9 +13,39 @@ endif(WIN32) find_package(PkgConfig) pkg_check_modules (GPAC REQUIRED gpac) @@ -152,16 +142,16 @@ index 4f329bcaab...a334d20c4d 100644 if (WITH_FFMPEG) find_package(PkgConfig) -@@ -94,7 +124,7 @@ - set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DDISABLE_RUST") - endif (WITHOUT_RUST) +@@ -87,7 +117,7 @@ if (WITH_HARDSUBX) + set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DENABLE_HARDSUBX") + endif (WITH_HARDSUBX) -file (GLOB HeaderFiles *.h) +file (GLOB_RECURSE HeaderFiles *.h) file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" "includedir=\${prefix}/include\n" "libdir=\${prefix}/lib\n\n" -@@ -102,8 +132,8 @@ +@@ -95,8 +125,8 @@ file (WRITE ccx.pc "prefix=${CMAKE_INSTALL_PREFIX}\n" "Description: Closed Caption Extraction library\n" "Version: 0.75\n" "Cflags: -I\${includedir}/\n" @@ -172,16 +162,3 @@ index 4f329bcaab...a334d20c4d 100644 ) install (TARGETS ccx DESTINATION lib) -diff --git a/src/lib_ccx/params.c b/src/lib_ccx/params.c -index eb1562e50c...984070a285 100644 ---- a/src/lib_ccx/params.c -+++ b/src/lib_ccx/params.c -@@ -14,7 +14,7 @@ - #include "../lib_hash/sha2.h" - #include - #include --#include -+#include - - #ifdef ENABLE_OCR - #include diff --git a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch b/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch deleted file mode 100644 index 2f5fe1eac532..000000000000 --- a/pkgs/by-name/cc/ccextractor/use-rsmpeg-0.15.patch +++ /dev/null @@ -1,42 +0,0 @@ -diff --git a/src/rust/Cargo.lock b/src/rust/Cargo.lock -index 5c49573775..3e855aa637 100644 ---- a/src/rust/Cargo.lock -+++ b/src/rust/Cargo.lock -@@ -665,11 +665,10 @@ - - [[package]] - name = "rsmpeg" --version = "0.14.2+ffmpeg.6.1" -+version = "0.15.1+ffmpeg.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "927012cd6ae43519f519741f4a69602ce3a47cf84750784da124dffd03527cc0" -+checksum = "d3ffbead667d06e0c77c4363f83d49a3481cc3838bc9a61882aa07b01e3f63e1" - dependencies = [ -- "libc", - "paste", - "rusty_ffmpeg", - "thiserror", -@@ -711,9 +710,9 @@ - - [[package]] - name = "rusty_ffmpeg" --version = "0.13.3+ffmpeg.6.1" -+version = "0.14.1+ffmpeg.7.0" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "716adffa5f909c8533611b1dab9ab5666bece35687845865b75ed6a990fc239c" -+checksum = "40f4db8e3e23d4a3044d53a41aba5324eae70d3e7fe82375ce833521533bc315" - dependencies = [ - "bindgen 0.69.4", - "camino", -diff --git a/src/rust/Cargo.toml b/src/rust/Cargo.toml -index 4c1e73dcf0..68502915dc 100644 ---- a/src/rust/Cargo.toml -+++ b/src/rust/Cargo.toml -@@ -15,7 +15,7 @@ - env_logger = "0.8.4" - palette = "0.6.1" --rsmpeg = { version = "0.14.2", optional = true, features = [ -+rsmpeg = { version = "0.15.1", optional = true, features = [ - "link_system_ffmpeg", - ] } - tesseract-sys = { version = "0.5.15", optional = true, default-features = false } diff --git a/pkgs/by-name/cc/ccusage/package.nix b/pkgs/by-name/cc/ccusage/package.nix new file mode 100644 index 000000000000..cad32ecb86ea --- /dev/null +++ b/pkgs/by-name/cc/ccusage/package.nix @@ -0,0 +1,107 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + fetchurl, + pkg-config, + apple-sdk_15, + libiconv, + versionCheckHook, + nix-update-script, + runCommand, + jq, +}: + +let + # ccusage embeds the LiteLLM model-pricing table at build time. Its build + # script otherwise downloads this file from the network, which fails in the + # sandbox. Upstream pins the data via a flake input and points + # CCUSAGE_PRICING_JSON_PATH at it; mirror that exact revision here so the + # build is offline and reproducible (see package.nix + flake.lock in the + # upstream repo at tag v20.0.6). Bump this revision together with the package + # version; nix-update only refreshes the src and cargo hashes. + litellmPricing = fetchurl { + url = "https://raw.githubusercontent.com/BerriAI/litellm/f27df8d516802ce4c1b32973992154fe83b851cf/model_prices_and_context_window.json"; + hash = "sha256-zJa6H2EwP9s+hMVs78Y+hwo4UX1dHRtvX5J3MdGh5aI="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ccusage"; + version = "20.0.6"; + + src = fetchFromGitHub { + owner = "ccusage"; + repo = "ccusage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uf/FlPprxx4jh74YwjmYMtoIHpTkKrWTLetbNoYiFv4="; + }; + + # The Cargo workspace lives in rust/, not at the repo root. + cargoRoot = "rust"; + buildAndTestSubdir = "rust"; + + cargoHash = "sha256-izA2Gs5nPmt0zn6/e1xM80vyyQHYKGEUDpUFRpyFiB8="; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + libiconv + ]; + + env.CCUSAGE_PRICING_JSON_PATH = "${litellmPricing}"; + + # Build only the ccusage binary out of the multi-crate workspace. + cargoBuildFlags = [ + "-p" + "ccusage" + "--bin" + "ccusage" + ]; + + # Upstream disables the test suite in its own Nix build; parts of it rely on + # network access and live pricing data. versionCheckHook still exercises the + # built binary below. + doCheck = false; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + + tests = { + # With no agent data on disk, ccusage must still emit a valid, empty JSON + # report. --offline keeps it from reaching the network, exercising the + # pricing table baked in at build time. This guards the data discovery, + # JSON serialization, and offline-pricing paths without needing fixtures. + smoke = + runCommand "ccusage-smoke-test" + { + nativeBuildInputs = [ + finalAttrs.finalPackage + jq + ]; + } + '' + export HOME="$(mktemp -d)" + ccusage daily --json --offline > report.json + jq -e '.daily == [] and .totals.totalTokens == 0' report.json + touch "$out" + ''; + }; + }; + + meta = { + description = "Analyze coding agent CLI token usage and costs from local data"; + homepage = "https://github.com/ccusage/ccusage"; + changelog = "https://github.com/ccusage/ccusage/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ thrix ]; + mainProgram = "ccusage"; + }; +}) diff --git a/pkgs/by-name/cd/cddl/Gemfile b/pkgs/by-name/cd/cddl/Gemfile index 2ba729084f1a..c6ecd4761427 100644 --- a/pkgs/by-name/cd/cddl/Gemfile +++ b/pkgs/by-name/cd/cddl/Gemfile @@ -1,2 +1,4 @@ source 'https://rubygems.org' gem 'cddl' + +gem "base64", "~> 0.2.0" diff --git a/pkgs/by-name/cd/cddl/Gemfile.lock b/pkgs/by-name/cd/cddl/Gemfile.lock index 660d6aaf3955..3e50a9115688 100644 --- a/pkgs/by-name/cd/cddl/Gemfile.lock +++ b/pkgs/by-name/cd/cddl/Gemfile.lock @@ -2,20 +2,21 @@ GEM remote: https://rubygems.org/ specs: abnc (0.1.1) - abnftt (0.2.6) + abnftt (0.2.10) base32 (0.3.4) base45_lite (1.0.1) + base64 (0.2.0) cbor-canonical (0.1.2) cbor-deterministic (0.1.3) - cbor-diag (0.9.5) + cbor-diag (0.9.7) cbor-canonical cbor-deterministic cbor-packed json_pure neatjson treetop (~> 1) - cbor-packed (0.1.5) - cddl (0.12.9) + cbor-packed (0.2.2) + cddl (0.12.11) abnc (~> 0.1.1) abnftt base32 (~> 0.3) @@ -31,14 +32,15 @@ GEM polyglot (0.3.5) regexp-examples (1.5.1) scanf (1.0.0) - treetop (1.6.12) + treetop (1.6.14) polyglot (~> 0.3) PLATFORMS ruby DEPENDENCIES + base64 (~> 0.2.0) cddl BUNDLED WITH - 2.5.22 + 2.6.6 diff --git a/pkgs/by-name/cd/cddl/gemset.nix b/pkgs/by-name/cd/cddl/gemset.nix index 5fbac5e7868f..79a423bc148a 100644 --- a/pkgs/by-name/cd/cddl/gemset.nix +++ b/pkgs/by-name/cd/cddl/gemset.nix @@ -14,10 +14,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1r9ay1kxn2yh9h0j2hr7iszz7cprpc7s6yjsv2k4inxndbsw5y4v"; + sha256 = "08k659idrl977g1anlff32g9cp3rykjvk05n4nifr8jxzdczzv0r"; type = "gem"; }; - version = "0.2.6"; + version = "0.2.10"; }; base32 = { groups = [ "default" ]; @@ -39,6 +39,16 @@ }; version = "1.0.1"; }; + base64 = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + type = "gem"; + }; + version = "0.2.0"; + }; cbor-canonical = { groups = [ "default" ]; platforms = [ ]; @@ -72,20 +82,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gxfs63jgvhdkfpm97mxpz14gxsvqds5pza8i175bmsqwvx3zn87"; + sha256 = "1psh00k5s19yhxajskdqlxfamyf1piriyzm1nrcjlqcjl0863j8l"; type = "gem"; }; - version = "0.9.5"; + version = "0.9.7"; }; cbor-packed = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1dijyj7rivi39h34f32fx7k4xvngldf569i0372n1z6w01nv761l"; + sha256 = "0sbbz0p17m77xqmh4fv4rwly1cj799hapdsg4h43kwsw8h0rnk8n"; type = "gem"; }; - version = "0.1.5"; + version = "0.2.2"; }; cddl = { dependencies = [ @@ -103,10 +113,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1811vvf73jjcxifq8h2cyp0b2z2qwhkplmrc2javx7gwrxlgb2p4"; + sha256 = "1qd398qll4xjbfaim4smvm61ffkx95hbp8l8ma6ss5hk75gr13pz"; type = "gem"; }; - version = "0.12.9"; + version = "0.12.11"; }; colorize = { groups = [ "default" ]; @@ -174,9 +184,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0adc8qblz8ii668r3rksjx83p675iryh52rvdvysimx2hkbasj7d"; + sha256 = "1m5fqy7vq6y7bgxmw7jmk7y6pla83m16p7lb41lbqgg53j8x2cds"; type = "gem"; }; - version = "1.6.12"; + version = "1.6.14"; }; } diff --git a/pkgs/by-name/cd/cdemu-client/package.nix b/pkgs/by-name/cd/cdemu-client/package.nix index 9e409d46fb4c..f5915f76ef43 100644 --- a/pkgs/by-name/cd/cdemu-client/package.nix +++ b/pkgs/by-name/cd/cdemu-client/package.nix @@ -11,11 +11,11 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "cdemu-client"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/cdemu/cdemu-client-${finalAttrs.version}.tar.xz"; - hash = "sha256-WiKm00ZKUDeHX6RII4+JKruAzUyWzZWyI0iZeDqksnA="; + hash = "sha256-26KMd2NtoMHG2AJgPGSJTgcshfSyJzW0dUipmA3NGlw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdemu-daemon/package.nix b/pkgs/by-name/cd/cdemu-daemon/package.nix index f25748b01c85..95eb42f7e75c 100644 --- a/pkgs/by-name/cd/cdemu-daemon/package.nix +++ b/pkgs/by-name/cd/cdemu-daemon/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdemu-daemon"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/cdemu/cdemu-daemon-${finalAttrs.version}.tar.xz"; - hash = "sha256-AYHjiOAQdu685gc6p0j2QNtCmTYTWix1kzWQZYvGPWU="; + hash = "sha256-rkhxivVGQ2lsCUQEXJupDenj74E3shQXExhTWysf+qo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdk-go/package.nix b/pkgs/by-name/cd/cdk-go/package.nix index 3774c2a61ecf..87ba783893a7 100644 --- a/pkgs/by-name/cd/cdk-go/package.nix +++ b/pkgs/by-name/cd/cdk-go/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Container penetration toolkit"; homepage = "https://github.com/cdk-team/CDK"; changelog = "https://github.com/cdk-team/CDK/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cdk"; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 diff --git a/pkgs/by-name/cd/cdk8s-cli/package.nix b/pkgs/by-name/cd/cdk8s-cli/package.nix index 58760a0b3536..2c9d4a8d20ab 100644 --- a/pkgs/by-name/cd/cdk8s-cli/package.nix +++ b/pkgs/by-name/cd/cdk8s-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdk8s-cli"; - version = "2.207.1"; + version = "2.207.41"; src = fetchFromGitHub { owner = "cdk8s-team"; repo = "cdk8s-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-Sw6BcUWnFS1/BOsLLm1Pi+z6kqEveZbGmY9UAWA6bJc="; + hash = "sha256-O1L5cHw8Rrj7bwHJ1tH7idKivSPHyV/9ma8iQ5w87OY="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-LY4rk9JQkoDW3YXlofuTepcGd1D4zuWnxHeSzlXL+wM="; + hash = "sha256-ShQbJUhLfgPEYHtQ7XgvXuYNt5xOjzT7VorbBLT21us="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cd/cdktn-cli/package.nix b/pkgs/by-name/cd/cdktn-cli/package.nix index 404b0f16b517..ff20b260f462 100644 --- a/pkgs/by-name/cd/cdktn-cli/package.nix +++ b/pkgs/by-name/cd/cdktn-cli/package.nix @@ -19,18 +19,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cdktn-cli"; - version = "0.23.0"; + version = "0.23.3"; src = fetchFromGitHub { owner = "open-constructs"; repo = "cdk-terrain"; tag = "v${finalAttrs.version}"; - hash = "sha256-qBpdeIa4V5hfVbkwa+5gHszSwqXJej0k0BdVImTdwt8="; + hash = "sha256-k3xAaJiqldRZubAFrRuNM1e+3kH/5vv0maEeT/gdqK0="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-H8UnrCZx9yjKn7YxRqv+uJ73fw/ngPFI6zdayUizo1k="; + hash = "sha256-9nhv31ljJ8DphOot3TAsYhbV6cx7Ovfe+ll+V2vJWx8="; }; hcl2json-go-modules = @@ -114,7 +114,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck # Skip tests that require terraform (unfree) - yarn --offline workspace cdktn-cli test -- \ + yarn --offline workspace cdktn-cli jest \ --testPathIgnorePatterns \ "src/test/cmds/(convert|init).test.ts" diff --git a/pkgs/by-name/cd/cdncheck/package.nix b/pkgs/by-name/cd/cdncheck/package.nix index 06d2ec65d2fe..dcd0e0b05fb8 100644 --- a/pkgs/by-name/cd/cdncheck/package.nix +++ b/pkgs/by-name/cd/cdncheck/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "cdncheck"; - version = "1.2.39"; + version = "1.2.44"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "cdncheck"; tag = "v${finalAttrs.version}"; - hash = "sha256-zBxNONUM5/7i7qmLzCl/xWadbP9FO9xWD/j96ncyIBo="; + hash = "sha256-8Lte+arj2nqEU8WmaX4bf/WOJV6bdMLskm0BqSyBOuE="; }; vendorHash = "sha256-iJ1agL7sZ3ZKbW1wMA+qi8FgHdPa6gZLQ5BBPKJTNaQ="; diff --git a/pkgs/by-name/cd/cdparanoia-iii/freebsd.patch b/pkgs/by-name/cd/cdparanoia-iii/freebsd.patch new file mode 100644 index 000000000000..a66482a91e5a --- /dev/null +++ b/pkgs/by-name/cd/cdparanoia-iii/freebsd.patch @@ -0,0 +1,45 @@ +From 368ea1fcdf4e8f9a5de4e7ade590242292ccb8fa Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 15 Jun 2026 18:40:07 +0200 +Subject: [PATCH] Fix designated initializers in memcpy arguments + +On FreeBSD, memcpy is a macro, and the lack of parentheses causes a +compilation failure. +--- + interface/scsi_interface.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/interface/scsi_interface.c b/interface/scsi_interface.c +index adbb9bf..7805559 100644 +--- a/interface/scsi_interface.c ++++ b/interface/scsi_interface.c +@@ -674,7 +674,7 @@ static int scsi_read_toc (cdrom_drive *d){ + } + + for (i = first; i <= last; i++){ +- memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); ++ memcpy(cmd, ((char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}), 10); + cmd[1]=d->lun<<5; + cmd[6]=i; + +@@ -695,7 +695,7 @@ static int scsi_read_toc (cdrom_drive *d){ + } + } + +- memcpy(cmd, (char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}, 10); ++ memcpy(cmd, ((char []){ 0x43, 0, 0, 0, 0, 0, 0, 0, 12, 0}), 10); + cmd[1]=d->lun<<5; + cmd[6]=0xAA; + +@@ -745,7 +745,7 @@ static int scsi_read_toc2 (cdrom_drive *d){ + } + + for (i = 0; i < tracks; i++){ +- memcpy(cmd, (char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 10); ++ memcpy(cmd, ((char[]){ 0xe5, 0, 0, 0, 0, 0, 0, 0, 0, 0}), 10); + cmd[5]=i+1; + cmd[8]=255; + +-- +2.54.0 + diff --git a/pkgs/by-name/cd/cdparanoia-iii/package.nix b/pkgs/by-name/cd/cdparanoia-iii/package.nix index 39d5bfb97b32..de38e46763c3 100644 --- a/pkgs/by-name/cd/cdparanoia-iii/package.nix +++ b/pkgs/by-name/cd/cdparanoia-iii/package.nix @@ -62,9 +62,10 @@ stdenv.mkDerivation (finalAttrs: { url = "https://salsa.debian.org/optical-media-team/cdparanoia/-/raw/f7bab3024c5576da1fdb7497abbd6abc8959a98c/debian/patches/04-endian.patch"; hash = "sha256-krfprwls0L3hsNfoj2j69J5k1RTKEQtzE0fLYG9EJKo="; }) + ./freebsd.patch ] ++ lib.optional stdenv.hostPlatform.isMusl ./utils.patch - ++ [ + ++ lib.optional (!stdenv.hostPlatform.isDarwin) [ (fetchpatch { url = "https://raw.githubusercontent.com/freebsd/freebsd-ports/42da4cdf2d9161fea8f7cdfc19aefda7707fadf4/audio/cdparanoia/files/patch-interface_low__interface.h"; hash = "sha256-bXrcRFCbU7/7/N+J8VGKGSxIB1m8XwoAlc/KTnt9wN0="; @@ -171,6 +172,9 @@ stdenv.mkDerivation (finalAttrs: { gpl2Plus lgpl21Plus ]; + maintainers = with lib.maintainers; [ + olduser101 + ]; platforms = lib.platforms.unix; mainProgram = "cdparanoia"; }; diff --git a/pkgs/by-name/cd/cdxgen/package.nix b/pkgs/by-name/cd/cdxgen/package.nix index 2f5f1e410631..28229632c32b 100644 --- a/pkgs/by-name/cd/cdxgen/package.nix +++ b/pkgs/by-name/cd/cdxgen/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { version = "11.10.0"; src = fetchFromGitHub { - owner = "CycloneDX"; + owner = "cdxgen"; repo = "cdxgen"; tag = "v${finalAttrs.version}"; hash = "sha256-RmgR6OfNrZUYFyn36zTHERIHlzszaFqTX8b4Rf2TF/U="; @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Creates CycloneDX Software Bill-of-Materials (SBOM) for your projects from source and container images"; mainProgram = "cdxgen"; - homepage = "https://github.com/CycloneDX/cdxgen"; + homepage = "https://github.com/cdxgen/cdxgen"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ quincepie diff --git a/pkgs/by-name/ce/cedar/package.nix b/pkgs/by-name/ce/cedar/package.nix index 2f0b387a65a3..ba2544fa9f25 100644 --- a/pkgs/by-name/ce/cedar/package.nix +++ b/pkgs/by-name/ce/cedar/package.nix @@ -9,16 +9,29 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cedar"; - version = "4.5.1"; + version = "4.11.2"; src = fetchFromGitHub { owner = "cedar-policy"; repo = "cedar"; tag = "v${finalAttrs.version}"; - hash = "sha256-f8d7KL1DzEfJqEJ5uwwOJCgePE/frOXIFcXuoybIp2U="; + hash = "sha256-pJiSnaq2oz1uZVkLp9s2HLPdG2sZ0EtURlO8R2V+dJs="; }; - cargoHash = "sha256-MK6Zcpf12mGzntEv632kQjH7YOx31QBCmSJHxjE3l1c="; + cargoHash = "sha256-6AtFdE7vXoevOU3uWP4sgibakNHK8ffnuWCzJxFt/wo="; + + cargoBuildFlags = [ + "--bin" + "cedar" + "--bin" + "cedar-language-server" + ]; + + cargoTestFlags = finalAttrs.cargoBuildFlags; + + preCheck = '' + export TMPDIR="/tmp" + ''; passthru = { tests.version = testers.testVersion { package = cedar; }; diff --git a/pkgs/by-name/ce/cef-binary/package.nix b/pkgs/by-name/ce/cef-binary/package.nix index 664e79d7976e..1e6c30859bf6 100644 --- a/pkgs/by-name/ce/cef-binary/package.nix +++ b/pkgs/by-name/ce/cef-binary/package.nix @@ -29,13 +29,13 @@ libx11, libxshmfence, libxcb, - version ? "147.0.10", - gitRevision ? "d58e84d", - chromiumVersion ? "147.0.7727.118", + version ? "149.0.5", + gitRevision ? "6770623", + chromiumVersion ? "149.0.7827.197", buildType ? "Release", srcHashes ? { - aarch64-linux = "sha256-kaRijMDacPcoeCcS31zmRSNOvgozx+uq2M34mD28bu4="; - x86_64-linux = "sha256-CHzPofBDhCniDZEpOxXK4I7p57SYjMAY1HVo3Vna0e8="; + aarch64-linux = "sha256-cBAvcvs1rAg5EKJkCt81RZYupCWpUNIC/nLt3PJow7Q="; + x86_64-linux = "sha256-OPGMBJmvvLiLdBDniBQwx7LmTGGI59AcesJdILSeqcs="; }, }: diff --git a/pkgs/by-name/ce/cel-go/package.nix b/pkgs/by-name/ce/cel-go/package.nix index 2b0c3085dd31..6ce048623ee6 100644 --- a/pkgs/by-name/ce/cel-go/package.nix +++ b/pkgs/by-name/ce/cel-go/package.nix @@ -9,7 +9,7 @@ let version = "0.25.2"; src = fetchFromGitHub { - owner = "google"; + owner = "cel-expr"; repo = "cel-spec"; tag = "v${finalAttrs.version}"; hash = "sha256-aNyBGUlpTqILCiQHo7BxaZShI6q9xgtRegywd+jQSlo="; @@ -26,18 +26,18 @@ let in buildGoModule (finalAttrs: { pname = "cel-go"; - version = "0.28.1"; + version = "0.29.2"; src = fetchFromGitHub { - owner = "google"; + owner = "cel-expr"; repo = "cel-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-fiFkoYVKdSdYkSMQxmC1SvEEGsalBasCl9tzsGSYwmw="; + hash = "sha256-IubOpjSE91Y2kmWrXw/jFA2QqB3Mx0d/DcJgDVI6+dc="; }; modRoot = "repl"; - vendorHash = "sha256-tMaDwKoE5tzbQD5b7EnpKqiT/CT9WDCKgoxQeyhIlXE="; + vendorHash = "sha256-xbg13CPZEK2uXa6U7T5I/6l1OFcgFOaThcKCfQkgJXI="; subPackages = [ "main" @@ -68,9 +68,9 @@ buildGoModule (finalAttrs: { }; meta = { - changelog = "https://github.com/google/cel-go/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/cel-expr/cel-go/releases/tag/${finalAttrs.src.tag}"; description = "Fast, portable, non-Turing complete expression evaluation with gradual typing"; - homepage = "https://github.com/google/cel-go"; + homepage = "https://github.com/cel-expr/cel-go"; license = lib.licenses.asl20; mainProgram = "cel-go"; maintainers = with lib.maintainers; [ hythera ]; diff --git a/pkgs/by-name/ce/celestegame/celeste.nix b/pkgs/by-name/ce/celestegame/celeste.nix index 2c7900602d20..3b34646f3f64 100644 --- a/pkgs/by-name/ce/celestegame/celeste.nix +++ b/pkgs/by-name/ce/celestegame/celeste.nix @@ -162,7 +162,7 @@ stdenvNoCC.mkDerivation { meta = { inherit downloadPage description; homepage = "https://www.celestegame.com"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ ulysseszhan ]; platforms = [ diff --git a/pkgs/by-name/ce/celestia/content.nix b/pkgs/by-name/ce/celestia/content.nix new file mode 100644 index 000000000000..4af7acfeac44 --- /dev/null +++ b/pkgs/by-name/ce/celestia/content.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + gettext, + imagemagick, +}: + +stdenv.mkDerivation { + pname = "celestia-content"; + version = "0-unstable-2026-07-19"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "CelestiaProject"; + repo = "CelestiaContent"; + rev = "724b9545b72c56c1a9afeda35d48f611e4f0d20f"; + hash = "sha256-4wicyDIvBK3gD6pAgFO0YH5gRT8E7/g9Qr3YDbRKHVw="; + }; + + nativeBuildInputs = [ + cmake + gettext + imagemagick + ]; + + meta = { + description = "Data files for Celestia space simulator"; + maintainers = with lib.maintainers; [ pancaek ]; + license = + with lib.licenses; + AND [ + cc-by-30 + cc-by-40 + cc-by-nc-sa-30 + # (unused according to upstream CI, at least for now) + # cc-by-sa-30 + cc-by-sa-40 + cc0 + gpl2Plus + jpl-image + cc-by-nc-30-igo + # some files are unlicensed so far, so to be safe let's mark unfree also + unfree + ]; + }; +} diff --git a/pkgs/by-name/ce/celestia/package.nix b/pkgs/by-name/ce/celestia/package.nix new file mode 100644 index 000000000000..0c7c379628a8 --- /dev/null +++ b/pkgs/by-name/ce/celestia/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libglut, + libjpeg_turbo, + lua, + libGLU, + libGL, + perl, + eigen, + freetype, + cmake, + libepoxy, + libpng, + boost, + fmt, + libavif, + ffmpeg, + gperf, + gettext, + qt6Packages, + callPackage, + celestia-content ? callPackage ./content.nix { }, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "celestia"; + version = "1.6.4-unstable-2026-07-02"; + + src = fetchFromGitHub { + owner = "CelestiaProject"; + repo = "Celestia"; + rev = "ded2c69ec7b819640a6c807fc7d4280bbf08e26b"; + hash = "sha256-GDp31jwY9ifppUJ3Yy84E+x33O4+UmR/ODrHwH2HyeM="; + fetchSubmodules = true; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + pkg-config + cmake + gperf + gettext + qt6Packages.wrapQtAppsHook + ]; + + buildInputs = [ + qt6Packages.qtbase + libglut + lua + perl + libjpeg_turbo + eigen + libepoxy + libpng + fmt + boost + libavif + ffmpeg + freetype + libGLU + libGL + ]; + + cmakeFlags = [ + (lib.cmakeFeature "ENABLE_QT6" "ON") + (lib.cmakeFeature "ENABLE_FFMPEG" "ON") + (lib.cmakeFeature "ENABLE_LIBAVIF" "ON") + (lib.cmakeFeature "GIT_COMMIT" "${finalAttrs.src.rev}") + ]; + + enableParallelBuilding = true; + + qtWrapperArgs = [ + "--unset" + "QT_QPA_PLATFORMTHEME" + "--unset" + "QT_STYLE_OVERRIDE" + ]; + + postInstall = '' + cp -r ${celestia-content}/share/celestia/* $out/share/celestia + cp -r ${celestia-content}/share/locale/* $out/share/locale + ''; + + meta = { + homepage = "https://celestiaproject.space/"; + description = "Real-time 3D simulation of space"; + mainProgram = "celestia"; + # no tagged release for ages, remove this for now + # changelog = "https://github.com/CelestiaProject/Celestia/releases/tag/${version}"; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + returntoreality + pancaek + ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ce/cell/package.nix b/pkgs/by-name/ce/cell/package.nix index 191570862f2b..7b1bc007c1f2 100644 --- a/pkgs/by-name/ce/cell/package.nix +++ b/pkgs/by-name/ce/cell/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cell"; - version = "0.5.0"; + version = "0.5.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "garritfra"; repo = "cell"; tag = "v${finalAttrs.version}"; - hash = "sha256-J13D46ttG7KlePyFZYxqjaMF7ZR5m3nTJ8/GLm4VH5o="; + hash = "sha256-43E2EW3SS35VyJpOE7KdDz7XcOsn3V9aVglIW1vPgIE="; }; - cargoHash = "sha256-ZQXyt/hL6wamGrFvmrShoUCTSGAo8V5CuejAzO5oCuU="; + cargoHash = "sha256-4qWI1dKv84Ga6A2ImkI3rRypqm+UkDNzD94Gxl43wj0="; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ce/cemu/package.nix b/pkgs/by-name/ce/cemu/package.nix index 6d8efb1d6395..9581a5122bd7 100644 --- a/pkgs/by-name/ce/cemu/package.nix +++ b/pkgs/by-name/ce/cemu/package.nix @@ -181,6 +181,9 @@ stdenv.mkDerivation (finalAttrs: { zhaofengli baduhai ]; - platforms = [ "x86_64-linux" ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; }; }) diff --git a/pkgs/by-name/ce/censor/package.nix b/pkgs/by-name/ce/censor/package.nix index 5b7b03b6ff40..d922d13afe51 100644 --- a/pkgs/by-name/ce/censor/package.nix +++ b/pkgs/by-name/ce/censor/package.nix @@ -13,14 +13,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "censor"; - version = "0.7.1"; + version = "0.8.0"; pyproject = false; src = fetchFromCodeberg { owner = "censor"; repo = "Censor"; tag = "v${finalAttrs.version}"; - hash = "sha256-wimLSoejojVBdHnuzLxOW4QssJZpK0GTp64oIvtSqBk="; + hash = "sha256-WxD2tK6vTYpvy/0BDzwAymdl4uCJNkgw7HBUrMrDlXQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ce/centrifugo/package.nix b/pkgs/by-name/ce/centrifugo/package.nix index 4724e3565641..ac575aee3562 100644 --- a/pkgs/by-name/ce/centrifugo/package.nix +++ b/pkgs/by-name/ce/centrifugo/package.nix @@ -16,16 +16,16 @@ let in buildGoModule (finalAttrs: { pname = "centrifugo"; - version = "6.6.2"; + version = "6.9.1"; src = fetchFromGitHub { owner = "centrifugal"; repo = "centrifugo"; rev = "v${finalAttrs.version}"; - hash = "sha256-V67riIkwBKz4YvCo6PJS3jrVl3Q6DE9ewEzzHPi7YFE="; + hash = "sha256-j5ezw4LOwNK61fk71XFfUtqyXwUyX5QwHPvbH4sOtjE="; }; - vendorHash = "sha256-K/90YrXkwiDt9Zm6h5nVo34WjtQQKBCNigJguwAdW5E="; + vendorHash = "sha256-hmAZ5fo9Hko2w+xwessHGTXlifHDGGAHmtehP1CVdkE="; ldflags = [ "-s" diff --git a/pkgs/by-name/ce/ceph/ceph.nix b/pkgs/by-name/ce/ceph/ceph.nix index f5f4867a2365..8fee8f501db9 100644 --- a/pkgs/by-name/ce/ceph/ceph.nix +++ b/pkgs/by-name/ce/ceph/ceph.nix @@ -393,10 +393,12 @@ stdenv.mkDerivation { pythonEnv = ceph-python-env; tests = { inherit (nixosTests) - ceph-multi-node - ceph-single-node + ceph-multi-node-bluestore + ceph-multi-node-bluestore-cephfs + ceph-multi-node-deprecated-filestore ceph-single-node-bluestore ceph-single-node-bluestore-dmcrypt + ceph-single-node-deprecated-filestore ; }; }; diff --git a/pkgs/by-name/ce/ceph/python-env.nix b/pkgs/by-name/ce/ceph/python-env.nix index 8d50840196aa..78c5df5a17f2 100644 --- a/pkgs/by-name/ce/ceph/python-env.nix +++ b/pkgs/by-name/ce/ceph/python-env.nix @@ -43,6 +43,9 @@ ceph-python.withPackages ( cryptography jsonpatch + # src/pybind/mgr/dashboard/services/sso.py + python3-saml + # src/tools/cephfs/shell/setup.py cmd2 colorama diff --git a/pkgs/by-name/ce/ceph/src.nix b/pkgs/by-name/ce/ceph/src.nix index da49dc1f4ae7..f5280271b250 100644 --- a/pkgs/by-name/ce/ceph/src.nix +++ b/pkgs/by-name/ce/ceph/src.nix @@ -6,11 +6,11 @@ applyPatches (final: { pname = "ceph-src"; - version = "20.2.1"; + version = "20.2.2"; src = fetchurl { url = "https://download.ceph.com/tarballs/ceph-${final.version}.tar.gz"; - hash = "sha256-3neaoBQYOTiLsgHgqdYiuEM5guHE17/DrGEXt2OXJUI="; + hash = "sha256-G76ZcCdadt4KP7Ry0yzqPrbi1ydZlrcZb2IhGd2Fd1M="; }; patches = [ diff --git a/pkgs/by-name/ce/cernlib/package.nix b/pkgs/by-name/ce/cernlib/package.nix index 0dc50aa77f9b..e029773d7c89 100644 --- a/pkgs/by-name/ce/cernlib/package.nix +++ b/pkgs/by-name/ce/cernlib/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "aarch64-linux" "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ veprbl ]; license = lib.licenses.gpl2; diff --git a/pkgs/by-name/ce/certspotter/package.nix b/pkgs/by-name/ce/certspotter/package.nix index 369b70cc1886..f9da2caba12a 100644 --- a/pkgs/by-name/ce/certspotter/package.nix +++ b/pkgs/by-name/ce/certspotter/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "certspotter"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "SSLMate"; repo = "certspotter"; rev = "v${finalAttrs.version}"; - hash = "sha256-yV0IiTHGEMsdTafrw/juu/vsCq/Ofoxik7vS2huwIKw="; + hash = "sha256-0GwESNuwvwC3HgNy+1dXxgGshlj5sFCnPj25TnDXbFw="; }; vendorHash = "sha256-JA/HZrbeauCD0TA2Egy49nYWXHqVRkOs9OmgaAR1z/c="; diff --git a/pkgs/by-name/ce/cewl/Gemfile.lock b/pkgs/by-name/ce/cewl/Gemfile.lock index 6f9bd20b1e0f..65a86f8fadef 100644 --- a/pkgs/by-name/ce/cewl/Gemfile.lock +++ b/pkgs/by-name/ce/cewl/Gemfile.lock @@ -6,19 +6,19 @@ GEM mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) - mime-types-data (3.2025.0924) + mime-types-data (3.2026.0414) mini_exiftool (2.14.0) ostruct (>= 0.6.0) pstore (>= 0.1.3) mini_portile2 (2.8.9) - nokogiri (1.18.10) + nokogiri (1.19.3) mini_portile2 (~> 2.8.2) racc (~> 1.4) ostruct (0.6.3) - pstore (0.2.0) + pstore (0.2.1) racc (1.8.1) rexml (3.4.4) - rubyzip (3.2.2) + rubyzip (3.4.0) spider (0.7.0) PLATFORMS diff --git a/pkgs/by-name/ce/cewl/gemset.nix b/pkgs/by-name/ce/cewl/gemset.nix index 1fc11621b17b..19cab141ee24 100644 --- a/pkgs/by-name/ce/cewl/gemset.nix +++ b/pkgs/by-name/ce/cewl/gemset.nix @@ -38,10 +38,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2025.0924"; + version = "3.2026.0414"; }; mini_exiftool = { dependencies = [ @@ -76,10 +76,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hcwwr2h8jnqqxmf8mfb52b0dchr7pm064ingflb78wa00qhgk6m"; + sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; type = "gem"; }; - version = "1.18.10"; + version = "1.19.3"; }; ostruct = { groups = [ "default" ]; @@ -96,10 +96,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3lrq8k62n8bazhxgdmjykni9wv0mcjks5vi1g274i3wblcgrfn"; + sha256 = "06icf1n6z7snygcq51zdm1zdz20cpkd4qw76s6b9wmv65h7lv403"; type = "gem"; }; - version = "0.2.0"; + version = "0.2.1"; }; racc = { groups = [ "default" ]; @@ -126,10 +126,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; + sha256 = "0yzmmwya4zis5f7zkhhp8p92m1xh2sg6rlbnlhsvc0m3xg4rpqvd"; type = "gem"; }; - version = "3.2.2"; + version = "3.4.0"; }; spider = { groups = [ "default" ]; @@ -141,4 +141,14 @@ }; version = "0.7.0"; }; + getoptlong = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "198vy9dxyzibqdbw9jg8p2ljj9iknkyiqlyl229vz55rjxrz08zx"; + type = "gem"; + }; + version = "0.2.1"; + }; } diff --git a/pkgs/by-name/ce/cewl/package.nix b/pkgs/by-name/ce/cewl/package.nix index a3cdebb0d54f..16ff14d7a948 100644 --- a/pkgs/by-name/ce/cewl/package.nix +++ b/pkgs/by-name/ce/cewl/package.nix @@ -1,6 +1,6 @@ { - stdenv, lib, + stdenv, fetchFromGitHub, bundlerEnv, bundlerUpdateScript, @@ -14,12 +14,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cewl"; - version = "5.5.2"; + version = "6.2.1"; + src = fetchFromGitHub { owner = "digininja"; repo = "CeWL"; tag = finalAttrs.version; - hash = "sha256-5LTZUr3OMeu1NODhIgBiVqtQnUWYfZTm73q61vT3rXc="; + hash = "sha256-wMTGAB4P925z2UYNvlN4kSu1SLzKyB4a/Cjq4BofJ9w="; }; buildInputs = [ rubyEnv.wrappedRuby ]; @@ -34,8 +35,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Custom wordlist generator"; - mainProgram = "cewl"; homepage = "https://digi.ninja/projects/cewl.php/"; + changelog = "https://github.com/digininja/CeWL/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; + maintainers = [ ]; + mainProgram = "cewl"; }; }) diff --git a/pkgs/by-name/cf/cfdg/package.nix b/pkgs/by-name/cf/cfdg/package.nix index 461678ec5bae..f2eaa34b1c0a 100644 --- a/pkgs/by-name/cf/cfdg/package.nix +++ b/pkgs/by-name/cf/cfdg/package.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { pname = "cfdg"; - version = "3.4.2"; + version = "3.4.3"; src = fetchFromGitHub { owner = "MtnViewJohn"; repo = "context-free"; rev = "Version${version}"; - sha256 = "sha256-PtkvhX5PIeN/5UDpAaVwBwfp8ykjsjfH+8iGdbNQOfI="; + sha256 = "sha256-a/HmB2AkhcibCxzHfiNjnUiYmz5hrfZVs7aZZu5IBIw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cf/cfm/package.nix b/pkgs/by-name/cf/cfm/package.nix index 5a7cd9d625d9..753d24f3bb40 100644 --- a/pkgs/by-name/cf/cfm/package.nix +++ b/pkgs/by-name/cf/cfm/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.6.6"; src = fetchFromGitHub { - owner = "willeccles"; + owner = "sophec"; repo = "cfm"; rev = "v${finalAttrs.version}"; sha256 = "sha256-uXL0RO9P+NYSZ0xCv91KzjHOJJI500YUT8IJkFS86pE="; @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/willeccles/cfm"; + homepage = "https://github.com/sophec/cfm"; description = "Simple and fast TUI file manager with no dependencies"; license = lib.licenses.mpl20; maintainers = [ ]; diff --git a/pkgs/by-name/cf/cfn-nag/package.nix b/pkgs/by-name/cf/cfn-nag/package.nix index b5f7cd01298a..f4ba07fd8c1a 100644 --- a/pkgs/by-name/cf/cfn-nag/package.nix +++ b/pkgs/by-name/cf/cfn-nag/package.nix @@ -19,7 +19,6 @@ bundlerEnv { mainProgram = "cfn_nag"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ - momeemt mathstlouis ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/cf/cfripper/package.nix b/pkgs/by-name/cf/cfripper/package.nix index b5e915bb043f..ea58101d841f 100644 --- a/pkgs/by-name/cf/cfripper/package.nix +++ b/pkgs/by-name/cf/cfripper/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cfripper"; - version = "1.20.1"; + version = "1.21.0"; pyproject = true; src = fetchFromGitHub { owner = "Skyscanner"; repo = "cfripper"; tag = "v${finalAttrs.version}"; - hash = "sha256-HE9n28q1HX1HRSiXyEuUrAJGp4d5i1e0lROcsqpsobA="; + hash = "sha256-psuUG8Kk+pl9Qv9vpH7yCn2X6leciftgFN1Ft+zEgtg="; }; pythonRelaxDeps = [ @@ -63,7 +63,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool for analysing CloudFormation templates"; homepage = "https://github.com/Skyscanner/cfripper"; changelog = "https://github.com/Skyscanner/cfripper/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "cfripper"; }; diff --git a/pkgs/by-name/cf/cfspeedtest/package.nix b/pkgs/by-name/cf/cfspeedtest/package.nix index 17a7e90df2e3..d79ccec67afd 100644 --- a/pkgs/by-name/cf/cfspeedtest/package.nix +++ b/pkgs/by-name/cf/cfspeedtest/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Unofficial CLI for speed.cloudflare.com"; homepage = "https://github.com/code-inflation/cfspeedtest"; changelog = "https://github.com/code-inflation/cfspeedtest/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ colemickens stepbrobd diff --git a/pkgs/by-name/cg/cgal/package.nix b/pkgs/by-name/cg/cgal/package.nix index 9c7be9d86df0..f49fbddeae49 100644 --- a/pkgs/by-name/cg/cgal/package.nix +++ b/pkgs/by-name/cg/cgal/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgal"; - version = "6.1.1"; + version = "6.2"; src = fetchurl { url = "https://github.com/CGAL/cgal/releases/download/v${finalAttrs.version}/CGAL-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-UlBpNfcOJH7Sd348ZfIOhveSCMKi0OGArnR12vEclu8="; + sha256 = "sha256-+8MoFnRehxpcvetiRTF+nb8QrhqVewqx7bALT94Auo0="; }; patches = [ ./cgal_path.patch ]; diff --git a/pkgs/by-name/cg/cgns/package.nix b/pkgs/by-name/cg/cgns/package.nix index 817d5f39431f..2de3a487d504 100644 --- a/pkgs/by-name/cg/cgns/package.nix +++ b/pkgs/by-name/cg/cgns/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://cgns.github.io"; downloadPage = "https://github.com/cgns/cgns"; changelog = "https://github.com/cgns/cgns/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ zlib ]; + license = lib.licenses.zlib; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/cg/cgreen/package.nix b/pkgs/by-name/cg/cgreen/package.nix index e3c557fc9ce7..e084f4ad15fb 100644 --- a/pkgs/by-name/cg/cgreen/package.nix +++ b/pkgs/by-name/cg/cgreen/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cgreen"; - version = "1.6.4"; + version = "1.6.5"; src = fetchFromGitHub { owner = "cgreen-devs"; repo = "cgreen"; rev = finalAttrs.version; - sha256 = "sha256-W4MdB3acZcxavjRupJa4eXAv9g4QgYXFAQWOLoHrQZ8="; + sha256 = "sha256-/D06k4c6xu9bL8z/DGnOLvgzOstTeR9PxW/J6a42rZs="; }; postPatch = '' diff --git a/pkgs/by-name/cg/cgt-calc/package.nix b/pkgs/by-name/cg/cgt-calc/package.nix index 700ead59662e..482be86743b2 100644 --- a/pkgs/by-name/cg/cgt-calc/package.nix +++ b/pkgs/by-name/cg/cgt-calc/package.nix @@ -1,6 +1,7 @@ { lib, fetchFromGitHub, + fetchpatch, python3Packages, withTeXLive ? true, texliveSmall, @@ -17,6 +18,15 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-KPzADW+n82X08IMfSIl5JyYPm8fxbbowud8sBdUxRgA="; }; + patches = [ + (fetchpatch { + # https://github.com/KapJI/capital-gains-calculator/pull/781 + name = "update uv-build requirement.patch"; + url = "https://github.com/KapJI/capital-gains-calculator/commit/0222eafdcf1911f3e2fd781697dc53311f529f62.patch"; + hash = "sha256-L8jgrdA9t3x8mdaLmAuW6vFhHCLGA+0gQ/8j9EcYKhE="; + }) + ]; + build-system = with python3Packages; [ uv-build ]; diff --git a/pkgs/by-name/ch/chainsaw/package.nix b/pkgs/by-name/ch/chainsaw/package.nix index 98aa57e383e6..d0a1fafb8a0d 100644 --- a/pkgs/by-name/ch/chainsaw/package.nix +++ b/pkgs/by-name/ch/chainsaw/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chainsaw"; - version = "2.16.0"; + version = "2.16.2"; src = fetchFromGitHub { owner = "WithSecureLabs"; repo = "chainsaw"; tag = "v${finalAttrs.version}"; - hash = "sha256-ywHPDVHpw0TrzeWPzZ3cvQSxCr2Di2YjS0Not1B9vlg="; + hash = "sha256-EKL2MTo5qirpY4TCWwBptpRWJRd6Yp/dLz/5sIsdsbg="; }; - cargoHash = "sha256-AA8JQiGukh4SRZyciuE2u4OUo7HNeb6+SWej9vlw5z8="; + cargoHash = "sha256-bbgRqp3bNw2U69aVqwvJNWOKgW0YhR8SlqzH9jdrHZU="; ldflags = [ "-w" diff --git a/pkgs/by-name/ch/chalk/package.nix b/pkgs/by-name/ch/chalk/package.nix index fb794b4b81e9..3411c52109ca 100644 --- a/pkgs/by-name/ch/chalk/package.nix +++ b/pkgs/by-name/ch/chalk/package.nix @@ -9,13 +9,11 @@ let chalkVersion = "1.34.9"; chalkPathPiecesByNixSystem = { "aarch64-darwin" = "Darwin/aarch64"; - "x86_64-darwin" = "Darwin/x86_64"; "aarch64-linux" = "Linux/aarch64"; "x86_64-linux" = "Linux/x86_64"; }; chalkHashByNixSystem = { "aarch64-darwin" = "sha256-owDGsT/2tU1Y3JKWAQkYNG18dOxXIST/3bfjXJf1gXU="; - "x86_64-darwin" = "sha256-lCRYekUmXFW6V/zvbvWCqzxr0bbpvQwk1wgWtAYuPuQ="; "aarch64-linux" = "sha256-uvhjhLbVBGB5SNFbfgtpaeLULFnEm3x8fN9ffyJzSSM="; "x86_64-linux" = "sha256-lC5SwvZzYJqomRrK42roSQr4/GZScM2VdgiQ9DOSkHQ="; }; @@ -47,7 +45,6 @@ stdenv.mkDerivation { mainProgram = "chalk"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ch/chameleon-cli/package.nix b/pkgs/by-name/ch/chameleon-cli/package.nix index 728e191cc7c1..773490dab190 100644 --- a/pkgs/by-name/ch/chameleon-cli/package.nix +++ b/pkgs/by-name/ch/chameleon-cli/package.nix @@ -23,14 +23,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "chameleon-cli"; - version = "2.1.0-unstable-2026-05-08"; + version = "2.2.0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "RfidResearchGroup"; repo = "ChameleonUltra"; - rev = "f06efdf81574406943142f4a14db338d2b145a15"; + rev = "f349dbeeaa315776b272ae8fb851cc4042d55f07"; rootDir = "software"; - hash = "sha256-2zc9Uww1t1XJzQpI4KChe1cbqJXoewTo3vBbQKJdjfI="; + hash = "sha256-D8/hdOcDnkAmwQeWR+faukAISlm6ZTauf8zoSi9sCsI="; }; postPatch = '' diff --git a/pkgs/by-name/ch/changie/package.nix b/pkgs/by-name/ch/changie/package.nix index f2de5c352eca..4cf4389d3b57 100644 --- a/pkgs/by-name/ch/changie/package.nix +++ b/pkgs/by-name/ch/changie/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "changie"; - version = "1.24.0"; + version = "1.25.1"; src = fetchFromGitHub { owner = "miniscruff"; repo = "changie"; rev = "v${finalAttrs.version}"; - hash = "sha256-wxIe/Hlp8qYzWC7ijQ7fqp+l75GCHxbbmZkYR/2v3Mw="; + hash = "sha256-zLAUOxe/PdVGBeT7inwZJuf/vascir32ade5CWqyvrM="; }; - vendorHash = "sha256-ozYaMiM2syI+0DkYj7PFTWajJ9/pmow9QLFuOGtBros="; + vendorHash = "sha256-+N/h5kNEiSFe1fnzuk/oqf8g0eND4SgHCN/HM9oOgoE="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ch/charasay/package.nix b/pkgs/by-name/ch/charasay/package.nix index 4c456682beb9..eda492557bc6 100644 --- a/pkgs/by-name/ch/charasay/package.nix +++ b/pkgs/by-name/ch/charasay/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "charasay"; - version = "3.3.0"; + version = "3.3.3"; src = fetchFromGitHub { owner = "latipun7"; repo = "charasay"; rev = "v${finalAttrs.version}"; - hash = "sha256-NB2GDDFH9IW/c0acMojYHuzPrx0J3tjlDqjQa6ZRbN4="; + hash = "sha256-8N3ToXpbDR+g19CT0q1J4QfQstBjS2QfX4IV2D7+ics="; }; - cargoHash = "sha256-i2CvwQXKKfYLdK0tKf/w4TepPyMo99v1I+kIr00PWcY="; + cargoHash = "sha256-yByNgG8JAdT5jVxe3ijLbmjE1c8YybPkiwMHOvpZPTM="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ch/charm-freeze/package.nix b/pkgs/by-name/ch/charm-freeze/package.nix index 5ce7e0d1a319..e9ff10c34681 100644 --- a/pkgs/by-name/ch/charm-freeze/package.nix +++ b/pkgs/by-name/ch/charm-freeze/package.nix @@ -23,6 +23,8 @@ buildGoModule (finalAttrs: { "-X=main.Version=${finalAttrs.version}" ]; + excludedPackages = [ "test/input" ]; + meta = { description = "Tool to generate images of code and terminal output"; mainProgram = "freeze"; diff --git a/pkgs/by-name/ch/chars/package.nix b/pkgs/by-name/ch/chars/package.nix index 4f4c7f552380..f5ee6393b10a 100644 --- a/pkgs/by-name/ch/chars/package.nix +++ b/pkgs/by-name/ch/chars/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.7.0"; src = fetchFromGitHub { - owner = "antifuchs"; + owner = "boinkor-net"; repo = "chars"; rev = "v${finalAttrs.version}"; sha256 = "sha256-mBtwdPzIc6RgEFTyReStFlhS4UhhRWjBTKT6gD3tzpQ="; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Commandline tool to display information about unicode characters"; mainProgram = "chars"; - homepage = "https://github.com/antifuchs/chars"; + homepage = "https://github.com/boinkor-net/chars"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bbigras ]; }; diff --git a/pkgs/by-name/ch/chatd/package.nix b/pkgs/by-name/ch/chatd/package.nix index 5a7a52e44a68..0aac9451c4d4 100644 --- a/pkgs/by-name/ch/chatd/package.nix +++ b/pkgs/by-name/ch/chatd/package.nix @@ -90,7 +90,7 @@ buildNpmPackage rec { homepage = "https://github.com/BruceMacD/chatd"; changelog = "https://github.com/BruceMacD/chatd/releases/tag/v${version}"; license = lib.licenses.mit; - maintainers = [ lib.maintainers.lucasew ]; + maintainers = [ ]; mainProgram = "chatd"; platforms = electron.meta.platforms; }; diff --git a/pkgs/by-name/ch/cheating-daddy/bump-yauzl.patch b/pkgs/by-name/ch/cheating-daddy/bump-yauzl.patch new file mode 100644 index 000000000000..e9f951489e86 --- /dev/null +++ b/pkgs/by-name/ch/cheating-daddy/bump-yauzl.patch @@ -0,0 +1,73 @@ +diff --git a/package-lock.json b/package-lock.json +index 044aa5b..45ebc08 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -2390,16 +2390,6 @@ + "ieee754": "^1.1.13" + } + }, +- "node_modules/buffer-crc32": { +- "version": "0.2.13", +- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", +- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": "*" +- } +- }, + "node_modules/buffer-equal-constant-time": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", +@@ -4372,16 +4362,6 @@ + "reusify": "^1.0.4" + } + }, +- "node_modules/fd-slicer": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", +- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "pend": "~1.2.0" +- } +- }, + "node_modules/filename-reserved-regex": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/filename-reserved-regex/-/filename-reserved-regex-2.0.0.tgz", +@@ -8633,14 +8613,16 @@ + } + }, + "node_modules/yauzl": { +- "version": "2.10.0", +- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", +- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", ++ "version": "3.4.0", ++ "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.4.0.tgz", ++ "integrity": "sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw==", + "dev": true, + "license": "MIT", + "dependencies": { +- "buffer-crc32": "~0.2.3", +- "fd-slicer": "~1.1.0" ++ "pend": "~1.2.0" ++ }, ++ "engines": { ++ "node": ">=12" + } + }, + "node_modules/yocto-queue": { +diff --git a/package.json b/package.json +index 369f312..51b8563 100644 +--- a/package.json ++++ b/package.json +@@ -42,5 +42,8 @@ + "@electron/fuses": "^1.8.0", + "@reforged/maker-appimage": "^5.0.0", + "electron": "^30.0.5" ++ }, ++ "overrides": { ++ "yauzl": "^3.3.1" + } + } diff --git a/pkgs/by-name/ch/cheating-daddy/package.nix b/pkgs/by-name/ch/cheating-daddy/package.nix index 0cbace76118f..8e5a93b24519 100644 --- a/pkgs/by-name/ch/cheating-daddy/package.nix +++ b/pkgs/by-name/ch/cheating-daddy/package.nix @@ -22,7 +22,12 @@ buildNpmPackage (finalAttrs: { hash = "sha256-/xH3tBnZAnDr/EbewtJc0WpBirW1Obn6tka7NP0ovAc="; }; - npmDepsHash = "sha256-xoZ/qz7fGw858GsITkx/ag0FeeL4zcXh32qwb+OTLbg="; + patches = [ + # zip extraction fails on newer nodejs versions without this fix + ./bump-yauzl.patch + ]; + + npmDepsHash = "sha256-p26yEuIiK7baeAxf06E+cmuzl45NS2WOmWNeFfTplQA="; nativeBuildInputs = [ copyDesktopItems @@ -35,6 +40,8 @@ buildNpmPackage (finalAttrs: { ONNXRUNTIME_NODE_INSTALL = "skip"; ONNXRUNTIME_NODE_INSTALL_CUDA = "skip"; ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + # electron-forge's console output is squeezed into one narrow column if unset + CI = "1"; }; makeCacheWritable = true; diff --git a/pkgs/by-name/ch/check-jsonschema/package.nix b/pkgs/by-name/ch/check-jsonschema/package.nix index bf59e76541e0..e564dd6390f2 100644 --- a/pkgs/by-name/ch/check-jsonschema/package.nix +++ b/pkgs/by-name/ch/check-jsonschema/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "check-jsonschema"; - version = "0.37.2"; + version = "0.37.4"; pyproject = true; src = fetchFromGitHub { owner = "python-jsonschema"; repo = "check-jsonschema"; tag = finalAttrs.version; - hash = "sha256-Uflc92J8oSl633FD+DDIDGXvrFCfwpyxTqoNHLcHEpE="; + hash = "sha256-MBnjH5lzutoPTyhYqQTa6FnK8fUMkzy15epBUMxO8BY="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh b/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh new file mode 100644 index 000000000000..1b610b631d84 --- /dev/null +++ b/pkgs/by-name/ch/checkPhaseThreadLimitHook/hook.sh @@ -0,0 +1,32 @@ +setupThreadLimit() { + # Limit number of threads used during checks. Default is "all cores". + # Using all cores causes high load on builders if checks are executed with NIX_BUILD_CORE parallelism. + # This gets even worse if multiple builds are scheduled on the same machine, potentially growing O(n^3) without explicit core limits. + + # global value to override all of these at once + NIX_CHECK_PHASE_DEFAULT_NUM_THREADS="${NIX_CHECK_PHASE_DEFAULT_NUM_THREADS:-1}" + + thread_vars=( + OMP_NUM_THREADS + OPENBLAS_NUM_THREADS + MKL_NUM_THREADS + BLIS_NUM_THREADS + VECLIB_MAXIMUM_THREADS + NUMBA_NUM_THREADS + NUMEXPR_NUM_THREADS + ) + + echo "setting known thread variables to default: $NIX_CHECK_PHASE_DEFAULT_NUM_THREADS" + for var in "${thread_vars[@]}"; do + export "$var=${!var:-$NIX_CHECK_PHASE_DEFAULT_NUM_THREADS}" + printf " %s=%s" "$var" "${!var}" + done + printf "\n" +} + + +if [[ -z "${dontLimitCheckPhaseThreads-}" ]]; then + echo "Using checkPhaseThreadLimitHook" + preCheckHooks+=('setupThreadLimit') + preInstallCheckHooks+=('setupThreadLimit') +fi diff --git a/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix b/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix new file mode 100644 index 000000000000..6bd9bda7135a --- /dev/null +++ b/pkgs/by-name/ch/checkPhaseThreadLimitHook/package.nix @@ -0,0 +1,15 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "check-phase-thread-limit-hook"; + + __structuredAttrs = true; + + meta = { + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grimmauld ]; + }; +} ./hook.sh diff --git a/pkgs/by-name/ch/checkov/package.nix b/pkgs/by-name/ch/checkov/package.nix index 4580028b3ebb..7437070891d8 100644 --- a/pkgs/by-name/ch/checkov/package.nix +++ b/pkgs/by-name/ch/checkov/package.nix @@ -35,14 +35,14 @@ let in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "checkov"; - version = "3.3.0"; + version = "3.3.6"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; tag = finalAttrs.version; - hash = "sha256-1hm3ZNvrO+U3PWb5gBSwKSXgOHQLU4avncSZOH/ijCM="; + hash = "sha256-4wOFbEv1MVVuMpYQLs+oHQxCLw/tk++yTiR+yyLiCa8="; }; pythonRelaxDeps = [ diff --git a/pkgs/by-name/ch/checkpolicy/package.nix b/pkgs/by-name/ch/checkpolicy/package.nix index b2d6a59daedf..9422f0807d29 100644 --- a/pkgs/by-name/ch/checkpolicy/package.nix +++ b/pkgs/by-name/ch/checkpolicy/package.nix @@ -9,12 +9,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "checkpolicy"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/checkpolicy-${finalAttrs.version}.tar.gz"; - hash = "sha256-LZKVHfywkNYXnnojhWYi4Py8Mr4Dvx5grOncnL2hHlk="; + hash = "sha256-m4G/zu9/qdAvmHLlanhvND3FjvS1cT3ODVxBbluEzvo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/checksec/package.nix b/pkgs/by-name/ch/checksec/package.nix index 9ecc1d038569..25004fcbccfb 100644 --- a/pkgs/by-name/ch/checksec/package.nix +++ b/pkgs/by-name/ch/checksec/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "checksec"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "slimm609"; repo = "checksec"; tag = finalAttrs.version; - hash = "sha256-LsVK+ufSUGXWHpPk1iAFD6Lxh5hEp1WmTAy9hZMEiKk="; + hash = "sha256-vvfr5JsCTq1NWUfOOlHIjf+ToNNzP5Xps09XPLlG1zc="; }; - vendorHash = "sha256-GzSliyKxBfATA7BaHO/4HyReEwT7dYTpRuyjADNtJuc="; + vendorHash = "sha256-sW2C39xhMQCyR8S1m0ZplVQxu42w+tNqjxH7VO5stGw="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/checkstyle/package.nix b/pkgs/by-name/ch/checkstyle/package.nix index e08f9d5d1c5f..e3134dd3c378 100644 --- a/pkgs/by-name/ch/checkstyle/package.nix +++ b/pkgs/by-name/ch/checkstyle/package.nix @@ -8,17 +8,17 @@ }: maven.buildMavenPackage (finalAttrs: { - version = "13.5.0"; + version = "13.8.0"; pname = "checkstyle"; src = fetchFromGitHub { owner = "checkstyle"; repo = "checkstyle"; tag = "checkstyle-${finalAttrs.version}"; - hash = "sha256-2v6ccNG4t8cXObMdztX+Y+PVuiqt4Fd5IR7j5bk5IaA="; + hash = "sha256-Nhn65Y6iz55wucAQ/DiF9VWm15O7m7+ZhOM+X4rIHGQ="; }; - mvnHash = "sha256-M830+mpd7fAbzZGUQiTJZUKPe64zYUKp6QRqTrSOy7w="; + mvnHash = "sha256-GhnxhSZX+plwQq9l4av6dqLEVp7HwT5aTVHKoTfaP8c="; nativeBuildInputs = [ maven diff --git a/pkgs/by-name/ch/cheesecutter/package.nix b/pkgs/by-name/ch/cheesecutter/package.nix index 88b64568da1d..fc363f829648 100644 --- a/pkgs/by-name/ch/cheesecutter/package.nix +++ b/pkgs/by-name/ch/cheesecutter/package.nix @@ -83,7 +83,6 @@ stdenv.mkDerivation { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ OPNA2608 ]; mainProgram = "ccutter"; diff --git a/pkgs/by-name/ch/chemacs2/package.nix b/pkgs/by-name/ch/chemacs2/package.nix index 9bce24384d04..662e33d4e960 100644 --- a/pkgs/by-name/ch/chemacs2/package.nix +++ b/pkgs/by-name/ch/chemacs2/package.nix @@ -44,7 +44,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { Think of it as a bootloader for Emacs. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/ch/chemtool/package.nix b/pkgs/by-name/ch/chemtool/package.nix deleted file mode 100644 index 344b1d66150b..000000000000 --- a/pkgs/by-name/ch/chemtool/package.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libx11, - gtk2, - fig2dev, - wrapGAppsHook3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "chemtool"; - version = "1.6.14"; - - src = fetchurl { - url = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/chemtool-${finalAttrs.version}.tar.gz"; - sha256 = "hhYaBGE4azNKX/sXzfCUpJGUGIRngnL0V0mBNRTdr8s="; - }; - - nativeBuildInputs = [ - pkg-config - wrapGAppsHook3 - ]; - buildInputs = [ - libx11 - gtk2 - fig2dev - ]; - - # Workaround build on -fno-common toolchains like upstream gcc-10. - # Otherwise built fails as: - # ld: inout.o:/build/chemtool-1.6.14/ct1.h:279: multiple definition of - # `outtype'; draw.o:/build/chemtool-1.6.14/ct1.h:279: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - preFixup = '' - gappsWrapperArgs+=(--prefix PATH : "${lib.makeBinPath [ fig2dev ]}") - ''; - - meta = { - homepage = "http://ruby.chemie.uni-freiburg.de/~martin/chemtool/"; - description = "Draw chemical structures"; - longDescription = '' - Chemtool is a program for drawing organic molecules. It runs under the X - Window System using the GTK widget set. - - Most operations in chemtool can be accomplished using the mouse - the - first (usually the left) button is used to select or place things, the - middle button modifies properties (e.g. reverses the direction of a bond), - and the right button is used to delete objects. - - The program offers essentially unlimited undo/redo, two text fonts plus - symbols, seven colors, drawing at several zoom scales, and square and - hexagonal backdrop grids for easier alignment. - ''; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/ch/cherry-studio/package.nix b/pkgs/by-name/ch/cherry-studio/package.nix index 4c824f3544b7..26a8791fd2e2 100644 --- a/pkgs/by-name/ch/cherry-studio/package.nix +++ b/pkgs/by-name/ch/cherry-studio/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cherry-studio"; - version = "1.9.9"; + version = "1.9.11"; src = fetchFromGitHub { owner = "CherryHQ"; repo = "cherry-studio"; tag = "v${finalAttrs.version}"; - hash = "sha256-TFmzQmZlRFTJa7KaHVj370n2YZuwXy8mCRFrKsf0w24="; + hash = "sha256-NbjFPHMh8LSqUv3wpXI/hBU9aJFe76l5UyoZ2XqX0hg="; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-wJPiEjIOReB/JCer6pdODnDfQ12zm9vPv79iaiyTp3I="; + hash = "sha256-9Vx4WzQjwNxPAkz+FjjqnMQxJviP4e0EhkQBN9Y+ujo="; }; nativeBuildInputs = [ @@ -159,6 +159,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cherry-studio"; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ xiaoxiangmoe ]; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; }; }) diff --git a/pkgs/by-name/ch/chez-racket/package.nix b/pkgs/by-name/ch/chez-racket/package.nix index 37a0dd0cce7c..240b72ba14a5 100644 --- a/pkgs/by-name/ch/chez-racket/package.nix +++ b/pkgs/by-name/ch/chez-racket/package.nix @@ -15,7 +15,7 @@ let else if stdenv.hostPlatform.isPower then "ppc${toString stdenv.hostPlatform.parsed.cpu.bits}" else - throw "Add ${stdenv.hostPlatform.parsed.cpu.arch} to chezArch to enable building chez-racket"; + throw "Add ${stdenv.hostPlatform.parsed.cpu.name} to chezArch to enable building chez-racket"; chezOs = if stdenv.hostPlatform.isDarwin then diff --git a/pkgs/by-name/ch/chez-racket/shared.nix b/pkgs/by-name/ch/chez-racket/shared.nix index aa38643ee4f4..fc7b9f2f9051 100644 --- a/pkgs/by-name/ch/chez-racket/shared.nix +++ b/pkgs/by-name/ch/chez-racket/shared.nix @@ -56,7 +56,9 @@ stdenv.mkDerivation ( homepage = "https://github.com/racket/ChezScheme"; license = lib.licenses.asl20; maintainers = [ ]; - platforms = lib.platforms.unix; + platforms = lib.intersectLists lib.platforms.unix ( + lib.platforms.x86 ++ lib.platforms.aarch64 ++ lib.platforms.arm ++ lib.platforms.power + ); }; } ) diff --git a/pkgs/by-name/ch/chez/package.nix b/pkgs/by-name/ch/chez/package.nix index 7551fc866a9e..645746d78052 100644 --- a/pkgs/by-name/ch/chez/package.nix +++ b/pkgs/by-name/ch/chez/package.nix @@ -23,7 +23,6 @@ let "x86_64-linux" = "ta6le"; "x86-linux" = "ti3le"; "aarch64-linux" = "tarm64le"; - "x86_64-darwin" = "ta6osx"; "aarch64-darwin" = "tarm64osx"; "x86_64-windows" = "ta6nt"; "aarch64-windows" = "tarm64nt"; diff --git a/pkgs/by-name/ch/chhoto-url/package.nix b/pkgs/by-name/ch/chhoto-url/package.nix index 7f3a2ec9ba89..a860045cb091 100644 --- a/pkgs/by-name/ch/chhoto-url/package.nix +++ b/pkgs/by-name/ch/chhoto-url/package.nix @@ -8,27 +8,30 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "chhoto-url"; - version = "7.2.1"; + version = "7.4.10"; src = fetchFromGitHub { owner = "SinTan1729"; repo = "chhoto-url"; tag = finalAttrs.version; - hash = "sha256-B6bMuy/EEveYtQtGBO5CNeEUlPK8eQ412k+SwlRPm2M="; + hash = "sha256-iZQFH+WoGu91DJT7X8FTs1qktf/SSrh6F9U4/OQWZiI="; + fetchLFS = true; }; - sourceRoot = "${finalAttrs.src.name}/actix"; + sourceRoot = "${finalAttrs.src.name}/backend"; postPatch = '' substituteInPlace src/{main.rs,services/get.rs,services/utils.rs} \ - --replace-fail "./resources/" "${placeholder "out"}/share/chhoto-url/resources/" + --replace-fail "./frontend/" "${placeholder "out"}/share/chhoto-url/frontend/" + substituteInPlace Cargo.toml \ + --replace-fail 'rust-version = "1.96"' 'rust-version = "1.95"' ''; - cargoHash = "sha256-9EVGsOipx9ObygpM37iZYLnhYjSMHFhHTDvjHkLWLz8="; + cargoHash = "sha256-1q5WWNnqDILgDbd9Wztvm0pYDDtaufqOxixwHb4VifY="; postInstall = '' mkdir -p $out/share/chhoto-url - cp -r ${finalAttrs.src}/resources $out/share/chhoto-url/resources + cp -r ${finalAttrs.src}/frontend $out/share/chhoto-url/frontend ''; passthru = { diff --git a/pkgs/by-name/ch/chiri/package.nix b/pkgs/by-name/ch/chiri/package.nix index b0ad9f5a174b..ffa912d6876d 100644 --- a/pkgs/by-name/ch/chiri/package.nix +++ b/pkgs/by-name/ch/chiri/package.nix @@ -41,22 +41,22 @@ rustPlatform.buildRustPackage ( in { pname = "chiri"; - version = "0.9.1"; + version = "0.9.2"; src = fetchFromGitHub { owner = "chiriapp"; repo = "chiri"; tag = "app-v${finalAttrs.version}"; - hash = "sha256-rkkyp36EIfvD0DXq0Tn+uLS/cBtgGk4x4sVkppTDaLg="; + hash = "sha256-zBv/egEvmsZXklhKtN5fd2DOKH+UWcaGUUkFxz0G+JI="; }; - cargoHash = "sha256-nSK4oyaW+chFHKrCI80d9785UsqBlX8YAdU26b/aa0s="; + cargoHash = "sha256-69r9ILhSov7A9zdWcPphGMXur/8lYyZYo7qSGPW9IzM="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm-patched; - hash = "sha256-dxfoo5Ajjt7zUsdQojXhePHp0K2itpdjequvGqqnZ7k="; - fetcherVersion = 3; + hash = "sha256-1S1XR/E611LGivXpIK0kvkvXWPNqDzvFKPT7a1Qu1zg="; + fetcherVersion = 4; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix index aebc5f9851f3..9b7a71a28ccf 100644 --- a/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix +++ b/pkgs/by-name/ch/chirpstack-gateway-bridge/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "chirpstack-gateway-bridge"; - version = "4.1.1"; + version = "4.1.2"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-gateway-bridge"; rev = "v${finalAttrs.version}"; - hash = "sha256-zMD5vbdnfkGHhnw7fG88n6JY1RSrj2mMgMICR7n0cUo="; + hash = "sha256-3rdpIqiO6D5+JntJm2GQlnH6zh3s3DOzpaxr06PR+K4="; }; - vendorHash = "sha256-y1NYYyRS5L7QzV/bcm43EJ2OCHg+vPSTSwhHO0AwqD8="; + vendorHash = "sha256-nDbUem9WV2DClrUBTjDvz+jUqqkQI+QGuv8h39EBs9E="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix index c662d9a56071..93dfb45c5c24 100644 --- a/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix +++ b/pkgs/by-name/ch/chirpstack-mqtt-forwarder/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage rec { pname = "chirpstack-mqtt-forwarder"; - version = "4.5.1"; + version = "4.6.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-mqtt-forwarder"; rev = "v${version}"; - hash = "sha256-AFyvXLXGs1jeOJM8tSKBNbTVYr5SRUscqnUlSvU9iuA="; + hash = "sha256-frEwQrGfB1J7ZY5jSkmgAyyCJwWUyu29QuZqMWlOPSk="; }; - cargoHash = "sha256-mRmvKOqfzqUvPexRbd9TRS2lunpne7+wO57bsYZ3dXw="; + cargoHash = "sha256-5/8f5eSLfCu8fOfT+jTEfJj+fSB6rJt34C6eJwyFIfo="; nativeBuildInputs = [ protobuf ]; diff --git a/pkgs/by-name/ch/chirpstack-rest-api/package.nix b/pkgs/by-name/ch/chirpstack-rest-api/package.nix index 7cef8d846206..64238e9b3c6d 100644 --- a/pkgs/by-name/ch/chirpstack-rest-api/package.nix +++ b/pkgs/by-name/ch/chirpstack-rest-api/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "chirpstack-rest-api"; - version = "4.18.0"; + version = "4.19.0"; src = fetchFromGitHub { owner = "chirpstack"; repo = "chirpstack-rest-api"; rev = "v${finalAttrs.version}"; - hash = "sha256-d8DoU5iqBtWLu8I0xzM8+ny16iylAbjRku7EC1m0o50="; + hash = "sha256-DOQ6S0o9kWYdIoR/SWW29hhsVJ9gKE3cRHrunhXHXJg="; }; - vendorHash = "sha256-b0m3a0U/XgRFR1lvfOUB1yQFZZ9j558WBiymnysjuGg="; + vendorHash = "sha256-5TEXM7sigSN6NpWUC3bv4rXhuArz1j8+R8P/arXa5rg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chisel/package.nix b/pkgs/by-name/ch/chisel/package.nix index 0b262add6dde..d1dbb68d2799 100644 --- a/pkgs/by-name/ch/chisel/package.nix +++ b/pkgs/by-name/ch/chisel/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "chisel"; - version = "1.11.6"; + version = "1.11.8"; src = fetchFromGitHub { owner = "jpillora"; repo = "chisel"; tag = "v${finalAttrs.version}"; - hash = "sha256-3pLqTOVJfp9MiorObS8I1KHB0MthzzK3oLFz+5emqxE="; + hash = "sha256-hhkauBn8yEnUmHQjgSF8LMM7zEwhIRRPIkx5VhVZCTI="; }; - vendorHash = "sha256-hqHd+62csVjHY2oAvi5fwlI0LbjR/LSDg6b1SMwe8Fw="; + vendorHash = "sha256-wt6d6yNi4QRI/RQiemfOAbc6FG8sBexWFT1dKOmFEes="; ldflags = [ "-s" diff --git a/pkgs/by-name/ch/chkcrontab/package.nix b/pkgs/by-name/ch/chkcrontab/package.nix index 2205eefcc159..04b8a2c8bc45 100644 --- a/pkgs/by-name/ch/chkcrontab/package.nix +++ b/pkgs/by-name/ch/chkcrontab/package.nix @@ -1,21 +1,27 @@ { lib, - python3, + python3Packages, fetchPypi, }: -with python3.pkgs; - -buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "chkcrontab"; version = "1.7"; - format = "setuptools"; + pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; sha256 = "0gmxavjkjkvjysgf9cf5fcpk589gb75n1mn20iki82wifi1pk1jn"; }; + postPatch = '' + # cannot install the manpage as it is not present in the wheel + substituteInPlace setup.py \ + --replace-fail "'doc/chkcrontab.1'" "" + ''; + + build-system = [ python3Packages.setuptools ]; + meta = { description = "Tool to detect crontab errors"; mainProgram = "chkcrontab"; diff --git a/pkgs/by-name/ch/chntpw/package.nix b/pkgs/by-name/ch/chntpw/package.nix index fe3d1e9e34aa..85229cf74f3b 100644 --- a/pkgs/by-name/ch/chntpw/package.nix +++ b/pkgs/by-name/ch/chntpw/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://pogostick.net/~pnh/ntpasswd/"; description = "Utility to reset the password of any user that has a valid local account on a Windows system"; - maintainers = with lib.maintainers; [ deepfire ]; + maintainers = [ ]; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ch/cholmod-extra/package.nix b/pkgs/by-name/ch/cholmod-extra/package.nix index 5426acb9b724..ce1c7c1534bc 100644 --- a/pkgs/by-name/ch/cholmod-extra/package.nix +++ b/pkgs/by-name/ch/cholmod-extra/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jluttine/cholmod-extra"; description = "Set of additional routines for SuiteSparse CHOLMOD Module"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ jluttine ]; platforms = with lib.platforms; unix; }; diff --git a/pkgs/by-name/ch/choose-gui/package.nix b/pkgs/by-name/ch/choose-gui/package.nix index 7a36bdfd60f8..63bb12ed9baa 100644 --- a/pkgs/by-name/ch/choose-gui/package.nix +++ b/pkgs/by-name/ch/choose-gui/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { changelog = "https://github.com/chipsenkbeil/choose/blob/${version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ heywoodlh - niksingh710 + semi710 ]; mainProgram = "choose"; }; diff --git a/pkgs/by-name/ch/chopchop/package.nix b/pkgs/by-name/ch/chopchop/package.nix index 4767b31ac7d1..70f9fc7902e2 100644 --- a/pkgs/by-name/ch/chopchop/package.nix +++ b/pkgs/by-name/ch/chopchop/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI to search for sensitive services/files/folders"; homepage = "https://github.com/michelin/ChopChop"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ch/chow-kick/package.nix b/pkgs/by-name/ch/chow-kick/package.nix index 729e7f93c03e..b85a99bba6e4 100644 --- a/pkgs/by-name/ch/chow-kick/package.nix +++ b/pkgs/by-name/ch/chow-kick/package.nix @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/Chowdhury-DSP/ChowKick"; description = "Kick synthesizer based on old-school drum machine circuits"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ChowKick"; diff --git a/pkgs/by-name/ch/chow-phaser/package.nix b/pkgs/by-name/ch/chow-phaser/package.nix index 79375f699547..a2859996588c 100644 --- a/pkgs/by-name/ch/chow-phaser/package.nix +++ b/pkgs/by-name/ch/chow-phaser/package.nix @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/ChowPhaser"; description = "Phaser effect based loosely on the Schulte Compact Phasing 'A'"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; mainProgram = "ChowPhaserStereo"; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ch/chow-tape-model/package.nix b/pkgs/by-name/ch/chow-tape-model/package.nix index 630bd0732071..56b4b1ce1ee8 100644 --- a/pkgs/by-name/ch/chow-tape-model/package.nix +++ b/pkgs/by-name/ch/chow-tape-model/package.nix @@ -123,7 +123,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/jatinchowdhury18/AnalogTapeModel"; description = "Physical modelling signal processing for analog tape recording. LV2, VST3, CLAP, and standalone"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ magnetophon ]; platforms = lib.platforms.linux; # error: 'vvtanh' was not declared in this scope; did you mean 'tanh'? diff --git a/pkgs/by-name/ch/chroma/package.nix b/pkgs/by-name/ch/chroma/package.nix index 965c5eb69add..b16544b934cb 100644 --- a/pkgs/by-name/ch/chroma/package.nix +++ b/pkgs/by-name/ch/chroma/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "chroma"; - version = "2.26.1"; + version = "2.27.0"; src = fetchFromGitHub { owner = "alecthomas"; repo = "chroma"; tag = "v${finalAttrs.version}"; - hash = "sha256-kOhPaiqtFU3H43jz+GjfOOIVEy5acpP9SwQ1/2xsMQc="; + hash = "sha256-iIu0FFAavXbma/LiKEDltvrGMYYd4uxSfHpNTrmN6aI="; }; - vendorHash = "sha256-mPB7qPPMIQLjmyN2T7qX/X1Ip0E4X0jNv5h+UfVEHrY="; + vendorHash = "sha256-B2TvCIBqgdTpQApmQkO2COIarqmgF9mhZ0HG5aFgVhY="; modRoot = "./cmd/chroma"; diff --git a/pkgs/by-name/ch/chrome-export/package.nix b/pkgs/by-name/ch/chrome-export/package.nix index 0228861b2edf..ba40c910fb6d 100644 --- a/pkgs/by-name/ch/chrome-export/package.nix +++ b/pkgs/by-name/ch/chrome-export/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Scripts to save Google Chrome's bookmarks and history as HTML bookmarks files"; homepage = "https://github.com/bdesham/chrome-export"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; maintainers = [ lib.maintainers.bdesham ]; platforms = python3.meta.platforms; }; diff --git a/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix b/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix new file mode 100644 index 000000000000..ca4cbec1470a --- /dev/null +++ b/pkgs/by-name/ch/chromium-hsts-preload-list/package.nix @@ -0,0 +1,37 @@ +{ + lib, + stdenvNoCC, + fetchurl, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "chromium-hsts-preload-list"; + version = "152.0.7937.0"; + + src = fetchurl { + url = "https://raw.github.com/chromium/chromium/${finalAttrs.version}/net/http/transport_security_state_static.json"; + hash = "sha256-kC18kJADCyxCtznyPzynTpnLOewIUWAGV8sQttUs9uU="; + }; + + dontUnpack = true; + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + + install -Dm444 $src $out/share/chromium-hsts-preload-list/transport_security_state_static.json + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Chromium HSTS preload list"; + homepage = "https://www.chromium.org/hsts/"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ schembriaiden ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh b/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh new file mode 100755 index 000000000000..4fa1d3459839 --- /dev/null +++ b/pkgs/by-name/ch/chromium-hsts-preload-list/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl jq nix + +set -euo pipefail + +latest_version=$( + curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/chromium/chromium/tags" \ + | jq -r 'map(select(.prerelease | not)) | .[1].name' +) + +hash=$( + nix-prefetch-url "https://raw.github.com/chromium/chromium/$latest_version/net/http/transport_security_state_static.json" +) +sri_hash=$(nix hash convert --hash-algo sha256 --to sri "$hash") + +cd "$(dirname "$0")/../../../.." +update-source-version chromium-hsts-preload-list "$latest_version" "$sri_hash" diff --git a/pkgs/by-name/ci/cicero-tui/package.nix b/pkgs/by-name/ci/cicero-tui/package.nix index 793e4438d2d6..88ea58c6dd68 100644 --- a/pkgs/by-name/ci/cicero-tui/package.nix +++ b/pkgs/by-name/ci/cicero-tui/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Unicode tool with a terminal user interface"; homepage = "https://github.com/eyeplum/cicero-tui"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "cicero"; }; diff --git a/pkgs/by-name/ci/cider-2/package.nix b/pkgs/by-name/ci/cider-2/package.nix index 90c81aecc8b1..501fd5abebf6 100644 --- a/pkgs/by-name/ci/cider-2/package.nix +++ b/pkgs/by-name/ci/cider-2/package.nix @@ -5,28 +5,27 @@ dpkg, autoPatchelfHook, makeWrapper, + gsettings-desktop-schemas, + dconf, # Required dependencies for autoPatchelfHook alsa-lib, - asar, gtk3, libgbm, libGL, nspr, nss, - widevine-cdm, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "cider-2"; - version = "3.1.8"; + version = "4.0.9.1"; src = fetchurl { - url = "https://repo.cider.sh/apt/pool/main/cider-v${version}-linux-x64.deb"; - hash = "sha256-cYtUVoDSESzElmmvhTPhLBXjiZF6fo3cJaw1QYCtVCg="; + url = "https://repo.cider.sh/apt/pool/main/cider-v${finalAttrs.version}-linux-x64.deb"; + hash = "sha256-MsA6lK3PsyOEx938FgJFx8l9oqwoM3FzIK5goF73lTs="; }; nativeBuildInputs = [ - asar dpkg autoPatchelfHook makeWrapper @@ -56,38 +55,29 @@ stdenv.mkDerivation rec { chmod +x $out/lib/cider/Cider + # The prefixes that follow LD_LIBRARY_PATH are typically injected via wrapGAppsHook3. + # We append them manually instead to avoid a double-wrapping. + makeWrapper $out/lib/cider/Cider $out/bin/cider-2 \ + --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \ + --add-flags "--no-sandbox --disable-gpu-sandbox" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" \ + --prefix XDG_DATA_DIRS : "${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}" \ + --prefix GIO_EXTRA_MODULES : "${dconf.lib}/lib/gio/modules" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" + runHook postInstall ''; - postInstall = '' - ${lib.getExe asar} extract $out/lib/cider/resources/app.asar ./cider-build - - # Patch login popup webview creation - substituteInPlace ./cider-build/.vite/build/events-*.js \ - --replace-fail 'else if(c.includes(r))return{action:"allow"}' 'else if(c.includes(r))return{action:"allow",overrideBrowserWindowOptions:{webPreferences:{devTools:!0,nodeIntegration:!1,contextIsolation:!0,webSecurity:!1,sandbox:!1,experimentalFeatures:!0}}}' - - ${lib.getExe asar} pack ./cider-build $out/lib/cider/resources/app.asar - rm -rf ./cider-build - - # Install Widevine CDM for DRM support - ln -sf ${widevine-cdm}/share/google/chrome/WidevineCdm $out/lib/cider/ - ''; - postFixup = '' - makeWrapper $out/lib/cider/Cider $out/bin/${pname} \ - --add-flags "\$\{NIXOS_OZONE_WL:+\$\{WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true\}\}" \ - --add-flags "--no-sandbox --disable-gpu-sandbox" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libGL ]}" - - mv $out/share/applications/cider.desktop $out/share/applications/${pname}.desktop - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-warn 'Exec=cider' 'Exec=${pname}' \ - --replace-warn 'Exec=/usr/lib/cider/Cider' 'Exec=${pname}' + mv $out/share/applications/cider.desktop $out/share/applications/cider-2.desktop + substituteInPlace $out/share/applications/cider-2.desktop \ + --replace-fail Exec=cider Exec=cider-2 install -Dm444 $out/share/pixmaps/cider.png \ $out/share/icons/hicolor/256x256/apps/cider.png - rm -r $out/share/pixmaps + rm -r $out/share/{pixmaps,lintian} ''; passthru.updateScript = ./updater.sh; @@ -99,8 +89,9 @@ stdenv.mkDerivation rec { mainProgram = "cider-2"; maintainers = with lib.maintainers; [ amadejkastelic + antoineco l0r3v ]; platforms = [ "x86_64-linux" ]; }; -} +}) diff --git a/pkgs/by-name/ci/cider/package.nix b/pkgs/by-name/ci/cider/package.nix deleted file mode 100644 index 227c507862e8..000000000000 --- a/pkgs/by-name/ci/cider/package.nix +++ /dev/null @@ -1,42 +0,0 @@ -{ - appimageTools, - lib, - fetchurl, - makeWrapper, -}: - -appimageTools.wrapType2 rec { - pname = "cider"; - version = "1.6.3"; - - src = fetchurl { - url = "https://github.com/ciderapp/Cider/releases/download/v${version}/Cider-${version}.AppImage"; - sha256 = "sha256-NwoV1eeAN0u9VXWpu5mANXhmgqe8u3h7BlsREP1f/pI="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - extraInstallCommands = - let - contents = appimageTools.extract { inherit pname version src; }; - in - '' - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - - install -m 444 -D ${contents}/${pname}.desktop -t $out/share/applications - substituteInPlace $out/share/applications/${pname}.desktop \ - --replace-warn 'Exec=AppRun' 'Exec=${pname}' - cp -r ${contents}/usr/share/icons $out/share - ''; - - meta = { - description = "New look into listening and enjoying Apple Music in style and performance"; - homepage = "https://github.com/ciderapp/Cider"; - license = lib.licenses.agpl3Only; - mainProgram = "cider"; - maintainers = [ lib.maintainers.cigrainger ]; - platforms = [ "x86_64-linux" ]; - broken = true; - }; -} diff --git a/pkgs/by-name/ci/cilium-cli/package.nix b/pkgs/by-name/ci/cilium-cli/package.nix index 8a0a38176433..727f3a838167 100644 --- a/pkgs/by-name/ci/cilium-cli/package.nix +++ b/pkgs/by-name/ci/cilium-cli/package.nix @@ -11,13 +11,13 @@ buildGoModule (finalAttrs: { pname = "cilium-cli"; - version = "0.19.4"; + version = "0.19.6"; src = fetchFromGitHub { owner = "cilium"; repo = "cilium-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-DDNs9cJrurTA2yNrm0AJTfl7m6tiWwERmdgKzceiK9I="; + hash = "sha256-2Yj0CvhF848oeLTnonk+ItBkNqN+RZekCQjcfr6ZYUM="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ci/cine/package.nix b/pkgs/by-name/ci/cine/package.nix index bfacf5d33111..224bd1b9185a 100644 --- a/pkgs/by-name/ci/cine/package.nix +++ b/pkgs/by-name/ci/cine/package.nix @@ -19,14 +19,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "cine"; - version = "1.4.1"; + version = "1.7.0"; pyproject = false; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Cine"; tag = "v${finalAttrs.version}"; - hash = "sha256-XB7DrFASIivCDvcNnuiVRI4xnkj0rOzHnD5z1AugGdQ="; + hash = "sha256-WBzdBZ7WL6HAd26tJtTaw39jAtdNYNiNmYHhVr+JBtM="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ci/cinnamon-session/package.nix b/pkgs/by-name/ci/cinnamon-session/package.nix index d64794db4bd6..1628fa160e20 100644 --- a/pkgs/by-name/ci/cinnamon-session/package.nix +++ b/pkgs/by-name/ci/cinnamon-session/package.nix @@ -39,13 +39,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cinnamon-session"; - version = "6.6.3"; + version = "6.6.4"; src = fetchFromGitHub { owner = "linuxmint"; repo = "cinnamon-session"; tag = finalAttrs.version; - hash = "sha256-fmeLywpM4QhgyiX68E+4vosUK2WKGVJ1Cx8pYdOnb+k="; + hash = "sha256-rx7+tBXQ9kvnRYNxgF1QXyhk9NamUIjti/6GGrACYU0="; }; buildInputs = [ diff --git a/pkgs/by-name/ci/cinnamon/package.nix b/pkgs/by-name/ci/cinnamon/package.nix index 3d80235e643a..b8dbff2dacee 100644 --- a/pkgs/by-name/ci/cinnamon/package.nix +++ b/pkgs/by-name/ci/cinnamon/package.nix @@ -10,6 +10,7 @@ cjs, evolution-data-server, fetchFromGitHub, + fetchpatch, gcr, gdk-pixbuf, gettext, @@ -86,6 +87,18 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./use-sane-install-dir.patch ./libdir.patch + + # util.js: Adapt to GIR 2.0 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/3a2d558aa575f0ea364c5b4e30d2eb3ee604ee58.patch"; + hash = "sha256-+uAGuQJ0VsIvMvPFafyoXmU4MiHfbbRXLzeW/n62ucw="; + }) + + # cinnamon-calendar-server.py: Allow ICal 4.0 + (fetchpatch { + url = "https://github.com/linuxmint/cinnamon/commit/dcf2d986c1ec167b0a8005ef2ca427317438c8d7.patch"; + hash = "sha256-4sCZShUOXPaJoumiuEG558e0l8CIehH0P+C9OouG3vI="; + }) ]; buildInputs = [ @@ -211,7 +224,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/linuxmint/cinnamon"; description = "Cinnamon desktop environment"; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.linux; teams = [ lib.teams.cinnamon ]; }; diff --git a/pkgs/by-name/ci/cinny-desktop/package.nix b/pkgs/by-name/ci/cinny-desktop/package.nix index c37b2a3b6025..4654b89dc523 100644 --- a/pkgs/by-name/ci/cinny-desktop/package.nix +++ b/pkgs/by-name/ci/cinny-desktop/package.nix @@ -20,35 +20,30 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cinny-desktop"; - # We have to be using the same version as cinny-web or this isn't going to work. - version = "4.12.2"; + version = "4.12.5"; src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-gaTgNTn0/HHzULHRL03+t73MEUOGdqcEyqaIt8CWA0k="; + hash = "sha256-/A/O42jwwK2iDV1IdRjOO8fE/AZ0h7UWAZZLozOqUWs="; }; sourceRoot = "${finalAttrs.src.name}/src-tauri"; - cargoHash = "sha256-x7rpnhTz454Ftolu4x50NSGKdg8NfenUwdhPY4a+lbA="; + cargoHash = "sha256-EF8gpfeZasazq0NKrjItt4bkgautQjYjEegf1OlWLOw="; postPatch = let - cinny' = - assert lib.assertMsg ( - cinny.version == finalAttrs.version - ) "cinny.version (${cinny.version}) != cinny-desktop.version (${finalAttrs.version})"; - cinny.override { - conf = { - hashRouter.enabled = true; - }; + cinny' = cinny.override { + conf = { + hashRouter.enabled = true; }; + }; in '' ${lib.getExe jq} \ - 'del(.plugins.tauri.updater) | .build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \ + '.build.frontendDist = "${cinny'}" | del(.build.beforeBuildCommand) | .bundle.createUpdaterArtifacts = false' tauri.conf.json \ | ${lib.getExe' moreutils "sponge"} tauri.conf.json ''; @@ -82,6 +77,9 @@ rustPlatform.buildRustPackage (finalAttrs: { webkitgtk_4_1 ]; + buildNoDefaultFeatures = true; + buildFeatures = [ "custom-protocol" ]; + passthru = { updateScript = _experimental-update-script-combinators.sequence [ (nix-update-script { attrPath = "cinny-unwrapped"; }) diff --git a/pkgs/by-name/ci/cinny-unwrapped/package.nix b/pkgs/by-name/ci/cinny-unwrapped/package.nix index add2f7191cc7..f8b00f00cf07 100644 --- a/pkgs/by-name/ci/cinny-unwrapped/package.nix +++ b/pkgs/by-name/ci/cinny-unwrapped/package.nix @@ -7,17 +7,17 @@ buildNpmPackage (finalAttrs: { pname = "cinny-unwrapped"; # Remember to update cinny-desktop when bumping this version. - version = "4.12.2"; + version = "4.12.3"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "cinnyapp"; repo = "cinny"; tag = "v${finalAttrs.version}"; - hash = "sha256-UF5MwV02G0oYIXtvyzHn+DifYM8PFlyb9DZ4w1fuyDE="; + hash = "sha256-RjPdq9xNvUbJESV7CqxmgfqAx+MoKZbhUtJNTcH9aUk="; }; - npmDepsHash = "sha256-8SyUFv1wgnqfSyBlykmeGI8RAmFt5Q5uS6OFLi+qPPY="; + npmDepsHash = "sha256-CU8AVRuMFOGI0/LbN0LGysBk+qc2XQYxQGfrrH72stc="; # Skip rebuilding native modules since they're not needed for the web app npmRebuildFlags = [ diff --git a/pkgs/by-name/ci/cinny/package.nix b/pkgs/by-name/ci/cinny/package.nix index df494780e81d..02bfc4fca9cf 100644 --- a/pkgs/by-name/ci/cinny/package.nix +++ b/pkgs/by-name/ci/cinny/package.nix @@ -4,15 +4,16 @@ stdenvNoCC, writeText, conf ? { }, + pname ? "cinny", }: let - configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf); + configOverrides = writeText "${pname}-config-overrides.json" (builtins.toJSON conf); in if (conf == { }) then cinny-unwrapped else stdenvNoCC.mkDerivation { - pname = "cinny"; + inherit pname; inherit (cinny-unwrapped) version meta; dontUnpack = true; diff --git a/pkgs/by-name/ci/circom/package.nix b/pkgs/by-name/ci/circom/package.nix index 80b4804393f3..f0614c81400e 100644 --- a/pkgs/by-name/ci/circom/package.nix +++ b/pkgs/by-name/ci/circom/package.nix @@ -24,6 +24,6 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/iden3/circom"; changelog = "https://github.com/iden3/circom/blob/${finalAttrs.src.rev}/RELEASES.md"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ci/circumflex/package.nix b/pkgs/by-name/ci/circumflex/package.nix index 13b89884cd2e..c67ad6087ee0 100644 --- a/pkgs/by-name/ci/circumflex/package.nix +++ b/pkgs/by-name/ci/circumflex/package.nix @@ -1,10 +1,8 @@ { lib, - less, - ncurses, buildGoModule, fetchFromGitHub, - makeWrapper, + installShellFiles, }: buildGoModule (finalAttrs: { @@ -20,16 +18,20 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-4YL0N8wA8igveYfeL4uZDY5YD1InW0iD3WWq1E/vIJs="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ + installShellFiles + ]; + + excludedPackages = [ + "gen-completions" + ]; postInstall = '' - wrapProgram $out/bin/clx \ - --prefix PATH : ${ - lib.makeBinPath [ - less - ncurses - ] - } + installManPage share/man/clx.1 + + installShellCompletion --bash share/completions/clx.bash + installShellCompletion --fish share/completions/clx.fish + installShellCompletion --zsh share/completions/_clx ''; meta = { diff --git a/pkgs/by-name/ci/cirrusgo/package.nix b/pkgs/by-name/ci/cirrusgo/package.nix index d02de5a3adbe..49674d8004e5 100644 --- a/pkgs/by-name/ci/cirrusgo/package.nix +++ b/pkgs/by-name/ci/cirrusgo/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan SAAS and PAAS applications"; mainProgram = "cirrusgo"; homepage = "https://github.com/Ph33rr/cirrusgo"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/applications/networking/remote/citrix-workspace/generic.nix b/pkgs/by-name/ci/citrix-workspace/package.nix similarity index 75% rename from pkgs/applications/networking/remote/citrix-workspace/generic.nix rename to pkgs/by-name/ci/citrix-workspace/package.nix index 1ea48306fe1f..f3f0c2498c67 100644 --- a/pkgs/applications/networking/remote/citrix-workspace/generic.nix +++ b/pkgs/by-name/ci/citrix-workspace/package.nix @@ -18,12 +18,8 @@ gdk-pixbuf, glib, glib-networking, - gnome2, gst_all_1, - gtk2, - gtk2-x11, gtk3, - gtk_engines, harfbuzzFull, heimdal, hyphen, @@ -41,12 +37,11 @@ libjson, libmanette, libnotify, - libpng12, libpulseaudio, libredirect, libseccomp, libsecret, - libsoup_2_4, + libsoup_3, libvorbis, libxml2_13, libxslt, @@ -55,10 +50,8 @@ nspr, nss, opencv4, - openssl, pango, pcsclite, - perl, sane-backends, speex, symlinkJoin, @@ -66,6 +59,7 @@ tzdata, which, woff2, + webkitgtk_4_1, libxtst, libxscrnsaver, libxrender, @@ -78,13 +72,8 @@ xprop, xdpyinfo, libxcb, - x264, zlib, - homepage, - version, - hash, - extraCerts ? [ ], }: @@ -96,7 +85,6 @@ let gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly - gst_all_1.gst-vaapi ]; gstPluginPath = lib.makeSearchPathOutput "lib" "lib/gstreamer-1.0" gstPackages; @@ -105,27 +93,15 @@ let name = "fuse3-backwards-compat"; paths = [ (lib.getLib fuse3) ]; postBuild = '' - ln -sf $out/lib/libfuse3.so.3.17.4 $out/lib/libfuse3.so.3 - ''; - }; - - openssl' = symlinkJoin { - name = "openssl-backwards-compat"; - nativeBuildInputs = [ makeWrapper ]; - paths = [ (lib.getLib openssl) ]; - postBuild = '' - ln -sf $out/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 - ln -sf $out/lib/libssl.so $out/lib/libssl.so.1.0.0 + ln -sf $out/lib/libfuse3.so.3.* $out/lib/libfuse3.so.3 ''; }; opencv4' = symlinkJoin { name = "opencv4-compat"; - nativeBuildInputs = [ makeWrapper ]; paths = [ opencv4 ]; postBuild = '' for so in ${opencv4}/lib/*.so; do - ln -s "$so" $out/lib/$(basename "$so").407 || true ln -s "$so" $out/lib/$(basename "$so").410 || true done ''; @@ -133,21 +109,21 @@ let in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "citrix-workspace"; - inherit version; + version = "26.04.0.105"; src = requireFile rec { - name = "linuxx64-${version}.tar.gz"; - sha256 = hash; + name = "linuxx64-${finalAttrs.version}.tar.gz"; + sha256 = "1kl6b1ldjd9gb6cmvhxf6ggvc3amq1kz0qwjlb1fp6dxx0pivwm8"; message = '' In order to use Citrix Workspace, you need to comply with the Citrix EULA and download the 64-bit binaries, .tar.gz from: - ${homepage} + https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html - (if you do not find version ${version} there, try at + (if you do not find version ${finalAttrs.version} there, try at https://www.citrix.com/downloads/workspace-app/) Once you have downloaded the file, please use the following command and re-run the @@ -163,7 +139,7 @@ stdenv.mkDerivation rec { __structuredAttrs = true; sourceRoot = "."; preferLocalBuild = true; - passthru.icaroot = "${placeholder "out"}/opt/citrix-icaclient"; + passthru.icaroot = "${finalAttrs.finalPackage}/opt/citrix-icaclient"; nativeBuildInputs = [ autoPatchelfHook @@ -186,11 +162,7 @@ stdenv.mkDerivation rec { fuse3' gdk-pixbuf glib-networking - gnome2.gtkglext - gtk2 - gtk2-x11 gtk3 - gtk_engines harfbuzzFull heimdal hyphen @@ -206,11 +178,10 @@ stdenv.mkDerivation rec { libjson libmanette libnotify - libpng12 libpulseaudio libseccomp libsecret - libsoup_2_4 + libsoup_3 libvorbis libxml2_13 libxslt @@ -218,7 +189,6 @@ stdenv.mkDerivation rec { nspr nss opencv4' - openssl' pango pcsclite sane-backends @@ -226,11 +196,11 @@ stdenv.mkDerivation rec { stdenv.cc.cc (lib.getLib systemd) woff2 + webkitgtk_4_1 libxscrnsaver libxaw libxmu libxtst - x264 zlib ] ++ gstPackages; @@ -275,8 +245,7 @@ stdenv.mkDerivation rec { lib.optional (isWfica program) "$ICAInstDir" ++ [ "$ICAInstDir/lib" - "$ICAInstDir/usr/lib/x86_64-linux-gnu" - "$ICAInstDir/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle" + "${lib.getLib webkitgtk_4_1}/lib/webkit2gtk-4.1/injected-bundle" # HdxRtcEngine loads libpulse.so.0 with dlopen, so autoPatchelf # cannot discover it from ELF dependencies. "${lib.getLib libpulseaudio}/lib" @@ -297,7 +266,16 @@ stdenv.mkDerivation rec { ''--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "${gstPluginPath}"'' ''--prefix LD_LIBRARY_PATH : "${ldLibraryPath program}"'' ''--set LD_PRELOAD "${libredirect}/lib/libredirect.so ${lib.getLib pcsclite}/lib/libpcsclite.so"'' - ''--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone:/usr/lib/x86_64-linux-gnu=$ICAInstDir/usr/lib/x86_64-linux-gnu"'' + ''--set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone"'' + ] + ++ lib.optionals (isWfica program) [ + # wfica is an X11 client (it runs under XWayland). On a Wayland + # session Mesa's EGL loader otherwise auto-selects the Wayland + # platform for wfica's startup OpenGL probe and segfaults in + # wl_proxy_create_wrapper; pin the client to X11 (user-overridable). + # See https://github.com/NixOS/nixpkgs/issues/540102 + "--set-default GDK_BACKEND x11" + "--set-default EGL_PLATFORM x11" ] ); @@ -328,6 +306,7 @@ stdenv.mkDerivation rec { "util/configmgr" "util/conncenter" "util/ctx_rehash" + "util/ctxwebhelper" ]; in '' @@ -349,12 +328,13 @@ stdenv.mkDerivation rec { source_date=$(date --utc --date=@$SOURCE_DATE_EPOCH "+%F %T") faketime -f "$source_date" ${stdenv.shell} linuxx64/hinst CDROM "$(pwd)" - mkdir -p "$ICAInstDir/usr" - tar -xzf ./linuxx64/linuxx64.cor/Webkit2gtk4.0/webkit2gtk-4.0.tar.gz \ - --strip-components=2 \ - -C "$ICAInstDir/usr" \ - webkit2gtk-4.0-package/usr/lib + # The GCC 11 package line links against libsoup 3 and WebKitGTK 4.1, but + # the tarball still contains the legacy WebKitGTK 4.0 bundle. + rm -rf "$ICAInstDir/Webkit2gtk4.0" + # FHS launcher hinst generates even for non-root installs; it hardcodes + # store paths without any of the wrapper environment. + rm -f "$ICAInstDir/wfica.sh" if [ -f "$ICAInstDir/util/setlog" ]; then chmod +x "$ICAInstDir/util/setlog" ln -sf "$ICAInstDir/util/setlog" "$out/bin/citrix-setlog" @@ -365,7 +345,6 @@ stdenv.mkDerivation rec { "PrimaryAuthManager" "ServiceRecord" "AuthManagerDaemon" - "util/ctxwebhelper" ]} ln -sf $ICAInstDir/util/storebrowse $out/bin/storebrowse @@ -390,38 +369,47 @@ stdenv.mkDerivation rec { echo "We arbitrarily set the timezone to UTC. No known consequences at this point." echo UTC > "$ICAInstDir/timezone" - echo "Copy .desktop files." - cp $out/opt/citrix-icaclient/desktop/* $out/share/applications/ - for desktop in $out/share/applications/*.desktop; do + echo "Patch .desktop files." + for desktop in "$ICAInstDir"/desktop/*.desktop; do sed -i \ -e "s#/opt/Citrix/ICAClient#$ICAInstDir#g" \ - -e "s#$ICAInstDir/util/ctxwebhelper#ctxwebhelper#g" \ "$desktop" case "$(basename "$desktop")" in citrixapp.desktop) sed -i \ - -e 's#^TryExec=.*#TryExec=selfservice#' \ - -e 's#^Exec=.*#Exec=selfservice %u#' \ + -e "s#^TryExec=.*#TryExec=$out/bin/selfservice#" \ + -e "s#^Exec=.*#Exec=$out/bin/selfservice %u#" \ + "$desktop" + ;; + citrixweb.desktop | ctxaadsso.desktop | fido2_llt.desktop | receiver.desktop | receiver_fido2.desktop) + sed -i \ + -e "s#^TryExec=.*#TryExec=$out/bin/ctxwebhelper#" \ + -e "s#^Exec=.*#Exec=$out/bin/ctxwebhelper %u#" \ "$desktop" ;; selfservice.desktop) sed -i \ - -e 's#^TryExec=.*#TryExec=selfservice#' \ - -e 's#^Exec=.*#Exec=selfservice#' \ + -e "s#^TryExec=.*#TryExec=$out/bin/selfservice#" \ + -e "s#^Exec=.*#Exec=$out/bin/selfservice#" \ "$desktop" ;; wfica.desktop) sed -i \ - -e 's#^TryExec=.*#TryExec=adapter#' \ - -e 's#^Exec=.*#Exec=adapter %f#' \ + -e "s#^TryExec=.*#TryExec=$out/bin/adapter#" \ + -e "s#^Exec=.*#Exec=$out/bin/adapter %f#" \ "$desktop" ;; esac done - # We introduce a dependency on the source file so that it need not be redownloaded everytime - echo $src >> "$out/share/workspace_dependencies.pin" + echo "Copy .desktop files." + cp $out/opt/citrix-icaclient/desktop/*.desktop $out/share/applications/ + + install -Dm444 "$ICAInstDir/desktop/Citrix-mime_types.xml" \ + $out/share/mime/packages/Citrix-mime_types.xml + install -Dm444 "$ICAInstDir/icons/000_Receiver_64.png" \ + $out/share/icons/hicolor/64x64/apps/Citrix-Receiver.png runHook postInstall ''; @@ -429,13 +417,7 @@ stdenv.mkDerivation rec { # Make sure that `autoPatchelfHook` is executed before # running `ctx_rehash`. dontAutoPatchelf = true; - # Null out hardcoded webkit bundle path so it falls back to LD_LIBRARY_PATH postFixup = '' - ${lib.getExe perl} -0777 -pi -e 's{/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle/}{"\0" x length($&)}e' \ - $out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu/libwebkit2gtk-4.0.so.37.56.4 - - addAutoPatchelfSearchPath --no-recurse "$out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu" - addAutoPatchelfSearchPath "$out/opt/citrix-icaclient/usr/lib/x86_64-linux-gnu/webkit2gtk-4.0/injected-bundle" addAutoPatchelfSearchPath "$out/opt/citrix-icaclient/lib" autoPatchelf -- "$out" @@ -443,14 +425,14 @@ stdenv.mkDerivation rec { ''; meta = { - # Older versions need webkitgtk_4_0 which was removed. - # 25.08 bundles the same. - broken = lib.versionOlder version "25.08"; license = lib.licenses.unfree; description = "Citrix Workspace"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with lib.maintainers; [ flacks ]; - inherit homepage; + maintainers = with lib.maintainers; [ + khaneliman + flacks + ]; + homepage = "https://www.citrix.com/downloads/workspace-app/betas-and-tech-previews/workspace-app-tp-gcc11-for-linux.html"; }; -} +}) diff --git a/pkgs/by-name/ci/civetweb/package.nix b/pkgs/by-name/ci/civetweb/package.nix index 6736b11090e8..13c996fddcbf 100644 --- a/pkgs/by-name/ci/civetweb/package.nix +++ b/pkgs/by-name/ci/civetweb/package.nix @@ -66,6 +66,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Embedded C/C++ web server"; mainProgram = "civetweb"; homepage = "https://github.com/civetweb/civetweb"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/ci/civicrm/package.nix b/pkgs/by-name/ci/civicrm/package.nix new file mode 100644 index 000000000000..5e10dadc8bed --- /dev/null +++ b/pkgs/by-name/ci/civicrm/package.nix @@ -0,0 +1,38 @@ +{ + lib, + php, + fetchFromGitHub, +}: +php.buildComposerProject2 (finalAttrs: { + pname = "civicrm-core"; + version = "6.15.3"; + __structuredAttrs = true; + strictDeps = true; + dontUnpack = false; + + src = fetchFromGitHub { + owner = "civicrm"; + repo = "civicrm-core"; + tag = finalAttrs.version; + hash = "sha256-BKiV2dZSFo5asnTwtnNsJrZKjFd9Ar3a3kaIlpuGDp8="; + }; + + vendorHash = "sha256-z4DyAupfGNxhEuGShZQA8bl6041od0Kx0/BAoz9uc5I="; + + installPhase = '' + runHook preInstall + mkdir -p $out/ + cp -R . $out/ + cp $out/bin/setup.conf.txt $out/bin/setup.conf + runHook postInstall + ''; + + meta = { + homepage = "https://civicrm.org/"; + changelog = "https://download.civicrm.org/release/${finalAttrs.version}"; + description = "Standalone version of CiviCRM, a CRM software for non-profit organizations"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.sorooris ]; + mainProgram = "civicrm"; + }; +}) diff --git a/pkgs/by-name/cj/cjose/package.nix b/pkgs/by-name/cj/cjose/package.nix index 59ceae11a2de..5b6a65c5a7af 100644 --- a/pkgs/by-name/cj/cjose/package.nix +++ b/pkgs/by-name/cj/cjose/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.6.2.2"; src = fetchFromGitHub { - owner = "zmartzone"; + owner = "OpenIDC"; repo = "cjose"; rev = "v${finalAttrs.version}"; sha256 = "sha256-vDvCxMpgCdteGvNxy2HCNRaxbhxOuTadL0nM2wkFHtk="; @@ -47,8 +47,8 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/zmartzone/cjose"; - changelog = "https://github.com/zmartzone/cjose/blob/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/OpenIDC/cjose"; + changelog = "https://github.com/OpenIDC/cjose/blob/${finalAttrs.version}/CHANGELOG.md"; description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ midchildan ]; diff --git a/pkgs/by-name/cl/cl/package.nix b/pkgs/by-name/cl/cl/package.nix index 33f19af1798b..0ed69f19ed7e 100644 --- a/pkgs/by-name/cl/cl/package.nix +++ b/pkgs/by-name/cl/cl/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, rebar3, - erlang, + beamPackages, opencl-headers, ocl-icd, }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - erlang + beamPackages.erlang rebar3 opencl-headers ocl-icd diff --git a/pkgs/by-name/cl/clamav/package.nix b/pkgs/by-name/cl/clamav/package.nix index 155046aa8e16..e699e3fa2c5f 100644 --- a/pkgs/by-name/cl/clamav/package.nix +++ b/pkgs/by-name/cl/clamav/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "clamav"; - version = "1.4.3"; + version = "1.5.2"; src = fetchurl { url = "https://www.clamav.net/downloads/production/clamav-${finalAttrs.version}.tar.gz"; - hash = "sha256-2HTKvz1HZbNbUY71NWWKHm7HSAIAah1hP58SSqE0MhA="; + hash = "sha256-80AYzyLwW92dGhV0ygcZPj4DDKUgUMPlwiDiOjIxSWU="; }; patches = [ @@ -67,11 +67,11 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DSYSTEMD_UNIT_DIR=${placeholder "out"}/lib/systemd" "-DAPP_CONFIG_DIRECTORY=/etc/clamav" + "-DCVD_CERTS_DIRECTORY=${placeholder "out"}/share/clamav/certs" ]; - # Seems to only fail on x86_64-darwin with sandboxing - doCheck = !(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64); - __darwinAllowLocalNetworking = true; + # Fails on darwin with sandboxing + doCheck = !(stdenv.hostPlatform.isDarwin); checkInputs = [ python3.pkgs.pytest diff --git a/pkgs/by-name/cl/clang-uml/package.nix b/pkgs/by-name/cl/clang-uml/package.nix index 8bf5a994fe9e..746c96f003a5 100644 --- a/pkgs/by-name/cl/clang-uml/package.nix +++ b/pkgs/by-name/cl/clang-uml/package.nix @@ -17,13 +17,13 @@ }: clangStdenv.mkDerivation (finalAttrs: { pname = "clang-uml"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "bkryza"; repo = "clang-uml"; rev = finalAttrs.version; - hash = "sha256-hGjLOyduTc+yOQhO5gDKNfY0fDvbUfvF0FrdjrDheyw="; + hash = "sha256-t0z9VcPkdX9qKt/gA24G50+62Teh4eVF4etd4f6HzoQ="; }; patches = [ diff --git a/pkgs/by-name/cl/clap/package.nix b/pkgs/by-name/cl/clap/package.nix index 9e30cb4f96f7..5007bb7e0e1f 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.8"; + version = "1.2.10"; src = fetchFromGitHub { owner = "free-audio"; repo = "clap"; rev = finalAttrs.version; - hash = "sha256-slvq7p15xCa7l2tvEaGPzDL8w6/8EI0DySC4Zp+c7tQ="; + hash = "sha256-87vmpcfi2+bWZ0GFU91Qd52WddeuHTIDAdz9fc4ciJc="; }; postPatch = '' diff --git a/pkgs/by-name/cl/clapgrep/package.nix b/pkgs/by-name/cl/clapgrep/package.nix index f64e4e7df6e0..31325d53b528 100644 --- a/pkgs/by-name/cl/clapgrep/package.nix +++ b/pkgs/by-name/cl/clapgrep/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Search through all your files"; homepage = "https://github.com/luleyleo/clapgrep"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "clapgrep"; diff --git a/pkgs/by-name/cl/clarity-city/package.nix b/pkgs/by-name/cl/clarity-city/package.nix index f6c8edd2fca4..f6e9975102c4 100644 --- a/pkgs/by-name/cl/clarity-city/package.nix +++ b/pkgs/by-name/cl/clarity-city/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { version = "1.0.0"; src = fetchFromGitHub { - owner = "vmware"; + owner = "vmware-archive"; repo = "clarity-city"; rev = "v${finalAttrs.version}"; hash = "sha256-1POSdd2ICnyNNmGadIujezNK8qvARD0kkLR4yWjs5kA="; @@ -29,7 +29,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Open source sans-serif typeface"; - homepage = "https://github.com/vmware/clarity-city"; + homepage = "https://github.com/vmware-archive/clarity-city"; license = lib.licenses.ofl; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ sagikazarmark ]; diff --git a/pkgs/by-name/cl/clash-rs/package.nix b/pkgs/by-name/cl/clash-rs/package.nix index ecde76a9503e..f0f813ab2995 100644 --- a/pkgs/by-name/cl/clash-rs/package.nix +++ b/pkgs/by-name/cl/clash-rs/package.nix @@ -13,13 +13,13 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-rs"; - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "Watfaq"; repo = "clash-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-ncMJxVNHAgeXWhqZgWt3nth4BXqrrBaAEWmOVF/KsPg="; + hash = "sha256-tY/GB6J8kr6Ni9ScOpKkDYLaLffvtaIxH8tXK24LHt8="; }; patches = [ @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ./skip-npm-ci.patch ]; - cargoHash = "sha256-WI+wg6cu0cBFrZYyN3GXlfHOmo/cVo2uMLn1D5YTOCQ="; + cargoHash = "sha256-SlkqNu6Vk1D9aU4GgyNDW9Or3z8KSbEjwCUK9w3Jyx0="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/clash-dashboard"; - hash = "sha256-8fDeO7Yx+m2s0mzTO7MkQOQ0UYs8B2vFnNevHHZFghc="; + hash = "sha256-H8G3GuEh4JXZV1zxTfo89tl6D6WA5hWGOF9i8qP0njw="; }; npmRoot = "clash-dashboard"; diff --git a/pkgs/by-name/cl/clash-verge-rev/package.nix b/pkgs/by-name/cl/clash-verge-rev/package.nix index b09d09b28d4b..eb65597248ff 100644 --- a/pkgs/by-name/cl/clash-verge-rev/package.nix +++ b/pkgs/by-name/cl/clash-verge-rev/package.nix @@ -13,17 +13,17 @@ let pname = "clash-verge-rev"; # Please keep service version in sync - version = "2.5.1"; + version = "2.5.2"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-rev"; tag = "v${version}"; - hash = "sha256-2X2QlWo12qM7RT0wjf1Xlmh3We2wZR/kJnSxIxVst9Y="; + hash = "sha256-5Txjuzq91D+FfBHaXenES4eprIdIKHUFMOKtrHSdbw4="; }; - pnpm-hash = "sha256-JvY7olf1OOQ+j/z7hFEcmum24WlPggrur3K8cTEgc7g="; - vendor-hash = "sha256-nF9d1OWpn3rf4EPhD4vqQbKEp/J5pc7J7XJDgAjd0DA="; + pnpm-hash = "sha256-AS07hD3QqPJDLLUvNgArtXpH54ek14PmEjevP1WxTHs="; + vendor-hash = "sha256-GPqgzOLFPAb8SNgE3vI5Ypx+zJvk+5TgkttRVktxttU="; service = callPackage ./service.nix { inherit diff --git a/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch b/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch index 186340d9b9cd..8b9aa2962a23 100644 --- a/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch +++ b/pkgs/by-name/cl/clash-verge-rev/patch-service-directory.patch @@ -1,26 +1,65 @@ diff --git a/src/core/server.rs b/src/core/server.rs -index 45570ea..d459b3e 100644 +index 0098b20..db189e2 100644 --- a/src/core/server.rs +++ b/src/core/server.rs -@@ -123,7 +123,7 @@ async fn make_ipc_dir() -> Result<()> { - // on macOS or the primary group on Linux) to manage the socket's lifecycle. This prevents - // permission denied errors when the GUI process, running with non-root privileges, - // attempts to recreate the socket during service initialization or sidecar fallbacks. -- fs::set_permissions(dir_path, Permissions::from_mode(0o2770)).await?; -+ fs::set_permissions(dir_path, Permissions::from_mode(0o770)).await?; +@@ -73,7 +73,7 @@ pub async fn run_ipc_server() -> Result>> { + tokio::time::sleep(std::time::Duration::from_millis(25)).await; + } + if socket_ready { +- fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o777)).await?; ++ fs::set_permissions(paths.ipc_path(), Permissions::from_mode(0o660)).await?; + } else { + warn!( + "IPC socket {:?} did not appear before permission update timeout", +@@ -298,19 +298,9 @@ fn ensure_ipc_dir(dir: &std::path::Path) -> std::io::Result<()> { + return Err(std::io::Error::last_os_error()); } - #[cfg(windows)] - { + +- let gid = resolve_ipc_dir_gid(); +- // 以 root 运行(生产/launchd)时强制属主为 root:若攻击者预置 `/tmp/verge` 为其拥有的 +- // 真实目录,必须夺回属主,否则其以 owner 身份保留对目录(及内部 socket)的管理权。 +- // 非 root(测试/开发)既无权设 root 属主也无攻击面,跳过 chown,仅设权限位。 +- // chown/chmod 失败即 fatal;`&&`/`||` 短路使 `last_os_error()` 为失败 syscall 的 errno。 +- let chown_ok = +- unsafe { platform_lib::geteuid() } != 0 || unsafe { platform_lib::fchown(fd, 0, gid) } == 0; +- let ok = chown_ok && unsafe { platform_lib::fchmod(fd, 0o2770 as platform_lib::mode_t) } == 0; +- let result = if ok { +- Ok(()) +- } else { +- Err(std::io::Error::last_os_error()) +- }; ++ // The NixOS module's RuntimeDirectory owns the directory access policy. ++ // Opening it with O_NOFOLLOW above still validates that it is not a symlink. ++ let result: std::io::Result<()> = Ok(()); + unsafe { + platform_lib::close(fd); + } +@@ -414,14 +404,9 @@ pub fn spawn_socket_dir_watchdog() { + continue; + } + +- // 目录已存在:组属可能过期(开机落 staff、之后控制台用户主组不同),或被替换为 +- // symlink/文件。用 lstat(no-follow)判断,必要时经 ensure_ipc_dir 安全收敛 +- // (issue #7333 开机竞态尾部 + /tmp symlink 防护)。一致则跳过,避免抖动。 +- use std::os::unix::fs::MetadataExt; +- let needs_fix = match std::fs::symlink_metadata(dir) { +- Ok(meta) if meta.file_type().is_dir() => meta.gid() != resolve_ipc_dir_gid(), +- _ => true, +- }; ++ // RuntimeDirectory owns group and mode; only reject a replaced path. ++ let needs_fix = ++ !matches!(std::fs::symlink_metadata(dir), Ok(meta) if meta.file_type().is_dir()); + if needs_fix && let Err(e) = ensure_ipc_dir(dir) { + warn!("Failed to re-apply ownership on {:?}: {}", dir, e); + } diff --git a/src/lib.rs b/src/lib.rs index a21f89b..81175fc 100644 --- a/src/lib.rs +++ b/src/lib.rs -@@ -12,7 +12,7 @@ pub use core::{run_ipc_server, stop_ipc_server}; - pub use client::*; - +@@ -24,6 +24,6 @@ pub use client::*; + #[cfg(all(unix, not(feature = "test")))] -pub static IPC_PATH: &str = "/tmp/verge/clash-verge-service.sock"; +pub static IPC_PATH: &str = "/run/clash-verge-rev/service.sock"; #[cfg(all(windows, not(feature = "test")))] pub static IPC_PATH: &str = r"\\.\pipe\clash-verge-service"; - diff --git a/pkgs/by-name/cl/clash-verge-rev/service.nix b/pkgs/by-name/cl/clash-verge-rev/service.nix index 49dad0962642..bd9c3b776f67 100644 --- a/pkgs/by-name/cl/clash-verge-rev/service.nix +++ b/pkgs/by-name/cl/clash-verge-rev/service.nix @@ -7,25 +7,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clash-verge-service-ipc"; - version = "2.3.0"; + version = "2.3.3"; src = fetchFromGitHub { owner = "clash-verge-rev"; repo = "clash-verge-service-ipc"; - # upstream uses branch - rev = "21e661fa141e5ad3c705ee4cdb86efff8df6f769"; - hash = "sha256-XavlZWxuZKCTyIYpuXRvXpXCdakWhbLhOMmOrGBgDRo="; + tag = "v${finalAttrs.version}"; + hash = "sha256-/kr0C+4bhal7DqKudtZvhPYUyn6xbxQw57g6ieJV64w="; }; patches = [ - # 1. Don't SetGID because the path is managed by systemd in NixOS, and we - # use different IPC path for sidecar mode. We can keep RestrictSUIDSGID - # in systemd serviceConfig. - # 2. Set IPC socket path + # Let the NixOS module's RuntimeDirectory/Group own socket access policy. + # Upstream defaults target installer-managed /tmp paths and broad fallback + # permissions, which do not fit the hardened systemd service. ./patch-service-directory.patch ]; - cargoHash = "sha256-WhH2o5wN5vYW8jZl+hWbnk1xqHu61ibAr4+/CI3YKHg="; + cargoHash = "sha256-2/lFfhP2414iiH+zG2TvNy6uaCzDldoo7sIfhKrQaFg="; buildFeatures = [ "standalone" diff --git a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix index 7acef8fcb848..7cf47e1c6e4c 100644 --- a/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix +++ b/pkgs/by-name/cl/clash-verge-rev/unwrapped.nix @@ -13,7 +13,7 @@ moreutils, nodejs, pkg-config, - pnpm_9, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, @@ -37,8 +37,8 @@ rustPlatform.buildRustPackage { version src ; - pnpm = pnpm_9; - fetcherVersion = 3; + pnpm = pnpm_11; + fetcherVersion = 4; hash = pnpm-hash; }; @@ -87,7 +87,7 @@ rustPlatform.buildRustPackage { nodejs pkg-config pnpmConfigHook - pnpm_9 + pnpm_11 ]; buildInputs = [ diff --git a/pkgs/by-name/cl/clashtui/package.nix b/pkgs/by-name/cl/clashtui/package.nix index 6b5c9d8d72d3..72f331d38817 100644 --- a/pkgs/by-name/cl/clashtui/package.nix +++ b/pkgs/by-name/cl/clashtui/package.nix @@ -8,18 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "clashtui"; - version = "0.2.3"; + version = "0.3.1"; src = fetchFromGitHub { owner = "JohanChane"; repo = "clashtui"; tag = "v${finalAttrs.version}"; - hash = "sha256-2iQVYZrqo55EO0ZGn6ktP/3Py5v+LiVgrSYTtaxYXyQ="; + hash = "sha256-roP252d0lO7eN2KCHiuPPI5o8QqtPWJvmeex8sAmKww="; }; - sourceRoot = "${finalAttrs.src.name}/clashtui"; - - cargoHash = "sha256-8oDnumyn0Ry1AIWNLO2+1HSPsxkVLRLItgEVEXqSRFI="; + cargoHash = "sha256-7y31iZoSJ98XDiC+Akahgfp/lI5haaek6UpFtaCtGW8="; cargoBuildFlags = [ "--all-features" ]; @@ -43,6 +41,6 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "clashtui"; license = lib.licenses.mit; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ VZstless ]; }; }) diff --git a/pkgs/by-name/cl/classads/package.nix b/pkgs/by-name/cl/classads/package.nix deleted file mode 100644 index 9e15be4e8591..000000000000 --- a/pkgs/by-name/cl/classads/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - autoreconfHook, - pcre, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "classads"; - version = "1.0.10"; - - src = fetchurl { - url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${finalAttrs.version}.tar.gz"; - sha256 = "1czgj53gnfkq3ncwlsrwnr4y91wgz35sbicgkp4npfrajqizxqnd"; - }; - - nativeBuildInputs = [ autoreconfHook ]; - - buildInputs = [ pcre ]; - - configureFlags = [ - "--enable-namespace" - "--enable-flexible-member" - ]; - - # error: use of undeclared identifier 'finite'; did you mean 'isfinite'? - env.NIX_CFLAGS_COMPILE = lib.optionalString ( - stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 - ) "-Dfinite=isfinite"; - - meta = { - homepage = "http://www.cs.wisc.edu/condor/classad/"; - description = "Classified Advertisements library provides a generic means for matching resources"; - license = lib.licenses.asl20; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/cl/classicube/package.nix b/pkgs/by-name/cl/classicube/package.nix index 8caab86b7259..2c78585488b2 100644 --- a/pkgs/by-name/cl/classicube/package.nix +++ b/pkgs/by-name/cl/classicube/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.3.8"; src = fetchFromGitHub { - owner = "UnknownShadow200"; + owner = "ClassiCube"; repo = "ClassiCube"; tag = finalAttrs.version; hash = "sha256-AF4cr3ZXCixwiihS+2ayrzVH5eYShkjlfF0myb2PbHM="; diff --git a/pkgs/by-name/cl/claude-agent-acp/package.nix b/pkgs/by-name/cl/claude-agent-acp/package.nix index 4c16ea153213..989efdb51f4b 100644 --- a/pkgs/by-name/cl/claude-agent-acp/package.nix +++ b/pkgs/by-name/cl/claude-agent-acp/package.nix @@ -8,16 +8,16 @@ buildNpmPackage (finalAttrs: { pname = "claude-agent-acp"; - version = "0.42.0"; + version = "0.60.0"; src = fetchFromGitHub { owner = "agentclientprotocol"; repo = "claude-agent-acp"; tag = "v${finalAttrs.version}"; - hash = "sha256-yvljKMNVCQAFcobHzgPwXSTYGU1IWdOGdX6nsxBfWyw="; + hash = "sha256-idyZcd8KD+bhAlKqqaTS6X8DcNjAzluln8it1V0vyUk="; }; - npmDepsHash = "sha256-ecMy4cgsM+PKdsiqAG4Deoiz8DQeJRDgZ8aWzjS/EjA="; + npmDepsHash = "sha256-dJeUPTcGN616YVKLcsiGgSn8wb7NhJZuZmPRHeUxR4U="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/cl/claude-code/manifest.json b/pkgs/by-name/cl/claude-code/manifest.json index 5f2e80c7f9ce..8b4658f822a8 100644 --- a/pkgs/by-name/cl/claude-code/manifest.json +++ b/pkgs/by-name/cl/claude-code/manifest.json @@ -1,47 +1,75 @@ { - "version": "2.1.175", - "commit": "0b9163019454512fd2b2ed8e6bef5470f9259f35", - "buildDate": "2026-06-12T01:33:39Z", + "version": "2.1.218", + "commit": "bce61b433bc397ce68686368abd12f545b0a013a", + "buildDate": "2026-07-22T18:42:19Z", "platforms": { "darwin-arm64": { "binary": "claude", - "checksum": "6b75bf132c866ed409bf913c318ca32011e73ffb12d3cd67ecc37bc4ee9ec65d", - "size": 224216352 + "checksum": "71abaff59312c9a9b6a1d818365048b42e4e95cc521a823660eded3e0880d9b7", + "size": 255069680 }, "darwin-x64": { "binary": "claude", - "checksum": "3770f2cb42d3f776e62a59aa16230843dc7b8422b36be9b1532e02a6e92e7fa8", - "size": 226734640 + "checksum": "9862b74a083e8a4ed572f99cbd4895185e0dd5a0a601affb0fb8e43d8d1f40e6", + "size": 264548368 }, "linux-arm64": { "binary": "claude", - "checksum": "360f1f6f43ec26d9bb6e20e487bf44b753d9b8407e89e74bfeeb79707399f435", - "size": 249476744 + "checksum": "295fd30481bd03b38450fdec2a6e25bb6472c2074f04b0c4a566cd5988f230bf", + "size": 269990816 }, "linux-x64": { "binary": "claude", - "checksum": "4fc72fa6090c9a03f1850e1b1ccb3d6806bf802b67e3cb9dc5f2ced4b7ed5ca1", - "size": 249566928 + "checksum": "e12071751a9336b8af1012c103358ff04ac18f9aaff4a738cff7ba5cdfaf63f2", + "size": 273177584 }, "linux-arm64-musl": { "binary": "claude", - "checksum": "27234d99851b2e343184466924d8f5c9318d1cfc4156fc4198c99e26c8a8ab86", - "size": 242331480 + "checksum": "efcaae48f8f537a0e9a47b4317a5f8c184706c99ddd8ca0a9a21391e2a766ef8", + "size": 263239016 }, "linux-x64-musl": { "binary": "claude", - "checksum": "f40f977d2555f349e4d94f6efdc7deece3596c2cffa9d1a6a66b14ee30cfca54", - "size": 243977264 + "checksum": "62986293277153f5db97404cf7e3e96de136f02c28f79ccd5c7bc99766224db4", + "size": 267801168 }, "win32-x64": { "binary": "claude.exe", - "checksum": "c1b5b0ae1b607c1f8623d222c9eb6005a35dd6873aa834910a6fb3e00450e096", - "size": 244979872 + "checksum": "81fcf59bb7abb558aedc6f2361f4723b3d757d28e799962d88b18b4520df66ca", + "size": 263931552 }, "win32-arm64": { "binary": "claude.exe", - "checksum": "f01eea49c920e990a7c3d2c1071abbc7e79ab54a099380982c11a6f462ca7c4a", - "size": 240943776 + "checksum": "a7959fd87feb9557d56f4e5752f7ed1ddf405f3bea91b2571bf93af636efd193", + "size": 258307232 } + }, + "sdkCompat": { + "testedWrapperVersions": [ + "0.3.181", + "0.3.182", + "0.3.183", + "0.3.185", + "0.3.186", + "0.3.187", + "0.3.190", + "0.3.191", + "0.3.195", + "0.3.196", + "0.3.197", + "0.3.198", + "0.3.199", + "0.3.200", + "0.3.201", + "0.3.202", + "0.3.204", + "0.3.205", + "0.3.207", + "0.3.208", + "0.3.209", + "0.3.215", + "0.3.217" + ], + "harnessSchema": 1 } } diff --git a/pkgs/by-name/cl/claude-code/package.nix b/pkgs/by-name/cl/claude-code/package.nix index 5887d13fb28a..4eba181c8c9c 100644 --- a/pkgs/by-name/cl/claude-code/package.nix +++ b/pkgs/by-name/cl/claude-code/package.nix @@ -1,6 +1,6 @@ # 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"]])' +# nix-shell maintainers/scripts/update.nix --arg commit true --arg predicate '(path: pkg: builtins.elem path [["claude-code"] ["vscode-extensions" "anthropic" "claude-code"]])' # ``` { lib, @@ -97,7 +97,6 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/cl/claude-mergetool/package.nix b/pkgs/by-name/cl/claude-mergetool/package.nix index f323cdc2ed54..29cf3dfd9a55 100644 --- a/pkgs/by-name/cl/claude-mergetool/package.nix +++ b/pkgs/by-name/cl/claude-mergetool/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/claude-mergetool"; changelog = "https://github.com/9999years/claude-mergetool/releases/tag/v${version}"; description = "Resolve Git/jj merge conflicts automatically with claude-code"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "claude-mergetool"; }; diff --git a/pkgs/by-name/cl/claude-monitor/package.nix b/pkgs/by-name/cl/claude-monitor/package.nix index b474ef62e23a..3cff1c73bc1e 100644 --- a/pkgs/by-name/cl/claude-monitor/package.nix +++ b/pkgs/by-name/cl/claude-monitor/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "claude-monitor"; - version = "3.1.0"; + version = "4.0.0"; pyproject = true; src = fetchFromGitHub { owner = "Maciek-roboblog"; repo = "Claude-Code-Usage-Monitor"; tag = "v${finalAttrs.version}"; - hash = "sha256-v5ooniaN1iVerBW77/00SpghIVE1j8cl2WENcPnS66M="; + hash = "sha256-f/g8OygQYYfZqboTNePwCW3OxcH/wlvsHvL8Cv+iyCU="; }; build-system = with python3Packages; [ setuptools ]; @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyyaml pytz rich + wcwidth ]; # Tests require Claude API access and local data files @@ -39,7 +40,7 @@ python3Packages.buildPythonApplication (finalAttrs: { and get intelligent predictions about session limits. ''; homepage = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor"; - changelog = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/Maciek-roboblog/Claude-Code-Usage-Monitor/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ iamanaws ]; mainProgram = "claude-monitor"; diff --git a/pkgs/by-name/cl/claude-usage-tracker/package.nix b/pkgs/by-name/cl/claude-usage-tracker/package.nix index 3b508e0f0501..ee882c953e8a 100644 --- a/pkgs/by-name/cl/claude-usage-tracker/package.nix +++ b/pkgs/by-name/cl/claude-usage-tracker/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "claude-usage-tracker"; - version = "3.1.1"; + version = "3.2.0"; src = fetchzip { url = "https://github.com/hamed-elfayome/Claude-Usage-Tracker/releases/download/v${finalAttrs.version}/Claude-Usage.zip"; - hash = "sha256-g2mTU64iEWg7YaEQdWhAnnB1Tb1PrTDezojDw+535H0="; + hash = "sha256-V8fc5OuEBHf4w0fe5QX9znSLlu/xGkycVi3JzShVk+A="; stripRoot = false; }; diff --git a/pkgs/by-name/cl/clean-css-cli/package.nix b/pkgs/by-name/cl/clean-css-cli/package.nix index 4141f0731390..bfdf30b9a55e 100644 --- a/pkgs/by-name/cl/clean-css-cli/package.nix +++ b/pkgs/by-name/cl/clean-css-cli/package.nix @@ -26,6 +26,6 @@ buildNpmPackage (finalAttrs: { changelog = "https://github.com/clean-css/clean-css-cli/blob/v${finalAttrs.version}/History.md"; license = lib.licenses.mit; mainProgram = "cleancss"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/cl/clematis/package.nix b/pkgs/by-name/cl/clematis/package.nix index 28632ce71a87..e0f63572cdac 100644 --- a/pkgs/by-name/cl/clematis/package.nix +++ b/pkgs/by-name/cl/clematis/package.nix @@ -9,7 +9,7 @@ buildGoModule { version = "2022-04-16"; src = fetchFromGitHub { - owner = "TorchedSammy"; + owner = "sammy-ette"; repo = "clematis"; rev = "cbe74da084b9d3f6893f53721c27cd0f3a45fe93"; sha256 = "sha256-TjoXHbY0vUQ2rhwdCJ/s/taRd9/MG0P9HaEw2BOIy/s="; @@ -19,7 +19,7 @@ buildGoModule { meta = { description = "Discord rich presence for MPRIS music players"; - homepage = "https://github.com/TorchedSammy/Clematis"; + homepage = "https://github.com/sammy-ette/clematis"; license = lib.licenses.mit; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ misterio77 ]; diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index 381a9baa1434..44701880bf30 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -11,7 +11,7 @@ buildNpmPackage rec { pname = "clever-tools"; - version = "4.10.0"; + version = "4.11.0"; nodejs = nodejs_22; @@ -19,10 +19,10 @@ buildNpmPackage rec { owner = "CleverCloud"; repo = "clever-tools"; rev = version; - hash = "sha256-EgGjlZ6Awg7SEC3ljPqii3wpq2SlXN/gARUJBSFcX0k="; + hash = "sha256-ma1EZL5xuUw8BrECFamSR1I8XJk8PERW7YJSj8JTp4w="; }; - npmDepsHash = "sha256-1v9c1525J7aS89PDdl6hWbYdn/DIM3G1BxFbpxu/F7E="; + npmDepsHash = "sha256-9TPH+jRcM161MhabA9m0GcgAzc+yO1a1zh8vQHjZt7g="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/cl/cliairplay/package.nix b/pkgs/by-name/cl/cliairplay/package.nix index 389e973e6cb6..c357c16d8284 100644 --- a/pkgs/by-name/cl/cliairplay/package.nix +++ b/pkgs/by-name/cl/cliairplay/package.nix @@ -25,16 +25,16 @@ stdenv.mkDerivation { pname = "cliairplay"; # see the beginning of configure.ac for the upstream version number - version = "1.1-unstable-2026-03-16"; + version = "1.5-unstable-2026-05-03"; src = fetchFromGitHub { owner = "music-assistant"; repo = "cliairplay"; # we try to closely match the commit used in the last music-assistant release from # https://github.com/music-assistant/server/tree/stable/music_assistant/providers/airplay/bin - rev = "991c65acc2afa17ffe32e279dbc585b0b7f530f8"; + rev = "6aeceb49e4e37d044f09be9369b082fc26bcfa19"; fetchSubmodules = true; - hash = "sha256-m1O4l6gFEGNAyskYcRHcA15cubZnNgkaYjdVThRRX7w="; + hash = "sha256-Z2LzRhtQpuXPK6KibnxCqP0V6CulzkwNVHX1V7AFnDA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/cliamp/package.nix b/pkgs/by-name/cl/cliamp/package.nix index fe6bf8539723..02ea666b856e 100644 --- a/pkgs/by-name/cl/cliamp/package.nix +++ b/pkgs/by-name/cl/cliamp/package.nix @@ -16,16 +16,16 @@ buildGoModule (finalAttrs: { pname = "cliamp"; - version = "1.57.0"; + version = "1.61.0"; src = fetchFromGitHub { owner = "bjarneo"; repo = "cliamp"; tag = "v${finalAttrs.version}"; - hash = "sha256-tfPtc+YgtmuzdWod6EM0MJSoYLxLnQskuNRQbLRp4g8="; + hash = "sha256-BbyaZw+OvC6rb60Z2whhHj2iKow/ZJJ8VzuwPX7bHIE="; }; - vendorHash = "sha256-A2Ygc1a9e2flZzaNAEXvr8Ui1cE89TxBfUNALmDzIo0="; + vendorHash = "sha256-KYjP6qEINdSlcDSEMKxMwDfXzuQPAQSe4oZh+o4PrFs="; nativeBuildInputs = [ pkg-config @@ -41,6 +41,11 @@ buildGoModule (finalAttrs: { alsa-lib ]; + # macOS limits Unix socket paths to 104 bytes; use a shorter TMPDIR. + preCheck = lib.optionalString stdenv.hostPlatform.isDarwin '' + export TMPDIR="$(mktemp -d /tmp/cliamp-XXXXXX)" + ''; + postInstall = '' wrapProgram $out/bin/cliamp \ --prefix PATH : ${ @@ -60,6 +65,7 @@ buildGoModule (finalAttrs: { description = "Terminal Winamp - a retro terminal music player inspired by Winamp 2.x"; homepage = "https://github.com/bjarneo/cliamp"; license = lib.licenses.mit; + platforms = with lib.platforms; darwin ++ linux; maintainers = with lib.maintainers; [ supermarin ]; mainProgram = "cliamp"; }; diff --git a/pkgs/by-name/cl/click/package.nix b/pkgs/by-name/cl/click/package.nix index 15f231edc31f..1afd7f01f9a9 100644 --- a/pkgs/by-name/cl/click/package.nix +++ b/pkgs/by-name/cl/click/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Interactive Controller for Kubernetes"; homepage = "https://github.com/databricks/click"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.mbode ]; mainProgram = "click"; }; diff --git a/pkgs/by-name/cl/clickable/package.nix b/pkgs/by-name/cl/clickable/package.nix index f88311957c10..329d0742d1a9 100644 --- a/pkgs/by-name/cl/clickable/package.nix +++ b/pkgs/by-name/cl/clickable/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "clickable"; - version = "8.8.0"; + version = "8.9.0"; pyproject = true; src = fetchFromGitLab { owner = "clickable"; repo = "clickable"; rev = "v${finalAttrs.version}"; - hash = "sha256-EEICNL5ydrtep+Lbo9ryKW3+vcJwQxPeXY/C4bZaAnI="; + hash = "sha256-hrtAx/RKBlVf8cguPAGd55/m0D6YLu678f+aqeIzRos="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/cl/clickhouse-backup/package.nix b/pkgs/by-name/cl/clickhouse-backup/package.nix index 9ffd9af8236a..1c4d3c9d5448 100644 --- a/pkgs/by-name/cl/clickhouse-backup/package.nix +++ b/pkgs/by-name/cl/clickhouse-backup/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "clickhouse-backup"; - version = "2.7.1"; + version = "2.8.0"; src = fetchFromGitHub { owner = "Altinity"; repo = "clickhouse-backup"; tag = "v${finalAttrs.version}"; - hash = "sha256-hS3Hhy8NYIP/xpXZNSdzO4U0jWcl7nw+H8I1rnpvBmQ="; + hash = "sha256-FULdduxFQe1T2UbD/ieE7+ZqRqnRDvbydbmcC2v+D1I="; }; - vendorHash = "sha256-8vWqfoAJiZyb7ABk5bC3kuTu1s8dPgB+oHAI5eENDWY="; + vendorHash = "sha256-fCn3zEaAR+HnbYKNhtuapvThMcIMgcMGCfpEDTZ+jcM="; ldflags = [ "-X main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in b/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in new file mode 100644 index 000000000000..7d7fde74d07b --- /dev/null +++ b/pkgs/by-name/cl/clickhouse-cpp/clickhouse-cpp.pc.in @@ -0,0 +1,11 @@ +prefix=@out@ +includedir=${prefix}/include +libdir=${prefix}/lib + +Name: clickhouse-cpp +Description: Library to interact with ClickHouse Database from C++ code +URL: https://github.com/ClickHouse/clickhouse-cpp +Version: @version@ +Cflags: -pthread -isystem${includedir} +Libs: -pthread -L${libdir} -Wl,-rpath,${libdir} -lclickhouse-cpp-lib +Requires: absl_int128 diff --git a/pkgs/by-name/cl/clickhouse-cpp/package.nix b/pkgs/by-name/cl/clickhouse-cpp/package.nix new file mode 100644 index 000000000000..76230e9b3711 --- /dev/null +++ b/pkgs/by-name/cl/clickhouse-cpp/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + abseil-cpp, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "clickhouse-cpp"; + version = "2.6.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "clickhouse"; + repo = "clickhouse-cpp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-szvRPqj2xarzGTVyycPlSTJkWSxwLO4EKXADS1DpO7Q="; + }; + + flattenPackagesPrefix = "absl_"; + flattenPcLookupDir = "${abseil-cpp}/lib/pkgconfig"; + + nativeBuildInputs = [ + cmake + ]; + + cmakeFlags = [ + "-DWITH_SYSTEM_ABSEIL=1" + "-DBUILD_SHARED_LIBS=1" + ]; + + propagatedBuildInputs = [ abseil-cpp ]; + + postInstall = '' + mkdir -p $out/lib/pkgconfig + substituteAll ${./clickhouse-cpp.pc.in} $out/lib/pkgconfig/clickhouse-cpp.pc + ''; + + meta = { + description = "C++ client library for ClickHouse"; + homepage = "https://github.com/clickhouse/clickhouse-cpp"; + changelog = "https://github.com/clickhouse/clickhouse-cpp/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "clickhouse-cpp"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/cl/clickhouse/generic.nix b/pkgs/by-name/cl/clickhouse/generic.nix index 4b9b9cfaded9..4616222f3363 100644 --- a/pkgs/by-name/cl/clickhouse/generic.nix +++ b/pkgs/by-name/cl/clickhouse/generic.nix @@ -165,8 +165,17 @@ llvmStdenv.mkDerivation (finalAttrs: { gitHash = rev; in '' - cat <<'EOF' > cmake/autogenerated_versions.txt - SET(VERSION_REVISION 0) + # Preserve VERSION_REVISION from the source tree, like ClickHouse CI + # does. It identifies the server release line to clients (exposed via + # the revision() SQL function) + versionRevision=$(sed -n 's/^SET(VERSION_REVISION \([0-9]\{1,\}\))$/\1/p' cmake/autogenerated_versions.txt) + if [[ -z "$versionRevision" ]]; then + echo "Could not extract VERSION_REVISION from cmake/autogenerated_versions.txt" >&2 + exit 1 + fi + + cat < cmake/autogenerated_versions.txt + SET(VERSION_REVISION $versionRevision) SET(VERSION_MAJOR ${major}) SET(VERSION_MINOR ${minor}) SET(VERSION_PATCH ${patch}) diff --git a/pkgs/by-name/cl/clickhouse/lts.nix b/pkgs/by-name/cl/clickhouse/lts.nix index d039c92c54f7..aed4568a8329 100644 --- a/pkgs/by-name/cl/clickhouse/lts.nix +++ b/pkgs/by-name/cl/clickhouse/lts.nix @@ -1,6 +1,6 @@ import ./generic.nix { - version = "26.3.12.3-lts"; - rev = "d23c7536b980c34b39c850b08ef23c509f06aaaa"; - hash = "sha256-xM+dqOSNa4rMaCGgz86UCdF3szwXgYr5vH1Ov7y4X08="; + version = "26.3.17.56-lts"; + rev = "c57540de480d8a501b601163471d3843674378cf"; + hash = "sha256-fcRxZbcp7t28bC9vlmgVAV9gB63cQwFWsc0gyKxGhvQ="; lts = true; } diff --git a/pkgs/by-name/cl/clickhouse/package.nix b/pkgs/by-name/cl/clickhouse/package.nix index e364e6a97376..8c38f87f27cd 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 = "26.5.2.39-stable"; - rev = "8462fd8f3dea8603e67666414b2781ab57a8adb6"; - hash = "sha256-lbVveT6cFT9ZhSl+0qh3NhtO4FHakFWDBJd757J8WJg="; + version = "26.7.1.1315-stable"; + rev = "a6156303df65c307bdb8b66e9e9cc5637346a6b8"; + hash = "sha256-jCUSLYmhRLIUvDw3JYDtqmcjW92aJBzfFHyCAtxvlsY="; lts = false; } diff --git a/pkgs/by-name/cl/cliflux/package.nix b/pkgs/by-name/cl/cliflux/package.nix index 1e5237d140a8..ab09017374b0 100644 --- a/pkgs/by-name/cl/cliflux/package.nix +++ b/pkgs/by-name/cl/cliflux/package.nix @@ -1,7 +1,7 @@ { lib, rustPlatform, - fetchFromGitHub, + fetchFromCodeberg, pkg-config, openssl, nix-update-script, @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cliflux"; - version = "1.9.1"; + version = "1.10.0"; - src = fetchFromGitHub { + src = fetchFromCodeberg { owner = "spencerwi"; repo = "cliflux"; tag = "v${finalAttrs.version}"; - hash = "sha256-oBjflPZooZatZCvKLA8h0BMuj++2tPrhE365zTk7vhM="; + hash = "sha256-fzuqgzBVnVIOcRplDKLBskhX9PlMA9LM0f3MnLqzyhk="; }; - cargoHash = "sha256-Q+/sh7Wku40SyhmgGci1YgCXQuEu1Zf4DaRDlDqWpak="; + cargoHash = "sha256-gAfN3kO5wrZ8usKv4C97LT+BAEu9ZD8ZP/GOCrWC7Nk="; nativeBuildInputs = [ pkg-config @@ -32,8 +32,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Terminal client for Miniflux RSS reader"; - homepage = "https://github.com/spencerwi/cliflux"; - changelog = "https://github.com/spencerwi/cliflux/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://codeberg.org/spencerwi/cliflux"; + changelog = "https://codeberg.org/spencerwi/cliflux/raw/tag/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ ]; mainProgram = "cliflux"; diff --git a/pkgs/by-name/cl/cling/always-build-user-interface.patch b/pkgs/by-name/cl/cling/always-build-user-interface.patch new file mode 100644 index 000000000000..c15e31471415 --- /dev/null +++ b/pkgs/by-name/cl/cling/always-build-user-interface.patch @@ -0,0 +1,18 @@ +diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt +index eb29252..a62c0de 100644 +--- a/lib/CMakeLists.txt ++++ b/lib/CMakeLists.txt +@@ -8,7 +8,10 @@ + + add_subdirectory(Interpreter) + add_subdirectory(MetaProcessor) +-if(CLING_INCLUDE_TESTS) +- add_subdirectory(UserInterface) +-endif() ++# The UserInterface library (clingUserInterface) is linked unconditionally by the ++# cling driver, so it must always be built. Upstream cling 1.3 mistakenly gates it ++# behind CLING_INCLUDE_TESTS: the previous EXISTS check on the bundled textinput ++# sources was dropped when those were removed in favor of LLVM's LineEditor, but the ++# subdirectory must still be added. See lib/UserInterface and tools/driver. ++add_subdirectory(UserInterface) + add_subdirectory(Utils) diff --git a/pkgs/by-name/cl/cling/fix-new-parser.patch b/pkgs/by-name/cl/cling/fix-new-parser.patch deleted file mode 100644 index 9869686e6dda..000000000000 --- a/pkgs/by-name/cl/cling/fix-new-parser.patch +++ /dev/null @@ -1,54 +0,0 @@ -From cd4d1d8c4963620a6a84834948845df81fbbd70b Mon Sep 17 00:00:00 2001 -From: Jonas Hahnfeld -Date: Tue, 17 Dec 2024 14:54:18 +0100 -Subject: [PATCH] Use single Parser for LookupHelper - -It is the only construction of a temporary parser, and it seems not -necessary (anymore). ---- - include/cling/Interpreter/LookupHelper.h | 2 +- - lib/Interpreter/Interpreter.cpp | 11 ++++------- - 2 files changed, 5 insertions(+), 8 deletions(-) - -diff --git a/include/cling/Interpreter/LookupHelper.h b/include/cling/Interpreter/LookupHelper.h -index 6e6e281470..cd79b2a65c 100644 ---- a/include/cling/Interpreter/LookupHelper.h -+++ b/include/cling/Interpreter/LookupHelper.h -@@ -56,7 +56,7 @@ namespace cling { - WithDiagnostics - }; - private: -- std::unique_ptr m_Parser; -+ clang::Parser* m_Parser; - Interpreter* m_Interpreter; // we do not own. - std::array m_StringTy = {{}}; - /// A map containing the hash of the lookup buffer. This allows us to avoid -diff --git a/lib/Interpreter/Interpreter.cpp b/lib/Interpreter/Interpreter.cpp -index 13c8409cc5..f04695439b 100644 ---- a/lib/Interpreter/Interpreter.cpp -+++ b/lib/Interpreter/Interpreter.cpp -@@ -265,13 +265,6 @@ namespace cling { - } - - Sema& SemaRef = getSema(); -- Preprocessor& PP = SemaRef.getPreprocessor(); -- -- m_LookupHelper.reset(new LookupHelper(new Parser(PP, SemaRef, -- /*SkipFunctionBodies*/false, -- /*isTemp*/true), this)); -- if (!m_LookupHelper) -- return; - - if (!isInSyntaxOnlyMode() && !m_Opts.CompilerOpts.CUDADevice) { - m_Executor.reset(new IncrementalExecutor(SemaRef.Diags, *getCI(), -@@ -317,6 +310,10 @@ namespace cling { - return; - } - -+ m_LookupHelper.reset(new LookupHelper(m_IncrParser->getParser(), this)); -+ if (!m_LookupHelper) -+ return; -+ - // When not using C++ modules, we now have a PCH and we can safely setup - // our callbacks without fearing that they get overwritten by clang code. - // The modules setup is handled above. diff --git a/pkgs/by-name/cl/cling/package.nix b/pkgs/by-name/cl/cling/package.nix index c22c4c87a2c2..9b413ce677a6 100644 --- a/pkgs/by-name/cl/cling/package.nix +++ b/pkgs/by-name/cl/cling/package.nix @@ -5,19 +5,18 @@ git, lib, libffi, - llvmPackages_18, + llvmPackages_20, makeWrapper, ncurses, python3, zlib, - # *NOT* from LLVM 18! - # The compiler used to compile Cling may affect the runtime include and lib - # directories it expects to be run with. Cling builds against (a fork of) Clang, - # so we prefer to use Clang as the compiler as well for consistency. - # It would be cleanest to use LLVM 9's clang, but it errors. So, we use a later - # version of Clang to compile, but we check out the Cling fork of Clang 9 to - # build Cling against. + # The compiler used to *compile* Cling, independent of the LLVM/Clang that + # Cling is built against (the root-project/llvm-project fork checked out below) + # and of llvmPackages_20 (used only for the runtime wrapper flags). The compiler + # can affect the runtime include and lib directories Cling expects, and since + # Cling builds against a fork of Clang we use Clang as the compiler too for + # consistency. clangStdenv, # For runtime C++ standard library @@ -34,13 +33,13 @@ let stdenv = clangStdenv; - version = "1.2"; + version = "1.3"; clingSrc = fetchFromGitHub { owner = "root-project"; repo = "cling"; rev = "v${version}"; - sha256 = "sha256-ay9FXANJmB/+AdnCR4WOKHuPm6P88wLqoOgiKJwJ8JM="; + sha256 = "sha256-/qCHd9KfPW4dMjktaSdnJG+VDD1lLSI4ZFllTcxWsmc="; }; unwrapped = stdenv.mkDerivation { @@ -50,18 +49,18 @@ let src = fetchFromGitHub { owner = "root-project"; repo = "llvm-project"; - rev = "cling-llvm18-20250721-01"; - sha256 = "sha256-JGteapyujU5w81DsfPQfTq76cYHgk5PbAFbdYfYIDo4="; + rev = "cling-llvm20-20260119-01"; + sha256 = "sha256-fv7nrpZ5Dhbf+nW0ED0pkc8NDBXeaBs9MV2TW6o7FGU="; }; preConfigure = '' cp -r ${clingSrc} cling-source - # Patch a bug in version 1.2 by backporting a fix. See - # https://github.com/root-project/cling/issues/556 + # cling 1.3 only builds the clingUserInterface library (which the cling + # driver always links) when CLING_INCLUDE_TESTS is on. Always build it. chmod -R u+w cling-source pushd cling-source - patch -p1 < ${./fix-new-parser.patch} + patch -p1 < ${./always-build-user-interface.patch} popd cd llvm @@ -99,15 +98,13 @@ let "-DLLVM_ENABLE_LIBCXXABI=ON" ]; - CPPFLAGS = if useLLVMLibcxx then [ "-stdlib=libc++" ] else [ ]; + env.CPPFLAGS = lib.optionalString useLLVMLibcxx "-stdlib=libc++"; postInstall = '' mkdir -p $out/share/Jupyter cp -r ../../cling-source/tools/Jupyter/kernel $out/share/Jupyter ''; - buildTargets = [ "cling" ]; - dontStrip = debug; meta = { @@ -139,18 +136,18 @@ let "-nostdinc++" "-resource-dir" - "${llvmPackages_18.llvm.lib}/lib" + "${llvmPackages_20.llvm.lib}/lib" "-isystem" - "${lib.getLib unwrapped}/lib/clang/18/include" + "${lib.getLib unwrapped}/lib/clang/20/include" ] ++ lib.optionals useLLVMLibcxx [ "-I" - "${lib.getDev llvmPackages_18.libcxx}/include/c++/v1" + "${lib.getDev llvmPackages_20.libcxx}/include/c++/v1" "-L" - "${llvmPackages_18.libcxx}/lib" + "${llvmPackages_20.libcxx}/lib" "-l" - "${llvmPackages_18.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}" + "${llvmPackages_20.libcxx}/lib/libc++${stdenv.hostPlatform.extensions.sharedLibrary}" ] ++ lib.optionals (!useLLVMLibcxx) [ "-I" diff --git a/pkgs/by-name/cl/clipaste/package.nix b/pkgs/by-name/cl/clipaste/package.nix new file mode 100644 index 000000000000..6ba9af4fa198 --- /dev/null +++ b/pkgs/by-name/cl/clipaste/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + testers, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "clipaste"; + version = "2.4.0"; + + src = fetchFromGitHub { + owner = "hqhq1025"; + repo = "clipaste"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MNrhOvdyYs99Z6Wwf2X+xCNRzc6erpLpFB/GHBJRhrg="; + }; + + cargoHash = "sha256-QrUR3xHZ/1FFkBYt5qxi0mNVTvEaWBcLSjp6OnzR9GY="; + + strictDeps = true; + __structuredAttrs = true; + + passthru = { + tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + }; + + meta = { + description = "Screenshot clipboard paste fix for AI agents"; + homepage = "https://github.com/hqhq1025/clipaste"; + license = lib.licenses.mit; + platforms = lib.platforms.darwin; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "clipaste"; + }; +}) diff --git a/pkgs/by-name/cl/cliphist/package.nix b/pkgs/by-name/cl/cliphist/package.nix index 583912d7d693..effe6197099b 100644 --- a/pkgs/by-name/cl/cliphist/package.nix +++ b/pkgs/by-name/cl/cliphist/package.nix @@ -4,6 +4,12 @@ buildGoModule, fetchFromGitHub, nix-update-script, + gawk, + wl-clipboard, + fuzzel, + fzf, + chafa, + wofi, }: buildGoModule (finalAttrs: { @@ -19,8 +25,23 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-4XyDLOJHdre/1BpjgFt/W6gOlPOvKztE+MsbwE3JAaQ="; + postPatch = '' + substituteInPlace contrib/cliphist-{fuzzel,rofi,wofi}-img \ + --replace-fail "gawk" "${lib.getExe gawk}" + substituteInPlace contrib/cliphist-{fuzzel-img,fzf,fzf-sixel,rofi,rofi-img,wofi-img} \ + --replace-fail "wl-copy" "${lib.getExe' wl-clipboard "wl-copy"}" + substituteInPlace contrib/cliphist-fuzzel-img \ + --replace-fail "fuzzel " "${lib.getExe fuzzel} " + substituteInPlace contrib/cliphist-fzf{,-sixel} \ + --replace-fail "fzf " "${lib.getExe fzf} " + substituteInPlace contrib/cliphist-fzf-sixel \ + --replace-fail "chafa " "${lib.getExe chafa} " + substituteInPlace contrib/cliphist-wofi-img \ + --replace-fail "| wofi" "| ${lib.getExe wofi}" + ''; + postInstall = '' - cp ${finalAttrs.src}/contrib/* $out/bin/ + cp ./contrib/cliphist-{fuzzel-img,fzf,fzf-sixel,rofi,rofi-img,wofi-img} $out/bin/ ''; passthru = { @@ -34,7 +55,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/sentriz/cliphist"; license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ klea ]; mainProgram = "cliphist"; }; }) diff --git a/pkgs/by-name/cl/clipnotify/package.nix b/pkgs/by-name/cl/clipnotify/package.nix index bb3cc6b00a38..74bd082e9e40 100644 --- a/pkgs/by-name/cl/clipnotify/package.nix +++ b/pkgs/by-name/cl/clipnotify/package.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "clipnotify"; - version = "unstable-2018-02-20"; + version = "0-unstable-2018-02-20"; src = fetchFromGitHub { owner = "cdown"; diff --git a/pkgs/by-name/cl/clipqr/package.nix b/pkgs/by-name/cl/clipqr/package.nix index f40970a80523..a2334473e669 100644 --- a/pkgs/by-name/cl/clipqr/package.nix +++ b/pkgs/by-name/cl/clipqr/package.nix @@ -4,31 +4,37 @@ fetchFromGitLab, lib, libGL, + libdecor, + libgbm, libx11, libxcursor, libxext, libxi, libxinerama, + libxkbcommon, libxrandr, libxxf86vm, makeDesktopItem, - libgbm, + makeWrapper, pkg-config, - stdenv, + wayland, + wl-clipboard, }: buildGoModule (finalAttrs: { pname = "clipqr"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitLab { owner = "imatt-foss"; repo = "clipqr"; rev = "v${finalAttrs.version}"; - hash = "sha256-iuA6RqclMm1CWaiM1kpOpgfYvKaYGOIwFQkLr/nCL5M="; + hash = "sha256-DC6zc1Qe/z7ihuvdawb8bj5MefYGgt7HAV5dWTjeHZc="; }; - vendorHash = null; + vendorHash = "sha256-MrXMbavff6CEKVbL+Mx8hICYB9sZQcvAhnu2X4sVvVw="; + + tags = [ "wayland" ]; ldflags = [ "-s" @@ -37,23 +43,30 @@ buildGoModule (finalAttrs: { buildInputs = [ libGL + libgbm libx11 libxcursor libxext libxi libxinerama + libxkbcommon libxrandr libxxf86vm - libgbm + wayland ]; nativeBuildInputs = [ copyDesktopItems + makeWrapper pkg-config ]; postInstall = '' install -Dm644 icon.svg $out/share/icons/hicolor/scalable/apps/clipqr.svg + + wrapProgram $out/bin/clipqr \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libdecor ]} \ + --prefix PATH : ${lib.makeBinPath [ wl-clipboard ]} ''; desktopItems = [ @@ -73,7 +86,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ MatthieuBarthel ]; homepage = "https://gitlab.com/imatt-foss/clipqr"; - broken = stdenv.hostPlatform.isDarwin; + platforms = lib.platforms.linux; mainProgram = "clipqr"; }; }) diff --git a/pkgs/by-name/cl/clive/package.nix b/pkgs/by-name/cl/clive/package.nix index fb03c20f4b1b..53a6c558dcfb 100644 --- a/pkgs/by-name/cl/clive/package.nix +++ b/pkgs/by-name/cl/clive/package.nix @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { ''; nativeInstallCheckInputs = [ versionCheckHook ]; - doinstallCheck = true; + doInstallCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/cl/cloc/package.nix b/pkgs/by-name/cl/cloc/package.nix index b9faaaa2fa16..7d93bd4d6270 100644 --- a/pkgs/by-name/cl/cloc/package.nix +++ b/pkgs/by-name/cl/cloc/package.nix @@ -7,7 +7,7 @@ }: let - version = "2.08"; + version = "2.10"; in stdenv.mkDerivation { pname = "cloc"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { owner = "AlDanial"; repo = "cloc"; rev = "v${version}"; - sha256 = "sha256-FRby6mhaeTPU0G0rEDszfrTMcrNviFmjbJ8jJnjaZN4="; + sha256 = "sha256-B5dk22H5FeWZ+12A7iwAsJ0ORVfI1stDfue9ZgXBOg4="; }; setSourceRoot = '' diff --git a/pkgs/by-name/cl/clojure/package.nix b/pkgs/by-name/cl/clojure/package.nix index 89657a94199b..5e6ee69fd55c 100644 --- a/pkgs/by-name/cl/clojure/package.nix +++ b/pkgs/by-name/cl/clojure/package.nix @@ -10,7 +10,9 @@ rlwrap, makeWrapper, writeScript, + versionCheckHook, }: + stdenv.mkDerivation (finalAttrs: { pname = "clojure"; version = "1.12.5.1654"; @@ -31,6 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ]; strictDeps = true; + __structuredAttrs = true; # See https://github.com/clojure/brew-install/blob/1.10.3/src/main/resources/clojure/install/linux-install.sh installPhase = @@ -69,11 +72,17 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + installCheckPhase = '' + runHook preInstallCheck + CLJ_CONFIG=$TMPDIR CLJ_CACHE=$TMPDIR/.clj_cache $out/bin/clojure \ -Spath \ -Sverbose \ -Scp $out/libexec/clojure-tools-${finalAttrs.version}.jar + + runHook postInstallCheck ''; passthru.updateScript = writeScript "update-clojure" '' @@ -99,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://clojure.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; + mainProgram = "clojure"; longDescription = '' Clojure is a dynamic programming language that targets the Java Virtual Machine. It is designed to be a general-purpose language, diff --git a/pkgs/by-name/cl/closurecompiler/package.nix b/pkgs/by-name/cl/closurecompiler/package.nix index d7d84b3d6eb0..938b6a425f27 100644 --- a/pkgs/by-name/cl/closurecompiler/package.nix +++ b/pkgs/by-name/cl/closurecompiler/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { mkdir -p $out/share/java $out/bin cp ${finalAttrs.src} $out/share/java/closure-compiler-v${finalAttrs.version}.jar makeWrapper ${jre}/bin/java $out/bin/closure-compiler \ - --add-flags "-jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" + --add-flags "\$NIX_JAVA_ARGS -jar $out/share/java/closure-compiler-v${finalAttrs.version}.jar" ''; meta = { diff --git a/pkgs/by-name/cl/cloud-custodian/package.nix b/pkgs/by-name/cl/cloud-custodian/package.nix index c97c179e5f31..9bbf36fc99fc 100644 --- a/pkgs/by-name/cl/cloud-custodian/package.nix +++ b/pkgs/by-name/cl/cloud-custodian/package.nix @@ -2,18 +2,21 @@ lib, python3, fetchFromGitHub, + versionCheckHook, }: python3.pkgs.buildPythonApplication (finalAttrs: { pname = "cloud-custodian"; - version = "0.9.38.0"; + version = "0.9.51.0"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "cloud-custodian"; repo = "cloud-custodian"; tag = finalAttrs.version; - hash = "sha256-jGWPwHiETS4+hk9euLLxs0PBb7mxz2PHCbYYlFfLQUw="; + hash = "sha256-vL+/Sof61EkVjudwyFnYnkFi2Hggx9NFrvY8nRTaU+0="; }; pythonRelaxDeps = [ @@ -24,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "urllib3" ]; - build-system = with python3.pkgs; [ poetry-core ]; + build-system = with python3.pkgs; [ hatchling ]; dependencies = with python3.pkgs; [ argcomplete @@ -34,6 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { docutils importlib-metadata jsonpatch + cryptography jsonschema python-dateutil pyyaml @@ -41,15 +45,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { urllib3 ]; - # Requires tox, many packages, and network access - checkPhase = '' - $out/bin/custodian --help + pythonImportsCheck = [ + "c7n" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + preVersionCheck = '' + version=${lib.versions.pad 3 finalAttrs.version} ''; meta = { description = "Rules engine for cloud security, cost optimization, and governance"; homepage = "https://cloudcustodian.io"; changelog = "https://github.com/cloud-custodian/cloud-custodian/releases/tag/${finalAttrs.version}"; + maintainers = with lib.maintainers; [ jlesquembre ]; license = lib.licenses.asl20; mainProgram = "custodian"; }; diff --git a/pkgs/by-name/cl/cloud-hypervisor/package.nix b/pkgs/by-name/cl/cloud-hypervisor/package.nix index b8da2ae3b91a..064a1c91e8b4 100644 --- a/pkgs/by-name/cl/cloud-hypervisor/package.nix +++ b/pkgs/by-name/cl/cloud-hypervisor/package.nix @@ -6,29 +6,34 @@ pkg-config, dtc, openssl, + zstd, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cloud-hypervisor"; - version = "52.0"; + version = "53.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = "cloud-hypervisor"; rev = "v${finalAttrs.version}"; - hash = "sha256-OGyvmedSaWPsyH6mdHhgXN7MvTnK1HzdfTKUhJRlq8I="; + hash = "sha256-fPTGf8bAITDA8QwllWbbGXA7tJ6p/SxRDfcBQVRvCTI="; }; - cargoHash = "sha256-ZNj1H3Iq+IUSe0McHJjrwPOoR+YRB+rsSmZHMhXsHy0="; + cargoHash = "sha256-+RbW/9ap/69MyODUk/bHBlH6ZuqYYIyKaarYSMQ2G7w="; separateDebugInfo = true; nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optional stdenv.hostPlatform.isAarch64 dtc; - checkInputs = [ openssl ]; + buildInputs = [ + openssl + zstd + ] + ++ lib.optional stdenv.hostPlatform.isAarch64 dtc; env.OPENSSL_NO_VENDOR = true; + env.ZSTD_SYS_USE_PKG_CONFIG = true; cargoTestFlags = [ "--workspace" @@ -40,10 +45,8 @@ rustPlatform.buildRustPackage (finalAttrs: { "vmm" # /dev/kvm "--" # io_uring syscalls are blocked by the Lix sandbox - "--skip=io_uring" - "--skip=qcow_async::unit_tests::" - # fallocate(PUNCH_HOLE) reported size depends on the host filesystem - "--skip=test_query_device_size_sparse_file_punch_hole" + "--skip=formats" + "--skip=io_impl::async_io::uring_data_io" ]; nativeInstallCheckInputs = [ diff --git a/pkgs/by-name/cl/cloud-nuke/package.nix b/pkgs/by-name/cl/cloud-nuke/package.nix index 90aabe017b46..17eec3bdfdd0 100644 --- a/pkgs/by-name/cl/cloud-nuke/package.nix +++ b/pkgs/by-name/cl/cloud-nuke/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "cloud-nuke"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = "cloud-nuke"; tag = "v${finalAttrs.version}"; - hash = "sha256-tJi3SFBp/zuBB+0S0IOIWqvZRWdlSyJra8K4meJHXnY="; + hash = "sha256-UW6n1TFKkricWX71/zHGwLY+0fLtZRkAUU8bQQc5Lwg="; }; - vendorHash = "sha256-1DMwVJvr3zU96yAV2Vb4v58VNt7xg9dLCH7XGEMopjQ="; + vendorHash = "sha256-ztaQ4PnBk5lr5PXK6O0MYt+dUNKIxB+/gpGZ4izaqWs="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/cl/cloudbrute/package.nix b/pkgs/by-name/cl/cloudbrute/package.nix index f56d867aa8d5..381e9540ae66 100644 --- a/pkgs/by-name/cl/cloudbrute/package.nix +++ b/pkgs/by-name/cl/cloudbrute/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { Alibaba, Vultr, Linode). ''; homepage = "https://github.com/0xsha/CloudBrute"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cl/cloudcompare/package.nix b/pkgs/by-name/cl/cloudcompare/package.nix index a736269cf28a..28b69ee1ecee 100644 --- a/pkgs/by-name/cl/cloudcompare/package.nix +++ b/pkgs/by-name/cl/cloudcompare/package.nix @@ -16,6 +16,7 @@ mpfr, pcl, libsForQt5, + nixosTests, onetbb, xercesc, wrapGAppsHook3, @@ -162,6 +163,8 @@ stdenv.mkDerivation (finalAttrs: { }) ]; + passthru.tests = nixosTests.cloudcompare; + meta = { description = "3D point cloud and mesh processing software"; homepage = "https://cloudcompare.org"; diff --git a/pkgs/by-name/cl/clouddrive2/package.nix b/pkgs/by-name/cl/clouddrive2/package.nix index 3d96d8ca157b..8eb9b9a0c30e 100644 --- a/pkgs/by-name/cl/clouddrive2/package.nix +++ b/pkgs/by-name/cl/clouddrive2/package.nix @@ -11,16 +11,15 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "clouddrive2"; - version = "1.0.8"; + version = "1.0.11"; src = fetchurl { url = "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v${finalAttrs.version}/clouddrive-2-${os}-${arch}-${finalAttrs.version}.tgz"; hash = { - x86_64-linux = "sha256-LB2G5g5Bj+kFmrY/kgQEGsXmrmrGQbH7pdshr8lfank="; - aarch64-linux = "sha256-XYjHiB9JDkfoKS1uzzvJ0o79+YipABedY56JnmCyInE="; - x86_64-darwin = "sha256-avzB7gUiVPKuRha+Ls7huNfrPtDKmyFPc6gFfuWOBPw="; - aarch64-darwin = "sha256-frldCUG6aGfXDoPzvG8QYMTL4SxTEd2hPLy0+7YWtIE="; + x86_64-linux = "sha256-X5WAnHyXdAkWrN/AbkDE0eNH4mwdPcZ0Cs5Q21KB6/w="; + aarch64-linux = "sha256-somHyDBG94pGQB+IZd404H1tX0X2qC8LeIcXeihU6yA="; + aarch64-darwin = "sha256-GaL2bCwQdtI3bq2wkwza1OEHFvhppdZpUIq3QRQ0vN8="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); }; @@ -58,7 +57,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/cl/clouddrive2/update.sh b/pkgs/by-name/cl/clouddrive2/update.sh index 200bb47700fe..1e121ba98260 100755 --- a/pkgs/by-name/cl/clouddrive2/update.sh +++ b/pkgs/by-name/cl/clouddrive2/update.sh @@ -15,7 +15,6 @@ fi for i in \ "x86_64-linux linux-x86_64" \ "aarch64-linux linux-aarch64" \ - "x86_64-darwin macos-x86_64" \ "aarch64-darwin macos-aarch64"; do set -- $i prefetch=$(nix-prefetch-url "https://github.com/cloud-fs/cloud-fs.github.io/releases/download/v$latestVersion/clouddrive-2-$2-$latestVersion.tgz") diff --git a/pkgs/by-name/cl/cloudflare-cli/package.nix b/pkgs/by-name/cl/cloudflare-cli/package.nix index 89156c67d24e..48530fecd394 100644 --- a/pkgs/by-name/cl/cloudflare-cli/package.nix +++ b/pkgs/by-name/cl/cloudflare-cli/package.nix @@ -12,18 +12,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "cloudflare-cli"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "danielpigott"; repo = "cloudflare-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-lNwpXNKrhRAdcDnaapsAyANnsgUtah3/T99iBitgAdY="; + hash = "sha256-3I8KvP9nlkiyYi4h7LpP5LE9xR+uvQyfkLLdSmDaG7E="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-8dQkdCRJ7hJGC3zuUX0hmd5tWCoPSTdRNbtg2vapEXE="; + hash = "sha256-XCqKC/uATKsWaqF9FnEd/p+CRl2OFP7zdmz7LAkm5HQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix index 661c184be155..473ce4ae0ed9 100644 --- a/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix +++ b/pkgs/by-name/cl/cloudflare-dynamic-dns/package.nix @@ -7,16 +7,16 @@ }: buildGoModule (finalAttrs: { pname = "cloudflare-dynamic-dns"; - version = "4.4.5"; + version = "4.5.1"; src = fetchFromGitHub { owner = "zebradil"; repo = "cloudflare-dynamic-dns"; tag = finalAttrs.version; - hash = "sha256-TIun4EZuk4lgtNiNRA8P0x3+hkh3UFMVMUa75YecUk0="; + hash = "sha256-EMT4vFm1EJxHFfnjh4ExfWOqaA+s9bJbI71wj//oRv0="; }; - vendorHash = "sha256-Pu73TKBgEgLhUktnY4o/fR4KBLT2s2CUGFSf2Jo3SbQ="; + vendorHash = "sha256-1x1Hw343ylhGsbNcj4hwweYnACoVZSdycwBbGUVuu+k="; subPackages = "."; diff --git a/pkgs/by-name/cl/cloudflare-warp/package.nix b/pkgs/by-name/cl/cloudflare-warp/package.nix index fca8a5bc535e..809f6f028740 100644 --- a/pkgs/by-name/cl/cloudflare-warp/package.nix +++ b/pkgs/by-name/cl/cloudflare-warp/package.nix @@ -27,7 +27,7 @@ let version = "2026.3.846.0"; - sources = rec { + sources = { x86_64-linux = fetchurl { url = "https://pkg.cloudflareclient.com/pool/noble/main/c/cloudflare-warp/cloudflare-warp_${version}_amd64.deb"; hash = "sha256-1SKTK0QW+3CcqBLqHbIsPny/6ekyjZe9qRcjYOMnR58="; @@ -40,7 +40,6 @@ let url = "https://downloads.cloudflareclient.com/v1/download/macos/version/${version}"; hash = "sha256-cDmoM0nIYYQyurJeeiVSX0IWJdIY0pVLmjIae5mEXI4="; }; - x86_64-darwin = aarch64-darwin; }; in stdenv.mkDerivation (finalAttrs: { @@ -222,7 +221,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/cl/cloudflared/package.nix b/pkgs/by-name/cl/cloudflared/package.nix index 758efddd4e50..9d18a1b6c502 100644 --- a/pkgs/by-name/cl/cloudflared/package.nix +++ b/pkgs/by-name/cl/cloudflared/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "cloudflared"; - version = "2026.6.0"; + version = "2026.7.2"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; tag = finalAttrs.version; - hash = "sha256-V3fHxDNkxF7MwChZpyHZ7pn8bBgBe/ugNql2QzqSLFA="; + hash = "sha256-fuJfvm5c63koMl46sJmZOiWuNKpOwH17MD20XD7q6s0="; }; vendorHash = null; diff --git a/pkgs/by-name/cl/cloudfoundry-cli/package.nix b/pkgs/by-name/cl/cloudfoundry-cli/package.nix index a32cc8bb88ea..81d9f1a9c08a 100644 --- a/pkgs/by-name/cl/cloudfoundry-cli/package.nix +++ b/pkgs/by-name/cl/cloudfoundry-cli/package.nix @@ -8,15 +8,15 @@ buildGoModule (finalAttrs: { pname = "cloudfoundry-cli"; - version = "8.18.3"; + version = "8.18.4"; src = fetchFromGitHub { owner = "cloudfoundry"; repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-0+osaSI+qOBGMbkVBvoT69qbXLZLHHOs6ML3kx6OIMQ="; + sha256 = "sha256-qbNRferh8AEo3Y7zCgaQKQ1IZHSbhDYzy7OqZahiBfA="; }; - vendorHash = "sha256-8ozKd8kT+QDgk1t86AIdlRObZPooO77mEFGKcpGCy3s="; + vendorHash = "sha256-zkv7ZuEKp6Nlw1NQqr0A6HX4Jx/yFR4wpo7tyD6VoXY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/cl/cloudlog/package.nix b/pkgs/by-name/cl/cloudlog/package.nix index 42817d250b80..95d66a9b050b 100644 --- a/pkgs/by-name/cl/cloudlog/package.nix +++ b/pkgs/by-name/cl/cloudlog/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.8.14"; + version = "2.8.16"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - hash = "sha256-036wo8QiRoqiMNj7ag/txfecxITb1aPI4YydWc9N/yA="; + hash = "sha256-lu8ioYOFCv49vox1JjzzdPeM4RR6//uX+m+We7fj9Jc="; }; postPatch = '' diff --git a/pkgs/by-name/cl/cloudmonkey/package.nix b/pkgs/by-name/cl/cloudmonkey/package.nix index 34f60d86ea4b..b93780123a74 100644 --- a/pkgs/by-name/cl/cloudmonkey/package.nix +++ b/pkgs/by-name/cl/cloudmonkey/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI for Apache CloudStack"; homepage = "https://github.com/apache/cloudstack-cloudmonkey"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.womfoo ]; mainProgram = "cloudstack-cloudmonkey"; }; diff --git a/pkgs/by-name/cl/cloudquery/package.nix b/pkgs/by-name/cl/cloudquery/package.nix new file mode 100644 index 000000000000..fb602644e68a --- /dev/null +++ b/pkgs/by-name/cl/cloudquery/package.nix @@ -0,0 +1,62 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, + installShellFiles, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "cloudquery"; + version = "6.41.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cloudquery"; + repo = "cloudquery"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ybHyZnJTtOacywgjJ+PiH8KJNn1DgBNJ4yMMtu4y/vw="; + }; + + modRoot = "cli"; + + vendorHash = "sha256-zXYYheZtWFuOZ/9AH+h/Qjf4+UZ6RRb9grk/mrJZxTU="; + + subPackages = [ + "." + ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/cloudquery/cloudquery/cli/v${lib.versions.major finalAttrs.version}/cmd.Version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ]; + + postInstall = '' + mv $out/bin/cli $out/bin/cloudquery + + installShellCompletion --cmd cloudquery \ + --bash <($out/bin/cloudquery completion bash) \ + --fish <($out/bin/cloudquery completion fish) \ + --zsh <($out/bin/cloudquery completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Data pipelines for cloud config and security data"; + homepage = "https://github.com/cloudquery/cloudquery"; + changelog = "https://github.com/cloudquery/cloudquery/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mpl20; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "cloudquery"; + }; +}) diff --git a/pkgs/by-name/cl/clpeak/package.nix b/pkgs/by-name/cl/clpeak/package.nix index 23aad7821e46..048f1739585d 100644 --- a/pkgs/by-name/cl/clpeak/package.nix +++ b/pkgs/by-name/cl/clpeak/package.nix @@ -9,14 +9,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "clpeak"; - version = "2.0.0"; + version = "2.0.13"; src = fetchFromGitHub { owner = "krrishnarraj"; repo = "clpeak"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-e6r9kGjSWnhgODKtIIjXBA63L9JGQFHIsacfH0IJAGo="; + hash = "sha256-tybt85jxoaWLUuZNFAla+2t0rLSanapc9w3lgez9uPI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cl/clusterctl/package.nix b/pkgs/by-name/cl/clusterctl/package.nix index db51922af028..047d640963a7 100644 --- a/pkgs/by-name/cl/clusterctl/package.nix +++ b/pkgs/by-name/cl/clusterctl/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "clusterctl"; - version = "1.12.2"; + version = "1.13.4"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "cluster-api"; rev = "v${finalAttrs.version}"; - hash = "sha256-AaGJhdBTyCxUK+qm++McS6rFlgAdv/7SjQHvaNRn6YU="; + hash = "sha256-x/u4lWacCz3GpUCyC8ty4nPPQblEs9G7vucqSJSupEQ="; }; - vendorHash = "sha256-3dh9Y8R4OeUayyqNyrvUcrnSi/4s9x6oMrAADXR5rnw="; + vendorHash = "sha256-73hCBGzE9LB59L+GurlZeTV6K/FLJgtjQc3ku4JR+iM="; subPackages = [ "cmd/clusterctl" ]; diff --git a/pkgs/by-name/cl/clusternet/package.nix b/pkgs/by-name/cl/clusternet/package.nix index 6175595a2abc..dedf8b5e1660 100644 --- a/pkgs/by-name/cl/clusternet/package.nix +++ b/pkgs/by-name/cl/clusternet/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "clusternet"; - version = "0.18.1"; + version = "1.0.0"; src = fetchFromGitHub { owner = "clusternet"; repo = "clusternet"; tag = "v${finalAttrs.version}"; - hash = "sha256-MtiQM2msHv2gLaVpYoSrzJMZWwA0vMBIklwAQi+lG4g="; + hash = "sha256-Nrnk3Ru4DTOagc7iTC4ZGyYhqhQwLIgs3fu67l0stEs="; }; - vendorHash = "sha256-vG+k9ttXp/QqhbVKgwn2uo5kEk8OD+LBvJi5lBQfUk4="; + vendorHash = "sha256-mMXtiCz4Y5pL77c24RnZ2Uoq5Fh2pkrkApAdkd/xyyw="; ldFlags = [ "-s" diff --git a/pkgs/tools/system/cm-rgb/default.nix b/pkgs/by-name/cm/cm-rgb/package.nix similarity index 100% rename from pkgs/tools/system/cm-rgb/default.nix rename to pkgs/by-name/cm/cm-rgb/package.nix diff --git a/pkgs/by-name/cm/cmake/darwin-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch index b4e84bef22e6..af9d5af2cfe1 100644 --- a/pkgs/by-name/cm/cmake/darwin-binary-paths.patch +++ b/pkgs/by-name/cm/cmake/darwin-binary-paths.patch @@ -46,16 +46,3 @@ index 15a1e2c0c3..33bb304cf7 100644 OUTPUT_VARIABLE OSX_VERSION OUTPUT_STRIP_TRAILING_WHITESPACE ) -diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index ddc975c202..8ff651fd90 100644 ---- a/Utilities/cmcurl/CMakeLists.txt -+++ b/Utilities/cmcurl/CMakeLists.txt -@@ -127,7 +127,7 @@ - set(OSX_VERSION ${CMAKE_OSX_DEPLOYMENT_TARGET}) - else() - execute_process( -- COMMAND sw_vers -productVersion -+ COMMAND @sw_vers@ -productVersion - OUTPUT_VARIABLE OSX_VERSION - OUTPUT_STRIP_TRAILING_WHITESPACE - ) diff --git a/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch index b7917467f2f0..8fe699ac2953 100644 --- a/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch +++ b/pkgs/by-name/cm/cmake/darwin-bsd-binary-paths.patch @@ -39,13 +39,13 @@ index 260b6631c0..ffb8fcd8d2 100644 if(ProcessorCount_cmd_sysctl) execute_process(COMMAND ${ProcessorCount_cmd_sysctl} -n hw.ncpu diff --git a/Source/kwsys/ProcessUNIX.c b/Source/kwsys/ProcessUNIX.c -index a918b8d9a7..36145707e1 100644 +index 8c22b4e43a..6d9ccef5e7 100644 --- a/Source/kwsys/ProcessUNIX.c +++ b/Source/kwsys/ProcessUNIX.c -@@ -2503,7 +2503,7 @@ - have two integers to store: the pid and then the ppid. */ +@@ -2503,7 +2503,7 @@ static pid_t kwsysProcessFork(kwsysProcess* cp, #if defined(__linux__) || defined(__APPLE__) || defined(__FreeBSD__) || \ - defined(__OpenBSD__) || defined(__GLIBC__) || defined(__GNU__) + defined(__NetBSD__) || defined(__OpenBSD__) || defined(__GLIBC__) || \ + defined(__GNU__) -# define KWSYSPE_PS_COMMAND "ps axo pid,ppid" +# define KWSYSPE_PS_COMMAND "@ps@ axo pid,ppid" # define KWSYSPE_PS_FORMAT "%d %d\n" diff --git a/pkgs/by-name/cm/cmake/fix-curl-8.16.patch b/pkgs/by-name/cm/cmake/fix-curl-8.16.patch deleted file mode 100644 index feabba28b0d6..000000000000 --- a/pkgs/by-name/cm/cmake/fix-curl-8.16.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/Source/CTest/cmCTestCurl.h b/Source/CTest/cmCTestCurl.h -index 7836f4b9c78a1d103eee515d618856a6712b4480..9113890b5a12cb157b691b66d96e25d0fd4b50ef 100644 ---- a/Source/CTest/cmCTestCurl.h -+++ b/Source/CTest/cmCTestCurl.h -@@ -52,7 +52,7 @@ private: - std::vector HttpHeaders; - std::string HTTPProxyAuth; - std::string HTTPProxy; -- curl_proxytype HTTPProxyType; -+ long HTTPProxyType; - bool UseHttp10 = false; - bool Quiet = false; - int TimeOutSeconds = 0; diff --git a/pkgs/by-name/cm/cmake/package.nix b/pkgs/by-name/cm/cmake/package.nix index dc16992a27aa..134896e1fee7 100644 --- a/pkgs/by-name/cm/cmake/package.nix +++ b/pkgs/by-name/cm/cmake/package.nix @@ -50,11 +50,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString isMinimalBuild "-minimal" + lib.optionalString cursesUI "-cursesUI" + lib.optionalString qt5UI "-qt5UI"; - version = "4.1.2"; + version = "4.3.4"; src = fetchurl { url = "https://cmake.org/files/v${lib.versions.majorMinor finalAttrs.version}/cmake-${finalAttrs.version}.tar.gz"; - hash = "sha256-ZD8EGCt7oyOrMfUm94UTT7ecujGIqFIgbvBHP+4oKhU="; + hash = "sha256-/e/4l7nrSddkU58rHtxut+FEDfMlZ4qXwZeEmekxrdo="; }; patches = [ diff --git a/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch index cb01326b9c35..9054302f3785 100644 --- a/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch +++ b/pkgs/by-name/cm/cmake/remove-impure-search-paths.patch @@ -157,10 +157,10 @@ index 2a2f478fd7..f22281bdca 100644 list(REMOVE_DUPLICATES _CPACK_IFW_PATHS) diff --git a/Modules/FindBLAS.cmake b/Modules/FindBLAS.cmake -index b45a279b94..884ccc0e32 100644 +index 9f986a78e7..5a6a9758ea 100644 --- a/Modules/FindBLAS.cmake +++ b/Modules/FindBLAS.cmake -@@ -1098,16 +1098,8 @@ +@@ -1112,16 +1112,10 @@ if(BLA_VENDOR MATCHES "ACML" OR BLA_VENDOR STREQUAL "All") ((BLA_VENDOR STREQUAL "ACML_GPU") AND (NOT BLAS_ACML_GPU_LIB_DIRS)) ) # try to find acml in "standard" paths @@ -176,9 +176,11 @@ index b45a279b94..884ccc0e32 100644 - endif() + set(_ACML_ROOT) + set(_ACML_GPU_ROOT) - list(GET _ACML_ROOT 0 _ACML_ROOT) - list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT) ++ list(GET _ACML_ROOT 0 _ACML_ROOT) ++ list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT) if(_ACML_ROOT) + list(GET _ACML_ROOT 0 _ACML_ROOT) + list(GET _ACML_GPU_ROOT 0 _ACML_GPU_ROOT) diff --git a/Modules/FindCUDA.cmake b/Modules/FindCUDA.cmake index bceb615ca0..2350b15655 100644 --- a/Modules/FindCUDA.cmake @@ -229,26 +231,13 @@ index bceb615ca0..2350b15655 100644 # Example of how to find an include file from the CUDA_SDK_ROOT_DIR diff --git a/Modules/FindCUDAToolkit.cmake b/Modules/FindCUDAToolkit.cmake -index b00cd26b7e..f5f74ebe1d 100644 +index df36f9a19b..825d1e7386 100644 --- a/Modules/FindCUDAToolkit.cmake +++ b/Modules/FindCUDAToolkit.cmake -@@ -776,12 +776,6 @@ - elseif(CUDAToolkit_ROOT_DIR AND EXISTS "${CUDAToolkit_ROOT_DIR}/${vf}") - set(${result_variable} "${CUDAToolkit_ROOT_DIR}/${vf}" PARENT_SCOPE) - break() -- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}") -- set(${result_variable} "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}" PARENT_SCOPE) -- break() -- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}") -- set(${result_variable} "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}" PARENT_SCOPE) -- break() - endif() - endforeach() - endfunction() -@@ -864,18 +858,8 @@ - # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked - # directory is the desired location. - if(NOT CUDAToolkit_ROOT_DIR) +@@ -830,18 +830,9 @@ else() + # We will also search the default symlink location /usr/local/cuda first since + # if CUDAToolkit_ROOT is not specified, it is assumed that the symlinked + # directory is the desired location. - if(UNIX) - if(NOT APPLE) - set(platform_base "/usr/local/cuda-") @@ -258,14 +247,14 @@ index b00cd26b7e..f5f74ebe1d 100644 - else() - set(platform_base "C:\\Program Files\\NVIDIA GPU Computing Toolkit\\CUDA\\v") - endif() -- + # Build out a descending list of possible cuda installations, e.g. - file(GLOB possible_paths "${platform_base}*") + set(possible_paths) # Iterate the glob results and create a descending list. set(versions) foreach(p ${possible_paths}) -@@ -891,14 +875,6 @@ +@@ -857,14 +848,6 @@ else() # With a descending list of versions, populate possible paths to search. set(search_paths) @@ -280,6 +269,19 @@ index b00cd26b7e..f5f74ebe1d 100644 # Now search for the toolkit again using the platform default search paths. _CUDAToolkit_find_root_dir(SEARCH_PATHS "${search_paths}" FIND_FLAGS PATH_SUFFIXES bin) +@@ -889,12 +872,6 @@ else() + elseif(CUDAToolkit_ROOT_DIR AND EXISTS "${CUDAToolkit_ROOT_DIR}/${vf}") + set(${result_variable} "${CUDAToolkit_ROOT_DIR}/${vf}" PARENT_SCOPE) + break() +- elseif(CMAKE_SYSROOT_LINK AND EXISTS "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}") +- set(${result_variable} "${CMAKE_SYSROOT_LINK}/usr/lib/cuda/${vf}" PARENT_SCOPE) +- break() +- elseif(EXISTS "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}") +- set(${result_variable} "${CMAKE_SYSROOT}/usr/lib/cuda/${vf}" PARENT_SCOPE) +- break() + endif() + endforeach() + endfunction() diff --git a/Modules/FindCoin3D.cmake b/Modules/FindCoin3D.cmake index 1d89c604e0..5b70e71a87 100644 --- a/Modules/FindCoin3D.cmake @@ -579,10 +581,10 @@ index 82156747d3..cc3f2a64af 100644 "Ice-${Ice_VERSION_SLICE2CPP_FULL}/slice" "Ice-${Ice_VERSION_SLICE2CPP_SHORT}/slice" diff --git a/Modules/FindJNI.cmake b/Modules/FindJNI.cmake -index 10dcc51776..e272bd9583 100644 +index a70b00f330..1962b55d4a 100644 --- a/Modules/FindJNI.cmake +++ b/Modules/FindJNI.cmake -@@ -363,51 +363,6 @@ +@@ -367,56 +367,6 @@ if (WIN32) endif() set(_JNI_JAVA_DIRECTORIES_BASE @@ -604,6 +606,11 @@ index 10dcc51776..e272bd9583 100644 - # Arch Linux specific paths for default JVM - /usr/lib/jvm/default - # Ubuntu specific paths for default JVM +- /usr/lib/jvm/java-26-openjdk-{libarch} +- /usr/lib/jvm/java-25-openjdk-{libarch} # Ubuntu 24.04 LTS +- /usr/lib/jvm/java-24-openjdk-{libarch} +- /usr/lib/jvm/java-23-openjdk-{libarch} +- /usr/lib/jvm/java-22-openjdk-{libarch} - /usr/lib/jvm/java-21-openjdk-{libarch} # Ubuntu 23.04 - /usr/lib/jvm/java-20-openjdk-{libarch} # Ubuntu 22.10 - /usr/lib/jvm/java-19-openjdk-{libarch} # Ubuntu 22.04 LTS @@ -1093,28 +1100,28 @@ index edef791cb8..5515f44710 100644 find_path(PHP4_FOUND_INCLUDE_PATH main/php.h diff --git a/Modules/FindPerlLibs.cmake b/Modules/FindPerlLibs.cmake -index 330700e183..7fc89df6eb 100644 +index fbe1aade72..34562e7807 100644 --- a/Modules/FindPerlLibs.cmake +++ b/Modules/FindPerlLibs.cmake -@@ -141,10 +141,6 @@ +@@ -176,10 +176,6 @@ if (PERL_EXECUTABLE) PATHS "${PERL_UPDATE_ARCHLIB}/CORE" "${PERL_ARCHLIB}/CORE" -- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE -- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE -- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE -- /usr/lib/perl/${PERL_VERSION_STRING}/CORE +- /usr/lib/perl5/${PerlLibs_VERSION}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl/${PerlLibs_VERSION}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl5/${PerlLibs_VERSION}/CORE +- /usr/lib/perl/${PerlLibs_VERSION}/CORE ) ### PERL_LIBRARY -@@ -154,10 +150,6 @@ +@@ -189,10 +185,6 @@ if (PERL_EXECUTABLE) PATHS "${PERL_UPDATE_ARCHLIB}/CORE" "${PERL_ARCHLIB}/CORE" -- /usr/lib/perl5/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE -- /usr/lib/perl/${PERL_VERSION_STRING}/${PERL_ARCHNAME}/CORE -- /usr/lib/perl5/${PERL_VERSION_STRING}/CORE -- /usr/lib/perl/${PERL_VERSION_STRING}/CORE +- /usr/lib/perl5/${PerlLibs_VERSION}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl/${PerlLibs_VERSION}/${PERL_ARCHNAME}/CORE +- /usr/lib/perl5/${PerlLibs_VERSION}/CORE +- /usr/lib/perl/${PerlLibs_VERSION}/CORE ) endif () @@ -1343,17 +1350,21 @@ index 2c62a5f17f..772a8d88f6 100644 PATH_SUFFIXES bin lib/qt lib/qt3 qt qt3 qt/bin qt3/bin lib/qt/bin lib/qt3/bin diff --git a/Modules/FindRuby.cmake b/Modules/FindRuby.cmake -index 18b9e35855..dba9976565 100644 +index 863f70a7f2..17e3ac606a 100644 --- a/Modules/FindRuby.cmake +++ b/Modules/FindRuby.cmake -@@ -367,7 +367,6 @@ - HINTS - ${Ruby_HDR_DIR} - ${Ruby_ARCH_DIR} -- /usr/lib/ruby/${_Ruby_VERSION_SHORT}/i586-linux-gnu/ - ) +@@ -366,11 +366,6 @@ if (NOT Ruby_EXECUTABLE AND Ruby_FIND_VIRTUALENV MATCHES "^(FIRST|ONLY)$") + endif () + endif () - set(Ruby_INCLUDE_DIRS ${Ruby_INCLUDE_DIR}) +-# Check for Homebrew Ruby (non-virtualenv, common on MacOS) +-if (NOT Ruby_EXECUTABLE AND NOT Ruby_FIND_VIRTUALENV STREQUAL "ONLY") +- _RUBY_CHECK_BREW() +-endif () +- + # Fallback to system installed Ruby + if (NOT Ruby_EXECUTABLE AND NOT Ruby_FIND_VIRTUALENV STREQUAL "ONLY") + _RUBY_CHECK_SYSTEM() diff --git a/Modules/FindSDL.cmake b/Modules/FindSDL.cmake index a720dcc3df..73e222a27c 100644 --- a/Modules/FindSDL.cmake @@ -1644,6 +1655,20 @@ index 7c4f123a1d..4cfd53de9f 100644 if(NOT CMAKE_CROSSCOMPILING) execute_process(COMMAND @sw_vers@ -productVersion +@@ -277,13 +277,6 @@ if(NOT CMAKE_OSX_SYSROOT) + RESULT_VARIABLE _result + ) + unset(_sdk_macosx) +- +- list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES_EXCLUDE +- # Without -isysroot, some compiler drivers implicitly pass -L/usr/local/lib +- # to the linker. Since the macOS dynamic loader does not search it by +- # default, it is not a fully-implemented implicit link directory. +- /usr/local/lib +- ) + endif() + + #---------------------------------------------------------------------------- diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake index 42c6b35424..f2985f3765 100644 --- a/Modules/Platform/Darwin.cmake @@ -1905,10 +1930,10 @@ index b977d955ca..5ff835298d 100644 set(_jar_doc "NOTSET") diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt -index 8ff651fd90..9659deedf5 100644 +index 2c6a6e6a19..3a43da619a 100644 --- a/Utilities/cmcurl/CMakeLists.txt +++ b/Utilities/cmcurl/CMakeLists.txt -@@ -1826,43 +1826,6 @@ +@@ -1566,43 +1566,6 @@ if(_curl_ca_bundle_supported) endif() mark_as_advanced(CURL_CA_PATH_SET) @@ -1929,8 +1954,8 @@ index 8ff651fd90..9659deedf5 100644 - if(EXISTS "${_search_ca_bundle_path}") - message(STATUS "Found CA bundle: ${_search_ca_bundle_path}") - set(CURL_CA_BUNDLE "${_search_ca_bundle_path}" CACHE -- STRING "Path to the CA bundle. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") -- set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Path to the CA bundle has been set") +- STRING "Absolute path to the CA bundle. ${_ca_opt_desc}") +- set(CURL_CA_BUNDLE_SET TRUE CACHE BOOL "Absolute path to the CA bundle has been set") - break() - endif() - endforeach() @@ -1943,8 +1968,8 @@ index 8ff651fd90..9659deedf5 100644 - unset(_curl_ca_files_found) - message(STATUS "Found CA path: ${_search_ca_path}") - set(CURL_CA_PATH "${_search_ca_path}" CACHE -- STRING "Location of default CA path. Set 'none' to disable or 'auto' for auto-detection. Defaults to 'auto'.") -- set(CURL_CA_PATH_SET TRUE CACHE BOOL "Path to the CA bundle has been set") +- STRING "Absolute path to a directory containing CA certificates stored individually. ${_ca_opt_desc}") +- set(CURL_CA_PATH_SET TRUE CACHE BOOL "Absolute path to the CA bundle has been set") - endif() - endif() - endif() diff --git a/pkgs/by-name/cm/cmc/package.nix b/pkgs/by-name/cm/cmc/package.nix index 07e0370365d0..dde599bdddd6 100644 --- a/pkgs/by-name/cm/cmc/package.nix +++ b/pkgs/by-name/cm/cmc/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/TimidRobot/cmc"; description = "Manages SSH ControlMaster sessions"; mainProgram = "cmc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cm/cmocka/package.nix b/pkgs/by-name/cm/cmocka/package.nix index 34cb30c206b1..f2e4e6a38955 100644 --- a/pkgs/by-name/cm/cmocka/package.nix +++ b/pkgs/by-name/cm/cmocka/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "cmocka"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "https://cmocka.org/files/${lib.versions.majorMinor finalAttrs.version}/cmocka-${finalAttrs.version}.tar.xz"; - hash = "sha256-PzUzOCuimrOr9cT0snt50WXw31HqWH3nSbEbaLQBkYA="; + hash = "sha256-OfkvNmvfPxoCr02nW0pcUt9sn35zbH1l3hMoP58O9BY="; }; patches = [ @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake ]; cmakeFlags = - lib.optional finalAttrs.doCheck "-DUNIT_TESTING=ON" + lib.optional finalAttrs.finalPackage.doCheck "-DUNIT_TESTING=ON" ++ lib.optional stdenv.hostPlatform.isStatic "-DBUILD_SHARED_LIBS=OFF"; doCheck = true; diff --git a/pkgs/by-name/cn/cni-plugin-flannel/package.nix b/pkgs/by-name/cn/cni-plugin-flannel/package.nix index f838aa3c82c1..136fb2887c3d 100644 --- a/pkgs/by-name/cn/cni-plugin-flannel/package.nix +++ b/pkgs/by-name/cn/cni-plugin-flannel/package.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "cni-plugin-flannel"; - version = "1.9.1-flannel1"; + version = "1.9.1-flannel2"; src = fetchFromGitHub { owner = "flannel-io"; repo = "cni-plugin"; rev = "v${version}"; - sha256 = "sha256-iCSYr7S4oC8a5ijBgqMO/Gn0x/2had372Tx7lkg+X9I="; + sha256 = "sha256-ApPv1sQQZSevvP9gem9bTRWRZzHtcDHWNFTwEdCPJ6s="; }; - vendorHash = "sha256-PVkhwoGepRhD6VFJxhPA2tZ+zOkhQw0aI2yIWVYQnz8="; + vendorHash = "sha256-WoVjhj2r4hVLBFYUYwpwuB7rpvoZFBDLpaEbLrxuFj4="; ldflags = [ "-s" diff --git a/pkgs/by-name/cn/cnquery/package.nix b/pkgs/by-name/cn/cnquery/package.nix index 0c42681763a2..1251430fe788 100644 --- a/pkgs/by-name/cn/cnquery/package.nix +++ b/pkgs/by-name/cn/cnquery/package.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "mondoohq"; - repo = "cnquery"; + repo = "mql"; tag = "v${version}"; hash = "sha256-CTg2jfpCLTYuRx5R+9Si0Ig1NT1ZGXMFbcPPa8CbMKY="; }; @@ -32,7 +32,7 @@ buildGoModule rec { accounts, Kubernetes, containers, services, VMs, APIs, and more. ''; homepage = "https://mondoo.com/cnquery"; - changelog = "https://github.com/mondoohq/cnquery/releases/tag/v${version}"; + changelog = "https://github.com/mondoohq/mql/releases/tag/v${version}"; license = lib.licenses.bsl11; maintainers = with lib.maintainers; [ mariuskimmina ]; }; diff --git a/pkgs/by-name/cn/cnspec/package.nix b/pkgs/by-name/cn/cnspec/package.nix index ebf8ef72e0b4..f58604508756 100644 --- a/pkgs/by-name/cn/cnspec/package.nix +++ b/pkgs/by-name/cn/cnspec/package.nix @@ -6,18 +6,18 @@ buildGoModule (finalAttrs: { pname = "cnspec"; - version = "13.21.1"; + version = "13.28.0"; src = fetchFromGitHub { owner = "mondoohq"; repo = "cnspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-uc2W1OWvnzXqEpDtkXd2b8ieCHxOIQ0QAvayDyah7pc="; + hash = "sha256-9AlHvxWdmJIdfvmok9n+6g0k5A4Rts2+G5pO9xbYWSQ="; }; proxyVendor = true; - vendorHash = "sha256-RGuV0gZgCxmIVb2neb/Yn/Tvo4hZDAK5vUVEl8FxYBI="; + vendorHash = "sha256-LTzg76RQOV0d3Xk4Q8NvBnmTQv4QhJutNoJPw0gCCII="; subPackages = [ "apps/cnspec" ]; diff --git a/pkgs/by-name/cn/cnstrokeorder/package.nix b/pkgs/by-name/cn/cnstrokeorder/package.nix index 44d4d21b886f..02b0f35635cb 100644 --- a/pkgs/by-name/cn/cnstrokeorder/package.nix +++ b/pkgs/by-name/cn/cnstrokeorder/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Chinese font that shows stroke order for HSK 1-4"; homepage = "http://rtega.be/chmn/index.php?subpage=68"; - license = [ lib.licenses.arphicpl ]; + license = lib.licenses.arphicpl; maintainers = with lib.maintainers; [ johnazoidberg ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/cn/cntb/package.nix b/pkgs/by-name/cn/cntb/package.nix index 29b4af7a2f05..c570b3295b31 100644 --- a/pkgs/by-name/cn/cntb/package.nix +++ b/pkgs/by-name/cn/cntb/package.nix @@ -5,13 +5,13 @@ }: buildGoModule (finalAttrs: { pname = "cntb"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "contabo"; repo = "cntb"; rev = "v${finalAttrs.version}"; - hash = "sha256-si6mJ5jHGrgnKp0NP92iFOtGf8x8LG7fqnGccBKXThI="; + hash = "sha256-FR55cvsEEKR+zdvHrJWtmIv/fUn2nAY7JKd2DUlhb4M="; # docs contains two files with the same name but different cases, # this leads to a different hash on case insensitive filesystems (e.g. darwin) # https://github.com/contabo/cntb/issues/34 @@ -22,7 +22,7 @@ buildGoModule (finalAttrs: { subPackages = [ "." ]; - vendorHash = "sha256-W1087nbI6Gd9uy8HPTlms6mXfmj/IzcGIW2AXYRBQG4="; + vendorHash = "sha256-uM7RaVF95WsNok3W7smfX952+Ojl2saGO41QRIFG824="; ldflags = [ "-X contabo.com/cli/cntb/cmd.version=${finalAttrs.src.rev}" diff --git a/pkgs/by-name/co/coal/package.nix b/pkgs/by-name/co/coal/package.nix index c6b2596a8970..eceb6312814b 100644 --- a/pkgs/by-name/co/coal/package.nix +++ b/pkgs/by-name/co/coal/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coal"; - version = "3.0.3"; + version = "3.0.4"; src = fetchFromGitHub { owner = "coal-library"; repo = "coal"; tag = "v${finalAttrs.version}"; - hash = "sha256-2fmu2VZJ+Fd87q2RpnJU61v6Lj2C9r5iweFrr1HwQQI="; + hash = "sha256-lCTybqJPP7CuqdACjzuiR/kufu6fJxKhpa71/Z3oWXA="; }; strictDeps = true; diff --git a/pkgs/by-name/co/coc-clangd/package.nix b/pkgs/by-name/co/coc-clangd/package.nix index 9dce28970af3..6d44722e145c 100644 --- a/pkgs/by-name/co/coc-clangd/package.nix +++ b/pkgs/by-name/co/coc-clangd/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-clangd"; - version = "0-unstable-2026-06-02"; + version = "0-unstable-2026-07-01"; src = fetchFromGitHub { owner = "clangd"; repo = "coc-clangd"; - rev = "93926afd0beb4ac9beabddbac8b14743e2762fa9"; - hash = "sha256-03VgcaJ+EZmRXxKcWaHO9kVb9dmIGI30CiJNDkjp3CY="; + rev = "d745e149736451664ab448d08f3e9f83ec3cc70d"; + hash = "sha256-juqZg1zsmQYdokvH83InUP1YpS8oybPhglapMas5z0A="; }; - npmDepsHash = "sha256-YoFfBQjWvJZ1Xj9dkNmtb7jZI43eFf9O/WZDwOBejdo="; + npmDepsHash = "sha256-OgNHgDSAqINNmskwhrWNh+TiHGRE4Y9SCFc0+RTs+CI="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-markdownlint/package.nix b/pkgs/by-name/co/coc-markdownlint/package.nix index 5251a4ebe1b4..1a64fe49494e 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-2026-06-02"; + version = "0-unstable-2026-06-17"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "9722582fc3dbff43535d6ba643df6f1c1211f2a7"; - hash = "sha256-oOGLxK9A46HVaqmmdHN9SisplhOkvegAunx5IWvOyDo="; + rev = "56458cb4ffe81f70e23fafef276dc5eaf8e74061"; + hash = "sha256-FUWJoT8h/Hz8cOUY71TLDYCsWXPxWdT0NNdrhryOlWA="; }; - npmDepsHash = "sha256-s8MXIzIbq24UZ+SbLummedG6+4rvTRadCeWB8UiPlXM="; + npmDepsHash = "sha256-MuWfnvRWJXEnIa46WBrnhqKHzPe0TAOWuBOMK3XsxcM="; 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 2179468bdab5..ef84afa75456 100644 --- a/pkgs/by-name/co/coc-rust-analyzer/package.nix +++ b/pkgs/by-name/co/coc-rust-analyzer/package.nix @@ -7,16 +7,16 @@ buildNpmPackage { pname = "coc-rust-analyzer"; - version = "0-unstable-2026-06-09"; + version = "0-unstable-2026-07-14"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-rust-analyzer"; - rev = "cadaeed1edf1bc289c616d21f5818cf835ae45b2"; - hash = "sha256-eo+3K40JhktADVN2SWJg8AQAXBndx6u2L56ZXGbhqdE="; + rev = "4e0c84fdbfb8252cc88d0d8ef8af6642a00b8abc"; + hash = "sha256-XTerfjqPyyFlt4y1g1LlAN/JV0aXWEbwCb03YqkMySM="; }; - npmDepsHash = "sha256-4AdpOBXLqWzFQrI7MyWdEqkiE8BuxOV+SmHcFMKlkBk="; + npmDepsHash = "sha256-ifDAM08pfdbqPl9G5s5cx8hGzldNuVc0DcXDyCGgkkI="; passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; diff --git a/pkgs/by-name/co/coc-texlab/package.nix b/pkgs/by-name/co/coc-texlab/package.nix index 49abbcf6bbc6..fff291b2587f 100644 --- a/pkgs/by-name/co/coc-texlab/package.nix +++ b/pkgs/by-name/co/coc-texlab/package.nix @@ -36,18 +36,18 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "coc-texlab"; - version = "0-unstable-2026-03-11"; + version = "0-unstable-2026-06-20"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-texlab"; - rev = "4b0e8626f06a9396767468edd800501929483eda"; - hash = "sha256-HOZBojd6pqPPeOKeki2Fr23B5ew86ruEvPt9IAOJdMk="; + rev = "bd18d69dcc43c95b0cca4b1a75d8b9d7894c19a2"; + hash = "sha256-gOCs0ztJLlBdLpzzdC72UEXk01RO2d2vSXTawllPLX0="; }; yarnOfflineCache = fetchYarnDeps { inherit (finalAttrs) src; - hash = "sha256-iAEGe0QZrt+iSkR0MbjsrwpvJz89bP4Xj+NQfsOnL5s="; + hash = "sha256-2tjoLsmHDDnmC6f0d9IeK/bWprQJXrwEnGEFK9V4Lg0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cockpit-files/package.nix b/pkgs/by-name/co/cockpit-files/package.nix index 8239d5dbf066..e2d15ae8d224 100644 --- a/pkgs/by-name/co/cockpit-files/package.nix +++ b/pkgs/by-name/co/cockpit-files/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-files"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-files"; tag = finalAttrs.version; - hash = "sha256-qS9L0REWN8exXiy5ogYQNbuwaxuh8CiKaCUJHdkfSqQ="; + hash = "sha256-NfI6y60O5ctsPbwPcXgkwxpNYuZkF/2YXZOIcRZUc5c="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-files"; changelog = "https://github.com/cockpit-project/cockpit-files/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-machines/package.nix b/pkgs/by-name/co/cockpit-machines/package.nix index d16e56df2a18..96f4fb87e736 100644 --- a/pkgs/by-name/co/cockpit-machines/package.nix +++ b/pkgs/by-name/co/cockpit-machines/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-machines"; - version = "353"; + version = "354"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-machines"; tag = finalAttrs.version; - hash = "sha256-K4p2HDg1Wh1ORw3S2BeY0Kbpy+CEGyiCM623/6M4LpU="; + hash = "sha256-r5gvs6/clRDV0VZKU1r6fjJSwHLuf9Pnhi0c60/9qkE="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-machines"; changelog = "https://github.com/cockpit-project/cockpit-machines/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-podman/package.nix b/pkgs/by-name/co/cockpit-podman/package.nix index e14de81eaf25..f2419ca2f855 100644 --- a/pkgs/by-name/co/cockpit-podman/package.nix +++ b/pkgs/by-name/co/cockpit-podman/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cockpit-podman"; - version = "127"; + version = "128"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit-podman"; tag = finalAttrs.version; - hash = "sha256-dYwiHvpyzu03ceinPeEuTpnRx4OOmA9/UuIKJNxb1eY="; + hash = "sha256-GlnIZGV5nk7o28EUs4H/IdZkgtHG0a9uwCTCS4rCP6c="; fetchSubmodules = true; postFetch = "cp $out/node_modules/.package-lock.json $out/package-lock.json"; @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cockpit-project/cockpit-podman"; changelog = "https://github.com/cockpit-project/cockpit-podman/releases/tag/${finalAttrs.version}"; platforms = lib.platforms.linux; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; teams = [ lib.teams.cockpit ]; }; }) diff --git a/pkgs/by-name/co/cockpit-zfs/package.nix b/pkgs/by-name/co/cockpit-zfs/package.nix index 58e5fc00e1c8..23189d2644da 100644 --- a/pkgs/by-name/co/cockpit-zfs/package.nix +++ b/pkgs/by-name/co/cockpit-zfs/package.nix @@ -15,7 +15,7 @@ mbuffer, msmtp, nix-update-script, - nodejs, + nodejs_22, openssh, samba, shadow, @@ -27,39 +27,49 @@ yarn-berry, zfs, }: +let + # Pin to Node <24.15.0: Yarn Berry's PnP linker breaks `require.cache` on + # newer Node, which crashes tailwindcss mid-build (and ESLint, per + # yarnpkg/berry#7106). See NixOS/nixpkgs#530137. + # + # `nodejs` is rebound here (rather than touched at every call site below) + # so the rest of this file is unaffected. + # + # yarn-berry's own `yarn` binary gets patchShebang'd against whatever + # `nodejs` *it* was built with, so overriding nativeBuildInputs alone does + # nothing - we have to rebuild yarn-berry itself against nodejs_22, for + # both the host and build-platform (cross-compilation) variants. + nodejs = nodejs_22; + yarnBerry = yarn-berry.override { inherit nodejs; }; + yarnBerryForBuild = buildPackages.yarn-berry.override { nodejs = buildPackages.nodejs_22; }; +in stdenv.mkDerivation (finalAttrs: { pname = "cockpit-zfs"; - version = "1.2.27-3"; + version = "1.2.33"; src = fetchFromGitHub { owner = "45Drives"; repo = "cockpit-zfs"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-7hx9FJxFN7xsozMvAb0fdRTX2hAcxtJc5wdgrs2PGJc="; + hash = "sha256-3KoCp4gcWYuama+7t1oQhif3/Ii/zSlhyeNTH3mvbNg="; }; - patches = [ - # Remove after upstream updates to Yarn 4.14 - # https://github.com/45Drives/cockpit-zfs/blob/main/package.json#L13 - ./yarn-4.14-support.patch - ]; - missingHashes = ./missing-hashes.json; # Use buildPackages for cross-compilation support - offlineCache = buildPackages.yarn-berry.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-Tdxe5bXN9psSrnUXL1f+1nh4WPzuvOI7j0I+VPU2/1s="; + offlineCache = yarnBerryForBuild.fetchYarnBerryDeps { + inherit (finalAttrs) src missingHashes; + hash = "sha256-nm3iHf9Rm5JFKzH0HAvglkQPFIV6Fl1e9WvNdqevTug="; }; nativeBuildInputs = [ makeWrapper - nodejs + nodejs_22 jq - yarn-berry - buildPackages.yarn-berry.yarnBerryConfigHook + yarnBerry + yarnBerryForBuild.yarnBerryConfigHook ]; disallowedRequisites = [ finalAttrs.offlineCache ]; @@ -76,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { lsscsi mbuffer msmtp - nodejs + nodejs_22 openssh samba shadow diff --git a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch b/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch deleted file mode 100644 index 2d23ed3e118c..000000000000 --- a/pkgs/by-name/co/cockpit-zfs/yarn-4.14-support.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10c0 - diff --git a/pkgs/by-name/co/cockpit/package.nix b/pkgs/by-name/co/cockpit/package.nix index f956c4608a6d..15e75b87da26 100644 --- a/pkgs/by-name/co/cockpit/package.nix +++ b/pkgs/by-name/co/cockpit/package.nix @@ -53,13 +53,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "cockpit"; - version = "363.1"; + version = "364"; src = fetchFromGitHub { owner = "cockpit-project"; repo = "cockpit"; tag = finalAttrs.version; - hash = "sha256-w9+S3qc95gcNvVLGMdWlRxKXhNjZbcgKSGxlSvNJp9o="; + hash = "sha256-TAX0N6ZQWGr17GpyJS23Q5ES3USU2hxSiI867n6G17I="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/co/cocogitto/package.nix b/pkgs/by-name/co/cocogitto/package.nix index d27f7bfada91..c28b37b44f0d 100644 --- a/pkgs/by-name/co/cocogitto/package.nix +++ b/pkgs/by-name/co/cocogitto/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "7.0.0"; src = fetchFromGitHub { - owner = "oknozor"; + owner = "cocogitto"; repo = "cocogitto"; tag = finalAttrs.version; hash = "sha256-Z+SXB6bDxyR+Bt3Pz6uF9+sZLjbiFNYeECVFZbx40h8="; diff --git a/pkgs/by-name/co/coconutbattery/package.nix b/pkgs/by-name/co/coconutbattery/package.nix index 687f839e3d81..40733c9f1667 100644 --- a/pkgs/by-name/co/coconutbattery/package.nix +++ b/pkgs/by-name/co/coconutbattery/package.nix @@ -31,12 +31,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { It shows you live information about the battery quality in your Mac, iPhone and iPad. ''; homepage = "https://www.coconut-flavour.com/coconutbattery"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with lib.maintainers; [ stepbrobd ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/co/cocoon/package.nix b/pkgs/by-name/co/cocoon/package.nix index 34b58d9ad51a..bbd5dc372d26 100644 --- a/pkgs/by-name/co/cocoon/package.nix +++ b/pkgs/by-name/co/cocoon/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "cocoon"; - version = "0.9.0"; + version = "0.10"; src = fetchFromGitHub { owner = "haileyok"; repo = "cocoon"; tag = "v${finalAttrs.version}"; - hash = "sha256-MmDUTFcXonAwHzeeIBxTk4KOVuCNHmaBFHMqHkf4+Yc="; + hash = "sha256-SvLXtn4Nr8zcvvjGarNLYeKqyniI6eg50cnqV6Q+3/s="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-bux3OfHT8f1FVpBAZUP23vo8M6h8nPTJbi/GTUzhdc4="; + vendorHash = "sha256-Vkf5XyJA/Vdufa1OpCzgIGSQa5pVsFCTfaAVI7l947E="; passthru = { tests = lib.optionalAttrs stdenvNoCC.hostPlatform.isLinux { inherit (nixosTests) cocoon; }; diff --git a/pkgs/by-name/co/code-cursor/package.nix b/pkgs/by-name/co/code-cursor/package.nix index 3cfeb5cbdad4..419426e61a34 100644 --- a/pkgs/by-name/co/code-cursor/package.nix +++ b/pkgs/by-name/co/code-cursor/package.nix @@ -24,7 +24,14 @@ let in (buildVscode rec { inherit commandLineArgs useVSCodeRipgrep; - inherit (sourcesJson) version vscodeVersion; + inherit (sourcesJson) version; + # Cursor reports vscode >= 1.122 but still ships @vscode/ripgrep. + # Capping the build-time vscodeVersion avoids modifying the notarized app bundle on Darwin. + vscodeVersion = + if lib.versionAtLeast sourcesJson.vscodeVersion "1.122.0" then + "1.121.0" + else + sourcesJson.vscodeVersion; pname = "cursor"; diff --git a/pkgs/by-name/co/code-cursor/sources.json b/pkgs/by-name/co/code-cursor/sources.json index 80858c762470..14b7473e245b 100644 --- a/pkgs/by-name/co/code-cursor/sources.json +++ b/pkgs/by-name/co/code-cursor/sources.json @@ -1,22 +1,18 @@ { - "version": "3.7.19", - "vscodeVersion": "1.105.1", + "version": "3.12.30", + "vscodeVersion": "1.128.0", "sources": { "x86_64-linux": { - "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/linux/x64/Cursor-3.7.19-x86_64.AppImage", - "hash": "sha256-qlNQwaDqPL1/wsxwyUXPWvoeXuWoVahibnk0H0h6KZ4=" + "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/linux/x64/Cursor-3.12.30-x86_64.AppImage", + "hash": "sha256-7gyF8YtWLjFOjAxhqip2fVxTbaBj/4FtLsjw2JpTOD8=" }, "aarch64-linux": { - "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/linux/arm64/Cursor-3.7.19-aarch64.AppImage", - "hash": "sha256-JqFyV6OORi1IywBsTqCcamiyBojA7wFgMbcvD2PXjrQ=" - }, - "x86_64-darwin": { - "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/darwin/x64/Cursor-darwin-x64.dmg", - "hash": "sha256-nHewB1kn7wJDlzWWzuFD6yV6/LpcGGANHDQHTUgL6Ks=" + "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/linux/arm64/Cursor-3.12.30-aarch64.AppImage", + "hash": "sha256-UKPf2q4py0pN5FlgdwGbTEKA52T7iJpM63z2kemz9h8=" }, "aarch64-darwin": { - "url": "https://downloads.cursor.com/production/80c653c2c3528e65016a0d304b54486084b470bb/darwin/arm64/Cursor-darwin-arm64.dmg", - "hash": "sha256-Dj2JQmL5VDT7WpejNX4wQi4wOrx7pt22oryycY9BXj0=" + "url": "https://downloads.cursor.com/production/63a2996a10d9e476b6c28e951dd7691d9c0cf480/darwin/arm64/Cursor-darwin-arm64.dmg", + "hash": "sha256-uxAWl5wJISEbGSv7yHys29NZDquLe7z6wMNb61HC/7g=" } } } diff --git a/pkgs/by-name/co/code-cursor/update.sh b/pkgs/by-name/co/code-cursor/update.sh index d0d7308c81e1..da907c7aa003 100755 --- a/pkgs/by-name/co/code-cursor/update.sh +++ b/pkgs/by-name/co/code-cursor/update.sh @@ -17,7 +17,6 @@ VSCODE="" for pair in \ x86_64-linux:linux-x64 \ aarch64-linux:linux-arm64 \ - x86_64-darwin:darwin-x64 \ aarch64-darwin:darwin-arm64 do IFS=: read -r sys platform <<< "$pair" diff --git a/pkgs/by-name/co/code-server/package.nix b/pkgs/by-name/co/code-server/package.nix index 87c5dd768006..469afda541e2 100644 --- a/pkgs/by-name/co/code-server/package.nix +++ b/pkgs/by-name/co/code-server/package.nix @@ -62,7 +62,6 @@ let { x86_64-linux = "linux-x64"; aarch64-linux = "linux-arm64"; - x86_64-darwin = "darwin-x64"; aarch64-darwin = "darwin-arm64"; } .${system}; @@ -356,7 +355,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; mainProgram = "code-server"; }; diff --git a/pkgs/by-name/co/code2prompt/Cargo.lock b/pkgs/by-name/co/code2prompt/Cargo.lock deleted file mode 100644 index 1136972201b9..000000000000 --- a/pkgs/by-name/co/code2prompt/Cargo.lock +++ /dev/null @@ -1,1699 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "aho-corasick" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" -dependencies = [ - "memchr", -] - -[[package]] -name = "anstream" -version = "0.6.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b" - -[[package]] -name = "anstyle-parse" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19" -dependencies = [ - "anstyle", - "windows-sys 0.52.0", -] - -[[package]] -name = "anyhow" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" - -[[package]] -name = "autocfg" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" - -[[package]] -name = "base64" -version = "0.21.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" - -[[package]] -name = "bit-set" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" -dependencies = [ - "bit-vec", -] - -[[package]] -name = "bit-vec" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" - -[[package]] -name = "block" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" - -[[package]] -name = "block-buffer" -version = "0.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" -dependencies = [ - "generic-array", -] - -[[package]] -name = "bstr" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" -dependencies = [ - "memchr", - "regex-automata", - "serde", -] - -[[package]] -name = "byteorder" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" - -[[package]] -name = "cc" -version = "1.0.99" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695" -dependencies = [ - "jobserver", - "libc", - "once_cell", -] - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "clap" -version = "4.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9689a29b593160de5bc4aacab7b5d54fb52231de70122626c178e6a368994c7" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e5387378c84f6faa26890ebf9f0a92989f8873d4d380467bcd0d8d8620424df" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim", -] - -[[package]] -name = "clap_derive" -version = "4.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "clap_lex" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70" - -[[package]] -name = "cli-clipboard" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04087c1d4a2aa259784a563932aee09cbb0869d490775e051096174b070f3e3d" -dependencies = [ - "clipboard-win", - "objc", - "objc-foundation", - "objc_id", - "wl-clipboard-rs", - "x11-clipboard", -] - -[[package]] -name = "clipboard-win" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" -dependencies = [ - "error-code", - "str-buf", - "winapi", -] - -[[package]] -name = "code2prompt" -version = "1.0.0" -dependencies = [ - "anyhow", - "clap", - "cli-clipboard", - "colored", - "git2", - "handlebars", - "ignore", - "indicatif", - "inquire", - "jwalk", - "regex", - "serde_json", - "termtree", - "tiktoken-rs", -] - -[[package]] -name = "colorchoice" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422" - -[[package]] -name = "colored" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cbf2150cce219b664a8a70df7a1f933836724b503f8a413af9365b4dcc4d90b8" -dependencies = [ - "lazy_static", - "windows-sys 0.48.0", -] - -[[package]] -name = "console" -version = "0.15.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" -dependencies = [ - "encode_unicode", - "lazy_static", - "libc", - "unicode-width", - "windows-sys 0.52.0", -] - -[[package]] -name = "cpufeatures" -version = "0.2.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504" -dependencies = [ - "libc", -] - -[[package]] -name = "crossbeam" -version = "0.8.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-epoch", - "crossbeam-queue", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" -dependencies = [ - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-queue" -version = "0.3.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" -dependencies = [ - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" - -[[package]] -name = "crossterm" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67" -dependencies = [ - "bitflags 1.3.2", - "crossterm_winapi", - "libc", - "mio", - "parking_lot", - "signal-hook", - "signal-hook-mio", - "winapi", -] - -[[package]] -name = "crossterm_winapi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" -dependencies = [ - "winapi", -] - -[[package]] -name = "crypto-common" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" -dependencies = [ - "generic-array", - "typenum", -] - -[[package]] -name = "derive-new" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3418329ca0ad70234b9735dc4ceed10af4df60eff9c8e7b06cb5e520d92c3535" -dependencies = [ - "proc-macro2", - "quote", - "syn 1.0.109", -] - -[[package]] -name = "digest" -version = "0.10.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" -dependencies = [ - "block-buffer", - "crypto-common", -] - -[[package]] -name = "downcast-rs" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75b325c5dbd37f80359721ad39aca5a29fb04c89279657cffdda8736d0c0b9d2" - -[[package]] -name = "dyn-clone" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" - -[[package]] -name = "either" -version = "1.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b" - -[[package]] -name = "encode_unicode" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" - -[[package]] -name = "equivalent" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" - -[[package]] -name = "errno" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "error-code" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] - -[[package]] -name = "fancy-regex" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7493d4c459da9f84325ad297371a6b2b8a162800873a22e3b6b6512e61d18c05" -dependencies = [ - "bit-set", - "regex", -] - -[[package]] -name = "fastrand" -version = "2.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" - -[[package]] -name = "fixedbitset" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "form_urlencoded" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13624c2627564efccf4934284bdd98cbaa14e79b0b5a141218e507b3a823456" -dependencies = [ - "percent-encoding", -] - -[[package]] -name = "fuzzy-matcher" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54614a3312934d066701a80f20f15fa3b56d67ac7722b39eea5b4c9dd1d66c94" -dependencies = [ - "thread_local", -] - -[[package]] -name = "fxhash" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" -dependencies = [ - "byteorder", -] - -[[package]] -name = "generic-array" -version = "0.14.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" -dependencies = [ - "typenum", - "version_check", -] - -[[package]] -name = "gethostname" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1ebd34e35c46e00bb73e81363248d627782724609fe1b6396f553f68fe3862e" -dependencies = [ - "libc", - "winapi", -] - -[[package]] -name = "git2" -version = "0.18.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "232e6a7bfe35766bf715e55a88b39a700596c0ccfd88cd3680b4cdb40d66ef70" -dependencies = [ - "bitflags 2.5.0", - "libc", - "libgit2-sys", - "log", - "openssl-probe", - "openssl-sys", - "url", -] - -[[package]] -name = "globset" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" -dependencies = [ - "aho-corasick", - "bstr", - "log", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "handlebars" -version = "4.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225" -dependencies = [ - "log", - "pest", - "pest_derive", - "serde", - "serde_json", - "thiserror", -] - -[[package]] -name = "hashbrown" -version = "0.14.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" - -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - -[[package]] -name = "home" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "idna" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6" -dependencies = [ - "unicode-bidi", - "unicode-normalization", -] - -[[package]] -name = "ignore" -version = "0.4.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b46810df39e66e925525d6e38ce1e7f6e1d208f72dc39757880fcb66e2c58af1" -dependencies = [ - "crossbeam-deque", - "globset", - "log", - "memchr", - "regex-automata", - "same-file", - "walkdir", - "winapi-util", -] - -[[package]] -name = "indexmap" -version = "2.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" -dependencies = [ - "equivalent", - "hashbrown", -] - -[[package]] -name = "indicatif" -version = "0.17.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "763a5a8f45087d6bcea4222e7b72c291a054edf80e4ef6efd2a4979878c7bea3" -dependencies = [ - "console", - "instant", - "number_prefix", - "portable-atomic", - "unicode-width", -] - -[[package]] -name = "inquire" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fddf93031af70e75410a2511ec04d49e758ed2f26dad3404a934e0fb45cc12a" -dependencies = [ - "bitflags 2.5.0", - "crossterm", - "dyn-clone", - "fuzzy-matcher", - "fxhash", - "newline-converter", - "once_cell", - "unicode-segmentation", - "unicode-width", -] - -[[package]] -name = "instant" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "is_terminal_polyfill" -version = "1.70.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800" - -[[package]] -name = "itoa" -version = "1.0.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" - -[[package]] -name = "jobserver" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" -dependencies = [ - "libc", -] - -[[package]] -name = "jwalk" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2735847566356cd2179a2a38264839308f7079fa96e6bd5a42d740460e003c56" -dependencies = [ - "crossbeam", - "rayon", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.155" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" - -[[package]] -name = "libgit2-sys" -version = "0.16.2+1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4126d8b4ee5c9d9ea891dd875cfdc1e9d0950437179104b183d7d8a74d24e8" -dependencies = [ - "cc", - "libc", - "libssh2-sys", - "libz-sys", - "openssl-sys", - "pkg-config", -] - -[[package]] -name = "libssh2-sys" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dc8a030b787e2119a731f1951d6a773e2280c660f8ec4b0f5e1505a386e71ee" -dependencies = [ - "cc", - "libc", - "libz-sys", - "openssl-sys", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "libz-sys" -version = "1.1.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "linux-raw-sys" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" - -[[package]] -name = "lock_api" -version = "0.4.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" -dependencies = [ - "autocfg", - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" - -[[package]] -name = "malloc_buf" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" -dependencies = [ - "libc", -] - -[[package]] -name = "memchr" -version = "2.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - -[[package]] -name = "mio" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" -dependencies = [ - "libc", - "log", - "wasi", - "windows-sys 0.48.0", -] - -[[package]] -name = "newline-converter" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b6b097ecb1cbfed438542d16e84fd7ad9b0c76c8a65b7f9039212a3d14dc7f" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "nix" -version = "0.24.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" -dependencies = [ - "bitflags 1.3.2", - "cfg-if", - "libc", - "memoffset", -] - -[[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 = "number_prefix" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" - -[[package]] -name = "objc" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" -dependencies = [ - "malloc_buf", -] - -[[package]] -name = "objc-foundation" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1add1b659e36c9607c7aab864a76c7a4c2760cd0cd2e120f3fb8b952c7e22bf9" -dependencies = [ - "block", - "objc", - "objc_id", -] - -[[package]] -name = "objc_id" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c92d4ddb4bd7b50d730c215ff871754d0da6b2178849f8a2a2ab69712d0c073b" -dependencies = [ - "objc", -] - -[[package]] -name = "once_cell" -version = "1.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92" - -[[package]] -name = "openssl-probe" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" - -[[package]] -name = "openssl-sys" -version = "0.9.102" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c597637d56fbc83893a35eb0dd04b2b8e7a50c91e64e9493e398b5df4fb45fa2" -dependencies = [ - "cc", - "libc", - "pkg-config", - "vcpkg", -] - -[[package]] -name = "os_pipe" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" -dependencies = [ - "libc", - "windows-sys 0.52.0", -] - -[[package]] -name = "parking_lot" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" -dependencies = [ - "lock_api", - "parking_lot_core", -] - -[[package]] -name = "parking_lot_core" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" -dependencies = [ - "cfg-if", - "libc", - "redox_syscall", - "smallvec", - "windows-targets 0.52.5", -] - -[[package]] -name = "percent-encoding" -version = "2.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" - -[[package]] -name = "pest" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - -[[package]] -name = "pest_derive" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459" -dependencies = [ - "pest", - "pest_generator", -] - -[[package]] -name = "pest_generator" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687" -dependencies = [ - "pest", - "pest_meta", - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "pest_meta" -version = "2.7.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd" -dependencies = [ - "once_cell", - "pest", - "sha2", -] - -[[package]] -name = "petgraph" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db" -dependencies = [ - "fixedbitset", - "indexmap", -] - -[[package]] -name = "pkg-config" -version = "0.3.30" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" - -[[package]] -name = "portable-atomic" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" - -[[package]] -name = "proc-macro2" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" -dependencies = [ - "unicode-ident", -] - -[[package]] -name = "quote" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rayon" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b418a60154510ca1a002a752ca9714984e21e4241e804d32555251faf8b78ffa" -dependencies = [ - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.12.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1465873a3dfdaa8ae7cb14b4383657caab0b3e8a0aa9ae8e04b044854c8dfce2" -dependencies = [ - "crossbeam-deque", - "crossbeam-utils", -] - -[[package]] -name = "redox_syscall" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e" -dependencies = [ - "bitflags 2.5.0", -] - -[[package]] -name = "regex" -version = "1.10.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56" - -[[package]] -name = "rustc-hash" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" - -[[package]] -name = "rustix" -version = "0.38.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" -dependencies = [ - "bitflags 2.5.0", - "errno", - "libc", - "linux-raw-sys", - "windows-sys 0.52.0", -] - -[[package]] -name = "ryu" -version = "1.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" - -[[package]] -name = "same-file" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "scopeguard" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] -name = "serde" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.203" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "serde_json" -version = "1.0.117" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3" -dependencies = [ - "itoa", - "ryu", - "serde", -] - -[[package]] -name = "sha2" -version = "0.10.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" -dependencies = [ - "cfg-if", - "cpufeatures", - "digest", -] - -[[package]] -name = "signal-hook" -version = "0.3.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8621587d4798caf8eb44879d42e56b9a93ea5dcd315a6487c357130095b62801" -dependencies = [ - "libc", - "signal-hook-registry", -] - -[[package]] -name = "signal-hook-mio" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af" -dependencies = [ - "libc", - "mio", - "signal-hook", -] - -[[package]] -name = "signal-hook-registry" -version = "1.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1" -dependencies = [ - "libc", -] - -[[package]] -name = "smallvec" -version = "1.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" - -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - -[[package]] -name = "syn" -version = "1.0.109" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "syn" -version = "2.0.66" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" -dependencies = [ - "proc-macro2", - "quote", - "unicode-ident", -] - -[[package]] -name = "tempfile" -version = "3.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" -dependencies = [ - "cfg-if", - "fastrand", - "rustix", - "windows-sys 0.52.0", -] - -[[package]] -name = "termtree" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" - -[[package]] -name = "thiserror" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709" -dependencies = [ - "thiserror-impl", -] - -[[package]] -name = "thiserror-impl" -version = "1.0.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.66", -] - -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "tiktoken-rs" -version = "0.5.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c314e7ce51440f9e8f5a497394682a57b7c323d0f4d0a6b1b13c429056e0e234" -dependencies = [ - "anyhow", - "base64", - "bstr", - "fancy-regex", - "lazy_static", - "parking_lot", - "rustc-hash", -] - -[[package]] -name = "tinyvec" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tree_magic_mini" -version = "3.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "469a727cac55b41448315cc10427c069c618ac59bb6a4480283fcd811749bdc2" -dependencies = [ - "fnv", - "home", - "memchr", - "nom", - "once_cell", - "petgraph", -] - -[[package]] -name = "typenum" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" - -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - -[[package]] -name = "unicode-bidi" -version = "0.3.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75" - -[[package]] -name = "unicode-ident" -version = "1.0.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" - -[[package]] -name = "unicode-normalization" -version = "0.1.23" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" -dependencies = [ - "tinyvec", -] - -[[package]] -name = "unicode-segmentation" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" - -[[package]] -name = "unicode-width" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" - -[[package]] -name = "url" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" -dependencies = [ - "form_urlencoded", - "idna", - "percent-encoding", -] - -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - -[[package]] -name = "vcpkg" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "walkdir" -version = "2.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" -dependencies = [ - "same-file", - "winapi-util", -] - -[[package]] -name = "wasi" -version = "0.11.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" - -[[package]] -name = "wayland-client" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f3b068c05a039c9f755f881dc50f01732214f5685e379829759088967c46715" -dependencies = [ - "bitflags 1.3.2", - "downcast-rs", - "libc", - "nix", - "wayland-commons", - "wayland-scanner", - "wayland-sys", -] - -[[package]] -name = "wayland-commons" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8691f134d584a33a6606d9d717b95c4fa20065605f798a3f350d78dced02a902" -dependencies = [ - "nix", - "once_cell", - "smallvec", - "wayland-sys", -] - -[[package]] -name = "wayland-protocols" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b950621f9354b322ee817a23474e479b34be96c2e909c14f7bc0100e9a970bc6" -dependencies = [ - "bitflags 1.3.2", - "wayland-client", - "wayland-commons", - "wayland-scanner", -] - -[[package]] -name = "wayland-scanner" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" -dependencies = [ - "proc-macro2", - "quote", - "xml-rs", -] - -[[package]] -name = "wayland-sys" -version = "0.29.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be12ce1a3c39ec7dba25594b97b42cb3195d54953ddb9d3d95a7c3902bc6e9d4" -dependencies = [ - "pkg-config", -] - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-util" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" -dependencies = [ - "windows-sys 0.52.0", -] - -[[package]] -name = "winapi-wsapoll" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1eafc5f679c576995526e81635d0cf9695841736712b4e892f87abbe6fed3f28" -dependencies = [ - "winapi", -] - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" - -[[package]] -name = "windows-sys" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" -dependencies = [ - "windows-targets 0.48.5", -] - -[[package]] -name = "windows-sys" -version = "0.52.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" -dependencies = [ - "windows-targets 0.52.5", -] - -[[package]] -name = "windows-targets" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" -dependencies = [ - "windows_aarch64_gnullvm 0.48.5", - "windows_aarch64_msvc 0.48.5", - "windows_i686_gnu 0.48.5", - "windows_i686_msvc 0.48.5", - "windows_x86_64_gnu 0.48.5", - "windows_x86_64_gnullvm 0.48.5", - "windows_x86_64_msvc 0.48.5", -] - -[[package]] -name = "windows-targets" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" -dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", - "windows_i686_gnullvm", - "windows_i686_msvc 0.52.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", -] - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" - -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" - -[[package]] -name = "windows_aarch64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" - -[[package]] -name = "windows_i686_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" - -[[package]] -name = "windows_i686_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" - -[[package]] -name = "windows_i686_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" - -[[package]] -name = "windows_i686_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" - -[[package]] -name = "windows_i686_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" - -[[package]] -name = "windows_x86_64_gnu" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" - -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.48.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" - -[[package]] -name = "windows_x86_64_msvc" -version = "0.52.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" - -[[package]] -name = "wl-clipboard-rs" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "981a303dfbb75d659f6612d05a14b2e363c103d24f676a2d44a00d18507a1ad9" -dependencies = [ - "derive-new", - "libc", - "log", - "nix", - "os_pipe", - "tempfile", - "thiserror", - "tree_magic_mini", - "wayland-client", - "wayland-protocols", -] - -[[package]] -name = "x11-clipboard" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "980b9aa9226c3b7de8e2adb11bf20124327c054e0e5812d2aac0b5b5a87e7464" -dependencies = [ - "x11rb", -] - -[[package]] -name = "x11rb" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "592b4883219f345e712b3209c62654ebda0bb50887f330cbd018d0f654bfd507" -dependencies = [ - "gethostname", - "nix", - "winapi", - "winapi-wsapoll", - "x11rb-protocol", -] - -[[package]] -name = "x11rb-protocol" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56b245751c0ac9db0e006dc812031482784e434630205a93c73cfefcaabeac67" -dependencies = [ - "nix", -] - -[[package]] -name = "xml-rs" -version = "0.8.20" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791978798f0597cfc70478424c2b4fdc2b7a8024aaff78497ef00f24ef674193" diff --git a/pkgs/by-name/co/code2prompt/package.nix b/pkgs/by-name/co/code2prompt/package.nix index 66d9da853e45..a4f046ddc03a 100644 --- a/pkgs/by-name/co/code2prompt/package.nix +++ b/pkgs/by-name/co/code2prompt/package.nix @@ -4,31 +4,30 @@ rustPlatform, pkg-config, openssl, + perl, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "code2prompt"; - version = "1.1.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "mufeedvh"; repo = "code2prompt"; - rev = "v${finalAttrs.version}"; - hash = "sha256-KZqh0Vq4Mn56PhUO1JUzVpNBAGOZqUAsj31Cj5K+Lyk="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Gh8SsSTZW7QlyyC3SWJ5pOK2x85/GT7+LPJn2Jeczpc="; }; - cargoLock = { - lockFile = ./Cargo.lock; - }; + cargoHash = "sha256-t4HpGqojIkw9OBUAYz4ZEaB7XyHQxkFB2HtlkGKbe2s="; - postPatch = '' - # src is missing Cargo.lock - ln -s ${./Cargo.lock} Cargo.lock - ''; + nativeBuildInputs = [ + pkg-config + perl + ]; - nativeBuildInputs = [ pkg-config ]; - - buildInputs = [ openssl ]; + buildInputs = [ + openssl + ]; meta = { description = "CLI tool that converts your codebase into a single LLM prompt with a source tree, prompt templating, and token counting"; diff --git a/pkgs/by-name/co/codebase-memory-mcp/package.nix b/pkgs/by-name/co/codebase-memory-mcp/package.nix new file mode 100644 index 000000000000..e27c09b5cd86 --- /dev/null +++ b/pkgs/by-name/co/codebase-memory-mcp/package.nix @@ -0,0 +1,80 @@ +{ + lib, + bash, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + stdenv, + zlib, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "codebase-memory-mcp"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "DeusData"; + repo = "codebase-memory-mcp"; + rev = "v${finalAttrs.version}"; + hash = "sha256-H0l8H2JhPT1Rs0p+CJC1a1qYtnZNgLGe6n7PmM+WvE4="; + }; + + patches = [ + ./remove-install-update.diff + ]; + + postPatch = '' + substituteInPlace Makefile.cbm \ + --replace-fail "npm ci &&" "" + + substituteInPlace scripts/embed-frontend.sh \ + --replace-fail "/bin/bash" "${bash}/bin/bash" + ''; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + sourceRoot = "${finalAttrs.src.name}/${finalAttrs.npmRoot}"; + hash = "sha256-feoZNsZfrPgoLdjlnnh3w3vTxR6AwPdUkPubaR93TAk="; + }; + + npmRoot = "graph-ui"; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + ]; + + buildInputs = [ + bash + zlib + ]; + + strictDeps = true; + __structuredAttrs = true; + + enableParallelBuilding = true; + + makefile = "Makefile.cbm"; + + # scripts/build.sh verifies CC via `file`, which fails on Nix's compiler wrapper. + # Call make directly — mirrors upstream flake.nix. + makeFlags = [ + "cbm-with-ui" + "CFLAGS_EXTRA='-DCBM_VERSION=\"${finalAttrs.version}\"'" + ]; + + installPhase = '' + runHook preInstall + install -Dm755 build/c/codebase-memory-mcp $out/bin/codebase-memory-mcp + runHook postInstall + ''; + + meta = { + homepage = "https://github.com/DeusData/codebase-memory-mcp"; + description = "High-performance C11 MCP server that indexes codebases into a persistent knowledge graph"; + mainProgram = "codebase-memory-mcp"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ gdifolco ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff new file mode 100644 index 000000000000..fa35f0c3dec0 --- /dev/null +++ b/pkgs/by-name/co/codebase-memory-mcp/remove-install-update.diff @@ -0,0 +1,30 @@ +diff --git a/src/main.c b/src/main.c +index f2b72cb..1663138 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -284,9 +284,6 @@ static void print_help(void) { + printf("Usage:\n"); + printf(" codebase-memory-mcp Run MCP server on stdio\n"); + printf(" codebase-memory-mcp cli [json] Run a single tool\n"); +- printf(" codebase-memory-mcp install [-y|-n] [--force] [--dry-run]\n"); +- printf(" codebase-memory-mcp uninstall [-y|-n] [--dry-run]\n"); +- printf(" codebase-memory-mcp update [-y|-n]\n"); + printf(" codebase-memory-mcp config \n"); + printf(" codebase-memory-mcp --version Print version\n"); + printf(" codebase-memory-mcp --help Print this help\n"); +@@ -331,15 +328,6 @@ static int handle_subcommand(int argc, char **argv) { + cbm_mem_init(MAIN_RAM_FRACTION); + return cbm_cmd_hook_augment(); + } +- if (strcmp(argv[i], "install") == 0) { +- return cbm_cmd_install(argc - i - SKIP_ONE, argv + i + SKIP_ONE); +- } +- if (strcmp(argv[i], "uninstall") == 0) { +- return cbm_cmd_uninstall(argc - i - SKIP_ONE, argv + i + SKIP_ONE); +- } +- if (strcmp(argv[i], "update") == 0) { +- return cbm_cmd_update(argc - i - SKIP_ONE, argv + i + SKIP_ONE); +- } + if (strcmp(argv[i], "config") == 0) { + return cbm_cmd_config(argc - i - SKIP_ONE, argv + i + SKIP_ONE); + } diff --git a/pkgs/by-name/co/codeberg-cli/package.nix b/pkgs/by-name/co/codeberg-cli/package.nix index 9ab51d274a81..7abab8e37b30 100644 --- a/pkgs/by-name/co/codeberg-cli/package.nix +++ b/pkgs/by-name/co/codeberg-cli/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI Tool for Codeberg similar to gh and glab"; homepage = "https://codeberg.org/Aviac/codeberg-cli"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ robwalt ]; mainProgram = "berg"; }; diff --git a/pkgs/by-name/co/codebook/package.nix b/pkgs/by-name/co/codebook/package.nix index dd5412d834d3..40b492d080ee 100644 --- a/pkgs/by-name/co/codebook/package.nix +++ b/pkgs/by-name/co/codebook/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "codebook"; - version = "0.3.41"; + version = "0.3.42"; src = fetchFromGitHub { owner = "blopker"; repo = "codebook"; tag = "v${finalAttrs.version}"; - hash = "sha256-QmvkN0e4iwf3gwi/wMnGXlbr9CpG9JvWEuAjlFm50Sk="; + hash = "sha256-L+OVR7JHs9qFh48ET2eugl4zZIpbM4DBtoWsHKzKbks="; }; buildAndTestSubdir = "crates/codebook-lsp"; - cargoHash = "sha256-vh4ObFy3pq6e3+DQhYiWNTeaITm+ci/r4CwfAvO3JqU="; + cargoHash = "sha256-+OmaZkae5b5TKfMwlYGijJTD5gGS/YuoQOvKKfKuipk="; env = { CARGO_PROFILE_RELEASE_LTO = "fat"; diff --git a/pkgs/by-name/co/codebuff/package-lock.json b/pkgs/by-name/co/codebuff/package-lock.json index 1de7560f441a..5cf1e70b7750 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.680" + "codebuff": "^1.0.681" } }, "node_modules/@isaacs/fs-minipass": { @@ -30,9 +30,9 @@ } }, "node_modules/codebuff": { - "version": "1.0.680", - "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.680.tgz", - "integrity": "sha512-+HrrSchE7wsAQNcq5yJfL4YygOf+ng3T9S3yF+FZFVfnT29KVXSoar5mdRmzsVFNGjHZKc9I+kqt0dEO01G9Ow==", + "version": "1.0.681", + "resolved": "https://registry.npmjs.org/codebuff/-/codebuff-1.0.681.tgz", + "integrity": "sha512-xRj1kKCvXA522IiomLVV0EyORdsjjS4T/shLVeoTrdM9MNZRqrCcm/b9bsiTIzwlYz4oQFgBfmWeHapKKPjh7A==", "cpu": [ "x64", "arm64" diff --git a/pkgs/by-name/co/codebuff/package.nix b/pkgs/by-name/co/codebuff/package.nix index d29736373447..e8543c35f756 100644 --- a/pkgs/by-name/co/codebuff/package.nix +++ b/pkgs/by-name/co/codebuff/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "codebuff"; - version = "1.0.680"; + version = "1.0.681"; src = fetchzip { url = "https://registry.npmjs.org/codebuff/-/codebuff-${finalAttrs.version}.tgz"; - hash = "sha256-glsZk5q+Qd2NbMk/jIXklCHf9MSSqkMN67d7k1fuzlk="; + hash = "sha256-tkQ8MOkQk4vaS9PFqlFBV6unEgysXcwHrKGgxfe60fM="; }; strictDeps = true; - npmDepsHash = "sha256-+HZN4oal+Bn7uKfWrWd/eDRvuAPvRKlGO4ThFamNZCI="; + npmDepsHash = "sha256-KB0QCfpGP32O5dU+/2dOEmX87iclJrZudIkTNp9ZxSw="; postPatch = '' cp ${./package-lock.json} package-lock.json diff --git a/pkgs/by-name/co/codechecker/package.nix b/pkgs/by-name/co/codechecker/package.nix index 305e2aa8b8e4..371c6b048095 100644 --- a/pkgs/by-name/co/codechecker/package.nix +++ b/pkgs/by-name/co/codechecker/package.nix @@ -1,65 +1,30 @@ { lib, - python3, fetchPypi, - fetchFromGitHub, - clang, + makeWrapper, + python3Packages, + libclang, clang-tools, cppcheck, gcc, - makeWrapper, + infer, withClang ? false, withClangTools ? false, withCppcheck ? false, withGcc ? false, + withInfer ? false, }: -let - python = python3.override { - packageOverrides = self: super: rec { - # codechecker is incompatible with SQLAlchemy greater than 1.3 - sqlalchemy = super.sqlalchemy_1_4.overridePythonAttrs (oldAttrs: rec { - version = "1.3.23"; - pname = oldAttrs.pname; - src = fetchFromGitHub { - owner = "sqlalchemy"; - repo = "sqlalchemy"; - rev = "rel_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-hWA0/f7rQpEfYTg10i0rBK3qeJbw3p6HW7S59rLnD0Q="; - }; - doCheck = false; - # That test does not exist in the 1.3 branch so we get an error for disabling it - disabledTestPaths = builtins.filter ( - testPath: testPath != "test/ext/mypy" - ) oldAttrs.disabledTestPaths; - }); - sqlalchemy_1_4 = sqlalchemy; - - # The current alembic version is not compatible with SQLAlchemy 1.3 so we need to downgrade it - alembic = super.alembic.overridePythonAttrs (oldAttrs: rec { - pname = "alembic"; - version = "1.5.5"; - src = fetchPypi { - inherit pname version; - hash = "sha256-3wAowZJ1os/xN+OWF6Oc3NvRFzczuHtr+iV7fAhgITs="; - }; - doCheck = false; - dependencies = oldAttrs.dependencies ++ [ - super.python-dateutil - super.python-editor - ]; - }); - }; - }; - python3Packages = python.pkgs; -in python3Packages.buildPythonApplication rec { pname = "codechecker"; - version = "6.24.0"; + version = "6.28.0"; pyproject = true; + strictDeps = true; + __structuredAttrs = true; + src = fetchPypi { inherit pname version; - hash = "sha256-ftZACUf2lAHokcUXj45LRA7/3goOcIy521cGl6qhR98="; + hash = "sha256-wxV+/hzsk7RrzWTXNz5HyweYdFFI1upNS508QRPCefo="; }; build-system = with python3Packages; [ @@ -67,40 +32,39 @@ python3Packages.buildPythonApplication rec { ]; dependencies = with python3Packages; [ + alembic + argcomplete + authlib distutils # required in python312 to call subcommands (see https://github.com/Ericsson/codechecker/issues/4350) lxml - sqlalchemy - alembic + multiprocess portalocker psutil - multiprocess + semver + sqlalchemy thrift gitpython pyyaml + requests types-pyyaml sarif-tools + types-psutil ]; - pythonRelaxDeps = [ - "thrift" - "portalocker" - "types-pyyaml" - "lxml" - "psutil" - "multiprocess" - "gitpython" - "sarif-tools" - "pyyaml" + pythonRelaxDeps = true; + nativeBuildInputs = with python3Packages; [ + makeWrapper + pythonRelaxDepsHook ]; postInstall = '' wrapProgram "$out/bin/CodeChecker" --prefix PATH : ${ lib.makeBinPath ( - [ ] - ++ lib.optional withClang clang + lib.optional withClang libclang ++ lib.optional withClangTools clang-tools ++ lib.optional withCppcheck cppcheck ++ lib.optional withGcc gcc + ++ lib.optional withInfer infer ) } ''; @@ -116,6 +80,7 @@ python3Packages.buildPythonApplication rec { maintainers = with lib.maintainers; [ zebreus felixsinger + kacper-uminski ]; mainProgram = "CodeChecker"; platforms = lib.platforms.darwin ++ lib.platforms.linux; diff --git a/pkgs/by-name/co/codecov-cli/package.nix b/pkgs/by-name/co/codecov-cli/package.nix index 676417a9ec6b..f5043d0dc516 100644 --- a/pkgs/by-name/co/codecov-cli/package.nix +++ b/pkgs/by-name/co/codecov-cli/package.nix @@ -2,7 +2,20 @@ lib, python3Packages, fetchFromGitHub, + fetchPypi, }: +let + # Due to bug: + # https://github.com/codecov/codecov-cli/issues/721 + click_8_2 = python3Packages.click.overridePythonAttrs (old: rec { + version = "8.2.1"; + src = fetchPypi { + pname = "click"; + inherit version; + hash = "sha256-J8SRzAXZaNJx1aHbE+O1oYRjbZ2TDxSMULA48NBkYgI="; + }; + }); +in python3Packages.buildPythonApplication rec { pname = "codecov-cli"; @@ -21,12 +34,11 @@ python3Packages.buildPythonApplication rec { build-system = with python3Packages; [ setuptools ]; pythonRelaxDeps = [ - "click" "responses" ]; dependencies = with python3Packages; [ - click + click_8_2 ijson pyyaml responses diff --git a/pkgs/by-name/co/codegraph/package.nix b/pkgs/by-name/co/codegraph/package.nix new file mode 100644 index 000000000000..7f068105e424 --- /dev/null +++ b/pkgs/by-name/co/codegraph/package.nix @@ -0,0 +1,119 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + makeWrapper, + writeShellScript, + curl, + common-updater-scripts, + gnused, + cctools, + darwin, + rcodesign, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "codegraph"; + version = "1.4.1"; + + src = + finalAttrs.passthru.sources.${stdenv.hostPlatform.system} + or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + sourceRoot = + { + "aarch64-darwin" = "codegraph-darwin-arm64"; + "aarch64-linux" = "codegraph-linux-arm64"; + "x86_64-linux" = "codegraph-linux-x64"; + } + .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + makeWrapper + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + rcodesign + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + stdenv.cc.cc.lib + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/codegraph + cp -r lib $out/lib/codegraph/lib + cp node $out/lib/codegraph/node + + install -Dm 755 bin/codegraph $out/lib/codegraph/bin/codegraph + + mkdir -p $out/bin + makeWrapper $out/lib/codegraph/bin/codegraph $out/bin/codegraph + + runHook postInstall + ''; + + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + '${lib.getExe' cctools "${cctools.targetPrefix}install_name_tool"}' $out/lib/codegraph/node \ + -change /usr/lib/libicucore.A.dylib '${lib.getLib darwin.ICU}/lib/libicucore.A.dylib' + '${lib.getExe rcodesign}' sign --code-signature-flags linker-signed $out/lib/codegraph/node + ''; + + passthru = { + sources = { + "aarch64-darwin" = fetchurl { + url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-darwin-arm64.tar.gz"; + hash = "sha256-Smea5aXLn/+QDdWbt4baalgbf2j0z3E73t0TfjR9NNw="; + }; + "aarch64-linux" = fetchurl { + url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-arm64.tar.gz"; + hash = "sha256-DWLF6yci+NGdIPehvZdEReGNUpTLWb4Ragw9Vc6HWR8="; + }; + "x86_64-linux" = fetchurl { + url = "https://github.com/colbymchenry/codegraph/releases/download/v${finalAttrs.version}/codegraph-linux-x64.tar.gz"; + hash = "sha256-+1hf9QGNb6qkbSgrYfT2ibx5Z+2KG0Z6XFVt187ZtUI="; + }; + }; + updateScript = writeShellScript "update-codegraph" '' + set -o errexit + export PATH="${ + lib.makeBinPath [ + curl + common-updater-scripts + gnused + ] + }" + NEW_VERSION=$(curl --silent -fsSLI -o /dev/null -w '%{url_effective}' "https://github.com/colbymchenry/codegraph/releases/latest" | sed -n 's#.*/releases/tag/v##p') + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version same as the old version." + exit 0 + fi + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "codegraph" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + }; + + meta = { + description = "Pre-indexed code knowledge graph for AI coding agents"; + homepage = "https://github.com/colbymchenry/codegraph"; + changelog = "https://github.com/colbymchenry/codegraph/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "codegraph"; + maintainers = [ lib.maintainers.gdifolco ]; + platforms = builtins.attrNames finalAttrs.passthru.sources; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/co/codeium/package.nix b/pkgs/by-name/co/codeium/package.nix index 1de6073e6d26..31b4c65bbf5f 100644 --- a/pkgs/by-name/co/codeium/package.nix +++ b/pkgs/by-name/co/codeium/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux_x64"; aarch64-linux = "linux_arm"; - x86_64-darwin = "macos_x64"; aarch64-darwin = "macos_arm"; } @@ -25,7 +24,6 @@ let { x86_64-linux = "sha256-hx5q0JRwvmE63uOpht7+6d7/jCLeknrj2RwiiMkBllc="; aarch64-linux = "sha256-r0gGxwhVkQ5MLTmcrBCJpKfsizAJLJYPw1VdfiHJ3i8="; - x86_64-darwin = "sha256-LI+qp82dorbZCyibCVwx04tiCoRz3SkT1kUyAFlKWys="; aarch64-darwin = "sha256-c0BDLK1ilDOdNYbOqzFNoJFeBUlWI7/+z7HaosM/D4o="; } .${system} or throwSystem; @@ -84,7 +82,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-darwin" "aarch64-linux" "x86_64-linux" - "x86_64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/co/codeium/update.sh b/pkgs/by-name/co/codeium/update.sh index 268886b576a0..1c3bfabb32dd 100755 --- a/pkgs/by-name/co/codeium/update.sh +++ b/pkgs/by-name/co/codeium/update.sh @@ -24,12 +24,10 @@ CODEIUM_VER=$(curl -s "https://api.github.com/repos/Exafunction/codeium/releases CODEIUM_LINUX_X64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_x64") CODEIUM_LINUX_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "linux_arm") -CODEIUM_DARWIN_X64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_x64") CODEIUM_DARWIN_AARCH64_HASH=$(fetch_arch "$CODEIUM_VER" "macos_arm") sed -i "s/version = \".*\"/version = \"$CODEIUM_VER\"/" "$NIX_DRV" replace_hash "x86_64-linux" "$CODEIUM_LINUX_X64_HASH" replace_hash "aarch64-linux" "$CODEIUM_LINUX_AARCH64_HASH" -replace_hash "x86_64-darwin" "$CODEIUM_DARWIN_X64_HASH" replace_hash "aarch64-darwin" "$CODEIUM_DARWIN_AARCH64_HASH" diff --git a/pkgs/by-name/co/coder/package.nix b/pkgs/by-name/co/coder/package.nix index f27e0b8ada55..db0fc4b16120 100644 --- a/pkgs/by-name/co/coder/package.nix +++ b/pkgs/by-name/co/coder/package.nix @@ -15,21 +15,19 @@ let channels = { stable = { - version = "2.28.6"; + version = "2.33.11"; hash = { - x86_64-linux = "sha256-OBnEOR6uNCzfsnWIQupSN9JMykNbrojrkb5lcPXL1W8="; - x86_64-darwin = "sha256-ixI5BPxq7spPk1Un6eYVke+IkhqoIxTqDTXo5FehaEk="; - aarch64-linux = "sha256-w+5PMff13nUp7jAYGSQlozShWqjsF+NLKQiquxD07wc="; - aarch64-darwin = "sha256-nrx0Z1NdzkeQbeWzwOhpATIYnCCucG5lKRoUaRVjiQE="; + x86_64-linux = "sha256-NY9xyLc6Pr1wWPnr4fLo6t+7B7Gin/BlTH3tdxQk30k="; + aarch64-linux = "sha256-Wc9hhotJKcb1fdjfh9pWxVs/e4YpBua1PyAhMRJbUAY="; + aarch64-darwin = "sha256-7A6BxOg4A3Ua5SXjnh5gtG/LE94iGuRQPe/S9UjX/oc="; }; }; mainline = { - version = "2.29.1"; + version = "2.34.5"; hash = { - x86_64-linux = "sha256-LxYADRdkiIsvHBaMy+MtJuUo8p5MLDKDL6pMtHaqokw="; - x86_64-darwin = "sha256-OwZpCTjEVzTu4M9jf0vOuTuiyn66qRc/pEO/DLD8pvg="; - aarch64-linux = "sha256-hNPimwzopC2Hj8i0I6KJAtvKXANACpmcN+onGvAaMvc="; - aarch64-darwin = "sha256-AuNFtvnG40Toll/hmEXeGuV6ZcxfuVuUTFqdtTLXRn8="; + x86_64-linux = "sha256-B0roCJqTu6o89nHbVA3b9eHKj/VmJ9i1j4blF1I76yU="; + aarch64-linux = "sha256-UDyEhBAlvgSHWLPtbNXHj6X2gle1Y3fjQLSKHzwc/XI="; + aarch64-darwin = "sha256-VhliikNdqi7AauYlKQvMroEjR3jZZnhNw0HTtJFw5zg="; }; }; }; @@ -46,7 +44,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; } .${system}; @@ -55,7 +52,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { { x86_64-linux = "tar.gz"; aarch64-linux = "tar.gz"; - x86_64-darwin = "zip"; aarch64-darwin = "zip"; } .${system}; @@ -102,8 +98,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.agpl3Only; mainProgram = "coder"; maintainers = with lib.maintainers; [ - ghuntley + bpmct + developmentcats kylecarbs + phorcys420 ]; }; diff --git a/pkgs/by-name/co/coder/update.sh b/pkgs/by-name/co/coder/update.sh index 7f5e29d10b00..65a4dd6fcc84 100755 --- a/pkgs/by-name/co/coder/update.sh +++ b/pkgs/by-name/co/coder/update.sh @@ -13,7 +13,6 @@ LATEST_MAINLINE_VERSION=$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} --fail # Define the platforms declare -A ARCHS=(["x86_64-linux"]="linux_amd64.tar.gz" ["aarch64-linux"]="linux_arm64.tar.gz" - ["x86_64-darwin"]="darwin_amd64.zip" ["aarch64-darwin"]="darwin_arm64.zip") update_version_and_hashes() { diff --git a/pkgs/by-name/co/codesearch/package.nix b/pkgs/by-name/co/codesearch/package.nix index bc55d87aaaa8..ef378b6f9396 100644 --- a/pkgs/by-name/co/codesearch/package.nix +++ b/pkgs/by-name/co/codesearch/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/co/codespell/package.nix b/pkgs/by-name/co/codespell/package.nix index d033c7beb9f7..59a9f7eaf3ff 100644 --- a/pkgs/by-name/co/codespell/package.nix +++ b/pkgs/by-name/co/codespell/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "codespell"; - version = "2.4.2"; + version = "2.4.3"; pyproject = true; src = fetchFromGitHub { owner = "codespell-project"; repo = "codespell"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-OMnkTXt6ok3ll9ocZMY4jdpYl3PlI2ZZtLuiMYrCRNI="; + sha256 = "sha256-oWVhD9KINWNW75ufPK3yKJJ3zV2AaR6LNok4RQK1PLA="; }; nativeBuildInputs = with python3.pkgs; [ @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; nativeCheckInputs = with python3.pkgs; [ - aspell-python + aspell-python-py3 chardet pytestCheckHook pytest-cov-stub diff --git a/pkgs/by-name/co/codex-acp/librusty_v8.nix b/pkgs/by-name/co/codex-acp/librusty_v8.nix index c2f00c5fe62e..58ee83b3833e 100644 --- a/pkgs/by-name/co/codex-acp/librusty_v8.nix +++ b/pkgs/by-name/co/codex-acp/librusty_v8.nix @@ -12,7 +12,6 @@ fetchurl { { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; } .${stdenv.hostPlatform.system} diff --git a/pkgs/by-name/co/codex-acp/update.sh b/pkgs/by-name/co/codex-acp/update.sh index 2a8328e7bcf5..aa434ded6b25 100755 --- a/pkgs/by-name/co/codex-acp/update.sh +++ b/pkgs/by-name/co/codex-acp/update.sh @@ -141,7 +141,6 @@ fetchurl { { x86_64-linux = "${V8_HASH_X86_64_LINUX}"; aarch64-linux = "${V8_HASH_AARCH64_LINUX}"; - x86_64-darwin = "${V8_HASH_X86_64_DARWIN}"; aarch64-darwin = "${V8_HASH_AARCH64_DARWIN}"; } .\${stdenv.hostPlatform.system} @@ -198,9 +197,8 @@ export CODEX_HASH V8_HASH_X86_64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-unknown-linux-gnu.a.gz")" V8_HASH_AARCH64_LINUX="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-unknown-linux-gnu.a.gz")" -V8_HASH_X86_64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_x86_64-apple-darwin.a.gz")" V8_HASH_AARCH64_DARWIN="$(prefetch_sri "https://github.com/denoland/rusty_v8/releases/download/v${V8_VERSION}/librusty_v8_release_aarch64-apple-darwin.a.gz")" -export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_X86_64_DARWIN V8_HASH_AARCH64_DARWIN +export V8_VERSION V8_HASH_X86_64_LINUX V8_HASH_AARCH64_LINUX V8_HASH_AARCH64_DARWIN update-source-version "$ATTR_PATH" "$latest_version" "$src_hash" --ignore-same-version update_codex_pins diff --git a/pkgs/by-name/co/codex/librusty_v8.nix b/pkgs/by-name/co/codex/librusty_v8.nix index 213a3174cee3..9b38127fc5f6 100644 --- a/pkgs/by-name/co/codex/librusty_v8.nix +++ b/pkgs/by-name/co/codex/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-5ktNmeSuKTouhGJEqJuAF4uhA4LBP7WRwfppaPUpEVM="; aarch64-linux = "sha256-2/FlsHyBvbBUvARrQ9I+afz3vMGkwbW0d2mDpxBi7Ng="; - x86_64-darwin = "sha256-YwzSQPG77NsHFBfcGDh6uBz2fFScHFFaC0/Pnrpke7c="; aarch64-darwin = "sha256-v+LJvjKlbChUbw+WWCXuaPv2BkBfMQzE4XtEilaM+Yo="; }; } diff --git a/pkgs/by-name/co/codex/package.nix b/pkgs/by-name/co/codex/package.nix index 13a1a98bf7a9..6b7f883be89f 100644 --- a/pkgs/by-name/co/codex/package.nix +++ b/pkgs/by-name/co/codex/package.nix @@ -14,7 +14,6 @@ librusty_v8 ? callPackage ./librusty_v8.nix { inherit (callPackage ./fetchers.nix { }) fetchLibrustyV8; }, - livekit-libwebrtc, lld, makeBinaryWrapper, nix-update-script, @@ -26,41 +25,40 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "codex"; - version = "0.139.0"; + version = "0.145.0"; src = fetchFromGitHub { owner = "openai"; repo = "codex"; tag = "rust-v${finalAttrs.version}"; - hash = "sha256-XjzlkBUkBey+P3tFLDYB3ae5oseUfW5tmzhLzqlqj2E="; + hash = "sha256-/r4mBoJhHB1v5NTA4Hk565/D5B0deYJf9xJW330hyf0="; }; sourceRoot = "${finalAttrs.src.name}/codex-rs"; - cargoHash = "sha256-8mN4OTRJvt2mBYHQXZS55PSOChLqEIiXwPu2y+2MZ9o="; + cargoHash = "sha256-t9IMRK9R+Z67ThEcgBI0HQU0E4aJHcOjKp22RFclh9U="; __structuredAttrs = true; - # Match upstream's release build for the codex binary only. + # Match upstream's release build for the codex binary, plus its + # codex-code-mode-host runtime companion for out-of-process V8 execution. cargoBuildFlags = [ "--package" "codex-cli" + "--package" + "codex-code-mode-host" ]; cargoCheckFlags = [ "--package" "codex-cli" + "--package" + "codex-code-mode-host" ]; postPatch = '' - # webrtc-sys asks rustc to link libwebrtc statically by default, - # but nixpkgs provides libwebrtc as a shared library. - # use LK_CUSTOM_WEBRTC to point to the packaged library and adjust linking - # to use the shared library instead - substituteInPlace $cargoDepsCopy/*/webrtc-sys-*/build.rs \ - --replace-fail "cargo:rustc-link-lib=static=webrtc" "cargo:rustc-link-lib=dylib=webrtc" substituteInPlace Cargo.toml \ --replace-fail 'lto = "thin"' "" \ - --replace-fail 'codegen-units = 1' "" + --replace-fail 'codegen-units = 4' "" ''; nativeBuildInputs = [ @@ -86,7 +84,6 @@ rustPlatform.buildRustPackage (finalAttrs: { # character-conversion warning-as-error disabled. env = { LIBCLANG_PATH = "${lib.getLib libclang}/lib"; - LK_CUSTOM_WEBRTC = lib.getDev livekit-libwebrtc; NIX_CFLAGS_COMPILE = toString ( lib.optionals stdenv.cc.isGNU [ "-Wno-error=stringop-overflow" diff --git a/pkgs/by-name/co/codexbar/package.nix b/pkgs/by-name/co/codexbar/package.nix new file mode 100644 index 000000000000..62684d7c3540 --- /dev/null +++ b/pkgs/by-name/co/codexbar/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + makeWrapper, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "codexbar"; + version = "0.43.0"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/steipete/CodexBar/releases/download/v${finalAttrs.version}/CodexBar-macos-universal-${finalAttrs.version}.zip"; + hash = "sha256-dKr5/7HzgqDXUwkHGj1z534ekTajyUFNSrpg+vK/4Yw="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + makeWrapper + unzip + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r CodexBar.app $out/Applications + makeWrapper $out/Applications/CodexBar.app/Contents/MacOS/CodexBar $out/bin/codexbar + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--url=https://github.com/steipete/CodexBar" ]; + }; + + meta = { + description = "Show usage stats for AI coding-provider limits"; + homepage = "https://codex.bar/"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + Br1ght0ne + kinnrai + ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "codexbar"; + }; +}) diff --git a/pkgs/by-name/co/codipack/package.nix b/pkgs/by-name/co/codipack/package.nix index 6a3f7a203679..f195639e9e88 100644 --- a/pkgs/by-name/co/codipack/package.nix +++ b/pkgs/by-name/co/codipack/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "codipack"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "SciCompKL"; repo = "CoDiPack"; tag = "v${finalAttrs.version}"; - hash = "sha256-dHJvCR5IJ7Q/T94XcpbvXuXL41OrCNepqAmDVJ/7m6U="; + hash = "sha256-Xg87vpLiRuFqpKKKxmbf3TWjQRTbWWqYlH/Fku82Pak="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/cog/package.nix b/pkgs/by-name/co/cog/package.nix index 9da532e6d414..017d59d0c538 100644 --- a/pkgs/by-name/co/cog/package.nix +++ b/pkgs/by-name/co/cog/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "cog"; - version = "0.1.13"; + version = "0.1.23"; src = fetchFromGitHub { owner = "grafana"; repo = "cog"; tag = "v${finalAttrs.version}"; - hash = "sha256-e8PxH09d3n4nDhJzJ/y4KwTZ5UhKgwNupy31Z9VGi7A="; + hash = "sha256-uMlxFWMdrFF61FBinXi03QP1dGdQxaQWIyqv9eQCBP4="; }; - vendorHash = "sha256-0ywSn4JghAfg9KZptpLYp+h1hZju2SmLeOXG5DKPa98="; + vendorHash = "sha256-MY+rS6lF2p8cTDB2faxBwu1VpyMy/ZvadpRdGC8/SRU="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/co/coin3d/package.nix b/pkgs/by-name/co/coin3d/package.nix index c464f1078b38..c5faea3690d1 100644 --- a/pkgs/by-name/co/coin3d/package.nix +++ b/pkgs/by-name/co/coin3d/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coin"; - version = "4.0.8"; + version = "4.0.10"; src = fetchFromGitHub { owner = "coin3d"; repo = "coin"; rev = "v${finalAttrs.version}"; - hash = "sha256-2rKTDyDdmY7ItxUCHHfs3OyTlOQHdHaWITLxdGhrQ/I="; + hash = "sha256-Zymizcj+HeNgvvuuIoIHf03I0suOyWGOBIqvnjx5qyw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/co/coinmp/package.nix b/pkgs/by-name/co/coinmp/package.nix index 46959b52690a..4b90f42a304b 100644 --- a/pkgs/by-name/co/coinmp/package.nix +++ b/pkgs/by-name/co/coinmp/package.nix @@ -41,6 +41,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://projects.coin-or.org/CoinMP/"; description = "COIN-OR lightweight API for COIN-OR libraries CLP, CBC, and CGL"; + maintainers = with lib.maintainers; [ coolcuber ]; platforms = lib.platforms.unix; license = lib.licenses.epl10; }; diff --git a/pkgs/by-name/co/cointop/package.nix b/pkgs/by-name/co/cointop/package.nix index 243819c06b76..c0078b7bc622 100644 --- a/pkgs/by-name/co/cointop/package.nix +++ b/pkgs/by-name/co/cointop/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "1.6.10"; src = fetchFromGitHub { - owner = "miguelmota"; + owner = "cointop-sh"; repo = "cointop"; rev = "v${finalAttrs.version}"; sha256 = "sha256-NAw1uoBL/FnNLJ86L9aBCOY65aJn1DDGK0Cd0IO2kr0="; diff --git a/pkgs/by-name/co/colima/package.nix b/pkgs/by-name/co/colima/package.nix index c03ab54dd7df..038eeaa827b0 100644 --- a/pkgs/by-name/co/colima/package.nix +++ b/pkgs/by-name/co/colima/package.nix @@ -10,19 +10,20 @@ makeWrapper, procps, qemu, + docker, testers, colima, }: buildGoModule (finalAttrs: { pname = "colima"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "abiosoft"; repo = "colima"; tag = "v${finalAttrs.version}"; - hash = "sha256-WYwHqMPHRF17j7EfZzxHAMV0JPGZKLfJCn0axpuh5sc="; + hash = "sha256-FBFL3VO6t7SaGnZBT2qBD1DbRg14klBpiPiaELbRfIY="; # We need the git revision leaveDotGit = true; postFetch = '' @@ -37,7 +38,7 @@ buildGoModule (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.DarwinTools ]; - vendorHash = "sha256-UAnQZyZ4EcIZz55jXUjkJDjq3s0uLPBnwUPyNcBV6aE="; + vendorHash = "sha256-j1RuG3CTGfVNfT/v+C2pZgb58c9cxa2op3LA/F5rNWo="; # disable flaky Test_extractZones # https://hydra.nixos.org/build/212378003/log @@ -66,6 +67,7 @@ buildGoModule (finalAttrs: { # Suppress warning on `colima start`: https://github.com/abiosoft/colima/issues/1333 lima-full qemu + docker ] ++ lib.optional (lib.meta.availableOn stdenv.hostPlatform krunkit) krunkit ) diff --git a/pkgs/by-name/co/collectl/package.nix b/pkgs/by-name/co/collectl/package.nix index 8251bf100985..279557a86322 100644 --- a/pkgs/by-name/co/collectl/package.nix +++ b/pkgs/by-name/co/collectl/package.nix @@ -68,13 +68,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "collectl"; - version = "4.3.20.2"; + version = "4.3.20.3"; src = fetchFromGitHub { owner = "sharkcz"; repo = "collectl"; rev = finalAttrs.version; - hash = "sha256-xIfimx7IbC5WHLCLPXGAhL9gkC4F+/JHDFYb0wwAK3I="; + hash = "sha256-hokovb6uqPiMFlDS0g2F/J1rHTkyNBegcgOC3g3ykEs="; }; strictDeps = true; diff --git a/pkgs/by-name/co/colmap/package.nix b/pkgs/by-name/co/colmap/package.nix index 35b258738c98..fdee6db0126a 100644 --- a/pkgs/by-name/co/colmap/package.nix +++ b/pkgs/by-name/co/colmap/package.nix @@ -1,8 +1,8 @@ { lib, fetchFromGitHub, - fetchpatch, fetchurl, + fetchpatch, nix-update-script, cmake, boost, @@ -62,14 +62,12 @@ let onnxruntime ] ++ lib.optionals cudaSupport [ - cudatoolkit - (lib.getOutput "static" cudaPackages.cuda_cudart) + cudaPackages.cuda_cudart # CUDA::cudart, used by COLMAP and faiss + cudaPackages.libcublas # CUDA::cublas, propagated by faiss' exported targets + cudaPackages.libcurand # CUDA::curand, used by COLMAP ] ++ lib.optional stdenv'.cc.isClang llvmPackages.openmp; - # TODO: migrate to redist packages - inherit (cudaPackages) cudatoolkit; - # COLMAP needs these model files to run the ONNX tests # Based on: https://github.com/colmap/colmap/blob/79efc74b2b614935a3c69b1f983f2bad23a836a1/src/colmap/feature/resources.h#L36 modelsForTesting = [ @@ -100,16 +98,41 @@ let } ]; in -stdenv'.mkDerivation rec { +stdenv'.mkDerivation (finalAttrs: { version = "4.0.4"; pname = "colmap"; src = fetchFromGitHub { owner = "colmap"; repo = "colmap"; - tag = version; + tag = finalAttrs.version; hash = "sha256-n9YwEqMSIh6vM2MVf7qxxVvDpsTLEsT37xoHiX66bL0="; }; + __structuredAttrs = true; + strictDeps = true; + + patches = + lib.optionals stdenv'.hostPlatform.isAarch64 [ + # Set SANITIZE_PR for PoissonRecon to fix data races on aarch64 + # https://github.com/colmap/colmap/pull/4429 + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/e13294e43baae6cf7f4e3ec05a19060e0b230a72.patch"; + hash = "sha256-hoIjWdrOlXeT78X+g3YCDWaWnmQMzHVQNkdpx5vXpGk="; + }) + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/6c5c59f96f9e819bcc57267ef48b193d77707fe0.patch"; + hash = "sha256-2dAhy3sgxF2SXPAYE/EV1hd61dm05vJ5JJXEjQxEKWM="; + }) + ] + ++ lib.optionals (stdenv'.hostPlatform.isLinux && stdenv'.hostPlatform.isAarch64) [ + # Fix determinism check in rotation_averaging_test + # https://github.com/colmap/colmap/pull/4426 + (fetchpatch { + url = "https://github.com/colmap/colmap/commit/d38b65b9312c66e841739989f4a38924d8cb5ec5.patch"; + hash = "sha256-dbs+TNfa4o5L79+krPpF4VmP8PhFHtzYZehYZbsnx5s="; + }) + ]; + cmakeFlags = [ (lib.cmakeBool "DOWNLOAD_ENABLED" true) # We want COLMAP to be able to fetch models like LightGlue. (lib.cmakeBool "UNINSTALL_ENABLED" false) @@ -117,8 +140,8 @@ stdenv'.mkDerivation rec { (lib.cmakeBool "FETCH_FAISS" false) (lib.cmakeBool "FETCH_ONNX" false) (lib.cmakeBool "TESTS_ENABLED" enableTests) - (lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${suitesparse.dev}/include") - (lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${suitesparse}/lib") + (lib.cmakeFeature "CHOLMOD_INCLUDE_DIR_HINTS" "${lib.getDev suitesparse}/include") + (lib.cmakeFeature "CHOLMOD_LIBRARY_DIR_HINTS" "${lib.getLib suitesparse}/lib") ] ++ lib.optionals cudaSupport [ (lib.cmakeBool "CUDA_ENABLED" cudaSupport) @@ -135,6 +158,7 @@ stdenv'.mkDerivation rec { glog libGLU glew + gtest qt5.qtbase flann lz4 @@ -153,21 +177,43 @@ stdenv'.mkDerivation rec { ] ++ lib.optionals cudaSupport [ autoAddDriverRunpath + cudaPackages.cuda_nvcc ]; doCheck = enableTests; - preCheck = lib.optionalString enableTests '' - export GTEST_FILTER='-*Gpu*:*GPU*:*OpenGL*' # Disable any test involving OpenGL or GPU, these won't work in the sandbox. - export HOME=$PWD + preCheck = lib.optionalString enableTests ( + let + disabledTestPatterns = [ + # Disable any test involving OpenGL or GPU, these won't work in the sandbox. + "*Gpu*" + "*GPU*" + "*OpenGL*" + ] + ++ lib.optionals stdenv'.hostPlatform.isDarwin [ + # reconstruction_pruning_test.cc:65: Failure + # Expected: (redundant_point3D_ids.size()) > (prev_num_redundant_points3D), actual: 0 vs 0 + "FindRedundantPoints3D.VaryingCoverageGain" + ]; + in + '' + export GTEST_FILTER='-${lib.concatStringsSep ":" disabledTestPatterns}' + '' + + '' + export HOME=$PWD + '' # Pre-fetch the ONNX models into COLMAP's cache dir so we can run their tests. - mkdir -p .cache/colmap - ${lib.concatMapStringsSep "\n" (model: '' - ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name} - '') modelsForTesting} - ''; + + '' + mkdir -p .cache/colmap + ${lib.concatMapStringsSep "\n" (model: '' + ln -s ${fetchurl model} .cache/colmap/${model.sha256}-${model.name} + '') modelsForTesting} + '' + ); - passthru.depsAlsoForPycolmap = depsAlsoForPycolmap; - passthru.updateScript = nix-update-script { }; + passthru = { + depsAlsoForPycolmap = depsAlsoForPycolmap; + updateScript = nix-update-script { }; + }; meta = { description = "Structure-From-Motion and Multi-View Stereo pipeline"; @@ -177,6 +223,8 @@ stdenv'.mkDerivation rec { ''; mainProgram = "colmap"; homepage = "https://colmap.github.io/index.html"; + downloadPage = "https://github.com/colmap/colmap"; + changelog = "https://github.com/colmap/colmap/blob/${finalAttrs.src.tag}/CHANGELOG.rst"; license = lib.licenses.bsd3; platforms = if cudaSupport then lib.platforms.linux else lib.platforms.unix; maintainers = with lib.maintainers; [ @@ -185,4 +233,4 @@ stdenv'.mkDerivation rec { chpatrick ]; }; -} +}) diff --git a/pkgs/by-name/co/colmena/package.nix b/pkgs/by-name/co/colmena/package.nix index f95c311db6e7..fdf643e76301 100644 --- a/pkgs/by-name/co/colmena/package.nix +++ b/pkgs/by-name/co/colmena/package.nix @@ -8,19 +8,20 @@ makeBinaryWrapper, nix-eval-jobs, nix, - colmena, - testers, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "colmena"; version = "0.4.0"; + __structuredAttrs = true; + src = fetchFromGitHub { - owner = "zhaofengli"; + owner = "nix-community"; repo = "colmena"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-01bfuSY4gnshhtqA1EJCw2CMsKkAx+dHS+sEpQ2+EAQ="; }; cargoHash = "sha256-2OLApLD/04etEeTxv03p0cx8O4O51iGiBQTIG/iOIkU="; @@ -35,10 +36,10 @@ rustPlatform.buildRustPackage (finalAttrs: { env.NIX_EVAL_JOBS = "${nix-eval-jobs}/bin/nix-eval-jobs"; patches = [ - # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/236 + # Fixes nix 2.24 compat: https://github.com/zhaofengli/colmena/pull/233 (fetchpatch { - url = "https://github.com/zhaofengli/colmena/commit/36382ee2bef95983848435065f7422500c7923a8.patch"; - sha256 = "sha256-5cQ2u3eTzhzjPN+rc6xWIskHNtheVXXvlSeJ1G/lz+E="; + url = "https://github.com/nix-community/colmena/commit/00fd486d49170b1304c67381b3096e55d4cdc76f.patch"; + hash = "sha256-uwL3u0gO708bzV2NV8sTt10WHaCL3HykJNqSZNp9EtA="; }) ]; @@ -52,19 +53,22 @@ rustPlatform.buildRustPackage (finalAttrs: { --prefix PATH ":" "${lib.makeBinPath [ nix ]}" ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + # Recursive Nix is not stable yet doCheck = false; passthru = { # We guarantee CLI and Nix API stability for the same minor version apiVersion = builtins.concatStringsSep "." (lib.take 2 (lib.splitVersion finalAttrs.version)); - - tests.version = testers.testVersion { package = colmena; }; }; meta = { description = "Simple, stateless NixOS deployment tool"; homepage = "https://colmena.cli.rs/${finalAttrs.passthru.apiVersion}"; + downloadPage = "https://github.com/nix-community/colmena/"; + changelog = "https://github.com/nix-community/colmena/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ zhaofengli ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/co/colorgrind/package.nix b/pkgs/by-name/co/colorgrind/package.nix index 70b9ce0d16e4..649a57ea10d9 100644 --- a/pkgs/by-name/co/colorgrind/package.nix +++ b/pkgs/by-name/co/colorgrind/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Perl wrapper for Valgrind with ANSI escape code colored output"; homepage = "http://renatocf.github.io/colorgrind/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "colorgrind"; }; diff --git a/pkgs/by-name/co/colorized-logs/package.nix b/pkgs/by-name/co/colorized-logs/package.nix index f08531461b96..48987505dff2 100644 --- a/pkgs/by-name/co/colorized-logs/package.nix +++ b/pkgs/by-name/co/colorized-logs/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tools for logs with ANSI color"; homepage = "https://github.com/kilobyte/colorized-logs"; changelog = "https://github.com/kilobyte/colorized-logs/blob/v${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ CobaltCause ]; }; diff --git a/pkgs/by-name/co/colstr/package.nix b/pkgs/by-name/co/colstr/package.nix index 1d5b693b9f2b..716c8126acd9 100644 --- a/pkgs/by-name/co/colstr/package.nix +++ b/pkgs/by-name/co/colstr/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Deterministically output each input argument in a color assigned to it"; homepage = "https://git.sleeping.town/wonder/colstr"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ annaaurora ]; mainProgram = "colstr"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/co/comaps/package.nix b/pkgs/by-name/co/comaps/package.nix index 511829b29bf4..22fe26b9fd90 100644 --- a/pkgs/by-name/co/comaps/package.nix +++ b/pkgs/by-name/co/comaps/package.nix @@ -1,32 +1,53 @@ { lib, - organicmaps, + stdenv, + fetchFromGitHub, fetchurl, fetchFromCodeberg, + cmake, boost, expat, - gtest, - glm, + getopt, gflags, + glm, + gtest, + icu, imgui, jansson, + libxcursor, + libxinerama, + libxrandr, + ninja, + pkg-config, + pugixml, python3, + qt6, optipng, utf8cpp, + which, nix-update-script, }: let - # https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt - mapRev = 260321; + world_feed_integration_tests_data = fetchFromGitHub { + owner = "organicmaps"; + repo = "world_feed_integration_tests_data"; + rev = "30ecb0b3fe694a582edfacc2a7425b6f01f9fec6"; + hash = "sha256-1FF658OhKg8a5kKX/7TVmsxZ9amimn4lB6bX9i7pnI4="; + }; + + # Update mapRev here based on v field near the top in https://codeberg.org/comaps/comaps/src/branch/main/data/countries.txt + mapRev = 260603; worldMap = fetchurl { + name = "World-${toString mapRev}.mwm"; url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/World.mwm"; - hash = "sha256-pMmzPcWbS9drQzJCfiac2dfSMihiHDfhFyG5ux0pG54="; + hash = "sha256-1cq2gDiqeybA7VxjuSUFnlLagdZipdWiuAy5QI1LdZE="; }; worldCoasts = fetchurl { + name = "WorldCoasts-${toString mapRev}.mwm"; url = "https://cdn-fi-1.comaps.app/maps/${toString mapRev}/WorldCoasts.mwm"; - hash = "sha256-5LI6itC6LhprVfgGbT/HYy1lzZLZLUe2QoSil0/7kIc="; + hash = "sha256-MLRUPEXvXW2GqYdlxfhS5ODRiiWya4i2U+mpXnqc6rY="; }; pythonEnv = python3.withPackages ( @@ -35,26 +56,27 @@ let ] ); in -organicmaps.overrideAttrs (oldAttrs: rec { +stdenv.mkDerivation (finalAttrs: { pname = "comaps"; - version = "2026.03.23-5"; + version = "2026.06.05-11"; src = fetchFromCodeberg { owner = "comaps"; repo = "comaps"; - tag = "v${version}"; - hash = "sha256-1bD0QiEZu6nB7wwBpfpEf+WypqbOd9XuXbq7FDTL7bw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-W05fZT82H78TqlH4MFaIexX1LYhjATYL1E6e0WCYrBI="; fetchSubmodules = true; }; patches = [ ./use-vendored-protobuf.patch - - # Include missing editor_tests_support. - ./fix-editor-tests.patch ]; - postPatch = (oldAttrs.postPatch or "") + '' + postPatch = '' + patchShebangs 3party/boost/tools/build/src/engine/build.sh + + ln -s ${world_feed_integration_tests_data} data/test_data/world_feed_integration_tests_data + rm -f 3party/boost/b2 substituteInPlace configure.sh \ --replace-fail "git submodule update --init --recursive --depth 1" "" @@ -64,19 +86,34 @@ organicmaps.overrideAttrs (oldAttrs: rec { --replace-fail "/usr/bin/env python3" "${pythonEnv.interpreter}" ''; - nativeBuildInputs = (builtins.filter (x: x != python3) oldAttrs.nativeBuildInputs or [ ]) ++ [ + nativeBuildInputs = [ + cmake + ninja + getopt + which + pkg-config pythonEnv + qt6.wrapQtAppsHook optipng ]; - buildInputs = (oldAttrs.buildInputs or [ ]) ++ [ + buildInputs = [ + qt6.qtbase + qt6.qtpositioning + qt6.qtsvg + boost expat gtest gflags glm + icu imgui jansson + libxcursor + libxinerama + libxrandr + pugixml utf8cpp ]; @@ -85,6 +122,7 @@ organicmaps.overrideAttrs (oldAttrs: rec { ''; cmakeFlags = [ + (lib.cmakeBool "SKIP_TESTS" false) (lib.cmakeBool "WITH_SYSTEM_PROVIDED_3PARTY" true) ]; @@ -98,7 +136,6 @@ organicmaps.overrideAttrs (oldAttrs: rec { postInstall = '' install -Dm644 ${worldMap} $out/share/comaps/data/World.mwm install -Dm644 ${worldCoasts} $out/share/comaps/data/WorldCoasts.mwm - ln -s $out/bin/CoMaps $out/bin/comaps ''; passthru.updateScript = nix-update-script { @@ -108,11 +145,14 @@ organicmaps.overrideAttrs (oldAttrs: rec { ]; }; - meta = oldAttrs.meta // { + meta = { + broken = stdenv.hostPlatform.isDarwin; description = "Community-led fork of Organic Maps"; homepage = "https://comaps.app"; - changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${version}"; + changelog = "https://codeberg.org/comaps/comaps/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.ryand56 ]; - mainProgram = "comaps"; + platforms = lib.platforms.unix; + mainProgram = "CoMaps"; }; }) diff --git a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch index 01634f925256..1746411d69e6 100644 --- a/pkgs/by-name/co/comaps/use-vendored-protobuf.patch +++ b/pkgs/by-name/co/comaps/use-vendored-protobuf.patch @@ -1,21 +1,21 @@ diff --git a/3party/CMakeLists.txt b/3party/CMakeLists.txt -index dd851d7d..1b4e3ed3 100644 +index 2146a5fdcf..9fc67abfb3 100644 --- a/3party/CMakeLists.txt +++ b/3party/CMakeLists.txt -@@ -41,9 +41,6 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) +@@ -41,9 +41,6 @@ # Add pugixml library. add_subdirectory(pugixml) - + - # Add protobuf library. - add_subdirectory(protobuf) - if (NOT PLATFORM_LINUX) add_subdirectory(freetype) add_subdirectory(icu) -@@ -55,6 +52,9 @@ if (NOT WITH_SYSTEM_PROVIDED_3PARTY) +@@ -55,6 +52,9 @@ target_include_directories(utf8cpp INTERFACE "${OMIM_ROOT}/3party/utfcpp/source") endif() - + +# Add protobuf library. +add_subdirectory(protobuf) + @@ -23,13 +23,13 @@ index dd851d7d..1b4e3ed3 100644 add_subdirectory(bsdiff-courgette) add_subdirectory(glaze) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3ba193a9..dd2df855 100644 +index 096d31389e..c6e4aabdeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -225,25 +225,6 @@ endif() - # Used in qt/ and shaders/ - find_package(Python3 REQUIRED COMPONENTS Interpreter) - +@@ -212,26 +212,6 @@ + message(STATUS "==> Python Virtual Environment detected : ${PYTHON_VENV_PATH}" " ==> " "Using python command: ${Python3_EXECUTABLE}" ) + endif() + -execute_process( - COMMAND ${Python3_EXECUTABLE} -c "import google.protobuf; -print(google.protobuf.__version__)" @@ -40,15 +40,16 @@ index 3ba193a9..dd2df855 100644 -) - -if(PROTOBUF_CHECK EQUAL 0) -- if(PROTOBUF_VERSION VERSION_LESS "4.0.0") -- message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (< 4.0)") +- if(PROTOBUF_VERSION VERSION_LESS "3.20.0" OR PROTOBUF_VERSION VERSION_GREATER_EQUAL "4.0.0") +- message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version (>=3.20, <4.0) is required") - else() -- message(FATAL_ERROR "Python protobuf ${PROTOBUF_VERSION} found, but version < 4.0 required") +- message(STATUS "Python protobuf ${PROTOBUF_VERSION} found (>=3.20, <4.0)") - endif() -else() -- message(FATAL_ERROR "Python protobuf not found. Install version <4.0") +- message(FATAL_ERROR "Python protobuf not found. Install version (>=3.20, <4.0)") -endif() - - +- add_subdirectory(libs) - + + if (PLATFORM_DESKTOP) diff --git a/pkgs/by-name/co/comigo/package.nix b/pkgs/by-name/co/comigo/package.nix index d60841a11a5d..906571b91b38 100644 --- a/pkgs/by-name/co/comigo/package.nix +++ b/pkgs/by-name/co/comigo/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "comigo"; - version = "1.2.31"; + version = "1.3.0"; src = fetchFromGitHub { owner = "yumenaka"; repo = "comigo"; tag = "v${finalAttrs.version}"; - hash = "sha256-oQq1fPwTVuw/gzmTivkT2AUvHkMVMgECc9h+ZLg9FvA="; + hash = "sha256-6EnKIpcGFMNY3NRy/QBVgsSXGwBgxsjr1TgOD0cEW7k="; }; - vendorHash = "sha256-o8XzCcX6IYb73QxQWoVYuxHOjKRcV949g0AwtM08Pys="; + vendorHash = "sha256-ehK1fqHrSy6J6DThBR7s+LA+nP5DHDkwSRsR/NIg4g8="; subPackages = [ "." ]; diff --git a/pkgs/by-name/co/commafeed/package.nix b/pkgs/by-name/co/commafeed/package.nix index 1a53c5bbd7fa..47746936bdf2 100644 --- a/pkgs/by-name/co/commafeed/package.nix +++ b/pkgs/by-name/co/commafeed/package.nix @@ -54,7 +54,7 @@ maven.buildMavenPackage { pname = "commafeed"; - mvnHash = "sha256-jAU1zaTftMuB1WgOeFzU1i+fFHAw6JYxTGw2mY8VlQw="; + mvnHash = "sha256-P3pmU/ou/gErk91ANjD4QuBTldBPKHYtGJREJQVgde8="; mvnJdk = jdk25; mvnParameters = lib.escapeShellArgs [ @@ -100,7 +100,7 @@ maven.buildMavenPackage { homepage = "https://github.com/Athou/commafeed"; license = lib.licenses.asl20; mainProgram = "commafeed"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ svrana ]; broken = stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isAarch64; }; } diff --git a/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch b/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch new file mode 100644 index 000000000000..7126ebdb6a42 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/fix-hardcoded-flutter-cmd.patch @@ -0,0 +1,111 @@ +--- a/scripts/codegen.dart ++++ b/scripts/codegen.dart +@@ -2,38 +2,7 @@ + + import 'dart:io'; + +-Future getDependencies() async { +- var process = Process.runSync( +- "flutter", +- [ +- "pub", +- "get", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future intlUtilsGenerate() async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "intl_utils:generate", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future> generateFileLists() async { ++void main() async { + var dir = Directory("lib/generated/l10n"); + if (!dir.existsSync()) { + dir.create(recursive: true); +@@ -82,68 +51,4 @@ + + await arbFile.create(recursive: true); + arbFile.writeAsStringSync(fileList); +- +- return [sourcesFile, arbFile]; +-} +- +-Future generateFromArb(List files) async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "intl_translation:generate_from_arb", +- "--sources-list-file", +- files[0].absolute.path, +- "--translations-list-file", +- files[1].absolute.path, +- "--output-dir=lib/generated/l10n" +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-Future buildRunner() async { +- var process = await Process.run( +- "flutter", +- [ +- "pub", +- "run", +- "build_runner", +- "build", +- "--delete-conflicting-outputs", +- ], +- runInShell: true, +- ); +- +- print(process.stdout); +- print(process.stderr); +- return process; +-} +- +-void main() async { +- var result = await getDependencies(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- result = await intlUtilsGenerate(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- var files = await generateFileLists(); +- result = await generateFromArb(files); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } +- +- result = await buildRunner(); +- if (result.exitCode != 0) { +- exit(result.exitCode); +- } + } diff --git a/pkgs/by-name/co/commet-chat/package.nix b/pkgs/by-name/co/commet-chat/package.nix new file mode 100644 index 000000000000..9bf90ddf9f95 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/package.nix @@ -0,0 +1,164 @@ +{ + lib, + flutter341, + stdenv, + fetchFromGitHub, + fetchzip, + + webkitgtk_4_1, + mimalloc, + keybinder3, + + mpv-unwrapped, + libdovi, + libdvdcss, + libunwind, + + libgbm, + libdrm, +}: + +let + libwebrtcRpath = lib.makeLibraryPath [ + libgbm + libdrm + ]; + libwebrtc = fetchzip { + url = "https://github.com/flutter-webrtc/flutter-webrtc/releases/download/v1.2.0/libwebrtc.zip"; + hash = "sha256-i4LRG44f//SDIOl072yZavkYoTZdiydPZndeOm6/fBM="; + }; +in +flutter341.buildFlutterApplication (finalAttrs: { + pname = "commet-chat"; + version = "0.4.2+hotfix.2"; + + src = fetchFromGitHub { + owner = "commetchat"; + repo = "commet"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pf+JeVuTPxpufcx/whn8RVcYp1e69CJBFzyZaQ8I5RQ="; + fetchSubmodules = true; + leaveDotGit = true; + + # For the git hash property in about page + postFetch = '' + cd $out + git rev-parse HEAD | head -c 7 > $out/GIT_HASH + find $out -name .git -print0 | xargs -0 rm -rf + ''; + }; + strictDeps = true; + sourceRoot = "${finalAttrs.src.name}/commet"; + + pubspecLockFilePath = "../pubspec.lock"; + pubspecLock = lib.importJSON ./pubspec.lock.json; + + gitHashes = { + calendar_view = "sha256-tGAMK89VsgqfKQy+t8x5zl6dbQEf5h4HxSUR8crB1oM="; + desktop_webview_window = "sha256-EOh5QoOuAxiYn0IcdxY7taN2Twu8GshY9zAoGCztPnA="; + dynamic_color = "sha256-4zSTiXplkBjtPtzssj3VaHTVo9YlYKNTMLgBIM5MMe4="; + flutter_highlighter = "sha256-Y84Besir3gu1RnQt9YoE0GyIJLLZ6H0Kki/Wf6z6QMg="; + flutter_html = "sha256-576KYoYB4sZeavcAS8V5rjDG9hezYlN2Q4zlyvBOouw="; + flutter_local_notifications = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw="; + flutter_local_notifications_linux = "sha256-AgvvFoJgos/gsTwcLGX/CxbHauWiH3OHksqtF0Dauuw="; + markdown = "sha256-2rEMNJM9Vy7LrFLt30/Z3pyqERTYJei9D3mgOAAvVPg="; + matrix = "sha256-PB7xjulxmV2jE0WGVG116T50BrT3G5LsdLreR1cJTPI="; + matrix_dart_sdk_drift_db = "sha256-2sSN2TcPAPVdEm3NXpZyWlPvArNn2CWnPph5Vz48KQ8="; + receive_intent = "sha256-wGIOZRH4O3a44I8zG5Q1hCwn4SMuTWB7i9wtGSLZWeQ="; + signal_sticker_api = "sha256-VdEE3Bt8gpfUpxxYSz5319YEL49Eh+loO+ZipI1DoyA="; + starfield = "sha256-ebVRyVkyLfHCC6EBmx5evXL1U71S3tgCMo1yLWlIcw4="; + launcher_entry = "sha256-T/zQRvY6jOKroMrhVwBtsoSm2xCFjOd5jsJC0PA4cpc="; + }; + + buildInputs = [ + webkitgtk_4_1 + mimalloc + keybinder3 + + mpv-unwrapped + libdovi + libdvdcss + libunwind + ] + ++ mpv-unwrapped.buildInputs; + + env.NIX_LDFLAGS = "-rpath-link ${libwebrtcRpath}"; + env.COMMET_PROD = 1; + + targetFlutterPlatform = "linux"; + + customSourceBuilders = { + flutter_webrtc = + { version, src, ... }: + stdenv.mkDerivation { + pname = "flutter_webrtc"; + inherit version src; + inherit (src) passthru; + + postPatch = '' + substituteInPlace third_party/CMakeLists.txt \ + --replace-fail "\''${CMAKE_CURRENT_LIST_DIR}/downloads/libwebrtc.zip" ${libwebrtc} + ln -s ${libwebrtc} third_party/libwebrtc + ''; + + installPhase = '' + runHook preInstall + + mkdir $out + cp -r ./* $out/ + + runHook postInstall + ''; + }; + }; + + # The original codegen.dart hardcodes flutter calls inside, so the patch basically rewrites the codegen script forcing nix. + patches = [ + ./fix-hardcoded-flutter-cmd.patch + ]; + + flutterBuildFlags = [ + "--dart-define=BUILD_MODE=release" + "--dart-define=PLATFORM=linux" + "--dart-define=VERSION_TAG=v${finalAttrs.version}" + "--dart-define=BUILD_DETAIL=${stdenv.hostPlatform.system}" + ]; + + preBuild = '' + export flutterBuildFlags="$flutterBuildFlags --dart-define=GIT_HASH=$(cat ../GIT_HASH)" + + packageRun intl_utils -e generate + dart run --packages=.dart_tool/package_config.json scripts/codegen.dart + packageRun intl_translation -e generate_from_arb \ + --sources-list-file /build/source/commet/lib/generated/l10n/sources_list_file.txt \ + --translations-list-file /build/source/commet/lib/generated/l10n/arb_list_file.txt \ + --output-dir=lib/generated/l10n + packageRun build_runner build --delete-conflicting-outputs + ''; + + extraWrapProgramArgs = "--suffix LD_LIBRARY_PATH : $out/app/commet-chat/lib"; + + postInstall = '' + mkdir -p $out/share/applications + install -Dm644 \ + linux/debian/usr/share/applications/chat.commet.commetapp.desktop \ + $out/share/applications/ + substituteInPlace $out/share/applications/chat.commet.commetapp.desktop \ + --replace-fail "/usr/lib/chat.commet.commetapp/commet" "commet" + + mkdir -p $out/share/icons + cp -r linux/debian/usr/share/icons/hicolor $out/share/icons/hicolor + + patchelf --add-rpath ${libwebrtcRpath} $out/app/commet-chat/lib/libwebrtc.so + ''; + + __structuredAttrs = true; + meta = { + homepage = "https://commet.chat"; + description = "Client for Matrix focused on providing a feature rich experience while maintaining a simple interface"; + platforms = lib.platforms.linux; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ ckgxrg ]; + mainProgram = "commet"; + }; +}) diff --git a/pkgs/by-name/co/commet-chat/pubspec.lock.json b/pkgs/by-name/co/commet-chat/pubspec.lock.json new file mode 100644 index 000000000000..8b607ce3ff58 --- /dev/null +++ b/pkgs/by-name/co/commet-chat/pubspec.lock.json @@ -0,0 +1,3058 @@ +{ + "packages": { + "_fe_analyzer_shared": { + "dependency": "transitive", + "description": { + "name": "_fe_analyzer_shared", + "sha256": "da0d9209ca76bde579f2da330aeb9df62b6319c834fa7baae052021b0462401f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "85.0.0" + }, + "accessibility_tools": { + "dependency": "transitive", + "description": { + "name": "accessibility_tools", + "sha256": "c29732e423175a51e0a6ace7df1255f5d77812c7c7b7101d8ba0186a43d533aa", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.0" + }, + "adaptive_number": { + "dependency": "transitive", + "description": { + "name": "adaptive_number", + "sha256": "3a567544e9b5c9c803006f51140ad544aedc79604fd4f3f2c1380003f97c1d77", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "analyzer": { + "dependency": "direct overridden", + "description": { + "name": "analyzer", + "sha256": "974859dc0ff5f37bc4313244b3218c791810d03ab3470a579580279ba971a48d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.7.1" + }, + "archive": { + "dependency": "transitive", + "description": { + "name": "archive", + "sha256": "cb6a278ef2dbb298455e1a713bda08524a175630ec643a242c399c932a0a1f7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.6.1" + }, + "args": { + "dependency": "transitive", + "description": { + "name": "args", + "sha256": "d0481093c50b1da8910eb0bb301626d4d8eb7284aa739614d2b394ee09e3ea04", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "async": { + "dependency": "transitive", + "description": { + "name": "async", + "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.13.0" + }, + "base58check": { + "dependency": "transitive", + "description": { + "name": "base58check", + "sha256": "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "blurhash_dart": { + "dependency": "transitive", + "description": { + "name": "blurhash_dart", + "sha256": "43955b6c2e30a7d440028d1af0fa185852f3534b795cc6eb81fbf397b464409f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "boolean_selector": { + "dependency": "transitive", + "description": { + "name": "boolean_selector", + "sha256": "8aab1771e1243a5063b8b0ff68042d67334e3feab9e95b9490f9a6ebf73b42ea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "build": { + "dependency": "transitive", + "description": { + "name": "build", + "sha256": "51dc711996cbf609b90cbe5b335bbce83143875a9d58e4b5c6d3c4f684d3dda7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_cli_annotations": { + "dependency": "transitive", + "description": { + "name": "build_cli_annotations", + "sha256": "e563c2e01de8974566a1998410d3f6f03521788160a02503b0b1f1a46c7b3d95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "build_config": { + "dependency": "transitive", + "description": { + "name": "build_config", + "sha256": "4ae2de3e1e67ea270081eaee972e1bd8f027d459f249e0f1186730784c2e7e33", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "build_daemon": { + "dependency": "transitive", + "description": { + "name": "build_daemon", + "sha256": "bf05f6e12cfea92d3c09308d7bcdab1906cd8a179b023269eed00c071004b957", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.1" + }, + "build_resolvers": { + "dependency": "transitive", + "description": { + "name": "build_resolvers", + "sha256": "ee4257b3f20c0c90e72ed2b57ad637f694ccba48839a821e87db762548c22a62", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner": { + "dependency": "transitive", + "description": { + "name": "build_runner", + "sha256": "382a4d649addbfb7ba71a3631df0ec6a45d5ab9b098638144faf27f02778eb53", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "build_runner_core": { + "dependency": "transitive", + "description": { + "name": "build_runner_core", + "sha256": "85fbbb1036d576d966332a3f5ce83f2ce66a40bea1a94ad2d5fc29a19a0d3792", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.2" + }, + "built_collection": { + "dependency": "transitive", + "description": { + "name": "built_collection", + "sha256": "376e3dd27b51ea877c28d525560790aee2e6fbb5f20e2f85d5081027d94e2100", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.1" + }, + "built_value": { + "dependency": "transitive", + "description": { + "name": "built_value", + "sha256": "7931c90b84bc573fef103548e354258ae4c9d28d140e41961df6843c5d60d4d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "8.12.3" + }, + "calendar_view": { + "dependency": "direct overridden", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "fbd03769c8715cf43211dfb878640a5fc0133dbc", + "url": "https://github.com/commetchat/flutter_calendar_view.git" + }, + "source": "git", + "version": "2.0.0" + }, + "canonical_json": { + "dependency": "transitive", + "description": { + "name": "canonical_json", + "sha256": "d6be1dd66b420c6ac9f42e3693e09edf4ff6edfee26cb4c28c1c019fdb8c0c15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "characters": { + "dependency": "transitive", + "description": { + "name": "characters", + "sha256": "faf38497bda5ead2a8c7615f4f7939df04333478bf32e4173fcb06d428b5716b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "charcode": { + "dependency": "transitive", + "description": { + "name": "charcode", + "sha256": "fb0f1107cac15a5ea6ef0a6ef71a807b9e4267c713bb93e00e92d737cc8dbd8a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "checked_yaml": { + "dependency": "transitive", + "description": { + "name": "checked_yaml", + "sha256": "959525d3162f249993882720d52b7e0c833978df229be20702b33d48d91de70f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.4" + }, + "cli_config": { + "dependency": "transitive", + "description": { + "name": "cli_config", + "sha256": "ac20a183a07002b700f0c25e61b7ee46b23c309d76ab7b7640a028f18e4d99ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "cli_util": { + "dependency": "transitive", + "description": { + "name": "cli_util", + "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.2" + }, + "clock": { + "dependency": "transitive", + "description": { + "name": "clock", + "sha256": "fddb70d9b5277016c77a80201021d40a2247104d9f4aa7bab7157b7e3f05b84b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.2" + }, + "code_assets": { + "dependency": "transitive", + "description": { + "name": "code_assets", + "sha256": "83ccdaa064c980b5596c35dd64a8d3ecc68620174ab9b90b6343b753aa721687", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "code_builder": { + "dependency": "transitive", + "description": { + "name": "code_builder", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.11.1" + }, + "collection": { + "dependency": "transitive", + "description": { + "name": "collection", + "sha256": "2f5709ae4d3d59dd8f7cd309b4e023046b57d8a6c82130785d2b0e5868084e76", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.19.1" + }, + "connectivity_plus": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus", + "sha256": "b5e72753cf63becce2c61fd04dfe0f1c430cc5278b53a1342dc5ad839eab29ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5" + }, + "connectivity_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "connectivity_plus_platform_interface", + "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "console": { + "dependency": "transitive", + "description": { + "name": "console", + "sha256": "e04e7824384c5b39389acdd6dc7d33f3efe6b232f6f16d7626f194f6a01ad69a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "convert": { + "dependency": "transitive", + "description": { + "name": "convert", + "sha256": "b30acd5944035672bc15c6b7a8b47d773e41e2f17de064350988c5d02adb1c68", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.2" + }, + "coverage": { + "dependency": "transitive", + "description": { + "name": "coverage", + "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.15.0" + }, + "crop_image": { + "dependency": "transitive", + "description": { + "name": "crop_image", + "sha256": "27cbce1685a595efee62caab81c98b49b636f765c1da86353f58f5b2bf2775d8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.17" + }, + "cross_file": { + "dependency": "transitive", + "description": { + "name": "cross_file", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.5+2" + }, + "crypto": { + "dependency": "transitive", + "description": { + "name": "crypto", + "sha256": "c8ea0233063ba03258fbcf2ca4d6dadfefe14f02fab57702265467a19f27fadf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.7" + }, + "cryptography": { + "dependency": "transitive", + "description": { + "name": "cryptography", + "sha256": "3eda3029d34ec9095a27a198ac9785630fe525c0eb6a49f3d575272f8e792ef0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.0" + }, + "csslib": { + "dependency": "transitive", + "description": { + "name": "csslib", + "sha256": "831883fb353c8bdc1d71979e5b342c7d88acfbc643113c14ae51e2442ea0f20f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.3" + }, + "cupertino_icons": { + "dependency": "transitive", + "description": { + "name": "cupertino_icons", + "sha256": "ba631d1c7f7bef6b729a622b7b752645a2d076dba9976925b8f25725a30e1ee6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.8" + }, + "dart_ipc": { + "dependency": "transitive", + "description": { + "name": "dart_ipc", + "sha256": "6cad558cda5304017c1f581df4c96fd4f8e4ee212aae7bfa4357716236faa9ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "dart_jsonwebtoken": { + "dependency": "transitive", + "description": { + "name": "dart_jsonwebtoken", + "sha256": "0de65691c1d736e9459f22f654ddd6fd8368a271d4e41aa07e53e6301eff5075", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.1" + }, + "dart_style": { + "dependency": "transitive", + "description": { + "name": "dart_style", + "sha256": "7306ab8a2359a48d22310ad823521d723acfed60ee1f7e37388e8986853b6820", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.8" + }, + "dart_webrtc": { + "dependency": "transitive", + "description": { + "name": "dart_webrtc", + "sha256": "4ed7b9fa9924e5a81eb39271e2c2356739dd1039d60a13b86ba6c5f448625086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.7.0" + }, + "dbus": { + "dependency": "transitive", + "description": { + "name": "dbus", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.12" + }, + "desktop_drop": { + "dependency": "transitive", + "description": { + "name": "desktop_drop", + "sha256": "d55a010fe46c8e8fcff4ea4b451a9ff84a162217bdb3b2a0aa1479776205e15d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.4" + }, + "desktop_notifications": { + "dependency": "transitive", + "description": { + "name": "desktop_notifications", + "sha256": "6d92694ad6e9297a862c5ff7dd6b8ff64c819972557754769f819d2209612927", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.3" + }, + "desktop_webview_window": { + "dependency": "direct overridden", + "description": { + "path": "packages/desktop_webview_window", + "ref": "webview-patch", + "resolved-ref": "82c19ad6ee5ac2b2acac6001d3e0cbefb90f1e22", + "url": "https://github.com/commetchat/mixin-flutter-plugins.git" + }, + "source": "git", + "version": "0.2.3" + }, + "device_frame_plus": { + "dependency": "transitive", + "description": { + "name": "device_frame_plus", + "sha256": "ccc94abccd4d9f0a9f19ef239001b3a59896e678ad42601371d7065889f2bf78", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "device_info_plus": { + "dependency": "transitive", + "description": { + "name": "device_info_plus", + "sha256": "98f28b42168cc509abc92f88518882fd58061ea372d7999aecc424345c7bff6a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.5.0" + }, + "device_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "device_info_plus_platform_interface", + "sha256": "e1ea89119e34903dca74b883d0dd78eb762814f97fb6c76f35e9ff74d261a18f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.3" + }, + "drift": { + "dependency": "transitive", + "description": { + "name": "drift", + "sha256": "540cf382a3bfa99b76e51514db5b0ebcd81ce3679b7c1c9cb9478ff3735e47a1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.2" + }, + "drift_dev": { + "dependency": "transitive", + "description": { + "name": "drift_dev", + "sha256": "68c138e884527d2bd61df2ade276c3a144df84d1adeb0ab8f3196b5afe021bd4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.28.0" + }, + "dropdown_button2": { + "dependency": "transitive", + "description": { + "name": "dropdown_button2", + "sha256": "b0fe8d49a030315e9eef6c7ac84ca964250155a6224d491c1365061bc974a9e1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.9" + }, + "dynamic_color": { + "dependency": "transitive", + "description": { + "path": "packages/dynamic_color", + "ref": "HEAD", + "resolved-ref": "f8a2817197fb68bac47bd1067152c46a4ab56cab", + "url": "https://github.com/Airyzz/material-flutter-packages.git" + }, + "source": "git", + "version": "1.7.0" + }, + "ed25519_edwards": { + "dependency": "transitive", + "description": { + "name": "ed25519_edwards", + "sha256": "6ce0112d131327ec6d42beede1e5dfd526069b18ad45dcf654f15074ad9276cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "equatable": { + "dependency": "transitive", + "description": { + "name": "equatable", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.8" + }, + "exif": { + "dependency": "transitive", + "description": { + "name": "exif", + "sha256": "a7980fdb3b7ffcd0b035e5b8a5e1eef7cadfe90ea6a4e85ebb62f87b96c7a172", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.3.0" + }, + "fake_async": { + "dependency": "transitive", + "description": { + "name": "fake_async", + "sha256": "5368f224a74523e8d2e7399ea1638b37aecfca824a3cc4dfdf77bf1fa905ac44", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.3" + }, + "ffi": { + "dependency": "transitive", + "description": { + "name": "ffi", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "file": { + "dependency": "transitive", + "description": { + "name": "file", + "sha256": "a3b4f84adafef897088c160faf7dfffb7696046cb13ae90b508c2cbc95d3b8d4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.1" + }, + "file_picker": { + "dependency": "transitive", + "description": { + "name": "file_picker", + "sha256": "57d9a1dd5063f85fa3107fb42d1faffda52fdc948cefd5fe5ea85267a5fc7343", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "10.3.10" + }, + "file_selector_linux": { + "dependency": "transitive", + "description": { + "name": "file_selector_linux", + "sha256": "2567f398e06ac72dcf2e98a0c95df2a9edd03c2c2e0cacd4780f20cdf56263a0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.4" + }, + "file_selector_macos": { + "dependency": "transitive", + "description": { + "name": "file_selector_macos", + "sha256": "5e0bbe9c312416f1787a68259ea1505b52f258c587f12920422671807c4d618a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.5" + }, + "file_selector_platform_interface": { + "dependency": "transitive", + "description": { + "name": "file_selector_platform_interface", + "sha256": "35e0bd61ebcdb91a3505813b055b09b79dfdc7d0aee9c09a7ba59ae4bb13dc85", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.7.0" + }, + "file_selector_windows": { + "dependency": "transitive", + "description": { + "name": "file_selector_windows", + "sha256": "62197474ae75893a62df75939c777763d39c2bc5f73ce5b88497208bc269abfd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.3+5" + }, + "fixnum": { + "dependency": "transitive", + "description": { + "name": "fixnum", + "sha256": "b6dc7065e46c974bc7c5f143080a6764ec7a4be6da1285ececdc37be96de53be", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "flutter": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_background": { + "dependency": "transitive", + "description": { + "name": "flutter_background", + "sha256": "8dad66e3102da2b4046cc3adcf70625578809827170bd78e36e5890c074287d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0+1" + }, + "flutter_background_service": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service", + "sha256": "70a1c185b1fa1a44f8f14ecd6c86f6e50366e3562f00b2fa5a54df39b3324d3d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.0" + }, + "flutter_background_service_android": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_android", + "sha256": "ca0793d4cd19f1e194a130918401a3d0b1076c81236f7273458ae96987944a87", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.1" + }, + "flutter_background_service_ios": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_ios", + "sha256": "6037ffd45c4d019dab0975c7feb1d31012dd697e25edc05505a4a9b0c7dc9fba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.3" + }, + "flutter_background_service_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_background_service_platform_interface", + "sha256": "ca74aa95789a8304f4d3f57f07ba404faa86bed6e415f83e8edea6ad8b904a41", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.1.2" + }, + "flutter_blurhash": { + "dependency": "transitive", + "description": { + "name": "flutter_blurhash", + "sha256": "5e67678e479ac639069d7af1e133f4a4702311491188ff3e0227486430db0c06", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.2" + }, + "flutter_driver": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_highlighter": { + "dependency": "transitive", + "description": { + "path": "flutter_highlighter", + "ref": "HEAD", + "resolved-ref": "4de60d39c9fe4b828f90a019d0afc89e713c704e", + "url": "https://github.com/commetchat/highlight.git" + }, + "source": "git", + "version": "0.1.1" + }, + "flutter_html": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "1a2539aa10047b557f590abe21e8a5be0a93be70", + "url": "https://github.com/commetchat/flutter_html.git" + }, + "source": "git", + "version": "3.0.0-beta.2" + }, + "flutter_launcher_icons": { + "dependency": "transitive", + "description": { + "name": "flutter_launcher_icons", + "sha256": "526faf84284b86a4cb36d20a5e45147747b7563d921373d4ee0559c54fcdbcea", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.1" + }, + "flutter_local_notifications": { + "dependency": "transitive", + "description": { + "path": "flutter_local_notifications", + "ref": "HEAD", + "resolved-ref": "93f906985388835d24eea13ae6ccd8ee656f2cf1", + "url": "https://github.com/commetchat/flutter_local_notifications.git" + }, + "source": "git", + "version": "19.4.1" + }, + "flutter_local_notifications_linux": { + "dependency": "direct overridden", + "description": { + "path": "flutter_local_notifications_linux", + "ref": "HEAD", + "resolved-ref": "93f906985388835d24eea13ae6ccd8ee656f2cf1", + "url": "https://github.com/commetchat/flutter_local_notifications.git" + }, + "source": "git", + "version": "6.0.0" + }, + "flutter_local_notifications_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_platform_interface", + "sha256": "277d25d960c15674ce78ca97f57d0bae2ee401c844b6ac80fcd972a9c99d09fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.1.0" + }, + "flutter_local_notifications_windows": { + "dependency": "transitive", + "description": { + "name": "flutter_local_notifications_windows", + "sha256": "8d658f0d367c48bd420e7cf2d26655e2d1130147bca1eea917e576ca76668aaf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.3" + }, + "flutter_localizations": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_markdown": { + "dependency": "transitive", + "description": { + "name": "flutter_markdown", + "sha256": "04c4722cc36ec5af38acc38ece70d22d3c2123c61305d555750a091517bbe504", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.23" + }, + "flutter_plugin_android_lifecycle": { + "dependency": "transitive", + "description": { + "name": "flutter_plugin_android_lifecycle", + "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.33" + }, + "flutter_rust_bridge": { + "dependency": "transitive", + "description": { + "name": "flutter_rust_bridge", + "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "flutter_shortcuts_new": { + "dependency": "transitive", + "description": { + "name": "flutter_shortcuts_new", + "sha256": "16ee1c8a9bc9586b5117ebb774a8ff6b396f856743e97251eb483c4dc5769d7f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "flutter_staggered_grid_view": { + "dependency": "transitive", + "description": { + "name": "flutter_staggered_grid_view", + "sha256": "19e7abb550c96fbfeb546b23f3ff356ee7c59a019a651f8f102a4ba9b7349395", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.0" + }, + "flutter_svg": { + "dependency": "transitive", + "description": { + "name": "flutter_svg", + "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.3" + }, + "flutter_test": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_timezone": { + "dependency": "transitive", + "description": { + "name": "flutter_timezone", + "sha256": "978192f2f9ea6d019a4de4f0211d76a9af955ca24865828fa98ca4e20cf0cb3c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.1" + }, + "flutter_vodozemac": { + "dependency": "transitive", + "description": { + "name": "flutter_vodozemac", + "sha256": "ef4c3580a7f2fe8eebb7602c6cba593a42b4a5e5466c372a022f77ccc14914a5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "flutter_web_auth_2": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2", + "sha256": "3c14babeaa066c371f3a743f204dd0d348b7d42ffa6fae7a9847a521aff33696", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "flutter_web_auth_2_platform_interface": { + "dependency": "transitive", + "description": { + "name": "flutter_web_auth_2_platform_interface", + "sha256": "c63a472c8070998e4e422f6b34a17070e60782ac442107c70000dd1bed645f4d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "flutter_web_plugins": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "flutter_webrtc": { + "dependency": "transitive", + "description": { + "name": "flutter_webrtc", + "sha256": "71a38363a5b50603e405c275f30de2eb90f980b0cc94b0e1e9d8b9d6a6b03bf0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "frontend_server_client": { + "dependency": "transitive", + "description": { + "name": "frontend_server_client", + "sha256": "f64a0333a82f30b0cca061bc3d143813a486dc086b574bfb233b7c1372427694", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "fuchsia_remote_debug_protocol": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "fuzzy": { + "dependency": "transitive", + "description": { + "name": "fuzzy", + "sha256": "af5fbd36f2f8de0663a5b562ef5ca209aea957e81a2f0e97f97475cfbed044ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "get_it": { + "dependency": "transitive", + "description": { + "name": "get_it", + "sha256": "1d648d2dd2047d7f7450d5727ca24ee435f240385753d90b49650e3cdff32e56", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.2.0" + }, + "glob": { + "dependency": "transitive", + "description": { + "name": "glob", + "sha256": "c3f1ee72c96f8f78935e18aa8cecced9ab132419e8625dc187e1c2408efc20de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.3" + }, + "graphs": { + "dependency": "transitive", + "description": { + "name": "graphs", + "sha256": "741bbf84165310a68ff28fe9e727332eef1407342fca52759cb21ad8177bb8d0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "highlighter": { + "dependency": "transitive", + "description": { + "name": "highlighter", + "sha256": "92180c72b9da8758e1acf39a45aa305a97dcfe2fdc8f3d1d2947c23f2772bfbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "hooks": { + "dependency": "transitive", + "description": { + "name": "hooks", + "sha256": "7a08a0d684cb3b8fb604b78455d5d352f502b68079f7b80b831c62220ab0a4f6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "hotkey_manager": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager", + "sha256": "06f0655b76c8dd322fb7101dc615afbdbf39c3d3414df9e059c33892104479cd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.3" + }, + "hotkey_manager_linux": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_linux", + "sha256": "83676bda8210a3377bc6f1977f193bc1dbdd4c46f1bdd02875f44b6eff9a8473", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_macos": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_macos", + "sha256": "03b5967e64357b9ac05188ea4a5df6fe4ed4205762cb80aaccf8916ee1713c96", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_platform_interface": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_platform_interface", + "sha256": "98ffca25b8cc9081552902747b2942e3bc37855389a4218c9d50ca316b653b13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "hotkey_manager_windows": { + "dependency": "transitive", + "description": { + "name": "hotkey_manager_windows", + "sha256": "0d03ced9fe563ed0b68f0a0e1b22c9ffe26eb8053cb960e401f68a4f070e0117", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "html": { + "dependency": "transitive", + "description": { + "name": "html", + "sha256": "3a7812d5bcd2894edf53dfaf8cd640876cf6cef50a8f238745c8b8120ea74d3a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.15.4" + }, + "html_unescape": { + "dependency": "transitive", + "description": { + "name": "html_unescape", + "sha256": "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "http": { + "dependency": "transitive", + "description": { + "name": "http", + "sha256": "87721a4a50b19c7f1d49001e51409bddc46303966ce89a65af4f4e6004896412", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.6.0" + }, + "http_multi_server": { + "dependency": "transitive", + "description": { + "name": "http_multi_server", + "sha256": "aa6199f908078bb1c5efb8d8638d4ae191aac11b311132c3ef48ce352fb52ef8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "http_parser": { + "dependency": "transitive", + "description": { + "name": "http_parser", + "sha256": "178d74305e7866013777bab2c3d8726205dc5a4dd935297175b19a23a2e66571", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.2" + }, + "icalendar_parser": { + "dependency": "transitive", + "description": { + "name": "icalendar_parser", + "sha256": "107f936d286723346660df88191888562fc44c2def46ed8858a301a4777ad821", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "image": { + "dependency": "transitive", + "description": { + "name": "image", + "sha256": "f31d52537dc417fdcde36088fdf11d191026fd5e4fae742491ebd40e5a8bea7d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "image_picker": { + "dependency": "transitive", + "description": { + "name": "image_picker", + "sha256": "784210112be18ea55f69d7076e2c656a4e24949fa9e76429fe53af0c0f4fa320", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "image_picker_android": { + "dependency": "transitive", + "description": { + "name": "image_picker_android", + "sha256": "518a16108529fc18657a3e6dde4a043dc465d16596d20ab2abd49a4cac2e703d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+13" + }, + "image_picker_for_web": { + "dependency": "transitive", + "description": { + "name": "image_picker_for_web", + "sha256": "66257a3191ab360d23a55c8241c91a6e329d31e94efa7be9cf7a212e65850214", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.1" + }, + "image_picker_ios": { + "dependency": "transitive", + "description": { + "name": "image_picker_ios", + "sha256": "b9c4a438a9ff4f60808c9cf0039b93a42bb6c2211ef6ebb647394b2b3fa84588", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.8.13+6" + }, + "image_picker_linux": { + "dependency": "transitive", + "description": { + "name": "image_picker_linux", + "sha256": "1f81c5f2046b9ab724f85523e4af65be1d47b038160a8c8deed909762c308ed4", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "image_picker_macos": { + "dependency": "transitive", + "description": { + "name": "image_picker_macos", + "sha256": "86f0f15a309de7e1a552c12df9ce5b59fe927e71385329355aec4776c6a8ec91", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2+1" + }, + "image_picker_platform_interface": { + "dependency": "transitive", + "description": { + "name": "image_picker_platform_interface", + "sha256": "567e056716333a1647c64bb6bd873cff7622233a5c3f694be28a583d4715690c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.11.1" + }, + "image_picker_windows": { + "dependency": "transitive", + "description": { + "name": "image_picker_windows", + "sha256": "d248c86554a72b5495a31c56f060cf73a41c7ff541689327b1a7dbccc33adfae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.2" + }, + "implicitly_animated_list": { + "dependency": "transitive", + "description": { + "name": "implicitly_animated_list", + "sha256": "0912337ba058609ad8b4db8c1886959a4f82e03ee197ecdacbd8bf906bf1e195", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "inspector": { + "dependency": "transitive", + "description": { + "name": "inspector", + "sha256": "a01ea538b15947a9189835cc910041bab91aea3ad7c421684118aa1040189ded", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "integration_test": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "intl": { + "dependency": "transitive", + "description": { + "name": "intl", + "sha256": "3df61194eb431efc39c4ceba583b95633a403f46c9fd341e550ce0bfa50e9aa5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.2" + }, + "intl_translation": { + "dependency": "transitive", + "description": { + "name": "intl_translation", + "sha256": "b3f1ebfab4109d1a946b45c57523628da92a0e2a2df5f2d9981ef4334fd24a26", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.20.1" + }, + "intl_utils": { + "dependency": "transitive", + "description": { + "name": "intl_utils", + "sha256": "35f9a55004871f241e24b07465cf402914992d8549a60205ee0816576a8ddee7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.8.8" + }, + "io": { + "dependency": "transitive", + "description": { + "name": "io", + "sha256": "dfd5a80599cf0165756e3181807ed3e77daf6dd4137caaad72d0b7931597650b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "iso_duration": { + "dependency": "direct main", + "description": { + "name": "iso_duration", + "sha256": "0233fed5e650c0256c1e37f8427f28cb37bb680b948ee845e2c8f1befb0f899b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.1" + }, + "js": { + "dependency": "transitive", + "description": { + "name": "js", + "sha256": "f2c445dce49627136094980615a031419f7f3eb393237e4ecd97ac15dea343f3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.7" + }, + "js_interop": { + "dependency": "transitive", + "description": { + "name": "js_interop", + "sha256": "7ec859c296958ccea34dc770504bd3ff4ae52fdd9e7eeb2bacc7081ad476a1f5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.1" + }, + "js_interop_utils": { + "dependency": "transitive", + "description": { + "name": "js_interop_utils", + "sha256": "f1e05602f23b0f770e45b663a0873f704b5443c064c3fff4ed8acce317b0bd10", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.9" + }, + "json_annotation": { + "dependency": "transitive", + "description": { + "name": "json_annotation", + "sha256": "1ce844379ca14835a50d2f019a3099f419082cfdd231cd86a142af94dd5c6bb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.9.0" + }, + "json_serializable": { + "dependency": "transitive", + "description": { + "name": "json_serializable", + "sha256": "c50ef5fc083d5b5e12eef489503ba3bf5ccc899e487d691584699b4bdefeea8c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.9.5" + }, + "just_the_tooltip": { + "dependency": "transitive", + "description": { + "name": "just_the_tooltip", + "sha256": "7a081133d57285bfb41b331f411006d57b433d7b35772e6155745f6a7a09cb82", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.12" + }, + "launcher_entry": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "0a8a1d13677b531fe271d0457bb79f9e4f55ba9b", + "url": "https://github.com/commetchat/launcher_entry.git" + }, + "source": "git", + "version": "0.1.1" + }, + "leak_tracker": { + "dependency": "transitive", + "description": { + "name": "leak_tracker", + "sha256": "33e2e26bdd85a0112ec15400c8cbffea70d0f9c3407491f672a2fad47915e2de", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.0.2" + }, + "leak_tracker_flutter_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_flutter_testing", + "sha256": "1dbc140bb5a23c75ea9c4811222756104fbcd1a27173f0c34ca01e16bea473c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.10" + }, + "leak_tracker_testing": { + "dependency": "transitive", + "description": { + "name": "leak_tracker_testing", + "sha256": "8d5a2d49f4a66b49744b23b018848400d23e54caf9463f4eb20df3eb8acb2eb1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "lints": { + "dependency": "transitive", + "description": { + "name": "lints", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "list_counter": { + "dependency": "transitive", + "description": { + "name": "list_counter", + "sha256": "c447ae3dfcd1c55f0152867090e67e219d42fe6d4f2807db4bbe8b8d69912237", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "list_diff": { + "dependency": "transitive", + "description": { + "name": "list_diff", + "sha256": "ac2d99c4379d5175f1e4943850808e1bf4d5604fd46c1ec3060e7fb0c0fdab05", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "livekit_client": { + "dependency": "transitive", + "description": { + "name": "livekit_client", + "sha256": "4b8ef07d4acbd21e43a1edfd05932c2d71cc0c433607cefe64afdfe87bb53962", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "logger": { + "dependency": "transitive", + "description": { + "name": "logger", + "sha256": "a7967e31b703831a893bbc3c3dd11db08126fe5f369b5c648a36f821979f5be3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.2" + }, + "logging": { + "dependency": "transitive", + "description": { + "name": "logging", + "sha256": "c8245ada5f1717ed44271ed1c26b8ce85ca3228fd2ffdb75468ab01979309d61", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "markdown": { + "dependency": "direct overridden", + "description": { + "path": "pkgs/markdown", + "ref": "main", + "resolved-ref": "5978dd83f263574a05db478bc1be6ce705517aac", + "url": "https://github.com/Airyzz/dart-lang-tools" + }, + "source": "git", + "version": "7.3.1-wip" + }, + "matcher": { + "dependency": "transitive", + "description": { + "name": "matcher", + "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.12.18" + }, + "material_color_utilities": { + "dependency": "transitive", + "description": { + "name": "material_color_utilities", + "sha256": "9c337007e82b1889149c82ed242ed1cb24a66044e30979c44912381e9be4c48b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.13.0" + }, + "matrix": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "upstream-v6.1.1", + "resolved-ref": "58e0bd24c6a2d74d727dc92a24dc076144fae43b", + "url": "https://github.com/commetchat/matrix-dart-sdk.git" + }, + "source": "git", + "version": "6.1.1" + }, + "matrix_dart_sdk_drift_db": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "upstream-v6.1.1+patch.1", + "resolved-ref": "bb1abba161bd0e7438aa50e4ba8fb46408b69e67", + "url": "https://github.com/commetchat/matrix-dart-sdk-drift-db.git" + }, + "source": "git", + "version": "0.0.1" + }, + "media_kit": { + "dependency": "transitive", + "description": { + "name": "media_kit", + "sha256": "ae9e79597500c7ad6083a3c7b7b7544ddabfceacce7ae5c9709b0ec16a5d6643", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.6" + }, + "media_kit_libs_android_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_android_video", + "sha256": "3f6274e5ab2de512c286a25c327288601ee445ed8ac319e0ef0b66148bd8f76c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.8" + }, + "media_kit_libs_ios_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_ios_video", + "sha256": "b5382994eb37a4564c368386c154ad70ba0cc78dacdd3fb0cd9f30db6d837991", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_linux": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_linux", + "sha256": "2b473399a49ec94452c4d4ae51cfc0f6585074398d74216092bf3d54aac37ecf", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "media_kit_libs_macos_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_macos_video", + "sha256": "f26aa1452b665df288e360393758f84b911f70ffb3878032e1aabba23aa1032d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.4" + }, + "media_kit_libs_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_video", + "sha256": "2b235b5dac79c6020e01eef5022c6cc85fedc0df1738aadc6ea489daa12a92a9", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.7" + }, + "media_kit_libs_windows_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_libs_windows_video", + "sha256": "dff76da2778729ab650229e6b4ec6ec111eb5151431002cbd7ea304ff1f112ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.11" + }, + "media_kit_video": { + "dependency": "transitive", + "description": { + "name": "media_kit_video", + "sha256": "afaa509e7b7e0bf247557a3a740cde903a52c34ace9810f94500e127bd7b043d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.1" + }, + "meta": { + "dependency": "transitive", + "description": { + "name": "meta", + "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.17.0" + }, + "mime": { + "dependency": "transitive", + "description": { + "name": "mime", + "sha256": "801fd0b26f14a4a58ccb09d5892c3fbdeff209594300a542492cf13fba9d247a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.6" + }, + "mime_type": { + "dependency": "transitive", + "description": { + "name": "mime_type", + "sha256": "d652b613e84dac1af28030a9fba82c0999be05b98163f9e18a0849c6e63838bb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "msix": { + "dependency": "transitive", + "description": { + "name": "msix", + "sha256": "b6b08e7a7b5d1845f2b1d31216d5b1fb558e98251efefe54eb79ed00d27bc2ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.16.13" + }, + "native_toolchain_c": { + "dependency": "transitive", + "description": { + "name": "native_toolchain_c", + "sha256": "89e83885ba09da5fdf2cdacc8002a712ca238c28b7f717910b34bcd27b0d03ac", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.17.4" + }, + "nested": { + "dependency": "transitive", + "description": { + "name": "nested", + "sha256": "03bac4c528c64c95c722ec99280375a6f2fc708eec17c7b3f07253b626cd2a20", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "nm": { + "dependency": "transitive", + "description": { + "name": "nm", + "sha256": "2c9aae4127bdc8993206464fcc063611e0e36e72018696cd9631023a31b24254", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "node_preamble": { + "dependency": "transitive", + "description": { + "name": "node_preamble", + "sha256": "6e7eac89047ab8a8d26cf16127b5ed26de65209847630400f9aefd7cd5c730db", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "100a1c87616ab6ed41ec263b083c0ef3261ee6cd1dc3b0f35f8ddfa4f996fe52", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.3.0" + }, + "package_config": { + "dependency": "transitive", + "description": { + "name": "package_config", + "sha256": "f096c55ebb7deb7e384101542bfba8c52696c1b56fca2eb62827989ef2353bbc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "package_info_plus": { + "dependency": "transitive", + "description": { + "name": "package_info_plus", + "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.0.0" + }, + "package_info_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "package_info_plus_platform_interface", + "sha256": "202a487f08836a592a6bd4f901ac69b3a8f146af552bbd14407b6b41e1c3f086", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.1" + }, + "pasteboard": { + "dependency": "transitive", + "description": { + "name": "pasteboard", + "sha256": "1c8b6a8b3f1d12e55d4e9404433cda1b4abe66db6b17bc2d2fb5965772c04674", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "path": { + "dependency": "transitive", + "description": { + "name": "path", + "sha256": "75cca69d1490965be98c73ceaea117e8a04dd21217b37b292c9ddbec0d955bc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.9.1" + }, + "path_parsing": { + "dependency": "transitive", + "description": { + "name": "path_parsing", + "sha256": "883402936929eac138ee0a45da5b0f2c80f89913e6dc3bf77eb65b84b409c6ca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "path_provider": { + "dependency": "transitive", + "description": { + "name": "path_provider", + "sha256": "50c5dd5b6e1aaf6fb3a78b33f6aa3afca52bf903a8a5298f53101fdaee55bbcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.5" + }, + "path_provider_android": { + "dependency": "transitive", + "description": { + "name": "path_provider_android", + "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.22" + }, + "path_provider_foundation": { + "dependency": "transitive", + "description": { + "name": "path_provider_foundation", + "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.6.0" + }, + "path_provider_linux": { + "dependency": "transitive", + "description": { + "name": "path_provider_linux", + "sha256": "f7a1fe3a634fe7734c8d3f2766ad746ae2a2884abe22e241a8b301bf5cac3279", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.1" + }, + "path_provider_platform_interface": { + "dependency": "transitive", + "description": { + "name": "path_provider_platform_interface", + "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "path_provider_windows": { + "dependency": "transitive", + "description": { + "name": "path_provider_windows", + "sha256": "bd6f00dbd873bfb70d0761682da2b3a2c2fccc2b9e84c495821639601d81afe7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "permission_handler": { + "dependency": "transitive", + "description": { + "name": "permission_handler", + "sha256": "59adad729136f01ea9e35a48f5d1395e25cba6cea552249ddbe9cf950f5d7849", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "11.4.0" + }, + "permission_handler_android": { + "dependency": "transitive", + "description": { + "name": "permission_handler_android", + "sha256": "d3971dcdd76182a0c198c096b5db2f0884b0d4196723d21a866fc4cdea057ebc", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "12.1.0" + }, + "permission_handler_apple": { + "dependency": "transitive", + "description": { + "name": "permission_handler_apple", + "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.7" + }, + "permission_handler_html": { + "dependency": "transitive", + "description": { + "name": "permission_handler_html", + "sha256": "38f000e83355abb3392140f6bc3030660cfaef189e1f87824facb76300b4ff24", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3+5" + }, + "permission_handler_platform_interface": { + "dependency": "transitive", + "description": { + "name": "permission_handler_platform_interface", + "sha256": "eb99b295153abce5d683cac8c02e22faab63e50679b937fa1bf67d58bb282878", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.3.0" + }, + "permission_handler_windows": { + "dependency": "transitive", + "description": { + "name": "permission_handler_windows", + "sha256": "1a790728016f79a41216d88672dbc5df30e686e811ad4e698bfc51f76ad91f1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.1" + }, + "petitparser": { + "dependency": "transitive", + "description": { + "name": "petitparser", + "sha256": "07c8f0b1913bcde1ff0d26e57ace2f3012ccbf2b204e070290dad3bb22797646", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.0" + }, + "platform": { + "dependency": "transitive", + "description": { + "name": "platform", + "sha256": "5d6b1b0036a5f331ebc77c850ebc8506cbc1e9416c27e59b439f917a902a4984", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.6" + }, + "plugin_platform_interface": { + "dependency": "transitive", + "description": { + "name": "plugin_platform_interface", + "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.8" + }, + "pointycastle": { + "dependency": "transitive", + "description": { + "name": "pointycastle", + "sha256": "92aa3841d083cc4b0f4709b5c74fd6409a3e6ba833ffc7dc6a8fee096366acf5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.0.0" + }, + "pool": { + "dependency": "transitive", + "description": { + "name": "pool", + "sha256": "978783255c543aa3586a1b3c21f6e9d720eb315376a915872c61ef8b5c20177d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.2" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" + }, + "protobuf": { + "dependency": "transitive", + "description": { + "name": "protobuf", + "sha256": "de9c9eb2c33f8e933a42932fe1dc504800ca45ebc3d673e6ed7f39754ee4053e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.2.0" + }, + "provider": { + "dependency": "transitive", + "description": { + "name": "provider", + "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.1.5+1" + }, + "pub_semver": { + "dependency": "transitive", + "description": { + "name": "pub_semver", + "sha256": "5bfcf68ca79ef689f8990d1160781b4bad40a3bd5e5218ad4076ddb7f4081585", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "pubspec": { + "dependency": "transitive", + "description": { + "name": "pubspec", + "sha256": "f534a50a2b4d48dc3bc0ec147c8bd7c304280fff23b153f3f11803c4d49d927e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "pubspec_dependency_sorter": { + "dependency": "transitive", + "description": { + "name": "pubspec_dependency_sorter", + "sha256": "d2114e92f003195de74a9ed3aeb9c59425ae9b7d637b802bb225b3fe3a4ba605", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "pubspec_parse": { + "dependency": "transitive", + "description": { + "name": "pubspec_parse", + "sha256": "0560ba233314abbed0a48a2956f7f022cce7c3e1e73df540277da7544cad4082", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.5.0" + }, + "quiver": { + "dependency": "transitive", + "description": { + "name": "quiver", + "sha256": "ea0b925899e64ecdfbf9c7becb60d5b50e706ade44a85b2363be2a22d88117d2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "random_string": { + "dependency": "transitive", + "description": { + "name": "random_string", + "sha256": "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "recase": { + "dependency": "transitive", + "description": { + "name": "recase", + "sha256": "e4eb4ec2dcdee52dcf99cb4ceabaffc631d7424ee55e56f280bc039737f89213", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.1.0" + }, + "receive_intent": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "master", + "resolved-ref": "12cb1ef04311ffd7a4ba0f651105a2364c6b2afb", + "url": "https://github.com/daadu/receive_intent" + }, + "source": "git", + "version": "0.2.7" + }, + "resizable_widget": { + "dependency": "transitive", + "description": { + "name": "resizable_widget", + "sha256": "db2919754b93f386b9b3fb15e9f48f6c9d6d41f00a24397629133c99df86606a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.5" + }, + "safe_local_storage": { + "dependency": "transitive", + "description": { + "name": "safe_local_storage", + "sha256": "287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.3" + }, + "screen_retriever": { + "dependency": "transitive", + "description": { + "name": "screen_retriever", + "sha256": "570dbc8e4f70bac451e0efc9c9bb19fa2d6799a11e6ef04f946d7886d2e23d0c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_linux": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_linux", + "sha256": "f7f8120c92ef0784e58491ab664d01efda79a922b025ff286e29aa123ea3dd18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_macos": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_macos", + "sha256": "71f956e65c97315dd661d71f828708bd97b6d358e776f1a30d5aa7d22d78a149", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_platform_interface": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_platform_interface", + "sha256": "ee197f4581ff0d5608587819af40490748e1e39e648d7680ecf95c05197240c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "screen_retriever_windows": { + "dependency": "transitive", + "description": { + "name": "screen_retriever_windows", + "sha256": "449ee257f03ca98a57288ee526a301a430a344a161f9202b4fcc38576716fe13", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "scrollable_positioned_list": { + "dependency": "transitive", + "description": { + "name": "scrollable_positioned_list", + "sha256": "1b54d5f1329a1e263269abc9e2543d90806131aa14fe7c6062a8054d57249287", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.8" + }, + "sdp_transform": { + "dependency": "transitive", + "description": { + "name": "sdp_transform", + "sha256": "73e412a5279a5c2de74001535208e20fff88f225c9a4571af0f7146202755e45", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.2" + }, + "shared_preferences": { + "dependency": "transitive", + "description": { + "name": "shared_preferences", + "sha256": "2939ae520c9024cb197fc20dee269cd8cdbf564c8b5746374ec6cacdc5169e64", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.4" + }, + "shared_preferences_android": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_android", + "sha256": "cbc40be9be1c5af4dab4d6e0de4d5d3729e6f3d65b89d21e1815d57705644a6f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.20" + }, + "shared_preferences_foundation": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_foundation", + "sha256": "4e7eaffc2b17ba398759f1151415869a34771ba11ebbccd1b0145472a619a64f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "shared_preferences_linux": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_linux", + "sha256": "580abfd40f415611503cae30adf626e6656dfb2f0cee8f465ece7b6defb40f2f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_platform_interface": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_platform_interface", + "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shared_preferences_web": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_web", + "sha256": "c49bd060261c9a3f0ff445892695d6212ff603ef3115edbb448509d407600019", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.3" + }, + "shared_preferences_windows": { + "dependency": "transitive", + "description": { + "name": "shared_preferences_windows", + "sha256": "94ef0f72b2d71bc3e700e025db3710911bd51a71cefb65cc609dd0d9a982e3c1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.1" + }, + "shelf": { + "dependency": "transitive", + "description": { + "name": "shelf", + "sha256": "e7dd780a7ffb623c57850b33f43309312fc863fb6aa3d276a754bb299839ef12", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.2" + }, + "shelf_packages_handler": { + "dependency": "transitive", + "description": { + "name": "shelf_packages_handler", + "sha256": "89f967eca29607c933ba9571d838be31d67f53f6e4ee15147d5dc2934fee1b1e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "shelf_static": { + "dependency": "transitive", + "description": { + "name": "shelf_static", + "sha256": "c87c3875f91262785dade62d135760c2c69cb217ac759485334c5857ad89f6e3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.3" + }, + "shelf_web_socket": { + "dependency": "transitive", + "description": { + "name": "shelf_web_socket", + "sha256": "3632775c8e90d6c9712f883e633716432a27758216dfb61bd86a8321c0580925", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.0" + }, + "signal_sticker_api": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "f3295318c27d420f195e00164f104ead9aaa6209", + "resolved-ref": "f3295318c27d420f195e00164f104ead9aaa6209", + "url": "https://github.com/commetchat/signal-sticker-api.git" + }, + "source": "git", + "version": "1.0.0" + }, + "sky_engine": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, + "slugify": { + "dependency": "transitive", + "description": { + "name": "slugify", + "sha256": "b272501565cb28050cac2d96b7bf28a2d24c8dae359280361d124f3093d337c3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_gen": { + "dependency": "transitive", + "description": { + "name": "source_gen", + "sha256": "35c8150ece9e8c8d263337a265153c3329667640850b9304861faea59fc98f6b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.0" + }, + "source_helper": { + "dependency": "transitive", + "description": { + "name": "source_helper", + "sha256": "a447acb083d3a5ef17f983dd36201aeea33fedadb3228fa831f2f0c92f0f3aca", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.7" + }, + "source_map_stack_trace": { + "dependency": "transitive", + "description": { + "name": "source_map_stack_trace", + "sha256": "c0713a43e323c3302c2abe2a1cc89aa057a387101ebd280371d6a6c9fa68516b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.2" + }, + "source_maps": { + "dependency": "transitive", + "description": { + "name": "source_maps", + "sha256": "190222579a448b03896e0ca6eca5998fa810fda630c1d65e2f78b3f638f54812", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.13" + }, + "source_span": { + "dependency": "transitive", + "description": { + "name": "source_span", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.10.2" + }, + "sprintf": { + "dependency": "transitive", + "description": { + "name": "sprintf", + "sha256": "1fc9ffe69d4df602376b52949af107d8f5703b77cda567c4d7d86a0693120f23", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "7.0.0" + }, + "sqflite": { + "dependency": "transitive", + "description": { + "name": "sqflite", + "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_android": { + "dependency": "transitive", + "description": { + "name": "sqflite_android", + "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2+2" + }, + "sqflite_common": { + "dependency": "transitive", + "description": { + "name": "sqflite_common", + "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.5.6" + }, + "sqflite_common_ffi": { + "dependency": "transitive", + "description": { + "name": "sqflite_common_ffi", + "sha256": "8d7b8749a516cbf6e9057f9b480b716ad14fc4f3d3873ca6938919cc626d9025", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.7+1" + }, + "sqflite_darwin": { + "dependency": "transitive", + "description": { + "name": "sqflite_darwin", + "sha256": "279832e5cde3fe99e8571879498c9211f3ca6391b0d818df4e17d9fff5c6ccb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "sqflite_platform_interface": { + "dependency": "transitive", + "description": { + "name": "sqflite_platform_interface", + "sha256": "8dd4515c7bdcae0a785b0062859336de775e8c65db81ae33dd5445f35be61920", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.0" + }, + "sqlite3": { + "dependency": "transitive", + "description": { + "name": "sqlite3", + "sha256": "3145bd74dcdb4fd6f5c6dda4d4e4490a8087d7f286a14dee5d37087290f0f8a2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.9.4" + }, + "sqlite3_flutter_libs": { + "dependency": "transitive", + "description": { + "name": "sqlite3_flutter_libs", + "sha256": "1e800ebe7f85a80a66adacaa6febe4d5f4d8b75f244e9838a27cb2ffc7aec08d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.41" + }, + "sqlparser": { + "dependency": "transitive", + "description": { + "name": "sqlparser", + "sha256": "57090342af1ce32bb499aa641f4ecdd2d6231b9403cea537ac059e803cc20d67", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.41.2" + }, + "stack_trace": { + "dependency": "transitive", + "description": { + "name": "stack_trace", + "sha256": "8b27215b45d22309b5cddda1aa2b19bdfec9df0e765f2de506401c071d38d1b1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.12.1" + }, + "starfield": { + "dependency": "transitive", + "description": { + "path": ".", + "ref": "HEAD", + "resolved-ref": "6e3dee6dd4f56c3d8afb180832c27418d101c86f", + "url": "https://github.com/lagmachine-com/starfield.git" + }, + "source": "git", + "version": "0.0.1" + }, + "stream_channel": { + "dependency": "transitive", + "description": { + "name": "stream_channel", + "sha256": "969e04c80b8bcdf826f8f16579c7b14d780458bd97f56d107d3950fdbeef059d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.4" + }, + "stream_transform": { + "dependency": "transitive", + "description": { + "name": "stream_transform", + "sha256": "ad47125e588cfd37a9a7f86c7d6356dde8dfe89d071d293f80ca9e9273a33871", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.1" + }, + "string_scanner": { + "dependency": "transitive", + "description": { + "name": "string_scanner", + "sha256": "921cd31725b72fe181906c6a94d987c78e3b98c2e205b397ea399d4054872b43", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.1" + }, + "stringr": { + "dependency": "transitive", + "description": { + "name": "stringr", + "sha256": "bcc6e5cef07142673ff454b0fe7ca153e433646c52edf729636980e8a47bd7b7", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "sync_http": { + "dependency": "transitive", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, + "synchronized": { + "dependency": "transitive", + "description": { + "name": "synchronized", + "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.4.0" + }, + "term_glyph": { + "dependency": "transitive", + "description": { + "name": "term_glyph", + "sha256": "7f554798625ea768a7518313e58f83891c7f5024f88e46e7182a4558850a4b8e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.2" + }, + "test": { + "dependency": "transitive", + "description": { + "name": "test", + "sha256": "54c516bbb7cee2754d327ad4fca637f78abfc3cbcc5ace83b3eda117e42cd71a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.29.0" + }, + "test_api": { + "dependency": "transitive", + "description": { + "name": "test_api", + "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.7.9" + }, + "test_core": { + "dependency": "transitive", + "description": { + "name": "test_core", + "sha256": "394f07d21f0f2255ec9e3989f21e54d3c7dc0e6e9dbce160e5a9c1a6be0e2943", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.15" + }, + "timezone": { + "dependency": "transitive", + "description": { + "name": "timezone", + "sha256": "dd14a3b83cfd7cb19e7888f1cbc20f258b8d71b54c06f79ac585f14093a287d1", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.10.1" + }, + "timing": { + "dependency": "transitive", + "description": { + "name": "timing", + "sha256": "62ee18aca144e4a9f29d212f5a4c6a053be252b895ab14b5821996cff4ed90fe", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.2" + }, + "typed_data": { + "dependency": "transitive", + "description": { + "name": "typed_data", + "sha256": "f9049c039ebfeb4cf7a7104a675823cd72dba8297f264b6637062516699fa006", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "uni_platform": { + "dependency": "transitive", + "description": { + "name": "uni_platform", + "sha256": "e02213a7ee5352212412ca026afd41d269eb00d982faa552f419ffc2debfad84", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.3" + }, + "unifiedpush": { + "dependency": "transitive", + "description": { + "name": "unifiedpush", + "sha256": "6dbed5a6305ca33f1865c7a3d814ae39476b79a2d23ca76a5708f023f405730f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.2" + }, + "unifiedpush_android": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_android", + "sha256": "7443dece0a850ae956514f809983eb2b39fc518c2c7d24dbfe817198bec89134", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.0" + }, + "unifiedpush_platform_interface": { + "dependency": "transitive", + "description": { + "name": "unifiedpush_platform_interface", + "sha256": "dd588d78a8b2bfc10430e30035526e98caa543d0b7364a6344b5eb4815721c6d", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, + "universal_html": { + "dependency": "transitive", + "description": { + "name": "universal_html", + "sha256": "56536254004e24d9d8cfdb7dbbf09b74cf8df96729f38a2f5c238163e3d58971", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.4" + }, + "universal_io": { + "dependency": "transitive", + "description": { + "name": "universal_io", + "sha256": "f63cbc48103236abf48e345e07a03ce5757ea86285ed313a6a032596ed9301e2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.1" + }, + "universal_platform": { + "dependency": "transitive", + "description": { + "name": "universal_platform", + "sha256": "64e16458a0ea9b99260ceb5467a214c1f298d647c659af1bff6d3bf82536b1ec", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "unorm_dart": { + "dependency": "transitive", + "description": { + "name": "unorm_dart", + "sha256": "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, + "uri": { + "dependency": "transitive", + "description": { + "name": "uri", + "sha256": "889eea21e953187c6099802b7b4cf5219ba8f3518f604a1033064d45b1b8268a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "uri_parser": { + "dependency": "transitive", + "description": { + "name": "uri_parser", + "sha256": "051c62e5f693de98ca9f130ee707f8916e2266945565926be3ff20659f7853ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.2" + }, + "url_launcher": { + "dependency": "transitive", + "description": { + "name": "url_launcher", + "sha256": "f6a7e5c4835bb4e3026a04793a4199ca2d14c739ec378fdfe23fc8075d0439f8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.2" + }, + "url_launcher_android": { + "dependency": "transitive", + "description": { + "name": "url_launcher_android", + "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.3.28" + }, + "url_launcher_ios": { + "dependency": "transitive", + "description": { + "name": "url_launcher_ios", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.4.1" + }, + "url_launcher_linux": { + "dependency": "transitive", + "description": { + "name": "url_launcher_linux", + "sha256": "d5e14138b3bc193a0f63c10a53c94b91d399df0512b1f29b94a043db7482384a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.2" + }, + "url_launcher_macos": { + "dependency": "transitive", + "description": { + "name": "url_launcher_macos", + "sha256": "368adf46f71ad3c21b8f06614adb38346f193f3a59ba8fe9a2fd74133070ba18", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.2.5" + }, + "url_launcher_platform_interface": { + "dependency": "transitive", + "description": { + "name": "url_launcher_platform_interface", + "sha256": "552f8a1e663569be95a8190206a38187b531910283c3e982193e4f2733f01029", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.3.2" + }, + "url_launcher_web": { + "dependency": "transitive", + "description": { + "name": "url_launcher_web", + "sha256": "d0412fcf4c6b31ecfdb7762359b7206ffba3bbffd396c6d9f9c4616ece476c1f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.4.2" + }, + "url_launcher_windows": { + "dependency": "transitive", + "description": { + "name": "url_launcher_windows", + "sha256": "712c70ab1b99744ff066053cbe3e80c73332b38d46e5e945c98689b2e66fc15f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.5" + }, + "uuid": { + "dependency": "transitive", + "description": { + "name": "uuid", + "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "4.5.2" + }, + "vector_graphics": { + "dependency": "transitive", + "description": { + "name": "vector_graphics", + "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.19" + }, + "vector_graphics_codec": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_codec", + "sha256": "99fd9fbd34d9f9a32efd7b6a6aae14125d8237b10403b422a6a6dfeac2806146", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.13" + }, + "vector_graphics_compiler": { + "dependency": "transitive", + "description": { + "name": "vector_graphics_compiler", + "sha256": "201e876b5d52753626af64b6359cd13ac6011b80728731428fd34bc840f71c9b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.20" + }, + "vector_math": { + "dependency": "transitive", + "description": { + "name": "vector_math", + "sha256": "d530bd74fea330e6e364cda7a85019c434070188383e1cd8d9777ee586914c5b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.2.0" + }, + "vm_service": { + "dependency": "transitive", + "description": { + "name": "vm_service", + "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "15.0.2" + }, + "vodozemac": { + "dependency": "transitive", + "description": { + "name": "vodozemac", + "sha256": "bbe7dd31d7f623e2aeedb92e4b71a8b519e6109ce1e2911b5a220f6752b65cda", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.0" + }, + "wakelock_plus": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus", + "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "wakelock_plus_platform_interface": { + "dependency": "transitive", + "description": { + "name": "wakelock_plus_platform_interface", + "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.3.0" + }, + "watcher": { + "dependency": "transitive", + "description": { + "name": "watcher", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "web": { + "dependency": "transitive", + "description": { + "name": "web", + "sha256": "868d88a33d8a87b18ffc05f9f030ba328ffefba92d6c127917a2ba740f9cfe4a", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.1" + }, + "web_socket": { + "dependency": "transitive", + "description": { + "name": "web_socket", + "sha256": "34d64019aa8e36bf9842ac014bb5d2f5586ca73df5e4d9bf5c936975cae6982c", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" + }, + "web_socket_channel": { + "dependency": "transitive", + "description": { + "name": "web_socket_channel", + "sha256": "d645757fb0f4773d602444000a8131ff5d48c9e47adfe9772652dd1a4f2d45c8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.0.3" + }, + "webdriver": { + "dependency": "transitive", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, + "webkit_inspection_protocol": { + "dependency": "transitive", + "description": { + "name": "webkit_inspection_protocol", + "sha256": "87d3f2333bb240704cd3f1c6b5b7acd8a10e7f0bc28c28dcf14e782014f4a572", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, + "webrtc_interface": { + "dependency": "transitive", + "description": { + "name": "webrtc_interface", + "sha256": "ad0e5786b2acd3be72a3219ef1dde9e1cac071cf4604c685f11b61d63cdd6eb3", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.4.0" + }, + "widgetbook": { + "dependency": "transitive", + "description": { + "name": "widgetbook", + "sha256": "1877019a90c514c69be049255801487ef22fe0a86c33f81fd82c80cabe86d886", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.21.0" + }, + "widgetbook_annotation": { + "dependency": "transitive", + "description": { + "name": "widgetbook_annotation", + "sha256": "c074bcb262e32bfd62038557fd5ed51e88f4d14e24447ed60fa5e57854941dbb", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.10.0" + }, + "widgetbook_generator": { + "dependency": "transitive", + "description": { + "name": "widgetbook_generator", + "sha256": "361f28ae26a4eb9c74625ff1e53eb6a783c8f0e6032baed80de4489da778f955", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.14.0" + }, + "win32": { + "dependency": "transitive", + "description": { + "name": "win32", + "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.15.0" + }, + "win32_registry": { + "dependency": "transitive", + "description": { + "name": "win32_registry", + "sha256": "6f1b564492d0147b330dd794fee8f512cec4977957f310f9951b5f9d83618dae", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + "win_toast": { + "dependency": "transitive", + "description": { + "name": "win_toast", + "sha256": "1e0dc6e1094bc882ed87133e80c12cbe805d72f6faa7ed98795c7ffe7f7ea900", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.4.0" + }, + "window_manager": { + "dependency": "transitive", + "description": { + "name": "window_manager", + "sha256": "7eb6d6c4164ec08e1bf978d6e733f3cebe792e2a23fb07cbca25c2872bfdbdcd", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.5.1" + }, + "window_to_front": { + "dependency": "transitive", + "description": { + "name": "window_to_front", + "sha256": "7aef379752b7190c10479e12b5fd7c0b9d92adc96817d9e96c59937929512aee", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.0.3" + }, + "xdg_directories": { + "dependency": "transitive", + "description": { + "name": "xdg_directories", + "sha256": "7a3f37b05d989967cdddcbb571f1ea834867ae2faa29725fd085180e0883aa15", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.1.0" + }, + "xml": { + "dependency": "transitive", + "description": { + "name": "xml", + "sha256": "b015a8ad1c488f66851d762d3090a21c600e479dc75e68328c52774040cf9226", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "6.5.0" + }, + "yaml": { + "dependency": "transitive", + "description": { + "name": "yaml", + "sha256": "b9da305ac7c39faa3f030eccd175340f968459dae4af175130b3fc47e40d76ce", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.3" + }, + "yaml_writer": { + "dependency": "transitive", + "description": { + "name": "yaml_writer", + "sha256": "69651cd7238411179ac32079937d4aa9a2970150d6b2ae2c6fe6de09402a5dc5", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.1.0" + }, + + "tiamat": { + "dependency": "direct main", + "description": { + "path": "../tiamat", + "relative": true + }, + "source": "path", + "version": "1.0.0+1" + }, + "matrix_widget_api": { + "dependency": "direct main", + "description": { + "path": "../widgets/matrix_widget_api", + "relative": true + }, + "source": "path", + "version": "1.0.0" + }, + "commet_calendar_widget": { + "dependency": "direct main", + "description": { + "path": "../widgets/calendar", + "relative": true + }, + "source": "path", + "version": "1.0.0+1" + } + }, + "sdks": { + "dart": ">=3.10.3 <4.0.0", + "flutter": ">=3.38.4" + } +} diff --git a/pkgs/by-name/co/commitizen/package.nix b/pkgs/by-name/co/commitizen/package.nix index 9bbdda3ad1bd..77411ddb133b 100644 --- a/pkgs/by-name/co/commitizen/package.nix +++ b/pkgs/by-name/co/commitizen/package.nix @@ -12,19 +12,19 @@ python3Packages.buildPythonPackage rec { pname = "commitizen"; - version = "4.13.9"; + version = "4.16.5"; pyproject = true; src = fetchFromGitHub { owner = "commitizen-tools"; repo = "commitizen"; tag = "v${version}"; - hash = "sha256-bT154qRnZCf3StYs+acv4Be/SUCA5ovGjY/j2EDmUEc="; + hash = "sha256-OIaQcdkvLKUgHvlqsVTk9DaIAQUUZiP8BP9z5Xprdfc="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build >= 0.9.17, <0.10.0" "uv-build" + --replace-fail "uv_build >= 0.9.17, <0.12" "uv-build" ''; pythonRelaxDeps = [ @@ -54,6 +54,13 @@ python3Packages.buildPythonPackage rec { tomlkit ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ gitMinimal ]) + ]; + nativeCheckInputs = [ gitMinimal versionCheckHook diff --git a/pkgs/by-name/co/commix/package.nix b/pkgs/by-name/co/commix/package.nix index 3c46fb420986..b218a18532d5 100644 --- a/pkgs/by-name/co/commix/package.nix +++ b/pkgs/by-name/co/commix/package.nix @@ -39,7 +39,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "commix"; homepage = "https://github.com/commixproject/commix"; changelog = "https://github.com/commixproject/commix/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/co/communique/package.nix b/pkgs/by-name/co/communique/package.nix new file mode 100644 index 000000000000..bf46339cb802 --- /dev/null +++ b/pkgs/by-name/co/communique/package.nix @@ -0,0 +1,47 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + cacert, + gitMinimal, + ripgrep, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "communique"; + version = "1.2.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "communique"; + tag = "v${finalAttrs.version}"; + hash = "sha256-lQN6LViO3Ta6eCbU6j76OFN95R6A0hP3Pfc38KrHDng="; + }; + + cargoHash = "sha256-RJzjpDhxpi7Zmzw9kl48yq6//zTYOeJ+SrgAfqq/tl4="; + + nativeCheckInputs = [ + cacert + gitMinimal + ripgrep + ]; + + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Editorialized release notes powered by AI"; + homepage = "https://github.com/jdx/communique"; + changelog = "https://github.com/jdx/communique/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "communique"; + }; +}) diff --git a/pkgs/by-name/co/composer-require-checker/package.nix b/pkgs/by-name/co/composer-require-checker/package.nix index 4a32672c5deb..8eef375c54b3 100644 --- a/pkgs/by-name/co/composer-require-checker/package.nix +++ b/pkgs/by-name/co/composer-require-checker/package.nix @@ -25,7 +25,7 @@ php.buildComposerProject2 (finalAttrs: { description = "CLI tool to check whether a specific composer package uses imported symbols that aren't part of its direct composer dependencies"; homepage = "https://github.com/maglnet/ComposerRequireChecker/"; changelog = "https://github.com/maglnet/ComposerRequireChecker/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "composer-require-checker"; maintainers = [ lib.maintainers.patka ]; }; diff --git a/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch new file mode 100644 index 000000000000..a0b4f0b6ae1d --- /dev/null +++ b/pkgs/by-name/co/compsize/btrfs-progs-6-10-1.patch @@ -0,0 +1,47 @@ +From a471982c82d1917637cce81a084fcd4b02d6e33b Mon Sep 17 00:00:00 2001 +From: David Roman +Date: Mon, 25 Nov 2024 14:10:16 +0100 +Subject: [PATCH] fix build with btrfs-progs >= 6.10.1 + +https://github.com/kilobyte/compsize/pull/54 + +--- + compsize.c | 2 ++ + radix-tree.h | 4 ---- + 2 files changed, 2 insertions(+), 4 deletions(-) + +diff --git a/compsize.c b/compsize.c +index 42ec304..0f533e5 100644 +--- a/compsize.c ++++ b/compsize.c +@@ -5,12 +5,14 @@ + #include + #include + #include ++#include "kerncompat.h" + #include + #include + #include + #include + #include + #include ++#include + #include + #include + #include +diff --git a/radix-tree.h b/radix-tree.h +index bf96d83..d99ea7e 100644 +--- a/radix-tree.h ++++ b/radix-tree.h +@@ -37,11 +37,7 @@ + #ifndef _LINUX_RADIX_TREE_H + #define _LINUX_RADIX_TREE_H + +-#if BTRFS_FLAT_INCLUDES + #include "kerncompat.h" +-#else +-#include +-#endif /* BTRFS_FLAT_INCLUDES */ + + #define RADIX_TREE_MAX_TAGS 2 + diff --git a/pkgs/by-name/co/compsize/package.nix b/pkgs/by-name/co/compsize/package.nix index 10057405e27a..13d736337294 100644 --- a/pkgs/by-name/co/compsize/package.nix +++ b/pkgs/by-name/co/compsize/package.nix @@ -2,49 +2,45 @@ lib, stdenv, fetchFromGitHub, - fetchurl, btrfs-progs, }: -let - # https://github.com/kilobyte/compsize/issues/52 - btrfs-progs' = btrfs-progs.overrideAttrs (old: rec { - pname = "btrfs-progs"; - version = "6.10"; - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - hash = "sha256-M4KoTj/P4f/eoHphqz9OhmZdOPo18fNFSNXfhnQj4N8="; - }; - }); - -in -stdenv.mkDerivation rec { +stdenv.mkDerivation { pname = "compsize"; - version = "1.5"; + version = "1.5-unstable-2023-12-24"; src = fetchFromGitHub { owner = "kilobyte"; repo = "compsize"; - rev = "v${version}"; - sha256 = "sha256-OX41ChtHX36lVRL7O2gH21Dfw6GPPEClD+yafR/PFm8="; + rev = "d79eacf77abe3b799387bb8a4e07a18f1f1031e8"; + sha256 = "sha256-pwHFllwTznhgZAGtGsULoLLBZlCllGt1eBmUKoJ/2wk="; }; - buildInputs = [ btrfs-progs' ]; + patches = [ + ./btrfs-progs-6-10-1.patch + ]; + + __structuredAttrs = true; + strictDeps = true; + enableParallelBuilding = true; + + outputs = [ + "out" + "man" + ]; + + buildInputs = [ btrfs-progs ]; installFlags = [ "PREFIX=${placeholder "out"}" ]; - preInstall = '' - mkdir -p $out/share/man/man8 - ''; - meta = { description = "Find compression type/ratio on a file or set of files in the Btrfs filesystem"; mainProgram = "compsize"; homepage = "https://github.com/kilobyte/compsize"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ sandarukasa ]; platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/co/comrak/package.nix b/pkgs/by-name/co/comrak/package.nix index 7d0102434b68..efb36ff4bd01 100644 --- a/pkgs/by-name/co/comrak/package.nix +++ b/pkgs/by-name/co/comrak/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "comrak"; - version = "0.52.0"; + version = "0.54.0"; src = fetchFromGitHub { owner = "kivikakk"; repo = "comrak"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-MMCA6PfVt9kUvdOKlIBFUxTXEJwNETyxgdPhdXcM/os="; + sha256 = "sha256-nLyGIN5AsWJsi+RPsQqPb2DLeSVF30ZrJAcDTsBV1V8="; }; - cargoHash = "sha256-uHJvkFcKnX3gduTSQokhWwz9ABY94KxIQg7Q7fvyMhk="; + cargoHash = "sha256-CXdjr6ScUN1JehyFDlk1Fji93X5tCF5/fs4obRTBzOU="; meta = { description = "CommonMark-compatible GitHub Flavored Markdown parser and formatter"; diff --git a/pkgs/by-name/co/concord-tui/package.nix b/pkgs/by-name/co/concord-tui/package.nix new file mode 100644 index 000000000000..1071f79addc9 --- /dev/null +++ b/pkgs/by-name/co/concord-tui/package.nix @@ -0,0 +1,53 @@ +{ + rustPlatform, + fetchFromGitHub, + pkg-config, + alsa-lib, + cmake, + opus, + lib, + stdenv, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "concord-tui"; + version = "2.4.5"; + + src = fetchFromGitHub { + owner = "chojs23"; + repo = "concord"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BLfNgIXTTYMr5pFmCBMfu4euKR96GAPLsGTW/AaqJjo="; + }; + + cargoHash = "sha256-jaHDy/5e9BXXLRe3oc9g3JCCSg28bb1d2dMPkPJTkB4="; + + buildInputs = [ + opus + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + nativeBuildInputs = [ + pkg-config + cmake + ]; + + __darwinAllowLocalNetworking = true; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Feature-rich TUI client for Discord, written in Rust"; + homepage = "https://github.com/chojs23/concord"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + Simon-Weij + neo + Br1ght0ne + ]; + mainProgram = "concord"; + }; +}) diff --git a/pkgs/by-name/co/conda/package.nix b/pkgs/by-name/co/conda/package.nix index 16f5322bb1b3..8bd71cb42b5e 100644 --- a/pkgs/by-name/co/conda/package.nix +++ b/pkgs/by-name/co/conda/package.nix @@ -143,7 +143,7 @@ buildFHSEnv { "aarch64-linux" "x86_64-linux" ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jluttine ]; }; } diff --git a/pkgs/by-name/co/conduktor/package.nix b/pkgs/by-name/co/conduktor/package.nix deleted file mode 100644 index ee86a659cacd..000000000000 --- a/pkgs/by-name/co/conduktor/package.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - fetchzip, - jdk11, - openjfx17, - gtk3, - glib, - pango, - cairo, - gdk-pixbuf, - libxtst, - makeBinaryWrapper, - makeDesktopItem, - copyDesktopItems, -}: - -let - openjfx_jdk = openjfx17.override { withWebKit = true; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "conduktor"; - version = "2.24.9"; - - src = fetchzip { - url = "https://github.com/conduktor/builds/releases/download/v${finalAttrs.version}/Conduktor-linux-${finalAttrs.version}.zip"; - hash = "sha256-c9QjlKPZpeJi5YTq4gm+sg7my4EP0LI95AfGguF4ork="; - }; - - nativeBuildInputs = [ - makeBinaryWrapper - copyDesktopItems - ]; - - desktopItems = [ - (makeDesktopItem { - type = "Application"; - name = "conduktor"; - desktopName = "Conduktor"; - genericName = finalAttrs.meta.description; - exec = "conduktor"; - icon = fetchurl { - url = "https://github.com/conduktor/builds/raw/v${finalAttrs.version}/.github/resources/Conduktor.png"; - hash = "sha256-mk4c9ecookRb7gR56cedIWfPfQy2uGF+ZbX6NI90KI0="; - }; - comment = "A beautiful and fully-featured desktop client for Apache Kafka"; - }) - ]; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - cp -r . $out - wrapProgram $out/bin/conduktor \ - --set JAVA_HOME ${jdk11.home} \ - --set LD_LIBRARY_PATH ${ - lib.makeLibraryPath [ - openjfx_jdk - gtk3 - gtk3 - glib - pango - cairo - gdk-pixbuf - libxtst - ] - } \ - --add-flags "--module-path ${openjfx_jdk}/lib --add-modules=javafx.controls,javafx.fxml" - - runHook postInstall - ''; - - meta = { - description = "Apache Kafka Desktop Client"; - longDescription = '' - Conduktor is a GUI over the Kafka ecosystem, to make the development - and management of Apache Kafka clusters as easy as possible. - ''; - homepage = "https://www.conduktor.io/"; - changelog = "https://www.conduktor.io/changelog/#${finalAttrs.version}"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ trobert ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/co/confluencepot/package.nix b/pkgs/by-name/co/confluencepot/package.nix index 87732ffe870b..a5bfaaa3c2fe 100644 --- a/pkgs/by-name/co/confluencepot/package.nix +++ b/pkgs/by-name/co/confluencepot/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { ConfluencePot is a simple honeypot for the Atlassian Confluence unauthenticated and remote OGNL injection vulnerability (CVE-2022-26134). ''; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ fab ]; mainProgram = "confluencepot"; }; diff --git a/pkgs/by-name/co/confluent-cli/package.nix b/pkgs/by-name/co/confluent-cli/package.nix index da338b94344c..8ae7ef9ed628 100644 --- a/pkgs/by-name/co/confluent-cli/package.nix +++ b/pkgs/by-name/co/confluent-cli/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "confluent-cli"; - version = "4.50.0"; + version = "4.70.0"; # To get the latest version: # curl -L https://cnfl.io/cli | sh -s -- -l | grep -v latest | sort -V | tail -n1 @@ -19,17 +19,15 @@ stdenv.mkDerivation (finalAttrs: { system = selectSystem { x86_64-linux = "linux_amd64"; aarch64-linux = "linux_arm64"; - x86_64-darwin = "darwin_amd64"; aarch64-darwin = "darwin_arm64"; }; in fetchurl { url = "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/${finalAttrs.version}/confluent_${finalAttrs.version}_${system}.tar.gz"; hash = selectSystem { - x86_64-linux = "sha256-iBe/swUUHljqKMzJ3iVBrLc7MO0NBq9kmkdfe6+JcFw="; - aarch64-linux = "sha256-RSoztV0dK3Q1v7KqZYhNnu3ov1KhKpx8Cu2GtEl6vyk="; - x86_64-darwin = "sha256-otriw9/kzYA1rKuI+EaCcMY3sSINVMzebA5A9amtSz0="; - aarch64-darwin = "sha256-GRvM0J4yIRrK3vXLfRRplG26E1L7XtRNUsuA+L+dCOo="; + x86_64-linux = "sha256-52zPTIuJOS+MMG1+pA+f0HI7VvBHLsRnSq5zWorHsiQ="; + aarch64-linux = "sha256-hdhMSZR593rcjch4EVdRshC72aTp1c3dTQBlLCDMsVg="; + aarch64-darwin = "sha256-YOVGl47XOvvHDtm2/VzzLOeFCA6sw8BuDHQWZgzNNtE="; }; }; diff --git a/pkgs/by-name/co/confluent-cli/update.sh b/pkgs/by-name/co/confluent-cli/update.sh index e237957438f0..402304aa903e 100755 --- a/pkgs/by-name/co/confluent-cli/update.sh +++ b/pkgs/by-name/co/confluent-cli/update.sh @@ -23,7 +23,6 @@ fi for i in \ "x86_64-linux linux_amd64" \ "aarch64-linux linux_arm64" \ - "x86_64-darwin darwin_amd64" \ "aarch64-darwin darwin_arm64"; do set -- $i hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url "https://s3-us-west-2.amazonaws.com/confluent.cloud/confluent-cli/archives/$latestVersion/confluent_${latestVersion}_$2.tar.gz")) diff --git a/pkgs/by-name/co/confy-tui/package.nix b/pkgs/by-name/co/confy-tui/package.nix new file mode 100644 index 000000000000..ea852b704127 --- /dev/null +++ b/pkgs/by-name/co/confy-tui/package.nix @@ -0,0 +1,36 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "confy-tui"; + version = "3.0.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "phluxjr"; + repo = "confy"; + rev = "v${finalAttrs.version}"; + hash = "sha256-yhzmkIPrOckDxoB10RBX5ul/rYzVKtU6l6O1Zm69e9c="; + }; + + build-system = [ + python3Packages.hatchling + ]; + + postInstall = '' + install -Dm644 confy.1 $out/share/man/man1/confy.1 + ''; + + meta = { + description = "config manager tui for linux/unix systems"; + homepage = "https://github.com/phluxjr/confy"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ phluxjr ]; + mainProgram = "confy"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/co/conmon-rs/package.nix b/pkgs/by-name/co/conmon-rs/package.nix index 1a51e8bada43..624f7eed45aa 100644 --- a/pkgs/by-name/co/conmon-rs/package.nix +++ b/pkgs/by-name/co/conmon-rs/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "conmon-rs"; - version = "0.8.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "containers"; repo = "conmon-rs"; rev = "v${finalAttrs.version}"; - hash = "sha256-3+W+keg+4XwbtQDps/9FRVPtX3yuR2sQbkoSusDiLmA="; + hash = "sha256-aeicug8d5RKFgq7ZSGBN7qY0PvlZcTeMwYMYXTS3Gvw="; }; nativeBuildInputs = [ @@ -23,7 +23,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; doCheck = false; - cargoHash = "sha256-shfufw5Ompcp8rv5tnuojEP7t7r7eGTvomPVoFv2AFE="; + cargoHash = "sha256-8GtwbX+FOE+upKJbQFGv+RJDZHPNMcA5SUTPK6qgrIs="; meta = { description = "OCI container runtime monitor written in Rust"; diff --git a/pkgs/by-name/co/construct/package.nix b/pkgs/by-name/co/construct/package.nix index 90b475994a17..d73419f3ff40 100644 --- a/pkgs/by-name/co/construct/package.nix +++ b/pkgs/by-name/co/construct/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.1.0"; src = fetchFromGitHub { - owner = "Thomas-de-Bock"; + owner = "Thomas-995"; repo = "construct"; rev = finalAttrs.version; hash = "sha256-ENso0y7yEaXzGXzZOnlZ1L7+j/qayJL+f55/NYLz2ew="; @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Abstraction over x86 NASM Assembly"; longDescription = "Construct adds features such as while loops, if statements, scoped macros and function-call syntax to NASM Assembly."; - homepage = "https://github.com/Thomas-de-Bock/construct"; + homepage = "https://github.com/Thomas-995/construct"; maintainers = with lib.maintainers; [ rucadi ]; platforms = lib.platforms.all; license = lib.licenses.mit; diff --git a/pkgs/by-name/co/container/package.nix b/pkgs/by-name/co/container/package.nix index 4e9d69648b62..e084654d9ce8 100644 --- a/pkgs/by-name/co/container/package.nix +++ b/pkgs/by-name/co/container/package.nix @@ -5,23 +5,25 @@ libarchive, xar, installShellFiles, + makeWrapper, versionCheckHook, nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "container"; - version = "0.12.3"; + version = "1.1.0"; src = fetchurl { url = "https://github.com/apple/container/releases/download/${finalAttrs.version}/container-${finalAttrs.version}-installer-signed.pkg"; - hash = "sha256-g/NjEmrB8GRYjeOc1rR0NA1InBkmSSosTlnE1Uqm2OM="; + hash = "sha256-DKHEKiJpwlV++x2CsbOKxVPmo6PaGxF5xDm87h59ZxQ="; }; nativeBuildInputs = [ libarchive xar installShellFiles + makeWrapper ]; dontUnpack = true; @@ -43,6 +45,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { --zsh <($out/bin/${finalAttrs.meta.mainProgram} --generate-completion-script zsh) ''; + postFixup = '' + wrapProgram $out/bin/container \ + --set-default CONTAINER_INSTALL_ROOT "$out" + wrapProgram $out/bin/container-apiserver \ + --set-default CONTAINER_INSTALL_ROOT "$out" + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; @@ -60,6 +69,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "container"; maintainers = with lib.maintainers; [ xiaoxiangmoe + Br1ght0ne ]; platforms = [ "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/co/containerlab/package.nix b/pkgs/by-name/co/containerlab/package.nix index cc56dc199957..256ddd24d07f 100644 --- a/pkgs/by-name/co/containerlab/package.nix +++ b/pkgs/by-name/co/containerlab/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "containerlab"; - version = "0.76.0"; + version = "0.76.1"; src = fetchFromGitHub { owner = "srl-labs"; repo = "containerlab"; tag = "v${finalAttrs.version}"; - hash = "sha256-ULO0I9ixhRKCHI6LT2lWn2wXEIMl87q3PXwus+b3VmM="; + hash = "sha256-1BE3PZvXUYSMvs65MS5kT3xp0P7pPjTXJKq6dEcmKqw="; }; - vendorHash = "sha256-US8y4AlO9fMD7bogIPT6bsrSsUx7c6X1Y0ooHiQ6WUc="; + vendorHash = "sha256-x9G80vupcewg0FtIAnWSTQiPPWDIvfjqSpmmjAradwA="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/co/context7-mcp/package.nix b/pkgs/by-name/co/context7-mcp/package.nix index e128f05231ce..2869d2bac74c 100644 --- a/pkgs/by-name/co/context7-mcp/package.nix +++ b/pkgs/by-name/co/context7-mcp/package.nix @@ -18,13 +18,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "context7-mcp"; - version = "3.0.0"; + version = "3.2.3"; src = fetchFromGitHub { owner = "upstash"; repo = "context7"; tag = "${tag-prefix}@${finalAttrs.version}"; - hash = "sha256-3Hk3YEXIR6SAEtCeDeaU1fU/CyvxuObZSNbgqrzeJ/o="; + hash = "sha256-yyz4UraRm1JR/C7J2ib0nBU6zsNpKCWIWduTu7OlebM="; }; nativeBuildInputs = [ @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-ugUN1U0OR8dPTq4PADJaq6ElngSlw6PlmYDUFoW+2F4="; + hash = "sha256-S+TCwe4FJHjSLTUL/cPh+eRtWx/z7REUyfMNT0BgK7k="; }; buildPhase = '' diff --git a/pkgs/by-name/co/convco/package.nix b/pkgs/by-name/co/convco/package.nix index 9bd51a9efc5b..30a0eea2d75f 100644 --- a/pkgs/by-name/co/convco/package.nix +++ b/pkgs/by-name/co/convco/package.nix @@ -45,7 +45,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Conventional commit cli"; mainProgram = "convco"; homepage = "https://github.com/convco/convco"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ hoverbear cafkafk diff --git a/pkgs/by-name/co/conventional-changelog-cli/package.nix b/pkgs/by-name/co/conventional-changelog-cli/package.nix index 6c2ee732f9fe..90094258fa71 100644 --- a/pkgs/by-name/co/conventional-changelog-cli/package.nix +++ b/pkgs/by-name/co/conventional-changelog-cli/package.nix @@ -15,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "conventional-changelog-cli"; - version = "7.2.0"; + version = "7.2.1"; src = fetchFromGitHub { owner = "conventional-changelog"; repo = "conventional-changelog"; tag = "conventional-changelog-v${finalAttrs.version}"; - hash = "sha256-0Fee2sfLwxfE/MRLMUUMACTGVxnJJF1MPsWWzleVA3c="; + hash = "sha256-1unB4/naGc/V1Fjc7Arn4DjnGvyCdicNFOofdgpvRUI="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-O91ypnycBwkfLSruezx9E5CrytguBdtmvgVhKFjUzvM="; + hash = "sha256-khAAFQeWUkALdkEdjW3tvCi5KiF9lN202yhLcj8ey1o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/convertx/package.nix b/pkgs/by-name/co/convertx/package.nix index 153ab012903a..49dd77cf384f 100644 --- a/pkgs/by-name/co/convertx/package.nix +++ b/pkgs/by-name/co/convertx/package.nix @@ -1,5 +1,5 @@ { - stdenv, + stdenvNoCC, lib, fetchFromGitHub, @@ -43,11 +43,12 @@ let hash = pin.srcHash; }; - node_modules = stdenv.mkDerivation (finalAttrs: { + node_modules = stdenvNoCC.mkDerivation (finalAttrs: { pname = "${pname}-node_modules"; inherit version src; dontConfigure = true; + dontFixup = true; nativeBuildInputs = [ bun @@ -70,11 +71,11 @@ let cp package.json $out/lib ''; - outputHash = pin."${stdenv.system}"; + outputHash = pin."${stdenvNoCC.system}"; outputHashMode = "recursive"; }); in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { inherit pname version src; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/convertx/pin.json b/pkgs/by-name/co/convertx/pin.json index 1fc9e21d094a..928e63882b97 100644 --- a/pkgs/by-name/co/convertx/pin.json +++ b/pkgs/by-name/co/convertx/pin.json @@ -1,6 +1,6 @@ { - "version": "0.17.0", - "srcHash": "sha256-1W7M9BfAh89ntmJW7tNwydwPCkVy5CoddWb2aPPUFds=", - "x86_64-linux": "sha256-7B4ZGGew6isFnz7EoaLyJgO6a66V9ZTKsKxXwVSsnfs=", - "aarch64-linux": "sha256-IoQP9UBd64qecOwmI8oQREgiYCL2pXGjfVx1Ylvd/WA=" + "version": "0.18.0", + "srcHash": "sha256-S8oUU21VOy+4MiWvnEBOSUBuMysYq9H4tQIcEOvLjKw=", + "x86_64-linux": "sha256-rAZROhjbvGg/7aRPlh6yGmPDmbEsYjDHJEVaWXejxts=", + "aarch64-linux": "sha256-yJbwexqwe95XIZ51gbjwpg6cRm5ssJl1qrIS+Vrd+vo=" } diff --git a/pkgs/by-name/co/cook-cli/package.nix b/pkgs/by-name/co/cook-cli/package.nix index bf30ba429f59..b71119b5aee7 100644 --- a/pkgs/by-name/co/cook-cli/package.nix +++ b/pkgs/by-name/co/cook-cli/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cook-cli"; - version = "0.31.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "cooklang"; repo = "cookcli"; rev = "v${finalAttrs.version}"; - hash = "sha256-rn+V93QWeVH0A6SpnFLGYu12BJX9t0vQGdZzZZUDxvM="; + hash = "sha256-r6h7IHYvy3/3OS+6aueHj9ONXSYJ1K7gq7pcNTqN8wY="; }; - cargoHash = "sha256-ZndjB2dE8Pgep1Yog4+yxoJbaZtTUlnwFJMpPqS+CwY="; + cargoHash = "sha256-agUqBXhLsjS1nVRwzuiUZomhcYdiXBLU1xX9xh8zN+c="; # Build without the self-updating feature buildNoDefaultFeatures = true; diff --git a/pkgs/by-name/co/copacetic/package.nix b/pkgs/by-name/co/copacetic/package.nix index a689b45517b6..f1462d0ad0f8 100644 --- a/pkgs/by-name/co/copacetic/package.nix +++ b/pkgs/by-name/co/copacetic/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "copacetic"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "project-copacetic"; repo = "copacetic"; tag = "v${finalAttrs.version}"; - hash = "sha256-pD6AdJ9GfTPVgI/e4zRW4oJjOzpEk9uY4kdEm5yLDrw="; + hash = "sha256-MH3HSbJ+/5vjUrjFZQVf4Qv2+qAezOShxfkAoCJMnFU="; }; vendorHash = "sha256-RKqaIwGDZj91lfbEJHcnG8RhIrixtR0VtieCfZD/rns="; diff --git a/pkgs/by-name/co/cope/package.nix b/pkgs/by-name/co/cope/package.nix index 0c62015faec9..90e296b853c7 100644 --- a/pkgs/by-name/co/cope/package.nix +++ b/pkgs/by-name/co/cope/package.nix @@ -14,6 +14,12 @@ perlPackages.buildPerlPackage { rev = "6d0322a8493361ad32e454b97998df715dbe7b97"; hash = "sha256-VQveV7avM/4nbLroyujJaSoVAP3pXhwrzqzI3eMzxVo="; }; + + postPatch = '' + substituteInPlace lib/App/Cope.pm \ + --replace-warn "feature->import( ':5.10' );" "require feature; feature->import( ':5.10' );" + ''; + nativeBuildInputs = [ makeWrapper ]; buildInputs = with perlPackages; [ @@ -67,6 +73,5 @@ perlPackages.buildPerlPackage { gpl1Plus ]; maintainers = with lib.maintainers; [ deftdawg ]; - broken = true; # requires old Perl we don't ship anymore }; } diff --git a/pkgs/by-name/co/copilot-language-server/package.nix b/pkgs/by-name/co/copilot-language-server/package.nix index fe671d65afe7..229c2156ca93 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.498.0"; + version = "1.526.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-WpZKsi8OgF72cuAxSD4AHJBZkvRsPtveiG5AmaQH320="; + hash = "sha256-T1DYN/mVqISYtNGD1KBitXPgEIcrKQMqxquC7CywDo4="; stripRoot = false; }; @@ -58,7 +58,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/co/copybara/package.nix b/pkgs/by-name/co/copybara/package.nix index 6cf742d7df37..520df6bc94a7 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 = "20260601"; + version = "20260629"; src = fetchurl { url = "https://github.com/google/copybara/releases/download/v${finalAttrs.version}/copybara_deploy.jar"; - hash = "sha256-IH3BaZJG0xF7hKBRUImEbIUV1PVwG6wnQZY8MCuhPX0="; + hash = "sha256-Dm5hySUhVfWwg9lAgXiB/fZnedr/R0VlG44hi6Ms+Vc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/copyparty/package.nix b/pkgs/by-name/co/copyparty/package.nix index c2a4ee2dc0c3..0c30e8233d48 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.20.16"; + version = "1.20.18"; src = fetchurl { url = "https://github.com/9001/copyparty/releases/download/v${version}/copyparty-${version}.tar.gz"; - hash = "sha256-Yl+V1l2VzdaJhRBRjQE5BeZ2bH0q4Oqa59XeyW6J4C0="; + hash = "sha256-6hNHouMLQmEoKsRgnJuER2ipJe7XF6yK8f+HqKMmUI4="; }; pyproject = true; diff --git a/pkgs/by-name/co/coredns/package.nix b/pkgs/by-name/co/coredns/package.nix index 189ab608471b..444657a1a513 100644 --- a/pkgs/by-name/co/coredns/package.nix +++ b/pkgs/by-name/co/coredns/package.nix @@ -6,7 +6,7 @@ installShellFiles, nixosTests, externalPlugins ? [ ], - vendorHash ? "sha256-9LLTgIjOOMvYx4nhy+6X9bEBvqlKeTx//39q+YWXeHw=", + vendorHash ? "sha256-K7cHC6IVawJmlCLR45SKEowXw7SfURIePHzj1LvKS84=", }: let @@ -14,13 +14,13 @@ let in buildGoModule (finalAttrs: { pname = "coredns"; - version = "1.14.3"; + version = "1.14.6"; src = fetchFromGitHub { owner = "coredns"; repo = "coredns"; tag = "v${finalAttrs.version}"; - hash = "sha256-Uk4oWsUxaGdLQzX5JywYzi7pmQHGo06uQdLeOkP4U/s"; + hash = "sha256-3BKXmrsSsDWFl6MT6c5Q8wcQiApO1vG0KeUtJLm89jU="; }; inherit vendorHash; diff --git a/pkgs/by-name/co/corefonts/package.nix b/pkgs/by-name/co/corefonts/package.nix index bf7dc985b2c4..ce3cb273f7f3 100644 --- a/pkgs/by-name/co/corefonts/package.nix +++ b/pkgs/by-name/co/corefonts/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, cabextract, + installFonts, }: let @@ -76,7 +77,10 @@ stdenv.mkDerivation { ) fonts ); - nativeBuildInputs = [ cabextract ]; + nativeBuildInputs = [ + cabextract + installFonts + ]; buildCommand = '' for i in $exes; do @@ -124,7 +128,9 @@ stdenv.mkDerivation { mv webdings.ttf Webdings.ttf.tmp mv Webdings.ttf.tmp Webdings.ttf - install -m444 -Dt $out/share/fonts/truetype *.ttf + # using buildCommand means no phases are run + # so we run the function ourselves + installFonts # Also put the EULA there to be on the safe side. cp ${eula} $out/share/fonts/truetype/eula.html diff --git a/pkgs/by-name/co/cormorant/package.nix b/pkgs/by-name/co/cormorant/package.nix new file mode 100644 index 000000000000..be8f3febb4b0 --- /dev/null +++ b/pkgs/by-name/co/cormorant/package.nix @@ -0,0 +1,43 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cormorant"; + version = "4.002"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "CatharsisFonts"; + repo = "Cormorant"; + tag = "v${finalAttrs.version}"; + hash = "sha256-vYn6MV+P+YVH329NM9tfAsNG8bsgGTJtDLOgnNYRMFk="; + }; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -m444 -Dt $out/share/fonts/truetype fonts/ttf/*.ttf + install -m444 -Dt $out/share/fonts/opentype fonts/otf/*.otf + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Open-source display font family"; + longDescription = "Cormorant is a free display type family developed by Christian Thalmann (Catharsis Fonts)."; + homepage = "https://www.behance.net/gallery/28579883/Cormorant-an-open-source-display-font-family"; + license = lib.licenses.ofl; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ mrbjarksen ]; + }; +}) diff --git a/pkgs/by-name/co/coroot/package.nix b/pkgs/by-name/co/coroot/package.nix index 923b36d20808..e95d0c30f4d3 100644 --- a/pkgs/by-name/co/coroot/package.nix +++ b/pkgs/by-name/co/coroot/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "coroot"; - version = "1.22.0"; + version = "1.24.0"; src = fetchFromGitHub { owner = "coroot"; repo = "coroot"; rev = "v${finalAttrs.version}"; - hash = "sha256-FntRLdYazY/FeZrOp+DEV3eaaVhn5hxlE4dkUGbemTc="; + hash = "sha256-50VB7qONhRQ5FehPH6uemA8+4HZin/vdJ7JmD0S7AEk="; }; - vendorHash = "sha256-npMQah59pJqF6wgD2dlEleneIZbP/atDGEpjjb+KCpI="; + vendorHash = "sha256-P7EXBRG6OYIwaoObqpKBK2n0f6QYphr+DRNLbfysotA="; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/front"; hash = "sha256-5N4dmtKdZgwulqxFHYKhnHOYAg0gnb/rzVVcmzjYFUg="; diff --git a/pkgs/by-name/co/corrosion/package.nix b/pkgs/by-name/co/corrosion/package.nix index ce647cbdf350..9c313f9c1882 100644 --- a/pkgs/by-name/co/corrosion/package.nix +++ b/pkgs/by-name/co/corrosion/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cargo, cmake, rustc, @@ -18,6 +19,14 @@ stdenv.mkDerivation (finalAttrs: { rev = "v${finalAttrs.version}"; hash = "sha256-ppuDNObfKhneD9AlnPAvyCRHKW3BidXKglD1j/LE9CM="; }; + patches = [ + # Fix for this hard to debug issue in dependent packages: + # https://github.com/corrosion-rs/corrosion/issues/588 + (fetchpatch { + url = "https://github.com/corrosion-rs/corrosion/commit/7dab832903ddfb0f644cbd014252d477e692012b.patch"; + hash = "sha256-T9ILTfAd/i63v45YJQsz8F/P3NBwrP1mL2bKNU0NaLw="; + }) + ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/co/cortex-tools/package.nix b/pkgs/by-name/co/cortex-tools/package.nix index 3578775f00cd..84ae824e5c51 100644 --- a/pkgs/by-name/co/cortex-tools/package.nix +++ b/pkgs/by-name/co/cortex-tools/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { version = "0.11.3"; src = fetchFromGitHub { - owner = "grafana"; + owner = "grafana-cold-storage"; repo = "cortex-tools"; tag = "v${finalAttrs.version}"; hash = "sha256-+GWUC+lnCn5Nw2WytSvW/UsIMmMelCCsnKdBCHuue24="; @@ -31,7 +31,7 @@ buildGoModule (finalAttrs: { env.CGO_ENABLED = 0; ldflags = [ - "-X github.com/grafana/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}" + "-X github.com/grafana-cold-storage/cortex-tools/pkg/version.Version=${finalAttrs.src.tag}" "-s" "-w" ]; @@ -60,7 +60,7 @@ buildGoModule (finalAttrs: { versionCheckProgramArg = "version"; meta = { - changelog = "https://github.com/grafana/cortex-tools/releases/tag/${finalAttrs.src.tag}"; + changelog = "https://github.com/grafana-cold-storage/cortex-tools/releases/tag/${finalAttrs.src.tag}"; description = "Tools used for interacting with Cortex, a Prometheus-compatible server"; longDescription = '' Tools used for interacting with Cortex, a horizontally scalable, highly available, multi-tenant, long term Prometheus server: @@ -70,7 +70,7 @@ buildGoModule (finalAttrs: { - logtool: Tool which parses Cortex query-frontend logs and formats them for easy analysis. - e2ealerting: Tool that helps measure how long an alert takes from scrape of sample to Alertmanager notification delivery. ''; - homepage = "https://github.com/grafana/cortex-tools"; + homepage = "https://github.com/grafana-cold-storage/cortex-tools"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.windows ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ videl ]; diff --git a/pkgs/by-name/co/cosign/package.nix b/pkgs/by-name/co/cosign/package.nix index 92a57b76eb3f..3f8b82bf9771 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.6"; + version = "3.1.1"; src = fetchFromGitHub { owner = "sigstore"; repo = "cosign"; rev = "v${finalAttrs.version}"; - hash = "sha256-Flvi+dVb9RcaS5f1X8A8kevfzNbiSyglEYfJfievVfM="; + hash = "sha256-DOsGLU6W0JrUGpthILTZfKv3fC45SlIXkvt+idUn5Tc="; }; buildInputs = lib.optional (stdenv.hostPlatform.isLinux && pivKeySupport) (lib.getDev pcsclite); @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { installShellFiles ]; - vendorHash = "sha256-q9dB54s9LD0klbDW8bWlXmFzPIPrFBcWJrhYRkyKTp0="; + vendorHash = "sha256-AeVvp+6iKiTZ4dWy5kjAS2njI3IU+ANgTdUxOFcihSg="; subPackages = [ "cmd/cosign" diff --git a/pkgs/by-name/co/cosmic-applibrary/package.nix b/pkgs/by-name/co/cosmic-app-library/package.nix similarity index 85% rename from pkgs/by-name/co/cosmic-applibrary/package.nix rename to pkgs/by-name/co/cosmic-app-library/package.nix index 19c352f99649..7ada235b1263 100644 --- a/pkgs/by-name/co/cosmic-applibrary/package.nix +++ b/pkgs/by-name/co/cosmic-app-library/package.nix @@ -10,15 +10,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - pname = "cosmic-applibrary"; - version = "1.0.16"; + pname = "cosmic-app-library"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; - repo = "cosmic-applibrary"; + repo = "cosmic-app-library"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-mzHSLZK6HienbPRPetSj+XbPWCnpihEvMx9W9lJWpbA="; + hash = "sha256-TZncRQer4lXunUwdQ2xDP3DmF5B7UmfhSQvEwVodc98="; }; cargoHash = "sha256-qGx/3w78mgIMqRo1wJA+ULFHWdNW2LKe2Sej4f9KbVs="; @@ -62,7 +62,7 @@ rustPlatform.buildRustPackage (finalAttrs: { }; meta = { - homepage = "https://github.com/pop-os/cosmic-applibrary"; + homepage = "https://github.com/pop-os/cosmic-app-library"; description = "Application Template for the COSMIC Desktop Environment"; license = lib.licenses.gpl3Only; teams = [ lib.teams.cosmic ]; diff --git a/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch new file mode 100644 index 000000000000..d800685e4c23 --- /dev/null +++ b/pkgs/by-name/co/cosmic-applets/dedup-cosmic-settings-daemon.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index bdd37740..c1adcfad 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1514,7 +1514,7 @@ dependencies = [ + [[package]] + name = "cosmic-settings-config" + version = "0.1.0" +-source = "git+https://github.com/pop-os/cosmic-settings-daemon#fa82bdf9fe7b5f5bd6008f32f393efd5e7a71c47" ++source = "git+https://github.com/pop-os/cosmic-settings-daemon#e7936f0d4f01c8c5a436908c7ee9f6ad43e6a7d8" + dependencies = [ + "cosmic-config", + "ron 0.11.0", diff --git a/pkgs/by-name/co/cosmic-applets/package.nix b/pkgs/by-name/co/cosmic-applets/package.nix index 03ac8e1bb998..097703ec410f 100644 --- a/pkgs/by-name/co/cosmic-applets/package.nix +++ b/pkgs/by-name/co/cosmic-applets/package.nix @@ -20,17 +20,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-applets"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-applets"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-o+rEO+IA337fhpq6TsH+UZEN7kb/PqydlKo77NyCRcM="; + hash = "sha256-tygAgaafoU0CnTzKPb00uVaYTieCJ4uNjux3AYyYtXQ="; }; - cargoHash = "sha256-tbGuyqdDTsKYpKxeAuachwbPHTPhmb9Sg3qzxHYosjo="; + cargoPatches = [ + # A different reference to the `cosmic-settings-daemon` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-cosmic-settings-daemon.patch + ]; + + cargoHash = "sha256-81BFu13QmqOq43iN+ORQuktisEFYRrK+wd6diFfSufs="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-bg/package.nix b/pkgs/by-name/co/cosmic-bg/package.nix index e18cef8f3a4f..3ed2a20f6e01 100644 --- a/pkgs/by-name/co/cosmic-bg/package.nix +++ b/pkgs/by-name/co/cosmic-bg/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-bg"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-bg"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-E4OWxoGyRNFcMl7ni7PB6PE0Yl7dE+Wd4JGDMHO94Yw="; + hash = "sha256-r/7eyaUwxXNbfzO+7TCa25JaOefGF/hY+PBHFJtpoiw="; }; postPatch = '' @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "${cosmic-wallpapers}/share/backgrounds/cosmic/orion_nebula_nasa_heic0601a.jpg" ''; - cargoHash = "sha256-xXq8Dckg3YOf2AT9uOZqVfq00FhZp/X5UU8hLmAln1U="; + cargoHash = "sha256-jU6KesqaHnfVZfCtDKrG/pVaJzh3Q5Q6UDMlOoFiLeY="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-comp/package.nix b/pkgs/by-name/co/cosmic-comp/package.nix index b57bf910e0ca..30614e2d04d0 100644 --- a/pkgs/by-name/co/cosmic-comp/package.nix +++ b/pkgs/by-name/co/cosmic-comp/package.nix @@ -20,20 +20,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-comp"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-comp"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3WPZk/o+cfq3wwKEuYejMh+pn2o823m98OO3crFaNX4="; + hash = "sha256-yhgjdkAzUipGAo7Jv9hWlhOb/dLXn1/68yX+tRO6UV4="; }; - cargoHash = "sha256-ki+unf58rXBCpj5PCpBcg/6FWo16+MdPQWae+w1YkJ8="; + cargoHash = "sha256-Yi1nVvWmFzlXxHN01BeeGc9YRqrRoVXTqehisOrGWS0="; + + # Only default feature is systemd + buildNoDefaultFeatures = !useSystemd; separateDebugInfo = true; - __structuredAttrs = true; nativeBuildInputs = [ @@ -51,9 +53,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optional useSystemd systemd; - # Only default feature is systemd - buildNoDefaultFeatures = !useSystemd; - makeFlags = [ "prefix=${placeholder "out"}" "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" diff --git a/pkgs/by-name/co/cosmic-edit/package.nix b/pkgs/by-name/co/cosmic-edit/package.nix index ac6085d05627..543eb1e49d01 100644 --- a/pkgs/by-name/co/cosmic-edit/package.nix +++ b/pkgs/by-name/co/cosmic-edit/package.nix @@ -16,26 +16,27 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-edit"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-edit"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-almnWrJSV5xZoBDEuk0pfMZ/c00e0xpDNTTbcq+NCYM="; + hash = "sha256-w6Os3R//40ED9q6wyiABmIgofdj+WaLZPD/4+1EF7aY="; }; - cargoHash = "sha256-/qcpAR2nvC/MYa5QuCLiZFQgos5SlYtspZsNuMLJFHk="; - - separateDebugInfo = true; - postPatch = '' substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)" ''; + cargoHash = "sha256-/OnmUO7WFXvZPq+0nPe2BKbYZRR0Ku+V8+qeLWnYHPQ="; + + separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ just pkg-config diff --git a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix index 52ce2ebdadf4..ffcf6943eeb8 100644 --- a/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix +++ b/pkgs/by-name/co/cosmic-ext-applet-sysinfo/package.nix @@ -9,13 +9,13 @@ }: rustPlatform.buildRustPackage { pname = "cosmic-ext-applet-sysinfo"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-04"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "cosmic-ext-applet-sysinfo"; - rev = "681dfcf86009a84ae76573726d227f949930225b"; - hash = "sha256-HZZxyAzAwEgGWjPUU6MUhO/yShx423FTpvpImhdjGpk="; + rev = "f00dfa49568f8e9d97cd109fa67045ddc6df78d7"; + hash = "sha256-e/dmBJik953u1JSQwQ+n9A3jTVmcefKSkF+EmXhg73o="; }; cargoHash = "sha256-KVnvyiF2rXb9gio3o+dE9w/zZ5gcad1uEbWHMBC3yDc="; diff --git a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix index 53df717d345e..053aabe84074 100644 --- a/pkgs/by-name/co/cosmic-ext-tweaks/package.nix +++ b/pkgs/by-name/co/cosmic-ext-tweaks/package.nix @@ -26,6 +26,9 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-mC19GLLHrjqYXl052HoNFscz9zzQWVBBm0OxzXoUd8U="; separateDebugInfo = true; + __structuredAttrs = true; + + env.VERGEN_GIT_SHA = finalAttrs.src.tag; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/co/cosmic-files/package.nix b/pkgs/by-name/co/cosmic-files/package.nix index 149956ff852f..b2c4a1676330 100644 --- a/pkgs/by-name/co/cosmic-files/package.nix +++ b/pkgs/by-name/co/cosmic-files/package.nix @@ -12,21 +12,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-files"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-files"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-2vrk1hYL7E/vVWiLcOYY3O0cmYZyFG4bdkNDFuyA+cA="; + hash = "sha256-ZjV5HkVzDHH96OcaHSKKrTJdOSp3NqWHbLgtq/GOQ+M="; }; - cargoHash = "sha256-QPFGsn1J0lp5K4gLdar/Z5MmZg+VOoCZd1U8LUuLXqM="; + cargoHash = "sha256-HWkuWaF2UP5brDW39nq1pn9Zp1XgEUToumuD4MmHhU8="; separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ just libcosmicAppHook diff --git a/pkgs/by-name/co/cosmic-greeter/package.nix b/pkgs/by-name/co/cosmic-greeter/package.nix index 12e59cf25258..39c474e32fcd 100644 --- a/pkgs/by-name/co/cosmic-greeter/package.nix +++ b/pkgs/by-name/co/cosmic-greeter/package.nix @@ -19,26 +19,30 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-greeter"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-greeter"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-+6VOv6z61k48hURq4yRRMIFIE8ZrjYGapO5FybWKQTE="; + hash = "sha256-JaPF2kFXQLumPBn8JFBiaSJ/tP3QqK/hwhy5rZrLuY4="; }; + postPatch = '' + substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' + substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}' + ''; + cargoHash = "sha256-mfY2hsMxBooRjmTB2jgUIKyKHBpGfZ9Qslwv+2aEQyg="; - separateDebugInfo = true; - - env.VERGEN_GIT_SHA = finalAttrs.src.tag; - cargoBuildFlags = [ "--all" ]; + separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ rustPlatform.bindgenHook cmake @@ -66,11 +70,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - postPatch = '' - substituteInPlace src/greeter.rs --replace-fail '/usr/bin/env' '${lib.getExe' coreutils "env"}' - substituteInPlace src/greeter.rs --replace-fail '/usr/bin/orca' '${lib.getExe orca}' - ''; - preFixup = '' libcosmicAppWrapperArgs+=( --prefix PATH : ${lib.makeBinPath [ cosmic-randr ]} diff --git a/pkgs/by-name/co/cosmic-icons/package.nix b/pkgs/by-name/co/cosmic-icons/package.nix index 6009c0bcfc18..db16f91a226a 100644 --- a/pkgs/by-name/co/cosmic-icons/package.nix +++ b/pkgs/by-name/co/cosmic-icons/package.nix @@ -9,14 +9,14 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "cosmic-icons"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-icons"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3owl4M4vRyzjR4v74clyAxpNDu77rieSpYAVYfADHzY="; + hash = "sha256-QUTAYIQ6qAhjZK/9BZjJzTViECLUwO/MyaOqiRb1Ans="; }; __structuredAttrs = true; @@ -24,17 +24,17 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeBuildInputs = [ just ]; + propagatedBuildInputs = [ + pop-icon-theme + hicolor-icon-theme + ]; + justFlags = [ "--set" "prefix" (placeholder "out") ]; - propagatedBuildInputs = [ - pop-icon-theme - hicolor-icon-theme - ]; - dontDropIconThemeCache = true; passthru.updateScript = nix-update-script { diff --git a/pkgs/by-name/co/cosmic-idle/package.nix b/pkgs/by-name/co/cosmic-idle/package.nix index ca17faa2ce2b..03dea1383acd 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.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -26,6 +26,10 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-0tcrOfVT5b57ev3b5F2U78F2QPGFwp94bqFVNyKH0Yk="; }; + postPatch = '' + substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' + ''; + cargoHash = "sha256-wAjFC6qAC3nllbnZf0KVaZTEztNYo6GTvwcp5FYmXLw="; separateDebugInfo = true; @@ -48,10 +52,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - postPatch = '' - substituteInPlace src/main.rs --replace-fail '"/bin/sh"' '"${lib.getExe' bash "sh"}"' - ''; - passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cosmic-initial-setup/package.nix b/pkgs/by-name/co/cosmic-initial-setup/package.nix index 9006fa7e152d..aff99a5238e2 100644 --- a/pkgs/by-name/co/cosmic-initial-setup/package.nix +++ b/pkgs/by-name/co/cosmic-initial-setup/package.nix @@ -14,19 +14,25 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-initial-setup"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-initial-setup"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-3nGPBWYDqPJN99WtzsAVERucwiVAFynuUk2gezZ/RJU="; + hash = "sha256-UABqbmbwW2ZBOO7mq16/h0s55VCWRF2yyf/1TaubC88="; }; - cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY="; + postPatch = '' + # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart + substituteInPlace justfile \ + --replace-fail \ + "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \ + "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry" + ''; - separateDebugInfo = true; + cargoHash = "sha256-DESnl5NjakU4++Ep6CHxDZzHn+o0Gi0eREpXk5BN5iY="; buildFeatures = [ "nixos" ]; @@ -38,8 +44,14 @@ rustPlatform.buildRustPackage (finalAttrs: { # https://github.com/rust-secure-code/cargo-auditable/issues/225 auditable = false; + separateDebugInfo = true; __structuredAttrs = true; + env = { + VERGEN_GIT_SHA = finalAttrs.src.tag; + DISABLE_IF_EXISTS = "/iso/nix-store.squashfs"; + }; + nativeBuildInputs = [ libcosmicAppHook just @@ -52,18 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { udev ]; - postPatch = '' - # Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart - substituteInPlace justfile \ - --replace-fail \ - "autostart-dst := rootdir / 'etc' / 'xdg' / 'autostart' / desktop-entry" \ - "autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry" - ''; - - preFixup = '' - libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]}) - ''; - dontUseJustBuild = true; dontUseJustCheck = true; @@ -76,7 +76,9 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env.DISABLE_IF_EXISTS = "/iso/nix-store.squashfs"; + preFixup = '' + libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]}) + ''; passthru = { tests = { diff --git a/pkgs/by-name/co/cosmic-launcher/package.nix b/pkgs/by-name/co/cosmic-launcher/package.nix index 8b3b14881b5e..3c3c6922aedc 100644 --- a/pkgs/by-name/co/cosmic-launcher/package.nix +++ b/pkgs/by-name/co/cosmic-launcher/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-launcher"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-launcher"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-ZivzjufT2UlPi/En1AjGS8TfeFNdJDfDUd9cb2Begb8="; + hash = "sha256-Dy1sOEe/Cb1wyXHETZ5wJt8IcJMGw19OeDGOhuv4kQg="; }; cargoHash = "sha256-WnZAPQR8hGGNC5S7hPmcGSMs9HrOw4/wqJR151eIgHY="; @@ -26,6 +26,8 @@ rustPlatform.buildRustPackage (finalAttrs: { separateDebugInfo = true; __structuredAttrs = true; + env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; + nativeBuildInputs = [ just libcosmicAppHook @@ -43,8 +45,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env."CARGO_TARGET_${stdenv.hostPlatform.rust.cargoEnvVarTarget}_RUSTFLAGS" = "--cfg tokio_unstable"; - passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cosmic-monitor/package.nix b/pkgs/by-name/co/cosmic-monitor/package.nix new file mode 100644 index 000000000000..f192a0a0264d --- /dev/null +++ b/pkgs/by-name/co/cosmic-monitor/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + just, + libcosmicAppHook, + nixosTests, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cosmic-monitor"; + version = "1.2.0"; + + # nixpkgs-update: no auto update + src = fetchFromGitHub { + owner = "pop-os"; + repo = "cosmic-monitor"; + tag = "epoch-${finalAttrs.version}"; + hash = "sha256-6Iz2CMcw131GrgSsSk2FgnwAnges1yMeEwblrusCc24="; + }; + + cargoHash = "sha256-INILXUO4637bcq51OV+ENJG306kXOrKN8547/RRSG0k="; + + separateDebugInfo = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + just + libcosmicAppHook + rustPlatform.bindgenHook + ]; + + dontUseJustBuild = true; + dontUseJustCheck = true; + + justFlags = [ + "--set" + "prefix" + (placeholder "out") + "--set" + "cargo-target-dir" + "target/${stdenv.hostPlatform.rust.cargoShortTarget}" + ]; + + passthru = { + tests = { + inherit (nixosTests) + cosmic + cosmic-autologin + cosmic-noxwayland + cosmic-autologin-noxwayland + ; + }; + + updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "epoch-(.*)" + ]; + }; + }; + + meta = { + homepage = "https://github.com/pop-os/cosmic-monitor"; + description = "COSMIC System Monitor"; + mainProgram = "cosmic-monitor"; + license = lib.licenses.gpl3Only; + teams = [ lib.teams.cosmic ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/co/cosmic-notifications/package.nix b/pkgs/by-name/co/cosmic-notifications/package.nix index f0ae84bd4110..224f663015f6 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.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { diff --git a/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch b/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch deleted file mode 100644 index 9872e8d69f5f..000000000000 --- a/pkgs/by-name/co/cosmic-osd/deduplicate-cosmic-settings-crate.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 8b6704e..64c1691 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -1104,7 +1104,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-airplane-mode-subscription" - version = "1.0.7" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", -@@ -1150,7 +1150,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-pulse-subscription" - version = "0.1.0" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", -@@ -1162,7 +1162,7 @@ dependencies = [ - [[package]] - name = "cosmic-settings-upower-subscription" - version = "1.0.7" --source = "git+https://github.com/pop-os/cosmic-settings#78644a32e3741f8f80e9b8ce65c3550c85f9c1f8" -+source = "git+https://github.com/pop-os/cosmic-settings#81912bed6cdebe2719e29e6bd1453e7b977acb0e" - dependencies = [ - "futures", - "iced_futures", diff --git a/pkgs/by-name/co/cosmic-osd/package.nix b/pkgs/by-name/co/cosmic-osd/package.nix index 407e63972011..cf0d38e8a3bd 100644 --- a/pkgs/by-name/co/cosmic-osd/package.nix +++ b/pkgs/by-name/co/cosmic-osd/package.nix @@ -15,28 +15,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-osd"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-osd"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-jv28hxhQUcUDLnOwU3xQJwCU+s52pwDNs8Gf4I5Hp9k="; + hash = "sha256-veqkYF2CSwnc1nGIFeZXpfannCQ0RuacvqPVxVsiVDc="; }; - cargoHash = "sha256-YwZXlhggrUddxour+/S1mSL3Fq1mzvFaOHArLSnfPvc="; - - cargoPatches = [ - # A different reference to the `cargo-settings` crate was added in: - # - # Remove this patch once upstream fixes their lockfile. - ./deduplicate-cosmic-settings-crate.patch - ]; + cargoHash = "sha256-aweq4E2bwqRpetakpR0OqTsIsoJK6h4eRzMdBhGuIoU="; separateDebugInfo = true; __structuredAttrs = true; + env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; + nativeBuildInputs = [ just libcosmicAppHook @@ -62,8 +57,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env.POLKIT_AGENT_HELPER_1 = "/run/wrappers/bin/polkit-agent-helper-1"; - passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cosmic-panel/package.nix b/pkgs/by-name/co/cosmic-panel/package.nix index b003608effc0..566ad2f386f0 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.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-panel"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-MNOS7HMlyvU4zCZVINthgZgBsUn+LI1hUAEcwSq+zaE="; + hash = "sha256-DKwmZnTxsYCWAkLb9AXoHBa8m6Z5Gi1Jb7AuxZqq7RA="; }; cargoHash = "sha256-6E+bAi1f6gOZh64wyvLMKZiZNlMexPV+ZzS3riOx9xM="; diff --git a/pkgs/by-name/co/cosmic-player/package.nix b/pkgs/by-name/co/cosmic-player/package.nix index 549cdb52346d..030ff794d867 100644 --- a/pkgs/by-name/co/cosmic-player/package.nix +++ b/pkgs/by-name/co/cosmic-player/package.nix @@ -1,3 +1,7 @@ +# SPDX-License-Identifier: MIT +# SPDX-FileCopyrightText: Lily Foster +# Portions of this code are adapted from nixos-cosmic +# https://github.com/lilyinstarlight/nixos-cosmic { lib, stdenv, @@ -18,21 +22,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-player"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-player"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-iDEyR+P+iXShH0YFtqxvPbbs9kgtYvAsuKchB6plnKI="; + hash = "sha256-4oIfTsEGMVmgS0VWLnQ1xAcPAzBeYaGT8xU3b/ObeO8="; }; - cargoHash = "sha256-YzT16Ej+AyLLj8uHuHxZvHWujcW8jLjVg/4MmPyorH4="; + cargoHash = "sha256-aY5QYZ1OjiCHgfFysTTU6Wp/1IexAWjuZCkTFuFY1PI="; separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ just pkg-config @@ -40,9 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; - # Largely based on lilyinstarlight's work linked below - # https://github.com/lilyinstarlight/nixos-cosmic/blob/main/pkgs/cosmic-player/package.nix - buildInputs = [ alsa-lib ffmpeg @@ -67,8 +70,12 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - postInstall = '' + preFixup = '' libcosmicAppWrapperArgs+=(--prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0") + + substituteInPlace $out/share/thumbnailers/com.system76.CosmicPlayer.thumbnailer \ + --replace-fail "TryExec=cosmic-player" "TryExec=$out/bin/cosmic-player" \ + --replace-fail "Exec=cosmic-player" "Exec=$out/bin/cosmic-player" ''; passthru = { diff --git a/pkgs/by-name/co/cosmic-protocols/package.nix b/pkgs/by-name/co/cosmic-protocols/package.nix index 177d299c7550..1edaf703cb23 100644 --- a/pkgs/by-name/co/cosmic-protocols/package.nix +++ b/pkgs/by-name/co/cosmic-protocols/package.nix @@ -9,21 +9,22 @@ stdenv.mkDerivation { pname = "cosmic-protocols"; - version = "0-unstable-2026-05-08"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-protocols"; - rev = "c253ec1d6804afbcdf250f5cc37ae1194bba7bd2"; - hash = "sha256-KO7VTxomhrnwzFlkkXSoP0eh3NRShBD4srW5W6temxo="; + rev = "e95d89504513e1407f89a189aca328fbecc9eeef"; + hash = "sha256-u1Ur9lPm2HE60jCEJVhKtbGYfzV8pdiDjrsGwgKf3nA="; }; __structuredAttrs = true; strictDeps = true; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; nativeBuildInputs = [ wayland-scanner ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cosmic-randr/package.nix b/pkgs/by-name/co/cosmic-randr/package.nix index 4679dec4c858..84d0cf9deac1 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.16"; + version = "1.2.0"; # 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 3fd07573578c..f3aa6f97e8e5 100644 --- a/pkgs/by-name/co/cosmic-reader/package.nix +++ b/pkgs/by-name/co/cosmic-reader/package.nix @@ -33,6 +33,8 @@ rustPlatform.buildRustPackage (finalAttrs: { separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.rev; + nativeBuildInputs = [ just libcosmicAppHook @@ -64,7 +66,11 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env.VERGEN_GIT_SHA = finalAttrs.src.rev; + postInstall = '' + substituteInPlace $out/share/thumbnailers/com.system76.CosmicReader.thumbnailer \ + --replace-fail "TryExec=cosmic-reader" "TryExec=$out/bin/cosmic-reader" \ + --replace-fail "Exec=cosmic-reader" "Exec=$out/bin/cosmic-reader" + ''; passthru.updateScript = nix-update-script { extraArgs = [ diff --git a/pkgs/by-name/co/cosmic-screenshot/package.nix b/pkgs/by-name/co/cosmic-screenshot/package.nix index b5aa22076ca3..d9d1e9486e6b 100644 --- a/pkgs/by-name/co/cosmic-screenshot/package.nix +++ b/pkgs/by-name/co/cosmic-screenshot/package.nix @@ -11,14 +11,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-screenshot"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-screenshot"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-DngKZDKfgVdSZLZAsPq+7p4r/go2Y6141LrCNGoxD1E="; + hash = "sha256-RYvc/3FoRnNkuYBVfCG75Bmfb8JWW1H4GKXyhq7CxaQ="; }; cargoHash = "sha256-q0RJST1yeqPBjU5MseNZIrZw+brfDtQLKiw7wyViflE="; diff --git a/pkgs/by-name/co/cosmic-session/package.nix b/pkgs/by-name/co/cosmic-session/package.nix index b5507b5bd6af..859af85aec04 100644 --- a/pkgs/by-name/co/cosmic-session/package.nix +++ b/pkgs/by-name/co/cosmic-session/package.nix @@ -12,33 +12,35 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-session"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-session"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-FphY53MaOUUR2oQfZak3HbT+kvysUnw2AIc4L9O+TcU="; + hash = "sha256-nKrdjvD1dcFvwhCiruM/bxrh8CYOWnoVgJj/2nkfEFg="; }; + postPatch = '' + substituteInPlace data/start-cosmic \ + --replace-fail '/usr/bin/cosmic-session' "$out/bin/cosmic-session" \ + --replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session" + substituteInPlace data/cosmic.desktop \ + --replace-fail '/usr/bin/start-cosmic' "$out/bin/start-cosmic" + ''; + cargoHash = "sha256-5dLG40X+yxJo566guyHqOCLNp+uNSE+HONS8GIDm58A="; separateDebugInfo = true; - - postPatch = '' - substituteInPlace data/start-cosmic \ - --replace-fail '/usr/bin/cosmic-session' "${placeholder "out"}/bin/cosmic-session" \ - --replace-fail '/usr/bin/dbus-run-session' "${lib.getBin dbus}/bin/dbus-run-session" - substituteInPlace data/cosmic.desktop \ - --replace-fail '/usr/bin/start-cosmic' "${placeholder "out"}/bin/start-cosmic" - ''; - __structuredAttrs = true; - buildInputs = [ bash ]; + env.ORCA = "orca"; # get orca from $PATH + nativeBuildInputs = [ just ]; + buildInputs = [ bash ]; + dontUseJustBuild = true; justFlags = [ @@ -53,8 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; - env.ORCA = "orca"; # get orca from $PATH - passthru = { providedSessions = [ "cosmic" ]; tests = { diff --git a/pkgs/by-name/co/cosmic-settings-daemon/package.nix b/pkgs/by-name/co/cosmic-settings-daemon/package.nix index 00c546752bc5..a3bb39a29310 100644 --- a/pkgs/by-name/co/cosmic-settings-daemon/package.nix +++ b/pkgs/by-name/co/cosmic-settings-daemon/package.nix @@ -7,6 +7,7 @@ adw-gtk3, pkg-config, libpulseaudio, + pipewire, libinput, udev, openssl, @@ -16,14 +17,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings-daemon"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings-daemon"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-A+nOAadFWU+KRW54dP2WW6P6fabIs4z1AqC37LSZjUI="; + hash = "sha256-cCxcIRrLvCxWDujXuREukkxZ0qPl3SH4n1VWAR1c/QY="; }; postPatch = '' @@ -33,18 +34,22 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '/usr/share/themes/adw-gtk3' '${adw-gtk3}/share/themes/adw-gtk3' ''; - cargoHash = "sha256-bz+JasI3WE30sKKgjofVO/42Ml4YY9Dw3JxnZmZVQk4="; + cargoHash = "sha256-rpyMdwmcddsrXuIOI5T6Kh9+cB28DdUxotiqpeGqvCc="; separateDebugInfo = true; __structuredAttrs = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + ]; buildInputs = [ libinput libpulseaudio openssl udev + pipewire ]; makeFlags = [ diff --git a/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch new file mode 100644 index 000000000000..00d00905de3b --- /dev/null +++ b/pkgs/by-name/co/cosmic-settings/dedup-libcosmic.patch @@ -0,0 +1,112 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 46d491a..ea60cd9 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1774,7 +1774,7 @@ dependencies = [ + [[package]] + name = "cosmic-theme" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "almost", + "configparser", +@@ -3158,7 +3158,7 @@ dependencies = [ + [[package]] + name = "iced" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "dnd", + "iced_accessibility", +@@ -3214,7 +3214,7 @@ dependencies = [ + [[package]] + name = "iced_debug" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_core", + "iced_futures", +@@ -3238,7 +3238,7 @@ dependencies = [ + [[package]] + name = "iced_graphics" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bitflags 2.12.1", + "bytemuck", +@@ -3259,7 +3259,7 @@ dependencies = [ + [[package]] + name = "iced_program" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_runtime", +@@ -3268,7 +3268,7 @@ dependencies = [ + [[package]] + name = "iced_renderer" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "iced_graphics", + "iced_tiny_skia", +@@ -3280,7 +3280,7 @@ dependencies = [ + [[package]] + name = "iced_runtime" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytes", + "cosmic-client-toolkit", +@@ -3296,7 +3296,7 @@ dependencies = [ + [[package]] + name = "iced_tiny_skia" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "bytemuck", + "cosmic-text", +@@ -3313,7 +3313,7 @@ dependencies = [ + [[package]] + name = "iced_wgpu" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "as-raw-xcb-connection", + "bitflags 2.12.1", +@@ -3344,7 +3344,7 @@ dependencies = [ + [[package]] + name = "iced_widget" + version = "0.14.2" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "dnd", +@@ -3364,7 +3364,7 @@ dependencies = [ + [[package]] + name = "iced_winit" + version = "0.14.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "cosmic-client-toolkit", + "cursor-icon", +@@ -4455,7 +4455,7 @@ checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" + [[package]] + name = "libcosmic" + version = "1.0.0" +-source = "git+https://github.com/pop-os/libcosmic#f0f68933f1552857e2165fc0fa953228107bddef" ++source = "git+https://github.com/pop-os/libcosmic#a991d7bb433f67016c1473e8e4a03691ededd75a" + dependencies = [ + "apply", + "ashpd 0.12.3", diff --git a/pkgs/by-name/co/cosmic-settings/package.nix b/pkgs/by-name/co/cosmic-settings/package.nix index 513089a3af67..bfdc70e203c6 100644 --- a/pkgs/by-name/co/cosmic-settings/package.nix +++ b/pkgs/by-name/co/cosmic-settings/package.nix @@ -27,17 +27,23 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-settings"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-settings"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-knA3qpFeRRlUMV91+LleaWxb1fexX2IJlMRD81fl7l4="; + hash = "sha256-zs8QJc8bLbLLj1lqLsxdgkVOLIHqk+fOEyNEEmViv0g="; }; - cargoHash = "sha256-2ZHuOmtBzXQ/KSBMKus9LbojfByYzzCjIkbGY8C85bU="; + cargoPatches = [ + # A different reference to the `libcosmic` crate was added + # Remove this patch once upstream fixes their lockfile. + ./dedup-libcosmic.patch + ]; + + cargoHash = "sha256-rYjizOCcLJ4aq3UB5xEwWq5+KvrSi5PCUTIwUM/wegM="; separateDebugInfo = true; __structuredAttrs = true; diff --git a/pkgs/by-name/co/cosmic-store/package.nix b/pkgs/by-name/co/cosmic-store/package.nix index 25c9ad72ac4a..3b69f04cdeb8 100644 --- a/pkgs/by-name/co/cosmic-store/package.nix +++ b/pkgs/by-name/co/cosmic-store/package.nix @@ -15,21 +15,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-store"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-store"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-JE8LcFlhG4e3QqobzUNfCw3Eg10+FrlVuQu+J+96/es="; + hash = "sha256-DqkYwbEph6GJM9Gok/XaiIFyWnv0+W+geviyzrXmQ8I="; }; - cargoHash = "sha256-+lOt+mSTKKsSm3UzGXq43ZjbktiCCV8dnHdvnnx2vqA="; + cargoHash = "sha256-IuMCYUZWtzvGyLMNb+Kwoj6M9fKaEYFMfcfYYVggVYw="; separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ just pkg-config diff --git a/pkgs/by-name/co/cosmic-term/package.nix b/pkgs/by-name/co/cosmic-term/package.nix index 168b9b41beeb..9de1e442d300 100644 --- a/pkgs/by-name/co/cosmic-term/package.nix +++ b/pkgs/by-name/co/cosmic-term/package.nix @@ -15,21 +15,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-term"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-term"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-nDTDGtaGRW0JM48/tbWO/NK1WhGkPwlsqfWrDGvFE9A="; + hash = "sha256-0LGbe9oOwkNKU3XboEeZfi3isRbX95rIu+/VWWf6N68="; }; - cargoHash = "sha256-0W1TU1NIcV9fx/vgKpPLqLO1fcdtbZX5Ds1uQWGJ2C8="; + cargoHash = "sha256-JJQ+CLSaqdqTWcbb/Oj6a1vjIHXIYQsmMn+PtmHt0Gc="; separateDebugInfo = true; __structuredAttrs = true; + env.VERGEN_GIT_SHA = finalAttrs.src.tag; + nativeBuildInputs = [ just pkg-config diff --git a/pkgs/by-name/co/cosmic-wallpapers/package.nix b/pkgs/by-name/co/cosmic-wallpapers/package.nix index e7763090dc3c..3e7195bebfd8 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.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { @@ -19,11 +19,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-m2cYppfitpBDKK8CC9i/lUrC9rfSYTuqUSZSyIKKGyg="; }; - makeFlags = [ "prefix=${placeholder "out"}" ]; - __structuredAttrs = true; strictDeps = true; + makeFlags = [ "prefix=${placeholder "out"}" ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" diff --git a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix index 24e5785fc668..f4b3c8100cd2 100644 --- a/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix +++ b/pkgs/by-name/co/cosmic-workspaces-epoch/package.nix @@ -14,20 +14,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cosmic-workspaces-epoch"; - version = "1.0.16"; + version = "1.2.0"; # nixpkgs-update: no auto update src = fetchFromGitHub { owner = "pop-os"; repo = "cosmic-workspaces-epoch"; tag = "epoch-${finalAttrs.version}"; - hash = "sha256-u4p22qpxZPdBogzrJXGomqGGxgkpD0hdXf+3YNg2VIo="; + hash = "sha256-riiveHFtRF3rtOhbbUtfYRoAlqc7TCRr8aer0dgBY7g="; }; cargoHash = "sha256-Z5dC3W8QoDBZWBjHwRj9MC8EScDjQwUiUcOPTRDToDA="; separateDebugInfo = true; - __structuredAttrs = true; nativeBuildInputs = [ @@ -41,13 +40,13 @@ rustPlatform.buildRustPackage (finalAttrs: { udev ]; - dontCargoInstall = true; - makeFlags = [ "prefix=${placeholder "out"}" "CARGO_TARGET_DIR=target/${stdenv.hostPlatform.rust.cargoShortTarget}" ]; + dontCargoInstall = true; + passthru = { tests = { inherit (nixosTests) diff --git a/pkgs/by-name/co/cotp/package.nix b/pkgs/by-name/co/cotp/package.nix index 90a02b0f215e..2ae611954eb4 100644 --- a/pkgs/by-name/co/cotp/package.nix +++ b/pkgs/by-name/co/cotp/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cotp"; - version = "1.9.10"; + version = "1.10.0"; src = fetchFromGitHub { owner = "replydev"; repo = "cotp"; rev = "v${finalAttrs.version}"; - hash = "sha256-yVzVo4l2bMZXrWlDfJXSgHUmic7Fe0Og+I5ROv3iQCQ="; + hash = "sha256-L/HxdNufqmNZ8pF8tQ1VuOJIz+pEQN5IRpmg2+QTYos="; }; - cargoHash = "sha256-M0lI/DAMUVRMNbvoLc2w7PtU0rjjXiMYZM6vzfdEi0s="; + cargoHash = "sha256-Es9X9PDFeluHtPrOImLhWUstrawopX5yShdN0G7TuzI="; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libxcb ]; diff --git a/pkgs/by-name/co/coturn/package.nix b/pkgs/by-name/co/coturn/package.nix index 70befe6306cb..24eaad35921a 100644 --- a/pkgs/by-name/co/coturn/package.nix +++ b/pkgs/by-name/co/coturn/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "coturn"; - version = "4.9.0"; + version = "4.13.1"; src = fetchFromGitHub { owner = "coturn"; repo = "coturn"; tag = finalAttrs.version; - hash = "sha256-NSdmz5ZkzgP+kP6iutYX8+l1b4ErgB+kicskTn6OlRE="; + hash = "sha256-66bPrw/jUleEOKBBdNDa8qyxxQCiLk5saTnUQfDdTak="; }; nativeBuildInputs = [ @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { description = "TURN server"; homepage = "https://coturn.net/"; changelog = "https://github.com/coturn/coturn/blob/${finalAttrs.version}/ChangeLog"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ _0x4A6F ]; broken = stdenv.hostPlatform.isDarwin; # 2018-10-21 diff --git a/pkgs/by-name/co/coulomb/package.nix b/pkgs/by-name/co/coulomb/package.nix index 62ebb35f1ce8..66705cdd84e2 100644 --- a/pkgs/by-name/co/coulomb/package.nix +++ b/pkgs/by-name/co/coulomb/package.nix @@ -16,6 +16,8 @@ gdk-pixbuf, atk, cairo, + adwaita-icon-theme, + librsvg, }: stdenv.mkDerivation (finalAttrs: { @@ -51,6 +53,8 @@ stdenv.mkDerivation (finalAttrs: { gdk-pixbuf atk cairo + adwaita-icon-theme + librsvg ]; mitmCache = gradle.fetchDeps { @@ -75,14 +79,15 @@ stdenv.mkDerivation (finalAttrs: { cp -r app/build/resources/main/icons/vector/* $out/share/icons/ cp app/build/resources/main/icons/vector/light/coulomb.svg $out/share/icons/hicolor/scalable/apps/io.github.hamza_algohary.Coulomb.svg - makeWrapper ${jdk21_headless}/bin/java $out/bin/coulomb \ - --add-flags "-Djava.library.path=${lib.makeLibraryPath finalAttrs.buildInputs}" \ - --add-flags "-jar $out/share/coulomb/app-all.jar" \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ - ''${gappsWrapperArgs[@]} - runHook postInstall ''; + postFixup = '' + makeWrapper ${jdk21_headless}/bin/java $out/bin/coulomb \ + --add-flags "-Djava.library.path=${lib.makeLibraryPath finalAttrs.buildInputs}" \ + --add-flags "-jar $out/share/coulomb/app-all.jar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" \ + ''${gappsWrapperArgs[@]} + ''; passthru.updateScript = nix-update-script { }; @@ -90,7 +95,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Simple and beautiful circuit simulator app"; homepage = "https://github.com/hamza-algohary/Coulomb"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ thtrf ]; + maintainers = with lib.maintainers; [ + thtrf + _0xSA7 + ]; platforms = lib.platforms.linux; mainProgram = "coulomb"; }; diff --git a/pkgs/by-name/co/courier-unicode/package.nix b/pkgs/by-name/co/courier-unicode/package.nix index 899fae0fe2c9..3f1b1b84b7a2 100644 --- a/pkgs/by-name/co/courier-unicode/package.nix +++ b/pkgs/by-name/co/courier-unicode/package.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "courier-unicode"; - version = "2.5.0"; + version = "2.6.0"; src = fetchurl { url = "mirror://sourceforge/courier/courier-unicode/${finalAttrs.version}/courier-unicode-${finalAttrs.version}.tar.bz2"; - hash = "sha256-Xsp6U2UWEg745d5gFOaQcRvGs/saG9V9LxkDxU3ts+A="; + hash = "sha256-Cu0jScW2LeDTPM+MI1J6rkHa+VoDyAVMiN5Prvjaigg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/co/coze/package.nix b/pkgs/by-name/co/coze/package.nix index e542ab01e109..a2019e841897 100644 --- a/pkgs/by-name/co/coze/package.nix +++ b/pkgs/by-name/co/coze/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "Cyphrme"; - repo = "Coze_cli"; + repo = "CozeCLI"; rev = "v${finalAttrs.version}"; hash = "sha256-/Cznx5Q0a9vVrC4oAoBmAkejT1505AQzzCW/wi3itv4="; }; @@ -24,8 +24,8 @@ buildGoModule (finalAttrs: { meta = { description = "CLI client for Coze, a cryptographic JSON messaging specification"; mainProgram = "coze"; - homepage = "https://github.com/Cyphrme/coze_cli"; - license = with lib.licenses; [ bsd3 ]; + homepage = "https://github.com/Cyphrme/CozeCLI"; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ qbit ]; }; }) diff --git a/pkgs/by-name/cp/cp2k/package.nix b/pkgs/by-name/cp/cp2k/package.nix index ac1b21918707..42775a325526 100644 --- a/pkgs/by-name/cp/cp2k/package.nix +++ b/pkgs/by-name/cp/cp2k/package.nix @@ -26,7 +26,7 @@ pkg-config, plumed, zlib, - hdf5-fortran, + hdf5-fortran-mpi, sirius, libvdwxc, spla, @@ -131,13 +131,16 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cp2k"; - version = "2025.2"; + version = "2026.1-unstable-2026-06-16"; + + strictDeps = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "cp2k"; repo = "cp2k"; - rev = "v${finalAttrs.version}"; - hash = "sha256-vfl5rCoFeGtYuZ7LcsVsESjKxFbN5IYDvBSzOqsd64w="; + rev = "c28f603b5956aa638ef130b21b091da4e3a17639"; + hash = "sha256-LIghR2gCYbJDux4bFfeKCi+a+VDVbjcZfcVpYwjPkEg="; fetchSubmodules = true; }; @@ -157,8 +160,11 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config gfortran + mpi ] - ++ lib.optional (gpuBackend == "cuda") cudaPackages.cuda_nvcc; + ++ lib.optionals (gpuBackend == "cuda") [ + cudaPackages.cuda_nvcc + ]; buildInputs = [ fftw @@ -175,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { dbcsr plumed zlib - hdf5-fortran + hdf5-fortran-mpi spla spfft libvdwxc @@ -191,6 +197,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableElpa elpa ++ lib.optionals (gpuBackend == "cuda") [ cudaPackages.cuda_cudart + cudaPackages.libcufft cudaPackages.libcublas cudaPackages.cuda_nvrtc ] @@ -207,9 +214,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs tools exts/dbcsr/tools/build_utils exts/dbcsr/.cp2k - substituteInPlace exts/build_dbcsr/Makefile \ - --replace '/usr/bin/env python3' '${python3}/bin/python' \ - --replace 'SHELL = /bin/sh' 'SHELL = bash' ''; cmakeFlags = [ diff --git a/pkgs/by-name/cp/cpat/format-security.patch b/pkgs/by-name/cp/cpat/format-security.patch new file mode 100644 index 000000000000..d5c2eda85a99 --- /dev/null +++ b/pkgs/by-name/cp/cpat/format-security.patch @@ -0,0 +1,44 @@ +diff --git a/src/cpat.c b/src/cpat.c +index 4bb5dec..6aeeca3 100644 +--- a/src/cpat.c ++++ b/src/cpat.c +@@ -126,10 +126,10 @@ pager(char *title,char* text,int num_phrases, char **phrases) + + /* Add title and header lines */ + wattron(outer,A_UNDERLINE); +- mvwprintw(outer,2,4,title); ++ mvwprintw(outer,2,4,"%s",title); + xtermtitle(title); + wattroff(outer,A_UNDERLINE); +- for (i = 0;i < num_phrases;i++) mvwprintw(outer,4+i,4,phrases[i]); ++ for (i = 0;i < num_phrases;i++) mvwprintw(outer,4+i,4,"%s",phrases[i]); + wrefresh(outer); + + /* Values for inner window */ +@@ -244,10 +244,10 @@ d Scroll forward half a page\n\ + q Exit pager",-1,NULL); + box(outer,0,0); + wattron(outer,A_UNDERLINE); +- mvwprintw(outer,2,4,title); ++ mvwprintw(outer,2,4,"%s",title); + xtermtitle(title); + wattroff(outer,A_UNDERLINE); +- for (i = 0;i < num_phrases;i++) mvwprintw(outer,4+i,4,phrases[i]); ++ for (i = 0;i < num_phrases;i++) mvwprintw(outer,4+i,4,"%s",phrases[i]); + wrefresh(outer); + prev_line = -1; /* force page refresh */ + break; +@@ -354,11 +354,11 @@ menu(char *title,char **queries,int num_queries, + box(outer, 0, 0); + + wattron(outer,A_UNDERLINE); +- mvwprintw(outer,title_y,4,title); ++ mvwprintw(outer,title_y,4,"%s",title); + xtermtitle(title); + wattroff(outer,A_UNDERLINE); + for (i = 0;i < num_phrases;i++) +- mvwprintw(outer,phrases_y+i,6,phrases[i]); ++ mvwprintw(outer,phrases_y+i,6,"%s",phrases[i]); + wrefresh(outer); + + input = newwin(inner_h,inner_w,inner_y,inner_x); diff --git a/pkgs/by-name/cp/cpat/package.nix b/pkgs/by-name/cp/cpat/package.nix new file mode 100644 index 000000000000..f8c4e312bcc7 --- /dev/null +++ b/pkgs/by-name/cp/cpat/package.nix @@ -0,0 +1,32 @@ +{ + lib, + stdenv, + fetchurl, + ncurses, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "cpat"; + version = "1.4.2"; + + src = fetchurl { + url = "https://downloads.sourceforge.net/project/cpat/v1.4.2/cpat-${finalAttrs.version}.tar.gz"; + hash = "sha256-viVbaU21tI4lU+0WoSzRW81aUPzCIkJKjJR/BPEFO2c="; + }; + + __structuredAttrs = true; + strictDeps = true; + + patches = [ ./format-security.patch ]; + + buildInputs = [ ncurses ]; + + meta = { + description = "A curses based card games application"; + homepage = "https://sourceforge.net/projects/cpat/"; + mainProgram = "cpat"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ castorNova2 ]; + }; +}) diff --git a/pkgs/by-name/cp/cpc/package.nix b/pkgs/by-name/cp/cpc/package.nix index 8fedfbcbd1d5..3e33b00e435c 100644 --- a/pkgs/by-name/cp/cpc/package.nix +++ b/pkgs/by-name/cp/cpc/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cpc"; - version = "3.0.0"; + version = "4.0.0"; src = fetchFromGitHub { owner = "probablykasper"; repo = "cpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-DjJIXV5rJxQOiMH8/0yZQBvDh+jbejzADt4WSGyhozI="; + hash = "sha256-Gd2bFOyPERcwTGurJJDMNrRjFq7smtkgFMGUXxZVwaI="; }; - cargoHash = "sha256-2k+aFrP/PQmlGr3gIF1queDjuo/+3KtnrOrx1+wrqEg="; + cargoHash = "sha256-visApJ3DgQ1ohaQ2IE63bzdf0RuQI4NnpQqspP8WKjg="; meta = { mainProgram = "cpc"; diff --git a/pkgs/by-name/cp/cpcm-x/cmake-config-find-numsa.patch b/pkgs/by-name/cp/cpcm-x/cmake-config-find-numsa.patch new file mode 100644 index 000000000000..3e54583533ff --- /dev/null +++ b/pkgs/by-name/cp/cpcm-x/cmake-config-find-numsa.patch @@ -0,0 +1,15 @@ +diff --git a/config/config.cmake.in b/config/config.cmake.in +index e5e4f6b..d41c070 100644 +--- a/config/config.cmake.in ++++ b/config/config.cmake.in +@@ -23,6 +23,10 @@ if(NOT TARGET "@PROJECT_NAME@::@PROJECT_NAME@") + + include(CMakeFindDependencyMacro) + ++ if(NOT TARGET "numsa::numsa") ++ find_dependency("numsa" REQUIRED) ++ endif() ++ + if(NOT TARGET "mctc-lib::mctc-lib") + find_dependency("mctc-lib" REQUIRED) + endif() diff --git a/pkgs/by-name/cp/cpcm-x/package.nix b/pkgs/by-name/cp/cpcm-x/package.nix new file mode 100644 index 000000000000..7a5049365423 --- /dev/null +++ b/pkgs/by-name/cp/cpcm-x/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + buildType ? "meson", + + gfortran, + pkg-config, + python3, + meson, + ninja, + cmake, + + # buildInputs + blas, + lapack, + test-drive, + + # propagatedBuildInputs + mctc-lib, + numsa, + toml-f, + + nix-update-script, +}: + +assert ( + builtins.elem buildType [ + "meson" + "cmake" + ] +); +stdenv.mkDerivation (finalAttrs: { + pname = "cpcm-x"; + version = "1.1.0"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "grimme-lab"; + repo = "CPCM-X"; + tag = "v${finalAttrs.version}"; + hash = "sha256-FyPUECbcqUHoGq1LASvPF4qSUKQ5N/y1itq8e2wGliE="; + }; + + patches = [ + # The installed CMake package config links numsa::numsa transitively but + # never re-discovers it, so consumers fail with "target numsa::numsa not + # found". Add the missing find_dependency call. + ./cmake-config-find-numsa.patch + ]; + + postPatch = '' + substituteInPlace config/install-mod.py \ + --replace-fail "/usr/bin/env python" "${lib.getExe python3}" + ''; + + outputs = [ + "out" + "dev" + ]; + + nativeBuildInputs = [ + gfortran + pkg-config + python3 + ] + ++ lib.optionals (buildType == "meson") [ + meson + ninja + ] + ++ lib.optionals (buildType == "cmake") [ + cmake + ]; + + buildInputs = [ + blas + lapack + # only needed to build the bundled test suite + test-drive + ]; + + propagatedBuildInputs = [ + mctc-lib + numsa + toml-f + ]; + + doCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Extended conductor-like polarizable continuum solvation model"; + homepage = "https://github.com/grimme-lab/CPCM-X"; + changelog = "https://github.com/grimme-lab/CPCM-X/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.lgpl3; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "cpx"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/cp/cpond/package.nix b/pkgs/by-name/cp/cpond/package.nix new file mode 100644 index 000000000000..95fb3e96bd1b --- /dev/null +++ b/pkgs/by-name/cp/cpond/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + ncurses, +}: +stdenv.mkDerivation { + pname = "cpond"; + version = "0-unstable-2025-11-23"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "ayuzur"; + repo = "cpond"; + rev = "b6d2827c73080b144ff07a70ec61757baff6a73b"; + hash = "sha256-feRGJ2CIa82eEiGG65WwFlh6dhhIvhW70FJMObWvi1Q="; + }; + + buildInputs = [ ncurses ]; + + postPatch = '' + substituteInPlace Makefile \ + --replace-fail '$(eflags)$(ncursesw_macros)' '$(eflags) $(ncursesw_macros)' + '' + + lib.optionalString stdenv.isDarwin '' + substituteInPlace Makefile \ + --replace-fail '-lncursesw' '-lncurses' + ''; + + installPhase = '' + mkdir -p $out/bin + cp cpond $out/bin/ + ''; + + meta = { + homepage = "https://github.com/ayuzur/cpond"; + description = "Procedurally animated fish for your terminal"; + license = lib.licenses.mit; + mainProgram = "cpond"; + maintainers = with lib.maintainers; [ yarn ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/cp/cpp-interop/package.nix b/pkgs/by-name/cp/cpp-interop/package.nix new file mode 100644 index 000000000000..1360b19794f9 --- /dev/null +++ b/pkgs/by-name/cp/cpp-interop/package.nix @@ -0,0 +1,192 @@ +{ + lib, + fetchFromGitHub, + cmake, + ninja, + python3, + llvmPackages_21, + cling, + gcc-unwrapped, + libffi, + libxml2, + ncurses, + zlib, + zstd, + + # tests + gtest, + + # Which interpreter backend to build against. CppInterOp can use either + # clang-repl (from upstream LLVM/Clang) or Cling. They are mutually exclusive. + backend ? "clang-repl", # "clang-repl" | "cling" +}: + +let + llvmPackages = llvmPackages_21; + inherit (llvmPackages) stdenv; + + useCling = backend == "cling"; + llvm = llvmPackages.llvm; + clang = llvmPackages.clang-unwrapped; + + # For the cling backend we build against the LLVM/Clang/Cling that ship inside + # `cling` itself (its LLVM 20 fork), so the ABI matches libcling. The CMake + # config packages (LLVM, Clang, Cling) all live under cling.unwrapped. + clingRoot = cling.unwrapped; + + # The Clang resource dir and standard-library include flags the JIT interpreter + # needs, since there is no system compiler to probe in the Nix sandbox. Both + # this package's own tests and xeus-cpp (via passthru) feed these to CppInterOp + # through CPPINTEROP_EXTRA_INTERPRETER_ARGS. The resource dir must match the + # Clang that CppInterOp was built against: the cling fork for the cling backend, + # upstream LLVM otherwise. -nostdinc(++) makes the search hermetic: only the + # -isystem paths below are used, never any stray host include dirs. + resourceDir = + if useCling then + "${clingRoot}/lib/clang/20" + else + "${lib.getLib clang}/lib/clang/${lib.versions.major llvm.version}"; + interpreterArgs = [ + "-nostdinc" + "-nostdinc++" + "-resource-dir" + resourceDir + "-isystem" + "${resourceDir}/include" + "-isystem" + "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}" + "-isystem" + "${gcc-unwrapped}/include/c++/${gcc-unwrapped.version}/${stdenv.hostPlatform.config}" + "-isystem" + "${lib.getDev stdenv.cc.libc}/include" + ]; +in + +assert lib.assertOneOf "backend" backend [ + "clang-repl" + "cling" +]; + +stdenv.mkDerivation (finalAttrs: { + pname = "cpp-interop-${backend}"; + version = "1.9.0"; + + src = fetchFromGitHub { + owner = "compiler-research"; + repo = "CppInterOp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-am2WObER9dlNQU/VMTY2ScMe/w8c4N8m/DVyNwHiBnw="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + cmake + ninja + python3 + ]; + + buildInputs = [ + libffi + libxml2 + ncurses + zlib + zstd + ] + ++ ( + if useCling then + [ clingRoot ] + else + [ + llvm + clang + ] + ); + + # Upstream's unittests/CMakeLists.txt only fetches GoogleTest over the network + # (forbidden in the sandbox) when no gtest target exists; point it at the + # nixpkgs gtest instead so the tests can build offline. + postPatch = '' + substituteInPlace unittests/CMakeLists.txt \ + --replace-fail "include(GoogleTest)" "find_package(GTest REQUIRED)" + ''; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_SHARED_LIBS" true) + (lib.cmakeBool "CPPINTEROP_USE_CLING" useCling) + (lib.cmakeBool "CPPINTEROP_USE_REPL" (!useCling)) + (lib.cmakeBool "CPPINTEROP_ENABLE_TESTING" finalAttrs.finalPackage.doCheck) + ] + ++ ( + if useCling then + [ + "-DCling_DIR=${clingRoot}/lib/cmake/cling" + "-DLLVM_DIR=${clingRoot}/lib/cmake/llvm" + "-DClang_DIR=${clingRoot}/lib/cmake/clang" + ] + else + [ + "-DLLVM_DIR=${llvm.dev}/lib/cmake/llvm" + "-DClang_DIR=${clang.dev}/lib/cmake/clang" + ] + ); + + # Run the upstream GoogleTest suite. Only the clang-repl backend is exercised; + # the Cling backend skips many of these tests upstream. + doCheck = !useCling; + checkInputs = [ gtest ]; + checkPhase = '' + runHook preCheck + + export CPPINTEROP_EXTRA_INTERPRETER_ARGS="${lib.concatStringsSep " " interpreterArgs}" + # Upstream registers the tests only in the unittests subdir; its + # check-cppinterop target builds them and runs ctest from the right place. + ninja check-cppinterop + + runHook postCheck + ''; + + # Smoke test: drive the backend to JIT-compile and run a function, proving + # the installed library, headers and runtime linking all work together. + doInstallCheck = !useCling; + installCheckPhase = '' + runHook preInstallCheck + + cat > smoke.cpp <<'EOF' + #include "CppInterOp/CppInterOp.h" + #include + int main() { + Cpp::CreateInterpreter(); + if (Cpp::Declare("int square(int x) { return x * x; }") != 0) return 1; + bool hadError = false; + intptr_t result = Cpp::Evaluate("square(7)", &hadError); + if (hadError) return 2; + if (result != 49) { std::printf("expected 49, got %ld\n", (long)result); return 3; } + if (Cpp::GetNamed("square") == nullptr) return 4; + return 0; + } + EOF + + $CXX -std=c++17 smoke.cpp -I$out/include -L$out/lib -lclangCppInterOp -o smoke + LD_LIBRARY_PATH=$out/lib ./smoke + + runHook postInstallCheck + ''; + + passthru = { + inherit backend resourceDir interpreterArgs; + }; + + meta = { + description = "Clang-based C++ interoperability library (${backend} backend)"; + homepage = "https://github.com/compiler-research/CppInterOp"; + changelog = "https://github.com/compiler-research/CppInterOp/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + asl20 + llvm-exception + ]; + maintainers = with lib.maintainers; [ thomasjm ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix index 0dae81d299c6..5b46ca14a230 100644 --- a/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix +++ b/pkgs/by-name/cp/cpp-ipfs-http-client/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; # The last successful Darwin Hydra build was in 2023 broken = stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/cp/cpp-utilities/package.nix b/pkgs/by-name/cp/cpp-utilities/package.nix index 3702d496aca3..f27ac571e801 100644 --- a/pkgs/by-name/cp/cpp-utilities/package.nix +++ b/pkgs/by-name/cp/cpp-utilities/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cpp-utilities"; - version = "5.34.1"; + version = "5.34.2"; src = fetchFromGitHub { owner = "Martchus"; repo = "cpp-utilities"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-QzmjE0a89fdc6ueuZbg5JtoP74HRaE6VQ5N4hVoXhyI="; + sha256 = "sha256-8nmbA8DGQfP55GD1EETGeeJHQb6Wjs+3uvqOH9AYjZc="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/cp/cppcheck/package.nix b/pkgs/by-name/cp/cppcheck/package.nix index 2af1ab22eff4..79042f948c70 100644 --- a/pkgs/by-name/cp/cppcheck/package.nix +++ b/pkgs/by-name/cp/cppcheck/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "cppcheck"; - version = "2.21.0"; + version = "2.21.1"; outputs = [ "out" @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "cppcheck-opensource"; repo = "cppcheck"; tag = finalAttrs.version; - hash = "sha256-y7P25ThLC54IwuMIc4UGt9bz1HoafB0/b2rus28GcGo="; + hash = "sha256-kpolGzSk+1lY8EXFciAimhUlv7we3bMbu2/Y0DlO4YU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cp/cppcodec/package.nix b/pkgs/by-name/cp/cppcodec/package.nix index 5dba1db7c538..494537a4abd7 100644 --- a/pkgs/by-name/cp/cppcodec/package.nix +++ b/pkgs/by-name/cp/cppcodec/package.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ panicgh - raitobezarius ]; }; }) diff --git a/pkgs/by-name/cp/cpplint/package.nix b/pkgs/by-name/cp/cpplint/package.nix index f28a21289b99..44c42719e0bf 100644 --- a/pkgs/by-name/cp/cpplint/package.nix +++ b/pkgs/by-name/cp/cpplint/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchFromGitHub, + fetchpatch2, versionCheckHook, }: @@ -17,6 +18,20 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-4crTuqynQt8Nyjqea6DpREtLy7ydRF0hNVnc7tUnO1k="; }; + # Fix Python 3.14 test failures. Remove with the next release. + patches = [ + (fetchpatch2 { + name = "drop-codecs-open.patch"; + url = "https://github.com/cpplint/cpplint/commit/89bff410afed72e58d23ae084de4103986ea8630.patch?full_index=1"; + hash = "sha256-Jdeewj3GM7GMoRF7+Qz/9n1hc8PYPcXLgtSGwSUpT1E="; + }) + (fetchpatch2 { + name = "use-universal-newlines.patch"; + url = "https://github.com/cpplint/cpplint/commit/d15a8715a6e848f784fda700758c4ac2d252fd31.patch?full_index=1"; + hash = "sha256-Oo2doknEGnuxDJA0y17n1DCaKwadtMW/14a5wnIgfkw="; + }) + ]; + # We use pytest-cov-stub instead postPatch = '' substituteInPlace pyproject.toml \ @@ -41,6 +56,6 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Static code checker for C++"; changelog = "https://github.com/cpplint/cpplint/releases/tag/${finalAttrs.version}"; mainProgram = "cpplint"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; }; }) diff --git a/pkgs/by-name/cp/cppzmq/package.nix b/pkgs/by-name/cp/cppzmq/package.nix index d8284a40bc62..850690aabbfb 100644 --- a/pkgs/by-name/cp/cppzmq/package.nix +++ b/pkgs/by-name/cp/cppzmq/package.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/zeromq/cppzmq"; license = lib.licenses.bsd2; description = "C++ binding for 0MQ"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + panicgh + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch b/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch new file mode 100644 index 000000000000..a5644516fd5c --- /dev/null +++ b/pkgs/by-name/cp/cpufetch/darwin-x86-sysctl.patch @@ -0,0 +1,11 @@ +--- a/Makefile ++++ b/Makefile +@@ -30,7 +30,7 @@ + HEADERS += $(SRC_DIR)freq/freq.h + CFLAGS += -pthread + endif +- ifeq ($(os), FreeBSD) ++ ifneq (,$(filter $(os),FreeBSD Darwin)) + SOURCE += $(SRC_COMMON)sysctl.c + HEADERS += $(SRC_COMMON)sysctl.h + endif diff --git a/pkgs/by-name/cp/cpufetch/package.nix b/pkgs/by-name/cp/cpufetch/package.nix index 9ccd5a422957..cd046f27b87a 100644 --- a/pkgs/by-name/cp/cpufetch/package.nix +++ b/pkgs/by-name/cp/cpufetch/package.nix @@ -20,6 +20,15 @@ stdenv.mkDerivation (finalAttrs: { installShellFiles ]; + # Upstream Makefile bug: for x86 builds, sysctl.c is only added to + # SOURCE on FreeBSD even though cpuid.c calls get_sys_info_by_name + # (defined there) on darwin too. Without this the x86_64-darwin + # build fails to link with "Undefined symbols: _get_sys_info_by_name". + # Widen the conditional to cover Darwin alongside FreeBSD. + patches = lib.optionals stdenv.hostPlatform.isDarwin [ + ./darwin-x86-sysctl.patch + ]; + installPhase = '' runHook preInstall diff --git a/pkgs/os-specific/linux/cpupower-gui/default.nix b/pkgs/by-name/cp/cpupower-gui/package.nix similarity index 100% rename from pkgs/os-specific/linux/cpupower-gui/default.nix rename to pkgs/by-name/cp/cpupower-gui/package.nix diff --git a/pkgs/by-name/cp/cpuset/package.nix b/pkgs/by-name/cp/cpuset/package.nix index 723ba6eaeebd..e75d31737568 100644 --- a/pkgs/by-name/cp/cpuset/package.nix +++ b/pkgs/by-name/cp/cpuset/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "lpechacek"; + owner = "SUSE"; repo = "cpuset"; rev = "v${finalAttrs.version}"; hash = "sha256-fW0SXNI10pb6FTn/2TOqxP9qlys0KL/H9m//NjslUaY="; diff --git a/pkgs/development/python-modules/primp/Cargo.lock b/pkgs/by-name/cq/cqlsh-rs/Cargo.lock similarity index 66% rename from pkgs/development/python-modules/primp/Cargo.lock rename to pkgs/by-name/cq/cqlsh-rs/Cargo.lock index 4fb2cff4a67f..f4b7512d515e 100644 --- a/pkgs/development/python-modules/primp/Cargo.lock +++ b/pkgs/by-name/cq/cqlsh-rs/Cargo.lock @@ -2,12 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "adler2" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" - [[package]] name = "aho-corasick" version = "1.1.4" @@ -18,18 +12,12 @@ dependencies = [ ] [[package]] -name = "alloc-no-stdlib" -version = "2.0.4" +name = "alloca" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc7bb162ec39d46ab1ca8c77bf72e890535becd1751bb45f64c597edb4c8c6b3" - -[[package]] -name = "alloc-stdlib" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94fb8275041c72129eb51b7d0322c29b8387a0386127718b096429201a5d6ece" +checksum = "e5a7d05ea6aea7e9e64d25b9156ba2fee3fdd659e34e41063cd2fc7cd020d7f4" dependencies = [ - "alloc-no-stdlib", + "cc", ] [[package]] @@ -38,12 +26,55 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" +[[package]] +name = "android_system_properties" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +dependencies = [ + "libc", +] + [[package]] name = "anes" version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" +[[package]] +name = "ansi-str" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "060de1453b69f46304b28274f382132f4e72c55637cf362920926a70d090890d" +dependencies = [ + "ansitok", +] + +[[package]] +name = "ansitok" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0a8acea8c2f1c60f0a92a8cd26bf96ca97db56f10bbcab238bbe0cceba659ee" +dependencies = [ + "nom", + "vte", +] + +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + [[package]] name = "anstyle" version = "1.0.14" @@ -51,128 +82,106 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] -name = "anyhow" -version = "1.0.102" +name = "anstyle-parse" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.61.2", +] + +[[package]] +name = "anyhow" +version = "1.0.103" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a4385e2e34eb35d6b3efe798b9eb88096925d87726c0798709bf56d9ed84af3" [[package]] name = "arc-swap" -version = "1.9.1" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a3a1fd6f75306b68087b831f025c712524bcb19aad54e557b1129cfa0a2b207" +checksum = "c049c0be4daef0b145cb3555416b3b8ef5b7888a38aea1a3a155801fe7b0810b" dependencies = [ "rustversion", ] [[package]] -name = "argh" -version = "0.1.19" +name = "arrayvec" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "211818e820cda9ca6f167a64a5c808837366a6dfd807157c64c1304c486cd033" +checksum = "d3fb67a6e08acf24fdeccbac2cb6ac4305825bd1f117462e0e6f2f193345ad56" + +[[package]] +name = "assert_cmd" +version = "2.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2aa3a22042e45de04255c7bf3626e239f450200fd0493c1e382263544b20aea6" dependencies = [ - "argh_derive", - "argh_shared", + "anstyle", + "bstr", + "libc", + "predicates", + "predicates-core", + "predicates-tree", + "wait-timeout", ] [[package]] -name = "argh_derive" -version = "0.1.19" +name = "astral-tokio-tar" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c442a9d18cef5dde467405d27d461d080d68972d6d0dfd0408265b6749ec427d" +checksum = "08648fef353ab39a9d26f909ad53fc4f071be4c91853b78523f5cc3d9e5ebffd" dependencies = [ - "argh_shared", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "argh_shared" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5ade012bac4db278517a0132c8c10c6427025868dca16c801087c28d5a411f1" -dependencies = [ - "serde", -] - -[[package]] -name = "asn1-rs" -version = "0.6.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048" -dependencies = [ - "asn1-rs-derive 0.5.1", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror 1.0.69", - "time", -] - -[[package]] -name = "asn1-rs" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f43a50ac4fdca5df8e885c21b835997f0a1cdee65494a6847694a98652d9d8" -dependencies = [ - "asn1-rs-derive 0.6.0", - "asn1-rs-impl", - "displaydoc", - "nom", - "num-traits", - "rusticata-macros", - "thiserror 2.0.18", - "time", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "asn1-rs-derive" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3109e49b1e4909e9db6515a30c633684d68cdeaa252f215214cb4fa1a5bfee2c" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "asn1-rs-impl" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "async-compression" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" -dependencies = [ - "compression-codecs", - "compression-core", - "pin-project-lite", + "futures-core", + "libc", + "portable-atomic", + "rustc-hash", + "rustix 0.38.44", "tokio", + "tokio-stream", + "xattr", +] + +[[package]] +name = "async-stream" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476" +dependencies = [ + "async-stream-impl", + "futures-core", + "pin-project-lite", +] + +[[package]] +name = "async-stream-impl" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -194,31 +203,74 @@ checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" [[package]] name = "autocfg" -version = "1.5.0" +version = "1.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8" +checksum = "f2032f911046de80f0a198e0901378627c33f59ea0ac00e363d481118bd70a53" [[package]] name = "aws-lc-rs" -version = "1.17.0" +version = "1.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ec2f1fc3ec205783a5da9a7e6c1509cc69dedf09a1949e412c1e18469326d00" +checksum = "4342d8937fc7e5dd9b1c60292261c0670c882a2cd1719cfc11b1af41731e32ad" dependencies = [ "aws-lc-sys", - "untrusted 0.7.1", "zeroize", ] [[package]] name = "aws-lc-sys" -version = "0.41.0" +version = "0.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2f9779ce85b93ab6170dd940ad0169b5766ff848247aff13bb788b832fe3f4" +checksum = "6d9ceb1da931507a12f4fccea479dccd00da1943e1b4ae72d8e502d707361444" dependencies = [ "cc", "cmake", "dunce", "fs_extra", + "pkg-config", +] + +[[package]] +name = "axum" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "31b698c5f9a010f6573133b09e0de5408834d0c82f8d7475a89fc1867a71cd90" +dependencies = [ + "axum-core", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "itoa", + "matchit", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "serde_core", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "axum-core" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08c78f31d7b1291f7ee735c1c6780ccde7785daae9a9206026862dab7d8792d1" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "sync_wrapper", + "tower-layer", + "tower-service", ] [[package]] @@ -228,58 +280,150 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" [[package]] -name = "bencher" -version = "0.1.5" +name = "bigdecimal" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dfdb4953a096c551ce9ace855a604d702e6e62d77fac690575ae347571717f5" +checksum = "4d6867f1565b3aad85681f1015055b087fcfd840d6aeee6eee7f2da317603695" +dependencies = [ + "autocfg", + "libm", + "num-bigint", + "num-integer", + "num-traits", +] + +[[package]] +name = "bit-set" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08807e080ed7f9d5433fa9b275196cfc35414f66a0c79d864dc51a0d825231a3" +dependencies = [ + "bit-vec", +] [[package]] name = "bit-vec" -version = "0.9.1" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71798fca2c1fe1086445a7258a4bc81e6e49dcd24c8d0dd9a1e57395b603f51" -dependencies = [ - "serde", -] +checksum = "5e764a1d40d510daf35e07be9eb06e75770908c27d411ee6c92109c9840eaaf7" [[package]] name = "bitflags" -version = "2.11.1" +version = "2.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "b4388bee8683e3d04af747c73422af53102d2bd24d9eadb6cbc100baef4b43f8" [[package]] -name = "brotli" -version = "8.0.2" +name = "bollard" +version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560" +checksum = "ee04c4c84f1f811b017f2fbb7dd8815c976e7ca98593de9c1e2afad0f636bff4" dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", - "brotli-decompressor", + "async-stream", + "base64", + "bitflags", + "bollard-buildkit-proto", + "bollard-stubs", + "bytes", + "futures-core", + "futures-util", + "hex", + "home", + "http", + "http-body-util", + "hyper", + "hyper-named-pipe", + "hyper-rustls", + "hyper-util", + "hyperlocal", + "log", + "num", + "pin-project-lite", + "rand 0.9.4", + "rustls", + "rustls-native-certs", + "rustls-pki-types", + "serde", + "serde_derive", + "serde_json", + "serde_urlencoded", + "thiserror", + "time", + "tokio", + "tokio-stream", + "tokio-util", + "tonic", + "tower-service", + "url", + "winapi", ] [[package]] -name = "brotli-decompressor" -version = "5.0.0" +name = "bollard-buildkit-proto" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "874bb8112abecc98cbd6d81ea4fa7e94fb9449648c93cc89aa40c81c24d7de03" +checksum = "85a885520bf6249ab931a764ffdb87b0ceef48e6e7d807cfdb21b751e086e1ad" dependencies = [ - "alloc-no-stdlib", - "alloc-stdlib", + "prost", + "prost-types", + "tonic", + "tonic-prost", + "ureq", +] + +[[package]] +name = "bollard-stubs" +version = "1.52.1-rc.29.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f0a8ca8799131c1837d1282c3f81f31e76ceb0ce426e04a7fe1ccee3287c066" +dependencies = [ + "base64", + "bollard-buildkit-proto", + "bytes", + "prost", + "serde", + "serde_json", + "serde_repr", + "time", +] + +[[package]] +name = "bs58" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] + +[[package]] +name = "bstr" +version = "1.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5cee35f73844aa3014bb606320a6c1f010249dbdf43342fe54b5a4f6a8ed4b79" +dependencies = [ + "memchr", + "regex-automata", + "serde_core", ] [[package]] name = "bumpalo" -version = "3.20.2" +version = "3.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d20789868f4b01b2f2caec9f5c4e0213b41e3e5702a50157d699ae31ced2fcb" +checksum = "72f5acc6cb2ba439de613abc23857ec3d78374d8ed5ac84e9d11336e87da8649" + +[[package]] +name = "byteorder" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.11.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" +checksum = "8ae3f5d315924270530207e2a68396c3cc547f6dca3fbdca317cfb1a51edb593" [[package]] name = "cast" @@ -289,9 +433,9 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" [[package]] name = "cc" -version = "1.2.62" +version = "1.2.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "e228eec9be7c17ccb640b59b36a5cd805ea2a564a4c5e162c2f659fea30d3b96" dependencies = [ "find-msvc-tools", "jobserver", @@ -313,15 +457,29 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "chacha20" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f8d983286843e49675a4b7a2d174efe136dc93a18d69130dd18198a6c167601" +checksum = "d524456ba66e72eb8b115ff89e01e497f8e6d11d78b70b1aa13c0fbd97540a81" dependencies = [ "cfg-if", "cpufeatures", "rand_core 0.10.1", ] +[[package]] +name = "chrono" +version = "0.4.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1aa79e62e7697b8e29b513a68abacf485adcd1fe8284a4316c5ae868e6633327" +dependencies = [ + "iana-time-zone", + "js-sys", + "num-traits", + "serde", + "wasm-bindgen", + "windows-link", +] + [[package]] name = "ciborium" version = "0.2.2" @@ -356,6 +514,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", + "clap_derive", ] [[package]] @@ -364,8 +523,31 @@ version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ + "anstream", "anstyle", "clap_lex", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.6.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8b397918185f0161ff3d6fcaa9e4bfc09b8367caf6e1d4a2848e5477ed027b" +dependencies = [ + "clap", +] + +[[package]] +name = "clap_derive" +version = "4.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -374,6 +556,25 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" +[[package]] +name = "clap_mangen" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d82842b45bf9f6a3be090dd860095ac30728042c08e0d6261ca7259b5d850f07" +dependencies = [ + "clap", + "roff", +] + +[[package]] +name = "clipboard-win" +version = "5.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bde03770d3df201d4fb868f2c9c59e66a3e4e2bd06692a0fe701e7103c7e84d4" +dependencies = [ + "error-code", +] + [[package]] name = "cmake" version = "0.1.58" @@ -384,72 +585,49 @@ dependencies = [ ] [[package]] -name = "combine" -version = "4.6.7" +name = "colorchoice" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" + +[[package]] +name = "comfy-table" +version = "7.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "958c5d6ecf1f214b4c2bbbbf6ab9523a864bd136dcf71a7e8904799acfe1ad47" dependencies = [ - "bytes", - "memchr", + "ansi-str", + "console", + "crossterm", + "unicode-segmentation", + "unicode-width", ] [[package]] -name = "compression-codecs" -version = "0.4.38" +name = "configparser" +version = "3.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" -dependencies = [ - "brotli", - "compression-core", - "flate2", - "memchr", - "zstd", - "zstd-safe", -] +checksum = "b46dec724fd22199ebde05033a0cbae453bc3b1ecff11eb6a6bb3eec4b90c6a4" [[package]] -name = "compression-core" -version = "0.4.32" +name = "console" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" - -[[package]] -name = "cookie" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ddef33a339a91ea89fb53151bd0a4689cfce27055c291dfa69945475d22c747" +checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c" dependencies = [ - "percent-encoding", - "time", - "version_check", -] - -[[package]] -name = "cookie_store" -version = "0.22.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15b2c103cf610ec6cae3da84a766285b42fd16aad564758459e6ecf128c75206" -dependencies = [ - "cookie", - "document-features", - "idna", - "log", - "publicsuffix", - "serde", - "serde_derive", - "serde_json", - "time", - "url", -] - -[[package]] -name = "core-foundation" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e195e091a93c46f7102ec7818a2aa394e1e1771c3ab4825963fa03e45afb8f" -dependencies = [ - "core-foundation-sys", + "encode_unicode", "libc", + "unicode-width", + "windows-sys 0.61.2", +] + +[[package]] +name = "convert_case" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633458d4ef8c78b72454de2d54fd6ab2e60f9e02be22f3c6104cdc8a4e0fceb9" +dependencies = [ + "unicode-segmentation", ] [[package]] @@ -478,28 +656,58 @@ dependencies = [ ] [[package]] -name = "crc32fast" -version = "1.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" +name = "cqlsh-rs" +version = "0.5.12" dependencies = [ - "cfg-if", + "anyhow", + "assert_cmd", + "async-trait", + "bigdecimal", + "chrono", + "clap", + "clap_complete", + "clap_mangen", + "comfy-table", + "configparser", + "criterion", + "crossterm", + "csv", + "dirs", + "futures", + "insta", + "num-bigint", + "predicates", + "proptest", + "rcgen", + "rustls", + "rustls-pemfile", + "rustyline", + "scylla", + "tempfile", + "testcontainers", + "thiserror", + "tokio", + "tracing", + "tracing-subscriber", + "uuid", ] [[package]] name = "criterion" -version = "0.7.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1c047a62b0cc3e145fa84415a3191f628e980b194c2755aa12300a4e6cbd928" +checksum = "950046b2aa2492f9a536f5f4f9a3de7b9e2476e575e05bd6c333371add4d98f3" dependencies = [ + "alloca", "anes", "cast", "ciborium", "clap", "criterion-plot", - "itertools", + "itertools 0.13.0", "num-traits", "oorandom", + "page_size", "plotters", "rayon", "regex", @@ -511,27 +719,12 @@ dependencies = [ [[package]] name = "criterion-plot" -version = "0.6.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b1bcc0dc7dfae599d84ad0b1a55f80cde8af3725da8313b528da95ef783e338" +checksum = "d8d80a2f4f5b554395e47b5d8305bc3d27813bacb73493eb1001e8f76dae29ea" dependencies = [ "cast", - "itertools", -] - -[[package]] -name = "critical-section" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" - -[[package]] -name = "crossbeam-channel" -version = "0.5.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2" -dependencies = [ - "crossbeam-utils", + "itertools 0.13.0", ] [[package]] @@ -559,6 +752,33 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crossterm" +version = "0.29.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b" +dependencies = [ + "bitflags", + "crossterm_winapi", + "derive_more", + "document-features", + "mio", + "parking_lot", + "rustix 1.1.4", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "crunchy" version = "0.2.4" @@ -566,37 +786,107 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "460fbee9c2c2f33933d720630a6a0bac33ba7053db5344fac858d4b8952d77d5" [[package]] -name = "data-encoding" -version = "2.11.0" +name = "csv" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4ae5f15dda3c708c0ade84bfee31ccab44a3da4f88015ed22f63732abe300c8" - -[[package]] -name = "der-parser" -version = "9.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553" +checksum = "52cd9d68cf7efc6ddfaaee42e7288d3a99d613d4b50f76ce9827ae0c6e14f938" dependencies = [ - "asn1-rs 0.6.2", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", + "csv-core", + "itoa", + "ryu", + "serde_core", ] [[package]] -name = "der-parser" -version = "10.0.0" +name = "csv-core" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07da5016415d5a3c4dd39b11ed26f915f52fc4e0dc197d87908bc916e51bc1a6" +checksum = "704a3c26996a80471189265814dbc2c257598b96b8a7feae2d31ace646bb9782" dependencies = [ - "asn1-rs 0.7.2", - "displaydoc", - "nom", - "num-bigint", - "num-traits", - "rusticata-macros", + "memchr", +] + +[[package]] +name = "darling" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee" +dependencies = [ + "darling_core 0.20.11", + "darling_macro 0.20.11", +] + +[[package]] +name = "darling" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25ae13da2f202d56bd7f91c25fba009e7717a1e4a1cc98a76d844b65ae912e9d" +dependencies = [ + "darling_core 0.23.0", + "darling_macro 0.23.0", +] + +[[package]] +name = "darling_core" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d00b9596d185e565c2207a0b01f8bd1a135483d02d9b7b0a54b11da8d53412e" +dependencies = [ + "fnv", + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_core" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9865a50f7c335f53564bb694ef660825eb8610e0a53d3e11bf1b0d3df31e03b0" +dependencies = [ + "ident_case", + "proc-macro2", + "quote", + "strsim", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.20.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead" +dependencies = [ + "darling_core 0.20.11", + "quote", + "syn", +] + +[[package]] +name = "darling_macro" +version = "0.23.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3984ec7bd6cfa798e62b4a642426a5be0e68f9401cfc2a01e3fa9ea2fcdb8d" +dependencies = [ + "darling_core 0.23.0", + "quote", + "syn", +] + +[[package]] +name = "dashmap" +version = "6.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6361d5c062261c78a176addb82d4c821ae42bed6089de0e12603cd25de2059c" +dependencies = [ + "cfg-if", + "crossbeam-utils", + "hashbrown 0.14.5", + "lock_api", + "once_cell", + "parking_lot_core", ] [[package]] @@ -605,14 +895,63 @@ version = "0.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7cd812cc2bc1d69d4764bd80df88b4317eaef9e773c75226407d9bc0876b211c" dependencies = [ - "powerfmt", + "serde_core", +] + +[[package]] +name = "derive_more" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d751e9e49156b02b44f9c1815bcb94b984cdcc4396ecc32521c739452808b134" +dependencies = [ + "derive_more-impl", +] + +[[package]] +name = "derive_more-impl" +version = "2.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "799a97264921d8623a957f6c3b9011f3b5492f557bbb7a5a19b7fa6d06ba8dcb" +dependencies = [ + "convert_case", + "proc-macro2", + "quote", + "rustc_version", + "syn", +] + +[[package]] +name = "difflib" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8" + +[[package]] +name = "dirs" +version = "6.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e8aa94d75141228480295a7d0e7feb620b1a5ad9f12bc40be62411e38cce4e" +dependencies = [ + "dirs-sys", +] + +[[package]] +name = "dirs-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e01a3366d27ee9890022452ee61b2b63a67e6f13f58900b651ff5665f0bb1fab" +dependencies = [ + "libc", + "option-ext", + "redox_users", + "windows-sys 0.61.2", ] [[package]] name = "displaydoc" -version = "0.2.5" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +checksum = "1ac70aa55017e108007fbaf5aa0f54b021c98f92ff8af59d42eda9da96e3dd4f" dependencies = [ "proc-macro2", "quote", @@ -620,10 +959,15 @@ dependencies = [ ] [[package]] -name = "doc-comment" -version = "0.3.4" +name = "docker_credential" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "780955b8b195a21ab8e4ac6b60dd1dbdcec1dc6c51c0617964b08c81785e12c9" +checksum = "29547a1dc60885a552306986316bc9701ba120c1a8db6769fa68691529ad373d" +dependencies = [ + "base64", + "serde", + "serde_json", +] [[package]] name = "document-features" @@ -640,33 +984,29 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92773504d58c093f6de2459af4af33faa518c13451eb8f2b5698ed3d36e7c813" +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "either" -version = "1.15.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +checksum = "91622ff5e7162018101f2fea40d6ebf4a78bbe5a49736a2020649edf9693679e" [[package]] -name = "encoding_rs" -version = "0.8.35" +name = "encode_unicode" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75030f3c4f45dafd7586dd6780965a8c7e8e285a5ecb86713e63a79c5b2766f3" -dependencies = [ - "cfg-if", -] +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" [[package]] -name = "env_logger" -version = "0.10.2" +name = "endian-type" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cd405aab171cb85d6735e5c8d9db038c17d3ca007a4d2c25f337935c3d90580" -dependencies = [ - "humantime", - "is-terminal", - "log", - "regex", - "termcolor", -] +checksum = "869b0adbda23651a9c5c0c3d270aac9fcb52e8622a8f2b17e57802d7791962f2" [[package]] name = "equivalent" @@ -684,12 +1024,39 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "error-code" +version = "3.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea2df4cf52843e0452895c455a1a2cfbb842a1e7329671acf418fdc53ed4c59" + +[[package]] +name = "etcetera" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de48cc4d1c1d97a20fd819def54b890cadde72ed3ad0c614822a0a433361be96" +dependencies = [ + "cfg-if", + "windows-sys 0.61.2", +] + [[package]] name = "fastrand" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" +[[package]] +name = "ferroid" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee93edf3c501f0035bbeffeccfed0b79e14c311f12195ec0e661e114a0f60da4" +dependencies = [ + "portable-atomic", + "rand 0.10.2", + "web-time", +] + [[package]] name = "find-msvc-tools" version = "0.1.9" @@ -697,13 +1064,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5baebc0774151f905a1a2cc41989300b1e6fbb29aff0ceffa1064fdd3088d582" [[package]] -name = "flate2" -version = "1.1.9" +name = "float-cmp" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" +checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8" dependencies = [ - "crc32fast", - "miniz_oxide", + "num-traits", ] [[package]] @@ -718,27 +1084,6 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" -[[package]] -name = "foldhash" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ce24cb58228fbb8aa041425bb1050850ac19177686ea6e0f41a70416f56fdb" - -[[package]] -name = "foreign-types" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1" -dependencies = [ - "foreign-types-shared", -] - -[[package]] -name = "foreign-types-shared" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" - [[package]] name = "form_urlencoded" version = "1.2.2" @@ -849,10 +1194,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] @@ -862,32 +1205,28 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi 5.3.0", "wasip2", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.4.2" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" +checksum = "300e883d756b2e4ec94e02791f39b04b522276138852cfc41d9fb7e904106099" dependencies = [ "cfg-if", "libc", "r-efi 6.0.0", "rand_core 0.10.1", - "wasip2", - "wasip3", ] [[package]] name = "h2" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "171fefbc92fe4a4de27e0698d6a5b392d6a0e333506bc49133760b3bcf948733" +checksum = "6cb093c84e8bd9b188d4c4a8cb6579fc016968d14c99882163cd3ff402a4f155" dependencies = [ "atomic-waker", "bytes", @@ -895,41 +1234,13 @@ dependencies = [ "futures-core", "futures-sink", "http", - "indexmap", + "indexmap 2.14.0", "slab", "tokio", "tokio-util", "tracing", ] -[[package]] -name = "h3" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10872b55cfb02a821b69dc7cf8dc6a71d6af25eb9a79662bec4a9d016056b3be" -dependencies = [ - "bytes", - "fastrand", - "futures-util", - "http", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "h3-quinn" -version = "0.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b2e732c8d91a74731663ac8479ab505042fbf547b9a207213ab7fbcbfc4f8b4" -dependencies = [ - "bytes", - "futures", - "h3", - "quinn", - "tokio", - "tokio-util", -] - [[package]] name = "half" version = "2.7.1" @@ -941,24 +1252,27 @@ dependencies = [ "zerocopy", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" + [[package]] name = "hashbrown" version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - -[[package]] -name = "hashbrown" -version = "0.16.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", - "foldhash 0.2.0", + "foldhash", ] [[package]] @@ -973,12 +1287,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" -[[package]] -name = "hermit-abi" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" - [[package]] name = "hex" version = "0.4.3" @@ -986,111 +1294,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" [[package]] -name = "hickory-net" -version = "0.26.1" +name = "home" +version = "0.5.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2295ed2f9c31e471e1428a8f88a3f0e1f4b27c15049592138d1eebe9c35b183" +checksum = "cc627f471c528ff0c4a49e1d5e60450c8f6461dd6d10ba9dcd3a61d3dff7728d" dependencies = [ - "async-trait", - "bytes", - "cfg-if", - "data-encoding", - "futures-channel", - "futures-io", - "futures-util", - "h2", - "hickory-proto", - "http", - "idna", - "ipnet", - "jni", - "rand 0.10.1", - "rustls", - "thiserror 2.0.18", - "tinyvec", - "tokio", - "tokio-rustls", - "tracing", - "url", - "webpki-roots", -] - -[[package]] -name = "hickory-proto" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bab31817bfb44672a252e97fe81cd0c18d1b2cf892108922f6818820df8c643" -dependencies = [ - "data-encoding", - "idna", - "ipnet", - "jni", - "once_cell", - "prefix-trie", - "rand 0.10.1", - "ring", - "thiserror 2.0.18", - "tinyvec", - "tracing", - "url", -] - -[[package]] -name = "hickory-resolver" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0d58d28879ceecde6607729660c2667a081ccdc082e082675042793960f178c" -dependencies = [ - "cfg-if", - "futures-util", - "hickory-net", - "hickory-proto", - "ipconfig", - "ipnet", - "jni", - "moka", - "ndk-context", - "once_cell", - "parking_lot", - "rand 0.10.1", - "resolv-conf", - "rustls", - "smallvec", - "system-configuration", - "thiserror 2.0.18", - "tokio", - "tokio-rustls", - "tracing", - "webpki-roots", -] - -[[package]] -name = "html2text" -version = "0.16.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12d23156ea4dbe6b37ad48fab2da56ff27b0f6192fb5db210c44eb07bfe6e787" -dependencies = [ - "html5ever", - "tendril", - "thiserror 2.0.18", - "unicode-width", -] - -[[package]] -name = "html5ever" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" -dependencies = [ - "log", - "markup5ever", + "windows-sys 0.61.2", ] [[package]] name = "http" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "6970f50e31d6fc17d3fa27329444bfa74e196cf62e95052a3f6fee181dba6425" dependencies = [ "bytes", "itoa", @@ -1131,21 +1347,22 @@ version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" -[[package]] -name = "humantime" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424" - [[package]] name = "hyper" -version = "1.9.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "55281c53a1894c864990125767da440a4e630446785086f52523b20033b74498" dependencies = [ + "atomic-waker", "bytes", + "futures-channel", + "futures-core", + "h2", "http", "http-body", + "httparse", + "httpdate", + "itoa", "pin-project-lite", "smallvec", "tokio", @@ -1153,18 +1370,45 @@ dependencies = [ ] [[package]] -name = "hyper-tls" -version = "0.6.0" +name = "hyper-named-pipe" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0" +checksum = "73b7d8abf35697b81a825e386fc151e0d503e8cb5fcb93cc8669c376dfd6f278" dependencies = [ - "bytes", - "http-body-util", + "hex", "hyper", "hyper-util", - "native-tls", + "pin-project-lite", + "tokio", + "tower-service", + "winapi", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "tokio", + "tokio-rustls", + "tower-service", +] + +[[package]] +name = "hyper-timeout" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0" +dependencies = [ + "hyper", + "hyper-util", + "pin-project-lite", "tokio", - "tokio-native-tls", "tower-service", ] @@ -1182,12 +1426,51 @@ dependencies = [ "hyper", "libc", "pin-project-lite", - "socket2", + "socket2 0.6.4", "tokio", "tower-service", "tracing", ] +[[package]] +name = "hyperlocal" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "986c5ce3b994526b3cd75578e62554abd09f0899d6206de48b3e96ab34ccc8c7" +dependencies = [ + "hex", + "http-body-util", + "hyper", + "hyper-util", + "pin-project-lite", + "tokio", + "tower-service", +] + +[[package]] +name = "iana-time-zone" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "icu_collections" version = "2.2.0" @@ -1271,10 +1554,10 @@ dependencies = [ ] [[package]] -name = "id-arena" -version = "2.3.0" +name = "ident_case" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" +checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39" [[package]] name = "idna" @@ -1297,6 +1580,17 @@ dependencies = [ "icu_properties", ] +[[package]] +name = "indexmap" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +dependencies = [ + "autocfg", + "hashbrown 0.12.3", + "serde", +] + [[package]] name = "indexmap" version = "2.14.0" @@ -1310,55 +1604,23 @@ dependencies = [ ] [[package]] -name = "inventory" -version = "0.3.24" +name = "insta" +version = "1.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4f0c30c76f2f4ccee3fe55a2435f691ca00c0e4bd87abe4f4a851b1d4dac39b" -dependencies = [ - "rustversion", -] - -[[package]] -name = "ipconfig" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d40460c0ce33d6ce4b0630ad68ff63d6661961c48b6dba35e5a4d81cfb48222" -dependencies = [ - "socket2", - "widestring", - "windows-registry", - "windows-result", - "windows-sys 0.61.2", -] - -[[package]] -name = "ipnet" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" +checksum = "86f0f8fee8c926415c58d6ae43a08523a26faccb2323f5e6b644fe7dd4ef6b82" dependencies = [ + "console", + "once_cell", "serde", + "similar", + "tempfile", ] [[package]] -name = "ipnetwork" -version = "0.20.0" +name = "is_terminal_polyfill" +version = "1.70.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf466541e9d546596ee94f9f69590f89473455f88372423e0008fc1a7daf100e" -dependencies = [ - "serde", -] - -[[package]] -name = "is-terminal" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" -dependencies = [ - "hermit-abi", - "libc", - "windows-sys 0.61.2", -] +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" [[package]] name = "itertools" @@ -1369,61 +1631,21 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f42a60cbdf9a97f5d2305f08a87dc4e09308d1276d28c869c684d7777685682" -[[package]] -name = "jni" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5efd9a482cf3a427f00d6b35f14332adc7902ce91efb778580e180ff90fa3498" -dependencies = [ - "cfg-if", - "combine", - "jni-macros", - "jni-sys", - "log", - "simd_cesu8", - "thiserror 2.0.18", - "walkdir", - "windows-link", -] - -[[package]] -name = "jni-macros" -version = "0.22.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a00109accc170f0bdb141fed3e393c565b6f5e072365c3bd58f5b062591560a3" -dependencies = [ - "proc-macro2", - "quote", - "rustc_version", - "simd_cesu8", - "syn", -] - -[[package]] -name = "jni-sys" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6377a88cb3910bee9b0fa88d4f42e1d2da8e79915598f65fb0c7ee14c878af2" -dependencies = [ - "jni-sys-macros", -] - -[[package]] -name = "jni-sys-macros" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38c0b942f458fe50cdac086d2f946512305e5631e720728f2a61aabcd47a6264" -dependencies = [ - "quote", - "syn", -] - [[package]] name = "jobserver" version = "0.1.34" @@ -1436,13 +1658,12 @@ dependencies = [ [[package]] name = "js-sys" -version = "0.3.98" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67df7112613f8bfd9150013a0314e196f4800d3201ae742489d999db2f979f08" +checksum = "53b44bfcdb3f8d5837a46dae1ca9660a837176eee74a28b229bc626816589102" dependencies = [ "cfg-if", "futures-util", - "once_cell", "wasm-bindgen", ] @@ -1452,12 +1673,6 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" version = "0.2.186" @@ -1470,6 +1685,21 @@ version = "0.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6d2cec3eae94f9f509c767b45932f1ada8350c4bdb85af2fcab4a3c14807981" +[[package]] +name = "libredox" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c943259e342f1e06ff2da7a83eabdfe7f92ce10262688dbf1895ff0b3e6e4652" +dependencies = [ + "libc", +] + +[[package]] +name = "linux-raw-sys" +version = "0.4.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" + [[package]] name = "linux-raw-sys" version = "0.12.1" @@ -1499,48 +1729,30 @@ dependencies = [ [[package]] name = "log" -version = "0.4.29" +version = "0.4.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" +checksum = "0ceec5bc11778974d1bcb055b18002eba7f4b3518b6a0081b3af5f21666da9ad" [[package]] -name = "lru-slab" -version = "0.1.2" +name = "lz4_flex" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - -[[package]] -name = "macro_rules_attribute" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65049d7923698040cd0b1ddcced9b0eb14dd22c5f86ae59c3740eab64a676520" +checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a" dependencies = [ - "macro_rules_attribute-proc_macro", - "paste", + "twox-hash", ] [[package]] -name = "macro_rules_attribute-proc_macro" -version = "0.2.2" +name = "matchit" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670fdfda89751bc4a84ac13eaa63e205cf0fd22b4c9a5fbfa085b63c1f1d3a30" - -[[package]] -name = "markup5ever" -version = "0.38.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" -dependencies = [ - "log", - "tendril", - "web_atoms", -] +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" [[package]] name = "memchr" -version = "2.8.0" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8ca58f447f06ed17d5fc4043ce1b10dd205e060fb3ce5b979b8ed8e59ff3f79" +checksum = "88904434abc2901f197fe8cc55f0445e7ded921dba5911dad2e2b39b48e663c4" [[package]] name = "mime" @@ -1548,105 +1760,45 @@ version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" -[[package]] -name = "mime_guess" -version = "2.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c44f8e672c00fe5308fa235f821cb4198414e1c77935c1ab6948d3fd78550e" -dependencies = [ - "mime", - "unicase", -] - -[[package]] -name = "minicov" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4869b6a491569605d66d3952bcdf03df789e5b536e5f0cf7758a7f08a55ae24d" -dependencies = [ - "cc", - "walkdir", -] - [[package]] name = "minimal-lexical" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" -[[package]] -name = "miniz_oxide" -version = "0.8.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" -dependencies = [ - "adler2", - "simd-adler32", -] - [[package]] name = "mio" -version = "1.2.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" +checksum = "02bd0af71c67b473010cbbc60715ee815645a4dc942899111f494b4b737d6fda" dependencies = [ "libc", + "log", "wasi", "windows-sys 0.61.2", ] [[package]] -name = "moka" -version = "0.12.15" +name = "nibble_vec" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "957228ad12042ee839f93c8f257b62b4c0ab5eaae1d4fa60de53b27c9d7c5046" +checksum = "77a5d83df9f36fe23f0c3648c6bbb8b0298bb5f1939c8f2704431371f4b84d43" dependencies = [ - "crossbeam-channel", - "crossbeam-epoch", - "crossbeam-utils", - "equivalent", - "parking_lot", - "portable-atomic", "smallvec", - "tagptr", - "uuid", ] [[package]] -name = "native-tls" -version = "0.2.18" +name = "nix" +version = "0.31.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "465500e14ea162429d264d44189adc38b199b62b1c21eea9f69e4b73cb03bbf2" +checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d" dependencies = [ + "bitflags", + "cfg-if", + "cfg_aliases", "libc", - "log", - "openssl", - "openssl-probe", - "openssl-sys", - "schannel", - "security-framework", - "security-framework-sys", - "tempfile", ] -[[package]] -name = "ndk-context" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" - -[[package]] -name = "new_debug_unreachable" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "650eef8c711430f1a879fdd01d4745a7deea475becfb90269c06775983bbf086" - -[[package]] -name = "no-std-net" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65" - [[package]] name = "nom" version = "7.1.3" @@ -1657,6 +1809,12 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "normalize-line-endings" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be" + [[package]] name = "nu-ansi-term" version = "0.50.3" @@ -1667,15 +1825,38 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.4.6" +name = "num" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23" +dependencies = [ + "num-bigint", + "num-complex", + "num-integer", + "num-iter", + "num-rational", + "num-traits", +] + +[[package]] +name = "num-bigint" +version = "0.4.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c863e9ab5e7bf9c99ba75e1050f1e4d624ae87ed3532d6238ffbdc7b585dbbe6" 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-conv" version = "0.2.2" @@ -1691,6 +1872,28 @@ 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" @@ -1698,35 +1901,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ "autocfg", - "libm", -] - -[[package]] -name = "num_cpus" -version = "1.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91df4bbde75afed763b708b7eee1e8e7651e02d97f6d5dd763e89367e957b23b" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "oid-registry" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9" -dependencies = [ - "asn1-rs 0.6.2", -] - -[[package]] -name = "oid-registry" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12f40cff3dde1b6087cc5d5f5d4d65712f34016a03ed60e9c08dcc392736b5b7" -dependencies = [ - "asn1-rs 0.7.2", ] [[package]] @@ -1734,10 +1908,12 @@ name = "once_cell" version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -dependencies = [ - "critical-section", - "portable-atomic", -] + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "oorandom" @@ -1745,31 +1921,6 @@ version = "11.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6790f58c7ff633d8771f42965289203411a5e5c68388703c06e14f24770b41e" -[[package]] -name = "openssl" -version = "0.10.80" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a45fa2aa886c42762255da344f0a0d313e254066c46aad76f300c3d3da62d967" -dependencies = [ - "bitflags", - "cfg-if", - "foreign-types", - "libc", - "openssl-macros", - "openssl-sys", -] - -[[package]] -name = "openssl-macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "openssl-probe" version = "0.2.1" @@ -1777,25 +1928,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7c87def4c32ab89d880effc9e097653c8da5d6ef28e6b539d313baaacfbafcbe" [[package]] -name = "openssl-src" -version = "300.6.0+3.6.2" +name = "option-ext" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8e8cbfd3a4a8c8f089147fd7aaa33cf8c7450c4d09f8f80698a0cf093abeff4" -dependencies = [ - "cc", -] +checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d" [[package]] -name = "openssl-sys" -version = "0.9.116" +name = "page_size" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f28a22dc7140cda5f096e5e7724a6962ca81a7f8bfd2979f9b18c11af56318c4" +checksum = "30d5b2194ed13191c1999ae0704b7839fb18384fa22e49b57eeaa97d79ce40da" dependencies = [ - "cc", "libc", - "openssl-src", - "pkg-config", - "vcpkg", + "winapi", ] [[package]] @@ -1822,10 +1967,29 @@ dependencies = [ ] [[package]] -name = "paste" -version = "1.0.15" +name = "parse-display" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" +checksum = "914a1c2265c98e2446911282c6ac86d8524f495792c38c5bd884f80499c7538a" +dependencies = [ + "parse-display-derive", + "regex", + "regex-syntax", +] + +[[package]] +name = "parse-display-derive" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ae7800a4c974efd12df917266338e79a7a74415173caf7e70aa0a0707345281" +dependencies = [ + "proc-macro2", + "quote", + "regex", + "regex-syntax", + "structmeta", + "syn", +] [[package]] name = "pem" @@ -1843,45 +2007,6 @@ version = "2.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b4f627cb1b25917193a259e49bdad08f671f8d9708acfd5fe0a8c1455d87220" -[[package]] -name = "phf" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1562dc717473dbaa4c1f85a36410e03c047b2e7df7f45ee938fbef64ae7fadf" -dependencies = [ - "phf_shared", - "serde", -] - -[[package]] -name = "phf_codegen" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49aa7f9d80421bca176ca8dbfebe668cc7a2684708594ec9f3c0db0805d5d6e1" -dependencies = [ - "phf_generator", - "phf_shared", -] - -[[package]] -name = "phf_generator" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "135ace3a761e564ec88c03a77317a7c6b80bb7f7135ef2544dbe054243b89737" -dependencies = [ - "fastrand", - "phf_shared", -] - -[[package]] -name = "phf_shared" -version = "0.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e57fef6bc5981e38c2ce2d63bfa546861309f875b8a75f092d1d54ae2d64f266" -dependencies = [ - "siphasher", -] - [[package]] name = "pin-project" version = "1.1.13" @@ -1942,38 +2067,6 @@ dependencies = [ "plotters-backend", ] -[[package]] -name = "pnet_base" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffc190d4067df16af3aba49b3b74c469e611cad6314676eaf1157f31aa0fb2f7" -dependencies = [ - "no-std-net", -] - -[[package]] -name = "pnet_datalink" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79e70ec0be163102a332e1d2d5586d362ad76b01cec86f830241f2b6452a7b7" -dependencies = [ - "ipnetwork", - "libc", - "pnet_base", - "pnet_sys", - "winapi", -] - -[[package]] -name = "pnet_sys" -version = "0.35.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d4643d3d4db6b08741050c2f3afa9a892c4244c085a72fcda93c9c2c9a00f4b" -dependencies = [ - "libc", - "winapi", -] - [[package]] name = "portable-atomic" version = "1.13.1" @@ -2005,292 +2098,33 @@ dependencies = [ ] [[package]] -name = "precomputed-hash" -version = "0.1.1" +name = "predicates" +version = "3.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "925383efa346730478fb4838dbe9137d2a47675ad789c546d150a6e1dd4ab31c" +checksum = "ada8f2932f28a27ee7b70dd6c1c39ea0675c55a36879ab92f3a715eaa1e63cfe" +dependencies = [ + "anstyle", + "difflib", + "float-cmp", + "normalize-line-endings", + "predicates-core", + "regex", +] [[package]] -name = "prefix-trie" -version = "0.8.4" +name = "predicates-core" +version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cf6e3177f0684016a5c209b00882e15f8bdd3f3bb48f0491df10cd102d0c6e7" -dependencies = [ - "either", - "ipnet", - "num-traits", -] +checksum = "cad38746f3166b4031b1a0d39ad9f954dd291e7854fcc0eed52ee41a0b50d144" [[package]] -name = "pretty_env_logger" -version = "0.5.0" +name = "predicates-tree" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c" +checksum = "d0de1b847b39c8131db0467e9df1ff60e6d0562ab8e9a16e568ad0fdb372e2f2" dependencies = [ - "env_logger", - "log", -] - -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - -[[package]] -name = "primp" -version = "1.3.1" -dependencies = [ - "criterion", - "http", - "primp-h2", - "primp-reqwest", - "primp-rustls", - "rand 0.10.1", - "serde", - "serde_json", - "tokio", - "url", -] - -[[package]] -name = "primp-h2" -version = "0.4.15" -dependencies = [ - "atomic-waker", - "bytes", - "env_logger", - "fnv", - "futures-core", - "futures-sink", - "hex", - "http", - "indexmap", - "quickcheck", - "rand 0.8.6", - "serde", - "serde_json", - "slab", - "smallvec", - "tokio", - "tokio-util", - "tracing", - "walkdir", -] - -[[package]] -name = "primp-hyper" -version = "1.9.1" -dependencies = [ - "atomic-waker", - "bytes", - "form_urlencoded", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "httparse", - "httpdate", - "itoa", - "pin-project-lite", - "pretty_env_logger", - "primp-h2", - "serde", - "serde_json", - "smallvec", - "spmc", - "tokio", - "tokio-test", - "tokio-util", - "tracing", - "want", -] - -[[package]] -name = "primp-hyper-rustls" -version = "0.27.9" -dependencies = [ - "cfg-if", - "http", - "http-body-util", - "log", - "primp-hyper", - "primp-hyper-util", - "primp-rustls", - "primp-tokio-rustls", - "rustls-native-certs", - "rustls-platform-verifier", - "tokio", - "tower-service", - "webpki-roots", -] - -[[package]] -name = "primp-hyper-util" -version = "0.1.22" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "http-body-util", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "pnet_datalink", - "pretty_env_logger", - "primp-hyper", - "socket2", - "system-configuration", - "tokio", - "tokio-test", - "tower-layer", - "tower-service", - "tower-test", - "tracing", - "windows-registry", -] - -[[package]] -name = "primp-python" -version = "1.3.1" -dependencies = [ - "anyhow", - "bytes", - "encoding_rs", - "foldhash 0.2.0", - "html2text", - "http", - "indexmap", - "mime", - "primp", - "pyo3", - "pyo3-async-runtimes", - "pyo3-log", - "pythonize", - "rand 0.10.1", - "serde_json", - "tokio", - "tokio-util", - "tracing", - "url", -] - -[[package]] -name = "primp-reqwest" -version = "0.13.4" -dependencies = [ - "base64", - "brotli", - "bytes", - "cookie", - "cookie_store", - "doc-comment", - "encoding_rs", - "env_logger", - "flate2", - "futures-channel", - "futures-core", - "futures-util", - "h3", - "h3-quinn", - "hickory-resolver", - "http", - "http-body", - "http-body-util", - "hyper-tls", - "js-sys", - "libc", - "log", - "mime", - "mime_guess", - "native-tls", - "num_cpus", - "once_cell", - "percent-encoding", - "pin-project-lite", - "primp-h2", - "primp-hyper", - "primp-hyper-rustls", - "primp-hyper-util", - "primp-rustls", - "primp-tokio-rustls", - "quinn", - "rustls-native-certs", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-native-tls", - "tokio-util", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test", - "wasm-streams", - "web-sys", - "webpki-roots", - "zstd", -] - -[[package]] -name = "primp-rustls" -version = "0.23.40" -dependencies = [ - "aws-lc-rs", - "base64", - "bencher", - "brotli", - "brotli-decompressor", - "env_logger", - "hashbrown 0.16.1", - "hex", - "log", - "macro_rules_attribute", - "num-bigint", - "once_cell", - "rcgen 0.13.2", - "ring", - "rustls-pki-types", - "rustls-test", - "rustls-webpki", - "rustversion", - "serde", - "serde_json", - "subtle", - "time", - "webpki-roots", - "x509-parser 0.16.0", - "zeroize", - "zlib-rs", - "zstd", -] - -[[package]] -name = "primp-tokio-rustls" -version = "0.26.5" -dependencies = [ - "argh", - "futures-util", - "lazy_static", - "primp-rustls", - "rcgen 0.14.8", - "tokio", - "webpki-roots", + "predicates-core", + "termtree", ] [[package]] @@ -2303,188 +2137,67 @@ dependencies = [ ] [[package]] -name = "psl-types" -version = "2.0.11" +name = "proptest" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33cb294fe86a74cbcf50d4445b37da762029549ebeea341421c7c70370f86cac" - -[[package]] -name = "publicsuffix" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f42ea446cab60335f76979ec15e12619a2165b5ae2c12166bef27d283a9fadf" +checksum = "4b45fcc2344c680f5025fe57779faef368840d0bd1f42f216291f0dc4ace4744" dependencies = [ - "idna", - "psl-types", + "bit-set", + "bit-vec", + "bitflags", + "num-traits", + "rand 0.9.4", + "rand_chacha", + "rand_xorshift", + "regex-syntax", + "rusty-fork", + "tempfile", + "unarray", ] [[package]] -name = "pyo3" -version = "0.28.3" +name = "prost" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91fd8e38a3b50ed1167fb981cd6fd60147e091784c427b8f7183a7ee32c31c12" +checksum = "528ac67416ff8646872a3c02cad9cc4ee5dc9f9540c9b10771855c95cb2e5ae1" +dependencies = [ + "bytes", + "prost-derive", +] + +[[package]] +name = "prost-derive" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b570b25f7617e43d59005d0990ccb79e950a423952cea19671b7a876da390adf" dependencies = [ "anyhow", - "indexmap", - "inventory", - "libc", - "once_cell", - "portable-atomic", - "pyo3-build-config", - "pyo3-ffi", - "pyo3-macros", -] - -[[package]] -name = "pyo3-async-runtimes" -version = "0.28.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e7364a95bf00e8377bbf9b0f09d7ff9715a29d8fcf93b47d1a967363b973178" -dependencies = [ - "futures-channel", - "futures-util", - "once_cell", - "pin-project-lite", - "pyo3", - "tokio", -] - -[[package]] -name = "pyo3-build-config" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e368e7ddfdeb98c9bca7f8383be1648fd84ab466bf2bc015e94008db6d35611e" -dependencies = [ - "target-lexicon", -] - -[[package]] -name = "pyo3-ffi" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f29e10af80b1f7ccaf7f69eace800a03ecd13e883acfacc1e5d0988605f651e" -dependencies = [ - "libc", - "pyo3-build-config", -] - -[[package]] -name = "pyo3-log" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26c2ec80932c5c3b2d4fbc578c9b56b2d4502098587edb8bef5b6bfcad43682e" -dependencies = [ - "arc-swap", - "log", - "pyo3", -] - -[[package]] -name = "pyo3-macros" -version = "0.28.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df6e520eff47c45997d2fc7dd8214b25dd1310918bbb2642156ef66a67f29813" -dependencies = [ + "itertools 0.14.0", "proc-macro2", - "pyo3-macros-backend", "quote", "syn", ] [[package]] -name = "pyo3-macros-backend" -version = "0.28.3" +name = "prost-types" +version = "0.14.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4cdc218d835738f81c2338f822078af45b4afdf8b2e33cbb5916f108b813acb" +checksum = "f94967dc7688f3054c7fac87473ffae4cc4c3904800e2d9f5b857246d8963b0a" dependencies = [ - "heck", - "proc-macro2", - "pyo3-build-config", - "quote", - "syn", + "prost", ] [[package]] -name = "pythonize" -version = "0.28.0" +name = "quick-error" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b79f670c9626c8b651c0581011b57b6ba6970bb69faf01a7c4c0cfc81c43f95" -dependencies = [ - "pyo3", - "serde", -] - -[[package]] -name = "quickcheck" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95c589f335db0f6aaa168a7cd27b1fc6920f5e1470c804f814d9cd6e62a0f70b" -dependencies = [ - "rand 0.10.1", -] - -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases", - "futures-io", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror 2.0.18", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" -dependencies = [ - "aws-lc-rs", - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand 0.9.4", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.18", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.60.2", -] +checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.45" +version = "1.0.46" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41f2619966050689382d2b44f664f4bc593e129785a36d6ee376ddf37259b924" +checksum = "dfbc457d0c7a0759a614551b11a6409e5951f6c7537be1f1b7682b9ae9230368" dependencies = [ "proc-macro2", ] @@ -2502,14 +2215,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] -name = "rand" -version = "0.8.6" +name = "radix_trie" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca0ecfa931c29007047d1bc58e623ab12e5590e8c7cc53200d5202b69266d8a" +checksum = "3b4431027dcd37fc2a73ef740b5f233aa805897935b8bce0195e41bbf9a3289a" dependencies = [ - "libc", - "rand_chacha 0.3.1", - "rand_core 0.6.4", + "endian-type", + "nibble_vec", ] [[package]] @@ -2518,31 +2230,21 @@ version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" dependencies = [ - "rand_chacha 0.9.0", + "rand_chacha", "rand_core 0.9.5", ] [[package]] name = "rand" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" +checksum = "c7f5fa3a058cd35567ef9bfa5e75732bee0f9e4c55fa90477bef2dfcdbc4be80" dependencies = [ "chacha20", - "getrandom 0.4.2", + "getrandom 0.4.3", "rand_core 0.10.1", ] -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.4", -] - [[package]] name = "rand_chacha" version = "0.9.0" @@ -2553,15 +2255,6 @@ dependencies = [ "rand_core 0.9.5", ] -[[package]] -name = "rand_core" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" -dependencies = [ - "getrandom 0.2.17", -] - [[package]] name = "rand_core" version = "0.9.5" @@ -2577,6 +2270,24 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" +[[package]] +name = "rand_pcg" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b48ac3f7ffaab7fac4d2376632268aa5f89abdb55f7ebf8f4d11fffccb2320f7" +dependencies = [ + "rand_core 0.9.5", +] + +[[package]] +name = "rand_xorshift" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "513962919efc330f829edb2535844d1b912b0fbe2ca165d613e4e8788bb05a5a" +dependencies = [ + "rand_core 0.9.5", +] + [[package]] name = "rayon" version = "1.12.0" @@ -2607,21 +2318,7 @@ dependencies = [ "ring", "rustls-pki-types", "time", - "yasna 0.5.2", -] - -[[package]] -name = "rcgen" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57f6d249aad744e274e682777a50283a225a32705394ee6d5fcc01efa25e4055" -dependencies = [ - "pem", - "ring", - "rustls-pki-types", - "time", - "x509-parser 0.18.1", - "yasna 0.6.0", + "yasna", ] [[package]] @@ -2634,10 +2331,41 @@ dependencies = [ ] [[package]] -name = "regex" -version = "1.12.3" +name = "redox_users" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e10754a14b9137dd7b1e3e5b0493cc9171fdd105e0ab477f51b72e7f3ac0e276" +checksum = "a4e608c6638b9c18977b00b475ac1f28d14e84b27d8d42f70e0bf1e3dec127ac" +dependencies = [ + "getrandom 0.2.17", + "libredox", + "thiserror", +] + +[[package]] +name = "ref-cast" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f354300ae66f76f1c85c5f84693f0ce81d747e2c3f21a45fef496d89c960bf7d" +dependencies = [ + "ref-cast-impl", +] + +[[package]] +name = "ref-cast-impl" +version = "1.0.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7186006dcb21920990093f30e3dea63b7d6e977bf1256be20c3563a5db070da" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "regex" +version = "1.12.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1292b7759ae1cb9ec195452d1390a074f0cd8541ab7a5a8c31cd6db45d4a6ba" dependencies = [ "aho-corasick", "memchr", @@ -2658,15 +2386,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" - -[[package]] -name = "resolv-conf" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e061d1b48cb8d38042de4ae0a7a6401009d6143dc80d2e2d6f31f0bdd6470c7" +checksum = "d6f6ff9a378485b298a5286656da665ba74413d36db0979633275d2e708145d4" [[package]] name = "ring" @@ -2678,15 +2400,21 @@ dependencies = [ "cfg-if", "getrandom 0.2.17", "libc", - "untrusted 0.9.0", + "untrusted", "windows-sys 0.52.0", ] [[package]] -name = "rustc-hash" -version = "2.1.2" +name = "roff" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +checksum = "323c417e1d9665a65b263ec744ba09030cfb277e9daa0b018a4ab62e57bc8189" + +[[package]] +name = "rustc-hash" +version = "2.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b1e7f9a428571be2dc5bc0505c13fb6bf936822b894ec87abf8a08a4e51742d" [[package]] name = "rustc_version" @@ -2698,12 +2426,16 @@ dependencies = [ ] [[package]] -name = "rusticata-macros" -version = "4.1.0" +name = "rustix" +version = "0.38.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faf0c4a6ece9950b9abdb62b1cfcf2a68b3b67a10ba445b3bb85be2a293d0632" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" dependencies = [ - "nom", + "bitflags", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.59.0", ] [[package]] @@ -2715,19 +2447,20 @@ dependencies = [ "bitflags", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.12.1", "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "6b92b125634d9b795e7beca796cc790df15a7fb38323bf3196fda83292d06b1f" dependencies = [ "aws-lc-rs", "log", "once_cell", + "ring", "rustls-pki-types", "rustls-webpki", "subtle", @@ -2736,9 +2469,9 @@ dependencies = [ [[package]] name = "rustls-native-certs" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "612460d5f7bea540c490b2b6395d8e34a953e52b491accd6c86c8164c5932a63" +checksum = "dab5152771c58876a2146916e53e35057e1a4dfa2b9df0f0305b07f611fdea4d" dependencies = [ "openssl-probe", "rustls-pki-types", @@ -2746,50 +2479,24 @@ dependencies = [ "security-framework", ] +[[package]] +name = "rustls-pemfile" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dce314e5fee3f39953d46bb63bb8a46d40c2f8fb7cc5a3b6cab2bde9721d6e50" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "764899a24af3980067ee14bc143654f297b22eaebfe3c7b6b211920a5a59b046" dependencies = [ - "web-time", "zeroize", ] -[[package]] -name = "rustls-platform-verifier" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26d1e2536ce4f35f4846aa13bff16bd0ff40157cdb14cc056c7b14ba41233ba0" -dependencies = [ - "core-foundation 0.10.1", - "core-foundation-sys", - "jni", - "log", - "once_cell", - "rustls", - "rustls-native-certs", - "rustls-platform-verifier-android", - "rustls-webpki", - "security-framework", - "security-framework-sys", - "webpki-root-certs", - "windows-sys 0.61.2", -] - -[[package]] -name = "rustls-platform-verifier-android" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87165f0995f63a9fbeea62b64d10b4d9d8e78ec6d7d51fb2125fda7bb36788f" - -[[package]] -name = "rustls-test" -version = "0.1.0" -dependencies = [ - "primp-rustls", -] - [[package]] name = "rustls-webpki" version = "0.103.13" @@ -2799,7 +2506,7 @@ dependencies = [ "aws-lc-rs", "ring", "rustls-pki-types", - "untrusted 0.9.0", + "untrusted", ] [[package]] @@ -2808,6 +2515,51 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" +[[package]] +name = "rusty-fork" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc6bf79ff24e648f6da1f8d1f011e9cac26491b619e6b9280f2b47f1774e6ee2" +dependencies = [ + "fnv", + "quick-error", + "tempfile", + "wait-timeout", +] + +[[package]] +name = "rustyline" +version = "18.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53f6a737db68eb1a8ccff86b584b2fc13eca6a7bb6f78ebc7c529547e3ab9684" +dependencies = [ + "bitflags", + "cfg-if", + "clipboard-win", + "home", + "libc", + "log", + "memchr", + "nix", + "radix_trie", + "rustyline-derive", + "unicode-segmentation", + "unicode-width", + "utf8parse", + "windows-sys 0.61.2", +] + +[[package]] +name = "rustyline-derive" +version = "0.12.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64e5587417a3c4e16a4415e8d7d07f80998ed835ade621d19dfbe9fbe3205b0f" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "ryu" version = "1.0.23" @@ -2832,12 +2584,115 @@ dependencies = [ "windows-sys 0.61.2", ] +[[package]] +name = "schemars" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd191f9397d57d581cddd31014772520aa448f65ef991055d7f61582c65165f" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + +[[package]] +name = "schemars" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2b42f36aa1cd011945615b92222f6bf73c599a102a300334cd7f8dbeec726cc" +dependencies = [ + "dyn-clone", + "ref-cast", + "serde", + "serde_json", +] + [[package]] name = "scopeguard" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +[[package]] +name = "scylla" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4febc4a3c0b2b6a6ab0b25670a28015a7b87f6998b01ad324be19bb583237ad9" +dependencies = [ + "arc-swap", + "async-trait", + "bytes", + "chrono", + "dashmap", + "futures", + "hashbrown 0.15.5", + "itertools 0.14.0", + "rand 0.9.4", + "rand_pcg", + "rustls", + "scylla-cql", + "scylla-cql-core", + "smallvec", + "socket2 0.5.10", + "thiserror", + "tokio", + "tokio-rustls", + "tracing", + "uuid", +] + +[[package]] +name = "scylla-cql" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7898c851387b20e0996b33d6d98426c432cc0b45ed9af3cb4bd8b4d540ad7ade" +dependencies = [ + "bigdecimal", + "byteorder", + "bytes", + "chrono", + "itertools 0.14.0", + "lz4_flex", + "num-bigint", + "scylla-cql-core", + "snap", + "stable_deref_trait", + "thiserror", + "tokio", + "uuid", + "yoke", +] + +[[package]] +name = "scylla-cql-core" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e609d59933b27489fb329e0e290469f0a027fd75a598f8d219b1479ed6213d0" +dependencies = [ + "bigdecimal", + "byteorder", + "bytes", + "chrono", + "itertools 0.14.0", + "num-bigint", + "scylla-macros", + "thiserror", + "uuid", +] + +[[package]] +name = "scylla-macros" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "275a0290cc00fc50a46b302ad09490ccce2eff1203d648addab1bd8ae833b96e" +dependencies = [ + "darling 0.20.11", + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "security-framework" version = "3.7.0" @@ -2845,7 +2700,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b7f4bc775c73d9a02cde8bf7b2ec4c9d12743edf609006c7facc23998404cd1d" dependencies = [ "bitflags", - "core-foundation 0.10.1", + "core-foundation", "core-foundation-sys", "libc", "security-framework-sys", @@ -2899,9 +2754,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.149" +version = "1.0.150" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" +checksum = "e8014e44b4736ed0538adeecded0fce2a272f22dc9578a7eb6b2d9993c74cfb9" dependencies = [ "itoa", "memchr", @@ -2910,6 +2765,17 @@ dependencies = [ "zmij", ] +[[package]] +name = "serde_repr" +version = "0.1.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "175ee3e80ae9982737ca543e96133087cbd9a485eecc3bc4de9c1a37b47ea59c" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -2923,10 +2789,72 @@ dependencies = [ ] [[package]] -name = "shlex" -version = "1.3.0" +name = "serde_with" +version = "3.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +checksum = "76a5c54c7310e7b8b9577c286d7e399ddd876c3e12b3ed917a8aabc4b96e9e8c" +dependencies = [ + "base64", + "bs58", + "chrono", + "hex", + "indexmap 1.9.3", + "indexmap 2.14.0", + "schemars 0.9.0", + "schemars 1.2.1", + "serde_core", + "serde_json", + "serde_with_macros", + "time", +] + +[[package]] +name = "serde_with_macros" +version = "3.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "84d57bc0c8b9a17920c178daa6bb924850d54a9c97ab45194bb8c17ad66bb660" +dependencies = [ + "darling 0.23.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + +[[package]] +name = "shlex" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8fadd59c855ef2080decdef8ff161eb6661b86933c9d82e5ba29dc602a55aba" + +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" +dependencies = [ + "libc", + "mio", + "signal-hook", +] [[package]] name = "signal-hook-registry" @@ -2939,32 +2867,10 @@ dependencies = [ ] [[package]] -name = "simd-adler32" -version = "0.3.9" +name = "similar" +version = "2.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "703d5c7ef118737c72f1af64ad2f6f8c5e1921f818cdcb97b8fe6fc69bf66214" - -[[package]] -name = "simd_cesu8" -version = "1.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "94f90157bb87cddf702797c5dadfa0be7d266cdf49e22da2fcaa32eff75b2c33" -dependencies = [ - "rustc_version", - "simdutf8", -] - -[[package]] -name = "simdutf8" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" - -[[package]] -name = "siphasher" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ee5873ec9cce0195efcb7a4e9507a04cd49aec9c83d0389df45b1ef7ba2e649" +checksum = "bbbb5d9659141646ae647b42fe094daf6c6192d1620870b449d9557f748b2daa" [[package]] name = "slab" @@ -2974,26 +2880,36 @@ checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5" [[package]] name = "smallvec" -version = "1.15.1" +version = "1.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" +checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90" + +[[package]] +name = "snap" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b6b67fb9a61334225b5b790716f609cd58395f895b3fe8b328786812a40bc3b" [[package]] name = "socket2" -version = "0.6.3" +version = "0.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" +checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678" +dependencies = [ + "libc", + "windows-sys 0.52.0", +] + +[[package]] +name = "socket2" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52d1cfed4120b4d927bf7c0f86d2087a4a7d6027c906d9f9d525a80573b9be51" dependencies = [ "libc", "windows-sys 0.61.2", ] -[[package]] -name = "spmc" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02a8428da277a8e3a15271d79943e80ccc2ef254e78813a166a08d65e4c3ece5" - [[package]] name = "stable_deref_trait" version = "1.2.1" @@ -3001,27 +2917,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] -name = "string_cache" -version = "0.9.0" +name = "strsim" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18596f8c785a729f2819c0f6a7eae6ebeebdfffbfe4214ae6b087f690e31901" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "structmeta" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2e1575d8d40908d70f6fd05537266b90ae71b15dbbe7a8b7dffa2b759306d329" dependencies = [ - "new_debug_unreachable", - "parking_lot", - "phf_shared", - "precomputed-hash", + "proc-macro2", + "quote", + "structmeta-derive", + "syn", ] [[package]] -name = "string_cache_codegen" -version = "0.6.1" +name = "structmeta-derive" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "585635e46db231059f76c5849798146164652513eb9e8ab2685939dd90f29b69" +checksum = "152a0b65a590ff6c3da95cabe2353ee04e6167c896b28e3b14478c2636c922fc" dependencies = [ - "phf_generator", - "phf_shared", "proc-macro2", "quote", + "syn", ] [[package]] @@ -3032,9 +2953,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "syn" -version = "2.0.117" +version = "2.0.118" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e665b8803e7b1d2a727f4023456bbbbe74da67099c585258af0ad9c5013b9b99" +checksum = "1b9ae57f904213ebb649ce6895b8a66c66f0203b9319718f69a5612a065b1422" dependencies = [ "proc-macro2", "quote", @@ -3046,9 +2967,6 @@ name = "sync_wrapper" version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" -dependencies = [ - "futures-core", -] [[package]] name = "synstructure" @@ -3061,39 +2979,6 @@ dependencies = [ "syn", ] -[[package]] -name = "system-configuration" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13f3d0daba03132c0aa9767f98351b3488edc2c100cda2d2ec2b04f3d8d3c8b" -dependencies = [ - "bitflags", - "core-foundation 0.9.4", - "system-configuration-sys", -] - -[[package]] -name = "system-configuration-sys" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e1d1b10ced5ca923a1fcb8d03e96b8d3268065d724548c0211415ff6ac6bac4" -dependencies = [ - "core-foundation-sys", - "libc", -] - -[[package]] -name = "tagptr" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b2093cf4c8eb1e67749a6762251bc9cd836b6fc171623bd0a9d324d37af2417" - -[[package]] -name = "target-lexicon" -version = "0.13.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" - [[package]] name = "tempfile" version = "3.27.0" @@ -3101,38 +2986,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ "fastrand", - "getrandom 0.4.2", + "getrandom 0.4.3", "once_cell", - "rustix", + "rustix 1.1.4", "windows-sys 0.61.2", ] [[package]] -name = "tendril" -version = "0.5.0" +name = "termtree" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4790fc369d5a530f4b544b094e31388b9b3a37c0f4652ade4505945f5660d24" -dependencies = [ - "new_debug_unreachable", - "utf-8", -] +checksum = "8f50febec83f5ee1df3015341d8bd429f2d1cc62bcba7ea2076759d315084683" [[package]] -name = "termcolor" -version = "1.4.1" +name = "testcontainers" +version = "0.27.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" +checksum = "bfd5785b5483672915ed5fe3cddf9f546802779fc1eceff0a6fb7321fac81c1e" dependencies = [ - "winapi-util", -] - -[[package]] -name = "thiserror" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" -dependencies = [ - "thiserror-impl 1.0.69", + "astral-tokio-tar", + "async-trait", + "bollard", + "bytes", + "docker_credential", + "either", + "etcetera", + "ferroid", + "futures", + "http", + "itertools 0.14.0", + "log", + "memchr", + "parse-display", + "pin-project-lite", + "serde", + "serde_json", + "serde_with", + "thiserror", + "tokio", + "tokio-stream", + "tokio-util", + "url", ] [[package]] @@ -3141,18 +3035,7 @@ version = "2.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" dependencies = [ - "thiserror-impl 2.0.18", -] - -[[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", + "thiserror-impl", ] [[package]] @@ -3167,13 +3050,21 @@ dependencies = [ ] [[package]] -name = "time" -version = "0.3.47" +name = "thread_local" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "743bd48c283afc0388f9b8827b976905fb217ad9e647fae3a379a9283c4def2c" +checksum = "f60246a4944f24f6e018aa17cdeffb7818b76356965d03b07d6a9886e8962185" +dependencies = [ + "cfg-if", +] + +[[package]] +name = "time" +version = "0.3.53" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18dfaaeddcb932337b5e7866ee7d0ce9b76d2fd092997146f187ec09b4558a50" dependencies = [ "deranged", - "itoa", "num-conv", "powerfmt", "serde_core", @@ -3183,15 +3074,15 @@ dependencies = [ [[package]] name = "time-core" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7694e1cfe791f8d31026952abf09c69ca6f6fa4e1a1229e18988f06a04a12dca" +checksum = "9e1c906769ad99c88eaa54e728060edef082f8e358ff32030cb7c7d315e81109" [[package]] name = "time-macros" -version = "0.2.27" +version = "0.2.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e70e4c5a0e0a8a4823ad65dfe1a6930e4f4d756dcd9dd7939022b5e8c501215" +checksum = "c431b87111666e491a90baa837f914fb45cd5dc3c268591b0220ff5057f2085f" dependencies = [ "num-conv", "time-core", @@ -3244,7 +3135,7 @@ dependencies = [ "parking_lot", "pin-project-lite", "signal-hook-registry", - "socket2", + "socket2 0.6.4", "tokio-macros", "windows-sys 0.61.2", ] @@ -3260,16 +3151,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tokio-native-tls" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" -dependencies = [ - "native-tls", - "tokio", -] - [[package]] name = "tokio-rustls" version = "0.26.4" @@ -3291,17 +3172,6 @@ dependencies = [ "tokio", ] -[[package]] -name = "tokio-test" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6d24790a10a7af737693a3e8f1d03faef7e6ca0cc99aae5066f533766de545" -dependencies = [ - "futures-core", - "tokio", - "tokio-stream", -] - [[package]] name = "tokio-util" version = "0.7.18" @@ -3315,6 +3185,46 @@ dependencies = [ "tokio", ] +[[package]] +name = "tonic" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac2a5518c70fa84342385732db33fb3f44bc4cc748936eb5833d2df34d6445ef" +dependencies = [ + "async-trait", + "axum", + "base64", + "bytes", + "h2", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-timeout", + "hyper-util", + "percent-encoding", + "pin-project", + "socket2 0.6.4", + "sync_wrapper", + "tokio", + "tokio-stream", + "tower", + "tower-layer", + "tower-service", + "tracing", +] + +[[package]] +name = "tonic-prost" +version = "0.14.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "50849f68853be452acf590cde0b146665b8d507b3b8af17261df47e02c209ea0" +dependencies = [ + "bytes", + "prost", + "tonic", +] + [[package]] name = "tower" version = "0.5.3" @@ -3323,7 +3233,9 @@ checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" dependencies = [ "futures-core", "futures-util", + "indexmap 2.14.0", "pin-project-lite", + "slab", "sync_wrapper", "tokio", "tokio-util", @@ -3332,29 +3244,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "tower-http" -version = "0.6.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cfcf7e2740e6fc6d4d688b4ef00650406bb94adf4731e43c096c3a19fe40840" -dependencies = [ - "async-compression", - "bitflags", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "url", -] - [[package]] name = "tower-layer" version = "0.3.3" @@ -3367,27 +3256,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" -[[package]] -name = "tower-test" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4546773ffeab9e4ea02b8872faa49bb616a80a7da66afc2f32688943f97efa7" -dependencies = [ - "futures-util", - "pin-project", - "tokio", - "tokio-test", - "tower-layer", - "tower-service", -] - [[package]] name = "tracing" version = "0.1.44" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" dependencies = [ - "log", "pin-project-lite", "tracing-attributes", "tracing-core", @@ -3411,6 +3285,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" +dependencies = [ + "log", + "once_cell", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.23" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cb7f578e5945fb242538965c2d0b04418d38ec25c79d160cd279bf0731c8d319" +dependencies = [ + "nu-ansi-term", + "sharded-slab", + "smallvec", + "thread_local", + "tracing-core", + "tracing-log", ] [[package]] @@ -3420,10 +3320,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" [[package]] -name = "unicase" -version = "2.9.0" +name = "twox-hash" +version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + +[[package]] +name = "unarray" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94" [[package]] name = "unicode-ident" @@ -3431,30 +3337,51 @@ version = "1.0.24" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" +[[package]] +name = "unicode-segmentation" +version = "1.13.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6f5d3c3b1bf09027a88a6bc961fc00497d651009560b5463668dc81b0fa87a8" + [[package]] name = "unicode-width" version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - -[[package]] -name = "untrusted" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" - [[package]] name = "untrusted" version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" +[[package]] +name = "ureq" +version = "3.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dea7109cdcd5864d4eeb1b58a1648dc9bf520360d7af16ec26d0a9354bafcfc0" +dependencies = [ + "base64", + "log", + "percent-encoding", + "rustls", + "rustls-pki-types", + "ureq-proto", + "utf8-zero", +] + +[[package]] +name = "ureq-proto" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e994ba84b0bd1b1b0cf92878b7ef898a5c1760108fe7b6010327e274917a808c" +dependencies = [ + "base64", + "http", + "httparse", + "log", +] + [[package]] name = "url" version = "2.5.8" @@ -3465,13 +3392,14 @@ dependencies = [ "idna", "percent-encoding", "serde", + "serde_derive", ] [[package]] -name = "utf-8" -version = "0.7.6" +name = "utf8-zero" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9" +checksum = "b8c0a043c9540bae7c578c88f91dda8bd82e59ae27c21baca69c8b191aaf5a6e" [[package]] name = "utf8_iter" @@ -3480,27 +3408,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be" [[package]] -name = "uuid" -version = "1.23.1" +name = "utf8parse" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd74a9687298c6858e9b88ec8935ec45d22e8fd5e6394fa1bd4e99a87789c76" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + +[[package]] +name = "uuid" +version = "1.23.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf80a72845275afea99e7f2b434723d3bc7e38470fcd1c7ed39a599c73319a53" dependencies = [ - "getrandom 0.4.2", + "getrandom 0.4.3", "js-sys", "wasm-bindgen", ] [[package]] -name = "vcpkg" -version = "0.2.15" +name = "valuable" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426" +checksum = "ba73ea9cf16a25df0c8caa16c51acb937d5712a8429db78a3ee29d5dcacd3a65" [[package]] -name = "version_check" -version = "0.9.5" +name = "vte" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077" +dependencies = [ + "arrayvec", + "memchr", +] + +[[package]] +name = "wait-timeout" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09ac3b126d3914f9849036f826e054cbabdc8519970b8998ddaf3b5bd3c65f11" +dependencies = [ + "libc", +] [[package]] name = "walkdir" @@ -3529,52 +3476,31 @@ checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" [[package]] name = "wasip2" -version = "1.0.3+wasi-0.2.9" +version = "1.0.4+wasi-0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" +checksum = "b67efb37e106e55ce722a510d6b5f9c17f083e5fc79afc2badeb12cc313d9487" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] name = "wasm-bindgen" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49ace1d07c165b0864824eee619580c4689389afa9dc9ed3a4c75040d82e6790" +checksum = "4b067c0c11094aef6b7a801c1e34a26affafdf3d051dba08456b868789aaf9a4" dependencies = [ "cfg-if", "once_cell", "rustversion", - "serde", - "serde_json", "wasm-bindgen-macro", "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "wasm-bindgen-macro" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e68e6f4afd367a562002c05637acb8578ff2dea1943df76afb9e83d177c8578" +checksum = "167ce5e579f6bcf889c4f7175a8a5a585de84e8ff93976ce393efa5f2837aab1" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3582,9 +3508,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d95a9ec35c64b2a7cb35d3fead40c4238d0940c86d107136999567a4703259f2" +checksum = "f3997c7839262f4ef12cf90b818d6340c18e80f263f1a94bf157d0ec4420380e" dependencies = [ "bumpalo", "proc-macro2", @@ -3595,104 +3521,18 @@ dependencies = [ [[package]] name = "wasm-bindgen-shared" -version = "0.2.121" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0100b01e9f0d03189a92b96772a1fb998639d981193d7dbab487302513441" +checksum = "dc1b4cb0cc549fcf58d7dfc081778139b3d283a081644e833e84682ad71cea24" dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-bindgen-test" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af5ec93229ad9ccd0a545a516dec76dc276613f278f6a91aa6b463d5b33d42d0" -dependencies = [ - "async-trait", - "cast", - "js-sys", - "libm", - "minicov", - "nu-ansi-term", - "num-traits", - "oorandom", - "serde", - "serde_json", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-bindgen-test-macro", - "wasm-bindgen-test-shared", -] - -[[package]] -name = "wasm-bindgen-test-macro" -version = "0.3.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c81b9fef827e575e0e54431736d1baa0d700315d8c62cfef1f61fa3aad0cbeb" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "wasm-bindgen-test-shared" -version = "0.2.121" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f4d8ae7ad5440360e9799dfd42857d126454a88441ddf72d288ef83fa47f527" - -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasm-streams" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" -dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-sys" -version = "0.3.98" +version = "0.3.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" +checksum = "8622dcb61c0bcc9fffa6938bed81210af2da9a7e4a1a834b2e37a59b6dfb6141" dependencies = [ "js-sys", "wasm-bindgen", @@ -3708,42 +3548,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "web_atoms" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7cff6eef815df1834fd250e3a2ff436044d82a9f1bc1980ca1dbdf07effc538" -dependencies = [ - "phf", - "phf_codegen", - "string_cache", - "string_cache_codegen", -] - -[[package]] -name = "webpki-root-certs" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f31141ce3fc3e300ae89b78c0dd67f9708061d1d2eda54b8209346fd6be9a92c" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "webpki-roots" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" -dependencies = [ - "rustls-pki-types", -] - -[[package]] -name = "widestring" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "72069c3113ab32ab29e5584db3c6ec55d416895e60715417b5b883a357c3e471" - [[package]] name = "winapi" version = "0.3.9" @@ -3776,22 +3580,46 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] -name = "windows-link" -version = "0.2.1" +name = "windows-core" +version = "0.62.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - -[[package]] -name = "windows-registry" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02752bf7fbdcce7f2a27a742f798510f3e5ad88dbe84871e5168e2120c3d5720" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" dependencies = [ + "windows-implement", + "windows-interface", "windows-link", "windows-result", "windows-strings", ] +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-result" version = "0.4.1" @@ -3816,16 +3644,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.6", + "windows-targets", ] [[package]] name = "windows-sys" -version = "0.60.2" +version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -3843,31 +3671,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "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]] @@ -3876,190 +3687,54 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[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_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[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_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[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_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[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_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - [[package]] name = "writeable" version = "0.6.3" @@ -4067,38 +3742,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] -name = "x509-parser" -version = "0.16.0" +name = "xattr" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69" +checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ - "asn1-rs 0.6.2", - "data-encoding", - "der-parser 9.0.0", - "lazy_static", - "nom", - "oid-registry 0.7.1", - "rusticata-macros", - "thiserror 1.0.69", - "time", -] - -[[package]] -name = "x509-parser" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d43b0f71ce057da06bc0851b23ee24f3f86190b07203dd8f567d0b706a185202" -dependencies = [ - "asn1-rs 0.7.2", - "data-encoding", - "der-parser 10.0.0", - "lazy_static", - "nom", - "oid-registry 0.8.1", - "ring", - "rusticata-macros", - "thiserror 2.0.18", - "time", + "libc", + "rustix 1.1.4", ] [[package]] @@ -4110,21 +3760,11 @@ dependencies = [ "time", ] -[[package]] -name = "yasna" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b5f6765e852b9b4dc8e2a76843e4d64d1cea8e79bcde0b6901aea8e7c7f08282" -dependencies = [ - "bit-vec", - "time", -] - [[package]] name = "yoke" -version = "0.8.2" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +checksum = "709fe23a0424b6a435d82152b1bd3fdfb0833487d5fa90d05d42762a9891fef5" dependencies = [ "stable_deref_trait", "yoke-derive", @@ -4145,18 +3785,18 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "ce1022995ff5ff5d841ad7d994facc23098cd40152f2c1d11cd607c6f530653f" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.48" +version = "0.8.52" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "1ae7f38b72ec2a254e2b87ef277cf2cd4fb97cbebf944faa6f33354da0867930" dependencies = [ "proc-macro2", "quote", @@ -4186,23 +3826,9 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.8.2" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -dependencies = [ - "zeroize_derive", -] - -[[package]] -name = "zeroize_derive" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85a5b4158499876c763cb03bc4e49185d3cccbabb15b33c627f7884f43db852e" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] +checksum = "e13c156562582aa81c60cb29407084cdb54c4164760106ab78e6c5b0858cf64e" [[package]] name = "zerotrie" @@ -4237,42 +3863,8 @@ dependencies = [ "syn", ] -[[package]] -name = "zlib-rs" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" - [[package]] name = "zmij" version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" - -[[package]] -name = "zstd" -version = "0.13.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91ee311a569c327171651566e07972200e76fcfe2242a4fa446149a3881c08a" -dependencies = [ - "zstd-safe", -] - -[[package]] -name = "zstd-safe" -version = "7.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f49c4d5f0abb602a93fb8736af2a4f4dd9512e36f7f570d66e65ff867ed3b9d" -dependencies = [ - "zstd-sys", -] - -[[package]] -name = "zstd-sys" -version = "2.0.16+zstd.1.5.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91e19ebc2adc8f83e43039e79776e3fda8ca919132d68a1fed6a5faca2683748" -dependencies = [ - "cc", - "pkg-config", -] diff --git a/pkgs/by-name/cq/cqlsh-rs/package.nix b/pkgs/by-name/cq/cqlsh-rs/package.nix new file mode 100644 index 000000000000..30ca698d47af --- /dev/null +++ b/pkgs/by-name/cq/cqlsh-rs/package.nix @@ -0,0 +1,78 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + testers, + installShellFiles, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "cqlsh-rs"; + version = "0.5.12"; + + src = fetchFromGitHub { + owner = "scylladb"; + repo = "cqlsh-rs"; + rev = "v${finalAttrs.version}"; + hash = "sha256-0lxhO5mAcmF8lKzHUzUERjvvJVaPJ0VvZCu0ROPBRBY="; + }; + + # Upstream does not commit Cargo.lock. + # See https://github.com/scylladb/cqlsh-rs/issues/172 + cargoLock = { + lockFile = ./Cargo.lock; + }; + + postPatch = '' + ln -sf ${./Cargo.lock} Cargo.lock + ''; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ installShellFiles ]; + + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + # Ensure deterministic Mach-O UUID on Darwin. + SOURCE_DATE_EPOCH = 1; + }; + + preBuild = '' + # Remap build directory paths for deterministic output. + # Must be set in preBuild (not env) because $NIX_BUILD_TOP is a runtime + # bash variable that cannot be expanded in Nix string literals, and + # __structuredAttrs re-applies env vars between phases. + export RUSTFLAGS="--remap-path-prefix=$NIX_BUILD_TOP=/build ''${RUSTFLAGS:-}" + ''; + + # Only compile and run lib tests; skip integration tests and their heavy + # dev-deps (testcontainers, criterion, etc.) which require Docker/network. + cargoTestFlags = [ "--lib" ]; + + # Pager tests use std::env::set_var("PAGER", ...) which is not thread-safe; + # running tests serially avoids intermittent failures from env var races. + dontUseCargoParallelTests = true; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installManPage --name cqlsh-rs.1 <($out/bin/cqlsh-rs --generate-man) + + installShellCompletion --cmd cqlsh-rs \ + --bash <($out/bin/cqlsh-rs --completions bash) \ + --fish <($out/bin/cqlsh-rs --completions fish) \ + --zsh <($out/bin/cqlsh-rs --completions zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + }; + + meta = { + description = "Rust re-implementation of the Apache Cassandra cqlsh shell"; + homepage = "https://scylladb.github.io/cqlsh-rs/"; + changelog = "https://github.com/scylladb/cqlsh-rs/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ aaronjheng ]; + mainProgram = "cqlsh-rs"; + }; +}) diff --git a/pkgs/by-name/cr/crackql/package.nix b/pkgs/by-name/cr/crackql/package.nix index b3474f3f65c8..7860eb4fe424 100644 --- a/pkgs/by-name/cr/crackql/package.nix +++ b/pkgs/by-name/cr/crackql/package.nix @@ -42,7 +42,7 @@ python3.pkgs.buildPythonApplication { description = "GraphQL password brute-force and fuzzing utility"; mainProgram = "crackql"; homepage = "https://github.com/nicholasaleks/CrackQL"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/cr/cratedb/package.nix b/pkgs/by-name/cr/cratedb/package.nix index 8119c0d7f7fd..1f652d880999 100644 --- a/pkgs/by-name/cr/cratedb/package.nix +++ b/pkgs/by-name/cr/cratedb/package.nix @@ -72,7 +72,7 @@ maven.buildMavenPackage { ''; homepage = "https://cratedb.com/database"; changelog = "https://cratedb.com/docs/crate/reference/en/latest/appendices/release-notes/${version}.html"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; unix ++ windows; # FIXME: Somehow dependencies are platform-dependent. Somehow. broken = stdenvNoCC.hostPlatform.system != "x86_64-linux"; diff --git a/pkgs/by-name/cr/crates-lsp/package.nix b/pkgs/by-name/cr/crates-lsp/package.nix index c297cebaf644..fee204199ea1 100644 --- a/pkgs/by-name/cr/crates-lsp/package.nix +++ b/pkgs/by-name/cr/crates-lsp/package.nix @@ -22,13 +22,12 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Language Server implementation for Cargo.toml"; homepage = "https://github.com/MathiasPius/crates-lsp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = [ "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ steveej ]; diff --git a/pkgs/by-name/cr/crates-tui/package.nix b/pkgs/by-name/cr/crates-tui/package.nix index f601887ddc7f..c56137165e9c 100644 --- a/pkgs/by-name/cr/crates-tui/package.nix +++ b/pkgs/by-name/cr/crates-tui/package.nix @@ -34,13 +34,12 @@ rustPlatform.buildRustPackage { meta = { description = "TUI for exploring crates.io using Ratatui"; homepage = "https://github.com/ratatui/crates-tui"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; # See Cargo.toml: workspaces.metadata.dist.targets # Other platforms may work but YMMV platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" "x86_64-windows" ]; maintainers = with lib.maintainers; [ pluiedev ]; diff --git a/pkgs/by-name/cr/crc/package.nix b/pkgs/by-name/cr/crc/package.nix index dc35dffb6f76..3afe6f1bd619 100644 --- a/pkgs/by-name/cr/crc/package.nix +++ b/pkgs/by-name/cr/crc/package.nix @@ -8,16 +8,16 @@ }: let - openShiftVersion = "4.21.14"; + openShiftVersion = "4.22.1"; okdVersion = "4.21.0-okd-scos.8"; - microshiftVersion = "4.21.7"; + microshiftVersion = "4.22.0"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; - gitCommit = "6eb443d169c5a6dd461db1181f95506aa429f34b"; - gitHash = "sha256-sVByFqYvPLrpG90GYigLEDemaJVF2fj+tSgERmmRzsM="; + gitCommit = "70f0c9879a8812cdd6ae19c059ca5816d8de7900"; + gitHash = "sha256-TRqKCsHHc2+dpsLJ7t9apPvaR0jf/1xQrYV9swpk3RA="; in buildGoModule (finalAttrs: { pname = "crc"; - version = "2.61.0"; + version = "2.62.0"; src = fetchFromGitHub { owner = "crc-org"; diff --git a/pkgs/by-name/cr/crc32c/package.nix b/pkgs/by-name/cr/crc32c/package.nix index 221e67c07488..e34105895448 100644 --- a/pkgs/by-name/cr/crc32c/package.nix +++ b/pkgs/by-name/cr/crc32c/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/google/crc32c"; description = "CRC32C implementation with support for CPU-specific acceleration instructions"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ cpcloud ]; }; }) diff --git a/pkgs/by-name/cr/credhub-cli/package.nix b/pkgs/by-name/cr/credhub-cli/package.nix index 5850b41757ce..819049cf63d9 100644 --- a/pkgs/by-name/cr/credhub-cli/package.nix +++ b/pkgs/by-name/cr/credhub-cli/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "2.9.54"; src = fetchFromGitHub { - owner = "cloudfoundry-incubator"; + owner = "cloudfoundry"; repo = "credhub-cli"; rev = finalAttrs.version; sha256 = "sha256-qp7Oj207uu2P/Jt9O5tZM0ra9fMx+DfuHPaKr5z+ef0="; @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { meta = { description = "Provides a command line interface to interact with CredHub servers"; - homepage = "https://github.com/cloudfoundry-incubator/credhub-cli"; + homepage = "https://github.com/cloudfoundry/credhub-cli"; maintainers = with lib.maintainers; [ ris ]; license = lib.licenses.asl20; }; diff --git a/pkgs/by-name/cr/credslayer/package.nix b/pkgs/by-name/cr/credslayer/package.nix deleted file mode 100644 index e08e2309020a..000000000000 --- a/pkgs/by-name/cr/credslayer/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - fetchFromGitHub, - python3, - wireshark-cli, -}: - -python3.pkgs.buildPythonApplication rec { - pname = "credslayer"; - version = "0.1.3"; - format = "setuptools"; - - src = fetchFromGitHub { - owner = "ShellCode33"; - repo = "CredSLayer"; - tag = "v${version}"; - hash = "sha256-gryV9MHULY6ZHy6YDFQDIkZsfIX8La0tHT0vrrQJNDQ="; - }; - - propagatedBuildInputs = with python3.pkgs; [ - pyshark - ]; - - nativeCheckInputs = with python3.pkgs; [ - py - pytestCheckHook - wireshark-cli - ]; - - enabledTestPaths = [ - "tests/tests.py" - ]; - - disabledTests = [ - # Requires a telnet setup - "test_telnet" - # stdout has all the correct data, but the underlying test code fails - # functionally everything seems to be intact - "http_get_auth" - "test_http_post_auth" - "test_ntlmssp" - ]; - - pythonImportsCheck = [ - "credslayer" - ]; - - postInstall = '' - wrapProgram $out/bin/credslayer \ - --prefix PATH : "${lib.makeBinPath [ wireshark-cli ]}" - ''; - - meta = { - description = "Extract credentials and other useful info from network captures"; - mainProgram = "credslayer"; - homepage = "https://github.com/ShellCode33/CredSLayer"; - license = with lib.licenses; [ gpl3Only ]; - maintainers = with lib.maintainers; [ fab ]; - # broken due to wireshark 4.4 bump - # see: https://github.com/NixOS/nixpkgs/pull/344914 - broken = true; - }; -} diff --git a/pkgs/by-name/cr/credspy/package.nix b/pkgs/by-name/cr/credspy/package.nix new file mode 100644 index 000000000000..f964103921ab --- /dev/null +++ b/pkgs/by-name/cr/credspy/package.nix @@ -0,0 +1,41 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "credspy"; + version = "1.0.0-unstable-2026-06-22"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "RedByte1337"; + repo = "CredSpy"; + # https://github.com/RedByte1337/CredSpy/issues/2 + rev = "0fa54595fd6e5d1f903d8d248a7e9f3203e7ec09"; + hash = "sha256-PHSLke90obZw2cwY7zqp1DNnG26Hf+ixHunMwQHoU3o="; + }; + + build-system = with python3Packages; [ hatchling ]; + + dependencies = with python3Packages; [ requests ]; + + pythonImportsCheck = [ "credspy" ]; + + # Project has no tests + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Entra ID user enumeration and auth method discovery"; + homepage = "https://github.com/RedByte1337/CredSpy"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "credspy"; + }; +}) diff --git a/pkgs/by-name/cr/cri-o-unwrapped/package.nix b/pkgs/by-name/cr/cri-o-unwrapped/package.nix index f5e6e26b088a..7910c5f8c099 100644 --- a/pkgs/by-name/cr/cri-o-unwrapped/package.nix +++ b/pkgs/by-name/cr/cri-o-unwrapped/package.nix @@ -17,13 +17,13 @@ buildGoModule (finalAttrs: { pname = "cri-o"; - version = "1.36.0"; + version = "1.36.2"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; tag = "v${finalAttrs.version}"; - hash = "sha256-I+oqb8TeI7dBX4ecmEEWNKM7EAdCfGWYv6dpz8emvuA="; + hash = "sha256-mrR0Q23PCe2OMCgH6AgmSzE4zmZzTA6SiMD8OYiWdpE="; }; vendorHash = null; diff --git a/pkgs/by-name/cr/crlfsuite/package.nix b/pkgs/by-name/cr/crlfsuite/package.nix index 56081ef05d6d..9092df9eeec1 100644 --- a/pkgs/by-name/cr/crlfsuite/package.nix +++ b/pkgs/by-name/cr/crlfsuite/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "Nefcore"; + owner = "Raghavd3v"; repo = "CRLFsuite"; tag = "v${finalAttrs.version}"; sha256 = "sha256-mK20PbVGhTEjhY5L6coCzSMIrG/PHHmNq30ZoJEs6uI="; @@ -35,7 +35,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "CRLF injection (HTTP Response Splitting) scanner"; mainProgram = "crlfsuite"; - homepage = "https://github.com/Nefcore/CRLFsuite"; + homepage = "https://github.com/Raghavd3v/CRLFsuite"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab diff --git a/pkgs/by-name/cr/crlfuzz/package.nix b/pkgs/by-name/cr/crlfuzz/package.nix index b30c3b4c3b05..6115ffa3a269 100644 --- a/pkgs/by-name/cr/crlfuzz/package.nix +++ b/pkgs/by-name/cr/crlfuzz/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "Tool to scan for CRLF vulnerability"; mainProgram = "crlfuzz"; homepage = "https://github.com/dwisiswant0/crlfuzz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/cr/croaring/package.nix b/pkgs/by-name/cr/croaring/package.nix index 4b2be5003143..54e1a5c51436 100644 --- a/pkgs/by-name/cr/croaring/package.nix +++ b/pkgs/by-name/cr/croaring/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "croaring"; - version = "4.7.0"; + version = "4.7.2"; src = fetchFromGitHub { owner = "RoaringBitmap"; repo = "CRoaring"; tag = "v${finalAttrs.version}"; - hash = "sha256-YXEEiWbbP6G7x/rQiihAq20OEMxJNSgky+JTEaKlNDU="; + hash = "sha256-WSEMkXkR6diE5CV3gQ3tUAodLqNsWmBmrGyXOKg4CJA="; }; # roaring.pc.in cannot handle absolute CMAKE_INSTALL_*DIRs, nor diff --git a/pkgs/by-name/cr/croc/package.nix b/pkgs/by-name/cr/croc/package.nix index 3e6154a19da9..d10752e52d65 100644 --- a/pkgs/by-name/cr/croc/package.nix +++ b/pkgs/by-name/cr/croc/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "croc"; - version = "10.4.4"; + version = "10.4.13"; src = fetchFromGitHub { owner = "schollz"; repo = "croc"; rev = "v${finalAttrs.version}"; - hash = "sha256-Kwli0wgicebRlJE+c4McH6a7I2udRppJtKBopJ/eiFc="; + hash = "sha256-XhudK0wFk2VFYmd1ihW4SjJ4nzwNxOp9pTNUWJUg+AU="; }; - vendorHash = "sha256-jXv8M4MnaTVitLmQ4X+pyIihxcVGlEP4IEwZT1LPKIA="; + vendorHash = "sha256-rwGunSDIgetBsk97LxQz0WHpzMDMMESHC1OhBWRuVjI="; subPackages = [ "." ]; @@ -70,8 +70,8 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ equirosa - SuperSandro2000 ryan4yin + kaynetik ]; mainProgram = "croc"; }; diff --git a/pkgs/by-name/cr/crossfire-arch/package.nix b/pkgs/by-name/cr/crossfire-arch/package.nix index 21bb48e7973d..f0757abf53de 100644 --- a/pkgs/by-name/cr/crossfire-arch/package.nix +++ b/pkgs/by-name/cr/crossfire-arch/package.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; hydraPlatforms = [ ]; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossfire-client/package.nix b/pkgs/by-name/cr/crossfire-client/package.nix index 79ac50a254c0..ef821772ee61 100644 --- a/pkgs/by-name/cr/crossfire-client/package.nix +++ b/pkgs/by-name/cr/crossfire-client/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation { homepage = "http://crossfire.real-time.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossfire-gridarta/package.nix b/pkgs/by-name/cr/crossfire-gridarta/package.nix index 3f4b8ab5d15b..cf334fabdad8 100644 --- a/pkgs/by-name/cr/crossfire-gridarta/package.nix +++ b/pkgs/by-name/cr/crossfire-gridarta/package.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation { homepage = "http://crossfire.real-time.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossfire-jxclient/package.nix b/pkgs/by-name/cr/crossfire-jxclient/package.nix index 70f62541184c..c33183d6e8c9 100644 --- a/pkgs/by-name/cr/crossfire-jxclient/package.nix +++ b/pkgs/by-name/cr/crossfire-jxclient/package.nix @@ -68,6 +68,6 @@ stdenv.mkDerivation rec { homepage = "http://crossfire.real-time.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossfire-maps/package.nix b/pkgs/by-name/cr/crossfire-maps/package.nix index d48dea09daf4..703a6e3346c9 100644 --- a/pkgs/by-name/cr/crossfire-maps/package.nix +++ b/pkgs/by-name/cr/crossfire-maps/package.nix @@ -29,6 +29,6 @@ stdenv.mkDerivation { license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; hydraPlatforms = [ ]; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossfire-server/package.nix b/pkgs/by-name/cr/crossfire-server/package.nix index 0c7d715fe20c..7de376706186 100644 --- a/pkgs/by-name/cr/crossfire-server/package.nix +++ b/pkgs/by-name/cr/crossfire-server/package.nix @@ -55,6 +55,6 @@ stdenv.mkDerivation { homepage = "http://crossfire.real-time.com/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ToxicFrog ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/cr/crossmacro-daemon/deps.json b/pkgs/by-name/cr/crossmacro-daemon/deps.json index e7c1dcd91d03..348ebde20d7b 100644 --- a/pkgs/by-name/cr/crossmacro-daemon/deps.json +++ b/pkgs/by-name/cr/crossmacro-daemon/deps.json @@ -1,8 +1,8 @@ [ { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.7", - "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk=" + "version": "10.0.8", + "hash": "sha256-HV30fu+lF/GYkeVP+Yq/EU1FzgdMqwqlepCpvxUgugE=" }, { "pname": "Serilog", diff --git a/pkgs/by-name/cr/crossmacro-daemon/package.nix b/pkgs/by-name/cr/crossmacro-daemon/package.nix index f9b31c295935..c19cf34e5b24 100644 --- a/pkgs/by-name/cr/crossmacro-daemon/package.nix +++ b/pkgs/by-name/cr/crossmacro-daemon/package.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "crossmacro-daemon"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "alper-han"; repo = "CrossMacro"; tag = "v${version}"; - hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is="; + hash = "sha256-lMXp7ItwpZ14ATRKuR7Q8/FhfMNQ+YCgHL13oj6iBNs="; }; projectFile = "src/CrossMacro.Daemon/CrossMacro.Daemon.csproj"; diff --git a/pkgs/by-name/cr/crossmacro/deps.json b/pkgs/by-name/cr/crossmacro/deps.json index 469d0449149f..7c28f70ff48d 100644 --- a/pkgs/by-name/cr/crossmacro/deps.json +++ b/pkgs/by-name/cr/crossmacro/deps.json @@ -1,13 +1,8 @@ [ - { - "pname": "Acornima", - "version": "1.4.0", - "hash": "sha256-7SCe3Bgcyzlv6nXQfTOy3UZLc7ilZ3YXxgl6mcTF82s=" - }, { "pname": "Avalonia", - "version": "12.0.2", - "hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk=" + "version": "12.0.4", + "hash": "sha256-sHu0eifno4DJ0Tnl3v4e3OZY1oy41OO482UfKVkQfK0=" }, { "pname": "Avalonia.BuildServices", @@ -16,28 +11,28 @@ }, { "pname": "Avalonia.Fonts.Inter", - "version": "12.0.2", - "hash": "sha256-23iKfc71xCy+vaHlxSRi19ZsJ48Dey6mdOx9CGzg2SA=" + "version": "12.0.4", + "hash": "sha256-h0Nlzl9gpvt2z24lsJBD7l56ceCcZfOQKSzGOARgNV8=" }, { "pname": "Avalonia.FreeDesktop", - "version": "12.0.2", - "hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A=" + "version": "12.0.4", + "hash": "sha256-mj1icR/oMR4b6AygR3/ycq39DMuEpXHPy/fWeuwLYs8=" }, { "pname": "Avalonia.FreeDesktop.AtSpi", - "version": "12.0.2", - "hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI=" + "version": "12.0.4", + "hash": "sha256-FgfModA3bLccR6HM91A/+0198SR4NWg8zZIA3EE4wW8=" }, { "pname": "Avalonia.HarfBuzz", - "version": "12.0.2", - "hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE=" + "version": "12.0.4", + "hash": "sha256-tpTETc9r5b0CtXiYZEVgV57Tubqh3BS22+oq/ZU4YRQ=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "12.0.2", - "hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0=" + "version": "12.0.4", + "hash": "sha256-uuc61RM/WBfRmWCcBkoenLCreOxEGcF8U4t8RptrxiE=" }, { "pname": "Avalonia.Skia", @@ -46,18 +41,18 @@ }, { "pname": "Avalonia.Skia", - "version": "12.0.2", - "hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU=" + "version": "12.0.4", + "hash": "sha256-ba80KHyzW0NdoDK3iPntbi3NKEnh2c1rbrv4mu2xWcI=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "12.0.2", - "hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU=" + "version": "12.0.4", + "hash": "sha256-8b0+L0zU8J0csMkuRzeebsU/BENxD0iP2y5rSRmeMMk=" }, { "pname": "Avalonia.X11", - "version": "12.0.2", - "hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE=" + "version": "12.0.4", + "hash": "sha256-r6cV/4kqiZ6lBNgN2HrYagG41JFZrOe7GZzbSelBT2g=" }, { "pname": "CommunityToolkit.Mvvm", @@ -69,31 +64,16 @@ "version": "4.3.1", "hash": "sha256-nNn5+YEaqKSULhtDsImNEyndU/MHna7VpZNUExmo80o=" }, - { - "pname": "HarfBuzzSharp", - "version": "7.3.0.3", - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" - }, { "pname": "HarfBuzzSharp", "version": "8.3.1.3", "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU=" }, - { - "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.3", - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" - }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", "version": "8.3.1.3", "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU=" }, - { - "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" - }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", "version": "8.3.1.3", @@ -104,21 +84,11 @@ "version": "8.3.1.3", "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0=" }, - { - "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" - }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", "version": "8.3.1.3", "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM=" }, - { - "pname": "Jint", - "version": "4.8.0", - "hash": "sha256-+K8NGiJ1SChiyMrjn4dJOiBdnWXP6UOfXSsNsJ5//tI=" - }, { "pname": "MicroCom.Runtime", "version": "0.11.4", @@ -126,13 +96,13 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "10.0.7", - "hash": "sha256-dICogdaqa5mHqyvFA0lTomFa39Dqm4nn7Pit6qi6eQY=" + "version": "10.0.8", + "hash": "sha256-eKex/vpm5A4o2WV6sJyjqKPydWhekJFO6wrH0V7RyBY=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "10.0.7", - "hash": "sha256-uQmTQarMn0fuZV03MyCb78Ex+96cuqFHNO5SyFOPkJk=" + "version": "10.0.8", + "hash": "sha256-HV30fu+lF/GYkeVP+Yq/EU1FzgdMqwqlepCpvxUgugE=" }, { "pname": "Serilog", @@ -171,73 +141,68 @@ }, { "pname": "ShimSkiaSharp", - "version": "4.6.0", - "hash": "sha256-t2QHrLvtB9gONm2LA7GzGZIQXN5T0OrNDEdMqogWLic=" + "version": "5.0.0", + "hash": "sha256-zNZuDK+xWu4wl5NZG4z2JhuaYN/I6i70s3U5yKD6OGw=" }, { "pname": "SkiaSharp", - "version": "2.88.9", - "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + "version": "3.119.2", + "hash": "sha256-A9F397K5FfLeOsNZacKmUh4IU/WMK60B4Z6TEtS/oqo=" }, { "pname": "SkiaSharp", - "version": "3.119.4-preview.1.1", - "hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8=" + "version": "3.119.4", + "hash": "sha256-4ypEnTGUXAudFp61vGduHj9YmqtpiI5J1wP9wcOEwXY=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "3.119.4-preview.1.1", - "hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA=" + "version": "3.119.4", + "hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "3.119.4-preview.1.1", - "hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs=" + "version": "3.119.4", + "hash": "sha256-9/L1Oc5bujN6pKjW6sJcr1jL3RLt8/Mt3MmClOcwzyw=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "3.119.4-preview.1.1", - "hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ=" + "version": "3.119.4", + "hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "3.119.4-preview.1.1", - "hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM=" + "version": "3.119.4", + "hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E=" }, { "pname": "Svg.Animation", - "version": "4.6.0", - "hash": "sha256-KwXuouxbsgb98pyrYEL9HGWVkAXUzmfOsWYttCJQ1fk=" + "version": "5.0.0", + "hash": "sha256-paKYinI4AxOnVo+NKihYD5MA/6yu57CdL9a4J/ncGww=" }, { "pname": "Svg.Controls.Skia.Avalonia", - "version": "12.0.0.6", - "hash": "sha256-W0SLHlfzXIAO1YrbxwXcXBwV1CH18inaUv5l2qL/D68=" + "version": "12.0.0.11", + "hash": "sha256-/JXGujh32o9MOTe1aCoyGg0mn0/eJVia8f2iP6eN2Oc=" }, { "pname": "Svg.Custom", - "version": "4.6.0", - "hash": "sha256-Vp2VtpY1GMKh9FVTbgX5l6OtX/KKO+T+uj6KczNVLZk=" - }, - { - "pname": "Svg.JavaScript", - "version": "4.6.0", - "hash": "sha256-u9Bf3OU+cB5VnQr/CL7wBQw3YBxfh4OIXehXumDCYnI=" + "version": "5.0.0", + "hash": "sha256-WUu3lT9byGpjiwHnmzYUJey5T7sWPoMK5EZP6+UkgFY=" }, { "pname": "Svg.Model", - "version": "4.6.0", - "hash": "sha256-2b2g4TyQEYIEoubJHrB8Fpu2ZWb7eHN4vM/PZqJ1tbw=" + "version": "5.0.0", + "hash": "sha256-ROHls25fS8Y7MV70S2pzEqWkwTGeTOq9bfYd0QjEDuM=" }, { "pname": "Svg.SceneGraph", - "version": "4.6.0", - "hash": "sha256-8O89YBURkaJS08paV/LqLP4Z8oTdMJPrgkm8HAjWCcs=" + "version": "5.0.0", + "hash": "sha256-OA1qMUlnj7aJBltK0Mnwz2A8lv7ux8DveWt7gagojuc=" }, { "pname": "Svg.Skia", - "version": "4.6.0", - "hash": "sha256-kOUnFu2asUQqd3TfxN25WKbxR2TbcXOPTDCaR7LScP0=" + "version": "5.0.0", + "hash": "sha256-5o1HX5Eborn2GG1ns34ArYXeo2bEuIib9iXhMCSHoA8=" }, { "pname": "Tmds.DBus.Protocol", diff --git a/pkgs/by-name/cr/crossmacro/package.nix b/pkgs/by-name/cr/crossmacro/package.nix index 57037dfba893..bf9deb781197 100644 --- a/pkgs/by-name/cr/crossmacro/package.nix +++ b/pkgs/by-name/cr/crossmacro/package.nix @@ -27,13 +27,13 @@ buildDotnetModule rec { pname = "crossmacro"; - version = "1.1.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = "alper-han"; repo = "CrossMacro"; tag = "v${version}"; - hash = "sha256-M+Mat8pYeUyzomuvDdHdTHbyquTBDqrHHObVixTM3is="; + hash = "sha256-lMXp7ItwpZ14ATRKuR7Q8/FhfMNQ+YCgHL13oj6iBNs="; }; projectFile = "src/CrossMacro.UI.Linux/CrossMacro.UI.Linux.csproj"; diff --git a/pkgs/by-name/cr/crosspatch/package.nix b/pkgs/by-name/cr/crosspatch/package.nix index 1ae388c7cf83..5cae0918db02 100644 --- a/pkgs/by-name/cr/crosspatch/package.nix +++ b/pkgs/by-name/cr/crosspatch/package.nix @@ -67,6 +67,6 @@ stdenv.mkDerivation { homepage = "https://github.com/NickPlayzGITHUB/CrossPatch"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ toodeluna ]; + maintainers = with lib.maintainers; [ luna-the-tuna ]; }; } diff --git a/pkgs/by-name/cr/crossplane-cli/package.nix b/pkgs/by-name/cr/crossplane-cli/package.nix index fad2199fe069..9e99538f37ab 100644 --- a/pkgs/by-name/cr/crossplane-cli/package.nix +++ b/pkgs/by-name/cr/crossplane-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "crossplane-cli"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "crossplane"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-9BlNhllLz4LHPMy6gkph5flztQZBHI1tIMlNa22YPh4="; + hash = "sha256-pD91bH+K0nWDXv51mWtNlQVtBLi/zDEjAxAJ6ywd69g="; }; - vendorHash = "sha256-NHLryreDHxrqjo8VHR9R/MD8tDXYaZYyqgulxPOKUyA="; + vendorHash = "sha256-d7ZgiRF5LVxJoOwqfe0nHyJmakbexGEA7865QXUotP8="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/crosswords/package.nix b/pkgs/by-name/cr/crosswords/package.nix index 2944e468c472..a0f1538a6ac6 100644 --- a/pkgs/by-name/cr/crosswords/package.nix +++ b/pkgs/by-name/cr/crosswords/package.nix @@ -1,6 +1,7 @@ { lib, stdenv, + blueprint-compiler, desktop-file-utils, fetchFromGitLab, isocodes, @@ -17,17 +18,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "crosswords"; - version = "0.3.15"; + version = "0.3.17"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jrb"; repo = "crosswords"; rev = finalAttrs.version; - hash = "sha256-KcHcTjPoQNA5TBXnKgudjBTV/0JbeVMJ09XVAL7SizI="; + hash = "sha256-VeiVuMEfMCVjSk52BGtlypapeW6CBW1VQsrtDS8aCoY="; }; nativeBuildInputs = [ + blueprint-compiler desktop-file-utils meson ninja @@ -43,6 +45,12 @@ stdenv.mkDerivation (finalAttrs: { libipuz ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/crosswords.thumbnailer \ + --replace-fail "TryExec=crosswords-thumbnailer" "TryExec=$out/bin/crosswords-thumbnailer" \ + --replace-fail "Exec=crosswords-thumbnailer" "Exec=$out/bin/crosswords-thumbnailer" + ''; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/cr/crosvm/package.nix b/pkgs/by-name/cr/crosvm/package.nix index 2a5f375c9c83..89f552e48e54 100644 --- a/pkgs/by-name/cr/crosvm/package.nix +++ b/pkgs/by-name/cr/crosvm/package.nix @@ -21,18 +21,18 @@ rustPlatform.buildRustPackage { pname = "crosvm"; - version = "0-unstable-2026-02-13"; + version = "0-unstable-2026-07-15"; src = fetchgit { url = "https://chromium.googlesource.com/chromiumos/platform/crosvm"; - rev = "4c80bf3523cf84114054209d88a7af3eefd8423f"; - hash = "sha256-JpOw2DJsSjgm14M3ZenlXhnnNeYZC+G8jw8e9oEsBnQ="; + rev = "ffbf0df34699f9670db015962bac83d0d417d7e7"; + hash = "sha256-4z1TXMGOvOMUAED1gluugHPF4mBigjDioxnFneQOIS8="; fetchSubmodules = true; }; separateDebugInfo = true; - cargoHash = "sha256-AW/Gzbksek0mZ3UCtK64SfaHdY7/FHVrQmQ9xyW8MZQ="; + cargoHash = "sha256-bXATbiA+cRi9aOxpaTLRadBjl4O89x+J84byJ4CrsqI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cr/crow/cpm.patch b/pkgs/by-name/cr/crow/cpm.patch index d5a6b5b8ce6f..6a4a79cf2483 100644 --- a/pkgs/by-name/cr/crow/cpm.patch +++ b/pkgs/by-name/cr/crow/cpm.patch @@ -1,17 +1,30 @@ +From 0cfacb99db5940dabc385e7bc4534dfefa60fcfd Mon Sep 17 00:00:00 2001 +From: fliiiix +Date: Thu, 25 Jun 2026 10:46:35 +0200 +Subject: [PATCH] cpm + +--- + CMakeLists.txt | 4 ---- + tests/CMakeLists.txt | 11 +---------- + 2 files changed, 1 insertion(+), 14 deletions(-) + diff --git a/CMakeLists.txt b/CMakeLists.txt -index 7dbc2c3..cfdd98d 100644 +index 51fade9b4..1b93bffd2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -11,7 +11,6 @@ project(Crow +@@ -60,10 +60,6 @@ option(CROW_ENABLE_SSL "Enable Crow's SSL feature for supporting https" OFF) + option(CROW_ENABLE_COMPRESSION "Enable Crow's Compression feature for supporting compressed http content" OFF) + option(CROW_ENABLE_TSAN "Enable ThreadSanitizer" OFF) - 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) +-if(CROW_GENERATE_SBOM OR CROW_BUILD_TESTS) +- include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/CPM.cmake) +-endif () +- + if(CROW_GENERATE_SBOM) + CPMAddPackage( + NAME cmake-sbom diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt -index 67c458c..2873530 100644 +index 80f6dd364..e01adeb2f 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -5,18 +5,9 @@ set(CMAKE_POLICY_DEFAULT_CMP0077 new) @@ -23,7 +36,7 @@ index 67c458c..2873530 100644 +find_package(Catch2 REQUIRED) -CPMAddPackage(Catch2 -- VERSION 3.10.0 +- VERSION 3.12.0 - GITHUB_REPOSITORY catchorg/Catch2 - OPTIONS - "CATCH_INSTALL_DOCS Off" @@ -34,3 +47,6 @@ index 67c458c..2873530 100644 enable_testing() # list the test sources +-- +2.43.0 + diff --git a/pkgs/by-name/cr/crow/package.nix b/pkgs/by-name/cr/crow/package.nix index 65ed605821db..ce2b95c02aad 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.3.0.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "CrowCpp"; repo = "Crow"; tag = "v${finalAttrs.version}"; - hash = "sha256-QLYQ0RouqDDvhnBF79O/9M7IwlF0eQ3HTqR6bXWm574="; + hash = "sha256-MN2x1hgJ9TziZFPSZn6RuAEfl4mZv3ijU9LqQJkw6UM="; }; patches = [ diff --git a/pkgs/by-name/cr/crowdin-cli/package.nix b/pkgs/by-name/cr/crowdin-cli/package.nix index acf0adfbf76e..6ecda3150328 100644 --- a/pkgs/by-name/cr/crowdin-cli/package.nix +++ b/pkgs/by-name/cr/crowdin-cli/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "crowdin-cli"; - version = "4.14.3"; + version = "4.14.4"; src = fetchurl { url = "https://github.com/crowdin/crowdin-cli/releases/download/${finalAttrs.version}/crowdin-cli.zip"; - hash = "sha256-Jtj1WcKkJF0toa2/xK/cR0r4+lzzMFkoQnG6jCFSAM4="; + hash = "sha256-dHRFgAY+nWZq46VpC4tc/A2QR+f73ypn1aMxTI9g1F0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cr/crowdsec/package.nix b/pkgs/by-name/cr/crowdsec/package.nix index 3289a53dbc82..f146ec766583 100644 --- a/pkgs/by-name/cr/crowdsec/package.nix +++ b/pkgs/by-name/cr/crowdsec/package.nix @@ -3,26 +3,37 @@ buildGoModule, fetchFromGitHub, installShellFiles, + makeBinaryWrapper, }: buildGoModule (finalAttrs: { pname = "crowdsec"; - version = "1.7.7"; + version = "1.7.8"; src = fetchFromGitHub { owner = "crowdsecurity"; repo = "crowdsec"; tag = "v${finalAttrs.version}"; - hash = "sha256-TG9YRKzht9OAnlDNxLNP8060v0klee6GY7vJCu6MugM="; + hash = "sha256-2t9nxuqWNDAUOZHtfNkZ4ZFKXvv8k5LuvKrGNjpdGXc="; }; - vendorHash = "sha256-BjkTMBrQPv8uZzme02WFdobuYdbe1RvRkZ8RjHGubo8="; + vendorHash = "sha256-RDkttsV4PNOfjWPr4v+uIwdkmXYH83vkYFQQIO3CYGE="; - nativeBuildInputs = [ installShellFiles ]; + nativeBuildInputs = [ + installShellFiles + makeBinaryWrapper + ]; subPackages = [ "cmd/crowdsec" "cmd/crowdsec-cli" + "cmd/notification-dummy" + "cmd/notification-email" + "cmd/notification-file" + "cmd/notification-http" + "cmd/notification-sentinel" + "cmd/notification-slack" + "cmd/notification-splunk" ]; ldflags = [ @@ -39,13 +50,12 @@ buildGoModule (finalAttrs: { postBuild = "mv $GOPATH/bin/{crowdsec-cli,cscli}"; postInstall = '' + # so that `bin/crowdsec` is available for `cscli explain` for example + wrapProgram $out/bin/cscli --prefix PATH : $out/bin/ + mkdir -p $out/share/crowdsec cp -r ./config $out/share/crowdsec/ - mkdir -p $out/lib/systemd/system - substitute ./config/crowdsec.service $out/lib/systemd/system/crowdsec.service \ - --replace-fail /usr/local $out - installShellCompletion --cmd cscli \ --bash <($out/bin/cscli completion bash) \ --fish <($out/bin/cscli completion fish) \ @@ -63,6 +73,7 @@ buildGoModule (finalAttrs: { ''; meta = { + mainProgram = "crowdsec"; homepage = "https://crowdsec.net/"; changelog = "https://github.com/crowdsecurity/crowdsec/releases/tag/v${finalAttrs.version}"; description = "Free, open-source and collaborative IPS"; @@ -80,6 +91,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ jk + tornax ]; }; }) diff --git a/pkgs/by-name/cr/cruise/package.nix b/pkgs/by-name/cr/cruise/package.nix index 087e97b4feef..eed715ca09a6 100644 --- a/pkgs/by-name/cr/cruise/package.nix +++ b/pkgs/by-name/cr/cruise/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "cruise"; - version = "1.1.0"; + version = "2.2.2"; src = fetchFromGitHub { owner = "NucleoFusion"; repo = "cruise"; tag = "v${finalAttrs.version}"; - hash = "sha256-0xIugbLlKlMODbMvsFzQXjKNNGY61tF4P/0loPlfs6o="; + hash = "sha256-AhLSzynNvtHK3URTd1034/2ToGcJUDp7rGMtr3kyees="; }; vendorHash = "sha256-Zx1rZl5ljlsBNV1eQKPtQ+SgJV9l5rS8hwBe8nX9dYQ="; @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "TUI for managing Docker containers, images, volumes, networks, and more"; homepage = "https://github.com/NucleoFusion/cruise"; - license = lib.licenses.mit; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ greatnatedev ]; mainProgram = "cruise"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/cr/crunch/package.nix b/pkgs/by-name/cr/crunch/package.nix index 067a5e3a6644..0b328ac4dcb0 100644 --- a/pkgs/by-name/cr/crunch/package.nix +++ b/pkgs/by-name/cr/crunch/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "crunch"; homepage = "https://sourceforge.net/projects/crunch-wordlist/"; platforms = lib.platforms.unix; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/cr/crush/package.nix b/pkgs/by-name/cr/crush/package.nix index 7e50b3456162..7f4e1e65fe08 100644 --- a/pkgs/by-name/cr/crush/package.nix +++ b/pkgs/by-name/cr/crush/package.nix @@ -11,16 +11,16 @@ buildGo126Module (finalAttrs: { pname = "crush"; - version = "0.74.1"; + version = "0.86.0"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "crush"; tag = "v${finalAttrs.version}"; - hash = "sha256-JnELv8Q2GlOKhYbBRUDY8m8XuyyoD71Tw5qbnpbNxVY="; + hash = "sha256-dUeXU65A9/d365a9Z+eUoHOR0RnJV9SAYsks+Vtz9js="; }; - vendorHash = "sha256-D2GJ3ORyJy5Dn0MZJWgB3Wv1FyDoAWqLI3W0yU1q5Lw="; + vendorHash = "sha256-9WkkosPMwXsj32a5Zj4ZxphuB7aVteKq/YTzxP9Xmf0="; ldflags = [ "-s" diff --git a/pkgs/by-name/cr/cryfs/package.nix b/pkgs/by-name/cr/cryfs/package.nix deleted file mode 100644 index 1daefa523781..000000000000 --- a/pkgs/by-name/cr/cryfs/package.nix +++ /dev/null @@ -1,103 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - python3, - boost, - curl, - fuse, - gtest, - openssl, - range-v3, - spdlog, - llvmPackages, -}: - -stdenv.mkDerivation rec { - pname = "cryfs"; - version = "1.0.3"; - - src = fetchFromGitHub { - owner = "cryfs"; - repo = "cryfs"; - rev = version; - hash = "sha256-bBe//AjA9QmdSDlb0xiOboE5F4g6LJ03cHQZpfOk+Y4="; - }; - - postPatch = '' - patchShebangs src - - # remove tests that require network access - substituteInPlace test/cpp-utils/CMakeLists.txt \ - --replace "network/CurlHttpClientTest.cpp" "" \ - --replace "network/FakeHttpClientTest.cpp" "" - - # remove CLI test trying to access /dev/fuse - substituteInPlace test/cryfs-cli/CMakeLists.txt \ - --replace "CliTest_IntegrityCheck.cpp" "" \ - --replace "CliTest_Setup.cpp" "" \ - --replace "CliTest_WrongEnvironment.cpp" "" \ - --replace "CryfsUnmountTest.cpp" "" - - # downsize large file test as 4.5G is too big for Hydra - substituteInPlace test/cpp-utils/data/DataTest.cpp \ - --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" - ''; - - nativeBuildInputs = [ - cmake - pkg-config - python3 - ]; - - strictDeps = true; - - buildInputs = [ - boost - curl - fuse - gtest - openssl - range-v3 - spdlog - ] - ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - - cmakeFlags = [ - "-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'" - "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" - "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive - "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" - ]; - - # macFUSE needs to be installed for the test to succeed on Darwin - doCheck = !stdenv.hostPlatform.isDarwin; - - checkPhase = '' - runHook preCheck - export HOME=$(mktemp -d) - - # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) - SKIP_IMPURE_TESTS="CMakeFiles|fspp|my-gtest-main" - - for t in $(ls -d test/*/ | grep -E -v "$SKIP_IMPURE_TESTS") ; do - "./$t$(basename $t)-test" - done - - runHook postCheck - ''; - - meta = { - description = "Cryptographic filesystem for the cloud"; - homepage = "https://www.cryfs.org/"; - changelog = "https://github.com/cryfs/cryfs/raw/${version}/ChangeLog.txt"; - license = lib.licenses.lgpl3Only; - maintainers = with lib.maintainers; [ - peterhoeg - sigmasquadron - ]; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/cr/cryptomator-cli/package.nix b/pkgs/by-name/cr/cryptomator-cli/package.nix index b98ee6ba9bed..381bc7520644 100644 --- a/pkgs/by-name/cr/cryptomator-cli/package.nix +++ b/pkgs/by-name/cr/cryptomator-cli/package.nix @@ -27,7 +27,7 @@ maven.buildMavenPackage rec { mvnJdk = jdk; mvnParameters = "-Dmaven.test.skip=true"; - mvnHash = "sha256-54DT4C+WzyUBPxayA9YnB9I/Igd19iZygByUh5of51I="; + mvnHash = "sha256-oMfgWQ6mID1me0OP+BIwGJShCV5r/ahHlcAJ+S1KRBA="; env = { APP_VERSION = version; diff --git a/pkgs/by-name/cr/cryptsetup/package.nix b/pkgs/by-name/cr/cryptsetup/package.nix index 241d62fd7e9d..21ae5fc76b40 100644 --- a/pkgs/by-name/cr/cryptsetup/package.nix +++ b/pkgs/by-name/cr/cryptsetup/package.nix @@ -115,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "cryptsetup"; maintainers = with lib.maintainers; [ numinit - raitobezarius ]; platforms = with lib.platforms; linux; identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "cryptsetup_project" finalAttrs.version; diff --git a/pkgs/by-name/cs/csharp-ls/package.nix b/pkgs/by-name/cs/csharp-ls/package.nix index decfbf629b2a..f74f4d300085 100644 --- a/pkgs/by-name/cs/csharp-ls/package.nix +++ b/pkgs/by-name/cs/csharp-ls/package.nix @@ -11,9 +11,9 @@ in buildDotnetGlobalTool (finalAttrs: { pname = "csharp-ls"; - version = "0.25.0"; + version = "0.26.0"; - nugetHash = "sha256-w+zbCCR7ns8a5TqAOlwi5nE3AKWF9xhWG2jLmKbpzeI="; + nugetHash = "sha256-KwOYeu8Hu3CL/lanv7NwNkx8ggPmmqZ3o3WUu+IaFbA="; inherit dotnet-sdk; dotnet-runtime = dotnet-sdk; diff --git a/pkgs/by-name/cs/csharpier/package.nix b/pkgs/by-name/cs/csharpier/package.nix index 23a75a8bc7a7..6731cf7c7c12 100644 --- a/pkgs/by-name/cs/csharpier/package.nix +++ b/pkgs/by-name/cs/csharpier/package.nix @@ -2,10 +2,10 @@ buildDotnetGlobalTool { pname = "csharpier"; - version = "1.2.6"; + version = "1.3.0"; executables = "csharpier"; - nugetHash = "sha256-SaBHGaaeg/1c4okHN1Pn8caGZgfLJ/KsGRqgUiAqKlQ="; + nugetHash = "sha256-hwieEoQTcATyKZIZ7CQSWANPBv+pEShg6cDXU5EIexU="; meta = { description = "Opinionated code formatter for C#"; diff --git a/pkgs/by-name/cs/csharprepl/package.nix b/pkgs/by-name/cs/csharprepl/package.nix index fa0c82cf2fa5..fe0e76f7c63b 100644 --- a/pkgs/by-name/cs/csharprepl/package.nix +++ b/pkgs/by-name/cs/csharprepl/package.nix @@ -21,7 +21,7 @@ buildDotnetGlobalTool { changelog = "https://github.com/waf/CSharpRepl/blob/main/CHANGELOG.md"; license = lib.licenses.mpl20; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; mainProgram = "csharprepl"; }; } diff --git a/pkgs/by-name/cs/csvtk/package.nix b/pkgs/by-name/cs/csvtk/package.nix index 8798fb96b7de..dc7e47931040 100644 --- a/pkgs/by-name/cs/csvtk/package.nix +++ b/pkgs/by-name/cs/csvtk/package.nix @@ -7,7 +7,7 @@ buildPackages, }: let - version = "0.33.0"; + version = "0.37.0"; in buildGoModule { pname = "csvtk"; @@ -17,10 +17,13 @@ buildGoModule { owner = "shenwei356"; repo = "csvtk"; tag = "v${version}"; - hash = "sha256-Zacs1hw4pryVNxnrkLIoBNWo0jcKjtYdx6kW2LTFEIs="; + hash = "sha256-dpWxLOckdA0tNhSM8wGqBag/cXmMFhonybN+W1+KBXA="; }; - vendorHash = "sha256-T9flXxly3i8SKQlhp4AF2FNCqgcnGAHxv5b7nqzM3DI="; + vendorHash = "sha256-wi7WPwCg0MoNxgCLZO1UxG4M0g/Vo/GCiCGu8c5avyU="; + + # stale upstream test: asserts byte length, but expr-lang now returns rune count + checkFlags = [ "-skip=TestMutate3" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ct/ctodo/package.nix b/pkgs/by-name/ct/ctodo/package.nix index c2c93ba6e22b..d957f8b4427e 100644 --- a/pkgs/by-name/ct/ctodo/package.nix +++ b/pkgs/by-name/ct/ctodo/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.3"; src = fetchFromGitHub { - owner = "Acolarh"; + owner = "nielssp"; repo = "ctodo"; rev = "v${finalAttrs.version}"; sha256 = "0mqy5b35cbdwfpbs91ilsgz3wc4cky38xfz9pnr4q88q1vybigna"; diff --git a/pkgs/by-name/ct/ctpv/package.nix b/pkgs/by-name/ct/ctpv/package.nix index f0087e476b8f..b3494f54811d 100644 --- a/pkgs/by-name/ct/ctpv/package.nix +++ b/pkgs/by-name/ct/ctpv/package.nix @@ -8,6 +8,7 @@ atool, bat, chafa, + coreutils, delta, ffmpeg, ffmpegthumbnailer, @@ -16,7 +17,7 @@ imagemagick, jq, poppler-utils, - ueberzug, + ueberzugpp, }: stdenv.mkDerivation (finalAttrs: { @@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { atool # for archive files bat chafa # for image files on Wayland + coreutils delta # for diff files ffmpeg ffmpegthumbnailer @@ -54,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { imagemagick jq # for json files poppler-utils # for pdf files - ueberzug # for image files on X11 + ueberzugpp # for image files on X11 ] }"; ''; diff --git a/pkgs/by-name/ct/ctranslate2/package.nix b/pkgs/by-name/ct/ctranslate2/package.nix index bf13d9e7044f..b74567470c41 100644 --- a/pkgs/by-name/ct/ctranslate2/package.nix +++ b/pkgs/by-name/ct/ctranslate2/package.nix @@ -28,14 +28,17 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "ctranslate2"; - version = "4.7.2"; + version = "4.8.1"; + + __strutcturedAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "OpenNMT"; repo = "CTranslate2"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-jtOfMrC5kFKQN4eFEZeawo0blWHbpMu+peM3XtTSf5w="; + hash = "sha256-cchwv+esysn/0v6RqD5zp306HfzOjjlCxH5usLETXs0="; }; # Fix CMake 4 compatibility @@ -84,7 +87,7 @@ stdenv'.mkDerivation (finalAttrs: { mkl ] ++ lib.optionals withCUDA [ - cudaPackages.cuda_cccl # required by the fp16 headers in cudart + cudaPackages.cccl # required by the fp16 headers in cudart cudaPackages.cuda_cudart cudaPackages.libcublas cudaPackages.libcurand diff --git a/pkgs/by-name/ct/ctx7/package.nix b/pkgs/by-name/ct/ctx7/package.nix index 2d1ae96149eb..7b0fadbbdbc3 100644 --- a/pkgs/by-name/ct/ctx7/package.nix +++ b/pkgs/by-name/ct/ctx7/package.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ctx7"; - version = "0.4.4"; + version = "0.5.5"; __structuredAttrs = true; strictDeps = true; @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "upstash"; repo = "context7"; tag = "${finalAttrs.pname}@${finalAttrs.version}"; - hash = "sha256-3Hk3YEXIR6SAEtCeDeaU1fU/CyvxuObZSNbgqrzeJ/o="; + hash = "sha256-Ea281W/CT/TfFNFMKV7xQzXnMo/25mCAB/Gs9ofyUU4="; }; nativeBuildInputs = [ @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-ugUN1U0OR8dPTq4PADJaq6ElngSlw6PlmYDUFoW+2F4="; + hash = "sha256-F1A0y4uZczVqzce0FfugCaU5Y2qqMZQXy7T6oqlgkbA="; }; buildPhase = '' diff --git a/pkgs/by-name/ct/ctypes_sh/package.nix b/pkgs/by-name/ct/ctypes_sh/package.nix index c2885e928179..91f1504af266 100644 --- a/pkgs/by-name/ct/ctypes_sh/package.nix +++ b/pkgs/by-name/ct/ctypes_sh/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ctypes.sh"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "taviso"; repo = "ctypes.sh"; rev = "v${finalAttrs.version}"; - sha256 = "1wafyfhwd7nf7xdici0djpwgykizaz7jlarn0r1b4spnpjx1zbx4"; + sha256 = "sha256-ZYsjySJaxyLAiyGaNwngA7ef6vA+fUTCh9hi5g55v+g="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/cu/cubeb/package.nix b/pkgs/by-name/cu/cubeb/package.nix index 91cff5b1404e..10c4502c28d9 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-2026-06-09"; + version = "0-unstable-2026-07-16"; src = fetchFromGitHub { owner = "mozilla"; repo = "cubeb"; - rev = "b18d6992feeb7d4c4a0992257c85d96d761e68d2"; - hash = "sha256-H5ehdZ3PmH8VcBns7h8KsmsAjRVJqS7TSTeUwW/ucTM="; + rev = "0942f635f78049fc8af24939effed255ae0d0044"; + hash = "sha256-RQqmrRXRABsNDjGztsLLjsZlZFBEeAAc/ysoDj6CT1A="; }; outputs = [ diff --git a/pkgs/by-name/cu/cubelify/package.nix b/pkgs/by-name/cu/cubelify/package.nix index 87fb51f50e30..40ffb90e59ca 100644 --- a/pkgs/by-name/cu/cubelify/package.nix +++ b/pkgs/by-name/cu/cubelify/package.nix @@ -6,11 +6,11 @@ }: appimageTools.wrapType2 rec { pname = "cubelify"; - version = "1.25.11"; + version = "1.25.13"; src = fetchurl { url = "https://storage.cubelify.com/overlay/v1/Cubelify%20Overlay-${version}.AppImage"; - hash = "sha512-iWOkFTH5iPw3gzirWph14f8/M0cLQgsUyGX5Xnestc1oqcrKOJgdVb65RBWgCQBywhMkEXC0h1wzaZiBaKYuAQ=="; + hash = "sha512-1gNMoaEdh5qAySgRl9rjrFPLFpdTt6YxMaYdry4AJpQhNYxv45M1pq7D5HqJ4xgZHQZxfERPo+Wvfzk1rwaWog=="; }; nativeBuildInputs = [ makeWrapper ]; @@ -33,7 +33,7 @@ appimageTools.wrapType2 rec { meta = { description = "Powerful and feature-rich Hypixel anti-sniping stats overlay"; homepage = "https://cubelify.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "cubelify"; maintainers = with lib.maintainers; [ yunfachi ]; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/applications/science/logic/cubicle/default.nix b/pkgs/by-name/cu/cubicle/package.nix similarity index 86% rename from pkgs/applications/science/logic/cubicle/default.nix rename to pkgs/by-name/cu/cubicle/package.nix index 10a0b4044f13..4b74a10f6b4a 100644 --- a/pkgs/applications/science/logic/cubicle/default.nix +++ b/pkgs/by-name/cu/cubicle/package.nix @@ -4,14 +4,17 @@ fetchurl, autoreconfHook, which, - ocamlPackages, + ocaml-ng, }: -stdenv.mkDerivation rec { +let + ocamlPackages = ocaml-ng.ocamlPackages_4_14; +in +stdenv.mkDerivation (finalAttrs: { pname = "cubicle"; version = "1.2.0"; src = fetchurl { - url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${version}.tar.gz"; + url = "https://github.com/cubicle-model-checker/cubicle/archive/refs/tags/${finalAttrs.version}.tar.gz"; hash = "sha256-/EtbXpyXqRm0jGcMfGLAEwdr92061edjFys1V7/w6/Y="; }; @@ -45,4 +48,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ dwarfmaster ]; }; -} +}) diff --git a/pkgs/by-name/cu/cudatext-gtk/package.nix b/pkgs/by-name/cu/cudatext-gtk/package.nix new file mode 100644 index 000000000000..d2afa68f07f1 --- /dev/null +++ b/pkgs/by-name/cu/cudatext-gtk/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "gtk3"; } diff --git a/pkgs/by-name/cu/cudatext-qt/package.nix b/pkgs/by-name/cu/cudatext-qt/package.nix new file mode 100644 index 000000000000..dfed1f03a38b --- /dev/null +++ b/pkgs/by-name/cu/cudatext-qt/package.nix @@ -0,0 +1,3 @@ +{ cudatext }: + +cudatext.override { widgetset = "qt5"; } diff --git a/pkgs/by-name/cu/cudatext/deps.json b/pkgs/by-name/cu/cudatext/deps.json new file mode 100644 index 000000000000..03107f2a5a9e --- /dev/null +++ b/pkgs/by-name/cu/cudatext/deps.json @@ -0,0 +1,57 @@ +{ + "EncConv": { + "owner": "Alexey-T", + "rev": "2024.12.15", + "hash": "sha256-d57cOh4ucStPxOBYDt8+w1ITpCMbJW69T8mCfgJky3A=" + }, + "ATBinHex-Lazarus": { + "owner": "Alexey-T", + "rev": "2025.09.10", + "hash": "sha256-opt0gy2e+cptPWhPaSjWBikVRiAVTxwtIatdvzpc7eY=" + }, + "ATFlatControls": { + "owner": "Alexey-T", + "rev": "2026.07.13", + "hash": "sha256-6SEQ3WLXHlxze+8Ob/TEA4MJT7Ow1kE1Ti7qL19fwrA=" + }, + "ATSynEdit": { + "owner": "Alexey-T", + "rev": "2026.06.24", + "hash": "sha256-mjvWki4rUSvSYCmqM2eLDwbsKHkSSnq4noZYJDby1rY=" + }, + "ATSynEdit_Cmp": { + "owner": "Alexey-T", + "rev": "2025.02.15", + "hash": "sha256-mCb2112u5cQOsGpJdgJKZnDsAQs5p5+rSINTs4BaQeQ=" + }, + "EControl": { + "owner": "Alexey-T", + "rev": "2026.07.18", + "hash": "sha256-my3FmW/1wIh639GxMvnmrc8whLnqHPQaSG6U1tSyPEs=" + }, + "ATSynEdit_Ex": { + "owner": "Alexey-T", + "rev": "2026.07.08", + "hash": "sha256-mwFBB75vSCLiL1XQ0yR/Tf9ykTevdyAIYtYnusF77T0=" + }, + "Python-for-Lazarus": { + "owner": "Alexey-T", + "rev": "2024.10.15", + "hash": "sha256-HKo4GRZ91VDRc6AKs+lJYsFvgd+5VQlFY6pkg3gXz/s=" + }, + "Emmet-Pascal": { + "owner": "Alexey-T", + "rev": "2023.12.02", + "hash": "sha256-NDYhjmVGiw9UKfOQhXLdJiTaGZeTs8kr2hBujI2s+3E=" + }, + "CudaText-lexers": { + "owner": "CudaText-addons", + "rev": "2026.04.05", + "hash": "sha256-LtyfXEaIDjbivuL05E00U8Myy1mQFCzl9LQjiEr4U/E=" + }, + "bgrabitmap": { + "owner": "bgrabitmap", + "rev": "v11.6.6", + "hash": "sha256-bA8tvo7Srm5kIZTVWEA2+gjqHab7LByyL/zqdQxeFlA=" + } +} diff --git a/pkgs/applications/editors/cudatext/default.nix b/pkgs/by-name/cu/cudatext/package.nix similarity index 88% rename from pkgs/applications/editors/cudatext/default.nix rename to pkgs/by-name/cu/cudatext/package.nix index ba0cdf1ea046..85e02a9d6aa7 100644 --- a/pkgs/applications/editors/cudatext/default.nix +++ b/pkgs/by-name/cu/cudatext/package.nix @@ -7,15 +7,16 @@ fpc, libx11, - # GTK2/3 + # GTK3 + harfbuzz, pango, cairo, glib, atk, - gtk2, gtk3, gdk-pixbuf, python3, + wrapGAppsHook3, # Qt5 libsForQt5, @@ -26,7 +27,6 @@ }: assert builtins.elem widgetset [ - "gtk2" "gtk3" "qt5" ]; @@ -42,13 +42,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "cudatext"; - version = "1.202.1"; + version = "1.235.1.0"; src = fetchFromGitHub { owner = "Alexey-T"; repo = "CudaText"; tag = finalAttrs.version; - hash = "sha256-ZFMO986D4RtrTnLFdcL0a2BNjcsB+9pIolylblku7j4="; + hash = "sha256-9W0DlQfPbSJPFz7+ExbfFeYWc7IKsvvcjY0/3X6j0ys="; }; patches = [ ./proc_globdata.patch ]; @@ -65,20 +65,21 @@ stdenv.mkDerivation (finalAttrs: { lazarus fpc ] + ++ lib.optional (widgetset == "gtk3") wrapGAppsHook3 # required for FileChooser ++ lib.optional (widgetset == "qt5") libsForQt5.wrapQtAppsHook; buildInputs = [ libx11 ] - ++ lib.optionals (lib.hasPrefix "gtk" widgetset) [ + ++ lib.optionals (widgetset == "gtk3") [ + harfbuzz pango cairo glib atk gdk-pixbuf + gtk3 ] - ++ lib.optional (widgetset == "gtk2") gtk2 - ++ lib.optional (widgetset == "gtk3") gtk3 ++ lib.optional (widgetset == "qt5") libsForQt5.libqtpas; env.NIX_LDFLAGS = toString [ @@ -94,10 +95,6 @@ stdenv.mkDerivation (finalAttrs: { '') deps ) + '' - # See https://wiki.freepascal.org/CudaText#How_to_compile_CudaText - substituteInPlace ATSynEdit/atsynedit/atsynedit_package.lpk \ - --replace GTK2_IME_CODE _GTK2_IME_CODE - lazbuild --lazarusdir=${lazarus}/share/lazarus --pcp=./lazarus --ws=${widgetset} \ bgrabitmap/bgrabitmap/bgrabitmappack.lpk \ EncConv/encconv/encconv_package.lpk \ diff --git a/pkgs/applications/editors/cudatext/proc_globdata.patch b/pkgs/by-name/cu/cudatext/proc_globdata.patch similarity index 100% rename from pkgs/applications/editors/cudatext/proc_globdata.patch rename to pkgs/by-name/cu/cudatext/proc_globdata.patch diff --git a/pkgs/applications/editors/cudatext/update.sh b/pkgs/by-name/cu/cudatext/update.sh similarity index 91% rename from pkgs/applications/editors/cudatext/update.sh rename to pkgs/by-name/cu/cudatext/update.sh index 3ed1f8d56dc3..eb5eb43c46fa 100755 --- a/pkgs/applications/editors/cudatext/update.sh +++ b/pkgs/by-name/cu/cudatext/update.sh @@ -19,8 +19,8 @@ url="https://github.com/Alexey-T/CudaText/archive/refs/tags/${version}.tar.gz" hash=$(nix-prefetch-url --quiet --unpack --type sha256 $url) sriHash=$(nix --extra-experimental-features nix-command hash to-sri --type sha256 $hash) -sed -i "s#version = \".*\"#version = \"$version\"#" default.nix -sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" default.nix +sed -i "s#version = \".*\"#version = \"$version\"#" package.nix +sed -i "s#hash = \".*\"#hash = \"$sriHash\"#" package.nix while IFS=$'\t' read repo owner rev; do latest=$(curl -s https://api.github.com/repos/${owner}/${repo}/releases/latest | jq -r '.tag_name') diff --git a/pkgs/by-name/cu/cue/package.nix b/pkgs/by-name/cu/cue/package.nix index 45e51e985f56..fdecd5294637 100644 --- a/pkgs/by-name/cu/cue/package.nix +++ b/pkgs/by-name/cu/cue/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "cue"; - version = "0.16.1"; + version = "0.17.1"; src = fetchFromGitHub { owner = "cue-lang"; repo = "cue"; tag = "v${finalAttrs.version}"; - hash = "sha256-mTj3XMWByNrKjm+/MOQGLyUKIv4JJ8i6Oaphbzls84U="; + hash = "sha256-77IRLWlBlJ76yr9UzVpKuxZ9XbYFdGDdv/jPUojw8yc="; }; - vendorHash = "sha256-HXRrVPjPc10Q1MVr1d9vZBWgSVqNZ5J0UgvP/hTPfcg="; + vendorHash = "sha256-dTUg6EnU6xKCGve9ksxqBF3BaoBdVlXFU8pTyZtV+RA="; subPackages = [ "cmd/*" ]; diff --git a/pkgs/by-name/cu/cuetsy/package.nix b/pkgs/by-name/cu/cuetsy/package.nix index 0ed00d3b0edc..7de01e25da17 100644 --- a/pkgs/by-name/cu/cuetsy/package.nix +++ b/pkgs/by-name/cu/cuetsy/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.1.11"; src = fetchFromGitHub { - owner = "grafana"; + owner = "grafana-cold-storage"; repo = "cuetsy"; rev = "v${finalAttrs.version}"; hash = "sha256-dirzVR4j5K1+EHbeRi4rHwRxkyveySoM7qJzvOlGp+0="; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { meta = { description = "Experimental CUE->TypeScript exporter"; - homepage = "https://github.com/grafana/cuetsy"; + homepage = "https://github.com/grafana-cold-storage/cuetsy"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ bryanhonof ]; mainProgram = "cuetsy"; diff --git a/pkgs/by-name/cu/cup-docker-noserver/package.nix b/pkgs/by-name/cu/cup-docker-noserver/package.nix deleted file mode 100644 index 64597c39dbe4..000000000000 --- a/pkgs/by-name/cu/cup-docker-noserver/package.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - cup-docker, -}: - -cup-docker.override { - withServer = false; -} diff --git a/pkgs/by-name/cu/cup-docker/package.nix b/pkgs/by-name/cu/cup-docker/package.nix deleted file mode 100644 index 03695438dbe4..000000000000 --- a/pkgs/by-name/cu/cup-docker/package.nix +++ /dev/null @@ -1,91 +0,0 @@ -{ - rustPlatform, - fetchFromGitHub, - lib, - stdenvNoCC, - bun, - nodejs-slim_latest, - nix-update-script, - withServer ? true, -}: -rustPlatform.buildRustPackage (finalAttrs: { - pname = "cup-docker"; - version = "3.5.1"; - - src = fetchFromGitHub { - owner = "sergi0g"; - repo = "cup"; - tag = "v${finalAttrs.version}"; - hash = "sha256-l7TQwCzQNwrsM+xRcRcQaxIsnd8SVzrqEMwIoZGVBR0="; - }; - - web = stdenvNoCC.mkDerivation (finalAttrsWeb: { - pname = "cup-docker-web"; - inherit (finalAttrs) version src; - impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ - "GIT_PROXY_COMMAND" - "SOCKS_SERVER" - ]; - sourceRoot = "${finalAttrsWeb.src.name}/web"; - nativeBuildInputs = [ - bun - nodejs-slim_latest - ]; - configurePhase = '' - runHook preConfigure - bun install --no-progress --frozen-lockfile - substituteInPlace node_modules/.bin/{vite,tsc} \ - --replace-fail "/usr/bin/env node" "${nodejs-slim_latest}/bin/node" - runHook postConfigure - ''; - buildPhase = '' - runHook preBuild - bun run build - runHook postBuild - ''; - installPhase = '' - runHook preInstall - mkdir -p $out/dist - cp -R ./dist $out - runHook postInstall - ''; - outputHash = "sha256-uLsWppRabaI7JSHYf3YsEvf0Y36kU/iuNXnDXd+6AXY="; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; - }); - - cargoHash = "sha256-1VSbv6lDRRLZIu7hYrAqzQmvxcuhnPU0rcWfg7Upcm4="; - - buildNoDefaultFeatures = true; - buildFeatures = [ - "cli" - ] - ++ lib.optional withServer [ - "server" - ]; - - preConfigure = lib.optionalString withServer '' - cp -r ${finalAttrs.web}/dist src/static - ''; - - passthru = { - updateScript = nix-update-script { - extraArgs = [ - "--subpackage" - "web" - ]; - }; - }; - - meta = { - description = "Lightweight way to check for container image updates. written in Rust"; - homepage = "https://cup.sergi0g.dev"; - license = lib.licenses.agpl3Only; - platforms = lib.platforms.all; - changelog = "https://github.com/sergi0g/cup/releases"; - mainProgram = "cup"; - maintainers = with lib.maintainers; [ - kuflierl - ]; - }; -}) diff --git a/pkgs/by-name/cu/cups-printers/package.nix b/pkgs/by-name/cu/cups-printers/package.nix index 7378b14fe30b..fd1fca6dee9d 100644 --- a/pkgs/by-name/cu/cups-printers/package.nix +++ b/pkgs/by-name/cu/cups-printers/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "audiusGmbH"; + owner = "audius"; repo = "cups-printers"; tag = finalAttrs.version; hash = "sha256-Fne7V9dEZwdV6OsQPg2gzrz/wloAOOuwlx3CqXOyWBc="; diff --git a/pkgs/applications/misc/curaengine/stable.nix b/pkgs/by-name/cu/curaengine_stable/package.nix similarity index 86% rename from pkgs/applications/misc/curaengine/stable.nix rename to pkgs/by-name/cu/curaengine_stable/package.nix index fcc0e6be5aaa..2e602b76a602 100644 --- a/pkgs/applications/misc/curaengine/stable.nix +++ b/pkgs/by-name/cu/curaengine_stable/package.nix @@ -11,8 +11,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "Ultimaker"; repo = "CuraEngine"; - rev = finalAttrs.version; - sha256 = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0="; + tag = finalAttrs.version; + hash = "sha256-8V21TRSqCN+hkTlz51d5A5oK5JOwEtx+ROt8cfJBL/0="; }; postPatch = '' diff --git a/pkgs/by-name/cu/curlMinimal/package.nix b/pkgs/by-name/cu/curlMinimal/package.nix index 28220181cba0..8ef587a7ab88 100644 --- a/pkgs/by-name/cu/curlMinimal/package.nix +++ b/pkgs/by-name/cu/curlMinimal/package.nix @@ -6,6 +6,8 @@ perl, nixosTests, autoreconfHook, + buildPackages, + runtimeShellPackage, brotliSupport ? false, brotli, c-aresSupport ? false, @@ -82,9 +84,12 @@ assert ]) > 1 ); +let + isCross = !lib.systems.equals stdenv.buildPlatform stdenv.hostPlatform; +in stdenv.mkDerivation (finalAttrs: { pname = "curl"; - version = "8.20.0"; + version = "8.21.0"; src = fetchurl { urls = [ @@ -93,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { builtins.replaceStrings [ "." ] [ "_" ] finalAttrs.version }/curl-${finalAttrs.version}.tar.xz" ]; - hash = "sha256-Y/4twUi6DOromSLvg49+XJRicsLni3xZ+rS3nTziuJY="; + hash = "sha256-qhtmpw6s6D3GJFCHRWRsCK5WHeUSq0A63/uTrIf8cuY="; }; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion @@ -115,6 +120,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; strictDeps = true; + __structuredAttrs = true; env = { CXX = "${stdenv.cc.targetPrefix}c++"; @@ -240,7 +246,20 @@ stdenv.mkDerivation (finalAttrs: { ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary} ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4 ln $out/lib/libcurl${stdenv.hostPlatform.extensions.sharedLibrary} $out/lib/libcurl-gnutls${stdenv.hostPlatform.extensions.sharedLibrary}.4.4.0 + '' + # The wcurl shell script found in `''${!outputBin}/bin`, is located in the + # source along with all the scripts patched in `postPatch` above. + # `patchShebangs` at that stage causes the host intended wcurl script to get + # the buildPlatform's runtimeShell shebang, instead of the hostPlatform's. To + # make sure this doesn't happen we disallow it, and fix it above in the + # postInstall, and also with the conditional hostPlatform's + # runtimeShellPackage added in buildInputs. + + lib.optionalString isCross '' + patchShebangs --update --host "''${!outputBin}/bin" ''; + outputChecks.bin.disallowedReferences = lib.optional isCross buildPackages.runtimeShellPackage; + outputChecks.out.disallowedReferences = lib.optional isCross buildPackages.runtimeShellPackage; + buildInputs = lib.optional isCross runtimeShellPackage; passthru = let diff --git a/pkgs/by-name/cu/curlconverter/package.nix b/pkgs/by-name/cu/curlconverter/package.nix new file mode 100644 index 000000000000..776502e846d9 --- /dev/null +++ b/pkgs/by-name/cu/curlconverter/package.nix @@ -0,0 +1,31 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, +}: +buildNpmPackage (final: { + pname = "curlconverter"; + version = "4.12.0"; + + src = fetchFromGitHub { + owner = "curlconverter"; + repo = "curlconverter"; + tag = "v${final.version}"; + hash = "sha256-eJ8D5HkYSkWqQt/4UTv6/X6coLwcODde6xGEPQXgJRo="; + }; + + npmDepsHash = "sha256-UIbMvw8hkZxtSGInV2+Fjm4DZahrdGtSxi0Unhb5lh8="; + + # Prevent the dependency tree-sitter-cli from running its install script, which has an impure network request: https://github.com/tree-sitter/tree-sitter/blob/fd77bda97a0ca05d124590833312e4103f985543/crates/cli/npm/install.js#L63 + npmFlags = [ "--ignore-scripts" ]; + + npmBuildScript = "compile"; + + meta = { + description = "Convert curl commands to Python, JavaScript and more"; + homepage = "https://curlconverter.com/"; + license = lib.licenses.mit; + mainProgram = "curlconverter"; + maintainers = with lib.maintainers; [ jiamingc ]; + }; +}) diff --git a/pkgs/by-name/cu/cursor-cli/package.nix b/pkgs/by-name/cu/cursor-cli/package.nix index 9abc46274cad..a9169ec971c7 100644 --- a/pkgs/by-name/cu/cursor-cli/package.nix +++ b/pkgs/by-name/cu/cursor-cli/package.nix @@ -10,26 +10,22 @@ let inherit (stdenv) hostPlatform; sources = { x86_64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.24-dda726e/linux/x64/agent-cli-package.tar.gz"; - hash = "sha256-+hK1TIp6gLLboHlZQTOtA2qbnB58oKkPGlaGvg/UyYc="; + url = "https://downloads.cursor.com/lab/2026.07.16-899851b/linux/x64/agent-cli-package.tar.gz"; + hash = "sha256-EGrPazo3gc0nkDhyarxPefmHRJufUhmw9uYtlsiP7m0="; }; aarch64-linux = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.24-dda726e/linux/arm64/agent-cli-package.tar.gz"; - hash = "sha256-Uo9Nma7S3yQft6ocKOVFBknKDYCQTZiPJPhEBehLObY="; - }; - x86_64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.24-dda726e/darwin/x64/agent-cli-package.tar.gz"; - hash = "sha256-6X6jaZBW/deCyiL/KAjTqVCF0bGwlds4wmU3GkSpfmU="; + url = "https://downloads.cursor.com/lab/2026.07.16-899851b/linux/arm64/agent-cli-package.tar.gz"; + hash = "sha256-jujK8/VKymxztowTwNZL25ibGmXftldEFNmwMNDRCRg="; }; aarch64-darwin = fetchurl { - url = "https://downloads.cursor.com/lab/2026.05.24-dda726e/darwin/arm64/agent-cli-package.tar.gz"; - hash = "sha256-rwi0NjOmQB3S89H8y5KmF19vxbJtj8gv/p7susx45Q8="; + url = "https://downloads.cursor.com/lab/2026.07.16-899851b/darwin/arm64/agent-cli-package.tar.gz"; + hash = "sha256-wM17Y8AftjtE4zx6JhNDLo/YyxOIHacqwWE8nxQIEV8="; }; }; in stdenv.mkDerivation { pname = "cursor-cli"; - version = "0-unstable-2026-05-24"; + version = "0-unstable-2026-07-16"; src = sources.${hostPlatform.system}; diff --git a/pkgs/by-name/cu/cursor-cli/update.sh b/pkgs/by-name/cu/cursor-cli/update.sh index 82484933310f..26b370557183 100755 --- a/pkgs/by-name/cu/cursor-cli/update.sh +++ b/pkgs/by-name/cu/cursor-cli/update.sh @@ -22,7 +22,7 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then exit 0 fi -declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [x86_64-darwin]="darwin/x64" [aarch64-darwin]="darwin/arm64" ) +declare -A platforms=( [x86_64-linux]="linux/x64" [aarch64-linux]="linux/arm64" [aarch64-darwin]="darwin/arm64" ) for platform in "${!platforms[@]}"; do url="https://downloads.cursor.com/lab/$release/${platforms[$platform]}/agent-cli-package.tar.gz" diff --git a/pkgs/by-name/cu/cutecosmic/package.nix b/pkgs/by-name/cu/cutecosmic/package.nix index cbdd6ae9c449..12835a8cc0f5 100644 --- a/pkgs/by-name/cu/cutecosmic/package.nix +++ b/pkgs/by-name/cu/cutecosmic/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "cutecosmic"; - version = "0.1-unstable-2026-03-25"; + version = "0.1-unstable-2026-07-11"; src = fetchFromGitHub { owner = "IgKh"; repo = "cutecosmic"; - rev = "441c5ac05b85dd7afeaf02689af7de7428717c6b"; - hash = "sha256-NMRP9QeN+57pUyA0/xynITJyWrCu/Eg2ZvGzDBzfmvQ="; + rev = "3f518924fbccc1b62f4d9e8db6c9eda7490959c9"; + hash = "sha256-bombgw+vxn8LQ60ZWMrIJuwejsyJd+2dNkAjQBzVj3w="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/cu/cutter/package.nix b/pkgs/by-name/cu/cutter/package.nix index 3da5d1f86b02..4872bb232346 100644 --- a/pkgs/by-name/cu/cutter/package.nix +++ b/pkgs/by-name/cu/cutter/package.nix @@ -1,7 +1,6 @@ { lib, fetchFromGitHub, - fetchpatch2, stdenv, # for passthru.plugins pkgs, @@ -19,24 +18,16 @@ let cutter = stdenv.mkDerivation rec { pname = "cutter"; - version = "2.4.1"; + version = "2.5.0"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - hash = "sha256-fNOznaFzWJ4Dve9U1+E4xPaznnyxae2jHNaBCdJzDyQ="; + hash = "sha256-dnVbtAp7TorPQx4qdK43L2pXMcnWvOYjhRC3MJBrAmM="; fetchSubmodules = true; }; - patches = [ - (fetchpatch2 { - name = "fix-shiboken6-type-index-case.patch"; - url = "https://github.com/rizinorg/cutter/commit/07fea9c772dc573588dc2e5771f0740ee1883738.patch?full_index=1"; - hash = "sha256-/C/s+Ui5F7MCxbzbChQ5Tv/oUHUQxXmk9xOnNI80xwQ="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/cv/cv/package.nix b/pkgs/by-name/cv/cv/package.nix new file mode 100644 index 000000000000..d78489b929e8 --- /dev/null +++ b/pkgs/by-name/cv/cv/package.nix @@ -0,0 +1,35 @@ +{ + lib, + php, + fetchFromGitHub, +}: + +php.buildComposerProject2 (finalAttrs: { + pname = "cv"; + version = "0.3.71"; + __structuredAttrs = true; + strictDeps = true; + dontUnpack = false; + + src = fetchFromGitHub { + owner = "civicrm"; + repo = "cv"; + rev = "v${finalAttrs.version}"; + hash = "sha256-1InNm8ayshrACLUJ4MXb6DTnD9vxRVtwnK9oFAxMMho="; + }; + + vendorHash = "sha256-7+roKbgbSx00CrHDOwp7yxcSTdq9YDNgTLIdjLT05oM="; + + installPhase = '' + runHook preInstall + cp -ra $src $out + runHook postInstall + ''; + meta = { + homepage = "https://civicrm.org/"; + changelog = "https://github.com/civicrm/cv/releases/tag/v${finalAttrs.version}"; + description = "CiviCRM CLI Utility"; + license = lib.licenses.agpl3Plus; + maintainers = [ lib.maintainers.sorooris ]; + }; +}) diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/by-name/cv/cve-bin-tool/package.nix similarity index 100% rename from pkgs/tools/security/cve-bin-tool/default.nix rename to pkgs/by-name/cv/cve-bin-tool/package.nix diff --git a/pkgs/by-name/cw/cwiid/fix-ar.diff b/pkgs/by-name/cw/cwiid/fix-ar.diff deleted file mode 100644 index 8ca4b885a0a3..000000000000 --- a/pkgs/by-name/cw/cwiid/fix-ar.diff +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/common/include/lib.mak.in b/common/include/lib.mak.in -index 3afbb14..b8df9d9 100644 ---- a/common/include/lib.mak.in -+++ b/common/include/lib.mak.in -@@ -22,7 +22,7 @@ static: $(STATIC_LIB) - shared: $(SHARED_LIB) - - $(STATIC_LIB): $(OBJECTS) -- ar rcs $(STATIC_LIB) $(OBJECTS) -+ $(AR) rcs $(STATIC_LIB) $(OBJECTS) - - $(SHARED_LIB): $(OBJECTS) - $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $(SHARED_LIB) \ -diff --git a/configure.ac b/configure.ac -index 82ca3e1..0a78283 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -15,6 +15,8 @@ if test "$YACC" != "bison -y"; then - AC_MSG_ERROR([bison not found]) - fi - -+AC_CHECK_TOOL([AR], [ar], [:]) -+ - AC_ARG_WITH( - [python], - [AS_HELP_STRING([--without-python],[compile without python support])], diff --git a/pkgs/by-name/cw/cwiid/package.nix b/pkgs/by-name/cw/cwiid/package.nix deleted file mode 100644 index 2d7391811e6e..000000000000 --- a/pkgs/by-name/cw/cwiid/package.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - autoreconfHook, - bison, - flex, - bluez, - pkg-config, - gtk2, -}: - -stdenv.mkDerivation { - pname = "cwiid"; - version = "unstable-2010-02-21"; - - src = fetchFromGitHub { - owner = "abstrakraft"; - repo = "cwiid"; - rev = "fadf11e89b579bcc0336a0692ac15c93785f3f82"; - sha256 = "0qdb0x757k76nfj32xc2nrrdqd9jlwgg63vfn02l2iznnzahxp0h"; - }; - - hardeningDisable = [ "format" ]; - - configureFlags = [ "--without-python" ]; - - prePatch = '' - sed -i -e '/$(LDCONFIG)/d' common/include/lib.mak.in - ''; - - patches = [ - ./fix-ar.diff - ]; - - buildInputs = [ - bluez - gtk2 - ]; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - bison - flex - ]; - - env = { - NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - NIX_LDFLAGS = "-lbluetooth"; - }; - - postInstall = '' - # Some programs (for example, cabal-install) have problems with the double 0 - sed -i -e "s/0.6.00/0.6.0/" $out/lib/pkgconfig/cwiid.pc - ''; - - meta = { - description = "Linux Nintendo Wiimote interface"; - homepage = "http://cwiid.org"; - license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ bennofs ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/cw/cwm/package.nix b/pkgs/by-name/cw/cwm/package.nix index 58c5da37a0fe..fecb8b857bc6 100644 --- a/pkgs/by-name/cw/cwm/package.nix +++ b/pkgs/by-name/cw/cwm/package.nix @@ -13,16 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "cwm"; - version = "7.4"; + version = "7.9"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = "cwm"; - rev = "v${finalAttrs.version}"; - hash = "sha256-L3u4mH2UH2pTHhSPVr5dUi94b9DheslkIWL6EgQ05yA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-YC+x4YSPAgZ47PFMbzICv9ixfDxA1PG3ncLiMahSoUc="; }; strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ pkg-config @@ -40,7 +41,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight and efficient window manager for X11"; homepage = "https://github.com/leahneukirchen/cwm"; - maintainers = with lib.maintainers; [ _0x4A6F ]; + maintainers = with lib.maintainers; [ + _0x4A6F + iamanaws + ]; license = lib.licenses.isc; platforms = lib.platforms.linux; mainProgram = "cwm"; diff --git a/pkgs/by-name/cy/cyberchef/package.nix b/pkgs/by-name/cy/cyberchef/package.nix index 515da83edae1..ecba96cf49f3 100644 --- a/pkgs/by-name/cy/cyberchef/package.nix +++ b/pkgs/by-name/cy/cyberchef/package.nix @@ -21,15 +21,16 @@ let categories = [ "Development" ]; } ); - version = "11.0.0"; + version = "11.2.0"; + commit = "d358d82cbcb269d764a2deb598a37043bd054f45"; in stdenv.mkDerivation { pname = "cyberchef"; inherit version; src = fetchzip { - url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_v${version}.zip"; - hash = "sha256-Hom0YFel1GVdyx/1q7N93se6uLUVutp0Lu31WNhkPPA="; + url = "https://github.com/gchq/CyberChef/releases/download/v${version}/CyberChef_${commit}.zip"; + hash = "sha256-3DXIrxCefiEYqZOPs8pO5jWdHFj7cPGgrwZcwE4ESPg="; stripRoot = false; }; diff --git a/pkgs/by-name/cy/cyberstrike/package.nix b/pkgs/by-name/cy/cyberstrike/package.nix new file mode 100644 index 000000000000..777d5301dea2 --- /dev/null +++ b/pkgs/by-name/cy/cyberstrike/package.nix @@ -0,0 +1,178 @@ +{ + lib, + bun, + fetchFromGitHub, + installShellFiles, + makeBinaryWrapper, + models-dev, + nix-update-script, + nodejs, + ripgrep, + stdenvNoCC, + sysctl, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "cyberstrike"; + version = "1.1.15"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "CyberStrikeus"; + repo = "CyberStrike"; + tag = "v${finalAttrs.version}"; + hash = "sha256-U1yYTFZCjF3z+161CL4xyxYwcWJh5zCbGAOm/ctACSs="; + }; + + node_modules = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install \ + --cpu="${if stdenvNoCC.hostPlatform.isAarch64 then "arm64" else "x64"}" \ + --os="${if stdenvNoCC.hostPlatform.isLinux then "linux" else "darwin"}" \ + --filter '!./' \ + --filter './packages/cyberstrike' \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress + + bun --bun ./nix/scripts/canonicalize-node-modules.ts + bun --bun ./nix/scripts/normalize-bun-binaries.ts + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + find . -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + # Required so fixed-output derivation does not retain store references + dontFixup = true; + + outputHash = "sha256-O5p/2+14dFt/gbONLVSvqPdNmLgQ8L+cUTGp81Rm0js="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + nativeBuildInputs = [ + bun + installShellFiles + makeBinaryWrapper + writableTmpDirAsHomeHook + ]; + + configurePhase = '' + runHook preConfigure + + cp -R ${finalAttrs.node_modules}/. . + patchShebangs node_modules + patchShebangs packages/*/node_modules + + runHook postConfigure + ''; + + env = { + MODELS_DEV_API_JSON = "${models-dev}/dist/_api.json"; + CYBERSTRIKE_DISABLE_MODELS_FETCH = true; + CYBERSTRIKE_VERSION = finalAttrs.version; + CYBERSTRIKE_CHANNEL = "local"; + }; + + buildPhase = '' + runHook preBuild + + cd ./packages/cyberstrike + bun --bun ./script/build.ts --single --skip-install + bun --bun ./script/schema.ts schema.json + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 dist/cyberstrike-*/bin/cyberstrike $out/bin/cyberstrike + install -Dm644 schema.json $out/share/cyberstrike/schema.json + + wrapProgram $out/bin/cyberstrike \ + --prefix PATH : ${ + lib.makeBinPath ( + [ + ripgrep + nodejs + ] + ++ lib.optional stdenvNoCC.hostPlatform.isDarwin sysctl + ) + } + + runHook postInstall + ''; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd cyberstrike \ + --bash <($out/bin/cyberstrike completion) \ + --zsh <(SHELL=/bin/zsh $out/bin/cyberstrike completion) + ''; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + + doInstallCheck = true; + + versionCheckKeepEnvironment = [ + "HOME" + "CYBERSTRIKE_DISABLE_MODELS_FETCH" + ]; + + versionCheckProgramArg = "--version"; + + passthru = { + jsonschema = { + config = "${placeholder "out"}/share/cyberstrike/schema.json"; + tui = "${placeholder "out"}/share/cyberstrike/tui.json"; + }; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; + }; + + meta = { + description = "AI-powered offensive security agent"; + homepage = "https://github.com/CyberStrikeus/CyberStrike"; + changelog = "https://github.com/CyberStrikeus/CyberStrike/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "cyberstrike"; + }; +}) diff --git a/pkgs/by-name/cy/cyclonedds/package.nix b/pkgs/by-name/cy/cyclonedds/package.nix index ec54083be952..1e1c1dd38acb 100644 --- a/pkgs/by-name/cy/cyclonedds/package.nix +++ b/pkgs/by-name/cy/cyclonedds/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Eclipse Cyclone DDS project"; homepage = "https://cyclonedds.io/"; - license = with lib.licenses; [ epl20 ]; + license = lib.licenses.epl20; maintainers = with lib.maintainers; [ bachp ]; }; }) diff --git a/pkgs/by-name/cy/cyclonedx-cli/deps.json b/pkgs/by-name/cy/cyclonedx-cli/deps.json index d83d3a609d9b..bf9539d0d713 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/deps.json +++ b/pkgs/by-name/cy/cyclonedx-cli/deps.json @@ -16,84 +16,59 @@ }, { "pname": "CycloneDX.Core", - "version": "11.0.0", - "hash": "sha256-i1H/+oH4yljhvXg0PnM87F9qu2RtvPco7adZ2uxzOpY=" + "version": "12.1.1", + "hash": "sha256-iqWYbdfxr1wphhEAtj0ucYCs2+7tzC0HaxCosS+X1nk=" }, { "pname": "CycloneDX.Spdx", - "version": "11.0.0", - "hash": "sha256-JOY+PjDApeXdJlCXhcr91lUiC6DOQEcjoYuQbBaaiog=" + "version": "12.1.1", + "hash": "sha256-BtFGUSrSVPaq0iPXqsOhgiq7Dpw5hnt9EfPqvA5oVwk=" }, { "pname": "CycloneDX.Spdx.Interop", - "version": "11.0.0", - "hash": "sha256-N682Lern6x18EJlRuJDR+T7/n5+2DWXp4Kz1MNuGqEM=" + "version": "12.1.1", + "hash": "sha256-m8RhgvjPcLSlBzVUQbm1s1+gZ8/RKVwxX8y6h9W12t8=" }, { "pname": "CycloneDX.Utils", - "version": "11.0.0", - "hash": "sha256-3rBD3lAzQiv0TghEbfxCVUQoWNOX8tzFew7V0s4NRpE=" + "version": "12.1.1", + "hash": "sha256-TmpfTkh0INlWIH7/HH6S9JgEyFNRvpzzYVuUhNFLVtA=" }, { - "pname": "JetBrains.Annotations", - "version": "2021.2.0", - "hash": "sha256-NtTiowrMQgoTiQQheioseb/eGGLH+qR/NXDFAsWrO08=" + "pname": "Humanizer.Core", + "version": "3.0.1", + "hash": "sha256-Wxqf1FRXtsQulLFtbfsfYu4oZmrCuOZAikMcY2i6Dww=" }, { "pname": "Json.More.Net", - "version": "1.9.0", - "hash": "sha256-ySIEHWZJLk6LeWYdAA9Ci3coKXkRgpu4N79MD4pRXdk=" + "version": "3.0.0", + "hash": "sha256-zlJb9Wi9ErFqN8FYphzog9paPxI3DBVnoTL0c12Bfks=" }, { "pname": "JsonPointer.Net", - "version": "3.0.3", - "hash": "sha256-fWR1aCDWyc6flBLFaGSJmXg9vg2qMlAIN5wnj2RYqLY=" + "version": "7.0.0", + "hash": "sha256-/1GemlLhmYnz/HDQTpEEaGxaofoFkFUMNNPInKhAvM4=" }, { "pname": "JsonSchema.Net", - "version": "5.3.1", - "hash": "sha256-Cs1sh2mPN/pRO5m+5rnrBRoNhdxNoi6p0e9RmeJNQx4=" + "version": "9.1.1", + "hash": "sha256-NiVzn+SF3oe/ucKetzKC527ec5I9rq2BdBg0J0fbZPo=" }, { "pname": "Microsoft.CodeCoverage", "version": "17.3.2", "hash": "sha256-APxmbKMNQKWuFQMJjkVr2zIqv/bLUTMm5NRGVLegBbg=" }, - { - "pname": "Microsoft.CSharp", - "version": "4.0.1", - "hash": "sha256-0huoqR2CJ3Z9Q2peaKD09TV3E6saYSqDGZ290K8CrH8=" - }, { "pname": "Microsoft.NET.Test.Sdk", "version": "17.3.2", "hash": "sha256-1fZ/rrSbuyYUfvwyA3otFQdL0Y/H48goAVyhiLs1oF4=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "1.0.1", - "hash": "sha256-mZotlGZqtrqDSoBrZhsxFe6fuOv5/BIo0w2Z2x0zVAU=" - }, { "pname": "Microsoft.NETCore.Platforms", "version": "1.1.0", "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" }, - { - "pname": "Microsoft.NETCore.Platforms", - "version": "5.0.0", - "hash": "sha256-LIcg1StDcQLPOABp4JRXIs837d7z0ia6+++3SF3jl1c=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.0.1", - "hash": "sha256-lxxw/Gy32xHi0fLgFWNj4YTFBSBkjx5l6ucmbTyf7V4=" - }, - { - "pname": "Microsoft.NETCore.Targets", - "version": "1.1.0", - "hash": "sha256-0AqQ2gMS8iNlYkrD+BxtIg7cXMnr9xZHtKAuN4bjfaQ=" - }, { "pname": "Microsoft.TestPlatform.ObjectModel", "version": "17.3.2", @@ -104,11 +79,6 @@ "version": "17.3.2", "hash": "sha256-ySBqawHGZ/Dwoj2UnAzk1Ezxt4qR1AuEY73U/buqNiE=" }, - { - "pname": "Microsoft.Win32.Primitives", - "version": "4.3.0", - "hash": "sha256-mBNDmPXNTW54XLnPAUwBRvkIORFM7/j0D0I2SyQPDEg=" - }, { "pname": "NETStandard.Library", "version": "1.6.1", @@ -116,13 +86,8 @@ }, { "pname": "Newtonsoft.Json", - "version": "12.0.3", - "hash": "sha256-PSHK+Qn52ytdEySdZyjCUGxV5y4hI/vir2WgVsCgv50=" - }, - { - "pname": "Newtonsoft.Json", - "version": "9.0.1", - "hash": "sha256-mYCBrgUhIJFzRuLLV9SIiIFHovzfR8Uuqfg6e08EnlU=" + "version": "13.0.3", + "hash": "sha256-hy/BieY4qxBWVVsDqqOPaLy1QobiIapkbrESm6v2PHc=" }, { "pname": "NuGet.Frameworks", @@ -131,218 +96,13 @@ }, { "pname": "protobuf-net", - "version": "3.2.45", - "hash": "sha256-rWitxe3uP3SOyoG1fwM5n00RpR5IL1V6u1zXMI0p0JA=" + "version": "3.2.56", + "hash": "sha256-KjwRHyGwflQDjVaudT+NjRnfGhHb4CpCfn9hHVixI+E=" }, { "pname": "protobuf-net.Core", - "version": "3.2.45", - "hash": "sha256-bsMGUmd0yno8g0H0637jJboKJwyyHLHoHg45+bt9pLQ=" - }, - { - "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=" + "version": "3.2.56", + "hash": "sha256-NVvLreCvvvnS/s0syL5/L3mRpXeswP7E71C6WP9f2Dc=" }, { "pname": "Snapshooter", @@ -354,36 +114,6 @@ "version": "0.7.1", "hash": "sha256-fWVTjDrYHOQj2a1F0gynlKgGPhmjj3RWkvI4Za0xG/w=" }, - { - "pname": "System.AppContext", - "version": "4.3.0", - "hash": "sha256-yg95LNQOwFlA1tWxXdQkVyJqT4AnoDc+ACmrNvzGiZg=" - }, - { - "pname": "System.Buffers", - "version": "4.3.0", - "hash": "sha256-XqZWb4Kd04960h4U9seivjKseGA/YEIpdplfHYHQ9jk=" - }, - { - "pname": "System.Collections", - "version": "4.0.11", - "hash": "sha256-puoFMkx4Z55C1XPxNw3np8nzNGjH+G24j43yTIsDRL0=" - }, - { - "pname": "System.Collections", - "version": "4.3.0", - "hash": "sha256-afY7VUtD6w/5mYqrce8kQrvDIfS2GXDINDh73IjxJKc=" - }, - { - "pname": "System.Collections.Concurrent", - "version": "4.3.0", - "hash": "sha256-KMY5DfJnDeIsa13DpqvyN8NkReZEMAFnlmNglVoFIXI=" - }, - { - "pname": "System.Collections.Immutable", - "version": "7.0.0", - "hash": "sha256-9an2wbxue2qrtugYES9awshQg+KfJqajhnhs45kQIdk=" - }, { "pname": "System.CommandLine", "version": "2.0.0-beta4.22272.1", @@ -394,485 +124,25 @@ "version": "2.0.0-beta4.22272.1", "hash": "sha256-Ffzs51XiFraSX1efQRO1IyiNraIgi8aOdkRRzCT6DB4=" }, - { - "pname": "System.Console", - "version": "4.3.0", - "hash": "sha256-Xh3PPBZr0pDbDaK8AEHbdGz7ePK6Yi1ZyRWI1JM6mbo=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.0.11", - "hash": "sha256-P+rSQJVoN6M56jQbs76kZ9G3mAWFdtF27P/RijN8sj4=" - }, - { - "pname": "System.Diagnostics.Debug", - "version": "4.3.0", - "hash": "sha256-fkA79SjPbSeiEcrbbUsb70u9B7wqbsdM9s1LnoKj0gM=" - }, - { - "pname": "System.Diagnostics.DiagnosticSource", - "version": "4.3.0", - "hash": "sha256-OFJRb0ygep0Z3yDBLwAgM/Tkfs4JCDtsNhwDH9cd1Xw=" - }, - { - "pname": "System.Diagnostics.Tools", - "version": "4.0.1", - "hash": "sha256-vSBqTbmWXylvRa37aWyktym+gOpsvH43mwr6A962k6U=" - }, - { - "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.Dynamic.Runtime", - "version": "4.0.11", - "hash": "sha256-qWqFVxuXioesVftv2RVJZOnmojUvRjb7cS3Oh3oTit4=" - }, - { - "pname": "System.Formats.Asn1", - "version": "6.0.0", - "hash": "sha256-KaMHgIRBF7Nf3VwOo+gJS1DcD+41cJDPWFh+TDQ8ee8=" - }, - { - "pname": "System.Globalization", - "version": "4.0.11", - "hash": "sha256-rbSgc2PIEc2c2rN6LK3qCREAX3DqA2Nq1WcLrZYsDBw=" - }, - { - "pname": "System.Globalization", - "version": "4.3.0", - "hash": "sha256-caL0pRmFSEsaoeZeWN5BTQtGrAtaQPwFi8YOZPZG5rI=" - }, - { - "pname": "System.Globalization.Calendars", - "version": "4.3.0", - "hash": "sha256-uNOD0EOVFgnS2fMKvMiEtI9aOw00+Pfy/H+qucAQlPc=" - }, - { - "pname": "System.Globalization.Extensions", - "version": "4.3.0", - "hash": "sha256-mmJWA27T0GRVuFP9/sj+4TrR4GJWrzNIk2PDrbr7RQk=" - }, - { - "pname": "System.IO", - "version": "4.1.0", - "hash": "sha256-V6oyQFwWb8NvGxAwvzWnhPxy9dKOfj/XBM3tEC5aHrw=" - }, - { - "pname": "System.IO", - "version": "4.3.0", - "hash": "sha256-ruynQHekFP5wPrDiVyhNiRIXeZ/I9NpjK5pU+HPDiRY=" - }, { "pname": "System.IO.Abstractions", "version": "13.2.47", "hash": "sha256-pOzzQDwdHzoTSqycKTTmCh2kR3X6YDFUiszMlDob7mg=" }, - { - "pname": "System.IO.Compression", - "version": "4.3.0", - "hash": "sha256-f5PrQlQgj5Xj2ZnHxXW8XiOivaBvfqDao9Sb6AVinyA=" - }, - { - "pname": "System.IO.Compression.ZipFile", - "version": "4.3.0", - "hash": "sha256-WQl+JgWs+GaRMeiahTFUbrhlXIHapzcpTFXbRvAtvvs=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.0.1", - "hash": "sha256-4VKXFgcGYCTWVXjAlniAVq0dO3o5s8KHylg2wg2/7k0=" - }, - { - "pname": "System.IO.FileSystem", - "version": "4.3.0", - "hash": "sha256-vNIYnvlayuVj0WfRfYKpDrhDptlhp1pN8CYmlVd2TXw=" - }, { "pname": "System.IO.FileSystem.AccessControl", "version": "5.0.0", "hash": "sha256-c9MlDKJfj63YRvl7brRBNs59olrmbL+G1A6oTS8ytEc=" }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.0.1", - "hash": "sha256-IpigKMomqb6pmYWkrlf0ZdpILtRluX2cX5sOKVW0Feg=" - }, - { - "pname": "System.IO.FileSystem.Primitives", - "version": "4.3.0", - "hash": "sha256-LMnfg8Vwavs9cMnq9nNH8IWtAtSfk0/Fy4s4Rt9r1kg=" - }, - { - "pname": "System.Linq", - "version": "4.1.0", - "hash": "sha256-ZQpFtYw5N1F1aX0jUK3Tw+XvM5tnlnshkTCNtfVA794=" - }, - { - "pname": "System.Linq", - "version": "4.3.0", - "hash": "sha256-R5uiSL3l6a3XrXSSL6jz+q/PcyVQzEAByiuXZNSqD/A=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.1.0", - "hash": "sha256-7zqB+FXgkvhtlBzpcZyd81xczWP0D3uWssyAGw3t7b4=" - }, - { - "pname": "System.Linq.Expressions", - "version": "4.3.0", - "hash": "sha256-+3pvhZY7rip8HCbfdULzjlC9FPZFpYoQxhkcuFm2wk8=" - }, - { - "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.0.12", - "hash": "sha256-MudZ/KYcvYsn2cST3EE049mLikrNkmE7QoUoYKKby+s=" - }, - { - "pname": "System.ObjectModel", - "version": "4.3.0", - "hash": "sha256-gtmRkWP2Kwr3nHtDh0yYtce38z1wrGzb6fjm4v8wN6Q=" - }, - { - "pname": "System.Private.Uri", - "version": "4.3.0", - "hash": "sha256-fVfgcoP4AVN1E5wHZbKBIOPYZ/xBeSIdsNF+bdukIRM=" - }, - { - "pname": "System.Reflection", - "version": "4.1.0", - "hash": "sha256-idZHGH2Yl/hha1CM4VzLhsaR8Ljo/rV7TYe7mwRJSMs=" - }, - { - "pname": "System.Reflection", - "version": "4.3.0", - "hash": "sha256-NQSZRpZLvtPWDlvmMIdGxcVuyUnw92ZURo0hXsEshXY=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.0.1", - "hash": "sha256-F1MvYoQWHCY89/O4JBwswogitqVvKuVfILFqA7dmuHk=" - }, - { - "pname": "System.Reflection.Emit", - "version": "4.3.0", - "hash": "sha256-5LhkDmhy2FkSxulXR+bsTtMzdU3VyyuZzsxp7/DwyIU=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.0.1", - "hash": "sha256-YG+eJBG5P+5adsHiw/lhJwvREnvdHw6CJyS8ZV4Ujd0=" - }, - { - "pname": "System.Reflection.Emit.ILGeneration", - "version": "4.3.0", - "hash": "sha256-mKRknEHNls4gkRwrEgi39B+vSaAz/Gt3IALtS98xNnA=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.0.1", - "hash": "sha256-uVvNOnL64CPqsgZP2OLqNmxdkZl6Q0fTmKmv9gcBi+g=" - }, - { - "pname": "System.Reflection.Emit.Lightweight", - "version": "4.3.0", - "hash": "sha256-rKx4a9yZKcajloSZHr4CKTVJ6Vjh95ni+zszPxWjh2I=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.0.1", - "hash": "sha256-NsfmzM9G/sN3H8X2cdnheTGRsh7zbRzvegnjDzDH/FQ=" - }, - { - "pname": "System.Reflection.Extensions", - "version": "4.3.0", - "hash": "sha256-mMOCYzUenjd4rWIfq7zIX9PFYk/daUyF0A8l1hbydAk=" - }, - { - "pname": "System.Reflection.Metadata", - "version": "1.6.0", - "hash": "sha256-JJfgaPav7UfEh4yRAQdGhLZF1brr0tUWPl6qmfNWq/E=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.0.1", - "hash": "sha256-SFSfpWEyCBMAOerrMCOiKnpT+UAWTvRcmoRquJR6Vq0=" - }, - { - "pname": "System.Reflection.Primitives", - "version": "4.3.0", - "hash": "sha256-5ogwWB4vlQTl3jjk1xjniG2ozbFIjZTL9ug0usZQuBM=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.1.0", - "hash": "sha256-R0YZowmFda+xzKNR4kKg7neFoE30KfZwp/IwfRSKVK4=" - }, - { - "pname": "System.Reflection.TypeExtensions", - "version": "4.3.0", - "hash": "sha256-4U4/XNQAnddgQIHIJq3P2T80hN0oPdU2uCeghsDTWng=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.0.1", - "hash": "sha256-cZ2/3/fczLjEpn6j3xkgQV9ouOVjy4Kisgw5xWw9kSw=" - }, - { - "pname": "System.Resources.ResourceManager", - "version": "4.3.0", - "hash": "sha256-idiOD93xbbrbwwSnD4mORA9RYi/D/U48eRUsn/WnWGo=" - }, - { - "pname": "System.Runtime", - "version": "4.1.0", - "hash": "sha256-FViNGM/4oWtlP6w0JC0vJU+k9efLKZ+yaXrnEeabDQo=" - }, - { - "pname": "System.Runtime", - "version": "4.3.0", - "hash": "sha256-51813WXpBIsuA6fUtE5XaRQjcWdQ2/lmEokJt97u0Rg=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.1.0", - "hash": "sha256-X7DZ5CbPY7jHs20YZ7bmcXs9B5Mxptu/HnBUvUnNhGc=" - }, - { - "pname": "System.Runtime.Extensions", - "version": "4.3.0", - "hash": "sha256-wLDHmozr84v1W2zYCWYxxj0FR0JDYHSVRaRuDm0bd/o=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.0.1", - "hash": "sha256-j2QgVO9ZOjv7D1het98CoFpjoYgxjupuIhuBUmLLH7w=" - }, - { - "pname": "System.Runtime.Handles", - "version": "4.3.0", - "hash": "sha256-KJ5aXoGpB56Y6+iepBkdpx/AfaJDAitx4vrkLqR7gms=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.1.0", - "hash": "sha256-QceAYlJvkPRJc/+5jR+wQpNNI3aqGySWWSO30e/FfQY=" - }, - { - "pname": "System.Runtime.InteropServices", - "version": "4.3.0", - "hash": "sha256-8sDH+WUJfCR+7e4nfpftj/+lstEiZixWUBueR2zmHgI=" - }, - { - "pname": "System.Runtime.InteropServices.RuntimeInformation", - "version": "4.3.0", - "hash": "sha256-MYpl6/ZyC6hjmzWRIe+iDoldOMW1mfbwXsduAnXIKGA=" - }, - { - "pname": "System.Runtime.Numerics", - "version": "4.3.0", - "hash": "sha256-P5jHCgMbgFMYiONvzmaKFeOqcAIDPu/U8bOVrNPYKqc=" - }, - { - "pname": "System.Runtime.Serialization.Primitives", - "version": "4.1.1", - "hash": "sha256-80B05oxJbPLGq2pGOSl6NlZvintX9A1CNpna2aN0WRA=" - }, - { - "pname": "System.Security.AccessControl", - "version": "5.0.0", - "hash": "sha256-ueSG+Yn82evxyGBnE49N4D+ngODDXgornlBtQ3Omw54=" - }, - { - "pname": "System.Security.AccessControl", - "version": "6.0.0", - "hash": "sha256-qOyWEBbNr3EjyS+etFG8/zMbuPjA+O+di717JP9Cxyg=" - }, - { - "pname": "System.Security.Claims", - "version": "4.3.0", - "hash": "sha256-Fua/rDwAqq4UByRVomAxMPmDBGd5eImRqHVQIeSxbks=" - }, - { - "pname": "System.Security.Cryptography.Algorithms", - "version": "4.3.0", - "hash": "sha256-tAJvNSlczYBJ3Ed24Ae27a55tq/n4D3fubNQdwcKWA8=" - }, - { - "pname": "System.Security.Cryptography.Cng", - "version": "4.3.0", - "hash": "sha256-u17vy6wNhqok91SrVLno2M1EzLHZm6VMca85xbVChsw=" - }, - { - "pname": "System.Security.Cryptography.Csp", - "version": "4.3.0", - "hash": "sha256-oefdTU/Z2PWU9nlat8uiRDGq/PGZoSPRgkML11pmvPQ=" - }, - { - "pname": "System.Security.Cryptography.Encoding", - "version": "4.3.0", - "hash": "sha256-Yuge89N6M+NcblcvXMeyHZ6kZDfwBv3LPMDiF8HhJss=" - }, - { - "pname": "System.Security.Cryptography.OpenSsl", - "version": "4.3.0", - "hash": "sha256-DL+D2sc2JrQiB4oAcUggTFyD8w3aLEjJfod5JPe+Oz4=" - }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "6.0.1", - "hash": "sha256-OJ4NJ8E/8l86aR+Hsw+k/7II63Y/zPS+MgC+UfeCXHM=" - }, - { - "pname": "System.Security.Cryptography.Primitives", - "version": "4.3.0", - "hash": "sha256-fnFi7B3SnVj5a+BbgXnbjnGNvWrCEU6Hp/wjsjWz318=" - }, - { - "pname": "System.Security.Cryptography.X509Certificates", - "version": "4.3.0", - "hash": "sha256-MG3V/owDh273GCUPsGGraNwaVpcydupl3EtPXj6TVG0=" + "version": "10.0.6", + "hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA=" }, { "pname": "System.Security.Cryptography.Xml", - "version": "6.0.1", - "hash": "sha256-spXV8cWZu0V3liek1936REtdpvS4fQwc98JvacO1oJU=" - }, - { - "pname": "System.Security.Principal", - "version": "4.3.0", - "hash": "sha256-rjudVUHdo8pNJg2EVEn0XxxwNo5h2EaYo+QboPkXlYk=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "4.3.0", - "hash": "sha256-mbdLVUcEwe78p3ZnB6jYsizNEqxMaCAWI3tEQNhRQAE=" - }, - { - "pname": "System.Security.Principal.Windows", - "version": "5.0.0", - "hash": "sha256-CBOQwl9veFkrKK2oU8JFFEiKIh/p+aJO+q9Tc2Q/89Y=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.0.11", - "hash": "sha256-PEailOvG05CVgPTyKLtpAgRydlSHmtd5K0Y8GSHY2Lc=" - }, - { - "pname": "System.Text.Encoding", - "version": "4.3.0", - "hash": "sha256-GctHVGLZAa/rqkBNhsBGnsiWdKyv6VDubYpGkuOkBLg=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.0.11", - "hash": "sha256-+kf7J3dEhgCbnCM5vHYlsTm5/R/Ud0Jr6elpHm922iI=" - }, - { - "pname": "System.Text.Encoding.Extensions", - "version": "4.3.0", - "hash": "sha256-vufHXg8QAKxHlujPHHcrtGwAqFmsCD6HKjfDAiHyAYc=" - }, - { - "pname": "System.Text.Json", - "version": "8.0.5", - "hash": "sha256-yKxo54w5odWT6nPruUVsaX53oPRe+gKzGvLnnxtwP68=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.1.0", - "hash": "sha256-x6OQN6MCN7S0fJ6EFTfv4rczdUWjwuWE9QQ0P6fbh9c=" - }, - { - "pname": "System.Text.RegularExpressions", - "version": "4.3.0", - "hash": "sha256-VLCk1D1kcN2wbAe3d0YQM/PqCsPHOuqlBY1yd2Yo+K0=" - }, - { - "pname": "System.Threading", - "version": "4.0.11", - "hash": "sha256-mob1Zv3qLQhQ1/xOLXZmYqpniNUMCfn02n8ZkaAhqac=" - }, - { - "pname": "System.Threading", - "version": "4.3.0", - "hash": "sha256-ZDQ3dR4pzVwmaqBg4hacZaVenQ/3yAF/uV7BXZXjiWc=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.0.11", - "hash": "sha256-5SLxzFg1df6bTm2t09xeI01wa5qQglqUwwJNlQPJIVs=" - }, - { - "pname": "System.Threading.Tasks", - "version": "4.3.0", - "hash": "sha256-Z5rXfJ1EXp3G32IKZGiZ6koMjRu0n8C1NGrwpdIen4w=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.0.0", - "hash": "sha256-+YdcPkMhZhRbMZHnfsDwpNbUkr31X7pQFGxXYcAPZbE=" - }, - { - "pname": "System.Threading.Tasks.Extensions", - "version": "4.3.0", - "hash": "sha256-X2hQ5j+fxcmnm88Le/kSavjiGOmkcumBGTZKBLvorPc=" - }, - { - "pname": "System.Threading.ThreadPool", - "version": "4.3.0", - "hash": "sha256-wW0QdvssRoaOfQLazTGSnwYTurE4R8FxDx70pYkL+gg=" - }, - { - "pname": "System.Threading.Timer", - "version": "4.3.0", - "hash": "sha256-pmhslmhQhP32TWbBzoITLZ4BoORBqYk25OWbru04p9s=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.0.11", - "hash": "sha256-haZAFFQ9Sl2DhfvEbdx2YRqKEoxNMU5STaqpMmXw0zA=" - }, - { - "pname": "System.Xml.ReaderWriter", - "version": "4.3.0", - "hash": "sha256-QQ8KgU0lu4F5Unh+TbechO//zaAGZ4MfgvW72Cn1hzA=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.0.11", - "hash": "sha256-KPz1kxe0RUBM+aoktJ/f9p51GudMERU8Pmwm//HdlFg=" - }, - { - "pname": "System.Xml.XDocument", - "version": "4.3.0", - "hash": "sha256-rWtdcmcuElNOSzCehflyKwHkDRpiOhJJs8CeQ0l1CCI=" + "version": "10.0.6", + "hash": "sha256-QwcfiHtrRNK5j2vPudws4S0g7I8XYHFstKAI1bOlIFM=" }, { "pname": "xunit", diff --git a/pkgs/by-name/cy/cyclonedx-cli/package.nix b/pkgs/by-name/cy/cyclonedx-cli/package.nix index 7769ef30c367..6018162aca66 100644 --- a/pkgs/by-name/cy/cyclonedx-cli/package.nix +++ b/pkgs/by-name/cy/cyclonedx-cli/package.nix @@ -7,16 +7,16 @@ buildDotnetModule rec { pname = "cyclonedx-cli"; - version = "0.30.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "CycloneDX"; repo = "cyclonedx-cli"; tag = "v${version}"; - hash = "sha256-a9jUJqj/h2u2SrIQkQV8aFSzys+RVEI2yNlHTJpll+M="; + hash = "sha256-XP6Zz9JITIw6xUefOkLLjoHUDsnhsOKdtY5S5xbkejU="; }; - dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; nugetDeps = ./deps.json; preFixup = '' diff --git a/pkgs/by-name/cy/cyclonedx-python/package.nix b/pkgs/by-name/cy/cyclonedx-python/package.nix index 431696e03d6f..8fb0e1c42da5 100644 --- a/pkgs/by-name/cy/cyclonedx-python/package.nix +++ b/pkgs/by-name/cy/cyclonedx-python/package.nix @@ -30,6 +30,10 @@ python3Packages.buildPythonApplication (finalAttrs: { ] ++ cyclonedx-python-lib.optional-dependencies.validation; + pythonRelaxDeps = [ + "chardet" + ]; + pythonImportsCheck = [ "cyclonedx" ]; meta = { diff --git a/pkgs/by-name/cy/cyme/package.nix b/pkgs/by-name/cy/cyme/package.nix index 5b38760d67be..956491c0ee50 100644 --- a/pkgs/by-name/cy/cyme/package.nix +++ b/pkgs/by-name/cy/cyme/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "cyme"; - version = "3.0.0"; + version = "3.0.1"; src = fetchFromGitHub { owner = "tuna-f1sh"; repo = "cyme"; rev = "v${finalAttrs.version}"; - hash = "sha256-5BDvFtqBkMxhZu9Yk8Ov30Hmfg8xD1kRnD7lnEvR6v0="; + hash = "sha256-yc4oV5Sm5BuABEcfQVu7otNtHGDWVmSkV/FjTLER78Q="; }; - cargoHash = "sha256-kzpYbpCo8E5KQBkPwxe5pz+vjD1H3J51fnVdOW9LawM="; + cargoHash = "sha256-zNRZOOrKvYhDgCaNRS5P+UIZ8uzSW9nePciOn13LLB8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/cy/cypress/package.nix b/pkgs/by-name/cy/cypress/package.nix index 0bc132727e15..8673e221f023 100644 --- a/pkgs/by-name/cy/cypress/package.nix +++ b/pkgs/by-name/cy/cypress/package.nix @@ -1,6 +1,7 @@ { alsa-lib, autoPatchelfHook, + darwin, fetchzip, gtk2, gtk3, @@ -28,10 +29,6 @@ let platform = "darwin-arm64"; hash = "sha256-8qvMsC+tRKK12jC2r1A54kS/PZ6q+sErvLvTkse6Kn4="; }; - x86_64-darwin = { - platform = "darwin-x64"; - hash = "sha256-cCLJloLcuCDgTEiMMJKY6rYiPPhZfFfqXFP5NAMhw4Q="; - }; }; inherit (stdenv.hostPlatform) system; binary = @@ -55,6 +52,9 @@ stdenv.mkDerivation rec { unzip makeShellWrapper ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook # override doesn't preserve splicing https://github.com/NixOS/nixpkgs/issues/132651 diff --git a/pkgs/by-name/cy/cyrus-imapd/package.nix b/pkgs/by-name/cy/cyrus-imapd/package.nix index 8e95b5a449a5..f08795ea7e87 100644 --- a/pkgs/by-name/cy/cyrus-imapd/package.nix +++ b/pkgs/by-name/cy/cyrus-imapd/package.nix @@ -66,13 +66,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "cyrus-imapd"; - version = "3.12.2"; + version = "3.12.3"; src = fetchFromGitHub { owner = "cyrusimap"; repo = "cyrus-imapd"; tag = "cyrus-imapd-${finalAttrs.version}"; - hash = "sha256-zPEaxETzG4Aj8JYP/aZpN2xXrD+O22io/HzI4LK+s/o="; + hash = "sha256-2HTrFjFlFFqF1TWtClPSOJSCgmomjSgEU7o2UPgd/Cs="; }; nativeBuildInputs = [ @@ -191,7 +191,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.cyrusimap.org"; description = "Email, contacts and calendar server"; changelog = "https://www.cyrusimap.org/imap/download/release-notes/${lib.versions.majorMinor finalAttrs.version}/x/${finalAttrs.version}.html"; - license = with lib.licenses; [ bsdOriginal ]; + license = lib.licenses.bsdOriginal; mainProgram = "cyradm"; maintainers = with lib.maintainers; [ moraxyc diff --git a/pkgs/by-name/cz/cz-cli/package.nix b/pkgs/by-name/cz/cz-cli/package.nix index e770612ae945..093cd92ae09e 100644 --- a/pkgs/by-name/cz/cz-cli/package.nix +++ b/pkgs/by-name/cz/cz-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "cz-cli"; - version = "4.3.0"; + version = "4.3.2"; src = fetchFromGitHub { owner = "commitizen"; repo = "cz-cli"; tag = "v${version}"; - hash = "sha256-4kyGxidE8dzkHL0oPv/XxDxQ3qlEE6TKSgj+1g9uvJM="; + hash = "sha256-+MBFO3sisxV/4iddZTsfJW8QARZ+JlWK5ao3KNJ3zSA="; }; - npmDepsHash = "sha256-zQ0T/1khnn+CXm/3yc9nANL0ROEEE03U5fV57btEmPg="; + npmDepsHash = "sha256-6UpTaMqd7T17gx4yJowcWJMgKmFeq2r2yckrx1OpTCc="; meta = { description = "Commitizen command line utility"; diff --git a/pkgs/by-name/cz/czkawka/package.nix b/pkgs/by-name/cz/czkawka/package.nix index c83dee38753c..2210ead3f932 100644 --- a/pkgs/by-name/cz/czkawka/package.nix +++ b/pkgs/by-name/cz/czkawka/package.nix @@ -15,6 +15,7 @@ libxi, libxkbcommon, libxrandr, + lld, pango, pkg-config, rustPlatform, @@ -29,21 +30,24 @@ let self = rustPlatform.buildRustPackage { pname = "czkawka"; - version = "11.0.1"; + version = "12.0.0"; src = fetchFromGitHub { owner = "qarmin"; repo = "czkawka"; tag = self.version; - hash = "sha256-ke6N3vuKPGolfh6XpAg3/9dtwd09eX53fN2klUwwNwQ="; + hash = "sha256-KbGcaeQcpf2IL3I2PmsBpg8n+IfSuJl5tkLOxNCtYaQ="; }; - cargoHash = "sha256-fx2ZH4I2WYCdMgNoKQuBBEJrPjmgTRPeVM2L+TWYn54="; + cargoHash = "sha256-+1K2a64XcbBePiQ/LeaSVCU/Ih0Fr4EjzNU5xpzfz2Q="; nativeBuildInputs = [ gobject-introspection pkg-config wrapGAppsHook4 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + lld # ld crashes ]; buildInputs = [ @@ -126,7 +130,7 @@ let homepage = "https://github.com/qarmin/czkawka"; description = "Simple, fast and easy to use app to remove unnecessary files from your computer"; changelog = "https://github.com/qarmin/czkawka/raw/${self.version}/Changelog.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "czkawka_gui"; maintainers = with lib.maintainers; [ yanganto diff --git a/pkgs/by-name/d2/d2/package.nix b/pkgs/by-name/d2/d2/package.nix index 2083939d66aa..b590b73de755 100644 --- a/pkgs/by-name/d2/d2/package.nix +++ b/pkgs/by-name/d2/d2/package.nix @@ -1,5 +1,6 @@ { lib, + stdenv, buildGoModule, fetchFromGitHub, installShellFiles, @@ -10,8 +11,13 @@ libgbm, makeWrapper, playwright-driver, + withImageSupport ? lib.meta.availableOn stdenv.hostPlatform libdrm, }: +assert lib.assertMsg ( + withImageSupport -> lib.meta.availableOn stdenv.hostPlatform libdrm +) "d2: withImageSupport is not supported on ${stdenv.hostPlatform.system} (requires libdrm)"; + buildGoModule (finalAttrs: { pname = "d2"; version = "0.7.1"; @@ -38,7 +44,8 @@ buildGoModule (finalAttrs: { makeWrapper ]; - buildInputs = lib.optionals libdrm.meta.available [ + # playwright-drivers.browsers pulls down ~2GB+ for Webkit, Chrome, Firefox etc + buildInputs = lib.optionals withImageSupport [ libgbm playwright-driver.browsers ]; @@ -49,7 +56,7 @@ buildGoModule (finalAttrs: { installManPage ci/release/template/man/d2.1 '' # Wrap the d2 executable to set LD_LIBRARY_PATH for Playwright - + lib.optionalString (finalAttrs.buildInputs != [ ]) '' + + lib.optionalString withImageSupport '' wrapProgram $out/bin/d2 \ --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath finalAttrs.buildInputs} ''; diff --git a/pkgs/by-name/da/dae/package.nix b/pkgs/by-name/da/dae/package.nix index 9c40cd6b4d9e..844bd9eea49a 100644 --- a/pkgs/by-name/da/dae/package.nix +++ b/pkgs/by-name/da/dae/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "dae"; - version = "1.0.0"; + version = "2.0.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "dae"; tag = "v${finalAttrs.version}"; - hash = "sha256-RpbWZEoGrCq3Py0hu6YDie6ErDTLS3oabqScPzhCtm0="; + hash = "sha256-hzX3b86BHvxXQZotSteiHoyBMF/P4WubeuJ6xpxa8ac="; fetchSubmodules = true; }; - vendorHash = "sha256-u2DCHmX7vRNWIQ2Ir3UrxPGduggEqoUr1rnkDfwsT0I="; + vendorHash = "sha256-S2dNFvMeZqGhzu+sIBGeaET4bQXfeucao6XR4QSTpog="; proxyVendor = true; diff --git a/pkgs/by-name/da/daed/package.nix b/pkgs/by-name/da/daed/package.nix index 3a7ff752a325..823c19ca7602 100644 --- a/pkgs/by-name/da/daed/package.nix +++ b/pkgs/by-name/da/daed/package.nix @@ -1,9 +1,9 @@ { - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, - stdenv, + stdenvNoCC, clang, buildGoModule, fetchFromGitHub, @@ -11,39 +11,45 @@ _experimental-update-script-combinators, nix-update-script, }: - let + pnpm = pnpm_10; +in +buildGoModule (finalAttrs: { pname = "daed"; - version = "1.0.0"; - + version = "1.27.0"; src = fetchFromGitHub { owner = "daeuniverse"; repo = "daed"; - tag = "v${version}"; - hash = "sha256-WaybToEcFrKOcJ+vfCTc9uyHkTPOrcAEw9lZFEIBPgY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-CvxCDdOLsdSlFfmoR+C1IUt9HvkAV5JsWGI94DLXB+U="; fetchSubmodules = true; }; - web = stdenv.mkDerivation { - inherit pname version src; + sourceRoot = "${finalAttrs.src.name}/wing"; + + web = stdenvNoCC.mkDerivation { + inherit (finalAttrs) pname version src; pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname version src ; - pnpm = pnpm_9; + inherit pnpm; fetcherVersion = 3; - hash = "sha256-FBZk7qeYNi7JX99Sk1qe52YUE8GUYINJKid0mEBXMjU="; + hash = "sha256-2g/M+4XI1EM+c7W82qyfH8C7sX+Y0QACiSpn65Vei4g="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm ]; + strictDeps = true; + __structuredAttrs = true; + buildPhase = '' runHook preBuild @@ -55,25 +61,14 @@ let installPhase = '' runHook preInstall - cp -R dist $out + mkdir -p $out + cp -R apps/web/dist/* $out runHook postInstall ''; }; -in - -buildGoModule rec { - inherit - pname - version - src - web - ; - - sourceRoot = "${src.name}/wing"; - - vendorHash = "sha256-+uf8PJQvsJMUyQ6W+nDfdwrxBO2YRUL328ajTJpVDZk="; + vendorHash = "sha256-l7jgMvrbpOY2+cvnc0e5cvSgKVm4GcWC+bPbff+PE80="; proxyVendor = true; nativeBuildInputs = [ clang ]; @@ -84,9 +79,9 @@ buildGoModule rec { substituteInPlace Makefile \ --replace-fail /bin/bash /bin/sh - # ${web} does not have write permission + # ${finalAttrs.web} does not have write permission mkdir dist - cp -r ${web}/* dist + cp -r ${finalAttrs.web}/* dist chmod -R 755 dist ''; @@ -96,8 +91,8 @@ buildGoModule rec { make CFLAGS="-D__REMOVE_BPF_PRINTK -fno-stack-protector -Wno-unused-command-line-argument" \ NOSTRIP=y \ WEB_DIST=dist \ - AppName=${pname} \ - VERSION=${version} \ + AppName=daed \ + VERSION=${finalAttrs.version} \ OUTPUT=$out/bin/daed \ bundle @@ -110,21 +105,28 @@ buildGoModule rec { --replace-fail /usr/bin $out/bin ''; - passthru.updateScript = _experimental-update-script-combinators.sequence [ - (nix-update-script { - attrPath = "daed.web"; - }) - (nix-update-script { - extraArgs = [ "--version=skip" ]; - }) - ]; + passthru = { + inherit (finalAttrs) web; + updateScript = _experimental-update-script-combinators.sequence [ + (nix-update-script { + attrPath = "daed.web"; + extraArgs = [ "--use-github-releases" ]; + }) + (nix-update-script { + extraArgs = [ "--version=skip" ]; + }) + ]; + }; meta = { description = "Modern dashboard with dae"; homepage = "https://github.com/daeuniverse/daed"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ oluceps ]; + maintainers = with lib.maintainers; [ + oluceps + ccicnce113424 + ]; platforms = lib.platforms.linux; mainProgram = "daed"; }; -} +}) diff --git a/pkgs/by-name/da/daisydisk/package.nix b/pkgs/by-name/da/daisydisk/package.nix index e6d6676a0852..3419cee31b3e 100644 --- a/pkgs/by-name/da/daisydisk/package.nix +++ b/pkgs/by-name/da/daisydisk/package.nix @@ -10,11 +10,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "daisydisk"; - version = "4.33.3"; + version = "4.34.2"; src = fetchzip { url = "https://daisydiskapp.com/download/DaisyDisk.zip"; - hash = "sha256-2QhaY4oQV+bkvcyC88Zsk7eZJ6dySsb5G2+juH8HNjI="; + hash = "sha256-lSV367twsKDp0e5TsVYfjYO5GPcjtteBCxmUIOrz+0E="; stripRoot = false; }; @@ -51,7 +51,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Find out what’s taking up your disk space and recover it in the most efficient and easy way"; homepage = "https://daisydiskapp.com/"; changelog = "https://daisydiskapp.com/releases"; - license = [ lib.licenses.unfree ]; + license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = lib.platforms.darwin; diff --git a/pkgs/by-name/da/daktari/package.nix b/pkgs/by-name/da/daktari/package.nix index cf10fb7c079b..31e7798cc61a 100644 --- a/pkgs/by-name/da/daktari/package.nix +++ b/pkgs/by-name/da/daktari/package.nix @@ -7,7 +7,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "daktari"; - version = "0.0.334"; + version = "0.0.342"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "genio-learn"; repo = "daktari"; tag = "v${finalAttrs.version}"; - hash = "sha256-UmfR64zG7UHTCp1rh0LWoWNqPTaBqrT/eShggrmW2Yg="; + hash = "sha256-g2uFcXV2v5ik5u2Gvysea8K1WeIIzDGJLmslW4awmNc="; }; patches = [ ./optional-pyclip.patch ]; diff --git a/pkgs/by-name/da/dalfox/package.nix b/pkgs/by-name/da/dalfox/package.nix index 5254924b25ad..1d0872f47438 100644 --- a/pkgs/by-name/da/dalfox/package.nix +++ b/pkgs/by-name/da/dalfox/package.nix @@ -1,34 +1,41 @@ { lib, - buildGoModule, fetchFromGitHub, + openssl, + pkg-config, + rustPlatform, + versionCheckHook, }: -buildGoModule (finalAttrs: { +rustPlatform.buildRustPackage (finalAttrs: { pname = "dalfox"; - version = "3.0.2"; + version = "3.1.2"; src = fetchFromGitHub { owner = "hahwul"; repo = "dalfox"; tag = "v${finalAttrs.version}"; - hash = "sha256-IUCpDTTJJHZS+e/7ZR2ObZOxLIQhPD6MZvYp9opqUAI="; + hash = "sha256-0amVlnLwwb7YAUbTce9gRmjv3W1FMgc2/XZQKCettTY="; }; - vendorHash = null; + cargoHash = "sha256-pxlUEGCrJjoakAVpXFq2q73wEWiODsHvdax12quDlec="; - ldflags = [ - "-w" - "-s" - ]; + nativeBuildInputs = [ pkg-config ]; - # Tests require network access + buildInputs = [ openssl ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + # Many unit tests perform live HTTP requests / OOB interactsh lookups and + # fail in the sandbox. doCheck = false; + doInstallCheck = true; + meta = { - description = "Tool for analysing parameter and XSS scanning"; + description = "Tool for analyzing parameter and XSS scanning"; homepage = "https://github.com/hahwul/dalfox"; - changelog = "https://github.com/hahwul/dalfox/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/hahwul/dalfox/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dalfox"; diff --git a/pkgs/by-name/da/dapper/package.nix b/pkgs/by-name/da/dapper/package.nix index 6adeb5bef253..0260b5efbed1 100644 --- a/pkgs/by-name/da/dapper/package.nix +++ b/pkgs/by-name/da/dapper/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.6.0"; src = fetchFromGitHub { - owner = "rancher"; + owner = "rancher-archives"; repo = "dapper"; rev = "v${finalAttrs.version}"; sha256 = "sha256-V+lHnOmIWjI1qmoJ7+pp+cGmJAtSeY+r2I9zykswQzM="; @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "Docker build wrapper"; mainProgram = "dapper"; - homepage = "https://github.com/rancher/dapper"; + homepage = "https://github.com/rancher-archives/dapper"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ kuznero ]; diff --git a/pkgs/by-name/da/dapr-cli/package.nix b/pkgs/by-name/da/dapr-cli/package.nix index d4fc87222a5a..a8a8a457ff08 100644 --- a/pkgs/by-name/da/dapr-cli/package.nix +++ b/pkgs/by-name/da/dapr-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "dapr-cli"; - version = "1.17.1"; + version = "1.18.0"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-XsRMVuXkHRARQ2UhG317QH0Ub4SOG8mesa7PnesXpvc="; + hash = "sha256-2zi8r4LIguWPrsvpvz+sYF4sXqBVmWJtzHLm5nRHFCU="; }; - vendorHash = "sha256-WwYpoKyiNbeoXnOaRy94vSoG4Ya1a7DYNriZoZuBRF8="; + vendorHash = "sha256-P7zrfUcb/Hxo7QbIQfq9JSf2d7meZShQ++GG8HkEoLE="; proxyVendor = true; diff --git a/pkgs/by-name/da/darkly/package.nix b/pkgs/by-name/da/darkly/package.nix index 9dad017633cf..b2fc28ac9e5f 100644 --- a/pkgs/by-name/da/darkly/package.nix +++ b/pkgs/by-name/da/darkly/package.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/Bali10050/Darkly"; changelog = "https://github.com/Bali10050/Darkly/releases/tag/v${finalAttrs.version}"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "darkly-settings6"; }; diff --git a/pkgs/by-name/da/darktable/package.nix b/pkgs/by-name/da/darktable/package.nix index 822b15d3f2ca..88e96055a2db 100644 --- a/pkgs/by-name/da/darktable/package.nix +++ b/pkgs/by-name/da/darktable/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + withAi ? false, # nativeBuildInputs cmake, @@ -34,6 +35,7 @@ lensfun, lerc, libaom, + libarchive, libavif, libdatrie, libepoxy, @@ -53,12 +55,14 @@ libwebp, libxml2, lua5_4, + onnxruntime, util-linux, openexr, openjpeg, osm-gps-map, pcre2, portmidi, + potrace, pugixml, sqlite, # Linux only @@ -81,12 +85,12 @@ let pugixml-shared = pugixml.override { shared = true; }; in stdenv.mkDerivation rec { - version = "5.4.1"; + version = "5.6.0"; pname = "darktable"; src = fetchurl { url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; - hash = "sha256-r9x8iKM4qM0vrDHIRQ0Hbtv3PpVuQwcmDIPrwZX4ReQ="; + hash = "sha256-FX1tOEevivyr54lERUeG9zqIbgilBLS9YRTCBl/gBuQ="; }; nativeBuildInputs = [ @@ -144,9 +148,14 @@ stdenv.mkDerivation rec { osm-gps-map pcre2 portmidi + potrace pugixml-shared sqlite ] + ++ lib.optionals withAi [ + libarchive + onnxruntime + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib colord @@ -166,6 +175,10 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_USERMANUAL=False" ] + ++ lib.optionals withAi [ + (lib.cmakeBool "USE_AI" true) + (lib.cmakeBool "ONNXRUNTIME_OFFLINE" true) + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ "-DUSE_COLORD=OFF" "-DUSE_KWALLET=OFF" @@ -179,7 +192,9 @@ stdenv.mkDerivation rec { let libPathEnvVar = if stdenv.hostPlatform.isDarwin then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; libPathPrefix = - "$out/lib/darktable" + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib"; + "$out/lib/darktable" + + lib.optionalString (withAi && stdenv.hostPlatform.isLinux) ":${lib.getLib onnxruntime}/lib" + + lib.optionalString stdenv.hostPlatform.isLinux ":${ocl-icd}/lib"; in '' for f in $out/share/darktable/kernels/*.cl; do @@ -215,7 +230,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ flosse mrVanDalo - paperdigits freyacodes ]; }; diff --git a/pkgs/by-name/da/dart-sass/package.nix b/pkgs/by-name/da/dart-sass/package.nix index 8a91dfbd8b9e..3b353bc72db6 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.100.0"; + version = "1.101.2"; src = fetchFromGitHub { owner = "sass"; repo = "dart-sass"; tag = version; - hash = "sha256-yjI89EgFHMitdVVkjutTAiV/bND/eGTNCrLyZp/As4w="; + hash = "sha256-7q42Dv1HUWxeXa4j306ssKJrBsPKAFezqntx4mZXgw0="; }; 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 3129a0553f0b..b274072bc956 100644 --- a/pkgs/by-name/da/dart-sass/pubspec.lock.json +++ b/pkgs/by-name/da/dart-sass/pubspec.lock.json @@ -4,21 +4,21 @@ "dependency": "transitive", "description": { "name": "_fe_analyzer_shared", - "sha256": "3b19a47f6ea7c2632760777c78174f47f6aec1e05f0cd611380d4593b8af1dbc", + "sha256": "1b0e6a07425a3e460666e88bf1c949ccc7bb0116ad562ce94a1eca60fe820725", "url": "https://pub.dev" }, "source": "hosted", - "version": "96.0.0" + "version": "103.0.0" }, "analyzer": { "dependency": "direct dev", "description": { "name": "analyzer", - "sha256": "0c516bc4ad36a1a75759e54d5047cb9d15cded4459df01aa35a0b5ec7db2c2a0", + "sha256": "61c04d0c1bfed555c681ea079519933f071a5a026578ff73c4ff0df2d3462e5e", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.2.0" + "version": "13.3.0" }, "archive": { "dependency": "direct dev", @@ -94,11 +94,11 @@ "dependency": "direct main", "description": { "name": "cli_pkg", - "sha256": "8343ec3b11f163ab105687d6bad5432ef49b95d15137ec44a28c8cef918b5150", + "sha256": "1b3915a8924e8a495ec24b8ee076c182211d0bd563699a2c8ed9af33bf296af8", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.1" + "version": "2.15.2" }, "cli_repl": { "dependency": "direct main", @@ -114,11 +114,11 @@ "dependency": "direct dev", "description": { "name": "cli_util", - "sha256": "ff6785f7e9e3c38ac98b2fb035701789de90154024a75b6cb926445e83197d1c", + "sha256": "5909d2c6b66817222779e1eedc19e0e28b76d1df7bd9856a4792ccb9881df358", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.4.2" + "version": "0.5.1" }, "collection": { "dependency": "direct main", @@ -144,11 +144,11 @@ "dependency": "transitive", "description": { "name": "coverage", - "sha256": "5da775aa218eaf2151c721b16c01c7676fbfdd99cebba2bf64e8b807a28ff94d", + "sha256": "956a3de0725ca232ad353565a8290d3357592bf4250f6f298a185e2d949c5d3d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.15.0" + "version": "1.15.1" }, "crypto": { "dependency": "direct dev", @@ -184,21 +184,21 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "29f7ecc274a86d32920b1d9cfc7502fa87220da41ec60b55f329559d5732e2b2", + "sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.7" + "version": "3.1.12" }, "dartdoc": { "dependency": "direct dev", "description": { "name": "dartdoc", - "sha256": "c60c01dc5aeb095a3b7b875150fe0e50b46330aec5d3417e7bae235ccd8a00ab", + "sha256": "deb9e1d80cd0fd66139c5690315a5004150fd5c85a16d97459360531aa9e3702", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.4" + "version": "9.0.8" }, "ffi": { "dependency": "transitive", @@ -254,11 +254,11 @@ "dependency": "direct dev", "description": { "name": "grinder", - "sha256": "e1996e485d2b56bb164a8585679758d488fbf567273f51c432c8733fee1f6188", + "sha256": "8c65fc6c0c0748c2d9080c1fb603d7a9640bf5a5eda29f35099bd351cc45093f", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.9.5" + "version": "0.10.0" }, "html": { "dependency": "transitive", @@ -374,11 +374,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "df0c643f44ad098eb37988027a8e2b2b5a031fd3977f06bbfd3a76637e8df739", + "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.2" + "version": "1.19.0" }, "mime": { "dependency": "transitive", @@ -674,31 +674,31 @@ "dependency": "direct dev", "description": { "name": "test", - "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f", + "sha256": "0d5ba5602ec3baa28c8ce365e1efc5575969c765f45c554a3e167dc7945b9c30", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.31.1" + "version": "1.31.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11", + "sha256": "475610b2aa23c19687cce2961e44b0cc57cafe220f67c2b80201231b2a07fbe7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.12" + "version": "0.7.13" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5", + "sha256": "a39c204a4fc7a7ccb04a2b985e359fda3cc37e45e0b8ac61c3fb1a05aa832132", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.18" + "version": "0.6.19" }, "test_descriptor": { "dependency": "direct dev", @@ -804,11 +804,11 @@ "dependency": "transitive", "description": { "name": "xml", - "sha256": "971043b3a0d3da28727e40ed3e0b5d18b742fa5a68665cca88e74b7876d5e025", + "sha256": "67f0aff7be013d107995e9b75bf4e7f2c3ef2dfdb2c8e68024bba0a7fd5756a4", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.6.1" + "version": "7.0.1" }, "yaml": { "dependency": "direct dev", @@ -822,6 +822,6 @@ } }, "sdks": { - "dart": ">=3.10.0 <4.0.0" + "dart": ">=3.11.0 <4.0.0" } } diff --git a/pkgs/by-name/da/dasel/package.nix b/pkgs/by-name/da/dasel/package.nix index 06638a5e4090..ea328179b371 100644 --- a/pkgs/by-name/da/dasel/package.nix +++ b/pkgs/by-name/da/dasel/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "dasel"; - version = "3.8.1"; + version = "3.11.2"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${finalAttrs.version}"; - hash = "sha256-/rQItj+nCr/IriT4Lgbxe+d9XfAyyZM+Q0nM0F3s//M="; + hash = "sha256-F7oNs65AsokIgYjaPqgSbtsZ5JwSFJ/A6Edm+LzQqgU="; }; vendorHash = "sha256-oqGUHPnfCxgUTueB1zEJ8/h0L+2oxoVQHI+oJm3HcPo="; @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { doInstallCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; installCheckPhase = '' runHook preInstallCheck - if [[ $($out/bin/dasel version) == "v${finalAttrs.version}" ]]; then + if [[ $($out/bin/dasel version) == "${finalAttrs.version}" ]]; then echo '{ "my": { "favourites": { "colour": "blue" } } }' \ | $out/bin/dasel -i json 'my.favourites.colour = "red"' \ | grep "red" diff --git a/pkgs/by-name/da/dash/package.nix b/pkgs/by-name/da/dash/package.nix index eb5da071f472..ada4d8812cb9 100644 --- a/pkgs/by-name/da/dash/package.nix +++ b/pkgs/by-name/da/dash/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dash"; - version = "0.5.13.3"; + version = "0.5.13.4"; src = fetchurl { url = "http://gondor.apana.org.au/~herbert/dash/files/dash-${finalAttrs.version}.tar.gz"; - hash = "sha256-qDcnwSmaxMPZ1Dl5OTs6TrACddVjauAlJueXnVHW+9E="; + hash = "sha256-0Q39Qc2lkWVWDbOcqRXCxKdjb/8EKB2NLfd62Sx1Pis="; }; strictDeps = true; diff --git a/pkgs/by-name/da/dashy-ui/package.nix b/pkgs/by-name/da/dashy-ui/package.nix index dd69197b546b..4e3dac3e786f 100644 --- a/pkgs/by-name/da/dashy-ui/package.nix +++ b/pkgs/by-name/da/dashy-ui/package.nix @@ -17,16 +17,16 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "dashy-ui"; - version = "4.2.2"; + version = "4.4.5"; src = fetchFromGitHub { owner = "lissy93"; repo = "dashy"; tag = finalAttrs.version; - hash = "sha256-8oShyf4TfHjPG/yxK1sbZA5gHyqOQYqfoUEDQlaJgU0="; + hash = "sha256-S9x/qMjOwg0M59E0Ck7Ff3TYntXWkxansSNmNzWmJTk="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-5a2ypu6A4WOGdcm6HlvuzuCEgq3szd64zqTp/rmnjh4="; + hash = "sha256-oxVxzdap3dWi1ORP+eviFabO+G8GcFd0ZM3/a20Qbog="; }; passthru = { diff --git a/pkgs/by-name/da/databricks-cli/package.nix b/pkgs/by-name/da/databricks-cli/package.nix index 35713557d1c4..34ab2772083f 100644 --- a/pkgs/by-name/da/databricks-cli/package.nix +++ b/pkgs/by-name/da/databricks-cli/package.nix @@ -7,16 +7,15 @@ versionCheckHook, nix-update-script, }: - buildGoModule (finalAttrs: { pname = "databricks-cli"; - version = "1.2.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "databricks"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-pIcLZQm/53AMk51jEgM0j1yUR2FU3fhDgVGDBk7yaj4="; + hash = "sha256-08fYKWJRYkT48ivM9miPyoQ3fNNm6etdeqvqPZehtaM="; }; # Otherwise these tests fail asserting that the version is 0.0.0-dev @@ -25,24 +24,18 @@ buildGoModule (finalAttrs: { --replace-fail "cli/0.0.0-dev" "cli/${finalAttrs.version}" ''; - vendorHash = "sha256-TAyB9hpiNDDct2We7bbOiNr7ZkbRtF5cYjPmeLfUDkE="; + vendorHash = "sha256-1K722pdIXdYkc2HMlnjyjrZb/L2iUoRx2vY1szcF7aY="; - excludedPackages = [ - "bundle/internal" - "acceptance" - "integration" - "tools/testrunner" - "tools/testmask" - "cmd/auth" - "cmd/root" - "cmd/labs/project" - "libs/auth" - "libs/databrickscfg" - "libs/hostmetadata" - ]; + subPackages = [ "." ]; ldflags = [ "-X github.com/databricks/cli/internal/build.buildVersion=${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildTag=v${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildSummary=v${finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildMajor=${lib.versions.major finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildMinor=${lib.versions.minor finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildPatch=${lib.versions.patch finalAttrs.version}" + "-X github.com/databricks/cli/internal/build.buildIsSnapshot=false" ]; postBuild = '' diff --git a/pkgs/by-name/da/datafusion-cli/package.nix b/pkgs/by-name/da/datafusion-cli/package.nix index 25b75f7bbe2a..ba91851fdb07 100644 --- a/pkgs/by-name/da/datafusion-cli/package.nix +++ b/pkgs/by-name/da/datafusion-cli/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "datafusion-cli"; - version = "54.0.0"; + version = "54.1.0"; src = fetchFromGitHub { name = "datafusion-cli-source"; owner = "apache"; repo = "datafusion"; tag = finalAttrs.version; - hash = "sha256-BWpHiLCn7idvzI2rlsre8l23TbxQU1Ma6bCjAMxQ6m8="; + hash = "sha256-zeR6eyU4Cc5gHiE331ap8wuyYEj7s7BgqB+oOKwMfZw="; }; - cargoHash = "sha256-Sj/biBiJPIYwxpL+Fua0k47vOu6gyyAhcKb4ZSUli6k="; + cargoHash = "sha256-XXR1Turs+QwONZHq38MZHbcjv5DYZH9iqeuBl20gy3U="; buildAndTestSubdir = "datafusion-cli"; diff --git a/pkgs/by-name/da/datalab/package.nix b/pkgs/by-name/da/datalab/package.nix new file mode 100644 index 000000000000..8964dce5bab7 --- /dev/null +++ b/pkgs/by-name/da/datalab/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.datalab-platform diff --git a/pkgs/by-name/da/davinci-resolve/package.nix b/pkgs/by-name/da/davinci-resolve/package.nix index 547132815133..657f890d6701 100644 --- a/pkgs/by-name/da/davinci-resolve/package.nix +++ b/pkgs/by-name/da/davinci-resolve/package.nix @@ -56,7 +56,7 @@ let davinci = ( stdenv.mkDerivation rec { pname = "davinci-resolve${lib.optionalString studioVariant "-studio"}"; - version = "20.3.3"; + version = "21.0.1"; nativeBuildInputs = [ appimageTools.appimage-exec @@ -78,9 +78,9 @@ let outputHashAlgo = "sha256"; outputHash = if studioVariant then - "sha256-q5VGp0kkno//nYtT82QDZDJG92uumAtomUK4B55795g=" + "sha256-8JN3ptd8jcacxHihZHXuhdkyambUsnFIj+AruvpztKI=" else - "sha256-2pfJz71fS/oEmK3n4cESKb9EDYCeDBhbzGLgFpb+OLI="; + "sha256-ioAqvqHjwFX1ec6fDoxg2VUZy1moYoGx/aEewDuN1+g="; impureEnvVars = lib.fetchers.proxyImpureEnvVars; diff --git a/pkgs/by-name/da/davmail/package.nix b/pkgs/by-name/da/davmail/package.nix index 771510a5ff7d..026e4cde54ee 100644 --- a/pkgs/by-name/da/davmail/package.nix +++ b/pkgs/by-name/da/davmail/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "davmail"; - version = "6.7.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = "mguessan"; repo = "davmail"; tag = finalAttrs.version; - hash = "sha256-bQyZ+Sela70fOle+uqqG+y3fACeItvkmidXOFXW+DOk="; + hash = "sha256-kIDAMVenUzc7tIC49yzc1MzqNa9B7nNlX1bzwpG8Vp0="; }; buildPhase = '' diff --git a/pkgs/by-name/da/dawarich/gemset.nix b/pkgs/by-name/da/dawarich/gemset.nix index df873b0b90a4..bea587dcbe93 100644 --- a/pkgs/by-name/da/dawarich/gemset.nix +++ b/pkgs/by-name/da/dawarich/gemset.nix @@ -1,4 +1,15 @@ { + action_text-trix = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02a0yz97d12cf6wcj5r43ak57mhlcj4r84k5ma2g570046aga4kh"; + type = "gem"; + }; + version = "2.1.19"; + }; actioncable = { dependencies = [ "actionpack" @@ -11,10 +22,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12xv89kmr6l6mflzqddk0zsmbbsr53mv9dz6z91sdcb3ifjd3881"; + sha256 = "1w40bbkjd0lds57bfr24hbj9qfkwj9v33x6457g24sjfwispzg75"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; actionmailbox = { dependencies = [ @@ -29,10 +40,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0m00a0sqf68rllzmsfkb02cqy4vi5q2lrrmgld1i5pf31iyahl96"; + sha256 = "0ndf98dpzmz8xs6m253zpwnhyfrvxdkfyvssxps0vrx0x9sa8zfz"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; actionmailer = { dependencies = [ @@ -47,10 +58,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qc5ycibnxricdlgmrihds0hqjli5hhksbv947nqbsfg8b4gl63r"; + sha256 = "13a4329lgrda8s9mqrfbaakvc90i6ak82rfpljmd0w5vj54747w3"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; actionpack = { dependencies = [ @@ -73,13 +84,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dabvb49acbwvy91587cbn36ghv3bsyl14a9aq4ll4nxfn4qdpn9"; + sha256 = "18r93ii2ayw8n60qsx259dy8nwgbfxf3ndncla0xbia79np8r6dg"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; actiontext = { dependencies = [ + "action_text-trix" "actionpack" "activerecord" "activestorage" @@ -91,10 +103,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q8jm23v29zv055wpgyrwzb008bvqbm4x8bb64l0f8r6ccywxwqj"; + sha256 = "1ln7mwflqf7nsgkj9lm1p7bmc6h8yqaa47q1cdj9xsp102f034fj"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; actionview = { dependencies = [ @@ -113,10 +125,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04ql6lpvdmrl5169y166pfr9w53c6f40jkgmn4ljgkzh7pkaj3vd"; + sha256 = "0pgxl9p2q2zbwb6626yw7rgpbmv2bvxykq2w1h83inrygy6chiqk"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; activejob = { dependencies = [ @@ -127,10 +139,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "047asb83p78zh93v0q1svrfl6da3aqqbjlkwd2jap172pz1ybard"; + sha256 = "1lz8bxb6pcf9yvxwyj6355aws3ylxi5rwc577ly4q858d9vb2jd1"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -141,10 +153,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hjv2kmv7i0jk8zkng3pxa1kdd90qpgr3v60qvs764yw8qyq35n7"; + sha256 = "06c23jww82grgvxw19g4bi9c957aj5hh24wzyyw4jdpg9jz5rh4h"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; activerecord = { dependencies = [ @@ -159,10 +171,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ri9l5v4601bxwrkl105k1ccxxg2wpvg6x94rwqr834irnv63cl9"; + sha256 = "1avhmih54xqyj14zrv6ciw2ndpb11bmkwq0fcwm0mfk64ixvw0w0"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; activerecord-postgis-adapter = { dependencies = [ @@ -173,10 +185,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06xp91kanz3w2s89wqb97fzzzcpy79rfjjs4zq85m402zg2fm08w"; + sha256 = "1hms9ya0yiq1s1w6vy9yipaiq3yd8lrj7gw32p9bzmwyikc9naxf"; type = "gem"; }; - version = "11.0.0"; + version = "11.1.1"; }; activestorage = { dependencies = [ @@ -190,20 +202,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wrxnj6rqzp7n80f0cfrdalz7b2md6sqqmx8lrgd3klaiwzqm295"; + sha256 = "0k9q8sdlf576r8rp2hgdxy5lpr8f157bpq8mfsk52f8l169wwr05"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; activesupport = { dependencies = [ "base64" - "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "json" "logger" "minitest" "securerandom" @@ -219,10 +231,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08ybmp63qrfaxq7bv7mvb4xvfb4fcylw2a0szankzkrpdbzi7wip"; + sha256 = "03m2vjhq3nmc8c3hpivxhvkjd8igg16nmv0p2fgdsgacppgy1991"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -312,25 +324,36 @@ }; version = "1.0.2"; }; + auth-sanitizer = { + dependencies = [ "version_gem" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0xy5gjb12kv6zjn4zyd16yfv4bygd02ykbr6cz10d6sqyw0wyzci"; + type = "gem"; + }; + version = "0.2.1"; + }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07w1gp9wmldxw3bf25all32s46rrn10x25h0m9grj5fvs2y4m4nn"; + sha256 = "1ihq7k01fwayf4ir0n6g99r7s8xja1rnr55p9agfdqffhlzwaq8s"; type = "gem"; }; - version = "1.1253.0"; + version = "1.1259.0"; }; aws-sdk-core = { dependencies = [ @@ -346,10 +369,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zkkzr70qnm6jq2xxlg4zgp49zdg7431sgd6yl0sgrmq0bq3f31j"; + sha256 = "074awkbb7rs9332vvxifxndrjambxf1bkj8w8hwj5krazk5l5h09"; type = "gem"; }; - version = "3.249.0"; + version = "3.252.0"; }; aws-sdk-kms = { dependencies = [ @@ -360,10 +383,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xd3ddd9jiapkgv8im4pl9dcdy2ps7qjsssf2nz3q6sd1ca8x0di"; + sha256 = "0hrkb8ar61zgswz16rcf1x00n1liwn236lh5zpya9x11yf6m8grn"; type = "gem"; }; - version = "1.96.0"; + version = "1.129.0"; }; aws-sdk-s3 = { dependencies = [ @@ -375,10 +398,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ybqxlicjvhp74r4y87wy61j93j9kgs427881sv9b9zdx553qi3x"; + sha256 = "04k5wasssinx66vws2jn4vhzfisg30mkhbdmcs3m99dhp66kmcnl"; type = "gem"; }; - version = "1.224.0"; + version = "1.225.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -386,10 +409,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.1"; }; base64 = { groups = [ @@ -415,21 +438,6 @@ }; version = "3.1.22"; }; - benchmark = { - groups = [ - "default" - "development" - "staging" - "test" - ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0v1337j39w1z7x9zs4q7ag0nfv4vs4xlsjx2la0wpv8s6hig2pa6"; - type = "gem"; - }; - version = "0.5.0"; - }; bigdecimal = { groups = [ "default" @@ -461,10 +469,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "057jsch213i42qgdsz2vg1b190n2xvvbi3hgprc8nmaqim2ly9f1"; + sha256 = "0jhnvalyqhjv10y2m804z2s9wabmys4a4di6187jjch3qy4an2y6"; type = "gem"; }; - version = "1.23.0"; + version = "1.24.6"; }; brakeman = { dependencies = [ "racc" ]; @@ -476,10 +484,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "164l8dh3c22c8448hgd0zqhsffxvn4d9wad2zzipav29sssjd532"; + sha256 = "0vyg9l6xivamb49r4kzkcw12r9x943kv79wsvwslhm1qjvx23ybv"; type = "gem"; }; - version = "7.1.1"; + version = "8.0.4"; }; builder = { groups = [ @@ -511,18 +519,20 @@ version = "0.9.3"; }; byebug = { + dependencies = [ "reline" ]; groups = [ "default" "development" + "staging" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07hsr9zzl2mvf5gk65va4smdizlk9rsiz8wwxik0p96cj79518fl"; + sha256 = "0pg05blj56sxdxq9d54386y9rlvj36vl95x21x9clh8rfpz3w9nj"; type = "gem"; }; - version = "12.0.0"; + version = "13.0.0"; }; capybara = { dependencies = [ @@ -588,10 +598,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb"; + sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4"; type = "gem"; }; - version = "1.3.6"; + version = "1.3.7"; }; connection_pool = { groups = [ @@ -603,10 +613,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b8nlxr5z843ii7hfk6igpr5acw3k2ih9yjrgkyz2gbmallgjkz5"; + sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk"; type = "gem"; }; - version = "2.5.5"; + version = "3.0.2"; }; crack = { dependencies = [ @@ -683,10 +693,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ya5gbz8p4qm1h4p33b99zfna4n5flmccvwp5air4086j4sv5bzy"; + sha256 = "0fs7nz3ckyplaxv28nv4xhjdj6fl4ih7jkfjnzgfgphkp5fy5anf"; type = "gem"; }; - version = "3.0.0"; + version = "3.0.5"; }; date = { groups = [ @@ -723,6 +733,7 @@ ]; groups = [ "development" + "staging" "test" ]; platforms = [ @@ -741,10 +752,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wmfy5n5v2rzpr5vz698sqfj1gl596bxrqw44sahq4x0rxjdn98l"; + sha256 = "1djjx5332d1hdh9s782dyr0f9d4fr9rllzdcz2k0f8lz2730l2rf"; type = "gem"; }; - version = "1.11.0"; + version = "1.11.1"; }; devise = { dependencies = [ @@ -962,14 +973,15 @@ version = "6.5.1"; }; fakeredis = { + dependencies = [ "redis" ]; groups = [ "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xlkcavchj9l9457q4gfjynrzj3d9q9p8sxwclqrn4g2wjdc8vap"; + sha256 = "1avqz567g5d5c06f6fwgcdyn685svv54lsp911vxibw0r0f9q780"; type = "gem"; }; - version = "0.1.4"; + version = "0.9.2"; }; faraday = { dependencies = [ @@ -981,10 +993,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b930ag8nh99v8n9645ac1wcah9fx0mclbp323q4i1ly9acvkk3k"; + sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq"; type = "gem"; }; - version = "2.14.2"; + version = "2.14.3"; }; faraday-follow_redirects = { dependencies = [ "faraday" ]; @@ -1049,10 +1061,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kbf2r2ayb91d1i0lbpj418pcv33dc24pqs9fl1wg4rhzd035105"; + sha256 = "015kkhddkcjncqdv8mf8fd09ki4s44kyg6f5nqjvaq66brdxd9yw"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; flipper-active_record = { dependencies = [ @@ -1063,10 +1075,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dss4hhnw6ypn2yh0cq2yi08cwvkv0kqjxxih7214slps0d4i5si"; + sha256 = "1lgw3pxpgb1j53l0ywmvia8w5l88kckgqf2m1dlrrma4iavsww5b"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; flipper-ui = { dependencies = [ @@ -1081,10 +1093,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "168agvgc6skln31x3r5ic5c6varc3m5b1gxnpkxq5p9gslvm53mp"; + sha256 = "1vhdahaig6jhp9njxi5626q2ac8n4yyvl314r3haaawjds4gvcnp"; type = "gem"; }; - version = "1.4.1"; + version = "1.4.2"; }; foreman = { dependencies = [ "thor" ]; @@ -1170,10 +1182,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xv7zdaw799fvhbh0pdq2hi6lhvp1sid988l35l18s45yddqvamy"; + sha256 = "0405sjsqz2x62g5yghswbsm570xjh1j434p5867c70d9ijhhxy8n"; type = "gem"; }; - version = "6.7.0"; + version = "6.8.0"; }; h3 = { dependencies = [ @@ -1245,6 +1257,17 @@ }; version = "1.14.8"; }; + icons = { + dependencies = [ "nokogiri" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1s7lg09ki7x02advdrn98fa2gxbwaq5adlnf8mxqcnmsa4gid27x"; + type = "gem"; + }; + version = "0.8.1"; + }; importmap-rails = { dependencies = [ "actionpack" @@ -1255,10 +1278,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05767zlpfafsairdl1kgalfdjlvydjsd1qdd5447hcpqj885p7vj"; + sha256 = "0smixr7l97pky55k0kz9rxmmyk2032kp7xdqixaz2z699lmbw0bi"; type = "gem"; }; - version = "2.2.2"; + version = "2.2.3"; }; io-console = { groups = [ @@ -1336,14 +1359,16 @@ groups = [ "default" "development" + "staging" + "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wr6x4fxcw113rj0gdpgz8v4faa8647w2ni9hfiiirv67qzm3pir"; + sha256 = "1anz6a6n33x4s3906s0bz6x161kk1ns3h7xxsn3rpxkfsw7k2m33"; type = "gem"; }; - version = "2.19.6"; + version = "2.19.8"; }; json-jwt = { dependencies = [ @@ -1623,10 +1648,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76"; + sha256 = "18g6ps30z6m365bly7sfialavnsf6m6qamdxsr84w96k51j4mnlb"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.3"; }; multi_json = { groups = [ "default" ]; @@ -1669,10 +1694,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ax0f0r97jm83q462vsrcbdxprs894fyyc44v62c48ihgb39hmcs"; + sha256 = "03ga2h4i5hsk8pdlicyfvqfsbh55vrbikb0nkx9x7vx7fl6kdw19"; type = "gem"; }; - version = "0.6.4"; + version = "0.6.4.1"; }; net-pop = { dependencies = [ "net-protocol" ]; @@ -1731,13 +1756,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; + sha256 = "1d9safb4dly6qmc2g06444l0zifby52yy6j1a5fa1g4j3ihm3jah"; type = "gem"; }; - version = "1.19.3"; + version = "1.19.4"; }; oauth2 = { dependencies = [ + "auth-sanitizer" "faraday" "jwt" "logger" @@ -1750,10 +1776,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11rj80dgjz05x5xx93y4bfk9rcn7fl56srj8fgqn7ffzf3j13kxs"; + sha256 = "19igd2jv3vqrqpqqdf36740g1sln16ibv1npgvdzcsfyr3q6jilg"; type = "gem"; }; - version = "2.0.18"; + version = "2.0.22"; }; oj = { dependencies = [ @@ -1764,10 +1790,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara"; + sha256 = "1v87lxi5cdaw3fvdf046fwzrgfbmi2ndkl31clh4zb5p1dxrdqzb"; type = "gem"; }; - version = "3.16.11"; + version = "3.17.3"; }; omniauth = { dependencies = [ @@ -1909,10 +1935,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05xqijcf80sza5pnlp1c8whdaay8x5dc13214ngh790zrizgp8q9"; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; type = "gem"; }; - version = "0.6.1"; + version = "0.6.3"; }; parallel = { groups = [ @@ -1922,10 +1948,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; + sha256 = "0mlkn1vhh9lr7vljibpgspwsswk7mzm8nw6bbr616c9fbj35hlmk"; type = "gem"; }; - version = "1.27.0"; + version = "2.1.0"; }; parser = { dependencies = [ @@ -1939,10 +1965,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mmb59323ldv6vxfmy98azgsla9k3di3fasvpb28hnn5bkx8fdff"; + sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni"; type = "gem"; }; - version = "3.3.10.0"; + version = "3.3.11.1"; }; patience_diff = { dependencies = [ "optimist" ]; @@ -1963,10 +1989,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq"; + sha256 = "16caca7lcz5pwl82snarqrayjj9j7abmxqw92267blhk7rbd120k"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; posthog-rails = { dependencies = [ @@ -1977,10 +2003,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f2y2sd3r1ihpkwrjqa7h3frs2yv9pca00kpd54n2vy9y8vpi534"; + sha256 = "06iv4rh9hfqx9q2yxl6yr5nqqlc6xp60sqmnf94f2zw3k5csynj5"; type = "gem"; }; - version = "3.9.1"; + version = "3.11.0"; }; posthog-ruby = { dependencies = [ "concurrent-ruby" ]; @@ -1988,10 +2014,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09lpwyv5g6q3v4qrygkfdk3kzf3zh0bsyss0i5fgqhs4drnlhsz0"; + sha256 = "0v3yciwz314asqvxkc3qli5z7vn86c11dx2hjy0dcx2x4nb2gd6h"; type = "gem"; }; - version = "3.9.1"; + version = "3.11.0"; }; pp = { dependencies = [ "prettyprint" ]; @@ -2079,19 +2105,21 @@ dependencies = [ "coderay" "method_source" + "reline" ]; groups = [ "default" "development" + "staging" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ssv704qg75mwlyagdfr9xxbzn1ziyqgzm0x474jkynk8234pm8j"; + sha256 = "0kh5nv8v74k1ccy6gc7nd04aaf1cjkbk7g8pwy2izvcqaq36jv6p"; type = "gem"; }; - version = "0.15.2"; + version = "0.16.0"; }; pry-byebug = { dependencies = [ @@ -2100,15 +2128,16 @@ ]; groups = [ "development" + "staging" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wpa3jd46h44rjz3hjwl5c0zfx3jav4a64nm8h0g1iwv61yvn2hb"; + sha256 = "1dyi2dr5zp08s4bp9ik44v84wc0kdvinmcy7six0lfd8x150jkjr"; type = "gem"; }; - version = "3.11.0"; + version = "3.12.0"; }; pry-rails = { dependencies = [ "pry" ]; @@ -2151,10 +2180,10 @@ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x0r3gc66abv8i4dw0x0370b5hrshjfp6kpp7wbp178cy775fypb"; + sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql"; type = "gem"; }; - version = "5.3.1"; + version = "5.4.0"; }; public_suffix = { groups = [ @@ -2166,10 +2195,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; + sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs"; type = "gem"; }; - version = "6.0.2"; + version = "7.0.5"; }; puma = { dependencies = [ "nio4r" ]; @@ -2177,10 +2206,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3jd9qakasizrf7dkq5mqv51fjf02r2chybai2nskjaa6mz93mz"; + sha256 = "1yw6nvkvddriacmva8hm0za0961d6j96dm7zm6748rmyzcfqgvf8"; type = "gem"; }; - version = "7.2.0"; + version = "8.0.2"; }; pundit = { dependencies = [ "activesupport" ]; @@ -2345,10 +2374,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rjvzpnl0js6axlygij5a5c6cwmraxvv6z6c2px95qlbjj80zd2c"; + sha256 = "1lww7i686rm9s50d34hb596y2kfl46dida2kjy8gr64c6jjpn0bd"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; rails-dom-testing = { dependencies = [ @@ -2390,17 +2419,17 @@ }; rails_icons = { dependencies = [ - "nokogiri" + "icons" "rails" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0aixqyan3ik3z84135wn0zvvfb8krj4qxccsg9jbznjx0ywblhap"; + sha256 = "0yqdd1qrvggh5gb3qicngxxassbqi1nyviiyqr6j9pg6853gn3y4"; type = "gem"; }; - version = "1.4.0"; + version = "1.8.0"; }; railties = { dependencies = [ @@ -2422,10 +2451,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1md96yl05v436jkgz9725cax9hf61sv74267cg7yidwnl3lwd65d"; + sha256 = "08nyhsigcvjpj9i3r0s73yi8zm16sxmr2x7xgxlaq2jjrghb0gli"; type = "gem"; }; - version = "8.0.5"; + version = "8.1.3"; }; rainbow = { groups = [ @@ -2489,15 +2518,17 @@ version = "7.2.0"; }; redis = { - dependencies = [ "redis-client" ]; - groups = [ "default" ]; + groups = [ + "default" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm"; + sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; type = "gem"; }; - version = "5.4.1"; + version = "4.8.1"; }; redis-client = { dependencies = [ "connection_pool" ]; @@ -2505,10 +2536,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16vplvxrsaq6as1hzw71mkfcpjdphk0m662k36vrilq2f9dgndhk"; + sha256 = "18xy2nd8mcb186gqd11sy3vfwkq5n85mq26v7l325jkdiwgvyr8c"; type = "gem"; }; - version = "0.26.2"; + version = "0.29.0"; }; regexp_parser = { groups = [ @@ -2519,10 +2550,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya"; + sha256 = "1fwfw26a32rps78920nn29shqg2zmqv72i89j1fap41isshida9m"; type = "gem"; }; - version = "2.11.3"; + version = "2.12.0"; }; reline = { dependencies = [ "io-console" ]; @@ -2617,10 +2648,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mfxgxhsk4hpxh0ahk9yk593qiminv91gnfxkyixgm0nh6kn56ay"; + sha256 = "1mgmr8f7rfab8hyfd0s15nbvsbxzbghj87qyi5jwynmkji481hc9"; type = "gem"; }; - version = "3.0.1"; + version = "3.1.0"; }; rgeo-activerecord = { dependencies = [ @@ -2631,10 +2662,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "151hzz2amv4xn3ka5ab3rm3ghbyip8fqsa5m6jkpbf38qn6jz8n8"; + sha256 = "18ar7ycppwqwf3nyjm2q5rmqwgd2x04d1xwai8gc9wp2xavylyia"; type = "gem"; }; - version = "8.0.0"; + version = "8.1.0"; }; rgeo-geojson = { dependencies = [ @@ -2669,35 +2700,36 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2"; + sha256 = "0hlm1cfqs891irh4pl6wynsfm7nh7w7baf0g6cqxfrxvlr64khb4"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; rqrcode_core = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y"; + sha256 = "0l9hl5nb7jx8sjchsrlv6bk30hywr449ihcdxv2qy6wwz1fvh0zk"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; rspec-core = { dependencies = [ "rspec-support" ]; groups = [ "default" "development" + "staging" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1r6zbis0hhbik1ck8kh58qb37d1qwij1x1d2fy4jxkzryh3na4r5"; + sha256 = "0bcbh9yv6cs6pv299zs4bvalr8yxa51kcdd1pjl60yv625j3r0m8"; type = "gem"; }; - version = "3.13.3"; + version = "3.13.6"; }; rspec-expectations = { dependencies = [ @@ -2732,10 +2764,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0klv9mibmnfqw92w5bc1bab1x4dai60xfh0xz0mhgicibsp3gcbq"; + sha256 = "0iqxmw0knjiz5nf6pgr8ihs6cjzh89f0ppj3fqiz8cvms79x6sh8"; type = "gem"; }; - version = "3.13.6"; + version = "3.13.8"; }; rspec-rails = { dependencies = [ @@ -2755,24 +2787,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i"; + sha256 = "1pr29snnnlgkqv80vbi4795l6rxq3l47x5rl7lyni4h8zj95c8q6"; type = "gem"; }; - version = "8.0.2"; + version = "8.0.4"; }; rspec-support = { groups = [ "default" "development" + "staging" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hrzdcklbl8pv721cq906yfl38fmqmlnh33ff8l752z1ys9y6q9a"; + sha256 = "0z64h5rznm2zv21vjdjshz4v0h7bxvg02yc6g7yzxakj11byah06"; type = "gem"; }; - version = "3.13.3"; + version = "3.13.7"; }; rswag-api = { dependencies = [ @@ -2842,10 +2875,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wz2np5ck54vpwcz18y9x7w80c308wza7gmfcykysq59ajkadw89"; + sha256 = "138qbhxb6r8qyq6kz38i3wq4k2rdcrhfcyicxzw1798na7sxvndr"; type = "gem"; }; - version = "1.82.1"; + version = "1.87.0"; }; rubocop-ast = { dependencies = [ @@ -2859,10 +2892,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zbikzd6237fvlzjfxdlhwi2vbmavg1cc81y6cyr581365nnghs9"; + sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4"; type = "gem"; }; - version = "1.49.0"; + version = "1.49.1"; }; rubocop-rails = { dependencies = [ @@ -2876,10 +2909,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08kf3nhhhxcwb9shb4bv7jxr1mjrs63fwpywppmgy9cbwip29zqh"; + sha256 = "1xaxlfas5grja3lvzjrfiv86ah3rxa15cmi7hc79b2cw8cjs7sis"; type = "gem"; }; - version = "2.34.2"; + version = "2.35.4"; }; ruby-next-core = { groups = [ "default" ]; @@ -2912,10 +2945,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; + sha256 = "0khy3d43cr2i4x9as2k41ckrjb4wkpcycdbzaara4fy4qw923n9f"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; sanitize = { dependencies = [ @@ -2957,10 +2990,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16rmdnc8c779gmphv7n4rcx8bc6yv24i555lzqx2drmrqk721jbg"; + sha256 = "0xw4bpmw2kfpfk187mnga2ranalm688y1w26kic6kwwsa9rg07bg"; type = "gem"; }; - version = "4.35.0"; + version = "4.44.0"; }; sentry-rails = { dependencies = [ @@ -2971,10 +3004,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1r5031qb02xmwmkrrz8ald4gc35xgcgz2h089873w33l5kcd9ygb"; + sha256 = "1vdiia361bzmkajb8nfz6y87yjyj7wdnfp1n5lb5s8zbwr1sljfb"; type = "gem"; }; - version = "6.5.0"; + version = "6.6.2"; }; sentry-ruby = { dependencies = [ @@ -2986,10 +3019,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0srsbyw11h4gkr75vv4xcws8b9a9h7ii8wf3kb6syyh1d86swmrw"; + sha256 = "1mkcrjn47y7z4g59psrz4xw3sniabf9dwwaqzsc8a18hgmssyjm6"; type = "gem"; }; - version = "6.5.0"; + version = "6.6.2"; }; shoulda-matchers = { dependencies = [ "activesupport" ]; @@ -2997,10 +3030,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i1zkr4rsvf8pz1x38wkb82nsjx28prmyb5blsmw86pd5cmmfszg"; + sha256 = "0xwwfj48d6mpc66lhl4yabnjazpf47wqg9n1i9na7q0h9isdigxl"; type = "gem"; }; - version = "6.5.0"; + version = "7.0.1"; }; sidekiq = { dependencies = [ @@ -3014,10 +3047,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mjcm3csall2idnza3w9gvayq3fbpz0k1jsmhsdpgxj6ipddik1p"; + sha256 = "03z48p8asbid67lmlsn12njk1gdb6xqibabyz5na3c94242ws85y"; type = "gem"; }; - version = "8.0.10"; + version = "8.1.6"; }; sidekiq-cron = { dependencies = [ @@ -3096,10 +3129,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mnllrwhs7psw6xxs8x5yx85k12qjfdgs8zs0bxm70bfascx58r5"; + sha256 = "1p9cnbz0fxkfqgpjb5xwwj5pfm969ndbp8shg43fz2kksqvl3rvh"; type = "gem"; }; - version = "2.0.3"; + version = "2.0.5"; }; sprockets = { dependencies = [ @@ -3135,10 +3168,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03788mbipmihq2w7rznzvv0ks0s9z1321k1jyr6ffln8as3d5xmg"; + sha256 = "014s1zxlxcw35shislar3y1i3mqa0c6gh3m21js14q1q5zharhjf"; type = "gem"; }; - version = "0.2.27"; + version = "0.2.28"; }; stimulus-rails = { dependencies = [ "railties" ]; @@ -3189,10 +3222,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qc3682i373ccml000xvi9pdksj3rb9v9znagjs762iypp3nwrkm"; + sha256 = "00n97vh59in3cnak281rlm87imnglr4zpqrz41xxc8x2vb0c2py3"; type = "gem"; }; - version = "0.17.0"; + version = "0.19.0"; }; swd = { dependencies = [ @@ -3257,10 +3290,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bz11pq7n1g51f50jqmgyf5b1v64p1pfqmy5l21y6vpr37b2lwkd"; + sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq"; type = "gem"; }; - version = "0.6.0"; + version = "0.6.1"; }; tsort = { groups = [ @@ -3286,10 +3319,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15gafkrlg8rdk2fra0w3rjc1jwicbdjv24grr5qn97z57kfv9jyb"; + sha256 = "0priz7ww23h2j9j5zicc4np3rr357n01xw8zymn0bzxg79rr03gf"; type = "gem"; }; - version = "2.0.20"; + version = "2.0.23"; }; tzinfo = { dependencies = [ "concurrent-ruby" ]; @@ -3391,10 +3424,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "195r5qylwxwqbllnpli9c2pzin0lky6h3fw912h88g2lmri0j6hc"; + sha256 = "15wwjmzk8y63v1w11lzc6y0pqlb2j040wvjgdfbxrcv2913gcpb9"; type = "gem"; }; - version = "1.1.9"; + version = "1.1.11"; }; warden = { dependencies = [ "rack" ]; @@ -3432,20 +3465,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mqw7ca931zmqgad0fq4gw7z3gwb0pwx9cmd1b12ga4hgjsnysag"; + sha256 = "142cbab47mjxmg8gc89d94sd3h7an9ligh38r9n88wb3xbr5cibp"; type = "gem"; }; - version = "3.26.1"; + version = "3.26.2"; }; webrick = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; + sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; websocket = { groups = [ @@ -3469,10 +3502,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd"; + sha256 = "15idgibqpdaj97f734drx8a7k1jcc8wvxlk2nbafac72ihikicjs"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; websocket-extensions = { groups = [ "default" ]; @@ -3493,10 +3526,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "001sswk3d1n8nf4pzxxc4rvxw47q05m0harl50ys25b18nxqai6z"; + sha256 = "1gqm78w1va32w6kbhpm86pvn9g28d2g7d9j9jrxys42sscg2znys"; type = "gem"; }; - version = "7.0.2"; + version = "7.5.0"; }; xpath = { dependencies = [ "nokogiri" ]; @@ -3613,10 +3646,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pbkiwwla5gldgb3saamn91058nl1sq1344l5k36xsh9ih995nnq"; + sha256 = "04hx33lsnp4q0qf8982mz0acs1dap5s2bsmihi0n0g08249sc4kj"; type = "gem"; }; - version = "2.7.5"; + version = "2.8.2"; }; zlib = { groups = [ "default" ]; diff --git a/pkgs/by-name/da/dawarich/package.nix b/pkgs/by-name/da/dawarich/package.nix index acd55e201bc0..bb841683497d 100644 --- a/pkgs/by-name/da/dawarich/package.nix +++ b/pkgs/by-name/da/dawarich/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation (finalAttrs: { env = { RAILS_ENV = "production"; NODE_ENV = "production"; - REDIS_URL = ""; # build error if not defined TAILWINDCSS_INSTALL_DIR = "${tailwindcss_3}/bin"; }; diff --git a/pkgs/by-name/da/dawarich/sources.json b/pkgs/by-name/da/dawarich/sources.json index 0e3d50536994..62bdfb27b777 100644 --- a/pkgs/by-name/da/dawarich/sources.json +++ b/pkgs/by-name/da/dawarich/sources.json @@ -1,5 +1,5 @@ { - "version": "1.7.11", - "hash": "sha256-10FPOt/58AgP4ChMlAn5bYg2erJFXDdjXlHr3pA4L3Y=", - "npmHash": "sha256-CwpVV5xLw75ReS0IqFvV3oaVk6EBlqYIKRa2KehVwFQ=" + "version": "1.9.2", + "hash": "sha256-vUJPMwzYZK/UAFiqnn0fkJH7GJjdBkewfYikK35Tbb4=", + "npmHash": "sha256-sUDEqvqNrztedUGZRRkD2ythpBQQwpqJz/QleUvqz0Y=" } diff --git a/pkgs/by-name/db/dbcsr/package.nix b/pkgs/by-name/db/dbcsr/package.nix index 3021ba446435..8024f9c45ea4 100644 --- a/pkgs/by-name/db/dbcsr/package.nix +++ b/pkgs/by-name/db/dbcsr/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dbcsr"; - version = "2.9.1"; + version = "2.10.0"; src = fetchFromGitHub { owner = "cp2k"; repo = "dbcsr"; rev = "v${finalAttrs.version}"; - hash = "sha256-F6EvpsPAJJvmEZQKJDW2Mk4Yo8VsQCD4CE2IqxpjyN8="; + hash = "sha256-BgZmc81TzgU3ifv4RHh2pfjbkUyxMIIpBrHCtnLF3p0="; }; postPatch = '' diff --git a/pkgs/by-name/db/dbeaver-bin/package.nix b/pkgs/by-name/db/dbeaver-bin/package.nix index c68ca12af343..6627d34277af 100644 --- a/pkgs/by-name/db/dbeaver-bin/package.nix +++ b/pkgs/by-name/db/dbeaver-bin/package.nix @@ -19,7 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "dbeaver-bin"; - version = "26.1.0"; + version = "26.1.1"; src = let @@ -28,14 +28,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { suffix = selectSystem { x86_64-linux = "linux-x86_64.tar.gz"; aarch64-linux = "linux-aarch64.tar.gz"; - x86_64-darwin = "macos-x86_64.dmg"; aarch64-darwin = "macos-aarch64.dmg"; }; hash = selectSystem { - x86_64-linux = "sha256-zAkHddh5xm9SHMV6OcJpl2A3+lS4GMJDbZ/+zg/5PzE="; - aarch64-linux = "sha256-0Tv45N+nZ2lRgn/Lo5HpPjuGigI0X2CJIIV96UO0bs8="; - x86_64-darwin = "sha256-INfXvR9FJZcruC8KeRtc0SIHUUHc0p3jjDNk4eBk7Lo="; - aarch64-darwin = "sha256-s+NQ5hp3NiQpJ/b3mp7Fdjh5rEmf1UnSz/Ai5Z43qEg="; + x86_64-linux = "sha256-atbQ00lq589FlNem85NgzTKGyhTRpFII8OSfVfYQuD0="; + aarch64-linux = "sha256-Sde0q31hXMqX2oxfhgj5EcpeUYYFZJy61usaJVpZkLM="; + aarch64-darwin = "sha256-PwuFwEE+aBEG/ykwNrEBl20yfrade8BdUUHdLJGBkwc="; }; in fetchurl { diff --git a/pkgs/by-name/db/dbeaver-bin/update.sh b/pkgs/by-name/db/dbeaver-bin/update.sh index 8ab7bd75fcef..8a1e992dcef1 100755 --- a/pkgs/by-name/db/dbeaver-bin/update.sh +++ b/pkgs/by-name/db/dbeaver-bin/update.sh @@ -18,7 +18,6 @@ fi for i in \ "x86_64-linux linux-x86_64.tar.gz" \ "aarch64-linux linux-aarch64.tar.gz" \ - "x86_64-darwin macos-x86_64.dmg" \ "aarch64-darwin macos-aarch64.dmg" do # shellcheck disable=SC2086 # $i is intentionally splitted to $1 and $2 diff --git a/pkgs/by-name/db/dbgate/package.nix b/pkgs/by-name/db/dbgate/package.nix index dafa593efec1..8a8c8d042914 100644 --- a/pkgs/by-name/db/dbgate/package.nix +++ b/pkgs/by-name/db/dbgate/package.nix @@ -8,25 +8,21 @@ let pname = "dbgate"; - version = "6.6.9"; + version = "7.2.1"; src = fetchurl { aarch64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_arm64.AppImage"; - hash = "sha256-RS7fFP1ek59VvUv8Q7kjHSVUlH3r+ir3csotWHvyXaM="; + hash = "sha256-OkAyKMXOYxvZomVUB5xIpPKR+b4p3+US7TDMIYeCsoo="; }; x86_64-linux = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-linux_x86_64.AppImage"; - hash = "sha256-S+OSTa0g8//ORhRrsfrdRcIkk8EavTKjw4sYOdGXvfE="; - }; - x86_64-darwin = { - url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_x64.dmg"; - hash = "sha256-qu2We2ejeRP51DcG8CsMQ2GpfZZoA073dNUaBcStI90="; + hash = "sha256-QR44QZ5QNz/q9Cfp/d5EYjlG84ZmCtBFe8a4aMFEhjQ="; }; aarch64-darwin = { url = "https://github.com/dbgate/dbgate/releases/download/v${version}/dbgate-${version}-mac_universal.dmg"; - hash = "sha256-fW2Cz2u9LM2KMhGjbhq7EI0Oc8ACkTxddE2hOxR8TNU="; + hash = "sha256-luk0vWRc4x3QMYAPquTWiSW9FqTe1IsBm9qOoOeHOps="; }; } .${stdenv.hostPlatform.system} or (throw "dbgate: ${stdenv.hostPlatform.system} is unsupported."); @@ -42,7 +38,6 @@ let mainProgram = "dbgate"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/db/dbgate/update.sh b/pkgs/by-name/db/dbgate/update.sh index 1e893aaa7706..d37000bac6a1 100755 --- a/pkgs/by-name/db/dbgate/update.sh +++ b/pkgs/by-name/db/dbgate/update.sh @@ -15,7 +15,6 @@ fi for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; dbgate.src.url" --system "$system" | tr -d '"'))) update-source-version dbgate $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/db/dblab/package.nix b/pkgs/by-name/db/dblab/package.nix index 3cecff1c8e90..b7d17431c713 100644 --- a/pkgs/by-name/db/dblab/package.nix +++ b/pkgs/by-name/db/dblab/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "dblab"; - version = "0.40.2"; + version = "0.46.0"; src = fetchFromGitHub { owner = "danvergara"; repo = "dblab"; tag = "v${finalAttrs.version}"; - hash = "sha256-nEUKRI1pukVDsUvPIubujcy/O1E0t3ESRT0aem5HL78="; + hash = "sha256-BxGw3vWBpPlzRtP0IRXZUJrsp0hN9yBrvNp+Mk2q7aM="; }; - vendorHash = "sha256-T1y0ALF4s3T8ZaTqj2jUdnezVRmpegKnabahiQ3CgzA="; + vendorHash = "sha256-widzVKA85qslxuuO/ledG+IUvr+vw2HUiD3kVbe2D2A="; # Fix case-insensitive conflicts producing platform-dependent checksums # https://github.com/microsoft/go-mssqldb/issues/234 proxyVendor = true; diff --git a/pkgs/by-name/db/dblatex/package.nix b/pkgs/by-name/db/dblatex/package.nix index 3bed1f8cc05f..e3bd013ed712 100644 --- a/pkgs/by-name/db/dblatex/package.nix +++ b/pkgs/by-name/db/dblatex/package.nix @@ -1,8 +1,9 @@ { lib, stdenv, + fetchpatch, fetchurl, - python311, + python3, libxslt, texliveBasic, enableAllFeatures ? false, @@ -62,8 +63,26 @@ stdenv.mkDerivation rec { sha256 = "0yd09nypswy3q4scri1dg7dr99d7gd6r2dwx0xm81l9f4y32gs0n"; }; + patches = [ + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-replace-imp-by-importlib.patch"; + hash = "sha256-ND9fS8KkQKnML6EwJFSUFhqiIn4yEvu1KOxTRPjXsd0="; + }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-adjust-submodule-imports.patch"; + hash = "sha256-0wOn2IvCSCtrE0rM56yw3FcGggTsDk3owQa1UmFsbVo="; + }) + (fetchpatch { + url = "https://gitlab.archlinux.org/archlinux/packaging/packages/dblatex/-/raw/067a586a688635a8ad6c15b1bd8ef3b16eb3f9f4/dblatex-0.3.12-script_path.patch"; + hash = "sha256-JGN9NxOiqoZ0Yz5ZbYwsis3tujBA2OWX5PZtrc/iTJY="; + }) + ]; + + nativeBuildInputs = [ + (python3.withPackages (ps: [ ps.setuptools_80 ])) + ]; + buildInputs = [ - python311 libxslt tex ] @@ -100,7 +119,7 @@ stdenv.mkDerivation rec { dontBuild = true; installPhase = '' - ${python311.interpreter} ./setup.py install --prefix="$out" --use-python-path --verbose + python ./setup.py install --prefix="$out" --use-python-path --verbose ''; passthru = { inherit tex; }; diff --git a/pkgs/by-name/db/dbmate/package.nix b/pkgs/by-name/db/dbmate/package.nix index 37f6029cba35..0cf43002520c 100644 --- a/pkgs/by-name/db/dbmate/package.nix +++ b/pkgs/by-name/db/dbmate/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "dbmate"; - version = "2.33.0"; + version = "2.34.1"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; tag = "v${finalAttrs.version}"; - hash = "sha256-qdW7hutxjdhT8ypQOmVrcTMzuySy0zkS8SeTbvaGVK4="; + hash = "sha256-rDnXLNltUxtzJRw3kc1nQ0HnrWZYQKA+o1nup/WsD7E="; }; - vendorHash = "sha256-kKj3KOWq1IeQcR2/QJYsKZh6Kxryj0y687CKzyeO4ZM="; + vendorHash = "sha256-+P9K/uOLFhsSwOxWPvTVu5MBCkP+9rGAA9efmgw4R60="; tags = [ "fts5" ]; diff --git a/pkgs/by-name/db/dbus/package.nix b/pkgs/by-name/db/dbus/package.nix index b754f292c7c3..264f6d944497 100644 --- a/pkgs/by-name/db/dbus/package.nix +++ b/pkgs/by-name/db/dbus/package.nix @@ -129,6 +129,9 @@ stdenv.mkDerivation (finalAttrs: { "-Dselinux=disabled" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # D-Bus defaults to launchd-activation on Darwin, but that requires the launch agent be installed. It also breaks + # anything that uses `dbus-run-session` in tests. Changing the default aligns Darwin with other UNIX platforms. + "-Ddbus_session_bus_listen_address=unix:tmpdir=/tmp" # `launchctl` is only needed at runtime. Lie to `find_program` because it will always be present on a Darwin host. "--cross-file=${writeText "darwin.ini" '' [binaries] @@ -156,6 +159,14 @@ stdenv.mkDerivation (finalAttrs: { --replace-fail 'DBUS_DAEMONDIR"/dbus-daemon"' '"/run/current-system/sw/bin/dbus-daemon"' ''; + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + # For some reason, only these binaries reference the dylib by rpath instead of by an absolute install name. + for exe in bin/dbus-daemon bin/dbus-run-session libexec/dbus-daemon-launch-helper; do + install_name_tool "$out/$exe" \ + -change "@rpath/libdbus-1.3.dylib" "$lib/lib/libdbus-1.3.dylib" + done + ''; + postFixup = '' # It's executed from $lib by absolute path moveToOutput bin/dbus-launch "$lib" diff --git a/pkgs/by-name/db/dbvisualizer/package.nix b/pkgs/by-name/db/dbvisualizer/package.nix index c93af60e6840..ef85fe0f13ac 100644 --- a/pkgs/by-name/db/dbvisualizer/package.nix +++ b/pkgs/by-name/db/dbvisualizer/package.nix @@ -4,7 +4,7 @@ fetchurl, makeDesktopItem, makeWrapper, - openjdk17, + openjdk25, stdenv, }: @@ -19,7 +19,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "25.3.3"; + version = "26.1.3"; src = let @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "https://www.dbvis.com/product_download/dbvis-${finalAttrs.version}/media/dbvis_linux_${underscoreVersion}.tar.gz"; - hash = "sha256-rvS2NczwmT1+/JIfpLI518I0/2AaIJEQAOwmKUK2FQs="; + hash = "sha256-ifD6pNWsw0n+aiPvQXG0pjNp/NMIAbr+bxzzntDahhs="; }; strictDeps = true; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { $out/share/icons/hicolor/128x128/apps/dbvisualizer.png ln -s $out/dbvis $out/bin/ - wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${openjdk17} + wrapProgram $out/bin/dbvis --set INSTALL4J_JAVA_HOME ${openjdk25} runHook postInstall ''; diff --git a/pkgs/by-name/dc/dcgm/package.nix b/pkgs/by-name/dc/dcgm/package.nix index 8c823615b1ef..78240426d56c 100644 --- a/pkgs/by-name/dc/dcgm/package.nix +++ b/pkgs/by-name/dc/dcgm/package.nix @@ -37,7 +37,7 @@ let # C.f. https://github.com/NVIDIA/DCGM/blob/7e1012302679e4bb7496483b32dcffb56e528c92/dcgmbuild/scripts/0080_cuda.sh#L24-L39 getCudaPackages = p: with p; [ - cuda_cccl + cccl cuda_cudart cuda_nvcc cuda_nvml_dev diff --git a/pkgs/by-name/dc/dcmtk/package.nix b/pkgs/by-name/dc/dcmtk/package.nix index 7589e47a0213..a2ee1b9696e9 100644 --- a/pkgs/by-name/dc/dcmtk/package.nix +++ b/pkgs/by-name/dc/dcmtk/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, fetchurl, zlib, libtiff, @@ -23,9 +24,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-JUF3IX0LOtpeAJPuTbAJo79sCuPuhh7KNIuQJfcFN/A="; }; - # The following patches are taken from the Debian package - # See https://salsa.debian.org/med-team/dcmtk patches = [ + # Remove when updating past 3.7.0. + (fetchpatch { + name = "CVE-2026-5663.patch"; + url = "https://github.com/DCMTK/dcmtk/commit/edbb085e45788dccaf0e64d71534cfca925784b8.patch"; + hash = "sha256-aSK/G5zI1Zyz0aonxnbWP/W5Ra6xCBYGxgPhM+05LXs="; + }) + # The following patches are taken from the Debian package + # See https://salsa.debian.org/med-team/dcmtk (fetchurl { url = "https://salsa.debian.org/med-team/dcmtk/-/raw/debian/3.6.9-4/debian/patches/01_dcmtk_3.6.0-1.patch"; hash = "sha256-kDEZvPqcF8+PYID24srMoPSBPltmnGiJ67LHsLVcPYM="; diff --git a/pkgs/by-name/dc/dcp/package.nix b/pkgs/by-name/dc/dcp/package.nix index a6bae8b8afc9..2f7a4c6fa78a 100644 --- a/pkgs/by-name/dc/dcp/package.nix +++ b/pkgs/by-name/dc/dcp/package.nix @@ -15,16 +15,16 @@ buildGoModule (finalAttrs: { pname = "dcp"; - version = "0.25.0"; + version = "0.25.9"; src = fetchFromGitHub { owner = "microsoft"; repo = "dcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-9+z+umhxnu4X9Yk76qk5Li/6ltT9qR3IVgkKgFrLf2c="; + hash = "sha256-MjBnJRdlGF2efEH0TcJjM3JVEByRzeqAZ13sR9EL0Ik="; }; - vendorHash = "sha256-hcuVUUr3kr3iBmSEhHy365LIWGGLFTYnBRa5jnt7kPw="; + vendorHash = "sha256-eJAMl1vGX2JANdYe8SWWLsNImd3raEEYvSfvwwfV4Xk="; # This is required so we: # - Delete an inconsistent vendor directory from upstream diff --git a/pkgs/by-name/dc/dcrctl/package.nix b/pkgs/by-name/dc/dcrctl/package.nix index 053a60b5121f..dddad707dab3 100644 --- a/pkgs/by-name/dc/dcrctl/package.nix +++ b/pkgs/by-name/dc/dcrctl/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = [ ]; mainProgram = "dcrctl"; }; diff --git a/pkgs/by-name/dc/dcrd/package.nix b/pkgs/by-name/dc/dcrd/package.nix index e69ffc91c3d1..1f349723c597 100644 --- a/pkgs/by-name/dc/dcrd/package.nix +++ b/pkgs/by-name/dc/dcrd/package.nix @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Decred daemon in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; }; }) diff --git a/pkgs/by-name/dc/dcrwallet/package.nix b/pkgs/by-name/dc/dcrwallet/package.nix index 10a9b712bbee..81f24d57ea57 100644 --- a/pkgs/by-name/dc/dcrwallet/package.nix +++ b/pkgs/by-name/dc/dcrwallet/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://decred.org"; description = "Secure Decred wallet daemon written in Go (golang)"; - license = with lib.licenses; [ isc ]; + license = lib.licenses.isc; maintainers = with lib.maintainers; [ juaningan ]; mainProgram = "dcrwallet"; }; diff --git a/pkgs/by-name/dd/ddccontrol-db/package.nix b/pkgs/by-name/dd/ddccontrol-db/package.nix index 127aa8371c6f..49a6ffce8564 100644 --- a/pkgs/by-name/dd/ddccontrol-db/package.nix +++ b/pkgs/by-name/dd/ddccontrol-db/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ddccontrol-db"; - version = "20260610"; + version = "20260714"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol-db"; tag = finalAttrs.version; - sha256 = "sha256-/3TWnBHPP3SyrsVcxiVkHxPITZDqQPF7HaMIaVnCT4M="; + sha256 = "sha256-9X22Vt1LbaVLrjFqafnPPfsKQdLPBKxQR7cz75yqML0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dd/ddcutil-service/package.nix b/pkgs/by-name/dd/ddcutil-service/package.nix index 0eb2febe4aee..26f16b039fc9 100644 --- a/pkgs/by-name/dd/ddcutil-service/package.nix +++ b/pkgs/by-name/dd/ddcutil-service/package.nix @@ -31,6 +31,9 @@ stdenv.mkDerivation (finalAttrs: { ddcutil ]; + # Also installs ddcutil-client, which is built by default + installTargets = "install-all"; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/by-name/dd/ddev/package.nix b/pkgs/by-name/dd/ddev/package.nix index 36ffba5f1a09..9afe4d5c8d6f 100644 --- a/pkgs/by-name/dd/ddev/package.nix +++ b/pkgs/by-name/dd/ddev/package.nix @@ -20,13 +20,13 @@ let in buildGoModule (finalAttrs: { pname = "ddev"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "ddev"; repo = "ddev"; rev = "v${finalAttrs.version}"; - hash = "sha256-JcZTKGjYTvrUT6IAKfVJsJj3e4Q60uiIdK3Y9GzeIVw="; + hash = "sha256-IsFay9UqvRdllLzyQLg3YUPFlg6MugYVWRXxUpBV9n0="; }; postPatch = '' diff --git a/pkgs/by-name/dd/ddhx/package.nix b/pkgs/by-name/dd/ddhx/package.nix index e69826b472ed..033080c49167 100644 --- a/pkgs/by-name/dd/ddhx/package.nix +++ b/pkgs/by-name/dd/ddhx/package.nix @@ -5,13 +5,13 @@ }: buildDubPackage (finalAttrs: { pname = "ddhx"; - version = "0.9.3"; + version = "0.10.0"; src = fetchFromGitHub { owner = "dd86k"; repo = "ddhx"; tag = "v${finalAttrs.version}"; - hash = "sha256-7sXXkn/B9iN8Iq4X/Rj7BufdHKDBS1aG3pXcInG+UaI="; + hash = "sha256-1dbY7xUOpwihrppuB+tyHuV2b12E4Yv2J69LXULxmg0="; }; dubLock = ./dub-lock.json; diff --git a/pkgs/by-name/dd/ddosify/package.nix b/pkgs/by-name/dd/ddosify/package.nix index 36ee53796959..34be4e31705e 100644 --- a/pkgs/by-name/dd/ddosify/package.nix +++ b/pkgs/by-name/dd/ddosify/package.nix @@ -10,8 +10,8 @@ buildGoModule (finalAttrs: { version = "2.6.0"; src = fetchFromGitHub { - owner = "ddosify"; - repo = "ddosify"; + owner = "getanteon"; + repo = "anteon"; tag = "selfhosted-${finalAttrs.version}"; hash = "sha256-EPbpBCSaUVVhxGlj7gRqwHLuj5p6563iiARqkEjA6Rk="; }; @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { description = "High-performance load testing tool, written in Golang"; mainProgram = "ddosify"; homepage = "https://ddosify.com/"; - changelog = "https://github.com/ddosify/ddosify/releases/tag/selfhosted-${finalAttrs.version}"; + changelog = "https://github.com/getanteon/anteon/releases/tag/selfhosted-${finalAttrs.version}"; license = lib.licenses.agpl3Plus; maintainers = [ ]; }; diff --git a/pkgs/by-name/dd/ddsmt/package.nix b/pkgs/by-name/dd/ddsmt/package.nix index 22e4cf83a734..810c774b93aa 100644 --- a/pkgs/by-name/dd/ddsmt/package.nix +++ b/pkgs/by-name/dd/ddsmt/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication { meta = { description = "Delta debugger for SMT benchmarks in SMT-LIB v2"; homepage = "https://ddsmt.readthedocs.io/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; }; } diff --git a/pkgs/applications/audio/deadbeef/wrapper.nix b/pkgs/by-name/de/deadbeef-with-plugins/package.nix similarity index 94% rename from pkgs/applications/audio/deadbeef/wrapper.nix rename to pkgs/by-name/de/deadbeef-with-plugins/package.nix index c5bc3de9541c..9dd9a6802b1f 100644 --- a/pkgs/applications/audio/deadbeef/wrapper.nix +++ b/pkgs/by-name/de/deadbeef-with-plugins/package.nix @@ -2,7 +2,7 @@ symlinkJoin, deadbeef, makeWrapper, - plugins, + plugins ? [ ], }: symlinkJoin { diff --git a/pkgs/by-name/de/deadbeef/package.nix b/pkgs/by-name/de/deadbeef/package.nix index 2e53f768298a..919017ab9d6b 100644 --- a/pkgs/by-name/de/deadbeef/package.nix +++ b/pkgs/by-name/de/deadbeef/package.nix @@ -65,19 +65,19 @@ let in clangStdenv.mkDerivation (finalAttrs: { pname = "deadbeef"; - version = "1.10.2"; + version = "1.10.3"; src = fetchFromGitHub { owner = "DeaDBeeF-Player"; repo = "deadbeef"; fetchSubmodules = true; tag = finalAttrs.version; - hash = "sha256-9naokzS2PxnyeO8AnqwLOsrYf/8I6Ah3oesUy2f22vs="; + hash = "sha256-SAp6XAE3fKTR27xYrdkNHneYDGJW1+XJdX6eBI9+EY0="; }; buildInputs = [ jansson - swift-corelibs-libdispatch + (swift-corelibs-libdispatch.override { useSwift = false; }) gtk3 gsettings-desktop-schemas ] diff --git a/pkgs/by-name/de/debase/package.nix b/pkgs/by-name/de/debase/package.nix index 5afb703d27a7..424d38460dc5 100644 --- a/pkgs/by-name/de/debase/package.nix +++ b/pkgs/by-name/de/debase/package.nix @@ -77,7 +77,6 @@ stdenv.mkDerivation rec { platforms = [ # Only these systems are supported by Makefile "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/de/debcraft/package.nix b/pkgs/by-name/de/debcraft/package.nix new file mode 100644 index 000000000000..02a68241fbad --- /dev/null +++ b/pkgs/by-name/de/debcraft/package.nix @@ -0,0 +1,52 @@ +{ + stdenv, + lib, + fetchFromGitLab, + help2man, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "debcraft"; + version = "0.9.2"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "debcraft"; + tag = "debian/${finalAttrs.version}"; + hash = "sha256-U8qWT26qno2zpfdsLqlqZg0SipvHCN6dUjUCjGuyrkY="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ help2man ]; + makeFlags = [ "DESTDIR=$(out)" ]; + + # debcraft ships with some scripts it'll execute inside a docker/podman container + # this'd patch the shebangs of the scripts executed in the container too, breaking them. + dontPatchShebangs = true; + + postPatch = '' + substituteInPlace debcraft.sh --replace-fail \ + 'DEBCRAFT_LIB_DIR="/usr/share/debcraft"' \ + "DEBCRAFT_LIB_DIR=\"$out/share/debcraft\"" + + # their Makefile installs in DESTDIR/usr for some reason + substituteInPlace Makefile --replace-fail '$(DESTDIR)/usr' '$(DESTDIR)' + ''; + + preBuild = '' + # the makefile runs help2man on the script, which needs it to be executable + # (and the shebang would need to be patched later anyways) + patchShebangs debcraft.sh + ''; + + meta = { + description = "Easy, fast and secure way to build Debian packages"; + homepage = "https://salsa.debian.org/debian/debcraft"; + license = lib.licenses.gpl3Plus; + maintainers = [ lib.maintainers.gilice ]; + platforms = lib.platforms.unix; + mainProgram = "debcraft"; + }; +}) diff --git a/pkgs/by-name/de/decasify/package.nix b/pkgs/by-name/de/decasify/package.nix index 23a8fe5f0883..acbb0ded69a9 100644 --- a/pkgs/by-name/de/decasify/package.nix +++ b/pkgs/by-name/de/decasify/package.nix @@ -14,18 +14,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "decasify"; - version = "0.10.1"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/alerque/decasify/releases/download/v${finalAttrs.version}/decasify-${finalAttrs.version}.tar.zst"; - hash = "sha256-XPl4HfhkwhHRkfc64BTafeHgLK1lB4UHKP6loLn5Ruc="; + hash = "sha256-JATJ8cFjtCkK65NpTTrUkYHAo4nDrqftarqyJInRTpM="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-rbFacCK/HU2D7QbVfMgKr9VevfutBJJtbXbKodTmkrc="; + hash = "sha256-hXU9Yw9rGQDkNnwy63LYPIrreOO2P/f8jVaPnVOhrWI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/de/deck-app/package.nix b/pkgs/by-name/de/deck-app/package.nix new file mode 100644 index 000000000000..2fd4267197f2 --- /dev/null +++ b/pkgs/by-name/de/deck-app/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "deck-app"; + version = "1.4.5"; + + src = fetchurl { + url = "https://github.com/yuzeguitarist/Deck/releases/download/v${finalAttrs.version}/Deck.dmg"; + hash = "sha256-U5iMoQZGycwiiehxKUB3iohvzAh42gkC1sk3AJ62Ujs="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r *.app $out/Applications + + runHook postInstall + ''; + + dontBuild = true; + dontFixup = true; + strictDeps = true; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Deck is a modern, native, privacy-first clipboard manager for macOS."; + homepage = "https://deckclip.app/"; + changelog = "https://github.com/yuzeguitarist/Deck/releases/tag/v${finalAttrs.version}"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ myzel394 ]; + # Deck provides a CLI tool that can be enabled in the app settings. + mainProgram = "deckclip"; + }; +}) diff --git a/pkgs/by-name/de/deck/package.nix b/pkgs/by-name/de/deck/package.nix index fa168150fb57..e7ec6588744b 100644 --- a/pkgs/by-name/de/deck/package.nix +++ b/pkgs/by-name/de/deck/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "deck"; - version = "1.62.1"; + version = "1.64.0"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; tag = "v${finalAttrs.version}"; - hash = "sha256-14M0MTfELHvCmkGhzghXTSg1n2gl7S6a4yoGgjLfHzI="; + hash = "sha256-nVV1nNOQ5zqywUXg3vdyiudryWVRKiDWU0Yc8b0albo="; }; nativeBuildInputs = [ installShellFiles ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ]; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-pUA8GhDX6oQ1z1VvuAZyRf0trDFip5BfqnNcc37tAng="; + vendorHash = "sha256-lo+1ijaWod0UB2PXzmg806q2KYrVu9yNgkI/Nq2lyq4="; postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd deck \ diff --git a/pkgs/by-name/de/decker/package.nix b/pkgs/by-name/de/decker/package.nix index eea90322726f..59aeddfe8e62 100644 --- a/pkgs/by-name/de/decker/package.nix +++ b/pkgs/by-name/de/decker/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "decker"; - version = "1.66"; + version = "1.69"; src = fetchFromGitHub { owner = "JohnEarnest"; repo = "Decker"; rev = "v${finalAttrs.version}"; - hash = "sha256-GKhIm9TC0l1u4dblnemqM72uXY9ah4QWCJiyv1bu14I="; + hash = "sha256-N1g+jaINbUZcTazvgfBc3G0QD4fevJMINRGL9Lp27us="; }; buildInputs = [ diff --git a/pkgs/by-name/de/deej/package.nix b/pkgs/by-name/de/deej/package.nix new file mode 100644 index 000000000000..ba3080dfa39c --- /dev/null +++ b/pkgs/by-name/de/deej/package.nix @@ -0,0 +1,60 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + pkg-config, + gtk3, + libappindicator-gtk3, + webkitgtk_4_1, +}: + +buildGoModule { + pname = "deej"; + version = "0.9.10"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "omriharel"; + repo = "deej"; + rev = "v0.9.10"; + hash = "sha256-T6S3FQ9vxl4R3D+uiJ83z1ueK+3pfASEjpRI+HjIV0M="; + }; + + vendorHash = "sha256-1gjFPD7YV2MTp+kyC+hsj+NThmYG3hlt6AlOzXmEKyA="; + + subPackages = [ "cmd" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + gtk3 + libappindicator-gtk3 + webkitgtk_4_1 + ]; + + preBuild = '' + # getlantern/systray hardcodes webkit2gtk-4.0 + for file in $(grep -rl "webkit2gtk-4.0" .); do + substituteInPlace "$file" --replace-fail "webkit2gtk-4.0" "webkit2gtk-4.1" + done + ''; + + postInstall = '' + mv $out/bin/cmd $out/bin/deej + ''; + + meta = with lib; { + description = "Open-source hardware volume mixer for Windows and Linux"; + longDescription = '' + deej is an open-source hardware volume mixer for Windows and Linux. + It lets you use real-world sliders (potentiometers) to control the + volume of individual apps (like Discord, Spotify and Games) independently. + ''; + homepage = "https://github.com/omriharel/deej"; + license = lib.licenses.mit; + maintainers = with maintainers; [ swaggeroo ]; + platforms = platforms.linux; + mainProgram = "deej"; + }; +} diff --git a/pkgs/by-name/de/defuddle/package.nix b/pkgs/by-name/de/defuddle/package.nix index 16b78498174a..94131aac3c11 100644 --- a/pkgs/by-name/de/defuddle/package.nix +++ b/pkgs/by-name/de/defuddle/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "defuddle"; - version = "0.18.1"; + version = "0.19.1"; src = fetchFromGitHub { owner = "kepano"; repo = "defuddle"; tag = version; - hash = "sha256-e/+eigIzpP0g+ZqTeyZnF6mloaY6UeKcMWfqryCcLbM="; + hash = "sha256-Fn203XKjZ2qbM1o0zs6mgxCdjWLOwz9Na+s1WSQG9XM="; }; - npmDepsHash = "sha256-1NFwhYEGTKpjzCdK/eHK0TWtOEpn67FA+B3QZ11w1Rs="; + npmDepsHash = "sha256-quqWhbcaSNj4Bk++4N4LYq3Y8U5nQqnwc+MqU0LLgso="; # jsdom is both a peerDependency and devDependency; pruning # devDependencies removes it, but the CLI needs it at runtime. diff --git a/pkgs/by-name/de/dehydrated/package.nix b/pkgs/by-name/de/dehydrated/package.nix index 18f95593a879..0313de24a7ff 100644 --- a/pkgs/by-name/de/dehydrated/package.nix +++ b/pkgs/by-name/de/dehydrated/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.7.2"; src = fetchFromGitHub { - owner = "lukas2511"; + owner = "dehydrated-io"; repo = "dehydrated"; rev = "v${finalAttrs.version}"; sha256 = "sha256-xDDYqP6oxJt0NPgHtHV1xQKUxVc8JQxWekXwxezggtE="; diff --git a/pkgs/by-name/de/deja/package.nix b/pkgs/by-name/de/deja/package.nix index 075791180dfa..f0b19dfb2c75 100644 --- a/pkgs/by-name/de/deja/package.nix +++ b/pkgs/by-name/de/deja/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "deja"; - version = "0.3.1"; + version = "0.3.2"; __structuredAttrs = true; src = fetchFromGitHub { owner = "Giammarco-Ferranti"; repo = "deja"; tag = "v${finalAttrs.version}"; - hash = "sha256-3fwjPvxCoFBb4a7vKFfGk+sIaLzTSiLxpGp2UIB0llk="; + hash = "sha256-ngjnrEq7x6OQ9uFGKmEvbAG7rPtjYX0xLK8110WSZUQ="; }; vendorHash = "sha256-KmLdMK94cGOXMPJwWS6NgLB5OiNmJbszHdnLzauqJm8="; diff --git a/pkgs/by-name/de/delly/package.nix b/pkgs/by-name/de/delly/package.nix index 5d46510ee21e..6345d6873fb2 100644 --- a/pkgs/by-name/de/delly/package.nix +++ b/pkgs/by-name/de/delly/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "delly"; - version = "2.0.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "dellytools"; repo = "delly"; rev = "v${finalAttrs.version}"; - hash = "sha256-g2brBYSwYQhZ1L1rYCZStWWH76qVSR/NBTEEByr7W5g="; + hash = "sha256-pDylNWYdt7vrQUqaIE2XBopcETAFqHfZP+8mqeoUN+U="; }; postPatch = lib.optionalString stdenv.cc.isClang '' diff --git a/pkgs/by-name/de/delta/package.nix b/pkgs/by-name/de/delta/package.nix index e5ef35dec03f..181fed03a40c 100644 --- a/pkgs/by-name/de/delta/package.nix +++ b/pkgs/by-name/de/delta/package.nix @@ -1,6 +1,7 @@ { lib, rustPlatform, + buildPackages, fetchFromGitHub, installShellFiles, pkg-config, @@ -42,10 +43,17 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTONIG_SYSTEM_LIBONIG = true; }; - postInstall = '' - installShellCompletion --cmd delta \ - etc/completion/completion.{bash,fish,zsh} - ''; + postInstall = lib.optionalString (stdenv.hostPlatform.emulatorAvailable buildPackages) ( + let + emulator = stdenv.hostPlatform.emulator buildPackages; + in + '' + installShellCompletion --cmd delta \ + --bash <(${emulator} $out/bin/delta --generate-completion bash) \ + --fish <(${emulator} $out/bin/delta --generate-completion fish) \ + --zsh <(${emulator} $out/bin/delta --generate-completion zsh) + '' + ); # test_env_parsing_with_pager_set_to_bat sets environment variables, # which can be flaky with multiple threads: diff --git a/pkgs/by-name/de/deltachat-desktop/package.nix b/pkgs/by-name/de/deltachat-desktop/package.nix index dbcc517399ae..bd2dc45d2ed6 100644 --- a/pkgs/by-name/de/deltachat-desktop/package.nix +++ b/pkgs/by-name/de/deltachat-desktop/package.nix @@ -22,38 +22,38 @@ let deltachat-rpc-server' = deltachat-rpc-server.overrideAttrs rec { - version = "2.52.0"; + version = "2.53.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${version}"; - hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM="; + hash = "sha256-W2Yh5+6MaJ47GqJioGKge2J3RetGGTcl+0YxPPlSdDo="; }; cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit version src; - hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s="; + hash = "sha256-aoPc5XvjwwuA9aOTvIOpTm15wozC9glJGqn3vPqsJF4="; }; }; electron = electron_41; in stdenv.mkDerivation (finalAttrs: { pname = "deltachat-desktop"; - version = "2.52.0"; + version = "2.53.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-/FdGI6Dr9lz0+g/xSzHXbMdqWHf4TliHDXXiAQKKkOs="; + hash = "sha256-UJ6005PeQBiL9Inj/VRZjgxZtR278Ky2RcD5MywcGD8="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-0VvyZzWAdVGsuYb8CI36KqkqvjgRsTLJov1L44MxUHQ="; + hash = "sha256-t5OHx1GCaTIgGo9193Z3Kkl+jHCBIgtRypcUaO6By3I="; }; strictDeps = true; diff --git a/pkgs/by-name/de/deltachat-tauri/package.nix b/pkgs/by-name/de/deltachat-tauri/package.nix index f812683ceae5..1387196ffbae 100644 --- a/pkgs/by-name/de/deltachat-tauri/package.nix +++ b/pkgs/by-name/de/deltachat-tauri/package.nix @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ; __structuredAttrs = true; - cargoHash = "sha256-euRUA4LTmAdb9466DAMqKgAPX3N4KNXCh1ED9cL42lA="; + cargoHash = "sha256-iGgsG5V0cFzoudVASGqLakpuy2h4oD979LHuBclj+3o="; postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $cargoDepsCopy/*/libappindicator-sys-*/src/lib.rs \ @@ -64,7 +64,6 @@ rustPlatform.buildRustPackage (finalAttrs: { gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad - gst_all_1.gst-vaapi gst_all_1.gstreamer libayatana-appindicator openssl diff --git a/pkgs/by-name/de/delve/package.nix b/pkgs/by-name/de/delve/package.nix index 053b6aa93d68..32b4bf498625 100644 --- a/pkgs/by-name/de/delve/package.nix +++ b/pkgs/by-name/de/delve/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "delve"; - version = "1.26.3"; + version = "1.27.0"; src = fetchFromGitHub { owner = "go-delve"; repo = "delve"; tag = "v${finalAttrs.version}"; - hash = "sha256-R7rxWJZ1AfwH/ytgQnq21D5d4YRm3fzYSIG0eugww1U="; + hash = "sha256-g7Lyi+lZZ818p4yINoJ12bdCY8sTwxaU/eRkuofnqnU="; }; patches = [ diff --git a/pkgs/by-name/de/dendrite/package.nix b/pkgs/by-name/de/dendrite/package.nix index 227a78356917..6186e6723e06 100644 --- a/pkgs/by-name/de/dendrite/package.nix +++ b/pkgs/by-name/de/dendrite/package.nix @@ -67,6 +67,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://element-hq.github.io/dendrite"; + mainProgram = "dendrite"; description = "Second-generation Matrix homeserver written in Go"; changelog = "https://github.com/element-hq/dendrite/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Plus; diff --git a/pkgs/by-name/de/deniseemu/package.nix b/pkgs/by-name/de/deniseemu/package.nix index dfc536f64bec..4e2106e24685 100644 --- a/pkgs/by-name/de/deniseemu/package.nix +++ b/pkgs/by-name/de/deniseemu/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://bitbucket.org/piciji/denise"; downloadPage = "https://sourceforge.net/projects/deniseemu/"; description = "C64 / Amiga Emulator"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/de/deno/package.nix b/pkgs/by-name/de/deno/package.nix index 601e8a81e2e8..761c33d3000e 100644 --- a/pkgs/by-name/de/deno/package.nix +++ b/pkgs/by-name/de/deno/package.nix @@ -33,17 +33,24 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "deno"; - version = "2.8.2"; + version = "2.9.3"; + + __structuredAttrs = true; + + outputs = [ + "out" + "denort" + ]; src = fetchFromGitHub { owner = "denoland"; repo = "deno"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; # required for tests - hash = "sha256-WtACDLrC1c7KxkoQgYrNavykkm8+tZmF46UU1YrLwVs="; + hash = "sha256-XMHlWK+lhyn1KO1CSxcuM3KzTjYviVrRw+FUL74bBPc="; }; - cargoHash = "sha256-Og+owcfHfdFJ08Xtiye2IEvKWd2Q/7f7QzQ/898IOcQ="; + cargoHash = "sha256-WZxyoD9WMnaLyD3/86R90KWC+9OA15fIMw8SjmovNHA="; patches = [ ./patches/0002-tests-replace-hardcoded-paths.patch @@ -152,6 +159,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=node_unit_tests::net_test" "--skip=node_unit_tests::tls_test" "--skip=npm::lock_file_lock_write" + "--skip=happy_eyeballs::tests::test_parallel_second_wins" # GPU access "--skip=js_unit_tests::webgpu_test" @@ -225,7 +233,9 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; postInstall = '' - # Remove non-essential binaries like denort and test_server + moveToOutput "bin/denort" "$denort" + + # Remove non-essential binaries like test_server find $out/bin/* -not -name "deno" -delete # Do what `deno x --install-alias` would do (it doesn't work with Nix-packaged Deno) @@ -279,12 +289,12 @@ rustPlatform.buildRustPackage (finalAttrs: { jk ofalvai mynacol + anish ]; maxSilent = 14400; # 4h, double the default of 7200s; sometimes needed for x86_64-darwin on hydra platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/de/deno/rusty-v8/default.nix b/pkgs/by-name/de/deno/rusty-v8/default.nix index b9865c673fa4..8a61c63adce2 100644 --- a/pkgs/by-name/de/deno/rusty-v8/default.nix +++ b/pkgs/by-name/de/deno/rusty-v8/default.nix @@ -1,21 +1,18 @@ { lib, fetchFromGitHub, - fetchpatch, rustPlatform, rustc, - rustc-unwrapped, rust-bindgen, - rust-analyzer, rustfmt, cargo, - clippy, llvmPackages ? rustc.llvmPackages, pkg-config, stdenv, glib, glibc, icu, + libffi, python3, gn, ninja, @@ -29,20 +26,24 @@ let name = "rusty-v8-rust-toolchain"; paths = [ rustc - rustc-unwrapped rust-bindgen - rust-analyzer rustfmt cargo - clippy llvmPackages.libclang.lib + # To provide about the same tools as the upstream rust toolchain, the following inputs are also needed. + # But they are not actually needed, and to avoid unnecessary rebuilds, we are not adding them. + #rustc-unwrapped + #rust-analyzer + #clippy ]; - postBuild = '' - mkdir -p "$out/lib/rustlib/src/rust" - cp -r '${rustPlatform.rustcSrc}'/* "$out/lib/rustlib/src/rust/" - chmod u+w "$out/lib/rustlib/src/rust/library/" - ln -s '${rustPlatform.rustVendorSrc}' "$out/lib/rustlib/src/rust/library/vendor" - ''; + /* + postBuild = '' + mkdir -p "$out/lib/rustlib/src/rust" + cp -r '${rustPlatform.rustcSrc}'/* "$out/lib/rustlib/src/rust/" + chmod u+w "$out/lib/rustlib/src/rust/library/" + ln -s '${rustPlatform.rustVendorSrc}' "$out/lib/rustlib/src/rust/library/vendor" + ''; + */ }; clangBasePath = symlinkJoin { @@ -70,14 +71,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "rusty-v8"; - version = "149.2.0"; + version = "149.4.0"; src = fetchFromGitHub { owner = "denoland"; repo = "rusty_v8"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-OAwfrSU1bu80+qcseUHtScVLZCTe9mY3NEfq0+hmVMg="; + hash = "sha256-n4dKtki9ov0lWBeLmMDI4Tpk8zQ8YYSf04QW6DTYisY="; }; patches = [ @@ -89,7 +90,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ./librusty_v8-darwin-fix-__rust_no_alloc_shim_is_unstable_v2.patch ]; - cargoHash = "sha256-dkuvWJaDPmsU25f3UGifWl2GvYku6+7Htk9tm5JVpLU="; + cargoHash = "sha256-bGqg/6sfBaF/JpObgXyP4Mh+4P9zfuzd454m4wjluGw="; nativeBuildInputs = [ llvmPackages.clang @@ -106,6 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ glib icu + libffi ] ++ lib.optionals stdenv.targetPlatform.isDarwin [ apple-sdk_15 @@ -123,6 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { RUSTC_BOOTSTRAP = 1; EXTRA_GN_ARGS = lib.concatStringsSep " " ( [ + "use_system_libffi=true" "use_sysroot=false" # prevent download of debian sysroot "clang_version=\"${lib.versions.major llvmPackages.clang.version}\"" "rustc_version=\"${rustc.version}\"" diff --git a/pkgs/by-name/de/dep-scan/package.nix b/pkgs/by-name/de/dep-scan/package.nix index cb7a0be4f477..c079070f8a75 100644 --- a/pkgs/by-name/de/dep-scan/package.nix +++ b/pkgs/by-name/de/dep-scan/package.nix @@ -79,6 +79,6 @@ python3Packages.buildPythonApplication (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; teams = [ lib.teams.ngi ]; - mainProgram = "dep-scan"; + mainProgram = "depscan"; }; }) diff --git a/pkgs/by-name/de/dependabot-cli/package.nix b/pkgs/by-name/de/dependabot-cli/package.nix index 7bee0b7b4e8f..6d2ee5be695c 100644 --- a/pkgs/by-name/de/dependabot-cli/package.nix +++ b/pkgs/by-name/de/dependabot-cli/package.nix @@ -12,7 +12,7 @@ }: let pname = "dependabot-cli"; - version = "1.85.0"; + version = "1.91.0"; # `tag` is what `dependabot` uses to find the relevant docker images. tag = "nixpkgs-dependabot-cli-${version}"; @@ -20,12 +20,12 @@ let # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/github/dependabot-update-job-proxy/dependabot-update-job-proxy --image-tag latest --final-image-name dependabot-update-job-proxy --final-image-tag ${tag} updateJobProxy.imageDigest = "sha256:70cf9a8f006db9cde732faf9e33a4f60af895532bbe803268fc8fd2f70aa3202"; - updateJobProxy.hash = "sha256-Q7f520dQIKYpJrrL7FFmk06KSjKN0GBEzuLqdFnOIfQ="; + updateJobProxy.hash = "sha256-IBUBBSXHwepTqvcWJyo5St+ceCc80ml0Arf6R9v54Eg="; # Get these hashes from # nix run nixpkgs#nix-prefetch-docker -- --image-name ghcr.io/dependabot/dependabot-updater-github-actions --image-tag latest --final-image-name dependabot-updater-github-actions --final-image-tag ${tag} - updaterGitHubActions.imageDigest = "sha256:2a475efc2c6385602dc05cc5eeb9dfcdb9554bdd148dd6544bf8c704fc79eefd"; - updaterGitHubActions.hash = "sha256-I90FBY7JCmvgWGXPCzjrmI5ia9bn+UmoKHp7I289NyA="; + updaterGitHubActions.imageDigest = "sha256:57b7da54e9ce0f360523f27b3536f38af1606bf6a0a74a906d39fb9fa5caf80a"; + updaterGitHubActions.hash = "sha256-cuAlu1PovPztc3P79bz8ySRCCDKh3dbt2WA4/ws6In8="; in buildGoModule { inherit pname version; @@ -34,10 +34,10 @@ buildGoModule { owner = "dependabot"; repo = "cli"; rev = "v${version}"; - hash = "sha256-p4smWs9z/A8RFUEIldCs7BuSvFFexcKJbzcVCl1vwaY="; + hash = "sha256-8wDP9NRsO/xbtbRTXY1BviEbZUEsiZBosJAni62uyFE="; }; - vendorHash = "sha256-QrrCT5r9oW9+sF4n00G889eJUHHfEctXw7RbImV4fLA="; + vendorHash = "sha256-mo/OOo+vw2jX0ggeEzNE8Qr5xXg0GEaTH6krdGQyeEE="; ldflags = [ "-s" diff --git a/pkgs/by-name/de/dependency-track/package.nix b/pkgs/by-name/de/dependency-track/package.nix index 378f54cbb2dc..9c30cb651b6b 100644 --- a/pkgs/by-name/de/dependency-track/package.nix +++ b/pkgs/by-name/de/dependency-track/package.nix @@ -2,7 +2,7 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_20, + fetchpatch2, jre_headless, protobuf_30, xmlstarlet, @@ -13,20 +13,17 @@ nixosTests, }: let - version = "4.14.1"; + version = "4.14.2"; frontend = buildNpmPackage { pname = "dependency-track-frontend"; inherit version; - # TODO: pinned due to build error on node 22 - nodejs = nodejs_20; - src = fetchFromGitHub { owner = "DependencyTrack"; repo = "frontend"; - rev = version; - hash = "sha256-xjIRkffmXYMAfZ8wJehnPRfTThJjTgNL8ONl9N9ZJ+M="; + tag = version; + hash = "sha256-/MH1YjEJdRjYjenkzOcp7oytudsJcinPbc9OAGFnI/Q="; }; installPhase = '' @@ -34,7 +31,14 @@ let cp -R ./dist $out/ ''; - npmDepsHash = "sha256-CW9LOur8N3obrOeHgYFH2OO/vg8XihUspuXS5Zrix8I="; + patches = [ + (fetchpatch2 { + url = "https://github.com/DependencyTrack/frontend/pull/1575.patch?full_index=1"; + hash = "sha256-Wo+6yXa/8jB/pph0DTNsFz6lK3sedvro+7yvLSKes9c="; + }) + ]; + + npmDepsHash = "sha256-md+PGEC1/Kl2MQhhYldSErcsDSefbPvwVDsw0Yklq1E="; forceGitDeps = true; makeCacheWritable = true; @@ -50,8 +54,8 @@ maven.buildMavenPackage rec { src = fetchFromGitHub { owner = "DependencyTrack"; repo = "dependency-track"; - rev = version; - hash = "sha256-pIZM8FQ0IFqRbTQT5VIlCmS+fCCXULJJ6bdEv6xfjbc="; + tag = version; + hash = "sha256-9EPjIm2VOmt1FEiPoJtwNHoKZcewO0kJgBSc9fnUXeI="; }; postPatch = '' @@ -84,7 +88,7 @@ maven.buildMavenPackage rec { ''; mvnJdk = jre_headless; - mvnHash = "sha256-4N4KuJBF/RFZwpp3dIgXntxSEfKHyfvrShKQoUqY5bE="; + mvnHash = "sha256-pshUDIPPGGGzxg5WJXC3mjnqGXn8HVowFCb2l5f6zjA="; manualMvnArtifacts = [ "com.coderplus.maven.plugins:copy-rename-maven-plugin:1.0.1" # added to saticfy protobuf compiler plugin dependency resolving @@ -92,7 +96,7 @@ maven.buildMavenPackage rec { "com.fasterxml.jackson.module:jackson-module-jakarta-xmlbind-annotations:2.19.1" "com.fasterxml.jackson.dataformat:jackson-dataformat-xml:2.21.0" "com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.18.3" - "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.0" + "com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.21.2" "io.micrometer:micrometer-core:1.16.0" "io.micrometer:micrometer-observation:1.16.0" ]; diff --git a/pkgs/by-name/de/depotdownloader/package.nix b/pkgs/by-name/de/depotdownloader/package.nix index 43768226ed97..108ef26ed1f5 100644 --- a/pkgs/by-name/de/depotdownloader/package.nix +++ b/pkgs/by-name/de/depotdownloader/package.nix @@ -32,7 +32,6 @@ buildDotnetModule rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "DepotDownloader"; diff --git a/pkgs/by-name/de/deputy/package.nix b/pkgs/by-name/de/deputy/package.nix index 2bffdff4434e..deed139d4224 100644 --- a/pkgs/by-name/de/deputy/package.nix +++ b/pkgs/by-name/de/deputy/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "deputy"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "filiptibell"; repo = "deputy"; tag = "v${finalAttrs.version}"; - hash = "sha256-NBtVIe4ZMNiOgCoIbngk4ECqT0hwe7rsWye6QFJrdPg="; + hash = "sha256-OdIhRdJvuSlZoKO0bDVplbcASc0w7iO9b1FnY8Uf33o="; }; - cargoHash = "sha256-ZwBWmOVFRAlWg+nmnzCue7F8XBhpuX+yp2PlEntB5Oo="; + cargoHash = "sha256-pnpL3hLaJRo3VJ9EK5ewYHu/2JJtkvd7VUFeMq0kJKQ="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/de/descent3/package.nix b/pkgs/by-name/de/descent3/package.nix index 5027a8bc12e7..bf77dcebd4b1 100644 --- a/pkgs/by-name/de/descent3/package.nix +++ b/pkgs/by-name/de/descent3/package.nix @@ -15,7 +15,7 @@ runCommand "descent3-${descent3-unwrapped.version}" meta = descent3-unwrapped.meta // { # The code that produces the wrapper is in the Nixpkgs repo, and the # Nixpkgs repo is MIT Licensed. - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; longDescription = '' Playing Descent 3 using the Nix package manager is a little bit awkward at the moment. This wrapper makes it slightly less awkward. Here’s how diff --git a/pkgs/by-name/de/deskflow/package.nix b/pkgs/by-name/de/deskflow/package.nix index e391c3410856..dec4016133dd 100644 --- a/pkgs/by-name/de/deskflow/package.nix +++ b/pkgs/by-name/de/deskflow/package.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "deskflow"; - version = "1.25.0"; + version = "1.26.0"; src = fetchFromGitHub { owner = "deskflow"; repo = "deskflow"; tag = "v${finalAttrs.version}"; - hash = "sha256-IclKXYCvYHMK4e1z1efmOHUaJqnmZgofK5r6Ml+i5OI="; + hash = "sha256-XcSG47Ysjn+wrJH5DC/XXGXcneXcW7xIhAn6sguuv+s="; }; postPatch = '' @@ -58,6 +58,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DCMAKE_SKIP_RPATH=ON" # Avoid generating incorrect RPATH + "-DSKIP_BUILD_TESTS=ON" # Perform unit tests in `checkPhase` manually, with one job at a time. ]; strictDeps = true; @@ -99,6 +100,7 @@ stdenv.mkDerivation (finalAttrs: { runHook preCheck export QT_QPA_PLATFORM=offscreen + ctest --test-dir "src/unittests" --output-on-failure ./bin/legacytests runHook postCheck diff --git a/pkgs/by-name/de/deskreen/package.nix b/pkgs/by-name/de/deskreen/package.nix index b8f091919bee..7747ac41388f 100644 --- a/pkgs/by-name/de/deskreen/package.nix +++ b/pkgs/by-name/de/deskreen/package.nix @@ -4,35 +4,39 @@ fetchurl, appimageTools, }: - -stdenvNoCC.mkDerivation (finalAttrs: { +appimageTools.wrapType2 rec { pname = "deskreen"; - version = "2.0.4"; + version = "3.2.16"; - src = fetchurl { - url = "https://github.com/pavlobu/deskreen/releases/download/v${finalAttrs.version}/Deskreen-${finalAttrs.version}.AppImage"; - hash = "sha256-0jI/mbXaXanY6ay2zn+dPWGvsqWRcF8aYHRvfGVsObE="; - }; - deskreenUnwrapped = appimageTools.wrapType2 { - inherit (finalAttrs) pname version; - src = finalAttrs.src; - }; - - buildInputs = [ - finalAttrs.deskreenUnwrapped - ]; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p $out/bin - ln -s ${finalAttrs.deskreenUnwrapped}/bin/deskreen $out/bin/deskreen - - runHook postInstall - ''; + src = + let + sources = { + x86_64-linux = { + arch = "x86_64"; + hash = "sha256-JcVKRINEWHJXzpdyiMSzx+cp/BzHBhrXRxYizQmkerI="; + }; + aarch64-linux = { + arch = "arm64"; + hash = "sha256-FDZz3Aarz9j8ppaLO6C1IhVKr7Dns77fLdQQCaCoKg0="; + }; + }; + inherit (stdenvNoCC.hostPlatform) system; + in + fetchurl { + url = "https://github.com/pavlobu/deskreen/releases/download/v${version}/deskreen-ce-${version}-${sources.${system}.arch}.AppImage"; + inherit (sources.${system}) hash; + }; + extraInstallCommands = + let + contents = appimageTools.extractType2 { inherit pname version src; }; + in + '' + install -m 444 -D ${contents}/deskreen-ce.desktop $out/share/applications/deskreen-ce.desktop + install -m 444 -D ${contents}/usr/share/icons/hicolor/256x256/apps/deskreen-ce.png \ + $out/share/icons/hicolor/512x512/apps/deskreen-ce.png + substituteInPlace $out/share/applications/deskreen-ce.desktop \ + --replace-fail 'Exec=AppRun' 'Exec=deskreen' + ''; meta = { description = "Turn any device into a secondary screen for your computer"; @@ -42,6 +46,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ leo248 ]; - platforms = lib.platforms.linux; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; -}) +} diff --git a/pkgs/by-name/de/desktop-postflop/package.nix b/pkgs/by-name/de/desktop-postflop/package.nix deleted file mode 100644 index a3eec5bbb07d..000000000000 --- a/pkgs/by-name/de/desktop-postflop/package.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - rustPlatform, - buildNpmPackage, - fetchFromGitHub, - copyDesktopItems, - makeDesktopItem, - pkg-config, - gtk3, - libsoup_2_4, -}: - -rustPlatform.buildRustPackage rec { - pname = "desktop-postflop"; - version = "0.2.7"; - - src = fetchFromGitHub { - owner = "b-inary"; - repo = "desktop-postflop"; - rev = "v${version}"; - hash = "sha256-pOPxNHM4mseIuyyWNoU0l+dGvfURH0+9+rmzRIF0I5s="; - }; - - npmDist = buildNpmPackage { - name = "${pname}-${version}-dist"; - inherit src; - - npmDepsHash = "sha256-HWZLicyKL2FHDjZQj9/CRwVi+uc/jHmVNxtlDuclf7s="; - - installPhase = '' - mkdir -p $out - cp -r dist/* $out - ''; - }; - - sourceRoot = "${src.name}/src-tauri"; - - cargoHash = "sha256-pMvh2Rr+rMe0nMB9yRDrGatrS36+VM7os0eeBR31oCM="; - - postPatch = '' - substituteInPlace tauri.conf.json \ - --replace "../dist" "${npmDist}" - ''; - - # postflop-solver requires unstable rust features - env.RUSTC_BOOTSTRAP = 1; - - nativeBuildInputs = [ - copyDesktopItems - pkg-config - ]; - - buildInputs = [ - gtk3 - libsoup_2_4 - # webkitgtk_4_0 - ]; - - postInstall = '' - install -Dm644 ${src}/public/favicon.png $out/share/icons/hicolor/128x128/apps/desktop-postflop.png - ''; - - desktopItems = [ - (makeDesktopItem { - name = "desktop-postflop"; - exec = "desktop-postflop"; - icon = "desktop-postflop"; - desktopName = "Desktop Postflop"; - comment = meta.description; - categories = [ "Utility" ]; - terminal = false; - }) - ]; - - meta = { - # webkitgtk_4_0 was removed - broken = true; - changelog = "https://github.com/b-inary/desktop-postflop/releases/tag/${src.rev}"; - description = "Free, open-source GTO solver for Texas hold'em poker"; - homepage = "https://github.com/b-inary/desktop-postflop"; - license = lib.licenses.agpl3Plus; - mainProgram = "desktop-postflop"; - maintainers = with lib.maintainers; [ tomasajt ]; - }; -} diff --git a/pkgs/by-name/de/desmume/package.nix b/pkgs/by-name/de/desmume/package.nix index cc6b654542e4..11292e32d42f 100644 --- a/pkgs/by-name/de/desmume/package.nix +++ b/pkgs/by-name/de/desmume/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.9.13"; src = fetchFromGitHub { - owner = "TASVideos"; + owner = "TASEmulators"; repo = "desmume"; rev = "release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; hash = "sha256-vmjKXa/iXLTwtqnG+ZUvOnOQPZROeMpfM5J3Jh/Ynfo="; @@ -87,7 +87,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://www.github.com/TASVideos/desmume/"; + homepage = "https://www.github.com/TASEmulators/desmume/"; description = "Open-source Nintendo DS emulator"; longDescription = '' DeSmuME is a freeware emulator for the NDS roms & Nintendo DS Lite games diff --git a/pkgs/by-name/de/desync/package.nix b/pkgs/by-name/de/desync/package.nix index 157861086c96..9d3f3dfaec1f 100644 --- a/pkgs/by-name/de/desync/package.nix +++ b/pkgs/by-name/de/desync/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "desync"; - version = "1.0.0"; + version = "1.0.3"; src = fetchFromGitHub { owner = "folbricht"; repo = "desync"; tag = "v${finalAttrs.version}"; - hash = "sha256-aRxWq9gGfglfBixS7xOoj8r29rJRAfGj4ydcSFf/7P0="; + hash = "sha256-rdwUoTwN/fG4fsOY4mCcg0bzWMErFaxBe72RtmHohdA="; }; - vendorHash = "sha256-ywID0txn7L6+QkYNvGvO5DTsDQBZLU+pGwNd3q7kLKI="; + vendorHash = "sha256-unwaA+WNyaJbNrOFvjXeMI2YbNTpGBrjwBGXhvOfj0M="; nativeBuildInputs = [ installShellFiles ]; @@ -62,6 +62,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/folbricht/desync"; changelog = "https://github.com/folbricht/desync/releases/tag/v${finalAttrs.version}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ chaduffy ]; + maintainers = with lib.maintainers; [ matshch ]; }; }) diff --git a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch b/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch deleted file mode 100644 index 02ca8649949e..000000000000 --- a/pkgs/by-name/de/detect-it-easy/0001-remove-hard-coded-paths-in-xoptions.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/XOptions/xoptions.cpp b/XOptions/xoptions.cpp -index 8c887c3..36cdbc3 100755 ---- a/XOptions/xoptions.cpp -+++ b/XOptions/xoptions.cpp -@@ -1754,14 +1754,7 @@ bool XOptions::checkNative(const QString &sIniFileName) - #if defined(Q_OS_MAC) - bResult = true; - #elif defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD) -- QString sApplicationDirPath = qApp->applicationDirPath(); -- -- if ((sApplicationDirPath == "/bin") || (sApplicationDirPath == "/usr/bin") || (sApplicationDirPath == "/usr/local/bin") || (sApplicationDirPath == "/app/bin") || -- (sApplicationDirPath.contains("/usr/local/bin$")) || isAppImage()) { -- bResult = true; -- } else { -- bResult = false; -- } -+ bResult = true; - #elif defined(Q_OS_WIN) - QString sApplicationDirPath = qApp->applicationDirPath(); - -@@ -1788,22 +1781,7 @@ QString XOptions::getApplicationDataPath() - #ifdef Q_OS_MAC - sResult = sApplicationDirPath + "/../Resources"; - #elif defined(Q_OS_LINUX) -- if (isNative()) { -- if (sApplicationDirPath.contains("/usr/local/bin$")) { -- QString sPrefix = sApplicationDirPath.section("/usr/local/bin", 0, 0); -- -- sResult += sPrefix + QString("/usr/local/lib/%1").arg(qApp->applicationName()); -- } else { -- if (sApplicationDirPath.contains("/tmp/.mount_")) // AppImage -- { -- sResult = sApplicationDirPath.section("/", 0, 2); -- } -- -- sResult += QString("/usr/lib/%1").arg(qApp->applicationName()); -- } -- } else { -- sResult = sApplicationDirPath; -- } -+ sResult = sApplicationDirPath + "/../lib/die"; - #elif defined(Q_OS_FREEBSD) - sResult = QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation).at(1) + QDir::separator() + qApp->applicationName(); - #else diff --git a/pkgs/by-name/de/detect-it-easy/package.nix b/pkgs/by-name/de/detect-it-easy/package.nix index 000e587214f6..a6a1060eb8ff 100644 --- a/pkgs/by-name/de/detect-it-easy/package.nix +++ b/pkgs/by-name/de/detect-it-easy/package.nix @@ -13,17 +13,31 @@ stdenv.mkDerivation (finalAttrs: { pname = "detect-it-easy"; - version = "3.10"; + version = "3.21"; src = fetchFromGitHub { owner = "horsicq"; repo = "DIE-engine"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-yHgxYig5myY2nExweUk2muKbJTKN3SiwOLgQcMIY/BQ="; + hash = "sha256-gst0suw5mNR3A0s/jIfte41cOOxKR0IsTFkO7ydwKMs="; }; - patches = [ ./0001-remove-hard-coded-paths-in-xoptions.patch ]; + postPatch = '' + # Convert CRLF to LF so substituteInPlace works + tr -d '\r' < XOptions/xoptions.cpp > XOptions/xoptions.cpp.tmp + mv XOptions/xoptions.cpp.tmp XOptions/xoptions.cpp + + substituteInPlace XOptions/xoptions.cpp \ + --replace-fail 'QString XOptions::getApplicationDataPath() + { + QString sResult;' 'QString XOptions::getApplicationDataPath() + { + #if defined(Q_OS_LINUX) + return qApp->applicationDirPath() + "/../lib/die"; + #endif + QString sResult;' + ''; buildInputs = [ libsForQt5.qtbase diff --git a/pkgs/by-name/de/deterministic-uname/package.nix b/pkgs/by-name/de/deterministic-uname/package.nix index 771803f6b9b5..7f2047400999 100644 --- a/pkgs/by-name/de/deterministic-uname/package.nix +++ b/pkgs/by-name/de/deterministic-uname/package.nix @@ -46,6 +46,9 @@ replaceVarsWith { modDirVersion = if modDirVersion != "" then modDirVersion else "unknown"; }; + # coreutils uname is in initialPath, so ordinarily appears in PATH before packages in nativeBuildInputs. + setupHook = ./setup-hook.sh; + meta = { description = "Print certain system information (hardcoded with lib/system values)"; mainProgram = "uname"; @@ -58,7 +61,7 @@ replaceVarsWith { not intercept these calls, builds made on different kernels will produce different results. ''; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ artturin ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/de/deterministic-uname/setup-hook.sh b/pkgs/by-name/de/deterministic-uname/setup-hook.sh new file mode 100644 index 000000000000..c66623749a73 --- /dev/null +++ b/pkgs/by-name/de/deterministic-uname/setup-hook.sh @@ -0,0 +1,8 @@ +# PATH is overwritten after package setup hooks are run, +# so the variable change needs to be delayed until a phase. +# An entry in prePhases is the earliest possible, useful +# in case an unpack or patch hook attempts to run uname. +unamePreHook() { + export PATH="@out@/bin:$PATH" +} +appendToVar prePhases unamePreHook diff --git a/pkgs/by-name/de/dethrace/package.nix b/pkgs/by-name/de/dethrace/package.nix index 35620afd9a81..46cb6facf837 100644 --- a/pkgs/by-name/de/dethrace/package.nix +++ b/pkgs/by-name/de/dethrace/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dethrace"; - version = "0.9.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "dethrace-labs"; repo = "dethrace"; tag = "v${finalAttrs.version}"; - hash = "sha256-+C3NyRLmvXrkZuhLGwIIHFWjXLMpt3srLZCVrxRUlkA="; + hash = "sha256-SGQGErlmsJEhjdvZa2YPJWwNFuZR4RL81W7meilw8t0="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/de/devbox/package.nix b/pkgs/by-name/de/devbox/package.nix index 8be4b05a37eb..4f8e41da3ba5 100644 --- a/pkgs/by-name/de/devbox/package.nix +++ b/pkgs/by-name/de/devbox/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "devbox"; - version = "0.17.2"; + version = "0.17.5"; src = fetchFromGitHub { owner = "jetify-com"; repo = "devbox"; tag = finalAttrs.version; - hash = "sha256-4K7Y0GxMhnhlQP30NGAAqJSgEo6aTNCsUoOfaa+aYkE="; + hash = "sha256-m7FMUjKZZsmnjtnjPyyq0YUIjDQiyb5zBbpGiH4cdyw="; }; ldflags = [ diff --git a/pkgs/by-name/de/devin-cli/package.nix b/pkgs/by-name/de/devin-cli/package.nix index 9236e45f08cd..9b125290d17c 100644 --- a/pkgs/by-name/de/devin-cli/package.nix +++ b/pkgs/by-name/de/devin-cli/package.nix @@ -7,29 +7,24 @@ }: let - version = "2026.5.26-6"; + version = "3000.2.17"; throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; srcs = { x86_64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-unknown-linux.tar.gz"; - hash = "sha256-8jEq0X2owEnOdSWzEhDOYahAdq/3G/JIUZShHbYrR2c="; + hash = "sha256-8OHpNjr8buaMTvh7q0rrf/XMCKX6g4NQ7zzu/bsqK+I="; }; aarch64-linux = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-unknown-linux.tar.gz"; - hash = "sha256-i8m05WrmO/KQCt/4jVFkRxz9nIXZEDi8idVhXkXxDig="; + hash = "sha256-EW3HHvCFqSK8P/DqA3fUsmxSmkMdWCRuNlcpE+LSViQ="; }; aarch64-darwin = fetchurl { url = "https://static.devin.ai/cli/${version}/devin-${version}-aarch64-apple-darwin.tar.gz"; - hash = "sha256-WPL1kPMSmqh9/n2m9CvNnUcyLfjHz3PC9tAjGrjaZfw="; - }; - - x86_64-darwin = fetchurl { - url = "https://static.devin.ai/cli/${version}/devin-${version}-x86_64-apple-darwin.tar.gz"; - hash = "sha256-HtB5iCT3d3AprPM+1uNkPkX0v4wSerTJlEu5F4P6pp0="; + hash = "sha256-YOLt0yH1zV4c/fPW1eEgZPJTJsqONqitcfQ9AAdF3/g="; }; }; in diff --git a/pkgs/by-name/de/devin-cli/update.sh b/pkgs/by-name/de/devin-cli/update.sh index 58a20b17911b..33955c67802e 100755 --- a/pkgs/by-name/de/devin-cli/update.sh +++ b/pkgs/by-name/de/devin-cli/update.sh @@ -3,8 +3,8 @@ set -euo pipefail -currentVersion=$(nix-instantiate --eval -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)" | tr -d '"') -latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq '.version' | tr -d '"') +currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.version or (lib.getVersion devin-cli)") +latestVersion=$(curl https://static.devin.ai/cli/current/manifest.json | jq -r '.version') if [[ "$currentVersion" == "$latestVersion" ]]; then echo "package is up-to-date: $currentVersion" @@ -16,8 +16,8 @@ update-source-version devin-cli $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do - hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; devin-cli.src.url" --system "$system" | tr -d '"'))) + hash=$(nix store prefetch-file --json --hash-type sha256 \ + $(nix-instantiate --eval --raw -E "with import ./. {}; devin-cli.src.url" --system "$system") | jq -r '.hash') update-source-version devin-cli $latestVersion $hash --system=$system --ignore-same-version done diff --git a/pkgs/by-name/de/devin-desktop/info.json b/pkgs/by-name/de/devin-desktop/info.json new file mode 100644 index 000000000000..592f3a25bdb2 --- /dev/null +++ b/pkgs/by-name/de/devin-desktop/info.json @@ -0,0 +1,14 @@ +{ + "aarch64-darwin": { + "version": "3.4.27", + "vscodeVersion": "1.110.1", + "url": "https://windsurf-stable.codeiumdata.com/darwin-arm64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-darwin-arm64-3.4.27.zip", + "sha256": "c42b0671c246ef295807e822809cb82dfe65831d4879d68f25334f754babec8d" + }, + "x86_64-linux": { + "version": "3.4.27", + "vscodeVersion": "1.110.1", + "url": "https://windsurf-stable.codeiumdata.com/linux-x64/stable/0d4bf12ed4a7597cb8ae9016fe8474468aad98a2/Devin-linux-x64-3.4.27.tar.gz", + "sha256": "80850124b31331f63c24a201d1317bdacdfb438fb2bcc9b31c9b7a6391391619" + } +} diff --git a/pkgs/by-name/wi/windsurf/package.nix b/pkgs/by-name/de/devin-desktop/package.nix similarity index 73% rename from pkgs/by-name/wi/windsurf/package.nix rename to pkgs/by-name/de/devin-desktop/package.nix index 6f5e6c97c769..d33b5d803dbf 100644 --- a/pkgs/by-name/wi/windsurf/package.nix +++ b/pkgs/by-name/de/devin-desktop/package.nix @@ -16,15 +16,16 @@ buildVscode { inherit commandLineArgs useVSCodeRipgrep; inherit (info) version vscodeVersion; - pname = "windsurf"; - executableName = "windsurf"; - longName = "Windsurf"; - shortName = "windsurf"; - libraryName = "windsurf"; - iconName = "windsurf"; + pname = "devin-desktop"; - sourceRoot = if stdenv.hostPlatform.isDarwin then "Windsurf.app" else "Windsurf"; + executableName = "devin-desktop"; + longName = "devin-desktop"; + shortName = "devin-desktop"; + libraryName = "devin-desktop"; + iconName = "devin-desktop"; + + sourceRoot = if stdenv.hostPlatform.isDarwin then "Devin.app" else "Devin"; src = fetchurl { inherit (info) url sha256; }; @@ -41,9 +42,9 @@ buildVscode { description = "Agentic IDE powered by AI Flow paradigm"; longDescription = '' The first agentic IDE, and then some. - The Windsurf Editor is where the work of developers and AI truly flow together, allowing for a coding experience that feels like literal magic. + Devin Desktop is where the work of developers and AI truly flow together, allowing for a coding experience that feels like literal magic. ''; - homepage = "https://codeium.com/windsurf"; + homepage = "https://devin.ai/desktop"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ sarahec @@ -51,7 +52,6 @@ buildVscode { ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/wi/windsurf/update/.gitignore b/pkgs/by-name/de/devin-desktop/update/.gitignore similarity index 100% rename from pkgs/by-name/wi/windsurf/update/.gitignore rename to pkgs/by-name/de/devin-desktop/update/.gitignore diff --git a/pkgs/by-name/wi/windsurf/update/package.json b/pkgs/by-name/de/devin-desktop/update/package.json similarity index 100% rename from pkgs/by-name/wi/windsurf/update/package.json rename to pkgs/by-name/de/devin-desktop/update/package.json diff --git a/pkgs/by-name/wi/windsurf/update/tsconfig.json b/pkgs/by-name/de/devin-desktop/update/tsconfig.json similarity index 100% rename from pkgs/by-name/wi/windsurf/update/tsconfig.json rename to pkgs/by-name/de/devin-desktop/update/tsconfig.json diff --git a/pkgs/by-name/wi/windsurf/update/update.mts b/pkgs/by-name/de/devin-desktop/update/update.mts similarity index 84% rename from pkgs/by-name/wi/windsurf/update/update.mts rename to pkgs/by-name/de/devin-desktop/update/update.mts index 64fad0bbd59f..f10048bfdbd4 100755 --- a/pkgs/by-name/wi/windsurf/update/update.mts +++ b/pkgs/by-name/de/devin-desktop/update/update.mts @@ -17,7 +17,7 @@ interface LatestInfo { readonly productVersion: string; } -const platforms = ["aarch64-darwin", "x86_64-darwin", "x86_64-linux"] as const; +const platforms = ["aarch64-darwin", "x86_64-linux"] as const; type Platform = (typeof platforms)[number]; type InfoMap = Record< Platform, @@ -29,7 +29,7 @@ type InfoMap = Record< } >; -async function getInfo(targetSystem: "darwin-arm64" | "darwin-x64" | "linux-x64") { +async function getInfo(targetSystem: "darwin-arm64" | "linux-x64") { const url = `https://windsurf-stable.codeium.com/api/update/${targetSystem}/stable/latest` as const; @@ -57,7 +57,6 @@ async function main() { const info: InfoMap = { "aarch64-darwin": await getInfo("darwin-arm64"), - "x86_64-darwin": await getInfo("darwin-x64"), "x86_64-linux": await getInfo("linux-x64"), }; if (JSON.stringify(oldInfo) === JSON.stringify(info)) { @@ -66,7 +65,7 @@ async function main() { } for (const platform of platforms) { console.log( - `[update] Updating Windsurf ${platform} ${oldInfo[platform].version} -> ${info[platform].version}`, + `[update] Updating Devin Desktop ${platform} ${oldInfo[platform].version} -> ${info[platform].version}`, ); } await fsPromises.writeFile( @@ -74,7 +73,7 @@ async function main() { JSON.stringify(info, null, 2) + "\n", "utf-8", ); - console.log("[update] Updating Windsurf complete"); + console.log("[update] Updating Devin Desktop complete"); } if (process.argv[1] === __filename) { diff --git a/pkgs/by-name/de/dezoomify-rs/package.nix b/pkgs/by-name/de/dezoomify-rs/package.nix index 101220e3344d..5b69579ed744 100644 --- a/pkgs/by-name/de/dezoomify-rs/package.nix +++ b/pkgs/by-name/de/dezoomify-rs/package.nix @@ -6,17 +6,20 @@ nix-update-script, pkg-config, openssl, + cacert, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dezoomify-rs"; - version = "2.15.0"; + version = "2.17.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "lovasoa"; repo = "dezoomify-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-gx/h9i+VPU0AtpQEkN/zCLmeyaW5wSUCfdY52hPwm3Q="; + hash = "sha256-iRcRMzUW3K0pzRP9Y7ID29Kxpi3dPxRCC4WY+2ydAyE="; }; nativeBuildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ @@ -27,9 +30,13 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ]; + nativeCheckInputs = [ + cacert + ]; + passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-Jh1a5DW25a4wzuZbOAoTn/crp/ioLsmq3jDiqIctCCM="; + cargoHash = "sha256-Tou+t4rbN/KfUAr9AVWD/aAzz+u50v9UZwo5mGXmjy4="; # hyper uses SystemConfiguration.framework to read system proxy settings. # Allow access to the Mach service to prevent the tests from failing. @@ -39,9 +46,13 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Zoomable image downloader for Google Arts & Culture, Zoomify, IIIF, and others"; + changelog = "https://github.com/lovasoa/dezoomify-rs/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/lovasoa/dezoomify-rs/"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ fsagbuya ]; + maintainers = with lib.maintainers; [ + fsagbuya + kybe236 + ]; mainProgram = "dezoomify-rs"; }; }) diff --git a/pkgs/by-name/df/dftd4/fortran-module-dir.patch b/pkgs/by-name/df/dftd4/build-paths.patch similarity index 73% rename from pkgs/by-name/df/dftd4/fortran-module-dir.patch rename to pkgs/by-name/df/dftd4/build-paths.patch index 88d33a8d0499..4f29ecbd1ec5 100644 --- a/pkgs/by-name/df/dftd4/fortran-module-dir.patch +++ b/pkgs/by-name/df/dftd4/build-paths.patch @@ -1,5 +1,5 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt -index f222aab..262b505 100644 +index 3db5442..64fa14a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -89,7 +89,6 @@ target_include_directories( @@ -20,29 +20,38 @@ index f222aab..262b505 100644 if(WITH_API) enable_language("C") diff --git a/config/template.cmake b/config/template.cmake -index 8b5141d..8f94d66 100644 +index 8b5141d..76654d1 100644 --- a/config/template.cmake +++ b/config/template.cmake -@@ -6,7 +6,6 @@ set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@) +@@ -5,8 +5,7 @@ set("@PROJECT_NAME@_WITH_API_V2" @WITH_API_V2@) + set("@PROJECT_NAME@_WITH_OpenMP" @WITH_OpenMP@) set( "@PROJECT_NAME@_INCLUDE_DIRS" - "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" +- "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@" - "@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@/@module-dir@" ++ "@CMAKE_INSTALL_FULL_INCLUDEDIR@" ) list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") diff --git a/config/template.pc b/config/template.pc -index 3d6efbb..fea69e4 100644 +index 3d6efbb..55b899f 100644 --- a/config/template.pc +++ b/config/template.pc -@@ -6,4 +6,4 @@ Name: @PROJECT_NAME@ +@@ -1,9 +1,9 @@ + prefix=@CMAKE_INSTALL_PREFIX@ +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@CMAKE_INSTALL_FULL_LIBDIR@ ++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ + + Name: @PROJECT_NAME@ Description: @PROJECT_DESCRIPTION@ Version: @PROJECT_VERSION@ Libs: -L${libdir} -l@PROJECT_NAME@ -Cflags: -I${includedir} -I${includedir}/@module-dir@ +Cflags: -I${includedir} -I${includedir}/ diff --git a/meson.build b/meson.build -index c9e9c58..ac8f0bd 100644 +index 7de7d61..81b8a7d 100644 --- a/meson.build +++ b/meson.build @@ -83,7 +83,7 @@ if install diff --git a/pkgs/by-name/df/dftd4/cmake.patch b/pkgs/by-name/df/dftd4/cmake.patch deleted file mode 100644 index 00c7e907733b..000000000000 --- a/pkgs/by-name/df/dftd4/cmake.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/config/template.pc b/config/template.pc -index 3d6efbb..e338a42 100644 ---- a/config/template.pc -+++ b/config/template.pc -@@ -1,6 +1,6 @@ - prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: @PROJECT_NAME@ - Description: @PROJECT_DESCRIPTION@ diff --git a/pkgs/by-name/df/dftd4/package.nix b/pkgs/by-name/df/dftd4/package.nix index 47bdd3495224..b4bc8271cf33 100644 --- a/pkgs/by-name/df/dftd4/package.nix +++ b/pkgs/by-name/df/dftd4/package.nix @@ -26,21 +26,20 @@ assert ( stdenv.mkDerivation (finalAttrs: { pname = "dftd4"; - version = "3.7.0"; + version = "4.2.0"; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "dftd4"; repo = "dftd4"; - rev = "v${finalAttrs.version}"; - hash = "sha256-dixPCLH5dWkE2/7ghGEXJmX2/g1DN30dB4jX2d7fmio="; + tag = "v${finalAttrs.version}"; + hash = "sha256-uKjNOIza3/I0oREp88oFESoNqEdumo1AztIjcrVb1O8="; }; patches = [ - # Make sure fortran headers are installed directly in /include - ./fortran-module-dir.patch - - # Fix wrong generation of package config include paths - ./cmake.patch + # Fix pkg-config, meson and cmake paths for include and lib dirs + ./build-paths.patch ]; nativeBuildInputs = [ @@ -82,12 +81,9 @@ stdenv.mkDerivation (finalAttrs: { app/tester.py ''; - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - meta = { description = "Generally Applicable Atomic-Charge Dependent London Dispersion Correction"; + changelog = "https://github.com/dftd4/dftd4/releases/tag/${finalAttrs.src.tag}"; mainProgram = "dftd4"; license = with lib.licenses; [ lgpl3Plus diff --git a/pkgs/by-name/dg/dgop/package.nix b/pkgs/by-name/dg/dgop/package.nix index 33885162ae67..e1309e85cbba 100644 --- a/pkgs/by-name/dg/dgop/package.nix +++ b/pkgs/by-name/dg/dgop/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dgop"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "dgop"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYEFJvJApcgVgFu6QpSoNk2t0hv7AlmBARc5HPe/n+s="; + hash = "sha256-wH1A4bg7OSD/vb5r0naaT+5x5oy6wwTRh12a60sXPxU="; }; - vendorHash = "sha256-OxcSnBIDwbPbsXRHDML/Yaxcc5caoKMIDVHLFXaoSsc="; + vendorHash = "sha256-M46W8rnexs0GR5hahAqCiAX+bsQEmdwTIccUox+oJas="; ldflags = [ "-w" diff --git a/pkgs/by-name/dg/dgraph/package.nix b/pkgs/by-name/dg/dgraph/package.nix index 8ffdd70f628e..b2f4a1100b9c 100644 --- a/pkgs/by-name/dg/dgraph/package.nix +++ b/pkgs/by-name/dg/dgraph/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dgraph"; - version = "25.3.4"; + version = "25.3.8"; src = fetchFromGitHub { owner = "dgraph-io"; repo = "dgraph"; tag = "v${finalAttrs.version}"; - hash = "sha256-rN/lFPJV5QaZJMf1pYILWzKIyVBgye/IDciM/f3/QeA="; + hash = "sha256-RrOlJVkekZ3xWGtjc013YyCycJmlPowVzqrttnZD8BI="; }; - vendorHash = "sha256-EMRECoUs94v+oyKlRHexB+oE1WoxmjubAH12kbr6Nu4="; + vendorHash = "sha256-gD91KGWLqd6a7YkqQSeW1eS2MQI+1/RbI5X1/Xwrz90="; doCheck = false; diff --git a/pkgs/by-name/di/di-tui/package.nix b/pkgs/by-name/di/di-tui/package.nix index 52fb0c2c5c73..bb535015ed2b 100644 --- a/pkgs/by-name/di/di-tui/package.nix +++ b/pkgs/by-name/di/di-tui/package.nix @@ -2,17 +2,18 @@ lib, nix-update-script, buildGoModule, - fetchFromGitHub, + fetchFromGitea, }: buildGoModule (finalAttrs: { pname = "di-tui"; - version = "1.14.0"; + version = "1.15.0"; - src = fetchFromGitHub { - owner = "acaloiaro"; + src = fetchFromGitea { + domain = "code.adriano.fyi"; + owner = "me"; repo = "di-tui"; rev = "v${finalAttrs.version}"; - hash = "sha256-P784Tf3XA/28PgKTr89yizKAX1MhAb4877gV7vVHBYE="; + hash = "sha256-3dYcecrDSfd5sP5PjkagbFt2RmhaQSVw6kMt9J7wyeM="; }; vendorHash = "sha256-b7dG0nSjPQpjWUbOlIxWudPZWKqtq96sQaJxKvsQT9I="; @@ -21,7 +22,7 @@ buildGoModule (finalAttrs: { meta = { description = "Simple terminal UI player for di.fm"; - homepage = "https://github.com/acaloiaro/di-tui"; + homepage = "https://code.adriano.fyi/me/di-tui"; license = lib.licenses.bsd2; maintainers = [ lib.maintainers.acaloiaro ]; mainProgram = "di-tui"; diff --git a/pkgs/by-name/di/dia/package.nix b/pkgs/by-name/di/dia/package.nix index 0f56413de916..c71a40831715 100644 --- a/pkgs/by-name/di/dia/package.nix +++ b/pkgs/by-name/di/dia/package.nix @@ -98,6 +98,12 @@ stdenv.mkDerivation { gtk-mac-integration-gtk3 ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/org.gnome.Dia.thumbnailer \ + --replace-fail "TryExec=dia" "TryExec=$out/bin/dia" \ + --replace-fail "Exec=dia" "Exec=$out/bin/dia" + ''; + meta = { description = "Gnome Diagram drawing software"; mainProgram = "dia"; diff --git a/pkgs/by-name/di/dict-cc-py/package.nix b/pkgs/by-name/di/dict-cc-py/package.nix index 77f97174f87d..ab871a5c5310 100644 --- a/pkgs/by-name/di/dict-cc-py/package.nix +++ b/pkgs/by-name/di/dict-cc-py/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonPackage { description = "Unofficial command line client for dict.cc"; mainProgram = "dict.cc.py"; homepage = "https://github.com/rbaron/dict.cc.py"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; }; } diff --git a/pkgs/build-support/setup-hooks/die.sh b/pkgs/by-name/di/dieHook/die.sh similarity index 100% rename from pkgs/build-support/setup-hooks/die.sh rename to pkgs/by-name/di/dieHook/die.sh diff --git a/pkgs/by-name/di/dieHook/package.nix b/pkgs/by-name/di/dieHook/package.nix new file mode 100644 index 000000000000..e5bb76370426 --- /dev/null +++ b/pkgs/by-name/di/dieHook/package.nix @@ -0,0 +1,9 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "die-hook"; + meta.license = lib.licenses.mit; +} ./die.sh diff --git a/pkgs/by-name/di/diesel-cli/package.nix b/pkgs/by-name/di/diesel-cli/package.nix index fd6db582ecc7..b70a321014f0 100644 --- a/pkgs/by-name/di/diesel-cli/package.nix +++ b/pkgs/by-name/di/diesel-cli/package.nix @@ -27,15 +27,15 @@ assert lib.assertMsg (lib.elem true [ rustPlatform.buildRustPackage rec { pname = "diesel-cli"; - version = "2.3.9"; + version = "2.3.11"; src = fetchCrate { inherit version; crateName = "diesel_cli"; - hash = "sha256-aFve5n38EO7cqfYcb0AIEbOfY+Xs3oXlUIkNJdBxXr4="; + hash = "sha256-zxlV3AbG5cBBGUk3hx9U3OR26lB3G2QQlcxTg00WJZQ="; }; - cargoHash = "sha256-TAkZLwVaMvopkbh9kPvIhEHckQom+k8rkVNut7a31do="; + cargoHash = "sha256-GytJ0Eq4LkdSq1fosXFoC0nI7bY0VdM8oOV/tvyUSMg="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/di/diff-so-fancy/package.nix b/pkgs/by-name/di/diff-so-fancy/package.nix index 9dce1d9e2438..1d10152ecdc3 100644 --- a/pkgs/by-name/di/diff-so-fancy/package.nix +++ b/pkgs/by-name/di/diff-so-fancy/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "diff-so-fancy"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitHub { owner = "so-fancy"; repo = "diff-so-fancy"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mEVRwkfVK/qmOeU37hSxmO2t0z0TY4MWOjkt6hICQQ4="; + sha256 = "sha256-5laSG8UWsCXAK+Woiz1Opy3VViboCI7J2AsqoDiuq7k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diffedit3/package.nix b/pkgs/by-name/di/diffedit3/package.nix index b82cd45dc91a..95eba3db3711 100644 --- a/pkgs/by-name/di/diffedit3/package.nix +++ b/pkgs/by-name/di/diffedit3/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/ilyagr/diffedit3"; description = "3-pane diff editor"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "diffedit3"; maintainers = with lib.maintainers; [ thoughtpolice ]; }; diff --git a/pkgs/by-name/di/diffnav/package.nix b/pkgs/by-name/di/diffnav/package.nix index 52b00de0b4cd..f0150cd5122c 100644 --- a/pkgs/by-name/di/diffnav/package.nix +++ b/pkgs/by-name/di/diffnav/package.nix @@ -10,20 +10,21 @@ buildGoModule (finalAttrs: { pname = "diffnav"; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "diffnav"; tag = "v${finalAttrs.version}"; - hash = "sha256-6VtAQzZNLQrf8QYVXxLUgb3F6xguFDbwaE9kahPhbSE="; + hash = "sha256-DrEbo9YYg4FCXQXuIkbPxO5Z3ZOPZJYeGoLoP/vT0Y0="; }; - vendorHash = "sha256-gmmckzR0D1oFuTG5TAb6gLMoNbcZl9EsjbFjhPfJqnQ="; + vendorHash = "sha256-2OzHyBPsylQVXhPlqk2owEhiibFi3H1UENvGGDdzGss="; ldflags = [ "-s" "-w" + "-X github.com/dlvhdr/diffnav/pkg/version.Version=${finalAttrs.version}" ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/diffoscope/package.nix b/pkgs/by-name/di/diffoscope/package.nix index 20e30df4e5ea..985b1b1d51c8 100644 --- a/pkgs/by-name/di/diffoscope/package.nix +++ b/pkgs/by-name/di/diffoscope/package.nix @@ -7,6 +7,7 @@ apksigcopier, apksigner, apktool, + asar, binutils-unwrapped-all-targets, bzip2, cbfstool, @@ -23,10 +24,10 @@ enableBloat ? true, enjarify, fetchurl, + ffmpeg, file, findutils, fontforge-fonttools, - ffmpeg, fpc, gettext, ghc, @@ -54,6 +55,7 @@ oggvideotools, openssh, openssl, + p7zip, pdftk, perl, pgpdump, @@ -75,7 +77,6 @@ xz, zip, zstd, - binwalk, # updater only writeScript, }: @@ -84,8 +85,6 @@ let python = python3.override { self = python; packageOverrides = final: prev: { - # version 2 breaks dataset and thus androguard - sqlalchemy = prev.sqlalchemy_1_4; # version 4 or newer would log the following error but tests currently don't fail because radare2 is disabled # ValueError: argument TNULL is not a TLSH hex string tlsh = prev.tlsh.overridePythonAttrs ( @@ -99,6 +98,11 @@ let tag = version; hash = "sha256-ZYEjT/yShfA4+zpbGOtaFOx1nSSOWPtMvskPhHv3c9U="; }; + + postPatch = '' + substituteInPlace py_ext/setup.py \ + --replace-fail "0.2.0" "${version}" + ''; } ); }; @@ -108,12 +112,12 @@ in # Note: when upgrading this package, please run the list-missing-tools.sh script as described below! python.pkgs.buildPythonApplication rec { pname = "diffoscope"; - version = "318"; + version = "325"; pyproject = true; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - hash = "sha256-rvZxd0mFDzmMFg2QYihkfizYGwiK1QQB9flyYn1uESM="; + hash = "sha256-z8mdVWYo/UHfNIQy/XSDYSMAytIwXk/R3FRm4IsikIc="; }; outputs = [ @@ -121,7 +125,9 @@ python.pkgs.buildPythonApplication rec { "man" ]; - patches = [ ./ignore_links.patch ]; + patches = [ + ./ignore_links.patch + ]; postPatch = '' # When generating manpage, use the installed version @@ -140,23 +146,19 @@ python.pkgs.buildPythonApplication rec { build-system = with python.pkgs; [ setuptools ]; # Most of the non-Python dependencies here are optional command-line tools for various file-format parsers. - # To help figuring out what's missing from the list, run: ./pkgs/tools/misc/diffoscope/list-missing-tools.sh + # To help figuring out what's missing from the list, run: ./pkgs/by-name/di/diffoscope/list-missing-tools.sh # # Still missing these tools: # Android-specific tools: # dexdump - # Darwin-specific tools: + # Darwin-specific tools (llvm-lipo and llvm-otool don't suffice): # lipo # otool # Other tools: - # docx2txt <- makes tests broken: - # > FAILED tests/comparators/test_docx.py::test_diff - IndexError: list index out of range - # > FAILED tests/comparators/test_docx.py::test_compare_non_existing - AssertionError + # docx2txt (needs Debian's package called this, not the python package) # radare2 - # > FAILED tests/comparators/test_elf_decompiler.py::test_ghidra_diff - IndexError: list index out of range - # > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - AssertionError - # > FAILED tests/comparators/test_macho_decompiler.py::test_ghidra_diff - assert 0 == 1 - # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - AssertionError + # > FAILED tests/comparators/test_elf_decompiler.py::test_radare2_diff - KeyError: 'offset' + # > FAILED tests/comparators/test_macho_decompiler.py::test_radare2_diff - KeyError: 'offset' # # We filter automatically all packages for the host platform (some dependencies are not supported on Darwin, aarch64, etc.). # Packages which are marked broken for a platform are not automatically filtered to avoid accidentally removing them without noticing it. @@ -197,13 +199,13 @@ python.pkgs.buildPythonApplication rec { ] ++ (with python.pkgs; [ argcomplete - python-debian defusedxml jsbeautifier jsondiff libarchive-c - progressbar33 + progressbar pypdf + python-debian python-magic pyxattr rpm @@ -214,6 +216,7 @@ python.pkgs.buildPythonApplication rec { abootimg apksigcopier apksigner + asar cbfstool colord enjarify @@ -232,7 +235,9 @@ python.pkgs.buildPythonApplication rec { mono ocaml odt2txt + oggvideotools openssh + p7zip pdftk perl poppler-utils @@ -244,7 +249,6 @@ python.pkgs.buildPythonApplication rec { ubootTools wabt xmlbeans - binwalk ] ++ (with python.pkgs; [ androguard @@ -253,13 +257,10 @@ python.pkgs.buildPythonApplication rec { h5py pdfminer-six r2pipe - # docx2txt, nixpkgs packages another project named the same, which does not work ]) - # oggvideotools is broken on Darwin, please put it back when it will be fixed? - ++ lib.optionals stdenv.hostPlatform.isLinux [ oggvideotools ] # Causes an eval failure # See https://github.com/NixOS/nixpkgs/issues/463873 - ++ lib.optionals (!stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch64) [ + ++ lib.optionals (!stdenv.hostPlatform.isLinux || !stdenv.hostPlatform.isAarch64) [ aapt apktool ] @@ -273,6 +274,20 @@ python.pkgs.buildPythonApplication rec { "-vv" ]; + preCheck = lib.optionalString (enableBloat && stdenv.hostPlatform.isDarwin) '' + # h5dump is in hdf5's bin output, but its dylibs are in the out output. + export DYLD_LIBRARY_PATH="${lib.makeLibraryPath [ hdf5 ]}''${DYLD_LIBRARY_PATH:+:''${DYLD_LIBRARY_PATH}}" + ''; + + makeWrapperArgs = lib.optionals enableBloat ( + [ + "--prefix PATH : ${lib.makeBinPath [ hdf5 ]}" + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + "--prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath [ hdf5 ]}" + ] + ); + postInstall = '' make -C doc installManPage doc/diffoscope.1 @@ -344,7 +359,7 @@ python.pkgs.buildPythonApplication rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ danielfullmer - raitobezarius + mdaniels5757 ]; platforms = lib.platforms.unix; mainProgram = "diffoscope"; diff --git a/pkgs/by-name/di/diffr/package.nix b/pkgs/by-name/di/diffr/package.nix index 10ecfdd6f64a..8f67ff8645cd 100644 --- a/pkgs/by-name/di/diffr/package.nix +++ b/pkgs/by-name/di/diffr/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Yet another diff highlighting tool"; mainProgram = "diffr"; homepage = "https://github.com/mookid/diffr"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/di/diffsitter/package.nix b/pkgs/by-name/di/diffsitter/package.nix index 5397cd711ed1..30b802e3149f 100644 --- a/pkgs/by-name/di/diffsitter/package.nix +++ b/pkgs/by-name/di/diffsitter/package.nix @@ -4,32 +4,19 @@ linkFarm, makeWrapper, rustPlatform, - tree-sitter, + tree-sitter-grammars, gitUpdater, versionCheckHook, }: let # based on https://github.com/NixOS/nixpkgs/blob/aa07b78b9606daf1145a37f6299c6066939df075/pkgs/development/tools/parsing/tree-sitter/default.nix#L85-L104 - withPlugins = - grammarFn: - let - grammars = grammarFn tree-sitter.builtGrammars; - in - linkFarm "grammars" ( - map ( - drv: - let - name = lib.strings.getName drv; - in - { - name = "lib" + (lib.strings.removeSuffix "-grammar" name) + ".so"; - path = "${drv}/parser"; - } - ) grammars - ); + grammarToAttrSet = drv: { + name = "lib" + (lib.strings.removeSuffix "-grammar" (lib.strings.getName drv)) + ".so"; + path = "${drv}/parser"; + }; - libPath = withPlugins (_: tree-sitter.allGrammars); + libPath = linkFarm "grammars" (map grammarToAttrSet tree-sitter-grammars.allGrammars); in rustPlatform.buildRustPackage rec { pname = "diffsitter"; diff --git a/pkgs/tools/text/diffutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/di/diffutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch similarity index 100% rename from pkgs/tools/text/diffutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch rename to pkgs/by-name/di/diffutils/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch diff --git a/pkgs/tools/text/diffutils/musl-llvm.patch b/pkgs/by-name/di/diffutils/musl-llvm.patch similarity index 100% rename from pkgs/tools/text/diffutils/musl-llvm.patch rename to pkgs/by-name/di/diffutils/musl-llvm.patch diff --git a/pkgs/tools/text/diffutils/default.nix b/pkgs/by-name/di/diffutils/package.nix similarity index 100% rename from pkgs/tools/text/diffutils/default.nix rename to pkgs/by-name/di/diffutils/package.nix diff --git a/pkgs/by-name/di/diffyml/package.nix b/pkgs/by-name/di/diffyml/package.nix new file mode 100644 index 000000000000..c0b8fb86e053 --- /dev/null +++ b/pkgs/by-name/di/diffyml/package.nix @@ -0,0 +1,58 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "diffyml"; + version = "1.7.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "szhekpisov"; + repo = "diffyml"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DIKHvFY/eW3CAF/ojW+D737vFCcZk0peRrSb8I/an9Q="; + }; + + vendorHash = "sha256-QE/EwVzMqUO24ZAl0WBibGx6x0kNo1AUTZtfnQvX50k="; + + # bench/compare and doc/gen-cli-ref are internal dev tools, not user-facing. + excludedPackages = [ + "bench/compare" + "doc/gen-cli-ref" + ]; + + ldflags = [ + "-s" + "-w" + "-X main.version=${finalAttrs.version}" + "-X main.commit=v${finalAttrs.version}" + "-X main.buildDate=1970-01-01" + ]; + + # test/ holds e2e (kind/kubectl) and repo-health suites that need network + # and external tooling; unsuitable for the sandboxed build. + preCheck = '' + rm -rf test + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Structural YAML diff tool with Kubernetes awareness and CI-friendly output"; + homepage = "https://szhekpisov.github.io/diffyml/"; + downloadPage = "https://github.com/szhekpisov/diffyml"; + changelog = "https://github.com/szhekpisov/diffyml/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ szhekpisov ]; + mainProgram = "diffyml"; + }; +}) diff --git a/pkgs/by-name/di/digidrie/package.nix b/pkgs/by-name/di/digidrie/package.nix new file mode 100644 index 000000000000..0fad8cfe3d1e --- /dev/null +++ b/pkgs/by-name/di/digidrie/package.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + pkg-config, + libGL, + libx11, + libjack2, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "digidrie"; + version = "0.3.1"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "magnetophon"; + repo = "DigiDrie"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-bmytfZ6/V9eoEnj5xLq3Yzlhy0VGEK6utsfS9OCYWd0="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + libGL + libx11 + libjack2 + ]; + + sourceRoot = "${finalAttrs.src.name}/plugin/dpf"; + + postPatch = '' + patchShebangs generate-ttl.sh patch/apply.sh + ''; + + enableParallelBuilding = true; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = { + description = "Monophonic Faust synth with vector synthesis, CZ-style oscillators and macro morphing (DPF: JACK/LV2/VST2/VST3/CLAP)"; + homepage = "https://github.com/magnetophon/DigiDrie"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.magnetophon ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + mainProgram = "DigiDrie"; + }; +}) diff --git a/pkgs/by-name/di/digital/package.nix b/pkgs/by-name/di/digital/package.nix index 676cb42771f0..229ec189f7c4 100644 --- a/pkgs/by-name/di/digital/package.nix +++ b/pkgs/by-name/di/digital/package.nix @@ -52,7 +52,7 @@ maven.buildMavenPackage rec { }; inherit mvnParameters; - mvnHash = "sha256-wm/axWJucoW9P98dKqHI4bjrUnmBTfosCOdJg9VBJ+4="; + mvnHash = "sha256-qFJvpxK6PDmMfeL5fKVHUzK2NRLcQhQ3PJbwv2hYZqY="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/di/digitalbitbox/package.nix b/pkgs/by-name/di/digitalbitbox/package.nix index 737916a5f516..775e7c56adc6 100644 --- a/pkgs/by-name/di/digitalbitbox/package.nix +++ b/pkgs/by-name/di/digitalbitbox/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.0.0"; src = fetchFromGitHub { - owner = "digitalbitbox"; + owner = "BitBoxSwiss"; repo = "dbb-app"; tag = "v${finalAttrs.version}"; hash = "sha256-ig3+TdYv277D9GVnkRSX6nc6D6qruUOw/IQdQCK6FoA="; diff --git a/pkgs/by-name/di/dinit/package.nix b/pkgs/by-name/di/dinit/package.nix index afa123963737..4b18d93ce663 100644 --- a/pkgs/by-name/di/dinit/package.nix +++ b/pkgs/by-name/di/dinit/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "dinit"; - version = "0.22.0"; + version = "0.22.1"; src = fetchFromGitHub { owner = "davmac314"; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { postFetch = '' [ -f "$out/BUILD" ] && rm "$out/BUILD" ''; - hash = "sha256-Axa993X17NdsNb+HwfzVzGGVTPVmdolNRxh3GfrpmBY="; + hash = "sha256-LerUex/P8UYFWG0TK8LAFPlFBNIVIH2cZfBxe6AD7Sc="; }; postPatch = '' diff --git a/pkgs/applications/networking/instant-messengers/dino/default.nix b/pkgs/by-name/di/dino/package.nix similarity index 93% rename from pkgs/applications/networking/instant-messengers/dino/default.nix rename to pkgs/by-name/di/dino/package.nix index d343c7dedc2c..7188b8965453 100644 --- a/pkgs/applications/networking/instant-messengers/dino/default.nix +++ b/pkgs/by-name/di/dino/package.nix @@ -27,16 +27,20 @@ srtp, libnice, gnutls, - gstreamer, - gst-plugins-base, - gst-plugins-good, + gst_all_1, webrtc-audio-processing, }: # Upstream is very deliberate about which features are enabled per default or are automatically enabled. # Everything that is disabled per default has to been seen experimental and should not be enabled without strong reasoning. # see https://github.com/NixOS/nixpkgs/issues/469614#issuecomment-3649662176 - +let + inherit (gst_all_1) + gstreamer + gst-plugins-base + ; + gst-plugins-good = gst_all_1.gst-plugins-good.override { gtkSupport = true; }; +in stdenv.mkDerivation (finalAttrs: { pname = "dino"; version = "0.5.1"; diff --git a/pkgs/by-name/di/dioxus-cli/package.nix b/pkgs/by-name/di/dioxus-cli/package.nix index cdafe17af58f..ce34b458922b 100644 --- a/pkgs/by-name/di/dioxus-cli/package.nix +++ b/pkgs/by-name/di/dioxus-cli/package.nix @@ -9,7 +9,7 @@ installShellFiles, makeWrapper, esbuild, - wasm-bindgen-cli_0_2_118, + wasm-bindgen-cli_0_2_126, testers, dioxus-cli, withTelemetry ? false, @@ -81,7 +81,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --suffix PATH : ${ lib.makeBinPath [ esbuild - wasm-bindgen-cli_0_2_118 + wasm-bindgen-cli_0_2_126 ] } ''; diff --git a/pkgs/by-name/di/dirb/package.nix b/pkgs/by-name/di/dirb/package.nix index dbf59823052d..7b8eed782016 100644 --- a/pkgs/by-name/di/dirb/package.nix +++ b/pkgs/by-name/di/dirb/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Web content scanner"; homepage = "https://dirb.sourceforge.net/"; maintainers = with lib.maintainers; [ bennofs ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/di/direvent/package.nix b/pkgs/by-name/di/direvent/package.nix index 80c722a028df..f500c4d1e4fb 100644 --- a/pkgs/by-name/di/direvent/package.nix +++ b/pkgs/by-name/di/direvent/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "direvent"; - version = "5.4"; + version = "5.5"; src = fetchurl { url = "mirror://gnu/direvent/direvent-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-HbvGGSqrZ+NFclFIYD1XDGooKDgMlkIVdir5FSTXlbo="; + sha256 = "sha256-DhbAtLPm92c+m08x2BqwEjatIvg1OFEvOy9Y+flv3Lc="; }; meta = { diff --git a/pkgs/by-name/di/direwolf-unstable/package.nix b/pkgs/by-name/di/direwolf-unstable/package.nix index 13d4858ccc86..e4b74e0b8e17 100644 --- a/pkgs/by-name/di/direwolf-unstable/package.nix +++ b/pkgs/by-name/di/direwolf-unstable/package.nix @@ -12,13 +12,13 @@ inherit hamlibSupport gpsdSupport extraScripts; }).overrideAttrs (oldAttrs: { - version = "1.8.1-unstable-2026-05-27"; + version = "1.8.1-unstable-2026-07-16"; src = fetchFromGitHub { owner = "wb2osz"; repo = "direwolf"; - rev = "d6151874ecf202cbb401a671a90b15d0fab92fa9"; - hash = "sha256-t19AjQzjkpteqwfRVI/tM5wCVNeFceWPHjq0UtdevXg="; + rev = "078b2e8484be379d4e1eab139c6fd57c188c1754"; + hash = "sha256-Wje8GsdMcUptQEVsG7Ww8nW3PUuk/Y67zsjf+KjPPB8="; }; dontVersionCheck = true; diff --git a/pkgs/by-name/di/discord-gamesdk/package.nix b/pkgs/by-name/di/discord-gamesdk/package.nix index 8f9fff09dd6e..4163284b8099 100644 --- a/pkgs/by-name/di/discord-gamesdk/package.nix +++ b/pkgs/by-name/di/discord-gamesdk/package.nix @@ -47,7 +47,6 @@ stdenv.mkDerivation rec { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "x86_64-windows" ]; diff --git a/pkgs/by-name/di/discord-rpc/package.nix b/pkgs/by-name/di/discord-rpc/package.nix index 3948a05be270..66be4bb9cbe7 100644 --- a/pkgs/by-name/di/discord-rpc/package.nix +++ b/pkgs/by-name/di/discord-rpc/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.4.0"; src = fetchFromGitHub { - owner = "discordapp"; + owner = "discord"; repo = "discord-rpc"; rev = "v${finalAttrs.version}"; sha256 = "04cxhqdv5r92lrpnhxf8702a8iackdf3sfk1050z7pijbijiql2a"; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Official library to interface with the Discord client"; - homepage = "https://github.com/discordapp/discord-rpc"; + homepage = "https://github.com/discord/discord-rpc"; license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/di/discord-sh/package.nix b/pkgs/by-name/di/discord-sh/package.nix index 263bb33eb0d2..464f25e1b3f4 100644 --- a/pkgs/by-name/di/discord-sh/package.nix +++ b/pkgs/by-name/di/discord-sh/package.nix @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation rec { version = "2.0.1"; src = fetchFromGitHub { - owner = "ChaoticWeg"; + owner = "fieu"; repo = "discord.sh"; rev = "v${version}"; sha256 = "sha256-z57uMbH6PI68aTMAjA8UIPEefV8sQRR4cS0eK6Ypxuk="; @@ -61,7 +61,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Write-only command-line Discord webhook integration written in 100% Bash script"; mainProgram = "discord.sh"; - homepage = "https://github.com/ChaoticWeg/discord.sh"; + homepage = "https://github.com/fieu/discord.sh"; license = lib.licenses.gpl3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ matthewcroughan ]; diff --git a/pkgs/by-name/di/discordchatexporter-cli/deps.json b/pkgs/by-name/di/discordchatexporter-cli/deps.json index 8c54c871c728..736251ff7c3d 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/deps.json +++ b/pkgs/by-name/di/discordchatexporter-cli/deps.json @@ -1,92 +1,87 @@ [ { "pname": "AdvancedStringBuilder", - "version": "0.1.1", - "sha256": "1qc5b9vlh42yyw00kppkrdz0cji0cxslh97794km9nid8wcv3f54" + "version": "0.2.0", + "hash": "sha256-66bPgNGU/wLpGs9mydkBBlTEJRpvfHDwWEysUsufZJY=" }, { "pname": "AngleSharp", - "version": "1.1.2", - "sha256": "0rfild46lmqhxkfh6nhy7a9m8zzv25lj29riav5j6dmzw07l7wif" + "version": "1.4.0", + "hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0=" }, { "pname": "AsyncKeyedLock", - "version": "6.4.2", - "sha256": "1pghspgz9xis139b5v8h2y40gp14x6qfcam27zawq6cp278gnjhi" + "version": "8.0.2", + "hash": "sha256-0NKdC+oxdYxS3Uz1lak5RpdTWyKYT7C3hkCdm5T0D84=" }, { "pname": "CliFx", - "version": "2.3.5", - "sha256": "0rlbv93ssw0d8kvhnvrz2f06ka66gz4gbz1va2q135dab99cmrin" + "version": "3.0.0", + "hash": "sha256-RMHRAQ2SQB8G3GLzG5WGKNkWNJdLCwkedSoT0iKv9gk=" }, { "pname": "CSharpier.MsBuild", - "version": "0.28.2", - "sha256": "10c3v3pqv49y5wi0slswfzkwjh9q93diihpmkbfp3r7yjpv6871d" + "version": "1.2.6", + "hash": "sha256-jvY05AmHK0MO9cbSTwAvAXf4urL+6Df2ug4IKwcleDw=" }, { "pname": "Deorcify", - "version": "1.0.2", - "sha256": "0nwxyrl4rd5x621i2hs5fl3w7fxpm13lkdssxr9fd5042px2gqbm" + "version": "2.0.1", + "hash": "sha256-1Yl9KIEXNHHOUhmyYS65jx1AljPt7i4wvGGlxfm/XxA=" }, { "pname": "Gress", - "version": "2.1.1", - "sha256": "1svz1flhyl26h3xjch0acjjinympgf6bhj5vpb188njfih3ip4ck" + "version": "2.2.0", + "hash": "sha256-2vzffEFC2NHH5KGXssvlR4rH+e1DrsFMHN+zQcOgyGI=" }, { "pname": "JsonExtensions", "version": "1.2.0", - "sha256": "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy" + "hash": "sha256-vhuDDUSzDS5u9dfup0qk6j7Vc9i8Wyo7dBivpVaEpDw=" }, { "pname": "Polly", - "version": "8.4.0", - "sha256": "1zpq6590zpj3sibdhrn3fydqrm9ga43xdxvjv3rwzhigrkddg9zl" + "version": "8.6.6", + "hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps=" }, { "pname": "Polly.Core", - "version": "8.4.0", - "sha256": "1gp66r03zqvwwr4nw96n49bfv08bk54qpdbiqgxg93yhfsbsmkg8" + "version": "8.6.6", + "hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU=" + }, + { + "pname": "PowerKit", + "version": "2.0.1", + "hash": "sha256-mqXd34gelLM26cAlHCBWOkAhyVlzrRKr2NH2kiGf8qk=" }, { "pname": "RazorBlade", - "version": "0.6.0", - "sha256": "11k2j7d7ddb47sj4lkply8v4aqrfxl0b314cv0l4f5syi4ilfa6s" + "version": "1.0.0", + "hash": "sha256-ieuGwqM8HHtD+llYO3CdVB+fHHvQ6QnQiajttREFOXM=" }, { "pname": "Spectre.Console", - "version": "0.49.1", - "sha256": "0fhl96p3xjd5k1wwvhs80cp35rrlgnza6mw9vy0knhmf7ji9b95n" + "version": "0.55.2", + "hash": "sha256-PmvyqWWej8pT0X/J80Yr9ClMoO96zq7QlJme8AuQ6Tc=" + }, + { + "pname": "Spectre.Console.Ansi", + "version": "0.55.2", + "hash": "sha256-ha2TNW1IOgtkr1NUEs6sSlN6t+hwCEccUUiCGwEen9U=" }, { "pname": "Superpower", - "version": "3.0.0", - "sha256": "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4" - }, - { - "pname": "System.Text.Encoding.CodePages", - "version": "8.0.0", - "sha256": "1lgdd78cik4qyvp2fggaa0kzxasw6kc9a6cjqw46siagrm0qnc3y" - }, - { - "pname": "System.Text.Encodings.Web", - "version": "8.0.0", - "sha256": "1wbypkx0m8dgpsaqgyywz4z760xblnwalb241d5qv9kx8m128i11" - }, - { - "pname": "System.Text.Json", - "version": "8.0.3", - "sha256": "0jkl986gnh2a39v5wbab47qyh1g9a64dgh5s67vppcay8hd42c4n" + "version": "3.1.0", + "hash": "sha256-krsT4LFDHeCjwS0BbkgpBYggpr5Nmc1RXYyOjLqRifQ=" }, { "pname": "WebMarkupMin.Core", - "version": "2.16.0", - "sha256": "0cbkgrrkam76bhygrjzd4nj4mpzpgbnsddfzwry1933rcvjlqh6m" + "version": "2.21.0", + "hash": "sha256-k51tTFcdL9Bwsg3gA51ZswGxDtdBFb22BAj9wbyZu1E=" }, { "pname": "YoutubeExplode", - "version": "6.3.16", - "sha256": "1f6d47g1qmmahx6pn2sp0fff7hsmdqwm7z09j47hs6r1yn9a7kyj" + "version": "6.6.0", + "hash": "sha256-53mPbr8IVmJH2C3euhSz56Bl6fJt5yN0CU6vCmzUs4I=" } ] diff --git a/pkgs/by-name/di/discordchatexporter-cli/package.nix b/pkgs/by-name/di/discordchatexporter-cli/package.nix index a613ab27ced9..846d82ac1b47 100644 --- a/pkgs/by-name/di/discordchatexporter-cli/package.nix +++ b/pkgs/by-name/di/discordchatexporter-cli/package.nix @@ -3,25 +3,24 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, - testers, - discordchatexporter-cli, + versionCheckHook, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "discordchatexporter-cli"; - version = "2.43.3"; + version = "2.47.3"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; - rev = version; - hash = "sha256-r9bvTgqKQY605BoUlysSz4WJMxn2ibNh3EhoMYCfV3c="; + tag = finalAttrs.version; + hash = "sha256-B/2krGBYp/6qgINRyX/38tHlEy9JxmQMAIPsDNjZF5k="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_8_0; - dotnet-runtime = dotnetCorePackages.runtime_8_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; dotnetBuildFlags = [ # workaround for https://github.com/belav/csharpier/pull/1696 @@ -33,21 +32,18 @@ buildDotnetModule rec { ln -s $out/bin/DiscordChatExporter.Cli $out/bin/discordchatexporter-cli ''; - passthru = { - updateScript = ./updater.sh; - tests.version = testers.testVersion { - package = discordchatexporter-cli; - version = "v${version}"; - }; - }; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = ./updater.sh; meta = { + changelog = "https://github.com/Tyrrrz/DiscordChatExporter/releases/tag/${finalAttrs.version}"; description = "Tool to export Discord chat logs to a file"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = lib.licenses.gpl3Plus; - changelog = "https://github.com/Tyrrrz/DiscordChatExporter/releases/tag/${version}"; - maintainers = [ ]; - platforms = lib.platforms.unix; mainProgram = "discordchatexporter-cli"; + maintainers = with lib.maintainers; [ phanirithvij ]; + platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/di/discordchatexporter-cli/updater.sh b/pkgs/by-name/di/discordchatexporter-cli/updater.sh index d61235ef5c6f..6a8e031ef20d 100755 --- a/pkgs/by-name/di/discordchatexporter-cli/updater.sh +++ b/pkgs/by-name/di/discordchatexporter-cli/updater.sh @@ -11,5 +11,5 @@ if [[ "$new_version" == "$old_version" ]]; then fi cd ../../../.. -update-source-version discordchatexporter-cli "$new_version" +update-source-version discordchatexporter-cli "$new_version" --file=./pkgs/by-name/di/discordchatexporter-cli/package.nix $(nix-build -A discordchatexporter-cli.fetch-deps --no-out-link) diff --git a/pkgs/by-name/di/discordchatexporter-desktop/deps.json b/pkgs/by-name/di/discordchatexporter-desktop/deps.json index 3f0bf6f905ef..41d095ca26c9 100644 --- a/pkgs/by-name/di/discordchatexporter-desktop/deps.json +++ b/pkgs/by-name/di/discordchatexporter-desktop/deps.json @@ -1,252 +1,257 @@ [ { "pname": "AdvancedStringBuilder", - "version": "0.1.1", - "hash": "sha256-pLixGUct2lQnSeckSHVnIEoGfsvz3gkA914QSHdaheE=" + "version": "0.2.0", + "hash": "sha256-66bPgNGU/wLpGs9mydkBBlTEJRpvfHDwWEysUsufZJY=" }, { "pname": "AngleSharp", - "version": "1.2.0", - "hash": "sha256-l8+Var9o773VL6Ybih3boaFf9sYjS7eqtLGd8DCIPsk=" + "version": "1.4.0", + "hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0=" }, { "pname": "AsyncImageLoader.Avalonia", - "version": "3.3.0", - "hash": "sha256-blhfKI+vX+ojT2cOvSHu3Kp2CuxvhW/l+as88Dia4bA=" + "version": "3.8.0", + "hash": "sha256-sfIxMXp9DA502O8XrYIuUe/H6UE7ma25cs6C/73XvT8=" }, { "pname": "AsyncKeyedLock", - "version": "7.1.4", - "hash": "sha256-Q1iyq3j/zLDcGdAwMzTrf/L/DN3SJAT+lpX3yBwJ2+o=" + "version": "8.0.2", + "hash": "sha256-0NKdC+oxdYxS3Uz1lak5RpdTWyKYT7C3hkCdm5T0D84=" }, { "pname": "Avalonia", - "version": "11.2.5", - "hash": "sha256-DGTMzInnfvJUJWu2SXiRBercxxe1/paQkSlBHMahp4g=" + "version": "12.0.4", + "hash": "sha256-sHu0eifno4DJ0Tnl3v4e3OZY1oy41OO482UfKVkQfK0=" }, { "pname": "Avalonia.Angle.Windows.Natives", - "version": "2.1.22045.20230930", - "hash": "sha256-RxPcWUT3b/+R3Tu5E5ftpr5ppCLZrhm+OTsi0SwW3pc=" + "version": "2.1.27548.20260419", + "hash": "sha256-dtZ5AQl+kXPRVe/EwrfSyOMSLywuBBUCjrDIhHijhvk=" }, { "pname": "Avalonia.BuildServices", - "version": "0.0.31", - "hash": "sha256-wgtodGf644CsUZEBIpFKcUjYHTbnu7mZmlr8uHIxeKA=" - }, - { - "pname": "Avalonia.Controls.ColorPicker", - "version": "11.2.5", - "hash": "sha256-gWGIqXrac0fOnmGbovcFWv5Uj14hOyC+n0l45N7owMg=" - }, - { - "pname": "Avalonia.Controls.DataGrid", - "version": "11.2.5", - "hash": "sha256-eGKc+UnsO5nNiUd7+n3CQW6vIWq2qpazYvYXrVTQY7s=" + "version": "11.3.2", + "hash": "sha256-6wx06tjSKWQOlX2czdp6Wh0nuwVapx5qf/s8Qj5we40=" }, { "pname": "Avalonia.Desktop", - "version": "11.2.5", - "hash": "sha256-rDJ1NJM3tEqB7sRszj0AfplwkkvtE3Hvn7acrIsq+yw=" - }, - { - "pname": "Avalonia.Diagnostics", - "version": "11.2.5", - "hash": "sha256-WsAMBmNfUKMB2II3AfM8A0klfJR/vgEtRUTGpgC6F3A=" + "version": "12.0.4", + "hash": "sha256-6FeeNofcrLVgMyxT8j37CxVNUHIe1BfDIeAES1SChBA=" }, { "pname": "Avalonia.FreeDesktop", - "version": "11.2.5", - "hash": "sha256-rLzsxUQS1LLLcLWkDR8SLLwLY53vUMqgiKoDWM6PjtM=" + "version": "12.0.4", + "hash": "sha256-mj1icR/oMR4b6AygR3/ycq39DMuEpXHPy/fWeuwLYs8=" + }, + { + "pname": "Avalonia.FreeDesktop.AtSpi", + "version": "12.0.4", + "hash": "sha256-FgfModA3bLccR6HM91A/+0198SR4NWg8zZIA3EE4wW8=" + }, + { + "pname": "Avalonia.HarfBuzz", + "version": "12.0.4", + "hash": "sha256-tpTETc9r5b0CtXiYZEVgV57Tubqh3BS22+oq/ZU4YRQ=" }, { "pname": "Avalonia.Native", - "version": "11.2.5", - "hash": "sha256-XQQgcfbRRHPzH432M1KzkSEtLQof40yCt+KIrQREBY0=" + "version": "12.0.4", + "hash": "sha256-MzirvFnZFV3qddBUgEDzf8TwbmIrH3tWujUWKOdXAzc=" }, { "pname": "Avalonia.Remote.Protocol", - "version": "11.2.5", - "hash": "sha256-Mpml6U6Fl8FUvENGQxpxuw0+pOPvoWbZXV4V1bLUS9w=" + "version": "12.0.4", + "hash": "sha256-uuc61RM/WBfRmWCcBkoenLCreOxEGcF8U4t8RptrxiE=" }, { "pname": "Avalonia.Skia", - "version": "11.2.5", - "hash": "sha256-su1K1RmQ+syE6ufjrzpQR1yiUa6GEtY5QPlW0GOVKnU=" - }, - { - "pname": "Avalonia.Themes.Simple", - "version": "11.2.5", - "hash": "sha256-EjQ2XA81SS91h8oGUwVxLYewm3Lp5Sa2Lmbj0c8y8BU=" + "version": "12.0.4", + "hash": "sha256-ba80KHyzW0NdoDK3iPntbi3NKEnh2c1rbrv4mu2xWcI=" }, { "pname": "Avalonia.Win32", - "version": "11.2.5", - "hash": "sha256-ljgJgXDxmHOUQ+p8z62mtaK4FTmYAI+c+6gL2lczD/8=" + "version": "12.0.4", + "hash": "sha256-ZP1+man3HnJDh9vdEQBfa1W94t56BRkQ2feWqVJBm34=" }, { "pname": "Avalonia.X11", - "version": "11.2.5", - "hash": "sha256-wHEHcEvOUyIBgBtQZOIs330KajSv8DSEsJP7w4M9i4E=" + "version": "12.0.4", + "hash": "sha256-r6cV/4kqiZ6lBNgN2HrYagG41JFZrOe7GZzbSelBT2g=" }, { "pname": "Cogwheel", - "version": "2.1.0", - "hash": "sha256-Gby3JWUOSgQQmTLZfiItGdjE95GoZ/Cfqfp1CsWyS5g=" + "version": "2.1.1", + "hash": "sha256-1r95zm6YllPhnv7byYKGFPyBtOBEBT2+44vnQFQ3V3o=" }, { "pname": "CommunityToolkit.Mvvm", - "version": "8.4.0", - "hash": "sha256-a0D550q+ffreU9Z+kQPdzJYPNaj1UjgyPofLzUg02ZI=" + "version": "8.4.2", + "hash": "sha256-jLS1vo6V+fHsJs80HYT77oJE6IEC68fIgkLpYODjWAU=" }, { "pname": "CSharpier.MsBuild", - "version": "0.30.6", - "hash": "sha256-FhXf9ggWmWzGp6vz6vJP+ly4SOeyluP6Ic3MfCz1uUA=" + "version": "1.2.6", + "hash": "sha256-jvY05AmHK0MO9cbSTwAvAXf4urL+6Df2ug4IKwcleDw=" }, { "pname": "Deorcify", - "version": "1.1.0", - "hash": "sha256-R3V/9z/dP0LyhMNh+SiHD5j+XGr/DxPo4qwaKB+Fbak=" + "version": "2.0.1", + "hash": "sha256-1Yl9KIEXNHHOUhmyYS65jx1AljPt7i4wvGGlxfm/XxA=" }, { "pname": "DialogHost.Avalonia", - "version": "0.9.2", - "hash": "sha256-mDF1CM06p16xtxYg7wo8oJMF0QgMsPPAeQL2d22dhyc=" + "version": "0.12.2", + "hash": "sha256-5TYE2iosoba00U8GdCK6nKqOI7gOUZGBpo1XVqdwuLw=" }, { "pname": "Gress", - "version": "2.1.1", - "hash": "sha256-k5EbB4xOWoTCurtIuIx7t3obpWQKQCb7gEZQD6kLf+s=" + "version": "2.2.0", + "hash": "sha256-2vzffEFC2NHH5KGXssvlR4rH+e1DrsFMHN+zQcOgyGI=" }, { "pname": "HarfBuzzSharp", - "version": "7.3.0.3", - "hash": "sha256-1vDIcG1aVwVABOfzV09eAAbZLFJqibip9LaIx5k+JxM=" + "version": "8.3.1.3", + "hash": "sha256-/+ZEhjpOs8B4tMPw3vDyuQqGGZHJEWvy3WaKMaDwmrU=" }, { "pname": "HarfBuzzSharp.NativeAssets.Linux", - "version": "7.3.0.3", - "hash": "sha256-HW5r16wdlgDMbE/IfE5AQGDVFJ6TS6oipldfMztx+LM=" + "version": "8.3.1.3", + "hash": "sha256-feWOna/8ncvmrq7CxnDczv1facV2poZV5R+OyCtocpU=" }, { "pname": "HarfBuzzSharp.NativeAssets.macOS", - "version": "7.3.0.3", - "hash": "sha256-UpAVfRIYY8Wh8xD4wFjrXHiJcvlBLuc2Xdm15RwQ76w=" + "version": "8.3.1.3", + "hash": "sha256-6WKsJ/jF9pHnaWcQvaezc5AV6flu3XsOxQs7i4BGYJs=" }, { "pname": "HarfBuzzSharp.NativeAssets.WebAssembly", - "version": "7.3.0.3", - "hash": "sha256-jHrU70rOADAcsVfVfozU33t/5B5Tk0CurRTf4fVQe3I=" + "version": "8.3.1.3", + "hash": "sha256-arBiI82fXPjAqftqnG7Wc3BRzZ6+vKd7b58vQSWJVk0=" }, { "pname": "HarfBuzzSharp.NativeAssets.Win32", - "version": "7.3.0.3", - "hash": "sha256-v/PeEfleJcx9tsEQAo5+7Q0XPNgBqiSLNnB2nnAGp+I=" + "version": "8.3.1.3", + "hash": "sha256-WNUQmLWVFSwBKT9x7UdhSz9T2FA7wibvwjuPew/3yUM=" }, { "pname": "JsonExtensions", "version": "1.2.0", "hash": "sha256-vhuDDUSzDS5u9dfup0qk6j7Vc9i8Wyo7dBivpVaEpDw=" }, + { + "pname": "Markdig", + "version": "1.2.0", + "hash": "sha256-Z05n323rxztLtJdrqz6+kqKSpua/byYLk6/8lVnHbxU=" + }, { "pname": "Material.Avalonia", - "version": "3.9.2", - "hash": "sha256-CZRVo/i3qUE5Qj7H2yCrtV8ThDOfjMWTyGHLm0/Bajw=" + "version": "3.16.1", + "hash": "sha256-Yfdaj2NYvLfeGXTTYo4e+4Gi8pYpI4rA0N2yLiIiCVI=" }, { "pname": "Material.Icons", - "version": "2.2.0", - "hash": "sha256-Gw2a7oXicf3yQKEgRdwBJ0DubMvf8iEkn6GtcLF9zJM=" + "version": "3.0.2", + "hash": "sha256-BP1fQLsidpNpiyG87V6oNnuO8CKo8hcf6405AScb2Cs=" }, { "pname": "Material.Icons.Avalonia", - "version": "2.2.0", - "hash": "sha256-RkYaULaVMjm2HJV23gGRHomv6jI0dE/lIk1AWwkWJKA=" + "version": "3.0.2", + "hash": "sha256-1FHaifgw3P/holj2QcXH+1U4Mrga5qKsUrYgkYNuXXU=" }, { "pname": "MicroCom.Runtime", - "version": "0.11.0", - "hash": "sha256-VdwpP5fsclvNqJuppaOvwEwv2ofnAI5ZSz2V+UEdLF0=" + "version": "0.11.4", + "hash": "sha256-hd13T4Z9DsF1Sb56bS+SDpWjksJVzb4m/Kp37jaUhkU=" }, { "pname": "Microsoft.Extensions.DependencyInjection", - "version": "9.0.2", - "hash": "sha256-jNQVj2Xo7wzVdNDu27bLbYCVUOF8yDVrFtC3cZ9OsXo=" + "version": "10.0.8", + "hash": "sha256-eKex/vpm5A4o2WV6sJyjqKPydWhekJFO6wrH0V7RyBY=" }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.2", - "hash": "sha256-WoTLgw/OlXhgN54Szip0Zpne7i/YTXwZ1ZLCPcHV6QM=" + "version": "10.0.8", + "hash": "sha256-HV30fu+lF/GYkeVP+Yq/EU1FzgdMqwqlepCpvxUgugE=" }, { "pname": "Onova", - "version": "2.6.12", - "hash": "sha256-kYChxhtYxRhQ5gldSKg+jr6SoMqq6w2ezXZkBd4AtZk=" + "version": "2.6.13", + "hash": "sha256-PmFGRd9bRBxAQOsNiH4nCYGnFNoDtvdepu5YP5w89N4=" }, { "pname": "Polly", - "version": "8.5.2", - "hash": "sha256-IrN06ddOIJ0VYuVefe3LvfW0kX20ATRQkEBg9CBomRA=" + "version": "8.6.6", + "hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps=" }, { "pname": "Polly.Core", - "version": "8.5.2", - "hash": "sha256-PAwsWqrCieCf/7Y87fV7XMKoaY2abCQNtI+4oyyMifk=" + "version": "8.6.6", + "hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU=" + }, + { + "pname": "PowerKit", + "version": "2.0.1", + "hash": "sha256-mqXd34gelLM26cAlHCBWOkAhyVlzrRKr2NH2kiGf8qk=" }, { "pname": "RazorBlade", - "version": "0.8.0", - "hash": "sha256-ARj2CczrO3oxPgNcx2OAzfCppi1TE9ZDhPBnrCkKM6M=" + "version": "1.0.0", + "hash": "sha256-ieuGwqM8HHtD+llYO3CdVB+fHHvQ6QnQiajttREFOXM=" }, { "pname": "SkiaSharp", - "version": "2.88.9", - "hash": "sha256-jZ/4nVXYJtrz9SBf6sYc/s0FxS7ReIYM4kMkrhZS+24=" + "version": "3.119.4", + "hash": "sha256-4ypEnTGUXAudFp61vGduHj9YmqtpiI5J1wP9wcOEwXY=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "2.88.9", - "hash": "sha256-mQ/oBaqRR71WfS66mJCvcc3uKW7CNEHoPN2JilDbw/A=" + "version": "3.119.4", + "hash": "sha256-+uBVQFmxEH73iI5GwgvftUhAHvenpvc5GtT63HQy1Qo=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "2.88.9", - "hash": "sha256-qvGuAmjXGjGKMzOPBvP9VWRVOICSGb7aNVejU0lLe/g=" + "version": "3.119.4", + "hash": "sha256-9/L1Oc5bujN6pKjW6sJcr1jL3RLt8/Mt3MmClOcwzyw=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "2.88.9", - "hash": "sha256-vgFL4Pdy3O1RKBp+T9N3W4nkH9yurZ0suo8u3gPmmhY=" + "version": "3.119.4", + "hash": "sha256-xLfsWBsFFpv5Qg79GIMi+5CM6YDfcg//oywNlB5Y3J0=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "2.88.9", - "hash": "sha256-kP5XM5GgwHGfNJfe4T2yO5NIZtiF71Ddp0pd1vG5V/4=" + "version": "3.119.4", + "hash": "sha256-WlaYsbTh/cn/6YaN9odNtfpp8hpN52unGgGlQum0M5E=" }, { "pname": "Superpower", - "version": "3.0.0", - "hash": "sha256-5MNmhBDYyOs+sTH364Qdn+Ck328BAQaVC1KMQ7yK2Vw=" + "version": "3.1.0", + "hash": "sha256-krsT4LFDHeCjwS0BbkgpBYggpr5Nmc1RXYyOjLqRifQ=" }, { - "pname": "System.IO.Pipelines", - "version": "8.0.0", - "hash": "sha256-LdpB1s4vQzsOODaxiKstLks57X9DTD5D6cPx8DE1wwE=" + "pname": "ThisAssembly.Constants", + "version": "2.1.2", + "hash": "sha256-SZ1aQW/Ynt9H/gr1N3NYg4D27BBagHpF7OPqOIas6l0=" + }, + { + "pname": "ThisAssembly.Project", + "version": "2.1.2", + "hash": "sha256-IIlqnK37afpCMBdDNqsLbpX8dv6+c0mNen6pkRqDADw=" }, { "pname": "Tmds.DBus.Protocol", - "version": "0.20.0", - "hash": "sha256-CRW/tkgsuBiBJfRwou12ozRQsWhHDooeP88E5wWpWJw=" + "version": "0.92.0", + "hash": "sha256-WZSB9eqSOIzsBfnpOJDIIopIhNxAH+UcZuD6W94PIN4=" }, { "pname": "WebMarkupMin.Core", - "version": "2.17.0", - "hash": "sha256-LuTotFyrjbUf9hrVqNPVs443lizPgNINbKoHT4cfjYs=" + "version": "2.21.0", + "hash": "sha256-k51tTFcdL9Bwsg3gA51ZswGxDtdBFb22BAj9wbyZu1E=" }, { "pname": "YoutubeExplode", - "version": "6.5.3", - "hash": "sha256-fxmplhCjy9AMBs8uwH08OBBfo450l6qiTNdmvVqLDB8=" + "version": "6.6.0", + "hash": "sha256-53mPbr8IVmJH2C3euhSz56Bl6fJt5yN0CU6vCmzUs4I=" } ] diff --git a/pkgs/by-name/di/discordchatexporter-desktop/package.nix b/pkgs/by-name/di/discordchatexporter-desktop/package.nix index 475e651b162e..98d4e8675dc3 100644 --- a/pkgs/by-name/di/discordchatexporter-desktop/package.nix +++ b/pkgs/by-name/di/discordchatexporter-desktop/package.nix @@ -3,27 +3,25 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, - testers, - discordchatexporter-desktop, }: -buildDotnetModule rec { +buildDotnetModule (finalAttrs: { pname = "discordchatexporter-desktop"; - version = "2.44.2"; + version = "2.47.3"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; - rev = version; - hash = "sha256-Dc6OSWUTFftP2tyRFoxHm+TsnSMDfx627DhmYnPie9w="; + tag = finalAttrs.version; + hash = "sha256-B/2krGBYp/6qgINRyX/38tHlEy9JxmQMAIPsDNjZF5k="; }; env.XDG_CONFIG_HOME = "$HOME/.config"; projectFile = "DiscordChatExporter.Gui/DiscordChatExporter.Gui.csproj"; nugetDeps = ./deps.json; - dotnet-sdk = dotnetCorePackages.sdk_9_0; - dotnet-runtime = dotnetCorePackages.runtime_9_0; + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; patches = [ ./settings-path.patch ]; @@ -31,17 +29,21 @@ buildDotnetModule rec { ln -s $out/bin/DiscordChatExporter $out/bin/discordchatexporter ''; - passthru = { - updateScript = ./updater.sh; - }; + passthru.updateScript = ./updater.sh; meta = { + changelog = "https://github.com/Tyrrrz/DiscordChatExporter/releases/tag/${finalAttrs.version}"; description = "Tool to export Discord chat logs to a file (GUI version)"; homepage = "https://github.com/Tyrrrz/DiscordChatExporter"; license = lib.licenses.gpl3Plus; - changelog = "https://github.com/Tyrrrz/DiscordChatExporter/releases/tag/${version}"; - maintainers = with lib.maintainers; [ willow ]; - platforms = [ "x86_64-linux" ]; mainProgram = "discordchatexporter"; + maintainers = with lib.maintainers; [ + phanirithvij + willow + ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; }; -} +}) diff --git a/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch b/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch index 589128afa3dc..bbe872b25137 100644 --- a/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch +++ b/pkgs/by-name/di/discordchatexporter-desktop/settings-path.patch @@ -1,19 +1,19 @@ -diff --git a/DiscordChatExporter.Gui/Services/SettingsService.cs b/DiscordChatExporter.Gui/Services/SettingsService.cs -index 4f69969..2716225 100644 ---- a/DiscordChatExporter.Gui/Services/SettingsService.cs -+++ b/DiscordChatExporter.Gui/Services/SettingsService.cs -@@ -14,7 +14,13 @@ namespace DiscordChatExporter.Gui.Services; - [INotifyPropertyChanged] - public partial class SettingsService() - : SettingsBase( -- Path.Combine(AppContext.BaseDirectory, "Settings.dat"), -+ Path.Combine( -+ System.IO.Path.Combine( -+ Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), -+ "discordchatexporter" -+ ), -+ "Settings.dat" -+ ), - SerializerContext.Default - ) - { +diff --git a/DiscordChatExporter.Gui/StartOptions.cs b/DiscordChatExporter.Gui/StartOptions.cs +index d17752a..8df18c8 100644 +--- a/DiscordChatExporter.Gui/StartOptions.cs ++++ b/DiscordChatExporter.Gui/StartOptions.cs +@@ -21,7 +21,13 @@ public partial class StartOptions + ? Path.EndsInDirectorySeparator(path) || Directory.Exists(path) + ? Path.Combine(path, "Settings.dat") + : path +- : Path.Combine(AppContext.BaseDirectory, "Settings.dat"), ++ : Path.Combine( ++ System.IO.Path.Combine( ++ Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), ++ "discordchatexporter" ++ ), ++ "Settings.dat" ++ ), + IsAutoUpdateAllowed = !( + Environment.GetEnvironmentVariable("DISCORDCHATEXPORTER_ALLOW_AUTO_UPDATE") + is { } env diff --git a/pkgs/by-name/di/discordchatexporter-desktop/updater.sh b/pkgs/by-name/di/discordchatexporter-desktop/updater.sh index 0487fd1c392c..327db92945ad 100755 --- a/pkgs/by-name/di/discordchatexporter-desktop/updater.sh +++ b/pkgs/by-name/di/discordchatexporter-desktop/updater.sh @@ -11,5 +11,5 @@ if [[ "$new_version" == "$old_version" ]]; then fi cd ../../../.. -update-source-version discordchatexporter-desktop "$new_version" +update-source-version discordchatexporter-desktop "$new_version" --file=./pkgs/by-name/di/discordchatexporter-desktop/package.nix $(nix-build -A discordchatexporter-desktop.fetch-deps --no-out-link) diff --git a/pkgs/by-name/di/discover-overlay/package.nix b/pkgs/by-name/di/discover-overlay/package.nix index 521ff49a587b..3fe58531f832 100644 --- a/pkgs/by-name/di/discover-overlay/package.nix +++ b/pkgs/by-name/di/discover-overlay/package.nix @@ -45,7 +45,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { requests pillow setuptools - xlib + python-xlib ]; postPatch = '' substituteInPlace discover_overlay/image_getter.py \ diff --git a/pkgs/by-name/di/disk-inventory-x/package.nix b/pkgs/by-name/di/disk-inventory-x/package.nix deleted file mode 100644 index 86d35df055f6..000000000000 --- a/pkgs/by-name/di/disk-inventory-x/package.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - lib, - stdenvNoCC, - fetchurl, - undmg, -}: -stdenvNoCC.mkDerivation (finalAttrs: { - pname = "disk-inventory-x"; - version = "1.3"; - - src = fetchurl { - url = "https://www.derlien.com/diskinventoryx/downloads/Disk%20Inventory%20X%20${finalAttrs.version}.dmg"; - sha256 = "1rfqp8ia6ficvqxynn43f1pba4rfmhf61kn2ihysbnjs8c33bbvq"; - }; - sourceRoot = "."; - - nativeBuildInputs = [ undmg ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications - cp -r *.app $out/Applications - - runHook postInstall - ''; - - meta = { - description = "Disk usage utility for Mac OS X"; - homepage = "https://www.derlien.com"; - license = lib.licenses.gpl3Plus; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; - platforms = [ "x86_64-darwin" ]; - }; -}) diff --git a/pkgs/by-name/di/diskonaut-ng/package.nix b/pkgs/by-name/di/diskonaut-ng/package.nix new file mode 100644 index 000000000000..3735ed81bc59 --- /dev/null +++ b/pkgs/by-name/di/diskonaut-ng/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + + __structuredAttrs = true; + + pname = "diskonaut-ng"; + version = "0.13.2"; + + src = fetchFromGitHub { + owner = "neunenak"; + repo = "diskonaut"; + tag = finalAttrs.version; + hash = "sha256-4gfJnqACJP1lV62Bkuarp85Idoh/H8zQ5W085yNZR5Q="; + }; + + cargoHash = "sha256-+NwZbR3fRj8Wi95GtsUQFWOyaZ0ekC4chsoJ5rsH3Zg="; + + # 1 passed; 44 failed https://hydra.nixos.org/build/148943783/nixlog/1 + doCheck = !stdenv.hostPlatform.isDarwin; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal disk space navigator"; + homepage = "https://github.com/neunenak/diskonaut"; + changelog = "https://github.com/neunenak/diskonaut/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + gregshuflin + ]; + mainProgram = "diskonaut"; + }; +}) diff --git a/pkgs/by-name/di/disktui/package.nix b/pkgs/by-name/di/disktui/package.nix index a96d1833ab43..0f32fdea0598 100644 --- a/pkgs/by-name/di/disktui/package.nix +++ b/pkgs/by-name/di/disktui/package.nix @@ -7,7 +7,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "disktui"; version = "1.3.0"; src = fetchFromGitHub { - owner = "Maciejonos"; + owner = "mkbula"; repo = "disktui"; tag = "v${finalAttrs.version}"; hash = "sha256-C0skZF7fP7Qx5o+q9bUitgnBB9tBh1J4JdGyn8oQ/Rc="; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "TUI for disk management on Linux"; - homepage = "https://github.com/Maciejonos/disktui"; + homepage = "https://github.com/mkbula/disktui"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ Inarizxc ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/di/diskwatch/package.nix b/pkgs/by-name/di/diskwatch/package.nix index c5465d0814a6..ccf6871ddc64 100644 --- a/pkgs/by-name/di/diskwatch/package.nix +++ b/pkgs/by-name/di/diskwatch/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "diskwatch"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "matthart1983"; repo = "diskwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-pveHyT3ljQQ9GdOMhZhcY7QD/pMvL3fLrbM6D5fO+h4="; + hash = "sha256-CGt9954nwgVMcNJg6QjRLjhN8N9rQ6+bRuCzqQAUXGc="; }; __structuredAttrs = true; - cargoHash = "sha256-PufgQqJGsPMBcnNV/QXQnE/wrI4FAJWXLvoHEqLQm5k="; + cargoHash = "sha256-YYCIPti5f1fSf3AcDAIDIRHcbnxJRc+Pv5IKFWgYeYM="; nativeCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/di/dismap/package.nix b/pkgs/by-name/di/dismap/package.nix index 064e0c4bb23b..7f595788b3b0 100644 --- a/pkgs/by-name/di/dismap/package.nix +++ b/pkgs/by-name/di/dismap/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Asset discovery and identification tools"; mainProgram = "dismap"; homepage = "https://github.com/zhzyker/dismap"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/di/disorderfs/package.nix b/pkgs/by-name/di/disorderfs/package.nix index 722c5ed52d5a..c1517d9f43cd 100644 --- a/pkgs/by-name/di/disorderfs/package.nix +++ b/pkgs/by-name/di/disorderfs/package.nix @@ -10,14 +10,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "disorderfs"; - version = "0.6.2"; + version = "0.7.0"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "reproducible-builds"; repo = "disorderfs"; tag = finalAttrs.version; - hash = "sha256-1ehGbNYbOewnDrQ1JhozKMvfVaCH7sDCxrD0dvwAfw0="; + hash = "sha256-5eW5/fZesRvgXUANtbDCTDHiBvFiTQ32BPJSqoW/yYc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/di/display3d/package.nix b/pkgs/by-name/di/display3d/package.nix index e53d665b3743..b3befef51562 100644 --- a/pkgs/by-name/di/display3d/package.nix +++ b/pkgs/by-name/di/display3d/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "display3d"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { owner = "renpenguin"; repo = "display3d"; tag = "v${finalAttrs.version}"; - hash = "sha256-dFfU80/1fhBz9/0fVZigo+nZx6Lj66OsP52oMDpS+BY="; + hash = "sha256-f2iT+3xqtFY8e9kmwpEac0/WQLFVL6tXUk/lQgBQzaM="; }; - cargoHash = "sha256-eXpoWKYonNZQqqIFrxO4RnLLX1s1osaZxZt3gVTYd4o="; + cargoHash = "sha256-IEaiehlOCQGun/CUIbPlCITAm6L/XV1uyQSmlBPnxGk="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/di/displaycal/package.nix b/pkgs/by-name/di/displaycal/package.nix index a7422310e414..8375cc8170a9 100644 --- a/pkgs/by-name/di/displaycal/package.nix +++ b/pkgs/by-name/di/displaycal/package.nix @@ -15,13 +15,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "displaycal"; - version = "3.9.17"; + version = "3.9.19"; pyproject = true; src = fetchPypi { - pname = "DisplayCAL"; + pname = "displaycal"; inherit (finalAttrs) version; - hash = "sha256-cV8x1Hx+KQUhOOzqw/89QgoZ9+82vhwGrhG13KpE9Vw="; + hash = "sha256-GHx+2VwuxwdMQh6fxY6V/EQJE4CPxer39Aj/QlMWbrw="; }; nativeBuildInputs = [ @@ -29,17 +29,30 @@ python3.pkgs.buildPythonApplication (finalAttrs: { gtk3 ]; - build-system = with python3.pkgs; [ setuptools ]; + build-system = with python3.pkgs; [ setuptools_80 ]; + + postPatch = '' + # 2 conflicting copies of bin/displaycal end up from the installation + # process (one from pyproject.toml’s gui-scripts, one from setup.py). Keep + # only the setup.py version. Replace key with an invalide name to be + # skipped. + substituteInPlace pyproject.toml \ + --replace-fail "[project.gui-scripts]" "[_project.gui-scripts]" \ + ''; dependencies = with python3.pkgs; [ build certifi + defusedxml wxpython dbus-python distro numpy pillow + psutil pychromecast + pyglet + pyyaml send2trash zeroconf ]; diff --git a/pkgs/by-name/di/distgen/package.nix b/pkgs/by-name/di/distgen/package.nix index 90d85f3f986d..a0016d48d390 100644 --- a/pkgs/by-name/di/distgen/package.nix +++ b/pkgs/by-name/di/distgen/package.nix @@ -6,12 +6,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "distgen"; - version = "2.3"; + version = "2.4"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-EDRCGf4laHZs//E3w5FxlkuTfbVLxnaGmQF/xjwaKDQ="; + hash = "sha256-4XaZF4WmGhoGgQ3KlggIWLHAypZYA8QpkN7ARMijoPs="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/di/distro-info-data/package.nix b/pkgs/by-name/di/distro-info-data/package.nix index 2b3ca75e3452..b35275fab16e 100644 --- a/pkgs/by-name/di/distro-info-data/package.nix +++ b/pkgs/by-name/di/distro-info-data/package.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "distro-info-data"; - version = "0.69"; + version = "0.70"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "debian"; repo = "distro-info-data"; tag = "debian/${finalAttrs.version}"; - hash = "sha256-EsIg+ZPTKVXHvvGnwFSgzFfn+h0JTXcYzCP4ewFM5Kc="; + hash = "sha256-aTQak1meAqj/bTcw0Ky9xtYAuDISZ14EuOxwKsJZMhw="; }; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/di/distroshelf/package.nix b/pkgs/by-name/di/distroshelf/package.nix index 24b00d5daacf..683bd78a4395 100644 --- a/pkgs/by-name/di/distroshelf/package.nix +++ b/pkgs/by-name/di/distroshelf/package.nix @@ -12,23 +12,25 @@ pkg-config, glib, libadwaita, + libxml2, + vte-gtk4, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "distroshelf"; - version = "1.0.15"; + version = "1.4.8"; src = fetchFromGitHub { owner = "ranfdev"; repo = "DistroShelf"; tag = "v${finalAttrs.version}"; - hash = "sha256-4rNdp0g/QaiLnKGC4baYAq29dxluyZ+9TgeBlqidRp0="; + hash = "sha256-3O+KsOZzwH8E2rDSEgiVZK64B2wK1U/uDJ2z37NtJCg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-5luI46rSgB+N0OKQzSopEhCCEnwAhMabRit9MtsSSVA="; + hash = "sha256-lNKWcpdIr1tm2m50B9uOqFQvhndAEM5ADmmPBPb8sj4="; }; nativeBuildInputs = [ @@ -40,11 +42,13 @@ stdenv.mkDerivation (finalAttrs: { rustc desktop-file-utils pkg-config + libxml2 ]; buildInputs = [ glib libadwaita + vte-gtk4 ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/di/diswall/package.nix b/pkgs/by-name/di/diswall/package.nix index 96f52d4809aa..273b0be8a4c4 100644 --- a/pkgs/by-name/di/diswall/package.nix +++ b/pkgs/by-name/di/diswall/package.nix @@ -2,20 +2,27 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "diswall"; - version = "0.6.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "dis-works"; repo = "diswall-rs"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-t2ZBi3ab6OUWzc0L0Hq/ay+s3KNDMeu6mkYxti48BuE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-5kKVEdzN38gyovGAg3/FE5sbSwCBEiQH1GPsDeQ+rCg="; }; - cargoHash = "sha256-I4jfeOtK+ho2jksGHgQqHE+L6UzS240t+7v3/Eb/xAs="; + cargoHash = "sha256-WXaNLlTbZc2On19azFUbcsx0fA2LpsNNWxO6BzJ469M="; + + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ openssl ]; + + env.OPENSSL_NO_VENDOR = 1; doCheck = false; @@ -31,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { intruder to get any system information. ''; homepage = "https://www.diswall.stream"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ izorkin ]; mainProgram = "diswall"; }; diff --git a/pkgs/by-name/di/diun/package.nix b/pkgs/by-name/di/diun/package.nix index 29fa92935ccc..baa92a0cc4e2 100644 --- a/pkgs/by-name/di/diun/package.nix +++ b/pkgs/by-name/di/diun/package.nix @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { # upstream disable CGO in release build # https://github.com/crazy-max/diun/blob/76c0fe99212adc58d6a3433bbcde1ffa9fb879c4/Dockerfile#L11 - env.CGO_ENABLED = false; + env.CGO_ENABLED = 0; ldflags = [ "-s" diff --git a/pkgs/by-name/di/dix/package.nix b/pkgs/by-name/di/dix/package.nix index 7db7dadc9143..4679ba104917 100644 --- a/pkgs/by-name/di/dix/package.nix +++ b/pkgs/by-name/di/dix/package.nix @@ -7,7 +7,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dix"; - version = "2.0.1"; + version = "2.2.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "manic-systems"; repo = "dix"; tag = "v${finalAttrs.version}"; - hash = "sha256-KTlFgBEVKJIXymfN2UU8hvGM71PYRcNgJ1XWUmG2AI4="; + hash = "sha256-U7zKSFQsmAkG4Um0DxgkgsGKh+/MqT1H3llUVd/i8UE="; }; - cargoHash = "sha256-pNkSdsxOpv0E/xXs7tMg2vtP0PBU7p8fh3H4IX/u5k4="; + cargoHash = "sha256-m2jRDMjZTJHKbe0Ep76SFT3tV1xytThvaRAt6A0CF3A="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/dj/django-upgrade/package.nix b/pkgs/by-name/dj/django-upgrade/package.nix index c37e6c385585..de9163300556 100644 --- a/pkgs/by-name/dj/django-upgrade/package.nix +++ b/pkgs/by-name/dj/django-upgrade/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "django-upgrade"; - version = "1.30.0"; + version = "1.31.1"; pyproject = true; src = fetchFromGitHub { owner = "adamchainz"; repo = "django-upgrade"; tag = finalAttrs.version; - hash = "sha256-IiGwYq6TTNiNIx1jrzQlLiULWNZlam7onJJGFFJ/hVM="; + hash = "sha256-6x1542ieT+G/r3IiCw4aLePY3HLzpycI7FOBqHm1fmE="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/dj/djlint/package.nix b/pkgs/by-name/dj/djlint/package.nix index a5998c3952f6..f3d76c74eeae 100644 --- a/pkgs/by-name/dj/djlint/package.nix +++ b/pkgs/by-name/dj/djlint/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "Riverside-Healthcare"; + owner = "djlint"; repo = "djlint"; tag = "v${finalAttrs.version}"; hash = "sha256-1DXBDVe8Ae8joJOYwwlBZB8MVubDPVhh+TiJBpL2u2M="; @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "HTML Template Linter and Formatter. Django - Jinja - Nunjucks - Handlebars - GoLang"; mainProgram = "djlint"; - homepage = "https://github.com/Riverside-Healthcare/djlint"; + homepage = "https://github.com/djlint/djLint"; license = lib.licenses.gpl3Only; changelog = "https://github.com/djlint/djLint/blob/v${finalAttrs.version}/CHANGELOG.md"; maintainers = with lib.maintainers; [ traxys ]; diff --git a/pkgs/by-name/dj/djv/package.nix b/pkgs/by-name/dj/djv/package.nix index e7f2da7adcc9..b06440dd5527 100644 --- a/pkgs/by-name/dj/djv/package.nix +++ b/pkgs/by-name/dj/djv/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.1.1"; src = fetchFromGitHub { - owner = "darbyjohnston"; + owner = "grizzlypeak3d"; repo = "djv"; tag = finalAttrs.version; hash = "sha256-/SakJ23mi/dz8eUt2UtcgfLtFZiCHy1ME+jWdNS8+Fw="; diff --git a/pkgs/by-name/dj/djvulibre/package.nix b/pkgs/by-name/dj/djvulibre/package.nix index f6eb3ccbb140..13563f3242b8 100644 --- a/pkgs/by-name/dj/djvulibre/package.nix +++ b/pkgs/by-name/dj/djvulibre/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "djvulibre"; - version = "3.5.29"; + version = "3.5.30"; src = fetchurl { url = "mirror://sourceforge/djvu/djvulibre-${finalAttrs.version}.tar.gz"; - hash = "sha256-07SwOuK9yoUWo2726ye3d/BSjJ7aJnRdmWKCSj/f7M8="; + hash = "sha256-7l5FfUz+vlZvlLmeXj08x/XHndt0HCrCui5FbwAylkQ="; }; outputs = [ diff --git a/pkgs/by-name/dl/dlib/package.nix b/pkgs/by-name/dl/dlib/package.nix index a7c802197ac2..2f6626069135 100644 --- a/pkgs/by-name/dl/dlib/package.nix +++ b/pkgs/by-name/dl/dlib/package.nix @@ -76,7 +76,7 @@ libcurand libcusolver cudnn - cuda_cccl + cccl ] ); diff --git a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix index fa9419037b81..feda0b20daeb 100644 --- a/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix +++ b/pkgs/by-name/dm/dmarc-metrics-exporter/package.nix @@ -1,16 +1,11 @@ { lib, stdenv, - python312, + python3Packages, fetchFromGitHub, }: -let - # more-itertools unsupported on 3.13 - python3 = python312; -in - -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "dmarc-metrics-exporter"; version = "1.3.1"; @@ -25,15 +20,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonRelaxDeps = true; - build-system = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; dependencies = - with python3.pkgs; + with python3Packages; [ bite-parser - dataclasses-serialization prometheus-client pydantic structlog @@ -42,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ] ++ uvicorn.optional-dependencies.standard; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ aiohttp pytest-asyncio pytestCheckHook diff --git a/pkgs/by-name/dm/dmd/binary.nix b/pkgs/by-name/dm/dmd/binary.nix index 395468f59ac5..fec299c9976d 100644 --- a/pkgs/by-name/dm/dmd/binary.nix +++ b/pkgs/by-name/dm/dmd/binary.nix @@ -86,7 +86,6 @@ stdenv.mkDerivation { maintainers = [ lib.maintainers.lionello ]; homepage = "https://dlang.org/"; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/dm/dmd/generic.nix b/pkgs/by-name/dm/dmd/generic.nix index 971addbeaf51..4408faabee09 100644 --- a/pkgs/by-name/dm/dmd/generic.nix +++ b/pkgs/by-name/dm/dmd/generic.nix @@ -242,7 +242,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; # ld: section __DATA/__thread_bss has type zero-fill but non-zero file offset file '/private/tmp/nix-build-dmd-2.109.1.drv-0/.rdmd-301/rdmd-build.d-A1CF043A7D87C5E88A58F3C0EF5A0DF7/objs/build.o' for architecture x86_64 # clang-16: error: linker command failed with exit code 1 (use -v to see invocation) diff --git a/pkgs/by-name/dm/dmenu-rs/package.nix b/pkgs/by-name/dm/dmenu-rs/package.nix index 70ac55438b09..993749044cfc 100644 --- a/pkgs/by-name/dm/dmenu-rs/package.nix +++ b/pkgs/by-name/dm/dmenu-rs/package.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { "Pixel perfect port of dmenu, rewritten in Rust with extensive plugin support" + lib.optionalString enablePlugins ", with all upstream plugins enabled"; homepage = "https://github.com/Shizcow/dmenu-rs"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ benjaminedwardwebb ]; platforms = lib.platforms.linux; broken = stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64; diff --git a/pkgs/by-name/dm/dmrconfig/package.nix b/pkgs/by-name/dm/dmrconfig/package.nix index f3153fb3748d..80fc8a537dbf 100644 --- a/pkgs/by-name/dm/dmrconfig/package.nix +++ b/pkgs/by-name/dm/dmrconfig/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.1"; src = fetchFromGitHub { - owner = "sergev"; + owner = "OpenRTX"; repo = "dmrconfig"; rev = finalAttrs.version; sha256 = "1qwix75z749628w583fwp7m7kxbj0k3g159sxb7vgqxbadqqz1ab"; @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { longDescription = '' DMRconfig is a utility for programming digital radios via USB programming cable. ''; - homepage = "https://github.com/sergev/dmrconfig"; + homepage = "https://github.com/OpenRTX/dmrconfig"; license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/dm/dms-shell/package.nix b/pkgs/by-name/dm/dms-shell/package.nix index 033bf01d20c9..d1df7ebadd33 100644 --- a/pkgs/by-name/dm/dms-shell/package.nix +++ b/pkgs/by-name/dm/dms-shell/package.nix @@ -28,18 +28,18 @@ buildGoModule ( in { pname = "dms-shell"; - version = "1.4.6"; + version = "1.5.2"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "DankMaterialShell"; tag = "v${finalAttrs.version}"; - hash = "sha256-g6r/Gx8PTDzO3jCNzzySA+Ff1lmLF9nDlMCNyyoQjoE="; + hash = "sha256-7VjoVZu+8PC41ZDQ3umi/EXsU3sCLNyRfxZrfJKHy+E="; }; sourceRoot = "${finalAttrs.src.name}/core"; - vendorHash = "sha256-cVUJXgzYMRSM0od1xzDVkMTdxHu3OIQX2bQ8AJbGQ1Q="; + vendorHash = "sha256-nvxFHQhOfBGl3h51fgYDb39K0NCj+H8mAEyKr1qOwJQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/dn/dn42-registry-wizard/package.nix b/pkgs/by-name/dn/dn42-registry-wizard/package.nix index 3bbe574b6dd9..c5b96fd7565f 100644 --- a/pkgs/by-name/dn/dn42-registry-wizard/package.nix +++ b/pkgs/by-name/dn/dn42-registry-wizard/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dn42-registry-wizard"; - version = "0.4.20"; + version = "0.4.21"; src = fetchFromGitHub { owner = "Kioubit"; repo = "dn42_registry_wizard"; tag = "v${finalAttrs.version}"; - hash = "sha256-WFU1K0Ib1ETSib2WJkwus3zHYJXoVOtFDqv4/QNiP7E="; + hash = "sha256-PvB+rlIaedjCVA/8sDW754vvomVASIDhkUQlimZGiRg="; }; - cargoHash = "sha256-o8MF6uqk8f0Zc2fjBqLGElh56TKjLRRtNxrll5nY+bM="; + cargoHash = "sha256-tSxxsRQCbbP6iRT8sNfA/JVLm72PsSSCsC80hD5ZVxw="; postInstall = '' mv $out/bin/{registry_wizard,dn42-registry-wizard} diff --git a/pkgs/by-name/dn/dns-collector/package.nix b/pkgs/by-name/dn/dns-collector/package.nix index 3a113a35d490..a3dadd98a0b7 100644 --- a/pkgs/by-name/dn/dns-collector/package.nix +++ b/pkgs/by-name/dn/dns-collector/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "dns-collector"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dmachard"; repo = "dns-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-5SFdTDuXnVdMFGxoraUMbDV3o476sc9c7D9qWBoQXr4="; + hash = "sha256-Gm5PXEEgw98NnsfKN8JxhyTqEL9KSA6L2CgRTRJirdY="; }; subPackages = [ "." ]; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { "-X=github.com/prometheus/common/version.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-eoUsiRGtq1ucAIyeCRNEuro2Qj4iRe+3aE8DrqIcCWs="; + vendorHash = "sha256-pEex5xu3Cf6vqFp7YLwk+Ku+Yc0coOGLXP7/NUtDYbg="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/dn/dnscontrol/package.nix b/pkgs/by-name/dn/dnscontrol/package.nix index 0764db1ccbbb..21ca02b2a62d 100644 --- a/pkgs/by-name/dn/dnscontrol/package.nix +++ b/pkgs/by-name/dn/dnscontrol/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "dnscontrol"; - version = "4.41.0"; + version = "4.43.0"; src = fetchFromGitHub { owner = "DNSControl"; repo = "dnscontrol"; tag = "v${finalAttrs.version}"; - hash = "sha256-oz4hF3W6QKjPda/6AZ7djeZr32oFMqdMD34gWLMnFRQ="; + hash = "sha256-7t/j6vLeoYHTf7wMIZ1hns1Uo0udEqTu/0K/96C5aPQ="; }; - vendorHash = "sha256-DQmfwSPdUnoSmVDiKlwrHifKR59KuMe+0DGJtavpmLc="; + vendorHash = "sha256-NEFfYDLo/UiITlUd7XptBmWesJQexvaXH95gyMpgNqA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dn/dnsdiag/package.nix b/pkgs/by-name/dn/dnsdiag/package.nix index c8ea4d44d03b..35a5eac422d3 100644 --- a/pkgs/by-name/dn/dnsdiag/package.nix +++ b/pkgs/by-name/dn/dnsdiag/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "dnsdiag"; - version = "2.9.3"; + version = "2.9.4"; pyproject = true; src = fetchFromGitHub { owner = "farrokhi"; repo = "dnsdiag"; tag = "v${finalAttrs.version}"; - hash = "sha256-CMWjPgdYRL730AkC+PZaDAeefq9jCbO4o3RcdlIqsmU="; + hash = "sha256-R/yv3cPohMQ+DoUj1cvm96Ts2+QFy+SQQoji+HADf8U="; }; pythonRelaxDeps = [ "cryptography" ]; diff --git a/pkgs/by-name/dn/dnsdist/package.nix b/pkgs/by-name/dn/dnsdist/package.nix index 958710ca6aa1..4da51ddf2a40 100644 --- a/pkgs/by-name/dn/dnsdist/package.nix +++ b/pkgs/by-name/dn/dnsdist/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "dnsdist"; - version = "2.0.5"; + version = "2.0.7"; src = fetchurl { url = "https://downloads.powerdns.com/releases/dnsdist-${finalAttrs.version}.tar.xz"; - hash = "sha256-I8Z9usIeVWTflbZ4merP7sfXwZQRiqv5jODnY8zVx64="; + hash = "sha256-WGgPeAUXt4fmT+5M1NzFf0Ob5gcIT4nuRpl4nX1iaHU="; }; nativeBuildInputs = [ @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) cargoRoot src; - hash = "sha256-0CfOkjMe3p7xg62jlS3ASZRlr+/nqIJLRyRT+jcDiHQ="; + hash = "sha256-xFh+cywfNWalzRfCtM2pPtPfq8/RAlTC1EdZYYEiwxA="; }; cargoRoot = "dnsdist-rust-lib/rust"; @@ -89,11 +89,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests = { - inherit (nixosTests) dnsdist; - }; + passthru.tests = nixosTests.dnsdist; meta = { + changelog = "https://www.dnsdist.org/changelog.html"; description = "DNS Loadbalancer"; mainProgram = "dnsdist"; homepage = "https://dnsdist.org"; diff --git a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch b/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch deleted file mode 100644 index 62249150aa3b..000000000000 --- a/pkgs/by-name/dn/dnsmasq/CVE-2026-6507.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 9ad74926d4f7f34ff902e1db5235535aa813c33f Mon Sep 17 00:00:00 2001 -From: Simon Kelley -Date: Mon, 6 Apr 2026 22:22:43 +0100 -Subject: [PATCH] Fix 1-byte buffer overflow in relay_reply4() - -Potential SIGSEGV when using DHCPv4-relay. - -Thanks to Asim Viladi Oglu Manizada for finding this. ---- - src/rfc2131.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/rfc2131.c b/src/rfc2131.c -index 7bdfefd..55aad03 100644 ---- a/src/rfc2131.c -+++ b/src/rfc2131.c -@@ -3248,7 +3248,7 @@ unsigned int relay_reply4(struct dhcp_packet *mess, size_t sz, char *arrival_int - - /* delete agent info before return RFC 3046 para 2.1 */ - *opt = OPTION_END; -- memset(opt + 1, 0, option_len(opt) + 2); -+ memset(opt + 1, 0, option_len(opt) + 1); - } - } - else if (mess->giaddr.s_addr == relay->local.addr4.s_addr) --- -2.20.1 - diff --git a/pkgs/by-name/dn/dnsmasq/package.nix b/pkgs/by-name/dn/dnsmasq/package.nix index 6665b9776527..e757543b412a 100644 --- a/pkgs/by-name/dn/dnsmasq/package.nix +++ b/pkgs/by-name/dn/dnsmasq/package.nix @@ -4,7 +4,7 @@ fetchurl, pkg-config, nettle, - libidn, + libidn2, libnetfilter_conntrack, nftables, buildPackages, @@ -16,7 +16,7 @@ let copts = lib.concatStringsSep " " ( [ - "-DHAVE_IDN" + "-DHAVE_LIBIDN2" "-DHAVE_DNSSEC" ] ++ lib.optionals dbusSupport [ @@ -30,18 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dnsmasq"; - version = "2.92rel2"; + version = "2.93"; src = fetchurl { url = "https://www.thekelleys.org.uk/dnsmasq/dnsmasq-${finalAttrs.version}.tar.xz"; - hash = "sha256-Q9crjBKb3zPRe6/tyYgj9j5GtQBRKAZr8NKkcqMs4Go="; + hash = "sha256-DADU5cl8gwbl+5MrNIs0JpycKaDn3w6OgpWLQHCSvBk="; }; - patches = [ - # https://thekelleys.org.uk/gitweb/?p=dnsmasq.git;a=patch;h=9ad74926d4f7f34ff902e1db5235535aa813c33f - ./CVE-2026-6507.patch - ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' sed '1i#include ' -i src/dhcp.c ''; @@ -96,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; buildInputs = [ nettle - libidn + libidn2 ] ++ lib.optionals dbusSupport [ dbus ] ++ lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/dn/dnsmon-go/package.nix b/pkgs/by-name/dn/dnsmon-go/package.nix index 9fa7ae6bd15d..2757812bf968 100644 --- a/pkgs/by-name/dn/dnsmon-go/package.nix +++ b/pkgs/by-name/dn/dnsmon-go/package.nix @@ -25,7 +25,7 @@ buildGoModule { meta = { description = "Tool to collect DNS traffic"; homepage = "https://github.com/jonpulsifer/dnsmon-go"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsmon-go"; }; diff --git a/pkgs/by-name/dn/dnsproxy/package.nix b/pkgs/by-name/dn/dnsproxy/package.nix index d2fc76c85422..f620e39268fb 100644 --- a/pkgs/by-name/dn/dnsproxy/package.nix +++ b/pkgs/by-name/dn/dnsproxy/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "dnsproxy"; - version = "0.81.4"; + version = "0.83.0"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = "dnsproxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-KHun1/Da6wfOuMc9D8AJrgZg5PwuXAY6IVajSHa3rRE="; + hash = "sha256-ceeNS1Z2xQgZrouRTh48in+Z71dBj/dtnOYTPY/0az8="; }; - vendorHash = "sha256-dcT9miAerC7c9LsC8FoR61xFXLZjxm7LZlTRalB4oSU="; + vendorHash = "sha256-6skcvkErUm/0u7yk8p70tYnT4d1XLySw6arMgPnOzq8="; ldflags = [ "-s" diff --git a/pkgs/by-name/dn/dnsrecon/package.nix b/pkgs/by-name/dn/dnsrecon/package.nix index ea2a83998760..e3e107d34967 100644 --- a/pkgs/by-name/dn/dnsrecon/package.nix +++ b/pkgs/by-name/dn/dnsrecon/package.nix @@ -6,16 +6,21 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "dnsrecon"; - version = "1.6.0"; + version = "1.6.3"; pyproject = true; src = fetchFromGitHub { owner = "darkoperator"; repo = "dnsrecon"; tag = finalAttrs.version; - hash = "sha256-3o3UOEvaUVtfqZNAXzos7mtsAeUxJXtwNDw1MCKZ0YM="; + hash = "sha256-hDP+zCiZtZaVRYGLTISBjwETkh4LS+E+uBN862VEGdU="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools>=82.0.1" "setuptools" + ''; + pythonRelaxDeps = true; build-system = with python3.pkgs; [ setuptools ]; @@ -45,9 +50,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { homepage = "https://github.com/darkoperator/dnsrecon"; changelog = "https://github.com/darkoperator/dnsrecon/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ - fab - ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnsrecon"; }; }) diff --git a/pkgs/by-name/dn/dnst/package.nix b/pkgs/by-name/dn/dnst/package.nix index 1d14757abe54..ae7164e53545 100644 --- a/pkgs/by-name/dn/dnst/package.nix +++ b/pkgs/by-name/dn/dnst/package.nix @@ -10,14 +10,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dnst"; - version = "0.2.0-alpha2"; + version = "0.2.0-alpha3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "NLnetLabs"; repo = "dnst"; tag = "v${finalAttrs.version}"; - hash = "sha256-OpyOnBddbIdnJLchY5y2oMqK5JSXCTF8cC5KstJ7pnc="; + hash = "sha256-6Sgj2OZptG/bMsuYdGfaaY62qh4uUyxdbit6vpWWm9w="; }; nativeBuildInputs = [ @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = [ openssl ]; - cargoHash = "sha256-y048tMh5wBjAB7I8FK3pETn0j9S/h893JZb9sbOBdbo="; + cargoHash = "sha256-8pzf4GeBJbqIZf6KAqROEAvFAqtf6XLODWhS3RVfpAQ="; postInstall = '' mkdir -p $out/libexec @@ -39,7 +39,9 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage doc/manual/build/man/*.1 ''; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=unstable" ]; + }; meta = { description = "Toolset to assist DNS operators with zone and nameserver maintenance"; diff --git a/pkgs/by-name/dn/dnstwist/package.nix b/pkgs/by-name/dn/dnstwist/package.nix index 99e4d20638d4..135402b4d8de 100644 --- a/pkgs/by-name/dn/dnstwist/package.nix +++ b/pkgs/by-name/dn/dnstwist/package.nix @@ -40,7 +40,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Domain name permutation engine for detecting homograph phishing attacks"; homepage = "https://github.com/elceef/dnstwist"; changelog = "https://github.com/elceef/dnstwist/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "dnstwist"; }; diff --git a/pkgs/by-name/dn/dnsx/package.nix b/pkgs/by-name/dn/dnsx/package.nix index cd8d26cb4454..c26ba739c201 100644 --- a/pkgs/by-name/dn/dnsx/package.nix +++ b/pkgs/by-name/dn/dnsx/package.nix @@ -7,33 +7,24 @@ buildGoModule (finalAttrs: { pname = "dnsx"; - version = "1.2.3"; + version = "1.3.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "dnsx"; tag = "v${finalAttrs.version}"; - hash = "sha256-XtjNdqUS1l6Ct5s+OXmmwvpuckKTaHD2S4tn39Tvf1Y="; + hash = "sha256-325pwIcI8YjHA1K+gF3NA1LCP9dyZRJW4eKxm2AQyB8="; }; - vendorHash = "sha256-ng0S/oFnrSlJ6a2UIZ3IrZx0Tb8Mru9BOuHBqH/1ctU="; + vendorHash = "sha256-ep9IN/aPWy4N5HADh4U5T6XeBnm0YB5Tv8yeaqBxZi0="; subPackages = [ "cmd/dnsx" ]; - nativeInstallCheckInputs = [ versionCheckHook ]; - - ldflags = [ - "-s" - "-w" - ]; + ldflags = [ "-s" ]; # Tests require network access doCheck = false; - doInstallCheck = true; - - versionCheckProgramArg = "-version"; - meta = { description = "Fast and multi-purpose DNS toolkit"; longDescription = '' diff --git a/pkgs/by-name/do/doas-sudo-shim/package.nix b/pkgs/by-name/do/doas-sudo-shim/package.nix index bc7a005210d4..e973b4d526ea 100644 --- a/pkgs/by-name/do/doas-sudo-shim/package.nix +++ b/pkgs/by-name/do/doas-sudo-shim/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "doas-sudo-shim"; - version = "0.1.2"; + version = "0.2.0"; src = fetchFromGitHub { owner = "jirutka"; repo = "doas-sudo-shim"; rev = "v${version}"; - sha256 = "sha256-jgakKxglJi4LcxXsSE4mEdY/44kPxVb/jF7CgX7dllA="; + sha256 = "sha256-USSakVUzCbUY1DJLmDCiwdq/xjOwwnm3VtXBBeXeV1A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/doc2dash/package.nix b/pkgs/by-name/do/doc2dash/package.nix new file mode 100644 index 000000000000..fb5609690a05 --- /dev/null +++ b/pkgs/by-name/do/doc2dash/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + python3Packages, + nix-update-script, +}: +python3Packages.buildPythonApplication (finalAttrs: { + pname = "doc2dash"; + version = "3.1.0"; + pyproject = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "hynek"; + repo = "doc2dash"; + tag = finalAttrs.version; + hash = "sha256-u6K+BDc9tUxq4kCekTaqQLtNN/OLVc3rh14sVSfPtoQ="; + }; + + build-system = with python3Packages; [ + hatchling + hatch-vcs + hatch-fancy-pypi-readme + ]; + + dependencies = with python3Packages; [ + attrs + beautifulsoup4 + click + rich + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + pytest-cov-stub + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + changelog = "https://github.com/hynek/doc2dash/releases/tag/${finalAttrs.src.tag}"; + description = "Create docsets for Dash.app-compatible API browsers"; + homepage = "https://doc2dash.hynek.me"; + license = with lib.licenses; [ mit ]; + maintainers = [ lib.maintainers.pyrox0 ]; + mainProgram = "doc2dash"; + }; +}) diff --git a/pkgs/by-name/do/dockbarx/package.nix b/pkgs/by-name/do/dockbarx/package.nix index 7c7f20fd283c..d26dd806c34c 100644 --- a/pkgs/by-name/do/dockbarx/package.nix +++ b/pkgs/by-name/do/dockbarx/package.nix @@ -44,7 +44,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pillow pygobject3 pyxdg - xlib + python-xlib ]; # no tests diff --git a/pkgs/by-name/do/docker-credential-env/package.nix b/pkgs/by-name/do/docker-credential-env/package.nix index 576d48462d66..93caed4ed95c 100644 --- a/pkgs/by-name/do/docker-credential-env/package.nix +++ b/pkgs/by-name/do/docker-credential-env/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "docker-credential-env"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "isometry"; repo = "docker-credential-env"; tag = "v${finalAttrs.version}"; - hash = "sha256-EqSlbgGOuGQ2Y7aZ4MqUBgWK0aVI7Afi/KAxfdVu0zE="; + hash = "sha256-KsOLY1XDJVrsm2rnDCffPqtlD2yw+arWsJaItwoOyUQ="; }; - vendorHash = "sha256-JTrFRpRjdLXKTvj7I2KYcIsFfuWLHPnjKV+3Q6b6DDs="; + vendorHash = "sha256-Qr6T7NJaJcFD0EYuPS7mWJi0tjyut1aQ+Wbarc0tpGY="; ldflags = let diff --git a/pkgs/by-name/do/docker-credential-helpers/package.nix b/pkgs/by-name/do/docker-credential-helpers/package.nix index a48170c3140d..c98b49551dcb 100644 --- a/pkgs/by-name/do/docker-credential-helpers/package.nix +++ b/pkgs/by-name/do/docker-credential-helpers/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "docker-credential-helpers"; - version = "0.9.7"; + version = "0.9.8"; src = fetchFromGitHub { owner = "docker"; repo = "docker-credential-helpers"; rev = "v${version}"; - sha256 = "sha256-HgioRk6qz9H9KD0JWcYg2bIpqHZxnPHYc3idxMUKuD8="; + sha256 = "sha256-xioDtn0/4CZytaUhRXb2T5DHnP/yWdXPeNTQoKf9AoA="; }; vendorHash = null; diff --git a/pkgs/by-name/do/docker-sbx/package.nix b/pkgs/by-name/do/docker-sbx/package.nix new file mode 100644 index 000000000000..74cecebba681 --- /dev/null +++ b/pkgs/by-name/do/docker-sbx/package.nix @@ -0,0 +1,128 @@ +{ + lib, + fetchurl, + stdenvNoCC, + installShellFiles, + autoPatchelfHook, + makeWrapper, + gccForLibs, + e2fsprogs, + lz4, + xxhash, + zlib, + zstd, + versionCheckHook, + nix-update-script, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "docker-sbx"; + version = "0.34.0"; + src = + if stdenvNoCC.hostPlatform.system == "x86_64-linux" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-amd64.tar.gz"; + hash = "sha256-5H9LOyKi0/SBVJ0ld6OkcP1h9r9eHrAb4fsVVVdMusg="; + } + else if stdenvNoCC.hostPlatform.system == "aarch64-linux" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-linux-arm64.tar.gz"; + hash = "sha256-dZ/ttnmaf62rA5Cs8YSmZGHVQoy9PQh3Ok/AnIjCqZ4="; + } + else if stdenvNoCC.hostPlatform.system == "aarch64-darwin" then + fetchurl { + url = "https://github.com/docker/sbx-releases/releases/download/v${finalAttrs.version}/DockerSandboxes-darwin.tar.gz"; + hash = "sha256-aBh6NbtQ5o2zxuR+d1U1gZpm2bch/J3Y8GZ73DeUBUk="; + } + else + throw "Unsupported host platform ${stdenvNoCC.hostPlatform.system}"; + + strictDeps = true; + __structuredAttrs = true; + + sourceRoot = if stdenvNoCC.hostPlatform.isDarwin then "." else null; + + nativeBuildInputs = [ + installShellFiles + versionCheckHook + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isLinux [ + autoPatchelfHook + makeWrapper + e2fsprogs + ]; + + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + lz4 + zlib + zstd + xxhash + gccForLibs + ]; + + dontBuild = true; + doInstallCheck = true; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + preVersionCheck = '' + export HOME=$TMPDIR + ''; + + installPhase = + if stdenvNoCC.hostPlatform.isLinux then + '' + runHook preInstall + + PREFIX=$out bash ./install.sh + + wrapProgram $out/bin/sbx \ + --prefix PATH : ${lib.makeBinPath [ e2fsprogs ]} + + ${lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + export HOME=$TMPDIR + $out/bin/sbx completion bash > sbx.bash + $out/bin/sbx completion fish > sbx.fish + $out/bin/sbx completion zsh > sbx.zsh + installShellCompletion sbx.{bash,fish,zsh} + ''} + + runHook postInstall + '' + else + '' + runHook preInstall + + mkdir -pv $out + cp -rv bin libexec $out + + installShellCompletion \ + --bash --name sbx.bash completions/bash/sbx \ + --zsh --name _sbx completions/zsh/_sbx \ + --fish --name sbx.fish completions/fish/sbx.fish + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Safe environments for agents"; + longDescription = '' + Docker Sandboxes provides sandboxes with controlled access to your + filesystem, network, and tools. This means your agents can work + autonomously without putting your machine or data at risk. + ''; + homepage = "https://docs.docker.com/reference/cli/sbx/"; + changelog = "https://github.com/docker/sbx-releases/releases/tag/v${finalAttrs.version}"; + mainProgram = "sbx"; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + license = lib.licenses.unfree; + maintainers = [ + lib.maintainers.skyesoss + lib.maintainers.erics118 + ]; + }; +}) diff --git a/pkgs/by-name/do/dockerfmt/package.nix b/pkgs/by-name/do/dockerfmt/package.nix index fc5c4eec4d9c..9718e4391224 100644 --- a/pkgs/by-name/do/dockerfmt/package.nix +++ b/pkgs/by-name/do/dockerfmt/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "dockerfmt"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitHub { owner = "reteps"; repo = "dockerfmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-WfwrFe3E+CzfZ0ITSjMD8h4yrG+mnC6y0L+7OSYjMsw="; + hash = "sha256-j6Y0L6tr7BSoC1RWPE0vzUrIND7CBg3RuGoHzuvJHXI="; }; vendorHash = "sha256-r8vmbZ4oyplqIU6R/6hhcyjoR3E/mOFrB69TrfPYxRI="; diff --git a/pkgs/by-name/do/doctest/package.nix b/pkgs/by-name/do/doctest/package.nix index f6ffd1b9e559..cbea1dcba749 100644 --- a/pkgs/by-name/do/doctest/package.nix +++ b/pkgs/by-name/do/doctest/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doctest"; - version = "2.5.0"; + version = "2.5.2"; src = fetchFromGitHub { owner = "doctest"; repo = "doctest"; tag = "v${finalAttrs.version}"; - hash = "sha256-7t/eknv7VtHoBgcuJmI07x//HIyqzE9HUuH5u2y7X8A="; + hash = "sha256-4jW6xPFCFxk1l47EkSUVojhycrtluPhOc5Adf/25R7M="; }; nativeBuildInputs = [ cmake ]; @@ -27,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; meta = { + changelog = "https://github.com/doctest/doctest/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/doctest/doctest"; description = "Fastest feature-rich C++11/14/17/20 single-header testing framework"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/do/doctoc/package.nix b/pkgs/by-name/do/doctoc/package.nix index 1f7bde794ff3..b1e918aeec28 100644 --- a/pkgs/by-name/do/doctoc/package.nix +++ b/pkgs/by-name/do/doctoc/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "doctoc"; - version = "2.2.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "thlorenz"; repo = "doctoc"; rev = "v${version}"; - hash = "sha256-LYVxW8bZ4M87CmBvPyp4y0IeL9UFawwAKnUWHEWB5Gs="; + hash = "sha256-EmTZLy/eHtJ0Wi8EFP2lHdFKBut/8/aghRKZr1WHcNk="; }; - npmDepsHash = "sha256-TbAnFpiN/v6xjQQznL/B180f0W48HPRqW21cO9XZhYA="; + npmDepsHash = "sha256-rY9acsWMcR6cf9k0/rSoBvhuk96Yj8Yt8uhsC8dyQZU="; postInstall = '' find $out/lib/node_modules -xtype l -delete diff --git a/pkgs/by-name/do/documenso/package-lock.json.patch b/pkgs/by-name/do/documenso/package-lock.json.patch index 875cba7457ad..b14bd0071721 100644 --- a/pkgs/by-name/do/documenso/package-lock.json.patch +++ b/pkgs/by-name/do/documenso/package-lock.json.patch @@ -1,167 +1,258 @@ diff --git a/package-lock.json b/package-lock.json -index 1a647e8..d44033c 100644 +index cb4e523..51f3b56 100644 --- a/package-lock.json +++ b/package-lock.json -@@ -16,7 +16,6 @@ - "@documenso/prisma": "^0.0.0", - "@lingui/conf": "^5.2.0", - "@lingui/core": "^5.2.0", -- "inngest-cli": "^0.29.1", - "luxon": "^3.5.0", - "mupdf": "^1.0.0", - "react": "^18", -@@ -41,7 +40,7 @@ - "prisma-extension-kysely": "^3.0.0", - "prisma-kysely": "^1.8.0", - "rimraf": "^5.0.1", -- "turbo": "^1.9.3", -+ "turbo": "^2.5.8", - "vite": "^6.3.5" - }, - "engines": { -@@ -13223,15 +13222,6 @@ - "node": ">=0.4.0" +@@ -46,7 +46,6 @@ + "dotenv-cli": "^11.0.0", + "husky": "^9.1.7", + "inngest": "^3.54.0", +- "inngest-cli": "^1.17.9", + "lint-staged": "^16.2.7", + "nanoid": "^5.1.6", + "nodemailer": "^8.0.5", +@@ -61,7 +60,7 @@ + "rimraf": "^6.1.2", + "superjson": "^2.2.5", + "syncpack": "^14.0.0-alpha.27", +- "turbo": "^1.13.4", ++ "turbo": "^2.10.1", + "vite": "^7.2.4", + "vite-plugin-static-copy": "^3.1.4", + "zod-openapi": "^4.2.4", +@@ -4519,19 +4518,6 @@ + "url": "https://github.com/chalk/strip-ansi?sponsor=1" + } + }, +- "node_modules/@isaacs/fs-minipass": { +- "version": "4.0.1", +- "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", +- "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", +- "dev": true, +- "license": "ISC", +- "dependencies": { +- "minipass": "^7.0.4" +- }, +- "engines": { +- "node": ">=18.0.0" +- } +- }, + "node_modules/@jest/schemas": { + "version": "29.6.3", + "resolved": "https://registry.npmjs.org/@jest/schemas/-/schemas-29.6.3.tgz", +@@ -13599,6 +13585,90 @@ + } + } + }, ++ "node_modules/@turbo/darwin-64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/darwin-64/-/darwin-64-2.10.1.tgz", ++ "integrity": "sha512-EjfrTXVmT0r4Spv+nu1KRcvjqavCq35F5GRCvoxQi83uoX3wxQ2QTgDkSxO8O4HVXyi28dW0of/y2RFBOD4emA==", ++ "cpu": [ ++ "x64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ] ++ }, ++ "node_modules/@turbo/darwin-arm64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/darwin-arm64/-/darwin-arm64-2.10.1.tgz", ++ "integrity": "sha512-nVNvaJ7aHxF5zBw8Nc9Er2Iw8A/SPAw25sqlu/63/qGfDMGdarRYrxjdM0O0XK8X8bGg3Yr93Ro7I5tJksrfgA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "darwin" ++ ] ++ }, ++ "node_modules/@turbo/linux-64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/linux-64/-/linux-64-2.10.1.tgz", ++ "integrity": "sha512-jaYr5GQGfW2jMkoux7/Yh+pUhKgqBM0pyAZnNTUybnVPy4qB2jP0C4B32Nmg00BYaAU3FaWr/bQ3CKKIYjdI2Q==", ++ "cpu": [ ++ "x64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ] ++ }, ++ "node_modules/@turbo/linux-arm64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/linux-arm64/-/linux-arm64-2.10.1.tgz", ++ "integrity": "sha512-2Wg5TBGYQjaPMJhQzYf0EEM9N5mSE3AKmWBWKz6fsjZ8dlLL4uV7X3PnwtNO1+kRYjwg34ilJwweaT8MvxZOcA==", ++ "cpu": [ ++ "arm64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "linux" ++ ] ++ }, ++ "node_modules/@turbo/windows-64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/windows-64/-/windows-64-2.10.1.tgz", ++ "integrity": "sha512-fRCK6wZiWQgE5fb+WpaBgDsHNo/fKcCoMEOms9E5Il/Bp/ec9uhsVNn0V/2gmN2hSCyFm7oKf0BZY6Lb6CDMOQ==", ++ "cpu": [ ++ "x64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ] ++ }, ++ "node_modules/@turbo/windows-arm64": { ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/@turbo/windows-arm64/-/windows-arm64-2.10.1.tgz", ++ "integrity": "sha512-6REIwRpmmnJdHYL+fIv2BGBC9PYd+8Ta+J53nmcHjqi46v/z+hS1sirYU5fg7Cg1r9/99dpRtSXHKTgvcLYSpg==", ++ "cpu": [ ++ "arm64" ++ ], ++ "dev": true, ++ "license": "MIT", ++ "optional": true, ++ "os": [ ++ "win32" ++ ] ++ }, + "node_modules/@tybys/wasm-util": { + "version": "0.10.1", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", +@@ -14520,16 +14590,6 @@ + "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/adm-zip": { - "version": "0.5.16", - "resolved": "https://registry.npmjs.org/adm-zip/-/adm-zip-0.5.16.tgz", - "integrity": "sha512-TGw5yVi4saajsSEgz25grObGHEUaDrniwvA2qwSC060KfqGPdglhvPMA2lPIoxs3PQIItj2iag35fONcQqgUaQ==", +- "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0" - } - }, "node_modules/agent-base": { - "version": "7.1.3", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.3.tgz", -@@ -14705,6 +14695,7 @@ - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", - "license": "ISC", -+ "optional": true, - "engines": { - "node": ">=10" + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", +@@ -15567,16 +15627,6 @@ + "fsevents": "~2.3.1" } -@@ -19315,6 +19306,7 @@ - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", - "license": "ISC", -+ "optional": true, - "dependencies": { - "minipass": "^3.0.0" - }, -@@ -19327,6 +19319,7 @@ - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", -+ "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, -@@ -19338,7 +19331,8 @@ - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -- "license": "ISC" -+ "license": "ISC", -+ "optional": true }, - "node_modules/fs.realpath": { - "version": "1.0.0", -@@ -21227,23 +21221,6 @@ +- "node_modules/chownr": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", +- "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", +- "dev": true, +- "license": "BlueOak-1.0.0", +- "engines": { +- "node": ">=18" +- } +- }, + "node_modules/ci-info": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.9.0.tgz", +@@ -20684,24 +20734,6 @@ } } }, - "node_modules/inngest-cli": { -- "version": "0.29.9", -- "resolved": "https://registry.npmjs.org/inngest-cli/-/inngest-cli-0.29.9.tgz", -- "integrity": "sha512-H02T7DGG53WV38RswpWmz7JsZXajx+uXDi1Zgq/ON5a+fNQi4hVRkxfoiZLngNeROVVXlokMTBwOShdsrnr7WA==", +- "version": "1.17.9", +- "resolved": "https://registry.npmjs.org/inngest-cli/-/inngest-cli-1.17.9.tgz", +- "integrity": "sha512-4s2pwwiDiNS2AAWvX/pWXSnqyGE5b9Uf0qj2MlWmSVCzTNNwoxNWu6GEDfISWnyV2CMAq41CwuzcYzzLmqcNuA==", +- "dev": true, - "hasInstallScript": true, - "license": "SEE LICENSE IN LICENSE.md", - "dependencies": { - "adm-zip": "^0.5.10", - "debug": "^4.3.4", -- "node-fetch": "2.6.7", -- "tar": "6.2.1" +- "node-fetch": "^2.6.7", +- "tar": "^7.5.3" - }, - "bin": { - "inngest": "bin/inngest", - "inngest-cli": "bin/inngest" - } - }, - "node_modules/inngest/node_modules/@opentelemetry/api": { - "version": "1.9.0", - "resolved": "https://registry.npmjs.org/@opentelemetry/api/-/api-1.9.0.tgz", -@@ -25470,6 +25447,7 @@ - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", - "license": "MIT", -+ "optional": true, - "dependencies": { - "minipass": "^3.0.0", - "yallist": "^4.0.0" -@@ -25483,6 +25461,7 @@ - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", - "license": "ISC", -+ "optional": true, - "dependencies": { - "yallist": "^4.0.0" - }, -@@ -25494,13 +25473,15 @@ - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -- "license": "ISC" -+ "license": "ISC", -+ "optional": true - }, - "node_modules/mkdirp": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", - "license": "MIT", -+ "optional": true, - "bin": { - "mkdirp": "bin/cmd.js" - }, -@@ -32780,6 +32761,7 @@ - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", - "license": "ISC", -+ "optional": true, - "dependencies": { - "chownr": "^2.0.0", - "fs-minipass": "^2.0.0", -@@ -32838,6 +32820,7 @@ - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", - "license": "ISC", -+ "optional": true, - "engines": { - "node": ">=8" + "node_modules/inngest/node_modules/ansi-regex": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz", +@@ -23587,19 +23619,6 @@ + "node": ">=16 || 14 >=14.17" } -@@ -32846,7 +32829,8 @@ - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", -- "license": "ISC" -+ "license": "ISC", -+ "optional": true }, - "node_modules/temp-dir": { - "version": "2.0.0", -@@ -34050,102 +34034,102 @@ +- "node_modules/minizlib": { +- "version": "3.1.0", +- "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", +- "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "minipass": "^7.1.2" +- }, +- "engines": { +- "node": ">= 18" +- } +- }, + "node_modules/mlly": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.0.tgz", +@@ -28767,33 +28786,6 @@ + "url": "https://opencollective.com/webpack" } }, +- "node_modules/tar": { +- "version": "7.5.13", +- "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.13.tgz", +- "integrity": "sha512-tOG/7GyXpFevhXVh8jOPJrmtRpOTsYqUIkVdVooZYJS/z8WhfQUX8RJILmeuJNinGAMSu1veBr4asSHFt5/hng==", +- "dev": true, +- "license": "BlueOak-1.0.0", +- "dependencies": { +- "@isaacs/fs-minipass": "^4.0.0", +- "chownr": "^3.0.0", +- "minipass": "^7.1.2", +- "minizlib": "^3.1.0", +- "yallist": "^5.0.0" +- }, +- "engines": { +- "node": ">=18" +- } +- }, +- "node_modules/tar/node_modules/yallist": { +- "version": "5.0.0", +- "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", +- "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", +- "dev": true, +- "license": "BlueOak-1.0.0", +- "engines": { +- "node": ">=18" +- } +- }, + "node_modules/teeny-request": { + "version": "10.1.2", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-10.1.2.tgz", +@@ -29178,107 +29170,23 @@ + "license": "0BSD" + }, "node_modules/turbo": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo/-/turbo-1.13.4.tgz", - "integrity": "sha512-1q7+9UJABuBAHrcC4Sxp5lOqYS5mvxRrwa33wpIyM18hlOCpRD/fTJNxZ0vhbMcJmz15o9kkVm743mPn7p6jpQ==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.5.8.tgz", -+ "integrity": "sha512-5c9Fdsr9qfpT3hA0EyYSFRZj1dVVsb6KIWubA9JBYZ/9ZEAijgUEae0BBR/Xl/wekt4w65/lYLTFaP3JmwSO8w==", ++ "version": "2.10.1", ++ "resolved": "https://registry.npmjs.org/turbo/-/turbo-2.10.1.tgz", ++ "integrity": "sha512-z9WGX2bAfElLOri8JY6pcwr+GfS18B5iGefLcvv3nwM9MoE/fPQQhpgZKTRlBciqGSDuLnfNyfP+eji8mEapQA==", "dev": true, - "license": "MPL-2.0", + "license": "MIT", @@ -175,615 +266,107 @@ index 1a647e8..d44033c 100644 - "turbo-linux-arm64": "1.13.4", - "turbo-windows-64": "1.13.4", - "turbo-windows-arm64": "1.13.4" -+ "turbo-darwin-64": "2.5.8", -+ "turbo-darwin-arm64": "2.5.8", -+ "turbo-linux-64": "2.5.8", -+ "turbo-linux-arm64": "2.5.8", -+ "turbo-windows-64": "2.5.8", -+ "turbo-windows-arm64": "2.5.8" ++ "@turbo/darwin-64": "2.10.1", ++ "@turbo/darwin-arm64": "2.10.1", ++ "@turbo/linux-64": "2.10.1", ++ "@turbo/linux-arm64": "2.10.1", ++ "@turbo/windows-64": "2.10.1", ++ "@turbo/windows-arm64": "2.10.1" } }, - "node_modules/turbo-darwin-64": { +- "node_modules/turbo-darwin-64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-1.13.4.tgz", - "integrity": "sha512-A0eKd73R7CGnRinTiS7txkMElg+R5rKFp9HV7baDiEL4xTG1FIg/56Vm7A5RVgg8UNgG2qNnrfatJtb+dRmNdw==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-darwin-64/-/turbo-darwin-64-2.5.8.tgz", -+ "integrity": "sha512-Dh5bCACiHO8rUXZLpKw+m3FiHtAp2CkanSyJre+SInEvEr5kIxjGvCK/8MFX8SFRjQuhjtvpIvYYZJB4AGCxNQ==", - "cpu": [ - "x64" - ], - "dev": true, +- "cpu": [ +- "x64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/turbo-darwin-arm64": { +- "optional": true, +- "os": [ +- "darwin" +- ] +- }, +- "node_modules/turbo-darwin-arm64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-1.13.4.tgz", - "integrity": "sha512-eG769Q0NF6/Vyjsr3mKCnkG/eW6dKMBZk6dxWOdrHfrg6QgfkBUk0WUUujzdtVPiUIvsh4l46vQrNVd9EOtbyA==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-darwin-arm64/-/turbo-darwin-arm64-2.5.8.tgz", -+ "integrity": "sha512-f1H/tQC9px7+hmXn6Kx/w8Jd/FneIUnvLlcI/7RGHunxfOkKJKvsoiNzySkoHQ8uq1pJnhJ0xNGTlYM48ZaJOQ==", - "cpu": [ - "arm64" - ], - "dev": true, +- "cpu": [ +- "arm64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/turbo-linux-64": { +- "optional": true, +- "os": [ +- "darwin" +- ] +- }, +- "node_modules/turbo-linux-64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-1.13.4.tgz", - "integrity": "sha512-Bq0JphDeNw3XEi+Xb/e4xoKhs1DHN7OoLVUbTIQz+gazYjigVZvtwCvgrZI7eW9Xo1eOXM2zw2u1DGLLUfmGkQ==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-linux-64/-/turbo-linux-64-2.5.8.tgz", -+ "integrity": "sha512-hMyvc7w7yadBlZBGl/bnR6O+dJTx3XkTeyTTH4zEjERO6ChEs0SrN8jTFj1lueNXKIHh1SnALmy6VctKMGnWfw==", - "cpu": [ - "x64" - ], - "dev": true, +- "cpu": [ +- "x64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/turbo-linux-arm64": { +- "optional": true, +- "os": [ +- "linux" +- ] +- }, +- "node_modules/turbo-linux-arm64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-1.13.4.tgz", - "integrity": "sha512-BJcXw1DDiHO/okYbaNdcWN6szjXyHWx9d460v6fCHY65G8CyqGU3y2uUTPK89o8lq/b2C8NK0yZD+Vp0f9VoIg==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-linux-arm64/-/turbo-linux-arm64-2.5.8.tgz", -+ "integrity": "sha512-LQELGa7bAqV2f+3rTMRPnj5G/OHAe2U+0N9BwsZvfMvHSUbsQ3bBMWdSQaYNicok7wOZcHjz2TkESn1hYK6xIQ==", - "cpu": [ - "arm64" - ], - "dev": true, +- "cpu": [ +- "arm64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/turbo-windows-64": { +- "optional": true, +- "os": [ +- "linux" +- ] +- }, +- "node_modules/turbo-windows-64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-1.13.4.tgz", - "integrity": "sha512-OFFhXHOFLN7A78vD/dlVuuSSVEB3s9ZBj18Tm1hk3aW1HTWTuAw0ReN6ZNlVObZUHvGy8d57OAGGxf2bT3etQw==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-windows-64/-/turbo-windows-64-2.5.8.tgz", -+ "integrity": "sha512-3YdcaW34TrN1AWwqgYL9gUqmZsMT4T7g8Y5Azz+uwwEJW+4sgcJkIi9pYFyU4ZBSjBvkfuPZkGgfStir5BBDJQ==", - "cpu": [ - "x64" - ], - "dev": true, +- "cpu": [ +- "x64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/turbo-windows-arm64": { +- "optional": true, +- "os": [ +- "win32" +- ] +- }, +- "node_modules/turbo-windows-arm64": { - "version": "1.13.4", - "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-1.13.4.tgz", - "integrity": "sha512-u5A+VOKHswJJmJ8o8rcilBfU5U3Y1TTAfP9wX8bFh8teYF1ghP0EhtMRLjhtp6RPa+XCxHHVA2CiC3gbh5eg5g==", -+ "version": "2.5.8", -+ "resolved": "https://registry.npmjs.org/turbo-windows-arm64/-/turbo-windows-arm64-2.5.8.tgz", -+ "integrity": "sha512-eFC5XzLmgXJfnAK3UMTmVECCwuBcORrWdewoiXBnUm934DY6QN8YowC/srhNnROMpaKaqNeRpoB5FxCww3eteQ==", - "cpu": [ - "arm64" - ], - "dev": true, +- "cpu": [ +- "arm64" +- ], +- "dev": true, - "license": "MPL-2.0", -+ "license": "MIT", - "optional": true, - "os": [ - "win32" -@@ -36114,7 +36098,9 @@ - }, - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.52.0.tgz", -+ "integrity": "sha512-uh6W7sb55hl7D6vsAeA+V2p5JnlAqzhqFyF0VcJkKZXkgnFcVG9PziERRHQfPLfNGx1C292a4JqbWzhR8L4R1g==" +- "optional": true, +- "os": [ +- "win32" +- ] +- }, + "node_modules/type-is": { + "version": "1.6.18", + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", +@@ -30550,6 +30458,8 @@ }, - "packages/app-tests/node_modules/start-server-and-test": { - "version": "2.0.12", -@@ -36136,25 +36122,33 @@ - }, - "engines": { - "node": ">=16" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/start-server-and-test/-/start-server-and-test-2.0.12.tgz", -+ "integrity": "sha512-U6QiS5qsz+DN5RfJJrkAXdooxMDnLZ+n5nR8kaX//ZH19SilF6b58Z3zM9zTfrNIkJepzauHo4RceSgvgUSX9w==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/bluebird": { - "version": "3.7.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", -+ "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/check-more-types": { - "version": "2.24.0", - "license": "MIT", - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/check-more-types/-/check-more-types-2.24.0.tgz", -+ "integrity": "sha512-Pj779qHxV2tuapviy1bSZNEL1maXr13bPYpsvSDB68HlYcYuhlDrmGd63i0JHMCLKzc7rUSNIrpdJlhVlNwrxA==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/lazy-ass": { - "version": "1.6.0", - "license": "MIT", - "engines": { - "node": "> 0.8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/lazy-ass/-/lazy-ass-1.6.0.tgz", -+ "integrity": "sha512-cc8oEVoctTvsFZ/Oje/kGnHbpWHYBe8IAJe4C0QNc3t8uM/0Y8+erSz/7Y1ALuXTEZTMvxXwO6YbX1ey3ujiZw==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree": { - "version": "1.2.0", -@@ -36167,7 +36161,9 @@ - }, - "engines": { - "node": ">= 0.10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ps-tree/-/ps-tree-1.2.0.tgz", -+ "integrity": "sha512-0VnamPPYHl4uaU/nSFeZZpR21QAWRz+sRv4iW9+v/GS/J5U5iZB5BNN6J0RMoOvdx2gWM2+ZFMIm58q24e4UYA==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream": { - "version": "3.3.4", -@@ -36180,18 +36176,26 @@ - "split": "0.3", - "stream-combiner": "~0.0.4", - "through": "~2.3.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/event-stream/-/event-stream-3.3.4.tgz", -+ "integrity": "sha512-QHpkERcGsR0T7Qm3HNJSyXKEEj8AHNxkY3PK8TS2KJvQ7NiSHe3DDpwVKKtoYprL/AreyzFBeIkBIWChAqn60g==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/duplexer": { - "version": "0.1.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", -+ "integrity": "sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/from": { - "version": "0.1.7", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/from/-/from-0.1.7.tgz", -+ "integrity": "sha512-twe20eF1OxVxp/ML/kq2p1uc6KvFK/+vs8WjEbeKmV2He22MKm7YF2ANIt+EOqhJ5L3K/SuuPhk0hWQDjOM23g==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/map-stream": { -- "version": "0.1.0" -+ "version": "0.1.0", -+ "resolved": "https://registry.npmjs.org/map-stream/-/map-stream-0.1.0.tgz", -+ "integrity": "sha512-CkYQrPYZfWnu/DAmVCpTSX/xHpKZ80eKh2lAkyA6AJTef6bW+6JpbQZN5rofum7da+SyN1bi5ctTm+lTfcCW3g==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/pause-stream": { - "version": "0.0.11", -@@ -36201,7 +36205,9 @@ - ], - "dependencies": { - "through": "~2.3" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pause-stream/-/pause-stream-0.0.11.tgz", -+ "integrity": "sha512-e3FBlXLmN/D1S+zHzanP4E/4Z60oFAa3O051qt1pxa7DEJWKAyil6upYVXCWadEnuoqa4Pkc9oUx9zsxYeRv8A==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/split": { - "version": "0.3.3", -@@ -36211,14 +36217,18 @@ - }, - "engines": { - "node": "*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/split/-/split-0.3.3.tgz", -+ "integrity": "sha512-wD2AeVmxXRBoX44wAycgjVpMhvbwdI2aZjCkvfNcH1YqHQvJVa1duWc73OyVGJUc05fhFaTZeQ/PYsrmyH0JVA==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/ps-tree/node_modules/event-stream/node_modules/stream-combiner": { - "version": "0.0.4", - "license": "MIT", - "dependencies": { - "duplexer": "~0.1.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/stream-combiner/-/stream-combiner-0.0.4.tgz", -+ "integrity": "sha512-rT00SPnTVyRsaSz5zgSPma/aHSOic5U1prhYdRy5HS2kTZviFpmDgzilbtsJsxiroqACmayynDN/9VzIbX5DOw==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on": { - "version": "8.0.3", -@@ -36235,7 +36245,9 @@ - }, - "engines": { - "node": ">=12.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wait-on/-/wait-on-8.0.3.tgz", -+ "integrity": "sha512-nQFqAFzZDeRxsu7S3C7LbuxslHhk+gnJZHyethuGKAn2IVleIbTB9I3vJSQiSR+DifUqmdzfPMoMPJfLqMF2vw==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi": { - "version": "17.13.3", -@@ -36246,40 +36258,54 @@ - "@sideway/address": "^4.1.5", - "@sideway/formula": "^3.0.1", - "@sideway/pinpoint": "^2.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz", -+ "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/hoek": { - "version": "9.3.0", -- "license": "BSD-3-Clause" -+ "license": "BSD-3-Clause", -+ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", -+ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@hapi/topo": { - "version": "5.1.0", - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^9.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", -+ "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/address": { - "version": "4.1.5", - "license": "BSD-3-Clause", - "dependencies": { - "@hapi/hoek": "^9.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sideway/address/-/address-4.1.5.tgz", -+ "integrity": "sha512-IqO/DUQHUkPeixNQ8n0JA6102hT9CmaljNTPmQ1u8MEhBo/R4Q8eKLN/vGZxuebwOroDB4cbpjheD4+/sKFK4Q==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/formula": { - "version": "3.0.1", -- "license": "BSD-3-Clause" -+ "license": "BSD-3-Clause", -+ "resolved": "https://registry.npmjs.org/@sideway/formula/-/formula-3.0.1.tgz", -+ "integrity": "sha512-/poHZJJVjx3L+zVD6g9KgHfYnb443oi7wLu/XKojDviHy6HOEOA6z1Trk5aR1dGcmPenJEgb2sK2I80LeS3MIg==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/joi/node_modules/@sideway/pinpoint": { - "version": "2.0.0", -- "license": "BSD-3-Clause" -+ "license": "BSD-3-Clause", -+ "resolved": "https://registry.npmjs.org/@sideway/pinpoint/-/pinpoint-2.0.0.tgz", -+ "integrity": "sha512-RNiOoTPkptFtSVzQevY/yWtZwf/RxyVnPy/OcA9HBM3MlGDnBEYL5B41H0MTn0Uec8Hi+2qUtTfG2WWZBmMejQ==" - }, - "packages/app-tests/node_modules/start-server-and-test/node_modules/wait-on/node_modules/rxjs": { - "version": "7.8.2", + "packages/app-tests/node_modules/@playwright/test": { + "version": "1.56.1", ++ "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.56.1.tgz", ++ "integrity": "sha512-vSMYtL/zOcFpvJCW71Q/OEGQb7KYBPAdKh35WNSkaZA75JlAO8ED8UN6GUNTm3drWomcbcqRPFqQbLae8yBTdg==", + "dev": true, "license": "Apache-2.0", "dependencies": { - "tslib": "^2.1.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", -+ "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==" - }, - "packages/assets": { - "name": "@documenso/assets", -@@ -36718,7 +36744,9 @@ - }, - "packages/signing/node_modules/ts-pattern": { - "version": "5.7.1", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ts-pattern/-/ts-pattern-5.7.1.tgz", -+ "integrity": "sha512-EGs8PguQqAAUIcQfK4E9xdXxB6s2GK4sJfT/vcc9V1ELIvC4LH/zXu2t/5fajtv6oiRCxdv7BgtVK3vWgROxag==" - }, - "packages/signing/node_modules/vitest": { - "version": "3.1.4", -@@ -36787,7 +36815,9 @@ - "jsdom": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vitest/-/vitest-3.1.4.tgz", -+ "integrity": "sha512-Ta56rT7uWxCSJXlBtKgIlApJnT6e6IGmTYxYcmxjJ4ujuZDI59GUQgVDObXXJujOmPDBYXHK1qmaGtneu6TNIQ==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/expect": { - "version": "3.1.4", -@@ -36801,7 +36831,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-3.1.4.tgz", -+ "integrity": "sha512-xkD/ljeliyaClDYqHPNCiJ0plY5YIcM0OlRiZizLhlPmpXWpxnGMyTZXOHFhFeG7w9P5PBeL4IdtJ/HeQwTbQA==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/mocker": { - "version": "3.1.4", -@@ -36826,7 +36858,9 @@ - "vite": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-3.1.4.tgz", -+ "integrity": "sha512-8IJ3CvwtSw/EFXqWFL8aCMu+YyYXG2WUSrQbViOZkWTKTVicVwZ/YiEZDSqD00kX+v/+W+OnxhNWoeVKorHygA==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/mocker/node_modules/estree-walker": { - "version": "3.0.3", -@@ -36834,7 +36868,9 @@ - "license": "MIT", - "dependencies": { - "@types/estree": "^1.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", -+ "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/pretty-format": { - "version": "3.1.4", -@@ -36845,7 +36881,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-3.1.4.tgz", -+ "integrity": "sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/runner": { - "version": "3.1.4", -@@ -36857,7 +36895,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-3.1.4.tgz", -+ "integrity": "sha512-djTeF1/vt985I/wpKVFBMWUlk/I7mb5hmD5oP8K9ACRmVXgKTae3TUOtXAEBfslNKPzUQvnKhNd34nnRSYgLNQ==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/snapshot": { - "version": "3.1.4", -@@ -36870,7 +36910,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-3.1.4.tgz", -+ "integrity": "sha512-JPHf68DvuO7vilmvwdPr9TS0SuuIzHvxeaCkxYcCD4jTk67XwL45ZhEHFKIuCm8CYstgI6LZ4XbwD6ANrwMpFg==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/spy": { - "version": "3.1.4", -@@ -36881,7 +36923,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-3.1.4.tgz", -+ "integrity": "sha512-Xg1bXhu+vtPXIodYN369M86K8shGLouNjoVI78g8iAq2rFoHFdajNvJJ5A/9bPMFcfQqdaCpOgWKEoMQg/s0Yg==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/spy/node_modules/tinyspy": { - "version": "3.0.2", -@@ -36889,7 +36933,9 @@ - "license": "MIT", - "engines": { - "node": ">=14.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tinyspy/-/tinyspy-3.0.2.tgz", -+ "integrity": "sha512-n1cw8k1k0x4pgA2+9XrOkFydTerNcJ1zWCO5Nn9scWHTD+5tp8dghT2x1uduQePZTZgd3Tupf+x9BxJjeJi77Q==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/utils": { - "version": "3.1.4", -@@ -36902,12 +36948,16 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-3.1.4.tgz", -+ "integrity": "sha512-yriMuO1cfFhmiGc8ataN51+9ooHRuURdfAZfwFd3usWynjzpLslZdYnRegTv32qdgtJTsj15FoeZe2g15fY1gg==" - }, - "packages/signing/node_modules/vitest/node_modules/@vitest/utils/node_modules/loupe": { - "version": "3.1.3", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", -+ "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" - }, - "packages/signing/node_modules/vitest/node_modules/chai": { - "version": "5.2.0", -@@ -36922,7 +36972,9 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/chai/-/chai-5.2.0.tgz", -+ "integrity": "sha512-mCuXncKXk5iCLhfhwTc0izo0gtEmpz5CtG2y8GiOINBlMVS6v8TMRc5TaLWKS6692m9+dVVfzgeVxR5UxWHTYw==" - }, - "packages/signing/node_modules/vitest/node_modules/chai/node_modules/assertion-error": { - "version": "2.0.1", -@@ -36930,7 +36982,9 @@ - "license": "MIT", - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", -+ "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==" - }, - "packages/signing/node_modules/vitest/node_modules/chai/node_modules/check-error": { - "version": "2.1.1", -@@ -36938,7 +36992,9 @@ - "license": "MIT", - "engines": { - "node": ">= 16" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/check-error/-/check-error-2.1.1.tgz", -+ "integrity": "sha512-OAlb+T7V4Op9OwdkjmguYRqncdlx5JiofwOAUkmTF+jNdHwzTaTs4sRAGpzLF3oOz5xAyDGrPgeIDFQmDOTiJw==" - }, - "packages/signing/node_modules/vitest/node_modules/chai/node_modules/deep-eql": { - "version": "5.0.2", -@@ -36946,12 +37002,16 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/deep-eql/-/deep-eql-5.0.2.tgz", -+ "integrity": "sha512-h5k/5U50IJJFpzfL6nO9jaaumfjO/f2NjK/oYB2Djzm4p9L+3T9qWpZqZ2hAbLPuuYq9wrU08WQyBTL5GbPk5Q==" - }, - "packages/signing/node_modules/vitest/node_modules/chai/node_modules/loupe": { - "version": "3.1.3", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/loupe/-/loupe-3.1.3.tgz", -+ "integrity": "sha512-kkIp7XSkP78ZxJEsSxW3712C6teJVoeHHwgo9zJ380de7IYyJ2ISlxojcH2pC5OFLewESmnRi/+XCDIEEVyoug==" - }, - "packages/signing/node_modules/vitest/node_modules/chai/node_modules/pathval": { - "version": "2.0.0", -@@ -36959,7 +37019,9 @@ - "license": "MIT", - "engines": { - "node": ">= 14.16" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pathval/-/pathval-2.0.0.tgz", -+ "integrity": "sha512-vE7JKRyES09KiunauX7nd2Q9/L7lhok4smP9RZTDeD4MVs72Dp2qNFVz39Nz5a0FVEW0BJR6C0DYrq6unoziZA==" - }, - "packages/signing/node_modules/vitest/node_modules/expect-type": { - "version": "1.2.1", -@@ -36967,27 +37029,37 @@ - "license": "Apache-2.0", - "engines": { - "node": ">=12.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.2.1.tgz", -+ "integrity": "sha512-/kP8CAwxzLVEeFrMm4kMmy4CCDlpipyA7MYLVrdJIkV0fYF0UaigQHRsxHiuY/GEea+bh4KSv3TIlgr+2UL6bw==" - }, - "packages/signing/node_modules/vitest/node_modules/pathe": { - "version": "2.0.3", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", -+ "integrity": "sha512-WUjGcAqP1gQacoQe+OBJsFA7Ld4DyXuUIjZ5cc75cLHvJ7dtNsTugphxIADwspS+AraAUePCKrSVtPLFj/F88w==" - }, - "packages/signing/node_modules/vitest/node_modules/std-env": { - "version": "3.9.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/std-env/-/std-env-3.9.0.tgz", -+ "integrity": "sha512-UGvjygr6F6tpH7o2qyqR6QYpwraIjKSdtzyBdyytFOHmPZY917kwdwLG0RbOjWOnKmnm3PeHjaoLLMie7kPLQw==" - }, - "packages/signing/node_modules/vitest/node_modules/tinybench": { - "version": "2.9.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", -+ "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==" - }, - "packages/signing/node_modules/vitest/node_modules/tinyexec": { - "version": "0.3.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-0.3.2.tgz", -+ "integrity": "sha512-KQQR9yN7R5+OSwaK0XQoj22pwHoTlgYqmUscPYoknOoWCWfj/5/ABTMRi69FrKU5ffPVh5QcFikpWJI/P1ocHA==" - }, - "packages/signing/node_modules/vitest/node_modules/tinypool": { - "version": "1.0.2", -@@ -36995,7 +37067,9 @@ - "license": "MIT", - "engines": { - "node": "^18.0.0 || >=20.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tinypool/-/tinypool-1.0.2.tgz", -+ "integrity": "sha512-al6n+QEANGFOMf/dmUMsuS5/r9B06uwlyNjZZql/zv8J7ybHCgoihBNORZCY2mzUuAnomQa2JdhyHKzZxPCrFA==" - }, - "packages/signing/node_modules/vitest/node_modules/tinyrainbow": { - "version": "2.0.0", -@@ -37003,7 +37077,9 @@ - "license": "MIT", - "engines": { - "node": ">=14.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-2.0.0.tgz", -+ "integrity": "sha512-op4nsTR47R6p0vMUUoYl/a+ljLFVtlfaXkLQmqfLR1qHma1h/ysYk4hEXZ880bf2CYgTskvTa/e196Vd5dDQXw==" - }, - "packages/signing/node_modules/vitest/node_modules/vite-node": { - "version": "3.1.4", -@@ -37024,7 +37100,9 @@ - }, - "funding": { - "url": "https://opencollective.com/vitest" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vite-node/-/vite-node-3.1.4.tgz", -+ "integrity": "sha512-6enNwYnpyDo4hEgytbmc6mYWHXDHYEn0D1/rw4Q+tnHUGtKTJsn8T1YkX6Q18wI5LCrS8CTYlBaiCqxOy2kvUA==" - }, - "packages/signing/node_modules/vitest/node_modules/why-is-node-running": { - "version": "2.3.0", -@@ -37039,17 +37117,23 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", -+ "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==" - }, - "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/siginfo": { - "version": "2.0.0", - "dev": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", -+ "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==" - }, - "packages/signing/node_modules/vitest/node_modules/why-is-node-running/node_modules/stackback": { - "version": "0.0.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", -+ "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==" - }, - "packages/tailwind-config": { - "name": "@documenso/tailwind-config", -@@ -37171,4 +37255,4 @@ - "license": "MIT" - } - } --} -+} -\ No newline at end of file diff --git a/pkgs/by-name/do/documenso/package.json.patch b/pkgs/by-name/do/documenso/package.json.patch index a8a72575e1ad..8b546e93a620 100644 --- a/pkgs/by-name/do/documenso/package.json.patch +++ b/pkgs/by-name/do/documenso/package.json.patch @@ -1,40 +1,21 @@ diff --git a/package.json b/package.json -index 1ff8701..e337979 100644 +index d0ffcb2..9b47856 100644 --- a/package.json +++ b/package.json -@@ -44,22 +44,22 @@ - "@commitlint/cli": "^17.7.1", - "@commitlint/config-conventional": "^17.7.0", - "@lingui/cli": "^5.2.0", -+ "@prisma/client": "^6.8.2", - "dotenv": "^16.5.0", - "dotenv-cli": "^8.0.0", - "eslint": "^8.40.0", - "eslint-config-custom": "*", - "husky": "^9.0.11", - "lint-staged": "^15.2.2", -+ "nodemailer": "^6.10.1", - "playwright": "1.52.0", - "prettier": "^3.3.3", -- "rimraf": "^5.0.1", -- "turbo": "^1.9.3", -- "vite": "^6.3.5", -- "@prisma/client": "^6.8.2", - "prisma": "^6.8.2", - "prisma-extension-kysely": "^3.0.0", - "prisma-kysely": "^1.8.0", -- "nodemailer": "^6.10.1" -+ "rimraf": "^5.0.1", -+ "turbo": "^2.5.8", -+ "vite": "^6.3.5" - }, - "name": "@documenso/root", - "workspaces": [ -@@ -71,7 +71,6 @@ - "@documenso/prisma": "^0.0.0", - "@lingui/conf": "^5.2.0", - "@lingui/core": "^5.2.0", -- "inngest-cli": "^0.29.1", - "luxon": "^3.5.0", - "mupdf": "^1.0.0", - "react": "^18", +@@ -63,7 +63,6 @@ + "dotenv-cli": "^11.0.0", + "husky": "^9.1.7", + "inngest": "^3.54.0", +- "inngest-cli": "^1.17.9", + "lint-staged": "^16.2.7", + "nanoid": "^5.1.6", + "nodemailer": "^8.0.5", +@@ -78,7 +77,7 @@ + "rimraf": "^6.1.2", + "superjson": "^2.2.5", + "syncpack": "^14.0.0-alpha.27", +- "turbo": "^1.13.4", ++ "turbo": "^2.10.1", + "vite": "^7.2.4", + "vite-plugin-static-copy": "^3.1.4", + "zod-openapi": "^4.2.4", diff --git a/pkgs/by-name/do/documenso/package.nix b/pkgs/by-name/do/documenso/package.nix index c6978b7ddfaf..c6395e060fb0 100644 --- a/pkgs/by-name/do/documenso/package.nix +++ b/pkgs/by-name/do/documenso/package.nix @@ -1,30 +1,53 @@ { lib, + stdenv, nodejs, node-gyp, node-pre-gyp, pixman, fetchFromGitHub, + fetchurl, buildNpmPackage, prisma_6, prisma-engines_6, vips, pkg-config, + gzip, + autoPatchelfHook, cairo, pango, bash, openssl, }: +let + skiaCanvasVersion = "3.0.8"; + skiaCanvasTriplet = + { + x86_64-linux = "linux-x64-glibc"; + aarch64-linux = "linux-arm64-glibc"; + } + .${stdenv.hostPlatform.system} + or (throw "unsupported skia-canvas platform ${stdenv.hostPlatform.system}"); + skiaCanvasPrebuild = fetchurl { + url = "https://github.com/samizdatco/skia-canvas/releases/download/v${skiaCanvasVersion}/${skiaCanvasTriplet}.gz"; + hash = + { + x86_64-linux = "sha256-9FklKQWZ1LfLUhHBI/re4nvImddVZpbi4zPQ76xpN7I="; + aarch64-linux = "sha256-BmXQemDAXZEqL9FFmus3cU6wRFwveEhAdjhUbD0uGnA="; + } + .${stdenv.hostPlatform.system}; + }; +in buildNpmPackage (finalAttrs: { pname = "documenso"; - version = "1.12.6"; + version = "2.14.0"; src = fetchFromGitHub { owner = "documenso"; repo = "documenso"; rev = "v${finalAttrs.version}"; - hash = "sha256-1TKjsOKJkv3COFgsE4tPAymI0MdeT+T8HiNgnoWHlAY="; + hash = "sha256-ZVcbOKBqjDnCo2pZKjaAuO3MK7r/S6k4kEHwBteHVGg="; }; patches = [ @@ -33,9 +56,12 @@ buildNpmPackage (finalAttrs: { ./turbo.json.patch ]; - npmDepsHash = "sha256-ZddRSBDasa3mMAS2dqXgXRMOc1nvspdXsuTZ7c+einw="; + npmDepsHash = "sha256-/Jt1ct/GSumu/pgTrmnVHdMhhg8J2Epvu7wnnCakqGs="; + npmDepsFetcherVersion = 2; nativeBuildInputs = [ + autoPatchelfHook + gzip pkg-config vips node-gyp @@ -47,9 +73,12 @@ buildNpmPackage (finalAttrs: { pixman cairo pango + stdenv.cc.cc.lib vips ]; + npmRebuildFlags = [ "--ignore-scripts" ]; + env = { PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; PRISMA_QUERY_ENGINE_LIBRARY = "${lib.getLib prisma-engines_6}/lib/libquery_engine.node"; @@ -60,6 +89,13 @@ buildNpmPackage (finalAttrs: { TURBO_REMOTE_CACHE_ENABLED = "false"; }; + preBuild = '' + mkdir -p node_modules/skia-canvas/lib + gzip -dc ${skiaCanvasPrebuild} > node_modules/skia-canvas/lib/skia.node + + npm exec patch-package + ''; + buildPhase = '' runHook preBuild @@ -81,7 +117,7 @@ buildNpmPackage (finalAttrs: { export PKG_CONFIG_PATH=${lib.getLib openssl.dev}/lib/pkgconfig; export PRISMA_QUERY_ENGINE_LIBRARY=${lib.getLib prisma-engines_6}/lib/libquery_engine.node export PRISMA_QUERY_ENGINE_BINARY=${lib.getExe' prisma-engines_6 "query-engine"} - export PRISMA_SCHEMA_ENGINE_BINARY=${prisma-engines_6} + export PRISMA_SCHEMA_ENGINE_BINARY=${lib.getExe' prisma-engines_6 "schema-engine"} cd $out/apps/remix ${lib.getExe prisma_6} migrate deploy --schema ../../packages/prisma/schema.prisma ${lib.getExe nodejs} build/server/main.js @@ -91,6 +127,14 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; + postInstall = '' + # These optional prebuilds are for musl libc and can make autoPatchelf link + # glibc addons against incompatible vendored libraries. + rm -rf $out/node_modules/*musl* $out/node_modules/@*/*musl* + rm -rf $out/node_modules/@datadog/pprof/prebuilds/linuxmusl-* + rm -rf $out/node_modules/aws-crt/dist/bin/linux-*-musl + ''; + # cleanup dangling symlinks for workspaces preFixup = '' rm -Rf $out/lib/node_modules/@documenso/root/node_modules/@documenso/assets @@ -118,7 +162,10 @@ buildNpmPackage (finalAttrs: { homepage = "https://github.com/documenso/documenso"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ happysalada ]; - platforms = lib.platforms.unix; + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; mainProgram = "documenso"; }; }) diff --git a/pkgs/by-name/do/documenso/turbo.json.patch b/pkgs/by-name/do/documenso/turbo.json.patch index ee30405f325d..3377eba78b78 100644 --- a/pkgs/by-name/do/documenso/turbo.json.patch +++ b/pkgs/by-name/do/documenso/turbo.json.patch @@ -1,104 +1,20 @@ diff --git a/turbo.json b/turbo.json -index d767b46..b2d1ad3 100644 +index c5c0db0..8c79030 100644 --- a/turbo.json +++ b/turbo.json -@@ -1,41 +1,8 @@ +@@ -1,6 +1,6 @@ { "$schema": "https://turbo.build/schema.json", - "pipeline": { -- "build": { -- "dependsOn": ["prebuild", "^build"], -- "outputs": [".next/**", "!.next/cache/**"] -- }, -- "prebuild": { -- "cache": false, -- "dependsOn": ["^prebuild"] -- }, -- "lint": { -- "cache": false -- }, -- "lint:fix": { -- "cache": false -- }, -- "clean": { -- "cache": false -- }, -- "dev": { -- "cache": false, -- "persistent": true -- }, -- "start": { -- "dependsOn": ["^build"], -- "cache": false, -- "persistent": true -- }, -- "dev:test": { -- "cache": false -- }, -- "test:e2e": { -- "dependsOn": ["^build"], -- "cache": false -- } -- }, -- "globalDependencies": ["**/.env.*local"], -+ "globalDependencies": [ -+ "**/.env.*local" -+ ], - "globalEnv": [ - "APP_VERSION", - "NEXT_PRIVATE_ENCRYPTION_KEY", -@@ -119,5 +86,53 @@ - "E2E_TEST_AUTHENTICATE_USERNAME", - "E2E_TEST_AUTHENTICATE_USER_EMAIL", - "E2E_TEST_AUTHENTICATE_USER_PASSWORD" ++ "tasks": { + "build": { + "dependsOn": ["prebuild", "^build"], + "outputs": [".next/**", "!.next/cache/**"] +@@ -152,5 +152,6 @@ + "NEXT_PRIVATE_WEBHOOK_SSRF_BYPASS_HOSTS", + "NEXT_PUBLIC_TURNSTILE_SITE_KEY", + "NEXT_PRIVATE_TURNSTILE_SECRET_KEY" - ] + ], -+ "tasks": { -+ "build": { -+ "dependsOn": [ -+ "prebuild", -+ "^build" -+ ], -+ "outputs": [ -+ ".next/**", -+ "!.next/cache/**" -+ ] -+ }, -+ "prebuild": { -+ "cache": false, -+ "dependsOn": [ -+ "^prebuild" -+ ] -+ }, -+ "lint": { -+ "cache": false -+ }, -+ "lint:fix": { -+ "cache": false -+ }, -+ "clean": { -+ "cache": false -+ }, -+ "dev": { -+ "cache": false, -+ "persistent": true -+ }, -+ "start": { -+ "dependsOn": [ -+ "^build" -+ ], -+ "cache": false, -+ "persistent": true -+ }, -+ "dev:test": { -+ "cache": false -+ }, -+ "test:e2e": { -+ "dependsOn": [ -+ "^build" -+ ], -+ "cache": false -+ } -+ }, + "envMode": "loose" } diff --git a/pkgs/by-name/do/documenso/update-from-upstream.sh b/pkgs/by-name/do/documenso/update-from-upstream.sh index 315d05507e12..42f273366ff2 100755 --- a/pkgs/by-name/do/documenso/update-from-upstream.sh +++ b/pkgs/by-name/do/documenso/update-from-upstream.sh @@ -1,55 +1,116 @@ #!/usr/bin/env bash -CMDS=();DESC=();NARGS=$#;ARG1=$1;make_command(){ CMDS+=($1);DESC+=("$2");};usage(){ printf "\nUsage: %s [command]\n\nCommands:\n" $0;line=" ";for((i=0;i<=$(( ${#CMDS[*]} -1));i++));do printf " %s %s ${DESC[$i]}\n" ${CMDS[$i]} "${line:${#CMDS[$i]}}";done;echo;};runme(){ if test $NARGS -eq 1;then eval "$ARG1"||usage;else usage;fi;} +set -euo pipefail -version="1.12.6"; +version="2.14.0" -make_command "about" "About this update script." -about(){ - echo "Documenso upstream needs some fixing before it can be build in a pure sandbox" - echo "environment. This script does the following:" +usage() { + printf "Usage: %s {about|update} [version]\n" "$0" +} + +about() { + echo "Documenso upstream needs some fixing before it can be built in a pure sandbox" + echo "environment. This script regenerates the JSON patches for a version bump:" echo " - download documenso version ${version} from github in a temp dir" - echo " - uninstall inngest-cli which runs a binary download script at build time." - echo " - upgrade turborepo as the older upstream version 'phones home' at build time." - echo " - update the turbo.json to make it work with preset environment vars" - echo " - fix the lockfile by generating missing hash signatures" + echo " - remove inngest-cli which runs a binary download script at build time" + echo " - upgrade turborepo because the older upstream version phones home at build time" + echo " - update turbo.json for the newer turborepo config" + echo " - fix package-lock.json metadata needed by npmDepsFetcherVersion = 2" echo " - create patches from changed json files" } -make_command "update" "Get upstream and prepatch." -update(){ +patch_sources() { + node <<'NODE' +const fs = require('fs'); + +const packageJsonPath = 'package.json'; +const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8')); +delete packageJson.devDependencies['inngest-cli']; +packageJson.devDependencies.turbo = '^2.10.1'; +fs.writeFileSync(packageJsonPath, `${JSON.stringify(packageJson, null, 2)}\n`); + +const turboJsonPath = 'turbo.json'; +let turboJson = fs.readFileSync(turboJsonPath, 'utf8'); +turboJson = turboJson.replace(' "pipeline": {', ' "tasks": {'); +if (!turboJson.includes(' "envMode": "loose"')) { + turboJson = turboJson.replace('\n ]\n}\n', '\n ],\n "envMode": "loose"\n}\n'); +} +fs.writeFileSync(turboJsonPath, turboJson); +NODE +} + +fix_playwright_lockfile_metadata() { + local package_key="packages/app-tests/node_modules/@playwright/test" + local playwright_version resolved integrity + + playwright_version=$(jq -r --arg key "$package_key" '.packages[$key].version // empty' package-lock.json) + if [[ -z "$playwright_version" ]]; then + return + fi + + resolved=$(npm view "@playwright/test@${playwright_version}" dist.tarball) + integrity=$(npm view "@playwright/test@${playwright_version}" dist.integrity) + + node - "$package_key" "$resolved" "$integrity" <<'NODE' +const fs = require('fs'); + +const [packageKey, resolved, integrity] = process.argv.slice(2); +const path = 'package-lock.json'; +const lockfile = JSON.parse(fs.readFileSync(path, 'utf8')); +const packageEntry = lockfile.packages[packageKey]; +const updated = {}; +for (const [key, value] of Object.entries(packageEntry)) { + updated[key] = value; + if (key === 'version') { + updated.resolved = resolved; + updated.integrity = integrity; + } +} +lockfile.packages[packageKey] = updated; +fs.writeFileSync(path, `${JSON.stringify(lockfile, null, 2)}\n`); +NODE +} + +update() { + local update_version=${1:-$version} + local current_nixpkgs_dir temptarfile tempdir echo "updating documenso for nixpkgs packaging" current_nixpkgs_dir=${PWD} - temptarfile=/tmp/documenso-v${version}.tar.gz - tempdir=/tmp/documenso-v${version} + temptarfile="/tmp/documenso-v${update_version}.tar.gz" + tempdir="/tmp/documenso-v${update_version}" - if [ ! -f "$temptarfile" ]; then - echo "Tarball does not exist; downloading from github."; - wget https://github.com/documenso/documenso/archive/refs/tags/v${version}.tar.gz -O $temptarfile + if [[ ! -f "$temptarfile" ]]; then + echo "Tarball does not exist; downloading from github." + wget "https://github.com/documenso/documenso/archive/refs/tags/v${update_version}.tar.gz" -O "$temptarfile" fi - rm -Rf $tempdir - mkdir $tempdir - tar -xzvf /tmp/documenso-v${version}.tar.gz -C $tempdir --strip-components=1 - cd $tempdir + rm -Rf "$tempdir" + mkdir "$tempdir" + tar -xzf "$temptarfile" -C "$tempdir" --strip-components=1 + cd "$tempdir" git init git add package-lock.json package.json turbo.json git commit -m "commit4diff" package-lock.json package.json turbo.json - echo "rm inngest-cli from root" - npm uninstall inngest-cli + patch_sources + npm install --package-lock-only --ignore-scripts --no-audit --no-fund + fix_playwright_lockfile_metadata - npx @turbo/codemod migrate . --force - - jq '.envMode="loose"' turbo.json > turbo-patched.json - cp turbo-patched.json turbo.json - - echo "fix package-lock.json hashes" - nix run nixpkgs#npm-lockfile-fix -- package-lock.json - - git diff package-lock.json > $current_nixpkgs_dir/package-lock.json.patch - git diff package.json > $current_nixpkgs_dir/package.json.patch - git diff turbo.json > $current_nixpkgs_dir/turbo.json.patch + git diff --src-prefix=a/ --dst-prefix=b/ -- package-lock.json > "$current_nixpkgs_dir/package-lock.json.patch" + git diff --src-prefix=a/ --dst-prefix=b/ -- package.json > "$current_nixpkgs_dir/package.json.patch" + git diff --src-prefix=a/ --dst-prefix=b/ -- turbo.json > "$current_nixpkgs_dir/turbo.json.patch" } -runme +case "${1:-}" in + about) + about + ;; + update) + shift + update "${1:-}" + ;; + *) + usage + exit 1 + ;; +esac diff --git a/pkgs/by-name/do/dogedns/package.nix b/pkgs/by-name/do/dogedns/package.nix index 83433158a336..99f53b0c586e 100644 --- a/pkgs/by-name/do/dogedns/package.nix +++ b/pkgs/by-name/do/dogedns/package.nix @@ -15,7 +15,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "Dj-Codeman"; - repo = "doge"; + repo = "dog_community"; rev = "v${finalAttrs.version}"; hash = "sha256-SeC/GZ1AeEqRzxWc4oJ6JOvXfn3/LRcQz9uWXXqdTqU="; }; @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Reviving a command-line DNS client"; - homepage = "https://github.com/Dj-Codeman/doge"; + homepage = "https://github.com/Dj-Codeman/dog_community"; license = lib.licenses.eupl12; mainProgram = "doge"; maintainers = with lib.maintainers; [ aktaboot ]; diff --git a/pkgs/by-name/do/doggo/package.nix b/pkgs/by-name/do/doggo/package.nix index 2086efd64bb7..a3893d4912cb 100644 --- a/pkgs/by-name/do/doggo/package.nix +++ b/pkgs/by-name/do/doggo/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "doggo"; - version = "1.1.7"; + version = "1.2.0"; src = fetchFromGitHub { owner = "mr-karan"; repo = "doggo"; rev = "v${finalAttrs.version}"; - hash = "sha256-Q4a859MoVSZ4hjXwaIekL1En6xpd4bZPQ9NGAkxSPto="; + hash = "sha256-xzwgNuvEedqC0DS0cMi472x2Tx0mWdk+22E9Bz1G9Tk="; }; - vendorHash = "sha256-JMyGYG3cLOZmH9EcLPe+5+ViHv7Z7brLj5uqJrPYm7A="; + vendorHash = "sha256-AJQQVhrYhgazCwI2Dnvorj4Y78iwVO7mhx1gzZUA9BI="; nativeBuildInputs = [ installShellFiles ]; subPackages = [ "cmd/doggo" ]; diff --git a/pkgs/by-name/do/doh-proxy-rust/package.nix b/pkgs/by-name/do/doh-proxy-rust/package.nix index 18aaa31e1614..1d55facdf152 100644 --- a/pkgs/by-name/do/doh-proxy-rust/package.nix +++ b/pkgs/by-name/do/doh-proxy-rust/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jedisct1/doh-server"; description = "Fast, mature, secure DoH server proxy written in Rust"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ stephank ]; mainProgram = "doh-proxy"; }; diff --git a/pkgs/by-name/do/dokuwiki/package.nix b/pkgs/by-name/do/dokuwiki/package.nix index 0796e233496a..69f0d9b3461c 100644 --- a/pkgs/by-name/do/dokuwiki/package.nix +++ b/pkgs/by-name/do/dokuwiki/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2025-05-14b"; + version = "2026-07-14a"; src = fetchFromGitHub { owner = "dokuwiki"; repo = "dokuwiki"; rev = "release-${version}"; - sha256 = "sha256-J7B+mvvGtAPK+WjlkHyadG61vli+zZfozfEmEynYQaE="; + sha256 = "sha256-qj+Ng20aB3qV2afrER309kvlh6gXRFPh3MqnomvvCf4="; }; preload = writeText "preload.php" '' diff --git a/pkgs/by-name/do/dolfinx/package.nix b/pkgs/by-name/do/dolfinx/package.nix index 8f544b2857ed..402f9b7aa820 100644 --- a/pkgs/by-name/do/dolfinx/package.nix +++ b/pkgs/by-name/do/dolfinx/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, pkg-config, spdlog, @@ -26,32 +25,16 @@ let ); in stdenv.mkDerivation (finalAttrs: { - version = "0.10.0.post5"; + version = "0.11.0.post0"; pname = "dolfinx"; src = fetchFromGitHub { owner = "fenics"; repo = "dolfinx"; tag = "v${finalAttrs.version}"; - hash = "sha256-CK7YEtJtrx/Mto72RHT4Qjg5StO28Et+FeCYxk5T+8s="; + hash = "sha256-brmU6AA7lN4TyHjHcg4mHUIj/OvJ16pfspEN95M4oOE="; }; - patches = [ - # Fix wrong span extent in _lift_bc_interior_facets - # https://github.com/FEniCS/dolfinx/pull/4102 - (fetchpatch { - url = "https://github.com/FEniCS/dolfinx/commit/6daca34a075a6dcdfdf77feb13d55d5dbd20e4dd.patch"; - hash = "sha256-b/C1MqslS2OBCt+kK/+vJjW8pmsJx2FQ36qDtFA1ewI="; - includes = [ "cpp/dolfinx/fem/assemble_vector_impl.h" ]; - }) - # Fix hdf5 interface for rank 1 - # https://github.com/FEniCS/dolfinx/pull/4043 - (fetchpatch { - url = "https://github.com/FEniCS/dolfinx/commit/fce7c44f220d4cb94c5149ad28cd1ab00909c319.patch"; - hash = "sha256-EVm4Rx5UO/3pKIVvjgYAkN+i5QR+u0Nxwxotlf41t+Q="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config diff --git a/pkgs/by-name/do/dolphin-emu-primehack/package.nix b/pkgs/by-name/do/dolphin-emu-primehack/package.nix index 78a2f375b132..53d0363ffe9a 100644 --- a/pkgs/by-name/do/dolphin-emu-primehack/package.nix +++ b/pkgs/by-name/do/dolphin-emu-primehack/package.nix @@ -29,7 +29,6 @@ mbedtls, miniupnpc, openal, - pcre, portaudio, readline, SDL2, @@ -99,7 +98,6 @@ stdenv.mkDerivation (finalAttrs: { mbedtls miniupnpc openal - pcre portaudio qt6.qtbase qt6.qtsvg diff --git a/pkgs/by-name/do/dolphin-emu/package.nix b/pkgs/by-name/do/dolphin-emu/package.nix index 8a7d9041abde..a1a4802de7b0 100644 --- a/pkgs/by-name/do/dolphin-emu/package.nix +++ b/pkgs/by-name/do/dolphin-emu/package.nix @@ -55,13 +55,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dolphin-emu"; - version = "2603a"; + version = "2606"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; tag = finalAttrs.version; - hash = "sha256-+3/JtjKFsTEkKQa0LjycqNmDz0M8o2FndWQtw5R5/jQ="; + hash = "sha256-Rs/b5Vnm1VAYpvC6YWj3bZqHBCw2SCHnzLro1UrvsdY="; fetchSubmodules = true; leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/do/dolt/package.nix b/pkgs/by-name/do/dolt/package.nix index 52c854e7789a..a64297a736d9 100644 --- a/pkgs/by-name/do/dolt/package.nix +++ b/pkgs/by-name/do/dolt/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "dolt"; - version = "2.1.4"; + version = "2.2.2"; src = fetchFromGitHub { owner = "dolthub"; repo = "dolt"; tag = "v${finalAttrs.version}"; - hash = "sha256-0AyKwejOvTMgt53B22D0EIWuAwB/6QxxTHd0S77Fu1M="; + hash = "sha256-vy5Bw8hALFlsQAYFoTnk0AX87ebiDDu0nGqVbaZ3P5E="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" ]; - vendorHash = "sha256-tKkXZdbNFxyVK76aNkNDM3/s3e6J7aqLvAnA+jQBSNg="; + vendorHash = "sha256-DO3lR4sjxFOSiO2YIri8PqH3cpNuxD45FWX7Ushov3s="; proxyVendor = true; doCheck = false; diff --git a/pkgs/by-name/do/domoticz/package.nix b/pkgs/by-name/do/domoticz/package.nix index beeeafccb3a0..5bbdf8dc17cd 100644 --- a/pkgs/by-name/do/domoticz/package.nix +++ b/pkgs/by-name/do/domoticz/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, makeWrapper, cmake, python3, @@ -24,23 +23,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "domoticz"; - version = "2024.7"; + version = "2026.2-unstable-2026-07-09"; src = fetchFromGitHub { owner = "domoticz"; repo = "domoticz"; - tag = finalAttrs.version; - hash = "sha256-D8U1kK3m1zT83YvZ42hGSU9PzBfS1VGr2mxUYbM2vNQ="; + rev = "7e12d1e5d7bf3f7d083ef31d5dd611d678f89d48"; # pinned due to removed dependency (see nixpkgs pr #539060) + hash = "sha256-+6EIEsgGTaLEPzBa/R5EYAxnYB3+cj54LGDJwutTQGA="; + fetchSubmodules = true; }; - patches = [ - # Boost 1.87 compatibility, remove once upgraded to 2025.1 - (fetchpatch { - url = "https://github.com/domoticz/domoticz/commit/5d0db89bbd120ed5dc05b4ff8c136f14a42f0cd3.patch"; - hash = "sha256-FPe83yJKJEgnY3kABy9CTRe1CBh42dPG1ZWCUE5PO8E="; - }) - ]; - buildInputs = [ openssl python3 @@ -87,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeInstallCheckInputs = [ - versionCheckHook + # versionCheckHook # readd once we can move to a tagged release again ]; doInstallCheck = true; @@ -98,15 +90,15 @@ stdenv.mkDerivation (finalAttrs: { various devices like: lights, switches, various sensors/meters like temperature, rain, wind, UV, electra, gas, water and much more ''; - maintainers = with lib.maintainers; [ edcragg ]; + maintainers = with lib.maintainers; [ + edcragg + lenny + ]; homepage = "https://www.domoticz.com/"; changelog = "https://github.com/domoticz/domoticz/blob/${finalAttrs.version}/History.txt"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; broken = stdenv.hostPlatform.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/staging-next/domoticz.x86_64-darwin mainProgram = "domoticz"; - knownVulnerabilities = [ - "CVE-2026-1001" - ]; }; }) diff --git a/pkgs/by-name/do/doom-bcc/package.nix b/pkgs/by-name/do/doom-bcc/package.nix index 192ed2889445..b7f95cea620d 100644 --- a/pkgs/by-name/do/doom-bcc/package.nix +++ b/pkgs/by-name/do/doom-bcc/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { version = "unstable-2018-01-04"; src = fetchFromGitHub { - owner = "wormt"; + owner = "positively-charged"; repo = "bcc"; rev = "d58b44d9f18b28fd732c27113e5607a454506d19"; sha256 = "1m83ip40ln61qrvb1fbgaqbld2xip9n3k817lwkk1936pml9zcrq"; @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Compiler for Doom/Hexen scripts (ACS, BCS)"; mainProgram = "bcc"; - homepage = "https://github.com/wormt/bcc"; + homepage = "https://github.com/positively-charged/bcc"; license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/do/door-knocker/package.nix b/pkgs/by-name/do/door-knocker/package.nix index 8f6e4442a1f4..f962ef88a608 100644 --- a/pkgs/by-name/do/door-knocker/package.nix +++ b/pkgs/by-name/do/door-knocker/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "door-knocker"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromCodeberg { owner = "tytan652"; repo = "door-knocker"; rev = finalAttrs.version; - hash = "sha256-Yz/HVffOJNpu0D8SE32ehwI3UQ7yPKMqR6yYIAVuBDc="; + hash = "sha256-h7wDJRePWUZ/oHdkSXLFcDWau1K8Yof9pQXFjexZxbA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/do/dopamine/bump-better-sqlite3.patch b/pkgs/by-name/do/dopamine/bump-better-sqlite3.patch new file mode 100644 index 000000000000..7c2f9f8e7c83 --- /dev/null +++ b/pkgs/by-name/do/dopamine/bump-better-sqlite3.patch @@ -0,0 +1,48 @@ +diff --git a/package-lock.json b/package-lock.json +index 921ffcdc..f1a2aeeb 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -17,7 +17,7 @@ + "@electron/remote": "2.1.3", + "@fortawesome/fontawesome-free": "^6.6.0", + "angular-split": "14.1.0", +- "better-sqlite3": "12.5.0", ++ "better-sqlite3": "12.11.1", + "cheerio": "1.0.0-rc.12", + "discord-rpc": "4.0.1", + "electron-log": "4.4.8", +@@ -10353,9 +10353,9 @@ + "license": "MIT" + }, + "node_modules/better-sqlite3": { +- "version": "12.5.0", +- "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.5.0.tgz", +- "integrity": "sha512-WwCZ/5Diz7rsF29o27o0Gcc1Du+l7Zsv7SYtVPG0X3G/uUI1LqdxrQI7c9Hs2FWpqXXERjW9hp6g3/tH7DlVKg==", ++ "version": "12.11.1", ++ "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.11.1.tgz", ++ "integrity": "sha512-dq9AtApgg5PGFtBzPFSBl3HZQjHok5gaQCM6zh2Yk0aSmDCs1CbnVI8/HgASQkNKsWFpseIO9beg5xxpYhbIfA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { +@@ -10363,7 +10363,7 @@ + "prebuild-install": "^7.1.1" + }, + "engines": { +- "node": "20.x || 22.x || 23.x || 24.x || 25.x" ++ "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x" + } + }, + "node_modules/big.js": { +diff --git a/package.json b/package.json +index 2c07792f..9023e10c 100644 +--- a/package.json ++++ b/package.json +@@ -98,7 +98,7 @@ + "@electron/remote": "2.1.3", + "@fortawesome/fontawesome-free": "^6.6.0", + "angular-split": "14.1.0", +- "better-sqlite3": "12.5.0", ++ "better-sqlite3": "12.11.1", + "cheerio": "1.0.0-rc.12", + "discord-rpc": "4.0.1", + "electron-log": "4.4.8", diff --git a/pkgs/by-name/do/dopamine/package.nix b/pkgs/by-name/do/dopamine/package.nix index 6702fad34cba..9a1eecaf52e4 100644 --- a/pkgs/by-name/do/dopamine/package.nix +++ b/pkgs/by-name/do/dopamine/package.nix @@ -1,39 +1,127 @@ { lib, - fetchurl, - appimageTools, - nix-update-script, - makeWrapper, + stdenv, + fetchFromGitHub, + buildNpmPackage, + electron, + python3, + xcodebuild, + applyPatches, }: -appimageTools.wrapType2 rec { +buildNpmPackage (finalAttrs: { pname = "dopamine"; - version = "3.0.4"; + version = "3.0.7"; - src = fetchurl { - url = "https://github.com/digimezzo/dopamine/releases/download/v${version}/Dopamine-${version}.AppImage"; - hash = "sha256-sm8/ZzSqa1CsQJ7XfQ67yAKX5rR9E8J/Z6v1rLVhNwI="; + # needed to upgrade better-sqlite3 in npmConfigHook + src = applyPatches { + src = fetchFromGitHub { + owner = "digimezzo"; + repo = "dopamine"; + tag = "v${finalAttrs.version}"; + hash = "sha256-zYuf5BIQaxTqHBXWX1PLghGR5WmwtnSxTYrNosVFebc="; + }; + patches = [ + # register-scheme contains install scripts, but has no lockfile + ./remove-register-scheme.patch + + # fixes node-addon-api errors with aarch64-darwin + ./update-node-addon-api.patch + + # bump better-sqlite3 to work with electron 41 + ./bump-better-sqlite3.patch + ]; }; - nativeBuildInputs = [ makeWrapper ]; + npmDepsHash = "sha256-m5y8TmOUAUf2IE87b73hFe2vj/uRAqFGgfuy3vkUX/s="; - extraInstallCommands = - let - contents = appimageTools.extract { inherit pname version src; }; - in - '' - wrapProgram $out/bin/${pname} \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" + nativeBuildInputs = [ + (python3.withPackages (ps: with ps; [ distutils ])) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ xcodebuild ]; - install -Dm644 ${contents}/dopamine.desktop $out/share/applications/dopamine.desktop - substituteInPlace $out/share/applications/dopamine.desktop \ - --replace-fail 'Exec=AppRun' 'Exec=dopamine' - cp -r ${contents}/usr/share/icons $out/share - ''; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=unstable" ]; }; + buildPhase = '' + runHook preBuild + + # needed for better-sqlite3 rebuild + export npm_config_nodedir="${electron.headers}" + export npm_config_target="${electron.version}" + + npm rebuild --verbose --no-progress --offline + + # reduce better-sqlite3 size + pushd node_modules/better-sqlite3 + rm -rf src deps build/{deps,Release/{.deps,obj,obj.target,test_extension.node}} + popd + + npm run build:prod + + # otherwise angular uses up ~150MB space + rm -rf .angular + + ${ + if stdenv.hostPlatform.isDarwin then + '' + cp -r ${electron.dist}/Electron.app ./ + find ./Electron.app -name 'Info.plist' -exec chmod +rw {} \; + + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=false \ + -c.mac.identity=null \ + -c.electronDist=./ \ + -c.electronVersion=${electron.version} \ + -c.extraMetadata.version=v${finalAttrs.version} \ + --config electron-builder.config.js + '' + else + '' + npm exec electron-builder -- \ + --dir \ + -c.npmRebuild=false \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} \ + -c.extraMetadata.version=v${finalAttrs.version} \ + --config electron-builder.config.js + '' + } + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + ${ + if stdenv.hostPlatform.isDarwin then + '' + mkdir -p $out/{Applications,bin} + cp -r release/mac*/Dopamine.app $out/Applications + makeWrapper $out/Applications/Dopamine.app/Contents/MacOS/Dopamine $out/bin/dopamine + '' + else + '' + mkdir -p $out/share/dopamine + cp -r release/linux*unpacked/{locales,resources{,.pak}} $out/share/dopamine + + makeWrapper ${lib.getExe electron} $out/bin/dopamine \ + --add-flags $out/share/dopamine/resources/app.asar \ + --inherit-argv0 + + for size in 16 24 32 48 64 96 128 256 512; do + install -Dm644 "build/icons/"$size"x"$size".png" "$out/share/icons/hicolor/"$size"x"$size"/apps/dopamine.png" + done + + install -Dm644 deployment/AUR/Dopamine.desktop $out/share/applications/dopamine.desktop + '' + } + + runHook postInstall + ''; meta = { - changelog = "https://github.com/digimezzo/dopamine/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/digimezzo/dopamine/blob/v${finalAttrs.version}/CHANGELOG.md"; description = "Audio player that keeps it simple"; homepage = "https://github.com/digimezzo/dopamine"; license = lib.licenses.gpl3Only; @@ -42,7 +130,6 @@ appimageTools.wrapType2 rec { Guanran928 ern775 ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/do/dopamine/remove-register-scheme.patch b/pkgs/by-name/do/dopamine/remove-register-scheme.patch new file mode 100644 index 000000000000..1b375aa56a33 --- /dev/null +++ b/pkgs/by-name/do/dopamine/remove-register-scheme.patch @@ -0,0 +1,32 @@ +diff --git a/package-lock.json b/package-lock.json +index c0db8fd5..a060c1cc 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -12156,9 +12156,6 @@ + "dependencies": { + "node-fetch": "^2.6.1", + "ws": "^7.3.1" +- }, +- "optionalDependencies": { +- "register-scheme": "github:devsnek/node-register-scheme" + } + }, + "node_modules/dmg-builder": { +@@ -21476,17 +21473,6 @@ + "node": ">=4" + } + }, +- "node_modules/register-scheme": { +- "version": "0.0.2", +- "resolved": "git+ssh://git@github.com/devsnek/node-register-scheme.git#e7cc9a63a1f512565da44cb57316d9fb10750e17", +- "hasInstallScript": true, +- "license": "MIT", +- "optional": true, +- "dependencies": { +- "bindings": "^1.3.0", +- "node-addon-api": "^1.3.0" +- } +- }, + "node_modules/regjsgen": { + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz", diff --git a/pkgs/by-name/do/dopamine/update-node-addon-api.patch b/pkgs/by-name/do/dopamine/update-node-addon-api.patch new file mode 100644 index 000000000000..2b43263391af --- /dev/null +++ b/pkgs/by-name/do/dopamine/update-node-addon-api.patch @@ -0,0 +1,39 @@ +diff --git a/package-lock.json b/package-lock.json +index c0db8fd5..d98f8cfe 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -18303,12 +18303,15 @@ + } + }, + "node_modules/nice-napi/node_modules/node-addon-api": { +- "version": "3.2.1", +- "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-3.2.1.tgz", +- "integrity": "sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==", ++ "version": "8.7.0", ++ "resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-8.7.0.tgz", ++ "integrity": "sha512-9MdFxmkKaOYVTV+XVRG8ArDwwQ77XIgIPyKASB1k3JPq3M8fGQQQE3YpMOrKm6g//Ktx8ivZr8xo1Qmtqub+GA==", + "dev": true, + "license": "MIT", +- "optional": true ++ "optional": true, ++ "engines": { ++ "node": "^18 || ^20 || >= 21" ++ } + }, + "node_modules/nice-try": { + "version": "1.0.5", +diff --git a/package.json b/package.json +index 2eecf247..94a0cf8d 100644 +--- a/package.json ++++ b/package.json +@@ -116,5 +116,10 @@ + "tinycolor2": "1.6.0", + "tslib": "2.0.0", + "uuid": "9.0.0" ++ }, ++ "overrides": { ++ "nice-napi": { ++ "node-addon-api": "^8.0.0" ++ } + } + } diff --git a/pkgs/by-name/do/doppler/package.nix b/pkgs/by-name/do/doppler/package.nix index d142a1a53a14..80ca08143821 100644 --- a/pkgs/by-name/do/doppler/package.nix +++ b/pkgs/by-name/do/doppler/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "doppler"; - version = "3.76.0"; + version = "3.76.1"; src = fetchFromGitHub { owner = "dopplerhq"; repo = "cli"; rev = finalAttrs.version; - hash = "sha256-CmNSn4WRWMP07qC5APw8PTouCUOHJrz1ZYqpKhdiIDM="; + hash = "sha256-8df60dWV/8ZezCAXVT7wmzCCB/TyljzAszv8sy7qRjU="; }; - vendorHash = "sha256-u6SB3SXCqu7Y2aUoTAJ01mtDCxMofVQLAde1jDxVvks="; + vendorHash = "sha256-rDpr4qWhMWXEhgZrmoW5tzPZif3KAv3gDtJNtXzbVq0="; ldflags = [ "-s -w" diff --git a/pkgs/by-name/do/dorion/package.nix b/pkgs/by-name/do/dorion/package.nix index c184d89ca1fc..1b8ea9dbf160 100644 --- a/pkgs/by-name/do/dorion/package.nix +++ b/pkgs/by-name/do/dorion/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchurl, rustPlatform, cmake, ninja, @@ -16,7 +15,7 @@ openssl, pkg-config, yq-go, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, webkitgtk_4_1, @@ -25,22 +24,14 @@ pipewire, apple-sdk_15, darwin, + shelter, + nix-update-script, }: let webkitgtk_4_1' = webkitgtk_4_1.override { enableExperimental = true; }; - - shelter = fetchurl { - url = "https://raw.githubusercontent.com/uwu/shelter-builds/7a1beaff4bb4ec5e8590d069549686fda4200e82/shelter.js"; - hash = "sha256-LeZTxrGRQb0rl3BMP34UFHIEFnil4k3Fet3MTujvVB8="; - meta = { - homepage = "https://github.com/uwu/shelter"; - sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; # actually, minified JS - license = lib.licenses.cc0; - }; - }; in rustPlatform.buildRustPackage (finalAttrs: { pname = "dorion"; @@ -60,9 +51,9 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; + pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-E45X3JEns1TE+SVbtbBEl+RzwRgTiGN7/N4OgJ5o63o="; + hash = "sha256-WzJD2Brg7+cx7TXRpEg2c1QSY0uo0Ppulj3ytdl0A4I="; }; # CMake (webkit extension, Linux only) @@ -78,7 +69,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 cargo-tauri.hook nodejs pkg-config @@ -124,7 +115,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ' src-tauri/tauri.conf.json # link shelter injection - ln -s "${shelter}" src-tauri/injection/shelter.js + ln -s ${shelter}/shelter.js src-tauri/injection/shelter.js # link html/frontend data ln -s "$(pwd)/src" src-tauri/html @@ -189,9 +180,13 @@ rustPlatform.buildRustPackage (finalAttrs: { doCheck = false; env = { + # pnpm 10 prompts before purging node_modules in non-interactive builds. + CI = "true"; TAURI_RESOURCE_DIR = "${placeholder "out"}/lib"; }; + passthru.updateScript = nix-update-script { }; + meta = { homepage = "https://spikehd.github.io/projects/dorion/"; description = "Tiny alternative Discord client"; @@ -201,10 +196,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; changelog = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; downloadPage = "https://github.com/SpikeHD/Dorion/releases/tag/v${finalAttrs.version}"; - license = [ - lib.licenses.gpl3Only - shelter.meta.license - ]; + license = lib.licenses.gpl3Only; mainProgram = "Dorion"; maintainers = with lib.maintainers; [ nyabinary @@ -214,7 +206,6 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; platforms = lib.platforms.unix; sourceProvenance = [ - lib.sourceTypes.binaryBytecode # actually, minified JS lib.sourceTypes.fromSource ]; }; diff --git a/pkgs/by-name/do/dosage-tracker/package.nix b/pkgs/by-name/do/dosage-tracker/package.nix index 6016474be28d..674b0f078541 100644 --- a/pkgs/by-name/do/dosage-tracker/package.nix +++ b/pkgs/by-name/do/dosage-tracker/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosage"; - version = "2.1.7"; + version = "2.1.8"; src = fetchFromGitHub { owner = "diegopvlk"; repo = "Dosage"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tgsab1KzdEQ9C9gkh09M5gKpocrMrgxQ16pIJ4zcKsY="; + hash = "sha256-LqVJQkNjRafmC4OK2F3wZQwa0hofxmbMYWXQ6rPtHug="; }; # https://github.com/NixOS/nixpkgs/issues/318830 diff --git a/pkgs/by-name/do/dosbox-staging/package.nix b/pkgs/by-name/do/dosbox-staging/package.nix index 44db68ed9cb7..9fe868545a09 100644 --- a/pkgs/by-name/do/dosbox-staging/package.nix +++ b/pkgs/by-name/do/dosbox-staging/package.nix @@ -125,7 +125,6 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - joshuafern Zaechus ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/do/dosbox-x/package.nix b/pkgs/by-name/do/dosbox-x/package.nix index c09e3235c70f..b7007d6b9197 100644 --- a/pkgs/by-name/do/dosbox-x/package.nix +++ b/pkgs/by-name/do/dosbox-x/package.nix @@ -29,13 +29,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dosbox-x"; - version = "2026.06.02"; + version = "2026.07.02"; src = fetchFromGitHub { owner = "joncampbell123"; repo = "dosbox-x"; rev = "dosbox-x-v${finalAttrs.version}"; - hash = "sha256-60ZMaevTqYjHq6WrhKVQ8T8kfrQV7Auy59y3JFMHi5w="; + hash = "sha256-HO5JJQHeEJYXU7TtNCXZALgqkNbIMGI+TjDwbvs5L8w="; }; # sips is unavailable in sandbox, replacing with imagemagick breaks build due to wrong Foundation propagation(?) so don't generate resolution variants diff --git a/pkgs/by-name/do/dotenvx/package.nix b/pkgs/by-name/do/dotenvx/package.nix index 2ca9efcf88e7..1de4dcb5433a 100644 --- a/pkgs/by-name/do/dotenvx/package.nix +++ b/pkgs/by-name/do/dotenvx/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "dotenvx"; - version = "1.71.2"; + version = "2.14.0"; src = fetchFromGitHub { owner = "dotenvx"; repo = "dotenvx"; tag = "v${finalAttrs.version}"; - hash = "sha256-51mmOF03j+JpyE4fyoqmZdgHtAOPhdEQiUTTATPFujM="; + hash = "sha256-lFAnH1BcVRTvFyP5gOteNfokU0zYaoIY45df9fQ9cuA="; }; - npmDepsHash = "sha256-3+Dn4XE5BH3QfeHVILLP/3ZESmhbYuzfT6IAIOLCJkQ="; + npmDepsHash = "sha256-7EvZ3QOAiu2GPvDbHVfrbaF/0lAscH9lfsukv4WtBK0="; dontNpmBuild = true; diff --git a/pkgs/by-name/do/dotnet-ef/package.nix b/pkgs/by-name/do/dotnet-ef/package.nix index 5429950bcf66..7459d02e341b 100644 --- a/pkgs/by-name/do/dotnet-ef/package.nix +++ b/pkgs/by-name/do/dotnet-ef/package.nix @@ -6,11 +6,11 @@ buildDotnetGlobalTool { pname = "dotnet-ef"; - version = "10.0.2"; + version = "10.0.9"; dotnet-sdk = dotnetCorePackages.sdk_10_0; - nugetHash = "sha256-lJjGamBGb4jSuPaFGlNBEGkV7vh4uxv37rYiE7X5Hkk="; + nugetHash = "sha256-RqYc9rMfGI88Xo/kNMYbqzbfv4iyTFTk/I/RFLIJ3XM="; meta = { description = "Tools to help with design-time development tasks"; diff --git a/pkgs/by-name/do/dotnet-outdated/package.nix b/pkgs/by-name/do/dotnet-outdated/package.nix index c3b5f6035d8a..a12bbc267279 100644 --- a/pkgs/by-name/do/dotnet-outdated/package.nix +++ b/pkgs/by-name/do/dotnet-outdated/package.nix @@ -6,11 +6,11 @@ buildDotnetGlobalTool rec { pname = "dotnet-outdated"; nugetName = "dotnet-outdated-tool"; - version = "4.7.1"; + version = "4.8.1"; dotnet-sdk = dotnetCorePackages.sdk_10_0; - nugetHash = "sha256-EoH9TFAtnex+9uYaKUZMqQDSofQaZJDe0Va37PiO4OU="; + nugetHash = "sha256-f5su1er+1wP35rrU3S+qvwfPp/C55tR7xZ4bv4z7zL0="; meta = { description = ".NET Core global tool to display and update outdated NuGet packages in a project"; diff --git a/pkgs/by-name/do/dotter/package.nix b/pkgs/by-name/do/dotter/package.nix index f99741bb48f6..58c4798435a5 100644 --- a/pkgs/by-name/do/dotter/package.nix +++ b/pkgs/by-name/do/dotter/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dotter"; - version = "0.13.4"; + version = "0.13.5"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${finalAttrs.version}"; - hash = "sha256-cxabaCxbwP2YbnG2XfmVJWFTw9LGO0D1dlLy6fuux+M="; + hash = "sha256-xA/6j+wMTPx9p4aOHaqixlzUZcqgRazfJ1PwKaByTrw="; }; - cargoHash = "sha256-KLU+4CYqTKEH8wuvinVS0Zs+nFgOer2ho8LXnLDNVKY="; + cargoHash = "sha256-0yBuaTwP2IxZjRzC8jMhZ8eNDdFHKyJjSP0ZH15F3LI="; nativeCheckInputs = [ which diff --git a/pkgs/by-name/do/double-conversion/package.nix b/pkgs/by-name/do/double-conversion/package.nix index 7b31908b1d37..25df8ddcb8fa 100644 --- a/pkgs/by-name/do/double-conversion/package.nix +++ b/pkgs/by-name/do/double-conversion/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchFromGitHub, - fetchpatch, cmake, ninja, ctestCheckHook, @@ -11,34 +10,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "double-conversion"; - version = "3.3.1"; + version = "3.4.0"; src = fetchFromGitHub { owner = "google"; repo = "double-conversion"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-M80H+azCzQYa4/gBLWv5GNNhEuHsH7LbJ/ajwmACnrM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-gxaPqQ51RyXZaTHkvh4RBpedPopcRiuWDoT+PPbI1uw="; }; - patches = [ - # Fix the build with CMake 4. - (fetchpatch { - name = "double-conversion-fix-cmake-4-1.patch"; - url = "https://github.com/google/double-conversion/commit/101e1ba89dc41ceb75090831da97c43a76cd2906.patch"; - hash = "sha256-VRmuNXdzt/I+gWbz5mwWkx5IGn8Vsl9WkdwRsuwZdkU="; - }) - (fetchpatch { - name = "double-conversion-fix-cmake-4-2.patch"; - url = "https://github.com/google/double-conversion/commit/0604b4c18815aadcf7f4b78dfa6bfcb91a634ed7.patch"; - hash = "sha256-cJBp1ou1O/bMQ/7kvcX52dWbUdhmPfQ9aWmEhQdyhis="; - }) - (fetchpatch { - name = "double-conversion-add-pkg-config.patch"; - url = "https://github.com/google/double-conversion/commit/ddfd18c58ecc32fc74afc1083bb8774240b54efb.patch"; - hash = "sha256-/pKCL19vS8fNwCm27yTNP+32ApHTH5dEGpnsMI11Lf4="; - }) - ]; - outputs = [ "out" "dev" @@ -68,6 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { pkgConfigModules = [ "double-conversion" ]; + changelog = "https://github.com/google/double-conversion/blob/${finalAttrs.src.tag}/Changelog"; description = "Binary-decimal and decimal-binary routines for IEEE doubles"; homepage = "https://github.com/google/double-conversion"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/do/dovecot/fix-lua-build.patch b/pkgs/by-name/do/dovecot/fix-lua-build.patch new file mode 100644 index 000000000000..23d2dcb9bcd3 --- /dev/null +++ b/pkgs/by-name/do/dovecot/fix-lua-build.patch @@ -0,0 +1,28 @@ +diff --git a/src/auth/Makefile.am b/src/auth/Makefile.am +index 7474e76fb6..e7fc4aad0f 100644 +--- a/src/auth/Makefile.am ++++ b/src/auth/Makefile.am +@@ -21,12 +21,11 @@ LUA_LIB = + AUTH_LUA_LIBS = + AUTH_LUA_LDADD = + if HAVE_LUA +- ++AUTH_LUA_LDADD += $(LUA_LIBS) + if AUTH_LUA_PLUGIN + LUA_LIB += libauthdb_lua.la + else + AUTH_LUA_LIBS += $(LIBDOVECOT_LUA) +-AUTH_LUA_LDADD += $(LUA_LIBS) + endif + endif + +@@ -200,7 +199,7 @@ endif + endif + + if HAVE_LUA +-auth_libs += $(LIBDOVECOT_LUA) $(LUA_LIBS) ++auth_libs += $(LIBDOVECOT_LUA) + endif + + if AUTH_LUA_PLUGIN + diff --git a/pkgs/by-name/do/dovecot/generic.nix b/pkgs/by-name/do/dovecot/generic.nix index 7c6c2768f505..7c54332c89ab 100644 --- a/pkgs/by-name/do/dovecot/generic.nix +++ b/pkgs/by-name/do/dovecot/generic.nix @@ -7,6 +7,7 @@ autoreconfHook, stdenv, lib, + buildPackages, fetchzip, flex, bison, @@ -54,7 +55,20 @@ withLua ? false, lua5_3, }: - +let + # The `nativeBuildInputs` version of `mysql_config` emits headers and libraries for + # the build platform, not the host platform; `pkg-config` emits the correct versions. + fake_mysql_config = buildPackages.writeShellScriptBin "mysql_config" '' + if [ "$1" == "--include" ]; then + "$PKG_CONFIG" --cflags mysqlclient + elif [ "$1" == "--libs" ]; then + "$PKG_CONFIG" --libs mysqlclient + else + echo "fake_mysql_config: unsupported option: $1" >&2 + exit 1 + fi + ''; +in stdenv.mkDerivation (finalAttrs: { pname = "dovecot"; inherit version; @@ -64,9 +78,10 @@ stdenv.mkDerivation (finalAttrs: { bison perl pkg-config + autoreconfHook ] ++ lib.optionals (stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isDarwin) [ rpcsvc-proto ] - ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ autoreconfHook ]; + ++ lib.optional (withMySQL && lib.versionOlder version "2.4") fake_mysql_config; buildInputs = [ openssl @@ -110,7 +125,10 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - env.NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + env = { + NIX_LDFLAGS = lib.optionalString stdenv.hostPlatform.isDarwin "-liconv"; + LUA_PATH = lib.optionalString withLua "${lua5_3.pkgs.json}/share/lua/${lua5_3.luaversion}/?.lua"; + }; postPatch = '' sed -i -E \ diff --git a/pkgs/by-name/do/dovecot/package.nix b/pkgs/by-name/do/dovecot/package.nix index ccd716f729e3..aae29eb5e8fd 100644 --- a/pkgs/by-name/do/dovecot/package.nix +++ b/pkgs/by-name/do/dovecot/package.nix @@ -4,5 +4,6 @@ import ./generic.nix { patches = _: [ # Fix loading extended modules. ./load-extended-modules.patch + ./fix-lua-build.patch ]; } diff --git a/pkgs/by-name/do/doxygen/package.nix b/pkgs/by-name/do/doxygen/package.nix index eb701a89dc89..9ab45d795aa9 100644 --- a/pkgs/by-name/do/doxygen/package.nix +++ b/pkgs/by-name/do/doxygen/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "doxygen"; - version = "1.16.1"; + version = "1.17.0"; src = fetchFromGitHub { owner = "doxygen"; repo = "doxygen"; tag = "Release_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-MszJpYdXaC8BYK1lSV1LpJncKN1LrFoyJXZajpz0HIA="; + hash = "sha256-SSq/sFB9y2CFMeL58vgcHa2ulo+tPPUGT347ABoHoD4="; }; # https://github.com/doxygen/doxygen/issues/10928#issuecomment-2179320509 diff --git a/pkgs/by-name/dp/dpdk/package.nix b/pkgs/by-name/dp/dpdk/package.nix index 3c3a66aa8ff5..45895af76e35 100644 --- a/pkgs/by-name/dp/dpdk/package.nix +++ b/pkgs/by-name/dp/dpdk/package.nix @@ -19,7 +19,6 @@ doxygen, python3, pciutils, - fetchpatch, withExamples ? [ ], shared ? false, machine ? ( @@ -32,15 +31,18 @@ ), }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "dpdk"; - version = "25.07"; + version = "26.03"; src = fetchurl { - url = "https://fast.dpdk.org/rel/dpdk-${version}.tar.xz"; - sha256 = "sha256-aIbL7cNQu4y+80fRA2fWJZ42Q1Yn+7J9V4rb3A07QQ0="; + url = "https://fast.dpdk.org/rel/dpdk-${finalAttrs.version}.tar.xz"; + hash = "sha256-hJiSArvg+67rYvj9xj9pGICsC2bNDcZMFnhDxZ2ynSw="; }; + __structuredAttrs = true; + strictDeps = true; + nativeBuildInputs = [ makeWrapper doxygen @@ -55,12 +57,14 @@ stdenv.mkDerivation rec { jansson libbpf elfutils - intel-ipsec-mb libpcap numactl openssl.dev zlib python3 + ] + ++ lib.optionals stdenv.hostPlatform.isx86_64 [ + intel-ipsec-mb ]; propagatedBuildInputs = [ @@ -76,13 +80,15 @@ stdenv.mkDerivation rec { ''; mesonFlags = [ - "-Dtests=false" - "-Denable_docs=true" - "-Ddeveloper_mode=disabled" + (lib.mesonBool "tests" false) + (lib.mesonBool "enable_docs" true) + (lib.mesonEnable "developer_mode" false) + (lib.mesonOption "default_library" (if shared then "shared" else "static")) ] - ++ [ (if shared then "-Ddefault_library=shared" else "-Ddefault_library=static") ] - ++ lib.optional (machine != null) "-Dmachine=${machine}" - ++ lib.optional (withExamples != [ ]) "-Dexamples=${builtins.concatStringsSep "," withExamples}"; + ++ lib.optionals (machine != null) [ (lib.mesonOption "machine" machine) ] + ++ lib.optionals (withExamples != [ ]) [ + (lib.mesonOption "examples" (lib.concatStringsSep "," withExamples)) + ]; postInstall = '' # Remove Sphinx cache files. Not only are they not useful, but they also @@ -114,7 +120,8 @@ stdenv.mkDerivation rec { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ mic92 + stepbrobd zhaofengli ]; }; -} +}) diff --git a/pkgs/by-name/dp/dprint/package.nix b/pkgs/by-name/dp/dprint/package.nix index d8aca72dd913..4af408029750 100644 --- a/pkgs/by-name/dp/dprint/package.nix +++ b/pkgs/by-name/dp/dprint/package.nix @@ -12,7 +12,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dprint"; - version = "0.54.0"; + version = "0.55.2"; # Prefer repository rather than crate here # - They have Cargo.lock in the repository @@ -21,10 +21,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "dprint"; repo = "dprint"; tag = finalAttrs.version; - hash = "sha256-dNs2LQeEndeXS8xR9SXVFWT9PS+haB9SDZ+3PUPkFjg="; + hash = "sha256-80YdmDyyofBoHhLcldI9l1chpI6NKScyLQneJ068q/U="; }; - cargoHash = "sha256-fmbO14eTObK1cZu9gDls25KRmzAJPGiqQ8uURGD2vV0="; + cargoHash = "sha256-b6N4cKzsYRJEhvxVAtc+kfQJeDJMD7IpkGm14e9Icuo="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix index 50b3d16f8e1e..667d62e97ce6 100644 --- a/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix +++ b/pkgs/by-name/dp/dprint/plugins/dprint-plugin-biome.nix @@ -1,7 +1,7 @@ { mkDprintPlugin }: mkDprintPlugin { description = "Biome (JS/TS/JSON) wrapper plugin"; - hash = "sha256-0zbtVqdL86r69ahRS61qJ2r7qUtRzfY1qO1FL+SWt+g="; + hash = "sha256-HX4IOjLOGiqacEPdoaGy6QWq7Va1SEOk0J7+U5Rz2QM="; initConfig = { configExcludes = [ "**/node_modules" ]; configKey = "biome"; @@ -17,6 +17,6 @@ mkDprintPlugin { }; pname = "dprint-plugin-biome"; updateUrl = "https://plugins.dprint.dev/dprint/biome/latest.json"; - url = "https://plugins.dprint.dev/biome-0.12.12.wasm"; - version = "0.12.12"; + url = "https://plugins.dprint.dev/biome-0.13.0.wasm"; + version = "0.13.0"; } diff --git a/pkgs/by-name/dp/dput-ng/package.nix b/pkgs/by-name/dp/dput-ng/package.nix index 7caf42e88a6a..7b62937839db 100644 --- a/pkgs/by-name/dp/dput-ng/package.nix +++ b/pkgs/by-name/dp/dput-ng/package.nix @@ -64,7 +64,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Next-generation Debian package upload tool"; homepage = "https://dput.readthedocs.io/en/latest/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "dput"; diff --git a/pkgs/by-name/dr/dracut/package.nix b/pkgs/by-name/dr/dracut/package.nix index bc901a594a59..7a6de9a45785 100644 --- a/pkgs/by-name/dr/dracut/package.nix +++ b/pkgs/by-name/dr/dracut/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "dracut-ng"; - repo = "dracut-ng"; + repo = "dracut"; tag = finalAttrs.version; hash = "sha256-2jdS7/LGuLSBBXv1R/o8yjgwdXl2l2wNbZWxq01wSb0"; }; diff --git a/pkgs/by-name/dr/drafting-mono/package.nix b/pkgs/by-name/dr/drafting-mono/package.nix index a08f50c5eb13..39a2745cc21f 100644 --- a/pkgs/by-name/dr/drafting-mono/package.nix +++ b/pkgs/by-name/dr/drafting-mono/package.nix @@ -2,11 +2,18 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: + stdenvNoCC.mkDerivation { pname = "drafting-mono"; version = "1.1-unstable-2024-06-04"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "indestructible-type"; repo = "Drafting"; @@ -14,14 +21,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-J64mmDOzTV4MRuZO3MB2SSX5agCRjLDjXAPXuDfdlOM="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp fonts/*/*.otf $out/share/fonts/truetype - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://indestructibletype.com/Drafting/"; diff --git a/pkgs/by-name/dr/dragonflydb/external-libs.patch b/pkgs/by-name/dr/dragonflydb/external-libs.patch index 368c0b2a139e..7b0a7130171a 100644 --- a/pkgs/by-name/dr/dragonflydb/external-libs.patch +++ b/pkgs/by-name/dr/dragonflydb/external-libs.patch @@ -1,5 +1,5 @@ diff --git a/src/external_libs.cmake b/src/external_libs.cmake -index 62e6e879..8934777f 100644 +index 5a98540..1c5ab6d 100644 --- a/src/external_libs.cmake +++ b/src/external_libs.cmake @@ -1,7 +1,6 @@ @@ -11,11 +11,13 @@ index 62e6e879..8934777f 100644 CONFIGURE_COMMAND echo BUILD_IN_SOURCE 1 BUILD_COMMAND ${DFLY_TOOLS_MAKE} all -@@ -19,18 +18,16 @@ endif() +@@ -19,20 +18,16 @@ endif() add_third_party( dconv -- URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.0.tar.gz +- GIT_REPOSITORY https://github.com/google/double-conversion +- # URL https://github.com/google/double-conversion/archive/refs/tags/v3.3.1.tar.gz +- GIT_TAG 0604b4c - PATCH_COMMAND ${SED_REPL} "/static const std::ctype/d" - /double-conversion/string-to-double.cc - COMMAND ${SED_REPL} "/std::use_facet/double-conversion/string-to-double.cc @@ -35,12 +37,12 @@ index 62e6e879..8934777f 100644 CONFIGURE_COMMAND /configure --disable-avx2 --prefix=${THIRD_PARTY_LIB_DIR}/reflex CXX=${CMAKE_CXX_COMPILER} CC=${CMAKE_C_COMPILER} ) -@@ -41,16 +38,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex") +@@ -41,16 +36,14 @@ set(REFLEX "${THIRD_PARTY_LIB_DIR}/reflex/bin/reflex") add_third_party( jsoncons - GIT_REPOSITORY https://github.com/dragonflydb/jsoncons -- GIT_TAG Dragonfly.178 +- GIT_TAG Dragonfly1.5.0 - GIT_SHALLOW 1 + DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/jsoncons/. CMAKE_PASS_FLAGS "-DJSONCONS_BUILD_TESTS=OFF -DJSONCONS_HAS_POLYMORPHIC_ALLOCATOR=ON" @@ -54,7 +56,7 @@ index 62e6e879..8934777f 100644 BUILD_IN_SOURCE 1 CONFIGURE_COMMAND echo skip -@@ -65,7 +60,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG") +@@ -65,7 +58,7 @@ set(MIMALLOC_C_FLAGS "-O3 -g -DMI_STAT=1 -DNDEBUG") file(MAKE_DIRECTORY ${MIMALLOC_INCLUDE_DIR}) ExternalProject_Add(mimalloc2_project @@ -63,7 +65,7 @@ index 62e6e879..8934777f 100644 DOWNLOAD_DIR ${THIRD_PARTY_DIR}/mimalloc2 SOURCE_DIR ${THIRD_PARTY_DIR}/mimalloc2 # INSTALL_DIR ${MIMALLOC_ROOT_DIR} -@@ -118,21 +113,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO +@@ -119,23 +112,21 @@ set_target_properties(TRDP::mimalloc2 PROPERTIES IMPORTED_LOCATION ${MIMALLOC_RO add_third_party( croncpp @@ -78,17 +80,28 @@ index 62e6e879..8934777f 100644 - URL https://github.com/uni-algo/uni-algo/archive/refs/tags/v1.0.0.tar.gz + DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/uni-algo/. - CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=17" + CMAKE_PASS_FLAGS "-DCMAKE_CXX_STANDARD:STRING=20" ) add_third_party( hnswlib -- URL https://github.com/nmslib/hnswlib/archive/refs/tags/v0.7.0.tar.gz +- GIT_REPOSITORY https://github.com/dragonflydb/hnswlib.git +- # HEAD of dragonfly branch +- GIT_TAG d07dd1da2bf48b85d2f03b8396193ad7120f75c2 + DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/hnswlib/. BUILD_COMMAND echo SKIP INSTALL_COMMAND cp -R /hnswlib ${THIRD_PARTY_LIB_DIR}/hnswlib/include/ -@@ -142,21 +137,20 @@ endif() +@@ -145,7 +136,7 @@ if (WITH_SEARCH) + # No autoconf/cmake/install in upstream Makefile; manual install copy. + add_third_party( + stemmer +- URL https://github.com/snowballstem/snowball/archive/refs/tags/v3.0.1.tar.gz ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/stemmer/. + BUILD_IN_SOURCE 1 + CONFIGURE_COMMAND echo skip + BUILD_COMMAND ${DFLY_TOOLS_MAKE} -j4 CFLAGS=-O3\ -fPIC libstemmer.a +@@ -159,21 +150,20 @@ endif() add_third_party( fast_float diff --git a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch index c10bd8e89871..74d91bfe5210 100644 --- a/pkgs/by-name/dr/dragonflydb/helio-third-party.patch +++ b/pkgs/by-name/dr/dragonflydb/helio-third-party.patch @@ -1,35 +1,52 @@ diff --git a/helio/cmake/third_party.cmake b/helio/cmake/third_party.cmake -index 810a8fa..8b11922 100644 +index 6cad93a..409e45f 100644 --- a/helio/cmake/third_party.cmake +++ b/helio/cmake/third_party.cmake -@@ -151,7 +151,7 @@ endfunction() +@@ -189,24 +189,9 @@ function(download_and_validate url file out_status) + set(${out_status} "${st}" PARENT_SCOPE) + endfunction() +-if(NOT EXISTS "${GTEST_TARBALL}") +- download_and_validate("${GTEST_RELEASE_URL}" "${GTEST_TARBALL}" st1) +- list(GET st1 0 rc1) +- if(NOT rc1 EQUAL 0) +- file(REMOVE "${GTEST_TARBALL}") +- message(STATUS "Primary download failed: ${st1}. Trying archive URL...") +- download_and_validate("${GTEST_ARCHIVE_URL}" "${GTEST_TARBALL}" st2) +- list(GET st2 0 rc2) +- if(NOT rc2 EQUAL 0) +- file(REMOVE "${GTEST_TARBALL}") +- message(FATAL_ERROR "Failed to download googletest.\nRelease: ${st1}\nArchive: ${st2}") +- endif() +- endif() +-endif() +- FetchContent_Declare( gtest -- URL https://github.com/google/googletest/archive/v1.15.2.tar.gz +- URL "${GTEST_TARBALL}" + DOWNLOAD_COMMAND true ) FetchContent_GetProperties(gtest) -@@ -162,7 +162,7 @@ endif () +@@ -217,7 +202,7 @@ endif () FetchContent_Declare( benchmark -- URL https://github.com/google/benchmark/archive/v1.9.1.tar.gz +- URL https://github.com/google/benchmark/archive/v1.9.5.tar.gz + DOWNLOAD_COMMAND true ) FetchContent_GetProperties(benchmark) -@@ -181,7 +181,7 @@ endif () +@@ -236,7 +221,7 @@ endif () FetchContent_Declare( abseil_cpp - URL https://github.com/abseil/abseil-cpp/releases/download/20250512.1/abseil-cpp-20250512.1.tar.gz + DOWNLOAD_COMMAND true PATCH_COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-20250512.1.patch" + COMMAND patch -p1 < "${CMAKE_CURRENT_LIST_DIR}/../patches/abseil-gcc-undefined-sanitizer-compilation-fix.patch" ) - -@@ -204,11 +204,7 @@ if (LEGACY_GLOG) +@@ -263,11 +248,7 @@ if (LEGACY_GLOG) FetchContent_Declare( glog @@ -42,36 +59,16 @@ index 810a8fa..8b11922 100644 ) FetchContent_GetProperties(glog) -@@ -278,7 +274,7 @@ if (WITH_GPERF) +@@ -337,7 +318,7 @@ if (WITH_GPERF) add_third_party( gperf -- URL https://github.com/gperftools/gperftools/archive/gperftools-2.16.tar.gz +- URL https://github.com/gperftools/gperftools/archive/gperftools-2.18.1.tar.gz + DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/gperf/. # GIT_SHALLOW TRUE # Remove building the unneeded programs (they fail on macos) -@@ -312,9 +308,7 @@ set(MIMALLOC_INCLUDE_DIR ${THIRD_PARTY_LIB_DIR}/mimalloc/include) - set (MIMALLOC_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/mimalloc/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/mimalloc-v2.1.6.patch) - - add_third_party(mimalloc -- #GIT_REPOSITORY https://github.com/microsoft/mimalloc.git -- #GIT_TAG 0f6d8293c74796fa913e4b5eb4361f1e4734f7c6 -- URL https://github.com/microsoft/mimalloc/archive/refs/tags/v2.1.6.tar.gz -+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/mimalloc216/. - PATCH_COMMAND "${MIMALLOC_PATCH_COMMAND}" - # -DCMAKE_BUILD_TYPE=Release - # Add -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS=-O0 to debug -@@ -328,7 +322,7 @@ add_third_party(mimalloc - ) - - add_third_party(jemalloc -- URL https://github.com/jemalloc/jemalloc/releases/download/5.2.1/jemalloc-5.2.1.tar.bz2 -+ DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/jemalloc/. - PATCH_COMMAND ./autogen.sh - CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/jemalloc --with-jemalloc-prefix=je_ --disable-libdl - ) -@@ -336,7 +330,7 @@ add_third_party(jemalloc +@@ -367,7 +348,7 @@ endif() add_third_party( xxhash @@ -80,16 +77,16 @@ index 810a8fa..8b11922 100644 # A bug in xxhash 0.8.1 that searches for a file that doesn't exist PATCH_COMMAND touch /xxhsum.1 -@@ -347,7 +341,7 @@ add_third_party( +@@ -378,7 +359,7 @@ add_third_party( add_third_party( uring -- URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.8.tar.gz +- URL https://github.com/axboe/liburing/archive/refs/tags/liburing-2.13.tar.gz + DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/uring/. CONFIGURE_COMMAND /configure --prefix=${THIRD_PARTY_LIB_DIR}/uring BUILD_COMMAND make -C src -@@ -356,7 +350,7 @@ add_third_party( +@@ -387,12 +368,12 @@ add_third_party( add_third_party( pugixml @@ -98,28 +95,35 @@ index 810a8fa..8b11922 100644 ) if (WITH_AWS) -@@ -364,9 +358,7 @@ if (WITH_AWS) + set (AWS_PATCH_COMMAND patch -p1 -d ${THIRD_PARTY_DIR}/aws/ -i ${CMAKE_CURRENT_LIST_DIR}/../patches/aws-sdk-cpp-1.11.717.patch) +- set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5") ++ set(AWS_CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DENABLE_CURL_LOGGING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DAWS_SDK_WARNINGS_ARE_ERRORS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5 -DENFORCE_SUBMODULE_VERSIONS=OFF") + + if (OPENSSL_CRYPTO_LIBRARY AND OPENSSL_INCLUDE_DIR) + string(APPEND AWS_CMAKE_PASS_FLAGS " -Dcrypto_LIBRARY=${OPENSSL_CRYPTO_LIBRARY} -Dcrypto_INCLUDE_DIR=${OPENSSL_INCLUDE_DIR}") +@@ -410,10 +391,7 @@ if (WITH_AWS) add_third_party( aws - GIT_REPOSITORY https://github.com/aws/aws-sdk-cpp.git -- GIT_TAG 3e51fa016655eeb6b6610bdf8fe7cf33ebbf3e00 +- GIT_TAG 1.11.717 - GIT_SHALLOW TRUE +- GIT_CONFIG submodule.recurse=1 submodule.fetchJobs=10 + DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/aws-sdk-cpp/. PATCH_COMMAND "${AWS_PATCH_COMMAND}" - CMAKE_PASS_FLAGS "-DBUILD_ONLY=s3 -DNO_HTTP_CLIENT=ON -DENABLE_TESTING=OFF -DAUTORUN_UNIT_TESTS=OFF -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_LIBDIR=lib -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + CMAKE_PASS_FLAGS "${AWS_CMAKE_PASS_FLAGS}" LIB libaws-cpp-sdk-s3.a libaws-cpp-sdk-core.a libaws-crt-cpp.a libaws-c-mqtt.a libaws-c-event-stream.a libaws-c-s3.a libaws-c-auth.a libaws-c-http.a libaws-c-io.a libs2n.a libaws-c-compression.a libaws-c-cal.a libaws-c-sdkutils.a libaws-checksums.a libaws-c-common.a -@@ -376,8 +368,7 @@ endif() - if (WITH_GCP) - add_third_party( - rapidjson -- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git -- GIT_TAG ab1842a -+ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. - CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \ - -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5" - LIB "none" -@@ -386,24 +377,23 @@ endif() +@@ -422,8 +400,7 @@ endif() + + add_third_party( + rapidjson +- GIT_REPOSITORY https://github.com/Tencent/rapidjson.git +- GIT_TAG ab1842a ++ DOWNLOAD_COMMAND cp -r ${CMAKE_BINARY_DIR}/deps-nixpkgs/rapidjson/. + CMAKE_PASS_FLAGS "-DRAPIDJSON_BUILD_TESTS=OFF -DRAPIDJSON_BUILD_EXAMPLES=OFF \ + -DRAPIDJSON_BUILD_DOC=OFF -DCMAKE_POLICY_VERSION_MINIMUM=3.5" + LIB "none" +@@ -431,14 +408,14 @@ add_third_party( add_third_party( cares @@ -134,11 +138,9 @@ index 810a8fa..8b11922 100644 - URL https://github.com/facebook/zstd/releases/download/v1.5.7/zstd-1.5.7.tar.zst + DOWNLOAD_COMMAND cp -r ${CMAKE_CURRENT_BINARY_DIR}/deps-nixpkgs/zstd/. SOURCE_SUBDIR "build/cmake" -- -+ + # for debug pass : "CFLAGS=-fPIC -O0 -ggdb" - CMAKE_PASS_FLAGS "-DZSTD_BUILD_SHARED=OFF -DZSTD_BUILD_PROGRAMS=OFF -DZSTD_BUILD_TESTS=OFF" - ) +@@ -447,8 +424,7 @@ add_third_party( add_third_party( expected diff --git a/pkgs/by-name/dr/dragonflydb/package.nix b/pkgs/by-name/dr/dragonflydb/package.nix index cbd5fe185d33..4d9f71ac3f4e 100644 --- a/pkgs/by-name/dr/dragonflydb/package.nix +++ b/pkgs/by-name/dr/dragonflydb/package.nix @@ -4,7 +4,6 @@ stdenv, # Dependencies - abseil-cpp, c-ares, croncpp, double-conversion, @@ -15,8 +14,6 @@ gperftools, gtest, hdrhistogram_c, - hnswlib, - jemalloc, liburing, lz4, pcre2, @@ -36,6 +33,7 @@ cmake, gcc-unwrapped, ninja, + perl, # Runtime dependencies boost, @@ -57,21 +55,31 @@ let pname = "dragonflydb"; - version = "1.34.2"; + version = "1.39.0"; src = fetchFromGitHub { owner = "dragonflydb"; repo = "dragonfly"; tag = "v${version}"; - hash = "sha256-n70IB32tZDe665hVLrKC0BSSJutmYhtPJvfNa48xaqA="; + hash = "sha256-vLuuf3fVdVzcd06bafGiLtION6IwTnspiIJmZF9tUGg="; fetchSubmodules = true; }; - aws-sdk-cpp-1-11-162 = fetchFromGitHub { + # dragonfly's helio applies patches written against this exact abseil + # release (see helio/patches/abseil-20250512.1.patch), so it's pinned here + # rather than taken from nixpkgs' abseil-cpp, which tracks a newer version. + abseil-cpp-20250512 = fetchFromGitHub { + owner = "abseil"; + repo = "abseil-cpp"; + tag = "20250512.1"; + hash = "sha256-eB7OqTO9Vwts9nYQ/Mdq0Ds4T1KgmmpYdzU09VPWOhk="; + }; + + aws-sdk-cpp-1-11-717 = fetchFromGitHub { owner = "aws"; repo = "aws-sdk-cpp"; - tag = "1.11.162"; - hash = "sha256-NxVE7H8BOetpbBkB2PTVBoHSXYm6cTp41F1LJmhtBbs="; + tag = "1.11.717"; + hash = "sha256-stDZg9dvKljnbZZUHEn1KmlgDdvW6BK7H7RtGk/nyEI="; fetchSubmodules = true; }; @@ -85,8 +93,17 @@ let jsoncons-dragonfly = fetchFromGitHub { owner = "dragonflydb"; repo = "jsoncons"; - rev = "Dragonfly.178"; - hash = "sha256-cxM95DFFo5z+eImgZzJw+ykaeSDtBF+hw5qo6gnL53s="; + rev = "Dragonfly1.5.0"; + hash = "sha256-9W9GJpzKuqolXoz5iYiE1EbVWr7HiFqpMgZO1BQdi0s="; + }; + + # dragonfly's search module uses a fork of hnswlib with custom changes, so + # this can't come from nixpkgs' hnswlib (nmslib upstream). + hnswlib-dragonfly = fetchFromGitHub { + owner = "dragonflydb"; + repo = "hnswlib"; + rev = "d07dd1da2bf48b85d2f03b8396193ad7120f75c2"; + hash = "sha256-GFBjKzDauznGGfkXZqSFgbvBKxDXbx2rETqY5BnCIiw="; }; lua-dragonfly = fetchFromGitHub { @@ -96,13 +113,6 @@ let hash = "sha256-uLNe+hLihu4wMW/wstGnYdPa2bGPC5UiNE+VyNIYY2c="; }; - mimalloc216 = fetchFromGitHub { - owner = "microsoft"; - repo = "mimalloc"; - tag = "v2.1.6"; - hash = "sha256-Ff3+RP+lAXCOeHJ87oG3c02rPP4WQIbg5L/CVe6gA3M="; - }; - mimalloc224 = fetchFromGitHub { owner = "microsoft"; repo = "mimalloc"; @@ -110,6 +120,15 @@ let hash = "sha256-+8xZT+mVEqlqabQc+1buVH/X6FZxvCd0rWMyjPu9i4o="; }; + # nixpkgs' libstemmer is older than the snowball release dragonfly's search + # module builds against, so the source is pinned and built in-tree here. + snowball-stemmer = fetchFromGitHub { + owner = "snowballstem"; + repo = "snowball"; + tag = "v3.0.1"; + hash = "sha256-QPIPePddUqwpa0YMn0E7H9GZj3s2bEkJzZdXlrHeZbo="; + }; + withUnwind = !stdenv.targetPlatform.isAarch64; in stdenv.mkDerivation { @@ -130,7 +149,7 @@ stdenv.mkDerivation { # Copy FetchContent dependencies (in helio/cmake/third_party.cmake) # These go to build/_deps/ where FetchContent expects them - cp -r --no-preserve=mode,ownership ${abseil-cpp.src} build/_deps/abseil_cpp-src + cp -r --no-preserve=mode,ownership ${abseil-cpp-20250512} build/_deps/abseil_cpp-src cp -r --no-preserve=mode,ownership ${gbenchmark.src} build/_deps/benchmark-src cp -r --no-preserve=mode,ownership ${glog-absl} build/_deps/glog-src cp -r --no-preserve=mode,ownership ${gtest.src} build/_deps/gtest-src @@ -142,13 +161,12 @@ stdenv.mkDerivation { cp -r --no-preserve=mode,ownership ${fast-float.src} build/deps-nixpkgs/fast_float cp -r --no-preserve=mode,ownership ${flatbuffers_23.src} build/deps-nixpkgs/flatbuffers cp -r --no-preserve=mode,ownership ${hdrhistogram_c.src} build/deps-nixpkgs/hdr_histogram - cp -r --no-preserve=mode,ownership ${jemalloc.src} build/deps-nixpkgs/jemalloc cp -r --no-preserve=mode,ownership ${jsoncons-dragonfly} build/deps-nixpkgs/jsoncons cp -r --no-preserve=mode,ownership ${liburing.src} build/deps-nixpkgs/uring cp -r --no-preserve=mode,ownership ${lua-dragonfly} build/deps-nixpkgs/lua cp -r --no-preserve=mode,ownership ${lz4.src} build/deps-nixpkgs/lz4 - cp -r --no-preserve=mode,ownership ${mimalloc216} build/deps-nixpkgs/mimalloc216 cp -r --no-preserve=mode,ownership ${mimalloc224} build/deps-nixpkgs/mimalloc224 + cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson cp -r --no-preserve=mode,ownership ${pugixml.src} build/deps-nixpkgs/pugixml cp -r --no-preserve=mode,ownership ${re-flex.src} build/deps-nixpkgs/reflex cp -r --no-preserve=mode,ownership ${xxhash.src} build/deps-nixpkgs/xxhash @@ -161,16 +179,7 @@ stdenv.mkDerivation { ${ if withAws then '' - cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-162} build/deps-nixpkgs/aws-sdk-cpp - '' - else - "" - } - - ${ - if withGcp then - '' - cp -r --no-preserve=mode,ownership ${rapidjson.src} build/deps-nixpkgs/rapidjson + cp -r --no-preserve=mode,ownership ${aws-sdk-cpp-1-11-717} build/deps-nixpkgs/aws-sdk-cpp '' else "" @@ -188,7 +197,8 @@ stdenv.mkDerivation { ${ if withSearch then '' - cp -r --no-preserve=mode,ownership ${hnswlib.src} build/deps-nixpkgs/hnswlib + cp -r --no-preserve=mode,ownership ${hnswlib-dragonfly} build/deps-nixpkgs/hnswlib + cp -r --no-preserve=mode,ownership ${snowball-stemmer} build/deps-nixpkgs/stemmer cp -r --no-preserve=mode,ownership ${uni-algo.src} build/deps-nixpkgs/uni-algo '' else @@ -200,6 +210,14 @@ stdenv.mkDerivation { chmod u+x build/deps-nixpkgs/reflex/configure chmod u+x build/deps-nixpkgs/uring/configure touch build/deps-nixpkgs/xxhash/xxhsum.1 + + # snowball generates its C sources with perl scripts run via their shebang; + # the source copy drops their execute bit, so restore it and fix the + # /usr/bin/env shebang for the sandbox. + if [ -d build/deps-nixpkgs/stemmer ]; then + find build/deps-nixpkgs/stemmer -name '*.pl' -exec chmod +x {} + + patchShebangs build/deps-nixpkgs/stemmer + fi ''; nativeBuildInputs = [ @@ -209,6 +227,7 @@ stdenv.mkDerivation { bison cmake ninja + perl ]; buildInputs = [ diff --git a/pkgs/by-name/dr/drasl/package.nix b/pkgs/by-name/dr/drasl/package.nix index 49bf56f79376..6277aae2d512 100644 --- a/pkgs/by-name/dr/drasl/package.nix +++ b/pkgs/by-name/dr/drasl/package.nix @@ -10,13 +10,13 @@ }: buildGoModule (finalAttrs: { pname = "drasl"; - version = "3.4.3"; + version = "3.4.4"; src = fetchFromGitHub { owner = "unmojang"; repo = "drasl"; tag = "v${finalAttrs.version}"; - hash = "sha256-kisClBALEESxuGh2gtwCyB02/SrYvabouaApho7z7GY="; + hash = "sha256-GHwgN1yWf/xav2t03/09x/U0c6fRBDmEn0mDIv+V9ic="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dr/draupnir/package.nix b/pkgs/by-name/dr/draupnir/package.nix index 4152c07609d2..590a7a4e298f 100644 --- a/pkgs/by-name/dr/draupnir/package.nix +++ b/pkgs/by-name/dr/draupnir/package.nix @@ -13,6 +13,7 @@ cctools, nixosTests, nix-update-script, + fetchpatch2, }: let nodeSources = srcOnly nodejs_24; @@ -36,7 +37,14 @@ buildNpmPackage (finalAttrs: { ] ++ lib.optional stdenv.hostPlatform.isDarwin cctools.libtool; - npmDepsHash = "sha256-DvQM9Kr9Hc7/1OEZadZ1GvpAjfRmbdIcA6UDuFBQ+vo="; + patches = [ + (fetchpatch2 { + url = "https://github.com/the-draupnir-project/Draupnir/commit/4e63164046153c656050c6d0a325c79f1492153a.patch?full_index=1"; + hash = "sha256-dVG0BAE8pATfGdcHvTV8jTC+OQP0gMB7v396MtJlG4o="; + }) + ]; + + npmDepsHash = "sha256-7WAfSFfPQJ9d/U9hk5wypasSoU2JwkoCq/nKAnzFf1o="; preBuild = '' # install proper version and branch info diff --git a/pkgs/by-name/dr/drawio/package.nix b/pkgs/by-name/dr/drawio/package.nix index f93da550e2cd..0d88e62ee094 100644 --- a/pkgs/by-name/dr/drawio/package.nix +++ b/pkgs/by-name/dr/drawio/package.nix @@ -14,14 +14,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "drawio"; - version = "30.0.4"; + version = "30.2.6"; src = fetchFromGitHub { owner = "jgraph"; repo = "drawio-desktop"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-kkKiGRxztEVFo/wlcdBYcDlxadNarcTyL1MqwonfVY4="; + hash = "sha256-hn+Lrsn+aNZqVFcyLinuJjUiQgai0o4F5d5cT9CvtLA="; }; # `@electron/fuses` tries to run `codesign` and fails. Disable and use autoSignDarwinBinariesHook instead @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchNpmDeps { src = finalAttrs.src; - hash = "sha256-hv1LQwsSOsBR5l/joUmXq6foQsVilH+jw3Wje24ISCg="; + hash = "sha256-PnYUy0Arxo5uTYyYfUEkbd4u7oIOHkEc0/ufp0umBhE="; }; nativeBuildInputs = [ @@ -64,19 +64,18 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - cp -R ${electron.dist}/Electron.app Electron.app - chmod -R u+w Electron.app - export CSC_IDENTITY_AUTO_DISCOVERY=false + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" + sed -i "/afterSign/d" electron-builder-linux-mac.json - '' - + '' + npm exec electron-builder -- \ --dir \ - ${lib.optionalString stdenv.hostPlatform.isDarwin "--config electron-builder-linux-mac.json --config.mac.identity=null"} \ - -c.electronDist=${if stdenv.hostPlatform.isDarwin then "." else electron.dist} \ - -c.electronVersion=${electron.version} + --config electron-builder-linux-mac.json \ + -c.electronDist="$electron_dist" \ + -c.electronVersion=${electron.version} \ + -c.mac.identity=null runHook postBuild ''; diff --git a/pkgs/by-name/dr/drawterm/package.nix b/pkgs/by-name/dr/drawterm/package.nix index 58e89e83ca24..c5b7a32b5324 100644 --- a/pkgs/by-name/dr/drawterm/package.nix +++ b/pkgs/by-name/dr/drawterm/package.nix @@ -23,13 +23,13 @@ let in stdenv.mkDerivation { pname = "drawterm"; - version = "0-unstable-2026-05-26"; + version = "0-unstable-2026-06-27"; src = fetchFrom9Front { owner = "plan9front"; repo = "drawterm"; - rev = "0385fd3dc0343c4c882096c60558b01f61260736"; - hash = "sha256-OiGliIVMUpFaNkMn15qaYdBsU429Q0RUw68lqTOu880="; + rev = "a3b107c7356e034b95e83cdf40b367d68f1dc204"; + hash = "sha256-z0V3TM34yRpHYznQsniwyuxtVD2TtqgwIbEZTltxQ+o="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/dr/drawy/package.nix b/pkgs/by-name/dr/drawy/package.nix index c743c0cf6a91..c44ef3ca7ba6 100644 --- a/pkgs/by-name/dr/drawy/package.nix +++ b/pkgs/by-name/dr/drawy/package.nix @@ -12,16 +12,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "drawy"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitLab { domain = "invent.kde.org"; owner = "graphics"; repo = "drawy"; rev = "v${finalAttrs.version}"; - hash = "sha256-K070SiIf2bj1r44tixUZbsLYDxT65lEW0g68ENg3ZiE="; + hash = "sha256-Y6CAdHgcCK9lIae+CwqSGml+FAvVzLzyIAKdw85dKmQ="; }; + __structuredAttrs = true; strictDeps = true; nativeBuildInputs = [ @@ -31,32 +32,46 @@ stdenv.mkDerivation (finalAttrs: { shared-mime-info ]; - buildInputs = [ - qt6.qtbase - qt6.qttools - - kdePackages.extra-cmake-modules - kdePackages.kconfig - kdePackages.kconfigwidgets - kdePackages.kcoreaddons - kdePackages.kcrash - kdePackages.kdoctools - kdePackages.ki18n - kdePackages.kiconthemes - kdePackages.kwidgetsaddons - kdePackages.kxmlgui - kdePackages.syntax-highlighting - ]; + buildInputs = + (with qt6; [ + qtbase + qttools + ]) + ++ (with kdePackages; [ + extra-cmake-modules + kconfig + kconfigwidgets + kcoreaddons + kcrash + kdoctools + ki18n + kiconthemes + kwidgetsaddons + kxmlgui + syntax-highlighting + ]); passthru.updateScript = nix-update-script { }; meta = { description = "Handy and infinite brainstorming tool"; homepage = "https://apps.kde.org/drawy/"; - license = lib.licenses.gpl3Only; + changelog = "https://invent.kde.org/graphics/drawy/-/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + bsd2 + bsd3 + cc-by-sa-40 + cc0 + gpl2Plus + gpl3Plus + lgpl2Plus + mit + ofl + ]; maintainers = with lib.maintainers; [ - yiyu quarterstar + sigmasquadron + yiyu ]; mainProgram = "drawy"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/dr/drm_info/package.nix b/pkgs/by-name/dr/drm_info/package.nix index f2eaf49c6eb8..2c4d0deff321 100644 --- a/pkgs/by-name/dr/drm_info/package.nix +++ b/pkgs/by-name/dr/drm_info/package.nix @@ -3,6 +3,7 @@ stdenv, fetchFromGitLab, libdrm, + libdisplay-info, json_c, pciutils, meson, @@ -14,18 +15,23 @@ stdenv.mkDerivation (finalAttrs: { pname = "drm_info"; - version = "2.8.0"; + version = "2.10.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = "drm_info"; rev = "v${finalAttrs.version}"; - hash = "sha256-LtZ7JJmVNWMjJL2F6k+tcBpJ2v2fd+HNWyHAOvIi7Ko="; + hash = "sha256-QKF0frDPelwHOzf3r0tzSo7i1WfGhcFGJfxf2bj1+OE="; }; strictDeps = true; + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "'<2.4.134'" "'<2.4.133'" + ''; + depsBuildBuild = [ pkg-config ]; @@ -39,6 +45,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libdrm + libdisplay-info json_c pciutils ]; diff --git a/pkgs/by-name/dr/droidcam/package.nix b/pkgs/by-name/dr/droidcam/package.nix index c3a9a211284d..f99fa0692e9d 100644 --- a/pkgs/by-name/dr/droidcam/package.nix +++ b/pkgs/by-name/dr/droidcam/package.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: { version = "2.1.5"; src = fetchFromGitHub { - owner = "aramg"; - repo = "droidcam"; + owner = "dev47apps"; + repo = "droidcam-linux-client"; rev = "v${finalAttrs.version}"; sha256 = "sha256-22lRmtXumjR/83Fg1edBisM1GjNZvNUvPs1Yg7Na1xw="; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Linux client for DroidCam app"; - homepage = "https://github.com/aramg/droidcam"; + homepage = "https://github.com/dev47apps/droidcam-linux-client"; license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.suhr ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/dr/drone-runner-exec/package.nix b/pkgs/by-name/dr/drone-runner-exec/package.nix deleted file mode 100644 index 0786230cc586..000000000000 --- a/pkgs/by-name/dr/drone-runner-exec/package.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule { - pname = "drone-runner-exec"; - version = "unstable-2020-04-19"; - - src = fetchFromGitHub { - owner = "drone-runners"; - repo = "drone-runner-exec"; - rev = "c0a612ef2bdfdc6d261dfbbbb005c887a0c3668d"; - sha256 = "sha256-0UIJwpC5Y2TQqyZf6C6neICYBZdLQBWAZ8/K1l6KVRs="; - }; - - vendorHash = "sha256-ypYuQKxRhRQGX1HtaWt6F6BD9vBpD8AJwx/4esLrJsw="; - - meta = { - description = "Drone pipeline runner that executes builds directly on the host machine"; - homepage = "https://github.com/drone-runners/drone-runner-exec"; - # https://polyformproject.org/licenses/small-business/1.0.0/ - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ mic92 ]; - mainProgram = "drone-runner-exec"; - }; -} diff --git a/pkgs/by-name/dr/drone-runner-ssh/package.nix b/pkgs/by-name/dr/drone-runner-ssh/package.nix index f043415017f3..2ae051c8f476 100644 --- a/pkgs/by-name/dr/drone-runner-ssh/package.nix +++ b/pkgs/by-name/dr/drone-runner-ssh/package.nix @@ -6,7 +6,7 @@ buildGoModule { pname = "drone-runner-ssh"; - version = "unstable-2022-12-22"; + version = "1.0.1-unstable-2022-12-22"; src = fetchFromGitHub { owner = "drone-runners"; diff --git a/pkgs/by-name/dr/drone/package.nix b/pkgs/by-name/dr/drone/package.nix index 8441cc9548a4..e3156c5938c6 100644 --- a/pkgs/by-name/dr/drone/package.nix +++ b/pkgs/by-name/dr/drone/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "harness"; - repo = "drone"; + repo = "harness"; tag = "v${finalAttrs.version}"; hash = "sha256-jKM+jET6dsMe5+QRDKIHA40OOHb/nZmli3owaDB7IvU="; }; @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { meta = { description = "Continuous Integration platform built on container technology"; mainProgram = "drone-server"; - homepage = "https://github.com/harness/drone"; + homepage = "https://github.com/harness/harness"; maintainers = with lib.maintainers; [ vdemeester techknowlogick diff --git a/pkgs/applications/networking/droopy/default.nix b/pkgs/by-name/dr/droopy/package.nix similarity index 100% rename from pkgs/applications/networking/droopy/default.nix rename to pkgs/by-name/dr/droopy/package.nix diff --git a/pkgs/by-name/dr/dropbear/package.nix b/pkgs/by-name/dr/dropbear/package.nix index 2474bc2e0fb9..7663666681f0 100644 --- a/pkgs/by-name/dr/dropbear/package.nix +++ b/pkgs/by-name/dr/dropbear/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, libxcrypt, enableSCP ? false, @@ -15,18 +15,24 @@ let SFTPSERVER_PATH = sftpPath; DROPBEAR_PATH_SSH_PROGRAM = "${placeholder "out"}/bin/dbclient"; }; - in - stdenv.mkDerivation (finalAttrs: { pname = "dropbear"; - version = "2026.91"; + version = "2026.93"; - src = fetchurl { - url = "https://matt.ucc.asn.au/dropbear/releases/dropbear-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-3vqSRHWr9rwedKvAAXPka/3IBL1Hyq+hT1pO8Mx22jQ="; + src = fetchFromGitHub { + owner = "mkj"; + repo = "dropbear"; + tag = "DROPBEAR_${finalAttrs.version}"; + hash = "sha256-Xs5LTVaNdfRKx0cFTQknaHXka6QhxBS2JNTQ8RoHG80="; }; + patches = [ + # Allow sessions to inherit the PATH from the parent dropbear. + # Otherwise they only get the usual /bin:/usr/bin kind of PATH + ./pass-path.patch + ]; + env.CFLAGS = lib.pipe (lib.attrNames dflags) [ (map (name: "-D${name}=\\\"${dflags.${name}}\\\"")) (lib.concatStringsSep " ") @@ -55,27 +61,38 @@ stdenv.mkDerivation (finalAttrs: { ) ''; - postInstall = lib.optionalString enableSCP '' - ln -rs $out/bin/scp $out/bin/dbscp - ''; - - patches = [ - # Allow sessions to inherit the PATH from the parent dropbear. - # Otherwise they only get the usual /bin:/usr/bin kind of PATH - ./pass-path.patch - ]; - buildInputs = [ zlib libxcrypt ]; + postInstall = lib.optionalString enableSCP '' + ln -rs $out/bin/scp $out/bin/dbscp + ''; + meta = { - description = "Small footprint implementation of the SSH 2 protocol"; + description = "Small memory footprint ssh server/client suitable for memory-constrained environments"; + longDescription = '' + Dropbear is particularly useful for "embedded"-type Linux (or other Unix) systems, such as wireless routers. + + ## Features + + * Implements X11 forwarding, and authentication-agent forwarding for OpenSSH clients + * Can run from inetd or standalone + * Compatible with OpenSSH ~/.ssh/authorized_keys public key authentication + * Multi-hop mode uses SSH TCP forwarding to tunnel through multiple SSH hosts in a single command: + + ```shell + dbclient user1@hop1,user2@hop2,destination + ``` + ''; homepage = "https://matt.ucc.asn.au/dropbear/dropbear.html"; - changelog = "https://github.com/mkj/dropbear/raw/DROPBEAR_${finalAttrs.version}/CHANGES"; + changelog = "https://github.com/mkj/dropbear/releases/tag/DROPBEAR_${finalAttrs.version}"; + downloadPage = "https://matt.ucc.asn.au/dropbear/releases"; license = lib.licenses.mit; - maintainers = [ ]; platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + debtquity + ]; }; }) diff --git a/pkgs/by-name/dr/drupal/package.nix b/pkgs/by-name/dr/drupal/package.nix index 9427835d4bef..b9969e825517 100644 --- a/pkgs/by-name/dr/drupal/package.nix +++ b/pkgs/by-name/dr/drupal/package.nix @@ -8,18 +8,18 @@ php.buildComposerProject2 (finalAttrs: { pname = "drupal"; - version = "11.3.11"; + version = "11.4.4"; src = fetchFromGitLab { domain = "git.drupalcode.org"; owner = "project"; repo = "drupal"; tag = finalAttrs.version; - hash = "sha256-O1Al14D9vZEdNOtOKcvMnlp6hyjrfu8n2nTE5qk4Xe0="; + hash = "sha256-lwD4k4orQQD9gl60/Er9s1JTClN2i7b7JxBFuz5h+4s="; }; composerNoPlugins = false; - vendorHash = "sha256-pA1Hy4WtHqWQTBxD0fbbetg0heVYfuPJUUOHPE3JyGc="; + vendorHash = "sha256-mJwOXz+nn1N7kFKofkuqBcbXJGwJDcgRrhKAhhwydik="; passthru = { tests = { diff --git a/pkgs/by-name/ds/ds4u/package.nix b/pkgs/by-name/ds/ds4u/package.nix new file mode 100644 index 000000000000..2396f5a873fc --- /dev/null +++ b/pkgs/by-name/ds/ds4u/package.nix @@ -0,0 +1,108 @@ +{ + lib, + fetchFromGitea, + rustPlatform, + pkg-config, + systemd, + hidapi, + openssl, + libxkbcommon, + alsa-lib, + vulkan-loader, + wayland, + libx11, + libxcursor, + libxi, + copyDesktopItems, + makeDesktopItem, + autoPatchelfHook, + udevCheckHook, + writeText, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ds4u"; + version = "0.1.1"; + __structuredAttrs = true; + + src = fetchFromGitea { + domain = "git.yokai.digital"; + owner = "deadYokai"; + repo = "ds4u"; + tag = "v${finalAttrs.version}"; + hash = "sha256-q8NbpFbrYMtE56CnnjScbMewHCTxaxMih8/I9dspb+o="; + }; + + cargoHash = "sha256-KjNHX3S+XFUsngX8Od3HtI0IvpAyMp5TB6TVkCkl8Gc="; + + nativeBuildInputs = [ + pkg-config + copyDesktopItems + autoPatchelfHook + ]; + + buildInputs = [ + alsa-lib + libxkbcommon + vulkan-loader + wayland + libx11 + libxcursor + libxi + openssl + systemd + hidapi + ]; + + # autoPatchelfHook doesnt find these automatically using dlopen + appendRunpaths = [ (lib.makeLibraryPath finalAttrs.buildInputs) ]; + + udevRules = writeText "ds4u.rules" '' + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0ce6", MODE="0664", GROUP="input", TAG+="uaccess" + SUBSYSTEM=="hidraw", ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0df2", MODE="0664", GROUP="input", TAG+="uaccess" + ''; + + preInstall = '' + # desktop icon install + install -Dm644 $src/assets/icon.svg $out/share/icons/hicolor/scalable/apps/ds4u.svg + # udev rules + install -Dm644 ${finalAttrs.udevRules} -D $out/lib/udev/rules.d/70-ds4u.rules + ''; + + nativeInstallCheckInputs = [ udevCheckHook ]; + doInstallCheck = true; + + desktopItems = [ + (makeDesktopItem { + name = "ds4u"; + desktopName = "DS4U"; + comment = finalAttrs.meta.description; + exec = "ds4u"; + icon = "ds4u"; + terminal = false; + type = "Application"; + categories = [ + "Utility" + "Settings" + "Game" + ]; + keywords = [ + "controller" + "dualsense" + "ps5" + "gamepad" + ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "DualSense controller manager for Linux"; + homepage = "https://git.yokai.digital/deadYokai/ds4u"; + license = lib.licenses.mit; + mainProgram = "ds4u"; + maintainers = with lib.maintainers; [ cakeforcat ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ds/dsearch/package.nix b/pkgs/by-name/ds/dsearch/package.nix index 1855fd95f5e6..d4007f994c56 100644 --- a/pkgs/by-name/ds/dsearch/package.nix +++ b/pkgs/by-name/ds/dsearch/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "dsearch"; - version = "0.3.1"; + version = "0.3.2"; src = fetchFromGitHub { owner = "AvengeMedia"; repo = "danksearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-pEJgw0so89I/dELzYK58kwFASA+x+TH2D6moXdaFY4E="; + hash = "sha256-TnoKATODjWk4e1w3VhRYLWGMdXMJzDyvQF8mtD6WRGA="; }; - vendorHash = "sha256-scvZWbMHAhpYWCU0xZK1E6h6sAkoXegqI1iYS44fcCg="; + vendorHash = "sha256-Gq3tVwe39m5KGfkI3DEnQEQEGs/cLDCiwx6XFM61f6c="; ldflags = [ "-w" diff --git a/pkgs/by-name/dt/dtach/package.nix b/pkgs/by-name/dt/dtach/package.nix index 552026083c58..f531d7db170c 100644 --- a/pkgs/by-name/dt/dtach/package.nix +++ b/pkgs/by-name/dt/dtach/package.nix @@ -1,29 +1,26 @@ { lib, stdenv, - fetchurl, - fetchpatch2, + fetchFromGitHub, }: -stdenv.mkDerivation (finalAttrs: { +stdenv.mkDerivation { pname = "dtach"; - version = "0.9"; + version = "0.9-unstable-2025-06-20"; - src = fetchurl { - url = "mirror://sourceforge/project/dtach/dtach/${finalAttrs.version}/dtach-${finalAttrs.version}.tar.gz"; - sha256 = "1wwj2hlngi8qn2pisvhyfxxs8gyqjlgrrv5lz91w8ly54dlzvs9j"; + src = fetchFromGitHub { + owner = "crigler"; + repo = "dtach"; + rev = "b027c27b2439081064d07a86883c8e0b20a183c9"; + hash = "sha256-ilxBbrqwGe+jpFbQ93nfyp3HuDY0D7NgIXkIkw9YXkI="; }; - patches = [ - (fetchpatch2 { - url = "https://github.com/crigler/dtach/commit/6d80909a8c0fd19717010a3c76fec560f988ca48.patch?full_index=1"; - hash = "sha256-v3vToJdSwihiPCSjXjEJghiaynHPTEql3F7URXRjCbM="; - }) - ]; - installPhase = '' - mkdir -p $out/bin - cp dtach $out/bin/dtach + runHook preInstall + + install -D dtach $out/bin/dtach + + runHook postInstall ''; meta = { @@ -40,9 +37,8 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = [ lib.maintainers.jmbaur ]; mainProgram = "dtach"; }; -}) +} diff --git a/pkgs/by-name/dt/dtc/package.nix b/pkgs/by-name/dt/dtc/package.nix index ae581df6a81c..17fe8f5653e3 100644 --- a/pkgs/by-name/dt/dtc/package.nix +++ b/pkgs/by-name/dt/dtc/package.nix @@ -49,8 +49,6 @@ stdenv.mkDerivation (finalAttrs: { } ); - env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; - nativeBuildInputs = [ meson ninja diff --git a/pkgs/by-name/dt/dtop/package.nix b/pkgs/by-name/dt/dtop/package.nix index 6d7cd35ae900..025430f7b0b3 100644 --- a/pkgs/by-name/dt/dtop/package.nix +++ b/pkgs/by-name/dt/dtop/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dtop"; - version = "0.7.7"; + version = "0.7.9"; src = fetchFromGitHub { owner = "amir20"; repo = "dtop"; tag = "v${finalAttrs.version}"; - hash = "sha256-kYSOJCQfoYXhdZ3cyRv/+Ifov4VzOv0gqvjueVMmnuQ="; + hash = "sha256-1OHtMV2GmZQIx2pVujOXoQOkc6hJdJZjca4kk4HyESM="; }; - cargoHash = "sha256-fspIjgctyhQwyDygrSrtJBb/EYxY8o00/UJy/z89yso="; + cargoHash = "sha256-OHjgG5qHBz0Q74uWLkN9Ok0NiVeT71qpEjzFdMFWlfs="; nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; diff --git a/pkgs/by-name/dt/dtsfmt/package.nix b/pkgs/by-name/dt/dtsfmt/package.nix index be7b41f01ce4..6f78fc072789 100644 --- a/pkgs/by-name/dt/dtsfmt/package.nix +++ b/pkgs/by-name/dt/dtsfmt/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Auto formatter for device tree files"; homepage = "https://github.com/mskelton/dtsfmt"; license = lib.licenses.isc; - maintainers = with lib.maintainers; [ toodeluna ]; + maintainers = with lib.maintainers; [ luna-the-tuna ]; mainProgram = "dtsfmt"; }; }) diff --git a/pkgs/by-name/du/dua/package.nix b/pkgs/by-name/du/dua/package.nix index f851a097f925..7c1579211686 100644 --- a/pkgs/by-name/du/dua/package.nix +++ b/pkgs/by-name/du/dua/package.nix @@ -1,20 +1,22 @@ { + stdenv, lib, rustPlatform, fetchFromGitHub, versionCheckHook, nix-update-script, + installShellFiles, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "dua"; - version = "2.34.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "Byron"; repo = "dua-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-F09Ne+2Ospw44L97nwHXp/ELM9B3G2Mt0Crau//zV/c="; + hash = "sha256-vvCEWTkDoJvlz3hKay/179zkrDUU4rjeLtxZtw2YFLY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -22,12 +24,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; }; - cargoHash = "sha256-g92G/4mfHH7zW14eoodL7j179Iah5iAH78zlmcxM/AM="; + cargoHash = "sha256-bYnRng0bPdGC9Y/jVjqWgFcoMM04F1BF02IwATq8Ohw="; checkFlags = [ # Skip interactive tests "--skip=interactive::app::tests::journeys_readonly::quit_instantly_when_nothing_marked" "--skip=interactive::app::tests::journeys_readonly::quit_requires_two_presses_when_items_marked" + "--skip=interactive::app::tests::journeys_readonly::once_allows_replayed_quit_to_exit stdout" "--skip=interactive::app::tests::journeys_readonly::simple_user_journey_read_only" "--skip=interactive::app::tests::journeys_with_writes::basic_user_journey_with_deletion" "--skip=interactive::app::tests::unit::it_can_handle_ending_traversal_reaching_top_but_skipping_levels" @@ -37,13 +40,23 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + nativeBuildInputs = [ installShellFiles ]; + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + # TODO: Upstream also provides Elvish and PowerShell completions, + # but `installShellCompletion` only has support for Bash, Zsh and Fish at the moment. + installShellCompletion --cmd dua \ + --bash <($out/bin/dua completions bash) \ + --fish <($out/bin/dua completions fish) \ + --zsh <($out/bin/dua completions zsh) + ''; + passthru.updateScript = nix-update-script { }; meta = { description = "Tool to conveniently learn about the disk usage of directories"; homepage = "https://github.com/Byron/dua-cli"; changelog = "https://github.com/Byron/dua-cli/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ killercup defelo diff --git a/pkgs/by-name/du/dub/package.nix b/pkgs/by-name/du/dub/package.nix index 457af1c63539..27e2de5e22f9 100644 --- a/pkgs/by-name/du/dub/package.nix +++ b/pkgs/by-name/du/dub/package.nix @@ -163,7 +163,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 401df7d6762b..9c86d318fa57 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -152,11 +152,12 @@ stdenv.mkDerivation (finalAttrs: { ); LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; in + # FIXME: do something about the excessive logging on x86_64-linux (> 250 MiB). '' runHook preInstallCheck (($(ulimit -n) < 1024)) && ulimit -n 1024 - HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes} + HOME="$(mktemp -d)" ${LD_LIBRARY_PATH}="$lib/lib" ./test/unittest ${toString excludes}${lib.optionalString stdenv.hostPlatform.isx86_64 " >/dev/null"} runHook postInstallCheck ''; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index 6b16dcfd94a2..0f1ac213431c 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,6 +1,6 @@ { - "version": "1.5.2", - "rev": "8a5851971fae891f292c2714d86046ee018e9737", - "hash": "sha256-FWoVF7s/n28NN1HtnO0Cr3YyoIDgJcWBtBiO7vWiSOU=", - "python_hash": "sha256-B14dXW5pPnToiKbSD9ACzNksIhBG+ui1P9l67Qyke8o=" + "version": "1.5.4", + "rev": "08e34c447bae34eaee3723cac61f2878b6bdf787", + "hash": "sha256-6xpKZKfH5/nwE2nU5kcpgITKFm3ilb1PYf9QEk+bKoM=", + "python_hash": "sha256-2TgMuaeAehJ5rvpfA57KTmHtTZnvfa/nl/Y9ASCwVs0=" } diff --git a/pkgs/by-name/du/dumbpipe/package.nix b/pkgs/by-name/du/dumbpipe/package.nix index e76e8e71f581..e3133bcde92d 100644 --- a/pkgs/by-name/du/dumbpipe/package.nix +++ b/pkgs/by-name/du/dumbpipe/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dumbpipe"; - version = "0.33.0"; + version = "0.39.0"; src = fetchFromGitHub { owner = "n0-computer"; repo = "dumbpipe"; tag = "v${finalAttrs.version}"; - hash = "sha256-8iubiYZTOCGD7BjqMDnOi3Or1b7cYffL2HBEikUCXF8="; + hash = "sha256-AoWWFlMjo1bZUq5RY4gjpEMydULHaCKSSxBh45a7pdI="; }; - cargoHash = "sha256-nc/xGi+9kX9OAGLs2uTHMp8Z9+6DLKTvVki2RgNAUV0="; + cargoHash = "sha256-je2/GjCCDymYGhho6yf7SNQ3YkLCLQ5nEqHPNdDXjbQ="; __darwinAllowLocalNetworking = true; @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { asl20 mit ]; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "dumbpipe"; }; }) diff --git a/pkgs/by-name/du/dummyhttp/package.nix b/pkgs/by-name/du/dummyhttp/package.nix index d148a7579701..d3eee27af110 100644 --- a/pkgs/by-name/du/dummyhttp/package.nix +++ b/pkgs/by-name/du/dummyhttp/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Super simple HTTP server that replies a fixed body with a fixed response code"; homepage = "https://github.com/svenstaro/dummyhttp"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "dummyhttp"; }; diff --git a/pkgs/by-name/du/dump_syms/package.nix b/pkgs/by-name/du/dump_syms/package.nix index fde3b759d734..e1e2f06ea2ca 100644 --- a/pkgs/by-name/du/dump_syms/package.nix +++ b/pkgs/by-name/du/dump_syms/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "dump_syms"; - version = "2.3.7"; + version = "2.3.8"; src = fetchFromGitHub { owner = "mozilla"; repo = "dump_syms"; rev = "v${finalAttrs.version}"; - hash = "sha256-fCplZFp+yONBd2HDDlX/6XcmnQFbsnVmiS5b8fqGOAE="; + hash = "sha256-b+uZC+ss1utfQQOO+P9Nb1KomNcyxwSUcNAzaPh2Bik="; }; - cargoHash = "sha256-guJgkcldcKvi3XWolAqyB5bFzlSMNQQMzri6axGJpLo="; + cargoHash = "sha256-1M5IqcyDrQGhOALTyqSu6ZxZS8YBkxm+K++nOQhOEKI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/du/dumpifs/package.nix b/pkgs/by-name/du/dumpifs/package.nix index 6966e375bd7c..c01a80115082 100644 --- a/pkgs/by-name/du/dumpifs/package.nix +++ b/pkgs/by-name/du/dumpifs/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; postUnpack = '' - rm source/{dumpifs,exMifsLzo,uuu,zzz} + rm ${finalAttrs.src.name}/{dumpifs,exMifsLzo,uuu,zzz} ''; patches = [ ./package.patch ]; diff --git a/pkgs/by-name/du/dune/package.nix b/pkgs/by-name/du/dune/package.nix index 2a5b9122740a..0f50adc7b00f 100644 --- a/pkgs/by-name/du/dune/package.nix +++ b/pkgs/by-name/du/dune/package.nix @@ -3,7 +3,7 @@ stdenv, fetchurl, buildPackages, - version ? "3.21.1", + version ? "3.23.1", }: let # needed for pkgsStatic @@ -21,6 +21,8 @@ stdenv.mkDerivation { "https://github.com/ocaml/dune/releases/download/${version}/dune-${sfx}${version}.tbz"; hash = { + "3.23.1" = "sha256-k7TnFX9rqP62HPxfhgCO/SxZA3unigF9krSr8wYyNI8="; + "3.22.2" = "sha256-wsz4vGsXr6R8RQKXNXSWMDqnyGgOMpt52Yxo41AToRg="; "3.21.1" = "sha256-hPeoLG2ApxJPOEfppInoDPvq+3vtNXOsAShu9W/QjZQ="; "2.9.3" = "sha256:1ml8bxym8sdfz25bx947al7cvsi2zg5lcv7x9w6xb01cmdryqr9y"; } diff --git a/pkgs/by-name/du/dupe-krill/package.nix b/pkgs/by-name/du/dupe-krill/package.nix index a975ccf16da1..c42c2a51afcd 100644 --- a/pkgs/by-name/du/dupe-krill/package.nix +++ b/pkgs/by-name/du/dupe-krill/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast file deduplicator"; homepage = "https://github.com/kornelski/dupe-krill"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ urbas ]; mainProgram = "dupe-krill"; }; diff --git a/pkgs/by-name/du/duplicati/deps.json b/pkgs/by-name/du/duplicati/deps.json index eba4019bbca3..72e5400097aa 100644 --- a/pkgs/by-name/du/duplicati/deps.json +++ b/pkgs/by-name/du/duplicati/deps.json @@ -26,8 +26,8 @@ }, { "pname": "Avalonia", - "version": "12.0.0", - "hash": "sha256-pBn3o40TTYAPtjcfvaVK6wMFNSY7AHEE5wU4zDUj4FA=" + "version": "12.0.2", + "hash": "sha256-Ht2h4cBtnVhrk9VWsHDOEvU1wd/y80CxMDWn8W0lHKk=" }, { "pname": "Avalonia.Angle.Windows.Natives", @@ -46,8 +46,8 @@ }, { "pname": "Avalonia.Desktop", - "version": "12.0.0", - "hash": "sha256-M18vFA8cxZDR6RBF32O82n5pQAj70Jr6CpVXUEjtEso=" + "version": "12.0.2", + "hash": "sha256-ydFDRX0zTEtJJzjn+TTpcSYL49xBJ3vFi9v3NSOyPww=" }, { "pname": "Avalonia.Diagnostics", @@ -56,23 +56,23 @@ }, { "pname": "Avalonia.FreeDesktop", - "version": "12.0.0", - "hash": "sha256-jOAw9i1K093cfGrNOVZQgXm8nNxaFcRMhbLM3NFrGE8=" + "version": "12.0.2", + "hash": "sha256-raEQGX8Vwr+c7W5SzkEZ/phEEs/a5N0xeUfAWKEpl6A=" }, { "pname": "Avalonia.FreeDesktop.AtSpi", - "version": "12.0.0", - "hash": "sha256-/sXI18zP+SB8kRBZLl1WddrNxsgQRceoB3AiZwQYfWs=" + "version": "12.0.2", + "hash": "sha256-5AQPlWW6g7G6pm7qI8RHR/MQ45VGd7iAFWseXUitIVI=" }, { "pname": "Avalonia.HarfBuzz", - "version": "12.0.0", - "hash": "sha256-3S0L0YqiULMBgXbwlJl7qTwhBZl8I/ahM8GF1kcK/hE=" + "version": "12.0.2", + "hash": "sha256-FUYKVfweWiFix+LJZt9scI7HYiIl3C+8j9K0/yKsOIE=" }, { "pname": "Avalonia.Native", - "version": "12.0.0", - "hash": "sha256-QqPWE4I2TxCPHufuNkfx1r35lGN1W+c992gxzrB+RRc=" + "version": "12.0.2", + "hash": "sha256-E1uQvsvnVBIyzAyV3803LXMpitPvaoJezCedz6ZeV1A=" }, { "pname": "Avalonia.Remote.Protocol", @@ -81,18 +81,18 @@ }, { "pname": "Avalonia.Remote.Protocol", - "version": "12.0.0", - "hash": "sha256-l/NCO/I3Zavlta14Q198MpYn7jtwMclUWk6cqEgqmTU=" + "version": "12.0.2", + "hash": "sha256-19hc0GSsa9JujiZlHxLKn7x6fUjAeJSH3lO43hL0bD0=" }, { "pname": "Avalonia.Skia", - "version": "12.0.0", - "hash": "sha256-w8i8lTkf3yp78rPxg7LlcsrKF/K3J7ATOTy3D/Bt6CA=" + "version": "12.0.2", + "hash": "sha256-ZzNoO/8/SYG4xN0RmPz9AC6N1RtPTnSaTVrQ0+NNvGU=" }, { "pname": "Avalonia.Themes.Fluent", - "version": "12.0.0", - "hash": "sha256-wpBWj5EsRPDhsoE+RFGy8Z7wS8lN2s0mW7qFgRaVOOA=" + "version": "12.0.2", + "hash": "sha256-H8AXau1gV8m33lKYrSzxp0GDmoCuyx7+B93gTfcpXXU=" }, { "pname": "Avalonia.Themes.Simple", @@ -101,13 +101,13 @@ }, { "pname": "Avalonia.Win32", - "version": "12.0.0", - "hash": "sha256-QDS1fxNQMw3EHfrqihk05emNENjUmxLQyYgNCQp9vwM=" + "version": "12.0.2", + "hash": "sha256-yHcePPF2tKc9oussntmAr/4LX3FEkGRRFuzdmlE+NHQ=" }, { "pname": "Avalonia.X11", - "version": "12.0.0", - "hash": "sha256-WJjJKB2q1s18BVlLDUdPIpLQC2Bhgkl7fkO42Kjv2zU=" + "version": "12.0.2", + "hash": "sha256-not3Qv87nbN6Bi8sE49WKDSNzUTISBdcNR3rcFqgwHE=" }, { "pname": "AWSSDK.Core", @@ -936,28 +936,28 @@ }, { "pname": "SkiaSharp", - "version": "3.119.3-preview.1.1", - "hash": "sha256-fIrOUgx8K/qnJaQCPa06BPlkIy3PHRgrhHGkKn5d3qY=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-yUHsoau6WVQkzYV5UVnKcgpABiapa9aoTDd1pw/J5r8=" }, { "pname": "SkiaSharp.NativeAssets.Linux", - "version": "3.119.3-preview.1.1", - "hash": "sha256-JsQ9xmreA1zNaLwEHNPMaFsRygEDhemJCrbkhs8WHvQ=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-jcf0FhUgOzxpJ4ENn1q5uPe8dT+kXl0/yUWJs+hDYNA=" }, { "pname": "SkiaSharp.NativeAssets.macOS", - "version": "3.119.3-preview.1.1", - "hash": "sha256-9l1xrgVl6kH2kjW5ffluKv4ec/kqUfVnqlz9OVwP2cQ=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-olbqFOHmkiCdlnXHU4l1lTb04yAPn21CvLNMP4AGncs=" }, { "pname": "SkiaSharp.NativeAssets.WebAssembly", - "version": "3.119.3-preview.1.1", - "hash": "sha256-5UsssFayYOMcvWNBGJeChLRc9EahpIuuexNhGHnnrhU=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-R+67ADA6luDa9b7xvsE4PSL6GWwQTaNYzw2WYou/ofQ=" }, { "pname": "SkiaSharp.NativeAssets.Win32", - "version": "3.119.3-preview.1.1", - "hash": "sha256-MWsHe/NBlbHGtEhUICVuuhpRYSjtU06msLCoglqmVhQ=" + "version": "3.119.4-preview.1.1", + "hash": "sha256-Sd+KnMezIKbc4OLklHsfeM7EVZERtmawWuSCoaySteM=" }, { "pname": "SMBLibrary", @@ -1204,11 +1204,6 @@ "version": "1.5.4", "hash": "sha256-5rYv675c14DNMne6FUkebyBI+7fWwLCqGs+KQCjbCcI=" }, - { - "pname": "Tmds.DBus.Protocol", - "version": "0.90.3", - "hash": "sha256-jK/98C0WrkVqPPNMx+xkdGK7vhcFmDsMqX7hUmALAWM=" - }, { "pname": "Tmds.DBus.Protocol", "version": "0.92.0", diff --git a/pkgs/by-name/du/duplicati/package.nix b/pkgs/by-name/du/duplicati/package.nix index b9ef48a7c665..04a6d33e7e31 100644 --- a/pkgs/by-name/du/duplicati/package.nix +++ b/pkgs/by-name/du/duplicati/package.nix @@ -14,9 +14,9 @@ let # for update.sh easy to handle - ngclientVersion = "0.0.218"; - ngclientRev = "67e437adee2fefa9dc2a9464d3748a8512525f71"; - ngclientHash = "sha256-1DT/WIaQ+di8vsnsAaA5qYinhvaKImEfGn2pyljXxjw="; + ngclientVersion = "0.0.226"; + ngclientRev = "2cc3e2e088ddb4691bb389b0afa89287d399340e"; + ngclientHash = "sha256-uMWOunSaV9HNhgH65P2boangZFe/9NCRb5BBqXv9TI0="; # from Duplicati/Server/webroot/ngclient/package.json ngclient = buildNpmPackage { @@ -30,7 +30,7 @@ let hash = ngclientHash; }; - npmDepsHash = "sha256-yytz5qMhgd/yXr11szuVslTLTjV5XpfNPyLW3mmRM1E="; + npmDepsHash = "sha256-89l/1v8dncwImDgiQic2VN65K/dxIkEPCrsHCty2VV0="; nativeBuildInputs = [ bun ]; @@ -58,15 +58,15 @@ let in buildDotnetModule rec { pname = "duplicati"; - version = "2.3.0.1"; + version = "2.3.0.4"; channel = "stable"; - buildDate = "2026-04-24"; + buildDate = "2026-07-09"; src = fetchFromGitHub { owner = "duplicati"; repo = "duplicati"; tag = "v${version}_${channel}_${buildDate}"; - hash = "sha256-r3Oumo2vrViTNvZDUaVoJyGMBf1/uHS6oAhn9Aegb3s="; + hash = "sha256-pVfcD7bIlZ/ZsMNwjPcg+DY6YFNm191ngEm5SrDukSw="; stripRoot = true; }; diff --git a/pkgs/by-name/du/duplicity/package.nix b/pkgs/by-name/du/duplicity/package.nix index 7cdb8eff47f2..8e7b8698a1a4 100644 --- a/pkgs/by-name/du/duplicity/package.nix +++ b/pkgs/by-name/du/duplicity/package.nix @@ -75,20 +75,17 @@ let glib ]; - pythonPath = - with python3.pkgs; - [ - b2sdk - boto3 - idna - pygobject3 - fasteners - paramiko - pexpect - # Currently marked as broken. - # pydrive2 - ] - ++ paramiko.optional-dependencies.invoke; + pythonPath = with python3.pkgs; [ + b2sdk + boto3 + idna + pygobject3 + fasteners + paramiko + pexpect + # Currently marked as broken. + # pydrive2 + ]; nativeCheckInputs = [ gnupg # Add 'gpg' to PATH. diff --git a/pkgs/by-name/du/durden/package.nix b/pkgs/by-name/du/durden/package.nix index 57ec7ed07277..9c55d8718774 100644 --- a/pkgs/by-name/du/durden/package.nix +++ b/pkgs/by-name/du/durden/package.nix @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { features in Arcan, and as a very competent entry to the advanced-user side of the desktop environment spectrum. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/du/dutctl/package.nix b/pkgs/by-name/du/dutctl/package.nix index 15c1e0575bed..e1359750f38d 100644 --- a/pkgs/by-name/du/dutctl/package.nix +++ b/pkgs/by-name/du/dutctl/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "dutctl"; - version = "1.0.0-alpha.1-unstable-2026-06-03"; + version = "1.0.0-alpha.1-unstable-2026-07-05"; src = fetchFromGitHub { owner = "BlindspotSoftware"; repo = "dutctl"; - rev = "f2b5ea834299c5716a90662549fcef64408df0f9"; - hash = "sha256-lw8qkhXt2ZpgyZdfpJVLxr/7UxTcmhFg3fXKI/z9F40="; + rev = "1ee4c9baee1b088154fd3b94cf1023ef88f8cd0a"; + hash = "sha256-45C4ktDKiz4wkisKTSUCqlR5n5TI13IYPKAbsj5bekY="; }; - vendorHash = "sha256-vOBz9gi/cnUJ04ns1ZOgfNqzbVBE3Fd3oOfV04VSmFQ="; + vendorHash = "sha256-RJviv/FMfU6COdwUcsQb13cETAVOINYEGZNv5y4tKD0="; ldflags = [ "-s" diff --git a/pkgs/by-name/dv/dvdisaster/package.nix b/pkgs/by-name/dv/dvdisaster/package.nix index e68dfba2d32c..55881bdbea47 100644 --- a/pkgs/by-name/dv/dvdisaster/package.nix +++ b/pkgs/by-name/dv/dvdisaster/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dvdisaster"; - version = "0.79.10-pl5"; + version = "0.79.10-pl6"; src = fetchFromGitHub { owner = "speed47"; repo = "dvdisaster"; tag = "v${finalAttrs.version}"; - hash = "sha256-lWvZDB08lZb87l4oEbrdtc6Me4mWHiW3DFNXYoYR3a0="; + hash = "sha256-yQldvTvmbZgIOLKzdubd1zomSRKvAkTnS6hpEYWPr8A="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/dw/dwproton-bin/package.nix b/pkgs/by-name/dw/dwproton-bin/package.nix index cf51cb32d1e4..350041457939 100644 --- a/pkgs/by-name/dw/dwproton-bin/package.nix +++ b/pkgs/by-name/dw/dwproton-bin/package.nix @@ -11,11 +11,11 @@ proton-ge-bin.overrideAttrs ( inherit steamDisplayName; pname = "dwproton-bin"; - version = "dwproton-11.0-3"; + version = "dwproton-11.0-7"; src = fetchzip { url = "https://dawn.wine/dawn-winery/dwproton/releases/download/${finalAttrs.version}/${finalAttrs.version}-x86_64.tar.xz"; - hash = "sha256-e/YzKvwe30KveLHRUsntKDwzdEbr7a3Wfkqe/pu93WE="; + hash = "sha256-M8wcC7pKFs0Qena5NN9ylq2TykRfPK7JiHnzP6DkZv0="; }; preFixup = '' diff --git a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix index 013557a892fb..ddc4e794bf60 100644 --- a/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix +++ b/pkgs/by-name/dw/dwt1-shell-color-scripts/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://gitlab.com/dwt1/shell-color-scripts"; description = "Collection of shell color scripts collected by dt (Derek Taylor)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.all; mainProgram = "colorscript"; diff --git a/pkgs/by-name/dx/dxvk/package.nix b/pkgs/by-name/dx/dxvk/package.nix index 144bfe33609b..f4af351b33c1 100644 --- a/pkgs/by-name/dx/dxvk/package.nix +++ b/pkgs/by-name/dx/dxvk/package.nix @@ -84,7 +84,6 @@ stdenvNoCC.mkDerivation ( maintainers = [ lib.maintainers.reckenrode ]; license = lib.licenses.zlib; platforms = [ - "x86_64-darwin" "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/dy/dyalog/package.nix b/pkgs/by-name/dy/dyalog/package.nix index b972d23e5365..a926c8fba703 100644 --- a/pkgs/by-name/dy/dyalog/package.nix +++ b/pkgs/by-name/dy/dyalog/package.nix @@ -59,7 +59,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "dyalog"; - version = "20.0.52753"; + version = "20.0.53963"; shortVersion = lib.versions.majorMinor finalAttrs.version; passthru.sources = @@ -79,12 +79,12 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" = fetchArtifact { prefix = "linux_64"; suffix = "unicode.x86_64.deb"; - hash = "sha256-g5bilV2y7luWRZ1RPxe74F2mAKVHpKcytWWrX8dCuF8="; + hash = "sha256-4LjB/aHK40HecgZA7YUIoY/CaCnSoMOs9OoIhong8j4="; }; "aarch64-linux" = fetchArtifact { prefix = "linux_64"; suffix = "unicode.aarch64.deb"; - hash = "sha256-DR7Kjqdp5BKW3XKUNYIdaUiR4Wd+sWkiSLtT5Ni1E4E="; + hash = "sha256-5uVxMK0yowLOARW+PjFDpFiUNc/0cU/5lzY8t5Z6DxY="; }; }; diff --git a/pkgs/by-name/e-/e-imzo-manager/package.nix b/pkgs/by-name/e-/e-imzo-manager/package.nix index e0f05cd3cbac..07764992fc81 100644 --- a/pkgs/by-name/e-/e-imzo-manager/package.nix +++ b/pkgs/by-name/e-/e-imzo-manager/package.nix @@ -1,7 +1,7 @@ { stdenv, lib, - fetchFromGitHub, + fetchFromForgejo, cargo, desktop-file-utils, gnome-desktop, @@ -22,18 +22,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "e-imzo-manager"; - version = "1.2.0"; + version = "1.3.0"; - src = fetchFromGitHub { - owner = "xinux-org"; + src = fetchFromForgejo { + domain = "git.oss.uzinfocom.uz"; + owner = "xinux"; repo = "e-imzo-manager"; tag = finalAttrs.version; - hash = "sha256-LX13zdwjlV99NziEP7PoJH8yxPV1gVQQH/L0VkuRLD4="; + hash = "sha256-QXAfrNPaq76HALhUlMdSygbfA5wJI4rGHDpnwPI/74w"; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-qnwAJ0gRzIxEkkDeNqiYMB+Dvth4MugUIe9sv7c46/E="; + hash = "sha256-9yyTtMf1oCJWfFxWsaYWGT2/iTqU+3Ls0LIdHrNGZJI="; }; strictDeps = true; @@ -72,10 +73,10 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - homepage = "https://github.com/xinux-org/e-imzo-manager"; + homepage = "https://git.oss.uzinfocom.uz/xinux/e-imzo-manager"; mainProgram = "E-IMZO-Manager"; description = "GTK application for managing E-IMZO keys"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ orzklv diff --git a/pkgs/by-name/e2/e2fsprogs/package.nix b/pkgs/by-name/e2/e2fsprogs/package.nix index ceb394b1c433..970ea64682c5 100644 --- a/pkgs/by-name/e2/e2fsprogs/package.nix +++ b/pkgs/by-name/e2/e2fsprogs/package.nix @@ -3,7 +3,6 @@ stdenv, buildPackages, fetchurl, - fetchpatch, pkg-config, libuuid, gettext, @@ -20,25 +19,15 @@ stdenv.mkDerivation rec { pname = "e2fsprogs"; - version = "1.47.3"; + version = "1.47.4"; __structuredAttrs = true; src = fetchurl { url = "mirror://kernel/linux/kernel/people/tytso/e2fsprogs/v${version}/e2fsprogs-${version}.tar.xz"; - hash = "sha256-hX5u+AD+qiu0V4+8gQIUvl08iLBy6lPFOEczqWVzcyk="; + hash = "sha256-/VvziMvb4Aaj07MY2YOylIOCRArMhah/Hn0QhlPo2ws="; }; - patches = [ - # Upstream patch that fixes musl build (and probably others). - # Should be included in next release after 1.47.3. - (fetchpatch { - name = "stdio-portability.patch"; - url = "https://git.kernel.org/pub/scm/fs/ext2/e2fsprogs.git/patch/?id=f79abd8554e600eacc2a7c864a8332b670c9e262"; - hash = "sha256-zZ7zmSMTwGyS3X3b/D/mVG0bV2ul5xtY5DJx9YUvQO8="; - }) - ]; - # fuse2fs adds 14mb of dependencies outputs = [ "bin" diff --git a/pkgs/by-name/e5/e57inspector/package.nix b/pkgs/by-name/e5/e57inspector/package.nix index 895ced7a183c..3b9305bc3af6 100644 --- a/pkgs/by-name/e5/e57inspector/package.nix +++ b/pkgs/by-name/e5/e57inspector/package.nix @@ -62,9 +62,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = { - e57inspector = nixosTests.e57inspector; - }; + passthru.tests = nixosTests.e57inspector; meta = { description = "Cross-platform E57 file viewer to list and view stored point clouds, images and metadata"; diff --git a/pkgs/by-name/ea/ea/package.nix b/pkgs/by-name/ea/ea/package.nix index 107c19da4cc9..2bed9e08e2a7 100644 --- a/pkgs/by-name/ea/ea/package.nix +++ b/pkgs/by-name/ea/ea/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Makes file paths from CLI output actionable"; homepage = "https://github.com/dduan/ea"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ deejayem ]; mainProgram = "ea"; }; diff --git a/pkgs/by-name/ea/each/package.nix b/pkgs/by-name/ea/each/package.nix index b2bd7c2b65e7..d16a519959bd 100644 --- a/pkgs/by-name/ea/each/package.nix +++ b/pkgs/by-name/ea/each/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Command-line tool for processing CSV, JSON and other structured data"; mainProgram = "each"; homepage = "https://github.com/arraypad/each"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ thiagokokada ]; }; }) diff --git a/pkgs/by-name/ea/earlybird/package.nix b/pkgs/by-name/ea/earlybird/package.nix index d9b50c704da9..99bf8dd2db2e 100644 --- a/pkgs/by-name/ea/earlybird/package.nix +++ b/pkgs/by-name/ea/earlybird/package.nix @@ -2,32 +2,61 @@ lib, buildGoModule, fetchFromGitHub, + gitMinimal, + poppler-utils, + wv, + unrtf, + html-tidy, + makeWrapper, + # TODO add justext when github.com/JalfResi/justext becomes available + # justext }: buildGoModule (finalAttrs: { pname = "earlybird"; - version = "4.0.0"; + version = "4.6.1"; src = fetchFromGitHub { owner = "americanexpress"; repo = "earlybird"; - rev = "v${finalAttrs.version}"; - hash = "sha256-guSm/ha4ICaOcoynvAwFeojE6ikaCykMcdfskD/ehTw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Wjvg0+IQHIB5wFwY+4grTOagk5fHMf6YlIB83Jv/ZwE="; }; - vendorHash = "sha256-39jXqCXAwg/C+9gEXiS1X58OD61nMNQifnhgVGEF6ck="; + vendorHash = "sha256-pQ8gSDHsdDT/cgvRB0OSqnMZz2W5vAzFBzph0xksC2o="; ldflags = [ "-s" "-w" ]; + nativeBuildInputs = [ + makeWrapper + gitMinimal + ]; + + checkFlags = [ + "--skip=Test_parseGitFiles" + ]; + + postFixup = '' + wrapProgram $out/bin/earlybird \ + --prefix PATH : ${ + lib.makeBinPath [ + poppler-utils + wv + unrtf + html-tidy + ] + } + ''; + meta = { description = "Sensitive data detection tool capable of scanning source code repositories for passwords, key files, and more"; mainProgram = "earlybird"; homepage = "https://github.com/americanexpress/earlybird"; changelog = "https://github.com/americanexpress/earlybird/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; }; }) diff --git a/pkgs/by-name/ea/eas-cli/missing-hashes.json b/pkgs/by-name/ea/eas-cli/missing-hashes.json index ddc72dbc5b9f..6417aaf75412 100644 --- a/pkgs/by-name/ea/eas-cli/missing-hashes.json +++ b/pkgs/by-name/ea/eas-cli/missing-hashes.json @@ -1,4 +1,17 @@ { + "@ngrok/ngrok-android-arm64@npm:1.7.0": "90bd438c4a1f68d72ded57d6117989365ab2a05108ab0cea1f9d65aba9a94a8281bdd04ed1000cb28d28c5fa8e2346aefa0fd7af9aebf8cf88ac60f44d3c7601", + "@ngrok/ngrok-darwin-arm64@npm:1.7.0": "503e467c1cab54271ecdfc4bd7e2eb49366b56cd231898b8d8c4bbd5ac50d8aa85455d98bfa66383ea3369d7294dcf3ba59d865487c12145c18c38e73da31c28", + "@ngrok/ngrok-darwin-universal@npm:1.7.0": "9cde026e63251b406f99b6bb8189e3f51a2fef9a3d9391f7aef4fc54305d17b7404861694d8e703c9a880fe4580f7d4fcf312978337150876343fb1c25592e8f", + "@ngrok/ngrok-darwin-x64@npm:1.7.0": "6164fbe5ac5f78a9250f9b210d8b183905c1745e5c1e7b93ee3c9748c8096b32df5c2f6b20a59ebe77d79ed95e6f8ec40b14a8e41e98bde6a54a5b72b3395069", + "@ngrok/ngrok-freebsd-x64@npm:1.7.0": "e6ab26453b8b060a1e042a192908ba9966c1fc400b43d7cf74950824851d434a3e073613b04079acb449ce75e788b50c7696f3a821258bd5879b4a95cf9c0a9f", + "@ngrok/ngrok-linux-arm-gnueabihf@npm:1.7.0": "9282159ab05dab3b511de8268afa709ea46bc9a2733ac155fdc9a19c2061093f180bbdfea174bfa3752c304b9af33e165dc293b25fec6d5a78aa773372c7a888", + "@ngrok/ngrok-linux-arm64-gnu@npm:1.7.0": "3e93ae9ddd9de6029b2a840df1688795699b7f04a400fc2c7970ac5a4fee4b0bb50ba3a2da566bc2392b79c121e7b8e4aefc84ad3a6b4dcaa9f07486ca0a374f", + "@ngrok/ngrok-linux-arm64-musl@npm:1.7.0": "b6637244d06a1bb57e2c8654b4b19eb2cfe2ebcc21f90bcdafeee53efe00c74989a658f0102e2bace6286978fa58614ee67b6f7785ec9a23f7996c887a1e0212", + "@ngrok/ngrok-linux-x64-gnu@npm:1.7.0": "09d36e6da68e7a5fe64773c37f7bf4b0d28281ba944313b01bf8346b237615a6006847624d38280a39ae3b55b4da241502b786e46c77bd05eedcf1dc259ded0a", + "@ngrok/ngrok-linux-x64-musl@npm:1.7.0": "95c6ab6550f297f05824cc8d935d8c28eb39c745743b3ef46e6f7216011154bde45de390ef62e49226106f32b8900bc88bc0f1adabb3b143f434f4cf8b0db66f", + "@ngrok/ngrok-win32-arm64-msvc@npm:1.7.0": "773963f485b47c702c5a7e020238e8c17808ea591b536bf25bae5c18335ceffaacdf39b1b18eaa285ce44b1a62a9b4c32b11cd7eafe8cd8771d7c80d6e63d410", + "@ngrok/ngrok-win32-ia32-msvc@npm:1.7.0": "456df61943a2cfa656d257fce73f9a28177ab7ce94170ccfcbb40fd44fe204113c3ba26153b9a8cb8d49b0128d4fec9fd37ba38f37fee3d0a9d27c85448763a8", + "@ngrok/ngrok-win32-x64-msvc@npm:1.7.0": "8c73289d1c0d38c191a8ea701104d748717df5b250ce133c2e3a1cf1ac68951592a7276f3b17c0ee09c0d607bd9b0908cacefbe0bb8735027e2a2fcb612c08fb", "@nx/nx-darwin-arm64@npm:22.4.1": "d1faed4c0f1e45398d7819c384f52dc8070990be07f7b337e87af37b891129f5b3d7a0f08287e71ce3a20902c9881bbf53ad763ff58bd3270a6a9bfd137161bd", "@nx/nx-darwin-x64@npm:22.4.1": "ebe3622f46f691fcda61b4a1e4143ff9a745f044eb6c2f8d3ab8e97582e50a80ebf510bdd39770d62e49f493a46f4d41fedd75ea0c76f4e8bb7db75cf2beea0d", "@nx/nx-freebsd-x64@npm:22.4.1": "76f86487736fa29f88543766512d8440ddc63275670a4b1dbc4010866d9b90dee8cf10b724b551132471985b6ae47ef002985126b62213fca79e01a524738354", diff --git a/pkgs/by-name/ea/eas-cli/package.nix b/pkgs/by-name/ea/eas-cli/package.nix index c9cc2e57df1e..567372a7f135 100644 --- a/pkgs/by-name/ea/eas-cli/package.nix +++ b/pkgs/by-name/ea/eas-cli/package.nix @@ -10,12 +10,12 @@ python3, }: let - version = "18.7.0"; + version = "20.4.0"; src = fetchFromGitHub { owner = "expo"; repo = "eas-cli"; rev = "v${version}"; - hash = "sha256-Z+PtS88Rv9Vv6FA15KxSBWCmOtwmTqO1etgCV7WaTXo="; + hash = "sha256-EMN54PR9lhrZcGMq2iNUsdyBP3wVk4G/isjsneIGslI="; }; missingHashes = ./missing-hashes.json; patches = [ @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { yarnOfflineCache = yarn-berry_4.fetchYarnBerryDeps { inherit src missingHashes patches; - hash = "sha256-KtFLJc2bEBS0sgTqbF68574fFMxwSlaSKcR0RedVJ4k="; + hash = "sha256-dOx4T009+FMFEvTZtlyJpAUo2UYBm1O1hIyBnSbqIgw="; }; nativeBuildInputs = [ @@ -64,6 +64,14 @@ stdenv.mkDerivation (finalAttrs: { mv "$tmpfile" lerna.json ''; + buildPhase = '' + runHook preBuild + + yarn build + + runHook postBuild + ''; + # yarnInstallHook strips out build outputs within packages/eas-cli resulting in most commands missing from eas-cli. installPhase = '' runHook preInstall diff --git a/pkgs/by-name/ea/easyeffects/package.nix b/pkgs/by-name/ea/easyeffects/package.nix index 570e940467e6..eeace37ecfb3 100644 --- a/pkgs/by-name/ea/easyeffects/package.nix +++ b/pkgs/by-name/ea/easyeffects/package.nix @@ -61,13 +61,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "easyeffects"; - version = "8.2.4"; + version = "8.2.7"; src = fetchFromGitHub { owner = "wwmm"; repo = "easyeffects"; tag = "v${finalAttrs.version}"; - hash = "sha256-hhQVfUXjobQmrSYFquxbkIuCdBYaExAtjtwbyVqyVUg="; + hash = "sha256-YYwVoqCRVAZVu8vCTN3ZSicy1Fzw3l+hQbooGAE/AEI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ec/ec/package.nix b/pkgs/by-name/ec/ec/package.nix index 6e8eea5a9153..dc1596485b02 100644 --- a/pkgs/by-name/ec/ec/package.nix +++ b/pkgs/by-name/ec/ec/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "ec"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "chojs23"; repo = "ec"; tag = "v${finalAttrs.version}"; - hash = "sha256-Oltl23Ihv2p1sTW62nGUt+oH6E2DB38fIuNiXRaghBU="; + hash = "sha256-ZG4y5GS/33hHhM1OwgcwF13CfzjxT93cGUfkB8j09cY="; }; vendorHash = "sha256-bV5y8zKculYULkFl9J95qebLOzdTT/LuYycqMmHKZ+g="; diff --git a/pkgs/by-name/ec/ec2-metadata-mock/package.nix b/pkgs/by-name/ec/ec2-metadata-mock/package.nix index 9b278f4ec48d..e95085dbe2ab 100644 --- a/pkgs/by-name/ec/ec2-metadata-mock/package.nix +++ b/pkgs/by-name/ec/ec2-metadata-mock/package.nix @@ -6,20 +6,18 @@ buildGoModule (finalAttrs: { pname = "ec2-metadata-mock"; - version = "1.12.0"; + version = "1.13.0"; src = fetchFromGitHub { owner = "aws"; repo = "amazon-ec2-metadata-mock"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-8X6LBGo496fG0Chhvg3jAaUF6mp8psCzHd+Es75z27Y="; + hash = "sha256-gqzROHfwhd3i1GWSp58dBKjS1EU7Xu0Fqbzv2PoLaF8="; }; - vendorHash = "sha256-jRJX4hvfRuhR5TlZe7LsXaOlUCwmQGem2QKlX3vuk8c="; + vendorHash = "sha256-Px4vhFW1mhXbBuPbxEpukmeLZewF7zooOXKxL8sEFLU="; - postInstall = '' - mv $out/bin/{cmd,ec2-metadata-mock} - ''; + subPackages = [ "cmd/ec2-metadata-mock" ]; meta = { description = "Amazon EC2 Metadata Mock"; diff --git a/pkgs/by-name/ec/eccodes/package.nix b/pkgs/by-name/ec/eccodes/package.nix index 32c9129f541a..3b7425f56866 100644 --- a/pkgs/by-name/ec/eccodes/package.nix +++ b/pkgs/by-name/ec/eccodes/package.nix @@ -17,11 +17,11 @@ }: gccStdenv.mkDerivation rec { pname = "eccodes"; - version = "2.47.0"; + version = "2.48.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - hash = "sha256-gtqBmqm1GDHcFLO/KRi/7lCxzVOgUIjQw/RJN1iq4JQ="; + hash = "sha256-Yuj6XKE30TgYml/dbVsiBcicwmM44/Qoaro9ibScn5o="; }; postPatch = '' diff --git a/pkgs/by-name/ec/ecdsatool/package.nix b/pkgs/by-name/ec/ecdsatool/package.nix index 4110f5f4a4d3..b9a90e88f595 100644 --- a/pkgs/by-name/ec/ecdsatool/package.nix +++ b/pkgs/by-name/ec/ecdsatool/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { description = "Create and manipulate ECC NISTP256 keypairs"; mainProgram = "ecdsatool"; homepage = "https://github.com/kaniini/ecdsatool/"; - license = with lib.licenses; [ free ]; + license = lib.licenses.free; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ec/ecspresso/package.nix b/pkgs/by-name/ec/ecspresso/package.nix index 9efb948daa02..cf152f85c578 100644 --- a/pkgs/by-name/ec/ecspresso/package.nix +++ b/pkgs/by-name/ec/ecspresso/package.nix @@ -7,26 +7,26 @@ buildGoModule (finalAttrs: { pname = "ecspresso"; - version = "2.8.4"; + version = "2.8.5"; src = fetchFromGitHub { owner = "kayac"; repo = "ecspresso"; tag = "v${finalAttrs.version}"; - hash = "sha256-Mt4jXMPav82267lUlyI8MZ1g2LFsAylgoHo7QV4N0CQ="; + hash = "sha256-IXvCWuE1KJFCckZjGP9LvEY0S9WzrKPqPx759YIYe4A="; }; subPackages = [ "cmd/ecspresso" ]; - vendorHash = "sha256-xdj1wPg8YpcLW3QoDe/lBNkoMQR41oca1KI3sptXi9w="; + vendorHash = "sha256-bvmGvJwjh1tZcKiwIBAveN0Js61/+sh+X6lrJfUYPZ0="; ldflags = [ "-s" "-w" "-X main.buildDate=none" - "-X main.Version=${finalAttrs.version}" + "-X github.com/kayac/ecspresso/v2.Version=${finalAttrs.version}" ]; doInstallCheck = true; 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 72b8ac4404d2..c8c924e4557d 100644 --- a/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix +++ b/pkgs/by-name/ed/ed-odyssey-materials-helper/package.nix @@ -22,13 +22,13 @@ let in stdenv.mkDerivation rec { pname = "ed-odyssey-materials-helper"; - version = "3.6.6"; + version = "3.7.0"; src = fetchFromGitHub { owner = "jixxed"; repo = "ed-odyssey-materials-helper"; tag = version; - hash = "sha256-ljCN2tW7iH+kTiSXwUt+OsAhjYKlAy0W5x/JDmQeR6M="; + hash = "sha256-vQn45gHcMRLH5ta5+h3QXLODUlmDWeG1PSRRl/hgfiE="; }; nativeBuildInputs = [ @@ -147,7 +147,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/jixxed/ed-odyssey-materials-helper"; downloadPage = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; changelog = "https://github.com/jixxed/ed-odyssey-materials-helper/releases/tag/${version}"; - license = lib.licenses.gpl3Only; + license = lib.licenses.mit; sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode # mitm cache diff --git a/pkgs/by-name/ed/eddie/package.nix b/pkgs/by-name/ed/eddie/package.nix index 977c49caeff9..f811a888dcd7 100644 --- a/pkgs/by-name/ed/eddie/package.nix +++ b/pkgs/by-name/ed/eddie/package.nix @@ -17,7 +17,6 @@ openvpn, stunnel, - gtk2, libayatana-indicator, mono, @@ -70,7 +69,6 @@ buildDotnetModule (finalAttrs: { ]; runtimeInputs = lib.makeLibraryPath [ - gtk2 gtk3 libayatana-indicator ]; @@ -107,7 +105,7 @@ buildDotnetModule (finalAttrs: { cp src/Lib.Platform.Linux.Native/bin/libLib.Platform.Linux.Native.so $out/lib/eddie-ui cp src/App.Forms.Linux.Tray/bin/eddie-tray $out/lib/eddie-ui - ln -s $out/lib/eddie-ui/eddie-cli-elevated $out/lib/eddie/eddie-cli-elevated + cp $out/lib/eddie-ui/eddie-cli-elevated $out/lib/eddie/eddie-cli-elevated ln -s $out/lib/eddie-ui/libLib.Platform.Linux.Native.so $out/lib/eddie/Lib.Platform.Linux.Native.so cp -r src/App.Forms.Linux/bin/*/Release/* $out/lib/eddie-ui diff --git a/pkgs/by-name/ed/edgetx/package.nix b/pkgs/by-name/ed/edgetx/package.nix index 5205b6d8a56c..36b4d2af3ee2 100644 --- a/pkgs/by-name/ed/edgetx/package.nix +++ b/pkgs/by-name/ed/edgetx/package.nix @@ -34,7 +34,7 @@ let pillow lz4 jinja2 - libclang + clang ] ); @@ -47,14 +47,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "edgetx"; - version = "2.11.3"; + version = "2.11.5"; src = fetchFromGitHub { owner = "EdgeTX"; repo = "edgetx"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-vlJsfebTWhdh6HDpUEA1QJJSVGMlcL49XFwIx4A9zHs="; + hash = "sha256-M0NiHvYZD1Qw2VYRV+TKMI0qTfF5MBdTxsBZRMMrnnk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/edgetx/targets.nix b/pkgs/by-name/ed/edgetx/targets.nix index 3e988ffb2ce9..6dfec5ba715e 100644 --- a/pkgs/by-name/ed/edgetx/targets.nix +++ b/pkgs/by-name/ed/edgetx/targets.nix @@ -30,6 +30,7 @@ "xlites" "nv14" "el18" + "pa01" "pl18" "pl18ev" "pl18u" @@ -44,5 +45,6 @@ "t20v2" "tx16s" "f16" + "v14" "v16" ] diff --git a/pkgs/by-name/ed/edhm-ui/package.nix b/pkgs/by-name/ed/edhm-ui/package.nix index b5bd92b4f4e3..cfd0561164b6 100644 --- a/pkgs/by-name/ed/edhm-ui/package.nix +++ b/pkgs/by-name/ed/edhm-ui/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "edhm-ui"; - version = "3.0.67"; + version = "3.0.70"; strictDeps = true; src = fetchzip { url = "https://github.com/BlueMystical/EDHM_UI/releases/download/v${finalAttrs.version}/edhm-ui-v3-linux-x64.zip"; - hash = "sha256-JhWHub1YmdSJXZcyOK97/5TnBsKVN0dg7nwqg0EP7H8="; + hash = "sha256-jAvUWrjQl8dmXxd99ONYqgdnPkzDQwdSEf8ar2nLEds="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ed/editorconfig-checker/package.nix b/pkgs/by-name/ed/editorconfig-checker/package.nix index 4fb4f70d6eef..e4fc49db0a09 100644 --- a/pkgs/by-name/ed/editorconfig-checker/package.nix +++ b/pkgs/by-name/ed/editorconfig-checker/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "editorconfig-checker"; - version = "3.7.0"; + version = "3.8.0"; src = fetchFromGitHub { owner = "editorconfig-checker"; repo = "editorconfig-checker"; tag = "v${finalAttrs.version}"; - hash = "sha256-8DNxLACoTtB86JUkHUDopKY0SVFdhdye/ThbUXwAYQE="; + hash = "sha256-t0EliFWYYxKfPbfLKP4p3wJvmIfXF6CPpWIgUuD3pXY="; }; - vendorHash = "sha256-sOpa9aYWAQ5qahHhV0XgKOtuGWDu1+i0lcMCyc1FvMI="; + vendorHash = "sha256-5x7c8v+uMmqvyQnN47XgD8FFMoEq5/MPFO2WEj0WevU="; # Tests run on source and don't expect vendor dir. doCheck = false; diff --git a/pkgs/by-name/ed/edk2/package.nix b/pkgs/by-name/ed/edk2/package.nix index 32d2848178e1..3269e0d4882c 100644 --- a/pkgs/by-name/ed/edk2/package.nix +++ b/pkgs/by-name/ed/edk2/package.nix @@ -1,7 +1,6 @@ { stdenv, fetchFromGitHub, - fetchpatch, applyPatches, libuuid, bc, @@ -29,18 +28,23 @@ let "LOONGARCH64" else throw "Unsupported architecture"; + + # The toolchain definition uses different variables for different architectures. + targetPrefixes = lib.genAttrs [ "GCC_BIN" "GCC_${targetArch}_PREFIX" ] ( + lib.const stdenv.cc.targetPrefix + ); in stdenv.mkDerivation (finalAttrs: { pname = "edk2"; - version = "202602"; + version = "202605"; srcWithVendoring = fetchFromGitHub { owner = "tianocore"; repo = "edk2"; tag = "edk2-stable${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-TeMGpqVpXYRaeLjjg/aWHjtvfJpEfauA7Xg7dfe3XNg="; + hash = "sha256-sUqLocdX7lxN2pEdn84Cjh8pOzYqIeKqO144XhwKA30="; }; src = applyPatches { @@ -48,12 +52,6 @@ stdenv.mkDerivation (finalAttrs: { src = finalAttrs.srcWithVendoring; patches = [ - # pass targetPrefix as an env var - (fetchpatch { - url = "https://src.fedoraproject.org/rpms/edk2/raw/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/0021-Tweak-the-tools_def-to-support-cross-compiling.patch"; - hash = "sha256-E1/fiFNVx0aB1kOej2DJ2DlBIs9tAAcxoedym2Zhjxw="; - }) - ./fix-cross-compilation-antlr-dlg.patch ]; @@ -106,10 +104,8 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString (stdenv.cc.isGNU) " -Wno-error=stringop-truncation" + lib.optionalString (stdenv.hostPlatform.isDarwin) " -Wno-error=macro-redefined"; PYTHON_COMMAND = lib.getExe pythonEnv; - # trick taken from https://src.fedoraproject.org/rpms/edk2/blob/08f2354cd280b4ce5a7888aa85cf520e042955c3/f/edk2.spec#_319 - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; - - }; + } + // targetPrefixes; hardeningDisable = [ "format" @@ -169,7 +165,7 @@ stdenv.mkDerivation (finalAttrs: { finalAttrsInner: let attrs = lib.toFunction attrsOrFun finalAttrsInner; - buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC5"); + buildType = attrs.buildType or (if stdenv.hostPlatform.isDarwin then "CLANGPDB" else "GCC"); in { inherit (finalAttrs) src; @@ -212,10 +208,7 @@ stdenv.mkDerivation (finalAttrs: { "env" ] // { - env = { - ${"GCC5_${targetArch}_PREFIX"} = stdenv.cc.targetPrefix; - } - // (attrs.env or { }); + env = targetPrefixes // (attrs.env or { }); } ); }; diff --git a/pkgs/by-name/ed/edopro/package.nix b/pkgs/by-name/ed/edopro/package.nix index b1cbf4532474..d3970d5dea77 100644 --- a/pkgs/by-name/ed/edopro/package.nix +++ b/pkgs/by-name/ed/edopro/package.nix @@ -19,6 +19,7 @@ freetype, irrlicht, libevent, + libdecor, libgit2, libGL, libGLU, @@ -276,6 +277,7 @@ let --prefix PATH : ${lib.makeBinPath [ mono ]} \ --prefix LD_LIBRARY_PATH : ${ lib.makeLibraryPath [ + libdecor libGL libx11 libxkbcommon diff --git a/pkgs/by-name/ed/eduke32/package.nix b/pkgs/by-name/ed/eduke32/package.nix index afd2cb120202..ad46cb0fcbf8 100644 --- a/pkgs/by-name/ed/eduke32/package.nix +++ b/pkgs/by-name/ed/eduke32/package.nix @@ -181,7 +181,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Enhanced port of Duke Nukem 3D for various platforms"; homepage = "https://eduke32.com"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ qubitnano ]; diff --git a/pkgs/by-name/ef/effitask/package.nix b/pkgs/by-name/ef/effitask/package.nix index 363554688ae6..11ea7bf263fe 100644 --- a/pkgs/by-name/ef/effitask/package.nix +++ b/pkgs/by-name/ef/effitask/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.4.2"; src = fetchFromGitHub { - owner = "sanpii"; + owner = "todotxt-rs"; repo = "effitask"; rev = finalAttrs.version; sha256 = "sha256-6BA/TCCqVh5rtgGkUgk8nIqUzozipC5rrkbXMDWYpdQ="; @@ -45,9 +45,9 @@ rustPlatform.buildRustPackage (finalAttrs: { Or use it as standalone program by defining some environment variables like described in the projects readme. ''; - homepage = "https://github.com/sanpii/effitask"; + homepage = "https://github.com/todotxt-rs/effitask"; maintainers = with lib.maintainers; [ davidak ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "effitask"; }; }) diff --git a/pkgs/by-name/ef/efitools/cross.patch b/pkgs/by-name/ef/efitools/cross.patch new file mode 100644 index 000000000000..e1d853800b46 --- /dev/null +++ b/pkgs/by-name/ef/efitools/cross.patch @@ -0,0 +1,89 @@ +--- a/Make.rules ++++ b/Make.rules +@@ -68,35 +68,35 @@ endif + %.h: %.auth + ./xxdi.pl $< > $@ + +-%.hash: %.efi hash-to-efi-sig-list +- ./hash-to-efi-sig-list $< $@ ++%.hash: %.efi ++ hash-to-efi-sig-list $< $@ + +-%-blacklist.esl: %.crt cert-to-efi-hash-list +- ./cert-to-efi-sig-list $< $@ ++%-blacklist.esl: %.crt ++ cert-to-efi-sig-list $< $@ + +-%-hash-blacklist.esl: %.crt cert-to-efi-hash-list +- ./cert-to-efi-hash-list $< $@ ++%-hash-blacklist.esl: %.crt ++ cert-to-efi-hash-list $< $@ + +-%.esl: %.crt cert-to-efi-sig-list +- ./cert-to-efi-sig-list -g $(MYGUID) $< $@ ++%.esl: %.crt ++ cert-to-efi-sig-list -g $(MYGUID) $< $@ + + getcert = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo "-c PK.crt -k PK.key"; else echo "-c KEK.crt -k KEK.key"; fi) + getvar = $(shell if [ "$(1)" = "PK" -o "$(1)" = "KEK" ]; then echo $(1); else echo db; fi) + +-%.auth: %.esl PK.crt KEK.crt sign-efi-sig-list +- ./sign-efi-sig-list $(call getcert,$*) $(call getvar,$*) $< $@ ++%.auth: %.esl PK.crt KEK.crt ++ sign-efi-sig-list $(call getcert,$*) $(call getvar,$*) $< $@ + +-%-update.auth: %.esl PK.crt KEK.crt sign-efi-sig-list +- ./sign-efi-sig-list -a $(call getcert,$*) $(call getvar,$*) $< $@ ++%-update.auth: %.esl PK.crt KEK.crt ++ sign-efi-sig-list -a $(call getcert,$*) $(call getvar,$*) $< $@ + +-%-pkupdate.auth: %.esl PK.crt sign-efi-sig-list +- ./sign-efi-sig-list -a -c PK.crt -k PK.key $(call getvar,$*) $< $@ ++%-pkupdate.auth: %.esl PK.crt ++ sign-efi-sig-list -a -c PK.crt -k PK.key $(call getvar,$*) $< $@ + +-%-blacklist.auth: %-blacklist.esl KEK.crt sign-efi-sig-list +- ./sign-efi-sig-list -a -c KEK.crt -k KEK.key dbx $< $@ ++%-blacklist.auth: %-blacklist.esl KEK.crt ++ sign-efi-sig-list -a -c KEK.crt -k KEK.key dbx $< $@ + +-%-pkblacklist.auth: %-blacklist.esl PK.crt sign-efi-sig-list +- ./sign-efi-sig-list -a -c PK.crt -k PK.key dbx $< $@ ++%-pkblacklist.auth: %-blacklist.esl PK.crt ++ sign-efi-sig-list -a -c PK.crt -k PK.key dbx $< $@ + + %.o: %.c + $(CC) $(INCDIR) $(CFLAGS) $(CPPFLAGS) -c $< -o $@ +--- a/Makefile ++++ b/Makefile +@@ -27,13 +27,11 @@ include Make.rules + + EFISIGNED = $(patsubst %.efi,%-signed.efi,$(EFIFILES)) + +-all: $(EFISIGNED) $(BINARIES) $(MANPAGES) noPK.auth $(KEYAUTH) \ ++all: $(EFISIGNED) $(BINARIES) noPK.auth $(KEYAUTH) \ + $(KEYUPDATEAUTH) $(KEYBLACKLISTAUTH) $(KEYHASHBLACKLISTAUTH) + + + install: all +- $(INSTALL) -m 755 -d $(MANDIR) +- $(INSTALL) -m 644 $(MANPAGES) $(MANDIR) + $(INSTALL) -m 755 -d $(EFIDIR) + $(INSTALL) -m 755 $(EFIFILES) $(EFIDIR) + $(INSTALL) -m 755 -d $(BINDIR) +@@ -65,11 +63,11 @@ DB.h: DB.auth + noPK.esl: + > noPK.esl + +-noPK.auth: noPK.esl PK.crt sign-efi-sig-list +- ./sign-efi-sig-list -t "$(shell date --date='1 second' +'%Y-%m-%d %H:%M:%S')" -c PK.crt -k PK.key PK $< $@ ++noPK.auth: noPK.esl PK.crt ++ sign-efi-sig-list -t "$(shell date --date='1 second' +'%Y-%m-%d %H:%M:%S')" -c PK.crt -k PK.key PK $< $@ + +-ms-%.esl: ms-%.crt cert-to-efi-sig-list +- ./cert-to-efi-sig-list -g $(MSGUID) $< $@ ++ms-%.esl: ms-%.crt ++ cert-to-efi-sig-list -g $(MSGUID) $< $@ + + hashlist.h: HashTool.hash + cat $^ > /tmp/tmp.hash diff --git a/pkgs/by-name/ef/efitools/package.nix b/pkgs/by-name/ef/efitools/package.nix index 89787fdb0bee..f3cc209c7d1f 100644 --- a/pkgs/by-name/ef/efitools/package.nix +++ b/pkgs/by-name/ef/efitools/package.nix @@ -8,7 +8,13 @@ perlPackages, help2man, fetchzip, + pkgsCross, + efitools, + buildPackages, }: +let + isCross = !(stdenv.buildPlatform.canExecute stdenv.hostPlatform); +in stdenv.mkDerivation (finalAttrs: { pname = "efitools"; version = "1.9.2"; @@ -16,13 +22,17 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gnu-efi openssl - sbsigntool ]; nativeBuildInputs = [ perl perlPackages.FileSlurp help2man + openssl + sbsigntool + ] + ++ lib.optionals isCross [ + efitools ]; src = fetchzip { @@ -39,6 +49,10 @@ stdenv.mkDerivation (finalAttrs: { # https://bugs.debian.org/1122408 ./objcopy-output-target.patch + ] + ++ lib.optionals isCross [ + # Use builder's efitools to create sig lists for host + ./cross.patch ]; postPatch = '' @@ -47,9 +61,26 @@ stdenv.mkDerivation (finalAttrs: { sed -i -e 's#$(DESTDIR)/usr#$(out)#g' Make.rules sed -i '$asign-efi-sig-list.o flash-var.o: CFLAGS += -D_GNU_SOURCE' Makefile substituteInPlace lib/console.c --replace "EFI_WARN_UNKOWN_GLYPH" "EFI_WARN_UNKNOWN_GLYPH" + # Fix cross-compilation: use $(AR) and $(NM) variables instead of hardcoded commands + substituteInPlace Make.rules --replace-fail 'ar rcv' '$(AR) rcv' + substituteInPlace Make.rules --replace-fail 'nm -D' '$(NM) -D' patchShebangs . ''; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + "AR=${stdenv.cc.targetPrefix}ar" + "NM=${stdenv.cc.targetPrefix}nm" + "OBJCOPY=${stdenv.cc.targetPrefix}objcopy" + ] + ++ lib.optionals isCross [ + "MANPAGES=" + ]; + + passthru.tests = { + cross-aarch64 = pkgsCross.aarch64-multiplatform.efitools; + }; + meta = { description = "Tools for manipulating UEFI secure boot platforms"; homepage = "https://git.kernel.org/pub/scm/linux/kernel/git/jejb/efitools.git"; diff --git a/pkgs/by-name/ef/efm-langserver/package.nix b/pkgs/by-name/ef/efm-langserver/package.nix index ab3fd6b5da79..fb15cd9b59bb 100644 --- a/pkgs/by-name/ef/efm-langserver/package.nix +++ b/pkgs/by-name/ef/efm-langserver/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "efm-langserver"; - version = "0.0.56"; + version = "0.0.57"; src = fetchFromGitHub { owner = "mattn"; repo = "efm-langserver"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-M2I5UQYCkIVfINWEVa4tOt0Dtl4sBZoHP/q0ia/Bo2Y="; + sha256 = "sha256-LWpm5DyHhrSAGxfwEAM0HABPwfsvWEHZ22U93wdldTw="; }; vendorHash = "sha256-3Rz/9p1moT3rQPY3/lka9HZ16T00+bAWCc950IBTkFE="; diff --git a/pkgs/by-name/eg/egctl/package.nix b/pkgs/by-name/eg/egctl/package.nix index 283ee5d608ee..282cd52116c0 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.8.0"; + version = "1.8.3"; src = fetchFromGitHub { owner = "envoyproxy"; repo = "gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-KvXOLyMWtl4ycz6P4LQalODD95ptCY7tQtxtYG2x+28="; + hash = "sha256-dhAzFpo+pnttcVBVTbOK7sOEeXaIkdPF058Zt8M2JHU="; }; - vendorHash = "sha256-wiehH9qmDVLho+ZDQH5IbckO0LP3FLxHhYXBMA8aBjs="; + vendorHash = "sha256-rAShQLNGffK/l8H6b004HfC/Jt3I4ReVlb2YV9yMrwQ="; # Fix case-insensitive conflicts producing platform-dependent checksums # https://github.com/microsoft/go-mssqldb/issues/234 proxyVendor = true; diff --git a/pkgs/by-name/eg/eggnog-mapper/package.nix b/pkgs/by-name/eg/eggnog-mapper/package.nix index 2960d5485476..704794daac0c 100644 --- a/pkgs/by-name/eg/eggnog-mapper/package.nix +++ b/pkgs/by-name/eg/eggnog-mapper/package.nix @@ -2,6 +2,7 @@ lib, autoPatchelfHook, fetchFromGitHub, + fetchpatch2, python3Packages, wget, zlib, @@ -9,38 +10,53 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "eggnog-mapper"; - version = "2.1.13"; - format = "setuptools"; + version = "2.1.14"; + pyproject = true; src = fetchFromGitHub { owner = "eggnogdb"; repo = "eggnog-mapper"; - tag = finalAttrs.version; - hash = "sha256-Gu4D8DBvgCPlO+2MjeNZy6+lNqsIlksegWmmYvEZmUU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-rjQojz6JA7T03s4PojjXJuDZhdAx9VhPQrlRTGZaYZg="; }; - postPatch = '' - # Not a great solution... - substituteInPlace setup.cfg \ - --replace "==" ">=" - ''; + patches = [ + # From https://github.com/eggnogdb/eggnog-mapper/pull/599 + (fetchpatch2 { + name = "replace-distutils.patch"; + url = "https://github.com/eggnogdb/eggnog-mapper/commit/998129d3766e060ff450e8f950b5361c6318b0a2.patch?full_index=1"; + hash = "sha256-xYNd9p5BhGpvFXCWXRSEkZf+Lt4hCRGYeV9Oe4mDz3I="; + }) + ]; nativeBuildInputs = [ autoPatchelfHook ]; + build-system = with python3Packages; [ + setuptools + ]; + buildInputs = [ zlib ]; propagatedBuildInputs = [ wget - ] - ++ (with python3Packages; [ + ]; + + dependencies = with python3Packages; [ biopython psutil xlsxwriter - ]); + ]; + + # Upstream already relaxed these dependencies, but that is not yet included in 2.1.14 + pythonRelaxDeps = [ + "biopython" + "psutil" + "xlsxwriter" + ]; # Tests rely on some of the databases being available, which is not bundled # with this package as (1) in total, they represent >100GB of data, and (2) diff --git a/pkgs/by-name/ei/eigenwallet/package.nix b/pkgs/by-name/ei/eigenwallet/package.nix index 5444253ec88f..a4a1ecfc074a 100644 --- a/pkgs/by-name/ei/eigenwallet/package.nix +++ b/pkgs/by-name/ei/eigenwallet/package.nix @@ -4,6 +4,7 @@ stdenv, dpkg, autoPatchelfHook, + wrapGAppsHook3, cairo, gdk-pixbuf, webkitgtk_4_1, @@ -12,16 +13,17 @@ stdenv.mkDerivation (finalAttrs: { pname = "eigenwallet"; - version = "4.4.1"; + version = "4.10.0"; src = fetchurl { url = "https://github.com/eigenwallet/core/releases/download/${finalAttrs.version}/eigenwallet_${finalAttrs.version}_amd64.deb"; - hash = "sha256-iwnDAF3iWol7wOc8HWVi/E8hgf0EcVE7RcUtm11JpOs="; + hash = "sha256-hH4XdPQ5Q6mFbEcln/eA/ayxPjGbGSKYvTBa4qxD8Cc="; }; nativeBuildInputs = [ dpkg autoPatchelfHook + wrapGAppsHook3 ]; buildInputs = [ diff --git a/pkgs/by-name/ej/ejs/package.nix b/pkgs/by-name/ej/ejs/package.nix index 60737a1dbf6f..c3d40e9ed5a7 100644 --- a/pkgs/by-name/ej/ejs/package.nix +++ b/pkgs/by-name/ej/ejs/package.nix @@ -32,6 +32,6 @@ buildNpmPackage { homepage = "https://ejs.co"; license = lib.licenses.asl20; mainProgram = "ejs"; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/ek/eksctl/package.nix b/pkgs/by-name/ek/eksctl/package.nix index c8f79d529781..f5f3a26596c3 100644 --- a/pkgs/by-name/ek/eksctl/package.nix +++ b/pkgs/by-name/ek/eksctl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "eksctl"; - version = "0.226.0"; + version = "0.229.0"; src = fetchFromGitHub { - owner = "weaveworks"; + owner = "eksctl-io"; repo = "eksctl"; rev = finalAttrs.version; - hash = "sha256-XjiM4o4xJPY+ZFtvWi5K99tQaZwNxiCla/jUeQQo+5E="; + hash = "sha256-lLpodO/y4Ho3AAuIVSerDPKhSBiKFIQmRyOJWYK1DCw="; }; - vendorHash = "sha256-HP0EdZeM2Nz6LI3EjVT7qPl47Suh45OjWptEHgqqvhg="; + vendorHash = "sha256-6oSv3NrBPNraHrGsmJzMEeDlR9CcKn0M5FwoL5t+kd0="; doCheck = false; @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI for Amazon EKS"; - homepage = "https://github.com/weaveworks/eksctl"; + homepage = "https://github.com/eksctl-io/eksctl"; changelog = "https://github.com/eksctl-io/eksctl/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch b/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch new file mode 100644 index 000000000000..d1bdf7b757c2 --- /dev/null +++ b/pkgs/by-name/el/electron-fiddle/bump-yauzl.patch @@ -0,0 +1,61 @@ +diff --git a/package.json b/package.json +index 7e49e7a..ab5c306 100644 +--- a/package.json ++++ b/package.json +@@ -166,6 +166,7 @@ + ] + }, + "resolutions": { ++ "yauzl": "^3.3.1", + "@electron-forge/maker-base": "7.8.1", + "@electron-forge/shared-types": "7.8.1" + } +diff --git a/yarn.lock b/yarn.lock +index a4d91bb..8ae6ff9 100644 +--- a/yarn.lock ++++ b/yarn.lock +@@ -3653,11 +3653,6 @@ browserslist@^4.21.10: + node-releases "^2.0.18" + update-browserslist-db "^1.1.0" + +-buffer-crc32@~0.2.3: +- version "0.2.13" +- resolved "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz" +- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== +- + buffer-from@^1.0.0: + version "1.1.2" + resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz" +@@ -5746,13 +5741,6 @@ faye-websocket@^0.11.3: + dependencies: + websocket-driver ">=0.5.1" + +-fd-slicer@~1.1.0: +- version "1.1.0" +- resolved "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz" +- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== +- dependencies: +- pend "~1.2.0" +- + fdir@^6.4.4, fdir@^6.4.6: + version "6.4.6" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.4.6.tgz#2b268c0232697063111bbf3f64810a2a741ba281" +@@ -12352,13 +12340,12 @@ yargs@^17.0.1: + y18n "^5.0.5" + yargs-parser "^21.1.1" + +-yauzl@^2.10.0: +- version "2.10.0" +- resolved "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz" +- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== ++yauzl@^2.10.0, yauzl@^3.3.1: ++ version "3.4.0" ++ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719" ++ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw== + dependencies: +- buffer-crc32 "~0.2.3" +- fd-slicer "~1.1.0" ++ pend "~1.2.0" + + yocto-queue@^0.1.0: + version "0.1.0" diff --git a/pkgs/by-name/el/electron-fiddle/dont-fetch-contributors.patch b/pkgs/by-name/el/electron-fiddle/dont-fetch-contributors.patch new file mode 100644 index 000000000000..2cf2a3544980 --- /dev/null +++ b/pkgs/by-name/el/electron-fiddle/dont-fetch-contributors.patch @@ -0,0 +1,23 @@ +diff --git a/tools/contributors.ts b/tools/contributors.ts +index ad085d3..1a30ab4 100644 +--- a/tools/contributors.ts ++++ b/tools/contributors.ts +@@ -126,6 +126,7 @@ async function fetchDetailsContributors( + } + + async function fetchContributors() { ++ return [] + const response = await fetch(CONTRIBUTORS_URL, { headers: HEADERS }); + + if (!response.ok) { +@@ -173,10 +174,6 @@ async function fetchAndWriteContributorsFile() { + + try { + data = await fetchContributors(); +- +- if (!data || data.length === 0) { +- throw new Error('Contributors array is empty'); +- } + } catch (error) { + if (process.env.CI) { + throw error; diff --git a/pkgs/by-name/el/electron-fiddle/package.nix b/pkgs/by-name/el/electron-fiddle/package.nix index 0c51aa9310ad..fc8d78f0f6e8 100644 --- a/pkgs/by-name/el/electron-fiddle/package.nix +++ b/pkgs/by-name/el/electron-fiddle/package.nix @@ -25,15 +25,21 @@ let hash = "sha256-e9PLgkqWBNLBw7uuNpPluOQ6+aGLYQLyTzcLa+LMOzs="; }; + patches = [ + ./dont-use-initial-releases-json.patch + ./dont-fetch-contributors.patch + + # zip extraction fails on newer nodejs versions without this fix + ./bump-yauzl.patch + ]; + unwrapped = stdenvNoCC.mkDerivation { pname = "${pname}-unwrapped"; - inherit version src; - - patches = [ ./dont-use-initial-releases-json.patch ]; + inherit version src patches; offlineCache = fetchYarnDeps { - inherit src; - hash = "sha256-mB8WG6tX204u6AJ8qLbWrA+pSN3oDihHqj0t3bWcuAI="; + inherit src patches; + hash = "sha256-5yUsjXQ3OHwEGFgMTUJAXAuTdAl4zkb8zxTs5OT6sw4="; }; nativeBuildInputs = [ @@ -61,6 +67,9 @@ let --replace-fail 'await this.getElectronZipPath(downloadOpts)' '"electron.zip"' ''; + # electron-forge's console output is squeezed into one narrow column if unset + env.CI = "1"; + yarnBuildScript = "package"; installPhase = '' @@ -96,6 +105,8 @@ buildFHSEnv { inherit pname version; runScript = "${lib.getExe electron} ${unwrapped}/lib/electron-fiddle/resources/app.asar"; + passthru = { inherit unwrapped; }; + extraInstallCommands = '' mkdir -p "$out/share/icons/hicolor/scalable/apps" ln -s "${unwrapped}/share/icons/hicolor/scalable/apps/electron-fiddle.svg" "$out/share/icons/hicolor/scalable/apps/" diff --git a/pkgs/by-name/el/electron-mail/package.nix b/pkgs/by-name/el/electron-mail/package.nix index 22ed742e22d5..965e6ad8746d 100644 --- a/pkgs/by-name/el/electron-mail/package.nix +++ b/pkgs/by-name/el/electron-mail/package.nix @@ -10,20 +10,16 @@ let pname = "electron-mail"; - version = "5.3.7"; + version = "5.3.8"; sources = { x86_64-linux = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-linux-x86_64.AppImage"; - hash = "sha256-VJbCQ/4yIuBE4NPDFUbp8t2G/QjUclphH/MghvamDVo="; + hash = "sha256-twqB1D3zLlZJuxQWD4dGF70w57yYv6i3abGBidERsss="; }; aarch64-darwin = fetchurl { url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-arm64.dmg"; - hash = "sha256-ulB+dlp6ZBhcBJiLY4k+E/oEWy9XSIuIzd5rTzEq9+4="; - }; - x86_64-darwin = fetchurl { - url = "https://github.com/vladimiry/ElectronMail/releases/download/v${version}/electron-mail-${version}-mac-x64.dmg"; - hash = "sha256-LbAqUj34m8qSq8sQ1xgCQj9+MfJHoFDRMq+/waMKtzM="; + hash = "sha256-V32Wi0oCU9dLfzqxg3OdseiILX7wPiBGNz7KuG0vlZY="; }; }; @@ -45,7 +41,6 @@ let platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; changelog = "https://github.com/vladimiry/ElectronMail/releases/tag/v${version}"; }; diff --git a/pkgs/by-name/el/element-call/package.nix b/pkgs/by-name/el/element-call/package.nix index 1eb2861f3c5b..f37b775dd5b7 100644 --- a/pkgs/by-name/el/element-call/package.nix +++ b/pkgs/by-name/el/element-call/package.nix @@ -16,20 +16,20 @@ let # Keep this in sync with upstream locked version (likely a stable release, but not always latest) matrix-js-sdk = stdenv.mkDerivation (finalAttrs: { pname = "matrix-js-sdk"; - version = "41.7.0-rc.3"; + version = "41.8.0"; src = fetchFromGitHub { owner = "matrix-org"; repo = "matrix-js-sdk"; tag = "v${finalAttrs.version}"; - hash = "sha256-KD+AbMGVAaGEU5h2JB5JyQtwG0SYejdADjJ7TrxqVrY="; + hash = "sha256-9OWB3Hz8EoDIu27jvA6Am4l1dH53IZGE9TStB2Viw6E="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-mWtzWAV/lyaCZEIiGmOLUkhwwMouNAWoYJWL7Srr/bM="; + hash = "sha256-Me76t/wl4HtmbQ+FzUNLEpOM6aYbzTl68tuDSEh+Hq4="; }; nativeBuildInputs = [ @@ -58,20 +58,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-call"; - version = "0.20.1"; + version = "0.20.3"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-call"; tag = "v${finalAttrs.version}"; - hash = "sha256-g71b0GVpe181iNum5i6z1bTAbCykyoYUy300Ebeds1Q="; + hash = "sha256-H+In5fsX82eMDGk5kaS5ulqU1U5S67auEPc24rtCkuA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 4; - hash = "sha256-K+ccoUDNYdmeVyVSYLP1UsvdsAgD1aH80HIubZY4Mf8="; + hash = "sha256-JOpKxtElmNKepx3W+1LIolcrYrevsCEq7+Aoh0kwZEw="; }; inherit matrix-js-sdk; diff --git a/pkgs/by-name/el/element-desktop/package.nix b/pkgs/by-name/el/element-desktop/package.nix index 118a37a0023c..344d7db401f6 100644 --- a/pkgs/by-name/el/element-desktop/package.nix +++ b/pkgs/by-name/el/element-desktop/package.nix @@ -30,13 +30,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-desktop"; - version = "1.12.21"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-wtMmfNZptCMPp3j6dicEM/80otz20UBQw+HXb8EXJl0="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { @@ -46,8 +46,8 @@ stdenv.mkDerivation (finalAttrs: { src ; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-OPpJ5XJ0YeidvlT88JwQIKXxbQ40l0xdVH/9uT3La2M="; + fetcherVersion = 4; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/el/element-web-unwrapped/package.nix b/pkgs/by-name/el/element-web-unwrapped/package.nix index ee61fce02654..45dd152435f0 100644 --- a/pkgs/by-name/el/element-web-unwrapped/package.nix +++ b/pkgs/by-name/el/element-web-unwrapped/package.nix @@ -25,21 +25,21 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "element-web"; - version = "1.12.21"; + version = "1.12.23"; src = fetchFromGitHub { owner = "element-hq"; repo = "element-web"; tag = "v${finalAttrs.version}"; - hash = "sha256-wtMmfNZptCMPp3j6dicEM/80otz20UBQw+HXb8EXJl0="; + hash = "sha256-IdQZqwGk05APb38hEoin74/5FeRgjCLrdli+R6iaoUA="; }; pnpmDeps = fetchPnpmDeps { pname = "element"; inherit (finalAttrs) version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-OPpJ5XJ0YeidvlT88JwQIKXxbQ40l0xdVH/9uT3La2M="; + fetcherVersion = 4; + hash = "sha256-WVQaq7kqlEdKodOkErUCeYLh0xnH1NTHzgNyjn1+1y0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elements/package.nix b/pkgs/by-name/el/elements/package.nix index 2bdac00f7537..6d0385633609 100644 --- a/pkgs/by-name/el/elements/package.nix +++ b/pkgs/by-name/el/elements/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { "--with-boost-libdir=${boost.out}/lib" "--disable-bench" ] - ++ lib.optionals (!finalAttrs.doCheck) [ + ++ lib.optionals (!finalAttrs.finalPackage.doCheck) [ "--disable-tests" "--disable-gui-tests" ] diff --git a/pkgs/by-name/el/elephant/package.nix b/pkgs/by-name/el/elephant/package.nix index 93df5966a194..b2e446a8e4ce 100644 --- a/pkgs/by-name/el/elephant/package.nix +++ b/pkgs/by-name/el/elephant/package.nix @@ -31,16 +31,16 @@ let in buildGoModule (finalAttrs: { pname = "elephant"; - version = "2.21.0"; + version = "2.22.0"; src = fetchFromGitHub { owner = "abenz1267"; repo = "elephant"; rev = "v${finalAttrs.version}"; - hash = "sha256-h7Rw0vlb0n0Jsk21WJPm7H+1T1bG+PEuxE5cJ2TZl8A="; + hash = "sha256-frlaSpCf/e94OqO5Glp1NW96bemc+BhrKoPu+4X1FyI="; }; - vendorHash = "sha256-EWXZ+9/QDRpidpVHBcfJgp0xoc3YtRsiC/UTk1R+FSY="; + vendorHash = "sha256-ssX+ZQ6v+XcwC/RuIZ+rO/9zZwZnotudj8bvZNM7M3g="; buildInputs = [ protobuf ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/el/elf2uf2-rs/package.nix b/pkgs/by-name/el/elf2uf2-rs/package.nix index 434781557bcb..a5e240ffaa25 100644 --- a/pkgs/by-name/el/elf2uf2-rs/package.nix +++ b/pkgs/by-name/el/elf2uf2-rs/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Convert ELF files to UF2 for USB Flashing Bootloaders"; mainProgram = "elf2uf2-rs"; homepage = "https://github.com/JoNil/elf2uf2-rs"; - license = with lib.licenses; [ bsd0 ]; + license = lib.licenses.bsd0; platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ polygon diff --git a/pkgs/by-name/el/elfcat/package.nix b/pkgs/by-name/el/elfcat/package.nix index cb3dc8582637..28cad761edf5 100644 --- a/pkgs/by-name/el/elfcat/package.nix +++ b/pkgs/by-name/el/elfcat/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.1.10"; src = fetchFromGitHub { - owner = "ruslashev"; + owner = "rbakbashev"; repo = "elfcat"; rev = finalAttrs.version; sha256 = "sha256-8jyOYV455APlf8F6HmgyvgfNGddMzrcGhj7yFQT6qvg="; @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "ELF visualizer, generates HTML files from ELF binaries"; - homepage = "https://github.com/ruslashev/elfcat"; + homepage = "https://github.com/rbakbashev/elfcat"; license = lib.licenses.zlib; maintainers = with lib.maintainers; [ moni ]; mainProgram = "elfcat"; diff --git a/pkgs/by-name/el/elfutils/package.nix b/pkgs/by-name/el/elfutils/package.nix index 10d00afecf70..a66af1cb091b 100644 --- a/pkgs/by-name/el/elfutils/package.nix +++ b/pkgs/by-name/el/elfutils/package.nix @@ -28,11 +28,11 @@ # TODO: Look at the hardcoded paths to kernel, modules etc. stdenv.mkDerivation (finalAttrs: { pname = "elfutils"; - version = "0.194"; + version = "0.195"; src = fetchurl { url = "https://sourceware.org/elfutils/ftp/${finalAttrs.version}/elfutils-${finalAttrs.version}.tar.bz2"; - hash = "sha256-CeL/Az05uqiziKLX+8U5C/3pmuO3xnx9qvdDP7zw8B4="; + hash = "sha256-N2Kf338fPcKBjhOPyiuAlBd9bC0PcB07tlClYSGNwCY="; }; patches = [ @@ -58,12 +58,10 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-7daehJj1t0wPtQzTv+/Rpuqqs5Ng/EYnZzrcf2o/Lb0="; }) (fetchpatch { - name = "fix-aarch64_attributes.patch"; - url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=b27adc5262e807f341ca0a4910ce04294144f79a"; - hash = "sha256-hksO5HXL9Jv5E4o2rI4NAgQp+4z+Lg7Wn/AdW7fpr0c="; + name = "fix-i386_tlsdesc_relocation.patch"; + url = "https://sourceware.org/git/?p=elfutils.git;a=patch;h=bfd519cc58e190544a6785d3f0a27fcfaf7d8da3"; + hash = "sha256-N7DL2FG1AWLc+hcnxGMbUl5TuieoAc9OD6gc0sbsiGI="; }) - # https://patchwork.sourceware.org/project/elfutils/patch/20251205145241.1165646-1-arnout@bzzt.net/ - ./test-run-sysroot-reliability.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ ./musl-error_h.patch ]; @@ -92,8 +90,8 @@ stdenv.mkDerivation (finalAttrs: { flex gettext bzip2 - ] - ++ lib.optional enableDebuginfod pkg-config; + pkg-config + ]; buildInputs = [ zlib zstd diff --git a/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch b/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch deleted file mode 100644 index 6e5b5890a758..000000000000 --- a/pkgs/by-name/el/elfutils/test-run-sysroot-reliability.patch +++ /dev/null @@ -1,44 +0,0 @@ -commit 898804bed022d1ef26e5c0b12550f87fc86f29ed -Author: Arnout Engelen -Date: Thu Dec 4 21:42:40 2025 +0100 - - tests: improve reliability of run-sysroot.sh - - Previously, the 'second' test would test the `RESOLVE_IN_ROOT` feature - when the current libc supports it, even when the currently running - kernel did not yet support it. - - Signed-off-by: Arnout Engelen - -diff --git a/tests/run-sysroot.sh b/tests/run-sysroot.sh -index fe302446..d2041e8a 100755 ---- a/tests/run-sysroot.sh -+++ b/tests/run-sysroot.sh -@@ -46,10 +46,14 @@ TID 431185: - #8 0x0000aaaae56127f0 _start - EOF - --HAVE_OPENAT2=$(grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' \ -- ${abs_builddir}/../config.h | awk '{print $3}') -+libc_has_openat2_resolve_in_root() { -+ grep '^#define HAVE_OPENAT2_RESOLVE_IN_ROOT' ${abs_builddir}/../config.h | awk '{print $3}' -+} -+kernel_has_openat2_resolve_in_root() { -+ printf "%s\n%s" "5.6.0" "$(uname -r)" | sort -V -C -+} - --if [[ "$HAVE_OPENAT2" = 1 ]]; then -+if libc_has_openat2_resolve_in_root && kernel_has_openat2_resolve_in_root; then - # Change the layout of files in sysroot to test symlink escape scenario - rm -f "${tmpdir}/sysroot/bin" - mkdir "${tmpdir}/sysroot/bin" -@@ -57,7 +61,8 @@ if [[ "$HAVE_OPENAT2" = 1 ]]; then - ln -s /bin/bash "${tmpdir}/sysroot/usr/bin/bash" - - # Check that stack with --sysroot generates correct backtrace even if target -- # binary is actually absolute symlink pointing outside of sysroot directory -+ # binary is actually absolute symlink to be interpreted relative to the sysroot -+ # directory - testrun "${abs_top_builddir}"/src/stack --core "${tmpdir}/core.bash" \ - --sysroot "${tmpdir}/sysroot" >"${tmpdir}/stack.out" - diff --git a/pkgs/by-name/el/elfx86exts/package.nix b/pkgs/by-name/el/elfx86exts/package.nix index 657b6a2ff6b8..b123e6e16c9f 100644 --- a/pkgs/by-name/el/elfx86exts/package.nix +++ b/pkgs/by-name/el/elfx86exts/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/pkgw/elfx86exts"; maintainers = with lib.maintainers; [ rmcgibbo ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "elfx86exts"; }; }) diff --git a/pkgs/by-name/el/eliza/package.nix b/pkgs/by-name/el/eliza/package.nix index b7395a64a197..40478e01db5c 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-2026-06-09"; + version = "0-unstable-2026-06-13"; src = fetchFromGitHub { owner = "anthay"; repo = "ELIZA"; - rev = "ed26676c8903892945c549ae58722c4d355555b0"; - hash = "sha256-M2Qy+QeBPkQNx9hn2FZ2d5cUh532e+C/x8EJSgntO9Q="; + rev = "8e93cb50107a4c6c854e96b533a36958ac934d3f"; + hash = "sha256-KRw5ow/34A0GANUoCLM3xOhMc4dlzTWpVqWcsgruTCE="; }; doCheck = true; diff --git a/pkgs/by-name/el/elogind/errno-list-filter-out-EFSBADCRC-and-EFSCORRUPTED.patch b/pkgs/by-name/el/elogind/errno-list-filter-out-EFSBADCRC-and-EFSCORRUPTED.patch new file mode 100644 index 000000000000..51a1b6075595 --- /dev/null +++ b/pkgs/by-name/el/elogind/errno-list-filter-out-EFSBADCRC-and-EFSCORRUPTED.patch @@ -0,0 +1,34 @@ +From: Yu Watanabe +Date: Tue, 24 Feb 2026 20:19:45 +0900 +Subject: errno-list: filter out EFSBADCRC and EFSCORRUPTED + +These are introduced in kernel v7.0. + +(cherry picked from commit 3cfb16998808a6ec8012a6120d0a82f0e1a0c8bb) +(cherry picked from commit f870952f69c453aeef0b4022d32bba4769d84238) +(cherry picked from commit 73e2fa308cfa49f599e104e599e1a479fd3d21e3) +--- + src/basic/generate-errno-list.sh | 10 +++++++--- + 1 file changed, 7 insertions(+), 3 deletions(-) + +diff --git a/src/basic/generate-errno-list.sh b/src/basic/generate-errno-list.sh +index f756b2e..491fa1b 100755 +--- a/src/basic/generate-errno-list.sh ++++ b/src/basic/generate-errno-list.sh +@@ -3,9 +3,13 @@ + set -eu + set -o pipefail + +-# In kernel's arch/parisc/include/uapi/asm/errno.h, ECANCELLED and EREFUSED are defined as aliases of +-# ECANCELED and ECONNREFUSED, respectively. Let's drop them. ++# In kernel's arch/parisc/include/uapi/asm/errno.h, The following aliases are defined: ++# ECANCELLED → ECANCELED ++# EREFUSED → ECONNREFUSED ++# EFSBADCRC → EBADMSG ++# EFSCORRUPTED → EUCLEAN ++# Let's drop them. + + ${1:?} -dM -include errno.h - =24.0.0" } }, "node_modules/@asamuzakjp/dom-selector": { - "version": "6.8.1", - "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-6.8.1.tgz", - "integrity": "sha512-MvRz1nCqW0fsy8Qz4dnLIvhOlMzqDVBabZx6lH+YywFDdjXhMY37SmpV1XFX3JzG5GWHn63j6HX6QPr3lZXHvQ==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-7.1.1.tgz", + "integrity": "sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==", "dev": true, "license": "MIT", "dependencies": { + "@asamuzakjp/generational-cache": "^1.0.1", "@asamuzakjp/nwsapi": "^2.3.9", "bidi-js": "^1.0.3", - "css-tree": "^3.1.0", - "is-potential-custom-element-name": "^1.0.1", - "lru-cache": "^11.2.6" + "css-tree": "^3.2.1", + "is-potential-custom-element-name": "^1.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, + "node_modules/@asamuzakjp/generational-cache": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/generational-cache/-/generational-cache-1.0.1.tgz", + "integrity": "sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, "node_modules/@asamuzakjp/nwsapi": { @@ -595,7 +607,6 @@ "version": "7.29.7", "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", - "dev": true, "license": "MIT", "engines": { "node": ">=6.9.0" @@ -1851,6 +1862,19 @@ "dev": true, "license": "ISC" }, + "node_modules/@bramus/specificity": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz", + "integrity": "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "css-tree": "^3.0.0" + }, + "bin": { + "specificity": "bin/cli.js" + } + }, "node_modules/@colors/colors": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.5.0.tgz", @@ -1863,9 +1887,9 @@ } }, "node_modules/@csstools/color-helpers": { - "version": "6.0.2", - "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.0.2.tgz", - "integrity": "sha512-LMGQLS9EuADloEFkcTBR3BwV/CGHV7zyDxVRtVDTwdI2Ca4it0CCVTT9wCkxSgokjE5Ho41hEPgb8OEUwoXr6Q==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.0.tgz", + "integrity": "sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==", "dev": true, "funding": [ { @@ -1907,9 +1931,9 @@ } }, "node_modules/@csstools/css-color-parser": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.1.tgz", - "integrity": "sha512-eZ5XOtyhK+mggRafYUWzA0tvaYOFgdY8AkgQiCJF9qNAePnUo/zmsqqYubBBb3sQ8uNUaSKTY9s9klfRaAXL0g==", + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.9.tgz", + "integrity": "sha512-paQcIaOO53Rk5+YrBaBjm/SgrV4INImjo2BT1DtQRYr+XeTRbeAYlS+jxXp9drqvKmtFnWRJKIalDLhZZDu42A==", "dev": true, "funding": [ { @@ -1923,7 +1947,7 @@ ], "license": "MIT", "dependencies": { - "@csstools/color-helpers": "^6.0.2", + "@csstools/color-helpers": "^6.1.0", "@csstools/css-calc": "^3.2.1" }, "engines": { @@ -1958,9 +1982,9 @@ } }, "node_modules/@csstools/css-syntax-patches-for-csstree": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.4.tgz", - "integrity": "sha512-wgsqt92b7C7tQhIdPNxj0n9zuUbQlvAuI1exyzeNrOKOi62SD7ren8zqszmpVREjAOqg8cD2FqYhQfAuKjk4sw==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.6.tgz", + "integrity": "sha512-TcJCWFbXLPpJYq6z7bfOyjWYJDiDg2/I4gyUC9pqPNqHFRIey0EB0q0L5cSnQDfWJg8Jd6VadakxdIez/3zkqQ==", "dev": true, "funding": [ { @@ -2083,21 +2107,21 @@ } }, "node_modules/@emnapi/core": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.10.0.tgz", - "integrity": "sha512-yq6OkJ4p82CAfPl0u9mQebQHKPJkY7WrIuk205cTYnYe+k2Z8YBh11FrbRG/H6ihirqcacOgl2BIO8oyMQLeXw==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz", + "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@emnapi/wasi-threads": "1.2.1", + "@emnapi/wasi-threads": "1.2.2", "tslib": "^2.4.0" } }, "node_modules/@emnapi/runtime": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.10.0.tgz", - "integrity": "sha512-ewvYlk86xUoGI0zQRNq/mC+16R1QeDlKQy21Ki3oSYXNgLb45GV1P6A0M+/s6nyCuNDqe5VpaY84BzXGwVbwFA==", + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz", + "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==", "dev": true, "license": "MIT", "optional": true, @@ -2106,9 +2130,9 @@ } }, "node_modules/@emnapi/wasi-threads": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.1.tgz", - "integrity": "sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==", + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", + "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", "dev": true, "license": "MIT", "optional": true, @@ -2120,7 +2144,6 @@ "version": "0.86.0", "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.86.0.tgz", "integrity": "sha512-ukZmRQ81WiTpDWO6D/cTBM7XbrNtutHKvAVnZN/8pldAwLoJArGOvkNyxPTBGsPjsoaQBJxlH+tE2TNA/92Qgw==", - "dev": true, "license": "MIT", "dependencies": { "@types/estree": "^1.0.8", @@ -2137,7 +2160,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/@es-joy/resolve.exports/-/resolve.exports-1.2.0.tgz", "integrity": "sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==", - "dev": true, "license": "MIT", "engines": { "node": ">=10" @@ -2147,7 +2169,6 @@ "version": "4.7.2", "resolved": "https://registry.npmjs.org/@eslint-community/eslint-plugin-eslint-comments/-/eslint-plugin-eslint-comments-4.7.2.tgz", "integrity": "sha512-LF03qURSwEWm2dz5wtdDCzNk+7Opl0X7q6I3undsaIuNsEiNvRV3BCtqu14Q/6Pzg1tBj44LcxpW2EpSLZStZw==", - "dev": true, "license": "MIT", "dependencies": { "escape-string-regexp": "^4.0.0", @@ -2164,10 +2185,9 @@ } }, "node_modules/@eslint-community/eslint-plugin-eslint-comments/node_modules/ignore": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", - "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", - "dev": true, + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.6.tgz", + "integrity": "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==", "license": "MIT", "engines": { "node": ">= 4" @@ -2251,9 +2271,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", - "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz", + "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==", "dev": true, "license": "MIT", "dependencies": { @@ -2263,7 +2283,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", + "js-yaml": "^4.3.0", "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, @@ -2282,9 +2302,9 @@ "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -2350,35 +2370,18 @@ } }, "node_modules/@eslint/js": { - "version": "10.0.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz", - "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==", - "dev": true, - "license": "MIT", - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://eslint.org/donate" - }, - "peerDependencies": { - "eslint": "^10.0.0" - }, - "peerDependenciesMeta": { - "eslint": { - "optional": true - } - } + "resolved": "packages/js", + "link": true }, "node_modules/@eslint/json": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@eslint/json/-/json-1.2.0.tgz", - "integrity": "sha512-CEFEyNgvzu8zn5QwVYDg3FaG+ZKUeUsNYitFpMYJAqoAlnw68EQgNbUfheSmexZr4n0wZPrAkPLuvsLaXO6wRw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@eslint/json/-/json-2.0.1.tgz", + "integrity": "sha512-Thz2j92ceUF3Bq/0TuWb3MWn3Z+Cwc8k5ptF0fakl2D4Mp8mSx07Xr1aQM4R5NoihzarWUdxfOmQ8DesGy4jOg==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^1.1.1", - "@eslint/plugin-kit": "^0.6.1", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", "@humanwhocodes/momoa": "^3.3.10", "natural-compare": "^1.4.0" }, @@ -2386,20 +2389,6 @@ "node": "^20.19.0 || ^22.13.0 || >=24" } }, - "node_modules/@eslint/json/node_modules/@eslint/plugin-kit": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.6.1.tgz", - "integrity": "sha512-iH1B076HoAshH1mLpHMgwdGeTs0CYwL0SPMkGuSebZrwBp16v415e9NZXg2jtrqPVQjf6IANe2Vtlr5KswtcZQ==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@eslint/core": "^1.1.1", - "levn": "^0.4.1" - }, - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - } - }, "node_modules/@eslint/object-schema": { "version": "3.0.5", "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", @@ -2668,14 +2657,14 @@ } }, "node_modules/@keyvhq/memoize": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@keyvhq/memoize/-/memoize-2.1.16.tgz", - "integrity": "sha512-THiT2+c59Ju8+WybdhYZFx1cCrXR0glC3rIut+JU0E5D4uMzdObEi9I8alYGjJ+Qgigt9fHTAziYP6yemAhtnA==", + "version": "2.2.5", + "resolved": "https://registry.npmjs.org/@keyvhq/memoize/-/memoize-2.2.5.tgz", + "integrity": "sha512-Ut/O/k9RsClEiVhBMEcM0B4DEpLdaEdCCpu6xCFU+WhWAzvpm6kWck3fOgeUoCB7VytT1JFbD2tl0rn6R2BHwA==", "dev": true, "license": "MIT", "dependencies": { "@keyvhq/core": "2.1.15", - "mimic-fn": "~3.0.0", + "mimic-fn": "~3.1.0", "null-prototype-object": "~1.2.5" }, "engines": { @@ -2703,64 +2692,77 @@ } }, "node_modules/@metascraper/helpers": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.50.1.tgz", - "integrity": "sha512-F2C23cjHAL2fE5LAj+SsHGLC/8GCiI9U8m4iu92CwQScTYuDA2s9wrkDqsvSlVhnTxdAEM7JikLbyRIr+laXig==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/@metascraper/helpers/-/helpers-5.51.1.tgz", + "integrity": "sha512-69omtPC3Fap69balcMuJk2tN6nduKlP/VkZMXPw+UKCldDFJmKmTRi5AzvBE4/yxPAgFSpwP0Lt9YQmDoYCBLg==", "dev": true, "license": "MIT", "dependencies": { "audio-extensions": "0.0.0", - "chrono-node": "2.9.0", - "condense-whitespace": "~2.0.0", - "data-uri-utils": "~1.0.9", + "chrono-node": "2.9.1", + "condense-whitespace": "~3.0.0", + "data-uri-utils": "~1.0.13", "debug-logfmt": "~1.4.7", - "entities": "~7.0.1", + "entities": "~8.0.0", "file-extension": "~4.0.5", "has-values": "~2.0.1", "image-extensions": "~1.1.0", - "is-relative-url": "~3.0.0", - "is-uri": "~1.2.12", - "iso-639-3": "~2.2.0", + "is-relative-url": "~4.1.0", + "is-uri": "~1.2.14", + "iso-639-3": "~3.0.1", "isostring": "0.0.1", - "jsdom": "~27.4.0", - "jsonrepair": "~3.13.2", - "lodash": "~4.18.0", + "jsdom": "~29.1.1", + "jsonrepair": "~3.14.0", + "lodash": "~4.18.1", "memoize-one": "~6.0.0", - "microsoft-capitalize": "~1.0.6", - "mime": "3", - "normalize-url": "6", - "re2": "~1.23.0", + "microsoft-capitalize": "~1.0.8", + "mime": "4", + "normalize-url": "9", + "re2": "~1.25.0", "smartquotes": "~2.3.2", - "tldts": "~7.0.19", + "tldts": "~7.4.2", "url-regex-safe": "~4.0.0", - "video-extensions": "1" + "video-extensions": "2" }, "engines": { - "node": ">= 22" + "node": ">= 22.13" } }, "node_modules/@metascraper/helpers/node_modules/entities": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz", - "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz", + "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==", "dev": true, "license": "BSD-2-Clause", "engines": { - "node": ">=0.12" + "node": ">=20.19.0" }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } }, + "node_modules/@metascraper/helpers/node_modules/normalize-url": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-9.0.1.tgz", + "integrity": "sha512-ARftfC5HdUNu9jJeL8pHj8debUIHA2b91FizCoMzY4lG6dDX13jdvTK0TBe24IBDRf2HvJSzzwEPvmbkQWHRSg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" + } + }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", - "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.1" + "@tybys/wasm-util": "^0.10.3" }, "funding": { "type": "github", @@ -2810,9 +2812,9 @@ } }, "node_modules/@oxc-parser/binding-android-arm-eabi": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.133.0.tgz", - "integrity": "sha512-l/44caGse+VpnY9gx0yvvc5QnnG3yG1FO3KZgYvNL1GZrfK86zIwAOgGEVlxDyRymzrU/KHiblPFpevKOmJmUA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm-eabi/-/binding-android-arm-eabi-0.137.0.tgz", + "integrity": "sha512-KDs+0VPdEmasOkpuJHW9V5WCF+cvYdMQv2Jd+aJXt+cxIx12NToRQRbXaRwUEDsZw+/jMk81Ve8ZFbjUkJTOwA==", "cpu": [ "arm" ], @@ -2827,9 +2829,9 @@ } }, "node_modules/@oxc-parser/binding-android-arm64": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.133.0.tgz", - "integrity": "sha512-KUHmPMziLBp4u+zbrLdB7iWS7KshuZe+RAp7ELnY9SI9nNXBZ+dp8fiBqWOxhXqn+FQg3a4UcQhwmsJOKV8Jjg==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-android-arm64/-/binding-android-arm64-0.137.0.tgz", + "integrity": "sha512-WhALNzfy3x/RfC6bsqX+csavuUY0yHHE7XfgPE5M542uhoBZUUoGTPG+nkMbGoG4+gcfss5s7urMyn5QBHu0sw==", "cpu": [ "arm64" ], @@ -2844,9 +2846,9 @@ } }, "node_modules/@oxc-parser/binding-darwin-arm64": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.133.0.tgz", - "integrity": "sha512-q8dWmnU/8ea2tga9w2f1PinQ5rcMPDUGkF64T189b65YMjUomET4oy5oRldOr4AwOQkneOG/Zttnz1Dvrc62wg==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-arm64/-/binding-darwin-arm64-0.137.0.tgz", + "integrity": "sha512-bFPr5hgmNMOMoyPTGtdsK4Ug21RovIPojRMgDDhSp1LtCnc/DkLwGONKjgRjszg677RlGnkYSviQ8hHaUPOVYA==", "cpu": [ "arm64" ], @@ -2861,9 +2863,9 @@ } }, "node_modules/@oxc-parser/binding-darwin-x64": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.133.0.tgz", - "integrity": "sha512-cOKeIELIB2bJnCKwqx4Rdj+1Lss/U6uCbLxRySZrhyOOQa1flKhwZFjEHRHxk8fU1NKmhK5OnTdPQ4CpjuFuVw==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-darwin-x64/-/binding-darwin-x64-0.137.0.tgz", + "integrity": "sha512-CL5dMm1asqXIDZHg14FLxj3Mc36w8PI7xCWh1uA4is6z8g2XrIILoTcQYOxDbwzuk34RDPX5IAGUxZr6LA9KAg==", "cpu": [ "x64" ], @@ -2878,9 +2880,9 @@ } }, "node_modules/@oxc-parser/binding-freebsd-x64": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.133.0.tgz", - "integrity": "sha512-OpaSv4pW3KgFrMYQxTaS0aOE4T1DQF3qZE/4B6uqqv1KgPWWd4UQhJALi8PJPX1RRV5K7ThKXRfF7qGg2+3l1A==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-freebsd-x64/-/binding-freebsd-x64-0.137.0.tgz", + "integrity": "sha512-79h8rYGnSlKPGWo7mHr2ixO6ea7aW8B0CT965SZ8SLbNnCOH5aOYBTeVXUY6eMvEaiLyWr8Skuiugr5pDYgLGw==", "cpu": [ "x64" ], @@ -2895,9 +2897,9 @@ } }, "node_modules/@oxc-parser/binding-linux-arm-gnueabihf": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.133.0.tgz", - "integrity": "sha512-JGK1wlGrGwxBIlVSF7KWTX1/ru6BEtf28fRROztDRkLfiW+Kxa4onnriezMIiogfn9hVw2KzYcKiLjkLR2ns8A==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-0.137.0.tgz", + "integrity": "sha512-ASgmlSimhGyr0lksgVIo6hibz1obnDq4qJbiMX/AzltfgPnanRrzG1Q+23g8ljOHOjv6dsznkUuCYL3gg0sY1Q==", "cpu": [ "arm" ], @@ -2912,9 +2914,9 @@ } }, "node_modules/@oxc-parser/binding-linux-arm-musleabihf": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.133.0.tgz", - "integrity": "sha512-yuZO533Ftonxn/iyoqQzURzLQHMspvsIyfiCSNi1t/ER4eIQaR0SsmUOUm5b/lmSig7IWIUa5/BrbEkAPwcilQ==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-0.137.0.tgz", + "integrity": "sha512-AU2J9aa22Sx32wRGnDjybOU9TQXXQUud5sdUi+ZB0XxwM8aToWLweV+yA0wlQm0yIUVqljquqoHCYEq9II8gJQ==", "cpu": [ "arm" ], @@ -2929,9 +2931,9 @@ } }, "node_modules/@oxc-parser/binding-linux-arm64-gnu": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.133.0.tgz", - "integrity": "sha512-hvpbqT5pN2rR+3+xtWeizwfR/aZ0vGceg6TqYMl+ToxMpk9/tmnX7kSvQnfEUkoua8mhogzvIKsAkn0wxgblBA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-0.137.0.tgz", + "integrity": "sha512-GdEtiG89yMr7XkUGxifgodXEEm2f+xW2f9CpDjlgAnBOwhTmrpQMvhOGobLVKUyzf/qHBXW16smk5zbF3nZU6w==", "cpu": [ "arm64" ], @@ -2949,9 +2951,9 @@ } }, "node_modules/@oxc-parser/binding-linux-arm64-musl": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.133.0.tgz", - "integrity": "sha512-wJQGamIosQBoJHW9+S5XxrtKRo3eyJxsnS1XCPrqN0LHi8uw1pTqqTfn3t/NVuvbBg7Pumn4ez9Eidgcn0xbEg==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-arm64-musl/-/binding-linux-arm64-musl-0.137.0.tgz", + "integrity": "sha512-EGJ+Bs8iXx8KBH8DQ5BLoEm5lnHaYjlh4/8j8vFhrr/6z4tqONy5BZDzLpKmmNWlN6Hlc5r8YOuBVHqZ9vRFEQ==", "cpu": [ "arm64" ], @@ -2969,9 +2971,9 @@ } }, "node_modules/@oxc-parser/binding-linux-ppc64-gnu": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.133.0.tgz", - "integrity": "sha512-Koaz32/O5+abIfrNGdyndgRvdOZ9jEf5/z3Ep9h3h2QWpdDiUQpVwgH0OcMXCs+l9aXxPLtkupqyVig9W6FDKw==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-0.137.0.tgz", + "integrity": "sha512-vzFUQENy/fnbSe5DZWovq6tIBc1uhuMztanSW6rz1e9WdQE4gHwYuD7ZII6JnrJifd1R3RSoqiZbgRFlVL2tYQ==", "cpu": [ "ppc64" ], @@ -2989,9 +2991,9 @@ } }, "node_modules/@oxc-parser/binding-linux-riscv64-gnu": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.133.0.tgz", - "integrity": "sha512-R4vOjWzxhnNWHnVLeiB6jNuIifdy9vcMXZGPc7StXcxBovI+U2zg1QhZ9o8OjV80oGivs1lX5NfPLzk4IPqlRA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-0.137.0.tgz", + "integrity": "sha512-SfVI14HBQs9gtLcUD5hTt5hsNbdrqSUNg9S8muN+LhVQ5nf1WwH3hAoK6B9NKgdYgWAQSXFXGiiBedQ4r/BKuw==", "cpu": [ "riscv64" ], @@ -3009,9 +3011,9 @@ } }, "node_modules/@oxc-parser/binding-linux-riscv64-musl": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.133.0.tgz", - "integrity": "sha512-iwgBNUTHiMdxARLYuM0SBlnYeb19iw1Ea5M+4ERZupCsBMLArti6FyZ6UfFjJxIiTDr2oW2DGQFxlQVQ/dW9rA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-0.137.0.tgz", + "integrity": "sha512-e7Ppy4FCIFNQxT/ikSeIWFoQ0l+N9vgtRBtLcyZXeolTzApyVoPqEXsYPrcdM/9i0Bwk8knvYd37vaEMxHyi6g==", "cpu": [ "riscv64" ], @@ -3029,9 +3031,9 @@ } }, "node_modules/@oxc-parser/binding-linux-s390x-gnu": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.133.0.tgz", - "integrity": "sha512-ZwZNo8FZmB/gVfboQl+wXilBigGl+6nQQs+nITOeAP/HcAOjiHl6XZJL9F/KXNEspODQcbjAiyjUbeCJd9a0fA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-0.137.0.tgz", + "integrity": "sha512-Bho5qFwdhqsIFR7gipYEUlqvi3SRrY8sugxXig380MIaakBB1PyU9+7dBiBVScfImTNWhijUxdBwqrprGdq5WA==", "cpu": [ "s390x" ], @@ -3049,9 +3051,9 @@ } }, "node_modules/@oxc-parser/binding-linux-x64-gnu": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.133.0.tgz", - "integrity": "sha512-govCvWx1dBlED3uu4qXctxpRcouu9I8Kn+DBktGCl760JtlGJzc9l/OmPJKlYWSbrRqKkMZehNeZ/4Wfma7uSA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-gnu/-/binding-linux-x64-gnu-0.137.0.tgz", + "integrity": "sha512-36mGWtg7PyFzjJwGDkH6/F4o2nIDEoKXLPr/X/lwqklkomQwJJt1I5GJVmGhovUEmgPK5WAeAZMqlFCehwiy9Q==", "cpu": [ "x64" ], @@ -3069,9 +3071,9 @@ } }, "node_modules/@oxc-parser/binding-linux-x64-musl": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.133.0.tgz", - "integrity": "sha512-ssTlpXD5Mq9uCssDJPzlRWqBt4Y7Zzd9i+XZhWmK/9Y6KUIuAxVYTYiI8lxcGWi0+3/Cz4A8q9UrD4NK9Y2j7g==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-linux-x64-musl/-/binding-linux-x64-musl-0.137.0.tgz", + "integrity": "sha512-/Jqx6+N7A44n2BdvUr7pXhVr2vFjs6WGH3unZRczwrfiH0H1zY0QwKQMG/dtRiTlKGDKGukznPT8lx84/oEsZg==", "cpu": [ "x64" ], @@ -3089,9 +3091,9 @@ } }, "node_modules/@oxc-parser/binding-openharmony-arm64": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.133.0.tgz", - "integrity": "sha512-51aByfXhPtLEdWG4a2Ihdw6cPWV1ei1AarALpFdDP8MLWDLE2NuUMgbo3DERR2Kt8fT/ok1GUvBiLxVGke9uUQ==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-openharmony-arm64/-/binding-openharmony-arm64-0.137.0.tgz", + "integrity": "sha512-9Uj0qHNNl+OgT1UTGwF7ixIXU6T1u2SbMidmgPy/h1h/fl2gRS6YpAxxY1gwHofcWjoTwkoMFd8xs5Vuj6GOFA==", "cpu": [ "arm64" ], @@ -3106,9 +3108,9 @@ } }, "node_modules/@oxc-parser/binding-wasm32-wasi": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.133.0.tgz", - "integrity": "sha512-2e16tkKp+wDO2GTAmXfxbBcCmGEaFPIJEIRBBmVKNVXSc8/fJsSIaBGyFTPHM9ST5GNWgJcYIt94rDTks+PLwA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-wasm32-wasi/-/binding-wasm32-wasi-0.137.0.tgz", + "integrity": "sha512-gW2vfkytNGgMVADiuzdvOfw0mWG9za20F/1fCJsif5aBMAvWJTSbpIXbIe0XkOe0VENk+PadpQ7cZgUy2sUJcA==", "cpu": [ "wasm32" ], @@ -3116,18 +3118,18 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.10.0", - "@emnapi/runtime": "1.10.0", - "@napi-rs/wasm-runtime": "^1.1.4" + "@emnapi/core": "1.11.1", + "@emnapi/runtime": "1.11.1", + "@napi-rs/wasm-runtime": "^1.1.5" }, "engines": { "node": "^20.19.0 || >=22.12.0" } }, "node_modules/@oxc-parser/binding-win32-arm64-msvc": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.133.0.tgz", - "integrity": "sha512-KPTNDKbxH1cglrqTyVeXHb4Pk4oksz8EcE1/v8zqU7N4UXbiHfA/IwtXZ2U77fnRAWBbgVkl/lZbL7o3hRdejg==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-0.137.0.tgz", + "integrity": "sha512-x+pFANF0yL5uK/6T7lu6SlR5qid6sp//eZXKLq5iNsIE+EQg6EaS8/wsW7E91nXXjpnPhSoMOHXShSVhGRdn8w==", "cpu": [ "arm64" ], @@ -3142,9 +3144,9 @@ } }, "node_modules/@oxc-parser/binding-win32-ia32-msvc": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.133.0.tgz", - "integrity": "sha512-Una1bNYv9zCavQrfnDR9wuZVB3itLjCEH4Oz7i6CwAJN/Xq9b+zbbcxmvdkKvvJt4Ngc/MBmIYlbLo3zS4TQ0A==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-ia32-msvc/-/binding-win32-ia32-msvc-0.137.0.tgz", + "integrity": "sha512-sQUqym80PFi6McRsIqfJrSu2JrSClEZIXXD+/FjAFoULEKzOPsldIdFBG96xdX8aVMzCNQ9792FPx3MfkEIrFA==", "cpu": [ "ia32" ], @@ -3159,9 +3161,9 @@ } }, "node_modules/@oxc-parser/binding-win32-x64-msvc": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.133.0.tgz", - "integrity": "sha512-kjBhCiOGSYTwDJQuuZa7a94JbP8htWu7J0X1KwH74kV2K5eYf6eyJRYmkpCDvr0XEL8tMxYI4WU1VekblFCLgg==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-parser/binding-win32-x64-msvc/-/binding-win32-x64-msvc-0.137.0.tgz", + "integrity": "sha512-2AsevxlvNN4WKxpEn3RtqD5zbqMaXF+T7JXblsP4gVuY+vC9dXS4ED/PwfRCliFqoeisYS3Iro4DHzxr0TEvVA==", "cpu": [ "x64" ], @@ -3176,9 +3178,9 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz", - "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.137.0.tgz", + "integrity": "sha512-WT+Gb24i8hmvo85AIv2oEYouEXkRlKAlT9WaCa3TfLgNCN+GhrJOGZuIlMouAh38Qe4QOx26eUOVsq70qXrywA==", "dev": true, "license": "MIT", "funding": { @@ -3186,9 +3188,9 @@ } }, "node_modules/@oxc-resolver/binding-android-arm-eabi": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.20.0.tgz", - "integrity": "sha512-IjfWOXRgJFNdORDl+Uf1aibNgZY2guOD3zmOhx1BGVb/MIiqlFTdmjpQNplSN58lhWehnX4UNqC3QwpUo8pjJg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm-eabi/-/binding-android-arm-eabi-11.21.3.tgz", + "integrity": "sha512-eNU11A2WNizh04v3uyaJCootrHIaS0B9aHYXvAvVnPNk4xYSjMUjHnhQ6dewPN2MRYDskV85d1N0Aw0WNWhcyg==", "cpu": [ "arm" ], @@ -3200,9 +3202,9 @@ ] }, "node_modules/@oxc-resolver/binding-android-arm64": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.20.0.tgz", - "integrity": "sha512-QqslZAuFQG8Q9xm7JuIn8JUbvywhSBMVhuQHtYW+auirZJloS41oxUUaBXk7uUhZJgp44c5zQLeVvmFaDQB+2Q==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-android-arm64/-/binding-android-arm64-11.21.3.tgz", + "integrity": "sha512-8Q+ZjTLvn2dIcWsrmhdrEihm7q+ag/k+mkry7Z+t0QbbHaVxXQfvH9AewyVMh/WrpEKhQ3DDgx9fYbqeCpeOEw==", "cpu": [ "arm64" ], @@ -3214,9 +3216,9 @@ ] }, "node_modules/@oxc-resolver/binding-darwin-arm64": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.20.0.tgz", - "integrity": "sha512-MUcavykj2ewlR+kc5arpg4tC2RvzJkUxWtNv74pf7lcNk00GpIpN43vXMj+j6r4eMmfZhlb8hueKoIb8e9kAGQ==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-arm64/-/binding-darwin-arm64-11.21.3.tgz", + "integrity": "sha512-wkh0qKZGHXVUDxFw3oA1TXnU2BDYY/r775oJflGeIr8uDPPoN2pk8gijQIzYRT6hoql/lg3+Tx/SaTn9e2/aGg==", "cpu": [ "arm64" ], @@ -3228,9 +3230,9 @@ ] }, "node_modules/@oxc-resolver/binding-darwin-x64": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.20.0.tgz", - "integrity": "sha512-BGB16nRUK5Etiv//ihPyzj8Lj1px0mhh4YIfe0FDf045ywknfSm0GEbiRESpr6Q4K82AvnyaRIhhluHByvS4bg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-darwin-x64/-/binding-darwin-x64-11.21.3.tgz", + "integrity": "sha512-HbNc23FAQYbuyDV2vBWMez4u4mrsm5RAkniGZAWqr6lYZ3N4beeqIb776jzwRl8qL2zRhHVXpUj97X0QgogVzg==", "cpu": [ "x64" ], @@ -3242,9 +3244,9 @@ ] }, "node_modules/@oxc-resolver/binding-freebsd-x64": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.20.0.tgz", - "integrity": "sha512-JZgtePaqj3qmD5XFHJaSLWzHRxQu0LaPkdoM1KJXYADvAaa83ijXHclV3ej3CueeW0wxfIAbGCZVP45J0CA7uQ==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-freebsd-x64/-/binding-freebsd-x64-11.21.3.tgz", + "integrity": "sha512-K6xNsTUPEUdfrn0+kbMq5nOUB5w1C5pavPQngt4TM2FpN91lP0PBe2srSpamb4d69O7h86oAi/qWX/kZNRSjkw==", "cpu": [ "x64" ], @@ -3256,9 +3258,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-arm-gnueabihf": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.20.0.tgz", - "integrity": "sha512-hOQ/p3ry3v3SchUBXicrrnszaI/UmYzM4wtS4RGfwgVUX7a+HbyQSzJ5aOzu+o6XZkFkS3ZXN4PZAzhOb77OSg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-11.21.3.tgz", + "integrity": "sha512-VcFmOpcpWX1zoEy8M58tR2M9YxM+Z9RuQhqAx5q0CTmrruaP7Gveejg75hzd/5sg5nk9G3aLALEa3hE2FsmmTQ==", "cpu": [ "arm" ], @@ -3270,9 +3272,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-arm-musleabihf": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.20.0.tgz", - "integrity": "sha512-2ArPksaw0AqeuGBfoS715VF+JvJQAhD2niWgjE5hVO+L+nAfikVQopvngCMX9x4BD8itWoQ3dnikrQyl5Ho5Jg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm-musleabihf/-/binding-linux-arm-musleabihf-11.21.3.tgz", + "integrity": "sha512-quVoxFLBy43hWaQbbDtQNRwAX5vX76mv7n64icAtQcJ3eNgVeblqmkupF/hAneNthdqSlnd1sTjb3aQSaDPaCQ==", "cpu": [ "arm" ], @@ -3284,9 +3286,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-arm64-gnu": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.20.0.tgz", - "integrity": "sha512-0bJnmYFp62JdZ4nVMDUZ/C58BCZOCcqgKtnUlp7L9Ojf/czIN+3j72YlLPeWLkzlr6SlYvIQA4SGV/HyO0d+qg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-11.21.3.tgz", + "integrity": "sha512-X0AqNZgcD07Q4V3RDK18/vYOj/HQT/FnmEFGYS2jTWqY7JO13ryE3TEs3eAIgUJhBnNkpEaiXqz3VK8M7qQhWQ==", "cpu": [ "arm64" ], @@ -3301,9 +3303,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-arm64-musl": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.20.0.tgz", - "integrity": "sha512-wKHHzPKZo7Ufhv/Bt6yxT7FOgnIgW4gwXcJUipkShGp68W3wGVqvr1Sr0fY65lN0Oy6y41+g2kIDvkgZaMMUkw==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-arm64-musl/-/binding-linux-arm64-musl-11.21.3.tgz", + "integrity": "sha512-YkaQnaKYdbuaXvRt5Qd0GpbihzVnyfR6z1SpYfIUC6RTu4NF7lDKPjVkYb+jRI2gedVO2rVpN35Y6akG6ud4Lw==", "cpu": [ "arm64" ], @@ -3318,9 +3320,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-ppc64-gnu": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.20.0.tgz", - "integrity": "sha512-RN8goF7Ie0B79L4i4G6OeBocTgSC56vJbQ65VJje+oXnldVpLnOU7j/AQ/dP94TcCS+Yh6WG8u3Qt4ETteXFNQ==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-11.21.3.tgz", + "integrity": "sha512-gB9HwhrPiFqUzDeEq+y/CgAijz1YdI6BnXz5GaH2Pa9cWdutchlkGFAiAuGb/PjVQpiK6NFKzFuztxrweoit7A==", "cpu": [ "ppc64" ], @@ -3335,9 +3337,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-riscv64-gnu": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.20.0.tgz", - "integrity": "sha512-5l1yU6/xQEqLZRzxqmMxJfWPslpwCmBsdDGaBvABPehxquCXDC7dd7oraNdKSJUMDXSM7VvVj8H2D2FTjU7oWw==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-gnu/-/binding-linux-riscv64-gnu-11.21.3.tgz", + "integrity": "sha512-zjDWBlYk8QGv0H8dsPUWqkfjYIIjG2TvspGkzXL0eImbgxtZorA/klKeHyolevoT3Kvbi+1iMr9Lhrh7jf54Og==", "cpu": [ "riscv64" ], @@ -3352,9 +3354,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-riscv64-musl": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.20.0.tgz", - "integrity": "sha512-xHEvkbgz6UC+A3JOyDQy76LkUaxsNSfIr3/GV8slwZsnuooJiIB34gzJfsyvR4JdCYNUUPsRJc/w/oWkODu+hg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-riscv64-musl/-/binding-linux-riscv64-musl-11.21.3.tgz", + "integrity": "sha512-4UfsQvacV388y1zpXL7C1x1FNYaV52JtuNRiuzrfQA2z1z6ElVrsidkGsrvQ5EgeSq1Pj7kaKqrgGkvFuxJ/tw==", "cpu": [ "riscv64" ], @@ -3369,9 +3371,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-s390x-gnu": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.20.0.tgz", - "integrity": "sha512-aWPDUUmSeyHvlW+SoEUd+JIJsQhVhu6a5tBpDRMu058naPAchTgAVGCFy35zjbnFlt0i8hLWziff6HX0D3LU4g==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-11.21.3.tgz", + "integrity": "sha512-b5uH+HKH0MP5mNBYaK75SKsJbw52URqrx2LavYdq6wb0l3ExAG5niYRP9DWUNHdKilpaBVM2bXk9HNWrH3ew7Q==", "cpu": [ "s390x" ], @@ -3386,9 +3388,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-x64-gnu": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.20.0.tgz", - "integrity": "sha512-x2YeSimvhJjKLVD8KSu8f/rqU1potcdEMkApIPJqjZWN7c2Fpt4g2X32WDg1p+XDAmyT7nuQGe0vnhvXeLbH+g==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-gnu/-/binding-linux-x64-gnu-11.21.3.tgz", + "integrity": "sha512-PjYlmilBpNRh2ntXNYAK3Am5w/nPfEpnU/96iNx7CI8EzAn12J4JRiec63wHJTH31nLoCNxBg/829pN+3CfG3Q==", "cpu": [ "x64" ], @@ -3403,9 +3405,9 @@ ] }, "node_modules/@oxc-resolver/binding-linux-x64-musl": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.20.0.tgz", - "integrity": "sha512-kcRLEIxpZefeYfLChjpgFf3ilBzRDZ+yobMrpRsQlSrxuFGtm3U6PMU7AaEpMqo3NfDGVyJJseAjnRLzMFHjwQ==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-linux-x64-musl/-/binding-linux-x64-musl-11.21.3.tgz", + "integrity": "sha512-QTBAb7JuHlZ7JUEyM8UiQi2f7m/L4swBhP2TNpYIDc9Wp/wRw1G/8sl6i13aIzQAXH7LKIm294LeOHd0lQR8zA==", "cpu": [ "x64" ], @@ -3420,9 +3422,9 @@ ] }, "node_modules/@oxc-resolver/binding-openharmony-arm64": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.20.0.tgz", - "integrity": "sha512-HHcfnApSZGtKhTiHqe8OZruOZe5XuFQH5/E0Yhj3u8fnFvzkM4/k6WjacUf4SvA0SPEAbfbgYmVPuo0VX/fIBQ==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-openharmony-arm64/-/binding-openharmony-arm64-11.21.3.tgz", + "integrity": "sha512-4j1DFwjwv36ec9kds0jU/ucQ5Ha4ERO/H95BxR5JFf0kqUUAJ1kwII7XhTc1vZrkdJkvLGC9Q2MbpObpum8RBg==", "cpu": [ "arm64" ], @@ -3434,9 +3436,9 @@ ] }, "node_modules/@oxc-resolver/binding-wasm32-wasi": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.20.0.tgz", - "integrity": "sha512-Tn0y1XOFYHNfK1wp1Z5QK8Rcld/bsOwRISQXfqAZ5IBpv8Gz1IvV39fUWNprqNdRizgcvFhOzWwFun2zkJsyBg==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-wasm32-wasi/-/binding-wasm32-wasi-11.21.3.tgz", + "integrity": "sha512-i8oluoel5kru/j1WNrjmQSiA3GQ7wvIYVR1IwIoZtKogAhya2iub+ZKIeSIkcJOrnzQ18Tzl/F+kL3fYOxZLvA==", "cpu": [ "wasm32" ], @@ -3444,18 +3446,41 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.10.0", - "@emnapi/runtime": "1.10.0", - "@napi-rs/wasm-runtime": "^1.1.4" + "@emnapi/core": "1.11.0", + "@emnapi/runtime": "1.11.0", + "@napi-rs/wasm-runtime": "^1.1.5" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@emnapi/core": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.0.tgz", + "integrity": "sha512-l9Oo58x0HOP5znGzVhYW9U3e5wVuA4LAZU2AGezTmkhO1CgQRFDhDg4nneHsu/t3WniXg9QrG2nIXL/ZS8ln8Q==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.2", + "tslib": "^2.4.0" + } + }, + "node_modules/@oxc-resolver/binding-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "1.11.0", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.0.tgz", + "integrity": "sha512-55coeOFKHv1ywEcUXJtWU5f+Jr/W5tZDvZig8DLKSwUN1JpROQ4rk/SNOQiFWmaR/VKF4zuFyW1B8JduOSv6Pg==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@oxc-resolver/binding-win32-arm64-msvc": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.20.0.tgz", - "integrity": "sha512-qPi25YNPe4YenS8MgsQU2+bIFHxxpLx1LVna2444cEHqNPhNjvWf9zqj4aWE43H9LpAsTmkkAlA3eL5ElBU3mA==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-11.21.3.tgz", + "integrity": "sha512-M/8dw8dD6aOs+NlPJax401CZB9I7Aut84isQLgALGGwke4Afvw+/7yYhZb94yXf6t2sPLhQLmSmtSV+2FhsOWg==", "cpu": [ "arm64" ], @@ -3467,9 +3492,9 @@ ] }, "node_modules/@oxc-resolver/binding-win32-x64-msvc": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.20.0.tgz", - "integrity": "sha512-Wb14jWEW8huH6It9F6sXd9vrYmIS7pMrgkU6sxpLxkP+9z+wRgs71hUEhRpcn8FOXAFa27FVWfY2tRpbfTzfLw==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/@oxc-resolver/binding-win32-x64-msvc/-/binding-win32-x64-msvc-11.21.3.tgz", + "integrity": "sha512-H7BCt/VnS9hnmMp42eGhZ99izSCRvlnWwy/N71K1/J8QoExwY4262Z8QiEkMDtduRJrztayDxETTckmUuAVL9Q==", "cpu": [ "x64" ], @@ -3495,7 +3520,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/@sindresorhus/base62/-/base62-1.0.0.tgz", "integrity": "sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -3594,9 +3618,9 @@ } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", - "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", + "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", "dev": true, "license": "MIT", "optional": true, @@ -3694,9 +3718,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "22.19.19", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.19.tgz", - "integrity": "sha512-dyh/xO2Fh5bYrfWaaqGrRQQGkNdmYw6AmaAUvYeUMNTWQtvb796ikLdmTchRmOlOiIJ1TDXfWgVx1QkUlQ6Hew==", + "version": "22.20.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.20.1.tgz", + "integrity": "sha512-EANqOCF9QFyra+4pfxUcX9STKJpCLjMbObVzljIJomAWSnuSIEAvyzEU53GaajbXJEgdh0iEcPL+DGvpUd4k1Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3753,16 +3777,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.1.tgz", - "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.63.0.tgz", + "integrity": "sha512-gwh4gvvlaVDKKxyfxMG+Gnu1u9X0OQBwyGLkbwB65dIzBKnxeRiJlNFqlI3zwVhNXJIs6qV7mlFCn/BIajlVig==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/scope-manager": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0", "debug": "^4.4.3" }, "engines": { @@ -3778,14 +3802,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz", - "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.63.0.tgz", + "integrity": "sha512-e5dh0/UI0ok53AlZ5wRkXCB32z/f2jUZqPR/ygAw5WYaSw8j9EoJWlS7wQjr/dmOaqWjnPIn2m+HhVPCMWGZVQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.60.1", - "@typescript-eslint/types": "^8.60.1", + "@typescript-eslint/tsconfig-utils": "^8.63.0", + "@typescript-eslint/types": "^8.63.0", "debug": "^4.4.3" }, "engines": { @@ -3800,14 +3824,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz", - "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.63.0.tgz", + "integrity": "sha512-uUyfMWCnDSN8bCpcrY8nGP2BLkQ9Xn0GsipcONcpIDWhwhO4ZSyHvyS14U3X75mzxWxL3I2UZIrenTzdzcJO8A==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1" + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3818,9 +3842,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz", - "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.63.0.tgz", + "integrity": "sha512-sUAbkulqBAsncKnbRP3+7CtQFRKicexnj7ZwNC6ddCR7EmrXvjvdCYMJbUIqMd6lwoEriZjwLo08aS5tSjVMHg==", "dev": true, "license": "MIT", "engines": { @@ -3835,10 +3859,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.1.tgz", - "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==", - "dev": true, + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.63.0.tgz", + "integrity": "sha512-xyLtl9DUBBFrcJS4x2pIqGLH68/tC2uOa4Z7pUteW09D3bXnnXUom4dyPikzWgB7llmIc1zoeI3aoUdC4rPK/Q==", "license": "MIT", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3849,16 +3872,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz", - "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.63.0.tgz", + "integrity": "sha512-ygBkU+B7ex5UI/gKhaqexWev79uISfIv7XQCRNYO/jmD8rGLPyWLAb3KMRT6nd8Gt9bmUBi9+iX6tBdYfOY81Q==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.60.1", - "@typescript-eslint/tsconfig-utils": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/project-service": "8.63.0", + "@typescript-eslint/tsconfig-utils": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/visitor-keys": "8.63.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -3877,16 +3900,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.1.tgz", - "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.63.0.tgz", + "integrity": "sha512-fUKaeAvrTuQg/Tgt3nliAUSZHJM6DlCcfyEmxCvlX8kieWSStBX+5O5Fnidtc3i2JrH+9c/GL4RY2iasd/GPTA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1" + "@typescript-eslint/scope-manager": "8.63.0", + "@typescript-eslint/types": "8.63.0", + "@typescript-eslint/typescript-estree": "8.63.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3901,13 +3924,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz", - "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==", + "version": "8.63.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.63.0.tgz", + "integrity": "sha512-UexrHGnGTpbuQHct2ExOc2ZcFbGUS9FOesCxxqdBGcpI1BxYu/LZ6U8Aq6/72XtF/qRBk9nhuGHFJIXXMhPMdw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/types": "8.63.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -4140,9 +4163,9 @@ "license": "ISC" }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -4173,16 +4196,6 @@ "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" } }, - "node_modules/agent-base": { - "version": "7.1.4", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", - "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 14" - } - }, "node_modules/aggregate-error": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", @@ -4365,7 +4378,6 @@ "version": "0.0.2", "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", - "dev": true, "license": "MIT", "engines": { "node": ">=14" @@ -4408,9 +4420,9 @@ } }, "node_modules/asn1.js/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -4638,10 +4650,9 @@ "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.33", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.33.tgz", - "integrity": "sha512-bA6+tcSLpz2tIEdDXZPpPTIuxBcC4+w6SieaYyfigIa4h8GlFxbA17v22Vx3JUtuZQj9SgOsnbK+aTBzyDyEuw==", - "dev": true, + "version": "2.10.42", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.42.tgz", + "integrity": "sha512-c/jurFrDLyui7o1J86yLkRu4LMsTYcBohveus7/I2Hzdn9KIP2bdJPTue/lR1KH46enoPbD77GKeSYNdyPoD3Q==", "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.cjs" @@ -4695,9 +4706,9 @@ "license": "MIT" }, "node_modules/bn.js": { - "version": "5.2.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.3.tgz", - "integrity": "sha512-EAcmnPkxpntVL+DS7bO1zhcZNvCkxqtkd0ZY53h06GNQ3DEkkGZ/gKgmDv6DdZQGj9BgfSPKtJJ7Dp1GPP8f7w==", + "version": "5.2.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-5.2.5.tgz", + "integrity": "sha512-Vq886eXykuP5E6HcKSSStP3bJgrE6In5WKxVUvJ8XGpWWYs2xZHWqUwzCtGgEtBcxyd57KBFDPFoUfNzdaHCNg==", "dev": true, "license": "MIT" }, @@ -4709,9 +4720,9 @@ "license": "ISC" }, "node_modules/brace-expansion": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", - "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" @@ -4881,10 +4892,9 @@ } }, "node_modules/browserslist": { - "version": "4.28.2", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.2.tgz", - "integrity": "sha512-48xSriZYYg+8qXna9kwqjIVzuQxi+KYWp2+5nCYnYKPTr0LvD89Jqk2Or5ogxz0NUMfIjhh2lIUX/LyX9B4oIg==", - "dev": true, + "version": "4.28.5", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.5.tgz", + "integrity": "sha512-Cu2E6QejHWzuDMTkuwgpABFgDfZrXLQq5V13YOACZx4mFAG4IwGTbTfHPMr4WtxlHoXSM8FIuRwYYCz5XiabaQ==", "funding": [ { "type": "opencollective", @@ -4901,10 +4911,10 @@ ], "license": "MIT", "dependencies": { - "baseline-browser-mapping": "^2.10.12", - "caniuse-lite": "^1.0.30001782", - "electron-to-chromium": "^1.5.328", - "node-releases": "^2.0.36", + "baseline-browser-mapping": "^2.10.42", + "caniuse-lite": "^1.0.30001800", + "electron-to-chromium": "^1.5.387", + "node-releases": "^2.0.50", "update-browserslist-db": "^1.2.3" }, "bin": { @@ -4964,10 +4974,9 @@ "license": "MIT" }, "node_modules/builtin-modules": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.2.0.tgz", - "integrity": "sha512-02yxLeyxF4dNl6SlY6/5HfRSrSdZ/sCPoxy2kZNP5dZZX8LSAD9aE2gtJIUgWrsQTiMPl3mxESyrobSwvRGisQ==", - "dev": true, + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/builtin-modules/-/builtin-modules-5.3.0.tgz", + "integrity": "sha512-hMQUl2bUFG339QygPM97E+mc8OY1IAchORZxm4a/frcYwKzozMzRVDBwHW0NjOqGElLm2O37AVQE8ikxlZHrMQ==", "license": "MIT", "engines": { "node": ">=18.20" @@ -5130,10 +5139,9 @@ } }, "node_modules/caniuse-lite": { - "version": "1.0.30001793", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001793.tgz", - "integrity": "sha512-iwSsYWaCOoh26cV8NwNRViHlrfUvYsHDfRVcbtmw0Kg6PJIZZXwMkj1442FYLBGkeUf1juAsU3DTfxW579mrPA==", - "dev": true, + "version": "1.0.30001803", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001803.tgz", + "integrity": "sha512-g/uHREV2ZpK9qMalCsWaxmA6ol+DX8GYhuf3T40RKoP+oL7vhRJh8LNt73PCjpnR6l14FzfPrB5Yux4PKm2meg==", "funding": [ { "type": "opencollective", @@ -5197,7 +5205,6 @@ "version": "5.4.4", "resolved": "https://registry.npmjs.org/change-case/-/change-case-5.4.4.tgz", "integrity": "sha512-HRQyTk2/YPEkt9TnUPbOpr64Uw3KOicFWPVBb+xiHvd6eBx/qPr9xqfBFDT8P2vWsvvz4jbEkfDe71W3VyNu2w==", - "dev": true, "license": "MIT" }, "node_modules/char-regex": { @@ -5464,9 +5471,9 @@ } }, "node_modules/chrono-node": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.9.0.tgz", - "integrity": "sha512-glI4YY2Jy6JII5l3d5FN6rcrIbKSQqKPhWsIRYPK2IK8Mm4Q1ZZFdYIaDqglUNf7gNwG+kWIzTn0omzzE0VkvQ==", + "version": "2.9.1", + "resolved": "https://registry.npmjs.org/chrono-node/-/chrono-node-2.9.1.tgz", + "integrity": "sha512-nqP8Zp11efCYQIESXPxeDM8ikzN5BDb3Zzou+a66fZq+X2hzKFdsNLQE2/uBAh//BZEMbaMo1eTnagK7hOenAg==", "dev": true, "license": "MIT", "engines": { @@ -5477,7 +5484,6 @@ "version": "4.4.0", "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==", - "dev": true, "funding": [ { "type": "github", @@ -5515,7 +5521,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/clean-regexp/-/clean-regexp-1.0.0.tgz", "integrity": "sha512-GfisEZEJvzKrmGWkvfhgzcz/BllN1USeqD2V6tg14OAOgaCD2Z/PUEuxnAZ/nPvmaHRG7a8y77p1T/IRQ4D1Hw==", - "dev": true, "license": "MIT", "dependencies": { "escape-string-regexp": "^1.0.5" @@ -5528,7 +5533,6 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", - "dev": true, "license": "MIT", "engines": { "node": ">=0.8.0" @@ -5610,9 +5614,9 @@ } }, "node_modules/cli-highlight/node_modules/yargs": { - "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", + "version": "16.2.2", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.2.tgz", + "integrity": "sha512-Nt9ZJjXTv5R8MHbqby/wXQ6Gi0Bb3TcYZkR1bzuL4yB2OxWPkXknz513gEF0GoA6tn00UpbPvERW8rzCuWCA6w==", "dev": true, "license": "MIT", "dependencies": { @@ -5797,7 +5801,6 @@ "version": "1.4.6", "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.6.tgz", "integrity": "sha512-ObxuY6vnbWTN6Od72xfwN9DbzC7Y2vv8u1Soi9ahRKL37gb6y1qk6/dgjs+3JWuXJHWvsg3BXIwzd/rkmAwavg==", - "dev": true, "license": "MIT", "engines": { "node": ">= 12.0.0" @@ -5828,13 +5831,16 @@ "license": "MIT" }, "node_modules/condense-whitespace": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/condense-whitespace/-/condense-whitespace-2.0.0.tgz", - "integrity": "sha512-Ath9o58/0rxZXbyoy3zZgrVMoIemi30sukG/btuMKCLyqfQt3dNOWc9N3EHEMa2Q3i0tXQPDJluYFLwy7pJuQw==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/condense-whitespace/-/condense-whitespace-3.0.0.tgz", + "integrity": "sha512-Z186uLXZi/AMCd/9R0q3HEXgLZkT5fGFRe3dJqv0DsG5megM6QJ+N7t7KcVWxr3/dU8T0x++Uegq2NpIpW0zNQ==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/console-browserify": { @@ -5873,7 +5879,6 @@ "version": "3.49.0", "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.49.0.tgz", "integrity": "sha512-VQXt1jr9cBz03b331DFDCCP90b3fanciLkgiOoy8SBHy06gNf+vQ1A3WFLqG7I8TipYIKeYK9wxd0tUrvHcOZA==", - "dev": true, "license": "MIT", "dependencies": { "browserslist": "^4.28.1" @@ -5929,9 +5934,9 @@ } }, "node_modules/create-ecdh/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -6042,22 +6047,6 @@ "node": "*" } }, - "node_modules/cssstyle": { - "version": "5.3.7", - "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-5.3.7.tgz", - "integrity": "sha512-7D2EPVltRrsTkhpQmksIu+LxeWAIEk6wRDMJ1qljlv+CKHJM+cJLlfhWIzNA44eAsHXSNe3+vO6DW1yCYx8SuQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@asamuzakjp/css-color": "^4.1.1", - "@csstools/css-syntax-patches-for-csstree": "^1.0.21", - "css-tree": "^3.1.0", - "lru-cache": "^11.2.4" - }, - "engines": { - "node": ">=20" - } - }, "node_modules/cypress": { "version": "14.5.4", "resolved": "https://registry.npmjs.org/cypress/-/cypress-14.5.4.tgz", @@ -6204,27 +6193,17 @@ } }, "node_modules/data-urls": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-6.0.1.tgz", - "integrity": "sha512-euIQENZg6x8mj3fO6o9+fOW8MimUI4PpD/fZBhJfeioZVy9TUpM4UY7KjQNVZFlqwJ0UdzRDzkycB997HEq1BQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz", + "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==", "dev": true, "license": "MIT", "dependencies": { "whatwg-mimetype": "^5.0.0", - "whatwg-url": "^15.1.0" + "whatwg-url": "^16.0.0" }, "engines": { - "node": ">=20" - } - }, - "node_modules/data-urls/node_modules/whatwg-mimetype": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", - "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20" + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, "node_modules/dateformat": { @@ -6262,9 +6241,9 @@ } }, "node_modules/debug-logfmt": { - "version": "1.4.12", - "resolved": "https://registry.npmjs.org/debug-logfmt/-/debug-logfmt-1.4.12.tgz", - "integrity": "sha512-qWsSb25WvSgwLyWpEF/qMOXXQHQlOPhU/xgRzjfUqwXF9z2X+jLp5wIKTyjMrvJ56FIERaEegUIb54jCAC6XGg==", + "version": "1.4.13", + "resolved": "https://registry.npmjs.org/debug-logfmt/-/debug-logfmt-1.4.13.tgz", + "integrity": "sha512-LF2JDEigILRayrszaLwXq1UX8sC2hbDRfbV29kfq5r6u6haBAxKWAECb2e7fWmivKe+AoC4u5/Z/gxQOwVEyMA==", "dev": true, "license": "MIT", "dependencies": { @@ -6507,9 +6486,9 @@ } }, "node_modules/diffie-hellman/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -6614,10 +6593,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.366", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.366.tgz", - "integrity": "sha512-OlRuhb688YTCzzU3gXPLn6nGyd+F+53INE1qaKKlu6kETErE8FYsyDh0XqXEU+uBRn0MpCzz2vfNwORhkap8qg==", - "dev": true, + "version": "1.5.389", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.389.tgz", + "integrity": "sha512-cEto7aeOqBfU1D+c5py5pE+ooscKE75JifxLBdFUZsqAxRS6y7kebtxAZvICszSl05gPjYHDTjY+lXpyGvpJbg==", "license": "ISC" }, "node_modules/elliptic": { @@ -6637,9 +6615,9 @@ } }, "node_modules/elliptic/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -6692,10 +6670,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.22.1", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.22.1.tgz", - "integrity": "sha512-6QEuw3zoX1SJQc7b87aBXke/no+mG2bTBgw29gWMQonLmpEkWoCAVkl+M49e48AZlWzxiDzDZzYdp6kobcyLww==", - "dev": true, + "version": "5.24.2", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.2.tgz", + "integrity": "sha512-rpsZEGT1jFuve6QlpyRp9ckQ+kN61hvF9BzCPyMdaKTm8UJce96KBn3sorXOFXlzjPrs3Vc4T1NsSroZ3PxlFw==", "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", @@ -6793,9 +6770,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", - "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.0.tgz", + "integrity": "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw==", "dev": true, "license": "MIT" }, @@ -6832,7 +6809,6 @@ "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -6878,7 +6854,6 @@ "version": "7.8.0", "resolved": "https://registry.npmjs.org/eslint-plugin-es-x/-/eslint-plugin-es-x-7.8.0.tgz", "integrity": "sha512-7Ds8+wAAoV3T+LAKeu39Y5BzXCrGKrcISfgKEqTS4BDN8SFEDQd0S43jiQ8vIa3wUKD07qitZdfzlenSi8/0qQ==", - "dev": true, "funding": [ "https://github.com/sponsors/ota-meshi", "https://opencollective.com/eslint" @@ -6900,7 +6875,6 @@ "version": "0.5.1", "resolved": "https://registry.npmjs.org/eslint-compat-utils/-/eslint-compat-utils-0.5.1.tgz", "integrity": "sha512-3z3vFexKIEnjHE3zCMRo6fn/e44U7T1khUjg+Hp0ZQMCigh28rALD0nPFBcGZuiLC5rLZa2ubQHDRln09JfU2Q==", - "dev": true, "license": "MIT", "dependencies": { "semver": "^7.5.4" @@ -6913,9 +6887,9 @@ } }, "node_modules/eslint-plugin-eslint-plugin": { - "version": "7.4.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-7.4.0.tgz", - "integrity": "sha512-yLFVy13SVSgGWiufaB3lGIUef6dmjBTrfYdFD0xPxBSHdrfyIonl3zGszesOXS2iYy/iVPd5ZLBKryS12s0Scg==", + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-eslint-plugin/-/eslint-plugin-eslint-plugin-7.4.1.tgz", + "integrity": "sha512-qDn/je8VILWFpaDh2FAnQcvoLQmt3q0QWsBkjHF8OiECgvRWhMLazDS4igVnjxCf8GYdZCMs/SxAgYC/HjaVtQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6950,9 +6924,9 @@ } }, "node_modules/eslint-plugin-expect-type/node_modules/fs-extra": { - "version": "11.3.5", - "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.5.tgz", - "integrity": "sha512-eKpRKAovdpZtR1WopLHxlBWvAgPny3c4gX1G5Jhwmmw4XJj0ifSD5qB5TOo8hmA0wlRKDAOAhEE1yVPgs6Fgcg==", + "version": "11.3.6", + "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-11.3.6.tgz", + "integrity": "sha512-w8ZNZr2mKIc7qeNaQ9AVPT1+iFaI+Avd4xudVOvdDJ8VytREi1Ft5Ih7hd9jjehod8vAM5GMsfQ/TpPf4EyoEA==", "dev": true, "license": "MIT", "dependencies": { @@ -6968,7 +6942,6 @@ "version": "62.9.0", "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-62.9.0.tgz", "integrity": "sha512-PY7/X4jrVgoIDncUmITlUqK546Ltmx/Pd4Hdsu4CvSjryQZJI2mEV4vrdMufyTetMiZ5taNSqvK//BTgVUlNkA==", - "dev": true, "license": "BSD-3-Clause", "dependencies": { "@es-joy/jsdoccomment": "~0.86.0", @@ -6997,7 +6970,6 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", - "dev": true, "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", @@ -7008,7 +6980,6 @@ "version": "17.24.0", "resolved": "https://registry.npmjs.org/eslint-plugin-n/-/eslint-plugin-n-17.24.0.tgz", "integrity": "sha512-/gC7/KAYmfNnPNOb3eu8vw+TdVnV0zhdQwexsw6FLXbhzroVj20vRn2qL8lDWDGnAQ2J8DhdfvXxX9EoxvERvw==", - "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.5.0", @@ -7035,7 +7006,6 @@ "version": "15.15.0", "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -7045,10 +7015,9 @@ } }, "node_modules/eslint-plugin-regexp": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-3.1.0.tgz", - "integrity": "sha512-qGXIC3DIKZHcK1H9A9+Byz9gmndY6TTSRkSMTZpNXdyCw2ObSehRgccJv35n9AdUakEjQp5VFNLas6BMXizCZg==", - "dev": true, + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-regexp/-/eslint-plugin-regexp-3.1.1.tgz", + "integrity": "sha512-MxR5nqoQCtVWmJwia0D2+NlXX1xzdpkslsVOZLEYQ4PQWEaL65PCZXURxaBc3lPnkNFpNxzMIRmYVxdl8giXRA==", "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.2.0", @@ -7070,7 +7039,6 @@ "version": "63.0.0", "resolved": "https://registry.npmjs.org/eslint-plugin-unicorn/-/eslint-plugin-unicorn-63.0.0.tgz", "integrity": "sha512-Iqecl9118uQEXYh7adylgEmGfkn5es3/mlQTLLkd4pXkIk9CTGrAbeUux+YljSa2ohXCBmQQ0+Ej1kZaFgcfkA==", - "dev": true, "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.28.5", @@ -7104,7 +7072,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -7117,7 +7084,6 @@ "version": "4.1.1", "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-4.1.1.tgz", "integrity": "sha512-SlyRoSkdh1dYP0PzclLE7r0M9sgbFKKMFXpFRUMNuKhQSbC6VQIGzq3E0qsfvGJaUFJPGv6Ws1NZ/haTAjfbMA==", - "dev": true, "license": "MIT", "engines": { "node": ">=12" @@ -7491,9 +7457,9 @@ "license": "MIT" }, "node_modules/fast-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.2.tgz", - "integrity": "sha512-rVjf7ArG3LTk+FS6Yw81V1DLuZl1bRbNrev6Tmd/9RaroeeRRJhAt7jg/6YFxbvAQXUCavSoZhPPj6oOx+5KjQ==", + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz", + "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==", "dev": true, "funding": [ { @@ -7566,9 +7532,9 @@ } }, "node_modules/fflate": { - "version": "0.8.2", - "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.2.tgz", - "integrity": "sha512-cPJU47OaAoCbg0pBvzsgpTPhmhqI5eJjh/JIu8tPj5q+T7iLvW/JAYUqmE7KOB4R1ZyEhzBaIQpQpardBF5z8A==", + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/fflate/-/fflate-0.8.3.tgz", + "integrity": "sha512-tbZNuJrLwGUp3zshBtdy4W+ORxZuIh8a5ilyIEQDC5rY1f3U20JMry0Ll3WBzU58EZKsEuJFXhb5gwv8CsPvgA==", "dev": true, "license": "MIT" }, @@ -7638,9 +7604,9 @@ "license": "MIT" }, "node_modules/filelist/node_modules/brace-expansion": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", - "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -7735,7 +7701,6 @@ "version": "1.0.1", "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz", "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -7851,17 +7816,17 @@ } }, "node_modules/form-data": { - "version": "4.0.5", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", - "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", + "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", "dev": true, "license": "MIT", "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" + "hasown": "^2.0.4", + "mime-types": "^2.1.35" }, "engines": { "node": ">= 6" @@ -8060,7 +8025,6 @@ "version": "4.14.0", "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.14.0.tgz", "integrity": "sha512-yTb+8DXzDREzgvYmh6s9vHsSVCHeC0G3PI5bEXNBHtmshPnO+S5O7qgLEOn0I5QvMy6kpZN8K1NKGyilLb93wA==", - "dev": true, "license": "MIT", "dependencies": { "resolve-pkg-maps": "^1.0.0" @@ -8153,13 +8117,6 @@ "node": ">=10.13.0" } }, - "node_modules/glob-to-regexp": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", - "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", - "dev": true, - "license": "BSD-2-Clause" - }, "node_modules/glob/node_modules/balanced-match": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", @@ -8168,9 +8125,9 @@ "license": "MIT" }, "node_modules/glob/node_modules/brace-expansion": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", - "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -8213,7 +8170,6 @@ "version": "16.5.0", "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -8244,9 +8200,9 @@ } }, "node_modules/globby/node_modules/ignore": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", - "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.6.tgz", + "integrity": "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==", "dev": true, "license": "MIT", "engines": { @@ -8270,7 +8226,6 @@ "version": "0.1.2", "resolved": "https://registry.npmjs.org/globrex/-/globrex-0.1.2.tgz", "integrity": "sha512-uHJgbwAMwNFf5mLst7IWLNg14x1CkeqglJb/K3doi4dw6q2IvAAmM/Y81kevy83wP+Sst+nutFTYOGg3d1lsxg==", - "dev": true, "license": "MIT" }, "node_modules/gopd": { @@ -8316,7 +8271,6 @@ "version": "4.2.11", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, "license": "ISC" }, "node_modules/gray-matter": { @@ -8346,9 +8300,9 @@ } }, "node_modules/gray-matter/node_modules/js-yaml": { - "version": "3.14.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", - "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", + "version": "3.15.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.15.0.tgz", + "integrity": "sha512-ttBQIIQPDeLjpPOohtUdXuXUVoA2uIB6fEH9HyJ7234s5mBJ5wTx20njxplLZQgLaOfpmPQA7X2t5AX6tIPbog==", "dev": true, "license": "MIT", "dependencies": { @@ -8535,7 +8489,6 @@ "version": "2.6.0", "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz", "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==", - "dev": true, "funding": [ { "type": "github", @@ -8577,20 +8530,6 @@ "dev": true, "license": "BSD-2-Clause" }, - "node_modules/http-proxy-agent": { - "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.0", - "debug": "^4.3.4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/http-signature": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.4.0.tgz", @@ -8627,20 +8566,6 @@ "dev": true, "license": "MIT" }, - "node_modules/https-proxy-agent": { - "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", - "dev": true, - "license": "MIT", - "dependencies": { - "agent-base": "^7.1.2", - "debug": "4" - }, - "engines": { - "node": ">= 14" - } - }, "node_modules/human-signals": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", @@ -8790,17 +8715,22 @@ } }, "node_modules/install-artifact-from-github": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.6.0.tgz", - "integrity": "sha512-wKsuzN8fy8QK7iEUqyWTQmvZ1QFGPn1xyl3/1iIIDthDjS7Hn9HoPwHlNakZirWbCsbad0lZMkr6Xfbpe1pUzw==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/install-artifact-from-github/-/install-artifact-from-github-1.7.0.tgz", + "integrity": "sha512-qAb91yAKVF9rFY4rVP21ZtYUyCScxAFt9udwzVWNLBE1pQcdQeB2gd1HlNPcQNYCzCDvJ/QJQPuWQ6aTmSlU8g==", "dev": true, "license": "BSD-3-Clause", "bin": { + "hash-github-cache": "bin/hash-github-cache.js", "install-from-cache": "bin/install-from-cache.js", "save-to-github-cache": "bin/save-to-github-cache.js" }, "engines": { "node": ">=18" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/uhop" } }, "node_modules/interpret": { @@ -8824,13 +8754,16 @@ } }, "node_modules/is-absolute-url": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", - "integrity": "sha512-opmNIX7uFnS96NtPmhWQgQx6/NYFgsUXYMllcfzwWKUMwfo8kku1TvE6hkNcH+Q1ts5cMVrsY7j0bxXQDciu9Q==", + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-4.0.1.tgz", + "integrity": "sha512-/51/TKE88Lmm7Gc4/8btclNXWS+g50wXhYJq8HWIBAGUBnoAdRu1aXeh364t/O7wXDAcTJDP8PNuNKWUDWie+A==", "dev": true, "license": "MIT", "engines": { - "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-alphabetical": { @@ -8887,7 +8820,6 @@ "version": "5.0.0", "resolved": "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-5.0.0.tgz", "integrity": "sha512-f4RqJKBUe5rQkJ2eJEJBXSticB3hGbN9j0yxxMQFqIW89Jp9WYFtzfTcRlstDKVUTRzSOTLKRfO9vIztenwtxA==", - "dev": true, "license": "MIT", "dependencies": { "builtin-modules": "^5.0.0" @@ -9165,16 +9097,19 @@ } }, "node_modules/is-relative-url": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-3.0.0.tgz", - "integrity": "sha512-U1iSYRlY2GIMGuZx7gezlB5dp1Kheaym7zKzO1PV06mOihiWTXejLwm4poEJysPyXF+HtK/BEd0DVlcCh30pEA==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/is-relative-url/-/is-relative-url-4.1.0.tgz", + "integrity": "sha512-vhIXKasjAuxS7n+sdv7pJQykEAgS+YU8VBQOENXwo/VZpOHDgBBsIbHo7zFKaWBjYWF4qxERdhbPRRtFAeJKfg==", "dev": true, "license": "MIT", "dependencies": { - "is-absolute-url": "^3.0.0" + "is-absolute-url": "^4.0.1" }, "engines": { - "node": ">=8" + "node": ">=14.16" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" } }, "node_modules/is-stream": { @@ -9254,9 +9189,9 @@ "license": "ISC" }, "node_modules/iso-639-3": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/iso-639-3/-/iso-639-3-2.2.0.tgz", - "integrity": "sha512-v9w/U4XDSfXCrXxf4E6ertGC/lTRX8MLLv7XC1j6N5oL3ympe38jp77zgeyMsn3MbufuAAoGeVzDJbOXnPTMhQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/iso-639-3/-/iso-639-3-3.0.1.tgz", + "integrity": "sha512-SdljCYXOexv/JmbQ0tvigHN43yECoscVpe2y2hlEqy/CStXQlroPhZLj7zKLRiGqLJfw8k7B973UAMDoQczVgQ==", "dev": true, "license": "MIT", "funding": { @@ -9432,9 +9367,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", - "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", "dev": true, "funding": [ { @@ -9465,42 +9400,42 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-7.2.0.tgz", "integrity": "sha512-dh140MMgjyg3JhJZY/+iEzW+NO5xR2gpbDFKHqotCmexElVntw7GjWjt511+C/Ef02RU5TKYrJo/Xlzk+OLaTw==", - "dev": true, "license": "MIT", "engines": { "node": ">=20.0.0" } }, "node_modules/jsdom": { - "version": "27.4.0", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-27.4.0.tgz", - "integrity": "sha512-mjzqwWRD9Y1J1KUi7W97Gja1bwOOM5Ug0EZ6UDK3xS7j7mndrkwozHtSblfomlzyB4NepioNt+B2sOSzczVgtQ==", + "version": "29.1.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.1.1.tgz", + "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==", "dev": true, "license": "MIT", "dependencies": { - "@acemir/cssom": "^0.9.28", - "@asamuzakjp/dom-selector": "^6.7.6", - "@exodus/bytes": "^1.6.0", - "cssstyle": "^5.3.4", - "data-urls": "^6.0.0", + "@asamuzakjp/css-color": "^5.1.11", + "@asamuzakjp/dom-selector": "^7.1.1", + "@bramus/specificity": "^2.4.2", + "@csstools/css-syntax-patches-for-csstree": "^1.1.3", + "@exodus/bytes": "^1.15.0", + "css-tree": "^3.2.1", + "data-urls": "^7.0.0", "decimal.js": "^10.6.0", "html-encoding-sniffer": "^6.0.0", - "http-proxy-agent": "^7.0.2", - "https-proxy-agent": "^7.0.6", "is-potential-custom-element-name": "^1.0.1", - "parse5": "^8.0.0", + "lru-cache": "^11.3.5", + "parse5": "^8.0.1", "saxes": "^6.0.0", "symbol-tree": "^3.2.4", - "tough-cookie": "^6.0.0", + "tough-cookie": "^6.0.1", + "undici": "^7.25.0", "w3c-xmlserializer": "^5.0.0", - "webidl-conversions": "^8.0.0", - "whatwg-mimetype": "^4.0.0", - "whatwg-url": "^15.1.0", - "ws": "^8.18.3", + "webidl-conversions": "^8.0.1", + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^16.0.1", "xml-name-validator": "^5.0.0" }, "engines": { - "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + "node": "^20.19.0 || ^22.13.0 || >=24.0.0" }, "peerDependencies": { "canvas": "^3.0.0" @@ -9538,9 +9473,9 @@ } }, "node_modules/jsdom/node_modules/tough-cookie": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz", - "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.2.tgz", + "integrity": "sha512-exgYmnmL/sJpR3upZfXG5PoatXQii55xAiXGXzY+sROLZ/Y+SLcp9PgJNI9Vz37HpQ74WvDcLT8eqm+kV3FzrA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -9554,7 +9489,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", - "dev": true, "license": "MIT", "bin": { "jsesc": "bin/jsesc" @@ -9646,9 +9580,9 @@ } }, "node_modules/jsonrepair": { - "version": "3.13.3", - "resolved": "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.13.3.tgz", - "integrity": "sha512-BTznj0owIt2CBAH/LTo7+1I5pMvl1e1033LRl/HUowlZmJOIhzC0zbX5bxMngLkfT4WnzPP26QnW5wMr2g9tsQ==", + "version": "3.14.1", + "resolved": "https://registry.npmjs.org/jsonrepair/-/jsonrepair-3.14.1.tgz", + "integrity": "sha512-NpGgMhmzG/fajkBEFlS9jZvMSGDvc2xN/9wNCHZ+Nx32GZfLRELU6UE6dQkebvrQUct9S+7bvnpX29NB36Qbdw==", "dev": true, "license": "ISC", "bin": { @@ -9725,9 +9659,9 @@ } }, "node_modules/knip": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/knip/-/knip-6.15.0.tgz", - "integrity": "sha512-uBaKFEGcu/HG4EY2gWFBMr+fBF43Jftoc2riJX51TKME1Z46C8UQIbNEusenYbEWihphxe2PY0Kns0yPvPYz4A==", + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/knip/-/knip-6.26.0.tgz", + "integrity": "sha512-e9eELEEpBpGTd4H4HB7818/DYj9dMzMyUqAddfYwUN/EbSkgIjOuWEF96W/xHsmV0SDrsdXjIM+oZ2xpPzPsBA==", "dev": true, "funding": [ { @@ -9745,14 +9679,13 @@ "formatly": "^0.3.0", "get-tsconfig": "4.14.0", "jiti": "^2.7.0", - "minimist": "^1.2.8", - "oxc-parser": "^0.133.0", - "oxc-resolver": "^11.20.0", + "oxc-parser": "^0.137.0", + "oxc-resolver": "11.21.3", "picomatch": "^4.0.4", "smol-toml": "^1.6.1", "strip-json-comments": "5.0.3", - "tinyglobby": "^0.2.16", - "unbash": "^3.0.0", + "tinyglobby": "^0.2.17", + "unbash": "^4.0.1", "yaml": "^2.9.0", "zod": "^4.1.11" }, @@ -9818,13 +9751,23 @@ "license": "MIT" }, "node_modules/linkify-it": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-3.0.3.tgz", - "integrity": "sha512-ynTsyrFSdE5oZ/O9GEf00kPngmOfVwazR5GKDq6EYfhlpFug3J2zybX56a2PRRpc9P+FuSoGNAwjlbDs9jJBPQ==", + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.2.tgz", + "integrity": "sha512-ONTm2jCMAVZjgQa/Fy1kScXsuOoF5NPTsoFBdE1KVIZ2vAh/r9+Bqo+0jINCBYnavTPQZz38QzFTme79ENoN3Q==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/markdown-it" + } + ], "license": "MIT", "dependencies": { - "uc.micro": "^1.0.1" + "uc.micro": "^2.0.0" } }, "node_modules/lint-staged": { @@ -10230,9 +10173,9 @@ } }, "node_modules/lru-cache": { - "version": "11.5.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", - "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", + "version": "11.5.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz", + "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==", "dev": true, "license": "BlueOak-1.0.0", "engines": { @@ -10266,35 +10209,49 @@ } }, "node_modules/markdown-it": { - "version": "12.3.2", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-12.3.2.tgz", - "integrity": "sha512-TchMembfxfNVpHkbtriWltGWc+m3xszaRD0CZup7GFFhzIgQqxIfn3eGj1yZpfuflzPvfkt611B2Q/Bsk1YnGg==", + "version": "14.3.0", + "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.3.0.tgz", + "integrity": "sha512-RCEsPjR+sr0x+AuYp601tKTkgFG4YEPLCzHST3cQ/fhlJkqAkz1L2/Qbp1j9qw5SBwQHFBoW8+hoN5xssOF0Tw==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/markdown-it" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1", - "entities": "~2.1.0", - "linkify-it": "^3.0.1", - "mdurl": "^1.0.1", - "uc.micro": "^1.0.5" + "entities": "^4.5.0", + "linkify-it": "^5.0.2", + "mdurl": "^2.0.0", + "punycode.js": "^2.3.1", + "uc.micro": "^2.1.0" }, "bin": { - "markdown-it": "bin/markdown-it.js" + "markdown-it": "bin/markdown-it.mjs" } }, "node_modules/markdown-it-container": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-3.0.0.tgz", - "integrity": "sha512-y6oKTq4BB9OQuY/KLfk/O3ysFhB3IMYoIWhGJEidXt1NQFocFK2sA2t0NYZAMyMShAGL6x5OPIbrmXPIqaN9rw==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/markdown-it-container/-/markdown-it-container-4.0.0.tgz", + "integrity": "sha512-HaNccxUH0l7BNGYbFbjmGpf5aLHAMTinqRZQAEQbMr2cdD3z91Q6kIo1oUn1CQndkT03jat6ckrdRYuwwqLlQw==", "dev": true, "license": "MIT" }, "node_modules/markdown-it/node_modules/entities": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-2.1.0.tgz", - "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w==", + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", + "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "dev": true, "license": "BSD-2-Clause", + "engines": { + "node": ">=0.12" + }, "funding": { "url": "https://github.com/fb55/entities?sponsor=1" } @@ -10389,26 +10346,6 @@ "js-yaml": "bin/js-yaml.js" } }, - "node_modules/markdownlint-cli2/node_modules/linkify-it": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.1.tgz", - "integrity": "sha512-wVoTjP4Q6R0NW5hiZkVJaFZPWgtXfoGF+6LucL3/FtiNjmcHhYjEr5f1Kqjirc1nBW07J/ZuRFumqr2oqccEWg==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/puzrin" - }, - { - "type": "github", - "url": "https://github.com/sponsors/markdown-it" - } - ], - "license": "MIT", - "dependencies": { - "uc.micro": "^2.0.0" - } - }, "node_modules/markdownlint-cli2/node_modules/markdown-it": { "version": "14.1.1", "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.1.tgz", @@ -10427,19 +10364,18 @@ "markdown-it": "bin/markdown-it.mjs" } }, - "node_modules/markdownlint-cli2/node_modules/mdurl": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", + "node_modules/markdownlint-cli2/node_modules/smol-toml": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz", + "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==", "dev": true, - "license": "MIT" - }, - "node_modules/markdownlint-cli2/node_modules/uc.micro": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", - "dev": true, - "license": "MIT" + "license": "BSD-3-Clause", + "engines": { + "node": ">= 18" + }, + "funding": { + "url": "https://github.com/sponsors/cyyynthia" + } }, "node_modules/markdownlint/node_modules/string-width": { "version": "8.1.0", @@ -10568,9 +10504,9 @@ "license": "CC0-1.0" }, "node_modules/mdurl": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-1.0.1.tgz", - "integrity": "sha512-/sKlQJCBYVY9Ers9hqzKou4H6V5UWc/M59TH2dvkt+84itfnq7uFOMLpOiOS4ujvHP4etln18fmIxA5R5fll0g==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", + "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "dev": true, "license": "MIT" }, @@ -10609,55 +10545,55 @@ } }, "node_modules/metascraper": { - "version": "5.50.3", - "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.50.3.tgz", - "integrity": "sha512-QdlOGeLJY/q0p1mII4YVSgPcEPD5Sq53ugZ8OrezT+xRScXt0KZoNlp9wEdtQdQzhOJJ+bKa9YUIe/cAtrk70A==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper/-/metascraper-5.51.1.tgz", + "integrity": "sha512-7ZmGn0EBv0oNxwaaUuxeUge/GkpCfuuuMV6/0aXgfU4WQ60yJj+/u13A2tqSe0otQq640YkEXua90uKsAwlWdA==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "5.50.1", - "cheerio": "~1.1.2", - "debug-logfmt": "~1.4.7", - "whoops": "~5.0.7" + "@metascraper/helpers": "5.51.1", + "cheerio": "~1.2.0", + "debug-logfmt": "~1.4.12", + "whoops": "~5.1.2" }, "engines": { "node": ">= 22" } }, "node_modules/metascraper-description": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.50.1.tgz", - "integrity": "sha512-bDOTaDigGn7SI4NoOURPBId8RLAfQ4uCruLjiQPs+ccVo0Chnfmk1ghPKjcQifkX6D550j+jxk0eFO/QatZEDw==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper-description/-/metascraper-description-5.51.1.tgz", + "integrity": "sha512-N7ki5J46p5b7fdw/+55i8kMnjQ1tJ2vHa/RTeJ9DidK46kUzReQV9S6r2J9fqZwUEGB6sMQjyX2SkXqmeOdhtQ==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "5.50.1" + "@metascraper/helpers": "5.51.1" }, "engines": { "node": ">= 22" } }, "node_modules/metascraper-image": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.50.1.tgz", - "integrity": "sha512-jU50Nb6KQwB3fb8LFdEfT0wd414DYyvfpEvgvQfibROf48oAHHPVWzd3gTNrywmLTMNQeKaUIXp1u45gX5rlmA==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper-image/-/metascraper-image-5.51.1.tgz", + "integrity": "sha512-oRiCb6KB7VrfSMQCHcon70BkoJP2B53d0sEjTwFrsVwV4uSbZHtlTRyIZ00tXZ07wbYJeTst/PjUywCtbIMEfA==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "5.50.1" + "@metascraper/helpers": "5.51.1" }, "engines": { "node": ">= 22" } }, "node_modules/metascraper-logo": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.50.1.tgz", - "integrity": "sha512-r1M5fYcDBC3GVEUf/cWEmMPELeTktfUDLJ0FoZkrdhTcJlySLgVssmiYBpCd5azIkh2fj9bmIewb5w9TH0wojw==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper-logo/-/metascraper-logo-5.51.1.tgz", + "integrity": "sha512-Oy1T3lFbn+g+q77e6HLIek44feIYjPm8YPKB3+5vP18+vJK1vK0dncfvOJz4GRDykTyHHzepAuE3lvl45hUFOA==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "5.50.1", + "@metascraper/helpers": "5.51.1", "lodash": "~4.18.0" }, "engines": { @@ -10665,15 +10601,15 @@ } }, "node_modules/metascraper-logo-favicon": { - "version": "5.50.3", - "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.50.3.tgz", - "integrity": "sha512-i+ehu+nOcUhG2HQpAuyM0d8Zp8fXRXH1r6imAW2CQIJlkoB8tyh7RIWjT1swo3MrDk2Ff7lWbZ1bJUOPdAp5HQ==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper-logo-favicon/-/metascraper-logo-favicon-5.51.1.tgz", + "integrity": "sha512-i7pNj740f0rWs8ni3AIt4umo4sRi6Q2sR6OFQtqRdnUTZzS0hGtrkAMkyICLfX7RoUek+e7fROhmd9a5YtZ4HA==", "dev": true, "license": "MIT", "dependencies": { - "@keyvhq/memoize": "~2.1.11", - "@metascraper/helpers": "5.50.1", - "lodash": "~4.18.0", + "@keyvhq/memoize": "~2.2.4", + "@metascraper/helpers": "5.51.1", + "lodash": "~4.18.1", "reachable-url": "~1.8.3" }, "engines": { @@ -10681,22 +10617,22 @@ } }, "node_modules/metascraper-title": { - "version": "5.50.1", - "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.50.1.tgz", - "integrity": "sha512-25mie58NY79BiMLvAe7PajA/CnDLI/emWXpbJHnPwJPizZRjNEqCBpVRXKMxnJjQOgwi2NCCrASgwPOC0SXONA==", + "version": "5.51.1", + "resolved": "https://registry.npmjs.org/metascraper-title/-/metascraper-title-5.51.1.tgz", + "integrity": "sha512-aXsjULWwxjJwL9JpQL5Ihx1QYGLb3ApuRLTk8DDzHvlSliQ9mpU7wRpZDmt9XJIOJ5RgNqTLobSd+7/BINOsow==", "dev": true, "license": "MIT", "dependencies": { - "@metascraper/helpers": "5.50.1" + "@metascraper/helpers": "5.51.1" }, "engines": { "node": ">= 22" } }, "node_modules/metascraper/node_modules/cheerio": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.1.2.tgz", - "integrity": "sha512-IkxPpb5rS/d1IiLbHMgfPuS0FgiWTtFIm/Nj+2woXDLTZ7fOT2eqzgYbdMlLweqlHbsZjxEChoVK+7iph7jyQg==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.2.0.tgz", + "integrity": "sha512-WDrybc/gKFpTYQutKIK6UvfcuxijIZfMfXaYm8NMsPQxSYvf+13fXUJ4rztGGbJcBQ/GF55gvrZ0Bc0bj/mqvg==", "dev": true, "license": "MIT", "dependencies": { @@ -10705,11 +10641,11 @@ "domhandler": "^5.0.3", "domutils": "^3.2.2", "encoding-sniffer": "^0.2.1", - "htmlparser2": "^10.0.0", + "htmlparser2": "^10.1.0", "parse5": "^7.3.0", "parse5-htmlparser2-tree-adapter": "^7.1.0", "parse5-parser-stream": "^7.1.2", - "undici": "^7.12.0", + "undici": "^7.19.0", "whatwg-mimetype": "^4.0.0" }, "engines": { @@ -10864,14 +10800,14 @@ "url": "https://github.com/fb55/entities?sponsor=1" } }, - "node_modules/metascraper/node_modules/undici": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-7.27.0.tgz", - "integrity": "sha512-+t2Z/GwkZQDtu00813aP66ygViGtPHKhhoFZpQKpKrE+9jIgES+Zw+mFNaDWOVRKiuJjuqKHzD3B1sfGg8+ZOQ==", + "node_modules/metascraper/node_modules/whatwg-mimetype": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", + "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", "dev": true, "license": "MIT", "engines": { - "node": ">=20.18.1" + "node": ">=18" } }, "node_modules/micromark": { @@ -11462,23 +11398,26 @@ } }, "node_modules/miller-rabin/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, "node_modules/mime": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", - "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-4.1.0.tgz", + "integrity": "sha512-X5ju04+cAzsojXKes0B/S4tcYtFAJ6tTMuSPBEn9CPGlrWr8Fiw7qYeLT0XyH80HSoAoqWCaz+MWKh22P7G1cw==", "dev": true, + "funding": [ + "https://github.com/sponsors/broofa" + ], "license": "MIT", "bin": { - "mime": "cli.js" + "mime": "bin/cli.js" }, "engines": { - "node": ">=10.0.0" + "node": ">=16" } }, "node_modules/mime-db": { @@ -11505,9 +11444,9 @@ } }, "node_modules/mimic-fn": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.0.0.tgz", - "integrity": "sha512-PiVO95TKvhiwgSwg1IdLYlCTdul38yZxZMIcnDSFIBUm4BNZha2qpQ4GpJ++15bHoKDtrW2D69lMfFwdFYtNZQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-3.1.0.tgz", + "integrity": "sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ==", "dev": true, "license": "MIT", "engines": { @@ -11563,6 +11502,124 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/minimizer-webpack-plugin": { + "version": "5.6.1", + "resolved": "https://registry.npmjs.org/minimizer-webpack-plugin/-/minimizer-webpack-plugin-5.6.1.tgz", + "integrity": "sha512-DoeAZz8Q1C1znwsUzej1fdoi4jCf7/+Em27ouLqfK/+3m8G+D7yDhUwrc3CNhjSzGUN1kn7Iv4sWmjflQHenpw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@jridgewell/trace-mapping": "^0.3.25", + "jest-worker": "^27.4.5", + "schema-utils": "^4.3.0", + "terser": "^5.31.1" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + }, + "peerDependencies": { + "webpack": "^5.1.0" + }, + "peerDependenciesMeta": { + "@minify-html/node": { + "optional": true + }, + "@swc/core": { + "optional": true + }, + "@swc/css": { + "optional": true + }, + "@swc/html": { + "optional": true + }, + "clean-css": { + "optional": true + }, + "cssnano": { + "optional": true + }, + "csso": { + "optional": true + }, + "esbuild": { + "optional": true + }, + "html-minifier-terser": { + "optional": true + }, + "lightningcss": { + "optional": true + }, + "postcss": { + "optional": true + }, + "uglify-js": { + "optional": true + } + } + }, + "node_modules/minimizer-webpack-plugin/node_modules/ajv": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/minimizer-webpack-plugin/node_modules/ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3" + }, + "peerDependencies": { + "ajv": "^8.8.2" + } + }, + "node_modules/minimizer-webpack-plugin/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/minimizer-webpack-plugin/node_modules/schema-utils": { + "version": "4.3.3", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz", + "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + }, + "engines": { + "node": ">= 10.13.0" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/webpack" + } + }, "node_modules/minipass": { "version": "7.1.3", "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", @@ -11644,9 +11701,9 @@ "license": "MIT" }, "node_modules/mocha/node_modules/brace-expansion": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", - "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz", + "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==", "dev": true, "license": "MIT", "dependencies": { @@ -11718,9 +11775,9 @@ } }, "node_modules/nan": { - "version": "2.27.0", - "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz", - "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==", + "version": "2.28.0", + "resolved": "https://registry.npmjs.org/nan/-/nan-2.28.0.tgz", + "integrity": "sha512-fTsDz99OTq2sVePhGdp4qQhggZFtKr64ZNVyVajRKtMOkJxYekplBh577PiJB12v/D3s2E5cGtOI45LWp6rnLQ==", "dev": true, "license": "MIT" }, @@ -11798,38 +11855,38 @@ } }, "node_modules/node-gyp": { - "version": "12.3.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.3.0.tgz", - "integrity": "sha512-QNcUWM+HgJplcPzBvFBZ9VXacyGZ4+VTOb80PwWR+TlVzoHbRKULNEzpRsnaoxG3Wzr7Qh7BYxGDU3CbKib2Yg==", + "version": "13.0.1", + "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-13.0.1.tgz", + "integrity": "sha512-piOr0S10qy5THB+q5BdqkoOx65XL/tjTMUAit3vciPNp+snTOBnGunWH1Rz7XZUxf2T9uFrfT/Ty4+aC3yPeyg==", "dev": true, "license": "MIT", "dependencies": { "env-paths": "^2.2.0", "exponential-backoff": "^3.1.1", "graceful-fs": "^4.2.6", - "nopt": "^9.0.0", - "proc-log": "^6.0.0", + "nopt": "^10.0.0", + "proc-log": "^7.0.0", "semver": "^7.3.5", "tar": "^7.5.4", "tinyglobby": "^0.2.12", - "undici": "^6.25.0", - "which": "^6.0.0" + "undici": "^8.4.1", + "which": "^7.0.0" }, "bin": { "node-gyp": "bin/node-gyp.js" }, "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" } }, "node_modules/node-gyp/node_modules/abbrev": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz", - "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-5.0.0.tgz", + "integrity": "sha512-/XrFJgzQQQHpti1raDJC6m4ws6aNktmjBlhk8Fdlk7LwCEuDoieEJJY9OFHjfiFJFFRM2tK+Ky/IsfbbmlMu1w==", "dev": true, "license": "ISC", "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" } }, "node_modules/node-gyp/node_modules/isexe": { @@ -11843,25 +11900,35 @@ } }, "node_modules/node-gyp/node_modules/nopt": { - "version": "9.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", - "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/nopt/-/nopt-10.0.1.tgz", + "integrity": "sha512-df3sBr/6ax9hSGuC3CspvLlbnX8cP5L5nZwXF8cGN8l0zSWR6BvzmQ6jPUKjvo6+/xdpkNvEcucBNUdBeeV13g==", "dev": true, "license": "ISC", "dependencies": { - "abbrev": "^4.0.0" + "abbrev": "^5.0.0" }, "bin": { "nopt": "bin/nopt.js" }, "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" + } + }, + "node_modules/node-gyp/node_modules/undici": { + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-8.7.0.tgz", + "integrity": "sha512-N7iQtfyLhIMOFgQubvmLV26svHpO0bqKnAiWotTQCVKCmWrcGbBotPuW1x+xwYZ2VHdSTVUfPQQnlEt1/LouTQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=22.19.0" } }, "node_modules/node-gyp/node_modules/which": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/which/-/which-6.0.1.tgz", - "integrity": "sha512-oGLe46MIrCRqX7ytPUf66EAYvdeMIZYn3WaocqqKZAxrBpkqHfL/qvTyJ/bTk5+AqHCjXmrv3CEWgy368zhRUg==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/which/-/which-7.0.0.tgz", + "integrity": "sha512-RancgH2dmbLdHl6LRhEqvklWMgl/Hdnun0Y90KhBOLkMefg8Qa7/Zel8Sm+8HEcP6DEjzsWzpkuBQEZok58isA==", "dev": true, "license": "ISC", "dependencies": { @@ -11871,7 +11938,7 @@ "node-which": "bin/which.js" }, "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" } }, "node_modules/node-polyfill-webpack-plugin": { @@ -11939,10 +12006,9 @@ } }, "node_modules/node-releases": { - "version": "2.0.47", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.47.tgz", - "integrity": "sha512-Uzmd6LXpouKo8EUK68IjH4+E01w/hXyV3R3g/geCJo+rXLNfh1xucB+LOzYEOQPSiUK3h/xZf0cQGcSsmyL2Og==", - "dev": true, + "version": "2.0.51", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.51.tgz", + "integrity": "sha512-wRNIrw4DmVLKQlbgOMdkMx27Wrpzes2hh5Jtbi2bjPd+4wJstWIqP5A+lscnqbm0xxmT5Bpg8Lec5ItEBwx6BQ==", "license": "MIT", "engines": { "node": ">=18" @@ -12100,7 +12166,6 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/object-deep-merge/-/object-deep-merge-2.0.1.tgz", "integrity": "sha512-aKttDKcU3pyZqKcCkDhsMn70WmZFG2JGDQLP9EcLyTSIFQRCPWLAmBZRLJnrVUrhPG1jETEEbfdgbNtJf1LyMg==", - "dev": true, "license": "MIT" }, "node_modules/object-inspect": { @@ -12232,13 +12297,13 @@ "license": "MIT" }, "node_modules/oxc-parser": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.133.0.tgz", - "integrity": "sha512-661RSx+ZcjBmjBYid+Fpp/2F5EbtildpeoZh5HdgnGs+jZ03nqQEQW8yGkt4BGyOC3OMPDQQRl8M5kqD2/g6jw==", + "version": "0.137.0", + "resolved": "https://registry.npmjs.org/oxc-parser/-/oxc-parser-0.137.0.tgz", + "integrity": "sha512-yFImD+WLElJpLKy8llG1qe4DCmMsL18peRp8XP1JKfig/gISbJkglnpDtX2aTmAn10kZF7164HbN2H8QPsXxGg==", "dev": true, "license": "MIT", "dependencies": { - "@oxc-project/types": "^0.133.0" + "@oxc-project/types": "^0.137.0" }, "engines": { "node": "^20.19.0 || >=22.12.0" @@ -12247,57 +12312,57 @@ "url": "https://github.com/sponsors/Boshen" }, "optionalDependencies": { - "@oxc-parser/binding-android-arm-eabi": "0.133.0", - "@oxc-parser/binding-android-arm64": "0.133.0", - "@oxc-parser/binding-darwin-arm64": "0.133.0", - "@oxc-parser/binding-darwin-x64": "0.133.0", - "@oxc-parser/binding-freebsd-x64": "0.133.0", - "@oxc-parser/binding-linux-arm-gnueabihf": "0.133.0", - "@oxc-parser/binding-linux-arm-musleabihf": "0.133.0", - "@oxc-parser/binding-linux-arm64-gnu": "0.133.0", - "@oxc-parser/binding-linux-arm64-musl": "0.133.0", - "@oxc-parser/binding-linux-ppc64-gnu": "0.133.0", - "@oxc-parser/binding-linux-riscv64-gnu": "0.133.0", - "@oxc-parser/binding-linux-riscv64-musl": "0.133.0", - "@oxc-parser/binding-linux-s390x-gnu": "0.133.0", - "@oxc-parser/binding-linux-x64-gnu": "0.133.0", - "@oxc-parser/binding-linux-x64-musl": "0.133.0", - "@oxc-parser/binding-openharmony-arm64": "0.133.0", - "@oxc-parser/binding-wasm32-wasi": "0.133.0", - "@oxc-parser/binding-win32-arm64-msvc": "0.133.0", - "@oxc-parser/binding-win32-ia32-msvc": "0.133.0", - "@oxc-parser/binding-win32-x64-msvc": "0.133.0" + "@oxc-parser/binding-android-arm-eabi": "0.137.0", + "@oxc-parser/binding-android-arm64": "0.137.0", + "@oxc-parser/binding-darwin-arm64": "0.137.0", + "@oxc-parser/binding-darwin-x64": "0.137.0", + "@oxc-parser/binding-freebsd-x64": "0.137.0", + "@oxc-parser/binding-linux-arm-gnueabihf": "0.137.0", + "@oxc-parser/binding-linux-arm-musleabihf": "0.137.0", + "@oxc-parser/binding-linux-arm64-gnu": "0.137.0", + "@oxc-parser/binding-linux-arm64-musl": "0.137.0", + "@oxc-parser/binding-linux-ppc64-gnu": "0.137.0", + "@oxc-parser/binding-linux-riscv64-gnu": "0.137.0", + "@oxc-parser/binding-linux-riscv64-musl": "0.137.0", + "@oxc-parser/binding-linux-s390x-gnu": "0.137.0", + "@oxc-parser/binding-linux-x64-gnu": "0.137.0", + "@oxc-parser/binding-linux-x64-musl": "0.137.0", + "@oxc-parser/binding-openharmony-arm64": "0.137.0", + "@oxc-parser/binding-wasm32-wasi": "0.137.0", + "@oxc-parser/binding-win32-arm64-msvc": "0.137.0", + "@oxc-parser/binding-win32-ia32-msvc": "0.137.0", + "@oxc-parser/binding-win32-x64-msvc": "0.137.0" } }, "node_modules/oxc-resolver": { - "version": "11.20.0", - "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.20.0.tgz", - "integrity": "sha512-CblytBiV/a/ZXY34dsVU2NxhIOxMXst8CvDCtyBelVITgd7PLrKzbEbA6oKLdPjvDKDzCiW48qzmzZ+mYaqn+g==", + "version": "11.21.3", + "resolved": "https://registry.npmjs.org/oxc-resolver/-/oxc-resolver-11.21.3.tgz", + "integrity": "sha512-2Mx3fKQz7+xgrBONjsxOgCGtMHOn38/HxMzW1I5efwXB5a4lRN0Vp40gYUJFBWJslcrvwoofTrqoTnLbwTd3pA==", "dev": true, "license": "MIT", "funding": { "url": "https://github.com/sponsors/Boshen" }, "optionalDependencies": { - "@oxc-resolver/binding-android-arm-eabi": "11.20.0", - "@oxc-resolver/binding-android-arm64": "11.20.0", - "@oxc-resolver/binding-darwin-arm64": "11.20.0", - "@oxc-resolver/binding-darwin-x64": "11.20.0", - "@oxc-resolver/binding-freebsd-x64": "11.20.0", - "@oxc-resolver/binding-linux-arm-gnueabihf": "11.20.0", - "@oxc-resolver/binding-linux-arm-musleabihf": "11.20.0", - "@oxc-resolver/binding-linux-arm64-gnu": "11.20.0", - "@oxc-resolver/binding-linux-arm64-musl": "11.20.0", - "@oxc-resolver/binding-linux-ppc64-gnu": "11.20.0", - "@oxc-resolver/binding-linux-riscv64-gnu": "11.20.0", - "@oxc-resolver/binding-linux-riscv64-musl": "11.20.0", - "@oxc-resolver/binding-linux-s390x-gnu": "11.20.0", - "@oxc-resolver/binding-linux-x64-gnu": "11.20.0", - "@oxc-resolver/binding-linux-x64-musl": "11.20.0", - "@oxc-resolver/binding-openharmony-arm64": "11.20.0", - "@oxc-resolver/binding-wasm32-wasi": "11.20.0", - "@oxc-resolver/binding-win32-arm64-msvc": "11.20.0", - "@oxc-resolver/binding-win32-x64-msvc": "11.20.0" + "@oxc-resolver/binding-android-arm-eabi": "11.21.3", + "@oxc-resolver/binding-android-arm64": "11.21.3", + "@oxc-resolver/binding-darwin-arm64": "11.21.3", + "@oxc-resolver/binding-darwin-x64": "11.21.3", + "@oxc-resolver/binding-freebsd-x64": "11.21.3", + "@oxc-resolver/binding-linux-arm-gnueabihf": "11.21.3", + "@oxc-resolver/binding-linux-arm-musleabihf": "11.21.3", + "@oxc-resolver/binding-linux-arm64-gnu": "11.21.3", + "@oxc-resolver/binding-linux-arm64-musl": "11.21.3", + "@oxc-resolver/binding-linux-ppc64-gnu": "11.21.3", + "@oxc-resolver/binding-linux-riscv64-gnu": "11.21.3", + "@oxc-resolver/binding-linux-riscv64-musl": "11.21.3", + "@oxc-resolver/binding-linux-s390x-gnu": "11.21.3", + "@oxc-resolver/binding-linux-x64-gnu": "11.21.3", + "@oxc-resolver/binding-linux-x64-musl": "11.21.3", + "@oxc-resolver/binding-openharmony-arm64": "11.21.3", + "@oxc-resolver/binding-wasm32-wasi": "11.21.3", + "@oxc-resolver/binding-win32-arm64-msvc": "11.21.3", + "@oxc-resolver/binding-win32-x64-msvc": "11.21.3" } }, "node_modules/p-cancelable": { @@ -12461,7 +12526,6 @@ "version": "0.2.4", "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz", "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==", - "dev": true, "license": "MIT", "dependencies": { "parse-statements": "1.0.11" @@ -12500,7 +12564,6 @@ "version": "1.0.11", "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz", "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==", - "dev": true, "license": "MIT" }, "node_modules/parse-uri": { @@ -12705,14 +12768,12 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", - "dev": true, + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "license": "MIT", "engines": { "node": ">=12" @@ -12824,7 +12885,6 @@ "version": "8.0.0", "resolved": "https://registry.npmjs.org/pluralize/-/pluralize-8.0.0.tgz", "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", - "dev": true, "license": "MIT", "engines": { "node": ">=4" @@ -12850,9 +12910,9 @@ } }, "node_modules/prettier": { - "version": "3.8.3", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.3.tgz", - "integrity": "sha512-7igPTM53cGHMW8xWuVTydi2KO233VFiTNyF5hLJqpilHfmn8C8gPf+PS7dUT64YcXFbiMGZxS9pCSxL/Dxm/Jw==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", + "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", "dev": true, "license": "MIT", "bin": { @@ -12895,13 +12955,13 @@ } }, "node_modules/proc-log": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", - "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-7.0.0.tgz", + "integrity": "sha512-FYgfaA69XZ93zaXLoMNQ+ViDXGGBgR8aLh03txzcFhV+9xOXx7+8DLCULrKKpR9+GsH9ZfHm82aSUPpozX0Ztg==", "dev": true, "license": "ISC", "engines": { - "node": "^20.17.0 || >=22.9.0" + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" } }, "node_modules/process": { @@ -12973,9 +13033,9 @@ } }, "node_modules/public-encrypt/node_modules/bn.js": { - "version": "4.12.3", - "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.3.tgz", - "integrity": "sha512-fGTi3gxV/23FTYdAoUtLYp6qySe2KE3teyZitipKNRuVYcBkoP/bB3guXN/XVKUe9mxCHXnc9C4ocyz8OmgN0g==", + "version": "4.12.5", + "resolved": "https://registry.npmjs.org/bn.js/-/bn.js-4.12.5.tgz", + "integrity": "sha512-3aRg6/JxfffFD+OlOjOFR3Vo79l39ooBTFucxx+MT3dhCtzn3EmiUPQo+6/OZuI2jbXi3YKgmiTFBgChQMwIRQ==", "dev": true, "license": "MIT" }, @@ -13123,16 +13183,22 @@ } }, "node_modules/re2": { - "version": "1.23.3", - "resolved": "https://registry.npmjs.org/re2/-/re2-1.23.3.tgz", - "integrity": "sha512-5jh686rmj/8dYpBo72XYgwzgG8Y9HNDATYZ1x01gqZ6FvXVUP33VZ0+6GLCeavaNywz3OkXBU8iNX7LjiuisPg==", + "version": "1.25.2", + "resolved": "https://registry.npmjs.org/re2/-/re2-1.25.2.tgz", + "integrity": "sha512-t75KS05wrPM0S7IRbM0l/WUYlHftJj3WAzQJAcSH8CrDP/jFYicZbMYTKohJ8w/3kFGwkY/G8/dGtC6CdShDlw==", "dev": true, "hasInstallScript": true, "license": "BSD-3-Clause", "dependencies": { - "install-artifact-from-github": "^1.4.0", - "nan": "^2.25.0", - "node-gyp": "^12.2.0" + "install-artifact-from-github": "^1.6.0", + "nan": "^2.27.0", + "node-gyp": "^13.0.0" + }, + "engines": { + "node": "^22.22.2 || ^24.15.0 || >=26.0.0" + }, + "funding": { + "url": "https://github.com/sponsors/uhop" } }, "node_modules/reachable-url": { @@ -13200,9 +13266,9 @@ "license": "MIT" }, "node_modules/read-package-json/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -13305,7 +13371,6 @@ "version": "0.12.1", "resolved": "https://registry.npmjs.org/refa/-/refa-0.12.1.tgz", "integrity": "sha512-J8rn6v4DBb2nnFqkqwy6/NnTYMcgLA+sLr0iIO41qpv0n+ngb7ksag2tMRl0inb1bbO/esUwzW1vbJi7K0sI0g==", - "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.8.0" @@ -13345,7 +13410,6 @@ "version": "0.7.1", "resolved": "https://registry.npmjs.org/regexp-ast-analysis/-/regexp-ast-analysis-0.7.1.tgz", "integrity": "sha512-sZuz1dYW/ZsfG17WSAG7eS85r5a0dDsvg+7BiiYR5o6lKCAtUrEwdmRmaGF6rwVj3LcmAeYkOWKEPlbPzN3Y3A==", - "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.8.0", @@ -13359,7 +13423,6 @@ "version": "0.1.27", "resolved": "https://registry.npmjs.org/regexp-tree/-/regexp-tree-0.1.27.tgz", "integrity": "sha512-iETxpjK6YoRWJG5o6hXLwvjYAoW+FEZn9os0PD/b6AP6xQwsa/Y7lCVgIixBbUPMfhu+i2LtdeAqVTgGlQarfA==", - "dev": true, "license": "MIT", "bin": { "regexp-tree": "bin/regexp-tree" @@ -13391,10 +13454,9 @@ "license": "MIT" }, "node_modules/regjsparser": { - "version": "0.13.1", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.1.tgz", - "integrity": "sha512-dLsljMd9sqwRkby8zhO1gSg3PnJIBFid8f4CQj/sXx+7cKx+E7u0PKhZ+U4wmhx7EfmtvnA318oVaIkAB1lRJw==", - "dev": true, + "version": "0.13.2", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.13.2.tgz", + "integrity": "sha512-NgRBy2Nx/bE+9F27nVHnqcN5HjyLmecqsqx2PJHu3/IEtADD4WuxuXIVExD5PoSDFVrl78dOonfcOe5O+5nbzQ==", "license": "BSD-2-Clause", "dependencies": { "jsesc": "~3.1.0" @@ -13437,7 +13499,6 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/reserved-identifiers/-/reserved-identifiers-1.2.0.tgz", "integrity": "sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==", - "dev": true, "license": "MIT", "engines": { "node": ">=18" @@ -13512,7 +13573,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==", - "dev": true, "license": "MIT", "funding": { "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" @@ -13756,7 +13816,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/scslre/-/scslre-0.3.0.tgz", "integrity": "sha512-3A6sD0WYP7+QrjbfNA2FN3FsOaGGFoekCVgTyypy53gPxhbkCIjtO6YWgdrfM+n/8sI8JeXZOIxsHjMTNxQ4nQ==", - "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.8.0", @@ -13782,10 +13841,9 @@ } }, "node_modules/semver": { - "version": "7.8.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.1.tgz", - "integrity": "sha512-rkVq3IXh+4FDGch+KwzX3aV9W3kO54GyEgpvBzSyctDA6Xtd7RJQV1xmXbeQp5v7+VzLOfVqiutSE6GICgPFvg==", - "dev": true, + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -14065,15 +14123,15 @@ } }, "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" }, @@ -14239,9 +14297,9 @@ } }, "node_modules/smol-toml": { - "version": "1.6.1", - "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.6.1.tgz", - "integrity": "sha512-dWUG8F5sIIARXih1DTaQAX4SsiTXhInKf1buxdY9DIg4ZYPZK5nGM1VRIYmEbDbsHt7USo99xSLFu5Q1IqTmsg==", + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/smol-toml/-/smol-toml-1.7.0.tgz", + "integrity": "sha512-aqVvWoyO21L23mb+drl4RmMXbf6N7FdHjAhTRA9ZBL7apWBgfWC16KjrASI+1p9GAroljyMHj6fK67i0UiTNvQ==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -14297,7 +14355,6 @@ "version": "2.5.0", "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", - "dev": true, "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { @@ -14315,7 +14372,6 @@ "version": "3.0.23", "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==", - "dev": true, "license": "CC0-1.0" }, "node_modules/sprintf-js": { @@ -14595,7 +14651,6 @@ "version": "2.3.3", "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==", - "dev": true, "license": "MIT", "engines": { "node": ">=6" @@ -14606,9 +14661,9 @@ } }, "node_modules/tar": { - "version": "7.5.16", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.16.tgz", - "integrity": "sha512-56adEpPMouktRlBLXiaYFFzZ/3+JXa8P9n7WbR+ibIjtviN55mEaOkiysCnPnWm+7kkui1Dn8J9l+g6zV8731w==", + "version": "7.5.19", + "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.19.tgz", + "integrity": "sha512-4LeEWl96twnS2Q7Bz4MGqgazLqO+hJN63GZxXoIqh1T3VweYD997gbU1ItNsQafqqXTXd5WFyFdReLtwvRBNiw==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -14623,9 +14678,9 @@ } }, "node_modules/terser": { - "version": "5.48.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz", - "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", + "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -14641,124 +14696,6 @@ "node": ">=10" } }, - "node_modules/terser-webpack-plugin": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.6.1.tgz", - "integrity": "sha512-201R5j+sJpK8nFWwKVyNfZot8FaJbLZDq5evriVzbV1wDtSXDjRUDRfJzHpAaxFDMEhsZL1QkeqM61wgsS3KaQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/trace-mapping": "^0.3.25", - "jest-worker": "^27.4.5", - "schema-utils": "^4.3.0", - "terser": "^5.31.1" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - }, - "peerDependencies": { - "webpack": "^5.1.0" - }, - "peerDependenciesMeta": { - "@minify-html/node": { - "optional": true - }, - "@swc/core": { - "optional": true - }, - "@swc/css": { - "optional": true - }, - "@swc/html": { - "optional": true - }, - "clean-css": { - "optional": true - }, - "cssnano": { - "optional": true - }, - "csso": { - "optional": true - }, - "esbuild": { - "optional": true - }, - "html-minifier-terser": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "postcss": { - "optional": true - }, - "uglify-js": { - "optional": true - } - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv": { - "version": "8.20.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", - "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3", - "fast-uri": "^3.0.1", - "json-schema-traverse": "^1.0.0", - "require-from-string": "^2.0.2" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/epoberezkin" - } - }, - "node_modules/terser-webpack-plugin/node_modules/ajv-keywords": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", - "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", - "dev": true, - "license": "MIT", - "dependencies": { - "fast-deep-equal": "^3.1.3" - }, - "peerDependencies": { - "ajv": "^8.8.2" - } - }, - "node_modules/terser-webpack-plugin/node_modules/json-schema-traverse": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true, - "license": "MIT" - }, - "node_modules/terser-webpack-plugin/node_modules/schema-utils": { - "version": "4.3.3", - "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.3.3.tgz", - "integrity": "sha512-eflK8wEtyOE6+hsaRVPxvUKYCpRgzLqDTb8krvAsRIwOGlHoSgYLgBXoubGgLd2fT41/OUYdb48v4k4WWHQurA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/json-schema": "^7.0.9", - "ajv": "^8.9.0", - "ajv-formats": "^2.1.1", - "ajv-keywords": "^5.1.0" - }, - "engines": { - "node": ">= 10.13.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", @@ -14897,22 +14834,22 @@ } }, "node_modules/tldts": { - "version": "7.0.32", - "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.0.32.tgz", - "integrity": "sha512-5eDV0tK2NhLAAqBeXDAQ36+EwuStd1HbsSOnGsp+JbExITnExcALLL5M1kTH8gjDYN5QvwmUWimE3GoMZ2A7xQ==", + "version": "7.4.8", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.8.tgz", + "integrity": "sha512-htwgN/8KRB3z3vnC0BOETVh2m499g5GmyTK9Wq5JBLX3FNz6tSBveAd+fQhzy9hkjif8vy2jwDMR1sGhLtZl2A==", "dev": true, "license": "MIT", "dependencies": { - "tldts-core": "^7.0.32" + "tldts-core": "^7.4.8" }, "bin": { "tldts": "bin/cli.js" } }, "node_modules/tldts-core": { - "version": "7.4.2", - "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.2.tgz", - "integrity": "sha512-nwEyF4vl4RSJjwSjBUmOSxc3BFPoIFdlRthJ6e+5v9P3bHNsoD06UjuqMUspqp7vsEZ1beaHi1km+optiE17yA==", + "version": "7.4.8", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.8.tgz", + "integrity": "sha512-c1P7u0EhACHj7lPy4MJm8iTFEU8+nB0LCtddH0fhP7noaVoXAqafMtOOeX+ulpuPBqnrRgRhw494RICT3mbhnw==", "dev": true, "license": "MIT" }, @@ -14958,7 +14895,6 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-valid-identifier/-/to-valid-identifier-1.0.0.tgz", "integrity": "sha512-41wJyvKep3yT2tyPqX/4blcfybknGB4D+oETKLs7Q76UiPqRpUJK3hr1nxelyYO0PHKVzJwlu0aCeEAsGI6rpw==", - "dev": true, "license": "MIT", "dependencies": { "@sindresorhus/base62": "^1.0.0", @@ -15053,7 +14989,6 @@ "version": "1.0.7", "resolved": "https://registry.npmjs.org/ts-declaration-location/-/ts-declaration-location-1.0.7.tgz", "integrity": "sha512-EDyGAwH1gO0Ausm9gV6T2nUvBgXT5kGoCMJPllOaooZ+4VvJiKBdZE7wK18N1deEowhcUptS+5GXZK8U/fvpwA==", - "dev": true, "funding": [ { "type": "ko-fi", @@ -15157,7 +15092,6 @@ "version": "6.0.3", "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", - "dev": true, "license": "Apache-2.0", "bin": { "tsc": "bin/tsc", @@ -15168,16 +15102,16 @@ } }, "node_modules/uc.micro": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-1.0.6.tgz", - "integrity": "sha512-8Y75pvTYkLJW2hWQHXxoqRgV7qb9B+9vFEtidML+7koHUFapnVJAZ6cKs+Qjz5Aw3aZWHMC6u0wJE3At+nSGwA==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", + "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", "dev": true, "license": "MIT" }, "node_modules/unbash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unbash/-/unbash-3.0.0.tgz", - "integrity": "sha512-FeFPZ/WFT0mbRCuydiZzpPFlrYN8ZUpphQKoq4EeElVIYjYyGzPMxQR/simUwCOJIyVhpFk4RbtyO7RuMpMnHA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/unbash/-/unbash-4.0.2.tgz", + "integrity": "sha512-8gwNZ29+0/3zmXw7ToIHZtg6wK37xnniRUdBt7B27xZxaxfgR5tGMaGHT0t0dLtBV9fXE7zurh0s6Z1DHVjfWg==", "dev": true, "license": "ISC", "engines": { @@ -15191,13 +15125,13 @@ "dev": true }, "node_modules/undici": { - "version": "6.26.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.26.0.tgz", - "integrity": "sha512-4yqz8a3n5HmGTlsbADNtr/dJlhkh/55Rq798G6ibiULcXbDtaLpTl1pvdqcbFfeoj3iSi52lePFM7h9H21cw/A==", + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", "dev": true, "license": "MIT", "engines": { - "node": ">=18.17" + "node": ">=20.18.1" } }, "node_modules/undici-types": { @@ -15308,7 +15242,6 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", "integrity": "sha512-Js0m9cx+qOgDxo0eMiFGEueWztz+d4+M3rGlmKPT+T4IS/jP4ylw3Nwpu6cpTTP8R1MAC1kF4VbdLt3ARf209w==", - "dev": true, "funding": [ { "type": "opencollective", @@ -15485,13 +15418,13 @@ } }, "node_modules/video-extensions": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/video-extensions/-/video-extensions-1.2.0.tgz", - "integrity": "sha512-TriMl18BHEsh2KuuSA065tbu4SNAC9fge7k8uKoTTofTq89+Xsg4K1BGbmSVETwUZhqSjd9KwRCNwXAW/buXMg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/video-extensions/-/video-extensions-2.0.0.tgz", + "integrity": "sha512-qSXHIVmAVVKYk16x4keCwSqFuvF3D0K9KFuywWxd6ulpDfBHZ5QkGccMbT789IwSX9ykC88dL5kYGK3DZ59/ng==", "dev": true, "license": "MIT", "engines": { - "node": ">=0.10.0" + "node": ">=18.20" }, "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -15528,13 +15461,12 @@ } }, "node_modules/watchpack": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.1.tgz", - "integrity": "sha512-Zn5uXdcFNIA1+1Ei5McRd+iRzfhENPCe7LeABkJtNulSxjma+l7ltNx55BWZkRlwRnpOgHqxnjyaDgJnNXnqzg==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.5.2.tgz", + "integrity": "sha512-6i/00NBjP4yGPs+caKSyRfpTF/8Torsu0MOW3mMzIbhgISFder8i7xbqgHlLMwJrdiN8ndBV3UA1/AfzPSr+jg==", "dev": true, "license": "MIT", "dependencies": { - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.1.2" }, "engines": { @@ -15552,9 +15484,9 @@ } }, "node_modules/webpack": { - "version": "5.107.2", - "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.107.2.tgz", - "integrity": "sha512-v7RhXaJbpMlV0D7hC7lb2EbnxkoeUqf9qhKr6lozx3Q48pmFrqqNRmZFUEGmi7pSwm6fCQ2H1IjvCkHqdpVdjQ==", + "version": "5.108.4", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.108.4.tgz", + "integrity": "sha512-yur8LyJoeiWh47dErD+Ok7vlbmDsJ3UbbRPAoxbGJ54WpE2y5yVo5G/inUzujnYgw3tPmBRdn+G7PoxXaYC33w==", "dev": true, "license": "MIT", "dependencies": { @@ -15567,19 +15499,18 @@ "acorn-import-phases": "^1.0.3", "browserslist": "^4.28.1", "chrome-trace-event": "^1.0.2", - "enhanced-resolve": "^5.22.0", + "enhanced-resolve": "^5.22.2", "es-module-lexer": "^2.1.0", "eslint-scope": "5.1.1", "events": "^3.2.0", - "glob-to-regexp": "^0.4.1", "graceful-fs": "^4.2.11", "loader-runner": "^4.3.2", "mime-db": "^1.54.0", + "minimizer-webpack-plugin": "^5.6.1", "neo-async": "^2.6.2", "schema-utils": "^4.3.3", "tapable": "^2.3.0", - "terser-webpack-plugin": "^5.5.0", - "watchpack": "^2.5.1", + "watchpack": "^2.5.2", "webpack-sources": "^3.5.0" }, "bin": { @@ -15679,9 +15610,9 @@ } }, "node_modules/webpack-sources": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.0.tgz", - "integrity": "sha512-HPuy+uuoTCaaoEoI1LQ3JN9+vrPBvEesnnX1jADHy728cHSMlq4wUc4afYqahq2B1mhQVZxCXOkNTnXltr+2vQ==", + "version": "3.5.1", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.5.1.tgz", + "integrity": "sha512-jyuiGJdtvY434z5bUZrjz67v76/ePNvFZTp9Mdz29IlH4+GPsgyGjiv0fKI+M7BdkU6ADjulUcKAd3tUK3WlEw==", "dev": true, "license": "MIT", "engines": { @@ -15794,27 +15725,28 @@ } }, "node_modules/whatwg-mimetype": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", + "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", "dev": true, "license": "MIT", "engines": { - "node": ">=18" + "node": ">=20" } }, "node_modules/whatwg-url": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-15.1.0.tgz", - "integrity": "sha512-2ytDk0kiEj/yu90JOAp44PVPUkO9+jVhyf+SybKlRHSDlvOOZhdPIrr7xTH64l4WixO2cP+wQIcgujkGBPPz6g==", + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.1.tgz", + "integrity": "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==", "dev": true, "license": "MIT", "dependencies": { + "@exodus/bytes": "^1.11.0", "tr46": "^6.0.0", - "webidl-conversions": "^8.0.0" + "webidl-conversions": "^8.0.1" }, "engines": { - "node": ">=20" + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, "node_modules/which": { @@ -15833,9 +15765,9 @@ } }, "node_modules/which-typed-array": { - "version": "1.1.21", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.21.tgz", - "integrity": "sha512-zbRA8cVm6io/d5W8uIe2hblzN76/Wm3v/yiythQvr+dpBWeqhPSWIDNj4zOyHi4zKbMK6DN34Xsr9jPHJERAEw==", + "version": "1.1.22", + "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.22.tgz", + "integrity": "sha512-fvO4ExWMFsqyhG3AiPAObMuY1lxaqgYcxbc49CNdWDDECOJNgQyvsOWVwbZc+qf3rzRtxojBK+CMEv0Ld5CYpw==", "dev": true, "license": "MIT", "dependencies": { @@ -15855,9 +15787,9 @@ } }, "node_modules/whoops": { - "version": "5.0.7", - "resolved": "https://registry.npmjs.org/whoops/-/whoops-5.0.7.tgz", - "integrity": "sha512-itH58b0AcYhIC6oD356DrLFtC7WEyMhjYFqld1jnaCJ2peZt7J7XRlOc4AkMR9DlRivhaiqbiERTAZZBJCKD9g==", + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/whoops/-/whoops-5.1.2.tgz", + "integrity": "sha512-l2qT80rI+7qi7yJbURi4KHTTqBdxJS3SiXgJvbUxpQed7e28Gkv2I3GkjNAHaRjCzXhHINWUUds3fX8VAGg72g==", "dev": true, "license": "MIT", "engines": { @@ -15985,28 +15917,6 @@ "dev": true, "license": "ISC" }, - "node_modules/ws": { - "version": "8.21.0", - "resolved": "https://registry.npmjs.org/ws/-/ws-8.21.0.tgz", - "integrity": "sha512-Vsp28b7DRcimFQvrqu2Wek3z1iYxDCWqHYB8Qsnk/S4RfaCQzPGPyBNuVjJV3cd6UiKtUtp6sNM77gWvzcCH+g==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10.0.0" - }, - "peerDependencies": { - "bufferutil": "^4.0.1", - "utf-8-validate": ">=5.0.2" - }, - "peerDependenciesMeta": { - "bufferutil": { - "optional": true - }, - "utf-8-validate": { - "optional": true - } - } - }, "node_modules/xml-name-validator": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", @@ -16101,9 +16011,9 @@ } }, "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "version": "17.7.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", + "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", "dev": true, "license": "MIT", "dependencies": { @@ -16335,7 +16245,6 @@ }, "packages/eslint-config-eslint": { "version": "14.0.0", - "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-plugin-eslint-comments": "^4.7.1", @@ -16346,7 +16255,7 @@ "eslint-plugin-unicorn": "^63.0.0" }, "devDependencies": { - "@arethetypeswrong/cli": "^0.18.0", + "@arethetypeswrong/cli": "^0.18.3", "eslint": "^10.0.0", "typescript": "^6.0.3" }, @@ -16364,6 +16273,25 @@ "optional": true } } + }, + "packages/js": { + "name": "@eslint/js", + "version": "10.0.1", + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24" + }, + "funding": { + "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "eslint": "^10.0.0" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } + } } } } diff --git a/pkgs/by-name/es/eslint/package.nix b/pkgs/by-name/es/eslint/package.nix index 0d936293e4d5..896d81433911 100644 --- a/pkgs/by-name/es/eslint/package.nix +++ b/pkgs/by-name/es/eslint/package.nix @@ -3,33 +3,36 @@ buildNpmPackage, fetchFromGitHub, nix-update-script, + # webpack, }: buildNpmPackage (finalAttrs: { pname = "eslint"; - version = "10.4.1"; + version = "10.7.0"; src = fetchFromGitHub { owner = "eslint"; repo = "eslint"; tag = "v${finalAttrs.version}"; - hash = "sha256-/gNNO8r2QmvfVS28aF3hsWqCz157pInDVlPxy+xq0hA="; + hash = "sha256-DrmrPuFbEZzyfwFdJr/nAMq1xCugbyfJpJqN/qxsNCs="; }; # NOTE: Generating lock-file - # arch = [ x64 arm64 ] - # platform = [ darwin linux] - # npm install --package-lock-only --arch= --platform= - # darwin seems to generate a cross platform compatible lockfile + # npm install --package-lock-only postPatch = '' cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-OJ/xO2zJk0N4SmKYXCjiqcBc8B+wJKTKDE52ag6ODeo="; + npmDepsHash = "sha256-9VeeXBpQMww3Xb+tum+8julwek86k6S5Afqx9E2Ta14="; npmInstallFlags = [ "--omit=dev" ]; dontNpmBuild = true; dontNpmPrune = true; + # Delete dangling symlinks + preFixup = '' + rm $out/lib/node_modules/eslint/node_modules/{eslint-config-eslint,@eslint/js} + ''; + passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; diff --git a/pkgs/applications/audio/espeak/gcc6.patch b/pkgs/by-name/es/espeak-classic/gcc6.patch similarity index 100% rename from pkgs/applications/audio/espeak/gcc6.patch rename to pkgs/by-name/es/espeak-classic/gcc6.patch diff --git a/pkgs/applications/audio/espeak/default.nix b/pkgs/by-name/es/espeak-classic/package.nix similarity index 95% rename from pkgs/applications/audio/espeak/default.nix rename to pkgs/by-name/es/espeak-classic/package.nix index b2d68e2c24bf..ac183190ae49 100644 --- a/pkgs/applications/audio/espeak/default.nix +++ b/pkgs/by-name/es/espeak-classic/package.nix @@ -31,8 +31,10 @@ stdenv.mkDerivation (finalAttrs: { ''); configurePhase = '' + runHook preConfigure cd src makeFlags="PREFIX=$out DATADIR=$out/share/espeak-data" + runHook postConfigure ''; meta = { diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch b/pkgs/by-name/es/espeakedit/espeakedit-configurable-path-espeak-data.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-configurable-path-espeak-data.patch rename to pkgs/by-name/es/espeakedit/espeakedit-configurable-path-espeak-data.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch b/pkgs/by-name/es/espeakedit/espeakedit-configurable-sox-path.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-configurable-sox-path.patch rename to pkgs/by-name/es/espeakedit/espeakedit-configurable-sox-path.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch b/pkgs/by-name/es/espeakedit/espeakedit-fix-makefile.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-fix-makefile.patch rename to pkgs/by-name/es/espeakedit/espeakedit-fix-makefile.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-gcc6.patch b/pkgs/by-name/es/espeakedit/espeakedit-gcc6.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-gcc6.patch rename to pkgs/by-name/es/espeakedit/espeakedit-gcc6.patch diff --git a/pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch b/pkgs/by-name/es/espeakedit/espeakedit-wxgtk30.patch similarity index 100% rename from pkgs/applications/audio/espeak/espeakedit-wxgtk30.patch rename to pkgs/by-name/es/espeakedit/espeakedit-wxgtk30.patch diff --git a/pkgs/by-name/es/espeakedit/gcc6.patch b/pkgs/by-name/es/espeakedit/gcc6.patch new file mode 100644 index 000000000000..58036ecbe509 --- /dev/null +++ b/pkgs/by-name/es/espeakedit/gcc6.patch @@ -0,0 +1,13 @@ +diff --git c/src/tr_languages.cpp i/src/tr_languages.cpp +index ec210a5..9503f47 100755 +--- c/src/tr_languages.cpp ++++ i/src/tr_languages.cpp +@@ -198,7 +198,7 @@ static const unsigned short chars_ignore_zwnj_hyphen[] = { + 0x200d, 1, // zero width joiner + 0, 0 }; + +-const char string_ordinal[] = {0xc2,0xba,0}; // masculine ordinal character, UTF-8 ++const char string_ordinal[] = {char(0xc2),char(0xba),0}; // masculine ordinal character, UTF-8 + + + static Translator* NewTranslator(void) diff --git a/pkgs/applications/audio/espeak/edit.nix b/pkgs/by-name/es/espeakedit/package.nix similarity index 92% rename from pkgs/applications/audio/espeak/edit.nix rename to pkgs/by-name/es/espeakedit/package.nix index 13d31d066065..a0bc6e1d3b65 100644 --- a/pkgs/applications/audio/espeak/edit.nix +++ b/pkgs/by-name/es/espeakedit/package.nix @@ -61,12 +61,15 @@ stdenv.mkDerivation (finalAttrs: { ''; buildPhase = '' + runHook preBuild make -C src + runHook postBuild ''; installPhase = '' - mkdir -p "$out/bin" - cp src/espeakedit "$out/bin" + runHook preInstall + install -D src/espeakedit -t $out/bin + runHook postInstall ''; meta = { diff --git a/pkgs/by-name/es/espflash/package.nix b/pkgs/by-name/es/espflash/package.nix index 3f2830fae857..2c378e9a6670 100644 --- a/pkgs/by-name/es/espflash/package.nix +++ b/pkgs/by-name/es/espflash/package.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "espflash"; - version = "4.4.0"; + version = "4.5.0"; src = fetchFromGitHub { owner = "esp-rs"; repo = "espflash"; tag = "v${finalAttrs.version}"; - hash = "sha256-SXXFXwr+oO+BbBQ/BZgCKhbdcaybVr1JY66q+xM2Quc="; + hash = "sha256-o+MbUXZZycskltIH2NBGg2TnxOZ4viyc3D16quR2jqQ="; }; nativeBuildInputs = [ @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; - cargoHash = "sha256-ZAp9hEzDrzjYSJLKeMCjAoiybOqPdDLqIGOvBTCr5uU="; + cargoHash = "sha256-QvJsmjMTx+oVqP3TkbN4A1PLAxmy8jwX/dZZkwdrkf8="; cargoBuildFlags = [ "--exclude=xtask" diff --git a/pkgs/by-name/es/esphome/dashboard.nix b/pkgs/by-name/es/esphome/dashboard.nix index 180acf1ef55c..0359539d239a 100644 --- a/pkgs/by-name/es/esphome/dashboard.nix +++ b/pkgs/by-name/es/esphome/dashboard.nix @@ -54,7 +54,7 @@ buildPythonPackage (finalAttrs: { meta = { description = "ESPHome dashboard"; homepage = "https://esphome.io/"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ hexa ]; }; }) diff --git a/pkgs/by-name/es/esphome/package.nix b/pkgs/by-name/es/esphome/package.nix index da3e2f90d51c..69f1b4480ae4 100644 --- a/pkgs/by-name/es/esphome/package.nix +++ b/pkgs/by-name/es/esphome/package.nix @@ -9,6 +9,7 @@ esptool, git, versionCheckHook, + addBinToPathHook, nixosTests, }: @@ -18,29 +19,20 @@ let packageOverrides = self: super: { esphome-dashboard = self.callPackage ./dashboard.nix { }; - paho-mqtt = super.paho-mqtt.overridePythonAttrs (oldAttrs: rec { - version = "1.6.1"; - src = fetchFromGitHub { - inherit (oldAttrs.src) owner repo; - tag = "v${version}"; - hash = "sha256-9nH6xROVpmI+iTKXfwv2Ar1PAmWbEunI3HO0pZyK6Rg="; - }; - build-system = with self; [ setuptools ]; - doCheck = false; - }); + paho-mqtt = self.paho-mqtt_1; }; }; in python.pkgs.buildPythonApplication (finalAttrs: { pname = "esphome"; - version = "2026.5.3"; + version = "2026.6.5"; pyproject = true; src = fetchFromGitHub { owner = "esphome"; repo = "esphome"; tag = finalAttrs.version; - hash = "sha256-laz+XNszkayfmEyrtFr3BHUWVV9eFhj130o4l99XElY="; + hash = "sha256-4sbc/X86OWN/Bx2sPk3H2lgzGxdQNS6bIspNLAVqHz8="; }; patches = [ @@ -94,8 +86,8 @@ python.pkgs.buildPythonApplication (finalAttrs: { jinja2 paho-mqtt pillow - platformio puremagic + py7zr pyparsing pyserial pyyaml @@ -146,16 +138,17 @@ python.pkgs.buildPythonApplication (finalAttrs: { ++ [ git versionCheckHook + addBinToPathHook ]; disabledTestPaths = [ # platformio builds; requires networking for dependency resolution "tests/integration" - ]; - preCheck = '' - export PATH=$PATH:$out/bin - ''; + # tries to dynamically patch platformio module + "tests/unit_tests/test_writer.py" + "tests/unit_tests/test_espidf_component.py" + ]; postInstall = let @@ -168,8 +161,6 @@ python.pkgs.buildPythonApplication (finalAttrs: { --fish <(${argcomplete} --shell fish esphome) ''; - doInstallCheck = true; - disabledTests = [ # tries to import platformio, which is wrapped in an fhsenv "test_clean_build" @@ -211,6 +202,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { picnoir thanegill karlbeecken + tmarkus ]; mainProgram = "esphome"; }; diff --git a/pkgs/by-name/es/esptool/package.nix b/pkgs/by-name/es/esptool/package.nix index 6480217bb0a1..a431be78c64f 100644 --- a/pkgs/by-name/es/esptool/package.nix +++ b/pkgs/by-name/es/esptool/package.nix @@ -1,21 +1,22 @@ { lib, + addBinToPathHook, fetchFromGitHub, python3Packages, softhsm, installShellFiles, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "esptool"; - version = "5.3.0"; + version = "5.3.1"; pyproject = true; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; - tag = "v${version}"; - hash = "sha256-NRfXLf8u35/9RD1QxEuV06K3h030qXj5GM+QjvLC6FM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-oHQ6rkMnzvjtP/dg+tyc7Dw+D/WuWDqRwqePKBBnjCw="; }; postPatch = '' @@ -77,16 +78,13 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ + addBinToPathHook pyelftools pytestCheckHook requests softhsm ] - ++ lib.concatAttrValues optional-dependencies; - - preCheck = '' - export PATH="$out/bin:$PATH" - ''; + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies; pytestFlags = [ "-m" @@ -102,16 +100,14 @@ python3Packages.buildPythonApplication rec { "test_esp_rfc2217_server_py" ]; - postCheck = '' + preCheck = '' export SOFTHSM2_CONF=$(mktemp) echo "directories.tokendir = $(mktemp -d)" > "$SOFTHSM2_CONF" ./ci/setup_softhsm2.sh - - pytest test/test_espsecure_hsm.py ''; meta = { - changelog = "https://github.com/espressif/esptool/blob/${src.tag}/CHANGELOG.md"; + changelog = "https://github.com/espressif/esptool/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "ESP8266 and ESP32 serial bootloader utility"; homepage = "https://github.com/espressif/esptool"; license = lib.licenses.gpl2Plus; @@ -121,4 +117,4 @@ python3Packages.buildPythonApplication rec { platforms = with lib.platforms; linux ++ darwin; mainProgram = "esptool"; }; -} +}) diff --git a/pkgs/by-name/es/esshader/package.nix b/pkgs/by-name/es/esshader/package.nix index 731a0889482f..e155aa590528 100644 --- a/pkgs/by-name/es/esshader/package.nix +++ b/pkgs/by-name/es/esshader/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { version = "0-unstable-2020-08-09"; src = fetchFromGitHub { - owner = "cmcsun"; + owner = "chrismcfee"; repo = "esshader"; rev = "506eb02f3de52d3d1f4d81ac9ee145655216dee5"; sha256 = "sha256-euxJw7CqOwi6Ndzalps37kDr5oOIL3tZICCfmxsujfk="; @@ -40,7 +40,7 @@ stdenv.mkDerivation { meta = { description = "Offline ShaderToy-compatible GLSL shader viewer using OpenGL ES 2.0"; - homepage = "https://github.com/cmcsun/esshader"; + homepage = "https://github.com/chrismcfee/esshader"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ astro ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/et/et-book/package.nix b/pkgs/by-name/et/et-book/package.nix index a25b27d5c6a9..673a7704837d 100644 --- a/pkgs/by-name/et/et-book/package.nix +++ b/pkgs/by-name/et/et-book/package.nix @@ -2,12 +2,21 @@ lib, stdenvNoCC, fetchFromGitHub, + installFonts, }: stdenvNoCC.mkDerivation { pname = "et-book"; version = "0-unstable-2015-10-05"; + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "edwardtufte"; repo = "et-book"; @@ -15,14 +24,7 @@ stdenvNoCC.mkDerivation { hash = "sha256-B6ryC9ibNop08TJC/w9LSHHwqV/81EezXsTUJFq8xpo="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp -t $out/share/fonts/truetype source/4-ttf/*.ttf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Typeface used in Edward Tufte’s books"; diff --git a/pkgs/by-name/et/etcd_3_4/package.nix b/pkgs/by-name/et/etcd_3_4/package.nix deleted file mode 100644 index 887610e273bd..000000000000 --- a/pkgs/by-name/et/etcd_3_4/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - nixosTests, -}: - -buildGoModule (finalAttrs: { - pname = "etcd"; - version = "3.4.45"; - - src = fetchFromGitHub { - owner = "etcd-io"; - repo = "etcd"; - tag = "v${finalAttrs.version}"; - hash = "sha256-GvhejN7+woYK7UBNguzEaO6rqAbT7Vbwl5nFmI/F6Sc="; - }; - - proxyVendor = true; - vendorHash = "sha256-0xIK71sAwMzzSaN2lFKKdGtDKWYtL25x5GDoO6bO0wI="; - - preBuild = '' - go mod tidy - ''; - - buildPhase = '' - runHook preBuild - patchShebangs . - ./build - ./functional/build - runHook postBuild - ''; - - doCheck = false; - - postInstall = '' - install -Dm755 bin/* bin/functional/cmd/* -t $out/bin - ''; - - passthru.tests = nixosTests.etcd."3_4"; - - meta = { - description = "Distributed reliable key-value store for the most critical data of a distributed system"; - downloadPage = "https://github.com/etcd-io/etcd/"; - license = lib.licenses.asl20; - homepage = "https://etcd.io/"; - maintainers = with lib.maintainers; [ superherointj ]; - }; -}) diff --git a/pkgs/by-name/et/etcd_3_5/package.nix b/pkgs/by-name/et/etcd_3_5/package.nix index 376ebcf8a0c3..333a792212ae 100644 --- a/pkgs/by-name/et/etcd_3_5/package.nix +++ b/pkgs/by-name/et/etcd_3_5/package.nix @@ -7,11 +7,11 @@ }: let - version = "3.5.31"; - etcdSrcHash = "sha256-X3b1TBimNYo03fW0c5NeiD4uALMqtOQbJwPot11FCk8="; - etcdServerVendorHash = "sha256-1/XJGpyYuTsb+1hReksX5VyD+6xbKaiLA8520cDKc/4="; - etcdUtlVendorHash = "sha256-dUXAoIcOSlEbiSmy1M+oPaHt089gOttQwrB9ZhYc7v0="; - etcdCtlVendorHash = "sha256-l1j00Mzv1z021rfBbFZrIce2pifQyRkST0bkZhVoST0="; + version = "3.5.32"; + etcdSrcHash = "sha256-pqCMgY5veIF5kQDjqTg9B7aSL+V6bdMZpc464wjTLMo="; + etcdServerVendorHash = "sha256-FDzAF2J9wbRmQETvrdJK3gL4cfAhiiihb5EOrimE11M="; + etcdUtlVendorHash = "sha256-0xfq7f7Xr3SWxiU8C1bWQPxdFvEaoIrlK+gX3hkd4ho="; + etcdCtlVendorHash = "sha256-59e/TORi/XX+GXRjMO/45SMumYgrFbOHEXqV7sM72H8="; src = fetchFromGitHub { owner = "etcd-io"; @@ -28,10 +28,7 @@ let description = "Distributed reliable key-value store for the most critical data of a distributed system"; license = lib.licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with lib.maintainers; [ - dtomvan - superherointj - ]; + maintainers = with lib.maintainers; [ dtomvan ]; platforms = lib.platforms.darwin ++ lib.platforms.linux; }; diff --git a/pkgs/by-name/et/etcd_3_6/package.nix b/pkgs/by-name/et/etcd_3_6/package.nix index 47aa69616fa4..d8ab12fe73aa 100644 --- a/pkgs/by-name/et/etcd_3_6/package.nix +++ b/pkgs/by-name/et/etcd_3_6/package.nix @@ -9,11 +9,11 @@ }: let - version = "3.6.12"; - etcdSrcHash = "sha256-oUq/yRwSgJ2xZ6yoiEBYSSRH5NvHITXjMFuR7QZc4HU="; - etcdCtlVendorHash = "sha256-0ZlJiXFS7QxJ+dfstJf+ogLPL0kxrE/4ZTsKb0OOCqA="; - etcdUtlVendorHash = "sha256-o7TWg7RgeWZa92beumSGCpxvLcFMzqC1vgcKfi5K4dI="; - etcdServerVendorHash = "sha256-UzToh6FaAVyxzZdDoukrHez1W9+tifFGEM16UCcmm5U="; + version = "3.6.13"; + etcdSrcHash = "sha256-L6wnvexUxFlN4r2D9rIQPDIYWMvs6DqY8eWU1FToi3M="; + etcdCtlVendorHash = "sha256-UKuxCQi1RriPvX9cM+Nd1jXs/H0smwJJU9CEM/cI/sA="; + etcdUtlVendorHash = "sha256-molkWWxxKLCCbocqVaij1jcHeoYYHSuI/cAfieeZH+0="; + etcdServerVendorHash = "sha256-o58rJPOSeT14SAEjBSbXwPDuAsOT/YNAqZRCM15unJQ="; src = fetchFromGitHub { owner = "etcd-io"; @@ -31,10 +31,7 @@ let downloadPage = "https://github.com/etcd-io/etcd"; license = lib.licenses.asl20; homepage = "https://etcd.io/"; - maintainers = with lib.maintainers; [ - dtomvan - superherointj - ]; + maintainers = with lib.maintainers; [ dtomvan ]; platforms = lib.platforms.darwin ++ lib.platforms.linux; }; diff --git a/pkgs/by-name/et/ete-unwrapped/package.nix b/pkgs/by-name/et/ete-unwrapped/package.nix index 1b396ad00ce0..c8f8479f8b5d 100644 --- a/pkgs/by-name/et/ete-unwrapped/package.nix +++ b/pkgs/by-name/et/ete-unwrapped/package.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Improved Wolfenstein: Enemy Territory Engine"; homepage = "https://github.com/etfdevs/ETe"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ ashleyghooper drupol diff --git a/pkgs/by-name/et/ethercat/package.nix b/pkgs/by-name/et/ethercat/package.nix index b87dc7c2224e..4f9154e655aa 100644 --- a/pkgs/by-name/et/ethercat/package.nix +++ b/pkgs/by-name/et/ethercat/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "ethercat"; - version = "1.6.9"; + version = "1.6.10"; src = fetchFromGitLab { owner = "etherlab.org"; repo = "ethercat"; tag = finalAttrs.version; - hash = "sha256-Msx0i1SAwlSMD3+vjGRNe36Yx9qdUYokVekGytZptqk="; + hash = "sha256-ZlvlWSZz7oWMvl3XorS2lb4i33RRv8dBwOe2uLDeOjQ="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/et/etherpad-lite/package.nix b/pkgs/by-name/et/etherpad-lite/package.nix index b6736566c593..1a3478d04f87 100644 --- a/pkgs/by-name/et/etherpad-lite/package.nix +++ b/pkgs/by-name/et/etherpad-lite/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nix-update-script, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, makeWrapper, @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "ether"; - repo = "etherpad-lite"; + repo = "etherpad"; tag = "v${finalAttrs.version}"; hash = "sha256-8DCgbfp3ttpMTXS9SNkN1R63LZHaklsNHViRhmWVFuk="; }; @@ -30,14 +30,14 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-2nKpmGxC+KVg0oF0BsswS9L84QxzpRF7NvKyqyQ7WJM="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-scJhcZDyqUVdKv/EQvB5+EJN/SvMw220+QOcTUxTFJQ="; }; nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 makeWrapper ]; @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe nodejs} $out/bin/etherpad-lite \ --inherit-argv0 \ --add-flags "--require tsx/cjs $out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node/server.ts" \ - --suffix PATH : "${lib.makeBinPath [ pnpm_9 ]}" \ + --suffix PATH : "${lib.makeBinPath [ pnpm_10 ]}" \ --set NODE_PATH "$out/lib/node_modules:$out/lib/etherpad-lite/node_modules/ep_etherpad-lite/node_modules" \ --set-default NODE_ENV production find $out/lib -xtype l -delete @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { It provides full data export capabilities, and runs on your server, under your control. ''; homepage = "https://etherpad.org/"; - changelog = "https://github.com/ether/etherpad-lite/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/ether/etherpad/blob/${finalAttrs.src.rev}/CHANGELOG.md"; maintainers = with lib.maintainers; [ erdnaxe f2k1de diff --git a/pkgs/by-name/et/etlegacy-assets/package.nix b/pkgs/by-name/et/etlegacy-assets/package.nix index f4443287a060..d0259a237b2d 100644 --- a/pkgs/by-name/et/etlegacy-assets/package.nix +++ b/pkgs/by-name/et/etlegacy-assets/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy assets only"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ cc-by-nc-sa-30 ]; + license = lib.licenses.cc-by-nc-sa-30; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/et/etlegacy-unwrapped/package.nix b/pkgs/by-name/et/etlegacy-unwrapped/package.nix index 73b9e82e8e6e..25b878fa6369 100644 --- a/pkgs/by-name/et/etlegacy-unwrapped/package.nix +++ b/pkgs/by-name/et/etlegacy-unwrapped/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation { meta = { description = "ET: Legacy is an open source project based on the code of Wolfenstein: Enemy Territory which was released in 2010 under the terms of the GPLv3 license"; homepage = "https://etlegacy.com"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; longDescription = '' ET: Legacy, an open source project fully compatible client and server for the popular online FPS game Wolfenstein: Enemy Territory - whose diff --git a/pkgs/by-name/et/ets/package.nix b/pkgs/by-name/et/ets/package.nix index ac3f6fd7ea5a..598f6ac6468d 100644 --- a/pkgs/by-name/et/ets/package.nix +++ b/pkgs/by-name/et/ets/package.nix @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { description = "Command output timestamper"; homepage = "https://github.com/gdubicki/ets/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ cameronfyfe ]; + maintainers = [ ]; mainProgram = "ets"; }; }) diff --git a/pkgs/by-name/et/ettercap/package.nix b/pkgs/by-name/et/ettercap/package.nix index a34721462648..ab056633e881 100644 --- a/pkgs/by-name/et/ettercap/package.nix +++ b/pkgs/by-name/et/ettercap/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { analysis. ''; homepage = "https://www.ettercap-project.org/"; - changelog = "https://github.com/Ettercap/ettercap/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Ettercap/ettercap/blob/master/CHANGELOG"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ pSub ]; diff --git a/pkgs/by-name/eu/euphonica/package.nix b/pkgs/by-name/eu/euphonica/package.nix index 3e0534acfbd6..0c047a630348 100644 --- a/pkgs/by-name/eu/euphonica/package.nix +++ b/pkgs/by-name/eu/euphonica/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "euphonica"; - version = "0.99.4-beta"; + version = "0.99.5-beta"; src = fetchFromGitHub { owner = "htkhiem"; repo = "euphonica"; tag = "v${finalAttrs.version}"; - hash = "sha256-TDW3at2NXbdfUvHAZg7KK0HEqF8xDm0cIYfGuTSlYCQ="; + hash = "sha256-/U0ugG6refcMliHO1Eouk+yQyzXWh7Y/mzSTskU6/co="; fetchSubmodules = true; }; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-cXlfJ3MrW8n34KxE5uD+6dTqzaazmwgNQC3hHNPqzcE="; + hash = "sha256-eB5m2wa61k3m3uKzo7sgKxJZ3hZqvNqP8fs15e6tiZA="; }; mesonBuildType = "release"; diff --git a/pkgs/by-name/ev/evans/package.nix b/pkgs/by-name/ev/evans/package.nix index c7f8e974a554..5d66dfad7e8f 100644 --- a/pkgs/by-name/ev/evans/package.nix +++ b/pkgs/by-name/ev/evans/package.nix @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { description = "More expressive universal gRPC client"; mainProgram = "evans"; homepage = "https://evans.syfm.me/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ diogox ]; }; }) diff --git a/pkgs/by-name/ev/evcc/package.nix b/pkgs/by-name/ev/evcc/package.nix index 48da78ebcc5d..c6e7306038b8 100644 --- a/pkgs/by-name/ev/evcc/package.nix +++ b/pkgs/by-name/ev/evcc/package.nix @@ -17,16 +17,16 @@ }: let - version = "0.309.0"; + version = "0.312.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = "evcc"; tag = version; - hash = "sha256-Uyb83sBFNJLRU78Q60Mj3Q6j9Uvrv3unj0kkAdTXePc="; + hash = "sha256-gMEguCexIZlKayMVkY9w/C+dAem5mymzjaJs2qrmavk="; }; - vendorHash = "sha256-95yI/ObkLByzO+BBbACylaNcCrple8MpxY8dKLGqFDE="; + vendorHash = "sha256-x4iwvzf7iv6TyLEkTnqztDQrBD+3lT1yycB7yTD4xO4="; commonMeta = { license = lib.licenses.mit; @@ -40,7 +40,7 @@ buildGo126Module rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-ypBg2TQ3qbc8cIBfFqICbNSCsIdokOtaFOqFD9bnMQM="; + hash = "sha256-MhLc5RUjn8FYXiFQbGchRnf132QXwG0kSyyPsRRzu1A="; }; nativeBuildInputs = [ @@ -65,7 +65,6 @@ buildGo126Module rec { tags = [ "release" - "test" ]; ldflags = [ @@ -88,6 +87,10 @@ buildGo126Module rec { "TestOctopusConfigParse" "TestSessionHandlerTimezoneFilter" "TestTemplates" + # network access: mdns fails to start Avahi provider + "TestControlBoxGridGuardHeartbeat" + "TestEEBus" + "TestShipPairing" ]; in [ "-skip=^${lib.concatStringsSep "$|^" skippedTests}$" ]; diff --git a/pkgs/by-name/ev/evcxr/package.nix b/pkgs/by-name/ev/evcxr/package.nix index 7df91febe656..2c78a9670cbc 100644 --- a/pkgs/by-name/ev/evcxr/package.nix +++ b/pkgs/by-name/ev/evcxr/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.21.1"; src = fetchFromGitHub { - owner = "google"; + owner = "evcxr"; repo = "evcxr"; rev = "v${finalAttrs.version}"; sha256 = "sha256-8dV+NNtU4HFerrgRyc1kO+MSsMTJJItTtJylEIN014g="; @@ -91,7 +91,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Evaluation context for Rust"; - homepage = "https://github.com/google/evcxr"; + homepage = "https://github.com/evcxr/evcxr"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ protoben diff --git a/pkgs/by-name/ev/evdevremapkeys/package.nix b/pkgs/by-name/ev/evdevremapkeys/package.nix index 7986b373996b..e1c04f0c7c29 100644 --- a/pkgs/by-name/ev/evdevremapkeys/package.nix +++ b/pkgs/by-name/ev/evdevremapkeys/package.nix @@ -4,32 +4,35 @@ python3Packages, }: -python3Packages.buildPythonPackage { +python3Packages.buildPythonPackage (finalAttrs: { pname = "evdevremapkeys"; - version = "1.0.0"; + version = "1.0.3"; pyproject = true; src = fetchFromGitHub { owner = "philipl"; repo = "evdevremapkeys"; - rev = "9b6f372a9bdf8b27d39f7e655b74f6b9d1a8467f"; - sha256 = "sha256-FwRbo0RTiiV2AB7z6XOalMnwMbj15jM4Dxs41TsIOQI="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Gtml52tHNtg/3Fy+QO9eIh90nim0p0Fs+oEyqJvsZKs="; }; build-system = with python3Packages; [ - setuptools + hatchling + hatch-vcs ]; + env.SETUPTOOLS_SCM_PRETEND_VERSION = finalAttrs.version; + dependencies = with python3Packages; [ pyyaml pyxdg - python-daemon evdev pyudev ]; - # hase no tests - doCheck = false; + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; pythonImportsCheck = [ "evdevremapkeys" ]; @@ -41,4 +44,4 @@ python3Packages.buildPythonPackage { maintainers = [ lib.maintainers.q3k ]; platforms = lib.platforms.linux; }; -} +}) diff --git a/pkgs/by-name/ev/eventstore/package.nix b/pkgs/by-name/ev/eventstore/package.nix index 51452be3c28b..9b7b80e40dbf 100644 --- a/pkgs/by-name/ev/eventstore/package.nix +++ b/pkgs/by-name/ev/eventstore/package.nix @@ -19,8 +19,8 @@ buildDotnetModule rec { version = "24.10.6"; src = fetchFromGitHub { - owner = "EventStore"; - repo = "EventStore"; + owner = "kurrent-io"; + repo = "KurrentDB"; tag = "v${version}"; hash = "sha256-8/sagvMyJ1/onGMuJ28QLWI5M8dBDWyGOcZKUv3PJsQ="; leaveDotGit = true; @@ -82,7 +82,6 @@ buildDotnetModule rec { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; inherit mainProgram; }; diff --git a/pkgs/by-name/ev/everdo/package.nix b/pkgs/by-name/ev/everdo/package.nix index 3dc11174021b..b4f74e40f83b 100644 --- a/pkgs/by-name/ev/everdo/package.nix +++ b/pkgs/by-name/ev/everdo/package.nix @@ -5,11 +5,11 @@ }: let pname = "everdo"; - version = "1.9.0"; + version = "1.11.9"; src = fetchurl { url = "https://downloads.everdo.net/electron/Everdo-${version}.AppImage"; - hash = "sha256-mM2rCjK548kjNR60Mr/YxBiVk+jxuVU01B9GHfIp1Mk="; + hash = "sha256-67b0gSoVcCIfkFRUL3afgB6eYj5YEuvDTtQgTIwV9S0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ev/everest-bin/package.nix b/pkgs/by-name/ev/everest-bin/package.nix index 2d0ba6e4a1a3..808d1351a3c3 100644 --- a/pkgs/by-name/ev/everest-bin/package.nix +++ b/pkgs/by-name/ev/everest-bin/package.nix @@ -8,15 +8,15 @@ let pname = "everest"; - version = "6314"; + version = "6397"; phome = "$out/lib/Celeste"; in stdenvNoCC.mkDerivation { inherit pname version; src = fetchzip { - url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6314.0/main.zip"; + url = "https://github.com/EverestAPI/Everest/releases/download/stable-1.6397.0/main.zip"; extension = "zip"; - hash = "sha256-YM6zjANINWQlTNu3EJFKIVl9VhVY4Ednjp+I+6Ap7dI="; + hash = "sha256-zU9FCDe5NDfuxnV+KdI0g9XiqAZM/tI1XZOXifYLblE="; }; buildInputs = [ icu @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { ''; meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/everest/package.nix b/pkgs/by-name/ev/everest/package.nix index b05e536acf03..5b1fb0162381 100644 --- a/pkgs/by-name/ev/everest/package.nix +++ b/pkgs/by-name/ev/everest/package.nix @@ -11,8 +11,8 @@ let pname = "everest"; - version = "6314"; - rev = "a3112074ae83766af9f8cf48295689bbd8166730"; + version = "6397"; + rev = "985fd82290fe47798bcd46cbbaa7574fe02780c8"; phome = "$out/lib/Celeste"; in buildDotnetModule { @@ -25,7 +25,7 @@ buildDotnetModule { fetchSubmodules = true; # TODO: use leaveDotGit = true and modify external/MonoMod in postFetch to please SourceLink # Microsoft.SourceLink.Common.targets(53,5): warning : Source control information is not available - the generated source link is empty. - hash = "sha256-yZLhjP09ocn8lbb6SuklcEHvqz/GV2/wlxpjYm/gr08="; + hash = "sha256-p/blM1lXeR2MBjfgMlJuseYZgQj3ziaiY9x3V+vH15s="; }; nativeBuildInputs = [ autoPatchelfHook ]; @@ -102,7 +102,7 @@ buildDotnetModule { meta = { description = "Celeste mod loader (don't install; use celestegame instead)"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ulysseszhan ]; homepage = "https://everestapi.github.io"; platforms = [ "x86_64-linux" ]; diff --git a/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch new file mode 100644 index 000000000000..9efb115de101 --- /dev/null +++ b/pkgs/by-name/ev/everforest-gtk-theme/gtk3-remove-border-spacing.patch @@ -0,0 +1,12 @@ +diff --git a/themes/src/sass/gtk/_common-3.0.scss b/themes/src/sass/gtk/_common-3.0.scss +index 4148a1b4..735905e9 100644 +--- a/themes/src/sass/gtk/_common-3.0.scss ++++ b/themes/src/sass/gtk/_common-3.0.scss +@@ -1119,7 +1119,6 @@ dropdown { + + > button > box { + border-radius: 0 $modal-radius $modal-radius 0; +- border-spacing: $space-size; + + > stack > row.activatable { + &:hover, diff --git a/pkgs/by-name/ev/everforest-gtk-theme/package.nix b/pkgs/by-name/ev/everforest-gtk-theme/package.nix index fb5e6f71769f..8f49570534e1 100644 --- a/pkgs/by-name/ev/everforest-gtk-theme/package.nix +++ b/pkgs/by-name/ev/everforest-gtk-theme/package.nix @@ -23,6 +23,9 @@ stdenvNoCC.mkDerivation { # remove when merged # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/34 ./fix-install-script.patch + # remove when merged + # https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme/pull/35 + ./gtk3-remove-border-spacing.patch ]; propagatedUserEnvPkgs = [ @@ -68,7 +71,7 @@ stdenvNoCC.mkDerivation { description = "Everforest colour palette for GTK"; homepage = "https://github.com/Fausto-Korpsvart/Everforest-GTK-Theme"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ jn-sena ]; + maintainers = [ ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/ev/everspace/package.nix b/pkgs/by-name/ev/everspace/package.nix deleted file mode 100644 index d8c8b86efb3a..000000000000 --- a/pkgs/by-name/ev/everspace/package.nix +++ /dev/null @@ -1,140 +0,0 @@ -{ - # Packaging Dependencies - lib, - stdenv, - requireFile, - autoPatchelfHook, - unzip, - copyDesktopItems, - makeDesktopItem, - - # Everspace Dependencies - cairo, - gdk-pixbuf, - pango, - gtk2-x11, - libGL, - openal, - - # Unreal Engine 4 Dependencies - libxxf86vm, - libxscrnsaver, - libxrender, - libxrandr, - libxi, - libxfixes, - libxext, - libxcursor, - libxau, - libx11, - libxcb, -}: - -# Known issues: -# - Video playback (upon starting a new game) does not work (screen is black) -stdenv.mkDerivation rec { - pname = "everspace"; - version = "1.3.5.3655"; - - src = requireFile { - name = "everspace_1_3_5_3655_32896.sh"; - url = "https://www.gog.com/"; - sha256 = "0jlvxq14k1pxmbr08y8kar0ijlqxcnkfqlvw883j96v9zr34ynj3"; - }; - - nativeBuildInputs = [ - autoPatchelfHook - copyDesktopItems - unzip - ]; - - buildInputs = [ - cairo - gdk-pixbuf - pango - gtk2-x11 - openal - (lib.getLib stdenv.cc.cc) - ]; - - runtimeDependencies = [ - libGL - - # ue4 - libx11 - libxscrnsaver - libxau - libxcursor - libxext - libxfixes - libxi - libxrandr - libxrender - libxxf86vm - libxcb - ]; - - unpackPhase = '' - runHook preUnpack - - # The shell script contains a zip file. Unzipping it works but will result - # in some error output and an error exit code. - unzip "$src" || true - - runHook postUnpack - ''; - - postPatch = '' - ## Remove Bundled Libs ## - - # vlc libs - # - # TODO: This is probably what breaks video playback. It would be cleaner - # to remove the bundled libs and replace them with system libs but there - # are so many. Copy-pasting the list from the vlc package is a good start - # but still leaves us with many unresolved dependencies. - rm -rf ./data/noarch/game/RSG/Plugins/VlcMedia - - # openal - rm -rf ./data/noarch/game/Engine/Binaries/ThirdParty/OpenAL - ''; - - dontConfigure = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - - mkdir -p "$out/opt" - cp -r "./data/noarch" "$out/opt/everspace" - - mkdir -p "$out/bin" - ln -s "$out/opt/everspace/game/RSG/Binaries/Linux/RSG-Linux-Shipping" "$out/bin/everspace" - - mkdir -p "$out/share/pixmaps" - ln -s "$out/opt/everspace/support/icon.png" "$out/share/pixmaps/everspace-gog.png" - - runHook postInstall - ''; - - desktopItems = [ - (makeDesktopItem { - type = "Application"; - name = "everspace-gog"; - desktopName = "EVERSPACE™"; - comment = meta.description; - exec = "everspace"; - icon = "everspace-gog"; - categories = [ "Game" ]; - }) - ]; - - meta = { - description = "Action-focused single-player space shooter with roguelike elements"; - homepage = "https://classic.everspace-game.com/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ jtrees ]; - platforms = [ "x86_64-linux" ]; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/ev/evince/package.nix b/pkgs/by-name/ev/evince/package.nix index 889ec7107238..f1f6e7c67a36 100644 --- a/pkgs/by-name/ev/evince/package.nix +++ b/pkgs/by-name/ev/evince/package.nix @@ -126,6 +126,12 @@ stdenv.mkDerivation (finalAttrs: { "-DHAVE_STDLIB_H" ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/evince.thumbnailer \ + --replace-fail "TryExec=evince-thumbnailer" "TryExec=$out/bin/evince-thumbnailer" \ + --replace-fail "Exec=evince-thumbnailer" "Exec=$out/bin/evince-thumbnailer" + ''; + preFixup = '' gappsWrapperArgs+=(--prefix XDG_DATA_DIRS : "${shared-mime-info}/share") ''; diff --git a/pkgs/by-name/ev/evmdis/package.nix b/pkgs/by-name/ev/evmdis/package.nix index 5d028fc29d8f..c7d7fbff6166 100644 --- a/pkgs/by-name/ev/evmdis/package.nix +++ b/pkgs/by-name/ev/evmdis/package.nix @@ -27,7 +27,7 @@ buildGoModule { homepage = "https://github.com/Arachnid/evmdis"; description = "Ethereum EVM disassembler"; mainProgram = "evmdis"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ asymmetric ]; }; } diff --git a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch index 9a45269b21f9..c259dd0f1269 100644 --- a/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-data-server/hardcode-gsettings.patch @@ -130,7 +130,7 @@ index 9d986d2..d63902a 100644 g_object_unref (settings); diff --git a/src/addressbook/libedata-book/e-book-meta-backend.c b/src/addressbook/libedata-book/e-book-meta-backend.c -index 60ff97f..8535dec 100644 +index c24a37a..e5cf57e 100644 --- a/src/addressbook/libedata-book/e-book-meta-backend.c +++ b/src/addressbook/libedata-book/e-book-meta-backend.c @@ -148,7 +148,18 @@ ebmb_is_power_saver_enabled (void) @@ -338,7 +338,7 @@ index 94f0769..8de758b 100644 g_clear_object (&settings); diff --git a/src/camel/camel-utils.c b/src/camel/camel-utils.c -index 2c0b6ef..b354332 100644 +index 3de034a..b6732ba 100644 --- a/src/camel/camel-utils.c +++ b/src/camel/camel-utils.c @@ -363,7 +363,19 @@ void @@ -363,10 +363,10 @@ index 2c0b6ef..b354332 100644 G_CALLBACK (mi_user_headers_settings_changed_cb), NULL); G_UNLOCK (mi_user_headers); diff --git a/src/camel/providers/imapx/camel-imapx-server.c b/src/camel/providers/imapx/camel-imapx-server.c -index e605049..9961fea 100644 +index e3f2391..374c72d 100644 --- a/src/camel/providers/imapx/camel-imapx-server.c +++ b/src/camel/providers/imapx/camel-imapx-server.c -@@ -5666,7 +5666,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) +@@ -5682,7 +5682,18 @@ camel_imapx_server_do_old_flags_update (CamelFolder *folder) if (do_old_flags_update) { GSettings *eds_settings; @@ -507,10 +507,10 @@ index 3738359..f9ce2d9 100644 g_object_unref (settings); diff --git a/src/libedataserver/e-oauth2-service.c b/src/libedataserver/e-oauth2-service.c -index c999d4d..e9cf7c5 100644 +index 9f56da2..f82921a 100644 --- a/src/libedataserver/e-oauth2-service.c +++ b/src/libedataserver/e-oauth2-service.c -@@ -93,7 +93,18 @@ eos_default_guess_can_process (EOAuth2Service *service, +@@ -95,7 +95,18 @@ eos_default_guess_can_process (EOAuth2Service *service, name_len = strlen (name); hostname_len = strlen (hostname); diff --git a/pkgs/by-name/ev/evolution-data-server/package.nix b/pkgs/by-name/ev/evolution-data-server/package.nix index 4a686d1d2775..65178d7ce4cc 100644 --- a/pkgs/by-name/ev/evolution-data-server/package.nix +++ b/pkgs/by-name/ev/evolution-data-server/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-data-server"; - version = "3.60.1"; + version = "3.60.2"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/evolution-data-server/${lib.versions.majorMinor finalAttrs.version}/evolution-data-server-${finalAttrs.version}.tar.xz"; - hash = "sha256-M/ktO4gi66BMMTeWwHeMu2Who4Ry6FftxfmIVMyps0w="; + hash = "sha256-IITb2sOWNxs2XVBMH/RYZrqNyi8SUuXaHT2cM6vcEoY="; }; patches = [ diff --git a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch index 2cd005612c20..7e82dbd3b2bb 100644 --- a/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch +++ b/pkgs/by-name/ev/evolution-ews/hardcode-gsettings.patch @@ -32,7 +32,7 @@ index a976b2e..c15e6f3 100644 for (ii = 0; strv && strv[ii]; ii++) { diff --git a/src/Microsoft365/camel/camel-m365-store.c b/src/Microsoft365/camel/camel-m365-store.c -index 6c1ebd6..4b7de44 100644 +index 5c9f51d..1510272 100644 --- a/src/Microsoft365/camel/camel-m365-store.c +++ b/src/Microsoft365/camel/camel-m365-store.c @@ -311,7 +311,7 @@ m365_store_save_category_changes (GHashTable *old_categories, /* gchar *id ~> Ca diff --git a/pkgs/by-name/ev/evolution-ews/package.nix b/pkgs/by-name/ev/evolution-ews/package.nix index be943e069f4c..8c4bf01d126c 100644 --- a/pkgs/by-name/ev/evolution-ews/package.nix +++ b/pkgs/by-name/ev/evolution-ews/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "evolution-ews"; - version = "3.60.1"; + version = "3.60.2"; src = fetchurl { url = "mirror://gnome/sources/evolution-ews/${lib.versions.majorMinor finalAttrs.version}/evolution-ews-${finalAttrs.version}.tar.xz"; - hash = "sha256-CiL4ZevrcOJnlSD9LZSqmXPEA8vk4DqojPjyPzWOi20="; + hash = "sha256-lAIFgY9piEEUV931gE0hDzUVwm4zQV3r2Puycxsdrys="; }; patches = [ diff --git a/pkgs/by-name/ev/evremap/package.nix b/pkgs/by-name/ev/evremap/package.nix index 37f4f2679a46..580a63f3c2e7 100644 --- a/pkgs/by-name/ev/evremap/package.nix +++ b/pkgs/by-name/ev/evremap/package.nix @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage { description = "Keyboard input remapper for Linux/Wayland systems"; homepage = "https://github.com/wez/evremap"; maintainers = with lib.maintainers; [ pluiedev ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "evremap"; }; } diff --git a/pkgs/by-name/ev/evtx/package.nix b/pkgs/by-name/ev/evtx/package.nix index 1e72731fa69c..8234adfdacbe 100644 --- a/pkgs/by-name/ev/evtx/package.nix +++ b/pkgs/by-name/ev/evtx/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "evtx"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "omerbenamram"; repo = "evtx"; tag = "v${finalAttrs.version}"; - hash = "sha256-zmXRUA2+x697AptONn5VUVySp4zz+VHwt8dqd6pJBGI="; + hash = "sha256-RNJIYTSV1czMNAs8Aqu9nDt/mvaC6uLRv9ra8vCShNA="; }; - cargoHash = "sha256-5Jw+zem0XLLvn3tELXk8vTnH2zvUr82qFx9QUYUwXyY="; + cargoHash = "sha256-kJkMk4bfmijo7IX1XopibFnouahK8sn1SDQtX9ha898="; postPatch = '' # CLI tests will fail in the sandbox diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index b079226da18d..3b60609fb638 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -15,13 +15,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eww"; - version = "0.6.0-unstable-2026-03-05"; + version = "0.6.0-unstable-2026-07-05"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "865cf631d5bbb5f9fccc99b3f4cc80b9eeada18c"; - hash = "sha256-fL12XFMsf/efSlbzQc7cCI366CwETkM6sWpEfcF9s6A="; + rev = "4ded06345553e4c2bcf8179fc7438e53c5e54d89"; + hash = "sha256-fnI8XgBowMxs/j9FGf+pQI2U8YjN8pTRqkVmFm8PBHE="; }; cargoHash = "sha256-Kf99eojqXvdbZ3eRS8GBgyLYNpZKJGIJtsOsvhhSVDk="; @@ -46,9 +46,6 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoTestFlags = finalAttrs.cargoBuildFlags; - # requires unstable rust features - env.RUSTC_BOOTSTRAP = 1; - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' installShellCompletion --cmd eww \ --bash <($out/bin/eww shell-completions --shell bash) \ diff --git a/pkgs/by-name/ex/exegol/package.nix b/pkgs/by-name/ex/exegol/package.nix index 4a315fd84622..43ac070e546e 100644 --- a/pkgs/by-name/ex/exegol/package.nix +++ b/pkgs/by-name/ex/exegol/package.nix @@ -22,6 +22,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonRelaxDeps = [ "argcomplete" "cryptography" + "pydantic" "requests" "rich" "supabase" diff --git a/pkgs/by-name/ex/exfatprogs/package.nix b/pkgs/by-name/ex/exfatprogs/package.nix index b8a13a4e687b..16d83bebb7ba 100644 --- a/pkgs/by-name/ex/exfatprogs/package.nix +++ b/pkgs/by-name/ex/exfatprogs/package.nix @@ -5,17 +5,18 @@ pkg-config, autoreconfHook, file, + util-linux, }: stdenv.mkDerivation (finalAttrs: { pname = "exfatprogs"; - version = "1.3.2"; + version = "1.4.2"; src = fetchFromGitHub { owner = "exfatprogs"; repo = "exfatprogs"; - rev = finalAttrs.version; - sha256 = "sha256-eXJg4mMYydOpYVgOup7WJze0qx6RVkia0xSZOlG+IOQ="; + tag = finalAttrs.version; + hash = "sha256-c1tdSX/xpZw56B7LPWwvKI7U6xk55lDc7D0k5FI7zwQ"; }; nativeBuildInputs = [ @@ -24,6 +25,10 @@ stdenv.mkDerivation (finalAttrs: { file ]; + buildInputs = [ + util-linux + ]; + outputs = [ "out" "man" diff --git a/pkgs/by-name/ex/exificient/package.nix b/pkgs/by-name/ex/exificient/package.nix index f64ee15654ad..a5d60537678b 100644 --- a/pkgs/by-name/ex/exificient/package.nix +++ b/pkgs/by-name/ex/exificient/package.nix @@ -17,7 +17,7 @@ maven.buildMavenPackage rec { hash = "sha256-XrlZQf2BamYw8u1S2qQ6jV9mgyCEjBxKqPZCXMJzXmc="; }; - mvnHash = "sha256-/72Pi8WbKhPXu7Zb9r30znY1FHJc7FM42f7uQJqJnWo="; + mvnHash = "sha256-8q8voXYxOhWcb3U2Nqg/LRhSru94puhymQa7Z9FR0+g="; mvnParameters = "package assembly:single -Dmaven.test.skip=true"; diff --git a/pkgs/by-name/ex/exim/package.nix b/pkgs/by-name/ex/exim/package.nix index 0a9330e7b43a..0da92f263656 100644 --- a/pkgs/by-name/ex/exim/package.nix +++ b/pkgs/by-name/ex/exim/package.nix @@ -39,11 +39,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "exim"; - version = "4.99.4"; + version = "4.99.5"; src = fetchurl { url = "https://ftp.exim.org/pub/exim/exim4/exim-${finalAttrs.version}.tar.xz"; - hash = "sha256-h/84gVcA37HuTrfo26eRbfenVZBTVNLQ+qGuF5DE/Z0="; + hash = "sha256-wtL4Ctx8cdQk/YKkZlXqotfZtMoud4g+upB2lHt+5ic="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/ex/expat/package.nix b/pkgs/by-name/ex/expat/package.nix index cf55e71a2037..2e831ef025da 100644 --- a/pkgs/by-name/ex/expat/package.nix +++ b/pkgs/by-name/ex/expat/package.nix @@ -18,18 +18,18 @@ # files. let - version = "2.8.0"; - tag = "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; + tagFor = version: "R_${lib.replaceStrings [ "." ] [ "_" ] version}"; in + stdenv.mkDerivation (finalAttrs: { pname = "expat"; - inherit version; + version = "2.8.2"; src = fetchurl { url = with finalAttrs; - "https://github.com/libexpat/libexpat/releases/download/${tag}/${pname}-${version}.tar.xz"; - hash = "sha256-o3v64KqXdb2FIevYXcRW1Ibw/zETj2yR/ZAupzJiRUI="; + "https://github.com/libexpat/libexpat/releases/download/${tagFor version}/${pname}-${version}.tar.xz"; + hash = "sha256-OtibhYjmZEvU5JmBSA1IshKJ7rvNTwoaSvscKfmbarQ="; }; strictDeps = true; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - changelog = "https://github.com/libexpat/libexpat/blob/${tag}/expat/Changes"; + changelog = "https://github.com/libexpat/libexpat/blob/${tagFor finalAttrs.version}/expat/Changes"; homepage = "https://libexpat.github.io/"; description = "Stream-oriented XML parser library written in C"; mainProgram = "xmlwf"; diff --git a/pkgs/by-name/ex/expected-lite/package.nix b/pkgs/by-name/ex/expected-lite/package.nix index e0a3828f6a0e..75c6d2e63e55 100644 --- a/pkgs/by-name/ex/expected-lite/package.nix +++ b/pkgs/by-name/ex/expected-lite/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.10.0"; src = fetchFromGitHub { - owner = "martinmoene"; + owner = "nonstd-lite"; repo = "expected-lite"; rev = "v${finalAttrs.version}"; hash = "sha256-nxwdymBNbd+RuL8rKi2Fx2gC68TnJe7WnoN0O01lecQ="; @@ -28,8 +28,8 @@ stdenv.mkDerivation (finalAttrs: { description = '' Expected objects in C++11 and later in a single-file header-only library ''; - homepage = "https://github.com/martinmoene/expected-lite"; - changelog = "https://github.com/martinmoene/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt"; + homepage = "https://github.com/nonstd-lite/expected-lite"; + changelog = "https://github.com/nonstd-lite/expected-lite/blob/${finalAttrs.src.rev}/CHANGES.txt"; license = lib.licenses.boost; maintainers = with lib.maintainers; [ azahi ]; }; diff --git a/pkgs/by-name/ex/explo/package.nix b/pkgs/by-name/ex/explo/package.nix new file mode 100644 index 000000000000..2c9a2864ccb8 --- /dev/null +++ b/pkgs/by-name/ex/explo/package.nix @@ -0,0 +1,92 @@ +{ + lib, + buildGoModule, + buildNpmPackage, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "explo"; + version = "1.1.2"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "LumePart"; + repo = "Explo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-7FIDRNZn+Yh2c/oLU3Ggb4A9y+5q3vv17eVLmGR2Zeo="; + }; + + webui = buildNpmPackage { + inherit (finalAttrs) + pname + version + src + meta + ; + + sourceRoot = "${finalAttrs.src.name}/src/web/frontend"; + + npmDepsHash = "sha256-N+i+VFHKJ9OxHyQKJ3vSw50N3tLjvFVPeG5aU0hLzqw="; + + buildPhase = '' + runHook preBuild + + npx vite build --outDir dist + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r dist/* $out + + runHook postInstall + ''; + }; + + vendorHash = "sha256-pa3WaVJU4WY/EyE3VttfEVOwwaxvkfxQj0wrwOmefYQ="; + + ldflags = [ + "-X explo/src/config.Version=${finalAttrs.version}" + ]; + + preBuild = '' + mkdir -p src/web/dist + cp -r ${finalAttrs.webui}/* src/web/dist + ''; + + postInstall = '' + mv $out/bin/main $out/bin/explo + mkdir -p $out/share/explo + cp src/downloader/youtube_music/search_ytmusic.py $out/share/explo/ + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "webui" + ]; + }; + + meta = { + description = "Spotify's \"Discover Weekly\" for self-hosted music systems"; + homepage = "https://github.com/LumePart/Explo/"; + changelog = "https://github.com/LumePart/Explo/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + lilacious + arunoruto + ]; + mainProgram = "explo"; + }; +}) diff --git a/pkgs/by-name/ex/exploitdb/package.nix b/pkgs/by-name/ex/exploitdb/package.nix index 5009c2d77a46..12e0385e2724 100644 --- a/pkgs/by-name/ex/exploitdb/package.nix +++ b/pkgs/by-name/ex/exploitdb/package.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "exploitdb"; - version = "2026-06-09"; + version = "2026-07-09"; src = fetchFromGitLab { owner = "exploit-database"; repo = "exploitdb"; tag = finalAttrs.version; - hash = "sha256-iNtAJkcbrEcjjMs4lqwDzMc1xussDTONVW7IsPrgnB0="; + hash = "sha256-V9hRNS5F6XovML9coPqSq1letp67THqqocqKYWJtFkQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ex/expresslrs-configurator/package.nix b/pkgs/by-name/ex/expresslrs-configurator/package.nix index 4a63c931b5a8..11d43e3febc5 100644 --- a/pkgs/by-name/ex/expresslrs-configurator/package.nix +++ b/pkgs/by-name/ex/expresslrs-configurator/package.nix @@ -12,7 +12,7 @@ let pname = "expresslrs-configurator"; - version = "1.7.11"; + version = "1.8.2"; installPath = "share/${pname}"; resourcesPath = "${installPath}/resources"; in @@ -22,7 +22,7 @@ stdenv.mkDerivation { src = fetchzip { url = "https://github.com/ExpressLRS/ExpressLRS-Configurator/releases/download/v${version}/${pname}-${version}.zip"; stripRoot = false; - hash = "sha256-BIbJzNWjYFbbwCEWoym3g6XBpQGi2owbf2XsQiXwHmw="; + hash = "sha256-fVERT1JkXYwEqP0UJZZxT8AgkEMRzlvSqWPM4Zo9KXU="; }; nativeBuildInputs = [ @@ -52,10 +52,6 @@ stdenv.mkDerivation { cp -r $src/locales $src/resources $out/${installPath}/ chmod -R u+w $out/${resourcesPath} - # broken symlink - rm -f $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3 - touch $out/${resourcesPath}/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/node_gyp_bins/python3 - # patch asar absolute paths asar extract $out/${resourcesPath}/app.asar $TMPDIR/app substituteInPlace $TMPDIR/app/dist/main/main.js \ @@ -70,6 +66,7 @@ stdenv.mkDerivation { makeWrapper '${lib.getExe electron}' "$out/bin/${pname}" \ --add-flags "$out/${resourcesPath}/app.asar" \ --prefix PATH : ${lib.makeBinPath [ git ]} \ + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ (lib.getLib stdenv.cc.cc) ]} \ --set ELECTRON_OVERRIDE_DIST_PATH "${electron}/lib/electron" \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" diff --git a/pkgs/by-name/ex/external-editor-revived/package.nix b/pkgs/by-name/ex/external-editor-revived/package.nix index 29f29d11471f..57be8c4ead17 100644 --- a/pkgs/by-name/ex/external-editor-revived/package.nix +++ b/pkgs/by-name/ex/external-editor-revived/package.nix @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Native messaging host for the Thunderbird addon allowing to edit mails in external programs"; homepage = "https://github.com/Frederick888/external-editor-revived"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ mofrim ]; mainProgram = "external-editor-revived"; }; diff --git a/pkgs/by-name/ex/extism-js-core/package.nix b/pkgs/by-name/ex/extism-js-core/package.nix index f3942d3a1e6d..6b6963677b9e 100644 --- a/pkgs/by-name/ex/extism-js-core/package.nix +++ b/pkgs/by-name/ex/extism-js-core/package.nix @@ -79,6 +79,9 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; meta = { + # Fails to build on darwin due to libiconv linking failure (ld: library not found for -liconv) + # See https://github.com/NixOS/nixpkgs/pull/523442 for a (failed) attempt at fixing the issue + broken = stdenv.buildPlatform.isDarwin; changelog = "https://github.com/extism/js-pdk/releases/tag/${finalAttrs.src.tag}"; description = "Write Extism plugins in JavaScript & TypeScript (WASM core)"; homepage = "https://github.com/extism/js-pdk"; diff --git a/pkgs/by-name/ex/extrude/package.nix b/pkgs/by-name/ex/extrude/package.nix index 2612f6629a0e..973a3381fe2e 100644 --- a/pkgs/by-name/ex/extrude/package.nix +++ b/pkgs/by-name/ex/extrude/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { description = "Tool to analyse binaries for missing security features"; mainProgram = "extrude"; homepage = "https://github.com/liamg/extrude"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ez/eza/package.nix b/pkgs/by-name/ez/eza/package.nix index 2bbc21ac8708..fffd96089b3b 100644 --- a/pkgs/by-name/ez/eza/package.nix +++ b/pkgs/by-name/ez/eza/package.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "eza"; - version = "0.23.4"; + version = "0.23.5"; __structuredAttrs = true; @@ -24,10 +24,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "eza-community"; repo = "eza"; tag = "v${finalAttrs.version}"; - hash = "sha256-zLb2VPfmv9J9UdPAXS+QPHI+hvDRl5UBcvW84J6nUK8="; + hash = "sha256-4XgPePl90mnQxmTUJfOvIsCcTRSYNBuRUNOb/3kmO1k="; }; - cargoHash = "sha256-3KLjlEZhGEyOcaiBnfIafR509oRbsWllqf1e6Z0M8Sg="; + cargoHash = "sha256-IRG+mVgU8ZZ8PsxZWqmf3ZjW8fGL0RD0CwIrjsL366I="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/f3/f3d/package.nix b/pkgs/by-name/f3/f3d/package.nix index a88437a7e22a..b11b24646f65 100644 --- a/pkgs/by-name/f3/f3d/package.nix +++ b/pkgs/by-name/f3/f3d/package.nix @@ -84,9 +84,17 @@ stdenv.mkDerivation rec { "-DF3D_PLUGIN_BUILD_USD=ON" ]; + postInstall = '' + for thumbnailer in $out/share/thumbnailers/f3d-plugin-*.thumbnailer; do + substituteInPlace $thumbnailer \ + --replace-fail "TryExec=f3d" "TryExec=$out/bin/f3d" \ + --replace-fail "Exec=f3d" "Exec=$out/bin/f3d" + done + ''; + meta = { description = "Fast and minimalist 3D viewer using VTK"; - homepage = "https://f3d-app.github.io/f3d"; + homepage = "https://f3d.app"; changelog = "https://github.com/f3d-app/f3d/releases/tag/v${version}"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/fa/fa_1/package.nix b/pkgs/by-name/fa/fa_1/package.nix index 433225f080c0..77c9649a05b8 100644 --- a/pkgs/by-name/fa/fa_1/package.nix +++ b/pkgs/by-name/fa/fa_1/package.nix @@ -2,29 +2,20 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -let - majorVersion = "0"; - minorVersion = "100"; -in -stdenvNoCC.mkDerivation { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "fa_1"; - version = "${majorVersion}.${minorVersion}"; + version = "0.100"; src = fetchzip { - url = "https://dotcolon.net/files/fonts/fa_1_${majorVersion}${minorVersion}.zip"; + url = "https://dotcolon.net/files/fonts/fa_1_${lib.replaceString "." "" finalAttrs.version}.zip"; hash = "sha256-BPJ+wZMYXY/yg5oEgBc5YnswA6A7w6V0gdv+cac0qdc="; stripRoot = false; }; - installPhase = '' - runHook preInstall - - install -D -m444 -t $out/share/fonts/opentype $src/*.otf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { homepage = "https://dotcolon.net/font/fa_1/"; @@ -33,4 +24,4 @@ stdenvNoCC.mkDerivation { maintainers = with lib.maintainers; [ minijackson ]; license = lib.licenses.ofl; }; -} +}) diff --git a/pkgs/by-name/fa/faas-cli/package.nix b/pkgs/by-name/fa/faas-cli/package.nix index b10b405a7815..171bfe18f7b2 100644 --- a/pkgs/by-name/fa/faas-cli/package.nix +++ b/pkgs/by-name/fa/faas-cli/package.nix @@ -24,13 +24,13 @@ let in buildGoModule (finalAttrs: { pname = "faas-cli"; - version = "0.18.8"; + version = "0.18.11"; src = fetchFromGitHub { owner = "openfaas"; repo = "faas-cli"; rev = finalAttrs.version; - sha256 = "sha256-JiIKCrNH6aWiCqw1ji5RwNrHwLHuSbw/iwqzrumfQQQ="; + sha256 = "sha256-4bfp9nM6cAglx9mNzjQZ4uo6nJNWI9Q9g9zIdkev9FM="; }; vendorHash = null; diff --git a/pkgs/by-name/fa/faba-icon-theme/package.nix b/pkgs/by-name/fa/faba-icon-theme/package.nix index 5029b4ed65c1..5e0091e8c078 100644 --- a/pkgs/by-name/fa/faba-icon-theme/package.nix +++ b/pkgs/by-name/fa/faba-icon-theme/package.nix @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { version = "4.3"; src = fetchFromGitHub { - owner = "moka-project"; + owner = "snwh"; repo = "faba-icon-theme"; rev = "v${version}"; sha256 = "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n"; diff --git a/pkgs/by-name/fa/fable/package.nix b/pkgs/by-name/fa/fable/package.nix index 3660d752767b..c6aa8cef69ce 100644 --- a/pkgs/by-name/fa/fable/package.nix +++ b/pkgs/by-name/fa/fable/package.nix @@ -1,14 +1,18 @@ { buildDotnetGlobalTool, + dotnetCorePackages, lib, testers, }: buildDotnetGlobalTool (finalAttrs: { pname = "fable"; - version = "4.29.0"; + version = "5.0.0"; - nugetHash = "sha256-Eed1bb9heteWOWmv6NnXPzXbf3t218K/eHufwgtRuzI="; + nugetHash = "sha256-PSlr4cGZAm/bgAesVn7dYqamvncat8lm1/lJHvYcAwk="; + + dotnet-sdk = dotnetCorePackages.sdk_10_0; + dotnet-runtime = dotnetCorePackages.runtime_10_0; passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; @@ -23,7 +27,7 @@ buildDotnetGlobalTool (finalAttrs: { homepage = "https://github.com/fable-compiler/fable"; changelog = "https://github.com/fable-compiler/fable/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ lib.platforms.darwin; maintainers = with lib.maintainers; [ anpin mdarocha diff --git a/pkgs/by-name/fa/fabric-ai/package.nix b/pkgs/by-name/fa/fabric-ai/package.nix index 8a62a2677564..f44a85433ad4 100644 --- a/pkgs/by-name/fa/fabric-ai/package.nix +++ b/pkgs/by-name/fa/fabric-ai/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "fabric-ai"; - version = "1.4.455"; + version = "1.4.459"; src = fetchFromGitHub { owner = "danielmiessler"; repo = "fabric"; tag = "v${finalAttrs.version}"; - hash = "sha256-folZ+Y5l76SKo65RJAK7kZX6DJ/AL+iLkcV8NX+1DTA="; + hash = "sha256-HlOctDrdp1iksU2PU3LDDqaHdCtyTzJhToNkU7cqMPU="; }; - vendorHash = "sha256-DfI0SYMX1wfJ8V0tFYpjzCgqhR7H/0J1p5R3aNcrXTw="; + vendorHash = "sha256-l7LeD4FV7TCuqek36R8FcrXcjHmTwGkQpJobp15Auts="; # Fabric introduced plugin tests that fail in the nix build sandbox. doCheck = false; diff --git a/pkgs/by-name/fa/factorio/versions.json b/pkgs/by-name/fa/factorio/versions.json index 2e0208d73e3c..13296e1da5bb 100644 --- a/pkgs/by-name/fa/factorio/versions.json +++ b/pkgs/by-name/fa/factorio/versions.json @@ -3,99 +3,99 @@ "alpha": { "experimental": { "candidateHashFilenames": [ - "factorio_linux_2.0.76.tar.xz" + "factorio_linux_2.1.10.tar.xz" ], - "name": "factorio_alpha_x64-2.0.76.tar.xz", + "name": "factorio_alpha_x64-2.1.10.tar.xz", "needsAuth": true, - "sha256": "b1e50891bdc69cce3fdaee4f840cbe4658e18d465309ac87915b6fc41900754c", + "sha256": "3c3f885061fe3f066574797edd5e59bd9e848f0373dcd944c59d2b79bfbfb6b3", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/alpha/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.1.10/alpha/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ - "factorio_linux_2.0.76.tar.xz" + "factorio_linux_2.0.77.tar.xz" ], - "name": "factorio_alpha_x64-2.0.76.tar.xz", + "name": "factorio_alpha_x64-2.0.77.tar.xz", "needsAuth": true, - "sha256": "b1e50891bdc69cce3fdaee4f840cbe4658e18d465309ac87915b6fc41900754c", + "sha256": "2e7c26d999c140335abb82c5e642cdd4c98db559633562d7ad9844aff4f273ff", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/alpha/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.0.77/alpha/linux64", + "version": "2.0.77" } }, "demo": { "experimental": { "candidateHashFilenames": [ - "factorio-demo_linux_2.0.76.tar.xz" + "factorio-demo_linux_2.0.77.tar.xz" ], - "name": "factorio_demo_x64-2.0.76.tar.xz", + "name": "factorio_demo_x64-2.0.77.tar.xz", "needsAuth": false, - "sha256": "d5caee49636290b678d35adc59d2fc80ecbdbad8bf420731f1317971c89f941b", + "sha256": "f2fc889de1924b551cf52ca2ce2c73251f9c20ee2ae38cc8e973415baffef2a1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/demo/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.0.77/demo/linux64", + "version": "2.0.77" }, "stable": { "candidateHashFilenames": [ - "factorio-demo_linux_2.0.76.tar.xz" + "factorio-demo_linux_2.0.77.tar.xz" ], - "name": "factorio_demo_x64-2.0.76.tar.xz", + "name": "factorio_demo_x64-2.0.77.tar.xz", "needsAuth": false, - "sha256": "d5caee49636290b678d35adc59d2fc80ecbdbad8bf420731f1317971c89f941b", + "sha256": "f2fc889de1924b551cf52ca2ce2c73251f9c20ee2ae38cc8e973415baffef2a1", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/demo/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.0.77/demo/linux64", + "version": "2.0.77" } }, "expansion": { "experimental": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.76.tar.xz" + "factorio-space-age_linux_2.1.10.tar.xz" ], - "name": "factorio_expansion_x64-2.0.76.tar.xz", + "name": "factorio_expansion_x64-2.1.10.tar.xz", "needsAuth": true, - "sha256": "dc24bbbc1b6a619e4425d9a720bcfafce3463d908ab369a6cd1bee1a99332b4f", + "sha256": "35e42240a70c56e046489cb1cca8b6c7e17cf5fd4bdfb52c08422497bb57bb6c", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/expansion/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.1.10/expansion/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ - "factorio-space-age_linux_2.0.76.tar.xz" + "factorio-space-age_linux_2.0.77.tar.xz" ], - "name": "factorio_expansion_x64-2.0.76.tar.xz", + "name": "factorio_expansion_x64-2.0.77.tar.xz", "needsAuth": true, - "sha256": "dc24bbbc1b6a619e4425d9a720bcfafce3463d908ab369a6cd1bee1a99332b4f", + "sha256": "068cd4778459569cb46e8a8acde1c404969ad533d7e479789af9fce0d29f10a4", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/expansion/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.0.77/expansion/linux64", + "version": "2.0.77" } }, "headless": { "experimental": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.76.tar.xz", - "factorio_headless_x64_2.0.76.tar.xz" + "factorio-headless_linux_2.1.10.tar.xz", + "factorio_headless_x64_2.1.10.tar.xz" ], - "name": "factorio_headless_x64-2.0.76.tar.xz", + "name": "factorio_headless_x64-2.1.10.tar.xz", "needsAuth": false, - "sha256": "ef3663f66146d76342f7c09a3f743792636f8cd95c39ea26cfca5bd2e0e92430", + "sha256": "5aab961c026a35d5ee28b2846260812098ed8b362b1251edf6bbd15c7355cb6c", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/headless/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.1.10/headless/linux64", + "version": "2.1.10" }, "stable": { "candidateHashFilenames": [ - "factorio-headless_linux_2.0.76.tar.xz", - "factorio_headless_x64_2.0.76.tar.xz" + "factorio-headless_linux_2.0.77.tar.xz", + "factorio_headless_x64_2.0.77.tar.xz" ], - "name": "factorio_headless_x64-2.0.76.tar.xz", + "name": "factorio_headless_x64-2.0.77.tar.xz", "needsAuth": false, - "sha256": "ef3663f66146d76342f7c09a3f743792636f8cd95c39ea26cfca5bd2e0e92430", + "sha256": "c4efc11529f74d37c96933e291e0db73fd9f5aa4738913d9301b24680b3e947f", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/2.0.76/headless/linux64", - "version": "2.0.76" + "url": "https://factorio.com/get-download/2.0.77/headless/linux64", + "version": "2.0.77" } } } diff --git a/pkgs/by-name/fa/fail2ban/package.nix b/pkgs/by-name/fa/fail2ban/package.nix index e851036fbafa..4c615a737eaf 100644 --- a/pkgs/by-name/fa/fail2ban/package.nix +++ b/pkgs/by-name/fa/fail2ban/package.nix @@ -52,9 +52,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { substituteInPlace $i \ --replace /usr/sbin/sendmail sendmail done - - substituteInPlace config/filter.d/dovecot.conf \ - --replace dovecot.service dovecot2.service ''; doCheck = false; @@ -113,6 +110,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { homepage = "https://www.fail2ban.org/"; description = "Program that scans log files for repeated failing login attempts and bans IP addresses"; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + Deric-W + ]; }; }) diff --git a/pkgs/by-name/fa/faiss/package.nix b/pkgs/by-name/fa/faiss/package.nix index b4b74a815cfc..749fdbf20f8a 100644 --- a/pkgs/by-name/fa/faiss/package.nix +++ b/pkgs/by-name/fa/faiss/package.nix @@ -31,10 +31,10 @@ let stdenv = if cudaSupport then backendStdenv else inputs.stdenv; cudaComponents = with cudaPackages; [ + cccl cuda_cudart # cuda_runtime.h libcublas libcurand - cuda_cccl # cuda_profiler_api.h (cudaPackages.cuda_profiler_api or cudaPackages.cuda_nvprof) @@ -97,10 +97,22 @@ stdenv.mkDerivation (finalAttrs: { python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .) ''; - postInstall = lib.optionalString pythonSupport '' - mkdir "$dist" - cp faiss/python/dist/*.whl "$dist/" - ''; + postInstall = + lib.optionalString pythonSupport '' + mkdir "$dist" + cp faiss/python/dist/*.whl "$dist/" + '' + # The GPU targets in faiss-targets.cmake reference CUDA imported targets + # (CUDA::cudart, CUDA::cublas), but faiss-config.cmake never finds them. + # Declare the dependency so downstream find_package(faiss) resolves them. + + lib.optionalString cudaSupport '' + substituteInPlace "$out/share/faiss/faiss-config.cmake" \ + --replace-fail \ + 'include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")' \ + 'include(CMakeFindDependencyMacro) + find_dependency(CUDAToolkit) + include("''${CMAKE_CURRENT_LIST_DIR}/faiss-targets.cmake")' + ''; passthru = { inherit cudaSupport cudaPackages pythonSupport; diff --git a/pkgs/by-name/fa/fake-gcs-server/package.nix b/pkgs/by-name/fa/fake-gcs-server/package.nix index 786dc24d2f60..82a4f6e0466b 100644 --- a/pkgs/by-name/fa/fake-gcs-server/package.nix +++ b/pkgs/by-name/fa/fake-gcs-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "fake-gcs-server"; - version = "1.54.0"; + version = "1.55.0"; src = fetchFromGitHub { owner = "fsouza"; repo = "fake-gcs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-mskNNTytnqqFXP4REMz7KLgWL0ma/8hlQKSAABOGuvk="; + hash = "sha256-XbwiPWhudTUhiCA91n8av7oQ0USPA/vXHePfS7/jnOg="; }; - vendorHash = "sha256-KNappojVBU1F9F3FqindXVDzOIy7IwYd7xVzbqQk6QE="; + vendorHash = "sha256-9zovcKQ3eiYWHCxUBXI39kgnjD4mR/4GGAZz65f7Of4="; # Unit tests fail to start the emulator server in some environments (e.g. Hydra) for some reason. # diff --git a/pkgs/by-name/fa/fakeroot/add-missing-wrapawk.patch b/pkgs/by-name/fa/fakeroot/add-missing-wrapawk.patch new file mode 100644 index 000000000000..ec1e7bef28ae --- /dev/null +++ b/pkgs/by-name/fa/fakeroot/add-missing-wrapawk.patch @@ -0,0 +1,98 @@ +--- /dev/null 2026-06-10 18:10:25.546025717 +0200 ++++ b/wrapawk 1970-01-01 01:00:01.000000000 +0100 +@@ -0,0 +1,95 @@ ++#Saluton Emacson! Bonvolu elekti -*- mode: awk; -*-. Dankon. ++ ++BEGIN{ ++ headerfile="wrapped.h"; ++ deffile="wrapdef.h"; ++ structfile="wrapstruct.h"; ++ tmpffile="wraptmpf.h"; ++ FS=";"; ++ WARNING="/* Automatically generated file. Do not edit. Edit wrapawk/wrapfunc.inp. */"; ++ print WARNING > headerfile; ++ print "#ifndef WRAPPED_H" > headerfile; ++ print "#define WRAPPED_H" > headerfile; ++ print WARNING > deffile; ++ print "#ifndef WRAPDEF_H" > deffile; ++ print "#define WRAPDEF_H" > deffile; ++ print WARNING > tmpffile; ++ print "#ifndef WRAPTMPF_H" > tmpffile; ++ print "#define WRAPTMPF_H" > tmpffile; ++ print WARNING > structfile; ++ print "#ifndef WRAPSTRUCT_H" > structfile; ++ print "#define WRAPSTRUCT_H" > structfile; ++ print "struct next_wrap_st next_wrap[]= {" > structfile; ++} ++ ++/\/\*/{ ++} ++/^(\#)/{ ++ print $0 > structfile; ++ print $0 > tmpffile; ++ print $0 > deffile; ++ print $0 > headerfile; ++ ++} ++/^[^\/].*;.*;.*;/{ ++ name=$1; ++ ret=$2; ++ argtype=$3; ++ argname=$4; ++ MACRO=$5; ++ openat_extra=$6; ++ if(openat_extra){ ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" openat_extra ";" > headerfile; ++ print ret " (*next_" name ")" openat_extra "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, openat_extra "{" > tmpffile; ++ print " mode_t mode = 0;" > tmpffile; ++ print " if (flags & O_CREAT) {" > tmpffile; ++ print " va_list args;" > tmpffile; ++ print " va_start(args, flags);" > tmpffile; ++ print " mode = va_arg(args, int);" > tmpffile; ++ print " va_end(args);" > tmpffile; ++ print " }" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else if(MACRO){ ++ print " {(void(*))&NEXT_" MACRO "_NOARG, " name "_QUOTE}," > structfile; ++ print "extern " ret " (*NEXT_" MACRO "_NOARG)" argtype ";" > headerfile; ++ print ret " (*NEXT_" MACRO "_NOARG)" argtype "=TMP_" MACRO ";"> deffile; ++ ++ print ret " TMP_" MACRO, argtype "{" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return NEXT_" MACRO "_NOARG " argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } else { ++ print " {(void(*))&next_" name ", \"" name "\"}," > structfile; ++ print "extern " ret " (*next_" name ")" argtype ";" > headerfile; ++ print ret " (*next_" name ")" argtype "=tmp_" name ";"> deffile; ++ ++ print ret " tmp_" name, argtype "{" > tmpffile; ++ print " load_library_symbols();" > tmpffile; ++ print " return next_" name, argname ";" > tmpffile; ++ print "}" > tmpffile; ++ print "" > tmpffile; ++ } ++} ++ ++/^ *$/{ ++ print > structfile; ++ print > headerfile; ++ print > deffile; ++ print > tmpffile; ++} ++ ++END{ ++ print " {NULL, NULL}," > structfile; ++ print "};" > structfile; ++ print "#endif" > structfile; ++ print "#endif" > tmpffile; ++ print "#endif" > deffile; ++ print "#endif" > headerfile; ++} diff --git a/pkgs/by-name/fa/fakeroot/package.nix b/pkgs/by-name/fa/fakeroot/package.nix index 401b39ab993c..8ff043709eb9 100644 --- a/pkgs/by-name/fa/fakeroot/package.nix +++ b/pkgs/by-name/fa/fakeroot/package.nix @@ -1,31 +1,34 @@ { lib, - coreutils, stdenv, fetchFromGitLab, - fetchpatch, - getopt, - libcap, - gnused, - nixosTests, - testers, autoreconfHook, po4a, + libcap, + getopt, + gnused, + coreutils, + versionCheckHook, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { version = "1.38.1"; pname = "fakeroot"; + strictDeps = true; + __structuredAttrs = true; + src = fetchFromGitLab { + domain = "salsa.debian.org"; owner = "clint"; repo = "fakeroot"; - rev = "upstream/${finalAttrs.version}"; - domain = "salsa.debian.org"; - hash = "sha256-1Xmb8OPZSVP4xtSBGuwwKwdVQXixEugMgQfvAJueJAg="; + tag = "upstream/${finalAttrs.version}"; + hash = "sha256-sAzXeONjDT753lbu7amQY6yXpaTNCa4wFOzB01SRbCs="; }; patches = lib.optionals stdenv.hostPlatform.isLinux [ + ./add-missing-wrapawk.patch ./einval.patch ]; @@ -33,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { autoreconfHook po4a ]; - buildInputs = lib.optional stdenv.hostPlatform.isLinux libcap; + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libcap ]; postUnpack = '' sed -i \ @@ -51,11 +54,11 @@ stdenv.mkDerivation (finalAttrs: { popd ''; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + passthru = { tests = { - version = testers.testVersion { - package = finalAttrs.finalPackage; - }; # A lightweight *unit* test that exercises fakeroot and fakechroot together: nixos-etc = nixosTests.etc.test-etc-fakeroot; }; diff --git a/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch b/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch deleted file mode 100644 index 5f72338cc57e..000000000000 --- a/pkgs/by-name/fa/falcon/bump-minimum-cmake-required-version.patch +++ /dev/null @@ -1,250 +0,0 @@ -From a1f4fa1607249b0356c2cd2c54134cb3dc2dc231 Mon Sep 17 00:00:00 2001 -From: Stanislas Marquis -Date: Fri, 3 Mar 2023 12:44:09 +0100 -Subject: [PATCH] Update cmake minimum version >= 3.16.3 (ubuntu FF) - ---- - CMakeLists.txt | 2 +- - apps/faldoc/CMakeLists.txt | 2 +- - clt/falcon/editline/CMakeLists.txt | 4 ++-- - dist/nsis/CMakeLists.txt | 2 +- - modules/native/MP/CMakeLists.txt | 2 +- - modules/native/conio/CMakeLists.txt | 2 +- - modules/native/curl/CMakeLists.txt | 2 +- - modules/native/dbi/CMakeLists.txt | 2 +- - modules/native/dbus/CMakeLists.txt | 2 +- - modules/native/dynlib/CMakeLists.txt | 2 +- - modules/native/feathers/CMakeLists.txt | 2 +- - modules/native/gd2/CMakeLists.txt | 2 +- - modules/native/gtk/CMakeLists.txt | 2 +- - modules/native/hpdf/CMakeLists.txt | 2 +- - modules/native/sdl/CMakeLists.txt | 2 +- - modules/native/wopi/CMakeLists.txt | 2 +- - tests/native/dynlib/CMakeLists.txt | 2 +- - 17 files changed, 18 insertions(+), 18 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 81c404677..de2125e3d 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -34,7 +34,7 @@ - # List of available modules: CURL DBI DBUS DYNLIB GD2 GTK PDF SDL - # - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon) - - -diff --git a/apps/faldoc/CMakeLists.txt b/apps/faldoc/CMakeLists.txt -index 3e0867f63..7ef40d7b3 100644 ---- a/apps/faldoc/CMakeLists.txt -+++ b/apps/faldoc/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for Feather modules - #################################################################### - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(falcon-app-faldoc) - - set(FALDOC_DIR "${FALCON_APP_DIR}/faldoc" ) -diff --git a/clt/falcon/editline/CMakeLists.txt b/clt/falcon/editline/CMakeLists.txt -index 8b51862ad..933ef0a13 100644 ---- a/clt/falcon/editline/CMakeLists.txt -+++ b/clt/falcon/editline/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Editline) - - find_package(Curses REQUIRED) -@@ -23,4 +23,4 @@ configure_file( - ${CMAKE_CURRENT_SOURCE_DIR}/config.h.cmake - ${CMAKE_CURRENT_BINARY_DIR}/config.h - ) -- -\ No newline at end of file -+ -diff --git a/dist/nsis/CMakeLists.txt b/dist/nsis/CMakeLists.txt -index c6e0110bb..996ce5436 100644 ---- a/dist/nsis/CMakeLists.txt -+++ b/dist/nsis/CMakeLists.txt -@@ -1,7 +1,7 @@ - # - # Configurator for NSIS installer - # --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - # - # Files to be configured -diff --git a/modules/native/MP/CMakeLists.txt b/modules/native/MP/CMakeLists.txt -index 2b86107e0..f8eba5c40 100644 ---- a/modules/native/MP/CMakeLists.txt -+++ b/modules/native/MP/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(MP) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) - # Set here project-wide options - # OPTION( WITH_OPT "An poption" OFF) -diff --git a/modules/native/conio/CMakeLists.txt b/modules/native/conio/CMakeLists.txt -index 104c9bcec..d828d7e09 100644 ---- a/modules/native/conio/CMakeLists.txt -+++ b/modules/native/conio/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for @PROJECT_NAME@ - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(conio) - - # find the falcon installation. Set CMAKE_INSTALL_PREFIX to the falcon root -diff --git a/modules/native/curl/CMakeLists.txt b/modules/native/curl/CMakeLists.txt -index 2f1e908e7..7d7a2377c 100644 ---- a/modules/native/curl/CMakeLists.txt -+++ b/modules/native/curl/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for curl - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_curl) - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) - -diff --git a/modules/native/dbi/CMakeLists.txt b/modules/native/dbi/CMakeLists.txt -index 3a3f72c5f..20dbee902 100644 ---- a/modules/native/dbi/CMakeLists.txt -+++ b/modules/native/dbi/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for DBI - #################################################################### --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_DBI) - - list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) -diff --git a/modules/native/dbus/CMakeLists.txt b/modules/native/dbus/CMakeLists.txt -index 4bd76ce38..09f575fa7 100644 ---- a/modules/native/dbus/CMakeLists.txt -+++ b/modules/native/dbus/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(dbus) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - INCLUDE( ${CMAKE_ROOT}/Modules/FindPkgConfig.cmake) - -diff --git a/modules/native/dynlib/CMakeLists.txt b/modules/native/dynlib/CMakeLists.txt -index 92bc09e59..6e1f31ec9 100644 ---- a/modules/native/dynlib/CMakeLists.txt -+++ b/modules/native/dynlib/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for dynlib - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(Falcon_dynlib) - - find_package(Falcon REQUIRED) -diff --git a/modules/native/feathers/CMakeLists.txt b/modules/native/feathers/CMakeLists.txt -index 7be6dca12..3591a4b9a 100644 ---- a/modules/native/feathers/CMakeLists.txt -+++ b/modules/native/feathers/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for Feather modules - #################################################################### --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - PROJECT(Falcon_Feathers) - - # Find our Find*.cmake files -diff --git a/modules/native/gd2/CMakeLists.txt b/modules/native/gd2/CMakeLists.txt -index 7d775d1e7..73692d4fd 100644 ---- a/modules/native/gd2/CMakeLists.txt -+++ b/modules/native/gd2/CMakeLists.txt -@@ -5,7 +5,7 @@ - #################################################################### - - PROJECT(gd2) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - MESSAGE(STATUS "Building GD2 module" ) - - -diff --git a/modules/native/gtk/CMakeLists.txt b/modules/native/gtk/CMakeLists.txt -index 0f08e4bb3..f1bc647e9 100644 ---- a/modules/native/gtk/CMakeLists.txt -+++ b/modules/native/gtk/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - project( gtk ) - --cmake_minimum_required( VERSION 2.6.3 ) -+cmake_minimum_required( VERSION 3.16.3 ) - - list( APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ) - -diff --git a/modules/native/hpdf/CMakeLists.txt b/modules/native/hpdf/CMakeLists.txt -index 679444146..cf86e9392 100644 ---- a/modules/native/hpdf/CMakeLists.txt -+++ b/modules/native/hpdf/CMakeLists.txt -@@ -4,7 +4,7 @@ - # CMake configuration file for Feather modules - #################################################################### - --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - project(falcon-module-hpdf) - - list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") -diff --git a/modules/native/sdl/CMakeLists.txt b/modules/native/sdl/CMakeLists.txt -index 32a07dfd5..7d46ae513 100644 ---- a/modules/native/sdl/CMakeLists.txt -+++ b/modules/native/sdl/CMakeLists.txt -@@ -6,7 +6,7 @@ - if(COMMAND cmake_policy) - cmake_policy(SET CMP0003 OLD) - endif(COMMAND cmake_policy) --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - PROJECT(Falcon_SDL) - - -diff --git a/modules/native/wopi/CMakeLists.txt b/modules/native/wopi/CMakeLists.txt -index 3f711cd6d..56e6c539b 100644 ---- a/modules/native/wopi/CMakeLists.txt -+++ b/modules/native/wopi/CMakeLists.txt -@@ -3,7 +3,7 @@ - # Falcon Web Oriented Programming Interface - # - --cmake_minimum_required(VERSION 2.6.2) -+cmake_minimum_required(VERSION 3.16.3) - project( falcon_wopi ) - - ###################################################################### -diff --git a/tests/native/dynlib/CMakeLists.txt b/tests/native/dynlib/CMakeLists.txt -index 1781380d9..ed3f1e99f 100644 ---- a/tests/native/dynlib/CMakeLists.txt -+++ b/tests/native/dynlib/CMakeLists.txt -@@ -3,7 +3,7 @@ - # - # CMake configuration file for dynlib - TESTS - #################################################################### --cmake_minimum_required(VERSION 2.6) -+cmake_minimum_required(VERSION 3.16.3) - - include_directories( - ${CMAKE_CURRENT_SOURCE_DIR} diff --git a/pkgs/by-name/fa/falcon/package.nix b/pkgs/by-name/fa/falcon/package.nix deleted file mode 100644 index 26c8c902fba9..000000000000 --- a/pkgs/by-name/fa/falcon/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - pcre, - zlib, - sqlite, -}: - -stdenv.mkDerivation { - pname = "falcon"; - version = "0-unstable-2023-11-19"; - - src = fetchFromGitHub { - owner = "falconpl"; - repo = "falcon"; - rev = "fc403c6e8c1f3d8c2a5a6ebce5db6f1b3e355808"; - hash = "sha256-0yLhwDVFNbfiW23hNxrvItCCkyaOvEbFSg1ZQuJvhIs="; - }; - - patches = [ - # https://github.com/falconpl/falcon/pull/11 - ./bump-minimum-cmake-required-version.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - ]; - buildInputs = [ - pcre - zlib - sqlite - ]; - - meta = { - description = "Programming language with macros and syntax at once"; - homepage = "https://github.com/falconpl/falcon"; - license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ pSub ]; - platforms = with lib.platforms; unix; - broken = stdenv.cc.isClang; - }; -} diff --git a/pkgs/by-name/fa/falkor/package.nix b/pkgs/by-name/fa/falkor/package.nix index 3bcf0da92424..900257712a8d 100644 --- a/pkgs/by-name/fa/falkor/package.nix +++ b/pkgs/by-name/fa/falkor/package.nix @@ -43,7 +43,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Electron-based gaming hub"; homepage = "https://github.com/Team-Falkor/falkor"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ icedborn ]; platforms = [ "x86_64-linux" ]; hydraPlatforms = [ ]; diff --git a/pkgs/by-name/fa/famly-fetch/package.nix b/pkgs/by-name/fa/famly-fetch/package.nix index b9115720c77e..62005ab7fb44 100644 --- a/pkgs/by-name/fa/famly-fetch/package.nix +++ b/pkgs/by-name/fa/famly-fetch/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "famly-fetch"; - version = "0.5.3"; + version = "0.6.0"; pyproject = true; src = fetchFromGitHub { owner = "jacobbunk"; repo = "famly-fetch"; tag = "v${finalAttrs.version}"; - hash = "sha256-KsdypUXHU9drghAcDcur8FUUJvm8nIzq00QFdMqPnpc="; + hash = "sha256-MU9T8eP/LNOLAQFPOC1EEy58+kcn7G+Hh2R8wC92qnQ="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/fa/fan2go/package.nix b/pkgs/by-name/fa/fan2go/package.nix index 4f3add865b92..1559695d5646 100644 --- a/pkgs/by-name/fa/fan2go/package.nix +++ b/pkgs/by-name/fa/fan2go/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "fan2go"; - version = "0.13.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "markusressel"; repo = "fan2go"; tag = finalAttrs.version; - hash = "sha256-JU6hk3JJwoiC3R+Qx6QKzALnvhTA0/luQzO5X6Cpb/I="; + hash = "sha256-LEPyyVlVPbGnAfRF0E7wr4fQqRNSKKSsDSKGBCISt5A="; leaveDotGit = true; postFetch = '' cd $out @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-6rcU7Qtzz80WcygeLVftdpGYAuzGmWD0M+ZVxgGcgnI="; + vendorHash = "sha256-LydoBk7qt3Xsf13isJ/yTf6a+FExV9TSSUfD5Tu8Hqk="; nativeBuildInputs = lib.optionals enableNVML [ autoAddDriverRunpath diff --git a/pkgs/by-name/fa/far2l/package.nix b/pkgs/by-name/fa/far2l/package.nix index ea771b7d03cd..46f795747645 100644 --- a/pkgs/by-name/fa/far2l/package.nix +++ b/pkgs/by-name/fa/far2l/package.nix @@ -44,13 +44,13 @@ stdenv.mkDerivation rec { pname = "far2l"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "elfmz"; repo = "far2l"; tag = "v_${version}"; - hash = "sha256-pqyAZtVeE3awejx1/glJgAQN6fjAe4YHJX/fLHlF1+Y="; + hash = "sha256-LP+agJrYxjH6vLAg6cJTU4/9jYGF9iaZzxA7hozDKNY="; }; nativeBuildInputs = [ @@ -130,7 +130,7 @@ stdenv.mkDerivation rec { description = "Linux port of FAR Manager v2, a program for managing files and archives in Windows operating systems"; homepage = "https://github.com/elfmz/far2l"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ hypersw ]; + maintainers = with lib.maintainers; [ smakarov ]; platforms = lib.platforms.unix; }; } diff --git a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix index b371db2fd199..7229bcf79d0a 100644 --- a/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix +++ b/pkgs/by-name/fa/faraday-agent-dispatcher/package.nix @@ -2,6 +2,7 @@ lib, fetchFromGitHub, python3, + writableTmpDirAsHomeHook, }: python3.pkgs.buildPythonApplication (finalAttrs: { @@ -21,6 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { --replace-fail '"pytest-runner",' "" ''; pythonRelaxDeps = [ + "pytenable" "python-socketio" ]; @@ -28,13 +30,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "python-owasp-zap-v2.4" ]; - build-system = with python3.pkgs; [ - setuptools-scm - ]; + build-system = with python3.pkgs; [ setuptools-scm ]; - nativeBuildInputs = [ - python3.pkgs.python-owasp-zap-v2-4 - ]; + nativeBuildInputs = with python3.pkgs; [ python-owasp-zap-v2-4 ]; dependencies = with python3.pkgs; [ aiohttp @@ -57,12 +55,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = with python3.pkgs; [ pytest-asyncio pytestCheckHook + writableTmpDirAsHomeHook ]; - preCheck = '' - export HOME=$(mktemp -d); - ''; - disabledTests = [ "test_execute_agent" "SSL" @@ -74,14 +69,12 @@ python3.pkgs.buildPythonApplication (finalAttrs: { "tests/unittests/test_import_official_executors.py" ]; - pythonImportsCheck = [ - "faraday_agent_dispatcher" - ]; + pythonImportsCheck = [ "faraday_agent_dispatcher" ]; meta = { description = "Tool to send result from tools to the Faraday Platform"; homepage = "https://github.com/infobyte/faraday_agent_dispatcher"; - changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/infobyte/faraday_agent_dispatcher/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "faraday-dispatcher"; diff --git a/pkgs/by-name/fa/fasmg/package.nix b/pkgs/by-name/fa/fasmg/package.nix index c504c5e888c0..1ea5b4b1977b 100644 --- a/pkgs/by-name/fa/fasmg/package.nix +++ b/pkgs/by-name/fa/fasmg/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fasmg"; - version = "l5p0"; + version = "l7xm"; src = fetchzip { url = "https://flatassembler.net/fasmg.${finalAttrs.version}.zip"; - sha256 = "sha256-8nX45tHvKq6FPVhWQGNgrpkZgWuNbfsxL9YJxKa7P3I="; + sha256 = "sha256-m/mLZLluvoxr0VsNVcBnHvv1LlagafkX6fwZSovtO9s="; stripRoot = false; }; @@ -32,10 +32,6 @@ stdenv.mkDerivation (finalAttrs: { bin = "fasmg.x64"; asm = "source/linux/x64/fasmg.asm"; }; - x86_64-darwin = { - bin = "source/macos/x64/fasmg"; - asm = "source/macos/x64/fasmg.asm"; - }; x86-linux = { bin = "fasmg"; asm = "source/linux/fasmg.asm"; diff --git a/pkgs/by-name/fa/fast-float/package.nix b/pkgs/by-name/fa/fast-float/package.nix index b8bfc4002bd8..78b919e10656 100644 --- a/pkgs/by-name/fa/fast-float/package.nix +++ b/pkgs/by-name/fa/fast-float/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fast-float"; - version = "8.2.8"; + version = "8.2.10"; src = fetchFromGitHub { owner = "fastfloat"; repo = "fast_float"; rev = "v${finalAttrs.version}"; - hash = "sha256-wnWZyQJzg6vzaRi3hbNHCAZre+NrI7KMoJwJp94fy70="; + hash = "sha256-DOwDLnMwlXAP5SfDJuxhkmLmcBZ1wBvXEJr5RuHepp4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/fa/fast/package.nix b/pkgs/by-name/fa/fast/package.nix new file mode 100644 index 000000000000..61f77ee46591 --- /dev/null +++ b/pkgs/by-name/fa/fast/package.nix @@ -0,0 +1,29 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, +}: +buildGoModule rec { + pname = "fast"; + version = "0.1.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "maaslalani"; + repo = "fast"; + tag = "v${version}"; + hash = "sha256-/Li5AAuuHkVqJzmh38g5CPQXWj4RY0TRwvtjlpydosg="; + }; + + vendorHash = "sha256-YSjJ8NOL97hXZLnfGYIjoKmARv+gWOsv+5qkl9konnA="; + + meta = { + homepage = "https://github.com/maaslalani/fast"; + description = "Internet speed test in your terminal"; + license = lib.licenses.mit; + mainProgram = "fast"; + maintainers = with lib.maintainers; [ yarn ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/fa/fastdds/package.nix b/pkgs/by-name/fa/fastdds/package.nix index d441c4cc9a12..8c6e351de170 100644 --- a/pkgs/by-name/fa/fastdds/package.nix +++ b/pkgs/by-name/fa/fastdds/package.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "fastdds"; - version = "3.6.1"; + version = "3.6.2"; src = fetchFromGitHub { owner = "eProsima"; repo = "Fast-DDS"; rev = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-C9MKfQJ+8XsiSIYaB43j6xmoIyRH7h7sgEyzj1gml/8="; + hash = "sha256-17AxZwYPBhl+AyehWvNYP/if124GcmNfWJOD/yB+tgk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fa/fastfetch-unwrapped/package.nix b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix new file mode 100644 index 000000000000..cae780fd2c07 --- /dev/null +++ b/pkgs/by-name/fa/fastfetch-unwrapped/package.nix @@ -0,0 +1,169 @@ +{ + lib, + stdenv, + fetchFromGitHub, + apple-sdk_15, + chafa, + cmake, + dbus, + dconf, + ddcutil, + enlightenment, + glib, + hwdata, + imagemagick, + libdrm, + libelf, + libglvnd, + libpulseaudio, + libselinux, + libsepol, + libsysprof-capture, + libva, + libvdpau, + libxau, + libxcb, + libxdmcp, + libxext, + libxrandr, + moltenvk, + nix-update-script, + ocl-icd, + opencl-headers, + pcre2, + pkg-config, + python3, + rpm, + sqlite, + util-linux, + versionCheckHook, + vulkan-loader, + wayland, + xfconf, + yyjson, + zfs, + zlib, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fastfetch-unwrapped"; + version = "2.66.0"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "fastfetch-cli"; + repo = "fastfetch"; + tag = finalAttrs.version; + hash = "sha256-ttszEPEywszDGHoYKZYXM2WAUcuOSIj589LeEWxtRaU="; + }; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ + cmake + pkg-config + python3 + ]; + + buildInputs = [ + chafa + imagemagick + sqlite + yyjson + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + dbus + dconf + ddcutil + enlightenment.efl + glib + libdrm + libelf + libglvnd + libpulseaudio + libselinux + libsepol + libsysprof-capture + libva + libvdpau + libxau + libxcb + libxdmcp + libxext + libxrandr + ocl-icd + opencl-headers + pcre2 + rpm + util-linux + vulkan-loader + wayland + xfconf + zfs + zlib + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + moltenvk + ]; + + cmakeFlags = [ + (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") + (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) + (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) + + # Upstream defaults optional feature support to on when the platform allows it. + (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + # Embed these databases instead of referring to hwdata and libdrm at runtime. + (lib.cmakeBool "ENABLE_EMBEDDED_PCIIDS" true) + (lib.cmakeBool "ENABLE_EMBEDDED_AMDGPUIDS" true) + ]; + + # Upstream completions run Python when shells expand options from + # `fastfetch --help-raw`. Keep this runtime dependency explicit until + # upstream generates static completions at build time. + postPatch = '' + substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}' + ''; + + preConfigure = lib.optionalString stdenv.hostPlatform.isLinux '' + buildDir="''${cmakeBuildDir:-build}" + mkdir -p "$buildDir" + cp ${hwdata}/share/hwdata/pci.ids "$buildDir/pci.ids" + cp ${libdrm}/share/libdrm/amdgpu.ids "$buildDir/amdgpu.ids" + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Actively maintained, feature-rich and performance oriented, neofetch like system information tool"; + homepage = "https://github.com/fastfetch-cli/fastfetch"; + changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + defelo + khaneliman + luftmensch-luftmensch + ]; + platforms = lib.platforms.all; + mainProgram = "fastfetch"; + longDescription = '' + Fast and highly customizable system info script. + + This unwrapped build compiles optional feature support but does not wrap + runtime libraries into its closure. + ''; + }; +}) diff --git a/pkgs/by-name/fa/fastfetch/package.nix b/pkgs/by-name/fa/fastfetch/package.nix index 3fc1154db9e1..1225fda67242 100644 --- a/pkgs/by-name/fa/fastfetch/package.nix +++ b/pkgs/by-name/fa/fastfetch/package.nix @@ -1,60 +1,44 @@ { lib, stdenv, - fetchFromGitHub, + runCommand, apple-sdk_15, chafa, - cmake, dbus, dconf, ddcutil, enlightenment, glib, - hwdata, imagemagick, - libxrandr, libdrm, libelf, libglvnd, libpulseaudio, - libselinux, - libsepol, - libsysprof-capture, - libxcb, libva, libvdpau, + libxcb, + libxrandr, makeBinaryWrapper, moltenvk, - nix-update-script, ocl-icd, - opencl-headers, - pcre2, - pkg-config, - python3, rpm, sqlite, - util-linux, - versionCheckHook, vulkan-loader, wayland, xfconf, - libxext, - libxdmcp, - libxau, - yyjson, - zlib, zfs, + zlib, + fastfetch-unwrapped, - fastfetch, - - # Feature flags + # Runtime dependency selectors. fastfetch-unwrapped is always built with support enabled. audioSupport ? true, brightnessSupport ? true, codecSupport ? true, dbusSupport ? true, flashfetchSupport ? false, terminalSupport ? true, - enlightenmentSupport ? true, + # NOTE: disabled by default until lib dependency closure is minimal + enlightenmentSupport ? false, gnomeSupport ? true, imageSupport ? true, openclSupport ? true, @@ -66,280 +50,168 @@ x11Support ? true, xfceSupport ? true, zfsSupport ? false, + + runtimeDependencies ? null, + extraRuntimeDependencies ? [ ], + runtimePrograms ? [ ], + extraRuntimePrograms ? [ ], }: -stdenv.mkDerivation (finalAttrs: { - pname = "fastfetch"; - version = "2.64.2"; - strictDeps = true; - __structuredAttrs = true; +let + unwrapped = fastfetch-unwrapped; - src = fetchFromGitHub { - owner = "fastfetch-cli"; - repo = "fastfetch"; - tag = finalAttrs.version; - hash = "sha256-isSVcmtNglHy7+F3yemGyY8Jnsy3h5mjOnl159CyJ2Q="; - }; - - outputs = [ - "out" - "man" - ]; - - nativeBuildInputs = [ - cmake - makeBinaryWrapper - pkg-config - python3 - ]; - - buildInputs = - let - commonDeps = [ yyjson ]; - - # Cross-platform optional dependencies - imageDeps = lib.optionals imageSupport [ - # Image output as ascii art. - chafa - # Images in terminal using sixel or kitty graphics protocol - imagemagick - ]; - - sqliteDeps = lib.optionals sqliteSupport [ - # linux - Needed for pkg & rpm package count. - # darwin - Used for fast wallpaper detection before macOS Sonoma - sqlite - ]; - - linuxCoreDeps = lib.optionals stdenv.hostPlatform.isLinux ( - [ hwdata ] - # Fallback if both `wayland` and `x11` are not available. AMD GPU properties detection - ++ lib.optional (!x11Support && !waylandSupport) libdrm - ); - - linuxFeatureDeps = lib.optionals stdenv.hostPlatform.isLinux ( - lib.optionals audioSupport [ - # Sound device detection - libpulseaudio - ] - ++ lib.optionals brightnessSupport [ - # Brightness detection of external displays - ddcutil - ] - ++ lib.optionals codecSupport [ - # Hardware-accelerated video codec detection - libva - libvdpau - ] - ++ lib.optionals dbusSupport [ - # Bluetooth, wifi, player & media detection - dbus - ] - ++ lib.optionals enlightenmentSupport [ - # Eet support for reading Enlightenment window manager configuration. - enlightenment.efl - ] - ++ lib.optionals gnomeSupport [ - # Needed for values that are only stored in DConf + Fallback for GSettings. - dconf - glib - # Required by glib messages - libsysprof-capture - pcre2 - # Required by gio messages - libselinux - util-linux - # Required by selinux - libsepol - ] - ++ lib.optionals imageSupport [ - # Faster image output when using kitty graphics protocol. - zlib - ] - ++ lib.optionals openclSupport [ - # OpenCL module - ocl-icd - opencl-headers - ] - ++ lib.optionals openglSupport [ - # OpenGL module - libglvnd - ] - ++ lib.optionals rpmSupport [ - # Slower fallback for rpm package count. Needed on openSUSE. - rpm - ] - ++ lib.optionals terminalSupport [ - # Needed for st terminal font detection. - libelf - ] - ++ lib.optionals vulkanSupport [ - # Vulkan module & fallback for GPU output - vulkan-loader - ] - ++ lib.optionals waylandSupport [ - # Better display performance and output in wayland sessions. Supports different refresh rates per monitor. - wayland - ] - ++ lib.optionals x11Support [ - # At least one of them sould be present in X11 sessions for better display detection and faster WM detection. - # The *randr ones provide multi monitor support The libxcb* ones usually have better performance. - libxrandr - libxcb - # Required by libxcb messages - libxau - libxdmcp - libxext - ] - ++ lib.optionals xfceSupport [ - # Needed for XFWM theme and XFCE Terminal font. - xfconf - ] - ++ lib.optionals zfsSupport [ - # Needed for zpool module - zfs - ] - ); - - macosDeps = lib.optionals stdenv.hostPlatform.isDarwin [ - apple-sdk_15 - moltenvk - ]; - in - commonDeps ++ imageDeps ++ sqliteDeps ++ linuxCoreDeps ++ linuxFeatureDeps ++ macosDeps; - - cmakeFlags = [ - (lib.cmakeOptionType "filepath" "CMAKE_INSTALL_SYSCONFDIR" "${placeholder "out"}/etc") - (lib.cmakeBool "ENABLE_DIRECTX_HEADERS" false) - (lib.cmakeBool "ENABLE_SYSTEM_YYJSON" true) - - # Feature flags - (lib.cmakeBool "BUILD_FLASHFETCH" flashfetchSupport) - - (lib.cmakeBool "ENABLE_IMAGEMAGICK6" false) - (lib.cmakeBool "ENABLE_IMAGEMAGICK7" imageSupport) - (lib.cmakeBool "ENABLE_CHAFA" imageSupport) - - (lib.cmakeBool "ENABLE_SQLITE3" sqliteSupport) - - (lib.cmakeBool "ENABLE_LIBZFS" zfsSupport) - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ - (lib.cmakeBool "ENABLE_PULSE" audioSupport) - - (lib.cmakeBool "ENABLE_VA" codecSupport) - (lib.cmakeBool "ENABLE_VDPAU" codecSupport) - - (lib.cmakeBool "ENABLE_DDCUTIL" brightnessSupport) - - (lib.cmakeBool "ENABLE_DBUS" dbusSupport) - - (lib.cmakeBool "ENABLE_EET" enlightenmentSupport) - - (lib.cmakeBool "ENABLE_ELF" terminalSupport) - - (lib.cmakeBool "ENABLE_GIO" gnomeSupport) - (lib.cmakeBool "ENABLE_DCONF" gnomeSupport) - - (lib.cmakeBool "ENABLE_ZLIB" imageSupport) - - (lib.cmakeBool "ENABLE_OPENCL" openclSupport) - - (lib.cmakeBool "ENABLE_EGL" openglSupport) - (lib.cmakeBool "ENABLE_GLX" openglSupport) - - (lib.cmakeBool "ENABLE_RPM" rpmSupport) - - (lib.cmakeBool "ENABLE_DRM" (!x11Support && !waylandSupport)) - (lib.cmakeBool "ENABLE_DRM_AMDGPU" (!x11Support && !waylandSupport)) - - (lib.cmakeBool "ENABLE_VULKAN" vulkanSupport) - - (lib.cmakeBool "ENABLE_WAYLAND" waylandSupport) - - (lib.cmakeBool "ENABLE_XCB_RANDR" x11Support) - (lib.cmakeBool "ENABLE_XRANDR" x11Support) - - (lib.cmakeBool "ENABLE_XFCONF" xfceSupport) - - (lib.cmakeOptionType "filepath" "CUSTOM_PCI_IDS_PATH" "${hwdata}/share/hwdata/pci.ids") - (lib.cmakeOptionType "filepath" "CUSTOM_AMDGPU_IDS_PATH" "${libdrm}/share/libdrm/amdgpu.ids") - ]; - - postPatch = '' - substituteInPlace completions/fastfetch.{bash,fish,zsh} --replace-fail python3 '${python3.interpreter}' - ''; - - postInstall = '' - wrapProgram $out/bin/fastfetch \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" - '' - + lib.optionalString flashfetchSupport '' - wrapProgram $out/bin/flashfetch \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath finalAttrs.buildInputs}" - ''; - - nativeInstallCheckInputs = [ versionCheckHook ]; - doInstallCheck = true; - - passthru = { - updateScript = nix-update-script { }; - # finalAttrs.finalPackage.override doesn’t exist - minimal = fastfetch.override { - audioSupport = false; - brightnessSupport = false; - codecSupport = false; - dbusSupport = false; - enlightenmentSupport = false; - flashfetchSupport = false; - gnomeSupport = false; - imageSupport = false; - openclSupport = false; - openglSupport = false; - rpmSupport = false; - sqliteSupport = false; - terminalSupport = false; - vulkanSupport = false; - waylandSupport = false; - x11Support = false; - xfceSupport = false; - }; - }; - - meta = { - description = "Actively maintained, feature-rich and performance oriented, neofetch like system information tool"; - homepage = "https://github.com/fastfetch-cli/fastfetch"; - changelog = "https://github.com/fastfetch-cli/fastfetch/releases/tag/${finalAttrs.version}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - luftmensch-luftmensch - khaneliman - defelo + defaultRuntimeDependencies = + lib.optionals imageSupport [ + # Image output as ascii art. + chafa + # Images in terminal using sixel or kitty graphics protocol + imagemagick + ] + ++ lib.optionals sqliteSupport [ + # linux - Needed for pkg & rpm package count. + # darwin - Used for fast wallpaper detection before macOS Sonoma + sqlite + ] + ++ lib.optionals stdenv.hostPlatform.isLinux ( + [ + # DRM display and AMD GPU detection. + libdrm + ] + ++ lib.optionals audioSupport [ + # Sound device detection + libpulseaudio + ] + ++ lib.optionals brightnessSupport [ + # Brightness detection of external displays + ddcutil + ] + ++ lib.optionals codecSupport [ + # Hardware-accelerated video codec detection + libva + libvdpau + ] + ++ lib.optionals dbusSupport [ + # Bluetooth, wifi, player & media detection + dbus + ] + ++ lib.optionals enlightenmentSupport [ + # Eet support for reading Enlightenment window manager configuration. + enlightenment.efl + ] + ++ lib.optionals gnomeSupport [ + # Needed for values that are only stored in DConf + Fallback for GSettings. + dconf + glib + ] + ++ lib.optionals imageSupport [ + # Faster image output when using kitty graphics protocol. + zlib + ] + ++ lib.optionals openclSupport [ + # OpenCL module + ocl-icd + ] + ++ lib.optionals openglSupport [ + # OpenGL module + libglvnd + ] + ++ lib.optionals rpmSupport [ + # Slower fallback for rpm package count. Needed on openSUSE. + rpm + ] + ++ lib.optionals terminalSupport [ + # Needed for st terminal font detection. + libelf + ] + ++ lib.optionals vulkanSupport [ + # Vulkan module & fallback for GPU output + vulkan-loader + ] + ++ lib.optionals waylandSupport [ + # Better display performance and output in wayland sessions. + wayland + ] + ++ lib.optionals x11Support [ + # Better display detection and faster WM detection in X11 sessions. + libxrandr + libxcb + ] + ++ lib.optionals xfceSupport [ + # Needed for XFWM theme and XFCE Terminal font. + xfconf + ] + ++ lib.optionals zfsSupport [ + # Needed for zpool module + zfs + ] + ) + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + apple-sdk_15 + moltenvk ]; - platforms = lib.platforms.all; - mainProgram = "fastfetch"; - longDescription = '' - Fast and highly customizable system info script. - Feature flags (all default to 'true' except rpmSupport, flashfetchSupport and zfsSupport): - * audioSupport: PulseAudio functionality - * brightnessSupport: External display brightness detection via DDCUtil - * codecSupport: Hardware-accelerated video codec detection - * dbusSupport: DBus functionality for Bluetooth, WiFi, player & media detection - * enlightenmentSupport: Enlightenment configuration detection via EFL's Eet - * flashfetchSupport: Build the flashfetch utility (default: false) - * gnomeSupport: GNOME integration (dconf, dbus, gio) - * imageSupport: Image rendering (chafa and imagemagick) - * openclSupport: OpenCL features - * openglSupport: OpenGL features - * rpmSupport: RPM package detection (default: false) - * sqliteSupport: Package counting via SQLite - * terminalSupport: Terminal font detection - * vulkanSupport: Vulkan GPU information and DRM features - * waylandSupport: Wayland display detection - * x11Support: X11 display information - * xfceSupport: XFCE integration for theme and terminal font detection - * zfsSupport: zpool information - ''; - }; -}) + resolvedRuntimeDependencies = + (if runtimeDependencies == null then defaultRuntimeDependencies else runtimeDependencies) + ++ extraRuntimeDependencies; + + resolvedRuntimePrograms = runtimePrograms ++ extraRuntimePrograms; + + runtimeLibraryPath = lib.makeLibraryPath resolvedRuntimeDependencies; + runtimeProgramPath = lib.makeBinPath resolvedRuntimePrograms; +in +runCommand "fastfetch-${unwrapped.version}" + { + pname = "fastfetch"; + inherit (unwrapped) version; # nixpkgs-update: no auto update + + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "man" + ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + passthru = (removeAttrs unwrapped.passthru [ "updateScript" ]) // { + inherit unwrapped; + runtimeDependencies = resolvedRuntimeDependencies; + runtimePrograms = resolvedRuntimePrograms; + minimal = lib.warnOnInstantiate "`fastfetch.minimal` has been renamed to `fastfetch-unwrapped`" unwrapped; + }; + + meta = unwrapped.meta // { + priority = (unwrapped.meta.priority or lib.meta.defaultPriority) - 1; + longDescription = '' + Fast and highly customizable system info script. + + This wrapped package makes optional runtime libraries available to the + full-featured fastfetch-unwrapped binary. + ''; + }; + + preferLocalBuild = true; + } + '' + makeWrapperArgs=(--inherit-argv0) + + if [ -n "${runtimeLibraryPath}" ]; then + makeWrapperArgs+=(--prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}") + fi + + if [ -n "${runtimeProgramPath}" ]; then + makeWrapperArgs+=(--prefix PATH : "${runtimeProgramPath}") + fi + + mkdir -p "$out/bin" + makeWrapper ${unwrapped}/bin/fastfetch "$out/bin/fastfetch" "''${makeWrapperArgs[@]}" + + ${lib.optionalString flashfetchSupport '' + makeWrapper ${unwrapped}/bin/flashfetch "$out/bin/flashfetch" "''${makeWrapperArgs[@]}" + ''} + + ln -s ${unwrapped}/share "$out/share" + + ln -s ${unwrapped.man} "$man" + '' diff --git a/pkgs/by-name/fa/fastly/package.nix b/pkgs/by-name/fa/fastly/package.nix index 2243b8917e38..eb13774b41d7 100644 --- a/pkgs/by-name/fa/fastly/package.nix +++ b/pkgs/by-name/fa/fastly/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "fastly"; - version = "15.2.0"; + version = "15.4.0"; src = fetchFromGitHub { owner = "fastly"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-q75cNedu+loAkntMykfPil7/gd7inrJx5RyWJPq0NE0="; + hash = "sha256-vC3S3PYLtkbobfqUSdgrxcfFxHWN02mEO3YzctMkybU="; # The git commit is part of the `fastly version` original output; # leave that output the same in nixpkgs. Use the `.git` directory # to retrieve the commit SHA, and remove the directory afterwards, @@ -35,7 +35,7 @@ buildGoModule (finalAttrs: { "cmd/fastly" ]; - vendorHash = "sha256-dTu+LFxKrLCXnbBH3QJ3PgbXEEtJ0NUIKfoKuCHWlgQ="; + vendorHash = "sha256-8TM/gprIgItjw9rUAHh6eJ8ZHlbUoB5KyKmFJDM2xlU="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fa/fastmail-desktop/linux.nix b/pkgs/by-name/fa/fastmail-desktop/linux.nix index 98f354809842..b973981b57f1 100644 --- a/pkgs/by-name/fa/fastmail-desktop/linux.nix +++ b/pkgs/by-name/fa/fastmail-desktop/linux.nix @@ -66,9 +66,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { ''; # remove musl-libc dependencies before the autoPatchelfHook - preFixup = '' - rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-x64,sharp-libvips-linuxmusl-x64} - ''; + preFixup = + let + suffix = + { + aarch64-linux = "arm64"; + x86_64-linux = "x64"; + } + .${stdenvNoCC.targetPlatform.system}; + in + '' + rm -r "$out/opt/fastmail/app.asar.unpacked/node_modules/@img/"{sharp-linuxmusl-${suffix},sharp-libvips-linuxmusl-${suffix}} + ''; meta = meta // { mainProgram = "fastmail"; diff --git a/pkgs/by-name/fa/fastmail-desktop/package.nix b/pkgs/by-name/fa/fastmail-desktop/package.nix index ae6f88fdd833..20ad3f4fa7ae 100644 --- a/pkgs/by-name/fa/fastmail-desktop/package.nix +++ b/pkgs/by-name/fa/fastmail-desktop/package.nix @@ -26,6 +26,7 @@ callPackage (if isDarwin then ./darwin.nix else ./linux.nix) { ]; platforms = [ "aarch64-darwin" + "aarch64-linux" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fa/fastmail-desktop/sources.nix b/pkgs/by-name/fa/fastmail-desktop/sources.nix index 374f140afcaf..380636526ff8 100644 --- a/pkgs/by-name/fa/fastmail-desktop/sources.nix +++ b/pkgs/by-name/fa/fastmail-desktop/sources.nix @@ -1,19 +1,26 @@ # Generated by ./update.sh - do not update manually! -# Last updated: 2026-03-23 +# Last updated: 2026-07-11 { fetchurl, fetchzip }: { aarch64-darwin = { - version = "1.2.1"; + version = "1.4.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.2.1-arm64-mac.zip"; - hash = "sha512-bu6IeL8X8ogD1qSlAuApWTBTCYIk5QrjWrzjOv8fel+kqYfCIcDXP1DP1FdJwULe91zoZn4M/uDX8CoOPWa0cA=="; + url = "https://dl.fastmailcdn.com/desktop/production/mac/arm64/Fastmail-1.4.0-arm64-mac.zip"; + hash = "sha512-QyZZu6pwFJ0SkVye0/OtvNTligl6qKsYbpJfdPeHojPj+OqVyV8bavz15Lest+v7ALJhACZ3x+2kBiWa0ZCSow=="; + }; + }; + aarch64-linux = { + version = "1.4.0"; + src = fetchurl { + url = "https://dl.fastmailcdn.com/desktop/production/linux/arm64/com.fastmail.Fastmail-1.4.0-arm64.AppImage"; + hash = "sha512-sw55AwedyijKTXWAAAaSi6sgGMGK0uF4nPtQRacp9VG5EwlC+0wedyO4ax2cWxhsVUSXnk9ngN4mkraSd07vag=="; }; }; x86_64-linux = { - version = "1.2.1"; + version = "1.4.0"; src = fetchurl { - url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.2.1.AppImage"; - hash = "sha512-xudOPNjOaumYxD7yZyjQnYhuiKqDO10cBwMdFJtVEOfHVia0jJMgdUTJx03otIBn9ijM3/1Qo6wsq1HF0A/zlQ=="; + url = "https://dl.fastmailcdn.com/desktop/production/linux/x64/com.fastmail.Fastmail-1.4.0.AppImage"; + hash = "sha512-0hNTRFNAnnLPq19isnaoVlXNl6za4Z5o6yh9ovU564JBMyAjsDNHk8h+2zArSSpydaUky6tIgAUsOhhWrIRtcg=="; }; }; } diff --git a/pkgs/by-name/fa/fastmail-desktop/update.sh b/pkgs/by-name/fa/fastmail-desktop/update.sh index c21c13c3fe7a..4c84120dfefa 100755 --- a/pkgs/by-name/fa/fastmail-desktop/update.sh +++ b/pkgs/by-name/fa/fastmail-desktop/update.sh @@ -6,15 +6,19 @@ set -euo pipefail cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")" x86_64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/x64/latest-linux.yml") +aarch64_linux_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/linux/arm64/latest-linux-arm64.yml") aarch64_darwin_info=$(curl -fsS "https://dl.fastmailcdn.com/desktop/production/mac/arm64/latest-mac.yml") x86_64_linux_version=$(yq -r '.version' <<<"$x86_64_linux_info") +aarch64_linux_version=$(yq -r '.version' <<<"$aarch64_linux_info") aarch64_darwin_version=$(yq -r '.version' <<<"$aarch64_darwin_info") x86_64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/x64/$(yq -r '.path' <<<"$x86_64_linux_info")" +aarch64_linux_url="https://dl.fastmailcdn.com/desktop/production/linux/arm64/$(yq -r '.path' <<<"$aarch64_linux_info")" aarch64_darwin_url="https://dl.fastmailcdn.com/desktop/production/mac/arm64/$(yq -r '.path' <<<"$aarch64_darwin_info")" x86_64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$x86_64_linux_info")") +aarch64_linux_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_linux_info")") aarch64_darwin_hash=$(nix-hash --type sha512 --to-sri "$(yq -r '.sha512' <<<"$aarch64_darwin_info")") cat >sources.nix <sources.nix <@ gcc -E -@' -i GNUmakefile - sed -e 's@$(HAVE_LINUX_FB_H)@yes@' -i GNUmakefile - ''; - meta = { description = "Image viewing and manipulation programs including fbi, fbgs, ida, exiftran and thumbnail.cgi"; homepage = "https://www.kraxel.org/blog/linux/fbida/"; + downloadPage = "https://gitlab.com/kraxel/fbida/"; + changelog = "https://gitlab.com/kraxel/fbida/-/blob/${finalAttrs.src.tag}/Changes?ref_type=tags"; license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ pSub ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fc/fceux/package.nix b/pkgs/by-name/fc/fceux/package.nix index 4cf042e1d37d..659c2398c982 100644 --- a/pkgs/by-name/fc/fceux/package.nix +++ b/pkgs/by-name/fc/fceux/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.fceux.com"; description = "Nintendo Entertainment System (NES) Emulator"; changelog = "https://github.com/TASEmulators/fceux/blob/${finalAttrs.src.rev}/changelog.txt"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "fceux"; maintainers = with lib.maintainers; [ kuflierl ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fc/fcitx5-chewing/package.nix b/pkgs/by-name/fc/fcitx5-chewing/package.nix index f1f53547f01e..613fd355c34b 100644 --- a/pkgs/by-name/fc/fcitx5-chewing/package.nix +++ b/pkgs/by-name/fc/fcitx5-chewing/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-chewing"; - version = "5.1.11"; + version = "5.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-zOaXQUIW9+kOae2hajtnKLNmtlhZLuFAb+nts9gmivQ="; + hash = "sha256-WBCaknT1woPRmnxQP8WhJUodM5jTXYg3QP6trFw37gg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-gtk/package.nix b/pkgs/by-name/fc/fcitx5-gtk/package.nix index 603be1cd5e7f..1c51d18be6c4 100644 --- a/pkgs/by-name/fc/fcitx5-gtk/package.nix +++ b/pkgs/by-name/fc/fcitx5-gtk/package.nix @@ -28,13 +28,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-4v3XWXXlTYOO2/SKnEBTr5WsGxqFLjsPgCE7goVrFGY="; + hash = "sha256-ddXMkk1pQhFCOSzDbRWi/VDWtxqqKhMM4AnVFBGCOyA="; }; outputs = [ diff --git a/pkgs/by-name/fc/fcitx5-hangul/package.nix b/pkgs/by-name/fc/fcitx5-hangul/package.nix index 47dcd7b3e634..3e88529b78c0 100644 --- a/pkgs/by-name/fc/fcitx5-hangul/package.nix +++ b/pkgs/by-name/fc/fcitx5-hangul/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-hangul"; - version = "5.1.9"; + version = "5.1.10"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-zxq/nINxLvhZCcndNyAUAOY74npFXcYUR78TlZVyRUk="; + hash = "sha256-ZeBTJ9SllLSVHt7kJOQL+q2SGjQkyYqD5SCXWj1QojE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-lotus/package.nix b/pkgs/by-name/fc/fcitx5-lotus/package.nix new file mode 100644 index 000000000000..64c578ad4f57 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-lotus/package.nix @@ -0,0 +1,121 @@ +{ + lib, + stdenv, + acl, + buildGoModule, + cmake, + fcitx5, + fetchFromGitHub, + gettext, + go, + hicolor-icon-theme, + kdePackages, + libinput, + libx11, + nix-update-script, + pkg-config, + python3, + qt6, + udev, +}: + +let + pythonEnv = python3.withPackages ( + ps: with ps; [ + dbus-python + pyqt6 + qtpy + ] + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "fcitx5-lotus"; + version = "3.4.0"; + + src = fetchFromGitHub { + owner = "LotusInputMethod"; + repo = "fcitx5-lotus"; + rev = "v${finalAttrs.version}"; + hash = "sha256-MN83U0/o+vDGCxpYgFxfXAf+Iw59OaXyB7770ppLmEQ="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + gettext + go + hicolor-icon-theme + kdePackages.extra-cmake-modules + pkg-config + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + acl + fcitx5 + kdePackages.extra-cmake-modules + libinput + libx11 + pythonEnv + qt6.qtbase + udev + ]; + + strictDeps = true; + __structuredAttrs = true; + + dontWrapQtApps = true; + + vendorDir = + (buildGoModule { + pname = "fcitx5-lotus-go-modules"; + inherit (finalAttrs) version src; + modRoot = "bamboo"; + vendorHash = "sha256-HjVMGil4bNMTFifxFYtHELdkeKhrumHGrde4msbxvJc="; + }).goModules; + + preConfigure = '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + + rm -rf bamboo/vendor + cp -r $vendorDir bamboo/vendor + ''; + + postPatch = '' + substituteInPlace src/lotus-monitor.cpp \ + --replace-fail 'strcmp(exe_path, "/usr/bin/fcitx5-lotus-server") == 0' \ + '(strncmp(exe_path, "/nix/store/", 11) == 0 && strlen(exe_path) >= 24 && strcmp(exe_path + strlen(exe_path) - 24, "/bin/fcitx5-lotus-server") == 0)' + + substituteInPlace server/lotus-server.cpp \ + --replace-fail 'strcmp(exe_path, "/usr/bin/fcitx5") == 0' \ + '(strncmp(exe_path, "/nix/store/", 11) == 0 && strlen(exe_path) >= 11 && strcmp(exe_path + strlen(exe_path) - 11, "/bin/fcitx5") == 0)' + ''; + + postInstall = '' + substituteInPlace $out/lib/udev/rules.d/99-lotus.rules \ + --replace-fail "/usr/bin/setfacl" "${acl}/bin/setfacl" + + substituteInPlace $out/lib/systemd/system/fcitx5-lotus-server@.service \ + --replace-fail "/usr/bin/setfacl" "${acl}/bin/setfacl" \ + --replace-fail "/usr/bin/fcitx5-lotus-server" "$out/bin/fcitx5-lotus-server" + ''; + + postFixup = '' + patchShebangs $out/share/fcitx5-lotus/settings-gui + wrapQtApp $out/bin/fcitx5-lotus-settings + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Vietnamese input method engine for Fcitx5"; + homepage = "https://github.com/LotusInputMethod/fcitx5-lotus"; + license = with lib.licenses; [ + gpl3Plus + lgpl21Plus + ]; + maintainers = with lib.maintainers; [ imcvampire ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-lua/package.nix b/pkgs/by-name/fc/fcitx5-lua/package.nix index 9b3ffe06eff8..4be767a17220 100644 --- a/pkgs/by-name/fc/fcitx5-lua/package.nix +++ b/pkgs/by-name/fc/fcitx5-lua/package.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "fcitx5-lua"; - version = "5.0.16"; + version = "5.0.17"; __structuredAttrs = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "fcitx"; repo = "fcitx5-lua"; tag = finalAttrs.version; - hash = "sha256-df0BjORGT+zx/8kg/nGPDa9MBAXpPtdfx8S5O+E31wE="; + hash = "sha256-uEWa1wprWT8vDSHKXHUHEmXBtNHgj94hFuKvBm5GXqc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix index 87e68113e450..6fd6305e504a 100644 --- a/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix +++ b/pkgs/by-name/fc/fcitx5-pinyin-moegirl/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "fcitx5-pinyin-moegirl"; - version = "20260511"; + version = "20260713"; src = fetchurl { url = "https://github.com/outloudvi/mw2fcitx/releases/download/${finalAttrs.version}/moegirl.dict"; - hash = "sha256-H9SZRkwZJZ9LMDiyfXXZm8zCq3E3CjbSCBePjf1pPd4="; + hash = "sha256-ZmpTcolKTjJBino+zkVK6hBv/+yllAiBiR6Jy4SBdVs="; }; dontUnpack = true; diff --git a/pkgs/by-name/fc/fcitx5-rime/package.nix b/pkgs/by-name/fc/fcitx5-rime/package.nix index 9083c8873d56..88a22ff45168 100644 --- a/pkgs/by-name/fc/fcitx5-rime/package.nix +++ b/pkgs/by-name/fc/fcitx5-rime/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "fcitx5-rime"; - version = "5.1.13"; + version = "5.1.14"; src = fetchurl { url = "https://download.fcitx-im.org/fcitx5/${pname}/${pname}-${version}.tar.zst"; - hash = "sha256-KB4IOLq6mRB1ZnOPg4Avpk6vp29xbLkDGYXvCdtrjA8="; + hash = "sha256-dHiBH74dTnzabm23TrDAXV/oHSGMqdyBtrf0uyuwjWI="; }; cmakeFlags = [ diff --git a/pkgs/by-name/fc/fcitx5-sitelen-pona/package.nix b/pkgs/by-name/fc/fcitx5-sitelen-pona/package.nix new file mode 100644 index 000000000000..37eeac3c53c7 --- /dev/null +++ b/pkgs/by-name/fc/fcitx5-sitelen-pona/package.nix @@ -0,0 +1,73 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + libime, + fcitx5, + qt6Packages, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "fcitx5-sitelen-pona"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "Toastberries"; + repo = "fcitx5-sitelen-pona"; + tag = "v${finalAttrs.version}"; + hash = "sha256-/pauEuE+hNdWhAz4CnSqySnF0h1toNGngHKOO9ntDnY="; + }; + + strictDeps = true; + + nativeBuildInputs = [ libime ]; + + buildInputs = [ + fcitx5 + qt6Packages.fcitx5-chinese-addons + ]; + + buildPhase = '' + runHook preBuild + + mkdir -p fcitx5/table + for file in table_sources/*; do + libime_tabledict "$file" "fcitx5/table/$(basename "$file" .txt).dict" + done + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/fcitx5 + cp -r fcitx5/{inputmethod,punctuation,table} "$out/share/fcitx5/" + + mkdir -p $out/share/icons/hicolor/scalable/status + for icon in icons/*; do + install -Dm644 "$icon" "$out/share/icons/hicolor/scalable/status/fcitx5-$(basename "$icon")" + done + + runHook postInstall + ''; + + __structuredAttrs = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + inherit (fcitx5.meta) platforms; + description = "IME using Fcitx5 for writing toki pona's sitelen pona glyphs"; + longDescription = '' + This tool is an IME using Fcitx5 + With it, you can easily write toki pona's sitelen pona glyphs + Simply type your words in latin characters, and they'll be changed into sitelen pona + ''; + homepage = "https://github.com/Toastberries/fcitx5-sitelen-pona"; + changelog = "https://github.com/Toastberries/fcitx5-sitelen-pona/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ssnoer ]; + }; +}) diff --git a/pkgs/by-name/fc/fcitx5-table-extra/package.nix b/pkgs/by-name/fc/fcitx5-table-extra/package.nix index 6059b4546e21..fc7a71845f72 100644 --- a/pkgs/by-name/fc/fcitx5-table-extra/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-extra/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-extra"; - version = "5.1.11"; + version = "5.1.12"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-Oigygr486SNYssre8rMDRDzn28hVI8pabm+0/eoR94Y="; + hash = "sha256-PNljzjvT5WWoEPH7HbOcO9lDRkZHqiNXbaCifBKw5LI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-table-other/package.nix b/pkgs/by-name/fc/fcitx5-table-other/package.nix index 113a18ae2ede..427261053431 100644 --- a/pkgs/by-name/fc/fcitx5-table-other/package.nix +++ b/pkgs/by-name/fc/fcitx5-table-other/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-table-other"; - version = "5.1.6"; + version = "5.1.7"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-hqFui1Ycxih7I7VjUjfJe6V5I9RyamyNi6aZKcWGrWU="; + hash = "sha256-PoYDy0p/vflwVr5yCox2uSvr4ir6k2Yn1AQHmTw03Zk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fc/fcitx5-tokyonight/package.nix b/pkgs/by-name/fc/fcitx5-tokyonight/package.nix index ad36f5b5146b..3f6d551a58da 100644 --- a/pkgs/by-name/fc/fcitx5-tokyonight/package.nix +++ b/pkgs/by-name/fc/fcitx5-tokyonight/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation { version = "0-unstable-2024-01-28"; src = fetchFromGitHub { - owner = "ch3n9w"; + owner = "ch4xer"; repo = "fcitx5-Tokyonight"; rev = "f7454ab387d6b071ee12ff7ee819f0c7030fdf2c"; hash = "sha256-swOy0kDZUdqtC2sPSZEBLnHSs8dpQ/QfFMObI6BARfo="; @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Fcitx5 theme based on Tokyo Night color"; - homepage = "https://github.com/ch3n9w/fcitx5-Tokyonight"; + homepage = "https://github.com/ch4xer/fcitx5-Tokyonight"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ Guanran928 ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/fc/fcitx5/package.nix b/pkgs/by-name/fc/fcitx5/package.nix index 6ac5d9b7b750..d2b0dd7b63e2 100644 --- a/pkgs/by-name/fc/fcitx5/package.nix +++ b/pkgs/by-name/fc/fcitx5/package.nix @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.1.19"; + version = "5.1.21"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - hash = "sha256-ZsGRVuUpWIJnsSqcAQcerxvwWIRaGdAO2FM1k3D3g0M="; + hash = "sha256-IR5mKOsVJ/GPL2czdztLVXGJTNk1JXnWpzmqC/UIwuw="; fetchSubmodules = true; }; @@ -61,13 +61,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake - kdePackages.extra-cmake-modules pkg-config wayland-scanner gettext ]; buildInputs = [ + kdePackages.plasma-wayland-protocols kdePackages.extra-cmake-modules expat isocodes diff --git a/pkgs/by-name/fc/fcppt/package.nix b/pkgs/by-name/fc/fcppt/package.nix index df48ce23a374..4d94ebee34b1 100644 --- a/pkgs/by-name/fc/fcppt/package.nix +++ b/pkgs/by-name/fc/fcppt/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "5.0.0"; src = fetchFromGitHub { - owner = "freundlich"; + owner = "cpreh"; repo = "fcppt"; rev = finalAttrs.version; hash = "sha256-8dBG6LdSngsutBboqb3WVVg3ylayoUYDOJV6p/ZFkoE="; diff --git a/pkgs/by-name/fd/fdk-aac-encoder/package.nix b/pkgs/by-name/fd/fdk-aac-encoder/package.nix index c56e2f12d519..bd1c8017619d 100644 --- a/pkgs/by-name/fd/fdk-aac-encoder/package.nix +++ b/pkgs/by-name/fd/fdk-aac-encoder/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fdkaac"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "nu774"; repo = "fdkaac"; rev = "v${finalAttrs.version}"; - hash = "sha256-Yx+adbWs1qmuK+geHjCj7i56URDLVrUdLbJ2gKrJ1Oo="; + hash = "sha256-8fI3mbHPb6E5YXl4RaqU8P0ALldkOh+RKfecDX87m/s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fd/fdroidserver/package.nix b/pkgs/by-name/fd/fdroidserver/package.nix index b8cf0d26d0f3..db8439b21d1a 100644 --- a/pkgs/by-name/fd/fdroidserver/package.nix +++ b/pkgs/by-name/fd/fdroidserver/package.nix @@ -7,14 +7,7 @@ installShellFiles, }: -let - pythonPackages = python3Packages.overrideScope ( - self: super: { - sqlalchemy = self.sqlalchemy_1_4; - } - ); -in -pythonPackages.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "fdroidserver"; version = "2.4.3"; @@ -43,7 +36,7 @@ pythonPackages.buildPythonApplication (finalAttrs: { ''; preConfigure = '' - ${pythonPackages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog + ${python3Packages.python.pythonOnBuildForHost.interpreter} setup.py compile_catalog ''; postInstall = '' @@ -55,19 +48,19 @@ pythonPackages.buildPythonApplication (finalAttrs: { nativeBuildInputs = [ installShellFiles ]; - build-system = with pythonPackages; [ + build-system = with python3Packages; [ setuptools babel ]; - dependencies = with pythonPackages; [ + dependencies = with python3Packages; [ androguard biplist clint defusedxml gitpython libcloud - libvirt + libvirt-python magic mwclient oscrypto diff --git a/pkgs/by-name/fe/feather-tk/package.nix b/pkgs/by-name/fe/feather-tk/package.nix index 01e3d32a0085..e91d5a8c87e6 100644 --- a/pkgs/by-name/fe/feather-tk/package.nix +++ b/pkgs/by-name/fe/feather-tk/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.4.0"; src = fetchFromGitHub { - owner = "darbyjohnston"; + owner = "grizzlypeak3d"; repo = "feather-tk"; tag = finalAttrs.version; hash = "sha256-hcV99y14o3YFUtKDLEKaR7MxBB3pBdd3sferrYvtvYw="; @@ -90,12 +90,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Lightweight toolkit for building cross-platform applications"; - homepage = "https://github.com/darbyjohnston/feather-tk"; + homepage = "https://github.com/grizzlypeak3d/feather-tk"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ liberodark ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; badPlatforms = [ - # Broken on darwin with latest SDK, see https://github.com/darbyjohnston/feather-tk/issues/1 + # Broken on darwin with latest SDK, see https://github.com/grizzlypeak3d/feather-tk/issues/1 lib.systems.inspect.patterns.isDarwin ]; }; diff --git a/pkgs/by-name/fe/featherpad/package.nix b/pkgs/by-name/fe/featherpad/package.nix index 58b30ae6fde4..aaa315bd7265 100644 --- a/pkgs/by-name/fe/featherpad/package.nix +++ b/pkgs/by-name/fe/featherpad/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "featherpad"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "tsujan"; repo = "FeatherPad"; tag = "V${finalAttrs.version}"; - hash = "sha256-h/Opw4PmIEZdIx+gXoXriA0h1YxyImiZJFFPr1KUo/A="; + hash = "sha256-BPZkVmOxVJ8VoQ9+0Ca63pDIOfdwsaO24AEq0jkYCY0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fe/febio-studio/package.nix b/pkgs/by-name/fe/febio-studio/package.nix index 4b96436c4fbb..4e8f0c929665 100644 --- a/pkgs/by-name/fe/febio-studio/package.nix +++ b/pkgs/by-name/fe/febio-studio/package.nix @@ -77,9 +77,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "FEBio Suite Solver"; mainProgram = "FEBioStudio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ Scriptkiddi ]; }; }) diff --git a/pkgs/by-name/fe/febio/package.nix b/pkgs/by-name/fe/febio/package.nix index c7c2604d7ed1..96acb051ab6c 100644 --- a/pkgs/by-name/fe/febio/package.nix +++ b/pkgs/by-name/fe/febio/package.nix @@ -50,9 +50,9 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software tool for nonlinear finite element analysis in biomechanics and biophysics"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://febio.org/"; platforms = lib.platforms.unix; - maintainers = [ ]; + maintainers = with lib.maintainers; [ Scriptkiddi ]; }; }) diff --git a/pkgs/by-name/fe/fedimint/package.nix b/pkgs/by-name/fe/fedimint/package.nix index 86dfd656f004..6b6e350358f2 100644 --- a/pkgs/by-name/fe/fedimint/package.nix +++ b/pkgs/by-name/fe/fedimint/package.nix @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Federated E-Cash Mint"; homepage = "https://github.com/fedimint/fedimint"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ dpc ]; mainProgram = "fedimint-cli"; }; diff --git a/pkgs/by-name/fe/fedistar/package.nix b/pkgs/by-name/fe/fedistar/package.nix index 23c2bdd8d00d..9fa5a85d025d 100644 --- a/pkgs/by-name/fe/fedistar/package.nix +++ b/pkgs/by-name/fe/fedistar/package.nix @@ -20,25 +20,25 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fedistar"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "h3poteto"; repo = "fedistar"; tag = "v${finalAttrs.version}"; - hash = "sha256-Q2IfWeMV6yvmCmKBc/iufO28DyIIlj50wp9A7LbQcIY="; + hash = "sha256-MV2ItwIBzDEY2tKI8WrQj+rAzv6OTC2aZMiD46oLHFw="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = "src-tauri"; - cargoHash = "sha256-eYPvG07V0DKPQfs6g+oayDcF3Xn74Aq52ZA+psyoSnY="; + cargoHash = "sha256-Ac7u/u0kGlUwKF5/196Ss4+pUMyPhAbGqhlmtlYI2Us="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-GnVBCrBCnS0Tl9jZu3poIZZJO2SRdlS8jOYUE9G+BFM="; + hash = "sha256-JaFXAYHoSMyNgHjeNWgJXJ8ZeU9wUi47N58L3QEd0FE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fe/feedbackd-device-themes/package.nix b/pkgs/by-name/fe/feedbackd-device-themes/package.nix index 78deacafd2a5..02cd3b68cc7b 100644 --- a/pkgs/by-name/fe/feedbackd-device-themes/package.nix +++ b/pkgs/by-name/fe/feedbackd-device-themes/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - (lib.mesonOption "validate" (if finalAttrs.doCheck then "enabled" else "disabled")) + (lib.mesonOption "validate" (if finalAttrs.finalPackage.doCheck then "enabled" else "disabled")) ]; doCheck = true; diff --git a/pkgs/by-name/fe/feishin/package.nix b/pkgs/by-name/fe/feishin/package.nix index 4e2f82063d42..0ecd436e621c 100644 --- a/pkgs/by-name/fe/feishin/package.nix +++ b/pkgs/by-name/fe/feishin/package.nix @@ -4,56 +4,63 @@ buildNpmPackage, fetchFromGitHub, electron_41, - dart-sass, mpv-unwrapped, fetchPnpmDeps, pnpmConfigHook, - pnpm_10_29_2, + pnpm_11, + nodejs-slim_latest, darwin, actool, copyDesktopItems, makeDesktopItem, nix-update-script, + webVersion ? false, }: let pname = "feishin"; - version = "1.13.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "jeffvli"; repo = "feishin"; tag = "v${version}"; - hash = "sha256-v6dWzEB1+IK4bHmDo8Rr5e0Xi3OWKcm+UPBmBiSfdZ0="; + hash = "sha256-2UKJBUZNUpUUZIG1JFXok7YJdzqt+Ge0ykHUm8BeNcw="; }; electron = electron_41; + + # Fix pnpm issue on darwin https://github.com/NixOS/nixpkgs/issues/525627 + pnpm = pnpm_11.override { nodejs-slim = nodejs-slim_latest; }; in buildNpmPackage { inherit pname version; inherit src; + __structuredAttrs = true; + npmConfigHook = pnpmConfigHook; + npmBuildScript = if webVersion then "build:web" else "build"; npmDeps = null; pnpmDeps = fetchPnpmDeps { inherit pname + pnpm version src ; - pnpm = pnpm_10_29_2; - fetcherVersion = 3; - hash = "sha256-zNOGJ24G0xcgsGK4DmbBm7d1PHTp7IJS+RTALGRtfDg="; + fetcherVersion = 4; + hash = "sha256-9uG0AxIBAmuIPywg3p9fFCXmRvM9zDLhWfluSLRnUXY="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; nativeBuildInputs = [ - pnpm_10_29_2 + pnpm ] - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ copyDesktopItems ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ + ++ lib.optionals (stdenv.hostPlatform.isLinux && !webVersion) [ copyDesktopItems ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin && !webVersion) [ darwin.autoSignDarwinBinariesHook actool ]; @@ -64,16 +71,7 @@ buildNpmPackage { --replace-fail '"postinstall": "electron-builder install-app-deps",' "" ''; - preBuild = '' - rm -r node_modules/.pnpm/sass-embedded-* - - test -d node_modules/.pnpm/sass-embedded@* - dir="$(echo node_modules/.pnpm/sass-embedded@*)/node_modules/sass-embedded/dist/lib/src/vendor/dart-sass" - mkdir -p "$dir" - ln -s ${dart-sass}/bin/dart-sass "$dir"/sass - ''; - - postBuild = '' + postBuild = lib.optionalString (!webVersion) '' cp -r ${electron.dist} electron-dist chmod -R u+w electron-dist @@ -88,14 +86,18 @@ buildNpmPackage { installPhase = '' runHook preInstall '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' + + lib.optionalString webVersion '' + mkdir -p $out + cp -r out/web/* $out + '' + + lib.optionalString (stdenv.hostPlatform.isDarwin && !webVersion) '' mkdir -p $out/{Applications,bin} cp -r dist/**/Feishin.app $out/Applications/ makeWrapper $out/Applications/Feishin.app/Contents/MacOS/Feishin $out/bin/feishin \ --prefix PATH : "${lib.makeBinPath [ mpv-unwrapped ]}" \ --set DISABLE_AUTO_UPDATES 1 '' - + lib.optionalString stdenv.hostPlatform.isLinux '' + + lib.optionalString (stdenv.hostPlatform.isLinux && !webVersion) '' mkdir -p $out/share/feishin pushd dist/*-unpacked/ @@ -126,7 +128,7 @@ buildNpmPackage { runHook postInstall ''; - desktopItems = [ + desktopItems = lib.optionals (!webVersion) [ (makeDesktopItem { name = "feishin"; desktopName = "Feishin"; @@ -152,11 +154,11 @@ buildNpmPackage { sourceProvenance = with lib.sourceTypes; [ fromSource ]; license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; - mainProgram = "feishin"; maintainers = with lib.maintainers; [ BatteredBunny onny jlbribeiro ]; - }; + } + // lib.optionalAttrs (!webVersion) { mainProgram = "feishin"; }; } diff --git a/pkgs/by-name/fe/feishu-cli/package.nix b/pkgs/by-name/fe/feishu-cli/package.nix index 939523e02ce0..73d830b8c7ec 100644 --- a/pkgs/by-name/fe/feishu-cli/package.nix +++ b/pkgs/by-name/fe/feishu-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "feishu-cli"; - version = "1.29.0"; + version = "1.35.0"; src = fetchFromGitHub { owner = "riba2534"; repo = "feishu-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-oaq0/+tUK2eWX+8BEGk/oAN4eIxZ9/qW6pildPxZPRw="; + hash = "sha256-0FEVwpONZcN2DsYVzlY5EDsQwN81DjP9Xc857ro4quw="; }; - vendorHash = "sha256-HzyP2IZL+lNgf9n7A1681lfWcH6eAb6IrqPWvAsq25Q="; + vendorHash = "sha256-vRefU38o9Q4Q96aXoUXUggcRsfQePjlUrSsNERJH3YU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fe/fence/package.nix b/pkgs/by-name/fe/fence/package.nix index d71b14fe1a0f..94998281cf30 100644 --- a/pkgs/by-name/fe/fence/package.nix +++ b/pkgs/by-name/fe/fence/package.nix @@ -14,16 +14,16 @@ buildGoModule (finalAttrs: { pname = "fence"; - version = "0.1.60"; + version = "0.1.62"; src = fetchFromGitHub { owner = "fencesandbox"; repo = "fence"; tag = "v${finalAttrs.version}"; - hash = "sha256-4yRfU6fCTGOcA9IeFs9Sk9n1PqXi7E++reVDPlCwS1k="; + hash = "sha256-uJfQFOKR3f8OjzA1z18IeKvhAgTmQQ7o4Y7K4CFbwko="; }; - vendorHash = "sha256-rZ+ArTdr5GbW+nRzglNgxzsXjuTlTA0uInNWXgAVurM="; + vendorHash = "sha256-aMxay3dow6mDKyv396R0j1GOKDmhkX4ebGmhca1B4WE="; __structuredAttrs = true; diff --git a/pkgs/by-name/fe/fermyon-spin/package.nix b/pkgs/by-name/fe/fermyon-spin/package.nix index 1cd21ccad6bb..83735f7ba65b 100644 --- a/pkgs/by-name/fe/fermyon-spin/package.nix +++ b/pkgs/by-name/fe/fermyon-spin/package.nix @@ -14,23 +14,21 @@ let { x86_64-linux = "linux-amd64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "macos-amd64"; aarch64-darwin = "macos-aarch64"; } .${system} or (throw "Unsupported system: ${system}"); packageHashes = { - x86_64-linux = "sha256-L0Jwo4jY/HhRJGVtKWJ5qdZY+7y59bZClry86f87Snw="; - aarch64-linux = "sha256-wCUt6cDAohU8kG3uII/u9gP3K6uVssGnAS1QP0B/kgE="; - x86_64-darwin = "sha256-G7G9hzhtL1ILQTS96qEoZU//yVozvyFjnGT8Vot4pbk="; - aarch64-darwin = "sha256-xwXeiyWMrN7iXk2e4m7PQmcgtLcUgHt67xShBGmn3Mk="; + x86_64-linux = "sha256-eVI8/JNCTVVbNJPH6gfg+0guH9mXLymoO+oLp9dkvwA="; + aarch64-linux = "sha256-84ESEqr07JxqcxxRWrUFKmS+Uvws3RsVtC9EgXqCqdw="; + aarch64-darwin = "sha256-0WpDjZJhw/jB55G5IUdgvwOaYlqRCY5itk5sVjogYn4="; }; packageHash = packageHashes.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation (finalAttrs: { pname = "fermyon-spin"; - version = "3.6.3"; + version = "4.0.2"; # Use fetchurl rather than fetchzip as these tarballs are built by the project # and not by GitHub (and thus are stable) - this simplifies the update script @@ -69,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Framework for building, deploying, and running fast, secure, and composable cloud microservices with WebAssembly"; homepage = "https://github.com/spinframework/spin"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "spin"; maintainers = [ ]; platforms = builtins.attrNames packageHashes; diff --git a/pkgs/by-name/fe/fermyon-spin/update.py b/pkgs/by-name/fe/fermyon-spin/update.py index 2a2129a5926e..7fbff7d295f2 100755 --- a/pkgs/by-name/fe/fermyon-spin/update.py +++ b/pkgs/by-name/fe/fermyon-spin/update.py @@ -7,7 +7,6 @@ from os.path import join, dirname # We set oldHash and newHash fields in the inner dict later. systems = { "x86_64-linux": {"os": "linux", "arch": "amd64"}, - "x86_64-darwin": {"os": "macos", "arch": "amd64"}, "aarch64-linux": {"os": "linux", "arch": "aarch64"}, "aarch64-darwin": {"os": "macos", "arch": "aarch64"}, } diff --git a/pkgs/by-name/fe/ferrishot/package.nix b/pkgs/by-name/fe/ferrishot/package.nix index 11aba642b5d7..24e2f8156e6e 100644 --- a/pkgs/by-name/fe/ferrishot/package.nix +++ b/pkgs/by-name/fe/ferrishot/package.nix @@ -19,7 +19,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "nik-rev"; - repo = "ferrishot"; + repo = "peashot"; tag = "v${finalAttrs.version}"; hash = "sha256-QnIHLkxqL/4s6jgIbGmzR5tqCjH7yJcfpx0AhdxqVKc="; }; @@ -60,8 +60,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Screenshot app written in Rust"; - homepage = "https://github.com/nik-rev/ferrishot"; - changelog = "https://github.com/nik-rev/ferrishot/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/nik-rev/peashot"; + changelog = "https://github.com/nik-rev/peashot/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "ferrishot"; diff --git a/pkgs/by-name/fe/ferron/package.nix b/pkgs/by-name/fe/ferron/package.nix index af4b2e43c3cb..e2b95ff542e6 100644 --- a/pkgs/by-name/fe/ferron/package.nix +++ b/pkgs/by-name/fe/ferron/package.nix @@ -10,13 +10,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ferron"; - version = "2.7.0"; + version = "2.8.1"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "ferronweb"; repo = "ferron"; tag = finalAttrs.version; - hash = "sha256-nh3dq8s+lH+WbFviFZ9L+4MF4YhGPaJWTYtH12HfXoI="; + hash = "sha256-69rCgyUjEbInTmgZMU6uNuahaqSVcaIOWFVSGC9in28="; }; # ../../ is cargoDepsCopy, and obviously does not contain monoio's README.md @@ -25,9 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '#![doc = include_str!("../../README.md")]' "" ''; - strictDeps = true; - - cargoHash = "sha256-ft7Ewv56u31iPCH3LJKE4Mt68KTfHtIiYMRjeGcwSQQ="; + cargoHash = "sha256-H6AMHYlUdlCFAzOcso5V7uagB1Is304TuXR6+IrqWOU="; nativeBuildInputs = [ pkg-config @@ -53,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Fast, memory-safe web server written in Rust"; homepage = "https://github.com/ferronweb/ferron"; - changelog = "https://github.com/ferronweb/ferron/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/ferronweb/ferron/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ _0x4A6F diff --git a/pkgs/by-name/fe/fet-sh/package.nix b/pkgs/by-name/fe/fet-sh/package.nix index b25c819b79f2..91c7dcd1e1e9 100644 --- a/pkgs/by-name/fe/fet-sh/package.nix +++ b/pkgs/by-name/fe/fet-sh/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec { version = "1.9"; src = fetchFromGitHub { - owner = "6gk"; + owner = "eepykate"; repo = "fet.sh"; rev = "v${version}"; sha256 = "sha256-xhX2nVteC3T3IjQh++mYlm0btDJQbyQa6b8sGualV0E="; @@ -25,7 +25,7 @@ stdenvNoCC.mkDerivation rec { meta = { description = "Fetch written in posix shell without any external commands"; - homepage = "https://github.com/6gk/fet.sh"; + homepage = "https://github.com/eepykate/fet.sh"; license = lib.licenses.isc; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ elkowar ]; diff --git a/pkgs/by-name/fe/fetch/package.nix b/pkgs/by-name/fe/fetch/package.nix new file mode 100644 index 000000000000..13e80e78d502 --- /dev/null +++ b/pkgs/by-name/fe/fetch/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromGitHub, + # linux dependencies + makeWrapper, + fastfetch, + pciutils, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "fetch"; + version = "2.1.0"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "areofyl"; + repo = "fetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-9ixx7XJcY4ktcN/lUfjvFljvHIEO2ktOebeGgL0ulHg="; + }; + + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + nativeBuildInputs = [ makeWrapper ]; + postInstall = '' + wrapProgram $out/bin/fetch \ + --prefix PATH : ${ + lib.makeBinPath [ + fastfetch + pciutils + ] + } + ''; + + meta = { + description = "Animated 3D fetch tool that renders your distro logo as a spinning bas-relief"; + homepage = "https://github.com/areofyl/fetch"; + changelog = "https://github.com/areofyl/fetch/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.isc; + maintainers = with lib.maintainers; [ ghastrum ]; + mainProgram = "fetch"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fe/fetchmail/package.nix b/pkgs/by-name/fe/fetchmail/package.nix index 29a4776a4538..1f1c727728aa 100644 --- a/pkgs/by-name/fe/fetchmail/package.nix +++ b/pkgs/by-name/fe/fetchmail/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "fetchmail"; - version = "6.6.4"; + version = "6.6.6"; src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${finalAttrs.version}.tar.xz"; - hash = "sha256-7+AWkNIr2jWaV5x34rAHJligkr/0kOwEeKISxrfQ63A="; + hash = "sha256-2pn4xXPE2eY/STx+JERxJq6iW1O0wHbseSZodOKbGXU="; }; buildInputs = [ diff --git a/pkgs/by-name/fe/fetchtastic/package.nix b/pkgs/by-name/fe/fetchtastic/package.nix index bbc80f11b9cc..6d17d5b252f3 100644 --- a/pkgs/by-name/fe/fetchtastic/package.nix +++ b/pkgs/by-name/fe/fetchtastic/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "fetchtastic"; - version = "0.10.10"; + version = "0.10.11"; pyproject = true; src = fetchFromGitHub { owner = "jeremiah-k"; repo = "fetchtastic"; tag = finalAttrs.version; - hash = "sha256-ImXBH1mvJE+Ae7fUqR/Z381TKGt6hq0BRHhdtOz3YO4="; + hash = "sha256-/kp9bfJJLffZp+9dEY7G+RQmE43XXwNozkDYjeAjPkc="; }; pythonRelaxDeps = [ "platformdirs" ]; diff --git a/pkgs/by-name/fe/fex/package.nix b/pkgs/by-name/fe/fex/package.nix index 046ced1cb339..0a9c395988f8 100644 --- a/pkgs/by-name/fe/fex/package.nix +++ b/pkgs/by-name/fe/fex/package.nix @@ -185,7 +185,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { llvmPackages.bintools (python3.withPackages ( pythonPackages: with pythonPackages; [ - setuptools + packaging libclang ] )) @@ -233,7 +233,7 @@ llvmPackages.stdenv.mkDerivation (finalAttrs: { cmakeFlagsArray+=("-DBUILD_TESTING:BOOL=FALSE") else echo "Keeping checkPhase as-is" - cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck}") + cmakeFlagsArray+=("${lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck}") fi ''; diff --git a/pkgs/by-name/ff/fflogs/package.nix b/pkgs/by-name/ff/fflogs/package.nix deleted file mode 100644 index 2de7dfe9bf3c..000000000000 --- a/pkgs/by-name/ff/fflogs/package.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: - -let - pname = "fflogs"; - version = "9.3.65"; - src = fetchurl { - url = "https://github.com/RPGLogs/Uploaders-fflogs/releases/download/v${version}/fflogs-v${version}.AppImage"; - hash = "sha256-HsanoX1iJpLC8p64H4enlo20X6LOBNAxkubwPBp5juA="; - }; - extracted = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - mkdir -p $out/share/applications - mkdir -p $out/share/icons/hicolor/512x512/apps - cp -r ${extracted}/usr/share/icons/hicolor/512x512/apps/'FF Logs Uploader.png' $out/share/icons/hicolor/512x512/apps/fflogs.png - chmod -R +w $out/share/ - test ! -e $out/share/icons/hicolor/0x0 # check for regression of https://github.com/electron-userland/electron-builder/issues/5294 - cp ${extracted}/'FF Logs Uploader.desktop' $out/share/applications/fflogs.desktop - sed -i 's@^Exec=AppRun --no-sandbox@Exec=fflogs@g' $out/share/applications/fflogs.desktop - sed -i 's@^Icon=FF Logs Uploader@Icon=fflogs@g' $out/share/applications/fflogs.desktop - ''; - - meta = { - description = "Application for uploading Final Fantasy XIV combat logs to fflogs.com"; - homepage = "https://www.fflogs.com/client/download"; - downloadPage = "https://github.com/RPGLogs/Uploaders-fflogs/releases/latest"; - license = lib.licenses.unfree; # no license listed - mainProgram = "fflogs"; - platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ keysmashes ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/ff/ffmpeg-normalize/package.nix b/pkgs/by-name/ff/ffmpeg-normalize/package.nix index 0965b2e24413..6cc041bf6f3b 100644 --- a/pkgs/by-name/ff/ffmpeg-normalize/package.nix +++ b/pkgs/by-name/ff/ffmpeg-normalize/package.nix @@ -7,13 +7,13 @@ python3Packages.buildPythonApplication rec { pname = "ffmpeg-normalize"; - version = "1.37.8"; + version = "1.41.1"; pyproject = true; src = fetchPypi { inherit version; pname = "ffmpeg_normalize"; - hash = "sha256-9pSVrYTTaxjGCty2pHPtaaSSwCkGDLoNK2wltTwOL3c="; + hash = "sha256-v5icrioELMBi2uJSdoojgY4EMnwHGxncanrT6GpSpSc="; }; build-system = with python3Packages; [ uv-build ]; @@ -27,12 +27,9 @@ python3Packages.buildPythonApplication rec { ] ++ [ ffmpeg ]; - postPatch = with python3Packages; '' - substituteInPlace pyproject.toml \ - --replace-fail \ - 'colorlog==6.7.0' \ - 'colorlog==${colorlog.version}' - ''; + pythonRelaxDeps = [ + "colorlog" + ]; checkPhase = '' runHook preCheck diff --git a/pkgs/by-name/ff/fftw/package.nix b/pkgs/by-name/ff/fftw/package.nix index 0d9736335f68..a706799bf693 100644 --- a/pkgs/by-name/ff/fftw/package.nix +++ b/pkgs/by-name/ff/fftw/package.nix @@ -1,6 +1,5 @@ { fetchurl, - fetchpatch, stdenv, lib, gfortran, @@ -22,24 +21,16 @@ assert lib.elem precision [ stdenv.mkDerivation (finalAttrs: { pname = "fftw-${precision}"; - version = "3.3.10"; + version = "3.3.11"; src = fetchurl { urls = [ "https://fftw.org/fftw-${finalAttrs.version}.tar.gz" "ftp://ftp.fftw.org/pub/fftw/fftw-${finalAttrs.version}.tar.gz" ]; - hash = "sha256-VskyVJhSzdz6/as4ILAgDHdCZ1vpIXnlnmIVs0DiZGc="; + hash = "sha256-VjDCTN6zOxMWEvfrSxqZNCNHVPnziP+GF0WNC+byOaE="; }; - patches = [ - (fetchpatch { - name = "remove_missing_FFTW3LibraryDepends.patch"; - url = "https://github.com/FFTW/fftw3/pull/338/commits/f69fef7aa546d4477a2a3fd7f13fa8b2f6c54af7.patch"; - hash = "sha256-lzX9kAHDMY4A3Td8necXwYLcN6j8Wcegi3A7OIECKeU="; - }) - ]; - outputs = [ "out" "dev" @@ -107,6 +98,7 @@ stdenv.mkDerivation (finalAttrs: { __structuredAttrs = true; meta = { + changelog = "https://github.com/FFTW/fftw3/blob/fftw-${finalAttrs.version}/NEWS"; description = "Fastest Fourier Transform in the West library"; homepage = "https://www.fftw.org/"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/fi/ficsit-cli/package.nix b/pkgs/by-name/fi/ficsit-cli/package.nix index ed01091e919c..17167189068f 100644 --- a/pkgs/by-name/fi/ficsit-cli/package.nix +++ b/pkgs/by-name/fi/ficsit-cli/package.nix @@ -6,14 +6,14 @@ }: buildGoModule rec { pname = "ficsit-cli"; - version = "0.7.0"; + version = "0.7.1"; commit = "5dc8bdbaf6e8d9b1bcd2895e389d9d072d454e15"; src = fetchFromGitHub { owner = "satisfactorymodding"; repo = "ficsit-cli"; tag = "v${version}"; - hash = "sha256-Qwhz1Wc0yYfEqN3iO7iZKK57oxirl2j+z3rcfJPUxhc="; + hash = "sha256-YlwdP7afLsiOaIFKgUIkZXyqTPARgb2Iww/3eFgUcRs="; }; ldflags = [ diff --git a/pkgs/by-name/fi/file-roller/package.nix b/pkgs/by-name/fi/file-roller/package.nix index 74e87da34e23..6c9253811e54 100644 --- a/pkgs/by-name/fi/file-roller/package.nix +++ b/pkgs/by-name/fi/file-roller/package.nix @@ -24,11 +24,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "file-roller"; - version = "44.6"; + version = "44.7"; src = fetchurl { url = "mirror://gnome/sources/file-roller/${lib.versions.major finalAttrs.version}/file-roller-${finalAttrs.version}.tar.xz"; - hash = "sha256-noc7UAW8QleZqM1LI34f/0MOyNazSpksYDPx38bjdk4="; + hash = "sha256-Z8ralqJAnIWfN46C++hosOnACmnmt7iF1ULGTqKhKX0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/filebeat8/package.nix b/pkgs/by-name/fi/filebeat8/package.nix index aff497b2bdb5..3fca15111442 100644 --- a/pkgs/by-name/fi/filebeat8/package.nix +++ b/pkgs/by-name/fi/filebeat8/package.nix @@ -8,18 +8,18 @@ buildGoModule (finalAttrs: { pname = "filebeat"; - version = "8.19.16"; + version = "8.19.19"; src = fetchFromGitHub { owner = "elastic"; repo = "beats"; tag = "v${finalAttrs.version}"; - hash = "sha256-OBPaSbPAp7SvhEi2yycgT70yRfCtIEdkL4/GSR2YrO4="; + hash = "sha256-3hvP+4U3PWlOsaLHO1MZuIpcB6YzPv2dMPlC68esiHE="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-aCoXzWnNsctxJmsfeUyVSLkUY59adtIn2JxxGKPBob8="; + vendorHash = "sha256-e++Y5mhwms/uJnZCUyZNifoYqGH4TGEugSFHSGl0AQE="; subPackages = [ "filebeat" ]; diff --git a/pkgs/by-name/fi/filebrowser-quantum/package.nix b/pkgs/by-name/fi/filebrowser-quantum/package.nix index ab80d372ed04..a38354409ddd 100644 --- a/pkgs/by-name/fi/filebrowser-quantum/package.nix +++ b/pkgs/by-name/fi/filebrowser-quantum/package.nix @@ -6,13 +6,13 @@ }: let - version = "1.2.2-stable"; + version = "1.4.0-stable"; src = fetchFromGitHub { owner = "gtsteffaniak"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-MWFBoVr5WRfLhDUGEGS6ntb3v23HcOcm91x3fGriM2A="; + hash = "sha256-Ojz1VTtlCFUTodQ66mr0ozLKsx3kUirm79HuFJu33yQ="; }; frontend = buildNpmPackage { @@ -20,7 +20,7 @@ let inherit version src; sourceRoot = "${src.name}/frontend"; - npmDepsHash = "sha256-brW5YR/DNBOCPBDMEjSzyk+YTbrP5ppdQ0US/DLbyIs="; + npmDepsHash = "sha256-tisZA7v0WsynNxgbww48eERz9+om4w8MW4IMzQIyh+Y="; buildPhase = '' runHook preBuild @@ -47,7 +47,7 @@ buildGoModule { sourceRoot = "${src.name}/backend"; - vendorHash = "sha256-pU5qtWvhLbMdxzXK6uKxEkvbZdb2oa4ZHKaCPm0bIwU="; + vendorHash = "sha256-WvilFCwTGXecsD/afUpLL6TrGzr/cgkQeltCKKDc4AI="; preBuild = '' mkdir -p http/embed diff --git a/pkgs/by-name/fi/filebrowser/package.nix b/pkgs/by-name/fi/filebrowser/package.nix index 33f3d71541f9..0fcaa3ca2041 100644 --- a/pkgs/by-name/fi/filebrowser/package.nix +++ b/pkgs/by-name/fi/filebrowser/package.nix @@ -1,4 +1,5 @@ { + stdenv, lib, fetchFromGitHub, buildGoModule, @@ -8,18 +9,19 @@ pnpmBuildHook, nodejs-slim, pnpm_10, + installShellFiles, nix-update-script, nixosTests, }: let - version = "2.63.14"; + version = "2.63.18"; src = fetchFromGitHub { owner = "filebrowser"; repo = "filebrowser"; tag = "v${version}"; - hash = "sha256-9CXHoQWr1RpTwFR8JRR72oQZxHrndTrnxYa6/0Z3Mk0="; + hash = "sha256-0j0i6bKKbyUi4O0wBT+xYjvywjRzAGd0/13Yh/dG5GA="; }; frontend = stdenvNoCC.mkDerivation (finalAttrs: { @@ -62,7 +64,16 @@ buildGoModule { pname = "filebrowser"; inherit version src; - vendorHash = "sha256-ofeQkbvBfCpu2g1CLAwUZAZISyAOz+0smEZRx/koj/8="; + vendorHash = "sha256-BXw+fURCh1qNlwWo49aXIpSM339bV3Gwn9Ov8HLEVF0="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd filebrowser \ + --bash <($out/bin/filebrowser completion bash) \ + --fish <($out/bin/filebrowser completion fish) \ + --zsh <($out/bin/filebrowser completion zsh ) + ''; excludedPackages = [ "tools" ]; diff --git a/pkgs/by-name/fi/filen-cli/package.nix b/pkgs/by-name/fi/filen-cli/package.nix index d4202deff945..f49e06e0318c 100644 --- a/pkgs/by-name/fi/filen-cli/package.nix +++ b/pkgs/by-name/fi/filen-cli/package.nix @@ -59,7 +59,6 @@ let { aarch64-darwin = "sha256-+nTCiCEXsEz7YqRZkHlP3CWL7e7OPdds33BTwfqTL5c="; aarch64-linux = "sha256-uvL498mHFXwoZpeCwsup4Iyh4l5buVnqLRBMyGVRIlA="; - x86_64-darwin = "sha256-5nEB6JQLmHasxcIReoiLLLRdSiaT1CRAmGFVyqdd+VY="; x86_64-linux = "sha256-Ky+ewpdd5nKvRzXwEAUgT7P/OW3v6fdb2r6SGxZ/JEc="; } .${stdenv.hostPlatform.system} @@ -143,7 +142,6 @@ stdenv.mkDerivation { platforms = [ "aarch64-darwin" "aarch64-linux" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fi/filen-desktop/package.nix b/pkgs/by-name/fi/filen-desktop/package.nix index 862159bc5182..0446fc650324 100644 --- a/pkgs/by-name/fi/filen-desktop/package.nix +++ b/pkgs/by-name/fi/filen-desktop/package.nix @@ -4,10 +4,10 @@ buildNpmPackage, fetchFromGitHub, makeDesktopItem, - desktopToDarwinBundle, - pkg-config, - electron, + copyDesktopItems, makeWrapper, + electron, + pkg-config, pixman, cairo, pango, @@ -16,6 +16,8 @@ let packageName = "filen-desktop"; packageVersion = "3.0.47"; desktopName = "Filen Desktop"; + appName = "Filen"; + desktopItem = makeDesktopItem { name = packageName; exec = packageName; @@ -34,9 +36,6 @@ let "encrypted" ]; }; - - iconPrefix = if stdenv.hostPlatform.isDarwin then "darwin" else "linux"; - iconSuffix = if stdenv.hostPlatform.isDarwin then "icns" else "png"; in buildNpmPackage { pname = packageName; @@ -51,20 +50,13 @@ buildNpmPackage { }; npmDepsHash = "sha256-+Ul2z6faZvAeCHq35janVTUNoqTQ5JNDeLbCV220nFU="; - npmBuildScript = "build"; - - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; - }; nativeBuildInputs = [ pkg-config - electron makeWrapper ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - desktopToDarwinBundle + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + copyDesktopItems ]; buildInputs = [ @@ -73,34 +65,87 @@ buildNpmPackage { pango ]; - # Override package-lock.json electron version to use what's given by nixpkgs + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = "1"; + }; + postPatch = '' + # Use nixpkgs electron instead of downloading substituteInPlace package.json \ --replace-fail '"electron": "^34.1.1"' '"electron": "*"' + + # Disable code signing (not needed for Nix) + substituteInPlace package.json \ + --replace-fail '"afterSign": "build/notarize.js",' "" + + # Fix app name and userData paths inside filen-desktop app source + substituteInPlace src/index.ts \ + --replace-fail 'const options = await this.options.get()' \ ' + app.setName("${desktopName}") + app.setPath("userData", pathModule.join(app.getPath("appData"), "@filen", "desktop")) + const options = await this.options.get() + ' ''; - # Set up icon assets in path required by desktopItem - preInstall = '' - install -D $src/assets/icons/app/${iconPrefix}.${iconSuffix} $out/share/icons/hicolor/128x128/apps/${packageName}.${iconSuffix} - install -D $src/assets/icons/app/${iconPrefix}Notification.${iconSuffix} $out/share/icons/hicolor/128x128/apps/${packageName}-notification.${iconSuffix} + buildPhase = '' + runHook preBuild + + # Compile TypeScript + npm run build + + # Prepare nixpkgs electron for electron-builder + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + # Build platform bundle + npx electron-builder \ + --dir \ + --${if stdenv.hostPlatform.isDarwin then "mac" else "linux"} \ + -c.electronDist=electron-dist \ + -c.electronVersion="${electron.version}" + + runHook postBuild ''; - # Create binary wrapper and desktopItem - # desktopItem auto-creates the .app bundle for Darwin - postInstall = '' - makeWrapper ${electron}/bin/electron $out/bin/${packageName} \ - --set-default ELECTRON_IS_DEV 0 \ - --add-flags $out/lib/node_modules/@filen/desktop/dist/index.js \ - --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" + installPhase = '' + runHook preInstall - mkdir -p $out/share/applications - cp ${desktopItem}/share/applications/* $out/share/applications/ + ${ + if stdenv.hostPlatform.isDarwin then + '' + # Install macOS .app bundle + mkdir -p $out/Applications + cp -r prod/mac*/${appName}.app $out/Applications/ + + # Create bin symlink + mkdir -p $out/bin + makeWrapper "$out/Applications/${appName}.app/Contents/MacOS/${appName}" $out/bin/${packageName} + '' + else + '' + # Copy built resources + mkdir -p $out/share/${packageName} + cp -r prod/*-unpacked/{locales,resources{,.pak}} $out/share/${packageName} + + # Create desktop icon + mkdir -p $out/share/icons/hicolor/128x128/apps + cp assets/icons/app/linux.png $out/share/icons/hicolor/128x128/apps/${packageName}.png + + # Create launcher with electron + makeWrapper ${lib.getExe electron} $out/bin/${packageName} \ + --set ELECTRON_IS_DEV 0 \ + --add-flags $out/share/${packageName}/resources/app.asar \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc.lib ]}" \ + --inherit-argv0 + '' + } + + runHook postInstall ''; - # Write correct darwin icons to .app contents - postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' - cp -rf $out/share/pixmaps/* "$out/Applications/${desktopName}.app/Contents/Resources" - ''; + desktopItems = lib.optionals (!stdenv.hostPlatform.isDarwin) [ desktopItem ]; meta = { homepage = "https://filen.io/products"; diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index cda7d625dc2c..13d5fd10303e 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "files-cli"; - version = "2.15.335"; + version = "2.15.381"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${finalAttrs.version}"; - hash = "sha256-/X5h7umhwZQi65+MBTl4b9HKn28H+OTCgPV8UJJxV5o="; + hash = "sha256-p990MRYRaucbORv13k8q1lXIKdtvylEfJC6iufpq2F0="; }; - vendorHash = "sha256-YRnw+1SgMSVq+PWzRfwy2UFAsGFii27vocntXFov8ys="; + vendorHash = "sha256-nlYyCCO+DKqnZZ1NUcvXttDfPMlcasaJl6H/YZUZqjI="; ldflags = [ "-s" diff --git a/pkgs/by-name/fi/filius/package.nix b/pkgs/by-name/fi/filius/package.nix index 3bf63e93e17c..ea23e6eaf3bc 100644 --- a/pkgs/by-name/fi/filius/package.nix +++ b/pkgs/by-name/fi/filius/package.nix @@ -19,7 +19,7 @@ maven.buildMavenPackage rec { hash = "sha256-sIcYjbWONg8Cq+dHpoBYj07cyHV7oX06Xh1zK0CHn64="; }; - mvnHash = "sha256-/gA49V1Kjh4zJTzDCzFNwZF30ERwPk2lG6lw/jxM2Qo="; + mvnHash = "sha256-41NirfgR9EhHLRT3V6P5KrakYKZ6dJTlXZu6rgCAK3I="; mvnParameters = "-Plinux"; # tests want to create an X11 window which isn't often feasible diff --git a/pkgs/by-name/fi/filtr/package.nix b/pkgs/by-name/fi/filtr/package.nix index 7cd357b00749..4ba17c3a3d3e 100644 --- a/pkgs/by-name/fi/filtr/package.nix +++ b/pkgs/by-name/fi/filtr/package.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "filtr"; - version = "1.1.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "tiagolr"; repo = "filtr"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-LRVwJ/Eh+XeNGnlbd2c56hWV8StHZGhxy0XLjGZ0toY="; + hash = "sha256-diOM6Y2HrOP5wXg4tVXms7TYOSM16t06ZDg1/Q1L/zc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/finamp/git-hashes.json b/pkgs/by-name/fi/finamp/git-hashes.json index 6f0c48bd26a5..92a0e823d671 100644 --- a/pkgs/by-name/fi/finamp/git-hashes.json +++ b/pkgs/by-name/fi/finamp/git-hashes.json @@ -1,13 +1,14 @@ { "balanced_text": "sha256-U+gtC9AaUFp3gVkUzYMWAUSuUV7kYB8ZE2BsclnxwkA=", + "flutter_carplay": "sha256-0lewLQFVx+0rW2aAxWSePz/9bhNmb/mWt4RBJ++BCuM=", "flutter_user_certificates_android": "sha256-HL1Qd0D3CLYJysWLX2jqWt1FJRGm/BE8EjVFPztOIPo=", "isar": "sha256-Wg1m/HM7UnK+aC1DOyY41Bo4HuLrEaAxCtQw12ZrnN0=", - "isar_flutter_libs": "sha256-Z5IdfiaZ7348XwYSQb81z0YZEoIHWmsSZr6mYqqz4Oo=", + "isar_flutter_libs": "sha256-abfMKRRVJgrG5orGvXJbIJNTx8Fx0XTlvZZ9W+LcsP0=", "isar_generator": "sha256-fM8ygT6il7TdjmeTdmk8o4exc3Z/F1tYF878eoDK37E=", "just_audio": "sha256-I+HTDx3IpaQw3VBVO7KGzl0vDcFrNZhN5455i7TNxxs=", - "just_audio_media_kit": "sha256-dSlZETFqNQs7jxNN+8MWQzval31zA7zCs+7WiPPPZMw=", + "just_audio_media_kit": "sha256-ZdSX86xeqXZZrdHpdg8W240qtSnUTfZLN9XrM05rVTI=", "media_kit_libs_windows_audio": "sha256-XAObjn7wcN4qA7MW+hKqjNZv/L2Ec8t/cTF+d2ZoZ+k=", "palette_generator": "sha256-mnRJf3asu1mm9HYU8U0di+qRk3SpNFwN3S5QxChpIA0=", "smtc_windows": "sha256-ESR6qw8ciJvo1YG3wNK7Uy/N0zzl6OX6q40Dmgsvx6A=", "split_view": "sha256-unTJQDXUUPVDudlk0ReOPNYrsyEpbd/UMg1tHZsmg+k=" -} \ No newline at end of file +} diff --git a/pkgs/by-name/fi/finamp/package.nix b/pkgs/by-name/fi/finamp/package.nix index 4e2a80b5b16d..12c011f06952 100644 --- a/pkgs/by-name/fi/finamp/package.nix +++ b/pkgs/by-name/fi/finamp/package.nix @@ -15,7 +15,7 @@ dart, }: let - version = "0.9.23-beta"; + version = "0.9.24-beta"; in flutter341.buildFlutterApplication { inherit version; @@ -24,7 +24,7 @@ flutter341.buildFlutterApplication { owner = "UnicornsOnLSD"; repo = "finamp"; rev = version; - hash = "sha256-N1+6rB16geFMYMbfiF7eppnXfXC/pqv90I9aY/57lKI="; + hash = "sha256-o7q7Yr47maTrt4CG3PiV9Fdhy77ToboVdd8olZFfFts="; }; pubspecLock = lib.importJSON ./pubspec.lock.json; diff --git a/pkgs/by-name/fi/finamp/pubspec.lock.json b/pkgs/by-name/fi/finamp/pubspec.lock.json index 1a20e4851435..2c51383c3bf6 100644 --- a/pkgs/by-name/fi/finamp/pubspec.lock.json +++ b/pkgs/by-name/fi/finamp/pubspec.lock.json @@ -84,21 +84,21 @@ "dependency": "direct main", "description": { "name": "app_set_id", - "sha256": "bdc50b3da4b3db791e7a24bfca46f7f791dda318c096a3b62481ea2110a24847", + "sha256": "fe20e185b907e75f9c06f42423db816d3bec64973f10be0034d5bc6703e015cc", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.4.0" }, "archive": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "archive", - "sha256": "2fde1607386ab523f7a36bb3e7edb43bd58e6edaf2ffb29d8a6d578b297fdbbd", + "sha256": "a96e8b390886ee8abb49b7bd3ac8df6f451c621619f52a26e815fdcf568959ff", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.7" + "version": "4.0.9" }, "args": { "dependency": "transitive", @@ -114,11 +114,11 @@ "dependency": "transitive", "description": { "name": "async", - "sha256": "758e6d74e971c3e5aceb4110bfd6698efc7f501675bcfe0c775459a8140750eb", + "sha256": "e2eb0491ba5ddb6177742d2da23904574082139b07c1e33b8503b9f46f3e1a37", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.13.0" + "version": "2.13.1" }, "audio_service": { "dependency": "direct main", @@ -134,11 +134,11 @@ "dependency": "direct main", "description": { "name": "audio_service_mpris", - "sha256": "fdab1ae1f659c6db36d5cc396e46e4ee9663caefa6153f8453fcd01d57567c08", + "sha256": "8cb2ff2237f4cd2fd27f16451ed35b3aedc12df8a384435327c67a9f4d557ef4", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.0" + "version": "0.2.1" }, "audio_service_platform_interface": { "dependency": "direct main", @@ -164,11 +164,11 @@ "dependency": "direct main", "description": { "name": "audio_session", - "sha256": "8f96a7fecbb718cb093070f868b4cdcb8a9b1053dce342ff8ab2fde10eb9afb7", + "sha256": "7217b229db57cc4dc577a8abb56b7429a5a212b978517a5be578704bfe5e568b", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.2" + "version": "0.2.3" }, "auto_size_text": { "dependency": "direct main", @@ -184,11 +184,11 @@ "dependency": "direct main", "description": { "name": "background_downloader", - "sha256": "a3b340e42bc45598918944e378dc6a05877e587fcd0e1b8d2ea26339de87bdf9", + "sha256": "aceacec2b2a72ec3a8862ab5895fcbbc71ab33765f3619d57963f3110dd268e3", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.0" + "version": "9.5.5" }, "balanced_text": { "dependency": "direct main", @@ -325,11 +325,11 @@ "dependency": "transitive", "description": { "name": "built_value", - "sha256": "426cf75afdb23aa74bd4e471704de3f9393f3c7b04c1e2d9c6f1073ae0b8b139", + "sha256": "34e4067d30ce212937df995f03b69992eea683539ceeac7f679a1f1eba055b56", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.12.1" + "version": "8.12.6" }, "characters": { "dependency": "transitive", @@ -355,11 +355,11 @@ "dependency": "direct main", "description": { "name": "chopper", - "sha256": "fb6106cd29553e34c811874efd8e8ee051ad7b9546e0d8c79394d2b6c9621b45", + "sha256": "2e7535c174752c6b051e18baa6f9a7dcaa13fc2159f77b755ab58b5537a8545c", "url": "https://pub.dev" }, "source": "hosted", - "version": "8.4.0" + "version": "8.6.0" }, "chopper_generator": { "dependency": "direct dev", @@ -411,15 +411,25 @@ "source": "hosted", "version": "1.1.2" }, + "code_assets": { + "dependency": "transitive", + "description": { + "name": "code_assets", + "sha256": "bf394f466ba9205f1812a0433b392d6af280f155f56651eda7c18cc32ed493b8", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.2.1" + }, "code_builder": { "dependency": "transitive", "description": { "name": "code_builder", - "sha256": "11654819532ba94c34de52ff5feb52bd81cba1de00ef2ed622fd50295f9d4243", + "sha256": "6a6cab2ba4680d6423f34a9b972a4c9a94ebe1b62ecec4e1a1f2cba91fd1319d", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.11.0" + "version": "4.11.1" }, "collection": { "dependency": "direct main", @@ -445,21 +455,21 @@ "dependency": "direct main", "description": { "name": "connectivity_plus", - "sha256": "33bae12a398f841c6cda09d1064212957265869104c478e5ad51e2fb26c3973c", + "sha256": "62ffa266d9a23b79fb3fcbc206afc00bb979417ba57b1324c546b5aab95ba057", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.0" + "version": "7.1.1" }, "connectivity_plus_platform_interface": { "dependency": "transitive", "description": { "name": "connectivity_plus_platform_interface", - "sha256": "42657c1715d48b167930d5f34d00222ac100475f73d10162ddf43e714932f204", + "sha256": "3c09627c536d22fd24691a905cdd8b14520de69da52c7a97499c8be5284a32ed", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.1.0" }, "console": { "dependency": "transitive", @@ -485,11 +495,11 @@ "dependency": "transitive", "description": { "name": "cross_file", - "sha256": "701dcfc06da0882883a2657c445103380e53e647060ad8d9dfb710c100996608", + "sha256": "28bb3ae56f117b5aec029d702a90f57d285cd975c3c5c281eaca38dbc47c5937", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.5+1" + "version": "0.3.5+2" }, "crypto": { "dependency": "transitive", @@ -575,21 +585,21 @@ "dependency": "direct main", "description": { "name": "dbus", - "sha256": "79e0c23480ff85dc68de79e2cd6334add97e48f7f4865d17686dd6ea81a47e8c", + "sha256": "d0c98dcd4f5169878b6cf8f6e0a52403a9dff371a3e2f019697accbf6f44a270", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.11" + "version": "0.7.12" }, "device_info_plus": { "dependency": "direct main", "description": { "name": "device_info_plus", - "sha256": "4df8babf73058181227e18b08e6ea3520cf5fc5d796888d33b7cb0f33f984b7c", + "sha256": "b4fed1b2835da9d670d7bed7db79ae2a94b0f5ad6312268158a9b5479abbacdd", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.3.0" + "version": "12.4.0" }, "device_info_plus_platform_interface": { "dependency": "transitive", @@ -601,6 +611,16 @@ "source": "hosted", "version": "7.0.3" }, + "diacritic": { + "dependency": "direct main", + "description": { + "name": "diacritic", + "sha256": "12981945ec38931748836cd76f2b38773118d0baef3c68404bdfde9566147876", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.1.6" + }, "dynamic_color": { "dependency": "direct main", "description": { @@ -615,11 +635,11 @@ "dependency": "transitive", "description": { "name": "equatable", - "sha256": "567c64b3cb4cf82397aac55f4f0cbd3ca20d77c6c03bedbc4ceaddc08904aef7", + "sha256": "3e0141505477fd8ad55d6eb4e7776d3fe8430be8e497ccb1521370c3f21a3e2b", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.7" + "version": "2.0.8" }, "fading_edge_scrollview": { "dependency": "transitive", @@ -645,11 +665,11 @@ "dependency": "transitive", "description": { "name": "ffi", - "sha256": "289279317b4b16eb2bb7e271abccd4bf84ec9bdcbe999e278a94b804f5630418", + "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.4" + "version": "2.2.0" }, "file": { "dependency": "direct main", @@ -665,11 +685,11 @@ "dependency": "direct main", "description": { "name": "file_picker", - "sha256": "7872545770c277236fd32b022767576c562ba28366204ff1a5628853cf8f2200", + "sha256": "f13a03000d942e476bc1ff0a736d2e9de711d2f89a95cd4c1d88f861c3348387", "url": "https://pub.dev" }, "source": "hosted", - "version": "10.3.7" + "version": "11.0.2" }, "file_sizes": { "dependency": "direct main", @@ -695,21 +715,21 @@ "dependency": "direct main", "description": { "name": "flex_color_picker", - "sha256": "f5b0b53d4ae0d59b1e28dfc21d5398e5028cf8e764518e491a52fd050aa23881", + "sha256": "a0979dd61f21b634717b98eb4ceaed2bfe009fe020ce8597aaf164b9eeb57aaa", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.7.2" + "version": "3.8.0" }, "flex_seed_scheme": { "dependency": "transitive", "description": { "name": "flex_seed_scheme", - "sha256": "828291a5a4d4283590541519d8b57821946660ac61d2e07d955f81cfcab22e5d", + "sha256": "a3183753bbcfc3af106224bff3ab3e1844b73f58062136b7499919f49f3667e7", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.6.1" + "version": "4.0.1" }, "flutter": { "dependency": "direct main", @@ -737,6 +757,17 @@ "source": "hosted", "version": "3.4.1" }, + "flutter_carplay": { + "dependency": "direct main", + "description": { + "path": ".", + "ref": "017ce2e", + "resolved-ref": "017ce2e19711d3e043ed86ade25f941f96ebb7ba", + "url": "https://github.com/oguzhnatly/flutter_carplay.git" + }, + "source": "git", + "version": "1.2.11" + }, "flutter_discord_rpc": { "dependency": "direct main", "description": { @@ -747,25 +778,31 @@ "source": "hosted", "version": "1.1.0" }, + "flutter_driver": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, "flutter_gen_core": { "dependency": "transitive", "description": { "name": "flutter_gen_core", - "sha256": "b6bafbbd981da2f964eb45bcb8b8a7676a281084f8922c0c75de4cfbaa849311", + "sha256": "22b3198a4cb1255841a3662b41adad35d36d9037fcd9d129858240030417e0b1", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.12.0" + "version": "5.13.0+1" }, "flutter_gen_runner": { "dependency": "direct dev", "description": { "name": "flutter_gen_runner", - "sha256": "c99b10af9d404e3f46fd1927e7d90099779e935e86022674c4c2a9e6c2a93b29", + "sha256": "83fd55f5472a955725c5912819847e9770c4f295cd0ae4bdd26d99853f8a6546", "url": "https://pub.dev" }, "source": "hosted", - "version": "5.12.0" + "version": "5.13.0+1" }, "flutter_launcher_icons": { "dependency": "direct dev", @@ -807,11 +844,11 @@ "dependency": "transitive", "description": { "name": "flutter_plugin_android_lifecycle", - "sha256": "ee8068e0e1cd16c4a82714119918efdeed33b3ba7772c54b5d094ab53f9b7fd1", + "sha256": "3854fe5e3bff0b113c658f260b90c95dea17c92db0f2addeac2e343dd9969785", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.33" + "version": "2.0.35" }, "flutter_riverpod": { "dependency": "direct main", @@ -824,7 +861,7 @@ "version": "2.6.1" }, "flutter_rust_bridge": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "flutter_rust_bridge", "sha256": "37ef40bc6f863652e865f0b2563ea07f0d3c58d8efad803cc01933a4b2ee067e", @@ -857,11 +894,11 @@ "dependency": "direct main", "description": { "name": "flutter_svg", - "sha256": "87fbd7c534435b6c5d9d98b01e1fd527812b82e68ddd8bd35fc45ed0fa8f0a95", + "sha256": "35882981abcbfb8c15b286f0cd690ff25bac12d95eff3e25ee207f37d4c42e7f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.3" + "version": "2.3.0" }, "flutter_tabler_icons": { "dependency": "direct main", @@ -936,15 +973,21 @@ "source": "hosted", "version": "4.0.0" }, + "fuchsia_remote_debug_protocol": { + "dependency": "transitive", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" + }, "gaimon": { "dependency": "direct main", "description": { "name": "gaimon", - "sha256": "fca9d9bef76604a4d3ad5d212a349406c68f78ed01172f40bebcbd5b4f55087a", + "sha256": "2024da7b9642dc295ad7bcc69ff0be4ba4b0c9ab4134338ae95c3bd58dd16fb0", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.1" + "version": "1.4.3" }, "get_it": { "dependency": "direct main", @@ -980,11 +1023,11 @@ "dependency": "transitive", "description": { "name": "gtk", - "sha256": "e8ce9ca4b1df106e4d72dad201d345ea1a036cc12c360f1a7d5a758f78ffa42c", + "sha256": "4ff85b2a16724029dd9e5bbb5a94b6918f9973f74ba571c949d2002801879cf5", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.0" + "version": "2.2.0" }, "hashcodes": { "dependency": "transitive", @@ -1000,21 +1043,21 @@ "dependency": "direct main", "description": { "name": "hive_ce", - "sha256": "81d39a03c4c0ba5938260a8c3547d2e71af59defecea21793d57fc3551f0d230", + "sha256": "8e9980e68643afb1e765d3af32b47996552a64e190d03faf622cea07c1294418", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.15.1" + "version": "2.19.3" }, "hive_ce_flutter": { "dependency": "direct main", "description": { "name": "hive_ce_flutter", - "sha256": "26d656c9e8974f0732f1d09020e2d7b08ba841b8961a02dbfb6caf01474b0e9a", + "sha256": "2677e95a333ff15af43ccd06af7eb7abbf1a4f154ea071997f3de4346cae913a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.3.3" + "version": "2.3.4" }, "hive_ce_generator": { "dependency": "direct dev", @@ -1026,15 +1069,25 @@ "source": "hosted", "version": "1.9.2" }, + "hooks": { + "dependency": "transitive", + "description": { + "name": "hooks", + "sha256": "9a62a50b50b769a737bc0a8ff381f333529df3ab746b2f6b02e83760231455ba", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "2.0.2" + }, "hotreloader": { "dependency": "transitive", "description": { "name": "hotreloader", - "sha256": "bc167a1163807b03bada490bfe2df25b0d744df359227880220a5cbd04e5734b", + "sha256": "66871df468fc24eee81f1a0a7cb98acc104716f9b7376d355437b48d633c4ebf", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.3.0" + "version": "4.4.0" }, "html": { "dependency": "transitive", @@ -1080,11 +1133,11 @@ "dependency": "transitive", "description": { "name": "image", - "sha256": "4e973fcf4caae1a4be2fa0a13157aa38a8f9cb049db6529aa00b4d71abc4d928", + "sha256": "f9881ff4998044947ec38d098bc7c8316ae1186fa786eddffdb867b9bc94dfce", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.4" + "version": "4.8.0" }, "image_size_getter": { "dependency": "transitive", @@ -1100,11 +1153,17 @@ "dependency": "direct main", "description": { "name": "infinite_scroll_pagination", - "sha256": "4047eb8191e8b33573690922a9e995af64c3949dc87efc844f936b039ea279df", + "sha256": "b0d28e37cd8f62490ff6aef63f9db93d4c78b7f11b7c6b26f33c69d8476fda78", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.1.0" + "version": "5.1.1" + }, + "integration_test": { + "dependency": "direct dev", + "description": "flutter", + "source": "sdk", + "version": "0.0.0" }, "intl": { "dependency": "direct main", @@ -1141,9 +1200,9 @@ "dependency": "direct main", "description": { "path": ".", - "ref": "59103190aa2ac03041d61ad6d127b540be079ec8", - "resolved-ref": "59103190aa2ac03041d61ad6d127b540be079ec8", - "url": "https://github.com/MrLittleWhite/isar_flutter_libs.git" + "ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b", + "resolved-ref": "21c20862e94bb33fca9e9c14b5ca72fc41307f4b", + "url": "https://github.com/Komodo5197/isar_flutter_libs.git" }, "source": "git", "version": "3.1.0+1" @@ -1163,11 +1222,31 @@ "dependency": "transitive", "description": { "name": "isolate_channel", - "sha256": "f3d36f783b301e6b312c3450eeb2656b0e7d1db81331af2a151d9083a3f6b18d", + "sha256": "a9d3d620695bc984244dafae00b95e4319d6974b2d77f4b9e1eb4f2efe099094", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.2.2+1" + "version": "0.6.1" + }, + "jni": { + "dependency": "transitive", + "description": { + "name": "jni", + "sha256": "c2230682d5bc2362c1c9e8d3c7f406d9cbba23ab3f2e203a025dd47e0fb2e68f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.0" + }, + "jni_flutter": { + "dependency": "transitive", + "description": { + "name": "jni_flutter", + "sha256": "8b59e590786050b1cd866677dddaf76b1ade5e7bc751abe04b86e84d379d3ba6", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "1.0.1" }, "js": { "dependency": "transitive", @@ -1215,7 +1294,7 @@ "description": { "path": ".", "ref": "feat/queue-shuffle", - "resolved-ref": "f5237393a63da702426e4e20c6800b706a0b159f", + "resolved-ref": "5af56479c5a34d9ad9fcf2d94cc4e00b7f4ddace", "url": "https://github.com/Komodo5197/just_audio_media_kit.git" }, "source": "git", @@ -1275,11 +1354,11 @@ "dependency": "transitive", "description": { "name": "lints", - "sha256": "a5e2b223cb7c9c8efdc663ef484fdd95bb243bff242ef5b13e26883547fce9a0", + "sha256": "12f842a479589fea194fe5c5a3095abc7be0c1f2ddfa9a0e76aed1dbd26a87df", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.0" + "version": "6.1.0" }, "locale_names": { "dependency": "direct main", @@ -1325,11 +1404,11 @@ "dependency": "transitive", "description": { "name": "matcher", - "sha256": "12956d0ad8390bbcc63ca2e1469c0619946ccb52809807067a7020d57e647aa6", + "sha256": "dc0b7dc7651697ea4ff3e69ef44b0407ea32c487a39fff6a4004fa585e901861", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.12.18" + "version": "0.12.19" }, "material_color_utilities": { "dependency": "transitive", @@ -1376,11 +1455,11 @@ "dependency": "direct main", "description": { "name": "meta", - "sha256": "23f08335362185a5ea2ad3a4e597f1375e78bce8a040df5c600c8d3552ef2394", + "sha256": "1741988757a65eb6b36abe716829688cf01910bbf91c34354ff7ec1c3de2b349", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.17.0" + "version": "1.18.0" }, "mime": { "dependency": "transitive", @@ -1422,6 +1501,16 @@ "source": "hosted", "version": "0.5.0" }, + "objective_c": { + "dependency": "transitive", + "description": { + "name": "objective_c", + "sha256": "6cb691c686fa2838c6deb34980d426145c2a5d537491cb83d463c33cdbc726ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "9.4.1" + }, "octo_image": { "dependency": "direct main", "description": { @@ -1446,11 +1535,11 @@ "dependency": "direct main", "description": { "name": "package_info_plus", - "sha256": "f69da0d3189a4b4ceaeb1a3defb0f329b3b352517f52bed4290f83d4f06bc08d", + "sha256": "468c26b4254ab01979fa5e4a98cb343ea3631b9acee6f21028997419a80e1a20", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.0.0" + "version": "9.0.1" }, "package_info_plus_platform_interface": { "dependency": "transitive", @@ -1507,21 +1596,21 @@ "dependency": "transitive", "description": { "name": "path_provider_android", - "sha256": "f2c65e21139ce2c3dad46922be8272bb5963516045659e71bb16e151c93b580e", + "sha256": "69cbd515a62b94d32a7944f086b2f82b4ac40a1d45bebfc00813a430ab2dabcd", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.22" + "version": "2.3.1" }, "path_provider_foundation": { "dependency": "transitive", "description": { "name": "path_provider_foundation", - "sha256": "6d13aece7b3f5c5a9731eaf553ff9dcbc2eff41087fd2df587fd0fed9a3eb0c4", + "sha256": "2a376b7d6392d80cd3705782d2caa734ca4727776db0b6ec36ef3f1855197699", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.1" + "version": "2.6.0" }, "path_provider_linux": { "dependency": "transitive", @@ -1534,7 +1623,7 @@ "version": "2.2.1" }, "path_provider_platform_interface": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "path_provider_platform_interface", "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", @@ -1557,11 +1646,11 @@ "dependency": "direct main", "description": { "name": "permission_handler", - "sha256": "bc917da36261b00137bbc8896bf1482169cd76f866282368948f032c8c1caae1", + "sha256": "fe54465bcc62a4564c6e4db337bbaded6c0c0fa6e10487414436d163114784f6", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.1" + "version": "12.0.3" }, "permission_handler_android": { "dependency": "transitive", @@ -1577,11 +1666,11 @@ "dependency": "transitive", "description": { "name": "permission_handler_apple", - "sha256": "f000131e755c54cf4d84a5d8bd6e4149e262cc31c5a8b1d698de1ac85fa41023", + "sha256": "e20daf680eef1ca62ffe8c8c526b778cc386d50137c77ac71c8ec9c88c13fb9d", "url": "https://pub.dev" }, "source": "hosted", - "version": "9.4.7" + "version": "9.4.9" }, "permission_handler_html": { "dependency": "transitive", @@ -1617,11 +1706,11 @@ "dependency": "transitive", "description": { "name": "petitparser", - "sha256": "1a97266a94f7350d30ae522c0af07890c70b8e62c71e8e3920d1db4d23c057d1", + "sha256": "91bd59303e9f769f108f8df05e371341b15d59e995e6806aefab827b58336675", "url": "https://pub.dev" }, "source": "hosted", - "version": "7.0.1" + "version": "7.0.2" }, "platform": { "dependency": "transitive", @@ -1657,11 +1746,21 @@ "dependency": "transitive", "description": { "name": "posix", - "sha256": "6323a5b0fa688b6a010df4905a56b00181479e6d10534cecfecede2aa55add61", + "sha256": "185ef7606574f789b40f289c233efa52e96dead518aed988e040a10737febb07", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.0.3" + "version": "6.5.0" + }, + "process": { + "dependency": "transitive", + "description": { + "name": "process", + "sha256": "c6248e4526673988586e8c00bb22a49210c258dc91df5227d5da9748ecf79744", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "5.0.5" }, "progress_border": { "dependency": "direct main", @@ -1707,11 +1806,21 @@ "dependency": "transitive", "description": { "name": "qs_dart", - "sha256": "27da57e8b394163f96b74bccb6eb6115bfd2585de4b9ad6241bdf1a9797ab54f", + "sha256": "2758b3012c92fa1335b3867d89f5debaf33c71fa5fd086ab67e625f674ef0d10", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.6.0" + "version": "1.7.5" + }, + "record_use": { + "dependency": "transitive", + "description": { + "name": "record_use", + "sha256": "2551bd8eecfe95d14ae75f6021ad0248be5c27f138c2ec12fcb52b500b3ba1ed", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" }, "riverpod": { "dependency": "transitive", @@ -1777,11 +1886,11 @@ "dependency": "transitive", "description": { "name": "safe_local_storage", - "sha256": "e9a21b6fec7a8aa62cc2585ff4c1b127df42f3185adbd2aca66b47abe2e80236", + "sha256": "287ea1f667c0b93cdc127dccc707158e2d81ee59fba0459c31a0c7da4d09c755", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.0.1" + "version": "2.0.3" }, "screen_retriever": { "dependency": "transitive", @@ -1847,11 +1956,11 @@ "dependency": "direct main", "description": { "name": "share_plus", - "sha256": "14c8860d4de93d3a7e53af51bff479598c4e999605290756bbbe45cf65b37840", + "sha256": "223873d106614442ea6f20db5a038685cc5b32a2fba81cdecaefbbae0523f7fa", "url": "https://pub.dev" }, "source": "hosted", - "version": "12.0.1" + "version": "12.0.2" }, "share_plus_platform_interface": { "dependency": "transitive", @@ -1867,21 +1976,21 @@ "dependency": "direct main", "description": { "name": "shared_preferences", - "sha256": "6e8bf70b7fef813df4e9a36f658ac46d107db4b4cfe1048b477d4e453a8159f5", + "sha256": "c3025c5534b01739267eb7d76959bbc25a6d10f6988e1c2a3036940133dd10bf", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.3" + "version": "2.5.5" }, "shared_preferences_android": { "dependency": "transitive", "description": { "name": "shared_preferences_android", - "sha256": "83af5c682796c0f7719c2bbf74792d113e40ae97981b8f266fa84574573556bc", + "sha256": "e8d4762b1e2e8578fc4d0fd548cebf24afd24f49719c08974df92834565e2c53", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.18" + "version": "2.4.23" }, "shared_preferences_foundation": { "dependency": "transitive", @@ -1907,11 +2016,11 @@ "dependency": "transitive", "description": { "name": "shared_preferences_platform_interface", - "sha256": "57cbf196c486bc2cf1f02b85784932c6094376284b3ad5779d1b1c6c6a816b80", + "sha256": "649dc798a33931919ea356c4305c2d1f81619ea6e92244070b520187b5140ef9", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.2" }, "shared_preferences_web": { "dependency": "transitive", @@ -2014,11 +2123,11 @@ "dependency": "transitive", "description": { "name": "source_span", - "sha256": "254ee5351d6cb365c859e20ee823c3bb479bf4a293c22d17a9f1bf144ce86f7c", + "sha256": "56a02f1f4cd1a2d96303c0144c93bd6d909eea6bee6bf5a0e0b685edbd4c47ab", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.10.1" + "version": "1.10.2" }, "split_view": { "dependency": "direct main", @@ -2035,31 +2144,31 @@ "dependency": "transitive", "description": { "name": "sqflite", - "sha256": "e2297b1da52f127bc7a3da11439985d9b536f75070f3325e62ada69a5c585d03", + "sha256": "564cfed0746fe53140c23b70b308e045c3b31f17778f2f326ccb7d804ea0250a", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2" + "version": "2.4.2+1" }, "sqflite_android": { "dependency": "transitive", "description": { "name": "sqflite_android", - "sha256": "ecd684501ebc2ae9a83536e8b15731642b9570dc8623e0073d227d0ee2bfea88", + "sha256": "881e28efdcc9950fd8e9bb42713dcf1103e62a2e7168f23c9338d82db13dec40", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.2+2" + "version": "2.4.2+3" }, "sqflite_common": { "dependency": "transitive", "description": { "name": "sqflite_common", - "sha256": "6ef422a4525ecc601db6c0a2233ff448c731307906e92cabc9ba292afaae16a6", + "sha256": "1581ffbf7a0e333b380d6a30737d78516b826cb35beb7fb0bf8a3ea0c678b465", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.5.6" + "version": "2.5.8" }, "sqflite_darwin": { "dependency": "transitive", @@ -2131,15 +2240,25 @@ "source": "hosted", "version": "1.4.1" }, + "sync_http": { + "dependency": "transitive", + "description": { + "name": "sync_http", + "sha256": "7f0cd72eca000d2e026bcd6f990b81d0ca06022ef4e32fb257b30d3d1014a961", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.3.1" + }, "synchronized": { "dependency": "transitive", "description": { "name": "synchronized", - "sha256": "c254ade258ec8282947a0acbbc90b9575b4f19673533ee46f2f6e9b3aeefd7c0", + "sha256": "63896c27e81b28f8cb4e69ead0d3e8f03f1d1e5fc531a3e579cabed6a2c7c9e5", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.4.0" + "version": "3.4.0+1" }, "term_glyph": { "dependency": "transitive", @@ -2155,31 +2274,31 @@ "dependency": "transitive", "description": { "name": "test_api", - "sha256": "93167629bfc610f71560ab9312acdda4959de4df6fac7492c89ff0d3886f6636", + "sha256": "949a932224383300f01be9221c39180316445ecb8e7547f70a41a35bf421fb9e", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.9" + "version": "0.7.11" }, "threshold": { "dependency": "transitive", "description": { "name": "threshold", - "sha256": "0a1585947eb84bfbe7ca6a6598c9075d3d71fe969e81668cd6d2122be664fd39", + "sha256": "33bdf79425c89d65f1dc32bec10328de8e89451946611c1e04b08ed28d647b85", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.0.5" + "version": "1.0.6" }, "time": { "dependency": "transitive", "description": { "name": "time", - "sha256": "370572cf5d1e58adcb3e354c47515da3f7469dac3a95b447117e728e7be6f461", + "sha256": "46187cf30bffdab28c56be9a63861b36e4ab7347bf403297595d6a97e10c789f", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.5" + "version": "2.1.6" }, "timing": { "dependency": "transitive", @@ -2255,21 +2374,21 @@ "dependency": "transitive", "description": { "name": "url_launcher_android", - "sha256": "767344bf3063897b5cf0db830e94f904528e6dd50a6dfaf839f0abf509009611", + "sha256": "17bc677f0b301615530dd1d67e0a9828cafa2d0b6b6eae4cd3679b7eac4a273c", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.28" + "version": "6.3.30" }, "url_launcher_ios": { "dependency": "transitive", "description": { "name": "url_launcher_ios", - "sha256": "cfde38aa257dae62ffe79c87fab20165dfdf6988c1d31b58ebf59b9106062aad", + "sha256": "580fe5dfb51671ae38191d316e027f6b76272b026370708c2d898799750a02b0", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.3.6" + "version": "6.4.1" }, "url_launcher_linux": { "dependency": "transitive", @@ -2305,11 +2424,11 @@ "dependency": "transitive", "description": { "name": "url_launcher_web", - "sha256": "4bd2b7b4dc4d4d0b94e5babfffbca8eac1a126c7f3d6ecbc1a11013faa3abba2", + "sha256": "85c81589622fbc87c1c683aaea164d3604a7777495a79d91e39ffcdec39ddb34", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.4.1" + "version": "2.4.3" }, "url_launcher_windows": { "dependency": "transitive", @@ -2325,11 +2444,11 @@ "dependency": "direct main", "description": { "name": "uuid", - "sha256": "a11b666489b1954e01d992f3d601b1804a33937b5a8fe677bd26b8a9f96f96e8", + "sha256": "1fef9e8e11e2991bb773070d4656b7bd5d850967a2456cfc83cf47925ba79489", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.5.2" + "version": "4.5.3" }, "value_layout_builder": { "dependency": "transitive", @@ -2345,11 +2464,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics", - "sha256": "a4f059dc26fc8295b5921376600a194c4ec7d55e72f2fe4c7d2831e103d461e6", + "sha256": "2306c03da2ba81724afeb589c351ebbc0aa7d86005925be8f8735856dbe5e42d", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.19" + "version": "1.2.2" }, "vector_graphics_codec": { "dependency": "transitive", @@ -2365,11 +2484,11 @@ "dependency": "transitive", "description": { "name": "vector_graphics_compiler", - "sha256": "d354a7ec6931e6047785f4db12a1f61ec3d43b207fc0790f863818543f8ff0dc", + "sha256": "7ee12e6dffe0fc8e755179d6d91b3b34f5924223fc104d85572ef9180d73d172", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.19" + "version": "1.2.5" }, "vector_math": { "dependency": "transitive", @@ -2395,51 +2514,41 @@ "dependency": "transitive", "description": { "name": "vm_service", - "sha256": "45caa6c5917fa127b5dbcfbd1fa60b14e583afdc08bfc96dda38886ca252eb60", + "sha256": "0016aef94fc66495ac78af5859181e3f3bf2026bd8eecc72b9565601e19ab360", "url": "https://pub.dev" }, "source": "hosted", - "version": "15.0.2" + "version": "15.2.0" }, "wakelock_plus": { "dependency": "direct main", "description": { "name": "wakelock_plus", - "sha256": "9296d40c9adbedaba95d1e704f4e0b434be446e2792948d0e4aa977048104228", + "sha256": "ddf3db70eaa10c37558ff817519b85d527dbd21034fd5d8e1c2e85f31588f1c1", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.4.0" + "version": "1.5.2" }, "wakelock_plus_platform_interface": { "dependency": "transitive", "description": { "name": "wakelock_plus_platform_interface", - "sha256": "036deb14cd62f558ca3b73006d52ce049fabcdcb2eddfe0bf0fe4e8a943b5cf2", + "sha256": "b13f99e992e7ae6a152e16c5559d3c07ff445b13330192662494e614ca3e7d7b", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.3.0" + "version": "1.5.1" }, "watcher": { "dependency": "transitive", "description": { "name": "watcher", - "sha256": "592ab6e2892f67760543fb712ff0177f4ec76c031f02f5b4ff8d3fc5eb9fb61a", + "sha256": "1398c9f081a753f9226febe8900fce8f7d0a67163334e1c94a2438339d79d635", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.1.4" - }, - "weak_map": { - "dependency": "transitive", - "description": { - "name": "weak_map", - "sha256": "5f8e5d5ce57dc624db5fae814dd689ccae1f17f92b426e52f0a7cbe7f6f4ab97", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "4.0.1" + "version": "1.2.1" }, "web": { "dependency": "transitive", @@ -2471,6 +2580,16 @@ "source": "hosted", "version": "3.0.3" }, + "webdriver": { + "dependency": "transitive", + "description": { + "name": "webdriver", + "sha256": "2f3a14ca026957870cfd9c635b83507e0e51d8091568e90129fbf805aba7cade", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "3.1.0" + }, "win32": { "dependency": "transitive", "description": { @@ -2553,7 +2672,7 @@ } }, "sdks": { - "dart": ">=3.9.0 <4.0.0", - "flutter": ">=3.35.0" + "dart": ">=3.11.0 <4.0.0", + "flutter": ">=3.41.0" } } diff --git a/pkgs/by-name/fi/findomain/package.nix b/pkgs/by-name/fi/findomain/package.nix index 110e2654f010..4487624ec997 100644 --- a/pkgs/by-name/fi/findomain/package.nix +++ b/pkgs/by-name/fi/findomain/package.nix @@ -1,16 +1,20 @@ { lib, - rustPlatform, fetchFromGitHub, installShellFiles, - pkg-config, + nix-update-script, openssl, + pkg-config, + rustPlatform, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "findomain"; version = "10.0.1"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "findomain"; repo = "findomain"; @@ -25,9 +29,9 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config ]; - buildInputs = [ - openssl - ]; + buildInputs = [ openssl ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; env = { OPENSSL_NO_VENDOR = true; @@ -37,12 +41,16 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage findomain.1 ''; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + meta = { description = "Fastest and cross-platform subdomain enumerator"; homepage = "https://github.com/Findomain/Findomain"; - changelog = "https://github.com/Findomain/Findomain/releases/tag/${finalAttrs.version}"; + changelog = "https://github.com/Findomain/Findomain/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ fab ]; mainProgram = "findomain"; }; }) diff --git a/pkgs/by-name/fi/findup/package.nix b/pkgs/by-name/fi/findup/package.nix index 0f5fd7506215..b158d8385d74 100644 --- a/pkgs/by-name/fi/findup/package.nix +++ b/pkgs/by-name/fi/findup/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.0.0"; src = fetchFromGitHub { - owner = "booniepepper"; + owner = "so-dang-cool"; repo = "findup"; tag = "v${finalAttrs.version}"; hash = "sha256-6/rQ4xNfzJQwJgrpvFRuirqlx6fVn7sLXfVRFsG3fUw="; @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { - homepage = "https://github.com/booniepepper/findup"; + homepage = "https://github.com/so-dang-cool/findup"; description = "Search parent directories for sentinel files"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ booniepepper ]; diff --git a/pkgs/by-name/fi/firebase-tools/package.nix b/pkgs/by-name/fi/firebase-tools/package.nix index 6805bb6bb89c..3e4e196679f3 100644 --- a/pkgs/by-name/fi/firebase-tools/package.nix +++ b/pkgs/by-name/fi/firebase-tools/package.nix @@ -11,17 +11,17 @@ buildNpmPackage rec { pname = "firebase-tools"; - version = "15.19.1"; + version = "15.24.0"; nodejs = nodejs_22; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; tag = "v${version}"; - hash = "sha256-ofKgbByTlQgU0qVxsAdnOLruZwboHqEmBIOHmptEUcY="; + hash = "sha256-Ly2iWu29lmexSQL/MMjo10CStItxrHKZD1RgEHUzOVM="; }; - npmDepsHash = "sha256-1F1jMl8JFWf/f6smd30W3GQvuoxHtappDOnh3P67/08="; + npmDepsHash = "sha256-Qe/azXfVryMs+XFZdLq270dPrh1AqzWWqpn8PqvRnds="; # No more package-lock.json in upstream src postPatch = '' @@ -46,7 +46,6 @@ buildNpmPackage rec { license = lib.licenses.mit; mainProgram = "firebase"; maintainers = with lib.maintainers; [ - momeemt sarahec ]; }; diff --git a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix index d9afbec8e06e..6b6bd3e8eaf4 100644 --- a/pkgs/by-name/fi/firefly-iii-data-importer/package.nix +++ b/pkgs/by-name/fi/firefly-iii-data-importer/package.nix @@ -16,13 +16,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "firefly-iii-data-importer"; - version = "2.3.2"; + version = "2.3.4"; src = fetchFromGitHub { owner = "firefly-iii"; repo = "data-importer"; tag = "v${finalAttrs.version}"; - hash = "sha256-JLN13SCpMXByu3rWSclcsLBGCLFMzHGHOM+bWLJ2MPw="; + hash = "sha256-869oPalwVdc7Ge8zcG6OniTZ6zhLOknlvFQkEHzLg0M="; }; buildInputs = [ php ]; @@ -42,12 +42,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-QobjMMPEhLvsTwlJJvf4nUi1PcZEDOaU8EzexluOI90="; + vendorHash = "sha256-GEioAwqo9BHzoP4/uetqiQgv+O9Qzqyo/AcW9VP23n0="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-NkxCvC0EPMLi7GV5GG1+5niL3KIaqBsleo11/gzaX/s="; + hash = "sha256-FEEC89/7cEuKU4mY27Pm5nr5EkOoL7BWZRAOpCZK61I="; }; composerRepository = php.mkComposerRepository { diff --git a/pkgs/by-name/fi/firefly-iii/package.nix b/pkgs/by-name/fi/firefly-iii/package.nix index ea54f90bc1aa..82f9ef9be386 100644 --- a/pkgs/by-name/fi/firefly-iii/package.nix +++ b/pkgs/by-name/fi/firefly-iii/package.nix @@ -13,13 +13,13 @@ }: let php = php85; - version = "6.6.3"; + version = "6.6.6"; # Release tarball contains translations downloaded from crowdin releaseTarball = fetchzip { url = "https://github.com/firefly-iii/firefly-iii/releases/download/v${version}/FireflyIII-v${version}.tar.gz"; stripRoot = false; - hash = "sha256-vPuLCjU8MzV5odoDl9QQXj4kKnT6QBSAPwvekMxJtEM="; + hash = "sha256-ejXSfrsmHfbR5KpVo9VxXEsJWZ2ejS55JPl9P/6QzH8="; }; in stdenvNoCC.mkDerivation (finalAttrs: { @@ -30,7 +30,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { owner = "firefly-iii"; repo = "firefly-iii"; tag = "v${finalAttrs.version}"; - hash = "sha256-MPBWurmtaIaKHRLf4TPCdgTVWRZ0JdZ0Ix2N7d80s8c="; + hash = "sha256-OfdMx0qiEszFRsgZlF7KILLNA+XBzcD4c2oWIzdIGfk="; }; buildInputs = [ php ]; @@ -48,13 +48,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit (finalAttrs) pname src version; composerStrictValidation = true; strictDeps = true; - vendorHash = "sha256-qjMDZbPpyTkKxvZhgNERe2ZuRFj7LmRW7XZoeezizbk="; + vendorHash = "sha256-pdgXnNTE3iQ/v6t23nc7FojvVbB74W1AhiP7Z1XACUA="; }; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; - name = "${finalAttrs.pname}-npm-deps"; - hash = "sha256-QlLFhrD94mpfoe9mmCVmem9E4oPsLAGMMf+MbI/5Vx0="; + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + hash = "sha256-7RvuwFI7NrPwjkS0Lz56ItcHAPt2Sp3iarod+FrNon0="; }; preInstall = '' diff --git a/pkgs/by-name/fi/firefox-devtools-mcp/package.nix b/pkgs/by-name/fi/firefox-devtools-mcp/package.nix new file mode 100644 index 000000000000..fb87d07a6648 --- /dev/null +++ b/pkgs/by-name/fi/firefox-devtools-mcp/package.nix @@ -0,0 +1,69 @@ +{ + lib, + buildNpmPackage, + fetchFromGitHub, + makeWrapper, + geckodriver, + nix-update-script, +}: + +buildNpmPackage (finalAttrs: { + pname = "firefox-devtools-mcp"; + version = "0.9.9"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "mozilla"; + repo = "firefox-devtools-mcp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bz6LkiUbgu81OnPv6xegmo7EYVgGJdlbB5HZsW4QO/Q="; + }; + + npmDepsHash = "sha256-JnAivSiThEm+EPm6gY08zQfD/aaF2sLfz6YSfsle9uE="; + + # 0.9.9 ships a stale hardcoded server version (0.7.1) in constants.ts; upstream switched to + # build-time injection right after release (Bug 2050918), so this substitution should be dropped + # once that fix lands in a tagged release. + postPatch = '' + substituteInPlace src/config/constants.ts \ + --replace-fail "'0.7.1'" "'${finalAttrs.version}'" + ''; + + nativeBuildInputs = [ makeWrapper ]; + + # The `geckodriver` npm dependency's install script downloads a prebuilt binary from the network, + # which is unavailable in the sandbox. The server locates geckodriver on PATH first (see + # src/firefox/core.ts), so skip the install scripts and provide geckodriver from nixpkgs via the + # wrapper below. + npmFlags = [ "--ignore-scripts" ]; + + # `npm run build` (tsup) emits dist/index.js, the package's bin entry point. + postInstall = '' + wrapProgram $out/bin/firefox-devtools-mcp \ + --prefix PATH : ${lib.makeBinPath [ geckodriver ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Model Context Protocol server for Firefox DevTools automation"; + longDescription = '' + A Model Context Protocol (MCP) server that automates Firefox via WebDriver BiDi. + It works with MCP clients such as Claude Code, Claude Desktop, Cursor and Cline, + exposing tools to navigate pages, take snapshots, inspect the DOM, capture network requests + and console messages, take screenshots and more. + + A local Firefox installation is required at runtime. + ''; + homepage = "https://github.com/mozilla/firefox-devtools-mcp"; + changelog = "https://github.com/mozilla/firefox-devtools-mcp/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ philiptaron ]; + mainProgram = "firefox-devtools-mcp"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fi/firefox-sync-client/package.nix b/pkgs/by-name/fi/firefox-sync-client/package.nix index 2a229175c249..5712e849d4b9 100644 --- a/pkgs/by-name/fi/firefox-sync-client/package.nix +++ b/pkgs/by-name/fi/firefox-sync-client/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "firefox-sync-client"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "Mikescher"; repo = "firefox-sync-client"; rev = "v${finalAttrs.version}"; - hash = "sha256-tzYuYSifV/a9SPb5KyabhQ29ByXuAgQgi3t0VMHVSH8="; + hash = "sha256-hZ6sd/IM/X8WWNc1ca7w1R4fsixo5VMGEujmPJvEMQc="; }; - vendorHash = "sha256-kDh/5SOwKPYl9sC9W17bnzG73fGI5iX6lSjcB3IjOss="; + vendorHash = "sha256-NQKF5LugGh2wNWf6M3uUhS2YOTuv2/K56gWUv5ACwEU="; meta = { description = "Commandline-utility to list/view/edit/delete entries in a firefox-sync account"; diff --git a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix index ffd28d2e605b..297083d0e04f 100644 --- a/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix +++ b/pkgs/by-name/fi/firefoxpwa-unwrapped/package.nix @@ -16,13 +16,13 @@ rustPlatform.buildRustPackage rec { pname = "firefoxpwa-unwrapped"; - version = "2.18.2"; + version = "2.18.4"; src = fetchFromGitHub { owner = "filips123"; repo = "PWAsForFirefox"; rev = "v${version}"; - hash = "sha256-eNJKR6dmG4dDKwvWjC0Nbzk5ixNJtnRXjWJgxc9W5i8="; + hash = "sha256-Rz0H6dpeTnKHRnmBUZicjgzRSrcpamuGDJRw/lqD/7k="; }; sourceRoot = "${src.name}/native"; diff --git a/pkgs/by-name/fi/firewalld/package.nix b/pkgs/by-name/fi/firewalld/package.nix index 0d7e5ea21f23..9d2feb3d738b 100644 --- a/pkgs/by-name/fi/firewalld/package.nix +++ b/pkgs/by-name/fi/firewalld/package.nix @@ -43,7 +43,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "firewalld"; - version = "2.4.2"; + version = "2.5.0"; __structuredAttrs = true; strictDeps = true; @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "firewalld"; repo = "firewalld"; tag = "v${finalAttrs.version}"; - hash = "sha256-RUDDUvpGfWEKI+VtC4SBMLKsAHkStV1qAYpHLQbN5HM="; + hash = "sha256-d/mKBkyi9f1/FpD5ECnvC0R/WCtfq6ewWu8kFs6sG9o="; }; patches = [ @@ -80,6 +80,7 @@ stdenv.mkDerivation (finalAttrs: { docbook_xml_dtd_42 docbook-xsl-nons glib + gobject-introspection intltool libxml2 libxslt @@ -94,7 +95,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib - gobject-introspection ipset iptables kmod @@ -132,6 +132,9 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString (!withGui) '' rm $out/bin/firewall-{applet,config} + rm $out/etc/xdg/autostart/firewall-applet.desktop + rm $out/share/applications/firewall-config.desktop + rm $out/share/metainfo/org.firewalld.firewall-config.metainfo.xml ''; dontWrapGApps = true; diff --git a/pkgs/by-name/fi/firezone-gateway/package.nix b/pkgs/by-name/fi/firezone-gateway/package.nix index 0cd89a809b4c..e8031b677e6a 100644 --- a/pkgs/by-name/fi/firezone-gateway/package.nix +++ b/pkgs/by-name/fi/firezone-gateway/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "firezone-gateway"; - version = "1.4.18"; + version = "1.5.2"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gateway-${finalAttrs.version}"; - hash = "sha256-vxOFca6yO9AvgIJwizhaNlOjOvV00+ckQfXIJ17ASq4="; + hash = "sha256-bfLPOhxv0xfnU3Q1zZWbhqvNe9Hav2RgF/ESMk81F4I="; }; - cargoHash = "sha256-8YftVt72JpmxWB/WvOPpduE0/QgYvQhSuFRmsFth2iU="; + cargoHash = "sha256-oOJ/UkamQrlWjAz2A4oObdBssHH9iJWN2BHFgMPOxck="; sourceRoot = "${finalAttrs.src.name}/rust"; buildAndTestSubdir = "gateway"; env.RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/firezone-gui-client/package.nix b/pkgs/by-name/fi/firezone-gui-client/package.nix index 4a5530b6878a..bbc69b367a77 100644 --- a/pkgs/by-name/fi/firezone-gui-client/package.nix +++ b/pkgs/by-name/fi/firezone-gui-client/package.nix @@ -19,7 +19,7 @@ libayatana-appindicator, webkitgtk_4_1, wrapGAppsHook3, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -27,12 +27,12 @@ copyDesktopItems, }: let - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "gui-client-${version}"; - hash = "sha256-KozSy44Opx6cukA0QTXeMpI3fP49iyabFzPLIJckOZ4="; + hash = "sha256-Ew6oLVL7u9RtidHNsz29lzH9WPxKNneEoVACuLdP7yo="; }; frontend = stdenvNoCC.mkDerivation rec { @@ -41,10 +41,10 @@ let pnpmDeps = fetchPnpmDeps { inherit pname version; - pnpm = pnpm_9; + pnpm = pnpm_10; src = "${src}/rust/gui-client"; - fetcherVersion = 3; - hash = "sha256-akanXiWehhQRx6WHN75PjYvFxFiSsJ5dJaguJBTM9J0="; + fetcherVersion = 4; + hash = "sha256-770+06rpf/P9hOFLgEWc0/BKjIxHyCWB2E3tqdEskAA="; }; pnpmRoot = "rust/gui-client"; @@ -52,7 +52,7 @@ let nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 nodejs ]; @@ -79,7 +79,7 @@ rustPlatform.buildRustPackage rec { pname = "firezone-gui-client"; inherit version src; - cargoHash = "sha256-TDP1Z4MeQaSER8MGnCEQfIhRsakaSCeJ7boUMBYkkI0="; + cargoHash = "sha256-LHHaklGIMuDuZwikXiQzLPbmkUbPyYR04UBQTBxq2ps="; sourceRoot = "${src.name}/rust"; buildAndTestSubdir = "gui-client"; env.RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/firezone-headless-client/package.nix b/pkgs/by-name/fi/firezone-headless-client/package.nix index 877f40279af8..7d80fc1e0f50 100644 --- a/pkgs/by-name/fi/firezone-headless-client/package.nix +++ b/pkgs/by-name/fi/firezone-headless-client/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "firezone-headless-client"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "firezone"; repo = "firezone"; tag = "headless-client-${finalAttrs.version}"; - hash = "sha256-Lo5iUXlpAecglr0uohOdsefeaDQZor2YoF0O99CxvEo="; + hash = "sha256-yEceZJBqSF35herNjbqFHKaIoFJwbkDN28wlxFa1UbU="; }; - cargoHash = "sha256-1e2uqxZFDbtcQREB0s2jxfSFgs/hnPxTlUGFeK5L9yw="; + cargoHash = "sha256-3V2eMxUtNcnWsh7cYA5Wf979sKmFl7bjwwrqwcfW4tI="; sourceRoot = "${finalAttrs.src.name}/rust"; buildAndTestSubdir = "headless-client"; env.RUSTFLAGS = "--cfg system_certs"; diff --git a/pkgs/by-name/fi/firezone-server/package.nix b/pkgs/by-name/fi/firezone-server/package.nix index 0e44d761a1e2..1322c7da4c64 100644 --- a/pkgs/by-name/fi/firezone-server/package.nix +++ b/pkgs/by-name/fi/firezone-server/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, beam27Packages, gitMinimal, - pnpm_9, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -34,10 +34,10 @@ beam27Packages.mixRelease rec { pnpmDeps = fetchPnpmDeps { inherit pname version; - pnpm = pnpm_9; + pnpm = pnpm_10; src = "${src}/apps/web/assets"; - fetcherVersion = 3; - hash = "sha256-tB0y3T/dZBe8BHz7AV913zQ4oQu7VLyqHCnzBycNg18="; + fetcherVersion = 4; + hash = "sha256-Uq6dAYYWT8G6upYcNEzVc8Gb2HUj8SaWRD0/w0quaRE="; }; pnpmRoot = "apps/web/assets"; @@ -63,7 +63,7 @@ beam27Packages.mixRelease rec { nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_10 nodejs ]; diff --git a/pkgs/by-name/fi/fish-irssi/package.nix b/pkgs/by-name/fi/fish-irssi/package.nix index 6dcfb1bfc05a..7b15a7c33066 100644 --- a/pkgs/by-name/fi/fish-irssi/package.nix +++ b/pkgs/by-name/fi/fish-irssi/package.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation { pname = "fish-irssi"; - version = "unstable-2023-08-05"; + version = "1.6-unstable-2023-08-05"; src = fetchFromGitHub { owner = "falsovsky"; diff --git a/pkgs/by-name/fi/fish-lsp/package.nix b/pkgs/by-name/fi/fish-lsp/package.nix index 28a72e4b8a3b..9154a2b3b412 100644 --- a/pkgs/by-name/fi/fish-lsp/package.nix +++ b/pkgs/by-name/fi/fish-lsp/package.nix @@ -16,18 +16,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "fish-lsp"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "ndonfris"; repo = "fish-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-G0RaDXn3UNkdrlnjNH75ftvcLgAuiY09aXY3MXjaLEE="; + hash = "sha256-kPGbEi0KCq/BsEq2RkFb5zfARncMIvXHniOUglNYk1s="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-uLrdja3G/OwHZXkQbKXsPmGRIs08b3sCPtxtP1a52fg="; + hash = "sha256-WrH56oWTTDG1P/OHC5WjLCkZM3j6HEirAvhF+6Xd76I="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fi/fish/nix-darwin-path.patch b/pkgs/by-name/fi/fish/nix-darwin-path.patch index 8e92dcf1e9ce..cca5b1ccd81d 100644 --- a/pkgs/by-name/fi/fish/nix-darwin-path.patch +++ b/pkgs/by-name/fi/fish/nix-darwin-path.patch @@ -1,12 +1,12 @@ diff --git a/share/config.fish b/share/config.fish -index 73148ac25..1964e30be 100644 +index b246916a5..05252c35f 100644 --- a/share/config.fish +++ b/share/config.fish -@@ -175,6 +175,7 @@ and __fish_set_locale +@@ -132,6 +132,7 @@ and __fish_set_locale + # This used to be in etc/config.fish - keep it here to keep the semantics # - if status --is-login - if command -sq /usr/libexec/path_helper -+ and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE - __fish_macos_set_env PATH /etc/paths '/etc/paths.d' - if test -n "$MANPATH" - __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d' + if status is-login && command -sq /usr/libexec/path_helper ++ and not set -q __NIX_DARWIN_SET_ENVIRONMENT_DONE + __fish_macos_set_env PATH /etc/paths '/etc/paths.d' + if test -n "$MANPATH" + __fish_macos_set_env MANPATH /etc/manpaths '/etc/manpaths.d' diff --git a/pkgs/by-name/fi/fish/package.nix b/pkgs/by-name/fi/fish/package.nix index a991b9b5683c..565619aecf2e 100644 --- a/pkgs/by-name/fi/fish/package.nix +++ b/pkgs/by-name/fi/fish/package.nix @@ -150,13 +150,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fish"; - version = "4.7.1"; + version = "4.8.1"; src = fetchFromGitHub { owner = "fish-shell"; repo = "fish-shell"; tag = finalAttrs.version; - hash = "sha256-u0mBdWkxP4zI6NUhJ0LJrEDrbAAfTDi8IapsWWC9yWc="; + hash = "sha256-i9Ng9RYqlMGRShu2sDSXCZ6KD7n7A0TKzLdyatXjBmY="; }; env = { @@ -169,7 +169,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-d4YA9fnDQyfyK675nP+tiTqJ1o2jqjwPHU1trXd8MCA="; + hash = "sha256-ikHv1WP38ClHGZy3StiyGS+lDHOjBT8ohJ/HdJwtYgw="; }; patches = [ @@ -404,10 +404,17 @@ stdenv.mkDerivation (finalAttrs: { fishConfig = let fishScript = writeText "test.fish" '' - set -x __fish_bin_dir ${finalAttrs.finalPackage}/bin - echo $__fish_bin_dir - cp -r ${finalAttrs.finalPackage}/share/fish/tools/web_config/* . - chmod -R +w * + # webconfig.py locates fish via $fish_bin_dir, which fish_config + # normally exports from the read-only $__fish_bin_dir. + set -x fish_bin_dir $__fish_bin_dir + echo $fish_bin_dir + + # The web_config tool is embedded in the binary, so extract it. + for f in (status list-files tools/web_config) + mkdir -p (path dirname $f) + status get-file $f > $f + end + cd tools/web_config # if we don't set `delete=False`, the file will get cleaned up # automatically (leading the test to fail because there's no diff --git a/pkgs/by-name/fi/fittrackee/package.nix b/pkgs/by-name/fi/fittrackee/package.nix index f261ac07eae6..ed8611772707 100644 --- a/pkgs/by-name/fi/fittrackee/package.nix +++ b/pkgs/by-name/fi/fittrackee/package.nix @@ -1,49 +1,51 @@ { - fetchFromGitHub, + fetchFromCodeberg, + fetchNpmDeps, lib, stdenv, + nodejs_24, + npmHooks, postgresql, postgresqlTestHook, python3Packages, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "fittrackee"; - version = "0.11.2"; + version = "1.3.3"; pyproject = true; - src = fetchFromGitHub { - owner = "SamR1"; + src = fetchFromCodeberg { + owner = "FitTrackee"; repo = "FitTrackee"; tag = "v${finalAttrs.version}"; - hash = "sha256-A9gebHxNCpYUUIm7IjyySojIIyuTxfYCUeUufpUM1iA="; + hash = "sha256-XWR9gg52pfg0lHoFikQ2wVhvkPCTjTTndBYqBzYPB8s="; }; + makeCacheWritable = true; + npmRoot = "fittrackee_client"; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) pname version src; + hash = "sha256-HEgof2ln+mBxM63Dv8Lc/bfx3ozoJCRYYyJOz6jh+Vs="; + sourceRoot = "${finalAttrs.src.name}/fittrackee_client"; + }; + + nativeBuildInputs = [ + nodejs_24 + npmHooks.npmConfigHook + ]; + + preBuild = '' + pushd fittrackee_client + npm run build-only + popd + ''; + build-system = [ python3Packages.poetry-core ]; - # The upstream project changed the behavior of the CLI when --set-admin and --set-role are used together. - # Previously, it would raise an error, but now it issues a deprecation warning. - # This patch updates the test assertion to expect the new deprecation warning message. - # See upstream commit 6eda1b6119b3e41bdf8896e74b4a07d3c9e97609. - postPatch = '' - substituteInPlace fittrackee/tests/users/test_users_commands.py \ - --replace '"--set-admin and --set-role can not be used together."' '"WARNING: --set-admin is deprecated. Please use --set-role option instead."' - ''; - - pythonRelaxDeps = [ - "authlib" - "fitdecode" - "flask" - "flask-limiter" - "flask-migrate" - "nh3" - "lxml" - "pyopenssl" - "pytz" - "sqlalchemy" - "xmltodict" - ]; + pythonRelaxDeps = true; dependencies = with python3Packages; @@ -53,21 +55,31 @@ python3Packages.buildPythonApplication (finalAttrs: { click dramatiq dramatiq-abort + feedgenerator fitdecode flask + flask-babel flask-bcrypt flask-dramatiq flask-limiter flask-migrate flask-sqlalchemy + geoalchemy2 + geopandas gpxpy gunicorn humanize jsonschema + lxml + mistune nh3 + numpy + pandas psycopg2-binary pyjwt pyopenssl + pyproj + python-magic pytz shortuuid sqlalchemy @@ -76,7 +88,9 @@ python3Packages.buildPythonApplication (finalAttrs: { xmltodict ] ++ dramatiq.optional-dependencies.redis - ++ flask-limiter.optional-dependencies.redis; + ++ flask-limiter.optional-dependencies.redis + ++ geoalchemy2.optional-dependencies.shapely + ++ staticmap3.optional-dependencies.filecache; pythonImportsCheck = [ "fittrackee" ]; @@ -84,7 +98,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pytestCheckHook freezegun postgresqlTestHook - postgresql + (postgresql.withPackages (ps: with ps; [ postgis ])) time-machine ]; @@ -93,6 +107,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; postgresqlTestSetupPost = '' + echo "CREATE EXTENSION postgis; CREATE EXTENSION postgis_topology;" | PGUSER=postgres psql test_db export DATABASE_TEST_URL=postgresql://$PGUSER/$PGDATABASE?host=$PGHOST ''; @@ -105,8 +120,8 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Self-hosted outdoor activity tracker"; - homepage = "https://github.com/SamR1/FitTrackee"; - changelog = "https://github.com/SamR1/FitTrackee/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://docs.fittrackee.org/"; + changelog = "https://codeberg.org/FitTrackee/FitTrackee/src/tag/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ tebriel diff --git a/pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh b/pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh similarity index 100% rename from pkgs/build-support/setup-hooks/fix-darwin-dylib-names.sh rename to pkgs/by-name/fi/fixDarwinDylibNames/fix-darwin-dylib-names.sh diff --git a/pkgs/by-name/fi/fixDarwinDylibNames/package.nix b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix new file mode 100644 index 000000000000..3caba19ec6da --- /dev/null +++ b/pkgs/by-name/fi/fixDarwinDylibNames/package.nix @@ -0,0 +1,14 @@ +{ + lib, + targetPackages, + makeSetupHook, +}: + +makeSetupHook { + name = "fix-darwin-dylib-names-hook"; + substitutions = { inherit (targetPackages.stdenv.cc) targetPrefix; }; + meta = { + platforms = lib.platforms.darwin; + license = lib.licenses.mit; + }; +} ./fix-darwin-dylib-names.sh diff --git a/pkgs/by-name/fl/flac2mp3/package.nix b/pkgs/by-name/fl/flac2mp3/package.nix index 8d2ef887ec22..33ce91412280 100644 --- a/pkgs/by-name/fl/flac2mp3/package.nix +++ b/pkgs/by-name/fl/flac2mp3/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Tool to convert audio files from flac to mp3 format including the copying of tags"; homepage = "https://github.com/robinbowes/flac2mp3"; changelog = "https://github.com/robinbowes/flac2mp3/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ lilahummel ]; }; }) diff --git a/pkgs/by-name/fl/flake-edit/package.nix b/pkgs/by-name/fl/flake-edit/package.nix index 9961bfa6934c..45dcfb304755 100644 --- a/pkgs/by-name/fl/flake-edit/package.nix +++ b/pkgs/by-name/fl/flake-edit/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "flake-edit"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "a-kenji"; repo = "flake-edit"; rev = "v${finalAttrs.version}"; - hash = "sha256-4wy+J+xIOSmavPgxYO+Wji9gyRomOwk0ibwQOQqJBSM="; + hash = "sha256-xEQ+zBU31KBmv2j19KB7pX2P4a1MLPT8BDbDGXBSySk="; }; - cargoHash = "sha256-5CBSvE1darONbZMg4PsEqyhaVBUS84xcG+BafJzeaS0="; + cargoHash = "sha256-QAVu/fiuV818zTrSqy2k+2GMz18oYcrf6xLY/7bii2c="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/fl/flameshot/load-missing-deps.patch b/pkgs/by-name/fl/flameshot/load-missing-deps.patch index 9fdb2c46d7a4..ccd4efc29a3d 100644 --- a/pkgs/by-name/fl/flameshot/load-missing-deps.patch +++ b/pkgs/by-name/fl/flameshot/load-missing-deps.patch @@ -1,46 +1,46 @@ ---- a/CMakeLists.txt 2025-08-21 13:12:55 -+++ b/CMakeLists.txt 2025-08-21 13:16:26 -@@ -24,28 +24,8 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -35,27 +35,7 @@ #Needed due to linker error with QtColorWidget set(CMAKE_POSITION_INDEPENDENT_CODE ON) - -+find_package(QtColorWidgets REQUIRED) +- -# Dependency can be fetched via flatpak builder -if(EXISTS "${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets/CMakeLists.txt") -- add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL) +- add_subdirectory("${CMAKE_SOURCE_DIR}/external/Qt-Color-Widgets" EXCLUDE_FROM_ALL) -else() -- FetchContent_Declare( -- qtColorWidgets -- GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git -- GIT_TAG 352bc8f99bf2174d5724ee70623427aa31ddc26a -- ) +- FetchContent_Declare( +- qtColorWidgets +- GIT_REPOSITORY https://gitlab.com/mattbas/Qt-Color-Widgets.git +- GIT_TAG 5d52e907e50dc88cf969b41cea44665ff6c475b1 +- ) - #Workaround for duplicate GUID in windows WIX installer -- if (WIN32) -- FetchContent_GetProperties(qtColorWidgets) -- if(NOT qtcolorwidgets_POPULATED) -- FetchContent_Populate(qtColorWidgets) -- add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL) -- endif() +- if(WIN32) +- FetchContent_GetProperties(qtColorWidgets) +- if(NOT qtcolorwidgets_POPULATED) +- FetchContent_Populate(qtColorWidgets) +- add_subdirectory(${qtcolorwidgets_SOURCE_DIR} ${qtcolorwidgets_BINARY_DIR} EXCLUDE_FROM_ALL) +- endif() - else() -- FetchContent_MakeAvailable(qtColorWidgets) +- FetchContent_MakeAvailable(qtColorWidgets) - endif() -endif() -- ++find_package(QtColorWidgets REQUIRED) + # This can be read from ${PROJECT_NAME} after project() is called - if (APPLE) - set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment version") -@@ -133,12 +113,7 @@ + if(APPLE) +@@ -124,12 +104,7 @@ + # ToDo: Check if this is used anywhere option(BUILD_STATIC_LIBS ON) - - if (APPLE) + + if(WIN32 OR APPLE) - FetchContent_Declare( -- qHotKey -- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey -- GIT_TAG master +- qHotKey +- GIT_REPOSITORY https://github.com/flameshot-org/QHotkey +- GIT_TAG master - ) - FetchContent_MakeAvailable(QHotKey) + find_package(QHotKey REQUIRED) endif() - + add_subdirectory(src) \ No newline at end of file diff --git a/pkgs/by-name/fl/flameshot/package.nix b/pkgs/by-name/fl/flameshot/package.nix index 7ae09fd008df..054c8c93ea94 100644 --- a/pkgs/by-name/fl/flameshot/package.nix +++ b/pkgs/by-name/fl/flameshot/package.nix @@ -19,13 +19,13 @@ assert stdenv.hostPlatform.isDarwin -> (!enableWlrSupport); stdenv.mkDerivation (finalAttrs: { pname = "flameshot"; - version = "13.3.0"; + version = "14.0.0"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; tag = "v${finalAttrs.version}"; - hash = "sha256-RyoLniRmJRinLUwgmaA4RprYAVHnoPxCP9LyhHfUPe0="; + hash = "sha256-GnJ3nOJyyqQbCTMrTYhnQfEOXqCy0x3IapX/PsaZ3VI="; }; cmakeFlags = [ diff --git a/pkgs/by-name/fl/flamp/package.nix b/pkgs/by-name/fl/flamp/package.nix index 841a43c6a9f5..43a893f92198 100644 --- a/pkgs/by-name/fl/flamp/package.nix +++ b/pkgs/by-name/fl/flamp/package.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ stteague ]; platforms = lib.platforms.unix; - broken = stdenv.system == "x86_64-darwin"; mainProgram = "flamp"; }; }) diff --git a/pkgs/by-name/fl/flannel/package.nix b/pkgs/by-name/fl/flannel/package.nix index 7a2b5240fdea..d873f3e8c261 100644 --- a/pkgs/by-name/fl/flannel/package.nix +++ b/pkgs/by-name/fl/flannel/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "flannel"; - version = "0.28.5"; + version = "0.28.7"; rev = "v${version}"; - vendorHash = "sha256-TsMIH1L2LD+LxoAMwtvOa36sakiyxoJ2Av0oW5+dEJQ="; + vendorHash = "sha256-io2xUh5jM2x7P01MIpPgLAVXC/CAL22zrC6kfi4uYFs="; src = fetchFromGitHub { inherit rev; owner = "flannel-io"; repo = "flannel"; - sha256 = "sha256-cG6w2fErJ6lnEfnHXEVwk6dk056bSamPUWquRu1R0QU="; + sha256 = "sha256-K810ikYfDdOtOUTSGqeAwczxNO/XPB+2RbelHBc8tok="; }; ldflags = [ "-X github.com/flannel-io/flannel/pkg/version.Version=${rev}" ]; diff --git a/pkgs/by-name/fl/flare-signal/package.nix b/pkgs/by-name/fl/flare-signal/package.nix index fee8f4adcadf..3faed27e98f6 100644 --- a/pkgs/by-name/fl/flare-signal/package.nix +++ b/pkgs/by-name/fl/flare-signal/package.nix @@ -24,18 +24,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "flare"; - version = "0.20.6"; + version = "0.21.0"; src = fetchFromGitLab { owner = "schmiddi-on-mobile"; repo = "flare"; tag = finalAttrs.version; - hash = "sha256-X+3fwIDqRC9S0SYkN3knjQ5wFSptxuM0iggu4pgZ89Q="; + hash = "sha256-Vt83VsqylFSM2rUj5egu1FEFjaVLVUI8SeGHAXmgKW4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-EEIZjK8bVPg1AFkmOvckkVMCRHXLoiBz5CITwpolJ4k="; + hash = "sha256-GlkrQtMGFqujEiwAVMts6nsPbQ2GTxwYIJsu6axeg0Q="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/fl/flare/engine.nix b/pkgs/by-name/fl/flare/engine.nix index 8b9e26d8e2d4..55ed135f8d7e 100644 --- a/pkgs/by-name/fl/flare/engine.nix +++ b/pkgs/by-name/fl/flare/engine.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flare/game.nix b/pkgs/by-name/fl/flare/game.nix index c3868c8d2b3d..0ec86b74347b 100644 --- a/pkgs/by-name/fl/flare/game.nix +++ b/pkgs/by-name/fl/flare/game.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { aanderse McSinyx ]; - license = [ lib.licenses.cc-by-sa-30 ]; + license = lib.licenses.cc-by-sa-30; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fl/flarum/package.nix b/pkgs/by-name/fl/flarum/package.nix index 227eb5b395fe..d79a26a5bb34 100644 --- a/pkgs/by-name/fl/flarum/package.nix +++ b/pkgs/by-name/fl/flarum/package.nix @@ -2,6 +2,7 @@ lib, php, fetchFromGitHub, + nixosTests, }: php.buildComposerProject2 (finalAttrs: { @@ -19,6 +20,8 @@ php.buildComposerProject2 (finalAttrs: { composerStrictValidation = false; vendorHash = "sha256-EHl+Mr6y5A51EpLPAWUGtiPkLOky6KvsSY4JWHeyO28="; + passthru.tests.module = nixosTests.flarum; + meta = { changelog = "https://github.com/flarum/framework/blob/main/CHANGELOG.md"; description = "Delightfully simple discussion platform for your website"; diff --git a/pkgs/by-name/fl/flashprog/package.nix b/pkgs/by-name/fl/flashprog/package.nix index 3f7d9aa58be8..96baeb034583 100644 --- a/pkgs/by-name/fl/flashprog/package.nix +++ b/pkgs/by-name/fl/flashprog/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://flashprog.org"; description = "Utility for reading, writing, erasing and verifying flash ROM chips"; changelog = "https://flashprog.org/wiki/Flashprog/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ felixsinger funkeleinhorn diff --git a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix index eb89a4959e9f..410a02fe5734 100644 --- a/pkgs/by-name/fl/flat-remix-icon-theme/package.nix +++ b/pkgs/by-name/fl/flat-remix-icon-theme/package.nix @@ -49,7 +49,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Flat remix is a pretty simple icon theme inspired on material design"; homepage = "https://drasite.com/flat-remix"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; # breeze-icons and pantheon.elementary-icon-theme dependencies are restricted to linux platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/fl/flatcc/package.nix b/pkgs/by-name/fl/flatcc/package.nix index 23300be4a0e1..62d30133edb2 100644 --- a/pkgs/by-name/fl/flatcc/package.nix +++ b/pkgs/by-name/fl/flatcc/package.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "flatcc"; homepage = "https://github.com/dvidelabs/flatcc"; changelog = "https://github.com/dvidelabs/flatcc/blob/${finalAttrs.src.tag}/CHANGELOG.md"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ onny ]; }; }) diff --git a/pkgs/by-name/fl/flatpak/package.nix b/pkgs/by-name/fl/flatpak/package.nix index 5e9a0b3b2cff..7f909e0960d0 100644 --- a/pkgs/by-name/fl/flatpak/package.nix +++ b/pkgs/by-name/fl/flatpak/package.nix @@ -80,7 +80,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "flatpak"; - version = "1.16.6"; + version = "1.18.0"; # TODO: split out lib once we figure out what to do with triggerdir outputs = [ @@ -98,7 +98,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/flatpak/flatpak/releases/download/${finalAttrs.version}/flatpak-${finalAttrs.version}.tar.xz"; - hash = "sha256-HmPn8/5EtgLzTZKm/kb9ijvGvpRgwDwmgeV5dsZY7sM="; + hash = "sha256-pYV6ZsQDndoF2SvcsrAz14jNJYlhAWfw7F8OyNT6xvI="; }; patches = [ @@ -119,7 +119,7 @@ stdenv.mkDerivation (finalAttrs: { # and cannot bind FHS paths since those are not available on NixOS. finalAttrs.passthru.icon-validator-patch ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ # Hardcode paths used by tests and change test runtime generation to use files from Nix store. # https://github.com/flatpak/flatpak/issues/1460 (replaceVars ./fix-test-paths.patch { diff --git a/pkgs/by-name/fl/flawfinder/package.nix b/pkgs/by-name/fl/flawfinder/package.nix index dfbf11197fce..658c6c30740e 100644 --- a/pkgs/by-name/fl/flawfinder/package.nix +++ b/pkgs/by-name/fl/flawfinder/package.nix @@ -27,7 +27,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to examines C/C++ source code for security flaws"; mainProgram = "flawfinder"; homepage = "https://dwheeler.com/flawfinder/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fl/flawz/package.nix b/pkgs/by-name/fl/flawz/package.nix index a95d7e392108..2a39916d21da 100644 --- a/pkgs/by-name/fl/flawz/package.nix +++ b/pkgs/by-name/fl/flawz/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "flawz"; - version = "0.3.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "orhun"; repo = "flawz"; rev = "v${finalAttrs.version}"; - hash = "sha256-7p/BUXrElJutUcRMu+LxdsMxA6lCDnaci0fDaKGsawI="; + hash = "sha256-a+UfWoBQP54/Vj5VJ9eMKcG+wQxXtd1bXii281SwjHo="; }; - cargoHash = "sha256-X2RyavcPOQzuAt347KxfmNtO4YsFdncwUcBWtMfxaRU="; + cargoHash = "sha256-MnBbxGS70pG2vRQKfqI/fuWC4gCOYehoh/ncNXsN9kI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fl/flclash/package.nix b/pkgs/by-name/fl/flclash/package.nix index eb941222e743..85f3e0d8f4f0 100644 --- a/pkgs/by-name/fl/flclash/package.nix +++ b/pkgs/by-name/fl/flclash/package.nix @@ -31,7 +31,7 @@ let meta = { description = "Proxy client based on ClashMeta, simple and easy to use"; homepage = "https://github.com/chen08209/FlClash"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ VZstless ]; }; @@ -83,6 +83,7 @@ flutter335.buildFlutterApplication { genericName = "FlClash"; desktopName = "FlClash"; categories = [ "Network" ]; + startupWMClass = "com.follow.clash"; keywords = [ "FlClash" "Clash" diff --git a/pkgs/by-name/fl/fldigi/package.nix b/pkgs/by-name/fl/fldigi/package.nix index ce45fc6315ab..af7668fb45dc 100644 --- a/pkgs/by-name/fl/fldigi/package.nix +++ b/pkgs/by-name/fl/fldigi/package.nix @@ -62,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ relrod - ftrvxmtrx ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/fl/flent/package.nix b/pkgs/by-name/fl/flent/package.nix index 3c75ba139927..523f72e2659b 100644 --- a/pkgs/by-name/fl/flent/package.nix +++ b/pkgs/by-name/fl/flent/package.nix @@ -2,18 +2,21 @@ lib, python3Packages, fetchPypi, + qt6, + irtt, + iputils, + netperf, procps, - qt5, nix-update-script, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "flent"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) pname version; - hash = "sha256-BPwh3oWIY1YEI+ecgi9AUiX4Ka/Y5dYikwmfvvNB+eg="; + hash = "sha256-qy+BvMpBDBtBqEEM9yEko/Gb2pusxF/LqiutSKlS2eE="; }; build-system = with python3Packages; [ @@ -21,11 +24,23 @@ python3Packages.buildPythonApplication (finalAttrs: { sphinx ]; - nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + nativeBuildInputs = [ qt6.wrapQtAppsHook ]; + buildInputs = [ qt6.qtbase ]; + makeWrapperArgs = [ + "--prefix" + "PATH" + ":" + (lib.makeBinPath [ + iputils + irtt + netperf + procps + ]) + ]; dependencies = with python3Packages; [ matplotlib - pyqt5 + pyqt6 qtpy ]; @@ -36,17 +51,10 @@ python3Packages.buildPythonApplication (finalAttrs: { sed -i 's|self.skip|pass; #&|' unittests/test_gui.py # Dummy qt setup for gui tests - export QT_PLUGIN_PATH="${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix}" + export QT_PLUGIN_PATH="${qt6.qtbase}/${qt6.qtbase.qtPluginPrefix}" export QT_QPA_PLATFORM=offscreen ''; - preFixup = '' - makeWrapperArgs+=( - "''${qtWrapperArgs[@]}" - --prefix PATH : ${lib.makeBinPath [ procps ]} - ) - ''; - passthru.updateScript = nix-update-script { }; meta = { description = "FLExible Network Tester"; diff --git a/pkgs/by-name/fl/flet-client-flutter/package.nix b/pkgs/by-name/fl/flet-client-flutter/package.nix index 7d85c1fc14ea..7733ee43da04 100644 --- a/pkgs/by-name/fl/flet-client-flutter/package.nix +++ b/pkgs/by-name/fl/flet-client-flutter/package.nix @@ -51,7 +51,7 @@ flutter338.buildFlutterApplication rec { mpv-unwrapped gst_all_1.gst-libav gst_all_1.gst-plugins-base - gst_all_1.gst-vaapi + gst_all_1.gst-plugins-bad gst_all_1.gstreamer libunwind orc @@ -92,7 +92,6 @@ flutter338.buildFlutterApplication rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ heyimnova - lucasew ]; mainProgram = "flet"; }; diff --git a/pkgs/by-name/fl/flexget/package.nix b/pkgs/by-name/fl/flexget/package.nix index edfe32405653..98182d3b6c51 100644 --- a/pkgs/by-name/fl/flexget/package.nix +++ b/pkgs/by-name/fl/flexget/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "flexget"; - version = "3.19.23"; + version = "3.19.30"; pyproject = true; src = fetchFromGitHub { owner = "Flexget"; repo = "Flexget"; tag = "v${finalAttrs.version}"; - hash = "sha256-r54vFE2FISNge84jaFKL5SGQ41LhEq1YVvoGcKOsi0I="; + hash = "sha256-LfitvBEg9qjv6glIK9KbttM/5nSnKA0i8+Q8gCNMVx8="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/fl/flightcore/override-tauri.conf.json b/pkgs/by-name/fl/flightcore/override-tauri.conf.json new file mode 100644 index 000000000000..9c3b2d049b86 --- /dev/null +++ b/pkgs/by-name/fl/flightcore/override-tauri.conf.json @@ -0,0 +1,8 @@ +{ + "build": { + "beforeBuildCommand": "" + }, + "bundle":{ + "createUpdaterArtifacts": false + } +} diff --git a/pkgs/by-name/fl/flightcore/package.nix b/pkgs/by-name/fl/flightcore/package.nix new file mode 100644 index 000000000000..51783604e22d --- /dev/null +++ b/pkgs/by-name/fl/flightcore/package.nix @@ -0,0 +1,120 @@ +{ + buildNpmPackage, + cargo-tauri, + copyDesktopItems, + fetchFromGitHub, + fetchNpmDeps, + glib-networking, + lib, + makeDesktopItem, + nodejs, + openssl, + pkg-config, + rustPlatform, + stdenv, + webkitgtk_4_1, + wrapGAppsHook4, +}: +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + pname = "flightcore"; + version = "3.2.2"; + + src = fetchFromGitHub { + owner = "R2NorthstarTools"; + repo = "FlightCore"; + tag = "v${finalAttrs.version}"; + hash = "sha256-eTRtd616hWHgj3wg+jtrt/tFkaxUeKSN0d+XO1CghsE="; + }; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) pname version src; + + # Hash of dependencies fetched from upstream's `package-lock.json` file. + hash = "sha256-+xrNKFcCatqbl79j/tSLFNTYjxXANFb3/vgWXYY2PGo="; + }; + + frontend = buildNpmPackage { + pname = "${finalAttrs.pname}-frontend"; + inherit (finalAttrs) version src; + sourceRoot = "source/src-vue"; + + # Hash of dependencies fetched from upstream's `src-vue/package-lock.json` + # file. + npmDepsHash = "sha256-2PiMB9X/tp1QtTfUgVnH6caE+m2QSKTMYxPUHAUPWhQ="; + + installPhase = '' + runHook preInstall + + mkdir -p "$out" + cp -a dist "$out" + + runHook postInstall + ''; + }; + + cargoHash = "sha256-weidVeEIo3IIV+Xwe1htV46fRymOo5aRzHAEKQwKbvU="; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = finalAttrs.cargoRoot; + + # This override does the following: + # + # * Disables creating updater artifacts - the default behavior causes issues + # with building the package, but since it is going to be distributed via a + # software repository, it won't need to auto-update itself anyways. + # + # * Empties `beforeBuildCommand` - the upstream Tauri configuration includes + # commands that automatically build the software's front-end, before + # building its back-end. However, since Nixpkgs requires NPM dependencies + # to be hashed, we need to build the front-end in a separate step. + # + # This way, we end up fetching the NPM dependencies from both + # `source/package.json`, and `source/src-vue/package.json`. + tauriBuildFlags = "-c ${./override-tauri.conf.json}"; + + # Copy [frontend] to where it can be picked up by Tauri. + preBuild = '' + ln -s "${finalAttrs.frontend}"/dist src-vue + ''; + + nativeBuildInputs = [ + cargo-tauri.hook + copyDesktopItems + nodejs + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook4 + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + glib-networking + openssl + webkitgtk_4_1 + ]; + + desktopItems = [ + (makeDesktopItem { + name = "FlightCore"; + desktopName = "FlightCore"; + exec = "flightcore"; + icon = "flightcore"; + comment = finalAttrs.meta.description; + categories = [ + "Game" + "PackageManager" + ]; + terminal = false; + }) + ]; + + meta = { + description = "Updater and mod manager for Northstar"; + homepage = "https://github.com/R2NorthstarTools/FlightCore"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ username-generic ]; + mainProgram = "flightcore"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix index 655fa0ed57d9..4a9083663f81 100644 --- a/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix +++ b/pkgs/by-name/fl/flightgear/openscenegraph-flightgear.nix @@ -9,7 +9,6 @@ fetchurl, glib, libxml2, - pcre, zlib, libjpeg, giflib, @@ -53,7 +52,6 @@ stdenv.mkDerivation { ++ [ glib libxml2 - pcre zlib libjpeg giflib diff --git a/pkgs/by-name/fl/flink/package.nix b/pkgs/by-name/fl/flink/package.nix index 32cd4d90dd35..ac711253363f 100644 --- a/pkgs/by-name/fl/flink/package.nix +++ b/pkgs/by-name/fl/flink/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "flink"; - version = "2.2.1"; + version = "2.3.0"; src = fetchurl { url = "mirror://apache/flink/${pname}-${version}/${pname}-${version}-bin-scala_2.12.tgz"; - sha256 = "sha256-WxL4DN/UbOIcUc7K+yNtzyCtN4D884qmEMa+hk/3EQs="; + sha256 = "sha256-tShksMQqNjitsIlbl1QqPKggoMPe/ameum5FwvjKSWo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fl/flint/package.nix b/pkgs/by-name/fl/flint/package.nix index 27d9b48f0940..0077c9f1ca8a 100644 --- a/pkgs/by-name/fl/flint/package.nix +++ b/pkgs/by-name/fl/flint/package.nix @@ -25,11 +25,11 @@ assert stdenv.mkDerivation (finalAttrs: { pname = "flint"; - version = "3.5.0"; + version = "3.6.0"; src = fetchurl { url = "https://flintlib.org/download/flint-${finalAttrs.version}.tar.gz"; - hash = "sha256-OYLzhfAGEKlE4BUusKKYk7I2b6ZA6PXzB2xHVkz34qY="; + hash = "sha256-uV4sd5L17qShyNLULECYQ0dWgy5XoJSyletd/cm0w2s="; }; strictDeps = true; diff --git a/pkgs/by-name/fl/flintlock/package.nix b/pkgs/by-name/fl/flintlock/package.nix index da890d978f6d..4f52b9868493 100644 --- a/pkgs/by-name/fl/flintlock/package.nix +++ b/pkgs/by-name/fl/flintlock/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "flintlock"; - version = "0.8.1"; + version = "0.10.0"; src = fetchFromGitHub { - owner = "weaveworks"; + owner = "liquidmetal-dev"; repo = "flintlock"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-Kbk94sqj0aPsVonPsiu8kbjhIOURB1kX9Lt3NURL+jk="; + sha256 = "sha256-0d67+UXJ0cxTb8E81slMi9y2KOeOIr4B1zTyf4RF8zQ="; }; - vendorHash = "sha256-Iv1qHEQLgw6huCA/6PKNmm+dS2yHgOvY/oy2fKjwEpY="; + vendorHash = "sha256-kdGvDDSM/Kp74+PVBFraN6kvUyvvZOVf1/iw+ZmXpz0="; subPackages = [ "cmd/flintlock-metrics" diff --git a/pkgs/by-name/fl/flix/package.nix b/pkgs/by-name/fl/flix/package.nix index 8947f5a0a755..4599bc7ecf7b 100644 --- a/pkgs/by-name/fl/flix/package.nix +++ b/pkgs/by-name/fl/flix/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation rec { pname = "flix"; - version = "0.69.1"; + version = "0.75.1"; src = fetchurl { url = "https://github.com/flix/flix/releases/download/v${version}/flix.jar"; - sha256 = "sha256-UgYMaZ/v99dmfSUekU2xSOoJecrmvUoVfO5eYm9prZw="; + sha256 = "sha256-4xd3AK6tiiKkLJEOc7+4oyb+/bq04+rq9tVcMopr2Tg="; }; dontUnpack = true; diff --git a/pkgs/by-name/fl/flood/package.nix b/pkgs/by-name/fl/flood/package.nix index 519b00b12135..c413e958d102 100644 --- a/pkgs/by-name/fl/flood/package.nix +++ b/pkgs/by-name/fl/flood/package.nix @@ -10,13 +10,13 @@ }: buildNpmPackage (finalAttrs: { pname = "flood"; - version = "4.14.2"; + version = "4.15.0"; src = fetchFromGitHub { owner = "jesec"; repo = "flood"; tag = "v${finalAttrs.version}"; - hash = "sha256-gSjkpAGkvgRRh8WDpL/F7fS8KDxHRJUuWVqHGcFEGAc="; + hash = "sha256-wd+9owJi9W9pf6c1JuO0X/6JWxLq8XIypj6r4rQUemM="; }; nativeBuildInputs = [ pnpm_10 ]; @@ -31,7 +31,7 @@ buildNpmPackage (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 4; - hash = "sha256-yNRC5sCBn002gxUfHMUvh3DZeVYOokfz4MTvqXR2MzI="; + hash = "sha256-a1PoQ5pXw1SgyGFRa3+7AOr6vpyGyHxkMU7KQEFlZ04="; }; passthru = { diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json index 551d99612543..c10dfd437b94 100644 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/sources.json @@ -1,21 +1,17 @@ { - "version": "12.14.2", + "version": "12.15.2", "sources": { "aarch64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-linux-aarch64.tar.xz", - "sha256": "46ecf1316465a17d65fd654aeb2fe20cc1c63253fd6dad974f3972b20c1fc5ad" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-linux-aarch64.tar.xz", + "sha256": "1dbd4002b8e3e907ecc0adf760013a4f22186f9d425ded3372eafedce53bc6df" }, "x86_64-linux": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-linux-x86_64.tar.xz", - "sha256": "177f5d8d6c7dcde70db2b96cf5244daa1eb9bd4861504be275983c6cb8ee2e40" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-linux-x86_64.tar.xz", + "sha256": "5b068379ccb6f8cbd86e8d03d20a30cb8a03816a871fa28ca6f0ce13fb227960" }, "aarch64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-macOS-universal.dmg", - "sha256": "55c86ab248eebbba3a500e0f76554bbf387c333fdd7c9c48845a3dae53db9b17" - }, - "x86_64-darwin": { - "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.14.2/floorp-macOS-universal.dmg", - "sha256": "55c86ab248eebbba3a500e0f76554bbf387c333fdd7c9c48845a3dae53db9b17" + "url": "https://github.com/Floorp-Projects/Floorp/releases/download/v12.15.2/floorp-macOS-universal.dmg", + "sha256": "c4e64d732cd687e6711230d84cac687e8e4d28cc056f66a665fbf03ac2861b7b" } } } diff --git a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh index 3d0b87d688f2..f912437dd84b 100755 --- a/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh +++ b/pkgs/by-name/fl/floorp-bin-unwrapped/update.sh @@ -34,10 +34,9 @@ jq ' elif .url | contains("linux-x86_64") then {key: "x86_64-linux", value: .} elif .url | contains("macOS-universal") then - [{key: "aarch64-darwin", value: .}, {key: "x86_64-darwin", value: .}] + {key: "aarch64-darwin", value: .} else null end ) - | flatten | from_entries ) } diff --git a/pkgs/by-name/fl/flow/package.nix b/pkgs/by-name/fl/flow/package.nix index d92a8bed0415..fe9bd6dcc814 100644 --- a/pkgs/by-name/fl/flow/package.nix +++ b/pkgs/by-name/fl/flow/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "flow"; - version = "0.317.0"; + version = "0.318.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; tag = "v${finalAttrs.version}"; - hash = "sha256-3r330N+bmtMhUszOoaRqVqbrno7tZatXMO6szvPKqAc="; + hash = "sha256-FlrQzfFYGDydlYR7AgC+sXBGQtMhDzazV1C5OxVbuuY="; }; patches = [ diff --git a/pkgs/by-name/fl/flowblade/package.nix b/pkgs/by-name/fl/flowblade/package.nix index c69c98bd04f9..344a23a7c4c6 100644 --- a/pkgs/by-name/fl/flowblade/package.nix +++ b/pkgs/by-name/fl/flowblade/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Multitrack Non-Linear Video Editor"; homepage = "https://jliljebl.github.io/flowblade/"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ polygon ]; mainProgram = "flowblade"; diff --git a/pkgs/by-name/fl/fluent-bit/package.nix b/pkgs/by-name/fl/fluent-bit/package.nix index 416efc2f686a..023f5b60ff78 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 = "5.0.6"; + version = "5.0.7"; src = fetchFromGitHub { owner = "fluent"; repo = "fluent-bit"; tag = "v${finalAttrs.version}"; - hash = "sha256-VXf1F0TZFi8d7gil8yc3WWA/0X3QyYPnbA3luE1DE98="; + hash = "sha256-5X6qiwoRc7FTJSGjWYhhef9N8gaxrc9dwD8Z/8woIUo="; }; # The source build documentation covers some dependencies and CMake options. diff --git a/pkgs/by-name/fl/fluentd/Gemfile.lock b/pkgs/by-name/fl/fluentd/Gemfile.lock index 7f6bacc67594..f46cd8453ad2 100644 --- a/pkgs/by-name/fl/fluentd/Gemfile.lock +++ b/pkgs/by-name/fl/fluentd/Gemfile.lock @@ -1,72 +1,103 @@ GEM remote: https://rubygems.org/ specs: - addressable (2.8.7) - public_suffix (>= 2.0.2, < 7.0) - aws-eventstream (1.3.2) - aws-partitions (1.1064.0) - aws-sdk-cloudwatchlogs (1.109.0) - aws-sdk-core (~> 3, >= 3.216.0) + addressable (2.9.0) + public_suffix (>= 2.0.2, < 8.0) + async (2.42.0) + console (~> 1.29) + fiber-annotation + io-event (~> 1.11) + metrics (~> 0.12) + traces (~> 0.18) + async-http (0.95.1) + async (>= 2.10.2) + async-pool (~> 0.11) + io-endpoint (~> 0.14) + io-stream (~> 0.6) + metrics (~> 0.12) + protocol-http (~> 0.62) + protocol-http1 (~> 0.39) + protocol-http2 (~> 0.26) + protocol-url (~> 0.2) + traces (~> 0.10) + async-pool (0.11.2) + async (>= 2.0) + aws-eventstream (1.4.0) + aws-partitions (1.1267.0) + aws-sdk-cloudwatchlogs (1.159.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sigv4 (~> 1.5) - aws-sdk-core (3.220.1) + aws-sdk-core (3.254.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.992.0) aws-sigv4 (~> 1.9) base64 + bigdecimal jmespath (~> 1, >= 1.6.1) - aws-sdk-firehose (1.89.0) - aws-sdk-core (~> 3, >= 3.216.0) + logger + aws-sdk-firehose (1.112.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sigv4 (~> 1.5) - aws-sdk-kinesis (1.74.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kinesis (1.103.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sigv4 (~> 1.5) - aws-sdk-kms (1.99.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-kms (1.130.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.182.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-s3 (1.227.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sqs (1.93.0) - aws-sdk-core (~> 3, >= 3.216.0) + aws-sdk-sqs (1.117.0) + aws-sdk-core (~> 3, >= 3.254.0) aws-sigv4 (~> 1.5) - aws-sigv4 (1.11.0) + aws-sigv4 (1.12.1) aws-eventstream (~> 1, >= 1.0.2) - base64 (0.2.0) + base64 (0.3.0) + bigdecimal (4.1.2) bson (4.15.0) - concurrent-ruby (1.3.5) - cool.io (1.9.0) - csv (3.3.2) + concurrent-ruby (1.3.7) + console (1.36.0) + fiber-annotation + fiber-local (~> 1.1) + json + cool.io (1.9.4) + csv (3.3.5) digest-crc (0.7.0) rake (>= 12.0.0, < 14.0.0) - drb (2.2.1) - elastic-transport (8.4.0) + drb (2.2.3) + elastic-transport (8.5.3) faraday (< 3) multi_json - elasticsearch (8.17.1) + elasticsearch (9.4.3) elastic-transport (~> 8.3) - elasticsearch-api (= 8.17.1) - elasticsearch-api (8.17.1) + elasticsearch-api (= 9.4.3) + elasticsearch-api (9.4.3) + base64 multi_json - excon (1.2.5) + excon (1.5.0) logger - faraday (2.12.2) + faraday (2.14.3) faraday-net_http (>= 2.0, < 3.5) json logger - faraday-excon (2.3.0) + faraday-excon (2.4.0) excon (>= 1.0.0) faraday (>= 2.11.0, < 3) - faraday-net_http (3.4.0) - net-http (>= 0.5.0) + faraday-net_http (3.4.4) + net-http (~> 0.5) + fiber-annotation (0.2.0) + fiber-local (1.1.0) + fiber-storage + fiber-storage (1.0.1) fluent-config-regexp-type (1.0.0) fluentd (> 1.0.0, < 2) - fluent-plugin-cloudwatch-logs (0.14.3) + fluent-plugin-cloudwatch-logs (0.15.0) aws-sdk-cloudwatchlogs (~> 1.0) fluentd (>= 1.8.0) - fluent-plugin-concat (2.5.0) + fluent-plugin-concat (2.6.2) fluentd (>= 0.14.0, < 2) - fluent-plugin-elasticsearch (5.4.3) + fluent-plugin-elasticsearch (6.0.0) elasticsearch excon faraday (>= 2.0.0) @@ -76,12 +107,13 @@ GEM fluentd (>= 0.10.58, < 2) ltsv ruby-kafka (>= 1.5.0, < 2) - fluent-plugin-kinesis (3.5.0) + fluent-plugin-kinesis (3.7.0) aws-sdk-firehose (~> 1, != 1.9, != 1.5, != 1.15) aws-sdk-kinesis (~> 1, != 1.5, != 1.4, != 1.14) fluentd (>= 0.14.22, < 2) - google-protobuf (~> 3) - fluent-plugin-mongo (1.6.0) + google-protobuf (~> 4) + fluent-plugin-mongo (1.6.3) + bigdecimal (~> 4.0) fluentd (>= 0.14.22, < 2) mongo (>= 2.15.0, < 2.19.0) fluent-plugin-record-reformer (0.9.1) @@ -89,14 +121,15 @@ GEM fluent-plugin-rewrite-tag-filter (2.4.0) fluent-config-regexp-type fluentd (>= 0.14.2, < 2) - fluent-plugin-s3 (1.8.3) + fluent-plugin-s3 (1.8.5) aws-sdk-s3 (~> 1.60) aws-sdk-sqs (~> 1.23) fluentd (>= 0.14.22, < 2) fluent-plugin-webhdfs (1.6.0) fluentd (>= 0.14.22) webhdfs (>= 0.11.0) - fluentd (1.18.0) + fluentd (1.19.3) + async-http (~> 0.86) base64 (~> 0.2) bundler cool.io (>= 1.4.5, < 2.0.0) @@ -105,31 +138,46 @@ GEM http_parser.rb (>= 0.5.1, < 0.9.0) logger (~> 1.6) msgpack (>= 1.3.1, < 2.0.0) + net-http (~> 0.8) + ostruct (~> 0.6) serverengine (>= 2.3.2, < 3.0.0) sigdump (~> 0.2.5) strptime (>= 0.2.4, < 1.0.0) tzinfo (>= 1.0, < 3.0) tzinfo-data (~> 1.0) + uri (~> 1.0) webrick (~> 1.4) yajl-ruby (~> 1.0) - google-protobuf (3.25.6) - google-protobuf (3.25.6-aarch64-linux) - google-protobuf (3.25.6-arm64-darwin) - google-protobuf (3.25.6-x86-linux) - google-protobuf (3.25.6-x86_64-darwin) - http_parser.rb (0.8.0) + zstd-ruby (~> 1.5) + google-protobuf (4.35.1) + bigdecimal + rake (~> 13.3) + http_parser.rb (0.8.1) + io-endpoint (0.17.2) + io-event (1.19.1) + io-stream (0.13.1) jmespath (1.6.2) - json (2.10.1) - logger (1.6.6) + json (2.20.0) + logger (1.7.0) ltsv (0.1.2) + metrics (0.15.0) mongo (2.18.3) bson (>= 4.14.1, < 5.0.0) - msgpack (1.8.0) - multi_json (1.15.0) - net-http (0.6.0) - uri - public_suffix (6.0.1) - rake (13.2.1) + msgpack (1.8.3) + multi_json (1.21.1) + net-http (0.9.1) + uri (>= 0.11.1) + ostruct (0.6.3) + protocol-hpack (1.5.1) + protocol-http (0.62.2) + protocol-http1 (0.39.0) + protocol-http (~> 0.62) + protocol-http2 (0.26.0) + protocol-hpack (~> 1.4) + protocol-http (~> 0.62) + protocol-url (0.4.0) + public_suffix (7.0.5) + rake (13.4.2) ruby-kafka (1.5.0) digest-crc serverengine (2.4.0) @@ -138,22 +186,20 @@ GEM sigdump (~> 0.2.2) sigdump (0.2.5) strptime (0.2.5) + traces (0.18.2) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2025.1) + tzinfo-data (1.2026.3) tzinfo (>= 1.0.0) - uri (1.0.3) + uri (1.1.1) webhdfs (0.11.0) addressable - webrick (1.9.1) + webrick (1.9.2) yajl-ruby (1.4.3) + zstd-ruby (1.5.7.1) PLATFORMS - aarch64-linux - arm64-darwin ruby - x86-linux - x86_64-darwin DEPENDENCIES fluent-plugin-cloudwatch-logs @@ -169,4 +215,4 @@ DEPENDENCIES fluentd BUNDLED WITH - 2.6.2 + 2.7.2 diff --git a/pkgs/by-name/fl/fluentd/gemset.nix b/pkgs/by-name/fl/fluentd/gemset.nix index a006d8c272f7..04551bd2d61e 100644 --- a/pkgs/by-name/fl/fluentd/gemset.nix +++ b/pkgs/by-name/fl/fluentd/gemset.nix @@ -5,30 +5,80 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cl2qpvwiffym62z991ynks7imsm87qmgxf0yfsmlwzkgi9qcaa6"; + sha256 = "1by7h2lwziiblizpd5yx87jsq8ppdhzvwf08ga34wzqgcv1nmpvz"; type = "gem"; }; - version = "2.8.7"; + version = "2.9.0"; + }; + async = { + dependencies = [ + "console" + "fiber-annotation" + "io-event" + "metrics" + "traces" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1ik5p6pgx01mrg2c5pj6rmjwr2s5sbvip84zcysxb5cc7clphq2k"; + type = "gem"; + }; + version = "2.42.0"; + }; + async-http = { + dependencies = [ + "async" + "async-pool" + "io-endpoint" + "io-stream" + "metrics" + "protocol-http" + "protocol-http1" + "protocol-http2" + "protocol-url" + "traces" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0v3q2kn9j5vfag7b4zv2vc1i4jkrqjz1pc109df6vh04q9cd8g8c"; + type = "gem"; + }; + version = "0.95.1"; + }; + async-pool = { + dependencies = [ "async" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1vg3lwb3yhq0rad3dm00vp35vrahkbxgl4kx3d2rqkdh09xs2hqa"; + type = "gem"; + }; + version = "0.11.2"; }; aws-eventstream = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mvjjn8vh1c3nhibmjj9qcwxagj6m9yy961wblfqdmvhr9aklb3y"; + sha256 = "0fqqdqg15rgwgz3mn4pj91agd20csk9gbrhi103d20328dfghsqi"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.0"; }; aws-partitions = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jdajznsdc0niv68xqp9sv29l9piyn32grq1y367l14hbm17mnf2"; + sha256 = "07i2n8f7cpbcckj6zqlivhw05khsrg77bijj2jdb00y3z2zcd90m"; type = "gem"; }; - version = "1.1064.0"; + version = "1.1267.0"; }; aws-sdk-cloudwatchlogs = { dependencies = [ @@ -39,10 +89,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1izd0al8i8wmi0cx18w4y8nriw623c21rb7c8vwpgk4mzd2kqxhw"; + sha256 = "1ja3j4a3mvgcdrcpzisip40h5f4mix0724p14w8c1phxd794xz5r"; type = "gem"; }; - version = "1.109.0"; + version = "1.159.0"; }; aws-sdk-core = { dependencies = [ @@ -50,16 +100,18 @@ "aws-partitions" "aws-sigv4" "base64" + "bigdecimal" "jmespath" + "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cjdqmy5hjbgzc0iac1i143va76qgp7jc7hg1aviy1n8cgywq44y"; + sha256 = "1zhj444iybzs1ikw1p4arv3zayw9xkk1ifnsb6g3r2j6p0h34gpf"; type = "gem"; }; - version = "3.220.1"; + version = "3.254.0"; }; aws-sdk-firehose = { dependencies = [ @@ -70,10 +122,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sryh7fjg525ddwlbd37mi3ygjcc6qn9r0md64d6ssrvk2ah0v1i"; + sha256 = "0sxr068m9fxw04m79ainsr3fniq7pxdwcp9syxbxxyq65bgq300g"; type = "gem"; }; - version = "1.89.0"; + version = "1.112.0"; }; aws-sdk-kinesis = { dependencies = [ @@ -84,10 +136,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1qfwsc373a674y8xcy8g1ykc84d21vbz0dqpbh1f1k2mny2cxz7s"; + sha256 = "0g7m6ii4m03h6prd21z42yll259qlk08agfydkcikrixq1nlf3rz"; type = "gem"; }; - version = "1.74.0"; + version = "1.103.0"; }; aws-sdk-kms = { dependencies = [ @@ -98,10 +150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a3mh89kfh6flqxw48wfv9wfwkj2zxazw096mqm56wnnzz1jyads"; + sha256 = "0jfpgjyhq3f7w67p3361f1racrc1m502zan934m7mdrir9i3ds52"; type = "gem"; }; - version = "1.99.0"; + version = "1.130.0"; }; aws-sdk-s3 = { dependencies = [ @@ -113,10 +165,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03a55dbihv6xvgfwhx0f35rwc7q3rr0555vfpxlwpdjw75wkbz6h"; + sha256 = "0fd9xq7xyadlldgd9l9iry3fi38wwr1iaag9ax4xpirpkazj6asm"; type = "gem"; }; - version = "1.182.0"; + version = "1.227.0"; }; aws-sdk-sqs = { dependencies = [ @@ -127,10 +179,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16b5jdnmk93l86nnqpij4zac7srx8c2yvx07xxbazmkawcnrd27g"; + sha256 = "0wj489w3v5canns7c5lnp38hjf954gxfvlva76vwrw9618cvzznd"; type = "gem"; }; - version = "1.93.0"; + version = "1.117.0"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -138,20 +190,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nx1il781qg58nwjkkdn9fw741cjjnixfsh389234qm8j5lpka2h"; + sha256 = "003ch8qzh3mppsxch83ns0jra8d222ahxs96p9cdrl0grfazywv9"; type = "gem"; }; - version = "1.11.0"; + version = "1.12.1"; }; base64 = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01qml0yilb9basf7is2614skjp8384h2pycfx86cr8023arfj98g"; + sha256 = "0yx9yn47a8lkfcjmigk79fykxvr80r4m1i35q82sxzynpbm7lcr7"; type = "gem"; }; - version = "0.2.0"; + version = "0.3.0"; + }; + bigdecimal = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk"; + type = "gem"; + }; + version = "4.1.2"; }; bson = { groups = [ "default" ]; @@ -168,30 +230,45 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.7"; + }; + console = { + dependencies = [ + "fiber-annotation" + "fiber-local" + "json" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01vg83f2q7n0q5dsq2sfjmm6mrizhyzkmw21i4ysg06g0slrwna5"; + type = "gem"; + }; + version = "1.36.0"; }; "cool.io" = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cl3ri6zsnpm3hixmlkrmyjir1w7m9szjfizwvccn05qb40a4apa"; + sha256 = "0lzay9zxgf7j2avpl19334si092f3xyfd819wq75nmbrdwp4l0m5"; type = "gem"; }; - version = "1.9.0"; + version = "1.9.4"; }; csv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kmx36jjh2sahd989vcvw74lrlv07dqc3rnxchc5sj2ywqsw3w3g"; + sha256 = "0gz7r2kazwwwyrwi95hbnhy54kwkfac5swh2gy5p5vw36fn38lbf"; type = "gem"; }; - version = "3.3.2"; + version = "3.3.5"; }; digest-crc = { dependencies = [ "rake" ]; @@ -209,10 +286,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h5kbj9hvg5hb3c7l425zpds0vb42phvln2knab8nmazg2zp5m79"; + sha256 = "0wrkl7yiix268s2md1h6wh91311w95ikd8fy8m5gx589npyxc00b"; type = "gem"; }; - version = "2.2.1"; + version = "2.2.3"; }; elastic-transport = { dependencies = [ @@ -223,10 +300,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xz5q3zlbkwdb9zipallvqxdw6gnz8ljyz4w7b3pv1lar43f9sdm"; + sha256 = "1i2qzvf40hvp1s0m44kvpzi9zsinsy7w8fsrj62saa07n6pkdw1v"; type = "gem"; }; - version = "8.4.0"; + version = "8.5.3"; }; elasticsearch = { dependencies = [ @@ -237,21 +314,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nbwd1f5s060hiqcs2bmwzvsli3l3vcyyd3khxcxzzxvysqq0zb9"; + sha256 = "0hpvj11mbn74z8ph17qjs1n7jkpjv5csr1x1nhrnk9zi04xnwjnw"; type = "gem"; }; - version = "8.17.1"; + version = "9.4.3"; }; elasticsearch-api = { - dependencies = [ "multi_json" ]; + dependencies = [ + "base64" + "multi_json" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iwl70xid303nyhfv5342yj5kk37rjbgdzkjdi83fnvyhisi5166"; + sha256 = "14n9mypalmi9f1gv9xkdirjxhihv3wiks2vsgdnl7q19wyfq2626"; type = "gem"; }; - version = "8.17.1"; + version = "9.4.3"; }; excon = { dependencies = [ "logger" ]; @@ -259,10 +339,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17asr18vawi08g3wbif0wdi8bnyj01d125saydl9j1f03fv0n16a"; + sha256 = "0l3dpg45i74ap1d7c4wyrdlc67l9vj4kgzv2l2r8mg1304fss0y5"; type = "gem"; }; - version = "1.2.5"; + version = "1.5.0"; }; faraday = { dependencies = [ @@ -274,10 +354,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mls9g490k63rdmjc9shqshqzznfn1y21wawkxrwp2vvbk13jwqm"; + sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq"; type = "gem"; }; - version = "2.12.2"; + version = "2.14.3"; }; faraday-excon = { dependencies = [ @@ -288,10 +368,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xdmwnkkms7bnx0bpkdk52qcazjqa3skb7jmjr21cjr8mdsp3z65"; + sha256 = "1xn867jjsy4dj0sxrrwd58l3kpdjs1in4p1jcbmni126hcszy1ra"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; }; faraday-net_http = { dependencies = [ "net-http" ]; @@ -299,10 +379,41 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jp5ci6g40d6i50bsywp35l97nc2fpi9a592r2cibwicdb6y9wd1"; + sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f"; type = "gem"; }; - version = "3.4.0"; + version = "3.4.4"; + }; + fiber-annotation = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "00vcmynyvhny8n4p799rrhcx0m033hivy0s1gn30ix8rs7qsvgvs"; + type = "gem"; + }; + version = "0.2.0"; + }; + fiber-local = { + dependencies = [ "fiber-storage" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "01lz929qf3xa90vra1ai1kh059kf2c8xarfy6xbv1f8g457zk1f8"; + type = "gem"; + }; + version = "1.1.0"; + }; + fiber-storage = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qa0j9qjwav9xb0n3isx0rbh0942xrfback392n6vs8bidnmp3pl"; + type = "gem"; + }; + version = "1.0.1"; }; fluent-config-regexp-type = { dependencies = [ "fluentd" ]; @@ -324,10 +435,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "139d7qv4my818mhjp0104ns9dlndlvrb6dgxa2rkv6jlzlamjpjb"; + sha256 = "0d4vr7mkha72f65pnisqp26gppas0zhz4xvpyqk0ka9mkwyj2m2m"; type = "gem"; }; - version = "0.14.3"; + version = "0.15.0"; }; fluent-plugin-concat = { dependencies = [ "fluentd" ]; @@ -335,10 +446,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b9z6hrjcsvccfimmgczzcbhvf2zwyqzvsdc29i2biqhk1mcwn3k"; + sha256 = "18vsv1lh41hk12ji11zsf2ipqzw0l6isxw748yhrlzfz55lh2j99"; type = "gem"; }; - version = "2.5.0"; + version = "2.6.2"; }; fluent-plugin-elasticsearch = { dependencies = [ @@ -352,10 +463,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19psa92z4zsmbwz8n4rizkwws58qlgb30325rhmqpnsp9h8b0cbb"; + sha256 = "0lnz56kaxqp28dckn5f7xb6mywf5dr0v56lvskx5jr67z97wsich"; type = "gem"; }; - version = "5.4.3"; + version = "6.0.0"; }; fluent-plugin-kafka = { dependencies = [ @@ -383,13 +494,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12wx84a9h1xjldxa3yxxsmkyn620m2knw47dmfnr9rvgw2s4dlrz"; + sha256 = "0jq7ci8h243g23dhx9vbqz1sb2kipz7v7y318wvj4lnq2xgpmmj5"; type = "gem"; }; - version = "3.5.0"; + version = "3.7.0"; }; fluent-plugin-mongo = { dependencies = [ + "bigdecimal" "fluentd" "mongo" ]; @@ -397,10 +509,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1m3fa6fwpzxw08lnczsif5c7v33yryyvgb1lbp7a7qjhipvb6jfm"; + sha256 = "09h70j007gb7ia66fm67b9842vbdfp18h1bf8mgjxvhz4ylx4p26"; type = "gem"; }; - version = "1.6.0"; + version = "1.6.3"; }; fluent-plugin-record-reformer = { dependencies = [ "fluentd" ]; @@ -437,10 +549,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c7l7y51j5fz99086ghj99rjv16frj5kl4wcclvfws1jc5c38mj9"; + sha256 = "1r6vqs2zlsck2v6pd89g9s2mxk064y0pls0s3awbq4186a8kpn9r"; type = "gem"; }; - version = "1.8.3"; + version = "1.8.5"; }; fluent-plugin-webhdfs = { dependencies = [ @@ -458,6 +570,7 @@ }; fluentd = { dependencies = [ + "async-http" "base64" "cool.io" "csv" @@ -465,42 +578,80 @@ "http_parser.rb" "logger" "msgpack" + "net-http" + "ostruct" "serverengine" "sigdump" "strptime" "tzinfo" "tzinfo-data" + "uri" "webrick" "yajl-ruby" + "zstd-ruby" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "100fd0ihgpqddkdqmbvlp51v09rnr4xb25l5lq776ai21hc4gj8d"; + sha256 = "1n2f3lfc99ry640i1j2xar2fp9yn6fhrbzdw0ilpdicrclnmb3y2"; type = "gem"; }; - version = "1.18.0"; + version = "1.19.3"; }; google-protobuf = { + dependencies = [ + "bigdecimal" + "rake" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g0h7rwiivx93jddfws5pdkcpnhma3694k2jfv2i1k80qkrqnrmv"; + sha256 = "09ipzsijxkrgwnyic0l4yhnazw46ca7ll0adza6za66r649lg9m3"; type = "gem"; }; - version = "3.25.6"; + version = "4.35.1"; }; "http_parser.rb" = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gj4fmls0mf52dlr928gaq0c0cb0m3aqa9kaa6l0ikl2zbqk42as"; + sha256 = "0yh924g697spcv4hfigyxgidhyy6a7b9007rnac57airbcadzs4s"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; + }; + io-endpoint = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0f1kzf4d5qgqgfjh52a8pf3pii5dmav6ib0zq4wmicqnq5kggsiz"; + type = "gem"; + }; + version = "0.17.2"; + }; + io-event = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1rkfxcydk07qa9zs2ll7fj9zhl374v6vb0m9m7dbz74832isj6l5"; + type = "gem"; + }; + version = "1.19.1"; + }; + io-stream = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1pi0vr60l3ld4mlfrhgbiyvxkribi82258mlh1s7dg8gzd6pq3ap"; + type = "gem"; + }; + version = "0.13.1"; }; jmespath = { groups = [ "default" ]; @@ -517,20 +668,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1p4l5ycdxfsr8b51gnvlvhq6s21vmx9z4x617003zbqv3bcqmj6x"; + sha256 = "0ay31y1yl208xrpcsw6b0k4q309magq7q5prmdbb0lm9ampbqqlk"; type = "gem"; }; - version = "2.10.1"; + version = "2.20.0"; }; logger = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05s008w9vy7is3njblmavrbdzyrwwc1fsziffdr58w9pwqj8sqfx"; + sha256 = "00q2zznygpbls8asz5knjvvj2brr3ghmqxgr83xnrdj4rk3xwvhr"; type = "gem"; }; - version = "1.6.6"; + version = "1.7.0"; }; ltsv = { groups = [ "default" ]; @@ -542,6 +693,16 @@ }; version = "0.1.2"; }; + metrics = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0wlh0g4xmfqa41dsh4m3514q3jcvy6jx97mwn6ayj62ir6xdbpk1"; + type = "gem"; + }; + version = "0.15.0"; + }; mongo = { dependencies = [ "bson" ]; groups = [ "default" ]; @@ -558,20 +719,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76"; + sha256 = "18g6ps30z6m365bly7sfialavnsf6m6qamdxsr84w96k51j4mnlb"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.3"; }; multi_json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6"; type = "gem"; }; - version = "1.15.0"; + version = "1.21.1"; }; net-http = { dependencies = [ "uri" ]; @@ -579,30 +740,95 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5"; type = "gem"; }; - version = "0.6.0"; + version = "0.9.1"; + }; + ostruct = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "04nrir9wdpc4izqwqbysxyly8y7hsfr4fsv69rw91lfi9d5fv8lm"; + type = "gem"; + }; + version = "0.6.3"; + }; + protocol-hpack = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14ddqg5mcs9ysd1hdzkm5pwil0660vrxcxsn576s3387p0wa5v3g"; + type = "gem"; + }; + version = "1.5.1"; + }; + protocol-http = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "0fvpza7nnbyd3nfxkn5gych6diwns386g2ib9s6azh99c3sz5hg1"; + type = "gem"; + }; + version = "0.62.2"; + }; + protocol-http1 = { + dependencies = [ "protocol-http" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1syqgaklsn9rf11xmll2s3ms7jvpd5zjng9jdb3r8pbgv963z6z4"; + type = "gem"; + }; + version = "0.39.0"; + }; + protocol-http2 = { + dependencies = [ + "protocol-hpack" + "protocol-http" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11kl6768hpzgvvvlpyvmr74v0jqf2vslcwngs3643cl2h3brrj5s"; + type = "gem"; + }; + version = "0.26.0"; + }; + protocol-url = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1qd9vsn9sif58swfqsyj429aynqyv6hpgbzxqrd83baidcxw1m34"; + type = "gem"; + }; + version = "0.4.0"; }; public_suffix = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vqcw3iwby3yc6avs1vb3gfd0vcp2v7q310665dvxfswmcf4xm31"; + sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs"; type = "gem"; }; - version = "6.0.1"; + version = "7.0.5"; }; rake = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17850wcwkgi30p7yqh60960ypn7yibacjjha0av78zaxwvd3ijs6"; + sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb"; type = "gem"; }; - version = "13.2.1"; + version = "13.4.2"; }; ruby-kafka = { dependencies = [ "digest-crc" ]; @@ -650,6 +876,16 @@ }; version = "0.2.5"; }; + traces = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "05722prvh34n96irnxa762wz0yj2nyrz70ab2zby3b6snjf69wc0"; + type = "gem"; + }; + version = "0.18.2"; + }; tzinfo = { dependencies = [ "concurrent-ruby" ]; groups = [ "default" ]; @@ -667,20 +903,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02yz3x0qxnnwbf7k18yck5pggbnyy43rq0d5w2r6rwlk3981m31d"; + sha256 = "1ygpikd3hdqsi16gqh33r5al1b9xdwrv2wl3rw210g7iar9vr3s7"; type = "gem"; }; - version = "1.2025.1"; + version = "1.2026.3"; }; uri = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04bhfvc25b07jaiaf62yrach7khhr5jlr5bx6nygg8pf11329wp9"; + sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp"; type = "gem"; }; - version = "1.0.3"; + version = "1.1.1"; }; webhdfs = { dependencies = [ "addressable" ]; @@ -698,10 +934,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; + sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; yajl-ruby = { groups = [ "default" ]; @@ -713,4 +949,14 @@ }; version = "1.4.3"; }; + zstd-ruby = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "08gxd4hm9qpiyf9bvwwxba75g70j8vascj44y89xccps7bwgplfy"; + type = "gem"; + }; + version = "1.5.7.1"; + }; } diff --git a/pkgs/by-name/fl/fluidsynth/package.nix b/pkgs/by-name/fl/fluidsynth/package.nix index 78b37719df78..d292b8ac7a60 100644 --- a/pkgs/by-name/fl/fluidsynth/package.nix +++ b/pkgs/by-name/fl/fluidsynth/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fluidsynth"; - version = "2.5.3"; + version = "2.5.5"; src = fetchFromGitHub { owner = "FluidSynth"; repo = "fluidsynth"; tag = "v${finalAttrs.version}"; - hash = "sha256-k8IHS6Mh1b1iMSuBg3svlf7A2dsg6VHEKqlDhvyJnbo="; + hash = "sha256-WEzOYHtPIUkPZu3v4dWcCh3dOJUyG1xRxDuoSXqiGbk="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/fl/fluux-messenger/package.nix b/pkgs/by-name/fl/fluux-messenger/package.nix new file mode 100644 index 000000000000..03692b2697ac --- /dev/null +++ b/pkgs/by-name/fl/fluux-messenger/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchFromGitHub, + rustPlatform, + cargo-tauri, + nodejs, + npmHooks, + fetchNpmDeps, + pkg-config, + webkitgtk_4_1, + libayatana-appindicator, + libxscrnsaver, + cacert, + wrapGAppsHook3, + autoPatchelfHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "fluux-messenger"; + version = "0.17.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + name = "${finalAttrs.pname}-${finalAttrs.version}-source"; + owner = "processone"; + repo = "fluux-messenger"; + tag = "v${finalAttrs.version}"; + hash = "sha256-APdzwVnDOGnngZJ3LjQMk2Y6KRbGqXaaFEb+NzhfkIo="; + }; + + cargoRoot = "apps/fluux/src-tauri"; + cargoHash = "sha256-pjx4tP89aRx1/m5eYjI2DPhTtSuMnFudongEFhiaigE="; + + npmDeps = fetchNpmDeps { + name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; + inherit (finalAttrs) src; + hash = "sha256-rV5Q8WKcSmL1JSubFefsytOd3qiB5OandcwfZw9DJgE="; + }; + + nativeBuildInputs = [ + cargo-tauri.hook + nodejs + npmHooks.npmConfigHook + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + (wrapGAppsHook3.override { isGraphical = true; }) + autoPatchelfHook + ]; + + buildInputs = [ + webkitgtk_4_1 + libayatana-appindicator + libxscrnsaver + cacert + ]; + + # libayatana-appindicator is not in the RUNPATH by default + runtimeDependencies = [ libayatana-appindicator ]; + + tauriBuildFlags = [ "--no-sign" ]; + + # setting buildAndTestSubdir from the beginning interferes with buildPhase + preCheck = "export buildAndTestSubdir=${finalAttrs.cargoRoot}"; + # tauriInstallHook only works when we are in cargoRoot + preInstall = "pushd $buildAndTestSubdir"; + postInstall = "popd"; + + meta = { + description = "XMPP client for communities and organizations"; + longDescription = "A modern, Web and Desktop cross-platform XMPP client for communities and organizations, built with a reusable Typescript SDK and Tauri for desktop"; + changelog = "https://github.com/processone/fluux-messenger/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + homepage = "https://github.com/processone/fluux-messenger"; + license = lib.licenses.agpl3Plus; + mainProgram = "fluux"; + maintainers = [ lib.maintainers.haansn08 ]; + platforms = lib.platforms.all; + # see also https://github.com/processone/fluux-messenger/blob/main/fluux-messenger.doap + }; +}) diff --git a/pkgs/by-name/fl/flux9s/package.nix b/pkgs/by-name/fl/flux9s/package.nix index 7ef314704e29..394d996e5249 100644 --- a/pkgs/by-name/fl/flux9s/package.nix +++ b/pkgs/by-name/fl/flux9s/package.nix @@ -1,5 +1,5 @@ { - fetchCrate, + fetchFromGitHub, lib, openssl, pkg-config, @@ -9,14 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "flux9s"; - version = "0.9.0"; + version = "0.12.0"; - src = fetchCrate { - inherit (finalAttrs) pname version; - hash = "sha256-cto3Fu2UW8+Pq6OK5miw+cAwzqiotTGWPD0Yyckh1/M="; + src = fetchFromGitHub { + owner = "dgunzy"; + repo = "flux9s"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kwUoA5NTjJjCI3aUgpFOcDpRZbDEPCTzzsk7TxVn6K4="; }; - cargoHash = "sha256-uOa/qWBtTQf7jJWJhFJBmYWQ5mU/3P/YuACbnVbHdJc="; + cargoHash = "sha256-5UOaIbaAlBufB4BJ+ZX82xaKTQ4qDDRZWaweM8d2AOY="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix index 2cfcd09beb1d..d47e5dfc5548 100644 --- a/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator-mcp/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator-mcp"; - version = "0.50.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; - repo = "fluxcd-operator"; + repo = "flux-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok="; + hash = "sha256-l+IJtFmVR3WZaFW4aaYjirTqj+X1FGLAVgbA21MHO1k="; }; - vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74="; + vendorHash = "sha256-DW+dnakqnpSiV7MlzshGEzoy3Osv93dAsJYe4cR0sJ4="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/fluxcd-operator/package.nix b/pkgs/by-name/fl/fluxcd-operator/package.nix index 127f93b5a779..9a34b5c495cb 100644 --- a/pkgs/by-name/fl/fluxcd-operator/package.nix +++ b/pkgs/by-name/fl/fluxcd-operator/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "fluxcd-operator"; - version = "0.50.0"; + version = "0.55.0"; src = fetchFromGitHub { owner = "controlplaneio-fluxcd"; - repo = "fluxcd-operator"; + repo = "flux-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-4FIsad3/57KtyTVQE0T4jhQGEvuEw9/ZFWsriLyc6Ok="; + hash = "sha256-MWtjoTQuB6G/f9MnKOkIKlbI5tvaP5TLb5PvEySNLFM="; }; - vendorHash = "sha256-DxXTepwTjgc+Xy3MAIFcYZ/XZZ3zGgyStmXN2/BqM74="; + vendorHash = "sha256-DW+dnakqnpSiV7MlzshGEzoy3Osv93dAsJYe4cR0sJ4="; ldflags = [ "-s" diff --git a/pkgs/by-name/fl/fluxcd/package.nix b/pkgs/by-name/fl/fluxcd/package.nix index 79f2cf5543d5..f2ea364767e1 100644 --- a/pkgs/by-name/fl/fluxcd/package.nix +++ b/pkgs/by-name/fl/fluxcd/package.nix @@ -9,10 +9,10 @@ }: let - version = "2.8.8"; - srcHash = "sha256-ECFEzYhnhse2yrfWYaeN5dE+HUvCy5RKZ2OceCb5+sA="; - vendorHash = "sha256-pV7eoiGhWk6KYZbK8bamXJY/NdK7ZYqrVcCTX9ccLJc="; - manifestsHash = "sha256-fF21nDstKUrlW6fgm0DrDtntR/0cnHMEzRltjBm9nwA="; + version = "2.9.2"; + srcHash = "sha256-a4925TZIqYqSk4/gyjwTeThOaQiIt1S3Md7b9eu7H20="; + vendorHash = "sha256-iPj7F/7u5MrxoZJ4qk6XONeUmAXkMckpXK/P0HNQ78A="; + manifestsHash = "sha256-uSfH2hcz1+rqHc9szCe4V40mTl6d+Li308WW9xLVXWs="; manifests = fetchzip { url = "https://github.com/fluxcd/flux2/releases/download/v${version}/manifests.tar.gz"; @@ -85,7 +85,6 @@ buildGoModule rec { ryan4yin SchahinRohani stealthybox - superherointj ]; mainProgram = "flux"; }; diff --git a/pkgs/by-name/fl/fly/package.nix b/pkgs/by-name/fl/fly/package.nix index d60bdb360d05..38d281348bf1 100644 --- a/pkgs/by-name/fl/fly/package.nix +++ b/pkgs/by-name/fl/fly/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "fly"; - version = "8.2.3"; + version = "8.2.4"; src = fetchFromGitHub { owner = "concourse"; repo = "concourse"; rev = "v${finalAttrs.version}"; - hash = "sha256-mg95mi2pose/vqLPeekv2lfS7rLtuyn+k9yeqbzlwm0="; + hash = "sha256-iY0oPeP3D6/nsPDdGE3lvjFlhH/z9QQ5gHpjpamdl5M="; }; vendorHash = "sha256-ZNhGt+nyl7zmQIHT+5f/c2hixyZ8kLmCWO5qa7CAGuY="; diff --git a/pkgs/by-name/fl/flyctl/package.nix b/pkgs/by-name/fl/flyctl/package.nix index c3d2e420c035..40a7ca034e95 100644 --- a/pkgs/by-name/fl/flyctl/package.nix +++ b/pkgs/by-name/fl/flyctl/package.nix @@ -12,7 +12,7 @@ buildGoModule rec { pname = "flyctl"; - version = "0.4.59"; + version = "0.4.71"; src = fetchFromGitHub { owner = "superfly"; @@ -22,11 +22,11 @@ buildGoModule rec { cd "$out" git rev-parse HEAD > COMMIT ''; - hash = "sha256-UDwVwfx/FTLszEK/vTv0P07TBBPsNR+e+jAGxqNwSDk="; + hash = "sha256-dCgfmG3h/E+ADbwY2pHxIFNBahSJCNGBsn3XohJMWRk="; }; proxyVendor = true; - vendorHash = "sha256-XBpLOhC3fY18o0tQZXgyKrQRgd84U5SRo6Rrgkuq4f8="; + vendorHash = "sha256-xm5DDXo5es7JhYXBcaohz1bkJw6yGNZl/z9W5I8lutg="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fl/flye/package.nix b/pkgs/by-name/fl/flye/package.nix index 6e1800ff3110..facbf31db95f 100644 --- a/pkgs/by-name/fl/flye/package.nix +++ b/pkgs/by-name/fl/flye/package.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "fenderglass"; + owner = "mikolmogorov"; repo = "flye"; tag = finalAttrs.version; hash = "sha256-ZdrAxPKY3+HJ388tGCdpDcvW70mJ5wd4uOUkuufyqK8="; @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "De novo assembler for single molecule sequencing reads using repeat graphs"; - homepage = "https://github.com/fenderglass/Flye"; + homepage = "https://github.com/mikolmogorov/Flye"; license = lib.licenses.bsd3; mainProgram = "flye"; maintainers = with lib.maintainers; [ assistant ]; diff --git a/pkgs/by-name/fl/flytectl/package.nix b/pkgs/by-name/fl/flytectl/package.nix new file mode 100644 index 000000000000..4a284a00ad29 --- /dev/null +++ b/pkgs/by-name/fl/flytectl/package.nix @@ -0,0 +1,65 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + installShellFiles, + stdenv, + testers, + flytectl, +}: +buildGoModule (finalAttrs: { + pname = "flytectl"; + version = "0.9.8"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "flyteorg"; + repo = "flyte"; + tag = "flytectl/v${finalAttrs.version}"; + hash = "sha256-p6fU+BLvhwK+4zDNBy4jwtvIll+s4jXmpYIF1mfeoB4="; + }; + + vendorHash = "sha256-h4L8BFzRiph4SBffVRH9TU5j7k+CZGshOV160mENAL0="; + + sourceRoot = "${finalAttrs.src.name}/flytectl"; + + subPackages = [ "." ]; + + ldflags = [ + "-s" + "-w" + "-X github.com/flyteorg/flyte/flytestdlib/version.Version=v${finalAttrs.version}" + "-X github.com/flyteorg/flyte/flytestdlib/version.Build=${finalAttrs.src.tag}" + "-X github.com/flyteorg/flyte/flytestdlib/version.BuildTime=1970-01-01" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + # Tests require network and file system access + doCheck = false; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd flytectl \ + --bash <($out/bin/flytectl completion bash) \ + --fish <($out/bin/flytectl completion fish) \ + --zsh <($out/bin/flytectl completion zsh) + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "flytectl version"; + version = "v${finalAttrs.version}"; + }; + + meta = { + description = "Command-line interface for Flyte, a cloud-native workflow orchestration platform"; + downloadPage = "https://github.com/flyteorg/flyte"; + homepage = "https://flyte.org/"; + changelog = "https://github.com/flyteorg/flyte/releases/tag/flytectl%2Fv${finalAttrs.version}"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.mcuste ]; + mainProgram = "flytectl"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/fl/flyway/package.nix b/pkgs/by-name/fl/flyway/package.nix index 2aadb8c25e49..420996791b33 100644 --- a/pkgs/by-name/fl/flyway/package.nix +++ b/pkgs/by-name/fl/flyway/package.nix @@ -9,10 +9,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "flyway"; - version = "12.0.0"; + version = "13.0.0"; src = fetchurl { url = "https://github.com/flyway/flyway/releases/download/flyway-${finalAttrs.version}/flyway-commandline-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-aBAbpNL+wJ+XOS7g8Af94iCylJTE7DmlbViVxA/yV1M="; + sha256 = "sha256-uVbvjvfEw+JqTicfB3N2a+Cxm6fJRptOJm4C8oZ15ao="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { done makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ - --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/lib/flyway/*:$out/share/flyway/lib/aad/*:$out/share/flyway/lib/netty/*:$out/share/flyway/drivers/*'" \ + --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/lib/aad/*:$out/share/flyway/lib/flyway/*:$out/share/flyway/lib/netty/*:$out/share/flyway/drivers/*:$out/share/flyway/drivers/aws/*:$out/share/flyway/drivers/gcp/*:$out/share/flyway/drivers/cassandra/*:$out/share/flyway/drivers/couchbase/*:$out/share/flyway/drivers/mongo/*'" \ --add-flags "org.flywaydb.commandline.Main" ''; passthru.tests = { diff --git a/pkgs/by-name/fl/flywheel-cli/package.nix b/pkgs/by-name/fl/flywheel-cli/package.nix index dfc2a3b68421..aab993c1f79b 100644 --- a/pkgs/by-name/fl/flywheel-cli/package.nix +++ b/pkgs/by-name/fl/flywheel-cli/package.nix @@ -5,31 +5,13 @@ unzip, }: -let - inherit (stdenv.hostPlatform) system; - throwSystem = throw "Unsupported system: ${system}"; - - os = - { - x86_64-darwin = "darwin"; - x86_64-linux = "linux"; - } - .${system} or throwSystem; - - sha256 = - { - x86_64-darwin = "sha256-OIyEu3Hsobui9s5+T9nC10SxMw0MhgmTA4SN9Ridyzo="; - x86_64-linux = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; - } - .${system} or throwSystem; -in stdenv.mkDerivation (finalAttrs: { pname = "flywheel-cli"; version = "16.2.0"; src = fetchurl { - url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-${os}_amd64-${finalAttrs.version}.zip"; - inherit sha256; + url = "https://storage.googleapis.com/flywheel-dist/cli/${finalAttrs.version}/fw-linux_amd64-${finalAttrs.version}.zip"; + hash = "sha256-SxBjRd95hoh2zwX6IDnkZnTWVduQafPHvnWw8qTuM78="; }; nativeBuildInputs = [ unzip ]; @@ -40,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { installPhase = '' runHook preInstall - install -Dt $out/bin ./${os}_amd64/fw + install -Dt $out/bin ./linux_amd64/fw runHook postInstall ''; @@ -52,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ rbreslow ]; platforms = [ - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fm/fm-go/package.nix b/pkgs/by-name/fm/fm-go/package.nix index 568b37d94345..e7a1e2b32a09 100644 --- a/pkgs/by-name/fm/fm-go/package.nix +++ b/pkgs/by-name/fm/fm-go/package.nix @@ -22,7 +22,7 @@ let homepage = "https://github.com/mistakenelf/fm"; description = "Terminal based file manager"; changelog = "https://github.com/mistakenelf/fm/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "fm"; maintainers = [ ]; }; diff --git a/pkgs/by-name/fm/fm-tune/package.nix b/pkgs/by-name/fm/fm-tune/package.nix index 29dbe906f52c..aa7e0663dab4 100644 --- a/pkgs/by-name/fm/fm-tune/package.nix +++ b/pkgs/by-name/fm/fm-tune/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fm-tune"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "viraptor"; repo = "fm_tune"; rev = finalAttrs.version; - hash = "sha256-pwL2G1Ni1Ixw/N0diSoGGIoVrtmF92mWZ5i57OOvkX4="; + hash = "sha256-kjTcg8nvhPgpsopIjYsaIsEszYPh86ilkSXMMk+z3x0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fm/fmodex/package.nix b/pkgs/by-name/fm/fmodex/package.nix index 36d0e24d9250..702efa275e19 100644 --- a/pkgs/by-name/fm/fmodex/package.nix +++ b/pkgs/by-name/fm/fmodex/package.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "i686-linux" - "x86_64-darwin" ]; maintainers = [ lib.maintainers.lassulus ]; }; diff --git a/pkgs/by-name/fn/fn-cli/package.nix b/pkgs/by-name/fn/fn-cli/package.nix index ce0bbfd105f2..70c410d93ba3 100644 --- a/pkgs/by-name/fn/fn-cli/package.nix +++ b/pkgs/by-name/fn/fn-cli/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "fn"; - version = "0.6.60"; + version = "0.6.61"; src = fetchFromGitHub { owner = "fnproject"; repo = "cli"; rev = finalAttrs.version; - hash = "sha256-DsDUVumixQh5R3wVYGU5cfcIICnbLWMQMbZRz3xSnk0="; + hash = "sha256-uw4fH3PyuAnNEhrvw0dl2jJxP4jau3tVuAjzSgeu1Lw="; }; vendorHash = null; diff --git a/pkgs/by-name/fn/fnox/package.nix b/pkgs/by-name/fn/fnox/package.nix new file mode 100644 index 000000000000..93c2e7d90d1e --- /dev/null +++ b/pkgs/by-name/fn/fnox/package.nix @@ -0,0 +1,59 @@ +{ + lib, + fetchFromGitHub, + stdenv, + rustPlatform, + perl, + pkg-config, + testers, + dbus, + udev, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + pname = "fnox"; + version = "1.31.0"; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "fnox"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BwuMuiJiC5QbtlfZz/aqSXQmjyf0jUWv2sNdKEK3LJY="; + }; + + cargoHash = "sha256-vU1LA6vvNpLFRXj07WmtCoWDdJezqMoI/t7q7E77JUk="; + + nativeBuildInputs = [ + perl + pkg-config + ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + dbus + udev + ]; + + passthru = { + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = nix-update-script { }; + }; + + checkFlags = [ + # requires a D-Bus session unavailable in the sandbox + "--skip=providers::keychain::tests::test_keychain_set_and_get" + ]; + + meta = { + description = "Flexible secret management tool supporting multiple providers and encryption methods"; + homepage = "https://github.com/jdx/fnox"; + changelog = "https://github.com/jdx/fnox/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + tiptenbrink + Br1ght0ne + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/fo/foks-server/package.nix b/pkgs/by-name/fo/foks-server/package.nix deleted file mode 100644 index 5cffeb4a7033..000000000000 --- a/pkgs/by-name/fo/foks-server/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - foks, - pcsclite, - pkg-config, - stdenv, - buildPackages, -}: -let - templFoks = buildPackages.templ.overrideAttrs (old: { - pname = "templ-foks"; - version = "0.3.833"; - src = old.src.override { - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; - }; - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; - }); -in -buildGoModule (finalAttrs: { - pname = "foks-server"; - version = "0.1.7"; - - src = fetchFromGitHub { - owner = "foks-proj"; - repo = "go-foks"; - tag = "v${finalAttrs.version}"; - hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0="; - }; - - vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8="; - - postPatch = '' - cd ./server/web/templates - templ generate - cd - - ''; - postInstall = '' - ln -s $out/bin/{foks-server,git-remote-foks} - ''; - - subPackages = [ "server/foks-server" ]; - excludedPackages = [ "server" ]; - - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ]; - nativeBuildInputs = [ - pkg-config - templFoks - foks - ]; - __structuredAttrs = true; - - meta = { - description = "Federated key management and distribution system"; - homepage = "https://foks.pub"; - downloadPage = "https://github.com/foks-proj/go-foks"; - changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ poptart ]; - mainProgram = "foks"; - }; -}) diff --git a/pkgs/by-name/fo/foks/package.nix b/pkgs/by-name/fo/foks/package.nix index caf6f5d99cf7..e2fc73f21d2b 100644 --- a/pkgs/by-name/fo/foks/package.nix +++ b/pkgs/by-name/fo/foks/package.nix @@ -1,54 +1,72 @@ { lib, + stdenv, buildGoModule, + buildPackages, fetchFromGitHub, + versionCheckHook, + pcsclite, pkg-config, - stdenv, - templ, - buildPackages, + foks, # self + + server ? false, }: let - templFoks = buildPackages.templ.overrideAttrs (old: { - pname = "templ-foks"; - version = "0.3.833"; - src = old.src.override { - hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; - }; - vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; - }); + client = !server; + pname = if server then "foks-server" else "foks"; + subPackages = if server then [ "server/foks-server" ] else [ "client/foks" ]; in buildGoModule (finalAttrs: { - pname = "foks"; - version = "0.1.7"; + inherit pname; + version = "0.1.8"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "foks-proj"; repo = "go-foks"; tag = "v${finalAttrs.version}"; - hash = "sha256-UZ4BZ2/S44hnG+uLHtWR/qqQtr6tbbQbQOgIrN4ciT0="; + hash = "sha256-JY0ec+LNRQf0S8gTeazvQhvQ7LRM3zz1qvopGPaKM1k="; }; - vendorHash = "sha256-+ysHa5KNhoxtoXPgOWC9ZDJKYqF+84s7oyxRib2S6a8="; + vendorHash = "sha256-W0lyLy7k3xin8VSdxNgeh1FpHprOKIDduHIW3Oqk1LY="; postPatch = '' cd ./server/web/templates - ${templFoks}/bin/templ generate + templ generate cd - ''; - postInstall = '' + + inherit subPackages; + excludedPackages = [ "server" ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pcsclite ]; + nativeBuildInputs = [ + pkg-config + finalAttrs.passthru.templ + ]; + + postInstall = lib.optionalString client '' ln -s $out/bin/{foks,git-remote-foks} ''; - subPackages = [ "client/foks" ]; - excludedPackages = [ "server" ]; + doInstallCheck = true; + versionCheckProgramArg = "version"; + nativeInstallCheckInputs = [ versionCheckHook ]; - buildInputs = lib.optionals (stdenv.hostPlatform.isLinux) [ pcsclite ]; - nativeBuildInputs = [ - pkg-config - ]; - - __structuredAttrs = true; + passthru = { + templ = buildPackages.templ.overrideAttrs (old: { + pname = "templ-foks"; + version = "0.3.833"; + src = old.src.override { + hash = "sha256-4K1MpsM3OuamXRYOllDsxxgpMRseFGviC4RJzNA7Cu8="; + }; + vendorHash = "sha256-OPADot7Lkn9IBjFCfbrqs3es3F6QnWNjSOHxONjG4MM="; + }); + server = foks.override { server = true; }; + }; meta = { description = "Federated key management and distribution system"; @@ -56,7 +74,10 @@ buildGoModule (finalAttrs: { downloadPage = "https://github.com/foks-proj/go-foks"; changelog = "https://github.com/foks-proj/go-foks/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ poptart ]; - mainProgram = "foks"; + maintainers = with lib.maintainers; [ + poptart + phanirithvij + ]; + mainProgram = pname; }; }) diff --git a/pkgs/by-name/fo/folia-major/package.nix b/pkgs/by-name/fo/folia-major/package.nix new file mode 100644 index 000000000000..66fff26fb41e --- /dev/null +++ b/pkgs/by-name/fo/folia-major/package.nix @@ -0,0 +1,115 @@ +{ + lib, + stdenvNoCC, + fetchFromGitHub, + fetchNpmDeps, + nodejs, + npmHooks, + makeWrapper, + electron, + copyDesktopItems, + makeDesktopItem, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "folia-major"; + version = "0.6.1"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "chthollyphile"; + repo = "folia-major"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rGkIFMbbLA2dxxDJ41NyIi++jcfIZQ3EoBpRJ0n+fTU="; + }; + + npmDeps = fetchNpmDeps { + inherit (finalAttrs) src; + hash = "sha256-bH9nSHRjYiQzJIU9MC9k+13Uc0ZIem+hRz0CD+9oWPs="; + }; + + nativeBuildInputs = [ + nodejs + npmHooks.npmConfigHook + makeWrapper + copyDesktopItems + ]; + + env = { + ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + ELECTRON_DEV = "false"; + ELECTRON = "true"; + }; + + # workaround for https://github.com/electron/electron/issues/31121 + postPatch = '' + substituteInPlace electron/main.cjs \ + --replace-fail "process.resourcesPath" "'$out/lib/folia-major/resources'" + + substituteInPlace vite.config.ts \ + --replace-fail "git rev-parse --short HEAD" "echo unknown" \ + --replace-fail "git rev-parse --abbrev-ref HEAD" "echo main" + ''; + + buildPhase = '' + runHook preBuild + + npm run build + npm exec electron-builder -- \ + --dir \ + -c.electronDist=${electron.dist} \ + -c.electronVersion=${electron.version} + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib/folia-major + cp -r release/*-unpacked/{locales,resources{,.pak}} $out/lib/folia-major/ + + install -D build/icon.png $out/share/icons/hicolor/512x512/apps/folia-major.png + + makeWrapper '${lib.getExe electron}' $out/bin/folia-major \ + --add-flags $out/lib/folia-major/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}}" \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --set-default ELECTRON_IS_DEV 0 \ + --inherit-argv0 + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "folia-major"; + desktopName = "Folia"; + exec = "folia-major"; + terminal = false; + type = "Application"; + icon = "folia-major"; + startupWMClass = "folia"; + comment = "Lyrics Reimagine"; + categories = [ + "AudioVideo" + "Player" + ]; + }) + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + + meta = { + description = "Lyrics Reimagine desktop app"; + homepage = "https://folia-site.vercel.app/"; + downloadPage = "https://github.com/chthollyphile/folia-major/releases"; + license = lib.licenses.agpl3Only; + mainProgram = "folia-major"; + maintainers = with lib.maintainers; [ chillcicada ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/fo/folly/memset-benchmark-darwin.patch b/pkgs/by-name/fo/folly/memset-benchmark-darwin.patch new file mode 100644 index 000000000000..218789a22acb --- /dev/null +++ b/pkgs/by-name/fo/folly/memset-benchmark-darwin.patch @@ -0,0 +1,11 @@ +--- a/folly/test/MemsetBenchmark.cpp ++++ b/folly/test/MemsetBenchmark.cpp +@@ -40,7 +40,7 @@ + + template + void bmMemset(void* buf, size_t length, size_t iters) { +-#if !defined(__aarch64__) ++#if !defined(__aarch64__) && !defined(__APPLE__) + __asm__ volatile(".align 64\n"); + #endif + #pragma unroll(1) diff --git a/pkgs/by-name/fo/folly/package.nix b/pkgs/by-name/fo/folly/package.nix index 196179c9e423..0ae344bb364b 100644 --- a/pkgs/by-name/fo/folly/package.nix +++ b/pkgs/by-name/fo/folly/package.nix @@ -144,6 +144,11 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/facebook/folly/pull/2561 ./memset-memcpy-aarch64.patch + # `.align 64` is invalid on x86_64 Mach-O, where `.align` takes a + # power-of-two exponent (64 means 2^64). The guard only excluded + # aarch64, so add !__APPLE__ to also skip x86_64-darwin. + ./memset-benchmark-darwin.patch + # Use feature detection directly instead of private standard library # macros to detect the presence of ASAN and otherwise fallback to # _not_ having ASAN. @@ -183,6 +188,7 @@ stdenv.mkDerivation (finalAttrs: { "singleton_thread_local_test.SingletonThreadLocalDeathTest.Overload" # very strict timing constraints, will fail under load + "logging_async_file_writer_test.AsyncFileWriter.discard" "io_async_hh_wheel_timer_test.HHWheelTimerTest.CancelTimeout" "io_async_hh_wheel_timer_test.HHWheelTimerTest.DefaultTimeout" "io_async_hh_wheel_timer_test.HHWheelTimerTest.DeleteWheelInTimeout" diff --git a/pkgs/by-name/fo/folo/package.nix b/pkgs/by-name/fo/folo/package.nix index c48cb706ac23..fe78ae1d2487 100644 --- a/pkgs/by-name/fo/folo/package.nix +++ b/pkgs/by-name/fo/folo/package.nix @@ -1,47 +1,52 @@ { electron, fetchFromGitHub, + nix-update-script, imagemagick, lib, makeDesktopItem, makeWrapper, nodejs, - pnpm_10_29_2, + pnpm_11, fetchPnpmDeps, pnpmConfigHook, stdenv, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "folo"; - version = "0.6.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "RSSNext"; repo = "Folo"; - tag = "v${version}"; - hash = "sha256-huVk5KcsepDwtdWMm9pvn31GE1felbH1pR3mGqlSWRs="; + tag = "desktop/v${finalAttrs.version}"; + hash = "sha256-kJ5FX6whBPTPJoWBmgaMeDSJAF7pGl5WkGmDzQSKLpo="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10_29_2 + pnpm_11 makeWrapper imagemagick ]; pnpmDeps = fetchPnpmDeps { - inherit + inherit (finalAttrs) pname version src + pnpmInstallFlags ; - pnpm = pnpm_10_29_2; - fetcherVersion = 3; - hash = "sha256-EP7bpbJUcKmHm7KMlKc0Fz2u0niQ3jC7YN/9pp7vucE="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-W8vzjbBBK3wvr6abIniW5oRpSJU45Gua6EjBTTA326I="; }; + __structuredAttrs = true; + strictDeps = true; + env = { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; @@ -67,6 +72,16 @@ stdenv.mkDerivation rec { dontCheckForBrokenSymlinks = true; + # Several build scripts import transitive dependencies directly (e.g. + # ast-kit from unplugin-ast). + pnpmInstallFlags = [ "--shamefully-hoist" ]; + + postPatch = '' + # pnpm 11 verifies node_modules before every `pnpm run` which conflicts + # with --shamefully-hoist + echo 'verifyDepsBeforeRun: false' >> pnpm-workspace.yaml + ''; + desktopItem = makeDesktopItem { name = "folo"; desktopName = "Folo"; @@ -77,7 +92,7 @@ stdenv.mkDerivation rec { mimeTypes = [ "x-scheme-handler/follow" ]; }; - icon = src + "/apps/desktop/resources/icon.png"; + icon = finalAttrs.src + "/apps/desktop/resources/icon.png"; buildPhase = '' runHook preBuild @@ -86,13 +101,13 @@ stdenv.mkDerivation rec { # Build desktop app. cd apps/desktop - pnpm --offline --no-inline-css build:electron-vite + pnpm run build:electron-vite cd ../.. # Remove dev dependencies. CI=true pnpm --ignore-scripts prune --prod # Clean up broken symlinks left behind by `pnpm prune` - find node_modules/.bin -xtype l -delete + [ -d node_modules/.bin ] && find node_modules/.bin -xtype l -delete runHook postBuild ''; @@ -109,24 +124,34 @@ stdenv.mkDerivation rec { --add-flags $out/share/follow/apps/desktop \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" - install -m 444 -D "${desktopItem}/share/applications/"* \ + install -m 444 -D "${finalAttrs.desktopItem}/share/applications/"* \ -t $out/share/applications/ for size in 16 24 32 48 64 128 256 512; do mkdir -p $out/share/icons/hicolor/"$size"x"$size"/apps - convert -background none -resize "$size"x"$size" ${icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png + convert -background none -resize "$size"x"$size" ${finalAttrs.icon} $out/share/icons/hicolor/"$size"x"$size"/apps/follow.png done runHook postInstall ''; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^desktop/v([0-9]+\\.[0-9]+\\.[0-9]+)$" + ]; + }; + meta = { description = "Next generation information browser"; homepage = "https://github.com/RSSNext/Folo"; - changelog = "https://github.com/RSSNext/Folo/releases/tag/${src.tag}"; + changelog = "https://github.com/RSSNext/Folo/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; - maintainers = with lib.maintainers; [ iosmanthus ]; + maintainers = with lib.maintainers; [ + amadejkastelic + iosmanthus + ]; platforms = [ "x86_64-linux" ]; mainProgram = "follow"; }; -} +}) diff --git a/pkgs/by-name/fo/fondo/package.nix b/pkgs/by-name/fo/fondo/package.nix deleted file mode 100644 index 3a917d067515..000000000000 --- a/pkgs/by-name/fo/fondo/package.nix +++ /dev/null @@ -1,72 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - nix-update-script, - pantheon, - vala, - pkg-config, - meson, - ninja, - python3, - glib, - gsettings-desktop-schemas, - gtk3, - libgee, - libhandy, - libsoup_2_4, - json-glib, - glib-networking, - desktop-file-utils, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "fondo"; - version = "1.6.1"; - - src = fetchFromGitHub { - owner = "calo001"; - repo = "fondo"; - rev = version; - sha256 = "sha256-JiDbkVs+EZRWRohSiuh8xFFgEhbnMYZfnZtz5Z4Wdb0="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - python3 - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - glib-networking - gsettings-desktop-schemas - gtk3 - json-glib - libgee - libhandy - libsoup_2_4 - pantheon.granite - ]; - - postPatch = '' - chmod +x meson/post_install.py - patchShebangs meson/post_install.py - ''; - - passthru.updateScript = nix-update-script { }; - - meta = { - homepage = "https://github.com/calo001/fondo"; - description = "Find the most beautiful wallpapers for your desktop"; - license = lib.licenses.agpl3Plus; - teams = [ lib.teams.pantheon ]; - platforms = lib.platforms.linux; - mainProgram = "com.github.calo001.fondo"; - }; -} diff --git a/pkgs/by-name/fo/font-config-info/package.nix b/pkgs/by-name/fo/font-config-info/package.nix index 9ee14d3d1762..688c62d2854a 100644 --- a/pkgs/by-name/fo/font-config-info/package.nix +++ b/pkgs/by-name/fo/font-config-info/package.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Prints a Linux system's font configuration"; homepage = "https://github.com/derat/font-config-info"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ romildo ]; mainProgram = "font-config-info"; diff --git a/pkgs/by-name/fo/fontfor/package.nix b/pkgs/by-name/fo/fontfor/package.nix index 4b52ad8f006a..99a8d5b0ec20 100644 --- a/pkgs/by-name/fo/fontfor/package.nix +++ b/pkgs/by-name/fo/fontfor/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Find fonts which can show a specified character and preview them in browser"; homepage = "https://github.com/7sDream/fontfor"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; mainProgram = "fontfor"; }; diff --git a/pkgs/by-name/fo/fooyin/package.nix b/pkgs/by-name/fo/fooyin/package.nix index cdaf7c3925bd..282241d50064 100644 --- a/pkgs/by-name/fo/fooyin/package.nix +++ b/pkgs/by-name/fo/fooyin/package.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.9.2"; src = fetchFromGitHub { - owner = "ludouzi"; + owner = "fooyin"; repo = "fooyin"; tag = "v" + finalAttrs.version; hash = "sha256-sQ1zsQ/6OHGPkofiKhusCrpW2XnO+PpMvH1M2OG5Huw="; diff --git a/pkgs/by-name/fo/fop/package.nix b/pkgs/by-name/fo/fop/package.nix index 34db373d0130..6f0767a25302 100644 --- a/pkgs/by-name/fo/fop/package.nix +++ b/pkgs/by-name/fo/fop/package.nix @@ -18,7 +18,7 @@ maven.buildMavenPackage (finalAttrs: { patches = [ ./fix-maven-plugin-versions.patch ]; - mvnHash = "sha256-EaOIAy0+YPrF+yGsFKKqcA4bt90bq1Z86V57P9rMatE="; + mvnHash = "sha256-KfIcc1MWGs7vZHPjfNgy3NBCAyTMtyvRTZfcN4LQVv8="; buildOffline = true; doCheck = false; diff --git a/pkgs/by-name/fo/ford/package.nix b/pkgs/by-name/fo/ford/package.nix index c2f5f3ebfd4c..3f2dcec9710b 100644 --- a/pkgs/by-name/fo/ford/package.nix +++ b/pkgs/by-name/fo/ford/package.nix @@ -58,7 +58,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran documentation system"; mainProgram = "ford"; homepage = "https://github.com/Fortran-FOSS-Programmers/ford"; - license = [ lib.licenses.gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/forecast/package.nix b/pkgs/by-name/fo/forecast/package.nix index bf90ea627b69..25db7b50a01d 100644 --- a/pkgs/by-name/fo/forecast/package.nix +++ b/pkgs/by-name/fo/forecast/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage { pname = "forecast"; - version = "0-unstable-2026-01-27"; + version = "0-unstable-2026-07-12"; src = fetchFromGitHub { owner = "cosmic-utils"; repo = "forecast"; - rev = "b82babc843d5e9c58a6635d3b1941ac185ae4906"; - hash = "sha256-QoZ854+2/4+VMZbOI/M167qjDPahtzbV/NH8Y46uBs8="; + rev = "0de1b7502979eb3704445c98ce8dbb7969e109da"; + hash = "sha256-9IZDDIhZY+YC0SOie5z0Ed5UAvBcf+soZ0RRz8sr71w="; }; - cargoHash = "sha256-di7zjwI0/6NB2cAih3d7iqwSb+o/607jbgJN1MtbZX8="; + cargoHash = "sha256-F5AlYm9bzJJUrDiY712dbwpCR3lzvQNFKXHzIDG+TVQ="; nativeBuildInputs = [ libcosmicAppHook diff --git a/pkgs/by-name/fo/forge-mtg/package.nix b/pkgs/by-name/fo/forge-mtg/package.nix index 245203dc7844..79bf41309d44 100644 --- a/pkgs/by-name/fo/forge-mtg/package.nix +++ b/pkgs/by-name/fo/forge-mtg/package.nix @@ -16,13 +16,13 @@ }: let - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "Card-Forge"; repo = "forge"; rev = "forge-${version}"; - hash = "sha256-OwrjpK5aqEx5HCZqU+iLJtkUtmt5yGW1bHLrX1UYf3Q="; + hash = "sha256-BU2RkXE3oMVLlCqebQwidH/ZtHKrrD47PAQhMnF/8pU="; }; # launch4j downloads and runs a native binary during the package phase. diff --git a/pkgs/by-name/fo/forgejo-cli/package.nix b/pkgs/by-name/fo/forgejo-cli/package.nix index 6c425c9d1c77..7c6aa1cb7642 100644 --- a/pkgs/by-name/fo/forgejo-cli/package.nix +++ b/pkgs/by-name/fo/forgejo-cli/package.nix @@ -14,7 +14,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "forgejo-cli"; - version = "0.5.0"; + version = "0.6.0"; __structuredAttrs = true; @@ -22,10 +22,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "forgejo-contrib"; repo = "forgejo-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-6qouGcqNau2aCBPYpn0hFdm8QXL1WjZvnowK4aspe/Q="; + hash = "sha256-XG7IPfl5yLToDQ+P0JkMxhfqsGd3cGWYCNrmlFf9j2Y="; }; - cargoHash = "sha256-UPDhPKC/x0ccfm7Df74PtCn+Zt9ShCxf9uB5TVaYV6Y="; + cargoHash = "sha256-+7WiOmYBjTMEsIGaqnMVTIHhzTpm8ObnljNXFnDazhI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fo/forgejo-mcp/package.nix b/pkgs/by-name/fo/forgejo-mcp/package.nix index e4dec5782e07..04397782b34e 100644 --- a/pkgs/by-name/fo/forgejo-mcp/package.nix +++ b/pkgs/by-name/fo/forgejo-mcp/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "forgejo-mcp"; - version = "2.28.0"; + version = "2.30.2"; src = fetchFromCodeberg { owner = "goern"; repo = "forgejo-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-nq5Mccz2mKWfkrEyqQXli4BB3+99NFwT3c1Mf2vZ3sc="; + hash = "sha256-czL2jfFalnbDzvtEAOLS82c+zuGpWgUrMFlu/vj1C8Q="; }; vendorHash = "sha256-QDJRbF4mZzBv1vxvo1ZQJaUJayRHj1jMgjaRfAmLMik="; diff --git a/pkgs/by-name/fo/forgejo-runner/package.nix b/pkgs/by-name/fo/forgejo-runner/package.nix index 8803c82a5221..dbe9e1dad928 100644 --- a/pkgs/by-name/fo/forgejo-runner/package.nix +++ b/pkgs/by-name/fo/forgejo-runner/package.nix @@ -22,12 +22,14 @@ let # Requires running Docker daemon "TestDocker" "TestJobExecutor" + "TestRunContext_PrepareJobContainer/Overlapping" "TestRunExec" "TestRunner" "Test_validateCmd" # Docker network request for image "TestImageExistsLocally" + "TestStepDockerMain" # Reaches out to different websites "TestFindGitRemoteURL" @@ -48,21 +50,22 @@ let ++ lib.optionals stdenv.hostPlatform.isDarwin [ # Uses docker-specific options, unsupported on Darwin "TestMergeJobOptions" + "TestNewEndpointHonoursTLSEnv" ]; in buildGoModule (finalAttrs: { pname = "forgejo-runner"; - version = "12.10.2"; + version = "12.13.1"; src = fetchFromGitea { domain = "code.forgejo.org"; owner = "forgejo"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-Uo+x02HgpfOY+KXug7cmnW4d85AlX6wqz+nYGF/JrHk="; + hash = "sha256-f2YVcb2bq1//A0SX1bfLLkGfp04REHgzg8o3dsN1Kh0="; }; - vendorHash = "sha256-0gOftkxkBPziU0Tm8lIiD72rXcMMY5M57G9/Bt/mneI="; + vendorHash = "sha256-du7fXehcxZ70Lsr5VCkz646G0Us/XwM4Sl98HXimoao="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/fo/forgejo/generic.nix b/pkgs/by-name/fo/forgejo/generic.nix index 413b070c3143..e1b7277aba7f 100644 --- a/pkgs/by-name/fo/forgejo/generic.nix +++ b/pkgs/by-name/fo/forgejo/generic.nix @@ -12,7 +12,7 @@ bash, brotli, buildGoModule, - fetchpatch, + coreutils, forgejo, git, gzip, @@ -116,6 +116,23 @@ buildGoModule rec { # TestRunHookPrePostReceive (cmd/hook_test.go) needs .git to pass git init + '' + # Unlike NixOS, the Nix build sandbox has no /usr/bin/env and we + # can't just create it, so Forgejo trying to execute git hooks + # that have #!/usr/bin/env as shebang fails with: + # + # To /build/repos44353414/user2/repo1.wiki.git + # ! [remote rejected] fda09356fb8b1da00546f764933f9dacda1b44ea -> master (pre-receive hook declined) + # error: failed to push some refs to '/build/repos44353414/user2/repo1.wiki.git' + # - remote: fatal: cannot exec '/build/appdata2719412950/home/hooks/pre-receive': No such file or directory + # + # We also can't just call patchShebangs because the hooks are + # created just in time by the test suite. Patching the source of + # the hooks after go build but before go test is oddly enough + # the least invasive hack to have those tests pass. + + lib.optionalString (lib.versionAtLeast version "16") '' + substituteInPlace modules/git/hook_generate.go \ + --replace-fail "#!/usr/bin/env" "#!${lib.getExe' coreutils "env"}" ''; checkFlags = @@ -124,6 +141,11 @@ buildGoModule rec { "TestPassword" # requires network: api.pwnedpasswords.com "TestCaptcha" # requires network: hcaptcha.com "TestDNSUpdate" # requires network: release.forgejo.org + ] + ++ lib.optionals (lib.versionAtLeast version "16") [ + "TestMigrateRepository" # requires network: codeberg.org + ] + ++ [ "TestMigrateWhiteBlocklist" # requires network: gitlab.com (DNS) "TestURLAllowedSSH/Pushmirror_URL" # requires network git.gay (DNS) "TestBleveDeleteIssue" # Known Flake-y https://github.com/NixOS/nixpkgs/issues/509878 diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix deleted file mode 120000 index 8d225ed3269a..000000000000 --- a/pkgs/by-name/fo/forgejo/lts.nix +++ /dev/null @@ -1 +0,0 @@ -package.nix \ No newline at end of file diff --git a/pkgs/by-name/fo/forgejo/lts.nix b/pkgs/by-name/fo/forgejo/lts.nix new file mode 100644 index 000000000000..6c4609ae7b43 --- /dev/null +++ b/pkgs/by-name/fo/forgejo/lts.nix @@ -0,0 +1,11 @@ +import ./generic.nix { + version = "15.0.5"; + hash = "sha256-S+x/YEfQrYIzHLnZ7LDLnkMYVN3TajwS7SHydM8uMPQ="; + npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; + vendorHash = "sha256-00QiJ8W76FdG96fmsIRLkaYlMQTZoIRmRd/qYGyPuig="; + lts = true; + nixUpdateExtraArgs = [ + "--override-filename" + "pkgs/by-name/fo/forgejo/lts.nix" + ]; +} diff --git a/pkgs/by-name/fo/forgejo/package.nix b/pkgs/by-name/fo/forgejo/package.nix index ad10007e9e99..3fb1a5e7275b 100644 --- a/pkgs/by-name/fo/forgejo/package.nix +++ b/pkgs/by-name/fo/forgejo/package.nix @@ -1,9 +1,9 @@ import ./generic.nix { - version = "15.0.3"; - hash = "sha256-tGZ83TEG6iyZd5mfSuSvVkmUJINWLN661YpOk1+dgbM="; - npmDepsHash = "sha256-BZSYjEsjUqMYWu3EUP+K35hqSOniv8Y6ek5bEC2vTPg="; - vendorHash = "sha256-z3YTjt+SM9yPCsJdfSQbTpy3vRiXaFV2QMz1y6J6k/Q="; - lts = true; + version = "16.0.1"; + hash = "sha256-fMAOmYh21nMyd9b8e6cXlh7ArJtIys3N6sbTJNV1oyw="; + npmDepsHash = "sha256-UhivpUqNJvc3zHxdRVAWT9x68jG1KnQa8yS4KkL2W5g="; + vendorHash = "sha256-elbuQxUtbuDTJV686ZqiFgxWlIYrWDZ4fUet2QY/sJ8="; + lts = false; nixUpdateExtraArgs = [ "--override-filename" "pkgs/by-name/fo/forgejo/package.nix" diff --git a/pkgs/by-name/fo/formatjson5/package.nix b/pkgs/by-name/fo/formatjson5/package.nix index 505c3f073f8a..55cc640cf25d 100644 --- a/pkgs/by-name/fo/formatjson5/package.nix +++ b/pkgs/by-name/fo/formatjson5/package.nix @@ -20,9 +20,20 @@ rustPlatform.buildRustPackage { patches = [ (fetchpatch { + # bugfix: fix missing_docs error + # Needed to build with Rust 1.83+. + name = "0001-bugfix-fix-missing-docs-error"; url = "https://github.com/google/json5format/commit/32914546e7088b3d9173ae9a2f307effa87917bf.patch"; hash = "sha256-kAbRUL/FuhnxkC9Xo4J2bXt9nkMOLeJvgMmOoKnSxKc="; }) + (fetchpatch { + # Skip rewriting unchanged files with --replace + # Unmerged upstream patch, ensures json5format is compatible with treefmt(-nix), + # which is quite popular in the Nix ecosystem. + name = "0002-skip-rewriting-unchanged-files"; + url = "https://github.com/google/json5format/commit/7bb67ff03529f6f0350d72b7a36839f20fe9d190.patch"; + hash = "sha256-ZY7Ck51/vHcRDQ5GEwOuMIF+QiYNGay3wbIvesmEl9k="; + }) ]; cargoHash = "sha256-1CSt9dPVHdOqfQXio7/eXiDLWt+iOe6Qj+VtWblwSDE="; diff --git a/pkgs/by-name/fo/fortls/package.nix b/pkgs/by-name/fo/fortls/package.nix index d6b771aa8aa3..a08b22726716 100644 --- a/pkgs/by-name/fo/fortls/package.nix +++ b/pkgs/by-name/fo/fortls/package.nix @@ -54,7 +54,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Fortran Language Server"; mainProgram = "fortls"; homepage = "https://github.com/fortran-lang/fortls"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fortran-language-server/package.nix b/pkgs/by-name/fo/fortran-language-server/package.nix index 383732e2e574..04a61238dd86 100644 --- a/pkgs/by-name/fo/fortran-language-server/package.nix +++ b/pkgs/by-name/fo/fortran-language-server/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "FORTRAN Language Server for the Language Server Protocol"; mainProgram = "fortls"; homepage = "https://pypi.org/project/fortran-language-server/"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sheepforce ]; }; }) diff --git a/pkgs/by-name/fo/fosrl-gerbil/package.nix b/pkgs/by-name/fo/fosrl-gerbil/package.nix index e602d599da8a..7e31e213d342 100644 --- a/pkgs/by-name/fo/fosrl-gerbil/package.nix +++ b/pkgs/by-name/fo/fosrl-gerbil/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gerbil"; - version = "1.4.1"; + version = "1.4.3"; src = fetchFromGitHub { owner = "fosrl"; repo = "gerbil"; tag = finalAttrs.version; - hash = "sha256-wKqJfiCzmMbKZXJGB7BWoXRNDukc4t+PX60XyynJNAU="; + hash = "sha256-9bKpuMAhQlhK8+IB6L3pEw4WU/1I3YXa0HDBhWPNOAo="; }; - vendorHash = "sha256-S5olgsmX0uZR9P/u/8Rf3lzRCSIwPDcmlvSzJhhJM3w="; + vendorHash = "sha256-bTUUGVn4vKEoxd95iCGw9AFrRZmYSs5eQc8Lan+wSDw="; # patch out the /usr/sbin/iptables postPatch = '' diff --git a/pkgs/by-name/fo/fosrl-newt/package.nix b/pkgs/by-name/fo/fosrl-newt/package.nix index 40e03e02cf70..7cf12b016c3a 100644 --- a/pkgs/by-name/fo/fosrl-newt/package.nix +++ b/pkgs/by-name/fo/fosrl-newt/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "newt"; - version = "1.12.4"; + version = "1.14.0"; src = fetchFromGitHub { owner = "fosrl"; repo = "newt"; tag = finalAttrs.version; - hash = "sha256-wYLnuKIU+wcCxF57cdfepTVm52btfdrveQ8Y+R9flMo="; + hash = "sha256-WjjXtx2csUAzQ1h3Ey2axaYdsn8pTeyxYByiTfBURos="; }; - vendorHash = "sha256-WfIK+Q8WQ372NzLw6DRapv1nYPduShi4KnVJBPk0Oz0="; + vendorHash = "sha256-JhNBJhj5YX3Wurv7r/JDu6YtHizOMLk+NCob7ISx+3c="; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/fo/fosrl-olm/package.nix b/pkgs/by-name/fo/fosrl-olm/package.nix index 8d19d76e1253..17278da184c5 100644 --- a/pkgs/by-name/fo/fosrl-olm/package.nix +++ b/pkgs/by-name/fo/fosrl-olm/package.nix @@ -2,24 +2,28 @@ lib, buildGoModule, fetchFromGitHub, + versionCheckHook, }: buildGoModule (finalAttrs: { pname = "olm"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "fosrl"; repo = "olm"; tag = finalAttrs.version; - hash = "sha256-USwTaQd8Aqq1Azsp4fXz3xSoxiqzYRSnUoBiqrepOXY="; + hash = "sha256-kPxFjGpwFjz5BZfgtbo5o/NveFLjAGjOh4o1h2RtGWI="; }; - vendorHash = "sha256-+KQpYGoyNI2SnEjj23GM0FqZFX6lHx7oNw9qdkkgcPU="; + vendorHash = "sha256-OSW7WRIIHg0xXp7Zanxy9PJEthMSsHYWn8WdPjzt0fc="; + + nativeInstallCheckInputs = [ versionCheckHook ]; ldflags = [ "-s" "-w" + "-X=main.olmVersion=${finalAttrs.version}" ]; doInstallCheck = true; diff --git a/pkgs/by-name/fo/fosrl-pangolin/package.nix b/pkgs/by-name/fo/fosrl-pangolin/package.nix index 8b380d6e2aa2..cd7d05205f09 100644 --- a/pkgs/by-name/fo/fosrl-pangolin/package.nix +++ b/pkgs/by-name/fo/fosrl-pangolin/package.nix @@ -6,6 +6,7 @@ makeWrapper, formats, databaseType ? "sqlite", + edition ? "oss", environmentVariables ? { }, nixosTests, }: @@ -15,6 +16,12 @@ assert lib.assertOneOf "databaseType" databaseType [ "pg" ]; +assert lib.assertOneOf "edition" edition [ + "enterprise" + "oss" + "saas" +]; + let db = isLong: @@ -28,36 +35,42 @@ in buildNpmPackage (finalAttrs: { pname = "pangolin"; - version = "1.18.4"; + version = "1.21.0"; + + __structuredAttrs = true; + enableParallelBuilding = true; src = fetchFromGitHub { owner = "fosrl"; repo = "pangolin"; tag = finalAttrs.version; - hash = "sha256-b8fXjjsPAN8KI0jxshGJGJSLcRTG5x8bBwlZjxKOdP0="; + hash = "sha256-LR4UO2xrTLKmemDVsJWtEQoV2bDy6U2ahxTtA+SDymI="; }; - npmDepsHash = "sha256-+qsHvytwAIbbNYpgNT6I7lekpxY0mUWcWGA9dT6rbtc="; + npmDepsFetcherVersion = 2; + npmDepsHash = "sha256-EBectG1zNdUb30SlhAzy9rCwF/mYHAV4HZTRbk2CbDY="; nativeBuildInputs = [ esbuild makeWrapper ]; - # dependency resolution is borked - npmFlags = [ "--legacy-peer-deps" ]; + # remove the proprietary code + postUnpack = lib.optionalString (edition == "oss") '' + rm -rf server/private + ''; # upstream inconsistently updates this # so leaving this here in case it's needed - # postPatch = '' - # substituteInPlace server/lib/consts.ts --replace-fail \ - # 'export const APP_VERSION = "${lib.versions.majorMinor finalAttrs.version + ".0"}";' \ - # 'export const APP_VERSION = "${finalAttrs.version}";' - # ''; + postPatch = '' + substituteInPlace server/lib/consts.ts --replace-fail \ + 'export const APP_VERSION = "${lib.versions.majorMinor finalAttrs.version + ".0"}";' \ + 'export const APP_VERSION = "${finalAttrs.version}";' + ''; preBuild = '' npm run set:${db false} - npm run set:oss + npm run set:${edition} npm run db:generate ''; @@ -160,7 +173,7 @@ buildNpmPackage (finalAttrs: { description = "Tunneled reverse proxy server with identity and access control"; homepage = "https://github.com/fosrl/pangolin"; changelog = "https://github.com/fosrl/pangolin/releases/tag/${finalAttrs.version}"; - license = lib.licenses.agpl3Only; + license = [ lib.licenses.agpl3Only ] ++ lib.optional (edition != "oss") lib.licenses.unfree; maintainers = with lib.maintainers; [ jackr water-sucks diff --git a/pkgs/by-name/fo/foss-flame/package.nix b/pkgs/by-name/fo/foss-flame/package.nix new file mode 100644 index 000000000000..9948ec41f3e6 --- /dev/null +++ b/pkgs/by-name/fo/foss-flame/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.foss-flame diff --git a/pkgs/by-name/fo/fotema/package.nix b/pkgs/by-name/fo/fotema/package.nix index 723d9ab9d6aa..272bfd80ab1f 100644 --- a/pkgs/by-name/fo/fotema/package.nix +++ b/pkgs/by-name/fo/fotema/package.nix @@ -102,7 +102,7 @@ clangStdenv.mkDerivation (finalAttrs: { meta = { description = "Photo gallery for Linux"; homepage = "https://github.com/blissd/fotema"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "fotema"; diff --git a/pkgs/by-name/fo/fotowall/package.nix b/pkgs/by-name/fo/fotowall/package.nix new file mode 100644 index 000000000000..92fde5f9fdba --- /dev/null +++ b/pkgs/by-name/fo/fotowall/package.nix @@ -0,0 +1,40 @@ +{ + stdenv, + lib, + fetchFromGitHub, + cmake, + qt6, +}: + +stdenv.mkDerivation rec { + pname = "fotowall"; + version = "1.1.2"; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "fotowall"; + repo = "fotowall"; + rev = "v${version}"; + hash = "sha256-icZUT17vgpI65Vyx7/TuTP4ISDkb7mrXwuyVzDHcoNE="; + }; + + nativeBuildInputs = [ + cmake + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + qt6.qtsvg + ]; + + meta = { + description = "Pictures collage & creativity tool"; + homepage = "https://github.com/fotowall/fotowall"; + license = lib.licenses.gpl2Plus; + maintainers = [ ]; + platforms = lib.platforms.linux; + mainProgram = "fotowall"; + }; +} diff --git a/pkgs/by-name/fo/foxglove-cli/package.nix b/pkgs/by-name/fo/foxglove-cli/package.nix index 659e167c9c2c..c90023a5e8c4 100644 --- a/pkgs/by-name/fo/foxglove-cli/package.nix +++ b/pkgs/by-name/fo/foxglove-cli/package.nix @@ -11,16 +11,16 @@ }: buildGoModule (finalAttrs: { pname = "foxglove-cli"; - version = "1.0.31"; + version = "1.0.32"; src = fetchFromGitHub { owner = "foxglove"; repo = "foxglove-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-BBvkvh1OZ+HJHJzSxCf8aCQklpZ536bkLNVlbKX9obY="; + hash = "sha256-bc2YNCkTbO6qO2PyBI4UH7O48GNMgDfKKXWXjYaznBI="; }; - vendorHash = "sha256-nRd9d3LJIrWoO+CQdbWLs249rOYmzfIf4u6x5dBDA2Y="; + vendorHash = "sha256-IXmkO7WIvy4ETMMHHJF6hS8ACRat/vnoiqaXyhw8u+M="; env.CGO_ENABLED = 0; tags = [ "netgo" ]; diff --git a/pkgs/by-name/fo/foxmarks/package.nix b/pkgs/by-name/fo/foxmarks/package.nix index 75d8a217ef15..83bdf1a6a8f8 100644 --- a/pkgs/by-name/fo/foxmarks/package.nix +++ b/pkgs/by-name/fo/foxmarks/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "2.1.1"; src = fetchFromGitHub { - owner = "zer0-x"; + owner = "zefr0x"; repo = "foxmarks"; rev = "v${finalAttrs.version}"; hash = "sha256-6lJ9acVo444RMxc3wUakBz4zT74oNUpwoP69rdf2mmE="; @@ -22,8 +22,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI read-only interface for Mozilla Firefox's bookmarks"; - homepage = "https://github.com/zer0-x/foxmarks"; - changelog = "https://github.com/zer0-x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/zefr0x/foxmarks"; + changelog = "https://github.com/zefr0x/foxmarks/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ loicreynier ]; }; diff --git a/pkgs/by-name/fp/fpart/package.nix b/pkgs/by-name/fp/fpart/package.nix index 1858a238e017..1284944439f8 100644 --- a/pkgs/by-name/fp/fpart/package.nix +++ b/pkgs/by-name/fp/fpart/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fpart"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; rev = "fpart-${finalAttrs.version}"; - sha256 = "sha256-BQGSKDSuK2iB0o2v8I+XOwhYtU/0QtMevt4pgIfRhNQ="; + sha256 = "sha256-S+paRGjqALohSkm3kpbsiYiYZyC4WWL3ccTMX0FGhEg="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fp/fped/package.nix b/pkgs/by-name/fp/fped/package.nix deleted file mode 100644 index 0cfb5c180913..000000000000 --- a/pkgs/by-name/fp/fped/package.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ - lib, - stdenv, - fetchgit, - flex, - bison, - fig2dev, - imagemagick, - netpbm, - gtk2, - pkg-config, -}: - -stdenv.mkDerivation { - pname = "fped"; - version = "unstable-2017-05-11"; - - src = fetchgit { - url = "git://projects.qi-hardware.com/fped.git"; - rev = "fa98e58157b6f68396d302c32421e882ac87f45b"; - sha256 = "0xv364a00zwxhd9kg1z9sch5y0cxnrhk546asspyb9bh58sdzfy7"; - }; - - postPatch = '' - substituteInPlace Makefile \ - --replace-fail 'pkg-config' '${stdenv.cc.targetPrefix}pkg-config' - ''; - - # Workaround build failure on -fno-common toolchains: - # ld: postscript.o:postscript.h:29: multiple definition of - # `postscript_params'; fped.o:postscript.h:29: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - # This uses '/bin/bash', '/usr/local' and 'lex' by default - makeFlags = [ - "PREFIX=${placeholder "out"}" - "LEX=flex" - "RGBDEF=${netpbm.out}/share/netpbm/misc/rgb.txt" - ]; - - nativeBuildInputs = [ - flex - bison - pkg-config - imagemagick - fig2dev - netpbm - ]; - - buildInputs = [ - flex - gtk2 - ]; - - meta = { - description = "Editor that allows the interactive creation of footprints electronic components"; - mainProgram = "fped"; - homepage = "http://projects.qi-hardware.com/index.php/p/fped/"; - license = lib.licenses.gpl2; - maintainers = [ ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/fp/fprettify/package.nix b/pkgs/by-name/fp/fprettify/package.nix index 71bae9aa8d1f..e3b73c8ca265 100644 --- a/pkgs/by-name/fp/fprettify/package.nix +++ b/pkgs/by-name/fp/fprettify/package.nix @@ -10,7 +10,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "pseewald"; + owner = "fortran-lang"; repo = "fprettify"; rev = "v${finalAttrs.version}"; sha256 = "17v52rylmsy3m3j5fcb972flazykz2rvczqfh8mxvikvd6454zyj"; @@ -32,7 +32,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Auto-formatter for modern Fortran code that imposes strict whitespace formatting, written in Python"; mainProgram = "fprettify"; homepage = "https://pypi.org/project/fprettify/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/fr/fracjson/deps.json b/pkgs/by-name/fr/fracjson/deps.json new file mode 100644 index 000000000000..1f4890fe56da --- /dev/null +++ b/pkgs/by-name/fr/fracjson/deps.json @@ -0,0 +1,62 @@ +[ + { + "pname": "Microsoft.Bcl.AsyncInterfaces", + "version": "6.0.0", + "hash": "sha256-49+H/iFwp+AfCICvWcqo9us4CzxApPKC37Q5Eqrw+JU=" + }, + { + "pname": "Microsoft.NETCore.Platforms", + "version": "1.1.0", + "hash": "sha256-FeM40ktcObQJk4nMYShB61H/E8B7tIKfl9ObJ0IOcCM=" + }, + { + "pname": "NETStandard.Library", + "version": "2.0.3", + "hash": "sha256-Prh2RPebz/s8AzHb2sPHg3Jl8s31inv9k+Qxd293ybo=" + }, + { + "pname": "System.Buffers", + "version": "4.5.1", + "hash": "sha256-wws90sfi9M7kuCPWkv1CEYMJtCqx9QB/kj0ymlsNaxI=" + }, + { + "pname": "System.CommandLine", + "version": "2.0.2", + "hash": "sha256-PK3wKHjY8FHkPV75Z4ouxKU67WcuVSiMFjAkBs+iSAo=" + }, + { + "pname": "System.Memory", + "version": "4.5.4", + "hash": "sha256-3sCEfzO4gj5CYGctl9ZXQRRhwAraMQfse7yzKoRe65E=" + }, + { + "pname": "System.Numerics.Vectors", + "version": "4.5.0", + "hash": "sha256-qdSTIFgf2htPS+YhLGjAGiLN8igCYJnCCo6r78+Q+c8=" + }, + { + "pname": "System.Runtime.CompilerServices.Unsafe", + "version": "6.0.0", + "hash": "sha256-bEG1PnDp7uKYz/OgLOWs3RWwQSVYm+AnPwVmAmcgp2I=" + }, + { + "pname": "System.Text.Encodings.Web", + "version": "6.0.0", + "hash": "sha256-UemDHGFoQIG7ObQwRluhVf6AgtQikfHEoPLC6gbFyRo=" + }, + { + "pname": "System.Text.Json", + "version": "6.0.10", + "hash": "sha256-UijYh0dxFjFinMPSTJob96oaRkNm+Wsa+7Ffg6mRnsc=" + }, + { + "pname": "System.Threading.Tasks.Extensions", + "version": "4.5.4", + "hash": "sha256-owSpY8wHlsUXn5xrfYAiu847L6fAKethlvYx97Ri1ng=" + }, + { + "pname": "Wcwidth", + "version": "4.0.1", + "hash": "sha256-r9HxW/S4CjLPd7f646KdYoXGUKgllrPqhMYOmJStwB4=" + } +] diff --git a/pkgs/by-name/fr/fracjson/package.nix b/pkgs/by-name/fr/fracjson/package.nix new file mode 100644 index 000000000000..178660b91114 --- /dev/null +++ b/pkgs/by-name/fr/fracjson/package.nix @@ -0,0 +1,37 @@ +{ + buildDotnetModule, + dotnetCorePackages, + fetchFromGitHub, + lib, +}: +buildDotnetModule (finalAttrs: { + pname = "fracjson"; + version = "1.0.1"; + src = fetchFromGitHub { + owner = "j-brooke"; + repo = "FracturedJson"; + tag = "cli-v${finalAttrs.version}"; + sha256 = "sha256-JdCDL6kTGUT2bgKLXw9aHThuSNxeSOtFm2besvFw814="; + }; + + projectFile = "Cli/Cli.csproj"; + nugetDeps = ./deps.json; + + dotnet-sdk = dotnetCorePackages.sdk_8_0; + dotnet-runtime = dotnetCorePackages.runtime_8_0; + + # Compression in single-file bundles requires self-contained builds; + # override the .csproj setting for framework-dependent Nix packaging. + dotnetInstallFlags = [ "-p:EnableCompressionInSingleFile=false" ]; + + __structuredAttrs = true; + strictDeps = true; + + meta = { + description = "JSON formatter that produces compact, highly readable output"; + homepage = "https://github.com/j-brooke/FracturedJson"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ allsimon ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/fr/fractal/package.nix b/pkgs/by-name/fr/fractal/package.nix index d74d1e036524..aacc85b13b3f 100644 --- a/pkgs/by-name/fr/fractal/package.nix +++ b/pkgs/by-name/fr/fractal/package.nix @@ -33,19 +33,19 @@ stdenv.mkDerivation (finalAttrs: { pname = "fractal"; - version = "14"; + version = "14.1"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = "fractal"; tag = finalAttrs.version; - hash = "sha256-pgu+O9fRyZiRYkxRTlPgnd5jaGPL1nN0agMR+x6+oGg="; + hash = "sha256-GQdEa5JHXkpQdKcnzT4udZ0Cr4eJv4zoB7sknWnuGCI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Fsw0hIAYiF+31PNuC5a9SatRatY7A8OwABhlyHIl1Lc="; + hash = "sha256-y3osmwhrB9x2s9V8L9qI1qs2fv2ygynq+mS+cA/KIyA="; }; patches = [ diff --git a/pkgs/by-name/fr/frama-c/package.nix b/pkgs/by-name/fr/frama-c/package.nix index bb9229a8803a..fea4bd606332 100644 --- a/pkgs/by-name/fr/frama-c/package.nix +++ b/pkgs/by-name/fr/frama-c/package.nix @@ -129,11 +129,12 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl21; maintainers = with lib.maintainers; [ thoughtpolice - amiddelk luc65r ]; platforms = lib.platforms.unix; mainProgram = "frama-c"; - broken = !lib.versionAtLeast ocamlPackages.ocaml.version "4.14"; + broken = + !lib.versionAtLeast ocamlPackages.ocaml.version "4.14" + || lib.versionAtLeast ocamlPackages.ocaml.version "5.5"; }; }) diff --git a/pkgs/by-name/fr/framework-control/package.nix b/pkgs/by-name/fr/framework-control/package.nix index 37fcf8b1df53..d324064136ff 100644 --- a/pkgs/by-name/fr/framework-control/package.nix +++ b/pkgs/by-name/fr/framework-control/package.nix @@ -7,6 +7,7 @@ fetchNpmDeps, makeDesktopItem, copyDesktopItems, + nix-update-script, controlPort ? 30912, }: @@ -75,6 +76,8 @@ rustPlatform.buildRustPackage (finalAttrs: { $out/share/icons/hicolor/256x256/apps/framework-control.png ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "Lightweight control surface for Framework laptops"; homepage = "https://github.com/ozturkkl/framework-control"; diff --git a/pkgs/by-name/fr/framework-tool-tui/package.nix b/pkgs/by-name/fr/framework-tool-tui/package.nix index 5eaadae52a7a..0c9c957e1d8b 100644 --- a/pkgs/by-name/fr/framework-tool-tui/package.nix +++ b/pkgs/by-name/fr/framework-tool-tui/package.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool-tui"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "grouzen"; repo = "framework-tool-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-LNGfjDRJ6sGLBfnANzrLWUFB0ZPDVPLaw7powdsC43I="; + hash = "sha256-IZq2amZYQJxt9ojZfjgrj303vdh+NAKg6fmd2TZa4q8="; }; - cargoHash = "sha256-ERyVdowVf7bFyupAuCKCgih9M0K/ThKjBJ2TEjbPqD4="; + cargoHash = "sha256-jd6M7tq4BTAsETimFsSmX1KLz7G+wTloBFmq4V8svRg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/framework-tool/package.nix b/pkgs/by-name/fr/framework-tool/package.nix index 7a51410c03bd..9f8a65f56cd2 100644 --- a/pkgs/by-name/fr/framework-tool/package.nix +++ b/pkgs/by-name/fr/framework-tool/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "framework-tool"; - version = "0.6.4"; + version = "0.6.5"; src = fetchFromGitHub { owner = "FrameworkComputer"; repo = "framework-system"; tag = "v${finalAttrs.version}"; - hash = "sha256-EpStj1uMh0IkzXA5eI/xOndzDCxyJITqKGaSHqnJEFs="; + hash = "sha256-criNeQcbMAWA8q27GClzCncbcj/zhD7yJylQnnFKMS4="; }; - cargoHash = "sha256-SVipNctgdU5oJiKbDnUmpv99Hc0W6nFtnI/DB90ndCo="; + cargoHash = "sha256-sMhH/Qzc2Pf+hnKcCEmw37s8rLniqFnfZ72ptG8APOk="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ udev ]; diff --git a/pkgs/by-name/fr/frankenphp/package.nix b/pkgs/by-name/fr/frankenphp/package.nix index c297c4e01e00..307dd9b21398 100644 --- a/pkgs/by-name/fr/frankenphp/package.nix +++ b/pkgs/by-name/fr/frankenphp/package.nix @@ -30,13 +30,13 @@ let in buildGoModule (finalAttrs: { pname = "frankenphp"; - version = "1.12.4"; + version = "1.12.5"; src = fetchFromGitHub { owner = "php"; repo = "frankenphp"; tag = "v${finalAttrs.version}"; - hash = "sha256-DzncOAhdDyc5qOipMI8OPss0WciAQIam6GmaUoe8mR8="; + hash = "sha256-1f+3w9x6P1euUZr4hC4jOkgEJEbS/MJ11u+chGShCno="; }; sourceRoot = "${finalAttrs.src.name}/caddy"; @@ -44,7 +44,7 @@ buildGoModule (finalAttrs: { # frankenphp requires C code that would be removed with `go mod tidy` # https://github.com/golang/go/issues/26366 proxyVendor = true; - vendorHash = "sha256-XY5a8pd5vJ/ouZMASzVqPoeXVfPbnEVDJFKkVNQF+2M="; + vendorHash = "sha256-d6ZTi1Ihu011eKVdHMiW9oSdPB4SYpDHMFxH65XLGac="; buildInputs = [ phpUnwrapped diff --git a/pkgs/by-name/fr/fre/package.nix b/pkgs/by-name/fr/fre/package.nix index 78eec456b62e..ae6b16cf83a4 100644 --- a/pkgs/by-name/fr/fre/package.nix +++ b/pkgs/by-name/fr/fre/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool for tracking your most-used directories and files"; homepage = "https://github.com/camdencheek/fre"; changelog = "https://github.com/camdencheek/fre/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "fre"; }; diff --git a/pkgs/by-name/fr/free42/package.nix b/pkgs/by-name/fr/free42/package.nix index a38818417b30..96a639a3260c 100644 --- a/pkgs/by-name/fr/free42/package.nix +++ b/pkgs/by-name/fr/free42/package.nix @@ -112,7 +112,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://thomasokken.com/free42/"; changelog = "https://thomasokken.com/free42/history.html"; description = "Software clone of the HP-42S calculator"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ elfenermarcell ]; mainProgram = "free42dec"; platforms = with lib.platforms; unix; diff --git a/pkgs/by-name/fr/freebayes/package.nix b/pkgs/by-name/fr/freebayes/package.nix index dfcad223285a..0e1c820f06dd 100644 --- a/pkgs/by-name/fr/freebayes/package.nix +++ b/pkgs/by-name/fr/freebayes/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { name = "freebayes-${finalAttrs.version}-src"; - owner = "ekg"; + owner = "freebayes"; repo = "freebayes"; tag = "v${finalAttrs.version}"; sha256 = "035nriknjqq8gvil81vvsmvqwi35v80q8h1cw24vd1gdyn1x7bys"; @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Bayesian haplotype-based polymorphism discovery and genotyping"; license = lib.licenses.mit; - homepage = "https://github.com/ekg/freebayes"; + homepage = "https://github.com/freebayes/freebayes"; maintainers = with lib.maintainers; [ jdagilliland ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/fr/freecad/package.nix b/pkgs/by-name/fr/freecad/package.nix index 5e04316c6f8d..da18b7958bac 100644 --- a/pkgs/by-name/fr/freecad/package.nix +++ b/pkgs/by-name/fr/freecad/package.nix @@ -6,6 +6,7 @@ doxygen, eigen, fetchFromGitHub, + fetchpatch, fmt, gts, hdf5, @@ -30,6 +31,8 @@ nix-update-script, gmsh, which, + gtk3, + gsettings-desktop-schemas, }: let pythonDeps = with python3Packages; [ @@ -48,6 +51,7 @@ let scipy shiboken6 vtk + networkx # for sheetmetal plugin ]; freecad-utils = callPackage ./freecad-utils.nix { inherit (python3Packages) python; }; @@ -99,7 +103,15 @@ freecad-utils.makeCustomizable ( ] ++ pythonDeps; - patches = [ ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch ]; + patches = [ + ./0001-NIXOS-don-t-ignore-PYTHONPATH.patch + (fetchpatch { + # https://github.com/FreeCAD/FreeCAD/pull/30899 + # fix COIN3D_MICRO_VERSION regex for coin 4.0.10 + url = "https://github.com/FreeCAD/FreeCAD/commit/e3e56059865849c6b1c85161f69183ad872414e3.patch"; + hash = "sha256-qe0wn7DwvQT/pmrSCa44+orMetztpw8DZ+NhDJEYAMw="; + }) + ]; postPatch = '' substituteInPlace src/Mod/Fem/femmesh/gmshtools.py \ @@ -127,6 +139,7 @@ freecad-utils.makeCustomizable ( "--set COIN_GL_NO_CURRENT_CONTEXT_CHECK 1" "--prefix PATH : ${binPath}" "--prefix PYTHONPATH : ${python3Packages.makePythonPath pythonDeps}" + "--prefix XDG_DATA_DIRS : ${gsettings-desktop-schemas}/share/gsettings-schemas/${gsettings-desktop-schemas.name}:${gtk3}/share/gsettings-schemas/${gtk3.name}" ]; postFixup = '' @@ -146,6 +159,9 @@ freecad-utils.makeCustomizable ( }; }; + # 6.9k object files, cuts down build time from 2-3 hours to 15 minutes + requiredSystemFeatures = [ "big-parallel" ]; + meta = { homepage = "https://www.freecad.org"; description = "General purpose Open Source 3D CAD/MCAD/CAx/CAE/PLM modeler"; diff --git a/pkgs/by-name/fr/freedoom/package.nix b/pkgs/by-name/fr/freedoom/package.nix index 4d9753f1bf38..4de73f7bf289 100644 --- a/pkgs/by-name/fr/freedoom/package.nix +++ b/pkgs/by-name/fr/freedoom/package.nix @@ -20,6 +20,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-uOLyh/epVxv3/N+6P1glBX1ZkGWzHWGaERYZRSL/3AU="; }; + postPatch = '' + substituteInPlace dist/freedoom \ + --replace-fail 'DOOMWADPATH="$(echo "''${PATHS[@]}" | tr '"' '"' :)"' \ + "DOOMWADPATH=$out/share/games/doom" + ''; + strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/fr/freedv/package.nix b/pkgs/by-name/fr/freedv/package.nix index 99d631b9ad1e..8df7058846e1 100644 --- a/pkgs/by-name/fr/freedv/package.nix +++ b/pkgs/by-name/fr/freedv/package.nix @@ -8,7 +8,6 @@ libtool, cmake, pkg-config, - python3, macdylibbundler, makeWrapper, darwin, @@ -24,6 +23,7 @@ dbus, apple-sdk_15, nix-update-script, + wget, }: let @@ -49,52 +49,54 @@ let hash = "sha256-P84gjnuiQQBVBExJBY3sUbwo00lXY6HB+AMpx/oovRg="; }; radaeSrc = fetchFromGitHub { - owner = "drowe67"; - repo = "radae"; - rev = "5d640a028ab2b8e4ff23ed7136caee396cdcb844"; - # upstream repository archive fetching is broken - forceFetchGit = true; - hash = "sha256-+Sd+FWycEJabT3RN/zyKXS2Xzr060/ekYdzg6s1gQcM="; + owner = "peterbmarks"; + repo = "radae_nopy"; + rev = "d72ec84e795493249db44d5939eb9b05438f956a"; + hash = "sha256-ziEhYZarzQtQ1akAxF54kcX6o38gJeUJ08jipSWXnxQ="; }; - radeInteg = fetchFromGitHub { - owner = "drowe67"; - repo = "radae"; - rev = "7bd3ae2401fcba58e314755576a2940085835312"; - hash = "sha256-WVYKvttiNh6uEzw0b27winyDfzzGkEEhYq7DIwfZW74="; + rnnoiseSrc = fetchFromGitHub { + owner = "xiph"; + repo = "rnnoise"; + rev = "70f1d256acd4b34a572f999a05c87bf00b67730d"; + nativeBuildInputs = [ wget ]; + postFetch = '' + cd $out + export NIX_SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt + export SSL_CERT_FILE=$NIX_SSL_CERT_FILE + ./download_model.sh + substituteInPlace autogen.sh \ + --replace-fail "./download_model.sh" "" + ''; + hash = "sha256-t/AwOCuHb5Oahy1fDI3Sc9M08Xz3dSAavhYatRC1OIk="; }; in stdenv.mkDerivation (finalAttrs: { pname = "freedv"; - version = "2.2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "drowe67"; repo = "freedv-gui"; tag = "v${finalAttrs.version}"; - hash = "sha256-7SOGz2+MzAkXd5JDKasSJcKVXcnuYk+C0S9N/NPRfOM="; + hash = "sha256-TjE/iYg+VFvbZH7/1q1V4t0SgcS44pLVet4Pgt6L5HA="; }; - patches = [ - ./no-framework.patch - ]; - postPatch = '' cp -R ${ebur128Src} ebur128 cp -R ${radaeSrc} radae - cp -R ${radeInteg} rade_integ - chmod -R u+w ebur128 radae rade_integ + cp -R ${rnnoiseSrc} rnnoise + chmod -R u+w ebur128 radae rnnoise substituteInPlace cmake/BuildEbur128.cmake \ --replace-fail "GIT_REPOSITORY https://github.com/jiixyj/libebur128.git" "URL $(realpath ebur128)" \ --replace-fail 'GIT_TAG "v''${EBUR128_VERSION}"' "" \ --replace-fail "git apply" "patch -p1 <" 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_REPOSITORY https://github.com/peterbmarks/radae_nopy/" "URL $(realpath radae)" \ + --replace-fail "GIT_TAG main" "" + substituteInPlace cmake/BuildRNNoise.cmake \ + --replace-fail "GIT_REPOSITORY \''${RNNOISE_REPO}" "URL $(realpath rnnoise)" \ --replace-fail "GIT_TAG main" "" - substituteInPlace cmake/BuildRADEForIntegrations.cmake \ - --replace-fail "https://github.com/xiph/opus/archive/940d4e5af64351ca8ba8390df3f555484c567fbb.zip" "${opusSrc}" \ - --replace-fail "GIT_REPOSITORY https://github.com/drowe67/radae.git" "URL $(realpath rade_integ)" \ - --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}" @@ -113,7 +115,6 @@ stdenv.mkDerivation (finalAttrs: { libtool cmake pkg-config - python3 ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ (macdylibbundler.overrideAttrs { @@ -136,7 +137,6 @@ stdenv.mkDerivation (finalAttrs: { speexdsp hamlib_4 wxwidgets_3_2 - python3.pkgs.numpy ] ++ ( if stdenv.hostPlatform.isLinux then diff --git a/pkgs/by-name/fr/freefilesync/package.nix b/pkgs/by-name/fr/freefilesync/package.nix index 59b024995149..0c7ece0dba16 100644 --- a/pkgs/by-name/fr/freefilesync/package.nix +++ b/pkgs/by-name/fr/freefilesync/package.nix @@ -38,7 +38,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freefilesync"; - version = "14.9"; + version = "14.10"; src = fetchurl { url = "https://freefilesync.org/download/FreeFileSync_${finalAttrs.version}_Source.zip"; @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { rm -f "$out" tryDownload "$url" "$out" ''; - hash = "sha256-TY41DJIvp7CNR8U12q2YUhiyHZuL9FcfLTVDQWTIfQA="; + hash = "sha256-tjyJ4+sc4nZxP7NQnBlISODsqDHKSKfpw8P8RixZj80="; }; sourceRoot = "."; diff --git a/pkgs/by-name/fr/freeipa/package.nix b/pkgs/by-name/fr/freeipa/package.nix index 6813e656de96..145942eec5c0 100644 --- a/pkgs/by-name/fr/freeipa/package.nix +++ b/pkgs/by-name/fr/freeipa/package.nix @@ -2,7 +2,6 @@ stdenv, lib, fetchurl, - fetchpatch, pkg-config, autoconf, automake, @@ -60,7 +59,7 @@ let yubico setuptools jinja2 - augeas + python-augeas samba ifaddr ]; @@ -75,26 +74,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "freeipa"; - version = "4.12.5"; + version = "4.13.1"; src = fetchurl { url = "https://releases.pagure.org/freeipa/freeipa-${finalAttrs.version}.tar.gz"; - hash = "sha256-jvXS9Hx9VGFccFL19HogfH15JVIW7pc3/TY1pOvJglM="; + hash = "sha256-U1MSfXxWynK8LUWDdtRX+LDMRRzb0x3Hk5qIBY6RUnw="; }; - patches = [ - (fetchpatch { - name = "support-pyca-44.0"; - url = "https://github.com/freeipa/freeipa/pull/7619/commits/2dc4133920fe58ce414c545102c74173d40d1997.patch"; - hash = "sha256-PROnPc/1qS3hcO8s5sel55tsyZ1VPjEKLcua8Pd4DP0="; - }) - (fetchpatch { - name = "fix-tripledes-cipher-warnings"; - url = "https://github.com/freeipa/freeipa/pull/7619/commits/e2bf6e4091c7b5320ec6387dab2d5cabe4a9a42d.patch"; - hash = "sha256-AyMK0hjXMrFK4/qIcjPMFH9DKvnvYOK2QS83Otcc+l4="; - }) - ]; - nativeBuildInputs = [ python3Packages.wrapPython jre diff --git a/pkgs/by-name/fr/freelens-bin/package.nix b/pkgs/by-name/fr/freelens-bin/package.nix index e35f6a48994a..25aea7c42f28 100644 --- a/pkgs/by-name/fr/freelens-bin/package.nix +++ b/pkgs/by-name/fr/freelens-bin/package.nix @@ -16,24 +16,20 @@ let pname = "freelens-bin"; - version = "1.9.0"; + version = "1.10.2"; sources = { x86_64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-amd64.AppImage"; - hash = "sha256-aM3sS87kpb9UhVMdG7cPeCp4j9KBW71H+MJR+oN4908="; + hash = "sha256-l+6QnlDnNs2t4auJRS0MLy592OfQDd0tDNqiVH5xJ3g="; }; aarch64-linux = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-linux-arm64.AppImage"; - hash = "sha256-/DUMuGAhVV0Ro4UbAF6lwjgB4/Wi1AY2UKn9ZuN7fDc="; - }; - x86_64-darwin = { - url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-amd64.dmg"; - hash = "sha256-xKH/RBR2if37WiquCC+ZSxGyoFF32iIPvYdGNfDbDFw="; + hash = "sha256-Pw6RPa6T9jN7XAfOqj6lDFzTqhwOT1DgK35cANyBAOE="; }; aarch64-darwin = { url = "https://github.com/freelensapp/freelens/releases/download/v${version}/Freelens-${version}-macos-arm64.dmg"; - hash = "sha256-dp/kD6NHmK/CNZEF2BKh6NAChBTMgjZLY7eIwhyWgWk="; + hash = "sha256-ARIvUMkkdUK5O6xdplXJ/JkPdezO/16HvO2P21W6y8I="; }; }; diff --git a/pkgs/by-name/fr/freeplane/deps.json b/pkgs/by-name/fr/freeplane/deps.json index f061ee3c311e..8d89c21c0e32 100644 --- a/pkgs/by-name/fr/freeplane/deps.json +++ b/pkgs/by-name/fr/freeplane/deps.json @@ -109,12 +109,18 @@ "com/fasterxml#oss-parent/65": { "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4=" }, + "com/fasterxml#oss-parent/70": { + "pom": "sha256-JsqO1vgsnS7XzTIpgQW7ZcD52JnbYXV6CXQVhvqTpjk=" + }, "com/fasterxml/jackson#jackson-base/2.18.3": { "pom": "sha256-1bv9PIRFIw5Ji2CS3oCa/WXPUE0BOTLat7Pf1unzpP0=" }, "com/fasterxml/jackson#jackson-base/2.19.0": { "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg=" }, + "com/fasterxml/jackson#jackson-base/2.20.1": { + "pom": "sha256-C3SKsMx/KH21tgGMYUz+Z+fh9NgJQc4vQdMXzMO1tcU=" + }, "com/fasterxml/jackson#jackson-bom/2.17.1": { "pom": "sha256-n0RhIo4SkQPu16MC3BABqy5Mgt086pFcKn27jMYe/SU=" }, @@ -124,6 +130,9 @@ "com/fasterxml/jackson#jackson-bom/2.19.0": { "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI=" }, + "com/fasterxml/jackson#jackson-bom/2.20.1": { + "pom": "sha256-DGRn7UyMc5JSTOcDymzj7YhZbuw5DxOwwmTy+WEwilQ=" + }, "com/fasterxml/jackson#jackson-parent/2.17": { "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" }, @@ -133,6 +142,9 @@ "com/fasterxml/jackson#jackson-parent/2.19": { "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo=" }, + "com/fasterxml/jackson#jackson-parent/2.20": { + "pom": "sha256-tDt/XGLoaxZPrnCuF9aRHF22B5mvAQVzYK/aguSEW+U=" + }, "com/fasterxml/jackson/core#jackson-annotations/2.18.3": { "jar": "sha256-iqV0DYC1pQJVCLQbutuqH7N3ImfGKLLjBoGk9F+LiTE=", "module": "sha256-RkWF2yH0irFZ6O9XnNfo5tMHoEdhGZZRw+zBf05ydF0=", @@ -143,6 +155,11 @@ "module": "sha256-HzHOjWv4Trf0q6Hl/gGn7mshk+mw8rv4zENMRUXVGh8=", "pom": "sha256-MnlOx3WinmcwPfut370Jq/3nKaRPWuJ7Wew8g65vOuA=" }, + "com/fasterxml/jackson/core#jackson-annotations/2.20": { + "jar": "sha256-lZov+y1ZFDb1Hxg8alIfyJNHkS9xG/DK4AjN8EXZUxk=", + "module": "sha256-wHDxTsg1jQlcAurootZcsAzLoOXFqnOwASlDM/5GiXE=", + "pom": "sha256-TXQMRHjdCNCJ7NxtBjIopVoRp+jkl9pDOPhy+BFXlKQ=" + }, "com/fasterxml/jackson/core#jackson-core/2.18.3": { "jar": "sha256-BWvE0+XlPOghRQ+pez+eD43eElz22miENTux8JWC4dk=", "module": "sha256-mDbVp/Iba8VNfybeh8izBd3g5PGEsqyJUOmhsd9Hw0A=", @@ -153,6 +170,11 @@ "module": "sha256-WT2jX9rflNEYYvfErCjcq52J1bzd2y2jOe7WFXxVbYk=", "pom": "sha256-zOajQFk4YjqBCJX/b94vBMnDuTegVihx4aY0lr4Pr6s=" }, + "com/fasterxml/jackson/core#jackson-core/2.20.1": { + "jar": "sha256-/6tNlX2qJ5bPJMtm0LeKcJDxvL4Xw6RXjwmv+q8TcIk=", + "module": "sha256-GalAQ0Ic2ahuFUkSnDjBjgs1exQUWuT3Ns2gL4Bch8k=", + "pom": "sha256-FuBJqySPgqpssEjwTVLvPuH1TIDaHSY68k++UM9ueX4=" + }, "com/fasterxml/jackson/core#jackson-databind/2.18.3": { "jar": "sha256-UQvdp1p6YYbFvzO4USOUiKFFCQauV1cSHy4cxIp+EI8=", "module": "sha256-ZCqggPhbIAV3ifrPKsaibhR4NbUDPidSDstpe8RD/Lo=", @@ -163,6 +185,11 @@ "module": "sha256-Z2HeLgXl0m7GK5R/p1AJEZDz/JnM8iaM3suTz/bfbSo=", "pom": "sha256-f0zGn9XZuwIW0ULD2Cv/2v64bUelU8KBRbjOcOfreHY=" }, + "com/fasterxml/jackson/core#jackson-databind/2.20.1": { + "jar": "sha256-NLvrRSb/9PhWWxIQa/haavy66FiWbUibVCFKxGsuJug=", + "module": "sha256-S1M7Mu5wZfVaSnsNbuTYn9WDdxSr83YUyJkRT7EhWHo=", + "pom": "sha256-vP3yeCUyMraDq1HeLcvI+Y8g9Hc4wRHs/SyFxBsTHOw=" + }, "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.3": { "jar": "sha256-PKAOR8/LQ+eUON3PyPxzXp66w4JPt3aROGCb5r1W5IM=", "module": "sha256-v2AjrStgVyCsbaJ6K16Y7bGjJs0L9jfDpAtiH+jgk80=", @@ -173,12 +200,20 @@ "module": "sha256-PMYsM/xsilphLhhqrDn6Lagh8wZqt9Dj0O5Jh8moGtw=", "pom": "sha256-/vTqd2/yMf2s7avll/9DGpXe9Rjk9140ZLwr5HCj23o=" }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.20.1": { + "jar": "sha256-Aw8dkfffJ46G4bo+Ep+1IIcawWzlMBfHNfcIgjvpcNs=", + "module": "sha256-At0WoElpdLY7sgrszAK2fpeuQ6Uc5H1JSbyAUiLHQxI=", + "pom": "sha256-JrotoAFsKiNbPccCc5xm3O6xjKBURirhVE2srfnguSU=" + }, "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.3": { "pom": "sha256-VnParMboVZdt7O3rRtxjOVprGsmkg+Zy8IMc9G/gbiU=" }, "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.0": { "pom": "sha256-wZ0UHUA3aIQ2Rq7KvAMdPPqalqeH2Cfqmj5KDCguUwI=" }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.20.1": { + "pom": "sha256-bIZ3yvUcuerYfbYmiPNR3MxDrPkAqONHcuQQ0TOPaqs=" + }, "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.0": { "jar": "sha256-Dul78yk2NJ1qTPbYQoUzv0pLWz5+Vf2aTxlQjOBip3U=", "module": "sha256-cg5M2qz3VPSlMw9EWBBhKPSGf4D7jTB1tavgx6Auam4=", @@ -312,6 +347,11 @@ "jar": "sha256-dVx5UBq9gG9aqDJX3Iiyylkj5pZfPL/ocxFsfJdoIQo=", "pom": "sha256-XPoeoCxNwZ0n3Vr8pRPynGerNE0aylU9jxbxW2mOT4U=" }, + "com/knuddels#jtokkit/1.1.0": { + "jar": "sha256-FQHOAlmriXxnRsz6+h0gis1AT7F+GsYuFXFy8meLEYM=", + "module": "sha256-QxxAPs80ROw72ZNJIvNpOf1vCClXmpolySdBmSzVjC8=", + "pom": "sha256-cfjoMOMzqx9I5NAy7FSiu4J6Zk+crtGlo8h815W+8eA=" + }, "com/moandjiezana/toml#toml4j/0.7.2": { "jar": "sha256-9UdeY+fonl22IiNImux6Vr0wNUN3IHehfCy1TBnKOiA=", "pom": "sha256-W3YhZzfy2pODlTrMybpY9uc500Rnh5nm1NCCz24da9M=" @@ -445,6 +485,34 @@ "jar": "sha256-aBm3LpRQ2u5e9WMeq1pHT2BFJo2MZjugKAzQZHMtsgM=", "pom": "sha256-aNbsZVtGv6PXgOzwYrww3uyoxJTFrptUgJmqMfddj/8=" }, + "dev/langchain4j#langchain4j-core/1.10.0": { + "jar": "sha256-mLYaUMXnrQqgAeZzNaQiC5Oxdjb0GJjpJKlITPY6D2A=", + "pom": "sha256-RWtDs6sZ13bd8B5Lo4Ns3PQY+lqMY03D7RIYNfL61Us=" + }, + "dev/langchain4j#langchain4j-google-ai-gemini/1.10.0": { + "jar": "sha256-vnn3FTdhbL20H9mGx8FCGbxbSjUZinzPILPzCw+oQGM=", + "pom": "sha256-fl3i8dKdWFoKqrcU/7ApPsovnfghcTnsIxeztR2W+Zc=" + }, + "dev/langchain4j#langchain4j-http-client-jdk/1.10.0": { + "jar": "sha256-UvACwI95ym0tgB5pk+2qi6y80E8j9aWl2kP3LhPzc7Q=", + "pom": "sha256-O157qvYTpQygMo1F/uQECx87iQjmxDMdAQaFrqmWIXQ=" + }, + "dev/langchain4j#langchain4j-http-client/1.10.0": { + "jar": "sha256-2/8KUpgCqg4B7cpaw/Jge9xKpwMUfQkYYy5WiEys22M=", + "pom": "sha256-6pKR89smKWwyMeIhcnrhJ1PSDZd6rPPgJ5DPZz7iugs=" + }, + "dev/langchain4j#langchain4j-ollama/1.10.0": { + "jar": "sha256-gdAO/aKXlr/wfOToNukxKs0rY5KM5pl08fW/J+PuB8A=", + "pom": "sha256-DMFtKMuYoTb/lj/9cg5i8gtAaN7KaOQWM11w+U+W61s=" + }, + "dev/langchain4j#langchain4j-open-ai/1.10.0": { + "jar": "sha256-Gc86eMzldPSmjXH3MOd8miVgxddLqWCCFJ7TtmbEpT4=", + "pom": "sha256-dsuM2N519LnL0ILyPczhPN5lCnRoIJ06mdwOt7ihgg8=" + }, + "dev/langchain4j#langchain4j/1.10.0": { + "jar": "sha256-FbLb3RdPhOw9IGUgEZhp1cy3RVcO5UB/k8iSYqSrbug=", + "pom": "sha256-Lks6x5I/NCz4wXrmBuYheDDhrjB7Hy9/wBc/JIAmx5E=" + }, "info/picocli#picocli/4.7.7": { "jar": "sha256-+G4w//0Q0rE7jKqNSyN6fuYfL/zPWxlB3nGLdl0jW/g=", "pom": "sha256-GxjTYxNN9mYx0rn3R1Bo1zQiW6OJzfkIKhvYvakNV9M=" @@ -569,6 +637,9 @@ "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, + "org/apache#apache/34": { + "pom": "sha256-NnGunU0GKuO7mFcxx2CIuy9vfXJU4tME7p9pC5dlEyg=" + }, "org/apache#apache/7": { "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" }, @@ -891,6 +962,13 @@ "jar": "sha256-RKYMYQ9OMVJLA9gaaYsezOuhFjIOpRC6v4WVdbLqcjM=", "pom": "sha256-NFZNRisHTeJlC4Vb5yPej1WT5ZDLkTK6402dsd/7W+c=" }, + "org/apache/opennlp#opennlp-tools/2.5.4": { + "jar": "sha256-Xv7bJtDpflNweo0vDi4o8F/PZU/OKjP4v+EcLUwqT+k=", + "pom": "sha256-/UVXkW5ld1lWw36M3afZrSvKd4opyY1qXG4xth+D1WA=" + }, + "org/apache/opennlp#opennlp/2.5.4": { + "pom": "sha256-Qz0Ic+wnz+Gxog6mQ3c6LymkCh/eobtdGCiy81NQwps=" + }, "org/apache/pdfbox#fontbox/3.0.3": { "jar": "sha256-ZWkMPzmwShTRLBf0mYwVGGzod9Pi7CIscIV348wCgDA=", "pom": "sha256-sik+UDqncEMGEVD4hGg9f2FMz1Fjvi0PBSyinzx2d+I=" @@ -1209,6 +1287,10 @@ "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=", "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc=" }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, "org/junit#junit-bom/5.9.3": { "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" @@ -1366,6 +1448,7 @@ "pom": "sha256-Udh5pZmPWCJ0Dc9VIsDtaXGtXEpeowtw9bVGCT5rQmM=" }, "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" }, "org/slf4j#slf4j-api/2.1.0-alpha1": { diff --git a/pkgs/by-name/fr/freeplane/package.nix b/pkgs/by-name/fr/freeplane/package.nix index 134495debe72..32cf9417c51c 100644 --- a/pkgs/by-name/fr/freeplane/package.nix +++ b/pkgs/by-name/fr/freeplane/package.nix @@ -8,11 +8,12 @@ gradle_9, which, copyDesktopItems, + fetchpatch, }: let pname = "freeplane"; - version = "1.12.16"; + version = "1.13.2"; jdk = jdk17; gradle = gradle_9; @@ -21,13 +22,21 @@ let owner = "freeplane"; repo = "freeplane"; rev = "release-${version}"; - hash = "sha256-I7vp67UXoiBDxmIOlgCWk6sKOZSWHHI7A2Sdu6cl488="; + hash = "sha256-NDji6psNXESAY5NWI/Ms63MTgbxZHiIxYAgOSkWHuK0="; }; in stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version src; + patches = [ + # Gradle 9.5 compatibility. Remove on next version bump. + (fetchpatch { + url = "https://github.com/freeplane/freeplane/commit/34189b58bbdf0027185a212e2d6bd9e289782ef2.patch"; + hash = "sha256-gVCKXme+pB7PV0yBoDMPg6ltCaTGYh1lspEKgwVkDgc="; + }) + ]; + nativeBuildInputs = [ makeBinaryWrapper jdk @@ -102,7 +111,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://freeplane.org/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ chaduffy ]; + maintainers = [ ]; mainProgram = "freeplane"; }; }) diff --git a/pkgs/by-name/fr/freepv/package.nix b/pkgs/by-name/fr/freepv/package.nix index 8ccd3ff08afc..e37de84d89f9 100644 --- a/pkgs/by-name/fr/freepv/package.nix +++ b/pkgs/by-name/fr/freepv/package.nix @@ -57,6 +57,6 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open source panorama viewer using GL"; homepage = "https://freepv.sourceforge.net/"; - license = [ lib.licenses.lgpl21 ]; + license = lib.licenses.lgpl21; }; }) diff --git a/pkgs/by-name/fr/freeradius/package.nix b/pkgs/by-name/fr/freeradius/package.nix index 7f0036dc66a5..3aa2e394b9f5 100644 --- a/pkgs/by-name/fr/freeradius/package.nix +++ b/pkgs/by-name/fr/freeradius/package.nix @@ -38,13 +38,13 @@ assert withRest -> withJson; stdenv.mkDerivation rec { pname = "freeradius"; - version = "3.2.8"; + version = "3.2.10"; src = fetchFromGitHub { owner = "FreeRADIUS"; repo = "freeradius-server"; tag = "release_${lib.replaceStrings [ "." ] [ "_" ] version}"; - hash = "sha256-NvcXTT0jp3WR/w+JWcNESg6iNYqIV8QAlM8MxpYkpjs="; + hash = "sha256-+pFV6dDnL7T5G309cLACa+/0vGppCEdk3ghOQhgSjTs="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/fr/freerdp/package.nix b/pkgs/by-name/fr/freerdp/package.nix index babe7ce7d317..14453b349c0f 100644 --- a/pkgs/by-name/fr/freerdp/package.nix +++ b/pkgs/by-name/fr/freerdp/package.nix @@ -39,6 +39,8 @@ orc, cairo, cjson, + libcbor, + libfido2, libusb1, libpulseaudio, cups, @@ -70,13 +72,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "freerdp"; - version = "3.26.0"; + version = "3.30.0"; src = fetchFromGitHub { owner = "FreeRDP"; repo = "FreeRDP"; tag = finalAttrs.version; - hash = "sha256-7yUqZXuUn3OFhlWrZyXmmh/aGOp0uRJ7XxaLl1fVnVQ="; + hash = "sha256-Fy7TB7cRHXB86deb86eg05Cwf9SHU0C/Qnfj5Ylmjug="; }; postPatch = '' @@ -117,6 +119,8 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg glib icu + libcbor + libfido2 libx11 libxcursor libxdamage @@ -173,6 +177,8 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.mapAttrsToList lib.cmakeBool ( { BUILD_TESTING = false; # false is recommended by upstream + CHANNEL_RDPEWA = true; + CHANNEL_RDPEWA_CLIENT = true; WITH_CAIRO = cairo != null; WITH_CUPS = cups != null; WITH_FAAC = withUnfree && faac != null; @@ -230,7 +236,10 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/FreeRDP/FreeRDP/releases/tag/${finalAttrs.src.tag}"; homepage = "https://www.freerdp.com/"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ deimelias ]; + maintainers = with lib.maintainers; [ + cizra + deimelias + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/fr/freescout/0001-settings-catch-unwritable-.env.patch b/pkgs/by-name/fr/freescout/0001-settings-catch-unwritable-.env.patch new file mode 100644 index 000000000000..ff9616206f24 --- /dev/null +++ b/pkgs/by-name/fr/freescout/0001-settings-catch-unwritable-.env.patch @@ -0,0 +1,30 @@ +From 1c749a3610fb423e50260a2c807b44a94ef4c69d Mon Sep 17 00:00:00 2001 +From: Nina Fromm +Date: Thu, 25 Jun 2026 16:23:00 +0200 +Subject: [PATCH] settings: catch unwritable .env + +--- + app/Misc/Helper.php | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/app/Misc/Helper.php b/app/Misc/Helper.php +index 2d647b89..3fc2ef84 100644 +--- a/app/Misc/Helper.php ++++ b/app/Misc/Helper.php +@@ -1172,7 +1172,12 @@ class Helper + $contents = $contents."\n{$key}={$value}\n"; + } + } +- \File::put($env_path, $contents); ++ try { ++ \File::put($env_path, $contents); ++ } catch (\Exception $e) { ++ \Helper::logException($e, 'Error updating ' . $key .' in .env file: '); ++ \Session::flash('flash_error_unescaped', "Unable to write settings to $env_path: " . $e->getMessage()); ++ } + } + + /** +-- +2.53.0 + diff --git a/pkgs/by-name/fr/freescout/package.nix b/pkgs/by-name/fr/freescout/package.nix new file mode 100644 index 000000000000..24442006c851 --- /dev/null +++ b/pkgs/by-name/fr/freescout/package.nix @@ -0,0 +1,64 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nixosTests, +}: +stdenv.mkDerivation (finalAttrs: { + preferLocalBuild = true; + pname = "freescout"; + version = "1.8.230"; + + src = fetchFromGitHub { + owner = "freescout-help-desk"; + repo = "freescout"; + tag = finalAttrs.version; + hash = "sha256-QAMZj1tUSaErLTJR8IfzatNw5G8lznA4mNa+a4Bd5rQ="; + }; + + patches = [ + ./0001-settings-catch-unwritable-.env.patch + ]; + + prePatch = '' + rm -rf storage + rm bootstrap/cache/.gitignore + rm public/{css,js}/builds/.htaccess + rm {Modules,public/modules}/.gitkeep + rmdir Modules public/modules bootstrap/cache public/{css,js}/builds + ln -rs data/.env .env + ln -rs data/storage storage + ln -rs data/bootstrap/cache bootstrap/cache + ln -rs data/storage/app/public public/storage + ln -rs data/public/css/builds public/css/builds + ln -rs data/public/js/builds public/js/builds + ln -rs data/Modules Modules + ln -rs data/public/modules public/modules + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/freescout + cp -ar . $out/share/freescout + chmod +x $out/share/freescout/artisan + + runHook postInstall + ''; + + passthru.tests = lib.attrValues nixosTests.freescout; + + # Because freescout is searching for some folders only relative to it's own source location, we need to have the symlinks to the actual locations in here + dontCheckForBrokenSymlinks = true; + strictDeps = true; + __structuredAttrs = true; + + meta = with lib; { + changelog = "https://github.com/freescout-help-desk/freescout/releases/tag/${finalAttrs.src.tag}"; + description = "Free self-hosted help desk & shared mailbox"; + license = licenses.agpl3Only; + homepage = "https://freescout.net/"; + platforms = platforms.all; + maintainers = with maintainers; [ e1mo ]; + }; +}) diff --git a/pkgs/by-name/fr/freeswitch/package.nix b/pkgs/by-name/fr/freeswitch/package.nix index c80de735f401..f8a2d2e02dc9 100644 --- a/pkgs/by-name/fr/freeswitch/package.nix +++ b/pkgs/by-name/fr/freeswitch/package.nix @@ -12,7 +12,7 @@ sqlite, libjpeg, speex, - pcre, + pcre2, libuuid, ldns, libedit, @@ -109,12 +109,12 @@ in stdenv.mkDerivation (finalAttrs: { pname = "freeswitch"; - version = "1.10.12"; + version = "1.11.1"; src = fetchFromGitHub { owner = "signalwire"; repo = "freeswitch"; rev = "v${finalAttrs.version}"; - hash = "sha256-uOO+TpKjJkdjEp4nHzxcHtZOXqXzpkIF3dno1AX17d8="; + hash = "sha256-uXn5MLEsGPfRzTQJ/v3Tq1yXVIWZQwNQIyvZulMxSqU="; }; postPatch = '' @@ -146,7 +146,7 @@ stdenv.mkDerivation (finalAttrs: { readline libjpeg sqlite - pcre + pcre2 speex ldns libedit diff --git a/pkgs/by-name/fr/freetube/package.nix b/pkgs/by-name/fr/freetube/package.nix index 89da9140443b..ed4e7f35e84e 100644 --- a/pkgs/by-name/fr/freetube/package.nix +++ b/pkgs/by-name/fr/freetube/package.nix @@ -2,13 +2,14 @@ lib, stdenvNoCC, fetchFromGitHub, - fetchYarnDeps, + fetchPnpmDeps, replaceVars, makeDesktopItem, nodejs, - yarnConfigHook, - yarnBuildHook, + pnpmConfigHook, + pnpmBuildHook, + pnpm_10, makeShellWrapper, copyDesktopItems, electron, @@ -17,18 +18,22 @@ }: let description = "Open Source YouTube app for privacy"; + pnpm = pnpm_10; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "freetube"; - version = "0.24.1"; + version = "0.25.1"; src = fetchFromGitHub { owner = "FreeTubeApp"; repo = "FreeTube"; tag = "v${finalAttrs.version}-beta"; - hash = "sha256-oo5ozdP3d82jY8OOYrt568MoSfPmwBoitdtgESiRMlE="; + hash = "sha256-CQiwAoOJoAZpcDIwqcOfUAvJHLWTdj8fIInlR3qyjg8="; }; + __structuredAttrs = true; + strictDeps = true; + # Darwin requires writable Electron dist postUnpack = if stdenvNoCC.hostPlatform.isDarwin then @@ -48,15 +53,18 @@ stdenvNoCC.mkDerivation (finalAttrs: { ./targets.patch ]; - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-9rO/XYfOf1TEQOpb5clCfdTiuDeynpnk6L4WpcIIWGk="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-NWCgUjBuSeEl65mmAeJzOyIxCi2ha0Nr5qjOQq+CtMQ="; }; nativeBuildInputs = [ nodejs - yarnConfigHook - yarnBuildHook + pnpmConfigHook + pnpmBuildHook + pnpm makeShellWrapper copyDesktopItems ]; diff --git a/pkgs/by-name/fr/freetype/package.nix b/pkgs/by-name/fr/freetype/package.nix index 76ffe6324cf2..460e787f59a6 100644 --- a/pkgs/by-name/fr/freetype/package.nix +++ b/pkgs/by-name/fr/freetype/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, buildPackages, pkgsHostHost, pkg-config, @@ -39,16 +40,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "freetype"; - version = "2.14.2"; + version = "2.14.3"; - src = - let - inherit (finalAttrs) pname version; - in - fetchurl { - url = "mirror://savannah/freetype/freetype-${version}.tar.xz"; - sha256 = "sha256-S2Lcq0ySChqGA2mTMiGBQ2LmmeJvVXklFtZx5v9VteE="; - }; + src = fetchurl { + url = "mirror://savannah/freetype/freetype-${finalAttrs.version}.tar.xz"; + hash = "sha256-NrxPHMQTM1No7mVsQq/KZcWjmH6HaMwozxG6d154Wl8="; + }; propagatedBuildInputs = [ zlib @@ -69,6 +66,53 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./enable-table-validation.patch + + # https://project-zero.issues.chromium.org/issues/505355061 + # https://gitlab.freedesktop.org/freetype/freetype/-/work_items/1419 + # https://gitlab.freedesktop.org/freetype/freetype/-/work_items/1420 + (fetchpatch { + name = "truetype-shz-limit-heap-buffer-overflow-part1.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/1803559c4ee407d0bcbf2a67dbe96690cee869d2.patch"; + hash = "sha256-zxtJ2pJz8pNofgYrJ6c8/eZqRvxTotanF2IdU9ckpM4="; + }) + (fetchpatch { + name = "truetype-shz-limit-heap-buffer-overflow-part2.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/7d600a022e1d813e85a8c94ffd395f6135872267.patch"; + hash = "sha256-aHE11C9Cr23D2lqNmTVUDA5E07xxUm+AcYdWJG9zLFs="; + }) + + # https://project-zero.issues.chromium.org/issues/505357209 + # https://gitlab.freedesktop.org/freetype/freetype/-/work_items/1421 + (fetchpatch { + name = "truetype-iup-integer-overflow.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/7974be74d8b5a2fbf99aa88f0461d1f80af51cee.patch"; + hash = "sha256-b5Px0ALsnC5K1+601YioAjCLkLVXNnvTIZ1aQtCeNoQ="; + }) + + # https://project-zero.issues.chromium.org/issues/506902245 + # https://gitlab.freedesktop.org/freetype/freetype/-/work_items/1423 + # https://gitlab.freedesktop.org/freetype/freetype/-/merge_requests/428 + (fetchpatch { + name = "truetype-variation-handling-signednes-mismatch.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/0d45c7f1911bc6db0bf072eea0c8cdccd77bc6b3.patch"; + hash = "sha256-bw/9O86sZQa+vwdgx2MTqxWi6vjMcRTyC42ba9CaZ3I="; + }) + + # prerequisite for the below to apply, since this changes formatting of + # affected code. + (fetchpatch { + name = "ftobjs-formatting.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/590b77014bd920d0bdf64c039fddbce89a288b83.patch"; + hash = "sha256-govOzLBzQMAjSKABVFryDnSn2by2f/W9BgGG3o+qSuE="; + }) + + # https://project-zero.issues.chromium.org/issues/507321912 + # https://gitlab.freedesktop.org/freetype/freetype/-/work_items/1425 + (fetchpatch { + name = "sub-byte-bitmaps-heap-buffer-over-read.patch"; + url = "https://gitlab.freedesktop.org/freetype/freetype/-/commit/cbe12767ea73d1006edc75fcd61c0b0d2a88f34e.patch"; + hash = "sha256-jMeqY9uX7Ryfdd8icGDT4kEKl6aGRWafSN8GzOhGW7g="; + }) ] ++ lib.optional useEncumberedCode ./enable-subpixel-rendering.patch; diff --git a/pkgs/by-name/fr/frescobaldi/package.nix b/pkgs/by-name/fr/frescobaldi/package.nix index e0c0cbaa91b9..b3a673bd85c8 100644 --- a/pkgs/by-name/fr/frescobaldi/package.nix +++ b/pkgs/by-name/fr/frescobaldi/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { pyproject = true; src = fetchFromGitHub { - owner = "wbsoft"; + owner = "frescobaldi"; repo = "frescobaldi"; tag = "v${version}"; hash = "sha256-IgvjKj0+8oNbuZ91n4O16kGXBS7rS63HQUNQnJcOis8="; diff --git a/pkgs/by-name/fr/fresh-editor/package.nix b/pkgs/by-name/fr/fresh-editor/package.nix index 26b240c85534..270143a61da4 100644 --- a/pkgs/by-name/fr/fresh-editor/package.nix +++ b/pkgs/by-name/fr/fresh-editor/package.nix @@ -7,21 +7,22 @@ pkg-config, openssl, gitMinimal, + python3, nix-update-script, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "fresh"; - version = "0.3.10"; + version = "0.4.4"; src = fetchFromGitHub { owner = "sinelaw"; repo = "fresh"; tag = "v${finalAttrs.version}"; - hash = "sha256-5gMrQOhQVyIJuv5QAPOyiTFcY4RntmQV0Mtue1x8aAs="; + hash = "sha256-ycB5wEDYlyTDdIk5lE26c2YFMmDGGqcMuSqwqDSyxs0="; }; - cargoHash = "sha256-5QHNIt7PoB2IhQU6IyL5Ljax0/CzVMHvMcNDfM9st7U="; + cargoHash = "sha256-HWuHKn+vJC3cdS6bKp5iw9VSTRHn/Q5Zsj6OHvmfYp0="; __structuredAttrs = true; @@ -32,6 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; nativeCheckInputs = [ + python3 gitMinimal rustPlatform.bindgenHook ]; @@ -46,7 +48,8 @@ rustPlatform.buildRustPackage (finalAttrs: { postInstall = '' wrapProgram $out/bin/${finalAttrs.meta.mainProgram} \ - --add-flags "--no-upgrade-check" + --add-flags "--no-upgrade-check" \ + --prefix PATH : ${lib.makeBinPath [ python3 ]} rm -rf $out/bin/fresh.dSYM ''; diff --git a/pkgs/by-name/fr/fretboard/package.nix b/pkgs/by-name/fr/fretboard/package.nix index 115e311419e8..a1c0e3a6707a 100644 --- a/pkgs/by-name/fr/fretboard/package.nix +++ b/pkgs/by-name/fr/fretboard/package.nix @@ -69,6 +69,5 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fretboard"; teams = [ lib.teams.gnome-circle ]; platforms = lib.platforms.unix; - broken = stdenv.hostPlatform.isDarwin; }; }) diff --git a/pkgs/by-name/fr/fricas/package.nix b/pkgs/by-name/fr/fricas/package.nix index 9eeadf410d0a..31bfcbd3a581 100644 --- a/pkgs/by-name/fr/fricas/package.nix +++ b/pkgs/by-name/fr/fricas/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fricas"; - version = "1.3.12"; + version = "1.3.13"; src = fetchFromGitHub { owner = "fricas"; repo = "fricas"; - rev = finalAttrs.version; - sha256 = "sha256-GUGJR65K1bPC0D36l4Yyj3GOsWtUrSKLu6JnlfjHzDc="; + tag = finalAttrs.version; + hash = "sha256-vpClJwB91pCgc6DWy0I2XTfSWkt+7nEAkUK9zz4qh4A="; }; buildInputs = [ @@ -34,23 +34,16 @@ stdenv.mkDerivation (finalAttrs: { libxdmcp ]; - # Remove when updating to next version - configurePhase = '' - runHook preConfigure - - ./configure --prefix=$out --with-lisp='sbcl --dynamic-space-size 3072' - - runHook postConfigure - ''; - dontStrip = true; meta = { homepage = "https://fricas.github.io"; description = "Advanced computer algebra system"; + changelog = "https://github.com/fricas/fricas/blob/${finalAttrs.src.tag}/ChangeLog"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.sprock ]; + maintainers = [ ]; + mainProgram = "fricas"; }; }) diff --git a/pkgs/by-name/fr/frida-tools/package.nix b/pkgs/by-name/fr/frida-tools/package.nix index 288a1ac6202a..c432e3780099 100644 --- a/pkgs/by-name/fr/frida-tools/package.nix +++ b/pkgs/by-name/fr/frida-tools/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "frida-tools"; - version = "14.9.0"; + version = "14.10.4"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; pname = "frida_tools"; - hash = "sha256-9S/PtdcyFV/9c3pNrmhpqBg8hXtGkqtUyoX1SzXHxtE="; + hash = "sha256-eixUS1RdCVBA//vTdoooekJjQ9rYkJW0ok9LIDgtkmo="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/fr/frigate/package.nix b/pkgs/by-name/fr/frigate/package.nix index 8cb605a69061..024fdc31b76d 100644 --- a/pkgs/by-name/fr/frigate/package.nix +++ b/pkgs/by-name/fr/frigate/package.nix @@ -15,22 +15,22 @@ }: let - version = "0.17.1"; + version = "0.17.2"; src = fetchFromGitHub { name = "frigate-${version}-source"; owner = "blakeblackshear"; repo = "frigate"; tag = "v${version}"; - hash = "sha256-jQQ54By77dOVSIu08YhJn+EUV0D03j1bcMQRk9404RE="; + hash = "sha256-8ujG5rVGqIJxM+IiQKvudrA0xqfz+3Uisl/zXwARPpY="; }; frigate-web = callPackage ./web.nix { inherit version src; }; - python = python313Packages.python.override { - packageOverrides = self: super: { + python3Packages = python313Packages.overrideScope ( + self: super: { joserfc = super.joserfc.overridePythonAttrs (oldAttrs: { version = "1.1.0"; src = fetchFromGitHub { @@ -43,9 +43,10 @@ let huggingface-hub = super.huggingface-hub_0; transformers = super.transformers_4; - }; - }; - python3Packages = python.pkgs; + } + ); + + inherit (python3Packages) python; # Tensorflow audio model # https://github.com/blakeblackshear/frigate/blob/v0.15.0/docker/main/Dockerfile#L125 @@ -101,6 +102,9 @@ python3Packages.buildPythonApplication rec { # Fix excessive trailing whitespaces in process commandlines # https://github.com/blakeblackshear/frigate/pull/22089 ./proc-cmdline-strip.patch + + # Fix more granular dtype resultion in Pandas 3.0 + ./pandas3-compat.patch ]; postPatch = '' @@ -239,9 +243,6 @@ python3Packages.buildPythonApplication rec { pytestCheckHook ]; - # interpreter crash in onnxruntime on aarch64-linux - doCheck = !(stdenv.hostPlatform.system == "aarch64-linux"); - preCheck = '' # Unavailable in the build sandbox substituteInPlace frigate/const.py \ diff --git a/pkgs/by-name/fr/frigate/pandas3-compat.patch b/pkgs/by-name/fr/frigate/pandas3-compat.patch new file mode 100644 index 000000000000..466e45e0153f --- /dev/null +++ b/pkgs/by-name/fr/frigate/pandas3-compat.patch @@ -0,0 +1,13 @@ +diff --git a/frigate/api/review.py b/frigate/api/review.py +index 76619dcb2..f72c0efc3 100644 +--- a/frigate/api/review.py ++++ b/frigate/api/review.py +@@ -660,7 +660,7 @@ def motion_activity( + df.iloc[i : i + chunk, 0] = 0.0 + + # change types for output +- df.index = df.index.astype(int) // (10**9) ++ df.index = df.index.as_unit("s").astype("int64") + normalized = df.reset_index().to_dict("records") + return JSONResponse(content=normalized) + diff --git a/pkgs/by-name/fr/frodo4/package.nix b/pkgs/by-name/fr/frodo4/package.nix index a4d37b3a3e3d..9f49ba742498 100644 --- a/pkgs/by-name/fr/frodo4/package.nix +++ b/pkgs/by-name/fr/frodo4/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/cebix/frodo4"; description = "C64 emulator with emphasis on graphical accuracy"; mainProgram = "Frodo"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ chordtoll ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fr/frotz/package.nix b/pkgs/by-name/fr/frotz/package.nix index 845cc7f48790..f78b72dc3ade 100644 --- a/pkgs/by-name/fr/frotz/package.nix +++ b/pkgs/by-name/fr/frotz/package.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://davidgriffith.gitlab.io/frotz/"; - changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/NEWS"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${finalAttrs.version}/ChangeLog"; description = "Z-machine interpreter for Infocom games and other interactive fiction (${frontend})"; mainProgram = progName; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/fr/frp/dashboard.nix b/pkgs/by-name/fr/frp/dashboard.nix new file mode 100644 index 000000000000..facbdd467ea7 --- /dev/null +++ b/pkgs/by-name/fr/frp/dashboard.nix @@ -0,0 +1,34 @@ +{ + buildNpmPackage, + frp, +}: +let + builder = + name: + buildNpmPackage { + pname = "${name}-dashboard"; + inherit (frp) version src; + + sourceRoot = "source/web"; + + preBuild = '' + pushd ${name} + ''; + + installPhase = '' + runHook preInstall + cp -r dist $out + runHook postInstall + ''; + + npmDepsHash = "sha256-XuqQPfywzK81anAD1pAl1TMQqb1+hH2QxLwuTn7zCPU="; + + meta = frp.meta // { + description = "Dashboard for frp"; + }; + }; +in +{ + frpc = builder "frpc"; + frps = builder "frps"; +} diff --git a/pkgs/by-name/fr/frp/package.nix b/pkgs/by-name/fr/frp/package.nix index a5e1ddbfb695..25b5cde69a00 100644 --- a/pkgs/by-name/fr/frp/package.nix +++ b/pkgs/by-name/fr/frp/package.nix @@ -1,22 +1,24 @@ { buildGoModule, + callPackage, lib, fetchFromGitHub, nixosTests, }: - +let + web = callPackage ./dashboard.nix { }; +in buildGoModule (finalAttrs: { pname = "frp"; - version = "0.66.0"; - + version = "0.69.1"; src = fetchFromGitHub { owner = "fatedier"; repo = "frp"; tag = "v${finalAttrs.version}"; - hash = "sha256-GFvXdhX7kA43kppWWdL7KhummUCqpa1cQ7V2d9ISGfo="; + hash = "sha256-3tOOgnzZZ05En5NMLbp4UFNazX950Jbosvszmjf947c="; }; - vendorHash = "sha256-m5ECF0cgp2LfsTKey02MHz5TfqfzOCT5cU5trUfrOjY="; + vendorHash = "sha256-JrkIztnmhEYAogr4pDWrPu9/j+C0VLpEyNbh2UK5UcY="; doCheck = false; @@ -25,8 +27,14 @@ buildGoModule (finalAttrs: { "cmd/frps" ]; - passthru.tests = { - frp = nixosTests.frp; + preBuild = '' + cp -r ${web.frpc} web/frpc/dist + cp -r ${web.frps} web/frps/dist + ''; + + passthru = { + tests.frp = nixosTests.frp; + inherit web; }; meta = { @@ -39,5 +47,6 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/fatedier/frp"; license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ epireyn ]; }; }) diff --git a/pkgs/by-name/fr/frr/package.nix b/pkgs/by-name/fr/frr/package.nix index 748f8544ca91..77eabab1fc27 100644 --- a/pkgs/by-name/fr/frr/package.nix +++ b/pkgs/by-name/fr/frr/package.nix @@ -82,13 +82,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "frr"; - version = "10.6.1"; + version = "10.7.0"; src = fetchFromGitHub { owner = "FRRouting"; repo = "frr"; rev = "frr-${finalAttrs.version}"; - hash = "sha256-sSvw9tfVNUyQjEOELoUAIQkEvXg765MsWvVKM0gsYUc="; + hash = "sha256-A98uyOiFH/DvJPMmUvXQ1bG//OCdvuclpHD6xe5BqFU="; }; # Without the std explicitly set, we may run into abseil-cpp diff --git a/pkgs/by-name/fr/frugally-deep/package.nix b/pkgs/by-name/fr/frugally-deep/package.nix index c7861f0995a9..900bbb1b3995 100644 --- a/pkgs/by-name/fr/frugally-deep/package.nix +++ b/pkgs/by-name/fr/frugally-deep/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Header-only library for using Keras (TensorFlow) models in C++"; homepage = "https://github.com/Dobiasd/frugally-deep"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/fs/fscan/package.nix b/pkgs/by-name/fs/fscan/package.nix index c8e04bbc7206..d7f229604a6f 100644 --- a/pkgs/by-name/fs/fscan/package.nix +++ b/pkgs/by-name/fs/fscan/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "fscan"; - version = "2.1.3"; + version = "2.2.0"; src = fetchFromGitHub { owner = "shadow1ng"; repo = "fscan"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZfzFBOIsuwcfmmyZMPhgP9Oznec+rJs16IuIG7gwZhA="; + hash = "sha256-05z5DuW25/hVoTdUtGGuaCBPtO1QyGqgvKWSpO8DBpQ="; }; - vendorHash = "sha256-ihaGbm4iLjwvTzM278wuwom8LrmHB3WgmbfcJxtkbYc="; + vendorHash = "sha256-IlGHY0KbYsy/5Yz11XhkcS9yS8byY3vhPZiTwnJM6/Q="; subPackages = [ "." ]; diff --git a/pkgs/by-name/fs/fselect/package.nix b/pkgs/by-name/fs/fselect/package.nix index a0f51ed11bd2..33476559b84d 100644 --- a/pkgs/by-name/fs/fselect/package.nix +++ b/pkgs/by-name/fs/fselect/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fselect"; - version = "0.10.1"; + version = "0.10.2"; src = fetchFromGitHub { owner = "jhspetersson"; repo = "fselect"; rev = finalAttrs.version; - sha256 = "sha256-eu2OAxdhDaKewMKL02rj8ED6tfB9OI3br7g0WoKOejk="; + sha256 = "sha256-j9Md3yfL1tQkjCQ/Wo+oKaI/6OsJsCRsSscSiRuLOV0="; }; - cargoHash = "sha256-6XV8O3Ko4NKw5PaVbazrh6LQ0eQpbiPh/cB3Y9dkcb8="; + cargoHash = "sha256-+4dtpBcCOC1iwXKQHqgvvVtAvIFM3ZCAaefk9oPM1l0="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optional stdenv.hostPlatform.isDarwin libiconv; diff --git a/pkgs/by-name/fs/fsql/package.nix b/pkgs/by-name/fs/fsql/package.nix index bceca65e53f6..552bc13ea5d2 100644 --- a/pkgs/by-name/fs/fsql/package.nix +++ b/pkgs/by-name/fs/fsql/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.5.2"; src = fetchFromGitHub { - owner = "kshvmdn"; + owner = "kashav"; repo = "fsql"; rev = "v${finalAttrs.version}"; sha256 = "sha256-U6TPszqsZvoz+9GIB0wNYMRJqIDLOp/BZO3/k8FC0Gs="; @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { meta = { description = "Search through your filesystem with SQL-esque queries"; - homepage = "https://github.com/kshvmdn/fsql"; + homepage = "https://github.com/kashav/fsql"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pSub ]; mainProgram = "fsql"; diff --git a/pkgs/by-name/fs/fsrx/package.nix b/pkgs/by-name/fs/fsrx/package.nix index ea6cf0f2a74f..840774ed52fd 100644 --- a/pkgs/by-name/fs/fsrx/package.nix +++ b/pkgs/by-name/fs/fsrx/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.0.2"; src = fetchFromGitHub { - owner = "thatvegandev"; + owner = "jrnxf"; repo = "fsrx"; rev = "v${finalAttrs.version}"; sha256 = "sha256-hzfpjunP20WCt3erYu7AO7A3nz+UMKdFzWUA5jASbVA="; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Flow state reader in the terminal"; - homepage = "https://github.com/thatvegandev/fsrx"; + homepage = "https://github.com/jrnxf/fsrx"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ MoritzBoehme ]; mainProgram = "fsrx"; diff --git a/pkgs/by-name/fs/fsverity-utils/package.nix b/pkgs/by-name/fs/fsverity-utils/package.nix index 72eac55086af..b52e19121c67 100644 --- a/pkgs/by-name/fs/fsverity-utils/package.nix +++ b/pkgs/by-name/fs/fsverity-utils/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "fsverity-utils"; - version = "1.6"; + version = "1.7"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchzip { url = "https://git.kernel.org/pub/scm/fs/fsverity/fsverity-utils.git/snapshot/fsverity-utils-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-FZN4MKNmymIXZ2Q0woA0SLzPf4SaUJkj4ssKPsY4xXc="; + sha256 = "sha256-c8dillkgGh41elo/a5EqGQIrS4TZeDLsYkmyNke6koc="; }; patches = lib.optionals (!enableShared) [ diff --git a/pkgs/by-name/ft/ft2-clone/package.nix b/pkgs/by-name/ft/ft2-clone/package.nix index a8f89d0440e7..ffce55459699 100644 --- a/pkgs/by-name/ft/ft2-clone/package.nix +++ b/pkgs/by-name/ft/ft2-clone/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ft2-clone"; - version = "2.19"; + version = "2.22"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${finalAttrs.version}"; - hash = "sha256-vIo+7yb8QjzHAj68N2rHHc1o2knaBn6hCatDeKr+5gs="; + hash = "sha256-mHZtU7A4TVteZDxPngY68cbok/7Gzx0KBoOK6MhlaKk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ft/ftxui/package.nix b/pkgs/by-name/ft/ftxui/package.nix index 70bfe592bc97..cc659187d2f4 100644 --- a/pkgs/by-name/ft/ftxui/package.nix +++ b/pkgs/by-name/ft/ftxui/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "FTXUI_BUILD_EXAMPLES" false) (lib.cmakeBool "FTXUI_BUILD_DOCS" true) - (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "FTXUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; meta = { diff --git a/pkgs/by-name/fu/fuc/package.nix b/pkgs/by-name/fu/fuc/package.nix index e06fb465092b..91ba682eda49 100644 --- a/pkgs/by-name/fu/fuc/package.nix +++ b/pkgs/by-name/fu/fuc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fuc"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "SUPERCILEX"; repo = "fuc"; tag = finalAttrs.version; - hash = "sha256-fDSAqsKEx+th4tiJ3VlROqF4hhHzusqiw9enAmnOPlQ="; + hash = "sha256-EzT8Rq0vqcHiW6W0yLSzlWNEZzaKXvOL3o9WUj648gU="; }; - cargoHash = "sha256-OoTWGeF96BpPDx1Y9AEVOIBK7kCz6pjw24pLiNcKmOc="; + cargoHash = "sha256-sZGAQ+9u/2PpHkp5BcrrTU+48s6PT42+eEs/Cn0RsKk="; env.RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/by-name/fu/fujprog/package.nix b/pkgs/by-name/fu/fujprog/package.nix index 87363e2402c7..be9d78e695ef 100644 --- a/pkgs/by-name/fu/fujprog/package.nix +++ b/pkgs/by-name/fu/fujprog/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "fujprog"; homepage = "https://github.com/kost/fujprog"; license = lib.licenses.bsd2; - maintainers = with lib.maintainers; [ trepetti ]; + maintainers = [ ]; platforms = lib.platforms.all; changelog = "https://github.com/kost/fujprog/releases/tag/v${finalAttrs.version}"; }; diff --git a/pkgs/by-name/fu/fulcio/package.nix b/pkgs/by-name/fu/fulcio/package.nix index 531da83dab32..2aebfe6f983c 100644 --- a/pkgs/by-name/fu/fulcio/package.nix +++ b/pkgs/by-name/fu/fulcio/package.nix @@ -15,13 +15,13 @@ buildGoModule (finalAttrs: { pname = "fulcio"; - version = "1.8.7"; + version = "1.8.8"; src = fetchFromGitHub { owner = "sigstore"; repo = "fulcio"; tag = "v${finalAttrs.version}"; - hash = "sha256-9TvucbTD2uPFxJqUG2EwMLRV6PxGf5UbxoEIUAqUE84="; + hash = "sha256-MKXJAk4N6Q/VM7/8Ri08rfrxHRw5FvOoreFrMp2SoE0="; # 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 (finalAttrs: { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorHash = "sha256-Mb4MBqEbWAo58TLd15JUh53I7CUHu+nyyIAfZxx3DMw="; + vendorHash = "sha256-Bpu6PR3i+Sq5tZhCPLYi4rECwZ/QiN3Wls7U+8f6fBU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/fu/function-runner/package.nix b/pkgs/by-name/fu/function-runner/package.nix index 76e0fbeea0c9..65c2870b8119 100644 --- a/pkgs/by-name/fu/function-runner/package.nix +++ b/pkgs/by-name/fu/function-runner/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "function-runner"; - version = "9.1.2"; + version = "9.2.1"; __structuredAttrs = true; @@ -17,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Shopify"; repo = "function-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-KvReKvmF3i4zlfM8uj3KHamjfudcrhqrKGfK8O5tMpE="; + hash = "sha256-IhlQEeKGWcE2lVhcLbOqUQU+DboxMDc/9eDlzlfcprg="; }; - cargoHash = "sha256-gnEps/o+C8UpukO1oRF4qlhNsoAmyUmxMKGAgSykNY0="; + cargoHash = "sha256-mf1kIDsNIk5oXIuvki9zt3D7qJOUtPOvDC8jbLjCMtE="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/fu/functiontrace-server/package.nix b/pkgs/by-name/fu/functiontrace-server/package.nix index 0584ab933271..95583d1fab82 100644 --- a/pkgs/by-name/fu/functiontrace-server/package.nix +++ b/pkgs/by-name/fu/functiontrace-server/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage rec { meta = { description = "Server for FunctionTrace, a graphical Python profiler"; homepage = "https://functiontrace.com"; - license = with lib.licenses; [ prosperity30 ]; + license = lib.licenses.prosperity30; maintainers = with lib.maintainers; [ tehmatt ]; }; } diff --git a/pkgs/by-name/fu/furnace/package.nix b/pkgs/by-name/fu/furnace/package.nix index 0591915c2523..5a37b6718bf3 100644 --- a/pkgs/by-name/fu/furnace/package.nix +++ b/pkgs/by-name/fu/furnace/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Multi-system chiptune tracker compatible with DefleMask modules"; homepage = "https://github.com/tildearrow/furnace"; changelog = "https://github.com/tildearrow/furnace/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; mainProgram = "furnace"; diff --git a/pkgs/by-name/fu/fusee-nano/package.nix b/pkgs/by-name/fu/fusee-nano/package.nix index ca75ded59699..1891849b726f 100644 --- a/pkgs/by-name/fu/fusee-nano/package.nix +++ b/pkgs/by-name/fu/fusee-nano/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { pname = "fusee-nano"; - version = "unstable-2023-05-17"; + version = "0.5.3-unstable-2023-05-17"; src = fetchFromGitHub { owner = "DavidBuchanan314"; diff --git a/pkgs/by-name/fu/fut/package.nix b/pkgs/by-name/fu/fut/package.nix index bda5369506da..fad7c0841dee 100644 --- a/pkgs/by-name/fu/fut/package.nix +++ b/pkgs/by-name/fu/fut/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fut"; - version = "3.3.3"; + version = "3.3.6"; src = fetchFromGitHub { owner = "fusionlanguage"; repo = "fut"; tag = "fut-${finalAttrs.version}"; - hash = "sha256-CBCL+LKHFr982riDBSKkcp0QP/9Ukjrs3gs1y4AN/2I="; + hash = "sha256-DWx97eYGR/jrLiN8RkHdjsU+hjSNKRD8q1BSEkNtcDU="; }; buildPhase = '' diff --git a/pkgs/by-name/fu/fuzzdb/package.nix b/pkgs/by-name/fu/fuzzdb/package.nix index 4ca1eb4cb191..bb67c638b5c3 100644 --- a/pkgs/by-name/fu/fuzzdb/package.nix +++ b/pkgs/by-name/fu/fuzzdb/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Comprehensive collection of attack patterns and predictable resource names used for security testing and fuzzing application"; homepage = "https://github.com/fuzzdb-project/fuzzdb"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/fv/fvm/package.nix b/pkgs/by-name/fv/fvm/package.nix index f94cd3862d08..21bcd18bfeee 100644 --- a/pkgs/by-name/fv/fvm/package.nix +++ b/pkgs/by-name/fv/fvm/package.nix @@ -9,13 +9,13 @@ }: let - version = "4.0.5"; + version = "4.1.2"; src = fetchFromGitHub { owner = "leoafarias"; repo = "fvm"; tag = version; - hash = "sha256-NLFEGUo4Zy/OYOlbPKirN+JhbGfvzX2Eg0qB10SiGxs="; + hash = "sha256-Kyxyt2UsrQ6Bc6EuYJjpEFdYwcus2/bcVrWsd/gs3Ok="; }; in buildDartApplication { diff --git a/pkgs/by-name/fv/fvs2/package.nix b/pkgs/by-name/fv/fvs2/package.nix index 2a2e310332d0..ff4fb1a1e201 100644 --- a/pkgs/by-name/fv/fvs2/package.nix +++ b/pkgs/by-name/fv/fvs2/package.nix @@ -13,16 +13,16 @@ let in buildGoModule (finalAttrs: { pname = "fvs2"; - version = "0.1.5"; + version = "0.2.0"; src = fetchFromGitHub { owner = "fvs-lab"; repo = "fvs2"; tag = "v${finalAttrs.version}"; - hash = "sha256-YFtHWtkAPxHT2BqJyyKpPPwkrYyDoFEHq76mNPczJjI="; + hash = "sha256-wod+GzJ/tCl0dlAv0PM9I1TG9l96SujrOkSlEsgXp5U="; }; - vendorHash = "sha256-onx9DxaDcNwDWXfSNSugOG9WoLG918b2A1KJIaeQNpI="; + vendorHash = "sha256-MDizWAeXJW0YTMrGEtk3Ulvx0InW0EgytrtE9O7T3Ps="; preBuild = '' cp -r ${core} ../core diff --git a/pkgs/by-name/fw/fwanalyzer/package.nix b/pkgs/by-name/fw/fwanalyzer/package.nix index 6460d68cb5ac..330e29854586 100644 --- a/pkgs/by-name/fw/fwanalyzer/package.nix +++ b/pkgs/by-name/fw/fwanalyzer/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { meta = { description = "Tool to analyze filesystem images"; homepage = "https://github.com/cruise-automation/fwanalyzer"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "fwanalyzer"; }; diff --git a/pkgs/by-name/fw/fwup/package.nix b/pkgs/by-name/fw/fwup/package.nix index 40207fd2677c..3eddac5d52dc 100644 --- a/pkgs/by-name/fw/fwup/package.nix +++ b/pkgs/by-name/fw/fwup/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.15.1"; src = fetchFromGitHub { - owner = "fhunleth"; + owner = "fwup-home"; repo = "fwup"; tag = "v${finalAttrs.version}"; hash = "sha256-SIRDVlC/g+rq5m4Ind7dqPzjdCjAxRK/kAdXt6byL/8="; @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { unzip zip ] - ++ lib.optionals finalAttrs.doCheck [ + ++ lib.optionals finalAttrs.finalPackage.doCheck [ mtools dosfstools ]; @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { changelog = "https://github.com/fwup-home/fwup/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Configurable embedded Linux firmware update creator and runner"; - homepage = "https://github.com/fhunleth/fwup"; + homepage = "https://github.com/fwup-home/fwup"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.georgewhewell ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch b/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch deleted file mode 100644 index b2876ca37a6d..000000000000 --- a/pkgs/by-name/fw/fwupd/0004-Get-the-efi-app-from-fwupd-efi.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: r-vdp -Date: Mon, 28 Oct 2024 12:08:49 +0100 -Subject: [PATCH] Get the efi app from fwupd-efi - -EFI capsule is located in fwupd-efi now. ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 917770b38abb86056d6c42fa9c99dedf27ebe999..f52f3ec12dd9def0a68ea1645f7d508acbb731b9 100644 ---- a/meson.build -+++ b/meson.build -@@ -651,7 +651,7 @@ endif - - # EFI - if build_standalone -- efi_app_location = join_paths(libexecdir, 'fwupd', 'efi') -+ efi_app_location = join_paths(dependency('fwupd-efi').get_variable(pkgconfig: 'prefix'), 'libexec', 'fwupd', 'efi') - conf.set_quoted('EFI_APP_LOCATION', efi_app_location) - endif - diff --git a/pkgs/by-name/fw/fwupd/package.nix b/pkgs/by-name/fw/fwupd/package.nix index 0025fb8d550a..734a4f07e844 100644 --- a/pkgs/by-name/fw/fwupd/package.nix +++ b/pkgs/by-name/fw/fwupd/package.nix @@ -13,6 +13,7 @@ unstableGitUpdater, # fwupd + fetchpatch2, pkg-config, pkgsBuildBuild, @@ -122,7 +123,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "fwupd"; - version = "2.1.5"; + version = "2.1.6"; # libfwupd goes to lib # daemon, plug-ins and libfwupdplugin go to out @@ -140,14 +141,21 @@ stdenv.mkDerivation (finalAttrs: { owner = "fwupd"; repo = "fwupd"; tag = finalAttrs.version; - hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc="; + hash = "sha256-K8n1rPiLuHDybWPoAUQA7RY4J+Ga1fwNiaj48fHAh9A="; }; patches = [ ./0001-Install-fwupdplugin-to-out.patch ./0002-Add-output-for-installed-tests.patch ./0003-Add-option-for-installation-sysconfdir.patch - ./0004-Get-the-efi-app-from-fwupd-efi.patch + + # The memfd seal check added in 2.1.6 rejects any file on tmpfs, since + # F_GET_SEALS also works on tmpfs files on recent kernels. + # Remove when updating to 2.1.7. + (fetchpatch2 { + url = "https://github.com/fwupd/fwupd/commit/c2ff6e0bf9e3fea5b8502ed12fdc9ab604a51518.patch"; + hash = "sha256-Y8YbECfUGqvpNTlKCLOXgRSIZYO+MsZYIMcMgIQfkIs="; + }) ]; postPatch = '' @@ -227,6 +235,8 @@ stdenv.mkDerivation (finalAttrs: { "--sysconfdir=/etc" (lib.mesonOption "sysconfdir_install" "${placeholder "out"}/etc") (lib.mesonOption "efi_os_dir" "nixos") + # Use the EFI app from the separate fwupd-efi package. + (lib.mesonOption "efi_app_location" "${fwupd-efi}/libexec/fwupd/efi") # HSI is auto-disabled on non-x86 upstream; auto_features=enabled overrides # that, breaking the fwupdtool installed test which expects rc=1 on non-x86. (lib.mesonEnable "hsi" isx86) diff --git a/pkgs/by-name/fx/fx-cast-bridge/package.nix b/pkgs/by-name/fx/fx-cast-bridge/package.nix index b5276379abc0..1acb35b25238 100644 --- a/pkgs/by-name/fx/fx-cast-bridge/package.nix +++ b/pkgs/by-name/fx/fx-cast-bridge/package.nix @@ -72,7 +72,6 @@ buildNpmPackage rec { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; # aarch64-linux wasn't support in upstream according to README broken = stdenv.hostPlatform.isDarwin; mainProgram = "fx_cast_bridge"; diff --git a/pkgs/by-name/fy/fyi/package.nix b/pkgs/by-name/fy/fyi/package.nix index c8218a4e8c19..e1ea4eaed3e9 100644 --- a/pkgs/by-name/fy/fyi/package.nix +++ b/pkgs/by-name/fy/fyi/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://codeberg.org/dnkl/fyi/releases/tag/${finalAttrs.version}"; description = "Command line utility to create desktop notifications"; homepage = "https://codeberg.org/dnkl/fyi"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "fyi"; maintainers = with lib.maintainers; [ marnym ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/fy/fyne/package.nix b/pkgs/by-name/fy/fyne/package.nix index b5f79e98b6ac..973634e06fa6 100644 --- a/pkgs/by-name/fy/fyne/package.nix +++ b/pkgs/by-name/fy/fyne/package.nix @@ -15,18 +15,16 @@ buildGoModule (finalAttrs: { pname = "fyne"; - # This is the current latest version - # version "1.26.1" was a typo of "1.7.1" - maybe, don't "upgrade" to it - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "fyne-io"; repo = "tools"; rev = "v${finalAttrs.version}"; - hash = "sha256-NmO0AtD2lJMBOnlgFm6dXRp6NWMuyAIlckYLHugeJ1Q="; + hash = "sha256-kLhh44zRYEPD6kwh+DHaRYidbV+YWq9Tc0yB3f290Z4="; }; - vendorHash = "sha256-pTVl9NMqoLqRYrNFWSoagpELwbsW7t5kHYo+fEFQie0="; + vendorHash = "sha256-EzwSZDq3s74ohGk0s9NV5RwSFqlUA5AFM8DvKSZeXnM="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/fz/fzf-git-sh/package.nix b/pkgs/by-name/fz/fzf-git-sh/package.nix index a8710f8f34d0..813841875655 100644 --- a/pkgs/by-name/fz/fzf-git-sh/package.nix +++ b/pkgs/by-name/fz/fzf-git-sh/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "fzf-git-sh"; - version = "0-unstable-2026-03-19"; + version = "0-unstable-2026-07-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf-git.sh"; - rev = "0f0488331a060cf45aaecb6705a2cf394fb20293"; - hash = "sha256-fV4RtYL+ksbl5SMVZMoRyo6YUWP/KFvFPgfIbecIOO4="; + rev = "fdf632c53262dfcc44fc09d591e462e9f8fcae83"; + hash = "sha256-3ho7Kn84q36bj9N+Nj+5XEdkXIN4xwYk7h7g/ou3TRM="; }; dontBuild = true; diff --git a/pkgs/by-name/fz/fzf-make/package.nix b/pkgs/by-name/fz/fzf-make/package.nix index 0ef79c7935f7..2e483464beac 100644 --- a/pkgs/by-name/fz/fzf-make/package.nix +++ b/pkgs/by-name/fz/fzf-make/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "fzf-make"; - version = "0.69.0"; + version = "0.70.0"; src = fetchFromGitHub { owner = "kyu08"; repo = "fzf-make"; tag = "v${finalAttrs.version}"; - hash = "sha256-ezE7plWdPqfENprOWhl5YQnoXk9khXsDtsYf6Lifk3w="; + hash = "sha256-LRLwHCHsXW0SZ8X+7719vaCBQDx9fjiMvF2oma8u41w="; }; - cargoHash = "sha256-uF+oV0ZvGsRy20DkNrVowyb+RoYVtYN4R/gOZ6WzHQw="; + cargoHash = "sha256-bNp4P/Hag4br28rrfeNIUFQqKNKa/Gin79gQR6sg8W8="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/fz/fzf-preview/package.nix b/pkgs/by-name/fz/fzf-preview/package.nix index a055104b3779..fd874ef3e364 100644 --- a/pkgs/by-name/fz/fzf-preview/package.nix +++ b/pkgs/by-name/fz/fzf-preview/package.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { version = "0-unstable-2026-02-22"; src = fetchFromGitHub { - owner = "niksingh710"; + owner = "semi710"; repo = "fzf-preview"; rev = "5e5a5a5c4258fa86300cb56224e31416ff7401b5"; hash = "sha256-ZjBoTsZ2ymfhmUbMpMWT1MB20kLf0BILnCDu75F6WEQ="; @@ -79,10 +79,10 @@ stdenv.mkDerivation { be simple, fast, and highly compatible, making it a useful tool for anyone leveraging fzf for file navigation or search. ''; - homepage = "https://github.com/niksingh710/fzf-preview"; + homepage = "https://github.com/semi710/fzf-preview"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ - niksingh710 + semi710 ]; mainProgram = "fzf-preview"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix index 014ddae292ea..f955a1c27f89 100644 --- a/pkgs/by-name/fz/fzf-zsh-plugin/package.nix +++ b/pkgs/by-name/fz/fzf-zsh-plugin/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "fzf-zsh-plugin"; - version = "1.0.0-unstable-2026-05-06"; + version = "1.0.0-unstable-2026-07-09"; src = fetchFromGitHub { owner = "unixorn"; repo = "fzf-zsh-plugin"; - rev = "87d14584a9fe82e316173fdade8761dd53e45a62"; - hash = "sha256-ne/xNgKcESsZKIBk/5TqiDDcOWUR/512DezCNVnAWzw="; + rev = "92187cbc8fe91b7c5ab3a186e566682f64286879"; + hash = "sha256-JedEqrcaJmVL8PF850xP7csgvFzDpcCqW8lJ/5WHklY="; }; strictDeps = true; diff --git a/pkgs/by-name/fz/fzf/package.nix b/pkgs/by-name/fz/fzf/package.nix index c16b66f477a9..36c51ab58110 100644 --- a/pkgs/by-name/fz/fzf/package.nix +++ b/pkgs/by-name/fz/fzf/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { pname = "fzf"; - version = "0.73.1"; + version = "0.74.1"; __structuredAttrs = true; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { owner = "junegunn"; repo = "fzf"; tag = "v${finalAttrs.version}"; - hash = "sha256-xdhlbokeCzeBUP3YHA5u5tr3NTQz7n5TKPlJANp7yvM="; + hash = "sha256-Dmd/Vpw/W/pz9Hhkwb22zPQyHGLbs3cDjDHVM8ymkrc="; }; vendorHash = "sha256-MLuoKPEAqrpCbUphYOCpHdo8MdW5kvueeDU/3loK33Q="; diff --git a/pkgs/by-name/ga/galaxis/package.nix b/pkgs/by-name/ga/galaxis/package.nix index c25ae4dfc9cf..e404df1eaadb 100644 --- a/pkgs/by-name/ga/galaxis/package.nix +++ b/pkgs/by-name/ga/galaxis/package.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { game's simpler deductions. ''; homepage = "http://catb.org/~esr/galaxis/"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "galaxis"; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ga/galaxy-buds-client/deps.json b/pkgs/by-name/ga/galaxy-buds-client/deps.json index 98430195aa5b..98458540dc25 100644 --- a/pkgs/by-name/ga/galaxy-buds-client/deps.json +++ b/pkgs/by-name/ga/galaxy-buds-client/deps.json @@ -959,6 +959,11 @@ "version": "0.21.2", "hash": "sha256-gaK/5aAummyin6ptnhaJbnA0ih4+2xADrtrLfFbHwYI=" }, + { + "pname": "Tmds.DBus.Protocol", + "version": "0.21.3", + "hash": "sha256-HVEIHSeSe29ergHxsNvWYu3o7Ai8VZKo09yFn+miTnI=" + }, { "pname": "Xaml.Behaviors.Avalonia", "version": "11.3.9", diff --git a/pkgs/by-name/ga/galaxy-buds-client/package.nix b/pkgs/by-name/ga/galaxy-buds-client/package.nix index b95111ba1fa9..b1c06c92cd30 100644 --- a/pkgs/by-name/ga/galaxy-buds-client/package.nix +++ b/pkgs/by-name/ga/galaxy-buds-client/package.nix @@ -19,13 +19,13 @@ buildDotnetModule rec { pname = "galaxy-buds-client"; - version = "5.2.0"; + version = "5.2.1"; src = fetchFromGitHub { - owner = "ThePBone"; + owner = "timschneeb"; repo = "GalaxyBudsClient"; tag = version; - hash = "sha256-rFaI5coTGuWoxM3QZyCBJdvwvR6LeB2jjvcJ3xXw5X8="; + hash = "sha256-jPVrSkf6Bybwc5glkxId5VeWkwLBoTjOzM3CCgO6h9I="; }; projectFile = [ "GalaxyBudsClient/GalaxyBudsClient.csproj" ]; @@ -85,7 +85,7 @@ buildDotnetModule rec { meta = { description = "Unofficial Galaxy Buds Manager"; - homepage = "https://github.com/ThePBone/GalaxyBudsClient"; + homepage = "https://github.com/timschneeb/GalaxyBudsClient"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ icy-thought ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ga/gallery-dl/package.nix b/pkgs/by-name/ga/gallery-dl/package.nix index a7e3de1ed9e4..18adde6d3ff9 100644 --- a/pkgs/by-name/ga/gallery-dl/package.nix +++ b/pkgs/by-name/ga/gallery-dl/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gallery-dl"; - version = "1.32.1"; + version = "1.32.6"; pyproject = true; src = fetchFromCodeberg { owner = "mikf"; repo = "gallery-dl"; tag = "v${finalAttrs.version}"; - hash = "sha256-5GVwCVpoxpC32VHh1Ju50bhtvwTmZQnuqEIPFu99njQ="; + hash = "sha256-EWNKcFMrZG3WAcuKyVBk1u+4qn/a9gWt3QMc5Lu82es="; }; build-system = [ python3Packages.setuptools ]; @@ -47,15 +47,14 @@ python3Packages.buildPythonApplication (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/mikf/gallery-dl/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://codeberg.org/mikf/gallery-dl/src/tag/v${finalAttrs.version}/CHANGELOG.md"; description = "Command-line program to download image-galleries and -collections from several image hosting sites"; - homepage = "https://github.com/mikf/gallery-dl"; + homepage = "https://codeberg.org/mikf/gallery-dl"; license = lib.licenses.gpl2Only; mainProgram = "gallery-dl"; maintainers = with lib.maintainers; [ dawidsowa - FlameFlag - lucasew + _4evy ]; }; }) diff --git a/pkgs/by-name/ga/game-music-emu/package.nix b/pkgs/by-name/ga/game-music-emu/package.nix index 54eee2b237f9..f660fde43654 100644 --- a/pkgs/by-name/ga/game-music-emu/package.nix +++ b/pkgs/by-name/ga/game-music-emu/package.nix @@ -8,14 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.6.4"; + version = "0.6.5"; pname = "game-music-emu"; src = fetchFromGitHub { owner = "libgme"; repo = "game-music-emu"; tag = finalAttrs.version; - hash = "sha256-qGNWFFUUjv2R5e/nQrriAyDJCARISqNB8e5/1zEJ3fk="; + hash = "sha256-zn1t0oDj8hz/sfbG7lrstkv2Kf6cL7zAEMpIu9X4dyQ="; }; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/ga/game-rs/package.nix b/pkgs/by-name/ga/game-rs/package.nix index 7c0a7cfe0598..9cf7b03f00ed 100644 --- a/pkgs/by-name/ga/game-rs/package.nix +++ b/pkgs/by-name/ga/game-rs/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Minimal CLI game launcher for linux"; homepage = "https://github.com/amanse/game-rs"; changelog = "https://github.com/Amanse/game-rs/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ amanse ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ga/gamehub/package.nix b/pkgs/by-name/ga/gamehub/package.nix deleted file mode 100644 index c5f3ede58a80..000000000000 --- a/pkgs/by-name/ga/gamehub/package.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - meson, - ninja, - vala, - pkg-config, - desktop-file-utils, - glib, - gtk3, - glib-networking, - libgee, - libsoup_2_4, - json-glib, - sqlite, - # webkitgtk_4_0, - libmanette, - libxtst, - wrapGAppsHook3, -}: - -stdenv.mkDerivation rec { - pname = "GameHub"; - version = "0.16.3-2"; - - src = fetchFromGitHub { - owner = "tkashkin"; - repo = "GameHub"; - rev = "${version}-master"; - hash = "sha256-dBGzXwDO9BvnEIcdfqlGnMzUdBqaVA96Ds0fY6eukes="; - }; - - nativeBuildInputs = [ - desktop-file-utils - meson - ninja - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - glib - glib-networking - gtk3 - json-glib - libgee - libmanette - libsoup_2_4 - libxtst - sqlite - # webkitgtk_4_0 - ]; - - meta = { - # webkitgtk_4_0 was removed - broken = true; - homepage = "https://tkashkin.github.io/projects/gamehub"; - description = "Unified library for all your games"; - longDescription = '' - GameHub is a unified library for all your games. It allows you to store - your games from different platforms into one program to make it easier - for you to manage your games. - ''; - maintainers = with lib.maintainers; [ pasqui23 ]; - license = with lib.licenses; [ gpl3Only ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/ga/gamemac/package.nix b/pkgs/by-name/ga/gamemac/package.nix new file mode 100644 index 000000000000..4e0bd43b621a --- /dev/null +++ b/pkgs/by-name/ga/gamemac/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + makeWrapper, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gamemac"; + version = "0.8.328"; + + src = fetchurl { + name = "GameHub_en_${finalAttrs.version}.dmg"; + url = "https://gamehub-cdn.masnet.cn/uploads/upgrade/20260618/b616a96780c249a789d95f7b897333cb.dmg"; + hash = "sha256-uo/kr9PAFREfbkXX9hpJJNT6OZDv3jnOuZgc2fwtSyM="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + undmg + makeWrapper + ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + mv GameHub.app "$out/Applications/" + makeWrapper "$out/Applications/GameHub.app/Contents/MacOS/GameHub" "$out/bin/GameHub" + + runHook postInstall + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Play mobile games natively on macOS"; + homepage = "https://www.gamemac.com/en/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ damidoug ]; + mainProgram = "GameHub"; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ga/gamemac/update.sh b/pkgs/by-name/ga/gamemac/update.sh new file mode 100755 index 000000000000..e12550fcc7d6 --- /dev/null +++ b/pkgs/by-name/ga/gamemac/update.sh @@ -0,0 +1,32 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash curl gnused nix + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +ROLLING_URL="https://api-international-gamehub.xiaoji.com/game/download/mac/en" +UA="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/131.0.0.0 Safari/537.36" + +# Resolve rolling URL to stable CDN URL (strip query string) +DIRECT_URL=$(curl -fsSL -A "$UA" -w "%{url_effective}" -o /dev/null "$ROLLING_URL") +CDN_URL="${DIRECT_URL%%\?*}" + +# Extract version from CDN filename (e.g. .../GameHub_en_0.8.328.dmg) +VERSION=$(basename "$CDN_URL" | grep -oE '[0-9]+\.[0-9]+\.[0-9]+') + +CURRENT=$(grep 'version = ' package.nix | head -1 | grep -oE '"[0-9.]+"' | tr -d '"') +if [ "$VERSION" = "$CURRENT" ]; then + echo "Already at $VERSION" + exit 0 +fi + +HASH=$(nix-prefetch-url --name "GameHub_en_${VERSION}.dmg" --type sha256 "$CDN_URL") +SRI=$(nix-hash --to-sri --type sha256 "$HASH") + +sed -i \ + -e "s|version = \"[^\"]*\"|version = \"$VERSION\"|" \ + -e "s|https://gamehub-cdn\.masnet\.cn/uploads/upgrade/[^\"]*|$CDN_URL|" \ + -e "s|hash = \"sha256-[^\"]*\"|hash = \"$SRI\"|" \ + package.nix + +echo "Updated $CURRENT -> $VERSION" diff --git a/pkgs/by-name/ga/gamma-launcher/package.nix b/pkgs/by-name/ga/gamma-launcher/package.nix index 0f13de6e90f3..c0a29cdfd513 100644 --- a/pkgs/by-name/ga/gamma-launcher/package.nix +++ b/pkgs/by-name/ga/gamma-launcher/package.nix @@ -17,14 +17,14 @@ let in python3Packages.buildPythonApplication rec { pname = "gamma-launcher"; - version = "3.0"; + version = "3.1"; pyproject = true; src = fetchFromGitHub { owner = "Mord3rca"; repo = "gamma-launcher"; tag = "v${version}"; - hash = "sha256-bvlNmpl2L9MAhZMyHwosXrypH1CQrSI1RQwo+sXO7/w="; + hash = "sha256-FLxJfP1fl3efRk9iAIAsMUrjQcUNa04GjiAKrYequF8="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ga/garage-webui/package.nix b/pkgs/by-name/ga/garage-webui/package.nix deleted file mode 100644 index a0d4b336b0ec..000000000000 --- a/pkgs/by-name/ga/garage-webui/package.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - buildGoModule, - nodejs, - pnpm_9, - fetchPnpmDeps, - pnpmConfigHook, - nix-update-script, -}: -buildGoModule (finalAttrs: { - pname = "garage-webui"; - version = "1.1.0"; - - src = fetchFromGitHub { - owner = "khairul169"; - repo = "garage-webui"; - tag = finalAttrs.version; - hash = "sha256-bqUAhZBSQkWZ1QsgPslEUDwt8NOg25Os0NGlPoyjPL4="; - }; - - frontend = stdenv.mkDerivation (finalAttrs': { - pname = "${finalAttrs.pname}-frontend"; - inherit (finalAttrs) version src; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm_9 - ]; - - pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs') pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-z/Y9q/SE2c/KYzIOAfATlprjr6NjmmUHQB+ZbO39OK4="; - }; - - buildPhase = '' - runHook preBuild - pnpm run build - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - cp -r dist $out/ - runHook postInstall - ''; - }); - - preBuild = '' - cp -r ${finalAttrs.frontend} ./ui/dist - ''; - - modRoot = "./backend"; - tags = [ "prod" ]; - env.CGO_ENABLED = 0; - vendorHash = "sha256-7z6r6w/SbBlYYHMxm11xFl/QEYZc2KebnOJZRgYRUYk="; - - passthru = { - updateScript = nix-update-script { }; - }; - - meta = { - description = "Simple admin web UI for Garage"; - homepage = "https://github.com/khairul169/garage-webui"; - changelog = "https://github.com/khairul169/garage-webui/releases/tag/${finalAttrs.version}"; - mainProgram = "garage-webui"; - license = lib.licenses.mit; - platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ griffi-gh ]; - }; -}) diff --git a/pkgs/by-name/ga/gardendevd/package.nix b/pkgs/by-name/ga/gardendevd/package.nix new file mode 100644 index 000000000000..adf591b109f6 --- /dev/null +++ b/pkgs/by-name/ga/gardendevd/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchFromCodeberg, + nix-update-script, + acl, + elogind, + meson, + ninja, + pkg-config, + util-linux, + kmod, + uaccessSupport ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gardendevd"; + version = "0.2"; + + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "Gardenhouse"; + repo = "gardendevd"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aEG2QIRFH3F5tXBD1U+6SNmOpUMHgdhH7AXwyGGrilI="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = lib.optionals uaccessSupport [ + acl + elogind + ]; + + mesonFlags = [ + "-Dopenrc=disabled" + (lib.mesonEnable "uaccess" uaccessSupport) + ]; + + postPatch = '' + substituteInPlace src/rules-builtin.c \ + --replace-fail "/sbin/blkid" "${util-linux}/bin/blkid" \ + --replace-fail "/sbin/modprobe" "${kmod}/bin/modprobe" + substituteInPlace src/rules-parse.c \ + --replace-fail "/usr/lib/udev/rules.d" "$out/lib/udev/rules.d" + substituteInPlace src/spawn.c \ + --replace-fail "/usr/lib/udev/" "$out/lib/udev/" + + patchShebangs scripts/ + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://codeberg.org/Gardenhouse/gardendevd"; + description = "Udev daemon running on top of mdevd to replace systemd-udev"; + longDescription = '' + Gardendevd is a udev-compatible daemon that processes device + events from the Linux kernel. It is designed to be a lightweight + and flexible alternative to systemd-udevd, leveraging mdevd for + device node creation and firmware loading. + ''; + maintainers = with lib.maintainers; [ + aanderse + choco98 + ]; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ga/gatus/package.nix b/pkgs/by-name/ga/gatus/package.nix index df40c24b23c7..dca8d87a73bf 100644 --- a/pkgs/by-name/ga/gatus/package.nix +++ b/pkgs/by-name/ga/gatus/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gatus"; - version = "5.35.0"; + version = "5.36.0"; src = fetchFromGitHub { owner = "TwiN"; repo = "gatus"; rev = "v${finalAttrs.version}"; - hash = "sha256-I1HjeJ4/yLLgcoIEOQCv3WQDNrpIAFhzDvVpz24T7gU="; + hash = "sha256-YduXhHra6w7zo1f+brCjiusH7xCSdAzo5uF6aN5uv/A="; }; - vendorHash = "sha256-PBy/0My0TdlolpagDSdt7r2dPPLJOVHEsU1xaV8RFjg="; + vendorHash = "sha256-RbFNtojZthf7bKMhGStH/jOkeIR6EHpw2vvAMLEFtKI="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ga/gauge-unwrapped/package.nix b/pkgs/by-name/ga/gauge-unwrapped/package.nix index 1991fadd7378..b8b146f266d2 100644 --- a/pkgs/by-name/ga/gauge-unwrapped/package.nix +++ b/pkgs/by-name/ga/gauge-unwrapped/package.nix @@ -6,7 +6,7 @@ buildGoModule (finalAttrs: { pname = "gauge"; - version = "1.6.31"; + version = "1.6.32"; patches = [ # adds a check which adds an error message when trying to @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "getgauge"; repo = "gauge"; tag = "v${finalAttrs.version}"; - hash = "sha256-rvhWZgw0lq/YF8Js4UsIqiVOWe5/56bOaCq87+gdmPA="; + hash = "sha256-j8nT39mwRvccZQyrhviQxPbM3Cd7F2x4X24OYFq3LYQ="; }; - vendorHash = "sha256-FdTauyiGjmNRJNsVG4tS8PesC8J24NqQ4rmW3EgCoQk="; + vendorHash = "sha256-OmGKpgsouK5W/DWFi8vNT/0HSX5HqaAzNdN8eEAhNhk="; excludedPackages = [ "build" diff --git a/pkgs/by-name/ga/gauge/plugins/go/data.json b/pkgs/by-name/ga/gauge/plugins/go/data.json index b4c9904bbea4..6a423125a65c 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/data.json +++ b/pkgs/by-name/ga/gauge/plugins/go/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.arm64.zip", "hash": "sha256-tMo3+gQPnldCARm0WB7UYSMwaVpz90N2BiTzmvIFTg0=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-darwin.x86_64.zip", - "hash": "sha256-zfrEDRyflvvp4Hf2+42RL+5ooY0iBU0bkO2caOAGp74=" - }, "x86_64-linux": { "url": "https://github.com/getgauge-contrib/gauge-go/releases/download/v0.4.0/gauge-go-0.4.0-linux.x86_64.zip", "hash": "sha256-JEHjk51vYCFAcj9xant2vBU3BZI0krYbfZk9ALjdIs0=" diff --git a/pkgs/by-name/ga/gauge/plugins/go/default.nix b/pkgs/by-name/ga/gauge/plugins/go/default.nix index 09b89bb82f7d..a766b71a0117 100644 --- a/pkgs/by-name/ga/gauge/plugins/go/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/go/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/data.json b/pkgs/by-name/ga/gauge/plugins/html-report/data.json index c307371ca4fd..8e797b972857 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/html-report/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.arm64.zip", "hash": "sha256-30RW9I9QTGncnwNTj0/rLlVCQ1wo8oJ2Q0gchHk+ioM=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-darwin.x86_64.zip", - "hash": "sha256-6dC1gObS4msHr+KyKZufDpDQ9MgAIfqUPSIW7jWewtU=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/html-report/releases/download/v4.3.2/html-report-4.3.2-linux.arm64.zip", "hash": "sha256-sayeQCuoJbeDWK7s/86ApMhzxHhxsyBB4D9QCMxJ/p8=" diff --git a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix index 4d07f023de9b..c41c1add4ba2 100644 --- a/pkgs/by-name/ga/gauge/plugins/html-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/html-report/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/java/data.json b/pkgs/by-name/ga/gauge/plugins/java/data.json index 1c0861f5cdb6..ef7944717914 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/data.json +++ b/pkgs/by-name/ga/gauge/plugins/java/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.arm64.zip", "hash": "sha256-vN0FqYT/73+OPGIYEsPwB+eSQ6n5SrFwlHfFybBDpEo=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-darwin.x86_64.zip", - "hash": "sha256-loKFJzvFshMY206t1z01d4q5jTxKtB0o7nmN4qFWDDQ=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-java/releases/download/v0.12.0/gauge-java-0.12.0-linux.arm64.zip", "hash": "sha256-z6nclV/gUDR/jTA4DKaP1HVwuM3U3IVljbYzrlGF15A=" diff --git a/pkgs/by-name/ga/gauge/plugins/java/default.nix b/pkgs/by-name/ga/gauge/plugins/java/default.nix index 95843d20f914..662d80a47c24 100644 --- a/pkgs/by-name/ga/gauge/plugins/java/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/java/default.nix @@ -22,7 +22,6 @@ makeGaugePlugin { ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/js/default.nix b/pkgs/by-name/ga/gauge/plugins/js/default.nix index 7af057045b3e..d65139b31323 100644 --- a/pkgs/by-name/ga/gauge/plugins/js/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/js/default.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "gauge-plugin-js"; - version = "5.0.5"; + version = "5.0.6"; src = fetchFromGitHub { owner = "getgauge"; repo = "gauge-js"; rev = "v${version}"; - hash = "sha256-qWnBx6bvut/bSvFC8WPAetyAsF16Wz99Pq0tGg+YpZw="; + hash = "sha256-/hfsBoZ37A4W3uejmOnl6nZv0oCedkQFMNidqWb9DN8="; fetchSubmodules = true; }; - npmDepsHash = "sha256-HD1JsAewyzoUPKFwtpGGwjHWmYUpLSN3Spb5FW+3d10="; + npmDepsHash = "sha256-2kZDpRUegHqZOEc49h3+RRAbKroW7v63bXjzDAu/bCc="; npmBuildScript = "package"; buildInputs = [ nodejs ]; diff --git a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix index 36025ca24492..e720d8694304 100644 --- a/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix +++ b/pkgs/by-name/ga/gauge/plugins/make-gauge-plugin.nix @@ -37,7 +37,6 @@ let ; # Upstream uses a different naming scheme for platforms systemMap = { - "x86_64-darwin" = "darwin.x86_64"; "aarch64-darwin" = "darwin.arm64"; "aarch64-linux" = "linux.arm64"; "x86_64-linux" = "linux.x86_64"; diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/data.json b/pkgs/by-name/ga/gauge/plugins/ruby/data.json index 3fb1653b0465..219525a8b9ff 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/data.json +++ b/pkgs/by-name/ga/gauge/plugins/ruby/data.json @@ -4,10 +4,6 @@ "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.arm64.zip", "hash": "sha256-s0/hTqVP4Pa1yk474TYUF1dbXy+NbrtJjwBxRXShXqQ=" }, - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-darwin.x86_64.zip", - "hash": "sha256-NNPIR6ZueZ3coavMM9AeqC+O/I/xcfnEo8KTiQivvQs=" - }, "aarch64-linux": { "url": "https://github.com/getgauge/gauge-ruby/releases/download/v0.9.3/gauge-ruby-0.9.3-linux.arm64.zip", "hash": "sha256-vd3KZ1Lc2F81xknc6+tPNxLjZWD8oCMBsCAuw2iJURw=" diff --git a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix index 3754cd9f617a..17d1976f0de1 100644 --- a/pkgs/by-name/ga/gauge/plugins/ruby/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/ruby/default.nix @@ -17,7 +17,6 @@ makeGaugePlugin { sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "aarch64-linux" "x86_64-linux" ]; diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json index dd06efc09a7a..f0a50c659b92 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/data.json +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/data.json @@ -1,9 +1,5 @@ { "version": "0.3.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.x86_64.zip", - "hash": "sha256-0qOdBQv6TCiwHizvbb47Sj0aUcMtID4qQ3v5D3XGkXg=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/gauge_screenshot/releases/download/v0.3.2/screenshot-0.3.2-darwin.arm64.zip", "hash": "sha256-hsFevOBgKbUIMpNcEyv/2A/agIuInIjLTdhmg0C54pQ=" diff --git a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix index b769266051a3..c6572efbc623 100644 --- a/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/screenshot/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json index d3b3daf86634..10db9f0700d3 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/data.json +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/data.json @@ -1,9 +1,5 @@ { "version": "0.5.2", - "x86_64-darwin": { - "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.x86_64.zip", - "hash": "sha256-YVH9Eh9EVDdJp8F/PXMz4egVpo8ULJmvWjWHH4iH2iI=" - }, "aarch64-darwin": { "url": "https://github.com/getgauge/xml-report/releases/download/v0.5.2/xml-report-0.5.2-darwin.arm64.zip", "hash": "sha256-UW3Axcti8r9dEfiupj2r+mcLGpFBwYQf/7mDNyynReE=" diff --git a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix index 4335ff94fc35..6ebfc058ee1f 100644 --- a/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix +++ b/pkgs/by-name/ga/gauge/plugins/xml-report/default.nix @@ -16,7 +16,6 @@ makeGaugePlugin { maintainers = [ ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "x86_64-linux" diff --git a/pkgs/by-name/gb/gb-backup/package.nix b/pkgs/by-name/gb/gb-backup/package.nix index d543c8e68fec..95229a822702 100644 --- a/pkgs/by-name/gb/gb-backup/package.nix +++ b/pkgs/by-name/gb/gb-backup/package.nix @@ -1,36 +1,34 @@ { lib, - makeWrapper, buildGoModule, fetchFromGitHub, - lepton, + nix-update-script, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "gb-backup"; - version = "unstable-2021-10-27"; + version = "0-unstable-2026-06-05"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "leijurv"; repo = "gb"; - rev = "61383d445af7b035fb8e1df0cacc424340dd16df"; - sha256 = "sha256-YRrD2gW+gzxD2JwadCbF/SBSsHeeGPsa8kKZHHAytVo="; + rev = "d388723a2cbed495bcf1793aa0958a9ba4f3d6b9"; + hash = "sha256-um2wMfHdEL3GkILtM7R/bNW17pknq0M/CCfHPlu6/58="; }; - vendorHash = "sha256-H3Zf4VNJVX9C3GTeqU4YhNqCIQz1R55MfhrygDgJTxc="; + vendorHash = "sha256-fjOIp2LUBaAPAPMxU2T+qbIQZgmVa0vNPYzW2hOsBr8="; - nativeBuildInputs = [ makeWrapper ]; - - nativeCheckInputs = [ lepton ]; - - postFixup = '' - wrapProgram $out/bin/gb --prefix PATH : ${lib.makeBinPath [ lepton ]} - ''; + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; meta = { description = "Gamer Backup, a super opinionated cloud backup system"; homepage = "https://github.com/leijurv/gb"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ babbaj ]; + mainProgram = "gb"; }; -} +}) diff --git a/pkgs/by-name/gb/gbdfed/Makefile.patch b/pkgs/by-name/gb/gbdfed/Makefile.patch deleted file mode 100644 index 9c437deca07c..000000000000 --- a/pkgs/by-name/gb/gbdfed/Makefile.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git "a/Makefile.in" "b/Makefile.in" -index b482958..472b8da 100644 ---- "a/Makefile.in" -+++ "b/Makefile.in" -@@ -27,9 +27,7 @@ MKINSTALLDIRS = ./mkinstalldirs - CC = @CC@ - CFLAGS = @XX_CFLAGS@ @CFLAGS@ - --DEFINES = @DEFINES@ -DG_DISABLE_DEPRECATED \ -- -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED \ -- -DGTK_DISABLE_DEPRECATED -+DEFINES = @DEFINES@ - - SRCS = bdf.c \ - bdfcons.c \ diff --git a/pkgs/by-name/gb/gbdfed/package.nix b/pkgs/by-name/gb/gbdfed/package.nix deleted file mode 100644 index ef988794e367..000000000000 --- a/pkgs/by-name/gb/gbdfed/package.nix +++ /dev/null @@ -1,49 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - freetype, - gtk2-x11, -}: - -stdenv.mkDerivation (finalAttrs: { - version = "1.6"; - pname = "gbdfed"; - - src = fetchurl { - url = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/gbdfed-${finalAttrs.version}.tar.bz2"; - sha256 = "0g09k6wim58hngxncq2brr7mwjm92j3famp0vs4b3p48wr65vcjx"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - freetype - gtk2-x11 - ]; - - patches = [ ./Makefile.patch ]; - - hardeningDisable = [ "format" ]; - - postPatch = '' - # gcc15 - substituteInPlace bdfgrab.c --replace-fail 'int (*old_error_handler)();' 'XErrorHandler old_error_handler;' - substituteInPlace hbf.c --replace-fail 'typedef int bool;' '// typedef int bool;' - ''; - - meta = { - description = "Bitmap Font Editor"; - longDescription = '' - gbdfed lets you interactively create new bitmap font files or modify existing ones. - It allows editing multiple fonts and multiple glyphs, - it allows cut and paste operations between fonts and glyphs and editing font properties. - The editor works natively with BDF fonts. - ''; - homepage = "http://sofia.nmsu.edu/~mleisher/Software/gbdfed/"; - license = lib.licenses.mit; - maintainers = [ ]; - platforms = lib.platforms.all; - mainProgram = "gbdfed"; - }; -}) diff --git a/pkgs/by-name/gb/gbenchmark/package.nix b/pkgs/by-name/gb/gbenchmark/package.nix index 6cc1617193ee..a35f4781dba1 100644 --- a/pkgs/by-name/gb/gbenchmark/package.nix +++ b/pkgs/by-name/gb/gbenchmark/package.nix @@ -2,23 +2,33 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, cmake, ninja, gtest, + glibcLocales, prometheus-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "gbenchmark"; - version = "1.9.4"; + version = "1.9.5"; src = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "v${finalAttrs.version}"; - hash = "sha256-P7wJcKkIBoWtN9FCRticpBzYbEZPq71a0iW/2oDTZRU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Mm4pG7zMB00iof32CxreoNBFnduPZTMp3reHMCIAFPQ="; }; + patches = [ + (fetchpatch { + name = "portability.patch"; + url = "https://github.com/google/benchmark/commit/b5ba9bab85d80f29a161dd634b7d234cf3722f90.patch"; + hash = "sha256-/X01AWXK0eJ59F8oSREZ7V5Cpw1y35n9uFB1mCvMOus="; + }) + ]; + nativeBuildInputs = [ cmake ninja @@ -26,20 +36,32 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtest ]; + nativeCheckInputs = lib.optionals (glibcLocales != null) [ glibcLocales ]; + cmakeFlags = [ (lib.cmakeBool "BENCHMARK_USE_BUNDLED_GTEST" false) (lib.cmakeBool "BENCHMARK_ENABLE_WERROR" false) ]; - # We ran into issues with gtest 1.8.5 conditioning on - # `#if __has_cpp_attribute(maybe_unused)`, which was, for some - # reason, going through even when C++14 was being used and - # breaking the build on Darwin by triggering errors about using - # C++17 features. - # - # This might be a problem with our Clang, as it does not reproduce - # with Xcode, but we just work around it by silencing the warning. - env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++17-attribute-extensions"; + env = { + # We ran into issues with gtest 1.8.5 conditioning on + # `#if __has_cpp_attribute(maybe_unused)`, which was, for some + # reason, going through even when C++14 was being used and + # breaking the build on Darwin by triggering errors about using + # C++17 features. + # + # This might be a problem with our Clang, as it does not reproduce + # with Xcode, but we just work around it by silencing the warning. + NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isClang "-Wno-c++17-attribute-extensions"; + } + // lib.optionalAttrs stdenv.hostPlatform.isGnu { + # For test:locale_impermeability_test + LANG = "en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; + } + // lib.optionalAttrs (glibcLocales != null) { + LOCALE_ARCHIVE = "${glibcLocales}/lib/locale/locale-archive"; + }; # Tests fail on 32-bit due to not enough precision doCheck = stdenv.hostPlatform.is64bit; @@ -53,6 +75,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/google/benchmark"; license = lib.licenses.asl20; platforms = lib.platforms.linux ++ lib.platforms.darwin ++ lib.platforms.freebsd; - maintainers = [ ]; + maintainers = with lib.maintainers; [ miniharinn ]; }; }) diff --git a/pkgs/by-name/gc/gcan/package.nix b/pkgs/by-name/gc/gcan/package.nix new file mode 100644 index 000000000000..ac9013c3d4b2 --- /dev/null +++ b/pkgs/by-name/gc/gcan/package.nix @@ -0,0 +1,34 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gcan"; + version = "1.1.1"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "applicative-systems"; + repo = "gcan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BZfdc3ddAa9CPC3GOH9G3QJbECbSRY7ymzIMtYl076M="; + }; + + cargoHash = "sha256-5oE69FYTAV6JiTAN4A79+ndI0vHrbAi1JeEJcD+eY2c="; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + description = "Analyze, filter, and prune Nix GC roots"; + homepage = "https://github.com/applicative-systems/gcan"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.tfc ]; + mainProgram = "gcan"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix index 7ca004b43a97..d598c14c8ce1 100644 --- a/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix +++ b/pkgs/by-name/gc/gcc-arm-embedded-13/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "darwin-arm64"; aarch64-linux = "aarch64"; - x86_64-darwin = "darwin-x86_64"; x86_64-linux = "x86_64"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -30,7 +29,6 @@ stdenv.mkDerivation rec { { aarch64-darwin = "fb6921db95d345dc7e5e487dd43b745e3a5b4d5c0c7ca4f707347148760317b4"; aarch64-linux = "c8824bffd057afce2259f7618254e840715f33523a3d4e4294f471208f976764"; - x86_64-darwin = "1ab00742d1ed0926e6f227df39d767f8efab46f5250505c29cb81f548222d794"; x86_64-linux = "95c011cee430e64dd6087c75c800f04b9c49832cc1000127a92a97f9c8d83af4"; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); @@ -104,7 +102,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/gc/gcdemu/package.nix b/pkgs/by-name/gc/gcdemu/package.nix index 3cd67894358e..86632141ea17 100644 --- a/pkgs/by-name/gc/gcdemu/package.nix +++ b/pkgs/by-name/gc/gcdemu/package.nix @@ -16,11 +16,11 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gcdemu"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/cdemu/gcdemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-C9d4Rv47kQhs2kbTCwAUcdm+dcljA8IVkwhLJHJpUS0="; + hash = "sha256-zBRZxbT+J85pMTYaTRxrV3ua61m6KYU6aStpeghYdvY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gc/gcli/package.nix b/pkgs/by-name/gc/gcli/package.nix index 3dfaee7f72d9..4d731e7c8884 100644 --- a/pkgs/by-name/gc/gcli/package.nix +++ b/pkgs/by-name/gc/gcli/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { description = "Portable Git(Hub|Lab|ea) CLI tool"; homepage = "https://herrhotzenplotz.de/gcli/"; - changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/${version}"; + changelog = "https://github.com/herrhotzenplotz/gcli/releases/tag/v${version}"; license = lib.licenses.bsd2; mainProgram = "gcli"; maintainers = with lib.maintainers; [ kenran ]; diff --git a/pkgs/by-name/gc/gclient2nix/gclient2nix.py b/pkgs/by-name/gc/gclient2nix/gclient2nix.py index b26ef247d2e4..214b0da47f67 100755 --- a/pkgs/by-name/gc/gclient2nix/gclient2nix.py +++ b/pkgs/by-name/gc/gclient2nix/gclient2nix.py @@ -60,7 +60,14 @@ class Repo: ) deps_file = self.get_file("DEPS") - evaluated = gclient_eval.Parse(deps_file, vars_override=repo_vars, filename="DEPS") + evaluated = gclient_eval.Parse( + deps_file, + filename="DEPS", + vars_override=repo_vars, + # KeyError: "host_cpu was used as a variable, but was not declared in the vars dict (file 'DEPS', line 114)" + # https://chromium.googlesource.com/webpagereplay.git/+/b2b856131e36c99e9de9c419fe8ca02f857082ba/DEPS#114 + builtin_vars= {"host_cpu": "*host_cpu_placeholder*"} if path == "src/third_party/webpagereplay" else None, + ) repo_vars = dict(evaluated.get("vars", {})) | repo_vars diff --git a/pkgs/by-name/gc/gclient2nix/package.nix b/pkgs/by-name/gc/gclient2nix/package.nix index bdf8cdc327f3..32ce999f8f55 100644 --- a/pkgs/by-name/gc/gclient2nix/package.nix +++ b/pkgs/by-name/gc/gclient2nix/package.nix @@ -69,8 +69,8 @@ runCommand "gclient2nix" # substitutions depot_tools_checkout = fetchgit { url = "https://chromium.googlesource.com/chromium/tools/depot_tools"; - rev = "977d597d75def6781f890cdce459969a9568ea07"; - hash = "sha256-OCIay+a+DHvKKIbDMSjTf6CbHHVfp8k0n1AO3E4yx1U="; + rev = "1b1b01fa912786b88a79f3504176a275183839b5"; + hash = "sha256-SRPeosetXYUklafhcuqsJiIKfItUJACG70m4Z5pBQiU="; }; passthru = { diff --git a/pkgs/by-name/gc/gcsfuse/package.nix b/pkgs/by-name/gc/gcsfuse/package.nix index 3827a251350b..b32232d2ac71 100644 --- a/pkgs/by-name/gc/gcsfuse/package.nix +++ b/pkgs/by-name/gc/gcsfuse/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gcsfuse"; - version = "3.9.0"; + version = "3.11.0"; src = fetchFromGitHub { owner = "googlecloudplatform"; repo = "gcsfuse"; rev = "v${finalAttrs.version}"; - hash = "sha256-jVuO73U9KKop9wpO/uLz1ergo3FygCeFHaQbNS46gF0="; + hash = "sha256-T+HzH8hdtCzYiXz6eA1IbGNZwAqvE2fLQkAqatV6nzY="; }; - vendorHash = "sha256-Hsx4FJ1DHnS8Nv8eNjbmLTTFlfuRNFP/7V63JefuKR0="; + vendorHash = "sha256-olkKP8z6E+wYm8f5LMEZqWy/RDFlRJtts/zpJwJDoPc="; subPackages = [ "." diff --git a/pkgs/by-name/gc/gcstar/package.nix b/pkgs/by-name/gc/gcstar/package.nix index 0f282e663f7e..3388908e8d99 100644 --- a/pkgs/by-name/gc/gcstar/package.nix +++ b/pkgs/by-name/gc/gcstar/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gcstar"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitLab { owner = "Kerenoc"; repo = "GCstar"; rev = "v${finalAttrs.version}"; - hash = "sha256-37yjKI4l/nUzDnra1AGxDQxNafMsLi1bSifG6pz33zg="; + hash = "sha256-cVDOu1BH3WEHhaHa5d8usTrc5M8ZKaKCLNzsSIC+HsU="; }; nativeBuildInputs = [ wrapGAppsHook3 ]; @@ -34,6 +34,7 @@ stdenv.mkDerivation (finalAttrs: { JSON ImageExifTool librelative + LocaleCodes LWP LWPProtocolHttps MP3Info @@ -45,6 +46,9 @@ stdenv.mkDerivation (finalAttrs: { XMLParser ]; + # DateTime::Format::Strptime requires lang locale to be defined for correct date formatting. + env.LANG = "C.UTF-8"; + installPhase = '' runHook preInstall diff --git a/pkgs/by-name/gc/gcx/package.nix b/pkgs/by-name/gc/gcx/package.nix index a5bcefec7be5..644851da09d0 100644 --- a/pkgs/by-name/gc/gcx/package.nix +++ b/pkgs/by-name/gc/gcx/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "gcx"; - version = "0.4.0"; + version = "0.4.4"; src = fetchFromGitHub { owner = "grafana"; repo = "gcx"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ZKlNLtP3dwPAIXGnupIk0wuXs+qMy2d2OreKfKJlxM="; + hash = "sha256-yPxSRg9PLfHwfv4bCTaxgvRD6UHD4A5qh68c2Dxcpn0="; }; - vendorHash = "sha256-FzhQfooCApBsnNH/cZYFfy3m4cDSBVX9ueaWfhTgx1k="; + vendorHash = "sha256-PevzovryzpNap8dzruYWdk07M5g9jlA8QPQcrXnO7xk="; subPackages = [ "cmd/gcx" ]; diff --git a/pkgs/by-name/gd/gdal/package.nix b/pkgs/by-name/gd/gdal/package.nix index b8800268e3b7..d74d70ffe917 100644 --- a/pkgs/by-name/gd/gdal/package.nix +++ b/pkgs/by-name/gd/gdal/package.nix @@ -79,17 +79,17 @@ xz, zlib, zstd, + buildPackages, }: - stdenv.mkDerivation (finalAttrs: { pname = "gdal" + lib.optionalString useMinimalFeatures "-minimal"; - version = "3.12.4"; + version = "3.13.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; tag = "v${finalAttrs.version}"; - hash = "sha256-sD/ZAOvMWK2+AGw6wgziDsheH+hwUwhd7i2f65cjFKg="; + hash = "sha256-IsSENjOJpCMnGR1O8/gV6X7GTNIK/c+JIYBrkxDgj/A="; }; nativeBuildInputs = [ @@ -132,6 +132,9 @@ stdenv.mkDerivation (finalAttrs: { # This is not strictly needed as the Java bindings wouldn't build anyway if # ant/jdk were not available. "-DBUILD_JAVA_BINDINGS=OFF" + ] + ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + "-DCMAKE_CROSSCOMPILING_EMULATOR=${stdenv.hostPlatform.emulator buildPackages}" ]; buildInputs = @@ -257,8 +260,10 @@ stdenv.mkDerivation (finalAttrs: { ]; disabledTestPaths = [ # tests that attempt to make network requests + "gcore/basic_test.py::test_hint_http" "gcore/vsis3.py" "gdrivers/gdalhttp.py" + "gdrivers/hdf5multidim.py::test_hdf5_multimdim_eos_grid_dimension_list" "gdrivers/wms.py" ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -307,6 +312,11 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals (!usePoppler) [ "test_pdf_jpx_compression" + ] + ++ lib.optionals (!useNetCDF) [ + # writes the Zarr tile-presence cache (.gmac) via the netCDF driver, which + # is absent in the minimal build + "test_zarr_read_simple_sharding" ]; postCheck = '' popd # autotest diff --git a/pkgs/by-name/gd/gdash/package.nix b/pkgs/by-name/gd/gdash/package.nix index d844cbb45fbe..d2498412156d 100644 --- a/pkgs/by-name/gd/gdash/package.nix +++ b/pkgs/by-name/gd/gdash/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { SDL2_image ]; - env.NIX_CFLAGS_COMPILE = " -I${SDL2_image}/include/SDL2"; + env.NIX_CFLAGS_COMPILE = " -I${lib.getInclude SDL2_image}/include/SDL2"; doCheck = true; diff --git a/pkgs/by-name/gd/gdb-dashboard/package.nix b/pkgs/by-name/gd/gdb-dashboard/package.nix index badac418d66a..84a3b8f2b467 100644 --- a/pkgs/by-name/gd/gdb-dashboard/package.nix +++ b/pkgs/by-name/gd/gdb-dashboard/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gdb-dashboard"; - version = "0.17.4"; + version = "0.17.5"; src = fetchFromGitHub { owner = "cyrus-and"; repo = "gdb-dashboard"; tag = "v${finalAttrs.version}"; - hash = "sha256-xoBkAFwkbaAsvgPwGwe1JxE1C8gPR6GP1iXeNKK5Z70="; + hash = "sha256-q1oh/i7BWhycTK+2dZDDOTGHzMZuBKb9qrawmuyW2CU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gd/gdb/package.nix b/pkgs/by-name/gd/gdb/package.nix index 95769211d8c2..b7aef9c38772 100644 --- a/pkgs/by-name/gd/gdb/package.nix +++ b/pkgs/by-name/gd/gdb/package.nix @@ -5,7 +5,6 @@ # Build time fetchurl, - fetchpatch, pkg-config, perl, texinfo, @@ -68,11 +67,11 @@ in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "17.1"; + version = "17.2"; src = fetchurl { url = "mirror://gnu/gdb/gdb-${finalAttrs.version}.tar.xz"; - hash = "sha256-FJlvX3TJ9o9aVD/cRbyngAIH+R+SrupsLnkYIsfG2HY="; + hash = "sha256-HANsDXLks9H7XJTIhjKt1vnXb018TS6nk8EqnxmjIow="; }; postPatch = @@ -90,17 +89,6 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./debug-info-from-env.patch - - (fetchurl { - name = "musl.patch"; - url = "https://inbox.sourceware.org/gdb-patches/20260324164527.1446549-2-sunilkumar.dora@windriver.com/raw"; - hash = "sha256-FC4DDVS4wtE/HXtbUqvkxu9+e7nE3DYi1zIuQP9yQO8="; - }) - (fetchpatch { - name = "musl-aarch64.patch"; - url = "https://sourceware.org/git/?p=binutils-gdb.git;a=patch;h=1ccc3f6a2e28fa1f3357826374cba165b3ba3ff7"; - hash = "sha256-Q2oTo2b+9yNN3PSsxqgxV4/9/05uFE/JMLe1CPs9Y7I="; - }) ] ++ optionals stdenv.hostPlatform.isDarwin [ ./darwin-target-match.patch diff --git a/pkgs/development/tools/misc/gdbgui/default.nix b/pkgs/by-name/gd/gdbgui/package.nix similarity index 74% rename from pkgs/development/tools/misc/gdbgui/default.nix rename to pkgs/by-name/gd/gdbgui/package.nix index a64c37640a15..ae7e1b01cbe6 100644 --- a/pkgs/development/tools/misc/gdbgui/default.nix +++ b/pkgs/by-name/gd/gdbgui/package.nix @@ -5,15 +5,29 @@ gdb, }: -python3Packages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "gdbgui"; - version = "0.15.3.0"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; + + src = fetchPypi { + inherit (finalAttrs) pname version; + hash = "sha256-/HyFE0JnoN03CDyCQCo/Y9RyH4YOMoeB7khReIb8t7Y="; + }; + + postPatch = '' + echo ${finalAttrs.version} > gdbgui/VERSION.txt + # relax version requirements + sed -i 's/==.*$//' requirements.txt + ''; + + build-system = with python3Packages; [ setuptools ]; buildInputs = [ gdb ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ eventlet flask-compress flask-socketio @@ -21,17 +35,6 @@ python3Packages.buildPythonApplication rec { pygments ]; - src = fetchPypi { - inherit pname version; - hash = "sha256-/HyFE0JnoN03CDyCQCo/Y9RyH4YOMoeB7khReIb8t7Y="; - }; - - postPatch = '' - echo ${version} > gdbgui/VERSION.txt - # relax version requirements - sed -i 's/==.*$//' requirements.txt - ''; - postInstall = '' wrapProgram $out/bin/gdbgui \ --prefix PATH : ${lib.makeBinPath [ gdb ]} @@ -51,4 +54,4 @@ python3Packages.buildPythonApplication rec { dump_stack ]; }; -} +}) diff --git a/pkgs/by-name/gd/gdevelop/darwin.nix b/pkgs/by-name/gd/gdevelop/darwin.nix index 4b18cf7f7a38..e6ec9675ed0e 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-B/QyB6ZdyjIBBOOZG1nnVcXyqbPGyf56AndELzi3IZY="; + hash = "sha256-6nM9dJ6eoQ4ec6VfW1p6rxQ2U8CnOKe9unQ32jSnAWY="; }; sourceRoot = "."; diff --git a/pkgs/by-name/gd/gdevelop/linux.nix b/pkgs/by-name/gd/gdevelop/linux.nix index 6cbce1c80e5d..ccf9210d9d99 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-IRSg7/jj8QRvVYuHiYzci/mWrQ2lW6RJy9QdZs/guFI="; + hash = "sha256-r4drlfi1jz86w1b7LIt6pz7sW4WB7UiU49uVwxtXKdw="; } 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 75cd81c69a39..2eb0046f8f15 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.6.269"; + version = "5.6.274"; pname = "gdevelop"; meta = { description = "Graphical Game Development Studio"; diff --git a/pkgs/by-name/gd/gdm/package.nix b/pkgs/by-name/gd/gdm/package.nix index a84f733c3345..6495cdc457d8 100644 --- a/pkgs/by-name/gd/gdm/package.nix +++ b/pkgs/by-name/gd/gdm/package.nix @@ -44,7 +44,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gdm"; - version = "50.0"; + version = "50.1"; outputs = [ "out" @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gdm/${lib.versions.major finalAttrs.version}/gdm-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZG9T1o8tLRRxRv+uuFBH3ti4E9yxwQTY8Ow2ymCetb8="; + hash = "sha256-dwFZNzUSGSQQ9BK10MRnjsFXPxrks5yB/nWGH+iJAXQ="; }; mesonFlags = [ diff --git a/pkgs/by-name/gd/gdscript-formatter/package.nix b/pkgs/by-name/gd/gdscript-formatter/package.nix index 006afb7e1012..a35349559076 100644 --- a/pkgs/by-name/gd/gdscript-formatter/package.nix +++ b/pkgs/by-name/gd/gdscript-formatter/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gdscript-formatter"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "GDQuest"; repo = "GDScript-formatter"; tag = finalAttrs.version; - hash = "sha256-T0NURMu/AWRC+z3VSv20cpdUEq+nczsdp+C9SlvObmg="; + hash = "sha256-lmKnTeGb7HFQ+xD3pxjiE9s+IvKwiMrrsKNB3OsIXcE="; # Needed due to .gitattributes being used for the Godot addon and export-ignoring all files deepClone = true; # Avoid hash differences due to differences in .git leaveDotGit = false; }; - cargoHash = "sha256-JGvtjxHfkMknilFCRJS3VzvN6yifDx0nTNTQua0qmlI="; + cargoHash = "sha256-38qzBoPLcI2dMCTaoEg3seNUrFcAf7RjAc6dv+BRcNg="; cargoBuildFlags = [ "--bin=gdscript-formatter" diff --git a/pkgs/by-name/gd/gdu/package.nix b/pkgs/by-name/gd/gdu/package.nix index 622769eafb27..e03a4ec1db9d 100644 --- a/pkgs/by-name/gd/gdu/package.nix +++ b/pkgs/by-name/gd/gdu/package.nix @@ -63,7 +63,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/dundee/gdu"; changelog = "https://github.com/dundee/gdu/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab zowoq diff --git a/pkgs/by-name/ge/geant4/package.nix b/pkgs/by-name/ge/geant4/package.nix index 7db3e4f88ccf..c710d89bdd19 100644 --- a/pkgs/by-name/ge/geant4/package.nix +++ b/pkgs/by-name/ge/geant4/package.nix @@ -38,12 +38,12 @@ let in stdenv.mkDerivation (finalAttrs: { - version = "11.4.1"; + version = "11.4.2"; pname = "geant4"; src = fetchurl { url = "https://cern.ch/geant4-data/releases/geant4-v${finalAttrs.version}.tar.gz"; - hash = "sha256-HG3ymOw5hFlDgP/jRJ48I80jKZsX4QZz5pI7jmuNIBc="; + hash = "sha256-VyDyu6aSECfiBq1PCgb5vMNIras2JA6LJ3EPIM4+lxo="; }; # Fix broken paths in a .pc diff --git a/pkgs/by-name/ge/gearboy/package.nix b/pkgs/by-name/ge/gearboy/package.nix index c1c19d8a3a2f..e96f9ab020f5 100644 --- a/pkgs/by-name/ge/gearboy/package.nix +++ b/pkgs/by-name/ge/gearboy/package.nix @@ -16,13 +16,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gearboy"; - version = "3.8.6"; + version = "3.8.9"; src = fetchFromGitHub { owner = "drhelius"; repo = "Gearboy"; tag = finalAttrs.version; - hash = "sha256-HdTypXuIVMl3y83RbjNviAtgl2KwCU+faI6ZcG2P/LY="; + hash = "sha256-p6gIGWkcv4jJacF4baK8Uej2kwwPnd/ylvgmUHHPXnI="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ge/geckodriver/package.nix b/pkgs/by-name/ge/geckodriver/package.nix index 2681f81f5690..75fa124c7cb9 100644 --- a/pkgs/by-name/ge/geckodriver/package.nix +++ b/pkgs/by-name/ge/geckodriver/package.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - version = "0.36.0"; + version = "0.37.1"; pname = "geckodriver"; src = fetchFromGitHub { owner = "mozilla"; repo = "geckodriver"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-rqJ6+QKfEhdHGZBT9yEWtsBlETxz4XeEZXisXf7RdIE="; + sha256 = "sha256-LnfJmiV4SJpFBXDAJmwbHKv6RvO40e7/3Lm6Jc6YA40="; }; - cargoHash = "sha256-wFRZhQzFBwwNfiszwr7XK3e8tfqqFG6DIe7viWvB5vg="; + cargoHash = "sha256-zNwlQ2CsDHQnFog59jKFAxVaNK0/8hUts6NRkFVKCGk="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/by-name/ge/gecode/package.nix b/pkgs/by-name/ge/gecode/package.nix index d07198f78125..d325f2501a3f 100644 --- a/pkgs/by-name/ge/gecode/package.nix +++ b/pkgs/by-name/ge/gecode/package.nix @@ -2,8 +2,8 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, bison, + cmake, flex, perl, gmp, @@ -12,30 +12,22 @@ enableGist ? true, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "gecode"; - version = "6.2.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "Gecode"; repo = "gecode"; - rev = "release-${version}"; - sha256 = "0b1cq0c810j1xr2x9y9996p894571sdxng5h74py17c6nr8c6dmk"; + tag = "release-${finalAttrs.version}"; + hash = "sha256-WhMN7QC+VQfvHUV1LLaW7I7fG++/fznh1ZDUY/Q8zD8="; }; - patches = [ - # https://github.com/Gecode/gecode/pull/74 - (fetchpatch { - name = "fix-const-weights-clang.patch"; - url = "https://github.com/Gecode/gecode/commit/c810c96b1ce5d3692e93439f76c4fa7d3daf9fbb.patch"; - sha256 = "0270msm22q5g5sqbdh8kmrihlxnnxqrxszk9a49hdxd72736p4fc"; - }) - ]; - enableParallelBuilding = true; dontWrapQtApps = true; nativeBuildInputs = [ bison + cmake flex ]; buildInputs = [ @@ -52,4 +44,4 @@ stdenv.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/ge/geeqie/package.nix b/pkgs/by-name/ge/geeqie/package.nix index c48dfab6f595..c0a945cc229a 100644 --- a/pkgs/by-name/ge/geeqie/package.nix +++ b/pkgs/by-name/ge/geeqie/package.nix @@ -41,13 +41,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "geeqie"; - version = "2.7"; + version = "2.9"; src = fetchFromGitHub { owner = "BestImageViewer"; repo = "geeqie"; tag = "v${finalAttrs.version}"; - hash = "sha256-yCY9ltm21cD3NnC2hDZ3O+2UZYgop4TLHC0djPF3Lo0="; + hash = "sha256-6g1aBeQUy9+WMlikAqvlb0NcCT7h0qgBRSsCOdRiZ/E="; }; postPatch = '' diff --git a/pkgs/by-name/ge/geesefs/package.nix b/pkgs/by-name/ge/geesefs/package.nix index 1affc960cde0..658c16b34943 100644 --- a/pkgs/by-name/ge/geesefs/package.nix +++ b/pkgs/by-name/ge/geesefs/package.nix @@ -5,7 +5,7 @@ }: let - version = "0.43.7"; + version = "0.43.8"; in buildGoModule { pname = "geesefs"; @@ -15,7 +15,7 @@ buildGoModule { owner = "yandex-cloud"; repo = "geesefs"; rev = "v${version}"; - hash = "sha256-D9ZFjsmM4x1TVHRGcu6uredWjhwEsNjTr+kwQDmpyGE="; + hash = "sha256-NDe3GnB0xVly6Elfpa60+Wx3RyWhfPfssf1l7Tt20zY="; }; # hashes differ per architecture otherwise. @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://github.com/yandex-cloud/geesefs"; description = "Finally, a good FUSE FS implementation over S3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.flokli ]; platforms = lib.platforms.unix; mainProgram = "geesefs"; diff --git a/pkgs/by-name/ge/gefyra/package.nix b/pkgs/by-name/ge/gefyra/package.nix index 14a29ca5908e..1a5bf842ad90 100644 --- a/pkgs/by-name/ge/gefyra/package.nix +++ b/pkgs/by-name/ge/gefyra/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gefyra"; - version = "2.5.1"; + version = "2.5.3"; src = fetchzip { url = "https://github.com/gefyrahq/gefyra/releases/download/${finalAttrs.version}/gefyra-${finalAttrs.version}-linux-amd64.zip"; - hash = "sha256-RwosuoLT7lONDvUsWHQBHr52On4M5B8FoHEgUdPJwmI="; + hash = "sha256-0bSFeXvoLmlVwOfTEWpnXt3yHm7YwSoo5W9u4yPccHo="; stripRoot = false; }; diff --git a/pkgs/by-name/ge/gelly/package.nix b/pkgs/by-name/ge/gelly/package.nix index 360988c2c887..67a920bbc921 100644 --- a/pkgs/by-name/ge/gelly/package.nix +++ b/pkgs/by-name/ge/gelly/package.nix @@ -14,20 +14,21 @@ openssl, bubblewrap, glycin-loaders, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "gelly"; - version = "1.4.0"; + version = "1.9.4"; src = fetchFromGitHub { owner = "Fingel"; repo = "gelly"; tag = "v${finalAttrs.version}"; - hash = "sha256-3RXAipo8QzRu8OVJqrh2AHVXgvgbEYC7GJ4ho4rbNnI="; + hash = "sha256-GYMLV4hffaIbqUp1b5ERo2QQqiKRlHe9oXfq+wNH/hM="; }; - cargoHash = "sha256-yiW0neFnNPb9go7Yef+DLoUCZ32E3DLe1a0onbte+Xc="; + cargoHash = "sha256-CsmcXlkOec/KJ59Ng7MyGsfjWQ80YyV6MztRFULmvDA="; nativeBuildInputs = [ pkg-config @@ -69,6 +70,8 @@ rustPlatform.buildRustPackage (finalAttrs: { ) ''; + passthru.updateScript = nix-update-script { }; + meta = { description = "A Jellyfin GTK client for Linux focused on music"; homepage = "https://github.com/Fingel/gelly"; diff --git a/pkgs/by-name/ge/gemget/package.nix b/pkgs/by-name/ge/gemget/package.nix index 18ac03146fed..871f88e5cc1e 100644 --- a/pkgs/by-name/ge/gemget/package.nix +++ b/pkgs/by-name/ge/gemget/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "1.9.0"; src = fetchFromGitHub { - owner = "makeworld-the-better-one"; + owner = "makew0rld"; repo = "gemget"; rev = "v${finalAttrs.version}"; sha256 = "sha256-P5+yRaf2HioKOclJMMm8bJ8/BtBbNEeYU57TceZVqQ8="; @@ -19,7 +19,7 @@ buildGoModule (finalAttrs: { meta = { description = "Command line downloader for the Gemini protocol"; - homepage = "https://github.com/makeworld-the-better-one/gemget"; + homepage = "https://github.com/makew0rld/gemget"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ amfl ]; mainProgram = "gemget"; diff --git a/pkgs/by-name/ge/gemini-cli/package.nix b/pkgs/by-name/ge/gemini-cli/package.nix index b4ac203be5da..1e8c4a420024 100644 --- a/pkgs/by-name/ge/gemini-cli/package.nix +++ b/pkgs/by-name/ge/gemini-cli/package.nix @@ -15,18 +15,18 @@ buildNpmPackage (finalAttrs: { pname = "gemini-cli"; - version = "0.43.0"; + version = "0.47.0"; src = fetchFromGitHub { owner = "google-gemini"; repo = "gemini-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-UFz+CQLGbzFlpa5Mhf/frnQJWttF35URvua1QTfoaZ0="; + hash = "sha256-pabav4ehssc3oQFuF4MgnSG7Ql1r5Y6n+ZzYbgh5tz8="; }; nodejs = nodejs_22; - npmDepsHash = "sha256-7Pl020NKKzRpQftzEYRpQ0v1mkPnO3kVZITvFSLYztI="; + npmDepsHash = "sha256-Df1EVzKYWo5o2cvP3kFGcNKEuDu3fZno4OTKBe37IK8="; dontPatchElf = stdenv.hostPlatform.isDarwin; @@ -54,9 +54,13 @@ buildNpmPackage (finalAttrs: { # Remove node-pty dependency from packages/core/package.json ${jq}/bin/jq 'del(.optionalDependencies."node-pty")' packages/core/package.json > packages/core/package.json.tmp && mv packages/core/package.json.tmp packages/core/package.json - # Fix ripgrep path for SearchText; ensureRgPath() on its own may return the path to a dynamically-linked ripgrep binary without required libraries + # Prefer the Nix ripgrep binary by prepending it to candidate paths substituteInPlace packages/core/src/tools/ripGrep.ts \ - --replace-fail "await ensureRgPath();" "'${lib.getExe ripgrep}';" + --replace-fail "const candidatePaths = [" "const candidatePaths = [\"${lib.getExe ripgrep}\", " + + # Trust the Nix store path by adding it to standard system prefixes + substituteInPlace packages/core/src/utils/paths.ts \ + --replace-fail "const trustedPrefixes = [" "const trustedPrefixes = [\"/nix/store\", " # Disable auto-update by changing default values in settings schema sed -i '/enableAutoUpdate:/,/default: true/ s/default: true/default: false/' packages/cli/src/config/settingsSchema.ts @@ -115,7 +119,7 @@ buildNpmPackage (finalAttrs: { maintainers = with lib.maintainers; [ brantes xiaoxiangmoe - FlameFlag + _4evy taranarmo caverav ]; diff --git a/pkgs/by-name/ge/geminicommit/package.nix b/pkgs/by-name/ge/geminicommit/package.nix index cad18ba4b39a..572d60b2988a 100644 --- a/pkgs/by-name/ge/geminicommit/package.nix +++ b/pkgs/by-name/ge/geminicommit/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "geminicommit"; - version = "0.7.0"; + version = "0.8.0"; src = fetchFromGitHub { owner = "tfkhdyt"; repo = "geminicommit"; tag = "v${finalAttrs.version}"; - hash = "sha256-BLCnBym69O6s4UnogopcccI5PnniOFJ3BcWFyxEsUUI="; + hash = "sha256-OgcbPnZ88snTky8Uzbq2LIwSpMv44JvE75MPbTih7+c="; }; vendorHash = "sha256-FFWptw1kSbl7f8DR3FrM0jAfr06NaJT+i/8ZaQjav/E="; diff --git a/pkgs/by-name/ge/genimage/package.nix b/pkgs/by-name/ge/genimage/package.nix index c9403ae7c263..c7a9d80a72f4 100644 --- a/pkgs/by-name/ge/genimage/package.nix +++ b/pkgs/by-name/ge/genimage/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, autoreconfHook, pkg-config, libconfuse, @@ -10,11 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "genimage"; - version = "19"; + version = "20"; - src = fetchurl { - url = "https://public.pengutronix.de/software/genimage/genimage-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-fsT8uGVmKosv8gKEgZBE/6hBN788oW+3SXASkbwB8Qg="; + src = fetchFromGitHub { + owner = "pengutronix"; + repo = "genimage"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6pKqvpoEQWebubl6K5FzEAv2aUsBXgOBEAdcCwARkrU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ge/geobug/package.nix b/pkgs/by-name/ge/geobug/package.nix new file mode 100644 index 000000000000..f211688b96d8 --- /dev/null +++ b/pkgs/by-name/ge/geobug/package.nix @@ -0,0 +1,63 @@ +{ + lib, + python3Packages, + fetchFromCodeberg, + gobject-introspection, + wrapGAppsHook4, + geoclue2, + libadwaita, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "geobug"; + version = "0.9.1"; + pyproject = true; + + src = fetchFromCodeberg { + owner = "tpikonen"; + repo = "geobug"; + tag = finalAttrs.version; + hash = "sha256-u9+tCKE5zhX6PGl1IsYcqCT0Q1p/eP+V68N6ggAgDoQ="; + }; + + nativeBuildInputs = [ + gobject-introspection + wrapGAppsHook4 + ]; + + build-system = with python3Packages; [ + setuptools + ]; + + dependencies = + (with python3Packages; [ + gpxpy + pygobject3 + ]) + ++ [ + geoclue2 + libadwaita + ]; + + pythonImportsCheck = [ + "geobug" + ]; + + strictDeps = true; + + __structuredAttrs = true; + + meta = { + description = "Adaptive GeoClue client"; + longDescription = '' + Geobug is an adaptive client for GeoClue, the geolocation D-bus server from freedesktop.org. It can display your location information (coordinates, speed etc.) and save a track of your movements to a GPX-file. + ''; + homepage = "https://codeberg.org/tpikonen/geobug"; + changelog = "https://codeberg.org/tpikonen/geobug/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + Luflosi + ]; + mainProgram = "geobug"; + }; +}) diff --git a/pkgs/by-name/ge/geogram/package.nix b/pkgs/by-name/ge/geogram/package.nix index 87f89e888151..6aae896f16fc 100644 --- a/pkgs/by-name/ge/geogram/package.nix +++ b/pkgs/by-name/ge/geogram/package.nix @@ -101,7 +101,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ tmarkus ]; diff --git a/pkgs/by-name/ge/geographiclib/package.nix b/pkgs/by-name/ge/geographiclib/package.nix index 9f915f128d89..34069f754fd7 100644 --- a/pkgs/by-name/ge/geographiclib/package.nix +++ b/pkgs/by-name/ge/geographiclib/package.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation (finalAttrs: { }; outputs = [ - "dev" "doc" "out" ]; diff --git a/pkgs/by-name/ge/geoipupdate/package.nix b/pkgs/by-name/ge/geoipupdate/package.nix index 210c27fd5198..7ee20c77422c 100644 --- a/pkgs/by-name/ge/geoipupdate/package.nix +++ b/pkgs/by-name/ge/geoipupdate/package.nix @@ -24,7 +24,7 @@ buildGoModule (finalAttrs: { meta = { description = "Automatic GeoIP database updater"; homepage = "https://github.com/maxmind/geoipupdate"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ das_j helsinki-Jo diff --git a/pkgs/by-name/ge/gephgui-wry/package.nix b/pkgs/by-name/ge/gephgui-wry/package.nix index e3c36a091bb6..41941020239b 100644 --- a/pkgs/by-name/ge/gephgui-wry/package.nix +++ b/pkgs/by-name/ge/gephgui-wry/package.nix @@ -59,13 +59,13 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gephgui-wry"; - version = "5.7.1"; + version = "5.7.2"; src = fetchFromGitHub { owner = "geph-official"; repo = "gephgui-pkg"; tag = "v${finalAttrs.version}"; - hash = "sha256-PpkhIfA1jTqiY+4UwonrUk2wq+wL2Rhltfhp0LSURMg="; + hash = "sha256-uY2m4TXy4+efRC6WzGjB5Vushgj8zkCp0ctnCJAR+FE="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ge/gerbolyze/package.nix b/pkgs/by-name/ge/gerbolyze/package.nix index 690e38ca3313..a5a13ccc60c1 100644 --- a/pkgs/by-name/ge/gerbolyze/package.nix +++ b/pkgs/by-name/ge/gerbolyze/package.nix @@ -32,7 +32,7 @@ let meta = { description = "SVG-flatten SVG downconverter"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "svg-flatten"; platforms = lib.platforms.linux; @@ -91,7 +91,7 @@ python3Packages.buildPythonApplication { meta = { description = "Directly render SVG overlays into Gerber and Excellon files"; homepage = "https://github.com/jaseg/gerbolyze"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; maintainers = with lib.maintainers; [ wulfsta ]; mainProgram = "gerbolyze"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ge/gerrit/package.nix b/pkgs/by-name/ge/gerrit/package.nix index adf149804c93..4d7c87408399 100644 --- a/pkgs/by-name/ge/gerrit/package.nix +++ b/pkgs/by-name/ge/gerrit/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gerrit"; - version = "3.13.6"; + version = "3.14.2"; src = fetchurl { url = "https://gerrit-releases.storage.googleapis.com/gerrit-${finalAttrs.version}.war"; - hash = "sha256-nGKl5KNundR+FkiQ5CO/qBezOSNAHDHcPsssm1lZAhk="; + hash = "sha256-OuM96W9++2QKD2O2IwkzDjmBaC9Ej/6ReHY/Rwujuno="; }; buildCommand = '' diff --git a/pkgs/by-name/ge/geteduroam/package.nix b/pkgs/by-name/ge/geteduroam/package.nix index ee473df5ec9f..a62fe3681926 100644 --- a/pkgs/by-name/ge/geteduroam/package.nix +++ b/pkgs/by-name/ge/geteduroam/package.nix @@ -67,6 +67,7 @@ buildGoModule (finalAttrs: { libraryPath = symlinkJoin { name = "eduroam-gui-puregotk-lib"; # based on https://github.com/jwijenbergh/puregotk/blob/bc1a52f44fd4c491947f7af85296c66173da17ba/internal/core/core.go#L41 + # cat "$(nix-build . -A geteduroam.goModules)"/*/*/puregotk/v4/*/*.go | grep -E 'SetSharedLibraries\(.*\)' -o | cut -d'"' -f4 | sort -u paths = [ cairo gdk-pixbuf diff --git a/pkgs/by-name/ge/geticons/package.nix b/pkgs/by-name/ge/geticons/package.nix index 8d50d39c9325..1ca57bd976f8 100644 --- a/pkgs/by-name/ge/geticons/package.nix +++ b/pkgs/by-name/ge/geticons/package.nix @@ -23,6 +23,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI utility to get icons for apps on your system or other generic icons by name"; mainProgram = "geticons"; homepage = "https://git.sr.ht/~zethra/geticons"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; }; }) diff --git a/pkgs/by-name/ge/getmail6/package.nix b/pkgs/by-name/ge/getmail6/package.nix index a15b28d8faef..0ebcddd09f8e 100644 --- a/pkgs/by-name/ge/getmail6/package.nix +++ b/pkgs/by-name/ge/getmail6/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "getmail6"; - version = "6.19.12"; + version = "6.20.00"; pyproject = true; src = fetchFromGitHub { owner = "getmail6"; repo = "getmail6"; tag = "v${finalAttrs.version}"; - hash = "sha256-E+S6p12eqVDkzTv6RdeBpUJqPd4a4LMVoGaYOr2XKVo="; + hash = "sha256-f0IH0wI7Ue/HjvMIhBRGaMoO9BYDJoH/3fWRDsFD9+8="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/gf/gf/package.nix b/pkgs/by-name/gf/gf/package.nix index a86e316e8c70..ffbac9d48f2b 100644 --- a/pkgs/by-name/gf/gf/package.nix +++ b/pkgs/by-name/gf/gf/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation { pname = "gf"; - version = "0-unstable-2026-05-03"; + version = "0-unstable-2026-06-16"; src = fetchFromGitHub { repo = "gf"; owner = "nakst"; - rev = "46174e9b25850c9898ca0c2de90af31ad83122d7"; - hash = "sha256-UnMpV9RCDsJEDBj4/gypzYFhR4IqEVKYKLpvrLlTGaA="; + rev = "1c04ed95d45d49fb4b06cbc620c61acd58818977"; + hash = "sha256-42uB2HVJaEXgjA+/iUrML6biUOqj9b7mCQfSrj/nKvw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gf/gfan/gfan-0.7-macos.patch b/pkgs/by-name/gf/gfan/gfan-0.7-macos.patch new file mode 100644 index 000000000000..9a1bfe31e30e --- /dev/null +++ b/pkgs/by-name/gf/gfan/gfan-0.7-macos.patch @@ -0,0 +1,139 @@ +diff --git a/src/app_components.cpp b/src/app_components.cpp +index 407c23e..8fc0d86 100644 +--- a/src/app_components.cpp ++++ b/src/app_components.cpp +@@ -162,7 +162,6 @@ void connectedComponentsOfSlices(PostComplex& pc, bool saveNoncomets, boo + */ + if (potentialsOutputAndStop) { + std::for_each( +- std::execution::seq, + potentials.begin(), + potentials.end(), + [](Rational p) +@@ -180,7 +179,6 @@ void connectedComponentsOfSlices(PostComplex& pc, bool saveNoncomets, boo + }); + } else { + std::for_each( +- std::execution::par,//fails to trigger parallelism + potentials.begin(), + potentials.end(), + [pc,minConePotential,maxConePotential,saveNoncomets](Rational p) +diff --git a/src/gfanlib_circuittableint.h b/src/gfanlib_circuittableint.h +index 2b5ced4..d53fbec 100644 +--- a/src/gfanlib_circuittableint.h ++++ b/src/gfanlib_circuittableint.h +@@ -25,6 +25,7 @@ namespace gfan{ + template struct MyMakeUnsigned; + template <> struct MyMakeUnsigned{typedef unsigned int type;}; + template <> struct MyMakeUnsigned{typedef unsigned long int type;}; ++ template <> struct MyMakeUnsigned{typedef unsigned long long int type;}; + template <> struct MyMakeUnsigned<__int128>{typedef unsigned __int128 type;}; + + class MVMachineIntegerOverflow: public std::exception +@@ -92,6 +93,15 @@ static std::string toStr(__uint32_t b) + return s.str(); + } + ++#ifndef _64BITLONGINT ++static std::string toStr(long int b) ++{ ++ std::stringstream s; ++ s< ++#include + #include +-#include ++#include + #include + + +@@ -42,9 +42,9 @@ void test() { + + template + //using std::experimental::pmr pmr; +-using pmrvector=std::experimental::pmr::vector; +-typedef std::experimental::pmr::memory_resource MR; //Maybe this should be polymorphic_allocator instead - at least for the constructors using these +-using std::experimental::pmr::get_default_resource; ++using pmrvector=std::pmr::vector; ++typedef std::pmr::memory_resource MR; //Maybe this should be polymorphic_allocator instead - at least for the constructors using these ++using std::pmr::get_default_resource; + + //DELETE + class ResourceWrapper: public MR{ +@@ -76,7 +76,7 @@ public: + } + }; + +-class StackResource: public std::experimental::pmr::memory_resource{ ++class StackResource: public std::pmr::memory_resource{ + /* + * + * Layout of memory +@@ -98,7 +98,7 @@ class StackResource: public std::experimental::pmr::memory_resource{ + The header is 4 byte aligned, while the alignment of each block is specified at allocation. + */ + public: +- std::experimental::pmr::vector mem; ++ std::pmr::vector mem; + int topHeader; + int nbytes; + memory_resource* parentResource; +@@ -124,8 +124,8 @@ public: + return (firstPossible+((align-1)|(minimumAlignment-1)))& ~((align-1)|(minimumAlignment-1)); + } + StackResource(int nbytes_, +- memory_resource* parentResource_=std::experimental::pmr::new_delete_resource(), +- memory_resource* fallBackResource_=std::experimental::pmr::null_memory_resource()): ++ memory_resource* parentResource_=std::pmr::new_delete_resource(), ++ memory_resource* fallBackResource_=std::pmr::null_memory_resource()): + topHeader(0), + nbytes(nbytes_), + mem(nbytes_,parentResource_), +@@ -254,7 +254,7 @@ public: + }; + + +-std::string memoryResourceToString(const std::experimental::pmr::memory_resource *mr); ++std::string memoryResourceToString(const std::pmr::memory_resource *mr); + + // DELETE? + class ResourceInvariant diff --git a/pkgs/by-name/gf/gfan/package.nix b/pkgs/by-name/gf/gfan/package.nix index 9ca8ed038811..8b6bce850f2f 100644 --- a/pkgs/by-name/gf/gfan/package.nix +++ b/pkgs/by-name/gf/gfan/package.nix @@ -9,22 +9,19 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gfan"; - version = "0.6.2"; + version = "0.7"; src = fetchurl { url = "https://home.math.au.dk/jensen/software/gfan/gfan${finalAttrs.version}.tar.gz"; - sha256 = "02pihqb1lb76a0xbfwjzs1cd6ay3ldfxsm8dvsbl6qs3vkjxax56"; + sha256 = "sha256-q4M3V+Hk1KmGYvSqaROUAT6poib2QWuPhWU1bW/MmJ4="; }; patches = [ ./gfan-0.6.2-cddlib-prefix.patch (fetchpatch { - # removes dead code with invalid member reference in gfanlib - name = "clang-19.patch"; - url = "https://github.com/Singular/Singular/commit/d3f73432d73ac0dd041af83cb35301498e9b57d9.patch"; - stripLen = 2; - extraPrefix = "src/"; - hash = "sha256-jPGMYx/GOFV7Tk3CqaRWeX/UHkzjeL57eZj4r40s8/g="; + name = "cstdint.patch"; + url = "https://salsa.debian.org/math-team/gfan/-/raw/6bb6bc3dd517b3c26fbcb76bfdc47f04d1978007/debian/patches/cstdint.patch"; + hash = "sha256-ALD8Exe2SW8TZg0hIfhvUuiEbbT3Sk7v+oLnNsYA8hs="; }) ] ++ lib.optionals (stdenv.cc.isClang) [ @@ -33,17 +30,17 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/sagemath/sage/eea1f59394a5066e9acd8ae39a90302820914ee3/build/pkgs/gfan/patches/nodel.patch"; sha256 = "sha256-RrncSgFyrBIk/Bwe3accxiJ2rpOSJKQ84cV/uBvQsDc="; }) + ] + ++ lib.optionals (stdenv.hostPlatform.isDarwin) [ + # On MacOS, we need to adress differences in int64_t types and remove the + # "experimental/" library and namespace prefixes as well as references to + # std::execution. + ./gfan-0.7-macos.patch ]; - # This test assumes that our implementation of sort behaves identically to the - # one used during development, which is not necessarily the case; update the - # expected result to be sorted using our copy of sort. - postPatch = '' - sort testsuite/0008PolynomialSetUnion/output -o testsuite/0008PolynomialSetUnion/output - sort testsuite/0008PolynomialSetUnion/outputNew -o testsuite/0008PolynomialSetUnion/outputNew - '' - + lib.optionalString stdenv.cc.isClang '' - substituteInPlace Makefile --replace "-fno-guess-branch-probability" "" + postPatch = lib.optionalString stdenv.cc.isClang '' + substituteInPlace Makefile --replace-fail "-fno-guess-branch-probability" "" \ + --replace-fail "-finline-limit=1000" "" for f in $(find -name "*.h" -or -name "*.cpp"); do substituteInPlace "$f" --replace-quiet "log2" "_log2" @@ -60,6 +57,7 @@ stdenv.mkDerivation (finalAttrs: { mpir cddlib ]; + enableParallelBuilding = true; hardeningDisable = [ "libcxxhardeningfast" ]; doCheck = true; @@ -72,7 +70,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Software package for computing Gröbner fans and tropical varieties"; - license = lib.licenses.gpl2; + license = + with lib.licenses; + OR [ + gpl2 + gpl3 + ]; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.unix; homepage = "http://home.math.au.dk/jensen/software/gfan/gfan.html"; diff --git a/pkgs/by-name/gf/gflags/package.nix b/pkgs/by-name/gf/gflags/package.nix index 665ed686a51c..6fa9a27b5ccb 100644 --- a/pkgs/by-name/gf/gflags/package.nix +++ b/pkgs/by-name/gf/gflags/package.nix @@ -2,31 +2,21 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, enableShared ? !stdenv.hostPlatform.isStatic, }: stdenv.mkDerivation (finalAttrs: { pname = "gflags"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "gflags"; repo = "gflags"; - rev = "v${finalAttrs.version}"; - sha256 = "147i3md3nxkjlrccqg4mq1kyzc7yrhvqv5902iibc7znkvzdvlp0"; + tag = "v${finalAttrs.version}"; + hash = "sha256-sud3c6XH24YA6vzGQ7LhSoiKycan5JYehC5l2gH6DEo="; }; - patches = [ - # Fix the build with CMake 4. - (fetchpatch { - name = "gflags-fix-cmake-4.patch"; - url = "https://github.com/gflags/gflags/commit/70c01a642f08734b7bddc9687884844ca117e080.patch"; - hash = "sha256-TYdroBbF27Wvvm/rOahBEvhezuKCcxbtgh/ZhpA5ESo="; - }) - ]; - nativeBuildInputs = [ cmake ]; # This isn't used by the build and breaks the CMake build on case-insensitive filesystems (e.g., on Darwin) @@ -48,6 +38,7 @@ stdenv.mkDerivation (finalAttrs: { It was owned by Google. google-gflags project has been renamed to gflags and maintained by new community. ''; homepage = "https://gflags.github.io/gflags/"; + changelog = "https://github.com/gflags/gflags/blob/${finalAttrs.src.tag}/ChangeLog.txt"; license = lib.licenses.bsd3; maintainers = [ ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gf/gforth/package.nix b/pkgs/by-name/gf/gforth/package.nix index ee2378a3bac5..9c00c810a71a 100644 --- a/pkgs/by-name/gf/gforth/package.nix +++ b/pkgs/by-name/gf/gforth/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gforth"; - version = "0.7.9_20260513"; + version = "0.7.9_20260715"; src = fetchFromGitHub { owner = "forthy42"; repo = "gforth"; rev = finalAttrs.version; - hash = "sha256-hx1/CE18lepkyTnT6yymGwAAJtRM8u7DAhPsKTj0gdo="; + hash = "sha256-cMVvNSDRN3384e5gX62sApO6mM3lxIEeO2ZRtJSmcHc="; }; patches = [ ./use-nproc-instead-of-fhs.patch ]; diff --git a/pkgs/by-name/gf/gftp/package.nix b/pkgs/by-name/gf/gftp/package.nix index 68cf2bf9510e..1bb023756a27 100644 --- a/pkgs/by-name/gf/gftp/package.nix +++ b/pkgs/by-name/gf/gftp/package.nix @@ -5,24 +5,22 @@ meson, ninja, gettext, - gtk2, + gtk3, ncurses, openssl, pkg-config, readline, - nix-update-script, - versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "gftp"; - version = "2.9.1b-unstable-2025-05-12"; + version = "2.9.1b-unstable-2026-03-30"; src = fetchFromGitHub { owner = "masneyb"; repo = "gftp"; - rev = "48114635f7b7b1f9a5eda985021ea53b10a7a030"; - hash = "sha256-unTsd2xX8Y71ItE3gYHoxUPgViK/xhZdx0IQYvDPaEc="; + rev = "f64d27b116be1fc444e0f50ec375847b72df65f7"; + hash = "sha256-2CVRIrSOBi1AUoEKiyYhMmGcIIBnwMQ3EQsgBIvlXEs="; }; nativeBuildInputs = [ @@ -33,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - gtk2 + gtk3 ncurses openssl readline diff --git a/pkgs/by-name/gg/gg-jj/package.nix b/pkgs/by-name/gg/gg-jj/package.nix index 69e7aa478d9f..4d1a93bce638 100644 --- a/pkgs/by-name/gg/gg-jj/package.nix +++ b/pkgs/by-name/gg/gg-jj/package.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GUI for the version control system Jujutsu"; homepage = "https://github.com/gulbanana/gg"; changelog = "https://github.com/gulbanana/gg/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; inherit (cargo-tauri.hook.meta) platforms; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "gg"; diff --git a/pkgs/by-name/gg/ggml/package.nix b/pkgs/by-name/gg/ggml/package.nix index 8d4693174847..aa55a4bdd3ed 100644 --- a/pkgs/by-name/gg/ggml/package.nix +++ b/pkgs/by-name/gg/ggml/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "ggml"; - version = "0.13.1"; + version = "0.17.0"; __structuredAttrs = true; strictDeps = true; @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "ggml"; tag = "v${finalAttrs.version}"; - hash = "sha256-OZjuLdQI312UTn4LLW13C7xMqrM0L/2pVl7cAOlbS6M="; + hash = "sha256-kUCXeIgRRv9UgVlTDwSJaZuTw4piaP23pzTUi1PCi5Q="; }; # The cmake package does not handle absolute CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR diff --git a/pkgs/by-name/gg/ggmorse/package.nix b/pkgs/by-name/gg/ggmorse/package.nix new file mode 100644 index 000000000000..e11f6879e877 --- /dev/null +++ b/pkgs/by-name/gg/ggmorse/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "ggmorse"; + version = "0-unstable-2024-05-31"; + + src = fetchFromGitHub { + owner = "ggerganov"; + repo = "ggmorse"; + rev = "8fb433d6cd6a71940f51b5724663ec0c75bf0b62"; + hash = "sha256-6GhyPhzNNAx1DSomfIfejbnLTckKa7/+VUZhSaGvGtI="; + }; + + postPatch = '' + substituteInPlace ./CMakeLists.txt \ + --replace-fail "cmake_minimum_required (VERSION 3.0)" \ + "cmake_minimum_required (VERSION 3.5)" + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ + (lib.cmakeBool "GGMORSE_BUILD_EXAMPLES" false) + ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "Morse code decoding library"; + homepage = "https://github.com/ggerganov/ggmorse"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.unix; + }; +} diff --git a/pkgs/by-name/gg/ggshield/package.nix b/pkgs/by-name/gg/ggshield/package.nix index a7b8562d06d4..a7ab96e14f37 100644 --- a/pkgs/by-name/gg/ggshield/package.nix +++ b/pkgs/by-name/gg/ggshield/package.nix @@ -5,49 +5,34 @@ python3, }: -let - py = python3.override { - packageOverrides = self: super: { - - # Doesn't support latest marshmallow - marshmallow = super.marshmallow.overridePythonAttrs (oldAttrs: rec { - version = "3.26.2"; - src = fetchFromGitHub { - owner = "marshmallow-code"; - repo = "marshmallow"; - tag = version; - hash = "sha256-ioe+aZHOW8r3wF3UknbTjAP0dEggd/NL9PTkPVQ46zM="; - }; - }); - }; - }; -in - -py.pkgs.buildPythonApplication (finalAttrs: { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "ggshield"; - version = "1.50.4"; + version = "1.52.2"; pyproject = true; src = fetchFromGitHub { owner = "GitGuardian"; repo = "ggshield"; tag = "v${finalAttrs.version}"; - hash = "sha256-wwGj7i1GoxNzdfUhcL7mulgQAPtz5WhbT67hgbcMxpo="; + hash = "sha256-bz3R1ylmkaYF3Wt/ylzeE2IsWKvZ8bmoF39Xu4tVzFU="; }; pythonRelaxDeps = true; - build-system = with py.pkgs; [ hatchling ]; + build-system = with python3.pkgs; [ hatchling ]; - dependencies = with py.pkgs; [ + dependencies = with python3.pkgs; [ charset-normalizer click + configupdater cryptography + filelock keyring marshmallow marshmallow-dataclass notify-py oauthlib + packaging platformdirs pygitguardian pyjwt @@ -56,6 +41,7 @@ py.pkgs.buildPythonApplication (finalAttrs: { requests rich sigstore + tomli truststore typing-extensions urllib3 @@ -64,7 +50,7 @@ py.pkgs.buildPythonApplication (finalAttrs: { nativeCheckInputs = [ git ] - ++ (with py.pkgs; [ + ++ (with python3.pkgs; [ jsonschema pyfakefs pytest-factoryboy @@ -100,6 +86,8 @@ py.pkgs.buildPythonApplication (finalAttrs: { "test_generate_files_from_paths" # Nixpkgs issue "test_get_file_sha_in_ref" + # Generated hooks config references pytest binary, instead of ggshield CLI. Odd! + "test_install_cursor_local_fresh" ]; meta = { diff --git a/pkgs/by-name/gh/gh-actions-cache/package.nix b/pkgs/by-name/gh/gh-actions-cache/package.nix deleted file mode 100644 index a38af3829e58..000000000000 --- a/pkgs/by-name/gh/gh-actions-cache/package.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ - lib, - fetchFromGitHub, - buildGoModule, -}: - -buildGoModule (finalAttrs: { - pname = "gh-actions-cache"; - version = "1.0.4"; - - src = fetchFromGitHub { - owner = "actions"; - repo = "gh-actions-cache"; - rev = "v${finalAttrs.version}"; - hash = "sha256-GVha3xxLTBTiKfAjGb2q9btsGYzWQivGLyZ4Gg0s/N0="; - }; - - vendorHash = "sha256-4/Zt+ga3abEPtR0FjWIsDpOiG1bfVtVuLuXP8aHbzqk="; - - ldflags = [ - "-s" - "-w" - ]; - - # Needed for tests. - # https://github.com/actions/gh-actions-cache/issues/53#issuecomment-1464954495 - env.GH_TOKEN = "dummy-token-to-facilitate-rest-client"; - - meta = { - description = "gh extension to manage GitHub Actions caches"; - homepage = "https://github.com/actions/gh-actions-cache"; - changelog = "https://github.com/actions/gh-actions-cache/releases/tag/${finalAttrs.src.rev}"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - mainProgram = "gh-actions-cache"; - }; -}) diff --git a/pkgs/by-name/gh/gh-aw/package.nix b/pkgs/by-name/gh/gh-aw/package.nix new file mode 100644 index 000000000000..927e0e503241 --- /dev/null +++ b/pkgs/by-name/gh/gh-aw/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + buildGoModule, + versionCheckHook, +}: +buildGoModule (finalAttrs: { + pname = "gh-aw"; + version = "0.80.9"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "github"; + repo = "gh-aw"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2BGFKy/X8j0jYQc+W2rLZmZmPgCvZ+QOZweQaAQQJLM="; + }; + + vendorHash = "sha256-jxh8R/X12/QHxZOIKsTvS6FcDQSmJ7RJEvDnJuUr93A="; + + subPackages = [ "cmd/gh-aw" ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + ldflags = [ + "-s" + "-w" + "-X" + "main.version=${finalAttrs.version}" + ]; + + meta = { + homepage = "https://github.com/github/gh-aw"; + description = "gh extension for GitHub Agentic Workflows"; + longDescription = '' + Repository automation, running the coding agents you know and + love, with strong guardrails in GitHub Actions. + ''; + changelog = "https://github.com/github/gh-aw/releases/tag/v${finalAttrs.version}"; + downloadPage = "https://github.com/github/gh-aw/releases"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ MH0386 ]; + mainProgram = "gh-aw"; + }; +}) diff --git a/pkgs/by-name/gh/gh-dash/package.nix b/pkgs/by-name/gh/gh-dash/package.nix index cef2c082b068..2a8ffea396f5 100644 --- a/pkgs/by-name/gh/gh-dash/package.nix +++ b/pkgs/by-name/gh/gh-dash/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gh-dash"; - version = "4.24.1"; + version = "4.25.2"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${finalAttrs.version}"; - hash = "sha256-eNmOSYsmB+G0VgVn1ITo/mUyYSeXz43goG/VjYqmiQI="; + hash = "sha256-3iUBuMvA2Xh7UjTiFNEs3tuZMCnSt/bIhTSEDD92yCU="; }; - vendorHash = "sha256-fXgj2q0HAGu9Jfdy7NJ6iE5hEKmt50HAEg/9Wds56g0="; + vendorHash = "sha256-Teu+8jiZE2gZ+0ErKsunhotY9W4Hjg6PAeFkFLgESIk="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/gh-gei/package.nix b/pkgs/by-name/gh/gh-gei/package.nix index 7f552b939092..789301891d6e 100644 --- a/pkgs/by-name/gh/gh-gei/package.nix +++ b/pkgs/by-name/gh/gh-gei/package.nix @@ -7,13 +7,13 @@ buildDotnetModule rec { pname = "gh-gei"; - version = "1.30.0"; + version = "1.30.3"; src = fetchFromGitHub { owner = "github"; repo = "gh-gei"; rev = "v${version}"; - hash = "sha256-dmou1CGsx7QLlDI3W1x0Sen35okUNQ4ofe8RMLQDP34="; + hash = "sha256-kWL/ZKBLCXzXXy4gVALfP275PUI2UPlM/WJVqQS+5ak="; }; dotnet-sdk = dotnetCorePackages.sdk_8_0_4xx; diff --git a/pkgs/by-name/gh/gh-poi/package.nix b/pkgs/by-name/gh/gh-poi/package.nix index 9e76b277425c..768bcf434537 100644 --- a/pkgs/by-name/gh/gh-poi/package.nix +++ b/pkgs/by-name/gh/gh-poi/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gh-poi"; - version = "0.17.2"; + version = "0.18.2"; src = fetchFromGitHub { owner = "seachicken"; repo = "gh-poi"; rev = "v${finalAttrs.version}"; - hash = "sha256-tG6rC5htgC9RsHdExpMwb0CDLs7e8PLKEDLih4mGVu8="; + hash = "sha256-QsX24rqTn6v4+yQ+xh63GFNAUrRhn+Ib7Jr4tzLyZRM="; }; ldflags = [ @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-o3ys+Em27sx3VS3AQIP7G/tWRiBlPnvBq37jLtj9QVQ="; # Skip checks because some of test suites require fixture. - # See: https://github.com/seachicken/gh-poi/blob/v0.17.2/.github/workflows/contract-test.yml#L28-L29 + # See: https://github.com/seachicken/gh-poi/blob/v0.18.2/.github/workflows/contract-test.yml#L28-L29 doCheck = false; meta = { diff --git a/pkgs/by-name/gh/gh-pr-review/package.nix b/pkgs/by-name/gh/gh-pr-review/package.nix new file mode 100644 index 000000000000..6fe1bd89b079 --- /dev/null +++ b/pkgs/by-name/gh/gh-pr-review/package.nix @@ -0,0 +1,42 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, +}: + +buildGoModule (finalAttrs: { + pname = "gh-pr-review"; + version = "1.6.2"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "agynio"; + repo = "gh-pr-review"; + tag = "v${finalAttrs.version}"; + hash = "sha256-NVctUkxfYGs29T9naAfqbEhUXfhynx8Ajsh+V+4gCLw="; + }; + + vendorHash = "sha256-CEV23koYz0FpSWXJRF4J+dGNuDT8Ftkn4LGFftvd0ts="; + + nativeBuildInputs = lib.optionals (stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ + installShellFiles + ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gh-pr-review \ + --zsh <($out/bin/gh-pr-review completion zsh) \ + --fish <($out/bin/gh-pr-review completion fish) \ + --bash <($out/bin/gh-pr-review completion bash) + ''; + + meta = { + description = "GitHub CLI extension that adds full inline PR review comment support"; + homepage = "https://github.com/agynio/gh-pr-review"; + changelog = "https://github.com/agynio/gh-pr-review/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "gh-pr-review"; + }; +}) diff --git a/pkgs/by-name/gh/gh/package.nix b/pkgs/by-name/gh/gh/package.nix index d03d00f150f0..6e4bbbbc4380 100644 --- a/pkgs/by-name/gh/gh/package.nix +++ b/pkgs/by-name/gh/gh/package.nix @@ -10,7 +10,7 @@ buildGoModule (finalAttrs: { pname = "gh"; - version = "2.94.0"; + version = "2.96.0"; __structuredAttrs = true; @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "cli"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-wv9hMep8dDKKpqzNI5We6KThOFX82ppzvkoGyhY21pk="; + hash = "sha256-+Roh0eR3Cm+ktLRHwWkvTiEvMGxsj7ngODJnjajL2x4="; }; - vendorHash = "sha256-sRpHQTJNDPVe1jaLO9zMqtIMDE6JQB3vUL7AMxlcnJA="; + vendorHash = "sha256-pQNepOGVEHF8rwdgnaUCnFe/mzDxabYqhouN2V0WkOo="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/gh/ghciwatch/package.nix b/pkgs/by-name/gh/ghciwatch/package.nix index d2025871b576..f52ac38d9122 100644 --- a/pkgs/by-name/gh/ghciwatch/package.nix +++ b/pkgs/by-name/gh/ghciwatch/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ghciwatch"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "MercuryTechnologies"; repo = "ghciwatch"; rev = "v${finalAttrs.version}"; - hash = "sha256-ivSn1q/E0akz2JEkGcfB8i46Vom8/Pp/DlFBI+Zmo5Q="; + hash = "sha256-x+8cA3wO8LOB1/bMKZlKTkuts1IobEsAhRIJQWwrpjs="; }; - cargoHash = "sha256-LZIBQ5dKtqTsMjLrhBucsgSAdmsGKkhOFtMCGh3clPk="; + cargoHash = "sha256-ysB1BJbMJ8KSCGSQzs9AnOA4SnnRcukC5R/vU45pbRM="; # integration tests are not run but the macros need this variable to be set env.GHC_VERSIONS = ""; diff --git a/pkgs/by-name/gh/ghdl/package.nix b/pkgs/by-name/gh/ghdl/package.nix index b4f754b8e423..b56327e67e8b 100644 --- a/pkgs/by-name/gh/ghdl/package.nix +++ b/pkgs/by-name/gh/ghdl/package.nix @@ -13,11 +13,21 @@ libmpc, gnutar, makeWrapper, - backend ? "mcode", + backend ? if stdenv.hostPlatform.isAarch64 then "llvm-jit" else "mcode", }: -assert backend == "mcode" || backend == "llvm" || backend == "gcc"; +assert lib.asserts.assertOneOf "backend" backend [ + "mcode" + "llvm" + "llvm-jit" + "gcc" +]; +let + backendIsLLVM = backend == "llvm"; + backendIsLLVMJit = backend == "llvm-jit"; + backendIsGCC = backend == "gcc"; +in stdenv.mkDerivation (finalAttrs: { pname = "ghdl-${backend}"; version = "6.0.0"; @@ -37,17 +47,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ gnat ] - ++ lib.optionals (backend == "llvm" || backend == "gcc") [ + ++ lib.optionals (backendIsLLVM || backendIsGCC) [ makeWrapper ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ texinfo ]; buildInputs = [ zlib ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ gmp mpfr libmpc @@ -57,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { # If llvm 7.0 works, 7.x releases should work too. sed -i 's/check_version 7.0/check_version 7/g' configure '' - + lib.optionalString (backend == "gcc") '' + + lib.optionalString backendIsGCC '' ${gnutar}/bin/tar -xf ${gcc13.cc.src} ''; @@ -66,14 +76,17 @@ stdenv.mkDerivation (finalAttrs: { "--disable-werror" "--enable-synth" ] - ++ lib.optionals (backend == "llvm") [ + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "--with-llvm-config=${llvm.dev}/bin/llvm-config" ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsLLVMJit [ + "--with-llvm-jit" + ] + ++ lib.optionals backendIsGCC [ "--with-gcc=gcc-${gcc13.cc.version}" ]; - buildPhase = lib.optionalString (backend == "gcc") '' + buildPhase = lib.optionalString backendIsGCC '' make copy-sources mkdir gcc-objs cd gcc-objs @@ -93,14 +106,14 @@ stdenv.mkDerivation (finalAttrs: { --with-mpfr-include=${mpfr.dev}/include \ --with-mpfr-lib=${mpfr.out}/lib \ --with-mpc=${libmpc} \ - --enable-default-pie=${if stdenv.targetPlatform.hasSharedLibraries then "yes" else "no"} + --enable-default-pie=${lib.boolToYesNo stdenv.targetPlatform.hasSharedLibraries} make -j $NIX_BUILD_CORES make install cd ../ make -j $NIX_BUILD_CORES ghdllib ''; - postFixup = lib.optionalString (backend == "llvm" || backend == "gcc") '' + postFixup = lib.optionalString (backendIsLLVM || backendIsGCC) '' wrapProgram $out/bin/ghdl \ --set LIBRARY_PATH ${lib.makeLibraryPath [ zlib ]} \ --prefix PATH : ${lib.makeBinPath [ stdenv.cc ]} @@ -108,7 +121,7 @@ stdenv.mkDerivation (finalAttrs: { hardeningDisable = [ ] - ++ lib.optionals (backend == "gcc") [ + ++ lib.optionals backendIsGCC [ # GCC compilation fails with format errors "format" ]; @@ -135,7 +148,10 @@ stdenv.mkDerivation (finalAttrs: { thoughtpolice sempiternal-aurora ]; - platforms = - lib.platforms.linux ++ lib.optionals (backend == "mcode" || backend == "llvm") [ "x86_64-darwin" ]; + platforms = [ + "x86_64-linux" + ] + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit || backendIsGCC) [ "aarch64-linux" ] + ++ lib.optionals (backendIsLLVM || backendIsLLVMJit) [ "aarch64-darwin" ]; }; }) diff --git a/pkgs/by-name/gh/ghdl/test-simple.nix b/pkgs/by-name/gh/ghdl/test-simple.nix index f83891172d28..341e141823fd 100644 --- a/pkgs/by-name/gh/ghdl/test-simple.nix +++ b/pkgs/by-name/gh/ghdl/test-simple.nix @@ -1,6 +1,7 @@ { - stdenv, + stdenvNoCC, ghdl-llvm, + ghdl-llvm-jit, ghdl-mcode, ghdl-gcc, backend, @@ -10,12 +11,14 @@ let ghdl = if backend == "llvm" then ghdl-llvm + else if backend == "llvm-jit" then + ghdl-llvm-jit else if backend == "gcc" then ghdl-gcc else ghdl-mcode; in -stdenv.mkDerivation { +stdenvNoCC.mkDerivation { name = "ghdl-test-simple"; meta.timeout = 300; nativeBuildInputs = [ ghdl ]; diff --git a/pkgs/by-name/gh/ghdorker/package.nix b/pkgs/by-name/gh/ghdorker/package.nix index 96c5bf424647..d0ac4064bca7 100644 --- a/pkgs/by-name/gh/ghdorker/package.nix +++ b/pkgs/by-name/gh/ghdorker/package.nix @@ -36,7 +36,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Extensible GitHub dorking tool"; mainProgram = "ghdorker"; homepage = "https://github.com/dtaivpp/ghdorker"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gh/ghorg/package.nix b/pkgs/by-name/gh/ghorg/package.nix index 5115f59acb52..c11ff85a8680 100644 --- a/pkgs/by-name/gh/ghorg/package.nix +++ b/pkgs/by-name/gh/ghorg/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "ghorg"; - version = "1.11.10"; + version = "1.11.12"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-LgbvCXmyiNBGTY+IYBWNGThtc00AC2rXelYG8PAFdOg="; + sha256 = "sha256-KOXUbjaw1TL6Q/fRXTU5fFkxgs1jJ5GcKbn7VVbAipY="; }; doCheck = false; diff --git a/pkgs/by-name/gh/ghost-complete/package.nix b/pkgs/by-name/gh/ghost-complete/package.nix index 8e21d5edc8e4..5b845d9fb6c0 100644 --- a/pkgs/by-name/gh/ghost-complete/package.nix +++ b/pkgs/by-name/gh/ghost-complete/package.nix @@ -8,13 +8,13 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ghost-complete"; - version = "0.16.0"; + version = "0.18.0"; src = fetchFromGitHub { owner = "StanMarek"; repo = "ghost-complete"; tag = "v${finalAttrs.version}"; - hash = "sha256-SL0PRGppuiglP/BStlvc//6dn2lP472lLfhz3Hq7ZVw="; + hash = "sha256-AOhH98qGHISf8AZw3MSMnS5ADL6wQJ5jlo4PXsw7CAo="; }; __structuredAttrs = true; @@ -27,7 +27,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '"-C", "link-arg=-fuse-ld=/usr/bin/ld",' "" ''; - cargoHash = "sha256-F568kxHWcbBQuAwUpkT1AwAr/u486/k094wVmB9SiqY="; + cargoHash = "sha256-l1Gp9FVtrGhzobM2Wdq110y1W7V6PNsQsJLBJ3sgOEs="; cargoBuildFlags = [ "--package=ghost-complete" ]; diff --git a/pkgs/by-name/gh/ghostfolio/package.nix b/pkgs/by-name/gh/ghostfolio/package.nix index 04d19f30a190..19d8af496cb4 100644 --- a/pkgs/by-name/gh/ghostfolio/package.nix +++ b/pkgs/by-name/gh/ghostfolio/package.nix @@ -12,13 +12,13 @@ buildNpmPackage (finalAttrs: { pname = "ghostfolio"; - version = "3.3.0"; + version = "3.29.0"; src = fetchFromGitHub { owner = "ghostfolio"; repo = "ghostfolio"; tag = finalAttrs.version; - hash = "sha256-74CqCDyLrn3//FiTfo6xR5jLyo4jU+daBF9ES/uQE3E="; + hash = "sha256-fmYE942D91beGxCnJ5Kc8fdLbsgu9/VWe+9Gd/dMYIs="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -28,7 +28,7 @@ buildNpmPackage (finalAttrs: { ''; }; - npmDepsHash = "sha256-klWmB6LYf6h1WPi3AasDrdVdaPCyb5ePWuO9zqMcXys="; + npmDepsHash = "sha256-DqPCKW5axDToe0iboe9MF6ea4TNif3Oo5jOzWlMnQas="; postPatch = '' substituteInPlace replace.build.mjs \ diff --git a/pkgs/by-name/gh/ghostscript/package.nix b/pkgs/by-name/gh/ghostscript/package.nix index 36b9ced6f56b..6cd7c4b18ed1 100644 --- a/pkgs/by-name/gh/ghostscript/package.nix +++ b/pkgs/by-name/gh/ghostscript/package.nix @@ -67,13 +67,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ghostscript${lib.optionalString x11Support "-with-X"}"; - version = "10.07.0"; + version = "10.07.1"; src = fetchurl { url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${ lib.replaceStrings [ "." ] [ "" ] finalAttrs.version }/ghostscript-${finalAttrs.version}.tar.xz"; - hash = "sha256-3azk4XIflnpVA5uv9WSEAiXguqHU9UMiR8oczRRzt8E="; + hash = "sha256-HNt2bejbjx5YnIF/CcWFXqX2XfyFQORlpprBTBhBYCU="; }; patches = [ @@ -233,6 +233,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.ghostscript.com/"; + changelog = "https://ghostscript.readthedocs.io/en/gs${finalAttrs.version}/News.html"; description = "PostScript interpreter (mainline version)"; longDescription = '' Ghostscript is the name of a set of tools that provides (i) an diff --git a/pkgs/by-name/gh/ghostunnel/package.nix b/pkgs/by-name/gh/ghostunnel/package.nix index ae3525d3315a..9af77d72cbd5 100644 --- a/pkgs/by-name/gh/ghostunnel/package.nix +++ b/pkgs/by-name/gh/ghostunnel/package.nix @@ -1,5 +1,4 @@ { - stdenv, buildGoModule, fetchFromGitHub, lib, @@ -9,16 +8,21 @@ buildGoModule rec { pname = "ghostunnel"; - version = "1.8.4"; + version = "1.10.0"; src = fetchFromGitHub { owner = "ghostunnel"; repo = "ghostunnel"; rev = "v${version}"; - hash = "sha256-NnRm1HEdfK6WI5ntilLSwdR2B5czG5CIcMFzl2TzEds="; + hash = "sha256-BntQCauAgnaiNn31nrVEsHFvQv7zK6D0z/rInbCVTr0="; }; - vendorHash = "sha256-vP8OtjpYNMm1KkNfD3pmNrHh3HRy1GkzUbfLKWKhHbo="; + patches = [ + # upstream left an untidied go.mod/go.sum in v1.10.0 + ./pkg-errors.patch + ]; + + vendorHash = "sha256-pd7fTP0BAgpd4mD8ZG8Ak9fFF2sC0JGCDbPG8tAnWvw="; deleteVendor = true; diff --git a/pkgs/by-name/gh/ghostunnel/pkg-errors.patch b/pkgs/by-name/gh/ghostunnel/pkg-errors.patch new file mode 100644 index 000000000000..4b316b956d7f --- /dev/null +++ b/pkgs/by-name/gh/ghostunnel/pkg-errors.patch @@ -0,0 +1,26 @@ +diff --git a/go.mod b/go.mod +index d06c2e9117..f560c1cc69 100644 +--- a/go.mod ++++ b/go.mod +@@ -192,6 +192,7 @@ + github.com/nwaples/rardecode v1.1.3 // indirect + github.com/pelletier/go-toml/v2 v2.3.0 // indirect + github.com/pierrec/lz4 v2.6.1+incompatible // indirect ++ github.com/pkg/errors v0.9.1 // indirect + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect + github.com/prometheus/client_model v0.6.2 // indirect + github.com/prometheus/common v0.67.5 // indirect +diff --git a/go.sum b/go.sum +index 4dea0025f3..1edce71302 100644 +--- a/go.sum ++++ b/go.sum +@@ -460,6 +460,9 @@ + github.com/pierrec/lz4 v2.6.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY= + github.com/pires/go-proxyproto v0.11.0 h1:gUQpS85X/VJMdUsYyEgyn59uLJvGqPhJV5YvG68wXH4= + github.com/pires/go-proxyproto v0.11.0/go.mod h1:ZKAAyp3cgy5Y5Mo4n9AlScrkCZwUy0g3Jf+slqQVcuU= ++github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= ++github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4= ++github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= + github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 h1:Jamvg5psRIccs7FGNTlIRMkT8wgtp5eCXdBlqhYGL6U= + github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix index b70cb048ff07..a5549bc3a238 100644 --- a/pkgs/by-name/gh/ghq/package.nix +++ b/pkgs/by-name/gh/ghq/package.nix @@ -11,16 +11,16 @@ buildGo126Module (finalAttrs: { pname = "ghq"; - version = "1.9.4"; + version = "1.10.1"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-z7tLCSThR4EFLk8GnyrB8H6d/9t5AKegVEdzlleCS94="; + sha256 = "sha256-SmcgBwd5k/lAv9bwYRpkIM0fil2ajSlT8zznP7bgpDk="; }; - vendorHash = "sha256-/uk1hf5eXpNULKm7UeVgQ7Lc7YOU+eV9Yd/4lYorz/8="; + vendorHash = "sha256-8aC1J/mM7ZTEQBdZwstvHxMKDPqgzjzYztC7shuwu/Q="; doCheck = false; diff --git a/pkgs/by-name/gh/ghqr/package.nix b/pkgs/by-name/gh/ghqr/package.nix index 6c47091a4ed9..b9003ddec899 100644 --- a/pkgs/by-name/gh/ghqr/package.nix +++ b/pkgs/by-name/gh/ghqr/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "ghqr"; - version = "0.4.3"; + version = "0.5.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "microsoft"; repo = "ghqr"; tag = "v.${finalAttrs.version}"; - hash = "sha256-KKuxl8odNdMom8l524Mac+sM/5ZdtpakLqazZDQcXJs="; + hash = "sha256-MpCOeKMqLyZd2N1XL7bUHuCM7AjLgsHzQ1plUKMWn50="; }; - vendorHash = "sha256-la/yXEZzAIt9l0q0P7+N8yCW0BQie9sLmAhLFK1qyGE="; + vendorHash = "sha256-8lyQ1LDT1GAs+UDOpLxI/6BneU6Hqyt+PWsZIkq2rHY="; ldflags = [ "-s" diff --git a/pkgs/by-name/gh/ghr-cli/package.nix b/pkgs/by-name/gh/ghr-cli/package.nix index 67d0ae0a7b34..1b5c81832a3f 100644 --- a/pkgs/by-name/gh/ghr-cli/package.nix +++ b/pkgs/by-name/gh/ghr-cli/package.nix @@ -4,11 +4,12 @@ fetchFromGitHub, nix-update-script, gitMinimal, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "ghr-cli"; - version = "0.8.1"; + version = "0.8.2"; __structuredAttrs = true; @@ -16,10 +17,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "chenyukang"; repo = "ghr"; tag = "v${finalAttrs.version}"; - hash = "sha256-lo8a5EhLslqjnUG/xM8XFU1x1Eam47lFD8KRMzuCSD4="; + hash = "sha256-ELYWoGUP6s2Trtnk9zgDLlT7MtaiHzfsFbzH+LmsKDE="; }; - cargoHash = "sha256-PtnQVdW9yC2309047PFt/HXV1QyqNttZ0zJ8hocLRAo="; + cargoHash = "sha256-siMxS08K+7L8f9A32gEWwQF9PAQh5UPMA+xTkTlz13o="; passthru.updateScript = nix-update-script { }; @@ -27,6 +28,12 @@ rustPlatform.buildRustPackage (finalAttrs: { gitMinimal ]; + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + meta = { description = "Fast terminal workspace for staying on top of GitHub"; homepage = "https://catcoding.me/ghr/"; diff --git a/pkgs/by-name/gi/giada/package.nix b/pkgs/by-name/gi/giada/package.nix index c76f5c574370..650f37868857 100644 --- a/pkgs/by-name/gi/giada/package.nix +++ b/pkgs/by-name/gi/giada/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "giada"; - version = "1.4.2"; + version = "1.5.0"; src = fetchFromGitHub { owner = "monocasual"; repo = "giada"; tag = finalAttrs.version; - hash = "sha256-GVK/VyqRatxptuQGINaev5RVmafZNxogdKUzC5b4ns4="; + hash = "sha256-AceH2FO75WF/Cmk3wd6u495M277iuZp/21nBl3K4jHU="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gi/gickup/package.nix b/pkgs/by-name/gi/gickup/package.nix index 1410b566346a..f68b4695e941 100644 --- a/pkgs/by-name/gi/gickup/package.nix +++ b/pkgs/by-name/gi/gickup/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gickup"; - version = "0.10.44"; + version = "0.10.45"; src = fetchFromGitHub { owner = "cooperspencer"; repo = "gickup"; tag = "v${finalAttrs.version}"; - hash = "sha256-AbeV/0CngNgCaLUIwv/uy8VgpiKiOXWGSjnW+xrd7gk="; + hash = "sha256-oVvL5BZYZZCfkGK9ABcppbddKuzykZv1OtBvKElaStI="; }; - vendorHash = "sha256-lCeUEReVh0Fg1gyyTvWq2CIdQLuGCN20u9TftiokI0I="; + vendorHash = "sha256-2SwjvITyo6z34MZ7gSbSQ1PeW0aO4MRi2DzYgqGcOvk="; ldflags = [ "-X main.version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/gi/gif-for-cli/package.nix b/pkgs/by-name/gi/gif-for-cli/package.nix index 8afdc6765c1d..ed278a90506d 100644 --- a/pkgs/by-name/gi/gif-for-cli/package.nix +++ b/pkgs/by-name/gi/gif-for-cli/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { pname = "gif-for-cli"; version = "1.1.2"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "google"; @@ -30,16 +30,22 @@ python3Packages.buildPythonApplication { ]; # coverage is not needed to build and test this package + # The symlinking of third_party in setup.py doesn't work correctly with pyproject = true, so we copy instead postPatch = '' sed -i '/coverage>=/d' setup.py + cp -r third_party gif_for_cli ''; + build-system = with python3Packages; [ + setuptools + ]; + buildInputs = [ zlib libjpeg ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ ffmpeg pillow requests @@ -51,7 +57,10 @@ python3Packages.buildPythonApplication { longDescription = "Takes in a GIF, short video, or a query to the Tenor GIF API and converts it to animated ASCII art."; homepage = "https://github.com/google/gif-for-cli"; license = lib.licenses.asl20; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + ambossmann + Scriptkiddi + ]; mainProgram = "gif-for-cli"; }; } diff --git a/pkgs/by-name/gi/giflib/0001-Suppress-undefined-symbol-error-on-Darwin.patch b/pkgs/by-name/gi/giflib/0001-Suppress-undefined-symbol-error-on-Darwin.patch new file mode 100644 index 000000000000..461f4d06512a --- /dev/null +++ b/pkgs/by-name/gi/giflib/0001-Suppress-undefined-symbol-error-on-Darwin.patch @@ -0,0 +1,25 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Randy Eckenrode +Date: Sun, 14 Jun 2026 10:49:22 -0400 +Subject: [PATCH] Suppress undefined symbol error on Darwin + +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index f347162..720bffa 100644 +--- a/Makefile ++++ b/Makefile +@@ -133,7 +133,7 @@ libgif.a: $(OBJECTS) $(HEADERS) + + $(LIBUTILSO): $(UOBJECTS) $(UHEADERS) + ifeq ($(UNAME), Darwin) +- $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(UOBJECTS) -o $(LIBUTILSO) ++ $(CC) $(CFLAGS) -dynamiclib -current_version $(LIBVER) $(UOBJECTS) -Wl,-U,_GifErrorString -o $(LIBUTILSO) + else + $(CC) $(CFLAGS) $(CPPLAGS) -shared $(LDFLAGS) -Wl,-soname -Wl,$(LIBUTILSOMAJOR) -o $(LIBUTILSO) $(UOBJECTS) + endif +-- +2.54.0 + diff --git a/pkgs/by-name/gi/giflib/CVE-2021-40633.patch b/pkgs/by-name/gi/giflib/CVE-2021-40633.patch deleted file mode 100644 index 8a665bb1638b..000000000000 --- a/pkgs/by-name/gi/giflib/CVE-2021-40633.patch +++ /dev/null @@ -1,26 +0,0 @@ -From ccbc956432650734c91acb3fc88837f7b81267ff Mon Sep 17 00:00:00 2001 -From: "Eric S. Raymond" -Date: Wed, 21 Feb 2024 18:55:00 -0500 -Subject: [PATCH] Clean up memory better at end of run (CVE-2021-40633) - ---- - gif2rgb.c | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/gif2rgb.c b/gif2rgb.c -index d51226d..fc2e683 100644 ---- a/gif2rgb.c -+++ b/gif2rgb.c -@@ -517,6 +517,9 @@ static void GIF2RGB(int NumFiles, char *FileName, bool OneFileFlag, - DumpScreen2RGB(OutFileName, OneFileFlag, ColorMap, ScreenBuffer, - GifFile->SWidth, GifFile->SHeight); - -+ for (i = 0; i < GifFile->SHeight; i++) { -+ (void)free(ScreenBuffer[i]); -+ } - (void)free(ScreenBuffer); - - { --- -2.44.0 - diff --git a/pkgs/by-name/gi/giflib/CVE-2025-31344.patch b/pkgs/by-name/gi/giflib/CVE-2025-31344.patch deleted file mode 100644 index 04ef6c3ba755..000000000000 --- a/pkgs/by-name/gi/giflib/CVE-2025-31344.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up giflib-5.2.2/gif2rgb.c.omv~ giflib-5.2.2/gif2rgb.c ---- giflib-5.2.2/gif2rgb.c.omv~ 2025-04-07 21:44:54.956355983 +0200 -+++ giflib-5.2.2/gif2rgb.c 2025-04-07 21:45:29.630769589 +0200 -@@ -329,6 +329,11 @@ static void DumpScreen2RGB(char *FileNam - GifRow = ScreenBuffer[i]; - GifQprintf("\b\b\b\b%-4d", ScreenHeight - i); - for (j = 0; j < ScreenWidth; j++) { -+ /* Check if color is within color palete */ -+ if (GifRow[j] >= ColorMap->ColorCount) { -+ GIF_EXIT(GifErrorString( -+ D_GIF_ERR_IMAGE_DEFECT)); -+ } - ColorMapEntry = &ColorMap->Colors[GifRow[j]]; - Buffers[0][j] = ColorMapEntry->Red; - Buffers[1][j] = ColorMapEntry->Green; diff --git a/pkgs/by-name/gi/giflib/package.nix b/pkgs/by-name/gi/giflib/package.nix index 579cbd5a3e3c..1fa7deb61a00 100644 --- a/pkgs/by-name/gi/giflib/package.nix +++ b/pkgs/by-name/gi/giflib/package.nix @@ -3,21 +3,33 @@ lib, fetchurl, fixDarwinDylibNames, + + # for passthru.tests + SDL2_image, + SDL_image, + gdal, + imlib2, + leptonica, + libjxl, + libwebp, + openimageio, + openjdk, pkgsStatic, }: stdenv.mkDerivation (finalAttrs: { pname = "giflib"; - version = "5.2.2"; + version = "6.1.3"; src = fetchurl { url = "mirror://sourceforge/giflib/giflib-${finalAttrs.version}.tar.gz"; - hash = "sha256-vn/70FfK3r4qoURUL9kMaDjGoIO16KkEi47jtmsp1fs="; + hash = "sha256-tltmuZ8EJLk1JfmHOG8i/F77naK/ySrUpTIkmq/7qw4="; }; patches = [ - ./CVE-2021-40633.patch - ./CVE-2025-31344.patch + # Fix missing symbol error on Darwin when linking libutil.dylib. + # Based on discussion in https://sourceforge.net/p/giflib/bugs/189/. + ./0001-Suppress-undefined-symbol-error-on-Darwin.patch ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ # Build dll libraries. @@ -54,6 +66,16 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests = { static = pkgsStatic.giflib; + inherit + SDL2_image + SDL_image + gdal + imlib2 + leptonica + libjxl + openimageio + openjdk + ; }; meta = { diff --git a/pkgs/by-name/gi/gilt-rs/package.nix b/pkgs/by-name/gi/gilt-rs/package.nix new file mode 100644 index 000000000000..bd6d74053f5d --- /dev/null +++ b/pkgs/by-name/gi/gilt-rs/package.nix @@ -0,0 +1,28 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "gilt-rs"; + version = "0.3.6"; + + src = fetchFromGitHub { + owner = "simonhollingshead"; + repo = "gilt-rs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rW5uHRqGq8CBl+4eZo/1W0T7km+mRI2oFN0FU30To8Q="; + }; + + cargoHash = "sha256-oVHNBg6umFsPWBVIZEMBc6AB1SFqHMAxwuTa3cIyKjE="; + + __structuredAttrs = true; + + meta = { + description = "Tool for calculating which UK Gilt will give the best return if held to maturity"; + homepage = "https://github.com/simonhollingshead/gilt-rs"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ambroisie ]; + }; +}) diff --git a/pkgs/by-name/gi/giph/package.nix b/pkgs/by-name/gi/giph/package.nix index f1fba37b2cb2..0be11bef8b16 100644 --- a/pkgs/by-name/gi/giph/package.nix +++ b/pkgs/by-name/gi/giph/package.nix @@ -2,7 +2,7 @@ stdenvNoCC, lib, fetchFromGitHub, - ffmpeg, + ffmpeg-full, xdotool, slop, libnotify, @@ -33,7 +33,7 @@ stdenvNoCC.mkDerivation rec { wrapProgram $out/bin/giph \ --prefix PATH : ${ lib.makeBinPath [ - ffmpeg + ffmpeg-full xdotool libnotify slop diff --git a/pkgs/by-name/gi/gir-rs/package.nix b/pkgs/by-name/gi/gir-rs/package.nix index 5bb5ce06c398..a4b16ffd69f6 100644 --- a/pkgs/by-name/gi/gir-rs/package.nix +++ b/pkgs/by-name/gi/gir-rs/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { meta = { description = "Tool to generate rust bindings and user API for glib-based libraries"; homepage = "https://github.com/gtk-rs/gir/"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ anish ]; mainProgram = "gir"; }; diff --git a/pkgs/by-name/gi/git-absorb/package.nix b/pkgs/by-name/gi/git-absorb/package.nix index 711a366e1d26..e2cc2d6c46df 100644 --- a/pkgs/by-name/gi/git-absorb/package.nix +++ b/pkgs/by-name/gi/git-absorb/package.nix @@ -49,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/tummychow/git-absorb"; description = "git commit --fixup, but automatic"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix index fb9c6fcebb7d..a6f8b99fd3c9 100644 --- a/pkgs/by-name/gi/git-annex-remote-rclone/package.nix +++ b/pkgs/by-name/gi/git-annex-remote-rclone/package.nix @@ -11,7 +11,7 @@ stdenvNoCC.mkDerivation rec { version = "0.8"; src = fetchFromGitHub { - owner = "DanielDent"; + owner = "git-annex-remote-rclone"; repo = "git-annex-remote-rclone"; rev = "v${version}"; sha256 = "sha256-B6x67XXE4BHd3x7a8pQlqPPmpy0c62ziDAldB4QpqQ4="; @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation rec { ''; meta = { - homepage = "https://github.com/DanielDent/git-annex-remote-rclone"; + homepage = "https://github.com/git-annex-remote-rclone/git-annex-remote-rclone"; description = "Use rclone supported cloud storage providers with git-annex"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gi/git-backup-go/package.nix b/pkgs/by-name/gi/git-backup-go/package.nix index 3dcaac1ff9f4..307699a04fbb 100644 --- a/pkgs/by-name/gi/git-backup-go/package.nix +++ b/pkgs/by-name/gi/git-backup-go/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "git-backup-go"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "ChappIO"; repo = "git-backup"; rev = "v${finalAttrs.version}"; - hash = "sha256-Z32ThzmGkF89wsYqJnP/Koz4/2mulkrvvnUKHE6Crks="; + hash = "sha256-xpHrBGgPH2dnbDz49OBntdHbowMhoz3P7k8UlNN7ku8="; }; - vendorHash = "sha256-BLnnwwCrJJd8ihpgfdWel7l8aAIVVJBIpE+97J9ojPo="; + vendorHash = "sha256-xP2bV3vD4CbMGVT+MK4wJgMbIBZLvyqiMOfgj8Rc38Y="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/gi/git-bug-migration/package.nix b/pkgs/by-name/gi/git-bug-migration/package.nix index 62d838767ffc..2825f58d1e62 100644 --- a/pkgs/by-name/gi/git-bug-migration/package.nix +++ b/pkgs/by-name/gi/git-bug-migration/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.3.4"; src = fetchFromGitHub { - owner = "MichaelMure"; + owner = "git-bug"; repo = "git-bug-migration"; rev = "v${finalAttrs.version}"; hash = "sha256-IOBgrU3C0ZHD2wx9LRVgKEJzDlUj6z2UXlHGU3tdTdQ="; @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { meta = { description = "Tool for upgrading repositories using git-bug to new versions"; - homepage = "https://github.com/MichaelMure/git-bug-migration"; + homepage = "https://github.com/git-bug/git-bug-migration"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ DeeUnderscore diff --git a/pkgs/by-name/gi/git-credential-manager/package.nix b/pkgs/by-name/gi/git-credential-manager/package.nix index 71cddaeae4cf..bcefa224c2cd 100644 --- a/pkgs/by-name/gi/git-credential-manager/package.nix +++ b/pkgs/by-name/gi/git-credential-manager/package.nix @@ -58,7 +58,7 @@ buildDotnetModule rec { meta = { description = "Secure, cross-platform Git credential storage with authentication to GitHub, Azure Repos, and other popular Git hosting services"; homepage = "https://github.com/git-ecosystem/git-credential-manager"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ _999eagle ]; longDescription = '' diff --git a/pkgs/by-name/gi/git-crypt/package.nix b/pkgs/by-name/gi/git-crypt/package.nix index aeb5635f37a4..8f6eb5bb0ab2 100644 --- a/pkgs/by-name/gi/git-crypt/package.nix +++ b/pkgs/by-name/gi/git-crypt/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { entire repository. ''; downloadPage = "https://github.com/AGWA/git-crypt/releases"; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ dochang ]; platforms = lib.platforms.unix; mainProgram = "git-crypt"; diff --git a/pkgs/by-name/gi/git-gamble/package.nix b/pkgs/by-name/gi/git-gamble/package.nix index 3ce94ac84e06..cccfb68ae07b 100644 --- a/pkgs/by-name/gi/git-gamble/package.nix +++ b/pkgs/by-name/gi/git-gamble/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-gamble"; - version = "2.14.2"; + version = "2.14.6"; src = fetchFromGitLab { owner = "pinage404"; repo = "git-gamble"; - rev = "version/${finalAttrs.version}"; - hash = "sha256-UPiktBeMPZf9vrKz5XFyMzBJtxCe0ojJabeIwhyo9/g="; + rev = "v${finalAttrs.version}"; + hash = "sha256-+YjAXELI4AnHTZ7PvBWhvu3BQP7kys5VV2EllyABYKo="; }; - cargoHash = "sha256-yMlb3c2V3NUFw/GDPyCqTCSz+YLn3F9wmeP12jTySCI="; + cargoHash = "sha256-UHj/rhL9/r/UUtlgqTgMr9jFNRwwFDrfltyB5PyZanM="; nativeCheckInputs = [ gitMinimal ]; preCheck = '' @@ -27,17 +27,20 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; checkFlags = [ # this test can be flaky ; help is needed to stabilize it in upstream - "--skip=git_time_keeper::white_box::lock_file::create_as_many_as_lock_files_when_starting_several_times" + "--skip=git_gamble::cancel_command_with_signal::fail_when_git_is_killed" ]; nativeBuildInputs = [ - installShellFiles makeWrapper + installShellFiles ]; postInstall = '' wrapProgram $out/bin/git-gamble \ --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}" + wrapProgram $out/bin/git-time-keeper \ + --prefix PATH : "${lib.makeBinPath [ gitMinimal ]}" + export PATH="$PATH:$out/bin/" sh ./script/generate_completion.sh target/release/shell_completions/ @@ -53,14 +56,14 @@ rustPlatform.buildRustPackage (finalAttrs: { passthru.updateScript = nix-update-script { extraArgs = [ "--version-regex" - "version/(.*)" + "v(.*)" ]; }; meta = { description = "Tool that blends TDD (Test Driven Development) + TCR (`test && commit || revert`)"; homepage = "https://git-gamble.is-cool.dev"; - changelog = "https://gitlab.com/pinage404/git-gamble/-/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://git-gamble.is-cool.dev/changelog/${finalAttrs.version}.html"; license = lib.licenses.isc; sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ lib.maintainers.pinage404 ]; diff --git a/pkgs/by-name/gi/git-gr/package.nix b/pkgs/by-name/gi/git-gr/package.nix index fdfd2141f396..5fc3aa0fb75a 100644 --- a/pkgs/by-name/gi/git-gr/package.nix +++ b/pkgs/by-name/gi/git-gr/package.nix @@ -57,7 +57,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-gr"; changelog = "https://github.com/9999years/git-gr/releases/tag/v${version}"; description = "Gerrit CLI client"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-gr"; }; diff --git a/pkgs/by-name/gi/git-graph/package.nix b/pkgs/by-name/gi/git-graph/package.nix index e582b795899f..48a9acc8f009 100644 --- a/pkgs/by-name/gi/git-graph/package.nix +++ b/pkgs/by-name/gi/git-graph/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.7.0"; src = fetchFromGitHub { - owner = "mlange-42"; + owner = "git-bahn"; repo = "git-graph"; tag = "v${finalAttrs.version}"; hash = "sha256-9GFwxWYDnH3kKDWpxgh7ciSLB1Zr2zExxIrIrhycmZY="; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command line tool to show clear git graphs arranged for your branching model"; - homepage = "https://github.com/mlange-42/git-graph"; + homepage = "https://github.com/git-bahn/git-graph"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ cafkafk diff --git a/pkgs/by-name/gi/git-igitt/package.nix b/pkgs/by-name/gi/git-igitt/package.nix index 1ae12698e0d0..97a9dabda083 100644 --- a/pkgs/by-name/gi/git-igitt/package.nix +++ b/pkgs/by-name/gi/git-igitt/package.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.1.21"; src = fetchFromGitHub { - owner = "mlange-42"; + owner = "git-bahn"; repo = "git-igitt"; rev = "v${finalAttrs.version}"; hash = "sha256-5AVKBew+HShWFZwm4xRmRSL76N2c84Yi97jgcqsslxM="; @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Interactive, cross-platform Git terminal application with clear git graphs arranged for your branching model"; - homepage = "https://github.com/mlange-42/git-igitt"; + homepage = "https://github.com/git-bahn/git-igitt"; license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; maintainers = [ lib.maintainers.pinage404 ]; diff --git a/pkgs/by-name/gi/git-imerge/package.nix b/pkgs/by-name/gi/git-imerge/package.nix index 4dfc8f3dd6e6..ae949bde3a68 100644 --- a/pkgs/by-name/gi/git-imerge/package.nix +++ b/pkgs/by-name/gi/git-imerge/package.nix @@ -1,20 +1,24 @@ { lib, python3Packages, - fetchPypi, + fetchFromGitHub, installShellFiles, }: python3Packages.buildPythonApplication (finalAttrs: { pname = "git-imerge"; version = "1.2.0"; - format = "setuptools"; + pyproject = true; - src = fetchPypi { - inherit (finalAttrs) pname version; - sha256 = "df5818f40164b916eb089a004a47e5b8febae2b4471a827e3aaa4ebec3831a3f"; + src = fetchFromGitHub { + owner = "mhagger"; + repo = "git-imerge"; + tag = "v${finalAttrs.version}"; + hash = "sha256-17xUe1N4igx5HOZBU+q7UQxkpHOFQozhR18hUYuPVuo="; }; + build-system = [ python3Packages.setuptools ]; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' diff --git a/pkgs/by-name/gi/git-lfs/package.nix b/pkgs/by-name/gi/git-lfs/package.nix index 345aa81d8370..f77729d8594b 100644 --- a/pkgs/by-name/gi/git-lfs/package.nix +++ b/pkgs/by-name/gi/git-lfs/package.nix @@ -21,7 +21,8 @@ buildGoModule (finalAttrs: { hash = "sha256-N5ckTnyA3mueZre+rMhFZBiAFgEu4pmtzkiUidXnan8="; }; - vendorHash = "sha256-6H0KpLin+DqwEg5bdzaxj2CoNSneZ/ET43MTrrdF3h8="; + proxyVendor = true; + vendorHash = "sha256-SUnZ9uN43CAw/iHC8cPBm3nYD03d3Pg2pYS2PwjDCnE="; nativeBuildInputs = [ asciidoctor @@ -37,7 +38,7 @@ buildGoModule (finalAttrs: { subPackages = [ "." ]; preBuild = '' - GOARCH= go generate ./commands + CC= GOOS= GOARCH= go generate ./commands ''; postBuild = '' diff --git a/pkgs/by-name/gi/git-ls/package.nix b/pkgs/by-name/gi/git-ls/package.nix index 2653b1e7a374..50b39e921d7c 100644 --- a/pkgs/by-name/gi/git-ls/package.nix +++ b/pkgs/by-name/gi/git-ls/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "git-ls"; - version = "7.0.1"; + version = "7.1.2"; __structuredAttrs = true; strictDeps = true; @@ -18,7 +18,7 @@ buildGoModule (finalAttrs: { owner = "llimllib"; repo = "git-ls"; tag = "v${finalAttrs.version}"; - hash = "sha256-2D82VbOf/NPCXHNraiOfWwRthKElg1AgNr8dxY41AiA="; + hash = "sha256-g+LFQEud4nF+3hRaH8JcjQHx6Ol2LDRRP2HdQ2oLfls="; }; vendorHash = "sha256-Bk6IBG+BrqY4FNVIlbSSSnqqAeL+8SJUtRXuIp4e8f8="; diff --git a/pkgs/by-name/gi/git-machete/package.nix b/pkgs/by-name/gi/git-machete/package.nix index d3a7763334ef..865082ddc1cd 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 (finalAttrs: { pname = "git-machete"; - version = "3.41.0"; + version = "3.44.1"; pyproject = true; src = fetchFromGitHub { owner = "virtuslab"; repo = "git-machete"; tag = "v${finalAttrs.version}"; - hash = "sha256-3BofEBgHgtdpQeaMx1BaNtDQ/HmX3GYagKOVHGq1+os="; + hash = "sha256-OqNfKqp3nOXij9dSvStmRyYIQOF91F+pA+9rSGPp7gQ="; }; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/gi/git-metrics/package.nix b/pkgs/by-name/gi/git-metrics/package.nix index d5b1bb5b5590..1072b3574423 100644 --- a/pkgs/by-name/gi/git-metrics/package.nix +++ b/pkgs/by-name/gi/git-metrics/package.nix @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { homepage = "https://github.com/jdrouet/git-metrics"; description = "Git extension to be able to track metrics about your project, within the git repository"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer ]; diff --git a/pkgs/by-name/gi/git-mit/package.nix b/pkgs/by-name/gi/git-mit/package.nix index e42a226eda64..635e1cf27b80 100644 --- a/pkgs/by-name/gi/git-mit/package.nix +++ b/pkgs/by-name/gi/git-mit/package.nix @@ -9,7 +9,7 @@ }: let - version = "6.0.11"; + version = "6.5.3"; in rustPlatform.buildRustPackage { pname = "git-mit"; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage { owner = "PurpleBooth"; repo = "git-mit"; tag = "v${version}"; - hash = "sha256-Hnmhvql7oTbNQnBvWlV60bxddH7H7intEsjfXhV4Z2Y="; + hash = "sha256-vk0TxbvjjFqyisyeet2s3mp7+aPb99Lp0iLU59+pNG0="; }; - cargoHash = "sha256-4HNr/m+n+M1BaL67Fo/S4A9EXBYOIp7il0sAtm4rSQc="; + cargoHash = "sha256-54s4Jnc6C6ysQnQ4AyxxghbTVVkud4KrZ9wLZ83OZmQ="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/gi/git-pages-cli/package.nix b/pkgs/by-name/gi/git-pages-cli/package.nix index a4fb358e4ea8..98760b019b25 100644 --- a/pkgs/by-name/gi/git-pages-cli/package.nix +++ b/pkgs/by-name/gi/git-pages-cli/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "git-pages-cli"; - version = "1.9.0"; + version = "1.10.0"; __structuredAttrs = true; @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { owner = "git-pages"; repo = "git-pages-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-toqL/BUj3MDAqqD+94nLyw7QwU5jsUqThQVK0hJbU8Y="; + hash = "sha256-GIZ6kdCd8BIBEZxBw4Srwnbbl3PtpS2IRyA+Hx5PbAc="; }; vendorHash = "sha256-SNLSkz38AgLfjpKaEYawBLdWznKWOz62bNzuaquk7Rs="; diff --git a/pkgs/by-name/gi/git-pkgs/package.nix b/pkgs/by-name/gi/git-pkgs/package.nix index fed7f36bd933..3f63928cac74 100644 --- a/pkgs/by-name/gi/git-pkgs/package.nix +++ b/pkgs/by-name/gi/git-pkgs/package.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "git-pkgs"; - version = "0.16.2"; + version = "0.18.0"; src = fetchFromGitHub { owner = "git-pkgs"; repo = "git-pkgs"; tag = "v${version}"; - hash = "sha256-6AhA4CG4q6ujM3JSz5aUXvVG7vC5mL8DGiF4dO2kU3k="; + hash = "sha256-xGcyl1BMgGkrjr0QgarQWkBBsZa5lKGYFqUpnHQRJvw="; }; - vendorHash = "sha256-uram6wb0nTxVDy8PQa3R4os620S/XuDcTZkMhwNhd3A="; + vendorHash = "sha256-7wxcBDZKnTqBUsnQ7dznl8e5qHN1Ep4uJ4/nqc+oL3c="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gi/git-point/package.nix b/pkgs/by-name/gi/git-point/package.nix index 1420708e1cbc..75482bdd8d41 100644 --- a/pkgs/by-name/gi/git-point/package.nix +++ b/pkgs/by-name/gi/git-point/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage { lib.maintainers.qyriad lib.maintainers.philiptaron ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; sourceProvenance = [ lib.sourceTypes.fromSource ]; platforms = lib.platforms.all; mainProgram = "git-point"; diff --git a/pkgs/by-name/gi/git-privacy/package.nix b/pkgs/by-name/gi/git-privacy/package.nix index 21a2b06b9188..ecd8ed84e55c 100644 --- a/pkgs/by-name/gi/git-privacy/package.nix +++ b/pkgs/by-name/gi/git-privacy/package.nix @@ -46,7 +46,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { meta = { description = "Tool to redact Git author and committer dates"; homepage = "https://github.com/EMPRI-DEVOPS/git-privacy"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; mainProgram = "git-privacy"; }; diff --git a/pkgs/by-name/gi/git-prole/package.nix b/pkgs/by-name/gi/git-prole/package.nix index 42d96fef65ec..e23acdab7709 100644 --- a/pkgs/by-name/gi/git-prole/package.nix +++ b/pkgs/by-name/gi/git-prole/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage { homepage = "https://github.com/9999years/git-prole"; changelog = "https://github.com/9999years/git-prole/releases/tag/v${version}"; description = "`git-worktree(1)` manager"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-prole"; }; diff --git a/pkgs/by-name/gi/git-pw/package.nix b/pkgs/by-name/gi/git-pw/package.nix index ee710113a09d..c39da003e5b8 100644 --- a/pkgs/by-name/gi/git-pw/package.nix +++ b/pkgs/by-name/gi/git-pw/package.nix @@ -51,6 +51,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool for integrating Git with Patchwork, the web-based patch tracking system"; homepage = "https://github.com/getpatchwork/git-pw"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raitobezarius ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/gi/git-quick-stats/package.nix b/pkgs/by-name/gi/git-quick-stats/package.nix index eebf32503476..2b9295f3f650 100644 --- a/pkgs/by-name/gi/git-quick-stats/package.nix +++ b/pkgs/by-name/gi/git-quick-stats/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { repo = "git-quick-stats"; - owner = "arzzen"; + owner = "git-quick-stats"; rev = finalAttrs.version; sha256 = "sha256-YVvlrlNRDDci7fH9LW4NxZcIkakVgvKe9FhJ2gCfoXg="; }; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/arzzen/git-quick-stats"; + homepage = "https://github.com/git-quick-stats/git-quick-stats"; description = "Simple and efficient way to access various statistics in git repository"; platforms = lib.platforms.all; maintainers = [ lib.maintainers.kmein ]; diff --git a/pkgs/by-name/gi/git-remote-codecommit/package.nix b/pkgs/by-name/gi/git-remote-codecommit/package.nix index 2c714f837989..10ec05a8a88c 100644 --- a/pkgs/by-name/gi/git-remote-codecommit/package.nix +++ b/pkgs/by-name/gi/git-remote-codecommit/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, python3Packages, - awscli2, + awscli, }: python3Packages.buildPythonApplication (finalAttrs: { @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ botocore ]; nativeCheckInputs = [ - awscli2 + awscli ] ++ (with python3Packages; [ pytestCheckHook diff --git a/pkgs/by-name/gi/git-repo/package.nix b/pkgs/by-name/gi/git-repo/package.nix index 913ebe0ba977..d28573c0448c 100644 --- a/pkgs/by-name/gi/git-repo/package.nix +++ b/pkgs/by-name/gi/git-repo/package.nix @@ -1,9 +1,8 @@ { lib, stdenv, - fetchFromGitHub, + fetchFromGitiles, makeWrapper, - nix-update-script, python3, git, gnupg, @@ -13,13 +12,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-repo"; - version = "2.59"; + version = "2.65"; - src = fetchFromGitHub { - owner = "android"; - repo = "tools_repo"; + src = fetchFromGitiles { + url = "https://android.googlesource.com/tools/repo"; rev = "v${finalAttrs.version}"; - hash = "sha256-5ffk5B4ZA/Wy2bQNahFaXPFRSZdKz5t6TaGbN00mfxo="; + hash = "sha256-ToJj5WS74vwCAX53UB5zgy1K54y1gNK+1d4qQLmp1L8="; }; # Fix 'NameError: name 'ssl' is not defined' @@ -57,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = ./update.sh; }; meta = { @@ -70,7 +68,10 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://android.googlesource.com/tools/repo"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ otavio ]; + maintainers = with lib.maintainers; [ + otavio + ungeskriptet + ]; platforms = lib.platforms.unix; mainProgram = "repo"; }; diff --git a/pkgs/by-name/gi/git-repo/update.sh b/pkgs/by-name/gi/git-repo/update.sh new file mode 100755 index 000000000000..3b1531b75b87 --- /dev/null +++ b/pkgs/by-name/gi/git-repo/update.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts git +set -euo pipefail +latest_tag=$(list-git-tags --url="https://android.googlesource.com/tools/repo" | sort -V | tail -n1) +latest_tag=${latest_tag##v} +cd "$(git rev-parse --show-toplevel)" +update-source-version git-repo "$latest_tag" diff --git a/pkgs/by-name/gi/git-spice/package.nix b/pkgs/by-name/gi/git-spice/package.nix index 55341d1894b0..d408fd3fa2f7 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.29.2"; + version = "0.31.2"; src = fetchFromGitHub { owner = "abhinav"; repo = "git-spice"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZwhbsSFnzKZv8iEgI9tO2tekmzT7mh7w0+PXDyucuLw="; + hash = "sha256-0f7n27oSz6a3piaXA4jj7UWgS6Vl4WzRkHh5VAF3tGo="; }; - vendorHash = "sha256-t7nfOTHncSLounY1zR4idAmDmqj9znR2IUQA2xt0Drs="; + vendorHash = "sha256-xcU0B+ju1f/JfNVKpXkIy5SO9rd3O9Nl0FizW3kVgI0="; subPackages = [ "." ]; @@ -31,7 +31,6 @@ buildGoModule (finalAttrs: { ldflags = [ "-s" - "-w" "-X=main._version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/gi/git-statuses/package.nix b/pkgs/by-name/gi/git-statuses/package.nix index 29f1c6ea59c1..0c57ed4f0393 100644 --- a/pkgs/by-name/gi/git-statuses/package.nix +++ b/pkgs/by-name/gi/git-statuses/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "git-statuses"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "bircni"; repo = "git-statuses"; tag = finalAttrs.version; - hash = "sha256-p200nv8H/tuO48ZBsTQvM0JBGN4Yu58kXLhYl8AJxfc="; + hash = "sha256-hZ0/lC7Xjv+CDi2uucRa009nTCrKIrBFj3BbZsciJ2o="; }; - cargoHash = "sha256-MJekW/AzVe1dCr5La4+FKBeyGFAjN0fCBUiGnMoAtdI="; + cargoHash = "sha256-RMRATVe6NILxNiNVkcdv5x5BYVL5UUphtrrGRWN18KU="; # Needed to get openssl-sys to use pkg-config. env.OPENSSL_NO_VENDOR = 1; diff --git a/pkgs/by-name/gi/git-toolbelt/package.nix b/pkgs/by-name/gi/git-toolbelt/package.nix index 1fc88f93f85d..cceaacd277f5 100644 --- a/pkgs/by-name/gi/git-toolbelt/package.nix +++ b/pkgs/by-name/gi/git-toolbelt/package.nix @@ -9,13 +9,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "git-toolbelt"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "nvie"; repo = "git-toolbelt"; tag = "v${finalAttrs.version}"; - hash = "sha256-2jpgwB2DEoRtV+WGe81X1rnC7T4+FmJovOFx+4lifQw="; + hash = "sha256-5ywYbZeMqHU7/nnnINeR0BfVBxxgYmeXvjIuC45V43g="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gi/git-town/package.nix b/pkgs/by-name/gi/git-town/package.nix index 6c84a4be9e57..3799b2b4f393 100644 --- a/pkgs/by-name/gi/git-town/package.nix +++ b/pkgs/by-name/gi/git-town/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "git-town"; - version = "23.0.2"; + version = "23.0.3"; src = fetchFromGitHub { owner = "git-town"; repo = "git-town"; tag = "v${finalAttrs.version}"; - hash = "sha256-FwwyX/Ncl8zCR1+/A49VIugESU1YFgDcQYbO8w84Lm0="; + hash = "sha256-vw8S1Y9yXERL9Ddt70Elz0pZZHAuC+C9231Y8o1mb9k="; }; vendorHash = null; diff --git a/pkgs/by-name/gi/git-upstream/package.nix b/pkgs/by-name/gi/git-upstream/package.nix index b63abd7f7981..c2a5f88777ab 100644 --- a/pkgs/by-name/gi/git-upstream/package.nix +++ b/pkgs/by-name/gi/git-upstream/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/9999years/git-upstream"; changelog = "https://github.com/9999years/git-upstream/releases/tag/v${finalAttrs.version}"; description = "Shortcut for `git push --set-upstream`"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers._9999years ]; mainProgram = "git-upstream"; }; diff --git a/pkgs/by-name/gi/git-vanity-hash/package.nix b/pkgs/by-name/gi/git-vanity-hash/package.nix index 6179ecc4a2cc..911893091641 100644 --- a/pkgs/by-name/gi/git-vanity-hash/package.nix +++ b/pkgs/by-name/gi/git-vanity-hash/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage { meta = { homepage = "https://github.com/prasmussen/git-vanity-hash"; description = "Tool for creating commit hashes with a specific prefix"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.kaction ]; mainProgram = "git-vanity-hash"; }; diff --git a/pkgs/by-name/gi/git-warp-time/package.nix b/pkgs/by-name/gi/git-warp-time/package.nix index e70059c509bd..c9580eb3a38a 100644 --- a/pkgs/by-name/gi/git-warp-time/package.nix +++ b/pkgs/by-name/gi/git-warp-time/package.nix @@ -17,18 +17,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "git-warp-time"; - version = "0.8.5"; + version = "1.0.0"; src = fetchurl { url = "https://github.com/alerque/git-warp-time/releases/download/v${finalAttrs.version}/git-warp-time-${finalAttrs.version}.tar.zst"; - hash = "sha256-bt94Y1EIcLzz1v2Nwyde63y6FWD+iaFkoEYoQpWVWGY="; + hash = "sha256-Fq0fb2EZkBHJvcwOF9xRIvfh6yAICQ6cpvkFLJtxF78="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; dontConfigure = true; nativeBuildInputs = [ zstd ]; - hash = "sha256-FNt9spOFOSbOgpZnxLl3aIvU6lnIJHaVMoAKxl4lzhU="; + hash = "sha256-46NDJEGUk1NWk3fbpwenMSlxX0S5sYA1cpOghigInrU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/git-workspace/package.nix b/pkgs/by-name/gi/git-workspace/package.nix index 4e8a50ce7305..3c7615de3170 100644 --- a/pkgs/by-name/gi/git-workspace/package.nix +++ b/pkgs/by-name/gi/git-workspace/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Sync personal and work git repositories from multiple providers"; homepage = "https://github.com/orf/git-workspace"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ misuzu ]; mainProgram = "git-workspace"; }; diff --git a/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch b/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch deleted file mode 100644 index a0015f87888d..000000000000 --- a/pkgs/by-name/gi/git/osxkeychain-link-rust_lib.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2026-02-14 15:58:16.624434564 -0500 -+++ b/Makefile 2026-02-14 15:59:25.701016105 -0500 -@@ -4059,9 +4059,9 @@ - contrib/libgit-sys/libgitpub.a: $(LIBGIT_HIDDEN_EXPORT) - $(AR) $(ARFLAGS) $@ $^ - --contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) GIT-LDFLAGS -+contrib/credential/osxkeychain/git-credential-osxkeychain: contrib/credential/osxkeychain/git-credential-osxkeychain.o $(LIB_FILE) $(RUST_LIB) GIT-LDFLAGS - $(QUIET_LINK)$(CC) $(ALL_CFLAGS) -o $@ $(ALL_LDFLAGS) \ -- $(filter %.o,$^) $(LIB_FILE) $(EXTLIBS) -framework Security -framework CoreFoundation -+ $(filter %.o,$^) $(LIB_FILE) $(RUST_LIB) $(EXTLIBS) -framework Security -framework CoreFoundation - - contrib/credential/osxkeychain/git-credential-osxkeychain.o: contrib/credential/osxkeychain/git-credential-osxkeychain.c GIT-CFLAGS - $(QUIET_LINK)$(CC) -o $@ -c $(dep_args) $(compdb_args) $(ALL_CFLAGS) $(EXTRA_CPPFLAGS) $< diff --git a/pkgs/by-name/gi/git/package.nix b/pkgs/by-name/gi/git/package.nix index bda0344badb9..a6fe8a13efc3 100644 --- a/pkgs/by-name/gi/git/package.nix +++ b/pkgs/by-name/gi/git/package.nix @@ -55,6 +55,7 @@ rustSupport ? lib.meta.availableOn stdenv.hostPlatform rustc, cargo, rustc, + nix-update-script, }: assert osxkeychainSupport -> stdenv.hostPlatform.isDarwin; @@ -62,7 +63,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.54.0"; + version = "2.55.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI @@ -104,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { }.tar.xz" else "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - hash = "sha256-9okWI2TBDeee+Jqo2/SHMesFfjTtu9IKylEM4BVGgaM="; + hash = "sha256-RX/bBNyHKOAH1GiGleaRLm9oByeSDypAvxHqzBdQU1c="; }; outputs = [ "out" ] ++ lib.optional withManual "doc"; @@ -132,17 +133,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://lore.kernel.org/git/20260504101429.340123-1-joerg@thalheim.io/raw"; hash = "sha256-44EPfEJ39LjPWjqjFb52EKNaJGzYxZzJaJOis8QnazU="; }) - # Address test failure (new in 2.52.0) caused by `git-gui--askyesno` being - # installed by `make install`. - (fetchurl { - name = "expect-gui--askyesno-failure-in-t1517.patch"; - url = "https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/raw"; - hash = "sha256-vvhbvg74OIMzfksHiErSnjOZ+W0M/T9J8GOQ4E4wKbU="; - }) - ] - ++ lib.optionals rustSupport [ - # The above patch doesn’t work with Rust support enabled. - ./osxkeychain-link-rust_lib.patch ] ++ lib.optionals withSsh [ # Hard-code the ssh executable to ${pkgs.openssh}/bin/ssh instead of @@ -271,7 +261,7 @@ stdenv.mkDerivation (finalAttrs: { # See https://github.com/Homebrew/homebrew-core/commit/dfa3ccf1e7d3901e371b5140b935839ba9d8b706 ++ lib.optional stdenv.hostPlatform.isDarwin "TKFRAMEWORK=/nonexistent" # Starting with future Git version 3.0.0, rust will be mandatory. For now, it's optional. - ++ lib.optional rustSupport "WITH_RUST=YesPlease"; + ++ lib.optional (!rustSupport) "NO_RUST=YesPlease"; disallowedReferences = lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [ stdenv.shellPackage @@ -492,6 +482,13 @@ stdenv.mkDerivation (finalAttrs: { installCheckFlags = [ "DEFAULT_TEST_TARGET=prove" "PERL_PATH=${buildPackages.perl}/bin/perl" + + # Without setting debug explicitly, the test suite inherits the value of + # debug from the environment, which -- if separateDebugInfo is true -- will + # be the debug output path. The test suite then prints out extra debug + # info, as if `--debug` were passed on the command line, which causes test + # failures because that info can't be interpreted by the test harness. + "debug=" ]; nativeInstallCheckInputs = lib.optional ( @@ -552,6 +549,18 @@ stdenv.mkDerivation (finalAttrs: { disable_test t7513-interpret-trailers disable_test t2200-add-update + # Fails when run with GIT_TEST_INSTALLED, that is, when we're testing an + # installed package rather than the build output prior to installation. + # This test is fragile when testing an installed package even in Nix's + # otherwise clean build environment, upstream haven't been keen on patching + # individual failures when they crop up, and nobody has yet managed to + # rewrite the test to be less fragile. + # + # See in particular the below messages and discussions around them: + # https://lore.kernel.org/git/xmqqect7fhnp.fsf@gitster.g/ + # https://lore.kernel.org/git/20251201031040.1120091-1-brianmlyles@gmail.com/ + disable_test t1517-outside-repo + # Fails reproducibly on ZFS on Linux with formD normalization disable_test t0021-conversion disable_test t3910-mac-os-precompose @@ -616,7 +625,17 @@ stdenv.mkDerivation (finalAttrs: { }; } // tests.fetchgit; - updateScript = ./update.sh; + + # We get the source from the release packages, since that contains a few + # extra files that make the build easier without already having a Git + # installation. We get the version from GitHub, however, as that provides + # a nicer API for checking what the latest version is. + updateScript = nix-update-script { + extraArgs = [ + "--url" + "https://github.com/git/git" + ]; + }; }; meta = { diff --git a/pkgs/by-name/gi/git/update.sh b/pkgs/by-name/gi/git/update.sh deleted file mode 100755 index 7aa1e90d53b3..000000000000 --- a/pkgs/by-name/gi/git/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq git - -set -eu -o pipefail - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion git" | tr -d '"')" -latestTag="$(git ls-remote --tags --sort="v:refname" https://github.com/git/git.git | grep -v '{}' | grep -v '\-rc' | tail -1 | sed 's|^.*/v\(.*\)|\1|')" -targetVersion="${1:-$latestTag}" - -if [ ! "${oldVersion}" = "${targetVersion}" ]; then - update-source-version git "${targetVersion}" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/applications/version-management/git/default.nix" - nix-build -A git - git add "${default_nix}" - git commit -m "git: ${oldVersion} -> ${targetVersion}" -else - echo "git is already up-to-date" -fi diff --git a/pkgs/by-name/gi/git2cl/package.nix b/pkgs/by-name/gi/git2cl/package.nix index 35ad49505986..4dd5912ec30a 100644 --- a/pkgs/by-name/gi/git2cl/package.nix +++ b/pkgs/by-name/gi/git2cl/package.nix @@ -1,24 +1,25 @@ { - fetchgit, + fetchFromGitLab, lib, - stdenv, perl, + stdenv, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "git2cl"; - version = "unstable-2008-08-27"; + version = "3.0"; - src = fetchgit { - url = "git://repo.or.cz/git2cl.git"; - rev = "8373c9f74993e218a08819cbcdbab3f3564bbeba"; - sha256 = "b0d39379640c8a12821442431e2121f7908ce1cc88ec8ec6bede218ea8c21f2f"; + src = fetchFromGitLab { + owner = "jas"; + repo = "git2cl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-KEEUKSP7+05VIb/EhuCy0t1qP/UU0iqNzU4AacbdpTg="; }; buildInputs = [ perl ]; installPhase = '' install -D -m755 git2cl $out/bin/git2cl - install -D -m644 README $out/share/doc/git2cl/README + install -D -m644 README.md $out/share/doc/git2cl/README.md ''; meta = { @@ -27,4 +28,4 @@ stdenv.mkDerivation { platforms = lib.platforms.unix; mainProgram = "git2cl"; }; -} +}) diff --git a/pkgs/by-name/gi/gitaly/package.nix b/pkgs/by-name/gi/gitaly/package.nix index 7143fd093f77..c4e01515718d 100644 --- a/pkgs/by-name/gi/gitaly/package.nix +++ b/pkgs/by-name/gi/gitaly/package.nix @@ -7,7 +7,7 @@ }: let - version = "18.11.5"; + version = "18.11.7"; package_version = "v${lib.versions.major version}"; gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; @@ -21,7 +21,7 @@ let owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - hash = "sha256-i2DgcNoGPR/B6qya+jYFU5noOSabSlwu9P7p5KwR6jI="; + hash = "sha256-CupoX+Jv/4JDn50T7KF4+k9dd2bL+1zWd+3BsFIKOM8="; }; vendorHash = "sha256-/RJnCcmUoqGy08MSGEVM/taV1qZK65kiZw19n6S3ZQ0="; @@ -98,7 +98,7 @@ buildGoModule ( meta = { homepage = "https://gitlab.com/gitlab-org/gitaly"; description = "Git RPC service for handling all the git calls made by GitLab"; - platforms = lib.platforms.linux ++ [ "x86_64-darwin" ]; + platforms = lib.platforms.linux; teams = [ lib.teams.gitlab ]; license = lib.licenses.mit; }; diff --git a/pkgs/by-name/gi/gitbutler/package.nix b/pkgs/by-name/gi/gitbutler/package.nix index e0881da95a9b..d7a8c8951054 100644 --- a/pkgs/by-name/gi/gitbutler/package.nix +++ b/pkgs/by-name/gi/gitbutler/package.nix @@ -61,8 +61,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-hC4e0xgbGrOpO2pQGPIULlNyP/Kh5+A8+61taxM2DQ0="; + fetcherVersion = 4; + hash = "sha256-SqIf61KryWEvrw9rqA4UXTS+DCe08o+LqT4s1o9cPVE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gi/gitea-actions-runner/package.nix b/pkgs/by-name/gi/gitea-actions-runner/package.nix index 6f8dc249f6f4..2a3f171e161e 100644 --- a/pkgs/by-name/gi/gitea-actions-runner/package.nix +++ b/pkgs/by-name/gi/gitea-actions-runner/package.nix @@ -4,21 +4,22 @@ buildGoModule, testers, gitea-actions-runner, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "gitea-actions-runner"; - version = "1.0.3"; + version = "2.2.0"; src = fetchFromGitea { domain = "gitea.com"; owner = "gitea"; repo = "runner"; rev = "v${finalAttrs.version}"; - hash = "sha256-p6NdkQiZiEeuQjJp3CKTayStZlyk3d1XGigSI5uuLp0="; + hash = "sha256-aiba7Tdyyy8aDzJq62zOWNkEZE+twIxReW7clbIoVTI="; }; - vendorHash = "sha256-T1T5ZpGqGmipIkTWlYxlsLdAthW8bhcAvr0xyZ74+wQ="; + vendorHash = "sha256-Zpq/G/SZ959SRUIMGo2votFv4DzB46OmPmZwFoae3gU="; # Tests require network access (artifactcache tests try to determine outbound IP) doCheck = false; @@ -33,9 +34,12 @@ buildGoModule (finalAttrs: { mv "$out/bin/runner" "$out/bin/gitea-runner" ''; - passthru.tests.version = testers.testVersion { - package = gitea-actions-runner; - version = "v${finalAttrs.version}"; + passthru = { + tests.version = testers.testVersion { + package = gitea-actions-runner; + version = "v${finalAttrs.version}"; + }; + updateScript = nix-update-script { }; }; meta = { @@ -44,9 +48,6 @@ buildGoModule (finalAttrs: { homepage = "https://gitea.com/gitea/runner"; license = lib.licenses.mit; mainProgram = "gitea-runner"; - maintainers = with lib.maintainers; [ - superherointj - techknowlogick - ]; + maintainers = with lib.maintainers; [ techknowlogick ]; }; }) diff --git a/pkgs/by-name/gi/gitea/package.nix b/pkgs/by-name/gi/gitea/package.nix index 988ef9f8a149..1191c645692f 100644 --- a/pkgs/by-name/gi/gitea/package.nix +++ b/pkgs/by-name/gi/gitea/package.nix @@ -13,14 +13,14 @@ openssh, fetchPnpmDeps, pnpmConfigHook, - pnpm_10, + pnpm_11, stdenv, sqliteSupport ? true, nixosTests, }: let - pnpm = pnpm_10; + pnpm = pnpm_11; frontend = stdenv.mkDerivation (finalAttrs: { pname = "gitea-frontend"; @@ -29,8 +29,8 @@ let pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-Qo0DLuZv+2GVLsBfCv/6CC9E/qhSE4HwV4StQL4HX4Y="; + fetcherVersion = 4; + hash = "sha256-VAXSj+AYV6uEdCAD/sEzeydqn4cqNL+ITfrGq41jaLI="; }; nativeBuildInputs = [ @@ -39,6 +39,8 @@ let pnpm ]; + __darwinAllowLocalNetworking = true; + buildPhase = '' make frontend ''; @@ -49,20 +51,20 @@ let ''; }); in -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "gitea"; - version = "1.26.2"; + version = "1.27.0"; src = fetchFromGitHub { owner = "go-gitea"; repo = "gitea"; - tag = "v${gitea.version}"; - hash = "sha256-S7KV7soOnVQbw+2Ru7+DOL3Q4uWmSSdR6K90yofQlqw="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Pn1V4U43d4lTKRO7AftgKDDWls2z+3IeZgPBaKZlbow="; }; proxyVendor = true; - vendorHash = "sha256-7+M1n8RSgB3gZ/2na4RF9kYOf90H0bnsJZMDKpgAy64="; + vendorHash = "sha256-YRBMGWKIZgMxOXaXG2bIBj1XzkhSwiMyfRy+yQGw+Bo="; outputs = [ "out" @@ -77,14 +79,14 @@ buildGoModule rec { overrideModAttrs = _: { postPatch = '' substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; }; postPatch = '' substituteInPlace modules/setting/server.go --subst-var data substituteInPlace go.mod \ - --replace-fail "go 1.26.3" "go 1.26" + --replace-fail "go 1.26.4" "go 1.26.0" ''; subPackages = [ "." ]; @@ -99,8 +101,8 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X main.Version=${version}" - "-X 'main.Tags=${lib.concatStringsSep " " tags}'" + "-X main.Version=${finalAttrs.version}" + "-X 'main.Tags=${lib.concatStringsSep " " finalAttrs.tags}'" ]; postInstall = '' @@ -110,6 +112,7 @@ buildGoModule rec { mkdir -p $out cp -R ./options/locale $out/locale + mv $out/bin/gitea{.dev,} wrapProgram $out/bin/gitea \ --prefix PATH : ${ lib.makeBinPath [ @@ -133,6 +136,7 @@ buildGoModule rec { meta = { description = "Git with a cup of tea"; homepage = "https://about.gitea.com"; + changelog = "https://github.com/go-gitea/gitea/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ techknowlogick @@ -140,4 +144,4 @@ buildGoModule rec { ]; mainProgram = "gitea"; }; -} +}) diff --git a/pkgs/by-name/gi/gitfetch/package.nix b/pkgs/by-name/gi/gitfetch/package.nix index 3e718dac5cc5..bde36d74a09b 100644 --- a/pkgs/by-name/gi/gitfetch/package.nix +++ b/pkgs/by-name/gi/gitfetch/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gitfetch"; - version = "1.3.3"; + version = "1.4.0"; pyproject = true; src = fetchFromGitHub { owner = "Matars"; repo = "gitfetch"; tag = "v${finalAttrs.version}"; - hash = "sha256-dVJdc0iqcl/+s3v+ui6XtKRlOuYoFVYWlG0GtTZLr5o="; + hash = "sha256-WiMLpdj9p4fGxdMUlsNnGv0METgrCtpaCvTVm2474oE="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/gi/gitflow/package.nix b/pkgs/by-name/gi/gitflow/package.nix index b2ebf7e011af..b409a66c666a 100644 --- a/pkgs/by-name/gi/gitflow/package.nix +++ b/pkgs/by-name/gi/gitflow/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "petervanderdoes"; - repo = "gitflow"; + repo = "gitflow-avh"; rev = finalAttrs.version; sha256 = "sha256-kHirHG/bfsU6tKyQ0khNSTyChhzHfzib+HyA3LOtBI8="; }; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/petervanderdoes/gitflow"; + homepage = "https://github.com/petervanderdoes/gitflow-avh"; description = "Extend git with the Gitflow branching model"; mainProgram = "git-flow"; longDescription = '' diff --git a/pkgs/by-name/gi/github-act-runner/package.nix b/pkgs/by-name/gi/github-act-runner/package.nix new file mode 100644 index 000000000000..d1c1a04cc61c --- /dev/null +++ b/pkgs/by-name/gi/github-act-runner/package.nix @@ -0,0 +1,63 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + makeWrapper, + nodejs_24, + gitMinimal, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "github-act-runner"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "ChristopherHX"; + repo = "github-act-runner"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bcpaw3tVCkpxMmjxKTxu1H3amlawbIS0UdH0+qWEv18="; + }; + + vendorHash = "sha256-JS+8A6/JiIctCFzZQl1GqfSGv5yZT64++0BgYC8sulE="; + + ldflags = [ + "-s" + "-X main.version=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + postInstall = '' + wrapProgram $out/bin/github-act-runner \ + --prefix PATH : ${ + lib.makeBinPath [ + nodejs_24 + gitMinimal + ] + } + ''; + + __structuredAttrs = true; + strictDeps = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Reverse-engineered self-hosted GitHub Actions runner (Go)"; + homepage = "https://github.com/ChristopherHX/github-act-runner"; + changelog = "https://github.com/ChristopherHX/github-act-runner/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ liberodark ]; + platforms = lib.platforms.linux; + mainProgram = "github-act-runner"; + }; +}) diff --git a/pkgs/by-name/gi/github-backup/package.nix b/pkgs/by-name/gi/github-backup/package.nix index 8fbf5780075e..85bc5b59da9e 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 (finalAttrs: { pname = "github-backup"; - version = "0.62.1"; + version = "0.64.2"; pyproject = true; src = fetchFromGitHub { owner = "josegonzalez"; repo = "python-github-backup"; tag = finalAttrs.version; - hash = "sha256-G23kwtgL/HbfSZ1Go/wPk3fYCKqZzD5nGGi12kXdhk8="; + hash = "sha256-IO16n+Lx5igICbc0T6Nuir+I/nVBO6qlx+ILVWpYamo="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/gi/github-changelog-generator/package.nix b/pkgs/by-name/gi/github-changelog-generator/package.nix index b1d59ddf4c2d..6df22424bca2 100644 --- a/pkgs/by-name/gi/github-changelog-generator/package.nix +++ b/pkgs/by-name/gi/github-changelog-generator/package.nix @@ -16,6 +16,7 @@ bundlerApp { homepage = "https://github.com/github-changelog-generator/github-changelog-generator"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ + Scriptkiddi nicknovitski ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gi/github-copilot-cli/package.nix b/pkgs/by-name/gi/github-copilot-cli/package.nix index b71c9fd72969..059625b1bb30 100644 --- a/pkgs/by-name/gi/github-copilot-cli/package.nix +++ b/pkgs/by-name/gi/github-copilot-cli/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "github-copilot-cli"; - version = "1.0.26"; + version = "1.0.61"; # GitHub provide platform-specific SEA binaries as well as a "universal" # package. Use the universal package as it gives us a bit more flexibility @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { # about how paths should be set up which don't reliably hold when using Nix. src = fetchurl { url = "https://github.com/github/copilot-cli/releases/download/v${finalAttrs.version}/github-copilot-${finalAttrs.version}.tgz"; - hash = "sha256-zNO0clQRfgw6CX9K8NaJXsoOhhNjBfK7KAr0AoL7Oqo="; + hash = "sha256-8Lks8lHa5XF9ZrC+fU/9VlzD1W32MbRZ7PZtL5YWLTA="; }; nativeBuildInputs = [ @@ -58,6 +58,10 @@ stdenv.mkDerivation (finalAttrs: { ''; postInstall = '' + # Upstream bundles linuxmusl prebuilds in the universal tarball; they are + # not needed on glibc systems and make autoPatchelf fail on musl libc deps. + find "$out"/lib/github-copilot-cli -depth -path '*/linuxmusl-*' -exec rm -rf '{}' + + makeWrapper ${nodejs}/bin/node "$out"/bin/copilot \ --add-flag "$out"/lib/github-copilot-cli/index.js \ --add-flag --no-auto-update \ @@ -82,15 +86,18 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/github/copilot-cli"; changelog = "https://github.com/github/copilot-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ + binaryNativeCode # including contents of the prebuild directory + binaryBytecode # including WASM files + obfuscatedCode # including minified JavaScript + ]; maintainers = with lib.maintainers; [ - dbreyfogle me-and ]; mainProgram = "copilot"; platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix index 626d1836645d..0748ab05d59d 100644 --- a/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix +++ b/pkgs/by-name/gi/github-copilot-intellij-agent/package.nix @@ -88,7 +88,6 @@ stdenv.mkDerivation rec { mainProgram = "copilot-agent"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/gi/github-desktop/package.nix b/pkgs/by-name/gi/github-desktop/package.nix index 64a94973745f..1ea308c16d5e 100644 --- a/pkgs/by-name/gi/github-desktop/package.nix +++ b/pkgs/by-name/gi/github-desktop/package.nix @@ -29,19 +29,19 @@ let inherit (stdenv.hostPlatform.node) arch platform; - cacheRootHash = "sha256-OJDxq1Yep3swLU87YyJz7WfpPzpxo5ISukB4pIwxJBA="; - cacheAppHash = "sha256-DYUlLNxWn4sn7PBir/miJUoDVAQ2/nbOVGWSGN+IPxw="; + cacheRootHash = "sha256-2LV8hZCuX96h1KYYcL6b6XGC3uGcH5IQM4D61R7Em/U="; + cacheAppHash = "sha256-zX4V9mg7ljQ1AKl1fgATPVrFpx1a6jsyiLzN2VixpFE="; in stdenv.mkDerivation (finalAttrs: { pname = "github-desktop"; - version = "3.5.12"; + version = "3.6.3"; src = fetchFromGitHub { owner = "desktop"; repo = "desktop"; tag = "release-${finalAttrs.version}"; - hash = "sha256-/ehwjv1ipvxhmZYye1avkpz8uyO8YEWl0iM8U8n6pwE="; + hash = "sha256-HzfecIgPp/Hof5djWkKrrZD83Z0Afr1iC2WbzQrOyyI="; fetchSubmodules = true; postCheckout = "git -C $out rev-parse HEAD > $out/.gitrev"; }; diff --git a/pkgs/by-name/gi/github-mcp-server/package.nix b/pkgs/by-name/gi/github-mcp-server/package.nix index 2a053dcca345..eda1b992ca2c 100644 --- a/pkgs/by-name/gi/github-mcp-server/package.nix +++ b/pkgs/by-name/gi/github-mcp-server/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "github-mcp-server"; - version = "1.1.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "github"; repo = "github-mcp-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-/Wf0p3Ug3fxtXhvfab+ZSPe0XlGlWC0ujxkMb52D+oM="; + hash = "sha256-hTAo0bucL9YIcQPo3Twv6lMDj+hIUG9P4UEm1vZmDrQ="; }; - vendorHash = "sha256-J1hC4hdEKLENXLJrsyV41TaJ9+2CuPz5KoIMm2mXvTE="; + vendorHash = "sha256-oBFRpHxKZNxiT2iP0fkJI5CZWWGENy1qnTLVH2Y7XEs="; ldflags = [ "-s" diff --git a/pkgs/by-name/gi/github-runner/deps.json b/pkgs/by-name/gi/github-runner/deps.json index d6dac8df3eaf..f11ad9e3f106 100644 --- a/pkgs/by-name/gi/github-runner/deps.json +++ b/pkgs/by-name/gi/github-runner/deps.json @@ -36,8 +36,8 @@ }, { "pname": "Microsoft.Bcl.Cryptography", - "version": "10.0.6", - "hash": "sha256-6VaDedxTljDNE+a4ao4xSG3rzZ6lbmCShtgMgHe9aH4=" + "version": "10.0.7", + "hash": "sha256-5hOu8j2jLhCj9m7MlBoCjq3Qo0ST+b8n6oG2lLHL24s=" }, { "pname": "Microsoft.CodeCoverage", @@ -46,18 +46,18 @@ }, { "pname": "Microsoft.DevTunnels.Connections", - "version": "1.3.39", - "hash": "sha256-aJBUNv1n7b64EBrAa04+Gw1MLYC315xANCRdK3RnWlA=" + "version": "1.3.48", + "hash": "sha256-/E7ik2riVOMUyPt/1pxU7laDHG1pG5JpLIf5cQ7x7K4=" }, { "pname": "Microsoft.DevTunnels.Contracts", - "version": "1.3.39", - "hash": "sha256-lREgEhQhgQJyLoMYS/N5w+i6iX0s3Ppnl0T71KhG2u8=" + "version": "1.3.48", + "hash": "sha256-YYmyZWmKv03BnOKAwbAeLrKqYDbBQ4ZS26jn92QkLSc=" }, { "pname": "Microsoft.DevTunnels.Management", - "version": "1.3.39", - "hash": "sha256-twyduZ89fY69k5onUihezBwdiu3BxdOMBLIXq4aQvY0=" + "version": "1.3.48", + "hash": "sha256-DyDPqIwQkKJESx5K9Y4nKtw05cHrTlTp56rg/JXuVag=" }, { "pname": "Microsoft.DevTunnels.Ssh", @@ -536,8 +536,8 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "10.0.6", - "hash": "sha256-MpXUz1TiiFkD1ngApC7HKqW+i37zi5V2ApOmqZwDqiI=" + "version": "10.0.7", + "hash": "sha256-fV+2RcEzBV/JUnPDOLce3VBQKqvo32zcTWMZeJcAAJg=" }, { "pname": "System.Diagnostics.EventLog", @@ -561,8 +561,8 @@ }, { "pname": "System.Formats.Asn1", - "version": "10.0.6", - "hash": "sha256-h5f9iYBUHgG9kOV7jlVQ8HqBQ0DQJt+wy3R/FbB1kaQ=" + "version": "10.0.7", + "hash": "sha256-s48DCef2td3qUMdsRRGFfzkZ/wl/kUaVseQBDDfWUzM=" }, { "pname": "System.Globalization", @@ -856,8 +856,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "10.0.6", - "hash": "sha256-7T34t/DoxxMWUGRPSnLV1l5ScAxcDnK9iYKstRvLJuA=" + "version": "10.0.7", + "hash": "sha256-+3RdvoSme0k3FoutPdJLkbWPWsmqPVo80hMgpuH3FP0=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -896,8 +896,8 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "10.0.6", - "hash": "sha256-Lvkb2mzQT/tcJ2yxkQDmKKFpEyaUbQ75qU51FwD1dzY=" + "version": "10.0.7", + "hash": "sha256-koSlZI43JaCrG3ultJ6Sj7Ic9D9N878L+6HtRRGyJSA=" }, { "pname": "System.Text.Encoding", diff --git a/pkgs/by-name/gi/github-runner/package.nix b/pkgs/by-name/gi/github-runner/package.nix index c38f27abb913..3bc156df62ba 100644 --- a/pkgs/by-name/gi/github-runner/package.nix +++ b/pkgs/by-name/gi/github-runner/package.nix @@ -17,10 +17,8 @@ runtimeShell, # List of Node.js runtimes the package should support nodeRuntimes ? [ - # Node.js 20.x has reached EOL and is marked as insecure in Nixpkgs, thus omitted here "node24" ], - nodejs_20, nodejs_24, }: @@ -28,20 +26,20 @@ assert builtins.all ( x: builtins.elem x [ - "node20" + # Node.js 20.x has reached EOL and was removed from Nixpkgs, thus omitted here "node24" ] ) nodeRuntimes; buildDotnetModule (finalAttrs: { pname = "github-runner"; - version = "2.334.0"; + version = "2.335.1"; src = fetchFromGitHub { owner = "actions"; repo = "runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-KSfzWwIf8Vpc8H0XM1tIqdZhdY/noZCeYLBvdWjqmLA="; + hash = "sha256-mFwWhpFzp0pT7WaMpF/N6PGw0IJt3I6/e7GDgw9wA2U="; leaveDotGit = true; postFetch = '' git -C $out rev-parse --short HEAD > $out/.git-revision @@ -211,6 +209,10 @@ buildDotnetModule (finalAttrs: { "RepositoryActionWithInvalidWrapperActionfile_Node" "RepositoryActionWithWrapperActionfile_PreSteps" ] + ++ [ + "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.GetDownloadInfoAsync_OmitsDependencies_WhenEmpty" + "GitHub.Runner.Common.Tests.Worker.ActionManagerL0.GetDownloadInfoAsync_PropagatesDependencies_WhenPresent" + ] ++ map (x: "GitHub.Runner.Common.Tests.DotnetsdkDownloadScriptL0.${x}") [ "EnsureDotnetsdkBashDownloadScriptUpToDate" "EnsureDotnetsdkPowershellDownloadScriptUpToDate" @@ -246,9 +248,6 @@ buildDotnetModule (finalAttrs: { export GITHUB_ACTIONS_RUNNER_TRACE=1 mkdir -p _layout/externals '' - + lib.optionalString (lib.elem "node20" nodeRuntimes) '' - ln -s ${nodejs_20} _layout/externals/node20 - '' + lib.optionalString (lib.elem "node24" nodeRuntimes) '' ln -s ${nodejs_24} _layout/externals/node24 ''; @@ -290,9 +289,6 @@ buildDotnetModule (finalAttrs: { # link the Alpine Node flavors. mkdir -p $out/lib/externals '' - + lib.optionalString (lib.elem "node20" nodeRuntimes) '' - ln -s ${nodejs_20} $out/lib/externals/node20 - '' + lib.optionalString (lib.elem "node24" nodeRuntimes) '' ln -s ${nodejs_24} $out/lib/externals/node24 '' @@ -374,7 +370,6 @@ buildDotnetModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/gi/gitify/package.nix b/pkgs/by-name/gi/gitify/package.nix index a29faeeb9c2f..a1a7e0824265 100644 --- a/pkgs/by-name/gi/gitify/package.nix +++ b/pkgs/by-name/gi/gitify/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - pnpm_10_29_2, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -13,39 +13,57 @@ makeWrapper, nix-update-script, }: +let + pnpm = pnpm_10; +in stdenv.mkDerivation (finalAttrs: { pname = "gitify"; - version = "6.17.0"; + version = "6.20.0"; src = fetchFromGitHub { owner = "gitify-app"; repo = "gitify"; tag = "v${finalAttrs.version}"; - hash = "sha256-A9LeitceqDGictQbB7OYOI/pggrW9u8A7TUMblK/LHM="; + hash = "sha256-zKvI9uwKiKKbHTzM/LIhCzUCcM104UNReRJb51iQonc="; }; nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_10_29_2 + pnpm copyDesktopItems imagemagick makeWrapper ]; + strictDeps = true; + __structuredAttrs = true; + pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10_29_2; - fetcherVersion = 3; - hash = "sha256-0iTvrIe5PVj99ePWt8rn+laikdJ5TaNQ8GZGHyUTTQI="; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-KjRcUVeByCXetX7skJoxt6LU6EZcOG+5U2y3sr3XP7A="; }; env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; postPatch = '' - substituteInPlace config/electron-builder.js \ + substituteInPlace electron-builder.js \ --replace-fail "'Adam Setch (5KD23H9729)'" "null" \ --replace-fail "'scripts/afterSign.js'" "null" + + # With a nixpkgs electron wrapper, app.isPackaged always returns false, + # so isDevMode() is always true. This causes the config.ts getter for + # indexHtml to return VITE_DEV_SERVER_URL (which is empty) instead of the + # packaged file:// URL, resulting in a blank white window. + # Patch isDevMode() to false so the file:// path is always used. + substituteInPlace src/main/config.ts \ + --replace-fail "isDevMode()" "false" + + # Disable auto-updater; updates are handled via nixpkgs. + substituteInPlace src/main/updater.ts \ + --replace-fail "if (!this.menubar.app.isPackaged)" "if (true)" ''; buildPhase = '' @@ -57,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { pnpm build pnpm exec electron-builder \ - --config config/electron-builder.js \ + --config electron-builder.js \ --dir \ -c.electronDist=electron-dist \ -c.electronVersion="${electron.version}" \ diff --git a/pkgs/by-name/gi/gitjacker/package.nix b/pkgs/by-name/gi/gitjacker/package.nix index e97fc4f7e786..ac3f19c6b720 100644 --- a/pkgs/by-name/gi/gitjacker/package.nix +++ b/pkgs/by-name/gi/gitjacker/package.nix @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { even where directory listings are disabled. ''; homepage = "https://github.com/liamg/gitjacker"; - license = with lib.licenses; [ unlicense ]; + license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/gi/gitkraken/package.nix b/pkgs/by-name/gi/gitkraken/package.nix index 007bafb28925..ddc70a42368d 100644 --- a/pkgs/by-name/gi/gitkraken/package.nix +++ b/pkgs/by-name/gi/gitkraken/package.nix @@ -56,24 +56,19 @@ let pname = "gitkraken"; - version = "12.1.2"; + version = "12.2.1"; throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; srcs = { x86_64-linux = fetchzip { url = "https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz"; - hash = "sha256-uYEPOZ1OZwisiitByOWIjymzCayLCdN+cDzW/etktgM="; - }; - - x86_64-darwin = fetchzip { - url = "https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-BIeK1ICLmxciNbauWa23IITEUlbum/39e77D4ovNHCc="; + hash = "sha256-CX/NxvLrxia92vSIjWXzIiBdTfhZ8TW7a5g1hEt+Y/k="; }; aarch64-darwin = fetchzip { url = "https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip"; - hash = "sha256-1KTdxnpqNYpLKxX5G5QwY6mYP7j9GtDQoTeXwGfhv08="; + hash = "sha256-JEgqJ6smqDG/2KFApRSYTuL1Ch1sIkhGDMjqVsgQUmc="; }; }; diff --git a/pkgs/by-name/gi/gitkraken/update.sh b/pkgs/by-name/gi/gitkraken/update.sh index 8c75dc1a4977..3330868113c0 100755 --- a/pkgs/by-name/gi/gitkraken/update.sh +++ b/pkgs/by-name/gi/gitkraken/update.sh @@ -14,7 +14,6 @@ version=$(curl -fsSL https://api.gitkraken.dev/releases/production/linux/x64/REL # Hardcoded URLs to compute hashes declare -A tarballs=( ["x86_64-linux"]="https://api.gitkraken.dev/releases/production/linux/x64/${version}/gitkraken-amd64.tar.gz" - ["x86_64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/x64/${version}/GitKraken-v${version}.zip" ["aarch64-darwin"]="https://api.gitkraken.dev/releases/production/darwin/arm64/${version}/GitKraken-v${version}.zip" ) diff --git a/pkgs/by-name/gi/gitlab-ci-validate/package.nix b/pkgs/by-name/gi/gitlab-ci-validate/package.nix new file mode 100644 index 000000000000..7d428ed66608 --- /dev/null +++ b/pkgs/by-name/gi/gitlab-ci-validate/package.nix @@ -0,0 +1,38 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "gitlab-ci-validate"; + version = "0.6.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Code0x58"; + repo = "gitlab-ci-validate"; + tag = "v${finalAttrs.version}"; + hash = "sha256-j32knPhVio2OTATkW1Z3SMMYwl9u6Lh00Rell/knQ/0="; + }; + + vendorHash = "sha256-/+iu9SIaLtE51xcEzgA8dCp0eTAoPskp4xGlm1bsXTs="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Command line tool to validate .gitlab-ci.yml files"; + homepage = "https://github.com/Code0x58/gitlab-ci-validate"; + changelog = "https://github.com/Code0x58/gitlab-ci-validate/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ drupol ]; + mainProgram = "gitlab-ci-validate"; + }; +}) diff --git a/pkgs/by-name/gi/gitlab-container-registry/package.nix b/pkgs/by-name/gi/gitlab-container-registry/package.nix index 6f7021ae3974..01f8f222233e 100644 --- a/pkgs/by-name/gi/gitlab-container-registry/package.nix +++ b/pkgs/by-name/gi/gitlab-container-registry/package.nix @@ -6,7 +6,7 @@ buildGo125Module rec { pname = "gitlab-container-registry"; - version = "4.39.0"; + version = "4.40.2"; rev = "v${version}-gitlab"; # nixpkgs-update: no auto update @@ -14,10 +14,10 @@ buildGo125Module rec { owner = "gitlab-org"; repo = "container-registry"; inherit rev; - hash = "sha256-7dGKV2Pc3OPdM4OZqYjp3B9/s6DHtPvrqcWnWb3wHYw="; + hash = "sha256-k94uEM2VoOtdFRXWm6CDmeRt8LMXSNegRGes3ZKPg0I="; }; - vendorHash = "sha256-s08LsgYZTRJm0sWkbEUsmTYGkfb/5PJl9o9ozY1KOms="; + vendorHash = "sha256-MD98JYwTo/t5/E7clIlUfjmv8t7nDPpVElbuYDRjMMc="; excludedPackages = [ "devvm/*" diff --git a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch b/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch deleted file mode 100644 index b6718bdca087..000000000000 --- a/pkgs/by-name/gi/gitlab-duo/missing-hashes.patch +++ /dev/null @@ -1,4631 +0,0 @@ -diff --git c/package-lock.json i/package-lock.json -index 342d56e..b6d464b 100644 ---- c/package-lock.json -+++ i/package-lock.json -@@ -152,6 +152,7 @@ - "eslint-import-resolver-typescript": "^4.4.4", - "eslint-plugin-import": "^2.32.0", - "execa": "^9.3.1", -+ "extra-deps": "workspace:*", - "fs-extra": "^11.3.2", - "http-server": "^14.1.1", - "ink": "^6.5.1", -@@ -225,7 +226,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@aashutoshrathi/word-wrap/-/word-wrap-1.2.6.tgz", -+ "integrity": "sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA==" - }, - "node_modules/@adobe/css-tools": { - "version": "4.4.4", -@@ -557,18 +560,24 @@ - "license": "ISC", - "dependencies": { - "yallist": "^3.0.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", -+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==" - }, - "node_modules/@babel/helper-compilation-targets/node_modules/semver": { - "version": "6.3.1", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { - "version": "3.1.1", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", -+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==" - }, - "node_modules/@babel/helper-create-class-features-plugin": { - "version": "7.27.1", -@@ -596,7 +605,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-create-regexp-features-plugin": { - "version": "7.27.1", -@@ -620,7 +631,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/@babel/helper-define-polyfill-provider": { - "version": "0.6.3", -@@ -932,7 +945,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.21.0-placeholder-for-preset-env.2.tgz", -+ "integrity": "sha512-SOSkfJDddaM7mak6cPEpswyTRnuRltl429hMraQEglW+OkovnCzsiszTmsrlY//qLFjCpQDFRvjdm2wA5pPm9w==" - }, - "node_modules/@babel/plugin-syntax-async-generators": { - "version": "7.8.4", -@@ -943,7 +958,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", -+ "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==" - }, - "node_modules/@babel/plugin-syntax-bigint": { - "version": "7.8.3", -@@ -954,7 +971,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", -+ "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==" - }, - "node_modules/@babel/plugin-syntax-class-properties": { - "version": "7.12.13", -@@ -965,7 +984,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.13.tgz", -+ "integrity": "sha512-fm4idjKla0YahUNgFNLCB0qySdsoPiZP3iQE3rky0mBUtMZ23yDJ9SJdg6dXTSDnulOVqiF3Hgr9nbXvXTQZYA==" - }, - "node_modules/@babel/plugin-syntax-decorators": { - "version": "7.27.1", -@@ -1022,7 +1043,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", -+ "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==" - }, - "node_modules/@babel/plugin-syntax-json-strings": { - "version": "7.8.3", -@@ -1033,7 +1056,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", -+ "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==" - }, - "node_modules/@babel/plugin-syntax-jsx": { - "version": "7.27.1", -@@ -1060,7 +1085,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", -+ "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==" - }, - "node_modules/@babel/plugin-syntax-nullish-coalescing-operator": { - "version": "7.8.3", -@@ -1071,7 +1098,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", -+ "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==" - }, - "node_modules/@babel/plugin-syntax-numeric-separator": { - "version": "7.10.4", -@@ -1082,7 +1111,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", -+ "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==" - }, - "node_modules/@babel/plugin-syntax-object-rest-spread": { - "version": "7.8.3", -@@ -1093,7 +1124,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", -+ "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==" - }, - "node_modules/@babel/plugin-syntax-optional-catch-binding": { - "version": "7.8.3", -@@ -1104,7 +1137,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", -+ "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==" - }, - "node_modules/@babel/plugin-syntax-optional-chaining": { - "version": "7.8.3", -@@ -1115,7 +1150,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", -+ "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==" - }, - "node_modules/@babel/plugin-syntax-top-level-await": { - "version": "7.14.5", -@@ -1129,7 +1166,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz", -+ "integrity": "sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==" - }, - "node_modules/@babel/plugin-syntax-typescript": { - "version": "7.27.1", -@@ -1159,7 +1198,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-unicode-sets-regex/-/plugin-syntax-unicode-sets-regex-7.18.6.tgz", -+ "integrity": "sha512-727YkEAPwSIQTv5im8QHz3upqp92JTWhidIC81Tdx4VJYIte/VndKf1qKrfnnhPLiPghStWfvC/iFaMCQu7Nqg==" - }, - "node_modules/@babel/plugin-transform-arrow-functions": { - "version": "7.27.1", -@@ -1297,7 +1338,9 @@ - "license": "MIT", - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", -+ "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" - }, - "node_modules/@babel/plugin-transform-computed-properties": { - "version": "7.27.1", -@@ -4269,7 +4312,9 @@ - "funding": { - "type": "github", - "url": "https://github.com/sponsors/nzakas" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", -+ "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==" - }, - "node_modules/@humanwhocodes/object-schema": { - "version": "2.0.3", -@@ -4539,7 +4584,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", -+ "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { - "version": "1.0.10", -@@ -4547,7 +4594,9 @@ - "license": "MIT", - "dependencies": { - "sprintf-js": "~1.0.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", -+ "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { - "version": "5.3.1", -@@ -4555,7 +4604,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", -+ "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { - "version": "4.1.0", -@@ -4567,7 +4618,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { - "version": "3.14.2", -@@ -4592,7 +4645,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { - "version": "2.3.0", -@@ -4606,7 +4661,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { - "version": "4.1.0", -@@ -4617,7 +4674,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" - }, - "node_modules/@istanbuljs/load-nyc-config/node_modules/resolve-from": { - "version": "5.0.0", -@@ -4625,7 +4684,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", -+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "node_modules/@istanbuljs/schema": { - "version": "0.1.3", -@@ -4633,7 +4694,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", -+ "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==" - }, - "node_modules/@jest/console": { - "version": "29.7.0", -@@ -5040,7 +5103,9 @@ - "license": "MIT", - "engines": { - "node": ">=6.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz", -+ "integrity": "sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==" - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", -@@ -5323,14 +5388,18 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", -+ "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==" - }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "license": "MIT", - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", -+ "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==" - }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", -@@ -5341,7 +5410,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", -+ "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==" - }, - "node_modules/@octokit/auth-token": { - "version": "5.1.1", -@@ -8561,7 +8632,9 @@ - "dependencies": { - "@emnapi/wasi-threads": "1.1.0", - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.7.1.tgz", -+ "integrity": "sha512-o1uhUASyo921r2XtHYOHy7gdkGLge8ghBEQHMWmyJFoXlpU58kIrhhN3w26lpQb6dspetweapMn2CSNwQ8I4wg==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "1.7.1", -@@ -8571,7 +8644,9 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.7.1.tgz", -+ "integrity": "sha512-PVtJr5CmLwYAU9PZDMITZoR5iAOShYREoR45EyyLrbntV50mdePTgUn4AmOw90Ifcj+x2kRjdzr1HP3RrNiHGA==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": { - "version": "1.1.0", -@@ -8581,7 +8656,9 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.1.0.tgz", -+ "integrity": "sha512-WI0DdZ8xFSbgMjR1sFsKABJ/C5OnRrjT06JXbZKexJGrDuPTzZdDYfFlsgcCXCyf+suG5QU2e/y1Wo2V/OapLQ==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.0", -@@ -8593,7 +8670,9 @@ - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1", - "@tybys/wasm-util": "^0.10.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.0.tgz", -+ "integrity": "sha512-Fq6DJW+Bb5jaWE69/qOE0D1TUN9+6uWhCeZpdnSBk14pjLcCWR7Q8n49PTSPHazM37JqrsdpEthXy2xn6jWWiA==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": { - "version": "0.10.1", -@@ -8603,14 +8682,18 @@ - "optional": true, - "dependencies": { - "tslib": "^2.4.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.1.tgz", -+ "integrity": "sha512-9tTaPJLSiejZKx+Bmog4uSubteqTvFrVrURwkmHixBo0G4seD0zUxp98E1DzUBJxLQ3NPwXrGKDiVjwx/DpPsg==" - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": { - "version": "2.8.1", - "dev": true, - "inBundle": true, - "license": "0BSD", -- "optional": true -+ "optional": true, -+ "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", -+ "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==" - }, - "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.1.18", -@@ -9087,7 +9170,9 @@ - }, - "node_modules/@tootallnate/quickjs-emscripten": { - "version": "0.23.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@tootallnate/quickjs-emscripten/-/quickjs-emscripten-0.23.0.tgz", -+ "integrity": "sha512-C5Mc6rdnsaJDjO3UpGW/CQTHtCKaYlScZTly4JIu97Jxo/odCiH0ITnDXSJPTOrEKk/ycSZ0AOgTmkDtkOsvIA==" - }, - "node_modules/@ts-stack/markdown": { - "version": "1.5.0", -@@ -9306,7 +9391,9 @@ - "node_modules/@types/istanbul-lib-coverage": { - "version": "2.0.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz", -+ "integrity": "sha512-z/QT1XN4K4KYuslS23k62yDIDLwLFkzxOuMplDtObz0+y7VqJCaO2o+SPwHCvLFZh7xazvvoor2tA/hPz9ee7g==" - }, - "node_modules/@types/istanbul-lib-report": { - "version": "3.0.0", -@@ -9314,7 +9401,9 @@ - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-coverage": "*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", -+ "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==" - }, - "node_modules/@types/istanbul-reports": { - "version": "3.0.1", -@@ -9322,7 +9411,9 @@ - "license": "MIT", - "dependencies": { - "@types/istanbul-lib-report": "*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", -+ "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==" - }, - "node_modules/@types/jest": { - "version": "29.5.14", -@@ -9557,7 +9648,9 @@ - "node_modules/@types/stack-utils": { - "version": "2.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", -+ "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==" - }, - "node_modules/@types/statuses": { - "version": "2.0.6", -@@ -9642,7 +9735,9 @@ - "node_modules/@types/yargs-parser": { - "version": "21.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz", -+ "integrity": "sha512-iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA==" - }, - "node_modules/@types/yauzl": { - "version": "2.10.3", -@@ -11038,7 +11133,9 @@ - "node_modules/add-stream": { - "version": "1.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/add-stream/-/add-stream-1.0.0.tgz", -+ "integrity": "sha512-qQLMr+8o0WC4FZGQTcJiKBVC59JylcPSrTtk6usvmIDFUOCKegapy1VHQwRbFMOFyb/inzUVqHs+eMYKDM1YeQ==" - }, - "node_modules/agent-base": { - "version": "6.0.2", -@@ -11048,7 +11145,9 @@ - }, - "engines": { - "node": ">= 6.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", -+ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==" - }, - "node_modules/aggregate-error": { - "version": "3.1.0", -@@ -11089,7 +11188,9 @@ - "ajv": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", -+ "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==" - }, - "node_modules/ajv-formats": { - "version": "3.0.1", -@@ -11184,7 +11285,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.2.tgz", -+ "integrity": "sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==" - }, - "node_modules/ansi-escapes/node_modules/type-fest": { - "version": "0.21.3", -@@ -11195,14 +11298,18 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.21.3.tgz", -+ "integrity": "sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==" - }, - "node_modules/ansi-regex": { - "version": "5.0.1", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "node_modules/ansi-styles": { - "version": "4.3.0", -@@ -11215,7 +11322,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" - }, - "node_modules/ansis": { - "version": "4.1.0", -@@ -11241,7 +11350,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", -+ "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==" - }, - "node_modules/anymatch/node_modules/picomatch": { - "version": "2.3.2", -@@ -11864,7 +11975,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", -+ "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==" - }, - "node_modules/babel-plugin-jest-hoist": { - "version": "29.6.3", -@@ -11955,7 +12068,9 @@ - }, - "peerDependencies": { - "@babel/core": "^7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", -+ "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==" - }, - "node_modules/babel-preset-jest": { - "version": "29.6.3", -@@ -12099,7 +12214,9 @@ - }, - "node_modules/balanced-match": { - "version": "1.0.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/bare-events": { - "version": "2.6.1", -@@ -12845,7 +12962,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", -+ "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" - }, - "node_modules/camelcase": { - "version": "6.3.0", -@@ -13076,7 +13195,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.8.0.tgz", -+ "integrity": "sha512-eXTggHWSooYhq49F2opQhuHWgzucfF2YgODK4e1566GQs5BIfP30B0oenwBJHfWxAs2fyPB1s7Mg949zLf61Yw==" - }, - "node_modules/cjs-module-lexer": { - "version": "1.2.3", -@@ -13338,7 +13459,9 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", -+ "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==" - }, - "node_modules/clone": { - "version": "2.1.2", -@@ -13427,7 +13550,9 @@ - }, - "engines": { - "node": ">=7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" - }, - "node_modules/color-interpolate": { - "version": "2.0.0", -@@ -13441,7 +13566,9 @@ - }, - "node_modules/color-name": { - "version": "1.1.4", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/color-parse": { - "version": "2.0.2", -@@ -13482,13 +13609,13 @@ - }, - "node_modules/commander": { - "version": "14.0.2", -- "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", -- "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=20" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/commander/-/commander-14.0.2.tgz", -+ "integrity": "sha512-TywoWNNRbhoD0BXs1P3ZEScW8W5iKrnbithIl0YH+uCmBd0QpPOA8yc82DS3BIE5Ma6FnBVUsJ7wVUDz4dvOWQ==" - }, - "node_modules/compare-func": { - "version": "2.0.0", -@@ -13605,7 +13732,9 @@ - "dependencies": { - "ini": "^1.3.4", - "proto-list": "~1.2.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", -+ "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==" - }, - "node_modules/config-chain/node_modules/ini": { - "version": "1.3.8", -@@ -13971,7 +14100,9 @@ - }, - "node_modules/convert-source-map": { - "version": "2.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", -+ "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==" - }, - "node_modules/convert-to-spaces": { - "version": "2.0.1", -@@ -14039,7 +14170,9 @@ - "node_modules/core-util-is": { - "version": "1.0.3", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -+ "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==" - }, - "node_modules/cors": { - "version": "2.8.5", -@@ -14425,7 +14558,9 @@ - "license": "MIT", - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-5.0.1.tgz", -+ "integrity": "sha512-a9l6T1qqDogvvnw0nKlfZzqsyikEBZBClF39V3TFoKhDtGBqHu2HkuomJc02j5zft8zrUaXEuoicLeW54RkzPg==" - }, - "node_modules/data-urls": { - "version": "3.0.2", -@@ -14637,7 +14772,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz", -+ "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==" - }, - "node_modules/dedent": { - "version": "1.6.0", -@@ -14669,12 +14806,16 @@ - "license": "MIT", - "engines": { - "node": ">=4.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", -+ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==" - }, - "node_modules/deep-is": { - "version": "0.1.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", -+ "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==" - }, - "node_modules/deepmerge": { - "version": "4.3.1", -@@ -14986,7 +15127,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", -+ "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==" - }, - "node_modules/dlv": { - "version": "1.1.3", -@@ -15331,7 +15474,9 @@ - }, - "node_modules/emoji-regex": { - "version": "8.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/emojilib": { - "version": "2.4.0", -@@ -15611,7 +15756,9 @@ - "license": "MIT", - "dependencies": { - "is-arrayish": "^0.2.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", -+ "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==" - }, - "node_modules/error-stack-parser-es": { - "version": "1.0.5", -@@ -16635,7 +16782,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", -+ "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==" - }, - "node_modules/escodegen": { - "version": "2.1.0", -@@ -16654,7 +16803,9 @@ - }, - "optionalDependencies": { - "source-map": "~0.6.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz", -+ "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==" - }, - "node_modules/eslint": { - "version": "9.32.0", -@@ -17333,7 +17484,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", -+ "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" - }, - "node_modules/esquery": { - "version": "1.5.0", -@@ -17344,7 +17497,9 @@ - }, - "engines": { - "node": ">=0.10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.5.0.tgz", -+ "integrity": "sha512-YQLXUplAwJgCydQ78IMJywZCceoqk1oH01OERdSAJc/7U2AylwjhSCLDEtqwg811idIS/9fIU5GjG73IgjKMVg==" - }, - "node_modules/esrecurse": { - "version": "4.3.0", -@@ -17377,7 +17532,9 @@ - "license": "BSD-2-Clause", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", -+ "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" - }, - "node_modules/etag": { - "version": "1.8.1", -@@ -17398,7 +17555,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.x" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", -+ "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==" - }, - "node_modules/eventsource": { - "version": "3.0.7", -@@ -17465,7 +17624,9 @@ - "dev": true, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", -+ "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==" - }, - "node_modules/expect": { - "version": "29.7.0", -@@ -17513,6 +17674,10 @@ - "node": ">=0.10.0" - } - }, -+ "node_modules/extra-deps": { -+ "resolved": "packages/extra-deps", -+ "link": true -+ }, - "node_modules/extract-from-css": { - "version": "0.4.4", - "resolved": "https://registry.npmjs.org/extract-from-css/-/extract-from-css-0.4.4.tgz", -@@ -17571,7 +17736,9 @@ - }, - "node_modules/fast-deep-equal": { - "version": "3.1.3", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", -+ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" - }, - "node_modules/fast-diff": { - "version": "1.3.0", -@@ -17610,12 +17777,16 @@ - }, - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", -+ "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==" - }, - "node_modules/fast-json-stable-stringify": { - "version": "2.1.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", -+ "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" - }, - "node_modules/fast-json-stringify": { - "version": "6.0.1", -@@ -17644,7 +17815,9 @@ - "node_modules/fast-levenshtein": { - "version": "2.0.6", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", -+ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==" - }, - "node_modules/fast-querystring": { - "version": "1.1.2", -@@ -18005,7 +18178,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", -+ "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==" - }, - "node_modules/find-up-simple": { - "version": "1.0.0", -@@ -18202,7 +18377,9 @@ - "dependencies": { - "inherits": "^2.0.1", - "readable-stream": "^2.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz", -+ "integrity": "sha512-OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g==" - }, - "node_modules/fs-extra": { - "version": "11.3.2", -@@ -18221,7 +18398,9 @@ - }, - "node_modules/fs.realpath": { - "version": "1.0.0", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", -+ "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==" - }, - "node_modules/fsevents": { - "version": "2.3.3", -@@ -18232,7 +18411,9 @@ - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", -+ "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==" - }, - "node_modules/function-bind": { - "version": "1.1.2", -@@ -18295,14 +18476,18 @@ - "license": "MIT", - "engines": { - "node": ">=6.9.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", -+ "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" - }, - "node_modules/get-caller-file": { - "version": "2.0.5", - "license": "ISC", - "engines": { - "node": "6.* || 8.* || >= 10.*" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", -+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" - }, - "node_modules/get-east-asian-width": { - "version": "1.3.1", -@@ -18346,7 +18531,9 @@ - "license": "MIT", - "engines": { - "node": ">=8.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", -+ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==" - }, - "node_modules/get-proto": { - "version": "1.0.1", -@@ -18366,7 +18553,9 @@ - "license": "MIT", - "dependencies": { - "npm-conf": "~1.1.3" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-proxy-settings/-/get-proxy-settings-0.1.13.tgz", -+ "integrity": "sha512-67HvLHFnPpg6JIHq0z4TwW0iXOuX+H51FtEe9xSkEiRwrY0jYNAawtbGrUVFIEDcp4I0sRkm8pIRik8dss8OZw==" - }, - "node_modules/get-stream": { - "version": "9.0.1", -@@ -18426,7 +18615,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-6.0.1.tgz", -+ "integrity": "sha512-7ZqONUVqaabogsYNWlYj0t3YZaL6dhuEueZXGF+/YVmf6dHmaFg8/6psJKqhx9QykIDKzpGcy2cn4oV4YC7V/Q==" - }, - "node_modules/get-uri/node_modules/fs-extra": { - "version": "8.1.0", -@@ -18438,21 +18629,27 @@ - }, - "engines": { - "node": ">=6 <7 || >=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", -+ "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==" - }, - "node_modules/get-uri/node_modules/jsonfile": { - "version": "4.0.0", - "license": "MIT", - "optionalDependencies": { - "graceful-fs": "^4.1.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", -+ "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==" - }, - "node_modules/get-uri/node_modules/universalify": { - "version": "0.1.2", - "license": "MIT", - "engines": { - "node": ">= 4.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", -+ "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==" - }, - "node_modules/git-log-parser": { - "version": "1.2.1", -@@ -18528,7 +18725,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz", -+ "integrity": "sha512-lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q==" - }, - "node_modules/glob-parent": { - "version": "6.0.2", -@@ -18538,7 +18737,9 @@ - }, - "engines": { - "node": ">=10.13.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", -+ "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==" - }, - "node_modules/glob/node_modules/brace-expansion": { - "version": "1.1.14", -@@ -18759,12 +18960,16 @@ - }, - "node_modules/graceful-fs": { - "version": "4.2.11", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/graphemer": { - "version": "1.4.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", -+ "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==" - }, - "node_modules/graphql": { - "version": "16.11.0", -@@ -18872,7 +19077,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", -+ "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" - }, - "node_modules/has-property-descriptors": { - "version": "1.0.2", -@@ -19099,7 +19306,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.0.tgz", -+ "integrity": "sha512-o/zjMZRhJxny7OyEF+Op8X+efiELC7k7yOjMzgfzVqOzXqkBkWI79YoTdOtsuWd5BWhAGAuOY/Xa6xpiaWXiNg==" - }, - "node_modules/http-proxy/node_modules/eventemitter3": { - "version": "4.0.7", -@@ -19188,7 +19397,9 @@ - }, - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", -+ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==" - }, - "node_modules/human-signals": { - "version": "8.0.0", -@@ -19329,7 +19540,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz", -+ "integrity": "sha512-ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg==" - }, - "node_modules/import-meta-resolve": { - "version": "4.1.0", -@@ -19347,7 +19560,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.19" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" - }, - "node_modules/indent-string": { - "version": "4.0.0", -@@ -19377,11 +19592,15 @@ - "dependencies": { - "once": "^1.3.0", - "wrappy": "1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", -+ "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==" - }, - "node_modules/inherits": { - "version": "2.0.4", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -+ "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" - }, - "node_modules/ini": { - "version": "4.1.3", -@@ -19646,7 +19865,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-4.3.0.tgz", -+ "integrity": "sha512-B9ZWJxHHOHUhUjCPrMpLD4xEq35bUTClHM1S6CBU5ixQnkZmwipwgc96vAd7AAGM9TGHvJR+Uss+/Ak6UphK+Q==" - }, - "node_modules/ipaddr.js": { - "version": "1.9.1", -@@ -19703,7 +19924,9 @@ - "node_modules/is-arrayish": { - "version": "0.2.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", -+ "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==" - }, - "node_modules/is-async-function": { - "version": "2.1.1", -@@ -19961,7 +20184,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", -+ "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==" - }, - "node_modules/is-finalizationregistry": { - "version": "1.1.1", -@@ -19984,7 +20209,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "node_modules/is-generator-fn": { - "version": "2.1.0", -@@ -20022,7 +20249,9 @@ - }, - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", -+ "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==" - }, - "node_modules/is-hexadecimal": { - "version": "1.0.4", -@@ -20367,7 +20596,9 @@ - "node_modules/is-url": { - "version": "1.2.4", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/is-url/-/is-url-1.2.4.tgz", -+ "integrity": "sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==" - }, - "node_modules/is-weakmap": { - "version": "2.0.2", -@@ -20464,16 +20695,22 @@ - }, - "engines": { - "node": ">=v0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is2/-/is2-2.0.9.tgz", -+ "integrity": "sha512-rZkHeBn9Zzq52sd9IUIV3a5mfwBY+o2HePMh0wkGBM4z4qjvy2GwVxQ6nNXSfw6MmVP6gf1QIlWjiOavhM3x5g==" - }, - "node_modules/isarray": { - "version": "1.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -+ "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==" - }, - "node_modules/isexe": { - "version": "2.0.0", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/isomorphic-git": { - "version": "1.32.3", -@@ -20580,7 +20817,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", -+ "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==" - }, - "node_modules/istanbul-lib-instrument/node_modules/semver": { - "version": "6.3.1", -@@ -20588,7 +20827,9 @@ - "license": "ISC", - "bin": { - "semver": "bin/semver.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", -+ "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==" - }, - "node_modules/istanbul-lib-report": { - "version": "3.0.1", -@@ -21163,7 +21404,9 @@ - }, - "engines": { - "node": ">=10.12.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jest-junit/-/jest-junit-16.0.0.tgz", -+ "integrity": "sha512-A94mmw6NfJab4Fg/BlvVOUXzXgF0XIH6EmTgJ5NDPp4xoKq0Kr7sErb+4Xs9nZvu58pJojz5RFGpqnZYJTrRfQ==" - }, - "node_modules/jest-junit/node_modules/uuid": { - "version": "8.3.2", -@@ -21171,7 +21414,9 @@ - "license": "MIT", - "bin": { - "uuid": "dist/bin/uuid" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==" - }, - "node_modules/jest-leak-detector": { - "version": "29.7.0", -@@ -21946,7 +22191,9 @@ - }, - "node_modules/json-schema-traverse": { - "version": "1.0.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", -+ "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==" - }, - "node_modules/json-schema-typed": { - "version": "8.0.2", -@@ -21976,7 +22223,9 @@ - "node_modules/json-stable-stringify-without-jsonify": { - "version": "1.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", -+ "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==" - }, - "node_modules/json-stable-stringify/node_modules/isarray": { - "version": "2.0.5", -@@ -21999,7 +22248,9 @@ - }, - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", -+ "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==" - }, - "node_modules/jsonfile": { - "version": "6.1.0", -@@ -22009,7 +22260,9 @@ - }, - "optionalDependencies": { - "graceful-fs": "^4.1.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz", -+ "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==" - }, - "node_modules/jsonify": { - "version": "0.0.1", -@@ -22280,7 +22533,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", -+ "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==" - }, - "node_modules/light-my-request": { - "version": "6.6.0", -@@ -22670,7 +22925,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", -+ "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==" - }, - "node_modules/lodash": { - "version": "4.18.1", -@@ -22729,7 +22986,9 @@ - "node_modules/lodash.merge": { - "version": "4.6.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", -+ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==" - }, - "node_modules/lodash.uniqby": { - "version": "4.7.0", -@@ -23218,14 +23477,18 @@ - "node_modules/merge-stream": { - "version": "2.0.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", -+ "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" - }, - "node_modules/merge2": { - "version": "1.4.1", - "license": "MIT", - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", -+ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==" - }, - "node_modules/micromark": { - "version": "2.11.4", -@@ -23405,7 +23668,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz", -+ "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ==" - }, - "node_modules/min-indent": { - "version": "1.0.1", -@@ -23457,7 +23722,9 @@ - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", -+ "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==" - }, - "node_modules/minimisted": { - "version": "2.0.1", -@@ -23502,7 +23769,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", -+ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==" - }, - "node_modules/mocha": { - "version": "11.7.5", -@@ -23696,7 +23965,9 @@ - }, - "node_modules/ms": { - "version": "2.1.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", -+ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" - }, - "node_modules/msw": { - "version": "2.11.2", -@@ -23843,7 +24114,9 @@ - "node_modules/natural-compare": { - "version": "1.4.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", -+ "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==" - }, - "node_modules/negotiator": { - "version": "0.6.3", -@@ -23962,7 +24235,9 @@ - "encoding": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", -+ "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==" - }, - "node_modules/node-html-parser": { - "version": "6.1.13", -@@ -24020,7 +24295,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" - }, - "node_modules/normalize-url": { - "version": "8.0.1", -@@ -24204,7 +24481,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-conf/-/npm-conf-1.1.3.tgz", -+ "integrity": "sha512-Yic4bZHJOt9RCFbRP3GgpqhScOY4HH3V2P8yBj6CeYq118Qr+BLXqT2JvpJ00mryLESpgOxf5XlFv4ZjXxLScw==" - }, - "node_modules/npm-run-path": { - "version": "5.3.0", -@@ -24248,7 +24527,9 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/ansi-regex": { - "version": "6.2.2", -@@ -24260,13 +24541,17 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", -+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/emoji-regex": { - "version": "9.2.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/string-width": { - "version": "5.1.2", -@@ -24283,7 +24568,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" - }, - "node_modules/npm/node_modules/@isaacs/cliui/node_modules/strip-ansi": { - "version": "7.2.0", -@@ -24298,7 +24585,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", -+ "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==" - }, - "node_modules/npm/node_modules/@isaacs/fs-minipass": { - "version": "4.0.1", -@@ -24310,13 +24599,17 @@ - }, - "engines": { - "node": ">=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", -+ "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==" - }, - "node_modules/npm/node_modules/@isaacs/string-locale-compare": { - "version": "1.1.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", -+ "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==" - }, - "node_modules/npm/node_modules/@npmcli/agent": { - "version": "3.0.0", -@@ -24332,7 +24625,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-3.0.0.tgz", -+ "integrity": "sha512-S79NdEgDQd/NGCay6TCoVzXSj74skRZIKJcpJjC5lOq34SZzyI6MqtiiWoiVWoVrTcGjNeC4ipbh1VIHlpfF5Q==" - }, - "node_modules/npm/node_modules/@npmcli/arborist": { - "version": "8.0.5", -@@ -24382,7 +24677,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-8.0.5.tgz", -+ "integrity": "sha512-dFby80JSC3e8825FRGRuhOMWFeKFHokz8j8osLOujmjOSKm6smGu/b1/gbgW0lP8d84iMZO+RxpqBbC5KgL6DQ==" - }, - "node_modules/npm/node_modules/@npmcli/config": { - "version": "9.0.0", -@@ -24401,7 +24698,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/config/-/config-9.0.0.tgz", -+ "integrity": "sha512-P5Vi16Y+c8E0prGIzX112ug7XxqfaPFUVW/oXAV+2VsxplKZEnJozqZ0xnK8V8w/SEsBf+TXhUihrEIAU4CA5Q==" - }, - "node_modules/npm/node_modules/@npmcli/fs": { - "version": "4.0.0", -@@ -24413,7 +24712,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", -+ "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==" - }, - "node_modules/npm/node_modules/@npmcli/git": { - "version": "6.0.3", -@@ -24432,7 +24733,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-6.0.3.tgz", -+ "integrity": "sha512-GUYESQlxZRAdhs3UhbB6pVRNUELQOHXwK9ruDkwmCv2aZ5y0SApQzUJCg02p3A7Ue2J5hxvlk1YI53c00NmRyQ==" - }, - "node_modules/npm/node_modules/@npmcli/installed-package-contents": { - "version": "3.0.0", -@@ -24448,7 +24751,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-3.0.0.tgz", -+ "integrity": "sha512-fkxoPuFGvxyrH+OQzyTkX2LUEamrF4jZSmxjAtPPHHGO0dqsQ8tTKjnIS8SAnPHdk2I03BDtSMR5K/4loKg79Q==" - }, - "node_modules/npm/node_modules/@npmcli/map-workspaces": { - "version": "4.0.2", -@@ -24463,7 +24768,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-4.0.2.tgz", -+ "integrity": "sha512-mnuMuibEbkaBTYj9HQ3dMe6L0ylYW+s/gfz7tBDMFY/la0w9Kf44P9aLn4/+/t3aTR3YUHKoT6XQL9rlicIe3Q==" - }, - "node_modules/npm/node_modules/@npmcli/metavuln-calculator": { - "version": "8.0.1", -@@ -24479,7 +24786,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-8.0.1.tgz", -+ "integrity": "sha512-WXlJx9cz3CfHSt9W9Opi1PTFc4WZLFomm5O8wekxQZmkyljrBRwATwDxfC9iOXJwYVmfiW1C1dUe0W2aN0UrSg==" - }, - "node_modules/npm/node_modules/@npmcli/metavuln-calculator/node_modules/pacote": { - "version": "20.0.1", -@@ -24510,7 +24819,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-20.0.1.tgz", -+ "integrity": "sha512-jTMLD/QK7JMUKg3g7K3M/DEqIbGm7sxclj12eQYIkL3viutSiefTs26IrqIqgGlFsviF/9dlDUZxnpGvkRXtjw==" - }, - "node_modules/npm/node_modules/@npmcli/name-from-folder": { - "version": "3.0.0", -@@ -24519,7 +24830,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-3.0.0.tgz", -+ "integrity": "sha512-61cDL8LUc9y80fXn+lir+iVt8IS0xHqEKwPu/5jCjxQTVoSCmkXvw4vbMrzAMtmghz3/AkiBjhHkDKUH+kf7kA==" - }, - "node_modules/npm/node_modules/@npmcli/node-gyp": { - "version": "4.0.0", -@@ -24528,7 +24841,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-4.0.0.tgz", -+ "integrity": "sha512-+t5DZ6mO/QFh78PByMq1fGSAub/agLJZDRfJRMeOSNCt8s9YVlTjmGpIPwPhvXTGUIJk+WszlT0rQa1W33yzNA==" - }, - "node_modules/npm/node_modules/@npmcli/package-json": { - "version": "6.2.0", -@@ -24546,7 +24861,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-6.2.0.tgz", -+ "integrity": "sha512-rCNLSB/JzNvot0SEyXqWZ7tX2B5dD2a1br2Dp0vSYVo5jh8Z0EZ7lS9TsZ1UtziddB1UfNUaMCc538/HztnJGA==" - }, - "node_modules/npm/node_modules/@npmcli/promise-spawn": { - "version": "8.0.3", -@@ -24558,7 +24875,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-8.0.3.tgz", -+ "integrity": "sha512-Yb00SWaL4F8w+K8YGhQ55+xE4RUNdMHV43WZGsiTM92gS+lC0mGsn7I4hLug7pbao035S6bj3Y3w0cUNGLfmkg==" - }, - "node_modules/npm/node_modules/@npmcli/query": { - "version": "4.0.1", -@@ -24570,7 +24889,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-4.0.1.tgz", -+ "integrity": "sha512-4OIPFb4weUUwkDXJf4Hh1inAn8neBGq3xsH4ZsAaN6FK3ldrFkH7jSpCc7N9xesi0Sp+EBXJ9eGMDrEww2Ztqw==" - }, - "node_modules/npm/node_modules/@npmcli/redact": { - "version": "3.2.2", -@@ -24579,7 +24900,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-3.2.2.tgz", -+ "integrity": "sha512-7VmYAmk4csGv08QzrDKScdzn11jHPFGyqJW39FyPgPuAp3zIaUmuCo1yxw9aGs+NEJuTGQ9Gwqpt93vtJubucg==" - }, - "node_modules/npm/node_modules/@npmcli/run-script": { - "version": "9.1.0", -@@ -24596,7 +24919,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-9.1.0.tgz", -+ "integrity": "sha512-aoNSbxtkePXUlbZB+anS1LqsJdctG5n3UVhfU47+CDdwMi6uNTBMF9gPcQRnqghQd2FGzcwwIFBruFMxjhBewg==" - }, - "node_modules/npm/node_modules/@pkgjs/parseargs": { - "version": "0.11.0", -@@ -24606,7 +24931,9 @@ - "optional": true, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", -+ "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==" - }, - "node_modules/npm/node_modules/@sigstore/bundle": { - "version": "3.1.0", -@@ -24618,7 +24945,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-3.1.0.tgz", -+ "integrity": "sha512-Mm1E3/CmDDCz3nDhFKTuYdB47EdRFRQMOE/EAbiG1MJW77/w1b3P7Qx7JSrVJs8PfwOLOVcKQCHErIwCTyPbag==" - }, - "node_modules/npm/node_modules/@sigstore/core": { - "version": "2.0.0", -@@ -24627,7 +24956,9 @@ - "license": "Apache-2.0", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-2.0.0.tgz", -+ "integrity": "sha512-nYxaSb/MtlSI+JWcwTHQxyNmWeWrUXJJ/G4liLrGG7+tS4vAz6LF3xRXqLH6wPIVUoZQel2Fs4ddLx4NCpiIYg==" - }, - "node_modules/npm/node_modules/@sigstore/protobuf-specs": { - "version": "0.4.3", -@@ -24636,7 +24967,9 @@ - "license": "Apache-2.0", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.4.3.tgz", -+ "integrity": "sha512-fk2zjD9117RL9BjqEwF7fwv7Q/P9yGsMV4MUJZ/DocaQJ6+3pKr+syBq1owU5Q5qGw5CUbXzm+4yJ2JVRDQeSA==" - }, - "node_modules/npm/node_modules/@sigstore/sign": { - "version": "3.1.0", -@@ -24653,7 +24986,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-3.1.0.tgz", -+ "integrity": "sha512-knzjmaOHOov1Ur7N/z4B1oPqZ0QX5geUfhrVaqVlu+hl0EAoL4o+l0MSULINcD5GCWe3Z0+YJO8ues6vFlW0Yw==" - }, - "node_modules/npm/node_modules/@sigstore/tuf": { - "version": "3.1.1", -@@ -24666,7 +25001,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-3.1.1.tgz", -+ "integrity": "sha512-eFFvlcBIoGwVkkwmTi/vEQFSva3xs5Ot3WmBcjgjVdiaoelBLQaQ/ZBfhlG0MnG0cmTYScPpk7eDdGDWUcFUmg==" - }, - "node_modules/npm/node_modules/@sigstore/verify": { - "version": "2.1.1", -@@ -24680,7 +25017,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-2.1.1.tgz", -+ "integrity": "sha512-hVJD77oT67aowHxwT4+M6PGOp+E2LtLdTK3+FC0lBO9T7sYwItDMXZ7Z07IDCvR1M717a4axbIWckrW67KMP/w==" - }, - "node_modules/npm/node_modules/@tufjs/canonical-json": { - "version": "2.0.0", -@@ -24689,7 +25028,9 @@ - "license": "MIT", - "engines": { - "node": "^16.14.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", -+ "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==" - }, - "node_modules/npm/node_modules/abbrev": { - "version": "3.0.1", -@@ -24698,7 +25039,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", -+ "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==" - }, - "node_modules/npm/node_modules/agent-base": { - "version": "7.1.4", -@@ -24707,7 +25050,9 @@ - "license": "MIT", - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", -+ "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==" - }, - "node_modules/npm/node_modules/ansi-regex": { - "version": "5.0.1", -@@ -24716,7 +25061,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -+ "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==" - }, - "node_modules/npm/node_modules/ansi-styles": { - "version": "6.2.3", -@@ -24728,25 +25075,33 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", -+ "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==" - }, - "node_modules/npm/node_modules/aproba": { - "version": "2.1.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/aproba/-/aproba-2.1.0.tgz", -+ "integrity": "sha512-tLIEcj5GuR2RSTnxNKdkK0dJ/GrC7P38sUkiDmDuHfsHmbagTFAxDVIBltoklXEVIQ/f14IL8IMJ5pn9Hez1Ew==" - }, - "node_modules/npm/node_modules/archy": { - "version": "1.0.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", -+ "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==" - }, - "node_modules/npm/node_modules/balanced-match": { - "version": "1.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", -+ "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==" - }, - "node_modules/npm/node_modules/bin-links": { - "version": "5.0.0", -@@ -24762,7 +25117,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-5.0.0.tgz", -+ "integrity": "sha512-sdleLVfCjBtgO5cNjA2HVRvWBJAHs4zwenaCPMNJAJU0yNxpzj80IpjOIimkpkr+mhlA+how5poQtt53PygbHA==" - }, - "node_modules/npm/node_modules/binary-extensions": { - "version": "2.3.0", -@@ -24774,7 +25131,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", -+ "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==" - }, - "node_modules/npm/node_modules/brace-expansion": { - "version": "2.0.2", -@@ -24783,7 +25142,9 @@ - "license": "MIT", - "dependencies": { - "balanced-match": "^1.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", -+ "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==" - }, - "node_modules/npm/node_modules/cacache": { - "version": "19.0.1", -@@ -24806,7 +25167,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cacache/-/cacache-19.0.1.tgz", -+ "integrity": "sha512-hdsUxulXCi5STId78vRVYEtDAjq99ICAUktLTeTYsLoTE6Z8dS0c8pWNCxwdrk9YfJeobDZc2Y186hD/5ZQgFQ==" - }, - "node_modules/npm/node_modules/chalk": { - "version": "5.6.2", -@@ -24818,7 +25181,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", -+ "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==" - }, - "node_modules/npm/node_modules/chownr": { - "version": "3.0.0", -@@ -24827,7 +25192,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", -+ "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==" - }, - "node_modules/npm/node_modules/ci-info": { - "version": "4.4.0", -@@ -24842,7 +25209,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.4.0.tgz", -+ "integrity": "sha512-77PSwercCZU2Fc4sX94eF8k8Pxte6JAwL4/ICZLFjJLqegs7kCuAsqqj/70NQF6TvDpgFjkubQB2FW2ZZddvQg==" - }, - "node_modules/npm/node_modules/cidr-regex": { - "version": "4.1.3", -@@ -24854,7 +25223,9 @@ - }, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cidr-regex/-/cidr-regex-4.1.3.tgz", -+ "integrity": "sha512-86M1y3ZeQvpZkZejQCcS+IaSWjlDUC+ORP0peScQ4uEUFCZ8bEQVz7NlJHqysoUb6w3zCjx4Mq/8/2RHhMwHYw==" - }, - "node_modules/npm/node_modules/cli-columns": { - "version": "4.0.0", -@@ -24867,7 +25238,9 @@ - }, - "engines": { - "node": ">= 10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cli-columns/-/cli-columns-4.0.0.tgz", -+ "integrity": "sha512-XW2Vg+w+L9on9wtwKpyzluIPCWXjaBahI7mTcYjx+BVIYD9c3yqcv/yKC7CmdCZat4rq2yiE1UMSJC5ivKfMtQ==" - }, - "node_modules/npm/node_modules/cmd-shim": { - "version": "7.0.0", -@@ -24876,7 +25249,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-7.0.0.tgz", -+ "integrity": "sha512-rtpaCbr164TPPh+zFdkWpCyZuKkjpAzODfaZCf/SVJZzJN+4bHQb/LP3Jzq5/+84um3XXY8r548XiWKSborwVw==" - }, - "node_modules/npm/node_modules/color-convert": { - "version": "2.0.1", -@@ -24888,19 +25263,25 @@ - }, - "engines": { - "node": ">=7.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -+ "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==" - }, - "node_modules/npm/node_modules/color-name": { - "version": "1.1.4", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -+ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" - }, - "node_modules/npm/node_modules/common-ancestor-path": { - "version": "1.0.1", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", -+ "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==" - }, - "node_modules/npm/node_modules/cross-spawn": { - "version": "7.0.6", -@@ -24914,7 +25295,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", -+ "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==" - }, - "node_modules/npm/node_modules/cross-spawn/node_modules/which": { - "version": "2.0.2", -@@ -24929,7 +25312,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" - }, - "node_modules/npm/node_modules/cssesc": { - "version": "3.0.0", -@@ -24941,7 +25326,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", -+ "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==" - }, - "node_modules/npm/node_modules/debug": { - "version": "4.4.3", -@@ -24958,7 +25345,9 @@ - "supports-color": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==" - }, - "node_modules/npm/node_modules/diff": { - "version": "5.2.2", -@@ -24967,19 +25356,25 @@ - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.3.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/diff/-/diff-5.2.2.tgz", -+ "integrity": "sha512-vtcDfH3TOjP8UekytvnHH1o1P4FcUdt4eQ1Y+Abap1tk/OB2MWQvcwS2ClCd1zuIhc3JKOx6p3kod8Vfys3E+A==" - }, - "node_modules/npm/node_modules/eastasianwidth": { - "version": "0.2.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", -+ "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==" - }, - "node_modules/npm/node_modules/emoji-regex": { - "version": "8.0.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -+ "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" - }, - "node_modules/npm/node_modules/encoding": { - "version": "0.1.13", -@@ -24989,7 +25384,9 @@ - "optional": true, - "dependencies": { - "iconv-lite": "^0.6.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.13.tgz", -+ "integrity": "sha512-ETBauow1T35Y/WZMkio9jiM0Z5xjHHmJ4XmjZOq1l/dXz3lr2sRn87nJy20RupqSh1F2m3HHPSp8ShIPQJrJ3A==" - }, - "node_modules/npm/node_modules/env-paths": { - "version": "2.2.1", -@@ -24998,19 +25395,25 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", -+ "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==" - }, - "node_modules/npm/node_modules/err-code": { - "version": "2.0.3", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", -+ "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==" - }, - "node_modules/npm/node_modules/exponential-backoff": { - "version": "3.1.3", - "dev": true, - "inBundle": true, -- "license": "Apache-2.0" -+ "license": "Apache-2.0", -+ "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", -+ "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==" - }, - "node_modules/npm/node_modules/fastest-levenshtein": { - "version": "1.0.16", -@@ -25019,7 +25422,9 @@ - "license": "MIT", - "engines": { - "node": ">= 4.9.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", -+ "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==" - }, - "node_modules/npm/node_modules/fdir": { - "version": "6.5.0", -@@ -25036,7 +25441,9 @@ - "picomatch": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", -+ "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==" - }, - "node_modules/npm/node_modules/foreground-child": { - "version": "3.3.1", -@@ -25052,7 +25459,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", -+ "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==" - }, - "node_modules/npm/node_modules/fs-minipass": { - "version": "3.0.3", -@@ -25064,7 +25473,9 @@ - }, - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", -+ "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==" - }, - "node_modules/npm/node_modules/glob": { - "version": "10.5.0", -@@ -25084,13 +25495,17 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", -+ "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==" - }, - "node_modules/npm/node_modules/graceful-fs": { - "version": "4.2.11", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -+ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==" - }, - "node_modules/npm/node_modules/hosted-git-info": { - "version": "8.1.0", -@@ -25102,13 +25517,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-8.1.0.tgz", -+ "integrity": "sha512-Rw/B2DNQaPBICNXEm8balFz9a6WpZrkCGpcWFpy7nCj+NyhSdqXipmfvtmWt9xGfp0wZnBxB+iVpLmQMYt47Tw==" - }, - "node_modules/npm/node_modules/http-cache-semantics": { - "version": "4.2.0", - "dev": true, - "inBundle": true, -- "license": "BSD-2-Clause" -+ "license": "BSD-2-Clause", -+ "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", -+ "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==" - }, - "node_modules/npm/node_modules/http-proxy-agent": { - "version": "7.0.2", -@@ -25121,7 +25540,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", -+ "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==" - }, - "node_modules/npm/node_modules/https-proxy-agent": { - "version": "7.0.6", -@@ -25134,7 +25555,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", -+ "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==" - }, - "node_modules/npm/node_modules/iconv-lite": { - "version": "0.6.3", -@@ -25147,7 +25570,9 @@ - }, - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==" - }, - "node_modules/npm/node_modules/ignore-walk": { - "version": "7.0.0", -@@ -25159,7 +25584,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-7.0.0.tgz", -+ "integrity": "sha512-T4gbf83A4NH95zvhVYZc+qWocBBGlpzUXLPGurJggw/WIOwicfXJChLDP/iBZnN5WqROSu5Bm3hhle4z8a8YGQ==" - }, - "node_modules/npm/node_modules/imurmurhash": { - "version": "0.1.4", -@@ -25168,7 +25595,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.8.19" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", -+ "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==" - }, - "node_modules/npm/node_modules/ini": { - "version": "5.0.0", -@@ -25177,7 +25606,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", -+ "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==" - }, - "node_modules/npm/node_modules/init-package-json": { - "version": "7.0.2", -@@ -25195,7 +25626,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/init-package-json/-/init-package-json-7.0.2.tgz", -+ "integrity": "sha512-Qg6nAQulaOQZjvaSzVLtYRqZmuqOi7gTknqqgdhZy7LV5oO+ppvHWq15tZYzGyxJLTH5BxRTqTa+cPDx2pSD9Q==" - }, - "node_modules/npm/node_modules/ip-address": { - "version": "10.1.0", -@@ -25204,7 +25637,9 @@ - "license": "MIT", - "engines": { - "node": ">= 12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", -+ "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==" - }, - "node_modules/npm/node_modules/ip-regex": { - "version": "5.0.0", -@@ -25216,7 +25651,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-5.0.0.tgz", -+ "integrity": "sha512-fOCG6lhoKKakwv+C6KdsOnGvgXnmgfmp0myi3bcNwj3qfwPAxRKWEuFhvEFF7ceYIz6+1jRZ+yguLFAmUNPEfw==" - }, - "node_modules/npm/node_modules/is-cidr": { - "version": "5.1.1", -@@ -25228,7 +25665,9 @@ - }, - "engines": { - "node": ">=14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-cidr/-/is-cidr-5.1.1.tgz", -+ "integrity": "sha512-AwzRMjtJNTPOgm7xuYZ71715z99t+4yRnSnSzgK5err5+heYi4zMuvmpUadaJ28+KCXCQo8CjUrKQZRWSPmqTQ==" - }, - "node_modules/npm/node_modules/is-fullwidth-code-point": { - "version": "3.0.0", -@@ -25237,13 +25676,17 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -+ "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" - }, - "node_modules/npm/node_modules/isexe": { - "version": "2.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -+ "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==" - }, - "node_modules/npm/node_modules/jackspeak": { - "version": "3.4.3", -@@ -25258,7 +25701,9 @@ - }, - "optionalDependencies": { - "@pkgjs/parseargs": "^0.11.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", -+ "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==" - }, - "node_modules/npm/node_modules/json-parse-even-better-errors": { - "version": "4.0.0", -@@ -25267,7 +25712,9 @@ - "license": "MIT", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-4.0.0.tgz", -+ "integrity": "sha512-lR4MXjGNgkJc7tkQ97kb2nuEMnNCyU//XYVH0MKTGcXEiSudQ5MKGKen3C5QubYy0vmq+JGitUg92uuywGEwIA==" - }, - "node_modules/npm/node_modules/json-stringify-nice": { - "version": "1.1.4", -@@ -25276,7 +25723,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", -+ "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==" - }, - "node_modules/npm/node_modules/jsonparse": { - "version": "1.3.1", -@@ -25285,19 +25734,25 @@ - "node >= 0.2.0" - ], - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", -+ "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==" - }, - "node_modules/npm/node_modules/just-diff": { - "version": "6.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", -+ "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==" - }, - "node_modules/npm/node_modules/just-diff-apply": { - "version": "5.5.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", -+ "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==" - }, - "node_modules/npm/node_modules/libnpmaccess": { - "version": "9.0.0", -@@ -25310,7 +25765,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmaccess/-/libnpmaccess-9.0.0.tgz", -+ "integrity": "sha512-mTCFoxyevNgXRrvgdOhghKJnCWByBc9yp7zX4u9RBsmZjwOYdUDEBfL5DdgD1/8gahsYnauqIWFbq0iK6tO6CQ==" - }, - "node_modules/npm/node_modules/libnpmdiff": { - "version": "7.0.5", -@@ -25329,7 +25786,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmdiff/-/libnpmdiff-7.0.5.tgz", -+ "integrity": "sha512-pQ9Hg/j1DcHoY2tbkMKK8mIuEuDlwL9sYKmhY8foofBC8isgtjfrzXDjm4teoy91Pa2ukpnV8dXqKmFb04mc4A==" - }, - "node_modules/npm/node_modules/libnpmexec": { - "version": "9.0.5", -@@ -25350,7 +25809,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmexec/-/libnpmexec-9.0.5.tgz", -+ "integrity": "sha512-XAuPuoQhSgv8FEI03zvnxgr7ueeClSLUfHRwG+xtE9Ue2gjny7CIgpJsjd2a6evS0yHu8CcqtEumq50WzQ/UtQ==" - }, - "node_modules/npm/node_modules/libnpmfund": { - "version": "6.0.5", -@@ -25362,7 +25823,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmfund/-/libnpmfund-6.0.5.tgz", -+ "integrity": "sha512-8tGUrvobGjeAmbUxFI7ivjgWpeGsSz9CmI7FtrMdu7iGbtAcTESszl2J+R1+Pu0M+TO9fQIbyeovWGM6lI0akA==" - }, - "node_modules/npm/node_modules/libnpmhook": { - "version": "11.0.0", -@@ -25375,7 +25838,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmhook/-/libnpmhook-11.0.0.tgz", -+ "integrity": "sha512-Xc18rD9NFbRwZbYCQ+UCF5imPsiHSyuQA8RaCA2KmOUo8q4kmBX4JjGWzmZnxZCT8s6vwzmY1BvHNqBGdg9oBQ==" - }, - "node_modules/npm/node_modules/libnpmorg": { - "version": "7.0.0", -@@ -25388,7 +25853,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmorg/-/libnpmorg-7.0.0.tgz", -+ "integrity": "sha512-DcTodX31gDEiFrlIHurBQiBlBO6Var2KCqMVCk+HqZhfQXqUfhKGmFOp0UHr6HR1lkTVM0MzXOOYtUObk0r6Dg==" - }, - "node_modules/npm/node_modules/libnpmpack": { - "version": "8.0.5", -@@ -25403,7 +25870,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmpack/-/libnpmpack-8.0.5.tgz", -+ "integrity": "sha512-j1Zyacp6VRe1HsmOH4MWpEOLMzPKwBkmSgMn5ep83wbALPIwD7LcAvhyjM9sEFjKyFuqmX56XUvNLcF8sUayOg==" - }, - "node_modules/npm/node_modules/libnpmpublish": { - "version": "10.0.2", -@@ -25422,7 +25891,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmpublish/-/libnpmpublish-10.0.2.tgz", -+ "integrity": "sha512-Q+PlGO6vOZDlZ6jKPDqDLYbARfV5OBusmJZj9GPbNUiys8OK6/yrwJ8ty8ibbc4GkMspqgOMdJ/1dcJwhtpkDg==" - }, - "node_modules/npm/node_modules/libnpmsearch": { - "version": "8.0.0", -@@ -25434,7 +25905,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmsearch/-/libnpmsearch-8.0.0.tgz", -+ "integrity": "sha512-W8FWB78RS3Nkl1gPSHOlF024qQvcoU/e3m9BGDuBfVZGfL4MJ91GXXb04w3zJCGOW9dRQUyWVEqupFjCrgltDg==" - }, - "node_modules/npm/node_modules/libnpmteam": { - "version": "7.0.0", -@@ -25447,7 +25920,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmteam/-/libnpmteam-7.0.0.tgz", -+ "integrity": "sha512-PKLOoVukN34qyJjgEm5DEOnDwZkeVMUHRx8NhcKDiCNJGPl7G/pF1cfBw8yicMwRlHaHkld1FdujOzKzy4AlwA==" - }, - "node_modules/npm/node_modules/libnpmversion": { - "version": "7.0.0", -@@ -25463,13 +25938,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/libnpmversion/-/libnpmversion-7.0.0.tgz", -+ "integrity": "sha512-0xle91R6F8r/Q/4tHOnyKko+ZSquEXNdxwRdKCPv4kC1cOVBMFXRsKKrVtRKtXcFn362U8ZlJefk4Apu00424g==" - }, - "node_modules/npm/node_modules/lru-cache": { - "version": "10.4.3", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", -+ "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" - }, - "node_modules/npm/node_modules/make-fetch-happen": { - "version": "14.0.3", -@@ -25491,7 +25970,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-14.0.3.tgz", -+ "integrity": "sha512-QMjGbFTP0blj97EeidG5hk/QhKQ3T4ICckQGLgz38QF7Vgbk6e6FTARN8KhKxyBbWn8R0HU+bnw8aSoFPD4qtQ==" - }, - "node_modules/npm/node_modules/minimatch": { - "version": "9.0.9", -@@ -25506,7 +25987,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", -+ "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==" - }, - "node_modules/npm/node_modules/minipass": { - "version": "7.1.3", -@@ -25515,7 +25998,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=16 || 14 >=14.17" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", -+ "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==" - }, - "node_modules/npm/node_modules/minipass-collect": { - "version": "2.0.1", -@@ -25527,7 +26012,9 @@ - }, - "engines": { - "node": ">=16 || 14 >=14.17" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", -+ "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==" - }, - "node_modules/npm/node_modules/minipass-fetch": { - "version": "4.0.1", -@@ -25544,7 +26031,9 @@ - }, - "optionalDependencies": { - "encoding": "^0.1.13" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-4.0.1.tgz", -+ "integrity": "sha512-j7U11C5HXigVuutxebFadoYBbd7VSdZWggSe64NVdvWNBqGAiXPL2QVCehjmw7lY1oF9gOllYbORh+hiNgfPgQ==" - }, - "node_modules/npm/node_modules/minipass-flush": { - "version": "1.0.5", -@@ -25556,7 +26045,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", -+ "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==" - }, - "node_modules/npm/node_modules/minipass-flush/node_modules/minipass": { - "version": "3.3.6", -@@ -25568,13 +26059,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-flush/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minipass-pipeline": { - "version": "1.2.4", -@@ -25586,7 +26081,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", -+ "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==" - }, - "node_modules/npm/node_modules/minipass-pipeline/node_modules/minipass": { - "version": "3.3.6", -@@ -25598,13 +26095,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-pipeline/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minipass-sized": { - "version": "1.0.3", -@@ -25616,7 +26117,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", -+ "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==" - }, - "node_modules/npm/node_modules/minipass-sized/node_modules/minipass": { - "version": "3.3.6", -@@ -25628,13 +26131,17 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", -+ "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==" - }, - "node_modules/npm/node_modules/minipass-sized/node_modules/yallist": { - "version": "4.0.0", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", -+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==" - }, - "node_modules/npm/node_modules/minizlib": { - "version": "3.1.0", -@@ -25646,13 +26153,17 @@ - }, - "engines": { - "node": ">= 18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", -+ "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==" - }, - "node_modules/npm/node_modules/ms": { - "version": "2.1.3", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==" - }, - "node_modules/npm/node_modules/mute-stream": { - "version": "2.0.0", -@@ -25661,7 +26172,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-2.0.0.tgz", -+ "integrity": "sha512-WWdIxpyjEn+FhQJQQv9aQAYlHoNVdzIzUySNV1gHUPDSdZJ3yZn7pAAbQcV7B56Mvu881q9FZV+0Vx2xC44VWA==" - }, - "node_modules/npm/node_modules/negotiator": { - "version": "1.0.0", -@@ -25670,7 +26183,9 @@ - "license": "MIT", - "engines": { - "node": ">= 0.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", -+ "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==" - }, - "node_modules/npm/node_modules/node-gyp": { - "version": "11.5.0", -@@ -25694,7 +26209,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-11.5.0.tgz", -+ "integrity": "sha512-ra7Kvlhxn5V9Slyus0ygMa2h+UqExPqUIkfk7Pc8QTLT956JLSy51uWFwHtIYy0vI8cB4BDhc/S03+880My/LQ==" - }, - "node_modules/npm/node_modules/nopt": { - "version": "8.1.0", -@@ -25709,7 +26226,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", -+ "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==" - }, - "node_modules/npm/node_modules/normalize-package-data": { - "version": "7.0.1", -@@ -25723,7 +26242,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-7.0.1.tgz", -+ "integrity": "sha512-linxNAT6M0ebEYZOx2tO6vBEFsVgnPpv+AVjk0wJHfaUIbq31Jm3T6vvZaarnOeWDh8ShnwXuaAyM7WT3RzErA==" - }, - "node_modules/npm/node_modules/npm-audit-report": { - "version": "6.0.0", -@@ -25732,7 +26253,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-audit-report/-/npm-audit-report-6.0.0.tgz", -+ "integrity": "sha512-Ag6Y1irw/+CdSLqEEAn69T8JBgBThj5mw0vuFIKeP7hATYuQuS5jkMjK6xmVB8pr7U4g5Audbun0lHhBDMIBRA==" - }, - "node_modules/npm/node_modules/npm-bundled": { - "version": "4.0.0", -@@ -25744,7 +26267,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-4.0.0.tgz", -+ "integrity": "sha512-IxaQZDMsqfQ2Lz37VvyyEtKLe8FsRZuysmedy/N06TU1RyVppYKXrO4xIhR0F+7ubIBox6Q7nir6fQI3ej39iA==" - }, - "node_modules/npm/node_modules/npm-install-checks": { - "version": "7.1.2", -@@ -25756,7 +26281,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-7.1.2.tgz", -+ "integrity": "sha512-z9HJBCYw9Zr8BqXcllKIs5nI+QggAImbBdHphOzVYrz2CB4iQ6FzWyKmlqDZua+51nAu7FcemlbTc9VgQN5XDQ==" - }, - "node_modules/npm/node_modules/npm-normalize-package-bin": { - "version": "4.0.0", -@@ -25765,7 +26292,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-4.0.0.tgz", -+ "integrity": "sha512-TZKxPvItzai9kN9H/TkmCtx/ZN/hvr3vUycjlfmH0ootY9yFBzNOpiXAdIn1Iteqsvk4lQn6B5PTrt+n6h8k/w==" - }, - "node_modules/npm/node_modules/npm-package-arg": { - "version": "12.0.2", -@@ -25780,7 +26309,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-12.0.2.tgz", -+ "integrity": "sha512-f1NpFjNI9O4VbKMOlA5QoBq/vSQPORHcTZ2feJpFkTHJ9eQkdlmZEKSjcAhxTGInC7RlEyScT9ui67NaOsjFWA==" - }, - "node_modules/npm/node_modules/npm-packlist": { - "version": "9.0.0", -@@ -25792,7 +26323,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-9.0.0.tgz", -+ "integrity": "sha512-8qSayfmHJQTx3nJWYbbUmflpyarbLMBc6LCAjYsiGtXxDB68HaZpb8re6zeaLGxZzDuMdhsg70jryJe+RrItVQ==" - }, - "node_modules/npm/node_modules/npm-pick-manifest": { - "version": "10.0.0", -@@ -25807,7 +26340,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-10.0.0.tgz", -+ "integrity": "sha512-r4fFa4FqYY8xaM7fHecQ9Z2nE9hgNfJR+EmoKv0+chvzWkBcORX3r0FpTByP+CbOVJDladMXnPQGVN8PBLGuTQ==" - }, - "node_modules/npm/node_modules/npm-profile": { - "version": "11.0.1", -@@ -25820,7 +26355,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-profile/-/npm-profile-11.0.1.tgz", -+ "integrity": "sha512-HP5Cw9WHwFS9vb4fxVlkNAQBUhVL5BmW6rAR+/JWkpwqcFJid7TihKUdYDWqHl0NDfLd0mpucheGySqo8ysyfw==" - }, - "node_modules/npm/node_modules/npm-registry-fetch": { - "version": "18.0.2", -@@ -25839,7 +26376,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-18.0.2.tgz", -+ "integrity": "sha512-LeVMZBBVy+oQb5R6FDV9OlJCcWDU+al10oKpe+nsvcHnG24Z3uM3SvJYKfGJlfGjVU8v9liejCrUR/M5HO5NEQ==" - }, - "node_modules/npm/node_modules/npm-user-validate": { - "version": "3.0.0", -@@ -25848,7 +26387,9 @@ - "license": "BSD-2-Clause", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/npm-user-validate/-/npm-user-validate-3.0.0.tgz", -+ "integrity": "sha512-9xi0RdSmJ4mPYTC393VJPz1Sp8LyCx9cUnm/L9Qcb3cFO8gjT4mN20P9FAsea8qDHdQ7LtcN8VLh2UT47SdKCw==" - }, - "node_modules/npm/node_modules/p-map": { - "version": "7.0.4", -@@ -25860,13 +26401,17 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", -+ "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==" - }, - "node_modules/npm/node_modules/package-json-from-dist": { - "version": "1.0.1", - "dev": true, - "inBundle": true, -- "license": "BlueOak-1.0.0" -+ "license": "BlueOak-1.0.0", -+ "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", -+ "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==" - }, - "node_modules/npm/node_modules/pacote": { - "version": "19.0.2", -@@ -25897,7 +26442,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pacote/-/pacote-19.0.2.tgz", -+ "integrity": "sha512-iNInrWMS+PzYbaef5EW/mU8OiCPxGuTmYn6ht5ImeXd5TZIVY4+dDmIrbpB6v0MKG/KIMMvj2UD7eKU9GbTGHA==" - }, - "node_modules/npm/node_modules/parse-conflict-json": { - "version": "4.0.0", -@@ -25911,7 +26458,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-4.0.0.tgz", -+ "integrity": "sha512-37CN2VtcuvKgHUs8+0b1uJeEsbGn61GRHz469C94P5xiOoqpDYJYwjg4RY9Vmz39WyZAVkR5++nbJwLMIgOCnQ==" - }, - "node_modules/npm/node_modules/path-key": { - "version": "3.1.1", -@@ -25920,7 +26469,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "node_modules/npm/node_modules/path-scurry": { - "version": "1.11.1", -@@ -25936,7 +26487,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", -+ "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==" - }, - "node_modules/npm/node_modules/picomatch": { - "version": "4.0.3", -@@ -25948,7 +26501,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", -+ "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==" - }, - "node_modules/npm/node_modules/postcss-selector-parser": { - "version": "7.1.1", -@@ -25961,7 +26516,9 @@ - }, - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.1.tgz", -+ "integrity": "sha512-orRsuYpJVw8LdAwqqLykBj9ecS5/cRHlI5+nvTo8LcCKmzDmqVORXtOIYEEQuL9D4BxtA1lm5isAqzQZCoQ6Eg==" - }, - "node_modules/npm/node_modules/proc-log": { - "version": "5.0.0", -@@ -25970,7 +26527,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", -+ "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==" - }, - "node_modules/npm/node_modules/proggy": { - "version": "3.0.0", -@@ -25979,7 +26538,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/proggy/-/proggy-3.0.0.tgz", -+ "integrity": "sha512-QE8RApCM3IaRRxVzxrjbgNMpQEX6Wu0p0KBeoSiSEw5/bsGwZHsshF4LCxH2jp/r6BU+bqA3LrMDEYNfJnpD8Q==" - }, - "node_modules/npm/node_modules/promise-all-reject-late": { - "version": "1.0.1", -@@ -25988,7 +26549,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", -+ "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==" - }, - "node_modules/npm/node_modules/promise-call-limit": { - "version": "3.0.2", -@@ -25997,7 +26560,9 @@ - "license": "ISC", - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", -+ "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==" - }, - "node_modules/npm/node_modules/promise-retry": { - "version": "2.0.1", -@@ -26010,7 +26575,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", -+ "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==" - }, - "node_modules/npm/node_modules/promzard": { - "version": "2.0.0", -@@ -26022,7 +26589,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/promzard/-/promzard-2.0.0.tgz", -+ "integrity": "sha512-Ncd0vyS2eXGOjchIRg6PVCYKetJYrW1BSbbIo+bKdig61TB6nH2RQNF2uP+qMpsI73L/jURLWojcw8JNIKZ3gg==" - }, - "node_modules/npm/node_modules/qrcode-terminal": { - "version": "0.12.0", -@@ -26030,7 +26599,9 @@ - "inBundle": true, - "bin": { - "qrcode-terminal": "bin/qrcode-terminal.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", -+ "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==" - }, - "node_modules/npm/node_modules/read": { - "version": "4.1.0", -@@ -26042,7 +26613,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read/-/read-4.1.0.tgz", -+ "integrity": "sha512-uRfX6K+f+R8OOrYScaM3ixPY4erg69f8DN6pgTvMcA9iRc8iDhwrA4m3Yu8YYKsXJgVvum+m8PkRboZwwuLzYA==" - }, - "node_modules/npm/node_modules/read-cmd-shim": { - "version": "5.0.0", -@@ -26051,7 +26624,9 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-5.0.0.tgz", -+ "integrity": "sha512-SEbJV7tohp3DAAILbEMPXavBjAnMN0tVnh4+9G8ihV4Pq3HYF9h8QNez9zkJ1ILkv9G2BjdzwctznGZXgu/HGw==" - }, - "node_modules/npm/node_modules/read-package-json-fast": { - "version": "4.0.0", -@@ -26064,7 +26639,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-4.0.0.tgz", -+ "integrity": "sha512-qpt8EwugBWDw2cgE2W+/3oxC+KTez2uSVR8JU9Q36TXPAGCaozfQUs59v4j4GFpWTaw0i6hAZSvOmu1J0uOEUg==" - }, - "node_modules/npm/node_modules/retry": { - "version": "0.12.0", -@@ -26073,14 +26650,18 @@ - "license": "MIT", - "engines": { - "node": ">= 4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", -+ "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==" - }, - "node_modules/npm/node_modules/safer-buffer": { - "version": "2.1.2", - "dev": true, - "inBundle": true, - "license": "MIT", -- "optional": true -+ "optional": true, -+ "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -+ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" - }, - "node_modules/npm/node_modules/semver": { - "version": "7.7.4", -@@ -26092,7 +26673,9 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==" - }, - "node_modules/npm/node_modules/shebang-command": { - "version": "2.0.0", -@@ -26104,7 +26687,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" - }, - "node_modules/npm/node_modules/shebang-regex": { - "version": "3.0.0", -@@ -26113,7 +26698,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "node_modules/npm/node_modules/signal-exit": { - "version": "4.1.0", -@@ -26125,7 +26712,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", -+ "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==" - }, - "node_modules/npm/node_modules/sigstore": { - "version": "3.1.0", -@@ -26142,7 +26731,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-3.1.0.tgz", -+ "integrity": "sha512-ZpzWAFHIFqyFE56dXqgX/DkDRZdz+rRcjoIk/RQU4IX0wiCv1l8S7ZrXDHcCc+uaf+6o7w3h2l3g6GYG5TKN9Q==" - }, - "node_modules/npm/node_modules/smart-buffer": { - "version": "4.2.0", -@@ -26152,7 +26743,9 @@ - "engines": { - "node": ">= 6.0.0", - "npm": ">= 3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", -+ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==" - }, - "node_modules/npm/node_modules/socks": { - "version": "2.8.7", -@@ -26166,7 +26759,9 @@ - "engines": { - "node": ">= 10.0.0", - "npm": ">= 3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", -+ "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==" - }, - "node_modules/npm/node_modules/socks-proxy-agent": { - "version": "8.0.5", -@@ -26180,7 +26775,9 @@ - }, - "engines": { - "node": ">= 14" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", -+ "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==" - }, - "node_modules/npm/node_modules/spdx-correct": { - "version": "3.2.0", -@@ -26190,7 +26787,9 @@ - "dependencies": { - "spdx-expression-parse": "^3.0.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", -+ "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==" - }, - "node_modules/npm/node_modules/spdx-correct/node_modules/spdx-expression-parse": { - "version": "3.0.1", -@@ -26200,13 +26799,17 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" - }, - "node_modules/npm/node_modules/spdx-exceptions": { - "version": "2.5.0", - "dev": true, - "inBundle": true, -- "license": "CC-BY-3.0" -+ "license": "CC-BY-3.0", -+ "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", -+ "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==" - }, - "node_modules/npm/node_modules/spdx-expression-parse": { - "version": "4.0.0", -@@ -26216,13 +26819,17 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", -+ "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==" - }, - "node_modules/npm/node_modules/spdx-license-ids": { - "version": "3.0.23", - "dev": true, - "inBundle": true, -- "license": "CC0-1.0" -+ "license": "CC0-1.0", -+ "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.23.tgz", -+ "integrity": "sha512-CWLcCCH7VLu13TgOH+r8p1O/Znwhqv/dbb6lqWy67G+pT1kHmeD/+V36AVb/vq8QMIQwVShJ6Ssl5FPh0fuSdw==" - }, - "node_modules/npm/node_modules/ssri": { - "version": "12.0.0", -@@ -26234,7 +26841,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ssri/-/ssri-12.0.0.tgz", -+ "integrity": "sha512-S7iGNosepx9RadX82oimUkvr0Ct7IjJbEbs4mJcTxst8um95J3sDYU1RBEOvdu6oL1Wek2ODI5i4MAw+dZ6cAQ==" - }, - "node_modules/npm/node_modules/string-width": { - "version": "4.2.3", -@@ -26248,7 +26857,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/npm/node_modules/string-width-cjs": { - "name": "string-width", -@@ -26263,7 +26874,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/npm/node_modules/strip-ansi": { - "version": "6.0.1", -@@ -26275,7 +26888,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/npm/node_modules/strip-ansi-cjs": { - "name": "strip-ansi", -@@ -26288,7 +26903,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/npm/node_modules/supports-color": { - "version": "9.4.0", -@@ -26300,7 +26917,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/supports-color?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-9.4.0.tgz", -+ "integrity": "sha512-VL+lNrEoIXww1coLPOmiEmK/0sGigko5COxI09KzHc2VJXJsQ37UaQ+8quuxjDeA7+KnLGTWRyOXSLLR2Wb4jw==" - }, - "node_modules/npm/node_modules/tar": { - "version": "7.5.11", -@@ -26316,19 +26935,25 @@ - }, - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.11.tgz", -+ "integrity": "sha512-ChjMH33/KetonMTAtpYdgUFr0tbz69Fp2v7zWxQfYZX4g5ZN2nOBXm1R2xyA+lMIKrLKIoKAwFj93jE/avX9cQ==" - }, - "node_modules/npm/node_modules/text-table": { - "version": "0.2.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", -+ "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" - }, - "node_modules/npm/node_modules/tiny-relative-date": { - "version": "1.3.0", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tiny-relative-date/-/tiny-relative-date-1.3.0.tgz", -+ "integrity": "sha512-MOQHpzllWxDCHHaDno30hhLfbouoYlOI8YlMNtvKe1zXbjEVhbcEovQxvZrPvtiYW630GQDoMMarCnjfyfHA+A==" - }, - "node_modules/npm/node_modules/tinyglobby": { - "version": "0.2.15", -@@ -26344,7 +26969,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", -+ "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==" - }, - "node_modules/npm/node_modules/treeverse": { - "version": "3.0.0", -@@ -26353,7 +26980,9 @@ - "license": "ISC", - "engines": { - "node": "^14.17.0 || ^16.13.0 || >=18.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", -+ "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==" - }, - "node_modules/npm/node_modules/tuf-js": { - "version": "3.1.0", -@@ -26367,7 +26996,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-3.1.0.tgz", -+ "integrity": "sha512-3T3T04WzowbwV2FDiGXBbr81t64g1MUGGJRgT4x5o97N+8ArdhVCAF9IxFrxuSJmM3E5Asn7nKHkao0ibcZXAg==" - }, - "node_modules/npm/node_modules/tuf-js/node_modules/@tufjs/models": { - "version": "3.0.1", -@@ -26380,7 +27011,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-3.0.1.tgz", -+ "integrity": "sha512-UUYHISyhCU3ZgN8yaear3cGATHb3SMuKHsQ/nVbHXcmnBf+LzQ/cQfhNG+rfaSHgqGKNEm2cOCLVLELStUQ1JA==" - }, - "node_modules/npm/node_modules/unique-filename": { - "version": "4.0.0", -@@ -26392,7 +27025,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-4.0.0.tgz", -+ "integrity": "sha512-XSnEewXmQ+veP7xX2dS5Q4yZAvO40cBN2MWkJ7D/6sW4Dg6wYBNwM1Vrnz1FhH5AdeLIlUXRI9e28z1YZi71NQ==" - }, - "node_modules/npm/node_modules/unique-slug": { - "version": "5.0.0", -@@ -26404,13 +27039,17 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-5.0.0.tgz", -+ "integrity": "sha512-9OdaqO5kwqR+1kVgHAhsp5vPNU0hnxRa26rBFNfNgM7M6pNtgzeBn3s/xbyCQL3dcjzOatcef6UUHpB/6MaETg==" - }, - "node_modules/npm/node_modules/util-deprecate": { - "version": "1.0.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/npm/node_modules/validate-npm-package-license": { - "version": "3.0.4", -@@ -26420,7 +27059,9 @@ - "dependencies": { - "spdx-correct": "^3.0.0", - "spdx-expression-parse": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", -+ "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==" - }, - "node_modules/npm/node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { - "version": "3.0.1", -@@ -26430,7 +27071,9 @@ - "dependencies": { - "spdx-exceptions": "^2.1.0", - "spdx-license-ids": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", -+ "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==" - }, - "node_modules/npm/node_modules/validate-npm-package-name": { - "version": "6.0.2", -@@ -26439,13 +27082,17 @@ - "license": "ISC", - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-6.0.2.tgz", -+ "integrity": "sha512-IUoow1YUtvoBBC06dXs8bR8B9vuA3aJfmQNKMoaPG/OFsPmoQvw8xh+6Ye25Gx9DQhoEom3Pcu9MKHerm/NpUQ==" - }, - "node_modules/npm/node_modules/walk-up-path": { - "version": "3.0.1", - "dev": true, - "inBundle": true, -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", -+ "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==" - }, - "node_modules/npm/node_modules/which": { - "version": "5.0.0", -@@ -26460,7 +27107,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-5.0.0.tgz", -+ "integrity": "sha512-JEdGzHwwkrbWoGOlIHqQ5gtprKGOenpDHpxE9zVR1bWbOtYRyPPHMe9FaP6x61CmNaTThSkb0DAJte5jD+DmzQ==" - }, - "node_modules/npm/node_modules/which/node_modules/isexe": { - "version": "3.1.5", -@@ -26469,7 +27118,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.5.tgz", -+ "integrity": "sha512-6B3tLtFqtQS4ekarvLVMZ+X+VlvQekbe4taUkf/rhVO3d/h0M2rfARm/pXLcPEsjjMsFgrFgSrhQIxcSVrBz8w==" - }, - "node_modules/npm/node_modules/wrap-ansi": { - "version": "8.1.0", -@@ -26486,7 +27137,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", -+ "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==" - }, - "node_modules/npm/node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", -@@ -26504,7 +27157,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" - }, - "node_modules/npm/node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { - "version": "4.3.0", -@@ -26519,7 +27174,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", -+ "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/ansi-regex": { - "version": "6.2.2", -@@ -26531,13 +27188,17 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", -+ "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/emoji-regex": { - "version": "9.2.2", - "dev": true, - "inBundle": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", -+ "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/string-width": { - "version": "5.1.2", -@@ -26554,7 +27215,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -+ "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==" - }, - "node_modules/npm/node_modules/wrap-ansi/node_modules/strip-ansi": { - "version": "7.2.0", -@@ -26569,7 +27232,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/strip-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", -+ "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==" - }, - "node_modules/npm/node_modules/write-file-atomic": { - "version": "6.0.0", -@@ -26582,7 +27247,9 @@ - }, - "engines": { - "node": "^18.17.0 || >=20.5.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz", -+ "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==" - }, - "node_modules/npm/node_modules/yallist": { - "version": "5.0.0", -@@ -26591,7 +27258,9 @@ - "license": "BlueOak-1.0.0", - "engines": { - "node": ">=18" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", -+ "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==" - }, - "node_modules/nth-check": { - "version": "2.1.1", -@@ -26763,7 +27432,9 @@ - "license": "ISC", - "dependencies": { - "wrappy": "1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", -+ "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==" - }, - "node_modules/onetime": { - "version": "5.1.2", -@@ -26779,6 +27450,19 @@ - "url": "https://github.com/sponsors/sindresorhus" - } - }, -+ "node_modules/only-allow": { -+ "version": "1.2.2", -+ "resolved": "https://registry.npmjs.org/only-allow/-/only-allow-1.2.2.tgz", -+ "integrity": "sha512-uxyNYDsCh5YIJ780G7hC5OHjVUr9reHsbZNMM80L9tZlTpb3hUzb36KXgW4ZUGtJKQnGA3xegmWg1BxhWV0jJA==", -+ "dev": true, -+ "license": "MIT", -+ "dependencies": { -+ "which-pm-runs": "1.1.0" -+ }, -+ "bin": { -+ "only-allow": "bin.js" -+ } -+ }, - "node_modules/open": { - "version": "10.2.0", - "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz", -@@ -26835,7 +27519,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.3.tgz", -+ "integrity": "sha512-JjCoypp+jKn1ttEFExxhetCKeJt9zhAgAve5FXHixTvFDW/5aEktX9bufBKLRRMdU7bNtpLfcGu94B3cdEJgjg==" - }, - "node_modules/orderedmap": { - "version": "2.1.1", -@@ -26949,7 +27635,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", -+ "integrity": "sha512-Wo8VsW4IRQSKVXsJCn7TomUaVtyfjVDn3nUP7kE967BQk0CwFpdbZs0X0uk5sW9mkBa9eNM7hCMaG93WUAwxYQ==" - }, - "node_modules/p-limit": { - "version": "3.1.0", -@@ -26962,7 +27650,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", -+ "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==" - }, - "node_modules/p-locate": { - "version": "5.0.0", -@@ -26975,7 +27665,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", -+ "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==" - }, - "node_modules/p-map": { - "version": "7.0.3", -@@ -27031,7 +27723,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", -+ "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" - }, - "node_modules/pac-proxy-agent": { - "version": "7.1.0", -@@ -27439,7 +28133,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", -+ "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" - }, - "node_modules/path-is-absolute": { - "version": "1.0.1", -@@ -27447,7 +28143,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", -+ "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==" - }, - "node_modules/path-is-inside": { - "version": "1.0.2", -@@ -27461,11 +28159,15 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -+ "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" - }, - "node_modules/path-parse": { - "version": "1.0.7", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", -+ "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==" - }, - "node_modules/path-scurry": { - "version": "1.11.1", -@@ -27498,7 +28200,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", -+ "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==" - }, - "node_modules/pathe": { - "version": "2.0.3", -@@ -27582,7 +28286,9 @@ - "license": "MIT", - "engines": { - "node": ">=4" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz", -+ "integrity": "sha512-C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg==" - }, - "node_modules/pikaday": { - "version": "1.8.2", -@@ -27656,7 +28362,9 @@ - "license": "MIT", - "engines": { - "node": ">= 6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz", -+ "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==" - }, - "node_modules/pixelmatch": { - "version": "7.1.0", -@@ -27769,7 +28477,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", -+ "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==" - }, - "node_modules/pkg-dir/node_modules/find-up": { - "version": "4.1.0", -@@ -27781,7 +28491,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", -+ "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==" - }, - "node_modules/pkg-dir/node_modules/locate-path": { - "version": "5.0.0", -@@ -27792,7 +28504,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", -+ "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==" - }, - "node_modules/pkg-dir/node_modules/p-limit": { - "version": "2.3.0", -@@ -27806,7 +28520,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", -+ "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==" - }, - "node_modules/pkg-dir/node_modules/p-locate": { - "version": "4.1.0", -@@ -27817,7 +28533,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", -+ "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==" - }, - "node_modules/playwright": { - "version": "1.56.1", -@@ -28115,7 +28833,9 @@ - "license": "MIT", - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", -+ "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==" - }, - "node_modules/prepend-http": { - "version": "1.0.4", -@@ -28193,7 +28913,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", -+ "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==" - }, - "node_modules/pretty-ms": { - "version": "9.0.0", -@@ -28213,7 +28935,9 @@ - "node_modules/process-nextick-args": { - "version": "2.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -+ "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" - }, - "node_modules/process-warning": { - "version": "5.0.0", -@@ -28481,7 +29205,9 @@ - }, - "node_modules/proto-list": { - "version": "1.2.4", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", -+ "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==" - }, - "node_modules/protobufjs": { - "version": "7.5.0", -@@ -28581,7 +29307,9 @@ - }, - "node_modules/proxy-from-env": { - "version": "1.1.0", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", -+ "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" - }, - "node_modules/pseudomap": { - "version": "1.0.2", -@@ -28750,7 +29478,9 @@ - "license": "MIT", - "engines": { - "node": ">=6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.0.tgz", -+ "integrity": "sha512-rRV+zQD8tVFys26lAGR9WUuS4iUAngJScM+ZRSKtvl5tKeZ2t5bvdNFdNHBW9FWR4guGHlgmsZ1G7BSm2wTbuA==" - }, - "node_modules/punycode.js": { - "version": "2.3.1", -@@ -28881,7 +29611,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", -+ "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==" - }, - "node_modules/quick-format-unescaped": { - "version": "4.0.4", -@@ -28962,7 +29694,9 @@ - }, - "bin": { - "rc": "cli.js" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", -+ "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==" - }, - "node_modules/rc/node_modules/ini": { - "version": "1.3.8", -@@ -28976,7 +29710,9 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", -+ "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==" - }, - "node_modules/react": { - "version": "19.2.0", -@@ -29100,7 +29836,9 @@ - "node_modules/react-is": { - "version": "18.2.0", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", -+ "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" - }, - "node_modules/react-reconciler": { - "version": "0.33.0", -@@ -29327,12 +30065,16 @@ - "safe-buffer": "~5.1.1", - "string_decoder": "~1.1.1", - "util-deprecate": "~1.0.1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", -+ "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==" - }, - "node_modules/readable-stream/node_modules/safe-buffer": { - "version": "5.1.2", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/readdirp": { - "version": "3.6.0", -@@ -29606,14 +30348,18 @@ - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", -+ "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==" - }, - "node_modules/require-from-string": { - "version": "2.0.2", - "license": "MIT", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", -+ "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==" - }, - "node_modules/require-in-the-middle": { - "version": "7.5.1", -@@ -29666,7 +30412,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", -+ "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==" - }, - "node_modules/resolve-cwd/node_modules/resolve-from": { - "version": "5.0.0", -@@ -29674,7 +30422,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", -+ "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" - }, - "node_modules/resolve-from": { - "version": "4.0.0", -@@ -29691,7 +30441,9 @@ - "license": "MIT", - "funding": { - "url": "https://github.com/privatenumber/resolve-pkg-maps?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/resolve-pkg-maps/-/resolve-pkg-maps-1.0.0.tgz", -+ "integrity": "sha512-seS2Tj26TBVOC2NIc2rOe2y2ZO7efxITtLZcGSOnHHNOQ7CkiUBfw0Iw2ck6xkIhPwLhKNLS8BO+hEpngQlqzw==" - }, - "node_modules/resolve-url": { - "version": "0.2.1", -@@ -29771,7 +30523,9 @@ - "engines": { - "iojs": ">=1.0.0", - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", -+ "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==" - }, - "node_modules/rfdc": { - "version": "1.4.1", -@@ -30030,7 +30784,9 @@ - "license": "MIT", - "dependencies": { - "queue-microtask": "^1.2.2" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", -+ "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==" - }, - "node_modules/rxjs": { - "version": "7.8.1", -@@ -30084,7 +30840,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -+ "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==" - }, - "node_modules/safe-push-apply": { - "version": "1.0.0", -@@ -30687,14 +31445,18 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -+ "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==" - }, - "node_modules/shebang-regex": { - "version": "3.0.0", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -+ "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" - }, - "node_modules/shell-quote": { - "version": "1.8.3", -@@ -30794,7 +31556,9 @@ - }, - "node_modules/signal-exit": { - "version": "3.0.7", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", -+ "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==" - }, - "node_modules/signale": { - "version": "1.4.0", -@@ -30909,7 +31673,9 @@ - "url": "https://feross.org/support" - } - ], -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz", -+ "integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==" - }, - "node_modules/simple-get": { - "version": "4.0.1", -@@ -30932,7 +31698,9 @@ - "decompress-response": "^6.0.0", - "once": "^1.3.1", - "simple-concat": "^1.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz", -+ "integrity": "sha512-brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA==" - }, - "node_modules/simple-git": { - "version": "3.36.0", -@@ -31028,7 +31796,9 @@ - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", -+ "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" - }, - "node_modules/slice-ansi": { - "version": "7.1.0", -@@ -31260,7 +32030,9 @@ - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -+ "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" - }, - "node_modules/source-map-js": { - "version": "1.2.1", -@@ -31359,12 +32131,16 @@ - "license": "ISC", - "engines": { - "node": ">= 10.x" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", -+ "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==" - }, - "node_modules/sprintf-js": { - "version": "1.0.3", - "dev": true, -- "license": "BSD-3-Clause" -+ "license": "BSD-3-Clause", -+ "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", -+ "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==" - }, - "node_modules/ssh-config": { - "version": "5.0.4", -@@ -31390,14 +32166,18 @@ - }, - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", -+ "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==" - }, - "node_modules/stack-utils/node_modules/escape-string-regexp": { - "version": "2.0.0", - "license": "MIT", - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", -+ "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==" - }, - "node_modules/stackback": { - "version": "0.0.2", -@@ -31604,11 +32384,15 @@ - "license": "MIT", - "dependencies": { - "safe-buffer": "~5.1.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -+ "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==" - }, - "node_modules/string_decoder/node_modules/safe-buffer": { - "version": "5.1.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -+ "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" - }, - "node_modules/string-argv": { - "version": "0.3.2", -@@ -31643,7 +32427,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -+ "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==" - }, - "node_modules/string-width-cjs": { - "name": "string-width", -@@ -31726,7 +32512,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -+ "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==" - }, - "node_modules/strip-ansi-cjs": { - "name": "strip-ansi", -@@ -31792,7 +32580,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", -+ "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==" - }, - "node_modules/strip-literal": { - "version": "3.1.0", -@@ -31944,7 +32734,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", -+ "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==" - }, - "node_modules/supports-hyperlinks": { - "version": "3.1.0", -@@ -31969,7 +32761,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", -+ "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==" - }, - "node_modules/symbol-tree": { - "version": "3.2.4", -@@ -32111,7 +32905,9 @@ - "dependencies": { - "debug": "4.3.1", - "is2": "^2.0.6" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tcp-port-used/-/tcp-port-used-1.0.2.tgz", -+ "integrity": "sha512-l7ar8lLUD3XS1V2lfoJlCBaeoaWo/2xfYt81hM7VlvR4RrMVFqfmzfhLVk40hAb368uitje5gPtBRL1m/DGvLA==" - }, - "node_modules/tcp-port-used/node_modules/debug": { - "version": "4.3.1", -@@ -32127,7 +32923,9 @@ - "supports-color": { - "optional": true - } -- } -+ }, -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz", -+ "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==" - }, - "node_modules/temp-dir": { - "version": "3.0.0", -@@ -32135,7 +32933,9 @@ - "license": "MIT", - "engines": { - "node": ">=14.16" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", -+ "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==" - }, - "node_modules/tempfile": { - "version": "5.0.0", -@@ -32149,7 +32949,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/tempfile/-/tempfile-5.0.0.tgz", -+ "integrity": "sha512-bX655WZI/F7EoTDw9JvQURqAXiPHi8o8+yFxPF2lWYyz1aHnmMRuXWqL6YB6GmeO0o4DIYWHLgGNi/X64T+X4Q==" - }, - "node_modules/tempy": { - "version": "3.1.0", -@@ -32338,7 +33140,9 @@ - }, - "engines": { - "node": ">=8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", -+ "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==" - }, - "node_modules/test-exclude/node_modules/brace-expansion": { - "version": "1.1.14", -@@ -32650,7 +33454,9 @@ - }, - "node_modules/tr46": { - "version": "0.0.3", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", -+ "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, - "node_modules/traverse": { - "version": "0.6.8", -@@ -33016,7 +33822,9 @@ - }, - "engines": { - "node": ">= 0.8.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", -+ "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==" - }, - "node_modules/type-detect": { - "version": "4.0.8", -@@ -33474,7 +34282,9 @@ - "license": "MIT", - "engines": { - "node": ">= 10.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz", -+ "integrity": "sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ==" - }, - "node_modules/unpipe": { - "version": "1.0.0", -@@ -33728,7 +34538,9 @@ - "license": "BSD-2-Clause", - "dependencies": { - "punycode": "^2.1.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", -+ "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==" - }, - "node_modules/urix": { - "version": "0.1.0", -@@ -33779,7 +34591,9 @@ - }, - "node_modules/util-deprecate": { - "version": "1.0.2", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", -+ "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" - }, - "node_modules/uuid": { - "version": "10.0.0", -@@ -34490,7 +35304,9 @@ - }, - "bin": { - "installServerIntoExtension": "bin/installServerIntoExtension" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vscode-languageserver/-/vscode-languageserver-9.0.1.tgz", -+ "integrity": "sha512-woByF3PDpkHFUreUa7Hos7+pUWdeWMXRd26+ZX2A8cFx6v/JPTtd4/uN0/jB6XQHYaOlHbio03NTHCqrgG5n7g==" - }, - "node_modules/vscode-languageserver-protocol": { - "version": "3.17.5", -@@ -34498,7 +35314,9 @@ - "dependencies": { - "vscode-jsonrpc": "8.2.0", - "vscode-languageserver-types": "3.17.5" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.17.5.tgz", -+ "integrity": "sha512-mb1bvRJN8SVznADSGWM9u/b07H7Ecg0I3OgXDuLdn307rl/J3A9YD6/eYOssqhecL27hK1IPZAsaqh00i/Jljg==" - }, - "node_modules/vscode-languageserver-protocol/node_modules/vscode-jsonrpc": { - "version": "8.2.0", -@@ -34516,7 +35334,9 @@ - }, - "node_modules/vscode-languageserver-types": { - "version": "3.17.5", -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.17.5.tgz", -+ "integrity": "sha512-Ld1VelNuX9pdF39h2Hgaeb5hEZM2Z3jUrrMgWQAu82jMtZp7p3vJT3BzToKtZI7NgQssZje5o0zryOrhQvzQAg==" - }, - "node_modules/vscode-uri": { - "version": "3.1.0", -@@ -35035,7 +35855,9 @@ - }, - "node_modules/webidl-conversions": { - "version": "3.0.1", -- "license": "BSD-2-Clause" -+ "license": "BSD-2-Clause", -+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", -+ "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/webpack-sources": { - "version": "3.3.3", -@@ -35081,7 +35903,9 @@ - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", -+ "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==" - }, - "node_modules/which": { - "version": "2.0.2", -@@ -35094,7 +35918,9 @@ - }, - "engines": { - "node": ">= 8" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", -+ "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==" - }, - "node_modules/which-boxed-primitive": { - "version": "1.1.1", -@@ -35170,6 +35996,16 @@ - "url": "https://github.com/sponsors/ljharb" - } - }, -+ "node_modules/which-pm-runs": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/which-pm-runs/-/which-pm-runs-1.1.0.tgz", -+ "integrity": "sha512-n1brCuqClxfFfq/Rb0ICg9giSZqCS+pLtccdag6C2HyufBrh3fBOiy9nb6ggRMvWOVH5GrdJskj5iGTZNxd7SA==", -+ "dev": true, -+ "license": "MIT", -+ "engines": { -+ "node": ">=4" -+ } -+ }, - "node_modules/which-typed-array": { - "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", -@@ -35315,7 +36151,9 @@ - }, - "funding": { - "url": "https://github.com/chalk/wrap-ansi?sponsor=1" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", -+ "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==" - }, - "node_modules/wrap-ansi-cjs": { - "name": "wrap-ansi", -@@ -35336,7 +36174,9 @@ - }, - "node_modules/wrappy": { - "version": "1.0.2", -- "license": "ISC" -+ "license": "ISC", -+ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", -+ "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==" - }, - "node_modules/write-file-atomic": { - "version": "4.0.2", -@@ -35348,7 +36188,9 @@ - }, - "engines": { - "node": "^12.13.0 || ^14.15.0 || >=16.0.0" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-4.0.2.tgz", -+ "integrity": "sha512-7KxauUdBmSdWnmpaGFg+ppNjKF8uNLry8LyzjauQDOVONfFLNKrKvQOxZ/VuTIcS/gge/YNahf5RIIQWTSarlg==" - }, - "node_modules/ws": { - "version": "8.18.3", -@@ -35400,7 +36242,9 @@ - "node_modules/xml": { - "version": "1.0.1", - "dev": true, -- "license": "MIT" -+ "license": "MIT", -+ "resolved": "https://registry.npmjs.org/xml/-/xml-1.0.1.tgz", -+ "integrity": "sha512-huCv9IH9Tcf95zuYCsQraZtWnJvBtLVE0QHMOs8bWyZAFZNDcYjsPq1nEx8jKA9y+Beo9v+7OBPRisQTjinQMw==" - }, - "node_modules/xml-name-validator": { - "version": "4.0.0", -@@ -35440,7 +36284,9 @@ - "license": "ISC", - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", -+ "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==" - }, - "node_modules/yallist": { - "version": "2.1.2", -@@ -35478,14 +36324,18 @@ - }, - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==" - }, - "node_modules/yargs-parser": { - "version": "20.2.9", - "license": "ISC", - "engines": { - "node": ">=10" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", -+ "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==" - }, - "node_modules/yargs-unparser": { - "version": "2.0.0", -@@ -35518,7 +36368,9 @@ - "license": "ISC", - "engines": { - "node": ">=12" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", -+ "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==" - }, - "node_modules/yauzl": { - "version": "2.10.0", -@@ -35547,7 +36399,9 @@ - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" -- } -+ }, -+ "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", -+ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" - }, - "node_modules/yoctocolors": { - "version": "2.0.0", -@@ -35809,6 +36663,84 @@ - "version": "0.0.0", - "devDependencies": {} - }, -+ "packages/extra-deps": { -+ "devDependencies": { -+ "only-allow": "*" -+ }, -+ "optionalDependencies": { -+ "esbuild": "0.15.18" -+ } -+ }, -+ "packages/extra-deps/node_modules/@esbuild/android-arm": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz", -+ "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==", -+ "cpu": [ -+ "arm" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "android" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "packages/extra-deps/node_modules/@esbuild/linux-loong64": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz", -+ "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==", -+ "cpu": [ -+ "loong64" -+ ], -+ "license": "MIT", -+ "optional": true, -+ "os": [ -+ "linux" -+ ], -+ "engines": { -+ "node": ">=12" -+ } -+ }, -+ "packages/extra-deps/node_modules/esbuild": { -+ "version": "0.15.18", -+ "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz", -+ "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==", -+ "hasInstallScript": true, -+ "license": "MIT", -+ "optional": true, -+ "bin": { -+ "esbuild": "bin/esbuild" -+ }, -+ "engines": { -+ "node": ">=12" -+ }, -+ "optionalDependencies": { -+ "@esbuild/android-arm": "0.15.18", -+ "@esbuild/linux-loong64": "0.15.18", -+ "esbuild-android-64": "0.15.18", -+ "esbuild-android-arm64": "0.15.18", -+ "esbuild-darwin-64": "0.15.18", -+ "esbuild-darwin-arm64": "0.15.18", -+ "esbuild-freebsd-64": "0.15.18", -+ "esbuild-freebsd-arm64": "0.15.18", -+ "esbuild-linux-32": "0.15.18", -+ "esbuild-linux-64": "0.15.18", -+ "esbuild-linux-arm": "0.15.18", -+ "esbuild-linux-arm64": "0.15.18", -+ "esbuild-linux-mips64le": "0.15.18", -+ "esbuild-linux-ppc64le": "0.15.18", -+ "esbuild-linux-riscv64": "0.15.18", -+ "esbuild-linux-s390x": "0.15.18", -+ "esbuild-netbsd-64": "0.15.18", -+ "esbuild-openbsd-64": "0.15.18", -+ "esbuild-sunos-64": "0.15.18", -+ "esbuild-windows-32": "0.15.18", -+ "esbuild-windows-64": "0.15.18", -+ "esbuild-windows-arm64": "0.15.18" -+ } -+ }, - "packages/lib_ai_configuration": { - "name": "@gitlab-org/ai-configuration", - "version": "0.0.0", -@@ -41495,4 +42427,4 @@ - } - } - } --} -+} -\ No newline at end of file -diff --git c/package.json i/package.json -index a5f3bd6..0aa8b3e 100644 ---- c/package.json -+++ i/package.json -@@ -184,7 +184,8 @@ - "ts-node": "^10.9.2", - "tsx": "^4.20.4", - "type-fest": "^4.41.0", -- "ws": "^8.18.1" -+ "ws": "^8.18.1", -+ "extra-deps": "workspace:*" - }, - "scripts": { - "prepare": "node scripts/git_blame_ignore.mjs && lefthook install", -diff --git c/packages/extra-deps/package.json i/packages/extra-deps/package.json -new file mode 100644 -index 0000000..6099867 ---- /dev/null -+++ i/packages/extra-deps/package.json -@@ -0,0 +1,8 @@ -+{ -+ "devDependencies": { -+ "only-allow": "*" -+ }, -+ "optionalDependencies": { -+ "esbuild": "0.15.18" -+ } -+} diff --git a/pkgs/by-name/gi/gitlab-duo/package.nix b/pkgs/by-name/gi/gitlab-duo/package.nix index 3aadd7bfbbc3..72498b1fd603 100644 --- a/pkgs/by-name/gi/gitlab-duo/package.nix +++ b/pkgs/by-name/gi/gitlab-duo/package.nix @@ -1,65 +1,136 @@ { - buildNpmPackage, - bun, - concurrently, - fetchFromGitLab, lib, + stdenvNoCC, + bun, + fetchFromGitLab, + makeBinaryWrapper, + nix-update-script, nodejs_22, - patch-package, - stdenv, - versionCheckHook, ripgrep, + versionCheckHook, + writableTmpDirAsHomeHook, }: -buildNpmPackage (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "gitlab-duo"; - version = "8.89.0"; + version = "9.3.0"; - # DOCS https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp#node-version - nodejs = nodejs_22; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitLab { group = "gitlab-org"; owner = "editor-extensions"; repo = "gitlab-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-AiC0xxk8d/2rvRGm31vWqRuJ7nzMrITTGabv7v1LpOA="; + hash = "sha256-D4WNlmZeMG47Y6AHcwk38PFrO0NMX9mxM781Jy7YDFM="; }; - patches = [ - # HACK https://github.com/NixOS/nixpkgs/issues/408720 - # Fix packages locked but without hash, or even missing - ./missing-hashes.patch - ]; + # Upstream migrated from npm to bun (bun.lock) in v8.90.0. Vendor the fully + # resolved node_modules via a fixed-output derivation running `bun install`. + node_modules = stdenvNoCC.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) version src; + + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ + "GIT_PROXY_COMMAND" + "SOCKS_SERVER" + ]; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install \ + --cpu="*" \ + --os="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + find . -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + # Required: keeping store paths out of the FOD output keeps the hash stable. + dontFixup = true; + + outputHash = "sha256-SgLb1b43FJ8EYdRrdkpgA6MgYcAZD56e2u+4y3mKbpI="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; - npmFlags = [ "--install-links" ]; - npmDepsHash = "sha256-U/dwfYZqy/1CM+Emz1w44mAzY24Z8vKWBXSzSqeVmnY="; - npmRebuildFlags = [ "--ignore-scripts" ]; - npmBuildScript = "build:binary"; - npmWorkspace = "@gitlab/duo-cli"; nativeBuildInputs = [ bun - concurrently - patch-package + nodejs_22 + makeBinaryWrapper + writableTmpDirAsHomeHook ]; - env.ELECTRON_SKIP_BINARY_DOWNLOAD = "true"; - env.PUPPETEER_SKIP_DOWNLOAD = "true"; - env.TARGET = "${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}"; - env.SUPPORTED_TARGETS = "bun-${stdenv.targetPlatform.node.platform}-${stdenv.targetPlatform.node.arch}"; - env.SKIP_RIPGREP_BUNDLE = 1; + # Workspace packages export built `dist/` under the default condition and their + # TypeScript sources under `_ts-source`. Upstream's release build relies on a + # turbo remote cache to supply every dependency's `dist/`; offline we instead + # bundle straight from source by resolving the `_ts-source` condition. + configurePhase = '' + runHook preConfigure - postConfigure = '' - patchShebangs --build ./packages/cli/scripts - npmBuildScript=build:bundle runHook npmBuildHook + cp -R ${finalAttrs.node_modules}/. . + patchShebangs node_modules + patchShebangs packages/*/node_modules + + runHook postConfigure ''; + buildPhase = '' + runHook preBuild + + # Use --target=bun instead of a platform-specific target (e.g. + # bun-linux-x64-baseline) to avoid bun downloading that platform's runtime + # from npm, which is blocked by the Nix sandbox. --target=bun uses the + # running bun binary itself as the standalone-executable template, which is + # already patchelfd for NixOS. + bun build packages/cli/src/index.tsx \ + --compile \ + --target=bun \ + --minify \ + --conditions _ts-source \ + --define 'BUNDLER_INJECTED_GITLAB_LANGUAGE_SERVER_VERSION="${finalAttrs.version}"' \ + --define 'BUNDLER_INJECTED_ENVIRONMENT="production"' \ + --define 'BUNDLER_INJECTED_DISTRIBUTION="binary"' \ + --no-compile-autoload-dotenv \ + --no-compile-autoload-bunfig \ + --compile-exec-argv=--use-system-ca \ + --sourcemap=inline \ + --outfile packages/cli/bin/duo + + runHook postBuild + ''; + + # bun build --compile appends the JS bundle to the bun binary; strip would + # discard it and break the resulting executable. + dontStrip = true; + installPhase = '' runHook preInstall - install -Dm755 packages/cli/bin/duo-$TARGET $out/bin/duo + install -Dm755 packages/cli/bin/duo $out/bin/duo wrapProgram $out/bin/duo \ - --prefix PATH : ${lib.getExe ripgrep} + --prefix PATH : ${lib.makeBinPath [ ripgrep ]} runHook postInstall ''; @@ -68,7 +139,12 @@ buildNpmPackage (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgramArg = "--version"; - passthru.updateScript = ./update.sh; + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; meta = { changelog = "https://gitlab.com/gitlab-org/editor-extensions/gitlab-lsp/-/blob/main/CHANGELOG.md"; @@ -78,5 +154,12 @@ buildNpmPackage (finalAttrs: { license = lib.licenses.mit; mainProgram = "duo"; maintainers = with lib.maintainers; [ afontaine ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "aarch64-darwin" + "x86_64-darwin" + ]; }; }) diff --git a/pkgs/by-name/gi/gitlab-duo/update.sh b/pkgs/by-name/gi/gitlab-duo/update.sh deleted file mode 100755 index 784b159efc01..000000000000 --- a/pkgs/by-name/gi/gitlab-duo/update.sh +++ /dev/null @@ -1,55 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -I nixpkgs=./. -i bash -p git jaq prefetch-npm-deps nix-update npm-lockfile-fix nodejs_22 -set -euo pipefail - -# Get new Gitlab Duo release -nix-update --src-only "$UPDATE_NIX_ATTR_PATH" - -# Clone new sources -dir="$(mktemp -d --suffix="$UPDATE_NIX_PNAME")" -git clone --depth 1 \ - --branch "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.tag")" \ - "$(nix-instantiate --eval --raw -E "with import ./. {}; $UPDATE_NIX_ATTR_PATH.src.gitRepoUrl")" \ - "$dir" -pushd "$dir" - -# HACK https://github.com/npm/cli/issues/4460 -# Different dependencies require different versions of esbuild. Vite's lacks -# some integrity hashes. We add a dummy "extra-deps" package to the workspace -# to force recording those hashes. -esbuild_version=$(jaq -r '.packages["node_modules/vite/node_modules/esbuild"].version' ./package-lock.json) -mkdir packages/extra-deps -cat > packages/extra-deps/package.json < missing-hashes.patch -sed -E 's#\bnpmDepsHash = ".*?"#npmDepsHash = "'"$npmDepsHash"'"#' -i package.nix -popd diff --git a/pkgs/by-name/gi/gitlab-pages/package.nix b/pkgs/by-name/gi/gitlab-pages/package.nix index 096573d2c5f5..3ca2ef8a06e4 100644 --- a/pkgs/by-name/gi/gitlab-pages/package.nix +++ b/pkgs/by-name/gi/gitlab-pages/package.nix @@ -6,14 +6,14 @@ buildGoModule (finalAttrs: { pname = "gitlab-pages"; - version = "18.11.5"; + version = "18.11.7"; # nixpkgs-update: no auto update src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${finalAttrs.version}"; - hash = "sha256-jSTXLbzYCiCpqrbs9kAmW6um2X5hA1OFiA6fSZrQ2RI="; + hash = "sha256-AW/zzQiiGz8JBw1c5JAwo2boWKoeD1wx0dUA4nOyARA="; }; vendorHash = "sha256-PUW4cgAiM1GTtvja894OZ4pe0SWChf5JsL4/fkns2kI="; diff --git a/pkgs/by-name/gi/gitlab-runner/package.nix b/pkgs/by-name/gi/gitlab-runner/package.nix index 3fd603a4ce6e..709ab371c729 100644 --- a/pkgs/by-name/gi/gitlab-runner/package.nix +++ b/pkgs/by-name/gi/gitlab-runner/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "gitlab-runner"; - version = "18.11.3"; + version = "19.1.1"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; tag = "v${finalAttrs.version}"; - hash = "sha256-/QMmBDZz6nWmc9hODS3yVe9iyNERbebGysZ1Z4B5Gw8="; + hash = "sha256-QKiHd4UFTuAZElQ/793Tyid983RnfU9TeNpe1gFwChA="; }; - vendorHash = "sha256-xEvvYAVIwHwQDd38P2i6GcgFqf8FPnflWh5IEqmWQdE="; + vendorHash = "sha256-Ed2PrEkkqZEWhFLtT1BJavWiacLuv4U7kIAcscMDQgM="; # For patchShebangs buildInputs = [ bash ]; diff --git a/pkgs/by-name/gi/gitlab-timelogs/package.nix b/pkgs/by-name/gi/gitlab-timelogs/package.nix index 5df5d02c4620..d508ca6946d2 100644 --- a/pkgs/by-name/gi/gitlab-timelogs/package.nix +++ b/pkgs/by-name/gi/gitlab-timelogs/package.nix @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/phip1611/gitlab-timelogs"; changelog = "https://github.com/phip1611/gitlab-timelogs/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ blitz phip1611 diff --git a/pkgs/by-name/gi/gitlab-triage/Gemfile.lock b/pkgs/by-name/gi/gitlab-triage/Gemfile.lock index 556b6abf18ac..f62f9662d5c5 100644 --- a/pkgs/by-name/gi/gitlab-triage/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab-triage/Gemfile.lock @@ -18,18 +18,18 @@ GEM tzinfo (~> 2.0, >= 2.0.5) uri (>= 0.13.1) base64 (0.3.0) - bigdecimal (4.1.1) - concurrent-ruby (1.3.6) + bigdecimal (4.1.2) + concurrent-ruby (1.3.7) connection_pool (3.0.2) csv (3.3.5) drb (2.2.3) - gitlab-triage (1.50.0) + gitlab-triage (1.51.0) activesupport (>= 5.1) globalid (~> 1.0, >= 1.0.1) graphql (< 2.1.0) graphql-client (~> 0.16) httparty (~> 0.20.0) - globalid (1.3.0) + globalid (1.4.0) activesupport (>= 6.1) graphql (2.0.32) base64 @@ -39,18 +39,18 @@ GEM httparty (0.20.0) mime-types (~> 3.0) multi_xml (>= 0.5.2) - i18n (1.14.8) + i18n (1.15.2) concurrent-ruby (~> 1.0) - json (2.19.3) + json (2.20.0) logger (1.7.0) mime-types (3.7.0) logger mime-types-data (~> 3.2025, >= 3.2025.0507) mime-types-data (3.2026.0414) - minitest (6.0.4) + minitest (6.0.6) drb (~> 2.0) prism (~> 1.5) - multi_xml (0.8.1) + multi_xml (0.9.1) bigdecimal (>= 3.1, < 5) prism (1.9.0) racc (1.8.1) diff --git a/pkgs/by-name/gi/gitlab-triage/gemset.nix b/pkgs/by-name/gi/gitlab-triage/gemset.nix index ea0aee864abf..2603c29e8d14 100644 --- a/pkgs/by-name/gi/gitlab-triage/gemset.nix +++ b/pkgs/by-name/gi/gitlab-triage/gemset.nix @@ -38,20 +38,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jjlh2zkxdl4jm2xslmrmpgr3wqgxkd0qsrir01m590xjsmyy28w"; + sha256 = "1g9zi8c4i7g8zz0c3hxrw6mblrjvgn7akys60clb9si7c1k1gljk"; type = "gem"; }; - version = "4.1.1"; + version = "4.1.2"; }; concurrent-ruby = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aymcakhzl83k77g2f2krz07bg1cbafbcd2ghvwr4lky3rz86mkb"; + sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4"; type = "gem"; }; - version = "1.3.6"; + version = "1.3.7"; }; connection_pool = { groups = [ "default" ]; @@ -95,10 +95,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mms2amjhshwcf4xjgkxa8g7aj86bnnczf11imjl5kkhnqysjmqz"; + sha256 = "1s4sn5gha6a37pc7bzd1bm2s8kpim7fqrngk7i578wiv23px7025"; type = "gem"; }; - version = "1.50.0"; + version = "1.51.0"; }; globalid = { dependencies = [ "activesupport" ]; @@ -106,10 +106,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04gzhqvsm4z4l12r9dkac9a75ah45w186ydhl0i4andldsnkkih5"; + sha256 = "09zl0rkskfq0cwfrk9ypjvflvzanfg3xbhh1slaa1myry7xi4zq3"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.0"; }; graphql = { dependencies = [ "base64" ]; @@ -156,20 +156,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1994i044vdmzzkyr76g8rpl1fq1532wf0sb21xg5r1ilj5iphmr8"; + sha256 = "1dfikmmd9dllirsfq0kjiyxpmlq0afkxm5sslsr97r9g85ifpy80"; type = "gem"; }; - version = "1.14.8"; + version = "1.15.2"; }; json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0il6qxkxqql7n7sgrws5bi5a36v51dswqcxb6j6gm8aj62shp6r8"; + sha256 = "0ay31y1yl208xrpcsw6b0k4q309magq7q5prmdbb0lm9ampbqqlk"; type = "gem"; }; - version = "2.19.3"; + version = "2.20.0"; }; logger = { groups = [ "default" ]; @@ -214,10 +214,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18fw91yyphazl5bi9bkw1p7b0rpqa72gsiwj1130zm498mk084yz"; + sha256 = "1wfnqyfayx9n9j7x871v2ars4hjhfisi1dl24fa64ylq3mns6ghm"; type = "gem"; }; - version = "6.0.4"; + version = "6.0.6"; }; multi_xml = { dependencies = [ "bigdecimal" ]; @@ -225,10 +225,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nnzdswa9l6w8k5ndgbv5al9f0jkg14dqwzyic4fjd5c1cls1nxd"; + sha256 = "0msflv26i6i3jr9w761k4qdl7cp9zbhymjkn57b1w90pkjsndrvw"; type = "gem"; }; - version = "0.8.1"; + version = "0.9.1"; }; prism = { groups = [ "default" ]; diff --git a/pkgs/by-name/gi/gitlab/data.json b/pkgs/by-name/gi/gitlab/data.json index 3ce73f50325d..9001efd1dd54 100644 --- a/pkgs/by-name/gi/gitlab/data.json +++ b/pkgs/by-name/gi/gitlab/data.json @@ -1,17 +1,17 @@ { - "version": "18.11.5", - "repo_hash": "sha256-/RIUqxfRjq3+TOvapYMfl0uVqQLp1adpE6bR303rH6g=", + "version": "18.11.7", + "repo_hash": "sha256-LSrdAz4bt5h3Z2V4vlazH5hKoq3LNvoRz02AyUb4Ka4=", "yarn_hash": "sha256-og09R28lwYvDk4pe7z1dRMaanYiTsUSx+SUKoWc53do=", "frontend_islands_yarn_hash": "sha256-EvGQin+5DqqIgM36jlVkVI49WcJzVvceYnkSS9ybfcY=", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v18.11.5-ee", + "rev": "v18.11.7-ee", "passthru": { - "GITALY_SERVER_VERSION": "18.11.5", - "GITLAB_KAS_VERSION": "18.11.5", - "GITLAB_PAGES_VERSION": "18.11.5", + "GITALY_SERVER_VERSION": "18.11.7", + "GITLAB_KAS_VERSION": "18.11.7", + "GITLAB_PAGES_VERSION": "18.11.7", "GITLAB_SHELL_VERSION": "14.50.0", "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "5.14.7", - "GITLAB_WORKHORSE_VERSION": "18.11.5" + "GITLAB_WORKHORSE_VERSION": "18.11.7" } } diff --git a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix index 5fcf95d2f083..6aa8bbbc513a 100644 --- a/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix +++ b/pkgs/by-name/gi/gitlab/gitlab-workhorse/default.nix @@ -10,7 +10,7 @@ in buildGoModule (finalAttrs: { pname = "gitlab-workhorse"; - version = "18.11.5"; + version = "18.11.7"; # nixpkgs-update: no auto update src = fetchFromGitLab { diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock index 9e054ba008c9..ef81560ad325 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock +++ b/pkgs/by-name/gi/gitlab/rubyEnv/Gemfile.lock @@ -537,7 +537,7 @@ GEM thor (>= 0.19, < 2) descendants_tracker (0.0.4) thread_safe (~> 0.3, >= 0.3.1) - devfile (0.5.0) + devfile (0.5.2) device_detector (1.1.3) devise (4.9.4) bcrypt (~> 3.0) @@ -2678,7 +2678,7 @@ CHECKSUMS declarative_policy (2.1.0) sha256=f9ab705da726174bde97785c319311a4abf6143c07862f882bd8bc1b69361eea derailed_benchmarks (2.2.1) sha256=654280664fded41c9cd8fc27fc0fcfaf096023afab90eb4ac1185ba70c5d4439 descendants_tracker (0.0.4) sha256=e9c41dd4cfbb85829a9301ea7e7c48c2a03b26f09319db230e6479ccdc780897 - devfile (0.5.0) sha256=6a7e3be19e3e6b4b698b64ec4d6fd85b6653ce810c65cee611907d47ebb4cccf + devfile (0.5.2) sha256=2398cc38726f7bce03088eb74e4157f7839b353e36a488565e3fcc7739cd613d device_detector (1.1.3) sha256=c5fe3fe42cab2e8aa01f193b2074b8bb1510373ce47127206f28c7dea75a9c79 devise (4.9.4) sha256=920042fe5e704c548aa4eb65ebdd65980b83ffae67feb32c697206bfd975a7f8 devise-pbkdf2-encryptable (0.0.0) diff --git a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix index 4ed69ec68a77..4391115257d4 100644 --- a/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix +++ b/pkgs/by-name/gi/gitlab/rubyEnv/gemset.nix @@ -1621,10 +1621,10 @@ src: { platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kycnkmlfzch27kcwr8ch7756rjvv1plvv34idllnsrykvhknzka"; + sha256 = "0gb1rlwpgk1zbrb8i91n7qsrp0zpax0lxdwf101wwyvgf8wcr613"; type = "gem"; }; - version = "0.5.0"; + version = "0.5.2"; }; device_detector = { groups = [ "default" ]; diff --git a/pkgs/by-name/gi/gitoxide/package.nix b/pkgs/by-name/gi/gitoxide/package.nix index b857ac360b24..ab89da03a6b5 100644 --- a/pkgs/by-name/gi/gitoxide/package.nix +++ b/pkgs/by-name/gi/gitoxide/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "gitoxide"; - version = "0.54.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "GitoxideLabs"; repo = "gitoxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-MkOmxvACroJAB1nQZT1pcJ/Fn9gWNFwKiwVNb9iUlgY="; + hash = "sha256-2zNXe+niwH8oDZEx6It7APggOtL7vrnRGKO4OoteTIw="; }; - cargoHash = "sha256-bYgGQa8Gym4dzkuTrOSu3NwUhYdZNtq7ACwVwhdKQRI="; + cargoHash = "sha256-u9O4y6W0TuwdedNaQ127Bz4d3Olw9RzV/+AzxAstJQE="; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/gi/gitqlient/package.nix b/pkgs/by-name/gi/gitqlient/package.nix index a787c695cb05..468779b5c886 100644 --- a/pkgs/by-name/gi/gitqlient/package.nix +++ b/pkgs/by-name/gi/gitqlient/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.6.3-unstable-2025-09-11"; # cmake does not install correctly on tagged release src = fetchFromGitHub { - owner = "francescmm"; + owner = "francescmaestre"; repo = "gitqlient"; rev = "faa3e2c19205123944bb88427a569c6f1b4366a1"; fetchSubmodules = true; @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; # QCheckBox::stateChanged is deprecated meta = { - homepage = "https://github.com/francescmm/GitQlient"; + homepage = "https://github.com/francescmaestre/GitQlient"; description = "Multi-platform Git client written with Qt"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/gi/gitte/package.nix b/pkgs/by-name/gi/gitte/package.nix index bb81e9afeb2f..157a276ca285 100644 --- a/pkgs/by-name/gi/gitte/package.nix +++ b/pkgs/by-name/gi/gitte/package.nix @@ -22,7 +22,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "gitte"; - version = "0.6.1"; + version = "0.9.1"; __structuredAttrs = true; @@ -30,12 +30,12 @@ stdenv.mkDerivation (finalAttrs: { owner = "ckruse"; repo = "Gitte"; tag = finalAttrs.version; - hash = "sha256-ieW/oOFdyJWVR/7B62Rzcyii+/zDj/Xp6KCrVOf6mpA="; + hash = "sha256-/vVNWYuTsFf9SsL/PvM5hOJfULeibRn+9ukAbTs5rXk="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-VhcJepTeEjA/ZogqR82Whlyz4NRuI5MLB2HqNjGe8zQ="; + hash = "sha256-oz8pX33jua+bOBEmI87p4rkUxYrhzagBLcQvSHPOkp0="; }; strictDeps = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://codeberg.org/ckruse/Gitte"; mainProgram = "gitte"; description = "GTK4/libadwaita Git client"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ ckruse diff --git a/pkgs/by-name/gi/gittuf/package.nix b/pkgs/by-name/gi/gittuf/package.nix index b963b8db8bb4..b20a034433b6 100644 --- a/pkgs/by-name/gi/gittuf/package.nix +++ b/pkgs/by-name/gi/gittuf/package.nix @@ -3,41 +3,56 @@ fetchFromGitHub, buildGoModule, git, + gnupg, + less, openssh, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "gittuf"; - version = "0.12.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "gittuf"; repo = "gittuf"; - rev = "v${finalAttrs.version}"; - hash = "sha256-/PKbo8LPvU6ZTav9n82mrj2h6z6AyJ225mCH7EfazVU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VWbM7y9XCs/pANJtPa3MDbDhuEtVQ97X5Cyo6yY0Rd8="; }; - vendorHash = "sha256-unj9PpRkfNHWQzeCmcjppMFGAlHNcP0/j9EiGvpRzRc="; + vendorHash = "sha256-VTfS0bLq7B037qmFABO5JDrV98zik5ycR4s6NZr3H4s="; ldflags = [ "-X github.com/gittuf/gittuf/internal/version.gitVersion=${finalAttrs.version}" ]; + __structuredAttrs = true; + strictDeps = true; + nativeCheckInputs = [ git + gnupg + less openssh ]; - checkFlags = [ - "-skip=TestLoadRepository" - "-skip=TestSSH" - ]; + checkFlags = [ "-skip=TestLoadRepository|TestSSH" ]; - postInstall = "rm $out/bin/cli"; # remove gendoc cli binary + postInstall = "rm $out/bin/cli $out/bin/sandbox"; # remove gendoc helper binaries + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; meta = { - changelog = "https://github.com/gittuf/gittuf/blob/v${finalAttrs.version}/CHANGELOG.md"; + changelog = "https://github.com/gittuf/gittuf/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Security layer for Git repositories"; homepage = "https://gittuf.dev"; license = lib.licenses.asl20; mainProgram = "gittuf"; - maintainers = with lib.maintainers; [ flandweber ]; + maintainers = with lib.maintainers; [ + flandweber + anish + ]; }; }) diff --git a/pkgs/by-name/gi/gittyup/package.nix b/pkgs/by-name/gi/gittyup/package.nix index 92e92539c16c..cc83cfa7fe7a 100644 --- a/pkgs/by-name/gi/gittyup/package.nix +++ b/pkgs/by-name/gi/gittyup/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Graphical Git client designed to help you understand and manage your source code history"; homepage = "https://murmele.github.io/Gittyup"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fliegendewurst phijor diff --git a/pkgs/by-name/gi/gitu/package.nix b/pkgs/by-name/gi/gitu/package.nix index 2d588493d898..bed8e47f0002 100644 --- a/pkgs/by-name/gi/gitu/package.nix +++ b/pkgs/by-name/gi/gitu/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gitu"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "altsem"; repo = "gitu"; tag = "v${finalAttrs.version}"; - hash = "sha256-rEhAMikMCPtpKz7GAAFxzJYYshtEeeuawgagnD4IJhU="; + hash = "sha256-NpDTXTBHZs5o6HlOfpffOfo1S6Bw/oNxGuvRHzwv2II="; }; - cargoHash = "sha256-LZegPuUOSxg3a7Gl6bNMEvpKlD4BcaYgs3mc5EwIkTE="; + cargoHash = "sha256-brGnoaaXTxGPHCAHh2i4NzUVxHySmT8H2jmC9le2v8Q="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/gi/gitwatch/package.nix b/pkgs/by-name/gi/gitwatch/package.nix index 0ef9dada2992..75b1e35bd4a3 100644 --- a/pkgs/by-name/gi/gitwatch/package.nix +++ b/pkgs/by-name/gi/gitwatch/package.nix @@ -14,12 +14,12 @@ runCommand "gitwatch" rec { pname = "gitwatch"; - version = "0.5"; + version = "0.6"; src = fetchFromGitHub { owner = "gitwatch"; repo = "gitwatch"; rev = "v${version}"; - hash = "sha256-zOJPCoXco59ufQeGH2DPGbCbKx6rSC/3iNZWoEeoQKk="; + hash = "sha256-O8Qk2fGBAT7NGJYd+PIGOaiDQAnexsDm1y+KFHabQEM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/gk/gk-cli/package.nix b/pkgs/by-name/gk/gk-cli/package.nix index cce70ae497fe..58cd2315a577 100644 --- a/pkgs/by-name/gk/gk-cli/package.nix +++ b/pkgs/by-name/gk/gk-cli/package.nix @@ -85,11 +85,6 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-nDVehD0TTNTvhuDU8RB4lZiVcEJpB+l6EGkzckC7JuU="; stripRoot = false; }; - x86_64-darwin = fetchzip { - url = "${base_url}darwin_amd64.zip"; - hash = "sha256-Lhuqb5592T6VcTMVmAdIDfGMXaS4dSu0wbQeHheXXk4="; - stripRoot = false; - }; aarch64-windows = fetchzip { url = "${base_url}windows_arm64.zip"; hash = "sha256-sXHeqR4AW/sRPp74PieXI1n4VGV94CnrcMF1ovAek8E="; diff --git a/pkgs/by-name/gl/glab/package.nix b/pkgs/by-name/gl/glab/package.nix index 366d896bbacc..fc64a8eddc9a 100644 --- a/pkgs/by-name/gl/glab/package.nix +++ b/pkgs/by-name/gl/glab/package.nix @@ -13,13 +13,13 @@ buildGoModule (finalAttrs: { pname = "glab"; - version = "1.101.0"; + version = "1.108.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-K8QL9Ff5FHmiXyBEdsUE8kwhSF0camSFh08LbfJb3wo="; + hash = "sha256-JVUeCq21D5ajBiGU+fR6MHGF1Nz6i1aQFUiJZsw2zUI="; leaveDotGit = true; postFetch = '' cd "$out" @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-u1zvzMrQGyTVcl/lnIGK3dfisxGYRa2LGpDMBDq6rJk="; + vendorHash = "sha256-Ss5JnTa9KfOw5fElleu+HcDHVW5Bz8QxZ++YrCF2jCY="; ldflags = [ "-s" diff --git a/pkgs/by-name/gl/glabels-qt/package.nix b/pkgs/by-name/gl/glabels-qt/package.nix index a8aeff04dea0..da8c47a5c03c 100644 --- a/pkgs/by-name/gl/glabels-qt/package.nix +++ b/pkgs/by-name/gl/glabels-qt/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { version = "unstable-2025-12-03"; src = fetchFromGitHub { - owner = "jimevins"; + owner = "j-evins"; repo = "glabels-qt"; tag = "3.99-master602"; hash = "sha256-7MQufoU1GBvmZd8FRn331/PwmwQMuZeuFKQqViRI754="; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "GLabels Label Designer (Qt/C++)"; - homepage = "https://github.com/jimevins/glabels-qt"; + homepage = "https://github.com/j-evins/glabels-qt"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.matthewcroughan ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/gl/glances/package.nix b/pkgs/by-name/gl/glances/package.nix index 8c01c74e54da..ff407aa954f0 100644 --- a/pkgs/by-name/gl/glances/package.nix +++ b/pkgs/by-name/gl/glances/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "glances"; - version = "4.5.4"; + version = "4.5.5"; pyproject = true; disabled = python3Packages.isPyPy; @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "nicolargo"; repo = "glances"; tag = "v${finalAttrs.version}"; - hash = "sha256-oIuvVI1vXPrtJjWie/iDoCBM++Z7i4IQ5DPE6Yi3npA="; + hash = "sha256-RiAt797YS468lmwH68O9/KlbV46DAqd25O8J0wNIDsU="; }; build-system = with python3Packages; [ setuptools ]; diff --git a/pkgs/by-name/gl/glasgow/package.nix b/pkgs/by-name/gl/glasgow/package.nix index 9c9a4c44f328..c193c2029b45 100644 --- a/pkgs/by-name/gl/glasgow/package.nix +++ b/pkgs/by-name/gl/glasgow/package.nix @@ -2,13 +2,30 @@ lib, python3, fetchFromGitHub, + fetchPypi, sdcc, yosys, icestorm, nextpnr, }: -python3.pkgs.buildPythonApplication rec { +let + # glasgow uses importlib_resources' open_text(), removed in 7.x; pin it to 6.x. + pythonPackages = python3.pkgs.overrideScope ( + final: prev: { + importlib-resources = prev.importlib-resources.overridePythonAttrs (old: rec { + version = "6.5.2"; + src = fetchPypi { + pname = "importlib_resources"; + inherit version; + hash = "sha256-GF+Hre9bzCiESdmPtPugfOp4vANkVd1ExfxKL+eP7Sw="; + }; + doCheck = false; + }); + } + ); +in +pythonPackages.buildPythonApplication rec { pname = "glasgow"; version = "0-unstable-2025-12-22"; # Similar to `pdm show`, but without the commit counter @@ -36,10 +53,10 @@ python3.pkgs.buildPythonApplication rec { ]; build-system = [ - python3.pkgs.pdm-backend + pythonPackages.pdm-backend ]; - dependencies = with python3.pkgs; [ + dependencies = with pythonPackages; [ aiohttp amaranth cobs @@ -54,7 +71,7 @@ python3.pkgs.buildPythonApplication rec { nativeCheckInputs = [ # pytestCheckHook discovers way less tests - python3.pkgs.unittestCheckHook + pythonPackages.unittestCheckHook icestorm nextpnr yosys @@ -67,14 +84,18 @@ python3.pkgs.buildPythonApplication rec { __darwinAllowLocalNetworking = true; preBuild = '' - make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${python3.pkgs.fx2}/share/libfx2 + make -C firmware GIT_REV_SHORT=${firmwareGitRev} LIBFX2=${pythonPackages.fx2}/share/libfx2 # Normalize the .ihex file, see ./software/deploy-firmware.sh. - ${python3.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \ + ${pythonPackages.python.withPackages (p: [ p.fx2 ])}/bin/python firmware/normalize.py \ firmware/glasgow.ihex firmware/glasgow.ihex # Ensure the compiled firmware is exactly the same as the one shipped in the repo. - cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex + if ! cmp -s firmware/glasgow.ihex software/glasgow/hardware/firmware.ihex; then + echo >&2 "Firmware doesn't reproduce!" + diff -u software/glasgow/hardware/firmware.ihex firmware/glasgow.ihex + exit 1 + fi cd software export PDM_BUILD_SCM_VERSION="${pdmVersion}" diff --git a/pkgs/by-name/gl/glauth/package.nix b/pkgs/by-name/gl/glauth/package.nix index 1b53399e46e3..f493dd96ea33 100644 --- a/pkgs/by-name/gl/glauth/package.nix +++ b/pkgs/by-name/gl/glauth/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "glauth"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "glauth"; repo = "glauth"; tag = "GLAuth-v${finalAttrs.version}"; - hash = "sha256-9aymP2zhp2DaqqrC1tiTicqnzBvAHGdx4KHKXkYNNsg="; + hash = "sha256-cz+kmYIUqwiYj0/djsUfSEYSWRpUftaJDHX9JUJKnOg="; }; vendorHash = "sha256-Lijy0LFy0PgWogdzYRNPFOkLym6Gf9qG4R+Bm91eYJg="; diff --git a/pkgs/by-name/gl/glava/package.nix b/pkgs/by-name/gl/glava/package.nix index 3c3e1f120c48..2e6d9e087899 100644 --- a/pkgs/by-name/gl/glava/package.nix +++ b/pkgs/by-name/gl/glava/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.6.3"; src = fetchFromGitHub { - owner = "wacossusca34"; + owner = "jarcode-foss"; repo = "glava"; rev = "v${finalAttrs.version}"; sha256 = "0kqkjxmpqkmgby05lsf6c6iwm45n33jk5qy6gi3zvjx4q4yzal1i"; @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { OpenGL audio spectrum visualizer ''; mainProgram = "glava"; - homepage = "https://github.com/wacossusca34/glava"; + homepage = "https://github.com/jarcode-foss/glava"; platforms = lib.platforms.linux; license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/gl/glaze/package.nix b/pkgs/by-name/gl/glaze/package.nix index e7268ded081c..96bf10e34cd2 100644 --- a/pkgs/by-name/gl/glaze/package.nix +++ b/pkgs/by-name/gl/glaze/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "glaze"; - version = "7.8.0"; + version = "7.9.0"; src = fetchFromGitHub { owner = "stephenberry"; repo = "glaze"; tag = "v${finalAttrs.version}"; - hash = "sha256-E906rvJh6URPvtsLmOjvNKZQtI52ItkoXQvISIQlNXE="; + hash = "sha256-vNhxBdGaM70YABfwczvJcAFIYdEGIUGE8Sp2sgkTcaQ="; }; nativeBuildInputs = [ cmake ]; @@ -28,6 +28,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "glaze_DISABLE_SIMD_WHEN_SUPPORTED" (!enableSIMD)) (lib.cmakeBool "glaze_ENABLE_SSL" enableSSL) (lib.cmakeBool "glaze_BUILD_INTEROP" enableInterop) + (lib.cmakeBool "glaze_ENABLE_FUZZING" (!stdenv.hostPlatform.isMusl)) ]; meta = { diff --git a/pkgs/by-name/gl/gleam/package.nix b/pkgs/by-name/gl/gleam/package.nix index 928c7f2613e3..ec64c958c1c5 100644 --- a/pkgs/by-name/gl/gleam/package.nix +++ b/pkgs/by-name/gl/gleam/package.nix @@ -6,7 +6,7 @@ fetchFromGitHub, git, pkg-config, - erlang, + beamPackages, nodejs, bun, deno, @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ pkg-config - erlang + beamPackages.erlang ]; nativeCheckInputs = [ diff --git a/pkgs/by-name/gl/glew/package.nix b/pkgs/by-name/gl/glew/package.nix index db1e2c5f1b55..cff1bbb2067a 100644 --- a/pkgs/by-name/gl/glew/package.nix +++ b/pkgs/by-name/gl/glew/package.nix @@ -21,6 +21,15 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-tkeQ+UuSas1+j4TF1gAKhstDlnvR5oiwMIkHl5nJ6Ik="; }; + patches = [ + # Allow a single GLEW build to support both EGL and GLX. + # + # Originally developed for the AUR glew-egl-glx package and later adopted by + # Arch Linux. Carry an updated copy in-tree after it was removed from Arch's + # packaging repository. + ./patches/egl+glx.patch + ]; + outputs = [ "bin" "out" diff --git a/pkgs/by-name/gl/glew/patches/egl+glx.patch b/pkgs/by-name/gl/glew/patches/egl+glx.patch new file mode 100644 index 000000000000..9853f8e53236 --- /dev/null +++ b/pkgs/by-name/gl/glew/patches/egl+glx.patch @@ -0,0 +1,172 @@ +--- a/src/glew.c ++++ b/src/glew.c +@@ -36,6 +36,10 @@ + # include GLEW_INCLUDE + #endif + ++#if defined(GLEW_EGL) ++# include ++#endif ++ + #if defined(GLEW_OSMESA) + # define GLAPI extern + # ifndef APIENTRY +@@ -47,8 +51,6 @@ + # undef APIENTRY + # undef GLEW_APIENTRY_DEFINED + # endif +-#elif defined(GLEW_EGL) +-# include + #elif defined(_WIN32) + /* + * If NOGDI is defined, wingdi.h won't be included by windows.h, and thus +@@ -65,8 +67,7 @@ + + #include /* For size_t */ + +-#if defined(GLEW_EGL) +-#elif defined(GLEW_REGAL) ++#if defined(GLEW_REGAL) + + /* In GLEW_REGAL mode we call directly into the linked + libRegal.so glGetProcAddressREGAL for looking up +@@ -167,23 +168,37 @@ void* NSGLGetProcAddress (const GLubyte *name) + * Define glewGetProcAddress. + */ + #if defined(GLEW_REGAL) +-# define glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name) ++# define _glewGetProcAddress(name) regalGetProcAddress((const GLchar *)name) + #elif defined(GLEW_OSMESA) +-# define glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name) +-#elif defined(GLEW_EGL) +-# define glewGetProcAddress(name) eglGetProcAddress((const char *)name) ++# define _glewGetProcAddress(name) OSMesaGetProcAddress((const char *)name) + #elif defined(_WIN32) +-# define glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) ++# define _glewGetProcAddress(name) wglGetProcAddress((LPCSTR)name) + #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) +-# define glewGetProcAddress(name) NSGLGetProcAddress(name) ++# define _glewGetProcAddress(name) NSGLGetProcAddress(name) + #elif defined(__sgi) || defined(__sun) || defined(__HAIKU__) +-# define glewGetProcAddress(name) dlGetProcAddress(name) ++# define _glewGetProcAddress(name) dlGetProcAddress(name) + #elif defined(__ANDROID__) +-# define glewGetProcAddress(name) NULL /* TODO */ ++# define _glewGetProcAddress(name) NULL /* TODO */ + #elif defined(__native_client__) +-# define glewGetProcAddress(name) NULL /* TODO */ ++# define _glewGetProcAddress(name) NULL /* TODO */ + #else /* __linux */ +-# define glewGetProcAddress(name) (*glXGetProcAddressARB)(name) ++# define _glewGetProcAddress(name) (*glXGetProcAddressARB)(name) ++#endif ++ ++#if defined(GLEW_EGL) ++static GLboolean _EGL_available = GL_FALSE; ++static void (*glewGetProcAddress (const GLubyte *name)) (void) ++{ ++ void (*addr)(void); ++ if (_EGL_available) ++ { ++ addr = eglGetProcAddress((const char *)name); ++ if (addr) return addr; ++ } ++ return _glewGetProcAddress(name); ++} ++#else ++# define glewGetProcAddress(name) _glewGetProcAddress(name) + #endif + + /* +@@ -19783,9 +19798,7 @@ GLenum GLEWAPIENTRY glewContextInit (void) + } + + +-#if defined(GLEW_OSMESA) +- +-#elif defined(GLEW_EGL) ++#if defined(GLEW_EGL) + + PFNEGLCHOOSECONFIGPROC __eglewChooseConfig = NULL; + PFNEGLCOPYBUFFERSPROC __eglewCopyBuffers = NULL; +@@ -21074,8 +21087,8 @@ GLenum eglewInit (EGLDisplay display) + PFNEGLQUERYSTRINGPROC queryString = NULL; + + /* Load necessary entry points */ +- initialize = (PFNEGLINITIALIZEPROC) glewGetProcAddress("eglInitialize"); +- queryString = (PFNEGLQUERYSTRINGPROC) glewGetProcAddress("eglQueryString"); ++ initialize = (PFNEGLINITIALIZEPROC) eglGetProcAddress("eglInitialize"); ++ queryString = (PFNEGLQUERYSTRINGPROC) eglGetProcAddress("eglQueryString"); + if (!initialize || !queryString) + return 1; + +@@ -21669,7 +21682,9 @@ GLenum eglewInit (EGLDisplay display) + return GLEW_OK; + } + +-#elif defined(_WIN32) ++#endif ++ ++#if defined(_WIN32) + + PFNWGLSETSTEREOEMITTERSTATE3DLPROC __wglewSetStereoEmitterState3DL = NULL; + +@@ -23750,13 +23765,26 @@ GLenum GLEWAPIENTRY glewInit (void) + GLenum r; + #if defined(GLEW_EGL) + PFNEGLGETCURRENTDISPLAYPROC getCurrentDisplay = NULL; ++ EGLDisplay display; + #endif + r = glewContextInit(); + if ( r != 0 ) return r; + #if defined(GLEW_EGL) +- getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) glewGetProcAddress("eglGetCurrentDisplay"); +- return eglewInit(getCurrentDisplay()); +-#elif defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) ++ getCurrentDisplay = (PFNEGLGETCURRENTDISPLAYPROC) eglGetProcAddress("eglGetCurrentDisplay"); ++ if (getCurrentDisplay) ++ display = getCurrentDisplay(); ++ else ++ display = EGL_NO_DISPLAY; ++ if (display != EGL_NO_DISPLAY) ++ { ++ r = eglewInit(display); ++ if ( r == 0 ) { ++ _EGL_available = GL_TRUE; ++ return r; ++ } ++ } ++#endif ++#if defined(GLEW_OSMESA) || defined(__ANDROID__) || defined(__native_client__) || defined(__HAIKU__) + return r; + #elif defined(_WIN32) + return wglewInit(); +@@ -30675,7 +30703,7 @@ GLboolean GLEWAPIENTRY glewIsSupported (const char* name) + return ret; + } + +-#if defined(_WIN32) && !defined(GLEW_EGL) && !defined(GLEW_OSMESA) ++#if defined(_WIN32) && !defined(GLEW_OSMESA) + + GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) + { +@@ -31118,7 +31146,7 @@ GLboolean GLEWAPIENTRY wglewIsSupported (const char* name) + return ret; + } + +-#elif !defined(GLEW_OSMESA) && !defined(GLEW_EGL) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) ++#elif !defined(GLEW_OSMESA) && !defined(__ANDROID__) && !defined(__native_client__) && !defined(__HAIKU__) && !defined(__APPLE__) || defined(GLEW_APPLE_GLX) + + GLboolean glxewIsSupported (const char* name) + { +@@ -31702,7 +31730,9 @@ GLboolean glxewIsSupported (const char* name) + return ret; + } + +-#elif defined(GLEW_EGL) ++#endif ++ ++#if defined(GLEW_EGL) + + GLboolean eglewIsSupported (const char* name) + { diff --git a/pkgs/by-name/gl/glib/darwin-compilation.patch b/pkgs/by-name/gl/glib/darwin-compilation.patch deleted file mode 100644 index f215eef798af..000000000000 --- a/pkgs/by-name/gl/glib/darwin-compilation.patch +++ /dev/null @@ -1,24 +0,0 @@ -Fix compilation on Mac OS X with gcc 4.8. - -diff -ru glib-2.40.0-orig/gio/gdummyfile.c glib-2.40.0/gio/gdummyfile.c ---- glib-2.40.0-orig/gio/gdummyfile.c 2014-02-03 18:40:41.000000000 +0100 -+++ glib-2.40.0/gio/gdummyfile.c 2014-07-15 10:58:31.000000000 +0200 -@@ -454,7 +454,8 @@ - result = g_malloc (escaped_string_end - escaped_string + 1); - - out = result; -- for (in = escaped_string; in < escaped_string_end; in++) -+ in = escaped_string; -+ for (; in < escaped_string_end; in++) - { - character = *in; - if (*in == '%') -@@ -551,6 +552,7 @@ - - decoded->scheme = g_malloc (p - uri); - out = decoded->scheme; -- for (in = uri; in < p - 1; in++) -+ in = uri; -+ for (; in < p - 1; in++) - *out++ = g_ascii_tolower (*in); - *out = 0; diff --git a/pkgs/by-name/gl/glib/package.nix b/pkgs/by-name/gl/glib/package.nix index cf554d53e403..4aa4d639df9e 100644 --- a/pkgs/by-name/gl/glib/package.nix +++ b/pkgs/by-name/gl/glib/package.nix @@ -99,10 +99,7 @@ stdenv.mkDerivation (finalAttrs: { }; patches = - lib.optionals stdenv.hostPlatform.isDarwin [ - ./darwin-compilation.patch - ] - ++ lib.optionals stdenv.hostPlatform.isMusl [ + lib.optionals stdenv.hostPlatform.isMusl [ ./quark_init_on_demand.patch ./gobject_init_on_demand.patch ] diff --git a/pkgs/by-name/gl/glitchtip/frontend.nix b/pkgs/by-name/gl/glitchtip/frontend.nix index e57cd1aef060..86c37d73d166 100644 --- a/pkgs/by-name/gl/glitchtip/frontend.nix +++ b/pkgs/by-name/gl/glitchtip/frontend.nix @@ -10,13 +10,13 @@ buildNpmPackage (finalAttrs: { pname = "glitchtip-frontend"; - version = "6.1.8"; + version = "6.2.0"; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-y8NPj1xjGnGS9yBFaRjFRxLdTGrAq08T9N7cZN5IeSc="; + hash = "sha256-iKY1w9lmfuyvDblH/TlnUwAnda17qWGxmx1qtmQRENg="; }; nodejs = nodejs_22; @@ -25,7 +25,7 @@ buildNpmPackage (finalAttrs: { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src; npmDepsFetcherVersion = 3; - hash = "sha256-AIzPJpNvGV/U71UFAUwOqx8kb31s7LXhMha4bXV+oCU="; + hash = "sha256-V9aRKoJ6+BN/q7NS21eZBopzkWje8sOGGL1AgO4cUM0="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix b/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix new file mode 100644 index 000000000000..455d00a4614a --- /dev/null +++ b/pkgs/by-name/gl/glitchtip/glitchtip-rust.nix @@ -0,0 +1,42 @@ +{ + lib, + buildPythonPackage, + fetchFromGitLab, + rustPlatform, +}: + +buildPythonPackage (finalAttrs: { + pname = "glitchtip-rust"; + version = "0.3.0"; + pyproject = true; + + src = fetchFromGitLab { + owner = "glitchtip"; + repo = "glitchtip-rust"; + tag = "v${finalAttrs.version}"; + hash = "sha256-0FG+seIWqfyOG3JR0WF4ICnxMAPx9FO0JyFSB43CttU="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version src; + hash = "sha256-14j7h4TgQhTE5oihnvjAxtGZhPajuTRD4Cga8xzN9Lg="; + }; + + nativeBuildInputs = [ + rustPlatform.cargoSetupHook + rustPlatform.maturinBuildHook + ]; + + pythonImportsCheck = [ "gt_rust" ]; + + meta = { + description = "Rust components of GlitchTip Backend"; + homepage = "https://glitchtip.com"; + changelog = "https://gitlab.com/glitchtip/glitchtip-rust/-/tags/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + defelo + felbinger + ]; + }; +}) diff --git a/pkgs/by-name/gl/glitchtip/package.nix b/pkgs/by-name/gl/glitchtip/package.nix index 194c96134d45..a623377e0b95 100644 --- a/pkgs/by-name/gl/glitchtip/package.nix +++ b/pkgs/by-name/gl/glitchtip/package.nix @@ -13,6 +13,7 @@ let self = python; packageOverrides = final: prev: { django = final.django_6; + glitchtip-rust = final.callPackage ./glitchtip-rust.nix { }; }; }; @@ -24,11 +25,11 @@ let arro3-core arro3-io boto3 - brotli cxxfilt django django-allauth django-anymail + django-async-backend django-cors-headers django-environ django-extensions @@ -45,8 +46,10 @@ let duckdb google-cloud-logging granian + glitchtip-rust mcp minidump + opentelemetry-proto orjson psycopg pydantic @@ -76,14 +79,14 @@ in stdenv.mkDerivation (finalAttrs: { pname = "glitchtip"; - version = "6.1.8"; + version = "6.2.0"; pyproject = true; src = fetchFromGitLab { owner = "glitchtip"; repo = "glitchtip-backend"; tag = "v${finalAttrs.version}"; - hash = "sha256-4RAZYGoS1tUbcPVv8L0sFWqFfBX05yXKZHFZDbEn0C0="; + hash = "sha256-E1YwJwfL5+Q68xRfnoi2Sg+vAZxGQa0IKfOSVuLVnK0="; }; postPatch = '' @@ -127,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { inherit frontend python; + inherit (python.pkgs) glitchtip-rust; tests = { inherit (nixosTests) glitchtip; }; updateScript = ./update.sh; }; diff --git a/pkgs/by-name/gl/glitchtip/update.sh b/pkgs/by-name/gl/glitchtip/update.sh index e0a5cf370e59..33816b26d0b3 100755 --- a/pkgs/by-name/gl/glitchtip/update.sh +++ b/pkgs/by-name/gl/glitchtip/update.sh @@ -7,3 +7,4 @@ version=$(curl ${GITLAB_TOKEN:+-H "Private-Token: $GITLAB_TOKEN"} -sL https://gi nix-update --version="$version" glitchtip nix-update --version="$version" glitchtip.frontend +nix-update glitchtip.glitchtip-rust diff --git a/pkgs/by-name/gl/global-platform-pro/package.nix b/pkgs/by-name/gl/global-platform-pro/package.nix index 67d99f61406f..a6e44b81cadb 100644 --- a/pkgs/by-name/gl/global-platform-pro/package.nix +++ b/pkgs/by-name/gl/global-platform-pro/package.nix @@ -87,7 +87,7 @@ maven.buildMavenPackage rec { fromSource binaryBytecode # deps ]; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; mainProgram = "gp"; }; } diff --git a/pkgs/by-name/gl/global/package.nix b/pkgs/by-name/gl/global/package.nix index 43a1630067ef..447c653a1ea8 100644 --- a/pkgs/by-name/gl/global/package.nix +++ b/pkgs/by-name/gl/global/package.nix @@ -87,8 +87,6 @@ stdenv.mkDerivation (finalAttrs: { peterhoeg ]; platforms = lib.platforms.unix; - changelog = "https://cvs.savannah.gnu.org/viewvc/global/global/NEWS?view=markup&pathrev=VERSION-${ - lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version - }"; + changelog = "https://www.gnu.org/software/global/whatsnew.html"; }; }) diff --git a/pkgs/by-name/gl/globalping-cli/package.nix b/pkgs/by-name/gl/globalping-cli/package.nix index 2fc6d470840f..a4224f4e4a3c 100644 --- a/pkgs/by-name/gl/globalping-cli/package.nix +++ b/pkgs/by-name/gl/globalping-cli/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "globalping-cli"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "jsdelivr"; repo = "globalping-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-muWhiKqPdNVhy7c7MSRHACGzOn5pIVRdqSdfdCJw2CA="; + hash = "sha256-MaqBaR177gcgoqEpsER1+8oYZmiGeySfL/O9r6CxqCY="; }; - vendorHash = "sha256-dJAuN5srL5EvMaRg8rHaTsurjYrdH45p965DeubpB0E="; + vendorHash = "sha256-7fhcQptMyq8IuRaqx3Znc9QFLaV0t6HpM4eCtdimupA="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/gl/glog/package.nix b/pkgs/by-name/gl/glog/package.nix index cfe37529d3b3..ef5fb3be4277 100644 --- a/pkgs/by-name/gl/glog/package.nix +++ b/pkgs/by-name/gl/glog/package.nix @@ -38,6 +38,8 @@ stdenv.mkDerivation (finalAttrs: { # consumers of the CMake config file to fail at the configuration step. # Explicitly disabling unwind support sidesteps the issue. "-DWITH_UNWIND=OFF" + # Enable pkg-config support so that a `.pc` file is generated. + "-DWITH_PKGCONFIG=ON" ]; doCheck = true; diff --git a/pkgs/by-name/gl/glom/package.nix b/pkgs/by-name/gl/glom/package.nix deleted file mode 100644 index 7b734670b04d..000000000000 --- a/pkgs/by-name/gl/glom/package.nix +++ /dev/null @@ -1,161 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - autoconf, - automake, - libtool, - mm-common, - intltool, - itstool, - doxygen, - graphviz, - makeFontsConf, - freefont_ttf, - boost, - libxmlxx3, - libxslt, - libgdamm, - libarchive, - libepc, - python311, - python3, - ncurses, - glibmm, - gtk3, - openssl, - gtkmm3, - goocanvasmm2, - evince, - isocodes, - gtksourceview, - gtksourceviewmm, - postgresql, - gobject-introspection, - yelp-tools, - wrapGAppsHook3, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "glom"; - version = "1.32.0"; - - outputs = [ - "out" - "lib" - "dev" - "doc" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/glom/${lib.versions.majorMinor finalAttrs.version}/glom-${finalAttrs.version}.tar.xz"; - hash = "sha256-U78gfryoLFY7nme86XdFmhfn/ZTjXCfBlphnNtokjfE="; - }; - - gda = libgdamm.override { - mysqlSupport = true; - postgresSupport = true; - }; - - python = python311.withPackages ( - pkgs: with pkgs; [ - pygobject3 - distutils - ] - ); - - python_boost = python311.withPackages (pkgs: with pkgs; [ pygobject3 ]); - - sphinx-build = python311.pkgs.sphinx.overrideAttrs (super: { - postFixup = super.postFixup or "" + '' - # Do not propagate Python - rm $out/nix-support/propagated-build-inputs - ''; - }); - - boost_python = boost.override { - enablePython = true; - python = finalAttrs.python_boost; - }; - - nativeBuildInputs = [ - pkg-config - autoconf - automake - libtool - mm-common - intltool - (yelp-tools.override { - python3 = python311; - }) - itstool - doxygen - graphviz - finalAttrs.sphinx-build - wrapGAppsHook3 - gobject-introspection # for setup hook - ]; - - buildInputs = [ - finalAttrs.boost_python - glibmm - gtk3 - openssl - libxmlxx3 - libxslt - python311.pkgs.pygobject3 - finalAttrs.gda - libarchive - libepc - finalAttrs.python - ncurses # for python - gtkmm3 - goocanvasmm2 - evince - isocodes - gtksourceview - gtksourceviewmm - postgresql # for postgresql utils - ]; - - enableParallelBuilding = true; - - preConfigure = "NOCONFIGURE=1 ./autogen.sh"; - - configureFlags = [ - "--with-boost-python=boost_python${lib.versions.major python311.version}${lib.versions.minor python311.version}" - "--with-postgres-utils=${lib.getBin postgresql}/bin" - ]; - - makeFlags = [ - "libdocdir=${placeholder "doc"}/share/doc/$(book_name)" - "devhelpdir=${placeholder "devdoc"}/share/devhelp/books/$(book_name)" - ]; - - # Fontconfig error: Cannot load default config file - env.FONTCONFIG_FILE = makeFontsConf { - fontDirectories = [ freefont_ttf ]; - }; - - preFixup = '' - gappsWrapperArgs+=( - --prefix PYTHONPATH : "${placeholder "out"}/${python311.sitePackages}" - --set PYTHONHOME "${finalAttrs.python}" - ) - ''; - - meta = { - description = "Easy-to-use database designer and user interface"; - license = with lib.licenses; [ - lgpl2 - gpl2 - ]; - homepage = "https://gitlab.gnome.org/Archive/glom"; - maintainers = with lib.maintainers; [ - bot-wxt1221 - ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/gl/glooctl/package.nix b/pkgs/by-name/gl/glooctl/package.nix index 869241bdc43a..f4a854bae6d6 100644 --- a/pkgs/by-name/gl/glooctl/package.nix +++ b/pkgs/by-name/gl/glooctl/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "glooctl"; - version = "1.21.7"; + version = "1.21.12"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${finalAttrs.version}"; - hash = "sha256-bEFf6paNWstNftUZ3YDKkZmfSp4y4Q3k64p8r1yxzw4="; + hash = "sha256-7qVyVTvkWxSU9SiOdnpyHf+x6sJizkNkaa0yK3NKdF4="; }; - vendorHash = "sha256-1bY+69XKEmcV+8HV2X2JYA6S9A29KbHTLaXSZbkFbhg="; + vendorHash = "sha256-BMaRuW8NUIsTnPvIbMWd4tgt7IUUU7VjK64DMNP5hC0="; subPackages = [ "projects/gloo/cli/cmd" ]; diff --git a/pkgs/by-name/gl/glpaper/package.nix b/pkgs/by-name/gl/glpaper/package.nix index 144654c14ce1..7bb9373346c5 100644 --- a/pkgs/by-name/gl/glpaper/package.nix +++ b/pkgs/by-name/gl/glpaper/package.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation { homepage = "https://hg.sr.ht/~scoopta/glpaper"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ ccellado ]; + maintainers = [ ]; }; } diff --git a/pkgs/by-name/gl/glpi-agent/package.nix b/pkgs/by-name/gl/glpi-agent/package.nix index 8a23e9f21d2b..3e4314e5976e 100644 --- a/pkgs/by-name/gl/glpi-agent/package.nix +++ b/pkgs/by-name/gl/glpi-agent/package.nix @@ -16,13 +16,13 @@ perlPackages.buildPerlPackage rec { pname = "glpi-agent"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "glpi-project"; repo = "glpi-agent"; tag = version; - hash = "sha256-ug3/ullvEn98UUg4fzDQl5PjVFlbgbaIiz0tuWz9XeA="; + hash = "sha256-oXnV862kb7hP1+tWIaXaFMFsGVww0/4Rw3UFEePC5KU="; }; postPatch = '' diff --git a/pkgs/by-name/gl/glslang/external-gtest.patch b/pkgs/by-name/gl/glslang/external-gtest.patch deleted file mode 100644 index 3477b7584bfc..000000000000 --- a/pkgs/by-name/gl/glslang/external-gtest.patch +++ /dev/null @@ -1,69 +0,0 @@ -From ab20ba112e6fa5117bfeadde199fdc6c18cbdfb5 Mon Sep 17 00:00:00 2001 -From: OPNA2608 -Date: Mon, 12 Jan 2026 16:41:53 +0100 -Subject: [PATCH] Look for external gtest build, if not building in-tree - ---- - CMakeLists.txt | 12 ++++++++++++ - gtests/CMakeLists.txt | 8 +++----- - 2 files changed, 15 insertions(+), 5 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1e7d3ec9..ecda9c53 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -321,6 +321,18 @@ if(ENABLE_GLSLANG_BINARIES) - add_subdirectory(StandAlone) - endif() - -+option(ALLOW_EXTERNAL_GTEST "Allows to build against installed googletest. This is unsupported if the commit isn't the one in known_good.json") -+set(GMOCK_TARGET gmock) -+if(NOT TARGET ${GMOCK_TARGET}) -+ if(ALLOW_EXTERNAL_GTEST) -+ message(STATUS "Trying to find local googletest") -+ find_package(GTest) -+ if(TARGET GTest::gmock) -+ set(GMOCK_TARGET GTest::gmock) -+ endif() -+ endif() -+endif() -+ - if(GLSLANG_TESTS) - enable_testing() - add_subdirectory(gtests) -diff --git a/gtests/CMakeLists.txt b/gtests/CMakeLists.txt -index 27a5500c..21125775 100644 ---- a/gtests/CMakeLists.txt -+++ b/gtests/CMakeLists.txt -@@ -32,7 +32,7 @@ - # POSSIBILITY OF SUCH DAMAGE. - - if(GLSLANG_TESTS) -- if(TARGET gmock) -+ if(TARGET ${GMOCK_TARGET}) - message(STATUS "Google Mock found - building tests") - - set(TEST_SOURCES -@@ -76,9 +76,7 @@ if(GLSLANG_TESTS) - PRIVATE GLSLANG_TEST_BUILD=1) - target_include_directories(glslangtests PRIVATE - ${CMAKE_CURRENT_SOURCE_DIR} -- ${PROJECT_SOURCE_DIR} -- ${gmock_SOURCE_DIR}/include -- ${gtest_SOURCE_DIR}/include) -+ ${PROJECT_SOURCE_DIR}) - - if(ENABLE_OPT) - target_link_libraries(glslangtests -@@ -90,7 +88,7 @@ if(GLSLANG_TESTS) - glslang glslang-default-resource-limits - $<$,$,9.0>>:stdc++fs>) - -- target_link_libraries(glslangtests PRIVATE ${LIBRARIES} gmock) -+ target_link_libraries(glslangtests PRIVATE ${LIBRARIES} ${GMOCK_TARGET}) - - # The TARGET_RUNTIME_DLL_DIRS feature requires CMake 3.27 or greater. - if(WIN32 AND BUILD_SHARED_LIBS AND CMAKE_VERSION VERSION_LESS "3.27") --- -2.51.2 - diff --git a/pkgs/by-name/gl/glslang/package.nix b/pkgs/by-name/gl/glslang/package.nix index fc06faf61314..c8b19772c622 100644 --- a/pkgs/by-name/gl/glslang/package.nix +++ b/pkgs/by-name/gl/glslang/package.nix @@ -12,21 +12,15 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "glslang"; - version = "16.2.0"; + version = "16.3.0"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "glslang"; tag = finalAttrs.version; - hash = "sha256-2uWnZZNGdZorHaiLzMb/rpM6bL9oBClKqiFkUH3krJQ="; + hash = "sha256-wclcJ0NfqFXSUHGVsxjn2I8XxWbrkzOB4WXqsN1XtmE="; }; - patches = [ - # Allow building against our already-built gtest, without eating a rebuild - # https://github.com/KhronosGroup/glslang/pull/4140 - ./external-gtest.patch - ]; - outputs = [ "bin" "out" diff --git a/pkgs/by-name/gl/glslviewer/package.nix b/pkgs/by-name/gl/glslviewer/package.nix index 688e5b801971..5e6e02cae010 100644 --- a/pkgs/by-name/gl/glslviewer/package.nix +++ b/pkgs/by-name/gl/glslviewer/package.nix @@ -43,6 +43,15 @@ stdenv.mkDerivation (finalAttrs: { ffmpeg_7 python3 ]; + + # https://github.com/patriciogonzalezvivo/vera/pull/31/changes + patches = [ ./patches/0001-fix-miniaudio-device-id-handling.patch ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/glslViewer.thumbnailer \ + --replace-fail "TryExec=glslThumbnailer" "TryExec=$out/bin/glslThumbnailer" \ + --replace-fail "Exec=glslThumbnailer" "Exec=$out/bin/glslThumbnailer" + ''; + meta = { description = "Live GLSL coding renderer"; homepage = "https://patriciogonzalezvivo.com/2015/glslViewer/"; diff --git a/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch new file mode 100644 index 000000000000..d98c869ae71f --- /dev/null +++ b/pkgs/by-name/gl/glslviewer/patches/0001-fix-miniaudio-device-id-handling.patch @@ -0,0 +1,8 @@ +--- a/deps/vera/src/gl/textureStreamAudio.cpp ++++ b/deps/vera/src/gl/textureStreamAudio.cpp +@@ -59,7 +59,6 @@ TextureStreamAudio::TextureStreamAudio(): TextureStream() { + m_dft_buffer = (float*)av_malloc_array(sizeof(float), m_buf_len); + m_buffer_wr.resize(m_buf_len, 0); + m_buffer_re.resize(m_buf_len, 0); +- m_dft_buffer = nullptr; + } diff --git a/pkgs/by-name/gl/glycin-loaders/package.nix b/pkgs/by-name/gl/glycin-loaders/package.nix index f9b97462d915..bb6e645bb5f1 100644 --- a/pkgs/by-name/gl/glycin-loaders/package.nix +++ b/pkgs/by-name/gl/glycin-loaders/package.nix @@ -20,8 +20,20 @@ shared-mime-info, rustc, rustPlatform, + + # List of loaders to build. + # https://gitlab.gnome.org/GNOME/glycin/-/blob/2.1.1/meson_options.txt?ref_type=tags#L26-43 + enabledLoaders ? [ + "heif" + "image-rs" + "jxl" + "svg" + ], }: +# Doesn't produce any output if no loaders are enabled +assert enabledLoaders != [ ]; + stdenv.mkDerivation (finalAttrs: { pname = "glycin-loaders"; @@ -59,12 +71,15 @@ stdenv.mkDerivation (finalAttrs: { ]; mesonFlags = [ - "-Dglycin-loaders=true" - "-Dglycin-thumbnailer=false" - "-Dlibglycin=false" - "-Dlibglycin-gtk4=false" - "-Dvapi=false" + (lib.mesonBool "glycin-loaders" true) + (lib.mesonBool "glycin-thumbnailer" false) + (lib.mesonBool "libglycin" false) + (lib.mesonBool "libglycin-gtk4" false) + (lib.mesonBool "vapi" false) (lib.mesonBool "tests" finalAttrs.finalPackage.doCheck) + (lib.mesonOption "loaders" ( + lib.concatMapStringsSep "," (loader: "glycin-${loader}") enabledLoaders + )) ]; strictDeps = true; @@ -88,9 +103,16 @@ stdenv.mkDerivation (finalAttrs: { export XDG_CACHE_HOME=$(mktemp -d) ''; + # Thumbnailer files are provided by glycin-thumbnailer + postInstall = '' + rm -r $out/share/thumbnailers + ''; + env.CARGO_BUILD_TARGET = stdenv.hostPlatform.rust.rustcTargetSpec; passthru = { + inherit enabledLoaders; + tests = { withTests = finalAttrs.finalPackage.overrideAttrs { doCheck = true; @@ -102,10 +124,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Glycin loaders for several formats"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; teams = [ lib.teams.gnome ]; - license = with lib.licenses; [ - mpl20 # or - lgpl21Plus - ]; + license = + with lib.licenses; + OR [ + mpl20 + lgpl21Plus + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/gl/glycin-thumbnailer/package.nix b/pkgs/by-name/gl/glycin-thumbnailer/package.nix new file mode 100644 index 000000000000..f90b4dd1e43e --- /dev/null +++ b/pkgs/by-name/gl/glycin-thumbnailer/package.nix @@ -0,0 +1,100 @@ +{ + lib, + stdenv, + callPackage, + cargo, + fontconfig, + glib, + glycin-loaders, + glycin-thumbnailer, + libglycin, + libseccomp, + meson, + ninja, + pkg-config, + rustc, + rustPlatform, + wrapGAppsNoGuiHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "glycin-thumbnailer"; + + inherit (libglycin) version src cargoDeps; + + nativeBuildInputs = [ + cargo + libglycin.patchVendorHook + meson + ninja + pkg-config + rustc + rustPlatform.cargoSetupHook + wrapGAppsNoGuiHook + ]; + + buildInputs = [ + fontconfig + glib + glycin-loaders + libglycin + libglycin.setupHook + libseccomp + ]; + + mesonFlags = [ + (lib.mesonBool "glycin-loaders" false) + (lib.mesonBool "glycin-thumbnailer" true) + (lib.mesonBool "libglycin" false) + (lib.mesonBool "libglycin-gtk4" false) + ]; + + strictDeps = true; + __structuredAttrs = true; + + # Thumbnailer files are in `glycin-loaders`, but we provide them in this package + postInstall = '' + mkdir -p $out/share/thumbnailers + ( + shopt -s failglob + + for loader in ${lib.concatStringsSep " " glycin-loaders.passthru.enabledLoaders}; do + substitute \ + "../glycin-loaders/glycin-$loader/glycin-$loader.thumbnailer.in" \ + "$out/share/thumbnailers/glycin-$loader.thumbnailer" \ + --subst-var-by "BINDIR" "$out/bin" + done + ) + ''; + + passthru.tests = { + all-loaders = glycin-thumbnailer.override { + glycin-loaders = glycin-loaders.override { + enabledLoaders = [ + "heif" + "image-rs" + "jxl" + "raw" + "svg" + ]; + }; + }; + thumbnailer = callPackage ./tests.nix { }; + }; + + meta = { + description = "Glycin thumbnailers for several formats"; + homepage = "https://gitlab.gnome.org/GNOME/glycin"; + changelog = "https://gitlab.gnome.org/GNOME/glycin/-/tags/${finalAttrs.version}"; + license = + with lib.licenses; + OR [ + mpl20 + lgpl21Plus + ]; + maintainers = with lib.maintainers; [ thunze ]; + teams = [ lib.teams.gnome ]; + platforms = lib.platforms.linux; + mainProgram = "glycin-thumbnailer"; + }; +}) diff --git a/pkgs/by-name/gl/glycin-thumbnailer/tests.nix b/pkgs/by-name/gl/glycin-thumbnailer/tests.nix new file mode 100644 index 000000000000..da7f2a845de1 --- /dev/null +++ b/pkgs/by-name/gl/glycin-thumbnailer/tests.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + fetchFromGitLab, + glycin-thumbnailer, + shared-mime-info, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "glycin-thumbnailer-test"; + inherit (glycin-thumbnailer) version; + + src = fetchFromGitLab { + domain = "gitlab.gnome.org"; + owner = "sophie-h"; + repo = "test-images"; + rev = "f7a06d9131a5686c1b58c56f42f9fda9ea5e620d"; + hash = "sha256-qoteYmliUha3lY21PRM0FaeYu9aD5MsygBTsTYog9SE="; + }; + + # Fix incorrectly detected MIME types + preBuild = '' + export XDG_DATA_DIRS=${shared-mime-info}/share:$XDG_DATA_DIRS + ''; + + buildPhase = '' + runHook preBuild + + cd images/ + mkdir -p $out + + for image in color/* icon/*; do + for size in 128 256 512 1024; do + input="file://$(realpath "$image")" + output="$out/$(basename "$image")-$size.png" + + ${lib.getExe glycin-thumbnailer} -i "$input" -o "$output" -s $size + file -E "$output" + done + done + + runHook postBuild + ''; +}) diff --git a/pkgs/by-name/gm/gmap/package.nix b/pkgs/by-name/gm/gmap/package.nix index 70d096d88261..3bf9a926464a 100644 --- a/pkgs/by-name/gm/gmap/package.nix +++ b/pkgs/by-name/gm/gmap/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.3.3"; src = fetchFromGitHub { - owner = "seeyebe"; + owner = "marawny"; repo = "gmap"; tag = finalAttrs.version; hash = "sha256-+klVySOgI/M57f98Cx3omkEBx/NcaWD4FuIW6cz1aN8="; @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: { Built for developers who live in the CLI and want quick, powerful insights. ''; - homepage = "https://github.com/seeyebe/gmap"; - changelog = "https://github.com/seeyebe/gmap/releases/tag/${finalAttrs.src.tag}"; + homepage = "https://github.com/marawny/gmap"; + changelog = "https://github.com/marawny/gmap/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ yiyu ]; mainProgram = "gmap"; diff --git a/pkgs/by-name/gn/gn/package.nix b/pkgs/by-name/gn/gn/package.nix index 66f02fcc542a..f640662eedf4 100644 --- a/pkgs/by-name/gn/gn/package.nix +++ b/pkgs/by-name/gn/gn/package.nix @@ -11,11 +11,11 @@ version ? # This is a workaround for update-source-version to be able to update this let - _version = "0-unstable-2026-03-05"; + _version = "0-unstable-2026-04-01"; in _version, - rev ? "d8c2f07d653520568da7cace755a87dad241b72d", - hash ? "sha256-3AfExm7NL5GJXyC5JCPbGC70D59doRfIZIgpt6MLy9Y=", + rev ? "6e8dcdebbadf4f8aa75e6a4b6e0bdf89dce1513a", + hash ? "sha256-BTPD8WM1pVAMkFDlHekMdWFGyf63KdhKkKwsqikqoBQ=", }: stdenv.mkDerivation { diff --git a/pkgs/by-name/gn/gnaural/package.nix b/pkgs/by-name/gn/gnaural/package.nix deleted file mode 100644 index 34c18871c155..000000000000 --- a/pkgs/by-name/gn/gnaural/package.nix +++ /dev/null @@ -1,50 +0,0 @@ -{ - lib, - stdenv, - fetchurl, - pkg-config, - libsndfile, - portaudio, - gtk2, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gnaural"; - version = "20110606"; - - src = fetchurl { - url = "mirror://sourceforge/gnaural/gnaural_${finalAttrs.version}.tar.xz"; - hash = "sha256-0a09DUMfHEIGYuIYSBGJalBiIHIgejr/KVDXCFgKBb8="; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - gtk2 - libsndfile - portaudio - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: src/net/../gnauralnet.h:233: multiple definition of `GN_ScheduleFingerprint'; - # src/net/../../src/gnauralnet.h:233: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - postInstall = '' - mkdir -p $out/share/applications - substitute \ - $out/share/gnome/apps/Multimedia/gnaural.desktop \ - $out/share/applications/gnaural.desktop \ - --replace \ - "/usr/share/gnaural/pixmaps/gnaural-icon.png" \ - "$out/share/gnaural/pixmaps/gnaural-icon.png" \ - - rm -rf $out/share/gnome - ''; - - meta = { - description = "Programmable auditory binaural-beat synthesizer"; - homepage = "https://gnaural.sourceforge.net/"; - license = with lib.licenses; [ gpl2Only ]; - mainProgram = "gnaural"; - }; -}) diff --git a/pkgs/by-name/gn/gnome-control-center/package.nix b/pkgs/by-name/gn/gnome-control-center/package.nix index 6fdf165b7ec8..c019f5cdd555 100644 --- a/pkgs/by-name/gn/gnome-control-center/package.nix +++ b/pkgs/by-name/gn/gnome-control-center/package.nix @@ -77,11 +77,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-control-center"; - version = "50.1"; + version = "50.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-control-center/${lib.versions.major finalAttrs.version}/gnome-control-center-${finalAttrs.version}.tar.xz"; - hash = "sha256-64MkkdCI5PdCbopZKxBCikWlc2wL/+IQXFHExow6Ud0="; + hash = "sha256-Bu67D9MFbE2NeLvTdUyWEI84HXC3YNpCPFAklGlEKHw="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index 979cee9c9aee..e3231f2d300d 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -47,6 +47,12 @@ stdenv.mkDerivation (finalAttrs: { fribidi ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/gnome-font-viewer.thumbnailer \ + --replace-fail "TryExec=gnome-thumbnail-font" "TryExec=$out/bin/gnome-thumbnail-font" \ + --replace-fail "Exec=gnome-thumbnail-font" "Exec=$out/bin/gnome-thumbnail-font" + ''; + passthru = { updateScript = gnome.updateScript { packageName = "gnome-font-viewer"; diff --git a/pkgs/by-name/gn/gnome-inform7/package.nix b/pkgs/by-name/gn/gnome-inform7/package.nix index 3a3aaeccc1bc..053242e88679 100644 --- a/pkgs/by-name/gn/gnome-inform7/package.nix +++ b/pkgs/by-name/gn/gnome-inform7/package.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation { version = "unstable-2021-04-06"; src = fetchFromGitHub { owner = "ptomato"; - repo = "gnome-inform7"; + repo = "inform7-ide"; # build from revision in the GTK3 branch as mainline requires webkit-1.0 rev = "c37e045c159692aae2e4e79b917e5f96cfefa66a"; sha256 = "Q4xoITs3AYXhvpWaABRAvJaUWTtUl8lYQ1k9zX7FrNw="; @@ -143,7 +143,7 @@ stdenv.mkDerivation { longDescription = '' This version of Inform 7 for the Gnome platform was created by Philip Chimento, based on a design by Graham Nelson and Andrew Hunter. ''; - homepage = "https://github.com/ptomato/gnome-inform7"; + homepage = "https://github.com/ptomato/inform7-ide"; license = lib.licenses.gpl3Only; maintainers = [ lib.maintainers.fitzgibbon ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/gn/gnome-keysign/package.nix b/pkgs/by-name/gn/gnome-keysign/package.nix index e4043556cab8..4788899abe4e 100644 --- a/pkgs/by-name/gn/gnome-keysign/package.nix +++ b/pkgs/by-name/gn/gnome-keysign/package.nix @@ -52,7 +52,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { propagatedBuildInputs = with python3.pkgs; [ dbus-python - gpgme + gpg magic-wormhole pygobject3 pybluez diff --git a/pkgs/by-name/gn/gnome-maps/package.nix b/pkgs/by-name/gn/gnome-maps/package.nix index 6d57cc4ee73d..75beca5a9989 100644 --- a/pkgs/by-name/gn/gnome-maps/package.nix +++ b/pkgs/by-name/gn/gnome-maps/package.nix @@ -31,11 +31,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-maps"; - version = "50.1"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-maps/${lib.versions.major finalAttrs.version}/gnome-maps-${finalAttrs.version}.tar.xz"; - hash = "sha256-Qs3wNn+UXOPbEgOmvP0dX1822crDYcgcGFZ7kxMN6es="; + hash = "sha256-KKRGfR7J/jjrf4YmdMGZ6IQIbiXkwLDYDrUEVoICzr8="; }; doCheck = !stdenv.hostPlatform.isDarwin; diff --git a/pkgs/by-name/gn/gnome-music/package.nix b/pkgs/by-name/gn/gnome-music/package.nix index 9756e5243661..6739ce231ddb 100644 --- a/pkgs/by-name/gn/gnome-music/package.nix +++ b/pkgs/by-name/gn/gnome-music/package.nix @@ -31,13 +31,13 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "gnome-music"; - version = "49.1"; + version = "50.0"; pyproject = false; src = fetchurl { url = "mirror://gnome/sources/gnome-music/${lib.versions.major finalAttrs.version}/gnome-music-${finalAttrs.version}.tar.xz"; - hash = "sha256-uoga4LVeNOYmn9LT342L+jxex+N7rIlFrseLf/IHvGc="; + hash = "sha256-xyiQyn5YCc7+uHawEZn4sZcUa1wl6dV0UwGihMDzzao="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-network-displays/package.nix b/pkgs/by-name/gn/gnome-network-displays/package.nix index 681954677367..57e2576d2b7d 100644 --- a/pkgs/by-name/gn/gnome-network-displays/package.nix +++ b/pkgs/by-name/gn/gnome-network-displays/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-ugly gst_all_1.gst-rtsp-server - gst_all_1.gst-vaapi pipewire networkmanager json-glib diff --git a/pkgs/by-name/gn/gnome-nibbles/package.nix b/pkgs/by-name/gn/gnome-nibbles/package.nix index 8938be27fcf2..baa3797da150 100644 --- a/pkgs/by-name/gn/gnome-nibbles/package.nix +++ b/pkgs/by-name/gn/gnome-nibbles/package.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-nibbles"; - version = "4.5.1"; + version = "4.5.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-nibbles/${lib.versions.majorMinor finalAttrs.version}/gnome-nibbles-${finalAttrs.version}.tar.xz"; - hash = "sha256-hLrSgl05uL9wHvZEqrFrLcfnK7Q+P4cC0j7slhPSljc="; + hash = "sha256-dnKdO1Ys14Yq0wWQw71A/SUfnUu1xTuqhBUBl/Ixpfo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-pomodoro/package.nix b/pkgs/by-name/gn/gnome-pomodoro/package.nix index 910f4e10025b..9ecc2e4d1e63 100644 --- a/pkgs/by-name/gn/gnome-pomodoro/package.nix +++ b/pkgs/by-name/gn/gnome-pomodoro/package.nix @@ -27,8 +27,8 @@ stdenv.mkDerivation rec { version = "0.28.1"; src = fetchFromGitHub { - owner = "gnome-pomodoro"; - repo = "gnome-pomodoro"; + owner = "focustimerhq"; + repo = "FocusTimer"; rev = version; hash = "sha256-1G0Sv6uR4rE+/TZqEM57mCdBaXoJNpC0cznY4pnPEa4="; }; diff --git a/pkgs/by-name/gn/gnome-session/package.nix b/pkgs/by-name/gn/gnome-session/package.nix index f1f41e7ea312..2ae9f47e8790 100644 --- a/pkgs/by-name/gn/gnome-session/package.nix +++ b/pkgs/by-name/gn/gnome-session/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-session"; # Also bump ./ctl.nix when bumping major version. - version = "50.0"; + version = "50.1"; outputs = [ "out" @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-session/${lib.versions.major finalAttrs.version}/gnome-session-${finalAttrs.version}.tar.xz"; - hash = "sha256-vncIzZ0mDhrBg4FTE9u2ILGHbq1bo5zn6i5tx629ckY="; + hash = "sha256-Yom2r6RNPkyZnOV2H/iywQujCfVflCXysT+YIIyB9vs="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell-extensions/package.nix b/pkgs/by-name/gn/gnome-shell-extensions/package.nix index b29313b056f0..4c74b9e8b0bd 100644 --- a/pkgs/by-name/gn/gnome-shell-extensions/package.nix +++ b/pkgs/by-name/gn/gnome-shell-extensions/package.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell-extensions"; - version = "50.1"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-shell-extensions/${lib.versions.major finalAttrs.version}/gnome-shell-extensions-${finalAttrs.version}.tar.xz"; - hash = "sha256-RqXkpebEWNOftCNabYgzy9+8a+YLCeDw14Dxvm1aEmE="; + hash = "sha256-ofHWxSjS0pJuh02+nbFuu7nRiVZPil2++bMWqwSPodE="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-shell/package.nix b/pkgs/by-name/gn/gnome-shell/package.nix index bede5d2d751e..94315515d002 100644 --- a/pkgs/by-name/gn/gnome-shell/package.nix +++ b/pkgs/by-name/gn/gnome-shell/package.nix @@ -73,7 +73,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnome-shell"; - version = "50.1"; + version = "50.2"; outputs = [ "out" @@ -82,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gnome-shell/${lib.versions.major finalAttrs.version}/gnome-shell-${finalAttrs.version}.tar.xz"; - hash = "sha256-G0d2AXLBTz9O3Rya/zZfTeRVg1F78PgN9NOsvU5MspQ="; + hash = "sha256-UyFUIOUO/dTQYRultZ4Qy0yJ+j9R4q3f2Vyt4GGgmik="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-software/package.nix b/pkgs/by-name/gn/gnome-software/package.nix index 52b81eec1fce..b66d27c741bc 100644 --- a/pkgs/by-name/gn/gnome-software/package.nix +++ b/pkgs/by-name/gn/gnome-software/package.nix @@ -48,11 +48,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-software"; - version = "50.1"; + version = "50.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-software/${lib.versions.major finalAttrs.version}/gnome-software-${finalAttrs.version}.tar.xz"; - hash = "sha256-aWfu/sadUdNNIAWFye3+JPFRgD5J7ZKEo9dO2w5TQKg="; + hash = "sha256-sTGOaPArs5AvzY+QTVbwP1NOpQmPZeTGu5wskk2n+CM="; }; patches = [ diff --git a/pkgs/by-name/gn/gnome-sudoku/package.nix b/pkgs/by-name/gn/gnome-sudoku/package.nix index 44a730fa2289..38250650fe57 100644 --- a/pkgs/by-name/gn/gnome-sudoku/package.nix +++ b/pkgs/by-name/gn/gnome-sudoku/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-sudoku"; - version = "50.1"; + version = "50.2.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-sudoku/${lib.versions.major finalAttrs.version}/gnome-sudoku-${finalAttrs.version}.tar.xz"; - hash = "sha256-CwbJd37Ns1oPzZLRZJZCVJ3oFmKfSJ9dkzMVo03Me+I="; + hash = "sha256-ZKtGEAg+eMiV4T4C/pUHj5f44DwKj6h83EKFv3KzO58="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-text-editor/package.nix b/pkgs/by-name/gn/gnome-text-editor/package.nix index ffafb849bb03..8c8fb7beaaaf 100644 --- a/pkgs/by-name/gn/gnome-text-editor/package.nix +++ b/pkgs/by-name/gn/gnome-text-editor/package.nix @@ -23,11 +23,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-text-editor"; - version = "50.0"; + version = "50.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-text-editor/${lib.versions.major finalAttrs.version}/gnome-text-editor-${finalAttrs.version}.tar.xz"; - hash = "sha256-ncKZ2k2qCFQjtdSNtZ8AIa1V50FDpcuKsuX/4Xln9Fs="; + hash = "sha256-9oA2sJ03j6qIO/6Tbkecb/NwJ8L/7RAdr5Et9wxR0OY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-user-docs/package.nix b/pkgs/by-name/gn/gnome-user-docs/package.nix index 246b3cd0420c..6327615c371b 100644 --- a/pkgs/by-name/gn/gnome-user-docs/package.nix +++ b/pkgs/by-name/gn/gnome-user-docs/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-docs"; - version = "50.0"; + version = "50.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/${lib.versions.major finalAttrs.version}/gnome-user-docs-${finalAttrs.version}.tar.xz"; - hash = "sha256-6OIzJBhMfphcUE8F9tnGNCDJqdH2Tv3l2iqBEjYHL3g="; + hash = "sha256-g0hj2RYYmuE/clYr6B04FyMuE20NN+w3aBERH/oVlUI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gn/gnome-user-share/package.nix b/pkgs/by-name/gn/gnome-user-share/package.nix index 1cc81d060b58..e5043acb06d8 100644 --- a/pkgs/by-name/gn/gnome-user-share/package.nix +++ b/pkgs/by-name/gn/gnome-user-share/package.nix @@ -26,11 +26,11 @@ in stdenv.mkDerivation (finalAttrs: { pname = "gnome-user-share"; - version = "48.2"; + version = "48.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-share/${lib.versions.major finalAttrs.version}/gnome-user-share-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ayho1Ar4UIC6Thi6XatGwOZj7H5DiUnwgsgFeV9ivwY="; + hash = "sha256-oE1IP0mz92naj/Xi0/y/++rztsa3HYLSoqYju0seDdQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { diff --git a/pkgs/by-name/gn/gnomecast/package.nix b/pkgs/by-name/gn/gnomecast/package.nix index 0cd942d37a7d..52c4764a50fe 100644 --- a/pkgs/by-name/gn/gnomecast/package.nix +++ b/pkgs/by-name/gn/gnomecast/package.nix @@ -49,7 +49,7 @@ buildPythonApplication { meta = { description = "Native Linux GUI for Chromecasting local files"; homepage = "https://github.com/keredson/gnomecast"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; broken = stdenv.hostPlatform.isDarwin; mainProgram = "gnomecast"; }; diff --git a/pkgs/by-name/gn/gnu-shepherd/package.nix b/pkgs/by-name/gn/gnu-shepherd/package.nix index 3b8be6079788..9a1635b415bf 100644 --- a/pkgs/by-name/gn/gnu-shepherd/package.nix +++ b/pkgs/by-name/gn/gnu-shepherd/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://www.gnu.org/software/shepherd/"; description = "Service manager that looks after the herd of system services"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ kloenk ]; }; diff --git a/pkgs/by-name/gn/gnucash/package.nix b/pkgs/by-name/gn/gnucash/package.nix index 97a0ed3a40c1..6c5f3669e0dd 100644 --- a/pkgs/by-name/gn/gnucash/package.nix +++ b/pkgs/by-name/gn/gnucash/package.nix @@ -37,12 +37,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gnucash"; - version = "5.15"; + version = "5.16"; # raw source code doesn't work out of box; fetchFromGitHub not usable src = fetchurl { url = "https://github.com/Gnucash/gnucash/releases/download/${finalAttrs.version}/gnucash-${finalAttrs.version}.tar.bz2"; - hash = "sha256-sL1K9Dtr3jRUIn1LOY6ex6Db1RQ0acE3P8gkw8qrCQk="; + hash = "sha256-u5tsZ+u2o+Btn/T04EF6l77wFZ0mkSvpsOdaMpAf1JM="; }; nativeBuildInputs = [ @@ -134,7 +134,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "Gnucash"; repo = "gnucash-docs"; tag = finalAttrs.version; - hash = "sha256-EI/By0Ek3qDCmi6svX96Wg78UnmsDZzQLRSqErPUuxA="; + hash = "sha256-KC2POdwKma2CWpom3kN4X4MAItJFeWHl4SIV7sb+KCo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch b/pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch similarity index 100% rename from pkgs/tools/text/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch rename to pkgs/by-name/gn/gnugrep/gnulib-float-h-tests-port-to-C23-PowerPC-GCC.patch diff --git a/pkgs/tools/text/gnugrep/default.nix b/pkgs/by-name/gn/gnugrep/package.nix similarity index 100% rename from pkgs/tools/text/gnugrep/default.nix rename to pkgs/by-name/gn/gnugrep/package.nix diff --git a/pkgs/tools/text/gnupatch/default.nix b/pkgs/by-name/gn/gnupatch/package.nix similarity index 84% rename from pkgs/tools/text/gnupatch/default.nix rename to pkgs/by-name/gn/gnupatch/package.nix index 99a801c4cc8e..e32573c05048 100644 --- a/pkgs/tools/text/gnupatch/default.nix +++ b/pkgs/by-name/gn/gnupatch/package.nix @@ -15,8 +15,10 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-+Hzuae7CtPy/YKOWsDCtaqNBXxkqpffuhMrV4R9/WuM="; }; - # This test is filesystem-dependent - observed failing on ZFS - postPatch = lib.optionalString stdenv.hostPlatform.isFreeBSD '' + # This test is filesystem-dependent - observed failing on ZFS. + # It is also just plain flaky: it has been observed failing about 10% + # of the time on btrfs and ext4 too. + postPatch = '' sed -E -i -e '/bad-filenames/d' tests/Makefile.am ''; @@ -29,6 +31,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.hostPlatform.libc != "musl"; nativeCheckInputs = [ ed ]; + strictDeps = true; + meta = { description = "GNU Patch, a program to apply differences to files"; mainProgram = "patch"; diff --git a/pkgs/by-name/gn/gnutar/acl-2.4.0-name-conflicts.patch b/pkgs/by-name/gn/gnutar/acl-2.4.0-name-conflicts.patch new file mode 100644 index 000000000000..c871551bc772 --- /dev/null +++ b/pkgs/by-name/gn/gnutar/acl-2.4.0-name-conflicts.patch @@ -0,0 +1,85 @@ +diff --git a/src/xattrs.c b/src/xattrs.c +index 86a7e59cbc..c872ae308d 100644 +--- a/src/xattrs.c ++++ b/src/xattrs.c +@@ -139,13 +139,13 @@ + #ifdef HAVE_POSIX_ACLS + + /* acl-at wrappers, TODO: move to gnulib in future? */ +-static acl_t acl_get_file_at (int, const char *, acl_type_t); +-static int acl_set_file_at (int, const char *, acl_type_t, acl_t); ++static acl_t tar_acl_get_file_at (int, const char *, acl_type_t); ++static int tar_acl_set_file_at (int, const char *, acl_type_t, acl_t); + static int file_has_acl_at (int, char const *, struct stat const *); +-static int acl_delete_def_file_at (int, char const *); ++static int tar_acl_delete_def_file_at (int, char const *); + +-/* acl_get_file_at */ +-#define AT_FUNC_NAME acl_get_file_at ++/* tar_acl_get_file_at */ ++#define AT_FUNC_NAME tar_acl_get_file_at + #define AT_FUNC_RESULT acl_t + #define AT_FUNC_FAIL (acl_t)NULL + #define AT_FUNC_F1 acl_get_file +@@ -159,8 +159,8 @@ + #undef AT_FUNC_POST_FILE_PARAM_DECLS + #undef AT_FUNC_POST_FILE_ARGS + +-/* acl_set_file_at */ +-#define AT_FUNC_NAME acl_set_file_at ++/* tar_acl_set_file_at */ ++#define AT_FUNC_NAME tar_acl_set_file_at + #define AT_FUNC_F1 acl_set_file + #define AT_FUNC_POST_FILE_PARAM_DECLS , acl_type_t type, acl_t acl + #define AT_FUNC_POST_FILE_ARGS , type, acl +@@ -170,8 +170,8 @@ + #undef AT_FUNC_POST_FILE_PARAM_DECLS + #undef AT_FUNC_POST_FILE_ARGS + +-/* acl_delete_def_file_at */ +-#define AT_FUNC_NAME acl_delete_def_file_at ++/* tar_acl_delete_def_file_at */ ++#define AT_FUNC_NAME tar_acl_delete_def_file_at + #define AT_FUNC_F1 acl_delete_def_file + #define AT_FUNC_POST_FILE_PARAM_DECLS + #define AT_FUNC_POST_FILE_ARGS +@@ -299,10 +299,10 @@ + /* No "default" IEEE 1003.1e ACL set for directory. At this moment, + FILE_NAME may already have inherited default acls from parent + directory; clean them up. */ +- if (acl_delete_def_file_at (chdir_fd, file_name)) ++ if (tar_acl_delete_def_file_at (chdir_fd, file_name)) + WARNOPT (WARN_XATTR_WRITE, + (0, errno, +- _("acl_delete_def_file_at: Cannot drop default POSIX ACLs " ++ _("tar_acl_delete_def_file_at: Cannot drop default POSIX ACLs " + "for file '%s'"), + file_name)); + return; +@@ -316,11 +316,11 @@ + return; + } + +- if (acl_set_file_at (chdir_fd, file_name, type, acl) == -1) ++ if (tar_acl_set_file_at (chdir_fd, file_name, type, acl) == -1) + /* warn even if filesystem does not support acls */ + WARNOPT (WARN_XATTR_WRITE, + (0, errno, +- _ ("acl_set_file_at: Cannot set POSIX ACLs for file '%s'"), ++ _ ("tar_acl_set_file_at: Cannot set POSIX ACLs for file '%s'"), + file_name)); + + acl_free (acl); +@@ -357,10 +357,10 @@ + char *val = NULL; + acl_t acl; + +- if (!(acl = acl_get_file_at (parentfd, file_name, type))) ++ if (!(acl = tar_acl_get_file_at (parentfd, file_name, type))) + { + if (errno != ENOTSUP) +- call_arg_warn ("acl_get_file_at", file_name); ++ call_arg_warn ("tar_acl_get_file_at", file_name); + return; + } + diff --git a/pkgs/by-name/gn/gnutar/package.nix b/pkgs/by-name/gn/gnutar/package.nix index 51344245c45f..c7b072b71d10 100644 --- a/pkgs/by-name/gn/gnutar/package.nix +++ b/pkgs/by-name/gn/gnutar/package.nix @@ -24,9 +24,17 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-TWL/NzQux67XSFNTI5MMfPlKz3HDWRiCsmp+pQ8+3BY="; }; - # GNU tar fails to link libiconv even though the configure script detects it. - # https://savannah.gnu.org/bugs/index.php?64441 - patches = [ ./link-libiconv.patch ]; + patches = [ + # GNU tar fails to link libiconv even though the configure script detects it. + # https://savannah.gnu.org/bugs/index.php?64441 + ./link-libiconv.patch + + # acl 2.4.0 adds functions that have name conflicts with internal + # (`static`) functions from GNU tar. we prefix `tar_` to these names to + # avoid this, matching the approach from + # https://lists.gnu.org/archive/html/bug-tar/2026-06/msg00013.html + ./acl-2.4.0-name-conflicts.patch + ]; # gnutar tries to call into gettext between `fork` and `exec`, # which is not safe on darwin. @@ -40,7 +48,9 @@ stdenv.mkDerivation (finalAttrs: { "info" ]; + __structuredAttrs = true; strictDeps = true; + enableParallelBuilding = true; nativeBuildInputs = [ autoreconfHook ] ++ lib.optional stdenv.hostPlatform.isCygwin gettext; diff --git a/pkgs/by-name/gn/gnutls/package.nix b/pkgs/by-name/gn/gnutls/package.nix index 448bd4b1b110..c132697abbd7 100644 --- a/pkgs/by-name/gn/gnutls/package.nix +++ b/pkgs/by-name/gn/gnutls/package.nix @@ -1,7 +1,6 @@ { lib, stdenv, - buildPackages, fetchurl, zlib, libtasn1, @@ -9,7 +8,6 @@ pkg-config, perl, gmp, - automake, libidn2, libiconv, texinfo, @@ -167,10 +165,6 @@ stdenv.mkDerivation rec { pkg-config texinfo ] - ++ [ - buildPackages.autoconf269 - automake - ] ++ lib.optionals doCheck [ which net-tools diff --git a/pkgs/by-name/go/go-arch-lint/package.nix b/pkgs/by-name/go/go-arch-lint/package.nix index 4e183c5bee1b..3641ce73e098 100644 --- a/pkgs/by-name/go/go-arch-lint/package.nix +++ b/pkgs/by-name/go/go-arch-lint/package.nix @@ -14,13 +14,13 @@ buildGo125Module (finalAttrs: { pname = "go-arch-lint"; - version = "1.15.0"; + version = "1.16.0"; src = fetchFromGitHub { owner = "fe3dback"; repo = "go-arch-lint"; tag = "v${finalAttrs.version}"; - hash = "sha256-RHU7MJAuNcJhdHVzu25Vie6Q8e95ISsJsNB+MVTqAQc="; + hash = "sha256-oEbHuwQOHWglYHDG8gOKndjl6avSwK4+GyQHOj76ojA="; }; vendorHash = "sha256-2n7OjF4gl+qq9M5EtU0nmgWwRPZ3YvmLQDAgJ8w9S1M="; diff --git a/pkgs/by-name/go/go-audit/package.nix b/pkgs/by-name/go/go-audit/package.nix index ebe98f91475e..bead40959749 100644 --- a/pkgs/by-name/go/go-audit/package.nix +++ b/pkgs/by-name/go/go-audit/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-audit"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "slackhq"; repo = "go-audit"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-VzxFhaeETmhjYWBLQil10OhV4k8w6EHfV0qnun73gb0="; + sha256 = "sha256-Si8OuvQOyRN17DJC3mvFS7xkpbID8zcAD8n44VSLsTA="; }; - vendorHash = "sha256-g5NP5QY8kNPQLLT9GGqHIQXkaBoZ+Wqna7KknCIwBNM="; + vendorHash = "sha256-eUuLLpF8p7nTiddRy0hlqZ+n+OyvyJ1D20X1jvqKVC8="; # Tests need network access doCheck = false; @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { meta = { description = "Alternative to the auditd daemon"; homepage = "https://github.com/slackhq/go-audit"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; platforms = lib.platforms.linux; mainProgram = "go-audit"; diff --git a/pkgs/by-name/go/go-autoconfig/package.nix b/pkgs/by-name/go/go-autoconfig/package.nix index 7bc04faedf45..4805c6addbd4 100644 --- a/pkgs/by-name/go/go-autoconfig/package.nix +++ b/pkgs/by-name/go/go-autoconfig/package.nix @@ -9,7 +9,7 @@ buildGoModule { version = "unstable-2022-08-03"; src = fetchFromGitHub { - owner = "L11R"; + owner = "savely-krasovsky"; repo = "go-autoconfig"; rev = "b1b182202da82cc881dccd715564853395d4f76a"; sha256 = "sha256-Rbg6Ghp5NdcLSLSIhwwFFMKmZPWsboDyHCG6ePqSSZA="; @@ -23,7 +23,7 @@ buildGoModule { meta = { description = "IMAP/SMTP autodiscover feature for Thunderbird, Apple Mail and Microsoft Outlook"; - homepage = "https://github.com/L11R/go-autoconfig"; + homepage = "https://github.com/savely-krasovsky/go-autoconfig"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ onny ]; mainProgram = "go-autoconfig"; diff --git a/pkgs/by-name/go/go-avahi-cname/package.nix b/pkgs/by-name/go/go-avahi-cname/package.nix new file mode 100644 index 000000000000..d71c450ccc83 --- /dev/null +++ b/pkgs/by-name/go/go-avahi-cname/package.nix @@ -0,0 +1,43 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "go-avahi-cname"; + version = "2.6.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "grishy"; + repo = "go-avahi-cname"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MeEytTRZF5zpfWYNzvqiMdjvf6IJpS1t5V7+D08GjAY="; + }; + + vendorHash = "sha256-vbIHB9u9Ftwdw7rHnj6rkk/ABmESNvOgp0hixeWVnkI="; + + ldflags = [ + "-w" + "-s" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + # bind: operation not permitted + __darwinAllowLocalNetworking = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Lightweight mDNS publisher of subdomains for your machine"; + homepage = "https://github.com/grishy/go-avahi-cname"; + changelog = "https://github.com/grishy/go-avahi-cname/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ sarahec ]; + mainProgram = "go-avahi-cname"; + }; +}) diff --git a/pkgs/by-name/go/go-callvis/package.nix b/pkgs/by-name/go/go-callvis/package.nix index 71cc3c6af2a8..82cb1c892e1e 100644 --- a/pkgs/by-name/go/go-callvis/package.nix +++ b/pkgs/by-name/go/go-callvis/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.7.1"; src = fetchFromGitHub { - owner = "ofabry"; + owner = "ondrajz"; repo = "go-callvis"; rev = "v${finalAttrs.version}"; hash = "sha256-gCQjxJH03QAg6MZx5NJUJR6tKP02ThIa5BGN6A/0ejM="; @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { description = "Visualize call graph of a Go program using Graphviz"; mainProgram = "go-callvis"; - homepage = "https://github.com/ofabry/go-callvis"; + homepage = "https://github.com/ondrajz/go-callvis"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ meain ]; }; diff --git a/pkgs/by-name/go/go-camo/package.nix b/pkgs/by-name/go/go-camo/package.nix index 3b0a55e01ef4..f16590e6e2ac 100644 --- a/pkgs/by-name/go/go-camo/package.nix +++ b/pkgs/by-name/go/go-camo/package.nix @@ -9,16 +9,16 @@ buildGo125Module rec { pname = "go-camo"; - version = "2.7.4"; + version = "2.7.5"; src = fetchFromGitHub { owner = "cactus"; repo = "go-camo"; tag = "v${version}"; - hash = "sha256-CWyTqQdgf37Kx3E+/aTstsQ/mdLFAGrHJndc4foNt0A="; + hash = "sha256-P0n1rnxR9GQQw53MvHII7EXc4gWRThL4k1kulHTz9FU="; }; - vendorHash = "sha256-lNCMz2wJLZRXjQ5MF+4nu/tNitQb86tvPeD+NvSHW2c="; + vendorHash = "sha256-Fl+amgzolwcuz+eVQzD6mfBdMNzUm6UCwf9BbAt+85U="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/go/go-critic/package.nix b/pkgs/by-name/go/go-critic/package.nix index 6cbec75426c1..af6de6fbfc9d 100644 --- a/pkgs/by-name/go/go-critic/package.nix +++ b/pkgs/by-name/go/go-critic/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "go-critic"; - version = "0.14.3"; + version = "0.14.4"; src = fetchFromGitHub { owner = "go-critic"; repo = "go-critic"; rev = "v${finalAttrs.version}"; - hash = "sha256-lgOK2KvHkFzPdEfpUU9AgU6y8uQHtCk9u0/1XJLq+FU="; + hash = "sha256-RrofJ2/IsndBYvGZLlMbz7kZUGtMOwM4kGrzAiAk0Qs="; }; vendorHash = "sha256-2tzBJI2d9/EY1lPgJDrOGfgh8dz2bYwP5kWifJ46a8I="; diff --git a/pkgs/by-name/go/go-cve-search/package.nix b/pkgs/by-name/go/go-cve-search/package.nix index 307f9b5f2d3d..cea8622b7ef1 100644 --- a/pkgs/by-name/go/go-cve-search/package.nix +++ b/pkgs/by-name/go/go-cve-search/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/s-index/go-cve-search"; changelog = "https://github.com/s-index/go-cve-search/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/go-dnscollector/package.nix b/pkgs/by-name/go/go-dnscollector/package.nix index ae6e4556d82d..15376daf0f01 100644 --- a/pkgs/by-name/go/go-dnscollector/package.nix +++ b/pkgs/by-name/go/go-dnscollector/package.nix @@ -6,22 +6,22 @@ buildGoModule (finalAttrs: { pname = "go-dnscollector"; - version = "2.3.0"; + version = "2.4.0"; src = fetchFromGitHub { owner = "dmachard"; - repo = "go-dnscollector"; + repo = "DNS-collector"; tag = "v${finalAttrs.version}"; - hash = "sha256-5SFdTDuXnVdMFGxoraUMbDV3o476sc9c7D9qWBoQXr4="; + hash = "sha256-Gm5PXEEgw98NnsfKN8JxhyTqEL9KSA6L2CgRTRJirdY="; }; - vendorHash = "sha256-eoUsiRGtq1ucAIyeCRNEuro2Qj4iRe+3aE8DrqIcCWs="; + vendorHash = "sha256-pEex5xu3Cf6vqFp7YLwk+Ku+Yc0coOGLXP7/NUtDYbg="; subPackages = [ "." ]; meta = { description = "Ingesting, pipelining, and enhancing your DNS logs with usage indicators, security analysis, and additional metadata"; - homepage = "https://github.com/dmachard/go-dnscollector"; + homepage = "https://github.com/dmachard/DNS-collector"; changelog = "https://github.com/dmachard/DNS-collector/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ shift ]; diff --git a/pkgs/by-name/go/go-hass-agent/package.nix b/pkgs/by-name/go/go-hass-agent/package.nix index bb708356dbcd..e72c7b6b8270 100644 --- a/pkgs/by-name/go/go-hass-agent/package.nix +++ b/pkgs/by-name/go/go-hass-agent/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "go-hass-agent"; - version = "14.12.0"; + version = "14.14.1"; src = fetchFromGitHub { owner = "joshuar"; repo = "go-hass-agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-KQRM6b6BtCkY+raJoshOYOoKwOzRwzFTLFnHTY6hCSY="; + hash = "sha256-s5kzxzyfNGK57MtusjEjcm0Gn75Wu8vfwJEIaVz7m20="; }; - vendorHash = "sha256-WsxxT1hCpGt7YAcbp2NDVLPl4lFLHlZraiKUePoQwNU="; + vendorHash = "sha256-ZiLYnEcugciobjAchzJZNQrE3G11ehf3vi6cIMxZiTQ="; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; diff --git a/pkgs/by-name/go/go-httpbin/package.nix b/pkgs/by-name/go/go-httpbin/package.nix index 0cc59ad32857..9eec63378bac 100644 --- a/pkgs/by-name/go/go-httpbin/package.nix +++ b/pkgs/by-name/go/go-httpbin/package.nix @@ -9,13 +9,13 @@ buildGoModule (finalAttrs: { pname = "go-httpbin"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "mccutchen"; repo = "go-httpbin"; tag = "v${finalAttrs.version}"; - hash = "sha256-BQf6G02BRtVGcPVEfHPWwBfEh8CCbHRkaLV2FX6SeJc="; + hash = "sha256-2cqPDWaPfIwPLYiZTb4daLbEgfaUeo9zlX8LfOfnfB8="; }; vendorHash = null; diff --git a/pkgs/by-name/go/go-ios/package.nix b/pkgs/by-name/go/go-ios/package.nix index e076c4a1e53b..15aee98d31b1 100644 --- a/pkgs/by-name/go/go-ios/package.nix +++ b/pkgs/by-name/go/go-ios/package.nix @@ -7,33 +7,42 @@ pkg-config, libusb1, iproute2, - net-tools, }: buildGoModule (finalAttrs: { pname = "go-ios"; - version = "1.0.207"; + version = "1.2.0"; src = fetchFromGitHub { owner = "danielpaulus"; repo = "go-ios"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-2GjUrt1F8MrPOITCsuWHHsi/85pfzbLeY+WbPfLYDY4="; + sha256 = "sha256-5fMsHSwJUH/JBaZXyB11rHCNOqzHF3MYI9gg29hj0O4="; }; proxyVendor = true; - vendorHash = "sha256-/aVaTC9lfoXQvhDVQm31HmXBnDYYOv6RH69Nm3I/K7s="; + vendorHash = "sha256-Bl9nlRnclqVgFF6mS6DX6oS+1c26DoISqDBY2rMS2yw="; excludedPackages = [ "restapi" + "test/e2e" ]; - postPatch = lib.optionalString stdenv.hostPlatform.isLinux '' + ldflags = [ + "-X main.version=${finalAttrs.version}" + ]; + + postPatch = '' + substituteInPlace main.go \ + --replace-fail 'const version = ' 'var version = ' + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace ncm/linux_commands.go \ --replace-fail "ip " "${lib.getExe' iproute2 "ip"} " - - substituteInPlace ios/tunnel/tunnel.go \ - --replace-fail "ifconfig" "${lib.getExe' net-tools "ifconfig"}" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + substituteInPlace ios/tunnel/tunnel_darwin.go \ + --replace-fail "ifconfig" "/sbin/ifconfig" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/go-judge/package.nix b/pkgs/by-name/go/go-judge/package.nix index d63cd9f4983d..e3bca0300831 100644 --- a/pkgs/by-name/go/go-judge/package.nix +++ b/pkgs/by-name/go/go-judge/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-judge"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "criyle"; repo = "go-judge"; rev = "v${finalAttrs.version}"; - hash = "sha256-JxYdoDSkzb+BM76m+qzdLM31ox9jqCm3LDrjTn6q1/E="; + hash = "sha256-QWLR0bIBgjqh75D0J7KEDjS+6rL5kV+fg01ThO6Cbq0="; }; - vendorHash = "sha256-7DwEATr5AZGXHJXwDxjLpERquXFYm3AYjU/g3v7Xmlw="; + vendorHash = "sha256-i5RiLaALbHQhOSb143kyQQGu2maJIw2VS0JELmxbxM0="; tags = [ "nomsgpack" diff --git a/pkgs/by-name/go/go-librespot/package.nix b/pkgs/by-name/go/go-librespot/package.nix new file mode 100644 index 000000000000..a69b9b977f86 --- /dev/null +++ b/pkgs/by-name/go/go-librespot/package.nix @@ -0,0 +1,60 @@ +{ + alsa-lib, + buildGoModule, + fetchFromGitHub, + flac, + lib, + libogg, + libvorbis, + pkg-config, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "go-librespot"; + version = "0.7.4"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "devgianlu"; + repo = "go-librespot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-TJQMfZRuWDu83QZeCU+EQ90WX6gT5+nXbYRIqfvXRp8="; + }; + + vendorHash = "sha256-kCzzybOEP4Tp7OGFZBjIP1FgcQ9u+lgO3931gbaG9hA="; + + subPackages = [ "cmd/daemon" ]; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ + flac + libogg + libvorbis + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ]; + + ldflags = [ + "-s" + "-X github.com/devgianlu/go-librespot.version=v${finalAttrs.version}" + ]; + + postInstall = '' + mv $out/bin/daemon $out/bin/go-librespot + ''; + + meta = { + description = "Yet another open source Spotify client, written in Go"; + mainProgram = "go-librespot"; + homepage = "https://github.com/devgianlu/go-librespot"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ + sweenu + emilylange + ]; + }; +}) diff --git a/pkgs/by-name/go/go-licenses/package.nix b/pkgs/by-name/go/go-licenses/package.nix index bab6b8313b4c..ff47e3c966a8 100644 --- a/pkgs/by-name/go/go-licenses/package.nix +++ b/pkgs/by-name/go/go-licenses/package.nix @@ -50,7 +50,7 @@ buildGoModule (finalAttrs: { description = "Reports on the licenses used by a Go package and its dependencies"; mainProgram = "go-licenses"; homepage = "https://github.com/google/go-licenses"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ Luflosi ]; }; }) diff --git a/pkgs/by-name/go/go-mockery/package.nix b/pkgs/by-name/go/go-mockery/package.nix index e948a4dc8af8..7cad1976b419 100644 --- a/pkgs/by-name/go/go-mockery/package.nix +++ b/pkgs/by-name/go/go-mockery/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { "-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/internal/logging.SemVer=v${finalAttrs.version}" ]; - env.CGO_ENABLED = false; + env.CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/go-mockery_2/package.nix b/pkgs/by-name/go/go-mockery_2/package.nix index 5720982ae1fa..0cb8d3051ce1 100644 --- a/pkgs/by-name/go/go-mockery_2/package.nix +++ b/pkgs/by-name/go/go-mockery_2/package.nix @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { "-X github.com/vektra/mockery/v${lib.versions.major finalAttrs.version}/pkg/logging.SemVer=v${finalAttrs.version}" ]; - env.CGO_ENABLED = false; + env.CGO_ENABLED = 0; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/go-passbolt-cli/package.nix b/pkgs/by-name/go/go-passbolt-cli/package.nix index d72fccd81433..4559fdfd8546 100644 --- a/pkgs/by-name/go/go-passbolt-cli/package.nix +++ b/pkgs/by-name/go/go-passbolt-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "go-passbolt-cli"; - version = "0.5.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "passbolt"; repo = "go-passbolt-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-INV8z7GlZPGWNyGyBPgynRA40JiN4s2b4WgIoeQ23Hg="; + hash = "sha256-uccHe82p+56RV4tyZINFH0ilEdVREpZuxXXc7N5Vpgo="; }; - vendorHash = "sha256-dLfKIjm8SZHJhdiGayhrkZVdnARz8tE0N5T3JWuCbaM="; + vendorHash = "sha256-pjmKjTMPbjU0bI9+0YcwaIwoU2TG2NdWvNo9Uh3EHSA="; ldflags = [ "-X=main.version=${finalAttrs.version}" diff --git a/pkgs/by-name/go/go-secdump/package.nix b/pkgs/by-name/go/go-secdump/package.nix index da101b8b7ce8..ccbc6a32c025 100644 --- a/pkgs/by-name/go/go-secdump/package.nix +++ b/pkgs/by-name/go/go-secdump/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-secdump"; - version = "0.5.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "jfjallid"; repo = "go-secdump"; tag = finalAttrs.version; - hash = "sha256-v/IqOjohlGs6MQX2BevboysqW6Lzz0NupDH6sb1TG7Q="; + hash = "sha256-ogBBG6wEiYNY6ngOwVHYYiIUHNXKNISNrL1qvkBAjRs="; }; - vendorHash = "sha256-H9oFvnyigjwEs24XGGH5mtDMMCo846y0nFIlsrbvLMk="; + vendorHash = "sha256-bzvWdB/poT7mRCNIZU8ioRickwKExZl0ZtDrKi1T12o="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/go-sendxmpp/package.nix b/pkgs/by-name/go/go-sendxmpp/package.nix index 273b2f9123a7..2c685c5cabf4 100644 --- a/pkgs/by-name/go/go-sendxmpp/package.nix +++ b/pkgs/by-name/go/go-sendxmpp/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "go-sendxmpp"; - version = "0.15.8"; + version = "0.16.0"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "mdosch"; repo = "go-sendxmpp"; tag = "v${finalAttrs.version}"; - hash = "sha256-9p9/3kMW25lfWDdN1EExomVRaNXEytJ6/V8MUA3rABQ="; + hash = "sha256-QAsrx7Ae0AMxTMYsr40ZHsXXA4wLXVrxO3QLfLrIGXU="; }; - vendorHash = "sha256-/38b5tMB7ZHMl16ZzB8UJvWfysa1MD9OLRyqX5X0ACY="; + vendorHash = "sha256-uMl5/NKOgoVYFIAfgUBAr69KGIsi79RCWZLZac9HAQ4="; passthru = { tests = { inherit (nixosTests) ejabberd prosody; }; diff --git a/pkgs/by-name/go/go-swagger/package.nix b/pkgs/by-name/go/go-swagger/package.nix index e91136ee95c2..e006ff7073eb 100644 --- a/pkgs/by-name/go/go-swagger/package.nix +++ b/pkgs/by-name/go/go-swagger/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "go-swagger"; - version = "0.34.1"; + version = "0.35.1"; src = fetchFromGitHub { owner = "go-swagger"; repo = "go-swagger"; tag = "v${finalAttrs.version}"; - hash = "sha256-2kPB/E8/qr4j/2rJS6fbgH2CKTZE43L/7ERr2BzOESk="; + hash = "sha256-NeaSV9cbXZGApa03MKWywxm80UxvGuTLuEX5CQmV3aw="; }; - vendorHash = "sha256-FILITZAcRHcZs3sICuWVmLA53/zhegQcZTAua6m4HVI="; + vendorHash = "sha256-mUDw9iqyunsAsPPdo69NA0czZZAxOQsQDlrtRQ1/y4o="; doCheck = false; diff --git a/pkgs/by-name/go/go365/package.nix b/pkgs/by-name/go/go365/package.nix index 86e06f8ad4cd..c55fce455215 100644 --- a/pkgs/by-name/go/go365/package.nix +++ b/pkgs/by-name/go/go365/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { description = "Office 365 enumeration tool"; homepage = "https://github.com/optiv/Go365"; changelog = "https://github.com/optiv/Go365/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "Go365"; }; diff --git a/pkgs/by-name/go/goaway/package.nix b/pkgs/by-name/go/goaway/package.nix index a0e9cb7965eb..6cb1b3f215fd 100644 --- a/pkgs/by-name/go/goaway/package.nix +++ b/pkgs/by-name/go/goaway/package.nix @@ -14,13 +14,13 @@ let pnpm = pnpm_10; - version = "0.63.15"; + version = "0.63.17"; src = fetchFromGitHub { owner = "pommee"; repo = "goaway"; tag = "v${version}"; - hash = "sha256-jtUAMCGdFmt89kchHdy9AnSMKu1rZeTLPcFIzqipOyw="; + hash = "sha256-cRx7XN8eaxqqI5+CWF93U4rgP8sH3HY4MPOA6VtqXK8="; }; goaway-web = stdenvNoCC.mkDerivation (finalAttrs: { diff --git a/pkgs/by-name/go/gobgp/package.nix b/pkgs/by-name/go/gobgp/package.nix index 025e1cc35c7a..d707bd291096 100644 --- a/pkgs/by-name/go/gobgp/package.nix +++ b/pkgs/by-name/go/gobgp/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "gobgp"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-O+jKCckHAM7KCPvWpC0ZofJx2RR+GwAK8qz8tJXtsZQ="; + sha256 = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA="; }; vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ="; diff --git a/pkgs/by-name/go/gobgpd/package.nix b/pkgs/by-name/go/gobgpd/package.nix index ca13175dfadf..98fed863783b 100644 --- a/pkgs/by-name/go/gobgpd/package.nix +++ b/pkgs/by-name/go/gobgpd/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "gobgpd"; - version = "4.6.0"; + version = "4.7.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; tag = "v${finalAttrs.version}"; - hash = "sha256-O+jKCckHAM7KCPvWpC0ZofJx2RR+GwAK8qz8tJXtsZQ="; + hash = "sha256-crruhk4Jo1TdmGWvtdJKCBucjYNEwEMbNkJ3r5hxoQA="; }; vendorHash = "sha256-fGDjeWmIe0GNZTDCXDBU4b286rMdCnPgRBInLZsFWxQ="; diff --git a/pkgs/by-name/go/gobi_loader/package.nix b/pkgs/by-name/go/gobi_loader/package.nix index 13f44029265a..96cb504b090b 100644 --- a/pkgs/by-name/go/gobi_loader/package.nix +++ b/pkgs/by-name/go/gobi_loader/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Firmware loader for Qualcomm Gobi USB chipsets"; homepage = "https://www.codon.org.uk/~mjg59/gobi_loader/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ _0x4A6F ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/gocron/package.nix b/pkgs/by-name/go/gocron/package.nix new file mode 100644 index 000000000000..bc9ea1e8dd31 --- /dev/null +++ b/pkgs/by-name/go/gocron/package.nix @@ -0,0 +1,109 @@ +{ + lib, + fetchFromGitHub, + nodejs, + fetchYarnDeps, + yarnConfigHook, + yarnBuildHook, + yarnInstallHook, + stdenv, + buildGoModule, + makeWrapper, + bash, + versionCheckHook, + nix-update-script, + nixosTests, +}: + +buildGoModule (finalAttrs: { + + pname = "gocron"; + version = "0.9.14"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "flohoss"; + repo = "gocron"; + tag = "v${finalAttrs.version}"; + hash = "sha256-LKjK5V+WrzTJlWPytafy8Ypva41RW4/12aSGaJj572I="; + }; + + gocron-web = stdenv.mkDerivation (finalAttrsWebassets: { + pname = "${finalAttrs.pname}-web"; + src = "${finalAttrs.src}/web"; + inherit (finalAttrs) version; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = finalAttrsWebassets.src + "/yarn.lock"; + hash = "sha256-f0xnF9gd3c0KPrORPVkApyWPy+DazyzHeQu32wWybiw="; + }; + + nativeBuildInputs = [ + yarnConfigHook + yarnBuildHook + yarnInstallHook + nodejs + ]; + + preBuild = '' + yarn types + ''; + + postBuild = '' + mv dist/ $out + ''; + + }); + + vendorHash = "sha256-VbmS9Fh0pr/dUB+pZBqKbi4bu6Do/3TRr9uI3TmGsOM="; + + postPatch = '' + substituteInPlace handlers/web.go \ + --replace-fail "web/assets" "${finalAttrs.gocron-web}/assets" \ + --replace-fail "web/static" "${finalAttrs.gocron-web}/static" \ + --replace-fail "web/index.html" "${finalAttrs.gocron-web}/index.html" + substituteInPlace main.go \ + --replace-fail '"github.com/flohoss/gocron/internal/software"' "" \ + --replace-fail "software.Install()" "" + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/flohoss/gocron/internal/buildinfo.Version=${finalAttrs.version}" + ]; + + nativeBuildInputs = [ + makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/gocron --prefix PATH : ${ + lib.makeBinPath [ + bash + ] + } + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "gocron-web" + ]; + }; + passthru.tests = nixosTests.gocron; + + meta = { + description = "Task scheduler built with Go and Vue.js."; + homepage = "https://github.com/flohoss/gocron"; + license = lib.licenses.mit; + mainProgram = "gocron"; + maintainers = with lib.maintainers; [ + juliusfreudenberger + ]; + }; + +}) diff --git a/pkgs/by-name/go/goda/package.nix b/pkgs/by-name/go/goda/package.nix index 2049fd55f7d8..1918922bf141 100644 --- a/pkgs/by-name/go/goda/package.nix +++ b/pkgs/by-name/go/goda/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "goda"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${finalAttrs.version}"; - hash = "sha256-tUt/VxO3QLqPuHleFSO7txiHZ1bJ7ohGak09ZIr/62A="; + hash = "sha256-ARiI5varW7p7eX58N8mtS6yeXeTlZfiiTFgI8pcDD6M="; }; - vendorHash = "sha256-ZDiDAabLUGa/NFs2EQpwWAd8ypxUZ32I8AOeYCm/ntA="; + vendorHash = "sha256-jtri/73UnpI5oyykW2DYiH0vra62+jk8VIHhcWT2oJA="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/go/godot-mcp/package.nix b/pkgs/by-name/go/godot-mcp/package.nix index bf099173ea6d..2c079ec04153 100644 --- a/pkgs/by-name/go/godot-mcp/package.nix +++ b/pkgs/by-name/go/godot-mcp/package.nix @@ -38,7 +38,7 @@ buildNpmPackage { mainProgram = "godot-mcp"; homepage = "https://github.com/Coding-Solo/godot-mcp"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ superherointj ]; + maintainers = [ ]; platforms = lib.platforms.all; }; } diff --git a/pkgs/by-name/go/godotpcktool/package.nix b/pkgs/by-name/go/godotpcktool/package.nix index 8ca38733ce0f..8a3418012e48 100644 --- a/pkgs/by-name/go/godotpcktool/package.nix +++ b/pkgs/by-name/go/godotpcktool/package.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "godotpcktool"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "hhyyrylainen"; repo = "GodotPckTool"; tag = "v${finalAttrs.version}"; - hash = "sha256-H0v432PyKscazR9PN5d+MmYZ8ND497m3RHmWpw16UY4="; + hash = "sha256-v8etiUKVxSgVSB3ARqdLgbp3SEC12xBf0HXDl1RJRug="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/go/godsvg/package.nix b/pkgs/by-name/go/godsvg/package.nix index 13affaf2ac5a..de1255ca0c0a 100644 --- a/pkgs/by-name/go/godsvg/package.nix +++ b/pkgs/by-name/go/godsvg/package.nix @@ -10,12 +10,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "godsvg"; - version = "1.0-alpha15"; + version = "1.0-alpha16"; src = fetchFromGitHub { owner = "MewPurPur"; repo = "GodSVG"; tag = "v${finalAttrs.version}"; - hash = "sha256-vEwkpYMIqiqCFVNE7UzEts/lSS9zR+AgvvSr+vj0Aas="; + hash = "sha256-MuPEPnoBmqAg0vLQ7rQidWHA2DFpfNx7evPYeG311co="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/go/goeland/package.nix b/pkgs/by-name/go/goeland/package.nix index 993f05f184de..9788a3810bec 100644 --- a/pkgs/by-name/go/goeland/package.nix +++ b/pkgs/by-name/go/goeland/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "goeland"; - version = "0.24.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "slurdge"; repo = "goeland"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pUwGdL17/VS9difji4/B1QzG7l6K4igeRxISDKVToE8="; + sha256 = "sha256-8vhcAzpgYDPHRuvBzeboGO09n+UCSCxNaJuooPnLBjo="; }; - vendorHash = "sha256-s20LCVih71TR5IYQ26bpF+q4eonpBlGXayCzcFLlb8Y="; + vendorHash = "sha256-GOoeyh0ddtYiigavgjMNy8z6suTFtS9oswO9PAdagGE="; ldflags = [ "-s" @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/slurdge/goeland"; changelog = "https://github.com/slurdge/goeland/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sweenu ]; }; }) diff --git a/pkgs/by-name/go/gofu/package.nix b/pkgs/by-name/go/gofu/package.nix index 1b95bd33f4c0..3f709205e055 100644 --- a/pkgs/by-name/go/gofu/package.nix +++ b/pkgs/by-name/go/gofu/package.nix @@ -4,15 +4,15 @@ fetchFromGitHub, }: -buildGoModule { +buildGoModule (finalAttrs: { pname = "gofu"; - version = "unstable-2023-04-25"; + version = "2026.2"; src = fetchFromGitHub { owner = "majewsky"; repo = "gofu"; - rev = "f308ca92d1631e579fbfe3b3da13c93709dc18a2"; - hash = "sha256-8c/Z+44gX7diAhXq8sHOqISoGhYdFA7VUYn7eNMCYxY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-4ssDfWsV1/3iQ7beR+kyqsN+rMe6cxda4OB6f8KkWVY="; }; vendorHash = null; @@ -30,4 +30,4 @@ buildGoModule { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; -} +}) diff --git a/pkgs/build-support/setup-hooks/gog-unpack.sh b/pkgs/by-name/go/gogUnpackHook/gog-unpack.sh similarity index 100% rename from pkgs/build-support/setup-hooks/gog-unpack.sh rename to pkgs/by-name/go/gogUnpackHook/gog-unpack.sh diff --git a/pkgs/by-name/go/gogUnpackHook/package.nix b/pkgs/by-name/go/gogUnpackHook/package.nix new file mode 100644 index 000000000000..d47a750ad961 --- /dev/null +++ b/pkgs/by-name/go/gogUnpackHook/package.nix @@ -0,0 +1,15 @@ +{ + lib, + makeSetupHook, + innoextract, + file-rename, +}: + +makeSetupHook { + name = "gog-unpack-hook"; + propagatedBuildInputs = [ + innoextract + file-rename + ]; + meta.license = lib.licenses.mit; +} ./gog-unpack.sh diff --git a/pkgs/by-name/go/gogcli/package.nix b/pkgs/by-name/go/gogcli/package.nix index 5d7d9c06b5d6..a0ae754eef07 100644 --- a/pkgs/by-name/go/gogcli/package.nix +++ b/pkgs/by-name/go/gogcli/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gogcli"; - version = "0.11.0"; + version = "0.29.0"; src = fetchFromGitHub { - owner = "steipete"; + owner = "openclaw"; repo = "gogcli"; tag = "v${finalAttrs.version}"; - hash = "sha256-hJU40ysjRx4p9SWGmbhhpToYCpk3DcMAWCnKqxHRmh0="; + hash = "sha256-JunPpEzbNp00uEiJ7AzouXyzFwyNLehLU7mwL3eh4bM="; }; - vendorHash = "sha256-WGRlv3UsK3SVBQySD7uZ8+FiRl03p0rzjBm9Se1iITs="; + vendorHash = "sha256-JrRIUYpw2lAD0ezi0HTZvS42OS7vP8DAHU3m0u3eCbM="; subPackages = [ "cmd/gog" ]; @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI tool for interacting with Google APIs (Gmail, Calendar, Drive, and more)"; - homepage = "https://github.com/steipete/gogcli"; + homepage = "https://github.com/openclaw/gogcli"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ macalinao ]; mainProgram = "gog"; diff --git a/pkgs/by-name/go/gogdl/package.nix b/pkgs/by-name/go/gogdl/package.nix index 3c5df2a78ba0..85547311f399 100644 --- a/pkgs/by-name/go/gogdl/package.nix +++ b/pkgs/by-name/go/gogdl/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "GOG Downloading module for Heroic Games Launcher"; mainProgram = "gogdl"; homepage = "https://github.com/Heroic-Games-Launcher/heroic-gogdl"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/go/gogh/package.nix b/pkgs/by-name/go/gogh/package.nix index 695ac6dd2bd8..2a14bb73c7da 100644 --- a/pkgs/by-name/go/gogh/package.nix +++ b/pkgs/by-name/go/gogh/package.nix @@ -25,13 +25,13 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "gogh"; - version = "365"; + version = "366"; src = fetchFromGitHub { owner = "Gogh-Co"; repo = "Gogh"; tag = "v${finalAttrs.version}"; - hash = "sha256-qK3E7ceeVqBgJ8rSotfH3K9WpxE5dS/h4a7Ml5qwlS0="; + hash = "sha256-YJLWscXslIK1NKM4hhrKT/kKQJof0Vn6uCtkcuZ3vUw="; }; postPatch = '' diff --git a/pkgs/by-name/go/gogup/package.nix b/pkgs/by-name/go/gogup/package.nix index 43f69758bd40..25e7a046dafc 100644 --- a/pkgs/by-name/go/gogup/package.nix +++ b/pkgs/by-name/go/gogup/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gogup"; - version = "1.2.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nao1215"; repo = "gup"; rev = "v${finalAttrs.version}"; - hash = "sha256-tkZt0lv3uy43EijCE+Lvgt2X4p1rB2SkZ4UfkJGYPbY="; + hash = "sha256-XRwYvXrg6sF15mvRpldru+mNBu1qKzntoLnhx5+CtOk="; }; - vendorHash = "sha256-lS7C/932cpaVUtXJ3tuZKyqDv4yT2RSG2NfQW5kcQrM="; + vendorHash = "sha256-uvyt/JVHX/R44NOZ8Hl0Jwzge9v3bph/Jy9kX4vNReQ="; doCheck = false; ldflags = [ diff --git a/pkgs/by-name/go/goimapnotify/package.nix b/pkgs/by-name/go/goimapnotify/package.nix index 7a467144d0d7..5810a15871cb 100644 --- a/pkgs/by-name/go/goimapnotify/package.nix +++ b/pkgs/by-name/go/goimapnotify/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "goimapnotify"; - version = "2.5.5"; + version = "2.5.6"; src = fetchFromGitLab { owner = "shackra"; repo = "goimapnotify"; tag = finalAttrs.version; - hash = "sha256-kPyL6sObr1WvCjjGJZk2Rk4YsY4rH836OzXP/MEgpL0="; + hash = "sha256-3sHksrutag7gznxUrETDmd3VbJaTH1BqaGKEPTCCtL0="; }; - vendorHash = "sha256-5cZzaCoOR1R7iST0q3GaJbYIbKKEigeWqhp87maOL04="; + vendorHash = "sha256-3yavkH0b4ZLLt1a7MhdeHSNVAAOYKiKC+D9zfEv9bSA="; postPatch = '' for f in internal/util/command.go internal/util/command_test.go; do diff --git a/pkgs/by-name/go/gokapi/package.nix b/pkgs/by-name/go/gokapi/package.nix index d70c6a626bab..689de8190e4c 100644 --- a/pkgs/by-name/go/gokapi/package.nix +++ b/pkgs/by-name/go/gokapi/package.nix @@ -42,6 +42,7 @@ buildGoModule (finalAttrs: { ''; subPackages = [ + "cmd/cli-uploader" "cmd/gokapi" ]; @@ -50,6 +51,10 @@ buildGoModule (finalAttrs: { "-w" ]; + postInstall = '' + mv $out/bin/cli-uploader $out/bin/gokapi-cli + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/go/gol/package.nix b/pkgs/by-name/go/gol/package.nix index b8d1225f438e..2fb848e64b87 100644 --- a/pkgs/by-name/go/gol/package.nix +++ b/pkgs/by-name/go/gol/package.nix @@ -17,7 +17,7 @@ maven.buildMavenPackage rec { hash = "sha256-AnPm5Mooww9kAMWLnM36z8DVRGfIIEiqUE65tgNuKm8="; }; - mvnHash = "sha256-YD28YX0RKuxOEWuK12ToOnFFrUPqA9xZ+EmsCt1fDPI="; + mvnHash = "sha256-kLSMLt0TMMuyWLU65Y+4CpEn5PIm/+nLg1+oBR5w3pI="; mvnParameters = "compile assembly:single -Dmaven.test.skip=true"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/go/golden-cheetah-bin/package.nix b/pkgs/by-name/go/golden-cheetah-bin/package.nix index 43468179bff4..c3b8399f43da 100644 --- a/pkgs/by-name/go/golden-cheetah-bin/package.nix +++ b/pkgs/by-name/go/golden-cheetah-bin/package.nix @@ -12,7 +12,6 @@ let description = "Performance software for cyclists, runners and triathletes. This version includes the API Tokens for e.g. Strava"; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/go/goldendict-ng/package.nix b/pkgs/by-name/go/goldendict-ng/package.nix index 24314df20c70..099427df6359 100644 --- a/pkgs/by-name/go/goldendict-ng/package.nix +++ b/pkgs/by-name/go/goldendict-ng/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "goldendict-ng"; - version = "26.5.7"; + version = "26.6.2"; src = fetchFromGitHub { owner = "xiaoyifang"; repo = "goldendict-ng"; tag = "v${finalAttrs.version}"; - hash = "sha256-oTx0gEnyKg23E8fl+t1Cbi6jRoOYQGevaHGrJHSBA7s="; + hash = "sha256-2K0I6uYJtqRw0JbvNbbmIjzxzn6l7tzDU1d9Lo49cYs="; }; strictDeps = true; diff --git a/pkgs/by-name/go/golds/package.nix b/pkgs/by-name/go/golds/package.nix index 24eb0d7f5cd5..b492fb0775e1 100644 --- a/pkgs/by-name/go/golds/package.nix +++ b/pkgs/by-name/go/golds/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "golds"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "go101"; repo = "golds"; tag = "v${finalAttrs.version}"; - hash = "sha256-s4vzQ+ntty1XLe65sEBxxN+Amp162k40LmJ7AT2/26U="; + hash = "sha256-Jt0Q6Ie1HSqRs4+zlmNOXlSMXfWu0nSIOjglduq4FUE="; }; # nixpkgs is not using the go distpack archive and missing a VERSION file in the source diff --git a/pkgs/by-name/go/golink/package.nix b/pkgs/by-name/go/golink/package.nix index 2ae8a78b0334..526cde434ce7 100644 --- a/pkgs/by-name/go/golink/package.nix +++ b/pkgs/by-name/go/golink/package.nix @@ -1,22 +1,22 @@ { - git, lib, buildGoModule, fetchFromGitHub, + unstableGitUpdater, }: -buildGoModule rec { +buildGoModule { pname = "golink"; - version = "1.0.0"; + version = "1.0.0-unstable-2026-07-03"; src = fetchFromGitHub { owner = "tailscale"; repo = "golink"; - tag = "v${version}"; - hash = "sha256-cIml0ewF5j2cQySLHkMmV1rl7cVH8wuoPFeFDCARi1A="; + rev = "30223ca66c2dad29356b6266254e1bf4af921f28"; + hash = "sha256-hp886p94NHA8u3021horHFf6tGa8x8gWdeNA1XnQZ6E="; }; - vendorHash = "sha256-QIAkmqXWH3X2dIoWyVcqFXVHBwzyv1dNPfdkzD5LuSE="; + vendorHash = "sha256-7Ykb2YPrHwwBrWuufFwGTT9mQFzIRkiBiNlLvqpr+wo="; overrideModAttrs = old: { # netdb.go allows /etc/protocols and /etc/services to not exist and happily proceeds, but it panic()s if they exist but return permission denied. @@ -30,6 +30,8 @@ buildGoModule rec { "-w" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { description = "Private shortlink service for tailnets"; homepage = "https://github.com/tailscale/golink"; diff --git a/pkgs/by-name/go/gollama/package.nix b/pkgs/by-name/go/gollama/package.nix index b1ff1574cd1e..2b6cee4cc1e3 100644 --- a/pkgs/by-name/go/gollama/package.nix +++ b/pkgs/by-name/go/gollama/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "gollama"; - version = "2.0.4"; + version = "2.0.5"; src = fetchFromGitHub { owner = "sammcj"; repo = "gollama"; tag = "v${finalAttrs.version}"; - hash = "sha256-unvnFKkEWJnyzuNz8zekB8ZSXP/dUqv24qgyhkP3kkY="; + hash = "sha256-LjgQSV7Z2apcdIaxk9NU7AdlPJPlt7CQ/q9nID9Px5w="; }; - vendorHash = "sha256-t7Kl6WnS8vvLyvKzkDswv0yOaeTE3IgZCNAC3dD8euU="; + vendorHash = "sha256-xpAAtJIJtETbDYwieLBI7L79SedeAOmYnHL9zq6l7Rs="; doCheck = false; diff --git a/pkgs/by-name/go/gomapenum/package.nix b/pkgs/by-name/go/gomapenum/package.nix index 2247aa56a9be..7dc199b84350 100644 --- a/pkgs/by-name/go/gomapenum/package.nix +++ b/pkgs/by-name/go/gomapenum/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { description = "Tools for user enumeration and password bruteforce"; mainProgram = "gomapenum"; homepage = "https://github.com/nodauf/GoMapEnum"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/go/gomi/package.nix b/pkgs/by-name/go/gomi/package.nix index 73f4955b9930..0f883f4a7ab9 100644 --- a/pkgs/by-name/go/gomi/package.nix +++ b/pkgs/by-name/go/gomi/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "1.6.2"; src = fetchFromGitHub { - owner = "b4b4r07"; + owner = "babarot"; repo = "gomi"; tag = "v${finalAttrs.version}"; hash = "sha256-Ino7jUd9JvX6afvS6ouPHxU42GYfF696m+OS5CSvx5g="; @@ -40,7 +40,7 @@ buildGoModule (finalAttrs: { meta = { description = "Replacement for UNIX rm command"; - homepage = "https://github.com/b4b4r07/gomi"; + homepage = "https://github.com/babarot/gomi"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mimame diff --git a/pkgs/by-name/go/gomobile/package.nix b/pkgs/by-name/go/gomobile/package.nix index 4b00da7f414b..f25c06b753b0 100644 --- a/pkgs/by-name/go/gomobile/package.nix +++ b/pkgs/by-name/go/gomobile/package.nix @@ -71,7 +71,7 @@ buildGoModule { meta = { description = "Tool for building and running mobile apps written in Go"; homepage = "https://pkg.go.dev/golang.org/x/mobile/cmd/gomobile"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ jakubgs ]; }; } diff --git a/pkgs/by-name/go/gomplate/package.nix b/pkgs/by-name/go/gomplate/package.nix index 90997669c188..03bc1f9430c0 100644 --- a/pkgs/by-name/go/gomplate/package.nix +++ b/pkgs/by-name/go/gomplate/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gomplate"; - version = "5.1.0"; + version = "5.2.0"; src = fetchFromGitHub { owner = "hairyhenderson"; repo = "gomplate"; tag = "v${finalAttrs.version}"; - hash = "sha256-wgRIwY3MqYbVU/k4BZWqdDcybSJwnCDFQZ6ybr2/tiM="; + hash = "sha256-rkQ8X3gb9McNxXsp5IwRUoesrDN99uo55Njm8LKGeI4="; }; - vendorHash = "sha256-QXaXOEGUW1Wo6kD16nrNOn3MoZuJw8YNuJtGh0ffCgQ="; + vendorHash = "sha256-yy6+mbLy8HpLp6sPjf07S7ufrqLKmjzIA3NoeKUOeIc="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gomuks-web/package.nix b/pkgs/by-name/go/gomuks-web/package.nix index 2fa7366d7570..0ee8671cb9a6 100644 --- a/pkgs/by-name/go/gomuks-web/package.nix +++ b/pkgs/by-name/go/gomuks-web/package.nix @@ -11,17 +11,17 @@ buildGoModule (finalAttrs: { pname = "gomuks-web"; - version = "26.05"; + version = "26.07"; src = fetchFromGitHub { owner = "gomuks"; repo = "gomuks"; tag = "v0.${lib.replaceStrings [ "." ] [ "" ] finalAttrs.version}.0"; - hash = "sha256-BoTD4c9ZhfyFytsxUCvTIoCoBiFbPW1T1uGWRDx+OIE="; + hash = "sha256-OgcmRBuVFTPzAVgNVDUZcfdgxHi4mtUcbmfTRPx/f9M="; }; proxyVendor = true; - vendorHash = "sha256-WJQmei6+T98k2Dkma3rHM2c7pzvze0hT8W5UnnARLok="; + vendorHash = "sha256-wNscq9FDJb9+WqKCBZ9YD+EQ/Sc2PAznunKP6hrs+Ms="; nativeBuildInputs = [ nodejs @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { npmRoot = "web"; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/web"; - hash = "sha256-H76LUuhEqjuAh7PxjIjMBW5TvsOg9Ra2T7Y39SfktqM="; + hash = "sha256-C+zEMI2wmO3EvefpswTk9Tq3AV1Acfi+w3oO5WpxLIQ="; }; }; @@ -52,6 +52,7 @@ buildGoModule (finalAttrs: { tags = [ "goolm" "libheif" + "sqlite_fts5" ]; ldflags = [ diff --git a/pkgs/by-name/go/gomuks/package.nix b/pkgs/by-name/go/gomuks/package.nix index b938f1e0ec56..a62d200a971c 100644 --- a/pkgs/by-name/go/gomuks/package.nix +++ b/pkgs/by-name/go/gomuks/package.nix @@ -16,7 +16,7 @@ buildGoModule rec { version = "0.3.1"; src = fetchFromGitHub { - owner = "tulir"; + owner = "gomuks"; repo = "gomuks"; rev = "v${version}"; sha256 = "sha256-bDJXo8d9K5UO599HDaABpfwc9/dJJy+9d24KMVZHyvI="; diff --git a/pkgs/by-name/go/goofys/package.nix b/pkgs/by-name/go/goofys/package.nix index 0a678d455e2d..3bf49d7232a4 100644 --- a/pkgs/by-name/go/goofys/package.nix +++ b/pkgs/by-name/go/goofys/package.nix @@ -29,7 +29,7 @@ buildGoModule { meta = { homepage = "https://github.com/kahing/goofys"; description = "High-performance, POSIX-ish Amazon S3 file system written in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; broken = stdenv.hostPlatform.isDarwin; # needs to update gopsutil to at least v3.21.3 to include https://github.com/shirou/gopsutil/pull/1042 mainProgram = "goofys"; diff --git a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix index ed38fe104e89..b81475842f4e 100644 --- a/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix +++ b/pkgs/by-name/go/google-alloydb-auth-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "google-alloydb-auth-proxy"; - version = "1.15.0"; + version = "1.15.2"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "alloydb-auth-proxy"; tag = "v${finalAttrs.version}"; - hash = "sha256-TNb5rXKpVfqi4aPdB1qlQFVnxmcblrgmODeZtmS4XgA="; + hash = "sha256-b3HpCn1mIgQIMpeOCLXyx79U4MqEO3rhxgNRaNus5Bs="; }; subPackages = [ "." ]; - vendorHash = "sha256-j+jMwkW2yNEEd7TA5gUNRgKOOrm4w4U3ZfP7yErd13M="; + vendorHash = "sha256-PKIF5M/kJtds+9sgzg7hpnOzXnSHReV1GCKa1DF/tKQ="; checkFlags = [ "-short" diff --git a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix index 6cea608e8941..16ef0b8e1665 100644 --- a/pkgs/by-name/go/google-app-engine-go-sdk/package.nix +++ b/pkgs/by-name/go/google-app-engine-go-sdk/package.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ lufia ]; }; diff --git a/pkgs/by-name/go/google-chrome/package.nix b/pkgs/by-name/go/google-chrome/package.nix index 92004e0cdb4c..faf1f96f7f10 100644 --- a/pkgs/by-name/go/google-chrome/package.nix +++ b/pkgs/by-name/go/google-chrome/package.nix @@ -179,11 +179,11 @@ let linux = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.114"; + version = "150.0.7871.186"; src = fetchurl { url = "https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-stable/google-chrome-stable_${finalAttrs.version}-1_amd64.deb"; - hash = "sha256-GVvehY+e5thM3nHYMQd/uI8HTnjvL/w8UeRpUWouzlA="; + hash = "sha256-QZPgC21dWWnuY/emlZaGj1RqoOjLB3s+C/nMHixxnQA="; }; # With strictDeps on, some shebangs were not being patched correctly @@ -289,11 +289,11 @@ let darwin = stdenvNoCC.mkDerivation (finalAttrs: { inherit pname meta passthru; - version = "149.0.7827.115"; + version = "150.0.7871.187"; src = fetchurl { - url = "http://dl.google.com/release2/chrome/ny2unjynyv52nhojnzjueghuma_149.0.7827.115/GoogleChrome-149.0.7827.115.dmg"; - hash = "sha256-q1jMxveB5FFA+wA5a5mnSPWoQFkNHQ20x51R8A/yUsk="; + url = "http://dl.google.com/release2/chrome/ecziwrw2etq4lm3vlbpv5wzvce_150.0.7871.187/GoogleChrome-150.0.7871.187.dmg"; + hash = "sha256-I1a+wR5zNfOSYyns2ehDek5DP1xccRQvmBLymxB/R7A="; }; dontPatch = true; diff --git a/pkgs/by-name/go/google-cloud-cpp/package.nix b/pkgs/by-name/go/google-cloud-cpp/package.nix index cf3d824a9fd6..a2919dea36d1 100644 --- a/pkgs/by-name/go/google-cloud-cpp/package.nix +++ b/pkgs/by-name/go/google-cloud-cpp/package.nix @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { requiredSystemFeatures = [ "big-parallel" ]; meta = { - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/googleapis/google-cloud-cpp"; description = "C++ Idiomatic Clients for Google Cloud Platform services"; changelog = "https://github.com/googleapis/google-cloud-cpp/blob/v${finalAttrs.version}/CHANGELOG.md"; diff --git a/pkgs/by-name/go/google-cloud-sdk/cloudsdk-vendored-protobuf-upb.patch b/pkgs/by-name/go/google-cloud-sdk/cloudsdk-vendored-protobuf-upb.patch new file mode 100644 index 000000000000..819947e767d4 --- /dev/null +++ b/pkgs/by-name/go/google-cloud-sdk/cloudsdk-vendored-protobuf-upb.patch @@ -0,0 +1,22 @@ +diff --git a/lib/third_party/cloudsdk/google/protobuf/internal/api_implementation.py b/lib/third_party/cloudsdk/google/protobuf/internal/api_implementation.py +--- a/lib/third_party/cloudsdk/google/protobuf/internal/api_implementation.py ++++ b/lib/third_party/cloudsdk/google/protobuf/internal/api_implementation.py +@@ -55,7 +55,7 @@ _implementation_type = 'python' + if _implementation_type is None: +- if _CanImport('google._upb._message'): ++ if _CanImport('cloudsdk.google._upb._message'): + _implementation_type = 'upb' +- elif _CanImport('google.protobuf.pyext._message'): ++ elif _CanImport('cloudsdk.google.protobuf.pyext._message'): + _implementation_type = 'cpp' + else: + _implementation_type = 'python' +@@ -96,7 +96,7 @@ if _implementation_type == 'cpp': + if _implementation_type == 'upb': + try: + # pylint: disable=g-import-not-at-top +- from google._upb import _message ++ from cloudsdk.google._upb import _message + _c_module = _message + del _message + except ImportError: diff --git a/pkgs/by-name/go/google-cloud-sdk/data.nix b/pkgs/by-name/go/google-cloud-sdk/data.nix index 5f38c0ca139b..48f65e093eed 100644 --- a/pkgs/by-name/go/google-cloud-sdk/data.nix +++ b/pkgs/by-name/go/google-cloud-sdk/data.nix @@ -7,10 +7,6 @@ url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-x86_64.tar.gz"; sha256 = "1qx246cy1mcngky4gcg65lzzw64anab9hqpmp6v7dqfqfld64p5k"; }; - x86_64-darwin = { - url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-darwin-x86_64.tar.gz"; - sha256 = "1gk6rrj8p30zraw3n2ajy50vnd5v724s5bnhnilnml03is7ssamd"; - }; aarch64-linux = { url = "https://dl.google.com/dl/cloudsdk/channels/rapid/downloads/google-cloud-sdk-570.0.0-linux-arm.tar.gz"; sha256 = "085ykvz0y6madak8aak4bh0qyafqyiflmck0nkcb4xv6kmw6s3fa"; diff --git a/pkgs/by-name/go/google-cloud-sdk/package.nix b/pkgs/by-name/go/google-cloud-sdk/package.nix index e63b94324735..6e20f2bacb13 100644 --- a/pkgs/by-name/go/google-cloud-sdk/package.nix +++ b/pkgs/by-name/go/google-cloud-sdk/package.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation rec { ./gcloud-path.patch # Disable checking for updates for the package ./gsutil-disable-updates.patch + # Cloud SDK vendors protobuf under the cloudsdk.google.protobuf namespace. + # Keep that vendored runtime from loading external google._upb modules. + ./cloudsdk-vendored-protobuf-upb.patch ]; installPhase = '' @@ -185,6 +188,12 @@ stdenv.mkDerivation rec { # Avoid trying to write logs to homeless-shelter export HOME=$(mktemp -d) $out/bin/gcloud version --format json | jq '."Google Cloud SDK"' | grep "${version}" + $out/bin/gcloud storage ls --help > /dev/null + # Exercises generated clients that use Cloud SDK's vendored protobuf. This + # catches regressions where external protobuf/upb is selected instead of the + # vendored pure-Python protobuf implementation. + $out/bin/gcloud kms asymmetric-sign --help > /dev/null + PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION=upb $out/bin/gcloud kms asymmetric-sign --help > /dev/null $out/bin/gsutil version | grep -w "$(cat platform/gsutil/VERSION)" ''; diff --git a/pkgs/by-name/go/google-cloud-sdk/update.sh b/pkgs/by-name/go/google-cloud-sdk/update.sh index e8f3caf832f8..aea218cc1f87 100755 --- a/pkgs/by-name/go/google-cloud-sdk/update.sh +++ b/pkgs/by-name/go/google-cloud-sdk/update.sh @@ -30,9 +30,6 @@ EOF echo -n " x86_64-linux =" genMainSrc "linux" "x86_64" - echo -n " x86_64-darwin =" - genMainSrc "darwin" "x86_64" - echo -n " aarch64-linux =" genMainSrc "linux" "arm" diff --git a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix index 4e65566a0a90..30e2d43c064e 100644 --- a/pkgs/by-name/go/google-cloud-sql-proxy/package.nix +++ b/pkgs/by-name/go/google-cloud-sql-proxy/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "google-cloud-sql-proxy"; - version = "2.21.1"; + version = "2.23.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "cloud-sql-proxy"; rev = "v${finalAttrs.version}"; - hash = "sha256-3C7IfpVcv1BpzKnMV6dQJ0e7hY50owR3YijlI2+cAJQ="; + hash = "sha256-hCnwNSOu9aSdWC5Gtr0nytmQQnkMS6i84pICBrN2VVg="; }; subPackages = [ "." ]; - vendorHash = "sha256-tbglk7rscPx1RrURSzVW5FgZE6b6mp4tvOXVQKMUrjQ="; + vendorHash = "sha256-bM8BEdq5EY5RtsCNkRNTsc9dGgAEZkGHcUOip2LwKik="; checkFlags = [ "-short" diff --git a/pkgs/by-name/go/google-lighthouse/package.nix b/pkgs/by-name/go/google-lighthouse/package.nix index b5daf05fd3a7..143b2a52ca96 100644 --- a/pkgs/by-name/go/google-lighthouse/package.nix +++ b/pkgs/by-name/go/google-lighthouse/package.nix @@ -13,18 +13,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "google-lighthouse"; - version = "13.3.0"; + version = "13.4.0"; src = fetchFromGitHub { owner = "GoogleChrome"; repo = "lighthouse"; tag = "v${finalAttrs.version}"; - hash = "sha256-5GFaM6R836Z/EKTvDLF0/aLox5VltcwgLSWzAmn77EY="; + hash = "sha256-diZT1SOCSpuiQfAS7kjGxea2imVAJyKYxf2WFBsE/H0="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-tzN0rAHahBs4n6KCCAS2xoCxXmaZVtmB4WSNxia9TME="; + hash = "sha256-Rp+LCYRZ5jVGiR1L8Wyd5juw8GPrwnUH2chrxrrwE6k="; }; yarnBuildScript = "build-report"; diff --git a/pkgs/by-name/go/goose-cli/librusty_v8.nix b/pkgs/by-name/go/goose-cli/librusty_v8.nix index 3ace8f706ca8..0baf70969fb7 100644 --- a/pkgs/by-name/go/goose-cli/librusty_v8.nix +++ b/pkgs/by-name/go/goose-cli/librusty_v8.nix @@ -6,7 +6,6 @@ fetchLibrustyV8 { shas = { x86_64-linux = "sha256-chV1PAx40UH3Ute5k3lLrgfhih39Rm3KqE+mTna6ysE="; aarch64-linux = "sha256-4IivYskhUSsMLZY97+g23UtUYh4p5jk7CzhMbMyqXyY="; - x86_64-darwin = "sha256-1jUuC+z7saQfPYILNyRJanD4+zOOhXU2ac/LFoytwho="; aarch64-darwin = "sha256-yHa1eydVCrfYGgrZANbzgmmf25p7ui1VMas2A7BhG6k="; }; } diff --git a/pkgs/by-name/go/goose-cli/package.nix b/pkgs/by-name/go/goose-cli/package.nix index d0ca81708564..2c535194e247 100644 --- a/pkgs/by-name/go/goose-cli/package.nix +++ b/pkgs/by-name/go/goose-cli/package.nix @@ -51,7 +51,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.28.0"; src = fetchFromGitHub { - owner = "block"; + owner = "aaif-goose"; repo = "goose"; tag = "v${finalAttrs.version}"; hash = "sha256-/1TtsnNiLoTkvyeFR282qSpo+Jt3pvFxduJ7lyzsTXI="; @@ -181,7 +181,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Open-source, extensible AI agent that goes beyond code suggestions - install, execute, edit, and test with any LLM"; - homepage = "https://github.com/block/goose"; + homepage = "https://github.com/aaif-goose/goose"; mainProgram = "goose"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/go/goose/package.nix b/pkgs/by-name/go/goose/package.nix index d90533967545..f58da1fbc62d 100644 --- a/pkgs/by-name/go/goose/package.nix +++ b/pkgs/by-name/go/goose/package.nix @@ -7,17 +7,17 @@ buildGoModule (finalAttrs: { pname = "goose"; - version = "3.27.1"; + version = "3.27.3"; src = fetchFromGitHub { owner = "pressly"; repo = "goose"; rev = "v${finalAttrs.version}"; - hash = "sha256-dzeB5QXjQAyJlaM6I82C4gNoj7ELA4sgkfHkXADN9+Y="; + hash = "sha256-CSS0OtC4/EeQD7PGin64U0Fag2z490RQ7CKNBRyp8f8="; }; proxyVendor = true; - vendorHash = "sha256-JsLpcV5SSBin6U7Kj5O0mhXNdIwyV+xdteEJBxW8zuY="; + vendorHash = "sha256-opO6G9Fdyt27GlWyaB/6J1xhm3wTgH9Xc/FYcLcqBVs="; # skipping: end-to-end tests require a docker daemon postPatch = '' diff --git a/pkgs/by-name/go/gopeed/package.nix b/pkgs/by-name/go/gopeed/package.nix index 527cf0124410..25c743f62e52 100644 --- a/pkgs/by-name/go/gopeed/package.nix +++ b/pkgs/by-name/go/gopeed/package.nix @@ -21,7 +21,7 @@ let metaCommon = { description = "Modern download manager"; homepage = "https://github.com/GopeedLab/gopeed"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/go/goperf/package.nix b/pkgs/by-name/go/goperf/package.nix index 72e33364d2c9..0898a504ae3d 100644 --- a/pkgs/by-name/go/goperf/package.nix +++ b/pkgs/by-name/go/goperf/package.nix @@ -9,15 +9,15 @@ buildGoModule (finalAttrs: { pname = "goperf"; - version = "0-unstable-2026-05-12"; + version = "0-unstable-2026-07-08"; src = fetchgit { url = "https://go.googlesource.com/perf"; - rev = "3cf34090a3db6bb64df2259e30021db7ff5d9595"; - hash = "sha256-2dz8GCzmyS8LkN1zzyCO8cn/NBKmPhIqFRfILc9/lVo="; + rev = "82a0b07e230d76fa1b3036c383d7a98172f87334"; + hash = "sha256-TOzEoIWofdWlAfKWBS5KWxVpHsn2wx6GZDjACxFZiKI="; }; - vendorHash = "sha256-H9aP7PGzq5gmFvlYrkrOFfqCSdlpoQkIkTwKMgwr2hs="; + vendorHash = "sha256-PBvMccuMBBGfJlETw0Xjm5Ojkgg1BS+y9Kc3vwGW5kk="; passthru.updateScript = writeShellScript "update-goperf" '' export UPDATE_NIX_ATTR_PATH=goperf diff --git a/pkgs/by-name/go/gopher64/allow-unused-type.patch b/pkgs/by-name/go/gopher64/allow-unused-type.patch deleted file mode 100644 index 655f6411e282..000000000000 --- a/pkgs/by-name/go/gopher64/allow-unused-type.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/device/cart.rs b/src/device/cart.rs -index 97bf09f..4406fec 100644 ---- a/src/device/cart.rs -+++ b/src/device/cart.rs -@@ -21,6 +21,7 @@ const JDT_EEPROM_16K: u16 = 0xc000; /* 16k EEPROM */ - const EEPROM_BLOCK_SIZE: usize = 8; - pub const EEPROM_MAX_SIZE: usize = 0x800; - -+#[allow(warnings)] - #[derive(serde::Serialize, serde::Deserialize)] - pub enum CicType { - CicNus6101, diff --git a/pkgs/by-name/go/gopher64/no-git-describe.patch b/pkgs/by-name/go/gopher64/no-git-describe.patch new file mode 100644 index 000000000000..44f203f521c4 --- /dev/null +++ b/pkgs/by-name/go/gopher64/no-git-describe.patch @@ -0,0 +1,29 @@ +--- a/build.rs ++++ b/build.rs +@@ -278,26 +278,6 @@ + .compile("simd"); + } + +- let mut git_output = std::process::Command::new("git"); +- git_output.args(["describe", "--dirty"]); +- +- let git_describe = if let Ok(git_output) = git_output.output() +- && git_output.status.success() +- { +- String::from_utf8(git_output.stdout).unwrap() +- } else if let Ok(git_output) = git_output.args(["--always"]).output() +- && git_output.status.success() +- { +- format!( +- "v{}-{}", +- env!("CARGO_PKG_VERSION"), +- String::from_utf8(git_output.stdout).unwrap() +- ) +- } else { +- panic!("Failed to get git describe"); +- }; +- println!("cargo:rustc-env=GIT_DESCRIBE={git_describe}"); +- + println!("cargo:rerun-if-env-changed=NETPLAY_ID"); + let netplay_id = std::env::var("NETPLAY_ID").unwrap_or("gopher64".to_string()); + println!("cargo:rustc-env=NETPLAY_ID={netplay_id}"); diff --git a/pkgs/by-name/go/gopher64/no-homebrew.patch b/pkgs/by-name/go/gopher64/no-homebrew.patch new file mode 100644 index 000000000000..3ef1857da481 --- /dev/null +++ b/pkgs/by-name/go/gopher64/no-homebrew.patch @@ -0,0 +1,8 @@ +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -59,5 +59,4 @@ + identifier = "io.github.gopher64.gopher64" + category = "public.app-category.games" + icon = ["data/icon/gopher64_128x128.png","data/icon/gopher64_256x256.png","data/icon/gopher64_512x512.png"] +-osx_frameworks = ["/opt/homebrew/opt/molten-vk/lib/libMoltenVK.dylib","/opt/homebrew/opt/freetype/lib/libfreetype.6.dylib","/opt/homebrew/opt/libpng/lib/libpng16.16.dylib"] + osx_minimum_system_version = "15.0" diff --git a/pkgs/by-name/go/gopher64/no-lto.patch b/pkgs/by-name/go/gopher64/no-lto.patch new file mode 100644 index 000000000000..bc26d6e7c7b7 --- /dev/null +++ b/pkgs/by-name/go/gopher64/no-lto.patch @@ -0,0 +1,14 @@ +--- a/build.rs ++++ b/build.rs +@@ -150,11 +143,6 @@ + println!("cargo:rustc-link-lib=dylib=freetype"); + } + +- volk_build.flag("-flto=thin"); +- rdp_build.flag("-flto=thin"); +- simd_build.flag("-flto=thin"); +- retroachievements_build.flag("-flto=thin"); +- + volk_build.compile("volk"); + rdp_build.compile("parallel-rdp"); + retroachievements_build.compile("retroachievements"); diff --git a/pkgs/by-name/go/gopher64/package.nix b/pkgs/by-name/go/gopher64/package.nix index 77353e284318..abb9740accc7 100644 --- a/pkgs/by-name/go/gopher64/package.nix +++ b/pkgs/by-name/go/gopher64/package.nix @@ -1,38 +1,46 @@ { lib, - stdenv, - rustPlatform, + clangStdenv, + linkFarm, + llvmPackages, fetchFromGitHub, - pkg-config, + fetchgit, + runCommand, + rustPlatform, - bzip2, - libGL, - libx11, - libxcursor, - libxkbcommon, - libxi, + # nativeBuildInputs + cargo-bundle, + cctools, + gn, + ninja, + pkg-config, + python3, + + # buildInputs + fontconfig, moltenvk, sdl3, - wayland, + sdl3-ttf, zstd, -}: -rustPlatform.buildRustPackage (finalAttrs: { + # nativeInstallCheckInputs + versionCheckHook, +}: +let + stdenv = clangStdenv; +in +rustPlatform.buildRustPackage.override { inherit stdenv; } (finalAttrs: { pname = "gopher64"; - version = "1.0.17"; + version = "1.1.20"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "gopher64"; repo = "gopher64"; tag = "v${finalAttrs.version}"; - hash = "sha256-DDFtPISV17jQMECBIqYbbGhZpjYXuNnOq7EiEVtSzgc="; fetchSubmodules = true; - leaveDotGit = true; - postFetch = '' - cd "$out" - git rev-parse HEAD > $out/GIT_REV - find "$out" -name .git -print0 | xargs -0 rm -rf - ''; + hash = "sha256-gss0ZGTptk5O67SS+r3i3Caf9I7GQxP0RlHx7GfBihw="; }; cargoPatches = [ @@ -40,61 +48,110 @@ rustPlatform.buildRustPackage (finalAttrs: { # this patch makes it use the SDL3 library provided by nixpkgs ./use-sdl3-via-pkg-config.patch - # make the build script use the @GIT_REV@ string that will be substituted in the logic below - ./set-git-rev.patch - - # enum CicType is not used, but dead code is treated as an error - ./allow-unused-type.patch + ./no-lto.patch + ./no-git-describe.patch + ./volk-linking-order.patch + ./no-homebrew.patch ]; + cargoHash = "sha256-rmt2b8lk/9ts8v33yguuSFcbFvUX00icg1onmhCbDTQ="; + + # don't use lld on aarch64-linux postPatch = '' - # use the file generated in the fetcher to supply the git revision - substituteInPlace build.rs \ - --replace-fail "@GIT_REV@" $(cat GIT_REV) + substituteInPlace .cargo/config.toml \ + --replace-fail 'rustflags = ["-C", "link-arg=-fuse-ld=lld"]' "" ''; - cargoHash = "sha256-31kEYwlDA6iYcwPZyQU4gM/VLfPNeYcDKhhBqzNp/QE="; + env = { + # See pkgs/by-name/ne/neovide/package.nix + SKIA_SOURCE_DIR = + let + repo = fetchFromGitHub { + owner = "rust-skia"; + repo = "skia"; + # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia + tag = "m142-0.89.1"; + hash = "sha256-J7mBQ124/dODxX6MsuMW1NHizCMATAqdSzwxpP2afgk="; + }; + # The externals for skia are taken from skia/DEPS + externals = linkFarm "skia-externals" ( + lib.mapAttrsToList (name: value: { + inherit name; + path = fetchgit value; + }) (lib.importJSON ./skia-externals.json) + ); + in + runCommand "source" { } '' + cp -R ${repo} $out + chmod -R +w $out + ln -s ${externals} $out/third_party/externals + ''; - env.ZSTD_SYS_USE_PKG_CONFIG = true; + SKIA_GN_COMMAND = lib.getExe gn; + SKIA_NINJA_COMMAND = lib.getExe ninja; + + ZSTD_SYS_USE_PKG_CONFIG = true; + + LIBCLANG_PATH = "${lib.getLib llvmPackages.libclang}/lib"; + GIT_DESCRIBE = finalAttrs.version; + }; nativeBuildInputs = [ pkg-config - rustPlatform.bindgenHook + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cargo-bundle + cctools.libtool ]; buildInputs = [ - bzip2 + fontconfig sdl3 + sdl3-ttf zstd - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - moltenvk ]; - # these are dlopen-ed during runtime - runtimeDependencies = lib.optionalString stdenv.hostPlatform.isLinux [ - libGL - libxkbcommon + # no checks + doCheck = false; - # for X11 - libx11 - libxcursor - libxi + installPhase = lib.optionalString stdenv.hostPlatform.isDarwin '' + runHook preInstall - # for wayland - wayland - ]; + # cargo-bundle expects the binary in target/release + release_target="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release" + mv $release_target/gopher64 target/release/gopher64 - postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' - patchelf $out/bin/gopher64 --add-rpath ${lib.makeLibraryPath finalAttrs.runtimeDependencies} + export CARGO_BUNDLE_SKIP_BUILD=true + app_path=$(cargo bundle --release | xargs) + + mkdir -p $out/Applications $out/bin + mv $app_path $out/Applications/ + + ln -s $out/Applications/Gopher64.app/Contents/MacOS/gopher64 $out/bin/gopher64 + + runHook postInstall ''; + postFixup = lib.optionalString stdenv.hostPlatform.isDarwin '' + install_name_tool $out/Applications/Gopher64.app/Contents/MacOS/gopher64 \ + -add_rpath "${lib.makeLibraryPath [ moltenvk ]}" + ''; + + # Error: Os { code: 1, kind: PermissionDenied, message: "Operation not permitted" } + doInstallCheck = !stdenv.hostPlatform.isDarwin; + nativeInstallCheckInputs = [ versionCheckHook ]; + meta = { - changelog = "https://github.com/gopher64/gopher64/releases/tag/${finalAttrs.src.tag}"; - description = "N64 emulator written in Rust"; - homepage = "https://github.com/gopher64/gopher64"; + description = "N64 emulator"; + homepage = "https://loganmc10.itch.io/gopher64"; + downloadPage = "https://github.com/gopher64/gopher64/releases"; + changelog = "https://github.com/gopher64/gopher64/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + prince213 + tomasajt + ]; mainProgram = "gopher64"; - maintainers = with lib.maintainers; [ tomasajt ]; }; }) diff --git a/pkgs/by-name/go/gopher64/set-git-rev.patch b/pkgs/by-name/go/gopher64/set-git-rev.patch deleted file mode 100644 index 15b324e56bd7..000000000000 --- a/pkgs/by-name/go/gopher64/set-git-rev.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff --git a/build.rs b/build.rs -index 0b20db2..d904e63 100644 ---- a/build.rs -+++ b/build.rs -@@ -163,13 +163,7 @@ fn main() { - simd_build.compile("simd"); - } - -- let git_output = std::process::Command::new("git") -- .args(["rev-parse", "HEAD"]) -- .output() -- .unwrap(); -- -- let git_hash = String::from_utf8(git_output.stdout).unwrap(); -- println!("cargo:rustc-env=GIT_HASH={}", git_hash); -+ println!("cargo:rustc-env=GIT_HASH={}", "@GIT_REV@"); - - println!("cargo:rustc-env=N64_STACK_SIZE={}", 8 * 1024 * 1024); - } diff --git a/pkgs/by-name/go/gopher64/skia-externals.json b/pkgs/by-name/go/gopher64/skia-externals.json new file mode 100644 index 000000000000..de4076526c25 --- /dev/null +++ b/pkgs/by-name/go/gopher64/skia-externals.json @@ -0,0 +1,42 @@ +{ + "expat": { + "url": "https://chromium.googlesource.com/external/github.com/libexpat/libexpat.git", + "rev": "8e49998f003d693213b538ef765814c7d21abada", + "hash": "sha256-zP2kiB4nyLi0/I8OsRhxKG0qRGPe2ALLQ+HHfqlBJ6Y=" + }, + "harfbuzz": { + "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", + "rev": "08b52ae2e44931eef163dbad71697f911fadc323", + "hash": "sha256-sP9FQLUEgTZFlvfYqSZnzZqBMxVotzD0FKKsu3/OdUw=" + }, + "icu": { + "url": "https://chromium.googlesource.com/chromium/deps/icu.git", + "rev": "364118a1d9da24bb5b770ac3d762ac144d6da5a4", + "hash": "sha256-frsmwYMiFixEULsE91x5+p98DvkyC0s0fNupqjoRnvg=" + }, + "libjpeg-turbo": { + "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", + "rev": "e14cbfaa85529d47f9f55b0f104a579c1061f9ad", + "hash": "sha256-Ig+tmprZDvlf/M72/DTar2pbxat9ZElgSqdXdoM0lPs=" + }, + "libpng": { + "url": "https://skia.googlesource.com/third_party/libpng.git", + "rev": "ed217e3e601d8e462f7fd1e04bed43ac42212429", + "hash": "sha256-Mo1M8TuVaoSIb7Hy2u6zgjZ1DKgpmgNmGRP6dGg/aTs=" + }, + "vulkanmemoryallocator": { + "url": "https://chromium.googlesource.com/external/github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator", + "rev": "a6bfc237255a6bac1513f7c1ebde6d8aed6b5191", + "hash": "sha256-urUebQaPTgCECmm4Espri1HqYGy0ueAqTBu/VSiX/8I=" + }, + "wuffs": { + "url": "https://skia.googlesource.com/external/github.com/google/wuffs-mirror-release-c.git", + "rev": "e3f919ccfe3ef542cfc983a82146070258fb57f8", + "hash": "sha256-373d2F/STcgCHEq+PO+SCHrKVOo6uO1rqqwRN5eeBCw=" + }, + "zlib": { + "url": "https://chromium.googlesource.com/chromium/src/third_party/zlib", + "rev": "646b7f569718921d7d4b5b8e22572ff6c76f2596", + "hash": "sha256-jNj6SuTZ5/a7crtYhxW3Q/TlfRMNMfYIVxDlr7bYdzQ=" + } +} diff --git a/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch index 1eb8f968f8e2..014c744fb4d9 100644 --- a/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch +++ b/pkgs/by-name/go/gopher64/use-sdl3-via-pkg-config.patch @@ -1,85 +1,86 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 81c7e20..6ae0a17 100644 +--- a/build.rs ++++ b/build.rs +@@ -63,14 +63,7 @@ + .include("parallel-rdp/parallel-rdp-standalone/volk") + .include("parallel-rdp/parallel-rdp-standalone/vulkan") + .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include") +- .include("parallel-rdp/parallel-rdp-standalone/util") +- .include( +- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").unwrap()).join("include"), +- ) +- .include( +- std::path::PathBuf::from(std::env::var("DEP_SDL3_TTF_OUT_DIR").unwrap()) +- .join("include"), +- ); ++ .include("parallel-rdp/parallel-rdp-standalone/util"); + + let mut retroachievements_build = cc::Build::new(); + retroachievements_build --- a/Cargo.lock +++ b/Cargo.lock -@@ -611,15 +611,6 @@ dependencies = [ - "error-code", +@@ -4782,12 +4782,6 @@ ] --[[package]] --name = "cmake" --version = "0.1.54" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0" --dependencies = [ -- "cc", --] -- [[package]] - name = "cobs" - version = "0.2.3" -@@ -3243,12 +3234,6 @@ dependencies = [ - "windows-sys 0.52.0", - ] - --[[package]] -name = "rpkg-config" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a2d2f3481209a6b42eec2fbb49063fb4e8d35b57023401495d4fe0f85c817f0" - - [[package]] - name = "rustc-demangle" - version = "0.1.24" -@@ -3370,21 +3355,13 @@ version = "1.2.0" - source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" - -[[package]] --name = "sdl3-src" --version = "3.2.16" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "c5b5d192485408fa251477ea1dfb4778d864efaec72f730ce3a753deaffb27bb" -- - [[package]] - name = "sdl3-sys" - version = "0.5.2+SDL3-3.2.16" + name = "rspolib" + version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" - checksum = "f0a31799d7cbd36f2b187c32a56975fbdd371c200a91b01d4ed0faf0012bcf9c" +@@ -5002,28 +4996,10 @@ + ] + + [[package]] +-name = "sdl3-src" +-version = "3.4.8" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "997bff4c8d3d9d1e846d7ad8caa33e6fe18a07ec9dc474e1efbbb20923d87bd9" +- +-[[package]] + name = "sdl3-sys" + version = "0.6.5+SDL-3.4.8" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "51ca7a36c908d1d2b6c259d426a5000fbb70e764dcc430f6a373cc151f614f68" +-dependencies = [ +- "cc", +- "cmake", +- "rpkg-config", +- "sdl3-src", +-] +- +-[[package]] +-name = "sdl3-ttf-src" +-version = "3.2.3" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "f28923d2ce72ff317d8eb7cec97ddfb8f351c330d7bcbf8c76e91332122c93b3" + + [[package]] + name = "sdl3-ttf-sys" +@@ -5031,10 +5007,7 @@ + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c30da3dcd7e062f19350b47a532f7629c42801b801687535fd31e8ba2adfd71d" dependencies = [ - "cmake", - "rpkg-config", -- "sdl3-src", -+ "pkg-config", + "sdl3-sys", +- "sdl3-ttf-src", ] [[package]] -diff --git a/Cargo.toml b/Cargo.toml -index 82d8e99..8b15aad 100644 --- a/Cargo.toml +++ b/Cargo.toml -@@ -18,7 +18,7 @@ serde-big-array = "0.5" - eframe = { version = "0.31", default-features = false, features = ["wayland", "x11", "glow"] } - sha2 = "0.10" - ab_glyph = "0.2" --sdl3-sys = { version = "0.5", features = ["build-from-source-static"] } -+sdl3-sys = { version = "0.5", features = ["use-pkg-config"] } - rfd = { version = "0.15", default-features = false, features = ["xdg-portal", "tokio"] } - tokio = {version = "1.45", features = ["rt-multi-thread", "macros"] } +@@ -19,8 +19,8 @@ + slint = { version = "1.16", default-features = false, features = ["compat-1-2", "std", "unstable-winit-030", "backend-winit", "renderer-skia", "accessibility"], optional = true } + open = "5.3" + sha2 = "0.11" +-sdl3-sys = { version = "0.6", features = ["build-from-source-static"] } +-sdl3-ttf-sys = { version = "0.6", features = ["build-from-source-static", "no-sdlttf-harfbuzz", "no-sdlttf-plutosvg"] } ++sdl3-sys = { version = "0.6" } ++sdl3-ttf-sys = { version = "0.6" } + rfd = {version = "0.17", optional = true } + tokio = {version = "1.46", features = ["rt-multi-thread", "macros", "fs", "process"] } spin_sleep = "1.3" -diff --git a/build.rs b/build.rs -index f0c6d21..fa28e25 100644 ---- a/build.rs -+++ b/build.rs -@@ -52,10 +52,7 @@ fn main() { - .include("parallel-rdp/parallel-rdp-standalone/vulkan") - .include("parallel-rdp/parallel-rdp-standalone/vulkan-headers/include") - .include("parallel-rdp/parallel-rdp-standalone/util") -- .include( -- std::path::PathBuf::from(std::env::var("DEP_SDL3_OUT_DIR").to_owned().unwrap()) -- .join("include"), -- ); -+ ; - - let os = std::env::var("CARGO_CFG_TARGET_OS").unwrap(); - let arch = std::env::var("CARGO_CFG_TARGET_ARCH").unwrap(); diff --git a/pkgs/by-name/go/gopher64/volk-linking-order.patch b/pkgs/by-name/go/gopher64/volk-linking-order.patch new file mode 100644 index 000000000000..ccd68546b647 --- /dev/null +++ b/pkgs/by-name/go/gopher64/volk-linking-order.patch @@ -0,0 +1,12 @@ +--- a/build.rs ++++ b/build.rs +@@ -155,8 +155,8 @@ + simd_build.flag("-flto=thin"); + retroachievements_build.flag("-flto=thin"); + +- volk_build.compile("volk"); + rdp_build.compile("parallel-rdp"); ++ volk_build.compile("volk"); + retroachievements_build.compile("retroachievements"); + + let out_path = std::path::PathBuf::from(std::env::var("OUT_DIR").unwrap()); diff --git a/pkgs/by-name/go/gopls/package.nix b/pkgs/by-name/go/gopls/package.nix index fc32575b4948..1ce0b995c011 100644 --- a/pkgs/by-name/go/gopls/package.nix +++ b/pkgs/by-name/go/gopls/package.nix @@ -11,17 +11,17 @@ buildGoLatestModule (finalAttrs: { pname = "gopls"; - version = "0.22.0"; + version = "0.23.0"; src = fetchFromGitHub { owner = "golang"; repo = "tools"; tag = "gopls/v${finalAttrs.version}"; - hash = "sha256-JO3FHKBjAGPPuVvrgdc4RZJreiPHbZp+4RwiZubusVg="; + hash = "sha256-GTRZ0tS2a7Cx4qRf6PfxhkGVPYRoLYOmE+W/2x9Pttk="; }; modRoot = "gopls"; - vendorHash = "sha256-mZvjoEgVZ5iNTiduLEC3Oy4RCcxEdVlN6a0Us47IdIQ="; + vendorHash = "sha256-rvm33C3z3T6moeEQ4C7aG+dT8ROqmpBFehIpwGFZMrU="; # https://github.com/golang/tools/blob/9ed98faa/gopls/main.go#L27-L30 ldflags = [ "-X main.version=v${finalAttrs.version}" ]; diff --git a/pkgs/by-name/go/gopodder/package.nix b/pkgs/by-name/go/gopodder/package.nix new file mode 100644 index 000000000000..944c70fe416e --- /dev/null +++ b/pkgs/by-name/go/gopodder/package.nix @@ -0,0 +1,52 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitUpdater, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "gopodder"; + version = "1.2.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "cbrgm"; + repo = "gopodder"; + tag = "v${finalAttrs.version}"; + hash = "sha256-o/iQnr8WLArecRyMttCluuEYwKirKsOJyj5a7tdulVo="; + }; + + vendorHash = "sha256-iG2IUfBVLQ7P0W4HOiGShVyD4mGUQ0dfGjG4XIYVtWU="; + + ldflags = [ + "-s" + "-X main.Version=${finalAttrs.version}" + "-X main.Revision=${finalAttrs.src.tag}" + "-X main.BuildDate=1970-01-01" + ]; + + env.CGO_ENABLED = 0; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + doInstallCheck = true; + + __darwinAllowLocalNetworking = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + description = "Self-hostable podcast synchronization server compatible with the gPodder API"; + homepage = "https://github.com/cbrgm/gopodder"; + changelog = "https://github.com/cbrgm/gopodder/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ nielmin ]; + mainProgram = "gopodder"; + }; +}) diff --git a/pkgs/by-name/go/gops/package.nix b/pkgs/by-name/go/gops/package.nix index f31ffcb11fec..b29fa94f88c3 100644 --- a/pkgs/by-name/go/gops/package.nix +++ b/pkgs/by-name/go/gops/package.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, + nix-update-script, writableTmpDirAsHomeHook, installShellFiles, }: @@ -20,6 +21,8 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-mumni9LEUhnJz6RYp1MjjFQd9iXe7V0RjXR+S266WaE="; + passthru.updateScript = nix-update-script { }; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/go/gore/package.nix b/pkgs/by-name/go/gore/package.nix index a15a0c10bfa6..72a40dc11e56 100644 --- a/pkgs/by-name/go/gore/package.nix +++ b/pkgs/by-name/go/gore/package.nix @@ -6,23 +6,23 @@ buildGoModule (finalAttrs: { pname = "gore"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { - owner = "motemen"; + owner = "x-motemen"; repo = "gore"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-EPySMj+mQxTJbGheAtzKvQq23DLljPR6COrmytu1x/Q="; + sha256 = "sha256-niMYoYkDaZsv6ntUIfB0B4VheiG6rMouZGUSjHnm51w="; }; - vendorHash = "sha256-W9hMxANySY31X2USbs4o5HssxQfK/ihJ+vCQ/PTyTDc="; + vendorHash = "sha256-oS5LJfLFrmHEwayoD+HygfamZpmerIL1i4QtoRL4Om4="; doCheck = false; meta = { description = "Yet another Go REPL that works nicely"; mainProgram = "gore"; - homepage = "https://github.com/motemen/gore"; + homepage = "https://github.com/x-motemen/gore"; license = lib.licenses.mit; maintainers = [ ]; }; diff --git a/pkgs/by-name/go/goreleaser/package.nix b/pkgs/by-name/go/goreleaser/package.nix index b14df90b4bdc..532bca3baaeb 100644 --- a/pkgs/by-name/go/goreleaser/package.nix +++ b/pkgs/by-name/go/goreleaser/package.nix @@ -10,16 +10,16 @@ }: buildGo126Module (finalAttrs: { pname = "goreleaser"; - version = "2.16.0"; + version = "2.17.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "goreleaser"; rev = "v${finalAttrs.version}"; - hash = "sha256-TV03T9OZXiEa4+v1teI9YA2ilDEU4RoDY9kGdENfZqU="; + hash = "sha256-BB2URWDc5WR51uVsA0I9qhd0T6wYtmqM/jF5YAaV30o="; }; - vendorHash = "sha256-9an5C6xLxyiC4pejOZlz40ZNdc6c0A1mvekXefrCTeQ="; + vendorHash = "sha256-dSJ7F7PKGMZCoKAbu7SpJSXDKQWicoqNA3Kwl9+kGwI="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/goreman/package.nix b/pkgs/by-name/go/goreman/package.nix index c490c7480a78..3100f4df50c3 100644 --- a/pkgs/by-name/go/goreman/package.nix +++ b/pkgs/by-name/go/goreman/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "goreman"; - version = "0.3.16"; + version = "0.3.19"; src = fetchFromGitHub { owner = "mattn"; repo = "goreman"; tag = "v${finalAttrs.version}"; - hash = "sha256-hOFnLxHsrauOrsbJYKNrwFFT5yYX/rdZUVjscBIGDLo="; + hash = "sha256-WVgMJ/9HTwNY7M0hXW7ag8vyQkIrUg+n0e7RX3LQ6a4="; }; - vendorHash = "sha256-Udm0xdrW8Aky26oxUhdbpsNTWziZxkM0G1ZRKLwyl1Q="; + vendorHash = "sha256-KaqihJ5lu65EQQZGZ6Ym1Q/7jbN6zBdZ2AFovTpQ9S8="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/goreplay/package.nix b/pkgs/by-name/go/goreplay/package.nix index 7ec6997e7301..ac5394853dc3 100644 --- a/pkgs/by-name/go/goreplay/package.nix +++ b/pkgs/by-name/go/goreplay/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { version = "1.3.3"; src = fetchFromGitHub { - owner = "buger"; + owner = "probelabs"; repo = "goreplay"; rev = finalAttrs.version; sha256 = "sha256-FiY9e5FgpPu+K8eoO8TsU3xSaSoPPDxYEu0oi/S8Q1w="; }; patches = [ - # Fix build on arm64-linux, see https://github.com/buger/goreplay/pull/1140 + # Fix build on arm64-linux, see https://github.com/probelabs/goreplay/pull/1140 (fetchpatch { - url = "https://github.com/buger/goreplay/commit/a01afa1e322ef06f36995abc3fda3297bdaf0140.patch"; + url = "https://github.com/probelabs/goreplay/commit/a01afa1e322ef06f36995abc3fda3297bdaf0140.patch"; sha256 = "sha256-w3aVe/Fucwd2OuK5Fu2jJTbmMci8ilWaIjYjsWuLRlo="; }) ]; @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { doCheck = false; meta = { - homepage = "https://github.com/buger/goreplay"; + homepage = "https://github.com/probelabs/goreplay"; license = lib.licenses.lgpl3Only; description = "Open-source tool for capturing and replaying live HTTP traffic"; maintainers = [ ]; diff --git a/pkgs/by-name/go/goresym/package.nix b/pkgs/by-name/go/goresym/package.nix index 5870dd5d2b0f..87b774f099c1 100644 --- a/pkgs/by-name/go/goresym/package.nix +++ b/pkgs/by-name/go/goresym/package.nix @@ -8,13 +8,13 @@ buildGoModule (finalAttrs: { pname = "goresym"; - version = "3.3"; + version = "3.4"; src = fetchFromGitHub { owner = "mandiant"; repo = "goresym"; rev = "v${finalAttrs.version}"; - hash = "sha256-ICpgsqhF87jp5wrVmY1EhgKy/6XPBV4eXoFbDxPj8jc="; + hash = "sha256-zDa+NxoC9mAaITWEHzejJykWVnoqnlLQtzbu0vs3NoQ="; }; subPackages = [ "." ]; diff --git a/pkgs/by-name/go/gosec/package.nix b/pkgs/by-name/go/gosec/package.nix index 542c21fd4601..6aeb24a0b7ba 100644 --- a/pkgs/by-name/go/gosec/package.nix +++ b/pkgs/by-name/go/gosec/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gosec"; - version = "2.27.0"; + version = "2.28.0"; src = fetchFromGitHub { owner = "securego"; repo = "gosec"; rev = "v${finalAttrs.version}"; - hash = "sha256-X+jF98POuFlHY6PjTn3t3GQHwNDgHKW4ZnzN9LjjunE="; + hash = "sha256-kj6G8aDTLgAXOzlZGgHPiDGjpczDSwYog5G7Cw0/VNE="; }; - vendorHash = "sha256-kgUM93dbZMdj039kmtjo/DGQdVCe0UhSb1ucZF3Xjeg="; + vendorHash = "sha256-jd6nUvuWKygyKxyGCesQQj5OyYp+SD51ZDFXbyaJckc="; subPackages = [ "cmd/gosec" diff --git a/pkgs/by-name/go/goshs/package.nix b/pkgs/by-name/go/goshs/package.nix index 08816a6aacbd..34448c0dcbbc 100644 --- a/pkgs/by-name/go/goshs/package.nix +++ b/pkgs/by-name/go/goshs/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "goshs"; - version = "2.1.0"; + version = "2.1.4"; src = fetchFromGitHub { - owner = "patrickhener"; + owner = "goshs-labs"; repo = "goshs"; tag = "v${finalAttrs.version}"; - hash = "sha256-pS/Dx3C2c8Rpr2ugcxrElFice6Eildt28zdIfrL/5yk="; + hash = "sha256-8xSYdLO+2AB044sV3JJw0RXB0RuLQ7eIzWvwgoJdp5k="; }; - vendorHash = "sha256-nVg+ALvvZYG+9JFiNGaT/EQO8IdZK3EO8UQoAp29KNQ="; + vendorHash = "sha256-yKNJHs6A7Du9NvGOpwaDmABz6SBMPVzJNoQb7W32IfA="; ldflags = [ "-s" ]; @@ -43,7 +43,7 @@ buildGoModule (finalAttrs: { meta = { description = "Simple, yet feature-rich web server written in Go"; homepage = "https://goshs.de"; - changelog = "https://github.com/patrickhener/goshs/releases/tag/${finalAttrs.src.rev}"; + changelog = "https://github.com/goshs-labs/goshs/releases/tag/${finalAttrs.src.rev}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab diff --git a/pkgs/by-name/go/gotenberg/package.nix b/pkgs/by-name/go/gotenberg/package.nix index 45dd66b54510..1f1ebbe5b267 100644 --- a/pkgs/by-name/go/gotenberg/package.nix +++ b/pkgs/by-name/go/gotenberg/package.nix @@ -24,7 +24,7 @@ let in buildGo126Module (finalAttrs: { pname = "gotenberg"; - version = "8.33.0"; + version = "8.34.0"; outputs = [ "out" @@ -35,10 +35,10 @@ buildGo126Module (finalAttrs: { owner = "gotenberg"; repo = "gotenberg"; tag = "v${finalAttrs.version}"; - hash = "sha256-hTG2O8F/0FdKVKHQsFf027OJU60moey4qkMHUwIQ8xM="; + hash = "sha256-HFRymNfhQOBzXBWZhiujr8sn4m/hpfjcBGg/3/C67DU="; }; - vendorHash = "sha256-E0PVPuSxXtacxaFLrrIVFEre5C/woj3VUckLIdrQWoI="; + vendorHash = "sha256-njyxP+1S1ebaF9xJ1kBL9HrTWMTdEhu8MwUF6FYKHvs="; postPatch = '' find ./pkg -name '*_test.go' -exec sed -i -e 's#/tests#${finalAttrs.src}#g' {} \; diff --git a/pkgs/by-name/go/gotify-cli/package.nix b/pkgs/by-name/go/gotify-cli/package.nix index 23d968f98aba..ce38f358cee0 100644 --- a/pkgs/by-name/go/gotify-cli/package.nix +++ b/pkgs/by-name/go/gotify-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "gotify-cli"; - version = "2.3.2"; + version = "2.4.0"; src = fetchFromGitHub { owner = "gotify"; repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-GwPIGWEpj5GjGV9bz3LctZctHQe+Vywoc1piNb9vAAw="; + sha256 = "sha256-l6WiwAIxKSQnciyssY+dfEdn+GuCSrXdxxBNek4XRiA="; }; - vendorHash = "sha256-+G0LWlPiDcYmEou4gpoIU/OAjzQ3VSHftM1ViG9lhYM="; + vendorHash = "sha256-320MFcSPv05Zh/Lawq6ry+eemcsRpJu85LSd6TOZ8mM="; postInstall = '' mv $out/bin/cli $out/bin/gotify diff --git a/pkgs/by-name/go/gotip/package.nix b/pkgs/by-name/go/gotip/package.nix index 92a8bc90b03d..e22811e695fa 100644 --- a/pkgs/by-name/go/gotip/package.nix +++ b/pkgs/by-name/go/gotip/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "gotip"; - version = "0.6.4"; + version = "0.9.0"; src = fetchFromGitHub { owner = "lusingander"; repo = "gotip"; tag = "v${finalAttrs.version}"; - hash = "sha256-CgTznW4SwKrJ4Q7dIo2ebn51G13nP36tv8n2G9T+MZ0="; + hash = "sha256-W4N6O7cAUIFytjHIqbe7qSmuPHIpyhecw7bLyIP/LRU="; }; - vendorHash = "sha256-Sj7JzyWviGxp10O1zGONN49TXtwquXYJ1KoijIVcyj0="; + vendorHash = "sha256-fQ/rx7gyBcQ3nE/eiCJgtjZCa50iZAuodIZjaRG/mjE="; ldflags = [ "-s" diff --git a/pkgs/by-name/go/gotlsaflare/package.nix b/pkgs/by-name/go/gotlsaflare/package.nix index ef71350c33ce..ebaf3ac1ce1a 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.3"; + version = "2.8.4"; src = fetchFromGitHub { owner = "Stenstromen"; repo = "gotlsaflare"; tag = "v${finalAttrs.version}"; - hash = "sha256-Zw8RfwAR6dw4YUSdML1QJCXVj1s9ZNzr3LTb2vt2fjI="; + hash = "sha256-LDUrLeIgEr0IaYUHRdPtk2soYGbPAycQcroIUMrmVKg="; }; - vendorHash = "sha256-OaaIhXh9+iqMBnP4pHxuJMynXxvfY6iiv+Cd4Dq1I+I="; + vendorHash = "sha256-btvgwiYm+ccT9BPVO42bxidKfOBDrBMT3WidDlMi17k="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/go/gotosocial/package.nix b/pkgs/by-name/go/gotosocial/package.nix index 7f674be42123..e27130db606e 100644 --- a/pkgs/by-name/go/gotosocial/package.nix +++ b/pkgs/by-name/go/gotosocial/package.nix @@ -11,13 +11,13 @@ }: buildGo125Module (finalAttrs: { pname = "gotosocial"; - version = "0.21.2"; + version = "0.22.1"; src = fetchFromCodeberg { owner = "superseriousbusiness"; repo = "gotosocial"; tag = "v${finalAttrs.version}"; - hash = "sha256-Z3j5/pXnNTHgBmPEfFgjOJuL03LsPtvAwbuoL9wb5bk="; + hash = "sha256-fRMQISOYf0rGcnNBpdlDeYWO0vvVwW0UPXdeT1y0+Ec="; }; vendorHash = null; @@ -63,6 +63,9 @@ buildGo125Module (finalAttrs: { ''; postInstall = '' + # remove a Go codegen helper binary + rm $out/bin/gen + mkdir -p $out/share/gotosocial/web mv web/{assets,template} $out/share/gotosocial/web ''; diff --git a/pkgs/by-name/go/govc/package.nix b/pkgs/by-name/go/govc/package.nix index 0f77e32c9f3e..fbef90ea5c77 100644 --- a/pkgs/by-name/go/govc/package.nix +++ b/pkgs/by-name/go/govc/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "govc"; - version = "0.53.1"; + version = "0.55.1"; src = fetchFromGitHub { owner = "vmware"; repo = "govmomi"; tag = "v${finalAttrs.version}"; - hash = "sha256-egyXzA+0xobHcq3dGOYou4sPCHRDv2l8QWo8ZLWofKU="; + hash = "sha256-jhehpkwLa8wWdwMSazbZCT3zV4IUopUciSgPE71nTgQ="; }; - vendorHash = "sha256-xRhjAOQKX6CU9BmdNZonDMwmnEvFXWOaP73j7wPIexk="; + vendorHash = "sha256-6DKE4rs7w070ZreAffs3i7bcJ075eCn9MrvVlOTANPo="; sourceRoot = "${finalAttrs.src.name}/govc"; diff --git a/pkgs/by-name/go/govulncheck/package.nix b/pkgs/by-name/go/govulncheck/package.nix index 41906263741d..ae85b1926ff3 100644 --- a/pkgs/by-name/go/govulncheck/package.nix +++ b/pkgs/by-name/go/govulncheck/package.nix @@ -8,13 +8,13 @@ buildGoLatestModule (finalAttrs: { pname = "govulncheck"; - version = "1.3.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "golang"; repo = "vuln"; tag = "v${finalAttrs.version}"; - hash = "sha256-Xe2H0vF4CNDm1Xw7OD6m5NkqWrFtK/AXzZjqJ5SeoV8="; + hash = "sha256-6gPOteVgKe9ARGkS2wseorG3X0+ep/PD5qAA+59klWs="; }; patches = [ @@ -24,7 +24,7 @@ buildGoLatestModule (finalAttrs: { }) ]; - vendorHash = "sha256-yGaD/jAfT0/YV2ZE8H5++p6CM5qgm+oRtlhgOojX6Zo="; + vendorHash = "sha256-n3U2vX6ByF61oz6BWjMk0Ehwz3W/zMuUNM2+T0rbxPw="; subPackages = [ "cmd/govulncheck" diff --git a/pkgs/by-name/gp/gpaste/package.nix b/pkgs/by-name/gp/gpaste/package.nix index f71819236b18..3935301cd1b7 100644 --- a/pkgs/by-name/gp/gpaste/package.nix +++ b/pkgs/by-name/gp/gpaste/package.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpaste"; - version = "45.3"; + version = "45.5"; src = fetchurl { url = "https://www.imagination-land.org/files/gpaste/GPaste-${finalAttrs.version}.tar.xz"; - hash = "sha256-UU8pw7bqEwg2Vh7S6GTx8swI/2IhlwjQgkGNZCzoMwc="; + hash = "sha256-seoPqmec9F4/zwmLjpAOUBBIVvLbFRMVPZ3jcloRrZE="; }; patches = [ @@ -36,10 +36,6 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace src/libgpaste/gpaste/gpaste-settings.c \ --subst-var-by gschemasCompiled ${glib.makeSchemaPath (placeholder "out") "${finalAttrs.pname}-${finalAttrs.version}"} - - substituteInPlace src/gnome-shell/metadata.json.in --replace-fail \ - '"shell-version": [ "45", "46", "47", "48" ],' \ - '"shell-version": [ "45", "46", "47", "48", "49" ],' ''; nativeBuildInputs = [ @@ -90,5 +86,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.bsd2; platforms = lib.platforms.linux; teams = [ lib.teams.gnome ]; + maintainers = with lib.maintainers; [ fabiob ]; }; }) diff --git a/pkgs/by-name/gp/gpauth/package.nix b/pkgs/by-name/gp/gpauth/package.nix index 08906b1fe59b..c7759ccae790 100644 --- a/pkgs/by-name/gp/gpauth/package.nix +++ b/pkgs/by-name/gp/gpauth/package.nix @@ -12,19 +12,19 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gpauth"; - version = "2.5.4"; + version = "2.6.4"; src = fetchFromGitHub { owner = "yuezk"; repo = "GlobalProtect-openconnect"; tag = "v${finalAttrs.version}"; - hash = "sha256-RDfxhf0t70Ex6MfgHAX2AaWcPAwTCvjm1bQkek+92zc="; + hash = "sha256-cFzQhogahw4/LXI6B9K2xxkMitbHfZg/3/00UORiGEE="; fetchSubmodules = true; }; buildAndTestSubdir = "apps/gpauth"; - cargoHash = "sha256-SY0PS5GxvVO1jaCNyLa3/l/v8/JT2R+4lM3W9kA7fVM="; + cargoHash = "sha256-9O9DHkn2ZG3SOnqjd5xYTNTTJ3w6yj0bs9Nl7m+rg64="; nativeBuildInputs = [ perl diff --git a/pkgs/by-name/gp/gpclient/package.nix b/pkgs/by-name/gp/gpclient/package.nix index 1aa7b97cda5a..066f21314e26 100644 --- a/pkgs/by-name/gp/gpclient/package.nix +++ b/pkgs/by-name/gp/gpclient/package.nix @@ -41,11 +41,15 @@ rustPlatform.buildRustPackage { # nixpkgs-update: no auto update inherit (gpauth) cargoHash - meta src version ; + meta = gpauth.meta // { + # Re-anchor meta.position here so nixpkgs-update sees the opt-out above. + inherit (gpauth.meta) description; + }; + buildAndTestSubdir = "apps/gpclient"; nativeBuildInputs = [ @@ -82,7 +86,9 @@ rustPlatform.buildRustPackage { postPatch = '' substituteInPlace crates/openconnect/src/vpn_utils.rs \ + --replace-fail /usr/local/libexec/gpclient/vpnc-script $out/libexec/gpclient/vpnc-script \ --replace-fail /usr/libexec/gpclient/vpnc-script $out/libexec/gpclient/vpnc-script \ + --replace-fail /usr/local/libexec/gpclient/hipreport.sh $out/libexec/gpclient/hipreport.sh \ --replace-fail /usr/libexec/gpclient/hipreport.sh $out/libexec/gpclient/hipreport.sh substituteInPlace crates/common/src/constants.rs \ @@ -99,7 +105,9 @@ rustPlatform.buildRustPackage { cp -r packaging/files/usr/libexec $out/libexec substituteInPlace $out/libexec/gpclient/hipreport.sh \ - --replace-fail /usr/bin/gpclient $out/bin/gpclient + --replace-fail /usr/bin/gpclient $out/bin/gpclient \ + --replace-fail /opt/homebrew/bin/gpclient $out/bin/gpclient \ + --replace-fail /usr/local/bin/gpclient $out/bin/gpclient '' + lib.optionalString stdenv.hostPlatform.isLinux '' substituteInPlace $out/libexec/gpclient/vpnc-script \ @@ -131,6 +139,11 @@ rustPlatform.buildRustPackage { cp -r packaging/files/usr/lib $out/lib substituteInPlace $out/lib/NetworkManager/dispatcher.d/pre-down.d/gpclient.down \ --replace-fail /usr/bin/gpclient $out/bin/gpclient + + install -Dm644 packaging/files/usr/share/applications/gpgui.desktop \ + $out/share/applications/gpgui.desktop + substituteInPlace $out/share/applications/gpgui.desktop \ + --replace-fail /usr/bin/gpclient $out/bin/gpclient ''; postFixup = '' diff --git a/pkgs/by-name/gp/gperftools/package.nix b/pkgs/by-name/gp/gperftools/package.nix index a5888096c827..693d874cbf7b 100644 --- a/pkgs/by-name/gp/gperftools/package.nix +++ b/pkgs/by-name/gp/gperftools/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gperftools"; - version = "2.17.2"; + version = "2.18.1"; src = fetchFromGitHub { owner = "gperftools"; repo = "gperftools"; tag = "gperftools-${finalAttrs.version}"; - hash = "sha256-WCEuiSjNIX/KhEBWndyVhrKlWs7H60mcHoPlWd7YWC4="; + hash = "sha256-LvLsq0UuMu51vcgxDrBkdnoUJ3qFH+tbXbTjreBxBqs="; }; patches = [ diff --git a/pkgs/by-name/gp/gpg-mdp/package.nix b/pkgs/by-name/gp/gpg-mdp/package.nix index 522cbc8852df..e62916a04459 100644 --- a/pkgs/by-name/gp/gpg-mdp/package.nix +++ b/pkgs/by-name/gp/gpg-mdp/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://tamentis.com/projects/mdp/"; changelog = "https://github.com/tamentis/mdp/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.isc ]; + license = lib.licenses.isc; description = "Manage your passwords with GnuPG and a text editor"; }; diff --git a/pkgs/by-name/gp/gpgme/package.nix b/pkgs/by-name/gp/gpgme/package.nix index cd68dd81ec3b..eb406544e78e 100644 --- a/pkgs/by-name/gp/gpgme/package.nix +++ b/pkgs/by-name/gp/gpgme/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpgme"; - version = "2.0.1"; + version = "2.1.2"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnupg/gpgme/gpgme-${finalAttrs.version}.tar.bz2"; - hash = "sha256-ghqwaVyELqtRdSqBmAySsEEMfq3QQQP3kdXSpSZ4SWY="; + hash = "sha256-BoepWymYccQUH1B8D3QN5rQpyawGfQ+k4GLjJk31+3c="; }; postPatch = '' @@ -110,7 +110,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://gnupg.org/software/gpgme/index.html"; - changelog = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gpgme.git;f=NEWS;hb=gpgme-${finalAttrs.version}"; + changelog = "https://dev.gnupg.org/source/gpgme/browse/master/NEWS;gpgme-${finalAttrs.version}?as=remarkup"; description = "Library for making GnuPG easier to use"; longDescription = '' GnuPG Made Easy (GPGME) is a library designed to make access to GnuPG diff --git a/pkgs/by-name/gp/gpgmepp/package.nix b/pkgs/by-name/gp/gpgmepp/package.nix index d0f6ce2ae37d..d82e0d1617ba 100644 --- a/pkgs/by-name/gp/gpgmepp/package.nix +++ b/pkgs/by-name/gp/gpgmepp/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpgmepp"; - version = "2.0.0"; + version = "2.1.0"; src = fetchurl { url = "mirror://gnupg/gpgmepp/gpgmepp-${finalAttrs.version}.tar.xz"; - hash = "sha256-1HlgScBnCKJvMJb3SO8JU0fho8HlcFYXAf6VLD9WU4I="; + hash = "sha256-V/gERo8CBFBLFyxrE5ywUSS0JjvnrVFJMsfExQYqFuI="; }; postPatch = '' diff --git a/pkgs/by-name/gp/gphoto2fs/package.nix b/pkgs/by-name/gp/gphoto2fs/package.nix index c6ed189ad97c..f554d06f9ac9 100644 --- a/pkgs/by-name/gp/gphoto2fs/package.nix +++ b/pkgs/by-name/gp/gphoto2fs/package.nix @@ -1,39 +1,61 @@ { lib, stdenv, - fetchurl, - libtool, + fetchFromGitHub, + autoreconfHook, pkg-config, + gettext, + libtool, libgphoto2, - fuse, + fuse3, glib, }: stdenv.mkDerivation (finalAttrs: { pname = "gphoto2fs"; - version = "0.5.0"; - src = fetchurl { - url = "mirror://sourceforge/gphoto/gphotofs/${finalAttrs.version}/gphotofs-0.5.tar.bz2"; - hash = "sha256-Z27E3mmoHBk//DG9x7WHrCosw3gLFPDnycTApRezQ8w="; + version = "1.0"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "gphoto"; + repo = "gphotofs"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3DdL4FQzLEzvREhoZYfZlzZvyow/EATN/Q0HtOmdWKA="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + gettext + libtool + glib + ]; + buildInputs = [ libgphoto2 - fuse + fuse3 glib - libtool ]; + # gphotofs_init() still declares the FUSE 2 callback signature, which GCC 14 rejects + env = lib.optionalAttrs stdenv.cc.isGNU { + NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; + }; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/gphotofs --help > /dev/null + ''; + meta = { description = "Fuse FS to mount a digital camera"; mainProgram = "gphotofs"; homepage = "http://www.gphoto.org/"; + changelog = "https://github.com/gphoto/gphotofs/releases/tag/${finalAttrs.src.tag}"; maintainers = [ lib.maintainers.raskin ]; platforms = lib.platforms.linux; - license = with lib.licenses; [ - lgpl2 - gpl2 - ]; + license = lib.licenses.gpl2Only; }; }) diff --git a/pkgs/by-name/gp/gpt4all/package.nix b/pkgs/by-name/gp/gpt4all/package.nix index 98d01f664f68..a10dc4997729 100644 --- a/pkgs/by-name/gp/gpt4all/package.nix +++ b/pkgs/by-name/gp/gpt4all/package.nix @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl + cccl cuda_cudart libcublas ] diff --git a/pkgs/by-name/gp/gptcommit/package.nix b/pkgs/by-name/gp/gptcommit/package.nix index 9a923674f43b..dfcf46a392f1 100644 --- a/pkgs/by-name/gp/gptcommit/package.nix +++ b/pkgs/by-name/gp/gptcommit/package.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Git prepare-commit-msg hook for authoring commit messages with GPT-3"; mainProgram = "gptcommit"; homepage = "https://github.com/zurawiki/gptcommit"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ happysalada ]; platforms = with lib.platforms; all; }; diff --git a/pkgs/by-name/gp/gptscript/package.nix b/pkgs/by-name/gp/gptscript/package.nix index 50f7936a9211..4a992d5fbdee 100644 --- a/pkgs/by-name/gp/gptscript/package.nix +++ b/pkgs/by-name/gp/gptscript/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/gptscript-ai/gptscript"; changelog = "https://github.com/gptscript-ai/gptscript/releases/tag/v${finalAttrs.version}"; description = "Build AI assistants that interact with your systems"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ jamiemagee ]; mainProgram = "gptscript"; }; diff --git a/pkgs/by-name/gp/gpu-burn/package.nix b/pkgs/by-name/gp/gpu-burn/package.nix index a14f33d306f0..5bd0b81d1878 100644 --- a/pkgs/by-name/gp/gpu-burn/package.nix +++ b/pkgs/by-name/gp/gpu-burn/package.nix @@ -12,7 +12,7 @@ let inherit (config) cudaSupport; inherit (cudaPackages) backendStdenv - cuda_cccl + cccl cuda_cudart cuda_nvcc libcublas @@ -49,7 +49,7 @@ backendStdenv.mkDerivation { ]; buildInputs = [ - cuda_cccl # + cccl # cuda_cudart # driver_types.h cuda_nvcc # crt/host_defines.h libcublas # cublas_v2.h diff --git a/pkgs/by-name/gp/gpu-screen-recorder/package.nix b/pkgs/by-name/gp/gpu-screen-recorder/package.nix index f7c6d3b06211..dbe4c11d69b6 100644 --- a/pkgs/by-name/gp/gpu-screen-recorder/package.nix +++ b/pkgs/by-name/gp/gpu-screen-recorder/package.nix @@ -14,7 +14,6 @@ wayland, wayland-scanner, vulkan-headers, - vulkan-loader, pipewire, libdrm, libva, @@ -29,12 +28,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpu-screen-recorder"; - version = "5.13.8"; + version = "5.13.9"; src = fetchgit { url = "https://repo.dec05eba.com/gpu-screen-recorder"; tag = finalAttrs.version; - hash = "sha256-0uYj9NA6KqORr7ag8OOMphWWyHU27ptuOs5q0lGLGLc="; + hash = "sha256-rGjS21eY2XfcdRwmKE2hJO1+FIXAmmBJ4y2oKgSwoRM="; }; nativeBuildInputs = [ @@ -53,7 +52,6 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-scanner vulkan-headers - vulkan-loader libdrm libva libxdamage @@ -84,6 +82,8 @@ stdenv.mkDerivation (finalAttrs: { }" \ --prefix PATH : "${wrapperDir}" \ --suffix PATH : "$out/bin" + substituteInPlace $out/lib/systemd/user/gpu-screen-recorder.service \ + --replace-fail "ExecStart=gpu-screen-recorder" "ExecStart=$out/bin/gpu-screen-recorder" ''; passthru.updateScript = gitUpdater { }; diff --git a/pkgs/by-name/gp/gpu-viewer/package.nix b/pkgs/by-name/gp/gpu-viewer/package.nix index d81a56f116d2..f0b4663a0796 100644 --- a/pkgs/by-name/gp/gpu-viewer/package.nix +++ b/pkgs/by-name/gp/gpu-viewer/package.nix @@ -29,7 +29,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gpu-viewer"; - version = "3.34"; + version = "3.35"; pyproject = false; __structuredAttrs = true; @@ -37,7 +37,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "arunsivaramanneo"; repo = "gpu-viewer"; tag = "v${finalAttrs.version}"; - hash = "sha256-ovgP5RaFAT01zccQiyy1vERBj9OW77v0hMZ0SjoS74M="; + hash = "sha256-W8BPtHbOwLZ95bY6ZmAaKS87fh+gOWZIhxjWKqiavag="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gp/gpxsee/package.nix b/pkgs/by-name/gp/gpxsee/package.nix index cf93f011dfb4..b26d4010ac18 100644 --- a/pkgs/by-name/gp/gpxsee/package.nix +++ b/pkgs/by-name/gp/gpxsee/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gpxsee"; - version = "16.8"; + version = "16.9"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; tag = finalAttrs.version; - hash = "sha256-8G1PN4sN/OawEetbud+va8tTSzY2sb27e3sLNWOwSfk="; + hash = "sha256-pb5HsmGIiC2A5IjGYm+M636J7vM8LP9LFGINkSaSSj4="; }; buildInputs = [ diff --git a/pkgs/by-name/gq/gqlgen/package.nix b/pkgs/by-name/gq/gqlgen/package.nix index a6da605de43c..103f9ea04412 100644 --- a/pkgs/by-name/gq/gqlgen/package.nix +++ b/pkgs/by-name/gq/gqlgen/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.17.90"; + version = "0.17.94"; in buildGoModule { pname = "gqlgen"; @@ -16,10 +16,10 @@ buildGoModule { owner = "99designs"; repo = "gqlgen"; tag = "v${version}"; - hash = "sha256-kDr/CCLLuXApfMaiH9T8DoQxxDfSB+gZ8ntwIeG69n4="; + hash = "sha256-dtApWhbuajgFlaDzNz2rvAQqz8x7YNnyeXyw/OqM5Qc="; }; - vendorHash = "sha256-4lc3dR+d3CY6SV3nd9fqt/j4satS0xY08ebSDOjeBuQ="; + vendorHash = "sha256-n49MlAs6gWMxy6u/cH2UR3xd0iwttT3bTcOu2M0UFhc="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gq/gqlgenc/package.nix b/pkgs/by-name/gq/gqlgenc/package.nix index e7fbbffdf53c..06211a2496c6 100644 --- a/pkgs/by-name/gq/gqlgenc/package.nix +++ b/pkgs/by-name/gq/gqlgenc/package.nix @@ -11,7 +11,7 @@ buildGoModule (finalAttrs: { version = "0.32.1"; src = fetchFromGitHub { - owner = "yamashou"; + owner = "gqlgo"; repo = "gqlgenc"; rev = "v${finalAttrs.version}"; sha256 = "sha256-AGbE+R3502Igl4/HaN8yvFVJBsKQ6iVff8IEvddJLEo="; @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { patches = [ (fetchpatch2 { name = "fix-version.patch"; - url = "https://github.com/Yamashou/gqlgenc/commit/aad0599a70780696a9530a7adffebfff53538695.patch?full_index=1"; + url = "https://github.com/gqlgo/gqlgenc/commit/aad0599a70780696a9530a7adffebfff53538695.patch?full_index=1"; hash = "sha256-moidhkkO/5It8kH1VlwbV+YLlMOTXKH3RyLKGCA2chw="; }) ]; @@ -45,7 +45,7 @@ buildGoModule (finalAttrs: { meta = { description = "Go tool for building GraphQL client with gqlgen"; mainProgram = "gqlgenc"; - homepage = "https://github.com/Yamashou/gqlgenc"; + homepage = "https://github.com/gqlgo/gqlgenc"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ wattmto ]; }; diff --git a/pkgs/by-name/gr/gradia/package.nix b/pkgs/by-name/gr/gradia/package.nix index 1aa6761b181d..b4766d61f9e7 100644 --- a/pkgs/by-name/gr/gradia/package.nix +++ b/pkgs/by-name/gr/gradia/package.nix @@ -27,6 +27,8 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "1.13.0"; pyproject = false; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "AlexanderVanhee"; repo = "Gradia"; @@ -79,7 +81,9 @@ python3Packages.buildPythonApplication (finalAttrs: { dontWrapGApps = true; - makeWrapperArgs = [ "\${gappsWrapperArgs[@]}" ]; + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/gr/gradle-completion/package.nix b/pkgs/by-name/gr/gradle-completion/package.nix index 0e50c2c13bf6..0eff9d93ede6 100644 --- a/pkgs/by-name/gr/gradle-completion/package.nix +++ b/pkgs/by-name/gr/gradle-completion/package.nix @@ -8,13 +8,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gradle-completion"; - version = "9.4.1"; + version = "9.6.1"; src = fetchFromGitHub { owner = "gradle"; repo = "gradle-completion"; tag = "v${finalAttrs.version}"; - hash = "sha256-bqbi0Mg+MahS4ICmfC6kuEWVJ6t6GUdHB6Y5ATtbJ8c="; + hash = "sha256-bazehfRFvrcKOd5ZCUeKl/Ru/NtlVVS8LoZio+kI7+8="; }; nativeBuildInputs = [ @@ -46,6 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Gradle tab completion for bash and zsh"; homepage = "https://github.com/gradle/gradle-completion"; + changelog = "https://github.com/gradle/gradle-completion/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; teams = [ lib.teams.java ]; }; diff --git a/pkgs/by-name/gr/grafana-alloy/package.nix b/pkgs/by-name/gr/grafana-alloy/package.nix index 7a802ca30581..95e24d8005b3 100644 --- a/pkgs/by-name/gr/grafana-alloy/package.nix +++ b/pkgs/by-name/gr/grafana-alloy/package.nix @@ -15,23 +15,23 @@ }: let - beylaVersion = "v3.9.5"; + beylaVersion = "v3.9.8"; in buildGoModule (finalAttrs: { pname = "grafana-alloy"; - version = "1.16.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "grafana"; repo = "alloy"; tag = "v${finalAttrs.version}"; - hash = "sha256-q5R2noxBZ3OPyZqmB+bx3iJKWFxC2WIprcgh9RwjLzk="; + hash = "sha256-4HjOerOe+v8GkKgID/oBm5Rt7nQiHjucAQkSYGY5zZs="; }; npmDeps = fetchNpmDeps { src = "${finalAttrs.src}/internal/web/ui"; - hash = "sha256-vResNUT4auDsK9ngnJYfMUUOYr/ikPhrvakqCjGq2Q8="; + hash = "sha256-eGyKXsZzyDovsMY2U1uAOn22nyRTYGJT+kEh61857Ls="; }; frontend = buildNpmPackage { @@ -65,7 +65,7 @@ buildGoModule (finalAttrs: { modRoot = "collector"; proxyVendor = true; - vendorHash = "sha256-uTIdurwLfxh27fb1CPCHbHmENk3S6VYNBaGT/5yh3Sc="; + vendorHash = "sha256-C6qVdSfTwmjseCjXKn5f9Q9mn3EBg31CQlLk5QY4YRY="; subPackages = [ "." ]; diff --git a/pkgs/by-name/gr/grafana-image-renderer/package.nix b/pkgs/by-name/gr/grafana-image-renderer/package.nix index c48f30f86fa1..3cd9dc222c69 100644 --- a/pkgs/by-name/gr/grafana-image-renderer/package.nix +++ b/pkgs/by-name/gr/grafana-image-renderer/package.nix @@ -6,19 +6,19 @@ buildGoModule (finalAttrs: { pname = "grafana-image-renderer"; - version = "5.7.3"; + version = "5.9.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; tag = "v${finalAttrs.version}"; - hash = "sha256-CrJkBx2BMGlFtqXR174A5CVTH2GIZHTVxxwJjCi68pg="; + hash = "sha256-ODH5u7Q+CIJKZQEKz2QswgHm+ZVzmiRmw9GVR47iooI="; }; - vendorHash = "sha256-3nd0m0PltTiJX5e1tbQ7LSgUmDRXC8nRktOVAIgHOCU="; + vendorHash = "sha256-QiseTdsFOBg3aDYpdmLHfXL9eFll6iJo4wSKwXvdGnM="; postPatch = '' - substituteInPlace go.mod --replace-fail 'go 1.26.1' 'go 1.25.7' + substituteInPlace go.mod --replace-fail 'go 1.26.4' 'go 1.26.3' ''; subPackages = [ "." ]; diff --git a/pkgs/by-name/gr/grafana-loki/package.nix b/pkgs/by-name/gr/grafana-loki/package.nix index c712c39e49eb..f8cb2576672d 100644 --- a/pkgs/by-name/gr/grafana-loki/package.nix +++ b/pkgs/by-name/gr/grafana-loki/package.nix @@ -9,14 +9,14 @@ }: buildGoModule (finalAttrs: { - version = "3.7.2"; + version = "3.7.3"; pname = "grafana-loki"; src = fetchFromGitHub { owner = "grafana"; repo = "loki"; rev = "v${finalAttrs.version}"; - hash = "sha256-2VM5/SMgjxHraP+7H+AmDor9g4r+xglhqd/cVL7mCgQ="; + hash = "sha256-2dqwnM2+9+P/ZIiz5Z9JPN9WicHLRzq9xn6jG1OBqLs="; }; vendorHash = null; diff --git a/pkgs/by-name/gr/grafana/missing-hashes.json b/pkgs/by-name/gr/grafana/missing-hashes.json index 9107957eb5a9..c09679ae9185 100644 --- a/pkgs/by-name/gr/grafana/missing-hashes.json +++ b/pkgs/by-name/gr/grafana/missing-hashes.json @@ -1,56 +1,56 @@ { "@esbuild/aix-ppc64@npm:0.25.8": "451dc5fd41cf67ccc24b8d1da6f95b1082552b6908f0cb0c78fba3da39a4b6c3669ce37dc3c2c383cc18266ea35c0fcec6696fb24f8a0aaf097b94def035c129", - "@esbuild/aix-ppc64@npm:0.27.2": "9c18cc2e4a03339a55013aac05b4a3fc4b77e75715dc252d034aa3d43b754abc053a7601b95e31249f4b6e69b68db2f5e6cb04b0ed619f825f2f70daff1a78d7", + "@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3", "@esbuild/android-arm64@npm:0.25.8": "ef542eda68837bd16cdae4ed99c312405673da95ec3fba1d2f0f102cbd983fdd7357acd1504b5a5ef517b952c9978a0c4baa65211626db6cf862e2bf9ebebe49", - "@esbuild/android-arm64@npm:0.27.2": "a318fc9ffcdad7fda8bb521af8b17f73d93d9a94b4cca9301fbf72cf3f5a6e945edd589a47388de70f3e9582655dcf5b5bb928a11e306368fae4a9106d5143d2", + "@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6", "@esbuild/android-arm@npm:0.25.8": "a0a5995ed8ff2c9775e8395d3da0b7d7b9246040db680aedeb8df9ca980891fe322a6b833cf0bc554852de351aa1351b37aff0213113d4d4afd28c638edc74f1", - "@esbuild/android-arm@npm:0.27.2": "01114275e096b9177ad2496730087ee081d6e65a75bc087457b527c5baac5a8ccb362435f45232532bf6f97de95e1790dbce127d55abd5e4152c7214682bf4d3", + "@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848", "@esbuild/android-x64@npm:0.25.8": "afb24505bf544e53c71707456a85dc21bcc26106c1863aad85733eb5d5bd2e334cb58a2fe31973b4311cc08802493c8d920f41c91f88884baf4c6700a04182ec", - "@esbuild/android-x64@npm:0.27.2": "e92c5b6919081a14c8882f1167cf90b4e4bba745ad6e9a23428f85a1cd5e79dfa3f1d2fc943686b237e4cd09fac52ad3b3791deab6a0419ee10859284d3834aa", + "@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3", "@esbuild/darwin-arm64@npm:0.25.8": "c5bcf68dce1ba9fa111c2da068c50ade5fd74f724bab93058542619a67554b598ef0c47593f4d5cc382f0ac53507e2bc0ac3111824df9d5776c7cd8fe2c28001", - "@esbuild/darwin-arm64@npm:0.27.2": "5e99db5037167bad4a095fc445b94a2ce02357870ed58b79e13ae6bc09b5cb33d7e03f925492df940f9e0ad685a889f02beec1431d8fbf4c7ced55b2f48f5659", + "@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d", "@esbuild/darwin-x64@npm:0.25.8": "db948746f087aace173b52d08b7085514755cbc5bab7f1e64ff7e075489fb8596c7490038bea9e54337586ba02ca3c9f56365029660e711a380bb30f1dccb41a", - "@esbuild/darwin-x64@npm:0.27.2": "87f2fbc4cf11724ef805b17cbdc7b0a9498332bc4b61d55e110ecc3b09bc488b88c0bd140ea48924e9c97a2063cf7e440fef13dd56e415c46799619d61086910", + "@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524", "@esbuild/freebsd-arm64@npm:0.25.8": "faa5a23e4f2e8d1fae84ea0ae424b3b89e8c425e15427e749d0ca9f5a8ca77c6b237886914ce61495ce1f01cb5430b0e55ea61d21a2dc4930be09dffec56059f", - "@esbuild/freebsd-arm64@npm:0.27.2": "1ffa23243b913e377a5b09fd97ad9f089be3695aafdd893b60bb7f9be479256d8b7546f0bc96c4e61133fe7aeeaf95a8e941e82a65d99008ff82c99bdec85eee", + "@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3", "@esbuild/freebsd-x64@npm:0.25.8": "e5a93cef5e2c6b191f178aa73137d2c44cee60a7a6be8806d630ec82ff1dfc72ccd30297c6b607d2ad715ef20b88068e93abb0fa8e187c8fe2547920eef9b4e7", - "@esbuild/freebsd-x64@npm:0.27.2": "44f744b289cf9e115b0adfac1905818d756dfced14213bf144d9016d96f67575ef2a55526f76e29ee775fcfec7274ba3a5e6833f35ed79a4592d3f5eac278267", + "@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021", "@esbuild/linux-arm64@npm:0.25.8": "deb61aafe7a2cb32d9f43b5030fb070856f45210d2ac8ac9ce527fec4016bb4a58ffea93536834cd386786cd6ec40327e057853b0348b45d7a06e6eeec71a63c", - "@esbuild/linux-arm64@npm:0.27.2": "2b037d74eaff4e9b5a6076760ede873320707636a3495939687cdd0c2c7150883111273bc0a8663fa305c42f439f4748b5ad7f15a1a1ea9fa7db575d9faf2d1b", + "@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f", "@esbuild/linux-arm@npm:0.25.8": "3382c6f8e7b3bb479c5b4a01b0baa78054efdf002241eea1d606c8727b9d2168f0ee1798b5627de6b92285b85904e358c9531a1c0f07ef585845fd7d88696db4", - "@esbuild/linux-arm@npm:0.27.2": "28cfc3a9ca11fc899649e7a706fb4b2ee57999bd92e86c23726b3ed0f832732411dd0aa3e2bcdb4105759f83bc4e5adc98dc195aaafce736c910db4e43694702", + "@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689", "@esbuild/linux-ia32@npm:0.25.8": "e32f2fa63c74d6723c876cec9b42c04e6aa5e6d0cd9a7447d0b4b00d7615a484da55ef95b4fcf871492019a007c40defb497ef6075ad94da46b6121828fcf83a", - "@esbuild/linux-ia32@npm:0.27.2": "ac6cc92b9be2ec6d9d483c53fc973e6381765b784a2e1b71fa93ea0cf976344c2e3e0bfda0140b0829b3ec4304d9b886692b2891e68c17d2121066d06e67f0ac", + "@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b", "@esbuild/linux-loong64@npm:0.25.8": "a55894549cd7e64c2062863eaf697175a1d6f86def565555614ad335b462afbfebf403ec0f1d83bf8dff145d57c4046815b26c70e98f068a9f99317fc37d71e8", - "@esbuild/linux-loong64@npm:0.27.2": "625f5b6c2218a3acb2cff8f7f02a53ca89d13925f8932260ddad01595c6907beda4a79e4b767b1101f5971049f88d3ec6ab29cf565b4d61d9b0d7277e2cb578d", + "@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a", "@esbuild/linux-mips64el@npm:0.25.8": "5c1ef406e07fbb766417be11b859baa3e905587c8bf3465f0f6ffd6cfd54b658ceffc616bfbea0340473deaebd430db6aea33468876796bcad83f05bf1910d9d", - "@esbuild/linux-mips64el@npm:0.27.2": "0c62692cb3a297b37212dfde52a861861843a716f6b3bdb73da49ba249a4c001b989ea61dc4540c430fac59ce2f8fc45035cdfac80172c5ddaf1b9df8471aecf", + "@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1", "@esbuild/linux-ppc64@npm:0.25.8": "a5f386bd5b18eb3eb7f240b112595182f450382ca93a7d6cad4c57b82e13830aff22250ff02728dd5b8d65f3b9908ef291f223a6e83d78d64f497d3117a567a1", - "@esbuild/linux-ppc64@npm:0.27.2": "b804d2dd0a6a85fe1c731828c725731a55ab120d2cc16941d560b2e9af5c2ec51586914ce26a84a326a9d46fa61eb8bb1f843953fe29ddd43b3f3099c491b5ff", + "@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d", "@esbuild/linux-riscv64@npm:0.25.8": "6b624062871ac3bb93af3b560a97fb489eef06cb12f4716c0c7d54fb31d4047fec570bbc9cc2bc9f98e8a4fbd07db6fa542115c02ec3bb66922e8b1988304cc1", - "@esbuild/linux-riscv64@npm:0.27.2": "03e67e7207a83801363e3637f9a35fb6224ed4dc23bbf6eca41904fc42f5a6806e1e591666bf48dbf62eba97d41ff4355413b14dcb2339007b22c693374c49f6", + "@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb", "@esbuild/linux-s390x@npm:0.25.8": "c13f82778a07b14fa50d52322f4b347bea6540a207e0468b060588922fae2278ae1b18a88bbd1cf3656b5d7eb8a84dcf8a237c91e7e0629fa6e56be41db46055", - "@esbuild/linux-s390x@npm:0.27.2": "eb24b9c0a4a1492e4ff34a87933f6a3b348739c12f864b408144efdf949871c1fbb02a1cca741bfa11fd08aebe585d046fd3311b462ce4c795e3064ba3912469", + "@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0", "@esbuild/linux-x64@npm:0.25.8": "e6483e5c367e7c35899c98bc378e8a37f5617a741297d9b91c59c1d29b9b00f26f9c315a736b41af33f21d9d74a8c648715ce13ac520b3fa7604978a05dedd99", - "@esbuild/linux-x64@npm:0.27.2": "ed1542f203329521fb1f308696c76ba59ed4a4616a24e21bf4820685362bba209d5c44c2f4e66c88dc7b7399df9ace625454d4829ee529d076ccaf61566e11cf", + "@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3", "@esbuild/netbsd-arm64@npm:0.25.8": "02afba2e5fbf8e8cc4c375edfce673b38015213744f1df05a74ab9de99f5860e50dc26af97b4f0b4f804c461ab45cfa773603ce0e1b0528bd93e7a979eca7682", - "@esbuild/netbsd-arm64@npm:0.27.2": "576dd082047077b9cc41fbeffd728821a4f3b80969c1d2d6c274301122c6de2050f484fd4e946777527b8a15bd2a5ac54f85ca7ab95ea72b5345177e6a888687", + "@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3", "@esbuild/netbsd-x64@npm:0.25.8": "76c43cc94f9b287a6a0d277d51f17e650d168e26008741e86035f2e054b8216d61855feddc2c0b48f989b46c58913168148a30b30fff5b87a1bc08fd78cbd0e7", - "@esbuild/netbsd-x64@npm:0.27.2": "f8994af3e2ff3c9a91e874e58698b66e6f8d4e72dbc0aaf749b74a79420954146ed053359b0a4c213918582cee187d8a371737a33cfb93e624b4d091e5a6c240", + "@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6", "@esbuild/openbsd-arm64@npm:0.25.8": "9c0fbf35b6cefcc46c1c545520c50c65e89d620c65c97a55d47f1440e908cbbe6535073cb78ae69c1e2ba76621f09f3ab0f4bf9d5567660b8726c198a0ebdb0f", - "@esbuild/openbsd-arm64@npm:0.27.2": "f710da24beeb747ef3a11b9d99085a14f5c929f942fd9d9a05b7806d5ff1b85631bfa506eb7a6aed9fd01ec99bf91f24736f9f0e0eb6b7c0019fe0dddd2e615c", + "@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41", "@esbuild/openbsd-x64@npm:0.25.8": "cd45098a84bcc86d4b1a809cf6e5f9548aa69cdff3a0f63a9bb039d05fdfd0daa2e166e1e30b8fbb71ede895dfc9c371e8368e3d51e7bf0484083f9bb112945a", - "@esbuild/openbsd-x64@npm:0.27.2": "62670fbe1f609c5362df7b45968ded512a0860e2ad8a4715a89993abfa2f9f08a28f1294c7857d80e6d3f713639a71d291c06a961b331de67ad350032d1b8e96", + "@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051", "@esbuild/openharmony-arm64@npm:0.25.8": "769c3e589d62648c67cd36306aaee683429e42e7d02608a52929f245c3a42d8036156fe90d59aff7695c2e75712be89ae4d4f06f4249f15a06bdc091ff42908d", - "@esbuild/openharmony-arm64@npm:0.27.2": "e279efdc18301add96ea791ba9ef117cae05346688cd521fd225a60ad166add4bc995af985058e3b6ab9e65a7c49a79108a294d6aa26a1d1685ad0db194e2c56", + "@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec", "@esbuild/sunos-x64@npm:0.25.8": "8b3c79794775dce54d8d2c2c87cf876e8708ba2d7ca0ccda41d96c9bf3193237909f148195a20b7fa876c8e07def6db22510948a795156beeace160e9830ab62", - "@esbuild/sunos-x64@npm:0.27.2": "7234302321d36576b5a9f027915417cddc195a67b19cdfb50e69c337ee0dd63a88be6b72d7ef299cd569d1af62e54774303d52d3d6b5e5858db975241ae467d6", + "@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745", "@esbuild/win32-arm64@npm:0.25.8": "80f13cf66b45a32892f9b433689897362b69042173bc1e47ff333d8dd9df746be27bee031197653ee4e034a1563f61ae34efc44c61160a104dfda6500f6b4936", - "@esbuild/win32-arm64@npm:0.27.2": "36620fddf79da3e8e527ef8331436929fa7a0b23c9b591af8f8573d80ed9c4ef45b24c6fa0abbb01d187dec497efa6c9d9d397d575afc1f28477e9ca16a48d73", + "@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951", "@esbuild/win32-ia32@npm:0.25.8": "e4f0595306b2acbf19b62305c7acf97aa18954acf04f194c3cfd7a5782fab145ec6a551eaf657c3f0d2774cf19bc1fcb7ba76fb10cac32a4c2f48825c955690e", - "@esbuild/win32-ia32@npm:0.27.2": "96e8c1fa0ec2b5529ead2ba703e5da7644c138b2f9b6e285c05513f0455e99b2b0dcf399f01779fb384e22810e82f892491e44402772c62d3fe094b025bbdc0f", + "@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029", "@esbuild/win32-x64@npm:0.25.8": "4bf57733c5c4c1409cfceaf19bf5b8ce3c9b9a29705bc8a24fc72652846afd0bd478b14a17db326ae27896574ee346ffb96b2fa043f0716d1a7f30b89f8b3855", - "@esbuild/win32-x64@npm:0.27.2": "1ed08bebd916c16003f3784276ae683ab41d34951a0c272f6e072b8067a2b4bacd6f6f75a8dcea375b8545e15891d305425cf7c8dd31f7deab56ef22cde4a1e2", + "@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0", "@nx/nx-darwin-arm64@npm:22.5.4": "003e36b1b5c7e97cb253133a6a978d59edd2d75d4d57202169647ed8efaa052ea6b8025d79aefd6eec119b18423a3d6fef96c70e73a33a9a53134a64d25a3a4d", "@nx/nx-darwin-x64@npm:22.5.4": "e23cd9122715c8089393ead47a0ecd0948437c10fa4cb335fae237cbd984a7e464089bd2adb27837684eddfe0e5b0c469a069a8054d379b552b3e22d2799cb9e", "@nx/nx-freebsd-x64@npm:22.5.4": "1158a781e28cf886e131248ac1a70581578e51788eac92fd972938d21712085aed97116887bb687c7493548f8baba833f7baaefe9a96ec58515b9c5f2511ac14", @@ -61,6 +61,46 @@ "@nx/nx-linux-x64-musl@npm:22.5.4": "f2be6705e8203c0db17e5fc900f609de160052617075344429d5fa6da3a0f13a90ac654e90124df6100d7b2cde62acb84d9981d791eb8c494098896c19762274", "@nx/nx-win32-arm64-msvc@npm:22.5.4": "dbef169673a327f5764992da802e4adb4252d35ae8d708bef87b6f321cfb989165d2be80d35021278cbcd4243159cdd149be09519d8f694e9775bc6cbf46297d", "@nx/nx-win32-x64-msvc@npm:22.5.4": "8071d2641f0959957503e353fb6fa4357910fcc3eef403fab8400d8363dbbf959d8f0c225475516e903fc32cdd5389fee7c36e784d164620cb67632ccc944797", + "@oxc-parser/binding-android-arm-eabi@npm:0.130.0": "dee6fe4776c32499ea409eb9de646a61d14e3ceac9d0cce1a0cbf2d5da68ee39f406cadee362b1424a4baab14ddd3f4cbde999ec3e8dadd0f69c78ba74277514", + "@oxc-parser/binding-android-arm64@npm:0.130.0": "4c406c48f914da9419bcee033cc4738be2ec2b3683044b8d464a0cd58676c8b928a9a8bb40e57a6404f92a098b7a2b2870bf3fbf92471e5f1f68fe18e71f6858", + "@oxc-parser/binding-darwin-arm64@npm:0.130.0": "b4584d7f9ed971c0a8a25ed5d3d3d7c356427b220c519212551e4c6ed85df8d75bae92294866858f053d527ab5755cc4871346abaacb5e888db232f920c986e5", + "@oxc-parser/binding-darwin-x64@npm:0.130.0": "564e32d8225de688270ca263c20ed5fbcdac1afd38a00027e548b6bf3a5427e7860d6321fa3364d58fe6477e8a996cee0060ffce85791e310c55ac3fd74d4090", + "@oxc-parser/binding-freebsd-x64@npm:0.130.0": "8e84a9a00f3cc030073e8435d2822c56c735bf5d681d8221ff70a36e288cefc593200fdf0e0a49795f1977456bcc9bf0fbc50f06063f825fe38f373e9a864a35", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.130.0": "f4bc5b1095be58d1fa4bdc7a884aa28f95511fb1b491dd78a5874f1cbec12c5710f79ccc13531881e081b4f8ccfadd73551f268ad1187d2f6f63a8085a05954e", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.130.0": "19b0463a3f4890aa80d726b8c92c8ac3da85a43fe80fc8173e4fdf7b24775d7dfdf9d131743e35a16d6c32bec99f6a5a1b3a6c6a8a497d57cd9d067314016d29", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.130.0": "816ac7e05245e63f621162aa416bee946c25f44b518b8f02d4f1724d50c80db3feaf4e902fd8d0ab650071a335aaade613b2b6c7215e4fb23759aaaf074fe4e5", + "@oxc-parser/binding-linux-arm64-musl@npm:0.130.0": "3249219bef1e45e9a846856e00740a5f10a0217766774e3a5870cf63bd4693cf672709143e7979fa79911a5a37ec51710648993d0c863a5c4037d02f09597298", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.130.0": "3e4727f96ab39a3e8635fd4598f6fccd6fcd7379f516868717d77c1b572dfadeab7fe94bf16004123af461f4c5ea99ec8a2ae44183ba861aef0d0654d4e42f73", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.130.0": "fca1a09abccaca5b1037ad76f5ff87a44983818e62898b0839373a2b98a102b0de5821d9b87ea052f877127d019c34ac5f82121313a8ca3362d3d45cdd8f29ab", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.130.0": "7bc889130bed795bee462fcd1fa63944980224fe7b8fef517c7f5622bdd1cb657e168c0244a9d8df4be71f5f7101d5ae47a7c486bc7b582705bdc66f0ad76248", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.130.0": "7e98ea39ccf9d08a0000d82dd7a626b92ccf23dfa4f6a80ac30204435108050a389bfac14f1c36ee80d25d325c83e3384fbda3b9a88abea4f6a500971182e333", + "@oxc-parser/binding-linux-x64-gnu@npm:0.130.0": "bf365787c7dcf19f89070d241a01fef024a1242569070db3e005d329eca8317084630257501888db21bbb9309e74118e5713d319e3505cd6034ff6e4bc78321b", + "@oxc-parser/binding-linux-x64-musl@npm:0.130.0": "ca469b64eaeaa1a1f942ae4c5c00190276e933980a2fe2c1e491bdf50032323a2e22a906d6666f3c77aa0bc9cbb1d8d629fc6408ca0e53730d9d4146733bf62a", + "@oxc-parser/binding-openharmony-arm64@npm:0.130.0": "5a12f4e9d0cdbc00abbaa3cdb24e12b70d1204ee51da2aeba14ac8303cd64e2819e42e60841dd5bb5d5293bc1eca89e9366e7466b67392a1a8db3cc7aeba9674", + "@oxc-parser/binding-wasm32-wasi@npm:0.130.0": "2f6ba8f0f608273474188c7d984ac94495dac316aa5f3b9e230b398e3a1815e6588588c1b542b421f482004d814ff59e6d2e01c19be0d141010e354c48b60b35", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.130.0": "d450bb6ecc0d0edf70d2cd8153fd39051c182addeda6a70bc4b755760f4079f0c749f520666a101e0046ee566f0ca32c0dadbc3def2db55303d04bd41a98d5ca", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.130.0": "700738730e994801d9d378914498047f2a2999a73b46389a685260970e863cb839c8f2bbcb504c716b5d0fc56c75e93861196ce7befa6fcb8bede466261a25a3", + "@oxc-parser/binding-win32-x64-msvc@npm:0.130.0": "16a2c2f9a1c5d6bd254839388489e37d860cb67d28b6bb605561aacb460a0f77c2a39e4b96f869c9223f554d8a42e9f386b032f0a86fbbcc6db1b5b6be4b9337", + "@oxc-resolver/binding-android-arm-eabi@npm:11.19.1": "c727f6fba8c3f003494dccbcd1885a694871bb5e90c569751528cdc22ed860ca9b3a1aa63780f6b3d135839fbcb05dc00b96593ef63391334e4f39593eec817a", + "@oxc-resolver/binding-android-arm64@npm:11.19.1": "db14204c0a051ee3ae4c1f28faa3ec3e6de0083c0b92e75d17041a42be4035b799e650dda8aed9f3c278374f95f4423761cc49cb94b225a3dbf1ae22bfdc7689", + "@oxc-resolver/binding-darwin-arm64@npm:11.19.1": "9f6c21d248904d315df581f5d3d3a62bf302ca6e50c6b35d425ed64f886d6ca84ce29e156f0fda0cbc00f39d20c067fd6e66226c3a18d24d1c7ad6456f30ebee", + "@oxc-resolver/binding-darwin-x64@npm:11.19.1": "9bc9dcffcea10b8b49f515b81146104359afe4895ad94b164f436632029767f20ebbcc1481cad91d08d6e6b845f1f45229efe0dc1a64a9839c6d62d4efd82ad6", + "@oxc-resolver/binding-freebsd-x64@npm:11.19.1": "19e14b2de592215f53a29bd992b0bcd8b73e23f0b75e095e43a7fe02f8630c1e0556c4dcad9771565876b8cbc0005bdab07c375b000221899a9f89d64d078255", + "@oxc-resolver/binding-linux-arm-gnueabihf@npm:11.19.1": "5830e77af5d8bdc7cd24def91ae2a0cacd86cdf1ccc9a113ea2ed15392135e8e5eba7f50b0a68a4c3c3b80ea052d1896b8954d16343804458bdefc085ae3d56f", + "@oxc-resolver/binding-linux-arm-musleabihf@npm:11.19.1": "84141385161c4e1fc27069f4d4a108b86fa501888e355415adcef4991a8e7d50ba97bdaa48d09caa66637079edc4f8f40218e6419d72c25b014aef4de9d9156a", + "@oxc-resolver/binding-linux-arm64-gnu@npm:11.19.1": "17a77a2df6095bc0dbc119652ac978154ccedf1f4147767a90e24862f98d1a070c5035c8a6b598d4ffedd3abfbb56e617485db49db212a71d0b0a5682ef752ff", + "@oxc-resolver/binding-linux-arm64-musl@npm:11.19.1": "eca0e0c1266040eba78c2cca4fc67878c672cc51350f7f258e6f3b2fd0721fb458fd37e60d4abc2dc5aa467264fb58bfeb7eb056bad0963b511547cb1811d915", + "@oxc-resolver/binding-linux-ppc64-gnu@npm:11.19.1": "944c9c6f306fdb48b5f5a7e940619dd00d9c70e07d96c784ce43167d68558f5067c2345fad40e63aecabaa8eaebea3fc5a08bc2253f8a93a62f729b054abbd55", + "@oxc-resolver/binding-linux-riscv64-gnu@npm:11.19.1": "b161c4ba912c816007a7c9aee2a202924eec39700affeee365b88ea4174c15dd5713d0cfd1baaa6e5bfe6cb43d99de841ba3653cac18c610ec9bf39bb0fef05d", + "@oxc-resolver/binding-linux-riscv64-musl@npm:11.19.1": "6edaee8d1d468764d5034ad430a13097d81f5b80b67d0b71b738ed986a268f1d8504f233e6709ad504105014dcf91cdbccfa3458ffb5992d0a1a79a852e1b855", + "@oxc-resolver/binding-linux-s390x-gnu@npm:11.19.1": "3132d420ecae98cdaab5cd88e808197809ed471b5a60544d1be6576fcb6f286fd881ffb70fca61301411eaa10ce5bf3aab9dc41ad53b697fb93cf9d36f6ac5b7", + "@oxc-resolver/binding-linux-x64-gnu@npm:11.19.1": "b7d007688ca198b83fe7eb06e532dfbda1a9afe30f2ae2f6204d9c6a247c66a2c4b3c3cc099d4f5ddfd506dbab1bf7fbf688143ac5b268a80fddebfa95e222a1", + "@oxc-resolver/binding-linux-x64-musl@npm:11.19.1": "0b47e764d1fc1270726338041e25d870269755b56e620125b6a5d4e6c82842d1e8e9b80bf6e481f12d6f7f7d1a20f8c6af5a2b6f3a0d29ce1803bc5008e557da", + "@oxc-resolver/binding-openharmony-arm64@npm:11.19.1": "1f84a346f64ae2a37a3b956f3624895a97bb89567680d5c184b0afd1d6f2d1ef97af88a04c10baa4dd839065bc450823e551a76321660c510ece6befb8ca46e8", + "@oxc-resolver/binding-wasm32-wasi@npm:11.19.1": "a8fa76d0c95f28c772c823923ef247ad8ac1b7f38e9f66b7b74d05c54be61c50bcdc905578655be0a58c94ecacc7677db8cb70607a8c1771cb85e61b2842e9de", + "@oxc-resolver/binding-win32-arm64-msvc@npm:11.19.1": "00268100351260e55df6f0c28271e3809093a164bdb368fba3575cd2aaf31a88e4e1ff179e3a399d808edda249b267ec12f8671af287591c57c359560250c3c6", + "@oxc-resolver/binding-win32-ia32-msvc@npm:11.19.1": "3a83d915e805ed0d65164a1cb41d3366624b088e072f4923c50ad7dc15e9b3f48da9faf2775fc226662c785475bd7a9e1a0ac49265984142191f13185ab7c9e3", + "@oxc-resolver/binding-win32-x64-msvc@npm:11.19.1": "8cde7acdaa684a2fbb979db42621132cc2fbb6505ce8cf37582b85091bc4846a006a42e12b58e7e6cc0019f524bd4811109c488d7c8865d8df2f796a7995d3c7", "@parcel/watcher-android-arm64@npm:2.4.1": "279ac643abaccb2f9c986f35e39478e242b33bdda3128ca9e728ca1429b923d5f1bdc22268946138b0ced130ac3b2294cf2a44ff080b27c06a79062a5bbba13c", "@parcel/watcher-darwin-arm64@npm:2.4.1": "312fd03aaf7e75824fb84b6b99649caa4db01d55320320d88fb75ad5151bd24876555ae19fe8fdf81f92952bcf01e0a82db7c3bf540e54cee5beb20b85a6a80c", "@parcel/watcher-darwin-x64@npm:2.4.1": "47d8fd40e17e419459294b75c455ac7ce2a53dfcc578f2c2ab0fb0f59ad1ee6a6e87b6ecb92708139f48ed8568ffdd675fe5e57ed1468abac6a2a650fe490926", @@ -73,59 +113,87 @@ "@parcel/watcher-win32-arm64@npm:2.4.1": "a1395a97d1373dd7075da7234af8996302e45cb9d2507633a0f8188c239e8121e63842dded6fc13613986e0833c88435a8750b3c6b35d86b9e1af2b97430b940", "@parcel/watcher-win32-ia32@npm:2.4.1": "05a294e24923a02febe852154d8f8dd75fdeb53db8522c3bc87860523f1dc70d41a7507318b3ac93a24feda44526720dba2f1a7e0e20de7ca815c7dd175e3c11", "@parcel/watcher-win32-x64@npm:2.4.1": "28dc8dc547c4ef8b24193356bab99c4e5aafb2c8097e2d06b875c2ce4d767a9034ff82fbfac34a86fd331f8daea91a3aeee5c179ed69120c02e035f72dd44877", - "@rollup/rollup-android-arm-eabi@npm:4.59.0": "b2c5a1b261311a80e412c747b1f8644d43a472d6d45486d19becd78a1a75ec87422199783ac23c1178a7e94c2924be730e822062fe040f4dbc0093e6695ca84a", - "@rollup/rollup-android-arm64@npm:4.59.0": "5eb6a5e2c73348d2362e1df2b6e7b7eeb3c86ac12e7a1dcbfa435e5cd0d35771d6da7c319f60934884b1a8168001d2882e99c14ffb68916e419503fa4da13c8b", - "@rollup/rollup-darwin-arm64@npm:4.59.0": "64b5aa35d5140be4f0df2726485a3d375fccde2279f6aea82d8d256a7325cb6094eb01108a5aefd95b295bff25010447adf1d849b496fdab911afc5807866eb1", - "@rollup/rollup-darwin-x64@npm:4.59.0": "b14fe9c114130c89baaf807c2a69fd4962d0a6eb5464ab6a846b2ea023a63e4e3eb092c1cd293c13c5867c61ff09f01877294755a72c202ceaf0e497316ba954", - "@rollup/rollup-freebsd-arm64@npm:4.59.0": "1ce79859de5a6e48c162268cf8a33deedc9a318cb6229489f705bb9fe3903b39c91cdc2529b65d09b57c8862650c0eac350df80f1b798c86f7abd652f3d44179", - "@rollup/rollup-freebsd-x64@npm:4.59.0": "751dd34d4aea1521f4671aa0aa1377c0f2cdf82b04c1e14c24778774298b0db6ae58a7d574a0802ccefe8ad0631c4f1b4f6a8f88729520dd20a2be313045523b", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.59.0": "6cc3a24c867feec15fe90d23920a480e95ff7ed216e57e258574dd4180086f416711724438cab144f132b4537a9d1728bd6866989a88d43c2de87a9036ef8550", - "@rollup/rollup-linux-arm-musleabihf@npm:4.59.0": "59022fc0788e950c15c9461a0b9b2b6e48fdf20678f97fc7c63e39c97c3200674f6ca4570eff40582e14be191361da8400c217e380a94a728d2190cab7443056", - "@rollup/rollup-linux-arm64-gnu@npm:4.59.0": "78e80b5c7d01a30f4d7adaea126dc376021291d8328224eed9f29a0ff4f82ec2168afdff03d7fc5c4e4c1cb57c4056e8bb1007c5d3d5b2ef07f148130890ff2f", - "@rollup/rollup-linux-arm64-musl@npm:4.59.0": "35c6bda8aac1cc017b5a0841f9d392d9ba96379ac871593e9b7864a34356b1074982d0a0f7ee9d19af28f252ceeb61c026541b57e09c147c7475ab7bf1c5f6e5", - "@rollup/rollup-linux-loong64-gnu@npm:4.59.0": "fbb0cac0c248e465c32450cd3d369eb24cf1a75bded681a58cf99d1652b60ac5269ea6d619da429e5589360563cf6c6d879f940e3f436d8c283c957b49dace03", - "@rollup/rollup-linux-loong64-musl@npm:4.59.0": "39c1ef5d7e36bd84386cf8e50a7b26fabae26a7f819e481489ec8cba6528e6ae00d93e7d7aa54dda83a3166842e5e501edc1f743d31be4c971d2bb5e16f8ef90", - "@rollup/rollup-linux-ppc64-gnu@npm:4.59.0": "885029215e74dfd8a0afa747f53c597962c4186bfa16b86b986d85a3de460b177e1ba38f9823d5602f972dc33720a1a7b84a0bb441cc77aa2cb2b988eb90f3fb", - "@rollup/rollup-linux-ppc64-musl@npm:4.59.0": "6785e3d207e63b8f840da35b738b00090d20f85186ebf2654bd891556f970398847d3abf9b1ae5cf19aa098de8776454cd0b42b78e75d1142532051d6f9e9a58", - "@rollup/rollup-linux-riscv64-gnu@npm:4.59.0": "9ccfd99174d06ba523cad217068d527a6667a770e0332abc1f55a64b02fd09e586e542ec8731702888a771477257c00b6334911d72205093f1d10fc1baaec9b1", - "@rollup/rollup-linux-riscv64-musl@npm:4.59.0": "3a1ebc6fc9683a10e8c5d4e0080897bc247a7ba52aa39b0f586e80b92cefaa5bcb570c0dcf1475b7ea87a44dc551524d7ab9f5717e6ebdf85a55d7d4447dbfd3", - "@rollup/rollup-linux-s390x-gnu@npm:4.59.0": "df4cf92ef58379fd530ae14363bb8547352bf9c65ef68f6f01b6f4a1bcc558d0c4e2363361c35cb1627a2d87f30c579126dda1c91a36efe81e1002d26304f2a9", - "@rollup/rollup-linux-x64-gnu@npm:4.59.0": "fd48952a450a7c3f117445694878ab99941858f6c40920aef34678dea7880213af504ef490cdb269e038efbf5a497d4aab3cbf0a785ffcb0ee9bdc3b73e9c0a2", - "@rollup/rollup-linux-x64-musl@npm:4.59.0": "58811bbe6e78b4b0cce1b2c9f84768fe16bef8784152f01aa3e6479a92ebbe377cdd70c2d676cb5df93d62139a94eb0b5082f68347d57f2f364cc50cebc0a3b8", - "@rollup/rollup-openbsd-x64@npm:4.59.0": "f21f3d73b87f5298fa1d314d2d344319d55d9aea777d9551b5ede0176980a406a6e48b1f08ade1dd96e993460833a282b3abdce179f75af45d12b58ada8a1aed", - "@rollup/rollup-openharmony-arm64@npm:4.59.0": "b2eda04dd7fff48ca968a6a7a166aef4082cbeb2d1c41e45fd9824c80babc483ec86f6ed6e3b70ebeeedabb9f0d99cc611959652e87f6beaa9eea3c5d7691ae8", - "@rollup/rollup-win32-arm64-msvc@npm:4.59.0": "656459997e6f192387a29e3a88e734f981db1af6e78c1ed857e3596b46d361398e47ab390774d2bfee17e94aa760dd16a0448fa868f3f56b5f639eede29345c8", - "@rollup/rollup-win32-ia32-msvc@npm:4.59.0": "f0eabd43696d0a25bad55194bc0363ded364674ad0c1dd117d1e3fafbc4d0f077a2c60e81d756baaaa0859012949316d204c67b14c9f3ab8a80c9ea76983fc95", - "@rollup/rollup-win32-x64-gnu@npm:4.59.0": "c39d866bf3305397b1772c0ecc4d7bc9b9b1f0240d4425f1e938d4aaed206d8418d5b6e1e11608e7c4c4258cd723f101cc40e8beb1758d163adb1b6cd70bcc35", - "@rollup/rollup-win32-x64-msvc@npm:4.59.0": "34e03ac4acaf58e756ab0aec133d28c1cdcebde173e20a471f3f66292601a2a0c9b0bc2a24023ca30162ce039fddcc5c0264789d9f242945de169646b752c7cf", + "@rollup/rollup-android-arm-eabi@npm:4.60.1": "02e0a1742b32eacea5bd3f074145a0563d3ff7a8983d55e48453f71e23d4824869ad4a8c5a45a75e3bddbcb666177644f6ab7cea820d72702648e165bf4024e3", + "@rollup/rollup-android-arm64@npm:4.60.1": "088feba3a68b3fdf9b8f6bc25b93b6373fa705fc2a8650e2a8767cd14dfb0f38725d3b90cd784bb034d041fb704fdfeed94a0cdc711b74ad8fdf0f4ccbd1e208", + "@rollup/rollup-darwin-arm64@npm:4.60.1": "a69de43444a8313b4ed3550f2f6a756cca02baa37c0d4a6cecbe0ac1c50b76d7cd441c8ebc90c88c057f37830597082546261c86967e49fa3ed613767f54aa56", + "@rollup/rollup-darwin-x64@npm:4.60.1": "2d043947daa7fb9fce4fa28eac48a73c1edc11585c8320606e9a15e3db83264f0737d141b7969c2c0f95ffeac3816eefe2dab48e17d127bc4e999d28ba60faf9", + "@rollup/rollup-freebsd-arm64@npm:4.60.1": "c69cce5b2178252795852a95e90cd75dfdc753ebde161be4bee5bae6674db1ff5e5aaa3971a0c0a2e0321c162c1e9cf5f89619aa207d6b5596659149fd31f8c7", + "@rollup/rollup-freebsd-x64@npm:4.60.1": "04a6efd2098a3c3e5eea9714aa064442142bef9f7ab59212c2438907fdb3b8ff2f29f1f226fcb0ad04a969f8435838fbc424df6512932327d8235f08b17a9031", + "@rollup/rollup-linux-arm-gnueabihf@npm:4.60.1": "6f1d9cfaaaa327a33f0555dabc37815c662be5089f21e57f507e79886c1d5fda7e4edb892893b711560105041e5e574ac49ffb5223e9030e1a460266e914ab34", + "@rollup/rollup-linux-arm-musleabihf@npm:4.60.1": "01786a2cf6c249e51331fa1faa381bad0cdc7681be77396fe81dccc5b4cfae0e1b82ad048081053bebec9365f7b1613b63cdbdc8fb8660a2733d2e2d3601c70b", + "@rollup/rollup-linux-arm64-gnu@npm:4.60.1": "c3eaa2a6c142104a43f1f76f3a357d476afffab027b999872b759398f6d9358a002b29faa5913840d75e27d628a6e31dc433c18e6a49098b693d6a43f40daec7", + "@rollup/rollup-linux-arm64-musl@npm:4.60.1": "f080f94433fbd1a4d4d21c15742a5a8859250ef63a6fde6ca9356ee7b8719a32310fc911bb5015717a0c1a01aec139d69af296b3bc284b4d23543d30ac7e18de", + "@rollup/rollup-linux-loong64-gnu@npm:4.60.1": "99feb6b3dd8cae53900a5a423d6d0ea4feb8f4c8c7a5ba8abf1b67b10fa3094486debf1a61cd8a285c776aa3539cc1a35a44923c108d31eda1975089c09e060f", + "@rollup/rollup-linux-loong64-musl@npm:4.60.1": "e57a6dc1ea603400ae975ddc1db77c06575ae6a921c0b082ecc4c9ca3dd79fd5d5a7ab49e643525f1c6792a9786d9d8817aa7d18c4a21ab88def7d2417601f57", + "@rollup/rollup-linux-ppc64-gnu@npm:4.60.1": "4920d6dfa70c168a55db40124842570f929663879b6e690b278419abd38989ae8ce3c44f626bb94d5bc620b8e95e5acaa6f1dda36e9c07957f935a92bd3a63f9", + "@rollup/rollup-linux-ppc64-musl@npm:4.60.1": "56d4b2f07052f31b9110ae5bdfc7949b7054dc3c6ab29d2ffd4b1df749b21a8e1d8374cec1ab40517747703bbc1ed8c55c8ea2830f2258bdbaea85fbe1936bf1", + "@rollup/rollup-linux-riscv64-gnu@npm:4.60.1": "4358b23ff3f0cc293826866d66628145581cc39cec1c4f360ede66d0fce68948ea58ab4e82761e9922e0b1f6f37442bdd79ff8dbb070d888907740e106f720ec", + "@rollup/rollup-linux-riscv64-musl@npm:4.60.1": "696a7f7ef430b837e5fbf2772b5380383950cfa469b43a68fdf626a91739915afb33d51312e9006ae27deaeaecc9728590e7fd5ec0502235fa2a7d461dad5526", + "@rollup/rollup-linux-s390x-gnu@npm:4.60.1": "36fc046b53aa7e174996987a80c4dbacf2543bb67542d04039221554d865ce7bb0881059ea9e153b50943b3da7ac992021124e88ad642caf4d5fb133b2a0044c", + "@rollup/rollup-linux-x64-gnu@npm:4.60.1": "00416ed510f926d62c483912e8dc04888494cbdfd03a2acec85ffe9c451f24095141a505c2ad7ba082cd72f29b6586ac11b2fef0f7ebd95c6d15c64ce9507cd1", + "@rollup/rollup-linux-x64-musl@npm:4.60.1": "a5591cff52082db7a40cc1beb62729b153c1c381cd365f19860cd8aa82920c8086ca213fc4c168c5cbf585e3a35d98fdd7c2b40347d1f8f3d0dfc4094d6a17d2", + "@rollup/rollup-openbsd-x64@npm:4.60.1": "2aca6ce67c865613d317f84ea73d940e099754c1462f2d40219232118330062f0534cc3bec5c154ee8fa93e4f53b5dfd57b0365ef76c03f4e89b8c0808e14af6", + "@rollup/rollup-openharmony-arm64@npm:4.60.1": "cfdca7233d29e2a293cdfff5ebb9d1cefb407c900d84884cc92a38f82d9fa81bbf5353a88930698ae780b92816813e27fc136cce08608851a247659487cbab24", + "@rollup/rollup-win32-arm64-msvc@npm:4.60.1": "d55cc9cd6512e2a64572d9708ce0bc949ef597d5edf81b7b706e48f80d954b72c0d7564187c94a9a0aa0b496a3b443b412b94fb5b8632ed43395a8e49cb50e27", + "@rollup/rollup-win32-ia32-msvc@npm:4.60.1": "5ace4fabec2f13139b4dbd48512f5c1520fd2d52df7123c3fb4534fd01e86fe7957aab70b54c14dd3b4b40c88ba9ec4532751bdbb6337b462f9cf0d92833638a", + "@rollup/rollup-win32-x64-gnu@npm:4.60.1": "f085d1721e4d0dec6f05a5488e61ca4c98f361952aec3badfa03da8156cae19db6d897a646b59dd5c65772b7bf4f3fca698d2615b27f40cf86881dace95bc082", + "@rollup/rollup-win32-x64-msvc@npm:4.60.1": "d0879e0c8278b612f9689e03fbccf01de06beded0319365892ab028811e2edc7b5773f57f2958559571dd2e47d08145b909b10d058a59e7c468a541caaa08634", + "@rspack/resolver-binding-darwin-arm64@npm:0.2.8": "fc62adf359f60ae5a62d78009ca993cd22ade917422447fe19763ab145e899284bbaec0ba58e885e81011b1f71b3c5f20946da8d5800ff9f824552e19fda4ea3", + "@rspack/resolver-binding-darwin-x64@npm:0.2.8": "ed8abe29b2a8950e9e799be5c4a8ec66039890349c97d183fc0a5391d8e1457dc85fc8e229cf5899e5475169e8c630ae2ba81f79f9b8ef05c8c2a982a8d8f865", + "@rspack/resolver-binding-linux-arm64-gnu@npm:0.2.8": "1d577bf4d55f4e3dd3a4310af840d6229d7ca39e17202d8bcfc3267f6934927a5a7a9ba36260b8c0449a1dc94eda33d663d6cb4d43c3d54269f600b6c1f39774", + "@rspack/resolver-binding-linux-arm64-musl@npm:0.2.8": "5c9f1a2fb839bf027830be3d62a7e67f10fd0f63d37d14444e37dd4d32b5057cc5e76ed16e1ef0d96c3b02bed20658919d93d0a922670f7b1f9a79f1cb4efcb1", + "@rspack/resolver-binding-linux-x64-gnu@npm:0.2.8": "86bf0596f3b0245320d68cfd73560520bcd15ac541a7e2260ac98f6d32a9f3277387590564e52e62ae4a8b72f7c05ef34b44eba80b9596e18aaa943595e65229", + "@rspack/resolver-binding-linux-x64-musl@npm:0.2.8": "72cc901398aba0956c28e292b5efee87e5cb04e2ac53d037c9cca9e53575ea274a43503157dbf63046fb1b40766a5e4570d0da5d7e07105520e08f01c7da9a9f", + "@rspack/resolver-binding-wasm32-wasi@npm:0.2.8": "dec2a801c9b7d2e348209c229bd18d8098e6f4532db1e987221ac541da2ea8fc98f09713ed56e386d0c6f7555b720d9768e16d5298a10a3dd7ddbc8147ce7ba5", + "@rspack/resolver-binding-win32-arm64-msvc@npm:0.2.8": "325846d2997d7bfca1feeb77a6f71f2b8354502bfde6c060efe837c41cd5976f1c0c680be03ae88aba223de3a9167b9ae5f67d294ee10bb9e8d655e33ea5b7bc", + "@rspack/resolver-binding-win32-ia32-msvc@npm:0.2.8": "effefdc9c3c8acc39002c454a492330ccecf958945218f229838d088fafa3133691b973186555fba94da64184f54f2a854eb527f153ab8548693adfe8439702c", + "@rspack/resolver-binding-win32-x64-msvc@npm:0.2.8": "c0e74d6b2056f58251a93d35e55c8c69dfed6fc02c69f7a5f91fb1d0cc28ead0e755f4b6d6c322b32704ba648f1b5563747f58288ee78b15656aae06165726bf", "@swc/core-darwin-arm64@npm:1.13.3": "02e4c06e113dbf57a560c04bdfb0d9abc9eefbf6277a19f8f78fb42be710defd41bfd784f427a94dd23b371ce5c604a8cfae92509fef213c9de427ab3e64b25d", - "@swc/core-darwin-arm64@npm:1.15.17": "5699f18e1a03441a625d9304913f5cc4ecc0a348817e5527ed2463261da3b868e21e60a0f76c1d8c032d0aa95da3b745ea92683b57be85a85d0073bc889f8f42", - "@swc/core-darwin-arm64@npm:1.15.18": "1597877545538954d6445a21f4a102766f098aa2b0d55ded3a766993b527bf1bae9bca54e50e3289b8f6a0cdb42b550f65da38564340d954690df15d2e27f56a", + "@swc/core-darwin-arm64@npm:1.15.40": "5229e431490705bd39ec1937dc97c0c783bc2149dbafb554a27882f932dff476a01ff7a75f6b36674e8be83945f46b61f83e45abe7e0b2bfb7dc5dabb47ab3bf", "@swc/core-darwin-x64@npm:1.13.3": "39ed8633b500b8a32fd507c0a57ecbaed1d4840d75a1dcee9d8cafe36b378029299d9f5552404230800c186b7b972dd476401d7c216cb16f2d87c5f95ff8c58e", - "@swc/core-darwin-x64@npm:1.15.17": "e52ead49ec28a4f5799436f222298b923566516a015caa667dac0a6e68c3a1d102a944e2f4b328a8ba731b3b2098453ad4a3359fa47113459ff8172ab3d009ac", - "@swc/core-darwin-x64@npm:1.15.18": "326b8c3309c303a53bf4ed6afbfb0baee0acdb527253e734fe5cefc6916cea598d75fb508265e482143e92fabaf2cacfe9e3a30301ed527c32a727f998a65239", + "@swc/core-darwin-x64@npm:1.15.40": "22642bb1a0aa9632bb118c72727ac8d679cbf1dfb5f1e91d88d5e40764566dff57b81e87b9472ec42350920408aaef88924a45f8d75cd410ce310588f4aa8922", "@swc/core-linux-arm-gnueabihf@npm:1.13.3": "d3889724b5b787db220a65424b5e5e4b2a587f658582905d5a296e8931f30bd42202c356d05d650cfb649984884b05e1513412edaf4ce97c7a055547e3d26fd0", - "@swc/core-linux-arm-gnueabihf@npm:1.15.17": "eeae5f54a2a051fdbe45efb5b21aa08c5646afd9d5032e0388f1d55b1ecad1ba4fee27546ecd08a1076f9ae290451f73633405ea0782241e5c69294613eafdf0", - "@swc/core-linux-arm-gnueabihf@npm:1.15.18": "0d26738b4675ee1ff5b0322295c947f351e6d2494303248971b601e2fcfd666a17357a030f0a745e11b60065329652daa58db44abcfc7620f2da8d92733dd0ee", + "@swc/core-linux-arm-gnueabihf@npm:1.15.40": "7478570116139c720316bf6c565d81f3bbd07f33fbc5bbf1f4f0667f906034b26b89ad9919a27fba5c8906170f424561003be1d0ad1933674c24b8fc75b45cbf", "@swc/core-linux-arm64-gnu@npm:1.13.3": "9ab7ed4e31d4dba8df4b25109248c0225c33573a0046ef7380449fe348a9404dcf4115320e649ba5b5476a38a12dbc52dfe534f7dd7ad92dc5995e9aa9513dba", - "@swc/core-linux-arm64-gnu@npm:1.15.17": "56740456ab0df1238fab445a363a1cf4f29422710c67011efbaaaf17fa3b2260c731489836a80a84e75b8986de459251b60082e5f91ae42c403d704921771365", - "@swc/core-linux-arm64-gnu@npm:1.15.18": "96aa824334204b6ae8a9c337a745a64dedd4913331f313561eb9544b853e142d9a933230d06052eb677cffbed0b1c961389f1d626936a9b5fad6400ad254229e", + "@swc/core-linux-arm64-gnu@npm:1.15.40": "c08de62bc4adb387f57e86dfd1f18da32050cd44d3d28d33a69fde0bd5165081c5f5d953c1799a73628794e827c242d145ebfa99c6d134d0fa0d613be7660053", "@swc/core-linux-arm64-musl@npm:1.13.3": "39ce1201862d2368ed7a89a9f1960bcbf56da875c353da720894bccc75110d71ab2cb7f99a252518f96e678c5dd42ed2e1a588bf343e175f41a532785c03ffaf", - "@swc/core-linux-arm64-musl@npm:1.15.17": "c2c63181909bf180c4d57c60eeba7eab30680ff65944c7f76f4e89fd615acb68b3fc5aaba485ee63aeecefc183777261480eeb1de03668f5be43a28001190021", - "@swc/core-linux-arm64-musl@npm:1.15.18": "3781cb4bfce767fb85506a69bc6fb7745ec53be2a53735750ae88f51c3d6803725a3a906cb954888c529e7f675d3ff0f746bb22c646f1ac2caebdc2be64a852e", + "@swc/core-linux-arm64-musl@npm:1.15.40": "c2b7a9c9a57cbf8cbcdbe275b4c29c5eac30cf7db3b93fab993ad6d2d72b3f0a0004cddb20fb9de1e187feaba08303bedba457409355bfce84af2798f003312a", + "@swc/core-linux-ppc64-gnu@npm:1.15.40": "35127f033352094f67c16f3e4a0cb644574740285ece5e562c99398017478571b699909d0c36c927583ef122c43c7529ee9977bb1d9e774ede5d8723cd7294e7", + "@swc/core-linux-s390x-gnu@npm:1.15.40": "da840e6876c5868ab0effa37ddfa66b7bdada3c7e4ab73a942e9d81dc0fe89c4c665e8677e4705a843b01ac9995e4c06f8733aeb083dd047ba2ecebc1fc05569", "@swc/core-linux-x64-gnu@npm:1.13.3": "9e7edee322efd9b35a62d8507300adacbbcd53630a26e935cee8ede5ecf8710fac1ae60ce490cd2d6297d27196d8202a9281b6193da223689804ef9afab451c0", - "@swc/core-linux-x64-gnu@npm:1.15.17": "69321e9b263f07d11f98e389d8f6b94fdaabaf91adea24ccbe25107a75a7b348dafbffa2746aee1caeea24d0b3d29aa5d8d160419fe36b986a5a6350f1068d30", - "@swc/core-linux-x64-gnu@npm:1.15.18": "26f6fe774e88f8d58a48c18666eda6345cd7064cf065f02eae683f6eaac3e345a5fdbef22a8b3aa7069e332fe95c4b496cbab438bc2b474a9fdc8b37a616be0a", + "@swc/core-linux-x64-gnu@npm:1.15.40": "dfcbc023b2bfd67bd96d23e7c23c5b0dc1cff05139c7c194784c37b4bafad10d9d18acf8d596fdc7c7364e50becfefec2f42a8f6617fe185da32dc82dbe2412b", "@swc/core-linux-x64-musl@npm:1.13.3": "89f256a8a7da0317cf0b504846cf6d077695b7f86f3cb85e727deedcc82f00fbd42c36e5ec6ff9ead3a2ab1fda748b4d3fd59d93420b6abd3629e902f5a34828", - "@swc/core-linux-x64-musl@npm:1.15.17": "d02f7e4b55f2b22bf042093aa9c45356e851845a0ad8b87ff967033b6cbe474c196f03f2387ac9154a10988943674bbb80739a1c7ecc8a79fb174431bc5527ce", - "@swc/core-linux-x64-musl@npm:1.15.18": "96b5bd1bbacebbf806f9a6a02698d68ba2a677ce86b5c2d7a92ea6083b40d55a0a84abebd16b5afd7a574e727b8c19e9039315e8ef40f6c852bbfaee26f999cd", + "@swc/core-linux-x64-musl@npm:1.15.40": "f44a45cb822248bd3e15cf5f2301fde229cfd079c8f91aea6234fd731d86f7c874b7ba1bbc60d776258efa4338a40621240b306e052631f4725e12a4ff2d7532", "@swc/core-win32-arm64-msvc@npm:1.13.3": "18929504fef4c53a191512a9bdb5384fe2ef701f4cf43927aaaadd8fab199cf5c970f8ca48b9533e8190c4a88fc514147beb17768cf5232055b6ba075457ae09", - "@swc/core-win32-arm64-msvc@npm:1.15.17": "32f56af42c1ae67467479f72d9fa12c83d0242abf92dc79b001ce570341297e2e24b66682f28b514c6ac4ce794d426a599328b4bcb35c719cced967a4ccafb46", - "@swc/core-win32-arm64-msvc@npm:1.15.18": "3a170183da529015301e48bd305f9ea1bcbd38259ff25f1f6e778ee4bb68fda44552c696f067005729aa77407295b1388717a31d9429844725d7ee29645bde82", + "@swc/core-win32-arm64-msvc@npm:1.15.40": "99fabc56976a71f5a0500ea79ad9afd1b85b7e890573c613f602e64d841d47c5aa299aec3516e391754837d76cf942b67b8e848486cd3d92c9ef5657b19a79a8", "@swc/core-win32-ia32-msvc@npm:1.13.3": "0b7d5fc610de99bd24e0bd5430569e5b71dc0e2660a6e17aaffc7671ed0474a5a18096ea23acb83aadaa287fef5ff4c245a544c5ba38cb498ac4d843f7ca2256", - "@swc/core-win32-ia32-msvc@npm:1.15.17": "538f8276536cc51d790cd2f2b84e501f14796bba1bb96a09a2e4cb556efe90c8f525d42a8bdb79371b30c9a34ff32836dac34aef18fc70208ffef9a3f689b067", - "@swc/core-win32-ia32-msvc@npm:1.15.18": "a950c9d1d6338939734249ddb766c495e86e05509bb6a42f58d2713d419d4412c06fb0c11c7711c6612ab3e74520a8c1581449340aa3f4fe26f71c53675f37b4", + "@swc/core-win32-ia32-msvc@npm:1.15.40": "3cf3c74b3351dc0fc301b73f80f9b3eecd2bbdd30fa5fd1af3b3003fc24d5aa42da3f3851ad4a36e0bab449085c8f31a26865bd934fd1848b5d970e512f1b539", "@swc/core-win32-x64-msvc@npm:1.13.3": "632eac6a4997f4299e710f8be1a1d6df862a852beaa3b30dc1dce9ba5acd128d6e93af6ce64f8b39e4c37318b254f4f10d27ad5df1cf5bb493de39d7f205d1b7", - "@swc/core-win32-x64-msvc@npm:1.15.17": "e8636df1516b3ab23c6eeb156dc0f97014d3a77af071f035876b3185fe51bb4172de3ac7976a4270baa8bd9b1cd58d488ee4ef176e0804507593c687c3276947", - "@swc/core-win32-x64-msvc@npm:1.15.18": "68eac0d5148e7326b748a0f0adf44bffcfb1d0c78e366448aad9859eda537941391ea95e1863118460a49a58235ce9791ae1b20afc04a034677167e6ea43a5e2" + "@swc/core-win32-x64-msvc@npm:1.15.40": "73ffc36b8ed8ceaf7c96b98f28625c1fc4f2e477aa6a4a8169f7e551844a25bdb9e972f4ee9c6f171e96774a5033d48dcdeec17cfabaac8070b7681c332af680", + "@typescript/native-preview-darwin-arm64@npm:7.0.0-dev.20260421.2": "12273bab953bbacf429e4895db7ac5e40b05f3e1511b7053119eafad99af9241f893e975e29735403f7247a4a1a22f56a5eca0d84ec300dc705c77ebc4292b61", + "@typescript/native-preview-darwin-x64@npm:7.0.0-dev.20260421.2": "711451bef67dbe18e0a7fdfd5915f74935d76c8d22ac1f0bc74df55af66d6a782f7b91f3cdc7ff4773f02c5c84fbd3c79061e3888707735089d45148dc262910", + "@typescript/native-preview-linux-arm64@npm:7.0.0-dev.20260421.2": "b1ffbf30be075be6cf8ed9da314326ca4050a31ed33fde3daa90fddc37518d62695abbbc1b1f212cbf160c22fff760fa2ee9b447a16fe6e14fcf36329df9bad5", + "@typescript/native-preview-linux-arm@npm:7.0.0-dev.20260421.2": "c7e6be5c67f8010519e3240eb821b452beed3dfffe880a5cd8ca19f1873e1c27283af100d9e2c0175b624dd4042337e1898b1c3e3c1122605f1e9d7c56638b24", + "@typescript/native-preview-linux-x64@npm:7.0.0-dev.20260421.2": "73a130ffe78755e48254d12d82399a5c479998142e98273d4edda8f10806ac31a4e52ea4ee61dd52999930545b93471e8620746f8552ea275b2a2f32b1cf4c8e", + "@typescript/native-preview-win32-arm64@npm:7.0.0-dev.20260421.2": "903319a110c6348185aaa508db50d48ce0c981c5a745cbc57c36271caf6f3b37b7a577e549594edd1b185cd45f7bb50c7c98ac1bbea7f800bfef5dbd6d3d42bf", + "@typescript/native-preview-win32-x64@npm:7.0.0-dev.20260421.2": "a46bf36e4df25ac9bf60a39b4a4953d4cc43ec40c55bd1de9bb088ee4622d53955b39c07c8ed16b21c4bf841f22f997e17d9af50a376fd3c0349cf36e3857dfc", + "@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", + "@unrs/resolver-binding-darwin-x64@npm:1.11.1": "423acf3a8032b6bde50fabcdeccd4c1954bbede56f8c2fc5134621fd957f931a08ad74b3690762e3e18e2f5f31f35dc93b826a1c2626031d218dc4b16d415efc", + "@unrs/resolver-binding-freebsd-x64@npm:1.11.1": "d6b88ea9447328f4f5e373e77524daa52d5630ecc7035ca67121082e2017a91dc9e3fd7b8230e41f1307137ee7487b0bc0c8a922dda1b77b01f735202486e36f", + "@unrs/resolver-binding-linux-arm-gnueabihf@npm:1.11.1": "d4a3248f64ab92ea680b3bd5f74c19f15c8f82eb1628e32aeaa058a7fd2efdbba4b5d4e011e453389e42e79cbf00847c79a172ef66d8c9b555feada7a2693772", + "@unrs/resolver-binding-linux-arm-musleabihf@npm:1.11.1": "1426c4a182922d16b684cfaff9a2d1cc6ddb06eba6fbe966d8d5a88fc0ed6660f4742c7d90659dc14f9f152132fcbde4afd483b5d0c8aa22eedd1154b0f3c632", + "@unrs/resolver-binding-linux-arm64-gnu@npm:1.11.1": "baa3911178e6462c8d682d3ec182e95fc33f308d5b50662f07108a9a5572d365c97604932887113053fada46949580fabc9ca704822c714160ba8eee0387b286", + "@unrs/resolver-binding-linux-arm64-musl@npm:1.11.1": "cb7763961f472f201e885753c3daf72231990c65fa5112a76a996f7c5754f2e6688cdc58f1861b05b5f176dae9255e34a860c40b21401318395eb4939759e46a", + "@unrs/resolver-binding-linux-ppc64-gnu@npm:1.11.1": "148d28b05c5d50bc4d429f5da3e675b1285387b54c8e5363d7c288b53f2f38688bf9472ac5f2e4ba7fa3c3d7f19bac19738b1815a8973ba29c6bae76990b66f7", + "@unrs/resolver-binding-linux-riscv64-gnu@npm:1.11.1": "40ba923597ae297b7be85de1769025578e16af29def72060e7603ec3311fefe537c9608520e771291e934af7e64e3a52d74ccb5ee1f7a657ba2f2a2fcfbf3df7", + "@unrs/resolver-binding-linux-riscv64-musl@npm:1.11.1": "193da09875cf4ce3ea9ef24a141f9235da9095808b157b4dc83ce431f97732f2d19f65d4030771187d1a8424f6843e8a50ac6ba2ab4391271f80680c1166b2d7", + "@unrs/resolver-binding-linux-s390x-gnu@npm:1.11.1": "c376fbbfbe0909844c188f23eec33c937fbf4a1f2fe81418726aa9bab91b44d9411ec98560ed73aaf15fa2082483fb0907a335535449623e3e4a604ee18b7ac3", + "@unrs/resolver-binding-linux-x64-gnu@npm:1.11.1": "c3011171259f4f4c5c1751e565fd6f0ec203558484234cc438279a26f6fb2ec0d4bbed72ed9bfbc9967e43351fd8e3aa716269b8e670a7c9421ff64a1a9123eb", + "@unrs/resolver-binding-linux-x64-musl@npm:1.11.1": "27da30650ec1e6378bc47665a944913839ef95e9af1bc7892f6ad3fd7cd10468d5b4da8caa03f83e3c56e03253cae4034ba1ee64d3ceb19a3656f31d362eaabf", + "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "ca69e8caeed033c074d9413112264fe1c0bdaaedb4fa9e6f5bcbf3a64ee98fa8261a6b5e54c3d7b7144cf020217c9a89f308086ec64d11d78480bd5885dc2e1a", + "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "4aabb2e8c80590650bd2b46f205f24e9f345ead68e7b53c20adb219d0c3f030c605d5434f3895fde68ebfa521ea97ea6da974e342e19487086da6a16332860df", + "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "5b364708ea2985d0e59f235a00e05bf3668704a81e9d32e8929980c84fd0bd67102c2041337b08e266a8bc4883ddf618ac7cb5e1f64614d8f9861cc4e3208905", + "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "92ff0d27efe168480a14c8d705c0f68624f01251bdc5f8f41bbd6c7ed8ea23effb8481f01eb93270896822397fe2fd78a427c1756ecabc3cb13a746c918b5949" } diff --git a/pkgs/by-name/gr/grafana/package.nix b/pkgs/by-name/gr/grafana/package.nix index 19e9c093ff56..2fdf5e419e2d 100644 --- a/pkgs/by-name/gr/grafana/package.nix +++ b/pkgs/by-name/gr/grafana/package.nix @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { pname = "grafana"; - version = "13.0.2"; + version = "13.1.0"; subPackages = [ "pkg/cmd/grafana" @@ -33,15 +33,9 @@ buildGoModule (finalAttrs: { owner = "grafana"; repo = "grafana"; rev = "v${finalAttrs.version}"; - hash = "sha256-knalINdJPFrvj6HNxWPV6wu6TSkrRvgkZjOnECOsWwU="; + hash = "sha256-FyrClHQwkwNW9bFbFLyuE4s9Gg0tbg7v/s1I/4XaWmM="; }; - patches = [ - # Remove after upstream updates to Yarn 4.14 - # https://github.com/grafana/grafana/blob/main/package.json#L483 - ./yarn-4.14-support.patch - ]; - # borrowed from: https://github.com/NixOS/nixpkgs/blob/d70d9425f49f9aba3c49e2c389fe6d42bac8c5b0/pkgs/development/tools/analysis/snyk/default.nix#L20-L22 env = { CYPRESS_INSTALL_BINARY = 0; @@ -54,13 +48,13 @@ buildGoModule (finalAttrs: { missingHashes = ./missing-hashes.json; # Since this is not a dependency attribute the buildPackages has to be specified. offlineCache = buildPackages.yarn-berry_4-fetcher.fetchYarnBerryDeps { - inherit (finalAttrs) src missingHashes patches; - hash = "sha256-NXDXmed2TsMQS99breDt0Ky6X2ZyuWkJ5KyKz5Apkt8="; + inherit (finalAttrs) src missingHashes; + hash = "sha256-TAJYJ9oMVl9cT4Vs1SZVbhKuuWp/WxM99Wt7QzLq1WQ="; }; disallowedRequisites = [ finalAttrs.offlineCache ]; - vendorHash = "sha256-rFGwtplr+n0qgIulycNQ5L/lh4ZFoHCrYeIfbb+e/h4="; + vendorHash = "sha256-2OsgW52vQbeQu88eyoWsD8784gzI7/5SbLY62jYxukQ="; # Grafana seems to just set it to the latest version available # nowadays. @@ -173,7 +167,6 @@ buildGoModule (finalAttrs: { ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" "riscv64-linux" diff --git a/pkgs/by-name/gr/grafana/yarn-4.14-support.patch b/pkgs/by-name/gr/grafana/yarn-4.14-support.patch deleted file mode 100644 index 6d3be05a1c1e..000000000000 --- a/pkgs/by-name/gr/grafana/yarn-4.14-support.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/.yarnrc.yml b/.yarnrc.yml ---- a/.yarnrc.yml -+++ b/.yarnrc.yml -@@ -25,6 +25,7 @@ plugins: - path: .yarn/plugins/@yarnpkg/plugin-licenses.cjs - spec: "https://raw.githubusercontent.com/mhassan1/yarn-plugin-licenses/v0.15.0/bundles/@yarnpkg/plugin-licenses.js" - --yarnPath: .yarn/releases/yarn-4.11.0.cjs -+approvedGitRepositories: -+ - "**" - - enableScripts: false -diff --git a/yarn.lock b/yarn.lock ---- a/yarn.lock -+++ b/yarn.lock -@@ -2,6 +2,6 @@ - # Manual changes might be lost - proceed with caution! - - __metadata: -- version: 8 -+ version: 9 - cacheKey: 10 - diff --git a/pkgs/by-name/gr/grafx2/package.nix b/pkgs/by-name/gr/grafx2/package.nix index 9574fd771c43..a7505811a3f9 100644 --- a/pkgs/by-name/gr/grafx2/package.nix +++ b/pkgs/by-name/gr/grafx2/package.nix @@ -75,7 +75,7 @@ stdenv.mkDerivation (finalAttrs: { The program is mostly developed on Haiku, Linux and Windows, but is also portable on many other platforms. ''; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "grafx2-sdl"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/gram/package.nix b/pkgs/by-name/gr/gram/package.nix index 6d6f84306f33..2f860f540a62 100644 --- a/pkgs/by-name/gr/gram/package.nix +++ b/pkgs/by-name/gr/gram/package.nix @@ -6,7 +6,6 @@ pkg-config, protobuf, fontconfig, - libgit2, openssl, sqlite, zlib, @@ -31,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "gram"; - version = "2.1.2"; + version = "3.0.1"; outputs = [ "out" @@ -44,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "GramEditor"; repo = "gram"; tag = finalAttrs.version; - hash = "sha256-7FzAvC/JMMIFcuTGkL2Ju644UAIsneOMhiDUFnQske4="; + hash = "sha256-B3RmY1h0+D0aawNzevdt9f+gzozckjInhoz+t9taf8o="; }; postPatch = '' @@ -54,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail '$CARGO_ABOUT_VERSION' '${cargo-about.version}' ''; - cargoHash = "sha256-feESY8ALSG3xa906HBc4pOKGerQ1jF7VUxzvUcsZbrY="; + cargoHash = "sha256-pK0rUuPtWejXitbDQqh9fvdEv3aza0ZEg1XWnCmY4eE="; __structuredAttrs = true; @@ -66,12 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ cargo-bundle + rustPlatform.bindgenHook ]; dontUseCmakeConfigure = true; buildInputs = [ - libgit2 openssl sqlite zlib @@ -81,6 +80,9 @@ rustPlatform.buildRustPackage (finalAttrs: { fontconfig libxcb libxkbcommon + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + git ]; cargoBuildFlags = [ @@ -89,16 +91,13 @@ rustPlatform.buildRustPackage (finalAttrs: { ] ++ lib.optionals buildRemoteServer [ "--package=remote_server" ]; - # Required on darwin because we don't have access to the proprietary Metal shader compiler. - buildFeatures = lib.optionals stdenv.hostPlatform.isDarwin [ "gpui/runtime_shaders" ]; - env = { ALLOW_MISSING_LICENSES = true; OPENSSL_NO_VENDOR = true; - LIBGIT2_NO_VENDOR = true; LIBSQLITE3_SYS_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true; RELEASE_VERSION = finalAttrs.version; + GRAM_UPDATE_EXPLANATION = "Updates are handled by nixpkgs"; }; preBuild = '' diff --git a/pkgs/by-name/gr/graph-cli/package.nix b/pkgs/by-name/gr/graph-cli/package.nix index 720ec87b7a87..d9d046488eb7 100644 --- a/pkgs/by-name/gr/graph-cli/package.nix +++ b/pkgs/by-name/gr/graph-cli/package.nix @@ -41,7 +41,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "CLI to create graphs from CSV files"; homepage = "https://github.com/mcastorina/graph-cli/"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ leungbk ]; mainProgram = "graph"; }; diff --git a/pkgs/by-name/gr/graphhopper/version.toml b/pkgs/by-name/gr/graphhopper/version.toml index 64b95b5ab207..ad1a26b8902e 100644 --- a/pkgs/by-name/gr/graphhopper/version.toml +++ b/pkgs/by-name/gr/graphhopper/version.toml @@ -5,4 +5,4 @@ mapsBundle = "0.0.0-f171bcf55e447bf494348dd274cd377b73c951f6" [hash] src = "sha256-tK8zEX2szcU77ydHW+ak/GTjKKC6C5xlG0Uum7a/76I=" mapsBundle = "sha256-ehwWBIuYBwXu7W7uHYYuGl0lS4s6Tm5c4BfKPkY+w0A=" -mvnDeps = "sha256-0B38C37QbkOhxd5e4SHfMg9SqcUZkuIf1g1S9SnCu7U=" +mvnDeps = "sha256-bP019enDiHdKVtXvFXvBmsg9CtDTXA1t3VVjX3Xf8M0=" diff --git a/pkgs/by-name/gr/graphicsmagick/package.nix b/pkgs/by-name/gr/graphicsmagick/package.nix index ef76fb84d481..4c9ab79b4938 100644 --- a/pkgs/by-name/gr/graphicsmagick/package.nix +++ b/pkgs/by-name/gr/graphicsmagick/package.nix @@ -111,7 +111,7 @@ stdenv.mkDerivation (finalAttrs: { including important formats like DPX, GIF, JPEG, JPEG-2000, JXL, PNG, PDF, PNM, TIFF, and WebP. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ambossmann ]; mainProgram = "gm"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/gr/graphify/package.nix b/pkgs/by-name/gr/graphify/package.nix new file mode 100644 index 000000000000..f10fdd43b441 --- /dev/null +++ b/pkgs/by-name/gr/graphify/package.nix @@ -0,0 +1,93 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + python3, +}: + +python3Packages.buildPythonApplication rec { + __structuredAttrs = true; + pname = "graphify"; + version = "0.4.23"; + pyproject = true; + + src = fetchFromGitHub { + owner = "safishamsi"; + repo = "graphify"; + tag = "v${version}"; + hash = "sha256-QEzB1tFBqGhpmI7oudMRC1Ia0CDcm+GYt6AgxMA5zDo="; + }; + + build-system = [ + python3.pkgs.setuptools + ]; + + dependencies = + with python3.pkgs; + [ + networkx + tree-sitter + ] + ++ (with python3.pkgs.tree-sitter-grammars; [ + tree-sitter-c + tree-sitter-c-sharp + tree-sitter-cpp + tree-sitter-elixir + tree-sitter-go + tree-sitter-java + tree-sitter-javascript + tree-sitter-julia + tree-sitter-kotlin + tree-sitter-lua + tree-sitter-objc + tree-sitter-php + tree-sitter-powershell + tree-sitter-python + tree-sitter-ruby + tree-sitter-rust + tree-sitter-scala + tree-sitter-swift + tree-sitter-typescript + tree-sitter-verilog + tree-sitter-zig + ]); + + optional-dependencies = with python3.pkgs; { + leiden = [ + graspologic + ]; + mcp = [ + mcp + ]; + neo4j = [ + neo4j + ]; + office = [ + openpyxl + python-docx + ]; + pdf = [ + html2text + pypdf + ]; + svg = [ + matplotlib + ]; + video = [ + faster-whisper + yt-dlp + ]; + watch = [ + watchdog + ]; + }; + + meta = { + description = "AI coding assistant skill. Turn any folder of code, docs, papers, images, or videos into a queryable knowledge graph."; + homepage = "https://github.com/safishamsi/graphify"; + changelog = "https://github.com/safishamsi/graphify/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ stunkymonkey ]; + mainProgram = "graphify"; + }; +} diff --git a/pkgs/by-name/gr/graphite-cli/package-lock.json b/pkgs/by-name/gr/graphite-cli/package-lock.json deleted file mode 100644 index 35da6f75584d..000000000000 --- a/pkgs/by-name/gr/graphite-cli/package-lock.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "name": "@withgraphite/graphite-cli", - "version": "1.7.20", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "@withgraphite/graphite-cli", - "version": "1.7.20", - "hasInstallScript": true, - "license": "None", - "dependencies": { - "semver": "^7.5.4" - }, - "bin": { - "graphite": "graphite.js", - "gt": "graphite.js" - }, - "engines": { - "node": ">=16" - } - }, - "node_modules/semver": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", - "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", - "license": "ISC", - "bin": { - "semver": "bin/semver.js" - }, - "engines": { - "node": ">=10" - } - } - } -} diff --git a/pkgs/by-name/gr/graphite-cli/package.nix b/pkgs/by-name/gr/graphite-cli/package.nix index d8e487c11a11..242a2b4c91c8 100644 --- a/pkgs/by-name/gr/graphite-cli/package.nix +++ b/pkgs/by-name/gr/graphite-cli/package.nix @@ -1,42 +1,25 @@ { lib, stdenv, - buildNpmPackage, fetchurl, + buildFHSEnv, git, installShellFiles, + testers, + graphite-cli, }: -buildNpmPackage rec { - pname = "graphite-cli"; - version = "1.7.20"; - - src = fetchurl { - url = "https://registry.npmjs.org/@withgraphite/graphite-cli/-/graphite-cli-${version}.tgz"; - hash = "sha256-Xzq6+fsWRPoiPxtk1zNARCkIPBu64ipAKqPVU2dnV9E="; +let + selectSystem = + attrs: + attrs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); + suffix = selectSystem { + x86_64-linux = "linux-x64"; + aarch64-linux = "linux-arm64"; + aarch64-darwin = "darwin-arm64"; }; - npmDepsHash = "sha256-6JzVDgrV5kUKES7/z+0aU+Rs6VabdKhcfru38j3Jmcw="; - - postPatch = '' - ln -s ${./package-lock.json} package-lock.json - ''; - - nativeBuildInputs = [ - git - installShellFiles - ]; - - dontNpmBuild = true; - - postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - installShellCompletion --cmd gt \ - --bash <($out/bin/gt completion) \ - --fish <(GT_PAGER= $out/bin/gt fish) \ - --zsh <(ZSH_NAME=zsh $out/bin/gt completion) - ''; - - passthru.updateScript = ./update.sh; + version = "1.8.6"; meta = { changelog = "https://graphite.dev/docs/cli-changelog"; @@ -46,5 +29,101 @@ buildNpmPackage rec { license = lib.licenses.unfree; # no license specified mainProgram = "gt"; maintainers = with lib.maintainers; [ joshheinrichs-shopify ]; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; -} + + passthru = { + updateScript = ./update.sh; + tests.version = testers.testVersion { + package = graphite-cli; + command = "gt --version"; + }; + }; + + shellCompletions = '' + installShellCompletion --cmd gt \ + --bash <($out/bin/gt completion) \ + --zsh <(ZSH_NAME=zsh $out/bin/gt completion) \ + --fish <($out/bin/gt fish) + ''; + + unwrapped = stdenv.mkDerivation { + pname = "graphite-cli-unwrapped"; + inherit version meta passthru; + strictDeps = true; + + src = fetchurl { + url = "https://registry.npmjs.org/@withgraphite/graphite-cli-${suffix}/-/graphite-cli-${suffix}-${version}.tgz"; + hash = selectSystem { + x86_64-linux = "sha256-YnG3iw35ZEyGbB9vGdcnj0qkvUfyLuaIEB5l09hkRck="; + aarch64-linux = "sha256-Z4yY26hXf8++TX5tJcqufsAULTn9oUL90d9tDZj5d/k="; + aarch64-darwin = "sha256-6eogi8fMOD5IgRyEdPRxdDa17WytB1JwTpKRzyyhQ2Q="; + }; + }; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ + git + installShellFiles + ]; + + dontConfigure = true; + dontBuild = true; + # Skip fixup on all platforms: strip discards the vercel/pkg virtual + # filesystem appended to the binary (see the comment below), leaving a + # binary that fails at runtime with "Pkg: Error reading from file." + dontFixup = true; + + installPhase = '' + runHook preInstall + install -Dm755 bin/gt $out/bin/gt + runHook postInstall + ''; + + # gt tries to create ~/.config/graphite/aliases on startup and exits 1 + # with no output when HOME is not writable, which would leave the + # completion files empty. + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + export HOME=$(mktemp -d) + ${shellCompletions} + ''; + }; +in +# The binary is built with vercel/pkg, which appends a virtual filesystem to +# the executable at fixed byte offsets. patchelf and strip shift those offsets, +# corrupting the embedded data, so the binary must remain completely unmodified. +# On Linux we use buildFHSEnv to provide /lib64/ld-linux-*.so.* and shared +# libraries without touching the binary. On Darwin this isn't needed. +if stdenv.hostPlatform.isLinux then + (buildFHSEnv { + pname = "graphite-cli"; + inherit version passthru; + + targetPkgs = pkgs: [ + unwrapped + pkgs.stdenv.cc.cc.lib + git + ]; + + runScript = "gt"; + + extraInstallCommands = '' + ln -s $out/bin/graphite-cli $out/bin/gt + source ${installShellFiles}/nix-support/setup-hook + ${shellCompletions} + ''; + + meta = meta // { + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + }; + }).overrideAttrs + { strictDeps = true; } +else + unwrapped diff --git a/pkgs/by-name/gr/graphite-cli/update.sh b/pkgs/by-name/gr/graphite-cli/update.sh index 2f89e6fcd18b..e60ea11060b1 100755 --- a/pkgs/by-name/gr/graphite-cli/update.sh +++ b/pkgs/by-name/gr/graphite-cli/update.sh @@ -1,12 +1,10 @@ #! /usr/bin/env nix-shell -#! nix-shell -i bash -p gnused nix nodejs prefetch-npm-deps wget +#! nix-shell -i bash -p gnused nix nodejs set -euo pipefail pushd "$(dirname "${BASH_SOURCE[0]}")" version=$(npm view @withgraphite/graphite-cli version) -tarball="graphite-cli-$version.tgz" -url="https://registry.npmjs.org/@withgraphite/graphite-cli/-/$tarball" if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then echo "Already up to date!" @@ -15,16 +13,22 @@ fi sed -i 's#version = "[^"]*"#version = "'"$version"'"#' package.nix -sha256=$(nix-prefetch-url "$url") -src_hash=$(nix-hash --to-sri --type sha256 "$sha256") -sed -i 's#hash = "[^"]*"#hash = "'"$src_hash"'"#' package.nix +tmpdir=$(mktemp -d) +trap 'rm -rf "$tmpdir"' EXIT -rm -f package-lock.json package.json *.tgz -wget "$url" -tar xf "$tarball" --strip-components=1 package/package.json -npm i --package-lock-only --ignore-scripts -npm_hash=$(prefetch-npm-deps package-lock.json) -sed -i 's#npmDepsHash = "[^"]*"#npmDepsHash = "'"$npm_hash"'"#' package.nix -rm -f package.json *.tgz +for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do + ( + url="https://registry.npmjs.org/@withgraphite/graphite-cli-${platform}/-/graphite-cli-${platform}-${version}.tgz" + sha256=$(nix-prefetch-url "$url") + nix-hash --to-sri --type sha256 "$sha256" > "$tmpdir/$platform" + ) & +done +wait + +for platform in linux-x64 linux-arm64 darwin-x64 darwin-arm64; do + hash=$(cat "$tmpdir/$platform") + # Each platform hash appears only once in the file + sed -i "/${platform}/s#\"sha256-[^\"]*\"#\"${hash}\"#" package.nix +done popd diff --git a/pkgs/by-name/gr/graphite/package.nix b/pkgs/by-name/gr/graphite/package.nix index bdd515c272bc..889a7c71856d 100644 --- a/pkgs/by-name/gr/graphite/package.nix +++ b/pkgs/by-name/gr/graphite/package.nix @@ -12,7 +12,6 @@ lld, pkg-config, binaryen, - wasm-pack, cargo-about, nodejs, wasm-bindgen-cli_0_2_121, @@ -30,13 +29,13 @@ }: let - version = "0-unstable-2026-06-06"; - rev = "2c29d2c40614a0ea51b8be113daba2f7f54c4209"; + version = "0-unstable-2026-07-18"; + rev = "117da97dd5d6b1e02d7322682669508a4edfde3d"; - srcHash = "sha256-0arLP1xUAZRUezNkTvxuVLn470Zl7EKlGecdBb5xw0Q="; - shaderHash = "sha256-4lKBrGh1rfhTBczmCDvIF2KxLyEHzHdKVGgQ+jLd/Dw="; - cargoHash = "sha256-LAb279Acwl57aY5ijJ70c9rRMrBLGpGJ7Q5gVnEcRT0="; - npmHash = "sha256-AX5Jqk2E+WyQJyHbgvvq74MRsYmWUju4bOkabhYoeig="; + srcHash = "sha256-FSyu4aBl4gkn+jCMj9qjzNHl29F+Kxk95++H7pQou2Q="; + shaderHash = "sha256-V34/qlVsRcDH8FLpTMlaNeNxQhJI415Fv+xnhhLsi1Q="; + cargoHash = "sha256-lDf6GWGcqQ1JiETJSJ8A7dbgrZ4OEuifH/wIZZ+c/fY="; + npmHash = "sha256-Rb0bLPk54QigNp7TkDkJJy/TEJXAhlXOCruckwvdXks="; brandingRev = "0d004aa61e6b48d316e8e5db6d59ccc4788f192d"; brandingHash = "sha256-wAA6fR+NSxlCAqgwWmpiIAnji9k/jsMXpR0Vt04Ntmk="; @@ -97,7 +96,6 @@ stdenv.mkDerivation (finalAttrs: { npmHooks.npmConfigHook binaryen wasm-bindgen-cli_0_2_121 - wasm-pack nodejs cargo-about removeReferencesTo diff --git a/pkgs/by-name/gr/graphlan/package.nix b/pkgs/by-name/gr/graphlan/package.nix new file mode 100644 index 000000000000..3d4dcd726ef2 --- /dev/null +++ b/pkgs/by-name/gr/graphlan/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + nix-update-script, +}: + +python3Packages.buildPythonApplication { + pname = "graphlan"; + version = "1.1.3-unstable-2024-08-07"; + pyproject = true; + + src = fetchFromGitHub { + owner = "biobakery"; + repo = "graphlan"; + rev = "dc97f4feb0bb0bf3fa210e2699a86c5e476a647e"; + hash = "sha256-sBVlBu6RSs7dXQbxJrIQHWaDNliurY9UguzNeKj40gY="; + }; + + patchPhase = '' + sed -i 's|biopython==|biopython>=|' setup.py + ''; + + __structuredAttrs = true; + strictDeps = true; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ + biopython + matplotlib + scipy + ]; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Quality control tool for metagenomic and metatranscriptomic sequencing data"; + homepage = "https://github.com/biobakery/graphlan"; + changelog = "https://github.com/biobakery/graphlan/releases"; + license = lib.licenses.mit; + platforms = lib.platforms.all; + maintainers = with lib.maintainers; [ pandapip1 ]; + mainProgram = "graphlan.py"; + }; +} diff --git a/pkgs/by-name/gr/graphviz/package.nix b/pkgs/by-name/gr/graphviz/package.nix index 1172173dd326..98a60becb373 100644 --- a/pkgs/by-name/gr/graphviz/package.nix +++ b/pkgs/by-name/gr/graphviz/package.nix @@ -22,6 +22,7 @@ libxrender, python3, withXorg ? true, + withQuartz ? stdenv.hostPlatform.isDarwin, # for passthru.tests exiv2, @@ -39,13 +40,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "graphviz"; - version = "12.2.1"; + version = "14.1.2"; src = fetchFromGitLab { owner = "graphviz"; repo = "graphviz"; - rev = finalAttrs.version; - hash = "sha256-Uxqg/7+LpSGX4lGH12uRBxukVw0IswFPfpb2EkLsaiI="; + tag = finalAttrs.version; + hash = "sha256-LkyiKl0ulS9ujEdVLfyeoc4CtjITd6CAc35IUtlHSfw="; }; nativeBuildInputs = [ @@ -75,7 +76,8 @@ stdenv.mkDerivation (finalAttrs: { "--with-ltdl-lib=${libtool.lib}/lib" "--with-ltdl-include=${libtool}/include" (lib.withFeature withXorg "x") - ]; + ] + ++ optional withQuartz "--with-quartz"; enableParallelBuilding = true; strictDeps = true; @@ -136,6 +138,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://graphviz.org"; + changelog = "https://gitlab.com/graphviz/graphviz/-/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "Graph visualization tools"; license = lib.licenses.epl10; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/grav/package.nix b/pkgs/by-name/gr/grav/package.nix index 9249d435de55..f8e2888e4cc2 100644 --- a/pkgs/by-name/gr/grav/package.nix +++ b/pkgs/by-name/gr/grav/package.nix @@ -6,7 +6,7 @@ }: let - version = "1.7.52"; + version = "1.7.53.2"; in stdenvNoCC.mkDerivation { pname = "grav"; @@ -14,7 +14,7 @@ stdenvNoCC.mkDerivation { src = fetchzip { url = "https://github.com/getgrav/grav/releases/download/${version}/grav-admin-v${version}.zip"; - hash = "sha256-xAXUS4qGOSExniggPWwIooalHjHhpk4YK5tQvkRLp0g="; + hash = "sha256-6cQotHwIwWFR5phFQI9r79jpd+iYA1HpFBbYIzEVBsc="; }; patches = [ diff --git a/pkgs/by-name/gr/grc/package.nix b/pkgs/by-name/gr/grc/package.nix index 4ddd21ce51e3..f2b11e42f37b 100644 --- a/pkgs/by-name/gr/grc/package.nix +++ b/pkgs/by-name/gr/grc/package.nix @@ -53,7 +53,6 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - azahi peterhoeg ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/gr/grcov/package.nix b/pkgs/by-name/gr/grcov/package.nix index 1444dea0bf22..b5e61a855989 100644 --- a/pkgs/by-name/gr/grcov/package.nix +++ b/pkgs/by-name/gr/grcov/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "grcov"; - version = "0.9.1"; + version = "0.10.7"; src = fetchFromGitHub { owner = "mozilla"; repo = "grcov"; tag = "v${finalAttrs.version}"; - hash = "sha256-e3RQn6wKvVm40UK8ZlgIi2gRS9eEFBnEXdmXtCgv0Go="; + hash = "sha256-64c8byxQDEE9eRS+YAd9BaGSjGm+cl2XTAy3l3Utrws="; }; - cargoHash = "sha256-v4laGVbWmK8WFJXX5ChtViyKyMtmwpehSgNG6F31Mn0="; + cargoHash = "sha256-JTIYfAatMg9L597pRLywgCQmQO9sbuq/En0wNUx8QUo="; # tests do not find grcov path correctly checkFlags = @@ -29,6 +29,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "test_integration_guess_single_file" "test_integration_zip_dir" "test_integration_zip_zip" + "test_llvm_aggregate_profraws" + "test_profdatas_to_lcov" + "test_profraws_to_lcov" + "test_wrong_binary_file" ]; in builtins.map (x: "--skip=" + x) skipList; diff --git a/pkgs/by-name/gr/greenmask/package.nix b/pkgs/by-name/gr/greenmask/package.nix index 8a9a72457091..1b0f2f0799a9 100644 --- a/pkgs/by-name/gr/greenmask/package.nix +++ b/pkgs/by-name/gr/greenmask/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "greenmask"; - version = "0.2.21"; + version = "0.2.22"; src = fetchFromGitHub { owner = "GreenmaskIO"; repo = "greenmask"; tag = "v${finalAttrs.version}"; - hash = "sha256-QlNw2kCh5Rd8kwuA/BiNHXaw0p5qCfn4hzo9dgN45lU="; + hash = "sha256-bmKy3naQiLG4z3+VNkUck3UNVh2Oi8faXRz20qjwL9g="; }; - vendorHash = "sha256-zVbSppCgLil0qS4WYhkzQZxbBx6L/0gbexY//I+GzwQ="; + vendorHash = "sha256-PsGeh7PzZFFhzQClW56GfvsGp8T7dccyErdnOv3urhs="; subPackages = [ "cmd/greenmask/" ]; diff --git a/pkgs/by-name/gr/greenx/package.nix b/pkgs/by-name/gr/greenx/package.nix index c08356a17058..16c1f586823d 100644 --- a/pkgs/by-name/gr/greenx/package.nix +++ b/pkgs/by-name/gr/greenx/package.nix @@ -34,13 +34,9 @@ stdenv.mkDerivation (finalAttrs: { # Uses a hacky python setup run by cmake, which is hard to get running doCheck = false; - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - meta = { description = "Library for Green’s function based electronic structure theory calculations"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; homepage = "https://github.com/nomad-coe/greenX"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; diff --git a/pkgs/by-name/gr/greetd/package.nix b/pkgs/by-name/gr/greetd/package.nix index c6c65e452dec..c2dfaf7ac8de 100644 --- a/pkgs/by-name/gr/greetd/package.nix +++ b/pkgs/by-name/gr/greetd/package.nix @@ -1,18 +1,11 @@ { rustPlatform, lib, - config, fetchFromSourcehut, pam, scdoc, installShellFiles, nix-update-script, - # legacy passthrus - gtkgreet, - qtgreet, - regreet, - tuigreet, - wlgreet, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -45,26 +38,7 @@ rustPlatform.buildRustPackage (finalAttrs: { installManPage man/* ''; - # Added 2025-07-23. To be deleted on 26.05 - passthru = - let - warnPassthru = name: lib.warnOnInstantiate "`greetd.${name}` was renamed to `${name}`"; - in - lib.mapAttrs warnPassthru ( - lib.optionalAttrs config.allowAliases { - inherit - gtkgreet - qtgreet - regreet - tuigreet - wlgreet - ; - greetd = finalAttrs.finalPackage; - } - ) - // { - updateScript = nix-update-script { }; - }; + passthru.updateScript = nix-update-script { }; meta = { description = "Minimal and flexible login manager daemon"; @@ -75,7 +49,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://sr.ht/~kennylevinsen/greetd/"; mainProgram = "greetd"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gr/gren/generated-backend-package.nix b/pkgs/by-name/gr/gren/generated-backend-package.nix index 6ff48bab9b53..a097c4ec8656 100644 --- a/pkgs/by-name/gr/gren/generated-backend-package.nix +++ b/pkgs/by-name/gr/gren/generated-backend-package.nix @@ -29,11 +29,11 @@ }: mkDerivation { pname = "gren"; - version = "0.6.5"; + version = "0.6.6"; src = fetchgit { url = "https://github.com/gren-lang/compiler.git"; - sha256 = "1865x63y0kcp2ax49333i5512vwh845iiyq3b30jm31pr113csvr"; - rev = "ba2a2153b78086d75fe01ba45bdd630d6f5fc2fc"; + sha256 = "02hin22kyh2zgxn2fklnfa60iw3ppfr3xnv4z7r39vkf6c2q7fhq"; + rev = "03c52374f82036e7a3276a94e345a4aa98738b9b"; fetchSubmodules = true; }; isLibrary = false; @@ -83,6 +83,6 @@ mkDerivation { jailbreak = true; homepage = "https://gren-lang.org"; description = "The `gren` command line interface"; - license = lib.licensesSpdx."BSD-3-Clause"; + license = lib.meta.getLicenseFromSpdxId "BSD-3-Clause"; mainProgram = "gren"; } diff --git a/pkgs/by-name/gr/gren/package.nix b/pkgs/by-name/gr/gren/package.nix index 84ad7637623c..69af8be0e155 100644 --- a/pkgs/by-name/gr/gren/package.nix +++ b/pkgs/by-name/gr/gren/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gren"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "gren-lang"; repo = "compiler"; tag = finalAttrs.version; - hash = "sha256-eWs2Qsg3jCrBWAP7GAtBkG8RSoljjES6EpdN4IfpxaA="; + hash = "sha256-GLqDBTNu7jTy+WTbPrK7d/AIjHKWTidsf19AP4WwEQo="; }; buildInputs = [ nodejs ]; diff --git a/pkgs/by-name/gr/greybird/package.nix b/pkgs/by-name/gr/greybird/package.nix index 29bd35504195..f79e3ea6f623 100644 --- a/pkgs/by-name/gr/greybird/package.nix +++ b/pkgs/by-name/gr/greybird/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Grey and blue theme from the Shimmer Project for GTK-based environments"; homepage = "https://github.com/shimmerproject/Greybird"; - license = [ lib.licenses.gpl2Plus ]; # or alternatively: cc-by-nc-sa-30 or later + license = lib.licenses.gpl2Plus; # or alternatively: cc-by-nc-sa-30 or later platforms = lib.platforms.linux; maintainers = [ lib.maintainers.romildo ]; }; diff --git a/pkgs/by-name/gr/gridtracker2/package.nix b/pkgs/by-name/gr/gridtracker2/package.nix index aba9890cff20..bd45ad2b1ed2 100644 --- a/pkgs/by-name/gr/gridtracker2/package.nix +++ b/pkgs/by-name/gr/gridtracker2/package.nix @@ -11,16 +11,16 @@ }: buildNpmPackage (finalAttrs: { pname = "gridtracker2"; - version = "2.260323.0"; + version = "2.260714.0"; src = fetchFromGitLab { owner = "gridtracker.org"; repo = "gridtracker2"; tag = "v${finalAttrs.version}"; - hash = "sha256-3DUbKG7bMR2VpJPPsLNRLzYaStv5iTanECAT6DHMExo="; + hash = "sha256-ZY+p86wgjzVNALBt6+Gn68sZ6tNcsq5wo1QykZccPT0="; }; - npmDepsHash = "sha256-dJmrNP2AwIaQaCq0guG+OTogfcL8f97MAp6N7HAw5z8="; + npmDepsHash = "sha256-5h3bswjVf/8JHhwHRFTUfydN7XXtWbxNHTZ0mLL7RT8="; nativeBuildInputs = [ makeBinaryWrapper @@ -50,28 +50,20 @@ buildNpmPackage (finalAttrs: { buildPhase = '' runHook preBuild - '' - + lib.optionalString stdenv.hostPlatform.isDarwin '' - # electronDist needs to be modifiable on Darwin - cp -r ${electron.dist} electron-dist - chmod -R u+w electron-dist - # Disable code signing during build on macOS. - # https://github.com/electron-userland/electron-builder/blob/fa6fc16/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - export CSC_IDENTITY_AUTO_DISCOVERY=false + # the electronDist directory needs to be outside of the working directory + # otherwise the electron-builder config accidentally includes it inside the .asar file + electron_dist="$(mktemp -d)" + cp -r ${electron.dist}/. "$electron_dist" + chmod -R u+w "$electron_dist" npm exec electron-builder -- \ --dir \ - -c.electronDist=electron-dist \ - -c.electronVersion=${electron.version} - '' - + lib.optionalString stdenv.hostPlatform.isLinux '' - npm exec electron-builder -- \ - --dir \ - -c.electronDist=${electron.dist} \ - -c.electronVersion=${electron.version} - '' - + '' + -c.electronDist="$electron_dist" \ + -c.electronVersion=${electron.version} \ + -c.mac.identity=null + # ^ disable codesigning on Darwin + runHook postBuild ''; diff --git a/pkgs/by-name/gr/grimblast/package.nix b/pkgs/by-name/gr/grimblast/package.nix index e7a388c33bf9..4d4fad7ffbc7 100644 --- a/pkgs/by-name/gr/grimblast/package.nix +++ b/pkgs/by-name/gr/grimblast/package.nix @@ -20,13 +20,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "grimblast"; - version = "0.1-unstable-2026-05-29"; + version = "0.1-unstable-2026-06-30"; src = fetchFromGitHub { owner = "hyprwm"; repo = "contrib"; - rev = "bf1a7cdb086587e6bed6e8ecd285a81c01a11c54"; - hash = "sha256-epTJKmTCNL1Hm6/YdEWAgiOMVBSzC9/v/rjyOieP3yA="; + rev = "3dcbce715ae8b93107fa8632db15bf976862a573"; + hash = "sha256-JP0D8r8o9+jnYk0/B5O722La+oZeC5iNQ3lonKFTmbQ="; }; strictDeps = true; diff --git a/pkgs/by-name/gr/grizzly/package.nix b/pkgs/by-name/gr/grizzly/package.nix index f718b28b1b8e..80aa69b6edc6 100644 --- a/pkgs/by-name/gr/grizzly/package.nix +++ b/pkgs/by-name/gr/grizzly/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.7.1"; src = fetchFromGitHub { - owner = "grafana"; + owner = "grafana-cold-storage"; repo = "grizzly"; rev = "v${finalAttrs.version}"; hash = "sha256-1caG2QIBfbCgg9TLsW4XB0w+4dqUkQEsdWwRazbWeQA="; diff --git a/pkgs/by-name/gr/grobi/package.nix b/pkgs/by-name/gr/grobi/package.nix index ff198cf8db35..553b08f25e73 100644 --- a/pkgs/by-name/gr/grobi/package.nix +++ b/pkgs/by-name/gr/grobi/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/fd0/grobi"; description = "Automatically configure monitors/outputs for Xorg via RANDR"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; platforms = lib.platforms.linux; mainProgram = "grobi"; }; diff --git a/pkgs/by-name/gr/groff/package.nix b/pkgs/by-name/gr/groff/package.nix index a824d9a82f02..0b4ebba4d63f 100644 --- a/pkgs/by-name/gr/groff/package.nix +++ b/pkgs/by-name/gr/groff/package.nix @@ -48,8 +48,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-dOKBl5W2r/QxrqyYPWOpyJaO6roqLrp9+LpMe0Hnz9g="; }; - patches = lib.optionals stdenv.isLinux [ - # TODO: apply everywhere on rebuild + patches = [ # This revert a upstream refactor in continuous rendering mode, but this # causes a big performance regression for big manpages like # `man 5 configuration.nix`. @@ -193,6 +192,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ pSub ]; + mainProgram = "groff"; longDescription = '' groff is the GNU implementation of troff, a document formatting diff --git a/pkgs/by-name/gr/grok-build/package.nix b/pkgs/by-name/gr/grok-build/package.nix new file mode 100644 index 000000000000..8237c9a09f71 --- /dev/null +++ b/pkgs/by-name/gr/grok-build/package.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenvNoCC, + fetchurl, + installShellFiles, + autoPatchelfHook, + versionCheckHook, + runCommand, + testers, + grok-build, +}: +let + version = "0.2.93"; + + throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; + + platform = { + x86_64-linux = "linux-x86_64"; + aarch64-linux = "linux-aarch64"; + aarch64-darwin = "macos-aarch64"; + }; + + sourceData = lib.mapAttrs ( + system: upstreamPlatform: + fetchurl { + url = "https://x.ai/cli/grok-${version}-${upstreamPlatform}"; + hash = + { + x86_64-linux = "sha256-Tgc407VVDzyEK8CuafRogVxjKcAIoRDQwnppTcNAETU="; + aarch64-linux = "sha256-7a4g6SoKM/7ewao0iPPjgI2MTKISj8jzE/vYGOPpX18="; + aarch64-darwin = "sha256-Kpe6Z1vZkqqbmB4ug3dkYNlPRptRDAuO/ii1DSNtdnw="; + } + .${system}; + } + ) platform; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "grok-build"; + inherit version; + + strictDeps = true; + __structuredAttrs = true; + + src = sourceData.${stdenvNoCC.hostPlatform.system} or throwSystem; + + dontUnpack = true; + dontBuild = true; + + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optionals stdenvNoCC.hostPlatform.isElf [ autoPatchelfHook ]; + + installPhase = '' + runHook preInstall + + install -Dm755 "$src" "$out/bin/grok" + ln -s grok "$out/bin/agent" + + ${lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd grok \ + --bash <("$out/bin/grok" completions bash) \ + --fish <("$out/bin/grok" completions fish) \ + --zsh <("$out/bin/grok" completions zsh) + ''} + + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + + installCheckPhase = '' + runHook preInstallCheck + + # ensure is a symlink + test -L "$out/bin/agent" + + # ensure agent points at grok + [ "$(readlink -f "$out/bin/agent")" = "$(readlink -f "$out/bin/grok")" ] + + runHook postInstallCheck + ''; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Command-line coding agent by xAI"; + homepage = "https://docs.x.ai/build/overview"; + downloadPage = "https://x.ai/cli/stable"; + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ crertel ]; + platforms = lib.attrNames sourceData; + mainProgram = "grok"; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/gr/grok-build/update.sh b/pkgs/by-name/gr/grok-build/update.sh new file mode 100755 index 000000000000..5d7553dc2603 --- /dev/null +++ b/pkgs/by-name/gr/grok-build/update.sh @@ -0,0 +1,34 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl common-updater-scripts + +set -euo pipefail + +version="$(curl -fsSL https://x.ai/cli/stable)" + +currentVersion=$( + nix-instantiate --eval --raw -E "with import ./. {}; grok-build.version or (lib.getVersion grok-build)" +) + +if [[ "$currentVersion" == "$version" ]]; then + echo "package is up-to-date: $version" + exit 0 +fi + +update-source-version grok-build "${version}" || true + +for system in "aarch64-darwin macos-aarch64" "aarch64-linux linux-aarch64" "x86_64-linux linux-x86_64"; do + # shellcheck disable=SC2086 + set -- ${system} + + arch="${1}" + platform="${2}" + + url="https://x.ai/cli/grok-${version}-${platform}" + hash=$( + nix --extra-experimental-features nix-command hash convert --hash-algo sha256 "$( + nix-prefetch-url "${url}" + )" + ) + + update-source-version grok-build "${version}" "${hash}" --system="${arch}" --ignore-same-version +done diff --git a/pkgs/by-name/gr/grpc-client-cli/package.nix b/pkgs/by-name/gr/grpc-client-cli/package.nix index 42f0ce06eff5..71a31fea8340 100644 --- a/pkgs/by-name/gr/grpc-client-cli/package.nix +++ b/pkgs/by-name/gr/grpc-client-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grpc-client-cli"; - version = "1.24.5"; + version = "1.24.6"; src = fetchFromGitHub { owner = "vadimi"; repo = "grpc-client-cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-oN6+INV1psGa0nV5vPuNl9arnXaIU+pipwacHi7rHVY="; + sha256 = "sha256-5T5Ks98nOQmK3wexnSEZ5q1J9JNGorXpkLGWG5ie6Y4="; }; - vendorHash = "sha256-hE+iwPP9hlj/taVKKY+On8RCRIUynZnvVXnAn2y5sxA="; + vendorHash = "sha256-lwat8cp+Tr2KeUc5S2yNZtd3Jadxug0eQKLSsDZlT54="; meta = { description = "Generic gRPC command line client"; diff --git a/pkgs/by-name/gr/grpc-health-probe/package.nix b/pkgs/by-name/gr/grpc-health-probe/package.nix index 232eee138ffb..e09996e24d5b 100644 --- a/pkgs/by-name/gr/grpc-health-probe/package.nix +++ b/pkgs/by-name/gr/grpc-health-probe/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "grpc-health-probe"; - version = "0.4.52"; + version = "0.4.53"; src = fetchFromGitHub { owner = "grpc-ecosystem"; repo = "grpc-health-probe"; rev = "v${finalAttrs.version}"; - hash = "sha256-NbC2W76p9Ph6ZdCRCylMqqPzNO7/jq1WbCW+ly/jKAM="; + hash = "sha256-FSVNnSuybPfaC+iCwOT2wvxk/+Hazm0VRe2zmEw/Fss="; }; tags = [ @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { "-X main.versionTag=${finalAttrs.version}" ]; - vendorHash = "sha256-KZNoXWay/fegj6q075s40VvqtbA0ADrPKJ3VkQ/6os0="; + vendorHash = "sha256-g4RPn2iQEw7XJIwwk0j2Lznuhh/Pw6W3gU/2j2lymy4="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/gr/grpc/package.nix b/pkgs/by-name/gr/grpc/package.nix index fd682d3b0516..7688baf9284e 100644 --- a/pkgs/by-name/gr/grpc/package.nix +++ b/pkgs/by-name/gr/grpc/package.nix @@ -25,7 +25,7 @@ # nixpkgs-update: no auto update stdenv.mkDerivation (finalAttrs: { pname = "grpc"; - version = "1.80.0"; # N.B: if you change this, please update: + version = "1.82.1"; # N.B: if you change this, please update: # pythonPackages.grpcio # pythonPackages.grpcio-channelz # pythonPackages.grpcio-health-checking @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "grpc"; repo = "grpc"; tag = "v${finalAttrs.version}"; - hash = "sha256-/dpTRG5JcZY2VAsqOYNIpFW7ouSy/eC2STulP7qdSYg="; + hash = "sha256-w4tl1y1GITlfeHTsSAZm45d8HQVzqSBVEQXoEqO0h5g="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/gr/grpcui/package.nix b/pkgs/by-name/gr/grpcui/package.nix index 8cfb53958822..cfa0c99af2db 100644 --- a/pkgs/by-name/gr/grpcui/package.nix +++ b/pkgs/by-name/gr/grpcui/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "grpcui"; - version = "1.5.1"; + version = "1.5.2"; src = fetchFromGitHub { owner = "fullstorydev"; repo = "grpcui"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-mZeNK/NwN887TN4fnvGzrqwJCBYnYcuW/K+O0LgX0uo="; + sha256 = "sha256-qJ8X4l4Efww6fJ1Xr/MXn2Nr7O0zCmDTb0YAWGInVp4="; }; - vendorHash = "sha256-y4OK610q+8m48M/HX3bXNV7YguoOaZKnCw+JnEvqbEI="; + vendorHash = "sha256-S6GeFwxyrlHzsXWz66jrNa+mtoACn7w2oY3M9XjPusk="; doCheck = false; diff --git a/pkgs/by-name/gr/grpcurl/package.nix b/pkgs/by-name/gr/grpcurl/package.nix index 7ea9df310121..3e96e74239ea 100644 --- a/pkgs/by-name/gr/grpcurl/package.nix +++ b/pkgs/by-name/gr/grpcurl/package.nix @@ -29,7 +29,7 @@ buildGoModule (finalAttrs: { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; homepage = "https://github.com/fullstorydev/grpcurl"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ knl ]; + maintainers = [ ]; mainProgram = "grpcurl"; }; }) diff --git a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix index ef97dde99380..1bd79a88705d 100644 --- a/pkgs/by-name/gr/gruvbox-plus-icons/package.nix +++ b/pkgs/by-name/gr/gruvbox-plus-icons/package.nix @@ -11,13 +11,13 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "gruvbox-plus-icons"; - version = "6.4.0"; + version = "6.5.0"; src = fetchFromGitHub { owner = "SylEleuth"; repo = "gruvbox-plus-icon-pack"; tag = "v${finalAttrs.version}"; - hash = "sha256-t4bQeK9jwaE3nRZEhks9QARKkxKdH9ZTSgPIby323Jc="; + hash = "sha256-EG8AmnLqqml7oGeeNqLLpnmMj6/KVAJOKuTjCUoor4s="; }; patches = [ ./folder-color.patch ]; diff --git a/pkgs/by-name/gr/grype/package.nix b/pkgs/by-name/gr/grype/package.nix index 184eb03217c6..2fd707cefe94 100644 --- a/pkgs/by-name/gr/grype/package.nix +++ b/pkgs/by-name/gr/grype/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { pname = "grype"; - version = "0.114.0"; + version = "0.115.0"; # required for tests __darwinAllowLocalNetworking = true; @@ -21,7 +21,7 @@ buildGoModule (finalAttrs: { owner = "anchore"; repo = "grype"; tag = "v${finalAttrs.version}"; - hash = "sha256-JMcqoFqd7WtU/EKobNbiraOlQO7GdYT8IKzSnR26gXY="; + hash = "sha256-tc7ikgRQxwkCOaZuLzp7F898C+3mjpCjDSURw3rJRMc="; # 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; @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { proxyVendor = true; - vendorHash = "sha256-wAibdRMWscqu2nX08jzoS9rY+OrJEFB2TehYYkDQJ64="; + vendorHash = "sha256-QxHhRqLPXVzJL7ksx0lMQuk0qtzartJk+tKiz6IP4xc="; patches = [ # several test golden files have unstable paths based on the platform @@ -136,7 +136,7 @@ buildGoModule (finalAttrs: { As a vulnerability scanner grype is able to scan the contents of a container image or filesystem to find known vulnerabilities. ''; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/gs/gs1200-exporter/package.nix b/pkgs/by-name/gs/gs1200-exporter/package.nix index bbbec26d705a..25d6bdf1ac7f 100644 --- a/pkgs/by-name/gs/gs1200-exporter/package.nix +++ b/pkgs/by-name/gs/gs1200-exporter/package.nix @@ -6,15 +6,18 @@ }: buildGoModule rec { pname = "gs1200-exporter"; - version = "2.11.12"; + version = "2.11.13"; __structuredAttrs = true; src = fetchFromGitHub { owner = "robinelfrink"; repo = "gs1200-exporter"; tag = "v${version}"; - hash = "sha256-8s2VgaqYXp9PN2oNU/sWpjQjDPSWolbWEVSZcx9Lh3M="; + hash = "sha256-s+CdJBa9k4DBYBiwEAtWJz1r6DvDQtZR+dEB3FBSu3g="; }; - vendorHash = "sha256-204bFaywOolKVNoeH/w72Ba1PYAVgQawEmlaEXgRaRY="; + vendorHash = "sha256-R8is2TM2npCY1eOTRsL1spTJWf/KiBqHpjr4EjraLeU="; + postPatch = '' + substituteInPlace go.mod --replace-fail "go 1.26.4" "go 1.26.3" + ''; passthru.tests = { inherit (nixosTests) gs1200-exporter; }; diff --git a/pkgs/by-name/gs/gscreenshot/package.nix b/pkgs/by-name/gs/gscreenshot/package.nix index 30940413216e..7559182dc050 100644 --- a/pkgs/by-name/gs/gscreenshot/package.nix +++ b/pkgs/by-name/gs/gscreenshot/package.nix @@ -20,22 +20,22 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gscreenshot"; version = "3.11.1"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "thenaterhood"; repo = "gscreenshot"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc="; + hash = "sha256-24eo4ihWM/sJXj7Dp3hSp0FEP1uYzvCON2emuMiONSc="; }; # needed for wrapGAppsHook3 to function strictDeps = false; - # tests require a display and fail - doCheck = false; nativeBuildInputs = [ wrapGAppsHook3 ]; - propagatedBuildInputs = [ + dependencies = [ gettext gobject-introspection gtk3 @@ -52,12 +52,11 @@ python3Packages.buildPythonApplication (finalAttrs: { scrot slop xclip - python3Packages.xlib + python3Packages.python-xlib ] ++ (with python3Packages; [ pillow pygobject3 - setuptools ]); patches = [ ./0001-Changing-paths-to-be-nix-compatible.patch ]; diff --git a/pkgs/by-name/gs/gsl-lite/package.nix b/pkgs/by-name/gs/gsl-lite/package.nix index 7b53ae8762ee..07e497660fd5 100644 --- a/pkgs/by-name/gs/gsl-lite/package.nix +++ b/pkgs/by-name/gs/gsl-lite/package.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ]; cmakeFlags = [ - (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "GSL_LITE_OPT_BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; # Building tests is broken on Darwin. diff --git a/pkgs/by-name/gs/gsoap/package.nix b/pkgs/by-name/gs/gsoap/package.nix index 04aa2185bb39..5dc54e63a8d3 100644 --- a/pkgs/by-name/gs/gsoap/package.nix +++ b/pkgs/by-name/gs/gsoap/package.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "gsoap"; - version = "2.8.142"; + version = "2.8.143"; src = fetchurl { url = "mirror://sourceforge/gsoap2/gsoap_${finalAttrs.version}.zip"; - hash = "sha256-bXGWvWWR7Cl3R0xoHjUbSjPrXC1kyeLmcnsATzMLN1I="; + hash = "sha256-tTgVhMvIWRB4szmtoVn7BgWGwOHkZmtotKOVjvLisek="; }; buildInputs = [ diff --git a/pkgs/by-name/gs/gspell/package.nix b/pkgs/by-name/gs/gspell/package.nix index 2f210c57d9a2..d0b0af2b7e26 100644 --- a/pkgs/by-name/gs/gspell/package.nix +++ b/pkgs/by-name/gs/gspell/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "gspell"; - version = "1.14.3"; + version = "1.14.4"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnome/sources/gspell/${lib.versions.majorMinor version}/gspell-${version}.tar.xz"; - hash = "sha256-6LOcZ1VvdUlTYpUvgcokG1o8F8dZYLd/yT+nAsYSpaQ="; + hash = "sha256-5zqJ1oxw+HSK77aw9c/f7D/xc89ESYN/1ssX0en89IY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/gs/gssdp/package.nix b/pkgs/by-name/gs/gssdp/package.nix deleted file mode 100644 index 41ef85ad7d16..000000000000 --- a/pkgs/by-name/gs/gssdp/package.nix +++ /dev/null @@ -1,109 +0,0 @@ -{ - stdenv, - lib, - fetchpatch2, - fetchurl, - meson, - ninja, - pkg-config, - gobject-introspection, - vala, - gi-docgen, - python3, - libsoup_2_4, - glib, - gnome, - gssdp-tools, - buildPackages, - withIntrospection ? - lib.meta.availableOn stdenv.hostPlatform gobject-introspection - && stdenv.hostPlatform.emulatorAvailable buildPackages, -}: - -stdenv.mkDerivation rec { - pname = "gssdp"; - version = "1.4.1"; - - outputs = [ - "out" - "dev" - ] - ++ lib.optionals withIntrospection [ "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor version}/gssdp-${version}.tar.xz"; - sha256 = "VySWVDV9PVGxQDFRaaJMBnHeeqUsb3XIxcmr1Ao1JSk="; - }; - - patches = [ - (fetchpatch2 { - # https://gitlab.gnome.org/GNOME/gssdp/-/merge_requests/11 - url = "https://gitlab.gnome.org/GNOME/gssdp/-/commit/db9d02c22005be7e5e81b43a3ab777250bd7b27b.diff"; - hash = "sha256-DJQrg6MhzpX8R0QaNnqdwA1+v8xncDU8jcX+I3scW1M="; - }) - ]; - - strictDeps = true; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - glib - python3 - ] - ++ lib.optionals withIntrospection [ - gobject-introspection - vala - gi-docgen - ]; - - buildInputs = [ - libsoup_2_4 - ]; - - propagatedBuildInputs = [ - glib - ]; - - mesonFlags = [ - "-Dsniffer=false" - (lib.mesonBool "gtk_doc" withIntrospection) - (lib.mesonBool "introspection" withIntrospection) - (lib.mesonBool "vapi" withIntrospection) - ]; - - # Bail out! GLib-GIO-FATAL-CRITICAL: g_inet_address_to_string: assertion 'G_IS_INET_ADDRESS (address)' failed - doCheck = !stdenv.hostPlatform.isDarwin; - - postFixup = lib.optionalString withIntrospection '' - # Move developer documentation to devdoc output. - # Cannot be in postInstall, otherwise _multioutDocs hook in preFixup will move right back. - find -L "$out/share/doc" -type f -regex '.*\.devhelp2?' -print0 \ - | while IFS= read -r -d ''' file; do - moveToOutput "$(dirname "''${file/"$out/"/}")" "$devdoc" - done - ''; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gssdp"; - freeze = true; - }; - - tests = { - inherit gssdp-tools; - }; - }; - - meta = { - description = "GObject-based API for handling resource discovery and announcement over SSDP"; - homepage = "http://www.gupnp.org/"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/gs/gssdp_1_6/package.nix b/pkgs/by-name/gs/gssdp_1_6/package.nix index b4d8daba12c1..47c18a41e48b 100644 --- a/pkgs/by-name/gs/gssdp_1_6/package.nix +++ b/pkgs/by-name/gs/gssdp_1_6/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gssdp"; - version = "1.6.4"; + version = "1.6.6"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gssdp/${lib.versions.majorMinor finalAttrs.version}/gssdp-${finalAttrs.version}.tar.xz"; - hash = "sha256-/5f9+39WHT5oE7T2ohRSWefC7/Q8wOY/P9Ax0LYmYDI="; + hash = "sha256-dn0idSVM4O/q6sZEGf+fTwrUcNE072cvXFVrKrt4a8s="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/gs/gssproxy/package.nix b/pkgs/by-name/gs/gssproxy/package.nix new file mode 100644 index 000000000000..cb8cc73ab931 --- /dev/null +++ b/pkgs/by-name/gs/gssproxy/package.nix @@ -0,0 +1,84 @@ +{ + lib, + stdenv, + fetchFromGitHub, + autoreconfHook, + nix-update-script, + pkg-config, + ding-libs, + krb5, + libverto, + popt, + libxml2, + libxslt, + docbook-xsl-nons, + docbook_xml_dtd_44, + versionCheckHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "gssproxy"; + version = "0.9.2"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "gssapi"; + repo = "gssproxy"; + tag = "v${finalAttrs.version}"; + hash = "sha256-RcT1ge/XxhTaT9hrvcHElAEAbvOtjqep3kdEw5e7WZY="; + }; + + nativeBuildInputs = [ + autoreconfHook + docbook-xsl-nons + docbook_xml_dtd_44 + libxml2 + libxslt + pkg-config + ]; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + makeFlags = [ + "SGML_CATALOG_FILES=${docbook-xsl-nons}/xml/xsl/docbook/catalog.xml ${docbook_xml_dtd_44}/xml/dtd/docbook/catalog.xml" + "VERTO_CFLAGS=${libverto}/include" + "VERTO_LIBS=${libverto}/lib/libverto.so" + ]; + + postInstall = '' + find $out -type d -empty -delete + ''; + + buildInputs = [ + ding-libs + krb5 + libverto + popt + ]; + + configureFlags = [ + "--with-pubconf-path=${placeholder "out"}/etc/gssproxy" + "--with-initscript=none" + "--without-selinux" + # Use REMOTE_FIRST behavior: try gssproxy daemon first, fall back to local credentials + "--with-gpp-default-behavior=REMOTE_FIRST" + "--with-xml-catalog-path=${docbook-xsl-nons}/xml/xsl/docbook/catalog.xml" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "GSS-API proxy client library for credential isolation"; + homepage = "https://github.com/gssapi/gssproxy"; + changelog = "https://github.com/gssapi/gssproxy/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ jlesquembre ]; + mainProgram = "gssproxy"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/gs/gswatcher/package.nix b/pkgs/by-name/gs/gswatcher/package.nix index bafe4c812f8c..539633bde6d4 100644 --- a/pkgs/by-name/gs/gswatcher/package.nix +++ b/pkgs/by-name/gs/gswatcher/package.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple game server monitor and administrative tool"; homepage = "https://github.com/lxndr/gswatcher"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev ]; }; diff --git a/pkgs/by-name/gt/gt/package.nix b/pkgs/by-name/gt/gt/package.nix index fd62a2b45d99..1eb3dbf13f10 100644 --- a/pkgs/by-name/gt/gt/package.nix +++ b/pkgs/by-name/gt/gt/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Linux command line tool for setting up USB gadgets using configfs"; homepage = "https://github.com/linux-usb-gadgets/gt"; mainProgram = "gt"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/gt/gtdialog/package.nix b/pkgs/by-name/gt/gtdialog/package.nix deleted file mode 100644 index bcfe50d7324b..000000000000 --- a/pkgs/by-name/gt/gtdialog/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - cdk, - unzip, - gtk2, - glib, - ncurses, - pkg-config, - fetchFromGitHub, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtdialog"; - version = "1.6"; - - src = fetchFromGitHub { - owner = "orbitalquark"; - repo = "gtdialog"; - rev = "gtdialog_${finalAttrs.version}"; - hash = "sha256-TdYwT4bC+crTSNGJIr1Nno+/h1YgxNp0BR5MQtxdrVg="; - }; - - nativeBuildInputs = [ - pkg-config - unzip - ]; - buildInputs = [ - cdk - gtk2 - glib - ncurses - ]; - - makeFlags = [ "PREFIX=$(out)" ]; - - meta = { - description = "Cross-platform helper for creating interactive dialogs"; - mainProgram = "gtdialog"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ raskin ]; - platforms = lib.platforms.linux; - homepage = "http://foicica.com/gtdialog"; - downloadPage = "http://foicica.com/gtdialog/download"; - }; -}) diff --git a/pkgs/by-name/gt/gtg/package.nix b/pkgs/by-name/gt/gtg/package.nix index aa61c9a14c47..42cff6a4fc98 100644 --- a/pkgs/by-name/gt/gtg/package.nix +++ b/pkgs/by-name/gt/gtg/package.nix @@ -20,13 +20,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "gtg"; - version = "0.6"; + version = "0.6.1"; src = fetchFromGitHub { owner = "getting-things-gnome"; repo = "gtg"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-O8qBD92P2g8QrBdMXa6j0Ozk+W80Ny5yk0KNTy7ekfE="; + sha256 = "sha256-Qojw9mJlPU234ijsCN92Gu/j2CyMVDvFFwzbYSYvMdU="; }; patches = [ diff --git a/pkgs/by-name/gt/gtk-doc/package.nix b/pkgs/by-name/gt/gtk-doc/package.nix index a2db2fee4788..9f58e9fb8f75 100644 --- a/pkgs/by-name/gt/gtk-doc/package.nix +++ b/pkgs/by-name/gt/gtk-doc/package.nix @@ -16,7 +16,7 @@ python3.pkgs.buildPythonApplication rec { pname = "gtk-doc"; - version = "1.35.1"; + version = "1.36.1"; outputDevdoc = "out"; @@ -26,14 +26,10 @@ python3.pkgs.buildPythonApplication rec { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = "gtk-doc"; - rev = version; - hash = "sha256-EqU7lnBnOn3gR3hT95yjdTUb3cqX2XJK5UAKsFw2Q10="; + tag = version; + hash = "sha256-8hB43BCAtT1B7/ak2i0FAlYD3Kb4rNCWfsJ+wqGu3FA="; }; - patches = [ - passthru.respect_xml_catalog_files_var_patch - ]; - postPatch = '' substituteInPlace meson.build \ --replace "pkg-config" "$PKG_CONFIG" @@ -83,8 +79,6 @@ python3.pkgs.buildPythonApplication rec { ''; passthru = { - # Consumers are expected to copy the m4 files to their source tree, let them reuse the patch - respect_xml_catalog_files_var_patch = ./respect-xml-catalog-files-var.patch; updateScript = gnome.updateScript { packageName = "gtk-doc"; versionPolicy = "none"; @@ -92,6 +86,7 @@ python3.pkgs.buildPythonApplication rec { }; meta = { + changelog = "https://gitlab.gnome.org/GNOME/gtk-doc/-/blob/${src.tag}/NEWS"; description = "Tools to extract documentation embedded in GTK and GNOME source code"; homepage = "https://gitlab.gnome.org/GNOME/gtk-doc"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch b/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch deleted file mode 100644 index 95f6879a0069..000000000000 --- a/pkgs/by-name/gt/gtk-doc/respect-xml-catalog-files-var.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/m4/gtkdoc_jh_check_xml_catalog.m4 -+++ b/m4/gtkdoc_jh_check_xml_catalog.m4 -@@ -5,8 +5,8 @@ - [ - AC_REQUIRE([JH_PATH_XML_CATALOG],[JH_PATH_XML_CATALOG(,[:])])dnl - AC_MSG_CHECKING([for ifelse([$2],,[$1],[$2]) in XML catalog]) -- if $jh_found_xmlcatalog && \ -- AC_RUN_LOG([$XMLCATALOG --noout "$XML_CATALOG_FILE" "$1" >&2]); then -+ # empty argument forces libxml to use XML_CATALOG_FILES variable -+ if AC_RUN_LOG([$XMLCATALOG --noout "" "$1" >&2]); then - AC_MSG_RESULT([found]) - ifelse([$3],,,[$3]) - else diff --git a/pkgs/by-name/gt/gtk-session-lock/package.nix b/pkgs/by-name/gt/gtk-session-lock/package.nix index f84b82e5bf28..35640bc2cc2e 100644 --- a/pkgs/by-name/gt/gtk-session-lock/package.nix +++ b/pkgs/by-name/gt/gtk-session-lock/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { # The author stated "GTK Session Lock is licensed under the GNU General # Public License version 3.0 or any later version approved by me (Cu3PO42)." # Since we don't know if the author will approve later versions, we mark gpl3Only - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; badPlatforms = lib.platforms.darwin; diff --git a/pkgs/by-name/gt/gtk4/package.nix b/pkgs/by-name/gt/gtk4/package.nix index 28fd6efc8850..9b7807508a35 100644 --- a/pkgs/by-name/gt/gtk4/package.nix +++ b/pkgs/by-name/gt/gtk4/package.nix @@ -95,11 +95,13 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-Ub2fYMfSOmZaVWxzZMIfsuTiglZrPn4JJFXo+RAzCJM="; }; - patches = lib.optional stdenv.hostPlatform.is32bit (fetchpatch { - name = "fix-32bit-VkImage-null.patch"; - url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch"; - hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ="; - }); + patches = [ + (fetchpatch { + name = "fix-32bit-VkImage-null.patch"; + url = "https://gitlab.gnome.org/GNOME/gtk/-/commit/10d43de8f4f942cb591ada3103474bd7213425f1.patch"; + hash = "sha256-DJIL6M3XcsjBoMO77OxNi84d1DxAphAfot3N7Nq1QqQ="; + }) + ]; depsBuildBuild = [ pkg-config diff --git a/pkgs/by-name/gt/gtkgreet/package.nix b/pkgs/by-name/gt/gtkgreet/package.nix index 6156e3ee8f41..dad670c71fe9 100644 --- a/pkgs/by-name/gt/gtkgreet/package.nix +++ b/pkgs/by-name/gt/gtkgreet/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "GTK based greeter for greetd, to be run under cage or similar"; homepage = "https://git.sr.ht/~kennylevinsen/gtkgreet"; - license = lib.licenses.gpl3Plus; + license = lib.licenses.gpl3Only; maintainers = [ ]; platforms = lib.platforms.linux; mainProgram = "gtkgreet"; diff --git a/pkgs/by-name/gt/gtklp/000-autoconf.patch b/pkgs/by-name/gt/gtklp/000-autoconf.patch deleted file mode 100644 index c1698bee1fdc..000000000000 --- a/pkgs/by-name/gt/gtklp/000-autoconf.patch +++ /dev/null @@ -1,23 +0,0 @@ -Patch origin: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/3 - -diff --git a/configure.ac b/configure.ac -index b7a30e9..3768ae9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS([config.h]) - - AC_CONFIG_MACRO_DIR([m4]) - AM_GNU_GETTEXT([external]) -+AM_GNU_GETTEXT_REQUIRE_VERSION([0.21]) - - dnl Extra params - CUPSCONFIGPATH="" -@@ -30,8 +31,6 @@ AC_SUBST(XLIBS) - - dnl Checks for header files - --dnl internationalization macros --AM_GNU_GETTEXT - - - # Forte Compiler ############################################################ diff --git a/pkgs/by-name/gt/gtklp/001-format-parameter.patch b/pkgs/by-name/gt/gtklp/001-format-parameter.patch deleted file mode 100644 index 6cfc90beb02a..000000000000 --- a/pkgs/by-name/gt/gtklp/001-format-parameter.patch +++ /dev/null @@ -1,22 +0,0 @@ -Patch source: http://sophie.zarb.org/rpms/68e90a72e0052022f558148d97c9ea2a/files/1 - ---- a/libgtklp/libgtklp.c 2020-08-25 17:31:52.427298559 +0100 -+++ b/libgtklp/libgtklp.c 2020-08-25 17:36:37.728154682 +0100 -@@ -939,7 +939,7 @@ - gtk_widget_show(pixmapwid); - - if (strlen(gerror2) == 0) -- snprintf(tmplabel, (size_t) MAXLINE, gerror1); -+ snprintf(tmplabel, (size_t) MAXLINE, "%s", gerror1); - else - snprintf(tmplabel, (size_t) MAXLINE, gerror1, gerror2); - label = gtk_label_new(tmplabel); -@@ -973,7 +973,7 @@ - #endif - } else { - if (strlen(gerror2) == 0) -- g_warning(gerror1); -+ g_warning("%s", gerror1); - else - g_warning(gerror1, gerror2); - } diff --git a/pkgs/by-name/gt/gtklp/package.nix b/pkgs/by-name/gt/gtklp/package.nix deleted file mode 100644 index 8b4f3b209865..000000000000 --- a/pkgs/by-name/gt/gtklp/package.nix +++ /dev/null @@ -1,76 +0,0 @@ -{ - lib, - stdenv, - autoreconfHook, - cups, - fetchurl, - gettext, - glib, - gtk2, - libtool, - openssl, - pkg-config, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "gtklp"; - version = "1.3.4"; - - src = fetchurl { - url = "mirror://sourceforge/gtklp/gtklp-${finalAttrs.version}.src.tar.gz"; - hash = "sha256-vgdgkEJZX6kyA047LXA4zvM5AewIY/ztu1GIrLa1O6s="; - }; - - nativeBuildInputs = [ - autoreconfHook - pkg-config - cups - ]; - - buildInputs = [ - cups - gettext - glib - gtk2 - libtool - openssl - ]; - - outputs = [ - "out" - "doc" - "man" - ]; - - strictDeps = true; - - patches = [ - ./000-autoconf.patch - ./001-format-parameter.patch - ]; - - # Workaround build failure on -fno-common toolchains: - # ld: libgtklp.a(libgtklp.o):libgtklp/libgtklp.h:83: multiple definition of `progressBar'; - # file.o:libgtklp/libgtklp.h:83: first defined here - env.NIX_CFLAGS_COMPILE = "-fcommon"; - - postPatch = '' - substituteInPlace include/defaults.h \ - --replace "netscape" "firefox" \ - --replace "http://localhost:631/sum.html#STANDARD_OPTIONS" \ - "http://localhost:631/help/" - ''; - - preInstall = '' - install -D -m0644 -t $doc/share/doc AUTHORS BUGS ChangeLog README USAGE - ''; - - meta = { - homepage = "https://gtklp.sirtobi.com"; - description = "GTK-based graphical frontend for CUPS"; - license = with lib.licenses; [ gpl2Only ]; - mainProgram = "gtklp"; - maintainers = [ ]; - platforms = lib.platforms.unix; - }; -}) diff --git a/pkgs/by-name/gt/gtkradiant/package.nix b/pkgs/by-name/gt/gtkradiant/package.nix deleted file mode 100644 index 41754b8568f8..000000000000 --- a/pkgs/by-name/gt/gtkradiant/package.nix +++ /dev/null @@ -1,286 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchsvn, - scons, - pkg-config, - python3, - glib, - libxml2, - gtk2, - libGLU, - gnome2, - runCommand, - writeScriptBin, - runtimeShell, - makeDesktopItem, - copyDesktopItems, -}: - -let - q3Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q3Pack/trunk"; - rev = 144; - sha256 = "sha256-U1GtMv775JEOAJ1W2kSaRNPDCnW39W+KqVDTTG2yISY="; - }; - urtPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/UrTPack/trunk"; - rev = 144; - sha256 = "sha256-DQjENyQa1kEieU3ZWyMt2e4oEN0X2K3lxP79sBI91iI="; - }; - etPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/ETPack/trunk"; - rev = 144; - sha256 = "sha256-mqaWOYfF/F6ABh7nKA36YvsywZIdwJ9IitFi2Xp5rgk="; - }; - qlPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/QLPack/trunk"; - rev = 144; - sha256 = "sha256-lrn4nu3JI7j+t9jYd+UFE55GOCbc6+Sh2fZfVlEr1WM="; - }; - q2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2Pack/trunk"; - rev = 144; - sha256 = "sha256-ad8dRV+28Zz5yQsJU7hvteSIn9wWpehuqxMspw3yvvU="; - }; - quetooPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/QuetooPack/trunk"; - rev = 144; - sha256 = "sha256-SOblPJgdVEZrTYtvDlcF7paIm3UitSVFQ9+RahXkO64="; - }; - jaPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/JAPack/trunk"; - rev = 144; - sha256 = "sha256-P6lI+nNrPwoWJl5ThUHIA3Iw1nWVo2djaaWHAF5HuDo="; - }; - stvefPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/STVEFPack/trunk"; - rev = 144; - sha256 = "sha256-quNyVC6fg1FIBsLWx0LzRK2JfxKMNJeUEIkWGhGJHhI="; - }; - wolfPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/WolfPack/trunk"; - rev = 144; - sha256 = "sha256-693k6KiIchQddVGBhRJf7ikv6ut5L9rcLt0FTZ7pSvw="; - }; - unvanquishedPack = fetchsvn { - url = "https://github.com/Unvanquished/unvanquished-mapeditor-support.git/trunk/build/gtkradiant/"; - rev = 212; - sha256 = "sha256-weBlnSBezPppbhsMOT66vubioTxpDC+AcKIOC2Xitdo="; - }; - q1Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q1Pack/trunk"; - rev = 144; - sha256 = "sha256-JfmDIUoDY7dYdMgwwUMgcwNhWxuxsdkv1taw8DXhPY4="; - }; - darkPlacesPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/DarkPlacesPack/trunk"; - rev = 57; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - doom3Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Doom3Pack/trunk"; - rev = 56; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - halfLifePack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/HalfLifePack/trunk"; - rev = 1; - sha256 = "sha256-CrbN3iOG89j71y4ZJ4gNZEA5CYxphLLGbZwv6Tbjui0="; - }; - her2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Her2Pack/trunk"; - rev = 55; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - jk2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/JK2Pack/trunk"; - rev = 77; - sha256 = "sha256-3g/p9OC0j2va9CXXtsQf0lP6VJ1WyI5k2W9xNRwYjS8="; - }; - nexuizPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/NexuizPack/trunk"; - rev = 49; - sha256 = "sha256-nAV7rZKDgAxlEmu2RfBFNsHv9Xgas1IlDgioligvY+c="; - }; - preyPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/PreyPack/trunk"; - rev = 19; - sha256 = "sha256-wbKEnSaFO40HxhMsbYKy76MxXDvY9O1lTcr3M7fXxW0="; - }; - q2wPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q2WPack/trunk"; - rev = 126; - sha256 = "sha256-Q6IyL2qUr+6ktP34oYkFqN5MeFxCXOkcjrPg5J95ftg="; - }; - q4Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Q4Pack/trunk"; - rev = 54; - sha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; - }; - ravenPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/RavenPack/trunk"; - rev = 1; - sha256 = "sha256-bYRjCkdaznaO7+WDB6cgL3szTB+MXwt3IKH3L2rGjLs="; - }; - reactionPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/ReactionPack/trunk"; - rev = 69; - sha256 = "sha256-aXSM0ubyhgamLBzfNZ6RzRSdzKwfHWLt/6OS/i9mMVo="; - }; - sof2Pack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/Sof2Pack/trunk"; - rev = 1; - sha256 = "sha256-EnGhYghXe6hU5vvdF+Z9geTiHDukBEr1+CQgunxxGic="; - }; - tremulousPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/TremulousPack/trunk"; - rev = 46; - sha256 = "sha256-NU+ynpqydFxdZSkh7Szm6DTqyMYVS+PU70Mp98ZjdOs="; - }; - ufoaiPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/UFOAIPack/trunk"; - rev = 69; - sha256 = "sha256-nAd7fFZJJ82rDPVlTiZkkTGXi5tw7BSKk+akFBXSWvY="; - }; - warsowPack = fetchsvn { - url = "svn://svn.icculus.org/gtkradiant-gamepacks/WarsowPack/trunk"; - rev = 53; - sha256 = "sha256-IQ12fEKnq0cJxef+ddvTXcwM8lQ8nlUoMJy81XJ7ANY="; - }; - packs = runCommand "gtkradiant-packs" { } '' - mkdir -p $out - ln -s ${q3Pack} $out/Q3Pack - ln -s ${urtPack} $out/UrTPack - ln -s ${etPack} $out/ETPack - ln -s ${qlPack} $out/QLPack - ln -s ${q2Pack} $out/Q2Pack - ln -s ${quetooPack} $out/QuetooPack - ln -s ${jaPack} $out/JAPack - ln -s ${stvefPack} $out/STVEFPack - ln -s ${wolfPack} $out/WolfPack - ln -s ${unvanquishedPack} $out/UnvanquishedPack - ln -s ${q1Pack} $out/Q1Pack - ln -s ${darkPlacesPack} $out/DarkPlacesPack - ln -s ${doom3Pack} $out/Doom3Pack - ln -s ${halfLifePack} $out/HalfLifePack - ln -s ${her2Pack} $out/Her2Pack - ln -s ${jk2Pack} $out/JK2Pack - ln -s ${nexuizPack} $out/NexuizPack - ln -s ${preyPack} $out/PreyPack - ln -s ${q2wPack} $out/Q2WPack - ln -s ${q4Pack} $out/Q4Pack - ln -s ${ravenPack} $out/RavenPack - ln -s ${reactionPack} $out/ReactionPack - ln -s ${sof2Pack} $out/Sof2Pack - ln -s ${tremulousPack} $out/TermulousPack - ln -s ${ufoaiPack} $out/UFOAIPack - ln -s ${warsowPack} $out/WarsowPack - ''; - -in -stdenv.mkDerivation (finalAttrs: { - pname = "gtkradiant"; - - version = "unstable-2023-04-24"; - - src = fetchFromGitHub { - owner = "TTimo"; - repo = "GtkRadiant"; - rev = "ddbaf03d723a633d53fa442c2f802f7ad164dd6c"; - sha256 = "sha256-qI+KGx73AbM5PLFR2JDXKDbiqmU0gS/43rhjRKm/Gms="; - }; - - nativeBuildInputs = - let - python = python3.withPackages ( - ps: with ps; [ - urllib3 - ] - ); - svn = writeScriptBin "svn" '' - #!${runtimeShell} -e - if [ "$1" = checkout ]; then - # link predownloaded pack to destination - mkdir -p $(dirname $3) - ln -s ${packs}/$(basename $3) $3 - # verify existence - test -e $(readlink $3) - elif [ "$1" = update ]; then - # verify existence - test -e $(readlink $2) - else - echo "$@" - exit 1 - fi - ''; - in - [ - scons - pkg-config - python - svn - copyDesktopItems - ]; - - buildInputs = [ - glib - libxml2 - gtk2 - libGLU - gnome2.gtkglext - ]; - - enableParallelBuilding = true; - - # GCC 14 makes these errors by default - env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types -Wno-error=implicit-function-declaration -Wno-error=int-conversion -std=gnu17"; - - desktopItems = [ - (makeDesktopItem { - name = "gtkradiant"; - exec = "gtkradiant"; - desktopName = "GtkRadiant"; - comment = finalAttrs.meta.description; - categories = [ "Development" ]; - icon = "gtkradiant"; - # includes its own splash screen - startupNotify = false; - }) - ]; - - postInstall = '' - mkdir -p $out/{bin,lib} - cp -ar install $out/lib/gtkradiant - for pack in ${packs}/* ; do - name=$(basename "$pack") - if ! [ -e $out/lib/gtkradiant/installs/$name ]; then - ln -s $pack $out/lib/gtkradiant/installs/$name - fi - done - - cat >$out/bin/gtkradiant < { - return new Promise((resolve, reject) => { - let output: string -+ const coreWorkingDirectory = -+ envStore.env.os === 'linux' && envStore.env.configPath -+ ? `${envStore.env.configPath}/${CoreWorkingDirectory}` -+ : CoreWorkingDirectory - const pid = ExecBackground( -- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha), -+ coreWorkingDirectory + '/' + getKernelFileName(isAlpha), - getKernelRuntimeArgs(isAlpha), - (out) => { - output = out -@@ -263,8 +267,9 @@ - reject(output) - }, - { -- PidFile: CorePidFilePath, -+ PidFile: coreWorkingDirectory + '/pid.txt', - StopOutputKeyword: CoreStopOutputKeyword, -+ WorkingDirectory: envStore.env.configPath || envStore.env.basePath, - Env: getKernelRuntimeEnv(isAlpha), - }, - ).catch((e) => reject(e)) +@@ -271,19 +271,24 @@ + const runCoreProcess = async (isAlpha: boolean) => { + let stopped = false ++ const coreWorkingDirectory = ++ envStore.env.os === 'linux' && envStore.env.configPath ++ ? `${envStore.env.configPath}/${CoreWorkingDirectory}` ++ : CoreWorkingDirectory + const pid = await ExecBackground( +- CoreWorkingDirectory + '/' + getKernelFileName(isAlpha), ++ coreWorkingDirectory + '/' + getKernelFileName(isAlpha), + getKernelRuntimeArgs(isAlpha), + undefined, + async (end) => { + stopped = true + const logs = await ReadFile(CoreLogFilePath, { Range: '-4096' }).catch((err) => String(err)) + logs.split('\n').forEach((line) => line && logsStore.recordKernelLog(line)) + end && logsStore.recordKernelLog(end) + onCoreStopped() + }, + { +- PidFile: CorePidFilePath, + LogFile: CoreLogFilePath, ++ PidFile: coreWorkingDirectory + '/pid.txt', ++ WorkingDirectory: envStore.env.configPath || envStore.env.basePath, + Env: getKernelRuntimeEnv(isAlpha), + }, + ) diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts --- a/src/types/app.d.ts +++ b/src/types/app.d.ts @@ -63,6 +65,30 @@ diff -ruN a/src/types/app.d.ts b/src/types/app.d.ts appPath: string os: OS arch: string +diff -ruN a/src/views/PluginsView/index.vue b/src/views/PluginsView/index.vue +--- a/src/views/PluginsView/index.vue ++++ b/src/views/PluginsView/index.vue +@@ -37,7 +37,7 @@ + label: 'common.openFile', + handler: async (id: string) => { + const plugin = pluginsStore.getPluginById(id) +- await OpenURI(envStore.env.basePath + '/' + plugin!.path) ++ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${plugin!.path}`) + }, + }, + ] +diff -ruN a/src/views/RulesetsView/index.vue b/src/views/RulesetsView/index.vue +--- a/src/views/RulesetsView/index.vue ++++ b/src/views/RulesetsView/index.vue +@@ -27,7 +27,7 @@ + label: 'common.openFile', + handler: async (id: string) => { + const ruleset = rulesetsStore.getRulesetById(id) +- await OpenURI(envStore.env.basePath + '/' + ruleset!.path) ++ await OpenURI(`${envStore.env.configPath || envStore.env.basePath}/${ruleset!.path}`) + }, + }, + { diff -ruN a/src/utils/helper.ts b/src/utils/helper.ts --- a/src/utils/helper.ts +++ b/src/utils/helper.ts diff --git a/pkgs/by-name/gu/gui-for-singbox/package.nix b/pkgs/by-name/gu/gui-for-singbox/package.nix index e259f199abde..8245518cc16e 100644 --- a/pkgs/by-name/gu/gui-for-singbox/package.nix +++ b/pkgs/by-name/gu/gui-for-singbox/package.nix @@ -20,19 +20,19 @@ let pname = "gui-for-singbox"; - version = "1.23.2"; + version = "1.25.4"; src = fetchFromGitHub { owner = "GUI-for-Cores"; repo = "GUI.for.SingBox"; tag = "v${version}"; - hash = "sha256-CEJ0yzF2smBlLgZ4EH5UWV4Pc4vA2ZH80TjoudUKWZM="; + hash = "sha256-+2MdFF1iufbPJvf5XGrM9t9vaY7BNdIu/vSWgAKcbvQ="; }; metaCommon = { homepage = "https://github.com/GUI-for-Cores/GUI.for.SingBox"; hydraPlatforms = [ ]; # https://gui-for-cores.github.io/guide/#note - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ vollate ]; }; @@ -58,7 +58,7 @@ let ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-m9Rmc9Ww4jb2aQ+RXOwF71daZ6puspdMM/xidnk/YHs="; + hash = "sha256-BrDO9xdMuMnhXPAd9QvtU4R1W1WacnsVcGde+WFjvGA="; }; buildPhase = '' @@ -89,7 +89,7 @@ buildGo126Module { patches = [ ./xdg-path-and-restart-patch.patch ]; - vendorHash = "sha256-9uWrctbQ+vujb1Q8zT7Bv7rVyNY1rCM577c9caOKRNo="; + vendorHash = "sha256-Xi/EgMLex25p2tmRHEldCv6hgUKIpLJTmrMpHPGLY5M="; nativeBuildInputs = [ autoPatchelfHook diff --git a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch index f2cdd3b28229..dc1bfe5bfa32 100644 --- a/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch +++ b/pkgs/by-name/gu/gui-for-singbox/xdg-path-and-restart-patch.patch @@ -1,7 +1,7 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go --- a/bridge/bridge.go +++ b/bridge/bridge.go -@@ -50,6 +50,7 @@ +@@ -51,6 +51,7 @@ Env.BasePath = filepath.ToSlash(filepath.Dir(exePath)) Env.AppName = filepath.Base(exePath) @@ -13,7 +13,7 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go func (a *App) RestartApp() FlagResult { log.Printf("RestartApp") -- exePath := Env.BasePath + "/" + Env.AppName +- exePath := resolvePath(Env.AppName) + exePath, err := os.Executable() + if err != nil { + exePath = filepath.Join(Env.BasePath, Env.AppName) @@ -29,15 +29,6 @@ diff -ruN a/bridge/bridge.go b/bridge/bridge.go OS: Env.OS, ARCH: Env.ARCH, IsPrivileged: Env.IsPrivileged, -@@ -258,7 +263,7 @@ - } - - func loadConfig() { -- b, err := os.ReadFile(Env.BasePath + "/data/user.yaml") -+ b, err := os.ReadFile(GetPath("data/user.yaml")) - if err == nil { - yaml.Unmarshal(b, &Config) - } diff -ruN a/bridge/types.go b/bridge/types.go --- a/bridge/types.go +++ b/bridge/types.go @@ -52,9 +43,8 @@ diff -ruN a/bridge/types.go b/bridge/types.go diff -ruN a/bridge/utils.go b/bridge/utils.go --- a/bridge/utils.go +++ b/bridge/utils.go -@@ -13,7 +13,29 @@ - "golang.org/x/text/encoding/simplifiedchinese" - ) +@@ -23,7 +23,29 @@ + var requestTransportCache sync.Map +func GetConfigPath() string { + if Env.OS == "linux" { @@ -69,7 +59,7 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go + return Env.BasePath +} + - func GetPath(path string) string { + func resolvePath(path string) string { + if Env.OS == "linux" && !filepath.IsAbs(path) { + cleanPath := filepath.ToSlash(filepath.Clean(path)) + if cleanPath == "data" { @@ -82,3 +72,4 @@ diff -ruN a/bridge/utils.go b/bridge/utils.go if !filepath.IsAbs(path) { path = filepath.Join(Env.BasePath, path) } + return filepath.ToSlash(filepath.Clean(path)) diff --git a/pkgs/by-name/gu/guile-hoot/package.nix b/pkgs/by-name/gu/guile-hoot/package.nix index 6849a75af93a..db9bdb42a57b 100644 --- a/pkgs/by-name/gu/guile-hoot/package.nix +++ b/pkgs/by-name/gu/guile-hoot/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "guile-hoot"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromCodeberg { owner = "spritely"; repo = "hoot"; tag = "v${finalAttrs.version}"; - hash = "sha256-b372dMUsDTa+hYrOwvj+/YcwVP52BCJxwSGRaqSSWZs="; + hash = "sha256-ZzWGdLKiJF9lBKrlX7jCKnPlmWRi1dDB4zrfkIOMpQU="; }; nativeBuildInputs = [ @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { libs = [ "$out" ] ++ finalAttrs.propagatedBuildInputs; in '' - cp ./repl/repl.js $out/share/guile-hoot/0.8.0/repl/repl.js + cp ./repl/repl.js $out/share/guile-hoot/${finalAttrs.version}/repl/repl.js wrapProgram $out/bin/hoot \ --prefix GUILE_LOAD_PATH : ${lib.makeSearchPath guile.siteDir libs} \ --prefix GUILE_LOAD_COMPILED_PATH : ${lib.makeSearchPath guile.siteCcacheDir libs} @@ -62,7 +62,10 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Scheme to WebAssembly compiler backend for GNU Guile and a general purpose WASM toolchain"; homepage = "https://codeberg.org/spritely/hoot"; - license = lib.licenses.asl20; + license = with lib.licenses; [ + asl20 + lgpl3Plus + ]; maintainers = with lib.maintainers; [ jinser ]; platforms = lib.platforms.unix; mainProgram = "hoot"; diff --git a/pkgs/by-name/gu/guilt/package.nix b/pkgs/by-name/gu/guilt/package.nix index 53d4e1249f9d..d3c0688368fd 100644 --- a/pkgs/by-name/gu/guilt/package.nix +++ b/pkgs/by-name/gu/guilt/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/jeffpc/guilt"; maintainers = with lib.maintainers; [ javimerino ]; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; platforms = lib.platforms.all; mainProgram = "guilt"; }; diff --git a/pkgs/by-name/gu/gupnp-av/package.nix b/pkgs/by-name/gu/gupnp-av/package.nix index 9ab6982ea828..22422a67b388 100644 --- a/pkgs/by-name/gu/gupnp-av/package.nix +++ b/pkgs/by-name/gu/gupnp-av/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gupnp-av"; - version = "0.14.4"; + version = "0.14.5"; outputs = [ "out" @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gupnp-av/${lib.versions.majorMinor finalAttrs.version}/gupnp-av-${finalAttrs.version}.tar.xz"; - sha256 = "Idl0sydctdz1uKodmj/IDn7cpwaTX2+9AEx5eHE4+Mc="; + sha256 = "k5GPz1r1Kf2ls9LZ/Dt3zZPfiAZJObgvJJ9Vd9jeHAI="; }; strictDeps = true; diff --git a/pkgs/by-name/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch b/pkgs/by-name/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch deleted file mode 100644 index 46a2dae382d2..000000000000 --- a/pkgs/by-name/gu/gupnp/0001-pkg-config-Declare-header-dependencies-as-public.patch +++ /dev/null @@ -1,55 +0,0 @@ -From a3461f69222ef23b2edd411c5fc8daefea556a2c Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Wed, 20 Oct 2021 20:55:29 +0200 -Subject: [PATCH] pkg-config: Declare header dependencies as public -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The headers include libsoup and libxml2 headers but those libraries are only -listed in Requires.private. This does not matter for upstream pkg-config -because it uses Cflags from libraries in Requires.private as well but as our -pkg-config is patched to only use Requires.private for static linking. - -Let’s add libsoup-2.4 and libxml-2.0 to Requires rather than Requires.private -to make the reverse dependencies correctly find their headers. ---- - libgupnp/meson.build | 2 +- - meson.build | 3 ++- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/libgupnp/meson.build b/libgupnp/meson.build -index cb8a102..5fda9d8 100644 ---- a/libgupnp/meson.build -+++ b/libgupnp/meson.build -@@ -129,7 +129,7 @@ pkg.generate( - libgupnp, - subdirs: 'gupnp-1.2', - name : 'gupnp-1.2', -- requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2'], -+ requires : ['glib-2.0', 'gio-2.0', 'gssdp-1.2', 'libsoup-2.4 >= ' + libsoup_version, 'libxml-2.0'], - description : 'GObject-based UPnP library', - version : meson.project_version(), - filebase : 'gupnp-1.2' -diff --git a/meson.build b/meson.build -index 3790bcf..c96a983 100644 ---- a/meson.build -+++ b/meson.build -@@ -25,12 +25,13 @@ gssdp_dep = dependency('gssdp-1.2', version : '>= 1.3.0', default_options: ['sni - - gio_unix = dependency('gio-unix-2.0', version: '>= 2.44', required: host_machine.system() != 'windows') - -+libsoup_version = '2.48.0' - dependencies = [ - dependency('glib-2.0', version : '>= ' + glib_version), - dependency('gio-2.0', version : '>= ' + glib_version), - dependency('gmodule-2.0', version : '>= ' + glib_version), - dependency('gobject-2.0', version : '>= ' + glib_version), -- dependency('libsoup-2.4', version : '>= 2.48.0'), -+ dependency('libsoup-2.4', version : '>= ' + libsoup_version), - gssdp_dep, - dependency('libxml-2.0'), - ] --- -2.33.0 - diff --git a/pkgs/by-name/gu/gupnp/package.nix b/pkgs/by-name/gu/gupnp/package.nix deleted file mode 100644 index 74d70e05e5f8..000000000000 --- a/pkgs/by-name/gu/gupnp/package.nix +++ /dev/null @@ -1,107 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - fetchpatch2, - meson, - ninja, - pkg-config, - gobject-introspection, - vala, - gtk-doc, - docbook_xsl, - docbook_xml_dtd_412, - docbook_xml_dtd_45, - glib, - gssdp, - libsoup_2_4, - libxml2, - libuuid, - gnome, -}: - -stdenv.mkDerivation rec { - pname = "gupnp"; - version = "1.4.4"; - - outputs = [ - "out" - "dev" - ] - ++ lib.optionals (stdenv.buildPlatform == stdenv.hostPlatform) [ "devdoc" ]; - - src = fetchurl { - url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-N2GxXLBjYh+Efz7/t9djfwMXUA/Ka9oeGQT3OSF1Ch8="; - }; - - patches = [ - # Bring .pc file in line with our patched pkg-config. - ./0001-pkg-config-Declare-header-dependencies-as-public.patch - - # Unbreak build with Meson 1.2.0 - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/33 - (fetchpatch2 { - name = "meson-1.2-fix.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/85c0244cfbf933d3e90d50ab68394c68d86f9ed5.patch"; - hash = "sha256-poDhkEgDTpgGnTbbZLPwx8Alf0h81vmzJyx3izWmDGw="; - }) - - # Fix build against libxml2 2.11 - # https://gitlab.gnome.org/GNOME/gupnp/-/merge_requests/34 - (fetchpatch2 { - name = "libxml2-2.11-fix.patch"; - url = "https://gitlab.gnome.org/GNOME/gupnp/-/commit/bc56f02b0f89e96f2bd74af811903d9931965f58.patch"; - hash = "sha256-KCHlq7Es+WLIWKgIgGVTaHarVQIiZPEi5r6nMAhXTgY="; - }) - ]; - - depsBuildBuild = [ - pkg-config - ]; - - nativeBuildInputs = [ - meson - ninja - pkg-config - gobject-introspection - vala - gtk-doc - docbook_xsl - docbook_xml_dtd_412 - docbook_xml_dtd_45 - ]; - - buildInputs = [ - libuuid - ]; - - propagatedBuildInputs = [ - glib - gssdp - libsoup_2_4 - libxml2 - ]; - - mesonFlags = [ - "-Dgtk_doc=${lib.boolToString (stdenv.buildPlatform == stdenv.hostPlatform)}" - ]; - - # Bail out! ERROR:../tests/test-bugs.c:168:test_on_timeout: code should not be reached - doCheck = !stdenv.hostPlatform.isDarwin; - - passthru = { - updateScript = gnome.updateScript { - packageName = "gupnp"; - freeze = true; - }; - }; - - meta = { - homepage = "http://www.gupnp.org/"; - description = "Implementation of the UPnP specification"; - mainProgram = "gupnp-binding-tool-1.2"; - license = lib.licenses.lgpl2Plus; - platforms = lib.platforms.unix; - }; -} diff --git a/pkgs/by-name/gu/gupnp_1_6/package.nix b/pkgs/by-name/gu/gupnp_1_6/package.nix index f9c9c50a629c..357eff882818 100644 --- a/pkgs/by-name/gu/gupnp_1_6/package.nix +++ b/pkgs/by-name/gu/gupnp_1_6/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "gupnp"; - version = "1.6.9"; + version = "1.6.10"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/gupnp/${lib.versions.majorMinor finalAttrs.version}/gupnp-${finalAttrs.version}.tar.xz"; - hash = "sha256-Lttu42E1WOYvU4c1NoruJxUbfgnU4uLFFgaDPagBhps="; + hash = "sha256-oe4Ht7Emc8Mtf8c8oVilDBpNxpqzW2XpTSTTish1NF4="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/gv/gvfs/package.nix b/pkgs/by-name/gv/gvfs/package.nix index cc87126e8e35..0310a8c5e75a 100644 --- a/pkgs/by-name/gv/gvfs/package.nix +++ b/pkgs/by-name/gv/gvfs/package.nix @@ -46,11 +46,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvfs"; - version = "1.60.0"; + version = "1.60.1"; src = fetchurl { url = "mirror://gnome/sources/gvfs/${lib.versions.majorMinor finalAttrs.version}/gvfs-${finalAttrs.version}.tar.xz"; - hash = "sha256-ZIJz8GnpLH48ATuSFI6CyQHwgETis7FMbPvVImn2tkY="; + hash = "sha256-kOq6Mzq30xp/3q3kWVSlE8NmHM672aE4qrP7SB37nkA="; }; patches = [ diff --git a/pkgs/by-name/gv/gvm-libs/package.nix b/pkgs/by-name/gv/gvm-libs/package.nix index 573ede04d9a9..37cd7366e632 100644 --- a/pkgs/by-name/gv/gvm-libs/package.nix +++ b/pkgs/by-name/gv/gvm-libs/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gvm-libs"; - version = "23.2.2"; + version = "23.9.0"; src = fetchFromGitHub { owner = "greenbone"; repo = "gvm-libs"; tag = "v${finalAttrs.version}"; - hash = "sha256-lXvivYyo4o9Ng7AG9/VdRAgfzGo5ow/n5dIL+RPYTMU="; + hash = "sha256-oGV4Brb+LgxiflzAvv7HqQ0p9+Whe2J6du9wBKAkr5Q="; }; postPatch = '' diff --git a/pkgs/by-name/gv/gvolicon/package.nix b/pkgs/by-name/gv/gvolicon/package.nix index f354ded00128..e901fe06216a 100644 --- a/pkgs/by-name/gv/gvolicon/package.nix +++ b/pkgs/by-name/gv/gvolicon/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { version = "0-unstable-2014-04-28"; src = fetchFromGitHub { - owner = "Unia"; + owner = "Hjdskes"; repo = "gvolicon"; rev = "0d65a396ba11f519d5785c37fec3e9a816217a07"; sha256 = "sha256-lm5OfryV1/1T1RgsVDdp0Jg5rh8AND8M3ighfrznKes="; @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Simple and lightweight volume icon that sits in your system tray"; - homepage = "https://github.com/Unia/gvolicon"; + homepage = "https://github.com/Hjdskes/gvolicon"; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.bennofs ]; diff --git a/pkgs/by-name/gw/gwe/package.nix b/pkgs/by-name/gw/gwe/package.nix index 848df337bc3d..4b8640e6e163 100644 --- a/pkgs/by-name/gw/gwe/package.nix +++ b/pkgs/by-name/gw/gwe/package.nix @@ -25,7 +25,7 @@ let peewee pynvml pygobject3 - xlib + python-xlib pyxdg requests rx diff --git a/pkgs/by-name/gw/gwq/package.nix b/pkgs/by-name/gw/gwq/package.nix new file mode 100644 index 000000000000..9ad31c002b9d --- /dev/null +++ b/pkgs/by-name/gw/gwq/package.nix @@ -0,0 +1,77 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + gitMinimal, + installShellFiles, + makeWrapper, + tmux, + writableTmpDirAsHomeHook, + versionCheckHook, + stdenv, +}: + +buildGoModule (finalAttrs: { + pname = "gwq"; + version = "0.1.1"; + + src = fetchFromGitHub { + owner = "d-kuro"; + repo = "gwq"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MfCYFbODWnfPxx+6sLlcMT6tqghgILHB13+ccYqVjBA="; + }; + + vendorHash = "sha256-4K01Xf1EXl/NVX1loQ76l1bW8QglBAQdvlZSo7J4NPI="; + + subPackages = [ "cmd/gwq" ]; + + __structuredAttrs = true; + + ldflags = [ + "-s" + "-w" + "-X github.com/d-kuro/gwq/internal/cmd.version=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ + installShellFiles + makeWrapper + ]; + + nativeCheckInputs = [ + writableTmpDirAsHomeHook + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + + postInstall = '' + wrapProgram $out/bin/gwq \ + --prefix PATH : ${ + lib.makeBinPath [ + gitMinimal + tmux + ] + } + '' + + lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd gwq \ + --bash <($out/bin/gwq completion bash) \ + --fish <($out/bin/gwq completion fish) \ + --zsh <($out/bin/gwq completion zsh) + ''; + + doInstallCheck = true; + + meta = { + description = "Git worktree manager with fuzzy finder interface"; + homepage = "https://github.com/d-kuro/gwq"; + changelog = "https://github.com/d-kuro/gwq/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + mainProgram = "gwq"; + maintainers = with lib.maintainers; [ ojii3 ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/gy/gyroflow-bin/package.nix b/pkgs/by-name/gy/gyroflow-bin/package.nix new file mode 100644 index 000000000000..5b4736bb35ad --- /dev/null +++ b/pkgs/by-name/gy/gyroflow-bin/package.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, + makeWrapper, + gyroflow, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gyroflow-bin"; + version = "1.6.3"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/gyroflow/gyroflow/releases/download/v${finalAttrs.version}/Gyroflow-mac-universal.dmg"; + hash = "sha256-++Jnk8Y58UENiZXeutGIchWHEIy2p0Ik6Hn3nku4ocA="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + _7zz + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/Applications + cp -r "Gyroflow v${finalAttrs.version}/Gyroflow.app" $out/Applications/ + + makeWrapper $out/Applications/Gyroflow.app/Contents/MacOS/gyroflow $out/bin/gyroflow + + runHook postInstall + ''; + + meta = gyroflow.meta // { + description = "Advanced gyro-based video stabilization tool (pre-built macOS binary)"; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "gyroflow"; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; + + passthru.updateScript = nix-update-script { }; +}) diff --git a/pkgs/by-name/gz/gz-cmake/package.nix b/pkgs/by-name/gz/gz-cmake/package.nix index 34d9fefd9806..40210a44177b 100644 --- a/pkgs/by-name/gz/gz-cmake/package.nix +++ b/pkgs/by-name/gz/gz-cmake/package.nix @@ -45,8 +45,8 @@ stdenv.mkDerivation (finalAttrs: { doBuildExamples = false; cmakeFlags = [ - (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.doCheck) - (lib.cmakeBool "BUILD_TESTING" finalAttrs.doCheck) + (lib.cmakeBool "BUILDSYSTEM_TESTING" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "BUILD_EXAMPLES" finalAttrs.doBuildExamples) ]; diff --git a/pkgs/by-name/gz/gzdoom/package.nix b/pkgs/by-name/gz/gzdoom/package.nix index d91f7c34de20..0810619e2a17 100644 --- a/pkgs/by-name/gz/gzdoom/package.nix +++ b/pkgs/by-name/gz/gzdoom/package.nix @@ -120,7 +120,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.gpl3Plus; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ - azahi lassulus Gliczy r4v3n6101 diff --git a/pkgs/by-name/gz/gzrt/package.nix b/pkgs/by-name/gz/gzrt/package.nix index 034f340604b5..02a2a716673e 100644 --- a/pkgs/by-name/gz/gzrt/package.nix +++ b/pkgs/by-name/gz/gzrt/package.nix @@ -1,17 +1,19 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, zlib, }: stdenv.mkDerivation (finalAttrs: { pname = "gzrt"; - version = "0.8"; + version = "0.9.1"; - src = fetchurl { - url = "https://www.urbanophile.com/arenn/coding/gzrt/gzrt-${finalAttrs.version}.tar.gz"; - sha256 = "1vhzazj47xfpbfhzkwalz27cc0n5gazddmj3kynhk0yxv99xrdxh"; + src = fetchFromGitHub { + owner = "arenn"; + repo = "gzrt"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2RzQ/xrtADplVqUeB6suU3fKhJePYM7EkuIV59JSR3Q="; }; buildInputs = [ zlib ]; @@ -22,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://www.urbanophile.com/arenn/hacking/gzrt/"; + homepage = "https://github.com/arenn/gzrt"; description = "Gzip Recovery Toolkit"; maintainers = [ ]; mainProgram = "gzrecover"; diff --git a/pkgs/by-name/h2/h2/package.nix b/pkgs/by-name/h2/h2/package.nix index 32684fe191d6..e213425d32cc 100644 --- a/pkgs/by-name/h2/h2/package.nix +++ b/pkgs/by-name/h2/h2/package.nix @@ -24,7 +24,7 @@ maven.buildMavenPackage (finalAttrs: { }; mvnParameters = "-f h2/pom.xml"; - mvnHash = "sha256-ue1X0fswi3C9uqJ/cVCf/qd2XStMve1k1qA+IsREOGk="; + mvnHash = "sha256-j4Uso/bl4UhQbJc7Wre0btgC+9RKvuCHkn9euQFuTxk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/h2/h2o/package.nix b/pkgs/by-name/h2/h2o/package.nix index 7f39a6e685de..50191ac86634 100644 --- a/pkgs/by-name/h2/h2o/package.nix +++ b/pkgs/by-name/h2/h2o/package.nix @@ -4,33 +4,36 @@ fetchFromGitHub, pkg-config, cmake, - makeWrapper, + makeBinaryWrapper, ninja, perl, perlPackages, - brotli, openssl, libcap, libuv, wslay, zlib, + withBrotli ? true, + brotli, withMruby ? true, bison, ruby, withUring ? stdenv.hostPlatform.isLinux, liburing, + withZstandard ? true, + zstd, nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "h2o"; - version = "2.3.0-rolling-2026-06-04"; + version = "2.3.0-rolling-2026-06-29"; src = fetchFromGitHub { owner = "h2o"; repo = "h2o"; - rev = "cd4703768c56d45b1384880ba9f73961140d084f"; - hash = "sha256-EbpLS9Y733BszHSlvogPKTJY8p7hfVl+KF/OSwO8UZs="; + rev = "edd7a120bfc4af11ac0cbebce2a43cc1f93f9af1"; + hash = "sha256-WQy+v4zpwzgbMxT43+Nd33+YPynyZIwqzVTaknqjCmE="; }; outputs = [ @@ -43,15 +46,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config cmake - makeWrapper + makeBinaryWrapper ninja perlPackages.JSON ] + ++ lib.optional withBrotli brotli ++ lib.optionals withMruby [ bison ruby ] - ++ lib.optional withUring liburing; + ++ lib.optional withUring liburing + ++ lib.optional withZstandard zstd; buildInputs = [ brotli @@ -61,10 +66,14 @@ stdenv.mkDerivation (finalAttrs: { perl zlib wslay - ]; + ] + ++ lib.optional withBrotli brotli + ++ lib.optional withZstandard zstd; cmakeFlags = [ + "-DWITH_BROTLI=${if withBrotli then "ON" else "OFF"}" "-DWITH_MRUBY=${if withMruby then "ON" else "OFF"}" + "-DWITH_ZSTD=${if withZstandard then "ON" else "OFF"}" ]; postInstall = '' diff --git a/pkgs/by-name/ha/ha-mcp/package.nix b/pkgs/by-name/ha/ha-mcp/package.nix index 0335da534872..a8f23eb812a0 100644 --- a/pkgs/by-name/ha/ha-mcp/package.nix +++ b/pkgs/by-name/ha/ha-mcp/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "ha-mcp"; - version = "7.7.0"; + version = "7.8.0"; pyproject = true; src = fetchFromGitHub { owner = "homeassistant-ai"; repo = "ha-mcp"; tag = "v${finalAttrs.version}"; - hash = "sha256-Gp4C3SRNkgv9GfLkVx/VCMp4/kCORHsp87IHcCaCPKk="; + hash = "sha256-+HhtHeSQlK1jd/4/x1d54Etvrs8e+pQkIGvJV39ZZBw="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ha/hackernews-tui/package.nix b/pkgs/by-name/ha/hackernews-tui/package.nix new file mode 100644 index 000000000000..2ea3d0a12463 --- /dev/null +++ b/pkgs/by-name/ha/hackernews-tui/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hackernews-tui"; + version = "0.13.5"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "aome510"; + repo = "hackernews-TUI"; + tag = "v${finalAttrs.version}"; + hash = "sha256-p2MhVM+dbNiWlhvlSKdwXE37dKEaE2JCmT1Ari3b0WI="; + }; + + cargoHash = "sha256-KuqAyuU/LOFwvvfplHqq56Df4Dkr5PkUK1Fgeaq1REs="; + + meta = { + description = "A Terminal UI to browse Hacker News"; + homepage = "https://github.com/aome510/hackernews-TUI"; + changelog = "https://github.com/aome510/hackernews-TUI/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ paepcke ]; + mainProgram = "hackernews-tui"; + }; +}) diff --git a/pkgs/by-name/ha/hackertyper/package.nix b/pkgs/by-name/ha/hackertyper/package.nix index abcae45d8de7..3c61caf06713 100644 --- a/pkgs/by-name/ha/hackertyper/package.nix +++ b/pkgs/by-name/ha/hackertyper/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { version = "2.1"; src = fetchFromGitHub { - owner = "Hurricane996"; + owner = "hyasynthesized"; repo = "Hackertyper"; rev = "8d08e3200c65817bd8c5bd0baa5032919315853b"; sha256 = "0shri0srihw9fk027k61qkxr9ikwkn28aaamrhps6lg0vpbqpx2w"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { meta = { description = "C rewrite of hackertyper.net"; - homepage = "https://github.com/Hurricane996/Hackertyper"; + homepage = "https://github.com/hyasynthesized/Hackertyper"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.marius851000 ]; mainProgram = "hackertyper"; diff --git a/pkgs/by-name/ha/hacksguard/package.nix b/pkgs/by-name/ha/hacksguard/package.nix new file mode 100644 index 000000000000..06b11fa8d32e --- /dev/null +++ b/pkgs/by-name/ha/hacksguard/package.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + nix-update-script, + pkg-config, + rustPlatform, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hacksguard"; + version = "0.3"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "Rhacknarok"; + repo = "hacksguard"; + tag = finalAttrs.version; + hash = "sha256-3HD6FFZBJ7x5uDy0UEwQVaxpuNt4O2wmJgMspeFF6iQ="; + }; + + cargoHash = "sha256-LLAPbXz8QAEUGs+37ZIFVNW1WfCVQbROfI7wQFaiy3E="; + + nativeBuildInputs = [ pkg-config ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Multi-threaded TUI malware analysis tool"; + homepage = "https://github.com/Rhacknarok/hacksguard"; + changelog = "https://github.com/Rhacknarok/hacksguard/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "hacksguard"; + }; +}) diff --git a/pkgs/by-name/ha/hacompanion/package.nix b/pkgs/by-name/ha/hacompanion/package.nix index e381c07c3c8e..33a2daa389b3 100644 --- a/pkgs/by-name/ha/hacompanion/package.nix +++ b/pkgs/by-name/ha/hacompanion/package.nix @@ -7,13 +7,13 @@ buildGoModule (finalAttrs: { pname = "hacompanion"; - version = "1.0.30"; + version = "1.1.0"; src = fetchFromGitHub { owner = "tobias-kuendig"; repo = "hacompanion"; rev = "v${finalAttrs.version}"; - hash = "sha256-TC1ZnYT5WGbKP2Y2pOKaLj8Hmr3lU+LShkNV2DpcyDk="; + hash = "sha256-WwzfRsRfDMiK7V9XH/G86+illsbQdTw+MEXNmW5MLLg="; }; vendorHash = "sha256-SohjueM0DwSuh7XVClYiWA/5d0V6x2vmp5aPxgmIJYY="; diff --git a/pkgs/by-name/ha/halfempty/package.nix b/pkgs/by-name/ha/halfempty/package.nix index f0550d84e6f9..b8307f554b38 100644 --- a/pkgs/by-name/ha/halfempty/package.nix +++ b/pkgs/by-name/ha/halfempty/package.nix @@ -55,7 +55,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "halfempty"; homepage = "https://github.com/googleprojectzero/halfempty/"; maintainers = with lib.maintainers; [ fpletz ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ha/halloy/package.nix b/pkgs/by-name/ha/halloy/package.nix index 3ac327c34c34..801d6b1cf473 100644 --- a/pkgs/by-name/ha/halloy/package.nix +++ b/pkgs/by-name/ha/halloy/package.nix @@ -21,16 +21,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "halloy"; - version = "2026.7.1"; + version = "2026.7.2"; src = fetchFromGitHub { owner = "squidowl"; repo = "halloy"; tag = finalAttrs.version; - hash = "sha256-AFDx4gmYWUMcvpJi+/2xd0s4gAygwss2XrmCFsd6uKs="; + hash = "sha256-+qFHwlwRxVN4W9DG+gY5N6um+JARD+3EiLlsD7R9Tpc="; }; - cargoHash = "sha256-hrYWF5WNhLqKMFJJlir7tumxNZqgGm+gK+RI1iDPatM="; + cargoHash = "sha256-/nFtOJXpusIlc7orGv013qzad8fdfQr32c8DAlccHIA="; nativeBuildInputs = [ copyDesktopItems diff --git a/pkgs/by-name/ha/halo/package.nix b/pkgs/by-name/ha/halo/package.nix index 5637cf73031e..ce9d4cc4ef5e 100644 --- a/pkgs/by-name/ha/halo/package.nix +++ b/pkgs/by-name/ha/halo/package.nix @@ -8,10 +8,10 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "halo"; - version = "2.24.2"; + version = "2.25.4"; src = fetchurl { url = "https://github.com/halo-dev/halo/releases/download/v${finalAttrs.version}/halo-${finalAttrs.version}.jar"; - hash = "sha256-ONaSclpfNQtuSllndIylm759NUcfKL7dYTQYVj4jSjs="; + hash = "sha256-U3dWxAb/AT2zTUejdACT7SzRy97fWz2jTKgBfeYaoE4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hamlib_4/package.nix b/pkgs/by-name/ha/hamlib_4/package.nix index 1eade7399d8e..002afe022247 100644 --- a/pkgs/by-name/ha/hamlib_4/package.nix +++ b/pkgs/by-name/ha/hamlib_4/package.nix @@ -1,9 +1,10 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, perl, swig, + autoreconfHook, gd, ncurses, python311, @@ -23,11 +24,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hamlib"; - version = "4.6.2"; + version = "4.7.1"; - src = fetchurl { - url = "mirror://sourceforge/hamlib/hamlib-${finalAttrs.version}.tar.gz"; - hash = "sha256-sqxz9E3RFh6V/e5slSdhRHV2R7+S1/2zae4v5B7Ueug="; + src = fetchFromGitHub { + owner = "Hamlib"; + repo = "Hamlib"; + tag = finalAttrs.version; + hash = "sha256-nI8gDACxlci2Q9V2W4D1DYDUL74JwlCs+qyyNkXOPu4="; }; strictDeps = true; @@ -36,6 +39,7 @@ stdenv.mkDerivation (finalAttrs: { swig pkg-config libtool + autoreconfHook ] ++ lib.optionals pythonBindings [ python3 ] ++ lib.optionals tclBindings [ tcl ] @@ -78,7 +82,10 @@ stdenv.mkDerivation (finalAttrs: { lgpl2Plus ]; homepage = "https://hamlib.sourceforge.net"; - maintainers = with lib.maintainers; [ relrod ]; + maintainers = with lib.maintainers; [ + relrod + fstracke + ]; platforms = with lib.platforms; unix; }; }) diff --git a/pkgs/by-name/ha/hamrs-pro/package.nix b/pkgs/by-name/ha/hamrs-pro/package.nix index d13f584425ce..743efa9d5159 100644 --- a/pkgs/by-name/ha/hamrs-pro/package.nix +++ b/pkgs/by-name/ha/hamrs-pro/package.nix @@ -22,12 +22,6 @@ let url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-linux-arm64.AppImage"; hash = "sha256-5WUQBFyvMHZyyIH2aImCRUYdzou8BadaH/M4+5DeQdo="; }; - - x86_64-darwin = fetchurl { - url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-x64.dmg"; - hash = "sha256-BboXYdKT10+SBGhlxW5t1zPZ+0BMC1gUjwTlkQU+/Bk="; - }; - aarch64-darwin = fetchurl { url = "https://hamrs-dist.s3.amazonaws.com/hamrs-pro-${version}-mac-arm64.dmg"; hash = "sha256-/9UamFxEJ9NkswgsI8mcfher9nFpVt5Vk0QYFpRXRB4="; @@ -51,7 +45,6 @@ let "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; diff --git a/pkgs/by-name/ha/hamrs-pro/update.sh b/pkgs/by-name/ha/hamrs-pro/update.sh index 7913ced30cbb..a12439b3a10e 100755 --- a/pkgs/by-name/ha/hamrs-pro/update.sh +++ b/pkgs/by-name/ha/hamrs-pro/update.sh @@ -17,7 +17,6 @@ update-source-version hamrs-pro $latestVersion || true for system in \ x86_64-linux \ aarch64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import ./. {}; hamrs-pro.src.url" --system "$system" | tr -d '"'))) update-source-version hamrs-pro $latestVersion $hash --system=$system --ignore-same-version diff --git a/pkgs/by-name/ha/hamrs/darwin.nix b/pkgs/by-name/ha/hamrs/darwin.nix index fd8f413ba6d8..69e1c40da6fd 100644 --- a/pkgs/by-name/ha/hamrs/darwin.nix +++ b/pkgs/by-name/ha/hamrs/darwin.nix @@ -12,19 +12,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { inherit pname version; - src = - if stdenvNoCC.hostPlatform.isAarch64 then - (fetchurl { - url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg"; - hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc="; - }) - else - (fetchurl { - url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}-intel.dmg"; - hash = "sha256-bgWeIARE3gO5FA9MqidfXo1Wdn5wDUa/RNzZBxSKloM="; - }); + src = fetchurl { + url = "https://hamrs-releases.s3.us-east-2.amazonaws.com/${finalAttrs.version}/HAMRS-${finalAttrs.version}.dmg"; + hash = "sha256-IQ7r2OLwJW4auiNDddzZ99jXxrtPw3uYoGIUEHU1gtc="; + }; - nativeBuildInputs = if stdenvNoCC.hostPlatform.isAarch64 then [ _7zz ] else [ undmg ]; + nativeBuildInputs = [ _7zz ]; sourceRoot = "."; diff --git a/pkgs/by-name/ha/hamrs/package.nix b/pkgs/by-name/ha/hamrs/package.nix index f5efef779242..197c41291142 100644 --- a/pkgs/by-name/ha/hamrs/package.nix +++ b/pkgs/by-name/ha/hamrs/package.nix @@ -21,7 +21,6 @@ let "x86_64-linux" "i686-linux" "aarch64-darwin" - "x86_64-darwin" ]; mainProgram = "hamrs"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ha/handbrake/package.nix b/pkgs/by-name/ha/handbrake/package.nix index ce91685cf0b2..fadb57ec8242 100644 --- a/pkgs/by-name/ha/handbrake/package.nix +++ b/pkgs/by-name/ha/handbrake/package.nix @@ -10,7 +10,10 @@ { stdenv, lib, + applyPatches, fetchFromGitHub, + fetchFromGitLab, + fetchpatch2, # For tests testers, runCommand, @@ -26,7 +29,7 @@ numactl, writeText, # Processing, video codecs, containers - ffmpeg_7-full, + ffmpeg_8-full, nv-codec-headers, libogg, x264, @@ -85,14 +88,38 @@ }: let - version = "1.10.2"; + version = "1.11.2"; - src = fetchFromGitHub { - owner = "HandBrake"; - repo = "HandBrake"; - # uses version commit for logic in version.txt - rev = "dddf75f756e56d2b8dbb0609175bc12047a4841d"; - hash = "sha256-CIMpJDJ0IIz95f3/zxeQqpCFpHWEmdgA+VaaUDY516A="; + src = applyPatches { + src = fetchFromGitHub { + owner = "HandBrake"; + repo = "HandBrake"; + # uses version commit for logic in version.txt + rev = "9eb6c936803e8b071035b1a77662cb0db58441ea"; + hash = "sha256-f4kBFeW1yVFLlXGAimWsZx+9PKlgR6xrXUZG+CBh28A="; + }; + + patches = [ + # Update x265 submodule to v4.2, drop in next release + (fetchpatch2 { + url = "https://github.com/HandBrake/HandBrake/commit/432514bf839e7280511e4a7afc35fb4868ef4d0b.patch"; + excludes = [ + "contrib/x265/module.defs" + "contrib/x265_8bit/module.defs" + "contrib/x265_10bit/module.defs" + "contrib/x265_12bit/module.defs" + ]; + hash = "sha256-xwIY1pO9mKbrQFjQCENuvntIoiZTHeUVg8axrl3zxxo="; + }) + # Update ffmpeg to v8.1.2, drop if backported + (fetchpatch2 { + url = "https://github.com/HandBrake/HandBrake/commit/02b704c5cf2e73d227fbb5be151501b232b0e5f2.patch?full_index=1"; + excludes = [ + "contrib/ffmpeg/module.defs" + ]; + hash = "sha256-fSfLXH+aRwVv9BrDT1oNBHD2VUbAnN3jVu3CJeoaAKg="; + }) + ]; }; # Handbrake maintains a set of ffmpeg patches. In particular, these @@ -100,70 +127,68 @@ let # https://github.com/HandBrake/HandBrake/issues/4029 # base ffmpeg version is specified in: # https://github.com/HandBrake/HandBrake/blob/master/contrib/ffmpeg/module.defs - ffmpeg-version = "7.1.1"; - ffmpeg-hb = - (ffmpeg_7-full.override { - version = ffmpeg-version; - hash = "sha256-GyS8imOqfOUPxXrzCiQtzCQIIH6bvWmQAB0fKUcRsW4="; - }).overrideAttrs - (old: { - patches = (old.patches or [ ]) ++ [ - "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" - "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" - "${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch" - "${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch" - "${src}/contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch" - "${src}/contrib/ffmpeg/A06-dvdsubdec-fix-processing-of-partial-packets.patch" - "${src}/contrib/ffmpeg/A07-dvdsubdec-return-number-of-bytes-used.patch" - "${src}/contrib/ffmpeg/A08-dvdsubdec-use-pts-of-initial-packet.patch" - "${src}/contrib/ffmpeg/A09-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch" - "${src}/contrib/ffmpeg/A10-ccaption_dec-fix-pts-in-real_time-mode.patch" - "${src}/contrib/ffmpeg/A11-avformat-matroskaenc-return-error-if-aac-extradata-c.patch" - "${src}/contrib/ffmpeg/A12-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch" - - # patch to fix - # commented out because it causes ffmpeg's filter-pixdesc-p010le test to fail. - # "${src}/contrib/ffmpeg/A13-libswscale-fix-yuv420p-to-p01xle-color-conversion-bu.patch" - - "${src}/contrib/ffmpeg/A14-hevc_mp4toannexb.c-fix-qsv-decode-of-10bit-hdr.patch" - "${src}/contrib/ffmpeg/A15-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch" - "${src}/contrib/ffmpeg/A16-avcodec-amfenc-Add-support-for-on-demand-key-frames.patch" - "${src}/contrib/ffmpeg/A17-avcodec-amfenc-properly-set-primaries-transfer-and-m.patch" - "${src}/contrib/ffmpeg/A18-libavcodec-qsvenc-update-has_b_frames-value.patch" - "${src}/contrib/ffmpeg/A19-libavcodec-qsv-enable-av1-scc.patch" - "${src}/contrib/ffmpeg/A20-Revert-avcodec-amfenc-GPU-driver-version-check.patch" - "${src}/contrib/ffmpeg/A21-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch" - "${src}/contrib/ffmpeg/A22-avformat-mov-read-and-write-additional-iTunes-style-.patch" - "${src}/contrib/ffmpeg/A23-avformat-movenc-write-iTunEXTC-and-iTunMOVI-metadata.patch" - "${src}/contrib/ffmpeg/A24-AV1-videotoolbox.patch" - "${src}/contrib/ffmpeg/A25-videotoolbox-speedup-decoding.patch" - "${src}/contrib/ffmpeg/A28-enable-av1_mf-encoder.patch" - "${src}/contrib/ffmpeg/A30-qsv-fixed-BT2020-BT709-conversion.patch" - "${src}/contrib/ffmpeg/A31-Parse-EAC3-Atmos-ComplexityIndex-for-MP4-remuxing.patch" - ]; - }); + ffmpeg-hb = ffmpeg_8-full.overrideAttrs (old: { + patches = (old.patches or [ ]) ++ [ + "${src}/contrib/ffmpeg/A01-mov-read-name-track-tag-written-by-movenc.patch" + "${src}/contrib/ffmpeg/A02-movenc-write-3gpp-track-titl-tag.patch" + "${src}/contrib/ffmpeg/A03-mov-read-3gpp-udta-tags.patch" + "${src}/contrib/ffmpeg/A04-movenc-write-3gpp-track-names-tags-for-all-available.patch" + "${src}/contrib/ffmpeg/A05-avformat-mov-add-support-audio-fallback-track-ref.patch" + "${src}/contrib/ffmpeg/A06-avformat-mov-read-and-write-additional-iTunes-style-.patch" + "${src}/contrib/ffmpeg/A07-avformat-movenc-write-iTunEXTC-and-iTunMOVI-metadata.patch" + "${src}/contrib/ffmpeg/A08-dvdsubdec-fix-processing-of-partial-packets.patch" + "${src}/contrib/ffmpeg/A09-dvdsubdec-return-number-of-bytes-used.patch" + "${src}/contrib/ffmpeg/A10-dvdsubdec-use-pts-of-initial-packet.patch" + "${src}/contrib/ffmpeg/A11-dvdsubdec-add-an-option-to-output-subtitles-with-emp.patch" + "${src}/contrib/ffmpeg/A12-ccaption_dec-fix-pts-in-real_time-mode.patch" + "${src}/contrib/ffmpeg/A13-avformat-matroskaenc-return-error-if-aac-extradata-c.patch" + "${src}/contrib/ffmpeg/A14-Expose-the-unmodified-Dolby-Vision-RPU-T35-buffers.patch" + "${src}/contrib/ffmpeg/A15-lavc-pgssubdec-Add-graphic-plane-and-cropping.patch" + "${src}/contrib/ffmpeg/A16-libavcodec-qsvenc.c-update-has_b_frames-value-after-.patch" + "${src}/contrib/ffmpeg/A17-qsv-enable-av1-scc.patch" + "${src}/contrib/ffmpeg/A18-fixed-BT2020-BT709-conversion-via-VPP.patch" + "${src}/contrib/ffmpeg/A19-videotoolbox-disable-H.264-10-bit-on-Intel-macOS-it-.patch" + "${src}/contrib/ffmpeg/A20-videotoolbox-speedup-decoding.patch" + "${src}/contrib/ffmpeg/A21-Revert-avcodec-amfenc-GPU-driver-version-check.patch" + "${src}/contrib/ffmpeg/A22-fix-d3d11-static-pool-size-error.patch" + "${src}/contrib/ffmpeg/A23-movenc-set-the-chapters-track-language-to-the-same-a.patch" + "${src}/contrib/ffmpeg/A24-movenc-use-version-2-audio-descriptor-for-2-channels.patch" + "${src}/contrib/ffmpeg/A26-avformat-movenc-fix-mov_create_dvd_sub_decoder_speci.patch" + ]; + }); x265-hb = x265.overrideAttrs (old: { - version = "4.1"; - sourceRoot = "x265_4.1/source"; + version = "4.2"; + sourceRoot = "x265_4.2/source"; src = fetchurl { - url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.1.tar.gz"; - hash = "sha256-oxaZxqiYBrdLAVHl5qffZd5LSQUEgv5ev4pDedevjyk="; + url = "https://bitbucket.org/multicoreware/x265_git/downloads/x265_4.2.tar.gz"; + hash = "sha256-QLHqBFPgMJ8OupNODd9TP49ilZZmeeiJTo8cHI1eEhA="; }; # nixpkgs' x265 sourceRoot is x265-.../source whereas handbrake's x265 patches # are written with respect to the parent directory instead of that source directory. # patches which don't cleanly apply are commented out. postPatch = (old.postPatch or "") + '' pushd .. - patch -p1 < ${src}/contrib/x265/A01-Do-not-set-thread-priority-on-Windows.patch - patch -p1 < ${src}/contrib/x265/A02-Apple-Silicon-tuning.patch - patch -p1 < ${src}/contrib/x265/A03-Implement-ambient-viewing-environment-sei.patch - patch -p1 < ${src}/contrib/x265/A04-add-new-matrix-coefficients-from-H.273-v3.patch - patch -p1 < ${src}/contrib/x265/A05-Fix-Dolby-Vision-RPU-memory-management.patch - # patch -p1 < ${src}/contrib/x265/A06-Update-version-strings.patch - patch -p1 < ${src}/contrib/x265/A07-Fix-macOS-cross-compilation.patch - # patch -p1 < ${src}/contrib/x265/A08-Fix-inconsistent-bitrate-in-second-pass.patch - patch -p1 < ${src}/contrib/x265/A09-Ensuring-the-mvdLX-is-compliant.patch + for p in ${src}/contrib/x265/*.patch; do + patch -p1 < "$p" + done + popd + ''; + }); + + svt-av1-hb = svt-av1.overrideAttrs (old: rec { + version = "4.1.0"; + src = fetchFromGitLab { + owner = "AOMediaCodec"; + repo = "SVT-AV1"; + tag = "v${version}"; + hash = "sha256-NPJG1SsRlG9kGtUwdJa/uP6DAtF09nCctzeorrvjAhQ="; + }; + postPatch = (old.postPatch or "") + '' + pushd .. + for p in ${src}/contrib/svt-av1/*.patch; do + patch -p1 < "$p" + done popd ''; }); @@ -268,7 +293,7 @@ let libvpx libxml2 speex - svt-av1 + svt-av1-hb x264 x265-hb xz diff --git a/pkgs/by-name/ha/handheld-daemon-ui/package.nix b/pkgs/by-name/ha/handheld-daemon-ui/package.nix index 2f9401cb7c7e..b857c4f8d5b3 100644 --- a/pkgs/by-name/ha/handheld-daemon-ui/package.nix +++ b/pkgs/by-name/ha/handheld-daemon-ui/package.nix @@ -5,11 +5,11 @@ }: let pname = "handheld-daemon-ui"; - version = "3.4.0"; + version = "3.4.2"; src = fetchurl { url = "https://github.com/hhd-dev/hhd-ui/releases/download/v${version}/hhd-ui.Appimage"; - hash = "sha256-OeZMh3lC3fluwz1pU3JnLRkwFYiIkthGuclYkOJm430="; + hash = "sha256-91Wa50dJAW6Re1MBperHFoftAPagihUP4fv5cMb+pxI="; }; extractedFiles = appimageTools.extractType2 { inherit pname version src; }; in diff --git a/pkgs/by-name/ha/handheld-daemon/package.nix b/pkgs/by-name/ha/handheld-daemon/package.nix index b9f075e7a415..f46fb5cd7457 100644 --- a/pkgs/by-name/ha/handheld-daemon/package.nix +++ b/pkgs/by-name/ha/handheld-daemon/package.nix @@ -16,14 +16,14 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "handheld-daemon"; - version = "4.1.9"; + version = "4.1.10"; pyproject = true; src = fetchFromGitHub { owner = "hhd-dev"; repo = "hhd"; tag = "v${finalAttrs.version}"; - hash = "sha256-pzcMIXLZUkSqJuZTujAoKjfPuZgtit4u08wHZPPz8Ss="; + hash = "sha256-+POL5d9kn5oCGeu79gWxK0b0UHn//j/QjHq9wLZw6h8="; }; # Handheld-daemon runs some selinux-related utils which are not in nixpkgs. @@ -88,7 +88,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyyaml rich setuptools - xlib + python-xlib pyroute2 pygobject3 dbus-python diff --git a/pkgs/by-name/ha/handy/package.nix b/pkgs/by-name/ha/handy/package.nix index 0bd8e67d767c..d6bb5d4b53f7 100644 --- a/pkgs/by-name/ha/handy/package.nix +++ b/pkgs/by-name/ha/handy/package.nix @@ -28,6 +28,7 @@ gtk-layer-shell, vulkan-loader, vulkan-headers, + spirv-headers, shaderc, gst_all_1, glib-networking, @@ -54,7 +55,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "handy"; - version = "0.8.3"; + version = "0.9.1"; __structuredAttrs = true; @@ -62,11 +63,11 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "cjpais"; repo = "Handy"; tag = "v${finalAttrs.version}"; - hash = "sha256-sCCtp6UAxmCAcYeOM9+RW2czATh4Geqf1H8wXNMniYc="; + hash = "sha256-GuHMK98wmqv2ryrMF243CjRGMbjZ0ykX89RJbjwaP6U="; }; cargoRoot = "src-tauri"; - cargoHash = "sha256-mvOThNqfE24iMkVBM2zYexJkQxpMMgE4PPNXKy39hSg="; + cargoHash = "sha256-CNHWa70nAYbdgXO62s1iaW6nBacorgEVZIgkMZx/CNs="; nativeInstallInputs = [ jq ]; @@ -109,6 +110,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook4 shaderc + spirv-headers ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeBinaryWrapper @@ -154,12 +156,19 @@ rustPlatform.buildRustPackage (finalAttrs: { SWIFTC = lib.getExe' swift "swiftc"; # Explicit so the Handy build system can avoid xcrun }; - preBuild = '' - cp -R ${finalAttrs.passthru.frontendDeps}/node_modules . - chmod -R u+w node_modules - patchShebangs node_modules - bun run build - ''; + preBuild = + lib.optionalString stdenv.hostPlatform.isLinux '' + # Linux enables transcribe-cpp's ggml Vulkan backend, whose CMake build + # needs SPIRV-Headers' package config and headers. + export CMAKE_PREFIX_PATH="${spirv-headers}''${CMAKE_PREFIX_PATH:+:''${CMAKE_PREFIX_PATH}}" + export NIX_CFLAGS_COMPILE="-isystem ${spirv-headers}/include ''${NIX_CFLAGS_COMPILE:-}" + '' + + '' + cp -R ${finalAttrs.passthru.frontendDeps}/node_modules . + chmod -R u+w node_modules + patchShebangs node_modules + bun run build + ''; # If removed, the binary is produced, but not the app bundle for any platform. installPhase = '' @@ -208,8 +217,7 @@ rustPlatform.buildRustPackage (finalAttrs: { # The hook and deps fetcher in https://github.com/NixOS/nixpkgs/pull/376299 should simplify this dramatically. frontendDeps = stdenv.mkDerivation { pname = "handy-frontend-deps"; - version = "0.8.3"; - inherit (finalAttrs) src; + inherit (finalAttrs) src version; nativeBuildInputs = [ bun @@ -238,9 +246,9 @@ rustPlatform.buildRustPackage (finalAttrs: { outputHash = { - "x86_64-linux" = "sha256-tJ6LK99dELOiR0BcsTRTt/vLyNamntujLxhBy5Xl/lc="; - "aarch64-linux" = "sha256-S+dX6ZVgv9dexxIHoa5PxP7e0nxf/d7cKUGty5eEi8A="; - "aarch64-darwin" = "sha256-DQbogNBQ9izK5GPmoOudqiB2lJvct1vZI2U5lp3WFy8="; + "x86_64-linux" = "sha256-1jZBFvX9Ch3jNGPgSnOE8yNCXlHru7tcMJZ5uNZtE1g="; + "aarch64-linux" = "sha256-MsY2tOdBg11OMyQLRkLoVKxyrcqa0yVddfcYuIVWSxw="; + "aarch64-darwin" = "sha256-Fw0va7mq0F36qa15bDFVL01Q5pEprWhza78CzurLoLg="; } .${stdenv.hostPlatform.system}; @@ -268,8 +276,10 @@ rustPlatform.buildRustPackage (finalAttrs: { changelog = "https://github.com/cjpais/Handy/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; mainProgram = "handy"; - maintainers = with lib.maintainers; [ philocalyst ]; + maintainers = with lib.maintainers; [ + faukah + philocalyst + ]; platforms = with lib.platforms; linux ++ darwin; - badPlatforms = [ "x86_64-darwin" ]; # We weren't able to get hashes here }; }) diff --git a/pkgs/by-name/ha/haproxy/package.nix b/pkgs/by-name/ha/haproxy/package.nix index c06caea1a827..ac08bb4307e0 100644 --- a/pkgs/by-name/ha/haproxy/package.nix +++ b/pkgs/by-name/ha/haproxy/package.nix @@ -33,11 +33,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "haproxy"; - version = "3.3.10"; + version = "3.4.2"; src = fetchurl { url = "https://www.haproxy.org/download/${lib.versions.majorMinor finalAttrs.version}/src/haproxy-${finalAttrs.version}.tar.gz"; - hash = "sha256-aqkZoT86V1QW7wrkXaDss18ajQBGQd1oT+m1PmRokfI="; + hash = "sha256-sTMNuw1ua8SnLEcIpqnlhVec0RVt/ldjwmMFEFvBKQc="; }; buildInputs = [ diff --git a/pkgs/by-name/ha/harbor-cli/package.nix b/pkgs/by-name/ha/harbor-cli/package.nix index ca02e4fae725..24a5853a4622 100644 --- a/pkgs/by-name/ha/harbor-cli/package.nix +++ b/pkgs/by-name/ha/harbor-cli/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "harbor-cli"; - version = "0.0.22"; + version = "0.0.24"; src = fetchFromGitHub { owner = "goharbor"; repo = "harbor-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-QgI5ET5mS/vZb6a4kuTZzllUWKjbawgzknWkDgGNEi0="; + hash = "sha256-XL9w33ZPmB0imK8dudxj4zoUxDbUdpWaCu8u/1c6wG4="; }; vendorHash = "sha256-Iy+Kf0Kf1yuFk+shbomT0Z1zMvAbdWT4vLshAjlqvck="; diff --git a/pkgs/by-name/ha/hardinfo2/package.nix b/pkgs/by-name/ha/hardinfo2/package.nix index 756d1297b2ef..a91f768a4cfa 100644 --- a/pkgs/by-name/ha/hardinfo2/package.nix +++ b/pkgs/by-name/ha/hardinfo2/package.nix @@ -51,13 +51,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hardinfo2"; - version = "2.2.16"; + version = "2.3.1"; src = fetchFromGitHub { owner = "hardinfo2"; repo = "hardinfo2"; tag = "release-${finalAttrs.version}"; - hash = "sha256-n/Rf/XKsATx3OEzYSjl+2Yzk7WSiaBkbOveA9+xR6fc="; + hash = "sha256-rrb7iwR5kd7kJSncbE+yzdG55L7IaF7919kLsl/A5pY="; }; patches = [ diff --git a/pkgs/by-name/ha/harminv/package.nix b/pkgs/by-name/ha/harminv/package.nix index c60ee2b20dff..663bff3c62b5 100644 --- a/pkgs/by-name/ha/harminv/package.nix +++ b/pkgs/by-name/ha/harminv/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Harmonic inversion algorithm of Mandelshtam: decompose signal into sum of decaying sinusoids"; homepage = "https://github.com/NanoComp/harminv"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/ha/harmonoid/package.nix b/pkgs/by-name/ha/harmonoid/package.nix index be44011022dd..9a78f84bcded 100644 --- a/pkgs/by-name/ha/harmonoid/package.nix +++ b/pkgs/by-name/ha/harmonoid/package.nix @@ -19,20 +19,18 @@ let version = "0.3.22"; url_base = "https://github.com/alexmercerind2/harmonoid-releases/releases/download/v${version}"; url = - rec { + { x86_64-linux = "${url_base}/harmonoid-linux-x86_64.tar.gz"; aarch64-linux = "${url_base}/harmonoid-linux-aarch64.tar.gz"; - x86_64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "${url_base}/harmonoid-macos-universal.dmg"; } .${stdenv.hostPlatform.system} or (throw "${stdenv.hostPlatform.system} is an unsupported platform"); hash = - rec { + { x86_64-linux = "sha256-+fEx30uu0rZiORrtE00xG2piJzpFbfxSZw3OjrhLJyg="; aarch64-linux = "sha256-jXN5i+LudsODNZUzb5SXClqgQxYzanrbZCqB8X0pJRQ="; - x86_64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; - aarch64-darwin = x86_64-darwin; + aarch64-darwin = "sha256-YYMKrb7ZilfEztL2JTxSdeoDd8xQMrHFtN9N9fmsm3w="; } .${stdenv.hostPlatform.system}; in @@ -95,7 +93,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; license = { diff --git a/pkgs/by-name/ha/harmonoid/update.sh b/pkgs/by-name/ha/harmonoid/update.sh index 3b60cd92159c..b1879fc4425d 100755 --- a/pkgs/by-name/ha/harmonoid/update.sh +++ b/pkgs/by-name/ha/harmonoid/update.sh @@ -17,4 +17,4 @@ macos_hash=$(nix-hash --to-sri --type sha256 "$macos_hash") update-source-version harmonoid "$version" "$linux64_hash" --system=x86_64-linux --ignore-same-version update-source-version harmonoid "$version" "$linux_aarch_hash" --system=aarch64-linux --ignore-same-version -update-source-version harmonoid "$version" "$macos_hash" --system=x86_64-darwin --ignore-same-version +update-source-version harmonoid "$version" "$macos_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/ha/harper/package.nix b/pkgs/by-name/ha/harper/package.nix index f73784c0f341..52344b45df28 100644 --- a/pkgs/by-name/ha/harper/package.nix +++ b/pkgs/by-name/ha/harper/package.nix @@ -4,20 +4,21 @@ fetchFromGitHub, nix-update-script, versionCheckHook, + vscode-extensions, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "harper"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "Automattic"; repo = "harper"; rev = "v${finalAttrs.version}"; - hash = "sha256-D92Ung7nYFVUKH7SiLKf8fsoLGZkl+zVZV2/DGoWfnI="; + hash = "sha256-jNBtpW7rhuapVES6Dj1ue9PIJOit/Gh5RflNZL32gTw="; }; - cargoHash = "sha256-a1ATDCCZcXn9B1Ryx2oufFSvzECdH3+mXpojvW4/8nw="; + cargoHash = "sha256-xJmUyyU4Okvlh7m7tDJmfoOTXUglSltt4raPAf8O3/A="; cargoBuildFlags = [ "--package=harper-cli" @@ -29,7 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { "--package=harper-ls" ]; - passthru.updateScript = nix-update-script { }; + passthru = { + tests = vscode-extensions.elijah-potter.harper; + updateScript = nix-update-script { }; + }; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ha/hasciicam/package.nix b/pkgs/by-name/ha/hasciicam/package.nix new file mode 100644 index 000000000000..5a62995bd69c --- /dev/null +++ b/pkgs/by-name/ha/hasciicam/package.nix @@ -0,0 +1,63 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + SDL2, + libx11, + ncurses, + nix-update-script, + enableSDL ? true, + enableGUI ? true, + enableX11 ? stdenv.hostPlatform.isLinux, + enableCurses ? true, + enableTests ? true, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "hasciicam"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "dyne"; + repo = "hasciicam"; + tag = "v${finalAttrs.version}"; + hash = "sha256-Zh/yJJHWcD79J2HvUD5h4itg4jlDvpVb4cSwMsB1QOg="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = + lib.optionals enableSDL [ SDL2 ] + ++ lib.optionals enableX11 [ libx11 ] + ++ lib.optionals enableCurses [ ncurses ]; + + cmakeFlags = [ + (lib.cmakeBool "HASCIICAM_ENABLE_TESTS" enableTests) + (lib.cmakeBool "HASCIICAM_ENABLE_SDL" enableSDL) + (lib.cmakeBool "HASCIICAM_ENABLE_GUI" enableGUI) + (lib.cmakeBool "HASCIICAM_ENABLE_X11" enableX11) + (lib.cmakeBool "HASCIICAM_ENABLE_CURSES" enableCurses) + ]; + + doCheck = enableTests; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "ASCII art webcam and video viewer"; + homepage = "https://github.com/dyne/hasciicam"; + changelog = "https://github.com/dyne/hasciicam/releases/tag/v${finalAttrs.version}"; + mainProgram = "hasciicam"; + platforms = lib.platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ castorNova2 ]; + }; +}) diff --git a/pkgs/by-name/ha/hashes/package.nix b/pkgs/by-name/ha/hashes/package.nix index 2c5a2313779a..15d7e0e1a47d 100644 --- a/pkgs/by-name/ha/hashes/package.nix +++ b/pkgs/by-name/ha/hashes/package.nix @@ -19,7 +19,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "hashes"; - version = "1.1.2"; + version = "1.1.4"; pyproject = false; @@ -27,7 +27,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "zefr0x"; repo = "hashes"; tag = "v${finalAttrs.version}"; - hash = "sha256-Nyf7jED6LnsFu86zWhRh05sdGKwVAybVsGLGFFsz6eA="; + hash = "sha256-PbS0WOrolPz67kdx+wnyp8owBEwvRYXfqYQZcEmKZZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ha/hashlink/package.nix b/pkgs/by-name/ha/hashlink/package.nix index 27f7118cd6c2..a116f0677d4d 100644 --- a/pkgs/by-name/ha/hashlink/package.nix +++ b/pkgs/by-name/ha/hashlink/package.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ iblech diff --git a/pkgs/by-name/ha/hasmail/package.nix b/pkgs/by-name/ha/hasmail/package.nix deleted file mode 100644 index e562a4a24ad6..000000000000 --- a/pkgs/by-name/ha/hasmail/package.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, - pkg-config, - pango, - cairo, - gtk2, -}: - -buildGoModule { - pname = "hasmail-unstable"; - version = "2019-08-24"; - - src = fetchFromGitHub { - owner = "jonhoo"; - repo = "hasmail"; - rev = "eb52536d26815383bfe5990cd5ace8bb9d036c8d"; - hash = "sha256-QcUk2+JmKWfmCy46i9gna5brWS4r/D6nC6uG2Yvi09w="; - }; - - vendorHash = "sha256-kWGNsCekWI7ykcM4k6qukkQtyx3pnPerkb0WiFHeMIk="; - - doCheck = false; - - nativeBuildInputs = [ - pkg-config - ]; - - buildInputs = [ - pango - cairo - gtk2 - ]; - - meta = { - description = "Simple tray icon for detecting new email on IMAP servers"; - mainProgram = "hasmail"; - homepage = "https://github.com/jonhoo/hasmail"; - license = lib.licenses.unlicense; - maintainers = with lib.maintainers; [ doronbehar ]; - }; -} diff --git a/pkgs/by-name/ha/havn/package.nix b/pkgs/by-name/ha/havn/package.nix index 731ac2e94f52..9b80f6bfde08 100644 --- a/pkgs/by-name/ha/havn/package.nix +++ b/pkgs/by-name/ha/havn/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "havn"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "mrjackwills"; repo = "havn"; tag = "v${finalAttrs.version}"; - hash = "sha256-9xMrzRfnUA8GG+u255oBhdUWL7NACVtj50QwZuMM4yg="; + hash = "sha256-7VRYZK9QzKmhK4LPFRzf6QwgMwAC9aa6/+Fu/4SLQoo="; }; - cargoHash = "sha256-Fu+AU46AY/96uwKqDQcQ9inp2VZAZnq0YxR8N6wcQ2M="; + cargoHash = "sha256-pGfuKfjU/J52GgX8VmnNi9LLRfhQJagVzADn1bkUSvI="; checkFlags = [ # Skip tests that require network access diff --git a/pkgs/by-name/ha/hax11/package.nix b/pkgs/by-name/ha/hax11/package.nix index b3abacbe9fb4..33b586be1186 100644 --- a/pkgs/by-name/ha/hax11/package.nix +++ b/pkgs/by-name/ha/hax11/package.nix @@ -47,7 +47,7 @@ multiStdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/CyberShadow/hax11"; description = "Hackbrary to Hook and Augment X11 protocol calls"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cybershadow ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ha/haxor-news/package.nix b/pkgs/by-name/ha/haxor-news/package.nix deleted file mode 100644 index f4e7b439b52f..000000000000 --- a/pkgs/by-name/ha/haxor-news/package.nix +++ /dev/null @@ -1,51 +0,0 @@ -{ - lib, - fetchFromGitHub, - fetchPypi, - python3Packages, -}: - -python3Packages.buildPythonApplication { - pname = "haxor-news"; - version = "unstable-2022-04-22"; - format = "setuptools"; - - # haven't done a stable release in 3+ years, but actively developed - src = fetchFromGitHub { - owner = "donnemartin"; - repo = "haxor-news"; - rev = "8294e4498858f036a344b06e82f08b834c2a8270"; - hash = "sha256-0eVk5zj7F3QDFvV0Kv9aeV1oeKxr/Kza6M3pK6hyYuY="; - }; - - propagatedBuildInputs = with python3Packages; [ - click - colorama - requests - pygments - prompt-toolkit - six - ]; - - # will fail without pre-seeded config files - doCheck = false; - - nativeCheckInputs = with python3Packages; [ - unittestCheckHook - mock - ]; - - unittestFlagsArray = [ - "-s" - "tests" - "-v" - ]; - - meta = { - homepage = "https://github.com/donnemartin/haxor-news"; - description = "Browse Hacker News like a haxor"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ matthiasbeyer ]; - }; - -} diff --git a/pkgs/by-name/ha/hayagriva/package.nix b/pkgs/by-name/ha/hayagriva/package.nix index d37bc01d8004..dda29b883ae4 100644 --- a/pkgs/by-name/ha/hayagriva/package.nix +++ b/pkgs/by-name/ha/hayagriva/package.nix @@ -8,15 +8,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hayagriva"; - version = "0.10.0"; + version = "0.10.1"; src = fetchCrate { inherit (finalAttrs) version; pname = "hayagriva"; - hash = "sha256-bVyorGygr8T58qarpXiRtAwSFSf0nPttS5QNY2Y7tLs="; + hash = "sha256-bWCBKWuTyDoCQwzbqaHOD/1AZ/aNrwet1+E5iL6JcbA="; }; - cargoHash = "sha256-gqDxSj6paQOlH9ZoiWa5RRelsvr7QOZXWYJSNK2uHj0="; + cargoHash = "sha256-Dz7XmnIW3F2KV54jE1ZqqZLvUDJ88MfHn3tWoASeTkM="; buildFeatures = [ "cli" ]; diff --git a/pkgs/by-name/ha/haylxon/package.nix b/pkgs/by-name/ha/haylxon/package.nix index aed45fbd2bb4..322533022029 100644 --- a/pkgs/by-name/ha/haylxon/package.nix +++ b/pkgs/by-name/ha/haylxon/package.nix @@ -6,15 +6,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "haylxon"; - version = "1.1.0"; + version = "1.2.1"; src = fetchCrate { inherit (finalAttrs) version; pname = "hxn"; - hash = "sha256-pNOMCltMIKLJ8dNDzVa7MShpAROzvqK65d37fj+VXLQ="; + hash = "sha256-L1Xd6u4B8DR9jR//FNloiOzzXiLnWP+580izP2NVvoY="; }; - cargoHash = "sha256-3muxqWOYCNXcV6WEcUwtmn2fKudU0vJtNegr8Nf6x50="; + cargoHash = "sha256-aQSn3LT0gNQWXrPWVe/ulP446Dk9o1N0OGka3gGhNYg="; meta = { description = "Save screenshots of urls and webpages from terminal"; diff --git a/pkgs/by-name/hc/hck/package.nix b/pkgs/by-name/hc/hck/package.nix index 68681287ac19..0d57a6fcf977 100644 --- a/pkgs/by-name/hc/hck/package.nix +++ b/pkgs/by-name/hc/hck/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hck"; - version = "0.11.5"; + version = "0.11.6"; src = fetchFromGitHub { owner = "sstadick"; repo = "hck"; rev = "v${finalAttrs.version}"; - hash = "sha256-cycM40fm0bc6SCgGsMTKFVPUtjcXGpoMo3KhDDo74ZQ="; + hash = "sha256-W5y9NQjRkbb+ifOFMbqDECsm58rk6pozDprMnzC0euk="; }; - cargoHash = "sha256-1Kaob5OZiM9WZ6lwuRvuDMtHVolRPjApQtQ52TQhs8A="; + cargoHash = "sha256-coaRVmI++074P8PhZ/Zmok0lwtEz+/38nkF2h0JraAo="; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/hc/hcloud-upload-image/package.nix b/pkgs/by-name/hc/hcloud-upload-image/package.nix index 85892457a77c..52eadd8fae72 100644 --- a/pkgs/by-name/hc/hcloud-upload-image/package.nix +++ b/pkgs/by-name/hc/hcloud-upload-image/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "hcloud-upload-image"; - version = "1.4.0"; + version = "1.5.0"; src = fetchFromGitHub { owner = "apricote"; repo = "hcloud-upload-image"; tag = "v${version}"; - hash = "sha256-3ToqN7Fu1YzmGMnv1ZNRutYGMZ0fAKSIvyJEes+S3+Q="; + hash = "sha256-l2LFx1f7X4t8yELWqryJgLW8Mr5Wey9AbI2wCpA2GJ0="; }; - vendorHash = "sha256-IDtrD2P4lPl2q4Hu4fEQEjopE43CQ5xkFZQWOEvuR2U="; + vendorHash = "sha256-hKsyweWmLZ0zH8VRX//YWYszbdmwrH5LCHn/SKeDbuk="; ldflags = [ "-s" diff --git a/pkgs/by-name/hc/hcloud/package.nix b/pkgs/by-name/hc/hcloud/package.nix index d6adb4fa4efa..03bd61d035e2 100644 --- a/pkgs/by-name/hc/hcloud/package.nix +++ b/pkgs/by-name/hc/hcloud/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "hcloud"; - version = "1.64.1"; + version = "1.66.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-vhkajr/p64FkRMvtGLZZjCCB6Xc59SbumDaIiNX53ts="; + hash = "sha256-Ixx92yY0dC8g8YPQtqYUCMA5k2W9IAwRreSzwg73/04="; }; - vendorHash = "sha256-JtaI5v8H6Co7BuUS25zfhLYiqLKXMFlP7L2d9UEyZAo="; + vendorHash = "sha256-f960IUoBBxOEIdFTuJG6J5CKFdcSrZBrKDrMk28RzM4="; ldflags = [ "-s" diff --git a/pkgs/by-name/hc/hcom/package.nix b/pkgs/by-name/hc/hcom/package.nix new file mode 100644 index 000000000000..7e7d311f5a24 --- /dev/null +++ b/pkgs/by-name/hc/hcom/package.nix @@ -0,0 +1,50 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + writableTmpDirAsHomeHook, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hcom"; + version = "0.7.23"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "aannoo"; + repo = "hcom"; + tag = "v${finalAttrs.version}"; + hash = "sha256-58AcL/hOi8Fl1Nq6QBOyM7Uf7ZUjBabU4PBzZWo25Vo="; + }; + + cargoHash = "sha256-cGhssU75BrNmHqxYWvqRcjNxB70rxYHXBz3hZDY+was="; + + doCheck = true; + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + checkFlags = [ + # tries to read $PATH + "--skip=shell_env::tests::resolver_discards_stderr_without_breaking_env_resolution" + # tries to read shell pid + "--skip=shell_env::tests::timeout_kills_shell_process_group" + ]; + + # tons of unit tests use local ports + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Let AI agents message, watch, and spawn each other across terminals"; + homepage = "https://github.com/aannoo/hcom"; + changelog = "https://github.com/aannoo/hcom/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "hcom"; + }; +}) diff --git a/pkgs/by-name/hd/hddfancontrol/package.nix b/pkgs/by-name/hd/hddfancontrol/package.nix index 8822ea5a6d98..42d1a2bd5446 100644 --- a/pkgs/by-name/hd/hddfancontrol/package.nix +++ b/pkgs/by-name/hd/hddfancontrol/package.nix @@ -11,16 +11,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hddfancontrol"; - version = "2.1.1"; + version = "2.1.2"; src = fetchFromGitHub { owner = "desbma"; repo = "hddfancontrol"; tag = finalAttrs.version; - hash = "sha256-Fqkx2pO97RCFa1vFTCuMsO+WVs/2WGLsHwyKcuEnq5I="; + hash = "sha256-SQXzVUv+l14xUNJ7riXFwEq/T0HnL1Gmo6/bjU33Qz0="; }; - cargoHash = "sha256-8NNFL5aeQjdXP/qw9yxL2fFOJaLUVM2GJ0YSW5OuR4A="; + cargoHash = "sha256-MJ9Cm/mzas8mapRF0vmwR6ivWTZevnhkxT5987dypD8="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/hd/hdrhistogram_c/no-avx2-i386.patch b/pkgs/by-name/hd/hdrhistogram_c/no-avx2-i386.patch new file mode 100644 index 000000000000..84f2575526e9 --- /dev/null +++ b/pkgs/by-name/hd/hdrhistogram_c/no-avx2-i386.patch @@ -0,0 +1,13 @@ +diff --git a/src/hdr_histogram.c b/src/hdr_histogram.c +index b2041f8..a5dd8d7 100644 +--- a/src/hdr_histogram.c ++++ b/src/hdr_histogram.c +@@ -36,7 +36,7 @@ + + /* Runtime-dispatched AVX2 path: keep the rest of this TU at the project's + baseline ISA so the shipped binary does not silently require AVX2. */ +-#if (defined(__x86_64__) || defined(_M_X64) || defined(__i386__) || defined(_M_IX86)) \ ++#if (defined(__x86_64__) || defined(_M_X64)) \ + && (defined(__GNUC__) || defined(__clang__)) && !defined(__INTEL_COMPILER) + # define HDR_HAS_AVX2_DISPATCH 1 + # include diff --git a/pkgs/by-name/hd/hdrhistogram_c/package.nix b/pkgs/by-name/hd/hdrhistogram_c/package.nix index f05ebfe5f357..d8f02e4b540e 100644 --- a/pkgs/by-name/hd/hdrhistogram_c/package.nix +++ b/pkgs/by-name/hd/hdrhistogram_c/package.nix @@ -11,15 +11,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "hdrhistogram_c"; - version = "0.11.9"; + version = "0.11.10"; src = fetchFromGitHub { owner = "HdrHistogram"; repo = "HdrHistogram_c"; tag = finalAttrs.version; - hash = "sha256-9Xp+gPqJpB7xZr5dzyc9Via9gxG9q/EriCx3cm++0kU="; + hash = "sha256-LMZj7vuxOA1bgU/J10IKnyNe3R0dk2AA1ydLTHun4vg="; }; + # Fix build on i686 by not trying to build AVX2 code + # Submitted upstream: https://github.com/HdrHistogram/HdrHistogram_c/pull/143 + ${if stdenv.hostPlatform.isi686 then "patches" else null} = [ + ./no-avx2-i386.patch + ]; + buildInputs = [ zlib ]; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/he/headlamp-frontend/package.nix b/pkgs/by-name/he/headlamp-frontend/package.nix index 68b611156846..10866da81cbb 100644 --- a/pkgs/by-name/he/headlamp-frontend/package.nix +++ b/pkgs/by-name/he/headlamp-frontend/package.nix @@ -12,7 +12,7 @@ buildNpmPackage { sourceRoot = "${headlamp-server.src.name}/frontend"; - npmDepsHash = "sha256-73xc/GK1Cvz67D6ftYVRe5GARNgG5qD86CGK6uhoyWA="; + npmDepsHash = "sha256-v8aMlOk2JD2DzcUMWTK+2QP44n1Nl0LQPcIry7W51vg="; postPatch = '' chmod -R u+w ../app diff --git a/pkgs/by-name/he/headlamp-server/package.nix b/pkgs/by-name/he/headlamp-server/package.nix index ce86de1ab9a9..5abca97e1995 100644 --- a/pkgs/by-name/he/headlamp-server/package.nix +++ b/pkgs/by-name/he/headlamp-server/package.nix @@ -2,11 +2,13 @@ lib, buildGoModule, fetchFromGitHub, + nix-update, + writeShellScript, }: buildGoModule rec { pname = "headlamp-server"; - version = "0.42.0"; + version = "0.43.0"; strictDeps = true; __structuredAttrs = true; @@ -15,12 +17,12 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = "headlamp"; tag = "v${version}"; - hash = "sha256-SBPSh6dsKvMw1C80THri0mNPoTMgcrjONk455S/g9v0="; + hash = "sha256-6TGKBKR0WR4Xv7lGCgMFVG/nc19oMOP5cJcgT0bw6Ag="; }; modRoot = "backend"; - vendorHash = "sha256-dBU053QtUEMWjzkOEHzELH3j7PJOKuoBZCVZFmZ5z7E="; + vendorHash = "sha256-U0H1Dj38ajRGFqcWszveWckxenaKa4nrPg81GyIpS0U="; # Don't embed frontend - Electron serves it directly. This also prevents # the server from auto-opening a browser window. @@ -38,6 +40,14 @@ buildGoModule rec { mv $out/bin/cmd $out/bin/headlamp-server ''; + # headlamp-frontend and headlamp inherit src (and version) from here, update their hashes aswell + passthru.updateScript = writeShellScript "headlamp-update" '' + set -euo pipefail + ${lib.getExe nix-update} headlamp-server + ${lib.getExe nix-update} --version=skip --no-src headlamp-frontend + ${lib.getExe nix-update} --version=skip --no-src headlamp + ''; + meta = { description = "An easy-to-use and extensible Kubernetes web UI"; homepage = "https://headlamp.dev"; diff --git a/pkgs/by-name/he/headlamp/package.nix b/pkgs/by-name/he/headlamp/package.nix index 4991f3e61205..6a5fef440f67 100644 --- a/pkgs/by-name/he/headlamp/package.nix +++ b/pkgs/by-name/he/headlamp/package.nix @@ -17,7 +17,7 @@ buildNpmPackage { sourceRoot = "${headlamp-server.src.name}/app"; - npmDepsHash = "sha256-k7rABbEmYY24k/obKm1GZUnM0Udjtyv2bhrVEvc0ebc="; + npmDepsHash = "sha256-gZr+ni3dmrjqHDwoFxgGM0/Kf3R1Qy2SZetLtGtDY+0="; env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; diff --git a/pkgs/by-name/he/headplane-agent/package.nix b/pkgs/by-name/he/headplane-agent/package.nix index d7e795a62a99..583c4941847d 100644 --- a/pkgs/by-name/he/headplane-agent/package.nix +++ b/pkgs/by-name/he/headplane-agent/package.nix @@ -1,22 +1,15 @@ { buildGoModule, - fetchFromGitHub, + headplane, lib, }: buildGoModule (finalAttrs: { pname = "headplane-agent"; __structuredAttrs = true; - # Note, if you are upgrading this, you should upgrade headplane at the same time - version = "0.6.3"; + inherit (headplane) version src; - src = fetchFromGitHub { - owner = "tale"; - repo = "headplane"; - tag = "v${finalAttrs.version}"; - hash = "sha256-zvJUTKRIlHyPMq80teVXBSb7K9Zz44Kuuj2PPi6qIOw="; - }; + vendorHash = headplane.goVendorHash; - vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; subPackages = [ "cmd/hp_agent" ]; ldflags = [ diff --git a/pkgs/by-name/he/headplane/package.nix b/pkgs/by-name/he/headplane/package.nix index 2d71367644ea..4e844e82b10b 100644 --- a/pkgs/by-name/he/headplane/package.nix +++ b/pkgs/by-name/he/headplane/package.nix @@ -3,32 +3,31 @@ fetchFromGitHub, fetchPnpmDeps, git, - headplane-agent, lib, makeWrapper, nixosTests, - nodejs_22, + nodejs_24, pnpm_10, pnpmConfigHook, stdenv, }: let pname = "headplane"; - # Note, if you are upgrading this, you should upgrade headplane-agent at the same time - version = "0.6.2"; - pnpmDepsHash = "sha256-CsmffCo9Se/4oiOqbcuhjPMuGmR2GL+YfcyWgzBTAh8="; + version = "0.7.0"; + goVendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; + pnpmDepsHash = "sha256-OBerkCnB/QL5HGYp2kehzFYEIKSuqpBt0dTFHIypc00="; src = fetchFromGitHub { owner = "tale"; repo = "headplane"; tag = "v${version}"; - hash = "sha256-2C/Pn2M2aHADtoljSFg9hz6xOaZp6IRI77jjy+LDAgw="; + hash = "sha256-UMAGsrG2xfpgWlsDhf4aWJKoOrUbruucDNOhCJcYmQQ="; }; headplaneSshWasm = buildGoModule { pname = "headplane-ssh-wasm"; inherit version src; subPackages = [ "cmd/hp_ssh" ]; - vendorHash = "sha256-MvrqKMD+A+qBZmzQv+T9920U5uJop+pjfJpZdm2ZqEA="; + vendorHash = goVendorHash; env.CGO_ENABLED = 0; doCheck = false; buildPhase = '' @@ -73,7 +72,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ git makeWrapper - nodejs_22 + nodejs_24 pnpm_10 pnpmConfigHook ]; @@ -82,14 +81,14 @@ stdenv.mkDerivation (finalAttrs: { inherit (finalAttrs) pname version src; pnpm = pnpm_10; hash = pnpmDepsHash; - fetcherVersion = 3; + fetcherVersion = 4; }; buildPhase = '' runHook preBuild - cp ${headplaneSshWasm}/hp_ssh.wasm app/hp_ssh.wasm - cp ${headplaneSshWasm}/wasm_exec.js app/wasm_exec.js - pnpm --offline build + cp ${headplaneSshWasm}/hp_ssh.wasm public/hp_ssh.wasm + cp ${headplaneSshWasm}/wasm_exec.js public/wasm_exec.js + pnpm build runHook postBuild ''; @@ -97,18 +96,15 @@ stdenv.mkDerivation (finalAttrs: { runHook preInstall mkdir -p $out/{bin,share/headplane} cp -r build $out/share/headplane/ - cp -r node_modules $out/share/headplane/ cp -r drizzle $out/share/headplane/ - substituteInPlace $out/share/headplane/build/server/index.js \ - --replace "$PWD" "../.." - makeWrapper ${lib.getExe nodejs_22} $out/bin/headplane \ + makeWrapper ${lib.getExe nodejs_24} $out/bin/headplane \ --chdir $out/share/headplane \ --add-flags $out/share/headplane/build/server/index.js runHook postInstall ''; passthru = { - agent = headplane-agent; + inherit goVendorHash; tests = { inherit (nixosTests) headplane; }; }; diff --git a/pkgs/by-name/he/headscale/package.nix b/pkgs/by-name/he/headscale/package.nix index 6eb54176001a..95c7c9e616d5 100644 --- a/pkgs/by-name/he/headscale/package.nix +++ b/pkgs/by-name/he/headscale/package.nix @@ -11,13 +11,13 @@ }: buildGoModule (finalAttrs: { pname = "headscale"; - version = "0.28.0"; + version = "0.29.2"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; tag = "v${finalAttrs.version}"; - hash = "sha256-gR5kOFv4/+87mOhMYjejBMhZlrwYhABZpG0zjIL5vtI="; + hash = "sha256-zQ3dmb96fLhFwZjZUiifI73F+CRvDz6aiVafHaTuU/c="; }; postPatch = '' @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { --replace-fail 'Commit: "unknown"' 'Commit: "${finalAttrs.src.tag}"' ''; - vendorHash = "sha256-jkeB9XUTEGt58fPOMpE4/e3+JQoMQTgf0RlthVBmfG0="; + vendorHash = "sha256-fzKyXNMw/2yAEhaTZu0n1NXatPO2IP0HFA2ey1vZIYM="; subPackages = [ "cmd/headscale" ]; @@ -76,6 +76,7 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ kradalby misterio77 + debtquity ]; }; }) diff --git a/pkgs/by-name/he/hebbot/package.nix b/pkgs/by-name/he/hebbot/package.nix index bb2469185630..fe4cc079fd7f 100644 --- a/pkgs/by-name/he/hebbot/package.nix +++ b/pkgs/by-name/he/hebbot/package.nix @@ -52,7 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Matrix bot which can generate \"This Week in X\" like blog posts "; homepage = "https://github.com/haecker-felix/hebbot"; changelog = "https://github.com/haecker-felix/hebbot/releases/tag/v2.1"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; mainProgram = "hebbot"; maintainers = with lib.maintainers; [ a-kenji ]; }; diff --git a/pkgs/by-name/he/hecate/package.nix b/pkgs/by-name/he/hecate/package.nix index 00ff0afaccea..d4c37415ed26 100644 --- a/pkgs/by-name/he/hecate/package.nix +++ b/pkgs/by-name/he/hecate/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { inherit (finalAttrs.src.meta) homepage; description = "Terminal hex editor"; longDescription = "The Hex Editor From Hell!"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ramkromberg ]; mainProgram = "hecate"; }; diff --git a/pkgs/by-name/he/hedgedoc/missing-hashes.json b/pkgs/by-name/he/hedgedoc/missing-hashes.json index b48eabfb34d4..359be9190056 100644 --- a/pkgs/by-name/he/hedgedoc/missing-hashes.json +++ b/pkgs/by-name/he/hedgedoc/missing-hashes.json @@ -1,28 +1,28 @@ { - "@esbuild/aix-ppc64@npm:0.27.7": "848d1a798fb9ea6aa902c9138aaf6b45d889df39a1ff737300ea9968af3afee1000f611bc00187f5bda096d300fb25f4f883c57a2dc7296e40295f2470aa57b3", - "@esbuild/android-arm64@npm:0.27.7": "21a57ee237e1503d92c2f818c1dbf7d6f772b100fd0dfa95ea0d24be718c0c6952e915ad1f47bcc3496bb807a0a254d35d6baadc48531b684d2236f57023f1e6", - "@esbuild/android-arm@npm:0.27.7": "46a246245a024680c8b5051425fc724c846b7d36ac952cd312e71194bae07fd712aa6fa8ddd7fa648a18d665eb0bcfaf111726af7b676465cb181dff7e6a0848", - "@esbuild/android-x64@npm:0.27.7": "95c858fe95b716aabcb71a0dab9162d46859c0deb713189730ce6c2a2bc27efed2341b2d27aacc092dee7544df7b25035a12d65f30481b5b03a8358707e1a6f3", - "@esbuild/darwin-arm64@npm:0.27.7": "281897d55b71e222394f08ee519999f673778c26ac78e4dacc67262e449b9284e852dccac8d6293fd611e0a37d0c798f2ea18c65573ed251d5e04dcb01121f0d", - "@esbuild/darwin-x64@npm:0.27.7": "a6c320cda3c7c176d678c00367823259b7efc0f8638393bd0e45b4f950af15be887558c82e2d74ed9fb492a4b04f36afc1c3a3b9774aeaaa08fbf96aac6e3524", - "@esbuild/freebsd-arm64@npm:0.27.7": "8b546929340ebb3daf5b47ca24db6d6fdcf3c14a733c41ddd8ae960834a5aa60b22b341049aef39badfdfaad0081a8706d085ba892e2b23163d1d1ff52ca1dc3", - "@esbuild/freebsd-x64@npm:0.27.7": "5a4c0ccbde7fe7a6de14c8789d1f20f4cadc7980e531b090b137774b56f360ba3c50f5612f01980ab9071ae50e1bb007f44c1b04b68fd84ba07113472081e021", - "@esbuild/linux-arm64@npm:0.27.7": "741871bea9ce0a136367707cc509254fef167c5bf968706de6bff7db96ee7c672f02231cb69965e17ca0aedbd99d533275f5a695a3069cb3df0a9d2cd877847f", - "@esbuild/linux-arm@npm:0.27.7": "c2ee4ae5f6e13f8e882da4a369cc5d672ae8bf7613e35e22b54df3999e0d5aaef6d704c7dcbc473708eaeee202dd8e892c37e791bbc50a509b23ae845d18b689", - "@esbuild/linux-ia32@npm:0.27.7": "0933a68b0bdee3dd0fcd99da92c0472deb6d6225c454b88a3609e1b1ea7648b36f6b83be8a8cf41edc1f0d666b76006e270a66c7520050d278d7d73df171e86b", - "@esbuild/linux-loong64@npm:0.27.7": "9609e94b603a8a68bcd60325626d0bd35cce37e75994729d4ea264fa865db201da64c3216004656d94b1edeb8587150b1c47a1eef8ee1af9dc0d3cd6baa5ab2a", - "@esbuild/linux-mips64el@npm:0.27.7": "74ac0fe0b857b926af9057d5fa9634fc4b0b61a6fcd9c13cc2917e0e66638e2f724b8fd82024f97d524ff54ae17d0a52a0569078639aa9907f5287514aa046b1", - "@esbuild/linux-ppc64@npm:0.27.7": "7d75e59ad798631b7b7f77471fc9f545e0e6d2959a52d57b77e92d4aba81c5c57dea558d22539edc6aca92ac72112f93381e163b996df193cb5c9a1da4b4230d", - "@esbuild/linux-riscv64@npm:0.27.7": "6dca2a182f59d43057ef40b93788dfb265c3b9fff4738aa613d87c7c709d9c308f18c282b7cfc2a1c770fa4db78d3529dc50b8a9f30e415661d993b021b2cdcb", - "@esbuild/linux-s390x@npm:0.27.7": "870de4b9ff155cf5cf2ccd7b3587a6b4170550a31b621ea11dc134cd48af95f4a30f4ce868d249967eade6b3dd66e7a0af0d542c6fbba0dbc473fd0f5d3299b0", - "@esbuild/linux-x64@npm:0.27.7": "47fce66247eda2d4721c1e615f7169eb7bf6e4b6105eab7271391ce933e7d350d3d4a581b3b8a61573f70b6663268eb514e624875dc514dc56dec3a37cf7cbe3", - "@esbuild/netbsd-arm64@npm:0.27.7": "bbe0d0529fb73fd38c2cf9ebc1d1dcd5a2586b263cc4f6300d37008955f45310e842d63153e361a4447d4ca0f0a0691d62013fe60b09e4e0cd53f428ef2266f3", - "@esbuild/netbsd-x64@npm:0.27.7": "246ed4df55788aacd2d9146f51ea7fcf4715e73d32ca1b0fcb42c316fdbf21d8de03bb304205dc707942442899529e834466894faa0aa3fa40454f5622648fc6", - "@esbuild/openbsd-arm64@npm:0.27.7": "d99927053a0f8be5158da8ecde7e8a08dd0ea580ca93f006971730979681e3738f83ada4d6564a57cdd6f412e40e5a750a92f424807aa12f97c2ead52617ad41", - "@esbuild/openbsd-x64@npm:0.27.7": "1480ff755c727d056e5f37e1d2be83d36b137c9f3595911aaf1659160c2cbfea846bded0557017aaefd79a0322be5e381b168ebff3eec4af684198835504b051", - "@esbuild/openharmony-arm64@npm:0.27.7": "6aa1fd102bdfa99b3c27f558f6b5d493b47f34260cc10967c47d44b86018a307377e0c70ef51b8886c592f2a0057710a8ad7781716b0eb059d0b0657b4f7ddec", - "@esbuild/sunos-x64@npm:0.27.7": "66bff01f90a97b989c6e6fbe6f8df77a0e5b40b57b8c4d8e6c407635546eb05553de570cd4e0d4624a5a6be8a61d7e9c6e7d8bc238f8f5773a4231361c0e8745", - "@esbuild/win32-arm64@npm:0.27.7": "eb7008345c82bbd4be30bb27ae4e17346cb5014801e9d50058984e7c5e4cb509d6eae82db3c04aab16b72d3829908b32151117222c107962fe3fb0e317e55951", - "@esbuild/win32-ia32@npm:0.27.7": "b6a44b5b6bf670cbe86de063335f03faa308d5b3eabbca1f5078bba9674ea42d3d6ad9fb9601fb0c7abba65d4b4a467f20473aedb856c9544c20166c75538029", - "@esbuild/win32-x64@npm:0.27.7": "4b91237b01e7e1a5083d2df524bb2ddb13da334197681fd33ad05975c073ccc901ea6b9395453276557608e5858cc032ed12807cc156c29f4ce7d2c63e04d5a0" + "@esbuild/aix-ppc64@npm:0.28.1": "98a9325bec976ebe1cbbf2441fdbe895b36733919b9df7d62e7b73a1e199810affeac17d172cc5cf61196c9b1ede8073ca5d088ca52b14800b76f49bacc480b3", + "@esbuild/android-arm64@npm:0.28.1": "ec3e3c62bc684a09393ca10a0f64b166938f66e4b1972f6db63bf55463bf039736549d9808e50996eb0fedea70744b466aeb816c44e78f2b5d232aeb9929e3ac", + "@esbuild/android-arm@npm:0.28.1": "cda56884826ac2aa5dd3be5df9e89834df3b46515cf14099ddfc5bcfc80122d4f8d74b3831a0ac447d87dda73ae90fba49dc4e352b11240c2b055cdca69a0a02", + "@esbuild/android-x64@npm:0.28.1": "7f2ba14ba06fd3f2faff467e6fceb2466cd44d1d6039ae1c01f24336a5a1ad0f9c3721000331ded3f250587e4be5e7194d68dd33c55339dc26e1200e13e16d2d", + "@esbuild/darwin-arm64@npm:0.28.1": "9798bd013921f8dc5126eb12eba4ddfce9198d11eba6ae844f66d25919d5d26be2aa46b4da8d442ad0e7673e88b2f3d9e505d71692cd030bda9a7b762921c05d", + "@esbuild/darwin-x64@npm:0.28.1": "aaddefac25e025e309c71dc5c7074d8c295f44779e41add06dbf65d48b2a6a72b579266748e7f0ab3b2be1ed07be8d541e954f75dda2a2992f36f4c805d91fe1", + "@esbuild/freebsd-arm64@npm:0.28.1": "a325b7833f978b62bf25157ea5a951e29b9b0a1db9665ee52498644c9b250977ab6f21c049137d0a271bb0442b3e6d6148c257bace84476196b46570ce837d62", + "@esbuild/freebsd-x64@npm:0.28.1": "f092ddacd0bc715f443b62382dd8ba8f85d272f62caa47f603e85b9c5b14fef67c610523006ca88cae19e2829fe41a2a0ae92b7c158ef1038c714552dea57554", + "@esbuild/linux-arm64@npm:0.28.1": "bfda225d3101bb3ed5a74f979d50564a17ccf3799ad65fb968c5b15c9ceb9077c105a9bb5763d42f33f1917ac709e5779cd2112e5420188963568e80ac8439f8", + "@esbuild/linux-arm@npm:0.28.1": "b440cf89adf6dd1079bcf7d9aa915f70f467002bbb69bda21f4a3d160c9ae93bc6d8eb73b2831c8607fb1527d8ada288d907440e36969cb60000e4df85b7c549", + "@esbuild/linux-ia32@npm:0.28.1": "4329d81cf06331e537c8ebb571a9d4ca968811bee7c7cb4f975b8343c9f7649a8b2b9902b0974be0e2224656b1a0d21f3b191304db8cec52d006b80061faf4c2", + "@esbuild/linux-loong64@npm:0.28.1": "76b4d0f2cf716576181065e3fd2d6ffa9b0d0c39987e8d3d1b8d1e8aaa2563779cd4f861c881e3e7a9302f2d03d5543b8f726a99603e6aa754c8154772d0f434", + "@esbuild/linux-mips64el@npm:0.28.1": "59825a73d04187818c6fb53b22e2915a4c0e6c8fee9017d75dcafbdc66699f2765377faf801495d69952230935557f58360481a7edd78073816270aa8bd0cbee", + "@esbuild/linux-ppc64@npm:0.28.1": "3186d54b33d9b4849d6fe4fa2aeed4966a4117f9a27bf2d59f07f3ea651a9724a2eb9aaaf98813aac6dc726710a337bfc2472dd714262894fabf498a369fbd74", + "@esbuild/linux-riscv64@npm:0.28.1": "f01572cf6398b466d44bfa68dbc5f56a37b74e645673198f7ba157d215ccba35ea46e220a2526008d5679cef47a4368dd46480d4ba4c7330a491d215fe3f649f", + "@esbuild/linux-s390x@npm:0.28.1": "aad20d457c0441d7bf2f6c8dbe74297d4c3a3c90cf709a971a4a19b2c70497bf91ac4a80fa6168ccf6063eb284ea0f41f2293283e8351348369af551ffe6f3cf", + "@esbuild/linux-x64@npm:0.28.1": "d361ac73388af397803dc26242265c8f00fce91d9dd587b04d230c686294585c541f43dee706e23f8d56754e3a3da653b00b3f55855182d60deabc024acf19f7", + "@esbuild/netbsd-arm64@npm:0.28.1": "73e2d620958bcb61367849046397dee40dbd9bd6d0d4172bb87ef90ad644ed16e48386debd1ef0323648358fc617c0d8fae58be984774a2e8622712c7ab7f04b", + "@esbuild/netbsd-x64@npm:0.28.1": "663a35913d3d3a2f566d31ec00477954cc570f386d56a5ffffa1d7bb58bccfbe241780fc429c2e41463cef5d1d422ca02fe174df970932b46d225ff0bd333b65", + "@esbuild/openbsd-arm64@npm:0.28.1": "8add19644eca9a23cefc2a109644df802c626cc3460adef6f030ce72d1fcb127a4ff2b14a21cb51bbd68ec5a652f0bd7105c1a0d76a30f44fbf822c010096cd9", + "@esbuild/openbsd-x64@npm:0.28.1": "ad12be1ed38cc61410aa6210f88b8aa8dc3e6ee717dce32dba6e7cbaa57414af6e5314e7cdf9baa4affafe2d6a88e230d361a0ddadf76d06070b63bbf0a97cb2", + "@esbuild/openharmony-arm64@npm:0.28.1": "5ecd637058887c8458ebc7e95c67adee2397ebd8e5f6c302c17816eeb77963b1feeaff4e3f7823c0d85f0fc10771caa96175e2f0909b00e60ca5d90d22690a15", + "@esbuild/sunos-x64@npm:0.28.1": "e3286191315e30471e9cc176281a5d7acf5b877a95ea2868195024548a984e08b0214ea90e504e5bb5c595f9d3da9a5b961b52f79988702036b59233378580c4", + "@esbuild/win32-arm64@npm:0.28.1": "55e83fa2b63511bc3d2138ff84091b452936072b5b8e24405a5669f04355263b3f452861c13fc0c01ad80ebeb0df069da0318631386c9d66cda8ccbeca0fa82e", + "@esbuild/win32-ia32@npm:0.28.1": "dcd2579f97b8b5217e807d3a069461635ff6c1f13bc6e678fb0e385db4bf569afbbfe9f54ee512f0e120c6cc2689889725b8e2efdb17e3bb1603cffb58a4b6b3", + "@esbuild/win32-x64@npm:0.28.1": "1d7e7661663e2b0d814550e461fd06b814b3ac1ffda1e84468da3b7c29a1ad8a6067a8b7dcf6e66e38918b43a440c6302052f1bdb40c48a6d49a82c616e12f2d" } diff --git a/pkgs/by-name/he/hedgedoc/package.nix b/pkgs/by-name/he/hedgedoc/package.nix index 1f608ecc8be0..75817752c76e 100644 --- a/pkgs/by-name/he/hedgedoc/package.nix +++ b/pkgs/by-name/he/hedgedoc/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hedgedoc"; - version = "1.10.8"; + version = "1.11.0"; src = fetchFromGitHub { owner = "hedgedoc"; repo = "hedgedoc"; tag = finalAttrs.version; - hash = "sha256-9gKpjmE8z/9PUILCiVK1utNYKD8kscbCBKxerqTO3z4="; + hash = "sha256-L27Rmd85+UbAbJYY2vxsWLbY+9nsWFmnEE4o3fK0UZU="; }; patches = [ @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = yarn-berry_4.fetchYarnBerryDeps { inherit (finalAttrs) src missingHashes patches; - hash = "sha256-AMTSCM8dNwAddI3QZMFDzxJmJPvJ9fGK79at2I0S/pE="; + hash = "sha256-Vj1s8aA+L0GwJ6qr/5IXpYM5ZAY7qIiPn9BKadcO52E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/he/heh/package.nix b/pkgs/by-name/he/heh/package.nix index a2d9475ab0ec..64e141311d02 100644 --- a/pkgs/by-name/he/heh/package.nix +++ b/pkgs/by-name/he/heh/package.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { description = "Cross-platform terminal UI used for modifying file data in hex or ASCII"; homepage = "https://github.com/ndd7xv/heh"; changelog = "https://github.com/ndd7xv/heh/releases/tag/${src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ piturnah ]; mainProgram = "heh"; }; diff --git a/pkgs/by-name/he/heimdall-proxy/package.nix b/pkgs/by-name/he/heimdall-proxy/package.nix index 5420bd567024..c4fa3bfaed21 100644 --- a/pkgs/by-name/he/heimdall-proxy/package.nix +++ b/pkgs/by-name/he/heimdall-proxy/package.nix @@ -4,7 +4,7 @@ lib, }: let - version = "0.17.16"; + version = "0.17.18"; in buildGoModule { pname = "heimdall-proxy"; @@ -15,10 +15,10 @@ buildGoModule { owner = "dadrus"; repo = "heimdall"; tag = "v${version}"; - hash = "sha256-M1aaY32ykfzKGkH1D8U8yBeEPEM20IWuJHUiHIj9IPE="; + hash = "sha256-XNcUn/Xr1zYEfURX1POwGdSZqdmPTA8SqRzP+4qNECE="; }; - vendorHash = "sha256-ZNKNsiiCHlEp5JVVwHTvQLgxBNWIFAgI8vpYGOCb0RY="; + vendorHash = "sha256-r2IpMllA8EDCGwz91qXhsRR2LoTqRbxPXfN6PIJWvqk="; tags = [ "sqlite" ]; diff --git a/pkgs/by-name/he/helio-workstation/package.nix b/pkgs/by-name/he/helio-workstation/package.nix index 5a0e29c4af7a..6e190a1c5707 100644 --- a/pkgs/by-name/he/helio-workstation/package.nix +++ b/pkgs/by-name/he/helio-workstation/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "helio-fm"; - repo = "helio-workstation"; + repo = "helio-sequencer"; tag = finalAttrs.version; fetchSubmodules = true; hash = "sha256-uEo4dxwc1HksYGU5ssYp3rLugszSir2kKo4XxgqvSno="; diff --git a/pkgs/by-name/he/helix-unwrapped/package.nix b/pkgs/by-name/he/helix-unwrapped/package.nix index 5b520dc6bbfd..fff6eed11b78 100644 --- a/pkgs/by-name/he/helix-unwrapped/package.nix +++ b/pkgs/by-name/he/helix-unwrapped/package.nix @@ -83,7 +83,6 @@ rustPlatform.buildRustPackage ( mainProgram = "hx"; maintainers = with lib.maintainers; [ aciceri - danth yusdacra ]; }; diff --git a/pkgs/by-name/he/helix/package.nix b/pkgs/by-name/he/helix/package.nix index 37fc4ea9105d..e301693489f6 100644 --- a/pkgs/by-name/he/helix/package.nix +++ b/pkgs/by-name/he/helix/package.nix @@ -6,7 +6,7 @@ helix-unwrapped, removeReferencesTo, pkgs, - tree-sitter, + tree-sitter-grammars, lockedGrammars ? lib.importJSON ./grammars.json, grammarsOverlay ? ( final: prev: { @@ -40,6 +40,12 @@ tree-sitter-vue = prev.tree-sitter-vue.override { excludeBrokenTreeSitterJson = false; }; + tree-sitter-wit = prev.tree-sitter-wit.override { + excludeBrokenTreeSitterJson = false; + }; + tree-sitter-yuck = prev.tree-sitter-yuck.override { + excludeBrokenTreeSitterJson = false; + }; } ), }: @@ -60,13 +66,9 @@ let } ) prev; - tree-sitter-grammars = + helixTreeSitterGrammars = lib.filterAttrs (drvName: _: lib.hasAttr (lib.removePrefix "tree-sitter-" drvName) lockedGrammars) - ( - tree-sitter.grammarsScope.overrideScope ( - lib.composeExtensions lockedVersionsOverlay grammarsOverlay - ) - ); + (tree-sitter-grammars.overrideScope (lib.composeExtensions lockedVersionsOverlay grammarsOverlay)); # Dynamic libraries for the grammars always use the `.so` extension, also on Darwin (should use `.dylib`) # See here: https://github.com/helix-editor/helix/pull/14982 @@ -76,7 +78,7 @@ let lib.concatMapAttrsStringSep "\n" (_: grammar: '' install -D ${grammar}/parser $out/${grammar.language}.so ${lib.getExe removeReferencesTo} -t ${grammar} $out/${grammar.language}.so - '') (lib.filterAttrs (_: lib.isDerivation) tree-sitter-grammars) + '') helixTreeSitterGrammars ); lockedGrammarsCount = lib.length (lib.attrNames lockedGrammars); @@ -107,7 +109,7 @@ symlinkJoin { passthru = { updateScript = ./update.sh; runtime = runtimeDir; - inherit tree-sitter-grammars; + tree-sitter-grammars = helixTreeSitterGrammars; }; meta = { diff --git a/pkgs/by-name/he/helm/package.nix b/pkgs/by-name/he/helm/package.nix index 1d71ea4ee24a..ddc4d6eb4d59 100644 --- a/pkgs/by-name/he/helm/package.nix +++ b/pkgs/by-name/he/helm/package.nix @@ -70,6 +70,9 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace src/common/load_save.cpp \ --replace-fail "/usr/share/" "$out/share/" + + substituteInPlace JUCE/modules/juce_audio_formats/codecs/flac/libFLAC/cpu.c \ + --replace-fail "__sigemptyset(&sigill_sse.sa_mask);" "sigemptyset(&sigill_sse.sa_mask);" ''; meta = { diff --git a/pkgs/by-name/he/helmfile/package.nix b/pkgs/by-name/he/helmfile/package.nix index 2e08367ed9f9..c7549cfc5fca 100644 --- a/pkgs/by-name/he/helmfile/package.nix +++ b/pkgs/by-name/he/helmfile/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "helmfile"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "helmfile"; repo = "helmfile"; rev = "v${finalAttrs.version}"; - hash = "sha256-5eWD4Hr65DDWAXHXk0A9Mt90ZNcGt+6NXH5ggSHA4Fk="; + hash = "sha256-fSFx4N8wN+gNITf8Ebthb3I3aDzpPY7MaljOBC3BUBM="; }; - vendorHash = "sha256-bbMBesSbDMUqaJWm3Pgauz6tNw8gB0H5vQWKZJSn3sQ="; + vendorHash = "sha256-YGFLOlev/sX/LA9+9Y3+lsMLsLtMr7xm+uqUuV4xCaY="; proxyVendor = true; # darwin/linux hash mismatch diff --git a/pkgs/by-name/he/heptabase/package.nix b/pkgs/by-name/he/heptabase/package.nix deleted file mode 100644 index 62519c6e81ca..000000000000 --- a/pkgs/by-name/he/heptabase/package.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - lib, - appimageTools, - fetchurl, -}: -let - pname = "heptabase"; - version = "1.87.2"; - src = fetchurl { - url = "https://github.com/heptameta/project-meta/releases/download/v${version}/Heptabase-${version}.AppImage"; - hash = "sha256-6O6ksa0mCUoAfXW8jzh1n7zAfLZTA45va9o6J2ghKgU="; - }; - - appimageContents = appimageTools.extractType2 { inherit pname version src; }; -in -appimageTools.wrapType2 { - inherit pname version src; - - extraInstallCommands = '' - install -Dm444 ${appimageContents}/project-meta.desktop -T $out/share/applications/heptabase.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/0x0/apps/project-meta.png $out/share/icons/hicolor/512x512/apps/${pname}.png - - substituteInPlace $out/share/applications/heptabase.desktop \ - --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=heptabase %U' \ - --replace-fail 'Icon=project-meta' 'Icon=${pname}' - - ''; - - meta = { - changelog = "https://github.com/heptameta/project-meta/releases/tag/v${version}"; - description = "Visual note-taking tool for learning complex topics"; - homepage = "https://heptabase.com/"; - license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; - mainProgram = "heptabase"; - platforms = [ "x86_64-linux" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - }; -} diff --git a/pkgs/by-name/he/herbstluftwm/package.nix b/pkgs/by-name/he/herbstluftwm/package.nix index 202fef89c74c..f3d8da4a5c2d 100644 --- a/pkgs/by-name/he/herbstluftwm/package.nix +++ b/pkgs/by-name/he/herbstluftwm/package.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation (finalAttrs: { ps: with ps; [ ewmh pytest - xlib + python-xlib ] )) xdotool diff --git a/pkgs/by-name/he/herdr/package.nix b/pkgs/by-name/he/herdr/package.nix new file mode 100644 index 000000000000..0a9b504bdcce --- /dev/null +++ b/pkgs/by-name/he/herdr/package.nix @@ -0,0 +1,87 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + zig_0_15, + installShellFiles, + cctools, + xcbuild, + versionCheckHook, + nix-update-script, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "herdr"; + version = "0.7.5"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "ogulcancelik"; + repo = "herdr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-3BA8eredGku+vsL2Af7sUf43QiArR5XTHNrI+X11vFM="; + }; + + cargoHash = "sha256-lWnc0Ka0hp7bbm+dkKKj22Dbk+Cwrld86romXs3lzBs="; + + zigDeps = zig_0_15.fetchDeps { + inherit (finalAttrs) pname version; + src = "${finalAttrs.src}/vendor/libghostty-vt"; + fetchAll = true; + hash = "sha256-PnM+hZIlLyQwK8vJgd/Bhjt1lNIz06T8FahwliRmMrY="; + }; + + nativeBuildInputs = [ + zig_0_15.hook + installShellFiles + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools + xcbuild + ]; + + # Upstream binary tests are renamed, added, or changed between releases and + # depend on host process details, so Nix-only patches for them are brittle. + doCheck = false; + + dontUseZigBuild = true; + dontUseZigCheck = true; + dontUseZigInstall = true; + + postConfigure = '' + export ZIG_GLOBAL_CACHE_DIR=$(mktemp -d) + cp -rL ${finalAttrs.zigDeps} "$ZIG_GLOBAL_CACHE_DIR/p" + chmod -R u+w "$ZIG_GLOBAL_CACHE_DIR/p" + ''; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd herdr \ + --bash <("$out/bin/herdr" completion bash) \ + --fish <("$out/bin/herdr" completion fish) \ + --zsh <("$out/bin/herdr" completion zsh) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--custom-dep" + "zigDeps" + ]; + }; + + meta = { + description = "Agent multiplexer that lives in your terminal"; + homepage = "https://herdr.dev"; + changelog = "https://github.com/ogulcancelik/herdr/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.agpl3Plus; + maintainers = with lib.maintainers; [ + kevinpita + faukah + ]; + mainProgram = "herdr"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/he/heroic-unwrapped/package.nix b/pkgs/by-name/he/heroic-unwrapped/package.nix index fe5df97a6ba3..8f0bdf3cbe88 100644 --- a/pkgs/by-name/he/heroic-unwrapped/package.nix +++ b/pkgs/by-name/he/heroic-unwrapped/package.nix @@ -4,7 +4,7 @@ stdenv, fetchFromGitHub, # Pinned, because our FODs are not guaranteed to be stable between major versions. - pnpm_10_29_2, + pnpm_10, fetchPnpmDeps, pnpmConfigHook, nodejs, @@ -21,7 +21,7 @@ }: let - pnpm = pnpm_10_29_2; + pnpm = pnpm_10; legendary = callPackage ./legendary.nix { }; epic-integration = callPackage ./epic-integration.nix { }; diff --git a/pkgs/by-name/he/hex/package.nix b/pkgs/by-name/he/hex/package.nix index d1a0bc72b859..3ba38445309b 100644 --- a/pkgs/by-name/he/hex/package.nix +++ b/pkgs/by-name/he/hex/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hex"; - version = "0.6.0"; + version = "0.7.0"; src = fetchFromGitHub { owner = "sitkevij"; repo = "hex"; rev = "v${finalAttrs.version}"; - hash = "sha256-YctXDhCMJvDQLPsuhzdyYDUIlFE2vKltNtrFFeE7YE8="; + hash = "sha256-mqBVoaPKk3gG/drvwX+nHOzIXVM53hbkBJRdKk3a6Lo="; }; - cargoHash = "sha256-3lrNZyQVP+gswbF+pqQmVIHg3bjiJ22y87PtTHDwIXs="; + cargoHash = "sha256-faZTjori9MXzH4jC73G498WI7THFkGdh31fFb/F6fvA="; passthru.tests.version = testers.testVersion { package = hex; diff --git a/pkgs/by-name/he/heynote/package.nix b/pkgs/by-name/he/heynote/package.nix index 705e33c1927b..72065ce77776 100644 --- a/pkgs/by-name/he/heynote/package.nix +++ b/pkgs/by-name/he/heynote/package.nix @@ -7,11 +7,11 @@ }: let pname = "heynote"; - version = "2.9.0"; + version = "2.9.1"; src = fetchurl { url = "https://github.com/heyman/heynote/releases/download/v${version}/Heynote_${version}_x86_64.AppImage"; - sha256 = "sha256-5SCIMvhpFUwpcZaxUwDjWRN05QFLgKKE1C2J32lapH8="; + sha256 = "sha256-37as29Jh5Xz3nEW5aryD52puqaCiAxlMBs+aRIZbbU8="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/hf/hfinger/package.nix b/pkgs/by-name/hf/hfinger/package.nix index 92989dc1325f..585b0416a84d 100644 --- a/pkgs/by-name/hf/hfinger/package.nix +++ b/pkgs/by-name/hf/hfinger/package.nix @@ -43,7 +43,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "hfinger"; homepage = "https://github.com/CERT-Polska/hfinger"; changelog = "https://github.com/CERT-Polska/hfinger/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/applications/science/biology/hh-suite/default.nix b/pkgs/by-name/hh/hh-suite/package.nix similarity index 86% rename from pkgs/applications/science/biology/hh-suite/default.nix rename to pkgs/by-name/hh/hh-suite/package.nix index d5ba108135c6..0cda352af86e 100644 --- a/pkgs/applications/science/biology/hh-suite/default.nix +++ b/pkgs/by-name/hh/hh-suite/package.nix @@ -7,19 +7,22 @@ xxd, enableMpi ? false, mpi, - openmp, + llvmPackages, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "hh-suite"; version = "3.3.0"; src = fetchFromGitHub { owner = "soedinglab"; repo = "hh-suite"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw="; }; + strictDeps = true; + __structuredAttrs = true; + patches = [ # Should be removable as soon as this upstream PR is merged: https://github.com/soedinglab/hh-suite/pull/357 (fetchpatch { @@ -39,7 +42,7 @@ stdenv.mkDerivation rec { ++ lib.optional stdenv.hostPlatform.avx2Support "-DHAVE_AVX2=1" ++ lib.optional stdenv.hostPlatform.sse4_1Support "-DHAVE_SSE4_1=1"; - buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enableMpi mpi; postPatch = '' substituteInPlace CMakeLists.txt \ @@ -55,4 +58,4 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [ natsukium ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/hi/hidden-bar/package.nix b/pkgs/by-name/hi/hidden-bar/package.nix index 9c988082070b..cc342ba837f2 100644 --- a/pkgs/by-name/hi/hidden-bar/package.nix +++ b/pkgs/by-name/hi/hidden-bar/package.nix @@ -31,7 +31,7 @@ stdenvNoCC.mkDerivation rec { description = "Ultra-light MacOS utility that helps hide menu bar icons"; homepage = "https://github.com/dwarvesf/hidden"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/hi/higan/package.nix b/pkgs/by-name/hi/higan/package.nix index 79523e2ded29..4728999cef20 100644 --- a/pkgs/by-name/hi/higan/package.nix +++ b/pkgs/by-name/hi/higan/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "higan"; - version = "115-unstable-2024-09-04"; + version = "115-unstable-2025-08-30"; src = fetchFromGitHub { owner = "higan-emu"; repo = "higan"; - rev = "a03b2e94c620eb12ab6f9936aee50e4389bee2ff"; - hash = "sha256-VpwHjA0LufKDnGRAS906Qh3R2pVt4uUGXxsRcca9SyM="; + rev = "8f4df010715298455b92cfc0821ea833770a8b5a"; + hash = "sha256-sYMVe+Sj8tR7Off+Cgl+4pndTIforXgIOMoXrAdyd9s="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hi/high-tide/package.nix b/pkgs/by-name/hi/high-tide/package.nix index d0a6c34b1026..91ceebb4eefb 100644 --- a/pkgs/by-name/hi/high-tide/package.nix +++ b/pkgs/by-name/hi/high-tide/package.nix @@ -20,14 +20,14 @@ python313Packages.buildPythonApplication (finalAttrs: { pname = "high-tide"; - version = "1.3.1"; + version = "1.5.0"; pyproject = false; src = fetchFromGitHub { owner = "Nokse22"; repo = "high-tide"; tag = "v${finalAttrs.version}"; - hash = "sha256-42R4GrFioePGOiM/p9LLE3PR/TYhhnjwa9V/kvP4SWE="; + hash = "sha256-uZkXpzRIDzn6wT3GmwNQbtf2/G9ddU13f7iMkj9Qopc="; }; nativeBuildInputs = [ @@ -60,7 +60,7 @@ python313Packages.buildPythonApplication (finalAttrs: { pygobject3 tidalapi requests - mpd2 + python-mpd2 pypresence ]); @@ -73,7 +73,7 @@ python313Packages.buildPythonApplication (finalAttrs: { meta = { description = "Libadwaita TIDAL client for Linux"; homepage = "https://github.com/Nokse22/high-tide"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "high-tide"; maintainers = with lib.maintainers; [ drafolin diff --git a/pkgs/by-name/hi/highlight-pointer/package.nix b/pkgs/by-name/hi/highlight-pointer/package.nix index 8a6bcb591d60..a828a2becd38 100644 --- a/pkgs/by-name/hi/highlight-pointer/package.nix +++ b/pkgs/by-name/hi/highlight-pointer/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highlight-pointer"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "swillner"; repo = "highlight-pointer"; tag = "v${finalAttrs.version}"; - hash = "sha256-Og09/RmLWtzVAMs79Z4eDuXWg4w2kZfXyX8K7CowFaU="; + hash = "sha256-yCm5YpOTPWRYAzX2TRhwUnSc3LbdxjwR5Z0glUm95Cg="; }; buildInputs = [ diff --git a/pkgs/by-name/hi/highscore-bsnes/package.nix b/pkgs/by-name/hi/highscore-bsnes/package.nix index 4102cae2b5a7..aed6e11ce5bd 100644 --- a/pkgs/by-name/hi/highscore-bsnes/package.nix +++ b/pkgs/by-name/hi/highscore-bsnes/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-bsnes"; - version = "0-unstable-2026-02-17"; + version = "0-unstable-2026-05-27"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "bsnes"; - rev = "db1f255622b3410485a54c7c0097c747e7144091"; - hash = "sha256-SZugEb/vzFlzHjgHE/5ha03ULB95886N0b15iIlTsqA="; + rev = "d4ced9599ac8ffcd006104783c5e7e7e6a1d5a29"; + hash = "sha256-F9YELVKl/6rBOHaec79kSZ+/6fewbFVBZW8HNGr8ts4="; }; sourceRoot = "${finalAttrs.src.name}/bsnes"; diff --git a/pkgs/by-name/hi/highscore-mgba/package.nix b/pkgs/by-name/hi/highscore-mgba/package.nix index e6befe614e7d..f349d043bdff 100644 --- a/pkgs/by-name/hi/highscore-mgba/package.nix +++ b/pkgs/by-name/hi/highscore-mgba/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "highscore-mgba"; - version = "0-unstable-2026-06-02"; + version = "0-unstable-2026-06-19"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "mgba"; - rev = "0a595ca5728ed740fa94b705a49eda304d1217a8"; - hash = "sha256-ALtMF2SOhR+/00NFFWNy4jII2zCFtPunhndOY04il5g="; + rev = "cd3561415f98421e3369c47d6da1baca2bc85f75"; + hash = "sha256-Ek76XTB5y/COiiOCz4v11+TqMus2qrngoVsdya6lJ6k="; }; outputs = [ diff --git a/pkgs/by-name/hi/highscore-sameboy/package.nix b/pkgs/by-name/hi/highscore-sameboy/package.nix index 2dbf26a11db8..5bb467f2eb35 100644 --- a/pkgs/by-name/hi/highscore-sameboy/package.nix +++ b/pkgs/by-name/hi/highscore-sameboy/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "highscore-sameboy"; - version = "0-unstable-2026-04-01"; + version = "0-unstable-2026-06-16"; src = fetchFromGitHub { owner = "highscore-emu"; repo = "SameBoy"; - rev = "f59693cc4f1f3ac547eaf25856574fb850c1da61"; - hash = "sha256-GzBTB3lqWi+Cw24fFVN9YBa3ecOA5G9756RWM6mMxvA="; + rev = "10703e58fde906df5cd80b81a104b959880bed42"; + hash = "sha256-jpMY40f3xUMl2ZJPH815F0hRqnYiEtm17KYHHLVk4jk="; }; sourceRoot = "${finalAttrs.src.name}/highscore"; diff --git a/pkgs/by-name/hi/hinoirisetr/package.nix b/pkgs/by-name/hi/hinoirisetr/package.nix new file mode 100644 index 000000000000..f81630e23e47 --- /dev/null +++ b/pkgs/by-name/hi/hinoirisetr/package.nix @@ -0,0 +1,60 @@ +{ + fetchFromForgejo, + installShellFiles, + lib, + libnotify, + pandoc, + patchelf, + rustPlatform, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hinoirisetr"; + version = "1.6.3"; + + __structuredAttrs = true; + + src = fetchFromForgejo { + domain = "git.vavakado.xyz"; + owner = "me"; + repo = "hinoirisetr"; + tag = "v${finalAttrs.version}"; + hash = "sha256-XgIeeVCnlntf2RopA6SMuFCgbqTlTEZv6V5ezjEHVKA="; + }; + + cargoHash = "sha256-lydS9TWb+Y1PPC7C3Mn6KNVX1fsooAcDKJeKMnXWZY0="; + + nativeBuildInputs = [ + installShellFiles + pandoc + patchelf + ]; + + buildInputs = [ + libnotify + ]; + + postFixup = '' + patchelf --add-rpath "${lib.getLib libnotify}/lib" $out/bin/hinoirisetr + ''; + + postBuild = '' + pandoc manpages/hinoirisetr.1.md -s -t man -o hinoirisetr.1 + ''; + + postInstall = '' + installManPage hinoirisetr.1 + ''; + + meta = { + description = "a lightweight daemon that automatically adjusts your screen's color temperature and gamma"; + homepage = "https://git.vavakado.xyz/me/hinoirisetr"; + changelog = "https://git.vavakado.xyz/me/hinoirisetr/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + vavakado + ]; + mainProgram = "hinoirisetr"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/hi/hiredis/package.nix b/pkgs/by-name/hi/hiredis/package.nix index db1dcc4c5618..77033747eb46 100644 --- a/pkgs/by-name/hi/hiredis/package.nix +++ b/pkgs/by-name/hi/hiredis/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/redis/hiredis"; description = "Minimalistic C client for Redis >= 1.2"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ hythera ]; platforms = lib.platforms.all; + teams = [ lib.teams.redis ]; }; }) diff --git a/pkgs/by-name/hi/hivemind/package.nix b/pkgs/by-name/hi/hivemind/package.nix index 6fd8813dc659..1b0d4315fc2f 100644 --- a/pkgs/by-name/hi/hivemind/package.nix +++ b/pkgs/by-name/hi/hivemind/package.nix @@ -25,7 +25,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/DarthSim/"; description = "Process manager for Procfile-based applications"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ lib.maintainers.sveitser ]; mainProgram = "hivemind"; }; diff --git a/pkgs/by-name/hk/hk/package.nix b/pkgs/by-name/hk/hk/package.nix new file mode 100644 index 000000000000..b8ed92271a0d --- /dev/null +++ b/pkgs/by-name/hk/hk/package.nix @@ -0,0 +1,83 @@ +{ + lib, + stdenv, + rustPlatform, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, + pkg-config, + libgit2, + openssl, + usage, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hk"; + version = "1.51.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jdx"; + repo = "hk"; + tag = "v${finalAttrs.version}"; + hash = "sha256-kCmujjvh2CACLrzqFal1CFc7RMzECBYsQ4W3ZnJGRV0="; + }; + + cargoHash = "sha256-hICexfvE0swz+g/9r/vR/sG2DUAK5Fj0lDTrkuWujok="; + + nativeBuildInputs = [ + installShellFiles + pkg-config + usage + ]; + + buildInputs = [ + libgit2 + openssl + ]; + + # These tests require external dependencies and are fragile -- skipping. + checkFlags = [ + "--skip=cli::init::detector::tests::test_detect_builtins_with_cargo_toml" + "--skip=cli::init::detector::tests::test_detect_builtins_with_package_json" + "--skip=cli::init::detector::tests::test_detect_eslint_with_contains" + "--skip=cli::init::detector::tests::test_detect_shell_scripts" + "--skip=cli::util::python_check_ast::tests::test_invalid_python" + "--skip=settings::tests::test_settings_builder_fluent_api" + "--skip=settings::tests::test_settings_from_config" + "--skip=settings::tests::test_settings_snapshot_caching" + ]; + + cargoBuildFlags = [ + "--bin" + "hk" + ]; + + cargoTestFlags = [ "--all-features" ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd hk \ + --bash <($out/bin/hk completion bash) \ + --fish <($out/bin/hk completion fish) \ + --zsh <($out/bin/hk completion zsh) + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool for managing git hooks"; + homepage = "https://hk.jdx.dev"; + changelog = "https://github.com/jdx/hk/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + typedrat + Br1ght0ne + ]; + mainProgram = "hk"; + }; +}) diff --git a/pkgs/by-name/hl/hl-log-viewer/package.nix b/pkgs/by-name/hl/hl-log-viewer/package.nix index fd44667d6c23..cad200fb82fc 100644 --- a/pkgs/by-name/hl/hl-log-viewer/package.nix +++ b/pkgs/by-name/hl/hl-log-viewer/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hl-log-viewer"; - version = "0.36.2"; + version = "0.36.3"; src = fetchFromGitHub { owner = "pamburus"; repo = "hl"; tag = "v${finalAttrs.version}"; - hash = "sha256-r6p4gw1QzZPu1DWzbTNDnvKMi/pqZvViK4rAn4aov4A="; + hash = "sha256-Azt1jfBZP7N5ZAgdY2Hww6nt5ty2VEKZpaHZDodP/zM="; }; - cargoHash = "sha256-8yb8elk8iG4snyExkQdJQn5eaKMNcPqYsAE/sIW6euk="; + cargoHash = "sha256-RXIXoF3z2Zleje1OakHXQxPmNkRcqHjINRZYqMXS8U0="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch index 8bb7103962d6..272089641ce1 100644 --- a/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch +++ b/pkgs/by-name/hm/hmcl/0001-nix-use-terracotta-from-nix.patch @@ -4,14 +4,14 @@ Date: Wed, 4 Feb 2026 15:36:17 +0800 Subject: [PATCH 1/2] nix: use terracotta from nix --- - .../hmcl/terracotta/TerracottaBundle.java | 21 +++---------------- - 1 file changed, 3 insertions(+), 18 deletions(-) + .../hmcl/terracotta/TerracottaBundle.java | 19 ++----------------- + 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java -index 727edde9b..5b6e8b02f 100644 +index ecc99f3..b46ada0 100644 --- a/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java +++ b/HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java -@@ -139,26 +139,11 @@ public final class TerracottaBundle { +@@ -147,26 +147,11 @@ public final class TerracottaBundle { } public Path locate(String file) { @@ -33,20 +33,13 @@ index 727edde9b..5b6e8b02f 100644 - return AbstractTerracottaProvider.Status.LEGACY_VERSION; - } - } catch (IOException e) { -- Logger.LOG.warning("Cannot determine whether legacy versions exist.", e); +- LOG.warning("Cannot determine whether legacy versions exist.", e); - } - return AbstractTerracottaProvider.Status.NOT_EXIST; + return AbstractTerracottaProvider.Status.READY; } private boolean isLocalBundleValid() throws IOException { // FIXME: Make control flow clearer. -@@ -188,4 +173,4 @@ public final class TerracottaBundle { - } - return true; - } --} -+} -\ No newline at end of file -- 2.52.0 diff --git a/pkgs/by-name/hm/hmcl/package.nix b/pkgs/by-name/hm/hmcl/package.nix index 2dba788bc092..f8d668e037a6 100644 --- a/pkgs/by-name/hm/hmcl/package.nix +++ b/pkgs/by-name/hm/hmcl/package.nix @@ -50,13 +50,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "hmcl"; - version = "3.14.1"; + version = "3.16.2"; src = fetchurl { # HMCL has built-in keys, such as the Microsoft OAuth secret and the CurseForge API key. # See https://github.com/HMCL-dev/HMCL/blob/refs/tags/release-3.6.12/.github/workflows/gradle.yml#L26-L28 url = "https://github.com/HMCL-dev/HMCL/releases/download/v${finalAttrs.version}/HMCL-${finalAttrs.version}.jar"; - hash = "sha256-j8+PIbNySlwELKKdsYQe53++w9zunKaN9TRqZq+LpYI="; + hash = "sha256-kvQDDZwA2sy8UQLZG4FqGmSh0sDcEuSg5CM6uy0DzCc="; }; # - HMCL prompts users to download prebuilt Terracotta binary for @@ -71,12 +71,12 @@ stdenv.mkDerivation (finalAttrs: { terracottaBundleJava = fetchurl { name = "hmcl-terracotta-bundle-java-${finalAttrs.version}"; url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.terracottaBundleJavaPath}"; - hash = "sha256-05U4/TUYECPgrzZbLiSPUwo5XtIm2w+T8gCdtqpsRVs="; + hash = "sha256-dZHRim/7VNW0/nA6I8r3t5zGfzIMxG2lzdZ//dzv2Gs="; }; macOSProviderJava = fetchurl { name = "hmcl-macos-provider-java-${finalAttrs.version}"; url = "https://raw.githubusercontent.com/HMCL-dev/HMCL/v${finalAttrs.version}/${finalAttrs.macOSProviderJavaPath}"; - hash = "sha256-+Zji2B8ksT7P+IObyrM9q7vHPJVl5ZtH+v/J8Mfr0Q4="; + hash = "sha256-7vI2U8vx3GYwlshoHJF/J8n2RS6TZ/cvoAivqYtW23Q="; }; terracottaBundleJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/TerracottaBundle.java"; macOSProviderJavaPath = "HMCL/src/main/java/org/jackhuang/hmcl/terracotta/provider/MacOSProvider.java"; diff --git a/pkgs/by-name/ho/holo-cli/libyang4-sys.patch b/pkgs/by-name/ho/holo-cli/libyang4-sys.patch new file mode 100644 index 000000000000..829d39818da5 --- /dev/null +++ b/pkgs/by-name/ho/holo-cli/libyang4-sys.patch @@ -0,0 +1,12 @@ +--- a/build.rs ++++ b/build.rs +@@ -62,6 +62,9 @@ + cmake_config.define("ENABLE_BUILD_TESTS", "OFF"); + cmake_config.define("CMAKE_BUILD_TYPE", "Release"); + cmake_config.define("CMAKE_POSITION_INDEPENDENT_CODE", "ON"); ++ // https://github.com/CESNET/libyang/blob/3d07c3a71534a580c3960907da17568eff7e5c64/CMakeModules/FindPCRE2.cmake#L9 ++ cmake_config.define("PCRE2_INCLUDE_DIRS", "@PCRE2_INCLUDE_DIRS@"); ++ cmake_config.define("PCRE2_LIBRARIES", "@PCRE2_LIBRARIES@"); + let cmake_dst = cmake_config.build(); + println!("cargo:root={}", env::var("OUT_DIR").unwrap()); + println!("cargo:rustc-link-search=native={}/lib", cmake_dst.display()); diff --git a/pkgs/by-name/ho/holo-cli/package.nix b/pkgs/by-name/ho/holo-cli/package.nix index e3efcf600528..7dcc9ab35b83 100644 --- a/pkgs/by-name/ho/holo-cli/package.nix +++ b/pkgs/by-name/ho/holo-cli/package.nix @@ -2,26 +2,48 @@ lib, rustPlatform, fetchFromGitHub, + + stdenv, + replaceVars, + cmake, pkg-config, protobuf, + pcre2, + nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "holo-cli"; - version = "0.5.0-unstable-2025-09-22"; + version = "0.5.0-unstable-2026-03-15"; src = fetchFromGitHub { owner = "holo-routing"; repo = "holo-cli"; - rev = "7d99e7de5eb5226728ee57153c03362c90eb65b2"; - hash = "sha256-O509LNSpak+MJPQheYLPtJQcNGPyZLMHMasKScoVnls="; + rev = "36fdc13323e384c086da8663f0d510b238fb6e4f"; + hash = "sha256-5Nvyh9gznMsutu3wHR6gwgKkIm115hbx4R6D/Gm1Rug="; }; - cargoHash = "sha256-bsoxWjOMzRRtFGEaaqK0/adhGpDcejCIY0Pzw1HjQ5U="; - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + cargoPatches = [ + # cargo lock is outdated + # https://github.com/holo-routing/holo-cli/pull/31 + ./update-cargo-lock.patch + ]; + + cargoHash = "sha256-77aUfXcnVQLVEKQuUdBZ4k5/3rOoe9PvGC0AlJS0UJc="; + + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' + pushd $cargoDepsCopy/*/libyang4-sys-* + patch -p1 < ${ + replaceVars ./libyang4-sys.patch { + PCRE2_INCLUDE_DIRS = "${lib.getInclude pcre2}/include"; + PCRE2_LIBRARIES = "${lib.getLib pcre2}/lib/libpcre2-8${stdenv.hostPlatform.extensions.sharedLibrary}"; + } + } + popd + ''; # Use rust nightly features env.RUSTC_BOOTSTRAP = 1; @@ -31,17 +53,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pkg-config protobuf ]; + buildInputs = [ pcre2 ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Holo` Command Line Interface"; homepage = "https://github.com/holo-routing/holo-cli"; - teams = with lib.teams; [ ngi ]; - maintainers = with lib.maintainers; [ themadbit ]; license = lib.licenses.mit; mainProgram = "holo-cli"; + maintainers = with lib.maintainers; [ themadbit ]; platforms = lib.platforms.all; + teams = with lib.teams; [ ngi ]; }; }) diff --git a/pkgs/by-name/ho/holo-cli/update-cargo-lock.patch b/pkgs/by-name/ho/holo-cli/update-cargo-lock.patch new file mode 100644 index 000000000000..2482abe82614 --- /dev/null +++ b/pkgs/by-name/ho/holo-cli/update-cargo-lock.patch @@ -0,0 +1,96 @@ +From 8e282c056f7d3cc00c1f1b544659f94c150e72e9 Mon Sep 17 00:00:00 2001 +From: phanirithvij +Date: Sat, 28 Mar 2026 22:01:41 +0530 +Subject: [PATCH] update cargo lock file + +Signed-off-by: phanirithvij +--- + Cargo.lock | 28 +++++++++++++++------------- + 1 file changed, 15 insertions(+), 13 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index a7279b9b9a339056b625a217a642c50e2fb97780..b1f8b251d1e0d9c3cdfa4f769b690a75c7404624 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -26,12 +26,6 @@ dependencies = [ + "memchr", + ] + +-[[package]] +-name = "android-tzdata" +-version = "0.1.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +- + [[package]] + name = "android_system_properties" + version = "0.1.5" +@@ -224,15 +218,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + + [[package]] + name = "chrono" +-version = "0.4.40" ++version = "0.4.44" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" ++checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" + dependencies = [ +- "android-tzdata", + "iana-time-zone", ++ "js-sys", + "num-traits", + "serde", +- "windows-link", ++ "wasm-bindgen", ++ "windows-link 0.2.1", + ] + + [[package]] +@@ -537,6 +532,7 @@ checksum = "fbd780fe5cc30f81464441920d82ac8740e2e46b29a6fad543ddd075229ce37e" + name = "holo-cli" + version = "0.5.0" + dependencies = [ ++ "chrono", + "clap", + "derive-new", + "enum-as-inner", +@@ -1877,7 +1873,7 @@ checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980" + dependencies = [ + "windows-implement", + "windows-interface", +- "windows-link", ++ "windows-link 0.1.1", + "windows-result", + "windows-strings", + ] +@@ -1910,13 +1906,19 @@ version = "0.1.1" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + ++[[package]] ++name = "windows-link" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" ++ + [[package]] + name = "windows-result" + version = "0.3.2" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252" + dependencies = [ +- "windows-link", ++ "windows-link 0.1.1", + ] + + [[package]] +@@ -1925,7 +1927,7 @@ version = "0.4.0" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97" + dependencies = [ +- "windows-link", ++ "windows-link 0.1.1", + ] + + [[package]] + diff --git a/pkgs/by-name/ho/holo-daemon/package.nix b/pkgs/by-name/ho/holo-daemon/package.nix index 5889281c5363..6f4338c29970 100644 --- a/pkgs/by-name/ho/holo-daemon/package.nix +++ b/pkgs/by-name/ho/holo-daemon/package.nix @@ -6,6 +6,7 @@ pkg-config, protobuf, pcre2, + pkgs, nix-update-script, }: @@ -20,8 +21,6 @@ rustPlatform.buildRustPackage (finalAttrs: { hash = "sha256-zZrse46NJb8gD4BtM20FfdtRdxVNLZ+/51dy2nuiOd8="; }; - passthru.updateScript = nix-update-script { }; - cargoHash = "sha256-cHJzwI7FDVA1iwqg+x9sMlao22SGQoOuq+MB0XtYsEc="; # Use rust nightly features @@ -36,6 +35,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pcre2 ]; + passthru = { + updateScript = nix-update-script { }; + services.default = { + imports = [ + (lib.modules.importApply ./service.nix { + inherit pkgs; + }) + ]; + holo-daemon.package = lib.mkDefault finalAttrs.finalPackage; + }; + }; + meta = { description = "`holo` daemon that provides the routing protocols, tools and policies"; homepage = "https://github.com/holo-routing/holo"; diff --git a/pkgs/by-name/ho/holo-daemon/service.nix b/pkgs/by-name/ho/holo-daemon/service.nix new file mode 100644 index 000000000000..124a1fa30719 --- /dev/null +++ b/pkgs/by-name/ho/holo-daemon/service.nix @@ -0,0 +1,133 @@ +# Non-module dependencies (`importApply`) +{ pkgs }: + +# Service module +{ + config, + lib, + ... +}: +let + inherit (lib) + mkPackageOption + mkOption + types + ; + cfg = config.holo-daemon; + format = pkgs.formats.toml { }; + configFile = format.generate "holod.toml" cfg.settings; +in +{ + _class = "service"; + + options.holo-daemon = { + package = mkPackageOption pkgs "holo-daemon" { }; + settings = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + user = mkOption { + type = types.str; + description = "User for the holo daemon"; + default = "holo"; + }; + group = mkOption { + type = types.str; + description = "Group for the holo daemon"; + default = "holo"; + }; + # Needs to be writable by @user or @group + database_path = mkOption { + type = types.str; + description = "Path to the holo database"; + default = "/var/run/holod/holod.db"; + }; + logging = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + journald = mkOption { + type = types.submodule { + options = { + enabled = mkOption { + type = types.bool; + description = "Enable or disable journald logging"; + default = true; + }; + }; + }; + description = "Journald logging configuration"; + default = { }; + }; + file = mkOption { + type = types.submodule { + options = { + enabled = mkOption { + type = types.bool; + description = "Enable or disable file logging"; + default = true; + }; + dir = mkOption { + type = types.str; + description = "Directory for log files"; + default = "/var/log/"; + }; + name = mkOption { + type = types.str; + description = "Name of the log file"; + default = "holod.log"; + }; + }; + }; + description = "File logging configuration"; + default = { }; + }; + }; + }; + description = "Logging configuration for the holo daemon"; + default = { }; + }; + plugins = mkOption { + type = types.submodule { + freeformType = format.type; + options = { + grpc = mkOption { + type = types.submodule { + options = { + enabled = mkOption { + type = types.bool; + description = "Enable or disable gRPC plugin"; + default = true; + }; + address = mkOption { + type = types.str; + description = "gRPC server listening address"; + default = "[::]:50051"; + }; + }; + }; + description = "gRPC plugin configuration"; + default = { }; + }; + }; + }; + description = "Plugin configuration for the holo daemon"; + default = { }; + }; + }; + }; + description = "Configuration for the holo daemon"; + default = { }; + }; + }; + + config = { + process.argv = [ + "${cfg.package}/bin/holod" + "-c" + configFile + ]; + }; + + meta.maintainers = with lib.maintainers; [ themadbit ]; +} diff --git a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix index 3544723fc222..b6feefcde22d 100644 --- a/pkgs/by-name/ho/home-assistant-matter-hub/package.nix +++ b/pkgs/by-name/ho/home-assistant-matter-hub/package.nix @@ -7,19 +7,20 @@ pnpmConfigHook, fetchPnpmDeps, makeWrapper, + nix-update-script, }: let pnpm = pnpm_10; in stdenvNoCC.mkDerivation (finalAttrs: { pname = "home-assistant-matter-hub"; - version = "2.0.46"; + version = "2.0.49"; src = fetchFromGitHub { owner = "RiDDiX"; repo = "home-assistant-matter-hub"; tag = "v${finalAttrs.version}"; - hash = "sha256-lVsLvniPU7VAgxrUMZsGh9/cWgqap6iyX44r+Ap2Tjk="; + hash = "sha256-AbXm70mxpqIefVyoapdYc8NC+XUTAdfRDhorMP446JI="; }; # The bundled cli.js imports transitive dependencies (e.g. @noble/curves) @@ -36,8 +37,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { pnpmWorkspaces ; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-CuO+DTLPBr1WMyUMPKKzwYUrdWJLdWfj0IqmOyysaFo="; + fetcherVersion = 4; + hash = "sha256-PESk5TexRfwD/4upUA7npGQobhFwgm87oqVS1LqzbRg="; }; __structuredAttrs = true; @@ -92,6 +93,12 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; + passthru = { + updateScript = nix-update-script { + extraArgs = [ "--use-github-releases" ]; + }; + }; + meta = { description = "Publish your home-assistant instance using Matter"; homepage = "https://riddix.github.io/home-assistant-matter-hub/"; diff --git a/pkgs/by-name/ho/homebank/package.nix b/pkgs/by-name/ho/homebank/package.nix index 83f62f87bbe9..e7026b74bd4a 100644 --- a/pkgs/by-name/ho/homebank/package.nix +++ b/pkgs/by-name/ho/homebank/package.nix @@ -13,10 +13,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "homebank"; - version = "5.10"; + version = "5.10.2"; src = fetchurl { url = "https://www.gethomebank.org/public/sources/homebank-${finalAttrs.version}.tar.gz"; - hash = "sha256-eD/Yuy67oJcT5dfBg9RU9KQ5PoKK9XY/dotIr6vFQ4Y="; + hash = "sha256-8L6v4H6iIVXI+OJneY1usF1uAV1WYLlvs0/eylprxMc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homebridge/package.nix b/pkgs/by-name/ho/homebridge/package.nix index b24a5a59c4a1..5e8a0af4aaba 100644 --- a/pkgs/by-name/ho/homebridge/package.nix +++ b/pkgs/by-name/ho/homebridge/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "homebridge"; - version = "2.1.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "homebridge"; repo = "homebridge"; tag = "v${finalAttrs.version}"; - hash = "sha256-GIq0LjDF6dyXqU6yMTY2+56lF/UkdZFtnwpNG0k7Ic0="; + hash = "sha256-Vqs4zhhBt6Be/bzu5XX9PJxGqkvEeQjUymoFlL2adcQ="; }; - npmDepsHash = "sha256-gVrmuUUwAzCc1/cBrmt9nXyxfIncIj+RyCVsrqXGgVs="; + npmDepsHash = "sha256-yswPaaTVsb/OnBi+q1Gtlz+1PLUFaMJ+2RCWB+yJZ4k="; meta = { description = "Lightweight emulator of iOS HomeKit API"; diff --git a/pkgs/by-name/ho/homepage-dashboard/package.nix b/pkgs/by-name/ho/homepage-dashboard/package.nix index 9c2c1098ad27..b958398961f6 100644 --- a/pkgs/by-name/ho/homepage-dashboard/package.nix +++ b/pkgs/by-name/ho/homepage-dashboard/package.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "homepage-dashboard"; - version = "1.12.3"; + version = "1.13.2"; src = fetchFromGitHub { owner = "gethomepage"; repo = "homepage"; tag = "v${finalAttrs.version}"; - hash = "sha256-/8JAFYi7CSRvxEvqb36TTTWUbcaIht++OgKV1rSBcmg="; + hash = "sha256-d6NNtaThDfVErGx7fFdqLdjx4UZXMN6CZUBpMZFZYhQ="; }; pnpmDeps = fetchPnpmDeps { @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { ; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-suevJNExlktuuCXRYEi8603qrxeEPLYaYp9MO2hnLEk="; + hash = "sha256-jAcAbi++Wbyi07YdPuIhDAeNT4fJVAIxp51boD30x3k="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ho/homerow/package.nix b/pkgs/by-name/ho/homerow/package.nix new file mode 100644 index 000000000000..920f9afb5066 --- /dev/null +++ b/pkgs/by-name/ho/homerow/package.nix @@ -0,0 +1,37 @@ +{ + lib, + fetchzip, + stdenvNoCC, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "homerow"; + version = "1.5.3"; + + strictDeps = true; + __structuredAttrs = true; + + src = fetchzip { + url = "https://builds.homerow.app/v${finalAttrs.version}/Homerow.zip"; + hash = "sha256-zqa1QYq7UF80z0cvMZJMgTQFo3vqGdwzuLVMwgyuMME="; + stripRoot = false; + }; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R *.app "$out/Applications" + + runHook postInstall + ''; + + meta = { + description = "Keyboard shortcuts for every button in macOS"; + homepage = "https://www.homerow.app/"; + license = lib.licenses.unfree; + maintainers = with lib.maintainers; [ shunueda ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/ho/hongdown/package.nix b/pkgs/by-name/ho/hongdown/package.nix index 30f8beb67ae2..f7250d2adf72 100644 --- a/pkgs/by-name/ho/hongdown/package.nix +++ b/pkgs/by-name/ho/hongdown/package.nix @@ -5,15 +5,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "hongdown"; - version = "0.3.4"; + version = "0.5.1"; src = fetchFromGitHub { owner = "dahlia"; repo = "hongdown"; tag = finalAttrs.version; - hash = "sha256-Bj0ECrYRnXSjgyblocnVjdYipuzbX2+G3KRWZvdR9Rk="; + hash = "sha256-JnfYBPWnZgZ7149yVsabP3n2+GnxR6ZvK0S+4w6x/c4="; }; - cargoHash = "sha256-q84orbkrcKbO5FeI9dk0E92EtE9eQ8n/yGjXzh9MIgg="; + cargoHash = "sha256-Vn5dEaDnZ2FQ6ZlDKbbQ5lUvjyhIuhT2/xEaZ8KWmRA="; meta = { description = "Markdown formatter that enforces Hong Minhee's Markdown style conventions"; mainProgram = "hongdown"; diff --git a/pkgs/by-name/ho/honggfuzz/package.nix b/pkgs/by-name/ho/honggfuzz/package.nix index 72f7330a77a6..7de83d8baf72 100644 --- a/pkgs/by-name/ho/honggfuzz/package.nix +++ b/pkgs/by-name/ho/honggfuzz/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "honggfuzz"; - version = "2.6-unstable-2026-04-13"; + version = "2.6-unstable-2026-06-19"; src = fetchFromGitHub { owner = "google"; repo = "honggfuzz"; - rev = "48790f7b18f30ba4a95272ea290b720662ed56c9"; - hash = "sha256-RHNOZF5ttqdh3daGGVRHkvL9g2aZFDGDmmW056ohI6w="; + rev = "cf8b66a4d09f4d4d786d96e3c46d9141fb4e98e2"; + hash = "sha256-cu7VLQvdmgYIbWhAiZjG5wkO/b5+FoBmXp/SlYmykF0="; }; postPatch = '' diff --git a/pkgs/by-name/ho/hoppscotch/package.nix b/pkgs/by-name/ho/hoppscotch/package.nix index e45ed21adc28..ddbfdba315b7 100644 --- a/pkgs/by-name/ho/hoppscotch/package.nix +++ b/pkgs/by-name/ho/hoppscotch/package.nix @@ -17,10 +17,6 @@ let url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_aarch64.dmg"; hash = "sha256-RnLMpXkDAk89T5ogNiVz8zMMdLtXTlAg5nu+sjyczEk="; }; - x86_64-darwin = { - url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_mac_x64.dmg"; - hash = "sha256-dBjwElYc3+TpAbho/8p946VtEDlCVDsfCSidQUKVC/U="; - }; x86_64-linux = { url = "https://github.com/hoppscotch/releases/releases/download/v${version}/Hoppscotch_linux_x64.AppImage"; hash = "sha256-irPI613Y1l0j5F+Nzm9v/JXsiJY35D8dQpmMcPMYvmU="; @@ -46,7 +42,6 @@ let mainProgram = "hoppscotch"; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ho/hoppscotch/update.sh b/pkgs/by-name/ho/hoppscotch/update.sh index dd18d1942cad..ce3a73ceb62c 100755 --- a/pkgs/by-name/ho/hoppscotch/update.sh +++ b/pkgs/by-name/ho/hoppscotch/update.sh @@ -17,7 +17,6 @@ update-source-version hoppscotch $latestVersion || true for system in \ x86_64-linux \ - x86_64-darwin \ aarch64-darwin; do hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 $(nix-prefetch-url $(nix-instantiate --eval -E "with import $BASEDIR {}; hoppscotch.src.url" --system "$system" | tr -d '"'))) (cd $BASEDIR && update-source-version hoppscotch $latestVersion $hash --system=$system --ignore-same-version) diff --git a/pkgs/by-name/ho/hostapd/package.nix b/pkgs/by-name/ho/hostapd/package.nix index 1d6b53f4c8a0..1387b69dffdd 100644 --- a/pkgs/by-name/ho/hostapd/package.nix +++ b/pkgs/by-name/ho/hostapd/package.nix @@ -128,6 +128,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://w1.fi/hostapd/"; description = "User space daemon for access point and authentication servers"; license = lib.licenses.bsd3; + mainProgram = "hostapd"; maintainers = with lib.maintainers; [ oddlama ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ho/hotdoc/clang.patch b/pkgs/by-name/ho/hotdoc/clang.patch new file mode 100644 index 000000000000..cf5c10fca3d4 --- /dev/null +++ b/pkgs/by-name/ho/hotdoc/clang.patch @@ -0,0 +1,78 @@ +diff --git a/hotdoc/extensions/c/c_extension.py b/hotdoc/extensions/c/c_extension.py +index 1cfd5b3..1e1926f 100644 +--- a/hotdoc/extensions/c/c_extension.py ++++ b/hotdoc/extensions/c/c_extension.py +@@ -44,14 +44,6 @@ from hotdoc.utils.loggable import (info as core_info, warn, Logger, + debug as core_debug) + + +-LLVM_CONFIG = os.environ.get("LLVM_CONFIG") +-if LLVM_CONFIG is None: +- LLVM_CONFIG = shutil.which('llvm-config') +- +-if LLVM_CONFIG is None: +- raise ImportError() +- +- + def ast_node_is_function_pointer(ast_node): + if ast_node.kind == cindex.TypeKind.POINTER and \ + ast_node.get_pointee().get_result().kind != \ +@@ -80,42 +72,26 @@ Logger.register_warning_code('clang-headers-not-found', HotdocException, + 'c-extension') + + +-CLANG_HEADERS_WARNING = ( +- 'Did not find clang headers. Please report a bug with the output of the' +- '\'llvm-config --version\' and \'llvm-config --prefix\' commands') +- +- + def get_clang_headers(): + try: + # Clang 5.0+ can tell us directly + resource_dir = subprocess.check_output( +- ['clang', '--print-resource-dir']).strip().decode() ++ ['@clang@', '--print-resource-dir']).strip().decode() + if len(resource_dir) > 0: + include_dir = os.path.join(resource_dir, 'include') + if os.path.exists(include_dir): + return include_dir + except subprocess.CalledProcessError: + pass +- version = subprocess.check_output( +- [LLVM_CONFIG, '--version']).strip().decode() +- prefix = subprocess.check_output( +- [LLVM_CONFIG, '--prefix']).strip().decode() +- versions = (version, version.split('.').pop(0)) +- for (ver, lib) in itertools.product( +- versions, +- ['lib', 'lib64']): +- p = os.path.join(prefix, lib, 'clang', ver, 'include') +- if os.path.exists(p): +- return p + +- warn('clang-headers-not-found', CLANG_HEADERS_WARNING) ++ warn('clang-headers-not-found', 'Did not find clang headers. Make sure you\'re using Clang 5.0+') + + + CLANG_HEADERS = get_clang_headers() + + + def get_clang_libdir(): +- return subprocess.check_output([LLVM_CONFIG, '--libdir']).strip().decode() ++ return '@libclang_lib_dir@' + + + class ClangScanner(object): +diff --git a/hotdoc/extensions/c/clang/cindex.py b/hotdoc/extensions/c/clang/cindex.py +index fc93fda..0a16651 100644 +--- a/hotdoc/extensions/c/clang/cindex.py ++++ b/hotdoc/extensions/c/clang/cindex.py +@@ -3949,6 +3949,8 @@ class Config: + + if Config.library_path: + file = Config.library_path + '/' + file ++ else: ++ file = "@libclang_lib_dir@" + '/' + file + + return file + diff --git a/pkgs/development/tools/hotdoc/fix-cmake-4.patch b/pkgs/by-name/ho/hotdoc/fix-cmake-4.patch similarity index 100% rename from pkgs/development/tools/hotdoc/fix-cmake-4.patch rename to pkgs/by-name/ho/hotdoc/fix-cmake-4.patch diff --git a/pkgs/development/tools/hotdoc/default.nix b/pkgs/by-name/ho/hotdoc/package.nix similarity index 56% rename from pkgs/development/tools/hotdoc/default.nix rename to pkgs/by-name/ho/hotdoc/package.nix index 64f7538ca37b..26576ee89438 100644 --- a/pkgs/development/tools/hotdoc/default.nix +++ b/pkgs/by-name/ho/hotdoc/package.nix @@ -1,37 +1,21 @@ { lib, stdenv, - buildPythonApplication, + python3Packages, fetchpatch, fetchPypi, replaceVars, - clang, - libclang, - pytestCheckHook, pkg-config, cmake, flex, glib, json-glib, libxml2, - appdirs, - backports-entry-points-selectable, - dbus-deviation, - faust-cchardet, - feedgen, - lxml, - networkx, - pkgconfig, - pyyaml, - schema, - setuptools, - toposort, - wheezy-template, llvmPackages, gst_all_1, }: -buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "hotdoc"; version = "0.17.4"; pyproject = true; @@ -43,8 +27,8 @@ buildPythonApplication rec { patches = [ (replaceVars ./clang.patch { - clang = lib.getExe clang; - libclang = "${lib.getLib libclang}/lib/libclang${stdenv.hostPlatform.extensions.sharedLibrary}"; + clang = lib.getExe llvmPackages.clang; + libclang_lib_dir = "${lib.getLib llvmPackages.libclang}/lib"; }) # Fix build with gcc15 @@ -55,7 +39,9 @@ buildPythonApplication rec { }) ]; - build-system = [ setuptools ]; + postPatch = '' + patch -p1 -d cmark -i ${./fix-cmake-4.patch} + ''; nativeBuildInputs = [ pkg-config @@ -66,10 +52,12 @@ buildPythonApplication rec { buildInputs = [ glib json-glib - libxml2.dev + libxml2 ]; - dependencies = [ + build-system = with python3Packages; [ setuptools ]; + + dependencies = with python3Packages; [ appdirs backports-entry-points-selectable dbus-deviation @@ -85,7 +73,7 @@ buildPythonApplication rec { wheezy-template ]; - nativeCheckInputs = [ pytestCheckHook ]; + nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; # CMake is used to build CMARK, but the build system is still python dontUseCmakeConfigure = true; @@ -103,14 +91,6 @@ buildPythonApplication rec { "hotdoc" ]; - disabledTestPaths = [ - # Executing hotdoc exits with code 1 - "tests/test_hotdoc.py::TestHotdoc::test_basic" - "tests/test_hotdoc.py::TestHotdoc::test_explicit_conf_file" - "tests/test_hotdoc.py::TestHotdoc::test_implicit_conf_file" - "tests/test_hotdoc.py::TestHotdoc::test_private_folder" - ]; - disabledTests = [ # Test does not correctly handle path normalization for test comparison "test_cli_overrides" @@ -120,20 +100,6 @@ buildPythonApplication rec { "test_index" ]; - postPatch = - # Hardcode libclang paths - '' - substituteInPlace hotdoc/extensions/c/c_extension.py \ - --replace "shutil.which('llvm-config')" 'True' \ - --replace "subprocess.check_output(['llvm-config', '--version']).strip().decode()" '"${lib.versions.major llvmPackages.libclang.version}"' \ - --replace "subprocess.check_output(['llvm-config', '--prefix']).strip().decode()" '"${lib.getLib llvmPackages.libclang}"' \ - --replace "subprocess.check_output(['llvm-config', '--libdir']).strip().decode()" '"${lib.getLib llvmPackages.libclang}/lib"' - '' - # - + '' - patch -p1 -d cmark -i ${./fix-cmake-4.patch} - ''; - # Make pytest run from a temp dir to have it pick up installed package for cmark preCheck = '' pushd $TMPDIR @@ -149,7 +115,7 @@ buildPythonApplication rec { meta = { description = "Tastiest API documentation system"; homepage = "https://hotdoc.github.io/"; - license = [ lib.licenses.lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; }; } diff --git a/pkgs/by-name/ho/hover/package.nix b/pkgs/by-name/ho/hover/package.nix index 90de28ebf09e..b2718923a68d 100644 --- a/pkgs/by-name/ho/hover/package.nix +++ b/pkgs/by-name/ho/hover/package.nix @@ -48,7 +48,7 @@ let meta = { description = "Build tool to run Flutter applications on desktop"; homepage = "https://github.com/go-flutter-desktop/hover"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.ericdallo ]; }; diff --git a/pkgs/by-name/ho/howl/package.nix b/pkgs/by-name/ho/howl/package.nix index 7f04a9497a48..6c4cd032ace6 100644 --- a/pkgs/by-name/ho/howl/package.nix +++ b/pkgs/by-name/ho/howl/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ euxane ]; mainProgram = "howl"; - # LuaJIT and Howl builds fail for x86_64-darwin and aarch64-linux respectively + # Howl builds fail for aarch64-linux platforms = [ "i686-linux" "x86_64-linux" diff --git a/pkgs/by-name/hp/hpx/package.nix b/pkgs/by-name/hp/hpx/package.nix index 3fb86c2680d4..fd9fe7a86388 100644 --- a/pkgs/by-name/hp/hpx/package.nix +++ b/pkgs/by-name/hp/hpx/package.nix @@ -16,14 +16,14 @@ stdenv.mkDerivation (finalAttrs: { version = "1.11.0"; src = fetchFromGitHub { - owner = "STEllAR-GROUP"; + owner = "TheHPXProject"; repo = "hpx"; rev = "v${finalAttrs.version}"; hash = "sha256-AhByaw1KnEDuRfKiN+/vQMbkG0BJ6Z3+h+QT8scFzAY="; }; patches = [ - # https://github.com/STEllAR-GROUP/hpx/pull/6731 + # https://github.com/TheHPXProject/hpx/pull/6731 # Fix build with asio >= 1.34.0 ./remove_deprecated_asio_features.patch ]; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C++ standard library for concurrency and parallelism"; - homepage = "https://github.com/STEllAR-GROUP/hpx"; + homepage = "https://github.com/TheHPXProject/hpx"; license = lib.licenses.boost; platforms = [ "x86_64-linux" ]; # lib.platforms.linux; maintainers = with lib.maintainers; [ bobakker ]; diff --git a/pkgs/by-name/hq/hqplayerd/package.nix b/pkgs/by-name/hq/hqplayerd/package.nix index 54f8c7d13a2e..ef52b3ad614b 100644 --- a/pkgs/by-name/hq/hqplayerd/package.nix +++ b/pkgs/by-name/hq/hqplayerd/package.nix @@ -8,8 +8,8 @@ fetchurl, flac, gcc14, - gssdp, - gupnp, + # gssdp, + # gupnp, gupnp-av, lame, libgmpris, @@ -49,8 +49,8 @@ stdenv.mkDerivation rec { flac gcc14.cc.lib rygel-hqplayerd - gssdp - gupnp + # gssdp + # gupnp gupnp-av lame libgmpris @@ -111,6 +111,11 @@ stdenv.mkDerivation rec { }; meta = { + # libsoup 2.4 and its dependents (specifically gupnp and gssdp) were + # removed due to being insecure and having many known vulnerabilities. this + # thus no longer builds. this may be unbroken by updating to hqplayer 6.0, + # as it ostensibly removes the need for rygel and gupnp at all. + broken = true; homepage = "https://www.signalyst.com/custom.html"; description = "High-end upsampling multichannel software embedded HD-audio player"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/hq/hqplayerd/rygel.nix b/pkgs/by-name/hq/hqplayerd/rygel.nix index 14d7c082a830..b8fb0c496e6e 100644 --- a/pkgs/by-name/hq/hqplayerd/rygel.nix +++ b/pkgs/by-name/hq/hqplayerd/rygel.nix @@ -12,13 +12,13 @@ wrapGAppsHook3, python3, glib, - gssdp, - gupnp, + # gssdp, + # gupnp, gupnp-av, gupnp-dlna, gst_all_1, libgee, - libsoup_2_4, + # libsoup_2_4, gtk3, libmediaart, sqlite, @@ -61,12 +61,12 @@ stdenv.mkDerivation rec { buildInputs = [ glib - gssdp - gupnp + # gssdp + # gupnp gupnp-av gupnp-dlna libgee - libsoup_2_4 + # libsoup_2_4 gtk3 libmediaart sqlite @@ -105,6 +105,11 @@ stdenv.mkDerivation rec { }; meta = { + # libsoup 2.4 and its dependents (specifically gupnp and gssdp) were + # removed due to being insecure and having many known vulnerabilities. this + # thus no longer builds. this derivation might be obsoleted by updating to + # hqplayer 6.0, as it ostensibly removes the need for rygel. + broken = true; description = "Home media solution (UPnP AV MediaServer) that allows you to easily share audio, video and pictures to other devices"; homepage = "https://gitlab.gnome.org/GNOME/rygel"; license = lib.licenses.lgpl21Plus; diff --git a/pkgs/by-name/hs/hss/package.nix b/pkgs/by-name/hs/hss/package.nix index e3f1104af783..3afed755415a 100644 --- a/pkgs/by-name/hs/hss/package.nix +++ b/pkgs/by-name/hs/hss/package.nix @@ -17,12 +17,12 @@ buildRubyGem rec { name = "hss-${version}"; inherit ruby; gemName = "hss"; - version = "1.0.1"; - source.sha256 = "0hdfpxxqsh6gisn8mm0knsl1aig9fir0h2x9sirk3gr36qbz5xa4"; + version = "1.1.0"; + source.sha256 = "0zfgsiqy2c99c6hlg69bzj83kn6clkw1jmz6n6xh9ap4hz17blgm"; postInstall = '' substituteInPlace $GEM_HOME/gems/${gemName}-${version}/bin/hss \ - --replace \ + --replace-fail \ "'ssh'" \ "'${openssh}/bin/ssh'" ''; @@ -33,7 +33,10 @@ buildRubyGem rec { ''; homepage = "https://github.com/akerl/hss"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ nixy ]; + maintainers = with lib.maintainers; [ + nixy + lukas-sgx + ]; platforms = lib.platforms.unix; mainProgram = "hss"; }; diff --git a/pkgs/by-name/hs/hstr/package.nix b/pkgs/by-name/hs/hstr/package.nix index 354a90f0afdb..b5b40ce6b109 100644 --- a/pkgs/by-name/hs/hstr/package.nix +++ b/pkgs/by-name/hs/hstr/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { version = "3.2"; src = fetchFromGitHub { - owner = "dvorka"; + owner = "dvorka-oss"; repo = "hstr"; tag = "v${finalAttrs.version}"; hash = "sha256-c+YUpry96OGJ7nmBw180W2r0z4EBd2Cl3SyOQrNxP+o="; @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--prefix=$(out)" ]; meta = { - homepage = "https://github.com/dvorka/hstr"; + homepage = "https://github.com/dvorka-oss/hstr"; description = "Shell history suggest box - easily view, navigate, search and use your command history"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.matthiasbeyer ]; diff --git a/pkgs/by-name/ht/htmltest/package.nix b/pkgs/by-name/ht/htmltest/package.nix index ff0d289a345e..968a21ddb2bb 100644 --- a/pkgs/by-name/ht/htmltest/package.nix +++ b/pkgs/by-name/ht/htmltest/package.nix @@ -34,7 +34,7 @@ buildGoModule (finalAttrs: { links, images, scripts references work, your alt tags are filled in, etc. ''; homepage = "https://github.com/wjdp/htmltest"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ht/htop/package.nix b/pkgs/by-name/ht/htop/package.nix index 4ae8a43bd410..39719314437b 100644 --- a/pkgs/by-name/ht/htop/package.nix +++ b/pkgs/by-name/ht/htop/package.nix @@ -19,13 +19,13 @@ assert systemdSupport -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation (finalAttrs: { pname = "htop" + lib.optionalString withVimKeys "-vim"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "htop-dev"; repo = "htop"; tag = finalAttrs.version; - hash = "sha256-mw7pixNk+AF2Hz8YUkkUleQpR8yNF0pb1NjYgID076A="; + hash = "sha256-YKv0ski+lT4nMsGou0KmvXTbyG4DZYSq4+TU7Ts2qfo="; }; patches = lib.optional withVimKeys (fetchpatch2 { diff --git a/pkgs/by-name/ht/httpdump/package.nix b/pkgs/by-name/ht/httpdump/package.nix index 352e4d14425c..9285923c7f7e 100644 --- a/pkgs/by-name/ht/httpdump/package.nix +++ b/pkgs/by-name/ht/httpdump/package.nix @@ -29,7 +29,7 @@ buildGoModule { description = "Parse and display HTTP traffic from network device or pcap file"; mainProgram = "httpdump"; homepage = "https://github.com/hsiafan/httpdump"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ht/httpx/package.nix b/pkgs/by-name/ht/httpx/package.nix index 00f445e5d0da..cf614a722144 100644 --- a/pkgs/by-name/ht/httpx/package.nix +++ b/pkgs/by-name/ht/httpx/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "httpx"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; tag = "v${finalAttrs.version}"; - hash = "sha256-WVmxXdQUNrWaVgxx9cirafgsW8+wuNsYyCXYV3mvX9E="; + hash = "sha256-j5OvWPwu5dVWTa5a/eY+CpzijYNO6K4mwnnuyXdAoEc="; }; - vendorHash = "sha256-ALC8vhK/vzuKpiE1iQ2u0Orx/fUw5eVz32LyMrdrrrk="; + vendorHash = "sha256-Lx/m8B5rxuU5TI0BZe19aVBkc+ye2CkpIINydhLgajM="; subPackages = [ "cmd/httpx" ]; diff --git a/pkgs/by-name/ht/httrack/package.nix b/pkgs/by-name/ht/httrack/package.nix index 909980769ba5..56959795a99b 100644 --- a/pkgs/by-name/ht/httrack/package.nix +++ b/pkgs/by-name/ht/httrack/package.nix @@ -8,15 +8,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "3.49.6"; + version = "3.49.7"; pname = "httrack"; src = fetchFromGitHub { owner = "xroche"; repo = "httrack"; - # 3.49.6 is not tagged, but corresponds to this rev. - rev = "748c35de7858ead963daf1393ad023d75b7820c2"; - hash = "sha256-Iaeo6lB84I0amr2C8iZ+kQ6F8AXqyyARV6FiwpBshvA="; + tag = finalAttrs.version; + hash = "sha256-GTNXTFU5a/c1F6dBE8iHOq4PyTgUhXrjLEE6FsPeJbQ="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/hu/hub/package.nix b/pkgs/by-name/hu/hub/package.nix index 53dd1f77827d..c4d347e3e9a3 100644 --- a/pkgs/by-name/hu/hub/package.nix +++ b/pkgs/by-name/hu/hub/package.nix @@ -16,7 +16,7 @@ buildGoModule (finalAttrs: { version = "unstable-2022-12-01"; src = fetchFromGitHub { - owner = "github"; + owner = "mislav"; repo = "hub"; rev = "38bcd4ae469e5f53f01901340b715c7658ab417a"; hash = "sha256-V2GvwKj0m2UXxE42G23OHXyAsTrVRNw1p5CAaJxGYog="; @@ -24,15 +24,15 @@ buildGoModule (finalAttrs: { patches = [ # Fix `fish` completions - # https://github.com/github/hub/pull/3036 + # https://github.com/mislav/hub/pull/3036 (fetchpatch { - url = "https://github.com/github/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; + url = "https://github.com/mislav/hub/commit/439b7699e79471fc789929bcdea2f30bd719963e.patch"; hash = "sha256-pR/OkGa2ICR4n1pLNx8E2UTtLeDwFtXxeeTB94KFjC4="; }) # Fix `bash` completions - # https://github.com/github/hub/pull/2948 + # https://github.com/mislav/hub/pull/2948 (fetchpatch { - url = "https://github.com/github/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; + url = "https://github.com/mislav/hub/commit/64b291006f208fc7db1d5be96ff7db5535f1d853.patch"; hash = "sha256-jGFFIvSKEIpTQY0Wz63cqciUk25MzPHv5Z1ox8l7wmo="; }) ]; diff --git a/pkgs/by-name/hu/hubstaff/package.nix b/pkgs/by-name/hu/hubstaff/package.nix index d1a490cc76c9..d4f97a31b95a 100644 --- a/pkgs/by-name/hu/hubstaff/package.nix +++ b/pkgs/by-name/hu/hubstaff/package.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation { name = "netsoft-com.netsoft.hubstaff"; desktopName = "Hubstaff"; exec = "HubstaffClient"; - icon = "hubstaff"; + icon = "hubstaff-color"; comment = "Time tracking software"; categories = [ "Office" @@ -119,6 +119,13 @@ stdenv.mkDerivation { # Why is this needed? SEGV otherwise. ln -s $opt/data/resources $opt/x86_64/resources + + # Link icons to the standard directory + for dir in $opt/data/resources/hicolor/[0-9]*x[0-9]*; do + size=$(basename "$dir") + mkdir -p $out/share/icons/hicolor/$size/apps + ln -s $dir/apps/hubstaff-color.png $out/share/icons/hicolor/$size/apps/hubstaff-color.png + done runHook postInstall ''; diff --git a/pkgs/by-name/hu/hue-plus/package.nix b/pkgs/by-name/hu/hue-plus/package.nix index c229d5df7038..e0e3c2b609e9 100644 --- a/pkgs/by-name/hu/hue-plus/package.nix +++ b/pkgs/by-name/hu/hue-plus/package.nix @@ -5,16 +5,18 @@ libsForQt5, }: -python3Packages.buildPythonApplication { +python3Packages.buildPythonApplication (finalAttrs: { pname = "hue-plus"; version = "1.4.5"; - format = "setuptools"; + pyproject = true; + + build-system = with python3Packages; [ setuptools ]; src = fetchFromGitHub { owner = "kusti8"; repo = "hue-plus"; - rev = "7ce7c4603c6d0ab1da29b0d4080aa05f57bd1760"; - sha256 = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; + tag = "v.${finalAttrs.version}"; # Only the latest tag uses a . between v and 1. + hash = "sha256-dDIJXhB3rmKnawOYJHE7WK38b0M5722zA+yLgpEjDyI="; }; buildInputs = [ libsForQt5.qtbase ]; @@ -29,7 +31,6 @@ python3Packages.buildPythonApplication { setuptools ]; - doCheck = false; dontWrapQtApps = true; makeWrapperArgs = [ @@ -44,5 +45,6 @@ python3Packages.buildPythonApplication { ''; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ garaiza-93 ]; + mainProgram = "hue"; }; -} +}) diff --git a/pkgs/by-name/hu/hugo/package.nix b/pkgs/by-name/hu/hugo/package.nix index e3fb27c5845d..671d3614c1cb 100644 --- a/pkgs/by-name/hu/hugo/package.nix +++ b/pkgs/by-name/hu/hugo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "hugo"; - version = "0.162.1"; + version = "0.164.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = "hugo"; tag = "v${finalAttrs.version}"; - hash = "sha256-n3BL09Aqq/sL2d0idzxKhRv/chEComNbIp/e4euqKL4="; + hash = "sha256-hpxz5zOggqqYVTUkgwpkWcOa7sdGaWrRJUnXjJx59cA="; }; - vendorHash = "sha256-Wm2CMGhpVSL9K5pMdkQwH4HwI2uV9f7gq9wr/NHNLOI="; + vendorHash = "sha256-35VeZOtnwgYVuabzJ3+FjvhtoJGZcVRo+TWPTBAWVC4="; checkFlags = let diff --git a/pkgs/by-name/hu/humility/package.nix b/pkgs/by-name/hu/humility/package.nix index 93a032cc52a4..2dfa7dd81007 100644 --- a/pkgs/by-name/hu/humility/package.nix +++ b/pkgs/by-name/hu/humility/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage { description = "Debugger for Hubris"; mainProgram = "humility"; homepage = "https://github.com/oxidecomputer/humility"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ therishidesai ]; }; } diff --git a/pkgs/by-name/hu/hunk/package.nix b/pkgs/by-name/hu/hunk/package.nix new file mode 100644 index 000000000000..df60a63ad100 --- /dev/null +++ b/pkgs/by-name/hu/hunk/package.nix @@ -0,0 +1,152 @@ +{ + lib, + stdenv, + bun, + fetchFromGitHub, + nix-update-script, + versionCheckHook, + writableTmpDirAsHomeHook, +}: + +let + pname = "hunk"; + version = "0.17.3"; + + src = fetchFromGitHub { + owner = "modem-dev"; + repo = "hunk"; + tag = "v${version}"; + hash = "sha256-Sm/JPTjKw6zbXmBqiXt9wogTR0C24wxVzK3G9Ms7h9Y="; + }; + + node_modules = stdenv.mkDerivation { + pname = "${pname}-node_modules"; + inherit version src; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + export BUN_INSTALL_CACHE_DIR=$(mktemp -d) + bun install \ + --cpu="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress \ + --os="*" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -R node_modules $out + find packages -type d -name node_modules -exec cp -R --parents {} $out \; + + runHook postInstall + ''; + + dontFixup = true; + + outputHash = "sha256-m1XHfN5wnIoEFBnNMAUPErgL56KzKPMWmUJuz6T0vts="; + outputHashMode = "recursive"; + }; +in +stdenv.mkDerivation { + inherit pname version src; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + configurePhase = '' + runHook preConfigure + + cp -R ${node_modules}/. . + chmod -R u+w node_modules + find packages -type d -name node_modules -exec chmod -R u+w {} \; + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + mkdir -p .bun-tmp .bun-install + BUN_TMPDIR=$PWD/.bun-tmp \ + BUN_INSTALL=$PWD/.bun-install \ + bun build --compile \ + --no-compile-autoload-bunfig \ + --no-compile-autoload-dotenv \ + src/main.tsx \ + --outfile hunk + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 hunk $out/bin/hunk + mkdir -p $out/share/hunk + cp -R skills $out/share/hunk/skills + ln -s share/hunk/skills $out/skills + + runHook postInstall + ''; + + dontFixup = true; + dontStrip = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "--version"; + + installCheckPhase = '' + runHook preInstallCheck + + $out/bin/hunk --version | grep -F ${version} + test -f "$($out/bin/hunk skill path)" + + runHook postInstallCheck + ''; + + passthru = { + inherit node_modules; + updateScript = nix-update-script { + extraArgs = [ + "--subpackage" + "node_modules" + ]; + }; + }; + + meta = { + description = "Terminal diff viewer for agentic changesets"; + homepage = "https://github.com/modem-dev/hunk"; + changelog = "https://github.com/modem-dev/hunk/releases/tag/v${version}"; + license = lib.licenses.mit; + mainProgram = "hunk"; + maintainers = with lib.maintainers; [ + MarkusZoppelt + kaynetik + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.fromSource ]; + }; +} diff --git a/pkgs/by-name/hu/hunspell/dictionaries.nix b/pkgs/by-name/hu/hunspell/dictionaries.nix index 1fa3ea9a7839..9ca7e0e7a303 100644 --- a/pkgs/by-name/hu/hunspell/dictionaries.nix +++ b/pkgs/by-name/hu/hunspell/dictionaries.nix @@ -866,6 +866,28 @@ rec { ]; }; + ru_RU-mozilla = ru-ru-mozilla; + ru-ru-mozilla = mkDict { + pname = "hunspell-dict-ru-ru-mozilla"; + version = "0-unstable-2026-05-30"; + + src = fetchFromGitHub { + owner = "Goudron"; + repo = "ru-spelling-dictionary"; + rev = "43cc600462d8681bc6e92d1afb29874e2902ea9b"; + hash = "sha256-EN/f5lbpBiyItEFcHTJbuwuJF3rghkB1f5T9G0a2tdk="; + }; + + dictFileName = "ru_RU"; + readmeFile = "README.md"; + + meta = { + description = "Hunspell dictionary for Russian, updated version as used in Mozilla products"; + homepage = "https://github.com/Goudron/ru-spelling-dictionary"; + license = lib.licenses.mpl20; + }; + }; + # CZECH cs_CZ = cs-cz; @@ -874,7 +896,7 @@ rec { dictFileName = "cs_CZ"; shortDescription = "Czech (Czechia)"; readmeFile = "README_cs.txt"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; }; # SLOVAK @@ -966,7 +988,7 @@ rec { dictFileName = "he_IL"; shortDescription = "Hebrew (Israel)"; readmeFile = "README_he_IL.txt"; - license = with lib.licenses; [ agpl3Plus ]; + license = lib.licenses.agpl3Plus; }; # THAI @@ -986,7 +1008,7 @@ rec { meta = { description = "Hunspell dictionary for Central Thai (Thailand)"; homepage = "https://github.com/SyafiqHadzir/Hunspell-TH"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ toastal ]; # looking for a native speaker platforms = lib.platforms.all; }; @@ -1031,7 +1053,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Bokmål (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; nn_NO = nn-no; @@ -1041,7 +1063,7 @@ rec { sourceRoot = "no"; readmeFile = "README_hyph_NO.txt"; shortDescription = "Norwegian Nynorsk (Norway)"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; }; # TOKI PONA @@ -1099,7 +1121,7 @@ rec { dictFileName = "pt_BR"; shortDescription = "Portuguese (Brazil)"; readmeFile = "README_pt_BR.txt"; - license = with lib.licenses; [ lgpl3 ]; + license = lib.licenses.lgpl3; }; pt_PT = pt-pt; @@ -1172,7 +1194,7 @@ rec { meta = { description = "Hunspell dictionary for ${shortDescription} from rospell"; homepage = "https://sourceforge.net/projects/rospell/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ Andy3153 ]; }; }; diff --git a/pkgs/by-name/hu/hunspell/package.nix b/pkgs/by-name/hu/hunspell/package.nix index ce0e7db16a7b..398c9e9e453b 100644 --- a/pkgs/by-name/hu/hunspell/package.nix +++ b/pkgs/by-name/hu/hunspell/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "hunspell"; - version = "1.7.2"; + version = "1.7.3"; outputs = [ "bin" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "hunspell"; repo = "hunspell"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-x2FXxnVIqsf5/UEQcvchAndXBv/3mW8Z55djQAFgNA8="; + hash = "sha256-NoLlH+4Hb6w+HYl2fSBzroav1Pb3GojFSTJGBxlteBM="; }; patches = [ ./0001-Make-hunspell-look-in-XDG_DATA_DIRS-for-dictionaries.patch ]; diff --git a/pkgs/by-name/hu/hushboard/package.nix b/pkgs/by-name/hu/hushboard/package.nix index 03707922ca67..239994d636f5 100644 --- a/pkgs/by-name/hu/hushboard/package.nix +++ b/pkgs/by-name/hu/hushboard/package.nix @@ -49,7 +49,7 @@ python3Packages.buildPythonApplication { pycairo pygobject3 six - xlib + python-xlib ]; postPatch = '' diff --git a/pkgs/by-name/hw/hwdata/package.nix b/pkgs/by-name/hw/hwdata/package.nix index 0678443277a9..e88507d495f7 100644 --- a/pkgs/by-name/hw/hwdata/package.nix +++ b/pkgs/by-name/hw/hwdata/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwdata"; - version = "0.406"; + version = "0.409"; src = fetchFromGitHub { owner = "vcrhonek"; repo = "hwdata"; rev = "v${finalAttrs.version}"; - hash = "sha256-6GXXkDzunbtea+MmmWV2gpHgCgdGi75U+TV9H/6Emtk="; + hash = "sha256-WJ7oe94rTb+gzuawafpx7YyNTUzZe7ZWE0ZWWQKoyCA="; }; doCheck = false; # this does build machine-specific checks (e.g. enumerates PCI bus) diff --git a/pkgs/by-name/hw/hwloc/package.nix b/pkgs/by-name/hw/hwloc/package.nix index c49a9c9b78ad..5ad26d3e89a3 100644 --- a/pkgs/by-name/hw/hwloc/package.nix +++ b/pkgs/by-name/hw/hwloc/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hwloc"; - version = "2.13.0"; + version = "2.14.0"; src = fetchFromGitHub { owner = "open-mpi"; repo = "hwloc"; tag = "hwloc-${finalAttrs.version}"; - hash = "sha256-W/WiLj4lqJZMGRhH+PXuSJS6mtW+fir4xmDTH9mcOtE="; + hash = "sha256-lbh8tkKeUcHta7/q9TuHQhccyWjkBgrC5fVifFJqQyY="; }; configureFlags = [ diff --git a/pkgs/by-name/hy/hydra-cli/package.nix b/pkgs/by-name/hy/hydra-cli/package.nix index 549b5eec7d49..8464c3962d9b 100644 --- a/pkgs/by-name/hy/hydra-cli/package.nix +++ b/pkgs/by-name/hy/hydra-cli/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Client for the Hydra CI"; mainProgram = "hydra-cli"; homepage = "https://github.com/nlewo/hydra-cli"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ lewo aleksana diff --git a/pkgs/by-name/hy/hydralauncher/package.nix b/pkgs/by-name/hy/hydralauncher/package.nix index 099a9105b57b..6a4348de37f5 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.9.9"; + version = "4.0.5"; src = fetchurl { url = "https://github.com/hydralauncher/hydra/releases/download/v${version}/hydralauncher-${version}.AppImage"; - hash = "sha256-ZdrsEyJkenQbWTYEsgSaiMPx3JksHwjwti3HSb21iOw="; + hash = "sha256-9TAsBiSJ9ZjGoKuHDbPibu/ZDBM9kdk9BlY5zKysVQ4="; }; appimageContents = appimageTools.extractType2 { inherit pname src version; }; diff --git a/pkgs/by-name/hy/hydrus/package.nix b/pkgs/by-name/hy/hydrus/package.nix index 743bd933fd4d..25e9c5f44ad9 100644 --- a/pkgs/by-name/hy/hydrus/package.nix +++ b/pkgs/by-name/hy/hydrus/package.nix @@ -16,14 +16,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "hydrus"; - version = "668"; + version = "679"; pyproject = false; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; tag = "v${finalAttrs.version}"; - hash = "sha256-F6sQ2AyAIE7z7GH942sgzVbufA5GHEazoG+4YN8cFxQ="; + hash = "sha256-NIELa4E7l8T1oeF6V0kr1fhS4nj9TSSHAHo0Q3v0GTY="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ python3Packages.buildPythonApplication (finalAttrs: { # Move the hydrus module and related directories mkdir -p $out/${python3Packages.python.sitePackages} - mv {hydrus,static,db} $out/${python3Packages.python.sitePackages} + mv hydrus static $out/${python3Packages.python.sitePackages} # Fix random files being marked with execute permissions chmod -x $out/${python3Packages.python.sitePackages}/static/*.{png,svg,ico} # Build docs diff --git a/pkgs/by-name/hy/hygg/package.nix b/pkgs/by-name/hy/hygg/package.nix index 4b873664a44a..6f6352e57c2f 100644 --- a/pkgs/by-name/hy/hygg/package.nix +++ b/pkgs/by-name/hy/hygg/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hygg"; - version = "0.1.20"; + version = "0.1.21"; src = fetchFromGitHub { owner = "kruseio"; repo = "hygg"; tag = finalAttrs.version; - hash = "sha256-lqN8n51nm+FtmlI0PEgTZATE+jWE9Wc+o3Gedrdg/fo="; + hash = "sha256-Gu56WH7Sp1y/fXwEOOACUAe8nshvc6d2302YwPvM+ZM="; }; - cargoHash = "sha256-x8aZKyqLaR1cdLx9JofbXGLKwgNDWORqEi2UdcSOAzI="; + cargoHash = "sha256-AUkwjgF/LwOvbhOWcrK8ayvL2/MSc7GFh+/bfdZ28/8="; nativeBuildInputs = [ writableTmpDirAsHomeHook diff --git a/pkgs/by-name/hy/hyper8/package.nix b/pkgs/by-name/hy/hyper8/package.nix new file mode 100644 index 000000000000..f957d25de8b8 --- /dev/null +++ b/pkgs/by-name/hy/hyper8/package.nix @@ -0,0 +1,29 @@ +{ + lib, + rustPlatform, + fetchFromCodeberg, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "hyper8"; + version = "1.0.1"; + + src = fetchFromCodeberg { + owner = "simonrepp"; + repo = "hyper8"; + tag = finalAttrs.version; + hash = "sha256-pvtQPL/hPgoKDLYWC/IL04db7Q/FUlgiExthu4xBQEw="; + }; + + __structuredAttrs = true; + + cargoHash = "sha256-AQAWGmzixDFfL7wqJJXCvNSYojVtYHRP0zqdj0C8JRE="; + + meta = { + homepage = "https://hyper8.org"; + description = "Static site generator for video publishing."; + license = lib.licenses.gpl3; + platforms = lib.platforms.all; + mainProgram = "hyper8"; + }; +}) diff --git a/pkgs/by-name/hy/hyperrogue/package.nix b/pkgs/by-name/hy/hyperrogue/package.nix index cd0492506027..22358bf1783c 100644 --- a/pkgs/by-name/hy/hyperrogue/package.nix +++ b/pkgs/by-name/hy/hyperrogue/package.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://www.roguetemple.com/z/hyper/"; changelog = "https://github.com/zenorogue/hyperrogue/releases/tag/v${finalAttrs.version}"; mainProgram = "hyperrogue"; - maintainers = with lib.maintainers; [ rardiol ]; + maintainers = [ ]; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/hy/hyperscan/package.nix b/pkgs/by-name/hy/hyperscan/package.nix index 41fe9c8ac965..0a9312c052e9 100644 --- a/pkgs/by-name/hy/hyperscan/package.nix +++ b/pkgs/by-name/hy/hyperscan/package.nix @@ -8,7 +8,7 @@ util-linux, pkg-config, boost, - pcre, + pcre2, withStatic ? false, # build only shared libs by default, build static+shared if true }: @@ -78,7 +78,7 @@ stdenv.mkDerivation (finalAttrs: { preConfigure = lib.optionalString withStatic ( '' mkdir -p pcre - tar xvf ${pcre.src} --strip-components 1 -C pcre + tar xvf ${pcre2.src} --strip-components 1 -C pcre '' # - CMake 4 dropped support of versions lower than 3.5, versions lower than 3.10 are deprecated. # https://github.com/NixOS/nixpkgs/issues/445447 @@ -111,6 +111,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + broken = stdenv.hostPlatform.isStatic; # A minimum of SSSE3 compiler support is required description = "High-performance multiple regex matching library"; longDescription = '' Hyperscan is a high-performance multiple regex matching library. @@ -129,7 +130,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ avnik ]; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; license = lib.licenses.bsd3; }; diff --git a/pkgs/by-name/hy/hyperssh/package.nix b/pkgs/by-name/hy/hyperssh/package.nix index 7a37467517e2..4e86f9f24d80 100644 --- a/pkgs/by-name/hy/hyperssh/package.nix +++ b/pkgs/by-name/hy/hyperssh/package.nix @@ -17,16 +17,16 @@ buildNpmPackage { dontNpmBuild = true; src = fetchFromGitHub { - owner = "mafintosh"; + owner = "holepunchto"; repo = "hyperssh"; rev = "v5.0.3"; - hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI=2"; + hash = "sha256-vjPSNcQRsqu0ee0hownEE9y8dFf9dqaL7alGRc9WjcI="; }; patches = [ - # TODO: remove after this is merged: https://github.com/mafintosh/hyperssh/pull/16 + # TODO: remove after this is merged: https://github.com/holepunchto/hyperssh/pull/16 (fetchurl { - url = "https://github.com/mafintosh/hyperssh/commit/ad1d0e06a133e71c9df9f59dd5f805c49f46ec70.patch"; + url = "https://github.com/holepunchto/hyperssh/commit/ad1d0e06a133e71c9df9f59dd5f805c49f46ec70.patch"; hash = "sha256-fUjgHHbZHgqokNg2fVVZCjoDA3LqSJiFzBwgA8Tt1m4="; }) ]; @@ -50,7 +50,7 @@ buildNpmPackage { meta = { description = "Run SSH over hyperswarm"; - homepage = "https://github.com/mafintosh/hyperssh"; + homepage = "https://github.com/holepunchto/hyperssh"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ davhau ]; mainProgram = "hyperssh"; diff --git a/pkgs/by-name/hy/hyprcursor/package.nix b/pkgs/by-name/hy/hyprcursor/package.nix index a0dca3c3415b..8a80d746c340 100644 --- a/pkgs/by-name/hy/hyprcursor/package.nix +++ b/pkgs/by-name/hy/hyprcursor/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -12,7 +12,7 @@ tomlplusplus, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprcursor"; version = "0.1.13"; @@ -43,6 +43,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { "lib" ]; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/hy/hyprgraphics/package.nix b/pkgs/by-name/hy/hyprgraphics/package.nix index 3ef60dbbd679..334342d67dfc 100644 --- a/pkgs/by-name/hy/hyprgraphics/package.nix +++ b/pkgs/by-name/hy/hyprgraphics/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, nix-update-script, cmake, @@ -20,7 +20,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprgraphics"; version = "0.5.1"; @@ -59,6 +59,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { doCheck = true; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/hy/hypridle/package.nix b/pkgs/by-name/hy/hypridle/package.nix index d09e81d9aac4..ac234335a428 100644 --- a/pkgs/by-name/hy/hypridle/package.nix +++ b/pkgs/by-name/hy/hypridle/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, pkg-config, cmake, @@ -16,7 +16,7 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hypridle"; version = "0.1.7"; @@ -45,6 +45,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { wayland-protocols ]; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/hy/hyprland-protocols/package.nix b/pkgs/by-name/hy/hyprland-protocols/package.nix index 4f86862e1d81..32080ececc2f 100644 --- a/pkgs/by-name/hy/hyprland-protocols/package.nix +++ b/pkgs/by-name/hy/hyprland-protocols/package.nix @@ -1,11 +1,11 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, meson, ninja, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-protocols"; version = "0.7.0"; diff --git a/pkgs/by-name/hy/hyprland-qt-support/package.nix b/pkgs/by-name/hy/hyprland-qt-support/package.nix index 7e57ce1683d1..bc39d8d3b1a7 100644 --- a/pkgs/by-name/hy/hyprland-qt-support/package.nix +++ b/pkgs/by-name/hy/hyprland-qt-support/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, ninja, @@ -8,7 +8,7 @@ pkg-config, hyprlang, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qt-support"; version = "0.1.0"; diff --git a/pkgs/by-name/hy/hyprland-qtutils/package.nix b/pkgs/by-name/hy/hyprland-qtutils/package.nix index 59242eeb582b..6b01abe566c9 100644 --- a/pkgs/by-name/hy/hyprland-qtutils/package.nix +++ b/pkgs/by-name/hy/hyprland-qtutils/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprland-qtutils"; version = "0.1.5"; @@ -51,6 +51,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { qtWrapperArgs+=(--prefix PATH : "${makeBinPath [ pciutils ]}") ''; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + meta = { description = "Hyprland QT/qml utility apps"; homepage = "https://github.com/hyprwm/hyprland-qtutils"; diff --git a/pkgs/by-name/hy/hyprland/info.json b/pkgs/by-name/hy/hyprland/info.json index 4d58cbca04d1..ca344a406950 100644 --- a/pkgs/by-name/hy/hyprland/info.json +++ b/pkgs/by-name/hy/hyprland/info.json @@ -1,7 +1,7 @@ { - "branch": "v0.55.4-b", - "commit_hash": "a0136d8c04687bb36eb8a28eb9d1ff92aea99704", - "commit_message": "[gha] Nix: update inputs", - "date": "2026-06-11", - "tag": "v0.55.4" + "branch": "main", + "commit_hash": "36b2e0cfe0c6094dbc47bd42a437431315bb3087", + "commit_message": "version: bump to 0.56.0", + "date": "2026-07-20", + "tag": "v0.56.0" } diff --git a/pkgs/by-name/hy/hyprland/package.nix b/pkgs/by-name/hy/hyprland/package.nix index 3171d7b726d6..dc16a98cc29c 100644 --- a/pkgs/by-name/hy/hyprland/package.nix +++ b/pkgs/by-name/hy/hyprland/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, stdenvAdapters, fetchFromGitHub, pkg-config, @@ -22,6 +22,7 @@ lcms2, libGL, libdrm, + libei, libexecinfo, libgbm, libinput, @@ -34,6 +35,7 @@ pkgconf, python3, re2, + readline, systemd, tomlplusplus, uwsm, @@ -48,7 +50,7 @@ xwayland, debug ? false, enableXWayland ? true, - withSystemd ? lib.meta.availableOn gcc15Stdenv.hostPlatform systemd, + withSystemd ? lib.meta.availableOn gcc16Stdenv.hostPlatform systemd, wrapRuntimeDeps ? true, }: let @@ -75,22 +77,22 @@ let # which would be controlled by the `debug` flag # Condition on darwin to avoid breaking eval for darwin in CI, # even though darwin is not supported anyway. - adapters = lib.optionals (!gcc15Stdenv.targetPlatform.isDarwin) [ + adapters = lib.optionals (!gcc16Stdenv.targetPlatform.isDarwin) [ stdenvAdapters.useMoldLinker ]; - customStdenv = foldl' (acc: adapter: adapter acc) gcc15Stdenv adapters; + customStdenv = foldl' (acc: adapter: adapter acc) gcc16Stdenv adapters; in customStdenv.mkDerivation (finalAttrs: { pname = "hyprland" + optionalString debug "-debug"; - version = "0.55.4"; + version = "0.56.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprland"; fetchSubmodules = true; tag = "v${finalAttrs.version}"; - hash = "sha256-IuT0HnOr/0rAw+GXr+OwWx89FjA4Og1FqP7vywEwRJM="; + hash = "sha256-TWj51lMAgmEYl5x87wsKbuyWDk6QEG5t1uchw9zdJNE="; }; postPatch = '' @@ -156,6 +158,7 @@ customStdenv.mkDerivation (finalAttrs: { lcms2 libGL libdrm + libei libgbm libinput libuuid @@ -166,6 +169,7 @@ customStdenv.mkDerivation (finalAttrs: { pango pciutils re2 + readline tomlplusplus wayland wayland-protocols @@ -185,6 +189,7 @@ customStdenv.mkDerivation (finalAttrs: { cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; dontStrip = debug; + separateDebugInfo = !debug; strictDeps = true; cmakeFlags = mapAttrsToList cmakeBool { diff --git a/pkgs/by-name/hy/hyprlang/package.nix b/pkgs/by-name/hy/hyprlang/package.nix index 54ba47a80171..673b0b49cdf5 100644 --- a/pkgs/by-name/hy/hyprlang/package.nix +++ b/pkgs/by-name/hy/hyprlang/package.nix @@ -1,13 +1,13 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, hyprutils, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlang"; version = "0.6.8"; @@ -34,6 +34,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { doCheck = true; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + meta = { homepage = "https://github.com/hyprwm/hyprlang"; description = "Official implementation library for the hypr config language"; diff --git a/pkgs/by-name/hy/hyprlauncher/package.nix b/pkgs/by-name/hy/hyprlauncher/package.nix index f3369ddfb7f0..e148ad41ccb0 100644 --- a/pkgs/by-name/hy/hyprlauncher/package.nix +++ b/pkgs/by-name/hy/hyprlauncher/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -17,7 +17,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlauncher"; version = "0.1.6"; diff --git a/pkgs/by-name/hy/hyprlax/package.nix b/pkgs/by-name/hy/hyprlax/package.nix index ff07b7a74fe0..268059d7d3a2 100644 --- a/pkgs/by-name/hy/hyprlax/package.nix +++ b/pkgs/by-name/hy/hyprlax/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "hyprlax"; - version = "2.2.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "sandwichfarm"; repo = "hyprlax"; tag = "v${finalAttrs.version}"; - hash = "sha256-dWWpnJtjis4S+PBKpUrWxkrRETUG42fuyuUaWKFwOao="; + hash = "sha256-pI+JEuUOuUh4ZBT4YhIxc6FU3rMwau6qacypDrQG+dg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprlock/package.nix b/pkgs/by-name/hy/hyprlock/package.nix index a61f6f439476..cc06099e8625 100644 --- a/pkgs/by-name/hy/hyprlock/package.nix +++ b/pkgs/by-name/hy/hyprlock/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -26,15 +26,15 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprlock"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprlock"; tag = "v${finalAttrs.version}"; - hash = "sha256-VFlM1cN4jmUAbfmZbeg7vL+AN9miXEUqqpk5EkHNq2c="; + hash = "sha256-JNDoV4tUGL6mXfXMqOjBwUl3Cg1YNIBbAPbpTYY/BpI="; }; nativeBuildInputs = [ @@ -72,6 +72,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { ln -s $out/share/hypr/hyprlock.conf $out/etc/xdg/hypr/hyprlock.conf ''; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/hy/hyprls/package.nix b/pkgs/by-name/hy/hyprls/package.nix index d0c1b4d9c399..3c2fab6e0722 100644 --- a/pkgs/by-name/hy/hyprls/package.nix +++ b/pkgs/by-name/hy/hyprls/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "hyprls"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hyprland-community"; repo = "hyprls"; rev = "v${finalAttrs.version}"; - hash = "sha256-020bEXaFKZ74dJF5keIXMyRf/MQj0eKNYZXHajHgKUI="; + hash = "sha256-w9tUGArzHFy7JurhE9IGfVBTRQi8CCAPfjtT1Q7IX4U="; }; - vendorHash = "sha256-av3IZlfb09j6Dakc9lm8rPr85I/+pscjhEcZD04scUo="; + vendorHash = "sha256-thlILlWil618GJzPWkp4u7jmmuexmFtKqnAiZnokP0c="; checkFlags = [ # Not yet implemented @@ -30,6 +30,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/hyprland-community/hyprls/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = [ ]; + teams = [ lib.teams.hyprland ]; mainProgram = "hyprls"; }; }) diff --git a/pkgs/by-name/hy/hyprmag/package.nix b/pkgs/by-name/hy/hyprmag/package.nix new file mode 100644 index 000000000000..e3a459496f62 --- /dev/null +++ b/pkgs/by-name/hy/hyprmag/package.nix @@ -0,0 +1,60 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + cmake, + pkg-config, + wayland-scanner, + cairo, + libGL, + libjpeg, + libxkbcommon, + pango, + wayland, + wayland-protocols, +}: + +stdenv.mkDerivation (finalAttrs: { + __structuredAttrs = true; + + pname = "hyprmag"; + version = "2.2.0"; + + src = fetchFromGitHub { + owner = "SIMULATAN"; + repo = "hyprmag"; + tag = finalAttrs.version; + hash = "sha256-IHYxQeCcPH2XoRyTgFEi+HVlWGVAnaTdS0Jf96H9PNU="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + cmake + pkg-config + wayland-scanner + ]; + + buildInputs = [ + cairo + libGL + libjpeg + libxkbcommon + pango + wayland + wayland-protocols + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "wlroots-compatible Wayland screen magnifier, based on hyprpicker"; + homepage = "https://github.com/SIMULATAN/hyprmag"; + changelog = "https://github.com/SIMULATAN/hyprmag/releases/tag/${finalAttrs.version}"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ samiser ]; + mainProgram = "hyprmag"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/hy/hyprmagnifier/package.nix b/pkgs/by-name/hy/hyprmagnifier/package.nix deleted file mode 100644 index 48042f069a6c..000000000000 --- a/pkgs/by-name/hy/hyprmagnifier/package.nix +++ /dev/null @@ -1,60 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - pkg-config, - wayland, - wayland-protocols, - wayland-scanner, - hyprwayland-scanner, - libxkbcommon, - pango, - libjpeg, - hyprutils, - nix-update-script, -}: - -stdenv.mkDerivation { - pname = "hyprmagnifier"; - version = "0.0.1-unstable-2025-05-16"; - - src = fetchFromGitHub { - owner = "st0rmbtw"; - repo = "hyprmagnifier"; - rev = "ce05ed35a1a7f9df976be7ee604d291ddad9c91c"; - hash = "sha256-vsQnL3R7lPKsUlDQKXirWMj/3qI377g7PkKlN+eVDTI="; - }; - - strictDeps = true; - - nativeBuildInputs = [ - cmake - pkg-config - hyprwayland-scanner - ]; - - buildInputs = [ - wayland - wayland-protocols - wayland-scanner - hyprwayland-scanner - libxkbcommon - pango - libjpeg - hyprutils - ]; - - passthru.updateScript = nix-update-script { }; - - meta = { - description = "wlroots-compatible Wayland magnifier that does not suck"; - homepage = "https://github.com/st0rmbtw/hyprmagnifier"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ - matthewcroughan - ]; - mainProgram = "hyprmagnifier"; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/hy/hyprmoncfg/package.nix b/pkgs/by-name/hy/hyprmoncfg/package.nix new file mode 100644 index 000000000000..4d64d3739a57 --- /dev/null +++ b/pkgs/by-name/hy/hyprmoncfg/package.nix @@ -0,0 +1,91 @@ +{ + lib, + bash, + buildGoModule, + fetchFromGitHub, + hyprland, + makeWrapper, + nix-update-script, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "hyprmoncfg"; + version = "1.8.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "crmne"; + repo = "hyprmoncfg"; + tag = "v${finalAttrs.version}"; + hash = "sha256-hu3ekA4wAp83DE2v00B2n5gsZt2iSv0/OWbg5Mwo4gY="; + }; + + vendorHash = "sha256-gQbjvdKtO0hCXrs9RnWo1s0YeHf5W9t+8AgS2ELXlPo="; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/crmne/hyprmoncfg/internal/buildinfo.Version=${finalAttrs.version}" + "-X github.com/crmne/hyprmoncfg/internal/buildinfo.Commit=0000000" + "-X github.com/crmne/hyprmoncfg/internal/buildinfo.Date=unknown" + ]; + + nativeBuildInputs = [ makeWrapper ]; + + nativeCheckInputs = [ hyprland ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doCheck = true; + + doInstallCheck = true; + + postPatch = '' + substituteInPlace internal/daemon/daemon_test.go \ + --replace-fail '#!/bin/bash' '#!${lib.getExe bash}' + substituteInPlace internal/apply/apply_test.go \ + --replace-fail '#!/bin/bash' '#!${lib.getExe bash}' \ + --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bash}' \ + --replace-fail '#!/bin/sh' '#!${lib.getExe bash}' + substituteInPlace internal/hypr/client_test.go \ + --replace-fail '#!/usr/bin/env bash' '#!${lib.getExe bash}' + ''; + + preCheck = '' + export TMPDIR=/tmp + ''; + + postInstall = '' + install -Dm644 packaging/applications/hyprmoncfg.desktop \ + $out/share/applications/hyprmoncfg.desktop + install -Dm644 packaging/icons/hyprmoncfg.svg \ + $out/share/icons/hicolor/scalable/apps/hyprmoncfg.svg + substituteInPlace packaging/systemd/hyprmoncfgd.service \ + --replace-fail /usr/bin/hyprmoncfgd $out/bin/hyprmoncfgd + install -Dm644 packaging/systemd/hyprmoncfgd.service \ + $out/share/systemd/user/hyprmoncfgd.service + ''; + + postFixup = '' + wrapProgram $out/bin/hyprmoncfg \ + --prefix PATH : ${lib.makeBinPath [ hyprland ]} + wrapProgram $out/bin/hyprmoncfgd \ + --prefix PATH : ${lib.makeBinPath [ hyprland ]} + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-first monitor configurator and auto-switching daemon for Hyprland"; + homepage = "https://github.com/crmne/hyprmoncfg"; + changelog = "https://github.com/crmne/hyprmoncfg/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ crmne ]; + mainProgram = "hyprmoncfg"; + platforms = hyprland.meta.platforms; + }; +}) diff --git a/pkgs/by-name/hy/hyprpanel/package.nix b/pkgs/by-name/hy/hyprpanel/package.nix deleted file mode 100644 index 458773a33908..000000000000 --- a/pkgs/by-name/hy/hyprpanel/package.nix +++ /dev/null @@ -1,142 +0,0 @@ -{ - lib, - config, - ags, - astal, - awww, - bluez, - bluez-tools, - brightnessctl, - btop, - dart-sass, - fetchFromGitHub, - glib, - glib-networking, - gnome-bluetooth, - gpu-screen-recorder, - gpustat, - grimblast, - gtksourceview3, - gvfs, - hyprpicker, - libgtop, - libnotify, - libsoup_3, - matugen, - networkmanager, - nix-update-script, - python3, - pywal16, - stdenv, - upower, - wireplumber, - wl-clipboard, - writeShellScript, - writeShellScriptBin, - - enableCuda ? config.cudaSupport, -}: - -let - # TODO: Remove once hyprpanel updates to use `awww` - swww-compat = writeShellScriptBin "swww" '' - exec awww "$@" - ''; - swww-daemon-compat = writeShellScriptBin "swww-daemon" '' - exec awww-daemon "$@" - ''; -in - -ags.bundle { - pname = "hyprpanel"; - version = "0-unstable-2026-04-23"; - - __structuredAttrs = true; - strictDeps = true; - - src = fetchFromGitHub { - owner = "Jas-SinghFSU"; - repo = "HyprPanel"; - rev = "1961ba86ad5ab880beb639e5454054b2b5037e0d"; - hash = "sha256-QowlCOrE4jGOTDCUCEx/E8gHjqSx3r25y7v4dEBpBhk="; - }; - - # keep in sync with https://github.com/Jas-SinghFSU/HyprPanel/blob/master/flake.nix#L42 - dependencies = [ - astal.apps - astal.battery - astal.bluetooth - astal.cava - astal.hyprland - astal.mpris - astal.network - astal.notifd - astal.powerprofiles - astal.tray - astal.wireplumber - - awww - bluez - bluez-tools - brightnessctl - btop - dart-sass - glib - gnome-bluetooth - grimblast - gtksourceview3 - gvfs - hyprpicker - libgtop - libnotify - libsoup_3 - matugen - networkmanager - pywal16 - swww-compat - swww-daemon-compat - upower - wireplumber - wl-clipboard - (python3.withPackages ( - ps: - with ps; - [ - dbus-python - pygobject3 - ] - ++ lib.optional enableCuda gpustat - )) - ] - ++ (lib.optionals (stdenv.hostPlatform.system == "x86_64-linux") [ gpu-screen-recorder ]); - - passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; - - postFixup = - let - script = writeShellScript "hyprpanel" '' - export GIO_EXTRA_MODULES='${glib-networking}/lib/gio/modules' - if [ "$#" -eq 0 ]; then - exec @out@/bin/.hyprpanel - else - exec ${astal.io}/bin/astal -i hyprpanel "$*" - fi - ''; - in - # bash - '' - mv "$out/bin/hyprpanel" "$out/bin/.hyprpanel" - cp '${script}' "$out/bin/hyprpanel" - substituteInPlace "$out/bin/hyprpanel" \ - --replace-fail '@out@' "$out" - ''; - - meta = { - description = "Bar/Panel for Hyprland with extensive customizability"; - homepage = "https://github.com/Jas-SinghFSU/HyprPanel"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ PerchunPak ]; - mainProgram = "hyprpanel"; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/hy/hyprpaper/package.nix b/pkgs/by-name/hy/hyprpaper/package.nix index 5ff9377d6f03..3e5d3c75f357 100644 --- a/pkgs/by-name/hy/hyprpaper/package.nix +++ b/pkgs/by-name/hy/hyprpaper/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, hyprwayland-scanner, @@ -34,7 +34,7 @@ versionCheckHook, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpaper"; version = "0.8.4"; @@ -88,13 +88,16 @@ gcc15Stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + meta = { inherit (finalAttrs.src.meta) homepage; description = "Blazing fast wayland wallpaper utility"; license = lib.licenses.bsd3; teams = [ lib.teams.hyprland ]; inherit (wayland.meta) platforms; - broken = gcc15Stdenv.hostPlatform.isDarwin; + broken = gcc16Stdenv.hostPlatform.isDarwin; mainProgram = "hyprpaper"; }; }) diff --git a/pkgs/by-name/hy/hyprpicker/package.nix b/pkgs/by-name/hy/hyprpicker/package.nix index 006aa5d9472b..454b0fd38186 100644 --- a/pkgs/by-name/hy/hyprpicker/package.nix +++ b/pkgs/by-name/hy/hyprpicker/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, nix-update-script, pkg-config, @@ -18,7 +18,7 @@ libxdmcp, debug ? false, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpicker" + lib.optionalString debug "-debug"; version = "0.4.7"; @@ -29,7 +29,10 @@ gcc15Stdenv.mkDerivation (finalAttrs: { hash = "sha256-ABumeksE8Bvtdb6g4vJ2jA9BLlYHnXU86VAuKJhBPoY="; }; - cmakeBuildType = if debug then "Debug" else "Release"; + cmakeBuildType = if debug then "Debug" else "RelWithDebInfo"; + + dontStrip = debug; + separateDebugInfo = !debug; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/hy/hyprpolkitagent/package.nix b/pkgs/by-name/hy/hyprpolkitagent/package.nix index 2cbc31de60c0..5c9b8f16b807 100644 --- a/pkgs/by-name/hy/hyprpolkitagent/package.nix +++ b/pkgs/by-name/hy/hyprpolkitagent/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, pkg-config, fetchFromGitHub, @@ -10,7 +10,7 @@ polkit, qt6, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpolkitagent"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprpwcenter/package.nix b/pkgs/by-name/hy/hyprpwcenter/package.nix index ecf0d5e2229e..473fb57b5c86 100644 --- a/pkgs/by-name/hy/hyprpwcenter/package.nix +++ b/pkgs/by-name/hy/hyprpwcenter/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -14,7 +14,7 @@ pixman, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprpwcenter"; version = "0.1.2"; diff --git a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix b/pkgs/by-name/hy/hyprshade/package.nix similarity index 91% rename from pkgs/applications/window-managers/hyprwm/hyprshade/default.nix rename to pkgs/by-name/hy/hyprshade/package.nix index 79f4342066c0..b0081e56f393 100644 --- a/pkgs/applications/window-managers/hyprwm/hyprshade/default.nix +++ b/pkgs/by-name/hy/hyprshade/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonPackage (finalAttrs: { pname = "hyprshade"; - version = "4.0.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "loqusion"; repo = "hyprshade"; tag = finalAttrs.version; - hash = "sha256-zK8i2TePJ4cEtGXe/dssHWg+ioCTo1NyqzInQhMaB8w="; + hash = "sha256-ou4Iy040DozrlJuaYh3h2iNdUEw3amsCuAEEVHah+no="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/hy/hyprshell/package.nix b/pkgs/by-name/hy/hyprshell/package.nix index ac69fca14473..3eb1c56d3383 100644 --- a/pkgs/by-name/hy/hyprshell/package.nix +++ b/pkgs/by-name/hy/hyprshell/package.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprshell"; - version = "4.10.7"; + version = "4.10.8"; src = fetchFromGitHub { owner = "H3rmt"; repo = "hyprshell"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Hr9X7MdYkcibCxRl4zlQOxGu/HDyjBeDTUMJi4B23E="; + hash = "sha256-GXegc0W2xiRuSCjMpVc5mmKP5YFCYn87M/POTalISCA="; }; - cargoHash = "sha256-p2oo2rUOILRv5Ifapacz+CvJQhCjxnKTe3X2kTvLr9g="; + cargoHash = "sha256-idvY6AOLyx22Gy01kQyA4V8j0VupP5JNswsY4K5Oq9M="; nativeBuildInputs = [ wrapGAppsHook4 diff --git a/pkgs/by-name/hy/hyprshutdown/package.nix b/pkgs/by-name/hy/hyprshutdown/package.nix index 37d2a123203e..b1da70e88410 100644 --- a/pkgs/by-name/hy/hyprshutdown/package.nix +++ b/pkgs/by-name/hy/hyprshutdown/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -16,7 +16,7 @@ versionCheckHook, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprshutdown"; version = "0.1.1"; diff --git a/pkgs/by-name/hy/hyprspace/config_generated.go b/pkgs/by-name/hy/hyprspace/config_generated.go index 0a95013aa012..c0c060299cc7 100644 --- a/pkgs/by-name/hy/hyprspace/config_generated.go +++ b/pkgs/by-name/hy/hyprspace/config_generated.go @@ -6,6 +6,12 @@ import "encoding/json" import "fmt" type Config struct { + // List of libp2p bootstrap node multiaddresses for initial network discovery. + BootstrapPeers []string `json:"bootstrapPeers,omitempty"` + + // Domain suffix used for DNS names within the Hyprspace network. + Domain string `json:"domain,omitempty"` + // Whether to enable filtering of private/link-local addresses from peer // discovery. When enabled, the node will not attempt to connect to RFC1918, // link-local, or loopback addresses advertised by other peers. @@ -140,6 +146,33 @@ func (j *Config) UnmarshalJSON(value []byte) error { if err := json.Unmarshal(value, &plain); err != nil { return err } + if v, ok := raw["bootstrapPeers"]; !ok || v == nil { + plain.BootstrapPeers = []string{ + "/ip4/152.67.75.145/tcp/110/p2p/12D3KooWQWsHPUUeFhe4b6pyCaD1hBoj8j6Z7S7kTznRTh1p1eVt", + "/ip4/152.67.75.145/udp/110/quic-v1/p2p/12D3KooWQWsHPUUeFhe4b6pyCaD1hBoj8j6Z7S7kTznRTh1p1eVt", + "/ip4/152.67.75.145/tcp/995/p2p/QmbrAHuh4RYcyN9fWePCZMVmQjbaNXtyvrDCWz4VrchbXh", + "/ip4/152.67.75.145/udp/995/quic-v1/p2p/QmbrAHuh4RYcyN9fWePCZMVmQjbaNXtyvrDCWz4VrchbXh", + "/ip4/95.216.8.12/tcp/110/p2p/Qmd7QHZU8UjfYdwmjmq1SBh9pvER9AwHpfwQvnvNo3HBBo", + "/ip4/95.216.8.12/udp/110/quic-v1/p2p/Qmd7QHZU8UjfYdwmjmq1SBh9pvER9AwHpfwQvnvNo3HBBo", + "/ip4/95.216.8.12/tcp/995/p2p/QmYs4xNBby2fTs8RnzfXEk161KD4mftBfCiR8yXtgGPj4J", + "/ip4/95.216.8.12/udp/995/quic-v1/p2p/QmYs4xNBby2fTs8RnzfXEk161KD4mftBfCiR8yXtgGPj4J", + "/ip4/152.67.73.164/tcp/995/p2p/12D3KooWL84sAtq1QTYwb7gVbhSNX5ZUfVt4kgYKz8pdif1zpGUh", + "/ip4/152.67.73.164/udp/995/quic-v1/p2p/12D3KooWL84sAtq1QTYwb7gVbhSNX5ZUfVt4kgYKz8pdif1zpGUh", + "/ip4/37.27.11.202/udp/21/quic-v1/p2p/12D3KooWN31twBvdEcxz2jTv4tBfPe3mkNueBwDJFCN4xn7ZwFbi", + "/ip4/37.27.11.202/udp/443/quic-v1/p2p/12D3KooWN31twBvdEcxz2jTv4tBfPe3mkNueBwDJFCN4xn7ZwFbi", + "/ip4/37.27.11.202/udp/500/quic-v1/p2p/12D3KooWN31twBvdEcxz2jTv4tBfPe3mkNueBwDJFCN4xn7ZwFbi", + "/ip4/37.27.11.202/udp/995/quic-v1/p2p/12D3KooWN31twBvdEcxz2jTv4tBfPe3mkNueBwDJFCN4xn7ZwFbi", + "/dnsaddr/bootstrap.libp2p.io/p2p/12D3KooWEZXjE41uU4EL2gpkAQeDXYok6wghN7wwNVPF5bwkaNfS", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmNnooDu7bfjPFoTZYxMNLWUQJyrVwtbZg5gBMjTezGAJN", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmQCU2EcMqAqQPR2i9bChDtGNJchTbq5TbXJJ16u19uLTa", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmZa1sAxajnQjVM8WjWXoMbmPd7NsWhfKsPkErzpm9wGkp", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmbLHAnMoJPWSCR5Zhtx6BHJX9KiKNN6tpvbUcqanj75Nb", + "/dnsaddr/bootstrap.libp2p.io/p2p/QmcZf59bWwK5XFi76CZX8cbJ4BhTzzA3gU1ZjYZcYW3dwt", + } + } + if v, ok := raw["domain"]; !ok || v == nil { + plain.Domain = "hyprspace" + } if v, ok := raw["filterPrivateAddresses"]; !ok || v == nil { plain.FilterPrivateAddresses = false } diff --git a/pkgs/by-name/hy/hyprspace/package.nix b/pkgs/by-name/hy/hyprspace/package.nix index ed7e9b9eca67..8c7739aa3310 100644 --- a/pkgs/by-name/hy/hyprspace/package.nix +++ b/pkgs/by-name/hy/hyprspace/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { pname = "hyprspace"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "hyprspace"; repo = "hyprspace"; tag = "v${finalAttrs.version}"; - hash = "sha256-BtotGhctQKfP68VgG6+NsrDdEOmN/wiAzvBqloHU5BQ="; + hash = "sha256-DmcfR8hA0IsFVEJPZ50jL81u3rw0ieVReTDDC8fTREQ="; }; env.CGO_ENABLED = "0"; - vendorHash = "sha256-O604bzvz6QjDdM9hK4gya3vOjlki4ZaohY363mi3Of4="; + vendorHash = "sha256-Pkj4q5v35JWwd4OPqj3AX8QLdrjnceT+90sioK5+VvQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/hy/hyprsunset/package.nix b/pkgs/by-name/hy/hyprsunset/package.nix index 02716ad867d5..613f2adf3905 100644 --- a/pkgs/by-name/hy/hyprsunset/package.nix +++ b/pkgs/by-name/hy/hyprsunset/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, fetchFromGitHub, pkg-config, @@ -13,15 +13,15 @@ wayland-scanner, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprsunset"; - version = "0.3.3"; + version = "0.4.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprsunset"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yk6nDzCXrOehX3At8qdZ0cLr1kPySqACsihMYuP6T8w="; + hash = "sha256-MhrVi5f6n9eJv8kcDngb8j2P5F3i5/GCR77+qIWnjf4="; }; postPatch = '' @@ -46,6 +46,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { strictDeps = true; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + passthru = { updateScript = nix-update-script { }; }; diff --git a/pkgs/by-name/hy/hyprsysteminfo/package.nix b/pkgs/by-name/hy/hyprsysteminfo/package.nix index a3067b584af9..9f2f505a767f 100644 --- a/pkgs/by-name/hy/hyprsysteminfo/package.nix +++ b/pkgs/by-name/hy/hyprsysteminfo/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, fetchpatch, cmake, @@ -13,7 +13,7 @@ let inherit (lib.strings) makeBinPath; in -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprsysteminfo"; version = "0.1.3"; diff --git a/pkgs/by-name/hy/hyprtoolkit/package.nix b/pkgs/by-name/hy/hyprtoolkit/package.nix index d3575fd8779d..603bcd17b984 100644 --- a/pkgs/by-name/hy/hyprtoolkit/package.nix +++ b/pkgs/by-name/hy/hyprtoolkit/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -23,7 +23,7 @@ wayland-protocols, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprtoolkit"; version = "0.5.4"; diff --git a/pkgs/by-name/hy/hyprutils/package.nix b/pkgs/by-name/hy/hyprutils/package.nix index 99329345a7b8..0ee825ffbf46 100644 --- a/pkgs/by-name/hy/hyprutils/package.nix +++ b/pkgs/by-name/hy/hyprutils/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, cmake, pkg-config, pixman, @@ -8,15 +8,15 @@ nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprutils"; - version = "0.13.1"; + version = "0.14.0"; src = fetchFromGitHub { owner = "hyprwm"; repo = "hyprutils"; tag = "v${finalAttrs.version}"; - hash = "sha256-jAcsogZwWMfXT9MfXxZzkwliAqIuZUV0p71h6Ba9ReE="; + hash = "sha256-XnAVV+H4f8Xdv0yZcSwJ5kCjLyE8fHxPeLX6a3HSrAU="; }; nativeBuildInputs = [ @@ -34,6 +34,7 @@ gcc15Stdenv.mkDerivation (finalAttrs: { ]; cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/hy/hyprwayland-scanner/package.nix b/pkgs/by-name/hy/hyprwayland-scanner/package.nix index 752e54bb2134..a4b2d66e231f 100644 --- a/pkgs/by-name/hy/hyprwayland-scanner/package.nix +++ b/pkgs/by-name/hy/hyprwayland-scanner/package.nix @@ -1,13 +1,13 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, pugixml, nix-update-script, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprwayland-scanner"; version = "0.4.6"; diff --git a/pkgs/by-name/hy/hyprwhspr-rs/package.nix b/pkgs/by-name/hy/hyprwhspr-rs/package.nix index 27001b1ac259..429f3bf4f675 100644 --- a/pkgs/by-name/hy/hyprwhspr-rs/package.nix +++ b/pkgs/by-name/hy/hyprwhspr-rs/package.nix @@ -16,16 +16,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "hyprwhspr-rs"; - version = "0.3.29"; + version = "0.3.32"; src = fetchFromGitHub { owner = "better-slop"; repo = "hyprwhspr-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-vJYE5+4G68CK3hiW6KafO3htWgB6n+JcHVJ/3N8FjSw="; + hash = "sha256-z1ITwHiiBubeCnMw/e40XDtLyayDs4UmyEP3CrwlwFQ="; }; - cargoHash = "sha256-ZL3l6ihBWx+y2ErqP13dJyb7lUMbBX7IYf+Di0p5byA="; + cargoHash = "sha256-MbAUCxTvPw+ERjEa/2C9rjujq9rZG1oU8xvI6jKxHlI="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/hy/hyprwire/package.nix b/pkgs/by-name/hy/hyprwire/package.nix index 917ec60083d6..907354ae5c58 100644 --- a/pkgs/by-name/hy/hyprwire/package.nix +++ b/pkgs/by-name/hy/hyprwire/package.nix @@ -1,6 +1,6 @@ { lib, - gcc15Stdenv, + gcc16Stdenv, fetchFromGitHub, cmake, pkg-config, @@ -9,7 +9,7 @@ pugixml, }: -gcc15Stdenv.mkDerivation (finalAttrs: { +gcc16Stdenv.mkDerivation (finalAttrs: { pname = "hyprwire"; version = "0.3.1"; @@ -31,6 +31,9 @@ gcc15Stdenv.mkDerivation (finalAttrs: { pugixml ]; + cmakeBuildType = "RelWithDebInfo"; + separateDebugInfo = true; + meta = { inherit (finalAttrs.src.meta) homepage; description = "A fast and consistent wire protocol for IPC "; diff --git a/pkgs/by-name/i-/i-dot-ming/package.nix b/pkgs/by-name/i-/i-dot-ming/package.nix index 3f3a486b4d87..915c09944b96 100644 --- a/pkgs/by-name/i-/i-dot-ming/package.nix +++ b/pkgs/by-name/i-/i-dot-ming/package.nix @@ -1,47 +1,27 @@ { lib, stdenvNoCC, - fetchurl, - writeScript, + fetchFromGitHub, + installFonts, + nix-update-script, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "i.ming"; version = "8.10"; - src = fetchurl { - url = "https://raw.githubusercontent.com/ichitenfont/I.Ming/${version}/${version}/I.Ming-${version}.ttf"; - hash = "sha256-y6E7dbBQ1nG2EdAGMUcmLkIeFDWa1FMJSLBw9WER8PM="; + src = fetchFromGitHub { + owner = "ichitenfont"; + repo = "I.Ming"; + tag = finalAttrs.version; + hash = "sha256-TutIcX/DoeO5cwjD0o1IaXErStY73Cqk00NDKbXw39I="; + rootDir = finalAttrs.version; }; - dontUnpack = true; - - installPhase = '' - runHook preInstall - - install -DT -m444 $src $out/share/fonts/truetype/I.Ming/I.Ming.ttf - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru = { - updateScript = writeScript "updater" '' - #!/usr/bin/env nix-shell - #!nix-shell -i bash -p curl gnused - set -e - version=$(curl -i -s https://github.com/ichitenfont/I.Ming/releases/latest | sed -n -E 's|^location.*releases/tag/([0-9.]+).*$|\1|p') - if [[ $version != ${version} ]]; then - tmp=$(mktemp -d) - curl -Lo $tmp/I.Ming.ttf https://raw.githubusercontent.com/ichitenfont/I.Ming/$version/$version/I.Ming-$version.ttf - install -DT -m444 $tmp/I.Ming.ttf $tmp/share/fonts/truetype/I.Ming/I.Ming.ttf - rm $tmp/I.Ming.ttf - hash=$(nix --extra-experimental-features nix-command hash path --type sha256 --base32 --sri $tmp) - sed -i -E \ - -e "s/version = \"[0-9.]+\"/version = \"$version\"/" \ - -e "s|hash = \".*\"|hash = \"$hash\"|" \ - pkgs/data/fonts/i-dot-ming/default.nix - fi - ''; + updateScript = nix-update-script { }; }; meta = { @@ -51,4 +31,4 @@ stdenvNoCC.mkDerivation rec { platforms = lib.platforms.all; maintainers = [ lib.maintainers.linsui ]; }; -} +}) diff --git a/pkgs/by-name/i1/i18next-cli/package-lock.json b/pkgs/by-name/i1/i18next-cli/package-lock.json index efb4786466dd..d8bc8566f022 100644 --- a/pkgs/by-name/i1/i18next-cli/package-lock.json +++ b/pkgs/by-name/i1/i18next-cli/package-lock.json @@ -1,29 +1,29 @@ { "name": "i18next-cli", - "version": "1.61.0", + "version": "1.66.2", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "i18next-cli", - "version": "1.61.0", + "version": "1.66.2", "license": "MIT", "dependencies": { "@croct/json5-parser": "^0.2.2", - "@swc/core": "^1.15.40", + "@swc/core": "^1.15.41", "chokidar": "^5.0.0", "commander": "^14.0.3", "execa": "^9.6.1", "glob": "^13.0.6", - "i18next": "^26.3.0", + "i18next": "^26.3.1", "i18next-resources-for-ts": "^2.1.0", - "inquirer": "^13.4.3", + "inquirer": "^14.0.2", "jiti": "^2.7.0", "jsonc-parser": "^3.3.1", "magic-string": "^0.30.21", "minimatch": "^10.2.5", "ora": "^9.4.0", - "react": "^19.2.6", + "react": "^19.2.7", "react-i18next": "^17.0.8", "yaml": "^2.9.0" }, @@ -35,16 +35,16 @@ "@rollup/plugin-terser": "^1.0.0", "@rollup/plugin-typescript": "^12.3.0", "@types/inquirer": "^9.0.9", - "@types/node": "^25.9.1", - "@types/react": "^19.2.15", - "@typescript-eslint/parser": "^8.60.0", + "@types/node": "^25.9.2", + "@types/react": "^19.2.17", + "@typescript-eslint/parser": "^8.61.0", "@vitest/coverage-v8": "^4.1.8", "eslint": "^9.39.4", "eslint-import-resolver-typescript": "^4.4.5", "eslint-plugin-import": "^2.32.0", - "memfs": "^4.57.3", + "memfs": "^4.57.6", "neostandard": "^0.13.0", - "rollup": "^4.61.0", + "rollup": "^4.61.1", "typescript": "^6.0.3", "unplugin-swc": "^1.5.9", "vitest": "^4.1.8" @@ -236,9 +236,9 @@ "license": "MIT" }, "node_modules/@eslint/config-array/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -286,9 +286,9 @@ } }, "node_modules/@eslint/eslintrc": { - "version": "3.3.5", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.5.tgz", - "integrity": "sha512-4IlJx0X0qftVsN5E+/vGujTRIFtwuLbNsVUe7TO6zYPDR1O6nFwvwhIKEKSrl6dZchmYBITazxKoUYOjdtjlRg==", + "version": "3.3.6", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.6.tgz", + "integrity": "sha512-l2Ul9PrHsPCKcEY/ac7VgFj9D80C7S68sOKc618SyHDPK36s1XcFebXY0iTzUVn4Yq+YbwvSnDmCz9yxjX+QrA==", "dev": true, "license": "MIT", "dependencies": { @@ -298,7 +298,7 @@ "globals": "^14.0.0", "ignore": "^5.2.0", "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", + "js-yaml": "^4.3.0", "minimatch": "^3.1.5", "strip-json-comments": "^3.1.1" }, @@ -317,9 +317,9 @@ "license": "MIT" }, "node_modules/@eslint/eslintrc/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -341,9 +341,9 @@ } }, "node_modules/@eslint/js": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.4.tgz", - "integrity": "sha512-nE7DEIchvtiFTwBw4Lfbu59PG+kCofhjsKaCWzxTpt4lfRjRMqG6uMBzKXuEcyXhOHoUp9riAm7/aWYGhXZ9cw==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.5.tgz", + "integrity": "sha512-QywQuszQh77pIXCsq998c8hbhSTI/azTty1Z6N53dmAudKHhy573j3yvRLsX2BSp8YpLtoCEG8E9DJe+8zUh4A==", "dev": true, "license": "MIT", "engines": { @@ -894,14 +894,14 @@ } }, "node_modules/@jsonjoy.com/fs-core": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-core/-/fs-core-4.57.6.tgz", - "integrity": "sha512-uI++Wx6VkBJqVmkb4ZeExwAVpZiA2Do5NrEtXoDk0Pdvce3ytFXJoviT1sLOj16+qDIMnD5nWPfOhVpnDmRJKg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-core/-/fs-core-4.64.0.tgz", + "integrity": "sha512-zs2TAq7Six5jgMuoMNjpspAvOP3mhtgq/k1UyQodEzCtQi/N83y2/y+zcvnZSGp/Rxq96DBN+bValOBQAyn/ew==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-node-builtins": "4.57.6", - "@jsonjoy.com/fs-node-utils": "4.57.6", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", "thingies": "^2.5.0" }, "engines": { @@ -916,15 +916,15 @@ } }, "node_modules/@jsonjoy.com/fs-fsa": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-fsa/-/fs-fsa-4.57.6.tgz", - "integrity": "sha512-pKkw/yC5CzSZKhIIUIsH1przOa+K5jGmZIg1sWaSF24JojyrUFbjcQv7QrcGAudriei6HQ6R0BFj+V8NbQinJw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-fsa/-/fs-fsa-4.64.0.tgz", + "integrity": "sha512-nMWOVbkLFyEgmXZih3wyvxA9XpgyyqyfrINMHvEFqhi7uqfRl7c9ERJt6yX7vgMPrB9Uo+OJO+Spa0cFzPD01w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-core": "4.57.6", - "@jsonjoy.com/fs-node-builtins": "4.57.6", - "@jsonjoy.com/fs-node-utils": "4.57.6", + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", "thingies": "^2.5.0" }, "engines": { @@ -939,17 +939,17 @@ } }, "node_modules/@jsonjoy.com/fs-node": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node/-/fs-node-4.57.6.tgz", - "integrity": "sha512-Kbn1jdkvDN4F2+BhoB6mMu7NCbhP0bgA5NcI1aJj/Q5UcU+I1JLLW+dEQean33iV4tXv35AzBVKPICnDltBpxw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node/-/fs-node-4.64.0.tgz", + "integrity": "sha512-dO+NNkODbUli4uV42bcNrrLvq5rE7SNpdZ5TNd0dtbLsAaNK3MDiIC9lUi+brboGoIjW6vd2fB1qao60nrk5xA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-core": "4.57.6", - "@jsonjoy.com/fs-node-builtins": "4.57.6", - "@jsonjoy.com/fs-node-utils": "4.57.6", - "@jsonjoy.com/fs-print": "4.57.6", - "@jsonjoy.com/fs-snapshot": "4.57.6", + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "@jsonjoy.com/fs-print": "4.64.0", + "@jsonjoy.com/fs-snapshot": "4.64.0", "glob-to-regex.js": "^1.0.0", "thingies": "^2.5.0" }, @@ -965,9 +965,9 @@ } }, "node_modules/@jsonjoy.com/fs-node-builtins": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-builtins/-/fs-node-builtins-4.57.6.tgz", - "integrity": "sha512-V4DgEFT3Cg5S9fCMOZSCVdTxdJWWLBO0WnAazV7hnCM96u5zXHyW/ubDAfcSVwqjkMJ50W1Y44IXtxRoIwaCVg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-builtins/-/fs-node-builtins-4.64.0.tgz", + "integrity": "sha512-/o7WRFhUWaM/fOrslwLZGnzn4RmRILykn+lAL+mNObqqRNw+CQSiij6hpCeZ+C7buhdoVo7go/OYqzaSUfDYmA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -982,15 +982,15 @@ } }, "node_modules/@jsonjoy.com/fs-node-to-fsa": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-to-fsa/-/fs-node-to-fsa-4.57.6.tgz", - "integrity": "sha512-+JptNw3iifihxH2rEXrninDzX4FFVW8JD/wPR8GbJPAeL9CQUSblrlumOPB5gZuS7tYRX+PJPLtT7XzKoRhv/Q==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-to-fsa/-/fs-node-to-fsa-4.64.0.tgz", + "integrity": "sha512-WDD9WVs0hb7UAEKTgZW2f66WDrbj7gIIWwpP3spbLyXa0rghtUaFTB8L4gdR3ZCWwiKIsj38/CNijpVmpnuPUw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-fsa": "4.57.6", - "@jsonjoy.com/fs-node-builtins": "4.57.6", - "@jsonjoy.com/fs-node-utils": "4.57.6" + "@jsonjoy.com/fs-fsa": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0" }, "engines": { "node": ">=10.0" @@ -1004,13 +1004,14 @@ } }, "node_modules/@jsonjoy.com/fs-node-utils": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-utils/-/fs-node-utils-4.57.6.tgz", - "integrity": "sha512-foyUrfS7WmYEUzqYXSNxmJBcSj04TABrkpFabwO9SCDCpVCfJ+qG+2sk5FjfiflG2n0SDFZDCJ6vYlJAEpxJFg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-node-utils/-/fs-node-utils-4.64.0.tgz", + "integrity": "sha512-k5Indsx9hWW9xSF7Y6oSKKwtCUNhzZxadub3owhIlitc+iMRVlPPdX2duTKQWBL3qNWpXya8jykgaaWpheeS4w==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-node-builtins": "4.57.6" + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "glob-to-regex.js": "^1.0.1" }, "engines": { "node": ">=10.0" @@ -1024,13 +1025,13 @@ } }, "node_modules/@jsonjoy.com/fs-print": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-print/-/fs-print-4.57.6.tgz", - "integrity": "sha512-96eAn4Dudtt67LTeuU47yUD+pg9/G/oKpI10zei9ljk3X3WK4lYKc+n3cpaPCAbKPzoyfxl0mXm8f8Y7BOSFXw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-print/-/fs-print-4.64.0.tgz", + "integrity": "sha512-PHZFccchvkhWrwPWHjmVAhbC3vSHCtyZvlZfJJ3ho2bnzl450hXri6/8e6pbkWdH+SkmLXNml0sV8e5HDAfxKw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-node-utils": "4.57.6", + "@jsonjoy.com/fs-node-utils": "4.64.0", "tree-dump": "^1.1.0" }, "engines": { @@ -1045,14 +1046,14 @@ } }, "node_modules/@jsonjoy.com/fs-snapshot": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-snapshot/-/fs-snapshot-4.57.6.tgz", - "integrity": "sha512-V57CMzbOgTzUWGOWQ8GzHQdpJP6JnrYVNCtTBNxVYEnlVRvo4uEJqHhtAT8vhDFrIuJOXLrTL1Fki4h5oI7xxg==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/@jsonjoy.com/fs-snapshot/-/fs-snapshot-4.64.0.tgz", + "integrity": "sha512-oM7UDeL83q6NBzzsfKAsYKXKVXlykKFqqOLh4xZZKAzzROTlInkPbc6LTDGThEOnPiFiUzA7tYziHG9xavd76Q==", "dev": true, "license": "Apache-2.0", "dependencies": { "@jsonjoy.com/buffers": "^17.65.0", - "@jsonjoy.com/fs-node-utils": "4.57.6", + "@jsonjoy.com/fs-node-utils": "4.64.0", "@jsonjoy.com/json-pack": "^17.65.0", "@jsonjoy.com/util": "^17.65.0" }, @@ -1273,14 +1274,14 @@ } }, "node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.4.tgz", - "integrity": "sha512-3NQNNgA1YSlJb/kMH1ildASP9HW7/7kYnRI2szWJaofaS1hWmbGI4H+d3+22aGzXXN9IJ+n+GiFVcGipJP18ow==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", "dev": true, "license": "MIT", "optional": true, "dependencies": { - "@tybys/wasm-util": "^0.10.1" + "@tybys/wasm-util": "^0.10.3" }, "funding": { "type": "github", @@ -1292,9 +1293,9 @@ } }, "node_modules/@oxc-project/types": { - "version": "0.133.0", - "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.133.0.tgz", - "integrity": "sha512-KzkdCd6Uxqnf6l3HOw1xfatAlUURA0g14cvBYFyJ5SaNOQbOUvBr9PKArcPcrNIeRsBdgcUzOGrhKveVpvOIGA==", + "version": "0.139.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.139.0.tgz", + "integrity": "sha512-r9gHphtCs+1M7J0pw6Sn/hh/Wpa/iQrOOkrNAlVLF/gHq+/CJmHIWKKUUhdWjcD6CIa8idarspCsASiXCXvFUw==", "dev": true, "license": "MIT", "funding": { @@ -1302,9 +1303,9 @@ } }, "node_modules/@rolldown/binding-android-arm64": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.0.3.tgz", - "integrity": "sha512-454rs7jHngixp/NMxd5srYD57OnzSlZ/eFTETjORQHLwJG1lRtmNOJcBerZlfu4GjKqeq8aCCIQrMdHyhI51Hw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.5.tgz", + "integrity": "sha512-lZg8fqIv2v7FF237bwMgzGZEJvGL79/s5knJ/i6FmsGF4XXlzccZ4jb+TrFIxtSSxFtIpdsgrPZeMk1I9AFcyQ==", "cpu": [ "arm64" ], @@ -1319,9 +1320,9 @@ } }, "node_modules/@rolldown/binding-darwin-arm64": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.0.3.tgz", - "integrity": "sha512-PcAhP+ynjURNyy8SKGl5DQP94aGuB/7JrXJb/t7P+hanXvQVMWzUvRRhBAcg/lNRadBhoUPqSoP4xw5tR/KBEA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.5.tgz", + "integrity": "sha512-51Bnx9pNiMRKSUNtBfySkNJ9vMU9Hh3I1ozDd6gyPPYzaXCfnptUcEZxXGYFn+ul2dtcMUiqGR1Yai2K10uoTw==", "cpu": [ "arm64" ], @@ -1336,9 +1337,9 @@ } }, "node_modules/@rolldown/binding-darwin-x64": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.0.3.tgz", - "integrity": "sha512-9YpfeUvSE2RS7wysJ81uOZkXJz7f7Q55H2Gvp3VEw/EsahqDtrphrZ0EwDLK5vvKOzaCrBsjF8JmnMLcUt78Gg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.5.tgz", + "integrity": "sha512-Tm+gbfC0aHu1tBA/JvKQh32S0K6YgCHkiAF4/W6xX0K0RmNuc94VeK419dJoE65R5aRxmo+noZQSWrAMF6yb6g==", "cpu": [ "x64" ], @@ -1353,9 +1354,9 @@ } }, "node_modules/@rolldown/binding-freebsd-x64": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.0.3.tgz", - "integrity": "sha512-yB1IlAsSNHncV6SCTL27/MVGR5htvQsoGxIv5KMGXALp+Ll1wYsn+x98M9MW7qa+NdSbvrrY7ANI4wLJ0n1e6g==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.5.tgz", + "integrity": "sha512-JMzDKCCXq93YccG5gz3hvOs1oXRKAf0XYpfOS88e+wZrC8Iugj6j68867vrYZkvpDDpKn/KoKORThmchMpF6TA==", "cpu": [ "x64" ], @@ -1370,9 +1371,9 @@ } }, "node_modules/@rolldown/binding-linux-arm-gnueabihf": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.0.3.tgz", - "integrity": "sha512-Yi30IVAAfLUCy2MseFjbB1jAMDl1VMCAas5StnYp8da9+CKvMd2H2cbEjWcw5NPaPqzvYkVIaF1nNUG+b7u/sw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.5.tgz", + "integrity": "sha512-uML21j2K5TfPGutKxub+M+nLjZIrWjXQ5Grx4lCe/nimTj9B4L63zHpjXLl4y0L3mcm2htEQIb06oCG/szerNw==", "cpu": [ "arm" ], @@ -1387,9 +1388,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-gnu": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.0.3.tgz", - "integrity": "sha512-jsO7R8To+AdlYgUmN5sHSCZbfhtMBkO0WUx8iORQnPcMMdgr7qM2DQmMwgabs3GhNztdmoKkMKQFHD6DTMCIQw==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.5.tgz", + "integrity": "sha512-navSiuTMogvnQoZoM/v+l3ZWo50/NTwSHSzheABx/RCnmUPaKwq9qSo4Br2OYRs21+Fz8uFqITZM3H4opOB0/Q==", "cpu": [ "arm64" ], @@ -1407,9 +1408,9 @@ } }, "node_modules/@rolldown/binding-linux-arm64-musl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.0.3.tgz", - "integrity": "sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.5.tgz", + "integrity": "sha512-lAryqH7IteztmCXQXk0etKj4wBQ7Gx5S6LjKhsgp9zb8I5bsuvU/2llH1hDQcjsFeqIsovMVN339/8pUDDBXxA==", "cpu": [ "arm64" ], @@ -1427,9 +1428,9 @@ } }, "node_modules/@rolldown/binding-linux-ppc64-gnu": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.0.3.tgz", - "integrity": "sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.5.tgz", + "integrity": "sha512-fsK/sNBnxzBlL4O1JNrZakVQxPspqpED5dLtNsZS9oOKmtSpdNIzxH2kkol5HYTWJN47sE20ztMJPxfZ89qGOg==", "cpu": [ "ppc64" ], @@ -1447,9 +1448,9 @@ } }, "node_modules/@rolldown/binding-linux-s390x-gnu": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.0.3.tgz", - "integrity": "sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.5.tgz", + "integrity": "sha512-gLYb4BIadlfTOYT5gO503n8zQjXflgzpD0FcyKh0Mzx3rqCZKnHoJWV9xe1KXUJ5lx2JfcSHr/mhzS0PC/McAA==", "cpu": [ "s390x" ], @@ -1467,9 +1468,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-gnu": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.0.3.tgz", - "integrity": "sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.5.tgz", + "integrity": "sha512-FjcpEKUyJygHgs1o50VYNvkt5+7Le/VEdYt0AkRpkL33MnyQfwr8l5mXwMmfmTbyMPr5vJLC+8/Gd9gXnwU1QQ==", "cpu": [ "x64" ], @@ -1487,9 +1488,9 @@ } }, "node_modules/@rolldown/binding-linux-x64-musl": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.0.3.tgz", - "integrity": "sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.5.tgz", + "integrity": "sha512-Me+PfPI2TMeOQk0gYWfLQZtTktrmzbr8cDboqX83XKc7UrgAi55gF+2dUkWdxd19n55Essp2yeca+O9N5rBxHg==", "cpu": [ "x64" ], @@ -1507,9 +1508,9 @@ } }, "node_modules/@rolldown/binding-openharmony-arm64": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.0.3.tgz", - "integrity": "sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.5.tgz", + "integrity": "sha512-yc5WrLzXks6zCQfn9Oxr8pORKyl/pF+QjHmW/Qx3qu0oyrrNC+y2JLTU1E2rcWYAmzlnqngWXHQjy51VzW70Vw==", "cpu": [ "arm64" ], @@ -1524,9 +1525,9 @@ } }, "node_modules/@rolldown/binding-wasm32-wasi": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.0.3.tgz", - "integrity": "sha512-JTtb8BWFynicNSoPrehsCzBtOKjZ6jhMiPFEmOiuXg1Fl8dn2KHQob+GuPSGR0dryQa1PQJbzjF3dqO/whhjLg==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.5.tgz", + "integrity": "sha512-VbQGPX2b4r48TAMIM2cjgluIM1HYutm4pcTEJsle7iEP7sB1dFqtPLBVbdLAZCxy1txCcPxf4QFf4v8uvltPqA==", "cpu": [ "wasm32" ], @@ -1534,18 +1535,52 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "1.10.0", - "@emnapi/runtime": "1.10.0", - "@napi-rs/wasm-runtime": "^1.1.4" + "@emnapi/core": "1.11.1", + "@emnapi/runtime": "1.11.1", + "@napi-rs/wasm-runtime": "^1.1.6" }, "engines": { "node": "^20.19.0 || >=22.12.0" } }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/core": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz", + "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.2", + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz", + "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@rolldown/binding-wasm32-wasi/node_modules/@emnapi/wasi-threads": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", + "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/@rolldown/binding-win32-arm64-msvc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.0.3.tgz", - "integrity": "sha512-gEdFFEN70A/jxb2svrWsN3aDL7OUtmvlOy+6fa2jxG8K0wQ1ZbdeLGnidov6Yu5/733dI5ySfzFlQ/cb0bSz1g==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.5.tgz", + "integrity": "sha512-gHv82k63z4qpV5+Q1y/12KrK0ltWBukVDI8nZcbT7Tt/ZlOIVwppazneq0F93oDxTo3IgAMEDIoQh3E2n6mVsw==", "cpu": [ "arm64" ], @@ -1560,9 +1595,9 @@ } }, "node_modules/@rolldown/binding-win32-x64-msvc": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.0.3.tgz", - "integrity": "sha512-eXB7CHuaQdqmJcc3koCNtNPmT/bj2gc999kUFgBxG8Ac0NdgXc4rkCHhqrgrhN3zddvvvrgzj1e90SuSfmyIXA==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.5.tgz", + "integrity": "sha512-tTZuDBPw85tEN5PQi1pnEBzDy0Z49HtScLAbD5t6hyeU92A95pRWaSMw1GZZi/RwgSgUIl0xrSlXIT/9QzvYSA==", "cpu": [ "x64" ], @@ -1679,9 +1714,9 @@ } }, "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.61.1.tgz", - "integrity": "sha512-JnBB8MdXj45cajvTuO5FmPlvFVJRQgvrz1uSEl3NwqFnReAPGwb8EanbGi4z2nRaqLzjJSv5/JmycoTKlRZxHA==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.62.2.tgz", + "integrity": "sha512-6o7ZLZK+BeenkZCFNDXqpbjw9bD6nuWonvS/lwQJp7NoVVxm6p3qE7qQ5jGuBjiFsgvqjD8mZAU5oWxTmbOeOg==", "cpu": [ "arm" ], @@ -1693,9 +1728,9 @@ ] }, "node_modules/@rollup/rollup-android-arm64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.61.1.tgz", - "integrity": "sha512-Jx2g7iSjw4AOT0HDPHM9RV3GNjRXwybWtSFZiZAYUTjUwjVrYIwq3kBf+LnhqJlzXFAqTAh2F7IGI+O568exPw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.62.2.tgz", + "integrity": "sha512-BaH7BllCACHoH1LguOU56UItGfUWjujlO65kS9LAodViaN4bwIKd7oeW/ZHJ/4ljr/7MIiENnNy3HJ0zXv8Zkw==", "cpu": [ "arm64" ], @@ -1707,9 +1742,9 @@ ] }, "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.61.1.tgz", - "integrity": "sha512-0F1L/Z3Eqv8mT2n3dCpeO8GcTvHvVqkP5/t6DMsn0KzhYVcg+s7Ncl5DS8qjKYEeio6Az0Gt6nyBORay5qIlCA==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.62.2.tgz", + "integrity": "sha512-v39RCCvj4He82I9sFmk+M1VZ0PLM9sfsLVikjfx2hYBNALhrrOR2D3JjQA6AhlaSOgcR+RzrKY7e1+bT6SUO/A==", "cpu": [ "arm64" ], @@ -1721,9 +1756,9 @@ ] }, "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.61.1.tgz", - "integrity": "sha512-qLttcH871ujY4YcVfUSShhOw+CsoTatYz8gRbHO7Bb92QH059/P0y5do1KMs41fY0BpD2x4AJH/gID0zFiqVKQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.62.2.tgz", + "integrity": "sha512-yl0y2vq3S3lHeuXhEdss6TWfKW8vkujImO12tn4ZkG/4oghr09LvdYm2RElVjokTQiUvDUGXLGsYeLqUMCKpGA==", "cpu": [ "x64" ], @@ -1735,9 +1770,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.61.1.tgz", - "integrity": "sha512-fUI4RapGE0Oh3mb8mgfvC1O2nU1RpDZUKnDQm3xB1Ipg7C2wTs5Kstz7G2uWK99a8S2yTMq8/P4uycwNa0nJyw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.62.2.tgz", + "integrity": "sha512-tT4pvt4qXD+vEoezupCWi+a1F0vvDiksiHc+PxRlYTOH1I6/X4id9jPxTP+Fg+545euaFT1jJVs4CEdHZAU1vw==", "cpu": [ "arm64" ], @@ -1749,9 +1784,9 @@ ] }, "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.61.1.tgz", - "integrity": "sha512-H5YrdvJaDtI/U9/emrD4b++xkvp3y/JvOe4rizHbxvkyMfRS/CiRYdji+Pl8D0brEaNFWUh1drQxgAGIl6Xudw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.62.2.tgz", + "integrity": "sha512-6nU5F2wCW+qvCBhTn1pdIU3bzsIoF7EUwsCDRxilWGprQR6yd508YnH9+OKFCwpfS8pjZqDUmnCAr7exax0XCg==", "cpu": [ "x64" ], @@ -1763,9 +1798,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.61.1.tgz", - "integrity": "sha512-Q8CBCCQtDFrYtXoeUXSrnFXKOnyUhx6bz+SkL6A0E7V8kAiCJ5pamq1WtbfpVGhR5TSpXY6ak3avmDc5fHTyJA==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.62.2.tgz", + "integrity": "sha512-n1GJHPOvpIfhi3TmrCeh6S6URt9BFCt0KQE3qvexyGCTAKpR4Lg+eWvNZEqu7epxwus/8ElT3hacYEucm49SZg==", "cpu": [ "arm" ], @@ -1780,9 +1815,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.61.1.tgz", - "integrity": "sha512-nwnhk1581l0FBVellGcVCAT0Oi06onEA3WB53sf01VO3I0UPBkMH9sXONYME2K0ovXcNayJfNtHfm6mpJElatQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.62.2.tgz", + "integrity": "sha512-JqgflS8wEB+UXV/vS1RpRbifGBeN4D5lz8D8oOFbFZw4vedvdOgCFAjfBmIMdW3yL10XpQQ0Ambepw6MXrhOnA==", "cpu": [ "arm" ], @@ -1797,9 +1832,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.61.1.tgz", - "integrity": "sha512-x5Xr49hwt3hdW75UOZm3395YwwzPyauktslv29KpWL/T+vVAzoT3azLcTWv0eMciBNrx+DYjH4paehHoLpPvpg==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.62.2.tgz", + "integrity": "sha512-wnFJkogWvN4jm/hQRF2UBaeUmk20j5+DmHvoyWii2b8HJDyvz1MF2OU/6ynXt2KR63rbZLWkFpoytpdc/yBuSA==", "cpu": [ "arm64" ], @@ -1814,9 +1849,9 @@ ] }, "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.61.1.tgz", - "integrity": "sha512-unMS3H73DpaoPyyEVPjGKleM/s0mkmsauTENpw4INQY8y4+IuLNjkueQ5QCtC0D3N38Y38yhAU8OoZ20S2Tm6w==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.62.2.tgz", + "integrity": "sha512-HVu2bp0zhvJ8xHEV9+UUs7S90VadmBSY3LcIMvozbPo4AuMGDWlz3ymHLHZPX4hR67TKTt8Qp5PJ5RBg/i+RMQ==", "cpu": [ "arm64" ], @@ -1831,9 +1866,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.61.1.tgz", - "integrity": "sha512-zNZzGRnAhwjFEYmvphJRV5XaQGjs62cCmeYYHUT//NbvEnHauw+I85nGG+SiVg5ld4GX8D1IbKIX+ozITQnhMQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.62.2.tgz", + "integrity": "sha512-mQqqAV8QaoSgr9I2fKDLY2BAVvmKjWoGiu/cSYQonsLvtqwEn1E4QYfnCOcp5zoEqNhsDYin1s6jx/VJmrxlZg==", "cpu": [ "loong64" ], @@ -1848,9 +1883,9 @@ ] }, "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.61.1.tgz", - "integrity": "sha512-LdpWGL8X209B2SIvWjqlc8VZgM6PKfontSerGepuldQmHYrAOtnMCXeJkxXGbC+PPZVOuu5czJo7fNV6aeW8rQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.62.2.tgz", + "integrity": "sha512-IxKLoxCQ2IWi6bT2akyDUBGsOImDKB+sPp4EsTmwFQ/fMwpCKm8uLSSgP/Kx/QYUgKis6SEZ5/Nlhup0DIA0PQ==", "cpu": [ "loong64" ], @@ -1865,9 +1900,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.61.1.tgz", - "integrity": "sha512-EC5kTtNaNGOmbMGqar8dvJy6y/hg99GAwjfBz++pxZhQATXGcRjd6c5en5wcbru0vkRmiMGsQKdMJOOf6sza4g==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.62.2.tgz", + "integrity": "sha512-Mk5ha2RQSgyFfmYYLkBpPnUk8D8FriBxesO1u9O75X0mHgXL1UQcH5Itl2lurWL2tj0RxV9b9tJgipac0hRY9A==", "cpu": [ "ppc64" ], @@ -1882,9 +1917,9 @@ ] }, "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.61.1.tgz", - "integrity": "sha512-8hiwp6D4acEcNK78I4rP0/XtS1sknWIAMJBPdR4l6zUtyTm5KiTDr5bXmWt4foY7nAN7AThDHgkLIEZOWKbzWw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.62.2.tgz", + "integrity": "sha512-CjvEnqJL/0/TQ3TXX3OPIJ/kmBellrWd4heXUmHeJlTnmwjKpSJzoehLaL6Xk0ZnMHBu9dZuFADNOrtjF4v+2w==", "cpu": [ "ppc64" ], @@ -1899,9 +1934,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.61.1.tgz", - "integrity": "sha512-10dh/h/BqA7DuMPWSxkR8uks18FRwnwOEqr5zOTEl+NOwP/OMzKX8OFR/Of9xxDA7D5qef1Nzar5WDD2kCCr1g==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.62.2.tgz", + "integrity": "sha512-1SiZbzwdkaDURsew/tSOrooKiYy7EQGT6m8ufavAi9NEyQb/6VuIxFXAL1fqa4iZe3g4NbNk4P7J32z2tw5Mgg==", "cpu": [ "riscv64" ], @@ -1916,9 +1951,9 @@ ] }, "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.61.1.tgz", - "integrity": "sha512-YKJ5lg35DP17gcAOggnihe+APw9HLyj1Xn7gsmGumBJAUDa6NGXNixJzmkWLhcK9TOuuyQjdamzvJefkO7qHZQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.62.2.tgz", + "integrity": "sha512-nQts12zJ3NQRoE6uYljOH89v7szzLDvG2JD/vsX+vGXU8w/At1GowTZ5/7qeFQ8m7L55rpR8Okugnuo5bgjy2Q==", "cpu": [ "riscv64" ], @@ -1933,9 +1968,9 @@ ] }, "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.61.1.tgz", - "integrity": "sha512-Mlil5G2Jj6a7B3LWGctg+XPL9vdXYuzCtNXfxOQ0nPjc2m6ueUktocPGH9bnAM0bNRKb/bAWTujUU7IJQdQA+g==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.62.2.tgz", + "integrity": "sha512-E9/ll019jhPIJgpzfZoIkBGhcz+kKNgVWYRY0zr9srBdPPFVpvOKW8VaJKUbeK+eZXyQF9ltME+Kk6affeaPgg==", "cpu": [ "s390x" ], @@ -1950,9 +1985,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.61.1.tgz", - "integrity": "sha512-bVWIOIk6pV01p4CdUbPP7CJ/434z+OooYjDuFcR+44N35YvKUC66G8MGnvcWx5mWKW3g61J+t74l3Kj15Kwn2Q==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.62.2.tgz", + "integrity": "sha512-5BqxR/pshjey51iliyzTD5Xi3EN0aLmQ2lZ3lvefVV9c82BvrLo2/6OT55iifpWBufs6kdwWbuOKS841DrmK9A==", "cpu": [ "x64" ], @@ -1967,9 +2002,9 @@ ] }, "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.61.1.tgz", - "integrity": "sha512-qy5pBvZbqNFheBz61R1rzsezjm0J7O2oNGoWtGoY89SZYLUfxAJTBAqDChqAIdB4rCiIbi9nF7yZ83GnNiLwSw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.62.2.tgz", + "integrity": "sha512-uNN83XxQrRAh/w0/pmAfibcwyb6YWt4gP+dpnQKPVJshAloQ785ii8CT8ZCIxkGg9opVsvAlGhFitSm6D1Jjpg==", "cpu": [ "x64" ], @@ -1984,9 +2019,9 @@ ] }, "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.61.1.tgz", - "integrity": "sha512-E83TXjI4zm0+5f2qO+UOudaCYIhYwpJ5jq6YCZNIZ+6CbfhKrkAGezeiASBL9ElxAxFsRS9ZhESv8mfnj6TKeg==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.62.2.tgz", + "integrity": "sha512-srjEIxSH3LRnJN6THczDHWQplqEMFiAJrTab0msUryh9kwNpkICf3Ea6q6MN/2cZwRFUNx5w+h6Hpi4QuHS6Zg==", "cpu": [ "x64" ], @@ -1998,9 +2033,9 @@ ] }, "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.61.1.tgz", - "integrity": "sha512-fbWnKqVkjrJN38vNe3ahkbk6iejS/3b0Nt7EEtPpE6RBacZcGXNKbzfHN3GUUlXOPghUg0j6XUGrtjX9z1sIvA==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.62.2.tgz", + "integrity": "sha512-8hOJnxgbyObnCm5AlRA3A931xX19xq80RjVTKgJOvEKWqJruP/Uf12IbAOaDjjEXYRewwHLfmF0YRIdK3OwKWA==", "cpu": [ "arm64" ], @@ -2012,9 +2047,9 @@ ] }, "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.61.1.tgz", - "integrity": "sha512-ArMl38iVAbk0New1ogihQNY6iphLi4ZaRsa037gUzv5yeKPY8TD3Dmy4x2RNC1VztU/uqm+G+/RwFrSka3Oy2g==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.62.2.tgz", + "integrity": "sha512-mmF4AY1i0hG/bLWUctUq59gtmgaSIRa3cu/A3JFRp/sCNEme2bgDEiDS22P9FbnJB8NJNF4jPJiSP5RHQpUTDg==", "cpu": [ "arm64" ], @@ -2026,9 +2061,9 @@ ] }, "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.61.1.tgz", - "integrity": "sha512-0mYtjHS9ucAbcATycCNK9IGBk/cCe/ma7EmSLGZdsxnOA8cjRIyU04wDpVAD9NiOfLUR9KTxdiO53uOkherqjQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.62.2.tgz", + "integrity": "sha512-DZgkknc6jhHrk46V25vbAM0zZkyP0nSDkJB8/dRkLTxv470dOmWDqGoEJl/9A0dFfS7yE3REOwNDxpHwSLSt0Q==", "cpu": [ "ia32" ], @@ -2040,9 +2075,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.61.1.tgz", - "integrity": "sha512-gK1iCEPfpoSG9wfBihXxvBMi8ZfcWffYkEsC/Eih+iFENTaewvNcrEQ69lIOWYO5pePHKLHHO7nq5AILGO/HQQ==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.62.2.tgz", + "integrity": "sha512-T6xr6ucWSFto+VGajA8YH26LdpHRuP4YLHEKAtCWvJDOlnmWcDZVCI2Jmjr+IFHDlt2zRaTAKE4tfjTaWLgJBg==", "cpu": [ "x64" ], @@ -2054,9 +2089,9 @@ ] }, "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.61.1.tgz", - "integrity": "sha512-X+zaP2x+j4RXGfbp/seSoRHWnPxzApilDszisZxbYH5C/jTxFhCtDNdPGZb9lJyYPs24wGxruPF7Y+sIXt9Gzw==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.62.2.tgz", + "integrity": "sha512-BfzEnDJOt9T8M989/lA37EcJgat01wLRnoi5dQf3QzOH7jzpqTAzdDbVfRljVr5r+jzKqpbHeyOfAaXxAd0PAA==", "cpu": [ "x64" ], @@ -2133,14 +2168,14 @@ } }, "node_modules/@swc/core": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.40.tgz", - "integrity": "sha512-2kwzJikRvgtNAG7MwVZY2vEzZjTxKIq5jXOihuSV/8U+Hej8Va22t65aKnJZs3P+NwojZvR8Mf8kyM7O+V8sQg==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.46.tgz", + "integrity": "sha512-Ri3em2mBpq3h2zSPliCYl63otDGqek8PPEfv2nWgRQEbZ/VBCNyypVTVQ6cEbTCXBhy+WE2T3fQb08moIyuYaw==", "hasInstallScript": true, "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3", - "@swc/types": "^0.1.26" + "@swc/types": "^0.1.27" }, "engines": { "node": ">=10" @@ -2150,18 +2185,18 @@ "url": "https://opencollective.com/swc" }, "optionalDependencies": { - "@swc/core-darwin-arm64": "1.15.40", - "@swc/core-darwin-x64": "1.15.40", - "@swc/core-linux-arm-gnueabihf": "1.15.40", - "@swc/core-linux-arm64-gnu": "1.15.40", - "@swc/core-linux-arm64-musl": "1.15.40", - "@swc/core-linux-ppc64-gnu": "1.15.40", - "@swc/core-linux-s390x-gnu": "1.15.40", - "@swc/core-linux-x64-gnu": "1.15.40", - "@swc/core-linux-x64-musl": "1.15.40", - "@swc/core-win32-arm64-msvc": "1.15.40", - "@swc/core-win32-ia32-msvc": "1.15.40", - "@swc/core-win32-x64-msvc": "1.15.40" + "@swc/core-darwin-arm64": "1.15.46", + "@swc/core-darwin-x64": "1.15.46", + "@swc/core-linux-arm-gnueabihf": "1.15.46", + "@swc/core-linux-arm64-gnu": "1.15.46", + "@swc/core-linux-arm64-musl": "1.15.46", + "@swc/core-linux-ppc64-gnu": "1.15.46", + "@swc/core-linux-s390x-gnu": "1.15.46", + "@swc/core-linux-x64-gnu": "1.15.46", + "@swc/core-linux-x64-musl": "1.15.46", + "@swc/core-win32-arm64-msvc": "1.15.46", + "@swc/core-win32-ia32-msvc": "1.15.46", + "@swc/core-win32-x64-msvc": "1.15.46" }, "peerDependencies": { "@swc/helpers": ">=0.5.17" @@ -2173,9 +2208,9 @@ } }, "node_modules/@swc/core-darwin-arm64": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.40.tgz", - "integrity": "sha512-PaYyclfmQ++77D8ityYvmmVzHv9aG8ROwt2GfG6/ccloy4Hgf80qtOnzb9VYvPsUT7Ty1uhuDRhv3XYpf62qhQ==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.46.tgz", + "integrity": "sha512-IsISIT22EfktVJrlvIpnAxG2u/A9aob9l99HMlx80x72WlFmFPk1V3UhkEzx86eJP8hw049KTFv/RISho2cq2Q==", "cpu": [ "arm64" ], @@ -2189,9 +2224,9 @@ } }, "node_modules/@swc/core-darwin-x64": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.40.tgz", - "integrity": "sha512-HbbPzvfLBUXjIB1Ezks+//lNUjmLjfyd63XSwprJgrZaXYdm70kohXPJUWdqKZozolFxbPaO+xtBaiUp6BoueA==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.46.tgz", + "integrity": "sha512-4Tj4ppVIPCmUMpmGFiGtyEriwLyJ+yi/US4WfBrP/ok8COGddDZXLEzQETnKyK46mjvr1v0jevrS23zjoff7vA==", "cpu": [ "x64" ], @@ -2205,9 +2240,9 @@ } }, "node_modules/@swc/core-linux-arm-gnueabihf": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.40.tgz", - "integrity": "sha512-SlRZsCjOCPR2LvFs0Ri/Xrx/5o5TCt8vl4gW6mX1hEZOG0a625RxzRHpHdAQNGykmAN/7IeaFAJG+QnNmxlHcA==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.46.tgz", + "integrity": "sha512-i8tUGnNjyOgMmfmgFSg4aeJLQoFyfpIHK5FjpQAwpRyQIqEUB2w1e8zIDQzY1WhOxx8NoS1S5iUL813Un4Sf5A==", "cpu": [ "arm" ], @@ -2221,9 +2256,9 @@ } }, "node_modules/@swc/core-linux-arm64-gnu": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.40.tgz", - "integrity": "sha512-Q8byxJt2fh8CR3EUX6snBpy47AoBVm+In/+Z3rjDHMjC38ZvR9/gtUUNCT0tfrn4EdVsO8/QPi59nxrxvqxvBQ==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.46.tgz", + "integrity": "sha512-c0OnhqzdhfOvv6qhNCcByepB+sNYOGZyhtr2Qa6ZCHvAWTYhSRw4j/u92Stue9PbZ/6q74b9nHzi76+kVzqQHQ==", "cpu": [ "arm64" ], @@ -2240,9 +2275,9 @@ } }, "node_modules/@swc/core-linux-arm64-musl": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.40.tgz", - "integrity": "sha512-4z0MgHU+7M0pZDqBN1El7mFXDI1SBwinfcUkAyA4v8QrhOIUOZltySt2aStQLZGrdXVXM4Y4ylfiTC04ED+MoQ==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.46.tgz", + "integrity": "sha512-imyRpNEcUzFQFV2LE4jL68ErvmKEuZCbvZru77iQREunJ+bR4i658cupTgtG1mLYM3F1Tzy3Sb9xYb02KghWTg==", "cpu": [ "arm64" ], @@ -2259,9 +2294,9 @@ } }, "node_modules/@swc/core-linux-ppc64-gnu": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.40.tgz", - "integrity": "sha512-fLI4iUgeSZu0eRWUXwe6YzPFx9gHbFiPkl8Rp3mJfP8OpNR3nTQCGPvHdDh9xniW7mVvgMY4ni7A4VzqI1KrpA==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-ppc64-gnu/-/core-linux-ppc64-gnu-1.15.46.tgz", + "integrity": "sha512-ctEfcl/HcUeomK33cbySiHZm98GEDIxTm1EkpBsYCiHxElYBzvTXVeuQT2YwbUXn9XCrjiw4ipyUNk33k26qRg==", "cpu": [ "ppc64" ], @@ -2278,9 +2313,9 @@ } }, "node_modules/@swc/core-linux-s390x-gnu": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.40.tgz", - "integrity": "sha512-YqeKMAb7d4nQSGMJQ454IlaCENpzcDqhvBE9+CPfdnYpnUXxd+BSrB6Xk0YjW8UyoEhUj4p6quATCxbsp6J3jg==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-s390x-gnu/-/core-linux-s390x-gnu-1.15.46.tgz", + "integrity": "sha512-DxlMdnt84TtRVTv7WL/thWyz9+QU8QZNNoAP9rrk0P68LziuhfePp8MjQ44zIprpTHTsEwyziIuGUUN5iSC1bQ==", "cpu": [ "s390x" ], @@ -2297,9 +2332,9 @@ } }, "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.40.tgz", - "integrity": "sha512-7HOuS1iGcme/j/TuL1TfmmLGiMQrjv/GmjyZeydl00FKPtpGXEldwqfI56xgd1YzrzoB2svWjxbGGyQ0TEASxg==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.46.tgz", + "integrity": "sha512-SKxI7J6t90XPl8hRUqtJi9NfGdunN/E/vZMc7Bc0figeRdOPDBT+Tm8g7cx9xM0T0mewh2l+8dewa3Am27/P+A==", "cpu": [ "x64" ], @@ -2316,9 +2351,9 @@ } }, "node_modules/@swc/core-linux-x64-musl": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.40.tgz", - "integrity": "sha512-h4kZYHc7dpc9P9u4brRJaS8Pl7tPVHAeiLSzw7T5RfIJgAoSdaCMKzI/2Uay9gFhaw8uyCDl0L5q37r0EpAfIA==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.46.tgz", + "integrity": "sha512-qj9T6B7bosI0VEsrWOVXZN1OXxS8Tp63ywyrLxNdOycnUtLdkgYcoBsN5y8ImnDDsnwrEWZOy1e+J4xSe7mA3Q==", "cpu": [ "x64" ], @@ -2335,9 +2370,9 @@ } }, "node_modules/@swc/core-win32-arm64-msvc": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.40.tgz", - "integrity": "sha512-+mQgKZXSj6mV38Zh05QaxSjUDmGP/R2JWlXZTDLSPkDzHU6p3GxN9eeSf5dfyDVU86946fmCvSzyl/ucImx8+A==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.46.tgz", + "integrity": "sha512-8p7l4c3LU+eA5g9Et1JPhNeMC1oQwXTGU+uah8DPIBX7YXzqswvaBtyKVmXefVGi/DJU1x3YJsc3mbAp9aWzSQ==", "cpu": [ "arm64" ], @@ -2351,9 +2386,9 @@ } }, "node_modules/@swc/core-win32-ia32-msvc": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.40.tgz", - "integrity": "sha512-yvwdPLGd25mcj/mNatjNQ0lZujtQD6psH3v9PNmMb+fSzjbNG8KIDxjFWrcV+fsFVLOkyOmdJsFmX7NAFjVyPw==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.46.tgz", + "integrity": "sha512-tUEnfr3Bn9u6FOjUb3PN9p+09qZC2j+wNDLKHzXXZn22rqGcUqR/ohCRSS+nG9B9+X+U+3FewNEHJkTmdIvMjQ==", "cpu": [ "ia32" ], @@ -2367,9 +2402,9 @@ } }, "node_modules/@swc/core-win32-x64-msvc": { - "version": "1.15.40", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.40.tgz", - "integrity": "sha512-OXtKsLU1bVtInzzDEAY2sYiF/rl4tvAnLLLpuMp3HzAOQZ5A+i69AKDhA1YLQTaMAqO3vzyYNVAYVRMPtSYD4w==", + "version": "1.15.46", + "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.46.tgz", + "integrity": "sha512-Vux7UDzBJYQggSuPfcl2w9iu+IJpgpRCxHzgCaVkELnAXAE4XZMOTX9HNcaNiwfeIDqdu2rkr69RuDm6wY8neA==", "cpu": [ "x64" ], @@ -2389,18 +2424,18 @@ "license": "Apache-2.0" }, "node_modules/@swc/types": { - "version": "0.1.26", - "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.26.tgz", - "integrity": "sha512-lyMwd7WGgG79RS7EERZV3T8wMdmPq3xwyg+1nmAM64kIhx5yl+juO2PYIHb7vTiPgPCj8LYjsNV2T5wiQHUEaw==", + "version": "0.1.27", + "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.27.tgz", + "integrity": "sha512-K6h3iUlqeM946U4sXFYeahefR1YBbXJvko+hv8WS8/0BNJ4OHiHRywMnQUJCqkR7Y9+hqQ1TvEpiKqUhz7NEFg==", "license": "Apache-2.0", "dependencies": { "@swc/counter": "^0.1.3" } }, "node_modules/@tybys/wasm-util": { - "version": "0.10.2", - "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.2.tgz", - "integrity": "sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==", + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", + "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", "dev": true, "license": "MIT", "optional": true, @@ -2434,9 +2469,9 @@ "license": "MIT" }, "node_modules/@types/inquirer": { - "version": "9.0.9", - "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.9.tgz", - "integrity": "sha512-/mWx5136gts2Z2e5izdoRCo46lPp5TMs9R15GTSsgg/XnZyxDWVqoVU3R9lWnccKpqwsJLvRoxbCjoJtZB7DSw==", + "version": "9.0.10", + "resolved": "https://registry.npmjs.org/@types/inquirer/-/inquirer-9.0.10.tgz", + "integrity": "sha512-vFW2WbXwO9eZpRT5GJGFJ/shgyMNnYozmnjakt9jCQSS1lvqX8pZEQMjJ9RdDPct/YxwciQ8+V8OYn9euIrZDA==", "dev": true, "license": "MIT", "dependencies": { @@ -2459,9 +2494,9 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "25.9.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.2.tgz", - "integrity": "sha512-G05zqtJhcDLb8uslf5EjCxXg9G1KQxiV8OS0R26IC//Eoyitzqe8z37I7cqvnZlrlSfgocQRfSn/AHBZJJFyGw==", + "version": "25.9.5", + "resolved": "https://registry.npmjs.org/@types/node/-/node-25.9.5.tgz", + "integrity": "sha512-OScDchr2fwuUmWdf4kZ9h7PcJiYDVInhJizG/biAq3cAvqwYktuy/TYGGdZNMtNTFUP7rnb0NU4TUdm82kt4Rg==", "devOptional": true, "license": "MIT", "dependencies": { @@ -2489,17 +2524,17 @@ } }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.60.1.tgz", - "integrity": "sha512-JQ4S5GB0tfjO8BuJ4fcX+HodkzJjYBV+7OJ+wLygaX7OGQ7FudyHL4NSCA6ob+w3Yn+5MkKIozOwQhXeM7opVg==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.64.0.tgz", + "integrity": "sha512-CGvQPBxN3wZLu6Rz2kFUpZeoCm78xUic92ck39KPePkO1NPOwjCqdQnm5Q87tpWw9vcBvW8XLrDXjH9PWYtJ3Q==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/type-utils": "8.60.1", - "@typescript-eslint/utils": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/type-utils": "8.64.0", + "@typescript-eslint/utils": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "ignore": "^7.0.5", "natural-compare": "^1.4.0", "ts-api-utils": "^2.5.0" @@ -2512,15 +2547,15 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.60.1", + "@typescript-eslint/parser": "^8.64.0", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", - "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.6.tgz", + "integrity": "sha512-BAg6QkE8W+TuQLrrw0Ugr7HegXduRuuj8/ti2kSOc+jz1dmx8/WNcjr6XGnq5YpDWxFwwaavqD0+jIUOKelTsw==", "dev": true, "license": "MIT", "engines": { @@ -2528,16 +2563,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.60.1.tgz", - "integrity": "sha512-A0M6ua6H252bVjPvvtSgl2QA4+ET9S5Mtkb2GDyTxIhH/C4qDItT7RQNO5PhMC6NXGYXOR9dIalcDDgBKT7oFA==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.64.0.tgz", + "integrity": "sha512-KA0OshtlcCCXmbfqyZkM5pV3/WNraJf7DkJRLpyrmwPtud57H5BDX7C3k0LPSPxpprfRL+cJDGabF10mvNCoCw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "debug": "^4.4.3" }, "engines": { @@ -2553,14 +2588,14 @@ } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.60.1.tgz", - "integrity": "sha512-eXkTH2bxmXlqD1RnOPmLZ9ZM9D3VwSx04JOwBnP9RQ+yUA5a2Mu7SfW8uaV2Aon53NJzZlZYuX7tn91Izf+xaw==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.64.0.tgz", + "integrity": "sha512-tk4WpOJ6IEbGrVHaNmM0YRrwAD3exZlIK3iadQNAxh4YKk6jvUQ4ecq18n+v7+meh+cJ3j+D8nbk8sRKhlwLQg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.60.1", - "@typescript-eslint/types": "^8.60.1", + "@typescript-eslint/tsconfig-utils": "^8.64.0", + "@typescript-eslint/types": "^8.64.0", "debug": "^4.4.3" }, "engines": { @@ -2575,14 +2610,14 @@ } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.60.1.tgz", - "integrity": "sha512-gvI5OQoptnxQnchOirukCuQ55svJSTuD/4k5+pC267xyBtYry748R9/c3tYUzb/iE6RZfllRz2lVulLCHkTm4w==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.64.0.tgz", + "integrity": "sha512-CXEaFdYXjSTgKhisNkwCcJwTP8Pl+fmRrEQrri4nm3vU743bALrxzLmq7fHG/7e6a5xO0lDYeURpZmBuhHk54w==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1" + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2593,9 +2628,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.60.1.tgz", - "integrity": "sha512-nh8w4qAteiKuZu3pSSzG/yGKpw0OlkrKnzFmbVRenKaD4qc+7i1GrmZaLVkr8rk4uipiPGMOW4YsM6WmKZ5CvA==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.64.0.tgz", + "integrity": "sha512-2yo8rRNKuzbVWQp5kslhANqZ2uDAeROQHBRZNPu8JDsHmeFNj/XJJhX/FhNUWmkHHvoNsKa6+tHJiig87EzsQw==", "dev": true, "license": "MIT", "engines": { @@ -2610,15 +2645,15 @@ } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.60.1.tgz", - "integrity": "sha512-sdwTrpjosW7ANQYJ39ZBF1ZyEMEGVB2UsikrserVM/30a/F1dTLnu9bGxEdosugyu5caigjLrR2qiD11asjI1A==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.64.0.tgz", + "integrity": "sha512-XWG4Fmmv/6SvyS9nH8jWrKs6terwJvE8cyRt1CzYYqzp9OrPhCT4cMc/f7C6RZCwG+qMmiffJS1/qJP8G1URtg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/utils": "8.60.1", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/utils": "8.64.0", "debug": "^4.4.3", "ts-api-utils": "^2.5.0" }, @@ -2635,9 +2670,9 @@ } }, "node_modules/@typescript-eslint/types": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.60.1.tgz", - "integrity": "sha512-4h0tY8ppCkdCzcrl2YM5M3my0xsE1Tf8om3owEu5oPWmXwkKRmk0j0LGDzYBGUcAlesEbxBhazqu/K4cu3Ug7w==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.64.0.tgz", + "integrity": "sha512-qjhfuTfLXjA4IOzXvz0rTjT01BqEiIgPoUeMwiEjnaHKJMTNo8rH5pYW1a2L/0Dnux2fPC85AeyJoWaGa8WxTA==", "dev": true, "license": "MIT", "engines": { @@ -2649,16 +2684,16 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.60.1.tgz", - "integrity": "sha512-alpRkfG8hlVE5kdJW2GkfgDgXxold3e8e4l6EnmhRmRLbekgAPCCGDVD++sABy9FcgPFroq+uFcCSM1vR57Cew==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.64.0.tgz", + "integrity": "sha512-Pztpsn1aCE1oWDvDEfUk31nngvvF7vUB5SwHFEaZIFpvw7WJtqUHHL4plBZDA9HfWJJjL13BdG0YrJInTUvoVA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.60.1", - "@typescript-eslint/tsconfig-utils": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/visitor-keys": "8.60.1", + "@typescript-eslint/project-service": "8.64.0", + "@typescript-eslint/tsconfig-utils": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/visitor-keys": "8.64.0", "debug": "^4.4.3", "minimatch": "^10.2.2", "semver": "^7.7.3", @@ -2677,16 +2712,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.60.1.tgz", - "integrity": "sha512-h2MPBLoNtjc3qZWfY3Tl51yPorQ2McHn8pJfcMNTcIvrrZrr90Ykffit0yjrPFWQcRcUxzH20+6OcVdW4yHtUg==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.64.0.tgz", + "integrity": "sha512-aJUGVB3+U0htrrCjoA8qukw8cm8fNCGAxK/tVoS70k8aeb7DETKeFozRiVFIwEeN9WJLsjaP3ph8I60tY2XZoQ==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.60.1", - "@typescript-eslint/types": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1" + "@typescript-eslint/scope-manager": "8.64.0", + "@typescript-eslint/types": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -2701,13 +2736,13 @@ } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.60.1.tgz", - "integrity": "sha512-EbGRQg4FhrmwLodl+t3JNAnXHWVr9Vp+Zl1QBZVPY4ByfkzIT8cX3K6QWODHtkIZqqJVEWvhHSx3v5PDHsaQag==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.64.0.tgz", + "integrity": "sha512-mrtuL8Nsn6gi2H4mo5KMTp823M+3Q19Ew/i+Zlikq20tIMm99C3Ez0dCmkWWnxut20esQvTg8aUSEhMcAOXhEw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.60.1", + "@typescript-eslint/types": "8.64.0", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3062,14 +3097,14 @@ ] }, "node_modules/@vitest/coverage-v8": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.8.tgz", - "integrity": "sha512-lt3kovsyHwYe00wq4D1ti0Z974fWj4NLp6siqiyEufUpyFwK9Yhi7rBhac9JL5aA0zoMrJqc4vYPZRUnI7l7nw==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/coverage-v8/-/coverage-v8-4.1.10.tgz", + "integrity": "sha512-IM49HmthevbgAO4anp1hwtoT9wYe59w0LR00gr+eagHE+ZJ5lK4sLPeO0ubgoJcwLk6dehU3R24N+FbEEKDc8g==", "dev": true, "license": "MIT", "dependencies": { "@bcoe/v8-coverage": "^1.0.2", - "@vitest/utils": "4.1.8", + "@vitest/utils": "4.1.10", "ast-v8-to-istanbul": "^1.0.0", "istanbul-lib-coverage": "^3.2.2", "istanbul-lib-report": "^3.0.1", @@ -3083,8 +3118,8 @@ "url": "https://opencollective.com/vitest" }, "peerDependencies": { - "@vitest/browser": "4.1.8", - "vitest": "4.1.8" + "@vitest/browser": "4.1.10", + "vitest": "4.1.10" }, "peerDependenciesMeta": { "@vitest/browser": { @@ -3093,16 +3128,16 @@ } }, "node_modules/@vitest/expect": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.8.tgz", - "integrity": "sha512-h3nDO677RDLEGlBxyQ5CW8RlMThSKSRLUePLOx09gNIWRL40edgA1GCZSZgf1W55MFAG6/Sw14KeaAnqv0NKdQ==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.10.tgz", + "integrity": "sha512-YsCn+qAk1GWjQOWFEsEcL2gNQ0zmVmQu3T03qP6UyjhtmdtwtbuI+DASn/7iQB3HGTXkdBwGddzxPlmiql5vlA==", "dev": true, "license": "MIT", "dependencies": { "@standard-schema/spec": "^1.1.0", "@types/chai": "^5.2.2", - "@vitest/spy": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/spy": "4.1.10", + "@vitest/utils": "4.1.10", "chai": "^6.2.2", "tinyrainbow": "^3.1.0" }, @@ -3111,13 +3146,13 @@ } }, "node_modules/@vitest/mocker": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.8.tgz", - "integrity": "sha512-LEiN/xe4OSIbKe9HQIp5OC24agGD9J5CnmMgsLohVVoOPWL9a2sBoR6VBx43jQZb7Kr1l4RCuyCJzcAa0+dojw==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.10.tgz", + "integrity": "sha512-v0xaezt+DKEmKfaxg133ldzADrwLGd7Ze1MfQQTYfvs8OqZIwbxyxaYURivwV7sWy5fqn3rH5uOrSp07bp44Ow==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/spy": "4.1.8", + "@vitest/spy": "4.1.10", "estree-walker": "^3.0.3", "magic-string": "^0.30.21" }, @@ -3148,9 +3183,9 @@ } }, "node_modules/@vitest/pretty-format": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.8.tgz", - "integrity": "sha512-9GasEBxpZ1VYIpqHf/0+YGg121uSNwCKOJqIrTwWP/TB7DmFCiaBpNl3aPZzoLWfWkuqhbH8vJIVobZkvdo2cA==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.10.tgz", + "integrity": "sha512-W1HsjSH4MXQ9YfmmhLAoIYf1HRfekQCGngeIgcei6MP5QQGWUe0gkopdZQaVCFO+JDJMrAJGwa5pRpNpvy4P8Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3161,13 +3196,13 @@ } }, "node_modules/@vitest/runner": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.8.tgz", - "integrity": "sha512-EmVxeBAfMJvycdjd6Hm+RbFBbA9fKvo0Kx37hNpBYoYeavH3RNsBXWDooR1mgD52dCrxIIuP7UotpfiwOikvcg==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.10.tgz", + "integrity": "sha512-IKI6kpIH+LmpROplyLwBBaCfMgOZOMsygVa6BARD6ahA04VRuJSa6OaVG7kRvSEMD870Vd91rSSw0eegtWyLGg==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/utils": "4.1.8", + "@vitest/utils": "4.1.10", "pathe": "^2.0.3" }, "funding": { @@ -3175,14 +3210,14 @@ } }, "node_modules/@vitest/snapshot": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.8.tgz", - "integrity": "sha512-acfZboRmAIf05DEKcBQy33VXojFJjtUdLyo7oOmV9kebb2xdU01UknNiPuPZoJZQyO7DF0gZdTGTpeAzET9QPQ==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.10.tgz", + "integrity": "sha512-xRkfOT1qpTAi/Ti4Y1LtfRc3kEuqxGw59eN2jN9pRWMtS/XDevekhcFSqvQqjUNGksfjMJu3Y+oJ+4Ypn2OaJw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/pretty-format": "4.1.10", + "@vitest/utils": "4.1.10", "magic-string": "^0.30.21", "pathe": "^2.0.3" }, @@ -3191,9 +3226,9 @@ } }, "node_modules/@vitest/spy": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.8.tgz", - "integrity": "sha512-6EevtBp6OZOPF7bmz36HrGMeP3txgVSrgebWxHOafDXGkhIzfXK14f8KF6MuFfgXXUeHxmpD3BQxkV00/3s5mA==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.10.tgz", + "integrity": "sha512-PLf/Ugvoq5wO/b4rwYCR1h2PSIdXz7wnkQFMiUpLdtM7l6pqVFcQIBEHyT1+l+cj7mNwAfZHzqXqDyjvOuwbDw==", "dev": true, "license": "MIT", "funding": { @@ -3201,13 +3236,13 @@ } }, "node_modules/@vitest/utils": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.8.tgz", - "integrity": "sha512-uOJamYALNhfJ6iolExyQM40yIQwDqYnkKtQ5VCiSe17E33H0aQ/u+1GlRuz4LZBk6Mm3sg90G9hEbmEt37C1Zg==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.10.tgz", + "integrity": "sha512-fy9am/HWxbaGt/Sawrp90vt6Y6jQwf1RX77cz3uwoJwJVMli/e1IEwRPnMNJ7vKfPTwo0diXifkpPvwH9v7nGA==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/pretty-format": "4.1.8", + "@vitest/pretty-format": "4.1.10", "convert-source-map": "^2.0.0", "tinyrainbow": "^3.1.0" }, @@ -3216,9 +3251,9 @@ } }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", "dev": true, "license": "MIT", "bin": { @@ -3461,9 +3496,9 @@ } }, "node_modules/ast-v8-to-istanbul": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.3.tgz", - "integrity": "sha512-jCMQ6ZylLPudp0CDfBmQBZUsrh1/8psbmu9ibeVWKuHWD0YrH9YABwlKu5kVEFoT0GCQQW9Z/SxfuEbbkGQCRg==", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/ast-v8-to-istanbul/-/ast-v8-to-istanbul-1.0.5.tgz", + "integrity": "sha512-UPAgKJFSEGMWSDr3LX4tqnAb4f7KGT8O40Tyx8wbYmmZ/yn58lNCm8h3svs3eXgiGd5AXxz8NDOvXWvicq+rJA==", "dev": true, "license": "MIT", "dependencies": { @@ -3518,9 +3553,9 @@ } }, "node_modules/brace-expansion": { - "version": "5.0.6", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.6.tgz", - "integrity": "sha512-kLpxurY4Z4r9sgMsyG0Z9uzsBlgiU/EFKhj/h91/8yHu0edo7XuixOIH3VcJ8kkxs6/jPzoI6U9Vj3WqbMQ94g==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", "license": "MIT", "dependencies": { "balanced-match": "^4.0.2" @@ -3624,9 +3659,9 @@ } }, "node_modules/chardet": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.1.1.tgz", - "integrity": "sha512-PsezH1rqdV9VvyNhxxOW32/d75r01NY7TQCmOqomRo15ZSOKbpTFVsfjghxo6JloQUCGnH4k1LGu0R4yCLlWQQ==", + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/chardet/-/chardet-2.2.0.tgz", + "integrity": "sha512-rddelWYNPRrXq6PtNEN2S3f6t9ILzvqaN5pVgi4kqt9jHQaXIial9PznB5iSPVlQSLNaaH22ItWz3EJtQ10+OA==", "license": "MIT" }, "node_modules/chokidar": { @@ -3898,9 +3933,9 @@ } }, "node_modules/enhanced-resolve": { - "version": "5.23.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.23.0.tgz", - "integrity": "sha512-yJN/BOOLxcOW2aQgeif9mSnaUB8KtvmMMp56oA1kx1CRfBKbhZm2pJ+NBY+3eOboHxix8lfjWpHE0Ei5U8RbSA==", + "version": "5.24.3", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.24.3.tgz", + "integrity": "sha512-PwKooW9JUzh5chmYfHM3IQl5OkK2u2Nm011MgeZrss3JmFraUx/fqrf78kk8GUMYoibx/14MdwTl/1WKkG7TpQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3980,6 +4015,25 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/es-abstract-get": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz", + "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==", + "dev": true, + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0", + "es-object-atoms": "^1.1.2", + "is-callable": "^1.2.7", + "object-inspect": "^1.13.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/es-define-property": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", @@ -4001,9 +4055,9 @@ } }, "node_modules/es-iterator-helpers": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.3.2.tgz", - "integrity": "sha512-HVLACW1TppGYjJ8H6/jqH/pqOtKRw6wMlrB23xfExmFWxFquAIWCmwoLsOyN96K4a5KbmOf5At9ZUO3GZbetAw==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.4.0.tgz", + "integrity": "sha512-c/A0P0oxkACDc+cKWw8evLXK83oBKgn0qPOqCYT4x9uolpCIJAcYvJC9QYKNDRPsTeGyCrQ326jrvgZWdCdK5Q==", "dev": true, "license": "MIT", "dependencies": { @@ -4029,9 +4083,9 @@ } }, "node_modules/es-module-lexer": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.1.0.tgz", - "integrity": "sha512-n27zTYMjYu1aj4MjCWzSP7G9r75utsaoc8m61weK+W8JMBGGQybd43GstCXZ3WNmSFtGT9wi59qQTW6mhTR5LQ==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.1.tgz", + "integrity": "sha512-shc1dbU90Yl/xq1QrC7QRtfcwURZuVRfPhZbDoldJ1cn1gzDvBaBWlv0eFolj5+0znnPJz5TXLxsN77X/12KTA==", "dev": true, "license": "MIT" }, @@ -4078,15 +4132,18 @@ } }, "node_modules/es-to-primitive": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", - "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.4.tgz", + "integrity": "sha512-yPDz7wqpg1/mmHLmS3tcfTfbw5f1eryXvyghYBffGdERwe+mV7ZcWzTR8LR17Kvqt3qfPurjlonmnq3MKXIOXw==", "dev": true, "license": "MIT", "dependencies": { + "es-abstract-get": "^1.0.0", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", "is-callable": "^1.2.7", - "is-date-object": "^1.0.5", - "is-symbol": "^1.0.4" + "is-date-object": "^1.1.0", + "is-symbol": "^1.1.1" }, "engines": { "node": ">= 0.4" @@ -4109,9 +4166,9 @@ } }, "node_modules/eslint": { - "version": "9.39.4", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.4.tgz", - "integrity": "sha512-XoMjdBOwe/esVgEvLmNsD3IRHkm7fbKIUGvrleloJXUZgDHig2IPWNniv+GwjyJXzuNqVjlr5+4yVUZjycJwfQ==", + "version": "9.39.5", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.5.tgz", + "integrity": "sha512-DgZS62aPLXKlnxILS/AYCoRvHaZeXceIzlXPkkGGzJWSow1aEk0lbTlxUSlyjC8jcaKxAdOnTDz+o1JFSBsyjw==", "dev": true, "license": "MIT", "dependencies": { @@ -4120,8 +4177,8 @@ "@eslint/config-array": "^0.21.2", "@eslint/config-helpers": "^0.4.2", "@eslint/core": "^0.17.0", - "@eslint/eslintrc": "^3.3.5", - "@eslint/js": "9.39.4", + "@eslint/eslintrc": "^3.3.6", + "@eslint/js": "9.39.5", "@eslint/plugin-kit": "^0.4.1", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", @@ -4291,9 +4348,9 @@ } }, "node_modules/eslint-module-utils": { - "version": "2.13.0", - "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.13.0.tgz", - "integrity": "sha512-bLohSkT6469rRs8czj0tLTD8vaeIS/whvPRJVjDr7IuoTT1k5DYDERlNycjDj/HkOlvQdYurmfZ/g3fG5bgeLQ==", + "version": "2.14.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.14.0.tgz", + "integrity": "sha512-W2WCRZ9Dqntd+2u8jJcVMV2PKulc6RdLgUUoh/yQr3uB6lo/ZOeGx11sv60/8S4QFFKNslAlWhr9u0Ef7ZW6Ig==", "dev": true, "license": "MIT", "dependencies": { @@ -4382,9 +4439,9 @@ "license": "MIT" }, "node_modules/eslint-plugin-import/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -4525,9 +4582,9 @@ "license": "MIT" }, "node_modules/eslint-plugin-react/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -4620,9 +4677,9 @@ "license": "MIT" }, "node_modules/eslint/node_modules/brace-expansion": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", - "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.16.tgz", + "integrity": "sha512-IDw48K2/2kRkg9LdJxurvq3lV3aBgq0REY89duEqFRthjlPdXHKMj7EnQOXVckxzgisinf3nHfrcE2FufFLXMw==", "dev": true, "license": "MIT", "dependencies": { @@ -4767,9 +4824,9 @@ } }, "node_modules/expect-type": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.3.0.tgz", - "integrity": "sha512-knvyeauYhqjOYvQ66MznSMs83wmHrCycNEN6Ao+2AeYEfxUIkuiVxdEa1qlGEPK+We3n0THiDciYSsCcgW/DoA==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz", + "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -4947,18 +5004,21 @@ } }, "node_modules/function.prototype.name": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", - "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz", + "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==", "dev": true, "license": "MIT", "dependencies": { - "call-bind": "^1.0.8", - "call-bound": "^1.0.3", - "define-properties": "^1.2.1", + "call-bind": "^1.0.9", + "call-bound": "^1.0.4", + "es-define-property": "^1.0.1", + "es-errors": "^1.3.0", "functions-have-names": "^1.2.3", - "hasown": "^2.0.2", - "is-callable": "^1.2.7" + "has-property-descriptors": "^1.0.2", + "hasown": "^2.0.4", + "is-callable": "^1.2.7", + "is-document.all": "^1.0.0" }, "engines": { "node": ">= 0.4" @@ -5319,9 +5379,9 @@ } }, "node_modules/i18next": { - "version": "26.3.1", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.1.tgz", - "integrity": "sha512-txQqd5EULsqEh9OJqRH15aCaOuy/nLJyhw5EHCSKLKJE1aBbb3Zve2+uQIxgWhPm1QqUQoWyQBm2kfmmIrzkcQ==", + "version": "26.3.6", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.6.tgz", + "integrity": "sha512-Bu5Z2nAXgfVyM8xvW3jk9EKRIuX37PudsrBViThNFx7CR7aaYTpP01cxNB/E4c4UUzTDiAZRstEhsRfPOL/8xA==", "funding": [ { "type": "individual", @@ -5338,7 +5398,7 @@ ], "license": "MIT", "peerDependencies": { - "typescript": "^5 || ^6" + "typescript": "^5 || ^6 || ^7" }, "peerDependenciesMeta": { "typescript": { @@ -5362,9 +5422,9 @@ } }, "node_modules/iconv-lite": { - "version": "0.7.2", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.2.tgz", - "integrity": "sha512-im9DjEDQ55s9fL4EYzOAv0yMqmMBSZp6G0VvFyTMPKWxiSBHUj9NW/qqLmXUwXrrM7AvqSlTCfvqRb0cM8yYqw==", + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.7.3.tgz", + "integrity": "sha512-IKXpvIzjnC9XTAUbVBcMfGS0EPaIXtW6v+zr+RRp+hqULEpo0owZax6wyRwPOJbWbzjYspQwusTsfVr0ifh4uQ==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -5415,21 +5475,20 @@ } }, "node_modules/inquirer": { - "version": "13.4.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-13.4.3.tgz", - "integrity": "sha512-EPd3IqieHSavSOXh+LZhrIkdQcOELWeRblLT6kslQr+cF9XTh/HxZdSt1YkHH1iq4dvqBnV42uwg2YlorgOy6g==", + "version": "14.0.2", + "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-14.0.2.tgz", + "integrity": "sha512-VsSx1JneSNp3ld1veMTLe+UDcUD8Tw2/jjOthhkX3/IX2q+xHhVELifeb/hsb1fBw31pabEPNUf/xUOyb+KZjA==", "license": "MIT", "dependencies": { - "@inquirer/ansi": "^2.0.5", - "@inquirer/core": "^11.1.10", - "@inquirer/prompts": "^8.4.3", - "@inquirer/type": "^4.0.5", + "@inquirer/ansi": "^2.0.7", + "@inquirer/core": "^11.2.1", + "@inquirer/prompts": "^8.5.2", + "@inquirer/type": "^4.0.7", "mute-stream": "^3.0.0", - "run-async": "^4.0.6", - "rxjs": "^7.8.2" + "run-async": "^4.0.6" }, "engines": { - "node": ">=23.5.0 || ^22.13.0 || ^21.7.0 || ^20.12.0" + "node": ">=23.5.0 || ^22.13.0 || ^20.17.0" }, "peerDependencies": { "@types/node": ">=18" @@ -5600,6 +5659,22 @@ "url": "https://github.com/sponsors/ljharb" } }, + "node_modules/is-document.all": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz", + "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==", + "dev": true, + "license": "MIT", + "dependencies": { + "call-bound": "^1.0.4" + }, + "engines": { + "node": ">= 0.4" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -5982,9 +6057,9 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.2.0.tgz", - "integrity": "sha512-ePWsvanv0DWuDRsW8dnt+R4jQ31SCRCQ7hhNcPXZPsoBZiemuZNYGf7adZdqX2D86j6rvKp3RpCxVTSb8WQlOw==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", "dev": true, "funding": [ { @@ -6085,9 +6160,9 @@ } }, "node_modules/lightningcss": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", - "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz", + "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==", "dev": true, "license": "MPL-2.0", "dependencies": { @@ -6101,23 +6176,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-android-arm64": "1.32.0", - "lightningcss-darwin-arm64": "1.32.0", - "lightningcss-darwin-x64": "1.32.0", - "lightningcss-freebsd-x64": "1.32.0", - "lightningcss-linux-arm-gnueabihf": "1.32.0", - "lightningcss-linux-arm64-gnu": "1.32.0", - "lightningcss-linux-arm64-musl": "1.32.0", - "lightningcss-linux-x64-gnu": "1.32.0", - "lightningcss-linux-x64-musl": "1.32.0", - "lightningcss-win32-arm64-msvc": "1.32.0", - "lightningcss-win32-x64-msvc": "1.32.0" + "lightningcss-android-arm64": "1.33.0", + "lightningcss-darwin-arm64": "1.33.0", + "lightningcss-darwin-x64": "1.33.0", + "lightningcss-freebsd-x64": "1.33.0", + "lightningcss-linux-arm-gnueabihf": "1.33.0", + "lightningcss-linux-arm64-gnu": "1.33.0", + "lightningcss-linux-arm64-musl": "1.33.0", + "lightningcss-linux-x64-gnu": "1.33.0", + "lightningcss-linux-x64-musl": "1.33.0", + "lightningcss-win32-arm64-msvc": "1.33.0", + "lightningcss-win32-x64-msvc": "1.33.0" } }, "node_modules/lightningcss-android-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", - "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.33.0.tgz", + "integrity": "sha512-gEpRTalKdosp4Bb8qWtc2iOgE5SeIHlpS1up9bFq2wAyYhl1UdTObYiHe98zEM9SQvSoqQZ1IQD0JNpg3Ml5pg==", "cpu": [ "arm64" ], @@ -6136,9 +6211,9 @@ } }, "node_modules/lightningcss-darwin-arm64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", - "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.33.0.tgz", + "integrity": "sha512-Sciaz8eenNTKn9b3t7+xr0ipTp9YxKQY4npwQ3mrRuL0BAVHBLyZxofhaKBAVtzmtRZ/zTyo0/to4B1uWG/Djg==", "cpu": [ "arm64" ], @@ -6157,9 +6232,9 @@ } }, "node_modules/lightningcss-darwin-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", - "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.33.0.tgz", + "integrity": "sha512-Z5UPAxzrjlWNNyGy6i65cJzzvgJ5D3T6wMvs+gWpY9d7qRhANrxqAp6LhxIgZhWEw18RfJTGcRxjuLIBr+m8XQ==", "cpu": [ "x64" ], @@ -6178,9 +6253,9 @@ } }, "node_modules/lightningcss-freebsd-x64": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", - "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.33.0.tgz", + "integrity": "sha512-QQM/Ti/hQajJwCY+RiWuCZ9sdtI/XQk7nDK5vC8kkdwixezOlDgvDx7+RT+QjK6FcFT4MpsuoBnHIo/O3StRRg==", "cpu": [ "x64" ], @@ -6199,9 +6274,9 @@ } }, "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", - "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.33.0.tgz", + "integrity": "sha512-N7FVBe6iS24MlM6R/4RBTxGhQheZGs7tiQ9U32UtF75NzP5Q7xWPRqLBCKxlRQRk3rY1jCIPLzx7WzOhuUIRLQ==", "cpu": [ "arm" ], @@ -6220,9 +6295,9 @@ } }, "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", - "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.33.0.tgz", + "integrity": "sha512-j2v/itmy4HlNxlc6voKXYgBqNi0Ng2LShg4z7GufpEgs05P+2suBVyi9I6YHq5uoVFx9ETin3eCEhLVyXGQnKg==", "cpu": [ "arm64" ], @@ -6244,9 +6319,9 @@ } }, "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", - "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.33.0.tgz", + "integrity": "sha512-yiO5ROMuYQgXbC60yjZU5CYSFZGKXL0HFATXt9mHJn1+zW55oCtMI9NfcVhYLMFDL7gV7oBPon/EmMMGg2OvtQ==", "cpu": [ "arm64" ], @@ -6268,9 +6343,9 @@ } }, "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", - "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.33.0.tgz", + "integrity": "sha512-ar+Ju7LmcN0Jo4FpL4hpFybwNG9/3A/Br5KW2n2jyODg3MEZXaDYADdemoNS+BDNfMgKvylJLj4S5tyRActuAg==", "cpu": [ "x64" ], @@ -6292,9 +6367,9 @@ } }, "node_modules/lightningcss-linux-x64-musl": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", - "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.33.0.tgz", + "integrity": "sha512-RYiYbkokw0trfKqqzfF55lginwEPrD3OJDfTuJzFs1MK6iFnDenaz1fqLLtX4ITG3OktJQXOeTaw1awrBAlZPw==", "cpu": [ "x64" ], @@ -6316,9 +6391,9 @@ } }, "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", - "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.33.0.tgz", + "integrity": "sha512-1K+MPfLSFVpphzpdbfkhlWk6wBrTObBzS2T6db10PNOZgR9GoVsAWzwNyuhUYYbTp23j+4RrncfujZ4uAzXvwA==", "cpu": [ "arm64" ], @@ -6337,9 +6412,9 @@ } }, "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.32.0", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", - "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", + "version": "1.33.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.33.0.tgz", + "integrity": "sha512-OlEICDx/Xl0FqSp4bry8zFnCvGpig3Gl4gCquvYwHuqJKEC1+n9NgDniFvqHGmMv1ZkqDJrDqKKSykTDX+ehuA==", "cpu": [ "x64" ], @@ -6427,9 +6502,9 @@ "license": "MIT" }, "node_modules/lru-cache": { - "version": "11.5.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", - "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", + "version": "11.5.2", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz", + "integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==", "license": "BlueOak-1.0.0", "engines": { "node": "20 || >=22" @@ -6483,20 +6558,20 @@ } }, "node_modules/memfs": { - "version": "4.57.6", - "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.57.6.tgz", - "integrity": "sha512-WQK+DGjKCnPdpSyJUXphz+COF2uEhhsxQ3VIWBSbzpbbXuch3h4FePMqXrXGdLjsTgo4JFzBFsP6AWd9pVazGw==", + "version": "4.64.0", + "resolved": "https://registry.npmjs.org/memfs/-/memfs-4.64.0.tgz", + "integrity": "sha512-Kw72fgY7Wn+sD8KmtNWSafl1dz0UvAsE/PHs3YVfLiaZuA3HxNm9sRLqAu0ATiBGJvME1PxZXbBZPv5GycDeAw==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@jsonjoy.com/fs-core": "4.57.6", - "@jsonjoy.com/fs-fsa": "4.57.6", - "@jsonjoy.com/fs-node": "4.57.6", - "@jsonjoy.com/fs-node-builtins": "4.57.6", - "@jsonjoy.com/fs-node-to-fsa": "4.57.6", - "@jsonjoy.com/fs-node-utils": "4.57.6", - "@jsonjoy.com/fs-print": "4.57.6", - "@jsonjoy.com/fs-snapshot": "4.57.6", + "@jsonjoy.com/fs-core": "4.64.0", + "@jsonjoy.com/fs-fsa": "4.64.0", + "@jsonjoy.com/fs-node": "4.64.0", + "@jsonjoy.com/fs-node-builtins": "4.64.0", + "@jsonjoy.com/fs-node-to-fsa": "4.64.0", + "@jsonjoy.com/fs-node-utils": "4.64.0", + "@jsonjoy.com/fs-print": "4.64.0", + "@jsonjoy.com/fs-snapshot": "4.64.0", "@jsonjoy.com/json-pack": "^1.11.0", "@jsonjoy.com/util": "^1.9.0", "glob-to-regex.js": "^1.0.1", @@ -6575,9 +6650,9 @@ } }, "node_modules/nanoid": { - "version": "3.3.12", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.12.tgz", - "integrity": "sha512-ZB9RH/39qpq5Vu6Y+NmUaFhQR6pp+M2Xt76XBnEwDaGcVAqhlvxrl3B2bKS5D3NH3QR76v3aSrKaF/Kiy7lEtQ==", + "version": "3.3.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.16.tgz", + "integrity": "sha512-bzlKTyNJ7+LdGIIwy8ijFpIqEQIvafahV7eYykJ8Cvh42EdJeODoJ6gUJXpQJvej1BddH8OqTXZNE/KfbWAu8Q==", "dev": true, "funding": [ { @@ -6661,9 +6736,9 @@ } }, "node_modules/neostandard/node_modules/globals": { - "version": "17.6.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-17.6.0.tgz", - "integrity": "sha512-sepffkT8stwnIYbsMBpoCHJuJM5l98FUF2AnE07hfvE0m/qp3R586hw4jF4uadbhvg1ooIdzuu7CsfD2jzCaNA==", + "version": "17.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz", + "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==", "dev": true, "license": "MIT", "engines": { @@ -6735,9 +6810,9 @@ } }, "node_modules/node-exports-info": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.0.tgz", - "integrity": "sha512-pyFS63ptit/P5WqUkt+UUfe+4oevH+bFeIiPPdfb0pFeYEu/1ELnJu5l+5EcTKYL5M7zaAa7S8ddywgXypqKCw==", + "version": "1.6.2", + "resolved": "https://registry.npmjs.org/node-exports-info/-/node-exports-info-1.6.2.tgz", + "integrity": "sha512-kXs9Go0cah0qHVV2v389IXQLdLCeE1xfFtjOAF+iobu0OIoG1pje8At2vMHyaPMiPMnG/LWP50twML21eMcAag==", "dev": true, "license": "MIT", "dependencies": { @@ -6915,9 +6990,9 @@ } }, "node_modules/obug": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.2.tgz", - "integrity": "sha512-AWGB9WFcRXOQs48Z/udjI5ZcZMHXwX8XPByNpOydgcGsDLIzjGizhoMWJyKAWze7AVW/2W1i+/gPX4YtKe5cyg==", + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.4.tgz", + "integrity": "sha512-4a+OsYv9UktOJKE+l1A4OufDgdRF9PifWj+tJnHURo/P+WOxpG4GzUFL9qCalmWauao6ogiG+QvnCovwPoyAWA==", "dev": true, "funding": [ "https://github.com/sponsors/sxzz", @@ -6962,9 +7037,9 @@ } }, "node_modules/ora": { - "version": "9.4.0", - "resolved": "https://registry.npmjs.org/ora/-/ora-9.4.0.tgz", - "integrity": "sha512-84cglkRILFxdtA8hAvLNdMrtBpPNBTrQ9/ulg0FA7xLMnD6mifv+enAIeRmvtv+WgdCE+LPGOfQmtJRrVaIVhQ==", + "version": "9.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-9.4.1.tgz", + "integrity": "sha512-6VlU9MLXbjVQD04AZCMX28hVtA5bUoadvUqO76MUCVA0ilwJbMiHsITRPfyVm6p/BC0Av/BXMujx39WCe1LEqw==", "license": "MIT", "dependencies": { "chalk": "^5.6.2", @@ -7138,9 +7213,9 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.4.tgz", - "integrity": "sha512-QP88BAKvMam/3NxH6vj2o21R6MjxZUAd6nlwAS/pnGvN9IVLocLHxGYIzFhg6fUQ+5th6P4dv4eW9jX3DSIj7A==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", "dev": true, "license": "MIT", "engines": { @@ -7161,9 +7236,9 @@ } }, "node_modules/postcss": { - "version": "8.5.15", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.15.tgz", - "integrity": "sha512-FfR8sjd4em2T6fb3I2MwAJU7HWVMr9zba+enmQeeWFfCbm+UOC/0X4DS8XtpUTMwWMGbjKYP7xjfNekzyGmB3A==", + "version": "8.5.20", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.20.tgz", + "integrity": "sha512-lW616l85ucIQL+FocMmL7pQFPqBmwejrCMg+iPxyImlrANNJG9NHq/RkyCZopDhd8C3LA03PHRJDjkbGu8vvug==", "dev": true, "funding": [ { @@ -7181,7 +7256,7 @@ ], "license": "MIT", "dependencies": { - "nanoid": "^3.3.12", + "nanoid": "^3.3.16", "picocolors": "^1.1.1", "source-map-js": "^1.2.1" }, @@ -7246,9 +7321,9 @@ } }, "node_modules/react-i18next": { - "version": "17.0.8", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.8.tgz", - "integrity": "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==", + "version": "17.0.10", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.10.tgz", + "integrity": "sha512-XneHftyYA774MJkkccSkZ5oKrUpCnXIPmxio3wemqrVzCRLWiGXOMbIzObrer03fNDEnm8g8R5yYls4HcE+esg==", "license": "MIT", "dependencies": { "@babel/runtime": "^7.29.2", @@ -7258,7 +7333,7 @@ "peerDependencies": { "i18next": ">= 26.2.0", "react": ">= 16.8.0", - "typescript": "^5 || ^6" + "typescript": "^5 || ^6 || ^7" }, "peerDependenciesMeta": { "react-dom": { @@ -7395,13 +7470,13 @@ } }, "node_modules/rolldown": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.0.3.tgz", - "integrity": "sha512-i00lAJ2ks1BYr7rjNjKC7BcqAS7nVfiT3QX1SI5aY+AFHblCmaUf9OE9dbdzDvW6dJxbi2ZCZiy9v3CcwOiX3g==", + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.5.tgz", + "integrity": "sha512-t9z29cJjXf/vxQ8dyhCSpt6H6aSwHTk8cT5I3iy6SMXuFpk5mB6PL6XfC8PCwrPTx93udwKUm9HRteAlTGBLiA==", "dev": true, "license": "MIT", "dependencies": { - "@oxc-project/types": "=0.133.0", + "@oxc-project/types": "=0.139.0", "@rolldown/pluginutils": "^1.0.0" }, "bin": { @@ -7411,27 +7486,27 @@ "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rolldown/binding-android-arm64": "1.0.3", - "@rolldown/binding-darwin-arm64": "1.0.3", - "@rolldown/binding-darwin-x64": "1.0.3", - "@rolldown/binding-freebsd-x64": "1.0.3", - "@rolldown/binding-linux-arm-gnueabihf": "1.0.3", - "@rolldown/binding-linux-arm64-gnu": "1.0.3", - "@rolldown/binding-linux-arm64-musl": "1.0.3", - "@rolldown/binding-linux-ppc64-gnu": "1.0.3", - "@rolldown/binding-linux-s390x-gnu": "1.0.3", - "@rolldown/binding-linux-x64-gnu": "1.0.3", - "@rolldown/binding-linux-x64-musl": "1.0.3", - "@rolldown/binding-openharmony-arm64": "1.0.3", - "@rolldown/binding-wasm32-wasi": "1.0.3", - "@rolldown/binding-win32-arm64-msvc": "1.0.3", - "@rolldown/binding-win32-x64-msvc": "1.0.3" + "@rolldown/binding-android-arm64": "1.1.5", + "@rolldown/binding-darwin-arm64": "1.1.5", + "@rolldown/binding-darwin-x64": "1.1.5", + "@rolldown/binding-freebsd-x64": "1.1.5", + "@rolldown/binding-linux-arm-gnueabihf": "1.1.5", + "@rolldown/binding-linux-arm64-gnu": "1.1.5", + "@rolldown/binding-linux-arm64-musl": "1.1.5", + "@rolldown/binding-linux-ppc64-gnu": "1.1.5", + "@rolldown/binding-linux-s390x-gnu": "1.1.5", + "@rolldown/binding-linux-x64-gnu": "1.1.5", + "@rolldown/binding-linux-x64-musl": "1.1.5", + "@rolldown/binding-openharmony-arm64": "1.1.5", + "@rolldown/binding-wasm32-wasi": "1.1.5", + "@rolldown/binding-win32-arm64-msvc": "1.1.5", + "@rolldown/binding-win32-x64-msvc": "1.1.5" } }, "node_modules/rollup": { - "version": "4.61.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.61.1.tgz", - "integrity": "sha512-I4KW6iuRpuu2uHBLraZ1wNZe0DP7lnRha+VJ9tNaYVaVgKhW0aI3h4RYnoRPeql0flHm/Co55b7snEDcOfOJrA==", + "version": "4.62.2", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.62.2.tgz", + "integrity": "sha512-RFnrW4lhXA3s3eqHDZvN654g8OTjzRfqpIRJYczCGB6HzphckVAi/Qh4tbPUbRuDi7s1Llv8g/NspLkttY3gTA==", "dev": true, "license": "MIT", "dependencies": { @@ -7445,31 +7520,31 @@ "npm": ">=8.0.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.61.1", - "@rollup/rollup-android-arm64": "4.61.1", - "@rollup/rollup-darwin-arm64": "4.61.1", - "@rollup/rollup-darwin-x64": "4.61.1", - "@rollup/rollup-freebsd-arm64": "4.61.1", - "@rollup/rollup-freebsd-x64": "4.61.1", - "@rollup/rollup-linux-arm-gnueabihf": "4.61.1", - "@rollup/rollup-linux-arm-musleabihf": "4.61.1", - "@rollup/rollup-linux-arm64-gnu": "4.61.1", - "@rollup/rollup-linux-arm64-musl": "4.61.1", - "@rollup/rollup-linux-loong64-gnu": "4.61.1", - "@rollup/rollup-linux-loong64-musl": "4.61.1", - "@rollup/rollup-linux-ppc64-gnu": "4.61.1", - "@rollup/rollup-linux-ppc64-musl": "4.61.1", - "@rollup/rollup-linux-riscv64-gnu": "4.61.1", - "@rollup/rollup-linux-riscv64-musl": "4.61.1", - "@rollup/rollup-linux-s390x-gnu": "4.61.1", - "@rollup/rollup-linux-x64-gnu": "4.61.1", - "@rollup/rollup-linux-x64-musl": "4.61.1", - "@rollup/rollup-openbsd-x64": "4.61.1", - "@rollup/rollup-openharmony-arm64": "4.61.1", - "@rollup/rollup-win32-arm64-msvc": "4.61.1", - "@rollup/rollup-win32-ia32-msvc": "4.61.1", - "@rollup/rollup-win32-x64-gnu": "4.61.1", - "@rollup/rollup-win32-x64-msvc": "4.61.1", + "@rollup/rollup-android-arm-eabi": "4.62.2", + "@rollup/rollup-android-arm64": "4.62.2", + "@rollup/rollup-darwin-arm64": "4.62.2", + "@rollup/rollup-darwin-x64": "4.62.2", + "@rollup/rollup-freebsd-arm64": "4.62.2", + "@rollup/rollup-freebsd-x64": "4.62.2", + "@rollup/rollup-linux-arm-gnueabihf": "4.62.2", + "@rollup/rollup-linux-arm-musleabihf": "4.62.2", + "@rollup/rollup-linux-arm64-gnu": "4.62.2", + "@rollup/rollup-linux-arm64-musl": "4.62.2", + "@rollup/rollup-linux-loong64-gnu": "4.62.2", + "@rollup/rollup-linux-loong64-musl": "4.62.2", + "@rollup/rollup-linux-ppc64-gnu": "4.62.2", + "@rollup/rollup-linux-ppc64-musl": "4.62.2", + "@rollup/rollup-linux-riscv64-gnu": "4.62.2", + "@rollup/rollup-linux-riscv64-musl": "4.62.2", + "@rollup/rollup-linux-s390x-gnu": "4.62.2", + "@rollup/rollup-linux-x64-gnu": "4.62.2", + "@rollup/rollup-linux-x64-musl": "4.62.2", + "@rollup/rollup-openbsd-x64": "4.62.2", + "@rollup/rollup-openharmony-arm64": "4.62.2", + "@rollup/rollup-win32-arm64-msvc": "4.62.2", + "@rollup/rollup-win32-ia32-msvc": "4.62.2", + "@rollup/rollup-win32-x64-gnu": "4.62.2", + "@rollup/rollup-win32-x64-msvc": "4.62.2", "fsevents": "~2.3.2" } }, @@ -7486,6 +7561,7 @@ "version": "7.8.2", "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-7.8.2.tgz", "integrity": "sha512-dhKf903U/PQZY6boNNtAGdWbG85WAbjT/1xYoZIC7FAY0yWapOBQVsVrDl58W86//e1VpMNBtRV4MaXfdMySFA==", + "dev": true, "license": "Apache-2.0", "dependencies": { "tslib": "^2.1.0" @@ -7553,9 +7629,9 @@ "license": "MIT" }, "node_modules/semver": { - "version": "7.8.2", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.2.tgz", - "integrity": "sha512-c8jsqUZm3omBOI66G90z1Dyw5z622G8oLG+omfsHBJf3CWQTlOcwOjvOG6wtiNfW6anKm/eA39LMwMtMez2TiQ==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -7566,9 +7642,9 @@ } }, "node_modules/serialize-javascript": { - "version": "7.0.5", - "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.5.tgz", - "integrity": "sha512-F4LcB0UqUl1zErq+1nYEEzSHJnIwb3AF2XWB94b+afhrekOUijwooAYqFyRbjYkm2PAKBabx6oYv/xDxNi8IBw==", + "version": "7.0.7", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-7.0.7.tgz", + "integrity": "sha512-YAy8Od6KV+uuwUuU50np8fGB/Aues6Y0nAhA9y/hId74PlKUcme4pXcBD46NWKr1Q4osN/iseZ17YqO1XfmI8g==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -7646,15 +7722,15 @@ } }, "node_modules/side-channel": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.1.tgz", + "integrity": "sha512-6x6dK6zJdpTzF4sQeNYxwtvBzf6Eg4GtlesS94HOvTudUeyK2WXAaIfmDgsyslYrRBeFIlsi54AYsFGUuhmvrQ==", "dev": true, "license": "MIT", "dependencies": { "es-errors": "^1.3.0", - "object-inspect": "^1.13.3", - "side-channel-list": "^1.0.0", + "object-inspect": "^1.13.4", + "side-channel-list": "^1.0.1", "side-channel-map": "^1.0.1", "side-channel-weakmap": "^1.0.2" }, @@ -7799,9 +7875,9 @@ "license": "MIT" }, "node_modules/std-env": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz", - "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.2.0.tgz", + "integrity": "sha512-oCUKSupKTHX53EyjDtuZQ64pjLJ6yYCtpmEw0goYxtjG9KpbRe8KAsl2tBUGU9DyMcJ0RwJ8GqJAFzMXcXW1Rw==", "dev": true, "license": "MIT" }, @@ -7832,9 +7908,9 @@ } }, "node_modules/string-width": { - "version": "8.2.1", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.1.tgz", - "integrity": "sha512-IIaP0g3iy9Cyy18w3M9YcaDudujEAVHKt3a3QJg1+sr/oX96TbaGUubG0hJyCjCBThFH+tFpcIyoUHUn1ogaLA==", + "version": "8.2.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-8.2.2.tgz", + "integrity": "sha512-GaPUh5gfdrYzqeVNZvUfT23vYYxXzKYidUcnMtJg/3rxRV63EFZy3k6xfKlmfeJD0176lnUV/Usr3XcwSvFzpg==", "license": "MIT", "dependencies": { "get-east-asian-width": "^1.5.0", @@ -8037,9 +8113,9 @@ } }, "node_modules/terser": { - "version": "5.48.0", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz", - "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==", + "version": "5.49.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.49.0.tgz", + "integrity": "sha512-SNiDnXyHSrxVcIOtVbULzcTmniUiwcV7Nwdyj1twVubeTmbjoa8p69KKDpfkdoOavuM4/GRm1+ykI8qqnavHoA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -8193,6 +8269,7 @@ "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", + "dev": true, "license": "0BSD" }, "node_modules/type-check": { @@ -8301,16 +8378,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.60.1", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.60.1.tgz", - "integrity": "sha512-6m5hkkRAp8lKvhVpcprAIn5KkehQEh+47oHH2VGnExEh7dhNxXlg6GPAOIu6TxbVQxhebrJDvjl3020ooiWCMA==", + "version": "8.64.0", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.64.0.tgz", + "integrity": "sha512-0qg+pDNMnqYzqH9AnNK+39tejHvsShUOUUoRUgtnTGE7QuMZhiFDnozq8nHJVq+Wae6NMLKNWLg5WmkcC/ndyQ==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.60.1", - "@typescript-eslint/parser": "8.60.1", - "@typescript-eslint/typescript-estree": "8.60.1", - "@typescript-eslint/utils": "8.60.1" + "@typescript-eslint/eslint-plugin": "8.64.0", + "@typescript-eslint/parser": "8.64.0", + "@typescript-eslint/typescript-estree": "8.64.0", + "@typescript-eslint/utils": "8.64.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -8451,16 +8528,16 @@ } }, "node_modules/vite": { - "version": "8.0.16", - "resolved": "https://registry.npmjs.org/vite/-/vite-8.0.16.tgz", - "integrity": "sha512-h9bXPmJichP5fLmVQo3PyaGSDE2n3aPuomeAlVRm0JLmt4rY6zmPKd59HYI4LNW8oTK7tlTsuC7l/m7awx9Jcw==", + "version": "8.1.5", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.5.tgz", + "integrity": "sha512-7ULLwsCdYx/nRyrpiEwvqb5TFHrMVZyBt+rg/OAXT7rgj/z+DtTDyKFeLAdDkubDVDKD8jOsndmy7m55XcfUsw==", "dev": true, "license": "MIT", "dependencies": { "lightningcss": "^1.32.0", - "picomatch": "^4.0.4", - "postcss": "^8.5.15", - "rolldown": "1.0.3", + "picomatch": "^4.0.5", + "postcss": "^8.5.17", + "rolldown": "~1.1.5", "tinyglobby": "^0.2.17" }, "bin": { @@ -8477,7 +8554,7 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", - "@vitejs/devtools": "^0.1.18", + "@vitejs/devtools": "^0.3.0", "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", @@ -8529,19 +8606,19 @@ } }, "node_modules/vitest": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.8.tgz", - "integrity": "sha512-flY6ScbCIt9HThs+C5HS7jvGOB560DJtk/Z15IQROTA6zEy49Nh8T/dofWTQL+n3vswqn87sbJNiuqw1SDp5Ig==", + "version": "4.1.10", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.10.tgz", + "integrity": "sha512-R9jUTe5S4Qb0HCd4TNqpC7oGcrMssMRGXLW80ubjWsW9VH5GF8y1Y0SFLY9AbqSk6nt0PnOx4H4WNJYZ13GUPw==", "dev": true, "license": "MIT", "dependencies": { - "@vitest/expect": "4.1.8", - "@vitest/mocker": "4.1.8", - "@vitest/pretty-format": "4.1.8", - "@vitest/runner": "4.1.8", - "@vitest/snapshot": "4.1.8", - "@vitest/spy": "4.1.8", - "@vitest/utils": "4.1.8", + "@vitest/expect": "4.1.10", + "@vitest/mocker": "4.1.10", + "@vitest/pretty-format": "4.1.10", + "@vitest/runner": "4.1.10", + "@vitest/snapshot": "4.1.10", + "@vitest/spy": "4.1.10", + "@vitest/utils": "4.1.10", "es-module-lexer": "^2.0.0", "expect-type": "^1.3.0", "magic-string": "^0.30.21", @@ -8569,12 +8646,12 @@ "@edge-runtime/vm": "*", "@opentelemetry/api": "^1.9.0", "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", - "@vitest/browser-playwright": "4.1.8", - "@vitest/browser-preview": "4.1.8", - "@vitest/browser-webdriverio": "4.1.8", - "@vitest/coverage-istanbul": "4.1.8", - "@vitest/coverage-v8": "4.1.8", - "@vitest/ui": "4.1.8", + "@vitest/browser-playwright": "4.1.10", + "@vitest/browser-preview": "4.1.10", + "@vitest/browser-webdriverio": "4.1.10", + "@vitest/coverage-istanbul": "4.1.10", + "@vitest/coverage-v8": "4.1.10", + "@vitest/ui": "4.1.10", "happy-dom": "*", "jsdom": "*", "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" diff --git a/pkgs/by-name/i1/i18next-cli/package.nix b/pkgs/by-name/i1/i18next-cli/package.nix index 94e44e94bb2f..ad6d884dee9f 100644 --- a/pkgs/by-name/i1/i18next-cli/package.nix +++ b/pkgs/by-name/i1/i18next-cli/package.nix @@ -6,13 +6,13 @@ }: buildNpmPackage rec { pname = "i18next-cli"; - version = "1.61.0"; + version = "1.66.2"; src = fetchFromGitHub { owner = "i18next"; repo = "i18next-cli"; tag = "v${version}"; - hash = "sha256-birjO9dfj3LhY/c1VQZJwVGDP9WWOmjPTeFF43/DetM="; + hash = "sha256-R+TT7ehika2Q9TgCT+wRIBAB3sjDMw/FrJdN3Za9rMc="; }; # NOTE: Generating lock-file @@ -21,7 +21,7 @@ buildNpmPackage rec { cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-uLnszHMzL+zEgOtlYzqUjlCxcF44KUjkdPy+QJe/3zs="; + npmDepsHash = "sha256-VHfL8feE3b5rK9o/QDbxdLIG8ew1YHfL0Y2HLV/Z9s4="; passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; diff --git a/pkgs/by-name/i3/i3-rounded/package.nix b/pkgs/by-name/i3/i3-rounded/package.nix index 01b0e3e4d5aa..92b1046fa1f3 100644 --- a/pkgs/by-name/i3/i3-rounded/package.nix +++ b/pkgs/by-name/i3/i3-rounded/package.nix @@ -2,21 +2,24 @@ fetchFromGitHub, lib, i3, - pcre, + pcre2, }: +let + version = "4.21.1"; +in i3.overrideAttrs (oldAttrs: { pname = "i3-rounded"; - version = "4.21.1"; + inherit version; src = fetchFromGitHub { owner = "LinoBigatti"; repo = "i3-rounded"; - rev = "524c9f7b50f8c540b2ae3480b242c30d8775f98e"; - hash = "sha256-lceeP+WZtBLNSDqcNn18MROLtBwj+nXufDs55IMO9Xg="; + rev = "v${version}"; + hash = "sha256-KMpejS89Hg6Mrm94HTNA9mV/6Leu1yo2W1CsD6vGDRo="; }; - buildInputs = oldAttrs.buildInputs ++ [ pcre ]; + buildInputs = oldAttrs.buildInputs ++ [ pcre2 ]; # Some tests are failing. doCheck = false; diff --git a/pkgs/by-name/i3/i3-swallow/package.nix b/pkgs/by-name/i3/i3-swallow/package.nix index c36c2cd2a01e..d3a7637d7df6 100644 --- a/pkgs/by-name/i3/i3-swallow/package.nix +++ b/pkgs/by-name/i3/i3-swallow/package.nix @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication { propagatedBuildInputs = [ python3Packages.i3ipc - python3Packages.xlib + python3Packages.python-xlib python3Packages.six ]; diff --git a/pkgs/by-name/i3/i3altlayout/package.nix b/pkgs/by-name/i3/i3altlayout/package.nix index d9af049b0a53..ef080a0da547 100644 --- a/pkgs/by-name/i3/i3altlayout/package.nix +++ b/pkgs/by-name/i3/i3altlayout/package.nix @@ -7,13 +7,19 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "i3altlayout"; version = "0.3"; - format = "setuptools"; + pyproject = true; + + __structuredAttrs = true; src = fetchPypi { inherit (finalAttrs) pname version; hash = "sha256-DhOYeSCxKthr2fEMGMBXjUYeCJjj6AV4d05So4eDF8A="; }; + build-system = with python3Packages; [ + setuptools + ]; + pythonRemoveDeps = [ "enum-compat" ]; pythonPath = with python3Packages; [ diff --git a/pkgs/by-name/i3/i3ipc-glib/package.nix b/pkgs/by-name/i3/i3ipc-glib/package.nix index 3c949cc344c4..3edf93555e4f 100644 --- a/pkgs/by-name/i3/i3ipc-glib/package.nix +++ b/pkgs/by-name/i3/i3ipc-glib/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.0.1"; src = fetchFromGitHub { - owner = "acrisci"; + owner = "altdesktop"; repo = "i3ipc-glib"; tag = "v${finalAttrs.version}"; hash = "sha256-F9Tiwc/gB7BFWr/qerS4n/+k/nUvJsH7Bp2zb1fe3wU="; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C interface library to i3wm"; - homepage = "https://github.com/acrisci/i3ipc-glib"; + homepage = "https://github.com/altdesktop/i3ipc-glib"; maintainers = with lib.maintainers; [ teto ]; license = lib.licenses.gpl3; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/i3/i3pystatus/package.nix b/pkgs/by-name/i3/i3pystatus/package.nix index 46c1d229cee5..55465c92de41 100644 --- a/pkgs/by-name/i3/i3pystatus/package.nix +++ b/pkgs/by-name/i3/i3pystatus/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { # i3pystatus moved to rolling release: # https://github.com/enkore/i3pystatus/issues/584 - version = "3.35-unstable-2025-06-24"; + version = "3.35-unstable-2026-04-21"; pname = "i3pystatus"; pyproject = true; build-system = [ python3Packages.setuptools ]; @@ -22,8 +22,8 @@ python3Packages.buildPythonApplication rec { src = fetchFromGitHub { owner = "enkore"; repo = "i3pystatus"; - rev = "e8e03934d95658c85fa9f594987dac0481ca26c9"; - hash = "sha256-uAt6jxNAUR9txyPtHS4BRtu8Z5QaP6uqFg0sROf356c="; + rev = "045d5f09220ccec1146a220619ff80b1077206a4"; + hash = "sha256-K6sCII8qw0JLcMw5QVCY0RCu0O55MlEKFQXDY96V3NM="; }; patches = [ @@ -44,12 +44,20 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ python3Packages.pytestCheckHook + python3Packages.mock writableTmpDirAsHomeHook ]; - checkInputs = [ python3Packages.requests ]; + # Upstream tests construct ElementCall via __new__ without Module.__init__, so + # output/_output is never set (AttributeError on .output after run()). + disabledTests = [ + "test_active_output" + "test_empty_output" + "test_error_output" + "test_format_includes_room_alias" + ]; - propagatedBuildInputs = + dependencies = with python3Packages; [ keyring @@ -58,6 +66,8 @@ python3Packages.buildPythonApplication rec { psutil basiciw pygobject3 + requests + dbus-python ] ++ extraLibs; diff --git a/pkgs/by-name/ia/iannix/package.nix b/pkgs/by-name/ia/iannix/package.nix index ceab601c015e..843b665bc93f 100644 --- a/pkgs/by-name/ia/iannix/package.nix +++ b/pkgs/by-name/ia/iannix/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { version = "unstable-2020-12-09"; src = fetchFromGitHub { - owner = "iannix"; + owner = "buzzinglight"; repo = "IanniX"; rev = "287b51d9b90b3e16ae206c0c4292599619f7b159"; sha256 = "AhoP+Ok78Vk8Aee/RP572hJeM8O7v2ZTvFalOZZqRy8="; diff --git a/pkgs/by-name/ib/ibm-plex/fonts.nix b/pkgs/by-name/ib/ibm-plex/fonts.nix index cda27fb6be87..9a5dd7b1748c 100644 --- a/pkgs/by-name/ib/ibm-plex/fonts.nix +++ b/pkgs/by-name/ib/ibm-plex/fonts.nix @@ -6,10 +6,10 @@ version = "1.1.0"; }; mono = { - hash = "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g="; + hash = "sha256-GK9KStu5KQ5g5+IUwJq4L+a5gOwzsNXH80OOIbyvOnM="; name = "IBM Plex Mono"; - url = "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip"; - version = "1.1.0"; + url = "https://github.com/IBM/plex/releases/download/%40ibm/plex-mono%402.5.0/ibm-plex-mono.zip"; + version = "2.5.0"; }; sans = { hash = "sha256-mK+8GGl2ugF2+fS6yd3p5NWPHHcKEJWiShDS3lihOlI="; diff --git a/pkgs/by-name/ib/ibm-plex/package.nix b/pkgs/by-name/ib/ibm-plex/package.nix index b87f6cabff55..8f3f7bbcf445 100644 --- a/pkgs/by-name/ib/ibm-plex/package.nix +++ b/pkgs/by-name/ib/ibm-plex/package.nix @@ -62,7 +62,7 @@ in assert lib.assertMsg (unknownFamilies == [ ]) "Unknown font(s): ${toString unknownFamilies}"; symlinkJoin { pname = "ibm-plex"; - version = "0-unstable-2026-02-12"; + version = "0-unstable-2026-05-26"; paths = lib.attrValues fontDerivations; passthru = fontDerivations // { updateScript = ./update.py; diff --git a/pkgs/by-name/ib/ibmcloud-cli/package.nix b/pkgs/by-name/ib/ibmcloud-cli/package.nix index 8042e9afd4a0..ae09b5cb8e96 100644 --- a/pkgs/by-name/ib/ibmcloud-cli/package.nix +++ b/pkgs/by-name/ib/ibmcloud-cli/package.nix @@ -21,13 +21,7 @@ let "s390x" else throw "Unsupported arch: ${stdenv.hostPlatform.system}"; - platform = - if stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 then - "macos_arm64" - else if stdenv.hostPlatform.isDarwin then - "macos" - else - "linux_${arch}"; + platform = if stdenv.hostPlatform.isDarwin then "macos_arm64" else "linux_${arch}"; in stdenv.mkDerivation (finalAttrs: { pname = "ibmcloud-cli"; @@ -37,7 +31,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://download.clis.cloud.ibm.com/ibm-cloud-cli/${finalAttrs.version}/binaries/IBM_Cloud_CLI_${finalAttrs.version}_${platform}.tgz"; hash = { - "x86_64-darwin" = "sha256-/sekaJxa8+inOBsHucyPE3yWM+Z+64jArGwCht8Corc="; "aarch64-darwin" = "sha256-JrTFbufKjX9uUwUcfxCDjqbZx6drgSmqn0F/xtce/mE="; "x86_64-linux" = "sha256-Zu6XFQeD9Dlny6cex7X6P428MiQftwn9RR4QL3H/0AU="; "aarch64-linux" = "sha256-pfHhAszhbbLKkJnwP94dCaDZNFTLr+2tnO3aHxOch+U="; diff --git a/pkgs/by-name/ib/ibmcloud-cli/update.sh b/pkgs/by-name/ib/ibmcloud-cli/update.sh index 26f1525a3202..2d340e8d12ee 100755 --- a/pkgs/by-name/ib/ibmcloud-cli/update.sh +++ b/pkgs/by-name/ib/ibmcloud-cli/update.sh @@ -19,7 +19,6 @@ for system in \ i686-linux \ powerpc64le-linux \ s390x-linux \ - x86_64-darwin \ aarch64-darwin; do tmp=$(mktemp -d) curl -fsSL -o $tmp/ibmcloud-cli $(nix-instantiate --eval -E "with import ./. {}; ibmcloud-cli.src.url" --system "$system" | tr -d '"') diff --git a/pkgs/by-name/ib/ibtool/package.nix b/pkgs/by-name/ib/ibtool/package.nix index 7729742bf4c5..9d87e11e4fe4 100644 --- a/pkgs/by-name/ib/ibtool/package.nix +++ b/pkgs/by-name/ib/ibtool/package.nix @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Apple's ibtool reimplementation"; homepage = "https://github.com/viraptor/ibtool"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; mainProgram = "ibtool"; maintainers = [ lib.maintainers.viraptor ]; }; diff --git a/pkgs/by-name/ib/ibus/package.nix b/pkgs/by-name/ib/ibus/package.nix index 8e8502ff557a..b164f6ead3a7 100644 --- a/pkgs/by-name/ib/ibus/package.nix +++ b/pkgs/by-name/ib/ibus/package.nix @@ -67,13 +67,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "ibus"; - version = "1.5.33"; + version = "1.5.34"; src = fetchFromGitHub { owner = "ibus"; repo = "ibus"; tag = finalAttrs.version; - hash = "sha256-cpNZI6KbL9zUJHw1szpWl4lOEAvlBdd+FA6xGh1sYYY="; + hash = "sha256-MCxzMnG+g2FC4pZtDOP2c7vSRG5Zk6EfrkGnEyFvBfQ="; }; patches = [ @@ -88,8 +88,6 @@ stdenv.mkDerivation (finalAttrs: { PYTHON = null; }) ./build-without-dbus-launch.patch - # https://github.com/NixOS/nixpkgs/issues/230290 - ./vala-parallelism.patch ]; outputs = [ diff --git a/pkgs/by-name/ib/ibus/vala-parallelism.patch b/pkgs/by-name/ib/ibus/vala-parallelism.patch deleted file mode 100644 index f4c47a76c39c..000000000000 --- a/pkgs/by-name/ib/ibus/vala-parallelism.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am -index 3ada6501..2066a8f5 100644 ---- a/ui/gtk3/Makefile.am -+++ b/ui/gtk3/Makefile.am -@@ -304,6 +304,8 @@ panelbinding.o: $(srcdir)/panelbinding.c - $(AM_V_CC_no)$(COMPILE) -c -o $@ $< - $(NULL) - -+.NOTPARALLEL: -+ - MAINTAINERCLEANFILES += extension.c panelbinding.c - - man_seven_DATA = ibus-emoji.7 diff --git a/pkgs/by-name/ic/ice-bar/package.nix b/pkgs/by-name/ic/ice-bar/package.nix index bd3e1ce55d2d..df9be0e0b777 100644 --- a/pkgs/by-name/ic/ice-bar/package.nix +++ b/pkgs/by-name/ic/ice-bar/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Powerful menu bar manager for macOS"; homepage = "https://icemenubar.app/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/ic/icesprog/package.nix b/pkgs/by-name/ic/icesprog/package.nix index a453534f7820..ed02168f6275 100644 --- a/pkgs/by-name/ic/icesprog/package.nix +++ b/pkgs/by-name/ic/icesprog/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "iCESugar FPGA flash utility"; mainProgram = "icesprog"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ RossComputerGuy ]; homepage = "https://github.com/wuxx/icesugar"; }; diff --git a/pkgs/by-name/ic/icestudio/package.nix b/pkgs/by-name/ic/icestudio/package.nix index 8c98baeed5ab..9e7995642d03 100644 --- a/pkgs/by-name/ic/icestudio/package.nix +++ b/pkgs/by-name/ic/icestudio/package.nix @@ -13,13 +13,13 @@ let # Use unstable because it has improvements for finding python - version = "0.12-unstable-2026-02-16"; + version = "0.12-unstable-2026-06-29"; src = fetchFromGitHub { owner = "FPGAwars"; repo = "icestudio"; - rev = "3398b694f7d8eeda47fae37067a66f011ce22880"; - hash = "sha256-OJQepq424ml86LHMfkexArwC7LWoXgJP1UEkqwSXtmY="; + rev = "8607f7ef538c4b447362b2ab90aece2fbb7d1b75"; + hash = "sha256-8KYwlOKKmTQza71cVpssOGJJNwIUvMHMYcokhK/LhEo="; }; collection = fetchurl { diff --git a/pkgs/by-name/ic/icinga2-agent/package.nix b/pkgs/by-name/ic/icinga2-agent/package.nix index 02e9371dae26..4e5551a90e18 100644 --- a/pkgs/by-name/ic/icinga2-agent/package.nix +++ b/pkgs/by-name/ic/icinga2-agent/package.nix @@ -5,4 +5,5 @@ icinga2.override { withNotification = false; withIcingadb = false; withPerfdata = false; + withOtel = false; } diff --git a/pkgs/by-name/ic/icinga2/package.nix b/pkgs/by-name/ic/icinga2/package.nix index 69aff4ef2cc5..0f75802365bd 100644 --- a/pkgs/by-name/ic/icinga2/package.nix +++ b/pkgs/by-name/ic/icinga2/package.nix @@ -7,13 +7,15 @@ flex, bison, systemd, - boost186, + boost, libedit, openssl, patchelf, mariadb-connector-c, libpq, + protobuf, zlib, + ctestCheckHook, tzdata, # Databases withMysql ? true, @@ -25,18 +27,19 @@ withNotification ? true, withPerfdata ? true, withIcingadb ? true, + withOtel ? true, nameSuffix ? "", }: stdenv.mkDerivation (finalAttrs: { pname = "icinga2${nameSuffix}"; - version = "2.15.1"; + version = "2.16.3"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${finalAttrs.version}"; - hash = "sha256-w/eD07yzBm3x4G74OuGwkmpBzj63UoklmcKxVi5lx8E="; + hash = "sha256-0gKNHtSc6uaabDHujlUKrcZfx6wz0vDp7Z4YMSem4iY="; }; patches = [ @@ -68,6 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (mkFeatureFlag "NOTIFICATION" withNotification) (mkFeatureFlag "PERFDATA" withPerfdata) (mkFeatureFlag "ICINGADB" withIcingadb) + (mkFeatureFlag "OPENTELEMETRY" withOtel) # Misc. "-DICINGA2_USER=icinga2" "-DICINGA2_GROUP=icinga2" @@ -81,11 +85,12 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - boost186 + boost libedit openssl systemd ] + ++ lib.optional withOtel protobuf ++ lib.optional withPostgresql libpq; nativeBuildInputs = [ @@ -96,7 +101,17 @@ stdenv.mkDerivation (finalAttrs: { ]; doCheck = true; - nativeCheckInputs = [ tzdata ]; # legacytimeperiod/dst needs this + + # https://github.com/Icinga/icinga2/issues/10722#issuecomment-4178294982 + ctestFlags = [ + "-LE" + "network" + ]; + + nativeCheckInputs = [ + ctestCheckHook # ctestFlags needs this + tzdata # legacytimeperiod/dst needs this + ]; postFixup = '' rm -r $out/etc/logrotate.d $out/etc/sysconfig $out/lib/icinga2/prepare-dirs @@ -126,7 +141,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open source monitoring system"; homepage = "https://www.icinga.com"; - license = lib.licenses.gpl2Plus; + license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ das_j diff --git a/pkgs/by-name/ic/icloudpd/package.nix b/pkgs/by-name/ic/icloudpd/package.nix index 35f5b3e5377e..ed2b454f607e 100644 --- a/pkgs/by-name/ic/icloudpd/package.nix +++ b/pkgs/by-name/ic/icloudpd/package.nix @@ -1,13 +1,13 @@ { lib, - python3Packages, + python313Packages, fetchFromGitHub, nix-update-script, testers, icloudpd, }: -python3Packages.buildPythonApplication (finalAttrs: { +python313Packages.buildPythonApplication (finalAttrs: { pname = "icloudpd"; version = "1.32.3"; pyproject = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonRelaxDeps = true; - dependencies = with python3Packages; [ + dependencies = with python313Packages; [ certifi click flask @@ -42,9 +42,9 @@ python3Packages.buildPythonApplication (finalAttrs: { wheel ]; - build-system = with python3Packages; [ setuptools ]; + build-system = with python313Packages; [ setuptools ]; - nativeCheckInputs = with python3Packages; [ + nativeCheckInputs = with python313Packages; [ freezegun mock pytest-timeout diff --git a/pkgs/by-name/ic/icm/package.nix b/pkgs/by-name/ic/icm/package.nix index 15a9f5957d4d..8518a92258e8 100644 --- a/pkgs/by-name/ic/icm/package.nix +++ b/pkgs/by-name/ic/icm/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "icm"; - version = "0.10.50"; + version = "0.10.53"; __structuredAttrs = true; src = fetchFromGitHub { owner = "rtk-ai"; repo = "icm"; tag = "icm-v${finalAttrs.version}"; - hash = "sha256-zaKpKMVH2vzUk0ryWupE4ByqqcmAdJwAe5ybb2TNlvM="; + hash = "sha256-fx7RPt32Vuy0j+Ab9VtqXoJ/+Ql5h4ORNPYwARlll0U="; }; - cargoHash = "sha256-5NcmFaRqDla2ei694fJiqNr5n4V3A/ai3/9fzBHNa3s="; + cargoHash = "sha256-5xlgEjQWPQEtLDzP403lFIEa2dvdsX6HujWMmCiFnD8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ic/icoextract/package.nix b/pkgs/by-name/ic/icoextract/package.nix index c83634db420d..0caa4544c881 100644 --- a/pkgs/by-name/ic/icoextract/package.nix +++ b/pkgs/by-name/ic/icoextract/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "icoextract"; - version = "0.2.0"; + version = "0.3.0"; pyproject = true; src = fetchFromGitHub { owner = "jlu5"; repo = "icoextract"; rev = finalAttrs.version; - hash = "sha256-GJCe7oFUidJt21F4NmOXspxZGRQXIjQvFjFhMYsHLjk="; + hash = "sha256-uesnYwv1ig7cnakWpH7MKeN6cfjasxVYLHs1JYG0Tss="; }; build-system = with python3Packages; [ setuptools ]; @@ -30,6 +30,9 @@ python3Packages.buildPythonApplication (finalAttrs: { postInstall = '' install -Dm644 exe-thumbnailer.thumbnailer -t $out/share/thumbnailers + + substituteInPlace $out/share/thumbnailers/exe-thumbnailer.thumbnailer \ + --replace-fail "Exec=exe-thumbnailer" "Exec=$out/bin/exe-thumbnailer" ''; meta = { diff --git a/pkgs/by-name/id/id3/fix-gcc15.patch b/pkgs/by-name/id/id3/fix-gcc15.patch deleted file mode 100644 index ddce9ac753fc..000000000000 --- a/pkgs/by-name/id/id3/fix-gcc15.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/fileops.c b/fileops.c -index 1e70af1..9017bd0 100644 ---- a/fileops.c -+++ b/fileops.c -@@ -68,7 +68,6 @@ FILE *ftemp(char *templ, const char *mode) - #else - int fd = mkstemp(templ); - if(fd >= 0) { -- FILE* fdopen(); /* in case -ansi is used */ - if(f = fdopen(fd, mode)) return f; - close(fd); - #endif diff --git a/pkgs/by-name/id/id3/package.nix b/pkgs/by-name/id/id3/package.nix index 99be080a9af1..0fb5c1829da5 100644 --- a/pkgs/by-name/id/id3/package.nix +++ b/pkgs/by-name/id/id3/package.nix @@ -7,20 +7,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "id3"; - version = "0.81"; + version = "0.82"; src = fetchFromGitHub { owner = "squell"; repo = "id3"; rev = finalAttrs.version; - hash = "sha256-+h1wwgTB7CpbjyUAK+9BNRhmy83D+1I+cZ70E1m3ENk="; + hash = "sha256-WwE+DotmA4Z5H4J5ShSWERk1K2QqvY01f8qnw0IRXR8="; }; - patches = [ - # https://github.com/squell/id3/pull/35 - ./fix-gcc15.patch - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv ]; makeFlags = [ "prefix=$(out)" ]; diff --git a/pkgs/by-name/id/identity/package.nix b/pkgs/by-name/id/identity/package.nix index 3e636485fb7c..b4b95c6ebedb 100644 --- a/pkgs/by-name/id/identity/package.nix +++ b/pkgs/by-name/id/identity/package.nix @@ -8,6 +8,7 @@ desktop-file-utils, fetchFromGitLab, glib, + glycin-loaders, gst_all_1, gtk4, lcms, @@ -68,6 +69,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ dav1d + glycin-loaders gst_all_1.gst-libav gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base diff --git a/pkgs/by-name/id/ideviceinstaller/package.nix b/pkgs/by-name/id/ideviceinstaller/package.nix index 37bb21b9a909..42939866de7c 100644 --- a/pkgs/by-name/id/ideviceinstaller/package.nix +++ b/pkgs/by-name/id/ideviceinstaller/package.nix @@ -4,6 +4,7 @@ fetchFromGitHub, autoreconfHook, pkg-config, + gitUpdater, usbmuxd, libimobiledevice, libzip, @@ -11,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ideviceinstaller"; - version = "1.1.1+date=2023-04-30"; + version = "1.2.0"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = "ideviceinstaller"; - rev = "71ec5eaa30d2780c2614b6b227a2229ea3aeb1e9"; - hash = "sha256-YsQwAlt71vouYJzXl0P7b3fG/MfcwI947GtvN4g3/gM="; + tag = finalAttrs.version; + hash = "sha256-V4zJ85wF3jjBlWOY+oxo6veNeiSHVAUBipmokzhRgaI="; }; nativeBuildInputs = [ @@ -40,6 +41,8 @@ stdenv.mkDerivation (finalAttrs: { export RELEASE_VERSION=${finalAttrs.version} ''; + passthru.updateScript = gitUpdater { }; + meta = { homepage = "https://github.com/libimobiledevice/ideviceinstaller"; description = "List/modify installed apps of iOS devices"; diff --git a/pkgs/by-name/id/idevicerestore/package.nix b/pkgs/by-name/id/idevicerestore/package.nix index 5b1bad477867..5174a524df2d 100644 --- a/pkgs/by-name/id/idevicerestore/package.nix +++ b/pkgs/by-name/id/idevicerestore/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "idevicerestore"; - version = "1.0.0-unstable-2025-10-02"; + version = "1.0.0-unstable-2026-07-26"; src = fetchFromGitHub { owner = "libimobiledevice"; repo = "idevicerestore"; - rev = "f4d0f7e83105cc362527566315abee07b0840848"; - hash = "sha256-fqTVAHTxamk2lIllr7ZNHOJ1YTJHM4JpVQylMV33CJI="; + rev = "45145e9fdc8458022c61a4b87bd029b866d5bcdc"; + hash = "sha256-0W0DEnO8eZx2G3JKjp7SilLH8vmpfkiJxrwkudyf5rM="; }; nativeBuildInputs = [ @@ -61,7 +61,10 @@ stdenv.mkDerivation (finalAttrs: { ''; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ nh2 ]; + maintainers = with lib.maintainers; [ + flokli + nh2 + ]; mainProgram = "idevicerestore"; }; }) diff --git a/pkgs/by-name/ie/ieda/package.nix b/pkgs/by-name/ie/ieda/package.nix index e39620b0e801..81d65eaf289f 100644 --- a/pkgs/by-name/ie/ieda/package.nix +++ b/pkgs/by-name/ie/ieda/package.nix @@ -81,12 +81,10 @@ stdenv.mkDerivation { (lib.cmakeBool "CMD_BUILD" true) (lib.cmakeBool "SANITIZER" false) (lib.cmakeBool "BUILD_STATIC_LIB" false) + (lib.cmakeOptionType "filepath" "CMAKE_RUNTIME_OUTPUT_DIRECTORY" "${placeholder "out"}/bin") + (lib.cmakeOptionType "filepath" "CMAKE_LIBRARY_OUTPUT_DIRECTORY" "${placeholder "out"}/lib") ]; - preConfigure = '' - cmakeFlags+=" -DCMAKE_RUNTIME_OUTPUT_DIRECTORY:FILEPATH=$out/bin -DCMAKE_LIBRARY_OUTPUT_DIRECTORY:FILEPATH=$out/lib" - ''; - buildInputs = [ rustpkgs.iir-rust rustpkgs.sdf_parse @@ -130,7 +128,8 @@ stdenv.mkDerivation { doInstallCheck = !stdenv.hostPlatform.isAarch64; # Tests will fail on aarch64-linux, wait for upstream fix: https://github.com/microsoft/onnxruntime/issues/10038 - enableParallelBuild = true; + enableParallelBuilding = true; + __structuredAttrs = true; passthru.updateScript = ./update.sh; diff --git a/pkgs/by-name/if/ifstate/package.nix b/pkgs/by-name/if/ifstate/package.nix index 1a215e80e3fb..3af27b81f119 100644 --- a/pkgs/by-name/if/ifstate/package.nix +++ b/pkgs/by-name/if/ifstate/package.nix @@ -4,6 +4,7 @@ yq, python3Packages, fetchFromCodeberg, + ethtool, iproute2, libbpf, nixosTests, @@ -62,6 +63,9 @@ let postPatch = '' substituteInPlace libifstate/routing/__init__.py \ --replace-fail '/usr/share/iproute2' '${iproute2}/share/iproute2' + + substituteInPlace libifstate/link/base.py \ + --replace-fail "/usr/sbin/ethtool" "${lib.getExe ethtool}" '' + lib.optionalString withBpf '' substituteInPlace libifstate/bpf/ctypes.py \ diff --git a/pkgs/by-name/if/ifwifi/package.nix b/pkgs/by-name/if/ifwifi/package.nix index dd5cba23547a..f1413bb283e7 100644 --- a/pkgs/by-name/if/ifwifi/package.nix +++ b/pkgs/by-name/if/ifwifi/package.nix @@ -50,7 +50,7 @@ rustPlatform.buildRustPackage (finalAttrs: { project that gave me almost everything I wanted to create this tool. ''; homepage = "https://github.com/araujobsd/ifwifi"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; # networkmanager doesn't work on darwin # even though the `wifiscanner` crate would work diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index e50d1c4c2630..d0eab6a75ed9 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -18,16 +18,16 @@ buildNpmPackage rec { pname = "igir"; - version = "5.1.0"; + version = "5.3.0"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-OgWf4xhgYsk9vQSbwrLdjbDElXrhI7r+4CaxZ7yRs7E="; + hash = "sha256-qs6CVmBLn23BOjr+d4WZeROFxqKy9vWx8iUVKBicKdk="; }; - npmDepsHash = "sha256-r/1ImMfTFuRHvcH3713sDFNq7LJvgjt8a1rE8JtuaUk="; + npmDepsHash = "sha256-ruFssMRX7fzEI7lwEb/a+0lYso9I3CufLK9uVZiuhoU="; # I have no clue why I have to do this postPatch = '' diff --git a/pkgs/by-name/ig/ignition/package.nix b/pkgs/by-name/ig/ignition/package.nix index edabfe8ebe4e..9013edbcd68d 100644 --- a/pkgs/by-name/ig/ignition/package.nix +++ b/pkgs/by-name/ig/ignition/package.nix @@ -20,14 +20,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "ignition"; - version = "2.3.1"; + version = "2.4.1"; src = fetchFromGitHub { owner = "flattool"; repo = "ignition"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-bkH8nxvqzxzYse7HNRWi79FfuMmLxd/CppKJQk2rTbo="; + hash = "sha256-egbpFpwYXhezeQbKSj75InFV3blj1GVzRgcku3ZF6Ag="; }; patches = [ diff --git a/pkgs/by-name/ig/igprof/package.nix b/pkgs/by-name/ig/igprof/package.nix index a0fc1c0a5e58..127d77148346 100644 --- a/pkgs/by-name/ig/igprof/package.nix +++ b/pkgs/by-name/ig/igprof/package.nix @@ -4,32 +4,25 @@ fetchFromGitHub, libunwind, cmake, - pcre, + pcre2, gdb, }: stdenv.mkDerivation (finalAttrs: { - version = "5.9.18"; + version = "6.0.0"; pname = "igprof"; src = fetchFromGitHub { owner = "igprof"; repo = "igprof"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-UTrAaH8C79km78Z/7NxvQ6dnl4u4Ki80nORf4bsoSNw="; + hash = "sha256-RIDnilCoYlq0D9CBJKMX1zg1DBQ4RPcOlfGcZ2xosUo="; }; - postPatch = '' - substituteInPlace src/igprof \ - --replace-fail libigprof.so $out/lib/libigprof.so - substituteInPlace CMakeLists.txt \ - --replace-fail "CMAKE_MINIMUM_REQUIRED(VERSION 2.6)" "CMAKE_MINIMUM_REQUIRED(VERSION 3.10)" - ''; - buildInputs = [ libunwind gdb - pcre + pcre2 ]; nativeBuildInputs = [ cmake ]; @@ -41,7 +34,6 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); description = "Ignominous Profiler"; longDescription = '' diff --git a/pkgs/by-name/ig/igsc/package.nix b/pkgs/by-name/ig/igsc/package.nix index ee77e5944f1f..10bf6e7df33d 100644 --- a/pkgs/by-name/ig/igsc/package.nix +++ b/pkgs/by-name/ig/igsc/package.nix @@ -9,12 +9,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "igsc"; - version = "1.3.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "intel"; repo = "igsc"; tag = "V${finalAttrs.version}"; - hash = "sha256-GdeGGrnkxJQlg+vVQan5rJW/rxlStD4TAmWxfloX0+k="; + hash = "sha256-NSNLiUMJBGtnfWUDIPIukyjgcI1YX9cfDDWphW8uSWs="; }; buildInputs = [ diff --git a/pkgs/by-name/ig/igv/package.nix b/pkgs/by-name/ig/igv/package.nix index b9015f6a1601..073f969113b6 100644 --- a/pkgs/by-name/ig/igv/package.nix +++ b/pkgs/by-name/ig/igv/package.nix @@ -10,10 +10,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "igv"; - version = "2.19.7"; + version = "2.19.8"; src = fetchzip { url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor finalAttrs.version}/IGV_${finalAttrs.version}.zip"; - sha256 = "sha256-IkzaQAM+s1boEKo/3ShtbUhihrhxLQCTz8/0lzAyYJA="; + sha256 = "sha256-WVf/y0+Hk3OIz+hlCTJ81Ui/s6vthFLJWLuBJAOGzaQ="; }; installPhase = '' diff --git a/pkgs/by-name/ii/iina/package.nix b/pkgs/by-name/ii/iina/package.nix index 51a280835fbc..b7a6ff958d1e 100644 --- a/pkgs/by-name/ii/iina/package.nix +++ b/pkgs/by-name/ii/iina/package.nix @@ -8,11 +8,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "iina"; - version = "1.4.2"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/iina/iina/releases/download/v${finalAttrs.version}/IINA.v${finalAttrs.version}.dmg"; - hash = "sha256-Lg/Yn7uhySpsEVFx5bUZBIg7tJf75ROmlh0ID7qwj/Y="; + hash = "sha256-3Q/AvUs3+1ehyNMNbjIBs6ZLr9KZWf5WlTlkYTI3vrE="; }; nativeBuildInputs = [ undmg ]; @@ -34,7 +34,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ arkivm - FlameFlag + _4evy + kinnrai stepbrobd ]; mainProgram = "iina"; diff --git a/pkgs/by-name/ii/iio-niri/package.nix b/pkgs/by-name/ii/iio-niri/package.nix index d3d81b23e81a..e06602a378fa 100644 --- a/pkgs/by-name/ii/iio-niri/package.nix +++ b/pkgs/by-name/ii/iio-niri/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "iio-niri"; - version = "2.1.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Zhaith-Izaliel"; repo = "iio-niri"; tag = "v${finalAttrs.version}"; - hash = "sha256-EwilbkL1cMH8l63Cm5eikVKc+YndsYsaYJxhCNJgz6M="; + hash = "sha256-6kIHZuHZYDsjY0q8V99jdDkNHwNtvrq77sxGI5SLzSs="; }; - cargoHash = "sha256-f/pFWlLxQebzawDdHj3UtpT5Kq9a6fm+tAssqg8ibdo="; + cargoHash = "sha256-gXqAUvZ0FjU7SrCmw0CpNtELPwmI0fFpJpe3wrBuqsY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ii/iir1/package.nix b/pkgs/by-name/ii/iir1/package.nix index 2eb083070b3a..fb523df04a70 100644 --- a/pkgs/by-name/ii/iir1/package.nix +++ b/pkgs/by-name/ii/iir1/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { description = "DSP IIR realtime filter library written in C++"; downloadPage = "https://github.com/berndporr/iir1"; changelog = "https://github.com/berndporr/iir1/releases/tag/${finalAttrs.src.rev}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ik/ikill/package.nix b/pkgs/by-name/ik/ikill/package.nix index fd6f1735030c..1e19b3f531b9 100644 --- a/pkgs/by-name/ik/ikill/package.nix +++ b/pkgs/by-name/ik/ikill/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.6.0"; src = fetchFromGitHub { - owner = "pjmp"; + owner = "pombadev"; repo = "ikill"; rev = "v${finalAttrs.version}"; sha256 = "sha256-hOQBBwxkVnTkAZJi84qArwAo54fMC0zS+IeYMV04kUs="; @@ -19,9 +19,9 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Interactively kill running processes"; - homepage = "https://github.com/pjmp/ikill"; + homepage = "https://github.com/pombadev/ikill"; maintainers = with lib.maintainers; [ zendo ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; mainProgram = "ikill"; }; diff --git a/pkgs/by-name/il/illum/package.nix b/pkgs/by-name/il/illum/package.nix index dd4af58281b4..99a65bd5fdc2 100644 --- a/pkgs/by-name/il/illum/package.nix +++ b/pkgs/by-name/il/illum/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.5"; src = fetchFromGitHub { - owner = "jmesmon"; + owner = "codyps"; repo = "illum"; tag = "v${finalAttrs.version}"; sha256 = "S4lUBeRnZlRUpIxFdN/bh979xvdS7roF6/6Dk0ZUrnM="; @@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: { patches = [ (fetchpatch { - name = "prevent-unplug-segfault"; # See https://github.com/jmesmon/illum/issues/19 - url = "https://github.com/jmesmon/illum/commit/47b7cd60ee892379e5d854f79db343a54ae5a3cc.patch"; + name = "prevent-unplug-segfault"; # See https://github.com/codyps/illum/issues/19 + url = "https://github.com/codyps/illum/commit/47b7cd60ee892379e5d854f79db343a54ae5a3cc.patch"; sha256 = "sha256-hIBBCIJXAt8wnZuyKye1RiEfOCelP3+4kcGrM43vFOE="; }) ]; @@ -52,7 +52,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/jmesmon/illum"; + homepage = "https://github.com/codyps/illum"; description = "Daemon that wires button presses to screen backlight level"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.dancek ]; diff --git a/pkgs/by-name/il/iloader/disable-update.patch b/pkgs/by-name/il/iloader/disable-update.patch new file mode 100644 index 000000000000..3eec01d44282 --- /dev/null +++ b/pkgs/by-name/il/iloader/disable-update.patch @@ -0,0 +1,20 @@ +--- a/src/App.tsx ++++ b/src/App.tsx +@@ -22,7 +22,7 @@ import { AppIds } from "./pages/AppIds"; + import { Settings } from "./pages/Settings"; + import { Pairing } from "./pages/Pairing"; + import { getVersion } from "@tauri-apps/api/app"; +-import { checkForUpdates } from "./update"; ++// import { checkForUpdates } from "./update"; + import logo from "./iloader.svg"; + import { GlassCard } from "./components/GlassCard"; + import { useTranslation } from "react-i18next"; +@@ -70,7 +70,7 @@ function App() { + }, []); + + useEffect(() => { +- checkForUpdates(); ++ // checkForUpdates(); + }, []); + + useEffect(() => { \ No newline at end of file diff --git a/pkgs/by-name/il/iloader/package.nix b/pkgs/by-name/il/iloader/package.nix new file mode 100644 index 000000000000..2caf94bfb38e --- /dev/null +++ b/pkgs/by-name/il/iloader/package.nix @@ -0,0 +1,128 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + rustPlatform, + nodejs, + cargo-tauri, + bun, + writableTmpDirAsHomeHook, + + glib, + glib-networking, + gst_all_1, + openssl, + pkg-config, + webkitgtk_4_1, + wrapGAppsHook3, + makeWrapper, +}: +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "iloader"; + version = "2.2.6"; + + src = fetchFromGitHub { + owner = "nab138"; + repo = "iloader"; + rev = "v${finalAttrs.version}"; + sha256 = "sha256-zSl08bhJ/OrdcvvL1ciybxgnLqrg4IinmcGXrsPQYyQ="; + }; + + nodeModules = stdenv.mkDerivation { + pname = "${finalAttrs.pname}-node_modules"; + inherit (finalAttrs) src version; + + nativeBuildInputs = [ + bun + writableTmpDirAsHomeHook + ]; + + dontConfigure = true; + + buildPhase = '' + runHook preBuild + + bun install \ + --cpu="*" \ + --frozen-lockfile \ + --ignore-scripts \ + --no-progress \ + --os="*" + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out + cp -r node_modules $out/node_modules + + runHook postInstall + ''; + + outputHash = "sha256-zB0BJrQuoIu7Y67WMfrVRsPPnJ6mhd5srL2M3zW6+1Q="; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + }; + + cargoRoot = "src-tauri"; + buildAndTestSubdir = "src-tauri"; + cargoHash = "sha256-6nDqIikItl5SuHN2o/iQREiOkY+bYkP7akShOEtY9JY="; + + doCheck = false; + + patches = [ ./disable-update.patch ]; + + postPatch = '' + cp -r ${finalAttrs.nodeModules}/node_modules . + chmod -R +w node_modules + patchShebangs --build node_modules + ''; + + nativeBuildInputs = [ + bun + cargo-tauri.hook + nodejs + pkg-config + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ wrapGAppsHook3 ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper ]; + + buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + webkitgtk_4_1 + glib + glib-networking + openssl + ]; + + tauriBuildFlags = [ + "--config" + "ci.conf.json" + "--no-sign" + ]; + + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p $out/bin + makeWrapper $out/Applications/iloader.app/Contents/MacOS/iloader $out/bin/iloader + ''; + + meta = { + changelog = "https://github.com/nab138/iloader/releases/tag/v${finalAttrs.version}"; + description = "User friendly sideloader"; + homepage = "https://github.com/nab138/iloader"; + license = lib.licenses.mit; + mainProgram = "iloader"; + maintainers = with lib.maintainers; [ ern775 ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + "aarch64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/im/image-analyzer/package.nix b/pkgs/by-name/im/image-analyzer/package.nix index 364286765d26..f35aae5c0e82 100644 --- a/pkgs/by-name/im/image-analyzer/package.nix +++ b/pkgs/by-name/im/image-analyzer/package.nix @@ -16,11 +16,11 @@ }: python3Packages.buildPythonApplication (finalAttrs: { pname = "image-analyzer"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { url = "mirror://sourceforge/cdemu/image-analyzer-${finalAttrs.version}.tar.xz"; - hash = "sha256-N2aufwYEBVx7z2Vo7Qi4DP2MsDXXr5LrQdeNYOtNGnU="; + hash = "sha256-vsfDmtjrvAC49ynnJ7QguBfSVnt/sBpCy/Eau2l1/jQ="; }; buildInputs = [ diff --git a/pkgs/by-name/im/imagemagick/package.nix b/pkgs/by-name/im/imagemagick/package.nix index 40d518373564..918d97c640fa 100644 --- a/pkgs/by-name/im/imagemagick/package.nix +++ b/pkgs/by-name/im/imagemagick/package.nix @@ -89,13 +89,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "imagemagick"; - version = "7.1.2-23"; + version = "7.1.2-27"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; tag = finalAttrs.version; - hash = "sha256-zYk75q+EyWq5g/AHFU6v8a7gye0aDAEe/ZZvjqR9ZTc="; + hash = "sha256-QCC2CO2zkhwlEWymwF739uSNuS7QCqqGIJnF/LtYzVc="; }; outputs = [ @@ -209,7 +209,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://www.imagemagick.org/"; - changelog = "https://github.com/ImageMagick/Website/blob/main/ChangeLog.md"; + changelog = "https://github.com/ImageMagick/Website/blob/main/docs/changelog/index.md"; description = "Software suite to create, edit, compose, or convert bitmap images"; pkgConfigModules = [ "ImageMagick" diff --git a/pkgs/by-name/im/imagineer/package.nix b/pkgs/by-name/im/imagineer/package.nix index 24e108b02ff0..3114786491e2 100644 --- a/pkgs/by-name/im/imagineer/package.nix +++ b/pkgs/by-name/im/imagineer/package.nix @@ -51,7 +51,5 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; maintainers = [ lib.maintainers.progrm_jarvis ]; mainProgram = "ig"; - # The last successful Darwin Hydra build was in 2024 - broken = stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64; }; }) diff --git a/pkgs/by-name/im/imapdedup/package.nix b/pkgs/by-name/im/imapdedup/package.nix index b275569cb47d..8b620e6b1656 100644 --- a/pkgs/by-name/im/imapdedup/package.nix +++ b/pkgs/by-name/im/imapdedup/package.nix @@ -25,7 +25,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "Duplicate email message remover"; homepage = "https://github.com/quentinsf/IMAPdedup"; maintainers = with lib.maintainers; [ sigmanificient ]; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; mainProgram = "imapdedup"; }; }) diff --git a/pkgs/by-name/im/imhex/package.nix b/pkgs/by-name/im/imhex/package.nix index bc563ca95895..b3ce78ad5a99 100644 --- a/pkgs/by-name/im/imhex/package.nix +++ b/pkgs/by-name/im/imhex/package.nix @@ -98,6 +98,9 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "USE_SYSTEM_NLOHMANN_JSON" true) (lib.cmakeBool "USE_SYSTEM_YARA" true) (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + (lib.cmakeFeature "CMAKE_INSTALL_NAME_DIR" "@executable_path/../Frameworks") ]; env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; @@ -122,10 +125,6 @@ stdenv.mkDerivation (finalAttrs: { '' mkdir -p $out/Applications mv $out/imhex.app $out/Applications - install_name_tool \ - -change "$out/lib/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ - "@executable_path/../Frameworks/libimhex.${finalAttrs.version}${stdenv.hostPlatform.extensions.sharedLibrary}" \ - "$out/Applications/imhex.app/Contents/MacOS/imhex" makeWrapper "$out/Applications/imhex.app/Contents/MacOS/imhex" "$out/bin/imhex" '' else @@ -136,7 +135,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; homepage = "https://github.com/WerWolv/ImHex"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ kashw2 cafkafk diff --git a/pkgs/by-name/im/immersed/linux.nix b/pkgs/by-name/im/immersed/linux.nix index 36b46c4c8916..aab42a39b2b6 100644 --- a/pkgs/by-name/im/immersed/linux.nix +++ b/pkgs/by-name/im/immersed/linux.nix @@ -25,6 +25,13 @@ appimageTools.wrapAppImage { extraPkgs = pkgs: with pkgs; [ + libva + # VAAPI backends + intel-media-driver + intel-vaapi-driver + nvidia-vaapi-driver + mesa + # Other dependencies libgpg-error fontconfig libGL diff --git a/pkgs/by-name/im/immersed/package.nix b/pkgs/by-name/im/immersed/package.nix index 38ed8ab5fd60..dd97389eea7d 100644 --- a/pkgs/by-name/im/immersed/package.nix +++ b/pkgs/by-name/im/immersed/package.nix @@ -9,7 +9,7 @@ let pname = "immersed"; version = "11.0.0"; - sources = lib.mapAttrs (_: fetchurl) rec { + sources = lib.mapAttrs (_: fetchurl) { x86_64-linux = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-x86_64.AppImage"; hash = "sha256-GbckZ/WK+7/PFQvTfUwwePtufPKVwIwSPh+Bo/cG7ko="; @@ -18,11 +18,10 @@ let url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed-aarch64.AppImage"; hash = "sha256-3BokV30y6QRjE94K7JQ6iIuQw1t+h3BKZY+nEFGTVHI="; }; - x86_64-darwin = { + aarch64-darwin = { url = "https://web.archive.org/web/20260306043741/https://static.immersed.com/dl/Immersed.dmg"; hash = "sha256-L5nrkchXD1NIQCknYHVhBWbVJVkkHvKaDjuk9qiY340="; }; - aarch64-darwin = x86_64-darwin; }; src = sources.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); diff --git a/pkgs/by-name/im/immich-cli/package.nix b/pkgs/by-name/im/immich-cli/package.nix index 3c16240a6ba3..a719db4480ea 100644 --- a/pkgs/by-name/im/immich-cli/package.nix +++ b/pkgs/by-name/im/immich-cli/package.nix @@ -12,12 +12,6 @@ stdenv.mkDerivation (finalAttrs: { pname = "immich-cli"; inherit (immich) version src pnpmDeps; - postPatch = '' - local -r cli_version="$(jq -r .version cli/package.json)" - test "$cli_version" = ${finalAttrs.version} \ - || (echo "error: update immich-cli version to $cli_version" && exit 1) - ''; - nativeBuildInputs = [ jq makeWrapper @@ -29,8 +23,7 @@ stdenv.mkDerivation (finalAttrs: { buildPhase = '' runHook preBuild - pnpm --filter @immich/sdk build - pnpm --filter @immich/cli build + pnpm --filter @immich/cli... build runHook postBuild ''; diff --git a/pkgs/by-name/im/immich-go/package.nix b/pkgs/by-name/im/immich-go/package.nix index bb2900f0ab30..9dc8babd6be0 100644 --- a/pkgs/by-name/im/immich-go/package.nix +++ b/pkgs/by-name/im/immich-go/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "immich-go"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { owner = "simulot"; repo = "immich-go"; tag = "v${finalAttrs.version}"; - hash = "sha256-u+laNZ0/UncwH+3Ylk7g40DB99dAbQRrBNOVk80FrMc="; + hash = "sha256-bMbLMlLZpzFP7Zh9kqWzEELt3MdOR8HMkH0gTU8qD9U="; # Inspired by: https://github.com/NixOS/nixpkgs/blob/f2d7a289c5a5ece8521dd082b81ac7e4a57c2c5c/pkgs/applications/graphics/pdfcpu/default.nix#L20-L32 # The intention here is to write the information into files in the `src`'s @@ -32,7 +32,7 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-C6IQ6g5vdGqv8mzdTzLicZqP5lh3l2uNH2gIZELNAHg="; + vendorHash = "sha256-BwrP+eG+XPcTAbSKhJk0BOrfBlNeLHEeRhq49ZkQhwY="; # options used by upstream: # https://github.com/simulot/immich-go/blob/v0.25.0/.goreleaser.yaml diff --git a/pkgs/by-name/im/immich-kiosk/package.nix b/pkgs/by-name/im/immich-kiosk/package.nix index 4ef4132a37af..0ca88bb23802 100644 --- a/pkgs/by-name/im/immich-kiosk/package.nix +++ b/pkgs/by-name/im/immich-kiosk/package.nix @@ -3,68 +3,61 @@ buildGoModule, fetchFromGitHub, nodejs, - pnpm_9, - fetchPnpmDeps, - pnpmConfigHook, + fetchNpmDeps, + npmHooks, + go-task, }: + buildGoModule rec { pname = "immich-kiosk"; - version = "0.31.0"; + version = "0.41.0"; src = fetchFromGitHub { owner = "damongolding"; repo = "immich-kiosk"; tag = "v${version}"; - hash = "sha256-PHdHhhVy0RWMFzR4ZEyWLOiRYHROadLiPIdqkUZMTow="; + hash = "sha256-mr0cxHdekpzfKfJ2IKpm79vTu5qnSl8q2c8eWose7tg="; }; - # Delete vendor directory to regenerate it consistently across platforms postPatch = '' + # Delete vendor directory to regenerate it consistently across platforms rm -rf vendor + # immich-kiosk bumps go at a faster cadence than nixpkgs + sed -i -E 's/^go 1\.26\.[0-9]+$/go 1.26/' go.mod ''; - vendorHash = "sha256-3M3fXwCkljfY8wjXf+PdcbqnkyPKaDCJWt9/nRA/+Dc="; + vendorHash = "sha256-5mMU73/XvHfvT8VaseSymZjDalvHj/KR6cTz1nvXHPQ="; proxyVendor = true; - pnpmDeps = fetchPnpmDeps { - inherit - pname - version - src - ; - pnpm = pnpm_9; + npmDeps = fetchNpmDeps { + inherit src; sourceRoot = "${src.name}/frontend"; - hash = "sha256-8iKug4zsX3u0vS68osKRW6iOP+A3OdjI3yxNPIJaQqM="; - fetcherVersion = 3; + hash = "sha256-1m0JvPZDYjd2cNy9atENRS3/GHWzLnPISwGnJbSZwAo="; }; - # Frontend is in a subdirectory - pnpmRoot = "frontend"; + npmRoot = "frontend"; nativeBuildInputs = [ nodejs - pnpmConfigHook - pnpm_9 + go-task + npmHooks.npmConfigHook ]; # Generate templ templates during vendor hash calculation - # Don't run pnpm in this phase - filter out pnpmConfigHook + # Don't run npm in this phase - filter out npmConfigHook overrideModAttrs = oldAttrs: { - nativeBuildInputs = builtins.filter (drv: drv != pnpmConfigHook) ( + nativeBuildInputs = builtins.filter (drv: drv != npmHooks.npmConfigHook) ( oldAttrs.nativeBuildInputs or [ ] ); preBuild = '' - go run github.com/a-h/templ/cmd/templ generate + go tool templ generate ''; }; # Generate templ templates and build frontend assets before Go build # Frontend assets are embedded into the binary via go:embed preBuild = '' - go run github.com/a-h/templ/cmd/templ generate - - pushd frontend - pnpm build - popd + go tool templ generate + task frontend ''; ldflags = [ diff --git a/pkgs/by-name/im/immich-public-proxy/package.nix b/pkgs/by-name/im/immich-public-proxy/package.nix index 921f4e44415e..e42c5698a21c 100644 --- a/pkgs/by-name/im/immich-public-proxy/package.nix +++ b/pkgs/by-name/im/immich-public-proxy/package.nix @@ -8,17 +8,17 @@ }: buildNpmPackage rec { pname = "immich-public-proxy"; - version = "2.4.0"; + version = "3.0.2"; src = fetchFromGitHub { owner = "alangrainger"; repo = "immich-public-proxy"; tag = "v${version}"; - hash = "sha256-hGL8mTeOUd0OIfuH4QCH/jyPI7AqhF6yj/SRz6eqAEo="; + hash = "sha256-Clx2+O0paKGaayEEoI1i0FV2JT03KpMigU0t5xKjrr0="; }; sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-WHD4d3iXHsotw7EhFWUz5/493E08Iubx/pRHWgTa2ac="; + npmDepsHash = "sha256-UR9sdCl2XafG+KtJcGsqH/KN90cEyzl9V9RK/pUOQ2w="; # patch in absolute nix store paths so the process doesn't need to cwd in $out postPatch = '' diff --git a/pkgs/by-name/im/immich/package.nix b/pkgs/by-name/im/immich/package.nix index e94ad087378e..674172bd4291 100644 --- a/pkgs/by-name/im/immich/package.nix +++ b/pkgs/by-name/im/immich/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm_10, + pnpm_11, python3, nodejs, node-gyp, @@ -37,7 +37,7 @@ buildPackages, }: let - pnpm = pnpm_10; + pnpm = pnpm_11; esbuild' = buildPackages.esbuild.override { buildGoModule = @@ -45,12 +45,12 @@ let buildPackages.buildGoModule ( args // rec { - version = "0.25.5"; + version = "0.28.1"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; tag = "v${version}"; - hash = "sha256-jemGZkWmN1x2+ZzJ5cLp3MoXO0oDKjtZTmZS9Be/TDw="; + hash = "sha256-V+HKaWGAIs24ynFFIS9fQ0EAJJdNmlAMeL1sgDEAqWM="; }; vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ="; } @@ -77,14 +77,14 @@ let # The geodata website is not versioned, so we use the internet archive geodata = let - timestamp = "20260408011516"; + timestamp = "20260710111330"; date = "${lib.substring 0 4 timestamp}-${lib.substring 4 2 timestamp}-${lib.substring 6 2 timestamp}T" + "${lib.substring 8 2 timestamp}:${lib.substring 10 2 timestamp}:${lib.substring 12 2 timestamp}Z"; in runCommand "immich-geodata" { - outputHash = "sha256-WSKaTn54+8ckXPsk3jsOJ4yCsO0jLKf3y+apqwNlHc4="; + outputHash = "sha256-Pf5u+bqzF2x1PECxKwZ6dfGiEj1YMlRejTcTI1amMvU="; outputHashMode = "recursive"; nativeBuildInputs = [ cacert @@ -115,20 +115,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "immich"; - version = "2.7.5"; + version = "3.0.3"; src = fetchFromGitHub { owner = "immich-app"; repo = "immich"; tag = "v${finalAttrs.version}"; - hash = "sha256-EC1IXM7KObAWfwG5KEao5VDp79d8WGNEI7E89lLOJ44="; + hash = "sha256-20MxwDCU9+SyZDx7PkLSfbW+mTGxGqITQRl7EgzkmkA="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; - fetcherVersion = 3; - hash = "sha256-FEesjbhxP7ydFfNshF3iFIk9N3Z53jrEZ9DRBjgEfs0="; + fetcherVersion = 4; + hash = "sha256-kCMFAPWcv2/qqVUoR5pbRxmkGg3mLPrpm8ce7R+9VYM="; }; postPatch = '' @@ -137,6 +137,8 @@ stdenv.mkDerivation (finalAttrs: { ''; nativeBuildInputs = [ + binaryen + extism-js nodejs pkg-config pnpmConfigHook @@ -174,7 +176,7 @@ stdenv.mkDerivation (finalAttrs: { # If exiftool-vendored.pl isn't found, exiftool is searched for on the PATH rm node_modules/.pnpm/node_modules/exiftool-vendored.pl - pnpm --filter immich build + pnpm --filter immich... --filter immich-web... --filter @immich/plugin-core... build runHook postBuild ''; @@ -196,9 +198,9 @@ stdenv.mkDerivation (finalAttrs: { -o -name '*.target.mk' \ \) -exec rm -r {} + - mkdir -p "$packageOut/build" - ln -s '${finalAttrs.passthru.plugins}' "$packageOut/build/corePlugin" - ln -s '${finalAttrs.passthru.web}' "$packageOut/build/www" + mkdir -p "$packageOut/build/plugins/immich-plugin-core" + cp -r packages/plugin-core/{dist,manifest.json} "$packageOut/build/plugins/immich-plugin-core/" + cp -r web/build "$packageOut/build/www" ln -s '${geodata}' "$packageOut/build/geodata" echo '${builtins.toJSON buildLock}' > "$packageOut/build/build-lock.json" @@ -231,66 +233,6 @@ stdenv.mkDerivation (finalAttrs: { immich = finalAttrs.finalPackage; }; - plugins = stdenv.mkDerivation { - pname = "immich-plugins"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - binaryen - extism-js - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter plugins build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd plugins - mkdir $out - cp -r dist manifest.json $out - - runHook postInstall - ''; - }; - - web = stdenv.mkDerivation { - pname = "immich-web"; - inherit (finalAttrs) version src pnpmDeps; - - nativeBuildInputs = [ - nodejs - pnpmConfigHook - pnpm - ]; - - buildPhase = '' - runHook preBuild - - pnpm --filter @immich/sdk build - pnpm --filter immich-web build - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cd web - cp -r build $out - - runHook postInstall - ''; - }; - inherit geodata pnpm diff --git a/pkgs/by-name/im/immichframe/deps.json b/pkgs/by-name/im/immichframe/deps.json index abf5e32343d8..e8f2efbd7986 100644 --- a/pkgs/by-name/im/immichframe/deps.json +++ b/pkgs/by-name/im/immichframe/deps.json @@ -1,54 +1,19 @@ [ - { - "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", @@ -94,36 +59,6 @@ "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", @@ -149,11 +84,6 @@ "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", @@ -164,31 +94,6 @@ "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", @@ -214,31 +119,6 @@ "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", @@ -279,71 +159,11 @@ "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", @@ -356,28 +176,13 @@ }, { "pname": "NSwag.ApiDescription.Client", - "version": "13.20.0", - "hash": "sha256-r/BtE46yFdM9MuoaVYNhO7vvdBICDsM8ROXZldxFIeY=" + "version": "14.6.3", + "hash": "sha256-razR+CaeTvCob8IaRkg9MKgfcChqAqjBa8At05V9lxQ=" }, { "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=" + "version": "14.6.3", + "hash": "sha256-6hzKfptXAXCCs2nM1UuN4cSBzZxDVoFWvFt5ypOTDxw=" }, { "pname": "OpenWeatherMap.API", @@ -404,46 +209,11 @@ "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", diff --git a/pkgs/by-name/im/immichframe/package.nix b/pkgs/by-name/im/immichframe/package.nix index dbc88fa3b41e..b519fae3ed94 100644 --- a/pkgs/by-name/im/immichframe/package.nix +++ b/pkgs/by-name/im/immichframe/package.nix @@ -1,86 +1,68 @@ { buildDotnetModule, - buildNpmPackage, dotnet-sdk, fetchFromGitHub, - fetchpatch, + fetchNpmDeps, lib, nixosTests, - writeShellApplication, + nodejs, + npmHooks, + nix-update-script, }: -let - version = "1.0.29.0"; +buildDotnetModule (finalAttrs: { + pname = "immichframe"; + version = "1.0.35.0"; + src = fetchFromGitHub { owner = "immichFrame"; repo = "immichFrame"; - rev = "v${version}"; - hash = "sha256-YFh+/QWYYtQzBVJUyUuhhKqi9/5waWVX+lw/tov++ws="; + tag = "v${finalAttrs.version}"; + hash = "sha256-VET0em+CyJzXPlCXjozj6SDhjD26lH94AETFKGG895I="; }; - publishApi = buildDotnetModule { - pname = "immichframe"; - inherit version src; - projectFile = "ImmichFrame.WebApi/ImmichFrame.WebApi.csproj"; - nugetDeps = ./deps.json; - dotnet-runtime = dotnet-sdk.aspnetcore; + 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="; - }) - ]; + nativeBuildInputs = [ + npmHooks.npmConfigHook + nodejs + ]; - meta.mainProgram = "ImmichFrame.WebApi"; + npmRoot = "immichFrame.Web"; + + npmDeps = fetchNpmDeps { + src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; + hash = "sha256-RyMY5ooC6Q+W+Y24ILv+WCcWLMDToZ52yefFuoAYubY="; }; - 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} "$@" + preBuild = '' + pushd ${finalAttrs.npmRoot} + npm run build + popd ''; - passthru.tests = { inherit (nixosTests) immichframe; }; + postInstall = '' + cp -r ${finalAttrs.npmRoot}/build/* $out/lib/immichframe/wwwroot/ + ''; + + makeWrapperArgs = [ + "--chdir ${placeholder "out"}/lib/immichframe" + ]; + + passthru = { + updateScript = nix-update-script { }; + tests = { inherit (nixosTests) immichframe; }; + }; meta = { + changelog = "https://github.com/immichFrame/ImmichFrame/releases/tag/${finalAttrs.src.tag}"; description = "Display your photos from Immich as a digital photo frame"; homepage = "https://immichframe.dev"; license = lib.licenses.gpl3Only; + mainProgram = "ImmichFrame.WebApi"; maintainers = with lib.maintainers; [ jfly ]; platforms = lib.platforms.all; }; -} +}) diff --git a/pkgs/by-name/im/immudb/package.nix b/pkgs/by-name/im/immudb/package.nix index b09aab42e53d..ed9ac0099094 100644 --- a/pkgs/by-name/im/immudb/package.nix +++ b/pkgs/by-name/im/immudb/package.nix @@ -15,13 +15,13 @@ let in buildGoModule (finalAttrs: { pname = "immudb"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitHub { owner = "codenotary"; repo = "immudb"; tag = "v${finalAttrs.version}"; - hash = "sha256-YL6L3WqazzdpXQiLGnuQ7ZRKzmx2Z8C9raFXkN1D1Zk="; + hash = "sha256-S+X52zxIJj9uJhvSk0aGrEvLKKoa0BciQW5nAgPRtrc="; }; postPatch = '' @@ -39,7 +39,7 @@ buildGoModule (finalAttrs: { go generate -mod=mod -tags webconsole ./webconsole ''; - vendorHash = "sha256-D1dEVnYNpCGSJ5lxzV0+ukDVbQntxcNw6mB3UKDBdQA="; + vendorHash = "sha256-7/TR+YjeeTQk+kY2WjYBeiP94onLJXrjJijYl5N6cPc="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/in/incus-spawn/package.nix b/pkgs/by-name/in/incus-spawn/package.nix new file mode 100644 index 000000000000..98d44b2c3944 --- /dev/null +++ b/pkgs/by-name/in/incus-spawn/package.nix @@ -0,0 +1,129 @@ +{ + lib, + stdenvNoCC, + fetchurl, + autoPatchelfHook, + installShellFiles, + zlib, + testers, + incus-spawn, + writeShellScript, + curl, + jq, + common-updater-scripts, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + version = "0.2.14"; + pname = "incus-spawn"; + + src = + finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported platform: ${stdenvNoCC.hostPlatform.system}"); + + dontUnpack = true; + dontBuild = true; + dontStrip = stdenvNoCC.hostPlatform.isDarwin; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + installShellFiles + ] + ++ lib.optional stdenvNoCC.hostPlatform.isLinux autoPatchelfHook; + + buildInputs = lib.optionals stdenvNoCC.hostPlatform.isLinux [ + zlib + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 $src $out/bin/isx + install -Dm755 ${finalAttrs.passthru.git-remote-isx} $out/bin/git-remote-isx + + runHook postInstall + ''; + + # Generate shell completions after autoPatchelfHook has patched the ELF binary. + # On Linux, autoPatchelfHook runs in postFixupHooks so we use installCheckPhase + # which runs after fixup is fully complete. On Darwin no patching is needed but + # we keep the same phase for consistency. + doInstallCheck = stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform; + installCheckPhase = '' + runHook preInstallCheck + + installShellCompletion --cmd isx \ + --bash <($out/bin/isx completion bash) \ + --zsh <($out/bin/isx completion zsh) \ + --fish <($out/bin/isx completion fish) + + runHook postInstallCheck + ''; + + passthru = { + sources = { + "x86_64-linux" = fetchurl { + url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-amd64"; + hash = "sha256-eyz54Ej1NJaTgVJuOPJTZb7zUHpHf5/yJa9RUkEjozs="; + }; + "aarch64-linux" = fetchurl { + url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-linux-aarch64"; + hash = "sha256-9qDDWimLb/sDtEbJrV4LbtTiWmbRI2jws0lreECbWp8="; + }; + "aarch64-darwin" = fetchurl { + url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/incus-spawn-macos-aarch64"; + hash = "sha256-ILGO6CGBWAeyVrkVVOnYZQOqoIYTzogfhk4NMkeY/a4="; + }; + }; + + git-remote-isx = fetchurl { + url = "https://github.com/Sanne/incus-spawn/releases/download/v${finalAttrs.version}/git-remote-isx"; + hash = "sha256-I9zmdLzO7VcfLHdgFD2Lvwiq4fkDw885j1JWsL8c+hA="; + }; + + tests.version = testers.testVersion { + package = incus-spawn; + command = "isx --version"; + }; + + updateScript = writeShellScript "update-incus-spawn" '' + set -o errexit + export PATH="${ + lib.makeBinPath [ + curl + jq + common-updater-scripts + ] + }" + NEW_VERSION=$(curl --silent https://api.github.com/repos/Sanne/incus-spawn/releases/latest | jq '.tag_name | ltrimstr("v")' --raw-output) + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "incus-spawn is already at $NEW_VERSION" + exit 0 + fi + update-source-version incus-spawn "$NEW_VERSION" --source-key="git-remote-isx" + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version incus-spawn "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + }; + + meta = { + description = "CLI tool for managing isolated Incus development environments"; + longDescription = '' + incus-spawn (isx) creates isolated Linux development environments using + Incus system containers with copy-on-write branching, a MITM TLS proxy + for credential isolation, and an interactive TUI. + ''; + homepage = "https://github.com/Sanne/incus-spawn"; + changelog = "https://github.com/Sanne/incus-spawn/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.attrNames finalAttrs.passthru.sources; + mainProgram = "isx"; + maintainers = with lib.maintainers; [ + galder + ]; + }; +}) diff --git a/pkgs/by-name/in/incus-ui-canonical/package.nix b/pkgs/by-name/in/incus-ui-canonical/package.nix index c62569a7ac3f..bf67d6bd68d0 100644 --- a/pkgs/by-name/in/incus-ui-canonical/package.nix +++ b/pkgs/by-name/in/incus-ui-canonical/package.nix @@ -1,6 +1,6 @@ { lib, - stdenv, + stdenvNoCC, fetchurl, fetchFromGitHub, fetchYarnDeps, @@ -18,27 +18,23 @@ let hash = "sha256-f0vd/Xp/kBbZkg6CBM4cZPlwg5WUL/zv3mCAEmugzCE="; }; in -stdenv.mkDerivation (finalAttrs: { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "incus-ui-canonical"; - version = "0.19.9"; + version = "0.21.5"; src = fetchFromGitHub { owner = "zabbly"; repo = "incus-ui-canonical"; # only use tags prefixed by incus- they are the tested fork versions tag = "incus-${finalAttrs.version}"; - hash = "sha256-HroAKFvmej3mOUMXwZuTXDV4UJAHkb+hLiKuqKgWRTc="; + hash = "sha256-HUx5QAXFtW+l3LYNWgiGWyOQzbHRbFQ1OpI0cSVLkd8="; }; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-08G3jYj7N9h6aBnqwGQQtpYOP/wP/k2VRY7dgmpxXZw="; + hash = "sha256-61z48VlhImykD/GJ5581Z95dIn7pv2ODZJfFKydGSPs="; }; - patchPhase = '' - find -type f -name "*.ts" -o -name "*.tsx" -o -name "*.scss" | xargs sed -i -f ${renamesSed} - ''; - nativeBuildInputs = [ nodejs fixup-yarn-lock @@ -46,6 +42,15 @@ stdenv.mkDerivation (finalAttrs: { git ]; + postPatch = '' + # run the canonical renames sed script + find -type f -name "*.ts" -o -name "*.tsx" -o -name "*.scss" | xargs sed -i -f ${renamesSed} + + # fix missing git repository issue for Vite + substituteInPlace vite.config.ts \ + --replace-fail "git rev-parse --short HEAD" "echo ${finalAttrs.version}" + ''; + configurePhase = '' runHook preConfigure diff --git a/pkgs/by-name/in/incus/generic.nix b/pkgs/by-name/in/incus/generic.nix index d65be430f557..827280a10bab 100644 --- a/pkgs/by-name/in/incus/generic.nix +++ b/pkgs/by-name/in/incus/generic.nix @@ -121,6 +121,7 @@ buildGoModule (finalAttrs: { ''; postBuild = '' + export HOME=$(mktemp -d) # build docs mkdir -p .sphinx/deps ln -s ${buildPackages.python3.pkgs.swagger-ui-bundle.src} .sphinx/deps/swagger-ui diff --git a/pkgs/by-name/in/incus/lts.nix b/pkgs/by-name/in/incus/lts.nix index 830273a7c26f..07d2b749ca21 100644 --- a/pkgs/by-name/in/incus/lts.nix +++ b/pkgs/by-name/in/incus/lts.nix @@ -1,105 +1,8 @@ import ./generic.nix { - hash = "sha256-7s2gc+78O8jKypVe1itaUrsLPa2mLjNgUUrR/cv7ITA="; - version = "7.0.0"; - vendorHash = "sha256-6irMB3hpWcxDuMQBxWXnhMLAOwTAl63JX6JJZMQXf5E="; + hash = "sha256-Ivj0vWKuhgb4VvyxcuB+CXsJ02zwo65rqxD5/cLUmSk="; + version = "7.0.1"; + vendorHash = "sha256-F3LhWVjckU0ypgOppHztjR6hDB6enHxoDmRWcSDfwQE="; lts = true; - patches = fetchpatch2: [ - (fetchpatch2 { - name = "doc-devices-disk_Fix-broken-link.patch"; - url = "https://github.com/lxc/incus/commit/faa636b70c05a5cca0346492a0586d5747e4b117.patch?full_index=1"; - hash = "sha256-UsfzSeLJq0B9xDmd124ITzFBJzg2w1xXNK6TavQ5iMs="; - }) - (fetchpatch2 { - name = "incusd-instance-qemu_Fix-version-detection-for-qemu-kvm.patch"; - url = "https://github.com/lxc/incus/commit/a5f50d36eaa41580f2233b05936bd29fe1b15100.patch?full_index=1"; - hash = "sha256-Qwu2oljB7COZB2m3W/9Y5wCCZyxvLj4ZUHcNqtoDGzk="; - }) - (fetchpatch2 { - name = "incusd_Re-introduce-core-scheduling-detection.patch"; - url = "https://github.com/lxc/incus/commit/1e6ce18e8cd92b5b3eb4346e7bd27fd4a7d1fb9b.patch?full_index=1"; - hash = "sha256-RLy8bcod55g8vtXxChte4oalApw7d/gZg8No6BUZQS0="; - }) - (fetchpatch2 { - name = "incusd-instance-lxc_Fix-swap=false-failure.patch"; - url = "https://github.com/lxc/incus/commit/5f2cdf7545c5398290dc507313de9ee547fe803f.patch?full_index=1"; - hash = "sha256-Ux6mm8Y4q68fj//hG7k+bXMjqhGDOxGNm64De1pwcYY="; - }) - (fetchpatch2 { - name = "incusd-forknet_Persist-DHCPv6-client-DUID-across-restarts.patch"; - url = "https://github.com/lxc/incus/commit/47377e345930e77d3fbce29d037fc7dbd6823dcf.patch?full_index=1"; - hash = "sha256-CWaNaDYuBBLahxkqnM0FQZraVkvBSbrx1+8dcB8Vfbg="; - }) - (fetchpatch2 { - name = "incusd-forknet_Include-FQDN-in-DHCPv6-INFO-requests.patch"; - url = "https://github.com/lxc/incus/commit/d7f1c9d75ca33eb2ddb0bf10cec934fd6e352089.patch?full_index=1"; - hash = "sha256-3zyADLiPUuiGLwdeISj5lUk3tkAayQGaRI+/yBHrvuM="; - }) - (fetchpatch2 { - name = "incusd-forknet_Properly-renew-stateful-DHCPv6.patch"; - url = "https://github.com/lxc/incus/commit/3b127758c17752302b3f4bf907f42e926ab664e4.patch?full_index=1"; - hash = "sha256-+dcdeZwuyTWH7yfPEDqKOax/lS1Yqvwn9ooqJxKD3jA="; - }) - (fetchpatch2 { - name = "incusd-forknet_Add-jitter-to-DHCPv6-renewal.patch"; - url = "https://github.com/lxc/incus/commit/2b24a260b6177c033047f270286933563f05a999.patch?full_index=1"; - hash = "sha256-grMspYyqn4Zl1Kn+hFeUfeIevdwszJc0x2YDC2JILKw="; - }) - (fetchpatch2 { - name = "incusd-device-nic_bridged_Fix-swapped-IPv4-IPv6-DNS-record.patch"; - url = "https://github.com/lxc/incus/commit/33ffcf71745e138dd4f3546839115c293e6be083.patch?full_index=1"; - hash = "sha256-E8Plz9qdoTt3id9I5jbZYMKQt+kUrKmXmtMJ6IXlRJg="; - }) - (fetchpatch2 { - name = "doc-authorization_Fix-reference-to-old-manager-relation.patch"; - url = "https://github.com/lxc/incus/commit/c65ac0f4e6e94859b8565bce41bbf1595f4a8085.patch?full_index=1"; - hash = "sha256-6wEz3uxWauIibBkH+OdB7+VsFySmugt6wk61qMayzYo="; - }) - (fetchpatch2 { - name = "incusd-network-acl_Fix-issue-with-instances-in-different-project-than-ACL.patch"; - url = "https://github.com/lxc/incus/commit/2a3584b6fccf152be42cf5614e54241bdb13e671.patch?full_index=1"; - hash = "sha256-CXE5Bowk3ZPup6oVDEJb9ucsJoXhXu/kU7gGCghhtjQ="; - }) - (fetchpatch2 { - name = "incusd-projects_Fix-targeting-on-project-delete.patch"; - url = "https://github.com/lxc/incus/commit/3a104e4dc24897f0d6543136bb1043fcd4a33632.patch?full_index=1"; - hash = "sha256-kTFkJqbjzdq5jvNxKw8YMPR04WRj4t5IS6ymoGyXDXE="; - }) - (fetchpatch2 { - name = "test-network_acl_Add-test-for-ACL-used-by-instance-in-different-project.patch"; - url = "https://github.com/lxc/incus/commit/41878729f06e9c31df9d4fac20fb8c384608577c.patch?full_index=1"; - hash = "sha256-YR2Akus4vp3vNvHEmsJUh/3gbEf3R/cFUOVvt9u/wEU="; - }) - (fetchpatch2 { - name = "incusd-instance-qemu_Remove-deprecated-QEMU-flag.patch"; - url = "https://github.com/lxc/incus/commit/c1f18c78fc6bc4850df20574bdcc541e5eefc4ac.patch?full_index=1"; - hash = "sha256-kbn4Yd/G23FCFA0Ch0+d81HUxCbcoiOzHfZ0MW+VlzE="; - }) - (fetchpatch2 { - name = "incusd-cluster_Re-order-evacuations-to-happen-earlier-on-shutdown.patch"; - url = "https://github.com/lxc/incus/commit/5b29ecc164ef28239d2e2a874a7c871a2e419083.patch?full_index=1"; - hash = "sha256-jpyJYjiZvRw/aOGsykEx8uotRBF7p1q5O08PVhyQtvk="; - }) - (fetchpatch2 { - name = "incusd-storage_Fix-unsafe-access-to-backup-data.patch"; - url = "https://github.com/lxc/incus/commit/d71c5053a4c8318e6eb07337a7a4a07a6608ef73.patch?full_index=1"; - hash = "sha256-/mH0/KmX9sG8HZTcdk8MT+QZtNqZa934wcHptvdVtXM="; - }) - (fetchpatch2 { - name = "incusd-storage_Guard-nil-ExpiresAt-in-CreateCustomVolumeFromBackup.patch"; - url = "https://github.com/lxc/incus/commit/ab6b7dff0c770044875d9d26a6254a7075b4d00b.patch?full_index=1"; - hash = "sha256-d7VUetQzUTBq3GLYM1JKy2KDbBxOW5Lg7Di1/JPNzSE="; - }) - (fetchpatch2 { - name = "incusd-storage_Guard-nil-fields-in-createDependentVolumesFromBackup.patch"; - url = "https://github.com/lxc/incus/commit/98e64f0a6fcfdc9676eea0246418d490c53297bf.patch?full_index=1"; - hash = "sha256-+lB7eHsGZ/dW7aL4/wIWD4AF6t7s4QYfAld1bQOw2tQ="; - }) - (fetchpatch2 { - name = "incusd-storage-s3_Confine-multipart-uploads-with-os.Root.patch"; - url = "https://github.com/lxc/incus/commit/a6012422b45c86f3b1956788cff5d75c604ad838.patch?full_index=1"; - hash = "sha256-u3NLKE8Rh8i6HMbJ0KNhH7gbuwIpJ1SPqiyVoiuw9Sc="; - }) - ]; nixUpdateExtraArgs = [ "--version-regex=^v(7\\.0\\.[0-9]+)$" "--override-filename=pkgs/by-name/in/incus/lts.nix" diff --git a/pkgs/by-name/in/incus/package.nix b/pkgs/by-name/in/incus/package.nix index 8ffc9f825563..8493e9b65d56 100644 --- a/pkgs/by-name/in/incus/package.nix +++ b/pkgs/by-name/in/incus/package.nix @@ -1,14 +1,8 @@ import ./generic.nix { - hash = "sha256-g0YnvPMwk7WpYCl5VbRtHKVYoLlrk6QYhRaRRqulVQM="; - version = "7.1.0"; - vendorHash = "sha256-VqvDrjdBTblqEOY/HtoKXGRAdoTJpSWxkmgJNNPw6eQ="; - patches = fetchpatch2: [ - (fetchpatch2 { - name = "lxc-fix-environment-quoting.patch"; - url = "https://github.com/lxc/incus/commit/a1276cdb57297245496ac8c1db76b90d1fcebd3b.patch?full_index=1"; - hash = "sha256-NqEMYcDYx18KbqShKxmaK1o08c8/X4O87zXclQ36Ors="; - }) - ]; + hash = "sha256-GVCC0nV5Ghd9BroVC4ysqiTIQ3AtXIJ+EG6VbJVQBB4="; + version = "7.2.0"; + vendorHash = "sha256-0lBMQXQEf+oYlvyoFV2VTpJbY+reavCJZQkzt9UbnaI="; + patches = fetchpatch2: [ ]; nixUpdateExtraArgs = [ "--override-filename=pkgs/by-name/in/incus/package.nix" ]; diff --git a/pkgs/by-name/in/infer/package.nix b/pkgs/by-name/in/infer/package.nix new file mode 100644 index 000000000000..938573476336 --- /dev/null +++ b/pkgs/by-name/in/infer/package.nix @@ -0,0 +1,249 @@ +{ + fetchFromGitHub, + lib, + stdenv, + + # nativeBuildInputs + autoconf, + automake, + cmake, + dune_3, + git, + makeWrapper, + ninja, + opam, + pkg-config, + perl, + which, + + # buildInputs + gmp, + mpfr, + ocaml-ng, + sqlite, + zlib, + + # Erlang + beamPackages, + + # Java + jdk, + + # LLVM + python3, + + # Options + withErlang ? true, + withJava ? true, + withLLVM ? true, + withRust ? false, +}: +let + pname = "infer"; + version = "1.3.0"; + src = fetchFromGitHub { + owner = "facebook"; + repo = pname; + tag = "v${version}"; + hash = "sha256-Kq7sJVBqe4ei1HbZz8R+P4V6yxisxEmPVHjyVlpL1aw="; + }; + + # Pre-fetched LLVM source that facebook-clang-plugins would normally download + # They specify the version in `facebook-clang-plugins/clang/src/prepare_clang_src.sh` + # Please check that file and update the version as appropriate when updating + llvmSrc = fetchFromGitHub { + owner = "llvm"; + repo = "llvm-project"; + tag = "llvmorg-21.1.6"; + hash = "sha256-mqZLJYDEs6FXAjbSOruR2ATZZxemNMagNG9SMjSWBFE="; + }; + + # We need to use 5.3 because stdcompat (a transitive ocaml dependency) is + # broken on 5.4 + ocamlPackages = ocaml-ng.ocamlPackages_5_3.overrideScope ( + self: super: { + # Newer ppxlib removed a function needed by 0.36 + ppxlib = super.ppxlib.override { version = "0.34.0"; }; + # Infer bundles charon 0.1.177; nixpkgs unstable has a newer incompatible + # version + charon = super.buildDunePackage { + pname = "charon"; + version = "0.1"; + src = "${src}/dependencies/charon"; + propagatedBuildInputs = with self; [ + easy_logging + name_matcher_parser + ppx_deriving + unionFind + visitors + yojson + ]; + }; + } + ); + + erlangDeps = with beamPackages; [ + erlang + rebar3 + ]; + javaDeps = [ jdk ]; +in +stdenv.mkDerivation { + inherit pname src version; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + autoconf + automake + cmake + dune_3 + git + makeWrapper + ninja + opam + pkg-config + perl + which + ] + ++ (with ocamlPackages; [ + atd + atdgen + ocaml + findlib + menhir + ocamlbuild + ]) + ++ lib.optionals withErlang erlangDeps + ++ lib.optionals withJava javaDeps + ++ lib.optional withLLVM python3; + + buildInputs = [ + gmp + mpfr + sqlite + zlib + ] + ++ (with ocamlPackages; [ + ansiterminal + atd + atdgen + base64 + bheap + charon + cmdliner + containers + containers-data + core + ctypes + fmt + fpath + iter + javalib + memtrace + menhirLib + mtime + ocamlgraph + ounit + ounit2 + parmap + ppx_blob + ppx_compare + ppx_enumerate + ppx_expect + ppx_fields_conv + ppx_show + ppx_yojson_conv + ppxlib + pyml + sawja + saturn + sedlex + spawn + ocaml_sqlite3 + tdigest + xmlm + zarith + ]) + ++ lib.optionals withErlang erlangDeps + ++ lib.optionals withJava javaDeps; + + preConfigure = '' + patchShebangs . + + ${lib.optionalString withLLVM + # sh + '' + # Link in the prefetched llvm source + mkdir -p facebook-clang-plugins/clang/src/download + ln -s ${llvmSrc} facebook-clang-plugins/clang/src/download/llvm-project + # Skip the download step in prepare_clang_src.sh + substituteInPlace facebook-clang-plugins/clang/src/prepare_clang_src.sh \ + --replace-fail 'curl -L' 'echo "SKIPPED: curl" #' \ + --replace-fail 'tar xf' 'echo "SKIPPED: tar" #' + + # Runtimes and bindings fail to build, as it tries to build them using its + # newly built clang, but infer seems to work with them disabled. + # Tools are needed because the build requires llvm-config. + substituteInPlace facebook-clang-plugins/clang/setup.sh \ + --replace-fail '-DLLVM_ENABLE_RUNTIMES="compiler-rt;libcxx;libcxxabi;libunwind"' '-DLLVM_ENABLE_RUNTIMES=""'\ + --replace-fail '-DLLVM_BUILD_DOCS=Off' '-DLLVM_BUILD_DOCS=Off -DLLVM_ENABLE_BINDINGS=Off' \ + --replace-fail '-DLLVM_BUILD_TOOLS=Off' '-DLLVM_BUILD_TOOLS=On' + '' + } + + # Remove deprecated -j-std atdgen flag, which is removed in current atdgen + find . -name "dune" -exec sed -i 's/-j-std//g' {} + 2>/dev/null || true + + # Use nix-provided context. + substituteInPlace infer/dune-workspace.in \ + --replace-fail '(context (opam (switch @OPAMSWITCH@) (name default) (merlin)))' '(context default)' + + ./autogen.sh + ''; + + dontUseCmakeConfigure = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + ] + ++ [ + "--disable-hack-analyzers" # No support on nixpkgs as of writing + "--disable-python-analyzers" # Needs python 3.10, which is not in nixpkgs + "--disable-swift-analyzers" # Does not want to build with the current package + ] + ++ lib.optional (!withErlang) "--disable-erlang-analyzers" + ++ lib.optional (!withJava) "--disable-java-analyzers" + ++ lib.optional (!withLLVM) "--disable-c-analyzers" + ++ lib.optional withRust "--enable-rust-analyzers"; + + buildFlags = [ + # This cuts the build time in half + "CFLAGS=-O2" + "CXXFLAGS=-O2" + # Prevent ocaml warnings 11 and 55 from crashing the build + "OCAMLPARAM=_,w=-11-55" + ]; + + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + + postInstall = + let + runtimeDeps = lib.optionals withErlang erlangDeps ++ lib.optionals withJava javaDeps; + in + lib.optionalString (runtimeDeps != [ ]) '' + wrapProgram "$out/bin/infer" \ + --prefix PATH : "${lib.makeBinPath runtimeDeps}" + ''; + + meta = { + description = "Facebook's static analysis tool for Java, C++, Objective-C, and C."; + homepage = "https://fbinfer.com/"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.kacper-uminski ]; + platforms = lib.platforms.darwin ++ lib.platforms.linux; + mainProgram = "infer"; + }; +} diff --git a/pkgs/by-name/in/inferno/package.nix b/pkgs/by-name/in/inferno/package.nix index cd6f3f87fb76..049873d980c6 100644 --- a/pkgs/by-name/in/inferno/package.nix +++ b/pkgs/by-name/in/inferno/package.nix @@ -6,17 +6,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inferno"; - version = "0.12.6"; + version = "0.12.8"; src = fetchFromGitHub { owner = "jonhoo"; repo = "inferno"; tag = "v${finalAttrs.version}"; - hash = "sha256-maqyxntCm8F8B14+26+ASJNl7JL3Pk+xzwgA2f8r4zc="; + hash = "sha256-IRL7hHXZlJiYw4dea0gjxVTgpSwxeAZBCCqkMMkukRo="; fetchSubmodules = true; }; - cargoHash = "sha256-0Zn3KS8Qo39yR+WUxj68eYt9jnDwpf4QUBGBqZPqFIU="; + cargoHash = "sha256-RB9XUURf+Eb2c3JcmqCmmM776FuNenn6Mj2zjo1X/Tw="; # skip flaky tests checkFlags = [ diff --git a/pkgs/by-name/in/infracost/package.nix b/pkgs/by-name/in/infracost/package.nix index 4f56c8ea08fd..ea2a068ba0c6 100644 --- a/pkgs/by-name/in/infracost/package.nix +++ b/pkgs/by-name/in/infracost/package.nix @@ -8,15 +8,15 @@ buildGoModule (finalAttrs: { pname = "infracost"; - version = "0.10.44"; + version = "0.10.45"; src = fetchFromGitHub { owner = "infracost"; rev = "v${finalAttrs.version}"; repo = "infracost"; - sha256 = "sha256-7TH7ZWANQMlhfpCP5OdiQCL6OsFP1RK5YGV8hGuouBY="; + sha256 = "sha256-ionW8XChMCQxekKqbiNc6wSu5pxdG59WX2CxlCqStXk="; }; - vendorHash = "sha256-ZG6DjYcHvEii55ayx6x168L2v04n/pAZRqqQ7DKvugA="; + vendorHash = "sha256-fwMVYzbCHENra1ySNMQnWF/JnYngO/oHgxZvMZ2+3TQ="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/infrastructure-agent/package.nix b/pkgs/by-name/in/infrastructure-agent/package.nix index 2abcd941c5ff..b75c0af5b860 100644 --- a/pkgs/by-name/in/infrastructure-agent/package.nix +++ b/pkgs/by-name/in/infrastructure-agent/package.nix @@ -6,16 +6,16 @@ }: buildGoModule (finalAttrs: { pname = "infrastructure-agent"; - version = "1.74.4"; + version = "1.77.0"; src = fetchFromGitHub { owner = "newrelic"; repo = "infrastructure-agent"; rev = finalAttrs.version; - hash = "sha256-T7DXHbI2aK6/nx6bYJEEcr2GRBo9+NnB9yami1SN528="; + hash = "sha256-QgyQ5fP8yIgmqHqLRn927pRmngOeKcdSaxXLDkcIwqI="; }; - vendorHash = "sha256-xkoNVXRm8OkVd2f3cSFE1QIF6EHhh8AQh/YZYt22+MU="; + vendorHash = "sha256-+ajMZ+kZ+m1vxyAfM+zvzTfcwkN63agdGoXPTNPC2i0="; ldflags = [ "-s" diff --git a/pkgs/by-name/in/iniparser/package.nix b/pkgs/by-name/in/iniparser/package.nix index 260dfdf1887f..3d1a5af3a3f4 100644 --- a/pkgs/by-name/in/iniparser/package.nix +++ b/pkgs/by-name/in/iniparser/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-z10S9ODLprd7CbL5Ecgh7H4eOwTetYwFXiWBUm6fIr4="; }; - patches = lib.optional finalAttrs.doCheck ( + patches = lib.optional finalAttrs.finalPackage.doCheck ( # 1. Do not fetch the Unity GitHub repository # 2. Lookup the Unity pkgconfig file # 3. Get the generate_test_runner.rb file from the Unity share directory diff --git a/pkgs/by-name/in/inlyne/package.nix b/pkgs/by-name/in/inlyne/package.nix index 5c56664215a4..6e5b4e15de90 100644 --- a/pkgs/by-name/in/inlyne/package.nix +++ b/pkgs/by-name/in/inlyne/package.nix @@ -21,21 +21,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inlyne"; - version = "0.5.0"; + version = "0.5.2"; src = fetchFromGitHub { owner = "Inlyne-Project"; repo = "inlyne"; rev = "v${finalAttrs.version}"; - hash = "sha256-ueE1NKbCMBUBrrdsHkwZ5Yv6LD3tQL3ZAk2O4xoYOcw="; + hash = "sha256-bUM9Mn/C9l6s6ucoLRo25m4PbbW3gp5d3AvO/9GTJcI="; }; - cargoHash = "sha256-6TwMZNYvW1bBE+9PJUXQxP5Uz7VYsjyLabmaxcX9Mbk="; - - cargoPatches = [ - # update metrics dependency to fix Rust 1.94 compatibility - ./update-metrics.patch - ]; + cargoHash = "sha256-IaaojW5PYSUwyh1iv2HrDidIV8keEykKHY61rpcCAPc="; nativeBuildInputs = [ installShellFiles @@ -83,6 +78,7 @@ rustPlatform.buildRustPackage (finalAttrs: { lib.makeLibraryPath [ libGL libx11 + libxkbcommon ] } ''; diff --git a/pkgs/by-name/in/inlyne/update-metrics.patch b/pkgs/by-name/in/inlyne/update-metrics.patch deleted file mode 100644 index 7bfc10569354..000000000000 --- a/pkgs/by-name/in/inlyne/update-metrics.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -2409,9 +2409,9 @@ dependencies = [ - - [[package]] - name = "metrics" --version = "0.24.0" -+version = "0.24.3" - source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "8ae428771d17306715c5091d446327d1cfdedc82185c65ba8423ab404e45bf10" -+checksum = "5d5312e9ba3771cfa961b585728215e3d972c950a3eed9252aa093d6301277e8" - dependencies = [ - "ahash 0.8.11", - "portable-atomic", diff --git a/pkgs/by-name/in/inmarsatc/package.nix b/pkgs/by-name/in/inmarsatc/package.nix new file mode 100644 index 000000000000..c1ff54c4e6b3 --- /dev/null +++ b/pkgs/by-name/in/inmarsatc/package.nix @@ -0,0 +1,35 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "inmarsatc"; + version = "0-unstable-2023-07-10"; + + src = fetchFromGitHub { + owner = "cropinghigh"; + repo = "inmarsatc"; + rev = "cda1242e79981d71cd8608e971c8dbc691942b10"; + hash = "sha256-UCmdHR9bSr1x4G0OP7n+o6pdS1thTl9hzH7YMykSiGw="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ cmake ]; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch" ]; + }; + + meta = { + description = "C++ library with functions to receive Inmarsat-C signals"; + homepage = "https://github.com/cropinghigh/inmarsatc"; + license = lib.licenses.gpl3Only; + maintainers = [ lib.maintainers.nekowinston ]; + platforms = lib.platforms.linux; + }; +} diff --git a/pkgs/by-name/in/innernet/package.nix b/pkgs/by-name/in/innernet/package.nix index c9604914b1f7..4b5fee216a6e 100644 --- a/pkgs/by-name/in/innernet/package.nix +++ b/pkgs/by-name/in/innernet/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "innernet"; - version = "1.7.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "tonarino"; repo = "innernet"; tag = "v${finalAttrs.version}"; - hash = "sha256-wGxTdoWMHVUldW+bjli+5zqo3PRU/8tn7fxAeVrynjs="; + hash = "sha256-7pvQFxXf1MCmnNNQIGGkI2jhL9jC/ZLZqwiJPSFC1b8="; }; - cargoHash = "sha256-vDPs+EEl/ZbKxOrNHc86N7+5ij+4YmsZRo5/Sxja6ms="; + cargoHash = "sha256-CaE2VH5CuOuEATcYrt7p7yQFQ5s0tZZomvy9VltRpRI="; nativeBuildInputs = [ rustPlatform.bindgenHook diff --git a/pkgs/by-name/in/inngest/package.nix b/pkgs/by-name/in/inngest/package.nix new file mode 100644 index 000000000000..8a13fb82b684 --- /dev/null +++ b/pkgs/by-name/in/inngest/package.nix @@ -0,0 +1,109 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchPnpmDeps, + pnpm_10, + pnpmConfigHook, + nodejs, + stdenv, + testers, +}: +let + version = "1.37.0"; + websiteRev = "159c0ac611e85ec85ffe0a8c8bf2c4a0330bdb38"; + + src = fetchFromGitHub { + owner = "inngest"; + repo = "inngest"; + tag = "v${version}"; + hash = "sha256-m9VFmplaMFD3+Z0qioehsuKeJaS6fUSb++liUabDEuM="; + }; + + website = fetchFromGitHub { + owner = "inngest"; + repo = "website"; + rev = websiteRev; + hash = "sha256-EkTIv8jgcqzurz2M7PC6Kfh6x2Zxu7UmIhpTjlj8o88="; + }; + + ui = stdenv.mkDerivation (finalAttrs: { + inherit version src; + pname = "inngest-ui"; + + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + ]; + + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_10; + sourceRoot = "${finalAttrs.src.name}/ui"; + fetcherVersion = 4; + hash = "sha256-bt/7cpN9EXf2CZFRAaybr7pgJyInV0fdUy7Rv/UcT/I="; + }; + pnpmRoot = "ui"; + + buildPhase = '' + runHook preBuild + pnpm --filter dev-server-ui build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mkdir -p $out/dist + cp -r ui/apps/dev-server-ui/dist/. $out/dist/ + runHook postInstall + ''; + }); +in +buildGoModule (finalAttrs: { + inherit version src; + pname = "inngest"; + + __structuredAttrs = true; + + vendorHash = null; + + preBuild = '' + cp -r ${ui}/dist/. ./pkg/devserver/static/ + cp -r ${website}/. ./internal/embeddocs/website/ + ''; + + postInstall = '' + mv $out/bin/cmd $out/bin/inngest + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/inngest/inngest/pkg/inngest/version.Version=${version}" + ]; + + env.CGO_ENABLED = 0; + + subPackages = [ "cmd" ]; + + passthru = { + inherit ui website websiteRev; + tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; + updateScript = ./update.sh; + }; + + meta = { + description = "CLI and dev server for Inngest durable workflows"; + homepage = "https://github.com/inngest/inngest"; + changelog = "https://github.com/inngest/inngest/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.sspl; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + maintainers = with lib.maintainers; [ + albertchae + kikos0 + ]; + mainProgram = "inngest"; + platforms = lib.lists.remove "x86_64-darwin" lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/in/inngest/update.sh b/pkgs/by-name/in/inngest/update.sh new file mode 100755 index 000000000000..6c2ff3314bb7 --- /dev/null +++ b/pkgs/by-name/in/inngest/update.sh @@ -0,0 +1,46 @@ +#!/usr/bin/env nix-shell +#!nix-shell -I nixpkgs=./. -i bash -p gh jq +# shellcheck shell=bash +set -euo pipefail + +nixpkgs="$(pwd)" +cd "$(readlink -e "$(dirname "${BASH_SOURCE[0]}")")" + +nix_attr() { nix eval --json --impure --expr "(import $nixpkgs {}).$1" | jq -r; } + +update_hash() { + old_hash="$(nix_attr "$1.outputHash")" + new_hash="$(nix-build --impure --expr "let src = (import $nixpkgs {}).$1; in (src.overrideAttrs or (f: src // f src)) (_: { outputHash = \"\"; outputHashAlgo = \"sha256\"; })" 2>&1 | tr -s ' ' | grep -Po "got: \K.+$")" || true + sed -i "s|${old_hash}|${new_hash}|g" package.nix + echo "$1: $old_hash -> $new_hash" +} + +latest=$(gh api repos/inngest/inngest/releases/latest --jq '.tag_name' | tr -d 'v') +current=$(nix_attr inngest.version) + +if [[ "$current" == "$latest" ]]; then + echo "inngest is already up to date: $current" + exit 0 +fi + +echo "Updating inngest $current -> $latest" + +sed -i "s|version = \"${current}\"|version = \"${latest}\"|" package.nix +update_hash inngest.src + +old_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${current}" --jq '.sha') +new_lock=$(gh api "repos/inngest/inngest/contents/ui/pnpm-lock.yaml?ref=v${latest}" --jq '.sha') +if [[ "$old_lock" != "$new_lock" ]]; then + update_hash inngest.ui.pnpmDeps +else + echo "pnpm lockfile unchanged, skipping" +fi + +new_rev=$(gh api "repos/inngest/inngest/contents/internal/embeddocs/website?ref=v${latest}" --jq '.sha') +old_rev=$(nix_attr inngest.websiteRev) +if [[ "$old_rev" != "$new_rev" ]]; then + sed -i "s|${old_rev}|${new_rev}|" package.nix + update_hash inngest.website +else + echo "website unchanged, skipping" +fi diff --git a/pkgs/tools/inputmethods/input-remapper/default.nix b/pkgs/by-name/in/input-remapper/package.nix similarity index 88% rename from pkgs/tools/inputmethods/input-remapper/default.nix rename to pkgs/by-name/in/input-remapper/package.nix index 3b7a60156f8e..03c5738a0f08 100644 --- a/pkgs/tools/inputmethods/input-remapper/default.nix +++ b/pkgs/by-name/in/input-remapper/package.nix @@ -32,24 +32,25 @@ let in (python3Packages.buildPythonApplication rec { pname = "input-remapper"; - version = "2.2.0"; - format = "setuptools"; + version = "2.2.1"; + pyproject = true; src = fetchFromGitHub { owner = "sezanzeb"; repo = "input-remapper"; tag = version; - hash = "sha256-MZO40Y8ym/lwHB8PETdtByAJb/UMMM6pRAAgAYao8UI="; + hash = "sha256-CFg/AvmZseU1f9bWI4CtYp9blvAhCgGzVWE8csVDbyE="; }; postPatch = '' # fix FHS paths - substituteInPlace inputremapper/configs/data.py \ - --replace-fail "/usr/share" "$out/usr/share" + substituteInPlace inputremapper/installation_info.py \ + --replace-fail 'DATA_DIR = "/usr/share/input-remapper"' \ + "DATA_DIR = \"$out/usr/share/input-remapper\"" '' + lib.optionalString withDebugLogLevel '' # if debugging - substituteInPlace inputremapper/logger.py \ + substituteInPlace inputremapper/logging/logger.py \ --replace-fail "logger.setLevel(logging.INFO)" "logger.setLevel(logging.DEBUG)" ''; @@ -63,15 +64,17 @@ in ] ++ maybeXmodmap; + build-system = with python3Packages; [ setuptools ]; + dependencies = with python3Packages; [ - setuptools # needs pkg_resources - pygobject3 + dasbus evdev - pkgconfig - pydantic - pydbus gtksourceview4 + packaging psutil + pycairo + pydantic + pygobject3 ]; # buildPythonApplication maps nativeCheckInputs to nativeInstallCheckInputs. @@ -98,6 +101,7 @@ in install -m644 -D -t $out/share/applications/ data/*.desktop install -m644 -D -t $out/share/polkit-1/actions/ data/input-remapper.policy + install -m644 -D data/69-input-remapper-forwarded.rules $out/etc/udev/rules.d/69-input-remapper-forwarded.rules install -m644 -D data/99-input-remapper.rules $out/etc/udev/rules.d/99-input-remapper.rules install -m644 -D data/input-remapper.service $out/lib/systemd/system/input-remapper.service install -m644 -D data/input-remapper.policy $out/share/polkit-1/actions/input-remapper.policy @@ -179,7 +183,8 @@ in # discussion postPatch = prev.postPatch or "" + '' # set revision for --version output - echo "COMMIT_HASH = '${final.src.rev}'" > inputremapper/commit_hash.py + substituteInPlace inputremapper/installation_info.py \ + --replace-fail 'COMMIT_HASH = "unknown"' 'COMMIT_HASH = "${final.src.rev}"' ''; } ) diff --git a/pkgs/by-name/in/inputplumber/package.nix b/pkgs/by-name/in/inputplumber/package.nix index 8c488ba81487..e2f821f1ddc1 100644 --- a/pkgs/by-name/in/inputplumber/package.nix +++ b/pkgs/by-name/in/inputplumber/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "inputplumber"; - version = "0.77.3"; + version = "0.78.0"; src = fetchFromGitHub { owner = "ShadowBlip"; repo = "InputPlumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-lcv61lzZ45vNDdFdlnJOQW/mIN8KdsAEAUsoNuuhLM0="; + hash = "sha256-wa05/gStEbXUZLvokY1N4k4f4/cPm2Kolbf+AF479lU="; }; - cargoHash = "sha256-VrzePyiBWAWy+IC9QWi5vooAp2+SwuzT3n+SMG/Ntas="; + cargoHash = "sha256-lScpMua5czwmnz/+fz+UrgZSWHwRNP7zB317xJS+6gs="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/inql/package.nix b/pkgs/by-name/in/inql/package.nix index eeee417289da..1e0114e58d65 100644 --- a/pkgs/by-name/in/inql/package.nix +++ b/pkgs/by-name/in/inql/package.nix @@ -41,7 +41,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "inql"; homepage = "https://github.com/doyensec/inql"; changelog = "https://github.com/doyensec/inql/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/in/inriafonts/package.nix b/pkgs/by-name/in/inriafonts/package.nix index 66cc4e5a7927..8215ca4a4b04 100644 --- a/pkgs/by-name/in/inriafonts/package.nix +++ b/pkgs/by-name/in/inriafonts/package.nix @@ -9,7 +9,7 @@ stdenvNoCC.mkDerivation rec { version = "1.200"; src = fetchFromGitHub { - owner = "BlackFoundry"; + owner = "BlackFoundryCom"; repo = "InriaFonts"; rev = "v${version}"; hash = "sha256-CMKkwGuUEVYavnFi15FCk7Xloyk97w+LhAZ6mpIv5xg="; diff --git a/pkgs/by-name/in/insomnia/package.nix b/pkgs/by-name/in/insomnia/package.nix index ae533545be65..1292d46639cc 100644 --- a/pkgs/by-name/in/insomnia/package.nix +++ b/pkgs/by-name/in/insomnia/package.nix @@ -7,22 +7,18 @@ }: let pname = "insomnia"; - version = "12.2.0"; + version = "13.0.0"; src = fetchurl { aarch64-darwin = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; - }; - x86_64-darwin = { - url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.dmg"; - hash = "sha256-ISQVIhR5TWY/Xk6sXeL89/srxppqBS7wdoRINwuoQqg="; + hash = "sha256-sPl7KXC8Z13LFZvxuKg02iDbtrCxn//Yrr8AOOf3VD4="; }; x86_64-linux = { url = "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.AppImage"; - hash = "sha256-/0fJmbXhjrcVVSFvxd847mSKrzrZRK3Sqi6rjyaBOUw="; + hash = "sha256-PlcKBQnkmgU/SsLRKX7ohrGHm7B4hK9FMkplwlbFolI="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -36,7 +32,6 @@ let platforms = [ "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ markus1189 diff --git a/pkgs/build-support/setup-hooks/install-fonts.sh b/pkgs/by-name/in/installFonts/install-fonts.sh similarity index 100% rename from pkgs/build-support/setup-hooks/install-fonts.sh rename to pkgs/by-name/in/installFonts/install-fonts.sh diff --git a/pkgs/by-name/in/installFonts/package.nix b/pkgs/by-name/in/installFonts/package.nix new file mode 100644 index 000000000000..05ea61967f35 --- /dev/null +++ b/pkgs/by-name/in/installFonts/package.nix @@ -0,0 +1,17 @@ +{ + lib, + makeSetupHook, +}: + +makeSetupHook { + name = "install-fonts-hook"; + meta = { + description = "Copies standard font extension into their respective installation path"; + maintainers = with lib.maintainers; [ + pancaek + sigmanificient + jopejoe1 + ]; + license = lib.licenses.mit; + }; +} ./install-fonts.sh diff --git a/pkgs/by-name/in/instant-space-switcher/package.nix b/pkgs/by-name/in/instant-space-switcher/package.nix new file mode 100644 index 000000000000..25297ba3a848 --- /dev/null +++ b/pkgs/by-name/in/instant-space-switcher/package.nix @@ -0,0 +1,50 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "instant-space-switcher"; + version = "2.0"; + + src = fetchurl { + url = "https://github.com/jurplel/InstantSpaceSwitcher/releases/download/v${finalAttrs.version}/InstantSpaceSwitcher-${finalAttrs.version}.dmg"; + hash = "sha256-48DH2Hu/XhLPr8jP2ArmLJLFbJmIupkrlqlFOsNnL7g="; + }; + + nativeBuildInputs = [ undmg ]; + + sourceRoot = "."; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R InstantSpaceSwitcher.app "$out/Applications/" + ln -s "$out/Applications/InstantSpaceSwitcher.app/Contents/MacOS/ISSCli" "$out/bin/isscli" + + runHook postInstall + ''; + + dontBuild = true; + dontFixup = true; + + __structuredAttrs = true; + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Native instant workspace switching on macOS. No more waiting for animations"; + homepage = "https://github.com/jurplel/InstantSpaceSwitcher"; + changelog = "https://github.com/jurplel/InstantSpaceSwitcher/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + mainProgram = "isscli"; + maintainers = with lib.maintainers; [ myzel394 ]; + }; +}) diff --git a/pkgs/by-name/in/intel-cmt-cat/package.nix b/pkgs/by-name/in/intel-cmt-cat/package.nix index 7c469dc1cb6c..42bfe92cf37c 100644 --- a/pkgs/by-name/in/intel-cmt-cat/package.nix +++ b/pkgs/by-name/in/intel-cmt-cat/package.nix @@ -5,14 +5,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "26.03"; + version = "26.06"; pname = "intel-cmt-cat"; src = fetchFromGitHub { owner = "intel"; repo = "intel-cmt-cat"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-uGSWpP5CWyUpdLX5F/Lpiqbcdb0Zldeh5XSjptUqLqY="; + sha256 = "sha256-4rpmbQzxLD7FrtIzE+iE4G0sU7Dvz4rWs4MSlJqZcok="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/bump-cmake.patch similarity index 100% rename from pkgs/by-name/in/intel-graphics-compiler/bump-cmake.patch rename to pkgs/by-name/in/intel-compute-runtime-legacy1/bump-cmake.patch diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch new file mode 100644 index 000000000000..90cd81176d12 --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-allow-llvm-free-nonheap-object-warning.patch @@ -0,0 +1,14 @@ +diff --git a/igc/IGC/common/LLVMWarningsPush.hpp b/igc/IGC/common/LLVMWarningsPush.hpp +index 12874dfcc2..38acd80943 100644 +--- a/igc/IGC/common/LLVMWarningsPush.hpp ++++ b/igc/IGC/common/LLVMWarningsPush.hpp +@@ -43,6 +43,9 @@ + #if __GNUC__ > 8 + #pragma GCC diagnostic ignored "-Winit-list-lifetime" + #endif ++#if __GNUC__ > 14 ++#pragma GCC diagnostic ignored "-Wfree-nonheap-object" ++#endif + #endif + + #if defined(_WIN32) || defined(_WIN64) diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch new file mode 100644 index 000000000000..d0b0964f5748 --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/gcc15-llvm-header-fixes.patch @@ -0,0 +1,13 @@ +diff --git a/llvm-project/llvm/include/llvm/Support/Threading.h b/llvm-project/llvm/include/llvm/Support/Threading.h +index ba6c531ab4..78aa5e7be5 100644 +--- a/llvm-project/llvm/include/llvm/Support/Threading.h ++++ b/llvm-project/llvm/include/llvm/Support/Threading.h +@@ -18,7 +18,7 @@ + #include "llvm/ADT/StringRef.h" + #include "llvm/Config/llvm-config.h" // for LLVM_ON_UNIX + #include "llvm/Support/Compiler.h" +-#include // So we can check the C++ standard lib macros. ++#include // So we can check the C++ standard lib macros. + #include + + #if defined(_MSC_VER) diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix new file mode 100644 index 000000000000..859ca5c54f5e --- /dev/null +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/intel-graphics-compiler.nix @@ -0,0 +1,156 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + ninja, + git, + bison, + flex, + zlib, + intel-compute-runtime, + python3, + spirv-tools, + spirv-headers, +}: + +let + llvmVersion = "16.0.6"; +in +stdenv.mkDerivation rec { + pname = "intel-graphics-compiler"; + version = "2.34.4"; + + # See the repository for expected versions: + # + srcs = [ + (fetchFromGitHub { + name = "igc"; + owner = "intel"; + repo = "intel-graphics-compiler"; + tag = "v${version}"; + hash = "sha256-w20nrn3wo9Dvv3BILYBzuJTTLXqcWaRAF7SiPtryhwk="; + }) + (fetchFromGitHub { + name = "llvm-project"; + owner = "llvm"; + repo = "llvm-project"; + tag = "llvmorg-${llvmVersion}"; + hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + }) + (fetchFromGitHub { + name = "vc-intrinsics"; + owner = "intel"; + repo = "vc-intrinsics"; + tag = "v0.25.0"; + hash = "sha256-ozc1w3V5RqWHwqNHuefZJMN8RAYxrJxH9bd1BEqxfiQ="; + }) + (fetchFromGitHub { + name = "opencl-clang"; + owner = "intel"; + repo = "opencl-clang"; + tag = "v16.0.11"; + hash = "sha256-ema1jTNMHs3pUituVb1NPllc6cA8eYJHtDOjuEzIDWM="; + }) + (fetchFromGitHub { + name = "llvm-spirv"; + owner = "KhronosGroup"; + repo = "SPIRV-LLVM-Translator"; + tag = "v16.0.24"; + hash = "sha256-aTcwfQt2WdOA44jfHdD7x7oxt8emSDexgZnI7MPVqvU="; + }) + ]; + + patches = [ + # Raise minimum CMake version to 3.5 + # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d + # https://github.com/intel/intel-graphics-compiler/pull/364 + ./bump-cmake.patch + + # Fix for GCC 15 by adding a previously-implicit `#include ` and + # replacing `` with `` in the the llvm directory. Based + # on https://github.com/intel/intel-graphics-compiler/pull/383. + ./gcc15-llvm-header-fixes.patch + + # Fix for GCC 15 by disabling `-Werror` for `-Wfree-nonheap-object` + # warnings within LLVM. This is in accordance with IGC disabling warnings + # that originate from within LLVM (see `IGC/common/LLVMWarningsPush.hpp`). + ./gcc15-allow-llvm-free-nonheap-object-warning.patch + ]; + + sourceRoot = "."; + + cmakeDir = "../igc"; + + postUnpack = '' + chmod -R +w . + mv opencl-clang llvm-spirv llvm-project/llvm/projects/ + ''; + + postPatch = '' + substituteInPlace igc/IGC/AdaptorOCL/igc-opencl.pc.in \ + --replace-fail '/@CMAKE_INSTALL_INCLUDEDIR@' "/include" \ + --replace-fail '/@CMAKE_INSTALL_LIBDIR@' "/lib" + + chmod +x igc/IGC/Scripts/igc_create_linker_script.sh + patchShebangs --build igc/IGC/Scripts/igc_create_linker_script.sh + + # The build system only applies patches when the sources are in a + # Git repository. + git -C llvm-project init + git -C llvm-project -c user.name=nixbld -c user.email= commit --allow-empty -m stub + substituteInPlace llvm-project/llvm/projects/opencl-clang/cmake/modules/CMakeFunctions.cmake \ + --replace-fail 'COMMAND ''${GIT_EXECUTABLE} am --3way --keep-non-patch --ignore-whitespace -C0 ' \ + 'COMMAND patch -p1 --ignore-whitespace -i ' + + # match default LLVM version with our provided version to apply correct patches + substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \ + --replace-fail "16.0.6" "${llvmVersion}" + ''; + + nativeBuildInputs = [ + bison + cmake + flex + git + ninja + (python3.withPackages ( + ps: with ps; [ + mako + pyyaml + ] + )) + zlib + ]; + + buildInputs = [ + spirv-headers + spirv-tools + ]; + + strictDeps = true; + + # testing is done via intel-compute-runtime + doCheck = false; + + cmakeFlags = [ + "-DIGC_OPTION__SPIRV_TOOLS_MODE=Prebuilds" + "-DIGC_OPTION__USE_PREINSTALLED_SPIRV_HEADERS=ON" + "-DSPIRV-Headers_INCLUDE_DIR=${spirv-headers}/include" + "-DLLVM_EXTERNAL_SPIRV_HEADERS_SOURCE_DIR=${spirv-headers.src}" + "-Wno-dev" + ]; + + passthru.tests = { + inherit intel-compute-runtime; + }; + + meta = { + description = "LLVM-based compiler for OpenCL targeting Intel Gen graphics hardware"; + homepage = "https://github.com/intel/intel-graphics-compiler"; + changelog = "https://github.com/intel/intel-graphics-compiler/releases/tag/v${version}"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ fleaz ]; + }; +} diff --git a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix index 424f8fe55c47..b91c58a244d3 100644 --- a/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime-legacy1/package.nix @@ -1,11 +1,11 @@ { lib, + callPackage, stdenv, fetchFromGitHub, cmake, pkg-config, intel-gmmlib, - intel-graphics-compiler, level-zero, libva, gitUpdater, @@ -13,6 +13,8 @@ let inherit (lib) cmakeBool; + # intel-graphics-compiler >= 2.36 does no longer support 8th Gen + intel-graphics-compiler = callPackage ./intel-graphics-compiler.nix { }; in stdenv.mkDerivation (finalAttrs: { # https://github.com/intel/compute-runtime/blob/master/LEGACY_PLATFORMS.md diff --git a/pkgs/by-name/in/intel-compute-runtime/package.nix b/pkgs/by-name/in/intel-compute-runtime/package.nix index b03153c084db..1e5ffa895573 100644 --- a/pkgs/by-name/in/intel-compute-runtime/package.nix +++ b/pkgs/by-name/in/intel-compute-runtime/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "intel-compute-runtime"; - version = "26.18.38308.1"; + version = "26.22.38646.4"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; tag = finalAttrs.version; - hash = "sha256-539TqwzPhclEpyxrwRB0DBLCAgM8JojdshvhNp0jeKU="; + hash = "sha256-YjCRbYsq44U+pwdTnyA5lffJtSHVK2u3R2XRRNb6l9c="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-graphics-compiler/package.nix b/pkgs/by-name/in/intel-graphics-compiler/package.nix index 3c0a5c6c5eaf..fe31d82c1233 100644 --- a/pkgs/by-name/in/intel-graphics-compiler/package.nix +++ b/pkgs/by-name/in/intel-graphics-compiler/package.nix @@ -11,15 +11,28 @@ intel-compute-runtime, python3, spirv-tools, - spirv-headers, }: let - llvmVersion = "16.0.6"; + llvmVersion = "17.0.6"; + + spirv-headers = stdenv.mkDerivation { + pname = "spirv-headers"; + version = "1.4.341.0-unstable-2026-04-29"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "SPIRV-Headers"; + rev = "948a3b0997e2dffea5484b3df7bd5590c5b844cc"; + hash = "sha256-goQTZ4vR4R+bp3mcco10y4grB97aB7QJauO9ZaHJbU8="; + }; + + nativeBuildInputs = [ cmake ]; + }; in stdenv.mkDerivation rec { pname = "intel-graphics-compiler"; - version = "2.34.4"; + version = "2.38.2"; # See the repository for expected versions: # @@ -29,14 +42,14 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "intel-graphics-compiler"; tag = "v${version}"; - hash = "sha256-w20nrn3wo9Dvv3BILYBzuJTTLXqcWaRAF7SiPtryhwk="; + hash = "sha256-xLRQzXUSqRVAN0flRlcrsSFZTLFxmQi6ePbm5ks6vhI="; }) (fetchFromGitHub { name = "llvm-project"; owner = "llvm"; repo = "llvm-project"; tag = "llvmorg-${llvmVersion}"; - hash = "sha256-fspqSReX+VD+Nl/Cfq+tDcdPtnQPV1IRopNDfd5VtUs="; + hash = "sha256-8MEDLLhocshmxoEBRSKlJ/GzJ8nfuzQ8qn0X/vLA+ag="; }) (fetchFromGitHub { name = "vc-intrinsics"; @@ -49,24 +62,19 @@ stdenv.mkDerivation rec { name = "opencl-clang"; owner = "intel"; repo = "opencl-clang"; - tag = "v16.0.11"; - hash = "sha256-ema1jTNMHs3pUituVb1NPllc6cA8eYJHtDOjuEzIDWM="; + tag = "v17.0.7"; + hash = "sha256-7kQlH1Y4pnNvj/CS2qAVbYUl9FQWBuMew7i8CpORfKE="; }) (fetchFromGitHub { name = "llvm-spirv"; owner = "KhronosGroup"; repo = "SPIRV-LLVM-Translator"; - tag = "v16.0.24"; - hash = "sha256-aTcwfQt2WdOA44jfHdD7x7oxt8emSDexgZnI7MPVqvU="; + tag = "v17.0.25"; + hash = "sha256-WzazByTj9Pnk9ix6cyCtxT8aSh9kg0lK3geiokCqO8I="; }) ]; patches = [ - # Raise minimum CMake version to 3.5 - # https://github.com/intel/intel-graphics-compiler/commit/4f0123a7d67fb716b647f0ba5c1ab550abf2f97d - # https://github.com/intel/intel-graphics-compiler/pull/364 - ./bump-cmake.patch - # Fix for GCC 15 by adding a previously-implicit `#include ` and # replacing `` with `` in the the llvm directory. Based # on https://github.com/intel/intel-graphics-compiler/pull/383. @@ -105,7 +113,7 @@ stdenv.mkDerivation rec { # match default LLVM version with our provided version to apply correct patches substituteInPlace igc/external/llvm/llvm_preferred_version.cmake \ - --replace-fail "16.0.6" "${llvmVersion}" + --replace-fail "17.0.6" "${llvmVersion}" ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/in/intel-llvm/package.nix b/pkgs/by-name/in/intel-llvm/package.nix index 04fba865125a..ff0f492f2e29 100644 --- a/pkgs/by-name/in/intel-llvm/package.nix +++ b/pkgs/by-name/in/intel-llvm/package.nix @@ -111,7 +111,20 @@ let mkdir "$rsrc" echo "-resource-dir=$rsrc" >> $out/nix-support/cc-cflags ln -s "${lib.getLib self.unwrapped}/lib/clang/${self.llvmMajorVersion}/include" "$rsrc" - ''; + '' + + (lib.concatStrings ( + lib.mapAttrsToList (k: v: '' + echo "export ${k}=${v}" >> $out/nix-support/setup-hook + '') self.unwrapped.unified-runtime.setupVars + )) + + + (lib.optionalString (self.unwrapped.unified-runtime.setupVars ? CUDA_PATH) '' + # SYCL CUDA runtime libs (e.g. libonemath_blas_cublas.so) carry DT_NEEDED: libcuda.so.1. + # GNU ld resolves transitive DT_NEEDED via -rpath-link, not -L; point it at the stubs. + echo "-rpath-link,${self.unwrapped.unified-runtime.setupVars.CUDA_PATH}/lib/stubs" >> $out/nix-support/cc-ldflags + # The SYCL CUDA backend discovers libdevice by finding ptxas in PATH. + echo "export PATH=${self.unwrapped.unified-runtime.setupVars.CUDA_PATH}/bin''${PATH:+:$PATH}" >> $out/nix-support/setup-hook + ''); extraPackages = # We need to explicitly link to the dev package to get headers like sycl.hpp diff --git a/pkgs/by-name/in/intel-llvm/unified-runtime.nix b/pkgs/by-name/in/intel-llvm/unified-runtime.nix index 78d673ca8094..1bd3cf296469 100644 --- a/pkgs/by-name/in/intel-llvm/unified-runtime.nix +++ b/pkgs/by-name/in/intel-llvm/unified-runtime.nix @@ -18,6 +18,7 @@ pkg-config, lit, filecheck, + buildPackages, rocmPackages ? { }, rocmGpuTargets ? lib.optionalString (rocmPackages ? clr.gpuTargets) ( builtins.concatStringsSep ";" rocmPackages.clr.gpuTargets @@ -41,10 +42,22 @@ let ]; }; + # Minimal rocm join required at runtime + # We pass this to clang in its wrapper later. + # This is a separate join from the above because we don't + # need to pull in hsakmt and comgr at runtime, only build time. + rocmPath = symlinkJoin { + name = "rocm-path"; + paths = with rocmPackages; [ + clr + rocm-device-libs + ]; + }; + cudatoolkit_joined = symlinkJoin { name = "cuda-merged"; - paths = with cudaPackages; [ + paths = with buildPackages.cudaPackages; [ cuda_cudart cuda_nvcc cuda_nvml_dev.include @@ -158,6 +171,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeFeature "CUDA_cupti_LIBRARY" "${cudatoolkit_joined}/lib/libcupti.so") ]; + passthru.setupVars = + lib.optionalAttrs rocmSupport { ROCM_PATH = rocmPath; } + // lib.optionalAttrs cudaSupport { CUDA_PATH = cudatoolkit_joined; }; + passthru.backends = lib.optionals levelZeroSupport [ "level_zero" diff --git a/pkgs/by-name/in/intelli-shell/package.nix b/pkgs/by-name/in/intelli-shell/package.nix index cac4d1afcccf..c968ffc4f5e3 100644 --- a/pkgs/by-name/in/intelli-shell/package.nix +++ b/pkgs/by-name/in/intelli-shell/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "intelli-shell"; - version = "3.4.3"; + version = "3.4.5"; src = fetchFromGitHub { owner = "lasantosr"; repo = "intelli-shell"; rev = "v${finalAttrs.version}"; - hash = "sha256-oE/o+8+nLO1cW3P/AeVtNOjZgQNl1ze/LCHe7Gx9UEU="; + hash = "sha256-jC5hvyefEEU8odiPaUWtWm8o2oHyS7ZOw4nJdvylb0U="; }; - cargoHash = "sha256-qK8HioGJfLARjo/fhe3ZOqNeqneGqnlg7I3+7fkMm5I="; + cargoHash = "sha256-g/sJJiwUl+N4ryFXhrbSIaOl0zzXKbehGyxTNamtua8="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/in/inter/package.nix b/pkgs/by-name/in/inter/package.nix index afe7ecea9380..1378a93ff670 100644 --- a/pkgs/by-name/in/inter/package.nix +++ b/pkgs/by-name/in/inter/package.nix @@ -2,8 +2,8 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: - stdenvNoCC.mkDerivation rec { pname = "inter"; version = "4.1"; @@ -14,15 +14,13 @@ stdenvNoCC.mkDerivation rec { hash = "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/truetype - cp Inter.ttc InterVariable*.ttf $out/share/fonts/truetype - - runHook postInstall + nativeBuildInputs = [ installFonts ]; + postPatch = '' + rm extras/ -rf ''; + dontInstallWebfonts = true; + meta = { homepage = "https://rsms.me/inter/"; description = "Typeface specially designed for user interfaces"; diff --git a/pkgs/by-name/in/internalallthethings/package.nix b/pkgs/by-name/in/internalallthethings/package.nix index 2a0ea15a2d81..8bac7efd957b 100644 --- a/pkgs/by-name/in/internalallthethings/package.nix +++ b/pkgs/by-name/in/internalallthethings/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/swisskyrepo/InternalAllTheThings"; description = "Active Directory and Internal Pentest Cheatsheets"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ felbinger ]; platforms = mkdocs.meta.platforms; sourceProvenance = with lib.sourceTypes; [ fromSource ]; diff --git a/pkgs/by-name/in/intersphinx-registry/package.nix b/pkgs/by-name/in/intersphinx-registry/package.nix new file mode 100644 index 000000000000..df03d3e74c17 --- /dev/null +++ b/pkgs/by-name/in/intersphinx-registry/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.intersphinx-registry diff --git a/pkgs/by-name/in/interval-tree/package.nix b/pkgs/by-name/in/interval-tree/package.nix new file mode 100644 index 000000000000..f43b8f9dc640 --- /dev/null +++ b/pkgs/by-name/in/interval-tree/package.nix @@ -0,0 +1,43 @@ +{ + stdenv, + lib, + fetchFromGitHub, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "interval-tree"; + version = "3.1.2"; + + src = fetchFromGitHub { + owner = "5cript"; + repo = "interval-tree"; + tag = "v${finalAttrs.version}"; + hash = "sha256-t1/oTr+sYkpTiDzaM4SxUcWzO3r24EkUJO04TYNLcQQ="; + }; + + # interval-tree is a header only library + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/ + cp -r $src/include/ $out/ + + runHook postInstall + ''; + + __structuredAttrs = true; + strictDeps = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "C++ header only interval tree implementation"; + maintainers = with lib.maintainers; [ aiyion ]; + homepage = "https://github.com/5cript/interval-tree"; + license = lib.licenses.cc0; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/in/intiface-central/package.nix b/pkgs/by-name/in/intiface-central/package.nix index 34b2c6e0a62d..7a4fd3bc653e 100644 --- a/pkgs/by-name/in/intiface-central/package.nix +++ b/pkgs/by-name/in/intiface-central/package.nix @@ -146,9 +146,8 @@ flutter338.buildFlutterApplication { ln -s ${buttplug} ../buttplug ''; - # without this, only the splash screen will be shown and the logs will contain the - # line `Failed to load dynamic library 'lib/libintiface_engine_flutter_bridge.so'` - extraWrapProgramArgs = "--chdir $out/app/intiface-central"; + # without this, only the splash screen will be shown + extraWrapProgramArgs = "--set FRB_DART_LOAD_EXTERNAL_LIBRARY_NATIVE_LIB_DIR $out/app/intiface-central/lib"; postInstall = '' install -Dm644 $out/app/intiface-central/data/flutter_assets/assets/icons/intiface_central_icon.png $out/share/icons/hicolor/512x512/apps/intiface-central.png diff --git a/pkgs/by-name/in/intune-portal/package.nix b/pkgs/by-name/in/intune-portal/package.nix index 494d1ff1e5ac..84a199a842e3 100644 --- a/pkgs/by-name/in/intune-portal/package.nix +++ b/pkgs/by-name/in/intune-portal/package.nix @@ -29,11 +29,11 @@ let in stdenv.mkDerivation rec { pname = "intune-portal"; - version = "1.2604.19-noble"; + version = "1.2605.16-noble"; src = fetchurl { url = "https://packages.microsoft.com/ubuntu/24.04/prod/pool/main/i/intune-portal/intune-portal_${version}_amd64.deb"; - hash = "sha256-gUeqU5FGJNddWL4DqN5ttVaeap7Y3rPL9E6AT7G0L4A="; + hash = "sha256-lPwOwxtsI40jeiLNKvWEz858QMOwGfxvhi7nFiidgLE="; }; nativeBuildInputs = [ dpkg ]; diff --git a/pkgs/by-name/in/inventree/package.nix b/pkgs/by-name/in/inventree/package.nix index b40201deee1e..fc63844cbdf9 100644 --- a/pkgs/by-name/in/inventree/package.nix +++ b/pkgs/by-name/in/inventree/package.nix @@ -14,12 +14,12 @@ }: let - version = "1.3.3"; + version = "1.3.5"; src = fetchFromGitHub { owner = "inventree"; repo = "inventree"; tag = "${version}"; - hash = "sha256-Xh3YcVz5OLQ596uWUEac87CKi62xgr63dYiYb6U6qXQ="; + hash = "sha256-SxJc09zy7aKW+PVl4My3jzwsktkbsvNnyXMTMs/NzUA="; postCheckout = '' git -C $out rev-parse HEAD > $out/commit_hash.txt git -C $out show -s --format=%cd --date=short HEAD > $out/commit_date.txt diff --git a/pkgs/by-name/in/invidious-router/package.nix b/pkgs/by-name/in/invidious-router/package.nix index 970efb5a1724..3aba1da93f59 100644 --- a/pkgs/by-name/in/invidious-router/package.nix +++ b/pkgs/by-name/in/invidious-router/package.nix @@ -27,7 +27,7 @@ buildGoModule { meta = { homepage = "https://gitlab.com/gaincoder/invidious-router"; description = "Go application that routes requests to different Invidious instances based on their health status and (optional) response time"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ sils ]; mainProgram = "invidious-router"; }; diff --git a/pkgs/by-name/in/invidious/package.nix b/pkgs/by-name/in/invidious/package.nix index e32b5816a5e9..57d6250fee35 100644 --- a/pkgs/by-name/in/invidious/package.nix +++ b/pkgs/by-name/in/invidious/package.nix @@ -3,6 +3,7 @@ callPackage, crystal, fetchFromGitHub, + fetchpatch2, librsvg, pkg-config, libxml2, @@ -31,6 +32,7 @@ in crystal.buildCrystalPackage rec { pname = "invidious"; inherit (versions.invidious) version; + __structuredAttrs = true; src = fetchFromGitHub { owner = "iv-org"; @@ -40,6 +42,15 @@ crystal.buildCrystalPackage rec { inherit (versions.invidious) hash; }; + patches = [ + # Remove with the first release containing this commit. + (fetchpatch2 { + name = "CVE-2026-58447.patch"; + url = "https://github.com/iv-org/invidious/commit/77ad41678b45c4f6815940123f1796fc51259f45.patch?full_index=1"; + hash = "sha256-0pf6eu0ckQ2gYHLr2tEDy+1dvAhVjepG26kuxuHbZl8="; + }) + ]; + postPatch = let # Replacing by the value (templates) of the variables ensures that building diff --git a/pkgs/by-name/in/invidious/update.sh b/pkgs/by-name/in/invidious/update.sh index a23cc7de0cfe..a61a48286c7d 100755 --- a/pkgs/by-name/in/invidious/update.sh +++ b/pkgs/by-name/in/invidious/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nix-prefetch pkg-config pcre gnugrep +#!nix-shell -i bash -p curl crystal crystal2nix jq git moreutils nix nurl pkg-config pcre gnugrep git_url='https://github.com/iv-org/invidious.git' git_branch='master' git_dir='/var/tmp/invidious.git' @@ -51,7 +51,7 @@ json_set '.invidious.date' "$date" json_set '.invidious.commit' "$commit" json_set '.invidious.version' "$new_version" -new_hash=$(nix-prefetch -I 'nixpkgs=../../../..' "$pkg") +new_hash=$(nurl --submodules --hash "$git_url" "$new_tag") json_set '.invidious.hash' "$new_hash" # fetch video.js dependencies diff --git a/pkgs/by-name/in/invidious/versions.json b/pkgs/by-name/in/invidious/versions.json index cf592f33e7b1..74b6e3663d93 100644 --- a/pkgs/by-name/in/invidious/versions.json +++ b/pkgs/by-name/in/invidious/versions.json @@ -1,11 +1,11 @@ { "invidious": { - "hash": "sha256-tACx4+HqouftDalZlrurS75gYvS02qnmxQoL91YfTjg=", - "version": "2.20260207.0", - "date": "2026.02.07", - "commit": "118d6356" + "hash": "sha256-xJZjEnSeMnDo37ohtSAI2ucaPPv+nBYdrslHUCL/Pd8=", + "version": "2.20260626.0", + "date": "2026.06.27", + "commit": "ad0bd928" }, "videojs": { "hash": "sha256-jED3zsDkPN8i6GhBBJwnsHujbuwlHdsVpVqa1/pzSH4=" } -} \ No newline at end of file +} diff --git a/pkgs/by-name/in/inxi/package.nix b/pkgs/by-name/in/inxi/package.nix index 165ef9de3787..5ac6b51c1ede 100644 --- a/pkgs/by-name/in/inxi/package.nix +++ b/pkgs/by-name/in/inxi/package.nix @@ -64,13 +64,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "inxi"; - version = "3.3.40-1"; + version = "3.3.41-1"; src = fetchFromCodeberg { owner = "smxi"; repo = "inxi"; tag = finalAttrs.version; - hash = "sha256-GpXfLLJhM4L9TB8Qw38uaCCwtCmBYg9nrVC001kDckc="; + hash = "sha256-JIBBYLpWKawmAEOVr7YoC6oBQdtlYuQcLFlt/ltswpc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/io/io/package.nix b/pkgs/by-name/io/io/package.nix index 8155d0e95f6c..b5b50d51b8e9 100644 --- a/pkgs/by-name/io/io/package.nix +++ b/pkgs/by-name/io/io/package.nix @@ -21,7 +21,6 @@ libxml2, libglut, libsamplerate, - pcre, libevent, libedit, yajl, @@ -39,7 +38,7 @@ stdenv.mkDerivation { version = "2019.05.22-alpha"; src = fetchFromGitHub { - owner = "stevedekorte"; + owner = "IoLanguage"; repo = "io"; tag = "2019.05.22-alpha"; fetchSubmodules = true; @@ -81,7 +80,6 @@ stdenv.mkDerivation { libxml2 libglut libsamplerate - pcre libevent libedit yajl diff --git a/pkgs/by-name/io/ioc-scan/package.nix b/pkgs/by-name/io/ioc-scan/package.nix index 49efb35b8aad..f05ef0c01569 100644 --- a/pkgs/by-name/io/ioc-scan/package.nix +++ b/pkgs/by-name/io/ioc-scan/package.nix @@ -32,7 +32,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { description = "Tool to search a filesystem for indicators of compromise (IoC)"; homepage = "https://github.com/cisagov/ioc-scanner"; changelog = "https://github.com/cisagov/ioc-scanner/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/io/ioping/package.nix b/pkgs/by-name/io/ioping/package.nix index 125a3ab42eb2..7f2a08763bab 100644 --- a/pkgs/by-name/io/ioping/package.nix +++ b/pkgs/by-name/io/ioping/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + pkgsCross, }: stdenv.mkDerivation (finalAttrs: { @@ -15,13 +16,20 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-9lJEjns8ttjgI52ZXeWgL77GMd7o7IvefBJ5UH9y9ks="; }; - makeFlags = [ "PREFIX=$(out)" ]; + makeFlags = [ + "PREFIX=$(out)" + "CC:=$(CC)" + ]; outputs = [ "out" "man" ]; + passthru.tests = { + aarch64-cross = pkgsCross.aarch64-multiplatform.ioping; + }; + meta = { description = "Disk I/O latency measuring tool"; maintainers = with lib.maintainers; [ raskin ]; diff --git a/pkgs/by-name/io/ioquake3/package.nix b/pkgs/by-name/io/ioquake3/package.nix index 59fcc1e7a882..d10726ced535 100644 --- a/pkgs/by-name/io/ioquake3/package.nix +++ b/pkgs/by-name/io/ioquake3/package.nix @@ -20,6 +20,7 @@ mumble, unstableGitUpdater, bc, + buildPackages, }: stdenv.mkDerivation (finalAttrs: { @@ -33,6 +34,11 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-OszPRlS5NTvajDZhtGw2wa275O8YodkIgiBz3POouYs="; }; + makeFlags = [ + "ARCH=${stdenv.hostPlatform.parsed.cpu.name}" + "NO_STRIP=1" + ]; + nativeBuildInputs = [ copyDesktopItems makeBinaryWrapper @@ -55,6 +61,8 @@ stdenv.mkDerivation (finalAttrs: { mumble ]; + depsBuildBuild = [ buildPackages.stdenv.cc ]; + enableParallelBuilding = true; preConfigure = '' diff --git a/pkgs/by-name/io/iosevka/package.nix b/pkgs/by-name/io/iosevka/package.nix index 0c117faed086..326dc45ad92a 100644 --- a/pkgs/by-name/io/iosevka/package.nix +++ b/pkgs/by-name/io/iosevka/package.nix @@ -6,6 +6,7 @@ cctools, go-toml, ttfautohint-nox, + nodejs_latest, # Custom font set options. # See https://typeof.net/Iosevka/customizer # Can be a raw TOML string, or a Nix attrset. @@ -58,16 +59,17 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "34.4.0"; + version = "34.7.0"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; tag = "v${version}"; - hash = "sha256-eOh1jdrgaMYhqxP+QSCBxqhkJUGYrWLTkYwGmKSNrRA="; + hash = "sha256-OwCtp/WufMCzuaPTDCr2siorUC52zgM2e80DyshzsZw="; }; - npmDepsHash = "sha256-9v4PKlS8FNuhnhdJmu3J1Bl+uSPS4KqE3PBrOhf9jQw="; + npmDepsHash = "sha256-tlBxO9K0itXO6Mac4jcygZ6+9kj1gTdmu+rtbL2qdcE="; + nodejs = nodejs_latest; nativeBuildInputs = [ go-toml diff --git a/pkgs/by-name/io/iozone/package.nix b/pkgs/by-name/io/iozone/package.nix index d0a31d286279..3285519e5a18 100644 --- a/pkgs/by-name/io/iozone/package.nix +++ b/pkgs/by-name/io/iozone/package.nix @@ -69,7 +69,6 @@ stdenv.mkDerivation rec { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-linux" ]; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ip/ip2location-c/package.nix b/pkgs/by-name/ip/ip2location-c/package.nix index 7207f8629b7d..34c67fd3d49a 100644 --- a/pkgs/by-name/ip/ip2location-c/package.nix +++ b/pkgs/by-name/ip/ip2location-c/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { version = "8.7.0"; src = fetchFromGitHub { - owner = "chrislim2888"; + owner = "ip2location"; repo = "IP2Location-C-Library"; rev = finalAttrs.version; sha256 = "sha256-kp0tNZPP9u2xxFOmBAdivsVLtyF66o38H6eRrs2/S/Y="; diff --git a/pkgs/by-name/ip/ip2unix/package.nix b/pkgs/by-name/ip/ip2unix/package.nix index 78f9d591a9eb..5476d8ad43e7 100644 --- a/pkgs/by-name/ip/ip2unix/package.nix +++ b/pkgs/by-name/ip/ip2unix/package.nix @@ -2,13 +2,12 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, meson, ninja, pkg-config, yaml-cpp, systemd, - python3Packages, + python313Packages, asciidoc, libxslt, docbook_xml_dtd_45, @@ -39,8 +38,8 @@ stdenv.mkDerivation (finalAttrs: { docbook_xsl libxml2.bin docbook5 - python3Packages.pytest - python3Packages.pytest-timeout + python313Packages.pytest + python313Packages.pytest-timeout systemd ] ++ lib.optionals (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) [ mesonEmulatorHook ]; diff --git a/pkgs/by-name/ip/ipatool/package.nix b/pkgs/by-name/ip/ipatool/package.nix index ba8eaab711c1..7ea5aa5d8e93 100644 --- a/pkgs/by-name/ip/ipatool/package.nix +++ b/pkgs/by-name/ip/ipatool/package.nix @@ -5,20 +5,27 @@ nix-update-script, testers, ipatool, + writableTmpDirAsHomeHook, }: buildGoModule (finalAttrs: { pname = "ipatool"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "majd"; repo = "ipatool"; rev = "v${finalAttrs.version}"; - hash = "sha256-ME3fvYziI3fjlQ0KBPMJJXsCG3hW0z2iz1gKoBh0grk="; + hash = "sha256-ZGy7Oxpjb5ONe//ImAN3bQwl+G9udvaf9V7heLq625c="; }; - vendorHash = "sha256-TmP7NjDrxTcsnVU9Hi4S1wXSzQNCJOVH02j5QpjvMgw="; + vendorHash = "sha256-PZDlJIIW+teFu6XuaTLB5eHHSeVJMUVAuq/StvyIVlc="; + + # Fixes "import lookup disabled by -mod=vendor" for onepassword-sdk-go on macOS + proxyVendor = true; + + # Fixes "unable to open output file '/homeless-shelter/.cache/clang/ModuleCache/" on macOS + nativeBuildInputs = [ writableTmpDirAsHomeHook ]; ldflags = [ "-s" diff --git a/pkgs/tools/networking/iperf/2.nix b/pkgs/by-name/ip/iperf2/package.nix similarity index 78% rename from pkgs/tools/networking/iperf/2.nix rename to pkgs/by-name/ip/iperf2/package.nix index adf7d57d5249..c82b1c3d3b20 100644 --- a/pkgs/tools/networking/iperf/2.nix +++ b/pkgs/by-name/ip/iperf2/package.nix @@ -2,12 +2,16 @@ lib, stdenv, fetchurl, + pkgsCross, }: stdenv.mkDerivation (finalAttrs: { pname = "iperf"; version = "2.2.1"; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { url = "mirror://sourceforge/iperf2/files/iperf-${finalAttrs.version}.tar.gz"; hash = "sha256-dUqwp+KAM9vqgTCO9CS8ffTW4v4xtgzFNrYbUf772Ps="; @@ -15,16 +19,23 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-fastsampling" ]; + makeFlags = [ "AR:=$(AR)" ]; + postInstall = '' mv $out/bin/iperf $out/bin/iperf2 ln -s $out/bin/iperf2 $out/bin/iperf ''; + passthru.tests = { + cross-aarch64 = pkgsCross.aarch64-multiplatform.iperf2; + }; + meta = { homepage = "https://sourceforge.net/projects/iperf/"; description = "Tool to measure IP bandwidth using UDP or TCP"; platforms = lib.platforms.unix; license = lib.licenses.mit; + mainProgram = "iperf2"; maintainers = with lib.maintainers; [ randomizedcoder ]; # prioritize iperf3 diff --git a/pkgs/tools/networking/iperf/3.nix b/pkgs/by-name/ip/iperf3/package.nix similarity index 81% rename from pkgs/tools/networking/iperf/3.nix rename to pkgs/by-name/ip/iperf3/package.nix index a88acec2192f..eabc0312af4c 100644 --- a/pkgs/tools/networking/iperf/3.nix +++ b/pkgs/by-name/ip/iperf3/package.nix @@ -7,12 +7,15 @@ lksctp-tools, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "iperf"; version = "3.21"; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { - url = "https://downloads.es.net/pub/iperf/iperf-${version}.tar.gz"; + url = "https://downloads.es.net/pub/iperf/iperf-${finalAttrs.version}.tar.gz"; hash = "sha256-ZW5EBevWIBId587KPq9DqI956huFfQQaagsTFIAazdg="; }; @@ -30,7 +33,7 @@ stdenv.mkDerivation rec { (fetchpatch { url = "https://git.alpinelinux.org/aports/plain/main/iperf3/remove-pg-flags.patch?id=7f979fc51ae31d5c695d8481ba84a4afc5080efb"; name = "remove-pg-flags.patch"; - sha256 = "0z3zsmf7ln08rg1mmzl8s8jm5gp8x62f5cxiqcmi8dcs2nsxwgbi"; + hash = "sha256-cT3etRWaNRQrw7Gz4oTp6L5SJdKI/lrDywhYelzVf3w="; }) ]; @@ -47,4 +50,4 @@ stdenv.mkDerivation rec { mainProgram = "iperf3"; maintainers = with lib.maintainers; [ fpletz ]; }; -} +}) diff --git a/pkgs/by-name/ip/ipinfo/package.nix b/pkgs/by-name/ip/ipinfo/package.nix index 037732247e4b..9e21184c787b 100644 --- a/pkgs/by-name/ip/ipinfo/package.nix +++ b/pkgs/by-name/ip/ipinfo/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "ipinfo"; - version = "3.3.1"; + version = "3.3.2"; src = fetchFromGitHub { owner = "ipinfo"; repo = "cli"; tag = "${pname}-${version}"; - hash = "sha256-sdQdCP2NotrdeqYrSd9c6sExFeuX54I4fxJfEyULPuk="; + hash = "sha256-/0n6DhJlRvTpS7ed0IM9mcKTLuXPx9Y4TMM4xjijKck="; }; vendorHash = null; @@ -24,7 +24,7 @@ buildGoModule rec { description = "Command Line Interface for the IPinfo API"; homepage = "https://github.com/ipinfo/cli"; changelog = "https://github.com/ipinfo/cli/releases/tag/ipinfo-${version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ip/ipp-usb/package.nix b/pkgs/by-name/ip/ipp-usb/package.nix index ceb73e3fe488..7766f93b23b5 100644 --- a/pkgs/by-name/ip/ipp-usb/package.nix +++ b/pkgs/by-name/ip/ipp-usb/package.nix @@ -9,13 +9,13 @@ }: buildGoModule (finalAttrs: { pname = "ipp-usb"; - version = "0.9.33"; + version = "0.9.34"; src = fetchFromGitHub { owner = "openprinting"; repo = "ipp-usb"; rev = finalAttrs.version; - sha256 = "sha256-G8eCRzfwF7fFROFgDPuiSVH2NAvKefGJfzLU6yW23z4="; + sha256 = "sha256-4xZf8Q1MfQcB13vHRdb8dQyZWrwnJzubdi+zln1lRc8="; }; postPatch = '' diff --git a/pkgs/by-name/ip/iproute2/package.nix b/pkgs/by-name/ip/iproute2/package.nix index 9417763e3177..2ad8fa7c8a26 100644 --- a/pkgs/by-name/ip/iproute2/package.nix +++ b/pkgs/by-name/ip/iproute2/package.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "7.0.0"; + version = "7.1.0"; src = fetchurl { - url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - hash = "sha256-5iiQ97XeY8BaO/Mx3I3rTAFcM2AT80Gk7fRpaXl/L04="; + url = "mirror://kernel/linux/utils/net/iproute2/iproute2-${version}.tar.xz"; + hash = "sha256-/Z+huVgJQXFXyoPdcpV+MmG9vOiWNTy5NvgK8LM6S1w="; }; postPatch = '' diff --git a/pkgs/by-name/ip/ipxe/package.nix b/pkgs/by-name/ip/ipxe/package.nix index 2b1b5de07650..c5ba8007293c 100644 --- a/pkgs/by-name/ip/ipxe/package.nix +++ b/pkgs/by-name/ip/ipxe/package.nix @@ -2,6 +2,7 @@ stdenv, lib, fetchFromGitHub, + fetchpatch, nix-update-script, buildPackages, mtools, @@ -105,6 +106,31 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-O7jUpnP+wa9zBIEqYa7FQ9Zo1Ii1oVH10nlk+c4iHwg="; }; + patches = [ + # GCC 16 gains stronger analysis for unused variables and emits a warning + # (made fatal by -Werror), so the usage of this variable is made + # unconditional. + (fetchpatch { + name = "w89c840-unused-variable.patch"; + url = "https://github.com/ipxe/ipxe/commit/2d28657ef63217b9a1774605267d84f89d751441.patch"; + hash = "sha256-p1r1iDOJbss458LlmfpuIkk+6VqthDl0mcK/EfcCqS4="; + }) + + # GCC 16 adds a warning (made fatal by -Werror) for attributes that do not + # apply. Since the regparm attribute only applies for i386, it is dropped + # for x86_64. + (fetchpatch { + name = "x86_64-drop-regparm-attribute.patch"; + url = "https://github.com/ipxe/ipxe/commit/c18d0a23b634ae001ea877020c0236bfca1468e5.patch"; + hash = "sha256-spEIdyw30zYiYmhnvYQEVUrr/uMnFqJO/yLWnPb+QMc="; + }) + (fetchpatch { + name = "librm-regparm-attribute-only-for-i386.patch"; + url = "https://github.com/ipxe/ipxe/commit/be35d67a029485f461ce83cbeda15056a52cb069.patch"; + hash = "sha256-ki6gUPC6njGvu27RsD3f1L0m82NOKj9es0/o0jXCpqk="; + }) + ]; + enableParallelBuilding = true; strictDeps = true; diff --git a/pkgs/by-name/ir/ircdog/package.nix b/pkgs/by-name/ir/ircdog/package.nix index 77dcfbea94c4..e420e452b9ed 100644 --- a/pkgs/by-name/ir/ircdog/package.nix +++ b/pkgs/by-name/ir/ircdog/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.5.5"; src = fetchFromGitHub { - owner = "goshuirc"; + owner = "ergochat"; repo = "ircdog"; tag = "v${finalAttrs.version}"; hash = "sha256-maF53Z0FHAhGmnOnMsX0dDnmckPNBY4Bcm4OBM/x4hQ="; diff --git a/pkgs/by-name/ir/iredis/package.nix b/pkgs/by-name/ir/iredis/package.nix index a8fbb956c9ef..bef043b7dcbd 100644 --- a/pkgs/by-name/ir/iredis/package.nix +++ b/pkgs/by-name/ir/iredis/package.nix @@ -1,34 +1,34 @@ { lib, stdenv, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "iredis"; - version = "1.15.2"; + version = "1.16.1"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "laixintao"; repo = "iredis"; tag = "v${finalAttrs.version}"; - hash = "sha256-g/gQb9QOyfa7kyHCUZf/kLZRO5IE8389BUCYz8Sqr8o="; + hash = "sha256-m8XDNzHgMWBgcN3AyFlb8K/UNXbGhH4toKBiX5Q4/QY="; }; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace-fail 'packaging = "^23.0"' 'packaging = "*"' \ - --replace-fail 'wcwidth = "0.1.9"' 'wcwidth = "*"' \ - --replace-fail 'redis = "^5.0.0"' 'redis = "*"' - ''; + pythonRelaxDeps = [ + "packaging" + "redis" + ]; - nativeBuildInputs = with python3.pkgs; [ + build-system = with python3Packages; [ poetry-core ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ click configobj mistune @@ -37,10 +37,9 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pygments python-dateutil redis - wcwidth ]; - nativeCheckInputs = with python3.pkgs; [ + nativeCheckInputs = with python3Packages; [ freezegun pexpect pytestCheckHook @@ -65,6 +64,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "iredis" ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + doInstallCheck = true; + meta = { description = "Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; changelog = "https://github.com/laixintao/iredis/blob/${finalAttrs.src.tag}/CHANGELOG.md"; diff --git a/pkgs/by-name/ir/ironcalc/nodejs.nix b/pkgs/by-name/ir/ironcalc/nodejs.nix index 50cb077de5db..6082a1a13f9f 100644 --- a/pkgs/by-name/ir/ironcalc/nodejs.nix +++ b/pkgs/by-name/ir/ironcalc/nodejs.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { pnpmDeps = fetchPnpmDeps { inherit (ironcalc) src; pname = "ironcalc-nodejs"; - hash = "sha256-q0PTXKAX0mhrMKMnFzV65YU948lh+/rGn9ttWzBfdNc="; - fetcherVersion = 3; + hash = "sha256-WBISZTISqnti5MiI+/rECZw31YumSm7VPN+MYZNoS28="; + fetcherVersion = 4; preInstall = '' cd bindings/nodejs ''; diff --git a/pkgs/by-name/ir/irpf/package.nix b/pkgs/by-name/ir/irpf/package.nix index 39deddd2273a..a965cada07ee 100644 --- a/pkgs/by-name/ir/irpf/package.nix +++ b/pkgs/by-name/ir/irpf/package.nix @@ -17,7 +17,7 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "irpf"; - version = "2026-1.4"; + version = "2026-1.5"; # https://www.gov.br/receitafederal/pt-br/centrais-de-conteudo/download/pgd/dirpf # Para outros sistemas operacionais -> Multi @@ -27,7 +27,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { in fetchzip { url = "https://downloadirpf.receita.fazenda.gov.br/irpf/${year}/irpf/arquivos/IRPF${finalAttrs.version}.zip"; - hash = "sha256-tPIu1nt1FtGyjM1vnzAHenjlKeAKJfqPus+XsP2CH5g="; + hash = "sha256-/y0XE+i+Sug/2TfqQuPQesYaDVn41v3hkikU/hmxxNE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ir/iruby/Gemfile b/pkgs/by-name/ir/iruby/Gemfile index 3998b5c6e99a..4a466e235bbb 100644 --- a/pkgs/by-name/ir/iruby/Gemfile +++ b/pkgs/by-name/ir/iruby/Gemfile @@ -1,2 +1,2 @@ source 'https://rubygems.org' -gem 'iruby', "0.8.2" +gem 'iruby', "0.8.3" diff --git a/pkgs/by-name/ir/iruby/Gemfile.lock b/pkgs/by-name/ir/iruby/Gemfile.lock index 972a50ba6bf4..4c8a24f9b13d 100644 --- a/pkgs/by-name/ir/iruby/Gemfile.lock +++ b/pkgs/by-name/ir/iruby/Gemfile.lock @@ -1,35 +1,54 @@ GEM remote: https://rubygems.org/ specs: + cgi (0.5.2) data_uri (0.1.0) - ffi (1.15.5) + date (3.5.1) + erb (4.0.4.1) + cgi (>= 0.3.3) + ffi (1.17.4) ffi-rzmq (2.0.7) ffi-rzmq-core (>= 1.0.7) ffi-rzmq-core (1.0.7) ffi - io-console (0.6.0) - irb (1.7.4) - reline (>= 0.3.6) - iruby (0.8.2) + io-console (0.8.2) + irb (1.18.0) + pp (>= 0.6.0) + prism (>= 1.3.0) + rdoc (>= 4.0.0) + reline (>= 0.4.2) + iruby (0.8.3) data_uri (~> 0.1) ffi-rzmq irb logger mime-types (>= 3.3.1) - multi_json (~> 1.11) logger (1.7.0) - mime-types (3.5.1) - mime-types-data (~> 3.2015) - mime-types-data (3.2023.0808) - multi_json (1.15.0) - reline (0.3.8) + mime-types (3.7.0) + logger + mime-types-data (~> 3.2025, >= 3.2025.0507) + mime-types-data (3.2026.0414) + pp (0.6.4) + prettyprint + prettyprint (0.2.0) + prism (1.9.0) + psych (5.4.0) + date + stringio + rdoc (7.2.0) + erb + psych (>= 4.0.0) + tsort + reline (0.6.3) io-console (~> 0.5) + stringio (3.2.0) + tsort (0.2.0) PLATFORMS ruby DEPENDENCIES - iruby (= 0.8.2) + iruby (= 0.8.3) BUNDLED WITH - 2.6.9 + 2.3.9 diff --git a/pkgs/by-name/ir/iruby/gemset.nix b/pkgs/by-name/ir/iruby/gemset.nix index 0b875d6e8a6f..6bc68cee3f16 100644 --- a/pkgs/by-name/ir/iruby/gemset.nix +++ b/pkgs/by-name/ir/iruby/gemset.nix @@ -1,4 +1,14 @@ { + cgi = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1fzqwshg1xzbdm97havskfp6wifsgbjii00dzba0y6bih4lk1jk1"; + type = "gem"; + }; + version = "0.5.2"; + }; data_uri = { groups = [ "default" ]; platforms = [ ]; @@ -9,15 +19,36 @@ }; version = "0.1.0"; }; + date = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm"; + type = "gem"; + }; + version = "3.5.1"; + }; + erb = { + dependencies = [ "cgi" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "097f4xvjq5k0m0i9mjwpl8vmqrl1wpbllc624f6fqk5s484sgqj7"; + type = "gem"; + }; + version = "4.0.4.1"; + }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1862ydmclzy1a0cjbvm8dz7847d9rch495ib0zb64y84d3xd4bkg"; + sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw"; type = "gem"; }; - version = "1.15.5"; + version = "1.17.4"; }; ffi-rzmq = { dependencies = [ "ffi-rzmq-core" ]; @@ -46,21 +77,26 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dikardh14c72gd9ypwh8dim41wvqmzfzf35mincaj5yals9m7ff"; + sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn"; type = "gem"; }; - version = "0.6.0"; + version = "0.8.2"; }; irb = { - dependencies = [ "reline" ]; + dependencies = [ + "pp" + "prism" + "rdoc" + "reline" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "158ca10kj3qqnql5g8f1g2arsnhgdl79mg74manpf8ldkwjjn3n8"; + sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y"; type = "gem"; }; - version = "1.7.4"; + version = "1.18.0"; }; iruby = { dependencies = [ @@ -69,16 +105,15 @@ "irb" "logger" "mime-types" - "multi_json" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11lb7flkqpaff303g6lj9vzdw9zc0s2qmz36a6i4x4qj559bz30n"; + sha256 = "13qdw2ykzn6yjs4biiyvy1dr5j5v3kb1q7r98ds0kvg22rbs1s56"; type = "gem"; }; - version = "0.8.2"; + version = "0.8.3"; }; logger = { groups = [ "default" ]; @@ -91,35 +126,88 @@ version = "1.7.0"; }; mime-types = { - dependencies = [ "mime-types-data" ]; + dependencies = [ + "logger" + "mime-types-data" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q8d881k1b3rbsfcdi3fx0b5vpdr5wcrhn88r2d9j7zjdkxp5mw5"; + sha256 = "0mjyxl7c0xzyqdqa8r45hqg7jcw2prp3hkp39mdf223g4hfgdsyw"; type = "gem"; }; - version = "3.5.1"; + version = "3.7.0"; }; mime-types-data = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17zdim7kzrh5j8c97vjqp4xp78wbyz7smdp4hi5iyzk0s9imdn5a"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2023.0808"; + version = "3.2026.0414"; }; - multi_json = { + pp = { + dependencies = [ "prettyprint" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + sha256 = "0w5mha75hs8gdj75g8vl0sxpyp8rzvwq8a4jcmi4ah8cf370zjyz"; type = "gem"; }; - version = "1.15.0"; + version = "0.6.4"; + }; + prettyprint = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14zicq3plqi217w6xahv7b8f7aj5kpxv1j1w98344ix9h5ay3j9b"; + type = "gem"; + }; + version = "0.2.0"; + }; + prism = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv"; + type = "gem"; + }; + version = "1.9.0"; + }; + psych = { + dependencies = [ + "date" + "stringio" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql"; + type = "gem"; + }; + version = "5.4.0"; + }; + rdoc = { + dependencies = [ + "erb" + "psych" + "tsort" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46"; + type = "gem"; + }; + version = "7.2.0"; }; reline = { dependencies = [ "io-console" ]; @@ -127,9 +215,29 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lv1nv7z63n4qmsm3h5h273m7daxngkcq8ynkk9j8lmn7jji98lb"; + sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i"; type = "gem"; }; - version = "0.3.8"; + version = "0.6.3"; + }; + stringio = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63"; + type = "gem"; + }; + version = "3.2.0"; + }; + tsort = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17q8h020dw73wjmql50lqw5ddsngg67jfw8ncjv476l5ys9sfl4n"; + type = "gem"; + }; + version = "0.2.0"; }; } diff --git a/pkgs/by-name/ir/iruby/package.nix b/pkgs/by-name/ir/iruby/package.nix index 9054540ab378..b69da51d9eb8 100644 --- a/pkgs/by-name/ir/iruby/package.nix +++ b/pkgs/by-name/ir/iruby/package.nix @@ -7,7 +7,7 @@ # nix run --impure --expr 'with import {}; jupyter-console.withSingleKernel iruby.definition' # Jupyter notebook: -# nix run --impure --expr 'with import {}; jupyter.override { definitions.iruby = iruby.definition; }' +# nix shell --impure --expr 'with import {}; [ (jupyter.override { definitions.iruby = iruby.definition; }) ]' -c jupyter-notebook let self = bundlerApp { diff --git a/pkgs/by-name/is/isa-l/package.nix b/pkgs/by-name/is/isa-l/package.nix index 22bdfce4ef02..b089ee2ac1ba 100644 --- a/pkgs/by-name/is/isa-l/package.nix +++ b/pkgs/by-name/is/isa-l/package.nix @@ -4,9 +4,13 @@ fetchFromGitHub, # nativeBuildInputs + cmake, nasm, - autoreconfHook, + # buildInputs + zlib, + + # nativeInstallCheckInputs versionCheckHook, # passthru @@ -18,32 +22,45 @@ stdenv.mkDerivation (finalAttrs: { pname = "isa-l"; - version = "2.32.0"; + version = "2.32.1"; + + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "intel"; repo = "isa-l"; tag = "v${finalAttrs.version}"; - hash = "sha256-LvxAlyBUSYEVLrMGcLii7bGvN1GZY/noYRSrBqsGiMI="; + hash = "sha256-JizQXhfDCL8aWEv52TBuXw06HA/8t7Ram/q9vSp5/DI="; }; nativeBuildInputs = [ + cmake nasm - autoreconfHook ]; - # configure.ac has two code paths for assembler detection: - # 1. When AS is unset: searches for nasm and tests with correct nasm syntax - # 2. When AS is set: tests with yasm-style syntax that nasm rejects - # AM_PROG_AS sets AS=as, so we must unset it to use path 1. - preConfigure = '' - unset AS - ''; + buildInputs = [ + zlib + ]; + + env = { + NIX_CFLAGS_COMPILE = toString [ + "-DVERSION=\"${finalAttrs.version}\"" + ]; + }; + cmakeFlags = [ + (lib.cmakeBool "ISAL_BUILD_IGZIP_CLI" true) + + # https://github.com/NixOS/nixpkgs/issues/144170 + (lib.cmakeFeature "CMAKE_INSTALL_INCLUDEDIR" "include") + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + ]; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + doCheck = true; passthru = { tests = { @@ -96,12 +113,5 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://github.com/intel/isa-l/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ jbedo ]; platforms = lib.platforms.all; - badPlatforms = [ - # :4:26: error: unexpected token in argument list - # movk x7, p4_low_b1, lsl 16 - "aarch64-darwin" - # https://github.com/intel/isa-l/issues/188 - "i686-linux" - ]; }; }) diff --git a/pkgs/by-name/is/isabelle/package.nix b/pkgs/by-name/is/isabelle/package.nix index a971e357825d..1a5f04256fab 100644 --- a/pkgs/by-name/is/isabelle/package.nix +++ b/pkgs/by-name/is/isabelle/package.nix @@ -356,7 +356,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/is/iso-flags/package.nix b/pkgs/by-name/is/iso-flags/package.nix index d66e64f1ca16..679cb5edf42e 100644 --- a/pkgs/by-name/is/iso-flags/package.nix +++ b/pkgs/by-name/is/iso-flags/package.nix @@ -45,7 +45,7 @@ stdenvNoCC.mkDerivation { meta = { homepage = "https://github.com/joielechong/iso-country-flags-svg-collection"; description = "248 country flag SVG & PNG icons with different icon styles"; - license = [ lib.licenses.publicDomain ]; + license = lib.licenses.publicDomain; platforms = lib.platforms.linux; # the output assets should work anywhere, but unsure about the tools to build them... maintainers = [ lib.maintainers.mkg20001 ]; }; diff --git a/pkgs/by-name/is/isolate/package.nix b/pkgs/by-name/is/isolate/package.nix index 69891ad0a845..f06812ddb73d 100644 --- a/pkgs/by-name/is/isolate/package.nix +++ b/pkgs/by-name/is/isolate/package.nix @@ -8,17 +8,18 @@ systemdLibs, installShellFiles, nixosTests, + libseccomp, }: stdenv.mkDerivation (finalAttrs: { pname = "isolate"; - version = "2.3"; + version = "2.5"; src = fetchFromGitHub { owner = "ioi"; repo = "isolate"; rev = "v${finalAttrs.version}"; - hash = "sha256-z/23k6F9XHbJDFld9tjIafUZzbUDEWAnbLvAoaEAilQ="; + hash = "sha256-a6FQxyClE9cXB0wHV0Z4kjYY6S1+mUE4ReroOifNjKg="; }; nativeBuildInputs = [ @@ -30,6 +31,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libcap.dev systemdLibs.dev + libseccomp ]; patches = [ diff --git a/pkgs/by-name/is/isomd5sum/package.nix b/pkgs/by-name/is/isomd5sum/package.nix index d15c959acc87..a596458c2cfa 100644 --- a/pkgs/by-name/is/isomd5sum/package.nix +++ b/pkgs/by-name/is/isomd5sum/package.nix @@ -41,6 +41,6 @@ stdenv.mkDerivation (finalAttrs: { description = "Utilities for working with md5sum implanted in ISO images"; platforms = lib.platforms.linux; license = lib.licenses.gpl2Plus; - maintainers = with lib.maintainers; [ knl ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/is/ispc/package.nix b/pkgs/by-name/is/ispc/package.nix index a268f04696ed..e08668ded3f6 100644 --- a/pkgs/by-name/is/ispc/package.nix +++ b/pkgs/by-name/is/ispc/package.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ispc"; - version = "1.30.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "ispc"; repo = "ispc"; tag = "v${finalAttrs.version}"; - hash = "sha256-CzyK38c8fCG7QiVHE0rSzxmyTXNr4sg1WtChbi75Wmw="; + hash = "sha256-n1zWokIuZEDJZN/KH3jxnIhgUo8iKDfZwiQnXZdxhL8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/is/isso/package.nix b/pkgs/by-name/is/isso/package.nix index 975ae03df330..e5f971b48f61 100644 --- a/pkgs/by-name/is/isso/package.nix +++ b/pkgs/by-name/is/isso/package.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication (finalAttrs: { format = "setuptools"; src = fetchFromGitHub { - owner = "posativ"; + owner = "isso-comments"; repo = "isso"; tag = finalAttrs.version; hash = "sha256-8kXqqiMXxF0wCJ+AzYT8j0rjuhlXO3F6UJbump672b4="; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ]; postPatch = '' - # Remove when https://github.com/posativ/isso/pull/973 is available. + # Remove when https://github.com/isso-comments/isso/pull/973 is available. substituteInPlace isso/tests/test_comments.py \ --replace "self.client.delete_cookie('localhost.local', '1')" "self.client.delete_cookie(key='1', domain='localhost')" ''; diff --git a/pkgs/by-name/is/istat-menus/package.nix b/pkgs/by-name/is/istat-menus/package.nix index 8f1a1391409d..865c053b8793 100644 --- a/pkgs/by-name/is/istat-menus/package.nix +++ b/pkgs/by-name/is/istat-menus/package.nix @@ -48,7 +48,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Set of nine separate and highly configurable menu items that let you know exactly what's going on inside your Mac"; homepage = "https://bjango.com/mac/istatmenus/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/is/istioctl/package.nix b/pkgs/by-name/is/istioctl/package.nix index fe374d91274a..6f6c8618c5d1 100644 --- a/pkgs/by-name/is/istioctl/package.nix +++ b/pkgs/by-name/is/istioctl/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "istioctl"; - version = "1.30.1"; + version = "1.30.3"; src = fetchFromGitHub { owner = "istio"; repo = "istio"; rev = finalAttrs.version; - hash = "sha256-jW0L/86D0YgAoUYAZfwHMGes5x0P5QLelP79XuG3riU="; + hash = "sha256-9HIDkNpLwwGN80NIweQ6DowKR0x26E0LkMuzl3qsGNs="; }; - vendorHash = "sha256-dOPrYZxOeP1ZahSaPS6U6tJDbTx/5BbwHFcNKS+2Lqc="; + vendorHash = "sha256-19ziol7/8UOw78kW5epqzrR6GO0k+CwQGkq1l7XKMaw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/it/itch/package.nix b/pkgs/by-name/it/itch/package.nix index a35d83f41f23..c9a14712a105 100644 --- a/pkgs/by-name/it/itch/package.nix +++ b/pkgs/by-name/it/itch/package.nix @@ -12,7 +12,7 @@ }: let - version = "26.9.0"; + version = "26.13.0"; itch-setup = fetchzip { url = "https://broth.itch.zone/itch-setup/linux-amd64/1.29.0/archive.zip"; @@ -26,7 +26,7 @@ let owner = "itchio"; repo = "itch"; rev = "v${version}"; - hash = "sha256-zTUCHpyjfPiYDAatkavNlSHekBTHadiHUa3VyLChYKE="; + hash = "sha256-v/2y9F+uigGaVsEy4gaa7WGTByW1wqYosti6AEOsaQQ="; sparseCheckout = [ sparseCheckout ]; } + sparseCheckout; @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchzip { url = "https://github.com/itchio/itch/releases/download/v${finalAttrs.version}/itch-v${finalAttrs.version}-linux-amd64.tar.gz"; stripRoot = false; - hash = "sha256-SRgaVweNqf/13C948eWncuCn9Cj82hYxDF3AzCaL5E0="; + hash = "sha256-//QA4aW9uwZ/yhKf1xJRthj36YqfXuu/6yU1yGXQeFo="; }; nativeBuildInputs = [ @@ -94,7 +94,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Best way to play itch.io games"; homepage = "https://github.com/itchio/itch"; - changelog = "https://github.com/itchio/itch/releases/tag/v${version}-canary"; + changelog = "https://github.com/itchio/itch/releases/tag/v${version}"; license = lib.licenses.mit; platforms = [ "x86_64-linux" ]; sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; diff --git a/pkgs/by-name/it/ite-backlight/package.nix b/pkgs/by-name/it/ite-backlight/package.nix index ca2b9ad8b246..65b8a1fb9ec4 100644 --- a/pkgs/by-name/it/ite-backlight/package.nix +++ b/pkgs/by-name/it/ite-backlight/package.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { This project aims to provide a set of simple utilities for controlling ITE 8291 keyboard backlight controllers. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; homepage = "https://github.com/hexagonal-sun/ite-backlight"; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ hexagonal-sun ]; diff --git a/pkgs/by-name/it/iterm2/package.nix b/pkgs/by-name/it/iterm2/package.nix index 330cb67f2afb..346b13595625 100644 --- a/pkgs/by-name/it/iterm2/package.nix +++ b/pkgs/by-name/it/iterm2/package.nix @@ -52,7 +52,6 @@ stdenvNoCC.mkDerivation rec { emaiax ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix b/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix index fac8fd86d8e5..ef98195f0265 100644 --- a/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix +++ b/pkgs/by-name/it/itgmania/themes/arrowcloud-theme.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { mv * "$out/itgmania/Themes/Arrow Cloud" ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + passthru.updateScript = nix-update-script { }; meta = { description = "Arrow Cloud's fork of Zmod"; diff --git a/pkgs/by-name/it/itgmania/themes/digital-dance.nix b/pkgs/by-name/it/itgmania/themes/digital-dance.nix index 60b5134a388b..f7ecc099fc25 100644 --- a/pkgs/by-name/it/itgmania/themes/digital-dance.nix +++ b/pkgs/by-name/it/itgmania/themes/digital-dance.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "digital-dance"; - version = "1.1.3-unstable-2026-06-04"; + version = "1.1.4-unstable-2026-06-30"; src = fetchFromCodeberg { owner = "JNero"; repo = "Digital-Dance-ITGMania"; - rev = "827d963fdc5732f11781bf3db7343a8897a10196"; - hash = "sha256-V3EmAg42BExodFiGd2u7brmTq4t3iVduWtxo5NjwGm8="; + rev = "90087bfd1182d1240f22e48fb348df52f784e799"; + hash = "sha256-iZ3N1+epG8EF8H9KViI3fgtHeayxmWaumxkOOK9qK0c="; }; postInstall = '' diff --git a/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix index 5234bfea09e5..bd7b8474c67e 100644 --- a/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix +++ b/pkgs/by-name/it/itgmania/themes/itg2-sm5.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "itg2-sm5"; - version = "1.1.0-unstable-2025-10-08"; + version = "1.1.0-unstable-2026-05-07"; src = fetchFromGitHub { owner = "JoseVarelaP"; repo = "In-The-Groove2-SM5"; - rev = "e25f1a44efa55cd2247891f40633403910b75d21"; - hash = "sha256-FMyT7ZA/1cqiClXDvD7CmJlOFaaWnPLuOuei6fsbzg8="; + rev = "07a71151b7170080902c3bf8118950ee4f410c01"; + hash = "sha256-SpYR6U/ujQ7toHIgCp+ogF1LdnH41ikshEdEjhMxlj4="; }; postInstall = '' diff --git a/pkgs/by-name/it/itgmania/themes/itg3encore.nix b/pkgs/by-name/it/itgmania/themes/itg3encore.nix index 58c64c26968a..6c25efbd5afa 100644 --- a/pkgs/by-name/it/itgmania/themes/itg3encore.nix +++ b/pkgs/by-name/it/itgmania/themes/itg3encore.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "itg3encore"; - version = "0-unstable-2026-06-05"; + version = "0-unstable-2026-07-18"; src = fetchFromGitHub { owner = "DarkBahamut162"; repo = "itg3encore"; - rev = "7aad94a63462efc85eb6e0e23bd0bd50be28137c"; - hash = "sha256-oaj76RMD+Ibm8n8/EiUZYVBlyy5PefpBsWhFbWEjM08="; + rev = "25185e67dd0706a2e5e83ad0e26aca6359d694fe"; + hash = "sha256-l+GPcqW7p3aYeaDUyOCMnZGfLkjljNB5KhMiLlG88ik="; }; postInstall = '' diff --git a/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix index 3d57f82120fa..912ab62186ea 100644 --- a/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix +++ b/pkgs/by-name/it/itgmania/themes/zmod-simply-love.nix @@ -6,13 +6,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "zmod-simply-love"; - version = "5.8.1-april"; + version = "5.9.0-july-2"; src = fetchFromGitHub { owner = "zarzob"; repo = "Simply-Love-SM5"; tag = finalAttrs.version; - hash = "sha256-4EkCR9M8xip2b8ddWyUIom2HM72Ba8KdVodIyc5h4p8="; + hash = "sha256-1sUiUPg5MzPZhdGdx3LqDbUIcSD+TkGKifj55S8MieQ="; }; postInstall = '' @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { mv * "$out/itgmania/Themes/Zmod Simply Love" ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--use-github-releases" ]; }; + passthru.updateScript = nix-update-script { }; meta = { description = "Zmod fork of Simply Love"; diff --git a/pkgs/by-name/it/itgmania/unwrapped.nix b/pkgs/by-name/it/itgmania/unwrapped.nix index f0d65de916e3..6eced844d6a9 100644 --- a/pkgs/by-name/it/itgmania/unwrapped.nix +++ b/pkgs/by-name/it/itgmania/unwrapped.nix @@ -23,14 +23,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "itgmania"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "itgmania"; repo = "itgmania"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-bTABfTflWasuXvX+YPciUIICAFVROk/SgeClgrTUjkQ="; + hash = "sha256-dwalGEQFNhjuKwUBBskCHDYzmyjuf0r9TYM2ex8wzio="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch b/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch new file mode 100644 index 000000000000..dc11f42f160d --- /dev/null +++ b/pkgs/by-name/it/itsycal/0001-Allow-running-from-the-Nix-store.patch @@ -0,0 +1,29 @@ +From 9ce5e368c00ed887f6d2628d4e8eff664bff5522 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:36 +0300 +Subject: [PATCH 1/4] Allow running from the Nix store + +Upstream normally requires the bundle to live in /Applications because its +Sparkle updater needs a stable, writable installation path. Nix applications +instead live in the immutable Nix store and are updated by Nix. + +Use upstream's existing kAllowOutsideApplicationsFolder escape hatch as the +registered default. This preserves upstream's check and keeps the downstream +change to one explicit policy setting. +--- + Itsycal/AppDelegate.m | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/Itsycal/AppDelegate.m b/Itsycal/AppDelegate.m +index 5cc187a..ee256d9 100644 +--- a/Itsycal/AppDelegate.m ++++ b/Itsycal/AppDelegate.m +@@ -42,6 +42,8 @@ + kThemePreference: @0, // System=0, Light=1, Dark=2 + kHideIcon: @(NO), + kShowLocation: @(NO), ++ // Nix installs the app in the immutable Nix store, not /Applications. ++ kAllowOutsideApplicationsFolder: @(YES), + kEnableTahoeMenuIcons: @(NO), + kDoNotDrawOutlineAroundCurrentMonth: @(NO) + }]; diff --git a/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch b/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch new file mode 100644 index 000000000000..de244f092ff6 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0002-Remove-self-update-controls-for-Nix-builds.patch @@ -0,0 +1,124 @@ +From f1474c9b296a3fbef30ca577dbd9a92224290b97 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:47 +0300 +Subject: [PATCH 2/4] Remove self-update controls for Nix builds + +Sparkle cannot replace an application inside the immutable Nix store. Leaving +its menu item and preference checkbox backed by a no-op stub is misleading. + +Remove the updater object, imports, controls, action, and matching Tahoe menu +symbol so the Nix build has no Sparkle runtime dependency or non-functional +update UI. +--- + Itsycal/Base.lproj/MainMenu.xib | 1 - + Itsycal/PrefsGeneralVC.m | 11 ++--------- + Itsycal/ViewController.m | 9 --------- + 3 files changed, 2 insertions(+), 19 deletions(-) + +diff --git a/Itsycal/Base.lproj/MainMenu.xib b/Itsycal/Base.lproj/MainMenu.xib +index aa2067e..1a25048 100644 +--- a/Itsycal/Base.lproj/MainMenu.xib ++++ b/Itsycal/Base.lproj/MainMenu.xib +@@ -89,6 +89,5 @@ + + + +- + + +diff --git a/Itsycal/PrefsGeneralVC.m b/Itsycal/PrefsGeneralVC.m +index 7c19942..86f6be0 100644 +--- a/Itsycal/PrefsGeneralVC.m ++++ b/Itsycal/PrefsGeneralVC.m +@@ -9,7 +9,6 @@ + #import "MoVFLHelper.h" + #import "EventCenter.h" + #import "MASShortcut/Shortcut.h" +-#import "Sparkle/SUUpdater.h" + + static NSString * const kSourceCellId = @"SourceCell"; + static NSString * const kCalendarCellId = @"CalendarCell"; +@@ -33,7 +32,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + { + NSTextField *_title; + NSButton *_login; +- NSButton *_checkUpdates; + NSButton *_beepBeep; + NSPopUpButton *_firstDayPopup; + NSTableView *_calendarsTV; +@@ -66,7 +64,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + // Checkboxes + _login = chkbx(NSLocalizedString(@"Launch at login", @"")); + _login.action = @selector(launchAtLogin:); +- _checkUpdates = chkbx(NSLocalizedString(@"Automatically check for updates", @"")); + _beepBeep = chkbx(NSLocalizedString(@"Beep beep on the hour", @"")); + + // First day of week label +@@ -130,10 +127,9 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + NSLocalizedString(@"31 days", @"")]]; + [v addSubview:_agendaDaysPopup]; + +- MoVFLHelper *vfl = [[MoVFLHelper alloc] initWithSuperview:v metrics:@{@"m": @20} views:NSDictionaryOfVariableBindings(_login, _checkUpdates, _beepBeep, firstDayLabel, _firstDayPopup, shortcutLabel, shortcutView, tvContainer, agendaDaysLabel, _agendaDaysPopup)]; +- [vfl :@"V:|-m-[_login]-[_checkUpdates]-[_beepBeep]-20-[_firstDayPopup]-20-[shortcutLabel]-3-[shortcutView(25)]-20-[tvContainer(170)]-[_agendaDaysPopup]-m-|"]; ++ MoVFLHelper *vfl = [[MoVFLHelper alloc] initWithSuperview:v metrics:@{@"m": @20} views:NSDictionaryOfVariableBindings(_login, _beepBeep, firstDayLabel, _firstDayPopup, shortcutLabel, shortcutView, tvContainer, agendaDaysLabel, _agendaDaysPopup)]; ++ [vfl :@"V:|-m-[_login]-[_beepBeep]-20-[_firstDayPopup]-20-[shortcutLabel]-3-[shortcutView(25)]-20-[tvContainer(170)]-[_agendaDaysPopup]-m-|"]; + [vfl :@"H:|-m-[_login]-(>=m)-|"]; +- [vfl :@"H:|-m-[_checkUpdates]-(>=m)-|"]; + [vfl :@"H:|-m-[_beepBeep]-(>=m)-|"]; + [vfl :@"H:|-m-[firstDayLabel]-[_firstDayPopup]-(>=m)-|" :NSLayoutFormatAlignAllFirstBaseline]; + [vfl :@"H:|-(>=m)-[shortcutLabel]-(>=m)-|"]; +@@ -144,9 +140,6 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + // Center shortcutLabel + [v addConstraint:[NSLayoutConstraint constraintWithItem:shortcutLabel attribute:NSLayoutAttributeCenterX relatedBy:NSLayoutRelationEqual toItem:v attribute:NSLayoutAttributeCenterX multiplier:1 constant:0]]; + +- // Binding for Sparkle automatic update checks +- [_checkUpdates bind:@"value" toObject:[SUUpdater sharedUpdater] withKeyPath:@"automaticallyChecksForUpdates" options:@{NSContinuouslyUpdatesValueBindingOption: @(YES)}]; +- + // Binding for hourly beep + [_beepBeep bind:@"value" toObject:[NSUserDefaultsController sharedUserDefaultsController] withKeyPath:[@"values." stringByAppendingString:kBeepBeepOnTheHour] options:@{NSContinuouslyUpdatesValueBindingOption: @(YES)}]; + +diff --git a/Itsycal/ViewController.m b/Itsycal/ViewController.m +index 1d55c4f..0bd303b 100644 +--- a/Itsycal/ViewController.m ++++ b/Itsycal/ViewController.m +@@ -21,7 +21,6 @@ + #import "MoButton.h" + #import "MoVFLHelper.h" + #import "MoUtils.h" +-#import "Sparkle/SUUpdater.h" + + @implementation ViewController + { +@@ -378,7 +377,6 @@ + NSInteger i = 0; + + [optMenu insertItemWithTitle:NSLocalizedString(@"About Itsycal", @"") action:@selector(showAbout:) keyEquivalent:@"" atIndex:i++]; +- [optMenu insertItemWithTitle:NSLocalizedString(@"Check for Updates…", @"") action:@selector(checkForUpdates:) keyEquivalent:@"" atIndex:i++]; + [optMenu insertItem:[NSMenuItem separatorItem] atIndex:i++]; + [optMenu insertItemWithTitle:NSLocalizedString(@"Go to Date…", @"") action:@selector(showDatePickerPopover:) keyEquivalent:@"T" atIndex:i++]; + [optMenu insertItem:[NSMenuItem separatorItem] atIndex:i++]; +@@ -394,7 +392,6 @@ + NSInteger index = 0; + NSArray *symbolNames = @[ + @"info.circle", +- @"arrow.trianglehead.2.clockwise", + @"21.calendar", + @"gear", + @"calendar.badge.clock", +@@ -462,11 +459,6 @@ + [self.prefsWC showWindow:self]; + } + +-- (void)checkForUpdates:(id)sender +-{ +- [[SUUpdater sharedUpdater] checkForUpdates:self]; +-} +- + - (void)openDateAndTimePrefs:(id)sender + { + NSURL *url = nil; +@@ -1514,4 +1506,3 @@ + } + + @end +- diff --git a/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch b/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch new file mode 100644 index 000000000000..44a67ce1d791 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0003-Use-modern-ServiceManagement-login-items.patch @@ -0,0 +1,116 @@ +From d3d2dd9ce8b566496503c38158199432a5ae87bb Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:47 +0300 +Subject: [PATCH 3/4] Use modern ServiceManagement login items + +LSSharedFileList was deprecated in macOS 10.11 and its status lookup can fail +when disconnected network volumes are present. Nixpkgs now targets macOS 14, +so no legacy fallback is needed. + +Use SMAppService.mainAppService, available since macOS 13. Treat +RequiresApproval as registered so users can still turn the pending login item +off. The package signs the complete app bundle after fixup, as required by +ServiceManagement. +--- + Itsycal/MoLoginItem.m | 58 +++++++--------------------------------- + Itsycal/PrefsGeneralVC.m | 12 +-------- + 2 files changed, 11 insertions(+), 59 deletions(-) + +diff --git a/Itsycal/MoLoginItem.m b/Itsycal/MoLoginItem.m +index 7efa602..0dc4960 100644 +--- a/Itsycal/MoLoginItem.m ++++ b/Itsycal/MoLoginItem.m +@@ -4,60 +4,22 @@ + // + + #import "MoLoginItem.h" +- +-// LSSharedFileList API was deprecated in macOS 10.11 +-#pragma clang diagnostic push +-#pragma clang diagnostic ignored "-Wdeprecated-declarations" ++#import + + BOOL MOIsLoginItemEnabled(void) + { +- BOOL isEnabled = NO; +- NSString *appPath = [[NSBundle mainBundle] bundlePath]; +- LSSharedFileListRef loginItemsRef = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL); +- +- if (loginItemsRef) { +- UInt32 seedValue; +- NSArray *loginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItemsRef, &seedValue)); +- for (id item in loginItems) { +- LSSharedFileListItemRef itemRef = (__bridge LSSharedFileListItemRef)item; +- NSURL *pathURL = CFBridgingRelease(LSSharedFileListItemCopyResolvedURL(itemRef, 0, NULL)); +- if (pathURL && [pathURL.path hasPrefix:appPath]) { +- isEnabled = YES; +- break; +- } +- } +- CFRelease(loginItemsRef); +- } +- return isEnabled; ++ SMAppServiceStatus status = SMAppService.mainAppService.status; ++ return status == SMAppServiceStatusEnabled || status == SMAppServiceStatusRequiresApproval; + } + + void MOEnableLoginItem(BOOL enable) + { +- NSString *appPath = [[NSBundle mainBundle] bundlePath]; +- LSSharedFileListRef loginItemsRef = LSSharedFileListCreate(NULL, kLSSharedFileListSessionLoginItems, NULL); +- +- if (loginItemsRef) { +- if (enable) { +- // We call LSSharedFileListInsertItemURL to insert the item at the bottom of Login Items list. +- CFURLRef url = (__bridge CFURLRef)[NSURL fileURLWithPath:appPath]; +- LSSharedFileListItemRef item = LSSharedFileListInsertItemURL(loginItemsRef, kLSSharedFileListItemLast, NULL, NULL, url, NULL, NULL); +- if (item != NULL) CFRelease(item); +- } +- else { +- // Grab the contents of the shared file list (LSSharedFileListItemRef objects) +- // and pop it in an array so we can iterate through it to find our item. +- UInt32 seedValue; +- NSArray *loginItems = CFBridgingRelease(LSSharedFileListCopySnapshot(loginItemsRef, &seedValue)); +- for (id item in loginItems) { +- LSSharedFileListItemRef itemRef = (__bridge LSSharedFileListItemRef)item; +- NSURL *pathURL = CFBridgingRelease(LSSharedFileListItemCopyResolvedURL(itemRef, 0, NULL)); +- if (pathURL && [pathURL.path hasPrefix:appPath]) { +- LSSharedFileListItemRemove(loginItemsRef, itemRef); // Deleting the item +- } +- } +- } +- CFRelease(loginItemsRef); ++ SMAppService *service = SMAppService.mainAppService; ++ NSError *error = nil; ++ BOOL succeeded = enable ++ ? [service registerAndReturnError:&error] ++ : [service unregisterAndReturnError:&error]; ++ if (!succeeded) { ++ NSLog(@"Unable to %@ launch at login: %@", enable ? @"enable" : @"disable", error); + } + } +- +-#pragma clang diagnostic pop +diff --git a/Itsycal/PrefsGeneralVC.m b/Itsycal/PrefsGeneralVC.m +index 86f6be0..ecfd30d 100644 +--- a/Itsycal/PrefsGeneralVC.m ++++ b/Itsycal/PrefsGeneralVC.m +@@ -158,17 +158,7 @@ static NSString * const kCalendarCellId = @"CalendarCell"; + + _sourcesAndCalendars = [self.ec sourcesAndCalendars]; + +- // The API used to check the login item's state (LSSharedFileList) causes +- // errors for users who have network drives but are not connected to their +- // network (github.com/sfsam/Itsycal/issues/15). Give them an option to +- // disable this check. +- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DoNotCheckLoginItemStatus"] == NO) { +- _login.hidden = NO; +- _login.state = MOIsLoginItemEnabled() ? NSControlStateValueOn : NSControlStateValueOff; +- } +- else { +- _login.hidden = YES; +- } ++ _login.state = MOIsLoginItemEnabled() ? NSControlStateValueOn : NSControlStateValueOff; + + _calendarsTV.enabled = self.ec.calendarAccessGranted; + _agendaDaysPopup.enabled = self.ec.calendarAccessGranted; diff --git a/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch b/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch new file mode 100644 index 000000000000..21cd84f9f0e2 --- /dev/null +++ b/pkgs/by-name/it/itsycal/0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch @@ -0,0 +1,90 @@ +From 6fb6ac13a8deee492449442e1ab3d7429aa9fff8 Mon Sep 17 00:00:00 2001 +From: 4evy +Date: Sat, 11 Jul 2026 01:12:55 +0300 +Subject: [PATCH 4/4] Use APIs available on the Nixpkgs macOS baseline + +The package metadata and Mach-O deployment target are both macOS 14. Remove +compatibility branches for older systems and use the corresponding current +APIs: + +* request EventKit full access directly; +* discover the calendar handler through NSWorkspace and + UniformTypeIdentifiers; +* use the renamed CoreAudio main-element constant. +--- + Itsycal/EventCenter.m | 20 ++------------------ + Itsycal/ViewController.m | 9 ++++----- + 2 files changed, 6 insertions(+), 23 deletions(-) + +diff --git a/Itsycal/EventCenter.m b/Itsycal/EventCenter.m +index 148c631..3862630 100644 +--- a/Itsycal/EventCenter.m ++++ b/Itsycal/EventCenter.m +@@ -59,15 +59,7 @@ static NSString *kSelectedCalendars = @"SelectedCalendars"; + _queueIsol = dispatch_queue_create("com.mowglii.Itsycal.queueIsol", DISPATCH_QUEUE_SERIAL); + _queueIsol2 = dispatch_queue_create("com.mowglii.Itsycal.queueIsol2", DISPATCH_QUEUE_SERIAL); + _store = [EKEventStore new]; +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 140000 +- if (@available(macOS 14.0, *)) { +- [_store requestFullAccessToEventsWithCompletion:requestCompletionHandler]; +- } else { +- [_store requestAccessToEntityType:EKEntityTypeEvent completion:requestCompletionHandler]; +- } +-#else +- [_store requestAccessToEntityType:EKEntityTypeEvent completion:requestCompletionHandler]; +-#endif ++ [_store requestFullAccessToEventsWithCompletion:requestCompletionHandler]; + + // Refetch everything when the event store has changed. + __weak __typeof(self) weakSelf = self; +@@ -85,15 +77,7 @@ static NSString *kSelectedCalendars = @"SelectedCalendars"; + #pragma mark - Public (main thread) + + - (BOOL)calendarAccessGranted { +-#if MAC_OS_X_VERSION_MAX_ALLOWED >= 140000 +- if (@available(macOS 14.0, *)) { +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusFullAccess; +- } else { +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusAuthorized; +- } +-#else +- return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusAuthorized; +-#endif ++ return [EKEventStore authorizationStatusForEntityType:EKEntityTypeEvent] == EKAuthorizationStatusFullAccess; + } + + - (NSString *)defaultCalendarIdentifier { +diff --git a/Itsycal/ViewController.m b/Itsycal/ViewController.m +index 0bd303b..a887682 100644 +--- a/Itsycal/ViewController.m ++++ b/Itsycal/ViewController.m +@@ -21,6 +21,7 @@ + #import "MoButton.h" + #import "MoVFLHelper.h" + #import "MoUtils.h" ++#import + + @implementation ViewController + { +@@ -319,10 +320,8 @@ + // Determine the default calendar app. + // See: support.busymac.com/help/21535-busycal-url-handler + +- CFStringRef strRef = UTTypeCreatePreferredIdentifierForTag(kUTTagClassFilenameExtension, CFSTR("ics"), kUTTypeData); +- CFStringRef bundleID = LSCopyDefaultRoleHandlerForContentType(strRef, kLSRolesEditor); +- CFRelease(strRef); +- NSString *defaultCalendarAppBundleID = CFBridgingRelease(bundleID); ++ NSURL *defaultCalendarAppURL = [NSWorkspace.sharedWorkspace URLForApplicationToOpenContentType:UTTypeCalendarEvent]; ++ NSString *defaultCalendarAppBundleID = [NSBundle bundleWithURL:defaultCalendarAppURL].bundleIdentifier; + + // Use URL scheme to open BusyCal or Fantastical2 on the + // date selected in our calendar. +@@ -1263,7 +1262,7 @@ + AudioObjectPropertyAddress propertyAddress; + propertyAddress.mSelector = kAudioHardwarePropertyDefaultOutputDevice; + propertyAddress.mScope = kAudioObjectPropertyScopeGlobal; +- propertyAddress.mElement = kAudioObjectPropertyElementMaster; ++ propertyAddress.mElement = kAudioObjectPropertyElementMain; + + OSStatus result = AudioObjectGetPropertyData(kAudioObjectSystemObject, &propertyAddress, 0, NULL, &dataSize, &deviceID); + diff --git a/pkgs/by-name/it/itsycal/package.nix b/pkgs/by-name/it/itsycal/package.nix index 41bac816c8cb..78b7fcb4bd51 100644 --- a/pkgs/by-name/it/itsycal/package.nix +++ b/pkgs/by-name/it/itsycal/package.nix @@ -1,42 +1,240 @@ { lib, - fetchzip, - stdenvNoCC, + stdenv, + fetchFromGitHub, + actool, + ibtool, + lld, + makeWrapper, + rcodesign, + re-plistbuddy, + nix-update-script, }: -stdenvNoCC.mkDerivation (finalAttrs: { +let + # Upstream ships MASShortcut only as a prebuilt framework. Build the + # maintained Rectangle fork instead; it adds F20 and macOS Tahoe fixes while + # retaining the API and bundle identity used by Itsycal. + masShortcutSrc = fetchFromGitHub { + owner = "rxhanson"; + repo = "MASShortcut"; + rev = "2f9fbb3f959b7a683c6faaf9638d22afad37a235"; + hash = "sha256-EZLt7ph24L1wwFEMlltuPutId09RBug/y9OtDhixIig="; + }; + + masShortcutSources = [ + "Model/MASShortcut.m" + "Model/MASShortcutValidator.m" + "Monitoring/MASHotKey.m" + "Monitoring/MASShortcutMonitor.m" + "UI/MASLocalization.m" + "UI/MASShortcutView.m" + "UI/MASShortcutView+Bindings.m" + "UI/MASShortcutViewButtonCell.m" + "User Defaults Storage/MASDictionaryTransformer.m" + "User Defaults Storage/MASShortcutBinder.m" + ]; + + masShortcutInfoPlist = lib.generators.toPlist { escape = true; } { + CFBundleDevelopmentRegion = "English"; + CFBundleExecutable = "MASShortcut"; + CFBundleIdentifier = "com.github.shpakovski.MASShortcut"; + CFBundleInfoDictionaryVersion = "6.0"; + CFBundleName = "MASShortcut"; + CFBundlePackageType = "FMWK"; + CFBundleShortVersionString = "2.4.0"; + CFBundleVersion = "2.4.0"; + NSHumanReadableCopyright = "Copyright © Vadim Shpakovski. All rights reserved."; + }; +in +stdenv.mkDerivation (finalAttrs: { pname = "itsycal"; version = "0.15.12"; - src = fetchzip { - url = "https://itsycal.s3.amazonaws.com/Itsycal-${finalAttrs.version}.zip"; - hash = "sha256-2Xu1ZQnNl0o2/AYOIjxZPDnc0TxMXrqKej7CCZEVV9I="; - stripRoot = false; + src = fetchFromGitHub { + owner = "sfsam"; + repo = "Itsycal"; + tag = finalAttrs.version; + hash = "sha256-K25oG8d+OauNHLkatLLskfcWCqOmM2WEw2Ygd3v1uqE="; }; + patches = [ + # Use upstream's hidden escape hatch for installations outside /Applications. + ./0001-Allow-running-from-the-Nix-store.patch + # Nix owns updates, so remove the otherwise non-functional Sparkle UI. + ./0002-Remove-self-update-controls-for-Nix-builds.patch + # Replace the deprecated LSSharedFileList implementation with SMAppService. + ./0003-Use-modern-ServiceManagement-login-items.patch + # The Nixpkgs Darwin baseline is macOS 14; use its non-deprecated APIs. + ./0004-Use-APIs-available-on-the-Nixpkgs-macOS-baseline.patch + ]; + + strictDeps = true; + + nativeBuildInputs = [ + actool + ibtool + lld + makeWrapper + rcodesign + re-plistbuddy + ]; + + # The classic open-source ld64 crashes while linking MASShortcut on arm64. + # Keep lld until the cctools linker can link this framework reliably. + env.NIX_CFLAGS_LINK = "-fuse-ld=lld"; + + dontConfigure = true; + + postPatch = '' + # Both upstream frameworks contain native code. MASShortcut is rebuilt + # below and Sparkle is removed by patch 0002, so make accidental reuse fail. + rm -rf Itsycal/_frameworks + ''; + + buildPhase = '' + runHook preBuild + + buildDir="$PWD/build" + mkdir -p "$buildDir/module-cache" + + # actool accepts one catalog, while upstream keeps images and colors in + # separate catalogs. Merge them without changing their contents. + cp -R Itsycal/Images.xcassets "$buildDir/Assets.xcassets" + cp -R Itsycal/Colors.xcassets/*.colorset "$buildDir/Assets.xcassets/" + + # Compile .m -> .o; flags before --, sources after. Sets _objects array + compile_objc() { + local prefix="$1"; shift + local -a flags=() + while [[ "$1" != "--" ]]; do flags+=("$1"); shift; done; shift + _objects=() + for src in "$@"; do + local obj="$buildDir/''${prefix}_$(basename "$src" .m).o" + clang -fobjc-arc "''${flags[@]}" -c "$src" -o "$obj" + _objects+=("$obj") + done + } + + link_dylib() { + local name="$1"; shift + clang -dynamiclib -fobjc-arc \ + -install_name "@rpath/$name.framework/$name" "$@" + } + + # Build MASShortcut as a real framework. The explicit source list avoids + # pulling its demo or test targets into the application. + masHeaders="$buildDir/MAS_headers/MASShortcut" + mkdir -p "$masHeaders" + cp ${masShortcutSrc}/Framework/include/*.h "$masHeaders/" + + masSources=( ${ + lib.escapeShellArgs (map (src: "${masShortcutSrc}/Framework/${src}") masShortcutSources) + } ) + compile_objc mas -fmodules -fmodules-cache-path="$buildDir/module-cache" \ + -I"$masHeaders" -include AppKit/AppKit.h -- "''${masSources[@]}" + link_dylib MASShortcut -framework AppKit -framework Carbon \ + -compatibility_version 1 -current_version 2.4.0 \ + -o "$buildDir/MASShortcut.dylib" "''${_objects[@]}" + + # Itsycal + compile_objc app -fmodules -fmodules-cache-path="$buildDir/module-cache" \ + -I"$buildDir/MAS_headers" -IItsycal -- Itsycal/*.m + clang -fobjc-arc \ + -framework AppKit -framework EventKit -framework ScriptingBridge \ + -framework Carbon -framework ServiceManagement -framework UniformTypeIdentifiers \ + -Wl,-rpath,@executable_path/../Frameworks \ + "$buildDir/MASShortcut.dylib" \ + -o "$buildDir/Itsycal" "''${_objects[@]}" + + runHook postBuild + ''; + installPhase = '' runHook preInstall - mkdir -p "$out/Applications" - cp -R Itsycal.app "$out/Applications/" + appDir="$out/Applications/Itsycal.app/Contents" + mkdir -p "$appDir"/{MacOS,Frameworks,Resources} + + cp "$buildDir/Itsycal" "$appDir/MacOS/Itsycal" + + # Assemble the framework bundle metadata normally generated by Xcode. + mkdir -p "$appDir/Frameworks/MASShortcut.framework/Resources" + cp "$buildDir/MASShortcut.dylib" "$appDir/Frameworks/MASShortcut.framework/MASShortcut" + cp -r ${masShortcutSrc}/Framework/Resources/*.lproj "$appDir/Frameworks/MASShortcut.framework/Resources/" + printf '%s' ${lib.escapeShellArg masShortcutInfoPlist} \ + > "$appDir/Frameworks/MASShortcut.framework/Resources/Info.plist" + + # Resources + ibtool --compile "$appDir/Resources/MainMenu.nib" Itsycal/Base.lproj/MainMenu.xib + actool --compile "$appDir/Resources" \ + --platform macosx \ + --minimum-deployment-target ${stdenv.hostPlatform.darwinMinVersion} \ + --app-icon AppIcon \ + --output-partial-info-plist "$buildDir/asset-info.plist" \ + "$buildDir/Assets.xcassets" + cp Itsycal/beep.mp3 "$appDir/Resources/" + mkdir -p "$appDir/Resources/Fonts" + cp Itsycal/_fonts/Mow.otf "$appDir/Resources/Fonts/" + for lproj in Itsycal/*.lproj; do + mkdir -p "$appDir/Resources/$(basename "$lproj")" + cp "$lproj"/*.strings "$appDir/Resources/$(basename "$lproj")/" 2>/dev/null || true + done + + # Resolve the Xcode variables in upstream's plist. Keeping that plist as + # the source of truth means new privacy and bundle metadata is preserved. + bundleVersion=$(sed -n 's/.*CURRENT_PROJECT_VERSION = \([0-9]*\);/\1/p' \ + Itsycal.xcodeproj/project.pbxproj | head -1) + cp Itsycal/Info.plist "$appDir/Info.plist" + substituteInPlace "$appDir/Info.plist" \ + --replace-fail '$(EXECUTABLE_NAME)' 'Itsycal' \ + --replace-fail '$(PRODUCT_BUNDLE_IDENTIFIER)' 'com.mowglii.ItsycalApp' \ + --replace-fail '$(PRODUCT_NAME)' 'Itsycal' \ + --replace-fail '$(MARKETING_VERSION)' '${finalAttrs.version}' \ + --replace-fail '$(CURRENT_PROJECT_VERSION)' "$bundleVersion" \ + --replace-fail '$(MACOSX_DEPLOYMENT_TARGET)' '${stdenv.hostPlatform.darwinMinVersion}' + + # Merge actool's icon metadata and remove the Sparkle configuration that + # no longer has a consumer in this immutable Nix build. + PlistBuddy -c 'Set :CFBundleIconFile AppIcon' \ + -c 'Add :CFBundleIconName string AppIcon' \ + -c 'Delete :SUAllowsAutomaticUpdates' \ + -c 'Delete :SUEnableAutomaticChecks' \ + -c 'Delete :SUFeedURL' \ + -c 'Delete :SUPublicEDKey' \ + -c 'Delete :SUScheduledCheckInterval' \ + "$appDir/Info.plist" + + makeWrapper "$out/Applications/Itsycal.app/Contents/MacOS/Itsycal" "$out/bin/itsycal" runHook postInstall ''; - passthru = { - updateScript = ./update.sh; + # Signing only Mach-O files leaves app resources unsealed. Sign the complete + # bundle after fixup so ServiceManagement accepts it and nested code verifies. + postFixup = '' + rcodesign sign "$out/Applications/Itsycal.app" + ''; + + passthru.updateScript = nix-update-script { + # Ignore upstream's non-version "help" tag. + extraArgs = [ "--version-regex=^([0-9]+\\.[0-9]+\\.[0-9]+)$" ]; }; meta = { changelog = "https://www.mowglii.com/itsycal/versionhistory.html"; description = "Tiny menu bar calendar"; homepage = "https://www.mowglii.com/itsycal/"; - license = lib.licenses.mit; + license = with lib.licenses; [ + bsd2 + mit + ]; + mainProgram = "itsycal"; maintainers = with lib.maintainers; [ eclairevoyant - FlameFlag + _4evy ]; platforms = lib.platforms.darwin; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; }; }) diff --git a/pkgs/by-name/it/itsycal/update.sh b/pkgs/by-name/it/itsycal/update.sh deleted file mode 100755 index cd176cc46860..000000000000 --- a/pkgs/by-name/it/itsycal/update.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl xq-xml common-updater-scripts - -set -eu - -ROOT="$(dirname "$(readlink -f "$0")")" -NIX_DRV="$ROOT/package.nix" -if [ ! -f "$NIX_DRV" ]; then - echo "ERROR: cannot find package.nix in $ROOT" - exit 1 -fi - -LATEST_VERSION="$(curl -Ls https://www.mowglii.com/itsycal/versionhistory.html | xq -m -q 'h4' -a 'id' | head -n1)" - -if [ -z "$LATEST_VERSION" ]; then - echo "ERROR: Failed to scrape the latest version." - exit 1 -fi - -update-source-version itsycal "$LATEST_VERSION" --file="$NIX_DRV" diff --git a/pkgs/by-name/iv/iverilog/package.nix b/pkgs/by-name/iv/iverilog/package.nix index c32744a4d55d..d5cf8f12a57e 100644 --- a/pkgs/by-name/iv/iverilog/package.nix +++ b/pkgs/by-name/iv/iverilog/package.nix @@ -93,10 +93,5 @@ stdenv.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ thoughtpolice ]; platforms = lib.platforms.all; - badPlatforms = [ - # Several tests fail with: - # ==> Failed - running iverilog. - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/iz/izrss/package.nix b/pkgs/by-name/iz/izrss/package.nix index 08e213adbc89..80d20da83842 100644 --- a/pkgs/by-name/iz/izrss/package.nix +++ b/pkgs/by-name/iz/izrss/package.nix @@ -5,22 +5,22 @@ }: buildGoModule (finalAttrs: { pname = "izrss"; - version = "0.3.0"; + version = "0.4.0"; src = fetchFromGitHub { owner = "isabelroses"; repo = "izrss"; tag = "v${finalAttrs.version}"; - hash = "sha256-cBkq+Xq6FxizftYZ1YelYdubWNakLbkhGE55hkOr4Qo="; + hash = "sha256-8eHUskfsdymVTYt5V/f75vKsvmuZz/CNGqbthSQrHow="; }; ldflags = [ "-s" "-w" - "-X main.version=${finalAttrs.version}" + "-X main.Version=${finalAttrs.version}" ]; - vendorHash = "sha256-hiqheaGCtybrK5DZYz2GsYvTlUZDGu04wDjQqfE7O3k="; + vendorHash = "sha256-NP363PtrTcI1EubIBJEoMCTkHCGsNRM8fY2fgwSlz5s="; meta = { description = "RSS feed reader for the terminal written in Go"; diff --git a/pkgs/by-name/ja/jabref/deps.json b/pkgs/by-name/ja/jabref/deps.json index a2a97eb36cb5..8d6f03f20126 100644 --- a/pkgs/by-name/ja/jabref/deps.json +++ b/pkgs/by-name/ja/jabref/deps.json @@ -868,9 +868,9 @@ "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.3.0": { - "jar": "sha256-cU30voGVRf9N4fNqohg+DeqUtMjN98op6ciZGbrzY2I=", - "pom": "sha256-89F2jvL7UxBIPb6R4w6fo2x7Pi/e5pRaCLujEBQtKcE=" + "org/jetbrains/kotlin#kotlin-reflect/2.3.20": { + "jar": "sha256-40b6PD/0RR9fcHoxKIf9TIVV2kjMFfqdsrqTwz+J+BM=", + "pom": "sha256-iwC9L+srtVON85aVQXTZ3cDsVA00ElhjA1ObHpZVwzM=" }, "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.2.21": { "jar": "sha256-yweF5qeHDS9eqW9kcCDigS3snXAjAzMZu9sc5+XmVUg=", @@ -924,10 +924,10 @@ "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": { - "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=", - "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=", - "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, "org/jetbrains/kotlin#kotlin-tooling-core/2.2.21": { "jar": "sha256-dAFOxPPveM59p+Pmlk8sUmoxIdXFj++MopeeXzRFgvQ=", @@ -1319,15 +1319,22 @@ "com/google/code/gson#gson-parent/2.13.2": { "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, + "com/google/code/gson#gson-parent/2.14.0": { + "pom": "sha256-grD2aUxXWKuLsH4FYwII1Q9YnUteBP0KBG1Zzfe6PR0=" + }, "com/google/code/gson#gson/2.13.2": { "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" }, + "com/google/code/gson#gson/2.14.0": { + "jar": "sha256-LL0Rm/GWHCh4gxCWPcgLpl9Yze7B3ROci9sSQPqiw28=", + "pom": "sha256-H6ASLA43MxkmQoYcNr5Mb3maeVMnojvdKSJpG26bpIA=" + }, "com/google/code/gson/gson/maven-metadata": { "xml": { "groupId": "com.google.code.gson", - "lastUpdated": "20250910210152", - "release": "2.13.2" + "lastUpdated": "20260423191314", + "release": "2.14.0" } }, "com/google/errorprone#error_prone_annotation/2.44.0": { @@ -1350,6 +1357,10 @@ "jar": "sha256-vPc4pSXlRskmojPQoWnPfq/PcD/oGsnWmU9yRO2ikFI=", "pom": "sha256-fmGVkFEuhKKOAjWK3qvn3kureQr2FOhAtAQTlRbeFlc=" }, + "com/google/errorprone#error_prone_annotations/2.48.0": { + "jar": "sha256-tJxclYMW7WegnGmd2pqnScr0NNUdhj3qWZ7zakm5yFU=", + "pom": "sha256-GJ4JrQSJwyXpDaqp1cj0BjMGAvo2Zgm8oHy82tA6udo=" + }, "com/google/errorprone#error_prone_check_api/2.44.0": { "jar": "sha256-rFRNsezoAFm1NJU93Ipa/PZUfCCrnBtQC5kHGQOQDL8=", "pom": "sha256-Nl9VFHNSFSwr9syl+uNdspsxDqR4A/neWuRL/k1d+jo=" @@ -1370,6 +1381,9 @@ "com/google/errorprone#error_prone_parent/2.44.0": { "pom": "sha256-9v3+0f+Ubr0B9HgCSux5CBz16XbMDY6MmL+GMXOxY10=" }, + "com/google/errorprone#error_prone_parent/2.48.0": { + "pom": "sha256-sz+opFyfF5SlAIwLLYOoTrKLXQEXptFW8AP58JvnQQ8=" + }, "com/google/googlejavaformat#google-java-format-parent/1.27.0": { "pom": "sha256-rOuKJTTBnTBcBY8iq0ffOaDhm3QIWx5MWwfTukXYQlA=" }, diff --git a/pkgs/by-name/ja/jack-passthrough/package.nix b/pkgs/by-name/ja/jack-passthrough/package.nix index 4725c4c63e2f..22c88835c545 100644 --- a/pkgs/by-name/ja/jack-passthrough/package.nix +++ b/pkgs/by-name/ja/jack-passthrough/package.nix @@ -7,11 +7,12 @@ meson, ninja, fmt_9, + nix-update-script, }: stdenv.mkDerivation { pname = "jack-passthrough"; - version = "2021-9-25"; + version = "0-unstable-2021-9-25"; # https://github.com/guysherman/jack-passthrough src = fetchFromGitHub { @@ -26,11 +27,14 @@ stdenv.mkDerivation { meson ninja ]; + buildInputs = [ fmt_9 libjack2 ]; + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + meta = { description = "Simple app to help with JACK apps that behave strangely"; longDescription = '' @@ -42,7 +46,10 @@ stdenv.mkDerivation { homepage = "https://github.com/guysherman/jack-passthrough"; # license unknown: https://github.com/guysherman/jack-passthrough/issues/2 license = lib.licenses.unfree; - maintainers = [ lib.maintainers.PowerUser64 ]; + maintainers = with lib.maintainers; [ + PowerUser64 + l1npengtul + ]; platforms = [ "x86_64-linux" ]; mainProgram = "jack-passthru"; }; diff --git a/pkgs/by-name/ja/jackass/package.nix b/pkgs/by-name/ja/jackass/package.nix index 99bba6cbcca1..50e820a7235c 100644 --- a/pkgs/by-name/ja/jackass/package.nix +++ b/pkgs/by-name/ja/jackass/package.nix @@ -56,7 +56,7 @@ stdenv.mkDerivation (finalAttrs: { PowerUser64 l1npengtul ]; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ja/jackett/deps.json b/pkgs/by-name/ja/jackett/deps.json index 0cac57b41576..e4951b5c71e3 100644 --- a/pkgs/by-name/ja/jackett/deps.json +++ b/pkgs/by-name/ja/jackett/deps.json @@ -6,8 +6,8 @@ }, { "pname": "AngleSharp", - "version": "1.4.0", - "hash": "sha256-xHpoMkhYSj7ejeMmI2e7ygef84QGZhttPjYOnLjITd0=" + "version": "1.5.2", + "hash": "sha256-81rDtnwvR0SDXNNUnPirWIa782gwkgRlz1Fbzm2ywwc=" }, { "pname": "AngleSharp.Xml", @@ -61,53 +61,53 @@ }, { "pname": "Microsoft.AspNetCore.Cryptography.Internal", - "version": "9.0.16", - "hash": "sha256-UwBbUhfCxg5B3llggin1UtoaGYdy9ifoYs1MT3WiIJw=" + "version": "9.0.18", + "hash": "sha256-2sigYMwiq5w/E2EFTXf1D0IjWW4/1HQMH4HOYfYTYtw=" }, { "pname": "Microsoft.AspNetCore.DataProtection", - "version": "9.0.16", - "hash": "sha256-8bK7MDVhISTXmEFdcFcnJUleDaPAZkA8fWPAHV6XFeg=" + "version": "9.0.18", + "hash": "sha256-wLswQ5CrFv93sZ1ZKhxUW1FrWH2KBp96GTqZrozuBVI=" }, { "pname": "Microsoft.AspNetCore.DataProtection.Abstractions", - "version": "9.0.16", - "hash": "sha256-YSVo0oww1xoG7Hef+roLwGNX6dQs7ZG10f3Ij7w6z1w=" + "version": "9.0.18", + "hash": "sha256-Rpas+cH+OSP80wwQ448h0rFUbUG74XJHNtQLL9fUcR4=" }, { "pname": "Microsoft.AspNetCore.Http", - "version": "2.3.9", - "hash": "sha256-XuOH9M6qd6XFz15TnWNnNCVd567B5BCb0wfl0Xoz5g4=" + "version": "2.3.11", + "hash": "sha256-Wy+HphsrkH6r9ljPfQ+k1bgL/nsUKR5A9iCJ7DP33d4=" }, { "pname": "Microsoft.AspNetCore.Http.Abstractions", - "version": "2.3.0", - "hash": "sha256-NrAFzk5IcxmeRk3Zu+rLcq0+KKiAYfygJbAdIt2Zpfk=" + "version": "2.3.10", + "hash": "sha256-TlgQug0JPR5vsFsxU0btpa4SbLSLLKZ2T8izyZpkZtM=" }, { "pname": "Microsoft.AspNetCore.Http.Features", - "version": "2.3.0", - "hash": "sha256-QkNFS3ScDLyt0XppATSogbF1raSQJN+wStcnAsSoUJw=" + "version": "2.3.9", + "hash": "sha256-9VJKZ5adBKRrVp+XRWEQiazv9Q6jj7noT/X693djVgQ=" }, { "pname": "Microsoft.AspNetCore.JsonPatch", - "version": "9.0.16", - "hash": "sha256-+AxAcxXNHLrELpW0KZd54TGMqPwe2bYaxUwNS64F8oQ=" + "version": "9.0.18", + "hash": "sha256-tKaK64BnFoj/J2DM4qSvO/zQ5alPLEasm6pr3+Tp3CM=" }, { "pname": "Microsoft.AspNetCore.Mvc.NewtonsoftJson", - "version": "9.0.16", - "hash": "sha256-ephL6fJDFR+0rrebEH92IDpoMadJLef98L7mNKHTAUo=" + "version": "9.0.18", + "hash": "sha256-jbOBm5T8ZlBhips96MI7u7JBLhNT/dX5eHjUQ6cw+dI=" }, { "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "2.3.0", - "hash": "sha256-oJMEP44Q9ClhbyZUPtSb9jqQyJJ/dD4DHElRvkYpIOo=" + "version": "2.3.10", + "hash": "sha256-XuHgYt83oinCBcCfY1FJa1PWj/t5kvg/YPse0DlYiUA=" }, { "pname": "Microsoft.AspNetCore.WebUtilities", - "version": "2.3.9", - "hash": "sha256-B5iIW0O5K11GELwd7dc96SYTmFkvINhdodBDcL14+/w=" + "version": "2.3.11", + "hash": "sha256-HAGuLuTRLkTTcP9oqRpqPYQmIzQTecUWHI/UTAJ2iMY=" }, { "pname": "Microsoft.Bcl.AsyncInterfaces", @@ -126,8 +126,8 @@ }, { "pname": "Microsoft.Bcl.AsyncInterfaces", - "version": "9.0.16", - "hash": "sha256-kCHVu7LDlMXlvDvFo9C3zbISV2t52s+iZMpp0/JX3iw=" + "version": "9.0.18", + "hash": "sha256-FscIiUzpg4lqoV4XU+qHKw1BipCPkC+twxRqcDDy4xo=" }, { "pname": "Microsoft.Bcl.TimeProvider", @@ -146,8 +146,8 @@ }, { "pname": "Microsoft.Extensions.Configuration", - "version": "9.0.16", - "hash": "sha256-wfj9Vp3innwgJGToOyGqhW2lyFe4vG3KW51vMJjGGoU=" + "version": "9.0.18", + "hash": "sha256-Th2ejKhzEMKV1FUoj+74zhJIg3jaFhWmtci2utqfIn8=" }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", @@ -156,8 +156,8 @@ }, { "pname": "Microsoft.Extensions.Configuration.Abstractions", - "version": "9.0.16", - "hash": "sha256-1968fW24KGyvpNU8gYIPEhXJVVusgCCBz4PkK9Rww0s=" + "version": "9.0.18", + "hash": "sha256-e0ABlyKnPhqtd875N0d04E4bdYWe5MOHK7YZzFM9nnY=" }, { "pname": "Microsoft.Extensions.DependencyInjection", @@ -171,23 +171,23 @@ }, { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", - "version": "9.0.16", - "hash": "sha256-jTzy4tazMmC7magGRhm86yd2a7+2vRYWrC0QoOoDMSQ=" + "version": "9.0.18", + "hash": "sha256-xpAbVQ2HlbLiEETz+IHa0Sih68j0HARbUCk423SCdYg=" }, { "pname": "Microsoft.Extensions.Diagnostics.Abstractions", - "version": "9.0.16", - "hash": "sha256-U6ij4cMOc94qLfVxuPINg4/vqqbFcZgTuIC/c0RznTQ=" + "version": "9.0.18", + "hash": "sha256-Or2ZUfYxYXZ7DrLYCPnkRhsKed4u0/ZElHrg65eovqY=" }, { "pname": "Microsoft.Extensions.FileProviders.Abstractions", - "version": "9.0.16", - "hash": "sha256-T5LCT9yTrHvMaVP/4spQqCj27hXCbchTUdPMKKGBp3E=" + "version": "9.0.18", + "hash": "sha256-SSERP6+GvZld+YjmGeAuwt6STik/aA8dR1v/7/kTiHo=" }, { "pname": "Microsoft.Extensions.Hosting.Abstractions", - "version": "9.0.16", - "hash": "sha256-u62QeQqAhJ0Pa5JnxXQIyOGkuQZnYYmo3ADTB9f6L9o=" + "version": "9.0.18", + "hash": "sha256-VLWUfFSry5RZz+oA6xqaF751QiOQmHKQftDoFbiMzCs=" }, { "pname": "Microsoft.Extensions.Logging", @@ -201,8 +201,8 @@ }, { "pname": "Microsoft.Extensions.Logging.Abstractions", - "version": "9.0.16", - "hash": "sha256-B5aTywrWdDbuAC5JBaueFtsA8VQAsejdMW9PSacELMM=" + "version": "9.0.18", + "hash": "sha256-wIfMBf7I1KuDIOyAuIML1Y9cZWkxYUdM3PercoEmSUM=" }, { "pname": "Microsoft.Extensions.ObjectPool", @@ -221,8 +221,8 @@ }, { "pname": "Microsoft.Extensions.Options", - "version": "9.0.16", - "hash": "sha256-GkwkNAO87zn4tzOX7Z0oSpBhjIgkhAx5ApnY/PP5q/0=" + "version": "9.0.18", + "hash": "sha256-AqEIL9qf6OJ4nzZZ/GT/53nz4TQofShVrDQhru/RgZs=" }, { "pname": "Microsoft.Extensions.Primitives", @@ -231,13 +231,13 @@ }, { "pname": "Microsoft.Extensions.Primitives", - "version": "9.0.16", - "hash": "sha256-UqBlK5n0ZV8PlvwbholkIB6OU8mkT8bLDUv74a8pq5Y=" + "version": "9.0.18", + "hash": "sha256-4WejEhNikEJEmlYxjqM5DpAeGH5LiaK9TVtZIBU56ck=" }, { "pname": "Microsoft.Net.Http.Headers", - "version": "2.3.8", - "hash": "sha256-IgcqzFtv8NAmnb8uvr+lEKHWSehpK3eciCIZ/lcFyaI=" + "version": "2.3.10", + "hash": "sha256-4LG06n+vo2bFpg9dQ9NSLvVf7rQfiD+k0FEq5S6tDsE=" }, { "pname": "Microsoft.NET.Test.Sdk", @@ -416,13 +416,13 @@ }, { "pname": "Polly", - "version": "8.6.6", - "hash": "sha256-0BrOttCw+HQYB24Y2uMy2vo0P5/txUlhELC8FlyLKps=" + "version": "8.7.0", + "hash": "sha256-iMNusWW+4nuIvkNLUaoru23Roe9vpC140TOIHbLvewE=" }, { "pname": "Polly.Core", - "version": "8.6.6", - "hash": "sha256-y6/a4OWrUlRfe0J8qdhBRmYRDi6K2y+kwhEVCIUOjvU=" + "version": "8.7.0", + "hash": "sha256-1AT4Xym9hn2Awgul9WErwXk2bBPN58P9XfRExrIPItg=" }, { "pname": "runtime.any.System.Collections", @@ -716,8 +716,8 @@ }, { "pname": "System.Diagnostics.EventLog", - "version": "9.0.16", - "hash": "sha256-5+BaoVjBFX0MoVDsUGqNs+Pu3oIrqksrnT9W7Eqgrww=" + "version": "9.0.18", + "hash": "sha256-pJBU/x5x1qwEjtSjkuTwVB6z04gAxMPPXOSdUIgYe1M=" }, { "pname": "System.Diagnostics.Tools", @@ -786,8 +786,8 @@ }, { "pname": "System.IO.Pipelines", - "version": "9.0.16", - "hash": "sha256-ySSAdeOwjapOB53Fb3EU0QwLHw1pLCoP2NZ07E8rj7Q=" + "version": "9.0.18", + "hash": "sha256-JacrrdrxR6u7aVjeJiSDOptqAV/f3rcszgz/WdCMBkg=" }, { "pname": "System.Linq", @@ -971,8 +971,8 @@ }, { "pname": "System.Security.Cryptography.Pkcs", - "version": "9.0.16", - "hash": "sha256-4IJgqiBVvHqLXr2LEC/m2sz4Z1ugU3YECsJHN2jvXqU=" + "version": "9.0.18", + "hash": "sha256-D16WfDikzmgkxmEspZqLa8m2UzyjgC3tivTAWCWZ87M=" }, { "pname": "System.Security.Cryptography.Primitives", @@ -986,8 +986,8 @@ }, { "pname": "System.Security.Cryptography.ProtectedData", - "version": "9.0.16", - "hash": "sha256-dzULuNU8/MMI0iZ9k1vS9pU5tgiwn6e7vvzGyxNHZHA=" + "version": "9.0.18", + "hash": "sha256-JfLdZjyzoRDHV2a6jGwq/xwuGy3T0XZNGB3zK9IAPBE=" }, { "pname": "System.Security.Cryptography.X509Certificates", @@ -996,8 +996,8 @@ }, { "pname": "System.Security.Cryptography.Xml", - "version": "9.0.16", - "hash": "sha256-1KFc+NUWOLCVj+KzrWVcrcL9Ph1roZ5qJuCfetHvQ8Q=" + "version": "9.0.18", + "hash": "sha256-OzwTTsPo8Gui1xs4+zlILwvZgbcxXJ97m3ejKqnebu4=" }, { "pname": "System.Security.Principal.Windows", @@ -1011,8 +1011,8 @@ }, { "pname": "System.ServiceProcess.ServiceController", - "version": "9.0.16", - "hash": "sha256-s7mpGEfvvgw5PzpcQJpMtrPzezPUaeJ81vc0KBM9+/k=" + "version": "9.0.18", + "hash": "sha256-LGttR/XVbEu/ZKz9Np0hTjP0t1TP/3lkQfGxWrhhT10=" }, { "pname": "System.Text.Encoding", @@ -1021,8 +1021,8 @@ }, { "pname": "System.Text.Encoding.CodePages", - "version": "9.0.16", - "hash": "sha256-llRnK9hMkLkFYP1OLNAfsr7GuIRP2OmbzfrIfCz2xv8=" + "version": "9.0.18", + "hash": "sha256-g5Ps501kdW4XXvSQrwb8qJq71I+P48+2T41uBkx42VA=" }, { "pname": "System.Text.Encoding.Extensions", @@ -1036,13 +1036,13 @@ }, { "pname": "System.Text.Encodings.Web", - "version": "9.0.16", - "hash": "sha256-Vo9mC4wgTNXc2DGUjhykVuuIJO8gpPTpYQJBsY0X5Rw=" + "version": "9.0.18", + "hash": "sha256-DTjo1Iqkf8qIdwYPKKeddiiU78j/OCvrMITJ3vlPdhU=" }, { "pname": "System.Text.Json", - "version": "9.0.16", - "hash": "sha256-GF3aOmsHlEjeWg/pkj1yFQktfd4PMNb2jKpMvUADOcQ=" + "version": "9.0.18", + "hash": "sha256-tClFgkq64oP9F4UEZhi2SrvVCkgnOmjVn7p0sbpiwEw=" }, { "pname": "System.Text.RegularExpressions", @@ -1096,7 +1096,7 @@ }, { "pname": "YamlDotNet", - "version": "16.3.0", - "hash": "sha256-4Gi8wSQ8Rsi/3+LyegJr//A83nxn2fN8LN1wvSSp39Q=" + "version": "18.1.0", + "hash": "sha256-Wf/mWt5nrZ2IYmf4d7Y0pFA2PLgblOGducpMNkYUFvY=" } ] diff --git a/pkgs/by-name/ja/jackett/package.nix b/pkgs/by-name/ja/jackett/package.nix index 1c744b328b22..405282ff4c20 100644 --- a/pkgs/by-name/ja/jackett/package.nix +++ b/pkgs/by-name/ja/jackett/package.nix @@ -12,13 +12,13 @@ buildDotnetModule (finalAttrs: { pname = "jackett"; - version = "0.24.2021"; + version = "0.24.2237"; src = fetchFromGitHub { owner = "jackett"; repo = "jackett"; tag = "v${finalAttrs.version}"; - hash = "sha256-/9NDFedtjMholM3Doqt/5hJ+Zw68DJheWNxZ0X+Kvuk="; + hash = "sha256-wlKfaVE69SQiA1GVxHWPAs5XOUv899E5NDVmI84/b7U="; }; projectFile = "src/Jackett.Server/Jackett.Server.csproj"; @@ -39,8 +39,6 @@ buildDotnetModule (finalAttrs: { runtimeDeps = [ openssl ]; # mono is not available on aarch64-darwin - #x86_64-darwin is failed with - #System.Net.Sockets.SocketException (13): Permission denied doCheck = !stdenv.hostPlatform.isDarwin; nativeCheckInputs = [ mono ]; testProjectFile = "src/Jackett.Test/Jackett.Test.csproj"; diff --git a/pkgs/by-name/ja/jadx/deps.json b/pkgs/by-name/ja/jadx/deps.json index 6ba277b93c6f..8717e1d647a9 100644 --- a/pkgs/by-name/ja/jadx/deps.json +++ b/pkgs/by-name/ja/jadx/deps.json @@ -2,14 +2,14 @@ "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", "!version": 1, "https://dl.google.com/dl/android/maven2/com/android": { - "tools#r8/8.13.17": { - "jar": "sha256-0x/Q3HUdSHQACc3ZpIUSassdDRTFm58FV5R5lA9K33Q=", - "pom": "sha256-L2yrUO4FVjWdnuAA2sSRLVo52tW6zt46XdudyWbeVDY=" + "tools#r8/9.1.31": { + "jar": "sha256-O03jBTiF2hBeOcFSEiYdImU9bRteuSMj3QSukTzIKG8=", + "pom": "sha256-S72wjiI2SBz1lzzCB0cPTiGtQ70Wzksyb4cYmQZQy80=" }, - "tools/build#aapt2-proto/8.13.2-14304508": { - "jar": "sha256-ps2oLVCOw7MlqeN/ePn6hFVv80DPQ7sjxiew8550bw4=", - "module": "sha256-fVtyhfR2yCAI8NOfUGsLjFPxsCa9Yk163GiCFr6Opb4=", - "pom": "sha256-+f1XBgvd7CGC3Mk1dBbpk5DUq4t4YWVLZ7cqdOCQ/6U=" + "tools/build#aapt2-proto/9.2.1-15009934": { + "jar": "sha256-IzW6t/2Cae6Y04Q0EMSlVT0x3XH5oi9JshpnbTE5yII=", + "module": "sha256-WVaRc7+A7IE9x61Fs37tAVhNEd3YhvxJh8vRe/Kbb0U=", + "pom": "sha256-eMmJdR6RlYFoubeqardbDuLjHXQ5WcqI+h/MrEWV0A8=" }, "tools/build#apksig/8.13.1": { "jar": "sha256-wHDtE5RinXRkGqCQb2Cy/6Hud+Y2ah+TQ39ZcXsa64k=", @@ -53,28 +53,28 @@ "jar": "sha256-CV/R3HeIjAc/C+OaAYFW7lJnInmLCd6eKF7yE14W6sQ=", "pom": "sha256-NQkZQkMk4nUKPdwvobzmqQrIziklaYpgqbTR1uSSL/4=" }, - "com/diffplug/durian#durian-swt.os/4.2.2": { - "jar": "sha256-a1Mca0vlgaizLq2GHdwVwsk7IMZl+00z4DgUg8JERfQ=", - "module": "sha256-rVlQLGknZu48M0vkliigDctNka4aSPJjLitxUStDXPk=", - "pom": "sha256-GzxJFP1eLM4pZq1wdWY5ZBFFwdNCB3CTV4Py3yY2kIU=" + "com/diffplug/durian#durian-swt.os/4.3.0": { + "jar": "sha256-geK2Oafkvm3JtyRXE88G9cq1HynbLha5tXZFyW/eKIQ=", + "module": "sha256-IFNqlfL+sr9DBRKMaq7Lb9idxFeYqchfJgK4qAnXUNs=", + "pom": "sha256-Q1z/VXiZht7arXF/aPuo1UgklHhWLc2EsirU1lZvRAs=" }, - "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/6.25.0": { - "pom": "sha256-9FyCsS+qzYWs1HTrppkyL6XeqIQIskfQ5L3pQSkIIjo=" + "com/diffplug/spotless#com.diffplug.spotless.gradle.plugin/8.8.0": { + "pom": "sha256-rjIEDWCar8jpaUB9lB6OAJ+/vhmR1A4GdTe9vlxSNxo=" }, - "com/diffplug/spotless#spotless-lib-extra/2.45.0": { - "jar": "sha256-YCy7zTgo7pz7LjCn+bMDNcaScTB3FBTUzdKU0h/ly2c=", - "module": "sha256-9pnkNfTlzgPbYJpHaO6wNj1uB8ZfvPrx/GKcTnbuf7A=", - "pom": "sha256-5x2LkRDdSNLn9KVLi/uozlWpbmteu9T0OpJGZJz1b7A=" + "com/diffplug/spotless#spotless-lib-extra/4.8.0": { + "jar": "sha256-vciax56nfFUzRzZDf6MuhsUW1aCbayIXgORXl2Pe6mw=", + "module": "sha256-fsJucDAxGawridZllXRA1d9cZ2/jMz8Vktc/lJodN10=", + "pom": "sha256-acayk+D14uHw0OiAyNZme8vsJ/Mudtw3+PFKaTw4Zis=" }, - "com/diffplug/spotless#spotless-lib/2.45.0": { - "jar": "sha256-sllply4dmAKAyirlKRl+2bMWCq5ItQbPGTXwG9Exhmc=", - "module": "sha256-+x+8+TUAczrHWcp99E8P9mVTEze0LaAS4on/CINNiQ8=", - "pom": "sha256-WKd8IsQLIc8m29tCEwFu9HrM9bBwchfHkyqQ9D+PMNw=" + "com/diffplug/spotless#spotless-lib/4.8.0": { + "jar": "sha256-/qJP2CUPcEnc+D6cU33KcNTu3fJ/ZWLMBbc5RdVYahU=", + "module": "sha256-x5qeZYQK3GICHDbY3j03FCXYZL+TSkWfzxQGxBBBSvc=", + "pom": "sha256-g1NaMOkgleCBTo4Y9mGvsc7Q7O/Mk+sI8iLXhiWBhYo=" }, - "com/diffplug/spotless#spotless-plugin-gradle/6.25.0": { - "jar": "sha256-9euQikxdpGKZ51Q/qtoEAtLEt31Yx7Qy1Lblk0mygKM=", - "module": "sha256-RoHRe/PJIF2DeOynBcAAywzJjcx40DATy2iJjGvSx0Q=", - "pom": "sha256-q1ZuPYS2w/rHqPySXy279TzZdZywOvPAfQ3EN9OXqNo=" + "com/diffplug/spotless#spotless-plugin-gradle/8.8.0": { + "jar": "sha256-4/v5wKvEIhru9DiGAA42oyMIvSNL9ntejx7B84MfVwc=", + "module": "sha256-NUNvS9pmAuS19I0Fer3fwb8+HY2kqJwdX8akTskkZcM=", + "pom": "sha256-oqjiUXekuEq40FutW8x6s8dbgWyibr2HC2jl+SMaJMY=" }, "com/fasterxml#oss-parent/55": { "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" @@ -95,13 +95,13 @@ "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" }, - "com/github/ben-manes#gradle-versions-plugin/0.53.0": { - "jar": "sha256-fystvdI5f/PwQ9e2YuwNYbqr7TqqerImB6702Y7z+mI=", - "module": "sha256-KLvVxzKZ1dGYcjzX8klS4b9RQJXE6OrpsisVQaicEII=", - "pom": "sha256-aPVU+CLT1aKhQrA6XZ9Wa5FXdPtjnYwds7zfmTyeQI0=" + "com/github/ben-manes#gradle-versions-plugin/0.54.0": { + "jar": "sha256-GwK15/qy3AUq4vlHU+5tsezaQoE/dXGycpqURbROpdU=", + "module": "sha256-2WoCXAumonbmVKE4UxXPExZ9CN+2uQuwSQo5RTUvmsg=", + "pom": "sha256-WX6mffXE8mkYP1y+WZAa2cBuExeLVZHNII2bMwQZ2J8=" }, - "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.53.0": { - "pom": "sha256-yWBPdJaskfaW5HRY2KLWt91U0MqkNn88GspmphyDcvQ=" + "com/github/ben-manes/versions#com.github.ben-manes.versions.gradle.plugin/0.54.0": { + "pom": "sha256-o07zaR8ZggeMe8ef2fuJojK3xzxFpYuBEVH+m/dgb+I=" }, "com/google/code/gson#gson-parent/2.11.0": { "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" @@ -164,18 +164,18 @@ "module": "sha256-akesUDZOZZhFlAH7hvm2z832N7mzowRbHMM8v0xAghg=", "pom": "sha256-rrO3CiTBA+0MVFQfNfXFEdJ85gyuN2pZbX1lNpf4zJU=" }, - "commons-codec#commons-codec/1.16.0": { - "jar": "sha256-VllfsgsLhbyR0NUD2tULt/G5r8Du1d/6bLslkpAASE0=", - "pom": "sha256-bLWVeBnfOTlW/TEaOgw/XuwevEm6Wy0J8/ROYWf6PnQ=" + "commons-codec#commons-codec/1.22.0": { + "jar": "sha256-0WT+efJiwy2bGKC1stMX0cJ2U9Xpj9K5mMJL+QHHLOQ=", + "pom": "sha256-2aVl2Xj6pp0rEZX7HsJ+YPKef+sJr7ha2sePKABo+P4=" }, "commons-io#commons-io/2.19.0": { "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=", "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA=" }, - "dev/equo/ide#solstice/1.7.5": { - "jar": "sha256-BuFLxDrMMx2ra16iAfxnNk7RI/mCyF+lEx8IF+1lrk8=", - "module": "sha256-eYp7cGdyE27iijLt2GOx6fgWE6NJhAXXS+ilyb6/9U8=", - "pom": "sha256-20U7urXn2opDE5sNzTuuZykzIfKcTZH1p5XZ/2xS3d8=" + "dev/equo/ide#solstice/1.8.2": { + "jar": "sha256-nslXwJZgBSDcmfN6EEp/TJkNQMLdN17pYOt8bNUMEvM=", + "module": "sha256-SrIVTJ83agthp6/i0djQJ+pvOQ08hyzkcKbZgqR+Wv4=", + "pom": "sha256-70jsrBwclJAdj/ML8J16CClTQCNnLdXiVyek6Vh+oFM=" }, "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" @@ -183,12 +183,12 @@ "jakarta/platform#jakartaee-api-parent/9.1.0": { "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" }, - "org/apache#apache/29": { - "pom": "sha256-PkkDcXSCC70N9jQgqXclWIY5iVTCoGKR+mH3J6w1s3c=" - }, "org/apache#apache/33": { "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" }, + "org/apache#apache/37": { + "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M=" + }, "org/apache/ant#ant-launcher/1.10.15": { "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" @@ -200,12 +200,12 @@ "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" }, - "org/apache/commons#commons-parent/58": { - "pom": "sha256-LUsS4YiZBjq9fHUni1+pejcp2Ah4zuy2pA2UbpwNVZA=" - }, "org/apache/commons#commons-parent/81": { "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" }, + "org/apache/commons#commons-parent/98": { + "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o=" + }, "org/apache/groovy#groovy-bom/4.0.22": { "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" @@ -265,16 +265,16 @@ "org/eclipse/ee4j#project/1.0.7": { "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" }, - "org/eclipse/jgit#org.eclipse.jgit-parent/6.7.0.202309050840-r": { - "pom": "sha256-u56FQW2Y0HMfx2f41w6EaAQWAdZnKuItsqx5n3qjkR8=" + "org/eclipse/jgit#org.eclipse.jgit-parent/7.7.0.202606012155-r": { + "pom": "sha256-S4qHPLaFhEH/MSUDTbVU0leSL7cIIEeVtyAZDW+05iE=" }, - "org/eclipse/jgit#org.eclipse.jgit/6.7.0.202309050840-r": { - "jar": "sha256-tWRHfQkiQaqrUMhKxd0aw3XAGCBE1+VlnTpgqQ4ugBo=", - "pom": "sha256-BNB83b8ZjfpuRIuan7lA94HAEq2T2eqCBv4KTTplwZI=" + "org/eclipse/jgit#org.eclipse.jgit/7.7.0.202606012155-r": { + "jar": "sha256-onxHjV94vD2VRh8VOmDv3xYjknUCxopFetmplaNcWnw=", + "pom": "sha256-owH00aR2nxrSVstU54V6Uq8n59A+UMo8UPTLZDw98SY=" }, - "org/eclipse/platform#org.eclipse.osgi/3.18.300": { - "jar": "sha256-urlD5Y7dFzCSOGctunpFrsni2svd24GKjPF3I+oT+iI=", - "pom": "sha256-4nl2N1mZxUJ/y8//PzvCD77a+tiqRRArN59cL5fI/rQ=" + "org/eclipse/platform#org.eclipse.osgi/3.24.200": { + "jar": "sha256-v+g/zR+gNOuamGs8tuXisY27rLZ+q9qtLaMoBOzYxlo=", + "pom": "sha256-sMVs+qxqcAh+RUJXzABLfTb7uYk9vu5N64fGISWGERY=" }, "org/gradle/kotlin#gradle-kotlin-dsl-plugins/5.2.0": { "jar": "sha256-SKlcMPRlehDfloYC01LJ2GTZemYholfoFQjINWDE/q4=", @@ -569,9 +569,9 @@ "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" }, - "org/junit#junit-bom/5.9.3": { - "module": "sha256-tAH9JZAeWCpSSqU0PEs54ovFbiSWHBBpvytLv87ka5M=", - "pom": "sha256-TQMpzZ5y8kIOXKFXJMv+b/puX9KIg2FRYnEZD9w0Ltc=" + "org/junit#junit-bom/5.14.2": { + "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", + "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" }, "org/mockito#mockito-bom/4.11.0": { "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" @@ -595,15 +595,18 @@ "jar": "sha256-NiT4R0wa9G11+YvAl9eGSjI8gbOAiqQ2iabhxgHAJ74=", "pom": "sha256-ABzeWzxrqRBwQlz+ny5pXkrri8KQotTNllMRJ6skT+U=" }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + "org/slf4j#slf4j-api/2.0.18": { + "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=", + "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s=" + }, + "org/slf4j#slf4j-bom/2.0.18": { + "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0=" }, "org/slf4j#slf4j-parent/1.7.32": { "pom": "sha256-WrNJ0PTHvAjtDvH02ThssZQKL01vFSFQ4W277MC4PHA=" }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + "org/slf4j#slf4j-parent/2.0.18": { + "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo=" }, "org/sonatype/oss#oss-parent/5": { "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" @@ -636,42 +639,41 @@ "jar": "sha256-iPvaS5Ellrn1bo4S5YDMlUus+1F3bs/d0+GPwc9W3Ew=", "pom": "sha256-EA95O6J/i05CBO20YXHr825U4PlM/AJSf+oHoLsfzrc=" }, - "aopalliance#aopalliance/1.0": { - "jar": "sha256-Ct3sZw/tzT8RPFyAkdeDKA0j9146y4QbYanNsHk3agg=", - "pom": "sha256-JugjMBV9a4RLZ6gGSUXiBlgedyl3GD4+Mf7GBYqppZs=" - }, "ch/qos/logback#logback-classic/1.5.21": { "jar": "sha256-slI/ew2r9DhsgTEvA3HSZ+Op+85AkEbxawQr9oVxuko=", "pom": "sha256-2L+25QxBRYd4sAl7bgatXgc5HpbkMjuJSjBaZoHVZbE=" }, - "ch/qos/logback#logback-classic/1.5.22": { - "jar": "sha256-h18xxLTcSYCOUDSQcBohzuPnJ5gA2cdmAdqCaFNC5Us=", - "pom": "sha256-50vZc0HgSY7vwDzn/gY2W8MTA4URDyg6SrXk5Mx03tk=" + "ch/qos/logback#logback-classic/1.5.38": { + "jar": "sha256-r7Q5xh+ih8nhklUjsTuqsDYX5yRAajidSLYcLD5GtwA=", + "pom": "sha256-YzE/hDtmnGAlXmbyxSqcHTrzeHAJ2fOJFZ41ppG2OFc=" }, "ch/qos/logback#logback-core/1.5.21": { "jar": "sha256-CCWsH8UpY2kSHlQj45fFLRJbDj+udDz8DY5BYVnxT0Q=", "pom": "sha256-kuYdhik+WPSObO9Xu55qx3sqd57ayaQ/GC8YYUJ0IUM=" }, - "ch/qos/logback#logback-core/1.5.22": { - "jar": "sha256-dWG3pSU2RhKWb/OCP4xiqBoyYnQtRVMB9HknPvVVcLg=", - "pom": "sha256-pvNkcaYMUESMURI07jpJs+YzuYKM7NuO111F4lq8I/o=" + "ch/qos/logback#logback-core/1.5.38": { + "jar": "sha256-qFWg/Jex0G9O+xw7ul69DrUI2LWOaOieS7wjqFE1yIM=", + "pom": "sha256-26FwfwJSAv40QFIWPDQZoPA9BWd3rFw0YXXlUjyTfWA=" }, "ch/qos/logback#logback-parent/1.5.21": { "pom": "sha256-3PccPlQ27GTfEIU6bOjEMNARdxCmyPyb6eK7tvLx5KM=" }, - "ch/qos/logback#logback-parent/1.5.22": { - "pom": "sha256-pSlOXwZyowtUHrCJIXA/luORyJAsef/+WO7Z4wzsWXk=" + "ch/qos/logback#logback-parent/1.5.38": { + "pom": "sha256-K846YaZEmtuaByLhwMHjkVM4gLoCkW09+DIImZrqbGY=" + }, + "com/eclipsesource/j2v8#j2v8_linux_x86_64/4.6.0": { + "jar": "sha256-VmTvg7AmsGEnXvCREBbCx8vSRe6gDXi0To4yqjinEOo=", + "pom": "sha256-Mbe26/pHzPx4ta5Cb0pYEUpiLJSeNRsmMBx7gLVVhjI=" + }, + "com/eclipsesource/j2v8#j2v8_win32_x86_64/4.6.0": { + "jar": "sha256-h4yJBoOLv76xx3guAiWWouNTcTI6Cjh7uXSmQHN48xM=", + "pom": "sha256-oCUgVrP8MgvG5r6yzCcFoMPYCvuOg/qnKlj+dImsyy4=" }, "com/fifesoft#autocomplete/3.3.2": { "jar": "sha256-bn+4bT9V9p8TogCk2qagTht1P4/TadoFe015KtxpQ1A=", "module": "sha256-fOqonK0zGDCGxKuU/sJF9outzqpxDfy2PZ8ajmJ9kao=", "pom": "sha256-bKhazD7s8LTdfQIA0cMm+ZHInY4KADqVbI9dS4kc7t0=" }, - "com/fifesoft#rsyntaxtextarea/3.6.0": { - "jar": "sha256-vwDsEBV5jt1DPD363ww0oSo5W4wBD4+f2Oxv9PROuUw=", - "module": "sha256-xmVm3lcpsQkmEimKqWaVtUVpPUEILd60RR/sASa4/Ao=", - "pom": "sha256-Mqfj1XMX7NOR6CDwohJLT5jOHONfMnVRkuxDPDUH3bA=" - }, "com/fifesoft#rsyntaxtextarea/3.6.1": { "jar": "sha256-qu9bv8cu0aagSgO4+zfY0LoEGlcDll0ADVQOIg2fG7U=", "module": "sha256-f7wBLMjeLBZzoL2WHeCJwIJpTeTkubSIZX42ClwmWKQ=", @@ -711,9 +713,6 @@ "jar": "sha256-gfya2lefw/SSTsNfkEwEPeE+6PuigDIuY4xwkgBvG1I=", "pom": "sha256-Guxlwy/utQYjbKc4rAoRwCwdslicZZzWFfDomcAyFic=" }, - "com/google#google/5": { - "pom": "sha256-4J00XnPKP7yn8+BfMN63Tp053Wt5qT/ujFEfI0F7aCg=" - }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" @@ -721,28 +720,42 @@ "com/google/code/gson#gson-parent/2.13.2": { "pom": "sha256-g6tSip1Q/XauuK1vcns+6ct2ZYYlV3TtFsqMTHbZ2s0=" }, + "com/google/code/gson#gson-parent/2.14.0": { + "pom": "sha256-grD2aUxXWKuLsH4FYwII1Q9YnUteBP0KBG1Zzfe6PR0=" + }, "com/google/code/gson#gson/2.13.2": { "jar": "sha256-3QzhtVo+0ggMtw+cZVhQzahsIGhiMQAJ3LXlyVJlpeA=", "pom": "sha256-OqBqp8D5rwkpYaQtCVeOQyS+FGNIoO5u1HhX98Jne3Y=" }, - "com/google/errorprone#error_prone_annotations/2.1.3": { - "jar": "sha256-A9AylUfBPanhfGNNEEnqLq0JOSXikFZ+GjZP1rH8f/g=", - "pom": "sha256-lYy4HDk8splsPGqehnpKS+jdxDORZyqeTk66UaxyN/U=" + "com/google/code/gson#gson/2.14.0": { + "jar": "sha256-LL0Rm/GWHCh4gxCWPcgLpl9Yze7B3ROci9sSQPqiw28=", + "pom": "sha256-H6ASLA43MxkmQoYcNr5Mb3maeVMnojvdKSJpG26bpIA=" }, "com/google/errorprone#error_prone_annotations/2.41.0": { "jar": "sha256-pW54K1tQgRrCBAc6NVoh2RWiEH/OE+xxEzGtA29mD8w=", "pom": "sha256-oVHfHi4LSGGNiwahgHSKKbOrs5sbI5b2och5pydIjG4=" }, + "com/google/errorprone#error_prone_annotations/2.47.0": { + "jar": "sha256-U2S8byLnLpgZXkBqWNO6HAn/oR3qBylZLLhw3C3kBW0=", + "pom": "sha256-2AyImkpvcR9pRfvueeBewkexeKVn6dWr9Y6ybr8KB1I=" + }, + "com/google/errorprone#error_prone_annotations/2.48.0": { + "jar": "sha256-tJxclYMW7WegnGmd2pqnScr0NNUdhj3qWZ7zakm5yFU=", + "pom": "sha256-GJ4JrQSJwyXpDaqp1cj0BjMGAvo2Zgm8oHy82tA6udo=" + }, "com/google/errorprone#error_prone_annotations/2.7.1": { "jar": "sha256-zVJXwIokbPhiiBeuccuCK+GS75H2iByko/z/Tx3hz/M=", "pom": "sha256-Mahy4RScXzqLwF+03kVeXqYI7PrRryIst2N8psdi7iU=" }, - "com/google/errorprone#error_prone_parent/2.1.3": { - "pom": "sha256-1SomFqE4n86VHeDpengLiPG98MlHsxWnb9R81rv7I5s=" - }, "com/google/errorprone#error_prone_parent/2.41.0": { "pom": "sha256-xTg4jXYKXByY3PBvbtPP5fEaZRgn21y9LtgojHlcrUI=" }, + "com/google/errorprone#error_prone_parent/2.47.0": { + "pom": "sha256-I2ipkMemMJXh0NREWdWkCS8Osx+FYr0SzfDhyHe2poU=" + }, + "com/google/errorprone#error_prone_parent/2.48.0": { + "pom": "sha256-sz+opFyfF5SlAIwLLYOoTrKLXQEXptFW8AP58JvnQQ8=" + }, "com/google/errorprone#error_prone_parent/2.7.1": { "pom": "sha256-Cm4kLigQToCTQFrjeWlmCkOLccTBtz/E/3FtuJ2ojeY=" }, @@ -754,9 +767,6 @@ "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=", "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s=" }, - "com/google/guava#guava-parent/25.1-android": { - "pom": "sha256-0ZsIc6B+Ez/yTAoYlDunEKfPul81poqm82JF1AAmtNU=" - }, "com/google/guava#guava-parent/26.0-android": { "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" }, @@ -766,39 +776,22 @@ "com/google/guava#guava-parent/33.4.0-android": { "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" }, - "com/google/guava#guava-parent/33.5.0-jre": { - "pom": "sha256-aHGeaHxuTJ/z4P7L73vSCJbw9PezFHQ+0zxy+WJWghU=" - }, - "com/google/guava#guava/25.1-android": { - "jar": "sha256-97j4/tF2uc9oMbmMsHMg1/vpHZmymZn3UsOCHf5Fvcg=", - "pom": "sha256-TR7iht9KVF87l4WMFHzvAVovWPKbHk6J5om+ohYZX2M=" + "com/google/guava#guava-parent/33.6.0-jre": { + "pom": "sha256-N0vTH2Gxz2Er7pqy5NcLvfd92FpJtDH4CdT73JAfLdQ=" }, "com/google/guava#guava/31.0.1-jre": { "jar": "sha256-1b6U1l6HvSGfsxk60VF7qlWjuI/JHSHPc1gmq1rwh7k=", "pom": "sha256-K+VmkgwhxgxcyvKCeGfK/3ZmRuIRO3/MPunCSkCy85Y=" }, - "com/google/guava#guava/33.5.0-jre": { - "jar": "sha256-HjAfDFKsJIsLFP3D0SKDx3JS1Nb0hSHVcufYxMLMSsc=", - "module": "sha256-d+1CyMiyzru5OsngdUP/ZBiqJL24UXWAz1Mk6aZRCVY=", - "pom": "sha256-BHj6eKkIs8Mf5td76ZeKqmIeKhgduEAH49OzdCSirGE=" + "com/google/guava#guava/33.6.0-jre": { + "jar": "sha256-3Fc+H8pP1UVPSl/T19ot8DACh2pBdbr8FKlZgN13E7M=", + "module": "sha256-K69zzoOa5I5LngCD4law5Y/Dv4/Hj8P755e7yJARIW4=", + "pom": "sha256-tFt4lEKABUMRxT2pJwgJ+0Dcq8QIzmbOVXMAmbT1fTI=" }, "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" }, - "com/google/inject#guice-parent/4.2.2": { - "pom": "sha256-WnS6PSK+GsE7nngvE6fZV9sqJN7TWUgTlMnoifHAN9Y=" - }, - "com/google/inject#guice/4.2.2": { - "pom": "sha256-BvPD3a1Xswv+iGVUVqBHMeVqeK0N2QnmXHGIEAO5ZHk=" - }, - "com/google/inject#guice/4.2.2/no_aop": { - "jar": "sha256-D09fsoYJpNKzi39xKL58+bVB8lKD1xtOVgZtmWg6r/8=" - }, - "com/google/j2objc#j2objc-annotations/1.1": { - "jar": "sha256-KZSn63jycQvT07+2ObLJTiGc7awNTQhNUW54wW3d7PY=", - "pom": "sha256-8MmMVx6Tp8tN0Y3w+jCPCWPnoGIKwtQkTmHnCdA61r4=" - }, "com/google/j2objc#j2objc-annotations/1.3": { "jar": "sha256-Ia8wySJnvWEiwOC00gzMtmQaN+r5VsZUDsRx1YTmSns=", "pom": "sha256-X6yoJLoRW+5FhzAzff2y/OpGui/XdNQwTtvzD6aj8FU=" @@ -832,57 +825,32 @@ "module": "sha256-+ZoUD5M57H9daiy9exohetkZmvmjm9YtVR7zJzr2qO4=", "pom": "sha256-HFT9dBll8xPm0g2xFVa7jM4v87hsg49YzQ6isxDKxRw=" }, - "com/pinterest/ktlint#ktlint-cli-ruleset-core/1.8.0": { - "jar": "sha256-PN4H3Taz0rCtm/YyChXXSh0WmZNhopQ+yJp3A1+Izvg=", - "module": "sha256-HpqJKShrcN9QMfTJsYT1KBt/SFqFJqg93wIw4NzQmNw=", - "pom": "sha256-CYVj1Lp5q1ho9aEcS/rtPMjx8+2AgRC2Y8nHxuEo5wU=" - }, - "com/pinterest/ktlint#ktlint-logger/1.8.0": { - "jar": "sha256-Mjolh7xdZYrKwquECBvhqR7CckR92uI+iJ/+7qA6ahk=", - "module": "sha256-6do/ejKLvEYv3nzuExoqDQFsk3QqoswYdUSFp9cRsJI=", - "pom": "sha256-sMudqdzo3/wOt42C2JWWG2UW+DPYEjZxlG6T4KqEGUs=" - }, - "com/pinterest/ktlint#ktlint-rule-engine-core/1.8.0": { - "jar": "sha256-vZnbyIi+Zq6jHbRfTc5cpW9GWvvwL+5jm9I0bSzYZOw=", - "module": "sha256-3littFd/kBQ9Gyv49iHmhAts4okLwhwUnJZdk1z8sdk=", - "pom": "sha256-4TICD2wyBfo93xfdVyu13gAC4d4whfV3D+w9svW7XuQ=" - }, - "com/pinterest/ktlint#ktlint-rule-engine/1.8.0": { - "jar": "sha256-JrK8e4QNrSGdVqJ28R/ko5w15WegYdcZpQkUsw9AN3I=", - "module": "sha256-cgWx4FCiOMdupNpHQCoWeqR16ElvjMk885ns1XRCP14=", - "pom": "sha256-GxX7s88C2N3bbioadbhdgTNfomUabFSnGkoe7nzlSt4=" - }, - "com/pinterest/ktlint#ktlint-ruleset-standard/1.8.0": { - "jar": "sha256-gpcrTLLpzWgoQAYbLenTQgRIRvDYFuzFj1CViCR2DWk=", - "module": "sha256-IZmrq6NLUJkrez/CDcE59o+xa99P9qb4PNeXaBa5WDE=", - "pom": "sha256-a/W5nlnAjxhBYiZhgkIB5IBYkaXIxp/EB89KPmgIDus=" - }, "com/puppycrawl/tools#checkstyle/9.3": { "jar": "sha256-BGPjBJgPVGC5ZPSBzMJaEPslO2AQDBnlD8mSiSiVl38=", "pom": "sha256-p9y0ZmVtZ/oKUNkE/d8U/GtTmEa4FO3/djXHRdW9MDQ=" }, - "com/squareup/okhttp3#mockwebserver3/5.3.0": { - "jar": "sha256-DF7A68lN/jZyFOL24m0y7ZvnXx17+fltmqRJPD2/Gn0=", - "module": "sha256-W+qZkqfKyNZz2huiCotFFDstV+XA2b3L/MccFUallC0=", - "pom": "sha256-6UvzdVwVUbBvnIQJvpj1RmzyXfxpsJ222EbDwzn/6s4=" + "com/squareup/okhttp3#mockwebserver3/5.4.0": { + "jar": "sha256-4eHVGldWfW24NPk9mIMasQuwIguRpnWAiU2as2zJ8GU=", + "module": "sha256-EWEJnVQQM5JrwIhqC8K0+5Kpmk/pQQGAuvN3FZqZa7s=", + "pom": "sha256-YVQP32dFG1xfe20tUXzk1TgkFY1b9C/wxQl2aeBKtNY=" }, - "com/squareup/okhttp3#okhttp-jvm/5.3.0": { - "jar": "sha256-fWAz7qDrAEVhXja9WiUPLgMgiF/+25nVwnqF5vXy+Ow=", - "module": "sha256-9QCTQDa/b6QGA3cGd3dpVQY1a/5zC7dCdvmyhMO9HgU=", - "pom": "sha256-yNbI7YKHcLhOE9QvTp2hGwro3lAB3CIrGd5nr1SGINU=" + "com/squareup/okhttp3#okhttp-jvm/5.4.0": { + "jar": "sha256-sV5gXKCksSxi6n9lfa1BPCNslH6HWFR2c0nNviDfRzw=", + "module": "sha256-LulBMuwJzT8RPMkA9ubc56VtnvmvRO1ayy6mt7yhNn0=", + "pom": "sha256-AsqVdVDYn0mbVhdE2balmr/VNXI/rzEmnDKQoNeMbQ4=" }, - "com/squareup/okhttp3#okhttp/5.3.0": { - "module": "sha256-I2/T6i5sxaIyY42z231edc9efNL6AY6JeQ4AYMzqp0c=", - "pom": "sha256-bnDpR5DXcxxy9hq0X+s0vRMjmm8nQUQGs1UcIeQJERc=" + "com/squareup/okhttp3#okhttp/5.4.0": { + "module": "sha256-Y5c7p1W6bHfeHoL176QZVWmAC+AMk8ATDOQjiptWyTw=", + "pom": "sha256-6+5oQtC1twCrfgFf3cw/HlddkrMadve2LrkCbDOIuIs=" }, - "com/squareup/okio#okio-jvm/3.16.2": { - "jar": "sha256-oKnxq/uQwKN7nIR86jn/8m0V85JT9RdWMs25SMljGNA=", - "module": "sha256-SclI9LQJ+Ep07eLykFd0BU4r3Jt02f/JP/nni0ARp5Y=", - "pom": "sha256-1HKg9+Imj/FtQBKxL5pPC0OuYIUazc33aAzxf6kIb00=" + "com/squareup/okio#okio-jvm/3.17.0": { + "jar": "sha256-OxPcw+FXMEfC1Qf8T3/LC7DLzZ05XaIdIOCUBuLNanM=", + "module": "sha256-1GF9DfcfIC5ymUcYSOYl9PNtf6ZNRsNQP3Cs9IIaRd4=", + "pom": "sha256-5ORCN6ZvQJG8D1sdWiu+IorAFKs8D5GM1vwCujGZkDA=" }, - "com/squareup/okio#okio/3.16.2": { - "module": "sha256-dAj9srGIjjHzxmxcE6xzNPO0ERfCbtVUNgGirYTG4yk=", - "pom": "sha256-tQbj1Rl248AvkSafkIyjBVgGrk28ek3dEGbmUDYABcA=" + "com/squareup/okio#okio/3.17.0": { + "module": "sha256-PYeNuf/U6VnDD5qDZqiMItAB6bMkN419vu2YVo5+xVk=", + "pom": "sha256-FbSDHoT1ylLdN8HW4XCaKQfi6bwqnD6hPyggMd4MATU=" }, "com/twelvemonkeys#twelvemonkeys/3.12.0": { "pom": "sha256-ttCYdPvd2bslDReBepMe+OCTvBjnQob/BrBAVBmAxzA=" @@ -921,30 +889,31 @@ "jar": "sha256-fZOMgXiQKARcCMBl6UvnX8KAUnYg1b1itRnVg4UyNoo=", "pom": "sha256-w1zKe2HUZ42VeMvAuQG4cXtTmr+SVEQdp4uP5g3gZNA=" }, - "commons-codec#commons-codec/1.11": { - "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", - "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" - }, "commons-collections#commons-collections/3.2.2": { "jar": "sha256-7urpF5FxRKaKdB1MDf9mqlxcX9hVk/8he87T/Iyng7g=", "pom": "sha256-1dgfzCiMDYxxHDAgB8raSqmiJu0aES1LqmTLHWMiFws=" }, - "commons-io#commons-io/2.18.0": { - "jar": "sha256-88oPjWPEDiOlbVQQHGDV7e4Ta0LYS/uFvHljCTEJz4s=", - "pom": "sha256-Y9lpQetE35yQ0q2yrYw/aZwuBl5wcEXF2vcT/KUrz8o=" - }, "commons-io#commons-io/2.21.0": { "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" }, - "dev/drewhamilton/poko#poko-annotations-jvm/0.20.1": { - "jar": "sha256-Fz/EQ/MLgYUpXJyblAEnK+hPVT5YNeN2fH2q/lvmBsk=", - "module": "sha256-yKFi1MVH49rn1YS/6uWWWaCOmIL78ZBAOdC5sJ5TDNA=", - "pom": "sha256-7vV49Xk7nI8QOyMr7solkxbrDzq/3EakACasot0w7SE=" + "commons-io#commons-io/2.22.0": { + "jar": "sha256-K5p7H3JvuGIW29LIMh6r4CIdvVsb6BwY4ctTgRsQR1g=", + "pom": "sha256-ZCXOwOp2ADXvp3J33oX4n6bb7RR6s92VuNLLxVNArM8=" }, - "dev/drewhamilton/poko#poko-annotations/0.20.1": { - "module": "sha256-r2kPmw0oxcHMCnwhcgUfI3GXm6Mijy7Bpen9IdzHY0U=", - "pom": "sha256-Nmq4/RYDG4BaXN/EBblv7jVuNr3M3pFF/7pXYsWovvA=" + "guru/nidi#graphviz-java-parent/0.18.1": { + "pom": "sha256-PK4LNey39USWi6GMGWOjEgTtH0vGyzM4+vqKMm8WT/c=" + }, + "guru/nidi#graphviz-java/0.18.1": { + "jar": "sha256-y/rONXq5wnzIkmroZT3kigiAyl01MrU6BsDewvbgKSE=", + "pom": "sha256-ZSrYLfypLU9xy4+hcp3axpJAFNBLV7JnZUhlCGIcTm8=" + }, + "guru/nidi#guru-nidi-parent-pom/1.1.36": { + "pom": "sha256-LihEX2IccvHvnvSdGFI4T/HnE3smuJIZ1FLwEmyc74w=" + }, + "guru/nidi/com/kitfox#svgSalamander/1.1.3": { + "jar": "sha256-rRLqaU6+xbULEDIucrfiz7bRaJ9boLzViwjwLB9Qx2U=", + "pom": "sha256-toDc92ke4L0go6ytRSLuSmPmSnfv+kNuUFjiPi+I1tM=" }, "hu/kazocsaba#image-viewer/1.2.3": { "jar": "sha256-wqNLddLK8alfjMGXGam6MNEJZhi9sIez22/8ELrAUik=", @@ -1003,28 +972,25 @@ "module": "sha256-2jn02k/u133+ELmAnVyysvO0Ra6nG2nhUjKkJpiThzs=", "pom": "sha256-chJrr7gKEse1WFJNCRkj5pYSODxHQay34Aw1ybBUazQ=" }, - "javax/annotation#javax.annotation-api/1.2": { - "jar": "sha256-WQmzlso6K+ENDuoyx073jYFuG06tId4deN4fiQ0DPgQ=", - "pom": "sha256-Utc/NffmOM48tWVG+HnCDn9wGfcqogzeH6gOl4Zd/UA=" - }, "javax/inject#javax.inject/1": { "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" }, - "net/bytebuddy#byte-buddy-parent/1.17.7": { - "pom": "sha256-ilfiDczgDaccM+8+GdndhY/p0gQsouK8onhxcA1SaYw=" + "net/arnx#nashorn-promise/0.1.1": { + "jar": "sha256-HS2d9MBFDU+x722+jB2FC3qabJLrbYF7YuRCnqjeTf4=", + "pom": "sha256-GZIqxpxfcQmvOXy6BKttZsf2hFVUe6IutJ3hvDJ6P/g=" }, - "net/bytebuddy#byte-buddy/1.17.7": { - "jar": "sha256-NXXcuKmPr5Q9PBWVxHoWBHxPzoqD67smJi8aL2dUY1c=", - "pom": "sha256-7n+6hWnDu1wekeWBL9n0oPMb4n5WjVNU4a39GRGfl7M=" + "net/bytebuddy#byte-buddy-parent/1.18.3": { + "pom": "sha256-kOpTFzFQjup1/5KVFBxQjX+aU9GgX0W4D49JmVIUJu8=" + }, + "net/bytebuddy#byte-buddy/1.18.3": { + "jar": "sha256-14OW48W84/KGXJGGZHSB5VidNMrMYySEcVtoYQjRfGY=", + "pom": "sha256-cVe2IqDWiFy1UmoQ8SIN3wkNu1LKL+OMMsxpxPFTB4g=" }, "net/fabricmc#mapping-io/0.8.0": { "jar": "sha256-zxN8f5BJqNTArajnZRgEYr8c2kIXIwCCEimsLUa2VIw=", "pom": "sha256-DDhXUa+iPSqFwAdx4CwI8bcSJSrQJx+6RHW6u3aKtig=" }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, "net/sf/saxon#Saxon-HE/10.6": { "jar": "sha256-bQjfguTthrarsaAse3SiaPz8XgBOg7tP8AbsOlCb01Y=", "pom": "sha256-otbdpDjoZKuTXzG0O1MFLE6HEalQVkJxkZBRPnb0Ekg=" @@ -1055,53 +1021,38 @@ "jar": "sha256-9mznLpZeUwHLDwIOVNK6atdv65Gzy/ww278AwGpt9tc=", "pom": "sha256-tF6CZVqlpI8z0TpD5DRUJrFWM1s14kta6hLbWCPBahY=" }, + "org/apache#apache/15": { + "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" + }, "org/apache#apache/16": { "pom": "sha256-n4X/L9fWyzCXqkf7QZ7n8OvoaRCfmKup9Oyj9J50pA4=" }, - "org/apache#apache/18": { - "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" - }, "org/apache#apache/19": { "pom": "sha256-kfejMJbqabrCy69tAf65NMrAAsSNjIz6nCQLQPHsId8=" }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/25": { - "pom": "sha256-5o/BmkjOxYKmcy/QsQ2/6f7KJQYJY974nlR/ijdZ03k=" - }, - "org/apache#apache/32": { - "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" - }, - "org/apache#apache/33": { - "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" - }, "org/apache#apache/35": { "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" }, + "org/apache#apache/37": { + "pom": "sha256-Uk7EeHr/c69rOp+voVTH8YgbZIKZtmP9v8rdoShvI1M=" + }, + "org/apache/commons#commons-exec/1.3": { + "jar": "sha256-y0mBLcG/sOpPIPOYvK4aiMZAbiE+Z/dST7ENT4rZNHs=", + "pom": "sha256-goJ/YBnA9xvXT7qIarM3/22ikfY9+XIzeaIJ1q07RPg=" + }, "org/apache/commons#commons-lang3/3.20.0": { "jar": "sha256-aeXJ+jXaelGl/SCZ3+VqLY0yzyM+L213DnlhRkQCY/Q=", "pom": "sha256-fKg7JwnB56ngO1ds1BQiGQN5SJqAhm5UL4yLlVQRoqo=" }, - "org/apache/commons#commons-lang3/3.8.1": { - "jar": "sha256-2sgH9lsHaY/zmxsHv+89h64/1G2Ru/iivAKyqDFhb2g=", - "pom": "sha256-7I4J91QRaFIFvQ2deHLMNiLmfHbfRKCiJ7J4vqBEWNU=" + "org/apache/commons#commons-parent/35": { + "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" }, "org/apache/commons#commons-parent/39": { "pom": "sha256-h80n4aAqXD622FBZzphpa7G0TCuLZQ8FZ8ht9g+mHac=" }, - "org/apache/commons#commons-parent/42": { - "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" - }, "org/apache/commons#commons-parent/47": { "pom": "sha256-io7LVwVTv58f+uIRqNTKnuYwwXr+WSkzaPunvZtC/Lc=" }, - "org/apache/commons#commons-parent/78": { - "pom": "sha256-Ai0gLmVe3QTyoQ7L5FPZKXeSTTg4Ckyow1nxgXqAMg4=" - }, "org/apache/commons#commons-parent/91": { "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" }, @@ -1111,159 +1062,21 @@ "org/apache/commons#commons-parent/93": { "pom": "sha256-qItfYWWmWb+DVEGDe8xcU+mf3nm5LPu4aYjOKVTNUmc=" }, + "org/apache/commons#commons-parent/98": { + "pom": "sha256-1AMYUn9WAz4P8HiZccw4yFaqmaaF7qEScIFOfx7an7o=" + }, "org/apache/commons#commons-text/1.15.0": { "jar": "sha256-WNLaMPBYUSoef5FOOSQd7KTf9cJ6CFtO0vqp5yCAZ/Y=", "pom": "sha256-XlFoaHvO2uoqqFVrizL1r6CO/Lwx0RuUfIZ2mHvJ0jk=" }, - "org/apache/httpcomponents#httpclient/4.5.14": { - "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", - "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5.14": { - "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.16": { - "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" - }, - "org/apache/httpcomponents#httpcomponents-parent/11": { - "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" - }, - "org/apache/httpcomponents#httpcore/4.4.16": { - "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", - "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" - }, - "org/apache/maven#maven-artifact/3.8.8": { - "jar": "sha256-gTIzqEhcuvl7H5osF873I7Bo9yYKQxnPSVjyIdBLmTc=", - "pom": "sha256-PGKRS2E++Q+BwFaN7kCNIlVrTZmoHnqk1yqlxO4r96U=" - }, - "org/apache/maven#maven-builder-support/3.8.8": { - "jar": "sha256-xCXKFp1nIXJWqNGZEURpH88jNR4JQxiQryQL/u0zuQI=", - "pom": "sha256-5yV1kZJC/vDOa4r3vKjVCbySqR74GB/henR7ALSsJLg=" - }, - "org/apache/maven#maven-core/3.8.8": { - "jar": "sha256-UvAHZNJtyXrJ/68gtOmZgtVoI4SQ+Ulr17nVzBB0ARM=", - "pom": "sha256-T8+CkzH2CovIlcNn3SfXS7i1FRX7v3RqfaIgaf2sZrY=" - }, - "org/apache/maven#maven-model-builder/3.8.8": { - "jar": "sha256-KIwprNodJhOMilP/8ybuebvOhwxjyayHbn/owpRARNM=", - "pom": "sha256-TZejrh20z6o6m7JYeKm/EwWChhPT6p7PG5EZUu83K4U=" - }, - "org/apache/maven#maven-model/3.8.8": { - "jar": "sha256-w5JUi8Gj8MahgPiIvSNJYC3lseMAWf4OxG+B7UzhQSk=", - "pom": "sha256-jnOB7w/mmO2OAoKuvfL7LoZOSQTDBMJn5vBrfvlBhpA=" - }, - "org/apache/maven#maven-parent/34": { - "pom": "sha256-Go+vemorhIrLJqlZlU7hFcDXnb51piBvs7jHwvRaI38=" - }, - "org/apache/maven#maven-parent/35": { - "pom": "sha256-0u3UB3wKvJzIICiDxFlQMYBCRjbLOagwMewREjlLJXY=" - }, - "org/apache/maven#maven-parent/42": { - "pom": "sha256-BFNN6jUKIYeXClt0REM4vPeLqOU31E8mKs+6FuuzMFY=" - }, - "org/apache/maven#maven-plugin-api/3.8.8": { - "jar": "sha256-ssbRU9ArNcHzDXLfI3L8XSOrzOw8Hmib5tYAR+E5fsw=", - "pom": "sha256-toRbJDq/3eToUFDcZGLPkNFcxvKwPjy5Dnng3W9KJeQ=" - }, - "org/apache/maven#maven-repository-metadata/3.8.8": { - "jar": "sha256-s5bTsIGzU1QeqaFHqy0+7lcjtGDRMO98sdlTZq6rfDE=", - "pom": "sha256-GdnwyEbhlBAvYMnufkQxedieKXo9Y3HjS+VeoTrSi7c=" - }, - "org/apache/maven#maven-resolver-provider/3.8.8": { - "jar": "sha256-GXqKbnx99m3R+nC7SVrHYW8OlvQ9NU1p/0eU1yXUdCc=", - "pom": "sha256-fUZO9DMa7AaZQZmz3HuIaCAGApMznhlKoIiLVsoOd5Y=" - }, - "org/apache/maven#maven-settings-builder/3.8.8": { - "jar": "sha256-52Wxca0/DZnCQmq/+JC0asGsaMeFY276tfYfzXPs1P8=", - "pom": "sha256-v1XOufu3YrVl0yo26kokuysPhbsab5f7OvteGAdJVuk=" - }, - "org/apache/maven#maven-settings/3.8.8": { - "jar": "sha256-cNtcB0JaXmbtzqwSr23WDPYUMwl4zBlcMAnHXG/25Hw=", - "pom": "sha256-y/zk0UwU6bJYjGkyl3XZy7tvomXkFjIQgjWBljd7zBw=" - }, - "org/apache/maven#maven/3.8.8": { - "pom": "sha256-6eaacQwJjVAXAdPwqqWnGJ/mfkb2yaeoVyGPpzHScyw=" - }, - "org/apache/maven/resolver#maven-resolver-api/1.6.3": { - "pom": "sha256-EWZ4Z526PTbXmfZywm7iRDSA76Gxu7glDwbg3VqRp5U=" - }, - "org/apache/maven/resolver#maven-resolver-api/1.9.22": { - "jar": "sha256-Y/X2ZeRKCe9VRjs7kf2gt4/wfdJLEGDVbnnBC24yy/s=", - "pom": "sha256-33XQa/rgI5QhTC2wja5mFcU/hLRWSHoo6nIt4/cIhgw=" - }, - "org/apache/maven/resolver#maven-resolver-connector-basic/1.9.22": { - "jar": "sha256-SraL3sl+7DGLKjvSfnyVTjFviQ35LVRLaK/Qv2ZslYg=", - "pom": "sha256-0bccYKNDZmPBG8IpuZD7qhUthp2kFKCnudv0Pitf5Jo=" - }, - "org/apache/maven/resolver#maven-resolver-impl/1.9.22": { - "jar": "sha256-5Nr7iswT1zY3fALSFw2GlDjddLmLhgdFkJ0jhya6vLs=", - "pom": "sha256-0MUBku9qyZ/kTgLFm3AIFsRQF7N623xufPQt3GHCgmQ=" - }, - "org/apache/maven/resolver#maven-resolver-named-locks/1.9.22": { - "jar": "sha256-BoXynsO1SNm2kXxSfxPGZ2haM5S5Vaqlsl0FWYGLf8U=", - "pom": "sha256-AHMPD9M9VcKNALQX3s7nILAMrk0nUwgZsHE6XF2dnzc=" - }, - "org/apache/maven/resolver#maven-resolver-spi/1.6.3": { - "pom": "sha256-H4lGxHHBZwPLsIBAvH0F1wcroiFQSnfWS+54Wj9T18M=" - }, - "org/apache/maven/resolver#maven-resolver-spi/1.9.22": { - "jar": "sha256-ma1yHkYx2b0MT54pyGlnJXfGbypnSlcjzjjv8Tx1y/0=", - "pom": "sha256-hBlkE6FTaSVD3GW9GfCnXcUKDctCotQW9NCpc/1uDtU=" - }, - "org/apache/maven/resolver#maven-resolver-transport-file/1.9.22": { - "jar": "sha256-TyqFfYuDJJS66e9tfbe7hAk3iyiqvTYV8D+uvkKkrR0=", - "pom": "sha256-OFtpusk/R2tkT+Z0bdJgL4mYGKKWFgZaD4Xvi6glH6g=" - }, - "org/apache/maven/resolver#maven-resolver-transport-wagon/1.9.22": { - "jar": "sha256-JB6diNHTriQrC3/m6oIiYFkNetkFv/GHITj7zeecsho=", - "pom": "sha256-y7WYphz+zzYCdKmNv24l8J3YilS5K6o/jR0cdao2NLU=" - }, - "org/apache/maven/resolver#maven-resolver-util/1.6.3": { - "pom": "sha256-0cNedvQWbxOwpR1WWs+Wfpw8eeLMtpzL9PrAmOS3xGY=" - }, - "org/apache/maven/resolver#maven-resolver-util/1.9.22": { - "jar": "sha256-Sq6hWEw5KUypJvxHRyPZaERzYJ70SQxOsWnW6n2sprU=", - "pom": "sha256-qmEFB6UPNUewgQwY83GKxBxjbG4LqERfFhGjxuiD/tM=" - }, - "org/apache/maven/resolver#maven-resolver/1.6.3": { - "pom": "sha256-lzl+51sTDuK7Sijg+7EllZWoNhM4q6CC+K8Uc5joo+w=" - }, - "org/apache/maven/resolver#maven-resolver/1.9.22": { - "pom": "sha256-MsdIma6Rm1K9wHysKKuixmUbcxcqufQRH3xSe2B2Cts=" - }, - "org/apache/maven/shared#maven-shared-components/34": { - "pom": "sha256-ZNDttfIc//YAscOrfUX5dUzRi6X7+Ds9G7fEhJQ32OM=" - }, - "org/apache/maven/shared#maven-shared-utils/3.3.4": { - "jar": "sha256-eSXZxaDiBA0kuPrj9hLrOZy//lg4szujaHd9x73fbdo=", - "pom": "sha256-v4NILZb3bWNpnWPhJeZPSsc8gXiYVzNmLb1pr5xgM54=" - }, - "org/apache/maven/wagon#wagon-http-shared/3.5.3": { - "jar": "sha256-jn2nZvVRZP3od5qqoSWDJQbChIyrSHa1MFE4hz4oA38=", - "pom": "sha256-YBSx5kq/RVxoNKCRgkjhVjgFD4NdoSBR0zzafpRtiPg=" - }, - "org/apache/maven/wagon#wagon-http/3.5.3": { - "jar": "sha256-0rbkjJ/L5XnhhYxiLRRGQBH/Jl+m4o55QASmiCFUpQk=", - "pom": "sha256-k08vnIfkl8T3lb5LsFs2C4wjFGfUYBA8GQErebjAPGs=" - }, - "org/apache/maven/wagon#wagon-provider-api/3.5.3": { - "jar": "sha256-XnIAAziUXtPpb45PV40dBnLhr34ZwOkBQZeuWzGvPvQ=", - "pom": "sha256-ZNagheimvt6WB8vQKepYzRyHMEQQhiSSF0ptWbnRcUI=" - }, - "org/apache/maven/wagon#wagon-providers/3.5.3": { - "pom": "sha256-gHxR/8ze9sARMLdK7tJ4FewWK8JobAHp0p8W78UmpEo=" - }, - "org/apache/maven/wagon#wagon/3.5.3": { - "pom": "sha256-fBC4usWSaP55V/KrK1CWXZAGnr+FDHVrtV6oB85EDws=" - }, "org/apiguardian#apiguardian-api/1.1.2": { "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" }, - "org/assertj#assertj-core/3.27.6": { - "jar": "sha256-snhysEmryI4jyFPOWReUXdV9Q70xF12FLjlB0qb9AjE=", - "pom": "sha256-sPgJRcedY8PDPWEL2HVNXppUNpVfev1oPQFg2GErquw=" + "org/assertj#assertj-core/3.27.7": { + "jar": "sha256-xKRFQmw8KGFmaGO4QsxOx7uxxCJv79NwttL+g9bE/w8=", + "pom": "sha256-laENz7O6mq1NC16cUjqNWDN3vuXs1Lo34Z5Vo0Zn8Hk=" }, "org/bouncycastle#bcpg-jdk18on/1.80": { "jar": "sha256-N5mg1TURuGB4CvQ8RK6OBRmvq7JjGVr0AXT0YxLNWL0=", @@ -1273,97 +1086,37 @@ "jar": "sha256-T0umqSYX6hncGD8PpdtJLu5Cb93ioKLWyUd3/9GvZBM=", "pom": "sha256-pKEiETRntyjhjyb7DP1X8LGg18SlO4Zxis5wv4uG7Uc=" }, - "org/bouncycastle#bcprov-jdk18on/1.80": { - "jar": "sha256-6K0gn4xY0pGjfKl1Dp6frGBZaVbJg+Sd2Cgjgd2LMkk=", - "pom": "sha256-oKdcdtkcQh7qVtD2Bi+49j7ff6x+xyT9QgzNytcYHUM=" + "org/bouncycastle#bcprov-jdk18on/1.80.2": { + "jar": "sha256-szIn8H3OJk2vGqwueY7xCaSQHzGr7axTY1dG3ZNnnTs=", + "pom": "sha256-EqUFpxejvHZH99jt6ndzLJxty1PE32Kju1i3pUIooo8=" }, - "org/bouncycastle#bcutil-jdk18on/1.80": { - "jar": "sha256-Iuymh/eVVBH0Vq8z5uqOaPxzzYDLizKqX3qLGCfXxng=", - "pom": "sha256-Qhp95L/rnFs4sfxHxCagh9kIeJVdQQf1t6gusde3R7Y=" + "org/bouncycastle#bcutil-jdk18on/1.80.2": { + "jar": "sha256-vHjTLX/7FB7ifk+3ffBCWdhCyJnn6Or5EvmQ1yU707Q=", + "pom": "sha256-Joi+GvSZ1SUJYRTML1HHp6TKI8PScxe3HhjByWvsA9E=" }, "org/bouncycastle/bcprov-jdk18on/maven-metadata": { "xml": { "groupId": "org.bouncycastle", - "lastUpdated": "20251126065922", - "release": "1.83" + "lastUpdated": "20260712065323", + "release": "1.85" } }, "org/bouncycastle/bcutil-jdk18on/maven-metadata": { "xml": { "groupId": "org.bouncycastle", - "lastUpdated": "20251126070121", - "release": "1.83" + "lastUpdated": "20260712065324", + "release": "1.85" } }, - "org/checkerframework#checker-compat-qual/2.0.0": { - "jar": "sha256-pAss5thVHluQsb9jcGQwPzKUTWG1KrIBTjhpnfVzlBs=", - "pom": "sha256-OKFU11Hav/PwLAOLaFCxl8qGH5pVO5Bkowoyf9iSjG0=" - }, "org/checkerframework#checker-qual/3.12.0": { "jar": "sha256-/xB4WsKjV+xd6cKTy5gqLLtgXAMJ6kzBy5ubxtvn88s=", "module": "sha256-0EeUnBuBCRwsORN3H6wvMqL6VJuj1dVIzIwLbfpJN3c=", "pom": "sha256-d1t6425iggs7htwao5rzfArEuF/0j3/khakionkPRrk=" }, - "org/codehaus#codehaus-parent/4": { - "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" - }, - "org/codehaus/mojo#animal-sniffer-annotations/1.14": { - "jar": "sha256-IGgyC9a610TDZzqwSPZ+ML749RiZb6OAAzVWYAZpkF0=", - "pom": "sha256-GHnxmgWZHj7ZWRC5ZokzM5awxGeiFdxNH5ABhAS3KiY=" - }, - "org/codehaus/mojo#animal-sniffer-parent/1.14": { - "pom": "sha256-9RVQoGsUEL1JYssOcd8Lkhpgp+9Hv6nEgloUvnIxbuo=" - }, - "org/codehaus/mojo#mojo-parent/34": { - "pom": "sha256-Pjldb7xDwJo3dMrIaUzlJzmDBeo/1UktgOJa8n04Kpw=" - }, - "org/codehaus/plexus#plexus-cipher/2.0": { - "jar": "sha256-mn8bXFqe/9Yerf2HMUUqL3ao55ER+sOR73XqgBvqIDo=", - "pom": "sha256-BIQvMxsCJbhaXiBDlxDSKOp6YwKr5tU8nJhG+8W/mf8=" - }, - "org/codehaus/plexus#plexus-classworlds/2.6.0": { - "jar": "sha256-Uvd8XsSfeHycQX6+1dbv2ZIvRKIC8hc3bk+UwNdPNUk=", - "pom": "sha256-RppsWfku/6YsB5fOfVLSwDz47hA0uSPDYN14qfUFp7o=" - }, - "org/codehaus/plexus#plexus-component-annotations/2.1.0": { - "jar": "sha256-veNhfOm1vPlYQSYEYIAEOvaks7rqQKOxU/Aue7wyrKw=", - "pom": "sha256-BnC2BSVffcmkVNqux5EpGMzxtUdcv8o3Q2O1H8/U6gA=" - }, - "org/codehaus/plexus#plexus-containers/2.1.0": { - "pom": "sha256-lNWu2zxGAjJlOWUnz4zn/JRLe9eeTrq5BzhkGOtaCNc=" - }, - "org/codehaus/plexus#plexus-interpolation/1.26": { - "jar": "sha256-s7VBLOF4iRA+pWS838+fs9+lQDRP/qxrU4pzydcYJmI=", - "pom": "sha256-4cELOmM1ZB63SmaNqp7oauSrBmEBdOWboHyMaAQjJ/c=" - }, - "org/codehaus/plexus#plexus-sec-dispatcher/2.0": { - "jar": "sha256-hzE5lgxMeAF23aWAsAOixL+CGIvc5buZI04iTves/Os=", - "pom": "sha256-myi7MHAXk4qU0GyFsrCZvEaRK4WdCE+yk+Vp9DLq23w=" - }, - "org/codehaus/plexus#plexus-utils/3.3.1": { - "pom": "sha256-Xlg4eN+QW18zojDvaQpSuPGdq5zIkr7e4Gnz2K9Olgo=" - }, - "org/codehaus/plexus#plexus-utils/3.4.1": { - "jar": "sha256-UtheBLORhyKvEdEoVbSoJX35ag52yPTjhS5vqoUfNXs=", - "pom": "sha256-sUTP+bHGJZ/sT+5b38DzYNacI6vU6m5URTOpSbaeNYI=" - }, - "org/codehaus/plexus#plexus/5.1": { - "pom": "sha256-o0PkT/V5au0OpgvhFFTJNc4gqxxfFkrMjaV0SC3Lx+k=" - }, - "org/codehaus/plexus#plexus/8": { - "pom": "sha256-/6NJ2wTnq/ZYhb3FogYvQZfA/50/H04qpXILdyM/dCw=" - }, "org/drjekyll#fontchooser/3.1.0": { "jar": "sha256-RYqkEi6dlGd8zws9uZ20MSrUnSn8xoFd/biHq9klZYc=", "pom": "sha256-l6K6GCYwhF2BknHP6GP08mPoGoh5DC3aopHpsdsbhaQ=" }, - "org/ec4j/core#ec4j-core-parent/1.1.1": { - "pom": "sha256-Id3ekeuJfAN3XBAVMgdn4mCWjuGRm6a4qYAuK6GX2VM=" - }, - "org/ec4j/core#ec4j-core/1.1.1": { - "jar": "sha256-1z3uRP77cl38ZYJnRl/lp2imZjE9is1wEgn1g28UMdg=", - "pom": "sha256-ms07s8BonmCVaYv2bmQxJkaReICt/2HTSSgQEmEpuTo=" - }, "org/eclipse/jdt#ecj/3.33.0": { "jar": "sha256-92hsSWDPcMLrxcUApzqM/ARUG3MMGPHFwhMpiJsTf0U=", "pom": "sha256-JmwX1PHL0Qtxvew5Dh9krNyV5h1hjPSi6obqkDM3v4g=" @@ -1371,24 +1124,10 @@ "org/eclipse/jdt/ecj/maven-metadata": { "xml": { "groupId": "org.eclipse.jdt", - "lastUpdated": "20260309141925", - "release": "3.45.0" + "lastUpdated": "20260608064341", + "release": "3.46.0" } }, - "org/eclipse/sisu#org.eclipse.sisu.inject/0.3.5": { - "jar": "sha256-xZlAELzc4dK9YDpNUMRxkd29eHXRFXsjqqJtM8gv2hM=", - "pom": "sha256-wpdpcrQkL/2GBHFthHX1Z1XaD6KGGDROxOUyeBBpbXE=" - }, - "org/eclipse/sisu#org.eclipse.sisu.plexus/0.3.5": { - "jar": "sha256-fkxhCW1wgm8g96fVXFmlUo56pa0kfuLf5UTk3SX2p4Q=", - "pom": "sha256-eGUjydeCWKdKoTRHoWdsIXKs/fQyFl162uK3h20tg9M=" - }, - "org/eclipse/sisu#sisu-inject/0.3.5": { - "pom": "sha256-XzLsq5yPbf8fnkG4U+QNjyOiUIIZFU72fMANRVb19d0=" - }, - "org/eclipse/sisu#sisu-plexus/0.3.5": { - "pom": "sha256-broJAu/Yma7A2NGaw8vFMSPNQROf4OHSnMXIdKeRud4=" - }, "org/exbin/auxiliary#binary_data-array/0.2.2": { "jar": "sha256-E5SjC6S8EJ3IJf9aMZSyEWMscaaT82vAd33avycWBd0=", "pom": "sha256-kvRjJ0EaMLAQ33Zdvsfjj52DE76LqHX1B4BYoCb6eig=" @@ -1430,14 +1169,10 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains#annotations/23.0.0": { - "jar": "sha256-ew8ZckCCy/y8ZuWr6iubySzwih6hHhkZM+1DgB6zzQU=", - "pom": "sha256-yUkPZVEyMo3yz7z990P1P8ORbWwdEENxdabKbjpndxw=" - }, - "org/jetbrains#annotations/26.0.2": { - "jar": "sha256-IDe+N4mA07qTM+l5VfOyzeOSqhJNBMpzzi7uZlcZkpc=", - "module": "sha256-vvC4NSst/Uy3FV7MKjkie/FqPghme6vsZQx2sau/zss=", - "pom": "sha256-fr7Oreja2nyxfv8+AUkiw5Ai0qN44+LSRh8o8Bb/x/c=" + "org/jetbrains#annotations/26.1.0": { + "jar": "sha256-68euwlLtDH0tBMA51/AOafe4ax9JPHQdZ7PvMbmGsFQ=", + "module": "sha256-W07rjbph51OBYVPgxz9WKyDgF+OTk5UtTeTdMbdyYLs=", + "pom": "sha256-+NxQzzqsS87HQKkJVfKADkElHpxANjC3W3UtO271vuI=" }, "org/jetbrains/kotlin#abi-tools-api/2.3.10": { "jar": "sha256-E2nLVCrmR6nVVJ5thkkh6g+GApdJWRmXteWqFhyXGIs=", @@ -1511,26 +1246,14 @@ "jar": "sha256-Ezqc4YWqR9FRphLyzFli0yuMpgX44ieh1/HhsJ4m7m4=", "pom": "sha256-NFeCP8HSlV8GBVk7m+nWUIbwwaEeGzdt9BHwqifkAuU=" }, - "org/jetbrains/kotlin#kotlin-scripting-dependencies-maven/2.3.10": { - "jar": "sha256-YLGj/TIrbTDBT6lr3FnKBBpIZw4tVUWx7oq0Ki1b43s=", - "pom": "sha256-9n72y62HtZzhYjKZtWDiwEPzHc4n0UQX/+cmIwrqV3w=" - }, - "org/jetbrains/kotlin#kotlin-scripting-dependencies/2.3.10": { - "jar": "sha256-Fm6IW3Xnbd21XjghMKnIh32hRw77MTtV0u3YA0X0v8k=", - "pom": "sha256-/BmsOH03KOwQnAAkBwy8hR9ZU3RfYuQsJshF+BzXlaQ=" - }, - "org/jetbrains/kotlin#kotlin-scripting-ide-services/2.3.10": { - "jar": "sha256-mEaqMrpBlstuQoPrVWR11mk6RWcTYPg7wiY+cfMiX6E=", - "pom": "sha256-NoeXGv7lWBeqCuPBR+PGf9WJYLcLKWdmKiAlh3Y0ujk=" - }, - "org/jetbrains/kotlin#kotlin-scripting-jvm-host/2.3.10": { - "jar": "sha256-CoixLF1i0CjU7jWpA5tYbnwPId4XfmJ16OvEbOFkaV0=", - "pom": "sha256-RM6fVi4kyKKkc8YF7oJbHOKZPxTyk39S9+c2RW5gG2s=" - }, "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.10": { "jar": "sha256-vyMqUZrwKVLhAQhvq9SIRDYldlbEXbCBeDysSxSWZLc=", "pom": "sha256-gzabR9onQj0BR+UZh/tY4YbjWt7KQUDxfysOu7uYPTc=" }, + "org/jetbrains/kotlin#kotlin-stdlib/2.1.21": { + "module": "sha256-DTc1BD1ot6WvtE0n3mX4Cp0rIIRicJwu27SP1bOVrYo=", + "pom": "sha256-xVJAhso+SaZ5ht+P3M1mA3uvXzxaNYt2+d1gm+57tjg=" + }, "org/jetbrains/kotlin#kotlin-stdlib/2.2.21": { "jar": "sha256-ZVij0jPaVqIJNLMhWfnbX4btWBbvCY94osIj3Gq7ed0=", "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", @@ -1545,43 +1268,23 @@ "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", "pom": "sha256-5hhz7dWo3QMaa6l1nAXRVpBlnmEuPUjB7RInN9q0SYY=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { - "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.10.2": { - "jar": "sha256-XKF1s43zMf1kFVs1zYyuElH6nuNpcJs21C4KKIzM4/0=", - "module": "sha256-6eSnS02/4PXr7tiNSfNUbD7DCJQZsg5SUEAxNcLGTFM=", - "pom": "sha256-ZY9Xa5bIMuc4JAatsZfWTY4ul94Q6W36NwDez6KmDe8=" - }, "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core/1.10.2": { - "module": "sha256-j+JUF35xGnzRijwG2CQvzpRfQcLMoT3BmzOuQqVDUBY=", - "pom": "sha256-UZ2lQACW80YqTa6AeDrQUEE9S8gex65T+udq7wzL7Uw=" - }, "org/jspecify#jspecify/1.0.0": { "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" }, - "org/junit#junit-bom/5.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, "org/junit#junit-bom/5.10.3": { "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" }, - "org/junit#junit-bom/5.11.2": { - "module": "sha256-iDoFuJLxGFnzg23nm3IH4kfhQSVYPMuKO+9Ni8D1jyw=", - "pom": "sha256-9I6IU4qsFF6zrgNFqevQVbKPMpo13OjR6SgTJcqbDqI=" - }, "org/junit#junit-bom/5.13.3": { "module": "sha256-XchNdO+YHQI8Y56wy8Sx+e+JEDQofOGxAe/7vA8VNLQ=", "pom": "sha256-47k+m7iHGWnPEcDo/xD1B4QdsYhcoQV44pCEb2YP1o4=" @@ -1594,6 +1297,10 @@ "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" }, + "org/junit#junit-bom/5.14.2": { + "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", + "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" + }, "org/junit/jupiter#junit-jupiter-api/5.13.3": { "jar": "sha256-GhWlIlOpcsgsDb93dZqYP1r+0Fg1hc3FsqO+qh9K4Kw=", "module": "sha256-hUq9STPlOKRnrmaPQIXiLq9JobVWx7qTlcJPaGLo7go=", @@ -1649,14 +1356,14 @@ "jar": "sha256-xjWnQC9Kqb9msvQjDOpiAloP4c1j6HKa3vybGZT6xMM=", "pom": "sha256-UsXB01dAR3nRqZtJqFv506CFAluFFstz2+93yK40AF4=" }, + "org/ow2/asm#asm/9.10.1": { + "jar": "sha256-7YJdEKsTmcjAy2aeaIzwyMgmKbTIOZtYNSto6SyhD8s=", + "pom": "sha256-4bHDgyyjrAqeVjxAX0x2ARi1VWpJINruFAWIhhl+CU0=" + }, "org/ow2/asm#asm/9.6": { "jar": "sha256-PG+sJCTbPUqFO2afTj0dnDxVIjXhmjGWc/iHCDwjA6E=", "pom": "sha256-ku7iS8PIQ+SIHUbB3WUFRx7jFC+s+0ZrQoz+paVsa2A=" }, - "org/ow2/asm#asm/9.9.1": { - "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=", - "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8=" - }, "org/reactivestreams#reactive-streams/1.0.4": { "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" @@ -1665,26 +1372,26 @@ "jar": "sha256-k4otCP5UBQ12ELlE2N3DoJNVcQ2ea+CqyDjbwE6aKCU=", "pom": "sha256-tsqj6301vXVu1usKKoGGi408D29CJE/q5BdgrGYwbYc=" }, - "org/slf4j#jcl-over-slf4j/1.7.36": { - "jar": "sha256-q1fKj9IjdywXNl0SH1npTsvwrlnQjAOjy1uBBxwBkZU=", - "pom": "sha256-vZYkPX1CGM18x9RcDjD6E0gKGk+R01bt19/pPx/7aOY=" + "org/slf4j#jcl-over-slf4j/1.7.30": { + "jar": "sha256-cenuN7nk63gCoqzF9BcopM85FedIPXmNs7T/LsiEfFA=", + "pom": "sha256-FnNt1OcecJe3WL4VU1BvGaVB7rd2bcNjVa2u16U2tFU=" }, - "org/slf4j#slf4j-api/1.7.36": { - "jar": "sha256-0+9XXj5JeWeNwBvx3M5RAhSTtNEft/G+itmCh3wWocA=", - "pom": "sha256-+wRqnCKUN5KLsRwtJ8i113PriiXmDL0lPZhSEN7cJoQ=" + "org/slf4j#jul-to-slf4j/1.7.30": { + "jar": "sha256-u8v9qnJXIlXE+FIHqb/bJDWNyZPkElIzG9TQkT5JiLk=", + "pom": "sha256-iFzlASLRCuXHj19ck4/qm4tRq3MtNnupz1nJPpImSdY=" }, - "org/slf4j#slf4j-api/2.0.17": { - "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", - "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + "org/slf4j#slf4j-api/2.0.18": { + "jar": "sha256-RFCP0VdlAGiMeQsZCs3Rb+xPjHmj4LkAr9cFA88FX1U=", + "pom": "sha256-bCx/LAJ3TMK3thn70t94c82tKXGJJuRHVLh/cNHrQ8s=" }, - "org/slf4j#slf4j-bom/2.0.17": { - "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + "org/slf4j#slf4j-bom/2.0.18": { + "pom": "sha256-khmqtgFXUSbE5m4TMesrDGwXozCsTVoH480R1YCgwS0=" }, - "org/slf4j#slf4j-parent/1.7.36": { - "pom": "sha256-uziNN/vN083mTDzt4hg4aTIY3EUfBAQMXfNgp47X6BI=" + "org/slf4j#slf4j-parent/1.7.30": { + "pom": "sha256-EWR5VuSKDFv7OsM/bafoPzQQAraFfv0zWlBbaHvjS3U=" }, - "org/slf4j#slf4j-parent/2.0.17": { - "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + "org/slf4j#slf4j-parent/2.0.18": { + "pom": "sha256-CziWvtrSye2Wl+3L6h2gxUzSOKcjWDqBNYqDv7eC6fo=" }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" @@ -1692,9 +1399,13 @@ "org/sonatype/oss#oss-parent/9": { "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" }, - "tools/profiler#async-profiler/4.2": { - "jar": "sha256-RFt73Go+0D1FqdS2G1pfwHKz6ZUtfytjciMS9I6p7hg=", - "pom": "sha256-BDXaxAKls39Iv2h+NHdQAArdQc8AEnrcsnD4z/5YyJs=" + "org/webjars/npm#viz.js-graphviz-java/2.1.3": { + "jar": "sha256-bBzQbXT7FVufnAjnqysOUFCd2tQxHOmgSVi9enunFiw=", + "pom": "sha256-5mLfaIrGp9GOh7p03ipI7YE3qoNCZIUfYRu1G3meMXc=" + }, + "tools/profiler#async-profiler/4.4": { + "jar": "sha256-R/MhuM263aLCgaYS9qwkUlTIGgLOV4q/eCpTFw6kCzc=", + "pom": "sha256-Du3mPG1G+9ApVMme+Sa/qsxyXdWFxCxzGy9djXS/lhU=" } } } diff --git a/pkgs/by-name/ja/jadx/nix-build.patch b/pkgs/by-name/ja/jadx/nix-build.patch index 11f927411a47..063931ab078e 100644 --- a/pkgs/by-name/ja/jadx/nix-build.patch +++ b/pkgs/by-name/ja/jadx/nix-build.patch @@ -1,79 +1,143 @@ diff --git a/build.gradle.kts b/build.gradle.kts -index df96f46c..f1f422f2 100644 +index 0f4d3f09..a44eec6f 100644 --- a/build.gradle.kts +++ b/build.gradle.kts -@@ -126,42 +126,11 @@ fun isNonStable(version: String): Boolean { - destinationDirectory.set(layout.buildDirectory) +@@ -129,19 +129,6 @@ fun loadEnv(file: File): Map { + return envMap } --val distWin by tasks.registering(Zip::class) { -- group = "jadx" -- description = "Build Windows bundle" -- -- from(distWinConfiguration) -- -- destinationDirectory.set(layout.buildDirectory.dir("distWin")) -- archiveFileName.set("jadx-gui-$jadxVersion-win.zip") -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} -- --val distWinWithJre by tasks.registering(Zip::class) { -- description = "Build Windows with JRE bundle" -- -- from(distWinWithJreConfiguration) -- -- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre")) -- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip") -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} -- - val dist by tasks.registering { - group = "jadx" - description = "Build jadx distribution zip bundles" - - dependsOn(pack) -- -- val os = DefaultNativePlatform.getCurrentOperatingSystem() -- if (os.isWindows) { -- if (project.hasProperty("bundleJRE")) { -- println("Build win bundle with JRE") -- dependsOn(distWinWithJre) -- } else { -- dependsOn(distWin) -- } +-val distWinConfiguration = +- configurations.create("distWinConfiguration") { +- isCanBeConsumed = false - } - } +-val distWinWithJreConfiguration = +- configurations.create("distWinWithJreConfiguration") { +- isCanBeConsumed = false +- } +-dependencies { +- distWinConfiguration(project(":jadx-gui", "distWinConfiguration")) +- distWinWithJreConfiguration(project(":jadx-gui", "distWinWithJreConfiguration")) +-} +- + val copyArtifacts = + tasks.register("copyArtifacts") { + val jarCliPattern = "jadx-cli-(.*)-all.jar".toPattern() +@@ -186,45 +173,12 @@ fun loadEnv(file: File): Map { + } + } - val cleanBuildDir by tasks.registering(Delete::class) { +-val distWin = +- tasks.register("distWin") { +- group = "jadx" +- description = "Build Windows bundle" +- +- from(distWinConfiguration) +- +- destinationDirectory.set(layout.buildDirectory.dir("distWin")) +- archiveFileName.set("jadx-gui-$jadxVersion-win.zip") +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +- } +- +-val distWinWithJre = +- tasks.register("distWinWithJre") { +- description = "Build Windows with JRE bundle" +- +- from(distWinWithJreConfiguration) +- +- destinationDirectory.set(layout.buildDirectory.dir("distWinWithJre")) +- archiveFileName.set("jadx-gui-$jadxVersion-with-jre-win.zip") +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE +- } +- + val dist = + tasks.register("dist") { + group = "jadx" + description = "Build jadx distribution zip bundles" + + dependsOn(pack) +- +- val os = DefaultNativePlatform.getCurrentOperatingSystem() +- if (os.isWindows) { +- if (project.hasProperty("bundleJRE")) { +- println("Build win bundle with JRE") +- dependsOn(distWinWithJre) +- } else { +- dependsOn(distWin) +- } +- } + } + + val cleanBuildDir = diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts -index ed67e57a..99aa9eb4 100644 +index 15f610b4..99aa9eb4 100644 --- a/buildSrc/build.gradle.kts +++ b/buildSrc/build.gradle.kts -@@ -4,8 +4,6 @@ +@@ -4,10 +4,6 @@ dependencies { implementation("org.jetbrains.kotlin:kotlin-gradle-plugin:2.3.10") - - implementation("org.openrewrite:plugin:6.19.1") +- implementation("net.ltgt.errorprone:net.ltgt.errorprone.gradle.plugin:4.2.0") +- implementation("net.ltgt.nullaway:net.ltgt.nullaway.gradle.plugin:2.3.0") } repositories { diff --git a/buildSrc/src/main/kotlin/jadx-java.gradle.kts b/buildSrc/src/main/kotlin/jadx-java.gradle.kts -index 0f60d301..5e577155 100644 +index 256dadde..7e044113 100644 --- a/buildSrc/src/main/kotlin/jadx-java.gradle.kts +++ b/buildSrc/src/main/kotlin/jadx-java.gradle.kts -@@ -3,8 +3,6 @@ +@@ -1,15 +1,8 @@ + import org.gradle.api.tasks.testing.logging.TestExceptionFormat +-import net.ltgt.gradle.errorprone.CheckSeverity +-import net.ltgt.gradle.errorprone.errorprone +-import net.ltgt.gradle.nullaway.nullaway + plugins { java checkstyle - - id("jadx-rewrite") +- id("net.ltgt.errorprone") +- id("net.ltgt.nullaway") } - val jadxVersion: String by rootProject.extra + val jadxVersion = rootProject.extra["jadxVersion"] as String +@@ -30,9 +23,6 @@ + testRuntimeOnly("org.junit.platform:junit-platform-launcher") + + testCompileOnly("org.jetbrains:annotations:26.1.0") +- +- errorprone("com.google.errorprone:error_prone_core:2.50.0") +- errorprone("com.uber.nullaway:nullaway:0.13.7") + } + + repositories { +@@ -77,21 +67,4 @@ + if (checkEnabled) { + options.compilerArgs.add("-XDaddTypeAnnotationsToSymbol=true") + } +- options.errorprone { +- isEnabled = checkEnabled +- allErrorsAsWarnings = jadxBuildChecksMode == "warn" +- excludedPaths = ".*/test/.*" +- nullaway { +- if (jadxBuildChecksMode == "error") { +- error() +- } +- annotatedPackages.add("jadx") +- } +- // TODO: fix and enable all checks +- disable("MixedMutabilityReturnType") +- disable("EqualsGetClass") +- disable("OperatorPrecedence") +- disable("UnusedVariable") +- disable("ImmutableEnumChecker") +- } + } diff --git a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts b/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts deleted file mode 100644 -index ceca3fe5..00000000 +index c6f3e979..00000000 --- a/buildSrc/src/main/kotlin/jadx-rewrite.gradle.kts +++ /dev/null @@ -1,35 +0,0 @@ @@ -86,10 +150,10 @@ index ceca3fe5..00000000 -} - -dependencies { -- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.24.0") -- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.20.0") -- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.24.0") -- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.24.0") +- rewrite("org.openrewrite.recipe:rewrite-testing-frameworks:3.41.0") +- rewrite("org.openrewrite.recipe:rewrite-logging-frameworks:3.29.2") +- rewrite("org.openrewrite.recipe:rewrite-migrate-java:3.39.0") +- rewrite("org.openrewrite.recipe:rewrite-static-analysis:2.38.0") -} - -tasks { @@ -113,7 +177,7 @@ index ceca3fe5..00000000 - } -} diff --git a/jadx-gui/build.gradle.kts b/jadx-gui/build.gradle.kts -index 2677881f..4cec0884 100644 +index fec42601..c4e20570 100644 --- a/jadx-gui/build.gradle.kts +++ b/jadx-gui/build.gradle.kts @@ -3,7 +3,6 @@ @@ -124,7 +188,7 @@ index 2677881f..4cec0884 100644 id("org.beryx.runtime") version "2.0.1" } -@@ -129,36 +128,6 @@ +@@ -142,42 +141,6 @@ } } @@ -145,79 +209,92 @@ index 2677881f..4cec0884 100644 - supportUrl.set("https://github.com/skylot/jadx") - - bundledJrePath.set(if (project.hasProperty("bundleJRE")) "%EXEDIR%/jre" else "%JAVA_HOME%") -- classpath.set(tasks.getByName("shadowJar").outputs.files.map { "%EXEDIR%/lib/${it.name}" }.sorted().toList()) +- classpath.set( +- tasks +- .getByName("shadowJar") +- .outputs.files +- .map { "%EXEDIR%/lib/${it.name}" } +- .sorted() +- .toList(), +- ) - println("Launch4J classpath: ${classpath.get()}") - - chdir.set("") // don't change current dir - libraryDir.set("") // don't add any libs -} - --fun escapeJVMOptions(): List { -- return application.applicationDefaultJvmArgs +-fun escapeJVMOptions(): List = +- application.applicationDefaultJvmArgs - .toList() - .map { if (it.startsWith("-D")) "\"$it\"" else it } --} - runtime { - addOptions("--strip-debug", "--compress", "zip-9", "--no-header-files", "--no-man-pages") + addOptions("--strip-debug", "--no-header-files", "--no-man-pages") addModules( -@@ -179,48 +148,6 @@ fun escapeJVMOptions(): List { +@@ -198,66 +161,6 @@ fun escapeJVMOptions(): List = } } --val copyDistWin by tasks.registering(Copy::class) { -- description = "Copy files for Windows bundle" +-val copyDistWin = +- tasks.register("copyDistWin") { +- description = "Copy files for Windows bundle" - -- val libTask = tasks.getByName("shadowJar") -- dependsOn(libTask) -- from(libTask.outputs) { -- include("*.jar") -- into("lib") +- val libTask = tasks.getByName("shadowJar") +- dependsOn(libTask) +- from(libTask.outputs) { +- include("*.jar") +- into("lib") +- } +- val exeTask = tasks.getByName("createExe") +- dependsOn(exeTask) +- from(exeTask.outputs) { +- include("*.exe") +- } +- into(layout.buildDirectory.dir("jadx-gui-win")) +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } -- val exeTask = tasks.getByName("createExe") -- dependsOn(exeTask) -- from(exeTask.outputs) { -- include("*.exe") -- } -- into(layout.buildDirectory.dir("jadx-gui-win")) -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} - --val copyDistWinWithJre by tasks.registering(Copy::class) { -- description = "Copy files for Windows with JRE bundle" +-val copyDistWinWithJre = +- tasks.register("copyDistWinWithJre") { +- description = "Copy files for Windows with JRE bundle" - -- val jreTask = tasks.runtime.get() -- dependsOn(jreTask) -- from(jreTask.jreDir) { -- include("**/*") -- into("jre") +- val jreTask = tasks.runtime.get() +- dependsOn(jreTask) +- from(jreTask.jreDir) { +- include("**/*") +- into("jre") +- } +- val libTask = tasks.getByName("shadowJar") +- dependsOn(libTask) +- from(libTask.outputs) { +- include("*.jar") +- into("lib") +- } +- val exeTask = tasks.getByName("createExe") +- dependsOn(exeTask) +- from(exeTask.outputs) { +- include("*.exe") +- } +- into(layout.buildDirectory.dir("jadx-gui-with-jre-win")) +- duplicatesStrategy = DuplicatesStrategy.EXCLUDE - } -- val libTask = tasks.getByName("shadowJar") -- dependsOn(libTask) -- from(libTask.outputs) { -- include("*.jar") -- into("lib") -- } -- val exeTask = tasks.getByName("createExe") -- dependsOn(exeTask) -- from(exeTask.outputs) { -- include("*.exe") -- } -- into(layout.buildDirectory.dir("jadx-gui-with-jre-win")) -- duplicatesStrategy = DuplicatesStrategy.EXCLUDE --} - - /** - * Register and expose distribution artifacts to use in top level packaging tasks - */ -@@ -230,10 +157,6 @@ fun escapeJVMOptions(): List { - val distWinWithJreConfiguration by configurations.creating { - isCanBeResolved = false - } +-/** +- * Register and expose distribution artifacts to use in top level packaging tasks +- */ +-val distWinConfiguration = +- configurations.create("distWinConfiguration") { +- isCanBeResolved = false +- } +-val distWinWithJreConfiguration = +- configurations.create("distWinWithJreConfiguration") { +- isCanBeResolved = false +- } -artifacts { - add(distWinConfiguration.name, copyDistWin) - add(distWinWithJreConfiguration.name, copyDistWinWithJre) -} - - val syncNLSLines by tasks.registering(JavaExec::class) { - group = "jadx-dev" +- + val syncNLSLines = + tasks.register("syncNLSLines") { + group = "jadx-dev" diff --git a/pkgs/by-name/ja/jadx/package.nix b/pkgs/by-name/ja/jadx/package.nix index 965deff80c7b..2979e364e1dc 100644 --- a/pkgs/by-name/ja/jadx/package.nix +++ b/pkgs/by-name/ja/jadx/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "jadx"; - version = "1.5.5"; + version = "1.5.6"; src = fetchFromGitHub { owner = "skylot"; repo = "jadx"; rev = "v${finalAttrs.version}"; - hash = "sha256-WONsXDNhlDuqKsS2Olz3ndZIbi6mdi9JBKaHPpcdTQQ="; + hash = "sha256-qwGFMj18xJOrBudthAIeKc/PT0uUzjmTgBYovF4A/94="; }; patches = [ diff --git a/pkgs/by-name/ja/jai/package.nix b/pkgs/by-name/ja/jai/package.nix index 2849b1e6c65d..80eb1815a571 100644 --- a/pkgs/by-name/ja/jai/package.nix +++ b/pkgs/by-name/ja/jai/package.nix @@ -32,7 +32,6 @@ let maintainers = with lib.maintainers; [ samestep ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ja/jameica/package.nix b/pkgs/by-name/ja/jameica/package.nix index 556acfc74307..e8d99bf3996e 100644 --- a/pkgs/by-name/ja/jameica/package.nix +++ b/pkgs/by-name/ja/jameica/package.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { owner = "willuhn"; repo = "jameica"; tag = version; - hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U=i"; + hash = "sha256-7KpQas8ttL2DP+gFH87uLQyx4PMwVQ+FaqXpZBPWV5U="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ja/jan/package.nix b/pkgs/by-name/ja/jan/package.nix index 027ddfd7cea1..f0ea40c96961 100644 --- a/pkgs/by-name/ja/jan/package.nix +++ b/pkgs/by-name/ja/jan/package.nix @@ -12,16 +12,16 @@ let pname = "Jan"; - version = "0.7.9"; + version = "0.8.4"; darwin-src = fetchzip { url = "https://github.com/janhq/jan/releases/download/v${version}/jan-mac-universal-${version}.zip"; - hash = "sha256-3SN/yZr40Zp6Oa3rDUnum1m7dwK8jbe6Bxx9iSHDM9U="; + hash = "sha256-hK9cu9c2kJRCJ3iy0CucRP0whgDgF5K29JgR4AIKXVg="; }; linux-src = fetchurl { - url = "https://github.com/janhq/jan/releases/download/v${version}/jan_${version}_amd64.AppImage"; - hash = "sha256-SMcjig6J/HCpLthT8dHC6yED6uuHyaTG/xLnUIlZHP8="; + url = "https://github.com/janhq/jan/releases/download/v${version}/Jan_${version}_amd64.AppImage"; + hash = "sha256-NNTIq02kisIjINS2TCh0Rb2UyRMSlJLR2+uzZmWxSVo="; }; appimageContents = appimageTools.extractType2 { @@ -29,13 +29,16 @@ let src = linux-src; }; + passthru.updateScript = ./update.sh; + meta = { changelog = "https://github.com/janhq/jan/releases/tag/v${version}"; - description = "Jan is an open source alternative to ChatGPT that runs 100% offline on your computer"; + description = "Open source alternative to ChatGPT that runs 100% offline on your computer"; homepage = "https://github.com/janhq/jan"; license = lib.licenses.asl20; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; mainProgram = "Jan"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ dfjay ]; platforms = lib.platforms.darwin ++ (with lib.systems.inspect; patternLogicalAnd patterns.isLinux patterns.isx86_64); @@ -56,25 +59,20 @@ let cudaPackages.cudatoolkit ]; - inherit meta; + inherit passthru meta; }; darwin = stdenv.mkDerivation { - inherit - pname - version - meta - ; + inherit pname version; src = darwin-src; - dontUnpack = true; - - sourceRoot = "${pname}.app"; nativeBuildInputs = [ makeWrapper ]; + dontUnpack = true; + installPhase = '' runHook preInstall @@ -87,6 +85,8 @@ let runHook postInstall ''; + + inherit passthru meta; }; in if stdenv.hostPlatform.isDarwin then darwin else linux diff --git a/pkgs/by-name/ja/jan/update.sh b/pkgs/by-name/ja/jan/update.sh new file mode 100755 index 000000000000..453ad670202c --- /dev/null +++ b/pkgs/by-name/ja/jan/update.sh @@ -0,0 +1,24 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nixVersions.latest curl coreutils jq common-updater-scripts + +set -euo pipefail + +latestTag=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/janhq/jan/releases/latest | jq -r ".tag_name") +latestVersion="${latestTag#v}" +currentVersion=$(nix-instantiate --eval -E "with import ./. {}; jan.version" | tr -d '"') + +echo "latest version: $latestVersion" +echo "current version: $currentVersion" + +if [[ "$latestVersion" == "$currentVersion" ]]; then + echo "package is up-to-date" + exit 0 +fi + +linuxUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/Jan_${latestVersion}_amd64.AppImage" +linuxHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url "$linuxUrl")") +update-source-version jan "$latestVersion" "$linuxHash" --system=x86_64-linux --ignore-same-version + +darwinUrl="https://github.com/janhq/jan/releases/download/v$latestVersion/jan-mac-universal-${latestVersion}.zip" +darwinHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$(nix-prefetch-url --unpack "$darwinUrl")") +update-source-version jan "$latestVersion" "$darwinHash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/ja/jasmin-compiler/package.nix b/pkgs/by-name/ja/jasmin-compiler/package.nix index acf734393ace..cbf548afa515 100644 --- a/pkgs/by-name/ja/jasmin-compiler/package.nix +++ b/pkgs/by-name/ja/jasmin-compiler/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "jasmin-compiler"; - version = "2026.03.1"; + version = "2026.03.2"; src = fetchurl { url = "https://github.com/jasmin-lang/jasmin/releases/download/v${finalAttrs.version}/jasmin-compiler-v${finalAttrs.version}.tar.bz2"; - hash = "sha256-eOn5KWNAPx7Z+VMm8mclUyxDlW8Q/MR9EayUxmojb1I="; + hash = "sha256-vGUy7SefQaq2xzxlyNfoay54gBqIDbQRp+vSN1V0Lc4="; }; nativeBuildInputs = with ocamlPackages; [ diff --git a/pkgs/by-name/ja/jasper/package.nix b/pkgs/by-name/ja/jasper/package.nix index 62f51d330e8a..eafddf6b27f5 100644 --- a/pkgs/by-name/ja/jasper/package.nix +++ b/pkgs/by-name/ja/jasper/package.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation (finalAttrs: { was chosen primarily due to the availability of C development environments for most computing platforms when JasPer was first developed, circa 1999. ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "jasper"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ja/jasterix/package.nix b/pkgs/by-name/ja/jasterix/package.nix index 9b804aaabd26..2d95eb370e55 100644 --- a/pkgs/by-name/ja/jasterix/package.nix +++ b/pkgs/by-name/ja/jasterix/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; buildInputs = [ diff --git a/pkgs/by-name/ja/java-language-server/package.nix b/pkgs/by-name/ja/java-language-server/package.nix index 234270d9cb12..7ab88894f51f 100644 --- a/pkgs/by-name/ja/java-language-server/package.nix +++ b/pkgs/by-name/ja/java-language-server/package.nix @@ -32,7 +32,7 @@ maven.buildMavenPackage { mvnFetchExtraArgs.dontConfigure = true; mvnJdk = jdk_headless; - mvnHash = "sha256-2uthmSjFQ43N5lgV11DsxuGce+ZptZsmRLTgjDo0M2w="; + mvnHash = "sha256-xxTR+2E+4nIkGwxCk0B+f0//rLdlqO/nwRaArxt3u8U="; nativeBuildInputs = [ jdk_headless diff --git a/pkgs/by-name/ja/jay/package.nix b/pkgs/by-name/ja/jay/package.nix index 205581101442..489402e85099 100644 --- a/pkgs/by-name/ja/jay/package.nix +++ b/pkgs/by-name/ja/jay/package.nix @@ -2,33 +2,34 @@ lib, stdenv, rustPlatform, - fetchFromGitHub, - libGL, - libinput, - pkgconf, - xkeyboard_config, - libgbm, - pango, - udev, - libglvnd, - vulkan-loader, autoPatchelfHook, + fetchFromGitHub, installShellFiles, + libGL, + libgbm, + libglvnd, + libinput, nix-update-script, + pango, + pkgconf, + sqlite, + udev, + vulkan-loader, + xkeyboard_config, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jay"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "mahkoh"; repo = "jay"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-tC2V1BgUGsUMpZsKXjFSS8Mp28LrNI/QNu761zpgAkc="; + sha256 = "sha256-bdvcGO1E9fkmKiXQxc3nvISwjIAegY8g37HmxXolsmU="; }; - cargoHash = "sha256-96vCkZR/8dgZH0hJPeKzP7jQZ41W7XTi9yMnxFaIhoY="; + cargoHash = "sha256-5yjMPDh7liaa9+KntfdCzUXz4vWzTcAhFmXrnVZ+pjM="; nativeBuildInputs = [ autoPatchelfHook @@ -38,16 +39,17 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ libGL - xkeyboard_config libgbm - pango - udev libinput + pango + sqlite + udev + vulkan-loader + xkeyboard_config ]; runtimeDependencies = [ libglvnd - vulkan-loader ]; checkFlags = [ diff --git a/pkgs/by-name/jb/jbang/package.nix b/pkgs/by-name/jb/jbang/package.nix index 501f3dbc8503..a2a6a029f981 100644 --- a/pkgs/by-name/jb/jbang/package.nix +++ b/pkgs/by-name/jb/jbang/package.nix @@ -4,6 +4,7 @@ fetchzip, jdk, makeWrapper, + bashNonInteractive, coreutils, curl, }: @@ -12,6 +13,9 @@ stdenv.mkDerivation rec { version = "0.136.0"; pname = "jbang"; + __structuredAttrs = true; + strictDeps = true; + src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; sha256 = "sha256-MsP4iLquOwJWlV7EPxSuAPWuyTv1PPSyQCrVdq4lPlM="; @@ -19,6 +23,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ + bashNonInteractive + ]; + installPhase = '' runHook preInstall rm bin/jbang.{cmd,ps1} diff --git a/pkgs/by-name/jc/jcal/package.nix b/pkgs/by-name/jc/jcal/package.nix index bfef63d4eadc..ab11c8a203ba 100644 --- a/pkgs/by-name/jc/jcal/package.nix +++ b/pkgs/by-name/jc/jcal/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.5.1"; src = fetchFromGitHub { - owner = "fzerorubigd"; + owner = "persiancal"; repo = "jcal"; rev = "v${finalAttrs.version}"; sha256 = "sha256-vJc5uijZlvohEtiS03LYlqtswVE38S9/ejlHrmZ0wqA="; diff --git a/pkgs/by-name/jc/jchempaint/package.nix b/pkgs/by-name/jc/jchempaint/package.nix index 179f52abcb5b..2edc4ec773c2 100644 --- a/pkgs/by-name/jc/jchempaint/package.nix +++ b/pkgs/by-name/jc/jchempaint/package.nix @@ -13,16 +13,16 @@ maven.buildMavenPackage { pname = "jchempaint"; - version = "3.4-SNAPSHOT-2025-10-15"; # "3.4-SNAPSHOT" is the version given in the pom.xml + version = "3.4-SNAPSHOT-2026-04-24"; # "3.4-SNAPSHOT" is the version given in the pom.xml src = fetchFromGitHub { owner = "JChemPaint"; repo = "jchempaint"; - rev = "de023b6ddc1a13f5af48fa2acc8a2633c36a30fa"; - hash = "sha256-1wcJ1qP8yZg1qe4YkpCRGidHUXc1/1eUabR3NoM6kjc="; + rev = "f128d0d15be1bac4d324463f269cf130d2211253"; + hash = "sha256-pcHX6PdnD/jkLxAMSV/Ts8VVrK9xy2NWiMVVJ7jTrQc="; }; - mvnHash = "sha256-AGDyXyEEDMjPHMlbcxninkciZ7V/ALMUS/OkgBnni18="; + mvnHash = "sha256-L5Gru4b8lMiDWapzaK9VXoKqRkJnXc1uKUn5Vjmnrqc="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/jd/jdiskreport/package.nix b/pkgs/by-name/jd/jdiskreport/package.nix index 5c89565d2a7e..c1766867a0ab 100644 --- a/pkgs/by-name/jd/jdiskreport/package.nix +++ b/pkgs/by-name/jd/jdiskreport/package.nix @@ -63,7 +63,6 @@ stdenv.mkDerivation rec { license = lib.licenses.unfreeRedistributable; # TODO freedist, libs under BSD-3 platforms = [ "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ kylesferrazza ]; mainProgram = "jdiskreport"; diff --git a/pkgs/by-name/jd/jdt-language-server/package.nix b/pkgs/by-name/jd/jdt-language-server/package.nix index dbfa2cd31415..e169a8c0e37d 100644 --- a/pkgs/by-name/jd/jdt-language-server/package.nix +++ b/pkgs/by-name/jd/jdt-language-server/package.nix @@ -7,15 +7,15 @@ }: let - timestamp = "202604151538"; + timestamp = "202606262232"; in stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.58.0"; + version = "1.60.0"; src = fetchurl { url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; - hash = "sha256-Klu+VeyRtDJTkgUNxCLOrTIgokWbN2a+NeH/9FtKUNk="; + hash = "sha256-6UwwPYGY+XeTCANYJzh3H9GMUsVJKHhBC/IisaqB7x0="; }; sourceRoot = "."; @@ -63,6 +63,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ matt-snider wenjinnn + yvnth ]; platforms = lib.platforms.all; mainProgram = "jdtls"; diff --git a/pkgs/by-name/je/jellyfin-desktop/package.nix b/pkgs/by-name/je/jellyfin-desktop/package.nix index 0c62dc24ed2d..3d571881d290 100644 --- a/pkgs/by-name/je/jellyfin-desktop/package.nix +++ b/pkgs/by-name/je/jellyfin-desktop/package.nix @@ -63,6 +63,8 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = [ "--set QT_STYLE_OVERRIDE Fusion" "--set NIX_SSL_CERT_FILE ${cacert}/etc/ssl/certs/ca-bundle.crt" + # Disable hardware acceleration to fix severe flickering in video playback. + "--set-default QTWEBENGINE_FORCE_USE_GBM 0" ]; postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' @@ -84,7 +86,6 @@ stdenv.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ jojosch diff --git a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix index 0b5e59a90e85..e6afd9c8c03e 100644 --- a/pkgs/by-name/je/jellyfin-ffmpeg/package.nix +++ b/pkgs/by-name/je/jellyfin-ffmpeg/package.nix @@ -38,7 +38,10 @@ in changelog = "https://github.com/jellyfin/jellyfin-ffmpeg/releases/tag/v${version}"; description = "${old.meta.description} (Jellyfin fork)"; homepage = "https://github.com/jellyfin/jellyfin-ffmpeg"; - maintainers = with lib.maintainers; [ justinas ]; + maintainers = with lib.maintainers; [ + dotlambda + justinas + ]; pkgConfigModules = [ "libavutil" ]; }; }) diff --git a/pkgs/applications/video/jellyfin-mpv-shim/default.nix b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix similarity index 83% rename from pkgs/applications/video/jellyfin-mpv-shim/default.nix rename to pkgs/by-name/je/jellyfin-mpv-shim/package.nix index 0f1334afafdb..09bc30ca7aa4 100644 --- a/pkgs/applications/video/jellyfin-mpv-shim/default.nix +++ b/pkgs/by-name/je/jellyfin-mpv-shim/package.nix @@ -10,12 +10,14 @@ python3Packages.buildPythonApplication rec { pname = "jellyfin-mpv-shim"; - version = "2.9.0"; + version = "2.10.0"; pyproject = true; + # contains shaderpacks src = fetchPypi { - inherit pname version; - hash = "sha256-YrwMvP66LAWKgx/yWBkWIkZtJ4a0YnhCiL7xB6fGm0E="; + pname = "jellyfin_mpv_shim"; + inherit version; + hash = "sha256-ZWmJQJAGAonStZyWww4P+034f2vGnTwLua7KUOqoBBE="; }; nativeBuildInputs = [ @@ -29,29 +31,23 @@ python3Packages.buildPythonApplication rec { dependencies = with python3Packages; [ jellyfin-apiclient-python mpv - pillow python-mpv-jsonipc + requests - # gui dependencies + # gui + mirror dependencies + pillow pystray tkinter - # display_mirror dependencies - jinja2 - pywebview - # discord rich presence dependency pypresence ]; - # override $HOME directory: - # error: [Errno 13] Permission denied: '/homeless-shelter' - # - # remove jellyfin_mpv_shim/win_utils.py: - # ModuleNotFoundError: No module named 'win32gui' preCheck = '' export HOME=$TMPDIR + # remove jellyfin_mpv_shim/win_utils.py: + # ModuleNotFoundError: No module named 'win32gui' rm jellyfin_mpv_shim/win_utils.py ''; @@ -60,7 +56,7 @@ python3Packages.buildPythonApplication rec { --replace-fail "check_updates: bool = True" "check_updates: bool = False" \ --replace-fail "notify_updates: bool = True" "notify_updates: bool = False" # python-mpv renamed to mpv with 1.0.4 - substituteInPlace setup.py \ + substituteInPlace pyproject.toml \ --replace-fail "python-mpv" "mpv" \ --replace-fail "mpv-jsonipc" "python_mpv_jsonipc" ''; @@ -70,7 +66,7 @@ python3Packages.buildPythonApplication rec { for s in 16 32 48 64 128 256; do mkdir -p $out/share/icons/hicolor/''${s}x''${s}/apps ln -s $out/${python3Packages.python.sitePackages}/jellyfin_mpv_shim/integration/jellyfin-''${s}.png \ - $out/share/icons/hicolor/''${s}x''${s}/apps/${pname}.png + $out/share/icons/hicolor/''${s}x''${s}/apps/jellyfin-mpv-shim.png done ''; @@ -84,9 +80,9 @@ python3Packages.buildPythonApplication rec { desktopItems = [ (makeDesktopItem { - name = pname; - exec = pname; - icon = pname; + name = "jellyfin-mpv-shim"; + exec = "jellyfin-mpv-shim"; + icon = "jellyfin-mpv-shim"; desktopName = "Jellyfin MPV Shim"; categories = [ "Video" @@ -123,5 +119,6 @@ python3Packages.buildPythonApplication rec { ]; maintainers = with lib.maintainers; [ jojosch ]; mainProgram = "jellyfin-mpv-shim"; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/by-name/je/jellyfin-rpc/package.nix b/pkgs/by-name/je/jellyfin-rpc/package.nix index 8163483638ee..1ff84539dc55 100644 --- a/pkgs/by-name/je/jellyfin-rpc/package.nix +++ b/pkgs/by-name/je/jellyfin-rpc/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jellyfin-rpc"; - version = "1.3.4"; + version = "1.3.5"; src = fetchFromGitHub { owner = "JustRadical"; repo = "jellyfin-rpc"; tag = finalAttrs.version; - hash = "sha256-g4Vd++Q6rJS6nU1kR+7aItnhHc0jeFSU460iF6P1EEk="; + hash = "sha256-6vlbANu3Eo51Zpdng4Ub3OYijwY5wekPLyyzIsG2zSE="; }; - cargoHash = "sha256-ltEm3hFiHBM4NtYg1qrFH26jMDgWa+al06P6O/Su1XA="; + cargoHash = "sha256-/g/qZM4wJuqqVUwoo8TzK1XsmRTGnDdo+toj/gO3QLo="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/je/jellyfin-tui/package.nix b/pkgs/by-name/je/jellyfin-tui/package.nix index 3a9baa010409..ffbaf54fb7aa 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 (finalAttrs: { pname = "jellyfin-tui"; - version = "1.5.0"; + version = "1.5.2"; src = fetchFromGitHub { owner = "dhonus"; repo = "jellyfin-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-BeZyJQ04S2Vnqx3sTFe6a0s56KckIzOIfOVz+bkhBoY="; + hash = "sha256-ZdcAPN+APEnkQbPdLpcQd/fdQnEP6peQ+xdZI5sskSM="; }; - cargoHash = "sha256-MP6wso9YlxJdN8WPuU149C5Hn3KeL+CekpPyN21ioA0="; + cargoHash = "sha256-mri4PhYcUTWWKLl39sDhLUsFQFGLUAvDlhKNcj9gTFU="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ diff --git a/pkgs/by-name/je/jellyfin/package.nix b/pkgs/by-name/je/jellyfin/package.nix index 15505b3a49a6..d7e8268a481b 100644 --- a/pkgs/by-name/je/jellyfin/package.nix +++ b/pkgs/by-name/je/jellyfin/package.nix @@ -10,6 +10,7 @@ jellyfin-web, sqlite, versionCheckHook, + jq, }: buildDotnetModule (finalAttrs: { @@ -23,6 +24,10 @@ buildDotnetModule (finalAttrs: { hash = "sha256-HCs4ZsutVoVH+bBZANjpPeMyV8e63Yemjg9DSr0R9zg="; }; + nativeBuildInputs = [ + jq + ]; + propagatedBuildInputs = [ sqlite ]; projectFile = "Jellyfin.Server/Jellyfin.Server.csproj"; @@ -44,6 +49,17 @@ buildDotnetModule (finalAttrs: { "--webdir=${jellyfin-web}/share/jellyfin-web" ]; + # Impurity with time. Injects the build date into this file + postFixup = '' + timestamp="$(TZ=GMT date -d "@$SOURCE_DATE_EPOCH" '+%a, %d %b %Y %X GMT')" + + cat "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json" \ + | jq --arg timestamp "$timestamp" '.Endpoints[].ResponseHeaders[] |= if (.Name == "Last-Modified") then .Value = $timestamp else . end' \ + > jellyfin.staticwebassets.endpoints.json.new + + mv "jellyfin.staticwebassets.endpoints.json.new" "$out/lib/jellyfin/jellyfin.staticwebassets.endpoints.json" + ''; + nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/je/jemalloc/package.nix b/pkgs/by-name/je/jemalloc/package.nix index 880e776d2dc0..3529c01c83cf 100644 --- a/pkgs/by-name/je/jemalloc/package.nix +++ b/pkgs/by-name/je/jemalloc/package.nix @@ -51,6 +51,14 @@ stdenv.mkDerivation (finalAttrs: { # `rtree_read.constprop.0` shows up in some builds but # not others, so we fall back to O2: ./o3-to-o2.patch + + # Active profiling may make xallocx decline to grow non-page-aligned + # allocations, so test/integration/extent can observe decommit without + # the matching commit on platforms with real decommit/commit. + # + # A (longer) patch addressing the failure posted upstream at: + # https://github.com/jemalloc/jemalloc/pull/2954 + ./skip-extent-test-with-prof-active.patch ]; nativeBuildInputs = [ @@ -60,6 +68,8 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--with-version=${finalAttrs.version}-0-g0000000000000000000000000000000000000000" "--with-lg-vaddr=${with stdenv.hostPlatform; toString (if isILP32 then 32 else parsed.cpu.bits)}" + # Profiling is inert unless enabled at runtime + "--enable-prof" ] # see the comment on stripPrefix ++ lib.optional stripPrefix "--with-jemalloc-prefix=" diff --git a/pkgs/by-name/je/jemalloc/skip-extent-test-with-prof-active.patch b/pkgs/by-name/je/jemalloc/skip-extent-test-with-prof-active.patch new file mode 100644 index 000000000000..1440435c1458 --- /dev/null +++ b/pkgs/by-name/je/jemalloc/skip-extent-test-with-prof-active.patch @@ -0,0 +1,24 @@ +diff --git a/test/integration/extent.sh b/test/integration/extent.sh +index 39fb0a73..ee9f3ed4 100644 +--- a/test/integration/extent.sh ++++ b/test/integration/extent.sh +@@ -1,5 +1,19 @@ + #!/bin/sh + ++# With active profiling, xallocx may decline to grow non-page-aligned ++# allocations. On platforms with real decommit/commit, this can make this ++# test observe a successful decommit without the matching commit. ++case ",${MALLOC_CONF_ALL}," in ++ *,prof:true,*) ++ case ",${MALLOC_CONF_ALL}," in ++ *,prof_active:false,*) ++ ;; ++ *) ++ return 1 ++ ;; ++ esac ++esac ++ + if [ "x${enable_fill}" = "x1" ] ; then + export MALLOC_CONF="junk:false" + fi diff --git a/pkgs/by-name/je/jenkins/package.nix b/pkgs/by-name/je/jenkins/package.nix index b6f35b371667..46338c62722f 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.555.3"; + version = "2.568.1"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${finalAttrs.version}/jenkins.war"; - hash = "sha256-XRmQXmwPI6/4n/AH3lVkuW4KBcE/TRqS0P3LabAzu5o="; + hash = "sha256-WPJPOWX773cIYp++FY1RvxOP/Vd8rbyGtGNn6K0L64M="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/je/jetbrains-mono/package.nix b/pkgs/by-name/je/jetbrains-mono/package.nix index 4461ab2bafef..5584347e5a2b 100644 --- a/pkgs/by-name/je/jetbrains-mono/package.nix +++ b/pkgs/by-name/je/jetbrains-mono/package.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, - python3Packages, + python313Packages, }: stdenvNoCC.mkDerivation rec { @@ -19,7 +19,8 @@ stdenvNoCC.mkDerivation rec { env."PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION" = "python"; nativeBuildInputs = [ - python3Packages.gftools + # Currently broken on 3.14 + python313Packages.gftools ]; buildPhase = '' diff --git a/pkgs/by-name/je/jetbrains-toolbox/package.nix b/pkgs/by-name/je/jetbrains-toolbox/package.nix index 25f9fafe6104..3399a8f136a2 100644 --- a/pkgs/by-name/je/jetbrains-toolbox/package.nix +++ b/pkgs/by-name/je/jetbrains-toolbox/package.nix @@ -10,7 +10,7 @@ let pname = "jetbrains-toolbox"; - version = "3.5.0.84344"; + version = "3.6.2.85969"; updateScript = ./update.sh; @@ -27,7 +27,6 @@ let "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; mainProgram = "jetbrains-toolbox"; }; @@ -58,10 +57,9 @@ let aarch64 = "-arm64"; }; hash = selectSystem { - x86_64-linux = "sha256-u+ATMiioJAmr8wTde4g1hB/DZqPnLZoPNJp6Oiq6m5o="; - aarch64-linux = "sha256-5sOJ7nrhNDCtAlrh2yoCUX/nGDm6gM5gV/y592zWQqQ="; - x86_64-darwin = "sha256-o2v30FIeVafjKXWjwEY9Mw+rbNfQyXJZUvDF6+DAR58="; - aarch64-darwin = "sha256-DDGoHMltZWW/7LtHdDiMwS7HEgs8iPrJqc0XC6YolpY="; + x86_64-linux = "sha256-2XvsZ5WrdmDGTigKWJCUJB2VkHj+Z3M8QClp6YoIIRw="; + aarch64-linux = "sha256-/8j7vJGTCvj57I1kqUCyBSDoJA8Tr0MUaomhb0Um7vA="; + aarch64-darwin = "sha256-esf/AfRDGoWV05KWb7CfJBRQvkcs3bG5/IldcTuNZOA="; }; in selectKernel { @@ -97,7 +95,7 @@ selectKernel { extraInstallCommands = '' install -Dm0644 ${src}/bin/jetbrains-toolbox.desktop -t $out/share/applications - install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/pixmaps/jetbrains-toolbox.png + install -Dm0644 ${src}/bin/toolbox-tray-color.png $out/share/icons/hicolor/32x32/apps/jetbrains-toolbox.png ''; }; diff --git a/pkgs/by-name/jf/jfbview/package.nix b/pkgs/by-name/jf/jfbview/package.nix index 5a28c3c8eea5..dfef739b1ac8 100644 --- a/pkgs/by-name/jf/jfbview/package.nix +++ b/pkgs/by-name/jf/jfbview/package.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "jfbview"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "jichu4n"; repo = "jfbview"; tag = finalAttrs.version; fetchSubmodules = true; - hash = "sha256-7iyDfMuGAXXLyDNz0d4jEQ+KfJ/LyUu4v1n0GcOKeEc="; + hash = "sha256-X52FBg4Jgb80OETu29p4lcWpT+OSRz1xfhw+IkFZr+I="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/jf/jffi/package.nix b/pkgs/by-name/jf/jffi/package.nix index 0cddc9dec8a7..8e8b03cba33e 100644 --- a/pkgs/by-name/jf/jffi/package.nix +++ b/pkgs/by-name/jf/jffi/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jffi"; - version = "1.3.13"; + version = "1.3.15"; src = fetchFromGitHub { owner = "jnr"; repo = "jffi"; rev = "jffi-${finalAttrs.version}"; - hash = "sha256-aBQkkZyXZkaJc4sr/jHnIRaJYP116u4Jqsr9XXzfOBA="; + hash = "sha256-CW9tB8g/xR01RB1Fl80vWVeXke1eLjHp9mSkMy6O4G4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/jf/jfmt/package.nix b/pkgs/by-name/jf/jfmt/package.nix index bfb31436d274..0709603f886a 100644 --- a/pkgs/by-name/jf/jfmt/package.nix +++ b/pkgs/by-name/jf/jfmt/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.2.1"; src = fetchFromGitHub { - owner = "scruffystuffs"; + owner = "skilly-lily"; repo = "jfmt.rs"; rev = "v${finalAttrs.version}"; hash = "sha256-X3wk669G07BTPAT5xGbAfIu2Qk90aaJIi1CLmOnSG80="; @@ -20,8 +20,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CLI utility to format json files"; mainProgram = "jfmt"; - homepage = "https://github.com/scruffystuffs/jfmt.rs"; - changelog = "https://github.com/scruffystuffs/jfmt.rs/blob/${finalAttrs.version}/CHANGELOG.md"; + homepage = "https://github.com/skilly-lily/jfmt.rs"; + changelog = "https://github.com/skilly-lily/jfmt.rs/blob/${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = [ lib.maintainers.psibi ]; }; diff --git a/pkgs/by-name/jf/jfrog-cli/package.nix b/pkgs/by-name/jf/jfrog-cli/package.nix index 1e7a338e2a5c..0507c9e71b6c 100644 --- a/pkgs/by-name/jf/jfrog-cli/package.nix +++ b/pkgs/by-name/jf/jfrog-cli/package.nix @@ -9,17 +9,17 @@ buildGoModule (finalAttrs: { pname = "jfrog-cli"; - version = "2.107.0"; + version = "2.113.0"; src = fetchFromGitHub { owner = "jfrog"; repo = "jfrog-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-C8O11hSt51NXTGAAIuPzpl7b78DqE+xDTFddO9UiSaQ="; + hash = "sha256-AcydCwarePzysegEH9QUgbp0v2SP8J56rAYFBF6FxO0="; }; proxyVendor = true; - vendorHash = "sha256-f2kA1zRMdScMxxJJOX7paUksg9gYKjo1S2FwHeRIVKs="; + vendorHash = "sha256-gghTbLH/o88u9smpe5gDUM0a4Zk0x/J9unABnqaKo58="; checkFlags = "-skip=^(TestReleaseBundle|TestVisibilitySendUsage_RtCurl_E2E)"; diff --git a/pkgs/by-name/jg/jgmenu/package.nix b/pkgs/by-name/jg/jgmenu/package.nix index 7ed3fef65fb7..7e33790fc08b 100644 --- a/pkgs/by-name/jg/jgmenu/package.nix +++ b/pkgs/by-name/jg/jgmenu/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { version = "4.5.0"; src = fetchFromGitHub { - owner = "johanmalm"; + owner = "jgmenu"; repo = "jgmenu"; rev = "v${finalAttrs.version}"; sha256 = "sha256-vuSpiZZYe0l5va9dHM54gaoI9x8qXH1gJORUS5489jQ="; @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.updateScript = gitUpdater { rev-prefix = "v"; }; meta = { - homepage = "https://github.com/johanmalm/jgmenu"; + homepage = "https://github.com/jgmenu/jgmenu"; description = "Small X11 menu intended to be used with openbox and tint2"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/ji/jimtcl/package.nix b/pkgs/by-name/ji/jimtcl/package.nix index 73e0d6e568a6..e551e07e3308 100644 --- a/pkgs/by-name/ji/jimtcl/package.nix +++ b/pkgs/by-name/ji/jimtcl/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jimtcl"; - version = "0.82"; + version = "0.84"; src = fetchFromGitHub { owner = "msteveb"; repo = "jimtcl"; rev = finalAttrs.version; - sha256 = "sha256-CDjjrxpoTbLESAbCiCjQ8+E/oJP87gDv9SedQOzH3QY="; + sha256 = "sha256-MvsC82PMmh7PP1sXNwZRNDNFU7r5LWRA6YqvuvZ9yZE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ji/jinja-lsp/package.nix b/pkgs/by-name/ji/jinja-lsp/package.nix index 8e38b1b90907..afb61fae645a 100644 --- a/pkgs/by-name/ji/jinja-lsp/package.nix +++ b/pkgs/by-name/ji/jinja-lsp/package.nix @@ -5,16 +5,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "jinja-lsp"; - version = "0.1.91"; + version = "0.2.3"; src = fetchFromGitHub { owner = "uros-5"; repo = "jinja-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-BOZIbuEZQAEVtB/rfZVPuUki4hdbq0+NEsXr26+zZ3o="; + hash = "sha256-Fjn4iJH3/Cgo+mD/tnJL12i+teVLNqb2xryZfhrZckg="; }; - cargoHash = "sha256-1tXgHd4PBOxa4YzHClahrrkRsbwBoT5lMdigB5CE5Zw="; + cargoHash = "sha256-8fKuqidgvtHanFgxyETbs7SrFVO9tmf0IogSq5URdF0="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/ji/jiratui/package.nix b/pkgs/by-name/ji/jiratui/package.nix index a9652114ab64..407fb5c1bafa 100644 --- a/pkgs/by-name/ji/jiratui/package.nix +++ b/pkgs/by-name/ji/jiratui/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jiratui"; - version = "1.3.0"; + version = "1.10.1"; pyproject = true; src = fetchFromGitHub { owner = "whyisdifficult"; repo = "jiratui"; tag = "v${finalAttrs.version}"; - hash = "sha256-b5bSMPnqHqpeFDl501gSun7G38OlhV/IMNMYXQT+j/4="; + hash = "sha256-yXVc3evYK3lbiLwn09M++lZfbb5F9bXSR5ge6Pfgs6w="; }; postPatch = '' @@ -32,19 +32,28 @@ python3Packages.buildPythonApplication (finalAttrs: { click gitpython httpx - pyaml + marklas + puremagic pydantic-settings python-dateutil python-json-logger - python-magic + pyyaml textual + textual-autocomplete textual-image + urllib3 xdg-base-dirs ] ++ textual.optional-dependencies.syntax; pythonRelaxDeps = [ "click" + "marklas" + # upstream wants puremagic >= 2.2.0 but only uses puremagic.magic_string, + # which is compatible with 1.x; drop once puremagic >= 2.2.0 lands + "puremagic" + "pydantic-settings" + "python-json-logger" ]; pythonImportsCheck = [ diff --git a/pkgs/by-name/jj/jj-pre-push/package.nix b/pkgs/by-name/jj/jj-pre-push/package.nix index f757a64df839..827117002602 100644 --- a/pkgs/by-name/jj/jj-pre-push/package.nix +++ b/pkgs/by-name/jj/jj-pre-push/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "jj-pre-push"; - version = "0.5.0"; + version = "0.5.1"; pyproject = true; src = fetchFromGitHub { owner = "acarapetis"; repo = "jj-pre-push"; tag = "v${finalAttrs.version}"; - hash = "sha256-AIsLUI42ewYqmgOP9livXE0tGAVWTfSh9K7h+PMObJg="; + hash = "sha256-Vi50t+AMUgSlUjwBRZPJ+yxfJMQWKDAr21trkqjcuQM="; }; postPatch = '' diff --git a/pkgs/by-name/jj/jj-vine/package.nix b/pkgs/by-name/jj/jj-vine/package.nix index 6287241df882..17ef577e9285 100644 --- a/pkgs/by-name/jj/jj-vine/package.nix +++ b/pkgs/by-name/jj/jj-vine/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jj-vine"; - version = "0.5.0"; + version = "0.5.3"; src = fetchFromCodeberg { owner = "abrenneke"; repo = "jj-vine"; tag = "v${finalAttrs.version}"; - hash = "sha256-uvnSv+4ijVdBoHrOklDRY+JDLsVOTRu+laOcFMjkYaA="; + hash = "sha256-dUamfoMtdDNz9xmXeg1O1j5UHW6uF/1WznHSsG+eVjs="; }; - cargoHash = "sha256-TsyFWcvr8ksiC1vStWs+mH88lw1/JGRg8IQ7XFnZ5qg="; + cargoHash = "sha256-nuj0cugeK5oc+sZmm1f5dvGEjML0qkle5uO66e54VIY="; nativeCheckInputs = [ jujutsu diff --git a/pkgs/by-name/jj/jjui/package.nix b/pkgs/by-name/jj/jjui/package.nix index 70835942d8ed..9ed459e2d028 100644 --- a/pkgs/by-name/jj/jjui/package.nix +++ b/pkgs/by-name/jj/jjui/package.nix @@ -8,16 +8,16 @@ }: buildGo125Module (finalAttrs: { pname = "jjui"; - version = "0.10.6"; + version = "0.10.8"; src = fetchFromGitHub { owner = "idursun"; repo = "jjui"; tag = "v${finalAttrs.version}"; - hash = "sha256-kz1GDk+M98yWVu69nTRVxjC/Kk9qbGFfXXJ5ZwDLEiU="; + hash = "sha256-ZbmCPCTsSbphLUy+lrTt4/6DVq70edKGI59U0HDbawE="; }; - vendorHash = "sha256-I39Tcb28voPSuZhYkEPdvhsViZD7QZZtZjDtRKkZ5LE="; + vendorHash = "sha256-thGlfZ0SwHpynYydxu6Sg8OUe5kr7jiPKvl6BXS5BWA="; ldflags = [ "-X main.Version=${finalAttrs.version}" ]; diff --git a/pkgs/by-name/jm/jmc2obj/package.nix b/pkgs/by-name/jm/jmc2obj/package.nix index efc0114dc310..a1c24a6599ab 100644 --- a/pkgs/by-name/jm/jmc2obj/package.nix +++ b/pkgs/by-name/jm/jmc2obj/package.nix @@ -18,7 +18,7 @@ maven.buildMavenPackage rec { hash = "sha256-3+vH1pGJ6I4oobb2vk+J5GrOQrSLNoCuBIC9OsWYCj0="; }; - mvnHash = "sha256-ZU/5RGujCdmlBuxtHDaBpF/54e8W/Kca+2jtTudMXWo="; + mvnHash = "sha256-y+K6FR0USh4LUyv/w5n3pRVILtMRKg64+3D7yfE1IP8="; mvnParameters = "-Dmaven.gitcommitid.skip=true"; diff --git a/pkgs/by-name/jm/jmol/package.nix b/pkgs/by-name/jm/jmol/package.nix index 9242614a4a3c..59150799e1ef 100644 --- a/pkgs/by-name/jm/jmol/package.nix +++ b/pkgs/by-name/jm/jmol/package.nix @@ -31,7 +31,7 @@ let }; in stdenv.mkDerivation (finalAttrs: { - version = "16.4.1"; + version = "16.4.11"; pname = "jmol"; src = @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { in fetchurl { url = "mirror://sourceforge/jmol/Jmol/Version%20${baseVersion}/Jmol%20${finalAttrs.version}/Jmol-${finalAttrs.version}-binary.tar.gz"; - hash = "sha256-n7Ql/pK/N6maG2EjrgdRz+HUvn+JwkZpvRQyuElKrHI="; + hash = "sha256-kDt6XF5axy9DhygLZcImV37plkq/xDqi2aL2wKV9wh4="; }; patchPhase = '' diff --git a/pkgs/by-name/jm/jmtpfs/package.nix b/pkgs/by-name/jm/jmtpfs/package.nix deleted file mode 100644 index beb1821d2f3b..000000000000 --- a/pkgs/by-name/jm/jmtpfs/package.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - fetchpatch, - pkg-config, - file, - fuse, - libmtp, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "jmtpfs"; - version = "0.5"; - - src = fetchFromGitHub { - sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; - rev = "v${finalAttrs.version}"; - repo = "jmtpfs"; - owner = "JasonFerrara"; - }; - - patches = [ - # Fix Darwin build (https://github.com/JasonFerrara/jmtpfs/pull/12) - (fetchpatch { - url = "https://github.com/JasonFerrara/jmtpfs/commit/b89084303477d1bc4dc9a887ba9cdd75221f497d.patch"; - sha256 = "0s7x3jfk8i86rd5bwhj7mb1lffcdlpj9bd7b41s1768ady91rb29"; - }) - ]; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ - file - fuse - libmtp - ]; - - meta = { - description = "FUSE filesystem for MTP devices like Android phones"; - homepage = "https://github.com/JasonFerrara/jmtpfs"; - license = lib.licenses.gpl3Only; - platforms = lib.platforms.unix; - maintainers = [ lib.maintainers.coconnor ]; - mainProgram = "jmtpfs"; - }; -}) diff --git a/pkgs/by-name/jn/jnr-posix/package.nix b/pkgs/by-name/jn/jnr-posix/package.nix index d8f78c6a3481..2c102a529296 100644 --- a/pkgs/by-name/jn/jnr-posix/package.nix +++ b/pkgs/by-name/jn/jnr-posix/package.nix @@ -45,7 +45,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-gOw0KUFyZEMONwLwlHSiV+ZZ7JQhjZwg708Q1IciUfo="; + outputHash = "sha256-Mtu67CcNY5uThfaa7CQr9cHHpjX+EMFktuSZOlLwyFg="; doCheck = false; }; diff --git a/pkgs/by-name/jn/jnv/package.nix b/pkgs/by-name/jn/jnv/package.nix index 8d3603432001..96bc793e1172 100644 --- a/pkgs/by-name/jn/jnv/package.nix +++ b/pkgs/by-name/jn/jnv/package.nix @@ -28,7 +28,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Interactive JSON filter using jq"; mainProgram = "jnv"; homepage = "https://github.com/ynqa/jnv"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ nealfennimore nshalman diff --git a/pkgs/by-name/jo/jocalsend/package.nix b/pkgs/by-name/jo/jocalsend/package.nix index 11af40e879ca..6597f1be5bb7 100644 --- a/pkgs/by-name/jo/jocalsend/package.nix +++ b/pkgs/by-name/jo/jocalsend/package.nix @@ -11,6 +11,8 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jocalsend"; version = "1.618033988"; + __structuredAttrs = true; + src = fetchFromGitea { domain = "git.kittencollective.com"; owner = "nebkor"; @@ -35,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.kittencollective.com/nebkor/joecalsend"; description = "Rust terminal client for Localsend"; changelog = "https://git.kittencollective.com/nebkor/joecalsend/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ unfreeRedistributable ]; + license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ Cameo007 ]; mainProgram = "jocalsend"; }; diff --git a/pkgs/by-name/jo/john/package.nix b/pkgs/by-name/jo/john/package.nix index ffb0d96558b1..0a95f2b97525 100644 --- a/pkgs/by-name/jo/john/package.nix +++ b/pkgs/by-name/jo/john/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation { pname = "john"; - version = "1.9.0-Jumbo-1-unstable-2026-06-07"; + version = "1.9.0-Jumbo-1-unstable-2026-07-07"; src = fetchFromGitHub { owner = "openwall"; repo = "john"; - rev = "309326510e585c7a1340dab2e475c2ebfa6295aa"; - hash = "sha256-9bk5Icnm7PgQdSVrAKWHaKN0POctVKbofR7Aa9T2fXE="; + rev = "b544069b36ac166fb0a2fb19d0dc144ca72da6bb"; + hash = "sha256-dSdezI0+WSufYVLNChNJQ04VzuKczbfBLrI/5smR1fA="; }; patches = lib.optionals withOpenCL [ @@ -95,6 +95,10 @@ stdenv.mkDerivation { scapy lxml ]) + # For office2john.py + ++ (with python3Packages; [ + olefile + ]) ++ (with perlPackages; [ # For pass_gen.pl DigestMD4 diff --git a/pkgs/by-name/jo/jol/package.nix b/pkgs/by-name/jo/jol/package.nix index 66aaec985d5e..36115f7b878c 100644 --- a/pkgs/by-name/jo/jol/package.nix +++ b/pkgs/by-name/jo/jol/package.nix @@ -17,7 +17,7 @@ maven.buildMavenPackage (finalAttrs: { hash = "sha256-ZJFuY2QYB8eUS3y3VRMGGwklCS93HHVkNe/dhyIx0SY="; }; - mvnHash = "sha256-yQfiHlAZZgINGAYVlK5JflWX3d8Axtv1Ke89S7x86G4="; + mvnHash = "sha256-VXYY7XWRuSjju9mgQ6cvHlJwOK2BklE9j/uj0yczjcI="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/jo/jonquil/package.nix b/pkgs/by-name/jo/jonquil/package.nix index 5434e3fa091f..141fa3822da8 100644 --- a/pkgs/by-name/jo/jonquil/package.nix +++ b/pkgs/by-name/jo/jonquil/package.nix @@ -21,13 +21,13 @@ assert ( stdenv.mkDerivation (finalAttrs: { pname = "jonquil"; - version = "0.3.0"; + version = "0.3.2"; src = fetchFromGitHub { owner = "toml-f"; repo = "jonquil"; rev = "v${finalAttrs.version}"; - hash = "sha256-2JCTHA0nyA7xE0IA+LNrEAulHU2eIbNRvFGQ7YSQMRE="; + hash = "sha256-eu5+cVvIF8AXye8zrcfaHoQzd+7bx6q9KtFuH5w2sFc="; }; patches = [ diff --git a/pkgs/by-name/jo/joomscan/package.nix b/pkgs/by-name/jo/joomscan/package.nix index 8f145f05a443..40780daa182d 100644 --- a/pkgs/by-name/jo/joomscan/package.nix +++ b/pkgs/by-name/jo/joomscan/package.nix @@ -16,7 +16,7 @@ let in stdenv.mkDerivation { pname = "joomscan"; - version = "unstable-2021-06-08"; + version = "0.0.7-unstable-2021-06-08"; src = fetchFromGitHub { owner = "owasp"; diff --git a/pkgs/by-name/jo/joplin-desktop/package.nix b/pkgs/by-name/jo/joplin-desktop/package.nix index 444eecdda5cf..c1005e35295a 100644 --- a/pkgs/by-name/jo/joplin-desktop/package.nix +++ b/pkgs/by-name/jo/joplin-desktop/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - nodejs, + nodejs_22, makeDesktopItem, copyDesktopItems, makeWrapper, @@ -25,7 +25,9 @@ }: let - yarn-berry = yarn-berry_4; + # nodejs pin should be obsolete once #522655 is in master + nodejs = nodejs_22; + yarn-berry = yarn-berry_4.override { inherit nodejs; }; releaseData = lib.importJSON ./release-data.json; in diff --git a/pkgs/by-name/jo/joplin-desktop/release-data.json b/pkgs/by-name/jo/joplin-desktop/release-data.json index 498b2075c049..5015e67861b0 100644 --- a/pkgs/by-name/jo/joplin-desktop/release-data.json +++ b/pkgs/by-name/jo/joplin-desktop/release-data.json @@ -1,6 +1,6 @@ { - "version": "3.6.14", - "hash": "sha256-0mioVPCBhWmcXkVqCOku1KsPN29fGDp5jGhxnwD0MUk=", + "version": "3.6.15", + "hash": "sha256-uCF0nsHZowb9SuqBNni8/MWjGv9JyAUJs/gQprEoGjU=", "plugins": { "io.github.jackgruber.backup": { "name": "joplin-plugin-backup", diff --git a/pkgs/by-name/jo/joularjx/package.nix b/pkgs/by-name/jo/joularjx/package.nix index 4233f4b861bc..240b0b6756b5 100644 --- a/pkgs/by-name/jo/joularjx/package.nix +++ b/pkgs/by-name/jo/joularjx/package.nix @@ -17,7 +17,7 @@ maven.buildMavenPackage rec { hash = "sha256-hr8a3Qr1LdFfGBLVJVkm6hhCW7knG4VpXj7nCtcptuU="; }; - mvnHash = "sha256-3y39873pxlQD7d02sbVtZ2I/zcQtPZ30XrA2qY84EzA="; + mvnHash = "sha256-XXqpajmHCjDxMZvYnW7EiCsPIuWF8tsE7RmI/gt3iZQ="; mvnParameters = "-DskipTests -Dmaven.javadoc.skip=true"; diff --git a/pkgs/by-name/jo/joystickwake/package.nix b/pkgs/by-name/jo/joystickwake/package.nix index f455d91fd88d..e8001e3273f4 100644 --- a/pkgs/by-name/jo/joystickwake/package.nix +++ b/pkgs/by-name/jo/joystickwake/package.nix @@ -22,7 +22,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { dependencies = with python3.pkgs; [ dbus-fast pyudev - xlib + python-xlib ]; postInstall = '' diff --git a/pkgs/by-name/jp/jpegli/package.nix b/pkgs/by-name/jp/jpegli/package.nix index 68ed1766c073..86bf75f0c426 100644 --- a/pkgs/by-name/jp/jpegli/package.nix +++ b/pkgs/by-name/jp/jpegli/package.nix @@ -31,7 +31,10 @@ stdenv.mkDerivation { outputs = [ "out" + "bin" + "dev" "man" + "benchmark" ]; strictDeps = true; @@ -70,6 +73,12 @@ stdenv.mkDerivation { (lib.cmakeFeature "CMAKE_POLICY_VERSION_MINIMUM" "3.5") ]; + # Move `benchmark_xl` into a separate output to avoid a file collision + # with the `benchmark_xl` binary provided by `libjxl`. + postInstall = '' + moveToOutput "bin/benchmark_xl" "$benchmark" + ''; + doCheck = true; passthru = { diff --git a/pkgs/by-name/jp/jpmml-evaluator/package.nix b/pkgs/by-name/jp/jpmml-evaluator/package.nix new file mode 100644 index 000000000000..3ca614f03a80 --- /dev/null +++ b/pkgs/by-name/jp/jpmml-evaluator/package.nix @@ -0,0 +1,56 @@ +{ + lib, + maven, + fetchFromGitHub, + makeBinaryWrapper, + jre_headless, + nix-update-script, +}: + +let + pname = "jpmml-evaluator"; + version = "1.7.7"; +in +maven.buildMavenPackage { + inherit pname version; + strictDeps = true; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jpmml"; + repo = "jpmml-evaluator"; + tag = version; + hash = "sha256-DtI/cHmiKVH0IAp3mWJr2sDDjAzM5d9/cBx4KJm74WM="; + }; + + mvnHash = "sha256-PBkRDMPF/btYROGs4bl71wl2em05N6T2Klf1qFZLHDI="; + + nativeBuildInputs = [ + makeBinaryWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/java $out/bin + cp pmml-evaluator-example/target/pmml-evaluator-example-executable-*.jar $out/share/java/jpmml-evaluator.jar + + makeBinaryWrapper ${jre_headless}/bin/java $out/bin/jpmml-evaluator \ + --add-flags "-jar $out/share/java/jpmml-evaluator.jar" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Java Evaluator API for PMML"; + homepage = "https://github.com/jpmml/jpmml-evaluator"; + changelog = "https://github.com/jpmml/jpmml-evaluator/releases/tag/${version}"; + license = lib.licenses.agpl3Only; + maintainers = [ lib.maintainers.b-rodrigues ]; + mainProgram = "jpmml-evaluator"; + platforms = lib.platforms.all; + sourceProvenance = with lib.sourceTypes; [ fromSource ]; + }; +} diff --git a/pkgs/by-name/jq/jq-lsp/package.nix b/pkgs/by-name/jq/jq-lsp/package.nix index ebb7750c241e..2206ef8598be 100644 --- a/pkgs/by-name/jq/jq-lsp/package.nix +++ b/pkgs/by-name/jq/jq-lsp/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "jq-lsp"; - version = "0.1.17"; + version = "0.1.18"; src = fetchFromGitHub { owner = "wader"; repo = "jq-lsp"; tag = "v${finalAttrs.version}"; - hash = "sha256-gHBEAKPjCX25bI/+wyhcqHja5hb4d+GXMD3pVFeqrCc="; + hash = "sha256-C32LxOfqCp6rhHKl1JNKq+KSw+TCN7QF6WDMfwfX4zo="; }; vendorHash = "sha256-pGXFuyYJPNcMEd0vPrmbdY/CeOF0AXwrNJEfrBBe4I0="; diff --git a/pkgs/by-name/jq/jq/CVE-2026-32316.patch b/pkgs/by-name/jq/jq/CVE-2026-32316.patch deleted file mode 100644 index 29d08c9adcd7..000000000000 --- a/pkgs/by-name/jq/jq/CVE-2026-32316.patch +++ /dev/null @@ -1,49 +0,0 @@ -From e47e56d226519635768e6aab2f38f0ab037c09e5 Mon Sep 17 00:00:00 2001 -From: itchyny -Date: Thu, 12 Mar 2026 20:28:43 +0900 -Subject: [PATCH] Fix heap buffer overflow in `jvp_string_append` and - `jvp_string_copy_replace_bad` - -In `jvp_string_append`, the allocation size `(currlen + len) * 2` could -overflow `uint32_t` when `currlen + len` exceeds `INT_MAX`, causing a small -allocation followed by a large `memcpy`. - -In `jvp_string_copy_replace_bad`, the output buffer size calculation -`length * 3 + 1` could overflow `uint32_t`, again resulting in a small -allocation followed by a large write. - -Add overflow checks to both functions to return an error for strings -that would exceed `INT_MAX` in length. Fixes CVE-2026-32316. ---- - src/jv.c | 11 ++++++++++- - 1 file changed, 10 insertions(+), 1 deletion(-) - -diff --git a/src/jv.c b/src/jv.c -index 722a539391..2a62b48419 100644 ---- a/src/jv.c -+++ b/src/jv.c -@@ -1114,7 +1114,12 @@ static jv jvp_string_copy_replace_bad(const char* data, uint32_t length) { - const char* end = data + length; - const char* i = data; - -- uint32_t maxlength = length * 3 + 1; // worst case: all bad bytes, each becomes a 3-byte U+FFFD -+ // worst case: all bad bytes, each becomes a 3-byte U+FFFD -+ uint64_t maxlength = (uint64_t)length * 3 + 1; -+ if (maxlength >= INT_MAX) { -+ return jv_invalid_with_msg(jv_string("String too long")); -+ } -+ - jvp_string* s = jvp_string_alloc(maxlength); - char* out = s->data; - int c = 0; -@@ -1174,6 +1179,10 @@ static uint32_t jvp_string_remaining_space(jvp_string* s) { - static jv jvp_string_append(jv string, const char* data, uint32_t len) { - jvp_string* s = jvp_string_ptr(string); - uint32_t currlen = jvp_string_length(s); -+ if ((uint64_t)currlen + len >= INT_MAX) { -+ jv_free(string); -+ return jv_invalid_with_msg(jv_string("String too long")); -+ } - - if (jvp_refcnt_unshared(string.u.ptr) && - jvp_string_remaining_space(s) >= len) { diff --git a/pkgs/by-name/jq/jq/CVE-2026-33947.patch b/pkgs/by-name/jq/jq/CVE-2026-33947.patch deleted file mode 100644 index 9f31fd82b057..000000000000 --- a/pkgs/by-name/jq/jq/CVE-2026-33947.patch +++ /dev/null @@ -1,66 +0,0 @@ -From fb59f1491058d58bdc3e8dd28f1773d1ac690a1f Mon Sep 17 00:00:00 2001 -From: itchyny -Date: Mon, 13 Apr 2026 11:23:40 +0900 -Subject: [PATCH] Limit path depth to prevent stack overflow - -Deeply nested path arrays can cause unbounded recursion in -`jv_setpath`, `jv_getpath`, and `jv_delpaths`, leading to -stack overflow. Add a depth limit of 10000 to match the -existing `tojson` depth limit. This fixes CVE-2026-33947. ---- - src/jv_aux.c | 21 +++++++++++++++++++++ - 2 files changed, 46 insertions(+) - -diff --git a/src/jv_aux.c b/src/jv_aux.c -index 018f380b10..fd5ff96684 100644 ---- a/src/jv_aux.c -+++ b/src/jv_aux.c -@@ -365,6 +365,10 @@ static jv jv_dels(jv t, jv keys) { - return t; - } - -+#ifndef MAX_PATH_DEPTH -+#define MAX_PATH_DEPTH (10000) -+#endif -+ - jv jv_setpath(jv root, jv path, jv value) { - if (jv_get_kind(path) != JV_KIND_ARRAY) { - jv_free(value); -@@ -372,6 +376,12 @@ jv jv_setpath(jv root, jv path, jv value) { - jv_free(path); - return jv_invalid_with_msg(jv_string("Path must be specified as an array")); - } -+ if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) { -+ jv_free(value); -+ jv_free(root); -+ jv_free(path); -+ return jv_invalid_with_msg(jv_string("Path too deep")); -+ } - if (!jv_is_valid(root)){ - jv_free(value); - jv_free(path); -@@ -424,6 +434,11 @@ jv jv_getpath(jv root, jv path) { - jv_free(path); - return jv_invalid_with_msg(jv_string("Path must be specified as an array")); - } -+ if (jv_array_length(jv_copy(path)) > MAX_PATH_DEPTH) { -+ jv_free(root); -+ jv_free(path); -+ return jv_invalid_with_msg(jv_string("Path too deep")); -+ } - if (!jv_is_valid(root)) { - jv_free(path); - return root; -@@ -502,6 +517,12 @@ jv jv_delpaths(jv object, jv paths) { - jv_free(elem); - return err; - } -+ if (jv_array_length(jv_copy(elem)) > MAX_PATH_DEPTH) { -+ jv_free(object); -+ jv_free(paths); -+ jv_free(elem); -+ return jv_invalid_with_msg(jv_string("Path too deep")); -+ } - jv_free(elem); - } - if (jv_array_length(jv_copy(paths)) == 0) { diff --git a/pkgs/by-name/jq/jq/CVE-2026-33948.patch b/pkgs/by-name/jq/jq/CVE-2026-33948.patch deleted file mode 100644 index 5b6497e1469d..000000000000 --- a/pkgs/by-name/jq/jq/CVE-2026-33948.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 6374ae0bcdfe33a18eb0ae6db28493b1f34a0a5b Mon Sep 17 00:00:00 2001 -From: itchyny -Date: Mon, 13 Apr 2026 08:46:11 +0900 -Subject: [PATCH] Fix NUL truncation in the JSON parser - -This fixes CVE-2026-33948. ---- - src/util.c | 8 +------- - tests/shtest | 6 ++++++ - 2 files changed, 7 insertions(+), 7 deletions(-) - -diff --git a/src/util.c b/src/util.c -index fdfdb96d88..80d65fc808 100644 ---- a/src/util.c -+++ b/src/util.c -@@ -312,13 +312,7 @@ static int jq_util_input_read_more(jq_util_input_state *state) { - if (p != NULL) - state->current_line++; - -- if (p == NULL && state->parser != NULL) { -- /* -- * There should be no NULs in JSON texts (but JSON text -- * sequences are another story). -- */ -- state->buf_valid_len = strlen(state->buf); -- } else if (p == NULL && feof(state->current_input)) { -+ if (p == NULL && feof(state->current_input)) { - size_t i; - - /* -diff --git a/tests/shtest b/tests/shtest -index cb88745277..370f7b7c69 100755 ---- a/tests/shtest -+++ b/tests/shtest -@@ -880,4 +880,10 @@ $JQ -nf $d/prog.jq 2> $d/out && { - } - diff $d/out $d/expected - -+# CVE-2026-33948: No NUL truncation in the JSON parser -+if printf '{}\x00{}' | $JQ >/dev/null 2> /dev/null; then -+ printf 'Error expected but jq exited successfully\n' 1>&2 -+ exit 1 -+fi -+ - exit 0 diff --git a/pkgs/by-name/jq/jq/CVE-2026-39979.patch b/pkgs/by-name/jq/jq/CVE-2026-39979.patch deleted file mode 100644 index cc0c3d17f77f..000000000000 --- a/pkgs/by-name/jq/jq/CVE-2026-39979.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 2f09060afab23fe9390cce7cb860b10416e1bf5f Mon Sep 17 00:00:00 2001 -From: itchyny -Date: Mon, 13 Apr 2026 11:04:52 +0900 -Subject: [PATCH] Fix out-of-bounds read in jv_parse_sized() - -This fixes CVE-2026-39979. - -Co-authored-by: Mattias Wadman ---- - src/jv_parse.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/src/jv_parse.c b/src/jv_parse.c -index aa2054cc09..56847b5eaa 100644 ---- a/src/jv_parse.c -+++ b/src/jv_parse.c -@@ -893,8 +893,9 @@ jv jv_parse_sized_custom_flags(const char* string, int length, int flags) { - - if (!jv_is_valid(value) && jv_invalid_has_msg(jv_copy(value))) { - jv msg = jv_invalid_get_msg(value); -- value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%s')", -+ value = jv_invalid_with_msg(jv_string_fmt("%s (while parsing '%.*s')", - jv_string_value(msg), -+ length, - string)); - jv_free(msg); - } diff --git a/pkgs/by-name/jq/jq/CVE-2026-40164.patch b/pkgs/by-name/jq/jq/CVE-2026-40164.patch deleted file mode 100644 index 483316f64b4b..000000000000 --- a/pkgs/by-name/jq/jq/CVE-2026-40164.patch +++ /dev/null @@ -1,87 +0,0 @@ -From 0c7d133c3c7e37c00b6d46b658a02244fdd3c784 Mon Sep 17 00:00:00 2001 -From: itchyny -Date: Mon, 13 Apr 2026 08:53:26 +0900 -Subject: [PATCH] Randomize hash seed to mitigate hash collision DoS attacks - -The hash function used a fixed seed, allowing attackers to craft colliding keys -and cause O(n^2) object parsing performance. Initialize the seed from a random -source at process startup to prevent the attack. This fixes CVE-2026-40164. - -Co-authored-by: Asaf Meizner ---- - configure.ac | 2 ++ - src/jv.c | 34 ++++++++++++++++++++++++++++++++-- - 2 files changed, 34 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 5dac42655a..f7067a4341 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -149,6 +149,8 @@ AC_CHECK_MEMBER([struct tm.tm_gmtoff], [AC_DEFINE([HAVE_TM_TM_GMT_OFF],1,[Define - AC_CHECK_MEMBER([struct tm.__tm_gmtoff], [AC_DEFINE([HAVE_TM___TM_GMT_OFF],1,[Define to 1 if the system has the __tm_gmt_off field in struct tm])], - [], [[#include ]]) - AC_FIND_FUNC([setlocale], [c], [#include ], [0,0]) -+AC_FIND_FUNC([arc4random], [c], [#include ], []) -+AC_FIND_FUNC([getentropy], [c], [#include ], [0, 0]) - - dnl Figure out if we have the pthread functions we actually need - AC_FIND_FUNC_NO_LIBS([pthread_key_create], [], [#include ], [NULL, NULL]) -diff --git a/src/jv.c b/src/jv.c -index 2a62b48419..607ac174f7 100644 ---- a/src/jv.c -+++ b/src/jv.c -@@ -40,6 +40,10 @@ - #include - #include - #include -+#include -+#include -+#include -+#include - - #include "jv_alloc.h" - #include "jv.h" -@@ -1206,7 +1210,33 @@ static jv jvp_string_append(jv string, const char* data, uint32_t len) { - } - } - --static const uint32_t HASH_SEED = 0x432A9843; -+static uint32_t hash_seed; -+static pthread_once_t hash_seed_once = PTHREAD_ONCE_INIT; -+ -+static void jvp_hash_seed_init(void) { -+ uint32_t seed; -+#if defined(HAVE_ARC4RANDOM) -+ seed = arc4random(); -+#elif defined(HAVE_GETENTROPY) -+ if (getentropy(&seed, sizeof(seed)) != 0) -+ seed = (uint32_t)getpid() ^ (uint32_t)time(NULL); -+#else -+ int fd = open("/dev/urandom", O_RDONLY); -+ if (fd >= 0) { -+ if (read(fd, &seed, sizeof(seed)) != 4) -+ seed = (uint32_t)getpid() ^ (uint32_t)time(NULL); -+ close(fd); -+ } else { -+ seed = (uint32_t)getpid() ^ (uint32_t)time(NULL); -+ } -+#endif -+ hash_seed = seed; -+} -+ -+static uint32_t jvp_hash_seed(void) { -+ pthread_once(&hash_seed_once, jvp_hash_seed_init); -+ return hash_seed; -+} - - static uint32_t rotl32 (uint32_t x, int8_t r){ - return (x << r) | (x >> (32 - r)); -@@ -1225,7 +1255,7 @@ static uint32_t jvp_string_hash(jv jstr) { - int len = (int)jvp_string_length(str); - const int nblocks = len / 4; - -- uint32_t h1 = HASH_SEED; -+ uint32_t h1 = jvp_hash_seed(); - - const uint32_t c1 = 0xcc9e2d51; - const uint32_t c2 = 0x1b873593; diff --git a/pkgs/by-name/jq/jq/musl.patch b/pkgs/by-name/jq/jq/musl.patch deleted file mode 100644 index 3632899882e7..000000000000 --- a/pkgs/by-name/jq/jq/musl.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 63e9449a8142ce30c83fcd7e9396e5de9843774e Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Thu, 3 Jul 2025 11:00:13 +0200 -Subject: [PATCH] jq.test: drop non-portable %F test - -%F is a non-portable GNU extension, not supported by all strptime -implementations (for example musl's). - -Link: https://github.com/jqlang/jq/pull/3365 ---- - tests/jq.test | 4 ---- - 1 file changed, 4 deletions(-) - -diff --git a/tests/jq.test b/tests/jq.test -index 4ecf72f..6bfb6f8 100644 ---- a/tests/jq.test -+++ b/tests/jq.test -@@ -1848,10 +1848,6 @@ try ["OK", strflocaltime({})] catch ["KO", .] - "2015-03-05T23:51:47Z" - [[2015,2,5,23,51,47,4,63],1425599507] - --[strptime("%FT%T")|(.,mktime)] --"2025-06-07T08:09:10" --[[2025,5,7,8,9,10,6,157],1749283750] -- - # Check day-of-week and day of year computations - # (should trip an assert if this fails) - last(range(365 * 67)|("1970-03-01T01:02:03Z"|strptime("%Y-%m-%dT%H:%M:%SZ")|mktime) + (86400 * .)|strftime("%Y-%m-%dT%H:%M:%SZ")|strptime("%Y-%m-%dT%H:%M:%SZ")) --- -2.49.0 - diff --git a/pkgs/by-name/jq/jq/package.nix b/pkgs/by-name/jq/jq/package.nix index 70b6bb169fce..edf9b16ec356 100644 --- a/pkgs/by-name/jq/jq/package.nix +++ b/pkgs/by-name/jq/jq/package.nix @@ -14,12 +14,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "jq"; - version = "1.8.1"; + version = "1.8.2"; # Note: do not use fetchpatch or fetchFromGitHub to keep this package available in __bootPackages src = fetchurl { url = "https://github.com/jqlang/jq/releases/download/jq-${finalAttrs.version}/jq-${finalAttrs.version}.tar.gz"; - hash = "sha256-K+ZOcSnOyxHVkGKQ66EK9pT7nj5/n8IIoxHcM8qDfrA="; + hash = "sha256-cbjW6PX+gfbG0NEQ44kiUfbOdu0JWr0xXibm4Rk6868="; }; outputs = [ @@ -30,15 +30,7 @@ stdenv.mkDerivation (finalAttrs: { "out" ]; - patches = [ - ./musl.patch - ./CVE-2026-32316.patch - ./CVE-2026-33947.patch - ./CVE-2026-33948.patch - ./CVE-2026-39979.patch - ./CVE-2026-40164.patch - ] - ++ lib.optionals stdenv.hostPlatform.is32bit [ + patches = lib.optionals stdenv.hostPlatform.is32bit [ # needed because epoch conversion test here is right at the end of 32 bit integer space # See also: https://github.com/jqlang/jq/blob/859a8073ee8a21f2133154eea7c2bd5e0d60837f/tests/optional.test#L15-L18 # "-D_TIME_BITS=64 -D_FILE_OFFSET_BITS=64" would be preferrable, but breaks with dynamic linking, diff --git a/pkgs/by-name/jr/jreleaser-cli/package.nix b/pkgs/by-name/jr/jreleaser-cli/package.nix index 320f8d08fc5c..952d2e2649cc 100644 --- a/pkgs/by-name/jr/jreleaser-cli/package.nix +++ b/pkgs/by-name/jr/jreleaser-cli/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation rec { pname = "jreleaser-cli"; - version = "1.24.0"; + version = "1.25.0"; src = fetchurl { url = "https://github.com/jreleaser/jreleaser/releases/download/v${version}/jreleaser-tool-provider-${version}.jar"; - hash = "sha256-WA2lH4SCjNDqkUE5OJe2hF7/HaEIyB+dynHT4yDqzMc="; + hash = "sha256-ixcHrzCX+b1iEkmk2rWZidFBtT2Ar58pRSGLzwaDYSM="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/jr/jrl-cmakemodules/package.nix b/pkgs/by-name/jr/jrl-cmakemodules/package.nix index 2f6eea9b5bc8..43bbda66f170 100644 --- a/pkgs/by-name/jr/jrl-cmakemodules/package.nix +++ b/pkgs/by-name/jr/jrl-cmakemodules/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jrl-cmakemodules"; - version = "1.1.2"; + version = "2.1.0"; src = fetchFromGitHub { owner = "jrl-umi3218"; repo = "jrl-cmakemodules"; tag = "v${finalAttrs.version}"; - hash = "sha256-TUewcxvBGYF3WpqkiWvZzmbyXyaM+UqzHLVsaUJdC0w="; + hash = "sha256-S9MRMV+xv70tIMFRpj7SQjHiBvMHZvDmG5eeuyzO5zQ="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/jr/jrsonnet/package.nix b/pkgs/by-name/jr/jrsonnet/package.nix index 61efa5875744..643edd5613b0 100644 --- a/pkgs/by-name/jr/jrsonnet/package.nix +++ b/pkgs/by-name/jr/jrsonnet/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "0.5.0-pre98"; src = fetchFromGitHub { - owner = "CertainLach"; + owner = "deltarocks"; repo = "jrsonnet"; tag = "v${finalAttrs.version}"; hash = "sha256-2dNzxZnvnw8TsKnnIlHGpuixrqe4z0a4faOBPv2N+ws="; @@ -35,7 +35,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Purely-functional configuration language that helps you define JSON data"; - homepage = "https://github.com/CertainLach/jrsonnet"; + homepage = "https://github.com/deltarocks/jrsonnet"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ lach diff --git a/pkgs/by-name/js/jsign/package.nix b/pkgs/by-name/js/jsign/package.nix index 2106244bd447..f12100177111 100644 --- a/pkgs/by-name/js/jsign/package.nix +++ b/pkgs/by-name/js/jsign/package.nix @@ -18,16 +18,16 @@ maven.buildMavenPackage rec { pname = "jsign"; # For build from non-release, increment version by one and add -SNAPSHOT # e.g. 7.3-SNAPSHOT - version = "7.3"; + version = "7.5"; src = fetchFromGitHub { owner = "ebourg"; repo = "jsign"; tag = version; - hash = "sha256-FlVTKM1swdNP3kht8MELgUAHPv+FBpwt23WNl/moGjI="; + hash = "sha256-Eg23jy5K4F8pL0qqt7Ut/9NOXR9UfnQD7S7qtX9vAjk="; }; - mvnHash = "sha256-N91gwM3vsDZQM/BptF5RgRQ/A8g56NOJ6bc2SkxLnBs="; + mvnHash = "sha256-zxlwb2id8yAw/yxTjD6jyAkPJx9IazrPQYGacQGLEK8="; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/js/json-tui/package.nix b/pkgs/by-name/js/json-tui/package.nix index 852dba711ead..6dcac51bbb47 100644 --- a/pkgs/by-name/js/json-tui/package.nix +++ b/pkgs/by-name/js/json-tui/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-Wno-dev" # suppress cmake warning about deprecated usage - (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "JSON_TUI_BUILD_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeFeature "FETCHCONTENT_SOURCE_DIR_GOOGLETEST" "${gtest.src}") ]; diff --git a/pkgs/by-name/js/jsoncons/package.nix b/pkgs/by-name/js/jsoncons/package.nix index 0d18c7e9b28a..73bf78ad92a6 100644 --- a/pkgs/by-name/js/jsoncons/package.nix +++ b/pkgs/by-name/js/jsoncons/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncons"; - version = "1.8.0"; + version = "1.8.1"; src = fetchFromGitHub { owner = "danielaparker"; repo = "jsoncons"; tag = "v${finalAttrs.version}"; - hash = "sha256-QSTT/wpc9EaQOF8aItqqtVQl2TjQA2iiw4vYmSjK7Tk="; + hash = "sha256-+5vglrmmJ6jb33Mlp+VnIMG2yHqzKFHPQUqTBezDNCw="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/js/jsoncpp/package.nix b/pkgs/by-name/js/jsoncpp/package.nix index dc3d94b78260..25d1bcdf8fe0 100644 --- a/pkgs/by-name/js/jsoncpp/package.nix +++ b/pkgs/by-name/js/jsoncpp/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "jsoncpp"; - version = "1.9.7"; + version = "1.9.8"; strictDeps = true; __structuredAttrs = true; @@ -24,8 +24,8 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "open-source-parsers"; repo = "jsoncpp"; - rev = finalAttrs.version; - sha256 = "sha256-rf8d2UNTVEZhuiyChK2XnUbfGDvsfXnKADhaSp8qBwQ="; + tag = finalAttrs.version; + hash = "sha256-5cH9G4/TVCM5HX6QSk3P4m5+cwuK4x8hP9FohBcmjik="; }; /* @@ -60,9 +60,10 @@ stdenv.mkDerivation (finalAttrs: { ) "-DJSONCPP_WITH_TESTS=OFF"; meta = { + changelog = "https://github.com/open-source-parsers/jsoncpp/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "C++ library for interacting with JSON"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ hythera ]; license = lib.licenses.mit; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/js/jsonschema-cli/package.nix b/pkgs/by-name/js/jsonschema-cli/package.nix index e1444c0b72c1..00151b83fb15 100644 --- a/pkgs/by-name/js/jsonschema-cli/package.nix +++ b/pkgs/by-name/js/jsonschema-cli/package.nix @@ -9,15 +9,15 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "jsonschema-cli"; - version = "0.46.5"; + version = "0.48.0"; src = fetchCrate { pname = "jsonschema-cli"; inherit (finalAttrs) version; - hash = "sha256-/0ADUfUoGB6i8L8FahjwafsjxXsRx0B0SnZH1FhUGxs="; + hash = "sha256-nQblUoTzrheAQA6wlT/p/x72eATD3gUUjgBneMu6L2E="; }; - cargoHash = "sha256-+V42oG6PYSmWKG6Dv2zllTxObeQqCABBcUOAvuLqAZ4="; + cargoHash = "sha256-rm5v5S11mJRoyhUnSFXLKu/znKClnI6hOQY7qDpyb/U="; preCheck = '' export SSL_CERT_FILE=${cacert}/etc/ssl/certs/ca-bundle.crt diff --git a/pkgs/by-name/js/jsubfinder/package.nix b/pkgs/by-name/js/jsubfinder/package.nix index 18df77c69466..5c603ce47b41 100644 --- a/pkgs/by-name/js/jsubfinder/package.nix +++ b/pkgs/by-name/js/jsubfinder/package.nix @@ -9,7 +9,7 @@ buildGoModule { version = "0-unstable-2022-05-31"; src = fetchFromGitHub { - owner = "ThreatUnkown"; + owner = "ThreatUnknown"; repo = "jsubfinder"; rev = "e21de1ebc174bb69485f1c224e8063c77d87e4ad"; hash = "sha256-QjRYJyk0uFGa6FCCYK9SIJhoyam4ALsQJ26DsmbNk8s="; @@ -20,7 +20,7 @@ buildGoModule { meta = { description = "Tool to search for in Javascript hidden subdomains and secrets"; mainProgram = "jsubfinder"; - homepage = "https://github.com/ThreatUnkown/jsubfinder"; + homepage = "https://github.com/ThreatUnknown/jsubfinder"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; diff --git a/pkgs/by-name/jt/jtdx/package.nix b/pkgs/by-name/jt/jtdx/package.nix index 018ed5d53c05..7204d9669390 100644 --- a/pkgs/by-name/jt/jtdx/package.nix +++ b/pkgs/by-name/jt/jtdx/package.nix @@ -21,5 +21,7 @@ wsjtx.overrideAttrs (old: { pkharvey ]; homepage = "https://github.com/jtdx-project/jtdx"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ju/jugglinglab/package.nix b/pkgs/by-name/ju/jugglinglab/package.nix index b27ef7717856..1841aefd1dcb 100644 --- a/pkgs/by-name/ju/jugglinglab/package.nix +++ b/pkgs/by-name/ju/jugglinglab/package.nix @@ -13,7 +13,6 @@ let { "x86_64-linux" = "linux-x86-64"; "aarch64-linux" = "linux-aarch64"; - "x86_64-darwin" = "darwin-x86-64"; "aarch64-darwin" = "darwin-aarch64"; } .${stdenv.system} or null; diff --git a/pkgs/by-name/ju/jujutsu/package.nix b/pkgs/by-name/ju/jujutsu/package.nix index 83a1d28b59e5..c8da060e028f 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.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "jj-vcs"; repo = "jj"; tag = "v${finalAttrs.version}"; - hash = "sha256-wAefhpNP4ErCTTjZADpvTDk2of/XKP/MoXl6fpG7/fA="; + hash = "sha256-XgBq2ZN34iWlwKVgW7Syr46KUdt7pJuSDd/J6QWJwwQ="; }; - cargoHash = "sha256-b7/5vkO6GNX8qzJr4NcxtLZVLDc6NOMrOU4dE6LOFoE="; + cargoHash = "sha256-bEvpTd+FAHrD+CZN7+AuCuThyJ5LtufQR7OrGpjrWK0="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ju/julec/package.nix b/pkgs/by-name/ju/julec/package.nix index bad43ba7d257..1204eb46cc68 100644 --- a/pkgs/by-name/ju/julec/package.nix +++ b/pkgs/by-name/ju/julec/package.nix @@ -116,7 +116,6 @@ clangStdenv.mkDerivation (finalAttrs: { "x86_64-linux" "aarch64-linux" "i686-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "julec"; diff --git a/pkgs/by-name/ju/julia-mono/package.nix b/pkgs/by-name/ju/julia-mono/package.nix index 4a1757da4311..607b56df83ec 100644 --- a/pkgs/by-name/ju/julia-mono/package.nix +++ b/pkgs/by-name/ju/julia-mono/package.nix @@ -7,12 +7,12 @@ stdenvNoCC.mkDerivation rec { pname = "JuliaMono-ttf"; - version = "0.062"; + version = "0.63"; src = fetchzip { url = "https://github.com/cormullion/juliamono/releases/download/v${version}/JuliaMono-ttf.tar.gz"; stripRoot = false; - hash = "sha256-f9hjo3B4q2WBl0j86fHny8bYUqldYSC0pP4uoWOI8Zk="; + hash = "sha256-e1tQPtSnDeFhODCT+qtJd3IuGzUHW9VMZP85Nff9SSk="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/ju/juno-theme/package.nix b/pkgs/by-name/ju/juno-theme/package.nix index b78d310c72b0..026ca9816fc3 100644 --- a/pkgs/by-name/ju/juno-theme/package.nix +++ b/pkgs/by-name/ju/juno-theme/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - gtk-engine-murrine, }: stdenv.mkDerivation (finalAttrs: { @@ -30,8 +29,6 @@ stdenv.mkDerivation (finalAttrs: { sourceRoot = "."; - propagatedUserEnvPkgs = [ gtk-engine-murrine ]; - installPhase = '' runHook preInstall mkdir -p $out/share/themes diff --git a/pkgs/by-name/ju/jupyterlite/package.nix b/pkgs/by-name/ju/jupyterlite/package.nix new file mode 100644 index 000000000000..90b7d2982089 --- /dev/null +++ b/pkgs/by-name/ju/jupyterlite/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.jupyterlite-core diff --git a/pkgs/by-name/ju/just-lsp/package.nix b/pkgs/by-name/ju/just-lsp/package.nix index 0d928cc1c41e..ec91f87c1400 100644 --- a/pkgs/by-name/ju/just-lsp/package.nix +++ b/pkgs/by-name/ju/just-lsp/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "just-lsp"; - version = "0.4.5"; + version = "0.4.8"; __structuredAttrs = true; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "terror"; repo = "just-lsp"; tag = finalAttrs.version; - hash = "sha256-Ly+9JXZNCQ3uFt2r6Cte88Hzr6VxpKFHYx29SdngfuE="; + hash = "sha256-fSr3Nv7KsVMntGpL/uThdY4atCFqbSAS3XsNbdwoCvs="; }; - cargoHash = "sha256-nsTC4ks81F0E8OqOaRXYlzi/RTg+ywpiCsTwKFGwCt0="; + cargoHash = "sha256-z0Gyh44/9nAz505k4B7sZN8BO3kyUutnfivj3QaTi3c="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 045f45d4e8d2..0a2aa7e81fc1 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -17,7 +17,7 @@ withDocumentation ? stdenv.buildPlatform.canExecute stdenv.hostPlatform, }: let - version = "1.51.0"; + version = "1.57.0"; in rustPlatform.buildRustPackage { inherit version; @@ -36,10 +36,10 @@ rustPlatform.buildRustPackage { owner = "casey"; repo = "just"; tag = version; - hash = "sha256-urD9R/qn7rwtzaVP65angk7z4bwxlP3w5G5Aa5tVmuw="; + hash = "sha256-fFeWGX72YcTKzPqfRYloTtnW4r7uXHUipyYP9VV8LZE="; }; - cargoHash = "sha256-war9yybsyfsm/wNlY+/fiN8pxxQwNLMogqe5u+jHNaw="; + cargoHash = "sha256-hdfOs9UDjdrk8XclCxTdQgSOpt+yYQoPD5lWZrdNs2Q="; nativeBuildInputs = lib.optionals (installShellCompletions || installManPages) [ installShellFiles ] @@ -114,9 +114,10 @@ rustPlatform.buildRustPackage { description = "Handy way to save and run project-specific commands"; license = lib.licenses.cc0; maintainers = with lib.maintainers; [ - xrelkd jk ryan4yin + xrelkd + yvnth ]; mainProgram = "just"; }; diff --git a/pkgs/by-name/jw/jwtcat/package.nix b/pkgs/by-name/jw/jwtcat/package.nix new file mode 100644 index 000000000000..33bacfa9b013 --- /dev/null +++ b/pkgs/by-name/jw/jwtcat/package.nix @@ -0,0 +1,44 @@ +{ + lib, + python3Packages, + fetchFromGitHub, +}: + +python3Packages.buildPythonApplication { + pname = "jwtcat"; + version = "0-unstable-2022-10-15"; + pyproject = false; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "aress31"; + repo = "jwtcat"; + rev = "f80f3d9352b82f0e7da504b2ee11f4a61f23c385"; + hash = "sha256-pk0/Lzw4yUIXfLBX/0Xwaecio42MjLYUzECQ8xaH3vY="; + }; + + dependencies = with python3Packages; [ + pyjwt + coloredlogs + tqdm + ]; + + installPhase = '' + runHook preInstall + + install -Dm755 jwtcat.py $out/bin/jwtcat + + runHook postInstall + ''; + + doCheck = false; + + meta = { + description = "CPU-based JSON Web Token cracker and scanner"; + homepage = "https://github.com/aress31/jwtcat"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ _0x2B ]; + mainProgram = "jwtcat"; + }; +} diff --git a/pkgs/by-name/jw/jwx/package.nix b/pkgs/by-name/jw/jwx/package.nix index 6ce0302271fa..e43423d5ab58 100644 --- a/pkgs/by-name/jw/jwx/package.nix +++ b/pkgs/by-name/jw/jwx/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "jwx"; - version = "4.0.2"; + version = "4.1.0"; src = fetchFromGitHub { owner = "lestrrat-go"; repo = "jwx"; tag = "v${finalAttrs.version}"; - hash = "sha256-CGBQF//smVUt1/SQkxvZJ+7zlAhAuxVtO3WWWHCSvII="; + hash = "sha256-+u2PR1L66cua6iGer9qYlnPpfYt1j9cZ0PSrWntpYp0="; }; - vendorHash = "sha256-g+kawcxLJdR77kkR6pJoRKe48kV+/kS33gYjOY30pAc="; + vendorHash = "sha256-dxC00wr51c48yxdCUWsL44RMmk+pBmqXkUQqjP90GNU="; sourceRoot = "${finalAttrs.src.name}/cmd/jwx"; diff --git a/pkgs/by-name/jx/jx/package.nix b/pkgs/by-name/jx/jx/package.nix index 2a813627aeff..69af58260a74 100644 --- a/pkgs/by-name/jx/jx/package.nix +++ b/pkgs/by-name/jx/jx/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "jx"; - version = "3.17.6"; + version = "3.17.17"; src = fetchFromGitHub { owner = "jenkins-x"; repo = "jx"; rev = "v${version}"; - sha256 = "sha256-s6+Tl3nMESOrp8nzmffkqV1ES9i+mZxd604VTi38GZo="; + sha256 = "sha256-Fu8qBiRWLZBK2Qn+fVPi7TVeqK+/ZD5a/c5yvPnypWo="; }; - vendorHash = "sha256-1ErjD+1MdbKN4EPaQX0jxNzoN9dB8beH1csdx1IPKl8="; + vendorHash = "sha256-tGvreLuxaRswjCGzroCRRDZR4QadQKLrX9Hz3u22VZ0="; subPackages = [ "cmd" ]; diff --git a/pkgs/by-name/k0/k0sctl/package.nix b/pkgs/by-name/k0/k0sctl/package.nix index 969ec2c1fc7f..362098ed7d74 100644 --- a/pkgs/by-name/k0/k0sctl/package.nix +++ b/pkgs/by-name/k0/k0sctl/package.nix @@ -9,16 +9,16 @@ buildGoModule rec { pname = "k0sctl"; - version = "0.30.1"; + version = "0.31.1"; src = fetchFromGitHub { owner = "k0sproject"; repo = "k0sctl"; tag = "v${version}"; - hash = "sha256-QmXoap/irR0SoN6abkXVgKThl3jMMmWSwKaAER2bgZI="; + hash = "sha256-AbSHyc+Orclm2Cun9QTBqC5AxN1+QOveNzBqzX62vBA="; }; - vendorHash = "sha256-KPhOpeFtwYF9kJjl09351DSoDhxpWIxZxyXrAyJwlNo="; + vendorHash = "sha256-zc/6fC6VQJp7g2URWivaGW0APVHMa+uyHlBPM4b0bf8="; ldflags = [ "-s" diff --git a/pkgs/by-name/k8/k8sgpt/package.nix b/pkgs/by-name/k8/k8sgpt/package.nix index de88e4ab38c4..2385803572eb 100644 --- a/pkgs/by-name/k8/k8sgpt/package.nix +++ b/pkgs/by-name/k8/k8sgpt/package.nix @@ -8,7 +8,7 @@ buildGoModule (finalAttrs: { pname = "k8sgpt"; - version = "0.4.33"; + version = "0.4.36"; nativeBuildInputs = [ installShellFiles @@ -18,10 +18,10 @@ buildGoModule (finalAttrs: { owner = "k8sgpt-ai"; repo = "k8sgpt"; rev = "v${finalAttrs.version}"; - hash = "sha256-nr/Cl416ENwrbVGYaAxuOQsYkRWpx/CCM2gIZ2z/I9c="; + hash = "sha256-J8imL+Rkp7/0xMppjMSXFdLTH3CwLvS1+Tbt6CWI6SQ="; }; - vendorHash = "sha256-7Kvj1BaiR4wrGjzR54f+Qe+PdOrLjD2noaRPaX/Yuos="; + vendorHash = "sha256-XLlBDFbvjr+Bun9V36MYwknz7SPw39ovd0b9gCht7L8="; # https://nixos.org/manual/nixpkgs/stable/#var-go-CGO_ENABLED env.CGO_ENABLED = 0; 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 bd5090c83370..cd7e05c817dd 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 (finalAttrs: { pname = "kak-tree-sitter-unwrapped"; - version = "3.2.1"; + version = "3.2.2"; src = fetchFromSourcehut { owner = "~hadronized"; repo = "kak-tree-sitter"; rev = "kak-tree-sitter-v${finalAttrs.version}"; - hash = "sha256-w+taJzr9tPLXdpV5RLTedVGR48Qodq/4M5IhlKAM/lU="; + hash = "sha256-RzPfQstjHdfLH6cF6KuMXB/J7UeR9DeJRypnGdb89TQ="; }; - cargoHash = "sha256-ztVBBeLU1AByDz3yVDMZ102bDG6JfL/6IoJlcqRmCmU="; + cargoHash = "sha256-5hCBFQsZpUyPlgO/iUmBXmdcC5ceG1w4IiB27oBxRxQ="; passthru = { updateScript = nix-update-script { }; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://git.sr.ht/~hadronized/kak-tree-sitter"; description = "Server that interfaces tree-sitter with kakoune"; mainProgram = "kak-tree-sitter"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ lelgenio ]; }; }) diff --git a/pkgs/by-name/ka/kakoune-lsp/package.nix b/pkgs/by-name/ka/kakoune-lsp/package.nix index 675875ff419c..fdbc98d8f3ac 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 (finalAttrs: { pname = "kakoune-lsp"; - version = "20.0.0"; + version = "21.0.2"; src = fetchFromGitHub { owner = "kakoune-lsp"; repo = "kakoune-lsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-1O0Seyz+Wzt2aJh5Os5D/7UI4LVizvY195aXJSMpeyw="; + hash = "sha256-nY/DOXE7youb/xpUU7T0t23vSMrGqlEa6qs5tclDE88="; }; patches = [ (replaceVars ./Hardcode-perl.patch { inherit perl; }) ]; - cargoHash = "sha256-wmoF0pwuXN83xy4R7wC1+YBBNdseFCg8xSqkBR/Axro="; + cargoHash = "sha256-1ktWlguBYURqIEotG9D4953bJm0TMM7+BzufFqXUibk="; meta = { description = "Kakoune Language Server Protocol Client"; diff --git a/pkgs/by-name/ka/kalamine/package.nix b/pkgs/by-name/ka/kalamine/package.nix index fe95c6b5022e..5963e2cd1375 100644 --- a/pkgs/by-name/ka/kalamine/package.nix +++ b/pkgs/by-name/ka/kalamine/package.nix @@ -1,26 +1,30 @@ { lib, - python3, + python3Packages, fetchFromGitHub, + versionCheckHook, + writableTmpDirAsHomeHook, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "kalamine"; version = "0.40"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "OneDeadKey"; repo = "kalamine"; - rev = "v${finalAttrs.version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-9R8N5p+VNuiqTl3a0SSmJEVg3Ol76nROf43GsdOdJL8="; }; - nativeBuildInputs = [ - python3.pkgs.hatchling + build-system = [ + python3Packages.hatchling ]; - propagatedBuildInputs = with python3.pkgs; [ + dependencies = with python3Packages; [ click livereload lxml @@ -31,11 +35,24 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "kalamine" ]; + # https://github.com/OneDeadKey/kalamine/blob/a9724bf6e93a34c740f9349b8811b2e51cc62c41/Makefile#L39 + preCheck = '' + python -m kalamine.cli build layouts/*.toml + ''; + + nativeCheckInputs = [ + python3Packages.pytestCheckHook + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckProgramArg = "version"; + versionCheckKeepEnvironment = [ "HOME" ]; + meta = { description = "Keyboard Layout Maker"; homepage = "https://github.com/OneDeadKey/kalamine/"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ xaltsc ]; mainProgram = "kalamine"; }; }) diff --git a/pkgs/by-name/ka/kanarenshu/package.nix b/pkgs/by-name/ka/kanarenshu/package.nix new file mode 100644 index 000000000000..e8e848d5f344 --- /dev/null +++ b/pkgs/by-name/ka/kanarenshu/package.nix @@ -0,0 +1,39 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "kanarenshu"; + version = "0.1.4"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "nuixyz"; + repo = "kanarenshu"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ROpZXGvleciJf+B3KVSIcsSES9+mtdLhcPFtGBpEmqY="; + }; + + vendorHash = "sha256-ES9+l6aDY8Y38yi4ufw2bpBPCW58L2oSlfXzh1TWGRE="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimal TUI application to practise Japanese from the terminal"; + homepage = "https://github.com/nuixyz/kanarenshu"; + changelog = "https://github.com/nuixyz/kanarenshu/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + platforms = lib.platforms.unix; + mainProgram = "kanarenshu"; + }; +}) diff --git a/pkgs/by-name/ka/kanata/package.nix b/pkgs/by-name/ka/kanata/package.nix index 2cc8f653c30a..ce66da16921d 100644 --- a/pkgs/by-name/ka/kanata/package.nix +++ b/pkgs/by-name/ka/kanata/package.nix @@ -16,16 +16,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "kanata"; - version = "1.11.0"; + version = "1.12.0"; src = fetchFromGitHub { owner = "jtroo"; repo = "kanata"; rev = "v${finalAttrs.version}"; - hash = "sha256-7rGV0nfI/ntvByz3NQs/2Sa2q/Ml8O3XRD14Mbt5fIU="; + hash = "sha256-WjdmjgEMoo3QNqT4yWxaKOkfuRLdNg4Im+V1Hy5vWgY="; }; - cargoHash = "sha256-Qxa90fMZ3c1+jlyxbIkC94DtSQSKFNr2V8GiLII6PNc="; + cargoHash = "sha256-4UBN4I35ZPPPL68LxxPna9Fs9sATCiwoTbWgHYwqOjs="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ (writeShellScriptBin "sw_vers" '' @@ -39,6 +39,11 @@ rustPlatform.buildRustPackage (finalAttrs: { install -Dm 444 assets/kanata-icon.svg $out/share/icons/hicolor/scalable/apps/kanata.svg ''; + checkFlags = [ + # these try to access /dev/uinput and won't work in the build sandbox + "--skip=kanata::tcp_layer_change_tests" + ]; + doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/ka/kanata/update.sh b/pkgs/by-name/ka/kanata/update.sh index b8aaab495676..d49363899ab9 100644 --- a/pkgs/by-name/ka/kanata/update.sh +++ b/pkgs/by-name/ka/kanata/update.sh @@ -3,7 +3,7 @@ nix-update importTree="(let tree = import ./.; in if builtins.isFunction tree then tree {} else tree)" NEW_VERSION=$(nix-instantiate --eval -E "with $importTree; kanata.version" | tr -d '"') karabinerDriverCrateVersion="$(curl -L "https://raw.githubusercontent.com/jtroo/kanata/refs/tags/v$NEW_VERSION/Cargo.lock" | tomlq | jq --raw-output '.package[] | select(.name | test("karabiner-driverkit")) |.version')" -newKarabinerDkVersion="$(curl -L "https://crates.io/api/v1/crates/karabiner-driverkit/$karabinerDriverCrateVersion/download" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)" +newKarabinerDkVersion="$(curl -L "https://static.crates.io/crates/karabiner-driverkit/karabiner-driverkit-$karabinerDriverCrateVersion.crate" | tar xzvf - --strip-components=1 -O "karabiner-driverkit-$karabinerDriverCrateVersion/c_src/Karabiner-DriverKit-VirtualHIDDevice/version.json" | jq --raw-output0 .package_version)" oldDarwinVersion=$(nix-instantiate --eval -E "with $importTree; kanata.passthru.darwinDriverVersion" | tr -d '"') nixFile=$(nix-instantiate --eval --strict -A "kanata.meta.position" | sed -re 's/^"(.*):[0-9]+"$/\1/') sed -i "$nixFile" -re "s|\"$oldDarwinVersion\"|\"$newKarabinerDkVersion\"|" diff --git a/pkgs/by-name/ka/kanban/package.nix b/pkgs/by-name/ka/kanban/package.nix index e1f27b49d744..d3e3b48c9e9b 100644 --- a/pkgs/by-name/ka/kanban/package.nix +++ b/pkgs/by-name/ka/kanban/package.nix @@ -7,18 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kanban"; - version = "0.6.0"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fulsomenko"; repo = "kanban"; tag = "v${finalAttrs.version}"; - hash = "sha256-6L+f4+A9mRZch7/D1koCMHrkciusKcoZhYJICEDU4b8="; + hash = "sha256-4wvSVnVck3AJ4pv6whxFiwsmoWl4f5Q0a2lSFeMGdZs="; }; env.GIT_COMMIT_HASH = finalAttrs.src.rev; - cargoHash = "sha256-NMFZW+LC5YYqbXCmgbmUyAx8O+M7o1TKigOC978k0/o="; + cargoHash = "sha256-Qmma0UkuuAhnD3zUUS5iCX2rUGvtO6U5zNFpg3Din7U="; passthru.updateScript = nix-update-script { }; @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { built with Rust. Features include file persistence, keyboard-driven navigation, multi-select capabilities, and sprint management. ''; - homepage = "https://kanban.yoon.se"; + homepage = "https://kanban.rs"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fulsomenko ]; mainProgram = "kanban"; diff --git a/pkgs/by-name/ka/kanboard/package.nix b/pkgs/by-name/ka/kanboard/package.nix index 2984ebb03d8a..b5b33964dc96 100644 --- a/pkgs/by-name/ka/kanboard/package.nix +++ b/pkgs/by-name/ka/kanboard/package.nix @@ -2,6 +2,7 @@ lib, stdenvNoCC, fetchFromGitHub, + fetchpatch, nixosTests, nix-update-script, php, @@ -18,6 +19,16 @@ stdenvNoCC.mkDerivation (finalAttrs: { hash = "sha256-iI9Dyno1s9P9t7IxfDs5gQUl9yFyu2taXvKY0WnF2Q0="; }; + # CVE-2026-56774 / NIXPKGS-2026-2001: scope remember-me session removal to + # the owning user so a session row can only be deleted by its owner. + # Remove this patch once upgraded past 1.2.52. + patches = [ + (fetchpatch { + url = "https://github.com/kanboard/kanboard/commit/928c68aa2b7c00092dd71084d329b912e229f3d1.patch"; + hash = "sha256-K616dTwAsLJAJMqY+DJjebfi6MV5wSICbd1iy6VynlM="; + }) + ]; + dontBuild = true; installPhase = '' diff --git a/pkgs/by-name/ka/kando/package.nix b/pkgs/by-name/ka/kando/package.nix index 86a4d4d372f8..f6f4b5789982 100644 --- a/pkgs/by-name/ka/kando/package.nix +++ b/pkgs/by-name/ka/kando/package.nix @@ -69,8 +69,8 @@ buildNpmPackage.override { inherit nodejs; } rec { ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; # use our own node headers since we skip downloading them NIX_CFLAGS_COMPILE = "-I${nodejs}/include/node"; - # disable code signing on Darwin - CSC_IDENTITY_AUTO_DISCOVERY = lib.optionalString stdenv.hostPlatform.isDarwin "false"; + # electron-forge's console output is squeezed into one narrow column if unset + CI = "1"; }; postConfigure = '' diff --git a/pkgs/by-name/ka/kaniko/package.nix b/pkgs/by-name/ka/kaniko/package.nix index d69cc0b7437c..bd6081171421 100644 --- a/pkgs/by-name/ka/kaniko/package.nix +++ b/pkgs/by-name/ka/kaniko/package.nix @@ -14,7 +14,7 @@ buildGoModule (finalAttrs: { version = "1.25.15"; src = fetchFromGitHub { - owner = "chainguard-dev"; + owner = "chainguard-forks"; repo = "kaniko"; rev = "v${finalAttrs.version}"; hash = "sha256-0d0QdNmR7FaybJJEq6bb9WshTg6dX3HtO9oESg1e4S4="; @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { meta = { description = "Tool to build container images from a Dockerfile, inside a container or Kubernetes cluster"; - homepage = "https://github.com/chainguard-dev/kaniko"; + homepage = "https://github.com/chainguard-forks/kaniko"; license = lib.licenses.asl20; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix index e33bac6c9e31..3f88eee860ec 100644 --- a/pkgs/by-name/ka/kanji-stroke-order-font/package.nix +++ b/pkgs/by-name/ka/kanji-stroke-order-font/package.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation { description = "Font containing stroke order diagrams for over 6500 kanji, 180 kana and other characters"; homepage = "https://www.kanji.uk/"; - license = [ lib.licenses.bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ptrhlm stephen-huan diff --git a/pkgs/by-name/ka/kapow/package.nix b/pkgs/by-name/ka/kapow/package.nix index 6e6405a9106a..9790db08bf28 100644 --- a/pkgs/by-name/ka/kapow/package.nix +++ b/pkgs/by-name/ka/kapow/package.nix @@ -1,34 +1,36 @@ { lib, stdenv, + cmake, fetchFromGitHub, - libsForQt5, + qt6, }: stdenv.mkDerivation (finalAttrs: { pname = "kapow"; - version = "1.5.10"; + version = "1.7.0"; src = fetchFromGitHub { owner = "gottcode"; repo = "kapow"; rev = "v${finalAttrs.version}"; - sha256 = "1fz9fb4w21ax8hjs6dwfn2410ig4lqvzdlijq0jcj3jbgxd4i1gw"; + hash = "sha256-IWkvAXDcWodrV23/wv3GEQXWdNcaIZDsU3LUtxsD+cA="; }; nativeBuildInputs = [ - libsForQt5.qmake - libsForQt5.qttools - libsForQt5.wrapQtAppsHook + cmake + qt6.qmake + qt6.qttools + qt6.wrapQtAppsHook ]; - buildInputs = [ libsForQt5.qtbase ]; + buildInputs = [ qt6.qtbase ]; meta = { description = "Punch clock to track time spent on projects"; mainProgram = "kapow"; homepage = "https://gottcode.org/kapow/"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; platforms = lib.platforms.linux; license = lib.licenses.gpl3Plus; }; diff --git a/pkgs/by-name/ka/karakeep/package.nix b/pkgs/by-name/ka/karakeep/package.nix index 31c3823c1ff2..55d4e20cbc2a 100644 --- a/pkgs/by-name/ka/karakeep/package.nix +++ b/pkgs/by-name/ka/karakeep/package.nix @@ -52,18 +52,13 @@ stdenv.mkDerivation (finalAttrs: { ]; pnpmDeps = fetchPnpmDeps { - inherit (finalAttrs) pname version; + inherit (finalAttrs) + pname + version + src + patches + ; pnpm = pnpm_9; - - # We need to pass the patched source code, so pnpm sees the patched version - src = stdenv.mkDerivation { - name = "${finalAttrs.pname}-patched-source"; - inherit (finalAttrs) src patches; - installPhase = '' - cp -pr --reflink=auto -- . $out - ''; - }; - fetcherVersion = 3; hash = "sha256-aT4JPx3iYw4kw8GHXKWMnelSVT0q2S3PK8DgSCQCyKQ="; }; diff --git a/pkgs/by-name/ka/karate/package.nix b/pkgs/by-name/ka/karate/package.nix index 405f869dc7c3..f1e87419b209 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.2"; + version = "2.1.1"; src = fetchurl { url = "https://github.com/karatelabs/karate/releases/download/v${version}/karate-${version}.jar"; - sha256 = "sha256-zPR0DGShVMTCRX1vD9GajzeQLCnTKqxOIwEuCoeGFL4="; + sha256 = "sha256-XrDmWpl1aforNvsnJU4V4TUUoCTU+7D8NTgTrJHjmOE="; }; dontUnpack = true; diff --git a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix index 906f428bd23d..cbbb2b23e080 100644 --- a/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix +++ b/pkgs/by-name/ka/kardolus-chatgpt-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule (finalAttrs: { # "chatgpt-cli" is taken by another package with the same upsteam name. # To keep "pname" and "package attribute name" identical, the owners name (kardolus) gets prefixed as identifier. pname = "kardolus-chatgpt-cli"; - version = "1.10.11"; + version = "1.10.12"; src = fetchFromGitHub { owner = "kardolus"; repo = "chatgpt-cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-XHrjjV7hMf6y9TA4Icj9AQ6Wa1Z5mxGXGlZ22BG18Ro="; + hash = "sha256-X+QfmoVY8J+D9WEQ6GS7ws5sFUh/2yfszyLkNCRy4gc="; }; vendorHash = null; # The tests of kardolus/chatgpt-cli require an OpenAI API Key to be present in the environment, - # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.11/test/contract/contract_test.go#L35) + # (e.g. https://github.com/kardolus/chatgpt-cli/blob/v1.10.12/test/contract/contract_test.go#L35) # which will not be the case in the pipeline. # Therefore, tests must be skipped. doCheck = false; diff --git a/pkgs/by-name/ka/kargo/package.nix b/pkgs/by-name/ka/kargo/package.nix index 1c842c896b04..297ae77b3411 100644 --- a/pkgs/by-name/ka/kargo/package.nix +++ b/pkgs/by-name/ka/kargo/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "kargo"; - version = "1.9.6"; + version = "1.10.9"; src = fetchFromGitHub { owner = "akuity"; repo = "kargo"; tag = "v${finalAttrs.version}"; - hash = "sha256-1r6XHtYbY107KwXHXv+AZd/y0TFa/LgU513bAhQPvPk="; + hash = "sha256-IQJJuw4ZGBJHo3bddVVYiw4NYLHFAlKGpvJwB/MjMX8="; }; - vendorHash = "sha256-ir73yLXLOs6/6YX72EeyMcGLsImRkGmH4vppwKeOD+A="; + vendorHash = "sha256-tucXuZhcCVplFAmRzWJtxbBQccxiVTAheTA55wHMkyw="; subPackages = [ "cmd/cli" ]; diff --git a/pkgs/by-name/ka/karmor/package.nix b/pkgs/by-name/ka/karmor/package.nix index 665fc0b8e669..ff29f6d90369 100644 --- a/pkgs/by-name/ka/karmor/package.nix +++ b/pkgs/by-name/ka/karmor/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "karmor"; - version = "1.4.6"; + version = "1.4.9"; src = fetchFromGitHub { owner = "kubearmor"; repo = "kubearmor-client"; rev = "v${finalAttrs.version}"; - hash = "sha256-xOI6meI88GB5w19T9eSn+8dTnhrUxUCKHUBk/1EaDVI="; + hash = "sha256-iTXUb66B6ONeP7oz+vg2Zkte9OjQYrPffh+zanLWTO0="; }; - vendorHash = "sha256-FL5WL44dsM0uPYXMNfYKRd37umId21rMGvj84rYTU3A="; + vendorHash = "sha256-LA2qKCWR5akyVmK0qzVS4rCX8WNPGXrqq1585xTDDrE="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ka/kas/package.nix b/pkgs/by-name/ka/kas/package.nix index 5481bd00740a..49fd9e9a81ff 100644 --- a/pkgs/by-name/ka/kas/package.nix +++ b/pkgs/by-name/ka/kas/package.nix @@ -8,14 +8,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "kas"; - version = "5.3"; + version = "5.4"; pyproject = true; src = fetchFromGitHub { owner = "siemens"; repo = "kas"; tag = finalAttrs.version; - hash = "sha256-XeAu8BNfcNmwDn25MA0uVmADjuYRkQxq+mG2XvRoJIE="; + hash = "sha256-wETe3VgG5ZEQjWXgcC/u42ZzzPIMqrBEcZmaDcK5yRY="; }; patches = [ ./pass-terminfo-env.patch ]; diff --git a/pkgs/by-name/ka/kassert/package.nix b/pkgs/by-name/ka/kassert/package.nix index dd796b047373..9ffdccde0198 100644 --- a/pkgs/by-name/ka/kassert/package.nix +++ b/pkgs/by-name/ka/kassert/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kamping-site.github.io/kassert/"; downloadPage = "https://github.com/kamping-site/kassert"; changelog = "https://github.com/kamping-site/kasser/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; }; diff --git a/pkgs/by-name/ka/kata-runtime/kata-images.nix b/pkgs/by-name/ka/kata-runtime/kata-images.nix index 8ed01e19354b..ed6da675716a 100644 --- a/pkgs/by-name/ka/kata-runtime/kata-images.nix +++ b/pkgs/by-name/ka/kata-runtime/kata-images.nix @@ -17,8 +17,8 @@ let imageHash = { - "x86_64-linux" = "sha256-sHPFf5DKsLjCiCG6PSjCEFcEtzESOxsVD162Ui/nCRc="; - "aarch64-linux" = "sha256-43P2MIMfE6+kB4/Ehe0NHmZhcd0/5Tnzj9vml5NxNWk="; + "x86_64-linux" = "sha256-ea4/6xjuoiqFebGF+NegGa4B+3Imf/4uULfQbJxqKtc="; + "aarch64-linux" = "sha256-cPx6uHXyMZ0x56dLUKx91FjhgkJaYW0nUtLrnfHz0as="; } ."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/ka/kata-runtime/package.nix b/pkgs/by-name/ka/kata-runtime/package.nix index d80fa2e383a3..dd35df110302 100644 --- a/pkgs/by-name/ka/kata-runtime/package.nix +++ b/pkgs/by-name/ka/kata-runtime/package.nix @@ -11,7 +11,7 @@ }: let - version = "3.29.0"; + version = "3.32.0"; kata-images = callPackage ./kata-images.nix { inherit version; }; @@ -34,14 +34,12 @@ buildGoModule rec { owner = "kata-containers"; repo = "kata-containers"; rev = version; - hash = "sha256-AjGqKJVrcfHLY0NosBWFOgKC3eiU9hsFXQsU+LM8XME="; + hash = "sha256-dnbzjYDKeAp0wFQcO5VK71vkf7ubVK5Lh9R9jjuro28="; }; sourceRoot = "${src.name}/src/runtime"; - vendorHash = null; - - dontConfigure = true; + vendorHash = "sha256-HAWobIcqwHL7jgawpOk1ZNx6vG8NApF5Nn60eZ9Fc1c="; makeFlags = [ "PREFIX=${placeholder "out"}" diff --git a/pkgs/by-name/ka/katago/package.nix b/pkgs/by-name/ka/katago/package.nix index 30b113517c8d..a4e3452116c1 100644 --- a/pkgs/by-name/ka/katago/package.nix +++ b/pkgs/by-name/ka/katago/package.nix @@ -78,7 +78,7 @@ stdenv'.mkDerivation rec { ++ lib.optionals (backend == "cuda") ( with cudaPackages; [ - cuda_cccl + cccl cuda_cudart cuda_nvcc cudnn diff --git a/pkgs/by-name/ka/katvan/package.nix b/pkgs/by-name/ka/katvan/package.nix new file mode 100644 index 000000000000..371d8880ca77 --- /dev/null +++ b/pkgs/by-name/ka/katvan/package.nix @@ -0,0 +1,99 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + # nativeBuildInputs + cmake, + pkg-config, + python3, + rustPlatform, + rustc, + cargo, + + # buildInputs + qt6, + libarchive, + corrosion, + hunspell, + + # checkInputs + gtest, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "katvan"; + version = "0.12.1"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "IgKh"; + repo = "katvan"; + tag = "v${finalAttrs.version}"; + hash = "sha256-WyPiRj/5So/1vjAytnXoldwYMG++tuLl0B0v31BeJxY="; + }; + + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) + pname + version + src + cargoRoot + ; + hash = "sha256-p5cMFCuDy17uMoy99R8l+e6iQcbNXSavFj0sBRRsMwo="; + }; + + # The CMakeLists files used by upstream issue a `cargo install` command to + # install a rust tool (cxxbridge-cmd) that is supposed to be included in the Cargo.toml's and + # `Cargo.lock` files of upstream. Setting CARGO_HOME like that helps `cargo + # install` find the dependencies we prefetched. See also: + # https://github.com/GothenburgBitFactory/taskwarrior/issues/3705 + postUnpack = '' + export CARGO_HOME=$PWD/.cargo + ''; + + cargoRoot = "typstdriver/rust"; + + nativeBuildInputs = [ + cmake + pkg-config + qt6.wrapQtAppsHook + qt6.qttools + rustPlatform.cargoSetupHook + rustc + cargo + (python3.withPackages (ps: [ + ps.mistletoe + ])) + ]; + + buildInputs = [ + qt6.qtbase + libarchive + corrosion + hunspell + ]; + + checkInputs = [ + gtest + ]; + + cmakeFlags = [ + # Don't set this to an absolute path, as it breaks upstream rpath settings + # for the final executable, see: https://github.com/IgKh/katvan/issues/46 + (lib.cmakeFeature "CMAKE_INSTALL_LIBDIR" "lib") + ]; + + doCheck = true; + + meta = { + description = "bare-bones editor for Typst files, with a bias for Right-to-Left editing"; + homepage = "https://github.com/IgKh/katvan"; + changelog = "https://github.com/IgKh/katvan/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ doronbehar ]; + mainProgram = "katvan"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ka/kazam/package.nix b/pkgs/by-name/ka/kazam/package.nix index fa1240ad5927..ab5de46ff6a2 100644 --- a/pkgs/by-name/ka/kazam/package.nix +++ b/pkgs/by-name/ka/kazam/package.nix @@ -56,7 +56,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pyxdg pycairo dbus-python - xlib + python-xlib ]; patches = [ diff --git a/pkgs/by-name/ka/kazumi/git-hashes.json b/pkgs/by-name/ka/kazumi/git-hashes.json index ca269ae4d04d..7d098ea2dbcd 100644 --- a/pkgs/by-name/ka/kazumi/git-hashes.json +++ b/pkgs/by-name/ka/kazumi/git-hashes.json @@ -2,14 +2,14 @@ "audio_service_mpris": "sha256-IVv1ioBpiK0VbnOFqnc9NbNn3Z+l9VN2clpCQjckBRo=", "audio_service_win": "sha256-OZq2waTr0WLJ6uki/VLdUBdDdui25PvXnMNFohs7gjs=", "desktop_webview_window": "sha256-KWON5aTPlVVrLidmnfpV+syWPYEngChOvkN7miIFjvE=", - "media_kit": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_android_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_ios_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_linux": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_macos_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_ohos": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_libs_windows_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", - "media_kit_video": "sha256-jbpGouOPjbZjF9gsNdNs6HMNqsNxIgb/UMG3NF7O+fw=", + "media_kit": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_android_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_ios_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_linux": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_macos_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_ohos": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_libs_windows_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", + "media_kit_video": "sha256-MZsIxwLrqMWOxa44vHlIf7TzYIJEzImRqpmyImoprPg=", "webview_windows": "sha256-afBTwbam9YA0xvIYMtiJe+CKi8GWit1HqDR3J72r2o0=" } diff --git a/pkgs/by-name/ka/kazumi/package.nix b/pkgs/by-name/ka/kazumi/package.nix index 222e4e390873..dd288a2724bd 100644 --- a/pkgs/by-name/ka/kazumi/package.nix +++ b/pkgs/by-name/ka/kazumi/package.nix @@ -18,13 +18,13 @@ }: let - version = "2.1.4"; + version = "2.2.0"; src = fetchFromGitHub { owner = "Predidit"; repo = "Kazumi"; tag = version; - hash = "sha256-rGziris2/4UiedviO+2L4cguC4DLGGCuGc1GK/Lyr3c="; + hash = "sha256-xAXhESIGk3St2TgqLtUl6je7DlS4j4vD338T5t99OAE="; }; in flutter.buildFlutterApplication { @@ -91,7 +91,6 @@ flutter.buildFlutterApplication { gst_all_1.gst-plugins-bad gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good - gst_all_1.gst-vaapi gst_all_1.gstreamer libayatana-appindicator mpv-unwrapped diff --git a/pkgs/by-name/ka/kazumi/pubspec.lock.json b/pkgs/by-name/ka/kazumi/pubspec.lock.json index 0b7aaff48812..ccd5c300e2fe 100644 --- a/pkgs/by-name/ka/kazumi/pubspec.lock.json +++ b/pkgs/by-name/ka/kazumi/pubspec.lock.json @@ -146,11 +146,11 @@ "dependency": "transitive", "description": { "name": "auto_injector", - "sha256": "1fc2624898e92485122eb2b1698dd42511d7ff6574f84a3a8606fc4549a1e8f8", + "sha256": "81815294ad9a512e294d97819bdbeccc7f93f18daeceac321e0c046a6f25eeb1", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.1.1" + "version": "2.2.0" }, "boolean_selector": { "dependency": "transitive", @@ -524,7 +524,7 @@ "version": "1.3.3" }, "ffi": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "ffi", "sha256": "6d7fd89431262d8f3125e81b50d3847a091d846eafcd4fdb88dd06f36d705a45", @@ -729,11 +729,11 @@ "dependency": "direct main", "description": { "name": "flutter_modular", - "sha256": "33a63d9fe61429d12b3dfa04795ed890f17d179d3d38e988ba7969651fcd5586", + "sha256": "04b924a79e17ec897aa40886a46f27954ee0194e4601a006bdba3cb2be65e180", "url": "https://pub.dev" }, "source": "hosted", - "version": "6.4.1" + "version": "7.1.0" }, "flutter_native_splash": { "dependency": "direct dev", @@ -1017,6 +1017,16 @@ "source": "hosted", "version": "1.0.5" }, + "iregexp": { + "dependency": "transitive", + "description": { + "name": "iregexp", + "sha256": "c79119931b7ae9c0b6327adaa4495811813fcae7e6236ac68c15f45ca857d38b", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.2.0" + }, "isolate_channel": { "dependency": "transitive", "description": { @@ -1067,6 +1077,16 @@ "source": "hosted", "version": "4.12.0" }, + "json_path": { + "dependency": "direct main", + "description": { + "name": "json_path", + "sha256": "99cef94ca7b604ad85b9442bc8852e55396f559c08c0ab961d10b90b730c326f", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.9.0" + }, "leak_tracker": { "dependency": "transitive", "description": { @@ -1147,12 +1167,22 @@ "source": "hosted", "version": "0.13.0" }, + "maybe_just_nothing": { + "dependency": "transitive", + "description": { + "name": "maybe_just_nothing", + "sha256": "57af3cacbbe57d5889a4479983755b76551db3c8862aa6335f57f50657945054", + "url": "https://pub.dev" + }, + "source": "hosted", + "version": "0.6.0" + }, "media_kit": { "dependency": "direct main", "description": { "path": "media_kit", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1162,8 +1192,8 @@ "dependency": "direct overridden", "description": { "path": "libs/android/media_kit_libs_android_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1173,8 +1203,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ios/media_kit_libs_ios_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1184,8 +1214,8 @@ "dependency": "direct overridden", "description": { "path": "libs/linux/media_kit_libs_linux", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1195,8 +1225,8 @@ "dependency": "direct overridden", "description": { "path": "libs/macos/media_kit_libs_macos_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1206,8 +1236,8 @@ "dependency": "direct overridden", "description": { "path": "libs/ohos/media_kit_libs_ohos", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1217,8 +1247,8 @@ "dependency": "direct main", "description": { "path": "libs/universal/media_kit_libs_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1228,8 +1258,8 @@ "dependency": "direct overridden", "description": { "path": "libs/windows/media_kit_libs_windows_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1239,8 +1269,8 @@ "dependency": "direct main", "description": { "path": "media_kit_video", - "ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", - "resolved-ref": "a7d4a070fb4b66cf794893a88a1686156daf20be", + "ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", + "resolved-ref": "652cfc765a43792be8bec429ea72296d5d96fb7d", "url": "https://github.com/Predidit/media-kit.git" }, "source": "git", @@ -1296,16 +1326,6 @@ "source": "hosted", "version": "2.7.7" }, - "modular_core": { - "dependency": "transitive", - "description": { - "name": "modular_core", - "sha256": "1db0420a0dfb8a2c6dca846e7cbaa4ffeb778e247916dbcb27fb25aa566e5436", - "url": "https://pub.dev" - }, - "source": "hosted", - "version": "3.4.1" - }, "msix": { "dependency": "direct dev", "description": { @@ -1477,7 +1497,7 @@ "version": "2.2.1" }, "path_provider_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "path_provider_platform_interface", "sha256": "88f5779f72ba699763fa3a3b06aa4bf6de76c8e5de842cf6f29e2e06476c2334", @@ -1527,7 +1547,7 @@ "version": "3.1.6" }, "plugin_platform_interface": { - "dependency": "transitive", + "dependency": "direct dev", "description": { "name": "plugin_platform_interface", "sha256": "4820fbfdb9478b1ebae27888254d445073732dae3d6ea81f0b7e06d5dedc3f02", @@ -1557,7 +1577,7 @@ "version": "6.5.0" }, "provider": { - "dependency": "direct main", + "dependency": "transitive", "description": { "name": "provider", "sha256": "4e82183fa20e5ca25703ead7e05de9e4cceed1fbd1eadc1ac3cb6f565a09f272", @@ -1606,15 +1626,15 @@ "source": "hosted", "version": "0.6.0" }, - "result_dart": { + "rfc_6901": { "dependency": "transitive", "description": { - "name": "result_dart", - "sha256": "80096f0928e276c024e53cf1bb2aaffd5a94623dac8fdfa5cb3529e82b51eb3c", + "name": "rfc_6901", + "sha256": "6a43b1858dca2febaf93e15639aa6b0c49ccdfd7647775f15a499f872b018154", "url": "https://pub.dev" }, "source": "hosted", - "version": "2.2.0" + "version": "0.2.1" }, "rxdart": { "dependency": "transitive", @@ -2314,7 +2334,7 @@ "version": "0.4.0" }, "win32": { - "dependency": "transitive", + "dependency": "direct main", "description": { "name": "win32", "sha256": "d7cb55e04cd34096cd3a79b3330245f54cb96a370a1c27adb3c84b917de8b08e", @@ -2396,6 +2416,6 @@ }, "sdks": { "dart": ">=3.11.0 <4.0.0", - "flutter": ">=3.44.1" + "flutter": ">=3.44.5" } } diff --git a/pkgs/by-name/kb/kbd-ergol/package.nix b/pkgs/by-name/kb/kbd-ergol/package.nix new file mode 100644 index 000000000000..7099e223b0bf --- /dev/null +++ b/pkgs/by-name/kb/kbd-ergol/package.nix @@ -0,0 +1,36 @@ +{ + stdenv, + fetchFromCodeberg, + lib, + nix-update-script, +}: +stdenv.mkDerivation { + pname = "kbd-ergol"; + version = "0-unstable-2026-07-07"; + + src = fetchFromCodeberg { + owner = "Alerymin"; + repo = "kbd-ergol"; + rev = "0af6404625fe4da03bc27e1141dc255ac49fa94e"; + hash = "sha256-875ss78HdU03EgoSpQqLWG279Zg3tIoc6ZTP/hnedcg="; + }; + + strictDeps = true; + __structuredAttrs = true; + + # console.nix expects keymaps to be under /share/keymaps + postPatch = '' + substituteInPlace Makefile \ + --replace "/usr/share/kbd/" "$out/share/" + ''; + + passthru.updateScript = nix-update-script { extraArgs = [ "--version=branch" ]; }; + + meta = { + description = "Ergo-L layout in keymap format for linux console"; + homepage = "https://codeberg.org/Alerymin/kbd-ergol"; + maintainers = with lib.maintainers; [ xaltsc ]; + platforms = lib.platforms.linux; + license = lib.licenses.wtfpl; + }; +} diff --git a/pkgs/by-name/kb/kbdlight/package.nix b/pkgs/by-name/kb/kbdlight/package.nix index fae1720b1be1..31869c849895 100644 --- a/pkgs/by-name/kb/kbdlight/package.nix +++ b/pkgs/by-name/kb/kbdlight/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.3"; src = fetchFromGitHub { - owner = "hobarrera"; + owner = "WhyNotHugo"; repo = "kbdlight"; rev = "v${finalAttrs.version}"; sha256 = "1f08aid1xrbl4sb5447gkip9lnvkia1c4ap0v8zih5s9w8v72bny"; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/hobarrera/kbdlight"; + homepage = "https://github.com/WhyNotHugo/kbdlight"; description = "Very simple application that changes MacBooks' keyboard backlight level"; mainProgram = "kbdlight"; license = lib.licenses.isc; diff --git a/pkgs/by-name/kc/kcl/package.nix b/pkgs/by-name/kc/kcl/package.nix index 79c57ceca027..4ed203ba3761 100644 --- a/pkgs/by-name/kc/kcl/package.nix +++ b/pkgs/by-name/kc/kcl/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "kcl"; - version = "0.12.3"; + version = "0.12.7"; src = fetchFromGitHub { owner = "kcl-lang"; repo = "cli"; rev = "v${finalAttrs.version}"; - hash = "sha256-vOdL+It8wY+U0Jt68KPAxMe3th0muaCXlEkuEphCVVY="; + hash = "sha256-HPydO/gBJkMsqR3Eb3ymKprm5x7tr9//IKT052hiDNA="; }; - vendorHash = "sha256-NfRVgGtm8w/K0utb3/AlBfT71txpmJlOaFrdqGC8Dkg="; + vendorHash = "sha256-46qLRdB0epfZPuvNVYaLIAiTkI9kbAS6OM9OYC8cmmE="; subPackages = [ "cmd/kcl" ]; @@ -51,7 +51,7 @@ buildGoModule (finalAttrs: { runHook preInstallCheck set -o pipefail $out/bin/kcl --version | grep $version - $out/bin/kcl <(echo 'hello = "KCL"') | grep "hello: KCL" + $out/bin/kcl run <(echo 'hello = "KCL"') | grep "hello: KCL" runHook postInstallCheck ''; diff --git a/pkgs/by-name/kd/kddockwidgets/package.nix b/pkgs/by-name/kd/kddockwidgets/package.nix index 4efc159da341..493f00ed10a2 100644 --- a/pkgs/by-name/kd/kddockwidgets/package.nix +++ b/pkgs/by-name/kd/kddockwidgets/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "KDDockWidgets"; - version = "2.4.0"; + version = "2.4.1"; src = fetchFromGitHub { owner = "KDAB"; repo = "KDDockWidgets"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-/ioCX/Txqr84uJJYPhVLrZKug6VdWQDVirmsTg42PXs="; + sha256 = "sha256-Bb9ZQTJ77Brn0XQY2DaBB68xk3Hw1ORuIU0xWIBVmhg="; }; nativeBuildInputs = [ cmake ]; @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { gpl3Only ]; maintainers = with lib.maintainers; [ - _1000teslas + sledgehammervampire tmarkus ]; }; diff --git a/pkgs/by-name/kd/kde-rounded-corners/package.nix b/pkgs/by-name/kd/kde-rounded-corners/package.nix index adde7bfc8e3b..a569c0ca6d9b 100644 --- a/pkgs/by-name/kd/kde-rounded-corners/package.nix +++ b/pkgs/by-name/kd/kde-rounded-corners/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kde-rounded-corners"; - version = "0.8.7"; + version = "0.9.0"; src = fetchFromGitHub { owner = "matinlotfali"; repo = "KDE-Rounded-Corners"; rev = "v${finalAttrs.version}"; - hash = "sha256-ivWOMl0cveJHC6eX/QYteVi2GaRJ/2j02YlDj/Uvs1s="; + hash = "sha256-JZlrjVjA2OGZhWpkSYvwYpPx4tmqlMvi4cP4zM4hxFc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kd/kdigger/package.nix b/pkgs/by-name/kd/kdigger/package.nix index 32f3d9e98857..3d4473fde6db 100644 --- a/pkgs/by-name/kd/kdigger/package.nix +++ b/pkgs/by-name/kd/kdigger/package.nix @@ -74,7 +74,6 @@ buildGoModule (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/kd/kdiskmark/package.nix b/pkgs/by-name/kd/kdiskmark/package.nix index 9b8b42fb21b3..46003e968649 100644 --- a/pkgs/by-name/kd/kdiskmark/package.nix +++ b/pkgs/by-name/kd/kdiskmark/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kdiskmark"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "jonmagon"; repo = "kdiskmark"; rev = finalAttrs.version; - hash = "sha256-b42PNUrG10RyGct6dPtdT89oO222tEovkSPoRcROfaQ="; + hash = "sha256-cdKkOe5BbzF8K+buwctsSMlw4ko0DrNHZ2HwJA9Det4="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ke/kea/dont-create-system-paths.patch b/pkgs/by-name/ke/kea/dont-create-system-paths.patch index a22ee8815ce0..5ad63feea1ae 100644 --- a/pkgs/by-name/ke/kea/dont-create-system-paths.patch +++ b/pkgs/by-name/ke/kea/dont-create-system-paths.patch @@ -1,14 +1,14 @@ diff --git a/meson.build b/meson.build -index 24ab9b5bd7..8f44076cf7 100644 +index eb7f261cef..72fa81daf7 100644 --- a/meson.build +++ b/meson.build -@@ -1118,10 +1118,6 @@ top_docs = [ +@@ -1139,10 +1139,6 @@ top_docs = [ ] install_data(top_docs, install_dir: DATADIR / 'doc/kea') --install_emptydir(LOGDIR) --install_emptydir(RUNSTATEDIR) --install_emptydir(SHAREDSTATEDIR) +-install_emptydir(LOGDIR, install_mode: 'rwxr-x---') +-install_emptydir(RUNSTATEDIR, install_mode: 'rwxr-x---') +-install_emptydir(SHAREDSTATEDIR, install_mode: 'rwxr-x---') - # Meson is annoying with its opinionated alteration of certain paths based on whether prefix is default or not. # So we revert what it does.. diff --git a/pkgs/by-name/ke/kea/package.nix b/pkgs/by-name/ke/kea/package.nix index 1ed011f2e21a..687faa31010b 100644 --- a/pkgs/by-name/ke/kea/package.nix +++ b/pkgs/by-name/ke/kea/package.nix @@ -25,22 +25,21 @@ # tests nixosTests, + testers, + kea, }: stdenv.mkDerivation (finalAttrs: { pname = "kea"; - version = "3.0.3"; # only even minor versions are stable + version = "3.2.0"; # only even minor versions are stable src = fetchurl { url = "https://ftp.isc.org/isc/kea/${finalAttrs.version}/kea-${finalAttrs.version}.tar.xz"; - hash = "sha256-CXAt2weLY36F3pI2y+3T+51698bnlwJsU4tFdIrU1jE="; + hash = "sha256-FL9pXTe2W5sb9VD+pdCtr5gGxQ5UGe8qF2pLjpqt498="; }; patches = [ ./dont-create-system-paths.patch - # backport of an upstream fix for boost-1.89: - # https://gitlab.isc.org/isc-projects/kea/-/merge_requests/2771 - ./boost-1.89.patch ]; postPatch = '' @@ -63,6 +62,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "postgresql" withPostgresql) (lib.mesonOption "localstatedir" "/var") (lib.mesonOption "runstatedir" "/run") + (lib.mesonOption "python.platlibdir" "${placeholder "python"}/${python3.sitePackages}") + (lib.mesonOption "python.purelibdir" "${placeholder "python"}/${python3.sitePackages}") ]; postConfigure = '' @@ -105,11 +106,6 @@ stdenv.mkDerivation (finalAttrs: { ninja doc ''; - postFixup = '' - mkdir -p $python/lib - mv $out/lib/python* $python/lib/ - ''; - passthru.tests = { kea = nixosTests.kea; prefix-delegation = nixosTests.systemd-networkd-ipv6-prefix-delegation; @@ -119,6 +115,12 @@ stdenv.mkDerivation (finalAttrs: { networking-networkd = lib.recurseIntoAttrs { inherit (nixosTests.networking.networkd) dhcpDefault dhcpSimple dhcpOneIf; }; + + version = testers.testVersion { + package = kea; + command = "kea-shell -v"; + version = finalAttrs.version; + }; }; meta = { diff --git a/pkgs/by-name/ke/keepalived/package.nix b/pkgs/by-name/ke/keepalived/package.nix index d08c856293f9..bb7406288ab2 100644 --- a/pkgs/by-name/ke/keepalived/package.nix +++ b/pkgs/by-name/ke/keepalived/package.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; - passthru.tests.keepalived = nixosTests.keepalived; + passthru.tests = nixosTests.keepalived; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ke/keeweb/package.nix b/pkgs/by-name/ke/keeweb/package.nix index 50229cc3c924..e83b9b6863fa 100644 --- a/pkgs/by-name/ke/keeweb/package.nix +++ b/pkgs/by-name/ke/keeweb/package.nix @@ -36,10 +36,6 @@ let url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.linux.x64.deb"; hash = "sha256-/U+vn5TLIU9/J6cRFjuAdyGzlwC04mp4L2X2ETp+ZSE="; }; - x86_64-darwin = fetchurl { - url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.x64.dmg"; - hash = "sha256-+ZFGrrw0tZ7F6lb/3iBIyGD+tp1puVhkPv10hfp6ATU="; - }; aarch64-darwin = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.mac.arm64.dmg"; hash = "sha256-bkhwsWYLkec16vMOfXUce7jfrmI9W2xHiZvU1asebK4="; diff --git a/pkgs/by-name/ke/keifu/package.nix b/pkgs/by-name/ke/keifu/package.nix index 7ce00967fc52..2dd1254741c9 100644 --- a/pkgs/by-name/ke/keifu/package.nix +++ b/pkgs/by-name/ke/keifu/package.nix @@ -15,17 +15,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "keifu"; - version = "0.3.0"; + version = "0.5.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "trasta298"; repo = "keifu"; tag = "v${finalAttrs.version}"; - hash = "sha256-Srw71Rswafu70kKI36dY1PtB4BQhpTYYzqbrWJuvaUM="; + hash = "sha256-ndMWi//G9kwnoPf58YtICyytMv2t0e4h7cwBdfpaoVY="; }; - cargoHash = "sha256-Ga405TV1uDSZbADrV+3aAeLDRfdPFHzdxxTEDu+f+b4="; + cargoHash = "sha256-lNctnxVntxRZaS9XeII1sQZ2ZNKkSvd8n+bq5Fwd6QM="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ke/keka/package.nix b/pkgs/by-name/ke/keka/package.nix index fcea35e15e49..2dbdb9d454bc 100644 --- a/pkgs/by-name/ke/keka/package.nix +++ b/pkgs/by-name/ke/keka/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keka"; - version = "1.6.0"; + version = "1.6.7"; src = fetchzip { url = "https://github.com/aonez/Keka/releases/download/v${finalAttrs.version}/Keka-${finalAttrs.version}.zip"; - hash = "sha256-E0KvDgjx86myZk5+QsydonDaT31CS+B1QGOUXCOaJxY="; + hash = "sha256-6zC8lQLkJ/Qppyo3XwK6fy4f/bLsIg0L+4GwFfiVlvg="; }; nativeBuildInputs = [ makeWrapper ]; @@ -31,7 +31,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { homepage = "https://www.keka.io"; license = lib.licenses.unfree; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - maintainers = with lib.maintainers; [ emilytrau ]; + maintainers = with lib.maintainers; [ + emilytrau + kinnrai + ]; platforms = lib.platforms.darwin; }; }) diff --git a/pkgs/by-name/ke/kerbrute/package.nix b/pkgs/by-name/ke/kerbrute/package.nix index 25a814a0cfdb..9eaecfbbf20e 100644 --- a/pkgs/by-name/ke/kerbrute/package.nix +++ b/pkgs/by-name/ke/kerbrute/package.nix @@ -21,7 +21,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { impacket ]; - installChechPhase = '' + installCheckPhase = '' $out/bin/kerbrute --version ''; diff --git a/pkgs/by-name/ke/kermit-terminal/package.nix b/pkgs/by-name/ke/kermit-terminal/package.nix index 677d51238628..bc74c936a3ab 100644 --- a/pkgs/by-name/ke/kermit-terminal/package.nix +++ b/pkgs/by-name/ke/kermit-terminal/package.nix @@ -4,7 +4,6 @@ fetchFromGitHub, cmake, gtk3, - pcre, pkg-config, vte, nixosTests, @@ -33,7 +32,6 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gtk3 - pcre vte ]; diff --git a/pkgs/by-name/ke/kermit/package.nix b/pkgs/by-name/ke/kermit/package.nix index 71f295c4d16c..1b5781283f04 100644 --- a/pkgs/by-name/ke/kermit/package.nix +++ b/pkgs/by-name/ke/kermit/package.nix @@ -39,7 +39,8 @@ stdenv.mkDerivation { make -f makefile install ''; - env.NIX_CFLAGS_COMPILE = "-Wno-implicit-function-declaration -Wno-implicit-int"; + # Old K&R C sources fail under GCC 14+ default C standard (e.g. dosexp prototypes). + env.NIX_CFLAGS_COMPILE = "-std=gnu89 -Wno-implicit-function-declaration -Wno-implicit-int"; meta = { homepage = "https://www.kermitproject.org/ck90.html"; diff --git a/pkgs/by-name/ke/ketch/package.nix b/pkgs/by-name/ke/ketch/package.nix new file mode 100644 index 000000000000..02754daac568 --- /dev/null +++ b/pkgs/by-name/ke/ketch/package.nix @@ -0,0 +1,46 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: +buildGoModule (finalAttrs: { + pname = "ketch"; + version = "0.12.0"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "1broseidon"; + repo = "ketch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qp4EwQBrN0ic/gUAvBAirz03kL7Vjhs1LbKBd+uXmHA="; + }; + + vendorHash = "sha256-Kk7fY27y1ziJEMpwRUoGfslGYYQdayLDuuRvNyfiAy8="; + + ldflags = [ + "-s" + "-w" + "-X github.com/1broseidon/ketch/cmd.version=${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, stateless CLI for web search and scrape. Built for AI agents."; + homepage = "https://chain.sh/ketch/"; + changelog = "https://github.com/1broseidon/ketch/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + stephsi + ]; + mainProgram = "ketch"; + }; +}) diff --git a/pkgs/by-name/ke/ketesa/package.nix b/pkgs/by-name/ke/ketesa/package.nix index 1c5db95856e7..9afc27b5184d 100644 --- a/pkgs/by-name/ke/ketesa/package.nix +++ b/pkgs/by-name/ke/ketesa/package.nix @@ -17,18 +17,18 @@ assert lib.asserts.assertMsg ( stdenv.mkDerivation (finalAttrs: { pname = "ketesa"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "etkecc"; repo = "ketesa"; tag = "v${finalAttrs.version}"; - hash = "sha256-Yg5M3D4etEVwLXT5+QSLqebJwBIpRKV43nYycKSi/tw="; + hash = "sha256-0YNCPOkWIzXMfs6Jptn+PBRHxuees6zVh7RpTXZKywQ="; }; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-mLFCVt2LsF4/evlVyTXEdSSk4aDU2tF2m3v8j8eX8ng="; + hash = "sha256-NJGAchoEVgIOjQyH9mNh7h4BZmq4HV2FjHOBhL88ZWw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keto/package.nix b/pkgs/by-name/ke/keto/package.nix index 2c65e602a957..19bf5849239f 100644 --- a/pkgs/by-name/ke/keto/package.nix +++ b/pkgs/by-name/ke/keto/package.nix @@ -1,48 +1,84 @@ { + lib, + stdenv, fetchFromGitHub, buildGoModule, - lib, + versionCheckHook, + installShellFiles, }: -let +buildGoModule (finalAttrs: { pname = "keto"; version = "26.2.0"; - commit = "e4393662cd2e744deeb79de77669e07b6ccf51f3"; -in -buildGoModule { - inherit pname version commit; src = fetchFromGitHub { owner = "ory"; repo = "keto"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-wRtz4RvJ7LxVnSLmXVZFGa9QXjcPnDNJxHKosbyTed0="; }; vendorHash = "sha256-B27aC4yXS36eOoq53+RWp0vq1Oqw2aR+gOjv0m+b/I4="; + __structuredAttrs = true; + tags = [ "sqlite" "json1" "hsm" ]; - subPackages = [ "." ]; + subPackages = [ "..." ]; # Pass versioning information via ldflags ldflags = [ "-s" - "-w" - "-X github.com/ory/keto/internal/driver/config.Version=${version}" - "-X github.com/ory/keto/internal/driver/config.Commit=${commit}" + "-X github.com/ory/keto/internal/driver/config.Version=${finalAttrs.src.tag}" + "-X github.com/ory/keto/internal/driver/config.Commit=${finalAttrs.src.rev}" ]; + nativeBuildInputs = [ installShellFiles ]; + # tests use dynamic port assignment via port `0` + __darwinAllowLocalNetworking = true; + + preCheck = '' + export version='${finalAttrs.src.tag}' + ''; + checkFlags = [ + "-short" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = [ "version" ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion --cmd keto \ + --bash <($out/bin/keto completion bash) \ + --fish <($out/bin/keto completion fish) \ + --zsh <($out/bin/keto completion zsh) + ''; + meta = { - description = "ORY Keto, the open source access control server"; - homepage = "https://www.ory.sh/keto/"; + description = "Scalable and customizable permission server "; + longDescription = '' + Open source implementation of "Zanzibar: Google's Consistent, Global Authorization System". It follows + [cloud architecture best practices](https://www.ory.com/docs/ecosystem/software-architecture-philosophy) + and focuses on: + + - Scalable permission checks based on the Zanzibar model + - The Ory Permission Language for defining access control policies + - Relationship-based access control (ReBAC) + - Low latency permission checks (sub-10ms) + - Horizontal scaling to billions of relationships + - Consistency and high availability + ''; + homepage = "https://github.com/ory/keto"; + changelog = "https://github.com/ory/keto/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mrmebelman debtquity ]; + mainProgram = "keto"; }; -} +}) diff --git a/pkgs/by-name/ke/kew/package.nix b/pkgs/by-name/ke/kew/package.nix index ee65e8acfc15..18c673079514 100644 --- a/pkgs/by-name/ke/kew/package.nix +++ b/pkgs/by-name/ke/kew/package.nix @@ -34,13 +34,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "kew"; - version = "4.0.0"; + version = "4.1.8"; src = fetchFromGitHub { owner = "ravachol"; repo = "kew"; tag = "v${finalAttrs.version}"; - hash = "sha256-DtYiqAM5q6H5f1s39CMO/kA1tPFvwcmzS31gZqPz8MQ="; + hash = "sha256-qT1hroZPmZezAQ1PzpDMLDgN8PufwbFtuIYGqvAcvNo="; }; postPatch = '' @@ -83,9 +83,12 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + installFlags = [ "MAN_DIR=${placeholder "out"}/share/man" - "PREFIX=${placeholder "out"}" ]; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/ke/keybinder/package.nix b/pkgs/by-name/ke/keybinder/package.nix index 0e7ed8ec4ea7..3cd461e3bce5 100644 --- a/pkgs/by-name/ke/keybinder/package.nix +++ b/pkgs/by-name/ke/keybinder/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.3.1"; src = fetchFromGitHub { - owner = "engla"; + owner = "kupferlauncher"; repo = "keybinder"; rev = "v${finalAttrs.version}"; sha256 = "sha256-elL6DZtzCwAtoyGZYP0jAma6tHPks2KAtrziWtBENGU="; @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { * Gobject-Introspection (gir) generated bindings * Lua bindings, ``lua-keybinder`` ''; - homepage = "https://github.com/engla/keybinder/"; + homepage = "https://github.com/kupferlauncher/keybinder/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.bjornfor ]; diff --git a/pkgs/by-name/ke/keyboard-layout-editor/package.nix b/pkgs/by-name/ke/keyboard-layout-editor/package.nix index 3c59c1790a13..a504ee36ba37 100644 --- a/pkgs/by-name/ke/keyboard-layout-editor/package.nix +++ b/pkgs/by-name/ke/keyboard-layout-editor/package.nix @@ -78,7 +78,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ke/keycard-cli/package.nix b/pkgs/by-name/ke/keycard-cli/package.nix index a600fbd46b52..d33861d1b020 100644 --- a/pkgs/by-name/ke/keycard-cli/package.nix +++ b/pkgs/by-name/ke/keycard-cli/package.nix @@ -12,7 +12,7 @@ buildGoModule (finalAttrs: { version = "0.8.2"; src = fetchFromGitHub { - owner = "status-im"; + owner = "keycard-tech"; repo = "keycard-cli"; rev = finalAttrs.version; hash = "sha256-H9fipHGxINMAXdxUYhyVZusDXA3HW1iQl8iRX6AF7iE="; diff --git a/pkgs/by-name/ke/keycastr/package.nix b/pkgs/by-name/ke/keycastr/package.nix index 3bcfce43aba7..6763809f126f 100644 --- a/pkgs/by-name/ke/keycastr/package.nix +++ b/pkgs/by-name/ke/keycastr/package.nix @@ -6,11 +6,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "keycastr"; - version = "0.10.3"; + version = "0.10.5"; src = fetchurl { url = "https://github.com/keycastr/keycastr/releases/download/v${finalAttrs.version}/KeyCastr.app.zip"; - hash = "sha256-4zhLsIaG0rK7pQnQ0RmhwrcUBGtUB4ca38GlFXQpiiU="; + hash = "sha256-yXxj6tv0MEwEgCwMg3XJm1gIRYS+MU6WTINm7KMYt1I="; }; sourceRoot = "."; diff --git a/pkgs/by-name/ke/keychain/package.nix b/pkgs/by-name/ke/keychain/package.nix index 9c5c35275f02..bc52d938f387 100644 --- a/pkgs/by-name/ke/keychain/package.nix +++ b/pkgs/by-name/ke/keychain/package.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.9.8"; src = fetchFromGitHub { - owner = "funtoo"; + owner = "danielrobbins"; repo = "keychain"; rev = finalAttrs.version; sha256 = "sha256-xk3ooFhBkgv93Po5oC4TZRmMhJJXDv7yekoE102FQd8="; diff --git a/pkgs/by-name/ke/keycloak-config-cli/package.nix b/pkgs/by-name/ke/keycloak-config-cli/package.nix index df21c7e3715f..f599bfab35b2 100644 --- a/pkgs/by-name/ke/keycloak-config-cli/package.nix +++ b/pkgs/by-name/ke/keycloak-config-cli/package.nix @@ -5,25 +5,33 @@ jre_headless, makeWrapper, nix-update-script, + versionCheckHook, }: -maven.buildMavenPackage rec { +maven.buildMavenPackage (finalAttrs: { pname = "keycloak-config-cli"; - version = "6.4.0"; + version = "6.5.1"; src = fetchFromGitHub { owner = "adorsys"; repo = "keycloak-config-cli"; - tag = "v${version}"; - hash = "sha256-Vg56Dz9U0eAJw+7u90MSZWmMIZttWYGXAwsXZsEfTj8="; + tag = "v${finalAttrs.version}"; + hash = "sha256-dSeLn9YaT0k6Mg8cxmoDoEtvjrzkyETvI4dt+q/Wj3A="; }; - mvnHash = "sha256-tdh8hRqGXI3zuwy55dC3La9dm2naqeCEZT4qcw37iDI="; + mvnHash = "sha256-Ff9ra9ruPJ8PA0bmC8uU8PiNqjtJoR4U04veZAqZ3sM="; - # Tests use MockServer which needs to bind to a local port - __darwinAllowLocalNetworking = true; + # JavaScriptEvaluatorTest needs GraalVM's Truffle engine, which fails to + # initialize on the sandbox JDK (org.graalvm.polyglot.Engine$ImplHolder). + doCheck = false; + + strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ makeWrapper ]; + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + installPhase = '' runHook preInstall install -Dm444 target/keycloak-config-cli.jar $out/share/keycloak-config-cli/keycloak-config-cli.jar @@ -36,6 +44,7 @@ maven.buildMavenPackage rec { meta = { homepage = "https://github.com/adorsys/keycloak-config-cli"; + changelog = "https://github.com/adorsys/keycloak-config-cli/releases/tag/v${finalAttrs.version}"; description = "Import YAML/JSON-formatted configuration files into Keycloak"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ @@ -46,4 +55,4 @@ maven.buildMavenPackage rec { mainProgram = "keycloak-config-cli"; platforms = jre_headless.meta.platforms; }; -} +}) diff --git a/pkgs/by-name/ke/keycloak/all-plugins.nix b/pkgs/by-name/ke/keycloak/all-plugins.nix index 5e36541557b5..ca02212b69dc 100644 --- a/pkgs/by-name/ke/keycloak/all-plugins.nix +++ b/pkgs/by-name/ke/keycloak/all-plugins.nix @@ -1,15 +1,18 @@ { + lib, + config, callPackage, fetchMavenArtifact, junixsocket-common, junixsocket-native-common, }: { + apple-identity-provider-keycloak = callPackage ./apple-identity-provider-keycloak { }; keycloak-2fa-sms-authenticator = callPackage ./keycloak-2fa-sms-authenticator { }; keycloak-discord = callPackage ./keycloak-discord { }; keycloak-enforce-mfa-authenticator = callPackage ./keycloak-enforce-mfa-authenticator { }; + keycloak-home-idp-discovery = callPackage ./keycloak-home-idp-discovery { }; keycloak-magic-link = callPackage ./keycloak-magic-link { }; - keycloak-metrics-spi = callPackage ./keycloak-metrics-spi { }; keycloak-orgs = callPackage ./keycloak-orgs { }; keycloak-remember-me-authenticator = callPackage ./keycloak-remember-me-authenticator { }; keycloak-restrict-client-auth = callPackage ./keycloak-restrict-client-auth { }; @@ -40,3 +43,6 @@ hash = "sha256-xHxzBxriSd/OU8gEcDG00VRkJYPYJDfAfPh/FkQe+zg="; }).passthru.jar; } +// lib.optionalAttrs config.allowAliases { + keycloak-metrics-spi = throw "keycloak.plugins.keycloak-metrics-spi has been removed in favor of Keycloak's native metrics."; # Added 2026-07-14 +} diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix new file mode 100644 index 000000000000..7bda6aa7651c --- /dev/null +++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/default.nix @@ -0,0 +1,54 @@ +{ + lib, + stdenv, + fetchFromGitHub, + gradle_8, + nix-update-script, +}: +let + gradle = gradle_8; +in +stdenv.mkDerivation (finalAttrs: { + pname = "apple-identity-provider-keycloak"; + version = "1.17.0"; + + src = fetchFromGitHub { + owner = "klausbetz"; + repo = "apple-identity-provider-keycloak"; + tag = finalAttrs.version; + hash = "sha256-0/uHQwgyHwy+5ynRHs0ot0iIBVUckEs65YxkWLQNgbY="; + }; + + nativeBuildInputs = [ gradle ]; + + mitmCache = gradle.fetchDeps { + pkg = finalAttrs.finalPackage; + data = ./deps.json; + }; + + __darwinAllowLocalNetworking = true; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" build/libs/apple-identity-provider-${finalAttrs.version}.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/klausbetz/apple-identity-provider-keycloak"; + changelog = "https://github.com/klausbetz/apple-identity-provider-keycloak/releases/tag/${finalAttrs.version}"; + description = "Keycloak identity provider extension for Sign in with Apple"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ anish ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryBytecode # mitm cache + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json new file mode 100644 index 000000000000..b8c6df951b03 --- /dev/null +++ b/pkgs/by-name/ke/keycloak/apple-identity-provider-keycloak/deps.json @@ -0,0 +1,1335 @@ +{ + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://repo.maven.apache.org/maven2": { + "com/apicatalog#titanium-json-ld/1.3.3": { + "jar": "sha256-d53h2I8XNIbw6p8bS3d5lwrCGnrUmyoDcPX5m23+9yw=", + "pom": "sha256-VM++dai2e/vf/1mf+be016mun7h1GQHKu9f1+OTbxL0=" + }, + "com/fasterxml#classmate/1.7.0": { + "jar": "sha256-y4aPIxxczrideV6gDm4bepO49Kwc4di+dt3jIt/0oEY=", + "pom": "sha256-ZHEa3vDskvH2zap7LqwGsuVmekppkez7i/rEZoHVuTE=" + }, + "com/fasterxml#oss-parent/56": { + "pom": "sha256-/UkfeIV0JBBtLj1gW815m1PTGlZc3IaEY8p+h120WlA=" + }, + "com/fasterxml#oss-parent/65": { + "pom": "sha256-2wuaUmqeMDxjuptYSWicYfs4kkf6cjEFS5DgvwC0MR4=" + }, + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" + }, + "com/fasterxml/jackson#jackson-base/2.19.0": { + "pom": "sha256-Noz4ykJkRni737F6sUfJC8QyWaWZUJfD8cT7au9Mdcg=" + }, + "com/fasterxml/jackson#jackson-base/2.19.2": { + "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM=" + }, + "com/fasterxml/jackson#jackson-bom/2.16.1": { + "pom": "sha256-adi/myp9QsnPHXCtgr5C9qxv14iRim4ddXkuzcwRegs=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.0": { + "pom": "sha256-sR/LPvM6wH5oDObYXxfELWoz2waG+6z68OQ0j8Y5cbI=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" + }, + "com/fasterxml/jackson#jackson-parent/2.16": { + "pom": "sha256-i/YUKBIUiiq/aFCycvCvTD2P8RIe1gTEAvPzjJ5lRqs=" + }, + "com/fasterxml/jackson#jackson-parent/2.19": { + "pom": "sha256-bNk0tNFdfz7hONl7I8y4Biqd5CJX7YelVs7k1NvvWxo=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.19.2": { + "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=", + "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=", + "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck=" + }, + "com/fasterxml/jackson/core#jackson-core/2.19.2": { + "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=", + "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", + "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.19.2": { + "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=", + "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=", + "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.0": { + "module": "sha256-qLWWRYzQPkdOAwOUJpAQeKzOtwMSau5jaUo0HpbWXoo=", + "pom": "sha256-p8eH3uN+tGj3MxtELbwPFUDxQnRveVmBu7YkgRY56K8=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-cbor/2.19.2": { + "jar": "sha256-RQ268UVD98LoE4cKousG/Nu3kxbYCzDMT32oMfNYLPM=", + "module": "sha256-tEgT9KJg3WOlW7Xcc9OsavHi+RwzrD8FfebYE6EiXeA=", + "pom": "sha256-o4vv9jT/C41ZaXIiP2tD7UtWatoxSBB5rwj9Hxn/mLs=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": { + "jar": "sha256-gKIT59mYJEkiq3vPCTjqA+t4aOiOLQWoQHxiKMiFo34=", + "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=", + "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.0": { + "pom": "sha256-D8yK4bXILDgeQPw9uULCgMHMSECz5sDekmOu9v4D0Zg=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-binary/2.19.2": { + "pom": "sha256-z8A2j768TpMUNzf2pDHWjpLPPDXMlFmLo1U+1wYYEQk=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": { + "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jdk8/2.19.2": { + "jar": "sha256-YFX+8QdW6L0bDogHqh2IEzjGPKldWSceHaSSK5oXWB4=", + "module": "sha256-cJMXXvltnjxoFL59n5uQeZzGsd/JDqi8ZUVP9byleEo=", + "pom": "sha256-u2kaYgtZPgNo7zrOifnc1dY3VtXlvAXdyay3ih/Ny+c=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.2": { + "jar": "sha256-lwn0Pg+lYlYz7mbbbAePsejHygIJJpa6lep4Xb8PpqE=", + "module": "sha256-HNFClAh9xmpIvf8+t1CZyHsK0paspR6AgMuc3yCRF6E=", + "pom": "sha256-sa5Nojzw/imhXWUC4XcpfAssYp3Nlpy2RFfVVLZacS8=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-base/2.19.2": { + "jar": "sha256-F/5iz/a/euqvdBNgCa9cS0mVSIxTe7bpKPcO2s7I4LA=", + "module": "sha256-1+OmfyY5twuE4/7bwZqTZKfMClnh7rl5lihDoARyjKg=", + "pom": "sha256-cuutsSEGvT1wp4JQT6g1ZL/R7oZHn5ZWPYMrnWt96rs=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-providers/2.19.2": { + "pom": "sha256-B2S/Gps0yugUzz8hO2oCKSBV4P0dxXOuixNfE/xre2M=" + }, + "com/fasterxml/jackson/jakarta/rs#jackson-jakarta-rs-yaml-provider/2.19.2": { + "jar": "sha256-zWNZeK73fG8NxbLTOhKhOo8HDmOjSVt9bCxrJRIwoSA=", + "module": "sha256-LLWfJRGJTBuWIQyhhK8LGvrXD+4HLMIfSo2OmEQe9wo=", + "pom": "sha256-JEYduYSE7ns8yTkLEKZyXfXp8JfN0XXnlwdnHCAmRcU=" + }, + "com/fasterxml/jackson/module#jackson-module-jakarta-xmlbind-annotations/2.19.2": { + "jar": "sha256-u69EflB7FOb/s/dVxLHmD1I5nHPzM4BfNK+6Z+8XWSs=", + "module": "sha256-HhkceCnIbeQvm7s6uph3Gdgcs49aDZdx5nQFHka3EDI=", + "pom": "sha256-mRKux2ADWIe3cb5/imHAWPOSt6WClRANzzqay8nAKec=" + }, + "com/fasterxml/jackson/module#jackson-modules-base/2.19.2": { + "pom": "sha256-V6S5QhVKz4VVeikvO4O3cnMAfjxwJak5UDScL9GoYVo=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": { + "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ=" + }, + "com/github/ben-manes/caffeine#caffeine/3.1.8": { + "jar": "sha256-fdFfnfG+I4/6o2fOb1VnN6iAMd5ClNrRju9XxHTd8dM=", + "module": "sha256-SazUz4G+Hk6GgFTw00/PXHdWCEWVBzB86HjNuk/dTYQ=", + "pom": "sha256-Rj9PiWOKroLGVLPyhC6NA/eg1IGUxCYEbdnJXOBjJu4=" + }, + "com/github/jai-imageio#jai-imageio-core/1.4.0": { + "jar": "sha256-itPGjp7/+xCsh/+LxYmt9ksEpynFGUwHnv0GQ2B/1yo=", + "pom": "sha256-Ac0LjPRGoe4kVuyeg8Q11gRH0G6fVJBMTm/sCPfO8qw=" + }, + "com/github/ua-parser#uap-java/1.6.1": { + "jar": "sha256-/z4eudgH34vBl5UN5dVV0YkqfO7Q/f91s+sqp4u+UcU=", + "pom": "sha256-ZnXK/DBSoJQXycUnGv5owrSrpuu8ya8FUfh10k6r6ck=" + }, + "com/google/api/grpc#proto-google-common-protos/2.29.0": { + "jar": "sha256-7px1HwaxEukrN/deT3OhfQPvLDMCxujZhq28xyG2PLA=", + "pom": "sha256-buHqFliOzsn79BLXrRulV7xFbOCXUg3uXkzQiuYcJ4Q=" + }, + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" + }, + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.30.0": { + "jar": "sha256-FE86771uJ9rsVdN1OyxrE8Gv2vDPBIFs21ZFiO2S8b0=", + "pom": "sha256-9xOEnCOzSVPoVFZdzoqnlcrgwUFmEbcgwhRhMix5X4Y=" + }, + "com/google/errorprone#error_prone_parent/2.30.0": { + "pom": "sha256-Xog0zMDl7Qxy8wbCULUY5q0Q0HWpt7kQz2lcuh7gKi0=" + }, + "com/google/guava#failureaccess/1.0.1": { + "jar": "sha256-oXHuTHNN0tqDfksWvp30Zhr6typBra8x64Tf2vk2yiY=", + "pom": "sha256-6WBCznj+y6DaK+lkUilHyHtAopG1/TzWcqQ0kkEDxLk=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/32.1.2-jre": { + "pom": "sha256-iOnLAHM1q1/bMUpuPJh3NOwjCMmgY/90fHRpGJ0Kkr8=" + }, + "com/google/guava#guava-parent/32.1.3-android": { + "pom": "sha256-QfwmRk+6irC1W0AmdrRTaeCqqbqOClpd7IBFKQisl+E=" + }, + "com/google/guava#guava-parent/33.3.1-android": { + "pom": "sha256-bhGYbqclC1H4RxV+Lck38yowaATfzgAHpegd25uVxXk=" + }, + "com/google/guava#guava/32.1.2-jre": { + "module": "sha256-5Azwhc7QWrGPnJTnx7wZfhzbaVvJOa/DRKskwUFNbH4=", + "pom": "sha256-PyCFltceCDmyU6SQr0mjbvf9tFG+kKQqsd+els/TFmA=" + }, + "com/google/guava#guava/32.1.3-android": { + "module": "sha256-+Kh873LA6AJ6b648vfAHKiQc5tjnYPlucIe3QqZgWmE=", + "pom": "sha256-SfgFUBXoaHd0z9iTm9aDx08J1rJLzA/CaEC82XoIhms=" + }, + "com/google/guava#guava/32.1.3-jre": { + "jar": "sha256-bU4rWhGKq2Lm5eKdGFoCJO7YLIXECsPTPPBKJww7N0Q=" + }, + "com/google/guava#guava/33.3.1-android": { + "module": "sha256-aXFhTd7uAD5U0racawyUzopbXrqYDRZFXIHfkImnrLc=", + "pom": "sha256-xyjbbycFyj6mo88s8SYNvv86RSQkmhsbkA7c/p1yFC8=" + }, + "com/google/guava#guava/33.3.1-jre": { + "jar": "sha256-S/Dixa+ORSXJbo/eF6T3MH+X+EePEcTI41oOMpiuTpA=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/protobuf#protobuf-bom/3.25.1": { + "pom": "sha256-Q3hpcMGst8EZyWH1PqhWpLwL9r8M7/qwrSqE8mLPFlQ=" + }, + "com/google/protobuf#protobuf-java/3.25.1": { + "jar": "sha256-SKjlihqPgu/xQaejiNON/nfXpI1eV8kGbuN/GRR+IN8=", + "pom": "sha256-P/SnjWBeHWmR5RXFUDcmy0gEK4dOpVSkvIqHrp+Rv5U=" + }, + "com/google/protobuf#protobuf-parent/3.25.1": { + "pom": "sha256-zRvoNznwNkYrEptlN1n6hov61D+5U5xefR3irD2F3Oo=" + }, + "com/google/zxing#core/3.4.0": { + "jar": "sha256-ZQBIBqZpI0xpj74HVSWBADdfsB/pO1OEVfOQNxPUpQ0=", + "pom": "sha256-CzqlUO6bM9qDUwx7POCYVDQyNZew+ZXZrqEkbfeweDI=" + }, + "com/google/zxing#javase/3.4.0": { + "jar": "sha256-eu73RqVE7/zZ5JkhTZ8xXmnDqDXnyBq/twO+efhZptc=", + "pom": "sha256-zAE4wjA1fmStdZpAwONiuog3yf1PSr5kw1uz/VKhCno=" + }, + "com/google/zxing#zxing-parent/3.4.0": { + "pom": "sha256-6hqNZZr4nC3dRyfettWvEkddEsi4Rd/J11AT0I/xE+8=" + }, + "com/googlecode/owasp-java-html-sanitizer#java10-shim/20260101.1": { + "jar": "sha256-nCC++8cAOvTe45cP0fnQHyUtK+mDUjVQkDhBn8to2h0=", + "pom": "sha256-AkJQ+u/aQWrhRxG64pkHes+SfHIy5JG4SlIjUNebpck=" + }, + "com/googlecode/owasp-java-html-sanitizer#java8-shim/20260101.1": { + "jar": "sha256-tdWxCv0qsYmb2ahZ0de1m0nkONqxinyV2FrHHBMpkyo=", + "pom": "sha256-1DL8KSVzoBYOU/IZAupmBMuST25eGW3J4G+Q5z25uSk=" + }, + "com/googlecode/owasp-java-html-sanitizer#owasp-java-html-sanitizer/20260101.1": { + "jar": "sha256-8xPx1q6Emhj1Ei2++BJtw3nshs7y3PgZK0eBcMfq8VU=", + "pom": "sha256-LzARwOiu+gAb+dsZ+Mx+ts7bcvnoA/7wKGLvWlVa71s=" + }, + "com/googlecode/owasp-java-html-sanitizer#parent/20260101.1": { + "pom": "sha256-nk08oMDaG75sAV7RenMI6GNFrx2/BGBtZ9hx5CI7vMc=" + }, + "com/sun/activation#all/2.0.1": { + "pom": "sha256-ZI1dYrYVP0LxkM7S1ucMHmRCVQyc/rZvvuCWHGYWssw=" + }, + "com/sun/activation#jakarta.activation/2.0.1": { + "jar": "sha256-ueJLfdbgdJVWLqllMb4xMMltuk144d/Yitu96/QzKHE=", + "pom": "sha256-igaFktsI5oUyBP8LYlowFDjjw26l8a5lur/tIIUCeBo=" + }, + "com/webauthn4j#webauthn4j-core/0.29.3.RELEASE": { + "jar": "sha256-KwcixSJzMd6gy6hVyM06C0wu+d1SKN3HP7g9wV4ado4=", + "module": "sha256-LvUJKU66sFQfwNJLBbuUReNtMbveczzXFFsUtKujeYg=", + "pom": "sha256-mRqiEmv00c88ly/MiIKgb0F2Q17FlC1CT2+Ou6GGp2A=" + }, + "commons-codec#commons-codec/1.11": { + "jar": "sha256-5ZnVMY6Xqkj0ITaikn5t+k6Igd/w5sjjEJ3bv/Ude30=", + "pom": "sha256-wecUDR3qj981KLwePFRErAtUEpcxH0X5gGwhPsPumhA=" + }, + "io/grpc#grpc-api/1.65.0": { + "pom": "sha256-JD7d8N/78ktOlxt4m6NO0zUb0X85Y3k8JaiNJv98dDk=" + }, + "io/grpc#grpc-api/1.69.1": { + "jar": "sha256-qNPW3McfOrYT1miEIoK0iL3ZPT6ZoO9dyn7ub6c0woM=", + "pom": "sha256-vq8uR11cRdBjTU0yS/hNsqjWqSkilx5vfcJ+hRxCkH8=" + }, + "io/grpc#grpc-context/1.69.1": { + "jar": "sha256-Re+VuMFYqLW906y2e55oLvJUFLsUj0iOyEdDirZHFdQ=", + "pom": "sha256-beKbzqslob0L4R7qhGjQ4/HAxHbQpTMhW0/eHIKEtXA=" + }, + "io/grpc#grpc-core/1.69.1": { + "jar": "sha256-UTUsra7L+aSkqkLZP28fxyjx/QGwUWgDg+0J5WMf+9A=", + "pom": "sha256-loCY9KhFG7zT17iMaoq1t6dO+A397npgUvNS//eDssU=" + }, + "io/grpc#grpc-netty/1.65.0": { + "jar": "sha256-zukwf1gJhY/XtLwR1Sxqz/jamJ3yiCItDGir7Qm6SI0=", + "pom": "sha256-4WrvLiECuNN5SvCh9eEZmQFohMkR1LFeBJBmcp+u3gs=" + }, + "io/grpc#grpc-protobuf-lite/1.65.0": { + "jar": "sha256-lEZ52Y6pLvVkx+zOMKtpJRLcL/rllvTpqJQRMq+TcOg=", + "pom": "sha256-OslNjEdH7PHig5nrPaapmCJg/eAOV5Y/C6PQ3YdqFbg=" + }, + "io/grpc#grpc-protobuf/1.65.0": { + "jar": "sha256-r2l19WnK5PBaY2/cFXXi7ufMIJmrvFCvSKrGhJA0hD0=", + "pom": "sha256-3M03CJmNVXPgzZAWE0iNloomfnpXVTrrT32Hwh5dF4I=" + }, + "io/grpc#grpc-stub/1.65.0": { + "jar": "sha256-oZ+kxWQ060tyDt7JrdOJqKRCe/kYGMP0dwVxIS5b7iQ=", + "pom": "sha256-lzgLq7iK4WhKL8aUCfgkXn/507Myla47K6WuwOpWdXg=" + }, + "io/grpc#grpc-util/1.65.0": { + "jar": "sha256-aVtu9QQdECm9RyQHyMvdI11S+zJ0DZq8l64GDKggRxo=", + "pom": "sha256-iBzI5CKWjAreK+XJmBLu/82qMein8Sf9cquJgQgpgGE=" + }, + "io/netty#netty-bom/4.1.121.Final": { + "pom": "sha256-E24RjGngF0Wbor28weVaD9w2dD1X8oqOoWKpjR/LtjM=" + }, + "io/netty#netty-bom/4.1.125.Final": { + "pom": "sha256-xKF8K1VcdW41xsJQz1dSjD0uyGAeReAOHEXTofHPAhY=" + }, + "io/netty#netty-bom/4.1.128.Final": { + "pom": "sha256-6EgBU0x4auPRUcKkhzZyrehbCxxlKXM1Y8134bo5XIQ=" + }, + "io/netty#netty-buffer/4.1.128.Final": { + "jar": "sha256-Jb77ayA7SS6tMqUOc3SiUFBKS4vMYru4lZLv3zP+Pp4=", + "pom": "sha256-kTgt1XW9T7AyzRhJTMh+BD4YIIM8NXOsMkcVD5aQgPc=" + }, + "io/netty#netty-codec-dns/4.1.128.Final": { + "jar": "sha256-u5qW8kV+IacKftui8LiOvF8GyohR9iFTzMacDp3I4gg=", + "pom": "sha256-WxwtwXjziq/oavyyerkx/QGdK272ox0Z0/DKKTrMayY=" + }, + "io/netty#netty-codec-haproxy/4.1.128.Final": { + "jar": "sha256-82SM6nywJ+8KfTCuXEzfVWCVTKfhVkwjvU0B4uZu4vw=", + "pom": "sha256-0S/Naoyzjg701bI69Q+QBz0PBI7cBPK4nRJGVn+3FEE=" + }, + "io/netty#netty-codec-http/4.1.128.Final": { + "jar": "sha256-dkxClm3MnfhUE+IOCn+X08toIhl3L7jcoybgovDl9fM=", + "pom": "sha256-IWZQVqRQE/BIOYpXmYA+1Zj4yBjUWsSABlIyG4hYzKc=" + }, + "io/netty#netty-codec-http2/4.1.128.Final": { + "jar": "sha256-Rnm13lVq5UWHM/hEZX2RLeIf25aXJLbL1bGUKqCUyeY=", + "pom": "sha256-/MSa+wuxBCjX6LOlvmUApo2Hfh9sj3syhGNTq5is2KU=" + }, + "io/netty#netty-codec-socks/4.1.128.Final": { + "jar": "sha256-gxboFZNUQSqv8A+Ozmjqwfd6GXB9H1nav1BFfLdS7Os=", + "pom": "sha256-WQy4n/NyKrKoPIa1M/NlEkRWvjKSg3whUEd3Sgb48nM=" + }, + "io/netty#netty-codec/4.1.128.Final": { + "jar": "sha256-0qrYGYggsdCFb6k/4KxvGTW9lQpIqyuF5bStvfxfp7Q=", + "pom": "sha256-Wjb0rUE+qslHS9wKtZBKZMfplniQDofNQPjqb/TVAWo=" + }, + "io/netty#netty-common/4.1.128.Final": { + "jar": "sha256-V12BA0KyQA+vgIW4/AveCUMtr26LknxNyyRvDuWz6Y8=", + "pom": "sha256-8VBjPV5LdwT/Wqdf4jXBXcqNwn+Sei32qMMGwmHhPTo=" + }, + "io/netty#netty-handler-proxy/4.1.128.Final": { + "jar": "sha256-gIQ08tqZP7DzJ2Y6qO8wdWx+6UsWQiE4jsY/7UqfaqY=", + "pom": "sha256-IxkMAx2zJZnCAzvie+9NrCzY2AgdUZ0H9+EjBQG3ic0=" + }, + "io/netty#netty-handler/4.1.128.Final": { + "jar": "sha256-2eP9m4OcsgcDD/04XVs8CH2/dGpkMFbbVE8WMYVzl18=", + "pom": "sha256-Us8llYniP11RyEQGwResnM9zVXf3ozmDomKHwiJzd0w=" + }, + "io/netty#netty-parent/4.1.128.Final": { + "pom": "sha256-MP+WtQDff6aHKn4uvjY57xc84HQ+FiUX+w50qiC77nQ=" + }, + "io/netty#netty-resolver-dns/4.1.128.Final": { + "jar": "sha256-JxwndI/K5eaL7nSvgaFQ0cQLTCE9g23LFYQ8CQpFLEo=", + "pom": "sha256-4Plrh2cPdoEbY9rr2Uv3hf4QbqykPe90SCWcmUYUzJE=" + }, + "io/netty#netty-resolver/4.1.128.Final": { + "jar": "sha256-OsK48KAP7HhaBkgXL7uLrGqOj1Tn1aqVh5Dl3nBQS2s=", + "pom": "sha256-Ksv4nHRODB31ls68vwy+qbr0JtFbFu81VXSpeMcxhBU=" + }, + "io/netty#netty-transport-native-unix-common/4.1.128.Final": { + "jar": "sha256-hWPiIpFJ2UKYjUp6DsfAG5oF3vUq0oRGM94lxcCmhp8=", + "pom": "sha256-DYZVX0OzfMzjiI4UgkIJYa0KrRxil44dUZifKr3S3xo=" + }, + "io/netty#netty-transport/4.1.128.Final": { + "jar": "sha256-3JEHqukxy1z1lHGDU1j2i0y5VIyfsKn+Bqzyo9PUIvI=", + "pom": "sha256-7hczPyV6AU9abJ92wHCjpfn4tL2ZxInU1ErEkMPFJek=" + }, + "io/opentelemetry#opentelemetry-api-incubator/1.44.1-alpha": { + "jar": "sha256-jb9FHOWA+gJS7pynczH9IXEHEMqbc1oTWSQerTvo6+U=", + "module": "sha256-4xVFUKMLo5DGJMsWRkRzAzGPseeQ2ocO2UGb1TcBvzQ=", + "pom": "sha256-hcOLlNH3DV4pzm2VhFaKae4m3X3nMZcCFsp0FHuxNlI=" + }, + "io/opentelemetry#opentelemetry-api/1.44.1": { + "jar": "sha256-CX4ucci4yBP0oTF2uq+7uxJLElP1yf/9EQvCrddKzpM=", + "module": "sha256-RbSspNj7Vc4bw+hkVvSTGQhRnvRJIb9+zLskhezCVeg=", + "pom": "sha256-KS4M34NNybob7DZvStv+UzZx9DZ3mlfBgshKTLU/PKQ=" + }, + "io/opentelemetry#opentelemetry-context/1.44.1": { + "jar": "sha256-AGs/fDiANWqG8CxA7t66Ek8iai8UX+kEzBt97wCIurA=", + "module": "sha256-h8s/2z9n8MpQ+C211ma7biS2jngCKKCXZD6JuXFQZGA=", + "pom": "sha256-zODnGGvOKSWMYdP68YUjTedaN3g81Lz++gr15YzkCWU=" + }, + "io/opentelemetry#opentelemetry-exporter-common/1.44.1": { + "jar": "sha256-JZtlrcHolpgEtCMlKb1Sy6qr+GBJxATyW841iYAjaWs=", + "module": "sha256-yW92+ff4JJk+mdYynDqOkJULe+ASlBrbPoo0jtK9gJo=", + "pom": "sha256-zBc+te2QVHVmGNUJFoMV9UiNn+doBox0QYX/3fBwFVI=" + }, + "io/opentelemetry#opentelemetry-exporter-otlp-common/1.44.1": { + "jar": "sha256-WJOFzt6Ol0oJJ1PXuvvFr9JujqrZcOl1+1EQZVe9rkE=", + "module": "sha256-K1ONCNGjdLY5Pj6Ucmzad+9FwSIDvt+g3HpEBSG5tRU=", + "pom": "sha256-/n6L61GdAJnLCzn8YmfP8rXdEgpSF92tJtJbvVI+IDg=" + }, + "io/opentelemetry#opentelemetry-exporter-otlp/1.44.1": { + "jar": "sha256-k4T6qDHwgt0QyksJ6xkG+izdiooP2/ylbrtPtNbiBew=", + "module": "sha256-aK04rzhflHG9FcXFzvj3ZWLTSO55JVXtaAMt9AGWP6I=", + "pom": "sha256-xEkzR+8x4M1O7083/BT7LDLOoOZ+kY+c5UZbuZtpKp4=" + }, + "io/opentelemetry#opentelemetry-sdk-common/1.44.1": { + "jar": "sha256-N3D8R37g+rIeeWu1WfCpltOMdE86Fwho0bO4W2O4J9A=", + "module": "sha256-GJDjyaKYoES0Wvc0EfKQ7GN7RLKHJReJ9jbHrWMmbic=", + "pom": "sha256-lSuXrrc9sdi6OocSdRPbY15F9Dy3jFqJY10DCmoyG/E=" + }, + "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure-spi/1.44.1": { + "jar": "sha256-80eK+W5PL1/WAoNSJVPeTOmcA2BqFuRg0HvG7uEvn5U=", + "module": "sha256-RR2LypYXHnQYdi+k56TE+NaVsft0p9/2VcEvR1l0ACY=", + "pom": "sha256-0VY919SNjat3nNL+nHsvMUuDezLjJlT2yvvfvzQCCkw=" + }, + "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure/1.44.1": { + "jar": "sha256-IsMSy/77GmqKsJc/P//oLDJpCJgmSqW6eUH77TM/Rrc=", + "module": "sha256-8Pp/J/HrRfuGKXzUhTVHWdCdSD4toO5+CM3+rJg8S50=", + "pom": "sha256-d8LvW3ZBR/ugGutAqaLHbH5BoVoWB31LRfYqywraQsM=" + }, + "io/opentelemetry#opentelemetry-sdk-logs/1.44.1": { + "jar": "sha256-ukqXlm3tKSfcqubpG/ChcHhn5EzD3Srkx++CFL342vc=", + "module": "sha256-WqzBloLcDuNB5WKaKCnrrdgQ2FlKOddardqk2bSD/Bc=", + "pom": "sha256-ZfhfVBB+2/csorRqovDFeVBl4sdD6nAi2WyWJm6PJb0=" + }, + "io/opentelemetry#opentelemetry-sdk-metrics/1.44.1": { + "jar": "sha256-PAlmipbx6UQ9KJSuRWZ0yMOLIhwJbDkfyBYW2qZyv2g=", + "module": "sha256-6rYDVYnMHynQbSW4JEa6175P6OqXdHjg35UhMe4e1Vo=", + "pom": "sha256-0aP1lEWdRQUX5k6D+dqjIj5RxSfouDGYLpfsDd7OjN8=" + }, + "io/opentelemetry#opentelemetry-sdk-trace/1.44.1": { + "jar": "sha256-/wE6uUVWfcy13eY496NmUZ3vvS0TjfE3CTboR+9gjIc=", + "module": "sha256-GbZ9F2m+2icA2wziDS5OMg+dGMHX3DW2iy2rq2e99M4=", + "pom": "sha256-Yhr6Z+8S2iKViUfNm8JR0vbCfSgzMOu+XKJv6fjscpo=" + }, + "io/opentelemetry#opentelemetry-sdk/1.44.1": { + "jar": "sha256-fGTzMOwZeh64gFm5fck3b9uYNmlQJ8lqDLTnTvkXzr4=", + "module": "sha256-l4xnOlg7C4VWdDijcn/JJ/uxB8zdniLEV27NQ1O8bto=", + "pom": "sha256-mSRNwYlhphYEI96Ks0Gg1cd5VcUrFHoFzLxxz75qrXU=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations-support/2.10.0-alpha": { + "jar": "sha256-+M7F7I2nF9sluK0wctA0PmNvW1uHv/2T2wks+/2/SAI=", + "module": "sha256-SX5VTcazi7yAtwUGYkv4ZHL7gPsSRhBUX/wVCtyVQPM=", + "pom": "sha256-8NVbPyHN3//YXrGy4nd1BuIhLmQEB381sh/GlUJ+/4A=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-annotations/2.10.0": { + "jar": "sha256-kGuirHRxCeRUC9hyN2P8HQxRYAuf6iA7oidqQpWb9tM=", + "module": "sha256-W6mFKXlR/zMxayDtgRXkPLgnZc7N74ijq0y9i88sOuY=", + "pom": "sha256-6QM+fjTF3BegyTlR1hFKejiSr6JyVICuptsHYcgK4n0=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api-incubator/2.10.0-alpha": { + "jar": "sha256-5q0LzuRnSZPxX9ZyACCQ97EI/+lf59otiCmJy+txmkw=", + "module": "sha256-4KjCBqOkKfT0rs73Fs6KntB0IMLRA51EPsvy88qeYDE=", + "pom": "sha256-NqfREgpfdEiRf0BB7HRejvP6aahhCNgmsY3ejoxyskI=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-api/2.10.0": { + "jar": "sha256-qxU1wp+S/Py3Vf35aQTTFxYcauJ9U4Xr6oyOOU0p5vY=", + "module": "sha256-1J2QILHe9JzH4Vp9AvoAIGLSd2/RZdyJ8SpL/hCXdGE=", + "pom": "sha256-KHIpdPydxrwV+ETuAhYEkhpVtI1aalZdmb7GQkuZ+D0=" + }, + "io/opentelemetry/instrumentation#opentelemetry-jdbc/2.10.0-alpha": { + "jar": "sha256-nO9Jvc7m0ndyWZUAQXQ2XXT7MV1zdDVbd00j1zvP8Hc=", + "module": "sha256-S643TODrEX09xYI5IBRQQf2wPLRz+TuEmrmODGsGuB8=", + "pom": "sha256-hchv5iiuk9gYQXQ5oVUtVUj4kMcfTS8KUsBvgq8gDLE=" + }, + "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java17/2.10.0-alpha": { + "jar": "sha256-eIoK0DsirJr24w+rkQNHCAd0Glqx8lrsAP1HQMSQ8cM=", + "module": "sha256-xqxvXJOqGGKNmG7KMw9YcLUPBQ4Wy5u8jt2Af0eoqSc=", + "pom": "sha256-1/247cE3DrnctSvBVqFlNRxYdeZZNYhWfzv39MrOues=" + }, + "io/opentelemetry/instrumentation#opentelemetry-runtime-telemetry-java8/2.10.0-alpha": { + "jar": "sha256-FlgPr5BTL2AXlnesGISpZjrecEf5UEqGcUbQrssyYyY=", + "module": "sha256-NoAo0AwQf6M46e3eyYXb284JzyAwkPpxldArDT4U/eM=", + "pom": "sha256-1S1lVTYZ50/4xiD9J4wPspBZChhRyVFrumhtKX4nadM=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv-incubating/1.29.0-alpha": { + "jar": "sha256-KNFmd+YnvROgJJe63cUjX/86TcmJO25xDaXX7n+OkRs=", + "module": "sha256-UQnQAW3PUDYkHNqJFISYO+QYwmqPq4c3a6XprAIyxyo=", + "pom": "sha256-bGXZkzdvLC9hRrir8BYts2lbnWXteUOYnr1O5nlUHec=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv/1.28.0-alpha": { + "module": "sha256-a+M8eGFUBbP+AKl/Kq/heNGT8/GXgbsMnS1BDKtMs/0=", + "pom": "sha256-WxMz4G1KPsra2LV6BJfZU4gLCL4fTBlKHR5ql2yE5VQ=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv/1.29.0-alpha": { + "jar": "sha256-qV8a7X4/ZDU+xiXG3vcqDKrwa2xTlw9Xj91RPa/Zlf0=", + "module": "sha256-uCvms5s/HXFPu90Te+mLagSeocjD/bPSRP+4YlGYOmg=", + "pom": "sha256-ritWG/POdHQlww2QMVMJt1fV/Qn/GVykQE5XSadm8hs=" + }, + "io/perfmark#perfmark-api/0.27.0": { + "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", + "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", + "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" + }, + "io/quarkus#quarkus-arc-parent/3.27.1": { + "pom": "sha256-r+Hy3BjQ0h4WmNEdMfWvqvH/y2qGBuP/rVWHUOiCzJg=" + }, + "io/quarkus#quarkus-arc/3.27.1": { + "jar": "sha256-S+KuUy1yMtViIe5+Dl7vDOROCwLFYTlh7f2q+vAl4Uk=", + "pom": "sha256-sj5Fn2K/Q4n4CDLsu+S0sndYsatMZjWr9Gc/BIFpC7Q=" + }, + "io/quarkus#quarkus-bom/3.27.1": { + "pom": "sha256-ic2cgol50N/WCG53Rw+dv2CpvFwC4+I6S4hh6to26vE=" + }, + "io/quarkus#quarkus-bootstrap-bom-test/3.27.1": { + "pom": "sha256-SuT+6+5SQplL2pTWVuM7oOwm8cl0KD5ivRMAKoDNofA=" + }, + "io/quarkus#quarkus-bootstrap-bom/3.27.1": { + "pom": "sha256-41TAMHxEga56DfKpfTy/f7E9z1gzQmNvXGHPlHdzhx0=" + }, + "io/quarkus#quarkus-bootstrap-parent/3.27.1": { + "pom": "sha256-PnAy4WfoK+CG+M/d6cWX4fxMEspy3UgyBuVKwe07Kpk=" + }, + "io/quarkus#quarkus-bootstrap-runner/3.27.1": { + "jar": "sha256-bkZqKVQOOCGzCHFNhS42nk4pksXmJFu8k/N5aDUf7cc=", + "pom": "sha256-LVBxXS6bD71Herqo/X5otezJf5mQ5GWSpdKH5p9nypg=" + }, + "io/quarkus#quarkus-build-parent/3.27.1": { + "pom": "sha256-i/dMvx3yTW3Na0BPk5gIs5X4LwV9QBi7iN3XCH1QaYw=" + }, + "io/quarkus#quarkus-classloader-commons/3.27.1": { + "jar": "sha256-tvj6OuYXuPm0drE0RYEaF5DJVyEw4Iwdw+xUCvAN1Tg=", + "pom": "sha256-pVhBcPuOEnunyM58orVoFFiqWBi/diaFO5oXmvEDUQY=" + }, + "io/quarkus#quarkus-core-parent/3.27.1": { + "pom": "sha256-AqCmkFLzkc5pJgJXlnyZSC+GVVtphw9TtG94ArzQC6A=" + }, + "io/quarkus#quarkus-core/3.27.1": { + "jar": "sha256-vquzQtI6cQY61ffEsJhdX8lZPxkbmmF2dnGmwrPC1AA=", + "pom": "sha256-gMiPhJuvoaJk5c3GDSM03kaZuaep37xh8BKEAQcSwhU=" + }, + "io/quarkus#quarkus-credentials-parent/3.27.1": { + "pom": "sha256-5LqD5xw19ulq6raZ+0Lj9WEeAzAfx6KCRMq/2w1ajDE=" + }, + "io/quarkus#quarkus-credentials/3.27.1": { + "jar": "sha256-RV2rOiUQwoqxAneuY1Ja8mRqSxBaYxnoQadVlOXWvQw=", + "pom": "sha256-Ta/o/0o264J9wgLgnpva8Kw75UG/x5RhjPNWP+4nqSo=" + }, + "io/quarkus#quarkus-development-mode-spi/3.27.1": { + "jar": "sha256-KYQeqIU8rGPKoDdP70flt4fnLiPLn2kfPcwLaTyaAV0=", + "pom": "sha256-08R9mFvm97gLRlOmVcXSpaWCaE6LmdqOrU6DBXhLSjc=" + }, + "io/quarkus#quarkus-extensions-parent/3.27.1": { + "pom": "sha256-AL/j47l8ooM2I4PqlAqQ6GMJ9wDu0r2nPKa/7sFMNAY=" + }, + "io/quarkus#quarkus-fs-util/1.1.0": { + "jar": "sha256-UVeS4sJh5wS1wFK+If2qnMQ6pf2FiN9Tzy7dBx/Z7iY=", + "pom": "sha256-b3vzqQRLngi5QKZ4aONBjJrTtaUw4L92iMJpTR4jYK4=" + }, + "io/quarkus#quarkus-grpc-common-parent/3.27.1": { + "pom": "sha256-ATBpJ84MCd1dbs9n8I9+6+TChHoOSoGfd1lEqyMHF1c=" + }, + "io/quarkus#quarkus-grpc-common/3.27.1": { + "jar": "sha256-tBgyjQj4Dkntr2ElV4n+OSWfdpyBlf4tYc3MCPLQpF8=", + "pom": "sha256-t7qidlYUCqTpKQg6m5jbwxWtTdquIMw7jqNghRxGs6U=" + }, + "io/quarkus#quarkus-ide-launcher/3.27.1": { + "jar": "sha256-WGzMWDNhLILgmNcD8f69E8OJKXsizxw79rui7m2XQCc=", + "pom": "sha256-sZonPJXUOMg93h052ulF3mOyienRjJezqgAZLifFgUo=" + }, + "io/quarkus#quarkus-mutiny-parent/3.27.1": { + "pom": "sha256-4fDk629gp9colHbBpBYXbC29Yg6pparY9rN2p7gM8t0=" + }, + "io/quarkus#quarkus-mutiny/3.27.1": { + "jar": "sha256-Wa9V7q4wnBRjRtw0opZAWdEw8YDyDtca8fqbXknreEc=", + "pom": "sha256-OBw67j40/cj4cwshiLbXJfkWTzU9oJVYKoIQOFa8R80=" + }, + "io/quarkus#quarkus-netty-parent/3.27.1": { + "pom": "sha256-ZJ3QhMKK1c0ybVhKcD7O8MZoqpEMHh2lPZ1yFNzJ+kI=" + }, + "io/quarkus#quarkus-netty/3.27.1": { + "jar": "sha256-eOuqYoIrJk0n1WsHH8W/Wej1FRn0gqzMGjsKkOasxXY=", + "pom": "sha256-aoNgfiRQ3/ySdDIQz2KHsfVVkykRiXvlfEEjCjdk7n8=" + }, + "io/quarkus#quarkus-opentelemetry-parent/3.27.1": { + "pom": "sha256-FDRhOYZblfU3H78qu7Kaeg/hrhC1qMRdKZcBJtRjEZc=" + }, + "io/quarkus#quarkus-opentelemetry/3.27.1": { + "jar": "sha256-TccC56imxwSa79eSZsM1j3D1z8bpAFHXx+Epz1VzUTQ=", + "pom": "sha256-EhcHh+DF3S6/FtlXeQ95eImZSedMBG6AzFwr7kWbC6A=" + }, + "io/quarkus#quarkus-parent/3.27.1": { + "pom": "sha256-aQJC4vk6U1kcqebmETu9x6BuaHcVI2gxVlcHeD09rFE=" + }, + "io/quarkus#quarkus-project/3.27.1": { + "pom": "sha256-XZ2SuvTsWMF+8kyCuC/Mu1otcV17P6qV8QfrAOVx2fM=" + }, + "io/quarkus#quarkus-security-parent/3.27.1": { + "pom": "sha256-/rbLSu0vEByzvOoa89+gLoHfQEXM5A3VCDTsrDaJBa0=" + }, + "io/quarkus#quarkus-security-runtime-spi/3.27.1": { + "jar": "sha256-bahwghgxPVoHqybwm3ARXMf8fan17WviCwQTMHwOTUA=", + "pom": "sha256-eDWfYKR6nRue9h/VFOQ6ZSG2nymsfLTcAgtl8kZDbdw=" + }, + "io/quarkus#quarkus-smallrye-context-propagation-parent/3.27.1": { + "pom": "sha256-bIPmNx+8faZa7GzEk2xgi8hTudJMpcX/7Ku48hBIPSg=" + }, + "io/quarkus#quarkus-smallrye-context-propagation/3.27.1": { + "jar": "sha256-78RAqAHk8YcLVRxj/87yT2O7TFxtbwHxiP71ddCagv8=", + "pom": "sha256-DbWuY2oMAdOI/oXi6Aeh4S/B4NqGAN4nJyMpgy2BYFI=" + }, + "io/quarkus#quarkus-tls-registry-parent/3.27.1": { + "pom": "sha256-8PmG4m64Xu7/YDJ7nslzA5pVlNibbXk+sw5Hw2Nujtk=" + }, + "io/quarkus#quarkus-tls-registry-spi/3.27.1": { + "jar": "sha256-AcDTssFYrwsKZRRLj82akg84+LV/9sgTe16NikVOEJY=", + "pom": "sha256-4P0BVMC8mvJ5gr3wZHnPhXLK6VxXdJjCFk372ylkqJI=" + }, + "io/quarkus#quarkus-tls-registry/3.27.1": { + "jar": "sha256-RM8NWfK1aDU9s8xAa9cnF0n4wZ6X3Q1glm8oQ1yfXAQ=", + "pom": "sha256-joJAcS7zcwoLie7o/XmPCWjTEoTKrgxbhP9KOXzyqYU=" + }, + "io/quarkus#quarkus-vertx-latebound-mdc-provider/3.27.1": { + "jar": "sha256-lYG3JcmSE5QU5w0yddTBFteOr5+76NkmbmZCVU48vIw=", + "pom": "sha256-7cHLybq1IlWyKODz37U17bnkeEsfA/F2Lk8lCxeeC0E=" + }, + "io/quarkus#quarkus-vertx-parent/3.27.1": { + "pom": "sha256-vraDDs16B9havTqUhKmBYMyiKwfiHzafHBOs4Rv7Moo=" + }, + "io/quarkus#quarkus-vertx/3.27.1": { + "jar": "sha256-MXhCvYIKlsoVWeVjPJ/qUGWGOqm4ShZWJa4QzOe+7gU=", + "pom": "sha256-ipj01ZM9buhM4iYAkvVTmhJ69Zb9LEp5Sp0HjQTSI1s=" + }, + "io/quarkus#quarkus-virtual-threads-parent/3.27.1": { + "pom": "sha256-tbV3LVxACcbKSif/FSPxnuwREInFliWTb4eEaEaKCHI=" + }, + "io/quarkus#quarkus-virtual-threads/3.27.1": { + "jar": "sha256-nFsg/8wBVE6o9Zafk3VrlvcYff/hm9B3n474OMhzchM=", + "pom": "sha256-D7dc1AZNuhnkns7sSQC8mkY24aMtdC5K8cYIgkFMUS8=" + }, + "io/quarkus#quarkus-websockets-next-parent/3.27.1": { + "pom": "sha256-M7QoaUhK3FVN1LL+C9A8eKOK82nHtWM59AJGJylvtHw=" + }, + "io/quarkus#quarkus-websockets-next-spi/3.27.1": { + "jar": "sha256-ieUFqGTfVK/smA2Sx4GoPUCUWHvlHOBqXUr5RouJYQ8=", + "pom": "sha256-ir5mMbxgTbc5CKl+VT8xEbQG0j0YFg7lvuzmSpgc+2I=" + }, + "io/quarkus/arc#arc-parent/3.27.1": { + "pom": "sha256-RLsMrAX3FOcOWQ7t39YS7AJo0clPMLgp0JS+KGobLf4=" + }, + "io/quarkus/arc#arc/3.27.1": { + "jar": "sha256-QNVht1tRjvE3aBA7Ees//i6lII4z2xERvQSr+wsE0Zg=", + "pom": "sha256-QvLyd1g/azcc1ZtnTZBMI3NC5ksaXcKtHcdwpOVGMsc=" + }, + "io/quarkus/platform#quarkus-bom/3.27.1": { + "pom": "sha256-HSMAeLG5ZadDG4+U+JqlQfsxKs//zlAppjKh9RbXoIU=" + }, + "io/quarkus/security#quarkus-security/2.2.1": { + "jar": "sha256-tQIPb8xQbS23HBesaFTMOpB4wLc5UpGASNHyy7Sn2Pg=", + "pom": "sha256-61QM6rzfhW8vhd1hzXDVDrIYSPb6mMFcSR/5ngWVZ+o=" + }, + "io/reactivex/rxjava3#rxjava/3.1.10": { + "jar": "sha256-6fJW+egFVy3V/UWxQNs2DX3ERNDDgwSbLT1+vwXYSqs=", + "module": "sha256-rwV/vBEyR6Pp/cYOWU+dh2xPW8oZy4sb2myBGP9ixpU=", + "pom": "sha256-EeldzI+ywwumAH/f9GxW+HF2/lwwLFGEQThZEk1Tq60=" + }, + "io/setl#rdf-urdna/1.1": { + "jar": "sha256-xXoq5VG9MB+E+vEBAlHZZRCkDisA2IPobN0tDfpvAa4=", + "pom": "sha256-A9Ntu7P+61HJhioDg6G/JMnvI/3MM+IaPi3iAxE/OF0=" + }, + "io/smallrye#smallrye-build-parent/41": { + "pom": "sha256-cMa/huHu5E1o5zmJYoghjLU6mtI+GNJHp5FBXKdyfGU=" + }, + "io/smallrye#smallrye-build-parent/42": { + "pom": "sha256-FBJFawNFSQ+NC00L5SnQSh1Y0Z1a2FvzHDdAwT+Q1t4=" + }, + "io/smallrye#smallrye-build-parent/45": { + "pom": "sha256-1vPL5JFUM6LZ9bmsEjjul17d+7En3yDbdpRpCKBMXys=" + }, + "io/smallrye#smallrye-build-parent/46": { + "pom": "sha256-FP8daINJaqcRP89+Fv5Whyr1hL2g2G16nreXQkW4zFE=" + }, + "io/smallrye#smallrye-build-parent/47": { + "pom": "sha256-1xrwHMwBPiiKiVx5tegErdaADy3r6NWXUSAaYsqt5Bk=" + }, + "io/smallrye#smallrye-context-propagation-api/2.2.1": { + "jar": "sha256-oTFH8wXUh5B0wHOt/YYdBwdieLGPH4AQrNgf2KIfXLk=", + "pom": "sha256-Xv/VEJ3oz9ZYvhkePAgHx9ri8OOcFIZslJzY0JxalWk=" + }, + "io/smallrye#smallrye-context-propagation-parent/2.2.1": { + "pom": "sha256-5unin/Ow22Q+mTxqico0Edh7FxMlbOd/3yTn6hcIxps=" + }, + "io/smallrye#smallrye-context-propagation-storage/2.2.1": { + "jar": "sha256-OzR7tXyOyT7SN1rnjySQj6C1QaEQ3oCv22PzJaXIpwU=", + "pom": "sha256-Z5IMHn2OUknNWtW2siSG10hnnAYml6unH7a8YHPrRxg=" + }, + "io/smallrye#smallrye-context-propagation/2.2.1": { + "jar": "sha256-kfolPYvZA2cvMLm80DqX8DpzSZ9aftH9PQPQT1NIVJo=", + "pom": "sha256-THy3aKr/jqdJXTUy9VVqP9wjaRas02QbF3745PJs2OY=" + }, + "io/smallrye#smallrye-fault-tolerance-implementation-parent/6.9.3": { + "pom": "sha256-ZVqovQk90r2ER3clp+IuJFvrUzHhXUpuX9W4rhH66p8=" + }, + "io/smallrye#smallrye-fault-tolerance-parent/6.9.3": { + "pom": "sha256-r/x2bbL5uacuQnzsKg0tZn0Lq5CohWTmPxv62is8yGA=" + }, + "io/smallrye#smallrye-fault-tolerance-vertx/6.9.3": { + "jar": "sha256-QQh8osz5wPJY3zY59uT5WbeRFZbQ8XXulCeNWbxIhKA=", + "pom": "sha256-hhpJklfkS8MRa9DJANGSPAzHh8JI3RzG7YMm/4EvCXk=" + }, + "io/smallrye#smallrye-parent/41": { + "pom": "sha256-ioaQNk3oDebPDRAahYPpMb6E4Ej6OHw5i79upl8lrQw=" + }, + "io/smallrye#smallrye-parent/42": { + "pom": "sha256-EGQjW60r3LUZiEslMIbPyqQ0Ft20fExszkIVadt5ooU=" + }, + "io/smallrye#smallrye-parent/46": { + "pom": "sha256-SwaHf4gDT1Nv8tl97y0zlQq2ROCZFWOb6lOPasl+je4=" + }, + "io/smallrye#smallrye-parent/47": { + "pom": "sha256-5kq1jZ4QolJiHzARt1x+dbNHmlvOiBoiuO+msH4EhDI=" + }, + "io/smallrye/certs#smallrye-certificate-generator-parent/0.9.2": { + "pom": "sha256-8aCsVJaI1GhDzzDhM3F6Gck17ytxXVemI6lfpzyjG2c=" + }, + "io/smallrye/certs#smallrye-private-key-pem-parser/0.9.2": { + "jar": "sha256-S6mOku0gNZPYfjhKHgn6lsGMkBc6YXD+pxzyOhycUoY=", + "pom": "sha256-xGmWD+xR7AjjvWN3l2QsRK3yIAFI0x6DJCLmU6XN/o8=" + }, + "io/smallrye/common#smallrye-common-annotation/2.13.9": { + "jar": "sha256-rT7/FbRvv4G7yVMVFEZAd0veeBfC51mBIwof4563Qpo=", + "pom": "sha256-SFvgX+ekxY65Ejs7GOv0QO5jwAHwaG65RJoQ9cRz6ek=" + }, + "io/smallrye/common#smallrye-common-bom/2.12.0": { + "pom": "sha256-KO214eRveaA0DEcf1MV3AV7+xXqcDC7wP+lNsuMh+vA=" + }, + "io/smallrye/common#smallrye-common-bom/2.13.7": { + "pom": "sha256-ONZLzK+YWJ7WHBXQo4w7Z6WQytJS/Hef5SZgk++Da7w=" + }, + "io/smallrye/common#smallrye-common-bom/2.13.9": { + "pom": "sha256-0HBc+5T145lqWx69/t6T9JGe86VS9nwcccsf0gbleRQ=" + }, + "io/smallrye/common#smallrye-common-bom/2.2.0": { + "pom": "sha256-qLCcNrWIuSXIMKhUV+75cVVOQk4H6wu+1GnGruoLiAk=" + }, + "io/smallrye/common#smallrye-common-bom/2.4.0": { + "pom": "sha256-puGY/JfU0KDHsxCSPhkTTjS6+jHmpG6CcmYDwLxeYow=" + }, + "io/smallrye/common#smallrye-common-classloader/2.13.7": { + "jar": "sha256-UauhPN7KCsXFLwPBgM+ovgm3BSYVM/9wKIxt8BpFeds=", + "pom": "sha256-PgSr+3GjSeEcYi8sYv5Ac2Nx7buorTcgLwf9JbnJN4k=" + }, + "io/smallrye/common#smallrye-common-constraint/2.13.9": { + "jar": "sha256-x11vzsuGdIAQbtFmB/A5MHiIOMT9lZ0R4FqRbl6uOgE=", + "pom": "sha256-atuj2SyHn4RCf3M5FqHGSvF4xjirIUVBd/kYMXPj0EI=" + }, + "io/smallrye/common#smallrye-common-cpu/2.12.0": { + "jar": "sha256-nR3X1CNMWNiRmNd3+hxretVTNm9fY1S4HNwjIE73cJA=", + "pom": "sha256-++jCL2Z7E7lT9AFC5AWZmMBunYdM9jxZweAlErHvBoQ=" + }, + "io/smallrye/common#smallrye-common-cpu/2.2.0": { + "pom": "sha256-0mGDziGlS1zTx9LyEZ18DDFLgs5OLXWsXHze+sQBK4M=" + }, + "io/smallrye/common#smallrye-common-expression/2.13.7": { + "jar": "sha256-QF4QVDL9FaTbTTzx+Q9bIRfSEohb4p4D5haG5NkZQPQ=", + "pom": "sha256-NEoEFG5anaEB6JLhnh4ThyxQvRAkKxudJX3/zkBXQa4=" + }, + "io/smallrye/common#smallrye-common-expression/2.2.0": { + "pom": "sha256-1uROh7ttspfOvjlga2s3qaLbDTShf2sLmZxAWDsNL1o=" + }, + "io/smallrye/common#smallrye-common-expression/2.4.0": { + "pom": "sha256-wBzAQOvkRjOSkKdFwFvU4nykStE1TbF/g9VpXEMeErk=" + }, + "io/smallrye/common#smallrye-common-function/2.12.0": { + "pom": "sha256-dYYLzV8fA29BYMyMqrNw55t2iend1Q0hDHey8gtBpDg=" + }, + "io/smallrye/common#smallrye-common-function/2.13.7": { + "jar": "sha256-xj4w9o6RJSiMT8DXcrpWHnKSjStsKiJYHM1GbfRaFz8=", + "pom": "sha256-8s3BlLdddMAJQzF6Kquv0cpz5w6XmX3qw5NZHRaq7N4=" + }, + "io/smallrye/common#smallrye-common-io/2.13.9": { + "jar": "sha256-YTJRL6HDLqY7nw2stfuF9dQY8ltwh9iNtu0pRWCoiOs=", + "pom": "sha256-qmB8FWWNw3VPNWFw0ChKzMv/Zrk3NxxXiVwVdoCN8EE=" + }, + "io/smallrye/common#smallrye-common-net/2.2.0": { + "pom": "sha256-Jamu9WCWh9aY0pXM6SMr+10GTXH80kb/I90yHXGFhas=" + }, + "io/smallrye/common#smallrye-common-net/2.4.0": { + "jar": "sha256-wwPBS2+Nz+u7O/IwwcKU5MP5kOBgtKLHDo/86jyabe4=", + "pom": "sha256-oLeuxpBtgIykODX1QIJb9Dr0HkNX3Me6dcvHfuWnqLM=" + }, + "io/smallrye/common#smallrye-common-os/2.13.9": { + "jar": "sha256-jeGEbKBnSimc1sN/ZpFM5yVpAZtXBiZ6o5Y85o/YezY=", + "pom": "sha256-/VEGxFrO4x3T4EHrCDwmAhplmKAwLqy2hnrGWOsiU0E=" + }, + "io/smallrye/common#smallrye-common-parent/2.12.0": { + "pom": "sha256-Lgu9gF58//pkt4GMZmEetxMSC/EiijO5MUeaFhw3VCs=" + }, + "io/smallrye/common#smallrye-common-parent/2.13.7": { + "pom": "sha256-HekbICMWPsNipJy1t+4sfdx0n5xJUZuvx9W4RnqWMxQ=" + }, + "io/smallrye/common#smallrye-common-parent/2.13.9": { + "pom": "sha256-98YjrNoF1DADFDNl04nV4UY8i1KmDv2uTvKzD2TSBfc=" + }, + "io/smallrye/common#smallrye-common-parent/2.2.0": { + "pom": "sha256-JMv8O0a0/z97onRjG26HpkFt0rKzCLfu7JarZYHeBJc=" + }, + "io/smallrye/common#smallrye-common-parent/2.4.0": { + "pom": "sha256-snO2sOWvRzileVZ+dA4krJON7RD45EbT26GQ9xhkT+E=" + }, + "io/smallrye/common#smallrye-common-ref/2.2.0": { + "pom": "sha256-/Ix5ya3YlCcd7MU2ZM+mNevQV/XIZu7kqu9046VKC3o=" + }, + "io/smallrye/common#smallrye-common-ref/2.4.0": { + "jar": "sha256-uZAtmbUqRjzDhREF3d1Y1A9YBzUGSLmWrhYasUEjQnw=", + "pom": "sha256-wMVVPQElarUrmuLe57dismveONfMkHaddTWM8+Cpo4Y=" + }, + "io/smallrye/common#smallrye-common-vertx-context/2.13.9": { + "jar": "sha256-LwDDSoNFiipQVkJZNJnm4FxQlpTyMIcyr13ZFgrRBU0=", + "pom": "sha256-wCsRlq7H/o/kqsXkYgZXvgZXbiq55EjXZMw09N9Hh0w=" + }, + "io/smallrye/config#smallrye-config-common/3.13.4": { + "jar": "sha256-/T+28GCdLLldJhGZEhZfiQNhIDkv95yr4Lwkzbes2lE=", + "pom": "sha256-ri+qhPtc37XPeMq5BL7OtXC+zV6cZrno743VPOq7fL4=" + }, + "io/smallrye/config#smallrye-config-core/3.13.4": { + "jar": "sha256-sqxThIRLrnmLQMVwV/Ex63J1T7aDZvsJK9pdkT7ko1s=", + "pom": "sha256-WM2maEKhpej+6b1VbAsRFu2IOJlbvATOOpwTPiKQdrQ=" + }, + "io/smallrye/config#smallrye-config-parent/3.13.4": { + "pom": "sha256-O/t/MY3foMxv7MzAXEEYzA86wXVbDQRacvnfYb06AGc=" + }, + "io/smallrye/config#smallrye-config/3.13.4": { + "jar": "sha256-yo1vsLAg2HS3B/LEoT1kktYup//6lf4DwED1U/d5mPQ=", + "pom": "sha256-Ps7R2beSYvTpJIKLdp0T9bBzmDyR56XPLxpMBT66/Nw=" + }, + "io/smallrye/reactive#mutiny-bom/2.9.5": { + "pom": "sha256-fXWvERRq4a5zlsXsV2GOaue600OsxjqPJ6f26yd7yZA=" + }, + "io/smallrye/reactive#mutiny-project/2.9.5": { + "pom": "sha256-7d/eBJRqr5SzYVp4D+fNSxg9xAf9NB+fAD2zjxzYfqE=" + }, + "io/smallrye/reactive#mutiny-smallrye-context-propagation/2.9.5": { + "jar": "sha256-cxHvP49PQO/RuMKr/oecwoeojLahwz66bIGetDLLP+k=", + "pom": "sha256-f/QMyqIOqZ2jTbAKmH6RPRnICX2El3WtMeQxOMuMjZc=" + }, + "io/smallrye/reactive#mutiny/2.9.5": { + "jar": "sha256-fj0axgFs+xUm2OSav0i7cr91IwXmzX9WCfnT914EvZA=", + "pom": "sha256-cFbpIIxnrcli7KWljCsj7jk4tHMSHu6ZUbkMyaM0DQs=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-bindings-projects/3.19.2": { + "pom": "sha256-CzmbH+pkPCpnDicjtlehqh10I7oKsj/FSS2Y86yyzow=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-core/3.19.2": { + "jar": "sha256-qcfKgb1b20YNpCzEk9JWBJ3BVEKqKB7z+pZ66IrF5Dk=", + "pom": "sha256-PIT7fs/5TJOmACHVYXqDzKS2b4q7X8uS7WVKHDXi6RM=" + }, + "io/smallrye/reactive#smallrye-mutiny-vertx-runtime/3.19.2": { + "jar": "sha256-tje5sU0FQ20qNhx9uv/lLg7tZoBavJkhwb5Tj8uXX5U=", + "pom": "sha256-QiNzICjfVvzW8IWKpJ+gCp2HT8MzpjgsYaS5YKOQjRo=" + }, + "io/smallrye/reactive#vertx-mutiny-clients/3.19.2": { + "pom": "sha256-e9l/JtUJFNpDZVvmrytUYm/od6HyKd1uoCph+t69EEo=" + }, + "io/smallrye/reactive#vertx-mutiny-generator/3.19.2": { + "jar": "sha256-WVckM8inxyrm31HfR9Atpo1CyEnf9RMZ2CEOL+gf1lc=", + "pom": "sha256-JoZP6CzDJMcnyKZ0NJMSUPKBBDf/7Nf3KPMPS9KuLVc=" + }, + "io/smallrye/testing#smallrye-testing-bom/2.3.1": { + "pom": "sha256-PXfwZzfjRWwgi9zmKzccfsRYz2+9vJgWQIPkiFC4Mf4=" + }, + "io/smallrye/testing#smallrye-testing-parent/2.3.1": { + "pom": "sha256-vxksWNysCIzuwC3riPu+eC7iNx4N8hZh6lXPR4kZNdE=" + }, + "io/vertx#vertx-codegen/4.5.16": { + "jar": "sha256-wudmVKG/xxEBG9dDXEhWWGNdEsC06uxBNoSEmczCn1Q=", + "pom": "sha256-/cs+rzdQDBvFRtu1tV8ScKlGlkio6RfV+M1kyAfnLmM=" + }, + "io/vertx#vertx-core/4.5.21": { + "pom": "sha256-AIylD5wQ4cMOKU0Yv+2Y7/CGiZwLS/n32Ns3RUBKbz0=" + }, + "io/vertx#vertx-core/4.5.22": { + "jar": "sha256-bB9vFYrSFHY7EV7v7KFS5hl8UJeVN5bj4GCJpfxmx3Y=", + "pom": "sha256-wsD6yOTRZH8l6qULgpsrBnuZOuUgBZHbuQLdRdX3ij4=" + }, + "io/vertx#vertx-dependencies/4.5.16": { + "pom": "sha256-tMhz4Q689VFGlzc5mGbEQl5jxFF49oUIcjZfh+4CaDs=" + }, + "io/vertx#vertx-dependencies/4.5.21": { + "pom": "sha256-RoNO1Vlj5RBbGeXMUF8j3MIvQpoVPxfpCAxSrIJi34s=" + }, + "io/vertx#vertx-dependencies/4.5.22": { + "pom": "sha256-U+GlkteyIh9ohiOVtLbaA/DBgAt+tRusu12VKc2UIMw=" + }, + "io/vertx#vertx-ext-parent/42": { + "pom": "sha256-VPvxEeodETa2f+Y4RC3Eezw7ecBZgtdJbcMSpeYtyQc=" + }, + "io/vertx#vertx-ext/42": { + "pom": "sha256-MNosN+ZU8G39XLc2XbuXawmGgNc4PtcVnmP5Ysbvoro=" + }, + "io/vertx#vertx-grpc-aggregator/4.5.22": { + "pom": "sha256-R3D3MtyQl5KPEOsJIdjPXBovmTGzFQkGo6nWGWQeaRk=" + }, + "io/vertx#vertx-grpc-client/4.5.22": { + "jar": "sha256-nvyN30Badsh/HgJjO+lzUrrPHlk4FKDLJwdkRvMO6Zo=", + "pom": "sha256-Ih+tXAnSuv0wB3oRM3J7YkWbzlqROggkJ2TCznixp4o=" + }, + "io/vertx#vertx-grpc-common/4.5.22": { + "jar": "sha256-zUBB3ryzoL5+4opkYZcImYH2HeIX6q+VZ/O4B+oyqvI=", + "pom": "sha256-chScFwdbbWHREqzwqiRPwLtKHVYntJIvFJFO3p+6Nvc=" + }, + "io/vertx#vertx-grpc-parent/4.5.22": { + "pom": "sha256-xIu0mGuT2E7ar4505VDYd5KNFXrARSr5PkuBa4uUKSY=" + }, + "io/vertx#vertx-grpc-server/4.5.22": { + "jar": "sha256-GOFss0HeqpRDfvngfGW/qJQ1v279hws/Xso8bm6k+Vo=", + "pom": "sha256-0+m3LUk/WvdU8TdqUFaOvqfJqT2w8q4YwWdmfZYX8hw=" + }, + "io/vertx#vertx-grpc/4.5.22": { + "jar": "sha256-CABnjN9H+ajYOzq7Z3H0d4/Eyn3+qi2LsKkxuy0SOQ0=", + "pom": "sha256-nOrng6qgdfJsb+hMkh7f/pZ1CGtI8HeyustVaB6faYc=" + }, + "io/vertx#vertx-parent/22": { + "pom": "sha256-0RFbFBZdLwS0RoW7RJhQ3l9Yd3EGWjGJWK/Iwvv9hv0=" + }, + "jakarta/activation#jakarta.activation-api/2.1.1": { + "pom": "sha256-aTJZ+O/tqXSHm/MFz3HPELZUjYxvZ6ufNYyWrUfnygA=" + }, + "jakarta/activation#jakarta.activation-api/2.1.3": { + "jar": "sha256-AbF21xihaSY+eCkGkfxHmXcYa8xrMzSHMlCE1lhvRic=", + "pom": "sha256-slSZQMF7aGWjT2E1t3Iu2Mv+9tC2wNs3LDDwNGvIzVg=" + }, + "jakarta/annotation#jakarta.annotation-api/3.0.0": { + "jar": "sha256-sB9VVSKEz7FJQR5k6rynXpQtJtLheGsykUJQ5DMK+qI=", + "pom": "sha256-n8Zqhzdd+EQ6umvcwdT/B/EmVCWDeFpIKpJioZv+jq4=" + }, + "jakarta/el#jakarta.el-api/6.0.0": { + "jar": "sha256-8z0L7PLVUWcwulzJmntaKx9imGvwozcCSc3/mi8XFQc=", + "pom": "sha256-JsZmqRV0htvE3C6xnzuAhWDdvAukVyVNY/JcjascZtA=" + }, + "jakarta/enterprise#jakarta.enterprise.cdi-api/4.1.0": { + "jar": "sha256-xCyAjxeSUSmggA9hj+vgUNlm4YGkxzhMil56AoPWhpk=", + "pom": "sha256-1GTYSDGOBh0SNkQit1NHz8i8vSlEfbZIDTbx0CWAmFw=" + }, + "jakarta/enterprise#jakarta.enterprise.cdi-parent/4.1.0": { + "pom": "sha256-4WQl8r2D3YcdpwRKpRQBb74SBdpfsVTl2tFEtrNjgvE=" + }, + "jakarta/enterprise#jakarta.enterprise.lang-model/4.1.0": { + "jar": "sha256-u1b1cfYNKGKyOH1UaP6PVUD4CUcnKD7ZkfiQgnCAle4=", + "pom": "sha256-/2xEh5kCTGlLrItSt97jsfJkoicYpeKvTdTV+0LJiwI=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/interceptor#jakarta.interceptor-api/2.2.0": { + "jar": "sha256-0kDXK03Tii5DHIBAeYEAEMuXkDZ4+l+Yf7dDSHiwQ5g=", + "pom": "sha256-jOOOxhmprbgI0qjQay+mLYmkNC5/Fu125+m7uzcypvg=" + }, + "jakarta/json#jakarta.json-api/2.1.3": { + "jar": "sha256-vJNBQoBeodeU8UQFY5ZaOGGiqft0FOzT/kTyZQBzRBQ=", + "pom": "sha256-QWpzlxOFoL5D+dqKR3qmT0gUrFIYfYjz4k8hW3+J394=" + }, + "jakarta/mail#jakarta.mail-api/2.1.1": { + "pom": "sha256-LApZ7RKeEs7aDkiIohPfsaBthZGa/OzAzBwKPUNqIqA=" + }, + "jakarta/mail#jakarta.mail-api/2.1.3": { + "jar": "sha256-gFG1jXX5gvmluWOzdlQm6CSypkhl7wrxcgXkVbmNsFw=", + "pom": "sha256-/r52PsEKgXMh7LFdqGyx+8mVx+NS4cET8P01fku1eYA=" + }, + "jakarta/transaction#jakarta.transaction-api/2.0.1": { + "jar": "sha256-UMCnx2DBOubAQqzxgrKPAEdBPblbRjb7iHm8/6tbqHU=", + "pom": "sha256-X+NJmBwVb7viY4jVmUn9rBa7jXh57mGzTEnHtc4PLyM=" + }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "jakarta/ws/rs#all/3.1.0": { + "pom": "sha256-1P3UF4DgZarNWsCZzQSQFxk3zFEi3CyO8biKh7PJQkw=" + }, + "jakarta/ws/rs#jakarta.ws.rs-api/3.1.0": { + "jar": "sha256-azs2KLi0rt2g0kwzVDNemFSX2O88UQuPMCjpINW4Zj0=", + "pom": "sha256-xpejA+n/wxlj6xwnW793pYOn1IKWWsTxuybckeWV/78=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api-parent/3.0.1": { + "pom": "sha256-nx+11KAun4/dYu876rlLj+p7gWQ3SMhvaKMfQPd0rVY=" + }, + "jakarta/xml/bind#jakarta.xml.bind-api/3.0.1": { + "jar": "sha256-uPtL7j/1tcHvdxRNhBExYBjXu9Qfzx7eBkb3l4VGuGc=", + "pom": "sha256-onPayXQUEv2dzM6ZESmHBteJ5YLcs1GXB19v0qWw6+o=" + }, + "jakarta/xml/soap#jakarta.xml.soap-api/3.0.0": { + "jar": "sha256-MxJOmNcktp4Wc6YWdcIFtYw3JgX0JU1FWxKzc5ghmjc=", + "pom": "sha256-L2a6M+MGzpKyLnvPRW0S5klOepfRijqNS+rbt4Gdzdg=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "org/apache#apache/18": { + "pom": "sha256-eDEwcoX9R1u8NrIK4454gvEcMVOx1ZMPhS1E7ajzPBc=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache/commons#commons-collections4/4.4": { + "jar": "sha256-Hfi5QwtcjtFD14FeQD4z71NxskAKrb6b2giDdi4IRtE=", + "pom": "sha256-JxvWc4Oa9G5zr/lX4pGNS/lvWsT2xs9NW+k/0fEnHE0=" + }, + "org/apache/commons#commons-parent/42": { + "pom": "sha256-zTE0lMZwtIPsJWlyrxaYszDlmPgHACNU63ZUefYEsJw=" + }, + "org/apache/commons#commons-parent/48": { + "pom": "sha256-Hh996TcKe3kB8Sjx2s0UIr504/R/lViw954EwGN8oLQ=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apiguardian#apiguardian-api/1.1.2": { + "jar": "sha256-tQlEisUG1gcxnxglN/CzXXEAdYLsdBgyofER5bW3Czg=", + "module": "sha256-4IAoExN1s1fR0oc06aT7QhbahLJAZByz7358fWKCI/w=", + "pom": "sha256-MjVQgdEJCVw9XTdNWkO09MG3XVSemD71ByPidy5TAqA=" + }, + "org/checkerframework#checker-qual/3.43.0": { + "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", + "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", + "pom": "sha256-kxO/U7Pv2KrKJm7qi5bjB5drZcCxZRDMbwIxn7rr7UM=" + }, + "org/crac#crac/1.5.0": { + "jar": "sha256-9EJuFkHI8PovAlpM18QMKFq68mWTDmcXrfyu8D0DSFA=", + "pom": "sha256-mW3NvEpNuqYmZ6d9nSoMlH7SeUpGuX5iG6nZpG4oxQ8=" + }, + "org/eclipse/angus#all/2.0.4": { + "pom": "sha256-/M1yMQnFQB6VNOZYBCnxNj/1yEa0sWkThqbx9zdcoQw=" + }, + "org/eclipse/angus#angus-activation-project/2.0.2": { + "pom": "sha256-r5GIoQy4qk61/+bTkfHuIVnx6kp/2JDuaYYj5vN52PY=" + }, + "org/eclipse/angus#angus-activation/2.0.2": { + "jar": "sha256-bdO8/8IrzoOwc3ag4uCU5JZKMZXUEY+0PjgO81Q2zB4=", + "pom": "sha256-deViGn3IWMmW7nDGtNiE2QHRh4Ns5sZxIMr5VH5vxXE=" + }, + "org/eclipse/angus#angus-mail/2.0.4": { + "jar": "sha256-hzAYZVhLrZFwZis+7vA1Cqr+pFIkg+OOVK6H3D3z6Vg=", + "pom": "sha256-hQ9aU/bgvIyFxRwmuDzkvVGEsbmC3zTRMfYIRO2T6zg=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.8": { + "pom": "sha256-DQx7blSjXq9sJG4QfrGox6yP8KC4TEibB6NXcTrfZ0s=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/microprofile#microprofile-parent/2.11": { + "pom": "sha256-Bh21mPB4vltnvh3qVKmYZPqaa6zH1AvPtWrArdpDdVc=" + }, + "org/eclipse/microprofile#microprofile-parent/2.8": { + "pom": "sha256-Jp6jTEQci09GlvduyeDGaE10K/13dicT+6ix5E2BI6k=" + }, + "org/eclipse/microprofile/config#microprofile-config-api/3.1": { + "jar": "sha256-3uJ3+B4e3+r9XkNYlEHs30NFAP5KMdA150uObY57/ZE=", + "pom": "sha256-GAJTRl9lUPjhlVSHJVZ5ZuUyS6NDkNGShL1V7tl+aWk=" + }, + "org/eclipse/microprofile/config#microprofile-config-parent/3.1": { + "pom": "sha256-ywzs7U528l0aYMvNPGfM9eOQKPYCTpM17fX6oPL2vhI=" + }, + "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-api/1.3": { + "jar": "sha256-aczARIfod3nUlwqlDGc8w0qd8IDBwOjY6rLotG+CXPQ=", + "pom": "sha256-nvSA7RaoZ9Gux6gEH6/mDcPBdF0G68GN1d1o5sQ/qEQ=" + }, + "org/eclipse/microprofile/context-propagation#microprofile-context-propagation-parent/1.3": { + "pom": "sha256-tIsfWNtYIsWs6EQcbAymZoHUsETBbbXLDsrxMUtGeLQ=" + }, + "org/eclipse/microprofile/openapi#microprofile-openapi-api/4.0.2": { + "jar": "sha256-xvypkT1+y964AdXmyTWYghn2Sg64sX4jQ36g4B56EKk=", + "pom": "sha256-pHgztxGIuIUZs0nPLC2LTiaKn78OhbwsC0+D7VFpcwo=" + }, + "org/eclipse/microprofile/openapi#microprofile-openapi-parent/4.0.2": { + "pom": "sha256-xZ/HxL1loTq28ogYDbDT5M1n2+sINSNpqn4wu7dsKus=" + }, + "org/eclipse/parsson#parsson/1.1.6": { + "jar": "sha256-f4gAdNCe+vG3RDv9n5m1KZgTkuhFrZctu2kXNEuxOBU=", + "pom": "sha256-DZz9FQTUuOs3gmXoY4M5nPEJuYMtCQvI0OzOMiOIs9M=" + }, + "org/eclipse/parsson#project/1.1.6": { + "pom": "sha256-LuAauaenRjgO5vpjnCrxvJixnc/WCmWZZUu7uS/tftA=" + }, + "org/hibernate/validator#hibernate-validator/9.0.1.Final": { + "jar": "sha256-JfQBGPpMUPhSLQkNJdUtWjiVOwzNElCDXwUue9MWTOA=", + "pom": "sha256-5w3BopQp/dTgh1E+tk70V1IMrwpRqxFFw7ilN8hC6gw=" + }, + "org/infinispan#infinispan-bom/15.0.19.Final": { + "pom": "sha256-EORmwd1rdMnBh9B5ZpN25naQJrlCWTpKu10NQ9W4XY8=" + }, + "org/infinispan#infinispan-build-configuration-parent/15.0.19.Final": { + "pom": "sha256-3jSEoQYRh1Y+i9Jj4xFRWs3i/Ie4GgrxZJ5s/TCsjJA=" + }, + "org/infinispan#infinispan-commons-parent/15.0.19.Final": { + "pom": "sha256-luIdP8U1wVS//6cWlsrHprgsUGVAqM3CA3QXqIAc0OI=" + }, + "org/infinispan#infinispan-commons/15.0.19.Final": { + "jar": "sha256-lnV1+9JTNIcr1J2hIA8sizIwXh68z3EJUhk30PRo920=", + "pom": "sha256-sJb5V+rLRJc1umczXOCq+0OvTm2ZNvN3VHPw6sBOlRI=" + }, + "org/infinispan#infinispan-parent/15.0.19.Final": { + "pom": "sha256-jmzA2m9nq4OgTPxDgVmhqKYYpzrxGAMT894ueE5F2f4=" + }, + "org/infinispan/protostream#parent/5.0.14.Final": { + "pom": "sha256-dd31FbFXy5YxbUl5TptinotZ9s+rTRpOmXtXRerEpBE=" + }, + "org/infinispan/protostream#protostream-processor/5.0.14.Final": { + "jar": "sha256-7YnsbRu2iKEmyYr+OmguOw4JVVfWye1iaWvs2rTDX5M=", + "pom": "sha256-DfassHZwHm5xRbfsowFX6442zcQK0q2FGflf2ZlQYPU=" + }, + "org/infinispan/protostream#protostream-types/5.0.14.Final": { + "jar": "sha256-Ff7P3AVs+AMw2yTAUge1e5mpKsiXHx9wmEkfvRXfOd0=", + "pom": "sha256-uFRu3De9CldOIkryjf2NtLkAasbheD0zTxBMsmbQGpI=" + }, + "org/infinispan/protostream#protostream/5.0.14.Final": { + "jar": "sha256-dcDm6an7B8faP85awaUBIqjAqcg8wDnYjHjAfyf9MRg=", + "pom": "sha256-Qd4D8E1bo2CzRxCoAWjT3uZnuldNChSG8PO+/bZy6Rk=" + }, + "org/jboss#jboss-parent/18": { + "pom": "sha256-cHWFSAOI9dIE/KZTz7/KCIVx61HCW70VLoXwfhg3tuQ=" + }, + "org/jboss#jboss-parent/39": { + "pom": "sha256-BN/wdaAAlLYwYa9AfSgW2c3mZ5WsrjdqBUvf6Lox5mQ=" + }, + "org/jboss#jboss-parent/42": { + "pom": "sha256-5BJ27+NQkFTLpBl7PWNgxR3Ve8ZA3eSM832vqkWgnDs=" + }, + "org/jboss#jboss-parent/43": { + "pom": "sha256-PDredvuIOs25qKAzVdHfQGb/ucjHjwmyGenA/Co/Qxc=" + }, + "org/jboss#jboss-parent/44": { + "pom": "sha256-zsr9kUYWSkIoy76TFkCzmGAmwC2D+U7fFrZJNPe2rcc=" + }, + "org/jboss#jboss-parent/47": { + "pom": "sha256-B0S14LJQm3uhe4W1r1RoCOovH4Oydl/R2MMztyzQW+Y=" + }, + "org/jboss#jboss-parent/48": { + "pom": "sha256-CO+EDZkz+WMjFsnLGysaql2oZynZSE5ZdQnRh43iv5s=" + }, + "org/jboss#jboss-parent/49": { + "pom": "sha256-LomePziWPgSk3fGSpaQFY6cAnEjYVjBAaHTMwVzbBpg=" + }, + "org/jboss/logging#commons-logging-jboss-logging/1.0.0.Final": { + "jar": "sha256-8SF2Jj6iX054u0+ks20zWilzjd5qgSPhttqJplXRUP8=", + "pom": "sha256-WNsZt6ci9K+a5CHQh0xaCkpCt/0VqO0m2FmnM1du5cw=" + }, + "org/jboss/logging#jboss-logging/3.6.1.Final": { + "jar": "sha256-XgiksJLchbM38JEKdAVx2HIM+lZfq9iAqMr5SmV8pBY=", + "pom": "sha256-J82Iq45ZRrinqpJkTrNzLjW+KBQ5qwevcfiYRT7nVA0=" + }, + "org/jboss/logging#logging-parent/1.0.0.Final": { + "pom": "sha256-42K+6+hUVCL6KGhAVGvIRqaeyo7NY+VKMkywhPqvyNY=" + }, + "org/jboss/logging#logging-parent/1.0.3.Final": { + "pom": "sha256-mXLIlHSc2jVXZiF9Q97XAJse6ybgMBwwkUotslPdaFs=" + }, + "org/jboss/logmanager#jboss-logmanager/3.1.2.Final": { + "jar": "sha256-wefeaCpIcajk7vsmra8PzGPNCRNUPFCqa39G+l7BUf4=", + "pom": "sha256-W8Fhlm6f+EcDJamlXR0bT3zhyp9b6CsrfG90toW+mxI=" + }, + "org/jboss/shrinkwrap#shrinkwrap-bom/1.2.6": { + "pom": "sha256-HArIAaoxJb3l6IFrqHijJDJZw5bS845nbihSqcxVADY=" + }, + "org/jboss/slf4j#slf4j-jboss-logmanager/2.0.0.Final": { + "jar": "sha256-J3iFEEtyeiE+94S6sxSZ0jIhB03tKLBIJ+gJ0vVIlpM=", + "pom": "sha256-U01FZKb8jAJlTHQ3X9lK7G4rg5C1mlTHfyKC5EjpOFo=" + }, + "org/jboss/threads#jboss-threads/3.9.1": { + "jar": "sha256-068va5Qurmg/8t59/mhGf41XDLuo2zf+hYl3NJw78qo=", + "pom": "sha256-1c6ELJiUVKWGeA4ONoidMglfFdMneG72yIRJ+d743AI=" + }, + "org/jctools#jctools-core/4.0.5": { + "jar": "sha256-1l5fOLzQmE4m+HGHaH8fcN1SdAxNXgRvjRBOAatduV8=", + "pom": "sha256-ppiXuP8MIZi0uM19T5P95tQrjp2/yVVTWF4nWHsk4hE=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.10.2": { + "pom": "sha256-+vDGU45T3cBJmmNmTY52PCFlgLLhjnIsy98bQxpq/iY=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0": { + "module": "sha256-9+2+Z/IgQnCMQQq8VHQI5cR29An1ViNqEXkiEnSi7S0=", + "pom": "sha256-5nRZ1IgkJKxjdPQNscj0ouiJRrNAugcsgL6TKivkZE0=" + }, + "org/junit#junit-bom/5.11.3": { + "module": "sha256-S/D1PO6nx5D9+9JNujyeBM3FGGQnnuv8V6qkc+vKA4A=", + "pom": "sha256-8T3y5Mrx/rzlZ2Z+fDeBAaAzHVPRMk1uLf467Psfd3Q=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/junit#junit-bom/5.9.0": { + "module": "sha256-oFTq9QFrWLvN6GZgREp8DdPiyvhNKhrV/Ey1JZecGbk=", + "pom": "sha256-2D6H8Wds3kQZHuxc2mkEkjkvJpI7HkmBSMpznf7XUpU=" + }, + "org/junit#junit-bom/5.9.2": { + "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", + "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" + }, + "org/junit/jupiter#junit-jupiter-api/5.9.0": { + "jar": "sha256-PjcLy7HoV/2l8LIDckEW0CsF54j6oeslGIFKzPnPtbE=", + "module": "sha256-n5LPF5V1xN9pgpRwTRDxLozHFdaC+yDtzYrbxB/H8PQ=", + "pom": "sha256-ap2MRpjcjGkE1qwfXRMBiqf4KESbxbjO94/BQxzgghc=" + }, + "org/junit/jupiter#junit-jupiter-engine/5.9.0": { + "jar": "sha256-24bLszUnGfoKl4AO39CcIEY8fyq0oEaZJEQwvYlUWDs=", + "module": "sha256-sVnltbYmIiOP1v0oZPigEsHfbbK7JvEMqA4dIqzOLx0=", + "pom": "sha256-qLfR7QMvuStDJY140jmwGcX1g02swIT5l4PjTD7hLL8=" + }, + "org/junit/jupiter#junit-jupiter-params/5.9.0": { + "jar": "sha256-uM73mC3VPfhMlXpumsie3pZ88ubZNA70xReG4gVIxBs=", + "module": "sha256-QUkSewrR3JKJdqY4WIer3wpD9oNlRLK614OUh2kJenE=", + "pom": "sha256-DDOljPiR2vvGIfPG2cyCMnCDHrOxib3juIbMMDmQ/Ww=" + }, + "org/junit/jupiter#junit-jupiter/5.9.0": { + "jar": "sha256-LbLkqitegv78vxjQryDICVpD6UrZq50WvYdVfNqjl90=", + "module": "sha256-a1AJDfWdSZ4ycr41ULiBJdXJGojhzbSaEsLwi+p6hds=", + "pom": "sha256-Imsy40Pt4WvSls+36xXhmaFOQBxUJulUOsUDrM1E3JI=" + }, + "org/junit/platform#junit-platform-commons/1.9.0": { + "jar": "sha256-5YlLcQCUtMqvxigLiCmkOft2SQHqCuGNBu2AOIswm3o=", + "module": "sha256-SyAzP4ruVOgwRY2B0EXrjRfcBCTTEzKNtQmpzCSZsXo=", + "pom": "sha256-MJp9efG/577WChoXCKqovXGGHBKdIWhNaO305NnILCA=" + }, + "org/junit/platform#junit-platform-engine/1.9.0": { + "jar": "sha256-quxzX3REqfwFXiBlmN49gpwk6ceo7qbv3usZYgh/6BE=", + "module": "sha256-/3Xx1hE/RdWyXyUpUE3tiDmGoBLJtD0hrUI5jknXEGM=", + "pom": "sha256-G2rN+hUNaWYlIHYAAcaONlhl1o7xMNGZblK5SD7IYWE=" + }, + "org/keycloak#keycloak-common/26.5.0": { + "jar": "sha256-2PK11SgJzuZvI+s03v9MhAU8PZMa8DmLaoldGeeybWA=", + "pom": "sha256-4vFpvHt9yXBC2UzAi6lkXABKch6kJGM5qAY+mrI/+YY=" + }, + "org/keycloak#keycloak-config-api/26.5.0": { + "jar": "sha256-oRDkNFwYkuUix1MJzdB0Y+jvXyRB/lPN+4AfDl5Ae6U=", + "pom": "sha256-morv3k+SZkVsBR2iwFVm31DUtAhUunCvjMVDy2VAqWg=" + }, + "org/keycloak#keycloak-core/26.5.0": { + "jar": "sha256-1yA3b1qqEu/i24uRbLchwOK51yflDoVeI7cBXdaBwbY=", + "pom": "sha256-xmppjrEpuyQI0bTJjsw9wTi9PZN0Yn8v1XSwNtCHXqI=" + }, + "org/keycloak#keycloak-model-pom/26.5.0": { + "pom": "sha256-DM/HtbmHsna/rnG1Dce8ZWb4atZ/RzMmcqY8GWor7Sc=" + }, + "org/keycloak#keycloak-model-storage-private/26.5.0": { + "jar": "sha256-3Wk68aMVEo85/pqRReLyJKSRyMhltmTNtfB+/1qaz+g=", + "pom": "sha256-1sFZtmjRNs8kOeJj/empnp2PYJzrunHetaRUxYTzdJU=" + }, + "org/keycloak#keycloak-model-storage/26.5.0": { + "jar": "sha256-HZ05Oog0lfyvAjQwbndB3g2ziytXqb4DSWK8WwwfbwQ=", + "pom": "sha256-iTC+gd270T75QEHzHTUNpfSBJV+VnvACYEguTUsipio=" + }, + "org/keycloak#keycloak-parent/26.5.0": { + "pom": "sha256-uUAV2DPIwxPbc6dW2EvXFhSdrRdQtYA1Zq1t4Rovwjw=" + }, + "org/keycloak#keycloak-quarkus-parent/26.5.0": { + "pom": "sha256-Ho5I8IjxJHJFmET7rE1Hhtv79KcilbaJLPA+DL2Vwrw=" + }, + "org/keycloak#keycloak-server-spi-private/26.5.0": { + "jar": "sha256-gjQHk70/k84MOYF6Fof9uMuGoispAKdK+j0LKUV0zGc=", + "pom": "sha256-ebNAq+2oFRzpgm4mvRLCfacycX1LTSNOWAxIrAme/zo=" + }, + "org/keycloak#keycloak-server-spi/26.5.0": { + "jar": "sha256-TTuIUF2kSgU270lW3Efk8kut4UK8m2/BpjBCzzeEYLk=", + "pom": "sha256-mxto4VbiUf9d1KK5kUSF3VzEn8cCrMCPGhKDDVyJZXs=" + }, + "org/keycloak#keycloak-services/26.5.0": { + "jar": "sha256-klKTfqrMeC/ZoH4+HvWmng6Dxf5zml4zlEU4zpC3Qaw=", + "pom": "sha256-Qu6DIJIxfY/tWp5pG7/ytqxzuKZ7Gz3gAVgkjov2NQ0=" + }, + "org/mockito#mockito-bom/5.18.0": { + "pom": "sha256-BhfEyedxfwt421BQgYuxvvLYvEuzmDQiQfKwoaKruZg=" + }, + "org/opentest4j#opentest4j/1.2.0": { + "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", + "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm/9.8": { + "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", + "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/testcontainers#testcontainers-bom/1.21.3": { + "pom": "sha256-LOcXIm0dZ7Wx35cH7ZgCKjZqyJLZ5JbF8Bc/GreKCWU=" + }, + "org/twitter4j#twitter4j-core/4.1.2": { + "jar": "sha256-cmAigcBtl+ksY86EvZPQB2QvoL/4UvY98S/RI7mQsfI=", + "module": "sha256-AQDT1GTl6gAdKXq4e4JQsslz2b9a2VFnltfHvnVrOCY=", + "pom": "sha256-VhhBMpQ6873BFPIRc7ieacjMqlj2GBo/vR1g9xJro0Y=" + }, + "org/wildfly/common#wildfly-common/2.0.1": { + "jar": "sha256-+kpxDbeuPlmKX0FjnrVOn3sJ3l/Q9Y9WvWBw8h2VY3Q=", + "pom": "sha256-yWySJJfCjJxm7brae4odGYJJJr1B/h1LEMJ7psZsZfM=" + }, + "org/yaml#snakeyaml/2.0": { + "pom": "sha256-Q8dh+StUnIsI+5kggCU+SfCpg+VE7wZjwfT51o61JhY=" + }, + "org/yaml#snakeyaml/2.4": { + "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + } + } +} diff --git a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix index e456b5f6a83a..20253474f3e0 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-2fa-sms-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix index 5a2f0bb9afa7..cbbc5e58a903 100644 --- a/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix +++ b/pkgs/by-name/ke/keycloak/keycloak-enforce-mfa-authenticator/default.nix @@ -19,7 +19,6 @@ maven.buildMavenPackage rec { let mvnHashes = { "aarch64-darwin" = "sha256-eRlu24SYe+PBOTKoAQPd5MoM7VUxHZx4/uiW6mV2PZI="; - "x86_64-darwin" = "sha256-p+XpCjXiEPMJnXIrbD2Qse/csZfv8YZ6h+sNZitCyro="; "aarch64-linux" = "sha256-4P9qM3X99dEy3ssr1+vp65QUJikRfE4EoK6LOta9IFs="; "x86_64-linux" = "sha256-wxgEHC1xJahyoizozvRfRZAWTjrYmYNM42yk+ZRke5A="; }; diff --git a/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix new file mode 100644 index 000000000000..7cd29ceaaeaf --- /dev/null +++ b/pkgs/by-name/ke/keycloak/keycloak-home-idp-discovery/default.nix @@ -0,0 +1,41 @@ +{ + lib, + fetchFromGitHub, + maven, + nix-update-script, +}: +maven.buildMavenPackage (finalAttrs: { + pname = "keycloak-home-idp-discovery"; + version = "26.2.1"; + + src = fetchFromGitHub { + owner = "sventorben"; + repo = "keycloak-home-idp-discovery"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4zZVDl50LOYv6OeBsBevxM9u3PNQPrn4ZxSNTa8dN7M="; + }; + + mvnHash = "sha256-+Urd07v2mYQjPCGAP4OnJr/dE/lmLrq8M7RAEdhyX3Y="; + + # e2e tests need docker (testcontainers/selenium) + mvnParameters = "-DskipTests"; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + install -Dm444 -t "$out" target/keycloak-home-idp-discovery.jar + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/sventorben/keycloak-home-idp-discovery"; + changelog = "https://github.com/sventorben/keycloak-home-idp-discovery/releases/tag/v${finalAttrs.version}"; + description = "Keycloak authenticator to redirect users to their home identity provider by email domain"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ anish ]; + }; +}) diff --git a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix b/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix deleted file mode 100644 index 7ae12fc8023a..000000000000 --- a/pkgs/by-name/ke/keycloak/keycloak-metrics-spi/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ - maven, - lib, - stdenv, - fetchFromGitHub, -}: -maven.buildMavenPackage rec { - pname = "keycloak-metrics-spi"; - version = "7.0.0"; - - src = fetchFromGitHub { - owner = "aerogear"; - repo = "keycloak-metrics-spi"; - tag = version; - hash = "sha256-C6ueYhSMVMGpjHF5QQj9jfaS9sGTZ3wKZq2xmNgTmAg="; - }; - - mvnHash = - let - mvnHashes = { - "aarch64-darwin" = "sha256-L+LVJGBVhkaWOdXpHep9f2s7hLr3enf5POm8U+Y7I1w="; - "x86_64-darwin" = "sha256-G/e0mgAGP+6zvX3b0EuI95bdLT7Bzwh1GgcAfxzsIhE="; - "aarch64-linux" = "sha256-Nrs+gqRYPKXWRr0COAsKmOrNaza2fxhEAJ5x896tKvA="; - "x86_64-linux" = "sha256-oHMkzXHR4mETH6VsxhFuap3AcjvTXytNkKlLY/mzT3g="; - }; - in - mvnHashes.${stdenv.hostPlatform.system} - or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); - - installPhase = '' - runHook preInstall - install -Dm444 -t "$out" target/keycloak-metrics-spi-*.jar - runHook postInstall - ''; - - meta = { - homepage = "https://github.com/aerogear/keycloak-metrics-spi"; - description = "Keycloak Service Provider that adds a metrics endpoint"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ - benley - anish - ]; - }; -} diff --git a/pkgs/by-name/ke/keycloak/package.nix b/pkgs/by-name/ke/keycloak/package.nix index 437dd9f436f9..bd7675168fe5 100644 --- a/pkgs/by-name/ke/keycloak/package.nix +++ b/pkgs/by-name/ke/keycloak/package.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "keycloak"; - version = "26.6.3"; + version = "26.7.0"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${finalAttrs.version}/keycloak-${finalAttrs.version}.zip"; - hash = "sha256-MlWWiTnQVB/JjBhEk3wUv/1WPWnEx9h2iULwzCxUKHU="; + hash = "sha256-QfPCgwUZYwiCWZgL8DVlVAYE3AoZnDHn99j+f/oo0Hs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ke/keyd/package.nix b/pkgs/by-name/ke/keyd/package.nix index f041a188abb5..57283ccebad9 100644 --- a/pkgs/by-name/ke/keyd/package.nix +++ b/pkgs/by-name/ke/keyd/package.nix @@ -28,7 +28,7 @@ let ''; propagatedBuildInputs = with python3Packages; [ - xlib + python-xlib pygobject3.out dbus-python.out ]; diff --git a/pkgs/by-name/ke/keyfinder-cli/package.nix b/pkgs/by-name/ke/keyfinder-cli/package.nix index 55f600863587..884874fed958 100644 --- a/pkgs/by-name/ke/keyfinder-cli/package.nix +++ b/pkgs/by-name/ke/keyfinder-cli/package.nix @@ -5,29 +5,32 @@ ffmpeg, libkeyfinder, fftw, + cmake, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "keyfinder-cli"; - version = "1.1.2"; + version = "1.2.0"; src = fetchFromGitHub { repo = "keyfinder-cli"; owner = "EvanPurkhiser"; rev = "v${finalAttrs.version}"; - hash = "sha256-9/+wzPTaQ5PfPiqTZ5EuHdswXJgfgnvAul/FeeDbbJA="; + hash = "sha256-WdZ5jiq5bfwiq1RK4XDRhqh2gAukq3hLCA56K/f+84g="; }; + nativeBuildInputs = [ + cmake + pkg-config + ]; + buildInputs = [ ffmpeg libkeyfinder fftw ]; - makeFlags = [ "PREFIX=$(out)" ]; - - enableParallelBuilding = true; - meta = { inherit (finalAttrs.src.meta) homepage; description = "Musical key detection for digital audio (command-line tool)"; diff --git a/pkgs/by-name/ke/keyfuzz/package.nix b/pkgs/by-name/ke/keyfuzz/package.nix index 0f4c29bee4d4..d54d7a125d4b 100644 --- a/pkgs/by-name/ke/keyfuzz/package.nix +++ b/pkgs/by-name/ke/keyfuzz/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { homepage = "http://0pointer.de/lennart/projects/keyfuzz/"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; - maintainers = with lib.maintainers; [ mboes ]; + maintainers = [ ]; }; src = fetchurl { diff --git a/pkgs/by-name/ke/keyguard/deps.json b/pkgs/by-name/ke/keyguard/deps.json index d3c379b962b0..8c2afcf57043 100644 --- a/pkgs/by-name/ke/keyguard/deps.json +++ b/pkgs/by-name/ke/keyguard/deps.json @@ -1114,13 +1114,13 @@ "nl/littlerobots/version-catalog-update#nl.littlerobots.version-catalog-update.gradle.plugin/1.0.1": { "pom": "sha256-BBNTyo5k8a+g5bFPXj+6PWRwIoFPPnomKwrgReqv2EA=" }, - "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.2": { - "jar": "sha256-O/9KBwDhyBXRlEifB7ugbLGQ6PKbdz03z+43rI1cdkQ=", - "module": "sha256-MVnFQXhFqWmTx4nULexDVwf7uEiXnP0R0LgzBZ5RIKM=", - "pom": "sha256-ctVO1m6jP6+UKCNRwxAZ4S59fpIOpnpRbL4ODWdBA0M=" + "org/gradle/kotlin#gradle-kotlin-dsl-plugins/6.5.7": { + "jar": "sha256-zIyqQQGjXQzwQzpj6K04kRpMhIBz/MlPQ64CUfM+Ta8=", + "module": "sha256-ENa9ZquwiOylvjYP9yVQyWFU0mdu/t10rzHEUAF8OQk=", + "pom": "sha256-q+nzlg+nNZciqHUuYb/ElnYeFdFHNeTGQiB5cHYGq74=" }, - "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/6.5.2": { - "pom": "sha256-5aavF7WFYNdGyrQseV/jpCoevkBQ5VpPANjPVM8x8eo=" + "org/gradle/kotlin/kotlin-dsl#org.gradle.kotlin.kotlin-dsl.gradle.plugin/6.5.7": { + "pom": "sha256-Ldg2zAlxLNrd/u/GgNLqZutD2NxjOGvVlSZYE0l/Ry0=" }, "org/gradle/toolchains#foojay-resolver/1.0.0": { "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", @@ -1137,106 +1137,106 @@ "org/jetbrains/compose#org.jetbrains.compose.gradle.plugin/1.11.0-alpha02": { "pom": "sha256-MU2vfNXg5KBkAF+cfuVA2xRoE9ywWMiBM4tHjynNKLw=" }, - "org/jetbrains/kotlin#abi-tools-api/2.3.0": { - "jar": "sha256-QBe8wfXTKFsX5rYiDRakaMhxWTDw35Y5bXZLV/Cm02U=", - "pom": "sha256-qJIhRAlxhudUjXFH3I3O1eYOMGnUY1ulUe8uV3WrmAk=" + "org/jetbrains/kotlin#abi-tools-api/2.3.20": { + "jar": "sha256-U2hfV4OwSQaDiY11Wrrk1Bi26DugYTSFiv3ctZRYmek=", + "pom": "sha256-qIbJ/X8rlmlFf+wCHxnc8V8EY+DbS9rVOuGBJTZsxvk=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.0": { - "module": "sha256-d8IDSG/XkrWAVyBp5cRC0YDA7wVbpzRQXaKNGX7BL/c=", - "pom": "sha256-k8/rFUWRw3AengQ1C9AF0ZVqmuZHFH1vsqfFeD4fkJo=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20": { + "module": "sha256-bNjWSw5lN3kE8wb2qFja/ZMcQTUkD4RMk9UpTumP6Dk=", + "pom": "sha256-SgpFTor25QOv5ngwoYVjubaA3u67GhcGoNe0S8UHQKE=" }, - "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.0/gradle813": { - "jar": "sha256-D+cv3G5RvisnSw5kuEQB9SUDavsgYWKkRYIU8R6614c=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-pPEKPw6l3dH1VaT3BuCep/VSs8hSK7EAY2HdMG4152o=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.3.0": { - "module": "sha256-ljRPGdjxnqpbxEHjP2UB9+c9o8el1X1EvHwW6qRXVls=", - "pom": "sha256-GqwiGC0snJVP/8FrV2Xq0jjiAw9HhIctRrxfOcozll0=" + "org/jetbrains/kotlin#kotlin-assignment/2.3.20": { + "module": "sha256-GCp0ZM5mvM/ejjG+aPoO7DE8HZDD2POWeclyJyliFjg=", + "pom": "sha256-f3R8uTA9Hfqh1hJfZsFUG+o4PsuZh2ta28riSAVZZ48=" }, - "org/jetbrains/kotlin#kotlin-assignment/2.3.0/gradle813": { - "jar": "sha256-PKIayHkWchdbgnPemV8CTzWZLfAwCijCdUnPd3DMnOY=" + "org/jetbrains/kotlin#kotlin-assignment/2.3.20/gradle813": { + "jar": "sha256-tYin5gfij7WAIo4SDdX/+L6nO9J3JnM6F35kRYLooB0=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.3.0": { - "jar": "sha256-Z3hVlwDnLXZOniTZWPFuwMx152t1s4FMK83hRKYnT04=", - "pom": "sha256-QTkKXrIxFJOxpFubOXLDoL8dqEfoRaNKtoQKr0EmTeI=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.3.20": { + "jar": "sha256-ptJ7PINhdlLdBlYG+Yz1nPviY/jCDr5OvVpvJonrDU8=", + "pom": "sha256-nQqNf/FyPV1y00ldVVc9jTxrd3TWHYBXlxT3nCQmX48=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.0": { - "jar": "sha256-xsCc8oU0VySfcHyGOCESQJ1aVfULa4Vouk9TDdAD/tw=", - "pom": "sha256-FzTIvg4nFXJ3AkW01gbOW7iBbosNHA9+euEcEMLKF1s=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": { + "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=", + "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.0": { - "jar": "sha256-hwl38pYFQ2xesiV7nI5dZPMoLyqI7e5FRNNOxF8Wpqc=", - "pom": "sha256-ov8zZnin9TpEOSv8bFK2gS7dxz5AghyQfyomQWeeDrs=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": { + "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=", + "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.3.0": { - "jar": "sha256-sr5naIyvEaE41a4M4SNTga2asN25OVqwb42EagtGYBc=", - "pom": "sha256-teLnTuXC+I/Qi/g+7GRx9rvKeqEhWYgCtsMsVuhwYCY=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": { + "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=", + "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.0": { - "jar": "sha256-/HKYw2tF820WUscDuraT9f6bEVmOzZrH7J/f6IptsPA=", - "pom": "sha256-aQhDRFhvUkNNH7tRZmlgr/uHbGQ+gIYkXrgLpeREm7U=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.20": { + "jar": "sha256-4WYu10cyK2P2HU+t2Zq3gQTEXq8JwRp4mGJBXoHBjcQ=", + "pom": "sha256-aP+Cf8E1DZPw1nM2jAZHm2K31eXDBlipWM+TBmgx6Nk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.0": { - "module": "sha256-BQ8eECIJAOR6MIkd1c/qg3pl27sNmjyxuFKRq6MmykE=", - "pom": "sha256-GeTwq/tcvwEdJZP1ZRV8jr9FkvMAhhS6LtsEinhRF10=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20": { + "module": "sha256-04UBEP9ajrcP7S1Xi0X7B+vESvaika5M88eUMMZRKLo=", + "pom": "sha256-AdVSITSRyFPVb4frdIEwON+e4dhekIaqN70GY7JJb4g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.0/gradle813": { - "jar": "sha256-yh6tFJqMj0G6YKg5qDsjw6BiJ8RsYhJMUb6ZkDXerDE=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20/gradle813": { + "jar": "sha256-ybwX32m/OZB8WXweGb7EtHnHWqx1+/1jIeNEW0lxLog=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.0": { - "jar": "sha256-epBQPJ14f5vNLBd25MxSfrneeRLvecbJWPEwWi0cQ7o=", - "pom": "sha256-2bCOHuM4pjRhSanQIY+FHuPUfYu3fWEDJg8qhyauUl4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.20": { + "jar": "sha256-5Cicv5/0lAfwQd3GM24bV3pspM8r4dKjEzgnHBPu0+0=", + "pom": "sha256-9veHObqf4nEunwyeW8T16TcZzP6pW0fC9JslC+F2NX4=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.0": { + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.20": { "jar": "sha256-lS5zlI4qINOYwmuHprtwzPZkGPuvFSfDUVsYjqnUvWA=", - "module": "sha256-kRUvrqO8DJTbZtPLWKrh2+rXyGC1dk5nsgC01N9M6rk=", - "pom": "sha256-BLSVrgZj7a3aSEBkZKzTlDGjysez6OjAlLdplu1BSaA=" + "module": "sha256-b7XZcwCl5Vmv1Nn/msA1bE2Wb31pS2Yvrhaf2HQhUx4=", + "pom": "sha256-WROHIVGNgqND99wvCRK3BJjT7vM2PJ66wiCssPyTjsw=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.0": { - "module": "sha256-vbMts6ongF80eewDPsY9PMq+sTuInYbavadCu+9TwJo=", - "pom": "sha256-h4cnvyGoOtrYnU5giEhN2/OfaoSpQoAiGm4cL4hBMD4=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20": { + "module": "sha256-lVUmc7gbNXitmy86/xRUtjzoBsb9SrfGBJIx6GQKtHE=", + "pom": "sha256-EcMjwt2KgE6fWOBHwsAYZLKgHcDYEys2PApDEiFbwJs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.0/gradle813": { - "jar": "sha256-Os+X1zolgbAyhz+on1Z1DTazt21A1pLZg58kZ92uTWk=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-RuFu4mWU9ID+y5LJbarjdTDoNQJreON+8yUelX8D9vs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.0": { - "module": "sha256-/9anNzSypS+3Yz8WOVRL43HgYpxR2X+h5fteqTQ6Fwk=", - "pom": "sha256-cYYJKmnzaIQyxcCsuQtKZx/Y7oANhP5YT66P1TO6v4o=" + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.20": { + "module": "sha256-+CvXZF0MPv609PZVIKPGWz6MMCsIMyIDegABuHsC6ZA=", + "pom": "sha256-3WuRkZfhMv5x3axw9vxdj65/Und6/YN7FN6HG4wKVAA=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.0": { - "jar": "sha256-m6V9kaveq5rNWIoUtfQiCbmWRMU0Ft/56X7LS/l/Ukg=", - "pom": "sha256-zTHw7NqCplEi/8alXehxE5S2GEtRRAK34RkZGqgJGoI=" + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.20": { + "jar": "sha256-vpN3SFQS0A8B54KZyzC+SAJZHCcwNCtuva/AiU91J0M=", + "pom": "sha256-IbFbpb1i0h1Ta7egyMtnQ1cfwPQwklSKQjWybyodIgs=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.3.0": { - "jar": "sha256-7kvygz0Q5fN90haoMSn1nzx8vvXrrBMPcGZIOXCMgLc=", - "pom": "sha256-Rp6PYB/b34kP+ozXSOEQcCqkUxu7KbZOXnUD8O/lDZA=" + "org/jetbrains/kotlin#kotlin-native-utils/2.3.20": { + "jar": "sha256-QxnCdkeV773/K3julUVRV9evC5FVaYuqG6Uqar46vy0=", + "pom": "sha256-LAp+ADViCIXUN+fxJidEdbpYqiJC+1279D+R8gyvpwg=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.0": { - "module": "sha256-DCD2gdNvSnmRYiFYCYkpF5TmVlgvlJwGed+kNKAm9so=", - "pom": "sha256-DILmEXpGNhvUzF5iZV8rgC8Q9LfZJWpjaD0DSv0MDUM=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.20": { + "module": "sha256-nhEhx/ZQMDvdx/BH/tMCf4FjuzZ1Gy3w+vNjfumFsh8=", + "pom": "sha256-Y/Gk4+TT3jrPghTwWgtW/5IM4L9ZYVSnkE8gVuP41RE=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.0/gradle813": { - "jar": "sha256-r8iTlKUrUu8Lp6gpakJi0NOoo850CRXYfXE7CgFhMpg=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver/2.3.20/gradle813": { + "jar": "sha256-oHxdPMvaP8dWTkB0RybhNz5UvSXwVGPT9D1DnXeOy90=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": { - "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=", - "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=", - "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.3.0": { + "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": { "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", - "pom": "sha256-tQ6FtLEYwSIjge0c67K6lqfeLdrtti3aZ9SuBqGiXTc=" + "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.3.0": { - "jar": "sha256-HJEgPyfnO5aI3f4aiAIyjTXrcPpV9eE96ttyHnj5KqQ=", - "pom": "sha256-hvmuNH2YfMwY2aEJ7tLlVDvjj/SMgdUtKMf6HyBarK8=" + "org/jetbrains/kotlin#kotlin-util-io/2.3.20": { + "jar": "sha256-DnbnRx6RxT6mjS0k7x8p+1kqxfuw0dEPqpFkMO/z2so=", + "pom": "sha256-lcKKgo/B8eWeZWOCR6ZPdm2B2LWfbY3r7y0YoMwyH4k=" }, - "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.0": { - "jar": "sha256-JZjCbDTMXGnrAEc0Y+lQrmfpuAln9DoBg8Vn7eZqlxc=", - "pom": "sha256-4EB9YmkdWjQWFh/YNztNt0o714bxtILghGGXUQL58+s=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.20": { + "jar": "sha256-qJlOC8poRt+xn0WMTMFdexN3nKGw2fNIgLX/LCorc7M=", + "pom": "sha256-jxApEHGu+rvY5m/5r3dDojiB1pxqryjhNhbMDpW9F7c=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.3.0": { - "jar": "sha256-ZLugCZZqAoGG2e5waw3ID+phwK5usXJe0dfXDvIrUuE=", - "pom": "sha256-lzWjPLZJg7qg0S3AyOGTSw5VLmvMh2chrFWKmCKFC/4=" + "org/jetbrains/kotlin#kotlin-util-klib/2.3.20": { + "jar": "sha256-lWK407egS+uisUwFZx5xOFnqVLvAohB+ZbK88nP6hEg=", + "pom": "sha256-WlhMPMK6O0HR5c1+eiCDV2wbjDl6ebuBY2dtjvew6hc=" }, "org/jetbrains/kotlin/android#org.jetbrains.kotlin.android.gradle.plugin/2.3.10-RC": { "pom": "sha256-p0/yoS/KLjABAqN1+7/O9sT75OaoBfyxZCxyZiIt5gw=" @@ -3117,9 +3117,9 @@ "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.10-RC/gradle813": { "jar": "sha256-lW/RrbQXK6I9hwM12BUayFL2/DmqyAMfRptDoBNoLBg=" }, - "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.3.0": { - "jar": "sha256-1D+qszfzaY6NrOZSXSzXwq66ewNZOEhYZBZP5wLnM70=", - "pom": "sha256-UttpIUdRA18/LYUvJDCC5x566wenFs2eCHskuYJ6Uio=" + "org/jetbrains/kotlin#kotlin-assignment-compiler-plugin-embeddable/2.3.20": { + "jar": "sha256-EjVTkgnMVtLi7G+XeYaHiHK3Cgh4H2Sv/0Ubwfe9VrE=", + "pom": "sha256-m9zHQ84iL4oxnuYJe2Cq7unmvqe1vzKXYVp1tLpsFDM=" }, "org/jetbrains/kotlin#kotlin-bom/2.0.21": { "pom": "sha256-1Ufg3iVCLZY+IsepRPO13pQ8akmClbUtv/49KJXNm+g=" @@ -3128,66 +3128,70 @@ "jar": "sha256-QcD+zb7B4vUdXG96lyzMaSIVNhpXSU5rI+4xOeKyIpQ=", "pom": "sha256-jbIqNqSFRiw9BdaOnnPwHqeDlovPlTeZWN8/zGeaSlQ=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.0": { - "jar": "sha256-xsCc8oU0VySfcHyGOCESQJ1aVfULa4Vouk9TDdAD/tw=", - "pom": "sha256-FzTIvg4nFXJ3AkW01gbOW7iBbosNHA9+euEcEMLKF1s=" - }, "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.10-RC": { "jar": "sha256-PaKI6nHlhcPNzNdz0cDdZ/+sGrxx77cWNp5+tma1pwM=", "pom": "sha256-ZOHGPrbAdBbxcC3/ltSXayhERBNbsEN9rM47bWrmAFY=" }, - "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.0": { - "jar": "sha256-AJST4crwTIKF8f7RV7uraINV2wTS3q7E9aD5tjX4ZuU=", - "pom": "sha256-ayMWTiKBY/1j+Bf7LF3ifW6cNAO3Y8y6BoBYTyF/jjI=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": { + "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=", + "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4=" }, "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.10-RC": { "jar": "sha256-Cy5M/Ny64fh/Or9QicVqgwpMF5cLKOgktamabo2JFFQ=", "pom": "sha256-wK1VOiQf6+HyYJcUPjMiRmO2REG6/XY/6Vm2Ae5mbwI=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.0": { - "jar": "sha256-k6Xo/7EACAHIMqhisjvZdm9ETm9sGFwysftXh3+1zqM=", - "pom": "sha256-AKelPNgr5ws234oCI6Wrhhoqb/txnZt3M3XId8idugQ=" + "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.20": { + "jar": "sha256-RMMHtO3UysUflgqBNBEtZkyTB2cAzaXoZulNmkKWNA4=", + "pom": "sha256-rpC+JesEdhCNlo6+Mqjd9SXhQIhYj6BUc9sSgVoPG3Q=" + }, + "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.3.20": { + "jar": "sha256-VOztYw8oEkzP4uRk5srMKB5SiopQqJclchVUyWk1SP4=", + "pom": "sha256-5zeMZYHvXw4stA46TOxR0rlj5iVkWpK2fqCVJa+XxMM=" }, "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.10-RC": { "jar": "sha256-9n02tA24gnd7Bseg/hO/aGAnu6wlxfblGNJzZWwhZrY=", "pom": "sha256-CMsXeW8qAa5vfqppz/F7bVzsr/tHxKBSpQWdiCJDC8w=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.0": { - "jar": "sha256-jb2IL6WMPRfmg6JzkCiDFfi0kPjj47G+TcPigNN+KFo=", - "pom": "sha256-zOmxEfIRZgxcRTk+dI30aVC2HAEUfgdzttxxnui7d6g=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.20": { + "jar": "sha256-loG8IWSovZ9t30wIXPSoNrktJ1BmZ9c7q59thVM2yRA=", + "pom": "sha256-gswavl5j0/5nV+eXKE8F25r9fq3D6D0ROcOlW2TUstU=" }, "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.10-RC": { "jar": "sha256-r6+klWvxvWJX9wLPm5oonqviny9TDCM7pPgZptfno6I=", "pom": "sha256-UyU8WscTHsSThFu1RsTY+79bu5WEF8KUBlFnLcmmKWA=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.0": { - "jar": "sha256-hwl38pYFQ2xesiV7nI5dZPMoLyqI7e5FRNNOxF8Wpqc=", - "pom": "sha256-ov8zZnin9TpEOSv8bFK2gS7dxz5AghyQfyomQWeeDrs=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.20": { + "jar": "sha256-l2+YnQtfXYDo6KitS3PaC/wn/dllufo4Nisr557MEzc=", + "pom": "sha256-DDWu7jcvB1FOvtN7lAe44RgdFCd1UTnlzudxnKBf5+g=" }, "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.10-RC": { "jar": "sha256-QqRjDDh2gXZkUOxQfriAelausTOw4G7RcDwEXorDfrM=", "pom": "sha256-hynzbhVt8+C2rvQTCNJ2xDz01apFAWUW1taKrpJTeik=" }, + "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": { + "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=", + "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig=" + }, "org/jetbrains/kotlin#kotlin-compose-compiler-plugin-embeddable/2.3.10-RC": { "jar": "sha256-zy8oVmxarKIn07MOOzTP9mjQh4IEYcA6nuhTJLrDDA8=", "pom": "sha256-REd2WqNlz5rxWBJ5kRx81qNxcwKp0fgVpeKVXZqQgS4=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.3.0": { - "jar": "sha256-sr5naIyvEaE41a4M4SNTga2asN25OVqwb42EagtGYBc=", - "pom": "sha256-teLnTuXC+I/Qi/g+7GRx9rvKeqEhWYgCtsMsVuhwYCY=" - }, "org/jetbrains/kotlin#kotlin-daemon-client/2.3.10-RC": { "jar": "sha256-C+suo6o9uyYgihTqpJs022QDETlZE6fOb5GDQQnGZsQ=", "pom": "sha256-qG6d+5GGaQ5j/Z5ROCL2pkRT/QDvLPgG0P6+PgSUzYA=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.0": { - "jar": "sha256-ObywLYwpOqZ4VUyLSdf/hGVwIXCSg8YYbjpAgGr5vRA=", - "pom": "sha256-TI3aucQLMNAbhc/qHxd31zUlybcWQ+YlDGV2/H0fwRI=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": { + "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=", + "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA=" }, "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.10-RC": { "jar": "sha256-QyoFSvwpRD1uVybcO3JKdrhDxR2yKEVbyogs3ANJhlk=", "pom": "sha256-ek+lwRozmQ8U1JE43U3kAj/v4vLgCNqDRMPCuUfAPrY=" }, + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.20": { + "jar": "sha256-iHC6uEC4CHyWxN3AYIi0rt9RMcQIrzZ0MGME8flq8/Q=", + "pom": "sha256-YVQOWzoywLEZYkSWZZJMbNdVTqmu4IVb2OT1t/YQoKs=" + }, "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.10-RC": { "jar": "sha256-LxUWxkToc3Rzi0QCsSPaeaA+KsQDXdAWXYtwFp6p6lA=", "pom": "sha256-EgyPnAxIjfUm9JHJ9L1laYx1+uDKnVABKNAp0smxvmA=" @@ -3238,54 +3242,54 @@ "jar": "sha256-vNdaNspK2OBhFyFO2Af43qL+YaceB/kcoU9DNQJLhGM=", "pom": "sha256-7XngK/COxxXsvNHi16RTYteqfDP5LvZ15t+kpJMbzF8=" }, - "org/jetbrains/kotlin#kotlin-reflect/2.3.0": { - "jar": "sha256-cU30voGVRf9N4fNqohg+DeqUtMjN98op6ciZGbrzY2I=", - "pom": "sha256-89F2jvL7UxBIPb6R4w6fo2x7Pi/e5pRaCLujEBQtKcE=" + "org/jetbrains/kotlin#kotlin-reflect/2.3.20": { + "jar": "sha256-40b6PD/0RR9fcHoxKIf9TIVV2kjMFfqdsrqTwz+J+BM=", + "pom": "sha256-iwC9L+srtVON85aVQXTZ3cDsVA00ElhjA1ObHpZVwzM=" }, - "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.3.0": { - "jar": "sha256-QOPhi7jFUjLuZSXOV9F7hl5WcosFK/DBDnvsHQhJmMo=", - "pom": "sha256-BnzIEOCaYeFufoe1Kk3WR+FfYLd+PaDRsVPz+A7r8wM=" - }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.3.0": { - "jar": "sha256-24JpYTcdZgUxjZxOS/zb+slMOgiSzcq9VSJIcP6tV/E=", - "pom": "sha256-20CN5tumaQeVvFOkoPhbM8en1qzLZ94ZAmQPr1QfL1s=" + "org/jetbrains/kotlin#kotlin-sam-with-receiver-compiler-plugin-embeddable/2.3.20": { + "jar": "sha256-hvch6zOswK/QbdZoDnenZLY0qb2LEbc77yv8CQnxiUA=", + "pom": "sha256-Vg23nSOjmud5dqVmkZRw3sQazHeqUa6qVlzAKbkXGqw=" }, "org/jetbrains/kotlin#kotlin-script-runtime/2.3.10-RC": { "jar": "sha256-vabutEYi4rlflkxb3MkPoWPNCgybtVabpd86MRwm8iA=", "pom": "sha256-JH2OT7fPc1Wnr/gMRAHp2wXubkb6xoZKp5ebl7ehR70=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.3.0": { - "jar": "sha256-QlK3gs2lP8v9lTuQrwMlDiGX/+9uVavZsKLkj5Pv8lM=", - "pom": "sha256-9AuKrV3x68riUJLMM7hpP6Qw5TRCC6Wup/AGsvMrQw4=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.3.20": { + "jar": "sha256-b8232m5lz4zEPlqrq5S9zEiCXnkzaG+KG/aU64j44A4=", + "pom": "sha256-ZgmWdnA6CB/ZrEMTlmWIPlwUUCC2QHWd4FOdiRb/JH8=" }, "org/jetbrains/kotlin#kotlin-scripting-common/2.3.10-RC": { "jar": "sha256-gbM3To+5LF1t82X13tIAW2Vb4rg3oNKjylND0/9tMCc=", "pom": "sha256-FA4i/htI2X7VHlRWnAUw9fNxhCQhGyEXMOwOrxbnLcQ=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.0": { - "jar": "sha256-ZxRdvqkxlNuyJT4vNaCp/ngBfCy84+zbSx/0P/9HGNU=", - "pom": "sha256-FjR61xI8BuiaUu+twxjZaick9UqBx+xZTA1ALh8eZFk=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.3.20": { + "jar": "sha256-tMI52HsjvhgvBb9Xz16B+V1wv370qYnrmLczicbryJ8=", + "pom": "sha256-h+/vFa4RjxNDUmPrEJcAZGD7qDlph340uKcvDjPIOsk=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.10-RC": { "jar": "sha256-WkVxf5DBowquk3ukcouU9cVjxp03s08671HP9OybPRg=", "pom": "sha256-z75mf7STjoyR9BDJWbjM+Xksc0bD8CjVmOotzRxYGX0=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.0": { - "jar": "sha256-MsdCfxBeYtT07/MDXaHkKAsndxvkrWFDuoZV0Yh3IM0=", - "pom": "sha256-TPG5v5rmnHbz6nWnhW3GbeRGeKfHQXFa6cFdtA7Nfv0=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.20": { + "jar": "sha256-vVX49hvUHOxSllbC1HeEvLpawmDpT0FWwnLDFJZu71k=", + "pom": "sha256-1l8YaBd9zkuKkv+93bVrFzH5+66IyOcw7XvLcAy7soo=" }, "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.10-RC": { "jar": "sha256-ua86tjyjMwHLUfkBJZk5Xtjy64jjyWNQHOLriCv/12I=", "pom": "sha256-gWW9J1eaLKO3r8ww5Swo6QfJECUg6yL+7QzS9rgtSuA=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.0": { - "jar": "sha256-NpM+uDYZqKZeBB36m2ktNOB9V8b9Yv43HIu/BYgL7Ec=", - "pom": "sha256-qemsNTtIBUA7A3spmZpUnxvESATniVnYT/sbwzBF8kc=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.20": { + "jar": "sha256-gG/WOzvOxea17rGghD1qsJTVV4aoRl5HSiQ5KVocCiU=", + "pom": "sha256-xKkTo4XzTjKlbyBd8XoI3U4RfDBsV+XkfcXUlSPw6+E=" }, "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.10-RC": { "jar": "sha256-7N5Qd0P8WB5wabFLHhohHK7MQ9fns7uZTrqEWqzAiag=", "pom": "sha256-d5APHmelXOOo3SxxIPARd0N5hHIHfyywQQlN18hovqg=" }, + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.20": { + "jar": "sha256-cEfOA1P0kSXDx0Z5LU92wyZde3L+YmlLfuwHW7oCUow=", + "pom": "sha256-B8Ba4tHs4K4e1mAQ7TGNnN3LNYcEbGM8GGvRTM8EYdU=" + }, "org/jetbrains/kotlin#kotlin-serialization-compiler-plugin-embeddable/2.3.10-RC": { "jar": "sha256-v3uAa0GY+/4UnjfD10j0JVA+3CxOir/JsqvFEDWOQxM=", "pom": "sha256-Ak0HyrVBLZHpPMmeZ5dbjC6fuWG3BpllagCE/MwBlF8=" @@ -3301,14 +3305,14 @@ "module": "sha256-b134r2M2AKa5z7D8x2SvPVEZ83Zndne5G2rugWsdMKs=", "pom": "sha256-X0As+413MZW5ZwUBJMnom1+EsXJGThiUkpeJv1xMLyk=" }, - "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.0": { - "module": "sha256-/pAljbcTNVWBoBZDfQbAKdBpwgu93uE02R5LiHBz108=", - "pom": "sha256-J+2DQuBLgcqy0aP512D06/lQmG9n7Eme1y1cw4d+6NA=" - }, "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.10-RC": { "module": "sha256-T7RK7JIrF+ytx62EMPj7cc0Cs0ZPLzNoPUEnau3/vPw=", "pom": "sha256-aNb+8ejJzL7tNa7xZvY3SFDf690TNXpwDjKANiWDF7E=" }, + "org/jetbrains/kotlin#kotlin-stdlib-common/2.3.20": { + "module": "sha256-fV4z3nFM3ddQeGQgmMvL7pfBg5jQNLd9MrSwdLlQOTk=", + "pom": "sha256-/Xtj7fb31urrwWoYVgu7koszQlYepcnR92kZiw/puYg=" + }, "org/jetbrains/kotlin#kotlin-stdlib-jdk7/1.3.72": { "pom": "sha256-nVoT2avDNEXhNm0livCnfkLwGUWs73wJF7nVOYVOL84=" }, @@ -3358,11 +3362,6 @@ "module": "sha256-v7xlfd06jjfkyK1BeWjV6wsLFxyfzkj5YsKtMu5DTCE=", "pom": "sha256-zzH5IxlsY67ezQpXwkJpvTcCpOR8C/C9ZLWtpd5SInI=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": { - "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=", - "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=", - "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI=" - }, "org/jetbrains/kotlin#kotlin-stdlib/2.3.0-RC": { "jar": "sha256-zDONZbvslLcwNvfDw6X28JrocFuVwPkg7DKHtGtolNM=", "module": "sha256-j+uBo/Q5DDNtB8a3zz7kVQHpwF5zupBFU8UeJImo4VM=", @@ -3376,14 +3375,19 @@ "org/jetbrains/kotlin#kotlin-stdlib/2.3.10-RC/all": { "jar": "sha256-8tQNQce+hFtMQsSM0wFI9oNm6QnfgiBJo96d0VLUjAI=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.3.0": { - "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", - "pom": "sha256-tQ6FtLEYwSIjge0c67K6lqfeLdrtti3aZ9SuBqGiXTc=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, "org/jetbrains/kotlin#kotlin-tooling-core/2.3.10-RC": { "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", "pom": "sha256-JP5o1+ZtHKA6rzslyx5nPzE0F54G3Q8K0rQyaxCREyo=" }, + "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": { + "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", + "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ=" + }, "org/jetbrains/kotlin#kotlin-util-io/2.3.10-RC": { "jar": "sha256-85zCXVt0ew16z7LloMQdTmhgCzwUyPnYF1dFmowN06o=", "pom": "sha256-dvRuzCGOmDpVggzpv19r4OQfMybphgof78Ac8TCVeqI=" diff --git a/pkgs/by-name/ke/keylights/package.nix b/pkgs/by-name/ke/keylights/package.nix new file mode 100644 index 000000000000..096a4559aa2a --- /dev/null +++ b/pkgs/by-name/ke/keylights/package.nix @@ -0,0 +1,57 @@ +{ + lib, + fetchFromCodeberg, + installShellFiles, + rustPlatform, + stdenv, + testers, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "keylights"; + version = "0.1.0"; + + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "wjohnsto"; + repo = "keylights"; + rev = "v${finalAttrs.version}"; + hash = "sha256-cl/IRkQMowrWOt0yLEFZC1J2MM6Fr68J6YaakUXwxTQ="; + }; + + cargoHash = "sha256-ns+EppqGP19P+xzevgZcovPKwYkMkWTcu5L0bovuQuk="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + keylightsBin="target/${stdenv.hostPlatform.rust.cargoShortTarget}/release/keylights" + + "$keylightsBin" completions bash > keylights.bash + "$keylightsBin" completions fish > keylights.fish + "$keylightsBin" completions zsh > _keylights + + installShellCompletion --cmd keylights \ + --bash keylights.bash \ + --fish keylights.fish \ + --zsh _keylights + ''; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "keylights --version"; + }; + + meta = { + description = "Daemonless CLI for discovering and controlling Elgato Key Light devices"; + homepage = "https://codeberg.org/wjohnsto/keylights"; + changelog = "https://codeberg.org/wjohnsto/keylights/releases/tag/v${finalAttrs.version}"; + license = with lib.licenses; [ + mit + asl20 + ]; + maintainers = with lib.maintainers; [ wjohnsto ]; + mainProgram = "keylights"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/ke/keymapp/package.nix b/pkgs/by-name/ke/keymapp/package.nix index 0b9c11e485df..ca95ba677ca6 100644 --- a/pkgs/by-name/ke/keymapp/package.nix +++ b/pkgs/by-name/ke/keymapp/package.nix @@ -21,7 +21,6 @@ let url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.dmg"; hash = "sha256-H6xRau7pWuSF5Aa6lblwi/Lg5KxC+HM3rtUMjX+hEE8="; }; - x86_64-darwin = aarch64-darwin; aarch64-linux = { url = "https://oryx.nyc3.cdn.digitaloceanspaces.com/keymapp/keymapp-${version}.tar.gz"; hash = "sha256-qHvHCDzWRhuhDg2kuU8kmikQDXElQtVEmPAelHz4aPo="; diff --git a/pkgs/by-name/ke/keymapper/package.nix b/pkgs/by-name/ke/keymapper/package.nix index 79d786145ee4..cac39957c211 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.3.1"; + version = "5.6.0"; src = fetchFromGitHub { owner = "houmain"; repo = "keymapper"; tag = finalAttrs.version; - hash = "sha256-YKfKgsrjDrskLEoYCSRMYco7+7E/sgXFAMEwwm7rs7w="; + hash = "sha256-0GadjBGgawn0V+PV04R6ULmanNUF7R14N/jHhObcTzM="; }; # all the following must be in nativeBuildInputs @@ -47,8 +47,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/houmain/keymapper"; license = lib.licenses.gpl3Only; mainProgram = "keymapper"; - maintainers = [ - ]; + maintainers = with lib.maintainers; [ anntoin ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix index ebd9e4b077f3..f36cfa1fa910 100644 --- a/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix +++ b/pkgs/by-name/kh/khronos-ocl-icd-loader/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "opencl-icd-loader"; - version = "2025.07.22"; + version = "2026.05.29"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenCL-ICD-Loader"; rev = "v${finalAttrs.version}"; - hash = "sha256-jwviNwX7C7b9lqIS4oZ4YLEFBfBdmQfXHxW3FPPYxYs="; + hash = "sha256-PUfYCf2+0i+SatQerehPv97LOTDlBsQAmtHFX97UGzo="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ki/kicad/versions.nix b/pkgs/by-name/ki/kicad/versions.nix index db36a9ae69da..faf8d0d696cf 100644 --- a/pkgs/by-name/ki/kicad/versions.nix +++ b/pkgs/by-name/ki/kicad/versions.nix @@ -3,67 +3,67 @@ { "kicad" = { kicadVersion = { - version = "10.0.3"; + version = "10.0.4"; src = { - rev = "1d69e55fc60915f8f1569c9f6522d9b0fb5a0ba8"; - sha256 = "0ldaj072x16452xw2wszbk20g932rz36zappjrxc4m6ygx298aa3"; + rev = "314f59e84469aa2db16a36740c891781c8a09fd8"; + sha256 = "1dp2rcblpz1i5hzrv5kb7cq91agha5msm2slhny3gf8x0gbzmawq"; }; }; libVersion = { - version = "10.0.3"; + version = "10.0.4"; libSources = { - symbols.rev = "299c330ab364cfc3989d1ab6e82f1eabb9ddd915"; - symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; - templates.rev = "a7e1a3ae6255d8d9aaff13e58adf3a0d78cb90c9"; + symbols.rev = "5a6700bbb3f2a3b05d123a1a1af770cfbb5bc7d3"; + symbols.sha256 = "1ns0lg360h3h55w2xv5lyj0qzy6nc1cr02vll95c0vma34rc1qwa"; + templates.rev = "32bcda122df6ae76b221155c641de3656904e786"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "fe0ca39d34a10036f2b6ccb9749a39bc3fa7af95"; - footprints.sha256 = "0wdzsn7z11wc5yskk576a4a6qfagsvw0y6r034inxrnfc32aiah9"; - packages3d.rev = "c955b94c7bdeffd94b06bac86d94588a9be03afe"; - packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; + footprints.rev = "12095f926a3c5c37d9573ebab0c67c9eed71812f"; + footprints.sha256 = "15cz4lh6dzqdl2cc9nqnpa8bd73h5p33vnvmc4l68js5wqlsyba1"; + packages3d.rev = "9484cb1a4e193898c3f86e0cf69146bcc6e8053d"; + packages3d.sha256 = "0mkc9km540n6ri5is4fjw5abv8afidwj9q7fmbs66l6kx1z3lxky"; }; }; }; "kicad-testing" = { kicadVersion = { - version = "10.0-2026-05-30"; + version = "10.0-2026-07-09"; src = { - rev = "81d0ec2f35bd2ce905e006d38274a5ab37d6baa9"; - sha256 = "1ajnh1d8gpyyh53s766cr7n6x3h4z0hrlhmyi9dx86p4c6138qly"; + rev = "d3b8ca6d7d750e499b96306ba56888aefb0d0936"; + sha256 = "07shf3nfn9jz5m4r4kskvgx157sx4q62zl4cqn7vy2x8vxlhgsxh"; }; }; libVersion = { - version = "10.0-2026-05-30"; + version = "10.0-2026-07-09"; libSources = { - symbols.rev = "299c330ab364cfc3989d1ab6e82f1eabb9ddd915"; - symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; - templates.rev = "a7e1a3ae6255d8d9aaff13e58adf3a0d78cb90c9"; + symbols.rev = "5a6700bbb3f2a3b05d123a1a1af770cfbb5bc7d3"; + symbols.sha256 = "1ns0lg360h3h55w2xv5lyj0qzy6nc1cr02vll95c0vma34rc1qwa"; + templates.rev = "32bcda122df6ae76b221155c641de3656904e786"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "fe0ca39d34a10036f2b6ccb9749a39bc3fa7af95"; - footprints.sha256 = "0wdzsn7z11wc5yskk576a4a6qfagsvw0y6r034inxrnfc32aiah9"; - packages3d.rev = "c955b94c7bdeffd94b06bac86d94588a9be03afe"; - packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; + footprints.rev = "12095f926a3c5c37d9573ebab0c67c9eed71812f"; + footprints.sha256 = "15cz4lh6dzqdl2cc9nqnpa8bd73h5p33vnvmc4l68js5wqlsyba1"; + packages3d.rev = "9484cb1a4e193898c3f86e0cf69146bcc6e8053d"; + packages3d.sha256 = "0mkc9km540n6ri5is4fjw5abv8afidwj9q7fmbs66l6kx1z3lxky"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2026-05-08"; + version = "2026-06-27"; src = { - rev = "76f8839fd232594f81180f644e3370c390025144"; - sha256 = "0nbr3cmrz1ca4rcwbfxvlrnwxy091lscgsqd92pqyy9sjcvqdfjg"; + rev = "26010f14414a39852891c13a5f37261691608bb6"; + sha256 = "1jd7dc7vabi2zl38aci3xlg3qwyrnwj0j2jzlfln7zq9p8h3fnsc"; }; }; libVersion = { - version = "2026-05-08"; + version = "2026-06-27"; libSources = { - symbols.rev = "5a41d2112853c72129a9128df01021278c1aec11"; - symbols.sha256 = "05h8dbygch2kp4s5ikspxngwv999j7jwsiwm4pzwwcrir7dqzdfl"; + symbols.rev = "c7e226a4946cbd123ac57131b79a73979891d82f"; + symbols.sha256 = "0sj2kxr48wqz075fda6jiwk9ajdf6iirbiw92wlilq3w8i3xa431"; templates.rev = "3ed4538b0f965d821df63a5fffc4441e723cfe7f"; templates.sha256 = "0zs29zn8qjgxv0w1vyr8yxmj02m8752zagn4vcraqgik46dwg2id"; - footprints.rev = "098da23b916d287a0c7913752df53e6bfdf640a2"; - footprints.sha256 = "1h1v44qc5lvvqvmi1i7b79jhxsfq8snk0mcfl6r73hj6w0b25l84"; - packages3d.rev = "394aeaa41d7be7f717715d9ba004d7d0d8b74b36"; - packages3d.sha256 = "01nbjcs3890hyfmafc623ldmfi9n8sjr5m0wripz5fq5fjdnzqxl"; + footprints.rev = "645402ed82e16096cf827fea7114fdbef4c46948"; + footprints.sha256 = "0plw6h6vr3rj9y7i59wa9c9qx9l8lsvzgan48q2k87wbs4x1gwsl"; + packages3d.rev = "0bc64e922178140eb6890377646efd45e15011bd"; + packages3d.sha256 = "0mkc9km540n6ri5is4fjw5abv8afidwj9q7fmbs66l6kx1z3lxky"; }; }; }; diff --git a/pkgs/by-name/ki/kiesel/deps.nix b/pkgs/by-name/ki/kiesel/deps.nix index bfae34f35bff..5fc41876a0f0 100644 --- a/pkgs/by-name/ki/kiesel/deps.nix +++ b/pkgs/by-name/ki/kiesel/deps.nix @@ -15,6 +15,14 @@ linkFarm "zig-packages" [ hash = "sha256-XeDNFR3jbP/rY9zBqaiOaDTwKn7tuxHMiBK3qwAky4w="; }; } + { + name = "N-V-__8AALjnOQBiCk4NffYgEewZ5v9qlLlDyXO22FIyzNdf"; + path = fetchgit { + url = "https://github.com/boa-dev/temporal"; + tag = "v0.2.4"; + hash = "sha256-0JhYANVsVvNC0OZe1E6WzGc+pH9j7Z9SGCmhk8TQanU="; + }; + } { name = "N-V-__8AAMFkNQCMS3QG2Q2vrQ1urnQq0PqKINS-iRDs1Xqc"; path = fetchzip { @@ -30,14 +38,6 @@ linkFarm "zig-packages" [ hash = "sha256-O9p1++FZmiCNGk55hvYe3iS/kdSXzR+1htWCq2tBgdw="; }; } - { - name = "N-V-__8AAPLKOQDfJ5TYhiiy_6a_dZqUmo9K4e8Xhjfup3fd"; - path = fetchgit { - url = "https://github.com/boa-dev/temporal"; - tag = "v0.2.3"; - hash = "sha256-wD4pTVgQZrGONgSTDm9Eq3fo3Ez7aIC0/n4Rqgksad4="; - }; - } { name = "args-0.0.0-CiLiqmvgAADyJmrzcQTP9IOYNvTzR_KGrg3ZNNsH2Qv0"; path = fetchgit { @@ -47,19 +47,19 @@ linkFarm "zig-packages" [ }; } { - name = "bdwgc-8.3.0-8obE-IejLwCX53s54D3b3nIqlsMLiZ0ZtAF8nMvffTtR"; + name = "bdwgc-8.3.0-8obE-Ky9LwD3G-0Hn12vdf3OhUGaCJxSUSlVxn-ScMJC"; path = fetchgit { url = "https://github.com/bdwgc/bdwgc"; - rev = "ea69934ed214cfb4e38d2a0176cc392af8055a83"; - hash = "sha256-wippr/ilU5cf+2D6T+kXUDZC0r353wCYyad7Y0hQvdM="; + rev = "af6f40bf3ce6ea916d487e10eee9dd4691ed4a07"; + hash = "sha256-x3nzPFXmsFdtZy8IGAF6F0boDRf0o3g14IZm1PRSp5U="; }; } { - name = "bdwgc_zig-0.1.0-ffcEgVh8AAAhDLt3oykzvhRx_WDGdHCoqmswDTnmei6b"; + name = "bdwgc_zig-0.1.0-ffcEgYd6AAA_rlVpPv9GN2Olt2DCBle_4Ageca2NDNUy"; path = fetchgit { url = "https://github.com/bdwgc/bdwgc-zig"; - rev = "1cfcd9ea8947e172f20b028fbc52e778632fa407"; - hash = "sha256-bTjPgn44QAgWAjiLqP3S5CK9os7L1cex+TXgzKU2dHY="; + rev = "81e92063debddd226f3a660cee43665a04c926f3"; + hash = "sha256-RZz4b9BcrLhxjkRTYI7RVbIIXXKyS1ZSIIo3hkzYjO0="; }; } { @@ -71,11 +71,11 @@ linkFarm "zig-packages" [ }; } { - name = "icu4zig-0.1.0-IT7GrJalAgC00wqxu8c6JBs8A580wS-QrXBE7FJ1ZVaz"; + name = "icu4zig-0.1.0-IT7GrO3IAgCsmavpCdZXvoJFn4MCxFYJ7vVkQyH5BfrW"; path = fetchgit { url = "https://codeberg.org/linus/icu4zig"; - rev = "13caca132022c0acd9a0c04356ebf7d758340b8a"; - hash = "sha256-fz1YnPDDEIJVxlmxUfYq3ydksu739cT6aNK5W9N1RbA="; + rev = "2e207c2db48a938453d6fe518fa30b76691a407a"; + hash = "sha256-SsVKpMiv5YMTo/dsvRV8r6U2WOX3OFvolu/s2zVWu/k="; }; } { diff --git a/pkgs/by-name/ki/kiesel/package.nix b/pkgs/by-name/ki/kiesel/package.nix index abc45b1930f9..a946ec6f71bf 100644 --- a/pkgs/by-name/ki/kiesel/package.nix +++ b/pkgs/by-name/ki/kiesel/package.nix @@ -14,18 +14,18 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiesel"; - version = "0.2.0"; + version = "0.3.0"; src = fetchFromCodeberg { owner = "kiesel-js"; repo = "kiesel"; tag = finalAttrs.version; - hash = "sha256-bddGd3LPmVV8wwoVHYJJKoHS6ssYyU1hQBTGJBQJPgc="; + hash = "sha256-X5KpobHnqU8LR+odxeoPyVQbWLO8Yq1Tys7gNQu8/tI="; }; cargoDeps = rustPlatform.fetchCargoVendor { src = "${finalAttrs.src}/pkg/zement"; - hash = "sha256-SOp8UW0iKniXwzEGGtzX5rFAdVQKDHoEvCupquusvmo="; + hash = "sha256-YjbrKfkmhBxRxqg8mllK7eEsZwkFYMWL+z7u1PtjEYw="; }; cargoRoot = "pkg/zement"; deps = callPackage ./deps.nix { }; diff --git a/pkgs/by-name/ki/kikit/default.nix b/pkgs/by-name/ki/kikit/default.nix index 40d312da3d57..62d0935c8336 100644 --- a/pkgs/by-name/ki/kikit/default.nix +++ b/pkgs/by-name/ki/kikit/default.nix @@ -2,8 +2,10 @@ bc, zip, lib, - fetchFromGitHub, bats, + fetchFromGitHub, + fetchpatch, + python, buildPythonApplication, callPackage, kicad, @@ -19,6 +21,7 @@ versioneer, shapely, setuptools, + versionCheckHook, nix-update-script, }: let @@ -36,12 +39,23 @@ buildPythonApplication (finalAttrs: { hash = "sha256-QhtdQgMgHaB0xj2hQ4MCptr5DDgCOfRClUSyYzrFQis="; # Upstream uses versioneer, which relies on gitattributes substitution. # This leads to non-reproducible archives on GitHub. - # See https://github.com/NixOS/nixpkgs/issues/84312 + # See + # https://github.com/NixOS/nixpkgs/issues/84312 + # https://github.com/NixOS/nixpkgs/pull/395213 + # https://github.com/python-versioneer/python-versioneer/issues/217 postFetch = '' rm "$out/kikit/_version.py" ''; }; + patches = [ + (fetchpatch { + name = "fix-stencil-arc-numpy2.patch"; + url = "https://github.com/yaqwsx/KiKit/commit/036ca08fc380dd2c5b8b3ba2adc4215f4114e975.patch?full_index=1"; + hash = "sha256-AmvH822nAubqVhl1PEKvE0Ij/K0NrBsSvnMUJXgxmfI="; + }) + ]; + build-system = [ setuptools ]; @@ -72,6 +86,7 @@ buildPythonApplication (finalAttrs: { nativeCheckInputs = [ pytestCheckHook + versionCheckHook bats ]; @@ -79,9 +94,10 @@ buildPythonApplication (finalAttrs: { "kikit" ]; - postPatch = '' - # Recreate _version.py, deleted at fetch time due to non-reproducibility. - echo 'def get_versions(): return {"version": "${finalAttrs.version}"}' > kikit/_version.py + # Recreate _version.py, deleted at fetch time due to non-reproducibility. + # should be done in postInstall to overwrite what versioneer generates again during the build phase + postInstall = '' + echo 'def get_versions(): return {"version": "${finalAttrs.version}"}' > $out/${python.sitePackages}/kikit/_version.py ''; preCheck = '' @@ -96,14 +112,15 @@ buildPythonApplication (finalAttrs: { passthru.updateScript = nix-update-script { }; meta = { + changelog = "https://github.com/yaqwsx/KiKit/releases/tag/${finalAttrs.src.tag}"; description = "Automation for KiCAD boards"; homepage = "https://github.com/yaqwsx/KiKit/"; - changelog = "https://github.com/yaqwsx/KiKit/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + mainProgram = "kikit"; maintainers = with lib.maintainers; [ jfly matusf ]; teams = with lib.teams; [ ngi ]; - license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/ki/kikit/solidpython/default.nix b/pkgs/by-name/ki/kikit/solidpython/default.nix index 7003d6a590ce..7f02e5c00228 100644 --- a/pkgs/by-name/ki/kikit/solidpython/default.nix +++ b/pkgs/by-name/ki/kikit/solidpython/default.nix @@ -7,7 +7,7 @@ poetry-core, prettytable, ply, - setuptools, + setuptools_80, euclid3, }: buildPythonPackage (finalAttrs: { @@ -28,7 +28,8 @@ buildPythonPackage (finalAttrs: { propagatedBuildInputs = [ ply - setuptools + # Pinned to v80 due to pkg_resources removal, see https://github.com/SolidCode/SolidPython/issues/216 + setuptools_80 euclid3 prettytable diff --git a/pkgs/by-name/ki/killport/package.nix b/pkgs/by-name/ki/killport/package.nix index 579156558456..85f4658533fd 100644 --- a/pkgs/by-name/ki/killport/package.nix +++ b/pkgs/by-name/ki/killport/package.nix @@ -2,34 +2,47 @@ lib, rustPlatform, fetchCrate, + stdenv, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "killport"; - version = "1.1.0"; + version = "2.0.1"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-7bENyg/KR4oI//jvG6bw+3UX3j9ITAXCMTpc+65VBZ8="; + hash = "sha256-BEvtRNP/fuS1l7RbUT4+6jWIElEa23yGQCOi9k23B0o="; }; - cargoHash = "sha256-+PhaRVpsM/6GOnGkGDROoOGasrZsagK1LqBZTo9IbSI="; + cargoHash = "sha256-fEeG076P6z5FojNG19QXQYTymJddLemt9L+v9OX/uxI="; nativeBuildInputs = [ rustPlatform.bindgenHook ]; checkFlags = [ - # assertion failed: re.is_match(data) + # assertion failed: re.is_match(data) or blocked by sandbox "--skip=test_mode_option" "--skip=test_signal_handling" + "--skip=test_signal_sig" + "--skip=test_mode_short_flag" + "--skip=test_mode_process_finds_process" + "--skip=test_kill_udp_process" + "--skip=test_mode_auto_finds_process" + "--skip=test_kill_tcp_ipv4_process" + "--skip=test_dry_run_with_signal" + "--skip=test_combined_flags" + "--skip=test_dry_run_does_not_kill" "--skip=test_dry_run_option" "--skip=test_basic_kill_process" + "--skip=test_unix_process_kill_" ]; + __darwinAllowLocalNetworking = true; + meta = { description = "Command-line tool to easily kill processes running on a specified port"; homepage = "https://github.com/jkfran/killport"; license = lib.licenses.mit; - maintainers = [ ]; + maintainers = with lib.maintainers; [ tbutter ]; mainProgram = "killport"; }; }) diff --git a/pkgs/by-name/ki/kilo/package.nix b/pkgs/by-name/ki/kilo/package.nix index 15dd55fab2e2..b49d470751de 100644 --- a/pkgs/by-name/ki/kilo/package.nix +++ b/pkgs/by-name/ki/kilo/package.nix @@ -190,11 +190,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { "aarch64-linux" "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" - ]; - badPlatforms = [ - # Broken due to Bun requiring AVX when run via Rosetta 2 on Apple Silicon. - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ki/kimai/package.nix b/pkgs/by-name/ki/kimai/package.nix index c4ba83df55eb..0bb42234493a 100644 --- a/pkgs/by-name/ki/kimai/package.nix +++ b/pkgs/by-name/ki/kimai/package.nix @@ -7,13 +7,13 @@ php.buildComposerProject2 (finalAttrs: { pname = "kimai"; - version = "2.58.0"; + version = "2.62.0"; src = fetchFromGitHub { owner = "kimai"; repo = "kimai"; tag = finalAttrs.version; - hash = "sha256-JS4Mjn8fUr9CCQiELnCVH1Arg7uk7KbRwYWF1ECuMRM="; + hash = "sha256-IN9AnyN04inRK43YbMas6rUtDhSXCtbEkP6vv+yZREc="; }; php = php.buildEnv { @@ -38,7 +38,7 @@ php.buildComposerProject2 (finalAttrs: { ''; }; - vendorHash = "sha256-bPEc/uOPorBo2EXNVBvvuy7yV3Poif2GrjD5jhY974M="; + vendorHash = "sha256-MkQlK3DUbLBkkwZkxzGdR98NTHx/o5KD9D194Dg2F38="; composerNoPlugins = false; postInstall = '' diff --git a/pkgs/by-name/ki/kin-openapi/package.nix b/pkgs/by-name/ki/kin-openapi/package.nix index 7a22e1454880..83b4a8963831 100644 --- a/pkgs/by-name/ki/kin-openapi/package.nix +++ b/pkgs/by-name/ki/kin-openapi/package.nix @@ -5,14 +5,14 @@ }: buildGoModule (finalAttrs: { pname = "kin-openapi"; - version = "0.140.0"; - vendorHash = "sha256-o6JX0WWT0402VUDz2Y7Clq7txcjvAQhrLJk+8+Xj78k="; + version = "0.142.0"; + vendorHash = "sha256-uprdzJnaxd1UyEdZFFPvmo2Xu/QXJdheC1eqkyKY9Zc="; src = fetchFromGitHub { owner = "getkin"; repo = "kin-openapi"; tag = "v${finalAttrs.version}"; - hash = "sha256-KmESbc9oPlBBTN9Mgx5xlBWcT6/tVXepxqd/uTWVpAk="; + hash = "sha256-QNFHKleHRjta9juSPXLJ/0h/vMV/XbODQ/z4VFD5UK0="; }; checkFlags = diff --git a/pkgs/by-name/ki/kind/package.nix b/pkgs/by-name/ki/kind/package.nix index 5a5d0303a46e..ee1ea69f2044 100644 --- a/pkgs/by-name/ki/kind/package.nix +++ b/pkgs/by-name/ki/kind/package.nix @@ -3,6 +3,7 @@ stdenv, buildGoModule, fetchFromGitHub, + fetchpatch, installShellFiles, testers, nix-update-script, @@ -11,18 +12,24 @@ buildGoModule (finalAttrs: { pname = "kind"; - version = "0.31.0"; + version = "0.32.0"; src = fetchFromGitHub { rev = "v${finalAttrs.version}"; owner = "kubernetes-sigs"; repo = "kind"; - hash = "sha256-3icwtfwlSkYOEw9bzEhKJC7OtE1lnBjZSYp+cC/2XNc="; + hash = "sha256-ii0VhS1Nib+r2ZFIIkRvkcGY1fLxev6WnhbqvaZW7j8="; }; patches = [ # fix kernel module path used by kind ./kernel-module-path.patch + + # fix apiserver connection loss after envoy lb container restart + (fetchpatch { + url = "https://github.com/kubernetes-sigs/kind/commit/9a24e6c1ae3d59f8de052ee5c3842820450a369a.patch"; + hash = "sha256-BP2Ub8b1GA7V0CGvhcoGuHRm7u+IMRTmN3mDc2rePnY="; + }) ]; vendorHash = "sha256-tRpylYpEGF6XqtBl7ESYlXKEEAt+Jws4x4VlUVW8SNI="; diff --git a/pkgs/by-name/ki/kine/package.nix b/pkgs/by-name/ki/kine/package.nix index 04dcf1d21b6d..91ece6e4756b 100644 --- a/pkgs/by-name/ki/kine/package.nix +++ b/pkgs/by-name/ki/kine/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kine"; - version = "0.16.0"; + version = "0.16.3"; src = fetchFromGitHub { owner = "k3s-io"; repo = "kine"; rev = "v${finalAttrs.version}"; - hash = "sha256-1hVhmWWVqhFceJhzFKuqF66YFHRoue+wrqrF0KtW3No="; + hash = "sha256-6/aaG8SE8spR0vNCHSkIRTQf5HoBnRFKjkO01uJHorc="; }; - vendorHash = "sha256-LJ9CxLxIzydXyz5EdgXzo16X6oJWguIQwKlzQ33fGeU="; + vendorHash = "sha256-8AWGYrnawnPnAqGr8pDzh6ePzyuY5Q5fy4cdphYELB8="; ldflags = [ "-s" diff --git a/pkgs/by-name/ki/kingfisher/package.nix b/pkgs/by-name/ki/kingfisher/package.nix new file mode 100644 index 000000000000..942845ed89b4 --- /dev/null +++ b/pkgs/by-name/ki/kingfisher/package.nix @@ -0,0 +1,67 @@ +{ + lib, + boost, + cmake, + fetchFromGitHub, + libgit2, + nix-update-script, + openssl, + pkg-config, + rust-jemalloc-sys, + rustPlatform, + sqlite, + versionCheckHook, + zlib, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "kingfisher"; + version = "1.107.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "mongodb"; + repo = "kingfisher"; + tag = "v${finalAttrs.version}"; + hash = "sha256-PhrniOr2YRaWbCbI35bhdYzztgegnKVTw/rWX/BMwGQ="; + }; + + cargoHash = "sha256-bEPg0exoNFxk/CZgThn6SXXx6ELJcKvmXBqDVeZlKv4="; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + boost + libgit2 + openssl + rust-jemalloc-sys + sqlite + zlib + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + env = { + LIBSQLITE3_SYS_USE_PKG_CONFIG = true; + }; + + doInstallCheck = true; + + # Integration tests exceed memory limits and can crash + doCheck = false; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Tool to detect leaked secrets and perform live validation"; + homepage = "https://github.com/mongodb/kingfisher"; + changelog = "https://github.com/mongodb/kingfisher/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "kingfisher"; + }; +}) diff --git a/pkgs/by-name/ki/kip/package.nix b/pkgs/by-name/ki/kip/package.nix new file mode 100644 index 000000000000..a1a7d2a7863c --- /dev/null +++ b/pkgs/by-name/ki/kip/package.nix @@ -0,0 +1,98 @@ +{ + lib, + stdenv, + fetchFromGitLab, + arpa2cm, + arpa2common, + bison, + cacert, + cmake, + cyrus_sasl, + e2fsprogs, + flex, + freediameter, + gnutls, + json_c, + libev, + libkrb5, + libressl, + openssl, + pkg-config, + python3, + quick-sasl, + quickder, + quickmem, + unbound, + nix-update-script, +}: +let + python-with-packages = python3.withPackages ( + ps: with ps; [ + asn1ate + colored + pyparsing + setuptools + six + ] + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "kip"; + version = "0.15.0"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "kip"; + tag = "v${finalAttrs.version}"; + hash = "sha256-A+tPaImjd9j1Vq69Dgh3j86xI/OcovwTZSULLkOVZaI="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + bison + cacert + cmake + cyrus_sasl + flex + libkrb5 + openssl + pkg-config + ]; + + buildInputs = [ + arpa2cm + arpa2common + cyrus_sasl + e2fsprogs + freediameter + gnutls + json_c + libev + libkrb5 + libressl + python-with-packages + quick-sasl + quickder + quickmem + unbound + ]; + + cmakeFlags = [ + (lib.cmakeFeature "freeDiameter_EXTENSION_DIR" "${placeholder "out"}/lib/freeDiameter") + ]; + + preBuild = '' + patchShebangs test + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Keyful Identity Protocol — symmetric-key encryption and signing via an online KIP Service"; + homepage = "https://gitlab.com/arpa2/kip"; + license = lib.licenses.bsd2; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/ki/kirimoto/package.nix b/pkgs/by-name/ki/kirimoto/package.nix index 608466b56362..292b05cf645f 100644 --- a/pkgs/by-name/ki/kirimoto/package.nix +++ b/pkgs/by-name/ki/kirimoto/package.nix @@ -5,12 +5,12 @@ }: let - version = "4.7.0"; + version = "4.7.1"; pname = "kirimoto"; src = fetchurl { url = "https://github.com/GridSpace/grid-apps/releases/download/${version}/KiriMoto-linux-x86_64.AppImage"; - hash = "sha256-bLeGDZzAzBVC4tTwcC8uDngqOEeJ/vyTJGre+EovOgs="; + hash = "sha256-qFvPuzoH/QsOA4WgBTn5t8Pkto3Sg5h+VSmFn7aEtR8="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; diff --git a/pkgs/by-name/ki/kiro-cli/package.nix b/pkgs/by-name/ki/kiro-cli/package.nix index 727e16c43fd4..b2a468be6fea 100644 --- a/pkgs/by-name/ki/kiro-cli/package.nix +++ b/pkgs/by-name/ki/kiro-cli/package.nix @@ -3,10 +3,17 @@ stdenv, fetchurl, autoPatchelfHook, + makeBinaryWrapper, undmg, versionCheckHook, xz, bzip2, + wl-clipboard, + # On Wayland, kiro-cli shells out to wl-clipboard (wl-copy/wl-paste) for + # clipboard access. Enabling this puts wl-clipboard on the runtime PATH so + # clipboard support works out of the box under Wayland sessions. Has no + # effect on Darwin. + waylandSupport ? stdenv.hostPlatform.isLinux, }: let @@ -14,26 +21,22 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kiro-cli"; - version = "2.5.1"; + version = "2.13.0"; src = - let - darwinDmg = fetchurl { - url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; - hash = "sha256-fSwq1iMCB/st3u+WI7nNxhx/ZAVfjpKIcLcmv+jJfv4="; - }; - in { x86_64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-x86_64-linux.tar.gz"; - hash = "sha256-hl3SeItsJ3uAXtZeoBISWJArefXfKBmLgzmnWKYVXxw="; + hash = "sha256-8qEnlNv8lQK3SCjYJ/AdfWB/RELpjLI0VQ7n4vKA7DI="; }; aarch64-linux = fetchurl { url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/kirocli-aarch64-linux.tar.gz"; - hash = "sha256-DLJY/VHexAToA3EjwYaGwSz3E2aTtT7Xbxnw9nBQ0Pk="; + hash = "sha256-uKR5ZxuijDgfIJ4DmDVhN5XGHDyOyiRkLcTie2iuzZU="; + }; + aarch64-darwin = fetchurl { + url = "https://desktop-release.q.us-east-1.amazonaws.com/${finalAttrs.version}/Kiro%20CLI.dmg"; + hash = "sha256-GAK8+adzrEc1kXtHVCNC1aU09C86D9mroSQv7dXvbfo="; }; - x86_64-darwin = darwinDmg; - aarch64-darwin = darwinDmg; } .${system} or (throw "Unsupported system: ${system}"); @@ -45,6 +48,9 @@ stdenv.mkDerivation (finalAttrs: { lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook ] + ++ lib.optionals (stdenv.hostPlatform.isLinux && waylandSupport) [ + makeBinaryWrapper + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ undmg ]; @@ -69,6 +75,12 @@ stdenv.mkDerivation (finalAttrs: { install -Dm755 bin/kiro-cli-chat $out/bin/kiro-cli-chat install -Dm755 bin/kiro-cli-term $out/bin/kiro-cli-term '' + + lib.optionalString (stdenv.hostPlatform.isLinux && waylandSupport) '' + for bin in kiro-cli kiro-cli-chat kiro-cli-term; do + wrapProgram $out/bin/$bin \ + --suffix PATH : ${lib.makeBinPath [ wl-clipboard ]} + done + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' mkdir -p $out/bin $out/Applications cp -r "../Kiro CLI.app" "$out/Applications/" @@ -90,12 +102,14 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kiro.dev"; license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - maintainers = [ lib.maintainers.jamesward ]; + maintainers = with lib.maintainers; [ + jamesward + pmw + ]; mainProgram = "kiro-cli"; platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ki/kiro-cli/update.sh b/pkgs/by-name/ki/kiro-cli/update.sh index baff24e34e71..bedf83491dfc 100755 --- a/pkgs/by-name/ki/kiro-cli/update.sh +++ b/pkgs/by-name/ki/kiro-cli/update.sh @@ -63,7 +63,7 @@ echo "darwin hash: $darwin_hash" # Get current hashes from package.nix current_x86_hash=$(grep -A2 'x86_64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') current_aarch64_hash=$(grep -A2 'aarch64-linux = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') -current_darwin_hash=$(grep -A2 'darwinDmg = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') +current_darwin_hash=$(grep -A2 'aarch64-darwin = fetchurl' "$PACKAGE_NIX" | grep -Po 'hash = "\K[^"]+') # Update version and hashes sed -i "s|version = \"$current_version\"|version = \"$latest_version\"|" "$PACKAGE_NIX" diff --git a/pkgs/by-name/ki/kiro/package.nix b/pkgs/by-name/ki/kiro/package.nix index d7c10b95a3f6..1a866bbd3d06 100644 --- a/pkgs/by-name/ki/kiro/package.nix +++ b/pkgs/by-name/ki/kiro/package.nix @@ -5,6 +5,7 @@ fetchurl, extraCommandLineArgs ? "", useVSCodeRipgrep ? stdenv.hostPlatform.isDarwin, + _7zz, }: let @@ -14,7 +15,7 @@ in inherit useVSCodeRipgrep; commandLineArgs = extraCommandLineArgs; - version = "0.12.301"; + version = "0.12.333"; pname = "kiro"; # You can find the current VSCode version in the About dialog: @@ -31,7 +32,16 @@ in url = sources.url; hash = sources.hash; }; - sourceRoot = "Kiro"; + + # Kiro.dmg is APFS formatted, unpack with 7zz + extraNativeBuildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ _7zz ]; + + sourceRoot = if stdenv.hostPlatform.isDarwin then "Kiro.app" else "Kiro"; + + sourceExecutableName = if stdenv.hostPlatform.isDarwin then "code" else "kiro"; + + dontFixup = stdenv.hostPlatform.isDarwin; + patchVSCodePath = true; tests = { }; @@ -48,7 +58,6 @@ in ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "kiro"; diff --git a/pkgs/by-name/ki/kiro/sources.json b/pkgs/by-name/ki/kiro/sources.json index 7b95fb488123..3bbebcea1ec8 100644 --- a/pkgs/by-name/ki/kiro/sources.json +++ b/pkgs/by-name/ki/kiro/sources.json @@ -1,14 +1,10 @@ { "x86_64-linux": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.301/tar/kiro-ide-0.12.301-stable-linux-x64.tar.gz", - "hash": "sha256-TSsezw9e4qwehiw1ZRkGIcNgsm9bfORqNZN+wBeoxZM=" - }, - "x86_64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-x64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-x64.dmg", - "hash": "sha256-t/UxzyVzx0+zlC6T2Rs3cmWObRYNdmhKoIobYGa+Yq4=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/linux-x64/signed/0.12.333/tar/kiro-ide-0.12.333-stable-linux-x64.tar.gz", + "hash": "sha256-EEj0hz3fxPtesifXuFb0DQfFHaYgOQ1wgkaqcNMeX84=" }, "aarch64-darwin": { - "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.301/kiro-ide-0.12.301-stable-darwin-arm64.dmg", - "hash": "sha256-Ofi+JB7aLSVYFnP3bUnkGGg900/pUu8bpEbnYfW1sDI=" + "url": "https://prod.download.desktop.kiro.dev/releases/stable/darwin-arm64/signed/0.12.333/kiro-ide-0.12.333-stable-darwin-arm64.dmg", + "hash": "sha256-Wu5dpXzth/TTly3k019ln/cHl3ZgtS8PenGTzwR5b6Y=" } } diff --git a/pkgs/by-name/ki/kiro/update.sh b/pkgs/by-name/ki/kiro/update.sh index 211dd624d020..07652514b9c2 100755 --- a/pkgs/by-name/ki/kiro/update.sh +++ b/pkgs/by-name/ki/kiro/update.sh @@ -12,7 +12,6 @@ SOURCES_JSON="${SCRIPT_DIR}/sources.json" # Platform configuration declare -A PLATFORM_URLS=( ["x86_64-linux"]="https://prod.download.desktop.kiro.dev/stable/metadata-linux-x64-stable.json" - ["x86_64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-x64-stable.json" ["aarch64-darwin"]="https://prod.download.desktop.kiro.dev/stable/metadata-dmg-darwin-arm64-stable.json" ) diff --git a/pkgs/by-name/ki/kiterunner/package.nix b/pkgs/by-name/ki/kiterunner/package.nix index c30a8e139085..1cb256d51c69 100644 --- a/pkgs/by-name/ki/kiterunner/package.nix +++ b/pkgs/by-name/ki/kiterunner/package.nix @@ -37,7 +37,7 @@ buildGoModule (finalAttrs: { and endpoints in modern applications. ''; homepage = "https://github.com/assetnote/kiterunner"; - license = with lib.licenses; [ agpl3Only ]; + license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ki/kitsas/package.nix b/pkgs/by-name/ki/kitsas/package.nix index d96b64028c4d..d54b1f68ad55 100644 --- a/pkgs/by-name/ki/kitsas/package.nix +++ b/pkgs/by-name/ki/kitsas/package.nix @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/artoh/kitupiikki"; license = lib.licenses.gpl3Plus; mainProgram = "kitsas"; - maintainers = [ ]; + maintainers = [ lib.maintainers.lajp ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/ki/kitty-bin/package.nix b/pkgs/by-name/ki/kitty-bin/package.nix new file mode 100644 index 000000000000..f197b6819f5f --- /dev/null +++ b/pkgs/by-name/ki/kitty-bin/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + _7zz, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "kitty-bin"; + version = "0.47.4"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/kovidgoyal/kitty/releases/download/v${finalAttrs.version}/kitty-${finalAttrs.version}.dmg"; + hash = "sha256-tTubGKJ9U61Eol3Wd2/ejEdIe04QOsUNaCrx7o57d+0="; + }; + + # undmg can't read the APFS dmg; -snld keeps the .app's symlinks intact. + nativeBuildInputs = [ _7zz ]; + sourceRoot = "."; + unpackCmd = "7zz x -snld $curSrc"; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" "$out/bin" + cp -R kitty.app "$out/Applications/kitty.app" + ln -s "$out/Applications/kitty.app/Contents/MacOS/kitty" "$out/bin/kitty" + ln -s "$out/Applications/kitty.app/Contents/MacOS/kitten" "$out/bin/kitten" + + runHook postInstall + ''; + + # leave the signed bundle untouched so its signature stays valid. + dontFixup = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://github.com/kovidgoyal/kitty"; + description = "Fast, feature-rich, GPU based terminal emulator (prebuilt signed macOS app)"; + changelog = "https://github.com/kovidgoyal/kitty/blob/v${finalAttrs.version}/docs/changelog.rst"; + license = lib.licenses.gpl3Only; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = lib.platforms.darwin; + mainProgram = "kitty"; + maintainers = with lib.maintainers; [ carlossless ]; + }; +}) diff --git a/pkgs/by-name/ki/kitty-img/package.nix b/pkgs/by-name/ki/kitty-img/package.nix index 96a6da300e1e..a7ede19a6bde 100644 --- a/pkgs/by-name/ki/kitty-img/package.nix +++ b/pkgs/by-name/ki/kitty-img/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Print images inline in kitty"; homepage = "https://git.sr.ht/~zethra/kitty-img"; changelog = "https://git.sr.ht/~zethra/kitty-img/refs/${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ gaykitty ]; mainProgram = "kitty-img"; }; diff --git a/pkgs/by-name/ki/kitty-themes/package.nix b/pkgs/by-name/ki/kitty-themes/package.nix index 4246c4015658..9a9adbc49bef 100644 --- a/pkgs/by-name/ki/kitty-themes/package.nix +++ b/pkgs/by-name/ki/kitty-themes/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "kitty-themes"; - version = "0-unstable-2026-03-31"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty-themes"; - rev = "c467f3ef3fd44f3fa3c16599e0d1663be027dea0"; - hash = "sha256-oNMf6hGcNj9IS7m+lo6xRsBAPQw40w7MlEPZCTv3Ggg="; + rev = "e144651f75891cf4795ef1e7c24bb3e27c47aa06"; + hash = "sha256-cl79/m3tGZzGXBuwcIIBxsewrcgaFK0R0VRlRiiw5yk="; }; dontConfigure = true; diff --git a/pkgs/by-name/ki/kitty/package.nix b/pkgs/by-name/ki/kitty/package.nix index cd4083b3194d..89f1c57fc6b9 100644 --- a/pkgs/by-name/ki/kitty/package.nix +++ b/pkgs/by-name/ki/kitty/package.nix @@ -50,21 +50,21 @@ with python3Packages; buildPythonApplication rec { pname = "kitty"; - version = "0.47.2"; + version = "0.48.0"; pyproject = false; src = fetchFromGitHub { owner = "kovidgoyal"; repo = "kitty"; tag = "v${version}"; - hash = "sha256-hRQ/1EMBt04Er1OfLg1W9fIma3NZBHZklW1N4DmFBpM="; + hash = "sha256-+x3saXQw+6BzBYfwwur0DiTaJZVNgOYKJ4UVzeScbtk="; }; goModules = (buildGo126Module { pname = "kitty-go-modules"; inherit src version; - vendorHash = "sha256-zZZDrWzl2q/o4f52diE0YDV/MdYfsdKWWjQ0ej2bBTM="; + vendorHash = "sha256-nxPca7xDgxQd8vXbGKGuKXmB5vu0d3me//m8AULJZ6o="; }).goModules; buildInputs = [ diff --git a/pkgs/by-name/ki/kiwix-apple/package.nix b/pkgs/by-name/ki/kiwix-apple/package.nix index e8e976367bf9..b2d5202d601a 100644 --- a/pkgs/by-name/ki/kiwix-apple/package.nix +++ b/pkgs/by-name/ki/kiwix-apple/package.nix @@ -8,11 +8,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "kiwix-apple"; - version = "3.14.0"; + version = "3.15.1"; src = fetchurl { url = "https://download.kiwix.org/release/kiwix-macos/kiwix-macos_${finalAttrs.version}.dmg"; - hash = "sha256-rVfoJg8VTyEF6KeMGIOTUijtz8Ot0DerayrPgs6Wje8="; + hash = "sha256-3wZ7zavLmLyPYGrdFpnhd8a1paI65yHFdL6JzL1e0e0="; }; sourceRoot = "."; diff --git a/pkgs/by-name/kj/kjv/package.nix b/pkgs/by-name/kj/kjv/package.nix index 16876f9b7b06..0fe0138020c0 100644 --- a/pkgs/by-name/kj/kjv/package.nix +++ b/pkgs/by-name/kj/kjv/package.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation { version = "unstable-2021-03-11"; src = fetchFromGitHub { - owner = "bontibon"; + owner = "layeh"; repo = "kjv"; rev = "108595dcbb9bb12d40e0309f029b6fb3ccd81309"; hash = "sha256-Z6myd9Xn23pYizG+IZVDrP988pYU06QIcpqXtWTcPiw="; @@ -42,7 +42,7 @@ stdenv.mkDerivation { meta = { description = "Bible, King James Version"; - homepage = "https://github.com/bontibon/kjv"; + homepage = "https://github.com/layeh/kjv"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ jtobin diff --git a/pkgs/by-name/kl/klayout/package.nix b/pkgs/by-name/kl/klayout/package.nix index 6b842a645514..7e6ff18cc50b 100644 --- a/pkgs/by-name/kl/klayout/package.nix +++ b/pkgs/by-name/kl/klayout/package.nix @@ -124,7 +124,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High performance layout viewer and editor with support for GDS and OASIS"; mainProgram = "klayout"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; homepage = "https://www.klayout.de/"; changelog = "https://www.klayout.de/development.html#${finalAttrs.version}"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/kl/kloak/package.nix b/pkgs/by-name/kl/kloak/package.nix index 38475a6f9757..83a5f783c62a 100644 --- a/pkgs/by-name/kl/kloak/package.nix +++ b/pkgs/by-name/kl/kloak/package.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "kloak"; - version = "0.8.5-1"; + version = "0.8.6-1"; src = fetchFromGitHub { owner = "Whonix"; repo = "kloak"; tag = finalAttrs.version; - hash = "sha256-fDmqA00b5ESS9LW2QIeEx3wWb0lhgkqoBYcw1XYDI7k="; + hash = "sha256-zaoKVPocL8iaX6hhZh0Q+cgYg3JLWBcMgGU0nLlNcjo="; }; strictDeps = true; diff --git a/pkgs/by-name/kl/kluctl/package.nix b/pkgs/by-name/kl/kluctl/package.nix index c18d75d1619a..655a9a1afb65 100644 --- a/pkgs/by-name/kl/kluctl/package.nix +++ b/pkgs/by-name/kl/kluctl/package.nix @@ -2,6 +2,7 @@ lib, stdenv, buildGoModule, + buildNpmPackage, buildPackages, fetchFromGitHub, installShellFiles, @@ -12,18 +13,18 @@ buildGoModule (finalAttrs: { pname = "kluctl"; - version = "2.27.0"; + version = "2.28.2"; src = fetchFromGitHub { owner = "kluctl"; repo = "kluctl"; tag = "v${finalAttrs.version}"; - hash = "sha256-m/bfZb+sp0gqxfMdBr/gAOxfYHdrPwKRcJAqprkAkQE="; + hash = "sha256-Adh2n8aE+DEBY1MC4laVPDdr5dq6FKSMEFLjbs74D4c="; }; subPackages = [ "cmd" ]; - vendorHash = "sha256-TKMMMZ+8bv5kKgrHIp3CXmt4tpi5VejPpXv/oiX4M3c="; + vendorHash = "sha256-cQJRU3vL5wJ0dgYMtN4qFdvJyp367I4N7GM6PhRvW0I="; ldflags = [ "-s" @@ -38,6 +39,29 @@ buildGoModule (finalAttrs: { # Depends on docker doCheck = false; + preBuild = + let + webui = buildNpmPackage { + pname = "kluctl-webui"; + inherit (finalAttrs) version src; + + sourceRoot = "source/pkg/webui/ui"; + + npmDepsHash = "sha256-e5Ic3W1UPQn/2ggaYez7G7exXNZA6BobP4BTM6B6rlI="; + + npmBuildScript = "build"; + + installPhase = '' + mkdir -p $out + cp -r build $out/ + ''; + }; + in + '' + rm -rf pkg/webui/ui/build + cp -r ${webui}/build pkg/webui/ui/build + ''; + postInstall = let emulator = stdenv.hostPlatform.emulator buildPackages; diff --git a/pkgs/by-name/kn/kn/package.nix b/pkgs/by-name/kn/kn/package.nix index 8e683a1220b5..53a76a274d9d 100644 --- a/pkgs/by-name/kn/kn/package.nix +++ b/pkgs/by-name/kn/kn/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "kn"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "knative"; repo = "client"; tag = "knative-v${finalAttrs.version}"; - hash = "sha256-G5kadNskSwKBxSuvs58aJUM7+lraevk2GKH/sncslTo="; + hash = "sha256-/mQvYYMwOvrwrIt8xo3j5qXXmfwDFJByaj1quHc5ebk="; }; - vendorHash = "sha256-+IiDWoT9E4SCkmOwPQMTM7AdrXVA6OJa0Fg9Xjq42gI="; + vendorHash = "sha256-1CTzRMlMsF4AZHYZMq0klmNpfmk4/O6ToitHyA9eEg0="; env.GOWORK = "off"; @@ -48,7 +48,7 @@ buildGoModule (finalAttrs: { description = "Create Knative resources interactively from the command line or from within scripts"; mainProgram = "kn"; homepage = "https://github.com/knative/client"; - changelog = "https://github.com/knative/client/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/knative/client/releases/tag/knative-v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = [ ]; }; diff --git a/pkgs/tools/networking/knock/package.nix b/pkgs/by-name/kn/knock/package.nix similarity index 75% rename from pkgs/tools/networking/knock/package.nix rename to pkgs/by-name/kn/knock/package.nix index 2ac33f93294f..adbb3a30a1cb 100644 --- a/pkgs/tools/networking/knock/package.nix +++ b/pkgs/by-name/kn/knock/package.nix @@ -5,17 +5,24 @@ installShellFiles, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "knock"; version = "0.0.2"; + __structuredAttrs = true; + src = fetchFromCodeberg { owner = "nat-418"; repo = "knock"; - rev = "v${version}"; - hash = "sha256-K+L4F4bTERQSqISAmfyps/U5GJ2N0FdJ3RmpiUmt4uA="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Iqx/UBZlsO8qxXpiZ/m61ojvfepodwUoWaP2Q9uh648="; }; + # devendor go modules + prePatch = '' + rm -rf vendor/ + ''; + vendorHash = "sha256-wkSXdIgfkHbVJYsgm/hLAeKA9geof92U3mzSzt7eJE8="; outputs = [ @@ -36,4 +43,4 @@ buildGoModule rec { changelog = "https://codeberg.org/nat-418/knock/raw/branch/trunk/CHANGELOG.md"; maintainers = with lib.maintainers; [ nat-418 ]; }; -} +}) diff --git a/pkgs/by-name/kn/knossosnet/package.nix b/pkgs/by-name/kn/knossosnet/package.nix index 96e16c05e9af..8214daf6bab9 100644 --- a/pkgs/by-name/kn/knossosnet/package.nix +++ b/pkgs/by-name/kn/knossosnet/package.nix @@ -11,13 +11,13 @@ buildDotnetModule rec { pname = "knossosnet"; - version = "1.3.7"; + version = "1.3.9"; src = fetchFromGitHub { owner = "KnossosNET"; repo = "Knossos.NET"; tag = "v${version}"; - hash = "sha256-zUV+sQdQ71ORKOZzd4yxgRK1HjtZc9wgkmnzz6bG8FA="; + hash = "sha256-ZRmv2S17bjHJZQPMzkRZoWXOPkfPed+QdIiBrtk/CiE="; }; patches = [ ./dotnet-8-upgrade.patch ]; diff --git a/pkgs/by-name/kn/knot-dns/package.nix b/pkgs/by-name/kn/knot-dns/package.nix index 76486a655421..c3c7743e0aa2 100644 --- a/pkgs/by-name/kn/knot-dns/package.nix +++ b/pkgs/by-name/kn/knot-dns/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "knot-dns"; - version = "3.5.5"; + version = "3.5.6"; src = fetchurl { url = "https://secure.nic.cz/files/knot-dns/knot-${finalAttrs.version}.tar.xz"; - sha256 = "38502c1472247c955aa3329bb5722e61ca765b833e3497d71f891ebf8e77fa04"; + sha256 = "8e2dde44c97f8a63ec5e6c11db26099acd5341286af5b6be900b62ccade68898"; }; outputs = [ diff --git a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix index cb449cb1df97..f501b3ca061e 100644 --- a/pkgs/by-name/kn/knot-resolver-manager_6/package.nix +++ b/pkgs/by-name/kn/knot-resolver-manager_6/package.nix @@ -9,7 +9,7 @@ let in assert lib.versionAtLeast kresd.version "6.0.0"; python3Packages.buildPythonPackage { - pname = "knot-resolver-manager_6"; + pname = "knot-resolver"; inherit (kresd) version src; pyproject = true; @@ -77,7 +77,7 @@ python3Packages.buildPythonPackage { doCheck = python3Packages.stdenv.hostPlatform.isLinux; # maybe in future nativeCheckInputs = with python3Packages; [ - augeas + python-augeas dnspython lief pytestCheckHook diff --git a/pkgs/by-name/kn/knot-resolver_5/package.nix b/pkgs/by-name/kn/knot-resolver_5/package.nix index 1bc541bb9498..7ff771ff9653 100644 --- a/pkgs/by-name/kn/knot-resolver_5/package.nix +++ b/pkgs/by-name/kn/knot-resolver_5/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, # native deps. runCommand, pkg-config, @@ -36,11 +35,11 @@ let unwrapped = stdenv.mkDerivation (finalAttrs: { pname = "knot-resolver_5"; - version = "5.7.6"; + version = "5.7.7"; src = fetchurl { url = "https://secure.nic.cz/files/knot-resolver/knot-resolver-${finalAttrs.version}.tar.xz"; - sha256 = "500ccd3a560300e547b8dc5aaff322f7c8e2e7d6f0d7ef5f36e59cb60504d674"; + sha256 = "481d2a6eb8690023895d389601e56fffbaeba3cc18cc1de5a5f177df9d0f9530"; }; outputs = [ @@ -48,15 +47,6 @@ let "dev" ]; - patches = [ - (fetchpatch { - # https://gitlab.nic.cz/knot/knot-resolver/-/merge_requests/1772 - url = "https://gitlab.nic.cz/knot/knot-resolver/-/commit/f4eaf8e69cc9839f68b613d0be10103e05c57fe9.patch"; - hash = "sha256-u/YQ85Jb5OxV8G3HeVPQUw0cmA+TLIDPze9mreqJGL4="; - excludes = [ "daemon/ratelimiting.test/tests.inc.c" ]; - }) - ]; - # Path fixups for the NixOS service. postPatch = '' patch meson.build <"${package_dir}/missing-hashes.json" + +echo "Updating offline cache hash…" +offline_cache_hash=$(yarn-berry-fetcher prefetch "${src_path}/client/yarn.lock" "${package_dir}/missing-hashes.json") +old_hash=$(nix-instantiate --eval --expr "with import ./. {}; koito.client.offlineCache.outputHash" --raw) +sed -i "s|${old_hash}|${offline_cache_hash}|" "${package_dir}/client.nix" + +echo "Done." diff --git a/pkgs/by-name/ko/komari-agent/package.nix b/pkgs/by-name/ko/komari-agent/package.nix index b2bf904c6e73..280f8e295a4c 100644 --- a/pkgs/by-name/ko/komari-agent/package.nix +++ b/pkgs/by-name/ko/komari-agent/package.nix @@ -27,7 +27,9 @@ buildGoModule (finalAttrs: { # tests require network access doCheck = false; - passthru.updateScript = nix-update-script { }; + passthru.updateScript = nix-update-script { + extraArgs = [ "--use-github-releases" ]; + }; meta = { homepage = "https://github.com/komari-monitor/komari-agent"; diff --git a/pkgs/by-name/ko/komga/package.nix b/pkgs/by-name/ko/komga/package.nix index fc7e34984b43..ea35ad3bfd2b 100644 --- a/pkgs/by-name/ko/komga/package.nix +++ b/pkgs/by-name/ko/komga/package.nix @@ -10,11 +10,11 @@ stdenvNoCC.mkDerivation rec { pname = "komga"; - version = "1.24.4"; + version = "1.25.0"; src = fetchurl { url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; - sha256 = "sha256-O06bHt4MgGL4Ffz0llUyX0VM/6MmnjSNGFjy3R8/J1I="; + sha256 = "sha256-NlL5rBpCFbiZ+HHNoOgLE0Ht3lXXul2qIb8rq9qEzhM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/komikku/package.nix b/pkgs/by-name/ko/komikku/package.nix index 3908d86b2586..c91f828342e0 100644 --- a/pkgs/by-name/ko/komikku/package.nix +++ b/pkgs/by-name/ko/komikku/package.nix @@ -24,14 +24,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "komikku"; - version = "50.4.0"; + version = "50.9.0"; pyproject = false; src = fetchFromCodeberg { owner = "valos"; repo = "Komikku"; tag = "v${finalAttrs.version}"; - hash = "sha256-u/OyWZJIntpeuVoJQmLrdsva3+xvwRX28N89aVZYc2o="; + hash = "sha256-fjAls3/ikNrQ1AgwUe9hFoQ48zv7UbGCUNB4dlmYM28="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/komodo/package.nix b/pkgs/by-name/ko/komodo/package.nix index 19a21ebc968f..1db23f3ce013 100644 --- a/pkgs/by-name/ko/komodo/package.nix +++ b/pkgs/by-name/ko/komodo/package.nix @@ -2,32 +2,38 @@ lib, rustPlatform, fetchFromGitHub, + pkg-config, + openssl, nix-update-script, nixosTests, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "komodo"; - version = "1.19.5"; + version = "2.2.0"; src = fetchFromGitHub { owner = "moghtech"; repo = "komodo"; tag = "v${finalAttrs.version}"; - hash = "sha256-dLBgdcrIp5QM2TVIa86qX7m1c5n+qOIQJtqJPGvIZ+0="; + hash = "sha256-Hw0JD4e/ODK19M/bZtX9foCu5c79XA8Jgv2fleltdLs="; }; - # Temporary fix to get build to pass until https://github.com/moghtech/komodo/pull/1122 - patches = [ - ./rustc-1_9_2-fixes.patch - ]; + cargoHash = "sha256-b/AgQBmS1QfP+BOCT4xL8majVKobig5M2YJhGuXMToc="; - cargoHash = "sha256-jf/Jp28g3inGn5jQp3cACdhl//tbXTMc1vP1K3g/CyQ="; + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; # disable for check. document generation is fail # > error: doctest failed, to rerun pass `-p komodo_client --doc` doCheck = false; + # xtask is a workspace-internal build helper, not a user-facing program. + postInstall = '' + rm -f $out/bin/xtask + ''; + passthru = { updateScript = nix-update-script { }; tests = { @@ -53,8 +59,11 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://komo.do"; changelog = "https://github.com/moghtech/komodo/releases/tag/v${finalAttrs.version}"; - mainProgram = "komodo"; - maintainers = with lib.maintainers; [ r17x ]; + mainProgram = "km"; + maintainers = with lib.maintainers; [ + r17x + channinghe + ]; license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch b/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch deleted file mode 100644 index 4021c35ba17e..000000000000 --- a/pkgs/by-name/ko/komodo/rustc-1_9_2-fixes.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/bin/core/src/alert/discord.rs b/bin/core/src/alert/discord.rs -index 427227d..6d19678 100644 ---- a/bin/core/src/alert/discord.rs -+++ b/bin/core/src/alert/discord.rs -@@ -230,14 +230,13 @@ pub async fn send_alert( - ) - } - AlertData::Custom { message, details } => { -- format!( -- "{level} | {message}{}", -- if details.is_empty() { -- format_args!("") -- } else { -- format_args!("\n{details}") -- } -- ) -+ let details_str = if details.is_empty() { -+ String::new() -+ } else { -+ format!("\n{details} f") -+ }; -+ -+ format!("{level} | {message}{details_str}") - } - AlertData::None {} => Default::default(), - }; -diff --git a/bin/core/src/alert/mod.rs b/bin/core/src/alert/mod.rs -index 9eba5da..1f51ac2 100644 ---- a/bin/core/src/alert/mod.rs -+++ b/bin/core/src/alert/mod.rs -@@ -474,14 +474,13 @@ fn standard_alert_content(alert: &Alert) -> String { - ) - } - AlertData::Custom { message, details } => { -- format!( -- "{level} | {message}{}", -- if details.is_empty() { -- format_args!("") -- } else { -- format_args!("\n{details}") -- } -- ) -+ let details_str = if details.is_empty() { -+ String::new() -+ } else { -+ format!("\n{details}") -+ }; -+ -+ format!("{level} | {message}{details_str}") - } - AlertData::None {} => Default::default(), - } diff --git a/pkgs/by-name/ko/komorebi/package.nix b/pkgs/by-name/ko/komorebi/package.nix index 9bc58263357d..8dba64355fe6 100644 --- a/pkgs/by-name/ko/komorebi/package.nix +++ b/pkgs/by-name/ko/komorebi/package.nix @@ -8,7 +8,7 @@ glib, gtk3, libgee, - # webkitgtk_4_0, + webkitgtk_4_1, clutter-gtk, clutter-gst, ninja, @@ -39,16 +39,17 @@ stdenv.mkDerivation (finalAttrs: { glib gtk3 libgee - # webkitgtk_4_0 + webkitgtk_4_1 clutter-gtk clutter-gst ]; + postPatch = '' + substituteInPlace meson.build --replace-fail "webkit2gtk-4.0" "webkit2gtk-4.1" + ''; passthru.tests.version = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { - # webkitgtk_4_0 was removed - broken = true; description = "Beautiful and customizable wallpaper manager for Linux"; homepage = "https://github.com/Komorebi-Fork/komorebi"; license = lib.licenses.gpl3Only; diff --git a/pkgs/by-name/ko/konsave/package.nix b/pkgs/by-name/ko/konsave/package.nix index bca1a13f07c6..feb4e7f9b7ba 100644 --- a/pkgs/by-name/ko/konsave/package.nix +++ b/pkgs/by-name/ko/konsave/package.nix @@ -6,13 +6,13 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "konsave"; - version = "2.2.0"; + version = "2.3.0"; pyproject = true; src = fetchPypi { inherit (finalAttrs) version; - pname = "Konsave"; - hash = "sha256-tWarqT2jFgCuSsa2NwMHRaR3/wj0khiRHidvRNMwM8M="; + pname = "konsave"; + hash = "sha256-Qe+RZIsgbqvFqWhUkfACbYvHtXQcp6yK+XrvqgXnlTc="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ko/kontainer/package.nix b/pkgs/by-name/ko/kontainer/package.nix index 4ee9ae7f474c..9b2e06be22be 100644 --- a/pkgs/by-name/ko/kontainer/package.nix +++ b/pkgs/by-name/ko/kontainer/package.nix @@ -11,7 +11,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "kontainer"; - version = "1.4.1"; + version = "1.5.0"; strictDeps = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "DenysMb"; repo = "Kontainer"; tag = finalAttrs.version; - hash = "sha256-15H4fTZ4Tja+nt0iKtFuULj/4g/0UK+W79R4kH7BFcs="; + hash = "sha256-sifNSnfvjZSDvCqXIOQWtmr3t/SQst20xpTfSr8YZh8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/koodo-reader/package.nix b/pkgs/by-name/ko/koodo-reader/package.nix index 29d3aecc989a..75319900ee1b 100644 --- a/pkgs/by-name/ko/koodo-reader/package.nix +++ b/pkgs/by-name/ko/koodo-reader/package.nix @@ -70,6 +70,12 @@ stdenv.mkDerivation (finalAttrs: { export npm_config_nodedir=${nodejs-slim} npm rebuild --verbose cpu-features + # register-scheme is an optional dependency of discord-rpc that fails to compile on modern macOS/Electron + # and is not required for the application's core functionality. + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + rm -rf node_modules/register-scheme + ''} + export npm_config_nodedir=${electron.headers} # Explicitly set identity to null to avoid signing on darwin yarn --offline run electron-builder --dir \ diff --git a/pkgs/by-name/ko/koodousfinder/package.nix b/pkgs/by-name/ko/koodousfinder/package.nix index 16b23b5dec66..7e987f65c3dc 100644 --- a/pkgs/by-name/ko/koodousfinder/package.nix +++ b/pkgs/by-name/ko/koodousfinder/package.nix @@ -10,9 +10,9 @@ python3.pkgs.buildPythonApplication { pyproject = true; src = fetchFromGitHub { - owner = "teixeira0xfffff"; + owner = "HuntDownProject"; repo = "KoodousFinder"; - # Not properly tagged, https://github.com/teixeira0xfffff/KoodousFinder/issues/7 + # Not properly tagged, https://github.com/HuntDownProject/KoodousFinder/issues/7 #tag = "v${version}"; rev = "d9dab5572f44e5cd45c04e6fcda38956897855d1"; hash = "sha256-skCbt2lDKgSyZdHY3WImbr6CF0icrDPTIXNV1736gKk="; @@ -34,8 +34,8 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tool to allows users to search for and analyze Android apps"; - homepage = "https://github.com/teixeira0xfffff/KoodousFinder"; - license = with lib.licenses; [ mit ]; + homepage = "https://github.com/HuntDownProject/KoodousFinder"; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/ko/kopia-ui/package.nix b/pkgs/by-name/ko/kopia-ui/package.nix index 68f8fe86a3dc..e32b5af7e61b 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.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${version}"; - hash = "sha256-9xvgm+A8h2pAX3oHtiFSa2xNab5BDkEBEtXQZz3Fd5A="; + hash = "sha256-yjeLV7N/U88oVdP4iJYgSM/QJLAMREaB/2jBcbTDWkA="; }; in buildNpmPackage { @@ -24,7 +24,7 @@ buildNpmPackage { sourceRoot = "${src.name}/app"; - npmDepsHash = "sha256-Ctp41vNZPVbycwIzWiTh+1ej3NpCf1WJCqnJsyoyxlc="; + npmDepsHash = "sha256-yj5+qiLfy6CjAOXIzT9OMu860Pefwn+HuJNoBAizb/0="; makeCacheWritable = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ko/kopia/package.nix b/pkgs/by-name/ko/kopia/package.nix index 933ad27aa7aa..0592f3a0e0bd 100644 --- a/pkgs/by-name/ko/kopia/package.nix +++ b/pkgs/by-name/ko/kopia/package.nix @@ -11,18 +11,18 @@ buildGoModule (finalAttrs: { pname = "kopia"; - version = "0.23.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "kopia"; repo = "kopia"; tag = "v${finalAttrs.version}"; - hash = "sha256-9xvgm+A8h2pAX3oHtiFSa2xNab5BDkEBEtXQZz3Fd5A="; + hash = "sha256-yjeLV7N/U88oVdP4iJYgSM/QJLAMREaB/2jBcbTDWkA="; }; __structuredAttrs = true; - vendorHash = "sha256-VMfFXGBIUtRa4JxhOn7YBfdLNmpmGrkBVKiIDn5vKTc="; + vendorHash = "sha256-5p/MUNkqNb+iAFxXXYRR2NB1WiGVIcNrTADsd/VjapU="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ko/kopuz/package.nix b/pkgs/by-name/ko/kopuz/package.nix new file mode 100644 index 000000000000..346c15987121 --- /dev/null +++ b/pkgs/by-name/ko/kopuz/package.nix @@ -0,0 +1,164 @@ +{ + lib, + stdenv, + rustPlatform, + pkg-config, + cmake, + git, + openssl, + cacert, + tailwindcss_4, + dioxus-cli, + yt-dlp, + fetchFromGitHub, + fetchurl, + libopus, + # Linux only + wrapGAppsHook3, + webkitgtk_4_1, + gtk3, + libsoup_3, + glib-networking, + alsa-lib, + xdotool, + wayland, + dbus, + libayatana-appindicator, +}: + +let + rustyV8Version = "130.0.7"; + rustyV8Target = stdenv.hostPlatform.rust.rustcTarget; + rustyV8Hashes = { + "aarch64-apple-darwin" = "sha256-9tvQD08OdW6GoNnx/3vgS27D9Aj9YdQdNJ9SgNvwAOo="; + "aarch64-unknown-linux-gnu" = "sha256-vu/ns1q+53FZ98tVCWZmsHYwwRBH1fOnTdBlhjcpkVo="; + "x86_64-unknown-linux-gnu" = "sha256-pkdsuU6bAkcIHEZUJOt5PXdzK424CEgTLXjLtQ80t10="; + }; + librustyV8 = fetchurl { + url = "https://github.com/denoland/rusty_v8/releases/download/v${rustyV8Version}/librusty_v8_release_${rustyV8Target}.a.gz"; + hash = + rustyV8Hashes.${rustyV8Target} + or (throw "no prebuilt librusty_v8 hash for target ${rustyV8Target}"); + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + __structuredAttrs = true; + + pname = "kopuz"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "Kopuz-org"; + repo = "kopuz"; + tag = "v${finalAttrs.version}"; + hash = "sha256-6Un2U9pfUfEHyx7x2zx7hRrAkqd/PbODCOZyb4EcC9o="; + }; + + cargoHash = "sha256-so8Q2Xx5XRQBB7RvD3muciPIUryW75AN5L98EnXJLMY="; + + env = { + RUSTY_V8_ARCHIVE = librustyV8; + SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt"; + }; + + nativeBuildInputs = [ + pkg-config + cmake + tailwindcss_4 + dioxus-cli + git + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + wrapGAppsHook3 + ]; + + buildInputs = [ + libopus + ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + webkitgtk_4_1 + gtk3 + libsoup_3 + glib-networking + alsa-lib + openssl + xdotool + wayland + dbus + libayatana-appindicator + ]; + + buildPhase = '' + runHook preBuild + + tailwindcss -i tailwind.css -o crates/kopuz/assets/tailwind.css --minify + + ${lib.optionalString stdenv.hostPlatform.isDarwin '' + mkdir -p "$TMPDIR/fake-bin" + cat > "$TMPDIR/fake-bin/codesign" << 'CODESIGN_EOF' + #!/bin/sh + exec true + CODESIGN_EOF + chmod +x "$TMPDIR/fake-bin/codesign" + export PATH="$TMPDIR/fake-bin:$PATH" + ''} + + dx build --release --platform desktop -p kopuz --offline --frozen + + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + ${ + if stdenv.hostPlatform.isLinux then + '' + cp -r target/dx/kopuz/release/linux/app/* $out/bin/ + + install -Dm644 data/com.temidaradev.kopuz.desktop \ + $out/share/applications/com.temidaradev.kopuz.desktop + substituteInPlace $out/share/applications/com.temidaradev.kopuz.desktop \ + --replace-fail "Exec=kopuz" "Exec=$out/bin/kopuz" + + install -Dm644 data/com.temidaradev.kopuz.metainfo.xml \ + $out/share/metainfo/com.temidaradev.kopuz.metainfo.xml + + install -Dm644 crates/kopuz/assets/logo.png \ + $out/share/icons/hicolor/256x256/apps/com.temidaradev.kopuz.png + '' + else + '' + # Dioxus outputs the bundle at macos/Kopuz.app (capitalised, no app/ subdir) + cp -r target/dx/kopuz/release/macos/Kopuz.app $out/bin/kopuz.app + # Symlink whatever binary dioxus placed in MacOS/ (name may differ in case) + macBin=$(find $out/bin/kopuz.app/Contents/MacOS -maxdepth 1 -type f | head -1) + ln -s "$macBin" $out/bin/kopuz + '' + } + + runHook postInstall + ''; + + preFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + gappsWrapperArgs+=( + --chdir $out/bin + --prefix PATH : ${lib.makeBinPath [ yt-dlp ]} + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libayatana-appindicator ]} + ) + ''; + + meta = { + description = "Fast, modern music player with Jellyfin and local library support"; + homepage = "https://github.com/Kopuz-org/kopuz"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ + temidaradev + NotAShelf + ]; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + mainProgram = "kopuz"; + }; +}) diff --git a/pkgs/by-name/ko/kord/package.nix b/pkgs/by-name/ko/kord/package.nix index 0d0cec62fd1a..bff91f9bb568 100644 --- a/pkgs/by-name/ko/kord/package.nix +++ b/pkgs/by-name/ko/kord/package.nix @@ -55,6 +55,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Music theory binary and library for Rust"; homepage = "https://github.com/twitchax/kord"; maintainers = with lib.maintainers; [ kidsan ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/ko/koreader/package.nix b/pkgs/by-name/ko/koreader/package.nix index 47e96fefa13c..b107abda4212 100644 --- a/pkgs/by-name/ko/koreader/package.nix +++ b/pkgs/by-name/ko/koreader/package.nix @@ -11,13 +11,13 @@ gtk3-x11, luajit, sdcv, - SDL2, + sdl3, openssl, writeScript, }: let - version = "2025.10"; + version = "2026.03"; # LuaJIT with table.pack/unpack support for KOReader # https://github.com/koreader/koreader-base/tree/master/thirdparty/luajit @@ -35,13 +35,16 @@ let owner = "koreader"; tag = "v${version}"; fetchSubmodules = true; - hash = "sha256-uYKN5fgIdCVH+pXU2lmsGu7HxZbDld5EJVO9o7Tk8BA="; + hash = "sha256-KWpWlFoBEAhVDuRTiF7yj1wlKLzYmvcngI9iWqsDuQY="; }; in stdenv.mkDerivation { pname = "koreader"; inherit version; + __structuredAttrs = true; + strictDeps = true; + src = let selectSystem = @@ -54,11 +57,11 @@ stdenv.mkDerivation { }; in fetchurl { - url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader-${version}-${arch}.deb"; + url = "https://github.com/koreader/koreader/releases/download/v${version}/koreader_${version}-1_${arch}.deb"; hash = selectSystem { - aarch64-linux = "sha256-z92sguFe5qcPmHk+Orm8vHJycVeZY3cYGByU6xIcrkA="; - armv7l-linux = "sha256-kVO+eUwGMULJZwbxZwbeooqRDF8oZPiuo47a7lNsl3I="; - x86_64-linux = "sha256-OYzMOUFzUzkYvcjjMX0FZBkZs//9ie3025lhhFOrt9M="; + aarch64-linux = "sha256-4ulpMXYcICQ5/9Q0GGn9lkbW0ntzIfUHQ5woTAhyXLU="; + armv7l-linux = "sha256-diMWFhL0D5bWPQFc9vvZZRPMfNxlxchGyT8Lz/TLHPs="; + x86_64-linux = "sha256-OhBu3oj9IqNmK5ngCkXvucVQq5aJohObgENtjdDcQcE="; }; }; @@ -73,7 +76,7 @@ stdenv.mkDerivation { gtk3-x11 luajit_koreader sdcv - SDL2 + sdl3 openssl ]; @@ -90,8 +93,9 @@ stdenv.mkDerivation { '' # Link SSL/network libraries + '' - ln -sf ${openssl.out}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1 - ln -sf ${openssl.out}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1 + ln -sf ${lib.getLib openssl}/lib/libcrypto.so.3 $out/lib/koreader/libs/libcrypto.so.1.1 + ln -sf ${lib.getLib openssl}/lib/libssl.so.3 $out/lib/koreader/libs/libssl.so.1.1 + ln -sf ${lib.getLib sdl3}/lib/libSDL3.so.0 $out/lib/koreader/libs/libSDL3.so.0 '' # Copy fonts + '' @@ -105,7 +109,7 @@ stdenv.mkDerivation { wrapProgram $out/bin/koreader --prefix LD_LIBRARY_PATH : $out/lib/koreader/libs:${ lib.makeLibraryPath [ gtk3-x11 - SDL2 + sdl3 glib stdenv.cc.cc openssl.out diff --git a/pkgs/by-name/ko/kotlin-cli/package.nix b/pkgs/by-name/ko/kotlin-cli/package.nix new file mode 100644 index 000000000000..02ca48c9c907 --- /dev/null +++ b/pkgs/by-name/ko/kotlin-cli/package.nix @@ -0,0 +1,62 @@ +{ + lib, + fetchurl, + stdenv, + jre, + makeWrapper, + nix-update-script, + jdk25, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kotlin-cli"; + version = "0.11.1"; + + src = fetchurl { + url = "https://packages.jetbrains.team/maven/p/amper/amper/org/jetbrains/kotlin/kotlin-cli/${finalAttrs.version}/kotlin-cli-${finalAttrs.version}-dist.tgz"; + hash = "sha256-De0qQ09r8ZOyTiptVsO6RD9CMnIRVaZaqoNyeJQSES8="; + }; + sourceRoot = "."; + dontBuild = true; + nativeBuildInputs = [ makeWrapper ]; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + mkdir -p $out/share/kotlin-cli + cp -r * $out/share/kotlin-cli/ + + mkdir -p $out/bin + chmod +x $out/share/kotlin-cli/bin/launcher.sh + + # Override amper runtime JVM. + sed -i 's|^[[:space:]]*jre_url=.*| jre_url=""|' $out/share/kotlin-cli/bin/launcher.sh + sed -i 's|^[[:space:]]*jre_target_dir=.*| jre_target_dir="${jdk25}"|' $out/share/kotlin-cli/bin/launcher.sh + + # Create the missing .flag file to satisfy the runtime check + touch $out/share/kotlin-cli/.flag + + # Override kotlin toolchain launcher JVM. + makeWrapper $out/share/kotlin-cli/bin/launcher.sh $out/bin/kotlin \ + --set KOTLIN_CLI_JAVA_HOME "${jdk25.home}" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--url=https://github.com/JetBrains/kotlin-toolchain" + ]; + }; + + meta = { + description = "Kotlin Toolchain CLI"; + homepage = "https://github.com/JetBrains/kotlin-toolchain"; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.dshatz ]; + platforms = jre.meta.platforms; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; + mainProgram = "kotlin"; + }; +}) diff --git a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix index 710a2d962e02..835493eb94a6 100644 --- a/pkgs/by-name/ko/kotlin-interactive-shell/package.nix +++ b/pkgs/by-name/ko/kotlin-interactive-shell/package.nix @@ -17,7 +17,7 @@ maven.buildMavenPackage (finalAttrs: { hash = "sha256-3DTyo7rPswpEVzFkcprT6FD+ITGJ+qCXFKXEGoCK+oE="; }; - mvnHash = "sha256-UHtvBVw35QBwgCD+nSduR0924ANAOfwrr/a4qPEYsrM="; + mvnHash = "sha256-qGxpeb+8hP0ljbI0+aHnuO5efzXvVQWo8VFYMuRzYck="; mvnParameters = "compile"; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ko/kotofetch/package.nix b/pkgs/by-name/ko/kotofetch/package.nix new file mode 100644 index 000000000000..e8a25ccea7b0 --- /dev/null +++ b/pkgs/by-name/ko/kotofetch/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + rustPlatform, + versionCheckHook, +}: +rustPlatform.buildRustPackage (finalAttrs: { + pname = "kotofetch"; + version = "0.2.22"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "hxpe-dev"; + repo = "kotofetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-aY8HRKSHLQKjl4b7v5q3SeNMc+GJPnE2XVrEsl+nGR0="; + }; + + cargoHash = "sha256-r36x/I/RaIWFEoDYXf3edpLeqGvEyozhT4EuCTSEe/k="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + meta = { + description = "Minimalist fetch tool for Japanese quotes"; + mainProgram = "kotofetch"; + homepage = "https://github.com/hxpe-dev/kotofetch"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ yarn ]; + }; +}) diff --git a/pkgs/by-name/kp/kphotoalbum/package.nix b/pkgs/by-name/kp/kphotoalbum/package.nix index 80075abbc1eb..cfb248f4bc35 100644 --- a/pkgs/by-name/kp/kphotoalbum/package.nix +++ b/pkgs/by-name/kp/kphotoalbum/package.nix @@ -2,6 +2,7 @@ stdenv, fetchurl, lib, + cmake, exiv2, ffmpeg, libvlc, @@ -26,6 +27,7 @@ stdenv.mkDerivation (finalAttrs: { ]; nativeBuildInputs = [ + cmake kdePackages.extra-cmake-modules kdePackages.wrapQtAppsHook ]; diff --git a/pkgs/by-name/kp/kpt/package.nix b/pkgs/by-name/kp/kpt/package.nix index 810963745070..a4a30e4e3057 100644 --- a/pkgs/by-name/kp/kpt/package.nix +++ b/pkgs/by-name/kp/kpt/package.nix @@ -30,6 +30,6 @@ buildGoModule (finalAttrs: { mainProgram = "kpt"; homepage = "https://github.com/kptdev/kpt"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ mikefaille ]; + maintainers = [ ]; }; }) diff --git a/pkgs/by-name/kr/kr106/package.nix b/pkgs/by-name/kr/kr106/package.nix new file mode 100644 index 000000000000..06a3167c1b05 --- /dev/null +++ b/pkgs/by-name/kr/kr106/package.nix @@ -0,0 +1,92 @@ +{ + lib, + stdenv, + fetchFromGitHub, + cmake, + pkg-config, + alsa-lib, + freetype, + fontconfig, + libGL, + libx11, + libxcursor, + libxext, + libxinerama, + libxrandr, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "kr106"; + version = "2.5.13"; + + src = fetchFromGitHub { + owner = "kayrockscreenprinting"; + repo = "ultramaster_kr106"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = true; + hash = "sha256-R0nvtdhhrT+ucpBSsWjJEUCInd4/0jDammlUsaCgL6M="; + }; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + alsa-lib + freetype + fontconfig + libGL + libx11 + libxcursor + libxext + libxinerama + libxrandr + ]; + + cmakeFlags = [ + (lib.cmakeBool "KR106_COPY_AFTER_BUILD" false) + ]; + + # JUCE dlopen's these at runtime, crashes without them + env.NIX_LDFLAGS = toString [ + "-lX11" + "-lXext" + "-lXcursor" + "-lXinerama" + "-lXrandr" + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib + cp -r KR106_artefacts/Release/LV2 $out/lib/lv2 + cp -r KR106_artefacts/Release/VST3 $out/lib/vst3 + cp -r KR106_artefacts/Release/CLAP $out/lib/clap + install -Dm755 "KR106_artefacts/Release/Standalone/Ultramaster KR-106" $out/bin/kr106 + + runHook postInstall + ''; + + __structuredAttrs = true; + strictDeps = true; + + doInstallCheck = true; + + passthru = { + updateScript = nix-update-script { }; + }; + + meta = { + description = "Synthesizer plugin emulating the Roland Juno-6, Juno-60 and Juno-106"; + homepage = "https://kayrock.org/kr106"; + downloadPage = "https://github.com/kayrockscreenprinting/ultramaster_kr106"; + changelog = "https://kayrock.org/kr106/changelog.html"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ crop ]; + platforms = lib.platforms.linux; + mainProgram = "kr106"; + }; +}) diff --git a/pkgs/by-name/kr/krapslog/package.nix b/pkgs/by-name/kr/krapslog/package.nix index c13ff620d55e..4dac61c7d625 100644 --- a/pkgs/by-name/kr/krapslog/package.nix +++ b/pkgs/by-name/kr/krapslog/package.nix @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Visualize a log file with sparklines"; homepage = "https://github.com/acj/krapslog-rs"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ yanganto ]; mainProgram = "krapslog"; }; diff --git a/pkgs/by-name/kr/krb5/CVE-2026-11850.patch b/pkgs/by-name/kr/krb5/CVE-2026-11850.patch new file mode 100644 index 000000000000..3c7dde29df3f --- /dev/null +++ b/pkgs/by-name/kr/krb5/CVE-2026-11850.patch @@ -0,0 +1,33 @@ +From 2a5fd83d4436583f2ddc0e193269a4d800ee45c4 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebasti=C3=A1n=20Alba?= +Date: Wed, 8 Apr 2026 18:32:25 -0400 +Subject: [PATCH] Prevent read overrun in libkdb_ldap + +In berval2tl_data(), reject inputs of length less than 2 to prevent an +integer underflow and subsequent read overrun. (The security impact +is negligible as the attacker would have to control the KDB LDAP +server.) + +[ghudson@mit.edu: wrote commit message] + +ticket: 9206 (new) +tags: pullup +target_version: 1.22-next +--- + plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c b/src/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +index 418d253d17..9aa68bacd7 100644 +--- a/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c ++++ b/plugins/kdb/ldap/libkdb_ldap/ldap_principal2.c +@@ -80,6 +80,9 @@ getstringtime(krb5_timestamp); + krb5_error_code + berval2tl_data(struct berval *in, krb5_tl_data **out) + { ++ if (in->bv_len < 2) ++ return EINVAL; ++ + *out = (krb5_tl_data *) malloc (sizeof (krb5_tl_data)); + if (*out == NULL) + return ENOMEM; diff --git a/pkgs/by-name/kr/krb5/CVE-2026-40355-and-CVE-2026-40356.patch b/pkgs/by-name/kr/krb5/CVE-2026-40355-and-CVE-2026-40356.patch new file mode 100644 index 000000000000..fe37f894fdc4 --- /dev/null +++ b/pkgs/by-name/kr/krb5/CVE-2026-40355-and-CVE-2026-40356.patch @@ -0,0 +1,61 @@ +From acea6182e46fff3d1d64a3172cdff307b07ca441 Mon Sep 17 00:00:00 2001 +From: Greg Hudson +Date: Wed, 8 Apr 2026 17:57:59 -0400 +Subject: [PATCH] Fix two NegoEx parsing vulnerabilities + +In parse_nego_message(), check the result of the second call to +vector_base() before dereferencing it. In parse_message(), check for +a short header_len to prevent an integer underflow when calculating +the remaining message length. + +Reported by Cem Onat Karagun. + +CVE-2026-40355: + +In MIT krb5 release 1.18 and later, if an application calls +gss_accept_sec_context() on a system with a NegoEx mechanism +registered in /etc/gss/mech, an unauthenticated remote attacker can +trigger a null pointer dereference, causing the process to terminate. + +CVE-2026-40356: + +In MIT krb5 release 1.18 and later, if an application calls +gss_accept_sec_context() on a system with a NegoEx mechanism +registered in /etc/gss/mech, an unauthenticated remote attacker can +trigger a read overrun of up to 52 bytes, possibly causing the process +to terminate. Exfiltration of the bytes read does not appear +possible. + +(cherry picked from commit 2e75f0d9362fb979f5fc92829431a590a130929f) + +ticket: 9205 +version_fixed: 1.22.3 +--- + lib/gssapi/spnego/negoex_util.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/lib/gssapi/spnego/negoex_util.c b/src/lib/gssapi/spnego/negoex_util.c +index edc5462e844..a65238e5730 100644 +--- a/lib/gssapi/spnego/negoex_util.c ++++ b/lib/gssapi/spnego/negoex_util.c +@@ -253,6 +253,10 @@ parse_nego_message(OM_uint32 *minor, struct k5input *in, + offset = k5_input_get_uint32_le(in); + count = k5_input_get_uint16_le(in); + p = vector_base(offset, count, EXTENSION_LENGTH, msg_base, msg_len); ++ if (p == NULL) { ++ *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; ++ return GSS_S_DEFECTIVE_TOKEN; ++ } + for (i = 0; i < count; i++) { + extension_type = load_32_le(p + i * EXTENSION_LENGTH); + if (extension_type & EXTENSION_FLAG_CRITICAL) { +@@ -391,7 +395,8 @@ parse_message(OM_uint32 *minor, spnego_gss_ctx_id_t ctx, struct k5input *in, + msg_len = k5_input_get_uint32_le(in); + conv_id = k5_input_get_bytes(in, GUID_LENGTH); + +- if (in->status || msg_len > token_remaining || header_len > msg_len) { ++ if (in->status || msg_len > token_remaining || ++ header_len < (size_t)(in->ptr - msg_base) || header_len > msg_len) { + *minor = ERR_NEGOEX_INVALID_MESSAGE_SIZE; + return GSS_S_DEFECTIVE_TOKEN; + } diff --git a/pkgs/by-name/kr/krb5/package.nix b/pkgs/by-name/kr/krb5/package.nix index 0b504c6dc8a6..4e97e9867190 100644 --- a/pkgs/by-name/kr/krb5/package.nix +++ b/pkgs/by-name/kr/krb5/package.nix @@ -34,16 +34,22 @@ stdenv.mkDerivation (finalAttrs: { pname = "krb5"; - version = "1.22.1"; + version = "1.22.2"; __structuredAttrs = true; src = fetchurl { url = "https://kerberos.org/dist/krb5/${lib.versions.majorMinor finalAttrs.version}/krb5-${finalAttrs.version}.tar.gz"; - hash = "sha256-GogyuMrZI+u/E5T2fi789B46SfRgKFpm41reyPoAU68="; + hash = "sha256-MkP/vI6k1Kwi3cfdKh3FTFeHTEBki2D/lwCXY1VOrxM="; }; - patches = lib.optionals stdenv.hostPlatform.isFreeBSD [ + patches = [ + # https://github.com/krb5/krb5/pull/1505 + ./CVE-2026-11850.patch + # https://github.com/krb5/krb5/pull/1506 + ./CVE-2026-40355-and-CVE-2026-40356.patch + ] + ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ (fetchpatch { name = "fix-missing-ENODATA.patch"; url = "https://cgit.freebsd.org/ports/plain/security/krb5-122/files/patch-lib_krad_packet.c?id=0501f716c4aff7880fde56e42d641ef504593b7d"; @@ -170,6 +176,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { + changelog = "https://web.mit.edu/Kerberos/krb5-${lib.versions.majorMinor finalAttrs.version}/"; description = "MIT Kerberos 5"; homepage = "http://web.mit.edu/kerberos/"; license = lib.licenses.mit; diff --git a/pkgs/by-name/kr/krep/package.nix b/pkgs/by-name/kr/krep/package.nix index 2405b731ce7e..502fc932bd7b 100644 --- a/pkgs/by-name/kr/krep/package.nix +++ b/pkgs/by-name/kr/krep/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "krep"; - version = "2.4.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "davidesantangelo"; repo = "krep"; rev = "v${finalAttrs.version}"; - hash = "sha256-LeL5vNDtpFREW+xQx9EFTP2MCd9Qfmn+HHvLDC7tsrM="; + hash = "sha256-lLlgsIFU37m+C1pqLYH+7n9Ye6jrpSdSJQYyTISId54="; }; makeFlags = [ diff --git a/pkgs/by-name/kr/krillinai/package.nix b/pkgs/by-name/kr/krillinai/package.nix index e4225de0c790..a1ab7d851602 100644 --- a/pkgs/by-name/kr/krillinai/package.nix +++ b/pkgs/by-name/kr/krillinai/package.nix @@ -16,16 +16,16 @@ buildGoModule (finalAttrs: { pname = "krillinai"; - version = "1.4.0"; + version = "2.1.0"; src = fetchFromGitHub { owner = "krillinai"; - repo = "KlicStudio"; + repo = "KrillinAI"; tag = "v${finalAttrs.version}"; - hash = "sha256-CMeF24BCJ+wbiXCl0iJm0acNoggVxeOu3Q/cXJY8aQo="; + hash = "sha256-k1p9v3MQklycW2FsDCyEWNwjLFSymxx1qVg5qhC8xgI="; }; - vendorHash = "sha256-bAKLNpt0K06egScyn7ImHV0csDsMQGUm92kU1PVQK+I="; + vendorHash = "sha256-OdmOalac4oked7vLGMWFCjjNU5TBq1P+HudE5a+bgq4="; nativeBuildInputs = [ pkg-config ]; @@ -51,8 +51,8 @@ buildGoModule (finalAttrs: { meta = { description = "Video translation and dubbing tool"; - homepage = "https://github.com/krillinai/KlicStudio"; - changelog = "https://github.com/krillinai/KlicStudio/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/krillinai/KrillinAI"; + changelog = "https://github.com/krillinai/KrillinAI/releases/tag/v${finalAttrs.version}"; mainProgram = "krillinai-desktop"; license = lib.licenses.gpl3Plus; maintainers = [ ]; diff --git a/pkgs/by-name/kr/kristall/package.nix b/pkgs/by-name/kr/kristall/package.nix index 66981fb5c045..1b6f27278f49 100644 --- a/pkgs/by-name/kr/kristall/package.nix +++ b/pkgs/by-name/kr/kristall/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "0.4"; src = fetchFromGitHub { - owner = "MasterQ32"; + owner = "ikskuh"; repo = "kristall"; rev = "V${version}"; hash = "sha256-zTO55xTc7hXlqVUVlx921+LalKj/yQwjEgXW2YUdG70="; diff --git a/pkgs/by-name/kr/krita-unwrapped/package.nix b/pkgs/by-name/kr/krita-unwrapped/package.nix index b2db245af594..039a958e02d6 100644 --- a/pkgs/by-name/kr/krita-unwrapped/package.nix +++ b/pkgs/by-name/kr/krita-unwrapped/package.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation (finalAttrs: { pname = "krita-unwrapped"; - version = "6.0.1"; + version = "6.0.2.1"; src = fetchurl { url = "mirror://kde/stable/krita/${finalAttrs.version}/krita-${finalAttrs.version}.tar.gz"; - hash = "sha256-COddFMgFJh/IIovsFt70cF9unPsBkecb0EzEwOGChIo="; + hash = "sha256-Z1M8sRXewqWYe1r6fdTPjgREuQfNmTSc8dD7ZEVuQPg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/kr/krunkit/boot-test.nix b/pkgs/by-name/kr/krunkit/boot-test.nix new file mode 100644 index 000000000000..4278b41539d2 --- /dev/null +++ b/pkgs/by-name/kr/krunkit/boot-test.nix @@ -0,0 +1,126 @@ +{ + krunkit, + lib, + nixos, + pkgs, + runCommand, +}: + +let + linuxPkgs = import pkgs.path { + system = "aarch64-linux"; + }; + + nixosConfig = + (nixos { + nixpkgs.pkgs = linuxPkgs; + + imports = [ "${pkgs.path}/nixos/modules/profiles/qemu-guest.nix" ]; + + boot = { + kernelParams = [ "console=hvc0" ]; + loader = { + efi.canTouchEfiVariables = false; + systemd-boot.enable = true; + }; + }; + + documentation.enable = false; + environment.defaultPackages = [ ]; + + fileSystems = { + "/" = { + device = "/dev/disk/by-label/nixos"; + fsType = "ext4"; + }; + + "/boot" = { + device = "/dev/disk/by-label/ESP"; + fsType = "vfat"; + }; + }; + + systemd.services.krunkit-boot-ok = { + wantedBy = [ "multi-user.target" ]; + after = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + echo krunkit-boot-ok >/dev/hvc0 + ''; + }; + + system.stateVersion = lib.trivial.release; + }).config; + + image = import "${pkgs.path}/nixos/lib/make-disk-image.nix" { + inherit lib; + config = nixosConfig; + pkgs = linuxPkgs; + + additionalSpace = "64M"; + baseName = "krunkit-nixos"; + bootSize = "128M"; + copyChannel = false; + format = "raw"; + partitionTableType = "efi"; + }; +in +runCommand "krunkit-nixos-boot-test" + { + requiredSystemFeatures = [ "apple-virt" ]; + + meta.platforms = [ "aarch64-darwin" ]; + } + '' + image=${image}/krunkit-nixos.img + disk=$TMPDIR/disk.img + console=$TMPDIR/console.log + log=$TMPDIR/krunkit.log + + cp "$image" "$disk" + chmod u+w "$disk" + touch "$console" "$log" + + cleanup() { + set +e + if [ -n "''${pid:-}" ]; then + kill "$pid" >/dev/null 2>&1 + for _ in $(seq 1 20); do + kill -0 "$pid" >/dev/null 2>&1 || break + sleep 1 + done + kill -KILL "$pid" >/dev/null 2>&1 + fi + } + trap cleanup EXIT + + ${krunkit}/bin/krunkit \ + --cpus 1 \ + --memory 1024 \ + --log-file "$log" \ + --device "virtio-blk,path=$disk,format=raw" \ + --device "virtio-serial,logFilePath=$console" & + pid=$! + + for _ in $(seq 1 120); do + if grep -q krunkit-boot-ok "$console"; then + touch "$out" + exit 0 + fi + + if ! kill -0 "$pid" >/dev/null 2>&1; then + echo "krunkit exited before the guest reached multi-user.target" + wait "$pid" + cat "$log" + cat "$console" + exit 1 + fi + + sleep 1 + done + + echo "timed out waiting for krunkit guest boot marker" + cat "$log" + cat "$console" + exit 1 + '' diff --git a/pkgs/by-name/kr/krunkit/package.nix b/pkgs/by-name/kr/krunkit/package.nix index 894231cb3ea1..8048432093ba 100644 --- a/pkgs/by-name/kr/krunkit/package.nix +++ b/pkgs/by-name/kr/krunkit/package.nix @@ -1,4 +1,5 @@ { + callPackage, cargo, darwin, pkg-config, @@ -13,18 +14,18 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "krunkit"; - version = "1.2.1"; + version = "1.3.2"; src = fetchFromGitHub { - owner = "containers"; + owner = "libkrun"; repo = "krunkit"; tag = "v${finalAttrs.version}"; - hash = "sha256-T3PbSDaMqR/DLaTe1/tyMx/KseU5ENFzz1Gxd5/hRao="; + hash = "sha256-aC/p+MoCG05hyADZaz+bbONLXTcR7uJIcMrZOn4Rjbg="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-Yb2jyK4UBJCeVXSKl4UABnlMj+7SKpOIi49tD/itHYo="; + hash = "sha256-ptMqyCiIJsQfjFyislyc3pR0BGpwnu8Ba3OcQYLJPtM="; }; nativeBuildInputs = [ @@ -43,14 +44,23 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=${placeholder "out"}" ]; + postInstall = '' + install -Dm444 edk2/KRUN_EFI.silent.fd $out/share/krunkit/KRUN_EFI.silent.fd + ''; + # This is necessary in order for the binary to keep its entitlements dontStrip = true; - passthru.updateScript = nix-update-script { }; + passthru = { + tests.boot = lib.optional stdenv.isDarwin ( + callPackage ./boot-test.nix { krunkit = finalAttrs.finalPackage; } + ); + updateScript = nix-update-script { }; + }; meta = { description = "Launch configurable virtual machines with libkrun"; - homepage = "https://github.com/containers/krunkit"; + homepage = "https://github.com/libkrun/krunkit"; license = lib.licenses.asl20; platforms = [ "aarch64-darwin" ]; maintainers = with lib.maintainers; [ quinneden ]; diff --git a/pkgs/applications/virtualization/krunvm/default.nix b/pkgs/by-name/kr/krunvm/package.nix similarity index 88% rename from pkgs/applications/virtualization/krunvm/default.nix rename to pkgs/by-name/kr/krunvm/package.nix index 8dd4fc569e42..70b8dd4114f0 100644 --- a/pkgs/applications/virtualization/krunvm/default.nix +++ b/pkgs/by-name/kr/krunvm/package.nix @@ -7,29 +7,32 @@ buildah, buildah-unwrapped, cargo, + darwin, libiconv, libkrun, makeWrapper, rustc, - sigtool, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "krunvm"; version = "0.2.6"; src = fetchFromGitHub { owner = "libkrun"; repo = "krunvm"; - rev = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-peOaPivQKOwioh5skPNFiA3ptHv9pSsnjpy43cms8O8="; }; cargoDeps = rustPlatform.fetchCargoVendor { - inherit src; + inherit (finalAttrs) src; hash = "sha256-MRcQ0Vnd3PJqE2q981JpXPjwMUKT4t+RcOvzWptK7PQ="; }; + strictDeps = true; + __structuredAttrs = true; + nativeBuildInputs = [ rustPlatform.cargoSetupHook cargo @@ -37,7 +40,7 @@ stdenv.mkDerivation rec { asciidoctor makeWrapper ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ sigtool ]; + ++ lib.optionals stdenv.hostPlatform.isDarwin [ darwin.sigtool ]; buildInputs = [ libkrun @@ -77,4 +80,4 @@ stdenv.mkDerivation rec { platforms = libkrun.meta.platforms; mainProgram = "krunvm"; }; -} +}) diff --git a/pkgs/by-name/ks/kshutdown/package.nix b/pkgs/by-name/ks/kshutdown/package.nix index f1956581dfc0..2fce0f755dbf 100644 --- a/pkgs/by-name/ks/kshutdown/package.nix +++ b/pkgs/by-name/ks/kshutdown/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://kshutdown.sourceforge.io/"; description = "Graphical shutdown utility for Linux and Windows"; mainProgram = "kshutdown"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ eymeric ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/kt/ktailctl/package.nix b/pkgs/by-name/kt/ktailctl/package.nix index 883b2c93e090..d6e25dd9a379 100644 --- a/pkgs/by-name/kt/ktailctl/package.nix +++ b/pkgs/by-name/kt/ktailctl/package.nix @@ -11,21 +11,21 @@ }: let - version = "0.21.5"; + version = "0.22.1"; src = fetchFromGitHub { owner = "f-koehler"; repo = "KTailctl"; - rev = "v${version}"; - hash = "sha256-DqPerb8NcNynMMmoG8Ld0ZEyhrNg2q17TaErAbXIHC0="; + tag = "v${version}"; + hash = "sha256-BRkjVZaoxiMW8JltIkYDiCCE2kNGLDpRJd0iclQMcGY="; }; goDeps = (buildGoModule { pname = "ktailctl-go-wrapper"; inherit src version; - modRoot = "src/wrapper"; - vendorHash = "sha256-jA1yortzyaBOP9GenmARhBBNDdpkGo9DNz0CXlh3BIU="; + modRoot = "src/tailscale/wrapper"; + vendorHash = "sha256-h2gf9igVOguNRroGK6qvinUlEkpeZ2YJTtKArvlMj88="; }).goModules; in stdenv.mkDerivation { @@ -33,7 +33,7 @@ stdenv.mkDerivation { inherit version src; postPatch = '' - cp -r --reflink=auto ${goDeps} src/wrapper/vendor + cp -r --reflink=auto ${goDeps} src/tailscale/wrapper/vendor ''; # needed for go build to work @@ -74,6 +74,7 @@ stdenv.mkDerivation { meta = { description = "GUI to monitor and manage Tailscale on your Linux desktop"; + changelog = "https://github.com/f-koehler/KTailctl/releases/tag/${src.tag}"; homepage = "https://github.com/f-koehler/KTailctl"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ k900 ]; diff --git a/pkgs/by-name/ku/ku/package.nix b/pkgs/by-name/ku/ku/package.nix new file mode 100644 index 000000000000..ee24a471399a --- /dev/null +++ b/pkgs/by-name/ku/ku/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGo126Module, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +buildGo126Module (finalAttrs: { + pname = "ku"; + version = "0.9.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "bjarneo"; + repo = "ku"; + tag = "v${finalAttrs.version}"; + hash = "sha256-4z4lPvmkEqC7YBEaAa8cUyB42hkFkTFRkHGaA58/Vpg="; + }; + + vendorHash = "sha256-x7O2/uKnIIFDr8WK0ej3FJiIGxN5Fq5Czqrv4OJ5A44="; + + ldflags = [ + "-s" + "-w" + "-X main.version=v${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "--version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast, keyboard-driven Kubernetes TUI"; + homepage = "https://github.com/bjarneo/ku"; + changelog = "https://github.com/bjarneo/ku/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kevinpita ]; + mainProgram = "ku"; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ku/kube-state-metrics/package.nix b/pkgs/by-name/ku/kube-state-metrics/package.nix index bd470233ccab..49af926f291b 100644 --- a/pkgs/by-name/ku/kube-state-metrics/package.nix +++ b/pkgs/by-name/ku/kube-state-metrics/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kube-state-metrics"; - version = "2.17.0"; + version = "2.19.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kube-state-metrics"; rev = "v${finalAttrs.version}"; - hash = "sha256-w55FOWw9p7yV/bt4leZucOLqjVyHYFF+gVLWLGQKF9M="; + hash = "sha256-PZC3ZiVnChy7IdibZKB3IRv8+1AfmvAWY7RquwTcS1Y="; }; - vendorHash = "sha256-pcoqeYyOehFNkwD4fWqrk9725BJkv+8sKy1NLv+HJPE="; + vendorHash = "sha256-vmmXEDzkv+ZQaKJ6++HpPHj2M9gaquonNjXG2DOlxwI="; excludedPackages = [ "./tests/e2e" diff --git a/pkgs/by-name/ku/kubeaudit/package.nix b/pkgs/by-name/ku/kubeaudit/package.nix index f476f7ed6e87..c38a64f577f0 100644 --- a/pkgs/by-name/ku/kubeaudit/package.nix +++ b/pkgs/by-name/ku/kubeaudit/package.nix @@ -28,7 +28,7 @@ buildGoModule (finalAttrs: { description = "Audit tool for Kubernetes"; homepage = "https://github.com/Shopify/kubeaudit"; changelog = "https://github.com/Shopify/kubeaudit/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "kubeaudit"; }; diff --git a/pkgs/by-name/ku/kubebuilder/package.nix b/pkgs/by-name/ku/kubebuilder/package.nix index bf5cfc30e6e4..70db72337fe5 100644 --- a/pkgs/by-name/ku/kubebuilder/package.nix +++ b/pkgs/by-name/ku/kubebuilder/package.nix @@ -12,16 +12,16 @@ buildGoModule (finalAttrs: { pname = "kubebuilder"; - version = "4.13.1"; + version = "4.15.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "kubebuilder"; - rev = "v${finalAttrs.version}"; - hash = "sha256-WOqrQb2haoEp57OHFo1Y1fon0lJedI/hEYKE4xrIbpM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iTC5HY4E54YG+isSgW2515Kz83+khzANAml78z8EG88="; }; - vendorHash = "sha256-1lbf1hXJfhdTu6Gm7dcbJlB3beITxBD83gMltZgg7Pg="; + vendorHash = "sha256-7rXunagWkUWGL5v+xkmyLELwrIEuRVGPk4SK8/lotio="; subPackages = [ "internal/cli/cmd" @@ -69,6 +69,8 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/kubernetes-sigs/kubebuilder"; changelog = "https://github.com/kubernetes-sigs/kubebuilder/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ cmars ]; + maintainers = with lib.maintainers; [ + hythera + ]; }; }) diff --git a/pkgs/by-name/ku/kubeclarity/package.nix b/pkgs/by-name/ku/kubeclarity/package.nix index d39a9619315f..8121a6ee324e 100644 --- a/pkgs/by-name/ku/kubeclarity/package.nix +++ b/pkgs/by-name/ku/kubeclarity/package.nix @@ -56,7 +56,7 @@ buildGoModule (finalAttrs: { ''; homepage = "https://github.com/openclarity/kubeclarity"; changelog = "https://github.com/openclarity/kubeclarity/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ku/kubectl-cnpg/package.nix b/pkgs/by-name/ku/kubectl-cnpg/package.nix index 37a81c43b0fa..eb6a000dd6f2 100644 --- a/pkgs/by-name/ku/kubectl-cnpg/package.nix +++ b/pkgs/by-name/ku/kubectl-cnpg/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-cnpg"; - version = "1.29.1"; + version = "1.30.0"; src = fetchFromGitHub { owner = "cloudnative-pg"; repo = "cloudnative-pg"; rev = "v${finalAttrs.version}"; - hash = "sha256-SlisY7v/CFVXH85IAvlBH1RjyrTS+e8hFHJIwh0FgCc="; + hash = "sha256-UHgllbD2eNBVYrF5nPZhethZIyyBkEji1xf0okGshoI="; }; - vendorHash = "sha256-He5L4HBTMOlzLgB+tAxNbjvDdvGyz5UolC8mMFibwZ4="; + vendorHash = "sha256-Eh057tW8NTCNVtgyeY4A+Cc8wQbRDpUYDFmj4l+pn8o="; subPackages = [ "cmd/kubectl-cnpg" ]; diff --git a/pkgs/by-name/ku/kubectl-gadget/package.nix b/pkgs/by-name/ku/kubectl-gadget/package.nix index 20047fda5c07..7a54d490998c 100644 --- a/pkgs/by-name/ku/kubectl-gadget/package.nix +++ b/pkgs/by-name/ku/kubectl-gadget/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubectl-gadget"; - version = "0.52.0"; + version = "0.54.1"; src = fetchFromGitHub { owner = "inspektor-gadget"; repo = "inspektor-gadget"; tag = "v${finalAttrs.version}"; - hash = "sha256-WcIPubDzj3LPf1KUWfmxdlBGnG2x68hax/ZQKwSNifc="; + hash = "sha256-eG316yAUxW6w5kn53szdgcd3q4czkrLWgG953gNYPsg="; }; - vendorHash = "sha256-aEzzXcsM3D+Sp6LBms5+RzWirdC5iFvN2IiwbOXCrEw="; + vendorHash = "sha256-35bloouMwEuaZOC7ygz3sOJqoJoldDD4XHeCdBxx56U="; env.CGO_ENABLED = 0; diff --git a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix index 125498486e5c..ee86ac4084cc 100644 --- a/pkgs/by-name/ku/kubectl-rabbitmq/package.nix +++ b/pkgs/by-name/ku/kubectl-rabbitmq/package.nix @@ -7,18 +7,18 @@ buildGoModule (finalAttrs: { pname = "kubectl-rabbitmq"; - version = "2.21.0"; + version = "2.22.1"; src = fetchFromGitHub { owner = "rabbitmq"; repo = "cluster-operator"; tag = "v${finalAttrs.version}"; - hash = "sha256-6kh4R84Nq82M66Y0vl1NLYUxWh52oYpCydK7vOmkMcU="; + hash = "sha256-Vofl4YXJUyjWBwxLhbQ09427hBz70Un2P0YLNYn7v28="; }; modRoot = "kubectl-rabbitmq"; - vendorHash = "sha256-/50MnUk1wxpUed8jZ8OC6rgu4Qj6CnUZdbYsgyjsxIo="; + vendorHash = "sha256-Jud0VpVcBPBtc3hgb997SzefZx7kM9hbPgdOqBRDezY="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubedb-cli/package.nix b/pkgs/by-name/ku/kubedb-cli/package.nix index ca2a58e0e2c9..952ec48f9f23 100644 --- a/pkgs/by-name/ku/kubedb-cli/package.nix +++ b/pkgs/by-name/ku/kubedb-cli/package.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubedb-cli"; - version = "0.64.0"; + version = "0.66.0"; src = fetchFromGitHub { owner = "kubedb"; repo = "cli"; tag = "v${version}"; - hash = "sha256-BkXUkL3bZg5g0ufGqL+QZ44ZXKMp5O8Ib9TjkBoQaaM="; + hash = "sha256-2JS+wvS+EBNrH+VGmfRp39sZjSBkTLX2iLuZuUQ3MZw="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubedock/package.nix b/pkgs/by-name/ku/kubedock/package.nix index b080ac63fe79..7c3fad9533d5 100644 --- a/pkgs/by-name/ku/kubedock/package.nix +++ b/pkgs/by-name/ku/kubedock/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubedock"; - version = "0.21.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "joyrex2001"; repo = "kubedock"; rev = finalAttrs.version; - hash = "sha256-mxOvk2o2Ke8AEA9SyuyqHr+G9A2qpzlE9rqKG7INr4w="; + hash = "sha256-BaQT1UWHejcVkvQs88hKZdfyouUcGaghAlI2u/2kv9s="; }; - vendorHash = "sha256-SROlRbpokMsnTscxF71upxmjhZPqTbkk50n0Htwh1lc="; + vendorHash = "sha256-2kr0nYKCRjHJkyp8/fdxssoDY6jJ03Bnc21Dw34GvB8="; # config.Build not defined as it would break r-ryantm ldflags = [ diff --git a/pkgs/by-name/ku/kubefwd/package.nix b/pkgs/by-name/ku/kubefwd/package.nix index 62d21d04ae0d..607e6afa93d9 100644 --- a/pkgs/by-name/ku/kubefwd/package.nix +++ b/pkgs/by-name/ku/kubefwd/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "kubefwd"; - version = "1.25.15"; + version = "1.25.16"; src = fetchFromGitHub { owner = "txn2"; repo = "kubefwd"; tag = "v${finalAttrs.version}"; - hash = "sha256-OlmaKXw3SRa+7wXGBD6hEjdccBbdUXp67SM9bHduNEs="; + hash = "sha256-+2RdT4SbXc7Ir9ChG+ps11WAMGno4vKOwc9VTXFijHE="; }; - vendorHash = "sha256-t6JaUKHpNrf9E8NTFFWwrJJI9b0HyYNQeUoV7II2ocQ="; + vendorHash = "sha256-MIz2pZerUjKjcViEPZQeduzga3d6fYPlWo7dGQ+OdR4="; subPackages = [ "cmd/kubefwd" ]; diff --git a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix index a9d3c5586608..7fea26a4f7ac 100644 --- a/pkgs/by-name/ku/kubernetes-controller-tools/package.nix +++ b/pkgs/by-name/ku/kubernetes-controller-tools/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "controller-tools"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = "controller-tools"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-c1d7FlfGv7iGS+4GyhsO99OrCBIxO3M9r7jwYh7qs2o="; + sha256 = "sha256-4IkVnD87/sHZKixDaF9Qz95cdChPfOkEowBQwu7kq9Y="; }; - vendorHash = "sha256-cFnUfcoLyFHg0JR6ix0AnpSHUGuNNVbKldKelvvMu/4="; + vendorHash = "sha256-LNjd0PDVa4GMY1rFJ5PFiWAEeA5MMraIIzZmYgkdgJc="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubernetes-polaris/package.nix b/pkgs/by-name/ku/kubernetes-polaris/package.nix index 2e6b3cf8e50e..5ab1d74f6189 100644 --- a/pkgs/by-name/ku/kubernetes-polaris/package.nix +++ b/pkgs/by-name/ku/kubernetes-polaris/package.nix @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { description = "Validate and remediate Kubernetes resources to ensure configuration best practices are followed"; mainProgram = "polaris"; homepage = "https://www.fairwinds.com/polaris"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ longer ]; }; }) diff --git a/pkgs/by-name/ku/kubernetes/package.nix b/pkgs/by-name/ku/kubernetes/package.nix index dc0735675aed..475d6e921049 100644 --- a/pkgs/by-name/ku/kubernetes/package.nix +++ b/pkgs/by-name/ku/kubernetes/package.nix @@ -23,13 +23,13 @@ buildGoModule (finalAttrs: { pname = "kubernetes"; - version = "1.36.1"; + version = "1.36.2"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; tag = "v${finalAttrs.version}"; - hash = "sha256-QG2zFaFtGXoWIlyp3hVBRU+OHre/6vWcvijUe1DdjIo="; + hash = "sha256-vE+2iBoJvkRhJDAHMCrJLIJKD53YWRBN6fBUP4589OU="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubernix/package.nix b/pkgs/by-name/ku/kubernix/package.nix index 991f5870f2d2..87b5d6deb4d7 100644 --- a/pkgs/by-name/ku/kubernix/package.nix +++ b/pkgs/by-name/ku/kubernix/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "kubernix"; - version = "0.3.2"; + version = "0.3.3"; src = fetchFromGitHub { owner = "saschagrunert"; repo = "kubernix"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-CtY2HzDOtR//0aJhJtO4wrqUwvCkTLmemfNYyoYrl88="; + sha256 = "sha256-WHXhPa+U53Z8GTCpKYk2j4SnDxZX+E/rQUHUvOz7G6c="; }; - cargoHash = "sha256-+bEwLg/S2TBCZLbNrQfA+FsftW4bb0XbIXtXGj+FO2A="; + cargoHash = "sha256-NQ0d7kk6nw1D/a57+nlrfjAr4gVKVjPrH59dcbKcII0="; # Tests require network access doCheck = false; @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Single dependency Kubernetes clusters for local testing, experimenting and development"; mainProgram = "kubernix"; homepage = "https://github.com/saschagrunert/kubernix"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ saschagrunert ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ku/kubescape/package.nix b/pkgs/by-name/ku/kubescape/package.nix index b789c8b1a8c2..bfe5a7f3037c 100644 --- a/pkgs/by-name/ku/kubescape/package.nix +++ b/pkgs/by-name/ku/kubescape/package.nix @@ -9,18 +9,18 @@ }: buildGoModule (finalAttrs: { pname = "kubescape"; - version = "4.0.9"; + version = "4.0.11"; src = fetchFromGitHub { owner = "kubescape"; repo = "kubescape"; tag = "v${finalAttrs.version}"; - hash = "sha256-BkBRRrYs551bGnT00EvVSzaNQM8GfcltEl8xLb/AKd8="; + hash = "sha256-1gaQgn3hLU59hX6GS9KoLcfNqf17wVb8pXP6xHjvCZE="; fetchSubmodules = true; }; proxyVendor = true; - vendorHash = "sha256-GQTk12dHSNLWdLcb0VedK1Ex1uJOZtL3+XOnh527p/8="; + vendorHash = "sha256-vyCj385lt28wApwvKACgVeF7tlJZwRaxlCP2JoDNkro="; subPackages = [ "." ]; diff --git a/pkgs/by-name/ku/kubeseal/package.nix b/pkgs/by-name/ku/kubeseal/package.nix index d0d3a73a52ca..5f02535e989e 100644 --- a/pkgs/by-name/ku/kubeseal/package.nix +++ b/pkgs/by-name/ku/kubeseal/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "0.36.0"; src = fetchFromGitHub { - owner = "bitnami-labs"; + owner = "bitnami"; repo = "sealed-secrets"; rev = "v${finalAttrs.version}"; sha256 = "sha256-r+PjrHewqNIjj1ZYGEvAns4cSsg7mQXoR8/et6SJzhs="; @@ -28,8 +28,8 @@ buildGoModule (finalAttrs: { meta = { description = "Kubernetes controller and tool for one-way encrypted Secrets"; mainProgram = "kubeseal"; - homepage = "https://github.com/bitnami-labs/sealed-secrets"; - changelog = "https://github.com/bitnami-labs/sealed-secrets/blob/v${finalAttrs.version}/RELEASE-NOTES.md"; + homepage = "https://github.com/bitnami/sealed-secrets"; + changelog = "https://github.com/bitnami/sealed-secrets/blob/v${finalAttrs.version}/RELEASE-NOTES.md"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ groodt ]; }; diff --git a/pkgs/by-name/ku/kubesec/package.nix b/pkgs/by-name/ku/kubesec/package.nix index 6ceb33e5ec66..bbfdb5fd052e 100644 --- a/pkgs/by-name/ku/kubesec/package.nix +++ b/pkgs/by-name/ku/kubesec/package.nix @@ -52,7 +52,7 @@ buildGoModule (finalAttrs: { mainProgram = "kubesec"; homepage = "https://github.com/controlplaneio/kubesec"; changelog = "https://github.com/controlplaneio/kubesec/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab jk diff --git a/pkgs/by-name/ku/kubeshark/package.nix b/pkgs/by-name/ku/kubeshark/package.nix index bb8327f5db10..46ceb2439622 100644 --- a/pkgs/by-name/ku/kubeshark/package.nix +++ b/pkgs/by-name/ku/kubeshark/package.nix @@ -66,7 +66,7 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/kubeshark/kubeshark/releases/tag/v${finalAttrs.version}"; description = "API Traffic Viewer for Kubernetes"; mainProgram = "kubeshark"; - homepage = "https://kubeshark.co/"; + homepage = "https://kubeshark.com/"; license = lib.licenses.asl20; longDescription = '' The API traffic viewer for Kubernetes providing real-time, protocol-aware visibility into Kubernetes’ internal network, diff --git a/pkgs/by-name/ku/kubevela/package.nix b/pkgs/by-name/ku/kubevela/package.nix index 24719b283605..109fb6318f39 100644 --- a/pkgs/by-name/ku/kubevela/package.nix +++ b/pkgs/by-name/ku/kubevela/package.nix @@ -14,13 +14,13 @@ let in buildGoModule (finalAttrs: { pname = "kubevela"; - version = "1.10.8"; + version = "1.10.9"; src = fetchFromGitHub { owner = "kubevela"; repo = "kubevela"; rev = "v${finalAttrs.version}"; - hash = "sha256-RD3EOlVTXMY+FLs7U5jEE3w6Wzs026ohu3LZ3oHgcvg="; + hash = "sha256-7rW5hJSci3jQP/0HDjwvrNLY5fKYog+jB/dqBdz+2fw="; }; vendorHash = "sha256-MUfULgycZn8hFfWmtNeoFf21+g3gGpeKoBvL8qB/m80="; diff --git a/pkgs/by-name/ku/kubevirt/package.nix b/pkgs/by-name/ku/kubevirt/package.nix index ef233f4fb9b5..660fd8893edf 100644 --- a/pkgs/by-name/ku/kubevirt/package.nix +++ b/pkgs/by-name/ku/kubevirt/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kubevirt"; - version = "1.8.2"; + version = "1.8.4"; src = fetchFromGitHub { owner = "kubevirt"; repo = "kubevirt"; rev = "v${finalAttrs.version}"; - hash = "sha256-YSrMJz0L0Ybw5G6p42YAMMa1D1xc9G8sBLdxjxz3axg="; + hash = "sha256-4MQtONb8opLDBLtGr+5oDrOQkkK1q4RlMXDcqyilarM="; }; vendorHash = null; diff --git a/pkgs/by-name/ku/kubexporter/package.nix b/pkgs/by-name/ku/kubexporter/package.nix index 841f89c1e4be..7f667caa911d 100644 --- a/pkgs/by-name/ku/kubexporter/package.nix +++ b/pkgs/by-name/ku/kubexporter/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "kubexporter"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "bakito"; repo = "kubexporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-sAY7nm+BaNOoPNmMDWVqJrzMSFnah8z6bKiGQrX1/+k="; + hash = "sha256-PD/mvjL5Xp7gAs3iIz8nhsW7cpenFyzYiEXHE/zmur4="; }; - vendorHash = "sha256-I6FBS8VnH4p9aZgJd1/dDf1xVJ3+PBhqkePZKTMuEJo="; + vendorHash = "sha256-FToKA1Zu8wj5CudxYmtggvBZmuQLYWWg2taswPnMuDA="; ldflags = [ "-s" diff --git a/pkgs/by-name/ku/kubie/package.nix b/pkgs/by-name/ku/kubie/package.nix index b3509df5fb58..f3e27bb26eb2 100644 --- a/pkgs/by-name/ku/kubie/package.nix +++ b/pkgs/by-name/ku/kubie/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { rev = "v${finalAttrs.version}"; - owner = "sbstp"; + owner = "kubie-org"; repo = "kubie"; sha256 = "sha256-eSzNCH0MiGvLKHrSXFSXQq4lN5tfmr0NcuGaN96Invs="; }; @@ -41,8 +41,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Shell independent context and namespace switcher for kubectl"; mainProgram = "kubie"; - homepage = "https://github.com/sbstp/kubie"; - license = with lib.licenses; [ zlib ]; + homepage = "https://github.com/kubie-org/kubie"; + license = lib.licenses.zlib; maintainers = with lib.maintainers; [ illiusdope ]; }; }) diff --git a/pkgs/by-name/ku/kulala-core/package.nix b/pkgs/by-name/ku/kulala-core/package.nix index e16c7f26174f..47307225b7be 100644 --- a/pkgs/by-name/ku/kulala-core/package.nix +++ b/pkgs/by-name/ku/kulala-core/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "kulala-core"; - version = "0.14.1"; + version = "0.28.2"; strictDeps = true; __structuredAttrs = true; @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "mistweaverco"; repo = "kulala-core"; tag = "v${finalAttrs.version}"; - hash = "sha256-1EtYAKulMQbtYWHZ8MkUA1fMcL3V07/Sz1sjl5PnaI4="; + hash = "sha256-hXCVufxl8S+PxW7tvMHDRuSvELxTbsgH/Euvl+u+7BM="; }; node_modules = stdenv.mkDerivation { @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { dontFixup = true; - outputHash = "sha256-XQlBawD3vt8pVc7Gy9XeiGie89HWbljNJt7kUEDaDKk="; + outputHash = "sha256-jvl3eJvweE7ZTcOaa9qTe9UwGzouK+6WUREkgRhYJfc="; outputHashAlgo = "sha256"; outputHashMode = "recursive"; }; @@ -116,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - description = "Core parser and runner for kulala.nvim"; + description = "HTTP client library powering the Kulala toolchain"; homepage = "https://github.com/mistweaverco/kulala-core"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ khaneliman ]; diff --git a/pkgs/by-name/ku/kulala-fmt/package.nix b/pkgs/by-name/ku/kulala-fmt/package.nix index b1b29d22a2df..4570d23a8c73 100644 --- a/pkgs/by-name/ku/kulala-fmt/package.nix +++ b/pkgs/by-name/ku/kulala-fmt/package.nix @@ -1,17 +1,18 @@ { lib, stdenv, - bun, fetchFromGitHub, + fetchPnpmDeps, kulala-core, makeBinaryWrapper, nodejs, - writableTmpDirAsHomeHook, + pnpm_11, + pnpmConfigHook, }: stdenv.mkDerivation (finalAttrs: { pname = "kulala-fmt"; - version = "3.1.0"; + version = "4.3.4"; strictDeps = true; __structuredAttrs = true; @@ -20,66 +21,27 @@ stdenv.mkDerivation (finalAttrs: { owner = "mistweaverco"; repo = "kulala-fmt"; tag = "v${finalAttrs.version}"; - hash = "sha256-4rVsw3dyoKrC6lj8m2R42iZmBk5G2LIVtV6Ro9pHSBo="; + hash = "sha256-sARZDtrF8JihVuE2Ix/f4h/OWIbdGW48xpVJlVmTdYY="; }; - node_modules = stdenv.mkDerivation { - pname = "${finalAttrs.pname}-node_modules"; - inherit (finalAttrs) version src; - - strictDeps = true; - __structuredAttrs = true; - - nativeBuildInputs = [ - bun - writableTmpDirAsHomeHook - ]; - - dontConfigure = true; - - buildPhase = '' - runHook preBuild - - bun install \ - --cpu="*" \ - --frozen-lockfile \ - --ignore-scripts \ - --no-progress \ - --os="*" - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out - cp -R node_modules $out/ - - runHook postInstall - ''; - - dontFixup = true; - - outputHash = "sha256-z+jQC2RCav3VG/agWizcWFat8KgkGdBzaGQriviEbyo="; - outputHashAlgo = "sha256"; - outputHashMode = "recursive"; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-wPMWFYRd3R570oAMORHTKamE0qcmIT+LFRuTiXFX97M="; }; nativeBuildInputs = [ - bun makeBinaryWrapper nodejs + pnpm_11 + pnpmConfigHook ]; - dontConfigure = true; - buildPhase = '' runHook preBuild - cp -R ${finalAttrs.node_modules}/node_modules . - patchShebangs node_modules - bun run build + pnpm run build runHook postBuild ''; diff --git a/pkgs/by-name/kv/kvrocks/package.nix b/pkgs/by-name/kv/kvrocks/package.nix index b4d28bdd6b63..39bad91529f8 100644 --- a/pkgs/by-name/kv/kvrocks/package.nix +++ b/pkgs/by-name/kv/kvrocks/package.nix @@ -12,6 +12,7 @@ # keep-sorted start cpptrace, + fast-float, fmt, gtest, hat-trie, @@ -83,8 +84,8 @@ let luajit-src = fetchFromGitHub { owner = "RocksLabs"; repo = "LuaJIT"; - rev = "c0a8e68325ec261a77bde1c8eabad398168ffe74"; - hash = "sha256-Wjh14d0JR5ecAwdYVBjQYIHb2vJ1I61oR0N0LMmtq4E="; + rev = "02dfcc34e93e57ac96e566d123c66ee01e650299"; + hash = "sha256-HINP9nahXHTManDMAAJBOUlSSxv5JZhlHs96HHkE7qE="; }; zlib-ng' = zlib-ng.override { withZlibCompat = true; }; @@ -107,13 +108,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "kvrocks"; - version = "2.15.0"; + version = "2.16.0"; src = fetchFromGitHub { owner = "apache"; repo = "kvrocks"; tag = "v${finalAttrs.version}"; - hash = "sha256-s4saKuezPYvcmKSqVBVDbPJcQXr6pVfIWjff7Txg8tY="; + hash = "sha256-CAbhOX7dmyXgl0STNjzALseXUzrpTPNy9tjoPACe0Os="; }; __structuredAttrs = true; @@ -151,6 +152,15 @@ stdenv.mkDerivation (finalAttrs: { ]; }} ${mkCmakeFile "fmt" { findPackage = "fmt"; }} + ${mkCmakeFile "fast_float" { + findPackage = "FastFloat"; + libraries = [ + { + name = "fast_float"; + target = "FastFloat::fast_float"; + } + ]; + }} ${mkCmakeFile "spdlog" { findPackage = "spdlog"; }} ${mkCmakeFile "snappy" { pkgConfig = { @@ -273,6 +283,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ # keep-sorted start cpptrace + fast-float fmt gtest hat-trie diff --git a/pkgs/by-name/kx/kx-aspe-cli/package.nix b/pkgs/by-name/kx/kx-aspe-cli/package.nix index 54ff953c63d4..e7e9d5ac1f46 100644 --- a/pkgs/by-name/kx/kx-aspe-cli/package.nix +++ b/pkgs/by-name/kx/kx-aspe-cli/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Keyoxide profile generator CLI using ASPE"; mainProgram = "kx-aspe"; platforms = lib.platforms.linux; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; maintainers = [ lib.maintainers.nobbz ]; }; }) diff --git a/pkgs/by-name/ky/kythe/package.nix b/pkgs/by-name/ky/kythe/package.nix index b9d536501b3a..47fba89db82b 100644 --- a/pkgs/by-name/ky/kythe/package.nix +++ b/pkgs/by-name/ky/kythe/package.nix @@ -7,12 +7,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.0.75"; + version = "0.0.76"; pname = "kythe"; src = fetchurl { url = "https://github.com/kythe/kythe/releases/download/v${finalAttrs.version}/kythe-v${finalAttrs.version}.tar.gz"; - sha256 = "sha256-ZFZh3kt32UeqAl8AYbvrwjhqRVWtgyI/3k+Vb4/jAGo="; + sha256 = "sha256-7qQw91Y9uAXJnk0aQnymDXrvAc7HZpmGUpz+LCYpY1Y="; }; buildInputs = [ binutils ]; diff --git a/pkgs/by-name/ky/kyverno/package.nix b/pkgs/by-name/ky/kyverno/package.nix index 05edb054143b..2202a1305ad1 100644 --- a/pkgs/by-name/ky/kyverno/package.nix +++ b/pkgs/by-name/ky/kyverno/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "kyverno"; - version = "1.18.1"; + version = "1.18.2"; src = fetchFromGitHub { owner = "kyverno"; repo = "kyverno"; rev = "v${finalAttrs.version}"; - hash = "sha256-zo02ABieJ+CykuqGJlnthXibgBzNGB3t3UdlKMTIkFo="; + hash = "sha256-vcZdrvtM9SnjR9MJOGZ892fXtsMDY7V/1gNqvZmB6To="; }; ldflags = [ @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { "-X github.com/kyverno/kyverno/pkg/version.BuildTime=1970-01-01_00:00:00" ]; - vendorHash = "sha256-z6kqFBWDWxJB/V+lhcCgataJCQ7NNh08yutdPDgBdkc="; + vendorHash = "sha256-xGGpK53FennS28Kw3ZEasr+sN7ZUuL98Bh4KIkr0OOs="; subPackages = [ "cmd/cli/kubectl-kyverno" ]; diff --git a/pkgs/by-name/la/labwc/package.nix b/pkgs/by-name/la/labwc/package.nix index 8215b985ea11..44de740f5c71 100644 --- a/pkgs/by-name/la/labwc/package.nix +++ b/pkgs/by-name/la/labwc/package.nix @@ -31,13 +31,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "labwc"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = "labwc"; repo = "labwc"; tag = finalAttrs.version; - hash = "sha256-JSs1Xys0+XAPbxLv5pR91K0/e78mu5xLKu0HGdFFCEM="; + hash = "sha256-1LINOZsdN5btT0VQvUwYXbSjuKdQdbkaI062OYAJSiE="; }; postPatch = '' @@ -99,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/labwc/labwc"; description = "Wayland stacking compositor, inspired by Openbox"; changelog = "https://github.com/labwc/labwc/blob/master/NEWS.md"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "labwc"; maintainers = [ ]; inherit (wayland.meta) platforms; diff --git a/pkgs/by-name/la/labymod-launcher/package.nix b/pkgs/by-name/la/labymod-launcher/package.nix index 0bcad7ad57c3..f35e48a086ab 100644 --- a/pkgs/by-name/la/labymod-launcher/package.nix +++ b/pkgs/by-name/la/labymod-launcher/package.nix @@ -6,12 +6,12 @@ let pname = "labymod-launcher"; - version = "3.0.1"; + version = "3.0.11"; src = fetchurl { name = "labymod-launcher"; url = "https://releases.r2.labymod.net/launcher/linux/x64/LabyMod%20Launcher-${version}.AppImage"; - hash = "sha256-E4yTsurnomuF72zye06Ycd0qXg4uTHj7Y+EW6lmanoA="; + hash = "sha256-piGk8nbOj4AUjw05y9Ux59JSPXBIB7VisDbVirriMoI="; }; appimageContents = appimageTools.extract { inherit pname version src; }; diff --git a/pkgs/by-name/la/lact/package.nix b/pkgs/by-name/la/lact/package.nix index 83831a62c835..5cba545612c6 100644 --- a/pkgs/by-name/la/lact/package.nix +++ b/pkgs/by-name/la/lact/package.nix @@ -10,6 +10,7 @@ gdk-pixbuf, gtk4, libadwaita, + libdisplay-info, libdrm, ocl-icd, vulkan-loader, @@ -25,16 +26,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lact"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; tag = "v${finalAttrs.version}"; - hash = "sha256-c5GJf8AYgaAN3O6AVSEbJybEYb6lSHf7R24/1PKYhyM="; + hash = "sha256-/b5Cfexi/RtE3DkON5J3dc4aEX6aLZvIcAhsg6Kdv7M="; }; - cargoHash = "sha256-Y+XdCmaDXdP7x22bYm//Ov7+IzlCr8GpFOgCXGFCfbA="; + cargoHash = "sha256-XV37VRbCaxySMgEqXmIA0TUpI9uR+6jGOzdMlEfWxDw="; nativeBuildInputs = [ pkg-config @@ -47,6 +48,7 @@ rustPlatform.buildRustPackage (finalAttrs: { gdk-pixbuf gtk4 libadwaita + libdisplay-info libdrm ocl-icd vulkan-loader @@ -55,6 +57,11 @@ rustPlatform.buildRustPackage (finalAttrs: { fuse3 ]; + checkFlags = [ + # Requires /dev/fuse, which is unavailable in the Nix build sandbox. + "--skip=tests::apply_settings" + ]; + # we do this here so that the binary is usable during integration tests env.RUSTFLAGS = lib.optionalString stdenv.targetPlatform.isElf ( lib.concatStringsSep " " [ diff --git a/pkgs/by-name/la/ladybird/package.nix b/pkgs/by-name/la/ladybird/package.nix index 47d584108578..f64b20b0cc17 100644 --- a/pkgs/by-name/la/ladybird/package.nix +++ b/pkgs/by-name/la/ladybird/package.nix @@ -7,6 +7,7 @@ unicode-character-database, unicode-idna, publicsuffix-list, + chromium-hsts-preload-list, cmake, ninja, pkg-config, @@ -14,6 +15,7 @@ libavif, angle, # libEGL libjxl, + libedit, libpulseaudio, libwebp, libxcrypt, @@ -34,6 +36,8 @@ skia, nixosTests, unstableGitUpdater, + _experimental-update-script-combinators, + common-updater-scripts, libtommath, sdl3, icu78, @@ -42,18 +46,18 @@ stdenv.mkDerivation (finalAttrs: { pname = "ladybird"; - version = "0-unstable-2026-05-04"; + version = "0-unstable-2026-06-05"; src = fetchFromGitHub { owner = "LadybirdBrowser"; repo = "ladybird"; - rev = "90b790f8702a5d5c5a66ef02f8669da2838ca6e3"; - hash = "sha256-BdJ24YtKMv8B6Vvequf9b5qr0S3FfFuphFo78mCIaN4="; + rev = "02b205361dd239e134f434e484b609d1fa5f1938"; + hash = "sha256-+CVJjrL1kqT2A7r89F+riiHpMa39rcggqG9SByidUY4="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-sbNYOdY56+waCVQHbGuvV5jT9EawV2IiGmL1e/O6ZRc="; + hash = "sha256-n0ACVH8NXwe7SIaGFoJ20WIGGR3XjcuLTwPSKGJpT5s="; }; postPatch = '' @@ -85,6 +89,9 @@ stdenv.mkDerivation (finalAttrs: { mkdir build/Caches/PublicSuffix cp ${publicsuffix-list}/share/publicsuffix/public_suffix_list.dat build/Caches/PublicSuffix + + mkdir build/Caches/HSTSPreload + cp ${chromium-hsts-preload-list}/share/chromium-hsts-preload-list/transport_security_state_static.json build/Caches/HSTSPreload ''; nativeBuildInputs = [ @@ -109,6 +116,7 @@ stdenv.mkDerivation (finalAttrs: { libavif angle # libEGL libjxl + libedit libwebp libxcrypt mimalloc @@ -176,7 +184,25 @@ stdenv.mkDerivation (finalAttrs: { nixosTest = nixosTests.ladybird; }; - passthru.updateScript = unstableGitUpdater { }; + passthru.updateScript = + let + updateSource = unstableGitUpdater { + hardcodeZeroVersion = true; + }; + + updateCargoDeps = { + command = [ + (lib.getExe' common-updater-scripts "update-source-version") + "ladybird" + "--ignore-same-version" + "--source-key=cargoDeps.vendorStaging" + ]; + }; + in + _experimental-update-script-combinators.sequence [ + updateSource + updateCargoDeps + ]; meta = { description = "Browser using the SerenityOS LibWeb engine with a Qt or Cocoa GUI"; @@ -190,7 +216,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "Ladybird"; diff --git a/pkgs/by-name/la/lagrange/package.nix b/pkgs/by-name/la/lagrange/package.nix index 60e31c55bd45..20c3e12b4195 100644 --- a/pkgs/by-name/la/lagrange/package.nix +++ b/pkgs/by-name/la/lagrange/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lagrange"; - version = "1.20.6"; + version = "1.20.9"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZKxRcZt5JAO9AOveqXaoqqseZbRguqetdoAKe8c8Il0="; + hash = "sha256-2g5WJSb6qX1vbwuypYiGtrKK7lXtfgiaGaeapcLGDxE="; }; nativeBuildInputs = [ @@ -71,12 +71,13 @@ stdenv.mkDerivation (finalAttrs: { ''; passthru = { - updateScript = nix-update-script { }; + updateScript = nix-update-script { attrPath = "lagrange"; }; }; meta = { description = "Beautiful Gemini Client"; homepage = "https://gmi.skyjake.fi/lagrange/"; + mainProgram = "lagrange"; license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ sikmir ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/la/lakectl/package.nix b/pkgs/by-name/la/lakectl/package.nix index 5364e13cc26d..379e89bf9e3a 100644 --- a/pkgs/by-name/la/lakectl/package.nix +++ b/pkgs/by-name/la/lakectl/package.nix @@ -7,18 +7,18 @@ buildGo126Module (finalAttrs: { pname = "lakectl"; - version = "1.80.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-fco+t73cmoXc3Irf6owloxtldAVfBHCNfYRMitiGeTY="; + hash = "sha256-5/2iI5/87x+VJ1MbYw7zPEDeTm1XVuLmSsI6KssRGRE="; }; subPackages = [ "cmd/lakectl" ]; proxyVendor = true; - vendorHash = "sha256-7sQMvpY+1RT2m1B14UPGCb60HQ9De5rErvoyj95Fkbc="; + vendorHash = "sha256-UNDIqP79CG2+M8HKkHT1l7X2/Dt6YDTQzADR5T7klUg="; ldflags = [ "-s" diff --git a/pkgs/by-name/la/lakefs/package.nix b/pkgs/by-name/la/lakefs/package.nix index 1ad8c3fbc909..b275e4808f28 100644 --- a/pkgs/by-name/la/lakefs/package.nix +++ b/pkgs/by-name/la/lakefs/package.nix @@ -12,13 +12,13 @@ buildGoModule (finalAttrs: { pname = "lakefs"; - version = "1.79.0"; + version = "1.83.0"; src = fetchFromGitHub { owner = "treeverse"; repo = "lakeFS"; tag = "v${finalAttrs.version}"; - hash = "sha256-UL9JvrNvtHADI0POguLXMDNNvO1oKHXXwfr8tOyvFYc="; + hash = "sha256-5/2iI5/87x+VJ1MbYw7zPEDeTm1XVuLmSsI6KssRGRE="; }; webui = buildNpmPackage { @@ -30,7 +30,7 @@ buildGoModule (finalAttrs: { nodejs = nodejs_22; - npmDepsHash = "sha256-Z9oOIKK6Hm/Bg3E37f4FqFFL1exMIf0KNEHQXIyox+Q="; + npmDepsHash = "sha256-AKCsxBW2ZBQB5fPkS1adAt8z6mHuC/zGMHhRW8pVyYs="; installPhase = '' runHook preInstall @@ -41,7 +41,7 @@ buildGoModule (finalAttrs: { subPackages = [ "cmd/lakefs" ]; proxyVendor = true; - vendorHash = "sha256-6XOJBDdAERD6mcneQ7UFqAPGq+pXroNlzQGNvycpVBc="; + vendorHash = "sha256-UNDIqP79CG2+M8HKkHT1l7X2/Dt6YDTQzADR5T7klUg="; ldflags = [ "-s" diff --git a/pkgs/by-name/la/lammps-mpi/package.nix b/pkgs/by-name/la/lammps-mpi/package.nix index 79c0ebddfd0f..04ad2decc7a3 100644 --- a/pkgs/by-name/la/lammps-mpi/package.nix +++ b/pkgs/by-name/la/lammps-mpi/package.nix @@ -6,8 +6,11 @@ lib.lowPrio ( lammps.override { - extraBuildInputs = [ + extraNativeBuildInputs = [ mpi ]; + extraCmakeFlags = { + BUILD_MPI = "ON"; + }; } ) diff --git a/pkgs/by-name/la/lammps/package.nix b/pkgs/by-name/la/lammps/package.nix index 40ed6f08f348..4b23520c0002 100644 --- a/pkgs/by-name/la/lammps/package.nix +++ b/pkgs/by-name/la/lammps/package.nix @@ -8,6 +8,7 @@ blas, lapack, python3, + mpich, cmake, autoAddDriverRunpath, pkg-config, @@ -44,6 +45,7 @@ extraCmakeFlags ? { }, # Extra `buildInputs` - meant for packages that require more inputs extraBuildInputs ? [ ], + extraNativeBuildInputs ? [ ], }: stdenv.mkDerivation (finalAttrs: { @@ -67,16 +69,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config - # Although not always needed, it is needed if cmakeFlags include - # GPU_API=cuda, and it doesn't users that don't enable the GPU package. - autoAddDriverRunpath ] - ++ lib.optionals packages.PYTHON [ python3 ]; + ++ extraNativeBuildInputs + ++ lib.optionals packages.PYTHON [ + python3 + ]; passthru = { inherit packages; inherit extraCmakeFlags; inherit extraBuildInputs; + inherit extraNativeBuildInputs; }; cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" true) diff --git a/pkgs/by-name/la/lan-mouse/package.nix b/pkgs/by-name/la/lan-mouse/package.nix index 97acca9f355b..0c086a58ef8a 100644 --- a/pkgs/by-name/la/lan-mouse/package.nix +++ b/pkgs/by-name/la/lan-mouse/package.nix @@ -14,24 +14,13 @@ rustPlatform.buildRustPackage rec { pname = "lan-mouse"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "feschber"; repo = "lan-mouse"; rev = "v${version}"; - hash = "sha256-ofiNgJbmf35pfRvZB3ZmMkCJuM7yYgNL+Dd5mZZqyNk="; - }; - - # lan-mouse uses `git` to determine the version at build time and - # has Cargo set the `GIT_DESCRIBE` environment variable. To improve - # build reproducibility, we define the variable based on the package - # version instead. - prePatch = '' - rm build.rs - ''; - env = { - GIT_DESCRIBE = "${version}-nixpkgs"; + hash = "sha256-6EqA9WfiukOymUT4FkNdMvzmFKByW0LLoI/9sv4TzBU="; }; nativeBuildInputs = [ @@ -47,7 +36,7 @@ rustPlatform.buildRustPackage rec { libxtst ]; - cargoHash = "sha256-+UXRBYfbkb114mwDGj36oG5ZT3TQtcEzsbyZvtWTMxM="; + cargoHash = "sha256-Lxs0qWvNAv4KCeJ+cDBYBzwlbJfQJshcxPRdg9w0szc="; postInstall = '' install -Dm444 de.feschber.LanMouse.desktop -t $out/share/applications diff --git a/pkgs/by-name/la/lapce/package.nix b/pkgs/by-name/la/lapce/package.nix index f94a88f9bbb5..c4d0d084ae36 100644 --- a/pkgs/by-name/la/lapce/package.nix +++ b/pkgs/by-name/la/lapce/package.nix @@ -107,7 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Lightning-fast and Powerful Code Editor written in Rust"; homepage = "https://github.com/lapce/lapce"; changelog = "https://github.com/lapce/lapce/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; mainProgram = "lapce"; }; }) diff --git a/pkgs/by-name/la/lark-cli/package.nix b/pkgs/by-name/la/lark-cli/package.nix new file mode 100644 index 000000000000..e485d848a2e1 --- /dev/null +++ b/pkgs/by-name/la/lark-cli/package.nix @@ -0,0 +1,74 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + fetchurl, + runCommand, + jq, + testers, +}: + +buildGoModule (finalAttrs: { + pname = "lark-cli"; + version = "1.0.58"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "larksuite"; + repo = "cli"; + tag = "v${finalAttrs.version}"; + hash = "sha256-MqaxcmzX/79vM2EI8wD4ZAFsUfqWvPAovlpmuDP1IWU="; + }; + + vendorHash = "sha256-M0/Y62Y+M/P1B/YIDjX5bEyB/GKihCWQakTWVd7zvBg="; + + subPackages = [ "." ]; + + postPatch = + let + metaDataRaw = fetchurl { + name = "meta_dataraw.json"; + url = "https://web.archive.org/web/20260626061256/https://open.feishu.cn/api/tools/open/api_definition?protocol=meta&client_version=v${finalAttrs.version}"; + hash = "sha256-W6KOtDW6gkZIqGa0A5QL0rVjVkRjM+gwW4S3AddPN1M="; + }; + + metaData = + runCommand "meta_data.json" + { + nativeBuildInputs = [ jq ]; + } + '' + jq '.data' ${metaDataRaw} > $out + ''; + in + '' + cp ${metaData} internal/registry/meta_data.json + ''; + + postInstall = '' + mv $out/bin/cli $out/bin/lark-cli + ''; + + ldflags = [ + "-s" + "-w" + "-X github.com/larksuite/cli/internal/build.Version=v${finalAttrs.version}" + "-X github.com/larksuite/cli/internal/build.Date=2026-06-01" + ]; + + passthru.tests.version = testers.testVersion { + package = finalAttrs.finalPackage; + command = "lark-cli --version"; + version = "v${finalAttrs.version}"; + }; + + meta = { + description = "The official CLI for Lark/Feishu open platform"; + homepage = "https://github.com/larksuite/cli"; + changelog = "https://github.com/larksuite/cli/releases/tag/v${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ zehuajun ]; + mainProgram = "lark-cli"; + }; +}) diff --git a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix index f0ae9af2df28..b93fe9205ce9 100644 --- a/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix +++ b/pkgs/by-name/la/lasuite-docs-collaboration-server/package.nix @@ -13,20 +13,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-collaboration-server"; - version = "5.2.1"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU="; + hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs-frontend/package.nix b/pkgs/by-name/la/lasuite-docs-frontend/package.nix index 4589e1cd595c..722711dd1bd4 100644 --- a/pkgs/by-name/la/lasuite-docs-frontend/package.nix +++ b/pkgs/by-name/la/lasuite-docs-frontend/package.nix @@ -12,20 +12,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "lasuite-docs-frontend"; - version = "5.2.1"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${finalAttrs.version}"; - hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; sourceRoot = "${finalAttrs.src.name}/src/frontend"; offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-6uZF4op81QzYCAogvlcyZAkJsCqs72scyLKc1bc2QBU="; + hash = "sha256-r4uROroadFHALG8uHFPcvs8tCEdObx2rSVmxISxyyS8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-docs/package.nix b/pkgs/by-name/la/lasuite-docs/package.nix index b620aa6df5e1..6584ead2daa5 100644 --- a/pkgs/by-name/la/lasuite-docs/package.nix +++ b/pkgs/by-name/la/lasuite-docs/package.nix @@ -11,12 +11,12 @@ yarnConfigHook, }: let - version = "5.2.1"; + version = "5.4.1"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "docs"; tag = "v${version}"; - hash = "sha256-FRN4rcS2aYoYjFY05nYV9pYz0Es8X3EWsD/oPdp4kpI="; + hash = "sha256-Xomq2i1t1POgggcAR8FAWf+Lr0y6YOKGvANFOv/BH20="; }; mail-templates = stdenv.mkDerivation { @@ -29,7 +29,7 @@ let offlineCache = fetchYarnDeps { yarnLock = "${src}/src/mail/yarn.lock"; - hash = "sha256-MYzADDcXHGieGkygmlbZQbYcS68NdKWyHYGgoSaqDO8="; + hash = "sha256-miA1ysqNSaBZSb2B2uqTx1rea9R5/AgRfuCPr5X0bx8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-drive/frontend.nix b/pkgs/by-name/la/lasuite-drive/frontend.nix index 5ed9033ec82e..1387b44b7b62 100644 --- a/pkgs/by-name/la/lasuite-drive/frontend.nix +++ b/pkgs/by-name/la/lasuite-drive/frontend.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${finalAttrs.src}/src/frontend/yarn.lock"; - hash = "sha256-yUKJp6yUTxpvkaA+YuQC3r1t4LBvuYMv1xesLewbK/U="; + hash = "sha256-W0Sp8G7Lt9UMND8+ZLD8oxrNCgGpQph23AvQpynYWYI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/la/lasuite-drive/package.nix b/pkgs/by-name/la/lasuite-drive/package.nix index 61d77e62b6a8..24953084a2b8 100644 --- a/pkgs/by-name/la/lasuite-drive/package.nix +++ b/pkgs/by-name/la/lasuite-drive/package.nix @@ -7,13 +7,13 @@ nixosTests, }: let - version = "0.18.0"; + version = "0.19.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "drive"; tag = "v${version}"; - hash = "sha256-JoOHbwZR4salfLB9Gg7kfRMDcDA/Srn8qwUqLAZtsz8="; + hash = "sha256-y9lvGYTIxpuTA0mFDl616JxX+RF5+5Ea8k/NWlLjrZk="; }; meta = { @@ -94,6 +94,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { sentry-sdk url-normalize whitenoise + zipstream-ng ] ++ celery.optional-dependencies.redis ++ django-storages.optional-dependencies.s3; diff --git a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix index f578f0635d9a..3dfb7faf8ec7 100644 --- a/pkgs/by-name/la/lasuite-meet/addon-outlook.nix +++ b/pkgs/by-name/la/lasuite-meet/addon-outlook.nix @@ -23,7 +23,7 @@ buildNpmPackage (finalAttrs: { npmDeps = fetchNpmDeps { inherit (finalAttrs) version src sourceRoot; - hash = "sha256-ReYXXYFzqZl0HWAgLdlw25ZamZJ06Aez8g1Tv/Nt3cE="; + hash = "sha256-1CoY0A4KMdn76SbgfRULn+O4yZhJgwNdk/bZ9Fk2rwY="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/frontend.nix b/pkgs/by-name/la/lasuite-meet/frontend.nix index 620641681dbe..4afde016f643 100644 --- a/pkgs/by-name/la/lasuite-meet/frontend.nix +++ b/pkgs/by-name/la/lasuite-meet/frontend.nix @@ -3,17 +3,37 @@ version, meta, fetchNpmDeps, + fetchpatch, buildNpmPackage, }: buildNpmPackage (finalAttrs: { pname = "lasuite-meet-frontend"; inherit src version; + patches = [ + # backport build fix + # FIXME: remove in next release + (fetchpatch { + url = "https://github.com/suitenumerique/meet/commit/df1495c97bc913866169ee8875a9a3169fcfc87e.diff"; + stripLen = 2; + includes = [ + "package.json" + "package-lock.json" + ]; + hash = "sha256-1A26T6LtFlOiJNVGD/fZs562feoQXY37A2ecUfvDGpk="; + }) + ]; + sourceRoot = "${finalAttrs.src.name}/src/frontend"; npmDeps = fetchNpmDeps { - inherit (finalAttrs) version src sourceRoot; - hash = "sha256-Dd0wqssmLBfHkOHI5aactLnCPG4JxPLhNC+eo//QRXM="; + inherit (finalAttrs) + version + src + patches + sourceRoot + ; + hash = "sha256-uiD5pcpmka43uraMFo7lRuQFx/4aq1BEhQvyCAzo8fg="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/mail.nix b/pkgs/by-name/la/lasuite-meet/mail.nix index 542433488845..9cdc0bbc74e3 100644 --- a/pkgs/by-name/la/lasuite-meet/mail.nix +++ b/pkgs/by-name/la/lasuite-meet/mail.nix @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { pname = "${finalAttrs.pname}-npm-deps"; inherit version src; inherit (finalAttrs) sourceRoot; - hash = "sha256-dvOmSQjtw7Qv3H+flOcXDaIxQzf9YBmsQo7jmSTA7tI="; + hash = "sha256-EPVkSzhecDZpvz+uOW0GZnmWl9KfE3UpkTCnhVnJ7dg="; }; npmBuildScript = "build"; diff --git a/pkgs/by-name/la/lasuite-meet/package.nix b/pkgs/by-name/la/lasuite-meet/package.nix index aef6663aaed2..efb0ab1e6b5e 100644 --- a/pkgs/by-name/la/lasuite-meet/package.nix +++ b/pkgs/by-name/la/lasuite-meet/package.nix @@ -6,13 +6,13 @@ python3, }: let - version = "1.17.0"; + version = "1.22.0"; src = fetchFromGitHub { owner = "suitenumerique"; repo = "meet"; tag = "v${version}"; - hash = "sha256-hmkJwFYTBTbYsroegaRp/dcaNmeyPQ0Rbh/D1PGbh04="; + hash = "sha256-w2Lw5K62Iaqzqa/ckxK36o5ZHFLXUpHnGGGl5PYGjaI="; }; meta = { @@ -46,7 +46,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "uv_build>=0.10.9,<0.11.0" "uv_build" + --replace-fail "uv_build>=0.11.16,<0.12.0" "uv_build" ''; build-system = with python.pkgs; [ uv-build ]; @@ -86,6 +86,7 @@ python.pkgs.buildPythonApplication (finalAttrs: { mozilla-django-oidc nested-multipart-parser phonenumbers + posthog psycopg pydantic pyjwt diff --git a/pkgs/by-name/la/lavacli/package.nix b/pkgs/by-name/la/lavacli/package.nix index 8e01b708e4e6..f581759ea19b 100644 --- a/pkgs/by-name/la/lavacli/package.nix +++ b/pkgs/by-name/la/lavacli/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "lavacli"; - version = "2.8"; + version = "2.9.0"; pyproject = true; src = fetchFromGitLab { owner = "lava"; repo = "lavacli"; tag = "v${finalAttrs.version}"; - hash = "sha256-oIB5BLLwyaDkV5mQ8vndlQQv4R1lCEATHO9JqJDYv7s="; + hash = "sha256-yDcvOuU/SxrQz8VN1ellf9Do7Sjw4/RwXpzOe0+5oAo="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/la/layerx/package.nix b/pkgs/by-name/la/layerx/package.nix new file mode 100644 index 000000000000..39bc78ea88dd --- /dev/null +++ b/pkgs/by-name/la/layerx/package.nix @@ -0,0 +1,57 @@ +{ + lib, + stdenv, + buildGoModule, + fetchFromGitHub, + installShellFiles, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "layerx"; + version = "1.5.3"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "deveshctl"; + repo = "layerx"; + tag = "v${finalAttrs.version}"; + hash = "sha256-HboWzfDiiVMwMXkrOyxUvZ+V4Hi11cEqODfWT7b5+dw="; + }; + + vendorHash = "sha256-7wbyz6fKB3HMFhKJVIWrOIczLfqF4yInyszdh2Ky8WU="; + + ldflags = [ + "-s" + "-w" + "-X=main.version=${finalAttrs.version}" + "-X=main.commit=${finalAttrs.src.rev}" + "-X=main.date=1970-01-01T00:00:00Z" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' + installShellCompletion \ + --cmd layerx \ + --bash <($out/bin/layerx completion bash) \ + --fish <($out/bin/layerx completion fish) \ + --zsh <($out/bin/layerx completion zsh) + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = [ "version" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Terminal-based Docker image layer inspector"; + homepage = "https://github.com/deveshctl/layerx"; + changelog = "https://github.com/deveshctl/layerx/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ kpbaks ]; + mainProgram = "layerx"; + }; +}) diff --git a/pkgs/by-name/la/laze/package.nix b/pkgs/by-name/la/laze/package.nix index 0d2803e1ff8d..d673643ed58b 100644 --- a/pkgs/by-name/la/laze/package.nix +++ b/pkgs/by-name/la/laze/package.nix @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "laze"; homepage = "https://github.com/kaspar030/laze"; changelog = "https://github.com/kaspar030/laze/blob/${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dannixon ]; }; }) diff --git a/pkgs/by-name/la/lazydocker/package.nix b/pkgs/by-name/la/lazydocker/package.nix index 99171a46f077..db5312136836 100644 --- a/pkgs/by-name/la/lazydocker/package.nix +++ b/pkgs/by-name/la/lazydocker/package.nix @@ -44,6 +44,7 @@ buildGoModule (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ das-g + yvnth ]; mainProgram = "lazydocker"; }; diff --git a/pkgs/by-name/la/lazygit/package.nix b/pkgs/by-name/la/lazygit/package.nix index 139fdd1d49c1..27bf48fb73a8 100644 --- a/pkgs/by-name/la/lazygit/package.nix +++ b/pkgs/by-name/la/lazygit/package.nix @@ -8,13 +8,13 @@ }: buildGoModule (finalAttrs: { pname = "lazygit"; - version = "0.62.2"; + version = "0.63.1"; src = fetchFromGitHub { owner = "jesseduffield"; repo = "lazygit"; tag = "v${finalAttrs.version}"; - hash = "sha256-V/dW7zx3D+RuYLqvTvblc93qrpwHB/wnysGdKS5FhoA="; + hash = "sha256-vcpd04DEHmtEJtOOYohxHUgNtQfiChErWmNiQle8pvc="; }; vendorHash = null; diff --git a/pkgs/by-name/la/lazyjournal/package.nix b/pkgs/by-name/la/lazyjournal/package.nix index 7a5b014e8ed7..cd613e21cbc5 100644 --- a/pkgs/by-name/la/lazyjournal/package.nix +++ b/pkgs/by-name/la/lazyjournal/package.nix @@ -34,7 +34,7 @@ buildGoModule { meta = { description = "TUI for journalctl, file system logs, as well as Docker and Podman containers"; homepage = "https://github.com/Lifailon/lazyjournal"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = with lib.platforms; unix ++ windows; maintainers = with lib.maintainers; [ pluiedev ]; mainProgram = "lazyjournal"; diff --git a/pkgs/by-name/la/lazysql/package.nix b/pkgs/by-name/la/lazysql/package.nix index 7ccbcaf947dd..9f44b33dbb8d 100644 --- a/pkgs/by-name/la/lazysql/package.nix +++ b/pkgs/by-name/la/lazysql/package.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "lazysql"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "jorgerojas26"; repo = "lazysql"; rev = "v${version}"; - hash = "sha256-srQyUQM7lvJD5SLLX9tr3x8U2/sv/fIrspUgSPbnsac="; + hash = "sha256-Grr1R88XguW/jT5Vj/m11Cr+Im2+mnVZw23QrO1ZzMk="; }; vendorHash = "sha256-FbAt/HsjoxqAKWQqqWN2xuyyTG2Ic4DcyEU4O0rjpQE="; diff --git a/pkgs/by-name/la/lazytrivy/package.nix b/pkgs/by-name/la/lazytrivy/package.nix index e4e26b363b8b..da5af6e914a5 100644 --- a/pkgs/by-name/la/lazytrivy/package.nix +++ b/pkgs/by-name/la/lazytrivy/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "lazytrivy"; - version = "1.4.0"; + version = "1.4.1"; env.GOEXPERIMENT = "jsonv2"; @@ -17,10 +17,10 @@ buildGoModule (finalAttrs: { owner = "owenrumney"; repo = "lazytrivy"; tag = "v${finalAttrs.version}"; - hash = "sha256-mZg8hXTZhgIkPNrzP7hQ7fwMDUL9MP5kUVdg8Smq5l4="; + hash = "sha256-0VWmsZKp0IEQ93AuMoYXN8pF0G3fwaP7Lzh3JsN2CtU="; }; - vendorHash = "sha256-2t6PckucJTr/2anqG8zarQOAlmGpOVvDxHkhhHfVaOo="; + vendorHash = "sha256-HKD7vpQAw3G4uMLUMhbv6tsFCOxfp62Phynun4HkFrg="; ldflags = [ "-s" diff --git a/pkgs/by-name/la/lazyworktree/package.nix b/pkgs/by-name/la/lazyworktree/package.nix index 847516f0e1b6..14a46b6d7123 100644 --- a/pkgs/by-name/la/lazyworktree/package.nix +++ b/pkgs/by-name/la/lazyworktree/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "lazyworktree"; - version = "1.46.1"; + version = "1.49.0"; src = fetchFromGitHub { owner = "chmouel"; repo = "lazyworktree"; tag = "v${finalAttrs.version}"; - hash = "sha256-S6Tv0g8C1B47UtZkmBy+DIcLhoSFLzIJ9EiRtbojqAI="; + hash = "sha256-lxh6N1SY1FoEyfDeFTqDdiDMNASwn2QyiyUwve56Dn0="; }; - vendorHash = "sha256-8zoomrS7neTvaCLRFJ4W8+mryEwHmu8VyKf81RRe4yE="; + vendorHash = "sha256-I0MIfk2/ZtjHBzovxijFw5N4siEUdjXEIs5WbNdAzu8="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/lb/lbreakout2/package.nix b/pkgs/by-name/lb/lbreakout2/package.nix index 22f4500376a9..cc6aa9ccaf75 100644 --- a/pkgs/by-name/lb/lbreakout2/package.nix +++ b/pkgs/by-name/lb/lbreakout2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LBreakout2/"; description = "Breakout clone from the LGames series"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lbreakout2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/lc/lc0/package.nix b/pkgs/by-name/lc/lc0/package.nix index 468ccf10ab6a..cc79a4b3665a 100644 --- a/pkgs/by-name/lc/lc0/package.nix +++ b/pkgs/by-name/lc/lc0/package.nix @@ -9,20 +9,28 @@ zlib, gtest, eigen, + abseil-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "lc0"; - version = "0.31.2"; + version = "0.32.1"; src = fetchFromGitHub { owner = "LeelaChessZero"; repo = "lc0"; tag = "v${finalAttrs.version}"; - hash = "sha256-8watDDxSyZ5khYqpXPyjQso2MkOzfI6o2nt0vkuiEUI="; + hash = "sha256-Dvq698ZfYumoax7i1nN5GwTQKXgby9+TdTZT6C7/jgc="; fetchSubmodules = true; }; + postPatch = '' + substituteInPlace meson.build \ + --replace-fail "absl = subproject('abseil-cpp', default_options : ['warning_level=0', 'cpp_std=c++20'])" "" \ + --replace-fail "deps += absl.get_variable('absl_container_dep').as_system()" "deps += [dependency('absl_flat_hash_map'), dependency('absl_cleanup'), dependency('absl_base')]" \ + --replace-fail "if eigen_dep.found() and cc.has_header('Eigen/Core')" "if eigen_dep.found()" + ''; + patchPhase = '' runHook prePatch @@ -44,6 +52,7 @@ stdenv.mkDerivation (finalAttrs: { eigen gtest zlib + abseil-cpp ]; mesonFlags = [ @@ -57,6 +66,8 @@ stdenv.mkDerivation (finalAttrs: { enableParallelBuilding = true; + doCheck = true; + meta = { homepage = "https://lczero.org/"; description = "Open source neural network based chess engine"; diff --git a/pkgs/by-name/lc/lcalc/package.nix b/pkgs/by-name/lc/lcalc/package.nix index 8ca3e7d23956..e29277b96f37 100644 --- a/pkgs/by-name/lc/lcalc/package.nix +++ b/pkgs/by-name/lc/lcalc/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://gitlab.com/sagemath/lcalc"; description = "Program for calculating with L-functions"; mainProgram = "lcalc"; - license = with lib.licenses; [ gpl2 ]; + license = lib.licenses.gpl2; teams = [ lib.teams.sage ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/lc/lcevcdec/package.nix b/pkgs/by-name/lc/lcevcdec/package.nix index b8c91741953b..ac235b1e5d4e 100644 --- a/pkgs/by-name/lc/lcevcdec/package.nix +++ b/pkgs/by-name/lc/lcevcdec/package.nix @@ -1,4 +1,5 @@ { + cctools, cmake, fetchFromGitHub, git, @@ -14,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lcevcdec"; - version = "4.1.0"; + version = "4.2.0"; outputs = [ "out" @@ -26,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "v-novaltd"; repo = "LCEVCdec"; tag = finalAttrs.version; - hash = "sha256-QzejWq0XGPLu+YVNetfbzczNuZ6Gp5QJP5G2RZUan6M="; + hash = "sha256-EVp+ucydbBWlMMXbldkwDEbFlM88UIts8f/PspIqqSY="; }; postPatch = '' @@ -46,6 +47,9 @@ stdenv.mkDerivation (finalAttrs: { git pkg-config python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + cctools.libtool ]; buildInputs = [ diff --git a/pkgs/by-name/lc/lcms2/package.nix b/pkgs/by-name/lc/lcms2/package.nix index ecb0c3280adb..d07d8ca7ffa4 100644 --- a/pkgs/by-name/lc/lcms2/package.nix +++ b/pkgs/by-name/lc/lcms2/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "lcms2"; - version = "2.18"; + version = "2.19.1"; src = fetchurl { url = "mirror://sourceforge/lcms/lcms2-${version}.tar.gz"; - hash = "sha256-7me+NWb0WTYsHuCU/eLBWdM/oDkKpO1fWvZ2+eUAQ0c="; + hash = "sha256-v8VPe6tZ+8khASAUqAMuTLpKvUbbR9RrdkFqjAsoFcg="; }; outputs = [ diff --git a/pkgs/by-name/ld/ld64/package.nix b/pkgs/by-name/ld/ld64/package.nix index 8699a4132d4a..ad2613836ff5 100644 --- a/pkgs/by-name/ld/ld64/package.nix +++ b/pkgs/by-name/ld/ld64/package.nix @@ -47,7 +47,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ld64"; - version = "956.6"; + version = "957.1"; outputs = [ "out" @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "apple-oss-distributions"; repo = "ld64"; tag = "ld64-${finalAttrs.version}"; - hash = "sha256-2VlBjlCZ+ZPKGZ0f5UuG3jJTLZIBXf8IZOiD6snheh4="; + hash = "sha256-KUkEKz2jQq815ls25u0JMYmad4cN9PS/nC3E5eV19co="; }; patches = [ @@ -138,7 +138,7 @@ stdenv.mkDerivation (finalAttrs: { xar ]; - # ld built with this fails to link glib's gio on x86_64 darwin + # ld built with this fails to link glib's gio hardeningDisable = [ "libcxxhardeningfast" ]; dontUseCmakeConfigure = true; # CMake is only needed because it’s used by Meson to find LLVM. diff --git a/pkgs/by-name/ld/ldacbt/0001-abr-drop-support-for-dynamic-loading-libldac.patch b/pkgs/by-name/ld/ldacbt/0001-abr-drop-support-for-dynamic-loading-libldac.patch new file mode 100644 index 000000000000..e054d75fd395 --- /dev/null +++ b/pkgs/by-name/ld/ldacbt/0001-abr-drop-support-for-dynamic-loading-libldac.patch @@ -0,0 +1,164 @@ +From 040210591a5e90fc3e0ca0ec438426273e86c497 Mon Sep 17 00:00:00 2001 +From: "yshuiv7@gmail.com" +Date: Mon, 27 Apr 2026 15:30:10 +0100 +Subject: [PATCH] abr: drop support for dynamic loading libldac + +--- + abr/inc/ldacBT_abr.h | 2 +- + abr/src/ldacBT_abr.c | 76 +------------------------------------------- + 2 files changed, 2 insertions(+), 76 deletions(-) + +diff --git a/abr/inc/ldacBT_abr.h b/abr/inc/ldacBT_abr.h +index 294e230..735ea67 100644 +--- a/abr/inc/ldacBT_abr.h ++++ b/abr/inc/ldacBT_abr.h +@@ -89,7 +89,7 @@ typedef struct _ldacbt_abr_param * HANDLE_LDAC_ABR; + * Return value + * HANDLE_LDAC_ABR for success, NULL for failure. + */ +-LDAC_ABR_API HANDLE_LDAC_ABR ldac_ABR_get_handle(const char *libpath); ++LDAC_ABR_API HANDLE_LDAC_ABR ldac_ABR_get_handle(void); + + /* Release of LDAC ABR handle. + * Format +diff --git a/abr/src/ldacBT_abr.c b/abr/src/ldacBT_abr.c +index 0af6278..fad2dd0 100644 +--- a/abr/src/ldacBT_abr.c ++++ b/abr/src/ldacBT_abr.c +@@ -8,10 +8,6 @@ + + #include + #include +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +-#include +-#include +-#endif + + #define LDAC_ABR_OBSERVING_TIME_MS 500 /* [ms] the time length for storing Tx Queue Depth */ + #define LDAC_ABR_PENALTY_MAX 4 +@@ -56,18 +52,11 @@ typedef int (*tLDACBT_GET_ERR)(HANDLE_LDAC_BT hLdacBt); + + typedef struct _ldacbt_api_param + { +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- const char *lib_name; +- void *lib_handle; +-#endif + tLDACBT_ALTER_EQMID_PRIORITY alter_eqmid_priority; + tLDACBT_GET_EQMID get_eqmid; + tLDACBT_GET_ERR get_error_code; + } LDACBT_API_PARAMS, * HANDLE_LDACBT_API; + +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +-static int open_lib(HANDLE_LDACBT_API hLdacBtApi, const char *lib_name ); +-#endif + + static int load_ldacbt_api_functions(HANDLE_LDACBT_API hLdacBtApi); + +@@ -122,7 +111,7 @@ static const int sizeOfEqmidToBitrateSortedIdTable = (int)(sizeof(aEqmidToAbrQua + / sizeof(aEqmidToAbrQualityModeID[0])); + + /* Get LDAC ABR handle */ +-HANDLE_LDAC_ABR ldac_ABR_get_handle(const char *libpath) ++HANDLE_LDAC_ABR ldac_ABR_get_handle(void) + { + HANDLE_LDAC_ABR hLdacAbr; + ABRDBG( "" ); +@@ -131,15 +120,6 @@ HANDLE_LDAC_ABR ldac_ABR_get_handle(const char *libpath) + return NULL; + } + clear_data( hLdacAbr, sizeof(LDAC_ABR_PARAMS) ); +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- if (libpath != NULL) { +- if (open_lib( &hLdacAbr->ldacBtApi, libpath ) < 0) { +- ABRDBG( "[ERR] Failed to open shared library \"%s\".", libpath ); +- ldac_ABR_free_handle(hLdacAbr); +- return NULL; +- } +- } +-#endif + if( load_ldacbt_api_functions(&hLdacAbr->ldacBtApi) != 0 ){ + ldac_ABR_free_handle(hLdacAbr); + return NULL; +@@ -156,12 +136,6 @@ void ldac_ABR_free_handle(HANDLE_LDAC_ABR hLdacAbr) + if (hLdacAbr->TxQD_Info.pHist){ + free(hLdacAbr->TxQD_Info.pHist); + } +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- if (hLdacAbr->ldacBtApi.lib_handle != NULL) { +- dlclose(hLdacAbr->ldacBtApi.lib_handle); +- hLdacAbr->ldacBtApi.lib_handle = NULL; +- } +-#endif + free(hLdacAbr); + } + } +@@ -408,65 +382,17 @@ int ldac_ABR_Proc( HANDLE_LDAC_BT hLDAC, HANDLE_LDAC_ABR hLdacAbr, + } + + +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +-static void *load_func(void *lib_handle, const char* func_name) +-{ +- void *func_ptr = dlsym(lib_handle, func_name); +- if(func_ptr == NULL){ +- ABRDBG("[ERR] cannot find function '%s' in the library.\n", func_name); +- return NULL; +- } +- return func_ptr; +-} +- +-static int open_lib(HANDLE_LDACBT_API hLdacBtApi, const char *lib_name ) +-{ +- if( hLdacBtApi == NULL ){ +- ABRDBG("[ERR] handle is NULL"); +- return -1; +- } +- if( lib_name == NULL ){ +- ABRDBG("[ERR] lib_name is NULL"); +- return -1; +- } +- // open library +- hLdacBtApi->lib_handle = dlopen(lib_name, RTLD_NOW); +- if(hLdacBtApi->lib_handle == NULL){ +-#ifdef LOCAL_DEBUG +- char buffer_str[1024]; +- strerror_r(errno, buffer_str, sizeof(buffer_str)); +- ABRDBG("[ERR] cannot open library '%s': errno = %d (%s)\n", +- lib_name, errno, buffer_str); +-#endif +- return -1; +- } +- return 0; +-} +-#endif /* LDAC_ABR_DYNAMIC_LINK_LDAC_API */ +- + // Load functions + static int load_ldacbt_api_functions(HANDLE_LDACBT_API hLdacBtApi) + { + hLdacBtApi->alter_eqmid_priority = +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- load_func(hLdacBtApi->lib_handle, "ldacBT_alter_eqmid_priority"); +-#else + ldacBT_alter_eqmid_priority; +-#endif + + hLdacBtApi->get_eqmid = +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- load_func(hLdacBtApi->lib_handle, "ldacBT_get_eqmid"); +-#else + ldacBT_get_eqmid; +-#endif + + hLdacBtApi->get_error_code = +-#ifdef LDAC_ABR_DYNAMIC_LINK_LDAC_API +- load_func(hLdacBtApi->lib_handle, "ldacBT_get_error_code"); +-#else + ldacBT_get_error_code; +-#endif + + if( (hLdacBtApi->alter_eqmid_priority == NULL) || + (hLdacBtApi->get_eqmid == NULL) || +-- +2.53.0 + diff --git a/pkgs/by-name/ld/ldacbt/make-byte-order-checks-portable.patch b/pkgs/by-name/ld/ldacbt/make-byte-order-checks-portable.patch new file mode 100644 index 000000000000..c357bed9881c --- /dev/null +++ b/pkgs/by-name/ld/ldacbt/make-byte-order-checks-portable.patch @@ -0,0 +1,55 @@ +diff --git a/src/ldacBT_internal.c b/src/ldacBT_internal.c +index 94458854fe..ca9df42c72 100644 +--- a/src/ldacBT_internal.c ++++ b/src/ldacBT_internal.c +@@ -241,7 +241,7 @@ + char *p_pcm_8 = (char *)pbuff; + char *p_lch_8 = (char *)ap_pcm[0]; + char *p_rch_8 = (char *)ap_pcm[1]; +-#if __BYTE_ORDER == __LITTLE_ENDIAN ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + for (i = 0; i < nsmpl; i++) { + *p_lch_8++ = p_pcm_8[0]; + *p_lch_8++ = p_pcm_8[1]; +@@ -252,24 +252,24 @@ + *p_rch_8++ = p_pcm_8[2]; + p_pcm_8+=3; + } +-#else /* __BYTE_ORDER */ ++#else /* __BYTE_ORDER__ */ + #error unsupported byte order +-#endif /* #if __BYTE_ORDER == __LITTLE_ENDIAN */ ++#endif /* #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ */ + } + else if ( fmt == LDACBT_SMPL_FMT_S32 ){ + char *p_pcm_8 = (char *)pbuff; + char *p_lch_8 = (char *)ap_pcm[0]; + char *p_rch_8 = (char *)ap_pcm[1]; +-#if __BYTE_ORDER == __LITTLE_ENDIAN ++#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ + for (i = 0; i < nsmpl; i++) { + *p_lch_8++ = p_pcm_8[0]; *p_lch_8++ = p_pcm_8[1]; *p_lch_8++ = p_pcm_8[2]; *p_lch_8++ = p_pcm_8[3]; + p_pcm_8+=4; + *p_rch_8++ = p_pcm_8[0]; *p_rch_8++ = p_pcm_8[1]; *p_rch_8++ = p_pcm_8[2]; *p_rch_8++ = p_pcm_8[3]; + p_pcm_8+=4; + } +-#else /* __BYTE_ORDER */ ++#else /* __BYTE_ORDER__ */ + #error unsupported byte order +-#endif /* #if __BYTE_ORDER == __LITTLE_ENDIAN */ ++#endif /* #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ */ + } + else if ( fmt == LDACBT_SMPL_FMT_F32 ){ + float *p_pcm = (float *)pbuff; +diff --git a/src/ldacBT_internal.h b/src/ldacBT_internal.h +index 70dac607e7..170d14be7d 100644 +--- a/src/ldacBT_internal.h ++++ b/src/ldacBT_internal.h +@@ -9,7 +9,6 @@ + + #include + #include +-#include + #ifdef ANDROID + #include + #include diff --git a/pkgs/by-name/ld/ldacbt/meson.build b/pkgs/by-name/ld/ldacbt/meson.build new file mode 100644 index 000000000000..1bd0a8ca2e96 --- /dev/null +++ b/pkgs/by-name/ld/ldacbt/meson.build @@ -0,0 +1,52 @@ +project( + 'ldacbt', + 'c', + meson_version: '>=1.10.0', + version: files('VERSION'), +) + +pkg = import('pkgconfig') + +cc = meson.get_compiler('c') +dep_m = cc.find_library('m') + +lib = library( + 'ldacBT', + 'abr/src/ldacBT_abr.c', + 'src/ldacBT.c', + 'src/ldaclib.c', + include_directories: [ + 'abr/inc', + 'inc', + ], + dependencies: [dep_m], + version: meson.project_version(), + install: true, +) + +install_headers( + 'abr/inc/ldacBT_abr.h', + 'inc/ldacBT.h', + subdir: 'ldac', +) + +pkg.generate( + lib, + name: 'ldacBT-enc', + description: 'LDAC Bluetooth encoder', + subdirs: 'ldac', +) + +pkg.generate( + lib, + name: 'ldacBT-abr', + description: 'LDAC Bluetooth ABR library', + subdirs: 'ldac', +) + +pkg.generate( + lib, + name: 'ldacBT-dec', + description: 'LDAC Bluetooth decoder', + subdirs: 'ldac', +) diff --git a/pkgs/by-name/ld/ldacbt/package.nix b/pkgs/by-name/ld/ldacbt/package.nix index 72320637739d..62ade6e1b577 100644 --- a/pkgs/by-name/ld/ldacbt/package.nix +++ b/pkgs/by-name/ld/ldacbt/package.nix @@ -2,19 +2,19 @@ lib, stdenv, fetchFromGitHub, - cmake, + meson, + ninja, }: stdenv.mkDerivation (finalAttrs: { - pname = "ldacBT"; - version = "2.0.2.3"; + pname = "ldacbt"; + version = "2.0.72"; src = fetchFromGitHub { - repo = "ldacBT"; - owner = "ehfive"; - tag = "v${finalAttrs.version}"; - sha256 = "09dalysx4fgrgpfdm9a51x6slnf4iik1sqba4xjgabpvq91bnb63"; - fetchSubmodules = true; + owner = "open-vela"; + repo = "external_libldac"; + rev = "5b4bf66096ba0d69615efb2422ba3d023c34c2fd"; + hash = "sha256-5jeqTyhSBtYky15Xw1lIbUxeGZMQQQdM/EQUFicyi3Y="; }; outputs = [ @@ -22,31 +22,41 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + patches = [ + ./0001-abr-drop-support-for-dynamic-loading-libldac.patch + + # Darwin doesn’t have ``; use the predefined GCC/Clang + # macros instead. + ./make-byte-order-checks-portable.patch + ]; + nativeBuildInputs = [ - cmake + meson + ninja ]; - cmakeFlags = [ - # CMakeLists.txt by default points to $out - "-DINSTALL_INCLUDEDIR=${placeholder "dev"}/include" - ]; + mesonBuildType = "release"; - # Fix the build with CMake 4. - # - # See: + # The upstream build system is tied to AOSP, so we use our own Meson + # definitions to replace it. postPatch = '' - substituteInPlace CMakeLists.txt \ - --replace-fail \ - 'cmake_minimum_required(VERSION 3.0)' \ - 'cmake_minimum_required(VERSION 3.0...3.10)' + ln -s ${./meson.build} meson.build + + awk -v want=${finalAttrs.version} ' + /^#define LDACBT_LIB_VER_/ { v = v sep ($3+0); sep = "." } + END { + if (v != want) { print "version mismatch: package says " want ", source reports " v > "/dev/stderr"; exit 1 } + print v + } + ' src/ldacBT_api.c > VERSION ''; meta = { - description = "AOSP libldac dispatcher"; - homepage = "https://github.com/EHfive/ldacBT"; + description = "Sony LDAC Bluetooth decoder library (from AOSP via open-vela)"; + homepage = "https://github.com/open-vela/external_libldac"; license = lib.licenses.asl20; # libldac code detects & #error's out on non-LE byte order platforms = lib.platforms.littleEndian; - maintainers = [ ]; + maintainers = with lib.maintainers; [ qweered ]; }; }) diff --git a/pkgs/by-name/ld/ldap-manager/package.nix b/pkgs/by-name/ld/ldap-manager/package.nix index 8884ce731d8a..5c5180fcf07b 100644 --- a/pkgs/by-name/ld/ldap-manager/package.nix +++ b/pkgs/by-name/ld/ldap-manager/package.nix @@ -2,7 +2,6 @@ lib, buildGoModule, fetchFromGitHub, - templ, versionCheckHook, nix-update-script, }: @@ -20,17 +19,13 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-sE8XGlQg6FLDfgYdioa5i5Gv8LyQo16p0oIaiyMOzZ4="; - nativeBuildInputs = [ - templ - ]; - excludedPackages = [ "internal/e2e" "internal/integration" ]; preBuild = '' - templ generate + go tool templ generate ''; ldflags = [ diff --git a/pkgs/by-name/ld/ldapmonitor/package.nix b/pkgs/by-name/ld/ldapmonitor/package.nix index 051d50ff5c82..26556ceeffe9 100644 --- a/pkgs/by-name/ld/ldapmonitor/package.nix +++ b/pkgs/by-name/ld/ldapmonitor/package.nix @@ -37,7 +37,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "ldapmonitor"; homepage = "https://github.com/p0dalirius/LDAPmonitor"; changelog = "https://github.com/p0dalirius/LDAPmonitor/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; }; }) diff --git a/pkgs/by-name/ld/ldash/package.nix b/pkgs/by-name/ld/ldash/package.nix new file mode 100644 index 000000000000..4e7a78529154 --- /dev/null +++ b/pkgs/by-name/ld/ldash/package.nix @@ -0,0 +1,32 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "ldash"; + version = "1.3.1"; + __structuredAttrs = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "md-weber"; + repo = "ldash"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ji1sgzDjJ8KVUVaKzhhCFBgIAAzRS2NQ7DTvJxb3PKA="; + }; + + cargoHash = "sha256-9/Dk3FQuSlUWPm4z3VadJl5FYtZ1gFY9mdZwiSXzzvc="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "This is a TUI for hledger to show a nice dashboard"; + homepage = "https://codeberg.org/md-weber/ldash"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ matthewcroughan ]; + mainProgram = "ldash"; + }; +}) diff --git a/pkgs/by-name/ld/ldc/bootstrap.nix b/pkgs/by-name/ld/ldc/bootstrap.nix index 734797cd5c2a..4c73b83d707b 100644 --- a/pkgs/by-name/ld/ldc/bootstrap.nix +++ b/pkgs/by-name/ld/ldc/bootstrap.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ lionello ]; platforms = [ "x86_64-linux" - "x86_64-darwin" "aarch64-linux" "aarch64-darwin" ]; diff --git a/pkgs/by-name/ld/ldc/package.nix b/pkgs/by-name/ld/ldc/package.nix index e57382a52b6a..e0bd2ad39ae2 100644 --- a/pkgs/by-name/ld/ldc/package.nix +++ b/pkgs/by-name/ld/ldc/package.nix @@ -177,7 +177,6 @@ stdenv.mkDerivation (finalAttrs: { "x86_64-linux" "i686-linux" "aarch64-linux" - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ld/ldns/package.nix b/pkgs/by-name/ld/ldns/package.nix index 4078cdfd5372..f40ea684be96 100644 --- a/pkgs/by-name/ld/ldns/package.nix +++ b/pkgs/by-name/ld/ldns/package.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "ldns"; - version = "1.9.0"; + version = "1.9.2"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/ldns/ldns-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-q67tKFj76oSk65gz4Z59IzgMwPPZtlSLlivkInb/3LM="; + sha256 = "sha256-tST6IZlLboNCAM64wn8bhL2lmC/jVwbwWBlsB525TV0="; }; postPatch = '' diff --git a/pkgs/by-name/le/ledger-live-desktop/package.nix b/pkgs/by-name/le/ledger-live-desktop/package.nix index 88878900af21..0ea559d58ac9 100644 --- a/pkgs/by-name/le/ledger-live-desktop/package.nix +++ b/pkgs/by-name/le/ledger-live-desktop/package.nix @@ -8,11 +8,11 @@ let pname = "ledger-live-desktop"; - version = "4.6.1"; + version = "4.11.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-OXzxOraDgOBNpsbDAPpf5dGERiK/pkfsVtpzTZkXPQA="; + hash = "sha256-XjJBywTscKNNVLTvcVfJPNfKPBBcKoeeSSmDSqz8ePk="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/by-name/le/ledmon/package.nix b/pkgs/by-name/le/ledmon/package.nix index c85d19900f6a..d6eed318eeea 100644 --- a/pkgs/by-name/le/ledmon/package.nix +++ b/pkgs/by-name/le/ledmon/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.92"; src = fetchFromGitHub { - owner = "intel"; + owner = "md-raid-utilities"; repo = "ledmon"; rev = "v${finalAttrs.version}"; sha256 = "1lz59606vf2sws5xwijxyffm8kxcf8p9qbdpczsq1b5mm3dk6lvp"; @@ -39,10 +39,10 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/intel/ledmon"; + homepage = "https://github.com/md-raid-utilities/ledmon"; description = "Enclosure LED Utilities"; platforms = lib.platforms.linux; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sorki ]; }; }) diff --git a/pkgs/by-name/le/leetcode-cli/package.nix b/pkgs/by-name/le/leetcode-cli/package.nix index 0e111b922c04..938ca1aa3a53 100644 --- a/pkgs/by-name/le/leetcode-cli/package.nix +++ b/pkgs/by-name/le/leetcode-cli/package.nix @@ -14,14 +14,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "leetcode-cli"; - version = "0.5.0"; + version = "0.5.4"; src = fetchCrate { inherit (finalAttrs) pname version; - hash = "sha256-EafEz5MhY9f56N1LCPaW+ktYrV01r9vHCbublDnfAKg="; + hash = "sha256-+6DpMDWP2ApyoQTRXLy1mJn3MZzYqunhcoy+c6fHOAk="; }; - cargoHash = "sha256-8bHpNckEsJ4VWlmEaDTeMW+Txi9SQh30lK5CKKperC8="; + cargoHash = "sha256-bbwyuFY3i/pcWBJjaKIZf2zHEkp4raZp7i5cWZtS9w8="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/le/leetgpu/package.nix b/pkgs/by-name/le/leetgpu/package.nix new file mode 100644 index 000000000000..78a13e1fffa3 --- /dev/null +++ b/pkgs/by-name/le/leetgpu/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenvNoCC, + fetchurl, + installShellFiles, + versionCheckHook, +}: + +let + version = "1.2.0"; + + throwSystem = throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"; + + srcs = { + x86_64-linux = fetchurl { + url = "https://cli.leetgpu.com/dist/${version}/leetgpu-linux-amd64"; + hash = "sha256-um+KHqE1mmx7dkKm3pecrZSnsT+vbMh95kWQAsLGxFw="; + }; + + aarch64-linux = fetchurl { + url = "https://cli.leetgpu.com/dist/${version}/leetgpu-linux-arm64"; + hash = "sha256-3BcM0SHBugv/72iznR0q6t18B+u1f2auyUK1n1t5KBY="; + }; + + aarch64-darwin = fetchurl { + url = "https://cli.leetgpu.com/dist/${version}/leetgpu-macos-arm64"; + hash = "sha256-B1Sdyw+6fDBKS3PsINmiNA9PnOtEpDZiodFPsx+qk1Y="; + }; + }; + + src = srcs.${stdenvNoCC.hostPlatform.system} or throwSystem; +in + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "leetgpu"; + inherit version; + + strictDeps = true; + __structuredAttrs = true; + + inherit src; + + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + install -Dm755 ${src} $out/bin/leetgpu + + runHook postInstall + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = ./update.sh; + + meta = { + description = "Run CUDA kernels from your terminal"; + homepage = "https://leetgpu.com/cli"; + license = lib.licenses.unfree; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "leetgpu"; + }; +}) diff --git a/pkgs/by-name/le/leetgpu/update.sh b/pkgs/by-name/le/leetgpu/update.sh new file mode 100755 index 000000000000..b30ac924cbe9 --- /dev/null +++ b/pkgs/by-name/le/leetgpu/update.sh @@ -0,0 +1,23 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p bash nix-update common-updater-scripts nix jq + +set -euo pipefail + +currentVersion=$(nix-instantiate --eval --raw -E "with import ./. {}; leetgpu.version or (lib.getVersion leetgpu)") +latestVersion=$(curl https://cli.leetgpu.com/latest) + +if [[ "$currentVersion" == "$latestVersion" ]]; then + echo "package is up-to-date: $currentVersion" + exit 0 +fi + +update-source-version leetgpu $latestVersion || true + +for system in \ + x86_64-linux \ + aarch64-linux \ + aarch64-darwin; do + hash=$(nix store prefetch-file --json --hash-type sha256 \ + $(nix-instantiate --eval --raw -E "with import ./. {}; leetgpu.src.url" --system "$system") | jq -r '.hash') + update-source-version leetgpu $latestVersion $hash --system=$system --ignore-same-version +done diff --git a/pkgs/by-name/le/leetsolv/package.nix b/pkgs/by-name/le/leetsolv/package.nix new file mode 100644 index 000000000000..1efc4fb78c8c --- /dev/null +++ b/pkgs/by-name/le/leetsolv/package.nix @@ -0,0 +1,50 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + writableTmpDirAsHomeHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "leetsolv"; + version = "1.2.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "eannchen"; + repo = "leetsolv"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZZ5TtrVUVWUTrGkp4p5k/aNT/XfCwJPsTjTUMcSz7sc="; + }; + + vendorHash = null; + + ldflags = [ + "-s" + "-X main.Version=${finalAttrs.version}" + "-X main.BuildTime=1970-01-01T00:00:00Z" + "-X main.GitCommit=${finalAttrs.src.rev}" + ]; + + # needed for unit tests, also for version test + nativeCheckInputs = [ writableTmpDirAsHomeHook ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Spaced repetition CLI for DSA and LeetCode"; + homepage = "https://github.com/eannchen/leetsolv"; + changelog = "https://github.com/eannchen/leetsolv/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ethancedwards8 ]; + mainProgram = "leetsolv"; + }; +}) diff --git a/pkgs/by-name/le/lefthook/package.nix b/pkgs/by-name/le/lefthook/package.nix index 99363cb56b44..4d5afcd48a16 100644 --- a/pkgs/by-name/le/lefthook/package.nix +++ b/pkgs/by-name/le/lefthook/package.nix @@ -8,16 +8,16 @@ buildGoModule (finalAttrs: { pname = "lefthook"; - version = "2.1.5"; + version = "2.1.10"; src = fetchFromGitHub { owner = "evilmartians"; repo = "lefthook"; rev = "v${finalAttrs.version}"; - hash = "sha256-HLC6X9JjiiR3Ecg5MQ33vELs6ooLLjQ9x++4xB1qyHU="; + hash = "sha256-GR97Z9wnM6z6gNIcf35leBGkhdj1d6OHQ9oFnaz3f1s="; }; - vendorHash = "sha256-75jrXoBXoPCE/Ue7OlGAA4nUDXHM5ccIaK4rsKgfG84="; + vendorHash = "sha256-G+v6ZqnkcFdPDzXlN89oqD7mOnHfq1tvIkFxdoVnBNo="; nativeBuildInputs = [ installShellFiles ]; @@ -41,6 +41,6 @@ buildGoModule (finalAttrs: { changelog = "https://github.com/evilmartians/lefthook/raw/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mit; mainProgram = "lefthook"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ nightconcept ]; }; }) diff --git a/pkgs/by-name/le/leftwm-theme/package.nix b/pkgs/by-name/le/leftwm-theme/package.nix index 6746dbc44c73..ce20b8c0696f 100644 --- a/pkgs/by-name/le/leftwm-theme/package.nix +++ b/pkgs/by-name/le/leftwm-theme/package.nix @@ -6,18 +6,18 @@ pkg-config, }: -rustPlatform.buildRustPackage { +rustPlatform.buildRustPackage (finalAttrs: { pname = "leftwm-theme"; - version = "unstable-2024-03-05"; + version = "0.1.3"; src = fetchFromGitHub { owner = "leftwm"; repo = "leftwm-theme"; - rev = "b394824ff874b269a90c29e2d45b0cacc4d209f5"; - hash = "sha256-cV4tY1qKNluSSGf+WwKFK3iVE7cMevafl6qQvhy1flE="; + tag = "v${finalAttrs.version}"; + hash = "sha256-TPzmopH9RBM/BBrEL9/NWO3qjVa6SSWCp34tHxjLtBI="; }; - cargoHash = "sha256-v3PHMaXJCEBiCd+78b/BXRooZC4Py82gDcvA/efNJ7w="; + cargoHash = "sha256-ZfNVpepTm6/JgJJB+qDVI2gVz36PRBpUL8/ba20xQhk="; checkFlags = [ # direct writing /tmp @@ -40,4 +40,4 @@ rustPlatform.buildRustPackage { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ denperidge ]; }; -} +}) diff --git a/pkgs/by-name/le/legcord/package.nix b/pkgs/by-name/le/legcord/package.nix index 7cb1c674808d..eca152547928 100644 --- a/pkgs/by-name/le/legcord/package.nix +++ b/pkgs/by-name/le/legcord/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, pnpmConfigHook, - pnpm_10_29_2, + pnpm_10, nodejs, electron, makeWrapper, @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pnpmConfigHook - pnpm_10_29_2 + pnpm_10 nodejs # we use a script wrapper here for environment variable expansion at runtime # https://github.com/NixOS/nixpkgs/issues/172583 @@ -47,9 +47,9 @@ stdenv.mkDerivation (finalAttrs: { pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_10_29_2; - fetcherVersion = 3; - hash = "sha256-ME74yxVwH4W9gE0XbtwDhR8g9QulN2eeOB1eekaHmG8="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-a0FvNwEAEAltQltgUf4tX0IGSdcYHkSodx4b9v5QQcg="; }; buildPhase = '' diff --git a/pkgs/by-name/le/legendary-gl/package.nix b/pkgs/by-name/le/legendary-gl/package.nix index 0f46e05b024f..a002532fa7bd 100644 --- a/pkgs/by-name/le/legendary-gl/package.nix +++ b/pkgs/by-name/le/legendary-gl/package.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication { pyproject = true; src = fetchFromGitHub { - owner = "derrod"; + owner = "legendary-gl"; repo = "legendary"; rev = "56d439ed2d3d9f34e2b08fa23e627c23a487b8d6"; hash = "sha256-yCHeeEGw+9gtRMGyIhbStxJhmSM/1Fqly7HSRDkZILQ="; @@ -35,7 +35,7 @@ python3Packages.buildPythonApplication { meta = { description = "Free and open-source Epic Games Launcher alternative"; - homepage = "https://github.com/derrod/legendary"; + homepage = "https://github.com/legendary-gl/legendary"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ equirosa ]; mainProgram = "legendary"; diff --git a/pkgs/by-name/le/legends-of-equestria/package.nix b/pkgs/by-name/le/legends-of-equestria/package.nix index 4c1b58e89594..65539a30db33 100644 --- a/pkgs/by-name/le/legends-of-equestria/package.nix +++ b/pkgs/by-name/le/legends-of-equestria/package.nix @@ -52,10 +52,6 @@ let url = "https://mega.nz/file/QmBXXDiC#XoG19N2_uBIHVKDNId5mE4cod9q29iPkYOfGDgAX_Oo"; outputHash = "IdcowkU2k2grg133jTf3EOENATCCige64BMYXtFupRE="; }; - x86_64-darwin = { - url = "https://mega.nz/file/Uy4WzbCL#5tCRmmrizaIdilo2iYLSVkoSSNDleyQ8ZNYYT5hJsR4"; - outputHash = "D/2G7w89Z4JTP0TEjnlBKI7XCBx2LBurXZcEp0gW+JA="; - }; aarch64-darwin = { url = "https://mega.nz/file/xr4AHIrb#pD5wDIiYys2my4_59UWiYoqBpdyUQHf_CalPZe7hpME"; outputHash = "PpDUFnobznB5FHYSF+m9S3RcNIdi7eWyxxDHRdS+zlY="; diff --git a/pkgs/by-name/le/legends-of-equestria/update.sh b/pkgs/by-name/le/legends-of-equestria/update.sh index 1035b733a8da..b3ac969539e1 100755 --- a/pkgs/by-name/le/legends-of-equestria/update.sh +++ b/pkgs/by-name/le/legends-of-equestria/update.sh @@ -60,5 +60,4 @@ applyUpdate() { } applyUpdate x86_64-linux Linux -applyUpdate x86_64-darwin macOS applyUpdate aarch64-darwin "macOS arm64" diff --git a/pkgs/by-name/le/legitify/package.nix b/pkgs/by-name/le/legitify/package.nix index 6147fc470318..a87f3ebb535c 100644 --- a/pkgs/by-name/le/legitify/package.nix +++ b/pkgs/by-name/le/legitify/package.nix @@ -4,23 +4,42 @@ fetchFromGitHub, }: -buildGoModule rec { +buildGoModule (finalAttrs: { pname = "legitify"; version = "1.0.11"; src = fetchFromGitHub { owner = "Legit-Labs"; repo = "legitify"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-ijW0vvamuqcN6coV5pAtmjAUjzNXxiqr2S9EwrNlrJc="; }; - vendorHash = "sha256-QwSh7+LuwdbBtrIGk3ZK6cMW9h7wzNArPT/lVZgUGBU="; + vendorHash = "sha256-XPfqQFGJ5yZJVFzHq4zzTXzwuxsAPJvTrZBK+gZWRKE="; + + overrideModAttrs = oldAttrs: { + postPatch = (oldAttrs.postPatch or "") + '' + export GOCACHE=$TMPDIR/go-cache + export GOPATH=$TMPDIR/go + go mod edit -replace golang.org/x/tools=golang.org/x/tools@v0.30.0 + go mod tidy + ''; + postBuild = (oldAttrs.postBuild or "") + '' + cp go.mod go.sum vendor/ + ''; + }; + + preBuild = '' + if [ -d vendor ]; then + chmod -R u+w vendor + cp vendor/go.mod vendor/go.sum . + fi + ''; ldflags = [ "-w" "-s" - "-X=github.com/Legit-Labs/legitify/internal/version.Version=${version}" + "-X=github.com/Legit-Labs/legitify/internal/version.Version=${finalAttrs.version}" ]; preCheck = '' @@ -30,10 +49,9 @@ buildGoModule rec { meta = { description = "Tool to detect and remediate misconfigurations and security risks of GitHub assets"; homepage = "https://github.com/Legit-Labs/legitify"; - changelog = "https://github.com/Legit-Labs/legitify/releases/tag/${src.tag}"; + changelog = "https://github.com/Legit-Labs/legitify/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ fab ]; mainProgram = "legitify"; - broken = true; }; -} +}) diff --git a/pkgs/by-name/le/leiningen/package.nix b/pkgs/by-name/le/leiningen/package.nix index 01550fdb9768..f06f6d58ed8c 100644 --- a/pkgs/by-name/le/leiningen/package.nix +++ b/pkgs/by-name/le/leiningen/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.epl10; platforms = jdk.meta.platforms; - maintainers = with lib.maintainers; [ momeemt ]; + maintainers = [ ]; mainProgram = "lein"; }; }) diff --git a/pkgs/by-name/le/lektor/package.nix b/pkgs/by-name/le/lektor/package.nix index bf2d4b7c17ea..943e3cbc1bfc 100644 --- a/pkgs/by-name/le/lektor/package.nix +++ b/pkgs/by-name/le/lektor/package.nix @@ -13,14 +13,7 @@ let python = python3.override { self = python; packageOverrides = self: super: { - mistune = super.mistune.overridePythonAttrs (old: rec { - version = "2.0.5"; - src = fetchPypi { - inherit (old) pname; - inherit version; - hash = "sha256-AkYRPLJJLbh1xr5Wl0p8iTMzvybNkokchfYxUc7gnTQ="; - }; - }); + mistune = self.mistune_2; }; }; in diff --git a/pkgs/by-name/le/lemminx/package.nix b/pkgs/by-name/le/lemminx/package.nix index 725c9565142a..67ad0ae8c033 100644 --- a/pkgs/by-name/le/lemminx/package.nix +++ b/pkgs/by-name/le/lemminx/package.nix @@ -26,13 +26,13 @@ let in maven.buildMavenPackage rec { pname = "lemminx"; - version = "0.31.0"; + version = "0.31.2"; src = fetchFromGitHub { - owner = "eclipse"; + owner = "eclipse-lemminx"; repo = "lemminx"; tag = version; - hash = "sha256-a+9RN1265fsmYAUMuUTxA+VqJv7xPlzuc8HqoZwmR4M="; + hash = "sha256-nV+IXeGEnJ7q2GEH9LKiy8ABePHSIt8GFPj/sZzv71E="; # Lemminx reads this git information at runtime from a git.properties # file on the classpath leaveDotGit = true; @@ -48,7 +48,7 @@ maven.buildMavenPackage rec { }; mvnJdk = jdk_headless; - mvnHash = "sha256-0KnaXr5Mmwm0pV4o5bAX0MWKl6f/cvlO6cyV9UcgXeo="; + mvnHash = "sha256-IJBmztfNco5UF0BwfeU5QHwvr50bXsrZFOSIPoGBijA="; # Disable gitcommitid plugin which needs a .git folder which we don't have. # Disable failing tests which either need internet access or are flaky. @@ -126,7 +126,7 @@ maven.buildMavenPackage rec { meta = { description = "XML Language Server"; mainProgram = "lemminx"; - homepage = "https://github.com/eclipse/lemminx"; + homepage = "https://github.com/eclipse-lemminx/lemminx"; license = lib.licenses.epl20; maintainers = with lib.maintainers; [ tricktron ]; }; diff --git a/pkgs/by-name/le/lemmy-help/package.nix b/pkgs/by-name/le/lemmy-help/package.nix index 88fcb34d5ddb..0336a0551d61 100644 --- a/pkgs/by-name/le/lemmy-help/package.nix +++ b/pkgs/by-name/le/lemmy-help/package.nix @@ -26,7 +26,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://github.com/numToStr/lemmy-help"; changelog = "https://github.com/numToStr/lemmy-help/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "lemmy-help"; }; diff --git a/pkgs/by-name/le/lemon-graph/package.nix b/pkgs/by-name/le/lemon-graph/package.nix index ca1ea2a627cc..0490bbc5187e 100644 --- a/pkgs/by-name/le/lemon-graph/package.nix +++ b/pkgs/by-name/le/lemon-graph/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://lemon.cs.elte.hu/trac/lemon"; description = "Efficient library for combinatorial optimization tasks on graphs and networks"; license = lib.licenses.boost; - maintainers = with lib.maintainers; [ trepetti ]; + maintainers = with lib.maintainers; [ hzeller ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/le/lenovo-legion/package.nix b/pkgs/by-name/le/lenovo-legion/package.nix index e712e5e11f47..ca02b32de8ee 100644 --- a/pkgs/by-name/le/lenovo-legion/package.nix +++ b/pkgs/by-name/le/lenovo-legion/package.nix @@ -9,14 +9,14 @@ python3.pkgs.buildPythonApplication rec { pname = "lenovo-legion-app"; - version = "0.0.20-unstable-2025-07-11"; + version = "0.0.20-unstable-2026-05-12"; pyproject = true; src = fetchFromGitHub { owner = "johnfanv2"; repo = "LenovoLegionLinux"; - rev = "f559df04cc0705b2b181dfd0404110a4d1d6e2a9"; - hash = "sha256-WXGDlykH6aBUVotmDcGZ8Y/zC8iBAv57u3hXRnfTaSo="; + rev = "7c19579d13ce686cf1e237699b9a78e80d03c977"; + hash = "sha256-gTlUrbNKCUQ+g70StlqspDn90wKW2scssKPZqaegzTY="; }; sourceRoot = "${src.name}/python/legion_linux"; @@ -38,10 +38,6 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' # only fixup application (legion-linux-gui), service (legiond) currently not installed so do not fixup - # version - substituteInPlace ./setup.cfg \ - --replace-fail "_VERSION" "${builtins.head (lib.splitString "-" version)}" - # /etc substituteInPlace ./legion_linux/legion.py \ --replace-fail "/etc/legion_linux" "$out/share/legion_linux" diff --git a/pkgs/by-name/le/lens/darwin.nix b/pkgs/by-name/le/lens/darwin.nix index 3acc21000c51..81d520d5fbd1 100644 --- a/pkgs/by-name/le/lens/darwin.nix +++ b/pkgs/by-name/le/lens/darwin.nix @@ -4,6 +4,7 @@ version, src, meta, + updateScript, undmg, }: @@ -29,4 +30,6 @@ stdenv.mkDerivation { ''; dontFixup = true; + + passthru = { inherit updateScript; }; } diff --git a/pkgs/by-name/le/lens/linux.nix b/pkgs/by-name/le/lens/linux.nix index e101ab53556c..81ed42f60958 100644 --- a/pkgs/by-name/le/lens/linux.nix +++ b/pkgs/by-name/le/lens/linux.nix @@ -3,6 +3,7 @@ version, src, meta, + updateScript, appimageTools, makeWrapper, }: @@ -21,6 +22,8 @@ appimageTools.wrapType2 { meta ; + passthru = { inherit updateScript; }; + nativeBuildInputs = [ makeWrapper ]; extraInstallCommands = '' diff --git a/pkgs/by-name/le/lens/package.nix b/pkgs/by-name/le/lens/package.nix index 6cbe93baffc1..8c06617539c8 100644 --- a/pkgs/by-name/le/lens/package.nix +++ b/pkgs/by-name/le/lens/package.nix @@ -8,20 +8,16 @@ let pname = "lens-desktop"; - version = "2024.11.261604"; + version = "2026.6.260931"; sources = { x86_64-linux = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.x86_64.AppImage"; - hash = "sha256-AbuEU5gOckVU+eDIFnomc7ryLq68ihuk3c0XosoJp74="; - }; - x86_64-darwin = { - url = "https://api.k8slens.dev/binaries/Lens-${version}-latest.dmg"; - hash = "sha256-MQQRGTCe+LEHXJi6zjnpENbtlWNP+XVH9rWXRMk+26w="; + hash = "sha512-P9PrtbGKaHNlzZsm10ovkYCBBfQpVWBgcVsYLETMwINP2bzrIIK5HVbkbcTEUsxK90L7MQmFwpAssojW0b9G5Q=="; }; aarch64-darwin = { url = "https://api.k8slens.dev/binaries/Lens-${version}-latest-arm64.dmg"; - hash = "sha256-aakJCLnQBAnUdrrniTcahS+q3/kP09mlaPTV8FW5afI="; + hash = "sha512-eCE3w7NlYrHiexCirH2wFN0nOO3qAt5acbldXbDMVIrG94tbgM8Y5ZO8/YIUN45XbotYtKW8/Nw+WsrTp6DPBg=="; }; }; @@ -35,12 +31,15 @@ let license = lib.licenses.lens; maintainers = with lib.maintainers; [ dbirks + qweered RossComputerGuy starkca90 ]; platforms = builtins.attrNames sources; }; + updateScript = ./update.sh; + in if stdenv.hostPlatform.isDarwin then callPackage ./darwin.nix { @@ -49,6 +48,7 @@ if stdenv.hostPlatform.isDarwin then version src meta + updateScript ; } else @@ -58,5 +58,6 @@ else version src meta + updateScript ; } diff --git a/pkgs/by-name/le/lens/update.sh b/pkgs/by-name/le/lens/update.sh new file mode 100755 index 000000000000..ec0f3bd9d32f --- /dev/null +++ b/pkgs/by-name/le/lens/update.sh @@ -0,0 +1,36 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts curl yq-go jq + +set -euo pipefail + +base="https://api.k8slens.dev/binaries" + +# Lens is built with electron-builder, which publishes an auto-update manifest +# next to each binary. These manifests carry both the latest version and the +# base64 sha512 digest of every artifact, so we can bump all platforms without +# downloading the (~250 MiB) images ourselves. +linux_manifest=$(curl -sfL "$base/latest-linux.yml" | yq -o=json) +mac_manifest=$(curl -sfL "$base/latest-mac.yml" | yq -o=json) + +# The manifest reports e.g. "2026.6.260931-latest"; the "-latest" suffix only +# lives in the download URL, so drop it from the Nix version. +version=$(jq -r '.version' <<<"$linux_manifest") +version=${version%-latest} + +# electron-builder records base64-encoded sha512 digests, which are already +# valid Nix SRI hashes once prefixed with "sha512-". Match artifacts by filename +# suffix (endswith) rather than a regex to keep jq's string escaping out of play. +manifest_hash() { + echo "sha512-$(jq -r --arg suffix "$1" '.files[] | select(.url | endswith($suffix)) | .sha512' <<<"$2" | head -n1)" +} + +appimage_hash=$(manifest_hash '.x86_64.AppImage' "$linux_manifest") +dmg_hash=$(manifest_hash '-latest.dmg' "$mac_manifest") +arm64_dmg_hash=$(manifest_hash '-arm64.dmg' "$mac_manifest") + +# The two platforms share one version but have distinct hashes. --system picks +# which source (and therefore which hash) update-source-version rewrites; passing +# the hash explicitly avoids a download. The version is written on the first call, +# so the darwin calls need --ignore-same-version to not early-exit as "unchanged". +update-source-version lens "$version" "$appimage_hash" --system=x86_64-linux +update-source-version lens "$version" "$arm64_dmg_hash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/le/lenspect/package.nix b/pkgs/by-name/le/lenspect/package.nix index 313eb0f0c234..6bb4e8a3c5a5 100644 --- a/pkgs/by-name/le/lenspect/package.nix +++ b/pkgs/by-name/le/lenspect/package.nix @@ -18,14 +18,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lenspect"; - version = "1.0.5"; + version = "1.0.6"; pyproject = false; src = fetchFromGitHub { owner = "vmkspv"; repo = "lenspect"; tag = "v${finalAttrs.version}"; - hash = "sha256-aGL6o9gv+z7Ey2XR8IZ/4gBXdDqGlaWaQXf0eVDEHlI="; + hash = "sha256-Crfkha2/aKXjhIP0DqDESbS2iM2QPWR6cDweYzRrUDE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/leo3-bin/package.nix b/pkgs/by-name/le/leo3-bin/package.nix index dfdd5f0eb22d..718e2c281425 100644 --- a/pkgs/by-name/le/leo3-bin/package.nix +++ b/pkgs/by-name/le/leo3-bin/package.nix @@ -7,11 +7,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "leo3"; - version = "1.2"; + version = "1.7.18"; src = fetchurl { - url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3.jar"; - sha256 = "1lgwxbr1rnk72rnvc8raq5i1q71ckhn998pwd9xk6zf27wlzijk7"; + url = "https://github.com/leoprover/Leo-III/releases/download/v${finalAttrs.version}/leo3-v${finalAttrs.version}.jar"; + sha256 = "sha256-HEUi8Krxv9u9Rq/2Gu0Tts86sseaAZq+pccJ4Q5MRr0="; }; dontUnpack = true; diff --git a/pkgs/by-name/le/lepton/package.nix b/pkgs/by-name/le/lepton/package.nix deleted file mode 100644 index 336afe9a1b16..000000000000 --- a/pkgs/by-name/le/lepton/package.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - cmake, - git, - glibc, -}: - -stdenv.mkDerivation { - version = "2019-08-20"; - pname = "lepton-unstable"; - - src = fetchFromGitHub { - repo = "lepton"; - owner = "dropbox"; - rev = "3d1bc19da9f13a6e817938afd0f61a81110be4da"; - sha256 = "0aqs6nvcbq8cbfv8699fa634bsz7csmk0169n069yvv17d1c07fd"; - }; - - nativeBuildInputs = [ - cmake - git - ]; - buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ glibc.static ]; - - meta = { - homepage = "https://github.com/dropbox/lepton"; - description = "Tool to losslessly compress JPEGs"; - license = lib.licenses.asl20; - platforms = [ - "x86_64-linux" - "x86_64-darwin" - ]; - maintainers = with lib.maintainers; [ artemist ]; - knownVulnerabilities = [ "CVE-2022-4104" ]; - }; -} diff --git a/pkgs/by-name/le/lerc/package.nix b/pkgs/by-name/le/lerc/package.nix index 9cf5725679dd..7765b5e8b9a6 100644 --- a/pkgs/by-name/le/lerc/package.nix +++ b/pkgs/by-name/le/lerc/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "lerc"; - version = "4.1.0"; + version = "4.1.1"; outputs = [ "out" @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "esri"; repo = "lerc"; tag = "v${finalAttrs.version}"; - hash = "sha256-+X30DQuq2oT/sTe8usUaNK1V+UTNvXJW7IAJVIr8m78="; + hash = "sha256-YTNIydQLCBzsuvPWA6qnOkOIPf9JlByJdNHkTevE7Z0="; }; # Required to get the freebsd-ports patch to apply. diff --git a/pkgs/by-name/le/less/package.nix b/pkgs/by-name/le/less/package.nix index fa2f854f4d80..00823f701cde 100644 --- a/pkgs/by-name/le/less/package.nix +++ b/pkgs/by-name/le/less/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "less"; - version = "692"; + version = "704"; # `less` is provided by the following sources: # - meta.homepage @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { # homepage, and only those not marked as beta. src = fetchurl { url = "https://www.greenwoodsoftware.com/less/less-${finalAttrs.version}.tar.gz"; - hash = "sha256-YTAPYDeY7PHXeGVweJ8P8/WhrPB1pvufdWg30WbjfRQ="; + hash = "sha256-IKCworslJfpTx+7pvrhUtMnPFy6rsgmvcCB0NUe/6fs="; }; buildInputs = [ diff --git a/pkgs/by-name/le/lessc/package.nix b/pkgs/by-name/le/lessc/package.nix index 494657523c3d..9fd16beb68a8 100644 --- a/pkgs/by-name/le/lessc/package.nix +++ b/pkgs/by-name/le/lessc/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm_9, + pnpm_11, pnpmConfigHook, callPackage, testers, @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lessc"; - version = "4.6.3"; + version = "4.7.0"; src = fetchFromGitHub { owner = "less"; repo = "less.js"; tag = "v${finalAttrs.version}"; - hash = "sha256-udfqfjdIhQ6UGAeXCT5FbI+iXNqfkbQMqZnnIDUrQaQ="; + hash = "sha256-j0RfzD7wfpscbHQJQyypvOF729D5a7uGoEFY7KToS14="; }; pnpmDeps = fetchPnpmDeps { @@ -32,16 +32,16 @@ stdenv.mkDerivation (finalAttrs: { src pnpmWorkspaces ; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-ZdADm6WKPP48DK+ezk/jdzXVEBX161SqgYgU5fsCW2k="; + pnpm = pnpm_11; + fetcherVersion = 4; + hash = "sha256-uV91YMyqWKXmGdx20Z0+rjJKF02vL7vdomY0IzAky9U="; }; strictDeps = true; nativeBuildInputs = [ pnpmConfigHook - pnpm_9 + pnpm_11 nodejs ]; diff --git a/pkgs/by-name/le/lesscpy/package.nix b/pkgs/by-name/le/lesscpy/package.nix index 2fbfd11e7664..dc7aea86f6f4 100644 --- a/pkgs/by-name/le/lesscpy/package.nix +++ b/pkgs/by-name/le/lesscpy/package.nix @@ -2,6 +2,7 @@ lib, python3Packages, fetchPypi, + fetchpatch, }: python3Packages.buildPythonPackage rec { @@ -14,6 +15,14 @@ python3Packages.buildPythonPackage rec { hash = "sha256-EEXRepj2iGRsp1jf8lTm6cA3RWSOBRoIGwOVw7d8gkw="; }; + patches = [ + # remove use of pkg_resources (drop on next release) + (fetchpatch { + url = "https://github.com/lesscpy/lesscpy/commit/bd8949579713c9d4ff9e15799a26fcecdf73530e.patch"; + hash = "sha256-U1VDqZqHYaUmND5qCkARyU/eDv2QRhGcCDzuN4+XTbo="; + }) + ]; + build-system = with python3Packages; [ setuptools ]; dependencies = with python3Packages; [ diff --git a/pkgs/by-name/le/level-zero/package.nix b/pkgs/by-name/le/level-zero/package.nix index 0d3fdf208a5a..6eca9754361b 100644 --- a/pkgs/by-name/le/level-zero/package.nix +++ b/pkgs/by-name/le/level-zero/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "level-zero"; - version = "1.29.0"; + version = "1.31.0"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "level-zero"; tag = "v${finalAttrs.version}"; - hash = "sha256-2OtJoVO8C9E1bf2uQv01O99wtuguINRSX4dCM6S93ns="; + hash = "sha256-/3HVvivHKSwvrrFEU7LHP2H/6bHDBDyI1SVr/3A6Ie0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/leviculum/package.nix b/pkgs/by-name/le/leviculum/package.nix new file mode 100644 index 000000000000..77b04ab2e892 --- /dev/null +++ b/pkgs/by-name/le/leviculum/package.nix @@ -0,0 +1,51 @@ +{ + lib, + rustPlatform, + fetchFromGitea, + pkg-config, + udev, + versionCheckHook, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "leviculum"; + version = "0.7.0"; + __structuredAttrs = true; + + src = fetchFromGitea { + domain = "codeberg.org"; + owner = "Lew_Palm"; + repo = "leviculum"; + tag = "v${finalAttrs.version}"; + fetchSubmodules = false; + hash = "sha256-/ylHrCLs9QSTiox3/JHJtZBYLlysLsezG8iz6C1DtCI="; + }; + + cargoHash = "sha256-DfwN4DTWcezcDRkl27cZXQdfXIhxlAj6+2nmYXhxius="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + udev + ]; + + # Most of the tests are failing, I couldn't figure out how to fix them, so I disable them for now. + doCheck = false; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgram = "${placeholder "out"}/bin/lnsd"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Full Rust implementation of the Reticulum network stack, for embedded, server, desktop and mobile"; + homepage = "https://codeberg.org/Lew_Palm/leviculum"; + changelog = "https://codeberg.org/Lew_Palm/leviculum/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ drupol ]; + }; +}) diff --git a/pkgs/by-name/le/lexbor/package.nix b/pkgs/by-name/le/lexbor/package.nix index 71df48fb8a5a..ca2e6fb9fdd1 100644 --- a/pkgs/by-name/le/lexbor/package.nix +++ b/pkgs/by-name/le/lexbor/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lexbor"; - version = "3.0.0"; + version = "3.0.0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "lexbor"; repo = "lexbor"; - tag = "v${finalAttrs.version}"; - hash = "sha256-P5ng/9lkjaWlZmyFzd3MpN39qBqhe8Rlkb/vv3cZ1MI="; + rev = "de1d07a7765aad37090cc36f7fac3bb59e21467d"; + hash = "sha256-e8NcTvLCbyCLeGdmmZBM4fmTirWYrQ/46nNqAjAnDzM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/le/lexy/package.nix b/pkgs/by-name/le/lexy/package.nix index 192651fb22f8..b3fb30eeafc9 100644 --- a/pkgs/by-name/le/lexy/package.nix +++ b/pkgs/by-name/le/lexy/package.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "lexy"; - version = "0.6.0"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "antoniorodr"; repo = "lexy"; tag = "v${finalAttrs.version}"; - hash = "sha256-1Q7ntShhzE9OUrifIV9GjCp6BvUv1OmtH7SRLGYUhYU="; + hash = "sha256-OT+RaoIC+CxHHFdi3Hp405B/tWCTsPPrK8aDowKOUFc="; }; build-system = [ diff --git a/pkgs/by-name/lf/lfk/package.nix b/pkgs/by-name/lf/lfk/package.nix index 044eccb276bd..f3de7966005c 100644 --- a/pkgs/by-name/lf/lfk/package.nix +++ b/pkgs/by-name/lf/lfk/package.nix @@ -6,17 +6,17 @@ buildGoModule (finalAttrs: { pname = "lfk"; - version = "0.10.2"; + version = "0.14.19"; __structuredAttrs = true; src = fetchFromGitHub { owner = "janosmiko"; repo = "lfk"; tag = "v${finalAttrs.version}"; - hash = "sha256-6H67d9zVdfsUhnsC4Hg6z3nm0w2//Q8oj1FZBR+a8SY="; + hash = "sha256-57bAYTU6/Fv7jbKK+RAbITECl4hYQzS2kkn7bytnW+Y="; }; - vendorHash = "sha256-GfJr3jtG+GhV7AHgM0EjPe+bFqdIRkHpjaylu753cGI="; + vendorHash = "sha256-WYx/eMArAsiyfEvrBZmTfK2ABxX2X1VQEtDCxC+UyP8="; ldflags = [ "-s" ]; diff --git a/pkgs/by-name/lh/lha/package.nix b/pkgs/by-name/lh/lha/package.nix index 072da499622d..5f97ee673d39 100644 --- a/pkgs/by-name/lh/lha/package.nix +++ b/pkgs/by-name/lh/lha/package.nix @@ -29,8 +29,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Archiver and compressor using the LZSS and Huffman encoding compression algorithms"; homepage = "https://github.com/jca02266/lha"; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - momeemt + maintainers = [ ]; # Some of the original LHa code has been rewritten and the current author # considers adopting a "true" free and open source license for it. diff --git a/pkgs/by-name/lh/lhasa/package.nix b/pkgs/by-name/lh/lhasa/package.nix index 652d97098f14..4184c917417f 100644 --- a/pkgs/by-name/lh/lhasa/package.nix +++ b/pkgs/by-name/lh/lhasa/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lhasa"; - version = "0.5.0"; + version = "0.6.0"; src = fetchurl { url = "https://soulsphere.org/projects/lhasa/lhasa-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-v4eFxwYJ0h62K32ueJTxOIiPiJ086Xho1QL24Tp5Kxw="; + sha256 = "sha256-mEAVQ2f3Pp2cMZb5RKEhq005jYTpIcj+j8qKkxJ0rtc="; }; meta = { diff --git a/pkgs/by-name/li/libacr38u/package.nix b/pkgs/by-name/li/libacr38u/package.nix index 899c8dcacde0..de8c18b1faaa 100644 --- a/pkgs/by-name/li/libacr38u/package.nix +++ b/pkgs/by-name/li/libacr38u/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; homepage = "https://www.acs.com.hk"; license = lib.licenses.lgpl2Plus; - maintainers = with lib.maintainers; [ berce ]; + maintainers = [ ]; platforms = with lib.platforms; unix; }; } diff --git a/pkgs/by-name/li/libadwaita/package.nix b/pkgs/by-name/li/libadwaita/package.nix index 0d1ed0da7e85..fdad6431655b 100644 --- a/pkgs/by-name/li/libadwaita/package.nix +++ b/pkgs/by-name/li/libadwaita/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libadwaita"; - version = "1.9.0"; + version = "1.9.2"; outputs = [ "out" @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "GNOME"; repo = "libadwaita"; tag = finalAttrs.version; - hash = "sha256-JAKP8CjLCKGZvHoB26ih/J3xAru4wiVf/ObG0L8r4pY="; + hash = "sha256-XKKjnZz4CII6w9fKFptPK3aTNa5eMfyE7rcerbgaDco="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libaec/package.nix b/pkgs/by-name/li/libaec/package.nix index c9824823b669..3b7b1768c93b 100644 --- a/pkgs/by-name/li/libaec/package.nix +++ b/pkgs/by-name/li/libaec/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libaec"; - version = "1.1.6"; + version = "1.1.7"; src = fetchFromGitHub { owner = "Deutsches-Klimarechenzentrum"; repo = "libaec"; tag = "v${finalAttrs.version}"; - hash = "sha256-cxDP+JNwokxgzH9hO2zw+rIcz8XG7E8ujbAbWpgUEW8="; + hash = "sha256-aBm+CXCq7sdJb6Qq9sNuTzNj0nRwTJI20HsqUg1Qi/8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libagar/package.nix b/pkgs/by-name/li/libagar/package.nix index 5994aa44a756..b8999c144cc8 100644 --- a/pkgs/by-name/li/libagar/package.nix +++ b/pkgs/by-name/li/libagar/package.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Cross-platform GUI toolkit"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/libagar_test/package.nix b/pkgs/by-name/li/libagar_test/package.nix index 2fd663cdb654..210aee5180ae 100644 --- a/pkgs/by-name/li/libagar_test/package.nix +++ b/pkgs/by-name/li/libagar_test/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { description = "Tests for libagar"; mainProgram = "agartest"; homepage = "http://libagar.org/index.html"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ ramkromberg ]; platforms = lib.platforms.linux; broken = (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64); diff --git a/pkgs/by-name/li/libaio/package.nix b/pkgs/by-name/li/libaio/package.nix index 35de54c0d9da..d803c65219e9 100644 --- a/pkgs/by-name/li/libaio/package.nix +++ b/pkgs/by-name/li/libaio/package.nix @@ -1,16 +1,18 @@ { lib, stdenv, - fetchurl, + fetchFromCodeberg, }: stdenv.mkDerivation (finalAttrs: { version = "0.3.113"; pname = "libaio"; - src = fetchurl { - url = "https://pagure.io/libaio/archive/libaio-${finalAttrs.version}/libaio-libaio-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-cWxwWXAyRzROsGa1TsvDyiE08BAzBxkubCt9q1+VKKs="; + src = fetchFromCodeberg { + owner = "jmoyer"; + repo = "libaio"; + tag = "libaio-${finalAttrs.version}"; + hash = "sha256-8TofYbwsnenv5GuC6FjkUt9rBTULEb5nhknuxr2ckQg="; }; postPatch = '' @@ -33,6 +35,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for asynchronous I/O in Linux"; homepage = "https://lse.sourceforge.net/io/aio.html"; + downloadPage = "https://codeberg.org/jmoyer/libaio"; platforms = lib.platforms.linux; license = lib.licenses.lgpl21; maintainers = [ ]; diff --git a/pkgs/by-name/li/libajantv2/package.nix b/pkgs/by-name/li/libajantv2/package.nix index aad9624acc98..dffc8bf3a642 100644 --- a/pkgs/by-name/li/libajantv2/package.nix +++ b/pkgs/by-name/li/libajantv2/package.nix @@ -47,11 +47,11 @@ stdenv.mkDerivation (finalAttrs: { ]; postInstall = '' - mkdir -p "$out/lib/pkgconfig" - cat >"$out/lib/pkgconfig/libajantv2.pc" <"$dev/lib/pkgconfig/libajantv2.pc" < libxml2 != null; stdenv.mkDerivation (finalAttrs: { pname = "libarchive"; - version = "3.8.7"; + version = "3.8.8"; src = fetchFromGitHub { owner = "libarchive"; repo = "libarchive"; rev = "v${finalAttrs.version}"; - hash = "sha256-LpD+lE+0PZi/3nYDVPXhBQL9A7mvqelOzRLskVtg9Y0="; + hash = "sha256-l8xh+z6lP7VnxMIf9tfoSByerjwN6Z4dE3JNA9zS3LM="; }; outputs = [ diff --git a/pkgs/by-name/li/libass/package.nix b/pkgs/by-name/li/libass/package.nix index 61b8611327f0..045b0d926bdb 100644 --- a/pkgs/by-name/li/libass/package.nix +++ b/pkgs/by-name/li/libass/package.nix @@ -44,9 +44,7 @@ stdenv.mkDerivation (finalAttrs: { fribidi harfbuzz ] - ++ lib.optional fontconfigSupport fontconfig - # TODO: remove dep after branchoff (in darwin stdenv) - ++ lib.optional stdenv.hostPlatform.isDarwin libiconv.out; + ++ lib.optional fontconfigSupport fontconfig; meta = { description = "Portable ASS/SSA subtitle renderer"; diff --git a/pkgs/by-name/li/libation/package.nix b/pkgs/by-name/li/libation/package.nix index 334b5c9ea34a..35ed8732b8a7 100644 --- a/pkgs/by-name/li/libation/package.nix +++ b/pkgs/by-name/li/libation/package.nix @@ -16,13 +16,13 @@ buildDotnetModule rec { pname = "libation"; - version = "13.4.5"; + version = "13.5.1"; src = fetchFromGitHub { owner = "rmcrackan"; repo = "Libation"; tag = "v${version}"; - hash = "sha256-t4Fz7aqQg1WPqSKvvVbSx45M6+UNGXacFHXGjzNW67A="; + hash = "sha256-DDLvblSJHKhOMGYwi89cy14sgm3TyM4f0B9SVs57HGg="; }; sourceRoot = "${src.name}/Source"; diff --git a/pkgs/by-name/li/libavif/package.nix b/pkgs/by-name/li/libavif/package.nix index c778d78d66a7..8ec16503feee 100644 --- a/pkgs/by-name/li/libavif/package.nix +++ b/pkgs/by-name/li/libavif/package.nix @@ -31,7 +31,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "libavif"; - version = "1.4.1"; + version = "1.4.2"; outputs = [ "out" @@ -42,7 +42,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "AOMediaCodec"; repo = "libavif"; rev = "v${finalAttrs.version}"; - hash = "sha256-035SoxHfN121mp3LGwGykReCi1WJbl2/nZH8c/VwABU="; + hash = "sha256-AMQ1TRPGpuBBW7tJ8xuLEVTAeOsLWTHuE0dFJjI7+W4="; }; postPatch = '' diff --git a/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch b/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch deleted file mode 100644 index 61fd56ee0880..000000000000 --- a/pkgs/by-name/li/libbacktrace/0001-libbacktrace-avoid-libtool-wrapping-tests.patch +++ /dev/null @@ -1,201 +0,0 @@ -From eadfee17e7d3a1c1bb2a0ff8585772b40331ebd7 Mon Sep 17 00:00:00 2001 -From: Jan Tojnar -Date: Sat, 24 Dec 2022 15:31:51 +0100 -Subject: [PATCH 1/4] libbacktrace: avoid libtool wrapping tests -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When `--enable-shared` is used, libtool will produce shell scripts -instead of programs, preventing separate debug info from being generated: - - objcopy --only-keep-debug btest btest_gnudebuglink.debug - objcopy: btest: file format not recognized - make[2]: *** [Makefile:2615: btest_gnudebuglink] Error 1 - -Let’s make it properly set rpath with `-no-install` flag, -so that wrappers are not needed, as mentioned on -https://autotools.info/libtool/wrappers.html ---- - Makefile.am | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 3d67909..06ccf3f 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -107,6 +107,8 @@ check_DATA = - # Flags to use when compiling test programs. - libbacktrace_TEST_CFLAGS = $(EXTRA_FLAGS) $(WARN_FLAGS) -g - -+libbacktrace_TEST_LDFLAGS = -no-install -+ - if USE_DSYMUTIL - - %.dSYM: % -@@ -171,48 +173,56 @@ xcoff_%.c: xcoff.c - - test_elf_32_SOURCES = test_format.c testlib.c - test_elf_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_elf_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_elf_32_LDADD = libbacktrace_noformat.la elf_32.lo - - BUILDTESTS += test_elf_32 - - test_elf_64_SOURCES = test_format.c testlib.c - test_elf_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_elf_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_elf_64_LDADD = libbacktrace_noformat.la elf_64.lo - - BUILDTESTS += test_elf_64 - - test_macho_SOURCES = test_format.c testlib.c - test_macho_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_macho_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_macho_LDADD = libbacktrace_noformat.la macho.lo - - BUILDTESTS += test_macho - - test_xcoff_32_SOURCES = test_format.c testlib.c - test_xcoff_32_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_xcoff_32_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_xcoff_32_LDADD = libbacktrace_noformat.la xcoff_32.lo - - BUILDTESTS += test_xcoff_32 - - test_xcoff_64_SOURCES = test_format.c testlib.c - test_xcoff_64_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_xcoff_64_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_xcoff_64_LDADD = libbacktrace_noformat.la xcoff_64.lo - - BUILDTESTS += test_xcoff_64 - - test_pecoff_SOURCES = test_format.c testlib.c - test_pecoff_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_pecoff_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_pecoff_LDADD = libbacktrace_noformat.la pecoff.lo - - BUILDTESTS += test_pecoff - - test_unknown_SOURCES = test_format.c testlib.c - test_unknown_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+test_unknown_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - test_unknown_LDADD = libbacktrace_noformat.la unknown.lo - - BUILDTESTS += test_unknown - - unittest_SOURCES = unittest.c testlib.c - unittest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+unittest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - unittest_LDADD = libbacktrace.la - - BUILDTESTS += unittest -@@ -254,7 +264,7 @@ if HAVE_OBJCOPY_DEBUGLINK - - b2test_SOURCES = $(btest_SOURCES) - b2test_CFLAGS = $(libbacktrace_TEST_CFLAGS) --b2test_LDFLAGS = -Wl,--build-id -+b2test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) - b2test_LDADD = libbacktrace_elf_for_test.la - - check_PROGRAMS += b2test -@@ -264,7 +274,7 @@ if HAVE_DWZ - - b3test_SOURCES = $(btest_SOURCES) - b3test_CFLAGS = $(libbacktrace_TEST_CFLAGS) --b3test_LDFLAGS = -Wl,--build-id -+b3test_LDFLAGS = -Wl,--build-id $(libbacktrace_TEST_LDFLAGS) - b3test_LDADD = libbacktrace_elf_for_test.la - - check_PROGRAMS += b3test -@@ -278,6 +288,7 @@ endif HAVE_ELF - - btest_SOURCES = btest.c testlib.c - btest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O -+btest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - btest_LDADD = libbacktrace.la - - BUILDTESTS += btest -@@ -332,6 +343,7 @@ endif HAVE_DWZ - - stest_SOURCES = stest.c - stest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+stest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - stest_LDADD = libbacktrace.la - - BUILDTESTS += stest -@@ -354,6 +366,7 @@ if HAVE_ELF - - ztest_SOURCES = ztest.c testlib.c - ztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+ztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - ztest_LDADD = libbacktrace.la - ztest_alloc_LDADD = libbacktrace_alloc.la - -@@ -373,6 +386,7 @@ BUILDTESTS += ztest_alloc - - zstdtest_SOURCES = zstdtest.c testlib.c - zstdtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+zstdtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - zstdtest_LDADD = libbacktrace.la - zstdtest_alloc_LDADD = libbacktrace_alloc.la - -@@ -394,6 +408,7 @@ endif HAVE_ELF - - edtest_SOURCES = edtest.c edtest2_build.c testlib.c - edtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -+edtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - edtest_LDADD = libbacktrace.la - - BUILDTESTS += edtest -@@ -424,6 +439,7 @@ BUILDTESTS += ttest - - ttest_SOURCES = ttest.c testlib.c - ttest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -pthread -+ttest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - ttest_LDADD = libbacktrace.la - - if USE_DSYMUTIL -@@ -472,12 +488,12 @@ if HAVE_COMPRESSED_DEBUG - - ctestg_SOURCES = btest.c testlib.c - ctestg_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu -+ctestg_LDFLAGS = -Wl,--compress-debug-sections=zlib-gnu $(libbacktrace_TEST_LDFLAGS) - ctestg_LDADD = libbacktrace.la - - ctesta_SOURCES = btest.c testlib.c - ctesta_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi -+ctesta_LDFLAGS = -Wl,--compress-debug-sections=zlib-gabi $(libbacktrace_TEST_LDFLAGS) - ctesta_LDADD = libbacktrace.la - - BUILDTESTS += ctestg ctesta -@@ -486,7 +502,7 @@ if HAVE_COMPRESSED_DEBUG_ZSTD - - ctestzstd_SOURCES = btest.c testlib.c - ctestzstd_CFLAGS = $(libbacktrace_TEST_CFLAGS) --ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd -+ctestzstd_LDFLAGS = -Wl,--compress-debug-sections=zstd $(libbacktrace_TEST_LDFLAGS) - ctestzstd_LDADD = libbacktrace.la - - BUILDTESTS += ctestzstd -@@ -533,6 +549,7 @@ endif - - mtest_SOURCES = mtest.c testlib.c - mtest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -O -+mtest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - mtest_LDADD = libbacktrace.la - - BUILDTESTS += mtest -@@ -565,6 +582,7 @@ if HAVE_ELF - - xztest_SOURCES = xztest.c testlib.c - xztest_CFLAGS = $(libbacktrace_TEST_CFLAGS) -DSRCDIR=\"$(srcdir)\" -+xztest_LDFLAGS = $(libbacktrace_TEST_LDFLAGS) - xztest_LDADD = libbacktrace.la - - xztest_alloc_SOURCES = $(xztest_SOURCES) --- -2.43.1 - diff --git a/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch b/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch index ee6063875091..da1efae66365 100644 --- a/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch +++ b/pkgs/by-name/li/libbacktrace/0002-libbacktrace-Allow-configuring-debug-dir.patch @@ -1,7 +1,7 @@ -From 2ceaa9bc8a9a0c8a02806a92e19bd21b3fccf3a0 Mon Sep 17 00:00:00 2001 +From f69f2a995d0c5c6bc44fd485a7f5d3b390f26fc4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar -Date: Sat, 24 Dec 2022 16:46:18 +0100 -Subject: [PATCH 2/4] libbacktrace: Allow configuring debug dir +Date: Sat, 25 Apr 2026 23:01:23 +0200 +Subject: [PATCH] libbacktrace: Allow configuring debug dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -14,13 +14,13 @@ the path can be changed. The same flag is supported by gdb: https://github.com/bminor/binutils-gdb/blob/095f84c7e3cf85cd68c657c46b80be078f336bc9/gdb/configure.ac#L113-L115 --- - Makefile.am | 13 +++++++------ + Makefile.am | 15 ++++++++------- configure.ac | 8 ++++++++ elf.c | 4 ++-- - 3 files changed, 17 insertions(+), 8 deletions(-) + 3 files changed, 18 insertions(+), 9 deletions(-) diff --git a/Makefile.am b/Makefile.am -index 06ccf3f..6304faa 100644 +index 7b32e23..51431b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -33,7 +33,8 @@ ACLOCAL_AMFLAGS = -I config @@ -33,7 +33,7 @@ index 06ccf3f..6304faa 100644 include_HEADERS = backtrace.h backtrace-supported.h -@@ -134,7 +135,7 @@ libbacktrace_noformat_la_DEPENDENCIES = $(libbacktrace_noformat_la_LIBADD) +@@ -136,7 +137,7 @@ libbacktrace_noformat_la_DEPENDENCIES = $(libbacktrace_noformat_la_LIBADD) if HAVE_ELF if HAVE_OBJCOPY_DEBUGLINK @@ -42,7 +42,7 @@ index 06ccf3f..6304faa 100644 check_LTLIBRARIES += libbacktrace_elf_for_test.la -@@ -143,8 +144,8 @@ libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \ +@@ -145,8 +146,8 @@ libbacktrace_elf_for_test_la_LIBADD = $(BACKTRACE_FILE) elf_for_test.lo \ $(VIEW_FILE) $(ALLOC_FILE) elf_for_test.c: elf.c @@ -53,7 +53,7 @@ index 06ccf3f..6304faa 100644 $(SED) "s%$$SEARCH%$$REPLACE%" \ $< \ > $@.tmp -@@ -474,13 +475,13 @@ endif HAVE_OBJCOPY_DEBUGLINK +@@ -484,13 +485,13 @@ endif HAVE_OBJCOPY_DEBUGLINK %_buildid: % ./install-debuginfo-for-buildid.sh \ @@ -69,8 +69,17 @@ index 06ccf3f..6304faa 100644 $< $(OBJCOPY) --strip-all $< $@ +@@ -621,7 +622,7 @@ MAKETESTS += m2test_minidebug2 + $(XZ) $<.mdbg2 + $(OBJCOPY) --add-section .gnu_debugdata=$<.mdbg2.xz $<.dbg2 + $(OBJCOPY) --add-section .gnu_debugdata=$<.mdbg2.xz $<.strip2 +- $(SHELL) ./install-debuginfo-for-buildid.sh $(TEST_BUILD_ID_DIR) $<.dbg2 ++ $(SHELL) ./install-debuginfo-for-buildid.sh "$(TEST_DEBUG_DIR)/.build-id" $<.dbg2 + mv $<.strip2 $@ + + endif HAVE_OBJCOPY_DEBUGLINK diff --git a/configure.ac b/configure.ac -index 69304ea..aeb2ee9 100644 +index 2267cc5..15cdc6e 100644 --- a/configure.ac +++ b/configure.ac @@ -67,6 +67,14 @@ AM_MAINTAINER_MODE @@ -89,10 +98,10 @@ index 69304ea..aeb2ee9 100644 # the wrong, non-multilib-adjusted value will be used in multilibs. # As a side effect, we have to subst CFLAGS ourselves. diff --git a/elf.c b/elf.c -index 3ef07bb..21fbe4f 100644 +index e93729d..4765fae 100644 --- a/elf.c +++ b/elf.c -@@ -856,7 +856,7 @@ elf_readlink (struct backtrace_state *state, const char *filename, +@@ -857,7 +857,7 @@ elf_readlink (struct backtrace_state *state, const char *filename, } } @@ -101,7 +110,7 @@ index 3ef07bb..21fbe4f 100644 /* Open a separate debug info file, using the build ID to find it. Returns an open file descriptor, or -1. -@@ -870,7 +870,7 @@ elf_open_debugfile_by_buildid (struct backtrace_state *state, +@@ -871,7 +871,7 @@ elf_open_debugfile_by_buildid (struct backtrace_state *state, backtrace_error_callback error_callback, void *data) { @@ -111,5 +120,5 @@ index 3ef07bb..21fbe4f 100644 const char * const suffix = ".debug"; const size_t suffix_len = strlen (suffix); -- -2.43.1 +2.51.2 diff --git a/pkgs/by-name/li/libbacktrace/package.nix b/pkgs/by-name/li/libbacktrace/package.nix index 0f3abdba1ab9..0e4f30d052ba 100644 --- a/pkgs/by-name/li/libbacktrace/package.nix +++ b/pkgs/by-name/li/libbacktrace/package.nix @@ -10,20 +10,16 @@ stdenv.mkDerivation { pname = "libbacktrace"; - version = "0-unstable-2024-03-02"; + version = "0-unstable-2026-05-03"; src = fetchFromGitHub { owner = "ianlancetaylor"; repo = "libbacktrace"; - rev = "28824f2cc9069e3fdc39d3702acdf753e35c41b4"; - sha256 = "1k1O1GT22hZAWPF8NYP0y4qe+e3pGfzT9Mz2TH+H/v4="; + rev = "96664e69b1ecdb76e824be1d9e8f475b76dd08cf"; + hash = "sha256-+tV6W8SnFWKweAASvFfb+i6bz73ssVGikNhVpq3YbT4="; }; patches = [ - # Fix tests with shared library. - # https://github.com/ianlancetaylor/libbacktrace/pull/99 - ./0001-libbacktrace-avoid-libtool-wrapping-tests.patch - # Support multiple debug dirs. # https://github.com/ianlancetaylor/libbacktrace/pull/100 ./0002-libbacktrace-Allow-configuring-debug-dir.patch @@ -33,6 +29,15 @@ stdenv.mkDerivation { ./0004-libbacktrace-Support-NIX_DEBUG_INFO_DIRS-environment.patch ]; + # https://github.com/ianlancetaylor/libbacktrace/issues/163 + postPatch = + lib.optionalString + (stdenv.hostPlatform.isPower64 && stdenv.hostPlatform.isBigEndian && stdenv.hostPlatform.isAbiElfv1) + '' + substituteInPlace Makefile.am \ + --replace-fail 'MAKETESTS += mtest_minidebug' '# MAKETESTS += mtest_minidebug' + ''; + nativeBuildInputs = [ autoreconfHook ]; @@ -52,6 +57,6 @@ stdenv.mkDerivation { description = "C library that may be linked into a C/C++ program to produce symbolic backtraces"; homepage = "https://github.com/ianlancetaylor/libbacktrace"; maintainers = with lib.maintainers; [ twey ]; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; }; } diff --git a/pkgs/by-name/li/libbde/package.nix b/pkgs/by-name/li/libbde/package.nix index acbdb3e1aa30..337e276d271c 100644 --- a/pkgs/by-name/li/libbde/package.nix +++ b/pkgs/by-name/li/libbde/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchurl, - fuse, + fuse3, + macfuse-stubs, + pkg-config, ncurses, python3, nix-update-script, @@ -17,10 +19,12 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-La6rzBOfyBIXDn78vXb8GUt8jgQkzsqM38kRZ7t3Fp0="; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ - fuse ncurses python3 + (if stdenv.hostPlatform.isDarwin then macfuse-stubs else fuse3) ]; preInstall = '' diff --git a/pkgs/by-name/li/libbpkg/package.nix b/pkgs/by-name/li/libbpkg/package.nix index 483ce5791778..3b6a8d2651a0 100644 --- a/pkgs/by-name/li/libbpkg/package.nix +++ b/pkgs/by-name/li/libbpkg/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbpkg"; - version = "0.17.0"; + version = "0.18.0"; outputs = [ "out" "dev" @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbpkg-${finalAttrs.version}.tar.gz"; - hash = "sha256-4P4+uJGWB3iblYPuErJNr8c7/pS2UhN6LXr7MY2rWDY="; + hash = "sha256-ROaIgIql1oXOqiwz8giTcz0landh6rITyzX3WxR16L4="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libbutl/package.nix b/pkgs/by-name/li/libbutl/package.nix index dc136a91796f..a4f2491e5d10 100644 --- a/pkgs/by-name/li/libbutl/package.nix +++ b/pkgs/by-name/li/libbutl/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libbutl"; - version = "0.17.0"; + version = "0.18.1"; outputs = [ "out" @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://pkg.cppget.org/1/alpha/build2/libbutl-${finalAttrs.version}.tar.gz"; - hash = "sha256-sFqaEf6s2rF1YcZjw5J6oY5ol5PbO9vy6NseKjrvTvs="; + hash = "sha256-tQl7FRJh/CJ7A5MIlxlVv5aduPy/C0shcn9l+IB1oZU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libcaca/package.nix b/pkgs/by-name/li/libcaca/package.nix index 689257d7ff8e..d233cdabfe87 100644 --- a/pkgs/by-name/li/libcaca/package.nix +++ b/pkgs/by-name/li/libcaca/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch, autoreconfHook, imlib2, libxext, @@ -23,6 +24,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-N0Lfi0d4kjxirEbIjdeearYWvStkKMyV6lgeyNKXcVw="; }; + patches = [ + (fetchpatch { + name = "CVE-2026-42046.patch"; + url = "https://github.com/cacalabs/libcaca/commit/fb77acff9ba6bb01d53940da34fb10f20b156a23.patch"; + hash = "sha256-AdpiE5Gw/CVET//7TTYZCb0glW5HY+T8xZkYs1XCBvY="; + }) + ]; + nativeBuildInputs = [ autoreconfHook pkg-config diff --git a/pkgs/by-name/li/libcap/package.nix b/pkgs/by-name/li/libcap/package.nix index c9c5813a16c1..19dc58048530 100644 --- a/pkgs/by-name/li/libcap/package.nix +++ b/pkgs/by-name/li/libcap/package.nix @@ -3,7 +3,6 @@ lib, buildPackages, fetchurl, - fetchpatch, runtimeShell, pkgsBuildHost, usePam ? !isStatic, @@ -31,11 +30,11 @@ assert usePam -> pam != null; stdenv.mkDerivation rec { pname = "libcap"; - version = "2.77"; + version = "2.78"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - hash = "sha256-iXvBi0Svwmxw54zq09uzHhVKzCS+4IWloJB5qI2/b1I="; + hash = "sha256-DWIeVi/ZMsz2e5Zg+wGORopoPXuCdUHfJ4EyKMmWuxE="; }; outputs = [ @@ -76,13 +75,6 @@ stdenv.mkDerivation rec { "LIBCSTATIC=yes" ]; - patches = [ - (fetchpatch { - url = "https://git.kernel.org/pub/scm/libs/libcap/libcap.git/patch/?id=d628b3bfe40338d4efff6b0ae50f250a0eb884c7"; - hash = "sha256-Eiv/BOJZkduL+hOEJd8K1LQd9wvOeCKchE2GaLcerVc="; - }) - ]; - postPatch = '' patchShebangs ./progs/mkcapshdoc.sh diff --git a/pkgs/by-name/li/libcava/package.nix b/pkgs/by-name/li/libcava/package.nix index 0067bd5e99df..985c4283fee2 100644 --- a/pkgs/by-name/li/libcava/package.nix +++ b/pkgs/by-name/li/libcava/package.nix @@ -8,13 +8,13 @@ cava.overrideAttrs (old: rec { pname = "libcava"; # fork may not be updated when we update upstream - version = "0.10.6"; + version = "0.10.7"; src = fetchFromGitHub { owner = "LukashonakV"; repo = "cava"; tag = version; - hash = "sha256-63be1wypMiqhPA6sjMebmFE6yKpTj/bUE53sMWun554="; + hash = "sha256-zkyj1vBzHtoypX4Bxdh1Vmwh967DKKxN751v79hzmgQ="; }; nativeBuildInputs = old.nativeBuildInputs ++ [ diff --git a/pkgs/by-name/li/libcbor/package.nix b/pkgs/by-name/li/libcbor/package.nix index 31ad8ed2fbd1..d195af9386e9 100644 --- a/pkgs/by-name/li/libcbor/package.nix +++ b/pkgs/by-name/li/libcbor/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libcbor"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "PJK"; repo = "libcbor"; - rev = "v${finalAttrs.version}"; - hash = "sha256-ePgVR7VHXWKqOShuAEQG3BJ08W2aZS/vfcPUCqTw7X4="; + tag = "v${finalAttrs.version}"; + hash = "sha256-zjajNtj4jKbt3pLjfLrgtYljyMDYJtnzAC5JPdt+Wys="; }; outputs = [ @@ -61,6 +61,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://github.com/PJK/libcbor/blob/${finalAttrs.src.tag}/CHANGELOG.md"; description = "CBOR protocol implementation for C and others"; homepage = "https://github.com/PJK/libcbor"; license = lib.licenses.mit; diff --git a/pkgs/by-name/li/libcdio-paranoia/package.nix b/pkgs/by-name/li/libcdio-paranoia/package.nix index b836352918c8..a656a7e1d321 100644 --- a/pkgs/by-name/li/libcdio-paranoia/package.nix +++ b/pkgs/by-name/li/libcdio-paranoia/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.0.2"; src = fetchFromGitHub { - owner = "rocky"; + owner = "libcdio"; repo = "libcdio-paranoia"; rev = "release-10.2+${finalAttrs.version}"; hash = "sha256-n05PSVgh6z7BFPq4CjJa5DqCO7Huj8Bsg0x3HQPsbeI="; @@ -40,7 +40,7 @@ stdenv.mkDerivation (finalAttrs: { This is a port of xiph.org's cdda paranoia to use libcdio for CDROM access. By doing this, cdparanoia runs on platforms other than GNU/Linux. ''; - homepage = "https://github.com/rocky/libcdio-paranoia"; + homepage = "https://github.com/libcdio/libcdio-paranoia"; license = lib.licenses.gpl3; maintainers = [ ]; mainProgram = "cd-paranoia"; diff --git a/pkgs/by-name/li/libchewing/package.nix b/pkgs/by-name/li/libchewing/package.nix index d0d8b8570a14..7258de3b987a 100644 --- a/pkgs/by-name/li/libchewing/package.nix +++ b/pkgs/by-name/li/libchewing/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "libchewing"; - version = "0.12.0"; + version = "0.13.1"; src = fetchFromCodeberg { owner = "chewing"; repo = "libchewing"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-+oSO1HgLMF5+UcY+2NwQjPmspGqaPYuI7mdvSLrhkNg="; + hash = "sha256-BiAQSaSOjzeRt+vw+b7JoTR1+mF+UYMIyx+5nuqk9Ko="; }; # ld: unknown option: -version-script @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-TcNhoGCN+S/Tt3IdysVnGmXNl+hXQoWMppp8yN9N0NY="; + hash = "sha256-WPB1IIwKTF9lnkdcgNXcOP6kWIwQcUguUf8Nh5vDA5E="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libconfig/package.nix b/pkgs/by-name/li/libconfig/package.nix index 0da2905d7725..d0c737104160 100644 --- a/pkgs/by-name/li/libconfig/package.nix +++ b/pkgs/by-name/li/libconfig/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, # This also disables building tests. # on static windows cross-compile they fail to build doCheck ? with stdenv.hostPlatform; !(isWindows && isStatic), @@ -10,24 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libconfig"; - version = "1.8"; + version = "1.8.2"; src = fetchurl { url = "https://hyperrealm.github.io/libconfig/dist/libconfig-${finalAttrs.version}.tar.gz"; - hash = "sha256-BR4V3Q6QfESQXzF5M/VIcxTypW6MZybIMEzpkIhIUKo="; + hash = "sha256-5Z/7kC3Vcx1dTk+4HTuYlpdhX+q3Lf18MGGBZ7kaQu4="; }; - patches = [ - # Fix tests on i686-linux: - # https://github.com/hyperrealm/libconfig/pull/260 - # TODO: remove with a next release - (fetchpatch { - name = "32-bit-tests.patch"; - url = "https://github.com/hyperrealm/libconfig/commit/b90c45a18110fcca415d00a98ff79c908c42544b.patch"; - hash = "sha256-8CihXbpKx0Rn0CFxyP6+f6m8vUYehCl/1EtTo98VpfM="; - }) - ]; - inherit doCheck; configureFlags = @@ -38,6 +26,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://hyperrealm.github.io/libconfig/"; + changelog = "https://github.com/hyperrealm/libconfig/blob/v${finalAttrs.version}/ChangeLog"; description = "C/C++ library for processing configuration files"; license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ stv0g ]; diff --git a/pkgs/by-name/li/libconfuse/package.nix b/pkgs/by-name/li/libconfuse/package.nix index 3ec6b978a2f5..d9fce644cda0 100644 --- a/pkgs/by-name/li/libconfuse/package.nix +++ b/pkgs/by-name/li/libconfuse/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "1npfk5jv59kk4n8pkyx89fn9s6p8x3gbffs42jaw24frgxfgp8ca"; rev = "v${finalAttrs.version}"; repo = "libconfuse"; - owner = "martinh"; + owner = "libconfuse"; }; patches = [ diff --git a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh index e6a523191956..2263dd3db2ca 100644 --- a/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh +++ b/pkgs/by-name/li/libcosmicAppHook/libcosmic-app-hook.sh @@ -5,24 +5,25 @@ # shellcheck shell=bash libcosmicAppWrapperArgs=() +libcosmicAppWrapHookRanFor=() libcosmicAppVergenHook() { - if [ -z "${VERGEN_GIT_COMMIT_DATE-}" ]; then - # shellcheck disable=SC2155 - export VERGEN_GIT_COMMIT_DATE="$(date --utc --date=@"$SOURCE_DATE_EPOCH" '+%Y-%m-%d')" - fi + if [ -z "${VERGEN_GIT_COMMIT_DATE-}" ]; then + # shellcheck disable=SC2155 + export VERGEN_GIT_COMMIT_DATE="$(date --utc --date=@"$SOURCE_DATE_EPOCH" '+%Y-%m-%d')" + fi } libcosmicAppLinkerArgsHook() { - # Force linking to certain libraries like libEGL, which are always dlopen()ed - local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" + # Force linking to certain libraries like libEGL, which are always dlopen()ed + local flags="CARGO_TARGET_@cargoLinkerVar@_RUSTFLAGS" - export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed" - # shellcheck disable=SC2043 - for lib in @cargoLinkLibs@; do - export "$flags"="${!flags} -C link-arg=-l${lib}" - done - export "$flags"="${!flags} -C link-arg=-Wl,--pop-state" + export "$flags"="${!flags-} -C link-arg=-Wl,--push-state,--no-as-needed" + # shellcheck disable=SC2043 + for lib in @cargoLinkLibs@; do + export "$flags"="${!flags} -C link-arg=-l${lib}" + done + export "$flags"="${!flags} -C link-arg=-Wl,--pop-state" } preConfigurePhases+=" libcosmicAppVergenHook libcosmicAppLinkerArgsHook" @@ -51,9 +52,18 @@ wrapLibcosmicApp() { # Note: $libcosmicAppWrapperArgs still gets defined even if ${dontWrapLibcosmicApp-} is set libcosmicAppWrapHook() { - # guard against running multiple times (e.g. due to propagation) - [ -z "$libcosmicAppWrapHookHasRun" ] || return 0 - libcosmicAppWrapHookHasRun=1 + # guard against running multiple times for the same prefix (e.g. due to propagation) + for _ranFor in "${libcosmicAppWrapHookRanFor[@]}"; do + if [[ "$_ranFor" == "$prefix" ]]; then + echo "[libcosmicAppWrapHook] already ran for prefix='${prefix}', returning early" + return 0 + fi + done + libcosmicAppWrapHookRanFor+=("$prefix") + + echo "[libcosmicAppWrapHook] prefix='${prefix}'" + echo "[libcosmicAppWrapHook] dontWrapLibcosmicApp='${dontWrapLibcosmicApp:-}'" + echo "[libcosmicAppWrapHook] libcosmicAppWrapperArgs=(${libcosmicAppWrapperArgs[*]})" if [[ -z "${dontWrapLibcosmicApp:-}" ]]; then targetDirsThatExist=() @@ -61,35 +71,47 @@ libcosmicAppWrapHook() { # wrap binaries targetDirs=("${prefix}/bin" "${prefix}/libexec") + echo "[libcosmicAppWrapHook] checking targetDirs: ${targetDirs[*]}" for targetDir in "${targetDirs[@]}"; do + echo "[libcosmicAppWrapHook] checking targetDir='${targetDir}' exists=$([ -d "${targetDir}" ] && echo yes || echo no)" if [[ -d "${targetDir}" ]]; then targetDirsThatExist+=("${targetDir}") targetDirsRealPath+=("$(realpath "${targetDir}")/") + echo "[libcosmicAppWrapHook] finding executables in '${targetDir}'" find "${targetDir}" -type f -executable -print0 | while IFS= read -r -d '' file; do - echo "Wrapping program '${file}'" + echo "[libcosmicAppWrapHook] wrapping program '${file}'" wrapLibcosmicApp "${file}" done fi done + echo "[libcosmicAppWrapHook] targetDirsThatExist=(${targetDirsThatExist[*]})" + echo "[libcosmicAppWrapHook] targetDirsRealPath=(${targetDirsRealPath[*]})" + # wrap links to binaries that point outside targetDirs # Note: links to binaries within targetDirs do not need # to be wrapped as the binaries have already been wrapped if [[ ${#targetDirsThatExist[@]} -ne 0 ]]; then + echo "[libcosmicAppWrapHook] finding symlinks in targetDirs" find "${targetDirsThatExist[@]}" -type l -xtype f -executable -print0 | while IFS= read -r -d '' linkPath; do linkPathReal=$(realpath "${linkPath}") + echo "[libcosmicAppWrapHook] checking link '${linkPath}' -> '${linkPathReal}'" for targetPath in "${targetDirsRealPath[@]}"; do if [[ "$linkPathReal" == "$targetPath"* ]]; then - echo "Not wrapping link: '$linkPath' (already wrapped)" + echo "[libcosmicAppWrapHook] not wrapping link: '$linkPath' (already wrapped)" continue 2 fi done - echo "Wrapping link: '$linkPath'" + echo "[libcosmicAppWrapHook] wrapping link: '$linkPath'" wrapLibcosmicApp "${linkPath}" done + else + echo "[libcosmicAppWrapHook] no targetDirs exist, skipping symlink wrapping" fi + else + echo "[libcosmicAppWrapHook] dontWrapLibcosmicApp is set, skipping all wrapping" fi } diff --git a/pkgs/by-name/li/libcotp/package.nix b/pkgs/by-name/li/libcotp/package.nix index 3fe41d69cd33..e8c51602e239 100644 --- a/pkgs/by-name/li/libcotp/package.nix +++ b/pkgs/by-name/li/libcotp/package.nix @@ -6,24 +6,21 @@ pkg-config, libgcrypt, }: - stdenv.mkDerivation (finalAttrs: { pname = "libcotp"; - version = "3.1.1"; + version = "4.1.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "paolostivanin"; repo = "libcotp"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-5Jjk8uby1QjvU7TraTTTp+29Yh5lzbCvlorfPbGvciM="; + tag = "v${finalAttrs.version}"; + hash = "sha256-iNmCQHAl2LIkdJiVByc9CWiJSTo1HIz5Ma5Xjo2n9mA="; }; - postPatch = lib.optionalString stdenv.cc.isClang '' - substituteInPlace CMakeLists.txt \ - --replace "add_link_options(-Wl," "# add_link_options(-Wl," - ''; - buildInputs = [ libgcrypt ]; + nativeBuildInputs = [ cmake pkg-config @@ -32,6 +29,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C library that generates TOTP and HOTP"; homepage = "https://github.com/paolostivanin/libcotp"; + changelog = "https://github.com/paolostivanin/libcotp/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ alexbakker ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libcpr/package.nix b/pkgs/by-name/li/libcpr/package.nix index e55950be8b7b..82a38e7be001 100644 --- a/pkgs/by-name/li/libcpr/package.nix +++ b/pkgs/by-name/li/libcpr/package.nix @@ -9,7 +9,7 @@ }: let - version = "1.14.1"; + version = "1.14.2"; in stdenv.mkDerivation { pname = "libcpr"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "libcpr"; repo = "cpr"; rev = version; - hash = "sha256-kwbkdAeTpkEJbzvqpUQx007ZIBtwqOPG8n41TvFxeiM="; + hash = "sha256-fglJNQzf+5c5nJysxqTxE4EWSQO0GVauLV8yLypQMPs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libcupsfilters/package.nix b/pkgs/by-name/li/libcupsfilters/package.nix index 9a89e9b29886..a7024801ff9f 100644 --- a/pkgs/by-name/li/libcupsfilters/package.nix +++ b/pkgs/by-name/li/libcupsfilters/package.nix @@ -5,6 +5,7 @@ dejavu_fonts, fetchFromGitHub, fetchpatch, + fetchurl, fontconfig, ghostscript, lcms2, @@ -21,6 +22,12 @@ stdenv, }: +let + testpage = fetchurl { + url = "https://codeberg.org/raboof/cups-testpage/releases/download/v0.1/default-testpage.pdf"; + hash = "sha256-gtR/r/tORsXLw4PlFhxm29+//YNAKTT0c4z3GsgtzNw="; + }; +in stdenv.mkDerivation { pname = "libcupsfilters"; version = "2.1.1"; @@ -100,6 +107,10 @@ stdenv.mkDerivation { "CUPS_SERVERROOT=$(out)/etc/cups" ]; + preBuild = '' + cp ${testpage} data/default-testpage.pdf + ''; + meta = { homepage = "https://github.com/OpenPrinting/libcupsfilters"; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; diff --git a/pkgs/by-name/li/libdatachannel/package.nix b/pkgs/by-name/li/libdatachannel/package.nix index f0f60aac75b3..b356fa9334c8 100644 --- a/pkgs/by-name/li/libdatachannel/package.nix +++ b/pkgs/by-name/li/libdatachannel/package.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C/C++ WebRTC network library featuring Data Channels, Media Transport, and WebSockets"; homepage = "https://libdatachannel.org/"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ erdnaxe ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; diff --git a/pkgs/by-name/li/libde265/package.nix b/pkgs/by-name/li/libde265/package.nix index 51e24c6ed5ac..771b9e336634 100644 --- a/pkgs/by-name/li/libde265/package.nix +++ b/pkgs/by-name/li/libde265/package.nix @@ -15,14 +15,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.0.18"; + version = "1.1.1"; pname = "libde265"; src = fetchFromGitHub { owner = "strukturag"; repo = "libde265"; tag = "v${finalAttrs.version}"; - hash = "sha256-N6K82ElrzrMSNKfPTDsc5onrxucIJ8niwFgbaEPPd2I="; + hash = "sha256-ZHfPC86oylqt2bwWMJRWVjdMEEmX6UOKR7XkR0HPyok="; }; nativeBuildInputs = [ @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/strukturag/libde265"; + changelog = "https://github.com/strukturag/libde265/releases/tag/${finalAttrs.src.tag}"; description = "Open h.265 video codec implementation"; mainProgram = "dec265"; license = lib.licenses.lgpl3; diff --git a/pkgs/by-name/li/libdeltachat/package.nix b/pkgs/by-name/li/libdeltachat/package.nix index 5357638c0418..6f36fad0241c 100644 --- a/pkgs/by-name/li/libdeltachat/package.nix +++ b/pkgs/by-name/li/libdeltachat/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdeltachat"; - version = "2.52.0"; + version = "2.56.0"; src = fetchFromGitHub { owner = "chatmail"; repo = "core"; tag = "v${finalAttrs.version}"; - hash = "sha256-AQo27qnHPCK6q/3+Umk6ueqkOIVBA8n4q9S5iEZ7TkM="; + hash = "sha256-qdkCv3MooW2tieg6ivJHjh7uTVzWcwDM3aV5u2rIqOw="; }; patches = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { pname = "chatmail-core"; inherit (finalAttrs) version src; - hash = "sha256-ni8iaVPHXWhxfiBvtVzGRyPcxkbV0HiqcQCHGmAqk7s="; + hash = "sha256-tETJAlwRmKgC1BRFtqQe2PNqpsGKaYeAfKA4kFog5+8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdict/package.nix b/pkgs/by-name/li/libdict/package.nix index b5013a3df553..7558978c2f4b 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.5"; + version = "1.0.6"; src = fetchFromGitHub { owner = "rtbrick"; repo = "libdict"; rev = finalAttrs.version; - hash = "sha256-604escyV5MVuYggs1awIrorCrdXSUj3IhjwXV2QdDMU="; + hash = "sha256-JO8gIZwSZ1vOigiM2IoGRYW2m2zoAa1af/eMBP3ZRjY="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libdrm/package.nix b/pkgs/by-name/li/libdrm/package.nix index caa0e573221a..7e0b8d177df9 100644 --- a/pkgs/by-name/li/libdrm/package.nix +++ b/pkgs/by-name/li/libdrm/package.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdrm"; - version = "2.4.133"; + version = "2.4.134"; src = fetchurl { url = "https://dri.freedesktop.org/libdrm/libdrm-${finalAttrs.version}.tar.xz"; - hash = "sha256-/Gj50LoupjyUMqKZ4U/qCfrXqKZugDn814AspZ93tPU="; + hash = "sha256-rF500VeDDri+5Exqa/OtSXdO8N0qcr2tdKjyAwi1KpU="; }; outputs = [ diff --git a/pkgs/by-name/li/libdvdcss/package.nix b/pkgs/by-name/li/libdvdcss/package.nix index 2f57d64b6145..dac50c6c439d 100644 --- a/pkgs/by-name/li/libdvdcss/package.nix +++ b/pkgs/by-name/li/libdvdcss/package.nix @@ -1,20 +1,31 @@ { lib, stdenv, - fetchurl, + fetchFromGitLab, + meson, + ninja, }: stdenv.mkDerivation (finalAttrs: { pname = "libdvdcss"; - version = "1.4.3"; + version = "1.5.0"; - src = fetchurl { - url = "https://get.videolan.org/libdvdcss/${finalAttrs.version}/libdvdcss-${finalAttrs.version}.tar.bz2"; - sha256 = "sha256-IzzJL13AHF06lvWzWCvn1c7lo1pS06CBWHRdPYYHAHk="; + src = fetchFromGitLab { + domain = "code.videolan.org"; + owner = "videolan"; + repo = "libdvdcss"; + tag = finalAttrs.version; + hash = "sha256-xQWfAfxqsaLZN0HMozsqY5mSIO9KvZ5RAb4bj/f6WWo="; }; + nativeBuildInputs = [ + meson + ninja + ]; + meta = { homepage = "http://www.videolan.org/developers/libdvdcss.html"; + changelog = "https://code.videolan.org/videolan/libdvdcss/blob/${finalAttrs.src.tag}/NEWS"; description = "Library for decrypting DVDs"; license = lib.licenses.gpl2; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libdwarf/package.nix b/pkgs/by-name/li/libdwarf/package.nix index c94bc7d2ee8a..99f998365cca 100644 --- a/pkgs/by-name/li/libdwarf/package.nix +++ b/pkgs/by-name/li/libdwarf/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libdwarf"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "davea42"; repo = "libdwarf-code"; tag = "v${finalAttrs.version}"; - hash = "sha256-azVCzQt9oA40YACa9PkdNt0D8vWRNHXXGoSFOYNJxgA="; + hash = "sha256-65jEnM+eJ7HnZlpEM2D67W0Xgb9B/aa4JhajowG0Z8o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libeconf/package.nix b/pkgs/by-name/li/libeconf/package.nix new file mode 100644 index 000000000000..4c0b848c0ae9 --- /dev/null +++ b/pkgs/by-name/li/libeconf/package.nix @@ -0,0 +1,40 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libeconf"; + version = "0.8.3"; + + src = fetchFromGitHub { + owner = "openSUSE"; + repo = "libeconf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-ZXZcXQdG3hXAMwwftrIWL5GbVdPXk+AyqdhGTnaKL1I="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Enhanced config file parser, which merges config files placed in several locations into one"; + homepage = "https://github.com/openSUSE/libeconf"; + changelog = "https://github.com/openSUSE/libeconf/blob/${finalAttrs.src.tag}/NEWS"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ grimmauld ]; + mainProgram = "econftool"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/li/libedit/package.nix b/pkgs/by-name/li/libedit/package.nix index 30a316d0074d..b74e107981a8 100644 --- a/pkgs/by-name/li/libedit/package.nix +++ b/pkgs/by-name/li/libedit/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libedit"; - version = "20251016-3.1"; + version = "20260508-3.1"; src = fetchurl { url = "https://thrysoee.dk/editline/libedit-${finalAttrs.version}.tar.gz"; - hash = "sha256-ITYrAGU7v8HHH3GnV42ma1tSA1WdQxNNLddxnjE84EE="; + hash = "sha256-kfQtZXHdjZL67dE0ETTOWrygxdC0s1KBQYbTPysRJy4="; }; outputs = [ @@ -60,7 +60,7 @@ stdenv.mkDerivation (finalAttrs: { provides generic line editing, history, and tokenization functions, similar to those found in GNU Readline. ''; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ corngood ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libei/package.nix b/pkgs/by-name/li/libei/package.nix index 93e90b41467c..4724fb81451f 100644 --- a/pkgs/by-name/li/libei/package.nix +++ b/pkgs/by-name/li/libei/package.nix @@ -27,14 +27,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libei"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "libinput"; repo = "libei"; rev = finalAttrs.version; - hash = "sha256-PqQpJz88tDzjwsBuwxpWcGAWz6Gp6A/oAOS87uxGOGs="; + hash = "sha256-fUeMdRK7uoRvgvY3INMorwnTleLrLA5xOeYBFp1qXeI="; }; patches = lib.optionals stdenv.hostPlatform.isBSD [ diff --git a/pkgs/by-name/li/libepc/no-avahi-ui.patch b/pkgs/by-name/li/libepc/no-avahi-ui.patch deleted file mode 100644 index 4649ecbe27ce..000000000000 --- a/pkgs/by-name/li/libepc/no-avahi-ui.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/Makefile.am b/Makefile.am -index acf0d25..13022d1 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -32,8 +32,6 @@ noinst_PROGRAMS = \ - examples/lookup-resource \ - examples/service-browser \ - examples/simple-publisher \ -- examples/consumer-ui \ -- examples/publisher-ui \ - examples/server-credentials \ - $(TESTS) - TESTS = \ -@@ -155,10 +153,6 @@ examples_service_browser_LDADD = $(example_epc_libs) - examples_simple_publisher_CFLAGS = $(example_epc_cflags) - examples_simple_publisher_LDADD = $(example_epc_libs) - --examples_consumer_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) --examples_consumer_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) --examples_publisher_ui_CFLAGS = $(example_epc_ui_cflags) $(AVAHI_UI_CFLAGS) -rdynamic --examples_publisher_ui_LDADD = $(example_epc_ui_libs) $(AVAHI_UI_LIBS) - examples_server_credentials_CFLAGS = $(example_epc_ui_cflags) - examples_server_credentials_LDADD = $(example_epc_ui_libs) - -diff --git a/configure.ac b/configure.ac -index d68bf94..89bd471 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -53,7 +53,6 @@ PKG_CHECK_EXISTS([$GIO_REQUIREMENT], - GIO=$GIO_REQUIREMENT], - [AC_MSG_RESULT([no])]) - --PKG_CHECK_MODULES(AVAHI_UI, [avahi-ui-gtk3 >= 0.6]) - PKG_CHECK_MODULES(LIBEPC, [avahi-client >= 0.6 - avahi-glib >= 0.6 - glib-2.0 >= 2.36 diff --git a/pkgs/by-name/li/libepc/package.nix b/pkgs/by-name/li/libepc/package.nix deleted file mode 100644 index e9d642d2a7d1..000000000000 --- a/pkgs/by-name/li/libepc/package.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ - stdenv, - lib, - fetchurl, - autoreconfHook, - gnome-common, - pkg-config, - intltool, - gtk-doc, - glib, - avahi, - gnutls, - libuuid, - libsoup_2_4, - gtk3, - gnome, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libepc"; - version = "0.4.6"; - - outputs = [ - "out" - "dev" - "devdoc" - ]; - - src = fetchurl { - url = "mirror://gnome/sources/libepc/${lib.versions.majorMinor finalAttrs.version}/libepc-${finalAttrs.version}.tar.xz"; - sha256 = "1s3svb2slqjsrqfv50c2ymnqcijcxb5gnx6bfibwh9l5ga290n91"; - }; - - patches = [ - # Remove dependency that is only needed by uninstalled examples. - ./no-avahi-ui.patch - ]; - - nativeBuildInputs = [ - autoreconfHook - gnome-common - pkg-config - intltool - gtk-doc - ]; - - buildInputs = [ - glib - libuuid - gtk3 - ]; - - propagatedBuildInputs = [ - avahi - gnutls - libsoup_2_4 - ]; - - enableParallelBuilding = true; - - passthru = { - updateScript = gnome.updateScript { - packageName = "libepc"; - versionPolicy = "odd-unstable"; - }; - }; - - meta = { - description = "Easy Publish and Consume Library"; - homepage = "https://gitlab.gnome.org/Archive/libepc"; - license = lib.licenses.lgpl21Plus; - maintainers = [ lib.maintainers.bot-wxt1221 ]; - platforms = lib.platforms.linux; - }; -}) diff --git a/pkgs/by-name/li/liberal-crime-squad/package.nix b/pkgs/by-name/li/liberal-crime-squad/package.nix index a3812708c1b3..f8a2ca4420a2 100644 --- a/pkgs/by-name/li/liberal-crime-squad/package.nix +++ b/pkgs/by-name/li/liberal-crime-squad/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation { Welcome to Liberal Crime Squad! The Conservatives have taken the Executive, Legislative, and Judicial branches of government. Over time, the Liberal laws of this nation will erode and turn the country into a BACKWOODS YET CORPORATE NIGHTMARE. To prevent this from happening, the Liberal Crime Squad was established. The mood of the country is shifting, and we need to turn things around. Go out on the streets and indoctrinate Conservative automatons. That is, let them see their True Liberal Nature. Then arm them and send them forth to Stop Evil. ''; homepage = "https://github.com/Kamal-Sadek/Liberal-Crime-Squad"; - maintainers = [ lib.maintainers.rardiol ]; + maintainers = [ ]; mainProgram = "crimesquad"; license = lib.licenses.gpl2Plus; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libetpan/package.nix b/pkgs/by-name/li/libetpan/package.nix index d266c7600ca8..79191951d5ff 100644 --- a/pkgs/by-name/li/libetpan/package.nix +++ b/pkgs/by-name/li/libetpan/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libetpan"; - version = "1.10"; + version = "1.10.1"; src = fetchFromGitHub { - owner = "dinhviethoa"; + owner = "dinhvh"; repo = "libetpan"; tag = finalAttrs.version; - hash = "sha256-dG1qsYv9W0l6LLMW+XnKtUunga3IGVxEy34Tnp+K99o="; + hash = "sha256-OBLGek7WYjiAiMMhycbx4eUy8d4XLF/B9p7GGO6LFHA="; }; outputs = [ diff --git a/pkgs/by-name/li/libeufin/package.nix b/pkgs/by-name/li/libeufin/package.nix index 07f0344163ea..e6bb25489684 100644 --- a/pkgs/by-name/li/libeufin/package.nix +++ b/pkgs/by-name/li/libeufin/package.nix @@ -34,9 +34,7 @@ stdenv.mkDerivation (finalAttrs: { ''; }; - patchPhase = '' - runHook prePatch - + postPatch = '' substituteInPlace Makefile \ --replace-fail "install: build install-nobuild-files" "install: install-nobuild-files" @@ -47,8 +45,6 @@ stdenv.mkDerivation (finalAttrs: { # Use gradle repo to download dependencies substituteInPlace build.gradle \ --replace-fail 'mavenCentral()' "gradlePluginPortal()" - - runHook postPatch ''; preConfigure = '' diff --git a/pkgs/by-name/li/libevent/package.nix b/pkgs/by-name/li/libevent/package.nix index fd8da373bf01..d220a63c4963 100644 --- a/pkgs/by-name/li/libevent/package.nix +++ b/pkgs/by-name/li/libevent/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libevent"; - version = "2.1.12"; + version = "2.1.13"; src = fetchurl { url = "https://github.com/libevent/libevent/releases/download/release-${finalAttrs.version}-stable/libevent-${finalAttrs.version}-stable.tar.gz"; - sha256 = "1fq30imk8zd26x8066di3kpc5zyfc5z6frr3zll685zcx4dxxrlj"; + hash = "sha256-9+k4O4wLqoG2h+W17swBvu+vGxm2QVHZXtYWR/56MVw="; }; patches = [ diff --git a/pkgs/by-name/li/libfabric/package.nix b/pkgs/by-name/li/libfabric/package.nix index 2bd139469e2c..c826fff3ad34 100644 --- a/pkgs/by-name/li/libfabric/package.nix +++ b/pkgs/by-name/li/libfabric/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libfabric"; - version = "2.5.1"; + version = "2.6.0"; enableParallelBuilding = true; @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "ofiwg"; repo = "libfabric"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-d8ZdHMo3ErwBtLtUiLetjR+wu6H9bj3jnGZDYX544Jc="; + sha256 = "sha256-/zQnXfEveIGCpPZ3lgrOLnXSS7m8U2spVjkqsXuaL0o="; }; outputs = [ diff --git a/pkgs/by-name/li/libfaketime/package.nix b/pkgs/by-name/li/libfaketime/package.nix index d66ac6704ecb..9500cdb60097 100644 --- a/pkgs/by-name/li/libfaketime/package.nix +++ b/pkgs/by-name/li/libfaketime/package.nix @@ -26,6 +26,12 @@ stdenv.mkDerivation (finalAttrs: { hash = hashes.${finalAttrs.version}; }; + outputs = [ + "out" + "doc" + "man" + ]; + patches = [ ./nix-store-date.patch ] @@ -55,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { env = { PREFIX = placeholder "out"; LIBDIRNAME = "/lib"; - NIX_CFLAGS_COMPILE = toString ( + CFLAGS = toString ( lib.optionals stdenv.cc.isClang [ "-Wno-error=cast-function-type" "-Wno-error=format-truncation" @@ -72,6 +78,8 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; __structuredAttrs = true; + strictDeps = true; + enableParallelBuilding = true; meta = { description = "Report faked system time to programs without having to change the system-wide time"; diff --git a/pkgs/by-name/li/libffiReal/package.nix b/pkgs/by-name/li/libffiReal/package.nix index 0869a82c1d16..3ccee9419fc5 100644 --- a/pkgs/by-name/li/libffiReal/package.nix +++ b/pkgs/by-name/li/libffiReal/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libffi"; - version = "3.5.2"; + version = "3.7.0"; src = fetchurl { url = with finalAttrs; "https://github.com/libffi/libffi/releases/download/v${version}/${pname}-${version}.tar.gz"; - hash = "sha256-86MIKiOzfCk6T80QUxR7Nx8v+R+n6hsqUuM1Z2usgtw="; + hash = "sha256-IlXFpjjftRv2fCChKnu3DRf+senqurrAX1VzFG9YZDY="; }; # Note: this package is used for bootstrapping fetchurl, and thus @@ -32,6 +32,9 @@ stdenv.mkDerivation (finalAttrs: { ./freebsd-tsan-pthread.patch ]; + # To workaround https://github.com/libffi/libffi/issues/993, we empty the test file: + postPatch = lib.optionalString stdenv.hostPlatform.isDarwin "echo 'int main (void) { return 0; }' > testsuite/libffi.call/i128-1.c"; + strictDeps = true; outputs = [ "out" diff --git a/pkgs/by-name/li/libfprint-tod/package.nix b/pkgs/by-name/li/libfprint-tod/package.nix index 9abebbb42b25..120082b2029e 100644 --- a/pkgs/by-name/li/libfprint-tod/package.nix +++ b/pkgs/by-name/li/libfprint-tod/package.nix @@ -27,6 +27,10 @@ libfprint.overrideAttrs ( hash = "sha256-xkywuFbt8EFJOlIsSN2hhZfMUhywdgJ/uT17uiO3YV4="; }; + # Different source than libfprint, so override any patches, because they + # would only apply to the original source tree + patches = [ ]; + mesonFlags = [ # Include virtual drivers for fprintd tests "-Ddrivers=all" diff --git a/pkgs/by-name/li/libfprint/package.nix b/pkgs/by-name/li/libfprint/package.nix index 160cec4aa0f9..edfc4aa8ea74 100644 --- a/pkgs/by-name/li/libfprint/package.nix +++ b/pkgs/by-name/li/libfprint/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitLab, + fetchpatch, pkg-config, meson, python3, @@ -35,6 +36,35 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-aNBUIKY3PP5A07UNg3N0qq+2cwb6Fk67oKQcXgr2G/4="; }; + patches = [ + # New hardware support since 1.94.10, just new USB Product IDs + (fetchpatch { + name = "realtek-3274-9003.patch"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/a25f71cf97820c51edc4c32f84686fcdc608d9d1.patch"; + sha256 = "sha256-T9rvT53Ij+5gtiVOp+xfzQwiVkyF0m6lZAUCXWmaugg="; + }) + (fetchpatch { + name = "elan-0c58.patch"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/4610f2285e6373c2fe4ead0dff4ebf8dabe4e532.patch"; + sha256 = "sha256-VR96V+7FvSa8sE6JpcCx/slZ0MaK9HLuNuAay2P9C6M="; + }) + (fetchpatch { + name = "elan-04F3-0C9C.patch"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2bdc2b7ca6d8bedc675054934fbc8f8b6a21deac.patch"; + sha256 = "sha256-LFMip9Mq55uDRgHkW+XeI+j0mILOb7DIHscHjyKe4yE="; + }) + (fetchpatch { + name = "focal-077a-079a.patch"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/2c7842c905147a2d127c1b168b2e9d432b8c91a4.patch"; + sha256 = "sha256-PuISGITn0/6AWY0WVUfViZtdcQFh+0s+4OLIszqdLUs="; + }) + (fetchpatch { + name = "focal-a97a.patch"; + url = "https://gitlab.freedesktop.org/libfprint/libfprint/-/commit/0dc384b90ed8cd78b3e8d7c0d30a953bd088b98c.patch"; + sha256 = "sha256-X/wl4MpxfQ7sLlFTkkiDQGyRFQ6lC9pdcy3XPrSeOZw="; + }) + ]; + postPatch = '' patchShebangs \ tests/test-runner.sh \ diff --git a/pkgs/by-name/li/libfreeaptx/package.nix b/pkgs/by-name/li/libfreeaptx/package.nix index 524c92b9d0df..e1edbbe93595 100644 --- a/pkgs/by-name/li/libfreeaptx/package.nix +++ b/pkgs/by-name/li/libfreeaptx/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.2.2"; src = fetchFromGitHub { - owner = "iamthehorker"; + owner = "regularhunter"; repo = "libfreeaptx"; rev = finalAttrs.version; sha256 = "sha256-ntbF0jz/ilOk45xMQxx00WJtJq4Wb7VyKE0eKvghYnY="; @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Free Implementation of Audio Processing Technology codec (aptX)"; license = lib.licenses.lgpl21Plus; - homepage = "https://github.com/iamthehorker/libfreeaptx"; + homepage = "https://github.com/regularhunter/libfreeaptx"; platforms = lib.platforms.unix; maintainers = [ ]; }; diff --git a/pkgs/by-name/li/libfrida-core/package.nix b/pkgs/by-name/li/libfrida-core/package.nix index e99e2303a335..044e98bb2a1c 100644 --- a/pkgs/by-name/li/libfrida-core/package.nix +++ b/pkgs/by-name/li/libfrida-core/package.nix @@ -2,39 +2,18 @@ lib, stdenvNoCC, fetchurl, - nix-update-script, + writeShellScript, + curl, + jq, + common-updater-scripts, }: -let - inherit (stdenvNoCC.hostPlatform) system; - version = "17.9.1"; - source = - { - x86_64-linux = { - url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-x86_64.tar.xz"; - hash = "sha256-94Zk7onepdNVEeDb+Vn4h680UoXCZPeZW+eGpaUrnwI="; - }; - aarch64-linux = { - url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-linux-arm64.tar.xz"; - hash = "sha256-o9kJvxqHICzuFItPj6r76D8aEEF/8QsRwJvE4oxphfA="; - }; - x86_64-darwin = { - url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-x86_64.tar.xz"; - hash = "sha256-9W6o5giLSR/5bWsgRTMHI3GS7565Nkdb2kZCIm5V/cQ="; - }; - aarch64-darwin = { - url = "https://github.com/frida/frida/releases/download/${version}/frida-core-devkit-${version}-macos-arm64.tar.xz"; - hash = "sha256-bTxBvz+wpdNGUDHTFB1nN1UroMC3Bi2H/bzTVSCeMno="; - }; - } - .${system} or (throw "Unsupported system: ${system}"); -in stdenvNoCC.mkDerivation (finalAttrs: { pname = "libfrida-core"; - inherit version; + version = "17.16.0"; - src = fetchurl { - inherit (source) url hash; - }; + src = + finalAttrs.passthru.sources.${stdenvNoCC.hostPlatform.system} + or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); dontUnpack = true; installPhase = '' @@ -46,7 +25,40 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { }; + passthru = { + sources = { + x86_64-linux = fetchurl { + url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-x86_64.tar.xz"; + hash = "sha256-4OkangepbSAtn6DPGOrDVVlcXjVnj2XXlT0xE/+WBsg="; + }; + aarch64-linux = fetchurl { + url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-linux-arm64.tar.xz"; + hash = "sha256-HrFTlYbpS01i6mVJlrieFpdZ0a27/u45sLJwarCQ150="; + }; + aarch64-darwin = fetchurl { + url = "https://github.com/frida/frida/releases/download/${finalAttrs.version}/frida-core-devkit-${finalAttrs.version}-macos-arm64.tar.xz"; + hash = "sha256-QeT3LLGNBQOgziu/HWqMHI6q3dNmyxJfqcm5xqpxY2Q="; + }; + }; + updateScript = writeShellScript "update-libfrida-core" '' + set -o errexit + export PATH="${ + lib.makeBinPath [ + curl + jq + common-updater-scripts + ] + }" + NEW_VERSION=$(curl --silent ''${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/frida/frida/releases/latest | jq '.tag_name' --raw-output) + if [[ "${finalAttrs.version}" = "$NEW_VERSION" ]]; then + echo "The new version is the same as the old version." + exit 0 + fi + for platform in ${lib.escapeShellArgs finalAttrs.meta.platforms}; do + update-source-version "libfrida-core" "$NEW_VERSION" --ignore-same-version --source-key="sources.$platform" + done + ''; + }; meta = { description = "Frida core library intended for static linking into bindings"; @@ -54,12 +66,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { changelog = "https://frida.re/news/"; license = lib.licenses.wxWindowsException31; maintainers = with lib.maintainers; [ nilathedragon ]; - platforms = [ - "x86_64-linux" - "aarch64-linux" - "x86_64-darwin" - "aarch64-darwin" - ]; + platforms = builtins.attrNames finalAttrs.passthru.sources; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; }) diff --git a/pkgs/by-name/li/libfyaml/package.nix b/pkgs/by-name/li/libfyaml/package.nix index ebbaae3748d8..4804f7bb9645 100644 --- a/pkgs/by-name/li/libfyaml/package.nix +++ b/pkgs/by-name/li/libfyaml/package.nix @@ -25,10 +25,29 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/pantoniou/libfyaml/commit/0982fcefc6a16d4c8cb5b06747d3fc8e630de3ae.diff"; hash = "sha256-aDubIn+et+1fWE7XU7a5AGZVacVFbAbC1PoSDrA6hXw="; }) + # backport "Fix C11 atomics detection and buggy macros for C++ compatibility" + (fetchpatch { + url = "https://github.com/pantoniou/libfyaml/commit/1026d76850909dc9b1c5f95b8cd94e865a313fd5.diff"; + hash = "sha256-0YfOqdqHdELFMqr52TDAC3BNFLkcuxvuJY5b9yZ7NFk="; + }) (fetchpatch { url = "https://github.com/pantoniou/libfyaml/commit/9192deaac095f9881cc1e5756dede683f36b09d6.diff"; hash = "sha256-cNL9wQtxIRg/ShZLJP4qHYNFRrYo9kRG+/U+3FiUeaI="; }) + # On Darwin, AX_PTHREAD returns empty PTHREAD_LIBS with -pthread in PTHREAD_CFLAGS; + # don't force -lpthread when PTHREAD_CFLAGS already provides pthread support. + # Pending PR: https://github.com/pantoniou/libfyaml/pull/294 + ./pthread-darwin.patch + + # backport "build: don't output 'none required' to LIBM if no linker flags needed for it" + (fetchpatch { + url = "https://github.com/pantoniou/libfyaml/commit/24b18e7363b336962fe160c1dc05ca57ba95783c.diff"; + hash = "sha256-g5QKI4HuS8MEQ9ddIQNC0j+28Dh9zLAp5RaZX5SWBHk="; + }) + (fetchpatch { + url = "https://github.com/pantoniou/libfyaml/commit/9f2492ca27bb1fda64f2b12edc2da17406208b93.diff"; + hash = "sha256-E4wS+P7R3VGrBpD7swWMMi/QPTF+9rzAeEyxhbmdiwk="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libfyaml/pthread-darwin.patch b/pkgs/by-name/li/libfyaml/pthread-darwin.patch new file mode 100644 index 000000000000..bada0d80d142 --- /dev/null +++ b/pkgs/by-name/li/libfyaml/pthread-darwin.patch @@ -0,0 +1,12 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -99,6 +99,7 @@ + AX_PTHREAD([], [AC_MSG_ERROR("Missing required pthread support")]) + +-# in some cases PTHREAD_LIBS is empty - force -lpthread */ +-if test "x$PTHREAD_LIBS" = "x"; then ++# In some cases PTHREAD_LIBS is empty; force -lpthread only when PTHREAD_CFLAGS ++# also provides no pthread support (e.g. on Darwin, -pthread in CFLAGS suffices). ++if test "x$PTHREAD_LIBS" = "x" && test "x$PTHREAD_CFLAGS" = "x"; then + PTHREAD_LIBS="-lpthread" + fi diff --git a/pkgs/by-name/li/libgaminggear/package.nix b/pkgs/by-name/li/libgaminggear/package.nix index 30ad21ee8d29..ad8945f0f0f5 100644 --- a/pkgs/by-name/li/libgaminggear/package.nix +++ b/pkgs/by-name/li/libgaminggear/package.nix @@ -9,7 +9,6 @@ gtk2, libcanberra, libnotify, - pcre, sqlite, libxdmcp, libpthread-stubs, @@ -48,7 +47,6 @@ stdenv.mkDerivation (finalAttrs: { gtk2 libcanberra libnotify - pcre sqlite libxdmcp libpthread-stubs diff --git a/pkgs/by-name/li/libgcrypt/package.nix b/pkgs/by-name/li/libgcrypt/package.nix index 9317da7494fd..20f8cad0a141 100644 --- a/pkgs/by-name/li/libgcrypt/package.nix +++ b/pkgs/by-name/li/libgcrypt/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, gettext, libgpg-error, enableCapabilities ? false, @@ -17,13 +18,23 @@ assert enableCapabilities -> stdenv.hostPlatform.isLinux; stdenv.mkDerivation rec { pname = "libgcrypt"; - version = "1.11.2"; + version = "1.12.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${pname}-${version}.tar.bz2"; - hash = "sha256-a6Wd0ZInDowdIt20GgfZXc28Hw+wLQPEtUsjWBQzCqw="; + hash = "sha256-fOM8JJIiGgQ2+WqFACFenz49y1/SanV81BXnqEO6vV4="; }; + patches = lib.optionals stdenv.hostPlatform.isRiscV64 [ + # Remove in next release + # https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5 + # zvkned AES corrupts CBC/CFB/CTR/OCB/XTS output on VLEN>128 hardware + (fetchpatch { + url = "https://github.com/gpg/libgcrypt/commit/3f684fc6ab3ac98320e245a06b3563ad37ec56f5.patch"; + hash = "sha256-1LSrIwsN0n5IBRDZ+9MJTEjzY+/T6LQO6hX1ke8hSuc="; + }) + ]; + outputs = [ "bin" "lib" @@ -73,17 +84,6 @@ stdenv.mkDerivation rec { postConfigure = '' sed -i configure \ -e 's/NOEXECSTACK_FLAGS=$/NOEXECSTACK_FLAGS="-Wa,--noexecstack"/' - '' - # The cipher/simd-common-riscv.h wasn't added to the release tarball, please remove this hack on next version update - # https://dev.gnupg.org/T7647 - + lib.optionalString stdenv.hostPlatform.isRiscV '' - cp ${ - fetchurl { - url = "https://git.gnupg.org/cgi-bin/gitweb.cgi?p=libgcrypt.git;a=blob_plain;f=cipher/simd-common-riscv.h;h=8381000f9ac148c60a6963a1d9ec14a3fee1c576;hb=81ce5321b1b79bde6dfdc3c164efb40c13cf656b"; - hash = "sha256-Toe15YLAOYULnLc2fGMMv/xzs/q1t3LsyiqtL7imc+8="; - name = "simd-common-riscv.h"; - } - } cipher/simd-common-riscv.h ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libgdsii/package.nix b/pkgs/by-name/li/libgdsii/package.nix index d7c011932808..7484d4837a3e 100644 --- a/pkgs/by-name/li/libgdsii/package.nix +++ b/pkgs/by-name/li/libgdsii/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Library and command-line utility for reading GDSII geometry files"; mainProgram = "GDSIIConvert"; homepage = "https://github.com/HomerReid/libGDSII"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ sheepforce markuskowa diff --git a/pkgs/by-name/li/libgedit-gfls/package.nix b/pkgs/by-name/li/libgedit-gfls/package.nix index caf368fc0579..554b7bf8dcba 100644 --- a/pkgs/by-name/li/libgedit-gfls/package.nix +++ b/pkgs/by-name/li/libgedit-gfls/package.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gfls"; - version = "0.4.1"; + version = "0.4.2"; outputs = [ "out" @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "libgedit-gfls"; tag = finalAttrs.version; forceFetchGit = true; # To avoid occasional 501 failures. - hash = "sha256-61jq7tcAAzYuhKM4OlH/GniGTfiWg/Pcznb03+vaLvw="; + hash = "sha256-8nr8rBvSBLadhxHipZiWOJj663R9jP6kFurSKp3n0U0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libgedit-gtksourceview/package.nix b/pkgs/by-name/li/libgedit-gtksourceview/package.nix index 21cc59c282a7..2d06a69c1866 100644 --- a/pkgs/by-name/li/libgedit-gtksourceview/package.nix +++ b/pkgs/by-name/li/libgedit-gtksourceview/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libgedit-gtksourceview"; - version = "299.7.0"; + version = "299.7.1"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "libgedit-gtksourceview"; tag = finalAttrs.version; forceFetchGit = true; # To avoid occasional 501 failures. - hash = "sha256-CU9EO0oHfkdWPyicmIG6eaN+wUvvkUhrb6wgNosnm2Q="; + hash = "sha256-i+6Rfqm/KPJrLSvhvTVY53Q6O+LJEU9WjLJ/L3hMSUA="; }; patches = [ diff --git a/pkgs/by-name/li/libghostty-vt/deps.nix b/pkgs/by-name/li/libghostty-vt/deps.nix index d4bbdf97a44c..1229b3fe8d8c 100644 --- a/pkgs/by-name/li/libghostty-vt/deps.nix +++ b/pkgs/by-name/li/libghostty-vt/deps.nix @@ -192,11 +192,11 @@ linkFarm name [ }; } { - name = "N-V-__8AAL6FAwBDPampKgDjoxlJYDIn2jv0VaINS4W6CXJN"; + name = "N-V-__8AALZGBAAS5NLVH-c8eC-6VtCdcH-9nUvVfUSkWS__"; path = fetchZigArtifact { name = "iterm2_themes"; - url = "https://deps.files.ghostty.org/ghostty-themes-release-20260323-152405-a2c7b60.tgz"; - hash = "sha256-fWgXdUXh2/dNZqERzEu9hz4xyy4nl+GUjLMpUMrsRnA="; + url = "https://deps.files.ghostty.org/ghostty-themes-release-20260713-155359-c3968b3.tgz"; + hash = "sha256-FLMES+9no8uDUjlzvRbTqg+wCW3dHg7Lo5FtFNbWfyA="; unpack = false; }; } diff --git a/pkgs/by-name/li/libghostty-vt/package.nix b/pkgs/by-name/li/libghostty-vt/package.nix index b6e629a50634..5132cad9839f 100644 --- a/pkgs/by-name/li/libghostty-vt/package.nix +++ b/pkgs/by-name/li/libghostty-vt/package.nix @@ -17,13 +17,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libghostty-vt"; - version = "0.1.0-unstable-2026-05-03"; + version = "0.1.0-unstable-2026-07-20"; src = fetchFromGitHub { owner = "ghostty-org"; repo = "ghostty"; - rev = "1547dd667ab6d1f4ebcdc7282adc54c95752ee67"; - hash = "sha256-dZFc+8az7BUIs8+v45XqNnY5G6oXEwVfVVHZQuATSGQ="; + rev = "88b4cd047fa627cdca6781bc7e7dc8b75a2cecb9"; + hash = "sha256-298x90knBUWX5GHGXh2SKsAKvStjU2ri9UgOGoF79/8="; }; # Zig's build runner computes relative paths from `cwd` to the build directory. diff --git a/pkgs/by-name/li/libgit2/package.nix b/pkgs/by-name/li/libgit2/package.nix index 568fa09201aa..c17240378a92 100644 --- a/pkgs/by-name/li/libgit2/package.nix +++ b/pkgs/by-name/li/libgit2/package.nix @@ -17,6 +17,7 @@ gitstatus, llhttp, withGssapi ? false, + withExperimentalSha256 ? false, krb5, }: @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { "-DUSE_HTTP_PARSER=llhttp" "-DUSE_SSH=ON" (lib.cmakeBool "USE_GSSAPI" withGssapi) + (lib.cmakeBool "EXPERIMENTAL_SHA256" withExperimentalSha256) "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" ] ++ lib.optionals stdenv.hostPlatform.isWindows [ @@ -89,6 +91,13 @@ stdenv.mkDerivation (finalAttrs: { ) ''; + postInstall = lib.optionalString withExperimentalSha256 '' + # Downstream Rust bindings (git2-rs / git2-sys) expect experimental headers + # to be located at 'git2/experimental.h', but upstream libgit2 installs them + # into 'git2-experimental/' when EXPERIMENTAL_SHA256 is enabled. + ln -s git2-experimental $dev/include/git2 + ''; + passthru.tests = lib.mapAttrs (_: v: v.override { libgit2 = finalAttrs.finalPackage; }) { inherit libgit2-glib; inherit (python3Packages) pygit2; diff --git a/pkgs/by-name/li/libglycin-gtk4/package.nix b/pkgs/by-name/li/libglycin-gtk4/package.nix index f5b46f1d68b3..b5181f595b22 100644 --- a/pkgs/by-name/li/libglycin-gtk4/package.nix +++ b/pkgs/by-name/li/libglycin-gtk4/package.nix @@ -96,10 +96,12 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "C-Bindings to convert glycin frames to GDK Textures"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; - license = with lib.licenses; [ - mpl20 # or - lgpl21Plus - ]; + license = + with lib.licenses; + OR [ + mpl20 + lgpl21Plus + ]; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; pkgConfigModules = [ diff --git a/pkgs/by-name/li/libglycin/package.nix b/pkgs/by-name/li/libglycin/package.nix index 9ee9bb5df921..3a42bc136d27 100644 --- a/pkgs/by-name/li/libglycin/package.nix +++ b/pkgs/by-name/li/libglycin/package.nix @@ -15,6 +15,7 @@ glib, gobject-introspection, glycin-loaders, + glycin-thumbnailer, libglycin-gtk4, fontconfig, libseccomp, @@ -153,6 +154,7 @@ stdenv.mkDerivation (finalAttrs: { tests = { inherit glycin-loaders + glycin-thumbnailer libglycin-gtk4 ; }; @@ -162,10 +164,12 @@ stdenv.mkDerivation (finalAttrs: { description = "Sandboxed and extendable image loading library"; homepage = "https://gitlab.gnome.org/GNOME/glycin"; changelog = "https://gitlab.gnome.org/GNOME/glycin/-/tags/${finalAttrs.version}"; - license = with lib.licenses; [ - mpl20 # or - lgpl21Plus - ]; + license = + with lib.licenses; + OR [ + mpl20 + lgpl21Plus + ]; maintainers = [ ]; teams = [ lib.teams.gnome ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/li/libgpg-error/package.nix b/pkgs/by-name/li/libgpg-error/package.nix index 0b933048fc0e..c086abb3c806 100644 --- a/pkgs/by-name/li/libgpg-error/package.nix +++ b/pkgs/by-name/li/libgpg-error/package.nix @@ -25,11 +25,11 @@ in stdenv.mkDerivation ( rec { pname = "libgpg-error"; - version = "1.59"; + version = "1.61"; src = fetchurl { url = "mirror://gnupg/libgpg-error/libgpg-error-${version}.tar.bz2"; - hash = "sha256-oZvFCH/ZcCbZPLS0XVFjjRolICpeH7w5BXmfQkz6YTQ="; + hash = "sha256-eoVBPyvDVPT4qoMrcYrxIuSJZeng65AS7mWcE8Y4XJM="; }; postPatch = '' diff --git a/pkgs/by-name/li/libgsf/package.nix b/pkgs/by-name/li/libgsf/package.nix index 56151be8ef97..c05c128e1aa8 100644 --- a/pkgs/by-name/li/libgsf/package.nix +++ b/pkgs/by-name/li/libgsf/package.nix @@ -83,6 +83,12 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs ./tests/ ''; + postInstall = '' + substituteInPlace $out/share/thumbnailers/gsf-office.thumbnailer \ + --replace-fail "TryExec=gsf-office-thumbnailer" "TryExec=$out/bin/gsf-office-thumbnailer" \ + --replace-fail "Exec=gsf-office-thumbnailer" "Exec=$out/bin/gsf-office-thumbnailer" + ''; + passthru = { updateScript = gnome.updateScript { packageName = finalAttrs.pname; diff --git a/pkgs/by-name/li/libgumath/package.nix b/pkgs/by-name/li/libgumath/package.nix index 01aa7ae1f619..6a3b2f507c26 100644 --- a/pkgs/by-name/li/libgumath/package.nix +++ b/pkgs/by-name/li/libgumath/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "xnd-project"; - repo = "gumath"; + repo = "libgumath"; rev = "360ed454105ac5615a7cb7d216ad25bc4181b876"; sha256 = "1wprkxpmjrk369fpw8rbq51r7jvqkcndqs209y7p560cnagmsxc6"; }; diff --git a/pkgs/by-name/li/libhangul/package.nix b/pkgs/by-name/li/libhangul/package.nix index e7630d33b024..caec4833b7df 100644 --- a/pkgs/by-name/li/libhangul/package.nix +++ b/pkgs/by-name/li/libhangul/package.nix @@ -1,29 +1,42 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, + autoreconfHook, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "libhangul"; - version = "0.1.0"; + version = "0.2.0"; - src = fetchurl { - url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/libhangul/libhangul-${finalAttrs.version}.tar.gz"; - sha256 = "0ni9b0v70wkm0116na7ghv03pgxsfpfszhgyj3hld3bxamfal1ar"; + src = fetchFromGitHub { + owner = "libhangul"; + repo = "libhangul"; + hash = "sha256-1cTDsRJpT5TLdJN8D2LfOISWeAOlSO6zKZOaCrTxooM="; + tag = "libhangul-${finalAttrs.version}"; }; + preAutoreconf = "./autogen.sh"; configureFlags = [ # detection doesn't work for cross builds "ac_cv_func_realloc_0_nonnull=yes" ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + meta = { description = "Core algorithm library for Korean input routines"; mainProgram = "hangul"; - homepage = "https://github.com/choehwanjin/libhangul"; - license = lib.licenses.lgpl21; - maintainers = [ lib.maintainers.ianwookim ]; + homepage = "https://github.com/libhangul/libhangul"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ + ianwookim + honnip + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/libheif/package.nix b/pkgs/by-name/li/libheif/package.nix index 7d4912e77598..940c3015dfb5 100644 --- a/pkgs/by-name/li/libheif/package.nix +++ b/pkgs/by-name/li/libheif/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libheif"; - version = "1.21.2"; + version = "1.23.1"; outputs = [ "bin" @@ -38,7 +38,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "strukturag"; repo = "libheif"; rev = "v${finalAttrs.version}"; - hash = "sha256-odkJ0wZSGoZ7mX9fkaNREDpMvQuQA9HKaf3so1dYrbc="; + hash = "sha256-o+gQCv/lpRx+IaqpjHACh8ysgl/N4Mo/9zbAI/cnWas="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libhsts/package.nix b/pkgs/by-name/li/libhsts/package.nix index 9546b652d021..621ea039025d 100644 --- a/pkgs/by-name/li/libhsts/package.nix +++ b/pkgs/by-name/li/libhsts/package.nix @@ -2,21 +2,12 @@ lib, stdenv, fetchFromGitLab, - fetchurl, + chromium-hsts-preload-list, autoconf-archive, autoreconfHook, pkg-config, python3, }: -let - chromium_version = "140.0.7324.1"; - - hsts_list = fetchurl { - url = "https://raw.github.com/chromium/chromium/${chromium_version}/net/http/transport_security_state_static.json"; - hash = "sha256-XV3yZA3Ai4It7S/y4V0h+UtKm8SXm6x1hlITD7jGY9I="; - }; - -in stdenv.mkDerivation rec { pname = "libhsts"; version = "0.1.0"; @@ -39,7 +30,7 @@ stdenv.mkDerivation rec { postPatch = '' pushd tests - cp ${hsts_list} transport_security_state_static.json + cp ${chromium-hsts-preload-list}/share/chromium-hsts-preload-list/transport_security_state_static.json . # strip comments from json sed 's/^ *\/\/.*$//g' transport_security_state_static.json >hsts.json popd @@ -53,8 +44,6 @@ stdenv.mkDerivation rec { python3 ]; - passthru.updateScript = ./update.sh; - meta = { description = "Library to easily check a domain against the Chromium HSTS Preload list"; mainProgram = "hsts"; diff --git a/pkgs/by-name/li/libhsts/update.sh b/pkgs/by-name/li/libhsts/update.sh deleted file mode 100755 index 911f91918332..000000000000 --- a/pkgs/by-name/li/libhsts/update.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl jq - -set -euo pipefail -x - -cd "$(dirname "$0")" - -chromium_version=$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/chromium/chromium/tags" | jq -r 'map(select(.prerelease | not)) | .[1].name') -sha256=$(nix-prefetch-url "https://raw.github.com/chromium/chromium/$chromium_version/net/http/transport_security_state_static.json") -hash=$(nix hash convert --to sri "$sha256") - -sed -e "0,/chromium_version/s/chromium_version = \".*\"/chromium_version = \"$chromium_version\"/" \ - -e "0,/hash/s/hash = \".*\"/sha256 = \"$hash\"/" \ - --in-place ./default.nix diff --git a/pkgs/by-name/li/libhwy/package.nix b/pkgs/by-name/li/libhwy/package.nix index d78d12faf698..fc60dbff5d0a 100644 --- a/pkgs/by-name/li/libhwy/package.nix +++ b/pkgs/by-name/li/libhwy/package.nix @@ -5,36 +5,19 @@ ninja, gtest, fetchFromGitHub, - fetchpatch, }: stdenv.mkDerivation rec { pname = "libhwy"; - version = "1.3.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "google"; repo = "highway"; rev = version; - hash = "sha256-8QOk96Y3GIIvBUGIDikMgTylx8y5aCyr68/TP5w5ha4="; + hash = "sha256-YUYZO9KLffczjwIz3mBBceD6oM1giLCFLDHgDCevdRA="; }; - patches = [ - # Apply upstream workaround for gcc-15 bug: - # https://github.com/google/highway/issues/2813 - # https://github.com/google/highway/pull/2824 - (fetchpatch { - name = "gcc-15-clone-hack-prerequisite.patch"; - url = "https://github.com/google/highway/commit/3b680cde3a556bead9cc23c8f595d07a44d5a0d5.patch"; - hash = "sha256-8xBPuhsifalhzKgeEOQq6yZw2NWas+SFQrNIaMicRnY="; - }) - (fetchpatch { - name = "gcc-15-clone-hack.patch"; - url = "https://github.com/google/highway/commit/5af21b8a9078330a3d7456d855e69245bb87bc7a.patch"; - hash = "sha256-hC/oEdxHsdZKlLFIw929ZHjffPURGzk9jiKz6iGSLkY="; - }) - ]; - hardeningDisable = lib.optionals stdenv.hostPlatform.isAarch64 [ # aarch64-specific code gets: # __builtin_clear_padding not supported for variable length aggregates diff --git a/pkgs/by-name/li/libidn/package.nix b/pkgs/by-name/li/libidn/package.nix index d36eedac8fe9..071b7f08f15d 100644 --- a/pkgs/by-name/li/libidn/package.nix +++ b/pkgs/by-name/li/libidn/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libidn"; - version = "1.43"; + version = "1.44"; src = fetchurl { url = "mirror://gnu/libidn/libidn-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-vcZiwS0EGyU50OY486bnQRMM2zOmRO80lpY6RDSC0WQ="; + sha256 = "sha256-SZYIurOmVlCg6lKIjBOo3uvj9xQI4xms2exS4C6xOVk="; }; outputs = [ @@ -30,6 +30,7 @@ stdenv.mkDerivation (finalAttrs: { passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; meta = { + changelog = "https://codeberg.org/libidn/libidn/src/tag/v${finalAttrs.version}/NEWS"; homepage = "https://www.gnu.org/software/libidn/"; description = "Library for internationalized domain names"; diff --git a/pkgs/by-name/li/libipuz/package.nix b/pkgs/by-name/li/libipuz/package.nix index 4648496425a4..baf41200cd3a 100644 --- a/pkgs/by-name/li/libipuz/package.nix +++ b/pkgs/by-name/li/libipuz/package.nix @@ -4,7 +4,6 @@ cargo, fetchFromGitLab, gi-docgen, - glib, gobject-introspection, json-glib, meson, @@ -15,14 +14,14 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libipuz"; - version = "0.5.2"; + version = "0.5.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "jrb"; repo = "libipuz"; rev = finalAttrs.version; - hash = "sha256-8bFMtqRD90SF9uT39Wkjf0eUef+0HgyrqY+DFA/xutI="; + hash = "sha256-rUFYPtedcNqba2OLPo9nSjyGxuc3Q3RNoOmZx+RUOcU="; }; cargoRoot = "libipuz/rust"; @@ -33,13 +32,12 @@ stdenv.mkDerivation (finalAttrs: { version cargoRoot ; - hash = "sha256-Aw/caE5Z5JxoKLEr2Dr2wq6cyFleNNwtKM1yXM8ZWmU="; + hash = "sha256-NbK++me/tOrl0MyxvyTIK9UWyR0jU3pkJ6c5sNjuY2M="; }; nativeBuildInputs = [ cargo gi-docgen - glib gobject-introspection meson ninja @@ -48,7 +46,6 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - glib json-glib ]; diff --git a/pkgs/by-name/li/libjpeg-tools/package.nix b/pkgs/by-name/li/libjpeg-tools/package.nix index 02b166817efe..53082642fc2d 100644 --- a/pkgs/by-name/li/libjpeg-tools/package.nix +++ b/pkgs/by-name/li/libjpeg-tools/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "A complete implementation of 10918-1 (JPEG) coming from jpeg.org (the ISO group) with extensions for HDR, lossless and alpha channel coding standardized as ISO/IEC 18477 (JPEG XT)"; homepage = "https://github.com/thorfdbg/libjpeg"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; changelog = "https://github.com/thorfdbg/libjpeg/README.history"; maintainers = with lib.maintainers; [ bcdarwin ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/li/libjpeg_turbo/package.nix b/pkgs/by-name/li/libjpeg_turbo/package.nix index 5156d1f87d5c..0181dabd9757 100644 --- a/pkgs/by-name/li/libjpeg_turbo/package.nix +++ b/pkgs/by-name/li/libjpeg_turbo/package.nix @@ -32,13 +32,13 @@ assert !(enableJpeg7 && enableJpeg8); # pick only one or none, not both stdenv.mkDerivation (finalAttrs: { pname = "libjpeg-turbo"; - version = "3.1.4"; + version = "3.1.4.1"; src = fetchFromGitHub { owner = "libjpeg-turbo"; repo = "libjpeg-turbo"; tag = finalAttrs.version; - hash = "sha256-mxmJejgUqS6OC0U0gHsHHe74X0MTVBY5OCbqxIyWa3Q="; + hash = "sha256-jBajigX4/j4jG11prTPeGkTVRrRzheFL/LxgnPufzb4="; }; patches = diff --git a/pkgs/by-name/li/libjxl/package.nix b/pkgs/by-name/li/libjxl/package.nix index ce50b109a961..c9bd4d79d174 100644 --- a/pkgs/by-name/li/libjxl/package.nix +++ b/pkgs/by-name/li/libjxl/package.nix @@ -31,18 +31,20 @@ in stdenv.mkDerivation rec { pname = "libjxl"; - version = "0.11.2"; + version = "0.12.0"; outputs = [ "out" + "bin" "dev" + "benchmark" ]; src = fetchFromGitHub { owner = "libjxl"; repo = "libjxl"; tag = "v${version}"; - hash = "sha256-L4/BY68ZBCpebQxryR7D1CxrsneYvw8B8EvW2mkF7bA="; + hash = "sha256-rJyvJo1ZveE1pvMErK9ilFQA0NXkD2ka93L+1gXeqf8="; # There are various submodules in `third_party/`. fetchSubmodules = true; }; @@ -67,7 +69,6 @@ stdenv.mkDerivation rec { # that the cmake build can apparently use: # OpenGL/GLUT (for Examples -> comparison with sjpeg) # viewer (see `cmakeFlags`) - # plugins like for GDK and GIMP (see `cmakeFlags`) # Vendored libraries: # `libjxl` currently vendors many libraries as git submodules that they @@ -125,7 +126,6 @@ stdenv.mkDerivation rec { ++ lib.optionals enablePlugins [ # Enable plugins, such as: # * the `gdk-pixbuf` one, which allows applications like `eog` to load jpeg-xl files - # * the `gimp` one, which allows GIMP to load jpeg-xl files "-DJPEGXL_ENABLE_PLUGINS=ON" ] ++ lib.optionals stdenv.hostPlatform.isStatic [ @@ -150,18 +150,22 @@ stdenv.mkDerivation rec { --replace 'sh$' 'sh( -e$|$)' ''; - postInstall = - lib.optionalString enablePlugins '' - GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ - GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ - gdk-pixbuf-query-loaders --update-cache - '' - # Cross-compiled gdk-pixbuf doesn't support thumbnailers - + lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) '' - mkdir -p "$out/bin" - makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \ - --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" - ''; + # Move `benchmark_xl` into a separate output to avoid a file collision + # with the `benchmark_xl` binary provided by `jpegli`. + postInstall = '' + moveToOutput "bin/benchmark_xl" "$benchmark" + '' + + lib.optionalString enablePlugins '' + GDK_PIXBUF_MODULEDIR="$out/${gdk-pixbuf.moduleDir}" \ + GDK_PIXBUF_MODULE_FILE="$out/${loadersPath}" \ + gdk-pixbuf-query-loaders --update-cache + '' + # Cross-compiled gdk-pixbuf doesn't support thumbnailers + + lib.optionalString (enablePlugins && stdenv.hostPlatform == stdenv.buildPlatform) '' + mkdir -p "$out/bin" + makeWrapper ${gdk-pixbuf}/bin/gdk-pixbuf-thumbnailer "$out/libexec/gdk-pixbuf-thumbnailer-jxl" \ + --set GDK_PIXBUF_MODULE_FILE "$out/${loadersPath}" + ''; env = lib.optionalAttrs stdenv.hostPlatform.isAarch32 { CXXFLAGS = "-mfp16-format=ieee"; diff --git a/pkgs/by-name/li/libkrun-efi/package.nix b/pkgs/by-name/li/libkrun-efi/package.nix index 2ab20562e614..7f601db24457 100644 --- a/pkgs/by-name/li/libkrun-efi/package.nix +++ b/pkgs/by-name/li/libkrun-efi/package.nix @@ -20,13 +20,13 @@ withGpu ? true, }: let - version = "1.18.0"; + version = "1.19.3"; src = fetchFromGitHub { - owner = "containers"; + owner = "libkrun"; repo = "libkrun"; tag = "v${version}"; - hash = "sha256-R7q52ZwiL9JsGofLPhXVTk/eH6bEob3DoZe21PHSBrU="; + hash = "sha256-mDko5fRcjnb3BI6cINr4gm6DiCghUlkIn1ZiQeHxyaE="; }; virglrenderer = stdenv.mkDerivation (finalAttrs: { @@ -77,7 +77,7 @@ let buildPhase = '' runHook preBuild - cd init + cd src/init_blob/init $CC -O2 -static -Wall -o init init.c dhcp.c runHook postBuild ''; @@ -100,7 +100,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit src; - hash = "sha256-3IAEWF+XGeKnb61SUpuVHMPiX6q0FgQFN4/eOBCH80c="; + hash = "sha256-PE8xO8T5TFuGnL+95Y1BAz9EdJVUrxgVtVssAgStW+8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libkrun/package.nix b/pkgs/by-name/li/libkrun/package.nix index fb413d835be4..ba4641449d8f 100644 --- a/pkgs/by-name/li/libkrun/package.nix +++ b/pkgs/by-name/li/libkrun/package.nix @@ -13,6 +13,7 @@ pipewire, virglrenderer, libkrunfw, + nix-update-script, rustc, withBlk ? false, withNet ? false, @@ -34,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libkrun" + lib.optionalString (variant != null) "-${variant}"; - version = "1.18.1"; + version = "1.19.0"; src = fetchFromGitHub { owner = "libkrun"; repo = "libkrun"; tag = "v${finalAttrs.version}"; - hash = "sha256-JXbCDByrWhmcEqwREX/kgVAtS4K8blfpjknTdJwQCLo="; + hash = "sha256-g4u34sGdgv6mRRry9b5TAXSx+pmVwCNSD3YNtr6qRxo="; }; outputs = [ @@ -50,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; - hash = "sha256-dfIe2pl957MRcY1hIv6wPPX/4He+ou+eCZLbylVeGAE="; + hash = "sha256-rxdaqEKDDMxFwRuX6kLhqGyFXJTz+Bx4mJJhYL5nPgU="; }; # Make sure libkrunfw can be found by dlopen() @@ -104,6 +105,10 @@ stdenv.mkDerivation (finalAttrs: { env.OPENSSL_NO_VENDOR = true; + passthru.updateScript = nix-update-script { + attrPath = "libkrun"; + }; + meta = { description = "Dynamic library providing Virtualization-based process isolation capabilities"; homepage = "https://github.com/libkrun/libkrun"; diff --git a/pkgs/by-name/li/libkrunfw/package.nix b/pkgs/by-name/li/libkrunfw/package.nix index c9598b861dcd..dedd6c90d58d 100644 --- a/pkgs/by-name/li/libkrunfw/package.nix +++ b/pkgs/by-name/li/libkrunfw/package.nix @@ -19,15 +19,16 @@ assert lib.elem variant [ "tdx" ]; -let +stdenv.mkDerivation (finalAttrs: { + pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; + version = "5.5.0"; + kernelSrc = fetchurl { url = "mirror://kernel/linux/kernel/v6.x/linux-6.12.91.tar.xz"; hash = "sha256-D/KrnhafnxlIVXRx+7RQ0wGPjFt3yvKI4aOYJYJZeWk="; }; -in -stdenv.mkDerivation (finalAttrs: { - pname = "libkrunfw" + lib.optionalString (variant != null) "-${variant}"; - version = "5.5.0"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "libkrun"; @@ -38,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' substituteInPlace Makefile \ - --replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${kernelSrc} $(KERNEL_TARBALL)' + --replace-fail 'curl $(KERNEL_REMOTE) -o $(KERNEL_TARBALL)' 'ln -s ${finalAttrs.kernelSrc} $(KERNEL_TARBALL)' ''; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libksba/package.nix b/pkgs/by-name/li/libksba/package.nix index 97736060a1ac..8ea24155784d 100644 --- a/pkgs/by-name/li/libksba/package.nix +++ b/pkgs/by-name/li/libksba/package.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libksba"; - version = "1.6.7"; + version = "1.8.0"; src = fetchurl { url = "mirror://gnupg/libksba/libksba-${finalAttrs.version}.tar.bz2"; - hash = "sha256-z3JRC467TrZpPu92V0nYNnegPHkpGjEQQKW/15uqt2M="; + hash = "sha256-KWuduQlXSfKqEEIC16t/0JrRBxDgB4CnCcl1SxodkpI="; }; outputs = [ diff --git a/pkgs/by-name/li/libldac-dec/package.nix b/pkgs/by-name/li/libldac-dec/package.nix deleted file mode 100644 index 89fa401ea258..000000000000 --- a/pkgs/by-name/li/libldac-dec/package.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, -}: - -stdenv.mkDerivation (finalAttrs: { - pname = "libldac-dec"; - version = "2.0.72"; - - src = fetchFromGitHub { - owner = "open-vela"; - repo = "external_libldac"; - rev = "5b4bf66096ba0d69615efb2422ba3d023c34c2fd"; - hash = "sha256-5jeqTyhSBtYky15Xw1lIbUxeGZMQQQdM/EQUFicyi3Y="; - }; - - outputs = [ - "out" - "dev" - ]; - - env.NIX_CFLAGS_COMPILE = "-O2 -fPIC -Wall -D_DECODE_ONLY -Iinc -Isrc"; - - # Verify finalAttrs.version matches LDACBT_LIB_VER_* in upstream source. - # Guards against silent version drift when the pinned commit changes. - preBuild = '' - awk -v want=${finalAttrs.version} ' - /^#define LDACBT_LIB_VER_/ { v = v sep ($3+0); sep = "." } - END { - if (v != want) { print "version mismatch: package says " want ", source reports " v > "/dev/stderr"; exit 1 } - } - ' src/ldacBT_api.c - ''; - - # Upstream ships AOSP build files and a gcc/ makefile that only knows - # about the in-tree layout. Compile and link directly; the entire - # library is two umbrella translation units. - buildPhase = '' - runHook preBuild - - soname=libldacBT_dec.so.${lib.versions.major finalAttrs.version} - sofile=libldacBT_dec.so.${finalAttrs.version} - - $CC -shared -Wl,-soname,$soname src/ldaclib.c src/ldacBT.c -lm -o $sofile - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - install -Dm644 -t $out/lib $sofile - ln -s $sofile $out/lib/$soname - ln -s $sofile $out/lib/libldacBT_dec.so - - install -Dm644 inc/ldacBT.h $dev/include/ldac/ldacBT.h - - mkdir -p $dev/lib/pkgconfig - cat > $dev/lib/pkgconfig/ldacBT-dec.pc < -+#include - --#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) -+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) - - /* FNV hash'es lifted from Dustin Sallings work */ - static uint64_t FNV_64_INIT= 0xcbf29ce484222325; -diff --git a/libhashkit/has.cc b/libhashkit/has.cc -index 843e32e..4153e5e 100644 ---- a/libhashkit/has.cc -+++ b/libhashkit/has.cc -@@ -37,6 +37,7 @@ - - - #include -+#include - - bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) - { -@@ -44,7 +45,7 @@ bool libhashkit_has_algorithm(const hashkit_hash_algorithm_t algo) - { - case HASHKIT_HASH_FNV1_64: - case HASHKIT_HASH_FNV1A_64: --#if __WORDSIZE == 64 && defined(HAVE_FNV64_HASH) -+#if (LONG_BITS == 64) && defined(HAVE_FNV64_HASH) - return true; - #else - return false; -diff --git a/libtest/cmdline.cc b/libtest/cmdline.cc -index 29a22de..161c646 100644 ---- a/libtest/cmdline.cc -+++ b/libtest/cmdline.cc -@@ -61,7 +61,7 @@ using namespace libtest; - #include - #include - --#ifndef __USE_GNU -+#ifndef _GNU_SOURCE - static char **environ= NULL; - #endif - -@@ -201,7 +201,7 @@ Application::error_t Application::run(const char *args[]) - - fatal_assert(posix_spawnattr_setsigmask(&spawnattr, &mask) == 0); - --#if defined(POSIX_SPAWN_USEVFORK) || defined(__linux__) -+#if defined(POSIX_SPAWN_USEVFORK) || defined(__GLIBC__) - // Use USEVFORK on linux - flags |= POSIX_SPAWN_USEVFORK; - #endif diff --git a/pkgs/by-name/li/libmemcached/package.nix b/pkgs/by-name/li/libmemcached/package.nix index dfcd86d022de..9a4553d22000 100644 --- a/pkgs/by-name/li/libmemcached/package.nix +++ b/pkgs/by-name/li/libmemcached/package.nix @@ -1,41 +1,66 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, fetchpatch, + bison, + cmake, + flex, cyrus_sasl, libevent, + ctestCheckHook, + memcached, }: stdenv.mkDerivation (finalAttrs: { pname = "libmemcached"; - version = "1.0.18"; + version = "1.1.4"; - src = fetchurl { - url = "https://launchpad.net/libmemcached/${lib.versions.majorMinor finalAttrs.version}/${finalAttrs.version}/+download/libmemcached-${finalAttrs.version}.tar.gz"; - sha256 = "10jzi14j32lpq0if0p9vygcl2c1352hwbywzvr9qzq7x6aq0nb72"; + src = fetchFromGitHub { + owner = "awesomized"; + repo = "libmemcached"; + tag = finalAttrs.version; + hash = "sha256-jEw6L2/139oo4sGprl9Xp0DTarxAK1bEF2ak2kHWSAs="; }; - # Fix linking against libpthread (patch from Fedora) - # https://bugzilla.redhat.com/show_bug.cgi?id=1037707 - # https://bugs.launchpad.net/libmemcached/+bug/1281907 - # Fix building on macOS (patch from Homebrew) - # https://bugs.launchpad.net/libmemcached/+bug/1245562 - patches = - lib.optional stdenv.hostPlatform.isLinux ./libmemcached-fix-linking-with-libpthread.patch - ++ lib.optional stdenv.hostPlatform.isDarwin (fetchpatch { - url = "https://raw.githubusercontent.com/Homebrew/homebrew/bfd4a0a4626b61c2511fdf573bcbbc6bbe86340e/Library/Formula/libmemcached.rb"; - sha256 = "1gjf3vd7hiyzxjvlg2zfc3y2j0lyr6nhbws4xb5dmin3csyp8qb8"; + patches = [ + (fetchpatch { + name = "libcxx-compat.patch"; + url = "https://github.com/awesomized/libmemcached/commit/547460c12287a34a5993045157a0e13e14203f92.patch"; + includes = [ "test/lib/random.cpp" ]; + hash = "sha256-aH51O4UM3M4yzTtC8bTy+6NKrtPfgqysrvspMZ/gWDc="; }) - ++ lib.optional stdenv.hostPlatform.isMusl ./musl-fixes.patch; + ]; + + nativeBuildInputs = [ + bison + cmake + flex + ]; + + cmakeFlags = [ + (lib.cmakeBool "BUILD_TESTING" finalAttrs.finalPackage.doCheck) + "-DENABLE_SASL=ON" + ]; buildInputs = [ libevent ]; propagatedBuildInputs = [ cyrus_sasl ]; - env.NIX_CFLAGS_COMPILE = "-fpermissive"; + doCheck = true; + + nativeCheckInputs = [ + ctestCheckHook + memcached + ]; + + disabledTests = [ + "bin/memcapable" + "memcached_regression_lp583031" + ]; meta = { - homepage = "https://libmemcached.org"; + homepage = "https://github.com/awesomized/libmemcached"; + changelog = "https://github.com/awesomized/libmemcached/blob/${finalAttrs.src.tag}/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; description = "Open source C/C++ client library and tools for the memcached server"; license = lib.licenses.bsd3; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/li/libmirage/package.nix b/pkgs/by-name/li/libmirage/package.nix index f45a1342ab26..107ad7a7418e 100644 --- a/pkgs/by-name/li/libmirage/package.nix +++ b/pkgs/by-name/li/libmirage/package.nix @@ -6,12 +6,17 @@ vala, glib, libsndfile, + flac, + libogg, + libvorbis, + libopus, zlib, bzip2, xz, libsamplerate, + libgcrypt, + libgpg-error, intltool, - pcre, util-linux, libselinux, libsepol, @@ -22,11 +27,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmirage"; - version = "3.3.1"; + version = "3.3.2"; src = fetchurl { url = "mirror://sourceforge/cdemu/libmirage-${finalAttrs.version}.tar.xz"; - hash = "sha256-mstOGdmKJXRUrQA5F1DZGqVuY+f25Q5ZpdOXPx4MZRI="; + hash = "sha256-wMAzJpEue1QnDllWheFk3ZX+8pSkYw13s+GU0G/AOfs="; }; env = { @@ -37,10 +42,15 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ glib libsndfile + flac + libogg + libvorbis zlib bzip2 xz libsamplerate + libgcrypt + libgpg-error ]; nativeBuildInputs = [ @@ -52,7 +62,6 @@ stdenv.mkDerivation (finalAttrs: { ]; propagatedBuildInputs = [ - pcre util-linux libselinux libsepol diff --git a/pkgs/by-name/li/libmodbus/package.nix b/pkgs/by-name/li/libmodbus/package.nix index de1ce0718503..fea94ba5b2e3 100644 --- a/pkgs/by-name/li/libmodbus/package.nix +++ b/pkgs/by-name/li/libmodbus/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmodbus"; - version = "3.1.12"; + version = "3.2.0"; src = fetchFromGitHub { owner = "stephane"; repo = "libmodbus"; rev = "v${finalAttrs.version}"; - hash = "sha256-DqR0E8ODZFGDx3r92XS+rLRqPD55yOi+NhU0gMRK7KY="; + hash = "sha256-eGbgQpXBHxVnXRQKzzF2zfSVlaQNTu1CwrU0ZxaqA3Y="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/li/libmodsecurity/package.nix b/pkgs/by-name/li/libmodsecurity/package.nix index 0725a6a29569..5224f7f6e81b 100644 --- a/pkgs/by-name/li/libmodsecurity/package.nix +++ b/pkgs/by-name/li/libmodsecurity/package.nix @@ -12,7 +12,6 @@ libxml2, lmdb, lua, - pcre, pcre2, ssdeep, yajl, @@ -37,6 +36,7 @@ stdenv.mkDerivation (finalAttrs: { flex pkg-config ]; + buildInputs = [ curl geoip @@ -44,7 +44,6 @@ stdenv.mkDerivation (finalAttrs: { libxml2 lmdb lua - pcre pcre2 ssdeep yajl @@ -58,34 +57,15 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-parser-generation" "--disable-doxygen-doc" - "--with-curl=${curl.dev}" - "--with-libxml=${libxml2.dev}" - "--with-lmdb=${lmdb.out}" - "--with-maxmind=${libmaxminddb}" - "--with-pcre=${pcre.dev}" - "--with-pcre2=${pcre2.out}" + "--disable-examples" + "--with-lmdb=${lmdb}" "--with-ssdeep=${ssdeep}" ]; postPatch = '' - substituteInPlace build/lmdb.m4 \ - --replace "\''${path}/include/lmdb.h" "${lmdb.dev}/include/lmdb.h" \ - --replace "lmdb_inc_path=\"\''${path}/include\"" "lmdb_inc_path=\"${lmdb.dev}/include\"" - substituteInPlace build/pcre2.m4 \ - --replace "/usr/local/pcre2" "${pcre2.out}/lib" \ - --replace "\''${path}/include/pcre2.h" "${pcre2.dev}/include/pcre2.h" \ - --replace "pcre2_inc_path=\"\''${path}/include\"" "pcre2_inc_path=\"${pcre2.dev}/include\"" - substituteInPlace build/ssdeep.m4 \ - --replace "/usr/local/libfuzzy" "${ssdeep}/lib" \ - --replace "\''${path}/include/fuzzy.h" "${ssdeep}/include/fuzzy.h" \ - --replace "ssdeep_inc_path=\"\''${path}/include\"" "ssdeep_inc_path=\"${ssdeep}/include\"" - substituteInPlace modsecurity.conf-recommended \ - --replace "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127" - # https://github.com/owasp-modsecurity/ModSecurity/blob/v3.0.15/build.sh#L6-L25 - cd src - echo "noinst_HEADERS = \\" > headers.mk - ls -1 \ + echo "noinst_HEADERS = \\" > ./src/headers.mk + ls -1 ./src/ \ actions/*.h \ actions/ctl/*.h \ actions/data/*.h \ @@ -100,8 +80,10 @@ stdenv.mkDerivation (finalAttrs: { utils/*.h \ variables/*.h \ engine/*.h \ - *.h | tr "\012" " " >> headers.mk - cd ../ + *.h | tr "\012" " " >> ./src/headers.mk + + substituteInPlace modsecurity.conf-recommended \ + --replace-fail "SecUnicodeMapFile unicode.mapping 20127" "SecUnicodeMapFile $out/share/modsecurity/unicode.mapping 20127" ''; postInstall = '' diff --git a/pkgs/by-name/li/libmpc/package.nix b/pkgs/by-name/li/libmpc/package.nix index 35328cc0023c..908ff90ff44a 100644 --- a/pkgs/by-name/li/libmpc/package.nix +++ b/pkgs/by-name/li/libmpc/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmpc"; - version = "1.4.0"; # to avoid clash with the MPD client + version = "1.4.1"; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${finalAttrs.version}.tar.xz"; - hash = "sha256-MhCzpUaxywDClso2CJHXdA7m/wbesCono1sgzTwLsaU="; + hash = "sha256-kSBM0y8WS9O3yZLUpqjOZRlRGq2rMPeLaYLQv41z6TE="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libmpdclient/package.nix b/pkgs/by-name/li/libmpdclient/package.nix index eb80534dbfe3..48ae8a2a6df4 100644 --- a/pkgs/by-name/li/libmpdclient/package.nix +++ b/pkgs/by-name/li/libmpdclient/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client library for MPD (music player daemon)"; homepage = "https://www.musicpd.org/libs/libmpdclient/"; changelog = "https://raw.githubusercontent.com/MusicPlayerDaemon/libmpdclient/${finalAttrs.src.rev}/NEWS"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libmspub/package.nix b/pkgs/by-name/li/libmspub/package.nix index 22f02740cd15..d657f7cd3bc6 100644 --- a/pkgs/by-name/li/libmspub/package.nix +++ b/pkgs/by-name/li/libmspub/package.nix @@ -12,11 +12,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libmspub"; - version = "0.1.4"; + version = "0.1.5"; src = fetchzip { url = "https://dev-www.libreoffice.org/src/libmspub/libmspub-${finalAttrs.version}.tar.xz"; - hash = "sha256-/6e9IGcTIZTlnsakOaSjTn3DsO9ZNQigdCCbMbrBTQE="; + hash = "sha256-1At2aFAdPeoDKcsrv1hpZ1Eig0//tc3jaRpg1qn14xI="; }; nativeBuildInputs = [ pkg-config ]; @@ -43,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { + changelog = "https://git.libreoffice.org/libmspub/+/refs/tags/libmspub-${finalAttrs.version}/NEWS"; description = "Microsoft Publisher import library"; homepage = "https://wiki.documentfoundation.org/DLP/Libraries/libmspub"; license = lib.licenses.mpl20; diff --git a/pkgs/by-name/li/libmt32emu/package.nix b/pkgs/by-name/li/libmt32emu/package.nix index f1e9ee748a0b..85f3fbe184f4 100644 --- a/pkgs/by-name/li/libmt32emu/package.nix +++ b/pkgs/by-name/li/libmt32emu/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmt32emu"; - version = "2.8.2"; + version = "2.8.3"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; tag = "libmt32emu_${lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version}"; - hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do="; + hash = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8="; }; outputs = [ @@ -95,7 +95,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://munt.sourceforge.net/"; description = "Library to emulate Roland MT-32, CM-32L, CM-64 and LAPC-I devices"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.unix; # Not tested on ReactOS yet :) }; diff --git a/pkgs/by-name/li/libmwaw/package.nix b/pkgs/by-name/li/libmwaw/package.nix index ed8cbd789a33..08a3c8fe05b4 100644 --- a/pkgs/by-name/li/libmwaw/package.nix +++ b/pkgs/by-name/li/libmwaw/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "libmwaw"; - version = "0.3.22"; + version = "0.3.23"; src = fetchurl { url = "mirror://sourceforge/libmwaw/libmwaw/libmwaw-${finalAttrs.version}/libmwaw-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-oaOf/Oo/8qenquDCOHfd9JGLVUv4Kw3l186Of2HqjjI="; + sha256 = "sha256-rDWQ9pGikE64x9yLdXuKKfEl9ZJEnkIUWa6PqSizmes="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/libnabo/package.nix b/pkgs/by-name/li/libnabo/package.nix index 1a23395da88e..ee9d4ced347a 100644 --- a/pkgs/by-name/li/libnabo/package.nix +++ b/pkgs/by-name/li/libnabo/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnabo"; src = fetchFromGitHub { - owner = "ethz-asl"; + owner = "norlab-ulaval"; repo = "libnabo"; rev = finalAttrs.version; sha256 = "sha256-/XXRwiLLaEvp+Q+c6lBiuWBb9by6o0pDf8wFtBNp7o8="; diff --git a/pkgs/by-name/li/libnbd/package.nix b/pkgs/by-name/li/libnbd/package.nix index f16c78c48c10..ce9602bb72ab 100644 --- a/pkgs/by-name/li/libnbd/package.nix +++ b/pkgs/by-name/li/libnbd/package.nix @@ -10,7 +10,6 @@ ocamlPackages, python3, libxml2, - fuse, fuse3, gnutls, autoreconfHook, @@ -41,7 +40,6 @@ stdenv.mkDerivation rec { ); buildInputs = [ - fuse fuse3 gnutls libxml2 diff --git a/pkgs/by-name/li/libndtypes/package.nix b/pkgs/by-name/li/libndtypes/package.nix index 07ec9eb8a49d..dc7157bfb550 100644 --- a/pkgs/by-name/li/libndtypes/package.nix +++ b/pkgs/by-name/li/libndtypes/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "xnd-project"; - repo = "ndtypes"; + repo = "libndtypes"; rev = "3ce6607c96d8fe67b72cc0c97bf595620cdd274e"; sha256 = "18303q0jfar1lmi4krp94plczb455zcgw772f9lb8xa5p0bkhx01"; }; diff --git a/pkgs/by-name/li/libnet/package.nix b/pkgs/by-name/li/libnet/package.nix index 298c0ecf7e2b..19357da19882 100644 --- a/pkgs/by-name/li/libnet/package.nix +++ b/pkgs/by-name/li/libnet/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.3"; src = fetchFromGitHub { - owner = "sam-github"; + owner = "libnet"; repo = "libnet"; rev = "v${finalAttrs.version}"; hash = "sha256-P3LaDMMNPyEnA8nO1Bm7H0mW/hVBr0cFdg+p2JmWcGI="; @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/sam-github/libnet"; + homepage = "https://github.com/libnet/libnet"; description = "Portable framework for low-level network packet construction"; mainProgram = "libnet-config"; license = lib.licenses.bsd3; diff --git a/pkgs/by-name/li/libnfs/package.nix b/pkgs/by-name/li/libnfs/package.nix index 305b95a852f1..60c527970028 100644 --- a/pkgs/by-name/li/libnfs/package.nix +++ b/pkgs/by-name/li/libnfs/package.nix @@ -2,38 +2,24 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, - autoreconfHook, + cmake, }: stdenv.mkDerivation (finalAttrs: { pname = "libnfs"; - version = "5.0.2"; + version = "6.0.2"; src = fetchFromGitHub { owner = "sahlberg"; repo = "libnfs"; - rev = "libnfs-${finalAttrs.version}"; - sha256 = "sha256-rdxi5bPXHTICZQIj/CmHgZ/V70svnITJj/OSF4mmC3o="; + tag = "libnfs-${finalAttrs.version}"; + hash = "sha256-uD7PtW2rcpGVzqD6U0DXK1gUaCKlKh+p+i6CW6jLGdw="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ cmake ]; - patches = [ - # Fixes 100% CPU usage in multi-threaded mode - (fetchpatch { - url = "https://github.com/sahlberg/libnfs/commit/34d6fe37e986da5b0ced86cd028a88e482537d5a.patch"; - sha256 = "sha256-i7mi+TVdkLb4MztT5Ic/Q8XBIWk9lo8v5bNjHOr6LaI="; - }) - # Fixes deprecation warnings on macOS - (fetchpatch { - url = "https://github.com/sahlberg/libnfs/commit/f6631c54a7b0385988f11357bf96728a6d7345b9.patch"; - sha256 = "sha256-xLRZ9J1vr04n//gNv9ljUBt5LHUGBRRVIXJCMlFbHFI="; - }) - ]; - - configureFlags = [ - "--enable-pthread" + cmakeFlags = [ + "-DENABLE_MULTITHREADING=ON" ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libnghttp2_asio/package.nix b/pkgs/by-name/li/libnghttp2_asio/package.nix index 152d8c0615f6..693716a7920d 100644 --- a/pkgs/by-name/li/libnghttp2_asio/package.nix +++ b/pkgs/by-name/li/libnghttp2_asio/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { OpenSSL. libnghttp2_asio provides both client and server APIs. ''; homepage = "https://github.com/nghttp2/nghttp2-asio"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ izorkin ]; }; } diff --git a/pkgs/by-name/li/libnice/musl.patch b/pkgs/by-name/li/libnice/musl.patch new file mode 100644 index 000000000000..bf5c2a890bbd --- /dev/null +++ b/pkgs/by-name/li/libnice/musl.patch @@ -0,0 +1,178 @@ +From a7310137cf09e382e2642e39d4ade88942d564c3 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Fri, 19 Jun 2026 17:21:47 +0200 +Subject: [PATCH 1/3] tests: treat Glibc-style sendmmsg as default case + +As requested. + +Link: https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/353#note_3526962 +Signed-off-by: Alyssa Ross +--- + tests/instrument-send.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/tests/instrument-send.c b/tests/instrument-send.c +index 3f79de87..65576dea 100644 +--- a/tests/instrument-send.c ++++ b/tests/instrument-send.c +@@ -190,23 +190,23 @@ sendmsg (int sockfd, const struct msghdr *msg, int flags) + } + } + +-#ifndef __FreeBSD__ +-int +-sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags) +-#else ++#ifdef __FreeBSD__ + ssize_t + sendmmsg (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags) ++#else ++int ++sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags) + #endif + { + if (should_inject_ewouldblock ()) { + errno = EWOULDBLOCK; + return -1; + } else { +-#ifndef __FreeBSD__ +- int ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags)) ( ++#ifdef __FreeBSD__ ++ ssize_t ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags)) ( + dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); + #else +- ssize_t ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags)) ( ++ int ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags)) ( + dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); + #endif + if (ret != -1) { +-- +GitLab + + +From 145c542b442f4deb89e1cc8bb92e1ca02456f918 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Mon, 15 Jun 2026 17:54:12 +0200 +Subject: [PATCH 2/3] tests: check sendmmsg prototype in Meson + +Checking the actual prototype we have rather than using hardcoded libc +checks improves portability by being compatible with libcs that aren't +explictly handled, but use the same prototype as a known libc. For +example, uClibc-ng uses the same prototype as FreeBSD, but wouldn't +have been caught be the __FreeBSD__ check. +--- + tests/instrument-send.c | 4 ++-- + tests/meson.build | 18 +++++++++++++++++- + 2 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/tests/instrument-send.c b/tests/instrument-send.c +index 65576dea..9903619a 100644 +--- a/tests/instrument-send.c ++++ b/tests/instrument-send.c +@@ -190,7 +190,7 @@ sendmsg (int sockfd, const struct msghdr *msg, int flags) + } + } + +-#ifdef __FreeBSD__ ++#if defined(HAVE_FREEBSD_STYLE_SENDMMSG) + ssize_t + sendmmsg (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags) + #else +@@ -202,7 +202,7 @@ sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags) + errno = EWOULDBLOCK; + return -1; + } else { +-#ifdef __FreeBSD__ ++#if defined(HAVE_FREEBSD_STYLE_SENDMMSG) + ssize_t ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags)) ( + dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); + #else +diff --git a/tests/meson.build b/tests/meson.build +index 7a4ce651..29888c29 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -102,9 +102,25 @@ if gst_dep.found() and not static_build + ] + gst_env = environment() + dl_dep = cc.find_library('dl') ++ ++ instrument_send_lib_c_args = ['-DG_LOG_DOMAIN="libnice-instrument-send"'] ++ if cc.compiles(''' ++ #include ++ static int (*f) (int, struct mmsghdr *, unsigned int, int) = &sendmmsg; ++ ''', args: ['-D_GNU_SOURCE', '-Werror=incompatible-pointer-types'], name: 'Glibc-style sendmmsg') ++ # We consider this the default. ++ elif cc.compiles(''' ++ #include ++ static ssize_t (*f) (int, struct mmsghdr *, size_t, int) = &sendmmsg; ++ ''', args: ['-D_GNU_SOURCE', '-Werror=incompatible-pointer-types'], name: 'FreeBSD-style sendmmsg') ++ instrument_send_lib_c_args += ['-DHAVE_FREEBSD_STYLE_SENDMMSG'] ++ else ++ error('sendmmsg not present or has unknown prototype') ++ endif ++ + instrument_send_lib = shared_library('instrument-send', + 'instrument-send.c', +- c_args: '-DG_LOG_DOMAIN="libnice-instrument-send"', ++ c_args: instrument_send_lib_c_args, + dependencies: [dl_dep, gio_deps], + ) + gst_env.append('LD_PRELOAD', instrument_send_lib.full_path()) +-- +GitLab + + +From 4565af6fe9fe01164b072710ad18e537608d3a40 Mon Sep 17 00:00:00 2001 +From: Alyssa Ross +Date: Wed, 17 Jun 2026 11:53:11 +0200 +Subject: [PATCH 3/3] tests: support NetBSD/musl-style sendmmsg + +Fixes compilation for these platforms. +--- + tests/instrument-send.c | 6 ++++++ + tests/meson.build | 5 +++++ + 2 files changed, 11 insertions(+) + +diff --git a/tests/instrument-send.c b/tests/instrument-send.c +index 9903619a..20c02b30 100644 +--- a/tests/instrument-send.c ++++ b/tests/instrument-send.c +@@ -193,6 +193,9 @@ sendmsg (int sockfd, const struct msghdr *msg, int flags) + #if defined(HAVE_FREEBSD_STYLE_SENDMMSG) + ssize_t + sendmmsg (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags) ++#elif defined(HAVE_NETBSD_STYLE_SENDMMSG) ++int ++sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags) + #else + int + sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags) +@@ -205,6 +208,9 @@ sendmmsg (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags) + #if defined(HAVE_FREEBSD_STYLE_SENDMMSG) + ssize_t ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, size_t vlen, int flags)) ( + dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); ++#elif defined(HAVE_NETBSD_STYLE_SENDMMSG) ++ int ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, unsigned int flags)) ( ++ dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); + #else + int ret = ((int (*) (int sockfd, struct mmsghdr *msgvec, unsigned int vlen, int flags)) ( + dlsym (RTLD_NEXT, "sendmmsg"))) (sockfd, msgvec, vlen, flags); +diff --git a/tests/meson.build b/tests/meson.build +index 29888c29..3827dc2b 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -114,6 +114,11 @@ if gst_dep.found() and not static_build + static ssize_t (*f) (int, struct mmsghdr *, size_t, int) = &sendmmsg; + ''', args: ['-D_GNU_SOURCE', '-Werror=incompatible-pointer-types'], name: 'FreeBSD-style sendmmsg') + instrument_send_lib_c_args += ['-DHAVE_FREEBSD_STYLE_SENDMMSG'] ++ elif cc.compiles(''' ++ #include ++ static int (*f) (int, struct mmsghdr *, unsigned int, unsigned int) = &sendmmsg; ++ ''', args: ['-D_GNU_SOURCE', '-Werror=incompatible-pointer-types'], name: 'NetBSD-style sendmmsg') ++ instrument_send_lib_c_args += ['-DHAVE_NETBSD_STYLE_SENDMMSG'] + else + error('sendmmsg not present or has unknown prototype') + endif +-- +GitLab + diff --git a/pkgs/by-name/li/libnice/package.nix b/pkgs/by-name/li/libnice/package.nix index 6d2361b25d2e..8551229f2208 100644 --- a/pkgs/by-name/li/libnice/package.nix +++ b/pkgs/by-name/li/libnice/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchurl, + fetchpatch, meson, ninja, pkg-config, @@ -19,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libnice"; - version = "0.1.22"; + version = "0.1.23"; outputs = [ "bin" @@ -30,13 +31,24 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://libnice.freedesktop.org/releases/libnice-${finalAttrs.version}.tar.gz"; - hash = "sha256-pfckzwnq5QxBp1FxQdidpKYeyerKMtpKAHP67VQXrX4="; + hash = "sha256-YY/E6N45O3GbFkHB2O7AGCbU050VrekmedIhx/Xk5w0="; }; patches = [ # Bumps the gupnp_igd_dep version requested to 1.6 # https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/255 ./gupnp-igd-bump.patch + ] + # TODO: investigate what's wrong + ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ + (fetchpatch { + name = "freebsd.patch"; + url = "https://gitlab.freedesktop.org/libnice/libnice/-/commit/479f0813a571ff035bf00de679db452a0441125b.patch"; + hash = "sha256-rr8pAb8TjU85jYWUjsMMKkLxxXVE3B+IjfAyOw9suo0="; + }) + + # https://gitlab.freedesktop.org/libnice/libnice/-/merge_requests/353 + ./musl.patch ]; nativeBuildInputs = [ @@ -75,6 +87,7 @@ stdenv.mkDerivation (finalAttrs: { doCheck = false; meta = { + changelog = "https://gitlab.freedesktop.org/libnice/libnice/-/blob/${finalAttrs.version}/NEWS"; description = "GLib ICE implementation"; longDescription = '' Libnice is an implementation of the IETF's Interactice Connectivity diff --git a/pkgs/by-name/li/libnitrokey/package.nix b/pkgs/by-name/li/libnitrokey/package.nix index 4af4e213392e..763806ab3e33 100644 --- a/pkgs/by-name/li/libnitrokey/package.nix +++ b/pkgs/by-name/li/libnitrokey/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ panicgh - raitobezarius ]; }; }) diff --git a/pkgs/by-name/li/libnvme/package.nix b/pkgs/by-name/li/libnvme/package.nix index f58a2d176c04..aaa5214ad200 100644 --- a/pkgs/by-name/li/libnvme/package.nix +++ b/pkgs/by-name/li/libnvme/package.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation (finalAttrs: { description = "C Library for NVM Express on Linux"; homepage = "https://github.com/linux-nvme/libnvme"; maintainers = with lib.maintainers; [ vifino ]; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/li/libodb-sqlite/package.nix b/pkgs/by-name/li/libodb-sqlite/package.nix index 28a42f053e64..4b9bfd1b7d48 100644 --- a/pkgs/by-name/li/libodb-sqlite/package.nix +++ b/pkgs/by-name/li/libodb-sqlite/package.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libodb-sqlite"; - version = "2.5.0-b.27"; + version = "2.5.0"; outputs = [ "out" @@ -19,8 +19,8 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchurl { - url = "https://pkg.cppget.org/1/beta/odb/libodb-sqlite-${finalAttrs.version}.tar.gz"; - hash = "sha256-jpxtY/VMkh88IzqGYgedu5TZGVIbPpy/FZNvUaOMf+w="; + url = "https://pkg.cppget.org/1/stable/odb/libodb-sqlite-${finalAttrs.version}.tar.gz"; + hash = "sha256-soq3OpAlVLum65um9MkJnR4Vgm3nofpPumRRpBCFb70="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libodb/package.nix b/pkgs/by-name/li/libodb/package.nix index fc513eeebc23..90a42db2b0eb 100644 --- a/pkgs/by-name/li/libodb/package.nix +++ b/pkgs/by-name/li/libodb/package.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libodb"; - version = "2.5.0-b.27"; + version = "2.5.0"; outputs = [ "out" @@ -17,8 +17,8 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchurl { - url = "https://pkg.cppget.org/1/beta/odb/libodb-${finalAttrs.version}.tar.gz"; - hash = "sha256-04Et/wHYsWvJPLlcL0J2iOPV2SBFC6J32EleGw38K2Q="; + url = "https://pkg.cppget.org/1/stable/odb/libodb-${finalAttrs.version}.tar.gz"; + hash = "sha256-cAA4pzxsvq0BESmxUDC3zdP3NRC2h/LEUEgI30IwRBs="; }; nativeBuildInputs = [ build2 ]; diff --git a/pkgs/by-name/li/libopenmpt/package.nix b/pkgs/by-name/li/libopenmpt/package.nix index 0e7f01d0fe84..2cccd04d27e6 100644 --- a/pkgs/by-name/li/libopenmpt/package.nix +++ b/pkgs/by-name/li/libopenmpt/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libopenmpt"; - version = "0.8.6"; + version = "0.8.7"; outputs = [ "out" @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://lib.openmpt.org/files/libopenmpt/src/libopenmpt-${finalAttrs.version}+release.autotools.tar.gz"; - hash = "sha256-yqL6lZ44n0N02eLfOvXGM0UsEt2ARCy6LonLf/K5PFs="; + hash = "sha256-J1wp70e+mZL2KjX8yW98oFwG0v0FySmLje6fdD91sIk="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/libopenshot-audio/package.nix b/pkgs/by-name/li/libopenshot-audio/package.nix index 7288bf804841..b8816e679f1c 100644 --- a/pkgs/by-name/li/libopenshot-audio/package.nix +++ b/pkgs/by-name/li/libopenshot-audio/package.nix @@ -66,7 +66,7 @@ stdenv.mkDerivation (finalAttrs: { high-quality editing and playback of audio, and is based on the amazing JUCE library. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libopenshot/package.nix b/pkgs/by-name/li/libopenshot/package.nix index 4d9bdabc6166..1eec1eaf174e 100644 --- a/pkgs/by-name/li/libopenshot/package.nix +++ b/pkgs/by-name/li/libopenshot/package.nix @@ -88,7 +88,7 @@ stdenv.mkDerivation (finalAttrs: { delivering high quality video editing, animation, and playback solutions to the world. API currently supports C++, Python, and Ruby. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libpaper/package.nix b/pkgs/by-name/li/libpaper/package.nix index d15318f30b06..71c6f5326aeb 100644 --- a/pkgs/by-name/li/libpaper/package.nix +++ b/pkgs/by-name/li/libpaper/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.1.29"; + version = "2.2.8"; pname = "libpaper"; src = fetchurl { - url = "mirror://debian/pool/main/libp/libpaper/libpaper_${finalAttrs.version}.tar.gz"; - hash = "sha256-JjMOIemjEkZY1RX9hQsM3lRv9C2JsllqUmTF8Wd/BUc="; + url = "https://github.com/rrthomas/libpaper/releases/download/v${finalAttrs.version}/libpaper-${finalAttrs.version}.tar.gz"; + hash = "sha256-HjMFcWkBkYdOykFex2iJ3RG6uYh6IwLWo2Zc0IHE13s="; }; nativeBuildInputs = [ autoreconfHook ]; @@ -36,9 +36,15 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { + changelog = "https://github.com/rrthomas/libpaper/releases/tag/v${finalAttrs.version}"; description = "Library for handling paper characteristics"; - homepage = "http://packages.debian.org/unstable/source/libpaper"; - license = lib.licenses.gpl2; + homepage = "https://github.com/rrthomas/libpaper"; + license = with lib.licenses; [ + gpl2Only + gpl3Plus + mit + publicDomain + ]; platforms = lib.platforms.unix; }; }) diff --git a/pkgs/by-name/li/libpg_query/package.nix b/pkgs/by-name/li/libpg_query/package.nix index 3f78829abccd..7e801d8839b7 100644 --- a/pkgs/by-name/li/libpg_query/package.nix +++ b/pkgs/by-name/li/libpg_query/package.nix @@ -9,13 +9,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libpg_query"; - version = "17-6.1.0"; + version = "18.0.0"; src = fetchFromGitHub { owner = "pganalyze"; repo = "libpg_query"; tag = finalAttrs.version; - hash = "sha256-UXba2WYyIO7RcFcNZeLL+Q9CwlloMZ5oFfHfL7+j4dU="; + hash = "sha256-Fs9SFs8ramKYdkv1gEOMJd9SnLmKDcbf+zYKv1hHBfc="; }; nativeBuildInputs = [ which ]; diff --git a/pkgs/by-name/li/libphonenumber/package.nix b/pkgs/by-name/li/libphonenumber/package.nix index 47dd4a574549..1007318b608f 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.32"; + version = "9.0.35"; src = fetchFromGitHub { owner = "google"; repo = "libphonenumber"; tag = "v${finalAttrs.version}"; - hash = "sha256-/weh6uAaK77MrPuxq45vFet1Wk9te0iGQP6ZASsbfA4="; + hash = "sha256-bGbPTZJWdGTdnWQCK9yXqcqK0AkAOsmZ/rRR2a+IT7M="; }; patches = [ diff --git a/pkgs/by-name/li/libpng/package.nix b/pkgs/by-name/li/libpng/package.nix index d533f3ed56bb..7d52bcffb378 100644 --- a/pkgs/by-name/li/libpng/package.nix +++ b/pkgs/by-name/li/libpng/package.nix @@ -11,10 +11,10 @@ assert zlib != null; let - patchVersion = "1.6.56"; + patchVersion = "1.6.58"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${patchVersion}-apng.patch.gz"; - hash = "sha256-nOMtSidjoqxfJYcmui9J6QETJ8HujDCGKjLQ8wiJ++g="; + hash = "sha256-7ufeoi7VAoaAF5cchsY8TtHmCF3guuv9zD0zIvAPPrA="; }; whenPatched = lib.optionalString apngSupport; @@ -24,11 +24,11 @@ let in stdenv'.mkDerivation (finalAttrs: { pname = "libpng" + whenPatched "-apng"; - version = "1.6.56"; + version = "1.6.58"; src = fetchurl { url = "mirror://sourceforge/libpng/libpng-${finalAttrs.version}.tar.xz"; - hash = "sha256-99i/FgG3gE9YOiVKs0OmVJymzyfSVcMCxHry2dNqbxg="; + hash = "sha256-KOtAP1Hw90BSSRMs7P6C6lwO+X8bMsWmWCiBSuDTR3U="; }; postPatch = whenPatched "gunzip < ${patch_src} | patch -Np1" diff --git a/pkgs/by-name/li/libpointmatcher/package.nix b/pkgs/by-name/li/libpointmatcher/package.nix index aa099a0cd540..66d2c094807e 100644 --- a/pkgs/by-name/li/libpointmatcher/package.nix +++ b/pkgs/by-name/li/libpointmatcher/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeFeature "EIGEN_INCLUDE_DIR" "${eigen}/include/eigen3") - (lib.cmakeBool "BUILD_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "BUILD_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = true; diff --git a/pkgs/by-name/li/libprojectm/package.nix b/pkgs/by-name/li/libprojectm/package.nix index ee3e8c451541..9c5414cc5e64 100644 --- a/pkgs/by-name/li/libprojectm/package.nix +++ b/pkgs/by-name/li/libprojectm/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libprojectm"; - version = "4.1.6"; + version = "4.1.7"; src = fetchFromGitHub { owner = "projectM-visualizer"; repo = "projectm"; tag = "v${finalAttrs.version}"; - hash = "sha256-IUVll+nRvIAOxrb16gWb9OpKzMRRuj28j/v+LvaLY5Y="; + hash = "sha256-g7a5Ce7dEfOBGn6wMgdwujkWSi+vLeayWHClvH5W1wY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/li/libpsm2/package.nix b/pkgs/by-name/li/libpsm2/package.nix index 0eb5caad1776..69cd0d2211d4 100644 --- a/pkgs/by-name/li/libpsm2/package.nix +++ b/pkgs/by-name/li/libpsm2/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "intel"; + owner = "cornelisnetworks"; repo = "opa-psm2"; rev = "PSM2_${finalAttrs.version}"; sha256 = "sha256-MzocxY+X2a5rJvTo+gFU0U10YzzazR1IxzgEporJyhI="; @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/intel/opa-psm2"; + homepage = "https://github.com/cornelisnetworks/opa-psm2"; description = "PSM2 library supports a number of fabric media and stacks"; license = with lib.licenses; [ gpl2Only diff --git a/pkgs/by-name/li/libqalculate/package.nix b/pkgs/by-name/li/libqalculate/package.nix index d4618b54cecb..0c6e356babd5 100644 --- a/pkgs/by-name/li/libqalculate/package.nix +++ b/pkgs/by-name/li/libqalculate/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libqalculate"; - version = "5.11.0"; + version = "5.12.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; tag = "v${finalAttrs.version}"; - hash = "sha256-lwA2faLYUb02FL9lOX+vuv/8pfKbkHWRlS1VnrV+sk4="; + hash = "sha256-f9FzFcu2LtBM6B6apYo7uobeR5uZVb02FxX7Kng/rRI="; }; outputs = [ diff --git a/pkgs/by-name/li/libr3/package.nix b/pkgs/by-name/li/libr3/package.nix index 1145b48362d9..647b91eb1f83 100644 --- a/pkgs/by-name/li/libr3/package.nix +++ b/pkgs/by-name/li/libr3/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "High-performance path dispatching library"; homepage = "https://github.com/c9s/r3"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; }) diff --git a/pkgs/by-name/li/librashader/package.nix b/pkgs/by-name/li/librashader/package.nix index 0b16b54579c4..f5503ab2d078 100644 --- a/pkgs/by-name/li/librashader/package.nix +++ b/pkgs/by-name/li/librashader/package.nix @@ -8,20 +8,20 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "librashader"; - version = "0.11.1"; + version = "0.11.2"; src = fetchFromGitHub { owner = "SnowflakePowered"; repo = "librashader"; tag = "librashader-v${finalAttrs.version}"; - hash = "sha256-oo4XbDjnrDR5vYYiOa/wjvKGm4a1KPzGsCQeNy9V07E="; + hash = "sha256-MdValg4bCyvrZJ4527N1eMeTE7Qo8EsxI/mMjZcVj7c="; }; patches = [ ./patches/fix-optional-dep-syntax.patch ]; - cargoHash = "sha256-9u/5Mv/Hng5iZzdCvl7oMWnxzKvDpvLeP34CdhHnQHU="; + cargoHash = "sha256-cc9C8IzCLkepJNvL1UNAfuHUUBeXkgrATQBOX9DPijM="; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/li/libre/package.nix b/pkgs/by-name/li/libre/package.nix index 3daed5925de7..e9028bb823be 100644 --- a/pkgs/by-name/li/libre/package.nix +++ b/pkgs/by-name/li/libre/package.nix @@ -8,13 +8,13 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "4.8.1"; + version = "4.10.0"; pname = "libre"; src = fetchFromGitHub { owner = "baresip"; repo = "re"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-fy7K7VE84E8JLWR9UZwHydL+I7NiAtlO8U4Gdr6m2KE="; + sha256 = "sha256-1EI7Tjp5pwinP65vG+59jyHRXbNOBCP3vnRyC7zHUh4="; }; buildInputs = [ diff --git a/pkgs/by-name/li/librealsense/package.nix b/pkgs/by-name/li/librealsense/package.nix index abef5142282f..8c5e71d0396e 100644 --- a/pkgs/by-name/li/librealsense/package.nix +++ b/pkgs/by-name/li/librealsense/package.nix @@ -46,7 +46,7 @@ stdenv'.mkDerivation rec { ]; src = fetchFromGitHub { - owner = "IntelRealSense"; + owner = "realsenseai"; repo = "librealsense"; rev = "v${version}"; sha256 = "sha256-d/FkvnUa7CqW25ZG8PY9+cd7uRL4zC1Md/JT8B/qAKU="; @@ -184,7 +184,7 @@ stdenv'.mkDerivation rec { meta = { description = "Cross-platform library for Intel® RealSense™ depth cameras (D400 series and the SR300)"; - homepage = "https://github.com/IntelRealSense/librealsense"; + homepage = "https://github.com/realsenseai/librealsense"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ brian-dawn diff --git a/pkgs/by-name/li/libremidi/package.nix b/pkgs/by-name/li/libremidi/package.nix index 690994c9f76b..7821b5d8f8f8 100644 --- a/pkgs/by-name/li/libremidi/package.nix +++ b/pkgs/by-name/li/libremidi/package.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (finalAttrs: { version = "4.5.0"; src = fetchFromGitHub { - owner = "jcelerier"; + owner = "celtera"; repo = "libremidi"; rev = "v${finalAttrs.version}"; hash = "sha256-JwXOIBq+pmPIR4y/Zv5whEyCfpLHmbllzdH2WLZmWLw="; @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { ''; meta = { - homepage = "https://github.com/jcelerier/libremidi"; + homepage = "https://github.com/celtera/libremidi"; description = "Modern C++ MIDI real-time & file I/O library"; license = lib.licenses.bsd2; maintainers = [ ]; diff --git a/pkgs/by-name/li/librenms/package.nix b/pkgs/by-name/li/librenms/package.nix index 7ecd8600145a..e99be2d3f16f 100644 --- a/pkgs/by-name/li/librenms/package.nix +++ b/pkgs/by-name/li/librenms/package.nix @@ -24,16 +24,16 @@ let in phpPackage.buildComposerProject2 rec { pname = "librenms"; - version = "26.5.1"; + version = "26.6.1"; src = fetchFromGitHub { owner = "librenms"; repo = "librenms"; tag = version; - hash = "sha256-RCSM8wSe5JOajhn4ku42NxZHDqHJjril9bg5IcPhyoE="; + hash = "sha256-RuKUdOopU8NDhsvYH1TIOdKzx5WMF9lfygZ7Ox8VM0E="; }; - vendorHash = "sha256-D7aPypNn5d/pDJMOeODLsnqU80m/swfXrIsqrRiPjCY="; + vendorHash = "sha256-evJriHdnKSVD9sDZj0xWyLmUPD/LgM8X8p8U5NwXwqk="; php = phpPackage; diff --git a/pkgs/by-name/li/librepcb/package.nix b/pkgs/by-name/li/librepcb/package.nix index 7a371b701c5d..db4e40b178a7 100644 --- a/pkgs/by-name/li/librepcb/package.nix +++ b/pkgs/by-name/li/librepcb/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "librepcb"; - version = "2.0.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "librepcb"; repo = "librepcb"; rev = version; - hash = "sha256-8hMPrpqwGNYXUTJGL/CMSP+Sjv5F6ZTkJHqauuOxwTw="; + hash = "sha256-UcX4r2TxinL2S3tPIiYRsPpYmKzdAx3Al0irkbXf5/g="; fetchSubmodules = true; }; @@ -38,13 +38,13 @@ stdenv.mkDerivation rec { cargoDeps1 = rustPlatform.fetchCargoVendor { inherit src; cargoRoot = "libs/librepcb/rust-core"; - hash = "sha256-1td3WjxbDq2lX7c0trpYRhO82ChNAG/ZABBRsekYtq4="; + hash = "sha256-1wHk8ynP3VnkypwY/C7nikfMSF0qU0L+CbBKoVxjlEc="; }; cargoDeps2 = rustPlatform.fetchCargoVendor { inherit src; cargoRoot = "libs/slint"; - hash = "sha256-DYcKoaOXYFvAi5VyWdhli73s7qrypeXmzGJNhVzcWtY="; + hash = "sha256-UX/7a0hzFBmPZKufcDKcICrXEM+rKcvqEq2pg1riBxo="; }; postPatch = '' @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] - directory = "${cargoDeps1}" + directory = "${cargoDeps1}/source-registry-0" EOF # Set up cargo config for the second Rust library @@ -63,7 +63,7 @@ stdenv.mkDerivation rec { [source.crates-io] replace-with = "vendored-sources" [source.vendored-sources] - directory = "${cargoDeps2}" + directory = "${cargoDeps2}/source-registry-0" EOF ''; diff --git a/pkgs/by-name/li/librepods/package.nix b/pkgs/by-name/li/librepods/package.nix index 180d130f621a..ce628a991a7e 100644 --- a/pkgs/by-name/li/librepods/package.nix +++ b/pkgs/by-name/li/librepods/package.nix @@ -13,8 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "librepods"; version = "0.2.5"; + __structuredAttrs = true; + strictDeps = true; + src = fetchFromGitHub { - owner = "kavishdevar"; + owner = "librepods-org"; repo = "librepods"; tag = "v${finalAttrs.version}"; hash = "sha256-6l1WjwjDbv5e3tDaWo9+XSEjr9ge/hKysIkeUqyiO4U="; @@ -38,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ]; meta = { - homepage = "https://github.com/kavishdevar/librepods"; + homepage = "https://github.com/librepods-org/librepods"; description = "AirPods liberated from Apple's ecosystem"; license = lib.licenses.gpl3; mainProgram = "librepods"; diff --git a/pkgs/by-name/li/libresidfp/package.nix b/pkgs/by-name/li/libresidfp/package.nix new file mode 100644 index 000000000000..3021326ce82c --- /dev/null +++ b/pkgs/by-name/li/libresidfp/package.nix @@ -0,0 +1,105 @@ +{ + stdenv, + lib, + fetchFromGitHub, + gitUpdater, + testers, + withDocumentation ? true, + autoreconfHook, + doxygen, + graphviz, + makeFontsConf, + writableTmpDirAsHomeHook, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libresidfp"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "libsidplayfp"; + repo = "libresidfp"; + tag = "v${finalAttrs.version}"; + hash = "sha256-xPIyJZWL5+tW3xk9b4dlL4klxXM6+cy38cALuhsH1zk="; + }; + + strictDeps = true; + __structuredAttrs = true; + + outputs = [ + "out" + "dev" + ] + ++ lib.optionals withDocumentation [ + "doc" + ]; + + # https://github.com/libsidplayfp/libresidfp/pull/41 + postPatch = '' + substituteInPlace configure.ac \ + --replace-fail 'AC_SUBST([LIB_MAJOR])NEWS.md' 'AC_SUBST([LIB_MAJOR])' + ''; + + nativeBuildInputs = [ + autoreconfHook + ] + ++ lib.optionals withDocumentation [ + doxygen + graphviz + writableTmpDirAsHomeHook + ]; + + configureFlags = [ + # Supposedly runtime detection only supported on GCC + # __builtin_cpu_supports on GCC's list of x86 built-in functions + (lib.strings.withFeatureAs true "simd" ( + if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none" + )) + (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") + ]; + + enableParallelBuilding = true; + + buildFlags = [ + "all" + ] + ++ lib.optionals withDocumentation [ + "doc" + ]; + + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + postInstall = lib.optionalString withDocumentation '' + mkdir -p $doc/share/doc/ + mv docs/html $doc/share/doc/libresidfp + ''; + + env = lib.optionalAttrs withDocumentation { + FONTCONFIG_FILE = makeFontsConf { + fontDirectories = [ ]; + }; + }; + + passthru = { + tests.pkg-config = testers.hasPkgConfigModules { + package = finalAttrs.finalPackage; + versionCheck = true; + }; + updateScript = gitUpdater { + rev-prefix = "v"; + ignoredVersions = "[a-zA-Z]"; + }; + }; + + meta = { + description = "Cycle exact SID emulation"; + homepage = "https://github.com/libsidplayfp/libresidfp"; + changelog = "https://github.com/libsidplayfp/libresidfp/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl2Plus; + maintainers = [ lib.maintainers.OPNA2608 ]; + platforms = lib.platforms.all; + pkgConfigModules = [ + "libresidfp" + ]; + }; +}) diff --git a/pkgs/by-name/li/librespot/package.nix b/pkgs/by-name/li/librespot/package.nix index 24dd76fd0f1d..8c4a3e7f498f 100644 --- a/pkgs/by-name/li/librespot/package.nix +++ b/pkgs/by-name/li/librespot/package.nix @@ -73,7 +73,7 @@ rustPlatform.buildRustPackage (finalAttrs: { mainProgram = "librespot"; homepage = "https://github.com/librespot-org/librespot"; changelog = "https://github.com/librespot-org/librespot/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ bennofs ]; }; }) diff --git a/pkgs/by-name/li/libresprite/package.nix b/pkgs/by-name/li/libresprite/package.nix index 630508099365..87df7ef2e689 100644 --- a/pkgs/by-name/li/libresprite/package.nix +++ b/pkgs/by-name/li/libresprite/package.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation (finalAttrs: { dst="$out"/share/icons/hicolor/"$size"x"$size" install -Dm644 "$src"/doc"$size".png "$dst"/mimetypes/aseprite.png done + + substituteInPlace $out/share/thumbnailers/libresprite.thumbnailer \ + --replace-fail "TryExec=libresprite-thumbnailer" "TryExec=$out/bin/libresprite-thumbnailer" \ + --replace-fail "Exec=libresprite-thumbnailer" "Exec=$out/bin/libresprite-thumbnailer" ''; passthru.tests = { diff --git a/pkgs/by-name/li/libressl/default.nix b/pkgs/by-name/li/libressl/default.nix index 7a266936f6c4..08f7090b6ca1 100644 --- a/pkgs/by-name/li/libressl/default.nix +++ b/pkgs/by-name/li/libressl/default.nix @@ -23,6 +23,9 @@ let pname = "libressl"; inherit version; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { url = "mirror://openbsd/LibreSSL/libressl-${version}.tar.gz"; inherit hash; @@ -60,6 +63,23 @@ let preCheck = '' export PREVIOUS_${ldLibPathEnvName}=$${ldLibPathEnvName} export ${ldLibPathEnvName}="$${ldLibPathEnvName}:$(realpath tls/):$(realpath ssl/):$(realpath crypto/)" + '' + + lib.optionalString (stdenv.hostPlatform.isElf && buildShared) '' + # Bail if any shared object has executable stack enabled. This can + # happen when an object produced from an assmbly file in libcrypto is + # missing a .note.GNU-stack section. An executable stack is dangerous + # and unintentional, but without this check the derivation will build + # and even run if W^X is not enforced; it would fail dangerously. + objdump -p **/*.so | awk ' + BEGIN { res = 0 } + /file format/ { file = $1 } + /STACK/ { stack = 1; next } + stack { + if ($0 ~ /flags.*x/) { print file " has executable stack"; res = 1 } + stack = 0 + } + END { exit res } + ' ''; postCheck = '' export ${ldLibPathEnvName}=$PREVIOUS_${ldLibPathEnvName} @@ -96,6 +116,7 @@ let maintainers = with lib.maintainers; [ thoughtpolice fpletz + ruuda ]; inherit knownVulnerabilities; @@ -111,32 +132,17 @@ let identifiers.cpeParts = lib.meta.cpeFullVersionWithVendor "openbsd" version; }; }; + # https://github.com/libressl/portable/pull/1206 + # This got merged in February 2026 and is included as of LibreSSL 4.3.0. common-cmake-install-full-dirs-patch = fetchpatch { url = "https://github.com/libressl/portable/commit/a15ea0710398eaeed3be53cf643e80a1e80c981d.patch"; hash = "sha256-Mlf4SrGCCqALQicbGtmVGdkdfcE8DEGYkOuVyG2CozM="; }; in { - libressl_4_1 = generic { - version = "4.1.2"; - hash = "sha256-+6Ti+ip/UjBt96OJlwoQ6YuX6w7bKZqf252/SZmcYeE="; - # Fixes build on loongarch64 - # https://github.com/libressl/portable/pull/1184 - postPatch = '' - mkdir -p include/arch/loongarch64 - cp ${ - fetchurl { - url = "https://github.com/libressl/portable/raw/refs/tags/v4.1.0/include/arch/loongarch64/opensslconf.h"; - hash = "sha256-68dw5syUy1z6GadCMR4TR9+0UQX6Lw/CbPWvjHGAhgo="; - } - } include/arch/loongarch64/opensslconf.h - ''; - patches = [ - common-cmake-install-full-dirs-patch - ]; - }; - + # 4.2 was released October 2025 and will become unsupported on October 22, + # 2026, one year after the release of OpenBSD 7.8. libressl_4_2 = generic { version = "4.2.1"; hash = "sha256-bVwvWFg1iOp5H0yGRQBAcdAN+lVKW/eIoAbKHrWr1ws="; @@ -144,4 +150,11 @@ in common-cmake-install-full-dirs-patch ]; }; + + # 4.3 was released April 2026 and will become unsupported on May 19, 2027, + # one year after the release of OpenBSD 7.9. + libressl_4_3 = generic { + version = "4.3.2"; + hash = "sha256-7fAa7iTGXWnmqe/LnUS82mgv+dTzu72V55Th36kIR7U="; + }; } diff --git a/pkgs/by-name/li/libressl/package.nix b/pkgs/by-name/li/libressl/package.nix index f9b05eb9555b..29dbda06f77d 100644 --- a/pkgs/by-name/li/libressl/package.nix +++ b/pkgs/by-name/li/libressl/package.nix @@ -1,5 +1,5 @@ { - libressl_4_2, + libressl_4_3, }: -libressl_4_2 +libressl_4_3 diff --git a/pkgs/by-name/li/libreswan/package.nix b/pkgs/by-name/li/libreswan/package.nix index c8cf909e1896..ae17e04d0078 100644 --- a/pkgs/by-name/li/libreswan/package.nix +++ b/pkgs/by-name/li/libreswan/package.nix @@ -51,11 +51,11 @@ in stdenv.mkDerivation rec { pname = "libreswan"; - version = "5.3"; + version = "5.3.2"; src = fetchurl { url = "https://download.libreswan.org/libreswan-${version}.tar.gz"; - hash = "sha256-wdNQw/Mpb9IbnbB5TiPT8xmykviAv4F4uC71xjkcYMA="; + hash = "sha256-+5GK+gu5K9BDDB2oYe+AaIZNJdchMN8MYweh+dp2EIg="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libretro-shaders-slang/package.nix b/pkgs/by-name/li/libretro-shaders-slang/package.nix index 3baaf9e86f5d..c69961f1a1c7 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-2026-06-10"; + version = "0-unstable-2026-07-15"; src = fetchFromGitHub { owner = "libretro"; repo = "slang-shaders"; - rev = "140d1bcc67a7287670ad6a02fc77e11c10ef5e07"; - hash = "sha256-EejHojtJDnhgYk5PM8RTiCdV5TCeqcszodHQvs6vVIU="; + rev = "3b0d6aa1d134a168478cd9c904a866d969f8882b"; + hash = "sha256-wSrKcrX5GcTXfaxxjyd7COAFsaZsed8pYtScqGo+LA8="; }; dontConfigure = true; diff --git a/pkgs/by-name/li/librevenge/package.nix b/pkgs/by-name/li/librevenge/package.nix index 3f023b20b60f..f95a20070669 100644 --- a/pkgs/by-name/li/librevenge/package.nix +++ b/pkgs/by-name/li/librevenge/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "librevenge"; - version = "0.0.5"; + version = "0.0.6"; src = fetchurl { url = "mirror://sourceforge/project/libwpd/librevenge/librevenge-${finalAttrs.version}/librevenge-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-EG0MRLtkCLE0i54EZWZvqDuBYXdmWiLNAX6IbBqu6zQ="; + sha256 = "sha256-GerPXOVdf+apkKRRQlic332gx7aHAXl/EzSCy0Txifo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/li/librevna/package.nix b/pkgs/by-name/li/librevna/package.nix new file mode 100644 index 000000000000..ff4074a56285 --- /dev/null +++ b/pkgs/by-name/li/librevna/package.nix @@ -0,0 +1,84 @@ +{ + stdenv, + lib, + fetchFromGitHub, + apple-sdk_14, + git, + pkg-config, + qt6, + libusb1, + udev, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "librevna"; + version = "1.6.5"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jankae"; + repo = "LibreVNA"; + tag = "v${finalAttrs.version}"; + hash = "sha256-uPVnjhbFXP1Z+pJuWDX4xqQGcmbJI8ElHq8fVXN0Qcc="; + }; + + sourceRoot = "${finalAttrs.src.name}/Software/PC_Application/LibreVNA-GUI"; + + postPatch = '' + substituteInPlace resources/librevna.desktop \ + --replace-fail Exec=/opt/LibreVNA-GUI Exec=$out/bin/LibreVNA-GUI + ''; + + nativeBuildInputs = [ + git + pkg-config + qt6.qmake + qt6.qtsvg + qt6.wrapQtAppsHook + ]; + + buildInputs = [ + qt6.qtbase + libusb1 + ] + ++ lib.optional stdenv.hostPlatform.isLinux udev + ++ lib.optional stdenv.hostPlatform.isDarwin apple-sdk_14; + + strictDeps = true; + + installPhase = + if stdenv.hostPlatform.isDarwin then + '' + runHook preInstall + + mkdir -p $out/{Applications,bin} + mv LibreVNA-GUI.app $out/Applications + ln -s $out/Applications/LibreVNA-GUI.app/Contents/MacOS/LibreVNA-GUI $out/bin/LibreVNA-GUI + + runHook postInstall + '' + else + '' + runHook preInstall + + install -Dm755 LibreVNA-GUI -t $out/bin + install -Dm644 ../51-vna.rules -t $out/etc/udev/rules.d + install -Dm644 resources/librevna.desktop -t $out/share/applications + install -Dm644 resources/librevna.png -t $out/share/pixmaps + + runHook postInstall + ''; + + meta = { + changelog = "https://github.com/jankae/LibreVNA/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/jankae/LibreVNA/"; + description = "100kHz to 6GHz 2 port USB based VNA"; + mainProgram = "LibreVNA-GUI"; + license = lib.licenses.gpl3Only; + platforms = lib.platforms.unix; + + maintainers = with lib.maintainers; [ + dunxen + ]; + }; +}) diff --git a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix index 396111b43ddf..efd707669374 100644 --- a/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-bin-unwrapped/package.nix @@ -36,7 +36,7 @@ let pname = "librewolf-bin-unwrapped"; - version = "151.0.1-2"; + version = "152.0.5-1"; in stdenv.mkDerivation { @@ -46,8 +46,8 @@ stdenv.mkDerivation { url = "https://codeberg.org/api/packages/librewolf/generic/librewolf/${version}/librewolf-${version}-${arch}-package.tar.xz"; hash = { - x86_64-linux = "sha256-YqFUKUK4GoP2JAIa3aJqz/iAAmD8hh5UqVzbm4jjvm8="; - aarch64-linux = "sha256-TIJEiffEa7X51RGmntCAR7NLP51qcJ08aTvKxVAYNsY="; + x86_64-linux = "sha256-9Y0n3UHRK9WgKhKFIMB3CLmh1Gp5aHoIiKxlKNKe5gc="; + aarch64-linux = "sha256-x9vUXaEtjnY6+mOLbLiXmBr5c7ZmEYRTJK9fDIpfgVs="; } .${stdenv.hostPlatform.system} or throwSystem; }; @@ -106,13 +106,14 @@ stdenv.mkDerivation { description = "Fork of Firefox, focused on privacy, security and freedom (upstream binary release)"; homepage = "https://librewolf.net"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dwrege ]; + maintainers = with lib.maintainers; [ + azahi + eclairevoyant + dwrege + ]; platforms = builtins.attrNames mozillaPlatforms; mainProgram = "librewolf"; hydraPlatforms = [ ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; - knownVulnerabilities = [ - "librewolf-bin lacks maintenance in nixpkgs, consider using an alternative" - ]; }; } diff --git a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix index 8db148066c60..1e3bf61a2e63 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/librewolf.nix @@ -37,8 +37,6 @@ rec { cp ${source}/assets/search-config.json services/settings/dumps/main/search-config.json sed -i '/MOZ_SERVICES_HEALTHREPORT/ s/True/False/' browser/moz.configure - sed -i '/# This must remain last./i gkrust_features += ["glean_disable_upload"]\'$'\n' toolkit/library/rust/gkrust-features.mozbuild - cp ${source}/patches/pref-pane/category-librewolf.svg browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.css browser/themes/shared/preferences cp ${source}/patches/pref-pane/librewolf.inc.xhtml browser/components/preferences diff --git a/pkgs/by-name/li/librewolf-unwrapped/package.nix b/pkgs/by-name/li/librewolf-unwrapped/package.nix index d279ee6ccf2c..2dcab94afe52 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/package.nix +++ b/pkgs/by-name/li/librewolf-unwrapped/package.nix @@ -29,9 +29,13 @@ in description = "Fork of Firefox, focused on privacy, security and freedom"; homepage = "https://librewolf.net/"; maintainers = with lib.maintainers; [ + azahi dwrege fpletz hythera + mBornand + thbemme + wolfgangwalther ]; platforms = lib.platforms.unix; broken = stdenv.buildPlatform.is32bit; diff --git a/pkgs/by-name/li/librewolf-unwrapped/src.json b/pkgs/by-name/li/librewolf-unwrapped/src.json index 95aac1a7ef29..bcc4927bcbc6 100644 --- a/pkgs/by-name/li/librewolf-unwrapped/src.json +++ b/pkgs/by-name/li/librewolf-unwrapped/src.json @@ -1,11 +1,11 @@ { - "packageVersion": "151.0.2-1", + "packageVersion": "152.0.6-1", "source": { - "rev": "151.0.2-1", - "hash": "sha256-Iq6Jf8Cw2AgkI5zehV5TJQBFHCGANtj4e13cy+ANoTo=" + "rev": "152.0.6-1", + "hash": "sha256-O5s1t/ZZVYL/9ik4zyi/kKAQEbSERO6vD1NJzEUmnU4=" }, "firefox": { - "version": "151.0.2", - "hash": "sha512-hzCJU+01SieZqaRb5AAzv5/42A+iIPA0qs+9bnVHFpAdQWTDf6VgMsZZslkRZgPguitWbB82UaucwINdUCzXOQ==" + "version": "152.0.6", + "hash": "sha512-xNh3g31wB/thHDjUnZtt07xMXJypALVOci4UDOfs0JJPabXO3H+MH+YC5+/h1xWbAZ3ieZnikjXNYxghuxPmsA==" } } diff --git a/pkgs/by-name/li/librime-octagram/package.nix b/pkgs/by-name/li/librime-octagram/package.nix index fe6d0f30da8e..4df378a3f315 100644 --- a/pkgs/by-name/li/librime-octagram/package.nix +++ b/pkgs/by-name/li/librime-octagram/package.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation { pname = "librime-octagram"; - version = "0-unstable-2024-11-18"; + version = "0-unstable-2026-07-11"; src = fetchFromGitHub { owner = "lotem"; repo = "librime-octagram"; - rev = "dfcc15115788c828d9dd7b4bff68067d3ce2ffb8"; - hash = "sha256-dgUsH10V87mEcX/k3N118qbKo3fKDFcS8inhS6p5bJc="; + rev = "c030e30e4df01a806841b64a438b55ec7b617b1f"; + hash = "sha256-kjUsG9Qm29nBYl/G/7FvHKirOq298scKFmaXtZfrcss="; }; installPhase = '' diff --git a/pkgs/by-name/li/librsvg/package.nix b/pkgs/by-name/li/librsvg/package.nix index 333015e1927c..297c1a0eae32 100644 --- a/pkgs/by-name/li/librsvg/package.nix +++ b/pkgs/by-name/li/librsvg/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "librsvg"; - version = "2.62.1"; + version = "2.62.3"; outputs = [ "out" @@ -62,13 +62,13 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/librsvg/${lib.versions.majorMinor finalAttrs.version}/librsvg-${finalAttrs.version}.tar.xz"; - hash = "sha256-tByoQgYkL93YJqK/djSNfN9SwQUMv6BguGboGiUhRcM="; + hash = "sha256-frRJsnIqdoAhNW9m3+4yAsIptU7U5qcM5AwJDpf/FvI="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src; name = "librsvg-deps-${finalAttrs.version}"; - hash = "sha256-Px7H2Z4ShCCuZNskuKj427lE9dvIc6xRo8R1S4fK+ZQ="; + hash = "sha256-9ubfIl9R2BdcAWn7i050KBbb4cMdlakvrKdnjpZCQjA="; dontConfigure = true; }; diff --git a/pkgs/by-name/li/libseccomp/package.nix b/pkgs/by-name/li/libseccomp/package.nix index 222bda60e16a..64677eb94051 100644 --- a/pkgs/by-name/li/libseccomp/package.nix +++ b/pkgs/by-name/li/libseccomp/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchurl, - fetchpatch, getopt, util-linuxMinimal, which, @@ -13,31 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libseccomp"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/seccomp/libseccomp/releases/download/v${finalAttrs.version}/libseccomp-${finalAttrs.version}.tar.gz"; - hash = "sha256-g7YIUjLRWIw3ncm5yuR7s3QHzyYubnSZPGG6ctKnhNw="; + hash = "sha256-UB9mxmciXVN5G5fh18+Fq3ZMKX0EiB9g849FHEsO4b4="; }; - patches = [ - # Remove when version > 2.6.0 - # Fixes test failures on big-endian archs - (fetchpatch { - name = "0001-libseccomp-remove-fuzzer-from-test-62-sim-arch_transactions.patch"; - url = "https://github.com/seccomp/libseccomp/commit/2f0f3b0e9121720108431c5d054164016f476230.patch"; - hash = "sha256-AKAQyALJlLgxnS23OEoqfyDswp0kU2vmja5ohgvFojw="; - }) - - # Remove when version > 2.6.0 - # Fixes OOB reads & tests on musl - (fetchpatch { - name = "0002-libseccomp-fix-seccomp_export_bpf_mem-out-of-bounds-read.patch"; - url = "https://github.com/seccomp/libseccomp/commit/dd759e8c4f5685b526638fba9ec4fc24c37c9aec.patch"; - hash = "sha256-TdfQ5T8FrGE6+P24MIi9rKSC3fQu/Jlr4bsFiJd4yVY="; - }) - ]; - outputs = [ "out" "lib" diff --git a/pkgs/by-name/li/libsemanage/package.nix b/pkgs/by-name/li/libsemanage/package.nix index c0423d7ef3e5..d37f651c1a29 100644 --- a/pkgs/by-name/li/libsemanage/package.nix +++ b/pkgs/by-name/li/libsemanage/package.nix @@ -16,12 +16,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsemanage"; - version = "3.10"; + version = "3.11"; inherit (libsepol) se_url; src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/libsemanage-${finalAttrs.version}.tar.gz"; - hash = "sha256-GXiJTEFHaa13Q40miG6q4/t7t0V47ypa0xMMictcsf4="; + hash = "sha256-52FgKGu/sIIWAsbAwyIOvPNmrTJG07nQoPvvzTXoYEM="; }; outputs = [ diff --git a/pkgs/by-name/li/libsepol/package.nix b/pkgs/by-name/li/libsepol/package.nix index 9e06808644cf..cefaad72d6ca 100644 --- a/pkgs/by-name/li/libsepol/package.nix +++ b/pkgs/by-name/li/libsepol/package.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsepol"; - version = "3.10"; + version = "3.11"; se_url = "https://github.com/SELinuxProject/selinux/releases/download"; outputs = [ @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "${finalAttrs.se_url}/${finalAttrs.version}/libsepol-${finalAttrs.version}.tar.gz"; - hash = "sha256-1VVYZ5f6nzg0RJbSp+wRR7bKrz/MRMQtjVFz7denmnE="; + hash = "sha256-efPSyI9Et+tc9U2XkuAyMil+F/l6F5Fj8nUAmaAPFk0="; }; nativeBuildInputs = [ flex ]; diff --git a/pkgs/by-name/li/libshumate/package.nix b/pkgs/by-name/li/libshumate/package.nix index 0321a1e27dc2..de1ae55529a8 100644 --- a/pkgs/by-name/li/libshumate/package.nix +++ b/pkgs/by-name/li/libshumate/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libshumate"; - version = "1.6.1"; + version = "1.6.2"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/libshumate/${lib.versions.majorMinor finalAttrs.version}/libshumate-${finalAttrs.version}.tar.xz"; - hash = "sha256-s2qtNFAHkXhfVGaE0PLtZE5IGf9Oha5noiRfFZ7MstQ="; + hash = "sha256-IjZLuY+LUgM0M2q4IkAZagljSJuGpbODKOG+orZPOp4="; }; depsBuildBuild = [ diff --git a/pkgs/by-name/li/libsidplayfp/package.nix b/pkgs/by-name/li/libsidplayfp/package.nix index dab256cfe4ad..e32438d996c3 100644 --- a/pkgs/by-name/li/libsidplayfp/package.nix +++ b/pkgs/by-name/li/libsidplayfp/package.nix @@ -10,7 +10,7 @@ doxygen, graphviz, libexsid, - libgcrypt, + libresidfp, libusb1, perl, pkg-config, @@ -19,24 +19,29 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsidplayfp"; - version = "2.16.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "libsidplayfp"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-gOnLjOw9TN2b0ne7Otm5DZhV/2D1xjLxwnaYilnlBgc="; + hash = "sha256-T0No3gxlG/IHHReJ23ET9MYvKgMgCP+e9YivBbLQm0I="; }; - outputs = [ "out" ] ++ lib.optionals docSupport [ "doc" ]; + outputs = [ + "out" + "dev" + ] + ++ lib.optionals docSupport [ "doc" ]; + + strictDeps = true; + __structuredAttrs = true; postPatch = '' patchShebangs . ''; - strictDeps = true; - nativeBuildInputs = [ autoreconfHook perl @@ -50,30 +55,17 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ libexsid - libgcrypt + libresidfp libusb1 ]; - enableParallelBuilding = true; - configureFlags = [ - (lib.strings.enableFeature true "hardsid") - (lib.strings.withFeature true "gcrypt") (lib.strings.withFeature true "exsid") (lib.strings.withFeature true "usbsid") - # Supposedly runtime detection only supported on GCC - # https://github.com/libsidplayfp/libsidplayfp/commit/65874166b14d44467782d2996f7b644fbde0ee87 - # __builtin_cpu_supports on GCC's list of x86 built-in functions - (lib.strings.withFeatureAs true "simd" ( - if (stdenv.cc.isGNU && stdenv.hostPlatform.isx86) then "runtime" else "none" - )) (lib.strings.enableFeature finalAttrs.finalPackage.doCheck "tests") ]; - # Make Doxygen happy with the setup, reduce log noise - env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { - fontDirectories = [ ]; - }); + enableParallelBuilding = true; preBuild = '' # Reduce noise from fontconfig during doc building @@ -89,6 +81,11 @@ stdenv.mkDerivation (finalAttrs: { mv docs/html $doc/share/doc/libsidplayfp/ ''; + # Make Doxygen happy with the setup, reduce log noise + env.FONTCONFIG_FILE = lib.optionalString docSupport (makeFontsConf { + fontDirectories = [ ]; + }); + passthru = { tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage; updateScript = gitUpdater { @@ -107,9 +104,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://github.com/libsidplayfp/libsidplayfp"; changelog = "https://github.com/libsidplayfp/libsidplayfp/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ - ramkromberg OPNA2608 ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/li/libsignal-ffi/package.nix b/pkgs/by-name/li/libsignal-ffi/package.nix index 0cb074ba6fc0..d5f380fb9654 100644 --- a/pkgs/by-name/li/libsignal-ffi/package.nix +++ b/pkgs/by-name/li/libsignal-ffi/package.nix @@ -13,14 +13,14 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "libsignal-ffi"; # must match the version used in mautrix-signal # see https://github.com/mautrix/signal/issues/401 - version = "0.93.2"; + version = "0.97.2"; src = fetchFromGitHub { fetchSubmodules = true; owner = "signalapp"; repo = "libsignal"; tag = "v${finalAttrs.version}"; - hash = "sha256-U32vd5TzgA1LwlFgLUJU30gUeQoYnKI7kYnhy+d8eQk="; + hash = "sha256-p9NIt+n7MTsYWAFS+FOuSGMJUZi8rBlTb6ATgVJ+uU8="; }; postPatch = @@ -46,7 +46,7 @@ rustPlatform.buildRustPackage (finalAttrs: { NIX_LDFLAGS = if stdenv.hostPlatform.isDarwin then "-lc++" else "-lstdc++"; }; - cargoHash = "sha256-5thq1MXL792u87fv6M5E1oi8gq6S8dnTsy3k26T7pgM="; + cargoHash = "sha256-JtNGubDMrUINCCiawrAW63L1trcBCAIibFpojK8mzhc="; cargoBuildFlags = [ "-p" diff --git a/pkgs/by-name/li/libsodium/package.nix b/pkgs/by-name/li/libsodium/package.nix index 7046a0a7d80d..3fc91abaf0ca 100644 --- a/pkgs/by-name/li/libsodium/package.nix +++ b/pkgs/by-name/li/libsodium/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsodium"; - version = "1.0.22-unstable-2026-04-09"; + version = "1.0.22-unstable-2026-04-16"; src = fetchFromGitHub { owner = "jedisct1"; repo = "libsodium"; - rev = "77e1ce5d6dee871c49ef211222ba18ef0c486bda"; - hash = "sha256-k8u7iNqvjLA0PptbneDyE8zCtutJlV2LirrRb41tmBY="; + rev = "33cc75ab1565d9dcbe808354191bd572ad6b64d0"; + hash = "sha256-8kS9FBoaFaJOjH7XZc8IG3GaQaUiYD/awQOhs7j0n1Y="; }; outputs = [ diff --git a/pkgs/by-name/li/libsolv/package.nix b/pkgs/by-name/li/libsolv/package.nix index 63a1ac4e31d6..4e7ff8c5fc0b 100644 --- a/pkgs/by-name/li/libsolv/package.nix +++ b/pkgs/by-name/li/libsolv/package.nix @@ -2,7 +2,6 @@ lib, stdenv, fetchFromGitHub, - fetchpatch, cmake, ninja, pkg-config, @@ -19,24 +18,16 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "0.7.37"; + version = "0.7.39"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = finalAttrs.version; - hash = "sha256-hiumMnTJ3eP+acH2V0eNTM71Fw//IWQPechCA0+kH1s="; + hash = "sha256-nl1g1BKauSXV54xjO/1jDQMbr1WfycupR0CPqkgkzrA="; }; - patches = [ - (fetchpatch { - name = "CVE-2026-9149"; - url = "https://github.com/openSUSE/libsolv/commit/210386037c892a720972ad35a3d8f7073b4d763b.patch"; - hash = "sha256-ju3xn78UGMR5usq1e1ovFTWnKW1TPDA77sNGx8yc8Z8="; - }) - ]; - cmakeFlags = [ "-DENABLE_COMPLEX_DEPS=true" (lib.cmakeBool "ENABLE_CONDA" withConda) diff --git a/pkgs/by-name/li/libspatialaudio/package.nix b/pkgs/by-name/li/libspatialaudio/package.nix index e19456d5120d..31ce96f66650 100644 --- a/pkgs/by-name/li/libspatialaudio/package.nix +++ b/pkgs/by-name/li/libspatialaudio/package.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { version = "0.3.0"; src = fetchFromGitHub { - owner = "videolabs"; + owner = "videolan"; repo = "libspatialaudio"; rev = version; hash = "sha256-sPnQPD41AceXM4uGqWXMYhuQv0TUkA6TZP8ChxUFIoI="; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { # Fix the build with CMake 4. # - # See: + # See: postPatch = '' substituteInPlace CMakeLists.txt \ --replace-fail \ @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { description = "Ambisonic encoding / decoding and binauralization library in C++"; - homepage = "https://github.com/videolabs/libspatialaudio"; + homepage = "https://github.com/videolan/libspatialaudio"; license = lib.licenses.lgpl21Plus; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ krav ]; diff --git a/pkgs/by-name/li/libspng/package.nix b/pkgs/by-name/li/libspng/package.nix index eb7b69bcbd27..24315abdb844 100644 --- a/pkgs/by-name/li/libspng/package.nix +++ b/pkgs/by-name/li/libspng/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Simple, modern libpng alternative"; homepage = "https://libspng.org/"; - license = with lib.licenses; [ bsd2 ]; + license = lib.licenses.bsd2; maintainers = with lib.maintainers; [ humancalico ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/li/libssc/package.nix b/pkgs/by-name/li/libssc/package.nix index a0bed1bc8a3b..ea84759291a4 100644 --- a/pkgs/by-name/li/libssc/package.nix +++ b/pkgs/by-name/li/libssc/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libssc"; - version = "0.2.2"; + version = "0.4.4"; src = fetchFromCodeberg { owner = "DylanVanAssche"; repo = "libssc"; tag = "v${finalAttrs.version}"; - hash = "sha256-vc3phLAURKXAVD/o4uiGkBtJ3wsbLEfkwygMltEhqug="; + hash = "sha256-C9A0NtkGztSJQIkv4diGAPhZMUiIUszRNYif2yZL8nI="; }; buildInputs = [ diff --git a/pkgs/by-name/li/libssh/package.nix b/pkgs/by-name/li/libssh/package.nix index 93876d1b72d8..2c786b504b1a 100644 --- a/pkgs/by-name/li/libssh/package.nix +++ b/pkgs/by-name/li/libssh/package.nix @@ -8,6 +8,9 @@ openssl, libsodium, + withGssapi ? false, + krb5, + # for passthru.tests ffmpeg, sshping, @@ -28,20 +31,29 @@ stdenv.mkDerivation (finalAttrs: { "dev" ]; + strictDeps = true; + + __structuredAttrs = true; + postPatch = '' # Fix headers to use libsodium instead of NaCl sed -i 's,nacl/,sodium/,g' ./include/libssh/curve25519.h src/curve25519.c ''; - # Don’t build examples, which are not installed and require additional dependencies not - # included in `buildInputs` such as libx11. - cmakeFlags = [ "-DWITH_EXAMPLES=OFF" ]; + cmakeFlags = [ + # Don’t build examples, which are not installed and require additional dependencies not + # included in `buildInputs` such as libx11. + "-DWITH_EXAMPLES=OFF" + + (lib.cmakeBool "USE_GSSAPI" withGssapi) + ]; buildInputs = [ zlib openssl libsodium - ]; + ] + ++ lib.optional withGssapi krb5; nativeBuildInputs = [ cmake diff --git a/pkgs/by-name/li/libssh2/package.nix b/pkgs/by-name/li/libssh2/package.nix index 71ed533d7a74..7a48067d111d 100644 --- a/pkgs/by-name/li/libssh2/package.nix +++ b/pkgs/by-name/li/libssh2/package.nix @@ -26,6 +26,31 @@ stdenv.mkDerivation (finalAttrs: { patches = [ # https://github.com/libssh2/libssh2/commit/256d04b60d80bf1190e96b0ad1e91b2174d744b1 ./CVE-2026-7598.patch + + (fetchurl { + name = "CVE-2025-15661.patch"; + url = "https://salsa.debian.org/debian/libssh2/-/raw/1d4906e6ebe85a9da2931ba33677ead96a61f07f/debian/patches/CVE-2025-15661.patch"; + hash = "sha256-Rz6i/881CbObUDcZbcPlgVPaKizSp6ZRTdmJNJ9HLHE="; + }) + + (fetchurl { + name = "CVE-2026-55199.patch"; + url = "https://salsa.debian.org/debian/libssh2/-/raw/1d4906e6ebe85a9da2931ba33677ead96a61f07f/debian/patches/CVE-2026-55199.patch"; + hash = "sha256-AFZa5kohha62aE0if5ckmAdJ0TZNcjfP32yDznoEhNo="; + }) + + (fetchurl { + name = "CVE-2026-55200.patch"; + url = "https://salsa.debian.org/debian/libssh2/-/raw/1d4906e6ebe85a9da2931ba33677ead96a61f07f/debian/patches/CVE-2026-55200.patch"; + hash = "sha256-wCAglr8BsBWIhnh3SiFeyKzZmIp8rC5MVfFgoEzp/hE="; + }) + + # necessary for the fix for CVE-2026-15661 + (fetchurl { + name = "libssh-unconst-backport.patch"; + url = "https://salsa.debian.org/debian/libssh2/-/raw/1d4906e6ebe85a9da2931ba33677ead96a61f07f/debian/patches/libssh-unconst-backport.patch"; + hash = "sha256-jc01Fb70GbaD9+RYeSjRaLFBtKLiMPTMuXas21aC0Ag="; + }) ]; # this could be accomplished by updateAutotoolsGnuConfigScriptsHook, but that causes infinite recursion @@ -57,7 +82,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Client-side C library implementing the SSH2 protocol"; homepage = "https://www.libssh2.org"; platforms = lib.platforms.all; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ SuperSandro2000 ]; }; }) diff --git a/pkgs/by-name/li/libsshWithGssapi/package.nix b/pkgs/by-name/li/libsshWithGssapi/package.nix new file mode 100644 index 000000000000..73876b693484 --- /dev/null +++ b/pkgs/by-name/li/libsshWithGssapi/package.nix @@ -0,0 +1,3 @@ +{ libssh }: + +libssh.override { withGssapi = true; } diff --git a/pkgs/by-name/li/libsupermesh/package.nix b/pkgs/by-name/li/libsupermesh/package.nix index 3608367671c8..e523f9a89026 100644 --- a/pkgs/by-name/li/libsupermesh/package.nix +++ b/pkgs/by-name/li/libsupermesh/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libsupermesh"; - version = "2025.4"; + version = "2026.0"; src = fetchFromGitHub { owner = "firedrakeproject"; repo = "libsupermesh"; - tag = "v${finalAttrs.version}"; - hash = "sha256-VIGfuSVneCBapZyU0GXyi6isUSdhD2Ylm4mCymSvzbo="; + tag = finalAttrs.version; + hash = "sha256-f/5y3XherRbN/Eq3tfivrOHByF8LAXtYN3v9Vx82m8Q="; }; strictDeps = true; @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/firedrakeproject/libsupermesh"; description = "Parallel supermeshing library"; - changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/firedrakeproject/libsupermesh/releases/tag/${finalAttrs.version}"; license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ qbisi ]; diff --git a/pkgs/by-name/li/libsurvive/package.nix b/pkgs/by-name/li/libsurvive/package.nix index db75ee608c6b..772b03624fe2 100644 --- a/pkgs/by-name/li/libsurvive/package.nix +++ b/pkgs/by-name/li/libsurvive/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.01"; src = fetchFromGitHub { - owner = "cntools"; + owner = "collabora"; repo = "libsurvive"; tag = "v${finalAttrs.version}"; # Fixes 'Unknown CMake command "cnkalman_generate_code"' @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { eigen ]; - # https://github.com/cntools/libsurvive/issues/272 + # https://github.com/collabora/libsurvive/issues/272 postPatch = '' substituteInPlace survive.pc.in \ libs/cnkalman/cnkalman.pc.in libs/cnkalman/libs/cnmatrix/cnmatrix.pc.in \ @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Open Source Lighthouse Tracking System"; - homepage = "https://github.com/cntools/libsurvive"; + homepage = "https://github.com/collabora/libsurvive"; license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/li/libtiff/package.nix b/pkgs/by-name/li/libtiff/package.nix index 3b6ba2345148..66f679f6c677 100644 --- a/pkgs/by-name/li/libtiff/package.nix +++ b/pkgs/by-name/li/libtiff/package.nix @@ -80,14 +80,17 @@ stdenv.mkDerivation (finalAttrs: { sphinx ]; - buildInputs = [ - libdeflate + # Things listed in the + # pkg-config file need to be propagated or else + # they will not be picked up properly + propagatedBuildInputs = [ libjpeg - # libwebp depends on us; this will cause infinite recursion otherwise - (libwebp.override { tiffSupport = false; }) - xz zlib zstd + libdeflate + xz + # libwebp depends on us; this will cause infinite recursion otherwise + (libwebp.override { tiffSupport = false; }) ] ++ lib.optionals withLerc [ lerc diff --git a/pkgs/by-name/li/libtorrent-rakshasa/package.nix b/pkgs/by-name/li/libtorrent-rakshasa/package.nix index 6a771d39158e..b8685277e4c5 100644 --- a/pkgs/by-name/li/libtorrent-rakshasa/package.nix +++ b/pkgs/by-name/li/libtorrent-rakshasa/package.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rakshasa"; - version = "0.16.13"; + version = "0.16.17"; __structuredAttrs = true; @@ -22,7 +22,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "rakshasa"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; - hash = "sha256-PRVSH2kOzQhmUSdueDSB9stLwCtbITisuvpysrw4M+I="; + hash = "sha256-gwEbaAe1A5bPBrrQDBeKraAwdzgbcUYVZYt8Gjtugi8="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix index 82626adf9740..36329fdabc7b 100644 --- a/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix +++ b/pkgs/by-name/li/libtorrent-rasterbar-2_0_x/package.nix @@ -17,14 +17,14 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "libtorrent-rasterbar"; - version = "2.0.12"; + version = "2.0.13"; src = fetchFromGitHub { owner = "arvidn"; repo = "libtorrent"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-JbNOKzB830VQkZjC8ZAmzbu/7nkAgyD8cOr22uYbIGQ="; + hash = "sha256-0L7C3IY/XA+/vLJjZr47aFdYypevhMn1tzZNvDtOjbw="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/libtpms/package.nix b/pkgs/by-name/li/libtpms/package.nix index f658b8d23f6c..d0b6a1f2e0a2 100644 --- a/pkgs/by-name/li/libtpms/package.nix +++ b/pkgs/by-name/li/libtpms/package.nix @@ -2,6 +2,7 @@ lib, stdenv, fetchFromGitHub, + fetchpatch2, pkg-config, autoreconfHook, openssl, @@ -10,16 +11,21 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtpms"; - version = "0.10.2"; + version = "0.10.2-unstable-2026-05-06"; src = fetchFromGitHub { owner = "stefanberger"; repo = "libtpms"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-UhEpq5f/FT5DmtzQBe/Si414mOq+D4glikgRNK60GKQ="; + rev = "521c51073fe6f7c56023db78e56961fcaf7906e8"; + hash = "sha256-wCipOOr3LnLq1NqDtxw6hq0VTyniDwp18vBxyET/WGM="; }; - hardeningDisable = [ "strictflexarrays3" ]; + patches = [ + (fetchpatch2 { + url = "https://github.com/stefanberger/libtpms/commit/2d9b00c4e42677cd0a9b67344f4d873ddc409a21.patch?full_index=1"; + hash = "sha256-MVHy0sdg8ywKzu9M4ueRjH786uXQK8al21k8f+mAdR0="; + }) + ]; nativeBuildInputs = [ autoreconfHook diff --git a/pkgs/by-name/li/libtree/package.nix b/pkgs/by-name/li/libtree/package.nix index 6ad5681d5ddf..2ad002f43cd2 100644 --- a/pkgs/by-name/li/libtree/package.nix +++ b/pkgs/by-name/li/libtree/package.nix @@ -53,7 +53,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ prusnak - rardiol ]; }; }) diff --git a/pkgs/by-name/li/libtsm/package.nix b/pkgs/by-name/li/libtsm/package.nix index 5cca1ae05a7b..fd960021e34b 100644 --- a/pkgs/by-name/li/libtsm/package.nix +++ b/pkgs/by-name/li/libtsm/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libtsm"; - version = "4.5.0"; + version = "4.6.0"; src = fetchFromGitHub { owner = "kmscon"; repo = "libtsm"; tag = "v${finalAttrs.version}"; - hash = "sha256-5Lv/Hb0FGWARk3Wv3IuAbtCDII7qOMmcZSmKTkgTEsc="; + hash = "sha256-CN5ktki8fbvmiGiyDvDf4ayRKakpWRI51SdhRbFqNVM="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libu2f-emu/package.nix b/pkgs/by-name/li/libu2f-emu/package.nix index 640402e64d20..97e9a69032e8 100644 --- a/pkgs/by-name/li/libu2f-emu/package.nix +++ b/pkgs/by-name/li/libu2f-emu/package.nix @@ -39,12 +39,6 @@ stdenv.mkDerivation { # Fix header guard typo: TRANSaCTION_H -> TRANSACTION_H substituteInPlace src/usb/transaction.h \ --replace-fail "define TRANSaCTION_H" "define TRANSACTION_H" - - # Install headers into a u2f-emu/ subdirectory so consumers can - # use #include (expected by QEMU). - substituteInPlace src/meson.build \ - --replace-fail "install_headers(u2f_emu_headers)" \ - "install_headers(u2f_emu_headers, subdir: 'u2f-emu')" ''; # Disable -Werror: upstream uses OpenSSL EC_KEY APIs deprecated since 3.0. diff --git a/pkgs/by-name/li/libudev-garden/package.nix b/pkgs/by-name/li/libudev-garden/package.nix new file mode 100644 index 000000000000..a46695d9bc6b --- /dev/null +++ b/pkgs/by-name/li/libudev-garden/package.nix @@ -0,0 +1,45 @@ +{ + lib, + stdenv, + fetchFromCodeberg, + nix-update-script, + meson, + ninja, + pkg-config, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libudev-garden"; + version = "0.2.1"; + + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "Gardenhouse"; + repo = "libudev-garden"; + tag = "v${finalAttrs.version}"; + hash = "sha256-+95+3Hb6lkIhpNZF0pQdM9y5GxZCplp/o2nemZJb5Wc="; + }; + + strictDeps = true; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + homepage = "https://codeberg.org/Gardenhouse/libudev-garden"; + description = "Daemonless replacement for libudev for use with gardendevd"; + maintainers = with lib.maintainers; [ + aanderse + choco98 + ]; + license = lib.licenses.isc; + pkgConfigModules = [ "libudev" ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/li/libultrahdr/package.nix b/pkgs/by-name/li/libultrahdr/package.nix index c3ef856b8fbf..c4328f72fcfb 100644 --- a/pkgs/by-name/li/libultrahdr/package.nix +++ b/pkgs/by-name/li/libultrahdr/package.nix @@ -40,6 +40,20 @@ stdenv.mkDerivation (finalAttrs: { (replaceVars ./gtest.patch { GTEST_INCLUDE_DIRS = "${lib.getDev gtest}/include"; }) + + # Remove platform and architecture detection logic + # Also drop arch-specific compile and optimization flags to ensure + # packaging friendliness. + # Based on https://github.com/google/libultrahdr/pull/383 + # modified to target 1.4.0 instead of main + ./remove-platform-and-detection-logic.patch + + # fix tests on big-endian + # https://github.com/google/libultrahdr/pull/396 + (fetchpatch { + url = "https://github.com/google/libultrahdr/commit/13a058f452d846e43d4691f6885eeeaa8b0ea8d0.patch"; + hash = "sha256-2ZVvBMz8wQLEThuXdRJbbx5m2ouRZpxVWoH88RLmit4="; + }) ]; # CMake incorrect absolute include/lib paths: https://github.com/NixOS/nixpkgs/issues/144170 @@ -53,6 +67,12 @@ stdenv.mkDerivation (finalAttrs: { 'includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@' ''; + # use sse2 for floating point math to fix tests + env = lib.optionalAttrs stdenv.hostPlatform.isi686 { + CFLAGS = "-mfpmath=sse -msse2"; + CXXFLAGS = "-mfpmath=sse -msse2"; + }; + cmakeFlags = [ (lib.cmakeBool "UHDR_BUILD_TESTS" true) # Build disables install target in cross-compilation mode so @@ -102,33 +122,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ yzx9 ]; - # CMake script rejects non-approved platform targets - # https://github.com/google/libultrahdr/pull/383 would get rid of that - platforms = - let - # Values from the "Detect system" section in /CMakeLists.txt - # https://github.com/google/libultrahdr/blob/d52a0d13814ca399fc8a07e23de1d2c63f0e8404/CMakeLists.txt#L34 - oss = [ - "linux" - "windows" - "darwin" - ]; - archs = [ - "i686" - "x86_64" - "aarch64" - "armv7l" - "riscv64" - "riscv32" - "loongarch64" - ]; - in - lib.lists.intersectLists lib.platforms.all ( - lib.lists.crossLists (arch: os: "${arch}-${os}") [ - archs - oss - ] - ); + platforms = lib.platforms.all; license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/by-name/li/libultrahdr/remove-platform-and-detection-logic.patch b/pkgs/by-name/li/libultrahdr/remove-platform-and-detection-logic.patch new file mode 100644 index 000000000000..5c3521be65a6 --- /dev/null +++ b/pkgs/by-name/li/libultrahdr/remove-platform-and-detection-logic.patch @@ -0,0 +1,142 @@ +From e2daed8da97d8857dcec2fd68d2f6f3326170f67 Mon Sep 17 00:00:00 2001 +From: Kleis Auke Wolthuizen +Date: Wed, 10 Dec 2025 15:01:28 +0100 +Subject: [PATCH] Remove platform and architecture detection logic + +Also drop arch-specific compile and optimization flags to ensure +packaging friendliness. +--- + CMakeLists.txt | 104 +++----------------------------------------- + cmake/package.cmake | 3 -- + 2 files changed, 5 insertions(+), 102 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 51283356..07ed9100 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -25,44 +25,6 @@ project(libuhdr + LANGUAGES C CXX + DESCRIPTION "Library for encoding and decoding ultrahdr images") + +-########################################################### +-# Detect system +-########################################################### +-if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") +-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Emscripten") +-elseif(${CMAKE_SYSTEM_NAME} MATCHES "Android") +-elseif(WIN32) +-elseif(APPLE) +-else() +- message(FATAL_ERROR "Platform ${CMAKE_SYSTEM_NAME} not recognized") +-endif() +- +-if(CMAKE_SYSTEM_PROCESSOR MATCHES "amd64.*|x86_64.*|AMD64.*") +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- set(ARCH "amd64") +- else() +- set(ARCH "i386") +- endif() +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "i686.*|i386.*|x86.*") +- set(ARCH "i386") +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(aarch64.*|AARCH64.*|arm64.*|ARM64.*)") +- if(CMAKE_SIZEOF_VOID_P EQUAL 8) +- set(ARCH "aarch64") +- else() +- set(ARCH "arm") +- endif() +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^(arm.*|ARM.*)") +- set(ARCH "arm") +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv64") +- set(ARCH "riscv64") +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^riscv32") +- set(ARCH "riscv32") +-elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "^loongarch64") +- set(ARCH "loong64") +-else() +- message(FATAL_ERROR "Architecture: ${CMAKE_SYSTEM_PROCESSOR} not recognized") +-endif() +- + ########################################################### + # Directories + ########################################################### +@@ -287,45 +228,9 @@ elseif(EMSCRIPTEN) + or try 'cmake -DUHDR_BUILD_DEPS=1'") + endif() + endif() +-else() +- add_compile_options(-ffunction-sections) +- add_compile_options(-fdata-sections) +- add_compile_options(-fomit-frame-pointer) +- add_compile_options(-ffp-contract=fast) +- if(ARCH STREQUAL "i386") +- add_compile_options(-m32) +- add_compile_options(-march=i386) +- add_compile_options(-mtune=generic) +- elseif(ARCH STREQUAL "amd64") +- add_compile_options(-m64) +- add_compile_options(-march=x86-64) +- add_compile_options(-mtune=generic) +- elseif(ARCH STREQUAL "arm") +- add_compile_options(-march=armv7-a) +- add_compile_options(-marm) +- if(NOT ANDROID_ABI) +- add_compile_options(-mfloat-abi=hard) +- endif() +- add_compile_options(-mfpu=neon-vfpv3) +- add_compile_options(-fno-lax-vector-conversions) +- elseif(ARCH STREQUAL "aarch64") +- add_compile_options(-march=armv8-a) +- add_compile_options(-fno-lax-vector-conversions) +- elseif(ARCH STREQUAL "riscv64") +- add_compile_options(-march=rv64gc) +- add_compile_options(-mabi=lp64d) +- elseif(ARCH STREQUAL "riscv32") +- add_compile_options(-march=rv32gc) +- add_compile_options(-mabi=ilp32d) +- elseif(ARCH STREQUAL "loong64") +- add_compile_options(-march=loongarch64) +- add_compile_options(-mabi=lp64d) +- endif() +- +- if(UHDR_ENABLE_WERROR) +- CheckCompilerOption("-Werror" SUPPORTS_WERROR) +- set(UHDR_WERROR_FLAGS "-Werror") +- endif() ++elseif(UHDR_ENABLE_WERROR) ++ CheckCompilerOption("-Werror" SUPPORTS_WERROR) ++ set(UHDR_WERROR_FLAGS "-Werror") + endif() + + ########################################################### +@@ -585,7 +490,8 @@ set_property(DIRECTORY PROPERTY ADDITIONAL_MAKE_CLEAN_FILES + ########################################################### + file(GLOB UHDR_CORE_SRCS_LIST "${SOURCE_DIR}/src/*.cpp") + if(UHDR_ENABLE_INTRINSICS) +- if(ARCH STREQUAL "arm" OR ARCH STREQUAL "aarch64") ++ string(TOLOWER ${CMAKE_SYSTEM_PROCESSOR} CMAKE_SYSTEM_PROCESSOR_LC) ++ if(CMAKE_SYSTEM_PROCESSOR_LC STREQUAL "aarch64" OR CMAKE_SYSTEM_PROCESSOR_LC MATCHES "^arm") + file(GLOB UHDR_CORE_NEON_SRCS_LIST "${SOURCE_DIR}/src/dsp/arm/*.cpp") + list(APPEND UHDR_CORE_SRCS_LIST ${UHDR_CORE_NEON_SRCS_LIST}) + endif() +diff --git a/cmake/package.cmake b/cmake/package.cmake +index 2e3649aa..5a416c22 100644 +--- a/cmake/package.cmake ++++ b/cmake/package.cmake +@@ -29,9 +29,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "") + message(FATAL_ERROR "Failed to determine CPACK_SYSTEM_NAME. Is CMAKE_SYSTEM_NAME set?" ) + endif() + string(TOLOWER "${CMAKE_SYSTEM_NAME}" CPACK_SYSTEM_NAME) +-set(CPACK_PACKAGE_ARCHITECTURE ${ARCH}) + set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${CPACK_PACKAGE_VERSION}-${CPACK_SYSTEM_NAME}") +-set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_FILE_NAME}-${CPACK_PACKAGE_ARCHITECTURE}") + set(CPACK_RESOURCE_FILE_LICENSE ${CMAKE_SOURCE_DIR}/LICENSE) + set(CPACK_PACKAGING_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX}) + +@@ -46,7 +44,6 @@ elseif(UNIX) + set(CPACK_DEBIAN_PACKAGE_HOMEPAGE ${CPACK_PACKAGE_HOMEPAGE_URL}) + elseif(EXISTS "/etc/redhat-release") + set(CPACK_GENERATOR "RPM") +- set(CPACK_RPM_PACKAGE_ARCHITECTURE ${CPACK_PACKAGE_ARCHITECTURE}) + set(CPACK_RPM_PACKAGE_RELEASE 1) + set(CPACK_RPM_PACKAGE_LICENSE "Apache 2.0") + set(CPACK_RPM_PACKAGE_URL ${CPACK_PACKAGE_HOMEPAGE_URL}) diff --git a/pkgs/by-name/li/libunibreak/package.nix b/pkgs/by-name/li/libunibreak/package.nix index 12c8795e30af..5ad9b09d6aaf 100644 --- a/pkgs/by-name/li/libunibreak/package.nix +++ b/pkgs/by-name/li/libunibreak/package.nix @@ -5,28 +5,29 @@ autoreconfHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "libunibreak"; - version = "6.1"; + version = "7.0"; src = let - rev_version = lib.replaceStrings [ "." ] [ "_" ] version; + rev_version = lib.replaceStrings [ "." ] [ "_" ] finalAttrs.version; in fetchFromGitHub { owner = "adah1972"; repo = "libunibreak"; - rev = "libunibreak_${rev_version}"; - sha256 = "sha256-8yheb+XSvc1AqITjSutF+/4OWb4+7hweedKzhKJcE1Y="; + tag = "libunibreak_${rev_version}"; + hash = "sha256-J+/L5pFudppf0l0Gk/6/Rwz5I59p9Aw11cUEPRPGP/8="; }; nativeBuildInputs = [ autoreconfHook ]; meta = { homepage = "https://github.com/adah1972/libunibreak"; + changelog = "https://github.com/adah1972/libunibreak/blob/${finalAttrs.src.tag}/NEWS"; description = "Implementation of line breaking and word breaking algorithms as in the Unicode standard"; license = lib.licenses.zlib; platforms = lib.platforms.unix; maintainers = [ ]; }; -} +}) diff --git a/pkgs/by-name/li/libusb1/package.nix b/pkgs/by-name/li/libusb1/package.nix index 4676098bff3e..06f18ee6e5ca 100644 --- a/pkgs/by-name/li/libusb1/package.nix +++ b/pkgs/by-name/li/libusb1/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libusb"; - version = "1.0.29"; + version = "1.0.30"; src = fetchFromGitHub { owner = "libusb"; repo = "libusb"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-m1w+uF8+2WCn72LvoaGUYa+R0PyXHtFFONQjdRfImYY="; + sha256 = "sha256-qgs8h1vSqJg2muBDWN5nJlvaMjGYZnwMg1m07rqzHco="; }; outputs = [ diff --git a/pkgs/by-name/li/libuv/package.nix b/pkgs/by-name/li/libuv/package.nix index 34b680b32e91..bcbf5472a7e2 100644 --- a/pkgs/by-name/li/libuv/package.nix +++ b/pkgs/by-name/li/libuv/package.nix @@ -129,6 +129,10 @@ stdenv.mkDerivation (finalAttrs: { # https://github.com/libuv/libuv/issues/1871 "shutdown_close_pipe" ] + ++ lib.optionals stdenv.hostPlatform.isRiscV64 [ + # Aborts (SIGABRT, exit 134) + "poll_nested_epoll" + ] ++ lib.optionals stdenv.hostPlatform.isFreeBSD [ # ENETUNREACH when performed in jailed build env "tcp_connect" diff --git a/pkgs/by-name/li/libuvc/package.nix b/pkgs/by-name/li/libuvc/package.nix index b188243b05f8..a47fee9f0b48 100644 --- a/pkgs/by-name/li/libuvc/package.nix +++ b/pkgs/by-name/li/libuvc/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation { pname = "libuvc"; - version = "unstable-2020-11-29"; + version = "0.0.7-unstable-2024-03-05"; src = fetchFromGitHub { owner = "libuvc"; repo = "libuvc"; - rev = "5cddef71b17d41f7e98875a840c50d9704c3d2b2"; - sha256 = "0kranb0x1k5qad8rwxnn1w9963sbfj2cfzdgpfmlivb04544m2j7"; + rev = "047920bcdfb1dac42424c90de5cc77dfc9fba04d"; + hash = "sha256-Ds4N9ezdO44eBszushQVvK0SUVDwxGkUty386VGqbT0="; }; # Upstream doesn't yet support CMake 4, remove once fixed diff --git a/pkgs/by-name/li/libversion/package.nix b/pkgs/by-name/li/libversion/package.nix index ba5c0d1ee3db..e9fe43fd2337 100644 --- a/pkgs/by-name/li/libversion/package.nix +++ b/pkgs/by-name/li/libversion/package.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Advanced version string comparison library"; homepage = "https://github.com/repology/libversion"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ ryantm ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libvfn/package.nix b/pkgs/by-name/li/libvfn/package.nix new file mode 100644 index 000000000000..a523b0a150ce --- /dev/null +++ b/pkgs/by-name/li/libvfn/package.nix @@ -0,0 +1,69 @@ +{ + lib, + stdenv, + fetchFromGitHub, + meson, + ninja, + pkg-config, + perl, + nix-update-script, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "libvfn"; + version = "5.1.0"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "SamsungDS"; + repo = "libvfn"; + tag = "v${finalAttrs.version}"; + hash = "sha256-CEVjJVeDEEJcJX2/6fwKGBHDsxgN+pL7fJWvQ+iCh3Y="; + }; + + nativeBuildInputs = [ + meson + ninja + pkg-config + perl + ]; + + postPatch = '' + patchShebangs scripts/trace.pl scripts/ctags.sh scripts/sparse.py + ''; + + mesonFlags = [ + (lib.mesonEnable "docs" false) + (lib.mesonEnable "libnvme" false) + (lib.mesonBool "profiling" false) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Zero-dependency library for interacting with PCIe-based NVMe devices from user-space"; + longDescription = '' + libvfn is a zero-dependency library for interacting with PCIe-based NVMe + devices from user-space using the Linux kernel vfio-pci driver. The core + of the library is excessively low-level and aims to allow controller + verification and testing teams to interact with the NVMe device at the + register and queue level. + ''; + homepage = "https://github.com/SamsungDS/libvfn"; + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ joelgranados ]; + + # Explicit list of tested platforms. The abstractions on other platforms + # are untested and might not work. More will be added as we test them. + platforms = [ + "x86_64-linux" + "aarch64-linux" + ]; + sourceProvenance = with lib.sourceTypes; [ + fromSource + binaryNativeCode + ]; + }; +}) diff --git a/pkgs/by-name/li/libvgm/package.nix b/pkgs/by-name/li/libvgm/package.nix index c6776d0c49da..4097c05e8d16 100644 --- a/pkgs/by-name/li/libvgm/package.nix +++ b/pkgs/by-name/li/libvgm/package.nix @@ -38,13 +38,13 @@ assert enableTools -> enableAudio && enableEmulation && enableLibplayer; stdenv.mkDerivation (finalAttrs: { pname = "libvgm"; - version = "0-unstable-2026-04-06"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "ValleyBell"; repo = "libvgm"; - rev = "d1151884997ba4769b070b7c7aaedeffc60a25fb"; - hash = "sha256-SiOB2M7RNo4S5uIr8wXsZ1UtS2+2N8Tqm5iJ+Am3Ep4="; + rev = "867223e7c33d63de115d1ab955f784c44f19040a"; + hash = "sha256-GuvngfkqLy3E5Esb+HOnY6G1XYDyDzv1yz+NccaclGI="; }; outputs = [ diff --git a/pkgs/by-name/li/libvirt/package.nix b/pkgs/by-name/li/libvirt/package.nix index a17ec8bbe5fe..084657ebe830 100644 --- a/pkgs/by-name/li/libvirt/package.nix +++ b/pkgs/by-name/li/libvirt/package.nix @@ -419,7 +419,7 @@ stdenv.mkDerivation rec { libvirtVersion=$(curl https://gitlab.com/api/v4/projects/192693/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") sysvirtVersion=$(curl https://gitlab.com/api/v4/projects/192677/repository/tags | jq -r '.[].name|select(. | contains("rc") | not)' | head -n1 | sed "s/v//g") update-source-version ${pname} "$libvirtVersion" - update-source-version python3Packages.${pname} "$libvirtVersion" + update-source-version python3Packages.libvirt-python "$libvirtVersion" update-source-version perlPackages.SysVirt "$sysvirtVersion" --file="pkgs/top-level/perl-packages.nix" ''; diff --git a/pkgs/by-name/li/libvlcpp/package.nix b/pkgs/by-name/li/libvlcpp/package.nix index 5aae8b619233..450acf0c48fd 100644 --- a/pkgs/by-name/li/libvlcpp/package.nix +++ b/pkgs/by-name/li/libvlcpp/package.nix @@ -2,26 +2,28 @@ lib, stdenv, fetchFromGitLab, - autoreconfHook, pkg-config, libvlc, + meson, + ninja, }: stdenv.mkDerivation (finalAttrs: { pname = "libvlcpp"; - version = "0.1.0-unstable-2024-02-04"; + version = "0.1.0-unstable-2026-04-16"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = "libvlcpp"; - rev = "44c1f48e56a66c3f418175af1e1ef3fd1ab1b118"; - hash = "sha256-nnS4DMz/2VciCrhOBGRb1+kDbxj+ZOnEtQmzs/TJ870="; + rev = "33214afee13df36dc46309ef5416d681b56db5b9"; + hash = "sha256-PjJzFrvkmrTsBjzmEG6hNU8VzDlofQrdfTGFhxkVPWU="; }; nativeBuildInputs = [ + meson + ninja pkg-config - autoreconfHook ]; propagatedBuildInputs = [ diff --git a/pkgs/by-name/li/libvmi/package.nix b/pkgs/by-name/li/libvmi/package.nix index 53680ff18971..1619409ed4d4 100644 --- a/pkgs/by-name/li/libvmi/package.nix +++ b/pkgs/by-name/li/libvmi/package.nix @@ -13,9 +13,6 @@ json_c, libvirt, - withVMIFS ? true, - fuse, - legacyKVM ? false, libkvmi, @@ -67,13 +64,11 @@ stdenv.mkDerivation { libvirt ] ++ lib.optionals xenSupport [ xen ] - ++ lib.optionals (!legacyKVM) [ libkvmi ] - ++ lib.optionals withVMIFS [ fuse ]; + ++ lib.optionals (!legacyKVM) [ libkvmi ]; configureFlags = lib.optionals (!xenSupport) [ "--disable-xen" ] - ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ] - ++ lib.optionals withVMIFS [ "--enable-vmifs" ]; + ++ lib.optionals legacyKVM [ "--enable-kvm-legacy" ]; # libvmi uses dlopen() for the xen libraries, however autoPatchelfHook doesn't work here postFixup = lib.optionalString xenSupport '' diff --git a/pkgs/by-name/li/libvncserver/package.nix b/pkgs/by-name/li/libvncserver/package.nix index 29ce2959e878..1cc1489c93d9 100644 --- a/pkgs/by-name/li/libvncserver/package.nix +++ b/pkgs/by-name/li/libvncserver/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_SYSTEMD" withSystemd) (lib.cmakeBool "BUILD_SHARED_LIBS" enableShared) (lib.cmakeBool "WITH_EXAMPLES" buildExamples) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; # This test checks if using the **installed** headers works. diff --git a/pkgs/by-name/li/libvori/package.nix b/pkgs/by-name/li/libvori/package.nix index 42c00efae9f8..8cc74b367f03 100644 --- a/pkgs/by-name/li/libvori/package.nix +++ b/pkgs/by-name/li/libvori/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library for Voronoi integration of electron densities"; homepage = "https://brehm-research.de/libvori.php"; - license = with lib.licenses; [ lgpl3Only ]; + license = lib.licenses.lgpl3Only; platforms = lib.platforms.unix; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/li/libwacom/package.nix b/pkgs/by-name/li/libwacom/package.nix index c7a3a0677360..bcbd92554548 100644 --- a/pkgs/by-name/li/libwacom/package.nix +++ b/pkgs/by-name/li/libwacom/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libwacom"; - version = "2.19.0"; + version = "2.19.1"; outputs = [ "bin" @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "linuxwacom"; repo = "libwacom"; rev = "libwacom-${finalAttrs.version}"; - hash = "sha256-0TlTt/9kN8NiWGDhvzMfvgJZnlzwcEFzAOCSzRowX8A="; + hash = "sha256-BYfMltOBhb9iS2sTazibcdIaAq5WHecHJIHIfu/cUAQ="; }; postPatch = '' diff --git a/pkgs/by-name/li/libwebsockets/package.nix b/pkgs/by-name/li/libwebsockets/package.nix index f0e50b0f6132..23a412dc3ec5 100644 --- a/pkgs/by-name/li/libwebsockets/package.nix +++ b/pkgs/by-name/li/libwebsockets/package.nix @@ -59,13 +59,24 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace lib/CMakeLists.txt \ --replace-fail '=\''${exec_prefix}/''${LWS_INSTALL_LIB_DIR}' '=''${CMAKE_INSTALL_FULL_LIBDIR}' \ --replace-fail '=\''${prefix}/''${LWS_INSTALL_INCLUDE_DIR}' '=''${CMAKE_INSTALL_FULL_INCLUDEDIR}' + + substituteInPlace cmake/lws_config.h.in \ + --replace-fail '"''${CMAKE_INSTALL_PREFIX}/''${LWS_INSTALL_LIB_DIR}"' '"''${CMAKE_INSTALL_FULL_LIBDIR}"' '' # Remove after https://github.com/warmcat/libwebsockets/pull/3567 has been merged or otherwise addressed + lib.optionalString stdenv.hostPlatform.isStatic '' substituteInPlace "cmake/libwebsockets-config.cmake.in" --replace-fail \ "set(LIBWEBSOCKETS_LIBRARIES websockets websockets_shared)" \ "set(LIBWEBSOCKETS_LIBRARIES websockets)" - ''; + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Fix doubled store path in macOS install_name + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'SET(CMAKE_INSTALL_NAME_DIR "''${CMAKE_INSTALL_PREFIX}/''${LWS_INSTALL_LIB_DIR}")' \ + 'SET(CMAKE_INSTALL_NAME_DIR "''${LWS_INSTALL_LIB_DIR}")' + '' + + lib.optionalString stdenv.hostPlatform.isStatic ""; postInstall = '' # Fix path that will be incorrect on move to "dev" output. diff --git a/pkgs/by-name/li/libwhereami/package.nix b/pkgs/by-name/li/libwhereami/package.nix index e77179f3066d..6c03202f9e7e 100644 --- a/pkgs/by-name/li/libwhereami/package.nix +++ b/pkgs/by-name/li/libwhereami/package.nix @@ -50,7 +50,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; # fails on aarch64 }; diff --git a/pkgs/by-name/li/libwmf/package.nix b/pkgs/by-name/li/libwmf/package.nix index 76872bf26404..4ca132dbddaf 100644 --- a/pkgs/by-name/li/libwmf/package.nix +++ b/pkgs/by-name/li/libwmf/package.nix @@ -2,7 +2,9 @@ lib, stdenv, fetchFromGitHub, + autoreconfHook, pkg-config, + expat, freetype, glib, imagemagick, @@ -14,7 +16,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libwmf"; - version = "0.2.13"; + version = "0.2.15"; outputs = [ "out" @@ -24,11 +26,15 @@ stdenv.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "caolanm"; repo = "libwmf"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-vffohx57OvQKu8DfNXNBm9bPsA8KgkQWs/3mmFn7L6M="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Bpxr04dQ6EjX1FBVF4KcbJQvUjsPK6L03xLIXG6F2FI="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + buildInputs = [ zlib imagemagick @@ -37,10 +43,12 @@ stdenv.mkDerivation (finalAttrs: { freetype libjpeg libxml2 + expat ]; enableParallelBuilding = true; meta = { + changelog = "https://github.com/caolanm/libwmf/blob/${finalAttrs.src.tag}/ChangeLog"; description = "WMF library from wvWare"; homepage = "https://wvware.sourceforge.net/libwmf.html"; downloadPage = "https://github.com/caolanm/libwmf/releases"; diff --git a/pkgs/by-name/li/libxfont_2/package.nix b/pkgs/by-name/li/libxfont_2/package.nix index 9f1dbea7359e..0156515019d1 100644 --- a/pkgs/by-name/li/libxfont_2/package.nix +++ b/pkgs/by-name/li/libxfont_2/package.nix @@ -15,7 +15,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxfont_2"; - version = "2.0.7"; + version = "2.0.8"; outputs = [ "out" @@ -24,7 +24,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXfont2-${finalAttrs.version}.tar.xz"; - hash = "sha256-i3uC/eukh2m2lDPo4/u5hKX2vzaLDV9Hq+7EnePljvs="; + hash = "sha256-9VbA4Qk6TmkRzJC8SxBtIBkC7hh/10ryBv8WL35qJNU="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxi/package.nix b/pkgs/by-name/li/libxi/package.nix index 3cbac22c36f3..0475ba395175 100644 --- a/pkgs/by-name/li/libxi/package.nix +++ b/pkgs/by-name/li/libxi/package.nix @@ -12,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxi"; - version = "1.8.2"; + version = "1.8.3"; outputs = [ "out" @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libXi-${finalAttrs.version}.tar.xz"; - hash = "sha256-0OBVXlPW4hFOq/pEImuhYtJwhQGiXhjZnPs1wJTGwQQ="; + hash = "sha256-etYAVvAa9PeGz+k7OncHRHcRYm/I2iY3vscakECbq+U="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch b/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch deleted file mode 100644 index c0a8b7ac43af..000000000000 --- a/pkgs/by-name/li/libxkbcommon_8/disable-x11com.patch +++ /dev/null @@ -1,23 +0,0 @@ -On nixpkgs /tmp/.X11-unix is not compatible with Xvfb requirement and the -test fails. ---- a/meson.build -+++ b/meson.build -@@ -1229,18 +1229,6 @@ if get_option('enable-x11') - env: test_env, - is_parallel : false, - ) -- test( -- 'x11comp', -- executable( -- 'test-x11comp', -- 'test/x11comp.c', -- 'test/utils-text.c', -- 'test/utils-text.h', -- dependencies: x11_xvfb_test_dep -- ), -- env: test_env, -- is_parallel : false, -- ) - endif - if get_option('enable-xkbregistry') - test( diff --git a/pkgs/by-name/li/libxkbcommon_8/package.nix b/pkgs/by-name/li/libxkbcommon_8/package.nix index caed48e59c02..7c96341eb86c 100644 --- a/pkgs/by-name/li/libxkbcommon_8/package.nix +++ b/pkgs/by-name/li/libxkbcommon_8/package.nix @@ -11,6 +11,8 @@ libxcb, libxml2, python3, + setxkbmap, + xkbcomp, libx11, # To enable the "interactive-wayland" subcommand of xkbcli. This is the # wayland equivalent of `xev` on X11. @@ -24,20 +26,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxkbcommon"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "xkbcommon"; repo = "libxkbcommon"; tag = "xkbcommon-${finalAttrs.version}"; - hash = "sha256-wUsxsM0xXTg7nbvFMXrrnHherOepj0YI77eferjRgJA="; + hash = "sha256-JdS4+HPHDUUOUq5TUX2F5DicHif8wD3cPvMocWhD4S4="; }; - patches = [ - # Disable one Xvfb test as it fails for permission checks. - ./disable-x11com.patch - ]; - outputs = [ "out" "dev" @@ -64,7 +61,11 @@ stdenv.mkDerivation (finalAttrs: { wayland wayland-protocols ]; - nativeCheckInputs = [ python3 ]; + nativeCheckInputs = [ + python3 + setxkbmap + xkbcomp + ]; mesonFlags = [ "-Dxkb-config-root=${xkeyboard_config}/etc/X11/xkb" diff --git a/pkgs/by-name/li/libxkbfile/package.nix b/pkgs/by-name/li/libxkbfile/package.nix index 93cd9028b379..4dd6270b4793 100644 --- a/pkgs/by-name/li/libxkbfile/package.nix +++ b/pkgs/by-name/li/libxkbfile/package.nix @@ -2,6 +2,8 @@ lib, stdenv, fetchurl, + meson, + ninja, pkg-config, xorgproto, libx11, @@ -10,7 +12,7 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxkbfile"; - version = "1.1.3"; + version = "1.2.0"; outputs = [ "out" @@ -19,12 +21,16 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://xorg/individual/lib/libxkbfile-${finalAttrs.version}.tar.xz"; - hash = "sha256-qbY+6pl6u57mqLT7tRWDHIQfRxr4RaCd5EOygAOHS+w="; + hash = "sha256-f3GITl+vVvsOgj84SFmc+bWpr85RyQmCuutk9jUjPr8="; }; strictDeps = true; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; buildInputs = [ xorgproto diff --git a/pkgs/by-name/li/libxmlb/package.nix b/pkgs/by-name/li/libxmlb/package.nix index 1d480f08f1e0..9218433fbe62 100644 --- a/pkgs/by-name/li/libxmlb/package.nix +++ b/pkgs/by-name/li/libxmlb/package.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmlb"; - version = "0.3.25"; + version = "0.3.27"; outputs = [ "out" @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "hughsie"; repo = "libxmlb"; rev = finalAttrs.version; - hash = "sha256-GBsaVJpnB6m1oItwD7t59BmoZcVQBU/sPz5fGGVzBG0="; + hash = "sha256-5RP794gBA67DcrjzqvguDYu/Sf+1X5kfRi9yvLx9b+c="; }; patches = [ diff --git a/pkgs/by-name/li/libxmlxx5/package.nix b/pkgs/by-name/li/libxmlxx5/package.nix index f9b7642082ac..98d6077a7ed1 100644 --- a/pkgs/by-name/li/libxmlxx5/package.nix +++ b/pkgs/by-name/li/libxmlxx5/package.nix @@ -1,7 +1,7 @@ { lib, stdenv, - fetchurl, + fetchFromGitHub, pkg-config, libxml2, glibmm, @@ -11,11 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmlxx5"; - version = "5.4"; + version = "5.6.1"; - src = fetchurl { - url = "mirror://gnome/sources/libxml++/${finalAttrs.version}/libxml++-${lib.versions.pad 3 finalAttrs.version}.tar.xz"; - hash = "sha256-6aI8Q2aGqUaY0hOOa8uvhJEh1jv6D1DcNP77/XlWaEg="; + src = fetchFromGitHub { + owner = "libxmlplusplus"; + repo = "libxmlplusplus"; + tag = finalAttrs.version; + hash = "sha256-f8R2T5A7C/HqydhZOlbWIKj6Q9oc97f2PfV8ef70G0I="; }; nativeBuildInputs = [ @@ -31,9 +33,10 @@ stdenv.mkDerivation (finalAttrs: { doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; meta = { + changelog = "https://github.com/libxmlplusplus/libxmlplusplus/blob/${finalAttrs.src.tag}/NEWS"; description = "C++ wrapper for the libxml2 XML parser library"; - homepage = "https://libxmlplusplus.sourceforge.net/"; - license = lib.licenses.lgpl2Plus; + homepage = "https://libxmlplusplus.github.io/libxmlplusplus"; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libxmp/package.nix b/pkgs/by-name/li/libxmp/package.nix index f54013905da5..327c21205901 100644 --- a/pkgs/by-name/li/libxmp/package.nix +++ b/pkgs/by-name/li/libxmp/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libxmp"; - version = "4.7.0"; + version = "4.7.1"; src = fetchFromGitHub { owner = "libxmp"; repo = "libxmp"; tag = "libxmp-${finalAttrs.version}"; - hash = "sha256-MatT8/tR8Gs3Q6WE+LOlbcZEiAxfO0Y89bo0c5reAUA="; + hash = "sha256-X+oIXTwlrLEl3n8gu5+LlNfIOBkZ02hiivrjTgVrqRk="; }; outputs = [ @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED" (!stdenv.hostPlatform.isStatic)) (lib.cmakeBool "BUILD_STATIC" stdenv.hostPlatform.isStatic) - (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_UNIT_TESTS" finalAttrs.finalPackage.doCheck) ]; doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; diff --git a/pkgs/by-name/li/libxslt/package.nix b/pkgs/by-name/li/libxslt/package.nix index 6de4895cf7bc..da39812157a4 100644 --- a/pkgs/by-name/li/libxslt/package.nix +++ b/pkgs/by-name/li/libxslt/package.nix @@ -78,6 +78,9 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' moveToOutput bin/xslt-config "$dev" moveToOutput lib/xsltConf.sh "$dev" + + substituteInPlace "$dev/lib/cmake/libxslt/libxslt-config.cmake" \ + --replace-fail '"''${PACKAGE_PREFIX_DIR}/lib"' "\"$out/lib\"" '' + lib.optionalString pythonSupport '' mkdir -p $py/nix-support diff --git a/pkgs/by-name/li/libxxf86dga/package.nix b/pkgs/by-name/li/libxxf86dga/package.nix index 20fa91a5f2af..5b4344a6fdf9 100644 --- a/pkgs/by-name/li/libxxf86dga/package.nix +++ b/pkgs/by-name/li/libxxf86dga/package.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "libxxf86dga"; - version = "1.1.6"; + version = "1.1.7"; src = fetchurl { url = "mirror://xorg/individual/lib/libXxf86dga-${finalAttrs.version}.tar.xz"; - hash = "sha256-vkRCdXmAj+OiF9WfUcrnVqJpE+tuTIc4zKtl/1bXmA8="; + hash = "sha256-s75bRE0yTLbg9LUBmklyyZ6jNsy4q3lo7M7+zZF//eY="; }; strictDeps = true; diff --git a/pkgs/by-name/li/libyang/package.nix b/pkgs/by-name/li/libyang/package.nix index 85ef0f7499e1..1838497f1208 100644 --- a/pkgs/by-name/li/libyang/package.nix +++ b/pkgs/by-name/li/libyang/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { sysrepo or FRRouting projects. ''; homepage = "https://github.com/CESNET/libyang"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ woffs ]; }; diff --git a/pkgs/by-name/li/libz/package.nix b/pkgs/by-name/li/libz/package.nix index 6e351e7bb43e..dfde91c55dfa 100644 --- a/pkgs/by-name/li/libz/package.nix +++ b/pkgs/by-name/li/libz/package.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://sortix.org/libz/"; description = "Clean fork of zlib"; - license = [ lib.licenses.zlib ]; + license = lib.licenses.zlib; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/libzim/package.nix b/pkgs/by-name/li/libzim/package.nix index a62b2fb5cd2b..acaaa36ff43a 100644 --- a/pkgs/by-name/li/libzim/package.nix +++ b/pkgs/by-name/li/libzim/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "libzim"; - version = "9.7.0"; + version = "9.8.1"; src = fetchFromGitHub { owner = "openzim"; repo = "libzim"; tag = finalAttrs.version; - hash = "sha256-W7s+RFC9g/IeZkbM/YJCwSfTjBQ8urYKZzyMJDFpAAM="; + hash = "sha256-XgUB3Nrz7qTinf9Xp1k+R8b+AfzpMAFlFUV6mej7TDU="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/license-plist/package.nix b/pkgs/by-name/li/license-plist/package.nix new file mode 100644 index 000000000000..95ade33eaca5 --- /dev/null +++ b/pkgs/by-name/li/license-plist/package.nix @@ -0,0 +1,46 @@ +{ + lib, + stdenvNoCC, + fetchzip, + versionCheckHook, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "license-plist"; + version = "3.27.7"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchzip { + url = "https://github.com/mono0926/LicensePlist/releases/download/${finalAttrs.version}/portable_licenseplist.zip"; + hash = "sha256-Z8jDFRZj0s6X+edexNZ0Qx2qUC8Bm2GC9uOrKWbXtCI="; + stripRoot = false; + }; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + install -Dm755 license-plist $out/bin/license-plist + runHook postInstall + ''; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "License list generator for iOS application dependencies"; + homepage = "https://github.com/mono0926/LicensePlist"; + changelog = "https://github.com/mono0926/LicensePlist/releases/tag/${finalAttrs.version}"; + license = lib.licenses.mit; + mainProgram = "license-plist"; + maintainers = with lib.maintainers; [ jeremystucki ]; + platforms = lib.platforms.darwin; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/li/licomp-toolkit/package.nix b/pkgs/by-name/li/licomp-toolkit/package.nix new file mode 100644 index 000000000000..e1205fa3a563 --- /dev/null +++ b/pkgs/by-name/li/licomp-toolkit/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.licomp-toolkit diff --git a/pkgs/by-name/li/lief/package.nix b/pkgs/by-name/li/lief/package.nix index d91399f0d52e..4b87c777fb79 100644 --- a/pkgs/by-name/li/lief/package.nix +++ b/pkgs/by-name/li/lief/package.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Library to Instrument Executable Formats"; homepage = "https://lief.quarkslab.com/"; - license = [ lib.licenses.asl20 ]; + license = lib.licenses.asl20; platforms = with lib.platforms; linux ++ darwin; maintainers = with lib.maintainers; [ lassulus diff --git a/pkgs/by-name/li/liferea/package.nix b/pkgs/by-name/li/liferea/package.nix index 494f4b65d837..d2095fdb8964 100644 --- a/pkgs/by-name/li/liferea/package.nix +++ b/pkgs/by-name/li/liferea/package.nix @@ -26,11 +26,11 @@ stdenv.mkDerivation rec { pname = "liferea"; - version = "1.16.10"; + version = "1.16.12"; src = fetchurl { url = "https://github.com/lwindolf/${pname}/releases/download/v${version}/${pname}-${version}.tar.bz2"; - hash = "sha256-4cprlrp/vCaoUN4HwZFa+H1DW1S5q/byQcd+g/g427g="; + hash = "sha256-9UDYvUuIhaz31vgq37KFtsfH3B2IzszzMaa/VSN8JW8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch b/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch deleted file mode 100644 index 8ddee3abf8d9..000000000000 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/fix-paths.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/greeter/CMakeLists.txt b/greeter/CMakeLists.txt -index 57aebb0..11c4ca7 100644 ---- a/greeter/CMakeLists.txt -+++ b/greeter/CMakeLists.txt -@@ -1,6 +1,6 @@ - project (greeter) --cmake_minimum_required (VERSION 2.8) --cmake_policy (VERSION 2.8) -+cmake_minimum_required (VERSION 3.10) -+cmake_policy (VERSION 3.10) - - enable_testing () - -@@ -9,7 +9,6 @@ list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake) - set (CONF_DIR "/etc/lightdm") - set (DATADIR "${CMAKE_INSTALL_PREFIX}/share") - set (PKGDATADIR "${DATADIR}/enso/greeter") --set (CMAKE_INSTALL_PREFIX /usr) - set (VERSION "1.0.6") - - -@@ -94,9 +93,9 @@ glib_compile_resources (GLIB_RESOURCES_CSS SOURCE data/css.gresource.xml) - add_executable (pantheon-greeter ${VALA_C} ${GLIB_RESOURCES_CSS}) - target_link_libraries(pantheon-greeter m) - --install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin) -+install (TARGETS pantheon-greeter RUNTIME DESTINATION bin) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters) --install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION ${CONF_DIR}) -+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/greeter.conf DESTINATION etc/lightdm) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR}) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/power.svg DESTINATION ${PKGDATADIR}) - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/checked.svg DESTINATION ${PKGDATADIR}) diff --git a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix b/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix deleted file mode 100644 index 91bbedc0e5dd..000000000000 --- a/pkgs/by-name/li/lightdm-enso-os-greeter/package.nix +++ /dev/null @@ -1,97 +0,0 @@ -{ - lib, - stdenv, - fetchFromGitHub, - pkg-config, - linkFarm, - lightdm-enso-os-greeter, - dbus, - pcre, - libepoxy, - libxdmcp, - libx11, - libpthread-stubs, - at-spi2-core, - libxklavier, - libxkbcommon, - gtk3, - vala, - cmake, - libgee, - lightdm, - gdk-pixbuf, - clutter-gtk, - wrapGAppsHook3, - librsvg, -}: - -stdenv.mkDerivation { - pname = "lightdm-enso-os-greeter"; - version = "0.2.1"; - - src = fetchFromGitHub { - owner = "nick92"; - repo = "Enso-OS"; - rev = "ed48330bfd986072bd82ac542ed8f8a7365c6427"; - sha256 = "sha256-v79J5KyjeJ99ifN7nK/B+J7f292qDAEHsmsHLAMKVYY="; - }; - - patches = [ - ./fix-paths.patch - ]; - - nativeBuildInputs = [ - cmake - pkg-config - vala - wrapGAppsHook3 - ]; - - buildInputs = [ - dbus - gtk3 - pcre - libepoxy - libgee - libx11 - lightdm - libxdmcp - gdk-pixbuf - clutter-gtk - libxklavier - at-spi2-core - libxkbcommon - libpthread-stubs - librsvg - ]; - - preConfigure = '' - cd greeter - ''; - - passthru.xgreeters = linkFarm "enso-os-greeter-xgreeters" [ - { - path = "${lightdm-enso-os-greeter}/share/xgreeters/pantheon-greeter.desktop"; - name = "pantheon-greeter.desktop"; - } - ]; - - postFixup = '' - substituteInPlace $out/share/xgreeters/pantheon-greeter.desktop \ - --replace "pantheon-greeter" "$out/bin/pantheon-greeter" - ''; - - meta = { - description = '' - A fork of pantheon greeter that positions elements in a central and - vertigal manner and adds a blur effect to the background - ''; - mainProgram = "pantheon-greeter"; - homepage = "https://github.com/nick92/Enso-OS"; - platforms = lib.platforms.linux; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ - eadwu - ]; - }; -} diff --git a/pkgs/by-name/li/lightdm-slick-greeter/package.nix b/pkgs/by-name/li/lightdm-slick-greeter/package.nix index 364cf7824910..96805f89afc5 100644 --- a/pkgs/by-name/li/lightdm-slick-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-slick-greeter/package.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lightdm-slick-greeter"; - version = "2.2.6"; + version = "2.2.7"; src = fetchFromGitHub { owner = "linuxmint"; repo = "slick-greeter"; rev = finalAttrs.version; - hash = "sha256-zYjtd/Lb9ialq+pzOml4FMfPq9maX848Or6lzyZj4qs="; + hash = "sha256-WP4OsiTEmACDXq5xNbJNEm28vdA3PQ8IscGiyaeyvwk="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix index fb365523f729..55d9aaab6d48 100644 --- a/pkgs/by-name/li/lightdm-tiny-greeter/package.nix +++ b/pkgs/by-name/li/lightdm-tiny-greeter/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { version = "1.2"; src = fetchFromGitHub { - owner = "off-world"; + owner = "tobiohlala"; repo = "lightdm-tiny-greeter"; rev = version; sha256 = "08azpj7b5qgac9bgi1xvd6qy6x2nb7iapa0v40ggr3d1fabyhrg6"; @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { meta = { description = "Tiny multi user lightdm greeter"; mainProgram = "lightdm-tiny-greeter"; - homepage = "https://github.com/off-world/lightdm-tiny-greeter"; + homepage = "https://github.com/tobiohlala/lightdm-tiny-greeter"; license = lib.licenses.bsd3; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/li/lightdm/package.nix b/pkgs/by-name/li/lightdm/package.nix index 3b250902fc43..a7822f5ef563 100644 --- a/pkgs/by-name/li/lightdm/package.nix +++ b/pkgs/by-name/li/lightdm/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - owner = "canonical"; + owner = "ubuntu"; repo = "lightdm"; tag = finalAttrs.version; sha256 = "sha256-ttNlhWD0Ran4d3QvZ+PxbFbSUGMkfrRm+hJdQxIDJvM="; @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { - homepage = "https://github.com/canonical/lightdm"; + homepage = "https://github.com/ubuntu/lightdm"; description = "Cross-desktop display manager"; platforms = lib.platforms.linux; license = with lib.licenses; [ diff --git a/pkgs/by-name/li/lightgbm/package.nix b/pkgs/by-name/li/lightgbm/package.nix index a0d18df3daf7..4573747649a1 100644 --- a/pkgs/by-name/li/lightgbm/package.nix +++ b/pkgs/by-name/li/lightgbm/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { version = "4.6.0"; src = fetchFromGitHub { - owner = "microsoft"; + owner = "lightgbm-org"; repo = "lightgbm"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; diff --git a/pkgs/by-name/li/lightning-loop/package.nix b/pkgs/by-name/li/lightning-loop/package.nix index de703a7f968b..a31298220176 100644 --- a/pkgs/by-name/li/lightning-loop/package.nix +++ b/pkgs/by-name/li/lightning-loop/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "lightning-loop"; - version = "0.33.0-beta"; + version = "0.33.2-beta"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "loop"; rev = "v${finalAttrs.version}"; - hash = "sha256-LfVC/s7VNc3LvypjdSFo0s2Ssmhk1Lzm9ojWGqaNCmI="; + hash = "sha256-NdwXEm5sj+Y5CPT9y658B6NTbM7heco5gLotyjBdg9c="; }; - vendorHash = "sha256-pzcOKYw2kXfGUOBZmuUYuEfRUY8f1PSj30tvhttEwAk="; + vendorHash = "sha256-2/T/rt1Q86tyzNOiweuDLEAUiSoYTRf/RiERV6MBmZg="; subPackages = [ "cmd/loop" diff --git a/pkgs/by-name/li/lightning-terminal/package.nix b/pkgs/by-name/li/lightning-terminal/package.nix index ed560e83762d..9bd9244214f7 100644 --- a/pkgs/by-name/li/lightning-terminal/package.nix +++ b/pkgs/by-name/li/lightning-terminal/package.nix @@ -23,12 +23,12 @@ buildGoModule rec { pname = "lightning-terminal"; - version = "0.16.0-alpha"; + version = "0.17.0-alpha"; src = fetchFromGitHub { owner = "lightninglabs"; repo = "lightning-terminal"; tag = "v${version}"; - hash = "sha256-lAWAyB6SAk23FS/smJyxl2yDayYLqzpNPI6bdPhRuK4="; + hash = "sha256-TjvQaKT2+n08efm+hRImmyFkvoyl0hfyw3dgtm6S/gk="; leaveDotGit = true; # Populate values that require us to use git. postFetch = '' @@ -41,7 +41,7 @@ buildGoModule rec { ''; }; - vendorHash = "sha256-b7AjCKUtjGr1L0+dFnPupKPM/DDj6LlBQ2T25kxCwdk="; + vendorHash = "sha256-VaXYBl6upod1fI86C7SzWD0Er2T81dZzaaBoFWTEoJc="; buildInputs = [ lightning-app ]; postUnpack = '' @@ -122,7 +122,7 @@ buildGoModule rec { fi ''; - # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --argstr commit true + # Usage: nix-shell maintainers/scripts/update.nix --argstr package lightning-terminal --arg commit true passthru.updateScript = _experimental-update-script-combinators.sequence [ (gitUpdater { rev-prefix = "v"; @@ -171,7 +171,7 @@ buildGoModule rec { version = "0.0.1"; yarnOfflineCache = fetchYarnDeps { yarnLock = "${src}/app/yarn.lock"; - hash = "sha256-3oeuCsdm9HcMlKBBWsROY7SKN1vw8H/IXtvkTLrO07I="; + hash = "sha256-EJwrnsIBwLKDI3mF54EjLvaKu1PYKKLXed9SKKwUZNA="; }; # Remove this command from package.json. It requires Git and it is not diff --git a/pkgs/by-name/li/lightning/package.nix b/pkgs/by-name/li/lightning/package.nix index 086ac44f3d53..90646f340256 100644 --- a/pkgs/by-name/li/lightning/package.nix +++ b/pkgs/by-name/li/lightning/package.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { standardized RISC instruction set inspired by the MIPS and SPARC chips. ''; maintainers = [ ]; - license = with lib.licenses; [ lgpl3Plus ]; + license = lib.licenses.lgpl3Plus; platforms = lib.platforms.unix; broken = stdenv.hostPlatform.isDarwin; # failing tests }; diff --git a/pkgs/by-name/li/lightningcss/package.nix b/pkgs/by-name/li/lightningcss/package.nix index 0710b97c23fe..a06ae76353c9 100644 --- a/pkgs/by-name/li/lightningcss/package.nix +++ b/pkgs/by-name/li/lightningcss/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lightningcss"; - version = "1.32.0"; + version = "1.33.0"; src = fetchFromGitHub { owner = "parcel-bundler"; repo = "lightningcss"; tag = "v${finalAttrs.version}"; - hash = "sha256-JqAzBPYbJq52exCpVTdhd90BQGsbfMOx68PD1xUripg="; + hash = "sha256-twodhkzM/h4ijZFeB2tQAOAV131r1ggLr3tcXUUGHFo="; }; - cargoHash = "sha256-zndBkOJ/U6lLaOJn273TabMAPbz96hQeWs4cPKFDGro="; + cargoHash = "sha256-Jz6kpaan1HNJKhG7Jb5f5mfZoYNDwQhemTuVCf5Cn0Q="; patches = [ # Backport fix for build error for lightningcss-napi diff --git a/pkgs/by-name/li/lighttpd/package.nix b/pkgs/by-name/li/lighttpd/package.nix index f72253f53cd9..4ff292424943 100644 --- a/pkgs/by-name/li/lighttpd/package.nix +++ b/pkgs/by-name/li/lighttpd/package.nix @@ -34,11 +34,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lighttpd"; - version = "1.4.82"; + version = "1.4.85"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-${lib.versions.majorMinor finalAttrs.version}.x/lighttpd-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-q/50OR+cvWarFU6gfmTxlNvn6QbvTtR+s7DztGJGyWI="; + sha256 = "sha256-GN5Rs5O6xKaCeHnhp/83fBaeQUuuks0kUJHYD8JgHRM="; }; separateDebugInfo = true; diff --git a/pkgs/by-name/li/lightworks/package.nix b/pkgs/by-name/li/lightworks/package.nix index 26d0fea55968..288e1b8be5bd 100644 --- a/pkgs/by-name/li/lightworks/package.nix +++ b/pkgs/by-name/li/lightworks/package.nix @@ -27,6 +27,7 @@ gmp, libdrm, libpulseaudio, + sndio, }: let fullPath = lib.makeLibraryPath [ @@ -53,18 +54,19 @@ let gmp libdrm libpulseaudio + sndio ]; lightworks = stdenv.mkDerivation rec { - version = "2025.1"; - rev = "148287"; + version = "2025.2"; + rev = "56356"; pname = "lightworks"; src = if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { - url = "https://cdn.lwks.com/releases/${version}/lightworks_${version}_r${rev}.deb"; - sha256 = "sha256-opYbWzZYim5wqSaxDeGmc10XxFkkE521PDB8OULh7Jc="; + url = "https://cdn.lwks.com/releases/${version}/Lightworks-${version}-${rev}.deb"; + sha256 = "sha256-MQsXl10I85qHiOosBEpdrLPq3iIiFlzumQv2R2sXNn8="; } else throw "${pname}-${version} is not supported on ${stdenv.hostPlatform.system}"; @@ -125,6 +127,7 @@ buildFHSEnv { antonxy vojta001 kashw2 + tombert ]; platforms = [ "x86_64-linux" ]; }; diff --git a/pkgs/by-name/li/lilv/package.nix b/pkgs/by-name/li/lilv/package.nix index acc3ff565858..c09fa4a379b8 100644 --- a/pkgs/by-name/li/lilv/package.nix +++ b/pkgs/by-name/li/lilv/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "lilv"; - version = "0.26.4"; + version = "0.28.0"; outputs = [ "out" @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://download.drobilla.net/lilv-${version}.tar.xz"; - hash = "sha256-HItfy3hxgXPmfXblGtQj9RE6n/aEY/JWYZWuRjlgieM="; + hash = "sha256-jctwrbXPByM1EVprCR9BE3EL3HOrqtqj+enB5VlXsUk="; }; nativeBuildInputs = [ @@ -76,6 +76,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://drobilla.net/software/lilv"; + changelog = "https://gitlab.com/lv2/lilv/-/blob/v${version}/NEWS"; description = "C library to make the use of LV2 plugins"; license = lib.licenses.mit; maintainers = [ ]; diff --git a/pkgs/by-name/li/lilypond-unstable/package.nix b/pkgs/by-name/li/lilypond-unstable/package.nix index d9900c23348a..2767cf9cf866 100644 --- a/pkgs/by-name/li/lilypond-unstable/package.nix +++ b/pkgs/by-name/li/lilypond-unstable/package.nix @@ -7,11 +7,11 @@ lilypond.overrideAttrs ( finalAttrs: prevAttrs: { - version = "2.27.0"; + version = "2.27.1"; src = fetchzip { url = "https://lilypond.org/download/sources/v${lib.versions.majorMinor finalAttrs.version}/lilypond-${finalAttrs.version}.tar.gz"; - hash = "sha256-uZKpHmuYFkmj1kI+D09rPNLov83EO1QdXyUSSscBRPE="; + hash = "sha256-SqnBem2dj7w6oRfxk+h5Ahq+NEPDdX7I/NRKZQnK1kU="; }; patches = [ ]; diff --git a/pkgs/by-name/li/lima/source.nix b/pkgs/by-name/li/lima/source.nix index e9fcc3aefe8c..00d144eb5dc2 100644 --- a/pkgs/by-name/li/lima/source.nix +++ b/pkgs/by-name/li/lima/source.nix @@ -4,7 +4,7 @@ }: let - version = "2.1.2"; + version = "2.2.0"; in { inherit version; @@ -13,10 +13,10 @@ in owner = "lima-vm"; repo = "lima"; tag = "v${version}"; - hash = "sha256-WN0HsSnxLh8MiA9UQoYWnfp5fJyEc6w1XJaencZCsL4="; + hash = "sha256-4Wi+YzMdEN263jeBefEvizlF2k+nLVq3+AHyqagUeHw="; }; - vendorHash = "sha256-8AksUgle1SlWuALi553TlpZ2qwO+jMA1kZQke91fimU="; + vendorHash = "sha256-gD9C0kupcEWCsU0nYOg+VcBCWR0oRf6Gaw0DDn0xits="; meta = { homepage = "https://github.com/lima-vm/lima"; diff --git a/pkgs/by-name/li/limine/package.nix b/pkgs/by-name/li/limine/package.nix index 6296234c02df..1b5f6193612a 100644 --- a/pkgs/by-name/li/limine/package.nix +++ b/pkgs/by-name/li/limine/package.nix @@ -47,14 +47,14 @@ in # as bootloader for various platforms and corresponding binary and helper files. stdenv.mkDerivation (finalAttrs: { pname = "limine"; - version = "12.3.3"; + version = "12.5.1"; # We don't use the Git source but the release tarball, as the source has a # `./bootstrap` script performing network access to download resources. # Packaging that in Nix is very cumbersome. src = fetchurl { url = "https://github.com/Limine-Bootloader/Limine/releases/download/v${finalAttrs.version}/limine-${finalAttrs.version}.tar.gz"; - hash = "sha256-8aUp2lzVClyje6WHMTOnuOclhLEn1zMf6U5VTl5gEvc="; + hash = "sha256-aGdx+IynrVBtI3Z5Zic/e5aVNWQeAFsxXr8xjIV1MTM="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/li/linear/package.nix b/pkgs/by-name/li/linear/package.nix index a0c8816a50bd..c7052fffb023 100644 --- a/pkgs/by-name/li/linear/package.nix +++ b/pkgs/by-name/li/linear/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "linear"; - version = "1.30.2"; + version = "1.31.1"; src = fetchurl { url = "https://releases.linear.app/Linear-${finalAttrs.version}-universal.dmg"; - hash = "sha256-udtN7sOnbT1B684q/JhPFGq8mYvhc5CbTxuJi6NYFac="; + hash = "sha256-haZz9RdbcQiFbCqdy/S25aCsFoSKn3dFAkYL8NgoTYw="; }; strictDeps = true; @@ -41,7 +41,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "App to manage software development and track bugs"; homepage = "https://linear.app/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ iniw ]; + maintainers = with lib.maintainers; [ + wini + pradyuman + ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/li/linear/update.sh b/pkgs/by-name/li/linear/update.sh index c6ee30c2ac3a..8a381a4bc560 100755 --- a/pkgs/by-name/li/linear/update.sh +++ b/pkgs/by-name/li/linear/update.sh @@ -1,18 +1,18 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p coreutils curl gnugrep common-updater-scripts +#!nix-shell -i bash -p coreutils curl gnugrep jq common-updater-scripts #shellcheck shell=bash -set -eu -o pipefail +set -euo pipefail -source_url="https://releases.linear.app/mac" - -version="$(curl -L -I "$source_url" | grep -ioE 'filename="Linear-[0-9]+(\.[0-9]+)*-universal\.dmg"' | grep -oE '[0-9]+(\.[0-9]+)*')" +releases_url="https://releases.linear.app" +version_pattern='filename="Linear-\K[0-9]+(\.[0-9]+)*(?=-universal\.dmg")' +version="$(curl -fsSLI "$releases_url/mac" | grep -ioP "$version_pattern")" if [[ -z $version ]]; then echo "Could not find the latest Linear version in release headers" >&2 exit 1 fi -hash=$(nix --extra-experimental-features nix-command hash convert --to sri --hash-algo sha256 "$(nix-prefetch-url --type sha256 "https://releases.linear.app/Linear-${version}-universal.dmg")") +hash="$(nix store prefetch-file --json "$releases_url/Linear-${version}-universal.dmg" | jq -r .hash)" update-source-version linear "$version" "$hash" --ignore-same-version diff --git a/pkgs/by-name/li/linja-sike/package.nix b/pkgs/by-name/li/linja-sike/package.nix index d92f4ce44ee9..f4fecd7b947a 100644 --- a/pkgs/by-name/li/linja-sike/package.nix +++ b/pkgs/by-name/li/linja-sike/package.nix @@ -18,8 +18,6 @@ stdenvNoCC.mkDerivation { __structuredAttrs = true; - stripDeps = true; - postPatch = "cp $src linja-sike-5.otf"; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/li/lint-staged/package.nix b/pkgs/by-name/li/lint-staged/package.nix index f3e71e4eb565..ac777cac76af 100644 --- a/pkgs/by-name/li/lint-staged/package.nix +++ b/pkgs/by-name/li/lint-staged/package.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "lint-staged"; - version = "17.0.7"; + version = "17.1.0"; src = fetchFromGitHub { - owner = "okonet"; + owner = "lint-staged"; repo = "lint-staged"; rev = "v${version}"; - hash = "sha256-oh4t1MlCs006W8oL0ljrNnckGfGqZOkER6J/FigoOZs="; + hash = "sha256-Gfrkqrm0CajvZllYMGxDEOCzXZijb3hMTovlvEJuepw="; }; - npmDepsHash = "sha256-MCFfmIXoFk2RyXg19Aho3MLf/W3hYGPelRhLka7lQWc="; + npmDepsHash = "sha256-615sJZU5ZXfern6CJtG8ILtaldF+A9jirJuFlm9X8wM="; dontNpmBuild = true; diff --git a/pkgs/by-name/li/lintspec/package.nix b/pkgs/by-name/li/lintspec/package.nix index 1009674a7b68..b652f34b926b 100644 --- a/pkgs/by-name/li/lintspec/package.nix +++ b/pkgs/by-name/li/lintspec/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lintspec"; - version = "0.17.0"; + version = "0.18.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "beeb"; repo = "lintspec"; tag = "v${finalAttrs.version}"; - hash = "sha256-iIanf/lQRD+JZEa9jAa4JNATJq2EYoKoiA4dOmXxgtY="; + hash = "sha256-CPyMP/UGP2PJ9tjNT0Ytj7jnA4BFBIXw3ZT1NHfKGAA="; }; - cargoHash = "sha256-+Hi9vciLSeIijTH3tCKMv2USTYrWzfuTUaxSOW0hi4g="; + cargoHash = "sha256-WMe9/7rk6tkpWQ7hezHTAoyvCE6Oo66RAfhz7NpT7JM="; cargoBuildFlags = [ "--package" "lintspec" diff --git a/pkgs/by-name/li/linux-exploit-suggester/package.nix b/pkgs/by-name/li/linux-exploit-suggester/package.nix index ae6373e809e0..224d5ec39740 100644 --- a/pkgs/by-name/li/linux-exploit-suggester/package.nix +++ b/pkgs/by-name/li/linux-exploit-suggester/package.nix @@ -5,14 +5,14 @@ }: stdenvNoCC.mkDerivation { - pname = "linux-exploit-suggester"; - version = "unstable-2022-04-01"; + pname = "937cf955501fe7da85994c98f0ca6151194e7c1d"; + version = "1.2-unstable-2026-03-20"; src = fetchFromGitHub { - owner = "mzet-"; + owner = "The-Z-Labs"; repo = "linux-exploit-suggester"; - rev = "54a5c01497d6655be88f6262ccad5bc5a5e4f4ec"; - sha256 = "v0Q8O+aaXEqwWAwGP/u5Nkm4DzM6nM11GI4XbK2PeWM="; + rev = "937cf955501fe7da85994c98f0ca6151194e7c1d"; + hash = "sha256-a6SS1GS0qc1BW0w9Er8LA7K4pRMYnfHtmjUNwBF5Gtg="; }; installPhase = '' @@ -25,10 +25,10 @@ stdenvNoCC.mkDerivation { meta = { description = "Tool designed to assist in detecting security deficiencies for given Linux kernel/Linux-based machine"; - mainProgram = "linux-exploit-suggester"; - homepage = "https://github.com/mzet-/linux-exploit-suggester"; + homepage = "https://github.com/The-Z-Labs/linux-exploit-suggester"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ emilytrau ]; platforms = lib.platforms.linux; + mainProgram = "linux-exploit-suggester"; }; } diff --git a/pkgs/by-name/li/linux-firmware/package.nix b/pkgs/by-name/li/linux-firmware/package.nix index f26f8e593019..6019480aed92 100644 --- a/pkgs/by-name/li/linux-firmware/package.nix +++ b/pkgs/by-name/li/linux-firmware/package.nix @@ -23,13 +23,13 @@ let in stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20260519"; + version = "20260622"; src = fetchFromGitLab { owner = "kernel-firmware"; repo = "linux-firmware"; tag = version; - hash = "sha256-vyrnHNnyNko7m/fZ3fXgLvvasYyJ/pzs5be/Ele+6vY="; + hash = "sha256-nSoJhgI4hAxtNmnj5M6ticzuBSt9uNAYcmc1VR/yXxE="; }; postUnpack = '' diff --git a/pkgs/by-name/li/linux-pam/package.nix b/pkgs/by-name/li/linux-pam/package.nix index 5e1fdfd4a7ce..0da213b857c0 100644 --- a/pkgs/by-name/li/linux-pam/package.nix +++ b/pkgs/by-name/li/linux-pam/package.nix @@ -3,6 +3,7 @@ stdenv, buildPackages, fetchFromGitHub, + fetchpatch, flex, db4, gettext, @@ -33,18 +34,25 @@ stdenv.mkDerivation (finalAttrs: { pname = "linux-pam"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "linux-pam"; repo = "linux-pam"; tag = "v${finalAttrs.version}"; - hash = "sha256-kANcwxifQz2tYPSrSBSFiYNTm51Gr10L/zroCqm8ZHQ="; - + hash = "sha256-V3XQqolinh+MqUefMDYJF9zP4fBJTHc7YKN+NEGjx1g="; }; __structuredAttrs = true; + patches = [ + (fetchpatch { + name = "secure-opendir-fix-error-handling.patch"; + url = "https://github.com/linux-pam/linux-pam/commit/dd62bac17221911106de165607c6925ea54b18d1.patch?full_index=1"; + hash = "sha256-ddgDYdVfdXfTaMFV1hO3RJX9w1NHmE7yi3PxsHOdpvY="; + }) + ]; + # patching unix_chkpwd is required as the nix store entry does not have the necessary bits postPatch = '' substituteInPlace modules/module-meson.build \ @@ -104,6 +112,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.mesonEnable "nis" false) (lib.mesonBool "xtests" false) (lib.mesonBool "examples" false) + (lib.mesonOption "vendordir" "${placeholder "out"}/etc") ] # warning: slower execution due to debug makes VM tests fail! ++ lib.optional debugMode (lib.mesonBool "pam-debug" true); diff --git a/pkgs/by-name/li/linvstmanager/package.nix b/pkgs/by-name/li/linvstmanager/package.nix index 5358d1d975d7..e3ddcdd758c5 100644 --- a/pkgs/by-name/li/linvstmanager/package.nix +++ b/pkgs/by-name/li/linvstmanager/package.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Graphical companion application for various bridges like LinVst, etc"; mainProgram = "linvstmanager"; homepage = "https://github.com/Goli4thus/linvstmanager"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ GabrielDougherty ]; }; diff --git a/pkgs/by-name/li/linyaps-box/package.nix b/pkgs/by-name/li/linyaps-box/package.nix index 00bb109c0759..2bda17485993 100644 --- a/pkgs/by-name/li/linyaps-box/package.nix +++ b/pkgs/by-name/li/linyaps-box/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps-box"; - version = "2.1.2"; + version = "2.2.1"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = "linyaps-box"; rev = finalAttrs.version; - hash = "sha256-i4wSddstCosDpBEcunoVsV464PTHmuvDDEFrsPQKnxU="; + hash = "sha256-KULNPztaDeO6Dih98KcnawMz2rDjQd6AYT9FgAADhIg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/linyaps/package.nix b/pkgs/by-name/li/linyaps/package.nix index 0d1e0587e93c..ff61c516c295 100644 --- a/pkgs/by-name/li/linyaps/package.nix +++ b/pkgs/by-name/li/linyaps/package.nix @@ -39,13 +39,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "linyaps"; - version = "1.12.3"; + version = "1.13.0"; src = fetchFromGitHub { owner = "OpenAtom-Linyaps"; repo = finalAttrs.pname; tag = finalAttrs.version; - hash = "sha256-AbiUHoNRaz2yL6pV5D1R0kmDGcV8+nmEa+EDDK6soe0="; + hash = "sha256-fHT6z0ZGDbhih3Qe1xdXmFqEAZNe+MfqEpD/5SjmTzk="; }; patches = [ diff --git a/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch b/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch new file mode 100644 index 000000000000..ed4d01061dc3 --- /dev/null +++ b/pkgs/by-name/li/liquid-dsp/fix-cmake-pc-paths.patch @@ -0,0 +1,29 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 07c123889..a6640515c 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -564,6 +564,9 @@ if (fftw3f_FOUND) + string(APPEND LIQUID_PC_LIBS_PRIVATE " -lfftw3f") + endif() + ++cmake_path(APPEND libdir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_LIBDIR}") ++cmake_path(APPEND includedir_for_pc_file "\${prefix}" "${CMAKE_INSTALL_INCLUDEDIR}") ++ + configure_file( + cmake/liquid-dsp.pc.in + ${CMAKE_CURRENT_BINARY_DIR}/liquid-dsp.pc +diff --git a/cmake/liquid-dsp.pc.in b/cmake/liquid-dsp.pc.in +index 93597a7e4..06de85dee 100644 +--- a/cmake/liquid-dsp.pc.in ++++ b/cmake/liquid-dsp.pc.in +@@ -2,8 +2,8 @@ + + prefix=@CMAKE_INSTALL_PREFIX@ + exec_prefix=${prefix} +-libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ +-includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++libdir=@libdir_for_pc_file@ ++includedir=@includedir_for_pc_file@ + + Name: liquid-dsp + Description: Software-defined radio digital signal processing library diff --git a/pkgs/by-name/li/liquid-dsp/include-stdarg.patch b/pkgs/by-name/li/liquid-dsp/include-stdarg.patch new file mode 100644 index 000000000000..3eb68b99e636 --- /dev/null +++ b/pkgs/by-name/li/liquid-dsp/include-stdarg.patch @@ -0,0 +1,12 @@ +diff --git a/include/liquid.h b/include/liquid.h +index 290778b50..52d898d07 100644 +--- a/include/liquid.h ++++ b/include/liquid.h +@@ -34,6 +34,7 @@ extern "C" { + #include + #include + #include ++#include + + // compile-time short file path: use __FILE_NAME__ if available (Clang 9+, GCC 12+) + #ifdef __FILE_NAME__ diff --git a/pkgs/by-name/li/liquid-dsp/package.nix b/pkgs/by-name/li/liquid-dsp/package.nix new file mode 100644 index 000000000000..55e7f60d85df --- /dev/null +++ b/pkgs/by-name/li/liquid-dsp/package.nix @@ -0,0 +1,53 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, + darwin, + fixDarwinDylibNames, +}: + +stdenv.mkDerivation rec { + pname = "liquid-dsp"; + version = "1.8.0"; + + src = fetchFromGitHub { + owner = "jgaeddert"; + repo = "liquid-dsp"; + rev = "v${version}"; + sha256 = "sha256-IvWtoXuuIvpJfY4cyRUsPHgax2/aytYShSdxEStiPYI="; + }; + + patches = [ + # Fix CMake absolute include/lib paths issue, see also + # - https://github.com/NixOS/nixpkgs/issues/144170 + # - https://github.com/jgaeddert/liquid-dsp/pull/450 + ./fix-cmake-pc-paths.patch + # liquid.h uses va_list; needs stdarg.h + ./include-stdarg.patch + ]; + + nativeBuildInputs = [ + cmake + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.autoSignDarwinBinariesHook + fixDarwinDylibNames + ]; + + cmakeFlags = [ + # Prevent native cpu arch from leaking into binaries. + (lib.cmakeBool "ENABLE_SIMD" false) + (lib.cmakeBool "FIND_SIMD" false) + ]; + + doCheck = true; + + meta = { + homepage = "https://liquidsdr.org/"; + description = "Digital signal processing library for software-defined radios"; + license = lib.licenses.mit; + platforms = lib.platforms.unix; + maintainers = with lib.maintainers; [ iank ]; + }; +} diff --git a/pkgs/by-name/li/liquidsoap/package.nix b/pkgs/by-name/li/liquidsoap/package.nix index 79efc4495c76..56a6d390222b 100644 --- a/pkgs/by-name/li/liquidsoap/package.nix +++ b/pkgs/by-name/li/liquidsoap/package.nix @@ -26,13 +26,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "liquidsoap"; - version = "2.4.4"; + version = "2.4.5"; src = fetchFromGitHub { owner = "savonet"; repo = "liquidsoap"; tag = "v${finalAttrs.version}"; - hash = "sha256-uRqYyxLF6PuSDvbL77qn2PvttqqM9S00BjcaKUFxlQw="; + hash = "sha256-9H0+si3JRw+NIBMWREHm4zzm4D4Asjoi6JbsJqJEpN0="; }; postPatch = '' diff --git a/pkgs/by-name/li/listmonk/email-builder.nix b/pkgs/by-name/li/listmonk/email-builder.nix index a8c4718730e6..4b069365903e 100644 --- a/pkgs/by-name/li/listmonk/email-builder.nix +++ b/pkgs/by-name/li/listmonk/email-builder.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/email-builder/yarn.lock"; - hash = "sha256-sFRmnMPStNp45hxcF+Iq1WhH6LtVFtgq2regq6MPzcc="; + hash = "sha256-ANPLOL9j0gljtNtbfb+ZifVRN9vLexPddAevpeFwX4o="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/frontend.nix b/pkgs/by-name/li/listmonk/frontend.nix index 4fec2c272de4..cb82721de315 100644 --- a/pkgs/by-name/li/listmonk/frontend.nix +++ b/pkgs/by-name/li/listmonk/frontend.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { offlineCache = fetchYarnDeps { yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-VCaEMftA7AzW/6jyceVO596iby0wC3LW9YDG66kLJmw="; + hash = "sha256-R2xHcHksTtFfFh41FLeBhpuz84ceixGt6oz6SQWWyMQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/li/listmonk/package.nix b/pkgs/by-name/li/listmonk/package.nix index 27da85d559f3..6525511d748f 100644 --- a/pkgs/by-name/li/listmonk/package.nix +++ b/pkgs/by-name/li/listmonk/package.nix @@ -11,16 +11,16 @@ buildGoModule (finalAttrs: { pname = "listmonk"; - version = "6.1.0"; + version = "6.2.0"; src = fetchFromGitHub { owner = "knadh"; repo = "listmonk"; rev = "v${finalAttrs.version}"; - hash = "sha256-SG9PhQOu3QB0LA9dNLnNzwwtfaib7MCfvOcBMkWMRPw="; + hash = "sha256-yLOs1vhTV/0zzq/2Rk5rJ3/1z+kE5xaYODM5NO06F6U="; }; - vendorHash = "sha256-0KrjaExgT9tN4M99CfyQpqpGYnXOpzsPRk/Ih4qXsuE="; + vendorHash = "sha256-t4l8872bniTmNIW4ias1gImURJgrR6htXkncqfrJ+AU="; nativeBuildInputs = [ stuffbin @@ -78,7 +78,6 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/knadh/listmonk"; changelog = "https://github.com/knadh/listmonk/releases/tag/v${finalAttrs.version}"; maintainers = with lib.maintainers; [ - raitobezarius hougo ]; license = lib.licenses.agpl3Only; diff --git a/pkgs/by-name/li/litecli/package.nix b/pkgs/by-name/li/litecli/package.nix index 844ced7b232e..1cfbd9d5e9d3 100644 --- a/pkgs/by-name/li/litecli/package.nix +++ b/pkgs/by-name/li/litecli/package.nix @@ -53,7 +53,10 @@ python3Packages.buildPythonApplication (finalAttrs: { homepage = "https://litecli.com"; changelog = "https://github.com/dbcli/litecli/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ iamanaws ]; + maintainers = with lib.maintainers; [ + iamanaws + Scriptkiddi + ]; mainProgram = "litecli"; }; }) diff --git a/pkgs/by-name/li/litmusctl/package.nix b/pkgs/by-name/li/litmusctl/package.nix index 63179580d54f..81905c937951 100644 --- a/pkgs/by-name/li/litmusctl/package.nix +++ b/pkgs/by-name/li/litmusctl/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { pname = "litmusctl"; - version = "1.25.0"; + version = "1.27.0"; nativeBuildInputs = [ installShellFiles @@ -23,7 +23,7 @@ buildGoModule (finalAttrs: { owner = "litmuschaos"; repo = "litmusctl"; rev = "${finalAttrs.version}"; - hash = "sha256-vHvTp6qOFblGbGatQ2YUJQIsJQgFzB/bbnTpMMzE4NY="; + hash = "sha256-jVbWgwW7qkGLY2T0SbK0Y/GItLj1BfLn1cloPyItpvI="; }; vendorHash = "sha256-Lkvc8dBr/nvKczx83/KXKLe5FskGpI/17GIrl2y/E1I="; diff --git a/pkgs/by-name/li/live-server/package.nix b/pkgs/by-name/li/live-server/package.nix index 6a31cf80f004..d5c3182a39e0 100644 --- a/pkgs/by-name/li/live-server/package.nix +++ b/pkgs/by-name/li/live-server/package.nix @@ -9,21 +9,28 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "live-server"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "lomirus"; repo = "live-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-FKX1rbRKWkWsxzJZDicVAUqrHBwEe2o7EXIouK74UMA="; + hash = "sha256-CV+QUwOYGg6lzEDlAlAYoKO3RqWlF3857/6rDmdLjZQ="; }; - cargoHash = "sha256-gaBYnhljcMqSEPViaOPMtuHjoDP8iY64UizlfK+fcQA="; + cargoHash = "sha256-C/uqEz8ww+YIg1QbnYgKUPNyLnIIf8Tcf8x99PGmOG4="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ]; + __darwinAllowLocalNetworking = true; + # Tests that require a browser + checkFlags = [ + "--skip=browser_reloads_on_file_change" + "--skip=page_content_is_served" + ]; + passthru.updateScript = nix-update-script { }; meta = { diff --git a/pkgs/by-name/li/live555/package.nix b/pkgs/by-name/li/live555/package.nix index cf873d769410..114959d2ae80 100644 --- a/pkgs/by-name/li/live555/package.nix +++ b/pkgs/by-name/li/live555/package.nix @@ -19,7 +19,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "live555"; - version = "2024.09.20"; + version = "2026.01.12"; src = fetchurl { urls = [ @@ -28,7 +28,7 @@ stdenv.mkDerivation (finalAttrs: { "https://download.videolan.org/contrib/live555/live.${finalAttrs.version}.tar.gz" "mirror://sourceforge/slackbuildsdirectlinks/live.${finalAttrs.version}.tar.gz" ]; - hash = "sha256-TrUneCGaJJxC+GgL1ZZ/ZcONeqDH05Bp44/3lkCs9tg="; + hash = "sha256-LFTC4JAGWEnQq4zHsGlC9OZt3hfyoMgK4guQfVYsk34="; }; patches = [ @@ -149,7 +149,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "http://www.live555.com/liveMedia/"; description = "Set of C++ libraries for multimedia streaming, using open standard protocols (RTP/RTCP, RTSP, SIP)"; changelog = "http://www.live555.com/liveMedia/public/changelog.txt"; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/li/livekit-cli/package.nix b/pkgs/by-name/li/livekit-cli/package.nix index 5534cb60fce5..e1617d426ba4 100644 --- a/pkgs/by-name/li/livekit-cli/package.nix +++ b/pkgs/by-name/li/livekit-cli/package.nix @@ -4,20 +4,28 @@ fetchFromGitHub, nix-update-script, testers, + pkg-config, + portaudio, }: buildGoModule (finalAttrs: { pname = "livekit-cli"; - version = "2.16.4"; + version = "2.18.0"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit-cli"; tag = "v${finalAttrs.version}"; - hash = "sha256-D3moluv7tWi9BIvhHq4NDgDmCBNtWPEJPIbvpaAHtao="; + hash = "sha256-lJagBIebVMWWImOHFxMxJDFRjrBNsrFrmpidnkjjScU="; }; - vendorHash = "sha256-/vhISkzvfsPswsM0g4/RuyTZxqEEtfbtyAQV8YDRmu8="; + vendorHash = "sha256-3DMJtYjmE8UQodmy3SsvKEDUKu+tGuhm1Pm7ovd2rUs="; + + # Use nixpkgs portaudio package + pkg-config rather than relying on a vendored + # git submodule, similar to the homebrew solution + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ portaudio ]; + tags = [ "portaudio_system" ]; subPackages = [ "cmd/lk" ]; diff --git a/pkgs/by-name/li/livekit-libwebrtc/package.nix b/pkgs/by-name/li/livekit-libwebrtc/package.nix index 7ea48483a9df..f7e1fd2e88b3 100644 --- a/pkgs/by-name/li/livekit-libwebrtc/package.nix +++ b/pkgs/by-name/li/livekit-libwebrtc/package.nix @@ -139,6 +139,10 @@ stdenv.mkDerivation { --replace-fail "rtc_static_library" "rtc_shared_library" \ --replace-fail "complete_static_lib = true" "" + # Remove the libcxx hardening config to avoid clashes with nixpkgs' own compiler wrapper, + # which already defines the hardening macros. + sed -i '/config("libcxx_hardening") {/,/^}/c\config("libcxx_hardening") {}' build/config/compiler/BUILD.gn + substituteInPlace webrtc.gni \ --replace-fail "!build_with_chromium && is_component_build" "false" @@ -179,6 +183,11 @@ stdenv.mkDerivation { chmod +x build/toolchain/apple/linker_driver.py patchShebangs build/toolchain/apple/linker_driver.py substituteInPlace build/toolchain/apple/toolchain.gni --replace-fail "/bin/cp -Rc" "cp -a" + + # nixpkgs calls the target "darwin" instead of "macos", and passing a different target + # results in warnings by the nixpkgs compiler wrapper + substituteInPlace build/config/mac/BUILD.gn \ + --replace-fail '$clang_arch-apple-macos' '$clang_arch-apple-darwin' ''; outputs = [ diff --git a/pkgs/by-name/li/livekit/package.nix b/pkgs/by-name/li/livekit/package.nix index 51f8ff662532..3f8f0261c778 100644 --- a/pkgs/by-name/li/livekit/package.nix +++ b/pkgs/by-name/li/livekit/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "livekit"; - version = "1.11.0"; + version = "1.13.4"; src = fetchFromGitHub { owner = "livekit"; repo = "livekit"; rev = "v${finalAttrs.version}"; - hash = "sha256-9YWZIZXXphsyYXaBFSUHNyulcBmob7vExkI+LM4DeFY="; + hash = "sha256-XdyXjDI9q1RjdLY19O2Gzp/KBTLk88soB5W60y9hFCs="; }; - vendorHash = "sha256-Fa2GHoXP8jm5aiPXLz9newQR/KAoUgJ3Pv/Bw2IYsrA="; + vendorHash = "sha256-wHra0WyEnN8bfBi2MWJaZmWwVeSchzN18zbu2hzJw5Q="; subPackages = [ "cmd/server" ]; diff --git a/pkgs/by-name/li/lix-diff/package.nix b/pkgs/by-name/li/lix-diff/package.nix index e516e9462618..7d886cd7f89d 100644 --- a/pkgs/by-name/li/lix-diff/package.nix +++ b/pkgs/by-name/li/lix-diff/package.nix @@ -9,7 +9,7 @@ rustPlatform.buildRustPackage (finalAttrs: { version = "1.5.1"; src = fetchFromGitHub { - owner = "tgirlcloud"; + owner = "isabelroses"; repo = "lix-diff"; tag = "v${finalAttrs.version}"; hash = "sha256-mURA7fZ9RAhVtOx+gnEeJI48tyvi+zbKE+xUs5UMPY4="; diff --git a/pkgs/by-name/ll/lla/package.nix b/pkgs/by-name/ll/lla/package.nix index 9d8c38b2578c..094ab30f08a3 100644 --- a/pkgs/by-name/ll/lla/package.nix +++ b/pkgs/by-name/ll/lla/package.nix @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; homepage = "https://lla.chaqchase.com"; changelog = "https://github.com/chaqchase/lla/blob/refs/tags/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ pluiedev ]; platforms = lib.platforms.unix; mainProgram = "lla"; diff --git a/pkgs/by-name/ll/llama-cpp/package.nix b/pkgs/by-name/ll/llama-cpp/package.nix index afbdd8906428..23d9e48f3ef4 100644 --- a/pkgs/by-name/ll/llama-cpp/package.nix +++ b/pkgs/by-name/ll/llama-cpp/package.nix @@ -34,11 +34,10 @@ npmHooks, pkg-config, - metalSupport ? stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64 && !openclSupport, + metalSupport ? stdenv.hostPlatform.isDarwin && !openclSupport, vulkanSupport ? false, rpcSupport ? false, openssl, - llama-cpp, shaderc, vulkan-headers, vulkan-loader, @@ -59,7 +58,7 @@ let ; cudaBuildInputs = with cudaPackages; [ - cuda_cccl # + cccl # # A temporary hack for reducing the closure size, remove once cudaPackages # have stopped using lndir: https://github.com/NixOS/nixpkgs/issues/271792 @@ -81,7 +80,7 @@ let in effectiveStdenv.mkDerivation (finalAttrs: { pname = "llama-cpp"; - version = "9503"; + version = "10063"; outputs = [ "out" @@ -92,7 +91,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { owner = "ggml-org"; repo = "llama.cpp"; tag = "b${finalAttrs.version}"; - hash = "sha256-SnPK7hCfA7svxXhPji7Cuf7H8eHFjdTJSpNR1otPO4c="; + hash = "sha256-mkvRK5vn0qK6iE8kMyN9Zo/zaaaKTzp6WV9QfrKrHWc="; leaveDotGit = true; postFetch = '' git -C "$out" rev-parse --short HEAD > $out/COMMIT @@ -125,7 +124,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ [ openssl ]; npmRoot = "tools/ui"; - npmDepsHash = "sha256-1iM0LGeI9e+gZEHk46lkBe51DxIhiimfAm9o3Z3m9Ik="; + npmDepsHash = "sha256-6s9skw1wzEfm9QKktTqea3J+oudQAsS6O2VnZEMXAdw="; npmDeps = fetchNpmDeps { name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; inherit (finalAttrs) src patches; @@ -138,7 +137,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { preConfigure = '' prependToVar cmakeFlags "-DLLAMA_BUILD_COMMIT:STRING=$(cat COMMIT)" pushd ${finalAttrs.npmRoot} - npm run build + LLAMA_BUILD_NUMBER=${finalAttrs.version} npm run build popd ''; @@ -190,9 +189,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { # upstream plans on adding targets at the cmakelevel, remove those # additional steps after that postInstall = '' - # Match previous binary name for this package - ln -sf $out/bin/llama-cli $out/bin/llama - mkdir -p $out/include cp $src/include/llama.h $out/include/ @@ -206,9 +202,6 @@ effectiveStdenv.mkDerivation (finalAttrs: { doCheck = false; passthru = { - tests = lib.optionalAttrs stdenv.hostPlatform.isDarwin { - metal = llama-cpp.override { metalSupport = true; }; - }; updateScript = nix-update-script { attrPath = "llama-cpp"; extraArgs = [ diff --git a/pkgs/by-name/ll/llama-swap-minimal/package.nix b/pkgs/by-name/ll/llama-swap-minimal/package.nix new file mode 100644 index 000000000000..df9303570750 --- /dev/null +++ b/pkgs/by-name/ll/llama-swap-minimal/package.nix @@ -0,0 +1,5 @@ +{ llama-swap }: + +llama-swap.override { + withUI = false; +} diff --git a/pkgs/by-name/ll/llama-swap/package.nix b/pkgs/by-name/ll/llama-swap/package.nix index 94762b624033..066ef2f14b5d 100644 --- a/pkgs/by-name/ll/llama-swap/package.nix +++ b/pkgs/by-name/ll/llama-swap/package.nix @@ -12,6 +12,8 @@ nixosTests, nix-update-script, + + withUI ? true, }: let @@ -19,7 +21,7 @@ let in buildGoModule (finalAttrs: { pname = "llama-swap"; - version = "224"; + version = "240"; outputs = [ "out" @@ -30,7 +32,7 @@ buildGoModule (finalAttrs: { owner = "mostlygeek"; repo = "llama-swap"; tag = "v${finalAttrs.version}"; - hash = "sha256-IblAaM9FBdI2Y9rg36SWpclQ0jV6Y93RC+N+cXWEO94="; + hash = "sha256-cvxF4J9Qvi522dBGjaNZvwwY/bV3wXSE0oGFATjzD4U="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -43,7 +45,10 @@ buildGoModule (finalAttrs: { ''; }; - vendorHash = "sha256-b+RreafBMCWT/jbWTlXaiDRzA4DRe76WaCEbrfRxV/4="; + vendorHash = "sha256-jQRnFGqQvk6my7ejnesv1pylCmEXLs9GKbQJEZdsaYg="; + + # Upstream only embeds the UI when this build tag is set. + tags = lib.optionals withUI [ "embed_ui" ]; passthru.ui = callPackage ./ui.nix { llama-swap = finalAttrs.finalPackage; }; @@ -62,7 +67,7 @@ buildGoModule (finalAttrs: { postPatch = '' substituteInPlace internal/process/process_command_forking_test.go \ - --replace "#!/bin/bash" "#!${lib.getExe bash}" + --replace-fail "#!/bin/bash" "#!${lib.getExe bash}" ''; preBuild = '' @@ -70,8 +75,10 @@ buildGoModule (finalAttrs: { ldflags+=" -X main.commit=$(cat COMMIT)" ldflags+=" -X main.date=$(cat SOURCE_DATE_EPOCH)" - # copy for go:embed in internal/server/ui_embed.go - cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/ + ${lib.optionalString withUI '' + # copy for go:embed in internal/server/ui_embed.go + cp -r ${finalAttrs.passthru.ui}/ui_dist internal/server/ + ''} ''; excludedPackages = [ @@ -88,7 +95,7 @@ buildGoModule (finalAttrs: { checkFlags = let - skippedTests = lib.optionals (stdenv.hostPlatform.isDarwin) [ + skippedTests = lib.optionals stdenv.hostPlatform.isDarwin [ # Fail only on *-darwin intermittently # https://github.com/mostlygeek/llama-swap/issues/320 "TestProcess_AutomaticallyStartsUpstream" @@ -138,6 +145,8 @@ buildGoModule (finalAttrs: { ]; }; + __structuredAttrs = true; + meta = { homepage = "https://github.com/mostlygeek/llama-swap"; changelog = "https://github.com/mostlygeek/llama-swap/releases/tag/${finalAttrs.src.tag}"; diff --git a/pkgs/by-name/ll/llama-swap/ui.nix b/pkgs/by-name/ll/llama-swap/ui.nix index 9d43a142c60d..4d0f02b6c85b 100644 --- a/pkgs/by-name/ll/llama-swap/ui.nix +++ b/pkgs/by-name/ll/llama-swap/ui.nix @@ -7,7 +7,7 @@ buildNpmPackage (finalAttrs: { pname = "${llama-swap.pname}-ui"; inherit (llama-swap) version src; - npmDepsHash = "sha256-NJqEJ+XTdpPFtJJxP4CGu+JDUW7lKDcFgsixQJ3SXtQ="; + npmDepsHash = "sha256-cAdFKDhmyaYCoKqSYEuAhu29rBxs7i8uTmU2SHwTLnY="; postPatch = '' substituteInPlace vite.config.ts \ diff --git a/pkgs/by-name/ll/lldap/package.nix b/pkgs/by-name/ll/lldap/package.nix index eb1130240e25..36b8a001853b 100644 --- a/pkgs/by-name/ll/lldap/package.nix +++ b/pkgs/by-name/ll/lldap/package.nix @@ -6,7 +6,7 @@ nixosTests, rustPlatform, rustc, - wasm-bindgen-cli_0_2_100, + wasm-bindgen-cli_0_2_120, wasm-pack, which, runCommand, @@ -16,16 +16,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "lldap"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "lldap"; repo = "lldap"; rev = "v${finalAttrs.version}"; - hash = "sha256-UBQWOrHika8X24tYdFfY8ETPh9zvI7/HV5j4aK8Uq+Y="; + hash = "sha256-EafYBCorK5t8ZLoXTjqLg+Q6GDRZjalpRqSoVySdpOk="; }; - cargoHash = "sha256-SO7+HiiXNB/KF3fjzSMeiTPjRQq/unEfsnplx4kZv9c="; + cargoHash = "sha256-GhSoPDMsWRuW6SYS/QTPgsA7fBFup5C5+DBqnlFqwlQ="; ## workaround for overrideAttrs on buildRustPackage ## see https://discourse.nixos.org/t/is-it-possible-to-override-cargosha256-in-buildrustpackage/4393/3 cargoDeps = rustPlatform.fetchCargoVendor { @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = finalAttrs.pname + "-frontend"; nativeBuildInputs = [ wasm-pack - wasm-bindgen-cli_0_2_100 + wasm-bindgen-cli_0_2_120 binaryen which rustc diff --git a/pkgs/by-name/ll/llhttp/package.nix b/pkgs/by-name/ll/llhttp/package.nix index 6f9115c07dc4..4487a4518360 100644 --- a/pkgs/by-name/ll/llhttp/package.nix +++ b/pkgs/by-name/ll/llhttp/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "llhttp"; - version = "9.4.1"; + version = "9.4.2"; src = fetchFromGitHub { owner = "nodejs"; repo = "llhttp"; tag = "release/v${finalAttrs.version}"; - hash = "sha256-eQoOsJ3lIIGSIfC4atkbUqCAYzCzs5kzTihYaI4jqz0="; + hash = "sha256-LS8HS8CnXJ3X8WlIvtxBLc0h1wLL/HmTqZWHlvBjTEo="; }; outputs = [ diff --git a/pkgs/by-name/ll/llmfit/package.nix b/pkgs/by-name/ll/llmfit/package.nix index 802a6eb81bee..8834c1cf457b 100644 --- a/pkgs/by-name/ll/llmfit/package.nix +++ b/pkgs/by-name/ll/llmfit/package.nix @@ -7,23 +7,23 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "llmfit"; - version = "0.9.30"; + version = "1.1.3"; src = fetchFromGitHub { owner = "AlexsJones"; repo = "llmfit"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZV+yLzRsEONR2tSCL6TNujl2nNQYTj7Pp7p5j31rZk0="; + hash = "sha256-y+1BhtxClXAUkPXsLZ0uHHk230Lcn2UdO4DVm/JWpFA="; }; - cargoHash = "sha256-/HCgbIA+6A0zcQIqC850K043ZUZVM7VjrNN22O0ygBo="; + cargoHash = "sha256-9HorFfdvPgUAkorDvZmZAsLSgejQEuGTFZu0A/ueoZE="; passthru.updateScript = nix-update-script { }; meta = { description = "TUI to find LLM models right sized for the system's RAM, CPU, and GPU"; homepage = "https://github.com/AlexsJones/llmfit"; - changelog = "https://github.com/AlexsJones/llmfit/blob/v${finalAttrs.src.rev}/CHANGELOG.md"; + changelog = "https://github.com/AlexsJones/llmfit/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ matthiasbeyer diff --git a/pkgs/by-name/ll/llmserve/package.nix b/pkgs/by-name/ll/llmserve/package.nix index e9f04e89a190..e50adcffb25b 100644 --- a/pkgs/by-name/ll/llmserve/package.nix +++ b/pkgs/by-name/ll/llmserve/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "llmserve"; - version = "0.0.8"; + version = "0.0.10"; src = fetchFromGitHub { owner = "AlexsJones"; repo = "llmserve"; tag = "v${finalAttrs.version}"; - hash = "sha256-j4ko8AkrIOWlM1Tkl/pGMI1PzQc6yImCAZXEmO/NBko="; + hash = "sha256-V0DtCjTQhgfO/WQy/OZc2ayDY9nl2YzstCnsoRAJDFo="; }; - cargoHash = "sha256-jwCQSm4k1YofCn2r5IX+knXbTo70bsAVHIxojeLpkqI="; + cargoHash = "sha256-5svPhLTpWfJgDVNyoytF42efiXzSZ2vbbrglSuNl3Ck="; __structuredAttrs = true; __darwinAllowLocalNetworking = true; diff --git a/pkgs/by-name/ll/llrCUDA/package.nix b/pkgs/by-name/ll/llrCUDA/package.nix index 1630f0d3e126..bcb3ad1f6cc5 100644 --- a/pkgs/by-name/ll/llrCUDA/package.nix +++ b/pkgs/by-name/ll/llrCUDA/package.nix @@ -39,7 +39,7 @@ backendStdenv.mkDerivation (finalAttrs: { gmp cudaPackages.cuda_cudart cudaPackages.libcufft - cudaPackages.cuda_cccl + cudaPackages.cccl ]; env = { diff --git a/pkgs/by-name/lm/lmmath/package.nix b/pkgs/by-name/lm/lmmath/package.nix index 58db2e36c080..23288e21db1e 100644 --- a/pkgs/by-name/lm/lmmath/package.nix +++ b/pkgs/by-name/lm/lmmath/package.nix @@ -2,27 +2,22 @@ lib, stdenvNoCC, fetchzip, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation { pname = "lmmath"; version = "1.959"; + strictDeps = true; + __structuredAttrs = true; + src = fetchzip { url = "https://www.gust.org.pl/projects/e-foundry/lm-math/download/latinmodern-math-1959.zip"; hash = "sha256-et/WMhfZZYgP0S7ZmI6MZK5owv9bSoMBXFX6yGSng5Y="; }; - installPhase = '' - runHook preInstall - - mkdir -p $out/share/fonts/opentype/ - mkdir -p $out/share/doc/latinmodern-math-${version}/ - cp otf/*.otf $out/share/fonts/opentype/ - cp doc/*.txt $out/share/doc/latinmodern-math-${version}/ - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; meta = { description = "Latin Modern Math (LM Math) font completes the modernization of the Computer Modern family of typefaces designed and programmed by Donald E. Knuth"; diff --git a/pkgs/by-name/lm/lmp/package.nix b/pkgs/by-name/lm/lmp/package.nix index 3fa1b52eefdf..883894c3b63c 100644 --- a/pkgs/by-name/lm/lmp/package.nix +++ b/pkgs/by-name/lm/lmp/package.nix @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { meta = { description = "Scanning and validation toolkit for the Log4J vulnerability"; homepage = "https://github.com/0xInfection/LogMePwn"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "lmp"; }; diff --git a/pkgs/by-name/lm/lms/package.nix b/pkgs/by-name/lm/lms/package.nix index bbd0c8e45af3..3cdd7fc7ad21 100644 --- a/pkgs/by-name/lm/lms/package.nix +++ b/pkgs/by-name/lm/lms/package.nix @@ -13,30 +13,31 @@ graphicsmagick, ffmpeg, zlib, - libsm, - libice, stb, openssl, xxhash, pugixml, + onnxruntime, }: stdenv.mkDerivation (finalAttrs: { pname = "lms"; - version = "3.74.0"; + version = "3.78.0"; src = fetchFromGitHub { owner = "epoupon"; repo = "lms"; rev = "v${finalAttrs.version}"; - hash = "sha256-D1Sg6XzZ8t/dFKrVh7k+KGLg2r6LeLGJk4FweVb4L1A="; + hash = "sha256-uOijIipay4ncE8hP6vJG9vOGiD/Ad6WJHEQ7P1HKi/Y="; }; strictDeps = true; + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ gtest boost @@ -44,15 +45,13 @@ stdenv.mkDerivation (finalAttrs: { taglib libconfig libarchive - graphicsmagick ffmpeg zlib - libsm - libice stb openssl xxhash pugixml + onnxruntime ]; postPatch = '' @@ -62,8 +61,7 @@ stdenv.mkDerivation (finalAttrs: { postInstall = '' substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/bin/ffmpeg" "${lib.getExe ffmpeg}" substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/Wt/resources" "${wt}/share/Wt/resources" - substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/docroot" "$out/share/lms/docroot" - substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms/approot" "$out/share/lms/approot" + substituteInPlace $out/share/lms/lms.conf --replace-fail "/usr/share/lms" "$out/share/lms" substituteInPlace $out/share/lms/default.service --replace-fail "/usr/bin/lms" "$out/bin/lms" install -Dm444 $out/share/lms/default.service -T $out/lib/systemd/system/lmsd.service ''; diff --git a/pkgs/by-name/lm/lmstudio/darwin.nix b/pkgs/by-name/lm/lmstudio/darwin.nix index d857fb008c29..a2702a5e06d2 100644 --- a/pkgs/by-name/lm/lmstudio/darwin.nix +++ b/pkgs/by-name/lm/lmstudio/darwin.nix @@ -1,7 +1,6 @@ { stdenv, fetchurl, - undmg, darwin, meta, pname, @@ -9,6 +8,7 @@ url, hash, passthru, + _7zz, }: stdenv.mkDerivation { inherit meta pname version; @@ -18,8 +18,8 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ - undmg darwin.sigtool + _7zz ]; sourceRoot = "."; @@ -50,22 +50,10 @@ stdenv.mkDerivation { dontFixup = true; # undmg doesn't support APFS and 7zz does break the xattr. Took that approach from https://github.com/NixOS/nixpkgs/blob/a3c6ed7ad2649c1a55ffd94f7747e3176053b833/pkgs/by-name/in/insomnia/package.nix#L52 - unpackCmd = '' - echo "Creating temp directory" - mnt=$(TMPDIR=/tmp mktemp -d -t nix-XXXXXXXXXX) - function finish { - echo "Ejecting temp directory" - /usr/bin/hdiutil detach $mnt -force - rm -rf $mnt - } - # Detach volume when receiving SIG "0" - trap finish EXIT - # Mount DMG file - echo "Mounting DMG file into \"$mnt\"" - /usr/bin/hdiutil attach -nobrowse -mountpoint $mnt $curSrc - # Copy content to local dir for later use - echo 'Copying extracted content into "sourceRoot"' - cp -a $mnt/LM\ Studio.app $PWD/ + # NOTE (djmaxus): even with hdiutil, a check `xattr -lr LM\ Studio.app` returns nothing, + # meaning that xattrs are lost anyway? So, I brought back simple 7zip unpacking + unpackPhase = '' + 7zz x -snld $src ''; inherit passthru; diff --git a/pkgs/by-name/lm/lmstudio/package.nix b/pkgs/by-name/lm/lmstudio/package.nix index aa5b2964ea8a..5338cf21baa6 100644 --- a/pkgs/by-name/lm/lmstudio/package.nix +++ b/pkgs/by-name/lm/lmstudio/package.nix @@ -7,12 +7,12 @@ let pname = "lmstudio"; - version_aarch64-linux = "0.4.15-2"; - hash_aarch64-linux = "sha256-HnxdikjdUPoQkHMGLHC7TJylj5ad5UWnFMkyjj/8haU="; - version_aarch64-darwin = "0.4.15-2"; - hash_aarch64-darwin = "sha256-Spe/d34X4V8LAheaLFQ68NvDo09FrshDrV0RLO+24sU="; - version_x86_64-linux = "0.4.15-2"; - hash_x86_64-linux = "sha256-M7doFWVEyzcDJF4M+h4WKR+Q45yn3FZc2vZbzjYWBPE="; + version_aarch64-linux = "0.4.19-2"; + hash_aarch64-linux = "sha256-okb6RxttmvVZdlg+V1P8UwCOhHgXIl+8fCRGy/JmkB4="; + version_aarch64-darwin = "0.4.19-2"; + hash_aarch64-darwin = "sha256-rWZpkdhEGsPYv7gFA5PVWtI+RU5d5DGiLh91O1W+vj4="; + version_x86_64-linux = "0.4.19-2"; + hash_x86_64-linux = "sha256-kR84VRYbKOYi8Y494/KFrIwzbK6nwSiorIkaIJJDeHI="; 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/ln/lnd/package.nix b/pkgs/by-name/ln/lnd/package.nix index 66d513e4df43..8a1c6e54808c 100644 --- a/pkgs/by-name/ln/lnd/package.nix +++ b/pkgs/by-name/ln/lnd/package.nix @@ -23,16 +23,16 @@ buildGoModule (finalAttrs: { pname = "lnd"; - version = "0.20.1-beta"; + version = "0.21.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${finalAttrs.version}"; - hash = "sha256-EHyyUleCKLEAnYNH7+PYwE/uTz445EQmtfosFxf10wU="; + hash = "sha256-LOP5vyffwxzXRI16Jgfjb+JykHcNWrGApM27frYUoPw="; }; - vendorHash = "sha256-jF/yQE0xH0MFKI7CCGHy/HFzp6tgTM5T/MP2uB62vKk="; + vendorHash = "sha256-7fssqutcagEv6JKxwaAp9g3TtxHnQ34Kyln4DIhxjSQ="; subPackages = [ "cmd/lncli" diff --git a/pkgs/by-name/lo/lobster/package.nix b/pkgs/by-name/lo/lobster/package.nix index a5c9b4dd9a2e..3e96a863080a 100644 --- a/pkgs/by-name/lo/lobster/package.nix +++ b/pkgs/by-name/lo/lobster/package.nix @@ -4,36 +4,59 @@ fetchFromGitHub, cmake, callPackage, + pkg-config, # Linux deps libGL, + libxcursor, libxext, + libxi, libx11, + libxrandr, + libxscrnsaver, + libxtst, }: stdenv.mkDerivation (finalAttrs: { pname = "lobster"; - version = "2026.1"; + version = "2026.4"; src = fetchFromGitHub { owner = "aardappel"; repo = "lobster"; tag = "v${finalAttrs.version}"; - hash = "sha256-kN4KYd0wTHqF3J4wFGHLmHifkxsb6J+Ex7gGRGnFiGk="; + hash = "sha256-kqKOf0zrHyqRTs+57owHR5sORZgNIgGghtjUtSaFjZw="; }; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ + cmake + pkg-config + ]; buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ + # TODO devendor sdl3 and remove these libGL + libxcursor libx11 libxext + libxi + libxrandr + libxscrnsaver + libxtst ]; preConfigure = '' cd dev ''; + doCheck = stdenv.buildPlatform.canExecute stdenv.hostPlatform; + + # The test suite expects the executable to be in any of a number of locations + # that do not include the bin directory. + preCheck = '' + ln -s ../../bin/lobster lobster + ''; + passthru.tests.can-run-hello-world = callPackage ./test-can-run-hello-world.nix { }; meta = { diff --git a/pkgs/by-name/lo/local-ai/package.nix b/pkgs/by-name/lo/local-ai/package.nix index 7e1d70a13530..7665a69e28d4 100644 --- a/pkgs/by-name/lo/local-ai/package.nix +++ b/pkgs/by-name/lo/local-ai/package.nix @@ -77,7 +77,7 @@ let inherit (cudaPackages) libcublas cuda_nvcc - cuda_cccl + cccl cuda_cudart libcufft ; @@ -255,7 +255,7 @@ let buildInputs = [ ] ++ lib.optionals with_cublas [ - cuda_cccl + cccl cuda_cudart libcublas libcufft @@ -337,7 +337,7 @@ let pname = "local-ai"; version = "2.28.0"; src = fetchFromGitHub { - owner = "go-skynet"; + owner = "mudler"; repo = "LocalAI"; tag = "v${version}"; hash = "sha256-Hpz0dGkgasSY/FGO7mDzqsLjXut0LdQ9PUXGaURUOlY="; diff --git a/pkgs/by-name/lo/localsend/package.nix b/pkgs/by-name/lo/localsend/package.nix index 0db8997810e4..e7337d1034a6 100644 --- a/pkgs/by-name/lo/localsend/package.nix +++ b/pkgs/by-name/lo/localsend/package.nix @@ -132,7 +132,6 @@ let mainProgram = "localsend"; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/lo/localstack/package.nix b/pkgs/by-name/lo/localstack/package.nix index f34f54c902fb..86e68afc6ccb 100644 --- a/pkgs/by-name/lo/localstack/package.nix +++ b/pkgs/by-name/lo/localstack/package.nix @@ -6,14 +6,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "localstack"; - version = "4.12.0"; + version = "4.13.0"; pyproject = true; src = fetchFromGitHub { owner = "localstack"; repo = "localstack"; tag = "v${finalAttrs.version}"; - hash = "sha256-k5aIdfWm3Tvl/J0s1l0gTXJqnb4j5doJdIIaLLOJXg4="; + hash = "sha256-vagQ2+eG93ns+E9HT/aDWlDn9jhhIyE7PxBXedsgyH0="; }; build-system = with python3.pkgs; [ diff --git a/pkgs/by-name/lo/lockbook-desktop/package.nix b/pkgs/by-name/lo/lockbook-desktop/package.nix index b5ef5e0631f5..d68cd95826b9 100644 --- a/pkgs/by-name/lo/lockbook-desktop/package.nix +++ b/pkgs/by-name/lo/lockbook-desktop/package.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lockbook-desktop"; - version = "26.6.1"; + version = "26.7.16"; src = fetchFromGitHub { owner = "lockbook"; repo = "lockbook"; tag = finalAttrs.version; - hash = "sha256-+r5WsaqQr6NlQNWDTQf/tvCh6P5LpFFyyLMTIZw9yis="; + hash = "sha256-/aZNHeE0bfW5bYOFEboWUMIl0b4FbkdOKXxMEPUqJF0="; }; - cargoHash = "sha256-ybAcG7sCEwZC6FxWx2KhHd1HkhK8wwkGeeLoI/KOXKU="; + cargoHash = "sha256-1cbsmCHNEiN0qxSa+5v5I1/WpFuVgAWuNfMERFviSmU="; nativeBuildInputs = [ pkg-config @@ -40,17 +40,17 @@ rustPlatform.buildRustPackage (finalAttrs: { glib gobject-introspection gdk-pixbuf - libxkbcommon ]; runtimeDependencies = [ vulkan-loader + libxkbcommon ]; doCheck = false; # there are no cli tests cargoBuildFlags = [ "--package" - "lockbook-linux" + "lockbook-desktop" ]; desktopItems = makeDesktopItem { @@ -67,7 +67,6 @@ rustPlatform.buildRustPackage (finalAttrs: { }; postInstall = '' - mv $out/bin/lockbook-linux $out/bin/lockbook-desktop install -D docs/graphics/logo.svg $out/share/icons/hicolor/scalable/apps/lockbook.svg ''; diff --git a/pkgs/by-name/lo/locker/package.nix b/pkgs/by-name/lo/locker/package.nix new file mode 100644 index 000000000000..1d5f474146b6 --- /dev/null +++ b/pkgs/by-name/lo/locker/package.nix @@ -0,0 +1,31 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "locker"; + version = "4.0.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "tgirlcloud"; + repo = "locker"; + tag = "v${finalAttrs.version}"; + hash = "sha256-rVW2OcRG2h5G46UdRLYeZ5A0Gmca2fj5rRbZzMeDqqc="; + }; + + cargoHash = "sha256-gfhOOgZ8wkqbcghcCGCBMtImLfZazR2Dg/FgnjbofAg="; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "A linter for your flake.lock file"; + homepage = "https://github.com/tgirlcloud/locker"; + license = lib.licenses.eupl12; + maintainers = with lib.maintainers; [ isabelroses ]; + mainProgram = "locker"; + }; +}) diff --git a/pkgs/by-name/lo/logseq/bump-yauzl.patch b/pkgs/by-name/lo/logseq/bump-yauzl.patch new file mode 100644 index 000000000000..bbb5118dc3e6 --- /dev/null +++ b/pkgs/by-name/lo/logseq/bump-yauzl.patch @@ -0,0 +1,61 @@ +diff --git a/resources/package.json b/resources/package.json +index d42b7fb..6e66826 100644 +--- a/resources/package.json ++++ b/resources/package.json +@@ -60,6 +60,7 @@ + "electron-forge-maker-appimage": "https://github.com/logseq/electron-forge-maker-appimage.git" + }, + "resolutions": { ++ "yauzl": "^3.3.1", + "**/electron": "38.4.0", + "**/node-abi": "4.14.0", + "**/node-gyp": "12.0.0", +diff --git a/static/yarn.lock b/static/yarn.lock +index 4738ef9..413dcd9 100644 +--- a/static/yarn.lock ++++ b/static/yarn.lock +@@ -1729,11 +1729,6 @@ browserslist@^4.26.3: + node-releases "^2.0.27" + update-browserslist-db "^1.1.4" + +-buffer-crc32@~0.2.3: +- version "0.2.13" +- resolved "https://registry.yarnpkg.com/buffer-crc32/-/buffer-crc32-0.2.13.tgz#0d333e3f00eac50aa1454abd30ef8c2a5d9a7242" +- integrity sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ== +- + buffer-equal@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/buffer-equal/-/buffer-equal-1.0.1.tgz#2f7651be5b1b3f057fcd6e7ee16cf34767077d90" +@@ -2839,13 +2834,6 @@ fastq@^1.17.1, fastq@^1.6.0: + dependencies: + reusify "^1.0.4" + +-fd-slicer@~1.1.0: +- version "1.1.0" +- resolved "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz#25c7c89cb1f9077f8891bbe61d8f390eae256f1e" +- integrity sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g== +- dependencies: +- pend "~1.2.0" +- + fdir@^6.5.0: + version "6.5.0" + resolved "https://registry.yarnpkg.com/fdir/-/fdir-6.5.0.tgz#ed2ab967a331ade62f18d077dae192684d50d350" +@@ -5771,13 +5759,12 @@ yargs@^17.0.1, yargs@^17.6.2: + y18n "^5.0.5" + yargs-parser "^21.1.1" + +-yauzl@^2.10.0: +- version "2.10.0" +- resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.10.0.tgz#c7eb17c93e112cb1086fa6d8e51fb0667b79a5f9" +- integrity sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g== ++yauzl@^2.10.0, yauzl@^3.3.1: ++ version "3.4.0" ++ resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-3.4.0.tgz#88b2a21455f37ca7dccf2eeb33bacb4392322719" ++ integrity sha512-jIH9yLR9wqr0wOS0TpBvo/g/2UgZH5qePVbjgRliiF0BYvOZyaBknKsF+x9Iht0O6sqgnB93rCICdOZFecJuDw== + dependencies: +- buffer-crc32 "~0.2.3" +- fd-slicer "~1.1.0" ++ pend "~1.2.0" + + yocto-queue@^0.1.0: + version "0.1.0" diff --git a/pkgs/by-name/lo/logseq/package.nix b/pkgs/by-name/lo/logseq/package.nix index 2bf9f5527f74..9eff3bf535ee 100644 --- a/pkgs/by-name/lo/logseq/package.nix +++ b/pkgs/by-name/lo/logseq/package.nix @@ -61,6 +61,9 @@ stdenv.mkDerivation (finalAttrs: { # bumps better-sqlite3 to work with electron 39+ # also fixes outdated yarn.lock ./bump-better-sqlite3.patch + + # zip extraction fails on newer nodejs versions without this fix + ./bump-yauzl.patch ]; mavenRepo = stdenv.mkDerivation { @@ -115,7 +118,7 @@ stdenv.mkDerivation (finalAttrs: { name = "logseq-${finalAttrs.version}-yarn-deps-static-resources"; inherit (finalAttrs) src patches; postPatch = "cd ./static"; - hash = "sha256-5DBVlCWlUXYvo0bJWQwvSNMW4P9E8kjE9RQe9/ViJM0="; + hash = "sha256-TFisR5GwcKmuddGhe0i6rAmr2wDWzed/mXnxVGARYK0="; }; yarnOfflineCacheAmplify = fetchYarnDeps { @@ -241,6 +244,9 @@ stdenv.mkDerivation (finalAttrs: { cp -r static/node_modules resources/node_modules ''; + # electron-forge's console output is squeezed into one narrow column if unset + env.CI = "1"; + yarnBuildScript = "release-electron"; installPhase = '' @@ -257,7 +263,7 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper ${lib.getExe electron} $out/bin/logseq \ --add-flags $out/share/logseq/resources/app \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true}}" \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations --enable-wayland-ime=true --wayland-text-input-version=3}}" \ --set-default LOCAL_GIT_DIRECTORY ${git} \ --inherit-argv0 '' diff --git a/pkgs/by-name/lo/lokalise2-cli/package.nix b/pkgs/by-name/lo/lokalise2-cli/package.nix index 433f66a74cd6..b057e0420b4f 100644 --- a/pkgs/by-name/lo/lokalise2-cli/package.nix +++ b/pkgs/by-name/lo/lokalise2-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "lokalise2-cli"; - version = "3.1.4"; + version = "3.1.7"; src = fetchFromGitHub { owner = "lokalise"; repo = "lokalise-cli-2-go"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-weqYHKxu6HvdrFduzKtHtCVnJ0GVRGIPABLrsW4f0VA="; + sha256 = "sha256-VkfXJhgz/Ki0+jx0Q+Hqr4RHY5BnqbzWU6LBs+YGvdo="; }; - vendorHash = "sha256-thD8NtG9uVI4KwNQiNsVCUdyUcgAmnr+szsUQ2Ika1c="; + vendorHash = "sha256-NS4nKoZSJ8M/n18Y2vQb5MuKBBjS6SGRoKJi5B2J68g="; doCheck = false; diff --git a/pkgs/by-name/lo/loksh/package.nix b/pkgs/by-name/lo/loksh/package.nix index 44d02a14f928..771c3b88d54a 100644 --- a/pkgs/by-name/lo/loksh/package.nix +++ b/pkgs/by-name/lo/loksh/package.nix @@ -63,7 +63,7 @@ stdenv.mkDerivation (finalAttrs: { vulnerabilities and makes loksh a good fit for resource-constrained systems. ''; - license = with lib.licenses; [ publicDomain ]; + license = lib.licenses.publicDomain; maintainers = with lib.maintainers; [ cameronnemo ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/lo/longcat/package.nix b/pkgs/by-name/lo/longcat/package.nix index 08d88538db00..24d9e109fa55 100644 --- a/pkgs/by-name/lo/longcat/package.nix +++ b/pkgs/by-name/lo/longcat/package.nix @@ -6,7 +6,7 @@ }: let - version = "0.0.17"; + version = "0.0.18"; in buildGoModule { pname = "longcat"; @@ -16,7 +16,7 @@ buildGoModule { owner = "mattn"; repo = "longcat"; tag = "v${version}"; - hash = "sha256-77pYs1IZiUlUGricE4K/zA/vKiihUZnrpyNPEhZjMas="; + hash = "sha256-5D+hGWwpjRLDNw1zwM+tkVPHRebERU83Gye6WQZUuhg="; }; vendorHash = "sha256-VcNhzQyhd7gDvlrz7Lh2QRUkMjZj40s2hanNP6gsnMs="; diff --git a/pkgs/by-name/lo/lookup-license/package.nix b/pkgs/by-name/lo/lookup-license/package.nix new file mode 100644 index 000000000000..0504ccaa5769 --- /dev/null +++ b/pkgs/by-name/lo/lookup-license/package.nix @@ -0,0 +1,3 @@ +{ python3Packages }: + +python3Packages.toPythonApplication python3Packages.lookup-license diff --git a/pkgs/by-name/lo/lora/package.nix b/pkgs/by-name/lo/lora/package.nix index 8947b828a6b2..dffc6af3de2e 100644 --- a/pkgs/by-name/lo/lora/package.nix +++ b/pkgs/by-name/lo/lora/package.nix @@ -17,7 +17,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { src = fetchFromGitHub { owner = "cyrealtype"; - repo = "lora"; + repo = "Lora-Cyrillic"; tag = "v${finalAttrs.version}"; hash = "sha256-v9wE9caI9HTCfO01Yf+s6KajF7WpnL12nu+IuOV7T+w="; }; @@ -38,7 +38,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Lora Font: well-balanced contemporary serif with roots in calligraphy"; - homepage = "https://github.com/cyrealtype/lora"; + homepage = "https://github.com/cyrealtype/Lora-Cyrillic"; license = lib.licenses.ofl; platforms = lib.platforms.all; maintainers = with lib.maintainers; [ ofalvai ]; diff --git a/pkgs/by-name/lo/losange/package.nix b/pkgs/by-name/lo/losange/package.nix index 6f50fabfc121..be9b2cee7f1a 100644 --- a/pkgs/by-name/lo/losange/package.nix +++ b/pkgs/by-name/lo/losange/package.nix @@ -21,7 +21,7 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "losange"; - version = "0.10.1"; + version = "0.10.2"; __structuredAttrs = true; strictDeps = true; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "tymmesyde"; repo = "losange"; tag = "v${finalAttrs.version}"; - hash = "sha256-mr54/vnaopLwG9lhFiZJGgxWH/VaGitROVEeV7GSyHM="; + hash = "sha256-GRWDtua4QaJP6Te/EUXu0YmUJYdYbMrdNxj0WiE/B7w="; }; - cargoHash = "sha256-LJ8EpxEIN8wojSmQ+WVshYRxGFAC9sUk5tnh3I2J408="; + cargoHash = "sha256-e7ENEIEpnwdI50bQnlP9iV0vmsNOlfNaR0UJ6mHsi2g="; buildInputs = [ mpv diff --git a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix index 7ac0dc35587c..ca09b2893b61 100644 --- a/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix +++ b/pkgs/by-name/lo/losslesscut-bin/build-from-dmg.nix @@ -2,7 +2,7 @@ lib, stdenvNoCC, fetchurl, - _7zz, + undmg, pname, version, hash, @@ -20,17 +20,16 @@ stdenvNoCC.mkDerivation { inherit hash; }; - nativeBuildInputs = [ _7zz ]; + nativeBuildInputs = [ undmg ]; - sourceRoot = "LosslessCut.app"; + sourceRoot = "."; installPhase = '' runHook preInstall mkdir -p "$out/Applications" - cd .. - mv "$sourceRoot" "$out/Applications" + cp -r LosslessCut.app "$out/Applications" mkdir -p "$out/bin" - ln -s "$out/Applications/$(basename "$sourceRoot")/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" + ln -s "$out/Applications/LosslessCut.app/Contents/MacOS/LosslessCut" "$out/bin/losslesscut" runHook postInstall ''; diff --git a/pkgs/by-name/lo/losslesscut-bin/package.nix b/pkgs/by-name/lo/losslesscut-bin/package.nix index 8fd238d8c9d8..82ad7eea6f3f 100644 --- a/pkgs/by-name/lo/losslesscut-bin/package.nix +++ b/pkgs/by-name/lo/losslesscut-bin/package.nix @@ -4,36 +4,38 @@ callPackage, buildPackages, }: - let pname = "losslesscut"; - version = "3.64.0"; + version = "3.69.0"; metaCommon = { description = "Swiss army knife of lossless video/audio editing"; homepage = "https://mifi.no/losslesscut/"; license = lib.licenses.gpl2Only; - maintainers = with lib.maintainers; [ ShamrockLee ]; + maintainers = with lib.maintainers; [ + ShamrockLee + Br1ght0ne + ]; mainProgram = "losslesscut"; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; x86_64-appimage = callPackage ./build-from-appimage.nix { inherit pname version metaCommon; - hash = "sha256-K90cJuJFcIkPuAQusJcOBkZ5PQ8T25q7IFIhtmK+jzc="; + hash = "sha256-F56q4nv/viWmVJpKcUR0EmtXwojO/DBwRvycYxOhJnY="; inherit (buildPackages) makeWrapper; }; x86_64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-BO2KoYAevbVL0Eix1knvaPVBkWucYI89VkueWYRTcXY="; + hash = "sha256-q4KNGmUsiVZhsVtoLYEQZWLg8R+ry4wtHkvyxP3d9ko="; isAarch64 = false; }; aarch64-dmg = callPackage ./build-from-dmg.nix { inherit pname version metaCommon; - hash = "sha256-/M5yafZQDqCoDzHpjZBC80CcL9KMO5lwvyCcq19caRg="; + hash = "sha256-x4AbSC3zvgOErMgXHVp9FsznDRWIhx40SxVarKOfpYs="; isAarch64 = true; }; x86_64-windows = callPackage ./build-from-windows.nix { inherit pname version metaCommon; - hash = "sha256-FYrnTiZ5ATT+Y08zceIIHbVM//5Bg2ozIEyC5UxmIno="; + hash = "sha256-uvcQZXaZnhRg+RgFTjrUrjipVGmJLMahqXtBMfAoGOQ="; }; in ( diff --git a/pkgs/by-name/lo/loudmouth/package.nix b/pkgs/by-name/lo/loudmouth/package.nix index c5208dfa8320..91155e474d41 100644 --- a/pkgs/by-name/lo/loudmouth/package.nix +++ b/pkgs/by-name/lo/loudmouth/package.nix @@ -10,16 +10,18 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.5.3"; + version = "1.5.4"; pname = "loudmouth"; src = fetchurl { url = "https://mcabber.com/files/loudmouth/loudmouth-${finalAttrs.version}.tar.bz2"; - sha256 = "0b6kd5gpndl9nzis3n6hcl0ldz74bnbiypqgqa1vgb0vrcar8cjl"; + hash = "sha256-McvJHB/dzFNGszc7j7RVlOnqnMf+NtBZXokSxHrZTQ0="; }; configureFlags = [ "--with-ssl=openssl" ]; + env.NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + propagatedBuildInputs = [ openssl libidn @@ -30,6 +32,7 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ pkg-config ]; meta = { + changelog = "https://mcabber.com/"; description = "Lightweight C library for the Jabber protocol"; platforms = lib.platforms.all; downloadPage = "http://mcabber.com/files/loudmouth/"; diff --git a/pkgs/by-name/lo/lowfi/package.nix b/pkgs/by-name/lo/lowfi/package.nix index 5c3d2d6076f8..d019856b6578 100644 --- a/pkgs/by-name/lo/lowfi/package.nix +++ b/pkgs/by-name/lo/lowfi/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lowfi"; - version = "2.0.2"; + version = "2.0.7"; src = fetchFromGitHub { owner = "talwat"; repo = "lowfi"; tag = finalAttrs.version; - hash = "sha256-RSdfZ0GrNhPcqDWutJW0VlplbpBNBCpSvw91fpl0d4E="; + hash = "sha256-/GU1e01AjeS4AVBvQUi/GZKeQ0X+hnmt+kyW3gp0jgg="; }; - cargoHash = "sha256-OAg3ZpBmuINkc6KZJGKvYFnpv9hVbwlnOEP5ICtYh28="; + cargoHash = "sha256-iuC0YBhzK8mATJekTgBDMiXATRdThem35p5AyDXQNGo="; buildFeatures = [ "scrape" ] ++ lib.optionals stdenv.hostPlatform.isLinux [ "mpris" ]; diff --git a/pkgs/by-name/lp/lpairs2/package.nix b/pkgs/by-name/lp/lpairs2/package.nix index ce1248cd2e26..d2dc5c3851bb 100644 --- a/pkgs/by-name/lp/lpairs2/package.nix +++ b/pkgs/by-name/lp/lpairs2/package.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "http://lgames.sourceforge.net/LPairs/"; description = "Matching the pairs - a typical Memory Game"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; mainProgram = "lpairs2"; maintainers = [ ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/lr/lr/package.nix b/pkgs/by-name/lr/lr/package.nix index 770bfc28c746..e5165e835da9 100644 --- a/pkgs/by-name/lr/lr/package.nix +++ b/pkgs/by-name/lr/lr/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { version = "2.0.1"; src = fetchFromGitHub { - owner = "chneukirchen"; + owner = "leahneukirchen"; repo = "lr"; rev = "v${finalAttrs.version}"; sha256 = "sha256-zpHThIB1FS45RriE214SM9ZQJ1HyuBkBi/+PTeJjEFc="; @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { makeFlags = [ "PREFIX=$(out)" ]; meta = { - homepage = "https://github.com/chneukirchen/lr"; + homepage = "https://github.com/leahneukirchen/lr"; description = "List files recursively"; license = lib.licenses.mit; platforms = lib.platforms.all; diff --git a/pkgs/by-name/ls/lsb-release/package.nix b/pkgs/by-name/ls/lsb-release/package.nix index 4e5f82c2c8ab..a0d17aae335d 100644 --- a/pkgs/by-name/ls/lsb-release/package.nix +++ b/pkgs/by-name/ls/lsb-release/package.nix @@ -23,7 +23,7 @@ replaceVarsWith { meta = { description = "Prints certain LSB (Linux Standard Base) and Distribution information"; mainProgram = "lsb_release"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ls/lsh/package.nix b/pkgs/by-name/ls/lsh/package.nix index a24c9bbe8b7c..59f751268aac 100644 --- a/pkgs/by-name/ls/lsh/package.nix +++ b/pkgs/by-name/ls/lsh/package.nix @@ -5,19 +5,19 @@ }: buildGoModule (finalAttrs: { pname = "lsh"; - version = "1.5.8"; + version = "1.6.3"; src = fetchFromGitHub { owner = "latitudesh"; - repo = "lsh"; + repo = "cli"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-BFhVCrl2LS5s38WBtkTjZ+IYCO9VQgIVmel3xwzaBI8="; + sha256 = "sha256-A0uZLcwFIuimSgwItDSfDCcDLZqI+q6C5iPyJgyUelQ="; }; - vendorHash = "sha256-vAZYd4fbXsZRqDvSQ1Y+lk3RVY06PqxdJF9DofTa6sQ="; + vendorHash = "sha256-MlpNAEbdl8AHu0uKhW/p0NTBROdGHKN+ODrcRCs9t4s="; subPackages = [ "." ]; meta = { - changelog = "https://github.com/latitudesh/lsh/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/latitudesh/cli/releases/tag/v${finalAttrs.version}"; description = "Command-Line Interface for Latitude.sh"; - homepage = "https://github.com/latitudesh/lsh"; + homepage = "https://github.com/latitudesh/cli"; license = lib.licenses.mit; maintainers = [ lib.maintainers.dzmitry-lahoda ]; }; diff --git a/pkgs/by-name/ls/lsof/package.nix b/pkgs/by-name/ls/lsof/package.nix index e471fa9ae830..b753264c7669 100644 --- a/pkgs/by-name/ls/lsof/package.nix +++ b/pkgs/by-name/ls/lsof/package.nix @@ -17,13 +17,13 @@ in stdenv.mkDerivation rec { pname = "lsof"; - version = "4.99.6"; + version = "4.99.7"; src = fetchFromGitHub { owner = "lsof-org"; repo = "lsof"; - rev = version; - hash = "sha256-M/2xcii8ibGAI/6f34AE7aEb9fmn+iSWqWqnyDhg4CI="; + tag = version; + hash = "sha256-o95osjMQvpOVx2b0lCXVp61x2GHQV+HW1iaamVhevng="; }; postPatch = '' @@ -80,6 +80,7 @@ stdenv.mkDerivation rec { meta = { homepage = "https://github.com/lsof-org/lsof"; + changelog = "https://github.com/lsof-org/lsof/releases/tag/${src.tag}"; description = "Tool to list open files"; mainProgram = "lsof"; longDescription = '' diff --git a/pkgs/by-name/ls/lsp-plugins/package.nix b/pkgs/by-name/ls/lsp-plugins/package.nix index 5efb69144bb9..07d99a9a034c 100644 --- a/pkgs/by-name/ls/lsp-plugins/package.nix +++ b/pkgs/by-name/ls/lsp-plugins/package.nix @@ -39,7 +39,7 @@ in stdenv.mkDerivation (finalAttrs: { pname = "lsp-plugins"; - version = "1.2.29"; + version = "1.2.33"; outputs = [ "out" @@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "https://github.com/lsp-plugins/lsp-plugins/releases/download/${finalAttrs.version}/lsp-plugins-src-${finalAttrs.version}.tar.gz"; - hash = "sha256-QEKXw63YecUI2wbVEZ4R78HQRzUn0qae057HfB0ZcvI="; + hash = "sha256-K2kiEFEYrIe9lCsP8+e/PIGAInsqtcTlDkjeuQrGib0="; }; # By default, GStreamer plugins are installed right alongside GStreamer itself diff --git a/pkgs/by-name/ls/lsplug/package.nix b/pkgs/by-name/ls/lsplug/package.nix new file mode 100644 index 000000000000..23ac2a7f9adc --- /dev/null +++ b/pkgs/by-name/ls/lsplug/package.nix @@ -0,0 +1,39 @@ +{ + lib, + python3Packages, + fetchFromSourcehut, +}: + +python3Packages.buildPythonApplication (finalAttrs: { + pname = "lsplug"; + version = "7"; + pyproject = true; + + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "lsplug"; + tag = finalAttrs.version; + hash = "sha256-eY9XNEdJfQREKroxsuPlv3CKqNX/XiMEnN8TdGYGa+g="; + }; + + build-system = with python3Packages; [ + setuptools + ]; + + pythonImportsCheck = [ + "lsplug" + ]; + + __structuredAttrs = true; + + meta = { + description = "Replacement for lsusb that shows more useful info and less useless info"; + homepage = "https://git.sr.ht/~martijnbraam/lsplug"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ + Luflosi + ]; + mainProgram = "lsplug"; + }; +}) diff --git a/pkgs/by-name/ls/lspmux/package.nix b/pkgs/by-name/ls/lspmux/package.nix index 5e3fce8ce39d..a539ba227f48 100644 --- a/pkgs/by-name/ls/lspmux/package.nix +++ b/pkgs/by-name/ls/lspmux/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Share one language server instance between multiple LSP clients to save resources"; mainProgram = "lspmux"; homepage = "https://codeberg.org/p2502/lspmux"; - license = with lib.licenses; [ eupl12 ]; + license = lib.licenses.eupl12; maintainers = with lib.maintainers; [ mrcjkb ]; }; }) diff --git a/pkgs/by-name/ls/lstk/package.nix b/pkgs/by-name/ls/lstk/package.nix index 022d2797a46a..ac93856533fa 100644 --- a/pkgs/by-name/ls/lstk/package.nix +++ b/pkgs/by-name/ls/lstk/package.nix @@ -7,7 +7,7 @@ }: buildGoModule (finalAttrs: { pname = "lstk"; - version = "0.11.0"; + version = "0.17.0"; __structuredAttrs = true; @@ -15,10 +15,10 @@ buildGoModule (finalAttrs: { owner = "localstack"; repo = "lstk"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-2PViyzcJ2AGigfxLwQ5FnULV4zF0FPQIr6nqg5d90S4="; + sha256 = "sha256-btwXEUstvJ2z+ixVH5QeOVOhrE7AmLNESKVSTmEmNiU="; }; - vendorHash = "sha256-y/QlgdYS4IeU9Xf/2trHRvjB5QOHDbFDrF57y9B6jxI="; + vendorHash = "sha256-86yg2+SZ+pnCi0wTjfqyO68adVaDjT24SgCbPVgd1Ho="; excludedPackages = "test/integration"; diff --git a/pkgs/by-name/ls/lstr/package.nix b/pkgs/by-name/ls/lstr/package.nix index 4561ace0098c..81def2cedee0 100644 --- a/pkgs/by-name/ls/lstr/package.nix +++ b/pkgs/by-name/ls/lstr/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lstr"; - version = "0.2.1"; + version = "0.4.0"; src = fetchFromGitHub { owner = "bgreenwell"; repo = "lstr"; tag = "v${finalAttrs.version}"; - hash = "sha256-uaefVDSTphboWW1BP2HkcuMiW87FmnVYxCthlrAKF5Y="; + hash = "sha256-uDwf6+By4z1TTkuyg0g5J8zzkM/UCsBMLAF9WfSEreE="; }; - cargoHash = "sha256-UVaqkNV1cNpbCNphk6YMqOz077xY9dUBgCGt7SLIH0U="; + cargoHash = "sha256-CGdQmjgOvcLAE88nocn/iA4qfS98CEsseoNn/0udd0s="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/lt/ltex-ls-plus/package.nix b/pkgs/by-name/lt/ltex-ls-plus/package.nix index 39ee4352f089..49f095779428 100644 --- a/pkgs/by-name/lt/ltex-ls-plus/package.nix +++ b/pkgs/by-name/lt/ltex-ls-plus/package.nix @@ -9,11 +9,11 @@ stdenvNoCC.mkDerivation rec { pname = "ltex-ls-plus"; - version = "18.6.1"; + version = "18.7.0"; src = fetchurl { url = "https://github.com/ltex-plus/ltex-ls-plus/releases/download/${version}/ltex-ls-plus-${version}.tar.gz"; - sha256 = "sha256-YhuT1ZKpecysA4DuMrgko77L0t0Ve9VanXWHbX8p3qo="; + sha256 = "sha256-z15a7ilSVw43QMB4YO8qQ8mS6GkxQkaZhdMrIYh6xlg="; }; nativeBuildInputs = [ makeBinaryWrapper ]; diff --git a/pkgs/by-name/lt/ltris/package.nix b/pkgs/by-name/lt/ltris/package.nix index 15c2107a06ea..58abf38148b4 100644 --- a/pkgs/by-name/lt/ltris/package.nix +++ b/pkgs/by-name/lt/ltris/package.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://lgames.sourceforge.io/LTris/"; description = "Tetris clone from the LGames series"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "ltris2"; maintainers = with lib.maintainers; [ marcin-serwin ]; platforms = lib.platforms.all; diff --git a/pkgs/by-name/lt/lttng-tools/package.nix b/pkgs/by-name/lt/lttng-tools/package.nix index ffe2ed82880b..e91b33e858fb 100644 --- a/pkgs/by-name/lt/lttng-tools/package.nix +++ b/pkgs/by-name/lt/lttng-tools/package.nix @@ -3,6 +3,7 @@ stdenv, fetchurl, pkg-config, + python3, babeltrace2, popt, libuuid, @@ -14,14 +15,21 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.14.1"; + version = "2.15.1"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-DmjrJ5I2IcS8Enz85AQi0oz35HP+32IprmwyulxbfG0="; + sha256 = "sha256-i21Lp64sA299r7tOKXF2d0EQePmp2WGy3HwboWJz6ek="; }; - nativeBuildInputs = [ pkg-config ]; + nativeBuildInputs = [ + pkg-config + python3 + ]; + + # Used by the test source generator during the build. + makeFlags = [ "PYTHON=${lib.getExe python3}" ]; + buildInputs = [ babeltrace2 popt diff --git a/pkgs/by-name/lt/lttng-ust/package.nix b/pkgs/by-name/lt/lttng-ust/package.nix index 0455146aaed8..9f359b838cb9 100644 --- a/pkgs/by-name/lt/lttng-ust/package.nix +++ b/pkgs/by-name/lt/lttng-ust/package.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lttng-ust"; - version = "2.14.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "lttng"; repo = "lttng-ust"; tag = "v${finalAttrs.version}"; - hash = "sha256-9WZDjOGfflEc6BUUO3W70KeLcZnTaePkF8eg8Ns/lQc="; + hash = "sha256-AWo205IPGKpEyz5RlscHfdfCTV0zOWPHOGk4ImAJbcQ="; }; outputs = [ @@ -67,7 +67,15 @@ stdenv.mkDerivation (finalAttrs: { patchShebangs . ''; - configureFlags = [ "--disable-examples" ]; + configureFlags = [ + "--disable-examples" + ] + ++ lib.optionals stdenv.hostPlatform.isMusl [ + # lttng-ust puts a single array on the stack that's the size of + # musl's whole default stack. + # https://review.lttng.org/c/lttng-ust/+/18160 + "CFLAGS=-Wl,-z,stack-size=2097152" + ]; doCheck = true; diff --git a/pkgs/by-name/lu/lua-language-server/package.nix b/pkgs/by-name/lu/lua-language-server/package.nix index b964eaa18cff..f5ab88f987bf 100644 --- a/pkgs/by-name/lu/lua-language-server/package.nix +++ b/pkgs/by-name/lu/lua-language-server/package.nix @@ -15,17 +15,19 @@ versionCheckHook, nix-update-script, + runCommand, + lua-language-server, }: stdenv.mkDerivation (finalAttrs: { pname = "lua-language-server"; - version = "3.18.1"; + version = "3.18.2"; src = fetchFromGitHub { owner = "luals"; repo = "lua-language-server"; tag = finalAttrs.version; - hash = "sha256-fD7qFY2xL86x/Ac03HkusvNh9Tn4LiqkJGGXNO0bPO8="; + hash = "sha256-c8YxTNmvloN9oabdbl5ZKgXqhxeZ9eVBt3B0Q9wA/GQ="; fetchSubmodules = true; }; @@ -128,7 +130,26 @@ stdenv.mkDerivation (finalAttrs: { ]; doInstallCheck = true; - passthru.updateScript = nix-update-script { }; + passthru = { + updateScript = nix-update-script { }; + + tests.smoke = runCommand "lua-language-server-smoke-test" { } '' + export XDG_CACHE_HOME=$(mktemp -d) + + INIT_REQUEST='{"jsonrpc":"2.0","id":1,"method":"initialize","params":{"processId":null,"rootUri":"file:///tmp","workspaceFolders":[{"uri":"file:///tmp","name":"test"}],"capabilities":{}}}' + CONTENT_LENGTH=''${#INIT_REQUEST} + + RESPONSE=$( + { + printf "Content-Length: %d\r\n\r\n%s" "$CONTENT_LENGTH" "$INIT_REQUEST" + sleep 1 + } | timeout 3 ${lib.getExe lua-language-server} --stdio 2>&1 | head -c 1000 + ) || true + + echo "$RESPONSE" | grep -q '"capabilities"' + touch $out + ''; + }; meta = { description = "Language server that offers Lua language support"; @@ -137,6 +158,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ gepbird + yvnth ]; mainProgram = "lua-language-server"; platforms = lib.platforms.linux ++ lib.platforms.darwin; diff --git a/pkgs/by-name/lu/luarocks-packages-updater/updater.py b/pkgs/by-name/lu/luarocks-packages-updater/updater.py index 951d5fddf4dd..e3e88e780701 100755 --- a/pkgs/by-name/lu/luarocks-packages-updater/updater.py +++ b/pkgs/by-name/lu/luarocks-packages-updater/updater.py @@ -72,6 +72,7 @@ LICENSE_NORMALIZATION = { "Apache 2.0": "lib.licenses.asl20", "Apache-2.0": "lib.licenses.asl20", "Apache License Version 2": "lib.licenses.asl20", + "BSD": "lib.licenses.free", # Too unspecific "BSD-2-Clause": "lib.licenses.bsd2", "BSD-3-Clause": "lib.licenses.bsd3", "GPL-2+": "lib.licenses.gpl2Plus", @@ -82,16 +83,23 @@ LICENSE_NORMALIZATION = { "GPL-3.0": "lib.licenses.gpl3Only", "GPL-3.0-only": "lib.licenses.gpl3Only", "GPL-3.0-or-later": "lib.licenses.gpl3Plus", + "GPLv3+ and other free licenses": "lib.licenses.AND [ lib.licenses.gpl3Plus lib.licenses.free ]", "ISC": "lib.licenses.isc", + "LGPL": "lib.licenses.free", # Too unspecific "LGPL-2.0": "lib.licenses.lgpl2Only", "LGPL-2.1": "lib.licenses.lgpl21Only", "LGPL-3.0": "lib.licenses.lgpl3Only", "MIT": "lib.licenses.mit", "MIT ": "lib.licenses.mit", + "MIT/X11": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]", + "MIT/X license": "lib.licenses.AND [ lib.licenses.mit lib.licenses.x11 ]", + "MIT/ICU": "lib.licenses.AND [ lib.licenses.mit lib.licenses.unicode-30 ]", "MPL-2.0": "lib.licenses.mpl20", "Unlicense": "lib.licenses.unlicense", "2-clause BSD": "lib.licenses.bsd2", "Two-clause BSD": "lib.licenses.bsd2", + "Public domain": "lib.licenses.publicDomain", + "UNKNOWN": "lib.licenses.unfree", } LICENSE_FULL_NAME_RE = re.compile(r'(?P\s*)license\.fullName = "(?P[^"]+)";') @@ -174,6 +182,13 @@ class LuaEditor(nixpkgs_plugin_update.Editor): parser.set_defaults(proc=1, update_only=None) return parser + def configure_add_parser(self, parser): + parser.add_argument( + "--maintainers", + default="", + help="Space-separated nixpkgs maintainer names to add to each package", + ) + def get_current_plugins(self, _config: FetchConfig, _nixpkgs: str): return [] @@ -202,11 +217,7 @@ class LuaEditor(nixpkgs_plugin_update.Editor): specs = sorted(specs, key=lambda v: v.name.lower()) if args.update_only: - specs = [ - p - for p in specs - if p.normalized_name in args.update_only or p.name in args.update_only - ] + specs = [p for p in specs if p.normalized_name in args.update_only or p.name in args.update_only] if not specs: log.error("No matching Lua packages to update") @@ -332,7 +343,7 @@ class LuaEditor(nixpkgs_plugin_update.Editor): "server": "", "version": "", "luaversion": "", - "maintainers": "", + "maintainers": args.maintainers, } existing_entries.append(new_entry) diff --git a/pkgs/by-name/lu/luau-lsp/package.nix b/pkgs/by-name/lu/luau-lsp/package.nix index abd3a6eb5cd8..0928dc206081 100644 --- a/pkgs/by-name/lu/luau-lsp/package.nix +++ b/pkgs/by-name/lu/luau-lsp/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "luau-lsp"; - version = "1.67.0"; + version = "1.69.0"; src = fetchFromGitHub { owner = "JohnnyMorganz"; repo = "luau-lsp"; tag = finalAttrs.version; - hash = "sha256-J2/ARONeRZ5gy/3RE25GgPNahDUkrgbwQaQLU5AxVhk="; + hash = "sha256-fVmc/Ky1fbS4hnh2pOw1idaZFCq0KFHE2hTVQQmYmfM="; fetchSubmodules = true; }; @@ -57,10 +57,5 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ HeitorAugustoLN ]; mainProgram = "luau-lsp"; platforms = lib.platforms.all; - badPlatforms = [ - # Could not find a package configuration file provided by "Protobuf" - # It is unclear why this is only happening on x86_64-darwin - "x86_64-darwin" - ]; }; }) diff --git a/pkgs/by-name/lu/luau/package.nix b/pkgs/by-name/lu/luau/package.nix index cc2b70ce687c..1db53fb43d0c 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.720"; + version = "0.726"; src = fetchFromGitHub { owner = "luau-lang"; repo = "luau"; tag = finalAttrs.version; - hash = "sha256-OF0Zsy1O+9rCcOlWRiBmoets7dAZES4Yy6X4QJ3ZdvQ="; + hash = "sha256-DAKyA8/ERX2AJ/XQDABOoI+cQCSW3PKnBpJkwS8IBdI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/lu/lubelogger/deps.json b/pkgs/by-name/lu/lubelogger/deps.json index 447b712aa934..c14ba5ba99f4 100644 --- a/pkgs/by-name/lu/lubelogger/deps.json +++ b/pkgs/by-name/lu/lubelogger/deps.json @@ -16,38 +16,43 @@ }, { "pname": "MailKit", - "version": "4.15.1", - "hash": "sha256-ZI2ASxX1dY53YxWRii0Dow4aojR8VCEWzCWZLrH7wPw=" + "version": "4.17.0", + "hash": "sha256-LGruedMrHrI0AXHcXOFxsYP2awwPbrC9Q41AeQk4+9U=" + }, + { + "pname": "Microsoft.Bcl.Cryptography", + "version": "10.0.2", + "hash": "sha256-+OYtcWsd1qZcEXadYeA4t6+pyADg1APQCxpKUtP002M=" }, { "pname": "Microsoft.IdentityModel.Abstractions", - "version": "8.17.0", - "hash": "sha256-AU+EMOZArc3rTdsnKYzAufFAtspuYQM3XYi8/VsQAio=" + "version": "8.19.1", + "hash": "sha256-7Y4j3WTI5fIXnt5h7WNygm8jCWHTK4JbREumCc3SfnM=" }, { "pname": "Microsoft.IdentityModel.JsonWebTokens", - "version": "8.17.0", - "hash": "sha256-MH7vdhCNAae32p6UTvaDtmyvFDxa/W71qTsEQ6yC9xM=" + "version": "8.19.1", + "hash": "sha256-HQYkEF4YAqSxOBBXzSB++frSxvjwLUgpI4AuQsbFY4g=" }, { "pname": "Microsoft.IdentityModel.Logging", - "version": "8.17.0", - "hash": "sha256-IM6jsPMz+l9JA0cye/v2ke51xlfP0u5HtWBqc2aKDYM=" + "version": "8.19.1", + "hash": "sha256-zp+JxFS4feqSum93vDuckx/2P8ZhxWjtSryTGWudRc8=" }, { "pname": "Microsoft.IdentityModel.Tokens", - "version": "8.17.0", - "hash": "sha256-XcA0KXJbqMWt0I5LuHHMRLpgVQ18KcBej1BoySHeA1A=" + "version": "8.19.1", + "hash": "sha256-kzZPJ0XvHCnKvxgxqhy5O4iJd2SbZPTXdA1czY/LNBc=" }, { "pname": "MimeKit", - "version": "4.15.1", - "hash": "sha256-MI4Wr+JWoxR9wsYhKmW8j1EdJ59W/O4jv5D9Zb8mEUw=" + "version": "4.17.0", + "hash": "sha256-GpWv+8shoprshuPNB+H+C5saffiKQ6Pek3zhLUGklRo=" }, { "pname": "Npgsql", - "version": "9.0.4", - "hash": "sha256-YH2QYLe56dH6NNGgSwLIaHefjkKQLh0Sf4vMWoJciyU=" + "version": "9.0.5", + "hash": "sha256-5AF0qiVQwfKUqCXSFb+oJhe3Q1wwK9F9+Q9/A4RTIdo=" }, { "pname": "System.Security.Cryptography.Pkcs", diff --git a/pkgs/by-name/lu/lubelogger/package.nix b/pkgs/by-name/lu/lubelogger/package.nix index 95c025ff95fb..9b860480c5a6 100644 --- a/pkgs/by-name/lu/lubelogger/package.nix +++ b/pkgs/by-name/lu/lubelogger/package.nix @@ -3,17 +3,18 @@ buildDotnetModule, dotnetCorePackages, fetchFromGitHub, + nix-update-script, }: buildDotnetModule rec { pname = "lubelogger"; - version = "1.6.4"; + version = "1.7.0"; src = fetchFromGitHub { owner = "hargata"; repo = "lubelog"; rev = "v${version}"; - hash = "sha256-w1UxnmuMBPi5Ov+3h7R0I0EIiZShsZm+TgXmfKdc1BU="; + hash = "sha256-I4GGlkEirqxiwIqczsCe9ns0ImOOalqg+pWKXx3o1Fo="; }; projectFile = "CarCareTracker.sln"; @@ -28,6 +29,8 @@ buildDotnetModule rec { executables = [ "CarCareTracker" ]; # This wraps "$out/lib/$pname/foo" to `$out/bin/foo`. + passthru.updateScript = nix-update-script { }; + meta = { description = "Vehicle service records and maintainence tracker"; longDescription = '' diff --git a/pkgs/by-name/lu/luigi/package.nix b/pkgs/by-name/lu/luigi/package.nix index ff1ba281badb..1ba48b5bb157 100644 --- a/pkgs/by-name/lu/luigi/package.nix +++ b/pkgs/by-name/lu/luigi/package.nix @@ -1,51 +1,5 @@ { - lib, python3Packages, - fetchPypi, }: -python3Packages.python.pkgs.buildPythonApplication (finalAttrs: { - pname = "luigi"; - version = "3.8.1"; - pyproject = true; - - src = fetchPypi { - pname = "luigi"; - inherit (finalAttrs) version; - hash = "sha256-L6XrXTR05JXeCb2WT1ApNsCPix624PPKPIppEWw40MM="; - }; - - build-system = with python3Packages; [ - hatchling - hatch-fancy-pypi-readme - ]; - - pythonRelaxDeps = [ "tenacity" ]; - - dependencies = with python3Packages; [ - python-dateutil - tornado - python-daemon - tenacity - typing-extensions - ]; - - pythonImportsCheck = [ "luigi" ]; - - # Requires tox, hadoop, and google cloud - doCheck = false; - - # This enables accessing modules stored in cwd - makeWrapperArgs = [ "--prefix PYTHONPATH . :" ]; - - meta = { - description = "Python package that helps you build complex pipelines of batch jobs"; - longDescription = '' - Luigi handles dependency resolution, workflow management, visualization, - handling failures, command line integration, and much more. - ''; - homepage = "https://github.com/spotify/luigi"; - changelog = "https://github.com/spotify/luigi/releases/tag/${finalAttrs.version}"; - license = [ lib.licenses.asl20 ]; - }; -}) +python3Packages.toPythonApplication python3Packages.luigi diff --git a/pkgs/by-name/lu/lulu/package.nix b/pkgs/by-name/lu/lulu/package.nix new file mode 100644 index 000000000000..6dc2ddbcd8a8 --- /dev/null +++ b/pkgs/by-name/lu/lulu/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lulu"; + version = "4.3.1"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/objective-see/LuLu/releases/download/v${finalAttrs.version}/LuLu_${finalAttrs.version}.dmg"; + hash = "sha256-zANmUn8fQSMpX9EzKaCAMaZgr9JWB23asD5gdDZc75M="; + }; + + nativeBuildInputs = [ undmg ]; + + unpackPhase = '' + runHook preUnpack + undmg "$src" + runHook postUnpack + ''; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R LuLu.app "$out/Applications/LuLu.app" + + runHook postInstall + ''; + + dontFixup = true; # Preserve upstream's notarized app bundle and system extension signature. + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Free open-source macOS firewall that alerts you to outgoing network connections"; + homepage = "https://objective-see.org/products/lulu.html"; + changelog = "https://github.com/objective-see/LuLu/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.gpl3Plus; + mainProgram = "LuLu"; + maintainers = with lib.maintainers; [ philocalyst ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/lu/lumen/package.nix b/pkgs/by-name/lu/lumen/package.nix new file mode 100644 index 000000000000..ffb9384f981b --- /dev/null +++ b/pkgs/by-name/lu/lumen/package.nix @@ -0,0 +1,65 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + makeWrapper, + pkg-config, + openssl, + fzf, + mdcat, + nix-update-script, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "lumen"; + version = "2.32.0"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "jnsahaj"; + repo = "lumen"; + tag = "v${finalAttrs.version}"; + hash = "sha256-wTkg7NGCCON1P422q5/76rodIBqDeWIY07J4pRo8Q8k="; + }; + + cargoHash = "sha256-ZXw7KEvf1sUHWIM5R4Th2SmekTX6rGXznAq3mtcf3Zo="; + + strictDeps = true; + + # use the non-vendored openssl + env.OPENSSL_NO_VENDOR = 1; + + nativeBuildInputs = [ + makeWrapper + pkg-config + ]; + + buildInputs = [ openssl ]; + + postFixup = '' + wrapProgram $out/bin/lumen --prefix PATH : ${ + lib.makeBinPath [ + fzf + mdcat + ] + } + ''; + + # tests that require a git repository to run + checkFlags = [ + "--skip=vcs::git::tests::test_get_merge_base_returns_ancestor" + "--skip=vcs::git::tests::test_working_copy_parent_ref_returns_head" + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Fast terminal diff viewer and code review TUI"; + homepage = "https://github.com/jnsahaj/lumen"; + changelog = "https://github.com/jnsahaj/lumen/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "lumen"; + }; +}) diff --git a/pkgs/by-name/lu/lunar-client/package.nix b/pkgs/by-name/lu/lunar-client/package.nix index 5f1e1757f80b..461083089ac5 100644 --- a/pkgs/by-name/lu/lunar-client/package.nix +++ b/pkgs/by-name/lu/lunar-client/package.nix @@ -7,11 +7,11 @@ appimageTools.wrapType2 rec { pname = "lunarclient"; - version = "3.6.11"; + version = "3.7.11"; src = fetchurl { url = "https://launcherupdates.lunarclientcdn.com/Lunar%20Client-${version}-ow.AppImage"; - hash = "sha512-WHjeAA+vS/gC8ZI2jUWpiJasvT+AgEWB14/ZnJGIOJPi4PUxtBNseM6HR8Aql8a8JGzobyZS9ISqYtFJEiYQ+A=="; + hash = "sha512-mKs/ZfTW+QrHQF86W7nutiGhVu/M5orbXyjPjlAjQDwusJ01A7eZzbXG9Le31QLqu4eX0mLl/SrzByYHiipYEQ=="; }; nativeBuildInputs = [ makeWrapper ]; @@ -34,7 +34,7 @@ appimageTools.wrapType2 rec { meta = { description = "Free Minecraft client with mods, cosmetics, and performance boost"; homepage = "https://www.lunarclient.com/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; mainProgram = "lunarclient"; maintainers = with lib.maintainers; [ Technical27 diff --git a/pkgs/by-name/lu/lunar/package.nix b/pkgs/by-name/lu/lunar/package.nix index d14faf6a0b11..8e1647755a0c 100644 --- a/pkgs/by-name/lu/lunar/package.nix +++ b/pkgs/by-name/lu/lunar/package.nix @@ -40,7 +40,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/lu/lune/package.nix b/pkgs/by-name/lu/lune/package.nix index 1b77171b6f05..c2e7903996e6 100644 --- a/pkgs/by-name/lu/lune/package.nix +++ b/pkgs/by-name/lu/lune/package.nix @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { version = "0.10.4"; src = fetchFromGitHub { - owner = "filiptibell"; + owner = "lune-org"; repo = "lune"; tag = "v${version}"; hash = "sha256-AbviyCy2nn6WHC575JKl/t3bM/4Myb+Wx5/buTvB4MY="; diff --git a/pkgs/by-name/lu/luwen/package.nix b/pkgs/by-name/lu/luwen/package.nix index 35dc01452d8d..f9a80ad2fa3c 100644 --- a/pkgs/by-name/lu/luwen/package.nix +++ b/pkgs/by-name/lu/luwen/package.nix @@ -26,6 +26,6 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Tenstorrent system interface tools"; homepage = "https://github.com/tenstorrent/luwen"; maintainers = with lib.maintainers; [ RossComputerGuy ]; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; }; }) diff --git a/pkgs/by-name/lu/lux-cli/package.nix b/pkgs/by-name/lu/lux-cli/package.nix index ad9dfd341c7d..90c2ecec0405 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.31.1"; + version = "0.39.1"; src = fetchFromGitHub { owner = "lumen-oss"; repo = "lux"; tag = "v${finalAttrs.version}"; - hash = "sha256-3gS3QO0i1ApVYG/hL/EyZhH1LykeJ5Ttt59vSDLUPMY="; + hash = "sha256-LTZGWwk4gVsPhNWpzK7kq5fYih8xgf0KbyPW50dDYO8="; }; buildAndTestSubdir = "lux-cli"; - cargoHash = "sha256-Ventw1LRk5795+X38yzyFGHFbvW1tEq6PE1zjhZSDDM="; + cargoHash = "sha256-xpPXCTrlZE3Gl0AsA4O/baQyHtvOAf6cPaUdAEtwmx0="; nativeInstallCheckInputs = [ versionCheckHook @@ -74,7 +74,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ''; postInstall = '' - installManPage target/dist/lx.1 + installManPage target/dist/*.1 installShellCompletion target/dist/lx.{bash,fish} --zsh target/dist/_lx ''; diff --git a/pkgs/by-name/lv/lv2bm/package.nix b/pkgs/by-name/lv/lv2bm/package.nix index d1149b519d08..a43191359f67 100644 --- a/pkgs/by-name/lv/lv2bm/package.nix +++ b/pkgs/by-name/lv/lv2bm/package.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.1"; src = fetchFromGitHub { - owner = "moddevices"; + owner = "mod-audio"; repo = "lv2bm"; rev = "v${finalAttrs.version}"; sha256 = "0vlppxfb9zbmffazs1kiyb79py66s8x9hihj36m2vz86zsq7ybl0"; diff --git a/pkgs/by-name/lv/lvtk/package.nix b/pkgs/by-name/lv/lvtk/package.nix index 7e0b9f8ff379..f84dd1bac181 100644 --- a/pkgs/by-name/lv/lvtk/package.nix +++ b/pkgs/by-name/lv/lvtk/package.nix @@ -51,7 +51,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ bot-wxt1221 ]; platforms = lib.platforms.unix; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/lx/lx-music-desktop/npm-deps.patch b/pkgs/by-name/lx/lx-music-desktop/npm-deps.patch new file mode 100644 index 000000000000..38b8360a4fe9 --- /dev/null +++ b/pkgs/by-name/lx/lx-music-desktop/npm-deps.patch @@ -0,0 +1,296 @@ +diff --git a/package-lock.json b/package-lock.json +index 1beb8ee..7160473 100644 +--- a/package-lock.json ++++ b/package-lock.json +@@ -11,7 +11,7 @@ + "license": "Apache-2.0", + "dependencies": { + "@simonwep/pickr": "^1.9.1", +- "better-sqlite3": "^12.9.0", ++ "better-sqlite3": "^12.11.1", + "bufferutil": "^4.1.0", + "comlink": "~4.3.1", + "crypto-js": "^4.2.0", +@@ -50,7 +50,7 @@ + "css-loader": "^7.1.4", + "css-minimizer-webpack-plugin": "^8.0.0", + "del": "^6.1.1", +- "electron": "40.9.2", ++ "electron": "42.6.0", + "electron-builder": "^26.9.0", + "electron-debug": "^3.2.0", + "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03", +@@ -210,6 +210,16 @@ + "node": ">=14.17.0" + } + }, ++ "node_modules/@electron-internal/extract-zip": { ++ "version": "1.0.4", ++ "resolved": "https://registry.npmjs.org/@electron-internal/extract-zip/-/extract-zip-1.0.4.tgz", ++ "integrity": "sha512-Zr1Vs7E9tpCNhZHDAbFVXc2gEVCG9RqPDjrno5+bdgB6LRAuvgyMHJut4NCVyYwtAieapMzc3fiQ3CSTi75ARg==", ++ "dev": true, ++ "license": "BSD-2-Clause", ++ "engines": { ++ "node": ">=22.12.0" ++ } ++ }, + "node_modules/@electron/asar": { + "version": "3.4.1", + "resolved": "https://registry.npmjs.org/@electron/asar/-/asar-3.4.1.tgz", +@@ -283,25 +293,37 @@ + } + }, + "node_modules/@electron/get": { +- "version": "2.0.3", +- "resolved": "https://registry.npmjs.org/@electron/get/-/get-2.0.3.tgz", +- "integrity": "sha512-Qkzpg2s9GnVV2I2BjRksUi43U5e6+zaQMcjoJy0C+C5oxaKl+fmckGDQFtRpZpZV0NQekuZZ+tGz7EA9TVnQtQ==", ++ "version": "5.0.0", ++ "resolved": "https://registry.npmjs.org/@electron/get/-/get-5.0.0.tgz", ++ "integrity": "sha512-pjoBpru1KdEtcExBnuHAP1cAc/5faoedw0hzJkL3o4/IJp7HNF1+fbrdxT3gMYRX2oJfvnA/WXeCTVQpYYxyJA==", + "dev": true, + "license": "MIT", + "dependencies": { + "debug": "^4.1.1", +- "env-paths": "^2.2.0", +- "fs-extra": "^8.1.0", +- "got": "^11.8.5", ++ "env-paths": "^3.0.0", ++ "graceful-fs": "^4.2.11", + "progress": "^2.0.3", +- "semver": "^6.2.0", ++ "semver": "^7.6.3", + "sumchecker": "^3.0.1" + }, + "engines": { +- "node": ">=12" ++ "node": ">=22.12.0" + }, + "optionalDependencies": { +- "global-agent": "^3.0.0" ++ "undici": "^7.24.4" ++ } ++ }, ++ "node_modules/@electron/get/node_modules/env-paths": { ++ "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-3.0.0.tgz", ++ "integrity": "sha512-dtJUTepzMW3Lm/NPxRf3wP4642UWhjL2sQxc+ym2YMj1m/H2zDNQOlezafzkHwn6sMstjHTwG6iQQsctDW/b1A==", ++ "dev": true, ++ "license": "MIT", ++ "engines": { ++ "node": "^12.20.0 || ^14.13.1 || >=16.0.0" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/sindresorhus" + } + }, + "node_modules/@electron/notarize": { +@@ -2014,17 +2036,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/@types/yauzl": { +- "version": "2.10.3", +- "resolved": "https://registry.npmjs.org/@types/yauzl/-/yauzl-2.10.3.tgz", +- "integrity": "sha512-oJoftv0LSuaDZE3Le4DbKX+KS9G36NzOeSap90UIK0yMA/NhKJhqlSGtNDORNRaIbQfzjXDrQa0ytJ6mNRGz/Q==", +- "dev": true, +- "license": "MIT", +- "optional": true, +- "dependencies": { +- "@types/node": "*" +- } +- }, + "node_modules/@typescript-eslint/eslint-plugin": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.21.0.tgz", +@@ -3373,9 +3384,9 @@ + "license": "MIT" + }, + "node_modules/better-sqlite3": { +- "version": "12.9.0", +- "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.9.0.tgz", +- "integrity": "sha512-wqUv4Gm3toFpHDQmaKD4QhZm3g1DjUBI0yzS4UBl6lElUmXFYdTQmmEDpAFa5o8FiFiymURypEnfVHzILKaxqQ==", ++ "version": "12.11.1", ++ "resolved": "https://registry.npmjs.org/better-sqlite3/-/better-sqlite3-12.11.1.tgz", ++ "integrity": "sha512-dq9AtApgg5PGFtBzPFSBl3HZQjHok5gaQCM6zh2Yk0aSmDCs1CbnVI8/HgASQkNKsWFpseIO9beg5xxpYhbIfA==", + "hasInstallScript": true, + "license": "MIT", + "dependencies": { +@@ -3383,7 +3394,7 @@ + "prebuild-install": "^7.1.1" + }, + "engines": { +- "node": "20.x || 22.x || 23.x || 24.x || 25.x" ++ "node": "20.x || 22.x || 23.x || 24.x || 25.x || 26.x" + } + }, + "node_modules/big.js": { +@@ -3632,16 +3643,6 @@ + "ieee754": "^1.1.13" + } + }, +- "node_modules/buffer-crc32": { +- "version": "0.2.13", +- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz", +- "integrity": "sha512-VO9Ht/+p3SN7SKWqcrgEzjGbRSJYTx+Q1pTQC0wrWqHx0vpJraQ6GtHx8tvcg1rlK1byhU5gccxgOgj7B0TDkQ==", +- "dev": true, +- "license": "MIT", +- "engines": { +- "node": "*" +- } +- }, + "node_modules/buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", +@@ -5529,22 +5530,22 @@ + } + }, + "node_modules/electron": { +- "version": "40.9.2", +- "resolved": "https://registry.npmjs.org/electron/-/electron-40.9.2.tgz", +- "integrity": "sha512-gTLLTlfMyORZDj+03tkxsstQOQlmu6dYl0X8cwlmFb+gMmCM9Gc+rmBGSaCb5KI11IMUWHu4hvKA/spP8oJe+w==", ++ "version": "42.6.0", ++ "resolved": "https://registry.npmjs.org/electron/-/electron-42.6.0.tgz", ++ "integrity": "sha512-axGNgd+yCTg+vi1VEGrQqAj9WVWkePKwbICSAvMiT2eTaxhij9a/xhBHD6rXV8wrlW9ZfJzE5+xg752ImxrmTw==", + "dev": true, +- "hasInstallScript": true, + "license": "MIT", + "dependencies": { +- "@electron/get": "^2.0.0", +- "@types/node": "^24.9.0", +- "extract-zip": "^2.0.1" ++ "@electron-internal/extract-zip": "^1.0.1", ++ "@electron/get": "^5.0.0", ++ "@types/node": "^24.9.0" + }, + "bin": { +- "electron": "cli.js" ++ "electron": "cli.js", ++ "install-electron": "install.js" + }, + "engines": { +- "node": ">= 12.20.55" ++ "node": ">= 22.12.0" + } + }, + "node_modules/electron-builder": { +@@ -6963,27 +6964,6 @@ + "dev": true, + "license": "MIT" + }, +- "node_modules/extract-zip": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-2.0.1.tgz", +- "integrity": "sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==", +- "dev": true, +- "license": "BSD-2-Clause", +- "dependencies": { +- "debug": "^4.1.1", +- "get-stream": "^5.1.0", +- "yauzl": "^2.10.0" +- }, +- "bin": { +- "extract-zip": "cli.js" +- }, +- "engines": { +- "node": ">= 10.17.0" +- }, +- "optionalDependencies": { +- "@types/yauzl": "^2.9.1" +- } +- }, + "node_modules/extsprintf": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.4.1.tgz", +@@ -7096,16 +7076,6 @@ + "node": ">=0.8.0" + } + }, +- "node_modules/fd-slicer": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", +- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "pend": "~1.2.0" +- } +- }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", +@@ -7390,21 +7360,6 @@ + "integrity": "sha512-y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow==", + "license": "MIT" + }, +- "node_modules/fs-extra": { +- "version": "8.1.0", +- "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz", +- "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "graceful-fs": "^4.2.0", +- "jsonfile": "^4.0.0", +- "universalify": "^0.1.0" +- }, +- "engines": { +- "node": ">=6 <7 || >=8" +- } +- }, + "node_modules/fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", +@@ -10819,13 +10774,6 @@ + "url": "https://github.com/sponsors/jet2jet" + } + }, +- "node_modules/pend": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", +- "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", +- "dev": true, +- "license": "MIT" +- }, + "node_modules/picocolors": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", +@@ -16252,17 +16200,6 @@ + "node": ">=12" + } + }, +- "node_modules/yauzl": { +- "version": "2.10.0", +- "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", +- "integrity": "sha512-p4a9I6X6nu6IhoGmBqAcbJy1mlC4j27vEPZX9F4L4/vZT3Lyq1VkFHw/V/PUcB9Buo+DG3iHkT0x3Qya58zc3g==", +- "dev": true, +- "license": "MIT", +- "dependencies": { +- "buffer-crc32": "~0.2.3", +- "fd-slicer": "~1.1.0" +- } +- }, + "node_modules/yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", +diff --git a/package.json b/package.json +index cc041c3..b656a6b 100644 +--- a/package.json ++++ b/package.json +@@ -123,7 +123,7 @@ + "css-loader": "^7.1.4", + "css-minimizer-webpack-plugin": "^8.0.0", + "del": "^6.1.1", +- "electron": "40.9.2", ++ "electron": "42.6.0", + "electron-builder": "^26.9.0", + "electron-debug": "^3.2.0", + "electron-devtools-installer": "github:lyswhut/electron-devtools-installer#64596d615c1fc891eefd8aef1dfcb2c87aaadf03", +@@ -167,7 +167,7 @@ + }, + "dependencies": { + "@simonwep/pickr": "^1.9.1", +- "better-sqlite3": "^12.9.0", ++ "better-sqlite3": "^12.11.1", + "bufferutil": "^4.1.0", + "comlink": "~4.3.1", + "crypto-js": "^4.2.0", diff --git a/pkgs/by-name/lx/lx-music-desktop/package.nix b/pkgs/by-name/lx/lx-music-desktop/package.nix index 69937ffeb004..548b4252325a 100644 --- a/pkgs/by-name/lx/lx-music-desktop/package.nix +++ b/pkgs/by-name/lx/lx-music-desktop/package.nix @@ -10,12 +10,12 @@ makeWrapper, makeDesktopItem, - electron_40, + electron_42, commandLineArgs ? "", }: let - electron = electron_40; + electron = electron_42; in buildNpmPackage (finalAttrs: { pname = "lx-music-desktop"; @@ -56,6 +56,13 @@ buildNpmPackage (finalAttrs: { (replaceVars ./electron-builder.patch { electron_version = electron.version; }) + + # the upstream repository hasn't released a version with a newer + # electron yet, so we patch `package.json` and the lock file to use + # electron 42. updating better-sqlite3 is also required due to the + # ABI incompatibility between the original one with electron 42, see + # https://github.com/WiseLibs/better-sqlite3/issues/1474 + ./npm-deps.patch ]; nativeBuildInputs = [ @@ -63,7 +70,7 @@ buildNpmPackage (finalAttrs: { copyDesktopItems ]; - npmDepsHash = "sha256-iIymnYIAE8rFEa8I2nVt2JrMyRiZL5nBS+HfNoDN1Hk="; + npmDepsHash = "sha256-1gizfbnkdG84VxB2MaoGoIEQoydiVHbGeWmy2A03FCI="; makeCacheWritable = true; @@ -118,6 +125,13 @@ buildNpmPackage (finalAttrs: { meta = { broken = stdenv.hostPlatform.isDarwin; description = "Music software based on Electron and Vue"; + longDescription = '' + Some functionalities (e.g. lyrics window) are broken when lx-music-desktop + runs using a Wayland ozone platform due to Electron's lack of support + for Wayland. If you do need these features, please consider unsetting + `NIXOS_OZONE_WL` and passing `--ozone-platform=x11` from the command line + to restore the expected behavior. + ''; homepage = "https://github.com/lyswhut/lx-music-desktop"; changelog = "https://github.com/lyswhut/lx-music-desktop/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; diff --git a/pkgs/by-name/lx/lxgw-neoxihei/package.nix b/pkgs/by-name/lx/lxgw-neoxihei/package.nix index 62e1682374cc..02f90de7c175 100644 --- a/pkgs/by-name/lx/lxgw-neoxihei/package.nix +++ b/pkgs/by-name/lx/lxgw-neoxihei/package.nix @@ -6,11 +6,11 @@ stdenvNoCC.mkDerivation rec { pname = "lxgw-neoxihei"; - version = "1.302"; + version = "1.304"; src = fetchurl { url = "https://github.com/lxgw/LxgwNeoXiHei/releases/download/v${version}/LXGWNeoXiHei.ttf"; - hash = "sha256-7YRfB+nDHUhzPuWyjuZUIwx7tLKjjhP9JutNWRnAw3w="; + hash = "sha256-WWXdmSKQhhxtYihQmNxcp/bGaZMHZf0R1dD9SRLYFuc="; }; dontUnpack = true; diff --git a/pkgs/by-name/lx/lxmf-rs/package.nix b/pkgs/by-name/lx/lxmf-rs/package.nix index edca89a9223a..da980c70f90d 100644 --- a/pkgs/by-name/lx/lxmf-rs/package.nix +++ b/pkgs/by-name/lx/lxmf-rs/package.nix @@ -13,17 +13,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "lxmf-rs"; - version = "0.2.0"; + version = "0.9.6"; __structuredAttrs = true; src = fetchFromGitHub { owner = "FreeTAKTeam"; repo = "LXMF-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-2bxSBw4ISb7xOQiazrSVytvW9cW4i7azB7U8sos7+yA="; + hash = "sha256-lkvfcIdSlvhWMDGv/N20uKfUygz9OUwQ2kFTR+oqeow="; }; - cargoHash = "sha256-EqRL1JoAdyh46Ev8S/Ta6RsbhhaNH6dlisudpO2D1Rw="; + cargoHash = "sha256-1ybnT3dSuPP+96fGP1ZBt1n7ommmD3/lsc3pJ+sK0yc="; nativeBuildInputs = [ pkg-config @@ -52,6 +52,7 @@ rustPlatform.buildRustPackage (finalAttrs: { "--skip=transport::announce_limits::tests::ingress_limiting_is_scoped_per_interface" # multicast listener expected to see the Broadcast tx within 500ms "--skip=broadcast_tx_reaches_multicast_listeners" + "--skip=direct_link_proof_targeting_multicast_iface_falls_back_to_broadcast" ]; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/lx/lxmf/package.nix b/pkgs/by-name/lx/lxmf/package.nix new file mode 100644 index 000000000000..c3768b15a883 --- /dev/null +++ b/pkgs/by-name/lx/lxmf/package.nix @@ -0,0 +1,14 @@ +{ + python3Packages, +}: + +let + pythonPackages = python3Packages.overrideScope ( + self: super: { + lxmf = super.lxmf.override { + propagateRns = true; + }; + } + ); +in +pythonPackages.toPythonApplication pythonPackages.lxmf diff --git a/pkgs/by-name/ly/lychee/package.nix b/pkgs/by-name/ly/lychee/package.nix index 97422a46de71..2726432bacb5 100644 --- a/pkgs/by-name/ly/lychee/package.nix +++ b/pkgs/by-name/ly/lychee/package.nix @@ -16,7 +16,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "lychee"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "lycheeverse"; @@ -31,10 +31,10 @@ rustPlatform.buildRustPackage (finalAttrs: { '("cargo:rustc-env=GIT_DATE={}", "'$GIT_DATE'")' rm -rf $out/.git ''; - hash = "sha256-lknj0uTIWYwDm3PA/Q8paVxRn+B9qvfllYUjnp7I4jI="; + hash = "sha256-fXuLeLwrE/CINQKqk87o0Dp+8nGOqCyUkS5gTr9YOXY="; }; - cargoHash = "sha256-ivLx48qbagjw5zGkYC+ygK83p8q110iEn2YEfUjTFHs="; + cargoHash = "sha256-21J6eH2xSLK2VWnsrMk9WaKjPJiNP2UQGJuYkZUqsnM="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/ly/lynis/package.nix b/pkgs/by-name/ly/lynis/package.nix index a128f0e7dff7..d464874f243b 100644 --- a/pkgs/by-name/ly/lynis/package.nix +++ b/pkgs/by-name/ly/lynis/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lynis"; - version = "3.1.6"; + version = "3.1.7"; src = fetchFromGitHub { owner = "CISOfy"; repo = "lynis"; tag = finalAttrs.version; - hash = "sha256-f1iV9OBkycrwP3ydjaGMX45JIBtzZKHEJqnEoVuZPu4="; + hash = "sha256-trD0/t7f3JChlv9aLyeGlieAEcxfUl4iPfubfpieoVA="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ly/lynx/package.nix b/pkgs/by-name/ly/lynx/package.nix index f5eb99b2e0a2..86350e08e700 100644 --- a/pkgs/by-name/ly/lynx/package.nix +++ b/pkgs/by-name/ly/lynx/package.nix @@ -13,14 +13,14 @@ stdenv.mkDerivation (finalAttrs: { pname = "lynx"; - version = "2.9.2"; + version = "2.9.3"; src = fetchurl { urls = [ "https://invisible-island.net/archives/lynx/tarballs/lynx${finalAttrs.version}.tar.bz2" "https://invisible-mirror.net/archives/lynx/tarballs/lynx${finalAttrs.version}.tar.bz2" ]; - hash = "sha256-c3S4mTbZkWaeEB9Ol/LJWSA24ejNqnuvwlmnerb7B84="; + hash = "sha256-F0t/KGamDzJHunX1x9uxCxJK7eShNZMS3hXzv+vSBQ8="; }; enableParallelBuilding = true; @@ -53,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://lynx.invisible-island.net/lynx${finalAttrs.version}/CHANGES.html"; description = "Text-mode web browser"; homepage = "https://lynx.invisible-island.net/"; mainProgram = "lynx"; diff --git a/pkgs/by-name/ly/lyricspot/package.nix b/pkgs/by-name/ly/lyricspot/package.nix new file mode 100644 index 000000000000..6a7eaef1388e --- /dev/null +++ b/pkgs/by-name/ly/lyricspot/package.nix @@ -0,0 +1,48 @@ +{ + lib, + fetchFromGitHub, + stdenvNoCC, + makeWrapper, + python3, + playerctl, +}: +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "lyricspot"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "vlensys"; + repo = "lyricspot"; + tag = "v${finalAttrs.version}"; + hash = "sha256-qDXTcTlpMWW7vAQuOFBEnM26DvIdy/fvkGTL/TdDa2A="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp lyricspot.py $out/bin/lyricspot + chmod +x $out/bin/lyricspot + wrapProgram $out/bin/lyricspot \ + --prefix PATH ":" ${ + lib.makeBinPath [ + python3 + playerctl + ] + } + ''; + + meta = { + homepage = "https://github.com/vlensys/lyricspot"; + description = "Good old live synced lyrics in your terminal"; + license = lib.licenses.gpl3Only; + mainProgram = "lyricspot"; + maintainers = with lib.maintainers; [ + yarn + ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/by-name/ly/lyx/package.nix b/pkgs/by-name/ly/lyx/package.nix index a766d92207a1..a76a7b6d0966 100644 --- a/pkgs/by-name/ly/lyx/package.nix +++ b/pkgs/by-name/ly/lyx/package.nix @@ -12,12 +12,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.5.1"; pname = "lyx"; src = fetchurl { - url = "ftp://ftp.lyx.org/pub/lyx/stable/2.4.x/${pname}-${version}.tar.xz"; - hash = "sha256-/6zTdIDzIPPz+PMERf5AiX6d9EyU7oe6BBPjZAhvS5A="; + url = "ftp://ftp.lyx.org/pub/lyx/stable/2.5.x/lyx-${version}.tar.xz"; + hash = "sha256-8qI4e8s/L1RsH8E+THTLT4qmSHBs5XiO9wXdUTRNLP0="; }; # LaTeX is used from $PATH, as people often want to have it with extra pkgs @@ -53,6 +53,7 @@ stdenv.mkDerivation rec { qtWrapperArgs = [ " --prefix PATH : ${python3}/bin" ]; meta = { + changelog = "https://www.lyx.org/announce/${lib.replaceString "." "_" version}.txt"; description = "WYSIWYM frontend for LaTeX, DocBook"; homepage = "https://www.lyx.org"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/lz/lzbench/package.nix b/pkgs/by-name/lz/lzbench/package.nix index 1e6e37634c5d..a7c99c250e69 100644 --- a/pkgs/by-name/lz/lzbench/package.nix +++ b/pkgs/by-name/lz/lzbench/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "lzbench"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "inikep"; repo = "lzbench"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CmT+mjFKf8/HE00re1QzU2pwdUYR8Js1kN4y6c2ZiNY="; + sha256 = "sha256-/rRLD7lK8YGyx6dHxw5BPydf2YigZn/dF5NF2Q2Misg="; }; enableParallelBuilding = true; diff --git a/pkgs/by-name/lz/lzsa/package.nix b/pkgs/by-name/lz/lzsa/package.nix index ef06433c7860..4b5312125ea0 100644 --- a/pkgs/by-name/lz/lzsa/package.nix +++ b/pkgs/by-name/lz/lzsa/package.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/emmanuel-marty/lzsa"; description = "Byte-aligned, efficient lossless packer that is optimized for fast decompression on 8-bit micros"; mainProgram = "lzsa"; - license = with lib.licenses; [ cc0 ]; + license = lib.licenses.cc0; maintainers = [ ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/m1/m1n1/package.nix b/pkgs/by-name/m1/m1n1/package.nix index ba9320acbde9..e3aade13e7a4 100644 --- a/pkgs/by-name/m1/m1n1/package.nix +++ b/pkgs/by-name/m1/m1n1/package.nix @@ -3,7 +3,6 @@ stdenv, fetchFromGitHub, imagemagick, - source-code-pro, python3Packages, nix-update-script, nixos-icons, @@ -32,17 +31,23 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "m1n1"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { owner = "AsahiLinux"; repo = "m1n1"; tag = "v${finalAttrs.version}"; - hash = "sha256-rxop5r+EVXnp1OVkGT6MUwcl6yNTJxJSJuruZiaou7g="; + hash = "sha256-yYXB2DhLcLqxaqwP5mII+j2PMIoXdZ35bpx/d0WSZA8="; fetchSubmodules = true; }; - cargoVendorDir = "."; + cargoDeps = rustPlatform.fetchCargoVendor { + inherit (finalAttrs) pname version; + src = "${finalAttrs.src}/rust"; + sourceRoot = "rust"; + hash = "sha256-iuiRp2FA5jnb3uh/p1gpc7Sznt1s4/UR91wEtXTf97o="; + }; + cargoRoot = "rust"; postPatch = lib.optionalString (customLogo != null) '' magick ${customLogo} -resize 128x128 data/custom_128.png @@ -56,14 +61,6 @@ stdenv.mkDerivation (finalAttrs: { rustPlatform.cargoSetupHook ]; - postConfigure = '' - patchShebangs --build font/makefont.sh - FONT_PATH=${source-code-pro}/share/fonts/opentype/SourceCodePro-Bold.otf - rm font/{SourceCodePro-Bold.ttf,font.bin,font_retina.bin} - ./font/makefont.sh 8 16 12 $FONT_PATH font/font.bin - ./font/makefont.sh 16 32 25 $FONT_PATH font/font_retina.bin - ''; - makeFlags = [ "ARCH=${stdenv.cc.targetPrefix}" "RELEASE=1" @@ -105,6 +102,7 @@ stdenv.mkDerivation (finalAttrs: { passthru = { updateScript = nix-update-script { }; + inherit rustPlatform rustPackages; }; meta = { diff --git a/pkgs/by-name/m3/m33-linux/package.nix b/pkgs/by-name/m3/m33-linux/package.nix index 7fa75e4a1ac5..0d08a36340b6 100644 --- a/pkgs/by-name/m3/m33-linux/package.nix +++ b/pkgs/by-name/m3/m33-linux/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "donovan6000"; - repo = "M3D-Linux"; + repo = "M33-Linux"; rev = "5c1b90c13d260771dac970b49fdc9f840fee5f4a"; sha256 = "1bvbclkyfcv23vxb4s1zssvygklks1nhp4iwi4v90c1fvyz0356f"; }; @@ -39,7 +39,7 @@ stdenv.mkDerivation { ''; meta = { - homepage = "https://github.com/donovan6000/M3D-Linux"; + homepage = "https://github.com/donovan6000/M33-Linux"; description = "Linux program that can communicate with the Micro 3D printer"; mainProgram = "m33-linux"; license = lib.licenses.gpl2Only; diff --git a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix index 92ec9065cdb9..16343ec424a5 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/fastdeploy-ppocr.nix @@ -44,7 +44,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # cub/cub.cuh + cccl # cub/cub.cuh libcublas # cublas_v2.h libcurand # curand.h libcusparse # cusparse.h diff --git a/pkgs/by-name/ma/maa-assistant-arknights/package.nix b/pkgs/by-name/ma/maa-assistant-arknights/package.nix index 6692daa5419d..14cc604059bc 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/package.nix +++ b/pkgs/by-name/ma/maa-assistant-arknights/package.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # cub/cub.cuh + cccl # cub/cub.cuh libcublas # cublas_v2.h libcurand # curand.h libcusparse # cusparse.h diff --git a/pkgs/by-name/ma/macchina/package.nix b/pkgs/by-name/ma/macchina/package.nix index 0e3b98afaf39..54d2cb46757f 100644 --- a/pkgs/by-name/ma/macchina/package.nix +++ b/pkgs/by-name/ma/macchina/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Fast, minimal and customizable system information fetcher"; homepage = "https://github.com/Macchina-CLI/macchina"; changelog = "https://github.com/Macchina-CLI/macchina/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _414owen progrm_jarvis diff --git a/pkgs/by-name/ma/macfuse-stubs/package.nix b/pkgs/by-name/ma/macfuse-stubs/package.nix index fdd513bb1561..8a9889649eca 100644 --- a/pkgs/by-name/ma/macfuse-stubs/package.nix +++ b/pkgs/by-name/ma/macfuse-stubs/package.nix @@ -58,13 +58,14 @@ stdenv.mkDerivation rec { cp -R usr/local/include/fuse{,.h} $out/include ''; + passthru.warning = meta.description; + meta = { homepage = "https://osxfuse.github.io"; description = "Build time stubs for FUSE on macOS"; longDescription = '' macFUSE is required for this package to work on macOS. To install macFUSE, - use the installer from the - project website. + use the installer from the [project website](https://osxfuse.github.io/). ''; platforms = lib.platforms.darwin; maintainers = with lib.maintainers; [ midchildan ]; @@ -76,10 +77,4 @@ stdenv.mkDerivation rec { lgpl2Plus # libfuse ]; }; - - passthru.warning = '' - macFUSE is required for this package to work on macOS. To install macFUSE, - use the installer from the - project website. - ''; } diff --git a/pkgs/by-name/ma/macos-instantview/package.nix b/pkgs/by-name/ma/macos-instantview/package.nix index 94a8178cb23c..ca3d2dac099f 100644 --- a/pkgs/by-name/ma/macos-instantview/package.nix +++ b/pkgs/by-name/ma/macos-instantview/package.nix @@ -7,11 +7,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "instantview"; - version = "3.22R0002"; + version = "3.24R0004"; src = fetchurl { url = "https://www.siliconmotion.com/downloads/macOS_InstantView_V${finalAttrs.version}.dmg"; - hash = "sha256-PdgX9zCrVYtNbuOCYKVo9cegCG/VY7QXetivVsUltbg="; + hash = "sha256-lozVykKK1edUQlwxNKy/GyMKjsQaXeR9XVoau72Bwhg="; }; nativeBuildInputs = [ _7zz ]; @@ -19,6 +19,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { dontUnpack = true; dontConfigure = true; dontBuild = true; + dontFixup = true; installPhase = '' runHook preInstall @@ -27,8 +28,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { # Extract the DMG using 7zip 7zz x "$src" -oextracted -y - # Move the extracted contents to $out - cp -r extracted/* "$out/Applications/" + cp -r extracted/*.app "$out/Applications/" runHook postInstall ''; diff --git a/pkgs/by-name/ma/macshot/package.nix b/pkgs/by-name/ma/macshot/package.nix new file mode 100644 index 000000000000..30bd9961fa42 --- /dev/null +++ b/pkgs/by-name/ma/macshot/package.nix @@ -0,0 +1,51 @@ +{ + lib, + stdenvNoCC, + fetchurl, + undmg, + nix-update-script, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "macshot"; + version = "4.1.2"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchurl { + url = "https://github.com/sw33tLie/macshot/releases/download/v${finalAttrs.version}/MacShot.dmg"; + hash = "sha256-5o8l6MvGs58zSPKaR4RQZ2UgWsqcQRaRUsd8cS62VVg="; + }; + + sourceRoot = "."; + + nativeBuildInputs = [ + undmg + ]; + + installPhase = '' + runHook preInstall + + mkdir -p "$out/Applications" + cp -R macshot.app "$out/Applications/" + + mkdir -p "$out/bin" + ln -s "$out/Applications/macshot.app/Contents/MacOS/macshot" "$out/bin/macshot" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Feature-packed native macOS screenshot & recording tool"; + homepage = "https://github.com/sw33tLie/macshot"; + changelog = "https://github.com/sw33tLie/macshot/blob/v${finalAttrs.version}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; + maintainers = with lib.maintainers; [ GaetanLepage ]; + mainProgram = "macshot"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/ma/mactracker/package.nix b/pkgs/by-name/ma/mactracker/package.nix index 6ed1c53b5007..f6b9a4a30bad 100644 --- a/pkgs/by-name/ma/mactracker/package.nix +++ b/pkgs/by-name/ma/mactracker/package.nix @@ -72,7 +72,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ DimitarNestorov ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/ma/mado/package.nix b/pkgs/by-name/ma/mado/package.nix index ed691886dc75..1fb4a74ea43a 100644 --- a/pkgs/by-name/ma/mado/package.nix +++ b/pkgs/by-name/ma/mado/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mado"; - version = "0.3.0"; + version = "0.3.1"; src = fetchFromGitHub { owner = "akiomik"; repo = "mado"; tag = "v${finalAttrs.version}"; - hash = "sha256-wAuV4w0dKfUbJVLTdp59/u4y13SPy3wkRfTlpvyE/zY="; + hash = "sha256-UpkzUeFSLpTjTcf5yEpQDJVDZXL9DEuvw0Hx4r0hG7o="; }; - cargoHash = "sha256-fkalUnPkjjzhLaACh+WQP4tG5VzZ7wmrh5T1DVgSDwM="; + cargoHash = "sha256-3Wtr+o59SqAjDPLZxTcjK92FF/+O0eXwehnJIRfV2zQ="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/maestro/package.nix b/pkgs/by-name/ma/maestro/package.nix index 95ba032e5135..1b1a62b24543 100644 --- a/pkgs/by-name/ma/maestro/package.nix +++ b/pkgs/by-name/ma/maestro/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "maestro"; - version = "2.6.0"; + version = "2.6.1"; src = fetchurl { url = "https://github.com/mobile-dev-inc/maestro/releases/download/cli-${finalAttrs.version}/maestro.zip"; - hash = "sha256-gBhRBaXX4ifjs/vPIl9FsxJQjqZ2qfyOGxqhysi5/24="; + hash = "sha256-NECCX1FPU3xqlrz13plXgMKkp/g6QyCP3JXU8f7PrTs="; }; dontUnpack = true; diff --git a/pkgs/by-name/ma/magma/package.nix b/pkgs/by-name/ma/magma/package.nix index dbf04424be14..55291c6a0ee0 100644 --- a/pkgs/by-name/ma/magma/package.nix +++ b/pkgs/by-name/ma/magma/package.nix @@ -207,7 +207,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lists.optionals cudaSupport ( with cudaPackages; [ - cuda_cccl # and + cccl # and cuda_cudart # cuda_runtime.h libcublas # cublas_v2.h libcusparse # cusparse.h diff --git a/pkgs/by-name/ma/mago/package.nix b/pkgs/by-name/ma/mago/package.nix index e826b30803c0..44cee926a131 100644 --- a/pkgs/by-name/ma/mago/package.nix +++ b/pkgs/by-name/ma/mago/package.nix @@ -11,17 +11,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mago"; - version = "1.29.0"; + version = "1.43.0"; src = fetchFromGitHub { owner = "carthage-software"; repo = "mago"; tag = finalAttrs.version; - hash = "sha256-e/LKOQ+GAtdDye/poJdbX/98gDWle3NWIZ2zHwkGkcQ="; + hash = "sha256-AWnPhylz41E6d1M7PxVpH4EbyYeO9T6jlWVlzBqiOhQ="; forceFetchGit = true; # Does not download all files otherwise }; - cargoHash = "sha256-stjjP8VRHy5k9zMXWGikVNExXRFte0gVBEsbKmPY6U4="; + cargoHash = "sha256-f7HZTJ0ESx7QTKgBqd2FOH1nCeIzgODMM9Sb0tQpfdE="; env = { # Get openssl-sys to use pkg-config diff --git a/pkgs/by-name/ma/maigret/package.nix b/pkgs/by-name/ma/maigret/package.nix index e81fc6e7b816..2322b0d6fd76 100644 --- a/pkgs/by-name/ma/maigret/package.nix +++ b/pkgs/by-name/ma/maigret/package.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pname = "maigret"; - version = "0.6.1"; + version = "0.6.3"; pyproject = true; src = fetchFromGitHub { owner = "soxoj"; repo = "maigret"; tag = "v${finalAttrs.version}"; - hash = "sha256-gojeqNZd0n5Qs7YVFBy6zDdjXR6KKdebcu8vfNs/AE8="; + hash = "sha256-iKWPIDxuwoNzyWZAiziWU2Q7VDFgGqAcxYjcw6L/5Ho="; }; pythonRelaxDeps = true; diff --git a/pkgs/by-name/ma/mail-tlsa-check-exporter/package.nix b/pkgs/by-name/ma/mail-tlsa-check-exporter/package.nix new file mode 100644 index 000000000000..05aebe64bae1 --- /dev/null +++ b/pkgs/by-name/ma/mail-tlsa-check-exporter/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenv, + fetchFromGitHub, + nix-update-script, + makeWrapper, + nodejs, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mail-tlsa-check-exporter"; + version = "0-unstable-2025-06-12"; + + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "ietf-tools"; + repo = "mail-tlsa-check-exporter"; + rev = "9843bf85971fbe130e8cd32e6fcf0dfcee92e929"; + hash = "sha256-5c3epExz3tv6gRiIfpDyV1pkfcRVWjtNpl93LWsYKdk="; + }; + + nativeBuildInputs = [ + makeWrapper + ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/libexec + cp $src/index.mjs $out/libexec + + makeWrapper ${lib.getExe nodejs} $out/bin/mail-tlsa-check-exporter \ + --append-flag $out/libexec/index.mjs + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version=branch=main" ]; + }; + + meta = { + description = "Validate SMTP / IMAP server certificates against a TLSA record as a Prometheus exporter"; + homepage = "https://github.com/ietf-tools/mail-tlsa-check-exporter"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ bartoostveen ]; + mainProgram = "mail-tlsa-check-exporter"; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/ma/mailpit/source.nix b/pkgs/by-name/ma/mailpit/source.nix index d08c094b3283..c20cf59126af 100644 --- a/pkgs/by-name/ma/mailpit/source.nix +++ b/pkgs/by-name/ma/mailpit/source.nix @@ -1,6 +1,6 @@ { - version = "1.30.1"; - hash = "sha256-Z/0Lh+2VLB3w4AHNf+imWRgHmarO1MMUmNqrcAVSQ2k="; - npmDepsHash = "sha256-eccYGPIbk98+BtNtBAq4G1z/ymj6HHwacuH6ZktuN0U="; - vendorHash = "sha256-FgwMdvND7DMrYWp9kB2IB+Gjyo1gm1LtLTeC9SfPw9U="; + version = "1.30.4"; + hash = "sha256-qpwwCugg18cC4xbwmLKNM3c63z8k1FOoZlzpgvXp5BU="; + npmDepsHash = "sha256-urjsUXcEwMaaaSs0WdH+8/q3h7mr+/lKvXi9x21VYpU="; + vendorHash = "sha256-/0ddo1IwGeLyOQRqgqNmju3qOzwYQTwz4MDf2TBkUDU="; } diff --git a/pkgs/by-name/ma/mailspring/darwin.nix b/pkgs/by-name/ma/mailspring/darwin.nix deleted file mode 100644 index 77750ef76453..000000000000 --- a/pkgs/by-name/ma/mailspring/darwin.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ - stdenv, - fetchurl, - pname, - version, - meta, - unzip, - makeWrapper, -}: - -stdenv.mkDerivation (finalAttrs: { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/Mailspring-AppleSilicon.zip"; - hash = "sha256-U8yh7Qsxu1AmqMVV2p9MmvNHH922yBEqWA8OsQleoCQ="; - }; - dontUnpack = true; - - nativeBuildInputs = [ - unzip - makeWrapper - ]; - - installPhase = '' - runHook preInstall - - mkdir -p $out/Applications $out/bin - unzip $src -d $out/Applications - makeWrapper $out/Applications/Mailspring.app/Contents/MacOS/Mailspring $out/bin/mailspring - - runHook postInstall - ''; -}) diff --git a/pkgs/by-name/ma/mailspring/libetpan.nix b/pkgs/by-name/ma/mailspring/libetpan.nix new file mode 100644 index 000000000000..93341ca2145b --- /dev/null +++ b/pkgs/by-name/ma/mailspring/libetpan.nix @@ -0,0 +1,49 @@ +{ + lib, + stdenv, + + src, + version, + + autoreconfHook, + pkg-config, + + cyrus_sasl, + openssl, + zlib, +}: +stdenv.mkDerivation { + pname = "mailspring-libetpan"; + inherit src version; + + sourceRoot = "${src.name}/mailsync/Vendor/libetpan"; + + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; + + buildInputs = [ + cyrus_sasl + openssl + zlib + ]; + + configureFlags = [ + "--with-sasl=${cyrus_sasl.dev}" + "--with-openssl=${openssl.dev}" + ]; + + # Prevent GCC 14 from treating pointer type mismatches as fatal build errors + env.CFLAGS = toString [ + "-std=gnu17" + "-Wno-error=incompatible-pointer-types" + ]; + + meta = { + description = "Modified fork of the libetpan mail framework"; + homepage = "https://github.com/Foundry376/Mailspring-Sync"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.linux ++ lib.platforms.darwin; + }; +} diff --git a/pkgs/by-name/ma/mailspring/linux.nix b/pkgs/by-name/ma/mailspring/linux.nix deleted file mode 100644 index 54e04eb2e601..000000000000 --- a/pkgs/by-name/ma/mailspring/linux.nix +++ /dev/null @@ -1,101 +0,0 @@ -{ - stdenv, - lib, - pname, - version, - meta, - fetchurl, - autoPatchelfHook, - alsa-lib, - coreutils, - curl, - db, - dpkg, - glib, - gtk3, - wrapGAppsHook3, - libkrb5, - libsecret, - nss, - openssl, - udev, - libxtst, - libxscrnsaver, - libxdamage, - libxshmfence, - libxkbfile, - libgbm, - libdrm, - libappindicator, -}: - -stdenv.mkDerivation (finalAttrs: { - inherit pname version meta; - - src = fetchurl { - url = "https://github.com/Foundry376/Mailspring/releases/download/${finalAttrs.version}/mailspring-${finalAttrs.version}-amd64.deb"; - hash = "sha256-pyEWypqujSYYmbpUgcUMJoew4nIjE/dQWTVdYTxhmN4="; - }; - - nativeBuildInputs = [ - autoPatchelfHook - dpkg - wrapGAppsHook3 - ]; - - buildInputs = [ - alsa-lib - db - glib - gtk3 - libkrb5 - libsecret - nss - libxkbfile - libxdamage - libxscrnsaver - libxtst - libxshmfence - libgbm - libdrm - openssl - curl - ]; - - runtimeDependencies = [ - coreutils - openssl - (lib.getLib udev) - libappindicator - libsecret - ]; - - unpackPhase = '' - runHook preUnpack - - dpkg -x $src . - - runHook postUnpack - ''; - - installPhase = '' - runHook preInstall - - mkdir -p $out/{bin,lib} - cp -ar ./usr/share $out - - substituteInPlace $out/share/mailspring/resources/app.asar.unpacked/mailsync \ - --replace-fail dirname ${coreutils}/bin/dirname - - ln -s $out/share/mailspring/mailspring $out/bin/mailspring - ln -s ${lib.getLib openssl}/lib/libcrypto.so $out/lib/libcrypto.so.1.0.0 - - runHook postInstall - ''; - - postFixup = # sh - '' - substituteInPlace $out/share/applications/Mailspring.desktop \ - --replace-fail Exec=mailspring Exec=$out/bin/mailspring - ''; -}) diff --git a/pkgs/by-name/ma/mailspring/mailcore2.nix b/pkgs/by-name/ma/mailspring/mailcore2.nix new file mode 100644 index 000000000000..c3dccc1d0bc4 --- /dev/null +++ b/pkgs/by-name/ma/mailspring/mailcore2.nix @@ -0,0 +1,105 @@ +{ + lib, + stdenv, + + src, + version, + + cmake, + pkg-config, + + glib, + icu, + mailspring-libetpan, + pcre2, + openssl, + cyrus_sasl, + html-tidy, + libuuid, + libctemplate, + libsysprof-capture, + libxml2, + zlib, +}: +stdenv.mkDerivation { + pname = "mailspring-mailcore2"; + inherit src version; + + sourceRoot = "${src.name}/mailsync/Vendor/mailcore2"; + + nativeBuildInputs = [ + cmake + pkg-config + ]; + + buildInputs = [ + cyrus_sasl + glib + html-tidy + icu + libctemplate + libsysprof-capture + libuuid + libxml2 + mailspring-libetpan + openssl + pcre2 + zlib + ]; + + # Prevent GCC 14 pointer errors + env = { + CXXFLAGS = toString [ + "-std=gnu++17" + "-Wno-error=incompatible-pointer-types" + ]; + + CFLAGS = toString [ + "-Wno-error=incompatible-pointer-types" + ]; + }; + + # Only build the core library, mimicking ./build.sh + buildFlags = [ "MailCore" ]; + + postPatch = '' + # Fix hardcoded impure paths + substituteInPlace CMakeLists.txt \ + --replace-fail "/usr/include/libxml2" "${lib.getDev libxml2}/include/libxml2" \ + --replace-fail "/usr/include/tidy" "${lib.getDev html-tidy}/include/tidy" + + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + # Tell CMake to build with Objective C if the file is C, otherwise Objective C++ if the file is C++. + substituteInPlace CMakeLists.txt \ + --replace-fail "project (mailcore2)" "project (mailcore2 C CXX OBJC OBJCXX) + add_compile_options(\"$<$:-xobjective-c>\" \"$<$:-xobjective-c++>\")" + + # Fix old tidy header reference + substituteInPlace src/core/basetypes/MCHTMLCleaner.cpp \ + --replace-fail "buffio.h" "tidybuffio.h" + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/lib $out/include + + cp src/libMailCore.* $out/lib/ + + cp -r src/include/MailCore $out/include/ + + runHook postInstall + ''; + + meta = { + description = "Modified fork of the mailcore2 asynchronous C++ framework"; + homepage = "https://github.com/Foundry376/Mailspring-Sync"; + license = lib.licenses.gpl3Plus; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/ma/mailspring/mailsync.nix b/pkgs/by-name/ma/mailspring/mailsync.nix new file mode 100644 index 000000000000..6f77d031ec29 --- /dev/null +++ b/pkgs/by-name/ma/mailspring/mailsync.nix @@ -0,0 +1,137 @@ +{ + lib, + stdenv, + callPackage, + + src, + version, + + autoPatchelfHook, + cmake, + pkg-config, + + c-ares, + curl, + cyrus_sasl, + glib, + html-tidy, + icu, + libctemplate, + libiconv, + libsysprof-capture, + libuuid, + libxml2, + pcre2, + sqlite, + xz, + zlib, +}: +let + # libetpan and mailcore2 have both been modified from their upstream sources, so we must provide the vendored derivations + # See: https://github.com/Foundry376/Mailspring/blob/master/mailsync/Vendor/README.md + mailspring-libetpan = callPackage ./libetpan.nix { inherit src version; }; + mailspring-mailcore2 = callPackage ./mailcore2.nix { inherit src version mailspring-libetpan; }; +in +stdenv.mkDerivation { + pname = "mailspring-sync"; + inherit src version; + + sourceRoot = "${src.name}/mailsync"; + + nativeBuildInputs = [ + cmake + pkg-config + ] + ++ lib.optionals stdenv.isLinux [ + autoPatchelfHook + ]; + + buildInputs = [ + c-ares + curl + cyrus_sasl + glib + html-tidy + icu + libctemplate + libsysprof-capture + libuuid + libxml2 + mailspring-libetpan + mailspring-mailcore2 + pcre2 + sqlite + xz + zlib + ] + ++ lib.optionals stdenv.isDarwin [ + libiconv + ]; + + runtimeDependencies = [ + html-tidy + ]; + + env = + let + FLAGS = toString [ + "-Wno-error=deprecated-declarations" + "-Wno-error=incompatible-pointer-types" + ]; + in + { + CFLAGS = FLAGS; + CXXFLAGS = FLAGS; + }; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail 'IF(''${CMAKE_SYSTEM_NAME} MATCHES "Linux")' 'if(TRUE)' + + # Replace hardcoded host paths and vendored dependencies + substituteInPlace CMakeLists.txt \ + --replace-fail "/usr/include/libxml2" "${lib.getDev libxml2}/include/libxml2" \ + --replace-fail "find_library(RESOLV_LIB NAMES libresolv.a libresolv)" "set(RESOLV_LIB \"resolv\")" \ + --replace-fail "target_link_libraries(mailsync libetpan.a)" "target_link_libraries(mailsync ${mailspring-libetpan}/lib/libetpan${stdenv.hostPlatform.extensions.sharedLibrary})" \ + --replace-fail "target_link_libraries(mailsync libMailCore.a)" "target_link_libraries(mailsync ${mailspring-mailcore2}/lib/libMailCore.a)" + + # Replace hardcoded references to archives with library references + # Transforms 'NAMES libfoo.a libfoo' into 'NAMES foo' + sed -i -E 's/NAMES lib([a-zA-Z0-9]+)\.a lib\1/NAMES \1/g' CMakeLists.txt + '' + + lib.optionalString stdenv.isDarwin '' + # UUID_LIB is provided by system frameworks + substituteInPlace CMakeLists.txt \ + --replace-fail "find_library(UUID_LIB NAMES uuid)" "set(UUID_LIB \"\")" + + # Remove GCC related linker flags + substituteInPlace CMakeLists.txt \ + --replace-fail 'set(CMAKE_EXE_LINKER_FLAGS "-static-libgcc -static-libstdc++")' "" + + # Inject system frameworks and dependencies + substituteInPlace CMakeLists.txt \ + --replace-fail 'target_link_libraries(mailsync pthread sasl2 ssl crypto curl dl)' \ + 'target_link_libraries(mailsync pthread sasl2 ssl crypto curl dl tidy iconv "-framework Foundation" "-framework CoreFoundation" "-framework Security" "-framework CoreServices" "-framework SystemConfiguration")' + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + + cp mailsync $out/bin + + runHook postInstall + ''; + + meta = { + description = "Email synchronization engine for Mailspring"; + homepage = "https://github.com/Foundry376/Mailspring-Sync"; + license = lib.licenses.gpl3Plus; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + }; +} diff --git a/pkgs/by-name/ma/mailspring/package.nix b/pkgs/by-name/ma/mailspring/package.nix index 37011710992f..68483b457314 100644 --- a/pkgs/by-name/ma/mailspring/package.nix +++ b/pkgs/by-name/ma/mailspring/package.nix @@ -1,31 +1,183 @@ { lib, stdenv, + buildNpmPackage, callPackage, + fetchFromGitHub, + + actool, + makeBinaryWrapper, + pkg-config, + wrapGAppsHook3, + zip, + + electron_41, + html-tidy, + + # Command line arguments which are always set e.g "--password-store=kwallet6" + commandLineArgs ? "", }: let + version = "1.23.0"; + + src = fetchFromGitHub { + owner = "Foundry376"; + repo = "Mailspring"; + tag = version; + hash = "sha256-GbY3lov3MT8c8LehEifzOH28VAYpBWDbwXrqEfFfwJg="; + fetchSubmodules = true; + }; + + patches = [ + ./remove-rpm-deb-and-macos-package-generation.patch + ]; + + electron = electron_41; + + mailspring-sync = callPackage ./mailsync.nix { inherit src version; }; + + mailspring-app = buildNpmPackage { + pname = "mailspring-app"; + inherit version src patches; + postPatch = "cd app"; # we don't use sourceRoot so that we don't have to make the patch relative to it + npmDepsHash = "sha256-JkjtC4WT3cBsVlmrfO5WAxU1Xe3vXbxuNBDs2Q7fEck="; + dontNpmBuild = true; + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + npmFlags = [ "--ignore-scripts" ]; + + makeCacheWritable = true; + installPhase = '' + cp -r . "$out" + ''; + + meta = { + description = "Node dependencies for the Mailspring electron frontend"; + license = lib.licenses.gpl3Plus; + platforms = [ + "x86_64-linux" + "aarch64-linux" + "aarch64-darwin" + ]; + }; + }; +in +buildNpmPackage (finalAttrs: { pname = "mailspring"; - version = "1.21.1"; + inherit version src patches; + + npmDepsHash = "sha256-0cg/DT0MUbfzTq5hejH7auSk77M9Md7FWzidov8iyA4="; + + nativeBuildInputs = [ + makeBinaryWrapper + pkg-config + wrapGAppsHook3 + zip + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + actool + ]; + + npmFlags = [ "--ignore-scripts" ]; + + env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; + + # Remove the postinstall script to stop it from downloading a recompiled mailspring-sync binary + postPatch = '' + echo "" > scripts/postinstall.js + ''; + + preConfigure = '' + chmod +w app + cp -r ${mailspring-app}/node_modules app/node_modules + chmod -R u+w app/node_modules + + cp ${mailspring-sync}/bin/mailsync app/mailsync + + # Remove nix sandbox violating steps from the build script + substituteInPlace app/build/build.js \ + --replace-fail "runWriteCommitHashIntoPackage," "" \ + --replace-fail "runUpdateSandboxHelperPermissions," "" \ + --replace-fail "runCopySymlinkedPackages," "" + + # Use npm env vars to make node-gyp compile against the electron ABI + export npm_config_target="${electron.version}" + export npm_config_nodedir="${electron.headers}" + + # Create the electron archive to be used by electron-packager + cp -r ${electron.dist} electron-dist + chmod -R u+w electron-dist + + pushd electron-dist + zip -0Xqr ../electron.zip . + popd + + rm -r electron-dist + + # force @electron/packager to use our electron instead of downloading it + substituteInPlace \ + node_modules/@electron/packager/dist/packager.js \ + --replace-fail "await this.getElectronZipPath(downloadOpts)" "'$(pwd)/electron.zip'" + + pushd app + npm rebuild + popd + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + '' + + lib.optionalString stdenv.hostPlatform.isLinux '' + + mkdir -p $out/share/mailspring + cp -r app/dist/*/resources $out/share/mailspring + + install -Dm444 app/dist/Mailspring.desktop $out/share/applications/Mailspring.desktop + install -Dm444 app/dist/mailspring.metainfo.xml $out/share/metainfo/mailspring.metainfo.xml + + for size in 16 32 64 128 256 512; do + install -Dm444 app/build/resources/linux/icons/$size.png \ + $out/share/icons/hicolor/''${size}x''${size}/apps/mailspring.png + done + + makeWrapper ${lib.getExe electron} "$out/bin/mailspring" \ + --add-flags "$out/share/mailspring/resources/app.asar" \ + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ html-tidy ]}" \ + --set-default ELECTRON_FORCE_IS_PACKAGED 1 \ + --add-flags ${lib.escapeShellArg commandLineArgs} \ + --inherit-argv0 + + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + + mkdir -p $out/Applications + cp -r app/dist/*/Mailspring.app $out/Applications + + makeWrapper "$out/Applications/Mailspring.app/Contents/MacOS/Mailspring" "$out/bin/mailspring" \ + --add-flags ${lib.escapeShellArg commandLineArgs} + '' + + '' + runHook postInstall + ''; meta = { description = "Beautiful, fast and maintained fork of Nylas Mail by one of the original authors"; - downloadPage = "https://github.com/Foundry376/Mailspring"; + downloadPage = "https://github.com/Foundry376/Mailspring/releases"; + changelog = "https://github.com/Foundry376/Mailspring/releases/tag/${finalAttrs.version}"; homepage = "https://getmailspring.com"; license = lib.licenses.gpl3Plus; longDescription = '' Mailspring is an open-source mail client forked from Nylas Mail and built with Electron. - Mailspring's sync engine runs locally, but its source is not open. + Mailspring's sync engine is open source and written in C++ and C. It runs locally on your computer. ''; mainProgram = "mailspring"; maintainers = with lib.maintainers; [ wrench-exile-legacy ]; platforms = [ "x86_64-linux" + "aarch64-linux" "aarch64-darwin" ]; - sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; - - linux = callPackage ./linux.nix { inherit pname version meta; }; - darwin = callPackage ./darwin.nix { inherit pname version meta; }; -in -if stdenv.hostPlatform.isDarwin then darwin else linux +}) diff --git a/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch new file mode 100644 index 000000000000..feac5cdc8821 --- /dev/null +++ b/pkgs/by-name/ma/mailspring/remove-rpm-deb-and-macos-package-generation.patch @@ -0,0 +1,54 @@ +From e1210102ab3f7bff24d9dfa38ad87b3fe04d0f5e Mon Sep 17 00:00:00 2001 +From: wrench-exile-legacy +Date: Wed, 22 Jul 2026 10:38:53 +0100 +Subject: [PATCH] remove rpm, deb and macos package generation + +--- + app/build/build.js | 17 ----------------- + 1 file changed, 17 deletions(-) + +diff --git a/app/build/build.js b/app/build/build.js +index 2e90d5624..d07244d75 100644 +--- a/app/build/build.js ++++ b/app/build/build.js +@@ -365,12 +365,6 @@ async function createMacZip() { + } + const arch = process.env.OVERRIDE_TO_INTEL ? 'x64' : process.arch; + const cwd = path.join(outputDir, `Mailspring-darwin-${arch}`); +- await spawn({ +- cmd: 'zip', +- args: ['-9', '-y', '-r', '-9', '-X', zipPath, 'Mailspring.app'], +- opts: { cwd }, +- }); +- console.log(`>> Created ${zipPath}`); + } + + function writeFromTemplate(filePath, data) { +@@ -415,11 +409,6 @@ async function createDebInstaller() { + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), data); + + const icon = path.join(appDir, 'build', 'resources', 'linux', 'icons', '512.png'); +- await spawn({ +- cmd: path.join(appDir, 'script', 'mkdeb'), +- args: [packageJSON.version, linuxArch, icon, linuxAssetsDir, contentsDir, outputDir], +- }); +- console.log(`Created ${outputDir}/mailspring-${packageJSON.version}-${linuxArch}.deb`); + } + + async function createRpmInstaller() { +@@ -446,12 +435,6 @@ async function createRpmInstaller() { + writeFromTemplate(path.join(linuxAssetsDir, 'redhat', 'mailspring.spec.in'), templateData); + writeFromTemplate(path.join(linuxAssetsDir, 'Mailspring.desktop.in'), templateData); + writeFromTemplate(path.join(linuxAssetsDir, 'mailspring.metainfo.xml.in'), templateData); +- +- await spawn({ +- cmd: path.join(appDir, 'script', 'mkrpm'), +- args: [outputDir, contentsDir, linuxAssetsDir], +- }); +- console.log(`Created rpm package in ${rpmDir}`); + } + + async function main() { +-- +2.54.0 + diff --git a/pkgs/by-name/ma/mainsail/package.nix b/pkgs/by-name/ma/mainsail/package.nix index 3536a2255124..5d995e4d4ef0 100644 --- a/pkgs/by-name/ma/mainsail/package.nix +++ b/pkgs/by-name/ma/mainsail/package.nix @@ -7,16 +7,16 @@ buildNpmPackage rec { pname = "mainsail"; - version = "2.17.0"; + version = "2.18.2"; src = fetchFromGitHub { owner = "mainsail-crew"; repo = "mainsail"; rev = "v${version}"; - hash = "sha256-lKLoY5FHO34bT/3apmfVkuW0E1h4/K4r2thF9ht03U4="; + hash = "sha256-Djw5wwVflhU9G99GLUNO0a6wDZTB4y/yBqRruUJZQis="; }; - npmDepsHash = "sha256-HIErBrQ0VP4vdCFZe7uT5b1q+QdSSf08CIQmNcSryZ8="; + npmDepsHash = "sha256-fQnAVwBME4oJ15sOmZAr4qwxSpA5qqr8zJxEsVVGwSg="; nodejs = nodejs_22; diff --git a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh index 74e72dc859e5..232bc2b5c3cd 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh +++ b/pkgs/by-name/ma/makeBinaryWrapper/make-binary-wrapper.sh @@ -6,6 +6,8 @@ set -euo pipefail # assertExecutable FILE assertExecutable() { local file="$1" + [[ -e "$file" ]] || \ + die "Cannot wrap '$file' because it does not exist" [[ -f "$file" && -x "$file" ]] || \ die "Cannot wrap '$file' because it is not an executable file" } diff --git a/pkgs/by-name/ma/makeBinaryWrapper/package.nix b/pkgs/by-name/ma/makeBinaryWrapper/package.nix index a844a586d800..c369119f16a1 100644 --- a/pkgs/by-name/ma/makeBinaryWrapper/package.nix +++ b/pkgs/by-name/ma/makeBinaryWrapper/package.nix @@ -24,9 +24,13 @@ makeSetupHook { passthru = { # Extract the function call used to create a binary wrapper from its embedded docstring - extractCmd = writeShellScript "extract-binary-wrapper-cmd" '' - ${targetPackages.gnuStdenv.cc.bintools.targetPrefix}strings -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' - ''; + extractCmd = + let + bintools = targetPackages.gnuStdenv.cc.bintools; + in + writeShellScript "extract-binary-wrapper-cmd" '' + ${lib.getExe' bintools "${bintools.targetPrefix}strings"} -dw "$1" | sed -n '/^makeCWrapper/,/^$/ p' + ''; tests = tests.makeBinaryWrapper; }; diff --git a/pkgs/by-name/ma/makemkv/app-id.patch b/pkgs/by-name/ma/makemkv/app-id.patch new file mode 100644 index 000000000000..b314fd7e5b6e --- /dev/null +++ b/pkgs/by-name/ma/makemkv/app-id.patch @@ -0,0 +1,14 @@ +diff --git a/makemkvgui/src/main.cpp b/makemkvgui/src/main.cpp +index 73ce457..71f822c 100644 +--- a/makemkvgui/src/main.cpp ++++ b/makemkvgui/src/main.cpp +@@ -65,6 +65,9 @@ int qMain(int argc, char **argv) + #if (QT_VERSION > 0x050000) + QCoreApplication::setAttribute(Qt::AA_UseHighDpiPixmaps); + #endif ++ // Ensure the app-id ('makemkv') is set, so that GNOME can show ++ // the correct icon in the dash. ++ QGuiApplication::setDesktopFileName("makemkv"); + + CApClient::ITransport* p_trans = NULL; + diff --git a/pkgs/by-name/ma/makemkv/package.nix b/pkgs/by-name/ma/makemkv/package.nix index 6d4ffd64d016..013251a1081f 100644 --- a/pkgs/by-name/ma/makemkv/package.nix +++ b/pkgs/by-name/ma/makemkv/package.nix @@ -24,26 +24,31 @@ stdenv.mkDerivation ( # Using two URLs as the first one will break as soon as a new version is released srcs.bin = fetchurl { urls = [ - "http://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" + "https://www.makemkv.com/download/makemkv-bin-${version}.tar.gz" + "https://www.makemkv.com/download/old/makemkv-bin-${version}.tar.gz" ]; - hash = "sha256-we5yCukbJ2p8ib6GEUbFuTRjGDHo1sj0U0BkNXJOkr0="; + hash = "sha256-zuVt4LqlUxq+0WvYYnQtMI13K0q02uFu6GW/dPBKFgg="; }; srcs.oss = fetchurl { urls = [ - "http://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" - "http://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" + "https://www.makemkv.com/download/makemkv-oss-${version}.tar.gz" + "https://www.makemkv.com/download/old/makemkv-oss-${version}.tar.gz" ]; - hash = "sha256-vIuwhK46q81QPVu5PvwnPgRuT9RmPTmpg2zgwEf+6CM="; + hash = "sha256-hZAGNkjULsKpWLdFc9cCLw9MM05OT+fdU7cMbnSLpFM="; }; in { pname = "makemkv"; - version = "1.18.3"; + version = "1.18.4"; srcs = lib.attrValues finalAttrs.passthru.srcs; sourceRoot = "makemkv-oss-${version}"; - patches = [ ./r13y.patch ]; + patches = [ + ./r13y.patch + # This patch is sourced from NonGuix, licensed GPLv3: + # https://gitlab.com/nonguix/nonguix/-/blob/2d1f3691546f007c7cd96ae87e4e970fed789182/nongnu/packages/patches/makemkv-app-id.patch + ./app-id.patch + ]; enableParallelBuilding = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/maker-panel/package.nix b/pkgs/by-name/ma/maker-panel/package.nix index 8d6d830396e0..77e76344ed32 100644 --- a/pkgs/by-name/ma/maker-panel/package.nix +++ b/pkgs/by-name/ma/maker-panel/package.nix @@ -37,7 +37,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Make mechanical PCBs by combining shapes together"; homepage = "https://github.com/twitchyliquid64/maker-panel"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; }; }) diff --git a/pkgs/by-name/ma/mako/package.nix b/pkgs/by-name/ma/mako/package.nix index d72185274177..75c399acd796 100644 --- a/pkgs/by-name/ma/mako/package.nix +++ b/pkgs/by-name/ma/mako/package.nix @@ -70,6 +70,12 @@ stdenv.mkDerivation (finalAttrs: { substitute $src/contrib/systemd/mako.service $out/lib/systemd/user/mako.service \ --replace-fail '/usr/bin' "$out/bin" chmod 0644 $out/lib/systemd/user/mako.service + + # Route D-Bus activation through the unit installed above, so it + # waits for graphical-session.target instead of exec'ing mako + # before the compositor is up. + echo "SystemdService=mako.service" \ + >> $out/share/dbus-1/services/fr.emersion.mako.service ''; meta = { diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index dfecddf48232..72d1499c537a 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "malwoverview"; - version = "8.0.2"; + version = "8.0.5"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "alexandreborges"; repo = "malwoverview"; tag = "v${finalAttrs.version}"; - hash = "sha256-dT1FnVm6J93mQHUfodVGgEFy7HAKFcHVicp4B9QKBrs="; + hash = "sha256-BIuz7QitSM7xOSwiIsitIdYXaBoENhzrOLVfyVcoy3M="; }; build-system = with python3Packages; [ diff --git a/pkgs/by-name/ma/managarr/package.nix b/pkgs/by-name/ma/managarr/package.nix index f5af6e545ce2..77788ad68e26 100644 --- a/pkgs/by-name/ma/managarr/package.nix +++ b/pkgs/by-name/ma/managarr/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "managarr"; - version = "0.7.2"; + version = "0.7.3"; __structuredAttrs = true; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Dark-Alex-17"; repo = "managarr"; tag = "v${finalAttrs.version}"; - hash = "sha256-10wM6OI3XqFQKyspJU6fqnE3GyzxNaquQlPjn3nS774="; + hash = "sha256-NdKtyvWNFBhXb6bxclfa/68/5WqOhlqLnEd0e2LQ10Q="; }; - cargoHash = "sha256-7myysFoBYTosHPZ3gzSzXhN8+wbHHF/73b6wQqdlKe8="; + cargoHash = "sha256-yecVTD/UC0vNuCRpLBr7GxT3Bs+Zs5oZHNcBa2HQns4="; nativeBuildInputs = [ perl ]; diff --git a/pkgs/by-name/ma/mangayomi/package.nix b/pkgs/by-name/ma/mangayomi/package.nix index dd6f25130177..867070e8222e 100644 --- a/pkgs/by-name/ma/mangayomi/package.nix +++ b/pkgs/by-name/ma/mangayomi/package.nix @@ -27,7 +27,7 @@ let changelog = "https://github.com/kodjodevf/mangayomi/releases/tag/v${version}"; description = "Reading manga, novels, and watching animes"; homepage = "https://github.com/kodjodevf/mangayomi"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = [ ]; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/ma/mangowc/package.nix b/pkgs/by-name/ma/mango/package.nix similarity index 81% rename from pkgs/by-name/ma/mangowc/package.nix rename to pkgs/by-name/ma/mango/package.nix index 73d105379d7a..775bf111216a 100644 --- a/pkgs/by-name/ma/mangowc/package.nix +++ b/pkgs/by-name/ma/mango/package.nix @@ -1,4 +1,5 @@ { + cjson, lib, libx11, libinput, @@ -22,14 +23,16 @@ libGL, }: stdenv.mkDerivation (finalAttrs: { - pname = "mangowc"; - version = "0.12.8"; + __structuredAttrs = true; + strictDeps = true; + pname = "mango"; + version = "0.14.4"; src = fetchFromGitHub { owner = "mangowm"; repo = "mango"; tag = finalAttrs.version; - hash = "sha256-k9qFn9I+eeAq1kBfw6QRLRMDb6sIV+pgd5zpKNoc1ck="; + hash = "sha256-WfQNALT+8ZbjZG2co1tz2dZZZw1tcU5ynuFe+vVMbV0="; }; nativeBuildInputs = [ @@ -40,6 +43,7 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ + cjson libinput libxcb libxkbcommon @@ -72,7 +76,10 @@ stdenv.mkDerivation (finalAttrs: { description = "Lightweight and feature-rich Wayland compositor based on dwl"; homepage = "https://mangowm.github.io"; license = lib.licenses.gpl3Plus; - maintainers = with lib.maintainers; [ hustlerone ]; + maintainers = with lib.maintainers; [ + hustlerone + yvnth + ]; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ma/mangojuice/package.nix b/pkgs/by-name/ma/mangojuice/package.nix index 2c664aa2506c..85baeb2c27be 100644 --- a/pkgs/by-name/ma/mangojuice/package.nix +++ b/pkgs/by-name/ma/mangojuice/package.nix @@ -81,7 +81,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Convenient alternative to GOverlay for setting up MangoHud"; homepage = "https://github.com/radiolamp/mangojuice"; changelog = "https://github.com/radiolamp/mangojuice/releases/tag/${finalAttrs.version}"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pluiedev diff --git a/pkgs/by-name/ma/manifold/package.nix b/pkgs/by-name/ma/manifold/package.nix index 80557bb78436..59537390f21a 100644 --- a/pkgs/by-name/ma/manifold/package.nix +++ b/pkgs/by-name/ma/manifold/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "manifold"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "elalish"; repo = "manifold"; tag = "v${finalAttrs.version}"; - hash = "sha256-ZsTGokNpWDT0EgA3VaU/aMh8WtUygIqcSxzLikeyQ9c="; + hash = "sha256-jzVIQ90H90szzZSUWvqgBB+5UMgZ9I/uYhYJbexCifk="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/ma/mantra/package.nix b/pkgs/by-name/ma/mantra/package.nix index ce7ef7ea19db..98932c046a15 100644 --- a/pkgs/by-name/ma/mantra/package.nix +++ b/pkgs/by-name/ma/mantra/package.nix @@ -9,7 +9,7 @@ buildGoModule (finalAttrs: { version = "3.1"; src = fetchFromGitHub { - owner = "MrEmpy"; + owner = "brosck"; repo = "Mantra"; tag = "v${finalAttrs.version}"; hash = "sha256-DnErXuMbCRK3WxhdyPj0dOUtGnCcmynPk/hYmOsOKVU="; @@ -24,8 +24,8 @@ buildGoModule (finalAttrs: { meta = { description = "Tool used to hunt down API key leaks in JS files and pages"; - homepage = "https://github.com/MrEmpy/Mantra"; - changelog = "https://github.com/MrEmpy/Mantra/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/brosck/mantra"; + changelog = "https://github.com/brosck/mantra/releases/tag/v${finalAttrs.version}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ fab ]; mainProgram = "mantra"; diff --git a/pkgs/by-name/ma/mapproxy/package.nix b/pkgs/by-name/ma/mapproxy/package.nix index e3393bc17036..84d035bf607c 100644 --- a/pkgs/by-name/ma/mapproxy/package.nix +++ b/pkgs/by-name/ma/mapproxy/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mapproxy"; - version = "6.0.1"; + version = "6.1.1"; pyproject = true; src = fetchFromGitHub { owner = "mapproxy"; repo = "mapproxy"; tag = finalAttrs.version; - hash = "sha256-1LDN0vfnJlINHCIagQWhai4uJP+Fidi/9seBoJIlLl0="; + hash = "sha256-uEnmYL6dzjR5p6MVXW23IJY1tJqfMhCjbHBDnlvaYrE="; }; prePatch = '' @@ -34,6 +34,7 @@ python3Packages.buildPythonApplication (finalAttrs: { python-dateutil pyyaml pyproj + requests shapely gdal lxml diff --git a/pkgs/by-name/ma/mapserver/package.nix b/pkgs/by-name/ma/mapserver/package.nix index b075c21c6e20..1faa71910363 100644 --- a/pkgs/by-name/ma/mapserver/package.nix +++ b/pkgs/by-name/ma/mapserver/package.nix @@ -30,13 +30,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mapserver"; - version = "8.6.4"; + version = "8.6.5"; src = fetchFromGitHub { owner = "MapServer"; repo = "MapServer"; rev = "rel-${lib.replaceStrings [ "." ] [ "-" ] finalAttrs.version}"; - hash = "sha256-kqCP0QZ8gNqS54B8nL8M9Wr9WyMQnORCs42O1eiMtRw="; + hash = "sha256-HEQ+bBb6cXXqR+4Yw5H+3xwQMQvlv0LjlBRT0baFeZQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ma/marco/package.nix b/pkgs/by-name/ma/marco/package.nix index 296c681f6282..7e830bfa5c06 100644 --- a/pkgs/by-name/ma/marco/package.nix +++ b/pkgs/by-name/ma/marco/package.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "MATE default window manager"; homepage = "https://github.com/mate-desktop/marco"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/marge-bot/package.nix b/pkgs/by-name/ma/marge-bot/package.nix index 5f0978768384..23d1b319ba26 100644 --- a/pkgs/by-name/ma/marge-bot/package.nix +++ b/pkgs/by-name/ma/marge-bot/package.nix @@ -1,36 +1,35 @@ { lib, - python3, fetchFromGitLab, + python3Packages, git, openssh, nix-update-script, }: -python3.pkgs.buildPythonApplication (finalAttrs: { +python3Packages.buildPythonApplication (finalAttrs: { pname = "marge-bot"; - version = "1.1.0"; + version = "1.3.1"; pyproject = true; src = fetchFromGitLab { owner = "marge-org"; repo = "marge-bot"; rev = finalAttrs.version; - hash = "sha256-nTVfsprCTa2S/F8GDdDw5SwQw+OrGkHrX/QwU1FZDsw="; + hash = "sha256-Wg+yWkHkCbry13SRaEvULF4jjCaBI524FsVfcP/+u/k="; }; - nativeBuildInputs = [ - python3.pkgs.setuptools + build-system = with python3Packages; [ + hatchling + uv-build ]; - propagatedBuildInputs = - (with python3.pkgs; [ + dependencies = + (with python3Packages; [ configargparse - maya pyyaml requests python-gitlab - hatchling ]) ++ [ git @@ -38,10 +37,11 @@ python3.pkgs.buildPythonApplication (finalAttrs: { ]; nativeCheckInputs = - (with python3.pkgs; [ + (with python3Packages; [ pytest-cov-stub pytestCheckHook - pendulum + python-dateutil + time-machine ]) ++ [ git diff --git a/pkgs/by-name/ma/mariadb-connector-java/package.nix b/pkgs/by-name/ma/mariadb-connector-java/package.nix index c354e2578df9..bb69fb838287 100644 --- a/pkgs/by-name/ma/mariadb-connector-java/package.nix +++ b/pkgs/by-name/ma/mariadb-connector-java/package.nix @@ -16,7 +16,7 @@ maven.buildMavenPackage rec { hash = "sha256-ScdrBSJKbVyD/omPrxiZvuaa5uOo2d3SqX/ozalMWHk="; }; - mvnHash = "sha256-pQYLMsxNVdby4WkO/dznIqqeu2dTtiBjrpJ/A3MuJ5Y="; + mvnHash = "sha256-CiUXHrabVX+ragocKbd4erIWr7J4kuWYcKYCDycpIrs="; doCheck = false; # Requires networking diff --git a/pkgs/by-name/ma/mariadb-galera/package.nix b/pkgs/by-name/ma/mariadb-galera/package.nix index c85fdb37bc4a..fc3f2646583c 100644 --- a/pkgs/by-name/ma/mariadb-galera/package.nix +++ b/pkgs/by-name/ma/mariadb-galera/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mariadb-galera"; - version = "26.4.24"; + version = "26.4.27"; src = fetchFromGitHub { - owner = "codership"; + owner = "mariadb-corporation"; repo = "galera"; tag = "release_${finalAttrs.version}"; - hash = "sha256-mpf+YY0m+UwvemdZt6SfRP9IJlq5IZtlOJMucADc1oM="; + hash = "sha256-Z1UtNM7HPcbFMr35JVJZCxPl43ZQxy+eBkiQFoVmFhY="; fetchSubmodules = true; }; diff --git a/pkgs/by-name/ma/mark/package.nix b/pkgs/by-name/ma/mark/package.nix index 5882cdc3e01e..9da7683e1c8b 100644 --- a/pkgs/by-name/ma/mark/package.nix +++ b/pkgs/by-name/ma/mark/package.nix @@ -8,16 +8,16 @@ # https://github.com/kovetskiy/mark/pull/581#issuecomment-2797872996 buildGoModule (finalAttrs: { pname = "mark"; - version = "16.4.0"; + version = "16.6.0"; src = fetchFromGitHub { owner = "kovetskiy"; repo = "mark"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-eru4EwF5LASyR2Xc1+t2fpvRd3PsZFomi83xxMDHzeE="; + sha256 = "sha256-kpWY+8r6ILHmZr1VWO+4rj8tLqzyucsDNPnoPaF1IkU="; }; - vendorHash = "sha256-eXUw4FnXoDxoWphwA+7inC4Fd8iuI8q5HtobnewHP44="; + vendorHash = "sha256-vJn/bFhbnDY0OfuD9swvt/X5Pb0nWpaoHc1iwWCVwpg="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/markdown-code-runner/package.nix b/pkgs/by-name/ma/markdown-code-runner/package.nix index ea602fd676af..d734dcb5a4f7 100644 --- a/pkgs/by-name/ma/markdown-code-runner/package.nix +++ b/pkgs/by-name/ma/markdown-code-runner/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "markdown-code-runner"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "drupol"; repo = "markdown-code-runner"; tag = finalAttrs.version; - hash = "sha256-GcPMkwXwLyHoVljOpfnhmysDYIFXSyvNL5P3f6q/KJw="; + hash = "sha256-xToBnuWjjh1Zle6lcWdYWO9iDhSJh1cbOOEr9p0n1vU="; }; - cargoHash = "sha256-ul5cl6FDYkW02HGtQmLHkOsSaTIn2lCaTpKjCUzdcjM="; + cargoHash = "sha256-tGEXJMlrxIBCzWVgOfcDNHq2Zli0mJVaOMdmwP9GhCk="; dontUseCargoParallelTests = true; diff --git a/pkgs/by-name/ma/markdown-oxide/package.nix b/pkgs/by-name/ma/markdown-oxide/package.nix index bb5791819406..d1d35e143b6b 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.10"; + version = "0.25.12"; src = fetchFromGitHub { owner = "Feel-ix-343"; repo = "markdown-oxide"; tag = "v${finalAttrs.version}"; - hash = "sha256-nzUje11rp6ByfajrxeEszi1mYs2Pu9Fq+blRdUECqT4="; + hash = "sha256-Nxsch5lLXNCnwG1hToel4xZIMnxlr40wskH+nMnFP9E="; }; - cargoHash = "sha256-Zzo7lEGfzPpxODeVHm89q22aAmuN5h2nIdh2eF2jSpY="; + cargoHash = "sha256-wJr30uwSRvXxBxPoLltaO5sTSAIvQk/2cDitusFL8f8="; meta = { description = "Markdown LSP server inspired by Obsidian"; diff --git a/pkgs/by-name/ma/markdownlint-cli/package.nix b/pkgs/by-name/ma/markdownlint-cli/package.nix index a4c129326726..edaa8a8c37e8 100644 --- a/pkgs/by-name/ma/markdownlint-cli/package.nix +++ b/pkgs/by-name/ma/markdownlint-cli/package.nix @@ -6,16 +6,16 @@ buildNpmPackage rec { pname = "markdownlint-cli"; - version = "0.48.0"; + version = "0.49.1"; src = fetchFromGitHub { owner = "igorshubovych"; repo = "markdownlint-cli"; rev = "v${version}"; - hash = "sha256-sepA0XUAXzhjKiHrOwtoXN9rJ3t6ge9vA5xYNzIHyDs="; + hash = "sha256-+zR/A7cp85ggX8MwidRzIPQ54Su4SyGOQtWy9c6fdk8="; }; - npmDepsHash = "sha256-pFJKEntmpO8CskQiSEqTwDxVZbdZDa/Uk2HcnMctiz4="; + npmDepsHash = "sha256-UMaE1ZAha8D8v387YlVn47AEu6YwNop1yh80gd1Gwh4="; dontNpmBuild = true; diff --git a/pkgs/by-name/ma/marker/package.nix b/pkgs/by-name/ma/marker/package.nix index 5a79599b0881..f22d93f73584 100644 --- a/pkgs/by-name/ma/marker/package.nix +++ b/pkgs/by-name/ma/marker/package.nix @@ -55,7 +55,6 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://fabiocolacio.github.io/Marker/"; description = "Markdown editor for the Linux desktop made with GTK3"; maintainers = with lib.maintainers; [ - trepetti aleksana ]; license = lib.licenses.gpl3Plus; diff --git a/pkgs/by-name/ma/marktext/package.nix b/pkgs/by-name/ma/marktext/package.nix index 6f3503763737..db7d839c5b44 100644 --- a/pkgs/by-name/ma/marktext/package.nix +++ b/pkgs/by-name/ma/marktext/package.nix @@ -173,7 +173,6 @@ stdenv.mkDerivation (finalAttrs: { bot-wxt1221 ]; badPlatforms = [ - "x86_64-darwin" "aarch64-darwin" ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ma/martin/package.nix b/pkgs/by-name/ma/martin/package.nix index 7c1807168515..f957e7424d17 100644 --- a/pkgs/by-name/ma/martin/package.nix +++ b/pkgs/by-name/ma/martin/package.nix @@ -7,6 +7,7 @@ rustPlatform, pkg-config, curl, + libuv, libz, openssl, postgresql, @@ -16,21 +17,21 @@ let # check package.metadata.mln in https://github.com/maplibre/maplibre-native-rs/blob/main/Cargo.toml - mlnRelease = "core-9b6325a14e2cf1cc29ab28c1855ad376f1ba4903"; + mlnRelease = "core-fa8a9c8e3261ce64940127aecc1d52f540c21c57"; mlnHeaders = fetchurl { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/maplibre-native-headers.tar.gz"; - hash = "sha256-VjVEc/+IZTBG9ixP/i7oeel+7gy3+DhSEOi2UDIqeLc="; + hash = "sha256-SqZaqePNbqBZoUgMJIsZf0zqKc8EAwInYNRciv/jX1A="; }; mlnLibrary = fetchurl ( let sources = { aarch64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-arm64-vulkan.a"; - hash = "sha256-PHFNdzcG3+kngZmziMccCTnwBUbtsS2RAUNkTyNYXmc"; + hash = "sha256-iug/ZEIoM0LUczPkVbzVelILoc1uzsM519V2em7Va4U="; }; x86_64-linux = { url = "https://github.com/maplibre/maplibre-native/releases/download/${mlnRelease}/libmaplibre-native-core-amalgam-linux-x64-vulkan.a"; - hash = "sha256-T9H7NiXHv+hbMgOd5QetQzxjIX1Ufn6gNmBJJ/7Ha50="; + hash = "sha256-FoUFDoUw+eM/aaXMfO7iuoUrv8gUGVdBW1tiqxjYCbI="; }; }; in @@ -46,18 +47,18 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "martin"; - version = "1.10.1"; + version = "1.12.0"; src = fetchFromGitHub { owner = "maplibre"; repo = "martin"; tag = "martin-v${finalAttrs.version}"; - hash = "sha256-Zu3vkU7HQcSqzCL7n0uX4M+DxBDMC0Sii7esxM9AtpA="; + hash = "sha256-zCiyJw79KBrK/JqZFx93cPeCnS02/HrH+F1A6EBras0="; }; patches = [ ./dont-build-webui.patch ]; - cargoHash = "sha256-OPuUvm4ez5TZUWwJ6D6fqy++cCiVt7f1qP6OPdsOEDA="; + cargoHash = "sha256-1VSErzoJ0Xdzefaq++8lCGnJfh7LyQCsWmq1xSl4iqg="; webui = buildNpmPackage { pname = "martin-ui"; @@ -71,7 +72,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ln -sf ${finalAttrs.src}/demo/frontend/public/favicon.ico public/_/assets/favicon.ico ''; - npmDepsHash = "sha256-lX5FSWAQyy4Sa7OPnNyTYttjHiPuYxgrPsmZpwCnpO8="; + npmDepsHash = "sha256-4BNjrYMAB8VBwCD4bREWw2vXwE9FCdfOFHsRgYNdiBI="; buildPhase = '' runHook preBuild @@ -99,6 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ curl + libuv libz openssl ]; diff --git a/pkgs/by-name/ma/mas/package.nix b/pkgs/by-name/ma/mas/package.nix index b9014aa454c1..2b46f7eec175 100644 --- a/pkgs/by-name/ma/mas/package.nix +++ b/pkgs/by-name/ma/mas/package.nix @@ -3,37 +3,24 @@ stdenvNoCC, fetchurl, installShellFiles, + jq, libarchive, p7zip, versionCheckHook, + zsh, }: + stdenvNoCC.mkDerivation (finalAttrs: { pname = "mas"; - version = "6.0.1"; + version = "7.0.0"; __structuredAttrs = true; - src = - let - # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-$ARCH.pkg - sources = - { - x86_64-darwin = { - arch = "x86_64"; - hash = "sha256-7+iDBr4GG5bdTuAlAmMQkEkIzVgLo2+DEdravClaLtQ="; - }; - aarch64-darwin = { - arch = "arm64"; - hash = "sha256-BZ9UE8H28kjqiMNdLDUUyC9madR4rBV1mLUGyj6ol3Y="; - }; - } - .${stdenvNoCC.hostPlatform.system} - or (throw "Unsupported system: ${stdenvNoCC.hostPlatform.system}"); - in - fetchurl { - url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-${sources.arch}.pkg"; - inherit (sources) hash; - }; + # nix store prefetch-file https://github.com/mas-cli/mas/releases/download/v$VERSION/mas-$VERSION-arm64.pkg + src = fetchurl { + url = "https://github.com/mas-cli/mas/releases/download/v${finalAttrs.version}/mas-${finalAttrs.version}-arm64.pkg"; + hash = "sha256-vCGKhUyF2eHJVJapayYoe7ZgVrlWiLkPkdBPpi7SG3U="; + }; nativeBuildInputs = [ installShellFiles @@ -58,6 +45,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { runHook preInstall installBin usr/local/opt/mas/bin/mas + install -D --mode=755 usr/local/opt/mas/libexec/bin/mas "$out/libexec/bin/mas" + + substituteInPlace "$out/bin/mas" \ + --replace-fail "#!/bin/zsh" "#!${lib.getExe zsh}" \ + --replace-fail "/usr/bin/jq" "${lib.getExe jq}" installManPage usr/local/opt/mas/share/man/man1/mas.1 installShellCompletion --bash usr/local/opt/mas/etc/bash_completion.d/mas @@ -69,6 +61,8 @@ stdenvNoCC.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; + passthru.updateScript = ./update.sh; + meta = { description = "Mac App Store command line interface"; homepage = "https://github.com/mas-cli/mas"; @@ -76,9 +70,9 @@ stdenvNoCC.mkDerivation (finalAttrs: { mainProgram = "mas"; maintainers = with lib.maintainers; [ zachcoyle + tiferrei ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; }; diff --git a/pkgs/by-name/ma/mas/update.sh b/pkgs/by-name/ma/mas/update.sh new file mode 100755 index 000000000000..6ed1b5b71a3c --- /dev/null +++ b/pkgs/by-name/ma/mas/update.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl jq nurl gnused + +set -eu + +ROOT="$(dirname "$(readlink -f "$0")")" +NIX_DRV="$ROOT/package.nix" + +VERSION="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} https://api.github.com/repos/mas-cli/mas/releases/latest \ + | jq -r '.tag_name | ltrimstr("v")')" + +URL="https://github.com/mas-cli/mas/releases/download/v${VERSION}/mas-${VERSION}-arm64.pkg" +HASH=$(nurl --hash --expr \ + "(import { }).fetchurl { url = \"$URL\"; }") + +sed -i "s/version = \".*\"/version = \"$VERSION\"/" "$NIX_DRV" +sed -i "/arm64.pkg\";/{n; s|hash = \"sha256-.\{44\}\"|hash = \"$HASH\"|}" "$NIX_DRV" diff --git a/pkgs/by-name/ma/maskromtool/package.nix b/pkgs/by-name/ma/maskromtool/package.nix index d3af7bd976d1..66b3e917a201 100644 --- a/pkgs/by-name/ma/maskromtool/package.nix +++ b/pkgs/by-name/ma/maskromtool/package.nix @@ -4,37 +4,60 @@ fetchFromGitHub, cmake, qt6, + yara-x, + replxx, + readline, + pkg-config, }: stdenv.mkDerivation (finalAttrs: { pname = "maskromtool"; - version = "2024-08-18"; + version = "2026-07-04"; src = fetchFromGitHub { owner = "travisgoodspeed"; repo = "maskromtool"; rev = "v${finalAttrs.version}"; - hash = "sha256-iuCjAAVEKVwJuAgKITwkXGhKau2DVWhFQLPjp28tjIo="; + hash = "sha256-QO2s+nGmf0XTq+PRcIqjEeuc6djzQv8TcJjlYYs/X5c="; + fetchSubmodules = true; }; + postPatch = '' + # remove hardcoded PKG_CONFIG_PATH + substituteInPlace CMakeLists.txt \ + --replace-fail \ + 'set(ENV{PKG_CONFIG_PATH} "c:/lib/pkgconfig;/usr/local/lib64")' \ + "" + ''; + + cmakeFlags = [ + (lib.cmakeFeature "FETCHCONTENT_TRY_FIND_PACKAGE_MODE" "ALWAYS") + ]; + buildInputs = [ qt6.qtbase qt6.qtcharts qt6.qttools + yara-x + replxx + readline ]; nativeBuildInputs = [ cmake + pkg-config qt6.wrapQtAppsHook ]; meta = { description = "CAD tool for extracting bits from Mask ROM photographs"; homepage = "https://github.com/travisgoodspeed/maskromtool"; + changelog = "https://github.com/travisgoodspeed/maskromtool/releases/tag/v${finalAttrs.version}"; license = with lib.licenses; [ beerware gpl1Plus ]; maintainers = with lib.maintainers; [ evanrichter ]; + mainProgram = "maskromtool"; }; }) diff --git a/pkgs/by-name/ma/mastodon-archive/package.nix b/pkgs/by-name/ma/mastodon-archive/package.nix index 2f17641add28..9f4597a5272b 100644 --- a/pkgs/by-name/ma/mastodon-archive/package.nix +++ b/pkgs/by-name/ma/mastodon-archive/package.nix @@ -11,7 +11,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { src = fetchFromGitHub { owner = "kensanata"; - repo = "mastodon-backup"; + repo = "mastodon-archive"; rev = "v${finalAttrs.version}"; hash = "sha256-yz17ddcA0U9fq1aDlPmD3OkNL6Epzdp9C7L+31yNLBc="; }; diff --git a/pkgs/by-name/ma/mastodon/gemset.nix b/pkgs/by-name/ma/mastodon/gemset.nix index ebf07a65f2df..d2e16e05e7fa 100644 --- a/pkgs/by-name/ma/mastodon/gemset.nix +++ b/pkgs/by-name/ma/mastodon/gemset.nix @@ -1,4 +1,15 @@ { + action_text-trix = { + dependencies = [ "railties" ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "02a0yz97d12cf6wcj5r43ak57mhlcj4r84k5ma2g570046aga4kh"; + type = "gem"; + }; + version = "2.1.19"; + }; actioncable = { dependencies = [ "actionpack" @@ -11,10 +22,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0lvcdy2akyv4ycardhqgcgnxv402vpvj9aqqcm7yyp3j1vx0qvs2"; + sha256 = "1w40bbkjd0lds57bfr24hbj9qfkwj9v33x6457g24sjfwispzg75"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; actionmailbox = { dependencies = [ @@ -29,10 +40,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j4m8q1mqlxlfrfkfk6ysyvljlb9g3bahb7c5hqq78vrdf1w6kk0"; + sha256 = "0ndf98dpzmz8xs6m253zpwnhyfrvxdkfyvssxps0vrx0x9sa8zfz"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; actionmailer = { dependencies = [ @@ -50,10 +61,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13vxbsl5wwqw4b7cp6mmk1w35l14x3la0fxazvgpjxjca1s7inwh"; + sha256 = "13a4329lgrda8s9mqrfbaakvc90i6ak82rfpljmd0w5vj54747w3"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; actionpack = { dependencies = [ @@ -77,13 +88,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0z9c60vayw2dyr7mbbfssxar966nib2mbbl3l1wg9y206dkv7j7i"; + sha256 = "18r93ii2ayw8n60qsx259dy8nwgbfxf3ndncla0xbia79np8r6dg"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; actiontext = { dependencies = [ + "action_text-trix" "actionpack" "activerecord" "activestorage" @@ -95,10 +107,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03959i7bsbrkj4kmzgsyk8nn7dag2y18kwdrry825s6zyil77gva"; + sha256 = "1ln7mwflqf7nsgkj9lm1p7bmc6h8yqaa47q1cdj9xsp102f034fj"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; actionview = { dependencies = [ @@ -118,10 +130,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "104dqwg8scbz4bn5k7ghn56jzgx91rirqj7vm15lq5qjii4jdmxx"; + sha256 = "0pgxl9p2q2zbwb6626yw7rgpbmv2bvxykq2w1h83inrygy6chiqk"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; active_model_serializers = { dependencies = [ @@ -134,10 +146,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0k0cig5ic38vfd7iba3rv3h7hs2lmycqp0wx4w286kmbhch5n9q8"; + sha256 = "06h6rknvpapvx8l4sfd72msi422fghhchmqd1jn8zh7a4wd3gdma"; type = "gem"; }; - version = "0.10.15"; + version = "0.10.16"; }; activejob = { dependencies = [ @@ -151,10 +163,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1fbgjyasgmxfkiq6132084virks1ijy61s9xjh9f3sls3hjdd00r"; + sha256 = "1lz8bxb6pcf9yvxwyj6355aws3ylxi5rwc577ly4q858d9vb2jd1"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; activemodel = { dependencies = [ "activesupport" ]; @@ -166,10 +178,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xaa76rhii244d139hjx0i7xqrch77dsl57sh8k8pm5z8495xqhy"; + sha256 = "06c23jww82grgvxw19g4bi9c957aj5hh24wzyyw4jdpg9jz5rh4h"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; activerecord = { dependencies = [ @@ -185,10 +197,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gg77abap2jdv9bz5qx49divrym7pcagzlbpfh0pff0wjspq498q"; + sha256 = "1avhmih54xqyj14zrv6ciw2ndpb11bmkwq0fcwm0mfk64ixvw0w0"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; activestorage = { dependencies = [ @@ -202,20 +214,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07kk417yg68mcrs23lpgzh1l18bkysp6nrxykhn94mrrcibvxp7j"; + sha256 = "0k9q8sdlf576r8rp2hgdxy5lpr8f157bpq8mfsk52f8l169wwr05"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; activesupport = { dependencies = [ "base64" - "benchmark" "bigdecimal" "concurrent-ruby" "connection_pool" "drb" "i18n" + "json" "logger" "minitest" "securerandom" @@ -232,10 +244,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rn7px77j9dar9n6gcgnawk5jivlnpswwv1yy05yk8xwkvlqf8c2"; + sha256 = "03m2vjhq3nmc8c3hpivxhvkjd8igg16nmv0p2fgdsgacppgy1991"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; addressable = { dependencies = [ "public_suffix" ]; @@ -281,10 +293,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1xwbz5zk37f7p3g6ypxzamisay06hidjmdsrvhxw4q0xin4jw6w7"; + sha256 = "11h2lz0fyj1hh37x1lwvxr0svaisnkjs2g81hap84nwdykjl1z36"; type = "gem"; }; - version = "4.20.0"; + version = "4.22.0"; }; ast = { groups = [ @@ -324,10 +336,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b30n0gwidxrz72whgkd54cj37anib7fn8pfijg63ryplvg1nggs"; + sha256 = "1ihq7k01fwayf4ir0n6g99r7s8xja1rnr55p9agfdqffhlzwaq8s"; type = "gem"; }; - version = "1.1238.0"; + version = "1.1259.0"; }; aws-sdk-core = { dependencies = [ @@ -343,10 +355,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1shqk9frm15g1ygiy33krwj34jrphfjc6w63bglxwnqcic3qqi9y"; + sha256 = "074awkbb7rs9332vvxifxndrjambxf1bkj8w8hwj5krazk5l5h09"; type = "gem"; }; - version = "3.244.0"; + version = "3.252.0"; }; aws-sdk-kms = { dependencies = [ @@ -357,10 +369,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "080zh4g1lcjl0bz2l0gjm8vmpd60cvi0p658bh235ypqh9zg61fl"; + sha256 = "0hrkb8ar61zgswz16rcf1x00n1liwn236lh5zpya9x11yf6m8grn"; type = "gem"; }; - version = "1.123.0"; + version = "1.129.0"; }; aws-sdk-s3 = { dependencies = [ @@ -372,10 +384,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iziq88dwja5gjimqm875g72h0d1lrf1ha9widsjb1cpfxrmsxba"; + sha256 = "04k5wasssinx66vws2jn4vhzfisg30mkhbdmcs3m99dhp66kmcnl"; type = "gem"; }; - version = "1.219.0"; + version = "1.225.1"; }; aws-sigv4 = { dependencies = [ "aws-eventstream" ]; @@ -441,9 +453,6 @@ benchmark = { groups = [ "default" - "development" - "pam_authentication" - "production" "test" ]; platforms = [ ]; @@ -502,10 +511,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16mjj15ks5ws53v2y31hxcmf46d0qjdvdaadpk7xsij2zymh4a9b"; + sha256 = "05yma8qd0c53dalkh2b9iddvi7j1wy1kmd77xmx5i1ca8bwfngp5"; type = "gem"; }; - version = "1.0.1"; + version = "2.0.0"; }; blurhash = { groups = [ "default" ]; @@ -523,10 +532,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "003xl226y120cbq1n99805jw6w75gcz1gs941yz3h7li3qy3kqha"; + sha256 = "0jhnvalyqhjv10y2m804z2s9wabmys4a4di6187jjch3qy4an2y6"; type = "gem"; }; - version = "1.18.6"; + version = "1.24.6"; }; brakeman = { dependencies = [ "racc" ]; @@ -534,10 +543,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "164l8dh3c22c8448hgd0zqhsffxvn4d9wad2zzipav29sssjd532"; + sha256 = "0vyg9l6xivamb49r4kzkcw12r9x943kv79wsvwslhm1qjvx23ybv"; type = "gem"; }; - version = "7.1.1"; + version = "8.0.4"; }; browser = { groups = [ "default" ]; @@ -571,10 +580,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0j0h5cgnzk0ms17ssjkzfzwz65ggrs3lsp53a1j46p4616m1s1bk"; + sha256 = "1sdlr4rj7x5nbrl8zkd3dqdg4fc50bnpx37rl0l0szg4f5n7dj41"; type = "gem"; }; - version = "0.9.2"; + version = "0.9.3"; }; capybara = { dependencies = [ @@ -606,10 +615,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hnjmbhyvfs543g96bc4sx94fdx2054ng12g925vwmkx0wl1jnl7"; + sha256 = "10kj1rh8w3qk6mg6kap1gh0p5kgmgdp1ij6gwayy3dqp139gw5sc"; type = "gem"; }; - version = "0.5.7"; + version = "0.5.9"; }; case_transform = { dependencies = [ "activesupport" ]; @@ -627,20 +636,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1w3d5dhx4vjd707ihkcmq7fy78p5fgawcjdqw2byxnfw32gzgkbr"; + sha256 = "0b65lw8a5s0x7g6c4h0mfzhqn83nwaql2m2hwqii321clvvh8lfz"; type = "gem"; }; - version = "0.5.10.1"; + version = "0.5.10.2"; }; cgi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rj7agrnd1a4282vg13qkpwky0379svdb2z2lc0wl8588q6ikjx3"; + sha256 = "1s8qdw1nfh3njd47q154njlfyc2llcgi4ik13vz39adqd7yclgz9"; type = "gem"; }; - version = "0.4.2"; + version = "0.5.1"; }; charlock_holmes = { groups = [ "default" ]; @@ -662,17 +671,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kgqj7hcs09ln7i1rds1xify08rzjk02ryzvjdvnllg1fkh3vm2b"; + sha256 = "1clkjg3n7c29c01cykjp6gbnvywjilfanzcrcrazhzf551ssndy6"; type = "gem"; }; - version = "7.6.0"; + version = "8.4.1"; }; childprocess = { dependencies = [ "logger" ]; groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -717,10 +725,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01dpvqlzybpb3pkcwd9ik5sbjw283618ywvdphxslhiy8ps3kp4r"; + sha256 = "094hvvpr7x7m6qq3yhmnzv7yv5clmmps1fy1rply10j6gcl1wpyf"; type = "gem"; }; - version = "0.1"; + version = "0.2"; }; concurrent-ruby = { groups = [ @@ -733,10 +741,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ipbrgvf0pp6zxdk5ascp6i29aybz2bx9wdrlchjmpx6mhvkwfw1"; + sha256 = "1c2i64xsd35vijnb50rxb70g508s0x674xi0qpyyb8jy7bncl4j4"; type = "gem"; }; - version = "1.3.5"; + version = "1.3.7"; }; connection_pool = { groups = [ @@ -749,10 +757,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02p7l47gvchbvnbag6kb4x2hg8n28r25ybslyvrr2q214wir5qg9"; + sha256 = "02ifws3c4x7b54fv17sm4cca18d2pfw1saxpdji2lbd1f6xgbzrk"; type = "gem"; }; - version = "2.5.4"; + version = "3.0.2"; }; cose = { dependencies = [ @@ -796,21 +804,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0pfl5c0pyqaparxaqxi6s4gfl21bdldwiawrc0aknyvflli60lfw"; + sha256 = "15djj19ynz3sbw54fsf8n7y3sha8a333f2mgvjfwhr46jhcqg1ll"; type = "gem"; }; - version = "1.0.6"; + version = "1.0.7"; }; css_parser = { - dependencies = [ "addressable" ]; + dependencies = [ + "addressable" + "ssrf_filter" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ha0bcz71z48ahdvc0dp71apnbqnnpgffq0dac2q65y68259hx7j"; + sha256 = "119q8j23xyb9pifka1n6jjrw04099zpwwdajh5pd10fm7wlfkw7a"; type = "gem"; }; - version = "1.22.0"; + version = "3.0.0"; }; csv = { groups = [ "default" ]; @@ -844,10 +855,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v44bn386ipjjh4m2kl53dal8g4d41xajn2jggnmjbhn6965fil6"; + sha256 = "09v9zfbslyay5d15dv7jyqwhh9f504z8i736idp72sxjv5k551xj"; type = "gem"; }; - version = "2.0.1"; + version = "2.1.0"; }; date = { groups = [ @@ -860,10 +871,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kz6mc4b9m49iaans6cbx031j9y7ldghpi5fzsdh0n3ixwa8w9mz"; + sha256 = "1h0db8r2v5llxdbzkzyllkfniqw9gm092qn7cbaib73v9lw0c3bm"; type = "gem"; }; - version = "3.4.1"; + version = "3.5.1"; }; debug = { dependencies = [ @@ -877,10 +888,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wmfy5n5v2rzpr5vz698sqfj1gl596bxrqw44sahq4x0rxjdn98l"; + sha256 = "1djjx5332d1hdh9s782dyr0f9d4fr9rllzdcz2k0f8lz2730l2rf"; type = "gem"; }; - version = "1.11.0"; + version = "1.11.1"; }; debug_inspector = { groups = [ @@ -965,10 +976,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1l35bpwnxqd6pqqy315a1y6bi2n8y6cd69dqh4gpi5nz7njx5z3f"; + sha256 = "1h6j62g1rbwvhq27sabxrv942giwn7dxmcxjm0g9nysdddw21i8g"; type = "gem"; }; - version = "1.4.0"; + version = "2.0.0"; }; docile = { groups = [ @@ -999,20 +1010,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lsh9lzrglqlwm9icmn0ggrwjc9iy9308f9m59z1w2srmyp0fgd7"; + sha256 = "1xyk49b88pcxrc08lgawkp5x57kxgyfwa3wgdbisy4jz13h46jnd"; type = "gem"; }; - version = "5.8.2"; + version = "5.9.2"; }; dotenv = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1hwjsddv666wpp42bip3fqx7c5qq6s8lwf74dj71yn7d1h37c4cy"; + sha256 = "17b1zr9kih0i3wb7h4yq9i8vi6hjfq07857j437a8z7a44qvhxg3"; type = "gem"; }; - version = "3.1.8"; + version = "3.2.0"; }; drb = { groups = [ @@ -1035,24 +1046,39 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "113f4b01pf6igzmb7zkbcd3zgp118gfsqc35ggw9p3bzkmgp2jlq"; + sha256 = "0x6qlxk6zp3jw748k6x3zkpywx9yjyagdyinb9qai2khdjvmn0dq"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; - elasticsearch = { + elastic-transport = { dependencies = [ - "elasticsearch-api" - "elasticsearch-transport" + "faraday" + "multi_json" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "11pw5x7kg6f6m8rqy2kpbzdlnvijjpmbqkj2gz8237wkbl40y27d"; + sha256 = "1hsg41zd1dkwc9frx35d9hhvbhdj0h71fs236xql8n70m9a6vdas"; type = "gem"; }; - version = "7.17.11"; + version = "8.5.2"; + }; + elasticsearch = { + dependencies = [ + "elastic-transport" + "elasticsearch-api" + "ostruct" + ]; + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "167b9m3hqyc4g77kx7a9xbzd566hdnvwwcyfidvk0dx9fd82gq1z"; + type = "gem"; + }; + version = "8.19.3"; }; elasticsearch-api = { dependencies = [ "multi_json" ]; @@ -1060,10 +1086,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01wi43a3zylrq2vca08vir5va142g5m3jcsak3rprjck8jvggn7y"; + sha256 = "1wklwh659c0faknzaqlfihl8ai3b52hwip69m2izk0ncjssjk06w"; type = "gem"; }; - version = "7.17.11"; + version = "8.19.3"; }; elasticsearch-dsl = { groups = [ "default" ]; @@ -1075,47 +1101,6 @@ }; version = "0.1.10"; }; - elasticsearch-transport = { - dependencies = [ - "base64" - "faraday" - "multi_json" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "00qgyyvjyyv7z22qjd408pby1h7902gdwkh8h3z3jk2y57amg06i"; - type = "gem"; - }; - version = "7.17.11"; - }; - email_spec = { - dependencies = [ - "htmlentities" - "launchy" - "mail" - ]; - groups = [ "test" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "049dhlyy2hcksp1wj9mx2fngk5limkm3afxysnizg1hi2dxbw8yz"; - type = "gem"; - }; - version = "2.3.0"; - }; - email_validator = { - dependencies = [ "activemodel" ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "0106y8xakq6frv2xc68zz76q2l2cqvhfjc7ji69yyypcbc4kicjs"; - type = "gem"; - }; - version = "2.2.4"; - }; erb = { groups = [ "default" @@ -1165,10 +1150,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gj6h2r9ylkmz9wjlf6p04d3hw99qfnf0wb081lzjx3alk13ngfq"; + sha256 = "0l3dpg45i74ap1d7c4wyrdlc67l9vj4kgzv2l2r8mg1304fss0y5"; type = "gem"; }; - version = "1.3.0"; + version = "1.5.0"; }; fabrication = { groups = [ @@ -1192,10 +1177,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wy4i4vl3h2v6scffx0zbp74vq1gfgq55m8x3n05kwp3na8h5a7r"; + sha256 = "1z1yfmqwml3gr1hjnjx6qbchmvr29j6z317wlhkhzabkvw4b6iy1"; type = "gem"; }; - version = "3.5.2"; + version = "3.8.0"; }; faraday = { dependencies = [ @@ -1207,10 +1192,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b930ag8nh99v8n9645ac1wcah9fx0mclbp323q4i1ly9acvkk3k"; + sha256 = "0y7j6yzv07zggic6g0p2v1ivnvkzsbqjnfdl4215qqb6cxz290hq"; type = "gem"; }; - version = "2.14.2"; + version = "2.14.3"; }; faraday-follow_redirects = { dependencies = [ "faraday" ]; @@ -1218,10 +1203,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nfmmnmqgbxci7dlca0qnwxn8j29yv7v8wm26m0f4l0kmcc13ynk"; + sha256 = "1b8hgpci3wjm3rm41bzpasvsc5j253ljyg5rsajl62dkjk497pjw"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; faraday-httpclient = { dependencies = [ "httpclient" ]; @@ -1240,10 +1225,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fxbckg468dabkkznv48ss8zv14d9cd8mh1rr3m98aw7wzx5fmq9"; + sha256 = "125m3qri52vwh5v9dhq0dkqxf8629cxrf99yyc01pva72wasyy0f"; type = "gem"; }; - version = "3.4.1"; + version = "3.4.4"; }; fast_blank = { groups = [ "default" ]; @@ -1260,20 +1245,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s67b9n7ki3iaycypq8sh02377gjkaxadg4dq53bpgfk4xg3gkjz"; + sha256 = "085d82jw6swv4k6jxya85q7rg3vjzy2nw7hcnwx99n3gdgafnjy6"; type = "gem"; }; - version = "2.4.0"; + version = "2.4.1"; }; ffi = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19kdyjg3kv7x0ad4xsd4swy5izsbb1vl1rpb6qqcqisr5s23awi9"; + sha256 = "1kqasqvy8d7r09ri4n6bkdwbk63j7afd9ilsw34nzlgh0qp69ldw"; type = "gem"; }; - version = "1.17.2"; + version = "1.17.4"; }; ffi-compiler = { dependencies = [ @@ -1284,14 +1269,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1844j58cdg2q6g0rqfwg4rrambnhf059h4yg9rfmrbrcs60kskx9"; + sha256 = "0vhjv98f9rjdzdxfsyyk19sfb45dcxc57ynsdmvn8vzdkifrvmm9"; type = "gem"; }; - version = "1.3.2"; + version = "1.4.2"; }; flatware = { dependencies = [ + "benchmark" "drb" + "logger" "thor" ]; groups = [ @@ -1301,10 +1288,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06yllpzx5ib7cv1ar03279gm2qywnzsqfiz42g5y9fmp7z24yiik"; + sha256 = "0na5w1krrrmd9vkv43v30k43d880hs9yz2zr3qfwxcjk1mq3nqk7"; type = "gem"; }; - version = "2.3.4"; + version = "2.4.0"; }; flatware-rspec = { dependencies = [ @@ -1315,10 +1302,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1gqkjilaqbd6qq80rx3fbjppjbllndvhd629yyd29943lrp3m9nb"; + sha256 = "0f19309xgbc6y008g6bkwjxq7962dspwr31lsznx7pdxp7x98x2w"; type = "gem"; }; - version = "2.3.4"; + version = "2.4.0"; }; fog-core = { dependencies = [ @@ -1345,10 +1332,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1zj8llzc119zafbmfa4ai3z5s7c4vp9akfs0f9l2piyvcarmlkyx"; + sha256 = "05x2pvzdzwh5g7z1s5592k3dg3bfidfamc7zxqngj50w4bmlyblc"; type = "gem"; }; - version = "1.2.0"; + version = "1.3.0"; }; fog-openstack = { dependencies = [ @@ -1370,20 +1357,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18jdg7y4746pfisvab6i3j1vl61bzhiap52dv8sf2i5g0kybian8"; + sha256 = "156qa2wiizmdalz6cim04yaasdz1q6c6k7yhnpdnrhn26f0qkyhr"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.3"; }; forwardable = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1b5g1i3xdvmxxpq4qp0z4v78ivqnazz26w110fh4cvzsdayz8zgi"; + sha256 = "0f78rjpnhm4lgp1qzadnr6kr02b6afh1lvy7w607k4qjk3641kgi"; type = "gem"; }; - version = "1.3.3"; + version = "1.4.0"; }; fugit = { dependencies = [ @@ -1394,10 +1381,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "00v5zy1s7cl4hbaaz2sqp02g6kaajn1yslvfpqcra55hndvdyg83"; + sha256 = "0phfqbch9pll4cny2c5ipna9nb3bnzc0v3mz1i0bsqxjipr2ngv4"; type = "gem"; }; - version = "1.12.0"; + version = "1.12.2"; }; globalid = { dependencies = [ "activesupport" ]; @@ -1425,10 +1412,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1rqmj1sl0bs42jjxdfpcqs8sgq6zvhjdixbsciaj1043l993zv6r"; + sha256 = "038cqc1kzxl22m3jfspkdpg0dxskga9jvgwclb4pivcjqxi62d4m"; type = "gem"; }; - version = "4.32.1"; + version = "4.35.0"; }; googleapis-common-protos-types = { dependencies = [ "google-protobuf" ]; @@ -1439,10 +1426,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1iy4pxpsbxjdiyd03mslalbcvrrga57h1mb0r0c01nnngfvr4x7r"; + sha256 = "02mg1y34ccwf4bkhz4vcl6m3giwgbm309999bzydk51pa8578blr"; type = "gem"; }; - version = "1.22.0"; + version = "1.23.0"; }; haml = { dependencies = [ @@ -1457,10 +1444,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "15yxph91zswbnfy7szpdcfbdfqqn595ff290hm4f6fcnhryvhvlf"; + sha256 = "0nnmzj6g2wynxbrp9j885zab4nkzfryhl2bv6cj1gazyyxqjpzc7"; type = "gem"; }; - version = "6.3.0"; + version = "7.2.0"; }; haml-rails = { dependencies = [ @@ -1490,10 +1477,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1v64nbbckmfgi7b5c5j609mpcdyhbf7gav3n99xjy5fpyca7hpab"; + sha256 = "1gfp0q98kfv5j68xqv2nydh64yqlwi29bl9ing212z7djc0d54fz"; type = "gem"; }; - version = "0.66.0"; + version = "0.73.0"; }; hashdiff = { groups = [ @@ -1509,14 +1496,15 @@ version = "1.2.1"; }; hashie = { + dependencies = [ "logger" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nh3arcrbz1rc1cr59qm53sdhqm137b258y8rcb4cvd3y98lwv4x"; + sha256 = "0w1qrab701d3a63aj2qavwc2fpcqmkzzh1w2x93c88zkjqc4frn2"; type = "gem"; }; - version = "5.0.0"; + version = "5.1.0"; }; hcaptcha = { dependencies = [ "json" ]; @@ -1543,26 +1531,16 @@ }; version = "3.1.2"; }; - hiredis = { - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "04jj8k7lxqxw24sp0jiravigdkgsyrpprxpxm71ba93x1wr2w1bz"; - type = "gem"; - }; - version = "0.6.3"; - }; hiredis-client = { dependencies = [ "redis-client" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0nsw7h1hab5f4hy778kd21y8q4hfiy0j9yxa5pjp3g49a9jl9jh6"; + sha256 = "1v2wa2797xsjx5j96dbnd9ll0sbxrfg5xwwk022fx3p6qp0m3nns"; type = "gem"; }; - version = "0.26.1"; + version = "0.29.0"; }; hkdf = { groups = [ "default" ]; @@ -1575,17 +1553,14 @@ version = "0.3.0"; }; htmlentities = { - groups = [ - "default" - "test" - ]; + groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nkklqsn8ir8wizzlakncfv42i32wc0w9hxp00hvdlgjr7376nhj"; + sha256 = "1hy5jvzd4wagk0k0yq7bjm6fa7ba7vjggzjfpri95jifkzvbvbxv"; type = "gem"; }; - version = "4.3.4"; + version = "4.4.2"; }; http = { dependencies = [ @@ -1609,10 +1584,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06dvmngd4hwrr6k774i1h6c50h2l8nww9f1id0wvrvi72l6yd99q"; + sha256 = "1aga7z4p0dka4zcqw9i05wa4ab1q7h7cgnj328ldqqfycjz84jxs"; type = "gem"; }; - version = "1.1.0"; + version = "1.1.6"; }; http-form_data = { groups = [ "default" ]; @@ -1647,6 +1622,7 @@ }; httplog = { dependencies = [ + "benchmark" "rack" "rainbow" ]; @@ -1654,10 +1630,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "04d75idhzybfr1zn0n8c6mk3ssgl3vh6cqkgcwc5rr0csh0sf3gb"; + sha256 = "1gq7cra0d9h5mc1295h3xknqwany9xbxasgliyq6axr74rmbs51b"; type = "gem"; }; - version = "1.7.3"; + version = "1.8.0"; }; i18n = { dependencies = [ "concurrent-ruby" ]; @@ -1671,10 +1647,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03sx3ahz1v5kbqjwxj48msw3maplpp2iyzs22l4jrzrqh4zmgfnf"; + sha256 = "0mbjg75bsnpf3mr5ad3425wi2ps9r809gvr8n0n8lv2f3zgcapjh"; type = "gem"; }; - version = "1.14.7"; + version = "1.15.1"; }; i18n-tasks = { dependencies = [ @@ -1684,6 +1660,7 @@ "highline" "i18n" "parser" + "prism" "rails-i18n" "rainbow" "ruby-progressbar" @@ -1693,10 +1670,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mpvpppwkzxal9k91lifafkwg676kqkg8ng6b1y7apfvwbhfkwvl"; + sha256 = "0yk3lgzmym02bvpqhvccrfjvnkyqh35idcqwcqq3yqiawm4vmksd"; type = "gem"; }; - version = "1.0.15"; + version = "1.1.2"; }; idn-ruby = { groups = [ "default" ]; @@ -1733,14 +1710,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1jszj95hazqqpnrjjzr326nn1j32xmsc9xvd97mbcrrgdc54858y"; + sha256 = "1k0lk3pwadm2myvpg893n8jshmrf2sigrd4ki15lymy7gixaxqyn"; type = "gem"; }; - version = "0.8.1"; + version = "0.8.2"; + }; + ipaddr = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1dyy0g6cycszq2xsrcx3kxq3fa3zyxx9kxxcs8dgipj55rxqm18g"; + type = "gem"; + }; + version = "1.2.9"; }; irb = { dependencies = [ "pp" + "prism" "rdoc" "reline" ]; @@ -1754,10 +1742,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1aja320qnimlnfc80wf2i2x8i99kl5sdzfacsfzzfzzs3vzysja3"; + sha256 = "1qs8a9vprg7s8krgq4s0pygr91hclqqyz98ik15p0m1sf2h5956y"; type = "gem"; }; - version = "1.15.3"; + version = "1.18.0"; }; jd-paperclip-azure = { dependencies = [ @@ -1788,15 +1776,17 @@ groups = [ "default" "development" + "pam_authentication" + "production" "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05ni5q7mrbcqisz4xfzb7xznbx3wn1q55p5mwf97cdp5alrk9y6i"; + sha256 = "1anz6a6n33x4s3906s0bz6x161kk1ns3h7xxsn3rpxkfsw7k2m33"; type = "gem"; }; - version = "2.15.2.1"; + version = "2.19.8"; }; json-canonicalization = { groups = [ "default" ]; @@ -1821,10 +1811,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1k64mp59jlbqd5hyy46pf93s3yl1xdngfy8i8flq2hn5nhk91ybg"; + sha256 = "0ihz7l0yqyd5rlk2j4s9jy0nlhn10djrxqgygrb4qsr0gc7ys72y"; type = "gem"; }; - version = "1.17.0"; + version = "1.17.1"; }; json-ld = { dependencies = [ @@ -1868,10 +1858,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gv3b0nry1sn1n7imfs2drqyfp4g8b2zcrizjc98j04pl7xszv3r"; + sha256 = "0rinh4347nvl9jm0r4mk7gi1zh1iz367w3dxn8d2r8j5v1pg9gz8"; type = "gem"; }; - version = "6.0.0"; + version = "6.2.0"; }; jsonapi-renderer = { groups = [ "default" ]; @@ -1960,10 +1950,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1j8z0757rb4kly4ghdzd6ihch6x5i0d53r543x2y9xa8cyrj7c4m"; + sha256 = "1456pfk271q10fv064kk15536n5sp9l44mqx9y0wjlzml1mx1bpw"; type = "gem"; }; - version = "7.2.2"; + version = "7.3.0"; }; language_server-protocol = { groups = [ @@ -1987,7 +1977,6 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -2053,20 +2042,18 @@ "forwardable" "logger" "net-http" - "openssl" "rack" "starry" - "stringio" "uri" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09rjxsmmnahxsaw0hc4f0ffw4rcncjxa01xd9v5z4q9radfidr5j"; + sha256 = "0254dp4l0p2v8jh90gc1z88vvk7zsdyqahv8w7b77ckpfvjy8k4a"; type = "gem"; }; - version = "0.7.7"; + version = "0.7.9"; }; llhttp-ffi = { dependencies = [ @@ -2086,6 +2073,7 @@ groups = [ "default" "development" + "opentelemetry" "pam_authentication" "production" "test" @@ -2129,10 +2117,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0dx316q03x6rpdbl610rdaj2vfd5s8fanixk21j4gv3h5f230nk5"; + sha256 = "011fdngxzr1p9dq2hxqz7qq1glj2g44xnhaadjqlf48cplywfdnl"; type = "gem"; }; - version = "2.24.1"; + version = "2.25.1"; }; mail = { dependencies = [ @@ -2145,7 +2133,6 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -2227,10 +2214,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0a27k4jcrx7pvb0p59fn1frh14iy087c2aygrdkmgwsrbshvqxpj"; + sha256 = "1k28j6ww8rf43r5i8278jvm2cq3pnzsvqm7yqpb4p93kadjlq726"; type = "gem"; }; - version = "3.2025.0924"; + version = "3.2026.0414"; }; mini_mime = { groups = [ @@ -2263,6 +2250,10 @@ version = "2.8.9"; }; minitest = { + dependencies = [ + "drb" + "prism" + ]; groups = [ "default" "development" @@ -2273,30 +2264,30 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c1c9lr7h0bnf48xj5sylg2cs2awrb0hfxwimiz4yfl6kz87m0gm"; + sha256 = "1wfnqyfayx9n9j7x871v2ars4hjhfisi1dl24fa64ylq3mns6ghm"; type = "gem"; }; - version = "5.26.0"; + version = "6.0.6"; }; msgpack = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0cnpnbn2yivj9gxkh8mjklbgnpx6nf7b8j2hky01dl0040hy0k76"; + sha256 = "18g6ps30z6m365bly7sfialavnsf6m6qamdxsr84w96k51j4mnlb"; type = "gem"; }; - version = "1.8.0"; + version = "1.8.3"; }; multi_json = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06sabsvnw0x1aqdcswc6bqrqz6705548bfd8z22jxgxfjrn1yn3n"; + sha256 = "1040lr5y2phn7avdyam6zw6ikprlmk77biw3yhclsfwfh0qnl4p6"; type = "gem"; }; - version = "1.17.0"; + version = "1.21.1"; }; mutex_m = { groups = [ "default" ]; @@ -2314,10 +2305,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ysrwaabhf0sn24jrp0nnp51cdv0jf688mh5i6fsz63q2c6b48cn"; + sha256 = "15k96fj6qwbaiv6g52l538ass95ds1qwgynqdridz29yqrkhpfi5"; type = "gem"; }; - version = "0.6.0"; + version = "0.9.1"; }; net-imap = { dependencies = [ @@ -2327,15 +2318,14 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "012snp6vxhclyjna9srdwzarvz8nvm3g18r4fddidm35il0wm40m"; + sha256 = "03ga2h4i5hsk8pdlicyfvqfsbh55vrbikb0nkx9x7vx7fl6kdw19"; type = "gem"; }; - version = "0.5.14"; + version = "0.6.4.1"; }; net-ldap = { dependencies = [ @@ -2356,7 +2346,6 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -2371,7 +2360,6 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -2386,7 +2374,6 @@ groups = [ "default" "development" - "test" ]; platforms = [ ]; source = { @@ -2401,10 +2388,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1a9www524fl1ykspznz54i0phfqya4x45hqaz67in9dvw1lfwpfr"; + sha256 = "18fwy5yqnvgixq3cn0h63lm8jaxsjjxkmj8rhiv8wpzv9271d43c"; type = "gem"; }; - version = "2.7.4"; + version = "2.7.5"; }; nokogiri = { dependencies = [ @@ -2421,24 +2408,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1s30b7h7qpyim30m8060xs415mbr3ci7i5hdg09chh1aqfx2qcbq"; + sha256 = "1d9safb4dly6qmc2g06444l0zifby52yy6j1a5fa1g4j3ihm3jah"; type = "gem"; }; - version = "1.19.3"; - }; - oj = { - dependencies = [ - "bigdecimal" - "ostruct" - ]; - groups = [ "default" ]; - platforms = [ ]; - source = { - remotes = [ "https://rubygems.org" ]; - sha256 = "1cajn3ylwhby1x51d9hbchm964qwb5zp63f7sfdm55n85ffn1ara"; - type = "gem"; - }; - version = "3.16.11"; + version = "1.19.4"; }; omniauth = { dependencies = [ @@ -2480,10 +2453,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1q2zvkw34vk1vyhn5kp30783w1wzam9i9g5ygsdjn2gz59kzsw0i"; + sha256 = "0bf3m2ds78scmgacb1wx38zjj1czzkym0bdmgi9vn99rgr6j1qy6"; type = "gem"; }; - version = "1.0.2"; + version = "2.0.1"; }; omniauth-saml = { dependencies = [ @@ -2494,10 +2467,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1sznc4d2qhqmkw1vhpx2v5i9ndfb4k25cazhz74cbv18wyp4bk2s"; + sha256 = "0ndbsyhdalpijj8bri3imkrrr06y07c0m7hnzl6iywadarjd8ajm"; type = "gem"; }; - version = "2.2.4"; + version = "2.2.5"; }; omniauth_openid_connect = { dependencies = [ @@ -2517,7 +2490,6 @@ dependencies = [ "activemodel" "attr_required" - "email_validator" "faraday" "faraday-follow_redirects" "json-jwt" @@ -2532,20 +2504,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10i13cn40jiiw8lslkv7bj1isinnwbmzlk6msgiph3gqry08702x"; + sha256 = "1i1rksidmf0aj0z6y89mhyp3fadf4xgpx0znwfc7g470vj7gz6k5"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.0"; }; openssl = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0v0grpg9gi59zr3imxy1745k9rp3dd095mkir8gvxi69blhh2kkz"; + sha256 = "1hj7wwp4r3jhvnyd8ik85wbs25cq1w61r28pv6ddyn5fd0lasdqh"; type = "gem"; }; - version = "3.3.2"; + version = "4.0.2"; }; openssl-signature_algorithm = { dependencies = [ "openssl" ]; @@ -2559,6 +2531,7 @@ version = "1.3.0"; }; opentelemetry-api = { + dependencies = [ "logger" ]; groups = [ "default" "opentelemetry" @@ -2566,10 +2539,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kr1jyk67zn4axafcb2fji5b8xvr56hhfg2y33s5pnzjlr72dzfc"; + sha256 = "1adzcv93ccs4bnjqvjwr5ma3gmv0l7v9pvhpm0qiqf0qkf17rvlr"; type = "gem"; }; - version = "1.7.0"; + version = "1.10.0"; }; opentelemetry-common = { dependencies = [ "opentelemetry-api" ]; @@ -2580,10 +2553,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0b5k7qc81ln96ayba90hm6ww7qpk8y7lc1r2mphblmwx8y812wns"; + sha256 = "178ly4bh8hpi5bdmy4i74m22bxz1mvyspqfb5b4pycwdwmi574bk"; type = "gem"; }; - version = "0.23.0"; + version = "0.25.0"; }; opentelemetry-exporter-otlp = { dependencies = [ @@ -2598,10 +2571,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jj78y79mawj86v5g3kcz6k81izd0m0w47wyyk2br744swbvwn2k"; + sha256 = "0q1a3spgyzcr0cf06c50nkn87ygrp09pz744klwg8c5s551xyg1v"; type = "gem"; }; - version = "0.31.1"; + version = "0.34.0"; }; opentelemetry-helpers-sql = { dependencies = [ "opentelemetry-api" ]; @@ -2612,13 +2585,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0kc8pdlm2avyvahg40bfbrimxmvmra0i30m4ha3pzvn6r9xrf8wz"; + sha256 = "1yqa891zajjpaph2a25s4n5ycnfwxzjb7fsiz65aja6a5hx8q3mi"; type = "gem"; }; - version = "0.2.0"; + version = "0.4.0"; }; - opentelemetry-helpers-sql-obfuscation = { - dependencies = [ "opentelemetry-common" ]; + opentelemetry-helpers-sql-processor = { + dependencies = [ + "opentelemetry-api" + "opentelemetry-common" + ]; groups = [ "default" "opentelemetry" @@ -2626,10 +2602,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h935j5ah9s2v9qm61ddp62kaffk1rn8assgljqap3fz2fgijlkj"; + sha256 = "1wg0s0ydbc69g6irw8f24z5d86dg6144abqby3cwn7s5r4dj96di"; type = "gem"; }; - version = "0.4.0"; + version = "0.5.0"; }; opentelemetry-instrumentation-action_mailer = { dependencies = [ "opentelemetry-instrumentation-active_support" ]; @@ -2640,10 +2616,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0mqh8z6myff0j11zcnm34s1lc8qzmzzqdrhzk95y2sh6vdmqd143"; + sha256 = "029bhz8gqf89bwsm29zw3m7cw97dy8f1hf9k9r5jh3yy875889rg"; type = "gem"; }; - version = "0.6.1"; + version = "0.8.1"; }; opentelemetry-instrumentation-action_pack = { dependencies = [ "opentelemetry-instrumentation-rack" ]; @@ -2654,10 +2630,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wzj0xmivyx243slz526z54lqyhsiyzzrbha4szyxjl30xsdxyl4"; + sha256 = "10anpln7i3vs5ry5ly02biz32h9ab6c7iwx409yrylqmdf12rflh"; type = "gem"; }; - version = "0.15.1"; + version = "0.18.0"; }; opentelemetry-instrumentation-action_view = { dependencies = [ "opentelemetry-instrumentation-active_support" ]; @@ -2668,10 +2644,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "16gmwl1v4jnz1x670qprkbc35phnbpbljsp2mcr71dq4fvfk8qa2"; + sha256 = "0s0mgwqmch5d1cww3qsrily38gfciqijsj6l4z2p4f8ls485d1av"; type = "gem"; }; - version = "0.11.1"; + version = "0.13.0"; }; opentelemetry-instrumentation-active_job = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2679,10 +2655,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "129ajjrxigl4pag1nlzbdv1js5bij4ll92i1ix50c3f24h9338df"; + sha256 = "14mr1l7a8x15khkqr8n0y94s5dj6c48hg4qxc1nq1l2w73ykcgyb"; type = "gem"; }; - version = "0.10.1"; + version = "0.12.0"; }; opentelemetry-instrumentation-active_model_serializers = { dependencies = [ "opentelemetry-instrumentation-active_support" ]; @@ -2690,10 +2666,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05ff7yxy2v96kslsqn1y68669is00798i9fgk9fy85vx2r21xs4g"; + sha256 = "1mvag13gjqg38grmg6a7slr7n3pxx8v2di8zbx1gy6kq717h1fwq"; type = "gem"; }; - version = "0.24.0"; + version = "0.25.0"; }; opentelemetry-instrumentation-active_record = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2704,10 +2680,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14kwks0130mrggk3irg4qvx5fmwk9gxv6w23dy6ryi50xqs3y20v"; + sha256 = "16d2ngy10qd3bsdpgh6sb0ha7gl830xwcyyqkpfq4bm4wnmcx7r3"; type = "gem"; }; - version = "0.11.1"; + version = "0.13.0"; }; opentelemetry-instrumentation-active_storage = { dependencies = [ "opentelemetry-instrumentation-active_support" ]; @@ -2718,10 +2694,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "17p8zmfyigdqvgy3d1691ayzm6nj4q4nx2n3qk01f7wjakphz6zq"; + sha256 = "0nwvsvid7ma31l85nn75wg3a3rplwbklrnrgql0bzdjd321apjvs"; type = "gem"; }; - version = "0.3.1"; + version = "0.5.1"; }; opentelemetry-instrumentation-active_support = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2732,10 +2708,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0zf5kg2h9zgmrwnq7v7by2nyhkxa20gmi5nyqqrpwyaqf4v9isl2"; + sha256 = "0177isfxbr3zb1aas1ajibnp2yqn26mrv0ly9hps9m5angfcp8i9"; type = "gem"; }; - version = "0.10.1"; + version = "0.12.0"; }; opentelemetry-instrumentation-base = { dependencies = [ @@ -2750,10 +2726,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09ysfv2x25svwl4yxrbgmjkwrlkylr7plci3jjb6wkim11zklak4"; + sha256 = "0x9pcz49iga988jabg9kkc6mk37dlk6a955plss166jyarfx7s29"; type = "gem"; }; - version = "0.25.0"; + version = "0.26.1"; }; opentelemetry-instrumentation-concurrent_ruby = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2761,10 +2737,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1lniyy8yzmvz1mrh7az0yn94j4d9p0vvd6v0jgk9vi8042vxi6r2"; + sha256 = "0bbvpwn70d12fsdc31w1qnc7ah82aw4bdl159al2ac4f0zki4abj"; type = "gem"; }; - version = "0.24.0"; + version = "0.25.0"; }; opentelemetry-instrumentation-excon = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2772,10 +2748,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "01rwnxml7h9vcwfdf2n1zr6kfxfcplr1i00aga8xd76wmbvld8fg"; + sha256 = "1inkzvkn57yf4xvl0iiyh2p1sg6drfknxq5qnlfyh168yr91r7vs"; type = "gem"; }; - version = "0.26.0"; + version = "0.29.1"; }; opentelemetry-instrumentation-faraday = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2783,10 +2759,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n32aqsqj9lf46mvm1pr5f2j386aq1jia00aajp4qpb9vgf0jnq1"; + sha256 = "00gqhgbya6hcl7h9rklg0h69mf4r4ksyl8555g7bi5srwgn0ncpl"; type = "gem"; }; - version = "0.30.0"; + version = "0.33.0"; }; opentelemetry-instrumentation-http = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2794,10 +2770,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ad0rrw0a74dzlhpcyccas54cl9zggfvdjxs6hdklhwkdla0vmr7"; + sha256 = "1j2m21smk0wfcjwi64ls2mas520qwcgxkq4rbsr8dlw1mfg67lin"; type = "gem"; }; - version = "0.27.0"; + version = "0.30.0"; }; opentelemetry-instrumentation-http_client = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2805,10 +2781,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mfa0ma9kl5yjzm1kph01y7cwk99nib4vibwz7d76rrk7qmiisx8"; + sha256 = "0g9xg7vk8s06y83bg8jckwz35md2g0q4h72m5sq6qa54lw53ydlj"; type = "gem"; }; - version = "0.26.0"; + version = "0.29.0"; }; opentelemetry-instrumentation-net_http = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2816,25 +2792,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14hx651frq9hncd14vi3yh5isrjsj2nalziy68k5j8afh4ydrhaf"; + sha256 = "1rsgz3rx4gs8ng544grm62w2pzaw9nvl68vm2pxqggsbg5mfprgs"; type = "gem"; }; - version = "0.26.0"; + version = "0.29.0"; }; opentelemetry-instrumentation-pg = { dependencies = [ "opentelemetry-helpers-sql" - "opentelemetry-helpers-sql-obfuscation" + "opentelemetry-helpers-sql-processor" "opentelemetry-instrumentation-base" ]; groups = [ "opentelemetry" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02pvkv1f374ibvpnha8y64zdjdyav7rk77rz9bkxnn61gcnvip56"; + sha256 = "1ixf7fr3qgsmdzn22xprwd04i27gmhp13b104z557h3p8f66yd7p"; type = "gem"; }; - version = "0.32.0"; + version = "0.36.0"; }; opentelemetry-instrumentation-rack = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2842,10 +2818,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xzk88iiiggx3kdfy5y75cb79cc5gn8jsl1vwg5n8w086s1vnb4y"; + sha256 = "0sjk2ngdd8cq40p4gnqzln0vaabwg04l4crhiy9s4gvdrr2w3a99"; type = "gem"; }; - version = "0.29.0"; + version = "0.31.1"; }; opentelemetry-instrumentation-rails = { dependencies = [ @@ -2862,10 +2838,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vy93a3hpi8l8crljxwxzxwmvyf9gg1pff6dnpxl0c2ljmwdynbr"; + sha256 = "1czqxavga9djkaw60i56ivljh75d3d3kgwzcljgywwyaff1q18sy"; type = "gem"; }; - version = "0.39.1"; + version = "0.42.0"; }; opentelemetry-instrumentation-redis = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2873,10 +2849,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "001rd4ix10hja64y2arhpcd0hlmjilx7zlb4slmx4zaj3iyra8c7"; + sha256 = "1v25jpq6s68qb5r7i5alr6jma57kx9and13yz6ggfwkzzwqmv1az"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; opentelemetry-instrumentation-sidekiq = { dependencies = [ "opentelemetry-instrumentation-base" ]; @@ -2884,10 +2860,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vi2ac1l66vsflslxv6ay4ml95svcq53v8rdmwf2c3vl94f6b3bl"; + sha256 = "1p5av36xg4imnq54cn971s3pzl1xkvcr8z7y751f39a1j35s1lmi"; type = "gem"; }; - version = "0.28.0"; + version = "0.29.0"; }; opentelemetry-registry = { dependencies = [ "opentelemetry-api" ]; @@ -2898,13 +2874,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13wns85c08hjy7gqqjxqad9pp5shp0lxskrssz0w3si9mazscgwh"; + sha256 = "0a57k220mf0mx1d4fyr61c2a84ddc6xx1w6l63dzpq7fp4md6gjx"; type = "gem"; }; - version = "0.4.0"; + version = "0.6.0"; }; opentelemetry-sdk = { dependencies = [ + "logger" "opentelemetry-api" "opentelemetry-common" "opentelemetry-registry" @@ -2914,10 +2891,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06jjh25s94lv94ljgbq13baqgnkccdsvzsw6xg54vwldpr4rjwa3"; + sha256 = "0jw6ig29c1rjmv8mw16dxw3kk118km6n675cnwfd88whqphan952"; type = "gem"; }; - version = "1.10.0"; + version = "1.12.0"; }; opentelemetry-semantic_conventions = { dependencies = [ "opentelemetry-api" ]; @@ -2928,10 +2905,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "05znn2iijg1qli52m09bgyq4b74nfs5nwgz2z73sllvqpiyn1cf1"; + sha256 = "0jh5qaqmcvsvf6x1v73zy77fz5mhrwp7syl8gnbs8h4vk58cyil9"; type = "gem"; }; - version = "1.36.0"; + version = "1.39.0"; }; orm_adapter = { groups = [ @@ -2947,7 +2924,11 @@ version = "0.5.0"; }; ostruct = { - groups = [ "default" ]; + groups = [ + "default" + "development" + "test" + ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; @@ -2962,10 +2943,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rhv8qdnm3s34yvsvmrii15f2238rk3psa6pq6x5x367sssfv6ja"; + sha256 = "174v7f6wjkhygpp6dr0vbka03v0h5kxdfkgsilbyi0pf4ihz112y"; type = "gem"; }; - version = "2.14.23"; + version = "2.14.27"; }; parallel = { groups = [ @@ -2975,10 +2956,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0c719bfgcszqvk9z47w2p8j2wkz5y35k48ywwas5yxbbh3hm3haa"; + sha256 = "0mlkn1vhh9lr7vljibpgspwsswk7mzm8nw6bbr616c9fbj35hlmk"; type = "gem"; }; - version = "1.27.0"; + version = "2.1.0"; }; parser = { dependencies = [ @@ -2992,10 +2973,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wl7frfk68q6gsf6q6j32jl5m3yc0b9x8ycxz3hy79miaj9r5mll"; + sha256 = "0m2xqvn1la62hji1mn04y59giikww95p2hs0r4y2rrz3mdxcwyni"; type = "gem"; }; - version = "3.3.9.0"; + version = "3.3.11.1"; }; parslet = { groups = [ "default" ]; @@ -3023,10 +3004,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0xf8i58shwvwlka4ld12nxcgqv0d5r1yizsvw74w5jaw83yllqaq"; + sha256 = "16caca7lcz5pwl82snarqrayjj9j7abmxqw92267blhk7rbd120k"; type = "gem"; }; - version = "1.6.2"; + version = "1.6.3"; }; pghero = { dependencies = [ "activerecord" ]; @@ -3034,13 +3015,14 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "08pm154bx5zbpgcqhk7gq78qq1mb149s2l7y0fxniqfvjmq4kn58"; + sha256 = "0q5kmfy1rgax98ivkcl5fy7lrz1zd8v9bf2cjm9x2asw15xaizgn"; type = "gem"; }; - version = "3.7.0"; + version = "3.8.0"; }; playwright-ruby-client = { dependencies = [ + "base64" "concurrent-ruby" "mime-types" ]; @@ -3048,10 +3030,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "02ivcflls7fy5axsqk602rqgfq9r6p8pmqkcxp9sdpgvvf8hflb0"; + sha256 = "0ls8r49d27j0ffpfva99nk53a4nk17f4k71x44hpny8f2gb448ll"; type = "gem"; }; - version = "1.55.0"; + version = "1.60.0"; }; pp = { dependencies = [ "prettyprint" ]; @@ -3080,10 +3062,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ryivdnij1990hcqqmq4s0x1vjvfl0awjc9b91f8af17v2639qhg"; + sha256 = "181x3nk1pz9fhydj7zf5zhg1grglxaiqd249zm3ks7vh432k0pq1"; type = "gem"; }; - version = "1.27.0"; + version = "1.29.0"; }; premailer-rails = { dependencies = [ @@ -3120,14 +3102,17 @@ groups = [ "default" "development" + "pam_authentication" + "production" + "test" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "07fz0p6nlifm983cac3ayi7nwrpb5l4s3jl7p70imbsm79k429qr"; + sha256 = "11ggfikcs1lv17nhmhqyyp6z8nq5pkfcj6a904047hljkxm0qlvv"; type = "gem"; }; - version = "1.5.2"; + version = "1.9.0"; }; prometheus_exporter = { dependencies = [ "webrick" ]; @@ -3135,10 +3120,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0x98zrcd83dq1y9qhshx8hqvlvy81wlns6k15hq1xr3lrsdxvrdz"; + sha256 = "013azj8pmmn6fsj1grnq0960pzb5zbpzmv1f2mdm2frsdjjaf0f5"; type = "gem"; }; - version = "2.3.0"; + version = "2.3.1"; }; propshaft = { dependencies = [ @@ -3150,10 +3135,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14n3fhz5hzpsczp4spqc26csfgk2qga7mgcm7px9z0byyr76dk4s"; + sha256 = "17iqn4sa59c9z5y3bpvxqka00srqnl379w6a57y1phljdbjs6mhx"; type = "gem"; }; - version = "1.3.1"; + version = "1.3.2"; }; psych = { dependencies = [ @@ -3170,10 +3155,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0vii1xc7x81hicdbp7dlllhmbw5w3jy20shj696n0vfbbnm2hhw1"; + sha256 = "1dx5bc3s1mb1i53np4cdkypg7ccygnvagr3hglyndbqilrljvxql"; type = "gem"; }; - version = "5.2.6"; + version = "5.4.0"; }; public_suffix = { groups = [ @@ -3184,10 +3169,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1543ap9w3ydhx39ljcd675cdz9cr948x9mp00ab8qvq6118wv9xz"; + sha256 = "08znfv30pxmdkjyihvbjqbvv874dj3nybmmyscl958dy3f7v12qs"; type = "gem"; }; - version = "6.0.2"; + version = "7.0.5"; }; puma = { dependencies = [ "nio4r" ]; @@ -3195,10 +3180,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pa9zpr51kqnsq549p6apvnr95s9flx6bnwqii24s8jg2b5i0p74"; + sha256 = "1yw6nvkvddriacmva8hm0za0961d6j96dm7zm6748rmyzcfqgvf8"; type = "gem"; }; - version = "7.1.0"; + version = "8.0.2"; }; pundit = { dependencies = [ "activesupport" ]; @@ -3291,10 +3276,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "19fi42hi9l474ki89y6cs8vrpfmc1h8zpd02iwjy4hw0a1yahfn7"; + sha256 = "0cn6a9v8nry9fx4zrzp1xakfp2n5xv5075j90q56m20k7zvjrq23"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.0"; }; rack-protection = { dependencies = [ @@ -3306,10 +3291,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0sniswjyi0yn949l776h7f67rvx5w9f04wh69z5g19vlsnjm98ji"; + sha256 = "1b4bamcbpk29i7jvly3i7ayfj69yc1g03gm4s7jgamccvx12hvng"; type = "gem"; }; - version = "4.1.1"; + version = "4.2.1"; }; rack-proxy = { dependencies = [ "rack" ]; @@ -3317,10 +3302,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12jw7401j543fj8cc83lmw72d8k6bxvkp9rvbifi88hh01blnsj4"; + sha256 = "1c0sw5l6v80ffrv8ac70v5l6q8118p96qb0xshkycx5ybj36w26k"; type = "gem"; }; - version = "0.7.7"; + version = "0.8.2"; }; rack-session = { dependencies = [ @@ -3371,10 +3356,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13brkq5xkj6lcdxj3f0k7v28hgrqhqxjlhd4y2vlicy5slgijdzp"; + sha256 = "0s48d2a0z5f0cg4npvzznf933vipi6j7gmk16yc913kpadkw4ybc"; type = "gem"; }; - version = "2.2.1"; + version = "2.3.1"; }; rails = { dependencies = [ @@ -3395,10 +3380,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "158p3fwnl81mg37jq599cil6vj0vl1hs1qwvrfxcl99rz68firqx"; + sha256 = "1lww7i686rm9s50d34hb596y2kfl46dida2kjy8gr64c6jjpn0bd"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; rails-dom-testing = { dependencies = [ @@ -3436,10 +3421,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0q55i6mpad20m2x1lg5pkqfpbmmapk0sjsrvr1sqgnj2hb5f5z1m"; + sha256 = "128y5g3fyi8fds41jasrr4va1jrs7hcamzklk1523k7rxb64bc98"; type = "gem"; }; - version = "1.6.2"; + version = "1.7.0"; }; rails-i18n = { dependencies = [ @@ -3453,10 +3438,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1brqyx0cn46lwgxni943ri9lcg12hskzw8d54j0d4pzqabv32kv2"; + sha256 = "1wvcbdslb5gfvs9dw7kscd9da3xfyr3mdh1w4a28vwmy19ngvmaj"; type = "gem"; }; - version = "8.0.2"; + version = "8.1.0"; }; railties = { dependencies = [ @@ -3479,10 +3464,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1341ccd8gw2gi13dgk8zyw2bl7bh4jlzmygv4snjnkzhcd6h7i5x"; + sha256 = "08nyhsigcvjpj9i3r0s73yi8zm16sxmr2x7xgxlaq2jjrghb0gli"; type = "gem"; }; - version = "8.0.4.1"; + version = "8.1.3"; }; rainbow = { groups = [ @@ -3509,10 +3494,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "14s4jdcs1a4saam9qmzbsa2bsh85rj9zfxny5z315x3gg0nhkxcn"; + sha256 = "009p524zl0p0kfa65nii8wdmaigkmawv9pbvlcffky7islmmp0nb"; type = "gem"; }; - version = "13.3.0"; + version = "13.4.2"; }; rdf = { dependencies = [ @@ -3559,10 +3544,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "06j83bdhsmq10083ahz3h125pnycx965cfpmg606l8lbrmrsrgr8"; + sha256 = "14iiyb4yi1chdzrynrk74xbhmikml3ixgdayjma3p700singfl46"; type = "gem"; }; - version = "6.15.1"; + version = "7.2.0"; }; readline = { dependencies = [ "reline" ]; @@ -3586,14 +3571,15 @@ version = "3.6.1"; }; redis = { + dependencies = [ "redis-client" ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0fikjg6j12ka6hh36dxzhfkpqqmilzjfzcdf59iwkzsgd63f0ziq"; + sha256 = "1bpsh5dbvybsa8qnv4dg11a6f2zn4sndarf7pk4iaayjgaspbrmm"; type = "gem"; }; - version = "4.8.1"; + version = "5.4.1"; }; redis-client = { dependencies = [ "connection_pool" ]; @@ -3604,10 +3590,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wx0v68lh924x544mkpydcrkkbr7i386xvkpyxgsf5j55j3d4f8y"; + sha256 = "18xy2nd8mcb186gqd11sy3vfwkq5n85mq26v7l325jkdiwgvyr8c"; type = "gem"; }; - version = "0.26.1"; + version = "0.29.0"; }; regexp_parser = { groups = [ @@ -3618,10 +3604,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "192mzi0wgwl024pwpbfa6c2a2xlvbh3mjd75a0sakdvkl60z64ya"; + sha256 = "1fwfw26a32rps78920nn29shqg2zmqv72i89j1fap41isshida9m"; type = "gem"; }; - version = "2.11.3"; + version = "2.12.0"; }; reline = { dependencies = [ "io-console" ]; @@ -3635,10 +3621,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0ii8l0q5zkang3lxqlsamzfz5ja7jc8ln905isfdawl802k2db8x"; + sha256 = "0d8q5c4nh2g9pp758kizh8sfrvngynrjlm0i1zn3cnsnfd4v160i"; type = "gem"; }; - version = "0.6.2"; + version = "0.6.3"; }; request_store = { dependencies = [ "rack" ]; @@ -3696,6 +3682,7 @@ version = "6.3.0"; }; rouge = { + dependencies = [ "strscan" ]; groups = [ "default" "development" @@ -3703,10 +3690,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1pkp5icgm7s10b2n6b2pzbdsfiv0l5sxqyizx55qdmlpaxnk8xah"; + sha256 = "1g2y2z07niw4ylbgf6zr6a7kjaqbaqxn98xwff58zf4w5yx9ppp2"; type = "gem"; }; - version = "4.6.1"; + version = "5.0.0"; }; rpam2 = { groups = [ @@ -3730,20 +3717,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bwqy1iwbyn1091mg203is5ngsnvfparwa1wh89s1sgnfmirkmg2"; + sha256 = "0hlm1cfqs891irh4pl6wynsfm7nh7w7baf0g6cqxfrxvlr64khb4"; type = "gem"; }; - version = "3.1.0"; + version = "3.2.0"; }; rqrcode_core = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1ayrj7pwbv1g6jg5vvx6rq05lr1kbkfzbzqplj169aapmcivhh0y"; + sha256 = "0l9hl5nb7jx8sjchsrlv6bk30hywr449ihcdxv2qy6wwz1fvh0zk"; type = "gem"; }; - version = "2.0.0"; + version = "2.1.0"; }; rspec = { dependencies = [ @@ -3758,10 +3745,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h11wynaki22a40rfq3ahcs4r36jdpz9acbb3m5dkf0mm67sbydr"; + sha256 = "11q5hagj6vr694innqj4r45jrm8qcwvkxjnphqgyd66piah88qi0"; type = "gem"; }; - version = "3.13.1"; + version = "3.13.2"; }; rspec-core = { dependencies = [ "rspec-support" ]; @@ -3773,10 +3760,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "18sgga9zjrd5579m9rpb78l7yn9a0bjzwz51z5kiq4y6jwl6hgxb"; + sha256 = "0bcbh9yv6cs6pv299zs4bvalr8yxa51kcdd1pjl60yv625j3r0m8"; type = "gem"; }; - version = "3.13.5"; + version = "3.13.6"; }; rspec-expectations = { dependencies = [ @@ -3820,10 +3807,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10gajm8iscl7gb8q926hyna83bw3fx2zb4sqdzjrznjs51pqlcz4"; + sha256 = "0iqxmw0knjiz5nf6pgr8ihs6cjzh89f0ppj3fqiz8cvms79x6sh8"; type = "gem"; }; - version = "3.13.5"; + version = "3.13.8"; }; rspec-rails = { dependencies = [ @@ -3842,10 +3829,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1kis8dfxlvi6gdzrv9nsn3ckw0c2z7armhni917qs1jx7yjkjc8i"; + sha256 = "1pr29snnnlgkqv80vbi4795l6rxq3l47x5rl7lyni4h8zj95c8q6"; type = "gem"; }; - version = "8.0.2"; + version = "8.0.4"; }; rspec-sidekiq = { dependencies = [ @@ -3858,10 +3845,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0rn2yzkn3ywryvrigmsr1902zd14kx5ya8n41jd1zc1szxkgbpvv"; + sha256 = "1imkvngglyd3vs2k526fffb5g22a08bwgjhdd1nq1jb7hym0b554"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; rspec-support = { groups = [ @@ -3872,10 +3859,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1cmgz34hwj5s3jwxhyl8mszs24nci12ffbrmr5jb1si74iqf739f"; + sha256 = "0z64h5rznm2zv21vjdjshz4v0h7bxvg02yc6g7yzxakj11byah06"; type = "gem"; }; - version = "3.13.6"; + version = "3.13.7"; }; rubocop = { dependencies = [ @@ -3894,10 +3881,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0hpgpyzpzgmp28pirlyrif3albsk5kni2k67h5yvxfvr3g55w2d7"; + sha256 = "138qbhxb6r8qyq6kz38i3wq4k2rdcrhfcyicxzw1798na7sxvndr"; type = "gem"; }; - version = "1.81.6"; + version = "1.87.0"; }; rubocop-ast = { dependencies = [ @@ -3911,10 +3898,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1bh1kls2cs2j3cmj6f2j2zmfqfknj2a6i441d828nh2mg00q49jr"; + sha256 = "0dahfpnzz63hyqxa03x8rypnrxzwyvh4i5a8ri34bzpnf3pg64j4"; type = "gem"; }; - version = "1.47.1"; + version = "1.49.1"; }; rubocop-capybara = { dependencies = [ @@ -3925,10 +3912,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "030wymq0jrblrdswl1lncj60dhcg5wszz6708qzsbziyyap8rn6f"; + sha256 = "0mz3mvjh09awggp0bwsmf4rfaz2irrwc6vzpiklfh7jnlyiipspr"; type = "gem"; }; - version = "2.22.1"; + version = "2.23.0"; }; rubocop-i18n = { dependencies = [ @@ -3939,10 +3926,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1nib58p2kf7lbxz5dvjb80rajr6rmry3v9x3q3kc14i86y7j484n"; + sha256 = "0sx970650mnw2pivf8bx251lnni2w3c2n39cjqs9xsy9x9x9gmbc"; type = "gem"; }; - version = "3.2.3"; + version = "3.3.0"; }; rubocop-performance = { dependencies = [ @@ -3971,24 +3958,25 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1danlfzfqx3x1kna248sm2b1br5ki369r51x90jc4vbh6xk8zv1l"; + sha256 = "1xaxlfas5grja3lvzjrfiv86ah3rxa15cmi7hc79b2cw8cjs7sis"; type = "gem"; }; - version = "2.33.4"; + version = "2.35.4"; }; rubocop-rspec = { dependencies = [ "lint_roller" + "regexp_parser" "rubocop" ]; groups = [ "development" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "13q588yrqr195d4d4vkv1y3px12llc8xiwh0dnfdnd1027d19cmp"; + sha256 = "1qk5bx4vg7n17i9475h6dqkhay9m3s6vanq9y35hxl9cb762wghb"; type = "gem"; }; - version = "3.7.0"; + version = "3.10.2"; }; rubocop-rspec_rails = { dependencies = [ @@ -4000,13 +3988,16 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i8zvzfj9gpq71zqkbmr05bfh66jg55hbwrfh551i896ibhpalvp"; + sha256 = "004i5a4iww7l3vpaxl70ijypmi321afrslsgadbvksznf8f683aa"; type = "gem"; }; - version = "2.31.0"; + version = "2.32.0"; }; ruby-prof = { - dependencies = [ "base64" ]; + dependencies = [ + "base64" + "ostruct" + ]; groups = [ "development" "test" @@ -4014,10 +4005,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0h23zjwma8car8jpq7af8gw39qi88rn24mass7r13ripmky28117"; + sha256 = "0d8lbpqw6hlrb5xy5h39f7pi68a4hczgd7dkb2fml18fhzv0y6a2"; type = "gem"; }; - version = "1.7.2"; + version = "2.0.4"; }; ruby-progressbar = { groups = [ @@ -4055,20 +4046,20 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0n3pgw1jkkivgkn08qpc4fb1kiivhbshkj0lhrms4sy3fahlgigk"; + sha256 = "0x2k5x272m2zs0vmznl2jac14bj9a2g0365xxcnr2s9rq41fr1g6"; type = "gem"; }; - version = "2.2.5"; + version = "2.3.0"; }; rubyzip = { groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0g2vx9bwl9lgn3w5zacl52ax57k4zqrsxg05ixf42986bww9kvf0"; + sha256 = "0khy3d43cr2i4x9as2k41ckrjb4wkpcycdbzaara4fy4qw923n9f"; type = "gem"; }; - version = "3.2.2"; + version = "3.3.1"; }; rufus-scheduler = { dependencies = [ "fugit" ]; @@ -4142,10 +4133,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0i1zkr4rsvf8pz1x38wkb82nsjx28prmyb5blsmw86pd5cmmfszg"; + sha256 = "0xwwfj48d6mpc66lhl4yabnjazpf47wqg9n1i9na7q0h9isdigxl"; type = "gem"; }; - version = "6.5.0"; + version = "7.0.1"; }; sidekiq = { dependencies = [ @@ -4162,10 +4153,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vpj4jqcvnybc6h6hxpvgq36h311jqz3myax36z9ls8ilnw2y3ns"; + sha256 = "03z48p8asbid67lmlsn12njk1gdb6xqibabyz5na3c94242ws85y"; type = "gem"; }; - version = "8.0.9"; + version = "8.1.6"; }; sidekiq-bulk = { dependencies = [ "sidekiq" ]; @@ -4187,10 +4178,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qj0lfy0860lbdg92mmv4f4yy3vr7pq01ay6df4xkqm3a7l09z71"; + sha256 = "1z6nl9aazi904qmc4vasxkb4w44c6cs1ygfjw6fq8l77i6lz2r8h"; type = "gem"; }; - version = "6.0.1"; + version = "6.0.2"; }; sidekiq-unique-jobs = { dependencies = [ @@ -4202,21 +4193,24 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "10g1y6258xsw89c831c16z7m66i37ivhrcbfirpi0pb48fwinik3"; + sha256 = "0dfwcz1v2a0xn41xm1glwb56ll3vd02zj39m8ajrg0a0mihslzka"; type = "gem"; }; - version = "8.0.11"; + version = "8.1.0"; }; simple-navigation = { - dependencies = [ "activesupport" ]; + dependencies = [ + "activesupport" + "ostruct" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1wc1rapwhqymcjfxmlgam4cvbyhnzfxada2damq88ij2p77pjz4q"; + sha256 = "11n460b89q3zzirkcmg9ln0rqzlfmq247ygyl4vppmjlbcm7aq3v"; type = "gem"; }; - version = "4.4.0"; + version = "4.4.1"; }; simple_form = { dependencies = [ @@ -4227,10 +4221,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vhh91l7pjx7fpvs62kmz99ypsnkk93yq1ra5qgigbinxjqfa77b"; + sha256 = "0208na2s7q1hny77v78b6h677vrhy2v72cjw0d2mazjc0clx5hsq"; type = "gem"; }; - version = "5.4.0"; + version = "5.4.1"; }; simplecov = { dependencies = [ @@ -4283,6 +4277,16 @@ }; version = "0.1.4"; }; + ssrf_filter = { + groups = [ "default" ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "1xlpb8y555frl82cx4q2i922mps36mmn0ajk21kpy3bks6wwsgg0"; + type = "gem"; + }; + version = "1.5.0"; + }; stackprof = { groups = [ "development" @@ -4291,10 +4295,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03788mbipmihq2w7rznzvv0ks0s9z1321k1jyr6ffln8as3d5xmg"; + sha256 = "014s1zxlxcw35shislar3y1i3mqa0c6gh3m21js14q1q5zharhjf"; type = "gem"; }; - version = "0.2.27"; + version = "0.2.28"; }; starry = { dependencies = [ "base64" ]; @@ -4308,15 +4312,18 @@ version = "0.2.0"; }; stoplight = { - dependencies = [ "zeitwerk" ]; + dependencies = [ + "concurrent-ruby" + "zeitwerk" + ]; groups = [ "default" ]; platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1mxy9x9zpi1grx24lds1kkipmh0rgcwsi74c7pbm1dza39m6p7nh"; + sha256 = "1mhnm73jix2khvba81sxc7580sn5iflkb9kynag1xprsgbrafwl0"; type = "gem"; }; - version = "5.4.0"; + version = "5.8.2"; }; stringio = { groups = [ @@ -4329,10 +4336,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1yh78pg6lm28c3k0pfd2ipskii1fsraq46m6zjs5yc9a4k5vfy2v"; + sha256 = "1q92y9627yisykyscv0bdsrrgyaajc2qr56dwlzx7ysgigjv4z63"; type = "gem"; }; - version = "3.1.7"; + version = "3.2.0"; }; strong_migrations = { dependencies = [ "activerecord" ]; @@ -4340,10 +4347,23 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "09llhlw9ddsjyv6c59z3yjwdhrxc2q60a60wjvqhrhhy96dkmjlb"; + sha256 = "0fa4hxwi075xxcfb93lfc6wja67nlrbqs2bn1sf3w3z6c20hz76b"; type = "gem"; }; - version = "2.5.1"; + version = "2.8.0"; + }; + strscan = { + groups = [ + "default" + "development" + ]; + platforms = [ ]; + source = { + remotes = [ "https://rubygems.org" ]; + sha256 = "17k75zrwf4ag9yl9wjjkcb90zrm4r5jigdzv3zr5jm9239hxpqma"; + type = "gem"; + }; + version = "3.1.8"; }; swd = { dependencies = [ @@ -4420,10 +4440,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1vsk2ca9kfrxhyd2xiiyr28hmxkh9vd8j2vwl5f1yfnkv4z52n8s"; + sha256 = "17j9cai2ykcndgn0800m9nb297sx0lpminxj8bcqw4bwkb1xjch3"; type = "gem"; }; - version = "1.4.4"; + version = "1.6.1"; }; thor = { groups = [ @@ -4436,10 +4456,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0gcarlmpfbmqnjvwfz44gdjhcmm634di7plcx2zdgwdhrhifhqw7"; + sha256 = "0wsy88vg2mazl039392hqrcwvs5nb9kq8jhhrrclir2px1gybag3"; type = "gem"; }; - version = "1.4.0"; + version = "1.5.0"; }; tilt = { groups = [ @@ -4449,10 +4469,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w27v04d7rnxjr3f65w1m7xyvr6ch6szjj2v5wv1wz6z5ax9pa9m"; + sha256 = "1cvaikq1dcbfl008i16c1pi1gmdax7vfkvmhch64jdkakyk9nnqd"; type = "gem"; }; - version = "2.6.1"; + version = "2.7.0"; }; timeout = { groups = [ @@ -4463,10 +4483,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "03p31w5ghqfsbz5mcjzvwgkw3h9lbvbknqvrdliy8pxmn9wz02cm"; + sha256 = "1jxcji88mh6xsqz0mfzwnxczpg7cyniph7wpavnavfz7lxl77xbq"; type = "gem"; }; - version = "0.4.3"; + version = "0.6.1"; }; tpm-key_attestation = { dependencies = [ @@ -4595,10 +4615,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0f898y35w60mkx3sd8ld2ryzkj4cld04qlgxi3z3hzdlzfhpa8x9"; + sha256 = "1g0hmv2axxjvk7m5ksql9q0a6mnhqv4cqgqqzh0pd39vsp9x7c3x"; type = "gem"; }; - version = "1.2025.2"; + version = "1.2026.2"; }; unf = { dependencies = [ "unf_ext" ]; @@ -4643,10 +4663,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "1995yfjbvjlwrslq48gzzc9j0blkdzlbda9h90pjbm0yvzax55s9"; + sha256 = "03zqn207zypycbz5m9mn7ym763wgpk7hcqbkpx02wrbm1wank7ji"; type = "gem"; }; - version = "4.1.0"; + version = "4.2.0"; }; uri = { groups = [ @@ -4659,10 +4679,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0jrl2vkdvc5aq8q3qvjmmrgjxfm784w8h7fal19qg7q7gh9msj1l"; + sha256 = "1ijpbj7mdrq7rhpq2kb51yykhrs2s54wfs6sm9z3icgz4y6sb7rp"; type = "gem"; }; - version = "1.0.4"; + version = "1.1.1"; }; useragent = { groups = [ @@ -4703,10 +4723,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "005mbcprdhjqx27561mb54kssjwxwij157x6wya1yp60gdkl8p0r"; + sha256 = "0md8zry4dvcj436mssd4mf4fmi6n7xsvk9aldyz3yz6xl4db32bf"; type = "gem"; }; - version = "3.0.19"; + version = "3.11.0"; }; vite_ruby = { dependencies = [ @@ -4720,10 +4740,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0wj9ia0s7vywn66pf2jn49pfsy5h5rncjjwhaymwq32r3f2pq2p1"; + sha256 = "11lsr9c9v7xpyz0z6yxvw992aaqxcxivm5pmh7fbn2hqxd8m8inv"; type = "gem"; }; - version = "3.9.2"; + version = "3.10.2"; }; warden = { dependencies = [ "rack" ]; @@ -4783,10 +4803,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0w1x1k3bkkvi1438kx9qa1b9hn6zff1ykh55278fjrax1nycsa6d"; + sha256 = "142cbab47mjxmg8gc89d94sd3h7an9ligh38r9n88wb3xbr5cibp"; type = "gem"; }; - version = "3.26.0"; + version = "3.26.2"; }; webpush = { dependencies = [ @@ -4809,10 +4829,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "12d9n8hll67j737ym2zw4v23cn4vxyfkb6vyv1rzpwv6y6a3qbdl"; + sha256 = "0ca1hr2rxrfw7s613rp4r4bxb454i3ylzniv9b9gxpklqigs3d5y"; type = "gem"; }; - version = "1.9.1"; + version = "1.9.2"; }; websocket-driver = { dependencies = [ @@ -4823,10 +4843,10 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "0qj9dmkmgahmadgh88kydb7cv15w13l1fj3kk9zz28iwji5vl3gd"; + sha256 = "15idgibqpdaj97f734drx8a7k1jcc8wvxlk2nbafac72ihikicjs"; type = "gem"; }; - version = "0.8.0"; + version = "0.8.1"; }; websocket-extensions = { groups = [ @@ -4886,9 +4906,9 @@ platforms = [ ]; source = { remotes = [ "https://rubygems.org" ]; - sha256 = "119ypabas886gd0n9kiid3q41w76gz60s8qmiak6pljpkd56ps5j"; + sha256 = "04hx33lsnp4q0qf8982mz0acs1dap5s2bsmihi0n0g08249sc4kj"; type = "gem"; }; - version = "2.7.3"; + version = "2.8.2"; }; } diff --git a/pkgs/by-name/ma/mastodon/missing-hashes.json b/pkgs/by-name/ma/mastodon/missing-hashes.json index 17032924257f..c444c5f4db38 100644 --- a/pkgs/by-name/ma/mastodon/missing-hashes.json +++ b/pkgs/by-name/ma/mastodon/missing-hashes.json @@ -1,29 +1,69 @@ { - "@esbuild/aix-ppc64@npm:0.25.5": "fb872b34a2843293dc60e809968fedf93e0d8f7174b062decffae6ba861eb56aaea0cd0aba87ba99162ceb2a690f0cde4fc29c000b52c035e40c91ec7861d43e", - "@esbuild/android-arm64@npm:0.25.5": "c818e799b19b5587466bf68a27b578ccaaf866c1d144573fbde7659e3fd3f555422ec3e67f5bd186a87648957d1b6e74df4f847edea7219c16979c9916f36e91", - "@esbuild/android-arm@npm:0.25.5": "a5384933f9f2ffcadce2be49da6ff43249fe42f32a04071316434e9f633fc20c8d4029072e9a53555620c3531045786297607b852579eee30b6dbc3bc9d98cd9", - "@esbuild/android-x64@npm:0.25.5": "8ce115dc7e1e6735f23b4aadb2dfca29c0abd8577ce34802ea3d017a64e388928949134fe225dfe190babdc5ec01be5fc7794eca84738cdefc12c5e3789ce43b", - "@esbuild/darwin-arm64@npm:0.25.5": "a009eab62f2bd284a6f2001d5e08217059186ffc16907bbe873e1de40fe9b5ed92c0db2f4c4d0dc41545838850a430c8f2f35d7bdb9cd01a1a04293acd97afca", - "@esbuild/darwin-x64@npm:0.25.5": "cac8021a7a0c549263e076913346b35a5bb81f76ffbc1abfad5e7b67303f013ac0c76f111bf624ea8447b327ec86c18a60c6ff307d743a2269f5d47313f5b2de", - "@esbuild/freebsd-arm64@npm:0.25.5": "d248e7103b7094eb4288db7c9a78b2905a25b4a957f2b945531ca88d3394f45ceca2343a7c84954734534af6159bc741eb3d5c1ed9df990f7395337a1b14192c", - "@esbuild/freebsd-x64@npm:0.25.5": "8a7be0740f07f5dbb3e24bf782ca6ef518a8ce9b53e5d864221722045713586d41774cbd531df97dc868b291b3b303c12e50ca8611c3cb7b5fe09a30b38285eb", - "@esbuild/linux-arm64@npm:0.25.5": "ce3c8fca47cf0a92148fb288eb35a5c4a4dcf7a700730b3a48fdd63c13e17c719eb6b350378203fba773477eb5be637f47a6d52c5d4ce5bdc0075ee917156006", - "@esbuild/linux-arm@npm:0.25.5": "cc81ea76ab86ed2a837c9da329f7c63412d288dc0aa608c8dcdf51705dc93d5b7f966a429be4896babe611074e5898c7e6c8e07ad7f50123a05478975294fbb4", - "@esbuild/linux-ia32@npm:0.25.5": "bfed6750923afd56148f658f6ec8995479f5115116dc212ecb9e4c556064422e22eda855177e7c02cbc945494e4db1167101918c5fa932278115db2c7025a3f6", - "@esbuild/linux-loong64@npm:0.25.5": "e5c20140bbbdba53f0d86dd72961ed73e6255d2ada2d3a626f390b352170605644822ad7592f695b6e520edcefe0c5f6ba19d10694b5d11d725745d9792bde01", - "@esbuild/linux-mips64el@npm:0.25.5": "6b3559517efd0dd1301debc7af7e275b055859c26facdda2e229b1aaab6ebea4c480a1da151c46211ee4035d95bfa7f0cdacf735b57ee99d41b69c77357310b9", - "@esbuild/linux-ppc64@npm:0.25.5": "a1a1af99d758efce928335637924dcd8ddec4201af51014e1f831b012d53a0a673b1e0c31036ec9e8c5a0311439283419ec8abdfc67ecb245fa7f7b653006ed0", - "@esbuild/linux-riscv64@npm:0.25.5": "6cd8dce6723b73e0f89898ab6cd52e0d009afdacdfc0d5529134de7b832c92c2e0421fbb5cbfc0e0c0b2b00a9b1ff2c4cdb9695b2c535ebc174960e986c727a7", - "@esbuild/linux-s390x@npm:0.25.5": "31b86dbc93d19eb362bad3353e65d6da771118346e723582d06c05f1b6ffad1c3765001b5215ef1e8f0c2bb29130d98815359bbc88e5c08304354d5a92e6ea94", - "@esbuild/linux-x64@npm:0.25.5": "f878a3e40edfd8a50de94bf982a9eaf03e636a0332af163a6c905490063aae652384fb392d4765c4338fb6f991034949c92ec768ee65c3b2fceeb494b89fe8b3", - "@esbuild/netbsd-arm64@npm:0.25.5": "941c5e28a63a93f19122271b5490e196db12815702c2266c6d66401b6909a4364ab889611ba81c5359624e3ce61f0505a680a1179ed9a555d1415fa1c485d75d", - "@esbuild/netbsd-x64@npm:0.25.5": "edbefdd88ca24a373497a7c8d1fdab418827ff89c6eee1c574159dbb4d9174552aa87753f35525a894964b77c14b012164ec5582b9f19dd4d6c1f5d45df411c7", - "@esbuild/openbsd-arm64@npm:0.25.5": "d44633a374c109d2fb9c678882016e3ec3d79f0c5f21a6e6fb0114ea709bc539200b037a4e3ec52304eea2f8c5957bf16c6f0a7af5cfde41b652c4bac604bba6", - "@esbuild/openbsd-x64@npm:0.25.5": "efc4641ea653dedc9886f0603c2e7cfc6fbe94c34d4cdaee9b060a8b9d8143d1192c45da93b3e802af2c26f72ab1ad3a3fad0e0cb297d06de55814fe83ccd32c", - "@esbuild/sunos-x64@npm:0.25.5": "29860663381b6098c0fda6f69235407654dfad953e83b3f9f06a270950d5c37da4ca60a4b5915b8e2606d468b560be6179870f64a22d5b046e8a930c31a7b554", - "@esbuild/win32-arm64@npm:0.25.5": "a77d395251c8a62ab0cec07d5230222823fa02fbf3ef008d94b5213a335c9f949872c3f1c2f947abaa28098b669018e429af42f59616e049860a0072f3b006de", - "@esbuild/win32-ia32@npm:0.25.5": "ff1b6cbe835082aef5b93c3e2012d51be431d05c6ae5f90a5bc89687c687e8e2340c262dedddd124b27b511616bbc4088b5a4a949d3147f677084dc6ec572629", - "@esbuild/win32-x64@npm:0.25.5": "266e69e8d37bd4deb77443588e49472e4e9791178cb39e1692eabb67cf65d8e85a932ac468e7ebb2072c8a9ee23ad413c8f0f7d954c474f643cedbbf7aad952a", + "@esbuild/aix-ppc64@npm:0.27.2": "78d13201fd4d048d19955fc510db508b14b5fc1a38f4ea506469eac65db770c65fc3727df15b087778178fc8e3304df88559a7441d227451efd8a0b1a688a729", + "@esbuild/android-arm64@npm:0.27.2": "e8aded79b2f1f8841c082396f7476bee51c056ed468e438fe2ee00b6b73e96acd640d0b8d0cc13e63c972898f6cdd275483c36c562d4186f0efc01881672b08a", + "@esbuild/android-arm@npm:0.27.2": "ac673502cf6672dabb4b82a26bb3cc120402acba1b87a92481c0a37c8fa06847fd16503714bb227f6351d836f6f60c644ab50fda95c896d8eeb3e5ec3af96226", + "@esbuild/android-x64@npm:0.27.2": "dcf5c84443645af089e3b82421097c0288a4bdebabf231449ddd66e1b48952e5af975bd26954a50be0441605b91cfe779ca2192bc4b02b7b19192a2a86f912f1", + "@esbuild/darwin-arm64@npm:0.27.2": "cf08b03672941acbea8b509db79a7cb9cf8c81b563c75414c87b8c8442cb1178063eaa14b7cd1ae6cae95dba7e1de9343b721a6d19523a5f21c3d1367e3688b7", + "@esbuild/darwin-x64@npm:0.27.2": "5d3207cf85674b01a817c43064525e39b215802a9ecf352d15e92e926c3e549d95b30e127c2d3f8196ac9472ecca87a861d9f270221ee55884c7a6d0aa636fe1", + "@esbuild/freebsd-arm64@npm:0.27.2": "45f475fc6ab2f4760155ca2b50c4cf0ea8aef2bfad3ba4548f4547898d3cc785dcfc2ea58a190be3c20c715c771d1d694a9eb6ef5fb6b72d93b6abc94f366b98", + "@esbuild/freebsd-x64@npm:0.27.2": "7fb62475cb9cdf54d22f2fa984ef57f891d05f366143227efd1d28d507a3b1f2c723239b3e22b3ac418467e6284a08eaf6dcf0bfd2a0f1bea06d0ac73c2aa8de", + "@esbuild/linux-arm64@npm:0.27.2": "89b8e94e2f4e7cf564623bb6b1d2e9ab218c6d4cafed93778fb797b552d3495f08c99e49d9a2573823bc62660353ce4b4cf17a2828359a3437a9caf8da99673b", + "@esbuild/linux-arm@npm:0.27.2": "fd7c845a5ee2073ef6c5bc9d914844b48b82006ebf00f5acb98a43f600ee83fda578034ed8eb6f7f462ed4e3ecd8b7c6570a78bb708ee7eb10b93751ab879ad6", + "@esbuild/linux-ia32@npm:0.27.2": "23f67cfbab67aa860d7afa842e29fa75eb16af8577a811c54263fc3a276c05e468d532bcdb118d174624ed76a9e133d2520567937d4ed646caf9dd19aadbae15", + "@esbuild/linux-loong64@npm:0.27.2": "b37e531c91346c7b5d31ce6664a334c391a27c3c9fb282136abf232111575387e9d066abf27f29436afc913270a8e2c2b09c1210fbf87e70f1028685d94ec4de", + "@esbuild/linux-mips64el@npm:0.27.2": "8b48a6c7dc8f16147c1087b56710685f3b89279498caab6b63cad3db9402308adf633111d773cfe31756d41fe46e895f2c1ece0fc1ed484ab02e92c28357f0c6", + "@esbuild/linux-ppc64@npm:0.27.2": "4f207f87bfc1253974e00d3cf27316d3e93b7e51fde46ed618367e62f2875dffd66812acb85e8d2949dffc73eed7b3939a42bb93f40ec8fca4a6988173709dab", + "@esbuild/linux-riscv64@npm:0.27.2": "837a0aa03e82a1b853632d153515d68035e57b39ccf730a778311c04e3429aa80f001d990392519a641945501f6ab3af331481eb4551e99718e7cd2ba5862089", + "@esbuild/linux-s390x@npm:0.27.2": "426a4b9d9d4c58d61031a412c64c8cfb0db0e38da3cf4dade253c45a46dc539dccee24700e965e66c7c397a65fef765fc43bdc6b3f46d6bc6f289f79c4b6d7d5", + "@esbuild/linux-x64@npm:0.27.2": "febde9f6908220698cf72947534eca590c2b5ce8b0c9bc6170649c5f64f7f93808bb9be2caabd7c63068dc68e218741f27a17ffb8826d87fb487a0639888b90f", + "@esbuild/netbsd-arm64@npm:0.27.2": "1f69c833bfc5d1d7c58f52fca35637df1686a5bff5c15af900c165b2561a809d805201dc8de712fa73c69205e96a078096cd00b00e9ca8fb5cd8741e4ec943b8", + "@esbuild/netbsd-x64@npm:0.27.2": "29c9cbd018788521145d719013020dfbf744185eaeaff845f0fc925c67630c66743b03486a2531493f79482d2315e910a27a31f89a791e0a9589e04d86d295d7", + "@esbuild/openbsd-arm64@npm:0.27.2": "dccfe8ca6c0d648a26a626b5a4caf3325fed90d7ae343db2a86be9af2479391518c02d54470c2690aec23af1359debe7fbf125d979b5ea891a63fe4b206c2d6f", + "@esbuild/openbsd-x64@npm:0.27.2": "0bc581af266608ba01c530ec1fe2b475630dbd56538562f8b1748f7044727bd08d0784afa9aee8aa0a2afe843bb0b47572b4c6babb2a9953808d37263d730be1", + "@esbuild/openharmony-arm64@npm:0.27.2": "1f04a6d690bd2ef231801b0c46b40359b4d4451409cf46a865613f3942835e7633286c328c31f3a10065491f314e6c7c47d7a8f79c1a1ec25f59ff46f5765c6f", + "@esbuild/sunos-x64@npm:0.27.2": "9543db0acc86a762f9fd708a3226ebc45a1625885532d153928b9d2b0de90b6d78db0f9b77261d345b95c1ba7282ff3ab0fa37932c2dcd9b1c2b7da7cf39cd76", + "@esbuild/win32-arm64@npm:0.27.2": "2bfe0fef3ace4a5b0f7647168ae21eda9344a8bef4924d60d1ca781b59eb1f7fef0858aef6e2fb8c185638117bfb7dc18c55a700db57799955c8f655eaaf1f44", + "@esbuild/win32-ia32@npm:0.27.2": "c510d04bc11f11b7bd6bbf0ea28e2ba484e6232b7655b5cc8ccf8276ef7da760d54a79eaef87a1a40a81632a5ec4a9f7bb08f63920e5d145c8a893ae76d93094", + "@esbuild/win32-x64@npm:0.27.2": "d11933a70f9c908e3cd7202071dc23a9dea8afa58a4c2e22a3beab3516d0898345a5ebb2af47ffb2cc7f5d2a6d788ed4681fa7f37e121f1605149f124d632c67", + "@oxc-parser/binding-android-arm-eabi@npm:0.132.0": "11d7e411090bbec8d07a867a7954aee5417c0ee9a985f1bb217aa6ff12e53d0a6919fc06e27c2d091dbfd02ffbf74edfcee0224b38e642a4138c4a522a1a861b", + "@oxc-parser/binding-android-arm64@npm:0.132.0": "dc00b1c88ef74c101af44aa62f54659a720e169339ef0971df70ffe32ff2e768051c24e1038d087fe2f9733045f213fd806bd73f3493280f1c170a1bfd04cea6", + "@oxc-parser/binding-darwin-arm64@npm:0.132.0": "8705914f91d01f534bf61cebead3e90cb4497787292faf46e5d198093a9500a2466a74a00f5efd204a1d329ff7da4b7329ef4b8840ba2e378a98872a0e21a3d3", + "@oxc-parser/binding-darwin-x64@npm:0.132.0": "4b90b26f7a997556e89c7d4648ee845f5e502dabbfbd2b330cccad756dd7b322e9a6195fdd1f33e278059a40292f754b7da7dd15db4baafb441c304e4cafc7eb", + "@oxc-parser/binding-freebsd-x64@npm:0.132.0": "60c04e9f3dd5f3addecdf85873ccc8a79d880e0237be07a597c1fff980e0cfe60d3b0a6b9400a89323c8fd48776a7e172a58b6bde9e3bff781ab5e4d80f2def0", + "@oxc-parser/binding-linux-arm-gnueabihf@npm:0.132.0": "eba579d9c7444748f9e82aad19accb80dfbff7ab66dc7f3766da790f97abc190dec8fe430a3af97d4c0f34c9353bb0563094f91efe7f893083a80f2f7ca4dbc8", + "@oxc-parser/binding-linux-arm-musleabihf@npm:0.132.0": "03765d72b81dacfd98c46c40fbdddff3361b92cf65e55176886780f158d563a18800bd744c374db28b3664c5eb1b14cd71b1a84cafc64e93d291ec226ed77a7c", + "@oxc-parser/binding-linux-arm64-gnu@npm:0.132.0": "aa9f9386d334953839bf0febb457c670f29b2545fba81c957efbf5701600c8f7024ac69f97a8d76de28609f00ffb2488be5c47907328f96c11d4d544c8c55277", + "@oxc-parser/binding-linux-arm64-musl@npm:0.132.0": "3f7037a6d4c81816509944a316f239ba7d233a099608ee08f882160067b4542570625bd81ac4029060da1f48a1ca12de74a049c6dfe84f6215d8fb8d77d06bc0", + "@oxc-parser/binding-linux-ppc64-gnu@npm:0.132.0": "63937000054bd2a986ebdaf6a92c6bdab926b52744b2e805727503f785eef692a3e1fa1fc85163f63020c6222107ce7fc4c97b4175a847c3774b67a1a904d1ba", + "@oxc-parser/binding-linux-riscv64-gnu@npm:0.132.0": "ce3c1c0f048d93fb75399f82bebb97f8c6079e3811bc9a741709906dee379a57660e45d379471beb4b52bd84223750acbdc4a52d34d0a0b6d9b49db5aa1f6ea6", + "@oxc-parser/binding-linux-riscv64-musl@npm:0.132.0": "f0eee8f514ae5906981594566180b11e5a8eff72840b3219493ce9bcb0ece6f7e69e37ca3e98b0e228a3a175b65a9730573be1e567652bd91875137a03a42aba", + "@oxc-parser/binding-linux-s390x-gnu@npm:0.132.0": "99988465bd899276e9e1c89715080493b91d5096e2a76433b44ee5225a761d77ce932ccd5c47ec16f2c259a11e6ee34e0074334e437774dde6ab74c4637bba07", + "@oxc-parser/binding-linux-x64-gnu@npm:0.132.0": "c4416d3014931b1831bf9cd11eaeafd44876a3dcf56f45c052a6d8f634b047f5851a0b822ac1621d1fe185a0109f2acefcd10507c51c2845c219cac08a16e185", + "@oxc-parser/binding-linux-x64-musl@npm:0.132.0": "4b45901795cf1eb2f53617e0619fca45b6efb52690ef1d77b3fcad07dbb25f854e7eb2c6317883ba6895521ec38828655ac9cf77fab2d2b27e4a59e7b14abcb5", + "@oxc-parser/binding-openharmony-arm64@npm:0.132.0": "46b3d666749e0e66e46810fcfbda37b65196fbedb31ffb9461bda2881f007a233f1c360d533d692f5789864ea99f842f1101edc4dd85e929cb64ef3a8f4c0684", + "@oxc-parser/binding-wasm32-wasi@npm:0.132.0": "63c0ca72ad2439c46212687caa3ca77f79312382d313c492b4f940edf71eecb14057325c4bfc78614f66579813add04aad8409ff32a684dcba7e32888d93d5e7", + "@oxc-parser/binding-win32-arm64-msvc@npm:0.132.0": "1c8db4cddad78adf0d5113047e7d85ca99ee6cf24db0b5cf143cc30461620e141cc42038928903c3d605e7dd449bb9a48030d15bfdcbccdd648c86e80f6316ce", + "@oxc-parser/binding-win32-ia32-msvc@npm:0.132.0": "38d5fe8cd2c5c0d2b3761fcc33062945e030951507b2d434ae060f9363686f267560ddad79e693d56cc9a784d74f5721eae019b18b283ae4f3651215a0a64aca", + "@oxc-parser/binding-win32-x64-msvc@npm:0.132.0": "3730b86c60ecc874a4c084cf7b020d7290996360bab49d669e2a931f999d53d9fecf9fda9b64fcfcaae34a08dbb41f6088ba10b03f1557f97dc8d91f67aa4074", + "@oxfmt/binding-android-arm-eabi@npm:0.47.0": "8c6093de3486fa25dbb64c832a8020b521116c550216822b3ead18c42e2f770bbd1e4fb9fdcd32b20aecb4c49c987d0625bc9e209e043cd4a55b593a1dc44342", + "@oxfmt/binding-android-arm64@npm:0.47.0": "ac9c7fd4ae638b2f7a4beb9c656e5e9ae6cecd6e64dff9d4e0588762a499e2e6bcf2d09b5711ab92ec071b3754e18b303ac5bcdbe6932e7c1aacb6d49a7d8726", + "@oxfmt/binding-darwin-arm64@npm:0.47.0": "48c212f8dbe32fedf44b721174463f763500821efc172a7311a53b1012b8b919b8597e212aabd74ff5c69e0355c2e3415d2e033fdc1fc731945fc45810000d48", + "@oxfmt/binding-darwin-x64@npm:0.47.0": "65f95c5615efbba9caa4717ba34a74e98ed54a0f656161752f6fd57837989afbd9cf3dc20074d5f35ed25f99c5b645638c84e58d0f51646db5dea95c95fa4a12", + "@oxfmt/binding-freebsd-x64@npm:0.47.0": "1fceb64e6c868a37b8bf7cfcb037b07168f0611bd000bd7fa216dc164999882e201c09f7aefd08e874e9d24e8a6ded10e7158c11249caa6f8567487ee39fa3b3", + "@oxfmt/binding-linux-arm-gnueabihf@npm:0.47.0": "d9f5db6f7528ac7df3faf81c9963b069ac2242356e71e541a13cdc8a4a569beed6e209d0fc7b3166cfe26acfc2c1036e2066e71960d68b4d3393d6c42d5b9bf2", + "@oxfmt/binding-linux-arm-musleabihf@npm:0.47.0": "9aaf0f065f6ca82c9966f414d83d9095f2554b7cbe873b7122eac542bf4874aab73f8670bdf0eec670f25bdffdcff1b03e4faf8f46d25ddce87f7c226332879f", + "@oxfmt/binding-linux-arm64-gnu@npm:0.47.0": "8f3a562d81e152de381cc3b136ca1381ecfd4c18165db17bc7c703090323596faefbc7363ef5ddf30ba03b935319dfc7391d00ce4fd46c3663eba57ac9618d9d", + "@oxfmt/binding-linux-arm64-musl@npm:0.47.0": "f497e7b058a0f78aeff46508a480d03c2306706f6586c5b4067bd08fbf0b3446e6e9e60386ca9439a34dc9aefd19872b53bcd4896ec1667ce442cf6d9e3a665d", + "@oxfmt/binding-linux-ppc64-gnu@npm:0.47.0": "89d0ff4a241537acfdc4c39c70489e2199edb1f81c218a473daec9686a76087b08ce15e29673470fe253010dccb3d7523ec1d7932d9764b8ded8e326f689e144", + "@oxfmt/binding-linux-riscv64-gnu@npm:0.47.0": "25aaae28128b2c78027f8c9002b0a7938ed47820da0c6ece2194786fb226cfbf70a081e8ae7b2b6240a418c844d22f6588f97b9babec0db559fd3731fb3be317", + "@oxfmt/binding-linux-riscv64-musl@npm:0.47.0": "805c8f46fffc3ee2e257cac8c72fa1b2324ef0505f33a400ee4c7adbba3133796bb1e31e63a3ab7f348faaeb532bce10da252161a10ae033c755c201053bd234", + "@oxfmt/binding-linux-s390x-gnu@npm:0.47.0": "e36674a39b5dc9a206b784477acf534112b2476457b484255416138ec0ce98733139f4ee7b44981021559c98e8b4a717ad19f5b5471e4cec06647c086028b2e7", + "@oxfmt/binding-linux-x64-gnu@npm:0.47.0": "089fc7bf49db9b50ad6c063cfca5390d12670cd3a3536b1c46a11a643a3d77fedf13a7646ed368ce2f0462484e0a248e96ef9997e06d992a684c7a7bde2f97c8", + "@oxfmt/binding-linux-x64-musl@npm:0.47.0": "e437731a19fecb379143f6fed7d862dd19bb721dc5190ffda707431f6de2ce44ca7f9d217a046cd0e70c31d2e3c1b95051ae5495a80c5142fc28922cd939ff28", + "@oxfmt/binding-openharmony-arm64@npm:0.47.0": "529ebb6bc9f8ff1fa7b5c6a476d260557172719839ee1efd28967f275c363025a85f6cad75f33e2ec88c139e88e0b9527ca2f3477ffa474b6cbab4900d69b242", + "@oxfmt/binding-win32-arm64-msvc@npm:0.47.0": "8de18898b3c5a8ef8f53aaf6471d928da30f5ffe2d65b34e88407ae81934afddf2f7e354c51af29c5354b9099e4f3d2e52ad2702d7a2a45fc21d4a889ca4ae7d", + "@oxfmt/binding-win32-ia32-msvc@npm:0.47.0": "a5ec49b5f47c6bf1805d08b566d65f00b275005268f9c19bdbc03cdec0977d4bdbe547850873f7d26b9eadd9b728965a58b477f4a46e2578ce119f7b18e8c8ea", + "@oxfmt/binding-win32-x64-msvc@npm:0.47.0": "5936d0d84dd9316ccb237322db6f7c19a5c29ef7dac00d237576924e917b9e35fb711f671c564dd17d31872ccf994e4e53c478981973e1fa8d48cb467182f406", "@parcel/watcher-android-arm64@npm:2.5.0": "2d5d66f4e904546cff638d0b27a871d695dda1205e32902f917723dc1b09a5edef4ed8064fc5c85192a4e5e5b531eb4a2d3b349015ff6170c8228e3c098d5376", "@parcel/watcher-darwin-arm64@npm:2.5.0": "bbdbaeb31ccea5ec172adab2bb2b1a5f4b2e18ed31054d7f6b1db718238f5880e3b8bc8ac1b55c00048c7a1973e75c0c86fa04c02679f99c0bb355145c8b685b", "@parcel/watcher-darwin-x64@npm:2.5.0": "85089bf1c0f7fb0b4007d54f97e890bf2173d1a11166e9e601b9afe6e260e9cff2eed150ea80f51aae358436376c36af75a70523f53711f16a773987422cf93b", @@ -37,26 +77,21 @@ "@parcel/watcher-win32-arm64@npm:2.5.0": "cff6516b1dad597ca1ec8c385cf8251f5050b32ab46fc15360f2eff3a40b61b7107eee56df73764007d9bd6b826960d2f3589c8e0ce270bb5b2a292313bd7a1b", "@parcel/watcher-win32-ia32@npm:2.5.0": "ad9d2c9ae3a7031105fc90418050a910d4b679ead36e5fdcbb1b3e4afbaf56aec6566863e3a374c645c82f57073d8f643183f19c67c8c48b0aa62224c05fdb9d", "@parcel/watcher-win32-x64@npm:2.5.0": "aa9660bdb2fe70de5163f9f8419e263711fd30612244fb7feb58fce49a653b88ac0e1e29646fb1fc76b86fd8215e62eea5ded0616725987dfca5372041925bd2", - "@rollup/rollup-android-arm-eabi@npm:4.46.4": "c87957e957226ba7b5388426aa9fceaf581d3ffb94f18a5042aeafe5dc7ad7dd7e857e7199bad7fd7967626d7f0b9ca7e3476133ea3304b0a1f7efec1a4efdbd", - "@rollup/rollup-android-arm64@npm:4.46.4": "61041fbc16fc274d27a5780041235c21bd1ad453bccfb60ac58d253a12673b34c4615b2ee60d92abafa14eef4405c4e907e8fd9c750fd29a55cdb279f8fac87a", - "@rollup/rollup-darwin-arm64@npm:4.46.4": "61ab7f693dd752352d1cd3baa1375b9f09bc044fc3612460685752cb6c526b1eab02fc9b3acd30ef4e1e0a65046ce418fa11b6c3fe503e9d105dfca513cdca19", - "@rollup/rollup-darwin-x64@npm:4.46.4": "3c3f7aff3151f19acc5791b55426871353c298e6c4685525778395e04a441664b5dbe840c0dfc384f4b09c540fc0721c2fe55e82c868d44262f4db1e1e0a1637", - "@rollup/rollup-freebsd-arm64@npm:4.46.4": "fda6ff0b60bdd1e73cc81ac597681ab9f6d9955bb57de6585ef1215ecd1821256f85bc6bff556522460c98c618c178601782253946866f605a48a05f69f897c3", - "@rollup/rollup-freebsd-x64@npm:4.46.4": "c173fbd95d3530ae20972e22b1e82f79b6e9ac685185bb5ecb38b1bb85385d1a2511ec5ae65c67406915b14e1e553e1953eca93b18040093d4b596303347f9eb", - "@rollup/rollup-linux-arm-gnueabihf@npm:4.46.4": "e20c0f7f45281a78ae67e6fc75f8bc1fd1d1ffb366c2f727c04d2c8d2e3bc468501920448c32284082f0025a872cf074cd30d8fef1254d04f0e3bcc9ba8b5a50", - "@rollup/rollup-linux-arm-musleabihf@npm:4.46.4": "10f315b0adaf6022bbaaa8caccda6c8ee09db72d72ebe8ca50c1906b1c5e619441a96608d7831fb35bc5426103080cc947a60a5f441f45389bf370ea0f7de4cb", - "@rollup/rollup-linux-arm64-gnu@npm:4.46.4": "51716d5d8afcb316f509b262ea2981125df6c3446da56ac75744595c7a001ac3edfdade8560bec48a20618d9e0ab5861e79769f97a3c001bf581fff3c1ae6d73", - "@rollup/rollup-linux-arm64-musl@npm:4.46.4": "f91c1d7ccf33522d4b9737ec83b77e7653e1a3e6c225fa20b92616eed7d96e753689a0ce536771561435dd0a08b60ea4c45e615a17aad6aa2f52a982d4453cc7", - "@rollup/rollup-linux-loongarch64-gnu@npm:4.46.4": "bc4142527835846e19034736ff9b95b92b9f7945ba6842dc555b9b82d2ef49328ab272264704edbba3452586d7c423dbe554605168bb1c178432ecc48698cc09", - "@rollup/rollup-linux-ppc64-gnu@npm:4.46.4": "8ff88717144ade71ebdbc6630d25d206700ffb7d85b549fbf40dc5786cec24079f084b040a7dae5ed6adab110e9952935b2603eeec6e488d924e88a103b22861", - "@rollup/rollup-linux-riscv64-gnu@npm:4.46.4": "77f82af4da7ac78452b3a9e81f6408b84005062405667acea55410ae72beb02bcb2cf66d551e912344b62d3b5d605670be8a394158cd54a19a5f95f370c6502b", - "@rollup/rollup-linux-riscv64-musl@npm:4.46.4": "278a9abc7816b3370833a91676c1001eeca17bc1717231bcbf92a286ec4bcdeb5416f3efe0fd7c8f89ee1aa323b651769380e0b4c27a3d472d87f88c7682f8f2", - "@rollup/rollup-linux-s390x-gnu@npm:4.46.4": "717e74e68f26988552ae074de11f7fa421a546c6371c7db4453e0e1011c1d954d3a7349b8bffec1160f8b89a13d11bad977aaff12eb64e37f1de3bcb3810857c", - "@rollup/rollup-linux-x64-gnu@npm:4.46.4": "d7734157db2dd6d25f00b4cd23442fc1c7e23ef5dd7226635243b7a26ca91064a25c0b458180457a5ebe2a7f3bc591297356290a26c93c5a4e4a9e36556f6ac2", - "@rollup/rollup-linux-x64-musl@npm:4.46.4": "41428ac6fefdf4bfc142387b687e3913b3a21fe118973e6fd9e757b5cfeca1c825919a5bbde05cfa00672d5a26cd264af76e82af3663d696bb66e3258886b2ec", - "@rollup/rollup-win32-arm64-msvc@npm:4.46.4": "feb15d6bc577fe552239281b86ce17f285a0e69e1b9071da277e8351d98d977b24988c195d124f930348c6a6111ac974ab6a1d61b247644cf6ff5629a7134909", - "@rollup/rollup-win32-ia32-msvc@npm:4.46.4": "505d598fd08db80b37d706a95e274afeea675626ca24a08442689a77fe3b0749ab67ced39cbc28ac3758fbfb0b98f410d5031beaf7bc182867cb309ebc4fd4ce", - "@rollup/rollup-win32-x64-msvc@npm:4.46.4": "8b804ddfb2dc6881fd123aa9e7764d2deb26a90b1867a0592871df9f98a8e3257d41b2da074f3d3e73ea11e6fe1605d2067bbf564427c7f63f8aaf97d1912140", + "@rolldown/binding-android-arm64@npm:1.0.3": "35e2b7f9e54c526cee5433351b0ef376dd1657d8a6eecf00512dec4720bb02594268bf8d3b661199917bdd286d4370bf3c3461b08eb74f0eae77bd13585e260a", + "@rolldown/binding-darwin-arm64@npm:1.0.3": "7e7d168d091053100a785c0240d6d6134039bf0fb7a658624fa33426b148e9b8131d1690729b32a7b1e65329879c15601b7afd576e149ca6feb6302c530ed860", + "@rolldown/binding-darwin-x64@npm:1.0.3": "0721c045d1446138e49dca250c8716c1b2eb4f1595bf1226a2c273befa063f91c4623e4cd5d338e969626e4281541b958c4a3d4649c0c553da0ec42292450a8d", + "@rolldown/binding-freebsd-x64@npm:1.0.3": "faa48a73ac1b1a4af8ed7b67932a59b62f139d76f21d1ccbe5efb5ab8a5a61e1f5de0b5d9367a9ecd8759bdab3aa1734aefd2214bbe2cfc4b0cb119f6e5391da", + "@rolldown/binding-linux-arm-gnueabihf@npm:1.0.3": "fab607d7639bf6d3393f6e0da0c9680e2d357b550abc50d7dc60cd45e25c788cddee38deac074d9c987e22532d83dcd8a76564710654663bd65622a190548c72", + "@rolldown/binding-linux-arm64-gnu@npm:1.0.3": "a067fc8d80a6af88893010abb55d697221afa8f9d3f468082bc759305f2decbf16f8655a5313e6e608d1b2f103d28922607290ab85d575b78930bc9daa777204", + "@rolldown/binding-linux-arm64-musl@npm:1.0.3": "b1264d8302780c991260991733cf156c1ed43fed66fce60e5a265577aced196b92907cfcbe8d3262621b8e08106f1f555743c601fe60676c08ffae0edd821128", + "@rolldown/binding-linux-ppc64-gnu@npm:1.0.3": "82f33061f5003b99bac68a0637bf7665f6fb2b22cfc025e4d7762afefe703af2acc1cd2df8ff07bb000b0eecd3e59959992481a5b03794604af090eaa843c70f", + "@rolldown/binding-linux-s390x-gnu@npm:1.0.3": "a6a3811352aa5db6a793879bf405bb98eaeca06cfd1aae959a9ed70db39b28e0a022ca50524cdd26d0447fa7b9c5ef913281cf543f816ac6e3ea6b6d620af88a", + "@rolldown/binding-linux-x64-gnu@npm:1.0.3": "13ece4e580f022a1a70031da2036448097bc38d040d1e87ee81cffd9e1ab8b64673e92843718470e3d07ea664171dc2c20d766cbafbb0ca8774e3c4f0b122c7d", + "@rolldown/binding-linux-x64-musl@npm:1.0.3": "6beeffe835e820679868021e01fb629fe124813911dd625bd3d24b1592450c06131b360e284396aca04798e6a85f988917ea00e95b3ea087a32a45441bad3235", + "@rolldown/binding-openharmony-arm64@npm:1.0.3": "f8e8352edde4d2345e3e360bb050915daf0d9ee4c491024a08e56088801994f2cbdf0152f81115a089c1870863e6384135765126114cf8481933bc15678e1dde", + "@rolldown/binding-wasm32-wasi@npm:1.0.3": "3f73081fc41cbd8c117183fecb0f491a71278472c0640b54e57a3a6705005f54d7997c610244d2ff651d5d688a20596ab1119e3dccf607f59fdea4ec0621da49", + "@rolldown/binding-win32-arm64-msvc@npm:1.0.3": "a29f05721b276acdeb7f00b43b9c6241f9c4cc60b820d6b9217d205cfd0ee66a82a29da501e60163c66ce7cc8cb6362f88933b466dea66e3219b38d15954873e", + "@rolldown/binding-win32-x64-msvc@npm:1.0.3": "d6afa484d89c9479561a0621709dfc9737584515f87e96fa74f7d153bbde74f81b6ba7aac92187189ffb4dd1795fa152c596a04ae9a41ffab7437babc5a15838", "@unrs/resolver-binding-android-arm-eabi@npm:1.11.1": "04dd38b694c1680bfec192b499e188700398a414886a08a8a7c72815db56ac147df03d88c73ff6fff7ac3e0a01dc41978054b3622b49463e0d684c5168557fcc", "@unrs/resolver-binding-android-arm64@npm:1.11.1": "763626adc34dd2b4af677b5ced6493e7b2b1935351a5c9137f1c9561d11faf97b94015e6876e57e85c33ff563564314c92c0882a4780a57f2225cbbd779a695d", "@unrs/resolver-binding-darwin-arm64@npm:1.11.1": "03b477fdfec55dbabe488fe0962417bddaa38b028d2670053469f1d24163907b097aac15b565f6974449bee398a38d5e3e1525f2b515ce57e243149021b7aa2f", @@ -75,5 +110,16 @@ "@unrs/resolver-binding-wasm32-wasi@npm:1.11.1": "655a3990ed9b238e8f0c4858f87ca84bd3d81db300f7730c885162333055170e11207af7789ff38f619e261178718f6977729e42ce7978cc9e6ac7b6d93822d5", "@unrs/resolver-binding-win32-arm64-msvc@npm:1.11.1": "983f800ff8b5181247a7d460ab5c9704cd425d0182e93290f69fb969d93efe17be6a27c22b97546d36e9a9d9aeda96d5f753bc938b3d9a00f32c10fc228ce5a9", "@unrs/resolver-binding-win32-ia32-msvc@npm:1.11.1": "383d639e3b08fc9e4ba18127ef55610172d2d1d6adb83e1466fff2b223552384cdc6217051f749829e0c90a757ea5631e8c4ad2cfeb59bdee2bb033fbd526854", - "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940" + "@unrs/resolver-binding-win32-x64-msvc@npm:1.11.1": "c862561f6495c0dbffb94d421e5727b25c1b61d98e22383bff23e6719a6c0125bb0b7df3be7220f5480bf54f5a605ea572f10fff1cce14fda24d42e396559940", + "lightningcss-android-arm64@npm:1.32.0": "1cb326ad39dcb02cf9f45025c167b6900e3a04b08f5149d3c5ee26054b00d08db3736fb69183a6c3ed1cb32dddd148608c784b6631b4777623f7dd0c032c392d", + "lightningcss-darwin-arm64@npm:1.32.0": "da954d0c215d0e95f15a92c8717f871017586e1332b98fd40e96196571d2fd3d51a727dc530768afee9f6a04da210510740574dd0c8dbf2ecced79e5996f1a06", + "lightningcss-darwin-x64@npm:1.32.0": "b1d298c9173f839e8447d1917ed8bc5ab098ed0fc4e4b419d36ac5afe8b27bf21cb47d00a35c3d2edadcac598086e9b4f26c992a809d79f9681d6865a230d79e", + "lightningcss-freebsd-x64@npm:1.32.0": "0eb59f6acf2fcdc944c921b0ac2a16ee803452b9438f573ad6bc41be00040b791ed698698ed5c06f98ef43a6fed0a54987ba3a88da204de9978db2fca96a4a65", + "lightningcss-linux-arm-gnueabihf@npm:1.32.0": "7d1ea43986d2370a90cefc920dac3e041e0d19445cc4fdaf244644b57b6937588d7c3a464c31440617231f55a6dad79744cf707912e05f3b46a1694abb5b4e00", + "lightningcss-linux-arm64-gnu@npm:1.32.0": "f01ede75f41480a164d18338fa46d9fccdb4a821717174ce848ff8b2aa4badba4f1d331deb3ebec3ee2f0eb95bfa2e35f54877f371427b04e6f36a4783aa1414", + "lightningcss-linux-arm64-musl@npm:1.32.0": "38d373f99768f1c5ab6a9c87e1c0ec45eccdb3fe4d216dd5cd06629648c4b0689570ad4e89285d490662cde1790cd36e6b3d176c14e5e31f6869c604aa2df820", + "lightningcss-linux-x64-gnu@npm:1.32.0": "0a1433d46a4a010f87b615c3fa43725a456bae259858a2c927899cbf93074f0ae40f49901bf6af6daa30a4d169c86f594f6341fd775bf7b59293b8d7947b81c5", + "lightningcss-linux-x64-musl@npm:1.32.0": "a6f48ccc30a73d30563c7b61856d1fd6a8812ce62b1bee797f227e06612df70aab4ccd1908552952f77ca7ff2a51019f62d14ae5310ca67311635eeec55d3a9e", + "lightningcss-win32-arm64-msvc@npm:1.32.0": "a919be7fb298c1102bccf18b6f83d54946adfac70ab2ac9c95e4ae38ded76d8f530215b0bcda4d38df4ffc40a70abe3afd91d01d35fd122e7d119ed0e46972d0", + "lightningcss-win32-x64-msvc@npm:1.32.0": "5b8d3431aadbdc40a0a7eae32f2415e4f28b547af1a1cd5b35a35d67f772a89492c7fa03e9fc88ce804b14f5f88e412e49fff40d1b0aad67177de815c434207e" } diff --git a/pkgs/by-name/ma/mastodon/package.nix b/pkgs/by-name/ma/mastodon/package.nix index 2bf76f28a662..3a211fdc08b6 100644 --- a/pkgs/by-name/ma/mastodon/package.nix +++ b/pkgs/by-name/ma/mastodon/package.nix @@ -90,7 +90,6 @@ stdenv.mkDerivation rec { -exec brotli --best --keep {} ';' find public/packs -type f -regextype posix-extended -iregex '.*\.(css|js|json|svg)' \ -exec brotli --best --keep {} ';' - gzip --best --keep public/packs/sw.js runHook postBuild ''; @@ -191,7 +190,6 @@ stdenv.mkDerivation rec { happy-river erictapen izorkin - ghuntley ]; }; } diff --git a/pkgs/by-name/ma/mastodon/source.nix b/pkgs/by-name/ma/mastodon/source.nix index 46470a7e4d2a..7d292595b1b4 100644 --- a/pkgs/by-name/ma/mastodon/source.nix +++ b/pkgs/by-name/ma/mastodon/source.nix @@ -5,22 +5,19 @@ patches ? [ ], }: let - version = "4.5.11"; + version = "4.6.3"; in applyPatches { src = fetchFromGitHub { owner = "mastodon"; repo = "mastodon"; rev = "v${version}"; - hash = "sha256-YAWlge8dShDFfMBhyRQHryZUs1yD5KNKzXOyCpRsy9w="; + hash = "sha256-NMeI8Ev0CSIf0dfbjqVAmFuTU9MFC8Y3qO9gI3p8Y+4="; passthru = { inherit version; - yarnHash = "sha256-OFPwe0OqvJhbJuY6gVuQJB5dGE8q6IPrsfW9NK8oVPM="; + yarnHash = "sha256-G1keSWDDpp0vBAOqQI8y8n7bmAeo9Hrdbo7R+cVZQwE="; yarnMissingHashes = ./missing-hashes.json; }; }; - patches = patches ++ [ - # Remove when https://github.com/mastodon/mastodon/commit/048700da2f95e492a81fde902f4d48c278763a6d is released - ./yarn-4.14-support.patch - ]; + patches = patches ++ [ ]; } diff --git a/pkgs/by-name/ma/mastodon/update.sh b/pkgs/by-name/ma/mastodon/update.sh index 75d7e9b74540..75027aed0b32 100755 --- a/pkgs/by-name/ma/mastodon/update.sh +++ b/pkgs/by-name/ma/mastodon/update.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p bundix coreutils diffutils nix-prefetch-github gnused jq yarn-berry_4.yarn-berry-fetcher +#! nix-shell -i bash -p bundix coreutils diffutils nixfmt nix-prefetch-github gnused jq yarn-berry_4.yarn-berry-fetcher set -e OWNER=mastodon @@ -111,6 +111,9 @@ echo "Creating gemset.nix" bundix --lockfile="$SOURCE_DIR/Gemfile.lock" --gemfile="$SOURCE_DIR/Gemfile" echo "" >> gemset.nix # Create trailing newline to please EditorConfig checks +# Fix formatting +nixfmt gemset.nix + echo "Updating yarnHash" yarn-berry-fetcher missing-hashes "$SOURCE_DIR/yarn.lock" > missing-hashes.json YARN_HASH="$(yarn-berry-fetcher prefetch "$SOURCE_DIR/yarn.lock" ./missing-hashes.json 2>/dev/null)" diff --git a/pkgs/by-name/ma/matcha/package.nix b/pkgs/by-name/ma/matcha/package.nix index 04720b6bd494..dd15b8c99612 100644 --- a/pkgs/by-name/ma/matcha/package.nix +++ b/pkgs/by-name/ma/matcha/package.nix @@ -14,16 +14,16 @@ buildGoLatestModule (finalAttrs: { __structuredAttrs = true; pname = "matcha"; - version = "0.40.1"; + version = "0.44.0"; src = fetchFromGitHub { owner = "floatpane"; repo = "matcha"; tag = "v${finalAttrs.version}"; - hash = "sha256-4GbuiFFHQ14O+S2TtWiP1UWg3h6J9Cys6A8k5+0Ww/I="; + hash = "sha256-y1YEnqTCmf+CMKpv3wN4SZsN+lUuv3T8pKmM+zu1Ipw="; }; - vendorHash = "sha256-TFc7e7gNtFNiCJHARngWSBKGqGhH7PiX48VkU9kD9Bs="; + vendorHash = "sha256-cg6R4WtDORwZlo+P16rN6qc0zZMOPtnr4VyQKV9Q2nM="; proxyVendor = true; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/ma/mate-calc/package.nix b/pkgs/by-name/ma/mate-calc/package.nix index 3488fd4ba96f..91f18026e381 100644 --- a/pkgs/by-name/ma/mate-calc/package.nix +++ b/pkgs/by-name/ma/mate-calc/package.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Calculator for the MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-control-center/package.nix b/pkgs/by-name/ma/mate-control-center/package.nix index 63374a83fe80..44036743da0b 100644 --- a/pkgs/by-name/ma/mate-control-center/package.nix +++ b/pkgs/by-name/ma/mate-control-center/package.nix @@ -89,6 +89,12 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--disable-update-mimedb" ]; + postInstall = '' + substituteInPlace $out/share/thumbnailers/mate-font-viewer.thumbnailer \ + --replace-fail "TryExec=mate-thumbnail-font" "TryExec=$out/bin/mate-thumbnail-font" \ + --replace-fail "Exec=mate-thumbnail-font" "Exec=$out/bin/mate-thumbnail-font" + ''; + preFixup = '' gappsWrapperArgs+=( # WM keyboard shortcuts diff --git a/pkgs/by-name/ma/mate-panel-with-applets/package.nix b/pkgs/by-name/ma/mate-panel-with-applets/package.nix index a3a52ced0d43..e5d5031ff9c9 100644 --- a/pkgs/by-name/ma/mate-panel-with-applets/package.nix +++ b/pkgs/by-name/ma/mate-panel-with-applets/package.nix @@ -34,12 +34,13 @@ let in stdenv.mkDerivation { pname = "${mate-panel.pname}-with-applets"; - inherit (mate-panel) version; + inherit (mate-panel) version outputs; src = null; paths = [ - mate-panel + mate-panel.out + mate-panel.man ] ++ selectedApplets; @@ -84,13 +85,5 @@ stdenv.mkDerivation { __structuredAttrs = true; - meta = { - inherit (mate-panel.meta) - description - homepage - license - teams - platforms - ; - }; + inherit (mate-panel) meta; } diff --git a/pkgs/by-name/ma/mate-polkit/package.nix b/pkgs/by-name/ma/mate-polkit/package.nix index 49b7269fae3e..363842c17ebc 100644 --- a/pkgs/by-name/ma/mate-polkit/package.nix +++ b/pkgs/by-name/ma/mate-polkit/package.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Integrates polkit authentication for MATE desktop"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-power-manager/package.nix b/pkgs/by-name/ma/mate-power-manager/package.nix index 9f67b36f661b..a46e9e41daee 100644 --- a/pkgs/by-name/ma/mate-power-manager/package.nix +++ b/pkgs/by-name/ma/mate-power-manager/package.nix @@ -56,7 +56,16 @@ stdenv.mkDerivation (finalAttrs: { mate-panel ]; - configureFlags = [ "--enable-applets" ]; + configureFlags = [ + "--enable-applets" + "--sbindir=$(out)/bin" + ]; + + postPatch = '' + # Fixes polkit popup after `nixos-rebuild switch`. + substituteInPlace src/gpm-brightness.c \ + --replace-fail 'SBINDIR "/mate-power-backlight-helper' '"/run/current-system/sw/bin/mate-power-backlight-helper' + ''; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/mate-sensors-applet/package.nix b/pkgs/by-name/ma/mate-sensors-applet/package.nix index 536b3c3251fa..a8496deb4f96 100644 --- a/pkgs/by-name/ma/mate-sensors-applet/package.nix +++ b/pkgs/by-name/ma/mate-sensors-applet/package.nix @@ -65,7 +65,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/mate-desktop/mate-sensors-applet"; description = "MATE panel applet for hardware sensors"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-system-monitor/package.nix b/pkgs/by-name/ma/mate-system-monitor/package.nix index bc8715962c5e..06ece55fd14b 100644 --- a/pkgs/by-name/ma/mate-system-monitor/package.nix +++ b/pkgs/by-name/ma/mate-system-monitor/package.nix @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { description = "System monitor for the MATE desktop"; mainProgram = "mate-system-monitor"; homepage = "https://mate-desktop.org"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-tweak/package.nix b/pkgs/by-name/ma/mate-tweak/package.nix index 63cc32afbd25..ee347085be71 100644 --- a/pkgs/by-name/ma/mate-tweak/package.nix +++ b/pkgs/by-name/ma/mate-tweak/package.nix @@ -85,7 +85,7 @@ python3Packages.buildPythonApplication rec { description = "Tweak tool for the MATE Desktop"; homepage = "https://github.com/ubuntu-mate/mate-tweak"; changelog = "https://github.com/ubuntu-mate/mate-tweak/releases/tag/${version}"; - license = [ lib.licenses.gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.linux; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/mate-user-share/package.nix b/pkgs/by-name/ma/mate-user-share/package.nix index f3e0b3846e5d..8a3acda40b02 100644 --- a/pkgs/by-name/ma/mate-user-share/package.nix +++ b/pkgs/by-name/ma/mate-user-share/package.nix @@ -74,7 +74,7 @@ stdenv.mkDerivation (finalAttrs: { description = "User level public file sharing for the MATE desktop"; mainProgram = "mate-file-share-properties"; homepage = "https://github.com/mate-desktop/mate-user-share"; - license = with lib.licenses; [ gpl2Plus ]; + license = lib.licenses.gpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/ma/material-design-icons/package.nix b/pkgs/by-name/ma/material-design-icons/package.nix index 88c7e5768793..d44886ff0b97 100644 --- a/pkgs/by-name/ma/material-design-icons/package.nix +++ b/pkgs/by-name/ma/material-design-icons/package.nix @@ -3,31 +3,27 @@ fetchFromGitHub, stdenvNoCC, nix-update-script, + installFonts, }: -stdenvNoCC.mkDerivation rec { +stdenvNoCC.mkDerivation (finalAttrs: { pname = "material-design-icons"; version = "7.4.47"; + outputs = [ + "out" + "webfont" + ]; + src = fetchFromGitHub { owner = "Templarian"; repo = "MaterialDesign-Webfont"; - tag = "v${version}"; + tag = "v${finalAttrs.version}"; hash = "sha256-7t3i3nPJZ/tRslLBfY+9kXH8TR145GC2hPFYJeMHRL8="; sparseCheckout = [ "fonts" ]; }; - installPhase = '' - runHook preInstall - - mkdir -p "$out/share/fonts/"{eot,truetype,woff,woff2} - cp fonts/*.eot "$out/share/fonts/eot/" - cp fonts/*.ttf "$out/share/fonts/truetype/" - cp fonts/*.woff "$out/share/fonts/woff/" - cp fonts/*.woff2 "$out/share/fonts/woff2/" - - runHook postInstall - ''; + nativeBuildInputs = [ installFonts ]; passthru.updateScript = nix-update-script { }; @@ -46,4 +42,4 @@ stdenvNoCC.mkDerivation rec { dixslyf ]; }; -} +}) diff --git a/pkgs/by-name/ma/material-maker/package.nix b/pkgs/by-name/ma/material-maker/package.nix index 2fe3edc95452..557f54970743 100644 --- a/pkgs/by-name/ma/material-maker/package.nix +++ b/pkgs/by-name/ma/material-maker/package.nix @@ -2,7 +2,7 @@ lib, stdenv, fetchFromGitHub, - godot_4_6, + godot_4_7, vulkan-headers, vulkan-loader, libx11, @@ -15,19 +15,21 @@ libxrender, nix-update-script, }: - +let + godot = godot_4_7; +in stdenv.mkDerivation (finalAttrs: { pname = "material-maker"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "RodZill4"; repo = "material-maker"; rev = finalAttrs.version; - hash = "sha256-jSbauK9eXoTW2xjZsipWcPs/8qmK8ztmT+doCgu8zrU="; + hash = "sha256-/oBAbdYNfIeNKnv1NGP05Nk5G8gov1yqRsG0jnFMW/Y="; }; - nativeBuildInputs = [ godot_4_6 ]; + nativeBuildInputs = [ godot ]; buildInputs = [ vulkan-headers @@ -48,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { export HOME=$TMPDIR mkdir -p "$HOME/.local/share/godot" - ln -s "${godot_4_6.export-templates-bin}/share/godot/export_templates" "$HOME/.local/share/godot/export_templates" + ln -s "${godot.export-templates-bin}/share/godot/export_templates" "$HOME/.local/share/godot/export_templates" mkdir -vp build godot4 -v --headless --export-release 'Linux/X11' build/material-maker diff --git a/pkgs/by-name/ma/material-symbols/package.nix b/pkgs/by-name/ma/material-symbols/package.nix index 9fec0f1f675e..e6cf43b8c55a 100644 --- a/pkgs/by-name/ma/material-symbols/package.nix +++ b/pkgs/by-name/ma/material-symbols/package.nix @@ -7,13 +7,13 @@ }: stdenvNoCC.mkDerivation { pname = "material-symbols"; - version = "4.0.0-unstable-2026-06-05"; + version = "4.0.0-unstable-2026-06-12"; src = fetchFromGitHub { owner = "google"; repo = "material-design-icons"; - rev = "27aa4d49e4fabcb2a7f3acc86d205d33b159fad3"; - hash = "sha256-l8uXZZZ0rtQIYiEua8xmpuacLiR8hVjclAyc9dUI8z8="; + rev = "5d5d1fdd5476f3df3749e9fb872e32021ec7a750"; + hash = "sha256-e0bxJpehssgnxigSgPt9qxMrKRZcvlVDyLu5DY6MkTA="; sparseCheckout = [ "variablefont" ]; }; diff --git a/pkgs/by-name/ma/mathematica/versions.nix b/pkgs/by-name/ma/mathematica/versions.nix index 67ae0e5d3086..5fbd2ecd61b0 100644 --- a/pkgs/by-name/ma/mathematica/versions.nix +++ b/pkgs/by-name/ma/mathematica/versions.nix @@ -4,6 +4,20 @@ nix --extra-experimental-features nix-command hash file */ [ + { + version = "15.0.0"; + lang = "en"; + language = "English"; + hash = "sha256-3xEWSCe4g8utJre7h6pr3uADh0VrDN+gh4Ye7eREyLw="; + installer = "Wolfram_15_LIN.sh"; + } + { + version = "15.0.0"; + lang = "en"; + language = "English"; + hash = "sha256-5GulP3FM7p/RBKJskVzywPGJMS90GNATpczcceKmUKo="; + installer = "Wolfram_15.sh"; + } { version = "14.3.0"; lang = "en"; diff --git a/pkgs/by-name/ma/mathic/package.nix b/pkgs/by-name/ma/mathic/package.nix index fe2330fd28da..9d90e17fa8f5 100644 --- a/pkgs/by-name/ma/mathic/package.nix +++ b/pkgs/by-name/ma/mathic/package.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation (finalAttrs: { ]; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; __structuredAttrs = true; diff --git a/pkgs/by-name/ma/mathicgb/package.nix b/pkgs/by-name/ma/mathicgb/package.nix index 3e11ddd869c6..f6cbbdcf9fbd 100644 --- a/pkgs/by-name/ma/mathicgb/package.nix +++ b/pkgs/by-name/ma/mathicgb/package.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathicgb"; - version = "1.3"; + version = "1.4"; src = fetchFromGitHub { owner = "Macaulay2"; repo = "mathicgb"; tag = "v${finalAttrs.version}"; - hash = "sha256-zcHaYzznvbBkfeFXNxIxy9qlyD0esOvwUIOuEli4rwc="; + hash = "sha256-34ASkRPNH6d8TSJmyZmYZVOi1p02nHgMVXXWVJMNZ1c="; }; buildInputs = [ @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/ma/mathjax/package.nix b/pkgs/by-name/ma/mathjax/package.nix index a7f6bc9c3590..7bedaa251fa7 100644 --- a/pkgs/by-name/ma/mathjax/package.nix +++ b/pkgs/by-name/ma/mathjax/package.nix @@ -5,13 +5,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mathjax"; - version = "4.1.2"; + version = "4.1.3"; src = fetchFromGitHub { owner = "mathjax"; repo = "mathjax"; tag = finalAttrs.version; - hash = "sha256-x4aRA1EDBpx/PmWF8YmWs1Le7yX/hJo0Egrhc/nrWsE="; + hash = "sha256-Vl4gh2GRnlLkTV1o41WV6WBccjr+bnbq6JPcHGwfKXQ="; }; installPhase = '' diff --git a/pkgs/by-name/ma/matio/package.nix b/pkgs/by-name/ma/matio/package.nix index 9cc0c0cf155a..df8dae915720 100644 --- a/pkgs/by-name/ma/matio/package.nix +++ b/pkgs/by-name/ma/matio/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matio"; - version = "1.5.29"; + version = "1.5.30"; src = fetchurl { url = "mirror://sourceforge/matio/matio-${finalAttrs.version}.tar.gz"; - hash = "sha256-2eX3ovLFlO/xX1UONHKbAZkc3VoCilWL6M5ZWzIjOvs="; + hash = "sha256-i9O5R3BC7MAN1xwEdi+lhGjhTMzDL9jGgmwtoei8MQc="; }; configureFlags = [ "ac_cv_va_copy=1" ]; diff --git a/pkgs/by-name/ma/matlab-language-server/package.nix b/pkgs/by-name/ma/matlab-language-server/package.nix index d65b973762e7..ff77f8ba723f 100644 --- a/pkgs/by-name/ma/matlab-language-server/package.nix +++ b/pkgs/by-name/ma/matlab-language-server/package.nix @@ -6,16 +6,16 @@ buildNpmPackage (finalAttrs: { pname = "matlab-language-server"; - version = "1.3.11"; + version = "1.3.12"; src = fetchFromGitHub { owner = "mathworks"; repo = "matlab-language-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-UY+rYWfLHSc+1wDZsRfttX9asFOmV4i42/vxdqLQSuw="; + hash = "sha256-+0aVg5SesV8zOndRLTpz3WwLW32GxLLVlMcWj46vVIM="; }; - npmDepsHash = "sha256-r4GE9uQwjyPWUitaxXLejH4Ej8SWw+slGlYIo0OX3HM="; + npmDepsHash = "sha256-SQtUgX3yNXwUxZxPvNdYAtLBAu++2DiAx301X0LnAQo="; npmBuildScript = "package"; diff --git a/pkgs/by-name/ma/matomo/package.nix b/pkgs/by-name/ma/matomo/package.nix index 50b6fea94708..6315cfc0bd2e 100644 --- a/pkgs/by-name/ma/matomo/package.nix +++ b/pkgs/by-name/ma/matomo/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "matomo"; - version = "5.10.0"; + version = "5.12.0"; src = fetchurl { url = "https://builds.matomo.org/matomo-${finalAttrs.version}.tar.gz"; - hash = "sha256-i7nRQRY2gAzMQmRNGaksq4B516MsQuXQZbzlEUWEsQw="; + hash = "sha256-yiQUXb9yGgJ8PFOL1tyXtXEmgCviaqCtN0DwxKcGZV0="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix index 48c65f8734d9..3faaf14536f3 100644 --- a/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix +++ b/pkgs/by-name/ma/matrix-alertmanager-receiver/package.nix @@ -8,16 +8,17 @@ buildGoModule (finalAttrs: { pname = "matrix-alertmanager-receiver"; - version = "2026.6.3"; + version = "2026.7.15"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "metio"; repo = "matrix-alertmanager-receiver"; tag = finalAttrs.version; - hash = "sha256-uYNFk/jhL6J4PT4g2coztf3qo7QIgcmbdkub49O+PII="; + hash = "sha256-bsnyRSxpJ3kIZWZtz50KTVz6SMHjANZ2KjcKqyB90JE="; }; - vendorHash = "sha256-TV7s0+Buh6ah5GsZdrvXH8WedVO5vY2zmhB6SVcGGtI="; + vendorHash = "sha256-eAySC6KmVsAZpGG2uPBAfNQBNCHjuTtnsSkjqbMiFeY="; env.CGO_ENABLED = "0"; diff --git a/pkgs/by-name/ma/matrix-appservice-discord/package.nix b/pkgs/by-name/ma/matrix-appservice-discord/package.nix deleted file mode 100644 index 7330ecea5b45..000000000000 --- a/pkgs/by-name/ma/matrix-appservice-discord/package.nix +++ /dev/null @@ -1,123 +0,0 @@ -{ - lib, - stdenv, - fetchYarnDeps, - fetchFromGitHub, - - # native - yarn, - yarnConfigHook, - node-gyp, - python3, - srcOnly, - removeReferencesTo, - yarnBuildHook, - makeWrapper, - - # buildInputs - nodejs_20, - matrix-sdk-crypto-nodejs, - napi-rs-cli, -}: - -let - yarn' = yarn.override { - nodejs = nodejs_20; - }; - yarnConfigHook' = yarnConfigHook.override { - nodejs-slim = nodejs_20; - yarn = yarn'; - }; - yarnBuildHook' = yarnBuildHook.override { - nodejs-slim = nodejs_20; - yarn = yarn'; - }; - matrix-sdk-crypto-nodejs' = matrix-sdk-crypto-nodejs.override { - nodejs = nodejs_20; - napi-rs-cli = napi-rs-cli.override { - nodejs = nodejs_20; - }; - }; - nodeSources = srcOnly nodejs_20; -in -stdenv.mkDerivation (finalAttrs: { - pname = "matrix-appservice-discord"; - version = "4.0.0"; - - src = fetchFromGitHub { - owner = "matrix-org"; - repo = "matrix-appservice-discord"; - tag = "v${finalAttrs.version}"; - hash = "sha256-UyRMMbnX4aJVv8oQfgn/rkZT1cRATtcgFj4fXszDKqo="; - }; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${finalAttrs.src}/yarn.lock"; - hash = "sha256-s8ictJX65mSU2oxaIuCswfb2flo2RN9a1JZevacN/Ic="; - }; - - nativeBuildInputs = [ - yarnConfigHook' - yarnBuildHook' - nodejs_20 - node-gyp - python3 - removeReferencesTo - makeWrapper - ]; - - preBuild = '' - cp -r ${matrix-sdk-crypto-nodejs'}/lib/node_modules/@matrix-org ./node_modules - cd ./node_modules/better-sqlite3 - npm run build-release --offline --nodedir="${nodeSources}" - find build -type f -exec remove-references-to -t "${nodeSources}" {} \; - cd ../../ - ''; - - # npmHooks.npmInstallHook and yarnInstallHook don't work for this package - # because: - # - # - There is no `bin` key in - # package.json, which instructs it to create a binary file for the package. - # - The build/ directory, containing the compiled `.js` files from some - # doesn't get picked up by `yarn pack`. - installPhase = '' - runHook preInstall - - mkdir -p $out/lib/node_modules - - mv build $out/lib/node_modules/matrix-appservice-discord - cp -r node_modules $out/lib/node_modules/matrix-appservice-discord - makeWrapper '${nodejs_20}/bin/node' "$out/bin/matrix-appservice-discord" \ - --add-flags "$out/lib/node_modules/matrix-appservice-discord/src/discordas.js" - - # admin tools wrappers - for toolPath in $out/lib/node_modules/matrix-appservice-discord/tools/*; do - makeWrapper '${nodejs_20}/bin/node' \ - "$out/bin/matrix-appservice-discord-$(basename $toolPath .js)" \ - --add-flags "$toolPath" - done - - runHook postInstall - ''; - - doCheck = true; - - checkPhase = '' - runHook preCheck - - # the default 2000ms timeout is sometimes too short on our busy builders - yarn --offline test --timeout 10000 - - runHook postCheck - ''; - - meta = { - description = "Bridge between Matrix and Discord"; - homepage = "https://github.com/matrix-org/matrix-appservice-discord"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ euxane ]; - platforms = lib.platforms.linux; - mainProgram = "matrix-appservice-discord"; - }; -}) diff --git a/pkgs/by-name/ma/matrix-appservice-irc/package.nix b/pkgs/by-name/ma/matrix-appservice-irc/package.nix index 52e4d4b8d854..6dcf8c5c3366 100644 --- a/pkgs/by-name/ma/matrix-appservice-irc/package.nix +++ b/pkgs/by-name/ma/matrix-appservice-irc/package.nix @@ -5,7 +5,7 @@ fetchYarnDeps, fixup-yarn-lock, node-gyp-build, - nodejs-slim, + nodejs-slim_22, matrix-sdk-crypto-nodejs, nixosTests, nix-update-script, @@ -42,7 +42,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ fixup-yarn-lock - nodejs-slim + nodejs-slim_22 yarn node-gyp-build ]; diff --git a/pkgs/by-name/ma/matrix-authentication-service/package.nix b/pkgs/by-name/ma/matrix-authentication-service/package.nix index 9d063b4fa960..618351a33b61 100644 --- a/pkgs/by-name/ma/matrix-authentication-service/package.nix +++ b/pkgs/by-name/ma/matrix-authentication-service/package.nix @@ -2,8 +2,9 @@ lib, rustPlatform, fetchFromGitHub, - fetchNpmDeps, - npmHooks, + fetchPnpmDeps, + pnpm, + pnpmConfigHook, nodejs, python3, pkg-config, @@ -19,30 +20,30 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-authentication-service"; - version = "1.17.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "element-hq"; repo = "matrix-authentication-service"; tag = "v${finalAttrs.version}"; - hash = "sha256-/3NgMZ0B+B0BHPBi/vuiCS6xi70wgNKCZH0hTpkWi+U="; + hash = "sha256-4z+u1IM2pclccv9+IH8IWjCodDxWZmffbqWPC726sIg="; }; - cargoHash = "sha256-aZSnQmOwqo0OG3XXM5eups0cKNs80j/nAsZB5tnWUrY="; + cargoHash = "sha256-HQU0zaK7rLJnTX5WVZrqNEaT5HfFLDzs+pHRxx5XTaA="; - npmDeps = fetchNpmDeps { - name = "${finalAttrs.pname}-${finalAttrs.version}-npm-deps"; - src = "${finalAttrs.src}/${finalAttrs.npmRoot}"; - hash = "sha256-FevzqirT/GyT8urQ79AtJi+q1zcwn73AyiJTf/B9cG0="; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + fetcherVersion = 4; + hash = "sha256-9a62WlBQW8lgXluMh+DM21CkFCqFYd7yUz220G1uTIY="; }; - npmRoot = "frontend"; - npmFlags = [ "--legacy-peer-deps" ]; + pnpmRoot = "frontend"; nativeBuildInputs = [ pkg-config open-policy-agent - npmHooks.npmConfigHook + pnpmConfigHook + pnpm nodejs (python3.withPackages (ps: [ ps.setuptools ])) # Used by gyp ] @@ -82,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { in '' make -C policies - (cd "$npmRoot" && npm run build) + (cd "$pnpmRoot" && npm run build) # Fix aws-lc-sys cross-compilation export CC_${buildTargetUnderscore}=$CC_FOR_BUILD @@ -92,8 +93,8 @@ rustPlatform.buildRustPackage (finalAttrs: { # Adapted from https://github.com/element-hq/matrix-authentication-service/blob/v0.20.0/.github/workflows/build.yaml#L75-L84 postInstall = '' install -Dm444 -t "$out/share/$pname" "policies/policy.wasm" - install -Dm444 -t "$out/share/$pname" "$npmRoot/dist/manifest.json" - install -Dm444 -t "$out/share/$pname/assets" "$npmRoot/dist/"* + install -Dm444 -t "$out/share/$pname" "$pnpmRoot/dist/manifest.json" + install -Dm444 -t "$out/share/$pname/assets" "$pnpmRoot/dist/"* cp -r templates "$out/share/$pname/templates" cp -r translations "$out/share/$pname/translations" ''; @@ -113,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/element-hq/matrix-authentication-service"; changelog = "https://github.com/element-hq/matrix-authentication-service/releases/tag/v${finalAttrs.version}"; license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ teutat3s ]; + teams = [ lib.teams.matrix ]; mainProgram = "mas-cli"; }; }) diff --git a/pkgs/by-name/ma/matrix-commander-rs/package.nix b/pkgs/by-name/ma/matrix-commander-rs/package.nix index bb999e21e94c..69f29c697c08 100644 --- a/pkgs/by-name/ma/matrix-commander-rs/package.nix +++ b/pkgs/by-name/ma/matrix-commander-rs/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-commander-rs"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "8go"; repo = "matrix-commander-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-CvsMRxB5s891cVu03RroTQYOGA6rmhpif8VT0njXTnc="; + hash = "sha256-SyAKKSPGO8yjP3Pgsr2sPW5cpNyNLiYTy7CDDAXdztw="; }; - cargoHash = "sha256-hzWq09qJTox8yZuMOQ1///hKxY4EsWn/mHKy3svxlF8="; + cargoHash = "sha256-X1xBhJ0B4FcC66qKtYZbcX2+92hy2R4fM/GYBI8AFTY="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/applications/networking/instant-messengers/matrix-commander/default.nix b/pkgs/by-name/ma/matrix-commander/package.nix similarity index 100% rename from pkgs/applications/networking/instant-messengers/matrix-commander/default.nix rename to pkgs/by-name/ma/matrix-commander/package.nix diff --git a/pkgs/by-name/ma/matrix-continuwuity/package.nix b/pkgs/by-name/ma/matrix-continuwuity/package.nix index 69fd23b0f903..9caad3ba2e9d 100644 --- a/pkgs/by-name/ma/matrix-continuwuity/package.nix +++ b/pkgs/by-name/ma/matrix-continuwuity/package.nix @@ -23,13 +23,13 @@ let }).overrideAttrs ( final: old: { - version = "10.10.1"; + version = "11.1.1"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "rocksdb"; - rev = "10.10.fb"; - hash = "sha256-1ef75IDMs5Hba4VWEyXPJb02JyShy5k4gJfzGDhopRk="; + rev = "3756b2b905e13216d8b56bcc783d814e7b073aff"; + hash = "sha256-rSv4fr2bf9JJwdodgeuPCuceeh7k97KVxrAOC0wyPQY="; }; patches = [ ]; @@ -38,17 +38,17 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-continuwuity"; - version = "0.5.9"; + version = "26.6.2"; src = fetchFromGitea { domain = "forgejo.ellis.link"; owner = "continuwuation"; repo = "continuwuity"; tag = "v${finalAttrs.version}"; - hash = "sha256-4zs26kTqwkJV7x+Sm12LnR02bbyH0f6Itbz7bDKUyts="; + hash = "sha256-GcCjJiUOGX+vF7R4IRgNQs8KpfVj+MXwnhofwSm6gpA="; }; - cargoHash = "sha256-T11ESuNg3BS54LtNJfhOoIgiyVL7VsdP4OeDI2nVBIk="; + cargoHash = "sha256-p1Bz7op/qPogBn8bj9pQ7KjRhH2kZao8o0LPqWH2ZYo="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix index 27bc8b43be4b..f21434225d06 100644 --- a/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix +++ b/pkgs/by-name/ma/matrix-synapse-unwrapped/package.nix @@ -14,19 +14,19 @@ python3Packages.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.154.0"; + version = "1.157.1"; pyproject = true; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-4US6PPJAI0UUOmy12thjXKX3IRUCH9w/zkRD3ivQ9BE="; + hash = "sha256-yDfBtcBvIoWUfD8bqwGgeMvq4XHrr9ptVB6yKJWFX0c="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit pname version src; - hash = "sha256-Cu5bXS6BprXr/dwkNXDjcP9hOfqQddoC5BxOus4rteM="; + hash = "sha256-KM3j2O7J4Sad6jKF2Ca4qkRLj3w7+/UCnK6T6x8kMfs="; }; build-system = @@ -157,7 +157,7 @@ python3Packages.buildPythonApplication rec { ''; passthru = { - tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; }; + tests = { inherit (nixosTests) matrix-synapse; }; plugins = python3Packages.callPackage ./plugins { }; inherit (python3Packages) python; updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/matrix-tuwunel/package.nix b/pkgs/by-name/ma/matrix-tuwunel/package.nix index 2ac745b9c1f2..ae7ca4a8c419 100644 --- a/pkgs/by-name/ma/matrix-tuwunel/package.nix +++ b/pkgs/by-name/ma/matrix-tuwunel/package.nix @@ -11,7 +11,6 @@ nix-update-script, testers, matrix-tuwunel, - enableBlurhashing ? true, # upstream tuwunel enables jemalloc by default, so we follow suit enableJemalloc ? true, rust-jemalloc-sys, @@ -44,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 = "9a3a213b55df0b11408102c899a940675c0d90e4"; - hash = "sha256-aOV/jJjRjNJ3hrRqhCsXlIz05NvEhDF/j5Q5UOQuvp8="; + rev = "0bd7e6d6438d318d66e8374ec1fe24126204f3b3"; + hash = "sha256-THAHov40punmqm3J9kNYwFXfdRZ2VwjR/+lmFhun/xk="; }; version = "tuwunel-changes"; patches = [ ]; @@ -89,16 +88,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "matrix-tuwunel"; - version = "1.7.0"; + version = "1.8.2"; src = fetchFromGitHub { owner = "matrix-construct"; repo = "tuwunel"; tag = "v${finalAttrs.version}"; - hash = "sha256-bB42SEa/gkFlkjb4L12Uh7xI4+3NmJgfbUPU01NXaEQ="; + hash = "sha256-mfdX5HmuXf6s7zyT9AJUoz4v5v9Km+VX8z6KvRGq8F8="; }; - cargoHash = "sha256-czCKzV/DCMJK0sN/jP5Jo98Zdii9DIAGAVnFnK0YtmY="; + cargoHash = "sha256-jIgL/4i17H216goZ8DiFvIJTCKyjEHGiky3MTO5sQoY="; nativeBuildInputs = [ pkg-config @@ -127,7 +126,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildNoDefaultFeatures = true; # See https://github.com/matrix-construct/tuwunel/blob/main/src/main/Cargo.toml # for available features. - # We enable all default features except jemalloc, blurhashing, and io_uring, which + # We enable all default features except jemalloc and io_uring, which # we guard behind our own (default-enabled) flags. buildFeatures = [ "brotli_compression" @@ -140,7 +139,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "url_preview" "zstd_compression" ] - ++ lib.optional enableBlurhashing "blurhashing" ++ lib.optional enableJemalloc [ "jemalloc" "jemalloc_conf" @@ -152,6 +150,8 @@ rustPlatform.buildRustPackage (finalAttrs: { libredirect.hook ]; + # Make sure tuwunel doesn't try to write to arbitrary + # directories or have DNS timeouts during `cargo test`. preCheck = let fakeResolvConf = writeTextFile { @@ -165,8 +165,17 @@ rustPlatform.buildRustPackage (finalAttrs: { export NIX_REDIRECTS="/etc/resolv.conf=${fakeResolvConf}" export TUWUNEL_DATABASE_PATH="$(mktemp -d)/smoketest.db" ''; + doCheck = true; + # 2026-06-24: Tuwunel has 16 integration tests. Cargo turns each of these + # into a separate binary that links in all 110 MB worth of tuwunel. Linking + # 16 big binaries like this takes a really long time and was causing Hydra + # to time out the build during `checkPhase`. So, we run the checks in the + # "debug" profile. This reduces the build+test time on my machine from + # 44min to 12min. + checkType = "debug"; + passthru = { rocksdb = rocksdb'; # make used rocksdb version available (e.g., for backup scripts) updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ma/matterbridge/package.nix b/pkgs/by-name/ma/matterbridge/package.nix index d847c02f3aa2..edad78b29a8e 100644 --- a/pkgs/by-name/ma/matterbridge/package.nix +++ b/pkgs/by-name/ma/matterbridge/package.nix @@ -22,7 +22,7 @@ buildGoModule { meta = { description = "Simple bridge between Mattermost, IRC, XMPP, Gitter, Slack, Discord, Telegram, Rocket.Chat, Hipchat(via xmpp), Matrix and Steam"; homepage = "https://github.com/42wim/matterbridge"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ ryantm ]; mainProgram = "matterbridge"; }; diff --git a/pkgs/by-name/ma/matterircd/package.nix b/pkgs/by-name/ma/matterircd/package.nix index 644de7bca07d..8fec83348474 100644 --- a/pkgs/by-name/ma/matterircd/package.nix +++ b/pkgs/by-name/ma/matterircd/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "matterircd"; - version = "0.29.0"; + version = "0.30.0"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-7pOhUeUT95nk6kk03xAaIYHgXwr09m6LSbib2YSi1Ck="; + sha256 = "sha256-W00q5bRzCXl9R56xGol1bWYeW5w5MUpcoraKVaKimyk="; }; vendorHash = null; diff --git a/pkgs/by-name/ma/matterjs-server/package.nix b/pkgs/by-name/ma/matterjs-server/package.nix index 389a8d34c39a..6095c3894b97 100644 --- a/pkgs/by-name/ma/matterjs-server/package.nix +++ b/pkgs/by-name/ma/matterjs-server/package.nix @@ -12,7 +12,7 @@ buildNpmPackage (finalAttrs: { pname = "matterjs-server"; - version = "1.0.0"; + version = "1.3.1"; __structuredAttrs = true; strictDeps = true; @@ -20,10 +20,10 @@ buildNpmPackage (finalAttrs: { owner = "matter-js"; repo = "matterjs-server"; tag = "v${finalAttrs.version}"; - hash = "sha256-c/jhQfenRgE0qHisGM1TOtqWjDy/RcwGa04RE0FzR/U="; + hash = "sha256-HY1VEjqQ2C6Ym9PB2/g7M7TeAgOFsVYMX6jvpZLPgOI="; }; - npmDepsHash = "sha256-7Anz+Foz5jKP8u9jmpw1wn/LgknR1LWyozamBs83v1A="; + npmDepsHash = "sha256-I/iY2YdsgvdLMkLRzML5VttmmDNUr/U38l+Wp8bu2B8="; nativeBuildInputs = [ makeBinaryWrapper diff --git a/pkgs/by-name/ma/mattermost-desktop/package.nix b/pkgs/by-name/ma/mattermost-desktop/package.nix index 89dde4b56f85..df0057ea8468 100644 --- a/pkgs/by-name/ma/mattermost-desktop/package.nix +++ b/pkgs/by-name/ma/mattermost-desktop/package.nix @@ -2,7 +2,7 @@ lib, fetchFromGitHub, buildNpmPackage, - electron_40, + electron_41, makeWrapper, testers, mattermost-desktop, @@ -10,21 +10,21 @@ }: let - electron = electron_40; + electron = electron_41; in buildNpmPackage rec { pname = "mattermost-desktop"; - version = "6.1.2"; + version = "6.2.2"; src = fetchFromGitHub { owner = "mattermost"; repo = "desktop"; tag = "v${version}"; - hash = "sha256-EI1bDSiWdLCXlhUk1CmbUyYU7giey366cZLuhs0qtqY="; + hash = "sha256-KSyFJrYy+pueSrX20SPBoudWfiHmy5L2O8TdzLJRiYk="; }; - npmDepsHash = "sha256-7XUZ2rt2fZiQNpW8iHnNDbCSuK4/srWqIEKOKM6xty8="; + npmDepsHash = "sha256-70TBP4iDKuF4X9Tf0tsbUQ3N7bluoPn65OdfdcWin4Y="; npmBuildScript = "build-prod"; makeCacheWritable = true; @@ -47,7 +47,7 @@ buildNpmPackage rec { chmod -R u+w electron-dist npm exec electron-builder -- \ - --config electron-builder.json \ + --config electron-builder.ts \ --dir \ -c.electronDist=electron-dist \ -c.electronVersion=${electron.version} diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch index 0b31bb032b51..d413cf2f7849 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-free-banner.patch @@ -11,7 +11,7 @@ index 93cb8ab263..3d12cd5e54 100644 ); }; diff --git a/channels/src/components/header_footer_route/header.scss b/channels/src/components/header_footer_route/header.scss -index c2e6fbd187..828955cc79 100644 +index c2e6fbd187..bc1cedcff1 100644 --- a/channels/src/components/header_footer_route/header.scss +++ b/channels/src/components/header_footer_route/header.scss @@ -47,20 +47,7 @@ @@ -36,6 +36,19 @@ index c2e6fbd187..828955cc79 100644 } } } +@@ -83,12 +70,6 @@ + margin-top: 12px; + } + } +- +- &.has-free-banner.has-custom-site-name { +- .header-back-button { +- bottom: -20px; +- } +- } + } + + @media screen and (max-width: 699px) { diff --git a/channels/src/components/widgets/menu/menu_items/menu_item.scss b/channels/src/components/widgets/menu/menu_items/menu_item.scss index dee9b57f8c..8ef4aa073a 100644 --- a/channels/src/components/widgets/menu/menu_items/menu_item.scss @@ -57,7 +70,7 @@ index dee9b57f8c..8ef4aa073a 100644 button { padding: 3px 0; diff --git a/channels/webpack.config.js b/channels/webpack.config.js -index 852046de70..cf28fdcbd6 100644 +index 852046de70..a310da48f4 100644 --- a/channels/webpack.config.js +++ b/channels/webpack.config.js @@ -470,6 +470,9 @@ if (targetIsDevServer) { diff --git a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch index 574d7f012fbf..1ae8c819b72a 100644 --- a/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch +++ b/pkgs/by-name/ma/mattermost/mattermost-remove-user-limit.patch @@ -1,8 +1,19 @@ diff --git a/server/channels/app/limits.go b/server/channels/app/limits.go -index 4c88c1f049..fb7d84ef05 100644 +index 45448e4b2b..6125c02baf 100644 --- a/server/channels/app/limits.go +++ b/server/channels/app/limits.go -@@ -18,23 +18,8 @@ func (a *App) GetServerLimits() (*model.ServerLimits, *model.AppError) { +@@ -10,8 +10,8 @@ import ( + ) + + const ( +- maxUsersLimit = 200 +- maxUsersHardLimit = 250 ++ maxUsersLimit = 10000000 ++ maxUsersHardLimit = 10000000 + ) + + // GetServerLimits returns the server's seat/post-history limits. The license-derived +@@ -25,23 +25,8 @@ func (a *App) GetServerLimits(includeUserCounts bool) (*model.ServerLimits, *mod limits := &model.ServerLimits{} license := a.License() @@ -28,11 +39,11 @@ index 4c88c1f049..fb7d84ef05 100644 // Check if license has post history limits and get the calculated timestamp if license != nil && license.Limits != nil && license.Limits.PostHistory > 0 { -@@ -99,14 +84,5 @@ func (a *App) GetPostHistoryLimit() int64 { +@@ -112,14 +97,5 @@ func (a *App) GetPostHistoryLimit() int64 { } func (a *App) isAtUserLimit() (bool, *model.AppError) { -- userLimits, appErr := a.GetServerLimits() +- userLimits, appErr := a.GetServerLimits(true) - if appErr != nil { - return false, appErr - } diff --git a/pkgs/by-name/ma/mattermost/package.nix b/pkgs/by-name/ma/mattermost/package.nix index 37edd7302c9d..e7627ba0410a 100644 --- a/pkgs/by-name/ma/mattermost/package.nix +++ b/pkgs/by-name/ma/mattermost/package.nix @@ -27,14 +27,19 @@ # # Ensure you also check ../mattermostLatest/package.nix. regex = "^v(11\\.7\\.[0-9]+)$"; - version = "11.7.2"; - srcHash = "sha256-qqBqV55Qq2zZOKIZmRB0MyCjFkHDmfvQjmuMn2cP4hY="; + version = "11.7.7"; + srcHash = "sha256-dV+U+2yYX4IrM/EMaBAMwhW9WJh976WGDWFNOqnkTE8="; vendorHash = "sha256-XaXqQN20c3DhW2/L0zhTA8dLeRp4MyBxUKpiMVwp/7s="; - npmDepsHash = "sha256-37nkbIMuCI0ZSFc+TXky+kkrbLJNNzX/xBXGZjp4r7o="; + npmDepsHash = "sha256-8ZEe2TM2bevzdn04YIcVICWFSaa8HZTVS4gKn6aFcqM="; }, ... }: +assert lib.warnIf (latestVersionInfo != null && (removeUserLimit || removeFreeBadge)) '' + The user limit and free badge patches are not tested with this Mattermost version + (${latestVersionInfo.version}). +'' true; + let /* Helper function that sets the `withTests` and `withoutTests` passthru correctly, @@ -265,7 +270,7 @@ buildMattermost rec { buildPhase = '' runHook preBuild - for ws in platform/{types,client,components,shared} channels; do + for ws in platform/{types,client,shared,components} channels; do if [ -d "$ws" ]; then npm run build --workspace="$ws" fi diff --git a/pkgs/by-name/ma/mattermostLatest/package.nix b/pkgs/by-name/ma/mattermostLatest/package.nix index 45685a9cfc8a..81bb48d30b17 100644 --- a/pkgs/by-name/ma/mattermostLatest/package.nix +++ b/pkgs/by-name/ma/mattermostLatest/package.nix @@ -15,10 +15,10 @@ mattermost.override ( # and make sure the version regex is up to date here. # Ensure you also check ../mattermost/package.nix for ESR releases. regex = "^v(11\\.[0-9]+\\.[0-9]+)$"; - version = "11.7.0"; - srcHash = "sha256-oH9bLN2BPvRSWl5m3VNHBNMBXfdmkwaE9tzL7pcD1mg="; - vendorHash = "sha256-PmwwiXNaDarc1H7z1G4zstgs7tvmZ/d7V5eGqMh1VX4="; - npmDepsHash = "sha256-C3vfWW2hMOMnrPn1538kT+ma09T9VswrmADV/KPkrPc="; + version = "11.8.3"; + srcHash = "sha256-OWHW6UifUljL+yyWtc5XD/spbn7Yu1FqZ8gQAs073gY="; + vendorHash = "sha256-F2QMrLbio7812ZTGQZZPTqHWtIXbwbDmjUhtvv0DJ9s="; + npmDepsHash = "sha256-C8L5g+HY5aArLJzPbw3fESvA+U4JK1OQFWA4wwaan1M="; autoUpdate = ./package.nix; }; } diff --git a/pkgs/by-name/ma/matugen/package.nix b/pkgs/by-name/ma/matugen/package.nix index d96f127310ae..ee3333f7f84b 100644 --- a/pkgs/by-name/ma/matugen/package.nix +++ b/pkgs/by-name/ma/matugen/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "matugen"; - version = "4.0.0"; + version = "4.1.0"; src = fetchFromGitHub { owner = "InioX"; repo = "matugen"; tag = "v${finalAttrs.version}"; - hash = "sha256-2jcqAU8QutF8AE15LYwd8cy7KjayGxUGHxvWnqAiS5M="; + hash = "sha256-xzwMDWb6pF3oStVoS8enNhpYptxdnB1NSIO7dUH6/qk="; }; - cargoHash = "sha256-RlzY0eaYrEVkO7ozzgfLHxKB2jy4nSYda9Z0jrqiUVA="; + cargoHash = "sha256-bfvlPiTlPQeedo+ikHXSI8NqdA5R5M7gCsgx7srYsMQ="; meta = { description = "Material you color generation tool"; diff --git a/pkgs/by-name/ma/maturin/package.nix b/pkgs/by-name/ma/maturin/package.nix index 8c08f6a0643f..fae97effb3b9 100644 --- a/pkgs/by-name/ma/maturin/package.nix +++ b/pkgs/by-name/ma/maturin/package.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "maturin"; - version = "1.12.6"; + version = "1.14.1"; src = fetchFromGitHub { owner = "PyO3"; repo = "maturin"; tag = "v${finalAttrs.version}"; - hash = "sha256-NQ94RdQTQlRR5+2dC95cFNhwYliHmkD11JWyGt6BV6g="; + hash = "sha256-sqcNRN8oAZ2AK5gHr3ipb035VOiB+zDA10wTtiaeUBM="; }; - cargoHash = "sha256-9VqS9wvQAsSYNhH7B9WlD6SZjXR4S2sYzYoNy6vbYBM="; + cargoHash = "sha256-pD8/S7GsFFeAjc8U4fQ9ZTu+o3mKyPagMPKKRI40n4w="; buildInputs = lib.optionals stdenv.hostPlatform.isDarwin [ libiconv diff --git a/pkgs/development/python-modules/maubot/default.nix b/pkgs/by-name/ma/maubot/package.nix similarity index 64% rename from pkgs/development/python-modules/maubot/default.nix rename to pkgs/by-name/ma/maubot/package.nix index 2b8f15339a51..acaf6827f826 100644 --- a/pkgs/development/python-modules/maubot/default.nix +++ b/pkgs/by-name/ma/maubot/package.nix @@ -4,49 +4,20 @@ fetchpatch, callPackage, runCommand, - python, + python3, encryptionSupport ? true, - sqliteSupport ? true, }: let - # save for overriding it - python' = python; -in -let - python = python'.override { - self = python; - packageOverrides = final: prev: { - # SQLAlchemy>=1,<1.4 - # SQLAlchemy 2.0's derivation is very different, so don't override, just write it from scratch - # (see https://github.com/NixOS/nixpkgs/blob/65dbed73949e4c0207e75dcc7271b29f9e457670/pkgs/development/python-modules/sqlalchemy/default.nix) - sqlalchemy = final.buildPythonPackage rec { - pname = "SQLAlchemy"; - version = "1.3.24"; - format = "setuptools"; + python = python3; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; - }; - - postInstall = '' - sed -e 's:--max-worker-restart=5::g' -i setup.cfg - ''; - - # tests are pretty annoying to set up for this version, and these dependency overrides are already long enough - doCheck = false; - }; - }; - }; - - maubot = python.pkgs.buildPythonPackage rec { + maubot = python.pkgs.buildPythonApplication (finalAttrs: { pname = "maubot"; version = "0.6.0"; - format = "setuptools"; + pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-ZXwyctTjKg1ssYE6Ehc1s1DPhWyc08dIQ4MQz6EQXGg="; }; @@ -58,7 +29,11 @@ let }) ]; - propagatedBuildInputs = + build-system = with python.pkgs; [ + setuptools + ]; + + dependencies = with python.pkgs; [ # requirements.txt @@ -76,16 +51,12 @@ let colorama questionary jinja2 - setuptools ] # optional-requirements.txt ++ lib.optionals encryptionSupport [ python-olm pycryptodome unpaddedbase64 - ] - ++ lib.optionals sqliteSupport [ - sqlalchemy ]; # used for plugin tests @@ -98,6 +69,11 @@ let rm $out/example-config.yaml ''; + pythonRelaxDeps = [ + "bcrypt" + "ruamel.yaml" + ]; + pythonImportsCheck = [ "maubot" ]; @@ -111,7 +87,7 @@ let in { tests = { - simple = runCommand "${pname}-tests" { } '' + simple = runCommand "${finalAttrs.pname}-tests" { } '' ${maubot}/bin/mbc --help > $out ''; }; @@ -135,7 +111,7 @@ let meta = { description = "Plugin-based Matrix bot system written in Python"; homepage = "https://maubot.xyz/"; - changelog = "https://github.com/maubot/maubot/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/maubot/maubot/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.agpl3Plus; # Presumably, people running "nix run nixpkgs#maubot" will want to run the tool # for interacting with Maubot rather than Maubot itself, which should be used as @@ -143,7 +119,7 @@ let mainProgram = "mbc"; maintainers = with lib.maintainers; [ chayleaf ]; }; - }; + }); in maubot diff --git a/pkgs/development/python-modules/maubot/plugins/default.nix b/pkgs/by-name/ma/maubot/plugins/default.nix similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/default.nix rename to pkgs/by-name/ma/maubot/plugins/default.nix diff --git a/pkgs/development/python-modules/maubot/plugins/generated.json b/pkgs/by-name/ma/maubot/plugins/generated.json similarity index 100% rename from pkgs/development/python-modules/maubot/plugins/generated.json rename to pkgs/by-name/ma/maubot/plugins/generated.json diff --git a/pkgs/development/python-modules/maubot/plugins/generated.nix b/pkgs/by-name/ma/maubot/plugins/generated.nix similarity index 92% rename from pkgs/development/python-modules/maubot/plugins/generated.nix rename to pkgs/by-name/ma/maubot/plugins/generated.nix index 9e7bf10ac8c3..d463de5e5d48 100644 --- a/pkgs/development/python-modules/maubot/plugins/generated.nix +++ b/pkgs/by-name/ma/maubot/plugins/generated.nix @@ -28,8 +28,11 @@ lib.flip builtins.mapAttrs json ( dash = builtins.replaceStrings [ "_" ] [ "-" ] packageName; lowerDash = builtins.replaceStrings [ "_" ] [ "-" ] lower; in - python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} - or python3.pkgs.${lowerDash} or null + if lower == "maubot" then + null + else + python3.pkgs.${packageName} or python3.pkgs.${lower} or python3.pkgs.${dash} + or python3.pkgs.${lowerDash} or null ) (builtins.filter (x: x != "maubot" && x != null) deps); reqDeps = resolveDeps (lib.toList (manifest.dependencies or null)); diff --git a/pkgs/development/python-modules/maubot/plugins/update.py b/pkgs/by-name/ma/maubot/plugins/update.py similarity index 97% rename from pkgs/development/python-modules/maubot/plugins/update.py rename to pkgs/by-name/ma/maubot/plugins/update.py index cf154d809968..4e177fd5b42e 100755 --- a/pkgs/development/python-modules/maubot/plugins/update.py +++ b/pkgs/by-name/ma/maubot/plugins/update.py @@ -213,8 +213,8 @@ def main(): for plugin_name in os.listdir(directory): process_repo(os.path.join(directory, plugin_name), official) - if os.path.isdir("pkgs/development/python-modules/maubot/plugins"): - generated = "pkgs/development/python-modules/maubot/plugins/generated.json" + if os.path.isdir("pkgs/by-name/ma/maubot/plugins"): + generated = "pkgs/by-name/ma/maubot/plugins/generated.json" else: script_dir = os.path.dirname(os.path.realpath(__file__)) generated = os.path.join(script_dir, "generated.json") diff --git a/pkgs/development/python-modules/maubot/wrapper.nix b/pkgs/by-name/ma/maubot/wrapper.nix similarity index 100% rename from pkgs/development/python-modules/maubot/wrapper.nix rename to pkgs/by-name/ma/maubot/wrapper.nix diff --git a/pkgs/by-name/ma/mautrix-meta/package.nix b/pkgs/by-name/ma/mautrix-meta/package.nix index 2d264f144cd0..81703b68f81f 100644 --- a/pkgs/by-name/ma/mautrix-meta/package.nix +++ b/pkgs/by-name/ma/mautrix-meta/package.nix @@ -15,8 +15,8 @@ buildGoModule rec { pname = "mautrix-meta"; - version = "26.05.1"; - tag = "v0.2605.1"; + version = "26.07"; + tag = "v0.2607.0"; subPackages = [ "cmd/mautrix-meta" ]; @@ -24,13 +24,13 @@ buildGoModule rec { owner = "mautrix"; repo = "meta"; inherit tag; - hash = "sha256-Lc4DfZ1lznbTIKWi3SMbdOAefCoa9unUvvQlsP6ZdRo="; + hash = "sha256-/NwO6B3IevmkP6nOgZ+Zjg12PvY/cGmH++7pKsJjaAk="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-+i45bXBhlXPXX24VMS9IJLLX+i4VPnqy5RAH4j88sTA="; + vendorHash = "sha256-ykTk6JQ6cMBH0HYK7n1FWxhAJkD7HVKrg9HChtvuCMk="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/mautrix-signal/package.nix b/pkgs/by-name/ma/mautrix-signal/package.nix index c0c7e9978038..27d3f2040855 100644 --- a/pkgs/by-name/ma/mautrix-signal/package.nix +++ b/pkgs/by-name/ma/mautrix-signal/package.nix @@ -20,14 +20,14 @@ let in buildGoModule rec { pname = "mautrix-signal"; - version = "26.05"; - tag = "v0.2605.0"; + version = "26.07"; + tag = "v0.2607.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "signal"; inherit tag; - hash = "sha256-IGDVfauU+zRbwEN6FdI9t5TjnKAm22NsuxiUiDPhK2Q="; + hash = "sha256-l6IIL2bClC6t5+P0/AkFIjkD/eDpQnnmA8x4i5ROaY4="; }; buildInputs = @@ -46,7 +46,7 @@ buildGoModule rec { CGO_LDFLAGS = toString [ cppStdLib ]; }; - vendorHash = "sha256-Njl4kwhx+vlqQI8CeA8gfanEKClvMefoM3Sy3UUYllc="; + vendorHash = "sha256-0ifGza94s4+ED5OrlrqoDKIDZIYJWJhB2q3LJRpKiJs="; ldflags = [ "-X" diff --git a/pkgs/by-name/ma/mautrix-slack/package.nix b/pkgs/by-name/ma/mautrix-slack/package.nix index 633cf027c05e..4a678bc4e146 100644 --- a/pkgs/by-name/ma/mautrix-slack/package.nix +++ b/pkgs/by-name/ma/mautrix-slack/package.nix @@ -14,17 +14,17 @@ }: buildGoModule rec { pname = "mautrix-slack"; - version = "26.05"; - tag = "v0.2605.0"; + version = "26.07"; + tag = "v0.2607.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "slack"; inherit tag; - hash = "sha256-v8Pinib2SJo5x3F1xYQno4kwzckMjoCi1iiPjJigUnc="; + hash = "sha256-ccUw9yspgZp4EUkv5WDBt4mAE1bez7iuPQ1CofjxjDw="; }; - vendorHash = "sha256-DNsDK48/NWylJegqI42/mbbIcSURp1VBXPKVtdq6uak="; + vendorHash = "sha256-Q0KQ+azkJq5+qJiY4cgTObpJZa7uWOBZ3BNZnJOQ4TE="; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; diff --git a/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch new file mode 100644 index 000000000000..bcacda11ca52 --- /dev/null +++ b/pkgs/by-name/ma/mautrix-telegram/0002-use-importlib-resources.patch @@ -0,0 +1,36 @@ +diff --git a/mautrix_telegram/web/public/__init__.py b/mautrix_telegram/web/public/__init__.py +index cde3735..d911779 100644 +--- a/mautrix_telegram/web/public/__init__.py ++++ b/mautrix_telegram/web/public/__init__.py +@@ -23,7 +23,7 @@ import time + + from aiohttp import web + from mako.template import Template +-import pkg_resources ++from importlib.resources import files + + from mautrix.types import UserID + from mautrix.util.signed_token import sign_token, verify_token +@@ -45,11 +45,11 @@ class PublicBridgeWebsite(AuthAPI): + self.secret_key = "".join(random.choices(string.ascii_lowercase + string.digits, k=64)) + + self.login = Template( +- pkg_resources.resource_string("mautrix_telegram", "web/public/login.html.mako") ++ files("mautrix_telegram").joinpath("web/public/login.html.mako").read_bytes() + ) + + self.mx_login = Template( +- pkg_resources.resource_string("mautrix_telegram", "web/public/matrix-login.html.mako") ++ files("mautrix_telegram").joinpath("web/public/matrix-login.html.mako").read_bytes() + ) + + self.app = web.Application(loop=loop) +@@ -58,7 +58,7 @@ class PublicBridgeWebsite(AuthAPI): + self.app.router.add_route("GET", "/matrix-login", self.get_matrix_login) + self.app.router.add_route("POST", "/matrix-login", self.post_matrix_login) + self.app.router.add_static( +- "/", pkg_resources.resource_filename("mautrix_telegram", "web/public/") ++ "/", str(files("mautrix_telegram").joinpath("web/public/")) + ) + + def make_token(self, mxid: str, endpoint: str = "/login", expires_in: int = 900) -> str: diff --git a/pkgs/by-name/ma/mautrix-telegram/package.nix b/pkgs/by-name/ma/mautrix-telegram/package.nix index 4a80fc9c9b36..2f6546a74b33 100644 --- a/pkgs/by-name/ma/mautrix-telegram/package.nix +++ b/pkgs/by-name/ma/mautrix-telegram/package.nix @@ -3,24 +3,43 @@ fetchPypi, fetchFromGitHub, python3, + openssl, withE2BE ? true, }: let - tulir-telethon = python3.pkgs.telethon.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "1.99.0a6"; - pname = "tulir_telethon"; - src = fetchFromGitHub { - owner = "tulir"; - repo = "Telethon"; - tag = "v${finalAttrs.version}"; - hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; - }; - dontUsePytestCheck = true; - } - ); + # tulir-telethon is a fork of telethon used only by mautrix-telegram. It is + # built standalone rather than via telethon.overrideAttrs so it does not + # inherit telethon's `disabled = pythonAtLeast "3.14"` (which exists only + # because telethon's *tests* fail on 3.14). This fork skips the test suite. + # + # Kept as a local let binding rather than a top-level package: the upstream + # Python version is EOL (being rewritten in Go), so splitting it out would + # only add maintenance surface for code that will soon be replaced. + tulir-telethon = python3.pkgs.buildPythonPackage { + pname = "tulir_telethon"; + version = "1.99.0a6"; + pyproject = true; + src = fetchFromGitHub { + owner = "tulir"; + repo = "Telethon"; + tag = "v1.99.0a6"; + hash = "sha256-ulnA+xKbZDOTzXYmF9oBWNBNhgxSiF+mKx1ijoCyo/w="; + }; + postPatch = '' + substituteInPlace telethon/crypto/libssl.py --replace-fail \ + "ctypes.util.find_library('ssl')" "'${lib.getLib openssl}/lib/libssl.so'" + ''; + build-system = [ + python3.pkgs.setuptools + ]; + dependencies = with python3.pkgs; [ + pyaes + rsa + ]; + dontUsePytestCheck = true; + }; in python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mautrix-telegram"; @@ -36,7 +55,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { build-system = with python3.pkgs; [ setuptools ]; - patches = [ ./0001-Re-add-entrypoint.patch ]; + patches = [ + ./0001-Re-add-entrypoint.patch + ./0002-use-importlib-resources.patch + ]; pythonRelaxDeps = [ "mautrix" diff --git a/pkgs/by-name/ma/mautrix-whatsapp/package.nix b/pkgs/by-name/ma/mautrix-whatsapp/package.nix index 3863bf8b3541..237445a9e328 100644 --- a/pkgs/by-name/ma/mautrix-whatsapp/package.nix +++ b/pkgs/by-name/ma/mautrix-whatsapp/package.nix @@ -14,20 +14,20 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "26.05"; - tag = "v0.2605.0"; + version = "26.07"; + tag = "v0.2607.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; inherit tag; - hash = "sha256-WlVfGQoP9e/wl98hUJei8O2JMcOKijoEY8XuU/z69Qk="; + hash = "sha256-cl3nJY9ui9J9fE9T1hBUV/o8lH0usrsUcpj9OwXxgtY="; }; buildInputs = lib.optional (!withGoolm) olm; tags = lib.optional withGoolm "goolm"; - vendorHash = "sha256-Hi/dZHJHoTTCnxLXgbkcYzuzis4fl5kxb5wMd9fKTY8="; + vendorHash = "sha256-fVs5su6UkjvQEkoWJH6WL1FCZNdwj0jzrjfpbWOHWDU="; ldflags = [ "-s" diff --git a/pkgs/by-name/ma/maven/build-maven-package.nix b/pkgs/by-name/ma/maven/build-maven-package.nix index afa25872e976..eb14f9904eec 100644 --- a/pkgs/by-name/ma/maven/build-maven-package.nix +++ b/pkgs/by-name/ma/maven/build-maven-package.nix @@ -121,6 +121,7 @@ let -o -name resolver-status.properties \ -o -name _remote.repositories \) \ -delete + rm -rf $out/.m2/.meta runHook postInstall ''; diff --git a/pkgs/by-name/ma/maven/package.nix b/pkgs/by-name/ma/maven/package.nix index a8379d4f5a97..43c4799a1254 100644 --- a/pkgs/by-name/ma/maven/package.nix +++ b/pkgs/by-name/ma/maven/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "maven"; - version = "3.9.12"; + version = "3.9.16"; src = fetchurl { url = "mirror://apache/maven/maven-3/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; - hash = "sha256-+iyZSHKSlsI6/Rj9AakPYs3aCaRhkbVKi8N2TC7ugS4="; + hash = "sha256-gP/KIq7Z6LlxOiMvM5T9gdfyAyLfde/bKwR9vT46I7s="; }; sourceRoot = "."; @@ -47,17 +47,26 @@ stdenvNoCC.mkDerivation (finalAttrs: { // { overrideMavenAttrs = newArgs: makeOverridableMavenPackage mavenRecipe (overrideWith newArgs); }; + + # Exposed so other Maven versions (e.g. maven_4) can reuse the builder + # without duplicating build-maven-package.nix. + mkBuildMavenPackage = + maven: + makeOverridableMavenPackage ( + callPackage ./build-maven-package.nix { + inherit maven; + } + ); in { buildMaven = callPackage ./build-maven.nix { maven = finalAttrs.finalPackage; }; - buildMavenPackage = makeOverridableMavenPackage ( - callPackage ./build-maven-package.nix { - maven = finalAttrs.finalPackage; - } - ); + inherit mkBuildMavenPackage; + + buildMavenPackage = mkBuildMavenPackage finalAttrs.finalPackage; + tests = { version = testers.testVersion { package = finalAttrs.finalPackage; diff --git a/pkgs/by-name/ma/maven_4/package.nix b/pkgs/by-name/ma/maven_4/package.nix new file mode 100644 index 000000000000..9a9b151302f7 --- /dev/null +++ b/pkgs/by-name/ma/maven_4/package.nix @@ -0,0 +1,82 @@ +{ + lib, + fetchurl, + jdk25_headless, + makeWrapper, + maven, + stdenvNoCC, + testers, +}: +let + # Maven 4 defaults to the latest LTS JDK. Bump this binding to change it. + jdk_headless = jdk25_headless; +in +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "maven"; + version = "4.0.0-rc-5"; + + src = fetchurl { + url = "mirror://apache/maven/maven-4/${finalAttrs.version}/binaries/apache-maven-${finalAttrs.version}-bin.tar.gz"; + hash = "sha256-7OalyZ09BBx25/7RgU656jogoSC8s8I1pz0sTo2xbKE="; + }; + + sourceRoot = "."; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out/maven + cp -r apache-maven-${finalAttrs.version}/* $out/maven + + makeWrapper $out/maven/bin/mvn $out/bin/mvn \ + --set-default JAVA_HOME "${jdk_headless}" + makeWrapper $out/maven/bin/mvnDebug $out/bin/mvnDebug \ + --set-default JAVA_HOME "${jdk_headless}" + + runHook postInstall + ''; + + passthru = { + # Reuse maven's builder so build-maven-package.nix is not duplicated. + buildMavenPackage = maven.mkBuildMavenPackage finalAttrs.finalPackage; + + tests = { + version = testers.testVersion { + package = finalAttrs.finalPackage; + command = '' + env MAVEN_OPTS="-Dmaven.repo.local=$TMPDIR/m2" \ + mvn --version + ''; + }; + }; + }; + + meta = { + homepage = "https://maven.apache.org/"; + description = "Build automation tool (used primarily for Java projects)"; + longDescription = '' + Apache Maven is a software project management and comprehension + tool. Based on the concept of a project object model (POM), Maven can + manage a project's build, reporting and documentation from a central piece + of information. + ''; + changelog = "https://maven.apache.org/docs/${finalAttrs.version}/release-notes.html"; + sourceProvenance = with lib.sourceTypes; [ + binaryBytecode + binaryNativeCode + ]; + license = lib.licenses.asl20; + mainProgram = "mvn"; + maintainers = with lib.maintainers; [ + tricktron + britter + ]; + teams = [ lib.teams.java ]; + inherit (jdk_headless.meta) platforms; + }; +}) diff --git a/pkgs/applications/science/robotics/mavproxy/default.nix b/pkgs/by-name/ma/mavproxy/package.nix similarity index 100% rename from pkgs/applications/science/robotics/mavproxy/default.nix rename to pkgs/by-name/ma/mavproxy/package.nix diff --git a/pkgs/by-name/ma/mawk/package.nix b/pkgs/by-name/ma/mawk/package.nix index 7de0684d118c..249c58deaba8 100644 --- a/pkgs/by-name/ma/mawk/package.nix +++ b/pkgs/by-name/ma/mawk/package.nix @@ -21,10 +21,15 @@ stdenv.mkDerivation (finalAttrs: { depsBuildBuild = [ buildPackages.stdenv.cc ]; + hardeningDisable = [ + "strictflexarrays1" + ]; + passthru = { tests.version = testers.testVersion { package = finalAttrs.finalPackage; command = "mawk -W version"; + version = lib.replaceString "-" " " finalAttrs.version; }; updateScript = directoryListingUpdater { inherit (finalAttrs) pname version; diff --git a/pkgs/by-name/ma/maxfetch/package.nix b/pkgs/by-name/ma/maxfetch/package.nix index 78a54246453d..c873f828bd34 100644 --- a/pkgs/by-name/ma/maxfetch/package.nix +++ b/pkgs/by-name/ma/maxfetch/package.nix @@ -13,7 +13,7 @@ stdenvNoCC.mkDerivation { version = "unstable-2023-07-31"; src = fetchFromGitHub { - owner = "jobcmax"; + owner = "natewhar"; repo = "maxfetch"; rev = "17baa4047073e20572403b70703c69696af6b68d"; hash = "sha256-LzOhrFFjGs9GIDjk1lUFKhlnzJuEUrKjBcv1eT3kaY8="; @@ -37,7 +37,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Nice fetching program written in sh"; - homepage = "https://github.com/jobcmax/maxfetch"; + homepage = "https://github.com/natewhar/maxfetch"; license = lib.licenses.gpl2Plus; mainProgram = "maxfetch"; maintainers = with lib.maintainers; [ jtbx ]; diff --git a/pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch b/pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch deleted file mode 100644 index 008fe725fa89..000000000000 --- a/pkgs/by-name/ma/maxima/5.47.0-CVE-2024-34490.patch +++ /dev/null @@ -1,86 +0,0 @@ -Based on upstream https://sourceforge.net/p/maxima/code/ci/51704ccb090f6f971b641e4e0b7c1c22c4828bf7/ -adjusted to apply to 5.47.0 - -diff --git a/src/gnuplot_def.lisp b/src/gnuplot_def.lisp -index 80c174bd5..6fdc8da6d 100644 ---- a/src/gnuplot_def.lisp -+++ b/src/gnuplot_def.lisp -@@ -286,7 +286,7 @@ - (format nil "set term postscript eps color solid lw 2 size 16.4 cm, 12.3 cm font \",24\" ~a" gstrings))) - (if (getf plot-options :gnuplot_out_file) - (setq out-file (getf plot-options :gnuplot_out_file)) -- (setq out-file "maxplot.ps"))) -+ (setq out-file (format nil "~a.ps" (random-name 16))))) - ((eq (getf plot-options :gnuplot_term) '$dumb) - (if (getf plot-options :gnuplot_dumb_term_command) - (setq terminal-command -@@ -294,7 +294,7 @@ - (setq terminal-command "set term dumb 79 22")) - (if (getf plot-options :gnuplot_out_file) - (setq out-file (getf plot-options :gnuplot_out_file)) -- (setq out-file "maxplot.txt"))) -+ (setq out-file (format nil "~a.txt" (random-name 16))))) - ((eq (getf plot-options :gnuplot_term) '$default) - (if (getf plot-options :gnuplot_default_term_command) - (setq terminal-command -diff --git a/src/plot.lisp b/src/plot.lisp -index fb2b3136b..8877f7025 100644 ---- a/src/plot.lisp -+++ b/src/plot.lisp -@@ -1755,16 +1755,24 @@ plot3d([cos(y)*(10.0+6*cos(x)), sin(y)*(10.0+6*cos(x)),-6*sin(x)], - - (defvar $xmaxima_plot_command "xmaxima") - -+;; random-file-name -+;; Creates a random word of 'count' alphanumeric characters -+(defun random-name (count) -+ (let ((chars "0123456789abcdefghijklmnopqrstuvwxyz") (name "")) -+ (setf *random-state* (make-random-state t)) -+ (dotimes (i count) -+ (setq name (format nil "~a~a" name (aref chars (random 36))))) -+ name)) -+ - (defun plot-set-gnuplot-script-file-name (options) - (let ((gnuplot-term (getf options :gnuplot_term)) - (gnuplot-out-file (getf options :gnuplot_out_file))) - (if (and (find (getf options :plot_format) '($gnuplot_pipes $gnuplot)) - (eq gnuplot-term '$default) gnuplot-out-file) - (plot-file-path gnuplot-out-file t options) -- (plot-file-path -- (format nil "maxout~d.~(~a~)" -- (getpid) -- (ensure-string (getf options :plot_format))) nil options)))) -+ (plot-file-path (format nil "~a.~a" (random-name 16) -+ (ensure-string (getf options :plot_format))) -+ nil options)))) - - (defun plot-temp-file0 (file &optional (preserve-file nil)) - (let ((filename -@@ -2577,9 +2585,13 @@ plot2d ( x^2+y^2 = 1, [x, -2, 2], [y, -2 ,2]); - (format dest "}~%")) - (format dest "}~%")) - -+; TODO: Check whether this function is still being used (villate 20240325) - (defun show-open-plot (ans file) - (cond ($show_openplot -- (with-open-file (st1 (plot-temp-file (format nil "maxout~d.xmaxima" (getpid))) :direction :output :if-exists :supersede) -+ (with-open-file -+ (st1 (plot-temp-file -+ (format nil "~a.xmaxima" (random-name 16))) -+ :direction :output :if-exists :supersede) - (princ ans st1)) - ($system (concatenate 'string *maxima-prefix* - (if (string= *autoconf-windows* "true") "\\bin\\" "/bin/") -diff --git a/src/xmaxima_def.lisp b/src/xmaxima_def.lisp -index b6513b564..5a13b6141 100644 ---- a/src/xmaxima_def.lisp -+++ b/src/xmaxima_def.lisp -@@ -431,7 +431,7 @@ - (format $pstream "}~%")))))) - - (defmethod plot-shipout ((plot xmaxima-plot) options &optional output-file) -- (let ((file (plot-file-path (format nil "maxout~d.xmaxima" (getpid))))) -+ (let ((file (plot-file-path (format nil "~a.xmaxima" (random-name 16))))) - (cond ($show_openplot - (with-open-file (fl - #+sbcl (sb-ext:native-namestring file) diff --git a/pkgs/by-name/ma/maxima/package.nix b/pkgs/by-name/ma/maxima/package.nix index ab65bdd92b12..da81ca504201 100644 --- a/pkgs/by-name/ma/maxima/package.nix +++ b/pkgs/by-name/ma/maxima/package.nix @@ -28,11 +28,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "maxima"; - version = "5.47.0"; + version = "5.49.0"; src = fetchurl { url = "mirror://sourceforge/maxima/maxima-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-kQQCGyT9U+jAOpg1CctC6TepJejAyFwzXXcJoU/UD3o="; + hash = "sha256-bUAaSqMHzTpanK3KT6lsTvDiT/laGLtqj4A+PSEUre4="; }; nativeBuildInputs = [ @@ -85,8 +85,6 @@ stdenv.mkDerivation (finalAttrs: { url = "https://raw.githubusercontent.com/sagemath/sage/07d6c37d18811e2b377a9689790a7c5e24da16ba/build/pkgs/maxima/patches/undoing_true_false_printing_patch.patch"; sha256 = "0fvi3rcjv6743sqsbgdzazy9jb6r1p1yq63zyj9fx42wd1hgf7yx"; }) - - ./5.47.0-CVE-2024-34490.patch ]; # The test suite is disabled since 5.42.2 because of the following issues: @@ -110,6 +108,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://sourceforge.net/p/maxima/code/ci/master/tree/changelogs/ChangeLog-${lib.versions.majorMinor finalAttrs.version}.md"; description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/ma/mayo/package.nix b/pkgs/by-name/ma/mayo/package.nix index 5baaa54006e6..3da00353fe45 100644 --- a/pkgs/by-name/ma/mayo/package.nix +++ b/pkgs/by-name/ma/mayo/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeOptionType "string" "Mayo_VersionMajor" (lib.versions.major finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionMinor" (lib.versions.minor finalAttrs.version)) (lib.cmakeOptionType "string" "Mayo_VersionPatch" (lib.versions.patch finalAttrs.version)) - (lib.cmakeBool "Mayo_BuildTests" finalAttrs.doCheck) + (lib.cmakeBool "Mayo_BuildTests" finalAttrs.finalPackage.doCheck) ] ++ lib.optional withAssimp "-DMayo_BuildPluginAssimp=ON"; diff --git a/pkgs/by-name/mb/mbedtls/4.nix b/pkgs/by-name/mb/mbedtls/4.nix index f49a6d54d403..bc20e80be986 100644 --- a/pkgs/by-name/mb/mbedtls/4.nix +++ b/pkgs/by-name/mb/mbedtls/4.nix @@ -1,4 +1,8 @@ -{ callPackage, fetchurl }: +{ + lib, + stdenv, + callPackage, +}: callPackage ./generic.nix { version = "4.1.0"; @@ -11,5 +15,11 @@ callPackage ./generic.nix { # * # * ./0001-fix-gcc14-build.patch + ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # Fixes build with GCC 15.3 on 32-bit platforms. + # See: https://github.com/Mbed-TLS/mbedtls/pull/10793 + # Manually forward-ported to v4 + ./fix-gcc153-32bit-v4.patch ]; } diff --git a/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit-v4.patch b/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit-v4.patch new file mode 100644 index 000000000000..f304018c0b3b --- /dev/null +++ b/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit-v4.patch @@ -0,0 +1,12 @@ +--- a/tf-psa-crypto/core/tf_psa_crypto_common.h ++++ b/tf-psa-crypto/core/tf_psa_crypto_common.h +@@ -332,7 +332,8 @@ static inline void mbedtls_xor_no_simd(unsigned char *r, + uint32_t x = mbedtls_get_unaligned_uint32(a + i) ^ mbedtls_get_unaligned_uint32(b + i); + mbedtls_put_unaligned_uint32(r + i, x); + } +-#if defined(__IAR_SYSTEMS_ICC__) ++#if defined(__IAR_SYSTEMS_ICC__) || \ ++ (defined(MBEDTLS_COMPILER_IS_GCC) && MBEDTLS_GCC_VERSION >= 150300) + if (n % 4 == 0) { + return; + } diff --git a/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit.patch b/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit.patch new file mode 100644 index 000000000000..c4015ecb4806 --- /dev/null +++ b/pkgs/by-name/mb/mbedtls/fix-gcc153-32bit.patch @@ -0,0 +1,14 @@ +diff --git a/library/common.h b/library/common.h +index 1f59b32426..8c756bcb07 100644 +--- a/library/common.h ++++ b/library/common.h +@@ -332,7 +332,8 @@ static inline void mbedtls_xor_no_simd(unsigned char *r, + uint32_t x = mbedtls_get_unaligned_uint32(a + i) ^ mbedtls_get_unaligned_uint32(b + i); + mbedtls_put_unaligned_uint32(r + i, x); + } +-#if defined(__IAR_SYSTEMS_ICC__) ++#if defined(__IAR_SYSTEMS_ICC__) || \ ++ (defined(MBEDTLS_COMPILER_IS_GCC) && MBEDTLS_GCC_VERSION >= 150300) + if (n % 4 == 0) { + return; + } diff --git a/pkgs/by-name/mb/mbedtls/package.nix b/pkgs/by-name/mb/mbedtls/package.nix index 44fde80fa51d..3bf8e310d0ba 100644 --- a/pkgs/by-name/mb/mbedtls/package.nix +++ b/pkgs/by-name/mb/mbedtls/package.nix @@ -1,4 +1,9 @@ -{ callPackage, fetchurl }: +{ + lib, + stdenv, + callPackage, + fetchurl, +}: callPackage ./generic.nix { version = "3.6.6"; @@ -14,5 +19,10 @@ callPackage ./generic.nix { url = "https://raw.githubusercontent.com/openwrt/openwrt/52b6c9247997e51a97f13bb9e94749bc34e2d52e/package/libs/mbedtls/patches/100-fix-gcc14-build.patch"; hash = "sha256-20bxGoUHkrOEungN3SamYKNgj95pM8IjbisNRh68Wlw="; }) + ] + ++ lib.optionals stdenv.hostPlatform.is32bit [ + # Fixes build with GCC 15.3 on 32-bit platforms. + # See: https://github.com/Mbed-TLS/mbedtls/pull/10793 + ./fix-gcc153-32bit.patch ]; } diff --git a/pkgs/by-name/mb/mbpfan/package.nix b/pkgs/by-name/mb/mbpfan/package.nix index ab0a660f07d5..10431052d0ae 100644 --- a/pkgs/by-name/mb/mbpfan/package.nix +++ b/pkgs/by-name/mb/mbpfan/package.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mbpfan"; version = "2.4.0"; src = fetchFromGitHub { - owner = "dgraziotin"; + owner = "linux-on-mac"; repo = "mbpfan"; rev = "v${finalAttrs.version}"; sha256 = "sha256-F9IWUcILOuLn5K4zRSU5jn+1Wk1xy0CONSI6JTXU2pA="; @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Daemon that uses input from coretemp module and sets the fan speed using the applesmc module"; mainProgram = "mbpfan"; - homepage = "https://github.com/dgraziotin/mbpfan"; + homepage = "https://github.com/linux-on-mac/mbpfan"; license = lib.licenses.gpl3; platforms = lib.platforms.linux; maintainers = [ ]; diff --git a/pkgs/by-name/mc/mcap-cli/package.nix b/pkgs/by-name/mc/mcap-cli/package.nix index 65fcd91a4a4b..96aa8e76e35e 100644 --- a/pkgs/by-name/mc/mcap-cli/package.nix +++ b/pkgs/by-name/mc/mcap-cli/package.nix @@ -77,7 +77,7 @@ buildGoModule { meta = { description = "MCAP CLI tool to inspect and fix MCAP files"; homepage = "https://github.com/foxglove/mcap"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ therishidesai ]; diff --git a/pkgs/by-name/mc/mcaselector/package.nix b/pkgs/by-name/mc/mcaselector/package.nix index 2c68d9a303cf..12fe6b32bbfb 100644 --- a/pkgs/by-name/mc/mcaselector/package.nix +++ b/pkgs/by-name/mc/mcaselector/package.nix @@ -13,11 +13,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "mcaselector"; - version = "2.7"; + version = "2.8"; src = fetchurl { url = "https://github.com/Querz/mcaselector/releases/download/${finalAttrs.version}/mcaselector-${finalAttrs.version}.jar"; - hash = "sha256-pdJIQmoZhIfvQAHMGy0+IjQviMjFOrNsI69PHLQ9WpE="; + hash = "sha256-ZFBfOe35ybXUfmZpgfgePDqInU8SKzBlr34mn0jlNCM="; }; dontUnpack = true; diff --git a/pkgs/by-name/mc/mcat-unwrapped/package.nix b/pkgs/by-name/mc/mcat-unwrapped/package.nix index 44cb06c81bae..08b15dc99396 100644 --- a/pkgs/by-name/mc/mcat-unwrapped/package.nix +++ b/pkgs/by-name/mc/mcat-unwrapped/package.nix @@ -9,16 +9,16 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mcat-unwrapped"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "Skardyy"; repo = "mcat"; tag = "v${finalAttrs.version}"; - hash = "sha256-zedVMX3JV0jHSUzSY3x9Olimy4Y6GrNVGRSc6Eev9ow="; + hash = "sha256-7QjnbdxUFeRDkIGnAcY2Wf8fLKuj1RuVbu0SUebOc5A="; }; - cargoHash = "sha256-szqXS2CRfHoCtt6Lq1DuVb199mIuf7HUPiN7fj5BGtc="; + cargoHash = "sha256-JnSycAz/jFs9JgA3tqYZn64yNK0bv5SXEYyUOXjC4ug="; nativeBuildInputs = [ installShellFiles diff --git a/pkgs/by-name/mc/mcp-gateway/package.nix b/pkgs/by-name/mc/mcp-gateway/package.nix index f44143cf8bfc..5824cd389793 100644 --- a/pkgs/by-name/mc/mcp-gateway/package.nix +++ b/pkgs/by-name/mc/mcp-gateway/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mcp-gateway"; - version = "2.12.2"; + version = "3.3.2"; src = fetchFromGitHub { owner = "MikkoParkkola"; repo = "mcp-gateway"; tag = "v${finalAttrs.version}"; - hash = "sha256-4zgWW9cWSdjOY7ECl7xdTlxtkmI86FfaYCjVTixSdSA="; + hash = "sha256-jSEstrmEdeQ7NzWCHCNZPBgBaroCbQ96oeQbZVxL5p0="; }; - cargoHash = "sha256-ncVF+wgkSWssgECvPF2Ug46nplBK47ggezUSZdJkwL4="; + cargoHash = "sha256-KZseznJdv28JbABgg4oV/Gj7y25JGdQ8UWq5KgzxVpk="; nativeInstallCheckInputs = [ versionCheckHook diff --git a/pkgs/by-name/mc/mcp-grafana/package.nix b/pkgs/by-name/mc/mcp-grafana/package.nix index 1cbef5c243a8..09e2c6a48648 100644 --- a/pkgs/by-name/mc/mcp-grafana/package.nix +++ b/pkgs/by-name/mc/mcp-grafana/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "mcp-grafana"; - version = "0.15.2"; + version = "0.17.2"; src = fetchFromGitHub { owner = "grafana"; repo = "mcp-grafana"; tag = "v${finalAttrs.version}"; - hash = "sha256-qjK8v3nUTGcBWdEF1hMKDRQtPKcYbZRU5+O8D89eZHI="; + hash = "sha256-8cImJIND4S3ISkfNBCdP05AgNuAJNKOCtI9o47MR7tw="; }; - vendorHash = "sha256-E7Uh5nG6elUhEa+4RCtgGrle0Py6TjRc+OOvjtik1D8="; + vendorHash = "sha256-SovR9UxTqN397oczKgJqlJ9iOFnCrZGqPWhhfcjSNPg="; ldflags = [ "-s" diff --git a/pkgs/by-name/mc/mcp-nixos/package.nix b/pkgs/by-name/mc/mcp-nixos/package.nix index 9216ba38d076..8a843fb2b5d1 100644 --- a/pkgs/by-name/mc/mcp-nixos/package.nix +++ b/pkgs/by-name/mc/mcp-nixos/package.nix @@ -1,7 +1,7 @@ { lib, - stdenv, fetchFromGitHub, + fetchpatch, python3Packages, }: @@ -17,6 +17,13 @@ python3Packages.buildPythonApplication (finalAttrs: { hash = "sha256-mWq9nnL4IGhUFkXJr8+t6BresOTDFS1caG8NuFqjrJg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/utensils/mcp-nixos/commit/0ef99b6a5674e60ca315dc55a0f458673bb1e4fa.patch"; + sha256 = "sha256-f57qS6V8mSv2kLKiudSG2enAofeUZwKvjfdowmGRIxw="; + }) + ]; + build-system = [ python3Packages.hatchling ]; dependencies = with python3Packages; [ @@ -40,9 +47,6 @@ python3Packages.buildPythonApplication (finalAttrs: { disabledTests = [ # Requires network access "test_valid_channel" - ] - ++ lib.optionals stdenv.hostPlatform.isDarwin [ - "test_read_text_file" ]; pythonImportsCheck = [ "mcp_nixos" ]; diff --git a/pkgs/by-name/mc/mcp-server-fetch/package.nix b/pkgs/by-name/mc/mcp-server-fetch/package.nix index 5ef4c68b2bbe..d4575f05da2e 100644 --- a/pkgs/by-name/mc/mcp-server-fetch/package.nix +++ b/pkgs/by-name/mc/mcp-server-fetch/package.nix @@ -6,7 +6,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-fetch"; - version = "2026.6.3"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { diff --git a/pkgs/by-name/mc/mcp-server-filesystem/package.nix b/pkgs/by-name/mc/mcp-server-filesystem/package.nix index 190cba24a12d..c8c0cfa81c1b 100644 --- a/pkgs/by-name/mc/mcp-server-filesystem/package.nix +++ b/pkgs/by-name/mc/mcp-server-filesystem/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "mcp-server-filesystem"; - version = "2026.1.26"; + version = "2026.7.4"; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk="; + hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { dontNpmPrune = true; npmWorkspace = "src/filesystem"; - npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE="; + npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k="; # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed postInstall = '' diff --git a/pkgs/by-name/mc/mcp-server-git/package.nix b/pkgs/by-name/mc/mcp-server-git/package.nix index 2d36a3921180..98140ce96260 100644 --- a/pkgs/by-name/mc/mcp-server-git/package.nix +++ b/pkgs/by-name/mc/mcp-server-git/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-git"; - version = "2026.6.3"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s="; + hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs="; }; sourceRoot = "${finalAttrs.src.name}/src/git/"; diff --git a/pkgs/by-name/mc/mcp-server-memory/package.nix b/pkgs/by-name/mc/mcp-server-memory/package.nix index 8ce6a1dd34e9..941f884c76a4 100644 --- a/pkgs/by-name/mc/mcp-server-memory/package.nix +++ b/pkgs/by-name/mc/mcp-server-memory/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "mcp-server-memory"; - version = "2026.1.26"; + version = "2026.7.4"; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk="; + hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { dontNpmPrune = true; npmWorkspace = "src/memory"; - npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE="; + npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k="; # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed postInstall = '' diff --git a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix index 019fbab0393d..474ccdd71d47 100644 --- a/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix +++ b/pkgs/by-name/mc/mcp-server-sequential-thinking/package.nix @@ -7,13 +7,13 @@ buildNpmPackage (finalAttrs: { pname = "mcp-server-sequential-thinking"; - version = "2026.1.26"; + version = "2026.7.4"; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-uULXUEHFZpYm/fmF6PkOFCxS+B+0q3dMveLG+3JHrhk="; + hash = "sha256-rBdJoTC1wOEMbAAeSccFqaHL7lacf2SFfxZ/pp2Lx90="; }; nativeBuildInputs = [ @@ -22,7 +22,7 @@ buildNpmPackage (finalAttrs: { dontNpmPrune = true; npmWorkspace = "src/sequentialthinking"; - npmDepsHash = "sha256-jmz4JdpeHH07vJQFntBwrENbJaIcOuZMb7+qf497VOE="; + npmDepsHash = "sha256-KhlTXcS+VDSPGnEus9fA0xhIxfTGwX1Cr5hbxFvdc2k="; # TODO: revisit this when https://github.com/NixOS/nixpkgs/pull/333759 has landed postInstall = '' diff --git a/pkgs/by-name/mc/mcp-server-time/package.nix b/pkgs/by-name/mc/mcp-server-time/package.nix index a2542902074f..33e53dc6bac0 100644 --- a/pkgs/by-name/mc/mcp-server-time/package.nix +++ b/pkgs/by-name/mc/mcp-server-time/package.nix @@ -6,14 +6,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mcp-server-time"; - version = "2026.6.3"; + version = "2026.7.10"; pyproject = true; src = fetchFromGitHub { owner = "modelcontextprotocol"; repo = "servers"; tag = finalAttrs.version; - hash = "sha256-C5wE5ChDI1w4fh5LC1gV9WFuKMVfwvSnS18Fi2s+t+s="; + hash = "sha256-ORihWA8Xx7WAPo2+vRPpYNF9CGfc1sjmW+NfUKBGzxs="; }; sourceRoot = "${finalAttrs.src.name}/src/time/"; diff --git a/pkgs/by-name/mc/mcphost/package.nix b/pkgs/by-name/mc/mcphost/package.nix deleted file mode 100644 index 2e13e24e199a..000000000000 --- a/pkgs/by-name/mc/mcphost/package.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - lib, - buildGoModule, - fetchFromGitHub, -}: - -buildGoModule (finalAttrs: { - pname = "mcphost"; - version = "0.34.0"; - - src = fetchFromGitHub { - owner = "mark3labs"; - repo = "mcphost"; - tag = "v${finalAttrs.version}"; - hash = "sha256-xqz6K0e/LSX77qpkmwmqgStPAfkkJdqKKDZOeYWnrRo="; - }; - - vendorHash = "sha256-mzrCIDMr1INzwqktZIc9m0SgynQC0FpyVlSlAba//sY="; - - doCheck = false; - - meta = { - description = "CLI host application that enables Large Language Models (LLMs) to interact with external tools through the Model Context Protocol (MCP)"; - homepage = "https://github.com/mark3labs/mcphost"; - license = lib.licenses.mit; - maintainers = [ ]; - mainProgram = "mcphost"; - }; -}) diff --git a/pkgs/by-name/mc/mcporter/package.nix b/pkgs/by-name/mc/mcporter/package.nix index 68cfd3f26480..c58414e918d3 100644 --- a/pkgs/by-name/mc/mcporter/package.nix +++ b/pkgs/by-name/mc/mcporter/package.nix @@ -15,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mcporter"; - version = "0.11.3"; + version = "0.12.3"; src = fetchFromGitHub { - owner = "steipete"; + owner = "openclaw"; repo = "mcporter"; tag = "v${finalAttrs.version}"; - hash = "sha256-xBH0OMrAQ3eVqBczzJnbaxbBLo2mRc6cCZBb5w4SkhI="; + hash = "sha256-dfbNyvIbdhZOLuwRDNLqUJHVeMEemioanktD6nL0Pmk="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-Ga1M3SQBaQnODQXh4+AXQ0FVCr7e8wPpbaV1ffQYNLM="; + hash = "sha256-EGG9ycEMssFE4MOiXL5YuCRiXEaP//3boceR3d7/VQo="; }; nativeBuildInputs = [ @@ -58,8 +58,8 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "TypeScript runtime and CLI for connecting to configured Model Context Protocol servers"; - homepage = "https://github.com/steipete/mcporter"; - changelog = "https://github.com/steipete/mcporter/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/openclaw/mcporter"; + changelog = "https://github.com/openclaw/mcporter/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ mkg20001 ]; mainProgram = "mcporter"; diff --git a/pkgs/by-name/mc/mctc-lib/package.nix b/pkgs/by-name/mc/mctc-lib/package.nix index 3473b3dbaa7e..0363ab2988cf 100644 --- a/pkgs/by-name/mc/mctc-lib/package.nix +++ b/pkgs/by-name/mc/mctc-lib/package.nix @@ -10,6 +10,7 @@ pkg-config, python3, jonquil, + checkPhaseThreadLimitHook, }: assert ( @@ -43,6 +44,7 @@ stdenv.mkDerivation (finalAttrs: { gfortran pkg-config python3 + checkPhaseThreadLimitHook ] ++ lib.optionals (buildType == "meson") [ meson @@ -50,7 +52,9 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optional (buildType == "cmake") cmake; - buildInputs = [ + propagatedBuildInputs = [ + # jonquil (and the toml-f it propagates) appears in mctc-lib.pc's Requires.private, so it must + # be propagated for pkg-config consumers (e.g. dftd4) to resolve mctc-lib jonquil ]; @@ -61,10 +65,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - postPatch = '' patchShebangs --build config/install-mod.py ''; diff --git a/pkgs/by-name/md/md-tui/package.nix b/pkgs/by-name/md/md-tui/package.nix index e03046cbdc53..cc1949debea5 100644 --- a/pkgs/by-name/md/md-tui/package.nix +++ b/pkgs/by-name/md/md-tui/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "md-tui"; - version = "0.10.1"; + version = "0.10.3"; __structuredAttrs = true; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "henriklovhaug"; repo = "md-tui"; tag = "v${finalAttrs.version}"; - hash = "sha256-bFL84y0735L93x0nWkKAAmTDMdZzs5DDoxqbQhgXUMQ="; + hash = "sha256-1E3R1pR5f65rMMEa3Wh2I1W7JV+WgJuVN23XNpaxWTc="; }; - cargoHash = "sha256-xR9bWWDxerP2zGAb43ZWONLcsbmUn8KzMXwDEmrjioU="; + cargoHash = "sha256-IjT5YnU9hJd9trsMEM/lDtZIWd0XFHFesq0XF+j9zPg="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/md/md4c/0001-fix-pkgconfig.patch b/pkgs/by-name/md/md4c/0001-fix-pkgconfig.patch deleted file mode 100644 index e0e9f3d96b2b..000000000000 --- a/pkgs/by-name/md/md4c/0001-fix-pkgconfig.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0ab8f5a6ee305cf4edcebfdc7b9eb5f98302de75 Mon Sep 17 00:00:00 2001 -From: Leif Middelschulte -Date: Fri, 17 Sep 2021 16:16:17 +0200 -Subject: [PATCH] pc.in: use _FULL_ variable variants - -Nix' cmake packaging handler replaces the CMAKE_INSTALL_INCLUDEDIR -with the absolute path. Which break package -portability (i.e. `prefix`-usage). ---- - src/md4c-html.pc.in | 6 ++---- - src/md4c.pc.in | 6 ++---- - 2 files changed, 4 insertions(+), 8 deletions(-) - -diff --git a/src/md4c-html.pc.in b/src/md4c-html.pc.in -index 504bb52..fec7df4 100644 ---- a/src/md4c-html.pc.in -+++ b/src/md4c-html.pc.in -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: @PROJECT_NAME@ HTML renderer - Description: Markdown to HTML converter library. -diff --git a/src/md4c.pc.in b/src/md4c.pc.in -index cd8842d..b5d81f8 100644 ---- a/src/md4c.pc.in -+++ b/src/md4c.pc.in -@@ -1,7 +1,5 @@ --prefix=@CMAKE_INSTALL_PREFIX@ --exec_prefix=@CMAKE_INSTALL_PREFIX@ --libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ --includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ -+libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: @PROJECT_NAME@ - Description: Markdown parser library with a SAX-like callback-based interface. --- -2.31.0 - diff --git a/pkgs/by-name/md/md4c/package.nix b/pkgs/by-name/md/md4c/package.nix index 10fe4712b78d..5447b89d4fb5 100644 --- a/pkgs/by-name/md/md4c/package.nix +++ b/pkgs/by-name/md/md4c/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "md4c"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "mity"; repo = "md4c"; rev = "release-${finalAttrs.version}"; - hash = "sha256-2/wi7nJugR8X2J9FjXJF1UDnbsozGoO7iR295/KSJng="; + hash = "sha256-rsNJlNLsmTEiAARqQ5TovNWmHNikMiRi8eEyn8o43ao="; }; outputs = [ @@ -24,13 +24,6 @@ stdenv.mkDerivation (finalAttrs: { "man" ]; - patches = [ - # We set CMAKE_INSTALL_LIBDIR to the absolute path in $out, so prefix and - # exec_prefix cannot be $out, too - # Use CMake's _FULL_ variables instead of `prefix` concatenation. - ./0001-fix-pkgconfig.patch - ]; - nativeBuildInputs = [ cmake pkg-config @@ -69,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { - Permissive license: MD4C is available under the MIT license. ''; changelog = "https://github.com/mity/md4c/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = [ ]; mainProgram = "md2html"; platforms = lib.platforms.all; diff --git a/pkgs/by-name/md/mdadm4/no-self-references.patch b/pkgs/by-name/md/mdadm4/no-self-references.patch deleted file mode 100644 index 3b3dc4d84609..000000000000 --- a/pkgs/by-name/md/mdadm4/no-self-references.patch +++ /dev/null @@ -1,124 +0,0 @@ -diff --git a/Makefile b/Makefile -index 2a51d813..a31ac48a 100644 ---- a/Makefile -+++ b/Makefile -@@ -63,6 +63,9 @@ endif - ifdef DEBIAN - CPPFLAGS += -DDEBIAN - endif -+ifdef NIXOS -+CPPFLAGS += -DNIXOS -+endif - ifdef DEFAULT_OLD_METADATA - CPPFLAGS += -DDEFAULT_OLD_METADATA - DEFAULT_METADATA=0.90 -@@ -129,6 +132,7 @@ endif - INSTALL = /usr/bin/install - DESTDIR = - BINDIR = /sbin -+INSTALL_BINDIR = ${BINDIR} - MANDIR = /usr/share/man - MAN4DIR = $(MANDIR)/man4 - MAN5DIR = $(MANDIR)/man5 -@@ -253,16 +257,16 @@ sha1.o : sha1.c sha1.h md5.h - install : install-bin install-man install-udev - - install-static : mdadm.static install-man -- $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(BINDIR)/mdadm -+ $(INSTALL) -D $(STRIP) -m 755 mdadm.static $(DESTDIR)$(INSTALL_BINDIR)/mdadm - - install-tcc : mdadm.tcc install-man -- $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(BINDIR)/mdadm -+ $(INSTALL) -D $(STRIP) -m 755 mdadm.tcc $(DESTDIR)$(INSTALL_BINDIR)/mdadm - - install-uclibc : mdadm.uclibc install-man -- $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(BINDIR)/mdadm -+ $(INSTALL) -D $(STRIP) -m 755 mdadm.uclibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm - - install-klibc : mdadm.klibc install-man -- $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(BINDIR)/mdadm -+ $(INSTALL) -D $(STRIP) -m 755 mdadm.klibc $(DESTDIR)$(INSTALL_BINDIR)/mdadm - - install-man: mdadm.8 md.4 mdadm.conf.5 mdmon.8 - $(INSTALL) -D -m 644 mdadm.8 $(DESTDIR)$(MAN8DIR)/mdadm.8 -@@ -305,7 +309,7 @@ install-bin: mdadm mdmon - $(INSTALL) -D $(STRIP) -m 755 mdmon $(DESTDIR)$(BINDIR)/mdmon - - uninstall: -- rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm -+ rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(INSTALL_BINDIR)/mdadm - - test: mdadm mdmon test_stripe swap_super raid6check - @echo "Please run './test' as root" -diff --git a/policy.c b/policy.c -index eee9ef63..9f916e9d 100644 ---- a/policy.c -+++ b/policy.c -@@ -817,12 +817,39 @@ char *find_rule(struct rule *rule, char *rule_type) - #define UDEV_RULE_FORMAT \ - "ACTION==\"add\", SUBSYSTEM==\"block\", " \ - "ENV{DEVTYPE}==\"%s\", ENV{ID_PATH}==\"%s\", " \ --"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n" -+"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n" - - #define UDEV_RULE_FORMAT_NOTYPE \ - "ACTION==\"add\", SUBSYSTEM==\"block\", " \ - "ENV{ID_PATH}==\"%s\", " \ --"RUN+=\"" BINDIR "/mdadm --incremental $env{DEVNAME}\"\n" -+"RUN+=\"%s/mdadm --incremental $env{DEVNAME}\"\n" -+ -+#ifdef NIXOS -+const char *get_mdadm_bindir(void) -+{ -+ static char *bindir = NULL; -+ if (bindir != NULL) { -+ return bindir; -+ } else { -+ int len; -+ bindir = xmalloc(1025); -+ len = readlink("/proc/self/exe", bindir, 1024); -+ if (len > 0) { -+ char *basename; -+ if ((basename = strrchr(bindir, '/')) != NULL) -+ *basename = '\0'; -+ else -+ *(bindir + len) = '\0'; -+ } else { -+ *bindir = '\0'; -+ } -+ return bindir; -+ } -+} -+#define SELF get_mdadm_bindir() -+#else -+#define SELF BINDIR -+#endif - - /* Write rule in the rule file. Use format from UDEV_RULE_FORMAT */ - int write_rule(struct rule *rule, int fd, int force_part) -@@ -836,9 +863,9 @@ int write_rule(struct rule *rule, int fd, int force_part) - if (force_part) - typ = type_part; - if (typ) -- snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth); -+ snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT, typ, pth, SELF); - else -- snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth); -+ snprintf(line, sizeof(line) - 1, UDEV_RULE_FORMAT_NOTYPE, pth, SELF); - return write(fd, line, strlen(line)) == (int)strlen(line); - } - -diff --git a/util.c b/util.c -index 3d05d074..e004a798 100644 ---- a/util.c -+++ b/util.c -@@ -1913,7 +1913,9 @@ int start_mdmon(char *devnm) - char pathbuf[1024]; - char *paths[4] = { - pathbuf, -+#ifndef NIXOS - BINDIR "/mdmon", -+#endif - "./mdmon", - NULL - }; diff --git a/pkgs/by-name/md/mdadm4/package.nix b/pkgs/by-name/md/mdadm4/package.nix index 2143acc494e5..a35b504f6234 100644 --- a/pkgs/by-name/md/mdadm4/package.nix +++ b/pkgs/by-name/md/mdadm4/package.nix @@ -15,27 +15,16 @@ stdenv.mkDerivation (finalAttrs: { pname = "mdadm"; - version = "4.4"; + version = "4.6"; src = fetchgit { url = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"; tag = "mdadm-${finalAttrs.version}"; - hash = "sha256-jGmc8fkJM0V9J7V7tQPXSF/WD0kzyEAloBAwaAFenS0="; + hash = "sha256-jFsVPJC4lcShkSwQCGjVdVkvk4q4weM7i5DzrLgpuSM="; }; patches = [ - ./no-self-references.patch ./fix-hardcoded-mapdir.patch - # Fixes build on musl - (fetchurl { - url = "https://raw.githubusercontent.com/void-linux/void-packages/e58d2b17d3c40faffc0d426aab00184f28d9dafa/srcpkgs/mdadm/patches/musl.patch"; - hash = "sha256-TIcQs+8RM5Q6Z8MHkI50kaJd7f9WdS/EVI16F7b2+SA="; - }) - # Fixes build on musl 1.2.5+ - (fetchurl { - url = "https://lore.kernel.org/linux-raid/20240220165158.3521874-1-raj.khem@gmail.com/raw"; - hash = "sha256-JOZ8n7zi+nq236NPpB4e2gUy8I3l3DbcoLhpeL73f98="; - }) ]; makeFlags = [ @@ -97,6 +86,7 @@ stdenv.mkDerivation (finalAttrs: { }; meta = { + changelog = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git/tree/CHANGELOG.md?h=${finalAttrs.src.tag}"; description = "Programs for managing RAID arrays under Linux"; homepage = "https://git.kernel.org/pub/scm/utils/mdadm/mdadm.git"; license = lib.licenses.gpl2Plus; diff --git a/pkgs/by-name/md/mdbook-bib/package.nix b/pkgs/by-name/md/mdbook-bib/package.nix index 8f6955dbba22..4c6816a923ee 100644 --- a/pkgs/by-name/md/mdbook-bib/package.nix +++ b/pkgs/by-name/md/mdbook-bib/package.nix @@ -8,17 +8,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-bib"; - version = "0.5.2"; + version = "0.5.3"; __structuredAttrs = true; src = fetchFromGitHub { owner = "francisco-perez-sorrosal"; repo = "mdbook-bib"; tag = "v${finalAttrs.version}"; - hash = "sha256-xgGJYnOYUuxHs2sXzYKSZd0jLm/x/PoPsNHQcWpXkn8="; + hash = "sha256-IhGwVnUYjnwZmZJkt1Z9yFlNcJ2EObnqFHmmfJNco/M="; }; - cargoHash = "sha256-QyP+Mw/95NvjaAkr5eoeC49nLXCE9/TMPIWahJayqBQ="; + cargoHash = "sha256-A1rOfXZP4rFtLX3pmLwB99FBws1wMotKnMPfqnYW9m0="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdbook-linkcheck2/package.nix b/pkgs/by-name/md/mdbook-linkcheck2/package.nix index d7375d7ded59..8a3acf3e211d 100644 --- a/pkgs/by-name/md/mdbook-linkcheck2/package.nix +++ b/pkgs/by-name/md/mdbook-linkcheck2/package.nix @@ -2,25 +2,39 @@ lib, fetchFromGitHub, rustPlatform, - testers, - mdbook-linkcheck2, + cacert, + versionCheckHook, + nix-update-script, }: + rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-linkcheck2"; - version = "0.12.0"; + version = "0.12.2"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "marxin"; repo = "mdbook-linkcheck2"; tag = "v${finalAttrs.version}"; - sha256 = "sha256-SvheBEIWiL1zdYeMQalbBeAQC86DycqV1/PTA+0S7Gg="; + hash = "sha256-D0pteKtmBDkqcaonbNzL6tyo97x+qQhn6oY88+4VGFE="; }; - cargoHash = "sha256-s4nvVHl/bViIxZfqc4SxSnCCYIY/hxy0C7f2/9ztqts="; + cargoHash = "sha256-XY1epCro/BqHm95HVP1eK0oVLSPYjD2hU7IdiEkgNMM="; - doCheck = false; # tries to access network to test broken web link functionality + propagatedNativeBuildInputs = [ cacert ]; - passthru.tests.version = testers.testVersion { package = mdbook-linkcheck2; }; + checkFlags = map (t: "--skip=${t}") [ + "check_all_links_in_a_valid_book" + "correctly_find_broken_links" + ]; + + # see https://github.com/NixOS/nixpkgs/pull/531531#pullrequestreview-4492334034 + # should be dropped in the next update + doInstallCheck = false; + nativeInstallCheckInputs = [ versionCheckHook ]; + + passthru.updateScript = nix-update-script { }; meta = { description = "Backend for mdbook which will check your links for you"; @@ -29,6 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { license = lib.licenses.mit; maintainers = with lib.maintainers; [ scandiravian + stepbrobd ]; }; }) diff --git a/pkgs/by-name/md/mdbook-open-on-gh/package.nix b/pkgs/by-name/md/mdbook-open-on-gh/package.nix index d922a63a13b8..841918c42094 100644 --- a/pkgs/by-name/md/mdbook-open-on-gh/package.nix +++ b/pkgs/by-name/md/mdbook-open-on-gh/package.nix @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "mdbook preprocessor to add a open-on-github link on every page"; mainProgram = "mdbook-open-on-gh"; homepage = "https://github.com/badboy/mdbook-open-on-gh"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ matthiasbeyer ]; }; }) diff --git a/pkgs/by-name/md/mdbook-plugins/package.nix b/pkgs/by-name/md/mdbook-plugins/package.nix index 226755d667eb..7d12e7811838 100644 --- a/pkgs/by-name/md/mdbook-plugins/package.nix +++ b/pkgs/by-name/md/mdbook-plugins/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdbook-plugins"; - version = "1.0.1"; + version = "1.0.4"; src = fetchFromGitHub { owner = "RustForWeb"; repo = "mdbook-plugins"; rev = "v${finalAttrs.version}"; - hash = "sha256-qV2ECcvhuLB4bvI7UYpnUr8MlOA0USyb1QrUxR+LXOM="; + hash = "sha256-Dv2HL8dLV8wOZp+Lhy5qgsZO9sZWOVVIhQZe6JE+F40="; }; - cargoHash = "sha256-Fhk4dtdOES+72/OBvhe/9WRk5sNzEuw3np84u13pEQ0="; + cargoHash = "sha256-5vyOxKhTbUFi1kUhm3OlhnEXoSYLdRMIWTTPSVXAvsA="; nativeBuildInputs = [ pkg-config diff --git a/pkgs/by-name/md/mdbook/package.nix b/pkgs/by-name/md/mdbook/package.nix index 66c14abfb130..3f55eea140de 100644 --- a/pkgs/by-name/md/mdbook/package.nix +++ b/pkgs/by-name/md/mdbook/package.nix @@ -8,7 +8,7 @@ installShellFiles, }: let - version = "0.5.2"; + version = "0.5.4"; in rustPlatform.buildRustPackage rec { inherit version; @@ -18,10 +18,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = "mdBook"; tag = "v${version}"; - hash = "sha256-gyjD47ZR9o2lIxipzesyJ6mxb9J9W+WS77TNWhKHP6U="; + hash = "sha256-1bUMFxPpb9H/pRdCOX0u8Tn8RPmJElDs7o9t5JtRFuU="; }; - cargoHash = "sha256-230KljOUSrDy8QCQki7jvJvdAsjVlUEjKDNVyTF4tWs="; + cargoHash = "sha256-OmlcPZuQ1RbyFrF5tuztucgtCA544UHJxEaXh/mfSHQ="; nativeBuildInputs = [ installShellFiles ]; @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage rec { mainProgram = "mdbook"; homepage = "https://github.com/rust-lang/mdBook"; changelog = "https://github.com/rust-lang/mdBook/blob/v${version}/CHANGELOG.md"; - license = [ lib.licenses.mpl20 ]; + license = lib.licenses.mpl20; maintainers = with lib.maintainers; [ Frostman matthiasbeyer diff --git a/pkgs/by-name/md/mdfried/package.nix b/pkgs/by-name/md/mdfried/package.nix index 2291edeeeba0..52eac913a73a 100644 --- a/pkgs/by-name/md/mdfried/package.nix +++ b/pkgs/by-name/md/mdfried/package.nix @@ -1,35 +1,69 @@ { lib, + stdenv, rustPlatform, fetchFromGitHub, pkg-config, chafa, + fontconfig, glib, + gnumake, + gperf, + libiconv, + python3, + unzip, + writeShellScriptBin, nix-update-script, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mdfried"; - version = "0.22.0"; + version = "0.22.4"; src = fetchFromGitHub { owner = "benjajaja"; repo = "mdfried"; tag = "v${finalAttrs.version}"; - hash = "sha256-zJSh5g1FkR/nqk2qj22Xo8qIOjwyF346PM4KOUOCBBo="; + hash = "sha256-Zcn1C8mXwljJ3HtYgYBPyU9cVHvoNBUn7qjqx45wMhE="; }; - cargoHash = "sha256-2wwaEKknnxX6QuE+6udHL2GTOuPpS1oqRI+b3aP0e1I="; + cargoHash = "sha256-Nt+oBl2HX/H/7j62VjaHrY29gpd2vouevBJO0W3AYAk="; + + buildFeatures = [ "pdf" ]; + + # Prevent updateAutotoolsGnuConfigScripts from modifying mupdf's vendored + # autotools files — doing so invalidates cargo's fingerprint for mupdf-sys + # and causes a rebuild that fails on read-only cargoArtifacts files. + updateAutotoolsGnuConfigScriptsPhase = "true"; nativeBuildInputs = [ pkg-config + rustPlatform.bindgenHook # for mupdf-sys bindgen + gperf # for mupdf vendored Makefile + python3 # for mupdf vendored Makefile + unzip # for mupdf vendored docx_template build + # mupdf-sys cp_r copies files from the read-only Nix store, preserving + # mode 444. make then fails to regenerate headers. Wrap make to chmod first. + (writeShellScriptBin "make" '' + chmod -R u+w . 2>/dev/null || true + exec ${lib.getExe gnumake} "$@" + '') ]; buildInputs = [ chafa - glib + fontconfig.dev # for font-kit (mupdf dep) + glib.dev # for glib-2.0.pc (mupdf needs glib.dev, chafa could do with just glib) + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + libiconv ]; + env = lib.optionalAttrs stdenv.hostPlatform.isDarwin { + CFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC"; + CXXFLAGS_aarch64_apple_darwin = "-UTARGET_OS_MAC"; + }; + doCheck = true; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdns-scanner/package.nix b/pkgs/by-name/md/mdns-scanner/package.nix index eb5165259143..f3274b732182 100644 --- a/pkgs/by-name/md/mdns-scanner/package.nix +++ b/pkgs/by-name/md/mdns-scanner/package.nix @@ -7,16 +7,18 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdns-scanner"; - version = "0.27.1"; + version = "0.27.5"; + + __structuredAttrs = true; src = fetchFromGitHub { owner = "CramBL"; repo = "mdns-scanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-90+VBCxb4bbmGCpBLmqzhUJ0/9GAH8Fnju61kq7sx+A="; + hash = "sha256-hN4WJ8RL5kl5mBXsVWspoOeN3PfPlH6RkgqWVFZpWkU="; }; - cargoHash = "sha256-LTL5nlT75Y/cALKVLVBWlMZZn9DewZfCbTAO1QsAfXI="; + cargoHash = "sha256-8oAxEjJWEgZo6qzabXnQQcEI3jSsZvfsIGycNunSjGs="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/md/mdsh/package.nix b/pkgs/by-name/md/mdsh/package.nix index e5bb0805e79e..297a02e2d957 100644 --- a/pkgs/by-name/md/mdsh/package.nix +++ b/pkgs/by-name/md/mdsh/package.nix @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Markdown shell pre-processor"; homepage = "https://github.com/zimbatm/mdsh"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ zimbatm ]; mainProgram = "mdsh"; }; diff --git a/pkgs/by-name/md/mdterm/package.nix b/pkgs/by-name/md/mdterm/package.nix index 69496609ce8b..2711df296540 100644 --- a/pkgs/by-name/md/mdterm/package.nix +++ b/pkgs/by-name/md/mdterm/package.nix @@ -2,6 +2,8 @@ lib, rustPlatform, fetchFromGitHub, + nix-update-script, + versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { @@ -19,6 +21,14 @@ rustPlatform.buildRustPackage (finalAttrs: { cargoHash = "sha256-YUPKUFfbzL/1peXEAX5EDehWq4hFwxJLkP2DBDkY23E="; + passthru.updateScript = nix-update-script { }; + + doInstallCheck = true; + + nativeInstallCheckInputs = [ + versionCheckHook + ]; + meta = { description = "A terminal-based Markdown browser"; homepage = "https://github.com/bahdotsh/mdterm"; diff --git a/pkgs/by-name/md/mdwatch/package.nix b/pkgs/by-name/md/mdwatch/package.nix index cf761ae0919d..a15ff37e4a66 100644 --- a/pkgs/by-name/md/mdwatch/package.nix +++ b/pkgs/by-name/md/mdwatch/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mdwatch"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "vimlinuz"; repo = "mdwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-vTwuhhMK0Rr3z1OCqTg8EaYQ3fuFe5S3WHQie/Spw98="; + hash = "sha256-SyuxEabAjeCX9/GQWXRsHofC/07BuYmf2eqmtbxl4To="; }; - cargoHash = "sha256-e3fB3UutnPYX1dxAlK0uu1n589W92MddSxWwDPWQQJc="; + cargoHash = "sha256-dd+gG9znTY4Nqx406HlZmLdxAsRrOa0oVHIpPXo97aA="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/me/me3/package.nix b/pkgs/by-name/me/me3/package.nix index 5cb05222d9bc..d525a1ea6cd6 100644 --- a/pkgs/by-name/me/me3/package.nix +++ b/pkgs/by-name/me/me3/package.nix @@ -10,7 +10,7 @@ }: let - version = "0.11.0"; + version = "0.12.1"; # me3 creates a pipe under /tmp needed by the compat tool subprocess steam-run = @@ -22,10 +22,10 @@ let owner = "garyttierney"; repo = "me3"; tag = "v${version}"; - sha256 = "sha256-XyeMVPGzNF2syipLz9HPtUg7lhxcEq434FnRH3Ax+HM="; + sha256 = "sha256-pGK6A85Xp6NbpYRKJTgi47acv4c8dZgb+Jdmeu8F/uU="; }; - cargoHash = "sha256-T1HeYe9FUC5oy/SDeEd6vV4D9YIGIXMkbzf43gRNyt8="; + cargoHash = "sha256-ss2NkDHfd5NBLGpnZ80UdvO0nn2mGueO0mnlWkog1jc="; me3-cli = rustPlatform.buildRustPackage (final: { inherit cargoHash version src; diff --git a/pkgs/by-name/me/mealie/mealie-frontend.nix b/pkgs/by-name/me/mealie/mealie-frontend.nix deleted file mode 100644 index b3359fb64271..000000000000 --- a/pkgs/by-name/me/mealie/mealie-frontend.nix +++ /dev/null @@ -1,68 +0,0 @@ -src: version: -{ - lib, - fetchYarnDeps, - dart-sass, - nodejs, - fixup-yarn-lock, - stdenv, - yarn, - writableTmpDirAsHomeHook, -}: -stdenv.mkDerivation { - name = "mealie-frontend"; - inherit version; - src = "${src}/frontend"; - - yarnOfflineCache = fetchYarnDeps { - yarnLock = "${src}/frontend/yarn.lock"; - hash = "sha256-F1dhdBHfT9N1Ejk7WLyz2BbKlTPfqqEDNi7ZTL3phWY="; - }; - - nativeBuildInputs = [ - fixup-yarn-lock - nodejs - (yarn.override { inherit nodejs; }) - writableTmpDirAsHomeHook - dart-sass - ]; - - configurePhase = '' - runHook preConfigure - - sed -i 's+"@nuxt/fonts",+// NUXT FONTS DISABLED+g' nuxt.config.ts - - yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" - fixup-yarn-lock yarn.lock - yarn install --offline --frozen-lockfile --no-progress --non-interactive --ignore-scripts - patchShebangs node_modules - - substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ - --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - export NUXT_TELEMETRY_DISABLED=1 - yarn --offline generate - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - mv .output/public $out - runHook postInstall - ''; - - meta = { - description = "Frontend for Mealie"; - license = lib.licenses.agpl3Only; - maintainers = with lib.maintainers; [ - litchipi - esch - ]; - }; -} diff --git a/pkgs/by-name/me/mealie/package.nix b/pkgs/by-name/me/mealie/package.nix index 765822f5dfa9..73876dc5f337 100644 --- a/pkgs/by-name/me/mealie/package.nix +++ b/pkgs/by-name/me/mealie/package.nix @@ -1,7 +1,5 @@ { lib, - pkgs, - callPackage, fetchFromGitHub, makeWrapper, nixosTests, @@ -9,27 +7,99 @@ nltk-data, writeShellScript, nix-update-script, + + # frontend + fetchYarnDeps, + dart-sass, + nodejs, + fixup-yarn-lock, + stdenv, + yarn, + writableTmpDirAsHomeHook, }: let - version = "3.16.0"; + version = "3.20.1"; src = fetchFromGitHub { owner = "mealie-recipes"; repo = "mealie"; tag = "v${version}"; - hash = "sha256-DUwLCe221MQb6AEYNxNDWXoaEdf9q/dNklOXJncnnJ4="; + hash = "sha256-SkPbu0DUNyjo1ARjZX+BXq+3ehZqnrku9kPjwsTJfuM="; }; - frontend = callPackage (import ./mealie-frontend.nix src version) { }; + frontend = stdenv.mkDerivation { + name = "mealie-frontend"; + inherit version; + src = "${src}/frontend"; + + __structuredAttrs = true; + + yarnOfflineCache = fetchYarnDeps { + yarnLock = "${src}/frontend/yarn.lock"; + hash = "sha256-nhV93uRfKUa/G7ikJkd6l9IudgMk7PZ7ujZNnwIZ71k="; + }; + + nativeBuildInputs = [ + fixup-yarn-lock + nodejs + (yarn.override { inherit nodejs; }) + writableTmpDirAsHomeHook + dart-sass + ]; + + env = { + NUXT_TELEMETRY_DISABLED = 1; + }; + + configurePhase = '' + runHook preConfigure + + sed -i 's+"@nuxt/fonts",+// NUXT FONTS DISABLED+g' nuxt.config.ts + + yarn config --offline set yarn-offline-mirror "$yarnOfflineCache" + fixup-yarn-lock yarn.lock + yarn install --offline --frozen-lockfile --no-progress --non-interactive --ignore-scripts + patchShebangs node_modules + + substituteInPlace node_modules/sass-embedded/dist/lib/src/compiler-path.js \ + --replace-fail 'compilerCommand = (() => {' 'compilerCommand = (() => { return ["dart-sass"];' + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + yarn --offline generate + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + mv .output/public $out + runHook postInstall + ''; + + meta = { + description = "Frontend for Mealie"; + license = lib.licenses.agpl3Only; + maintainers = with lib.maintainers; [ + litchipi + esch + ]; + }; + }; python = python3; pythonpkgs = python.pkgs; in -pythonpkgs.buildPythonApplication rec { +pythonpkgs.buildPythonApplication (finalAttrs: { pname = "mealie"; inherit version src; pyproject = true; + __structuredAttrs = true; + build-system = with pythonpkgs; [ setuptools ]; nativeBuildInputs = [ makeWrapper ]; @@ -112,11 +182,11 @@ pythonpkgs.buildPythonApplication rec { rm -f $out/bin/* makeWrapper ${start_script} $out/bin/mealie \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ - --set STATIC_FILES "${frontend}" + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath finalAttrs.passthru.dependencies}" \ + --set STATIC_FILES "${finalAttrs.passthru.frontend}" makeWrapper ${init_db} $out/libexec/init_db \ - --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath dependencies}" \ + --set PYTHONPATH "$out/${python.sitePackages}:${pythonpkgs.makePythonPath finalAttrs.passthru.dependencies}" \ --set OUT "$out" ''; @@ -136,7 +206,13 @@ pythonpkgs.buildPythonApplication rec { ]; passthru = { - updateScript = nix-update-script { }; + inherit frontend; + updateScript = nix-update-script { + extraArgs = [ + "-s" + "frontend" + ]; + }; tests = { inherit (nixosTests) mealie; }; @@ -160,4 +236,4 @@ pythonpkgs.buildPythonApplication rec { ]; mainProgram = "mealie"; }; -} +}) diff --git a/pkgs/by-name/me/mediaelch/package.nix b/pkgs/by-name/me/mediaelch/package.nix index 29adab944c09..e9e30dc6f788 100644 --- a/pkgs/by-name/me/mediaelch/package.nix +++ b/pkgs/by-name/me/mediaelch/package.nix @@ -38,6 +38,15 @@ stdenv.mkDerivation (finalAttrs: { url = "https://github.com/Komet/MediaElch/commit/dbea12fbf2c1fe603819392aa2a181cffa168548.patch"; hash = "sha256-Lv6rvjKbRNr5XrdZhPyw4S4RRCOnfAGhWgcSLo0gqS8="; }) + + # fix from: https://github.com/Komet/MediaElch/pull/1995 + # TMDb rejects a duplicate include_adult query param with HTTP 400 (issue #1992). + # Remove once MediaElch > 2.12.0 is released. + (fetchpatch { + name = "fix-tmdb-duplicate-include-adult.patch"; + url = "https://github.com/Komet/MediaElch/commit/f68419e746455d3c7eb6d95a4a1da7a6f7a5c505.patch"; + hash = "sha256-u+ScJDFX2IIpjXV58MCp1uJGx9QU+7cbq+e1qZPMWns="; + }) ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediainfo-gui/package.nix b/pkgs/by-name/me/mediainfo-gui/package.nix index a5d7caaecea4..46b142b90a0c 100644 --- a/pkgs/by-name/me/mediainfo-gui/package.nix +++ b/pkgs/by-name/me/mediainfo-gui/package.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediainfo-gui"; - version = "25.07"; + version = "26.05"; src = fetchurl { url = "https://mediaarea.net/download/source/mediainfo/${finalAttrs.version}/mediainfo_${finalAttrs.version}.tar.xz"; - hash = "sha256-UI6sHKCX9Byz/DliWs6wZS/KsArNDy68vR3GgAk26X0="; + hash = "sha256-+FIJP5BQAi1plgbuq7OLJNpVI9AhL6tk3E5NPka1beE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/mediamate/package.nix b/pkgs/by-name/me/mediamate/package.nix index e8d88b09d0aa..bcbb57bed324 100644 --- a/pkgs/by-name/me/mediamate/package.nix +++ b/pkgs/by-name/me/mediamate/package.nix @@ -36,7 +36,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "New, fresh visuals for changing your volume, brightness and now playing media"; homepage = "https://wouter01.github.io/MediaMate/"; license = lib.licenses.unfree; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; platforms = lib.platforms.darwin; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/me/mediawiki/package.nix b/pkgs/by-name/me/mediawiki/package.nix index 137a750715aa..0b8a4444421c 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.45.3"; + version = "1.45.4"; src = fetchurl { url = "https://releases.wikimedia.org/mediawiki/${lib.versions.majorMinor version}/mediawiki-${version}.tar.gz"; - hash = "sha256-XqjB8yHJ+Nuk0aweTsoYJ/sTUZ1KIZDiOfUUMgWKQmk="; + hash = "sha256-y3yCRGjrWlEacvCOYpHQncivEuCg/9wlMu4/drsMrXw="; }; postPatch = '' diff --git a/pkgs/by-name/me/mediawriter/package.nix b/pkgs/by-name/me/mediawriter/package.nix index 83bf8aae2e98..4a1ac02fe0de 100644 --- a/pkgs/by-name/me/mediawriter/package.nix +++ b/pkgs/by-name/me/mediawriter/package.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mediawriter"; - version = "5.3.1"; + version = "5.3.2"; src = fetchFromGitHub { owner = "FedoraQt"; repo = "MediaWriter"; tag = finalAttrs.version; - hash = "sha256-INq07MdWLq5qwBNWrrBRmtIpxsmnHcqPEUyRkIl3Qa4="; + hash = "sha256-Xf8W6qGvFOeJ/mVBE/vnngJkieASMpas9M9o+VwY5pc="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/meetingbar/package.nix b/pkgs/by-name/me/meetingbar/package.nix index 1038adb66296..c8b656d24b24 100644 --- a/pkgs/by-name/me/meetingbar/package.nix +++ b/pkgs/by-name/me/meetingbar/package.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/me/megabasterd/package.nix b/pkgs/by-name/me/megabasterd/package.nix index ab56f5528fbe..7c1e2b8d6ce4 100644 --- a/pkgs/by-name/me/megabasterd/package.nix +++ b/pkgs/by-name/me/megabasterd/package.nix @@ -19,7 +19,7 @@ maven.buildMavenPackage { hash = "sha256-6PKBzQA3lBa9/7J8bymGmnW3OPsRV4GgZ7dc7H6fOuE="; }; - mvnHash = "sha256-DVfPmW0ep6y/GxnwNKXxo68W5idcTkoNqUEKm7ouTEY="; + mvnHash = "sha256-JZ8INISDHPVhxylKwQc2DybPqxfwcGpkWxDhq8Fpqt8="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/science/misc/megam/ocaml-3.12.patch b/pkgs/by-name/me/megam/ocaml-3.12.patch similarity index 100% rename from pkgs/applications/science/misc/megam/ocaml-3.12.patch rename to pkgs/by-name/me/megam/ocaml-3.12.patch diff --git a/pkgs/applications/science/misc/megam/ocaml-includes.patch b/pkgs/by-name/me/megam/ocaml-includes.patch similarity index 100% rename from pkgs/applications/science/misc/megam/ocaml-includes.patch rename to pkgs/by-name/me/megam/ocaml-includes.patch diff --git a/pkgs/applications/science/misc/megam/default.nix b/pkgs/by-name/me/megam/package.nix similarity index 77% rename from pkgs/applications/science/misc/megam/default.nix rename to pkgs/by-name/me/megam/package.nix index 614b4935a644..53f1760943a0 100644 --- a/pkgs/applications/science/misc/megam/default.nix +++ b/pkgs/by-name/me/megam/package.nix @@ -2,17 +2,21 @@ lib, stdenv, fetchurl, - ocaml, + ocaml-ng, ncurses, }: +let + inherit (ocaml-ng.ocamlPackages_4_14) ocaml; +in + stdenv.mkDerivation { pname = "megam"; version = "0.92"; src = fetchurl { url = "http://hal3.name/megam/megam_src.tgz"; - sha256 = "dc0e9f59ff8513449fe3bd40b260141f89c88a4edf6ddc8b8a394c758e49724e"; + hash = "sha256-3A6fWf+FE0Sf471AsmAUH4nIik7fbdyLijlMdY5Jck4="; }; patches = [ @@ -23,12 +27,13 @@ stdenv.mkDerivation { postPatch = '' # Deprecated in ocaml 3.10 https://github.com/ocaml/ocaml/commit/f6190f3d0c49c5220d443ee8d03ca5072d68aa87 # Deprecated in ocaml 3.08 https://github.com/ocaml/ocaml/commit/0c7aecb88dc696f66f49f3bed54a037361a26b8d - substituteInPlace fastdot_c.c --replace copy_double caml_copy_double --replace Bigarray_val Caml_ba_array_val --replace caml_bigarray caml_ba_array + substituteInPlace fastdot_c.c --replace-fail copy_double caml_copy_double --replace-fail Bigarray_val Caml_ba_array_val --replace-fail caml_bigarray caml_ba_array # They were already deprecated in 3.12 https://v2.ocaml.org/releases/3.12/htmlman/libref/Array.html - substituteInPlace abffs.ml main.ml --replace create_matrix make_matrix - substituteInPlace intHashtbl.ml --replace Array.create Array.make + substituteInPlace abffs.ml main.ml --replace-fail create_matrix make_matrix + substituteInPlace intHashtbl.ml --replace-fail Array.create Array.make ''; strictDeps = true; + __structuredAttrs = true; nativeBuildInputs = [ ocaml ]; diff --git a/pkgs/by-name/me/megasync/package.nix b/pkgs/by-name/me/megasync/package.nix index d4cf351b2237..b554fefd2237 100644 --- a/pkgs/by-name/me/megasync/package.nix +++ b/pkgs/by-name/me/megasync/package.nix @@ -34,13 +34,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "megasync"; - version = "6.1.1.0"; + version = "6.4.0.2"; src = fetchFromGitHub rec { owner = "meganz"; repo = "MEGAsync"; tag = "v${finalAttrs.version}_Linux"; - hash = "sha256-lY8YfBWRYo+Q0ZvsZI2Mo0pgjD7wQvpyybPU+9bWahw="; + hash = "sha256-PgIRIr3+XRwv48EpREL56yzuqI8Ws72V4o3pTSR1ZfA="; fetchSubmodules = false; # DesignTokensImporter cannot be fetched, see #1010 in github:meganz/megasync leaveDotGit = true; postFetch = '' diff --git a/pkgs/by-name/me/megatools/package.nix b/pkgs/by-name/me/megatools/package.nix index 73dfbd3f6ee0..51978968ae86 100644 --- a/pkgs/by-name/me/megatools/package.nix +++ b/pkgs/by-name/me/megatools/package.nix @@ -11,7 +11,6 @@ pkg-config, curl, glib, - fuse, }: stdenv.mkDerivation (finalAttrs: { @@ -37,8 +36,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ curl glib - ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ fuse ]; + ]; enableParallelBuilding = true; strictDeps = true; diff --git a/pkgs/by-name/me/meilisearch/package.nix b/pkgs/by-name/me/meilisearch/package.nix index 9a1bbe6f1be8..03aa669ec133 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.45.2"; + version = "1.50.0"; src = fetchFromGitHub { owner = "meilisearch"; repo = "meilisearch"; tag = "v${finalAttrs.version}"; - hash = "sha256-hEMOyvFtbrOkN0I9F20NxdCLg+gYKDghZqXQ4T74Gsc="; + hash = "sha256-CTCfaWtLdRFCPEkcbewjz3zZ6NM1N8MaaeGM73T9QQk="; }; cargoBuildFlags = [ "--package=meilisearch" ]; - cargoHash = "sha256-R7q3TkmHBhKzfX+pVfh27UHBNtmMVwx0pjbqX+FCsWI="; + cargoHash = "sha256-mhXRHn+4i9lW81Cc7kzkGWODox2G6mYrmBkrhbcVYS8="; # Default features include mini dashboard which downloads something from the internet. buildNoDefaultFeatures = true; @@ -50,7 +50,6 @@ rustPlatform.buildRustPackage (finalAttrs: { "aarch64-linux" "aarch64-darwin" "x86_64-linux" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/me/melonds/package.nix b/pkgs/by-name/me/melonds/package.nix index d5bef23c640a..c3efe98f1a1e 100644 --- a/pkgs/by-name/me/melonds/package.nix +++ b/pkgs/by-name/me/melonds/package.nix @@ -29,13 +29,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "melonds"; - version = "1.1-unstable-2026-05-27"; + version = "1.1-unstable-2026-07-19"; src = fetchFromGitHub { owner = "melonDS-emu"; repo = "melonDS"; - rev = "c69c1ceb1176a03782f13bb8ae54883a44cb2d5d"; - hash = "sha256-d/9tlGAo66v0C2/erdoDyLXqoxqaTExztlxbFE4V7d8="; + rev = "82fdbc78483f43b310e920e21acc47787cb43564"; + hash = "sha256-2T8qzsqbULFw7jsNk0pTpLMIyS1XVnA5ojel8BmTPMw="; }; nativeBuildInputs = [ @@ -104,7 +104,7 @@ stdenv.mkDerivation (finalAttrs: { - (WIP) GBA slot add-ons - and more are planned! ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "melonDS"; maintainers = with lib.maintainers; [ artemist diff --git a/pkgs/by-name/me/melos/add-generic-main.patch b/pkgs/by-name/me/melos/add-generic-main.patch index 8e90ac427171..815f2163e7dc 100644 --- a/pkgs/by-name/me/melos/add-generic-main.patch +++ b/pkgs/by-name/me/melos/add-generic-main.patch @@ -1,8 +1,8 @@ diff --git a/bin/melos.dart b/bin/melos.dart -index 2476436..bd79fad 100644 +index 2476436..ee6adb0 100644 --- a/packages/melos/bin/melos.dart +++ b/packages/melos/bin/melos.dart -@@ -1,11 +1,72 @@ +@@ -1,11 +1,74 @@ import 'package:cli_launcher/cli_launcher.dart'; import 'package:melos/src/command_runner.dart'; +import 'dart:io'; @@ -19,31 +19,29 @@ index 2476436..bd79fad 100644 -); +final ExecutableName executableName = ExecutableName('melos'); + ++// Substituted at build time to the package's install location in the ++// nix store (see preBuild in package.nix). ++const _globalPackageRoot = '__NIX_MELOS_PACKAGE_ROOT__'; ++ +Future main(List arguments) async { -+ final workspaceRoot = _findLocalInstallation(Directory.current); ++ final localInstallation = _findLocalInstallation(Directory.current); + -+ if (workspaceRoot == null) { -+ print("Error: Could not find your work "); -+ return; -+ } -+ -+ melosEntryPoint( ++ await melosEntryPoint( + arguments, + LaunchContext( + directory: Directory.current, -+ localInstallation: ExecutableInstallation( ++ globalInstallation: ExecutableInstallation( + name: executableName, + isSelf: false, -+ packageRoot: workspaceRoot, ++ packageRoot: Directory(_globalPackageRoot), + ), ++ localInstallation: localInstallation, + ), + ); +} + +// Stolen then simplified from https://github.com/blaugold/cli_launcher/blob/dcdf11c42b77ddc8e38e7e2445c8cff9b55658ec/lib/cli_launcher.dart#L249 -+Directory? _findLocalInstallation( -+ Directory start, -+) { ++ExecutableInstallation? _findLocalInstallation(Directory start) { + if (path.equals(start.path, start.parent.path)) { + return null; + } @@ -72,12 +70,16 @@ index 2476436..bd79fad 100644 + + final isSelf = name == executableName.package; + -+ if ((isSelf) || ++ if (isSelf || + (dependencies != null && + dependencies.containsKey(executableName.package)) || + (devDependencies != null && + devDependencies.containsKey(executableName.package))) { -+ return start; ++ return ExecutableInstallation( ++ name: executableName, ++ isSelf: isSelf, ++ packageRoot: start, ++ ); + } + } + diff --git a/pkgs/by-name/me/melos/package.nix b/pkgs/by-name/me/melos/package.nix index fffcfb13ef57..cadca019cb4e 100644 --- a/pkgs/by-name/me/melos/package.nix +++ b/pkgs/by-name/me/melos/package.nix @@ -5,12 +5,12 @@ }: buildDartApplication (finalAttrs: { pname = "melos"; - version = "7.8.2"; + version = "8.2.2"; src = fetchFromGitHub { owner = "invertase"; repo = "melos"; tag = "melos-v${finalAttrs.version}"; - hash = "sha256-5HLd0NUaRd0zl8WtTOGX4nHXwzCOOvCQcUW8GmmBqEw="; + hash = "sha256-BIRk1VX8e3CEbnv5S55DsNIFWsGvSVvq53k0cKtqGKE="; }; patches = [ @@ -27,6 +27,8 @@ buildDartApplication (finalAttrs: { --replace-fail "final melosPackageFileUri = await Isolate.resolvePackageUri(melosPackageUri);" "return \"$out\";" substituteInPlace packages/melos/lib/src/common/utils.dart \ --replace-fail "return p.normalize('\''${melosPackageFileUri!.toFilePath()}/../..');" " " + substituteInPlace packages/melos/bin/melos.dart \ + --replace-fail "__NIX_MELOS_PACKAGE_ROOT__" "$out" mkdir --parents $out cp --recursive packages/melos/templates $out/ ''; diff --git a/pkgs/by-name/me/melos/pubspec.lock.json b/pkgs/by-name/me/melos/pubspec.lock.json index 15f4ee2a3413..17bd9a6517cf 100644 --- a/pkgs/by-name/me/melos/pubspec.lock.json +++ b/pkgs/by-name/me/melos/pubspec.lock.json @@ -64,11 +64,11 @@ "dependency": "transitive", "description": { "name": "build", - "sha256": "a156715e7cd728130c592f30552575908aae5b100005fbc1f0fb16b3c03a3d10", + "sha256": "59f99162d27dff3620f1d21165ce802237eb4556fed563c0902403f8207a7c00", "url": "https://pub.dev" }, "source": "hosted", - "version": "4.0.6" + "version": "4.0.8" }, "built_collection": { "dependency": "transitive", @@ -124,11 +124,11 @@ "dependency": "transitive", "description": { "name": "cli_launcher", - "sha256": "35cf15a3ffaeb9c11849eaa0afba761bb76dceb42d050532bfd3e1299c9748cd", + "sha256": "96883f87648524292e24e2cc6a369fbdf64883473fe3e3ddadd3d857bf16a484", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.3.3+1" + "version": "0.3.3+2" }, "cli_util": { "dependency": "transitive", @@ -194,11 +194,11 @@ "dependency": "transitive", "description": { "name": "dart_style", - "sha256": "59d53ef8eaed9d288ed9767618e2b31c4fa0383a127db59d5eb2e737a7638a60", + "sha256": "3f88fc9c96c568d631356507355a2d1e983ee000c9ac008bdcb39b5bf53ce777", "url": "https://pub.dev" }, "source": "hosted", - "version": "3.1.9" + "version": "3.1.12" }, "ffi": { "dependency": "transitive", @@ -334,11 +334,11 @@ "dependency": "transitive", "description": { "name": "meta", - "sha256": "c82594181e3312f3d0695fc95aaaf7758d75b8d4ae2bbecf223b9fd5109a059d", + "sha256": "307249ce4ff29d58a18e97f6345f539382eb9c9c29ecda628900f31de0443dd9", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.18.3" + "version": "1.19.0" }, "mime": { "dependency": "transitive", @@ -604,31 +604,31 @@ "dependency": "transitive", "description": { "name": "test", - "sha256": "ca578dc12bb8b2f40b67b7d3bd2fac4f31c01a6ff7130a14e2597b919934507f", + "sha256": "0d5ba5602ec3baa28c8ce365e1efc5575969c765f45c554a3e167dc7945b9c30", "url": "https://pub.dev" }, "source": "hosted", - "version": "1.31.1" + "version": "1.31.2" }, "test_api": { "dependency": "transitive", "description": { "name": "test_api", - "sha256": "2a122cbe059f8b610d3a5415f42e255b6c17b1f21eee1d960f31080237fb4f11", + "sha256": "475610b2aa23c19687cce2961e44b0cc57cafe220f67c2b80201231b2a07fbe7", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.7.12" + "version": "0.7.13" }, "test_core": { "dependency": "transitive", "description": { "name": "test_core", - "sha256": "d2e98ec12998368dc59ddd47ab709f2cd55acd6b66dc7db764455a44082f4bc5", + "sha256": "a39c204a4fc7a7ccb04a2b985e359fda3cc37e45e0b8ac61c3fb1a05aa832132", "url": "https://pub.dev" }, "source": "hosted", - "version": "0.6.18" + "version": "0.6.19" }, "typed_data": { "dependency": "transitive", diff --git a/pkgs/by-name/me/memento/package.nix b/pkgs/by-name/me/memento/package.nix index d36c21ac3bca..365e4e6836c3 100644 --- a/pkgs/by-name/me/memento/package.nix +++ b/pkgs/by-name/me/memento/package.nix @@ -42,31 +42,38 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "memento"; - version = "1.7.0"; + version = "2.0.2"; src = fetchFromGitHub { owner = "ripose-jp"; repo = "Memento"; tag = "v${finalAttrs.version}"; - hash = "sha256-6ipzorykt9GoGTHTTLCyDf7vXx9mT5AITKA9pyQ3GwI="; + hash = "sha256-PVGzPd9t8FNZ3kLLueDIzIKAgagW7avDMFp6NKtSCD0="; }; + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace-fail $'\tQml\n' $'\tQml\n\tQmlPrivate\n' + ''; + cmakeFlags = [ - (lib.cmakeBool "SYSTEM_QCORO" true) - (lib.cmakeBool "SYSTEM_MOCR" true) + (lib.cmakeBool "MEMENTO_SYSTEM_QCORO" true) + (lib.cmakeBool "MEMENTO_SYSTEM_MOCR" true) ] ++ lib.optionals withOcr [ - (lib.cmakeBool "OCR_SUPPORT" true) + (lib.cmakeBool "MEMENTO_OCR_SUPPORT" true) ]; nativeBuildInputs = [ cmake makeWrapper + qt6Packages.qttools qt6Packages.wrapQtAppsHook ]; buildInputs = [ qt6Packages.qtbase + qt6Packages.qtdeclarative qt6Packages.qtsvg qt6Packages.qtwayland sqlite diff --git a/pkgs/by-name/me/memos/package.nix b/pkgs/by-name/me/memos/package.nix index ba786d2f0ec6..a036672cfb39 100644 --- a/pkgs/by-name/me/memos/package.nix +++ b/pkgs/by-name/me/memos/package.nix @@ -52,6 +52,10 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-6oJgxhGS7aD3I0umTQuVMLzcOhzf53g4TZcCtkKrrc8="; + ldflags = [ + "-X github.com/usememos/memos/internal/version.Version=${finalAttrs.version}" + ]; + preBuild = '' rm -rf server/router/frontend/dist cp -r ${finalAttrs.memos-web} server/router/frontend/dist diff --git a/pkgs/by-name/me/memtailor/package.nix b/pkgs/by-name/me/memtailor/package.nix index a70d33ecf38d..ddfb329286af 100644 --- a/pkgs/by-name/me/memtailor/package.nix +++ b/pkgs/by-name/me/memtailor/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { strictDeps = true; configureFlags = [ - (lib.withFeature finalAttrs.doCheck "gtest") + (lib.withFeature finalAttrs.finalPackage.doCheck "gtest") ]; enableParallelBuilding = true; diff --git a/pkgs/by-name/me/memtier-benchmark/package.nix b/pkgs/by-name/me/memtier-benchmark/package.nix index e37df1419c59..45c62296664e 100644 --- a/pkgs/by-name/me/memtier-benchmark/package.nix +++ b/pkgs/by-name/me/memtier-benchmark/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "memtier-benchmark"; - version = "2.4.1"; + version = "2.5.1"; src = fetchFromGitHub { owner = "redis"; repo = "memtier_benchmark"; tag = finalAttrs.version; - hash = "sha256-pvi5p/0HZIiZYi5+eqcAu4MMrF0Hh42ByPEHuA9jcug="; + hash = "sha256-SCKxiSbyIyL1sAYpFCJs4OiGZahGgRG1bDFgDO++t9Y="; }; nativeBuildInputs = [ @@ -37,10 +37,8 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://github.com/redis/memtier_benchmark"; license = lib.licenses.gpl2Only; platforms = lib.platforms.unix; - maintainers = with lib.maintainers; [ - thoughtpolice - hythera - ]; + maintainers = with lib.maintainers; [ thoughtpolice ]; mainProgram = "memtier_benchmark"; + teams = [ lib.teams.redis ]; }; }) diff --git a/pkgs/by-name/me/mendingwall/package.nix b/pkgs/by-name/me/mendingwall/package.nix new file mode 100644 index 000000000000..029face5d87e --- /dev/null +++ b/pkgs/by-name/me/mendingwall/package.nix @@ -0,0 +1,58 @@ +{ + lib, + stdenv, + fetchFromGitHub, + wrapGAppsHook4, + meson, + blueprint-compiler, + glib, + gtk4, + libadwaita, + gettext, + appstream, + desktop-file-utils, + pkg-config, + ninja, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "mendingwall"; + version = "0.3.8"; + + src = fetchFromGitHub { + owner = "lawmurray"; + repo = "mendingwall"; + tag = "v${finalAttrs.version}"; + hash = "sha256-bt2DvbtwUaad5j2XpySA4KBfI4953tc1bHRuUUkS84M="; + }; + + strictDeps = true; + __structuredAttrs = true; + + nativeBuildInputs = [ + meson + blueprint-compiler + gettext + appstream + desktop-file-utils + pkg-config + ninja + wrapGAppsHook4 + ]; + + buildInputs = [ + glib + gtk4 + libadwaita + ]; + + meta = with lib; { + description = "Fix theme and menu inconsistencies when using multiple desktop environments"; + homepage = "https://mendingwall.indii.org/"; + changelog = "https://github.com/lawmurray/mendingwall/releases/tag/v${finalAttrs.version}"; + license = licenses.gpl3Plus; + maintainers = [ maintainers.jromer ]; + platforms = platforms.linux; + mainProgram = "mendingwall"; + }; +}) diff --git a/pkgs/by-name/me/meowfetch/package.nix b/pkgs/by-name/me/meowfetch/package.nix new file mode 100644 index 000000000000..b09773b39da3 --- /dev/null +++ b/pkgs/by-name/me/meowfetch/package.nix @@ -0,0 +1,34 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "meowfetch"; + version = "1.0.1"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "faynopi"; + repo = "meowfetch"; + tag = "v${finalAttrs.version}"; + hash = "sha256-5nUogUYc25FPQKY9oIU2bmOpgWN8bCoxEhRJQfEZOcM="; + }; + + vendorHash = "sha256-PnkXXNr+kIige1YB/vEG+sYI0X/rr+6Gtcnb0rW4YK0="; + + ldflags = [ "-s" ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Minimal system information fetcher program written in go"; + homepage = "https://github.com/faynopi/meowfetch"; + changelog = "https://github.com/faynopi/meowfetch/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ goobertony ]; + mainProgram = "meowfetch"; + }; +}) diff --git a/pkgs/by-name/me/meowlnir/package.nix b/pkgs/by-name/me/meowlnir/package.nix index c5a7236bcaf0..32f418546c13 100644 --- a/pkgs/by-name/me/meowlnir/package.nix +++ b/pkgs/by-name/me/meowlnir/package.nix @@ -9,19 +9,19 @@ buildGoModule rec { pname = "meowlnir"; - version = "26.05"; - tag = "v0.2605.0"; + version = "26.06"; + tag = "v0.2606.0"; src = fetchFromGitHub { owner = "maunium"; repo = "meowlnir"; inherit tag; - hash = "sha256-f2SgDFswjBDFQq9KvFo6A02vghMfYRkV26uWN8yxOz0="; + hash = "sha256-mhm/CznhaQCgx0ZQ/GArmWrhDS0sPkIkJrP3cAOIFME="; }; buildInputs = [ olm ]; - vendorHash = "sha256-rHBGTOqBfbu9EN0rWCui03aW2Co6Y4yxOvpuznjQ4qc="; + vendorHash = "sha256-0PgI0m2EsfiZjpOQ9lTfVavHNzKWKFdlmkIz2gqUXM0="; doCheck = true; doInstallCheck = true; diff --git a/pkgs/by-name/me/mercurial/package.nix b/pkgs/by-name/me/mercurial/package.nix index 3ac5b2529b12..badad6378c51 100644 --- a/pkgs/by-name/me/mercurial/package.nix +++ b/pkgs/by-name/me/mercurial/package.nix @@ -40,11 +40,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "7.1.2"; + version = "7.2.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - hash = "sha256-zie5pHZ88upJa1FGi65RL6am6vCJHkn4lh3GlLTcgco="; + hash = "sha256-8uyOfu7wUAWRcG03RVXwzrEYgiBo51+jsyvgfdIYT2w="; }; pyproject = false; @@ -56,7 +56,7 @@ let rustPlatform.fetchCargoVendor { inherit src; name = "mercurial-${version}"; - hash = "sha256-REMgZ1TiVTDbvT8TCd4EeHfYT/xMJfC4E6weLJFT6Rw="; + hash = "sha256-OGsHK3Bh47V4n+7HYpVp/jymCz1QY45rkWlAW0Hob7g="; sourceRoot = "mercurial-${version}/rust"; } else @@ -180,12 +180,6 @@ let "" } done - - # https://bz.mercurial-scm.org/show_bug.cgi?id=6887 - # Adding setuptools to the python path is not enough for the distutils - # module to be found, so we patch usage directly: - substituteInPlace tests/hghave.py \ - --replace-fail "distutils" "setuptools._distutils" ''; # This runs Mercurial _a lot_ of times. diff --git a/pkgs/by-name/me/mercury/package.nix b/pkgs/by-name/me/mercury/package.nix index 10a1d8b570c0..45326948f2ba 100644 --- a/pkgs/by-name/me/mercury/package.nix +++ b/pkgs/by-name/me/mercury/package.nix @@ -7,7 +7,7 @@ bison, texinfo, openjdk8_headless, - erlang, + beamPackages, makeWrapper, readline, }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { bison texinfo openjdk8_headless - erlang + beamPackages.erlang readline ]; @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/$e \ --prefix PATH ":" "${gcc}/bin" \ --prefix PATH ":" "${openjdk8_headless}/bin" \ - --prefix PATH ":" "${erlang}/bin" + --prefix PATH ":" "${beamPackages.erlang}/bin" done ''; diff --git a/pkgs/by-name/me/mergerfs/package.nix b/pkgs/by-name/me/mergerfs/package.nix index 401b07b2a49c..8cfc716e6f5c 100644 --- a/pkgs/by-name/me/mergerfs/package.nix +++ b/pkgs/by-name/me/mergerfs/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mergerfs"; - version = "2.41.1"; + version = "2.42.0"; src = fetchFromGitHub { owner = "trapexit"; repo = "mergerfs"; rev = finalAttrs.version; - sha256 = "sha256-pXge+/5Ti4+e0aSbWLg6roIcg+3foAvSHP/Obd0EiE4="; + sha256 = "sha256-FTkJpZkrU9ALMnmeqh1w9r46x4Waq30lA8yAHg3Y54s="; }; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/by-name/me/mergiraf/package.nix b/pkgs/by-name/me/mergiraf/package.nix index 086cd2759348..e20edd45e41e 100644 --- a/pkgs/by-name/me/mergiraf/package.nix +++ b/pkgs/by-name/me/mergiraf/package.nix @@ -6,23 +6,27 @@ # native check inputs git, + jujutsu, versionCheckHook, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mergiraf"; - version = "0.17.0"; + version = "0.18.0"; src = fetchFromCodeberg { owner = "mergiraf"; repo = "mergiraf"; tag = "v${finalAttrs.version}"; - hash = "sha256-Tqz1gNg2XIYO/dFETajF3XUs3A1+mY82U4pz+mMb/ws="; + hash = "sha256-PfGiPH7CU8z+Flj3X04XnRdWcv5K+hTZMfvHpM52Fic="; }; - cargoHash = "sha256-8Geu6Cd83hTnd53/ZTKq1YIEMIX4oIgwzSS6h8RNaP8="; + cargoHash = "sha256-1MDjaaH2PcvQz0DKSTADRB+8YEUWP1GN2edHk4EDVGA="; - nativeCheckInputs = [ git ]; + nativeCheckInputs = [ + git + jujutsu + ]; doInstallCheck = true; nativeInstallCheckInputs = [ versionCheckHook ]; diff --git a/pkgs/by-name/me/mermaid-cli/package.nix b/pkgs/by-name/me/mermaid-cli/package.nix index b1f24fc59e28..a8300fcdf519 100644 --- a/pkgs/by-name/me/mermaid-cli/package.nix +++ b/pkgs/by-name/me/mermaid-cli/package.nix @@ -7,7 +7,7 @@ nix-update-script, }: let - version = "11.12.0"; + version = "11.16.0"; in buildNpmPackage { pname = "mermaid-cli"; @@ -17,14 +17,14 @@ buildNpmPackage { owner = "mermaid-js"; repo = "mermaid-cli"; rev = version; - hash = "sha256-OpYq0nOYCGTorzDxybsEjJmhL646wMBbQw3eHVxTuqU="; + hash = "sha256-jK87Ffsv9qeh0UPJaLTuIJYbnR9HVqjm7hWrwUaP5zA="; }; patches = [ ./remove-puppeteer-from-dev-deps.patch # https://github.com/mermaid-js/mermaid-cli/issues/830 ]; - npmDepsHash = "sha256-Ex+tEm13feR/Vru0CHlvM3xS5wgGlYyqANeIquvRHwM="; + npmDepsHash = "sha256-sOEDz8ZT2zF+TH+ZJhb+LSyyUF1HWVVLzCqtYtg7A0E="; env = { PUPPETEER_SKIP_DOWNLOAD = true; diff --git a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch index 7c58948b97f6..1f9bbba9ba85 100644 --- a/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch +++ b/pkgs/by-name/me/mermaid-cli/remove-puppeteer-from-dev-deps.patch @@ -1,16 +1,11 @@ -Subject: [PATCH] remove pupperteer from dev dependencies +Subject: [PATCH] remove puppeteer from dev dependencies --- Index: package.json -<+>UTF-8 =================================================================== diff --git a/package.json b/package.json ---- a/package.json (revision fa593dc39619f44b57a922927a66346248f31d7d) -+++ b/package.json (date 1736721981718) -@@ -45,7 +45,6 @@ - "@tsconfig/node18": "^18.2.4", - "@types/node": "~18.19.31", - "jest": "^30.0.5", -- "puppeteer": "^23.1.1", - "standard": "^17.0.0", - "typescript": "^5.0.1-rc", - "vite": "^6.0.2", +--- a/package.json ++++ b/package.json +@@ -47,3 +47,2 @@ + "prettier": "^3.8.3", +- "puppeteer": "^25.0.0", + "typescript": "^6.0.3", diff --git a/pkgs/by-name/me/merve/package.nix b/pkgs/by-name/me/merve/package.nix index e8a210d551e6..066ac8fd351d 100644 --- a/pkgs/by-name/me/merve/package.nix +++ b/pkgs/by-name/me/merve/package.nix @@ -26,16 +26,14 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ (lib.cmakeBool "BUILD_SHARED_LIBS" (!static)) (lib.cmakeBool "MERVE_TESTING" finalAttrs.finalPackage.doCheck) - (lib.cmakeBool "MERVE_USE_SIMDUTF" true) - ]; + ] + ++ lib.optional (simdutf != null) (lib.cmakeBool "MERVE_USE_SIMDUTF" true); nativeBuildInputs = [ cmake validatePkgConfig ]; - buildInputs = [ - simdutf - ]; + buildInputs = lib.optional (simdutf != null) simdutf; checkInputs = [ gtest ]; diff --git a/pkgs/by-name/me/meshcentral/optionalDependencies.patch b/pkgs/by-name/me/meshcentral/optionalDependencies.patch index 09ad09fdfdb3..a1e393979d70 100644 --- a/pkgs/by-name/me/meshcentral/optionalDependencies.patch +++ b/pkgs/by-name/me/meshcentral/optionalDependencies.patch @@ -1,36 +1,36 @@ -From 2036fde7f3e47d3268acdbe4f9c9bc7453d100da Mon Sep 17 00:00:00 2001 +From b4628a6a19629bfdff70d92dfaf0792e3b658ad6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 25 Apr 2026 15:29:21 +0200 Subject: [PATCH] Add optional deps --- - package-lock.json | 18249 +++++++++++++++++++++++++++++++++++++++----- + package-lock.json | 17442 +++++++++++++++++++++++++++++++++++++++----- package.json | 59 + - 2 files changed, 16601 insertions(+), 1707 deletions(-) + 2 files changed, 15866 insertions(+), 1635 deletions(-) diff --git a/package-lock.json b/package-lock.json -index 2af3a0d1..5c5f4b73 100644 +index c1334f60..7855a902 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "meshcentral", -- "version": "1.1.58", -+ "version": "1.1.59", +- "version": "1.1.59", ++ "version": "1.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "meshcentral", -- "version": "1.1.58", -+ "version": "1.1.59", +- "version": "1.1.59", ++ "version": "1.2.0", "license": "Apache-2.0", "dependencies": { "@seald-io/nedb": "4.1.2", -@@ -33,2433 +33,16574 @@ +@@ -33,1309 +33,14255 @@ }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" + }, + "optionalDependencies": { + "@crowdsec/express-bouncer": "^0.1.0", @@ -97,10 +97,10 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", - "license": "ISC", -+ "node_modules/@aws-crypto/sha256-browser": { ++ "node_modules/@aws-crypto/crc32": { + "version": "5.2.0", -+ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", -+ "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", ++ "resolved": "https://registry.npmjs.org/@aws-crypto/crc32/-/crc32-5.2.0.tgz", ++ "integrity": "sha512-nLbCWqQNgUiwwtFsen1AdzAtvuLRsQS8rYgMuxCrdKf9kOssamGLuPwyTY9wyYblNr9+1XM8v6zoDTPPSIeANg==", + "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -110,27 +110,13 @@ index 2af3a0d1..5c5f4b73 100644 - "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", - "wrap-ansi": "^8.1.0", - "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" -+ "@aws-crypto/sha256-js": "^5.2.0", -+ "@aws-crypto/supports-web-crypto": "^5.2.0", + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", -+ "@aws-sdk/util-locate-window": "^3.0.0", -+ "@smithy/util-utf8": "^2.0.0", -+ "tslib": "^2.6.2" -+ } -+ }, -+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/is-array-buffer": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", -+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { + "tslib": "^2.6.2" }, "engines": { - "node": ">=12" -+ "node": ">=14.0.0" ++ "node": ">=16.0.0" } }, - "node_modules/@otplib/core": { @@ -145,19 +131,21 @@ index 2af3a0d1..5c5f4b73 100644 - "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==", - "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths", - "license": "MIT", -+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-buffer-from": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", -+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", ++ "node_modules/@aws-crypto/sha256-browser": { ++ "version": "5.2.0", ++ "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-browser/-/sha256-browser-5.2.0.tgz", ++ "integrity": "sha512-AXfN/lGotSQwu6HNcEsIASo7kWXZ5HYWvfOmSNKDsEqC4OashTp8alTmaz+F7TC2L083SFv5RdB+qU3Vs1kZqw==", + "license": "Apache-2.0", + "optional": true, "dependencies": { - "@otplib/core": "^12.0.1" -+ "@smithy/is-array-buffer": "^2.2.0", ++ "@aws-crypto/sha256-js": "^5.2.0", ++ "@aws-crypto/supports-web-crypto": "^5.2.0", ++ "@aws-crypto/util": "^5.2.0", ++ "@aws-sdk/types": "^3.222.0", ++ "@aws-sdk/util-locate-window": "^3.0.0", ++ "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=14.0.0" } }, - "node_modules/@otplib/plugin-thirty-two": { @@ -166,28 +154,6 @@ index 2af3a0d1..5c5f4b73 100644 - "integrity": "sha512-MtT+uqRso909UkbrrYpJ6XFjj9D+x2Py7KjTO9JDPhL0bJUYVu5kFP4TFZW4NFAywrAtFRxOVY261u0qwb93gA==", - "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths", - "license": "MIT", -+ "node_modules/@aws-crypto/sha256-browser/node_modules/@smithy/util-utf8": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", -+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "@otplib/core": "^12.0.1", -- "thirty-two": "^1.0.2" -+ "@smithy/util-buffer-from": "^2.2.0", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=14.0.0" - } - }, -- "node_modules/@otplib/preset-default": { -- "version": "12.0.1", -- "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz", -- "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==", -- "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths", -- "license": "MIT", + "node_modules/@aws-crypto/sha256-js": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/sha256-js/-/sha256-js-5.2.0.tgz", @@ -196,8 +162,7 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true, "dependencies": { - "@otplib/core": "^12.0.1", -- "@otplib/plugin-crypto": "^12.0.1", -- "@otplib/plugin-thirty-two": "^12.0.1" +- "thirty-two": "^1.0.2" + "@aws-crypto/util": "^5.2.0", + "@aws-sdk/types": "^3.222.0", + "tslib": "^2.6.2" @@ -206,10 +171,11 @@ index 2af3a0d1..5c5f4b73 100644 + "node": ">=16.0.0" } }, -- "node_modules/@otplib/preset-v11": { +- "node_modules/@otplib/preset-default": { - "version": "12.0.1", -- "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz", -- "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==", +- "resolved": "https://registry.npmjs.org/@otplib/preset-default/-/preset-default-12.0.1.tgz", +- "integrity": "sha512-xf1v9oOJRyXfluBhMdpOkr+bsE+Irt+0D5uHtvg6x1eosfmHCsCC6ej/m7FXiWqdo0+ZUI6xSKDhJwc8yfiOPQ==", +- "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths", - "license": "MIT", + "node_modules/@aws-crypto/supports-web-crypto": { + "version": "5.2.0", @@ -224,25 +190,54 @@ index 2af3a0d1..5c5f4b73 100644 + "tslib": "^2.6.2" } }, -- "node_modules/@pkgjs/parseargs": { -- "version": "0.11.0", -- "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", -- "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", +- "node_modules/@otplib/preset-v11": { +- "version": "12.0.1", +- "resolved": "https://registry.npmjs.org/@otplib/preset-v11/-/preset-v11-12.0.1.tgz", +- "integrity": "sha512-9hSetMI7ECqbFiKICrNa4w70deTUfArtwXykPUvSHWOdzOlfa9ajglu7mNCntlvxycTiOAXkQGwjQCzzDEMRMg==", - "license": "MIT", + "node_modules/@aws-crypto/util": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/@aws-crypto/util/-/util-5.2.0.tgz", + "integrity": "sha512-4RkU9EsI6ZpBve5fseQlGNUWKMa1RLPQ1dnjnQoe07ldfIzcsGb5hC5W0Dm7u423KWzawlrpbjXBrXCEv9zazQ==", + "license": "Apache-2.0", - "optional": true, -- "engines": { -- "node": ">=14" -+ "dependencies": { ++ "optional": true, + "dependencies": { +- "@otplib/core": "^12.0.1", +- "@otplib/plugin-crypto": "^12.0.1", +- "@otplib/plugin-thirty-two": "^12.0.1" + "@aws-sdk/types": "^3.222.0", + "@smithy/util-utf8": "^2.0.0", + "tslib": "^2.6.2" } }, +- "node_modules/@pkgjs/parseargs": { +- "version": "0.11.0", +- "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", +- "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", +- "license": "MIT", ++ "node_modules/@aws-sdk/client-cognito-identity": { ++ "version": "3.1072.0", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.1072.0.tgz", ++ "integrity": "sha512-V4Ic0hmxYlDiyMGArYoPL0EG6A4NHO6tlXC0oIfVJNAr/4uG9cbEMwcutrZkWVMU0QnxYk4iuOjUenF3wOGEBg==", ++ "license": "Apache-2.0", + "optional": true, ++ "dependencies": { ++ "@aws-crypto/sha256-browser": "5.2.0", ++ "@aws-crypto/sha256-js": "5.2.0", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/credential-provider-node": "^3.972.57", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/fetch-http-handler": "^5.4.6", ++ "@smithy/node-http-handler": "^4.7.6", ++ "@smithy/types": "^4.14.3", ++ "tslib": "^2.6.2" ++ }, + "engines": { +- "node": ">=14" ++ "node": ">=20.0.0" + } + }, - "node_modules/@seald-io/binary-search-tree": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/@seald-io/binary-search-tree/-/binary-search-tree-1.0.3.tgz", @@ -253,20 +248,27 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/@seald-io/nedb/-/nedb-4.1.2.tgz", - "integrity": "sha512-bDr6TqjBVS2rDyYM9CPxAnotj5FuNL9NF8o7h7YyFXM7yruqT4ddr+PkSb2mJvvw991bqdftazkEo38gykvaww==", - "license": "MIT", -+ "node_modules/@aws-crypto/util/node_modules/@smithy/is-array-buffer": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", -+ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", ++ "node_modules/@aws-sdk/core": { ++ "version": "3.974.22", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.22.tgz", ++ "integrity": "sha512-YofH63shc6YRdXjz80BJkpJW+Bkn0Cuu2dn4Rv7s9G2Idt58tgtzQEWxrR2xVljlVfIBeUjPuULnSVYLke3sUQ==", + "license": "Apache-2.0", + "optional": true, "dependencies": { - "@seald-io/binary-search-tree": "^1.0.3", - "localforage": "^1.10.0", - "util": "^0.12.5" ++ "@aws-sdk/types": "^3.973.13", ++ "@aws-sdk/xml-builder": "^3.972.30", ++ "@aws/lambda-invoke-store": "^0.2.2", ++ "@smithy/core": "^3.24.6", ++ "@smithy/signature-v4": "^5.4.6", ++ "@smithy/types": "^4.14.3", ++ "bowser": "^2.11.0", + "tslib": "^2.6.2" + }, + "engines": { -+ "node": ">=14.0.0" ++ "node": ">=20.0.0" } }, - "node_modules/abort-controller": { @@ -274,20 +276,23 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", - "license": "MIT", -+ "node_modules/@aws-crypto/util/node_modules/@smithy/util-buffer-from": { -+ "version": "2.2.0", -+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", -+ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", ++ "node_modules/@aws-sdk/credential-provider-cognito-identity": { ++ "version": "3.972.47", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.47.tgz", ++ "integrity": "sha512-IEW+q7yXgTT6+TFgJlOW+K5FK7kj1pBFW7oc04J/jlitMxq+vOJpmU42j+xaQlhwPx2JR805ryi73aLRWicXjQ==", + "license": "Apache-2.0", + "optional": true, "dependencies": { - "event-target-shim": "^5.0.0" -+ "@smithy/is-array-buffer": "^2.2.0", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { - "node": ">=6.5" -+ "node": ">=14.0.0" ++ "node": ">=20.0.0" } }, - "node_modules/accepts": { @@ -295,21 +300,24 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", - "license": "MIT", -+ "node_modules/@aws-crypto/util/node_modules/@smithy/util-utf8": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", -+ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", ++ "node_modules/@aws-sdk/credential-provider-env": { ++ "version": "3.972.48", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.48.tgz", ++ "integrity": "sha512-h6FEC95fbexUd6zxm4PdgS82bTcI2PRtUb2ZwMipb/Xr8bPwtf0G8rBo2jp7NA24Mbx2JA8/WingiYpA9RCCyw==", + "license": "Apache-2.0", + "optional": true, "dependencies": { - "mime-types": "~2.1.34", - "negotiator": "0.6.3" -+ "@smithy/util-buffer-from": "^2.2.0", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 0.6" -+ "node": ">=14.0.0" ++ "node": ">=20.0.0" } }, - "node_modules/accepts/node_modules/negotiator": { @@ -317,51 +325,19 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", - "license": "MIT", -+ "node_modules/@aws-sdk/client-cognito-identity": { -+ "version": "3.1037.0", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/client-cognito-identity/-/client-cognito-identity-3.1037.0.tgz", -+ "integrity": "sha512-/BQAyz98JRQFg3E8de3fGGydIYnsFRd6Cla4+zkviOe641fLCG0ZkPIk9D22HSi8qy9XKx+zk6ed2PcLO8uuPw==", ++ "node_modules/@aws-sdk/credential-provider-http": { ++ "version": "3.972.50", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.50.tgz", ++ "integrity": "sha512-lJO3OLpjvz5m/RSBQmsG/CEUGsvCy5ruxKwPQaOCqxqCMuyYT2BZwQUTDZVVwqQ9LrZKuK24JSa6r31hL/tvkg==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@aws-crypto/sha256-browser": "5.2.0", -+ "@aws-crypto/sha256-js": "5.2.0", -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/credential-provider-node": "^3.972.36", -+ "@aws-sdk/middleware-host-header": "^3.972.10", -+ "@aws-sdk/middleware-logger": "^3.972.10", -+ "@aws-sdk/middleware-recursion-detection": "^3.972.11", -+ "@aws-sdk/middleware-user-agent": "^3.972.35", -+ "@aws-sdk/region-config-resolver": "^3.972.13", -+ "@aws-sdk/types": "^3.973.8", -+ "@aws-sdk/util-endpoints": "^3.996.8", -+ "@aws-sdk/util-user-agent-browser": "^3.972.10", -+ "@aws-sdk/util-user-agent-node": "^3.973.21", -+ "@smithy/config-resolver": "^4.4.17", -+ "@smithy/core": "^3.23.17", -+ "@smithy/fetch-http-handler": "^5.3.17", -+ "@smithy/hash-node": "^4.2.14", -+ "@smithy/invalid-dependency": "^4.2.14", -+ "@smithy/middleware-content-length": "^4.2.14", -+ "@smithy/middleware-endpoint": "^4.4.32", -+ "@smithy/middleware-retry": "^4.5.5", -+ "@smithy/middleware-serde": "^4.2.20", -+ "@smithy/middleware-stack": "^4.2.14", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/node-http-handler": "^4.6.1", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", -+ "@smithy/util-base64": "^4.3.2", -+ "@smithy/util-body-length-browser": "^4.2.2", -+ "@smithy/util-body-length-node": "^4.2.3", -+ "@smithy/util-defaults-mode-browser": "^4.3.49", -+ "@smithy/util-defaults-mode-node": "^4.2.54", -+ "@smithy/util-endpoints": "^3.4.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-retry": "^4.3.4", -+ "@smithy/util-utf8": "^4.2.2", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/fetch-http-handler": "^5.4.6", ++ "@smithy/node-http-handler": "^4.7.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" + }, "engines": { @@ -376,57 +352,41 @@ index 2af3a0d1..5c5f4b73 100644 - "license": "MIT", - "engines": { - "node": ">=12" -+ "node_modules/@aws-sdk/core": { -+ "version": "3.974.5", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/core/-/core-3.974.5.tgz", -+ "integrity": "sha512-lMPlYlYfQdNZhlkJgnkmESwrY+hNh3PljmZ+37oAqLNdJ6rnILAwFSyc6B3bJeDOtMORNnMQIej0aTRuOlDyhQ==", ++ "node_modules/@aws-sdk/credential-provider-ini": { ++ "version": "3.972.55", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.55.tgz", ++ "integrity": "sha512-TBoF4buBGYhXjdZAryayY2TrkQj2B2KfE/msG4V53XCt+w0EhEwM2JRjx8p2grJ2C6gtH5++SAwEvGMRdi0yyw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@aws-sdk/types": "^3.973.8", -+ "@aws-sdk/xml-builder": "^3.972.19", -+ "@smithy/core": "^3.23.17", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/signature-v4": "^5.3.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-base64": "^4.3.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-retry": "^4.3.4", -+ "@smithy/util-utf8": "^4.2.2", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/credential-provider-env": "^3.972.48", ++ "@aws-sdk/credential-provider-http": "^3.972.50", ++ "@aws-sdk/credential-provider-login": "^3.972.54", ++ "@aws-sdk/credential-provider-process": "^3.972.48", ++ "@aws-sdk/credential-provider-sso": "^3.972.54", ++ "@aws-sdk/credential-provider-web-identity": "^3.972.54", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/credential-provider-imds": "^4.3.7", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, - "funding": { - "url": "https://github.com/chalk/ansi-regex?sponsor=1" -+ "engines": { -+ "node": ">=20.0.0" - } - }, +- } +- }, - "node_modules/ansi-styles": { - "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": { + "engines": { - "node": ">=12" -+ "node_modules/@aws-sdk/credential-provider-cognito-identity": { -+ "version": "3.972.28", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-cognito-identity/-/credential-provider-cognito-identity-3.972.28.tgz", -+ "integrity": "sha512-UXhc4FfxbfNaIqycDnIZ+W8CMAoCtcJJfZkq+cWSUwQRN0V0d0uAoN2qCFyKZip8inlHeKJmNQsPliKKcElP8Q==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" - }, +- }, - "funding": { - "url": "https://github.com/chalk/ansi-styles?sponsor=1" -+ "engines": { + "node": ">=20.0.0" } }, @@ -435,10 +395,10 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/archiver/-/archiver-7.0.1.tgz", - "integrity": "sha512-ZcbTaIqJOfCc03QwD468Unz/5Ir8ATtvAHsK+FdXbDIbGfihqh9mrvdcYunQzqn4HrvWWaFyaxJhGZagaJJpPQ==", - "license": "MIT", -+ "node_modules/@aws-sdk/credential-provider-env": { -+ "version": "3.972.31", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-env/-/credential-provider-env-3.972.31.tgz", -+ "integrity": "sha512-X/yGB73LmDW/6MdDJGCDzZBUXnM3ys4vs9l+5ZTJmiEswDdP1OjeoAFlFjVGS9o4KB2wZWQ9KOfdVNSSK6Ep3w==", ++ "node_modules/@aws-sdk/credential-provider-login": { ++ "version": "3.972.54", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.54.tgz", ++ "integrity": "sha512-hBWI3wZTdTGiuMfmPts6AWbAjFfRniOQnqx68tc2cQvRKWawFbN9wkLOVPWM1FAOyowZU73mC6Fi+rHSHNyLFw==", + "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -449,10 +409,11 @@ index 2af3a0d1..5c5f4b73 100644 - "readdir-glob": "^1.1.2", - "tar-stream": "^3.0.0", - "zip-stream": "^6.0.1" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { @@ -465,10 +426,10 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/archiver-utils/-/archiver-utils-5.0.2.tgz", - "integrity": "sha512-wuLJMmIBQYCsGZgYLTy5FIB2pF6Lfb6cXMSF8Qywwk3t20zWnAi7zLcQFdKQmIB8wyZpY5ER38x08GbwtR2cLA==", - "license": "MIT", -+ "node_modules/@aws-sdk/credential-provider-http": { -+ "version": "3.972.33", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-http/-/credential-provider-http-3.972.33.tgz", -+ "integrity": "sha512-c0ZF+lwoWVvX5iCaGKL5T/4DnIw88CGqxA0BcBs3U86mIp5EZYPVg+KSPkMXOyokmADvNewiMUfSG2uFwjRp0g==", ++ "node_modules/@aws-sdk/credential-provider-node": { ++ "version": "3.972.57", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.57.tgz", ++ "integrity": "sha512-u6dClpzNdWf1HGWz4wwhdXi1wiOofCLniM9S4BQQGlLAN9TW7VB+ld5V533GdKrYMaFeBGFqKnj0JCYvynLqwQ==", + "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -479,15 +440,16 @@ index 2af3a0d1..5c5f4b73 100644 - "lodash": "^4.17.15", - "normalize-path": "^3.0.0", - "readable-stream": "^4.0.0" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/fetch-http-handler": "^5.3.17", -+ "@smithy/node-http-handler": "^4.6.1", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-stream": "^4.5.25", ++ "@aws-sdk/credential-provider-env": "^3.972.48", ++ "@aws-sdk/credential-provider-http": "^3.972.50", ++ "@aws-sdk/credential-provider-ini": "^3.972.55", ++ "@aws-sdk/credential-provider-process": "^3.972.48", ++ "@aws-sdk/credential-provider-sso": "^3.972.54", ++ "@aws-sdk/credential-provider-web-identity": "^3.972.54", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/credential-provider-imds": "^4.3.7", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { @@ -512,27 +474,18 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", - "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", - "license": "MIT", -+ "node_modules/@aws-sdk/credential-provider-ini": { -+ "version": "3.972.35", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-ini/-/credential-provider-ini-3.972.35.tgz", -+ "integrity": "sha512-jsU4u/cRkKFLKQS0k918FQ27fzXLG5ENiLWQMYE6581zLeI2hWh04ptlrvZMB3wJT/5d+vSzJk74X1CMFr4y8Q==", ++ "node_modules/@aws-sdk/credential-provider-process": { ++ "version": "3.972.48", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.48.tgz", ++ "integrity": "sha512-w6VZwojPt12WnEkAUy6Nu4K6sWCbBmR7QX390b0nE6vRvkXbrYr9Lq9VySGkfjiMjpUA87op+J4EgvRmtWIDoQ==", + "license": "Apache-2.0", + "optional": true, "dependencies": { - "possible-typed-array-names": "^1.0.0" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/credential-provider-env": "^3.972.31", -+ "@aws-sdk/credential-provider-http": "^3.972.33", -+ "@aws-sdk/credential-provider-login": "^3.972.35", -+ "@aws-sdk/credential-provider-process": "^3.972.31", -+ "@aws-sdk/credential-provider-sso": "^3.972.35", -+ "@aws-sdk/credential-provider-web-identity": "^3.972.35", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/credential-provider-imds": "^4.2.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { @@ -547,22 +500,21 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "1.8.0", - "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz", - "integrity": "sha512-qRuSmNSkGQaHwNbM7J78Wwy+ghLEYF1zNrSeMxj4Kgw6y33O3mXcQ6Ie9fRvfU/YnxWkOchPXbaLb73TkIsfdg==", -+ "node_modules/@aws-sdk/credential-provider-login": { -+ "version": "3.972.35", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-login/-/credential-provider-login-3.972.35.tgz", -+ "integrity": "sha512-5oa3j0cA50jPqgNhZ9XdJVopuzUf1klRb28/2MfLYWWiPi9DRVvbrBWT+DidbHTT36520VuXZJahQwR+YgSjrg==", ++ "node_modules/@aws-sdk/credential-provider-sso": { ++ "version": "3.972.54", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.54.tgz", ++ "integrity": "sha512-23uZpIpF2SIFDCa1fcWa202tK4gGeyvX6GIIAjiB8WBsvsVRBMnJ/7dCxHzxf7eZT7GToJg837LDIBnZsl/VUg==", "license": "Apache-2.0", - "peerDependencies": { - "react-native-b4a": "*" + "optional": true, + "dependencies": { -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/token-providers": "3.1071.0", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, - "peerDependenciesMeta": { @@ -583,26 +535,20 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/bare-events/-/bare-events-2.8.2.tgz", - "integrity": "sha512-riJjyv1/mHLIPX4RwiK+oW9/4c3TEUeORHKefKAKnZ5kyslbN+HXowtbaVEqt4IMUB7OXlfixcs6gsFeo/jhiQ==", -+ "node_modules/@aws-sdk/credential-provider-node": { -+ "version": "3.972.36", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-node/-/credential-provider-node-3.972.36.tgz", -+ "integrity": "sha512-4nT2T8Z7vH8KE9EdjEsuIlHpZSlcaK2PrKbQBjuUGU46BCCzF3WvP0u0Uiosni3Ykmmn4rWLVawoOCLotUtCbg==", ++ "node_modules/@aws-sdk/credential-provider-web-identity": { ++ "version": "3.972.54", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.54.tgz", ++ "integrity": "sha512-0Iv5QttS6wcATlodYKgvQj6B9Db51rx7NU9fqu0PoLeS4BIgdYMc/QK4smwLwpm5RFrs02V/eLyEFp3FklvlNQ==", "license": "Apache-2.0", - "peerDependencies": { - "bare-abort-controller": "*" + "optional": true, + "dependencies": { -+ "@aws-sdk/credential-provider-env": "^3.972.31", -+ "@aws-sdk/credential-provider-http": "^3.972.33", -+ "@aws-sdk/credential-provider-ini": "^3.972.35", -+ "@aws-sdk/credential-provider-process": "^3.972.31", -+ "@aws-sdk/credential-provider-sso": "^3.972.35", -+ "@aws-sdk/credential-provider-web-identity": "^3.972.35", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/credential-provider-imds": "^4.2.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, - "peerDependenciesMeta": { @@ -617,10 +563,10 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "4.5.5", - "resolved": "https://registry.npmjs.org/bare-fs/-/bare-fs-4.5.5.tgz", - "integrity": "sha512-XvwYM6VZqKoqDll8BmSww5luA5eflDzY0uEFfBJtFKe4PAAtxBjU3YIxzIBzhyaEQBy1VXEQBto4cpN5RZJw+w==", -+ "node_modules/@aws-sdk/credential-provider-process": { -+ "version": "3.972.31", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-process/-/credential-provider-process-3.972.31.tgz", -+ "integrity": "sha512-eKeT4MXumpBJsrDLCYcSzIkFPVTFn/es7It2oogp2OhU/ic7P/+xzFpQx9ZhwtXS57Mc5S42BPWi7lHmvs/nYg==", ++ "node_modules/@aws-sdk/credential-providers": { ++ "version": "3.1072.0", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.1072.0.tgz", ++ "integrity": "sha512-TapaSwjVRVOV/1yEqlNRg6Co+YFnUBhYBlYZomHaY5FfbrsrtFueCBy0cDDrvr9s5wVIUkYLdsfiXeitatHfJg==", "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -629,11 +575,22 @@ index 2af3a0d1..5c5f4b73 100644 - "bare-stream": "^2.6.4", - "bare-url": "^2.2.2", - "fast-fifo": "^1.3.2" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/client-cognito-identity": "3.1072.0", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/credential-provider-cognito-identity": "^3.972.47", ++ "@aws-sdk/credential-provider-env": "^3.972.48", ++ "@aws-sdk/credential-provider-http": "^3.972.50", ++ "@aws-sdk/credential-provider-ini": "^3.972.55", ++ "@aws-sdk/credential-provider-login": "^3.972.54", ++ "@aws-sdk/credential-provider-node": "^3.972.57", ++ "@aws-sdk/credential-provider-process": "^3.972.48", ++ "@aws-sdk/credential-provider-sso": "^3.972.54", ++ "@aws-sdk/credential-provider-web-identity": "^3.972.54", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/credential-provider-imds": "^4.3.7", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, "engines": { @@ -653,20 +610,22 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/bare-os/-/bare-os-3.7.1.tgz", - "integrity": "sha512-ebvMaS5BgZKmJlvuWh14dg9rbUI84QeV3WlWn6Ph6lFI8jJoh7ADtVTyD2c93euwbe+zgi0DVrl4YmqXeM9aIA==", -+ "node_modules/@aws-sdk/credential-provider-sso": { -+ "version": "3.972.35", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-sso/-/credential-provider-sso-3.972.35.tgz", -+ "integrity": "sha512-bCuBdfnj0KGDMdLp6utMTLiJcFN2ek9EgZinxQZZSc3FxjJ/HSqeqab2cjbnoNfy8RM6suDCsRkmVY1izp9I+A==", ++ "node_modules/@aws-sdk/nested-clients": { ++ "version": "3.997.22", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.22.tgz", ++ "integrity": "sha512-4IwtcYSxEIVw5hcp8ogq0CMbFNZFw7jJUetpfFUhFFeqsa1K8j2Ihg2hnxLyOp3stMZnXda6VzOmPi1AFZQXcg==", "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/token-providers": "3.1036.0", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-crypto/sha256-browser": "5.2.0", ++ "@aws-crypto/sha256-js": "5.2.0", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/signature-v4-multi-region": "^3.996.35", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/fetch-http-handler": "^5.4.6", ++ "@smithy/node-http-handler": "^4.7.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" + }, "engines": { @@ -678,20 +637,17 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/bare-path/-/bare-path-3.0.0.tgz", - "integrity": "sha512-tyfW2cQcB5NN8Saijrhqn0Zh7AnFNsnczRcuWODH0eYAXBsJ5gVxAUuNr7tsHSC6IZ77cA0SitzT+s47kot8Mw==", -+ "node_modules/@aws-sdk/credential-provider-web-identity": { -+ "version": "3.972.35", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-provider-web-identity/-/credential-provider-web-identity-3.972.35.tgz", -+ "integrity": "sha512-swW6Bwvl8lanyEMtZOWE/oR6yqcRQH4HTQZUVsnDVgoXvRjRywpYpLv2BWwjUFyjPrqsdX6FeTkf4tMSe/qFTQ==", ++ "node_modules/@aws-sdk/signature-v4-multi-region": { ++ "version": "3.996.35", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.35.tgz", ++ "integrity": "sha512-6L/VWs+Wch2stHemCGTmUNqKLMzURxQDK5boNG3Jn3kAOp71meDUuS5sbObpEvFxHDq0uWeSLFDNSYsjNt+Dlg==", "license": "Apache-2.0", + "optional": true, "dependencies": { - "bare-os": "^3.0.1" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/signature-v4": "^5.4.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" + }, + "engines": { @@ -702,10 +658,10 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "2.8.0", - "resolved": "https://registry.npmjs.org/bare-stream/-/bare-stream-2.8.0.tgz", - "integrity": "sha512-reUN0M2sHRqCdG4lUK3Fw8w98eeUIZHL5c3H7Mbhk2yVBL+oofgaIp0ieLfD5QXwPCypBpmEEKU2WZKzbAk8GA==", -+ "node_modules/@aws-sdk/credential-providers": { -+ "version": "3.1037.0", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/credential-providers/-/credential-providers-3.1037.0.tgz", -+ "integrity": "sha512-TPPoQzfNkWltNgjJn3RRY1S8VXffDvv49xGGs9K0DrYS9LZCLLsoHmSmShx9HQusPc/4Oz23rfRWTolCU19PdQ==", ++ "node_modules/@aws-sdk/token-providers": { ++ "version": "3.1071.0", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1071.0.tgz", ++ "integrity": "sha512-4LDW2Qob6LoLFuqYSYZq2AyTE9koSE9+i+n5UZcm10GpmQOK0zRD9L4uYlzItiTKksIWgC/qMFChAi3RvKYtMg==", "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -715,25 +671,11 @@ index 2af3a0d1..5c5f4b73 100644 - "peerDependencies": { - "bare-buffer": "*", - "bare-events": "*" -+ "@aws-sdk/client-cognito-identity": "3.1037.0", -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/credential-provider-cognito-identity": "^3.972.28", -+ "@aws-sdk/credential-provider-env": "^3.972.31", -+ "@aws-sdk/credential-provider-http": "^3.972.33", -+ "@aws-sdk/credential-provider-ini": "^3.972.35", -+ "@aws-sdk/credential-provider-login": "^3.972.35", -+ "@aws-sdk/credential-provider-node": "^3.972.36", -+ "@aws-sdk/credential-provider-process": "^3.972.31", -+ "@aws-sdk/credential-provider-sso": "^3.972.35", -+ "@aws-sdk/credential-provider-web-identity": "^3.972.35", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/config-resolver": "^4.4.17", -+ "@smithy/core": "^3.23.17", -+ "@smithy/credential-provider-imds": "^4.2.14", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/types": "^4.14.1", ++ "@aws-sdk/core": "^3.974.22", ++ "@aws-sdk/nested-clients": "^3.997.22", ++ "@aws-sdk/types": "^3.973.13", ++ "@smithy/core": "^3.24.6", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" }, - "peerDependenciesMeta": { @@ -751,10 +693,10 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "2.3.2", - "resolved": "https://registry.npmjs.org/bare-url/-/bare-url-2.3.2.tgz", - "integrity": "sha512-ZMq4gd9ngV5aTMa5p9+UfY0b3skwhHELaDkhEHetMdX0LRkW9kzaym4oo/Eh+Ghm0CCDuMTsRIGM/ytUc1ZYmw==", -+ "node_modules/@aws-sdk/middleware-host-header": { -+ "version": "3.972.10", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-host-header/-/middleware-host-header-3.972.10.tgz", -+ "integrity": "sha512-IJSsIMeVQ8MMCPbuh1AbltkFhLBLXn7aejzfX5YKT/VLDHn++Dcz8886tXckE+wQssyPUhaXrJhdakO2VilRhg==", ++ "node_modules/@aws-sdk/types": { ++ "version": "3.973.13", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.13.tgz", ++ "integrity": "sha512-pEHZqRkAlHfnfAU9tK+WpKv/gBNjGJrHMgA3A0iYRGyswBS2t0pfez+lWlwktb3Bqa0ovh7w/QJTFwp3fDxLNg==", "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -786,9 +728,7 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/bignumber.js/-/bignumber.js-9.3.1.tgz", - "integrity": "sha512-Ko0uX15oIUS7wJ3Rb30Fs6SkVbLmPBAKdlm7q9+ak9bbIeFf0MwuBsQV6z7+X768/cHsfg+WlysDWJcmthjsjQ==", - "license": "MIT", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", ++ "@smithy/types": "^4.14.3", + "tslib": "^2.6.2" + }, "engines": { @@ -801,10 +741,10 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", - "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", - "license": "MIT", -+ "node_modules/@aws-sdk/middleware-logger": { -+ "version": "3.972.10", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-logger/-/middleware-logger-3.972.10.tgz", -+ "integrity": "sha512-OOuGvvz1Dm20SjZo5oEBePFqxt5nf8AwkNDSyUHvD9/bfNASmstcYxFAHUowy4n6Io7mWUZ04JURZwSBvyQanQ==", ++ "node_modules/@aws-sdk/util-locate-window": { ++ "version": "3.965.8", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.8.tgz", ++ "integrity": "sha512-uUbMs1cBZPafD0ohUj6EwNf0fPZ534NvBxHox4hjX+0Rxq5paSYUem7+hi833pYrzrcnBATKIYpR02MDXT5M9g==", + "license": "Apache-2.0", + "optional": true, "dependencies": { @@ -820,22 +760,32 @@ index 2af3a0d1..5c5f4b73 100644 - "raw-body": "~2.5.3", - "type-is": "~1.6.18", - "unpipe": "~1.0.0" -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/types": "^4.14.1", + "tslib": "^2.6.2" }, "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" -- } -- }, ++ "node": ">=20.0.0" + } + }, - "node_modules/brace-expansion": { - "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": { ++ "node_modules/@aws-sdk/xml-builder": { ++ "version": "3.972.30", ++ "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.30.tgz", ++ "integrity": "sha512-StElZPEoBquWwNqw1AcfpzEyZqJvFxouG+mpDNYlcH6ZOrqd2CuIryv+8LV8gNHZUOyKyJF3Dq9vxaXEmDR9TQ==", ++ "license": "Apache-2.0", ++ "optional": true, + "dependencies": { - "balanced-match": "^1.0.0" ++ "@smithy/types": "^4.14.3", ++ "fast-xml-parser": "5.7.3", ++ "tslib": "^2.6.2" ++ }, ++ "engines": { + "node": ">=20.0.0" } }, @@ -843,9 +793,13 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", -- "funding": [ -- { -- "type": "github", ++ "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": { ++ "version": "5.7.3", ++ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.3.tgz", ++ "integrity": "sha512-C0AaNuC+mscy6vrAQKAc/rMq+zAPHodfHGZu4sGVehvAQt/JLG1O5zEcYcXSY5zSqr4YVgxsB+pHXTq0i7eDlg==", + "funding": [ + { + "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { @@ -855,438 +809,16 @@ index 2af3a0d1..5c5f4b73 100644 - { - "type": "consulting", - "url": "https://feross.org/support" -- } -- ], -- "license": "MIT", -+ "node_modules/@aws-sdk/middleware-recursion-detection": { -+ "version": "3.972.11", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-recursion-detection/-/middleware-recursion-detection-3.972.11.tgz", -+ "integrity": "sha512-+zz6f79Kj9V5qFK2P+D8Ehjnw4AhphAlCAsPjUqEcInA9umtSSKMrHbSagEeOIsDNuvVrH98bjRHcyQukTrhaQ==", -+ "license": "Apache-2.0", ++ "url": "https://github.com/sponsors/NaturalIntelligence" + } + ], + "license": "MIT", + "optional": true, "dependencies": { - "base64-js": "^1.3.1", - "ieee754": "^1.2.1" -- } -- }, -- "node_modules/buffer-crc32": { -- "version": "1.0.0", -- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz", -- "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==", -- "license": "MIT", -+ "@aws-sdk/types": "^3.973.8", -+ "@aws/lambda-invoke-store": "^0.2.2", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, - "engines": { -- "node": ">=8.0.0" -+ "node": ">=20.0.0" - } - }, -- "node_modules/bytes": { -- "version": "3.1.2", -- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", -- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", -- "license": "MIT", -+ "node_modules/@aws-sdk/middleware-sdk-s3": { -+ "version": "3.972.34", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-sdk-s3/-/middleware-sdk-s3-3.972.34.tgz", -+ "integrity": "sha512-/UL96JKjsjdodcRRMKl99tLQvK6Oi9ptLC9iU1yiTF/ruaDX0mtBBtnLNZDxIZRJOCVOtB49ed1YaTadqygk8Q==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/types": "^3.973.8", -+ "@aws-sdk/util-arn-parser": "^3.972.3", -+ "@smithy/core": "^3.23.17", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/signature-v4": "^5.3.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-config-provider": "^4.2.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-stream": "^4.5.25", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, - "engines": { -- "node": ">= 0.8" -+ "node": ">=20.0.0" - } - }, -- "node_modules/call-bind": { -- "version": "1.0.8", -- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", -- "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", -- "license": "MIT", -+ "node_modules/@aws-sdk/middleware-user-agent": { -+ "version": "3.972.35", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/middleware-user-agent/-/middleware-user-agent-3.972.35.tgz", -+ "integrity": "sha512-hOFWNOjVmOocpRlrU04nYxjMOeoe0Obu5AXEuhB8zblMCPl3cG1hdluQCZERRKFyhMQjwZnDbhSHjoMUjetFGw==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "call-bind-apply-helpers": "^1.0.0", -- "es-define-property": "^1.0.0", -- "get-intrinsic": "^1.2.4", -- "set-function-length": "^1.2.2" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/types": "^3.973.8", -+ "@aws-sdk/util-endpoints": "^3.996.8", -+ "@smithy/core": "^3.23.17", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-retry": "^4.3.4", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=20.0.0" - } - }, -- "node_modules/call-bind-apply-helpers": { -- "version": "1.0.2", -- "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", -- "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", -- "license": "MIT", -+ "node_modules/@aws-sdk/nested-clients": { -+ "version": "3.997.3", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/nested-clients/-/nested-clients-3.997.3.tgz", -+ "integrity": "sha512-SivE6GP228IVgfsrr2c/vqTg95X0Qj39Yw4uIrcddpkUzIltNMoNOR62leHOLhODfjv9K8X2mPTwS69A5kT0nQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "es-errors": "^1.3.0", -- "function-bind": "^1.1.2" -+ "@aws-crypto/sha256-browser": "5.2.0", -+ "@aws-crypto/sha256-js": "5.2.0", -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/middleware-host-header": "^3.972.10", -+ "@aws-sdk/middleware-logger": "^3.972.10", -+ "@aws-sdk/middleware-recursion-detection": "^3.972.11", -+ "@aws-sdk/middleware-user-agent": "^3.972.35", -+ "@aws-sdk/region-config-resolver": "^3.972.13", -+ "@aws-sdk/signature-v4-multi-region": "^3.996.22", -+ "@aws-sdk/types": "^3.973.8", -+ "@aws-sdk/util-endpoints": "^3.996.8", -+ "@aws-sdk/util-user-agent-browser": "^3.972.10", -+ "@aws-sdk/util-user-agent-node": "^3.973.21", -+ "@smithy/config-resolver": "^4.4.17", -+ "@smithy/core": "^3.23.17", -+ "@smithy/fetch-http-handler": "^5.3.17", -+ "@smithy/hash-node": "^4.2.14", -+ "@smithy/invalid-dependency": "^4.2.14", -+ "@smithy/middleware-content-length": "^4.2.14", -+ "@smithy/middleware-endpoint": "^4.4.32", -+ "@smithy/middleware-retry": "^4.5.5", -+ "@smithy/middleware-serde": "^4.2.20", -+ "@smithy/middleware-stack": "^4.2.14", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/node-http-handler": "^4.6.1", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", -+ "@smithy/util-base64": "^4.3.2", -+ "@smithy/util-body-length-browser": "^4.2.2", -+ "@smithy/util-body-length-node": "^4.2.3", -+ "@smithy/util-defaults-mode-browser": "^4.3.49", -+ "@smithy/util-defaults-mode-node": "^4.2.54", -+ "@smithy/util-endpoints": "^3.4.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-retry": "^4.3.4", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.4" -+ "node": ">=20.0.0" - } - }, -- "node_modules/call-bound": { -- "version": "1.0.4", -- "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", -- "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", -- "license": "MIT", -+ "node_modules/@aws-sdk/region-config-resolver": { -+ "version": "3.972.13", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/region-config-resolver/-/region-config-resolver-3.972.13.tgz", -+ "integrity": "sha512-CvJ2ZIjK/jVD/lbOpowBVElJyC1YxLTIJ13yM0AEo0t2v7swOzGjSA6lJGH+DwZXQhcjUjoYwc8bVYCX5MDr1A==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "call-bind-apply-helpers": "^1.0.2", -- "get-intrinsic": "^1.3.0" -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/config-resolver": "^4.4.17", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=20.0.0" - } - }, -- "node_modules/cbor": { -- "version": "5.2.0", -- "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz", -- "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==", -- "license": "MIT", -+ "node_modules/@aws-sdk/signature-v4-multi-region": { -+ "version": "3.996.22", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/signature-v4-multi-region/-/signature-v4-multi-region-3.996.22.tgz", -+ "integrity": "sha512-/rXhMXteD+BqhFd0nYprAgcZ/KtU+963uftPqd3tiFcFfooHZINXUGtOmo2SQjRVauCTNqIEzkwuSETdZFqTTA==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "bignumber.js": "^9.0.1", -- "nofilter": "^1.0.4" -+ "@aws-sdk/middleware-sdk-s3": "^3.972.34", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/signature-v4": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">=6.0.0" -+ "node": ">=20.0.0" - } - }, -- "node_modules/color-convert": { -- "version": "2.0.1", -- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", -- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", -- "license": "MIT", -+ "node_modules/@aws-sdk/token-providers": { -+ "version": "3.1036.0", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/token-providers/-/token-providers-3.1036.0.tgz", -+ "integrity": "sha512-aNSJ6jjDYayxN9ZA1JpycVScX93Lx03kKZ1EXt3DGOTahcWVLJj3oLAlop0xKP+vP2Ga2t49p1tEaMkTbCCaZA==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "color-name": "~1.1.4" -+ "@aws-sdk/core": "^3.974.5", -+ "@aws-sdk/nested-clients": "^3.997.3", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">=7.0.0" -+ "node": ">=20.0.0" - } - }, -- "node_modules/color-name": { -- "version": "1.1.4", -- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", -- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", -- "license": "MIT" -- }, -- "node_modules/compress-commons": { -- "version": "6.0.2", -- "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz", -- "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==", -- "license": "MIT", -+ "node_modules/@aws-sdk/types": { -+ "version": "3.973.8", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/types/-/types-3.973.8.tgz", -+ "integrity": "sha512-gjlAdtHMbtR9X5iIhVUvbVcy55KnznpC6bkDUWW9z915bi0ckdUr5cjf16Kp6xq0bP5HBD2xzgbL9F9Quv5vUw==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "crc-32": "^1.2.0", -- "crc32-stream": "^6.0.0", -- "is-stream": "^2.0.1", -- "normalize-path": "^3.0.0", -- "readable-stream": "^4.0.0" -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 14" -+ "node": ">=20.0.0" - } - }, -- "node_modules/compressible": { -- "version": "2.0.18", -- "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", -- "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", -- "license": "MIT", -+ "node_modules/@aws-sdk/util-arn-parser": { -+ "version": "3.972.3", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-arn-parser/-/util-arn-parser-3.972.3.tgz", -+ "integrity": "sha512-HzSD8PMFrvgi2Kserxuff5VitNq2sgf3w9qxmskKDiDTThWfVteJxuCS9JXiPIPtmCrp+7N9asfIaVhBFORllA==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "mime-db": ">= 1.43.0 < 2" -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=20.0.0" - } - }, -- "node_modules/compression": { -- "version": "1.8.1", -- "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", -- "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", -- "license": "MIT", -+ "node_modules/@aws-sdk/util-endpoints": { -+ "version": "3.996.8", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-endpoints/-/util-endpoints-3.996.8.tgz", -+ "integrity": "sha512-oOZHcRDihk5iEe5V25NVWg45b3qEA8OpHWVdU/XQh8Zj4heVPAJqWvMphQnU7LkufmUo10EpvFPZuQMiFLJK3g==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "bytes": "3.1.2", -- "compressible": "~2.0.18", -- "debug": "2.6.9", -- "negotiator": "~0.6.4", -- "on-headers": "~1.1.0", -- "safe-buffer": "5.2.1", -- "vary": "~1.1.2" -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", -+ "@smithy/util-endpoints": "^3.4.2", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.8.0" -+ "node": ">=20.0.0" - } - }, -- "node_modules/content-disposition": { -- "version": "0.5.4", -- "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", -- "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", -- "license": "MIT", -+ "node_modules/@aws-sdk/util-locate-window": { -+ "version": "3.965.5", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-locate-window/-/util-locate-window-3.965.5.tgz", -+ "integrity": "sha512-WhlJNNINQB+9qtLtZJcpQdgZw3SCDCpXdUJP7cToGwHbCWCnRckGlc6Bx/OhWwIYFNAn+FIydY8SZ0QmVu3xTQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "safe-buffer": "5.2.1" -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=20.0.0" - } - }, -- "node_modules/content-type": { -- "version": "1.0.5", -- "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", -- "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", -- "license": "MIT", -- "engines": { -- "node": ">= 0.6" -+ "node_modules/@aws-sdk/util-user-agent-browser": { -+ "version": "3.972.10", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-browser/-/util-user-agent-browser-3.972.10.tgz", -+ "integrity": "sha512-FAzqXvfEssGdSIz8ejatan0bOdx1qefBWKF/gWmVBXIP1HkS7v/wjjaqrAGGKvyihrXTXW00/2/1nTJtxpXz7g==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/types": "^4.14.1", -+ "bowser": "^2.11.0", -+ "tslib": "^2.6.2" - } - }, -- "node_modules/cookie": { -- "version": "0.7.2", -- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", -- "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", -- "license": "MIT", -+ "node_modules/@aws-sdk/util-user-agent-node": { -+ "version": "3.973.21", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/util-user-agent-node/-/util-user-agent-node-3.973.21.tgz", -+ "integrity": "sha512-Av4UHTcAWgdvbN0IP9pbtf4Qa1+6LtJqQdZWj5pLn5J67w0pnJJAZZ+7JPPcj2KN3378zD2JDM9DwJKEyvyMTQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@aws-sdk/middleware-user-agent": "^3.972.35", -+ "@aws-sdk/types": "^3.973.8", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-config-provider": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=20.0.0" -+ }, -+ "peerDependencies": { -+ "aws-crt": ">=1.0.0" -+ }, -+ "peerDependenciesMeta": { -+ "aws-crt": { -+ "optional": true -+ } - } - }, -- "node_modules/cookie-session": { -- "version": "2.1.1", -- "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz", -- "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==", -- "license": "MIT", -+ "node_modules/@aws-sdk/xml-builder": { -+ "version": "3.972.19", -+ "resolved": "https://registry.npmjs.org/@aws-sdk/xml-builder/-/xml-builder-3.972.19.tgz", -+ "integrity": "sha512-Cw8IOMdBUEIl8ZlhRC3Dc/E64D5B5/8JhV6vhPLiPfJwcRC84S6F8aBOIi/N4vR9ZyA4I5Cc0Ateb/9EHaJXeQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "cookies": "0.9.1", -- "debug": "3.2.7", -- "on-headers": "~1.1.0", -- "safe-buffer": "5.2.1" -+ "@smithy/types": "^4.14.1", -+ "fast-xml-parser": "5.7.1", -+ "tslib": "^2.6.2" - }, - "engines": { -- "node": ">= 0.10" -+ "node": ">=20.0.0" - } - }, -- "node_modules/cookie-session/node_modules/debug": { -- "version": "3.2.7", -- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", -- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", -+ "node_modules/@aws-sdk/xml-builder/node_modules/fast-xml-parser": { -+ "version": "5.7.1", -+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.1.tgz", -+ "integrity": "sha512-8Cc3f8GUGUULg34pBch/KGyPLglS+OFs05deyOlY7fL2MTagYPKrVQNmR1fLF/yJ9PH5ZSTd3YDF6pnmeZU+zA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/NaturalIntelligence" -+ } -+ ], - "license": "MIT", -+ "optional": true, - "dependencies": { -- "ms": "^2.1.1" + "@nodable/entities": "^2.1.0", -+ "fast-xml-builder": "^1.1.5", ++ "fast-xml-builder": "^1.1.7", + "path-expression-matcher": "^1.5.0", + "strnum": "^2.2.3" + }, @@ -1294,40 +826,33 @@ index 2af3a0d1..5c5f4b73 100644 + "fxparser": "src/cli/cli.js" } }, -- "node_modules/cookie-session/node_modules/ms": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -- "license": "MIT" -- }, -- "node_modules/cookie-signature": { -- "version": "1.0.7", -- "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", -- "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", -- "license": "MIT" +- "node_modules/buffer-crc32": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-1.0.0.tgz", +- "integrity": "sha512-Db1SbgBS/fg/392AblrMJk97KggmvYhr4pB5ZIMTWtaivCPMWLkmb7m21cJvpvgK+J3nsU2CmmixNBZx4vFj/w==", +- "license": "MIT", + "node_modules/@aws/lambda-invoke-store": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/@aws/lambda-invoke-store/-/lambda-invoke-store-0.2.4.tgz", + "integrity": "sha512-iY8yvjE0y651BixKNPgmv1WrQc+GZ142sb0z4gYnChDDY2YqI4P/jsSopBWrKfAt7LOJAkOXt7rC/hms+WclQQ==", + "license": "Apache-2.0", + "optional": true, -+ "engines": { + "engines": { +- "node": ">=8.0.0" + "node": ">=18.0.0" -+ } + } }, -- "node_modules/cookies": { -- "version": "0.9.1", -- "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz", -- "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==", +- "node_modules/bytes": { +- "version": "3.1.2", +- "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", +- "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", + "node_modules/@babel/cli": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.28.6.tgz", -+ "integrity": "sha512-6EUNcuBbNkj08Oj4gAZ+BUU8yLCgKzgVX4gaTh09Ya2C8ICM4P+G30g4m3akRxSYAp3A/gnWchrNst7px4/nUQ==", ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/cli/-/cli-7.29.7.tgz", ++ "integrity": "sha512-/75HwRbAYPqXv/Ax1h7Fg3IZfXgdU98jnA8H93/m/QBaPV3Hp5ICoLqzGYye1yHBCgpmXvtqgSUN8oOKX5tojQ==", "license": "MIT", + "optional": true, - "dependencies": { -- "depd": "~2.0.0", -- "keygrip": "~1.1.0" ++ "dependencies": { + "@jridgewell/trace-mapping": "^0.3.28", + "commander": "^6.2.0", + "convert-source-map": "^2.0.0", @@ -1339,7 +864,7 @@ index 2af3a0d1..5c5f4b73 100644 + "bin": { + "babel": "bin/babel.js", + "babel-external-helpers": "bin/babel-external-helpers.js" - }, ++ }, "engines": { - "node": ">= 0.8" + "node": ">=6.9.0" @@ -1352,29 +877,25 @@ index 2af3a0d1..5c5f4b73 100644 + "@babel/core": "^7.0.0-0" } }, -- "node_modules/core-util-is": { -- "version": "1.0.3", -- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", -- "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", -- "license": "MIT" +- "node_modules/call-bind": { +- "version": "1.0.8", +- "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", +- "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", + "node_modules/@babel/cli/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", -+ "license": "MIT", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "call-bind-apply-helpers": "^1.0.0", +- "es-define-property": "^1.0.0", +- "get-intrinsic": "^1.2.4", +- "set-function-length": "^1.2.2" + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } - }, -- "node_modules/crc-32": { -- "version": "1.2.2", -- "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", -- "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", -- "license": "Apache-2.0", -- "bin": { -- "crc32": "bin/crc32.njs" ++ }, + "node_modules/@babel/cli/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -1391,17 +912,18 @@ index 2af3a0d1..5c5f4b73 100644 + "path-is-absolute": "^1.0.0" }, "engines": { -- "node": ">=0.8" +- "node": ">= 0.4" + "node": "*" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/sponsors/isaacs" } }, -- "node_modules/crc32-stream": { -- "version": "6.0.0", -- "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz", -- "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==", +- "node_modules/call-bind-apply-helpers": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", +- "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", - "license": "MIT", + "node_modules/@babel/cli/node_modules/minimatch": { + "version": "3.1.5", @@ -1410,77 +932,72 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "ISC", + "optional": true, "dependencies": { -- "crc-32": "^1.2.0", -- "readable-stream": "^4.0.0" +- "es-errors": "^1.3.0", +- "function-bind": "^1.1.2" + "brace-expansion": "^1.1.7" }, "engines": { -- "node": ">= 14" +- "node": ">= 0.4" + "node": "*" } }, -- "node_modules/cross-spawn": { -- "version": "7.0.6", -- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", -- "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", +- "node_modules/call-bound": { +- "version": "1.0.4", +- "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", +- "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", + "node_modules/@babel/code-frame": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", -+ "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", ++ "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", "license": "MIT", + "optional": true, "dependencies": { -- "path-key": "^3.1.0", -- "shebang-command": "^2.0.0", -- "which": "^2.0.1" -+ "@babel/helper-validator-identifier": "^7.28.5", +- "call-bind-apply-helpers": "^1.0.2", +- "get-intrinsic": "^1.3.0" ++ "@babel/helper-validator-identifier": "^7.29.7", + "js-tokens": "^4.0.0", + "picocolors": "^1.1.1" }, "engines": { -- "node": ">= 8" +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node": ">=6.9.0" } }, -- "node_modules/debug": { -- "version": "2.6.9", -- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", -- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", +- "node_modules/cbor": { +- "version": "5.2.0", +- "resolved": "https://registry.npmjs.org/cbor/-/cbor-5.2.0.tgz", +- "integrity": "sha512-5IMhi9e1QU76ppa5/ajP1BmMWZ2FHkhAhjeVKQ/EFCgYSEaeVaoGtL7cxJskf9oCCk+XjzaIdc3IuU/dbA/o2A==", + "node_modules/@babel/compat-data": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", -+ "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", - "license": "MIT", -- "dependencies": { -- "ms": "2.0.0" ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", ++ "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", ++ "license": "MIT", + "optional": true, + "engines": { + "node": ">=6.9.0" - } - }, -- "node_modules/define-data-property": { -- "version": "1.1.4", -- "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", -- "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", ++ } ++ }, + "node_modules/@babel/core": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", -+ "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", ++ "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "license": "MIT", + "optional": true, "dependencies": { -- "es-define-property": "^1.0.0", -- "es-errors": "^1.3.0", -- "gopd": "^1.0.1" -+ "@babel/code-frame": "^7.29.0", -+ "@babel/generator": "^7.29.0", -+ "@babel/helper-compilation-targets": "^7.28.6", -+ "@babel/helper-module-transforms": "^7.28.6", -+ "@babel/helpers": "^7.28.6", -+ "@babel/parser": "^7.29.0", -+ "@babel/template": "^7.28.6", -+ "@babel/traverse": "^7.29.0", -+ "@babel/types": "^7.29.0", +- "bignumber.js": "^9.0.1", +- "nofilter": "^1.0.4" ++ "@babel/code-frame": "^7.29.7", ++ "@babel/generator": "^7.29.7", ++ "@babel/helper-compilation-targets": "^7.29.7", ++ "@babel/helper-module-transforms": "^7.29.7", ++ "@babel/helpers": "^7.29.7", ++ "@babel/parser": "^7.29.7", ++ "@babel/template": "^7.29.7", ++ "@babel/traverse": "^7.29.7", ++ "@babel/types": "^7.29.7", + "@jridgewell/remapping": "^2.3.5", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", @@ -1489,30 +1006,30 @@ index 2af3a0d1..5c5f4b73 100644 + "semver": "^6.3.1" }, "engines": { -- "node": ">= 0.4" +- "node": ">=6.0.0" + "node": ">=6.9.0" - }, - "funding": { -- "url": "https://github.com/sponsors/ljharb" ++ }, ++ "funding": { + "type": "opencollective", + "url": "https://opencollective.com/babel" } }, -- "node_modules/depd": { -- "version": "2.0.0", -- "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", -- "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", +- "node_modules/color-convert": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", +- "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "node_modules/@babel/core/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "color-name": "~1.1.4" + "ms": "^2.1.3" -+ }, + }, "engines": { -- "node": ">= 0.8" +- "node": ">=7.0.0" + "node": ">=6.0" + }, + "peerDependenciesMeta": { @@ -1521,31 +1038,415 @@ index 2af3a0d1..5c5f4b73 100644 + } } }, -- "node_modules/destroy": { -- "version": "1.2.0", -- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", -- "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", +- "node_modules/color-name": { +- "version": "1.1.4", +- "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", +- "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", +- "license": "MIT" + "node_modules/@babel/core/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "license": "MIT", + "optional": true -+ }, + }, +- "node_modules/compress-commons": { +- "version": "6.0.2", +- "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-6.0.2.tgz", +- "integrity": "sha512-6FqVXeETqWPoGcfzrXb37E50NP0LXT8kAMu5ooZayhWWdgEY4lBEEcbQNXtkuKQsGduxiIcI4gOTsxTmuq/bSg==", + "node_modules/@babel/generator": { -+ "version": "7.29.1", -+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", -+ "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", ++ "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "license": "MIT", + "optional": true, -+ "dependencies": { -+ "@babel/parser": "^7.29.0", -+ "@babel/types": "^7.29.0", + "dependencies": { +- "crc-32": "^1.2.0", +- "crc32-stream": "^6.0.0", +- "is-stream": "^2.0.1", +- "normalize-path": "^3.0.0", +- "readable-stream": "^4.0.0" ++ "@babel/parser": "^7.29.7", ++ "@babel/types": "^7.29.7", + "@jridgewell/gen-mapping": "^0.3.12", + "@jridgewell/trace-mapping": "^0.3.28", + "jsesc": "^3.0.2" + }, + "engines": { +- "node": ">= 14" ++ "node": ">=6.9.0" + } + }, +- "node_modules/compressible": { +- "version": "2.0.18", +- "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", +- "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", ++ "node_modules/@babel/helper-annotate-as-pure": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.29.7.tgz", ++ "integrity": "sha512-OoK6239jHPuSQOoS0kfTVKn0b/rVTk0seKq4Gd2UMLtmOVLjDC0ki3e+c90Trqv2gMfvJFqkiljrr568+qddiw==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "mime-db": ">= 1.43.0 < 2" ++ "@babel/types": "^7.29.7" + }, + "engines": { +- "node": ">= 0.6" ++ "node": ">=6.9.0" + } + }, +- "node_modules/compression": { +- "version": "1.8.1", +- "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", +- "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", ++ "node_modules/@babel/helper-compilation-targets": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", ++ "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "bytes": "3.1.2", +- "compressible": "~2.0.18", +- "debug": "2.6.9", +- "negotiator": "~0.6.4", +- "on-headers": "~1.1.0", +- "safe-buffer": "5.2.1", +- "vary": "~1.1.2" ++ "@babel/compat-data": "^7.29.7", ++ "@babel/helper-validator-option": "^7.29.7", ++ "browserslist": "^4.24.0", ++ "lru-cache": "^5.1.1", ++ "semver": "^6.3.1" + }, + "engines": { +- "node": ">= 0.8.0" ++ "node": ">=6.9.0" + } + }, +- "node_modules/content-disposition": { +- "version": "0.5.4", +- "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", +- "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", +- "license": "MIT", ++ "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { ++ "version": "5.1.1", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", ++ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", ++ "license": "ISC", ++ "optional": true, + "dependencies": { +- "safe-buffer": "5.2.1" +- }, +- "engines": { +- "node": ">= 0.6" ++ "yallist": "^3.0.2" + } + }, +- "node_modules/content-type": { +- "version": "1.0.5", +- "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", +- "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", ++ "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { ++ "version": "3.1.1", ++ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", ++ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", ++ "license": "ISC", ++ "optional": true ++ }, ++ "node_modules/@babel/helper-globals": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", ++ "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", + "license": "MIT", ++ "optional": true, + "engines": { +- "node": ">= 0.6" ++ "node": ">=6.9.0" + } + }, +- "node_modules/cookie": { +- "version": "0.7.2", +- "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.2.tgz", +- "integrity": "sha512-yki5XnKuf750l50uGTllt6kKILY4nQ1eNIQatoXEByZ5dWgnKqbnqmTrBE5B4N7lrMJKQ2ytWMiTO2o0v6Ew/w==", ++ "node_modules/@babel/helper-module-imports": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", ++ "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", + "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@babel/traverse": "^7.29.7", ++ "@babel/types": "^7.29.7" + }, "engines": { +- "node": ">= 0.6" ++ "node": ">=6.9.0" + } + }, +- "node_modules/cookie-session": { +- "version": "2.1.1", +- "resolved": "https://registry.npmjs.org/cookie-session/-/cookie-session-2.1.1.tgz", +- "integrity": "sha512-ji3kym/XZaFVew1+tIZk5ZLp9Z/fLv9rK1aZmpug0FsgE7Cu3ZDrUdRo7FT9vFjMYfNimrrUHJzywDwT7XEFlg==", ++ "node_modules/@babel/helper-module-transforms": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", ++ "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "cookies": "0.9.1", +- "debug": "3.2.7", +- "on-headers": "~1.1.0", +- "safe-buffer": "5.2.1" ++ "@babel/helper-module-imports": "^7.29.7", ++ "@babel/helper-validator-identifier": "^7.29.7", ++ "@babel/traverse": "^7.29.7" + }, + "engines": { +- "node": ">= 0.10" ++ "node": ">=6.9.0" ++ }, ++ "peerDependencies": { ++ "@babel/core": "^7.0.0" + } + }, +- "node_modules/cookie-session/node_modules/debug": { +- "version": "3.2.7", +- "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", +- "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", ++ "node_modules/@babel/helper-plugin-utils": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.29.7.tgz", ++ "integrity": "sha512-G7sHYigPY17oO5SYWnfD/0MTBwVR781S/JI643e/JhUYgVgWE/61SoW3NH9KWUKyKq5LVh3npif99Wkt6j86Jw==", + "license": "MIT", +- "dependencies": { +- "ms": "^2.1.1" ++ "optional": true, ++ "engines": { ++ "node": ">=6.9.0" + } + }, +- "node_modules/cookie-session/node_modules/ms": { +- "version": "2.1.3", +- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", +- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", +- "license": "MIT" +- }, +- "node_modules/cookie-signature": { +- "version": "1.0.7", +- "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.7.tgz", +- "integrity": "sha512-NXdYc3dLr47pBkpUCHtKSwIOQXLVn8dZEuywboCOJY/osA0wFSLlSawr3KN8qXJEyX66FcONTH8EIlVuK0yyFA==", +- "license": "MIT" ++ "node_modules/@babel/helper-string-parser": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", ++ "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=6.9.0" ++ } + }, +- "node_modules/cookies": { +- "version": "0.9.1", +- "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz", +- "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==", ++ "node_modules/@babel/helper-validator-identifier": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", ++ "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", + "license": "MIT", +- "dependencies": { +- "depd": "~2.0.0", +- "keygrip": "~1.1.0" +- }, ++ "optional": true, + "engines": { +- "node": ">= 0.8" ++ "node": ">=6.9.0" + } + }, +- "node_modules/core-util-is": { +- "version": "1.0.3", +- "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", +- "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", +- "license": "MIT" ++ "node_modules/@babel/helper-validator-option": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", ++ "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=6.9.0" ++ } + }, +- "node_modules/crc-32": { +- "version": "1.2.2", +- "resolved": "https://registry.npmjs.org/crc-32/-/crc-32-1.2.2.tgz", +- "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==", +- "license": "Apache-2.0", +- "bin": { +- "crc32": "bin/crc32.njs" ++ "node_modules/@babel/helpers": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", ++ "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@babel/template": "^7.29.7", ++ "@babel/types": "^7.29.7" + }, + "engines": { +- "node": ">=0.8" ++ "node": ">=6.9.0" + } + }, +- "node_modules/crc32-stream": { +- "version": "6.0.0", +- "resolved": "https://registry.npmjs.org/crc32-stream/-/crc32-stream-6.0.0.tgz", +- "integrity": "sha512-piICUB6ei4IlTv1+653yq5+KoqfBYmj9bw6LqXoOneTMDXk5nM1qt12mFW1caG3LlJXEKW1Bp0WggEmIfQB34g==", ++ "node_modules/@babel/node": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.29.7.tgz", ++ "integrity": "sha512-nfdPXz8/mD3/t+1nE1DKwGR14Ccjt5xeF7u3g7sqWnLi4yR6n+9Z0kThIROF8SRM07ZKpEtiWSKpWKxsMiJeew==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "crc-32": "^1.2.0", +- "readable-stream": "^4.0.0" ++ "@babel/register": "^7.29.7", ++ "commander": "^6.2.0", ++ "core-js": "^3.48.0", ++ "node-environment-flags": "^1.0.5", ++ "regenerator-runtime": "^0.14.0", ++ "v8flags": "^3.1.1" ++ }, ++ "bin": { ++ "babel-node": "bin/babel-node.js" + }, + "engines": { +- "node": ">= 14" ++ "node": ">=6.9.0" ++ }, ++ "peerDependencies": { ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/cross-spawn": { +- "version": "7.0.6", +- "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", +- "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", ++ "node_modules/@babel/parser": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", ++ "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "path-key": "^3.1.0", +- "shebang-command": "^2.0.0", +- "which": "^2.0.1" ++ "@babel/types": "^7.29.7" ++ }, ++ "bin": { ++ "parser": "bin/babel-parser.js" + }, + "engines": { +- "node": ">= 8" ++ "node": ">=6.0.0" + } + }, +- "node_modules/debug": { +- "version": "2.6.9", +- "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", +- "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", ++ "node_modules/@babel/plugin-syntax-jsx": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.29.7.tgz", ++ "integrity": "sha512-TSu8+mHCoEaaCDEZ0I3+6mvTBYR4PCxQwf2z9/r5Tbztv6NaLR3B9thGTTxX2WGuGHJqRiAbKPeGTJ5XWXVg6A==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "ms": "2.0.0" ++ "@babel/helper-plugin-utils": "^7.29.7" ++ }, ++ "engines": { ++ "node": ">=6.9.0" ++ }, ++ "peerDependencies": { ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/define-data-property": { +- "version": "1.1.4", +- "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", +- "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", ++ "node_modules/@babel/plugin-transform-react-jsx": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.29.7.tgz", ++ "integrity": "sha512-WsZulLVBUHXVj2cUcPVx6UE21TpalB6bHbSFErKT0Ib++ax24jjXe73FqlWvdylFOjiuPHYi6VCcgRad1ItN+A==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "es-define-property": "^1.0.0", +- "es-errors": "^1.3.0", +- "gopd": "^1.0.1" ++ "@babel/helper-annotate-as-pure": "^7.29.7", ++ "@babel/helper-module-imports": "^7.29.7", ++ "@babel/helper-plugin-utils": "^7.29.7", ++ "@babel/plugin-syntax-jsx": "^7.29.7", ++ "@babel/types": "^7.29.7" + }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=6.9.0" + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "peerDependencies": { ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/depd": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", +- "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", ++ "node_modules/@babel/register": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.29.7.tgz", ++ "integrity": "sha512-AMGJoWuES861riy6pcB0fphE1YXybtQnBYQMuIyPv6mKLiosfa79BKTnAOyx215c/3RJPJpdQwoHZ3earVH7AA==", + "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "clone-deep": "^4.0.1", ++ "find-cache-dir": "^2.0.0", ++ "make-dir": "^2.1.0", ++ "pirates": "^4.0.6", ++ "source-map-support": "^0.5.16" ++ }, + "engines": { +- "node": ">= 0.8" ++ "node": ">=6.9.0" ++ }, ++ "peerDependencies": { ++ "@babel/core": "^7.0.0-0" + } + }, +- "node_modules/destroy": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", +- "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", ++ "node_modules/@babel/runtime": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", ++ "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", + "license": "MIT", ++ "optional": true, + "engines": { - "node": ">= 0.8", - "npm": "1.2.8000 || >= 1.4.16" + "node": ">=6.9.0" @@ -1555,17 +1456,19 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", -+ "node_modules/@babel/helper-annotate-as-pure": { -+ "version": "7.27.3", -+ "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz", -+ "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==", ++ "node_modules/@babel/template": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", ++ "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "license": "MIT", + "optional": true, "dependencies": { - "call-bind-apply-helpers": "^1.0.1", - "es-errors": "^1.3.0", - "gopd": "^1.2.0" -+ "@babel/types": "^7.27.3" ++ "@babel/code-frame": "^7.29.7", ++ "@babel/parser": "^7.29.7", ++ "@babel/types": "^7.29.7" }, "engines": { - "node": ">= 0.4" @@ -1594,18 +1497,20 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", -+ "node_modules/@babel/helper-compilation-targets": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", -+ "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", ++ "node_modules/@babel/traverse": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", ++ "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "license": "MIT", + "optional": true, + "dependencies": { -+ "@babel/compat-data": "^7.28.6", -+ "@babel/helper-validator-option": "^7.27.1", -+ "browserslist": "^4.24.0", -+ "lru-cache": "^5.1.1", -+ "semver": "^6.3.1" ++ "@babel/code-frame": "^7.29.7", ++ "@babel/generator": "^7.29.7", ++ "@babel/helper-globals": "^7.29.7", ++ "@babel/parser": "^7.29.7", ++ "@babel/template": "^7.29.7", ++ "@babel/types": "^7.29.7", ++ "debug": "^4.3.1" + }, "engines": { - "node": ">= 0.8" @@ -1616,75 +1521,57 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", -+ "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { -+ "version": "5.1.1", -+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", -+ "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", -+ "license": "ISC", -+ "optional": true, -+ "dependencies": { -+ "yallist": "^3.0.2" -+ } -+ }, -+ "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { -+ "version": "3.1.1", -+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", -+ "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", -+ "license": "ISC", -+ "optional": true -+ }, -+ "node_modules/@babel/helper-globals": { -+ "version": "7.28.0", -+ "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", -+ "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", ++ "node_modules/@babel/traverse/node_modules/debug": { ++ "version": "4.4.3", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", ++ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", + "optional": true, ++ "dependencies": { ++ "ms": "^2.1.3" ++ }, "engines": { - "node": ">= 0.4" -+ "node": ">=6.9.0" ++ "node": ">=6.0" ++ }, ++ "peerDependenciesMeta": { ++ "supports-color": { ++ "optional": true ++ } } }, - "node_modules/es-errors": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", -+ "node_modules/@babel/helper-module-imports": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", -+ "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", ++ "node_modules/@babel/traverse/node_modules/ms": { ++ "version": "2.1.3", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", ++ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT", -+ "optional": true, -+ "dependencies": { -+ "@babel/traverse": "^7.28.6", -+ "@babel/types": "^7.28.6" -+ }, - "engines": { +- "engines": { - "node": ">= 0.4" -+ "node": ">=6.9.0" - } +- } ++ "optional": true }, - "node_modules/es-object-atoms": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", -+ "node_modules/@babel/helper-module-transforms": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", -+ "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", ++ "node_modules/@babel/types": { ++ "version": "7.29.7", ++ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", ++ "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "license": "MIT", + "optional": true, "dependencies": { - "es-errors": "^1.3.0" -+ "@babel/helper-module-imports": "^7.28.6", -+ "@babel/helper-validator-identifier": "^7.28.5", -+ "@babel/traverse": "^7.28.6" ++ "@babel/helper-string-parser": "^7.29.7", ++ "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { - "node": ">= 0.4" + "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0" } }, - "node_modules/escape-html": { @@ -1697,45 +1584,51 @@ index 2af3a0d1..5c5f4b73 100644 - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", -+ "node_modules/@babel/helper-plugin-utils": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", -+ "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", ++ "node_modules/@buttercup/fetch": { ++ "version": "0.2.1", ++ "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", ++ "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", "license": "MIT", -+ "optional": true, - "engines": { +- "engines": { - "node": ">= 0.6" -+ "node": ">=6.9.0" ++ "optional": true, ++ "optionalDependencies": { ++ "node-fetch": "^3.3.0" } }, - "node_modules/event-target-shim": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", -+ "node_modules/@babel/helper-string-parser": { -+ "version": "7.27.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", -+ "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", ++ "node_modules/@colors/colors": { ++ "version": "1.6.0", ++ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", ++ "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", "license": "MIT", + "optional": true, "engines": { - "node": ">=6" -+ "node": ">=6.9.0" ++ "node": ">=0.1.90" } }, - "node_modules/events": { - "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", -+ "node_modules/@babel/helper-validator-identifier": { -+ "version": "7.28.5", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", -+ "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", ++ "node_modules/@crowdsec/express-bouncer": { ++ "version": "0.1.0", ++ "resolved": "https://registry.npmjs.org/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz", ++ "integrity": "sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==", "license": "MIT", -+ "optional": true, - "engines": { +- "engines": { - "node": ">=0.8.x" -+ "node": ">=6.9.0" ++ "optional": true, ++ "dependencies": { ++ "ip-address": "^7.1.0", ++ "isomorphic-fetch": "^3.0.0", ++ "lodash": "^4.17.21", ++ "svg-captcha": "^1.4.0", ++ "winston": "^3.3.3" } }, - "node_modules/events-universal": { @@ -1743,40 +1636,36 @@ index 2af3a0d1..5c5f4b73 100644 - "resolved": "https://registry.npmjs.org/events-universal/-/events-universal-1.0.1.tgz", - "integrity": "sha512-LUd5euvbMLpwOF8m6ivPCbhQeSiYVNb8Vs0fQ8QjXo0JTkEHpz8pxdQf0gStltaPpw0Cca8b39KxvK9cfKRiAw==", - "license": "Apache-2.0", -+ "node_modules/@babel/helper-validator-option": { -+ "version": "7.27.1", -+ "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", -+ "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", -+ "license": "MIT", -+ "optional": true, -+ "engines": { -+ "node": ">=6.9.0" -+ } ++ "node_modules/@cryptography/aes": { ++ "version": "0.1.1", ++ "resolved": "https://registry.npmjs.org/@cryptography/aes/-/aes-0.1.1.tgz", ++ "integrity": "sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==", ++ "license": "GPL-3.0-or-later", ++ "optional": true + }, -+ "node_modules/@babel/helpers": { -+ "version": "7.29.2", -+ "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.2.tgz", -+ "integrity": "sha512-HoGuUs4sCZNezVEKdVcwqmZN8GoHirLUcLaYVNBK2J0DadGtdcqgr3BCbvH8+XUo4NGjNl3VOtSjEKNzqfFgKw==", ++ "node_modules/@dabh/diagnostics": { ++ "version": "2.0.8", ++ "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz", ++ "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==", + "license": "MIT", + "optional": true, "dependencies": { - "bare-events": "^2.7.0" -+ "@babel/template": "^7.28.6", -+ "@babel/types": "^7.29.0" -+ }, -+ "engines": { -+ "node": ">=6.9.0" ++ "@so-ric/colorspace": "^1.1.6", ++ "enabled": "2.0.x", ++ "kuler": "^2.0.0" } }, - "node_modules/express": { - "version": "4.22.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", - "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", -+ "node_modules/@babel/node": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/node/-/node-7.29.0.tgz", -+ "integrity": "sha512-9UeU8F3rx2lOZXneEW2HTnTYdA8+fXP0kr54tk7d0fPomWNlZ6WJ2H9lunr5dSvr8FNY0CDnop3Km6jZ5NAUsQ==", - "license": "MIT", +- "license": "MIT", ++ "node_modules/@discordjs/builders": { ++ "version": "1.14.1", ++ "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz", ++ "integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==", ++ "license": "Apache-2.0", + "optional": true, "dependencies": { - "accepts": "~1.3.8", @@ -1810,352 +1699,6 @@ index 2af3a0d1..5c5f4b73 100644 - "type-is": "~1.6.18", - "utils-merge": "1.0.1", - "vary": "~1.1.2" -+ "@babel/register": "^7.28.6", -+ "commander": "^6.2.0", -+ "core-js": "^3.48.0", -+ "node-environment-flags": "^1.0.5", -+ "regenerator-runtime": "^0.14.0", -+ "v8flags": "^3.1.1" -+ }, -+ "bin": { -+ "babel-node": "bin/babel-node.js" - }, - "engines": { -- "node": ">= 0.10.0" -+ "node": ">=6.9.0" - }, -- "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/express" -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" - } - }, -- "node_modules/express-handlebars": { -- "version": "7.1.3", -- "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz", -- "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==", -- "license": "BSD-3-Clause", -+ "node_modules/@babel/parser": { -+ "version": "7.29.2", -+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.2.tgz", -+ "integrity": "sha512-4GgRzy/+fsBa72/RZVJmGKPmZu9Byn8o4MoLpmNe1m8ZfYnz5emHLQz3U4gLud6Zwl0RZIcgiLD7Uq7ySFuDLA==", -+ "license": "MIT", -+ "optional": true, - "dependencies": { -- "glob": "^10.4.2", -- "graceful-fs": "^4.2.11", -- "handlebars": "^4.7.8" -+ "@babel/types": "^7.29.0" -+ }, -+ "bin": { -+ "parser": "bin/babel-parser.js" - }, - "engines": { -- "node": ">=v16" -+ "node": ">=6.0.0" - } - }, -- "node_modules/express-ws": { -- "version": "5.0.2", -- "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz", -- "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==", -- "license": "BSD-2-Clause", -+ "node_modules/@babel/plugin-syntax-jsx": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.28.6.tgz", -+ "integrity": "sha512-wgEmr06G6sIpqr8YDwA2dSRTE3bJ+V0IfpzfSY3Lfgd7YWOaAdlykvJi13ZKBt8cZHfgH1IXN+CL656W3uUa4w==", -+ "license": "MIT", -+ "optional": true, - "dependencies": { -- "ws": "^7.4.6" -+ "@babel/helper-plugin-utils": "^7.28.6" - }, - "engines": { -- "node": ">=4.5.0" -+ "node": ">=6.9.0" - }, - "peerDependencies": { -- "express": "^4.0.0 || ^5.0.0-alpha.1" -+ "@babel/core": "^7.0.0-0" - } - }, -- "node_modules/express-ws/node_modules/ws": { -- "version": "7.5.10", -- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", -- "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", -+ "node_modules/@babel/plugin-transform-react-jsx": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.28.6.tgz", -+ "integrity": "sha512-61bxqhiRfAACulXSLd/GxqmAedUSrRZIu/cbaT18T1CetkTmtDN15it7i80ru4DVqRK1WMxQhXs+Lf9kajm5Ow==", - "license": "MIT", -+ "optional": true, -+ "dependencies": { -+ "@babel/helper-annotate-as-pure": "^7.27.3", -+ "@babel/helper-module-imports": "^7.28.6", -+ "@babel/helper-plugin-utils": "^7.28.6", -+ "@babel/plugin-syntax-jsx": "^7.28.6", -+ "@babel/types": "^7.28.6" -+ }, - "engines": { -- "node": ">=8.3.0" -+ "node": ">=6.9.0" - }, - "peerDependencies": { -- "bufferutil": "^4.0.1", -- "utf-8-validate": "^5.0.2" -+ "@babel/core": "^7.0.0-0" -+ } -+ }, -+ "node_modules/@babel/register": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/register/-/register-7.28.6.tgz", -+ "integrity": "sha512-pgcbbEl/dWQYb6L6Yew6F94rdwygfuv+vJ/tXfwIOYAfPB6TNWpXUMEtEq3YuTeHRdvMIhvz13bkT9CNaS+wqA==", -+ "license": "MIT", -+ "optional": true, -+ "dependencies": { -+ "clone-deep": "^4.0.1", -+ "find-cache-dir": "^2.0.0", -+ "make-dir": "^2.1.0", -+ "pirates": "^4.0.6", -+ "source-map-support": "^0.5.16" - }, -- "peerDependenciesMeta": { -- "bufferutil": { -- "optional": true -- }, -- "utf-8-validate": { -- "optional": true -- } -+ "engines": { -+ "node": ">=6.9.0" -+ }, -+ "peerDependencies": { -+ "@babel/core": "^7.0.0-0" - } - }, -- "node_modules/fast-fifo": { -- "version": "1.3.2", -- "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", -- "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", -- "license": "MIT" -+ "node_modules/@babel/runtime": { -+ "version": "7.29.2", -+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.2.tgz", -+ "integrity": "sha512-JiDShH45zKHWyGe4ZNVRrCjBz8Nh9TMmZG1kh4QTK8hCBTWBi8Da+i7s1fJw7/lYpM4ccepSNfqzZ/QvABBi5g==", -+ "license": "MIT", -+ "optional": true, -+ "engines": { -+ "node": ">=6.9.0" -+ } - }, -- "node_modules/fd-slicer": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", -- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", -+ "node_modules/@babel/template": { -+ "version": "7.28.6", -+ "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", -+ "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "pend": "~1.2.0" -+ "@babel/code-frame": "^7.28.6", -+ "@babel/parser": "^7.28.6", -+ "@babel/types": "^7.28.6" -+ }, -+ "engines": { -+ "node": ">=6.9.0" - } - }, -- "node_modules/finalhandler": { -- "version": "1.3.2", -- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", -- "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", -+ "node_modules/@babel/traverse": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", -+ "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "debug": "2.6.9", -- "encodeurl": "~2.0.0", -- "escape-html": "~1.0.3", -- "on-finished": "~2.4.1", -- "parseurl": "~1.3.3", -- "statuses": "~2.0.2", -- "unpipe": "~1.0.0" -+ "@babel/code-frame": "^7.29.0", -+ "@babel/generator": "^7.29.0", -+ "@babel/helper-globals": "^7.28.0", -+ "@babel/parser": "^7.29.0", -+ "@babel/template": "^7.28.6", -+ "@babel/types": "^7.29.0", -+ "debug": "^4.3.1" - }, - "engines": { -- "node": ">= 0.8" -+ "node": ">=6.9.0" - } - }, -- "node_modules/for-each": { -- "version": "0.3.5", -- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", -- "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", -+ "node_modules/@babel/traverse/node_modules/debug": { -+ "version": "4.4.3", -+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", -+ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "is-callable": "^1.2.7" -+ "ms": "^2.1.3" - }, - "engines": { -- "node": ">= 0.4" -+ "node": ">=6.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "peerDependenciesMeta": { -+ "supports-color": { -+ "optional": true -+ } - } - }, -- "node_modules/foreground-child": { -- "version": "3.3.1", -- "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", -- "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", -- "license": "ISC", -+ "node_modules/@babel/traverse/node_modules/ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -+ "license": "MIT", -+ "optional": true -+ }, -+ "node_modules/@babel/types": { -+ "version": "7.29.0", -+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", -+ "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", -+ "license": "MIT", -+ "optional": true, - "dependencies": { -- "cross-spawn": "^7.0.6", -- "signal-exit": "^4.0.1" -+ "@babel/helper-string-parser": "^7.27.1", -+ "@babel/helper-validator-identifier": "^7.28.5" - }, - "engines": { -- "node": ">=14" -- }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" -+ "node": ">=6.9.0" - } - }, -- "node_modules/forwarded": { -- "version": "0.2.0", -- "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", -- "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", -+ "node_modules/@buttercup/fetch": { -+ "version": "0.2.1", -+ "resolved": "https://registry.npmjs.org/@buttercup/fetch/-/fetch-0.2.1.tgz", -+ "integrity": "sha512-sCgECOx8wiqY8NN1xN22BqqKzXYIG2AicNLlakOAI4f0WgyLVUbAigMf8CZhBtJxdudTcB1gD5lciqi44jwJvg==", - "license": "MIT", -- "engines": { -- "node": ">= 0.6" -+ "optional": true, -+ "optionalDependencies": { -+ "node-fetch": "^3.3.0" - } - }, -- "node_modules/fresh": { -- "version": "0.5.2", -- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", -- "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", -+ "node_modules/@colors/colors": { -+ "version": "1.6.0", -+ "resolved": "https://registry.npmjs.org/@colors/colors/-/colors-1.6.0.tgz", -+ "integrity": "sha512-Ir+AOibqzrIsL6ajt3Rz3LskB7OiMVHqltZmspbW/TJuTVuyOMirVqAkjfY6JISiLHgyNqicAC8AyHHGzNd/dA==", - "license": "MIT", -+ "optional": true, - "engines": { -- "node": ">= 0.6" -+ "node": ">=0.1.90" - } - }, -- "node_modules/function-bind": { -- "version": "1.1.2", -- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", -- "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", -+ "node_modules/@crowdsec/express-bouncer": { -+ "version": "0.1.0", -+ "resolved": "https://registry.npmjs.org/@crowdsec/express-bouncer/-/express-bouncer-0.1.0.tgz", -+ "integrity": "sha512-cS5ATNInb914yOubWznMB02lheDLImtIZ8A7n99sn7q2YI+P3Zt6G/Mttp+d1NL1PDUkFBMFlBreOslkcWwLFQ==", - "license": "MIT", -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "optional": true, -+ "dependencies": { -+ "ip-address": "^7.1.0", -+ "isomorphic-fetch": "^3.0.0", -+ "lodash": "^4.17.21", -+ "svg-captcha": "^1.4.0", -+ "winston": "^3.3.3" - } - }, -- "node_modules/generator-function": { -- "version": "2.0.1", -- "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", -- "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", -+ "node_modules/@cryptography/aes": { -+ "version": "0.1.1", -+ "resolved": "https://registry.npmjs.org/@cryptography/aes/-/aes-0.1.1.tgz", -+ "integrity": "sha512-PcYz4FDGblO6tM2kSC+VzhhK62vml6k6/YAkiWtyPvrgJVfnDRoHGDtKn5UiaRRUrvUTTocBpvc2rRgTCqxjsg==", -+ "license": "GPL-3.0-or-later", -+ "optional": true -+ }, -+ "node_modules/@dabh/diagnostics": { -+ "version": "2.0.8", -+ "resolved": "https://registry.npmjs.org/@dabh/diagnostics/-/diagnostics-2.0.8.tgz", -+ "integrity": "sha512-R4MSXTVnuMzGD7bzHdW2ZhhdPC/igELENcq5IjEverBvq5hn1SXCWcsi6eSsdWP0/Ur+SItRRjAktmdoX/8R/Q==", - "license": "MIT", -- "engines": { -- "node": ">= 0.4" -+ "optional": true, -+ "dependencies": { -+ "@so-ric/colorspace": "^1.1.6", -+ "enabled": "2.0.x", -+ "kuler": "^2.0.0" - } - }, -- "node_modules/get-intrinsic": { -- "version": "1.3.0", -- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", -- "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", -- "license": "MIT", -+ "node_modules/@discordjs/builders": { -+ "version": "1.14.1", -+ "resolved": "https://registry.npmjs.org/@discordjs/builders/-/builders-1.14.1.tgz", -+ "integrity": "sha512-gSKkhXLqs96TCzk66VZuHHl8z2bQMJFGwrXC0f33ngK+FLNau4hU1PYny3DNJfNdSH+gVMzE85/d5FQ2BpcNwQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "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" + "@discordjs/formatters": "^0.6.2", + "@discordjs/util": "^1.2.0", + "@sapphire/shapeshift": "^4.0.0", @@ -2165,40 +1708,30 @@ index 2af3a0d1..5c5f4b73 100644 + "tslib": "^2.6.3" }, "engines": { -- "node": ">= 0.4" +- "node": ">= 0.10.0" + "node": ">=16.11.0" }, "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "type": "opencollective", +- "url": "https://opencollective.com/express" + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/get-proto": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", -- "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", -- "license": "MIT", -- "dependencies": { -- "dunder-proto": "^1.0.1", -- "es-object-atoms": "^1.0.0" -- }, +- "node_modules/express-handlebars": { +- "version": "7.1.3", +- "resolved": "https://registry.npmjs.org/express-handlebars/-/express-handlebars-7.1.3.tgz", +- "integrity": "sha512-O0W4n14iQ8+iFIDdiMh9HRI2nbVQJ/h1qndlD1TXWxxcfbKjKoqJh+ti2tROkyx4C4VQrt0y3bANBQ5auQAiew==", +- "license": "BSD-3-Clause", + "node_modules/@discordjs/collection": { + "version": "1.5.3", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-1.5.3.tgz", + "integrity": "sha512-SVb428OMd3WO1paV3rm6tSjM4wC+Kecaa1EUGX7vc6/fddvw/6lg90z4QtCqm21zvVe92vMMDt9+DkIvjXImQQ==", + "license": "Apache-2.0", + "optional": true, - "engines": { -- "node": ">= 0.4" ++ "engines": { + "node": ">=16.11.0" - } - }, -- "node_modules/glob": { -- "version": "10.5.0", -- "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", -- "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", -- "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", -- "license": "ISC", ++ } ++ }, + "node_modules/@discordjs/formatters": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/@discordjs/formatters/-/formatters-0.6.2.tgz", @@ -2206,36 +1739,32 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "Apache-2.0", + "optional": true, "dependencies": { -- "foreground-child": "^3.1.0", -- "jackspeak": "^3.1.2", -- "minimatch": "^9.0.4", -- "minipass": "^7.1.2", -- "package-json-from-dist": "^1.0.0", -- "path-scurry": "^1.11.1" +- "glob": "^10.4.2", +- "graceful-fs": "^4.2.11", +- "handlebars": "^4.7.8" + "discord-api-types": "^0.38.33" }, -- "bin": { -- "glob": "dist/esm/bin.mjs" -+ "engines": { + "engines": { +- "node": ">=v16" + "node": ">=16.11.0" - }, - "funding": { -- "url": "https://github.com/sponsors/isaacs" ++ }, ++ "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/gopd": { -- "version": "1.2.0", -- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", -- "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", -- "license": "MIT", +- "node_modules/express-ws": { +- "version": "5.0.2", +- "resolved": "https://registry.npmjs.org/express-ws/-/express-ws-5.0.2.tgz", +- "integrity": "sha512-0uvmuk61O9HXgLhGl3QhNSEtRsQevtmbL94/eILaliEADZBHZOQUAiHFrGPrgsjikohyrmSG5g+sCfASTt0lkQ==", +- "license": "BSD-2-Clause", + "node_modules/@discordjs/rest": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/@discordjs/rest/-/rest-2.6.1.tgz", + "integrity": "sha512-wwQdgjeaoYFiaG+atbqx6aJDpqW7JHAo0HrQkBTbYzM3/PJ3GweQIpgElNcGZ26DCUOXMyawYd0YF7vtr+fZXg==", + "license": "Apache-2.0", + "optional": true, -+ "dependencies": { + "dependencies": { +- "ws": "^7.4.6" + "@discordjs/collection": "^2.1.1", + "@discordjs/util": "^1.2.0", + "@sapphire/async-queue": "^1.5.3", @@ -2245,49 +1774,75 @@ index 2af3a0d1..5c5f4b73 100644 + "magic-bytes.js": "^1.13.0", + "tslib": "^2.6.3", + "undici": "6.24.1" -+ }, + }, "engines": { -- "node": ">= 0.4" +- "node": ">=4.5.0" + "node": ">=18" }, - "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "peerDependencies": { +- "express": "^4.0.0 || ^5.0.0-alpha.1" ++ "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/graceful-fs": { -- "version": "4.2.11", -- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", -- "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", -- "license": "ISC" +- "node_modules/express-ws/node_modules/ws": { +- "version": "7.5.10", +- "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz", +- "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==", +- "license": "MIT", + "node_modules/@discordjs/rest/node_modules/@discordjs/collection": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz", + "integrity": "sha512-LiSusze9Tc7qF03sLCujF5iZp7K+vRNEDBZ86FT9aQAv3vxMLihUvKvpsCWiQ2DJq1tVckopKm1rxomgNUc9hg==", + "license": "Apache-2.0", + "optional": true, -+ "engines": { + "engines": { +- "node": ">=8.3.0" +- }, +- "peerDependencies": { +- "bufferutil": "^4.0.1", +- "utf-8-validate": "^5.0.2" + "node": ">=18" -+ }, + }, +- "peerDependenciesMeta": { +- "bufferutil": { +- "optional": true +- }, +- "utf-8-validate": { +- "optional": true +- } + "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" -+ } + } }, -- "node_modules/handlebars": { -- "version": "4.7.8", -- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", -- "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", +- "node_modules/fast-fifo": { +- "version": "1.3.2", +- "resolved": "https://registry.npmjs.org/fast-fifo/-/fast-fifo-1.3.2.tgz", +- "integrity": "sha512-/d9sfos4yxzpwkDkuN7k2SqFKtYNmCTzgfEpz82x34IM9/zc8KGxQoXg1liNC/izpRM/MBdt44Nmx41ZWqk+FQ==", +- "license": "MIT" +- }, +- "node_modules/fd-slicer": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.1.0.tgz", +- "integrity": "sha512-cE1qsB/VwyQozZ+q1dGxR8LBYNZeofhEdUNGSMbQD3Gw2lAzX9Zb3uIU6Ebc/Fmyjo9AWWfnn0AUCHqtevs/8g==", + "node_modules/@discordjs/rest/node_modules/@sapphire/snowflake": { + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/@sapphire/snowflake/-/snowflake-3.5.5.tgz", + "integrity": "sha512-xzvBr1Q1c4lCe7i6sRnrofxeO1QTP/LKQ6A6qy0iB4x5yfiSfARMEQEghojzTNALDTcv8En04qYNIco9/K9eZQ==", "license": "MIT", +- "dependencies": { +- "pend": "~1.2.0" + "optional": true, + "engines": { + "node": ">=v14.0.0", + "npm": ">=7.0.0" -+ } -+ }, + } + }, +- "node_modules/finalhandler": { +- "version": "1.3.2", +- "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.2.tgz", +- "integrity": "sha512-aA4RyPcd3badbdABGDuTXCMTtOneUCAYH/gxoYRTZlIJdF0YPWuGqiAsIrhNnnqdXGswYk6dGujem4w80UJFhg==", +- "license": "MIT", + "node_modules/@discordjs/util": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@discordjs/util/-/util-1.2.0.tgz", @@ -2295,29 +1850,27 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "Apache-2.0", + "optional": true, "dependencies": { -- "minimist": "^1.2.5", -- "neo-async": "^2.6.2", -- "source-map": "^0.6.1", -- "wordwrap": "^1.0.0" -- }, -- "bin": { -- "handlebars": "bin/handlebars" +- "debug": "2.6.9", +- "encodeurl": "~2.0.0", +- "escape-html": "~1.0.3", +- "on-finished": "~2.4.1", +- "parseurl": "~1.3.3", +- "statuses": "~2.0.2", +- "unpipe": "~1.0.0" + "discord-api-types": "^0.38.33" }, "engines": { -- "node": ">=0.4.7" +- "node": ">= 0.8" + "node": ">=18" - }, -- "optionalDependencies": { -- "uglify-js": "^3.1.4" ++ }, + "funding": { + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/has-property-descriptors": { -- "version": "1.0.2", -- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", -- "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", +- "node_modules/for-each": { +- "version": "0.3.5", +- "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", +- "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", - "license": "MIT", + "node_modules/@discordjs/ws": { + "version": "1.2.3", @@ -2326,7 +1879,7 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "Apache-2.0", + "optional": true, "dependencies": { -- "es-define-property": "^1.0.0" +- "is-callable": "^1.2.7" + "@discordjs/collection": "^2.1.0", + "@discordjs/rest": "^2.5.1", + "@discordjs/util": "^1.1.0", @@ -2336,8 +1889,9 @@ index 2af3a0d1..5c5f4b73 100644 + "discord-api-types": "^0.38.1", + "tslib": "^2.6.2", + "ws": "^8.17.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.4" + "node": ">=16.11.0" }, "funding": { @@ -2345,11 +1899,15 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/has-symbols": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", -- "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", -- "license": "MIT", +- "node_modules/foreground-child": { +- "version": "3.3.1", +- "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", +- "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", +- "license": "ISC", +- "dependencies": { +- "cross-spawn": "^7.0.6", +- "signal-exit": "^4.0.1" +- }, + "node_modules/@discordjs/ws/node_modules/@discordjs/collection": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/@discordjs/collection/-/collection-2.1.1.tgz", @@ -2357,46 +1915,44 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "Apache-2.0", + "optional": true, "engines": { -- "node": ">= 0.4" +- "node": ">=14" + "node": ">=18" }, "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "url": "https://github.com/sponsors/isaacs" + "url": "https://github.com/discordjs/discord.js?sponsor" } }, -- "node_modules/has-tostringtag": { -- "version": "1.0.2", -- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", -- "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", +- "node_modules/forwarded": { +- "version": "0.2.0", +- "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", +- "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", + "node_modules/@duosecurity/duo_universal": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@duosecurity/duo_universal/-/duo_universal-2.1.0.tgz", + "integrity": "sha512-6i+oSezndETL5nwaZbe8OVXA8GTalI0KmY4hc060iTaGpkj5/WY1OWC1W9lWDg0dWpYohsTwZy1dBQOs+vUc7g==", "license": "MIT", + "optional": true, - "dependencies": { -- "has-symbols": "^1.0.3" ++ "dependencies": { + "axios": "^1.2.2", + "jsonwebtoken": "^9.0.0" - }, ++ }, "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "node": ">= 0.6" + "node": "^14.17.0 || ^16.13.0 || >=18.0.0" } }, -- "node_modules/hasown": { -- "version": "2.0.2", -- "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", -- "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", +- "node_modules/fresh": { +- "version": "0.5.2", +- "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", +- "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", + "node_modules/@fastify/busboy": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/@fastify/busboy/-/busboy-3.2.0.tgz", + "integrity": "sha512-m9FVDXU3GT2ITSe0UaMA5rU3QkfC/UXtCU8y0gSN/GugTqtVldOBWIB5V6V3sbmenVZUIpU6f+mPEO2+m5iTaA==", "license": "MIT", +- "engines": { +- "node": ">= 0.6" + "optional": true + }, + "node_modules/@firebase/app-check-interop-types": { @@ -2426,39 +1982,25 @@ index 2af3a0d1..5c5f4b73 100644 + "integrity": "sha512-gm8EUEJE/fEac86AvHn8Z/QW8BvR56TBw3hMW0O838J/1mThYQXAIQBgUv75EqlCZfdawpWLrKt1uXvp9ciK3Q==", + "license": "Apache-2.0", + "optional": true, - "dependencies": { -- "function-bind": "^1.1.2" -- }, -- "engines": { -- "node": ">= 0.4" ++ "dependencies": { + "@firebase/util": "1.10.0", + "tslib": "^2.1.0" } }, -- "node_modules/http-errors": { -- "version": "2.0.1", -- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", -- "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", +- "node_modules/function-bind": { +- "version": "1.1.2", +- "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", +- "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node_modules/@firebase/database": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@firebase/database/-/database-1.0.8.tgz", + "integrity": "sha512-dzXALZeBI1U5TXt6619cv0+tgEhJiwlUtQ55WNZY7vGAjv7Q1QioV969iYwt1AQQ0ovHnEW0YW9TiBfefLvErg==", + "license": "Apache-2.0", + "optional": true, - "dependencies": { -- "depd": "~2.0.0", -- "inherits": "~2.0.4", -- "setprototypeof": "~1.2.0", -- "statuses": "~2.0.2", -- "toidentifier": "~1.0.1" -- }, -- "engines": { -- "node": ">= 0.8" -- }, -- "funding": { -- "type": "opencollective", -- "url": "https://opencollective.com/express" ++ "dependencies": { + "@firebase/app-check-interop-types": "0.3.2", + "@firebase/auth-interop-types": "0.2.3", + "@firebase/component": "0.6.9", @@ -2468,22 +2010,20 @@ index 2af3a0d1..5c5f4b73 100644 + "tslib": "^2.1.0" } }, -- "node_modules/iconv-lite": { -- "version": "0.4.24", -- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", -- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", +- "node_modules/generator-function": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", +- "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", - "license": "MIT", +- "engines": { +- "node": ">= 0.4" + "node_modules/@firebase/database-compat": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/@firebase/database-compat/-/database-compat-1.0.8.tgz", + "integrity": "sha512-OpeWZoPE3sGIRPBKYnW9wLad25RaWbGyk7fFQe4xnJQKRzlynWeFBSRRAoLE2Old01WXwskUiucNqUUVlFsceg==", + "license": "Apache-2.0", + "optional": true, - "dependencies": { -- "safer-buffer": ">= 2.1.2 < 3" -- }, -- "engines": { -- "node": ">=0.10.0" ++ "dependencies": { + "@firebase/component": "0.6.9", + "@firebase/database": "1.0.8", + "@firebase/database-types": "1.0.5", @@ -2492,6 +2032,538 @@ index 2af3a0d1..5c5f4b73 100644 + "tslib": "^2.1.0" } }, +- "node_modules/get-intrinsic": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", +- "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", ++ "node_modules/@firebase/database-types": { ++ "version": "1.0.5", ++ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz", ++ "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "@firebase/app-types": "0.9.2", ++ "@firebase/util": "1.10.0" ++ } ++ }, ++ "node_modules/@firebase/logger": { ++ "version": "0.4.2", ++ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", ++ "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "tslib": "^2.1.0" ++ } ++ }, ++ "node_modules/@firebase/util": { ++ "version": "1.10.0", ++ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz", ++ "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "tslib": "^2.1.0" ++ } ++ }, ++ "node_modules/@gar/promisify": { ++ "version": "1.1.3", ++ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", ++ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", + "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/@google-cloud/firestore": { ++ "version": "7.11.6", ++ "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz", ++ "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==", ++ "license": "Apache-2.0", ++ "optional": true, + "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" ++ "@opentelemetry/api": "^1.3.0", ++ "fast-deep-equal": "^3.1.1", ++ "functional-red-black-tree": "^1.0.1", ++ "google-gax": "^4.3.3", ++ "protobufjs": "^7.2.6" + }, + "engines": { +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "node": ">=14.0.0" + } + }, +- "node_modules/get-proto": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", +- "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", +- "license": "MIT", ++ "node_modules/@google-cloud/paginator": { ++ "version": "5.0.2", ++ "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz", ++ "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==", ++ "license": "Apache-2.0", ++ "optional": true, + "dependencies": { +- "dunder-proto": "^1.0.1", +- "es-object-atoms": "^1.0.0" ++ "arrify": "^2.0.0", ++ "extend": "^3.0.2" + }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=14.0.0" + } + }, +- "node_modules/glob": { +- "version": "10.5.0", +- "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", +- "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", +- "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", +- "license": "ISC", ++ "node_modules/@google-cloud/projectify": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz", ++ "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "engines": { ++ "node": ">=14.0.0" ++ } ++ }, ++ "node_modules/@google-cloud/promisify": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz", ++ "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "engines": { ++ "node": ">=14" ++ } ++ }, ++ "node_modules/@google-cloud/storage": { ++ "version": "7.21.0", ++ "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.21.0.tgz", ++ "integrity": "sha512-l+IFTkd+6Y5LoAuXyYCKNAKtw/Ci+rAMqgdTB1jv4iZiLhw0rtq+0qjIRbBizXkNzEFmXiXUW0H7sZQQvk1ffA==", ++ "license": "Apache-2.0", ++ "optional": true, + "dependencies": { +- "foreground-child": "^3.1.0", +- "jackspeak": "^3.1.2", +- "minimatch": "^9.0.4", +- "minipass": "^7.1.2", +- "package-json-from-dist": "^1.0.0", +- "path-scurry": "^1.11.1" +- }, +- "bin": { +- "glob": "dist/esm/bin.mjs" ++ "@google-cloud/paginator": "^5.0.0", ++ "@google-cloud/projectify": "^4.0.0", ++ "@google-cloud/promisify": "<4.1.0", ++ "abort-controller": "^3.0.0", ++ "async-retry": "^1.3.3", ++ "duplexify": "^4.1.3", ++ "fast-xml-parser": "^5.3.4", ++ "gaxios": "^6.0.2", ++ "google-auth-library": "^9.6.3", ++ "html-entities": "^2.5.2", ++ "mime": "^3.0.0", ++ "p-limit": "^3.0.1", ++ "retry-request": "^7.0.0", ++ "teeny-request": "^9.0.0" + }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" ++ "engines": { ++ "node": ">=14" + } + }, +- "node_modules/gopd": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", +- "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", ++ "node_modules/@google-cloud/storage/node_modules/mime": { ++ "version": "3.0.0", ++ "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", ++ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", + "license": "MIT", ++ "optional": true, ++ "bin": { ++ "mime": "cli.js" ++ }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=10.0.0" ++ } ++ }, ++ "node_modules/@grpc/grpc-js": { ++ "version": "1.14.4", ++ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.4.tgz", ++ "integrity": "sha512-k9Dj3DV/itK9D06Y8f190Qgop7/Ui+D0njFV3LHMPwPT75DpXLQohE9Wmz0QElrJnzsjB7KPWiKJbOl7IPDArQ==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "@grpc/proto-loader": "^0.8.0", ++ "@js-sdsl/ordered-map": "^4.4.2" + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "engines": { ++ "node": ">=12.10.0" + } + }, +- "node_modules/graceful-fs": { +- "version": "4.2.11", +- "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", +- "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", +- "license": "ISC" ++ "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": { ++ "version": "0.8.1", ++ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.1.tgz", ++ "integrity": "sha512-wtF6h+DY6M3YaDBPAmvuuA6jV8Sif9MjtOI5euKFWRgCDl5PeDpPsHR9u2l6St5ceY8AZgoNDww5+HvEsXFsGg==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "lodash.camelcase": "^4.3.0", ++ "long": "^5.0.0", ++ "protobufjs": "^7.5.5", ++ "yargs": "^17.7.2" ++ }, ++ "bin": { ++ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" ++ }, ++ "engines": { ++ "node": ">=6" ++ } + }, +- "node_modules/handlebars": { +- "version": "4.7.8", +- "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", +- "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", +- "license": "MIT", ++ "node_modules/@grpc/proto-loader": { ++ "version": "0.7.15", ++ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz", ++ "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==", ++ "license": "Apache-2.0", ++ "optional": true, + "dependencies": { +- "minimist": "^1.2.5", +- "neo-async": "^2.6.2", +- "source-map": "^0.6.1", +- "wordwrap": "^1.0.0" ++ "lodash.camelcase": "^4.3.0", ++ "long": "^5.0.0", ++ "protobufjs": "^7.2.5", ++ "yargs": "^17.7.2" + }, + "bin": { +- "handlebars": "bin/handlebars" ++ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" + }, + "engines": { +- "node": ">=0.4.7" ++ "node": ">=6" ++ } ++ }, ++ "node_modules/@hapi/hoek": { ++ "version": "9.3.0", ++ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", ++ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", ++ "license": "BSD-3-Clause", ++ "optional": true ++ }, ++ "node_modules/@hapi/topo": { ++ "version": "5.1.0", ++ "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", ++ "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", ++ "license": "BSD-3-Clause", ++ "optional": true, ++ "dependencies": { ++ "@hapi/hoek": "^9.0.0" ++ } ++ }, ++ "node_modules/@isaacs/cliui": { ++ "version": "8.0.2", ++ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", ++ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", ++ "license": "ISC", ++ "dependencies": { ++ "string-width": "^5.1.2", ++ "string-width-cjs": "npm:string-width@^4.2.0", ++ "strip-ansi": "^7.0.1", ++ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", ++ "wrap-ansi": "^8.1.0", ++ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" + }, +- "optionalDependencies": { +- "uglify-js": "^3.1.4" ++ "engines": { ++ "node": ">=12" + } + }, +- "node_modules/has-property-descriptors": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", +- "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", ++ "node_modules/@jridgewell/gen-mapping": { ++ "version": "0.3.13", ++ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", ++ "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "es-define-property": "^1.0.0" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "@jridgewell/sourcemap-codec": "^1.5.0", ++ "@jridgewell/trace-mapping": "^0.3.24" + } + }, +- "node_modules/has-symbols": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", +- "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", ++ "node_modules/@jridgewell/remapping": { ++ "version": "2.3.5", ++ "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", ++ "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@jridgewell/gen-mapping": "^0.3.5", ++ "@jridgewell/trace-mapping": "^0.3.24" ++ } ++ }, ++ "node_modules/@jridgewell/resolve-uri": { ++ "version": "3.1.2", ++ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", ++ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "license": "MIT", ++ "optional": true, + "engines": { +- "node": ">= 0.4" +- }, ++ "node": ">=6.0.0" ++ } ++ }, ++ "node_modules/@jridgewell/source-map": { ++ "version": "0.3.11", ++ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", ++ "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@jridgewell/gen-mapping": "^0.3.5", ++ "@jridgewell/trace-mapping": "^0.3.25" ++ } ++ }, ++ "node_modules/@jridgewell/sourcemap-codec": { ++ "version": "1.5.5", ++ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", ++ "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", ++ "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/@jridgewell/trace-mapping": { ++ "version": "0.3.31", ++ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", ++ "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@jridgewell/resolve-uri": "^3.1.0", ++ "@jridgewell/sourcemap-codec": "^1.4.14" ++ } ++ }, ++ "node_modules/@js-sdsl/ordered-map": { ++ "version": "4.4.2", ++ "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", ++ "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", ++ "license": "MIT", ++ "optional": true, + "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "type": "opencollective", ++ "url": "https://opencollective.com/js-sdsl" + } + }, +- "node_modules/has-tostringtag": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", +- "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", ++ "node_modules/@mongodb-js/saslprep": { ++ "version": "1.4.11", ++ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.11.tgz", ++ "integrity": "sha512-o9rAHc0IpIjuPSxRutWpE1F62x7n+4mVS4rCNHkzhIUMQcc18bb6xEq5wd2NdN0WjepIyXIppRshYI2kQDOZVA==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "has-symbols": "^1.0.3" ++ "sparse-bitfield": "^3.0.3" ++ } ++ }, ++ "node_modules/@mysql/xdevapi": { ++ "version": "8.0.35", ++ "resolved": "https://registry.npmjs.org/@mysql/xdevapi/-/xdevapi-8.0.35.tgz", ++ "integrity": "sha512-l7HoBt1l0GwdCBXBrqri4kPBbJrqsyvaa4eqXvq50aWWArOTc5XGV06FWF1epxT+RORBy7scZTWFANxpr4Sfuw==", ++ "license": "GPL-2.0", ++ "optional": true, ++ "dependencies": { ++ "google-protobuf": "3.19.4", ++ "lossless-json": "2.0.1", ++ "parsimmon": "1.18.1" + }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=14.0.0" ++ } ++ }, ++ "node_modules/@nicolo-ribaudo/chokidar-2": { ++ "version": "2.1.8-no-fsevents.3", ++ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", ++ "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==", ++ "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/@nodable/entities": { ++ "version": "2.2.0", ++ "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.2.0.tgz", ++ "integrity": "sha512-9uGyhaQavEUMC8AIddIjau4NsnsXhou+j5sBAGojCM1oxmQpVKTWR/9JxABD6UAv12vpIms55fPZKFQEhG6uBg==", ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/nodable" ++ } ++ ], ++ "license": "MIT", ++ "optional": true ++ }, ++ "node_modules/@npmcli/fs": { ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", ++ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", ++ "license": "ISC", ++ "optional": true, ++ "dependencies": { ++ "@gar/promisify": "^1.0.1", ++ "semver": "^7.3.5" ++ } ++ }, ++ "node_modules/@npmcli/fs/node_modules/semver": { ++ "version": "7.8.4", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", ++ "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", ++ "license": "ISC", ++ "optional": true, ++ "bin": { ++ "semver": "bin/semver.js" + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "engines": { ++ "node": ">=10" + } + }, +- "node_modules/hasown": { +- "version": "2.0.2", +- "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", +- "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", ++ "node_modules/@npmcli/move-file": { ++ "version": "1.1.2", ++ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", ++ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", ++ "deprecated": "This functionality has been moved to @npmcli/fs", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "function-bind": "^1.1.2" ++ "mkdirp": "^1.0.4", ++ "rimraf": "^3.0.2" + }, + "engines": { +- "node": ">= 0.4" ++ "node": ">=10" + } + }, +- "node_modules/http-errors": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", +- "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", ++ "node_modules/@npmcli/move-file/node_modules/brace-expansion": { ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", ++ "optional": true, + "dependencies": { +- "depd": "~2.0.0", +- "inherits": "~2.0.4", +- "setprototypeof": "~1.2.0", +- "statuses": "~2.0.2", +- "toidentifier": "~1.0.1" ++ "balanced-match": "^1.0.0", ++ "concat-map": "0.0.1" ++ } ++ }, ++ "node_modules/@npmcli/move-file/node_modules/glob": { ++ "version": "7.2.3", ++ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", ++ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", ++ "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", ++ "license": "ISC", ++ "optional": true, ++ "dependencies": { ++ "fs.realpath": "^1.0.0", ++ "inflight": "^1.0.4", ++ "inherits": "2", ++ "minimatch": "^3.1.1", ++ "once": "^1.3.0", ++ "path-is-absolute": "^1.0.0" + }, + "engines": { +- "node": ">= 0.8" ++ "node": "*" + }, + "funding": { +- "type": "opencollective", +- "url": "https://opencollective.com/express" ++ "url": "https://github.com/sponsors/isaacs" + } + }, +- "node_modules/iconv-lite": { +- "version": "0.4.24", +- "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", +- "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", +- "license": "MIT", ++ "node_modules/@npmcli/move-file/node_modules/minimatch": { ++ "version": "3.1.5", ++ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", ++ "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", ++ "license": "ISC", ++ "optional": true, + "dependencies": { +- "safer-buffer": ">= 2.1.2 < 3" ++ "brace-expansion": "^1.1.7" + }, + "engines": { +- "node": ">=0.10.0" ++ "node": "*" + } + }, - "node_modules/ieee754": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", @@ -2511,675 +2583,6 @@ index 2af3a0d1..5c5f4b73 100644 - } - ], - "license": "BSD-3-Clause" -+ "node_modules/@firebase/database-types": { -+ "version": "1.0.5", -+ "resolved": "https://registry.npmjs.org/@firebase/database-types/-/database-types-1.0.5.tgz", -+ "integrity": "sha512-fTlqCNwFYyq/C6W7AJ5OCuq5CeZuBEsEwptnVxlNPkWCo5cTTyukzAHRSO/jaQcItz33FfYrrFk1SJofcu2AaQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@firebase/app-types": "0.9.2", -+ "@firebase/util": "1.10.0" -+ } - }, -- "node_modules/immediate": { -- "version": "3.0.6", -- "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", -- "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", -- "license": "MIT" -+ "node_modules/@firebase/logger": { -+ "version": "0.4.2", -+ "resolved": "https://registry.npmjs.org/@firebase/logger/-/logger-0.4.2.tgz", -+ "integrity": "sha512-Q1VuA5M1Gjqrwom6I6NUU4lQXdo9IAQieXlujeHZWvRt1b7qQ0KwBaNAjgxG27jgF9/mUwsNmO8ptBCGVYhB0A==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.1.0" -+ } - }, -- "node_modules/inherits": { -- "version": "2.0.4", -- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", -- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", -- "license": "ISC" -+ "node_modules/@firebase/util": { -+ "version": "1.10.0", -+ "resolved": "https://registry.npmjs.org/@firebase/util/-/util-1.10.0.tgz", -+ "integrity": "sha512-xKtx4A668icQqoANRxyDLBLz51TAbDP9KRfpbKGxiCAW346d0BeJe5vN6/hKxxmWwnZ0mautyv39JxviwwQMOQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.1.0" -+ } - }, -- "node_modules/ipaddr.js": { -- "version": "1.9.1", -- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", -- "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", -+ "node_modules/@gar/promisify": { -+ "version": "1.1.3", -+ "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz", -+ "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==", - "license": "MIT", -+ "optional": true -+ }, -+ "node_modules/@google-cloud/firestore": { -+ "version": "7.11.6", -+ "resolved": "https://registry.npmjs.org/@google-cloud/firestore/-/firestore-7.11.6.tgz", -+ "integrity": "sha512-EW/O8ktzwLfyWBOsNuhRoMi8lrC3clHM5LVFhGvO1HCsLozCOOXRAlHrYBoE6HL42Sc8yYMuCb2XqcnJ4OOEpw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@opentelemetry/api": "^1.3.0", -+ "fast-deep-equal": "^3.1.1", -+ "functional-red-black-tree": "^1.0.1", -+ "google-gax": "^4.3.3", -+ "protobufjs": "^7.2.6" -+ }, - "engines": { -- "node": ">= 0.10" -+ "node": ">=14.0.0" - } - }, -- "node_modules/ipcheck": { -- "version": "0.1.0", -- "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz", -- "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==", -- "license": "MIT" -- }, -- "node_modules/is-arguments": { -- "version": "1.2.0", -- "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", -- "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", -- "license": "MIT", -+ "node_modules/@google-cloud/paginator": { -+ "version": "5.0.2", -+ "resolved": "https://registry.npmjs.org/@google-cloud/paginator/-/paginator-5.0.2.tgz", -+ "integrity": "sha512-DJS3s0OVH4zFDB1PzjxAsHqJT6sKVbRwwML0ZBP9PbU7Yebtu/7SWMRzvO2J3nUi9pRNITCfu4LJeooM2w4pjg==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "call-bound": "^1.0.2", -- "has-tostringtag": "^1.0.2" -+ "arrify": "^2.0.0", -+ "extend": "^3.0.2" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=14.0.0" - } - }, -- "node_modules/is-callable": { -- "version": "1.2.7", -- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", -- "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", -- "license": "MIT", -+ "node_modules/@google-cloud/projectify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/@google-cloud/projectify/-/projectify-4.0.0.tgz", -+ "integrity": "sha512-MmaX6HeSvyPbWGwFq7mXdo0uQZLGBYCwziiLIGq5JVX+/bdI3SAq6bP98trV5eTWfLuvsMcIC1YJOF2vfteLFA==", -+ "license": "Apache-2.0", -+ "optional": true, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=14.0.0" - } - }, -- "node_modules/is-fullwidth-code-point": { -- "version": "3.0.0", -- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", -- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", -- "license": "MIT", -+ "node_modules/@google-cloud/promisify": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/@google-cloud/promisify/-/promisify-4.0.0.tgz", -+ "integrity": "sha512-Orxzlfb9c67A15cq2JQEyVc7wEsmFBmHjZWZYQMUyJ1qivXyMwdyNOs9odi79hze+2zqdTtu1E19IM/FtqZ10g==", -+ "license": "Apache-2.0", -+ "optional": true, - "engines": { -- "node": ">=8" -+ "node": ">=14" - } - }, -- "node_modules/is-generator-function": { -- "version": "1.1.2", -- "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", -- "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", -- "license": "MIT", -+ "node_modules/@google-cloud/storage": { -+ "version": "7.19.0", -+ "resolved": "https://registry.npmjs.org/@google-cloud/storage/-/storage-7.19.0.tgz", -+ "integrity": "sha512-n2FjE7NAOYyshogdc7KQOl/VZb4sneqPjWouSyia9CMDdMhRX5+RIbqalNmC7LOLzuLAN89VlF2HvG8na9G+zQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "call-bound": "^1.0.4", -- "generator-function": "^2.0.0", -- "get-proto": "^1.0.1", -- "has-tostringtag": "^1.0.2", -- "safe-regex-test": "^1.1.0" -+ "@google-cloud/paginator": "^5.0.0", -+ "@google-cloud/projectify": "^4.0.0", -+ "@google-cloud/promisify": "<4.1.0", -+ "abort-controller": "^3.0.0", -+ "async-retry": "^1.3.3", -+ "duplexify": "^4.1.3", -+ "fast-xml-parser": "^5.3.4", -+ "gaxios": "^6.0.2", -+ "google-auth-library": "^9.6.3", -+ "html-entities": "^2.5.2", -+ "mime": "^3.0.0", -+ "p-limit": "^3.0.1", -+ "retry-request": "^7.0.0", -+ "teeny-request": "^9.0.0", -+ "uuid": "^8.0.0" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=14" - } - }, -- "node_modules/is-regex": { -- "version": "1.2.1", -- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", -- "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", -+ "node_modules/@google-cloud/storage/node_modules/mime": { -+ "version": "3.0.0", -+ "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", -+ "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", - "license": "MIT", -- "dependencies": { -- "call-bound": "^1.0.2", -- "gopd": "^1.2.0", -- "has-tostringtag": "^1.0.2", -- "hasown": "^2.0.2" -+ "optional": true, -+ "bin": { -+ "mime": "cli.js" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=10.0.0" - } - }, -- "node_modules/is-stream": { -- "version": "2.0.1", -- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", -- "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", -+ "node_modules/@google-cloud/storage/node_modules/uuid": { -+ "version": "8.3.2", -+ "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", -+ "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", - "license": "MIT", -- "engines": { -- "node": ">=8" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "optional": true, -+ "bin": { -+ "uuid": "dist/bin/uuid" - } - }, -- "node_modules/is-typed-array": { -- "version": "1.1.15", -- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", -- "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", -- "license": "MIT", -+ "node_modules/@grpc/grpc-js": { -+ "version": "1.14.3", -+ "resolved": "https://registry.npmjs.org/@grpc/grpc-js/-/grpc-js-1.14.3.tgz", -+ "integrity": "sha512-Iq8QQQ/7X3Sac15oB6p0FmUg/klxQvXLeileoqrTRGJYLV+/9tubbr9ipz0GKHjmXVsgFPo/+W+2cA8eNcR+XA==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "which-typed-array": "^1.1.16" -+ "@grpc/proto-loader": "^0.8.0", -+ "@js-sdsl/ordered-map": "^4.4.2" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">=12.10.0" - } - }, -- "node_modules/isarray": { -- "version": "1.0.0", -- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", -- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", -- "license": "MIT" -- }, -- "node_modules/isexe": { -- "version": "2.0.0", -- "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", -- "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", -- "license": "ISC" -- }, -- "node_modules/jackspeak": { -- "version": "3.4.3", -- "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", -- "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", -- "license": "BlueOak-1.0.0", -+ "node_modules/@grpc/grpc-js/node_modules/@grpc/proto-loader": { -+ "version": "0.8.0", -+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.8.0.tgz", -+ "integrity": "sha512-rc1hOQtjIWGxcxpb9aHAfLpIctjEnsDehj0DAiVfBlmT84uvR0uUtN2hEi/ecvWVjXUGf5qPF4qEgiLOx1YIMQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "@isaacs/cliui": "^8.0.2" -+ "lodash.camelcase": "^4.3.0", -+ "long": "^5.0.0", -+ "protobufjs": "^7.5.3", -+ "yargs": "^17.7.2" - }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" -+ "bin": { -+ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, -- "optionalDependencies": { -- "@pkgjs/parseargs": "^0.11.0" -+ "engines": { -+ "node": ">=6" - } - }, -- "node_modules/keygrip": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", -- "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", -- "license": "MIT", -+ "node_modules/@grpc/proto-loader": { -+ "version": "0.7.15", -+ "resolved": "https://registry.npmjs.org/@grpc/proto-loader/-/proto-loader-0.7.15.tgz", -+ "integrity": "sha512-tMXdRCfYVixjuFK+Hk0Q1s38gV9zDiDJfWL3h1rv4Qc39oILCu1TRTDt7+fGUI8K4G1Fj125Hx/ru3azECWTyQ==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "tsscmp": "1.0.6" -+ "lodash.camelcase": "^4.3.0", -+ "long": "^5.0.0", -+ "protobufjs": "^7.2.5", -+ "yargs": "^17.7.2" -+ }, -+ "bin": { -+ "proto-loader-gen-types": "build/bin/proto-loader-gen-types.js" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=6" - } - }, -- "node_modules/lazystream": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", -- "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", -- "license": "MIT", -+ "node_modules/@hapi/hoek": { -+ "version": "9.3.0", -+ "resolved": "https://registry.npmjs.org/@hapi/hoek/-/hoek-9.3.0.tgz", -+ "integrity": "sha512-/c6rf4UJlmHlC9b5BaNvzAcFv7HZ2QHaV0D4/HNlBdvFnvQq8RI4kYdhyPCl7Xj+oWvTWQ8ujhqS53LIgAe6KQ==", -+ "license": "BSD-3-Clause", -+ "optional": true -+ }, -+ "node_modules/@hapi/topo": { -+ "version": "5.1.0", -+ "resolved": "https://registry.npmjs.org/@hapi/topo/-/topo-5.1.0.tgz", -+ "integrity": "sha512-foQZKJig7Ob0BMAYBfcJk8d77QtOe7Wo4ox7ff1lQYoNNAb6jwcY1ncdoy2e9wQZzvNy7ODZCYJkK8kzmcAnAg==", -+ "license": "BSD-3-Clause", -+ "optional": true, - "dependencies": { -- "readable-stream": "^2.0.5" -+ "@hapi/hoek": "^9.0.0" -+ } -+ }, -+ "node_modules/@isaacs/cliui": { -+ "version": "8.0.2", -+ "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", -+ "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", -+ "license": "ISC", -+ "dependencies": { -+ "string-width": "^5.1.2", -+ "string-width-cjs": "npm:string-width@^4.2.0", -+ "strip-ansi": "^7.0.1", -+ "strip-ansi-cjs": "npm:strip-ansi@^6.0.1", -+ "wrap-ansi": "^8.1.0", -+ "wrap-ansi-cjs": "npm:wrap-ansi@^7.0.0" - }, - "engines": { -- "node": ">= 0.6.3" -+ "node": ">=12" - } - }, -- "node_modules/lazystream/node_modules/readable-stream": { -- "version": "2.3.8", -- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", -- "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", -+ "node_modules/@jridgewell/gen-mapping": { -+ "version": "0.3.13", -+ "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", -+ "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "core-util-is": "~1.0.0", -- "inherits": "~2.0.3", -- "isarray": "~1.0.0", -- "process-nextick-args": "~2.0.0", -- "safe-buffer": "~5.1.1", -- "string_decoder": "~1.1.1", -- "util-deprecate": "~1.0.1" -+ "@jridgewell/sourcemap-codec": "^1.5.0", -+ "@jridgewell/trace-mapping": "^0.3.24" - } - }, -- "node_modules/lazystream/node_modules/safe-buffer": { -- "version": "5.1.2", -- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", -- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", -- "license": "MIT" -- }, -- "node_modules/lazystream/node_modules/string_decoder": { -- "version": "1.1.1", -- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", -- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", -+ "node_modules/@jridgewell/remapping": { -+ "version": "2.3.5", -+ "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", -+ "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "safe-buffer": "~5.1.0" -+ "@jridgewell/gen-mapping": "^0.3.5", -+ "@jridgewell/trace-mapping": "^0.3.24" - } - }, -- "node_modules/lie": { -- "version": "3.1.1", -- "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", -- "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", -+ "node_modules/@jridgewell/resolve-uri": { -+ "version": "3.1.2", -+ "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", -+ "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "license": "MIT", -- "dependencies": { -- "immediate": "~3.0.5" -+ "optional": true, -+ "engines": { -+ "node": ">=6.0.0" - } - }, -- "node_modules/localforage": { -- "version": "1.10.0", -- "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", -- "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", -- "license": "Apache-2.0", -+ "node_modules/@jridgewell/source-map": { -+ "version": "0.3.11", -+ "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", -+ "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", -+ "license": "MIT", -+ "optional": true, - "dependencies": { -- "lie": "3.1.1" -+ "@jridgewell/gen-mapping": "^0.3.5", -+ "@jridgewell/trace-mapping": "^0.3.25" - } - }, -- "node_modules/lodash": { -- "version": "4.17.23", -- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", -- "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", -- "license": "MIT" -- }, -- "node_modules/lru-cache": { -- "version": "10.4.3", -- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", -- "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", -- "license": "ISC" -- }, -- "node_modules/math-intrinsics": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", -- "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", -+ "node_modules/@jridgewell/sourcemap-codec": { -+ "version": "1.5.5", -+ "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", -+ "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "license": "MIT", -- "engines": { -- "node": ">= 0.4" -- } -+ "optional": true - }, -- "node_modules/media-typer": { -- "version": "0.3.0", -- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", -- "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", -+ "node_modules/@jridgewell/trace-mapping": { -+ "version": "0.3.31", -+ "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", -+ "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "license": "MIT", -- "engines": { -- "node": ">= 0.6" -+ "optional": true, -+ "dependencies": { -+ "@jridgewell/resolve-uri": "^3.1.0", -+ "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, -- "node_modules/merge-descriptors": { -- "version": "1.0.3", -- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", -- "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", -+ "node_modules/@js-sdsl/ordered-map": { -+ "version": "4.4.2", -+ "resolved": "https://registry.npmjs.org/@js-sdsl/ordered-map/-/ordered-map-4.4.2.tgz", -+ "integrity": "sha512-iUKgm52T8HOE/makSxjqoWhe95ZJA1/G1sYsGev2JDKUSS14KAgg1LHb+Ba+IPow0xflbnSkOsZcO08C7w1gYw==", - "license": "MIT", -+ "optional": true, - "funding": { -- "url": "https://github.com/sponsors/sindresorhus" -+ "type": "opencollective", -+ "url": "https://opencollective.com/js-sdsl" - } - }, -- "node_modules/methods": { -- "version": "1.1.2", -- "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", -- "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", -+ "node_modules/@mongodb-js/saslprep": { -+ "version": "1.4.9", -+ "resolved": "https://registry.npmjs.org/@mongodb-js/saslprep/-/saslprep-1.4.9.tgz", -+ "integrity": "sha512-RXSxsokhAF/4nWys8An8npsqOI33Ex1Hlzqjw2pZOO+GKtMAR2noGnUdsFiGwsaO/xXI+56mtjTmDA3JXJsvmA==", - "license": "MIT", -- "engines": { -- "node": ">= 0.6" -+ "optional": true, -+ "dependencies": { -+ "sparse-bitfield": "^3.0.3" - } - }, -- "node_modules/mime": { -- "version": "1.6.0", -- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", -- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", -- "license": "MIT", -- "bin": { -- "mime": "cli.js" -+ "node_modules/@mysql/xdevapi": { -+ "version": "8.0.35", -+ "resolved": "https://registry.npmjs.org/@mysql/xdevapi/-/xdevapi-8.0.35.tgz", -+ "integrity": "sha512-l7HoBt1l0GwdCBXBrqri4kPBbJrqsyvaa4eqXvq50aWWArOTc5XGV06FWF1epxT+RORBy7scZTWFANxpr4Sfuw==", -+ "license": "GPL-2.0", -+ "optional": true, -+ "dependencies": { -+ "google-protobuf": "3.19.4", -+ "lossless-json": "2.0.1", -+ "parsimmon": "1.18.1" - }, - "engines": { -- "node": ">=4" -+ "node": ">=14.0.0" - } - }, -- "node_modules/mime-db": { -- "version": "1.54.0", -- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", -- "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", -+ "node_modules/@nicolo-ribaudo/chokidar-2": { -+ "version": "2.1.8-no-fsevents.3", -+ "resolved": "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz", -+ "integrity": "sha512-s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ==", -+ "license": "MIT", -+ "optional": true -+ }, -+ "node_modules/@nodable/entities": { -+ "version": "2.1.0", -+ "resolved": "https://registry.npmjs.org/@nodable/entities/-/entities-2.1.0.tgz", -+ "integrity": "sha512-nyT7T3nbMyBI/lvr6L5TyWbFJAI9FTgVRakNoBqCD+PmID8DzFrrNdLLtHMwMszOtqZa8PAOV24ZqDnQrhQINA==", -+ "funding": [ -+ { -+ "type": "github", -+ "url": "https://github.com/sponsors/nodable" -+ } -+ ], - "license": "MIT", -+ "optional": true -+ }, -+ "node_modules/@npmcli/fs": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz", -+ "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==", -+ "license": "ISC", -+ "optional": true, -+ "dependencies": { -+ "@gar/promisify": "^1.0.1", -+ "semver": "^7.3.5" -+ } -+ }, -+ "node_modules/@npmcli/fs/node_modules/semver": { -+ "version": "7.7.4", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", -+ "license": "ISC", -+ "optional": true, -+ "bin": { -+ "semver": "bin/semver.js" -+ }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=10" - } - }, -- "node_modules/mime-types": { -- "version": "2.1.35", -- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", -- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", -+ "node_modules/@npmcli/move-file": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz", -+ "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==", -+ "deprecated": "This functionality has been moved to @npmcli/fs", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "mime-db": "1.52.0" -+ "mkdirp": "^1.0.4", -+ "rimraf": "^3.0.2" - }, - "engines": { -- "node": ">= 0.6" -+ "node": ">=10" - } - }, -- "node_modules/mime-types/node_modules/mime-db": { -- "version": "1.52.0", -- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", -- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", -+ "node_modules/@npmcli/move-file/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", - "license": "MIT", -- "engines": { -- "node": ">= 0.6" -+ "optional": true, -+ "dependencies": { -+ "balanced-match": "^1.0.0", -+ "concat-map": "0.0.1" - } - }, -- "node_modules/minimatch": { -- "version": "9.0.9", -- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", -- "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", -+ "node_modules/@npmcli/move-file/node_modules/glob": { -+ "version": "7.2.3", -+ "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", -+ "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", -+ "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", - "license": "ISC", -+ "optional": true, - "dependencies": { -- "brace-expansion": "^2.0.2" -+ "fs.realpath": "^1.0.0", -+ "inflight": "^1.0.4", -+ "inherits": "2", -+ "minimatch": "^3.1.1", -+ "once": "^1.3.0", -+ "path-is-absolute": "^1.0.0" - }, - "engines": { -- "node": ">=16 || 14 >=14.17" -+ "node": "*" - }, - "funding": { - "url": "https://github.com/sponsors/isaacs" - } - }, -- "node_modules/minimist": { -- "version": "1.2.8", -- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", -- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", -- "license": "MIT", -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node_modules/@npmcli/move-file/node_modules/minimatch": { -+ "version": "3.1.5", -+ "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", -+ "integrity": "sha512-VgjWUsnnT6n+NUk6eZq77zeFdpW2LWDzP6zFGrCbHXiYNul5Dzqk2HHQ5uFH2DNW5Xbp8+jVzaeNt94ssEEl4w==", -+ "license": "ISC", -+ "optional": true, -+ "dependencies": { -+ "brace-expansion": "^1.1.7" -+ }, -+ "engines": { -+ "node": "*" - } - }, -- "node_modules/minipass": { -- "version": "7.1.3", -- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", -- "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", -- "license": "BlueOak-1.0.0", + "node_modules/@npmcli/move-file/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", @@ -3189,15 +2592,15 @@ index 2af3a0d1..5c5f4b73 100644 + "bin": { + "mkdirp": "bin/cmd.js" + }, - "engines": { -- "node": ">=16 || 14 >=14.17" ++ "engines": { + "node": ">=10" - } ++ } }, -- "node_modules/ms": { -- "version": "2.0.0", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", -- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", +- "node_modules/immediate": { +- "version": "3.0.6", +- "resolved": "https://registry.npmjs.org/immediate/-/immediate-3.0.6.tgz", +- "integrity": "sha512-XXOFtyqDjNDAQxVfYxuF7g9Il/IbWmmlQg2MYKOH8ExIT1qg6xc4zyS3HaEEATgs1btfzxq15ciUiY7gjSXRGQ==", +- "license": "MIT" + "node_modules/@npmcli/move-file/node_modules/rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -3229,22 +2632,15 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@otplib/core/-/core-12.0.1.tgz", + "integrity": "sha512-4sGntwbA/AC+SbPhbsziRiD+jNDdIzsZ3JUyfZwjtKyc/wufl1pnSIaG4Uqx8ymPagujub0o92kgBnB89cuAMA==", - "license": "MIT" - }, -- "node_modules/multiparty": { -- "version": "4.2.3", -- "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz", -- "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==", ++ "license": "MIT" ++ }, + "node_modules/@otplib/plugin-crypto": { + "version": "12.0.1", + "resolved": "https://registry.npmjs.org/@otplib/plugin-crypto/-/plugin-crypto-12.0.1.tgz", + "integrity": "sha512-qPuhN3QrT7ZZLcLCyKOSNhuijUi9G5guMRVrxq63r9YNOxxQjPm59gVxLM+7xGnHnM6cimY57tuKsjK7y9LM1g==", + "deprecated": "Please upgrade to v13 of otplib. Refer to otplib docs for migration paths", - "license": "MIT", - "dependencies": { -- "http-errors": "~1.8.1", -- "safe-buffer": "5.2.1", -- "uid-safe": "2.1.5" ++ "license": "MIT", ++ "dependencies": { + "@otplib/core": "^12.0.1" + } + }, @@ -3307,28 +2703,27 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/@protobufjs/codegen": { -+ "version": "2.0.4", -+ "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.4.tgz", -+ "integrity": "sha512-YyFaikqM5sH0ziFZCN3xDC7zeGaB/d0IUb9CATugHWbd1FRFwWwt4ld4OYMPWu5a3Xe01mGAULCdqhMlPl29Jg==", ++ "version": "2.0.5", ++ "resolved": "https://registry.npmjs.org/@protobufjs/codegen/-/codegen-2.0.5.tgz", ++ "integrity": "sha512-zgXFLzW3Ap33e6d0Wlj4MGIm6Ce8O89n/apUaGNB/jx+hw+ruWEp7EwGUshdLKVRCxZW12fp9r40E1mQrf/34g==", + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/eventemitter": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.0.tgz", -+ "integrity": "sha512-j9ednRT81vYJ9OfVuXG6ERSTdEL1xVsNgqpkxMsbIabzSo3goCjDIveeGv5d03om39ML71RdmrGNjG5SReBP/Q==", ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@protobufjs/eventemitter/-/eventemitter-1.1.1.tgz", ++ "integrity": "sha512-vW1GmwMZNnL+gMRaovlh9yZX74kc+TTU3FObkkurpMaRtBfLP3ldjS9KQWlwZgraRE0+dheEEoAxdzcJQ8eXZg==", + "license": "BSD-3-Clause", + "optional": true + }, + "node_modules/@protobufjs/fetch": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.0.tgz", -+ "integrity": "sha512-lljVXpqXebpsijW71PZaCYeIcE5on1w5DlQy5WH6GLbFryLUrBD4932W/E2BSpfRJWseIL4v/KPgBFxDOIdKpQ==", ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@protobufjs/fetch/-/fetch-1.1.1.tgz", ++ "integrity": "sha512-GpptLrs57adMSuHi3VNj0mAF8dwh36LMaYF6XyJ6JMWlVsc+t42tm1HSEDmOs3A8fC9yyeisgLhsTVQokOZ0zw==", + "license": "BSD-3-Clause", + "optional": true, + "dependencies": { -+ "@protobufjs/aspromise": "^1.1.1", -+ "@protobufjs/inquire": "^1.1.0" ++ "@protobufjs/aspromise": "^1.1.1" + } + }, + "node_modules/@protobufjs/float": { @@ -3338,13 +2733,6 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "BSD-3-Clause", + "optional": true + }, -+ "node_modules/@protobufjs/inquire": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/@protobufjs/inquire/-/inquire-1.1.0.tgz", -+ "integrity": "sha512-kdSefcPdruJiFMVSbn801t4vFK7KB/5gd2fYvrxhuJYg8ILrmn9SKSX2tZdV6V+ksulWqS7aXjBcRXl3wHoD9Q==", -+ "license": "BSD-3-Clause", -+ "optional": true -+ }, + "node_modules/@protobufjs/path": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@protobufjs/path/-/path-1.1.2.tgz", @@ -3360,9 +2748,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/@protobufjs/utf8": { -+ "version": "1.1.0", -+ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.0.tgz", -+ "integrity": "sha512-Vvn3zZrhQZkkBE8LSuW3em98c0FwgO4nxzv6OdSxPKJIEKY2bGbHn+mhGIPerzI4twdxaP8/0+06HBpwf345Lw==", ++ "version": "1.1.1", ++ "resolved": "https://registry.npmjs.org/@protobufjs/utf8/-/utf8-1.1.1.tgz", ++ "integrity": "sha512-oOAWABowe8EAbMyWKM0tYDKi8Yaox52D+HWZhAIJqQXbqe0xI/GV7FhLWqlEKreMkfDjshR5FKgi3mnle0h6Eg==", + "license": "BSD-3-Clause", + "optional": true + }, @@ -3483,40 +2871,15 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "BSD-3-Clause", + "optional": true + }, -+ "node_modules/@smithy/config-resolver": { -+ "version": "4.4.17", -+ "resolved": "https://registry.npmjs.org/@smithy/config-resolver/-/config-resolver-4.4.17.tgz", -+ "integrity": "sha512-TzDZcAnhTyAHbXVxWZo7/tEcrIeFq20IBk8So3OLOetWpR8EwY/yEqBMBFaJMeyEiREDq4NfEl+qO3OAUD+vbQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-config-provider": "^4.2.2", -+ "@smithy/util-endpoints": "^3.4.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, + "node_modules/@smithy/core": { -+ "version": "3.23.17", -+ "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.23.17.tgz", -+ "integrity": "sha512-x7BlLbUFL8NWCGjMF9C+1N5cVCxcPa7g6Tv9B4A2luWx3be3oU8hQ96wIwxe/s7OhIzvoJH73HAUSg5JXVlEtQ==", ++ "version": "3.25.1", ++ "resolved": "https://registry.npmjs.org/@smithy/core/-/core-3.25.1.tgz", ++ "integrity": "sha512-zpDbpXBCBsxfLtG2GEUyfgvHvSFrw5CwDZSNzL0v52gx/c3oPlPbm+7W7num8xs6vyiUBn+bvYPHcQDOXZynCQ==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", -+ "@smithy/util-base64": "^4.3.2", -+ "@smithy/util-body-length-browser": "^4.2.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-stream": "^4.5.25", -+ "@smithy/util-utf8": "^4.2.2", -+ "@smithy/uuid": "^1.1.2", ++ "@aws-crypto/crc32": "5.2.0", ++ "@smithy/types": "^4.15.0", + "tslib": "^2.6.2" + }, + "engines": { @@ -3524,16 +2887,14 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/credential-provider-imds": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.2.14.tgz", -+ "integrity": "sha512-Au28zBN48ZAoXdooGUHemuVBrkE+Ie6RPmGNIAJsFqj33Vhb6xAgRifUydZ2aY+M+KaMAETAlKk5NC5h1G7wpg==", ++ "version": "4.4.1", ++ "resolved": "https://registry.npmjs.org/@smithy/credential-provider-imds/-/credential-provider-imds-4.4.1.tgz", ++ "integrity": "sha512-TSAF5NHgxEsllbErYWbK8aLnl5L601NGc5VYJlSPsKnf3YlkhdoBN+geGcaU00oiw2OK3QO5LA3QNXiiWhCidQ==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", ++ "@smithy/core": "^3.25.1", ++ "@smithy/types": "^4.15.0", + "tslib": "^2.6.2" + }, + "engines": { @@ -3541,46 +2902,14 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/fetch-http-handler": { -+ "version": "5.3.17", -+ "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.3.17.tgz", -+ "integrity": "sha512-bXOvQzaSm6MnmLaWA1elgfQcAtN4UP3vXqV97bHuoOrHQOJiLT3ds6o9eo5bqd0TJfRFpzdGnDQdW3FACiAVdw==", ++ "version": "5.5.1", ++ "resolved": "https://registry.npmjs.org/@smithy/fetch-http-handler/-/fetch-http-handler-5.5.1.tgz", ++ "integrity": "sha512-96JrD1q71anokymx9Iblb+zKmNQYNstlV/25A9ZYIJ2A0rp1r7/GZAIm0bDWSmVvz3DpNOCZuabzsiL+w0UHhw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/querystring-builder": "^4.2.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-base64": "^4.3.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/hash-node": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/hash-node/-/hash-node-4.2.14.tgz", -+ "integrity": "sha512-8ZBDY2DD4wr+GGjTpPtiglEsqr0lUP+KHqgZcWczFf6qeZ/YRjMIOoQWVQlmwu7EtxKTd8YXD8lblmYcpBIA1g==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-buffer-from": "^4.2.2", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/invalid-dependency": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/invalid-dependency/-/invalid-dependency-4.2.14.tgz", -+ "integrity": "sha512-c21qJiTSb25xvvOp+H2TNZzPCngrvl5vIPqPB8zQ/DmJF4QWXO19x1dWfMJZ6wZuuWUPPm0gV8C0cU3+ifcWuw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", ++ "@smithy/core": "^3.25.1", ++ "@smithy/types": "^4.15.0", + "tslib": "^2.6.2" + }, + "engines": { @@ -3588,215 +2917,27 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/is-array-buffer": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-4.2.2.tgz", -+ "integrity": "sha512-n6rQ4N8Jj4YTQO3YFrlgZuwKodf4zUFs7EJIWH86pSCWBaAtAGBFfCM7Wx6D2bBJ2xqFNxGBSrUWswT3M0VJow==", ++ "version": "2.2.0", ++ "resolved": "https://registry.npmjs.org/@smithy/is-array-buffer/-/is-array-buffer-2.2.0.tgz", ++ "integrity": "sha512-GGP3O9QFD24uGeAXYUjwSTXARoqpZykHadOmA8G5vfJPK0/DC67qa//0qvqrJzL1xc8WQWX7/yc7fwudjPHPhA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { + "tslib": "^2.6.2" + }, + "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/middleware-content-length": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/middleware-content-length/-/middleware-content-length-4.2.14.tgz", -+ "integrity": "sha512-xhHq7fX4/3lv5NHxLUk3OeEvl0xZ+Ek3qIbWaCL4f9JwgDZEclPBElljaZCAItdGPQl/kSM4LPMOpy1MYgprpw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/middleware-endpoint": { -+ "version": "4.4.32", -+ "resolved": "https://registry.npmjs.org/@smithy/middleware-endpoint/-/middleware-endpoint-4.4.32.tgz", -+ "integrity": "sha512-ZZkgyjnJppiZbIm6Qbx92pbXYi1uzenIvGhBSCDlc7NwuAkiqSgS75j1czAD25ZLs2FjMjYy1q7gyRVWG6JA0Q==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/core": "^3.23.17", -+ "@smithy/middleware-serde": "^4.2.20", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", -+ "@smithy/url-parser": "^4.2.14", -+ "@smithy/util-middleware": "^4.2.14", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/middleware-retry": { -+ "version": "4.5.5", -+ "resolved": "https://registry.npmjs.org/@smithy/middleware-retry/-/middleware-retry-4.5.5.tgz", -+ "integrity": "sha512-wnYOpB5vATFKWrY2Z9Alb0KhjZI6AbzU6Fbz3Hq2GnURdRYWB4q+qWivQtSTwXcmWUA3MZ6krfwL6Cq5MAbxsA==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/core": "^3.23.17", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/service-error-classification": "^4.3.0", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-retry": "^4.3.4", -+ "@smithy/uuid": "^1.1.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/middleware-serde": { -+ "version": "4.2.20", -+ "resolved": "https://registry.npmjs.org/@smithy/middleware-serde/-/middleware-serde-4.2.20.tgz", -+ "integrity": "sha512-Lx9JMO9vArPtiChE3wbEZ5akMIDQpWQtlu90lhACQmNOXcGXRbaDywMHDzuDZ2OkZzP+9wQfZi3YJT9F67zTQQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/core": "^3.23.17", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/middleware-stack": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/middleware-stack/-/middleware-stack-4.2.14.tgz", -+ "integrity": "sha512-2dvkUKLuFdKsCRmOE4Mn63co0Djtsm+JMh0bYZQupN1pJwMeE8FmQmRLLzzEMN0dnNi7CDCYYH8F0EVwWiPBeA==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/node-config-provider": { -+ "version": "4.3.14", -+ "resolved": "https://registry.npmjs.org/@smithy/node-config-provider/-/node-config-provider-4.3.14.tgz", -+ "integrity": "sha512-S+gFjyo/weSVL0P1b9Ts8C/CwIfNCgUPikk3sl6QVsfE/uUuO+QsF+NsE/JkpvWqqyz1wg7HFdiaZuj5CoBMRg==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/shared-ini-file-loader": "^4.4.9", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" ++ "node": ">=14.0.0" + } + }, + "node_modules/@smithy/node-http-handler": { -+ "version": "4.6.1", -+ "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.6.1.tgz", -+ "integrity": "sha512-iB+orM4x3xrr57X3YaXazfKnntl0LHlZB1kcXSGzMV1Tt0+YwEjGlbjk/44qEGtBzXAz6yFDzkYTKSV6Pj2HUg==", ++ "version": "4.8.1", ++ "resolved": "https://registry.npmjs.org/@smithy/node-http-handler/-/node-http-handler-4.8.1.tgz", ++ "integrity": "sha512-emtXvoky671puri18ETf64AFIQUGIEA093F2drXpBgB0OGnBLjcwNR3CA2mYu62IAqNsS56xa5lnTxAgPq7cjw==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/querystring-builder": "^4.2.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/property-provider": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/property-provider/-/property-provider-4.2.14.tgz", -+ "integrity": "sha512-WuM31CgfsnQ/10i7NYr0PyxqknD72Y5uMfUMVSniPjbEPceiTErb4eIqJQ+pdxNEAUEWrewrGjIRjVbVHsxZiQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/protocol-http": { -+ "version": "5.3.14", -+ "resolved": "https://registry.npmjs.org/@smithy/protocol-http/-/protocol-http-5.3.14.tgz", -+ "integrity": "sha512-dN5F8kHx8RNU0r+pCwNmFZyz6ChjMkzShy/zup6MtkRmmix4vZzJdW+di7x//b1LiynIev88FM18ie+wwPcQtQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/querystring-builder": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/querystring-builder/-/querystring-builder-4.2.14.tgz", -+ "integrity": "sha512-XYA5Z0IqTeF+5XDdh4BBmSA0HvbgVZIyv4cmOoUheDNR57K1HgBp9ukUMx3Cr3XpDHHpLBnexPE3LAtDsZkj2A==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-uri-escape": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/querystring-parser": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/querystring-parser/-/querystring-parser-4.2.14.tgz", -+ "integrity": "sha512-hr+YyqBD23GVvRxGGrcc/oOeNlK3PzT5Fu4dzrDXxzS1LpFiuL2PQQqKPs87M79aW7ziMs+nvB3qdw77SqE7Lw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/service-error-classification": { -+ "version": "4.3.0", -+ "resolved": "https://registry.npmjs.org/@smithy/service-error-classification/-/service-error-classification-4.3.0.tgz", -+ "integrity": "sha512-9jKsBYQRPR0xBLgc2415RsA5PIcP2sis4oBdN9s0D13cg1B1284mNTjx9Yc+BEERXzuPm5ObktI96OxsKh8E9A==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/shared-ini-file-loader": { -+ "version": "4.4.9", -+ "resolved": "https://registry.npmjs.org/@smithy/shared-ini-file-loader/-/shared-ini-file-loader-4.4.9.tgz", -+ "integrity": "sha512-495/V2I15SHgedSJoDPD23JuSfKAp726ZI1V0wtjB07Wh7q/0tri/0e0DLefZCHgxZonrGKt/OCTpAtP1wE1kQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", ++ "@smithy/core": "^3.25.1", ++ "@smithy/types": "^4.15.0", + "tslib": "^2.6.2" + }, + "engines": { @@ -3804,38 +2945,14 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/signature-v4": { -+ "version": "5.3.14", -+ "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.3.14.tgz", -+ "integrity": "sha512-1D9Y/nmlVjCeSivCbhZ7hgEpmHyY1h0GvpSZt3l0xcD9JjmjVC1CHOozS6+Gh+/ldMH8JuJ6cujObQqfayAVFA==", ++ "version": "5.5.1", ++ "resolved": "https://registry.npmjs.org/@smithy/signature-v4/-/signature-v4-5.5.1.tgz", ++ "integrity": "sha512-X9rVls3En0z3NtrmguTmpRM0/NqtWUxBjal6fcAkwtsub+gOdLZ6kD+V7xhUgFMGdG14bHbZ7M5QjaRI1+DatQ==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/is-array-buffer": "^4.2.2", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-hex-encoding": "^4.2.2", -+ "@smithy/util-middleware": "^4.2.14", -+ "@smithy/util-uri-escape": "^4.2.2", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/smithy-client": { -+ "version": "4.12.13", -+ "resolved": "https://registry.npmjs.org/@smithy/smithy-client/-/smithy-client-4.12.13.tgz", -+ "integrity": "sha512-y/Pcj1V9+qG98gyu1gvftHB7rDpdh+7kIBIggs55yGm3JdtBV8GT8IFF3a1qxZ79QnaJHX9GXzvBG6tAd+czJA==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/core": "^3.23.17", -+ "@smithy/middleware-endpoint": "^4.4.32", -+ "@smithy/middleware-stack": "^4.2.14", -+ "@smithy/protocol-http": "^5.3.14", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-stream": "^4.5.25", ++ "@smithy/core": "^3.25.1", ++ "@smithy/types": "^4.15.0", + "tslib": "^2.6.2" + }, + "engines": { @@ -3843,65 +2960,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/types": { -+ "version": "4.14.1", -+ "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.14.1.tgz", -+ "integrity": "sha512-59b5HtSVrVR/eYNei3BUj3DCPKD/G7EtDDe7OEJE7i7FtQFugYo6MxbotS8mVJkLNVf8gYaAlEBwwtJ9HzhWSg==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/url-parser": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/url-parser/-/url-parser-4.2.14.tgz", -+ "integrity": "sha512-p06BiBigJ8bTA3MgnOfCtDUWnAMY0YfedO/GRpmc7p+wg3KW8vbXy1xwSu5ASy0wV7rRYtlfZOIKH4XqfhjSQQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/querystring-parser": "^4.2.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-base64": { -+ "version": "4.3.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-base64/-/util-base64-4.3.2.tgz", -+ "integrity": "sha512-XRH6b0H/5A3SgblmMa5ErXQ2XKhfbQB+Fm/oyLZ2O2kCUrwgg55bU0RekmzAhuwOjA9qdN5VU2BprOvGGUkOOQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/util-buffer-from": "^4.2.2", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-body-length-browser": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-browser/-/util-body-length-browser-4.2.2.tgz", -+ "integrity": "sha512-JKCrLNOup3OOgmzeaKQwi4ZCTWlYR5H4Gm1r2uTMVBXoemo1UEghk5vtMi1xSu2ymgKVGW631e2fp9/R610ZjQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-body-length-node": { -+ "version": "4.2.3", -+ "resolved": "https://registry.npmjs.org/@smithy/util-body-length-node/-/util-body-length-node-4.2.3.tgz", -+ "integrity": "sha512-ZkJGvqBzMHVHE7r/hcuCxlTY8pQr1kMtdsVPs7ex4mMU+EAbcXppfo5NmyxMYi2XU49eqaz56j2gsk4dHHPG/g==", ++ "version": "4.15.0", ++ "resolved": "https://registry.npmjs.org/@smithy/types/-/types-4.15.0.tgz", ++ "integrity": "sha512-Z5TAOxygoFvybJV3igo5SloFflSokHx2hu1eFA+DxDTcn+FtKxUSui+rbTRG1pAafMA888Z3MVvCWUuvCrTXjg==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { @@ -3912,182 +2973,31 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@smithy/util-buffer-from": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-4.2.2.tgz", -+ "integrity": "sha512-FDXD7cvUoFWwN6vtQfEta540Y/YBe5JneK3SoZg9bThSoOAC/eGeYEua6RkBgKjGa/sz6Y+DuBZj3+YEY21y4Q==", ++ "version": "2.2.0", ++ "resolved": "https://registry.npmjs.org/@smithy/util-buffer-from/-/util-buffer-from-2.2.0.tgz", ++ "integrity": "sha512-IJdWBbTcMQ6DA0gdNhh/BwrLkDR+ADW5Kr1aZmd4k3DIF6ezMV4R2NIAmT08wQJ3yUK82thHWmC/TnK/wpMMIA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/is-array-buffer": "^4.2.2", ++ "@smithy/is-array-buffer": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-config-provider": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-config-provider/-/util-config-provider-4.2.2.tgz", -+ "integrity": "sha512-dWU03V3XUprJwaUIFVv4iOnS1FC9HnMHDfUrlNDSh4315v0cWyaIErP8KiqGVbf5z+JupoVpNM7ZB3jFiTejvQ==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-defaults-mode-browser": { -+ "version": "4.3.49", -+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.3.49.tgz", -+ "integrity": "sha512-a5bNrdiONYB/qE2BuKegvUMd/+ZDwdg4vsNuuSzYE8qs2EYAdK9CynL+Rzn29PbPiUqoz/cbpRbcLzD5lEevHw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-defaults-mode-node": { -+ "version": "4.2.54", -+ "resolved": "https://registry.npmjs.org/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.2.54.tgz", -+ "integrity": "sha512-g1cvrJvOnzeJgEdf7AE4luI7gp6L8weE0y9a9wQUSGtjb8QRHDbCJYuE4Sy0SD9N8RrnNPFsPltAz/OSoBR9Zw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/config-resolver": "^4.4.17", -+ "@smithy/credential-provider-imds": "^4.2.14", -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/property-provider": "^4.2.14", -+ "@smithy/smithy-client": "^4.12.13", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-endpoints": { -+ "version": "3.4.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-endpoints/-/util-endpoints-3.4.2.tgz", -+ "integrity": "sha512-a55Tr+3OKld4TTtnT+RhKOQHyPxm3j/xL4OR83WBUhLJaKDS9dnJ7arRMOp3t31dcLhApwG9bgvrRXBHlLdIkg==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/node-config-provider": "^4.3.14", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-hex-encoding": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-hex-encoding/-/util-hex-encoding-4.2.2.tgz", -+ "integrity": "sha512-Qcz3W5vuHK4sLQdyT93k/rfrUwdJ8/HZ+nMUOyGdpeGA1Wxt65zYwi3oEl9kOM+RswvYq90fzkNDahPS8K0OIg==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-middleware": { -+ "version": "4.2.14", -+ "resolved": "https://registry.npmjs.org/@smithy/util-middleware/-/util-middleware-4.2.14.tgz", -+ "integrity": "sha512-1Su2vj9RYNDEv/V+2E+jXkkwGsgR7dc4sfHn9Z7ruzQHJIEni9zzw5CauvRXlFJfmgcqYP8fWa0dkh2Q2YaQyw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-retry": { -+ "version": "4.3.4", -+ "resolved": "https://registry.npmjs.org/@smithy/util-retry/-/util-retry-4.3.4.tgz", -+ "integrity": "sha512-FY1UQQ1VFmMwiYp1GVS4MeaGD5O0blLNYK0xCRHU+mJgeoH/hSY8Ld8sJWKQ6uznkh14HveRGQJncgPyNl9J+A==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/service-error-classification": "^4.3.0", -+ "@smithy/types": "^4.14.1", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-stream": { -+ "version": "4.5.25", -+ "resolved": "https://registry.npmjs.org/@smithy/util-stream/-/util-stream-4.5.25.tgz", -+ "integrity": "sha512-/PFpG4k8Ze8Ei+mMKj3oiPICYekthuzePZMgZbCqMiXIHHf4n2aZ4Ps0aSRShycFTGuj/J6XldmC0x0DwednIA==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "@smithy/fetch-http-handler": "^5.3.17", -+ "@smithy/node-http-handler": "^4.6.1", -+ "@smithy/types": "^4.14.1", -+ "@smithy/util-base64": "^4.3.2", -+ "@smithy/util-buffer-from": "^4.2.2", -+ "@smithy/util-hex-encoding": "^4.2.2", -+ "@smithy/util-utf8": "^4.2.2", -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/util-uri-escape": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-uri-escape/-/util-uri-escape-4.2.2.tgz", -+ "integrity": "sha512-2kAStBlvq+lTXHyAZYfJRb/DfS3rsinLiwb+69SstC9Vb0s9vNWkRwpnj918Pfi85mzi42sOqdV72OLxWAISnw==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" ++ "node": ">=14.0.0" + } + }, + "node_modules/@smithy/util-utf8": { -+ "version": "4.2.2", -+ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-4.2.2.tgz", -+ "integrity": "sha512-75MeYpjdWRe8M5E3AW0O4Cx3UadweS+cwdXjwYGBW5h/gxxnbeZ877sLPX/ZJA9GVTlL/qG0dXP29JWFCD1Ayw==", ++ "version": "2.3.0", ++ "resolved": "https://registry.npmjs.org/@smithy/util-utf8/-/util-utf8-2.3.0.tgz", ++ "integrity": "sha512-R8Rdn8Hy72KKcebgLiv8jQcQkXoLMOGGv5uI1/k0l+snqkOzQ1R0ChUBCxWMlBsFMekWjq0wRudIweFs7sKT5A==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { -+ "@smithy/util-buffer-from": "^4.2.2", ++ "@smithy/util-buffer-from": "^2.2.0", + "tslib": "^2.6.2" + }, + "engines": { -+ "node": ">=18.0.0" -+ } -+ }, -+ "node_modules/@smithy/uuid": { -+ "version": "1.1.2", -+ "resolved": "https://registry.npmjs.org/@smithy/uuid/-/uuid-1.1.2.tgz", -+ "integrity": "sha512-O/IEdcCUKkubz60tFbGA7ceITTAJsty+lBjNoorP4Z6XRqaFb/OjQjZODophEcuq68nKm6/0r+6/lLQ+XVpk8g==", -+ "license": "Apache-2.0", -+ "optional": true, -+ "dependencies": { -+ "tslib": "^2.6.2" -+ }, -+ "engines": { -+ "node": ">=18.0.0" ++ "node": ">=14.0.0" + } + }, + "node_modules/@so-ric/colorspace": { @@ -4102,9 +3012,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@tootallnate/once": { -+ "version": "2.0.0", -+ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", -+ "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", ++ "version": "2.0.1", ++ "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.1.tgz", ++ "integrity": "sha512-HqmEUIGRJ5fSXchkVgR5F7qn48bDBzv0kWj/Kfu5e6uci4UlEeng4331LnBkWffb++Ei3FOVLxo8JJWMFBDMeQ==", + "license": "MIT", + "optional": true, + "engines": { @@ -4161,13 +3071,13 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/@types/node": { -+ "version": "25.6.0", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-25.6.0.tgz", -+ "integrity": "sha512-+qIYRKdNYJwY3vRCZMdJbPLJAtGjQBudzZzdzwQYkEPQd+PJGixUL5QfvCLDaULoLv+RhT3LDkwEfKaAkgSmNQ==", ++ "version": "26.0.0", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-26.0.0.tgz", ++ "integrity": "sha512-vf2YFi1iY9lHGwNJMs01biZFbKJkrZR1T6/MlzjhJLPdntOHLhTrDSnSVcdtvjihi4VQNlrFRIxLsDBlQpAipA==", + "license": "MIT", + "optional": true, + "dependencies": { -+ "undici-types": "~7.19.0" ++ "undici-types": "~8.3.0" + } + }, + "node_modules/@types/readable-stream": { @@ -4194,16 +3104,16 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/@types/request/node_modules/form-data": { -+ "version": "2.5.5", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.5.tgz", -+ "integrity": "sha512-jqdObeR2rxZZbPSGL+3VckHMYtu+f9//KXBsVny6JSX/pa38Fy+bGjuG8eW/H6USNQWhLi8Num++cU2yOCNz4A==", ++ "version": "2.5.6", ++ "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.5.6.tgz", ++ "integrity": "sha512-Ogz/E85h9tlfJzpI6TuFpGcHZFhLrb9Gw8wq9v40CxSCPnv7ahKr6Xgtkn0KYCDQJ8DNn5VoMO8EXr9V5PadyA==", + "license": "MIT", + "optional": true, + "dependencies": { + "asynckit": "^0.4.0", + "combined-stream": "^1.0.8", + "es-set-tostringtag": "^2.1.0", -+ "hasown": "^2.0.2", ++ "hasown": "^2.0.4", + "mime-types": "^2.1.35", + "safe-buffer": "^5.2.1" + }, @@ -4701,9 +3611,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/acebase": { -+ "version": "1.29.10", -+ "resolved": "https://registry.npmjs.org/acebase/-/acebase-1.29.10.tgz", -+ "integrity": "sha512-IiwxMtuGq5xkRxIgsnvlUzFTr50F81DCILW8/rqIiP2I9Wj4YW4bJ3O4dSNeUyh+kpWJkYuFBGl6EOwij/rNUw==", ++ "version": "1.29.12", ++ "resolved": "https://registry.npmjs.org/acebase/-/acebase-1.29.12.tgz", ++ "integrity": "sha512-AKhvMvP1cAt+fiHyQ9XdujvcRNCuFO237CrclYv1qsWeaEBvm0j4126IELa2AxJdu/HLhH8zHiz5HUCVijz2rQ==", + "funding": [ + { + "type": "GitHub sponsoring", @@ -4788,9 +3698,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/acorn": { -+ "version": "8.16.0", -+ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", -+ "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", ++ "version": "8.17.0", ++ "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", ++ "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", + "license": "MIT", + "optional": true, + "bin": { @@ -5053,6 +3963,19 @@ index 2af3a0d1..5c5f4b73 100644 + "node": ">= 8" + } + }, ++ "node_modules/anynum": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/anynum/-/anynum-1.0.1.tgz", ++ "integrity": "sha512-N6//FLET/tXYNM/F6ABca1oH6fWB+KlTt909Le28WMDBk8oaT4vY17DCrwg2MvmuqUKt3Ni4N5dGJ/EoBgcO6A==", ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/NaturalIntelligence" ++ } ++ ], ++ "license": "MIT", ++ "optional": true ++ }, + "node_modules/append-transform": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-1.0.0.tgz", @@ -5388,17 +4311,70 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/axios": { -+ "version": "1.15.2", -+ "resolved": "https://registry.npmjs.org/axios/-/axios-1.15.2.tgz", -+ "integrity": "sha512-wLrXxPtcrPTsNlJmKjkPnNPK2Ihe0hn0wGSaTEiHRPxwjvJwT3hKmXF4dpqxmPO9SoNb2FsYXj/xEo0gHN+D5A==", ++ "version": "1.18.0", ++ "resolved": "https://registry.npmjs.org/axios/-/axios-1.18.0.tgz", ++ "integrity": "sha512-E32NzpYKp++W7XRe52rHiXV2ehxmh3wbdgO7MHeFM+vqxLBYHzt0ElkiImtOBxtOmyp0yoC8C6uESVV84Y2/hw==", + "license": "MIT", + "optional": true, + "dependencies": { -+ "follow-redirects": "^1.15.11", ++ "follow-redirects": "^1.16.0", + "form-data": "^4.0.5", ++ "https-proxy-agent": "^5.0.1", + "proxy-from-env": "^2.1.0" + } + }, ++ "node_modules/axios/node_modules/agent-base": { ++ "version": "6.0.2", ++ "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", ++ "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "debug": "4" ++ }, ++ "engines": { ++ "node": ">= 6.0.0" ++ } ++ }, ++ "node_modules/axios/node_modules/debug": { ++ "version": "4.4.3", ++ "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", ++ "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "ms": "^2.1.3" ++ }, ++ "engines": { ++ "node": ">=6.0" ++ }, ++ "peerDependenciesMeta": { ++ "supports-color": { ++ "optional": true ++ } ++ } ++ }, ++ "node_modules/axios/node_modules/https-proxy-agent": { ++ "version": "5.0.1", ++ "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", ++ "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "agent-base": "6", ++ "debug": "4" ++ }, ++ "engines": { ++ "node": ">= 6" ++ } ++ }, ++ "node_modules/axios/node_modules/ms": { ++ "version": "2.1.3", ++ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", ++ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", ++ "license": "MIT", ++ "optional": true ++ }, + "node_modules/b4a": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/b4a/-/b4a-1.8.0.tgz", @@ -5608,9 +4584,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/baseline-browser-mapping": { -+ "version": "2.10.21", -+ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.21.tgz", -+ "integrity": "sha512-Q+rUQ7Uz8AHM7DEaNdwvfFCTq7a43lNTzuS94eiWqwyxfV/wJv+oUivef51T91mmRY4d4A1u9rcSvkeufCVXlA==", ++ "version": "2.10.38", ++ "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.38.tgz", ++ "integrity": "sha512-31/02mVB4yuQU6adKk5SlY6m+mxDwUq5KZkyYgnLrrKl7TEm1+3PyDtDBz2kOv/wxZz41GHsvV1A/u6RmiyBvw==", + "license": "Apache-2.0", + "optional": true, + "bin": { @@ -6015,9 +4991,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/cacache/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -6201,9 +5177,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/caniuse-lite": { -+ "version": "1.0.30001790", -+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001790.tgz", -+ "integrity": "sha512-bOoxfJPyYo+ds6W0YfptaCWbFnJYjh2Y1Eow5lRv+vI2u8ganPZqNm1JwNh0t2ELQCqIWg4B3dWEusgAmsoyOw==", ++ "version": "1.0.30001799", ++ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001799.tgz", ++ "integrity": "sha512-hG1bReV+OUU+MOqK4t/ZWI0tZOyz3rqS9XuhOUz1cIcbwBKjOyJEJuw9ER5JuNyqxNk8u/JUVbGibBOL1yrjFw==", + "funding": [ + { + "type": "opencollective", @@ -7020,9 +5996,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/dayjs": { -+ "version": "1.11.20", -+ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.20.tgz", -+ "integrity": "sha512-YbwwqR/uYpeoP4pu043q+LTDLFBLApUP6VxRihdfNTqu4ubqMlGDLd6ErXhEgsyvY0K6nCs7nggYumAN+9uEuQ==", ++ "version": "1.11.21", ++ "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz", ++ "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==", + "license": "MIT", + "optional": true + }, @@ -7203,9 +6179,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/discord-api-types": { -+ "version": "0.38.47", -+ "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.47.tgz", -+ "integrity": "sha512-XgXQodHQBAE6kfD7kMvVo30863iHX1LHSqNq6MGUTDwIFCCvHva13+rwxyxVXDqudyApMNAd32PGjgVETi5rjA==", ++ "version": "0.38.49", ++ "resolved": "https://registry.npmjs.org/discord-api-types/-/discord-api-types-0.38.49.tgz", ++ "integrity": "sha512-XnqcWmnFZFAE8ZM8SHAw9DIV8D3Or00rMQ8iQLotrEA2PmXhl+ykaf6L6q4l474hrSUH1JaYcv+iOMRWp2p6Tg==", + "license": "MIT", + "optional": true, + "workspaces": [ @@ -7213,9 +6189,9 @@ index 2af3a0d1..5c5f4b73 100644 + ] + }, + "node_modules/discord.js": { -+ "version": "14.26.3", -+ "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.3.tgz", -+ "integrity": "sha512-XEKtYn28YFsiJ5l4fLRyikdbo6RD5oFyqfVHQlvXz2104JhH/E8slN28dbky05w3DCrJcNVWvhVvcJCTSl/KIg==", ++ "version": "14.26.4", ++ "resolved": "https://registry.npmjs.org/discord.js/-/discord.js-14.26.4.tgz", ++ "integrity": "sha512-4oBp8tc6Kf8IDBwAHhbsMaAqx1b5fob9SNasZT7V6yyyUydoO5i5fGuX7TmvRtR+q/WgKRnRViRoAWnG7fNyvA==", + "license": "Apache-2.0", + "optional": true, + "dependencies": { @@ -7424,9 +6400,9 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "MIT" + }, + "node_modules/electron-to-chromium": { -+ "version": "1.5.344", -+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.344.tgz", -+ "integrity": "sha512-4MxfbmNDm+KPh066EZy+eUnkcDPcZ35wNmOWzFuh/ijvHsve6kbLTLURy88uCNK5FbpN+yk2nQY6BYh1GEt+wg==", ++ "version": "1.5.376", ++ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.376.tgz", ++ "integrity": "sha512-cUVA7/RvbFTEuw/i3obUwDTRIXojaxkResf+ibByPFxjc6XK3VNtcQXV0NSbAlJ0FMjcJGgftVVB4Qo184EXvA==", + "license": "ISC", + "optional": true + }, @@ -7594,6 +6570,25 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://github.com/sponsors/ljharb" + } + }, ++ "node_modules/es-abstract-get": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/es-abstract-get/-/es-abstract-get-1.0.0.tgz", ++ "integrity": "sha512-6PMWXpdhshVvFp+FoWYs1EvG1Nj0tvk0dZM+XcK0xMEM1czRVcP6ohqPWHy6qPagSpC8j4+p89WXlT+xXJs/fg==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "es-errors": "^1.3.0", ++ "es-object-atoms": "^1.1.2", ++ "is-callable": "^1.2.7", ++ "object-inspect": "^1.13.4" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, + "node_modules/es-array-method-boxes-properly": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/es-array-method-boxes-properly/-/es-array-method-boxes-properly-1.0.0.tgz", @@ -7620,9 +6615,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/es-object-atoms": { -+ "version": "1.1.1", -+ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", -+ "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", ++ "version": "1.1.2", ++ "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.2.tgz", ++ "integrity": "sha512-HWcBoN6NileqtSydK2FqHbS/LoDd2pqrnQHLyJzBj4kOp/ky2MWMN694xOfkK8/SnUsW2DH7EfyVlydKCsm1Zw==", + "license": "MIT", + "dependencies": { + "es-errors": "^1.3.0" @@ -7648,15 +6643,17 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/es-to-primitive": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", -+ "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", ++ "version": "1.3.1", ++ "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.1.tgz", ++ "integrity": "sha512-CxN9N56HYfd2m/acc/NOFrZQsN9kU4eh+2kk6A707Kz1krH8tKmfrs5RnftB8WNX80T0NS7vSQsDOlg23diR2g==", + "license": "MIT", + "optional": true, + "dependencies": { ++ "es-abstract-get": "^1.0.0", ++ "es-errors": "^1.3.0", + "is-callable": "^1.2.7", -+ "is-date-object": "^1.0.5", -+ "is-symbol": "^1.0.4" ++ "is-date-object": "^1.1.0", ++ "is-symbol": "^1.1.1" + }, + "engines": { + "node": ">= 0.4" @@ -8013,9 +7010,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/fast-xml-builder": { -+ "version": "1.1.5", -+ "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.1.5.tgz", -+ "integrity": "sha512-4TJn/8FKLeslLAH3dnohXqE3QSoxkhvaMzepOIZytwJXZO69Bfz0HBdDHzOTOon6G59Zrk6VQ2bEiv1t61rfkA==", ++ "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/fast-xml-builder/-/fast-xml-builder-1.2.0.tgz", ++ "integrity": "sha512-00aAWieqff+ZJhsXA4g1g7M8k+7AYoMUUHF+/zFb5U6Uv/P0Vl4QZo84/IcufzYalLuEj9928bXN9PbbFzMF0Q==", + "funding": [ + { + "type": "github", @@ -8025,13 +7022,14 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "MIT", + "optional": true, + "dependencies": { -+ "path-expression-matcher": "^1.1.3" ++ "path-expression-matcher": "^1.5.0", ++ "xml-naming": "^0.1.0" + } + }, + "node_modules/fast-xml-parser": { -+ "version": "5.7.2", -+ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.7.2.tgz", -+ "integrity": "sha512-P7oW7tLbYnhOLQk/Gv7cZgzgMPP/XN03K02/Jy6Y/NHzyIAIpxuZIM/YqAkfiXFPxA2CTm7NtCijK9EDu09u2w==", ++ "version": "5.9.3", ++ "resolved": "https://registry.npmjs.org/fast-xml-parser/-/fast-xml-parser-5.9.3.tgz", ++ "integrity": "sha512-brCNCeScma/kqa54J4PIDriSSSLssRkuYaUCpvHJulGc3HGI/xxKUCTDcYkAdqJsyb//ydpbxecjC3hB9+tb/g==", + "funding": [ + { + "type": "github", @@ -8041,10 +7039,12 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "MIT", + "optional": true, + "dependencies": { -+ "@nodable/entities": "^2.1.0", -+ "fast-xml-builder": "^1.1.5", ++ "@nodable/entities": "^2.2.0", ++ "fast-xml-builder": "^1.2.0", ++ "is-unsafe": "^1.0.1", + "path-expression-matcher": "^1.5.0", -+ "strnum": "^2.2.3" ++ "strnum": "^2.4.1", ++ "xml-naming": "^0.1.0" + }, + "bin": { + "fxparser": "src/cli/cli.js" @@ -8250,9 +7250,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/firebase-admin/node_modules/@types/node": { -+ "version": "22.19.17", -+ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.17.tgz", -+ "integrity": "sha512-wGdMcf+vPYM6jikpS/qhg6WiqSV/OhG+jeeHT/KlVqxYfD40iYJf9/AE1uQxVWFvU7MipKRkRv8NSHiCGgPr8Q==", ++ "version": "22.19.21", ++ "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.21.tgz", ++ "integrity": "sha512-VMeFBSCKQKmm2swI2kW51SFusDqekC6q9trBCvJ/JliDchFSuoYYKN7yVNjPthP1HKZcx3U1gI/wTcEBjEFKTA==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -8336,17 +7336,17 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/form-data": { -+ "version": "4.0.5", -+ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", -+ "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", ++ "version": "4.0.6", ++ "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.6.tgz", ++ "integrity": "sha512-vKatAh4SlVfgbv+YtmhiRjhEMJsYpsG1Y2rMQtR+SVSbytsSD1YGzDIcrAJmdFec88u/+VoGmxnl+80gL1tRCQ==", + "license": "MIT", + "optional": true, + "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" ++ "hasown": "^2.0.4", ++ "mime-types": "^2.1.35" + }, + "engines": { + "node": ">= 6" @@ -8454,18 +7454,21 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/function.prototype.name": { -+ "version": "1.1.8", -+ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", -+ "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", ++ "version": "1.2.0", ++ "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.2.0.tgz", ++ "integrity": "sha512-jObKIik1P2QjPHP5nz5BaOtUlfgS0fWo8IUByNXkM+o+02sJOi94em77GwJKQSJ3gfPHdgzLNrHc1uokV4P/ew==", + "license": "MIT", + "optional": true, + "dependencies": { -+ "call-bind": "^1.0.8", -+ "call-bound": "^1.0.3", -+ "define-properties": "^1.2.1", ++ "call-bind": "^1.0.9", ++ "call-bound": "^1.0.4", ++ "es-define-property": "^1.0.1", ++ "es-errors": "^1.3.0", + "functions-have-names": "^1.2.3", -+ "hasown": "^2.0.2", -+ "is-callable": "^1.2.7" ++ "has-property-descriptors": "^1.0.2", ++ "hasown": "^2.0.4", ++ "is-callable": "^1.2.7", ++ "is-document.all": "^1.0.0" + }, + "engines": { + "node": ">= 0.4" @@ -8613,6 +7616,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" @@ -8892,6 +7896,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" @@ -8973,6 +7978,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" @@ -9193,9 +8199,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/hasown": { -+ "version": "2.0.2", -+ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", -+ "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", ++ "version": "2.0.4", ++ "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.4.tgz", ++ "integrity": "sha512-T2UbfbBEF32wiepXIsMlTW9+dDYC6wMh/t/vYA4tuOMKqWz/n3vr1NFSxQiyP+zk2mXsoMA/i/7qV6LKut1t1A==", + "license": "MIT", + "dependencies": { + "function-bind": "^1.1.2" @@ -9583,6 +8589,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "8.3.2", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", + "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "license": "MIT", + "optional": true, + "bin": { @@ -9678,9 +8685,11 @@ index 2af3a0d1..5c5f4b73 100644 + "once": "^1.3.0", + "wrappy": "1" + } -+ }, -+ "node_modules/inherits": { -+ "version": "2.0.4", + }, + "node_modules/inherits": { + "version": "2.0.4", +- "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", +- "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "license": "ISC" @@ -9952,13 +8961,13 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/is-core-module": { -+ "version": "2.16.1", -+ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", -+ "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", ++ "version": "2.16.2", ++ "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.2.tgz", ++ "integrity": "sha512-evOr8xfXKxE6qSR0hSXL2r3sd7ALj8+7jQEUvPYcm5sgZFdJ+AYzT6yNmJenvIYQBgIGwfwz08sL8zoL7yq2BA==", + "license": "MIT", + "optional": true, + "dependencies": { -+ "hasown": "^2.0.2" ++ "hasown": "^2.0.3" + }, + "engines": { + "node": ">= 0.4" @@ -10002,6 +9011,22 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://github.com/sponsors/ljharb" + } + }, ++ "node_modules/is-document.all": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/is-document.all/-/is-document.all-1.0.0.tgz", ++ "integrity": "sha512-+XSoyS05OdBbhFuELhgTCpFNHkpBOJqtsZfUFFpe5QTw+9Sjbh8zitxhQkYAo6wV7e1Vb8cAPvpCk9jGam/82g==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "call-bound": "^1.0.4" ++ }, ++ "engines": { ++ "node": ">= 0.4" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" ++ } ++ }, + "node_modules/is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -10272,6 +9297,19 @@ index 2af3a0d1..5c5f4b73 100644 + "license": "MIT", + "optional": true + }, ++ "node_modules/is-unsafe": { ++ "version": "1.0.1", ++ "resolved": "https://registry.npmjs.org/is-unsafe/-/is-unsafe-1.0.1.tgz", ++ "integrity": "sha512-CLK2+VdgERgD96EYm5lUQssZYlRg2tkZnbsxZoacmSiRxiFJ4Nk4SzjCl+Ur+v3kXIY9dTIdb3IH22y1mZ56LA==", ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/NaturalIntelligence" ++ } ++ ], ++ "license": "MIT", ++ "optional": true ++ }, + "node_modules/is-weakmap": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", @@ -10545,9 +9583,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/joi": { -+ "version": "17.13.3", -+ "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.3.tgz", -+ "integrity": "sha512-otDA4ldcIx+ZXsKHWmp0YizCweVRZG96J10b0FevjfuncLO1oX59THoAmHkNubYJ+9gWsYsp5k8v4ib6oDv1fA==", ++ "version": "17.13.4", ++ "resolved": "https://registry.npmjs.org/joi/-/joi-17.13.4.tgz", ++ "integrity": "sha512-1RuuER6kmt8K8I3nIWvPZKi5RQCb568ZPyY4Pwjlua+yo+63ZTmIwxLZH0heBmiKN4uxjvCiarDrjaeH84xicQ==", + "license": "BSD-3-Clause", + "optional": true, + "dependencies": { @@ -10786,9 +9824,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/jsonwebtoken/node_modules/semver": { -+ "version": "7.7.4", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", ++ "version": "7.8.4", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", ++ "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "license": "ISC", + "optional": true, + "bin": { @@ -11481,20 +10519,20 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/mariadb": { -+ "version": "3.5.2", -+ "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.2.tgz", -+ "integrity": "sha512-9rztrI4nouxAY/82a+RlzzZ5ie2vxu2eYclkBvTy1ATXH1B9cnvZ0O71Pzsy/mlfDb5P3HhOg0JzQKkDRhctyA==", ++ "version": "3.5.3", ++ "resolved": "https://registry.npmjs.org/mariadb/-/mariadb-3.5.3.tgz", ++ "integrity": "sha512-i053Kc0MgdUv/hu9mCyq67TYfPXFj3/MV8I7ZW5wvJNixIyXC0VztMPUjIVj/449nQo+BsxFD4Fdk/sA/uqKPQ==", + "license": "LGPL-2.1-or-later", + "optional": true, + "dependencies": { + "@types/geojson": "^7946.0.16", -+ "@types/node": ">=18", ++ "@types/node": ">=20", + "denque": "^2.1.0", + "iconv-lite": "^0.7.2", -+ "lru-cache": "^10.4.3" ++ "lru-cache": "^11.5.0" + }, + "engines": { -+ "node": ">= 18" ++ "node": ">= 20.0.0" + } + }, + "node_modules/mariadb/node_modules/iconv-lite": { @@ -11514,6 +10552,16 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://opencollective.com/express" + } + }, ++ "node_modules/mariadb/node_modules/lru-cache": { ++ "version": "11.5.1", ++ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", ++ "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", ++ "license": "BlueOak-1.0.0", ++ "optional": true, ++ "engines": { ++ "node": "20 || >=22" ++ } ++ }, + "node_modules/math-intrinsics": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", @@ -11691,9 +10739,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/minio/node_modules/ipaddr.js": { -+ "version": "2.3.0", -+ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.3.0.tgz", -+ "integrity": "sha512-Zv/pA+ciVFbCSBBjGfaKUya/CcGmUHzTydLMaTwrUUEM2DIEO3iZvueGxmacvmN50fGpGVKeTXpb2LcYQxeVdg==", ++ "version": "2.4.0", ++ "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.4.0.tgz", ++ "integrity": "sha512-9VGk3HGanVE6JoZXHiCpnGy5X0jYDnN4EA4lntFPj+1vIWlFhIylq2CrrCOJH9EAhc5CYhq18F2Av2tgoAPsYQ==", + "license": "MIT", + "optional": true, + "engines": { @@ -12231,9 +11279,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/mysql2": { -+ "version": "3.22.2", -+ "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.2.tgz", -+ "integrity": "sha512-snC/L6YoCJPFpozZo3p3hiOlt9ItQ7sCnLSziFLlIttEzsPhrdcPT8g21BiQ7Oqif25W4Xq1IFuBzBvoFYDf0Q==", ++ "version": "3.22.5", ++ "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-3.22.5.tgz", ++ "integrity": "sha512-95uZ2TrPWAZdwpB3vvvDbmEMcNG8yIeNCyu6GUcr/QnWEE/wXm7+mhOCsdQfWQDTV7qYT/PDUZ4U4UPP4AsXqQ==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -12284,9 +11332,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/nan": { -+ "version": "2.26.2", -+ "resolved": "https://registry.npmjs.org/nan/-/nan-2.26.2.tgz", -+ "integrity": "sha512-0tTvBTYkt3tdGw22nrAy50x7gpbGCCFH3AFcyS5WiUu7Eu4vWlri1woE6qHBSfy11vksDqkiwjOnlR7WV8G1Hw==", ++ "version": "2.27.0", ++ "resolved": "https://registry.npmjs.org/nan/-/nan-2.27.0.tgz", ++ "integrity": "sha512-hC+0LidcL3XE4rp1C4H54KujgXKzbfyTngZTwBByQxsOxCEKZT0MPQ4hOKUH2jU1OYstqdDH4onyHPDzcV0XdQ==", + "license": "MIT", + "optional": true + }, @@ -12345,9 +11393,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/node-abi": { -+ "version": "3.89.0", -+ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.89.0.tgz", -+ "integrity": "sha512-6u9UwL0HlAl21+agMN3YAMXcKByMqwGx+pq+P76vii5f7hTPtKDp08/H9py6DY+cfDw7kQNTGEj/rly3IgbNQA==", ++ "version": "3.92.0", ++ "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-3.92.0.tgz", ++ "integrity": "sha512-KdHvFWZjEKDf0cakgFjebl371GPsISX2oZHcuyKqM7DtogIsHrqKeLTo8wBHxaXRAQlY2PsPlZmfo+9ZCxEREQ==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -12358,9 +11406,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/node-abi/node_modules/semver": { -+ "version": "7.7.4", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", ++ "version": "7.8.4", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", ++ "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "license": "ISC", + "optional": true, + "bin": { @@ -12485,9 +11533,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/node-gyp/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -12548,9 +11596,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/node-gyp/node_modules/semver": { -+ "version": "7.7.4", -+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", -+ "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", ++ "version": "7.8.4", ++ "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.4.tgz", ++ "integrity": "sha512-rUCObTnP32Q08R2uuIrt7r9PlEonuTmtuXYcW6s5kjdlj3xbnwe+21yXptAUYcMAABLkYYTtnmzb3w3EDZfueA==", + "license": "ISC", + "optional": true, + "bin": { @@ -12595,11 +11643,14 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/node-releases": { -+ "version": "2.0.38", -+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.38.tgz", -+ "integrity": "sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==", ++ "version": "2.0.48", ++ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.48.tgz", ++ "integrity": "sha512-1uz8041X6LoI6ZSdZacM9lVY28vuzDlSKitnpbSNK0RfKoIJkX29NBPVEFXhnuSuEOA9Ww0xnPJ+ILWbGAv8DA==", + "license": "MIT", -+ "optional": true ++ "optional": true, ++ "engines": { ++ "node": ">=18" ++ } + }, + "node_modules/node-sspi": { + "version": "0.2.11", @@ -12779,9 +11830,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/nwsapi": { -+ "version": "2.2.23", -+ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.23.tgz", -+ "integrity": "sha512-7wfH4sLbt4M0gCDzGE6vzQBo0bfTKjU7Sfpqy/7gs1qBfYz2vEJH6vXcBKpO3+6Yu1telwd0t9HpyOoLEQQbIQ==", ++ "version": "2.2.24", ++ "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.24.tgz", ++ "integrity": "sha512-7YRhZ3jS45LwmSCT4b2sVFHt/WuovaktDU07QrtOBY2PXskss5a9jfmR9jptyumwXST+rFjrmppMY1KT/yn35A==", + "license": "MIT", + "optional": true + }, @@ -12849,9 +11900,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/nyc/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -13019,7 +12070,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", -+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "license": "MIT", + "optional": true, + "bin": { @@ -13941,16 +12992,16 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/pg-cloudflare": { -+ "version": "1.3.0", -+ "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.3.0.tgz", -+ "integrity": "sha512-6lswVVSztmHiRtD6I8hw4qP/nDm1EJbKMRhf3HCYaqud7frGysPv7FYJ5noZQdhQtN2xJnimfMtvQq21pdbzyQ==", ++ "version": "1.4.0", ++ "resolved": "https://registry.npmjs.org/pg-cloudflare/-/pg-cloudflare-1.4.0.tgz", ++ "integrity": "sha512-Vo7z/6rrQYxpNRylp4Tlob2elzbh+N/MOQbxFVWCxS7oEx6jF53GTJFxK2WWpKuBRkmiin4Mt+xofFDjx09R0A==", + "license": "MIT", + "optional": true + }, + "node_modules/pg-connection-string": { -+ "version": "2.12.0", -+ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.12.0.tgz", -+ "integrity": "sha512-U7qg+bpswf3Cs5xLzRqbXbQl85ng0mfSV/J0nnA31MCLgvEaAo7CIhmeyrmJpOr7o+zm0rXK+hNnT5l9RHkCkQ==", ++ "version": "2.14.0", ++ "resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.14.0.tgz", ++ "integrity": "sha512-XwWDGcLRGCXAR8F/AM5bG7Q+A3Wm2s6QeEjlOKZLlH3UYcguiqCWKyWXVag5TLTIjR7oOJUY8kcADaZgWPyLeg==", + "license": "MIT", + "optional": true + }, @@ -13965,9 +13016,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/pg-pool": { -+ "version": "3.13.0", -+ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.13.0.tgz", -+ "integrity": "sha512-gB+R+Xud1gLFuRD/QgOIgGOBE2KCQPaPwkzBBGC9oG69pHTkhQeIuejVIk3/cnDyX39av2AxomQiyPT13WKHQA==", ++ "version": "3.14.0", ++ "resolved": "https://registry.npmjs.org/pg-pool/-/pg-pool-3.14.0.tgz", ++ "integrity": "sha512-gKtPkFdQPU3DksooVLi9LsjZxrsBUZIpa+7aVx+LV5pNh0KzP4Zleud2po+ConrxbuXGBJ6Hfer6hdgpIBpBaw==", + "license": "MIT", + "optional": true, + "peerDependencies": { @@ -13975,9 +13026,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/pg-protocol": { -+ "version": "1.13.0", -+ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.13.0.tgz", -+ "integrity": "sha512-zzdvXfS6v89r6v7OcFCHfHlyG/wvry1ALxZo4LqgUoy7W9xhBDMaqOuMiF3qEV45VqsN6rdlcehHrfDtlCPc8w==", ++ "version": "1.15.0", ++ "resolved": "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.15.0.tgz", ++ "integrity": "sha512-cq9sECI5s0+uPUXjbz8ioyPJni6RzsRib0US67i5IoTZKw8fNeYlVE7u8F4dG7vEJJtc5wdD1K189lCCUwqWTQ==", + "license": "MIT", + "optional": true + }, @@ -14062,9 +13113,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/plivo": { -+ "version": "4.76.2", -+ "resolved": "https://registry.npmjs.org/plivo/-/plivo-4.76.2.tgz", -+ "integrity": "sha512-W8bfvPKng/krEUYi7Gh2Pib7soYZm6TkiHcbKm2hRQVRkvek/FYRek+7Nb2FJ/vT6p/S8F3BKbrHjnkeT5XEJg==", ++ "version": "4.78.0", ++ "resolved": "https://registry.npmjs.org/plivo/-/plivo-4.78.0.tgz", ++ "integrity": "sha512-Z74Yzcy/uNyfApTBIJunGI2PlgUSMgJ/LKSkHxEWKu8usZ8fmdre9cowaqzHerOBxaAbc1EPqGgNG5CcsUmwNw==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -14347,25 +13398,24 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/protobufjs": { -+ "version": "7.5.5", -+ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.5.5.tgz", -+ "integrity": "sha512-3wY1AxV+VBNW8Yypfd1yQY9pXnqTAN+KwQxL8iYm3/BjKYMNg4i0owhEe26PWDOMaIrzeeF98Lqd5NGz4omiIg==", ++ "version": "7.6.4", ++ "resolved": "https://registry.npmjs.org/protobufjs/-/protobufjs-7.6.4.tgz", ++ "integrity": "sha512-RJJPTTpvFfHcWLkIa2JFWK4XvtSzS0yEWDmunqHXli1h3JlkbcQZXDZdcWxv+JK3Xsl5/UFDPZ0iGm7DAengYw==", + "hasInstallScript": true, + "license": "BSD-3-Clause", + "optional": true, + "dependencies": { + "@protobufjs/aspromise": "^1.1.2", + "@protobufjs/base64": "^1.1.2", -+ "@protobufjs/codegen": "^2.0.4", -+ "@protobufjs/eventemitter": "^1.1.0", -+ "@protobufjs/fetch": "^1.1.0", ++ "@protobufjs/codegen": "^2.0.5", ++ "@protobufjs/eventemitter": "^1.1.1", ++ "@protobufjs/fetch": "^1.1.1", + "@protobufjs/float": "^1.0.2", -+ "@protobufjs/inquire": "^1.1.0", + "@protobufjs/path": "^1.1.2", + "@protobufjs/pool": "^1.1.0", -+ "@protobufjs/utf8": "^1.1.0", ++ "@protobufjs/utf8": "^1.1.1", + "@types/node": ">=13.7.0", -+ "long": "^5.0.0" ++ "long": "^5.3.2" + }, + "engines": { + "node": ">=12.0.0" @@ -14807,7 +13857,7 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "3.4.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", + "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", -+ "deprecated": "Please upgrade to version 7 or higher. Older versions may use Math.random() in certain circumstances, which is known to be problematic. See https://v8.dev/blog/math-random for details.", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "license": "MIT", + "optional": true, + "bin": { @@ -14955,9 +14005,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/rimraf/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -15329,8 +14379,9 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", + "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", -+ "license": "ISC" -+ }, + "license": "ISC" + }, +- "node_modules/ipaddr.js": { + "node_modules/shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", @@ -15541,13 +14592,13 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/socks": { -+ "version": "2.8.7", -+ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", -+ "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", ++ "version": "2.8.9", ++ "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.9.tgz", ++ "integrity": "sha512-LJhUYUvItdQ0LkJTmPeaEObWXAqFyfmP85x0tch/ez9cahmhlBBLbIqDFnvBnUJGagb0JbIQrkBs1wJ+yRYpEw==", + "license": "MIT", + "optional": true, + "dependencies": { -+ "ip-address": "^10.0.1", ++ "ip-address": "^10.1.1", + "smart-buffer": "^4.2.0" + }, + "engines": { @@ -15609,9 +14660,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/socks/node_modules/ip-address": { -+ "version": "10.1.0", -+ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", -+ "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", ++ "version": "10.2.0", ++ "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.2.0.tgz", ++ "integrity": "sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==", + "license": "MIT", + "optional": true, + "engines": { @@ -15969,7 +15020,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/stream-json": { -+ "version": "1.9.1", + "version": "1.9.1", +- "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", +- "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", + "resolved": "https://registry.npmjs.org/stream-json/-/stream-json-1.9.1.tgz", + "integrity": "sha512-uWkjJ+2Nt/LO9Z/JyKZbMusL8Dkh97uUBTv3AJQ74y07lVahLY4eEFsPsE97pxYBwr8nnjMAIch5eqI0gPShyw==", + "license": "BSD-3-Clause", @@ -16019,43 +15072,72 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", + "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", -+ "license": "MIT", + "license": "MIT", + "dependencies": { + "eastasianwidth": "^0.2.0", + "emoji-regex": "^9.2.2", + "strip-ansi": "^7.0.1" + }, -+ "engines": { + "engines": { +- "node": ">= 0.10" + "node": ">=12" + }, + "funding": { + "url": "https://github.com/sponsors/sindresorhus" -+ } -+ }, + } + }, +- "node_modules/ipcheck": { +- "version": "0.1.0", +- "resolved": "https://registry.npmjs.org/ipcheck/-/ipcheck-0.1.0.tgz", +- "integrity": "sha512-NwhrmROU0iXKa+U1quGuQ+ag+K/1Bb5V/yh5Q4SylSu/LGymPZcWB7p4u7JgJH0qOR6cTLDO5VZlRbhoeekNzQ==", +- "license": "MIT" +- }, +- "node_modules/is-arguments": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz", +- "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==", + "node_modules/string-width-cjs": { + "name": "string-width", + "version": "4.2.3", + "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", + "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -+ "license": "MIT", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "call-bound": "^1.0.2", +- "has-tostringtag": "^1.0.2" + "emoji-regex": "^8.0.0", + "is-fullwidth-code-point": "^3.0.0", + "strip-ansi": "^6.0.1" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/is-callable": { +- "version": "1.2.7", +- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", +- "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", + "node_modules/string-width-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -+ "license": "MIT", -+ "engines": { + "license": "MIT", + "engines": { +- "node": ">= 0.4" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/is-fullwidth-code-point": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", +- "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", + "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", @@ -16066,88 +15148,119 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "license": "MIT", + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1" + }, -+ "engines": { -+ "node": ">=8" -+ } -+ }, + "engines": { + "node": ">=8" + } + }, +- "node_modules/is-generator-function": { +- "version": "1.1.2", +- "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", +- "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", + "node_modules/string.prototype.trim": { -+ "version": "1.2.10", -+ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", -+ "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", -+ "license": "MIT", ++ "version": "1.2.11", ++ "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.11.tgz", ++ "integrity": "sha512-PwvK7BU+CMTJGYQCTZb5RWXIML92lftJLhQz1tBzgKiqGxJaMlBAa48POXaNAC2s4y8jr3EFqrkF9+44neS46w==", + "license": "MIT", + "optional": true, -+ "dependencies": { -+ "call-bind": "^1.0.8", -+ "call-bound": "^1.0.2", + "dependencies": { ++ "call-bind": "^1.0.9", + "call-bound": "^1.0.4", +- "generator-function": "^2.0.0", +- "get-proto": "^1.0.1", +- "has-tostringtag": "^1.0.2", + "define-data-property": "^1.1.4", + "define-properties": "^1.2.1", -+ "es-abstract": "^1.23.5", -+ "es-object-atoms": "^1.0.0", -+ "has-property-descriptors": "^1.0.2" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, ++ "es-abstract": "^1.24.2", ++ "es-object-atoms": "^1.1.2", ++ "has-property-descriptors": "^1.0.2", + "safe-regex-test": "^1.1.0" + }, + "engines": { +@@ -1345,16 +14291,17 @@ + "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/is-regex": { +- "version": "1.2.1", +- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", +- "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", + "node_modules/string.prototype.trimend": { -+ "version": "1.0.9", -+ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", -+ "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", -+ "license": "MIT", ++ "version": "1.0.10", ++ "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.10.tgz", ++ "integrity": "sha512-2+3aDAOmPTmuFwjDnmJG2ctEkQKVki7vOSqaxkv42Mowj1V6PnvuwFCRrR5lChUux1TBskPjfkeTOhqczDMxTw==", + "license": "MIT", + "optional": true, -+ "dependencies": { -+ "call-bind": "^1.0.8", -+ "call-bound": "^1.0.2", + "dependencies": { +- "call-bound": "^1.0.2", +- "gopd": "^1.2.0", +- "has-tostringtag": "^1.0.2", +- "hasown": "^2.0.2" ++ "call-bind": "^1.0.9", ++ "call-bound": "^1.0.4", + "define-properties": "^1.2.1", -+ "es-object-atoms": "^1.0.0" -+ }, -+ "engines": { -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, ++ "es-object-atoms": "^1.1.2" + }, + "engines": { + "node": ">= 0.4" +@@ -1363,712 +14310,977 @@ + "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/is-stream": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", +- "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", + "node_modules/string.prototype.trimstart": { + "version": "1.0.8", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", + "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", -+ "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "call-bind": "^1.0.7", + "define-properties": "^1.2.1", + "es-object-atoms": "^1.0.0" + }, -+ "engines": { + "engines": { +- "node": ">=8" + "node": ">= 0.4" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/sindresorhus" + "url": "https://github.com/sponsors/ljharb" -+ } -+ }, + } + }, +- "node_modules/is-typed-array": { +- "version": "1.1.15", +- "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", +- "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", + "node_modules/strip-ansi": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", + "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", -+ "license": "MIT", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "which-typed-array": "^1.1.16" + "ansi-regex": "^6.2.2" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.4" + "node": ">=12" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/ljharb" + "url": "https://github.com/chalk/strip-ansi?sponsor=1" -+ } -+ }, + } + }, +- "node_modules/isarray": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", +- "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", +- "license": "MIT" + "node_modules/strip-ansi-cjs": { + "name": "strip-ansi", + "version": "6.0.1", @@ -16160,7 +15273,12 @@ index 2af3a0d1..5c5f4b73 100644 + "engines": { + "node": ">=8" + } -+ }, + }, +- "node_modules/isexe": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", +- "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", +- "license": "ISC" + "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", @@ -16169,7 +15287,12 @@ index 2af3a0d1..5c5f4b73 100644 + "engines": { + "node": ">=8" + } -+ }, + }, +- "node_modules/jackspeak": { +- "version": "3.4.3", +- "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", +- "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", +- "license": "BlueOak-1.0.0", + "node_modules/strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", @@ -16191,9 +15314,9 @@ index 2af3a0d1..5c5f4b73 100644 + } + }, + "node_modules/strnum": { -+ "version": "2.2.3", -+ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.2.3.tgz", -+ "integrity": "sha512-oKx6RUCuHfT3oyVjtnrmn19H1SiCqgJSg+54XqURKp5aCMbrXrhLjRN9TjuwMjiYstZ0MzDrHqkGZ5dFTKd+zg==", ++ "version": "2.4.1", ++ "resolved": "https://registry.npmjs.org/strnum/-/strnum-2.4.1.tgz", ++ "integrity": "sha512-M9eUSMT2dCB2cTNPG7UYj6KuK7RJR2SN2+yCV/fTW3xzTCS6EaGZ5pSMgDIjB7r8zSfTGk+dvvn9rTjpVS9Mwg==", + "funding": [ + { + "type": "github", @@ -16201,7 +15324,11 @@ index 2af3a0d1..5c5f4b73 100644 + } + ], + "license": "MIT", -+ "optional": true ++ "optional": true, + "dependencies": { +- "@isaacs/cliui": "^8.0.2" ++ "anynum": "^1.0.1" ++ } + }, + "node_modules/stubs": { + "version": "3.0.0", @@ -16228,29 +15355,43 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true, + "engines": { + "node": ">= 0.4" -+ }, -+ "funding": { + }, + "funding": { +- "url": "https://github.com/sponsors/isaacs" +- }, +- "optionalDependencies": { +- "@pkgjs/parseargs": "^0.11.0" + "url": "https://github.com/sponsors/ljharb" -+ } -+ }, + } + }, +- "node_modules/keygrip": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", +- "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", + "node_modules/svg-captcha": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/svg-captcha/-/svg-captcha-1.4.0.tgz", + "integrity": "sha512-/fkkhavXPE57zRRCjNqAP3txRCSncpMx3NnNZL7iEoyAtYwUjPhJxW6FQTQPG5UPEmCrbFoXS10C3YdJlW7PDg==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "tsscmp": "1.0.6" + "opentype.js": "^0.7.3" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.6" + "node": ">=4.x" -+ } -+ }, + } + }, +- "node_modules/lazystream": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz", +- "integrity": "sha512-b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw==", + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", -+ "license": "MIT", + "license": "MIT", + "optional": true + }, + "node_modules/syslog": { @@ -16269,43 +15410,71 @@ index 2af3a0d1..5c5f4b73 100644 + "deprecated": "Old versions of tar are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "license": "ISC", + "optional": true, -+ "dependencies": { + "dependencies": { +- "readable-stream": "^2.0.5" + "chownr": "^2.0.0", + "fs-minipass": "^2.0.0", + "minipass": "^5.0.0", + "minizlib": "^2.1.1", + "mkdirp": "^1.0.3", + "yallist": "^4.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.6.3" + "node": ">=10" -+ } -+ }, + } + }, +- "node_modules/lazystream/node_modules/readable-stream": { +- "version": "2.3.8", +- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", +- "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", + "node_modules/tar-fs": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.1.4.tgz", + "integrity": "sha512-mDAjwmZdh7LTT6pNleZ05Yt65HC3E+NiQzl672vQG38jIrehtJk/J3mNwIg+vShQPcLF/LV7CMnDW6vjj6sfYQ==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "core-util-is": "~1.0.0", +- "inherits": "~2.0.3", +- "isarray": "~1.0.0", +- "process-nextick-args": "~2.0.0", +- "safe-buffer": "~5.1.1", +- "string_decoder": "~1.1.1", +- "util-deprecate": "~1.0.1" + "chownr": "^1.1.1", + "mkdirp-classic": "^0.5.2", + "pump": "^3.0.0", + "tar-stream": "^2.1.4" -+ } -+ }, + } + }, +- "node_modules/lazystream/node_modules/safe-buffer": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", +- "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", +- "license": "MIT" +- }, +- "node_modules/lazystream/node_modules/string_decoder": { +- "version": "1.1.1", +- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", +- "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", + "node_modules/tar-fs/node_modules/bl": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz", + "integrity": "sha512-1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "safe-buffer": "~5.1.0" + "buffer": "^5.5.0", + "inherits": "^2.0.4", + "readable-stream": "^3.4.0" -+ } -+ }, + } + }, +- "node_modules/lie": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/lie/-/lie-3.1.1.tgz", +- "integrity": "sha512-RiNhHysUjhrDQntfYSfY4MU24coXXdEOgw9WGcKHNeEwffDYbF//u87M1EWaMGzuFoSbqW0C9C6lEEhDOAswfw==", + "node_modules/tar-fs/node_modules/buffer": { + "version": "5.7.1", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz", @@ -16324,40 +15493,70 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://feross.org/support" + } + ], -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "immediate": "~3.0.5" +- } +- }, +- "node_modules/localforage": { +- "version": "1.10.0", +- "resolved": "https://registry.npmjs.org/localforage/-/localforage-1.10.0.tgz", +- "integrity": "sha512-14/H1aX7hzBBmmh7sGPd+AOMkkIrHM3Z1PAyGgZigA1H1p5O5ANnMyWzvpAETtG68/dC4pC0ncy3+PPGzXZHPg==", +- "license": "Apache-2.0", +- "dependencies": { +- "lie": "3.1.1" + "base64-js": "^1.3.1", + "ieee754": "^1.1.13" -+ } -+ }, + } + }, +- "node_modules/lodash": { +- "version": "4.17.23", +- "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", +- "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", +- "license": "MIT" +- }, +- "node_modules/lru-cache": { +- "version": "10.4.3", +- "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", +- "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", +- "license": "ISC" + "node_modules/tar-fs/node_modules/chownr": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/chownr/-/chownr-1.1.4.tgz", + "integrity": "sha512-jJ0bqzaylmJtVnNgzTeSOs8DPavpbYgEr/b0YL8/2GO3xJEhInFmhKMUnEJQjZumK7KXGFhUy89PrsJWlakBVg==", + "license": "ISC", + "optional": true -+ }, + }, +- "node_modules/math-intrinsics": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", +- "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", + "node_modules/tar-fs/node_modules/readable-stream": { + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", -+ "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" + }, -+ "engines": { + "engines": { +- "node": ">= 0.4" + "node": ">= 6" -+ } -+ }, + } + }, +- "node_modules/media-typer": { +- "version": "0.3.0", +- "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", +- "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", + "node_modules/tar-fs/node_modules/tar-stream": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz", + "integrity": "sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==", -+ "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "bl": "^4.0.3", @@ -16366,134 +15565,229 @@ index 2af3a0d1..5c5f4b73 100644 + "inherits": "^2.0.3", + "readable-stream": "^3.1.1" + }, -+ "engines": { + "engines": { +- "node": ">= 0.6" + "node": ">=6" -+ } -+ }, + } + }, +- "node_modules/merge-descriptors": { +- "version": "1.0.3", +- "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", +- "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", + "node_modules/tar-stream": { + "version": "3.1.8", + "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz", + "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==", -+ "license": "MIT", + "license": "MIT", +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" + "dependencies": { + "b4a": "^1.6.4", + "bare-fs": "^4.5.5", + "fast-fifo": "^1.2.0", + "streamx": "^2.15.0" -+ } -+ }, + } + }, +- "node_modules/methods": { +- "version": "1.1.2", +- "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", +- "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", +- "license": "MIT", + "node_modules/tar/node_modules/minipass": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", + "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", + "license": "ISC", + "optional": true, -+ "engines": { + "engines": { +- "node": ">= 0.6" + "node": ">=8" -+ } -+ }, + } + }, +- "node_modules/mime": { +- "version": "1.6.0", +- "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", +- "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", + "node_modules/tar/node_modules/mkdirp": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", + "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "bin": { + "bin": { +- "mime": "cli.js" + "mkdirp": "bin/cmd.js" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=4" + "node": ">=10" -+ } -+ }, + } + }, +- "node_modules/mime-db": { +- "version": "1.54.0", +- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", +- "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", + "node_modules/tdigest": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/tdigest/-/tdigest-0.1.2.tgz", + "integrity": "sha512-+G0LLgjjo9BZX2MfdvPfH+MKLCrxlXSYec5DaPYP1fe6Iyhf0/fSmJ0bFiZ1F8BT6cGXl2LpltQptzjXKWEkKA==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.6" + "optional": true, + "dependencies": { + "bintrees": "1.0.2" -+ } -+ }, + } + }, +- "node_modules/mime-types": { +- "version": "2.1.35", +- "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", +- "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", +- "license": "MIT", + "node_modules/teeny-request": { + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/teeny-request/-/teeny-request-9.0.0.tgz", + "integrity": "sha512-resvxdc6Mgb7YEThw6G6bExlXKkv6+YbuzGg9xuXxSgxJF7Ozs+o8Y9+2R3sArdWdW8nOokoQb1yrpFB0pQK2g==", + "license": "Apache-2.0", + "optional": true, -+ "dependencies": { + "dependencies": { +- "mime-db": "1.52.0" + "http-proxy-agent": "^5.0.0", + "https-proxy-agent": "^5.0.0", + "node-fetch": "^2.6.9", + "stream-events": "^1.0.5", + "uuid": "^9.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.6" + "node": ">=14" -+ } -+ }, + } + }, +- "node_modules/mime-types/node_modules/mime-db": { +- "version": "1.52.0", +- "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", +- "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "node_modules/teeny-request/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.6" +- } +- }, +- "node_modules/minimatch": { +- "version": "9.0.9", +- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", +- "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", +- "license": "ISC", + "optional": true, -+ "dependencies": { + "dependencies": { +- "brace-expansion": "^2.0.2" + "debug": "4" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=16 || 14 >=14.17" +- }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" + "node": ">= 6.0.0" -+ } -+ }, + } + }, +- "node_modules/minimist": { +- "version": "1.2.8", +- "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", +- "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "node_modules/teeny-request/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", -+ "license": "MIT", + "license": "MIT", +- "funding": { +- "url": "https://github.com/sponsors/ljharb" +- } +- }, +- "node_modules/minipass": { +- "version": "7.1.3", +- "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz", +- "integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==", +- "license": "BlueOak-1.0.0", + "optional": true, + "dependencies": { + "ms": "^2.1.3" + }, -+ "engines": { + "engines": { +- "node": ">=16 || 14 >=14.17" + "node": ">=6.0" + }, + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } -+ } -+ }, + } + }, +- "node_modules/ms": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", +- "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", +- "license": "MIT" +- }, +- "node_modules/multiparty": { +- "version": "4.2.3", +- "resolved": "https://registry.npmjs.org/multiparty/-/multiparty-4.2.3.tgz", +- "integrity": "sha512-Ak6EUJZuhGS8hJ3c2fY6UW5MbkGUPMBEGd13djUzoY/BHqV/gTuFWtC6IuVA7A2+v3yjBS6c4or50xhzTQZImQ==", + "node_modules/teeny-request/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "http-errors": "~1.8.1", +- "safe-buffer": "5.2.1", +- "uid-safe": "2.1.5" + "agent-base": "6", + "debug": "4" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.10" + "node": ">= 6" -+ } -+ }, + } + }, +- "node_modules/multiparty/node_modules/depd": { +- "version": "1.1.2", +- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", +- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", + "node_modules/teeny-request/node_modules/ms": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.6" +- } + "optional": true -+ }, + }, +- "node_modules/multiparty/node_modules/http-errors": { +- "version": "1.8.1", +- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", +- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", + "node_modules/teeny-request/node_modules/node-fetch": { + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", + "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "depd": "~1.1.2", +- "inherits": "2.0.4", +- "setprototypeof": "1.2.0", +- "statuses": ">= 1.5.0 < 2", +- "toidentifier": "1.0.1" + "whatwg-url": "^5.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.6" + "node": "4.x || >=6.0.0" + }, + "peerDependencies": { @@ -16503,36 +15797,62 @@ index 2af3a0d1..5c5f4b73 100644 + "encoding": { + "optional": true + } -+ } -+ }, + } + }, +- "node_modules/multiparty/node_modules/statuses": { +- "version": "1.5.0", +- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", +- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", + "node_modules/teeny-request/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.6" +- } + "optional": true -+ }, + }, +- "node_modules/negotiator": { +- "version": "0.6.4", +- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", +- "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", + "node_modules/teeny-request/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.6" + "optional": true, + "bin": { + "uuid": "dist/bin/uuid" -+ } -+ }, + } + }, +- "node_modules/neo-async": { +- "version": "2.6.2", +- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", +- "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", +- "license": "MIT" + "node_modules/teeny-request/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "license": "BSD-2-Clause", + "optional": true -+ }, + }, +- "node_modules/node-forge": { +- "version": "1.4.0", +- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz", +- "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==", +- "license": "(BSD-3-Clause OR GPL-2.0)", +- "engines": { +- "node": ">= 6.13.0" + "node_modules/teeny-request/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", @@ -16542,22 +15862,34 @@ index 2af3a0d1..5c5f4b73 100644 + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" -+ } -+ }, + } + }, +- "node_modules/nofilter": { +- "version": "1.0.4", +- "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz", +- "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==", + "node_modules/teex": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", + "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">=8" + "dependencies": { + "streamx": "^2.12.5" -+ } -+ }, + } + }, +- "node_modules/normalize-path": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", +- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "node_modules/telegram": { + "version": "2.26.22", + "resolved": "https://registry.npmjs.org/telegram/-/telegram-2.26.22.tgz", + "integrity": "sha512-EIj7Yrjiu0Yosa3FZ/7EyPg9s6UiTi/zDQrFmR/2Mg7pIUU+XjAit1n1u9OU9h2oRnRM5M+67/fxzQluZpaJJg==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">=0.10.0" + "optional": true, + "dependencies": { + "@cryptography/aes": "^0.1.1", @@ -16578,39 +15910,57 @@ index 2af3a0d1..5c5f4b73 100644 + "optionalDependencies": { + "bufferutil": "^4.0.3", + "utf-8-validate": "^5.0.5" -+ } -+ }, + } + }, +- "node_modules/object-inspect": { +- "version": "1.13.4", +- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", +- "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", + "node_modules/telegram/node_modules/mime": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz", + "integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==", -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.4" + "optional": true, + "bin": { + "mime": "cli.js" -+ }, + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "engines": { + "node": ">=10.0.0" -+ } -+ }, + } + }, +- "node_modules/on-finished": { +- "version": "2.4.1", +- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", +- "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", + "node_modules/telnyx": { + "version": "1.27.0", + "resolved": "https://registry.npmjs.org/telnyx/-/telnyx-1.27.0.tgz", + "integrity": "sha512-cVbP3jEW4TbmNL5U0UbZc3OkLg+6dHRnMYByYfJnrGw5ZRn0XKb17Hx3fLMWmGgRFow7eqVP4hlCogbIB6T3+w==", -+ "license": "MIT", + "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "ee-first": "1.1.1" + "lodash.isplainobject": "^4.0.6", + "qs": "^6.11.2", + "safe-buffer": "^5.2.1", + "telnyx": "^1.26.2", + "tweetnacl": "^1.0.3", + "uuid": "^9.0.1" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">= 0.8" + "node": "^6 || >=8" -+ } -+ }, + } + }, +- "node_modules/on-headers": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", +- "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", + "node_modules/telnyx/node_modules/tweetnacl": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.3.tgz", @@ -16622,23 +15972,34 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">= 0.8" + "optional": true, + "bin": { + "uuid": "dist/bin/uuid" -+ } -+ }, + } + }, +- "node_modules/otplib": { +- "version": "12.0.1", +- "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz", +- "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==", +- "license": "MIT", + "node_modules/terser": { -+ "version": "5.46.2", -+ "resolved": "https://registry.npmjs.org/terser/-/terser-5.46.2.tgz", -+ "integrity": "sha512-uxfo9fPcSgLDYob/w1FuL0c99MWiJDnv+5qXSQc5+Ki5NjVNsYi66INnMFBjf6uFz6OnX12piJQPF4IpjJTNTw==", ++ "version": "5.48.0", ++ "resolved": "https://registry.npmjs.org/terser/-/terser-5.48.0.tgz", ++ "integrity": "sha512-J/9An6vs9Us6wKRriSFXBWdRZapREHqFzdNUKk0pmu804EMR6dr6winwo7e5JDxN4xahxQsuysyYFwlwj4XN/Q==", + "license": "BSD-2-Clause", + "optional": true, -+ "dependencies": { + "dependencies": { +- "@otplib/core": "^12.0.1", +- "@otplib/preset-default": "^12.0.1", +- "@otplib/preset-v11": "^12.0.1" + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.15.0", + "commander": "^2.20.0", @@ -16649,13 +16010,23 @@ index 2af3a0d1..5c5f4b73 100644 + }, + "engines": { + "node": ">=10" -+ } -+ }, + } + }, +- "node_modules/package-json-from-dist": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", +- "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", +- "license": "BlueOak-1.0.0" +- }, +- "node_modules/parseurl": { +- "version": "1.3.3", +- "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", +- "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", + "node_modules/terser/node_modules/commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", -+ "license": "MIT", + "license": "MIT", + "optional": true + }, + "node_modules/test-exclude": { @@ -16670,21 +16041,33 @@ index 2af3a0d1..5c5f4b73 100644 + "read-pkg-up": "^4.0.0", + "require-main-filename": "^2.0.0" + }, -+ "engines": { + "engines": { +- "node": ">= 0.8" + "node": ">=6" -+ } -+ }, + } + }, +- "node_modules/path-key": { +- "version": "3.1.1", +- "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", +- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "node_modules/test-exclude/node_modules/brace-expansion": { -+ "version": "1.1.14", -+ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.14.tgz", -+ "integrity": "sha512-MWPGfDxnyzKU7rNOW9SP/c50vi3xrmrua/+6hfPbCS2ABNWfx24vPidzvC7krjU/RTo235sV776ymlsMtGKj8g==", -+ "license": "MIT", ++ "version": "1.1.15", ++ "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.15.tgz", ++ "integrity": "sha512-EwOCDEex4quD37XhqM3omwtMoJjr//isUZz1JopUNWms+4Z2ViyM/k1YIRePpoVNnQhENnxtFjLaxNHrT7xIUg==", + "license": "MIT", +- "engines": { +- "node": ">=8" + "optional": true, + "dependencies": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" -+ } -+ }, + } + }, +- "node_modules/path-scurry": { +- "version": "1.11.1", +- "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", +- "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", +- "license": "BlueOak-1.0.0", + "node_modules/test-exclude/node_modules/glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", @@ -16692,21 +16075,29 @@ index 2af3a0d1..5c5f4b73 100644 + "deprecated": "Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me", + "license": "ISC", + "optional": true, -+ "dependencies": { + "dependencies": { +- "lru-cache": "^10.2.0", +- "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" -+ }, -+ "engines": { + }, + "engines": { +- "node": ">=16 || 14 >=14.18" + "node": "*" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/isaacs" -+ } -+ }, + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, +- "node_modules/path-to-regexp": { +- "version": "0.1.12", +- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", +- "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", +- "license": "MIT" + "node_modules/test-exclude/node_modules/minimatch": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.5.tgz", @@ -16719,7 +16110,12 @@ index 2af3a0d1..5c5f4b73 100644 + "engines": { + "node": "*" + } -+ }, + }, +- "node_modules/pend": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", +- "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", +- "license": "MIT" + "node_modules/text-decoder": { + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz", @@ -16728,22 +16124,31 @@ index 2af3a0d1..5c5f4b73 100644 + "dependencies": { + "b4a": "^1.6.4" + } -+ }, + }, +- "node_modules/possible-typed-array-names": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", +- "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", + "node_modules/text-hex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/text-hex/-/text-hex-1.0.0.tgz", + "integrity": "sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg==", -+ "license": "MIT", + "license": "MIT", + "optional": true + }, + "node_modules/thirty-two": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", + "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==", -+ "engines": { + "engines": { +- "node": ">= 0.4" + "node": ">=0.2.6" -+ } -+ }, + } + }, +- "node_modules/process": { +- "version": "0.11.10", +- "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", +- "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", + "node_modules/through": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", @@ -16765,36 +16170,34 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "3.6.2", + "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", + "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", -+ "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "inherits": "^2.0.3", + "string_decoder": "^1.1.1", + "util-deprecate": "^1.0.1" - }, ++ }, "engines": { -- "node": ">= 0.10" +- "node": ">= 0.6.0" + "node": ">= 6" } }, -- "node_modules/multiparty/node_modules/depd": { -- "version": "1.1.2", -- "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", -- "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", +- "node_modules/process-nextick-args": { +- "version": "2.0.1", +- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", +- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", +- "license": "MIT" + "node_modules/thunky": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz", + "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA==", - "license": "MIT", -- "engines": { -- "node": ">= 0.6" -- } ++ "license": "MIT", + "optional": true }, -- "node_modules/multiparty/node_modules/http-errors": { -- "version": "1.8.1", -- "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", -- "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", +- "node_modules/proxy-addr": { +- "version": "2.0.7", +- "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", +- "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", + "node_modules/tiny-inflate": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/tiny-inflate/-/tiny-inflate-1.0.3.tgz", @@ -16816,83 +16219,71 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "depd": "~1.1.2", -- "inherits": "2.0.4", -- "setprototypeof": "1.2.0", -- "statuses": ">= 1.5.0 < 2", -- "toidentifier": "1.0.1" +- "forwarded": "0.2.0", +- "ipaddr.js": "1.9.1" + "is-number": "^7.0.0" }, "engines": { -- "node": ">= 0.6" +- "node": ">= 0.10" + "node": ">=8.0" } }, -- "node_modules/multiparty/node_modules/statuses": { -- "version": "1.5.0", -- "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", -- "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", +- "node_modules/qs": { +- "version": "6.14.2", +- "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", +- "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", + "node_modules/toidentifier": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", + "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", - "license": "MIT", - "engines": { -- "node": ">= 0.6" ++ "license": "MIT", ++ "engines": { + "node": ">=0.6" - } - }, -- "node_modules/negotiator": { -- "version": "0.6.4", -- "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", -- "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", -- "license": "MIT", ++ } ++ }, + "node_modules/tough-cookie": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.1.4.tgz", + "integrity": "sha512-Loo5UUvLD9ScZ6jh8beX1T6sO1w2/MpCRpEP7V280GKMVUQ0Jzar2U3UJPsrdbziLEMMhu3Ujnq//rhiFuIeag==", -+ "license": "BSD-3-Clause", + "license": "BSD-3-Clause", + "optional": true, -+ "dependencies": { + "dependencies": { +- "side-channel": "^1.1.0" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.2.0", + "url-parse": "^1.5.3" -+ }, + }, "engines": { -- "node": ">= 0.6" +- "node": ">=0.6" +- }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "node": ">=6" } }, -- "node_modules/neo-async": { -- "version": "2.6.2", -- "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", -- "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", -- "license": "MIT" -- }, -- "node_modules/node-forge": { -- "version": "1.4.0", -- "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.4.0.tgz", -- "integrity": "sha512-LarFH0+6VfriEhqMMcLX2F7SwSXeWwnEAJEsYm5QKWchiVYVvJyV9v7UDvUv+w5HO23ZpQTXDv/GxdDdMyOuoQ==", -- "license": "(BSD-3-Clause OR GPL-2.0)", +- "node_modules/random-bytes": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", +- "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==", + "node_modules/tr46": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-4.1.1.tgz", + "integrity": "sha512-2lv/66T7e5yNyhAAC4NaKe5nVavzuGJQVVtRYLyQ2OI8tsJ61PMLlelehb0wi2Hx6+hT/OJUWZcw8MjlSRnxvw==", -+ "license": "MIT", + "license": "MIT", + "optional": true, + "dependencies": { + "punycode": "^2.3.0" + }, "engines": { -- "node": ">= 6.13.0" +- "node": ">= 0.8" + "node": ">=14" } }, -- "node_modules/nofilter": { -- "version": "1.0.4", -- "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-1.0.4.tgz", -- "integrity": "sha512-N8lidFp+fCz+TD51+haYdbDGrcBWwuHX40F5+z0qkUjMJ5Tp+rdSuAkMJ9N9eoolDlEVTf6u5icM+cNKkKW2mA==", +- "node_modules/range-parser": { +- "version": "1.2.1", +- "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", +- "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", + "node_modules/triple-beam": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/triple-beam/-/triple-beam-1.4.1.tgz", @@ -16900,29 +16291,35 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "engines": { -- "node": ">=8" +- "node": ">= 0.6" + "node": ">= 14.0.0" } }, -- "node_modules/normalize-path": { -- "version": "3.0.0", -- "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", -- "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", +- "node_modules/raw-body": { +- "version": "2.5.3", +- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", +- "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", + "node_modules/ts-custom-error": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/ts-custom-error/-/ts-custom-error-3.3.1.tgz", + "integrity": "sha512-5OX1tzOjxWEgsr/YEUWSuPrQ00deKLh6D7OTWcvNHm12/7QPyRh8SYpyWvA4IZv8H/+GQWQEh/kwo95Q9OVW1A==", "license": "MIT", +- "dependencies": { +- "bytes": "~3.1.2", +- "http-errors": "~2.0.1", +- "iconv-lite": "~0.4.24", +- "unpipe": "~1.0.0" +- }, + "optional": true, "engines": { -- "node": ">=0.10.0" +- "node": ">= 0.8" + "node": ">=14.0.0" } }, -- "node_modules/object-inspect": { -- "version": "1.13.4", -- "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", -- "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", +- "node_modules/readable-stream": { +- "version": "4.7.0", +- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", +- "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", + "node_modules/ts-mixer": { + "version": "6.0.4", + "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.4.tgz", @@ -16942,63 +16339,79 @@ index 2af3a0d1..5c5f4b73 100644 + "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", + "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==", "license": "MIT", - "engines": { -- "node": ">= 0.4" +- "dependencies": { +- "abort-controller": "^3.0.0", +- "buffer": "^6.0.3", +- "events": "^3.3.0", +- "process": "^0.11.10", +- "string_decoder": "^1.3.0" - }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" + "engines": { +- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" + "node": ">=0.6.x" } }, -- "node_modules/on-finished": { -- "version": "2.4.1", -- "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", -- "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", -- "license": "MIT", +- "node_modules/readdir-glob": { +- "version": "1.1.3", +- "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", +- "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", + "node_modules/tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha512-McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w==", -+ "license": "Apache-2.0", + "license": "Apache-2.0", + "optional": true, "dependencies": { -- "ee-first": "1.1.1" +- "minimatch": "^5.1.0" +- } +- }, +- "node_modules/readdir-glob/node_modules/minimatch": { +- "version": "5.1.9", +- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", +- "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", +- "license": "ISC", +- "dependencies": { +- "brace-expansion": "^2.0.1" + "safe-buffer": "^5.0.1" }, "engines": { -- "node": ">= 0.8" +- "node": ">=10" + "node": "*" } }, -- "node_modules/on-headers": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", -- "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", -- "license": "MIT", +- "node_modules/safe-buffer": { +- "version": "5.2.1", +- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", +- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", +- "funding": [ +- { +- "type": "github", +- "url": "https://github.com/sponsors/feross" +- }, + "node_modules/tv4": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", + "integrity": "sha512-afizzfpJgvPr+eDkREK4MxJ/+r8nEEHcmitwgnPUqpaP+FpwQyadnxNoSACbgc/b1LsZYtODGoPiFxQrgJgjvw==", + "license": [ -+ { + { +- "type": "patreon", +- "url": "https://www.patreon.com/feross" + "type": "Public Domain", + "url": "http://geraintluff.github.io/tv4/LICENSE.txt" -+ }, -+ { + }, + { +- "type": "consulting", +- "url": "https://feross.org/support" + "type": "MIT", + "url": "http://jsonary.com/LICENSE.txt" -+ } -+ ], + } + ], +- "license": "MIT" + "optional": true, - "engines": { -- "node": ">= 0.8" ++ "engines": { + "node": ">= 0.8.0" - } - }, -- "node_modules/otplib": { -- "version": "12.0.1", -- "resolved": "https://registry.npmjs.org/otplib/-/otplib-12.0.1.tgz", -- "integrity": "sha512-xDGvUOQjop7RDgxTQ+o4pOol0/3xSZzawTiPKRrHnQWAy0WjhNs/5HdIDJCrqC4MBynmjXgULc6YfioaxZeFgg==", ++ } ++ }, + "node_modules/tweetnacl": { + "version": "0.14.5", + "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -17010,12 +16423,9 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "4.23.0", + "resolved": "https://registry.npmjs.org/twilio/-/twilio-4.23.0.tgz", + "integrity": "sha512-LdNBQfOe0dY2oJH2sAsrxazpgfFQo5yXGxe96QA8UWB5uu+433PrUbkv8gQ5RmrRCqUTPQ0aOrIyAdBr1aB03Q==", - "license": "MIT", ++ "license": "MIT", + "optional": true, - "dependencies": { -- "@otplib/core": "^12.0.1", -- "@otplib/preset-default": "^12.0.1", -- "@otplib/preset-v11": "^12.0.1" ++ "dependencies": { + "axios": "^1.6.0", + "dayjs": "^1.11.9", + "https-proxy-agent": "^5.0.0", @@ -17027,117 +16437,121 @@ index 2af3a0d1..5c5f4b73 100644 + }, + "engines": { + "node": ">=14.0" - } - }, -- "node_modules/package-json-from-dist": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", -- "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", -- "license": "BlueOak-1.0.0" -- }, -- "node_modules/parseurl": { -- "version": "1.3.3", -- "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", -- "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", ++ } ++ }, + "node_modules/twilio/node_modules/agent-base": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", + "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", - "license": "MIT", ++ "license": "MIT", + "optional": true, + "dependencies": { + "debug": "4" + }, - "engines": { -- "node": ">= 0.8" ++ "engines": { + "node": ">= 6.0.0" - } ++ } }, -- "node_modules/path-key": { -- "version": "3.1.1", -- "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", -- "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", +- "node_modules/safe-regex-test": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", +- "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", + "node_modules/twilio/node_modules/debug": { + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", + "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", + "optional": true, -+ "dependencies": { + "dependencies": { +- "call-bound": "^1.0.2", +- "es-errors": "^1.3.0", +- "is-regex": "^1.2.1" + "ms": "^2.1.3" -+ }, + }, "engines": { -- "node": ">=8" +- "node": ">= 0.4" + "node": ">=6.0" -+ }, + }, +- "funding": { +- "url": "https://github.com/sponsors/ljharb" + "peerDependenciesMeta": { + "supports-color": { + "optional": true + } } }, -- "node_modules/path-scurry": { -- "version": "1.11.1", -- "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", -- "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", -- "license": "BlueOak-1.0.0", +- "node_modules/safer-buffer": { +- "version": "2.1.2", +- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", +- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", +- "license": "MIT" +- }, +- "node_modules/send": { +- "version": "0.19.2", +- "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", +- "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", + "node_modules/twilio/node_modules/https-proxy-agent": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", + "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", -+ "license": "MIT", + "license": "MIT", + "optional": true, "dependencies": { -- "lru-cache": "^10.2.0", -- "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" +- "debug": "2.6.9", +- "depd": "2.0.0", +- "destroy": "1.2.0", +- "encodeurl": "~2.0.0", +- "escape-html": "~1.0.3", +- "etag": "~1.8.1", +- "fresh": "~0.5.2", +- "http-errors": "~2.0.1", +- "mime": "1.6.0", +- "ms": "2.1.3", +- "on-finished": "~2.4.1", +- "range-parser": "~1.2.1", +- "statuses": "~2.0.2" + "agent-base": "6", + "debug": "4" }, "engines": { -- "node": ">=16 || 14 >=14.18" -- }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" +- "node": ">= 0.8.0" + "node": ">= 6" } }, -- "node_modules/path-to-regexp": { -- "version": "0.1.12", -- "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", -- "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", -- "license": "MIT" -- }, -- "node_modules/pend": { -- "version": "1.2.0", -- "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz", -- "integrity": "sha512-F3asv42UuXchdzt+xXqfW1OGlVBe+mxa2mqI0pg5yAHZPvFmY3Y6drSf/GQ1A86WgWEN9Kzh/WrgKa6iGcHXLg==", -- "license": "MIT" +- "node_modules/send/node_modules/ms": { + "node_modules/twilio/node_modules/ms": { -+ "version": "2.1.3", -+ "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -+ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", + "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", +- "license": "MIT" + "license": "MIT", + "optional": true }, -- "node_modules/possible-typed-array-names": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", -- "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", +- "node_modules/serve-static": { +- "version": "1.16.3", +- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", +- "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", + "node_modules/twilio/node_modules/xmlbuilder": { + "version": "13.0.2", + "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-13.0.2.tgz", + "integrity": "sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==", "license": "MIT", +- "dependencies": { +- "encodeurl": "~2.0.0", +- "escape-html": "~1.0.3", +- "parseurl": "~1.3.3", +- "send": "~0.19.1" +- }, + "optional": true, "engines": { -- "node": ">= 0.4" +- "node": ">= 0.8.0" + "node": ">=6.0" } }, -- "node_modules/process": { -- "version": "0.11.10", -- "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", -- "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", +- "node_modules/set-function-length": { +- "version": "1.2.2", +- "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", +- "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", + "node_modules/type": { + "version": "2.7.3", + "resolved": "https://registry.npmjs.org/type/-/type-2.7.3.tgz", @@ -17150,25 +16564,31 @@ index 2af3a0d1..5c5f4b73 100644 + "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", + "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "license": "MIT", -+ "dependencies": { + "dependencies": { +- "define-data-property": "^1.1.4", +- "es-errors": "^1.3.0", +- "function-bind": "^1.1.2", +- "get-intrinsic": "^1.2.4", +- "gopd": "^1.0.1", +- "has-property-descriptors": "^1.0.2" + "media-typer": "0.3.0", + "mime-types": "~2.1.24" -+ }, + }, "engines": { -- "node": ">= 0.6.0" +- "node": ">= 0.4" + "node": ">= 0.6" } }, -- "node_modules/process-nextick-args": { -- "version": "2.0.1", -- "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", -- "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", -- "license": "MIT" +- "node_modules/setprototypeof": { +- "version": "1.2.0", +- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", +- "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", +- "license": "ISC" - }, -- "node_modules/proxy-addr": { -- "version": "2.0.7", -- "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", -- "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", +- "node_modules/shebang-command": { +- "version": "2.0.0", +- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", +- "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "node_modules/typed-array-buffer": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", @@ -17176,66 +16596,45 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "forwarded": "0.2.0", -- "ipaddr.js": "1.9.1" +- "shebang-regex": "^3.0.0" + "call-bound": "^1.0.3", + "es-errors": "^1.3.0", + "is-typed-array": "^1.1.14" }, "engines": { -- "node": ">= 0.10" +- "node": ">=8" + "node": ">= 0.4" } }, -- "node_modules/qs": { -- "version": "6.14.2", -- "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.2.tgz", -- "integrity": "sha512-V/yCWTTF7VJ9hIh18Ugr2zhJMP01MY7c5kh4J870L7imm6/DIzBsNLTXzMwUA3yZ5b/KBqLx8Kp3uRvd7xSe3Q==", -- "license": "BSD-3-Clause", +- "node_modules/shebang-regex": { +- "version": "3.0.0", +- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", +- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "node_modules/typed-array-byte-length": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", + "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", -+ "license": "MIT", + "license": "MIT", + "optional": true, - "dependencies": { -- "side-channel": "^1.1.0" ++ "dependencies": { + "call-bind": "^1.0.8", + "for-each": "^0.3.3", + "gopd": "^1.2.0", + "has-proto": "^1.2.0", + "is-typed-array": "^1.1.14" - }, ++ }, "engines": { -- "node": ">=0.6" +- "node": ">=8" + "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" ++ }, ++ "funding": { ++ "url": "https://github.com/sponsors/ljharb" } }, -- "node_modules/random-bytes": { -- "version": "1.0.0", -- "resolved": "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz", -- "integrity": "sha512-iv7LhNVO047HzYR3InF6pUcUsPQiHTM1Qal51DcGSuZFBil1aBBWG5eHPNek7bvILMaYJ/8RU1e8w1AMdHmLQQ==", -- "license": "MIT", -- "engines": { -- "node": ">= 0.8" -- } -- }, -- "node_modules/range-parser": { -- "version": "1.2.1", -- "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", -- "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", -- "license": "MIT", -- "engines": { -- "node": ">= 0.6" -- } -- }, -- "node_modules/raw-body": { -- "version": "2.5.3", -- "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", -- "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", +- "node_modules/side-channel": { +- "version": "1.1.0", +- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", +- "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", + "node_modules/typed-array-byte-offset": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", @@ -17243,10 +16642,11 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "bytes": "~3.1.2", -- "http-errors": "~2.0.1", -- "iconv-lite": "~0.4.24", -- "unpipe": "~1.0.0" +- "es-errors": "^1.3.0", +- "object-inspect": "^1.13.3", +- "side-channel-list": "^1.0.0", +- "side-channel-map": "^1.0.1", +- "side-channel-weakmap": "^1.0.2" + "available-typed-arrays": "^1.0.7", + "call-bind": "^1.0.8", + "for-each": "^0.3.3", @@ -17256,105 +16656,75 @@ index 2af3a0d1..5c5f4b73 100644 + "reflect.getprototypeof": "^1.0.9" }, "engines": { -- "node": ">= 0.8" -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" + "node": ">= 0.4" +@@ -2077,14 +15289,19 @@ + "url": "https://github.com/sponsors/ljharb" } }, -- "node_modules/readable-stream": { -- "version": "4.7.0", -- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", -- "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", +- "node_modules/side-channel-list": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", +- "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", + "node_modules/typed-array-length": { -+ "version": "1.0.7", -+ "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", -+ "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", ++ "version": "1.0.8", ++ "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.8.tgz", ++ "integrity": "sha512-phPGCwqr2+Qo0fwniCE8e4pKnGu/yFb5nD5Y8bf0EEeiI5GklnACYA9GFy/DrAeRrKHXvHn+1SUsOWgJp6RO+g==", "license": "MIT", + "optional": true, "dependencies": { -- "abort-controller": "^3.0.0", -- "buffer": "^6.0.3", -- "events": "^3.3.0", -- "process": "^0.11.10", -- "string_decoder": "^1.3.0" -+ "call-bind": "^1.0.7", -+ "for-each": "^0.3.3", -+ "gopd": "^1.0.1", -+ "is-typed-array": "^1.1.13", -+ "possible-typed-array-names": "^1.0.0", -+ "reflect.getprototypeof": "^1.0.6" +- "es-errors": "^1.3.0", +- "object-inspect": "^1.13.3" ++ "call-bind": "^1.0.9", ++ "for-each": "^0.3.5", ++ "gopd": "^1.2.0", ++ "is-typed-array": "^1.1.15", ++ "possible-typed-array-names": "^1.1.0", ++ "reflect.getprototypeof": "^1.0.10" }, "engines": { -- "node": "^12.22.0 || ^14.17.0 || >=16.0.0" -- } -- }, -- "node_modules/readdir-glob": { -- "version": "1.1.3", -- "resolved": "https://registry.npmjs.org/readdir-glob/-/readdir-glob-1.1.3.tgz", -- "integrity": "sha512-v05I2k7xN8zXvPD9N+z/uhXPaj0sUFCe2rcWZIpBsqxfP7xXFQ0tipAd/wjj1YxWyWtUS5IDJpOG82JKt2EAVA==", -- "license": "Apache-2.0", -- "dependencies": { -- "minimatch": "^5.1.0" -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" + "node": ">= 0.4" +@@ -2093,35 +15310,105 @@ + "url": "https://github.com/sponsors/ljharb" } }, -- "node_modules/readdir-glob/node_modules/minimatch": { -- "version": "5.1.9", -- "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.9.tgz", -- "integrity": "sha512-7o1wEA2RyMP7Iu7GNba9vc0RWWGACJOCZBJX2GJWip0ikV+wcOsgVuY9uE8CPiyQhkGFSlhuSkZPavN7u1c2Fw==", -- "license": "ISC", +- "node_modules/side-channel-map": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", +- "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", + "node_modules/typedarray-to-buffer": { + "version": "3.1.5", + "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", + "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", -+ "license": "MIT", + "license": "MIT", + "optional": true, "dependencies": { -- "brace-expansion": "^2.0.1" -- }, -- "engines": { -- "node": ">=10" +- "call-bound": "^1.0.2", +- "es-errors": "^1.3.0", +- "get-intrinsic": "^1.2.5", +- "object-inspect": "^1.13.3" + "is-typedarray": "^1.0.0" - } - }, -- "node_modules/safe-buffer": { -- "version": "5.2.1", -- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", -- "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", ++ } ++ }, + "node_modules/ua-client-hints-js": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/ua-client-hints-js/-/ua-client-hints-js-0.1.2.tgz", + "integrity": "sha512-cYqD5p9PPCsNYpBJRYcU7s5QuZS3pdWpskOJl+QE7elbOrFzctLs5H9ppH10v7Tk0Kholzo9VIyjoTlh0B8XXg==", - "funding": [ - { - "type": "github", -- "url": "https://github.com/sponsors/feross" ++ "funding": [ ++ { ++ "type": "github", + "url": "https://github.com/sponsors/faisalman" - }, - { -- "type": "patreon", -- "url": "https://www.patreon.com/feross" ++ }, ++ { + "type": "opencollective", + "url": "https://opencollective.com/ua-parser-js" - }, - { -- "type": "consulting", -- "url": "https://feross.org/support" ++ }, ++ { + "type": "paypal", + "url": "https://paypal.me/faisalman" - } - ], - "license": "MIT" - }, -- "node_modules/safe-regex-test": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", -- "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", ++ } ++ ], ++ "license": "MIT" ++ }, + "node_modules/ua-parser-js": { + "version": "1.0.40", + "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz", @@ -17373,47 +16743,15 @@ index 2af3a0d1..5c5f4b73 100644 + "url": "https://github.com/sponsors/faisalman" + } + ], - "license": "MIT", -- "dependencies": { -- "call-bound": "^1.0.2", -- "es-errors": "^1.3.0", -- "is-regex": "^1.2.1" ++ "license": "MIT", + "bin": { + "ua-parser-js": "script/cli.js" }, "engines": { - "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" + "node": "*" - } - }, -- "node_modules/safer-buffer": { -- "version": "2.1.2", -- "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", -- "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", -- "license": "MIT" -- }, -- "node_modules/send": { -- "version": "0.19.2", -- "resolved": "https://registry.npmjs.org/send/-/send-0.19.2.tgz", -- "integrity": "sha512-VMbMxbDeehAxpOtWJXlcUS5E8iXh6QmN+BkRX1GARS3wRaXEEgzCcB10gTQazO42tpNIya8xIyNx8fll1OFPrg==", -- "license": "MIT", -- "dependencies": { -- "debug": "2.6.9", -- "depd": "2.0.0", -- "destroy": "1.2.0", -- "encodeurl": "~2.0.0", -- "escape-html": "~1.0.3", -- "etag": "~1.8.1", -- "fresh": "~0.5.2", -- "http-errors": "~2.0.1", -- "mime": "1.6.0", -- "ms": "2.1.3", -- "on-finished": "~2.4.1", -- "range-parser": "~1.2.1", -- "statuses": "~2.0.2" ++ } ++ }, + "node_modules/uglify-js": { + "version": "3.19.3", + "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", @@ -17423,42 +16761,33 @@ index 2af3a0d1..5c5f4b73 100644 + "bin": { + "uglifyjs": "bin/uglifyjs" }, - "engines": { -- "node": ">= 0.8.0" +- "funding": { +- "url": "https://github.com/sponsors/ljharb" ++ "engines": { + "node": ">=0.8.0" } }, -- "node_modules/send/node_modules/ms": { -- "version": "2.1.3", -- "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", -- "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", -- "license": "MIT" -- }, -- "node_modules/serve-static": { -- "version": "1.16.3", -- "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.3.tgz", -- "integrity": "sha512-x0RTqQel6g5SY7Lg6ZreMmsOzncHFU7nhnRWkKgWuMTu5NN0DR5oruckMqRvacAN9d5w6ARnRBXl9xhDCgfMeA==", +- "node_modules/side-channel-weakmap": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", +- "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", + "node_modules/uid-safe": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", + "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", "license": "MIT", "dependencies": { -- "encodeurl": "~2.0.0", -- "escape-html": "~1.0.3", -- "parseurl": "~1.3.3", -- "send": "~0.19.1" +- "call-bound": "^1.0.2", +- "es-errors": "^1.3.0", +- "get-intrinsic": "^1.2.5", +- "object-inspect": "^1.13.3", +- "side-channel-map": "^1.0.1" + "random-bytes": "~1.0.0" - }, - "engines": { -- "node": ">= 0.8.0" ++ }, ++ "engines": { + "node": ">= 0.8" - } - }, -- "node_modules/set-function-length": { -- "version": "1.2.2", -- "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", -- "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", ++ } ++ }, + "node_modules/uid2": { + "version": "0.0.4", + "resolved": "https://registry.npmjs.org/uid2/-/uid2-0.0.4.tgz", @@ -17470,15 +16799,9 @@ index 2af3a0d1..5c5f4b73 100644 + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", + "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", - "license": "MIT", ++ "license": "MIT", + "optional": true, - "dependencies": { -- "define-data-property": "^1.1.4", -- "es-errors": "^1.3.0", -- "function-bind": "^1.1.2", -- "get-intrinsic": "^1.2.4", -- "gopd": "^1.0.1", -- "has-property-descriptors": "^1.0.2" ++ "dependencies": { + "call-bound": "^1.0.3", + "has-bigints": "^1.0.2", + "has-symbols": "^1.1.0", @@ -17486,35 +16809,39 @@ index 2af3a0d1..5c5f4b73 100644 }, "engines": { "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" +@@ -2130,336 +15417,511 @@ + "url": "https://github.com/sponsors/ljharb" } }, -- "node_modules/setprototypeof": { -- "version": "1.2.0", -- "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", -- "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", -- "license": "ISC" +- "node_modules/signal-exit": { +- "version": "4.1.0", +- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", +- "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", +- "license": "ISC", + "node_modules/undici": { + "version": "6.24.1", + "resolved": "https://registry.npmjs.org/undici/-/undici-6.24.1.tgz", + "integrity": "sha512-sC+b0tB1whOCzbtlx20fx3WgCXwkW627p4EA9uM+/tNNPkSS+eSEld6pAs9nDv7WbY1UUljBMYPtu9BCOrCWKA==", + "license": "MIT", + "optional": true, -+ "engines": { + "engines": { +- "node": ">=14" +- }, +- "funding": { +- "url": "https://github.com/sponsors/isaacs" + "node": ">=18.17" -+ } + } }, -- "node_modules/shebang-command": { -- "version": "2.0.0", -- "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", -- "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", +- "node_modules/source-map": { +- "version": "0.6.1", +- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", +- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", +- "license": "BSD-3-Clause", + "node_modules/undici-types": { -+ "version": "7.19.2", -+ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.19.2.tgz", -+ "integrity": "sha512-qYVnV5OEm2AW8cJMCpdV20CDyaN3g0AjDlOGf1OW4iaDEx8MwdtChUp4zu4H0VP3nDRF/8RKWH+IPp9uW0YGZg==", - "license": "MIT", ++ "version": "8.3.0", ++ "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", ++ "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", ++ "license": "MIT", + "optional": true + }, + "node_modules/unidecode": { @@ -17522,7 +16849,8 @@ index 2af3a0d1..5c5f4b73 100644 + "resolved": "https://registry.npmjs.org/unidecode/-/unidecode-0.1.8.tgz", + "integrity": "sha512-SdoZNxCWpN2tXTCrGkPF/0rL2HEq+i2gwRG1ReBvx8/0yTzC3enHfugOf8A9JBShVwwrRIkLX0YcDUGbzjbVCA==", + "optional": true, -+ "engines": { + "engines": { +- "node": ">=0.10.0" + "node": ">= 0.4.12" + } + }, @@ -17532,51 +16860,63 @@ index 2af3a0d1..5c5f4b73 100644 + "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==", + "license": "ISC", + "optional": true, - "dependencies": { -- "shebang-regex": "^3.0.0" -- }, ++ "dependencies": { + "unique-slug": "^2.0.0" -+ } -+ }, + } + }, +- "node_modules/statuses": { + "node_modules/unique-slug": { -+ "version": "2.0.2", + "version": "2.0.2", +- "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", +- "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", +- "license": "MIT", +- "engines": { +- "node": ">= 0.8" + "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz", + "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==", + "license": "ISC", + "optional": true, + "dependencies": { + "imurmurhash": "^0.1.4" -+ } -+ }, + } + }, +- "node_modules/streamx": { +- "version": "2.23.0", +- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", +- "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", + "node_modules/universalify": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz", + "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==", -+ "license": "MIT", + "license": "MIT", +- "dependencies": { +- "events-universal": "^1.0.0", +- "fast-fifo": "^1.3.2", +- "text-decoder": "^1.1.0" + "optional": true, - "engines": { -- "node": ">=8" ++ "engines": { + "node": ">= 4.0.0" } }, -- "node_modules/shebang-regex": { -- "version": "3.0.0", -- "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", -- "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", +- "node_modules/string_decoder": { +- "version": "1.3.0", +- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", +- "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", + "node_modules/unpipe": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", + "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "license": "MIT", - "engines": { -- "node": ">=8" +- "dependencies": { +- "safe-buffer": "~5.2.0" ++ "engines": { + "node": ">= 0.8" } }, -- "node_modules/side-channel": { -- "version": "1.1.0", -- "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", -- "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", +- "node_modules/string-width": { +- "version": "5.1.2", +- "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", +- "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", + "node_modules/update-browserslist-db": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.2.3.tgz", @@ -17598,28 +16938,40 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "es-errors": "^1.3.0", -- "object-inspect": "^1.13.3", -- "side-channel-list": "^1.0.0", -- "side-channel-map": "^1.0.1", -- "side-channel-weakmap": "^1.0.2" +- "eastasianwidth": "^0.2.0", +- "emoji-regex": "^9.2.2", +- "strip-ansi": "^7.0.1" + "escalade": "^3.2.0", + "picocolors": "^1.1.1" -+ }, + }, +- "engines": { +- "node": ">=12" + "bin": { + "update-browserslist-db": "cli.js" }, +- "funding": { +- "url": "https://github.com/sponsors/sindresorhus" + "peerDependencies": { + "browserslist": ">= 4.21.0" -+ } -+ }, + } + }, +- "node_modules/string-width-cjs": { +- "name": "string-width", +- "version": "4.2.3", +- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", +- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", +- "license": "MIT", + "node_modules/uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "license": "BSD-2-Clause", + "optional": true, -+ "dependencies": { + "dependencies": { +- "emoji-regex": "^8.0.0", +- "is-fullwidth-code-point": "^3.0.0", +- "strip-ansi": "^6.0.1" +- }, + "punycode": "^2.1.0" + } + }, @@ -17629,39 +16981,35 @@ index 2af3a0d1..5c5f4b73 100644 + "integrity": "sha512-TRjjM2M83RD9jIIYttNj7ghUQTKSov+WXZbQIMM8DxY1R1QdJEGWNKKMYCxyeOw1p9re2nQ85usM6dPTVtox1g==", + "optional": true, "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "node": ">=8" + "node": "*" } }, -- "node_modules/side-channel-list": { -- "version": "1.0.0", -- "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", -- "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", +- "node_modules/string-width-cjs/node_modules/ansi-regex": { +- "version": "5.0.1", +- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", +- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/url-join": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/url-join/-/url-join-5.0.0.tgz", + "integrity": "sha512-n2huDr9h9yzd6exQVnH/jU5mr+Pfx08LRXXZhkLLetAMESRj+anQsTAh940iMrIetKAmry9coFuZQ2jY8/p3WA==", "license": "MIT", -- "dependencies": { -- "es-errors": "^1.3.0", -- "object-inspect": "^1.13.3" -- }, + "optional": true, "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "node": ">=8" + "node": "^12.20.0 || ^14.13.1 || >=16.0.0" } }, -- "node_modules/side-channel-map": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", -- "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", +- "node_modules/string-width-cjs/node_modules/emoji-regex": { +- "version": "8.0.0", +- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", +- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", +- "license": "MIT" +- }, +- "node_modules/string-width-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==", + "node_modules/url-parse": { + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz", @@ -17669,24 +17017,18 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "call-bound": "^1.0.2", -- "es-errors": "^1.3.0", -- "get-intrinsic": "^1.2.5", -- "object-inspect": "^1.13.3" +- "ansi-regex": "^5.0.1" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "node": ">=8" + "querystringify": "^2.1.1", + "requires-port": "^1.0.0" } }, -- "node_modules/side-channel-weakmap": { -- "version": "1.0.2", -- "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", -- "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", +- "node_modules/strip-ansi": { +- "version": "7.2.0", +- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", +- "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", + "node_modules/url-template": { + "version": "2.0.8", + "resolved": "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz", @@ -17702,52 +17044,39 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "call-bound": "^1.0.2", -- "es-errors": "^1.3.0", -- "get-intrinsic": "^1.2.5", -- "object-inspect": "^1.13.3", -- "side-channel-map": "^1.0.1" +- "ansi-regex": "^6.2.2" + "node-gyp-build": "^4.3.0" }, "engines": { -- "node": ">= 0.4" +- "node": ">=12" - }, - "funding": { -- "url": "https://github.com/sponsors/ljharb" +- "url": "https://github.com/chalk/strip-ansi?sponsor=1" + "node": ">=6.14.2" } }, -- "node_modules/signal-exit": { -- "version": "4.1.0", -- "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", -- "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", -- "license": "ISC", -- "engines": { -- "node": ">=14" -- }, -- "funding": { -- "url": "https://github.com/sponsors/isaacs" -- } +- "node_modules/strip-ansi-cjs": { +- "name": "strip-ansi", +- "version": "6.0.1", +- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", +- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "node_modules/utf8": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/utf8/-/utf8-2.1.2.tgz", + "integrity": "sha512-QXo+O/QkLP/x1nyi54uQiG0XrODxdysuQvE5dtVqv7F5K2Qb6FsN+qbr6KhF5wQ20tfcV3VQp0/2x1e1MRSPWg==", + "license": "MIT", + "optional": true - }, -- "node_modules/source-map": { -- "version": "0.6.1", -- "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", -- "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", -- "license": "BSD-3-Clause", -- "engines": { -- "node": ">=0.10.0" ++ }, + "node_modules/util": { + "version": "0.12.5", + "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", + "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "license": "MIT", -+ "dependencies": { + "license": "MIT", + "dependencies": { +- "ansi-regex": "^5.0.1" +- }, +- "engines": { +- "node": ">=8" + "inherits": "^2.0.3", + "is-arguments": "^1.0.4", + "is-generator-function": "^1.0.7", @@ -17755,10 +17084,10 @@ index 2af3a0d1..5c5f4b73 100644 + "which-typed-array": "^1.1.2" } }, -- "node_modules/statuses": { -- "version": "2.0.2", -- "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", -- "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", +- "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { +- "version": "5.0.1", +- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", +- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "node_modules/util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -17771,50 +17100,45 @@ index 2af3a0d1..5c5f4b73 100644 + "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "license": "MIT", "engines": { -- "node": ">= 0.8" +- "node": ">=8" + "node": ">= 0.4.0" } }, -- "node_modules/streamx": { -- "version": "2.23.0", -- "resolved": "https://registry.npmjs.org/streamx/-/streamx-2.23.0.tgz", -- "integrity": "sha512-kn+e44esVfn2Fa/O0CPFcex27fjIL6MkVae0Mm6q+E6f0hWv578YCERbv+4m02cjxvDsPKLnmxral/rR6lBMAg==", +- "node_modules/tar-stream": { +- "version": "3.1.8", +- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz", +- "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==", + "node_modules/uuid": { + "version": "10.0.0", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-10.0.0.tgz", + "integrity": "sha512-8XkAphELsDnEGrDxUOHB3RGvXz6TeuYSGEZBOjtTtPm2lwhGBjLgOzLHB63IUWfBpNucQjND6d3AOudO+H3RWQ==", ++ "deprecated": "uuid@10 and below is no longer supported. For ESM codebases, update to uuid@latest. For CommonJS codebases, use uuid@11 (but be aware this version will likely be deprecated in 2028).", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], "license": "MIT", - "dependencies": { -- "events-universal": "^1.0.0", -- "fast-fifo": "^1.3.2", -- "text-decoder": "^1.1.0" +- "b4a": "^1.6.4", +- "bare-fs": "^4.5.5", +- "fast-fifo": "^1.2.0", +- "streamx": "^2.15.0" + "optional": true, + "bin": { + "uuid": "dist/bin/uuid" } }, -- "node_modules/string_decoder": { -- "version": "1.3.0", -- "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", -- "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", +- "node_modules/teex": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", +- "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", + "node_modules/uuid-parse": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/uuid-parse/-/uuid-parse-1.1.0.tgz", + "integrity": "sha512-OdmXxA8rDsQ7YpNVbKSJkNzTw2I+S5WsbMDnCtIWSQaosNAcWtFuI/YK1TjzUI6nbkgiqEyh8gWngfcv8Asd9A==", - "license": "MIT", -- "dependencies": { -- "safe-buffer": "~5.2.0" -- } ++ "license": "MIT", + "optional": true - }, -- "node_modules/string-width": { -- "version": "5.1.2", -- "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", -- "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", ++ }, + "node_modules/v8flags": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/v8flags/-/v8flags-3.2.0.tgz", @@ -17822,61 +17146,47 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "eastasianwidth": "^0.2.0", -- "emoji-regex": "^9.2.2", -- "strip-ansi": "^7.0.1" +- "streamx": "^2.12.5" + "homedir-polyfill": "^1.0.1" - }, - "engines": { -- "node": ">=12" -- }, -- "funding": { -- "url": "https://github.com/sponsors/sindresorhus" ++ }, ++ "engines": { + "node": ">= 0.10" } }, -- "node_modules/string-width-cjs": { -- "name": "string-width", -- "version": "4.2.3", -- "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", -- "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", -- "license": "MIT", +- "node_modules/text-decoder": { +- "version": "1.2.7", +- "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz", +- "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==", + "node_modules/validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", -+ "license": "Apache-2.0", + "license": "Apache-2.0", + "optional": true, "dependencies": { -- "emoji-regex": "^8.0.0", -- "is-fullwidth-code-point": "^3.0.0", -- "strip-ansi": "^6.0.1" -- }, -- "engines": { -- "node": ">=8" +- "b4a": "^1.6.4" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, -- "node_modules/string-width-cjs/node_modules/ansi-regex": { -- "version": "5.0.1", -- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", +- "node_modules/thirty-two": { +- "version": "1.0.2", +- "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", +- "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==", + "node_modules/vary": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", + "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", - "license": "MIT", ++ "license": "MIT", "engines": { -- "node": ">=8" +- "node": ">=0.2.6" + "node": ">= 0.8" } }, -- "node_modules/string-width-cjs/node_modules/emoji-regex": { -- "version": "8.0.0", -- "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", -- "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", -- "license": "MIT" +- "node_modules/toidentifier": { +- "version": "1.0.1", +- "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", +- "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", + "node_modules/vasync": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/vasync/-/vasync-2.2.1.tgz", @@ -17884,21 +17194,25 @@ index 2af3a0d1..5c5f4b73 100644 + "engines": [ + "node >=0.6.0" + ], -+ "license": "MIT", + "license": "MIT", +- "engines": { +- "node": ">=0.6" + "optional": true, + "dependencies": { + "verror": "1.10.0" -+ } + } }, -- "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==", +- "node_modules/tsscmp": { +- "version": "1.0.6", +- "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", +- "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==", + "node_modules/vasync/node_modules/core-util-is": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", + "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", "license": "MIT", +- "engines": { +- "node": ">=0.6.x" + "optional": true + }, + "node_modules/vasync/node_modules/verror": { @@ -17910,20 +17224,16 @@ index 2af3a0d1..5c5f4b73 100644 + ], + "license": "MIT", + "optional": true, - "dependencies": { -- "ansi-regex": "^5.0.1" -- }, -- "engines": { -- "node": ">=8" ++ "dependencies": { + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" } }, -- "node_modules/strip-ansi": { -- "version": "7.2.0", -- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.2.0.tgz", -- "integrity": "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w==", +- "node_modules/type-is": { +- "version": "1.6.18", +- "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", +- "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", + "node_modules/verror": { + "version": "1.10.1", + "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.1.tgz", @@ -17931,204 +17241,15 @@ index 2af3a0d1..5c5f4b73 100644 "license": "MIT", + "optional": true, "dependencies": { -- "ansi-regex": "^6.2.2" +- "media-typer": "0.3.0", +- "mime-types": "~2.1.24" + "assert-plus": "^1.0.0", + "core-util-is": "1.0.2", + "extsprintf": "^1.2.0" }, "engines": { -- "node": ">=12" -- }, -- "funding": { -- "url": "https://github.com/chalk/strip-ansi?sponsor=1" -+ "node": ">=0.6.0" - } - }, -- "node_modules/strip-ansi-cjs": { -- "name": "strip-ansi", -- "version": "6.0.1", -- "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", -- "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", -+ "node_modules/verror/node_modules/core-util-is": { -+ "version": "1.0.2", -+ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", -+ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", -+ "license": "MIT", -+ "optional": true -+ }, -+ "node_modules/w3c-xmlserializer": { -+ "version": "4.0.0", -+ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", -+ "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", - "license": "MIT", -+ "optional": true, - "dependencies": { -- "ansi-regex": "^5.0.1" -+ "xml-name-validator": "^4.0.0" - }, - "engines": { -- "node": ">=8" -+ "node": ">=14" - } - }, -- "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { -- "version": "5.0.1", -- "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", -- "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", -+ "node_modules/weak-daemon": { -+ "version": "1.0.3", -+ "resolved": "https://registry.npmjs.org/weak-daemon/-/weak-daemon-1.0.3.tgz", -+ "integrity": "sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==", - "license": "MIT", -+ "optional": true, - "engines": { -- "node": ">=8" -+ "node": ">=4.8.7" - } - }, -- "node_modules/tar-stream": { -- "version": "3.1.8", -- "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-3.1.8.tgz", -- "integrity": "sha512-U6QpVRyCGHva435KoNWy9PRoi2IFYCgtEhq9nmrPPpbRacPs9IH4aJ3gbrFC8dPcXvdSZ4XXfXT5Fshbp2MtlQ==", -- "license": "MIT", -+ "node_modules/web-push": { -+ "version": "3.6.7", -+ "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz", -+ "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==", -+ "license": "MPL-2.0", -+ "optional": true, - "dependencies": { -- "b4a": "^1.6.4", -- "bare-fs": "^4.5.5", -- "fast-fifo": "^1.2.0", -- "streamx": "^2.15.0" -+ "asn1.js": "^5.3.0", -+ "http_ece": "1.2.0", -+ "https-proxy-agent": "^7.0.0", -+ "jws": "^4.0.0", -+ "minimist": "^1.2.5" -+ }, -+ "bin": { -+ "web-push": "src/cli.js" -+ }, -+ "engines": { -+ "node": ">= 16" - } - }, -- "node_modules/teex": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/teex/-/teex-1.0.1.tgz", -- "integrity": "sha512-eYE6iEI62Ni1H8oIa7KlDU6uQBtqr4Eajni3wX7rpfXD8ysFx8z0+dri+KWEPWpBsxXfxu58x/0jvTVT1ekOSg==", -+ "node_modules/web-streams-polyfill": { -+ "version": "3.3.3", -+ "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", -+ "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", - "license": "MIT", -- "dependencies": { -- "streamx": "^2.12.5" -+ "optional": true, -+ "engines": { -+ "node": ">= 8" - } - }, -- "node_modules/text-decoder": { -- "version": "1.2.7", -- "resolved": "https://registry.npmjs.org/text-decoder/-/text-decoder-1.2.7.tgz", -- "integrity": "sha512-vlLytXkeP4xvEq2otHeJfSQIRyWxo/oZGEbXrtEEF9Hnmrdly59sUbzZ/QgyWuLYHctCHxFF4tRQZNQ9k60ExQ==", -- "license": "Apache-2.0", -+ "node_modules/webdav": { -+ "version": "5.9.0", -+ "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.9.0.tgz", -+ "integrity": "sha512-OMJ6wtK1WvCO++aOLoQgE96S8KT4e5aaClWHmHXfFU369r4eyELN569B7EqT4OOUb99mmO58GkyuiCv/Ag6J0Q==", -+ "license": "MIT", -+ "optional": true, - "dependencies": { -- "b4a": "^1.6.4" -- } -- }, -- "node_modules/thirty-two": { -- "version": "1.0.2", -- "resolved": "https://registry.npmjs.org/thirty-two/-/thirty-two-1.0.2.tgz", -- "integrity": "sha512-OEI0IWCe+Dw46019YLl6V10Us5bi574EvlJEOcAkB29IzQ/mYD1A6RyNHLjZPiHCmuodxvgF6U+vZO1L15lxVA==", -+ "@buttercup/fetch": "^0.2.1", -+ "base-64": "^1.0.0", -+ "byte-length": "^1.0.2", -+ "entities": "^6.0.1", -+ "fast-xml-parser": "^5.3.4", -+ "hot-patcher": "^2.0.1", -+ "layerr": "^3.0.0", -+ "md5": "^2.3.0", -+ "minimatch": "^9.0.5", -+ "nested-property": "^4.0.0", -+ "node-fetch": "^3.3.2", -+ "path-posix": "^1.0.0", -+ "url-join": "^5.0.0", -+ "url-parse": "^1.5.10" -+ }, - "engines": { -- "node": ">=0.2.6" -+ "node": ">=14" - } - }, -- "node_modules/toidentifier": { -- "version": "1.0.1", -- "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", -- "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", -- "license": "MIT", -+ "node_modules/webdav/node_modules/entities": { -+ "version": "6.0.1", -+ "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", -+ "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", -+ "license": "BSD-2-Clause", -+ "optional": true, - "engines": { -- "node": ">=0.6" -+ "node": ">=0.12" -+ }, -+ "funding": { -+ "url": "https://github.com/fb55/entities?sponsor=1" - } - }, -- "node_modules/tsscmp": { -- "version": "1.0.6", -- "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", -- "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==", -- "license": "MIT", -+ "node_modules/webidl-conversions": { -+ "version": "7.0.0", -+ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", -+ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", -+ "license": "BSD-2-Clause", -+ "optional": true, - "engines": { -- "node": ">=0.6.x" -+ "node": ">=12" - } - }, -- "node_modules/type-is": { -- "version": "1.6.18", -- "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", -- "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", -- "license": "MIT", -+ "node_modules/websocket": { -+ "version": "1.0.35", -+ "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz", -+ "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==", -+ "license": "Apache-2.0", -+ "optional": true, - "dependencies": { -- "media-typer": "0.3.0", -- "mime-types": "~2.1.24" -+ "bufferutil": "^4.0.1", -+ "debug": "^2.2.0", -+ "es5-ext": "^0.10.63", -+ "typedarray-to-buffer": "^3.1.5", -+ "utf-8-validate": "^5.0.2", -+ "yaeti": "^0.0.6" - }, - "engines": { - "node": ">= 0.6" -+ "node": ">=4.0.0" ++ "node": ">=0.6.0" } }, - "node_modules/ua-client-hints-js": { @@ -18150,7 +17271,13 @@ index 2af3a0d1..5c5f4b73 100644 - } - ], - "license": "MIT" -- }, ++ "node_modules/verror/node_modules/core-util-is": { ++ "version": "1.0.2", ++ "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", ++ "integrity": "sha512-3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ==", ++ "license": "MIT", ++ "optional": true + }, - "node_modules/ua-parser-js": { - "version": "1.0.40", - "resolved": "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-1.0.40.tgz", @@ -18169,103 +17296,218 @@ index 2af3a0d1..5c5f4b73 100644 - "url": "https://github.com/sponsors/faisalman" - } - ], -- "license": "MIT", -- "bin": { -- "ua-parser-js": "script/cli.js" -+ "node_modules/websocket-driver": { -+ "version": "0.7.4", -+ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz", -+ "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==", -+ "license": "Apache-2.0", ++ "node_modules/w3c-xmlserializer": { ++ "version": "4.0.0", ++ "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz", ++ "integrity": "sha512-d+BFHzbiCx6zGfz0HyQ6Rg69w9k19nviJspaj4yNscGjrHu94sVP+aRm75yEbCh+r2/yR+7q6hux9LVtbuTGBw==", ++ "license": "MIT", + "optional": true, + "dependencies": { -+ "http-parser-js": ">=0.5.1", -+ "safe-buffer": ">=5.1.0", -+ "websocket-extensions": ">=0.1.1" ++ "xml-name-validator": "^4.0.0" ++ }, ++ "engines": { ++ "node": ">=14" ++ } ++ }, ++ "node_modules/weak-daemon": { ++ "version": "1.0.3", ++ "resolved": "https://registry.npmjs.org/weak-daemon/-/weak-daemon-1.0.3.tgz", ++ "integrity": "sha512-9OLYp5qQSxpnTIyuA1zJ7at3DV2DSBcbdXduC/3QFPeYjF30Lh1nfBrG+VLf4QUvZPz2lXFPu08oIRzWQfucVQ==", + "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=4.8.7" ++ } ++ }, ++ "node_modules/web-push": { ++ "version": "3.6.7", ++ "resolved": "https://registry.npmjs.org/web-push/-/web-push-3.6.7.tgz", ++ "integrity": "sha512-OpiIUe8cuGjrj3mMBFWY+e4MMIkW3SVT+7vEIjvD9kejGUypv8GPDf84JdPWskK8zMRIJ6xYGm+Kxr8YkPyA0A==", ++ "license": "MPL-2.0", ++ "optional": true, ++ "dependencies": { ++ "asn1.js": "^5.3.0", ++ "http_ece": "1.2.0", ++ "https-proxy-agent": "^7.0.0", ++ "jws": "^4.0.0", ++ "minimist": "^1.2.5" ++ }, + "bin": { +- "ua-parser-js": "script/cli.js" ++ "web-push": "src/cli.js" }, "engines": { - "node": "*" -+ "node": ">=0.8.0" ++ "node": ">= 16" } }, - "node_modules/uglify-js": { - "version": "3.19.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", - "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", -- "license": "BSD-2-Clause", -+ "node_modules/websocket-extensions": { -+ "version": "0.1.4", -+ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", -+ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", -+ "license": "Apache-2.0", ++ "node_modules/web-streams-polyfill": { ++ "version": "3.3.3", ++ "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz", ++ "integrity": "sha512-d2JWLCivmZYTSIoge9MsgFCZrt571BikcWGYkjC1khllbTeDlGqZ2D8vD8E/lJa8WGWbb7Plm8/XJYV7IJHZZw==", ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">= 8" ++ } ++ }, ++ "node_modules/webdav": { ++ "version": "5.10.0", ++ "resolved": "https://registry.npmjs.org/webdav/-/webdav-5.10.0.tgz", ++ "integrity": "sha512-fVPuRLtcduVGvSO7Tn/6TQCzIvI/g6BO/+xPRctCvi/GytYpjn4czxWbh4HsArsdom9qz9BI63k9/v2HBUui1A==", ++ "license": "MIT", ++ "optional": true, ++ "dependencies": { ++ "@buttercup/fetch": "^0.2.1", ++ "base-64": "^1.0.0", ++ "byte-length": "^1.0.2", ++ "entities": "^6.0.1", ++ "fast-xml-parser": "^5.7.2", ++ "hot-patcher": "^2.0.1", ++ "layerr": "^3.0.0", ++ "md5": "^2.3.0", ++ "minimatch": "^9.0.9", ++ "nested-property": "^4.0.0", ++ "node-fetch": "^3.3.2", ++ "path-posix": "^1.0.0", ++ "url-join": "^5.0.0", ++ "url-parse": "^1.5.10" ++ }, ++ "engines": { ++ "node": ">=14" ++ } ++ }, ++ "node_modules/webdav/node_modules/entities": { ++ "version": "6.0.1", ++ "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", ++ "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", + "license": "BSD-2-Clause", "optional": true, - "bin": { - "uglifyjs": "bin/uglifyjs" -- }, ++ "engines": { ++ "node": ">=0.12" + }, ++ "funding": { ++ "url": "https://github.com/fb55/entities?sponsor=1" ++ } ++ }, ++ "node_modules/webidl-conversions": { ++ "version": "7.0.0", ++ "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz", ++ "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==", ++ "license": "BSD-2-Clause", ++ "optional": true, "engines": { - "node": ">=0.8.0" +- "node": ">=0.8.0" ++ "node": ">=12" } }, - "node_modules/uid-safe": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.5.tgz", - "integrity": "sha512-KPHm4VL5dDXKz01UuEd88Df+KzynaohSL9fBh096KWAxSKZQDI2uBrVqtvRM4rwrIrRRKsdLNML/lnaaVSRioA==", +- "license": "MIT", ++ "node_modules/websocket": { ++ "version": "1.0.35", ++ "resolved": "https://registry.npmjs.org/websocket/-/websocket-1.0.35.tgz", ++ "integrity": "sha512-/REy6amwPZl44DDzvRCkaI1q1bIiQB0mEFQLUrhz3z2EK91cp3n72rAjUlrTP0zV22HJIUOVHQGPxhFRjxjt+Q==", ++ "license": "Apache-2.0", ++ "optional": true, + "dependencies": { +- "random-bytes": "~1.0.0" ++ "bufferutil": "^4.0.1", ++ "debug": "^2.2.0", ++ "es5-ext": "^0.10.63", ++ "typedarray-to-buffer": "^3.1.5", ++ "utf-8-validate": "^5.0.2", ++ "yaeti": "^0.0.6" + }, + "engines": { +- "node": ">= 0.8" ++ "node": ">=4.0.0" + } + }, +- "node_modules/unpipe": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", +- "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", ++ "node_modules/websocket-driver": { ++ "version": "0.7.5", ++ "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.5.tgz", ++ "integrity": "sha512-ZL2+3c7kMBdIRCMz6l8jQMHyGVxj+UL+xVk74Ombiciboca8rHa15L86B19E5oh1pL9Ii/uj54gtsIrZGMo6zA==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "dependencies": { ++ "http-parser-js": ">=0.5.1", ++ "safe-buffer": ">=5.1.0", ++ "websocket-extensions": ">=0.1.1" ++ }, ++ "engines": { ++ "node": ">=0.8.0" ++ } ++ }, ++ "node_modules/websocket-extensions": { ++ "version": "0.1.4", ++ "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz", ++ "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==", ++ "license": "Apache-2.0", ++ "optional": true, ++ "engines": { ++ "node": ">=0.8.0" ++ } ++ }, + "node_modules/whatwg-encoding": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz", + "integrity": "sha512-p41ogyeMUrw3jWclHWTQg1k05DSVXPLcVxRTYsXUk+ZooOCZLcoYgPZ/HL/D/N+uQPOtcp1me1WhBEaX02mhWg==", + "deprecated": "Use @exodus/bytes instead for a more spec-conformant and faster implementation", "license": "MIT", -+ "optional": true, - "dependencies": { -- "random-bytes": "~1.0.0" -+ "iconv-lite": "0.6.3" - }, - "engines": { -- "node": ">= 0.8" -+ "node": ">=12" - } - }, -- "node_modules/unpipe": { -- "version": "1.0.0", -- "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", -- "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", -+ "node_modules/whatwg-encoding/node_modules/iconv-lite": { -+ "version": "0.6.3", -+ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", -+ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", - "license": "MIT", + "optional": true, + "dependencies": { -+ "safer-buffer": ">= 2.1.2 < 3.0.0" ++ "iconv-lite": "0.6.3" + }, "engines": { - "node": ">= 0.8" -+ "node": ">=0.10.0" ++ "node": ">=12" } }, - "node_modules/util": { - "version": "0.12.5", - "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz", - "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==", -+ "node_modules/whatwg-fetch": { -+ "version": "3.6.20", -+ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", -+ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==", ++ "node_modules/whatwg-encoding/node_modules/iconv-lite": { ++ "version": "0.6.3", ++ "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", ++ "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", -- "dependencies": { ++ "optional": true, + "dependencies": { - "inherits": "^2.0.3", - "is-arguments": "^1.0.4", - "is-generator-function": "^1.0.7", - "is-typed-array": "^1.1.3", - "which-typed-array": "^1.1.2" -- } -- }, ++ "safer-buffer": ">= 2.1.2 < 3.0.0" ++ }, ++ "engines": { ++ "node": ">=0.10.0" + } + }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" ++ "node_modules/whatwg-fetch": { ++ "version": "3.6.20", ++ "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.20.tgz", ++ "integrity": "sha512-EqhiFU6daOA8kpjOWTL0olhVOF3i7OrFzSYiGsEMB8GcXS+RrzauAERX65xMeNWVqxA6HXH2m69Z9LaKKdisfg==", ++ "license": "MIT", + "optional": true }, - "node_modules/utils-merge": { @@ -18303,7 +17545,7 @@ index 2af3a0d1..5c5f4b73 100644 } }, "node_modules/which": { -@@ -2477,6 +16618,87 @@ +@@ -2477,6 +15939,87 @@ "node": ">= 8" } }, @@ -18391,20 +17633,15 @@ index 2af3a0d1..5c5f4b73 100644 "node_modules/which-typed-array": { "version": "1.1.20", "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.20.tgz", -@@ -2492,10 +16714,143 @@ - "has-tostringtag": "^1.0.2" - }, - "engines": { -- "node": ">= 0.4" -- }, -- "funding": { -- "url": "https://github.com/sponsors/ljharb" -+ "node": ">= 0.4" -+ }, -+ "funding": { -+ "url": "https://github.com/sponsors/ljharb" -+ } -+ }, +@@ -2498,11 +16041,181 @@ + "url": "https://github.com/sponsors/ljharb" + } + }, +- "node_modules/wordwrap": { +- "version": "1.0.0", +- "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", +- "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", +- "license": "MIT" + "node_modules/wide-align": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/wide-align/-/wide-align-1.1.5.tgz", @@ -18536,13 +17773,14 @@ index 2af3a0d1..5c5f4b73 100644 + }, + "engines": { + "node": ">= 6" - } - }, - "node_modules/wordwrap": { -@@ -2504,6 +16859,43 @@ - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", - "license": "MIT" - }, ++ } ++ }, ++ "node_modules/wordwrap": { ++ "version": "1.0.0", ++ "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", ++ "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", ++ "license": "MIT" ++ }, + "node_modules/worker-timers": { + "version": "7.1.8", + "resolved": "https://registry.npmjs.org/worker-timers/-/worker-timers-7.1.8.tgz", @@ -18579,11 +17817,10 @@ index 2af3a0d1..5c5f4b73 100644 + "@babel/runtime": "^7.24.5", + "tslib": "^2.6.2" + } -+ }, + }, "node_modules/wrap-ansi": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", -@@ -2595,6 +16987,32 @@ +@@ -2595,6 +16308,32 @@ "node": ">=8" } }, @@ -18616,7 +17853,7 @@ index 2af3a0d1..5c5f4b73 100644 "node_modules/ws": { "version": "8.18.3", "resolved": "https://registry.npmjs.org/ws/-/ws-8.18.3.tgz", -@@ -2616,6 +17034,251 @@ +@@ -2616,6 +16355,267 @@ } } }, @@ -18668,6 +17905,22 @@ index 2af3a0d1..5c5f4b73 100644 + "node": ">=12" + } + }, ++ "node_modules/xml-naming": { ++ "version": "0.1.0", ++ "resolved": "https://registry.npmjs.org/xml-naming/-/xml-naming-0.1.0.tgz", ++ "integrity": "sha512-k8KO9hrMyNk6tUWqUfkTEZbezRRpONVOzUTnc97VnCvyj6Tf9lyUR9EDAIeiVLv56jsMcoXEwjW8Kv5yPY52lw==", ++ "funding": [ ++ { ++ "type": "github", ++ "url": "https://github.com/sponsors/NaturalIntelligence" ++ } ++ ], ++ "license": "MIT", ++ "optional": true, ++ "engines": { ++ "node": ">=16.0.0" ++ } ++ }, + "node_modules/xml2js": { + "version": "0.6.2", + "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", @@ -18781,9 +18034,9 @@ index 2af3a0d1..5c5f4b73 100644 + "optional": true + }, + "node_modules/yargs": { -+ "version": "17.7.2", -+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", -+ "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", ++ "version": "17.7.3", ++ "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", ++ "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", + "license": "MIT", + "optional": true, + "dependencies": { @@ -18868,7 +18121,7 @@ index 2af3a0d1..5c5f4b73 100644 "node_modules/yauzl": { "version": "2.10.0", "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.10.0.tgz", -@@ -2635,6 +17298,26 @@ +@@ -2635,6 +16635,26 @@ "node": "*" } }, @@ -18895,7 +18148,7 @@ index 2af3a0d1..5c5f4b73 100644 "node_modules/zip-stream": { "version": "6.0.1", "resolved": "https://registry.npmjs.org/zip-stream/-/zip-stream-6.0.1.tgz", -@@ -2648,6 +17331,158 @@ +@@ -2648,6 +16668,158 @@ "engines": { "node": ">= 14" } @@ -19055,7 +18308,7 @@ index 2af3a0d1..5c5f4b73 100644 } } diff --git a/package.json b/package.json -index df713ddb..4a0d3fae 100644 +index dac5821d..1c10d82c 100644 --- a/package.json +++ b/package.json @@ -56,6 +56,65 @@ @@ -19122,8 +18375,8 @@ index df713ddb..4a0d3fae 100644 + "zulip": "^0.1.0" + }, "engines": { - "node": ">=16.0.0" + "node": ">=20.0.0" }, -- -2.51.2 +2.54.0 diff --git a/pkgs/by-name/me/meshcentral/package.nix b/pkgs/by-name/me/meshcentral/package.nix index b42126860b79..568b41107e93 100644 --- a/pkgs/by-name/me/meshcentral/package.nix +++ b/pkgs/by-name/me/meshcentral/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "meshcentral"; - version = "1.1.59"; + version = "1.2.0"; src = fetchFromGitHub { owner = "Ylianst"; repo = "MeshCentral"; tag = finalAttrs.version; - hash = "sha256-qfiIofwFOXHzxnqyJyXCgwMqBhONjBiU/5YLOE7u4n8="; + hash = "sha256-a+vqNjmKP866O2t+UsedpgYtWFbjeoYNtuCziAa436A="; }; - npmDepsHash = "sha256-UYPx3OIeT1HUgyjY743F/DTwsfIRTlsQLJxK99LbA/k="; + npmDepsHash = "sha256-ZnSpqw4pn6OI8Gh9qLseTLH24jtj1zPGfHiMlUX+l/s="; # Using the npmDeps with a newer nodejs causes `npm ci` errors, also upstream # states they stick to the LTS version of nodejs: # https://meshcentral.com/docs/MeshCentral2InstallGuide.pdf diff --git a/pkgs/by-name/me/meshoptimizer/package.nix b/pkgs/by-name/me/meshoptimizer/package.nix index 15f6638d90ca..7e781ffd44be 100644 --- a/pkgs/by-name/me/meshoptimizer/package.nix +++ b/pkgs/by-name/me/meshoptimizer/package.nix @@ -17,12 +17,12 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "meshoptimizer"; - version = "1.1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "zeux"; repo = "meshoptimizer"; rev = "v${finalAttrs.version}"; - hash = "sha256-h5lO3HHPtGYuzAZlRwXugvCsjtSMj9j2Z7xCRHQU8xY="; + hash = "sha256-1dHT4+aOwIY3DUrj6JwcDizRPWwL/PWkEcpmA8zD/vE="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/me/meson/package.nix b/pkgs/by-name/me/meson/package.nix index 4f48831753c4..edd39a451200 100644 --- a/pkgs/by-name/me/meson/package.nix +++ b/pkgs/by-name/me/meson/package.nix @@ -72,11 +72,11 @@ python3.pkgs.buildPythonApplication rec { if python3.isPyPy then '' substituteInPlace mesonbuild/modules/python.py \ - --replace-fail "PythonExternalProgram('python3', mesonlib.python_command)" \ - "PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command)" + --replace-fail "PythonExternalProgram('python3', mesonlib.python_command" \ + "PythonExternalProgram('${python3.meta.mainProgram}', mesonlib.python_command" substituteInPlace mesonbuild/modules/python3.py \ - --replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3')" \ - "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}')" + --replace-fail "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, 'python3'" \ + "state.environment.lookup_binary_entry(mesonlib.MachineChoice.HOST, '${python3.meta.mainProgram}'" substituteInPlace "test cases"/*/*/*.py "test cases"/*/*/*/*.py \ --replace-quiet '#!/usr/bin/env python3' '#!/usr/bin/env pypy3' \ --replace-quiet '#! /usr/bin/env python3' '#!/usr/bin/env pypy3' @@ -141,6 +141,8 @@ python3.pkgs.buildPythonApplication rec { ++ lib.optionals python3.isPyPy [ # fails for unknown reason "test cases/python/4 custom target depends extmodule" + # we patch the path to the binary... + "test cases/common/26 find program" ] )) ++ [ diff --git a/pkgs/by-name/me/meson/setup-hook.sh b/pkgs/by-name/me/meson/setup-hook.sh index a9feb15eedd3..4eac58193142 100644 --- a/pkgs/by-name/me/meson/setup-hook.sh +++ b/pkgs/by-name/me/meson/setup-hook.sh @@ -63,16 +63,22 @@ mesonCheckPhase() { flagsArray+=("--timeout-multiplier=0") fi - # Parallel checking is enabled by default. + # Parallel building is enabled by default. local buildCores=1 - if [ "${enableParallelChecking-1}" ]; then + if [ "${enableParallelBuilding-1}" ]; then buildCores="$NIX_BUILD_CORES" fi TERM=dumb ninja -j"$buildCores" $ninjaFlags "${ninjaFlagsArray[@]}" meson-test-prereq + # Parallel checking is enabled by default. + local testCores=1 + if [ "${enableParallelChecking-1}" ]; then + testCores="$NIX_BUILD_CORES" + fi + echoCmd 'mesonCheckPhase flags' "${flagsArray[@]}" - meson test --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}" + meson test -j"$testCores" --no-rebuild --print-errorlogs --max-lines=1000000 "${flagsArray[@]}" runHook postCheck } diff --git a/pkgs/by-name/me/messer-slim/package.nix b/pkgs/by-name/me/messer-slim/package.nix index 93f74a7820e9..84ab01605fae 100644 --- a/pkgs/by-name/me/messer-slim/package.nix +++ b/pkgs/by-name/me/messer-slim/package.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { description = "Evolutionary simulation framework"; homepage = "https://messerlab.org/slim/"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ bzizou ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/me/metal-cli/package.nix b/pkgs/by-name/me/metal-cli/package.nix index 81d1daf470b3..159e413645af 100644 --- a/pkgs/by-name/me/metal-cli/package.nix +++ b/pkgs/by-name/me/metal-cli/package.nix @@ -48,9 +48,7 @@ buildGoModule (finalAttrs: { homepage = "https://github.com/equinix/metal-cli/"; changelog = "https://github.com/equinix/metal-cli/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ - teutat3s - ]; + maintainers = [ ]; mainProgram = "metal"; }; }) diff --git a/pkgs/by-name/me/metals/package.nix b/pkgs/by-name/me/metals/package.nix index f33fd0036989..109b53fd8e94 100644 --- a/pkgs/by-name/me/metals/package.nix +++ b/pkgs/by-name/me/metals/package.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "metals"; - version = "1.6.7"; + version = "1.6.8"; deps = stdenv.mkDerivation { name = "metals-deps-${finalAttrs.version}"; @@ -23,7 +23,7 @@ stdenv.mkDerivation (finalAttrs: { ''; outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-2ly1vO+06EalQjEekRwm/g2wfdbq26IcEQscfM14Gvc="; + outputHash = "sha256-LdZ6I7zOUTHgS/TTo0T6Dh+Kb3YpgJg8gK0UngsA7Gs="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/me/metapac/package.nix b/pkgs/by-name/me/metapac/package.nix index dc9c7de6eade..3d59bf23ceca 100644 --- a/pkgs/by-name/me/metapac/package.nix +++ b/pkgs/by-name/me/metapac/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "metapac"; - version = "0.9.4"; + version = "0.10.0"; src = fetchFromGitHub { owner = "ripytide"; repo = "metapac"; tag = "v${finalAttrs.version}"; - hash = "sha256-Cr9Ui1nnCrjWZkXiFc1tDRWToJYVuUSVK4VPwFzXW2E="; + hash = "sha256-zp45oaLRHv6NdBQEpTEtG93gF04V8YayluXO2IV8LkI="; }; - cargoHash = "sha256-ByaCeWfcGmTiQKz3DdSQMAaCGwJTjNOLxDljfM46LRk="; + cargoHash = "sha256-sw9MPnhbQPifkDJoO33RbMBtTsSyRmuiNVyjlteAAcM="; nativeInstallCheckInputs = [ versionCheckHook ]; doInstallCheck = true; diff --git a/pkgs/by-name/me/meteor/package.nix b/pkgs/by-name/me/meteor/package.nix index 59f7148ad3f8..499113461bd7 100644 --- a/pkgs/by-name/me/meteor/package.nix +++ b/pkgs/by-name/me/meteor/package.nix @@ -20,10 +20,6 @@ let url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.linux.x86_64.tar.gz"; hash = "sha256-tzzRN9UAH7+BM3fs76U5H20vD0LGMpdrMDDiJtchgEg="; }; - x86_64-darwin = fetchurl { - url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.x86_64.tar.gz"; - hash = "sha256-Z9Had9hscEjxHch19KCYUTqN4OikYLfz1tqEpyxw2Y8="; - }; aarch64-darwin = fetchurl { url = "https://static.meteor.com/packages-bootstrap/${version}/meteor-bootstrap-os.osx.arm64.tar.gz"; hash = "sha256-AT7njZTgf/WTHlvLEbF3dXKNoqyqHy8KloBQ4gsbPuM="; diff --git a/pkgs/by-name/mg/mgba/package.nix b/pkgs/by-name/mg/mgba/package.nix index 100ef2405845..651badb289a7 100644 --- a/pkgs/by-name/mg/mgba/package.nix +++ b/pkgs/by-name/mg/mgba/package.nix @@ -102,7 +102,7 @@ stdenv.mkDerivation (finalAttrs: { not support. ''; changelog = "https://raw.githubusercontent.com/mgba-emu/mgba/${finalAttrs.src.rev}/CHANGES"; - license = with lib.licenses; [ mpl20 ]; + license = lib.licenses.mpl20; mainProgram = "mgba"; maintainers = with lib.maintainers; [ Gliczy ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mg/mgmt/package.nix b/pkgs/by-name/mg/mgmt/package.nix index 6a4611a5918e..3928b2ed0c49 100644 --- a/pkgs/by-name/mg/mgmt/package.nix +++ b/pkgs/by-name/mg/mgmt/package.nix @@ -12,16 +12,16 @@ }: buildGoModule (finalAttrs: { pname = "mgmt"; - version = "1.0.2"; + version = "1.1.0"; src = fetchFromGitHub { owner = "purpleidea"; repo = "mgmt"; tag = finalAttrs.version; - hash = "sha256-nLk497gGrZ664VG9/yV6tqTtwAsN8EmuAEh5Vmq95hQ="; + hash = "sha256-jVFIVlytDvfTrAzWkX+pedAq/AcLrCDFtLPx0Wc+XjM="; }; - vendorHash = "sha256-w4j9cJwW2tnjXSnd3w3v81TwHI8tGYiImjG3LZ+Pjuc="; + vendorHash = "sha256-mMRAlqySy6dpRG86p0BHSpYn2gzE8N4sZ3qHiyuttBA="; proxyVendor = true; diff --git a/pkgs/by-name/mi/microcad/package.nix b/pkgs/by-name/mi/microcad/package.nix new file mode 100644 index 000000000000..b731861af064 --- /dev/null +++ b/pkgs/by-name/mi/microcad/package.nix @@ -0,0 +1,54 @@ +{ + lib, + fetchFromCodeberg, + rustPlatform, + pkg-config, + wayland, + cmake, + ninja, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "microcad"; + version = "0.5.0"; + __structuredAttrs = true; + + src = fetchFromCodeberg { + owner = "microcad"; + repo = "microcad"; + tag = "v${finalAttrs.version}"; + hash = "sha256-2164ynL01cLv5/D1FkcZpuBXTHPMjbpeaPPEZpmrSso="; + }; + + cargoHash = "sha256-OwPAl8LirPQEQ8ytx/+9OnrdbUagLA25mGMw1z/L6V0="; + + nativeBuildInputs = [ + cmake + ninja + pkg-config + ]; + buildInputs = [ wayland ]; + cargoBuildFlags = [ + "-p" + "microcad-viewer" + "-p" + "microcad" + "-p" + "microcad-lsp" + ]; + + dontUseCmakeConfigure = true; + dontUseNinjaBuild = true; + dontUseNinjaInstall = true; + dontUseNinjaCheck = true; + + meta = { + description = "Description language for modeling parameterizable geometric objects"; + homepage = "https://microcad.xyz"; + license = lib.licenses.agpl3Plus; + mainProgram = "microcad"; + donationPage = "https://opencollective.com/microcad/donate"; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ fred441a ]; + }; +}) diff --git a/pkgs/by-name/mi/microfetch/package.nix b/pkgs/by-name/mi/microfetch/package.nix index 6ecf01979deb..6ce77db31bfe 100644 --- a/pkgs/by-name/mi/microfetch/package.nix +++ b/pkgs/by-name/mi/microfetch/package.nix @@ -9,25 +9,21 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "microfetch"; - version = "1.1.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "NotAShelf"; repo = "microfetch"; tag = "${finalAttrs.version}"; - hash = "sha256-akJ44+X1POnV1dZnWq66X5vWokp9TGgJ5/Ey6kh/icA="; + hash = "sha256-Hi9U1WqCCoXnZx8ZgT5+fT2grTdNPC73fTAn0l9kzkg="; }; - cargoHash = "sha256-mVS1fv/FI3rDoNm2D7ToiqZJZuySggK2zW2KbbxtpuQ="; + cargoHash = "sha256-7tN5E95uEJBUT1OMAnjkXnbSZjO23KWi8Vc3Cic9nek="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ mold ]; passthru.updateScript = nix-update-script { }; - # For whatever reason the cargo test build in the checkphase attempts to use dynamic libraries. - # Could be wrong, but rectifying this is probably more of an investment than it's worth. - doCheck = false; - meta = { description = "Microscopic fetch script in Rust, for NixOS systems"; homepage = "https://github.com/NotAShelf/microfetch"; @@ -37,6 +33,6 @@ rustPlatform.buildRustPackage (finalAttrs: { NotAShelf ]; mainProgram = "microfetch"; - platforms = lib.platforms.linux; + platforms = lib.platforms.linux ++ [ "aarch64-darwin" ]; }; }) diff --git a/pkgs/by-name/mi/micropython/package.nix b/pkgs/by-name/mi/micropython/package.nix index bb7745fd2849..38df77b5a981 100644 --- a/pkgs/by-name/mi/micropython/package.nix +++ b/pkgs/by-name/mi/micropython/package.nix @@ -67,7 +67,6 @@ stdenv.mkDerivation rec { "armv6l-linux" = "Linux"; "riscv64-linux" = "Linux"; "powerpc64le-linux" = "Linux"; - "x86_64-darwin" = "Darwin"; "aarch64-darwin" = "Darwin"; } .${stdenv.hostPlatform.system} or stdenv.hostPlatform.parsed.kernel.name diff --git a/pkgs/by-name/mi/microsoft-edge/package.nix b/pkgs/by-name/mi/microsoft-edge/package.nix index bb30db2dfd79..c1f04fdda10c 100644 --- a/pkgs/by-name/mi/microsoft-edge/package.nix +++ b/pkgs/by-name/mi/microsoft-edge/package.nix @@ -164,11 +164,11 @@ let in stdenvNoCC.mkDerivation (finalAttrs: { pname = "microsoft-edge"; - version = "149.0.4022.52"; + version = "150.0.4078.83"; 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-3lFhfxkS80P59dk00lpBp+8IIFUvSEJVGGTfAghxw4g="; + hash = "sha256-uTn6/f4Q9eifaJr5/U6i7KmJAtJKxHeaUsdV+omcqlQ="; }; # With strictDeps on, some shebangs were not being patched correctly diff --git a/pkgs/by-name/mi/microsoft-edge/update.py b/pkgs/by-name/mi/microsoft-edge/update.py index d2298c382e6f..1e6419338fce 100755 --- a/pkgs/by-name/mi/microsoft-edge/update.py +++ b/pkgs/by-name/mi/microsoft-edge/update.py @@ -1,7 +1,7 @@ #! /usr/bin/env nix-shell #! nix-shell -i python3 -p python3Packages.packaging python3Packages.python-debian common-updater-scripts -import os +import subprocess from collections import OrderedDict from os.path import abspath, dirname from urllib import request @@ -39,8 +39,8 @@ def write_expression(): version = Version.re_valid_version.match(latest["stable"]["Version"]).group( "upstream_version" ) - os.system(f'update-source-version microsoft-edge "{version}"') - os.system(f'update-source-version msedgedriver "{version}"') + subprocess.run(["update-source-version", "microsoft-edge", version]) + subprocess.run(["update-source-version", "msedgedriver", version]) write_expression() diff --git a/pkgs/by-name/mi/microsoft-gsl/package.nix b/pkgs/by-name/mi/microsoft-gsl/package.nix index 868a4b8e9ee7..1f6a66c8ad19 100644 --- a/pkgs/by-name/mi/microsoft-gsl/package.nix +++ b/pkgs/by-name/mi/microsoft-gsl/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "microsoft-gsl"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "Microsoft"; repo = "GSL"; rev = "v${finalAttrs.version}"; - hash = "sha256-rfSfgyjU1U6gaWzlx2CeaCSb784L29vHDAC/PQl+s6E="; + hash = "sha256-nWPjUPDx6Wp2BkREkZV+Nr9AUeUzpKlQ5c1CPp2Ks+M="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mi/middleclick/package.nix b/pkgs/by-name/mi/middleclick/package.nix new file mode 100644 index 000000000000..0ab33594dc9a --- /dev/null +++ b/pkgs/by-name/mi/middleclick/package.nix @@ -0,0 +1,52 @@ +{ + lib, + stdenvNoCC, + fetchurl, + nix-update-script, + unzip, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "middleclick"; + version = "3.2.0"; + + __structuredAttrs = true; + + src = fetchurl { + url = "https://github.com/artginzburg/MiddleClick/releases/download/${finalAttrs.version}/MiddleClick.zip"; + hash = "sha256-6T8XYSp3QTxefO+UI/DcnbFm1m841B14OpkOLqa6aYw="; + }; + + strictDeps = true; + + nativeBuildInputs = [ unzip ]; + + dontUnpack = true; + dontBuild = true; + + # Preserve the upstream Developer ID signature and notarized app bundle. + dontFixup = true; + + installPhase = '' + runHook preInstall + + mkdir -p unpacked "$out/Applications" + unzip -q "$src" -d unpacked + mv unpacked/MiddleClick.app "$out/Applications/" + + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Utility for emulating middle clicks with trackpad and Magic Mouse gestures"; + homepage = "https://github.com/artginzburg/MiddleClick"; + downloadPage = "https://github.com/artginzburg/MiddleClick/releases"; + changelog = "https://github.com/artginzburg/MiddleClick/releases/tag/${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ akosseres ]; + platforms = lib.platforms.darwin; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + }; +}) diff --git a/pkgs/by-name/mi/mieru/package.nix b/pkgs/by-name/mi/mieru/package.nix index d2bc17ed4ad6..ccaa8ebc477b 100644 --- a/pkgs/by-name/mi/mieru/package.nix +++ b/pkgs/by-name/mi/mieru/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "mieru"; - version = "3.33.0"; + version = "3.34.0"; src = fetchFromGitHub { owner = "enfein"; repo = "mieru"; rev = "v${finalAttrs.version}"; - hash = "sha256-26BT/OsA4T6S9xqlux/segQXtqWGR+IgCRG/PwuxquU="; + hash = "sha256-9VjzQ53/oifjXqT/aLaDDy200xyWEU3BBjxP+LM/EKE="; }; vendorHash = "sha256-pKcdvP38fZ2KFYNDx6I4TfmnnvWKzFDvz80xMkUojqM="; diff --git a/pkgs/by-name/mi/mill/package.nix b/pkgs/by-name/mi/mill/package.nix index 3f95a76c87fd..5288b8036f5f 100644 --- a/pkgs/by-name/mi/mill/package.nix +++ b/pkgs/by-name/mi/mill/package.nix @@ -16,7 +16,6 @@ let suffixMap = { aarch64-darwin = "native-mac-aarch64"; - x86_64-darwin = "native-mac-amd64"; aarch64-linux = "native-linux-aarch64"; x86_64-linux = "native-linux-amd64"; }; @@ -26,16 +25,15 @@ let in stdenvNoCC.mkDerivation rec { pname = "mill"; - version = "1.1.2"; + version = "1.1.7"; src = fetchurl { url = "https://repo1.maven.org/maven2/com/lihaoyi/mill-dist-${suffix}/${version}/mill-dist-${suffix}-${version}.exe"; sha256 = { - aarch64-darwin = "sha256-UiooqMbxceUepk4uJV8ZSL1o4VLeTZgWs3URQFXFmQs="; - x86_64-darwin = "sha256-EvIH0GHrdFtE5m6WqHAu7XDJn/8rElpmSxLrdCx5CKY="; - aarch64-linux = "sha256-Az/NCaFVrKANJvgIHx9QlW/fPyFVc4XiJ6BZr4ahfxk="; - x86_64-linux = "sha256-YhygFs8+ffOgoOSpggrYQ+xS19q8koYbN9UnozlLTPY="; + aarch64-darwin = "sha256-tQpV0Goe9Oq16rm14mavS5ELl7z4Bsu7JBVbbFgauPE="; + aarch64-linux = "sha256-lq0mR0lFhl7ESY+BM6kVRjyI3bpZOSwj+bSo37dAkaI="; + x86_64-linux = "sha256-2GSLEvRTlH9QPzkGM52sYiJh6OqXQzn/V0sPQ+SA39s="; } .${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; @@ -118,7 +116,6 @@ stdenvNoCC.mkDerivation rec { "x86_64-linux" "aarch64-linux" "aarch64-darwin" - "x86_64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; diff --git a/pkgs/by-name/mi/miller/package.nix b/pkgs/by-name/mi/miller/package.nix index 9a4633b889f9..147d8cbca1f5 100644 --- a/pkgs/by-name/mi/miller/package.nix +++ b/pkgs/by-name/mi/miller/package.nix @@ -6,13 +6,13 @@ buildGoModule (finalAttrs: { pname = "miller"; - version = "6.18.1"; + version = "6.20.2"; src = fetchFromGitHub { owner = "johnkerl"; repo = "miller"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-pXxXUw956M5EUhL1TFtQp1JTXQwQK9qxp2vjBkozi/0="; + sha256 = "sha256-unzjbPuOmppEY56JnV+A3TZuaHMLNeZS3n7tKpudCXk="; }; outputs = [ @@ -20,7 +20,7 @@ buildGoModule (finalAttrs: { "man" ]; - vendorHash = "sha256-ZnNEOVChF3kizfjti6Cgexvt/5UPIRQsyfUz8c03EKc="; + vendorHash = "sha256-ZA9ueehDXsRI3eEE44hJziWKAAsZXkF77hBkYvX2k+U="; postInstall = '' mkdir -p $man/share/man/man1 diff --git a/pkgs/by-name/mi/mimalloc/package.nix b/pkgs/by-name/mi/mimalloc/package.nix index ed8ba80d66e5..6f4c2362a33e 100644 --- a/pkgs/by-name/mi/mimalloc/package.nix +++ b/pkgs/by-name/mi/mimalloc/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation (finalAttrs: { MI_SECURE = secureBuild; MI_BUILD_SHARED = stdenv.hostPlatform.hasSharedLibraries; MI_LIBC_MUSL = stdenv.hostPlatform.libc == "musl"; - MI_BUILD_TESTS = finalAttrs.doCheck; + MI_BUILD_TESTS = finalAttrs.finalPackage.doCheck; # MI_OPT_ARCH is inaccurate (e.g. it assumes aarch64 == armv8.1-a). # Nixpkgs's native platform configuration does a better job. diff --git a/pkgs/by-name/mi/mimeo/package.nix b/pkgs/by-name/mi/mimeo/package.nix index 5edbcdaab098..4ac69cb3519a 100644 --- a/pkgs/by-name/mi/mimeo/package.nix +++ b/pkgs/by-name/mi/mimeo/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { meta = { description = "Open files by MIME-type or file name using regular expressions"; homepage = "https://xyne.dev/projects/mimeo/"; - license = [ lib.licenses.gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = [ lib.maintainers.rycee ]; platforms = lib.platforms.unix; mainProgram = "mimeo"; diff --git a/pkgs/by-name/mi/mimikatz/package.nix b/pkgs/by-name/mi/mimikatz/package.nix index 665ea7f82975..320ff1c76db9 100644 --- a/pkgs/by-name/mi/mimikatz/package.nix +++ b/pkgs/by-name/mi/mimikatz/package.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/gentilkiwi/mimikatz"; description = "Little tool to play with Windows security"; - license = with lib.licenses; [ cc-by-40 ]; + license = lib.licenses.cc-by-40; maintainers = [ ]; platforms = lib.platforms.all; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mi/mimir/package.nix b/pkgs/by-name/mi/mimir/package.nix index 63312e79cf25..f06783ebd4c5 100644 --- a/pkgs/by-name/mi/mimir/package.nix +++ b/pkgs/by-name/mi/mimir/package.nix @@ -7,13 +7,13 @@ }: buildGoModule (finalAttrs: { pname = "mimir"; - version = "3.1.1"; + version = "3.1.3"; src = fetchFromGitHub { rev = "mimir-${finalAttrs.version}"; owner = "grafana"; repo = "mimir"; - hash = "sha256-Gp4+eVL6HUFlhtAZmDJyHYr/QP0+JQIcDXJfCk2IpCg="; + hash = "sha256-OXzYV42v9coPPp1zbITDOepmccioF+rBfRMoVUZaTeY="; }; vendorHash = null; @@ -67,7 +67,6 @@ buildGoModule (finalAttrs: { maintainers = with lib.maintainers; [ happysalada bryanhonof - adamcstephens ]; }; }) diff --git a/pkgs/by-name/mi/min-ed-launcher/package.nix b/pkgs/by-name/mi/min-ed-launcher/package.nix index 4371bc758479..4d5a8583cdc1 100644 --- a/pkgs/by-name/mi/min-ed-launcher/package.nix +++ b/pkgs/by-name/mi/min-ed-launcher/package.nix @@ -6,13 +6,13 @@ }: buildDotnetModule rec { pname = "min-ed-launcher"; - version = "0.12.2"; + version = "0.13.0"; src = fetchFromGitHub { owner = "rfvgyhn"; repo = "min-ed-launcher"; tag = "v${version}"; - hash = "sha256-jx8R/8mWuluD7ub8J3UqiP4A8k1npBgZpqRti3mhBrM="; + hash = "sha256-blqGq6PORBEtCLO007TR3xJ6UXX8nFSOIoFh8Dc/5B8="; leaveDotGit = true; # During build the current commit is appended to the version }; diff --git a/pkgs/by-name/mi/mindustry/deps.json b/pkgs/by-name/mi/mindustry/deps.json index 7f1b82b2a125..d0782d4a749b 100644 --- a/pkgs/by-name/mi/mindustry/deps.json +++ b/pkgs/by-name/mi/mindustry/deps.json @@ -1,60 +1,31 @@ { "!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.14.1": { - "tar.gz": "sha256-F02eU0AuG/nscnfiLsGZuj5Vpr4sB0DLGMDumFD8jDQ=" - } - }, - "https://github.com": { - "nigels-com/glew/releases/download/glew-2.2.0/glew-2.2.0": { - "zip": "sha256-qQRqkTd0OVoJXtzAsKwtgcOqzKYXh7OYOblB6b4U4NQ=" - } - }, "https://jitpack.io/com/github": { - "Anuken#jabel/0.9.0": { - "jar": "sha256-uFYvq/P7dVZNH8xfSZPmm57JI+h47A7YqOaN3bsFLuo=", - "module": "sha256-r0Hiyh4MXzQkBudNhixHcXf1QOr4GWU841ypzRa0w/g=", - "pom": "sha256-2Zp//AsIqW7/+5ybmtConz5ykh3ZYrFBi6SzLuKTz8A=" + "Anuken#rhino/e74ac129d2bff72c1deb536d7d99a0dbb7046d2e": { + "jar": "sha256-iRvhgKzqoi/8VMmkiM5ibGULv6e07A98e8QoMB6XROQ=", + "module": "sha256-c02sDzu5Z+dMXP2DcCFen9ImCWTtZ2I06uSrrtJ8QIo=", + "pom": "sha256-kUrWd9wtr/SN21fjmyInwRN8CSxp2nKfeji3qz1OteA=" }, - "Anuken#rhino/54b75cbd1207ef1fd5cff517cbd188e763c85baa": { - "jar": "sha256-sZ5zFOXvyOLYEbb/LAQLU2u2S4FZ41T+rFHBfrG5O/Y=", - "module": "sha256-QqoHjAbLp9eza+7r921k2L6bbV8zqjhdkqHhCy1qIkA=", - "pom": "sha256-5xheV+aFDLRgYUS6b7GoGW0b2KSYsA8jY7NPy+Gb+H8=" + "Anuken#steamworks4j/da41c05b7a2a44c8625ca0ba7d6ca1a2e73f621a": { + "jar": "sha256-+8oDVVVbQSpioDAUXKm+vqe3YutsioD4eON7bp9JW0k=", + "pom": "sha256-F0jV/Pn+62IzshAyMgSj/kWaAcs98nH+iFEH4m0D8q0=" }, - "Anuken#steamworks4j/0b86023401880bb5e586bc404bedbaae9b1f1c94": { - "jar": "sha256-YbaPhCjWtlExwQ1dFNA6JrkiAfQYWxJ0VRV9rLnoYhY=", - "pom": "sha256-ktvhk8s3T1zswrYWuXz+cWHRyK3YbkikD5Sv/gjcfz4=" - }, - "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-loader/2.5.1": { - "jar": "sha256-6I+6THOtnaVYhOB4feFo1xkdF25G6T5iJfQyPCTc+Wo=", - "module": "sha256-Sdga7alkfzS4Loy6XAGXvw/+E0AoS6I1HcWD3cBPej4=", - "pom": "sha256-ieP1KOe4XwibX7rqHWJat1iH0saLcvfGjosSbODwKcc=" - }, - "libgdx/gdx-jnigen#gdx-jnigen/2.5.1": { - "jar": "sha256-OeLq815DT4ZtC8d7Ko/3VtV3u7R8Rj8HGX8mQb0eAZw=", - "module": "sha256-nicta1Y8N7VYMmNINhN4BRjsUCljtHv+g1lphUuKno8=", - "pom": "sha256-lpq6D25HGTFHWR3WDgKd4G2irqsk1rnjvMQlqKL1/NM=" + "Anuken/steamworks4j#build/da41c05b7a2a44c8625ca0ba7d6ca1a2e73f621a": { + "jar": "sha256-aUW6wELo6ixScFyjAAACxDsv1pc5Qy22JAxxHfu99ns=", + "module": "sha256-G4us5o9uhVf5uovjADWvn4uzac+lqhNaPIlQgLai2eg=", + "pom": "sha256-gqPxOnpZeJXAWsPvVZr5ja/aoMgxY/3Fp0zHNBuvh5I=" } }, "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=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.3.20": { + "pom": "sha256-OVGM+ut/cxup+D2UpCkwR/U6Th+1KpF1cFddfYzWs04=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": { - "pom": "sha256-HzOk8LbO3qaMYhC518PU/t7EGF2dUIqsqs0933q2Ti8=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.3.20": { + "pom": "sha256-IRkFLEQtpZu0sZW6Ci+dOl91zWp06K4BzR80nfVBX0k=" } }, "https://raw.githubusercontent.com": { @@ -68,28 +39,75 @@ "module": "sha256-LYLf2sMRuwSqec4UpQGJCvdAbJyj6CQHMidx1/QaXrQ=", "pom": "sha256-7o1bwxjqVI5VT8I/gm1Fooq5AEpGqZ4dkaZIQxuHcAc=" }, + "ch/qos/logback#logback-classic/1.4.12": { + "jar": "sha256-S0qZ4ZMbsOpsC2xI1CvEjN42oY6Nycwve4yKI2TC7JM=", + "pom": "sha256-1A/n7uF47GHF9MP5om1v7TJfV0EORmfFIL0OFF+gkpU=" + }, + "ch/qos/logback#logback-core/1.4.14": { + "jar": "sha256-+MLwX0JTCxhSc5UHwXkvAIAWeFDtjzlkRMaRPWYXopM=", + "pom": "sha256-XFBVktFPZqp/F3xpuTPkcE/R1pS2L5ST6peCbvVQAj0=" + }, + "ch/qos/logback#logback-parent/1.4.12": { + "pom": "sha256-PhKCXGfj5aKg6GFY13DslpJOgo+E5DVFSkGiytIWZJ8=" + }, + "ch/qos/logback#logback-parent/1.4.14": { + "pom": "sha256-5bddPe8EJ1dkUEoXp8GqHj7jcKWxpUiIS74Vfr3eXv0=" + }, + "com/badlogicgames/jnigen#jnigen-commons/3.1.1": { + "jar": "sha256-GhpDx0Kwd5H1I6LjAGzkysOnyWC60i3qcE0lf5+5Uic=", + "module": "sha256-h5TNmSGiisv/kGGm6e7jU3JW26POyMo58eKt7d1zG2E=", + "pom": "sha256-lKy0mhhj7cQgfVn6iwc9U1m4PuGhX+eYY0RTlYvaoTQ=" + }, + "com/badlogicgames/jnigen#jnigen-core/3.1.1": { + "jar": "sha256-9sl8HgFko1FKWFPR7+emTKYoXAZis5C6GGEMVRddqOM=", + "module": "sha256-arm2LaOD7BF6rY5Iv4bW2e3SP5Gq6TgJhlrO9vkg+AY=", + "pom": "sha256-ig4v9L0DMgIIumfHwy+YZbn3dKwvz97+nPdHHT2oOl4=" + }, + "com/badlogicgames/jnigen#jnigen-generator/3.1.1": { + "jar": "sha256-ipB6ZfxDED5WNDk7eq8Cc6Iog9AgkoBbyCGrmvMht4E=", + "module": "sha256-l4Y/xRC2r16qspcGcADJsnp2nY2owo56r+SVGEXyc/U=", + "pom": "sha256-/MiUlSd0enOtc7FBjbjjVlW/tfTaIF+GjuEq0rmbQlg=" + }, + "com/badlogicgames/jnigen#jnigen-gradle/3.1.1": { + "jar": "sha256-riahTjGeDivvNIIZdnd6hZ8L0a0omdLioDJ4VT6PXEw=", + "module": "sha256-Smwq0R4Dlv2f5RdgwERw18Zps62iGewN5bttg6pY8pg=", + "pom": "sha256-Yh5nfY9xbZWvlhWI1UFOWJud0YG/KEl7LR75XVf/mV8=" + }, "com/github/javaparser#javaparser-core/3.14.14": { - "jar": "sha256-Z4GYXisXFCvQfhp75Zt5NIXLAms3ZnN30WYQrpgUi24=", "pom": "sha256-70ERyN/Uh+Zp5w1Qzz2z8O3YuTLKvjXmYzuzzuuGpIo=" }, + "com/github/javaparser#javaparser-core/3.26.3": { + "jar": "sha256-okxPp3mf/gx6mvEdTuzXVwmO1EmPhgZ78otGsr/qGDM=", + "pom": "sha256-ZiXjSXeLPDEAJopgk6v0RHLl6WYe85nDNHjYdx+Fgu0=" + }, "com/github/javaparser#javaparser-parent/3.14.14": { "pom": "sha256-RwgtW3eLzkmjEnRtUWHJ48yhfYwh2eO+MTF68Io2FDc=" }, + "com/github/javaparser#javaparser-parent/3.26.3": { + "pom": "sha256-oQvtmKrkapQj/eE719L60v+wIjz/WY/MjbzA72a7wyg=" + }, "com/google/code/findbugs#jsr305/3.0.2": { "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" }, - "com/google/code/gson#gson-parent/2.8.9": { - "pom": "sha256-sW4CbmNCfBlyrQ/GhwPsN5sVduQRuknDL6mjGrC7z/s=" + "com/google/code/gson#gson-parent/2.11.0": { + "pom": "sha256-issfO3Km8CaRasBzW62aqwKT1Sftt7NlMn3vE6k2e3o=" }, - "com/google/code/gson#gson/2.8.9": { - "jar": "sha256-05mSkYVd5JXJTHQ3YbirUXbP6r4oGlqw2OjUUyb9cD4=", - "pom": "sha256-r97W5qaQ+/OtSuZa2jl/CpCl9jCzA9G3QbnJeSb91N4=" + "com/google/code/gson#gson/2.11.0": { + "jar": "sha256-V5KNblpu3rKr03cKj5W6RNzkXzsjt6ncKzCcWBVSp4s=", + "pom": "sha256-wOVHvqmYiI5uJcWIapDnYicryItSdTQ90sBd7Wyi42A=" + }, + "com/google/errorprone#error_prone_annotations/2.27.0": { + "jar": "sha256-JMkjNyxY410LnxagKJKbua7cd1IYZ8J08r0HNd9bofU=", + "pom": "sha256-TKWjXWEjXhZUmsNG0eNFUc3w/ifoSqV+A8vrJV6k5do=" }, "com/google/errorprone#error_prone_annotations/2.28.0": { "jar": "sha256-8/yKOgpAIHBqNzsA5/V8JRLdJtH4PSjH04do+GgrIx4=", "pom": "sha256-DOkJ8TpWgUhHbl7iAPOA+Yx1ugiXGq8V2ylet3WY7zo=" }, + "com/google/errorprone#error_prone_parent/2.27.0": { + "pom": "sha256-+oGCnQSVWd9pJ/nJpv1rvQn4tQ5tRzaucsgwC2w9dlQ=" + }, "com/google/errorprone#error_prone_parent/2.28.0": { "pom": "sha256-rM79u1QWzvX80t3DfbTx/LNKIZPMGlXf5ZcKExs+doM=" }, @@ -120,10 +138,32 @@ "jar": "sha256-g/D9S66+w78p7jrSwCSzBl3e+CWlqin33PXBifn6KWI=", "pom": "sha256-pxrD2PJ8ua0yyHtdiVnyLWca60YMejVdCfV35MV+TF8=" }, + "de/undercouch#gradle-download-task/5.0.1": { + "jar": "sha256-7VONXLvRug+MUcCRaEVg0S4JPuJwyFvDN6emaj97Rcc=", + "pom": "sha256-Pos7wzs3Vgzic+Pp+EZKtfdb9E5jlmEwMpdGrROyAX8=" + }, + "io/github/java-diff-utils#java-diff-utils-parent/4.12": { + "pom": "sha256-2BHPnxGMwsrRMMlCetVcF01MCm8aAKwa4cm8vsXESxk=" + }, + "io/github/java-diff-utils#java-diff-utils/4.12": { + "jar": "sha256-mZCiA5d49rTMlHkBQcKGiGTqzuBiDGxFlFESGpAc1bU=", + "pom": "sha256-wm4JftyOxoBdExmBfSPU5JbMEBXMVdxSAhEtj2qRZfw=" + }, "org/apiguardian#apiguardian-api/1.1.0": { "jar": "sha256-qarp/4rj4XoqGPeRdegrFiZ8JG+708qd+7spCwjc/dQ=", "pom": "sha256-qUW5y1zZt3sscRhE5lnEPsBw71nZ9Qn6n0wYYbSGJxE=" }, + "org/bytedeco#javacpp-presets/1.5.11": { + "pom": "sha256-h5CUm0S86GPsXnwI098BpFQdA2pAUPqw3JqxdCt6fc8=" + }, + "org/bytedeco#javacpp/1.5.11": { + "jar": "sha256-LjzDxddfBtY9+uqDnE8avJc/ty1RgYYBZXHHRnzfhDQ=", + "pom": "sha256-tfBkwcm2a+EJvCvdk2Gj+pRlP77zou/w1lEF0MuAbM8=" + }, + "org/bytedeco#llvm/19.1.3-1.5.11": { + "jar": "sha256-0b34tW7UTg3h9RI3JJ1eTG/A6rCPYIAYLVDIkE9F73g=", + "pom": "sha256-ql73P0v3Pl2WwzEV2fIVJweCBp+BI9NE/qFB3KHOzZU=" + }, "org/checkerframework#checker-qual/3.43.0": { "jar": "sha256-P7wumPBYVMPfFt+auqlVuRsVs+ysM2IyCO1kJGQO8PY=", "module": "sha256-+BYzJyRauGJVMpSMcqkwVIzZfzTWw/6GD6auxaNNebQ=", @@ -133,150 +173,177 @@ "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" }, - "org/jetbrains/intellij/deps#trove4j/1.0.20200330": { - "jar": "sha256-xf1yW/+rUYRr88d9sTg8YKquv+G3/i8A0j/ht98KQ50=", - "pom": "sha256-h3IcuqZaPJfYsbqdIHhA8WTJ/jh1n8nqEP/iZWX40+k=" + "org/jetbrains/kotlin#abi-tools-api/2.3.20": { + "jar": "sha256-U2hfV4OwSQaDiY11Wrrk1Bi26DugYTSFiv3ctZRYmek=", + "pom": "sha256-qIbJ/X8rlmlFf+wCHxnc8V8EY+DbS9rVOuGBJTZsxvk=" }, - "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/2.1.10": { - "jar": "sha256-rWzLNdLrwlw0eUNMGkAhS34juqdz7nYbhAgeWlOHHcE=", - "pom": "sha256-6K//Db8Bs37UdsOwKXRpJOG4X4+F3KNreYUVTARBb1k=" + "org/jetbrains/kotlin#abi-tools/2.3.20": { + "jar": "sha256-R9fBgRPZhYUGWrUky6HEcLTDaTB2l8qdHIEOULk9C9E=", + "pom": "sha256-Pi8inRHuIgaFPTAL/l0R3dzpYFqJ5cmvrwa3Ij0Zh1c=" }, - "org/jetbrains/kotlin#kotlin-build-common/2.1.10": { - "jar": "sha256-mXapS/X6gXTrOY+3Y0u59GUuBVfJhzfLJi7qUKPg4l8=", - "pom": "sha256-zo5bvGb+sXKAsxWzo1WjgeB84qxe1/PVYBeye9RkAwM=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20": { + "module": "sha256-bNjWSw5lN3kE8wb2qFja/ZMcQTUkD4RMk9UpTumP6Dk=", + "pom": "sha256-SgpFTor25QOv5ngwoYVjubaA3u67GhcGoNe0S8UHQKE=" }, - "org/jetbrains/kotlin#kotlin-build-statistics/2.1.10": { - "jar": "sha256-8XMePfcMSH0QB0tGAGQpLY99xwQj1IVkGN2Sb6DaXYM=", - "pom": "sha256-qU9wshjcayKAYaLTq+ERNpMejI9onWsCh8T85Xfb9CM=" + "org/jetbrains/kotlin#fus-statistics-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-pPEKPw6l3dH1VaT3BuCep/VSs8hSK7EAY2HdMG4152o=" }, - "org/jetbrains/kotlin#kotlin-build-tools-api/2.1.10": { - "jar": "sha256-JXFnlQAsewLbzOUQyZFvrn6UaFxIePT3vzxNA+yRqr4=", - "pom": "sha256-nGYMBDRvBWBfxozxgDeda3yDTnO3moOZoNy3Rthah00=" + "org/jetbrains/kotlin#kotlin-annotation-processing-gradle/2.3.20": { + "jar": "sha256-C+KMOeA/kQzQfZzqJkvx5uc06Zm6OvkPkkyaHc1JoNM=", + "pom": "sha256-cEzCAo+0gbjJP95chIAd5HE+52zN+pfU4v5mt8UerKs=" }, - "org/jetbrains/kotlin#kotlin-build-tools-impl/2.1.10": { - "jar": "sha256-ZWZ1x/B9nL28lPCY80lTVx7j7Px7w+JXqAfzgHn6SGk=", - "pom": "sha256-bBzPBAe3L8cRem+iGpzPQzX6qfd/f6YMmpcOogWaOSA=" + "org/jetbrains/kotlin#kotlin-build-statistics/2.3.20": { + "jar": "sha256-ptJ7PINhdlLdBlYG+Yz1nPviY/jCDr5OvVpvJonrDU8=", + "pom": "sha256-nQqNf/FyPV1y00ldVVc9jTxrd3TWHYBXlxT3nCQmX48=" }, - "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.1.10": { - "jar": "sha256-OW8ohW8P1wQyCBk5jVlZp4G98iWy3CrALNUkhELr1bg=", - "pom": "sha256-bec+IDkYqNyV/5qm5l9QIn2eCFPuh1y0o3I8YDz285I=" + "org/jetbrains/kotlin#kotlin-build-tools-api/2.3.20": { + "jar": "sha256-IvGrIjhUuUkJn2slnO9UHVtYo2Q9+aScRXfGPEFuhDs=", + "pom": "sha256-G14LLDaQXcL1XgpLeBKuY+MSXe/PaG0sD0kPg7c9nV4=" }, - "org/jetbrains/kotlin#kotlin-compiler-runner/2.1.10": { - "jar": "sha256-xC0ODpzkT1zzRP8lJoetKvPt3lhGlQAQI5TRN1E8gq8=", - "pom": "sha256-I49shzgP13Q28GBf5yJU7cUFUty5MoLbKFahQZT4s4A=" + "org/jetbrains/kotlin#kotlin-build-tools-compat/2.3.20": { + "jar": "sha256-RMMHtO3UysUflgqBNBEtZkyTB2cAzaXoZulNmkKWNA4=", + "pom": "sha256-rpC+JesEdhCNlo6+Mqjd9SXhQIhYj6BUc9sSgVoPG3Q=" }, - "org/jetbrains/kotlin#kotlin-daemon-client/2.1.10": { - "jar": "sha256-zxinYYIDWuLUjoJZllBSTh4VHnND6KsP0G0GB8QUXNE=", - "pom": "sha256-S3sZUpiHwl0qCtdvAWO2k1qrzzRWQyCDOigoQqZJEKA=" + "org/jetbrains/kotlin#kotlin-build-tools-cri-impl/2.3.20": { + "jar": "sha256-VOztYw8oEkzP4uRk5srMKB5SiopQqJclchVUyWk1SP4=", + "pom": "sha256-5zeMZYHvXw4stA46TOxR0rlj5iVkWpK2fqCVJa+XxMM=" }, - "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.1.10": { - "jar": "sha256-fvo/pbcG6xvbzapHYWRRm58JwtwWgAGUNTSNOc4kvh0=", - "pom": "sha256-MAw4DKEU2HmZEG78T5kRDHrEKxm2utmiSFiwLGzIvbA=" + "org/jetbrains/kotlin#kotlin-build-tools-impl/2.3.20": { + "jar": "sha256-loG8IWSovZ9t30wIXPSoNrktJ1BmZ9c7q59thVM2yRA=", + "pom": "sha256-gswavl5j0/5nV+eXKE8F25r9fq3D6D0ROcOlW2TUstU=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.1.10": { - "jar": "sha256-hhPV1T4x5SeS3qFerN2V6F6SSE3AMtZaC4D8OrCiaDo=", - "pom": "sha256-gToJLb+aST/lrRx1zy00r3eQYnETzrVkLvSE2PE7kP8=" + "org/jetbrains/kotlin#kotlin-compiler-embeddable/2.3.20": { + "jar": "sha256-l2+YnQtfXYDo6KitS3PaC/wn/dllufo4Nisr557MEzc=", + "pom": "sha256-DDWu7jcvB1FOvtN7lAe44RgdFCd1UTnlzudxnKBf5+g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.1.10": { - "jar": "sha256-rhutPDYWMMZrRBwN6CPI1nLsPSSaw9i2ltH06TaNJno=", - "module": "sha256-qfypH2qYul//RE/ydG2QsMfGiVyekxnCyUmbU+pmNds=", - "pom": "sha256-GlNAFMLCXyWMs7i+xds8pUcB5iG7xUmp4QG2lH4mHaw=" + "org/jetbrains/kotlin#kotlin-compiler-runner/2.3.20": { + "jar": "sha256-wGnzCkA75wyBUviqnyXsy6GI7q1UJjrgKvFEIUN6Igg=", + "pom": "sha256-jYTqDt1gs4vOpWLeUXgVKiZxqaAFPWcPkxRSs9sBMig=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.1.10": { - "jar": "sha256-0vcj8UlcfYLj1mbhAKYRAExZKh2NO1zTLmlr6QrILn4=", - "pom": "sha256-mnIVKRX/eLdKTOvB3OFLk4UPnTEsPPSreRYQ/sdTmFY=" + "org/jetbrains/kotlin#kotlin-daemon-client/2.3.20": { + "jar": "sha256-xxp8G+j7/wTgr0XJ7oy3ph2JU7ymuL8iWlcZxyWpC0Q=", + "pom": "sha256-nnyLgHJBF/cqrOZfa+SNg224/Dl1OtlR8ruQhi1+cIA=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.1.10": { - "jar": "sha256-Gn6NQPVJhknnsZleh71zUEh1JUrZytCTuGuBNH6AFRw=", - "module": "sha256-+ZK7mjYrAOahF6ugQe7EDYP2hPYw3hMA+t8v2jClYdE=", - "pom": "sha256-IY9nplnGzjz9BR+nSbQVLjLlMTssO1Me4XGRtFN2FJk=" + "org/jetbrains/kotlin#kotlin-daemon-embeddable/2.3.20": { + "jar": "sha256-iHC6uEC4CHyWxN3AYIi0rt9RMcQIrzZ0MGME8flq8/Q=", + "pom": "sha256-YVQOWzoywLEZYkSWZZJMbNdVTqmu4IVb2OT1t/YQoKs=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin-model/2.1.10": { - "jar": "sha256-ZM7lN+LvqAjIr0rCdZHIRfCGHFH7oNBk29dLpN7dg84=", - "module": "sha256-RVHiwEMx4WWf25kNvN2ZYG2HNLWkCN8KezuFuMKYTXA=", - "pom": "sha256-ijsc4TMDkoEFIUEhBHANqfxhYd50COmp1LZFg4p+EwM=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-annotations/2.3.20": { + "jar": "sha256-4WYu10cyK2P2HU+t2Zq3gQTEXq8JwRp4mGJBXoHBjcQ=", + "pom": "sha256-aP+Cf8E1DZPw1nM2jAZHm2K31eXDBlipWM+TBmgx6Nk=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.10": { - "module": "sha256-E2mm+exHB1Vh3Cc1x7sd6MmZLZFULnaYkJPb+Fv0mKY=", - "pom": "sha256-wt7LThQ0Um66OKV4EKQzWITQsAxy12kSwzKpVWak35A=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20": { + "module": "sha256-04UBEP9ajrcP7S1Xi0X7B+vESvaika5M88eUMMZRKLo=", + "pom": "sha256-AdVSITSRyFPVb4frdIEwON+e4dhekIaqN70GY7JJb4g=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugin/2.1.10/gradle85": { - "jar": "sha256-jCaugsJNq9Mn2HfSLsNW8md9zdYnFxJ2a2PxNeTdyqI=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-api/2.3.20/gradle813": { + "jar": "sha256-ybwX32m/OZB8WXweGb7EtHnHWqx1+/1jIeNEW0lxLog=" }, - "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.1.10": { - "module": "sha256-aN0fMZG0eiTJtyPop9+DbucnRZuw6G09x6H164hK1sY=", - "pom": "sha256-062RriLdACJzgzmvHvQMFC/THz4XpI9VsIZEQytA7Ck=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea-proto/2.3.20": { + "jar": "sha256-5Cicv5/0lAfwQd3GM24bV3pspM8r4dKjEzgnHBPu0+0=", + "pom": "sha256-9veHObqf4nEunwyeW8T16TcZzP6pW0fC9JslC+F2NX4=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.1.10": { - "jar": "sha256-G+wqyVJiA0voFoeToFQU7lYozB4oxIeyXV+XSc5y2ls=", - "pom": "sha256-+k+PHiJyweeF4c2eVOiyLq00B4a8x0uKx2C2MzUDVrY=" + "org/jetbrains/kotlin#kotlin-gradle-plugin-idea/2.3.20": { + "jar": "sha256-lS5zlI4qINOYwmuHprtwzPZkGPuvFSfDUVsYjqnUvWA=", + "module": "sha256-b7XZcwCl5Vmv1Nn/msA1bE2Wb31pS2Yvrhaf2HQhUx4=", + "pom": "sha256-WROHIVGNgqND99wvCRK3BJjT7vM2PJ66wiCssPyTjsw=" }, - "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.1.10": { - "jar": "sha256-0zJ6QnAZhNmS+/JavXKNlE3LLj8TL1wyU5+ccabPkNs=", - "pom": "sha256-zAYLn8Rzs74lFPsNeEu46al6zLHFXe8f4i7UPPUHArE=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20": { + "module": "sha256-lVUmc7gbNXitmy86/xRUtjzoBsb9SrfGBJIx6GQKtHE=", + "pom": "sha256-EcMjwt2KgE6fWOBHwsAYZLKgHcDYEys2PApDEiFbwJs=" }, - "org/jetbrains/kotlin#kotlin-native-utils/2.1.10": { - "jar": "sha256-L8Behn3ERw9lhR0WJjSY+xfdyxglErg9FeF4gVngomo=", - "pom": "sha256-lhBo1LVVnBlUAEVoCRoJUJdsZVz391Fh9v4kIqy12rQ=" + "org/jetbrains/kotlin#kotlin-gradle-plugin/2.3.20/gradle813": { + "jar": "sha256-RuFu4mWU9ID+y5LJbarjdTDoNQJreON+8yUelX8D9vs=" + }, + "org/jetbrains/kotlin#kotlin-gradle-plugins-bom/2.3.20": { + "module": "sha256-+CvXZF0MPv609PZVIKPGWz6MMCsIMyIDegABuHsC6ZA=", + "pom": "sha256-3WuRkZfhMv5x3axw9vxdj65/Und6/YN7FN6HG4wKVAA=" + }, + "org/jetbrains/kotlin#kotlin-klib-abi-reader/2.3.20": { + "jar": "sha256-XAo6pyBAjdL2PnYIdd0/Z9t+0Ws/AAKA4IgcYHDOT2M=", + "pom": "sha256-ui+7W5OjnlGraeWCJPGNdxYqDrYDkIbl9lVne8O3xno=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-api/2.3.20": { + "jar": "sha256-vpN3SFQS0A8B54KZyzC+SAJZHCcwNCtuva/AiU91J0M=", + "pom": "sha256-IbFbpb1i0h1Ta7egyMtnQ1cfwPQwklSKQjWybyodIgs=" + }, + "org/jetbrains/kotlin#kotlin-klib-commonizer-embeddable/2.3.20": { + "jar": "sha256-4FeWYwUcbaKyPZX8LDpBKnYnnbg6eQHuhqfjrPbnHjQ=", + "pom": "sha256-shhlfghlbEa018djdux6BOoGAJpGLTpkcBFvr92OPss=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.20": { + "jar": "sha256-FyZLlpD+7TSqi459VW+y55UfaABGLxFyQ/upYgEBT30=", + "pom": "sha256-DF/7/5dG1Ca56GasBWviiSizGKJc3FaDkIHsRJspzZc=" + }, + "org/jetbrains/kotlin#kotlin-native-utils/2.3.20": { + "jar": "sha256-QxnCdkeV773/K3julUVRV9evC5FVaYuqG6Uqar46vy0=", + "pom": "sha256-LAp+ADViCIXUN+fxJidEdbpYqiJC+1279D+R8gyvpwg=" }, "org/jetbrains/kotlin#kotlin-reflect/1.6.10": { "jar": "sha256-MnesECrheq0QpVq+x1/1aWyNEJeQOWQ0tJbnUIeFQgM=", "pom": "sha256-V5BVJCdKAK4CiqzMJyg/a8WSWpNKBGwcxdBsjuTW1ak=" }, - "org/jetbrains/kotlin#kotlin-script-runtime/2.1.10": { - "jar": "sha256-4kTA5/ZkERdV8ubpd4Ybcabro7T0UWJwSDPkbfqIOug=", - "pom": "sha256-zSWhAsEny99KW5n1M2pYSwyNR1zPzDUCya2LpelH2zc=" + "org/jetbrains/kotlin#kotlin-script-runtime/2.3.20": { + "jar": "sha256-b8232m5lz4zEPlqrq5S9zEiCXnkzaG+KG/aU64j44A4=", + "pom": "sha256-ZgmWdnA6CB/ZrEMTlmWIPlwUUCC2QHWd4FOdiRb/JH8=" }, - "org/jetbrains/kotlin#kotlin-scripting-common/2.1.10": { - "jar": "sha256-R3VyCGt1QtldsIyGY3rA7bm/DWsiq5uhNA5BoEiUEHk=", - "pom": "sha256-D/eXewgtbVneBV+q/2ACZVjJxZxllzsDnRG3i0SvEko=" + "org/jetbrains/kotlin#kotlin-scripting-common/2.3.20": { + "jar": "sha256-tMI52HsjvhgvBb9Xz16B+V1wv370qYnrmLczicbryJ8=", + "pom": "sha256-h+/vFa4RjxNDUmPrEJcAZGD7qDlph340uKcvDjPIOsk=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.1.10": { - "jar": "sha256-SeX8hK2b5s5TGUZrOKFxfUGh4jDZ4k2yb6xIse6sSo0=", - "pom": "sha256-isI7V2FoDl5lZHicZMvxEP5JWXp3JNqGQCRTLfUNrco=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-embeddable/2.3.20": { + "jar": "sha256-vVX49hvUHOxSllbC1HeEvLpawmDpT0FWwnLDFJZu71k=", + "pom": "sha256-1l8YaBd9zkuKkv+93bVrFzH5+66IyOcw7XvLcAy7soo=" }, - "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.1.10": { - "jar": "sha256-16kVX3BT+b4c4TX5/8QW4RaLsj0VCeslYoVHP9Of/4A=", - "pom": "sha256-FkJ9B0RZDHhkH9RywRNEvkBbBcA8CNmnIES/7djRzMg=" + "org/jetbrains/kotlin#kotlin-scripting-compiler-impl-embeddable/2.3.20": { + "jar": "sha256-gG/WOzvOxea17rGghD1qsJTVV4aoRl5HSiQ5KVocCiU=", + "pom": "sha256-xKkTo4XzTjKlbyBd8XoI3U4RfDBsV+XkfcXUlSPw6+E=" }, - "org/jetbrains/kotlin#kotlin-scripting-jvm/2.1.10": { - "jar": "sha256-lUZtpQ9CjAG9g2WE0wxVpomGHJOz2Xd4dKY2PRnPLdw=", - "pom": "sha256-/+onoApjoxX6ZoDQckI0xttuSJO4uGA6UmuNYuW+jc0=" + "org/jetbrains/kotlin#kotlin-scripting-jvm/2.3.20": { + "jar": "sha256-cEfOA1P0kSXDx0Z5LU92wyZde3L+YmlLfuwHW7oCUow=", + "pom": "sha256-B8Ba4tHs4K4e1mAQ7TGNnN3LNYcEbGM8GGvRTM8EYdU=" }, - "org/jetbrains/kotlin#kotlin-stdlib/2.1.10": { - "jar": "sha256-XyrByo3Is3o/QxTnFtNpaevwInp1GB0yaZ0Kj2RbHCE=", - "module": "sha256-jSwdcXxzVG1WOC0TbIZQtZpxWZQBciY4GJNKzkTLBI0=", - "pom": "sha256-SSISHT8LxgzkB/Ny3kLQKgt+lOddDD0VCLaDVyHySe8=" + "org/jetbrains/kotlin#kotlin-stdlib/2.3.20": { + "jar": "sha256-CuElBKUEDrrzdwOQhINCDRpWJN0dk/NXZl+Md8hIoB4=", + "module": "sha256-9Os0T8TR46KK4WwIbsPkL1I3O0ZtQwgYL7OG45LA76M=", + "pom": "sha256-yDwC2afi6VRzBJHDPC8dwDwnZi4ntWbsK0TS0Bhjm5g=" }, - "org/jetbrains/kotlin#kotlin-tooling-core/2.1.10": { - "jar": "sha256-QXbGEgmMuS3zikhf+LEKqiSrtAD2ENSPUIiusHyAAsg=", - "pom": "sha256-o9KW5sNBKQy36ihbNCnXjSwiEtow339G2UcV80D1JJ4=" + "org/jetbrains/kotlin#kotlin-tooling-core/2.3.20": { + "jar": "sha256-NnFCeBKZvA+RIMHe7A5ik0oa+ep/AaqpxaU1TcXY19k=", + "pom": "sha256-R+Ou/SS1vmLYB7bLzXnFW4P5S1XP4Y79xuM84RvxkOQ=" }, - "org/jetbrains/kotlin#kotlin-util-io/2.1.10": { - "jar": "sha256-RLWV7VtKEqqn3Wv4zYtWA+Eu3U0ykhkRPlJoX4xD7co=", - "pom": "sha256-yjmmo1CjkEEvKF9UWcl5rbkkkIeTBkmOTjdYwxLT+is=" + "org/jetbrains/kotlin#kotlin-util-io/2.3.20": { + "jar": "sha256-DnbnRx6RxT6mjS0k7x8p+1kqxfuw0dEPqpFkMO/z2so=", + "pom": "sha256-lcKKgo/B8eWeZWOCR6ZPdm2B2LWfbY3r7y0YoMwyH4k=" }, - "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.1.10": { - "jar": "sha256-obxgwmV1SpF06sB7JG7jtsyz4nhWoS8OXtAaJoc6DF4=", - "pom": "sha256-r0E3VoZzMQsOlRpGSN0JqJuY5cI5Cl2O7p5Hb7tCRT8=" + "org/jetbrains/kotlin#kotlin-util-klib-metadata/2.3.20": { + "jar": "sha256-qJlOC8poRt+xn0WMTMFdexN3nKGw2fNIgLX/LCorc7M=", + "pom": "sha256-jxApEHGu+rvY5m/5r3dDojiB1pxqryjhNhbMDpW9F7c=" }, - "org/jetbrains/kotlin#kotlin-util-klib/2.1.10": { - "jar": "sha256-wfBzMVzvkLaPI+vtaEfWfxny+ALR3URtNkTBryhAKHY=", - "pom": "sha256-aXGWCNsaiYCD5kOr5GR7lS471tQKxS74Gn8xZswO34A=" + "org/jetbrains/kotlin#kotlin-util-klib/2.3.20": { + "jar": "sha256-lWK407egS+uisUwFZx5xOFnqVLvAohB+ZbK88nP6hEg=", + "pom": "sha256-WlhMPMK6O0HR5c1+eiCDV2wbjDl6ebuBY2dtjvew6hc=" }, - "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.1.10": { - "pom": "sha256-ZeQcdCx+bntc5pEXF/23xNIMpDcqFKSYFis2OljR5dA=" + "org/jetbrains/kotlin/jvm#org.jetbrains.kotlin.jvm.gradle.plugin/2.3.20": { + "pom": "sha256-VdcHKXaj+iaZzzQy2Ls6rgEhnXcW4iX8ecddxqZRTwg=" }, - "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.1.10": { - "pom": "sha256-DUmjkkxWv9dmrd2/Jhhh8oLUisdzNZ1+bN5mCz6P0Fs=" + "org/jetbrains/kotlin/kapt#org.jetbrains.kotlin.kapt.gradle.plugin/2.3.20": { + "pom": "sha256-KgxHvSyS1Vp0n5Q0EyOtHffOgpNNAHfTNt1O+KMwcqQ=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.6.4": { - "pom": "sha256-qyYUhV+6ZqqKQlFNvj1aiEMV/+HtY/WTLnEKgAYkXOE=" + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.0": { + "pom": "sha256-Ejnp2+E5fNWXE0KVayURvDrOe2QYQuQ3KgiNz6i5rVU=" }, - "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.6.4": { - "jar": "sha256-wkyLsnuzIMSpOHFQGn5eDGFgdjiQexl672dVE9TIIL4=", - "module": "sha256-DZTIpBSD58Jwfr1pPhsTV6hBUpmM6FVQ67xUykMho6c=", - "pom": "sha256-Cdlg+FkikDwuUuEmsX6fpQILQlxGnsYZRLPAGDVUciQ=" + "org/jetbrains/kotlinx#kotlinx-coroutines-core-jvm/1.8.0": { + "jar": "sha256-mGCQahk3SQv187BtLw4Q70UeZblbJp8i2vaKPR9QZcU=", + "module": "sha256-/2oi2kAECTh1HbCuIRd+dlF9vxJqdnlvVCZye/dsEig=", + "pom": "sha256-pWM6vVNGfOuRYi2B8umCCAh3FF4LduG3V4hxVDSIXQs=" + }, + "org/jline#jline-parent/4.0.0": { + "pom": "sha256-qTWw4PG+PcA92t0Mhztwp1MdnO+RFf3JQLb0mor7w9s=" + }, + "org/jline#jline/4.0.0": { + "jar": "sha256-bcYGBxAc6o6XQOPLYjs46HMduP94j3WaOl+rwRkmcDI=", + "pom": "sha256-cbdxuk5C/hYpW1lmJEDdhqMveltqxYeNHzsl+TqUF9Y=" }, "org/json#json/20230618": { "jar": "sha256-cAQAep/Yf+HYb2c7RywDcuW8ULrLckwCmmES18S0pkA=", @@ -311,10 +378,25 @@ "module": "sha256-S2knc2Ouooq1DFpnYZ++q/jAgk5JOOYmC6wEjlvrga8=", "pom": "sha256-dmAvWZVKo9+mjjHIDKibb7ouoAG0+wbLUfoV6tfIWjA=" }, + "org/junit/platform#junit-platform-launcher/1.7.1": { + "jar": "sha256-MSKsb7KEvFDjr+RkGfyXf5TVgOnT0epYgF0gC1EKme4=", + "module": "sha256-iFMX9wTYc+F+oqGIZQY2MKbiSjCjq/6TTBXHSelJRt4=", + "pom": "sha256-Rk59Ip+eCnCgt1W2HYO+aiQhqsnQ87ZahfBueu4Wa2c=" + }, "org/opentest4j#opentest4j/1.2.0": { "jar": "sha256-WIEt5giY2Xb7ge87YtoFxmBMGP1KJJ9QRCgkefwoavI=", "pom": "sha256-qW5nGBbB/4gDvex0ySQfAlvfsnfaXStO4CJmQFk2+ZQ=" }, + "org/slf4j#slf4j-api/2.0.16": { + "jar": "sha256-oSV43eG6AL2bgW04iguHmSjQC6s8g8JA9wE79BlsV5o=", + "pom": "sha256-saAPWxxNvmK4BdZdI5Eab3cGOInXyx6G/oOJ1hkEc/c=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, "org/sonatype/oss#oss-parent/7": { "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" }, @@ -322,9 +404,9 @@ "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" } }, - "https://www.libsdl.org": { - "release/SDL2-devel-2.32.8-mingw": { - "tar.gz": "sha256-9ZCzcHaJViSD3tBb8V6vD10z65f0nQ/TuJQiX+F8xSs=" + "https://sourceforge.net": { + "projects/freetype/files/freetype2/2.14.3/freetype-2.14.3": { + "tar.gz/download": "sha256-5hsxqyY1i5Rudn7X639LsuUH2hz+/reohhrOf9XImaE=" } } } diff --git a/pkgs/by-name/mi/mindustry/package.nix b/pkgs/by-name/mi/mindustry/package.nix index d95d2827a5f9..3424bfb6afbb 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 = "155.4"; + version = "159.3"; buildVersion = makeBuildVersion version; jdk = jdk17; @@ -48,21 +48,21 @@ let owner = "Anuken"; repo = "Mindustry"; tag = "v${version}"; - hash = "sha256-NHI+YLh4ptuAEff6NM9ZgN2haB+iZ9np7nf6iRMzgHw="; + hash = "sha256-i29EbiKBVWab9YJWPWeVFQLLvRcigvHJPc7803A5e6g="; }; Arc = fetchFromGitHub { name = "Arc-source"; owner = "Anuken"; repo = "Arc"; tag = "v${version}"; - hash = "sha256-9nUj9aP1yAvZEDBuJPfE4ZzGEbZOSuVK+KbD1kUG+dM="; + hash = "sha256-1HEPON+cfsPYhPtYwVhj7zrc7fMdwpOA6H2r8yp4erE="; }; soloud = fetchFromGitHub { owner = "Anuken"; repo = "soloud"; - # This is pinned in Arc's arc-core/build.gradle - tag = "2025.12.01"; - hash = "sha256-I+VZW34eRGn1RJmK8e9nVSXIFSOK/pER+xEhmXeUB4Y="; + # This is pinned in Arc's build.gradle + tag = "2026.06.01"; + hash = "sha256-0/A3myfCYb+AMP3WH6stmXeb1eiA4dgX6H1Quj4AD9Q="; }; desktopItem = makeDesktopItem { @@ -98,11 +98,27 @@ stdenv.mkDerivation { rm -r Arc/backends/backend-*/libs/* rm -f Arc/arc-core/unsafe/unsafe.jar - cd Mindustry + # Remove unbuildable Android + substituteInPlace Arc/settings.gradle \ + --replace-fail 'include ":natives:natives-android"' "" + rm Arc/backends/backend-android/build.gradle - # Fix duplicate class entries in arc-core jar with newer Gradle - substituteInPlace ../Arc/arc-core/build.gradle \ - --replace-fail 'jar{' 'jar{ duplicatesStrategy = DuplicatesStrategy.EXCLUDE' + # avoid a circular dependency with rebuilding those + pushd Arc/arc-core/unsafe/ + javac --target 8 --source 8 -d . UnsafeBuffers.java + javac --target 16 --source 16 -d . Java16Buffers.java + jar cvf unsafe.jar arc + rm -r arc + popd + + # We need to mock those as otherwise mitmCache tries to download them + pushd Arc/backends/backend-sdl/ + mkdir -p build/jnigen/sources/ + touch build/jnigen/sources/glew.zip + touch build/jnigen/sources/sdlmingw.tar.gz + popd + + cd Mindustry # Remove unbuildable iOS stuff sed -i '/^project(":ios"){/,/^}/d' build.gradle @@ -150,30 +166,23 @@ stdenv.mkDerivation { buildPhase = '' runHook preBuild - - pushd ../Arc - gradle :arc-core:recompileUnsafe - popd '' + lib.optionalString enableServer '' gradle server:dist '' + lib.optionalString enableClient '' pushd ../Arc - gradle jnigenBuildLinux64 + gradle jnigenBuildLinux_x86_64 # Copy freshly-built libraries to where Gradle resource dirs expect them. # Using jnigenBuildLinux64 skips the postJni tasks, so we copy manually. # arc-core uses relative libsDir, others use absolute which causes path doubling. - cp arc-core/libs/linux64/* natives/natives-desktop/libs/ - cp -r backends/backend-sdl/build/Arc/backends/backend-sdl/libs/* backends/backend-sdl/libs/ - 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/ - glewlib=${lib.getLib glew}/lib/libGLEW.so - sdllib=${lib.getLib SDL2}/lib/libSDL2.so + cp arc-core/build/natives/*/* natives/natives-desktop/libs/ + cp extensions/freetype/build/natives/*/* natives/natives-freetype-desktop/libs/ + cp extensions/filedialogs/build/natives/*/* natives/natives-filedialogs/libs/ patchelf backends/backend-sdl/libs/linux64/libsdl-arc*.so \ - --add-needed "$glewlib" \ - --add-needed "$sdllib" - gradle jnigenJarNativesDesktop + --add-needed "${lib.getLib glew}/lib/libGLEW.so" \ + --add-needed "${lib.getLib SDL2}/lib/libSDL2.so" + gradle jnigenPackageAllDesktop popd gradle desktop:dist diff --git a/pkgs/by-name/mi/minecraft-server/derivation.nix b/pkgs/by-name/mi/minecraft-server/derivation.nix index 4192dff1ccf6..a93d2eb05302 100644 --- a/pkgs/by-name/mi/minecraft-server/derivation.nix +++ b/pkgs/by-name/mi/minecraft-server/derivation.nix @@ -36,7 +36,11 @@ stdenv.mkDerivation { passthru = { tests = { inherit (nixosTests) minecraft-server; }; - updateScript = ./update.py; + updateScript = { + command = [ ./update.py ]; + + supportedFeatures = [ "commit" ]; + }; }; meta = { @@ -48,6 +52,7 @@ stdenv.mkDerivation { maintainers = with lib.maintainers; [ thoughtpolice tomberek + wrench-exile-legacy costrouc ]; mainProgram = "minecraft-server"; diff --git a/pkgs/by-name/mi/minecraft-server/update.py b/pkgs/by-name/mi/minecraft-server/update.py index f272c8b71a84..de4c9339c576 100755 --- a/pkgs/by-name/mi/minecraft-server/update.py +++ b/pkgs/by-name/mi/minecraft-server/update.py @@ -110,6 +110,32 @@ def group_major_releases(releases: List[Version]) -> Dict[str, List[Version]]: return groups +def slugify(version: str) -> str: + return version.replace(".", "-") + + +def get_changelog_url(version: str) -> Optional[str]: + """ + Attempt to resolve the Minecraft changelog article URL. + Returns the URL if it exists, otherwise None. + """ + url = f"https://www.minecraft.net/en-us/article/minecraft-java-edition-{slugify(version)}" + + # our request is denied without a human user-agent + headers = { + "User-Agent": "Mozilla/5.0 (X11; Linux x86_64; rv:140.0) Gecko/20100101 Firefox/140.0" + } + + try: + response = requests.head(url, headers=headers, timeout=3) + if response.status_code == 200: + return url + except requests.RequestException as e: + pass + + return None + + def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]: """ Return a dictionary containing the latest version for each major release. @@ -118,8 +144,12 @@ def get_latest_major_releases(releases: List[Version]) -> Dict[str, Version]: """ return { major_release: max( - (release for release in releases if get_major_release(release.id) == major_release), - key=lambda x: tuple(map(int, x.id.split('.'))), + ( + release + for release in releases + if get_major_release(release.id) == major_release + ), + key=lambda x: tuple(map(int, x.id.split("."))), ) for major_release in group_major_releases(releases) } @@ -153,7 +183,101 @@ def generate() -> Dict[str, Dict[str, str]]: return servers +def get_latest(servers: Dict[str, Dict[str, str]]) -> str | None: + return max( + (v.get("version") for v in servers.values()), + key=lambda x: tuple(map(int, x.split("."))) if x is not None else (), + ) + + +def generate_commit( + previous_servers: Dict[str, Dict[str, str]], + servers: Dict[str, Dict[str, str]], + versions_file: Path, +) -> List[Dict[str, str | list[str]]]: + actions = [] + commit_body_lines = [] + + old_latest = get_latest(previous_servers) + new_latest = get_latest(servers) + + for major_version, server in servers.items(): + version = server.get("version") + previous_server = previous_servers.get(major_version) + + if version is None: + continue + + attribute = f"minecraftServers.vanilla-{slugify(major_version)}" + + if not previous_server: + # this version didn't exist before + # check if its now the latest version + if version == new_latest: + action = f"{old_latest} -> {new_latest}" + attribute = "minecraft-server" + else: + action = f"init {version}" + + else: + previous_version = previous_server.get("version") + if previous_version == version: + continue + + action = f"{previous_version} -> {version}" + + actions.append(action) + + commit_body_lines.append(f"{attribute}: {action}") + + changelog_url = get_changelog_url(version) + if changelog_url: + commit_body_lines.append(f"Release notes: {changelog_url}") + + if not commit_body_lines: + return [] + + if len(actions) == 1: + commit_message = commit_body_lines[0] + + # the body should only be the release notes to avoid repeatition + # if the release notes don't exist this will be blank + commit_body = "\n".join(commit_body_lines[1:]).strip() + else: + detailed_message = f"minecraft-server: {', '.join(actions)}" + + commit_message = ( + detailed_message + if len(detailed_message) <= 72 + else "minecraft-server: update multiple versions" + ) + + commit_body = "\n".join(commit_body_lines).strip() + + commit_json = { + "attrPath": "minecraftServers.vanilla", + "files": [str(versions_file)], + "commitMessage": commit_message, + } + + if commit_body: + commit_json["commitBody"] = commit_body + + return [commit_json] + + if __name__ == "__main__": - with open(Path(__file__).parent / "versions.json", "w") as file: - json.dump(generate(), file, indent=2) + versions_file = Path(__file__).parent / "versions.json" + + with open(versions_file, "r") as file: + previous_servers = json.load(file) + + servers = generate() + + commit_json = generate_commit(previous_servers, servers, versions_file) + + with open(versions_file, "w") as file: + json.dump(servers, file, indent=2) file.write("\n") + + print(json.dumps(commit_json)) diff --git a/pkgs/by-name/mi/minecraft-server/versions.json b/pkgs/by-name/mi/minecraft-server/versions.json index ac403058dc95..192cef5383f4 100644 --- a/pkgs/by-name/mi/minecraft-server/versions.json +++ b/pkgs/by-name/mi/minecraft-server/versions.json @@ -1,4 +1,10 @@ { + "26.2": { + "sha1": "823e2250d24b3ddac457a60c92a6a941943fcd6a", + "url": "https://piston-data.mojang.com/v1/objects/823e2250d24b3ddac457a60c92a6a941943fcd6a/server.jar", + "version": "26.2", + "javaVersion": 25 + }, "26.1": { "sha1": "97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51", "url": "https://piston-data.mojang.com/v1/objects/97ccd4c0ed3f81bbb7bfacddd1090b0c56f9bc51/server.jar", diff --git a/pkgs/by-name/mi/minesector/package.nix b/pkgs/by-name/mi/minesector/package.nix index 27fd547d5166..3a79a5a4c994 100644 --- a/pkgs/by-name/mi/minesector/package.nix +++ b/pkgs/by-name/mi/minesector/package.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.1.5"; src = fetchFromGitHub { - owner = "grassdne"; + owner = "ruuzia"; repo = "minesector"; tag = finalAttrs.version; hash = "sha256-VMTXZ4CIk9RpE4R9shHPl0R/T7mJUKY2b8Zi0DPW0/Q="; @@ -50,7 +50,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { mainProgram = "minesector"; description = "Snazzy Minesweeper-based game built with SDL2"; - homepage = "https://github.com/grassdne/minesector"; + homepage = "https://github.com/ruuzia/minesector"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = [ ]; diff --git a/pkgs/by-name/mi/miniflux/package.nix b/pkgs/by-name/mi/miniflux/package.nix index fae3e2e2bfe5..1986a4057ccc 100644 --- a/pkgs/by-name/mi/miniflux/package.nix +++ b/pkgs/by-name/mi/miniflux/package.nix @@ -9,16 +9,16 @@ buildGo126Module (finalAttrs: { pname = "miniflux"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "miniflux"; repo = "v2"; tag = finalAttrs.version; - hash = "sha256-cUCekYGFzvqdLql2Z0YoJ4Ug1bOYFMpvhBinD3sOaB0="; + hash = "sha256-gfudc11dJKzRtsT2gEazzgGFoUVaZNqgzdIATuGH29U="; }; - vendorHash = "sha256-aTRc1SspNET3nki7dji0EKIBwSbplsNkKZWud8XJTNA="; + vendorHash = "sha256-JjZfZJyml6/ANilLNAKaounUJ35TWhj/wVWWiGEhxps="; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff deleted file mode 100644 index d619219f50fe..000000000000 --- a/pkgs/by-name/mi/minigalaxy/inject-launcher-steam-run.diff +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/minigalaxy/launcher.py b/minigalaxy/launcher.py -index aeca3e3..aeb6763 100644 ---- a/minigalaxy/launcher.py -+++ b/minigalaxy/launcher.py -@@ -84,6 +84,7 @@ def get_execute_command(game) -> list: - if game.get_info("use_mangohud") is True: - exe_cmd.insert(0, "mangohud") - exe_cmd.insert(1, "--dlsym") -+ exe_cmd.insert(0, "@steamrun@") - exe_cmd = get_exe_cmd_with_var_command(game, exe_cmd) - logger.info("Launch command for %s: %s", game.name, " ".join(exe_cmd)) - return exe_cmd -diff --git a/tests/test_installer.py b/tests/test_installer.py -index d459b62..dee93cb 100644 ---- a/tests/test_installer.py -+++ b/tests/test_installer.py -@@ -405,13 +405,13 @@ class Test(TestCase): - mock_list_dir.return_value = ["data", "docs", "scummvm", "support", "beneath.ini", "gameinfo", "start.sh"] - - result1 = installer.get_exec_line(game1) -- self.assertEqual("scummvm -c beneath.ini", result1) -+ self.assertEqual("@steamrun@ scummvm -c beneath.ini", result1) - - game2 = Game("Blocks That Matter", install_dir="/home/test/GOG Games/Blocks That Matter", platform="linux") - mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] - - result2 = installer.get_exec_line(game2) -- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) -+ self.assertEqual('@steamrun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) - - @mock.patch('os.path.getsize') - @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff b/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff new file mode 100644 index 000000000000..b965056ab086 --- /dev/null +++ b/pkgs/by-name/mi/minigalaxy/inject-launcher-umu-run.diff @@ -0,0 +1,47 @@ +diff --git a/minigalaxy/installer.py b/minigalaxy/installer.py +index a68c2c8..2a34680 100644 +--- a/minigalaxy/installer.py ++++ b/minigalaxy/installer.py +@@ -477,7 +477,7 @@ def postinstaller(game): + postinst_script = os.path.join(game.install_dir, "support", "postinst.sh") + if os.path.isfile(postinst_script): + os.chmod(postinst_script, 0o775) +- stdout, stderr, exitcode = _exe_cmd([postinst_script]) ++ stdout, stderr, exitcode = _exe_cmd(["env", "PROTONPATH=umu-sniper", "@umurun@", postinst_script]) + if exitcode not in [0]: + err_msg = "Postinstallation script failed: {}".format(postinst_script) + return err_msg +diff --git a/minigalaxy/launch_command.py b/minigalaxy/launch_command.py +index fc27c1a..cf9de5f 100644 +--- a/minigalaxy/launch_command.py ++++ b/minigalaxy/launch_command.py +@@ -11,11 +11,15 @@ class LaunchCommand: + command: list[str] + + def apply_game_launch_config(self, game: Game) -> None: ++ if self.name == "start.sh": ++ self.command.insert(0, "@umurun@") + if game.get_info(InfoKey.GAMEMODE) is True: + self.command.insert(0, "gamemoderun") + if game.get_info(InfoKey.MANGOHUD) is True: + self.command.insert(0, "mangohud") +- self.command.insert(1, "--dlsym") ++ if self.name == "start.sh": ++ self.command.insert(0, "PROTONPATH=umu-sniper") ++ self.command.insert(0, "env") + + var_list = shlex.split(game.get_info(InfoKey.VARIABLES)) + command_list = shlex.split(game.get_info(InfoKey.COMMAND)) +diff --git a/tests/test_installer.py b/tests/test_installer.py +index 4b2fe1e..fd4dfef 100644 +--- a/tests/test_installer.py ++++ b/tests/test_installer.py +@@ -440,7 +440,7 @@ class Test(TestCase): + mock_list_dir.return_value = ["data", "docs", "support", "gameinfo", "start.sh"] + + result2 = installer.get_exec_line(game2) +- self.assertEqual('"/home/test/GOG Games/Blocks That Matter/start.sh"', result2) ++ self.assertEqual('env PROTONPATH=umu-sniper @umurun@ "/home/test/GOG Games/Blocks That Matter/start.sh"', result2) + + @mock.patch('os.path.getsize') + @mock.patch('os.listdir') diff --git a/pkgs/by-name/mi/minigalaxy/package.nix b/pkgs/by-name/mi/minigalaxy/package.nix index 61a041684c5a..24d683eb8888 100644 --- a/pkgs/by-name/mi/minigalaxy/package.nix +++ b/pkgs/by-name/mi/minigalaxy/package.nix @@ -1,15 +1,16 @@ { - lib, fetchFromGitHub, - glibcLocales, glib-networking, + glibcLocales, gobject-introspection, gtk3, + innoextract, + lib, libnotify, nix-update-script, python3Packages, - steam-run, replaceVars, + umu-launcher, unzip, webkitgtk_4_1, wrapGAppsHook3, @@ -18,25 +19,25 @@ python3Packages.buildPythonApplication rec { pname = "minigalaxy"; - version = "1.4.1"; + version = "1.4.2"; pyproject = true; src = fetchFromGitHub { owner = "sharkwouter"; repo = "minigalaxy"; tag = version; - hash = "sha256-YZhgVeWdVaNiTj7hvYuHbaVtoKN6EFoOANWdkrlj4dU="; + hash = "sha256-qq5XLWmQ0x6/hK8beKxJDxHmbu//EuukuyOG+CpF9ug="; }; patches = [ - (replaceVars ./inject-launcher-steam-run.diff { - steamrun = lib.getExe steam-run; + (replaceVars ./inject-launcher-umu-run.diff { + umurun = lib.getExe umu-launcher; }) ]; nativeBuildInputs = [ - wrapGAppsHook3 gobject-introspection + wrapGAppsHook3 ]; buildInputs = [ @@ -72,6 +73,7 @@ python3Packages.buildPythonApplication rec { "''${gappsWrapperArgs[@]}" --suffix PATH : "${ lib.makeBinPath [ + innoextract unzip xdg-utils ] diff --git a/pkgs/by-name/mi/minijail/package.nix b/pkgs/by-name/mi/minijail/package.nix index c2a72c604cd7..a00a16045076 100644 --- a/pkgs/by-name/mi/minijail/package.nix +++ b/pkgs/by-name/mi/minijail/package.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation (finalAttrs: { pname = "minijail"; - version = "2025.07.02"; + version = "2026.05.18"; src = fetchFromGitiles { url = "https://chromium.googlesource.com/chromiumos/platform/minijail"; tag = "linux-v${finalAttrs.version}"; - hash = "sha256-GRnr2O6ZpWtRDGJ6Am0XPT426Xh7wxTJsoEqyTUECYY="; + hash = "sha256-15TQnTFIx2DSdAQZPCVhBPs8a+V6YV3IrA1LqfMWcRQ="; }; buildInputs = [ libcap ]; diff --git a/pkgs/by-name/mi/minijinja/package.nix b/pkgs/by-name/mi/minijinja/package.nix index 656e0837d125..346726ba5716 100644 --- a/pkgs/by-name/mi/minijinja/package.nix +++ b/pkgs/by-name/mi/minijinja/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "minijinja"; - version = "2.20.0"; + version = "2.21.0"; src = fetchFromGitHub { owner = "mitsuhiko"; repo = "minijinja"; rev = finalAttrs.version; - hash = "sha256-8EEhtdfTU+q9TON6InIv0gdAS154745NeQX2TE513J0="; + hash = "sha256-1BPChGjf8ke9dEm6aVD+aKM2tDuWhG7VifV3RvukbdY="; }; - cargoHash = "sha256-uCyG+gT8zltsqwfwsQguoUvIEs5zLG70nBJC7txRLsI="; + cargoHash = "sha256-KpPPapS2iavhC/EP+qyeojo0nngfpjvyboSYzhGdI/0="; # The tests relies on the presence of network connection doCheck = false; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Command Line Utility to render MiniJinja/Jinja2 templates"; homepage = "https://github.com/mitsuhiko/minijinja"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ psibi ]; changelog = "https://github.com/mitsuhiko/minijinja/blob/${finalAttrs.version}/CHANGELOG.md"; mainProgram = "minijinja-cli"; diff --git a/pkgs/by-name/mi/minikube/package.nix b/pkgs/by-name/mi/minikube/package.nix index 1fcb9f03564f..791e29f09485 100644 --- a/pkgs/by-name/mi/minikube/package.nix +++ b/pkgs/by-name/mi/minikube/package.nix @@ -9,14 +9,20 @@ libvirt, withQemu ? false, qemu, + withVfkit ? false, + vfkit, makeWrapper, + writableTmpDirAsHomeHook, OVMF, + versionCheckHook, }: buildGoModule (finalAttrs: { pname = "minikube"; version = "1.38.1"; + __structuredAttrs = true; + vendorHash = "sha256-Oy8cM/foZKC83PxqkJW+o8vVYJhszKxXs9l2eks7FN4="; doCheck = false; @@ -24,8 +30,8 @@ buildGoModule (finalAttrs: { src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; - rev = "v${finalAttrs.version}"; - sha256 = "sha256-1unwbu2pJviHXukQKalJLgrkHpjf0sRR2nCm2gKv2VU="; + tag = "v${finalAttrs.version}"; + hash = "sha256-1unwbu2pJviHXukQKalJLgrkHpjf0sRR2nCm2gKv2VU="; }; postPatch = '' substituteInPlace Makefile \ @@ -34,14 +40,14 @@ buildGoModule (finalAttrs: { + (lib.optionalString (withQemu && stdenv.hostPlatform.isDarwin) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/local/opt/qemu/share/qemu" "${qemu}/share/qemu" \ - --replace "/opt/homebrew/opt/qemu/share/qemu" "${qemu}/share/qemu" + --replace-fail "/usr/local/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" \ + --replace-fail "/opt/homebrew/opt/qemu/share/qemu" "${lib.getLib qemu}/share/qemu" '') + (lib.optionalString (withQemu && stdenv.hostPlatform.isLinux) '' substituteInPlace \ pkg/minikube/registry/drvs/qemu2/qemu2.go \ - --replace "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ - --replace "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" + --replace-fail "/usr/share/OVMF/OVMF_CODE.fd" "${OVMF.firmware}" \ + --replace-fail "/usr/share/AAVMF/AAVMF_CODE.fd" "${OVMF.firmware}" ''); nativeBuildInputs = [ @@ -49,26 +55,53 @@ buildGoModule (finalAttrs: { pkg-config which makeWrapper + writableTmpDirAsHomeHook ]; buildInputs = lib.optionals stdenv.hostPlatform.isLinux [ libvirt ]; buildPhase = '' + runHook preBuild + make COMMIT=${finalAttrs.src.rev} + + runHook postBuild ''; installPhase = '' - install out/minikube -Dt $out/bin + runHook preInstall - wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false - export HOME=$PWD + installBin out/minikube - for shell in bash zsh fish; do - $out/bin/minikube completion $shell > minikube.$shell - installShellCompletion minikube.$shell - done + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false \ + --prefix PATH : ${ + lib.makeBinPath ( + lib.optionals withQemu [ qemu ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ libvirt ] + ++ lib.optionals (withVfkit && stdenv.hostPlatform.isDarwin) [ vfkit ] + ) + } \ + ${lib.optionalString stdenv.hostPlatform.isLinux "--prefix LD_LIBRARY_PATH : ${ + lib.makeLibraryPath [ libvirt ] + }"} + ln -sv $out/bin/minikube $out/bin/kubectl + + installShellCompletion --cmd minikube \ + --bash <($out/bin/minikube completion bash) \ + --fish <($out/bin/minikube completion fish) \ + --zsh <($out/bin/minikube completion zsh) + + runHook postInstall ''; + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + ]; + versionCheckKeepEnvironment = [ "HOME" ]; + versionCheckProgramArg = "version"; + doInstallCheck = true; + meta = { homepage = "https://minikube.sigs.k8s.io"; description = "Tool that makes it easy to run Kubernetes locally"; diff --git a/pkgs/by-name/mi/minilibx/package.nix b/pkgs/by-name/mi/minilibx/package.nix index 99df735260a0..e275fccaec4b 100644 --- a/pkgs/by-name/mi/minilibx/package.nix +++ b/pkgs/by-name/mi/minilibx/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation { pname = "minilibx"; - version = "0-unstable-2026-05-15"; + version = "0-unstable-2026-06-20"; src = fetchFromGitHub { owner = "42Paris"; repo = "minilibx-linux"; - rev = "b8de9b411818f2e56dd2f4f23c5aa9bffc18a612"; - hash = "sha256-LTZeVxa4NdGOai/GIrhPbWwXO7Vj7ct/gexeC81IvDw="; + rev = "f07d00f07c5c652223f505b526f84dab73cf2598"; + hash = "sha256-DPQ+hc4yJ7nh9UTJg+ustE+Gp+YM05RzsqiKdWQevkQ="; }; outputs = [ diff --git a/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix b/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix index cb21debb8ed5..af9717ff4a3f 100644 --- a/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix +++ b/pkgs/by-name/mi/minimax-coding-plan-mcp/package.nix @@ -30,7 +30,7 @@ python3Packages.buildPythonApplication (finalAttrs: { description = "MiniMax MCP server for coding-plan users with web search and image understanding"; homepage = "https://github.com/MiniMax-AI/MiniMax-Coding-Plan-MCP"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ superherointj ]; + maintainers = [ ]; mainProgram = "minimax-coding-plan-mcp"; }; }) diff --git a/pkgs/by-name/mi/minimax-mcp/package.nix b/pkgs/by-name/mi/minimax-mcp/package.nix index 532adbfeb053..082cb010077d 100644 --- a/pkgs/by-name/mi/minimax-mcp/package.nix +++ b/pkgs/by-name/mi/minimax-mcp/package.nix @@ -45,7 +45,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; homepage = "https://github.com/MiniMax-AI/MiniMax-MCP"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ superherointj ]; + maintainers = [ ]; mainProgram = "minimax-mcp"; }; }) diff --git a/pkgs/by-name/mi/miniplayer/package.nix b/pkgs/by-name/mi/miniplayer/package.nix index 4d374d5187b7..bccb55faaa34 100644 --- a/pkgs/by-name/mi/miniplayer/package.nix +++ b/pkgs/by-name/mi/miniplayer/package.nix @@ -23,7 +23,7 @@ buildPythonApplication (finalAttrs: { dependencies = [ colorthief ffmpeg-python - mpd2 + python-mpd2 pillow pixcat requests diff --git a/pkgs/by-name/mi/miniserve/package.nix b/pkgs/by-name/mi/miniserve/package.nix index 56bb57953d04..895e3cc33cee 100644 --- a/pkgs/by-name/mi/miniserve/package.nix +++ b/pkgs/by-name/mi/miniserve/package.nix @@ -66,7 +66,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "CLI tool to serve files and directories over HTTP"; homepage = "https://github.com/svenstaro/miniserve"; changelog = "https://github.com/svenstaro/miniserve/blob/v${finalAttrs.version}/CHANGELOG.md"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ defelo ]; diff --git a/pkgs/by-name/mi/miniz/package.nix b/pkgs/by-name/mi/miniz/package.nix index 55a0d4fd983f..18608a12261a 100644 --- a/pkgs/by-name/mi/miniz/package.nix +++ b/pkgs/by-name/mi/miniz/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "miniz"; - version = "3.1.1"; + version = "3.1.2"; src = fetchFromGitHub { owner = "richgel999"; repo = "miniz"; rev = finalAttrs.version; - hash = "sha256-hRB/0TVVQjr4VwjozfRnYKUJfeqO+1PNfdvP/rrOCR4="; + hash = "sha256-/MAJWZXZ+pbelFduGE75rK/x9qEzxSFEj8RJWe3JUv0="; }; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/mi/minizinc/package.nix b/pkgs/by-name/mi/minizinc/package.nix index 4747ebe471fa..22ed68a2228d 100644 --- a/pkgs/by-name/mi/minizinc/package.nix +++ b/pkgs/by-name/mi/minizinc/package.nix @@ -13,22 +13,6 @@ zlib, }: -let - gecode_6_3_0 = gecode.overrideAttrs (_: { - version = "6.3.0"; - src = fetchFromGitHub { - owner = "gecode"; - repo = "gecode"; - rev = "f7f0d7c273d6844698f01cec8229ebe0b66a016a"; - hash = "sha256-skf2JEtNkRqEwfHb44WjDGedSygxVuqUixskTozi/5k="; - }; - patches = [ ]; - }); -in -let - gecode = gecode_6_3_0; -in - stdenv.mkDerivation (finalAttrs: { pname = "minizinc"; version = "2.9.7"; diff --git a/pkgs/by-name/mi/minizip-ng/package.nix b/pkgs/by-name/mi/minizip-ng/package.nix index 63a7a152f7bb..624d7e9b8d43 100644 --- a/pkgs/by-name/mi/minizip-ng/package.nix +++ b/pkgs/by-name/mi/minizip-ng/package.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "minizip-ng" + lib.optionalString enableCompat "-compat"; - version = "4.2.1"; + version = "4.2.2"; src = fetchFromGitHub { owner = "zlib-ng"; repo = "minizip-ng"; rev = finalAttrs.version; - hash = "sha256-gpjM8Cqoe4kafXgl2wXhhCRx39WC94qJ1DIDyd2n0G8="; + hash = "sha256-yPDH9Far8I+tpNeIoXt6w2Aj1/LEYFjwaHyLZMavCCA="; }; nativeBuildInputs = [ @@ -42,8 +42,8 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "MZ_OPENSSL" true) (lib.cmakeBool "MZ_PPMD" false) # PPMD support requres internet access to make a git clone (lib.cmakeBool "MZ_LIBCOMP" false) # builds only on Darwin by default where it fails due to mising headers - (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.doCheck) - (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "MZ_BUILD_TESTS" finalAttrs.finalPackage.doCheck) + (lib.cmakeBool "MZ_BUILD_UNIT_TESTS" finalAttrs.finalPackage.doCheck) (lib.cmakeBool "MZ_COMPAT" enableCompat) ] ++ lib.optionals stdenv.hostPlatform.isi686 [ diff --git a/pkgs/by-name/mi/mint/package.nix b/pkgs/by-name/mi/mint/package.nix index 763640599e22..7a67d556741d 100644 --- a/pkgs/by-name/mi/mint/package.nix +++ b/pkgs/by-name/mi/mint/package.nix @@ -8,13 +8,13 @@ crystal.buildCrystalPackage rec { pname = "mint"; - version = "0.28.1"; + version = "0.29.0"; src = fetchFromGitHub { owner = "mint-lang"; repo = "mint"; tag = version; - hash = "sha256-CC3+ygs2JnqtKRGOlP5hZqnVARrgLjV5EewAP+jDM0M="; + hash = "sha256-T8gbJ6IeheaiT3QZ/005IV3942wTMjMa/8lWUuyayX0="; }; format = "shards"; diff --git a/pkgs/tools/text/mir-qualia/default.nix b/pkgs/by-name/mi/mir-qualia/package.nix similarity index 70% rename from pkgs/tools/text/mir-qualia/default.nix rename to pkgs/by-name/mi/mir-qualia/package.nix index 95da7c83e755..cf1ca8593f11 100644 --- a/pkgs/tools/text/mir-qualia/default.nix +++ b/pkgs/by-name/mi/mir-qualia/package.nix @@ -1,19 +1,19 @@ { lib, - pythonPackages, + python3Packages, fetchurl, }: -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication (finalAttrs: { pname = "mir.qualia"; version = "2.0.0"; format = "setuptools"; doCheck = false; # 2.0.0-released pytests are broken - buildInputs = with pythonPackages; [ pytest ]; + buildInputs = with python3Packages; [ pytest ]; src = fetchurl { - url = "mirror://pypi/m/mir.qualia/mir.qualia-${version}.tar.gz"; + url = "mirror://pypi/m/mir.qualia/mir.qualia-${finalAttrs.version}.tar.gz"; sha256 = "1ybq6jb5clh9hw0sp3idp4hjv2gkm9yiaph48gcc208affflc8m9"; }; @@ -24,4 +24,4 @@ pythonPackages.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = [ lib.maintainers.srhb ]; }; -} +}) diff --git a/pkgs/by-name/mi/miracle-wm/package.nix b/pkgs/by-name/mi/miracle-wm/package.nix index d17699a902af..489f32863563 100644 --- a/pkgs/by-name/mi/miracle-wm/package.nix +++ b/pkgs/by-name/mi/miracle-wm/package.nix @@ -11,6 +11,8 @@ glib, glm, gtest, + gtk4, + gtk4-layer-shell, json_c, libevdev, libglvnd, @@ -28,18 +30,19 @@ wasmedge, wayland, wayland-scanner, + wrapGAppsHook4, yaml-cpp, }: stdenv.mkDerivation (finalAttrs: { pname = "miracle-wm"; - version = "0.9.1"; + version = "0.10.1"; src = fetchFromGitHub { owner = "miracle-wm-org"; repo = "miracle-wm"; tag = "v${finalAttrs.version}"; - hash = "sha256-7JtdSopKBHfFK0KsV0+9OxrOx3vrSydmZSmAiBvKQiI="; + hash = "sha256-htFgvXYgxQXV2U3F+tXEoaTb0udc2H1aHsIg5E8nRL8="; }; postPatch = '' @@ -55,12 +58,15 @@ stdenv.mkDerivation (finalAttrs: { makeWrapper pkg-config wayland-scanner + wrapGAppsHook4 ]; buildInputs = [ boost glib glm + gtk4 + gtk4-layer-shell json_c libevdev libglvnd @@ -84,11 +90,15 @@ stdenv.mkDerivation (finalAttrs: { checkInputs = [ gtest ]; + # Manually wrapping the few binaries that needs it + dontWrapGApps = true; + cmakeFlags = [ + (lib.cmakeBool "BUILD_DEBUG_OVERLAY" true) + (lib.cmakeBool "BUILD_ERROR_REPORTER" true) (lib.cmakeBool "ENABLE_LTO" true) (lib.cmakeBool "ENABLE_TESTS" finalAttrs.finalPackage.doCheck) - # https://github.com/miracle-wm-org/miracle-wm/issues/865 - (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" false) + (lib.cmakeBool "FEATURE_PLUGIN_SYSTEM" true) (lib.cmakeBool "SYSTEMD_INTEGRATION" true) (lib.cmakeBool "END_TO_END_TESTS" finalAttrs.finalPackage.doCheck) ]; @@ -107,6 +117,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' patchShebangs $out/libexec/miracle-wm-session-setup + wrapProgram $out/libexec/miracle-wm-session-setup \ --prefix PATH : "$out/bin:${ lib.makeBinPath [ @@ -115,6 +126,9 @@ stdenv.mkDerivation (finalAttrs: { systemd # systemctl ] }" + + wrapGApp $out/bin/miracle-wm-basic-error-reporter + wrapGApp $out/bin/miracle-wm-debug-overlay ''; passthru = { diff --git a/pkgs/by-name/mi/mirrorbits/package.nix b/pkgs/by-name/mi/mirrorbits/package.nix index 5f3ee1294e9c..392239914eaa 100644 --- a/pkgs/by-name/mi/mirrorbits/package.nix +++ b/pkgs/by-name/mi/mirrorbits/package.nix @@ -13,7 +13,7 @@ buildGoModule (finalAttrs: { version = "0.6.1"; src = fetchFromGitHub { - owner = "etix"; + owner = "videolabs"; repo = "mirrorbits"; tag = "v${finalAttrs.version}"; hash = "sha256-PqPE/PgIyQylbYoABC/saxLF83XjgRAS0QimragJ8P8="; @@ -46,7 +46,7 @@ buildGoModule (finalAttrs: { meta = { description = "Geographical download redirector for distributing files efficiently across a set of mirrors"; - homepage = "https://github.com/etix/mirrorbits"; + homepage = "https://github.com/videolabs/mirrorbits"; longDescription = '' Mirrorbits is a geographical download redirector written in Go for distributing files efficiently across a set of mirrors. It offers diff --git a/pkgs/by-name/mi/mirrord/manifest.json b/pkgs/by-name/mi/mirrord/manifest.json index 588347bfa29e..9b1f4239a8f9 100644 --- a/pkgs/by-name/mi/mirrord/manifest.json +++ b/pkgs/by-name/mi/mirrord/manifest.json @@ -1,21 +1,17 @@ { - "version": "3.216.0", + "version": "3.233.0", "assets": { "x86_64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_x86_64", - "hash": "sha256-w4x1G12uifLTQzf9KWUgUYeu+4SQTI51HToI/cgB4ew=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.233.0/mirrord_linux_x86_64", + "hash": "sha256-F3pnhKxGLV1fy2mKfu3KFr495vuwq4wwmmnQ2PWsn3M=" }, "aarch64-linux": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_linux_aarch64", - "hash": "sha256-GLwDMlCV7izckP5roJGsVROK3+PSkwDH/Vbu4j9X1sk=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.233.0/mirrord_linux_aarch64", + "hash": "sha256-XHOTSr2Gxqqh7gIB5nv2nUMqUqFsNCsyPxhuQa0KCxY=" }, "aarch64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal", - "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg=" - }, - "x86_64-darwin": { - "url": "https://github.com/metalbear-co/mirrord/releases/download/3.216.0/mirrord_mac_universal", - "hash": "sha256-LCHPpdVWyBtmrcP+2bFqwaqhtH+nsXf2R3SeXJMFtVg=" + "url": "https://github.com/metalbear-co/mirrord/releases/download/3.233.0/mirrord_mac_universal", + "hash": "sha256-21EWgA1Ccz2HkhB/PocBT8yrhyxUhcPWOlj97F46Z6E=" } } } diff --git a/pkgs/by-name/mi/mirrord/update.py b/pkgs/by-name/mi/mirrord/update.py index 5756363cfc7c..580aafb451c2 100755 --- a/pkgs/by-name/mi/mirrord/update.py +++ b/pkgs/by-name/mi/mirrord/update.py @@ -12,7 +12,6 @@ platforms = { "x86_64-linux": "linux_x86_64", "aarch64-linux": "linux_aarch64", "aarch64-darwin": "mac_universal", - "x86_64-darwin": "mac_universal", } if __name__ == "__main__": diff --git a/pkgs/by-name/mi/mirth/package.nix b/pkgs/by-name/mi/mirth/package.nix new file mode 100644 index 000000000000..031fb321fd92 --- /dev/null +++ b/pkgs/by-name/mi/mirth/package.nix @@ -0,0 +1,115 @@ +{ + lib, + fetchFromSourcehut, + buildPackages, + stdenv, + makeBinaryWrapper, +}: + +stdenv.mkDerivation { + name = "mirth"; + version = "0-unstable-2026-05-28"; + + src = fetchFromSourcehut { + owner = "~typeswitch"; + repo = "mirth"; + rev = "b180112a547cb803e3bf5720a0bb08f8bffa9742"; + hash = "sha256-6nd1DrN3sGobmOh+E/8hYUFW2tBSFLdaEPXrViKDVSc="; + }; + + postPatch = + # Bug report: https://todo.sr.ht/~typeswitch/mirth/16 + lib.optionalString (with stdenv.buildPlatform; isAarch64 && isLinux) '' + substituteInPlace bin/mirth0.c \ + --replace-fail "WRAP_I63(24LL);" "WRAP_I63(16LL);" + substituteInPlace lib/std/world.mth \ + --replace-fail "Linux -> 24u," "Linux -> running-arch Arch.ARM64 = if(16u, 24u)," + '' + # Replace hard-coded GCC with stdenv’s C compiler. + # NOTE: newer GCC requires optimization level ≥1 to use fortity. -O1 is + # fast enough as a default for the compiler stages. + + '' + substituteInPlace Makefile \ + --replace-fail "-O0" "-O1" \ + --replace-fail "CC=gcc \$(C99FLAGS)" "CC=${buildPackages.stdenv.cc.targetPrefix}cc \$(C99FLAGS)" + '' + # Override the final binary, mirth3, with the target’s C compiler & -O2 + # optimization for distribution. + + '' + echo "bin/mirth3: CC := ${stdenv.cc.targetPrefix}cc \$(C99FLAGS) -O2" >>Makefile + ''; + + outputs = [ + "out" + "lib" + "bin" + "doc" + "examples" + "vim" + ]; + + strictDeps = true; + __structuredAttrs = true; + + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ makeBinaryWrapper ]; + + buildFlags = [ + "bin/mirth2" + "bin/mirth3" + ]; + + # st_mode substitution intentionally diverges from the pre-generated mirth0.c + doCheck = with stdenv.buildPlatform; !(isAarch64 && isLinux); + + installPhase = '' + runHook preInstall + + install -d "$lib/lib/mirth" "$doc/share/doc/mirth/tutorial" \ + "$examples/share/mirth/examples" "$vim" + + cp -Tr lib "$lib/lib/mirth" + cp -Tr examples "$examples/share/mirth/examples" + cp -Tr tutorial "$doc/share/doc/mirth/tutorial" + cp -Tr tools/mirth-vim "$vim" + + bin/mirth2 src/main.mth --docs "$doc/share/doc/mirth" -c + install -Dm644 LICENSE README.md -t "$doc/share/doc/mirth" + + # stages 0–2 aren’t needed anymore + install -Dm755 bin/mirth3 "$bin/bin/mirthc" + + runHook postInstall + ''; + + # The raw binary @ $bin needs wrapping to get the stdlib @ $lib. By wrapping + # it here, it will be more flexible towards allowing users to wrap the Mirth + # binary with their own stdlib & other packages. + postFixup = '' + makeBinaryWrapper "$bin/bin/mirthc" "$out/bin/mirthc" \ + --add-flags "-P $lib/lib/mirth" + ''; + + meta = { + description = "Concatenative functional programming language with strong static linear types"; + longDescription = '' + Mirth is inspired by Forth, Joy, Haskell, Lisp, and monoidal category theory. + Mirth compiles to C99. + ''; + homepage = "https://git.sr.ht/~typeswitch/mirth"; + license = lib.licenses.bsd0; + mainProgram = "mirthc"; + # https://git.sr.ht/~typeswitch/mirth/tree/main/item/src/mirth.h#L4-22 + platforms = [ + "aarch64-darwin" + "aarch64-linux" + "aarch64-windows" + "i686-linux" + "i686-windows" + "x86_64-linux" + "x86_64-windows" + ]; + maintainers = with lib.maintainers; [ toastal ]; + }; +} diff --git a/pkgs/by-name/mi/misc-gitology/package.nix b/pkgs/by-name/mi/misc-gitology/package.nix index 2b6c9f735544..df4c21bfb68b 100644 --- a/pkgs/by-name/mi/misc-gitology/package.nix +++ b/pkgs/by-name/mi/misc-gitology/package.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { description = "Assortment of scripts around Git"; homepage = "https://github.com/da-x/misc-gitology"; - license = [ lib.licenses.bsd2 ]; + license = lib.licenses.bsd2; maintainers = [ lib.maintainers._9999years ]; }; diff --git a/pkgs/by-name/mi/mise/package.nix b/pkgs/by-name/mi/mise/package.nix index 01f29f550fcf..855e36e1ebdf 100644 --- a/pkgs/by-name/mi/mise/package.nix +++ b/pkgs/by-name/mi/mise/package.nix @@ -13,8 +13,8 @@ openssl, cmake, cacert, + tzdata, usage, - mise, testers, runCommand, jq, @@ -22,16 +22,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mise"; - version = "2026.6.0"; + version = "2026.7.10"; src = fetchFromGitHub { owner = "jdx"; repo = "mise"; tag = "v${finalAttrs.version}"; - hash = "sha256-UE+Mo6AtNiVgKOfLS7khAoVNJGyomL5Vb/pfcCke5fI="; + hash = "sha256-klEexXMGaGM0YkcSDaHa8lD1jdwAfCcms7soRKy3r3w="; }; - cargoHash = "sha256-N1/lLQZbkqeQavNGhYBx4PDl0cid+DACzy9gpj5g1rs="; + cargoHash = "sha256-O32fVQGb8+ECopUPeU9Pm8xKP4Aj494MtyHYwR3wFnM="; nativeBuildInputs = [ installShellFiles @@ -69,8 +69,12 @@ rustPlatform.buildRustPackage (finalAttrs: { rustPlatform.bindgenHook ]; - # disable warnings as errors for aws-lc-sys in checkPhase - env.NIX_CFLAGS_COMPILE = "-Wno-error"; + env = { + # disable warnings as errors for aws-lc-sys in checkPhase + NIX_CFLAGS_COMPILE = "-Wno-error"; + # tera date helper tests look up timezone data via TZDIR. + TZDIR = "${tzdata}/share/zoneinfo"; + }; checkFlags = [ # last_modified will always be different in nix @@ -113,7 +117,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; }; tests = { - version = (testers.testVersion { package = mise; }).overrideAttrs (old: { + version = (testers.testVersion { package = finalAttrs.finalPackage; }).overrideAttrs (old: { nativeBuildInputs = old.nativeBuildInputs ++ [ cacert ]; }); usageCompat = @@ -121,7 +125,7 @@ rustPlatform.buildRustPackage (finalAttrs: { runCommand "mise-usage-compatibility" { nativeBuildInputs = [ - mise + finalAttrs.finalPackage usage jq ]; @@ -144,7 +148,10 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Front-end to your dev env"; changelog = "https://github.com/jdx/mise/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ konradmalik ]; + maintainers = with lib.maintainers; [ + konradmalik + Br1ght0ne + ]; mainProgram = "mise"; }; }) diff --git a/pkgs/by-name/mi/misskey/package.nix b/pkgs/by-name/mi/misskey/package.nix index 58f4552604a4..35bfec707916 100644 --- a/pkgs/by-name/mi/misskey/package.nix +++ b/pkgs/by-name/mi/misskey/package.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "misskey"; - version = "2026.5.4"; + version = "2026.6.0"; src = fetchFromGitHub { owner = "misskey-dev"; repo = "misskey"; tag = finalAttrs.version; - hash = "sha256-ENq5V1lIFGKIr1xZccy1LFRYVqZVEhDzBhAbDNcG5sM="; + hash = "sha256-jq1HtLabix9qxaAjaCgUN3nsY438ruHgHgC3MuGeR2E="; fetchSubmodules = true; }; @@ -62,7 +62,7 @@ stdenv.mkDerivation (finalAttrs: { ; inherit pnpm; fetcherVersion = 4; - hash = "sha256-wEbYkfp+zfytOPBjEcyTHCaoohGRNRjG5oTUefI5BVw="; + hash = "sha256-GCkSASkgwUvlAlm8hiy4Yk/QMVerVGacxOh1AYouH0g="; }; buildPhase = '' diff --git a/pkgs/by-name/mi/mist-cli/package.nix b/pkgs/by-name/mi/mist-cli/package.nix index 48b5bf6d5584..a071fe60c927 100644 --- a/pkgs/by-name/mi/mist-cli/package.nix +++ b/pkgs/by-name/mi/mist-cli/package.nix @@ -9,11 +9,11 @@ }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mist-cli"; - version = "2.2"; + version = "2.3"; src = fetchurl { url = "https://github.com/ninxsoft/mist-cli/releases/download/v${finalAttrs.version}/mist-cli.${finalAttrs.version}.pkg"; - hash = "sha256-d+tm37X6JC5r23D8WTsxIkL0RU4U58pJmLermwjOgCE="; + hash = "sha256-rUIA40JTXndE7W2wQiayhAP9RPTQMeJV8d6NUy/Immk="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch index ed65366cce2d..34087f8c4158 100644 --- a/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch +++ b/pkgs/by-name/mi/mistral-rs/no-native-cpu.patch @@ -1,20 +1,10 @@ diff --git a/.cargo/config.toml b/.cargo/config.toml -index 0ab50ad46..3f5fe0788 100644 +index d3e3031e1..96b624fb3 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml -@@ -1,15 +1,10 @@ +@@ -1,5 +1,2 @@ -[build] -rustflags = ["-C", "target-cpu=native"] - - [target.aarch64-apple-darwin] - rustflags = [ -- "-C", "target-cpu=native", - "-C", "target-feature=+aes,+sha2,+fp16,+i8mm", - ] - - [target.x86_64-apple-darwin] - rustflags = [ -- "-C", "target-cpu=native", - "-C", "target-feature=-avx,-avx2", - ] - + [target.wasm32-unknown-unknown] + rustflags = ["-C", "target-feature=+simd128"] diff --git a/pkgs/by-name/mi/mistral-rs/package.nix b/pkgs/by-name/mi/mistral-rs/package.nix index 760ba33786d0..b7799c0aa1a6 100644 --- a/pkgs/by-name/mi/mistral-rs/package.nix +++ b/pkgs/by-name/mi/mistral-rs/package.nix @@ -34,6 +34,7 @@ let inherit (stdenv) hostPlatform; + rustc = rustPlatform.callPackage ({ rustc }: rustc) { }; accelIsValid = builtins.elem acceleration [ null @@ -73,14 +74,14 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "mistral-rs"; - version = "0.8.3"; + version = "0.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "EricLBuehler"; repo = "mistral.rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-Ohkr45VXuXB7Ms8igZxQ7shrJa3+WBVT1fNYlc6JvZQ="; + hash = "sha256-3p/e7UZ8BLwT+dpb61NmzX2Z1QxxEgkgjlNzv5lWybM="; }; patches = [ @@ -94,9 +95,42 @@ rustPlatform.buildRustPackage (finalAttrs: { --replace-fail \ "lto = true" \ "lto = false" + + '' + # LLVM 21 cannot select the VPDPBUSD intrinsic because its argument types are incorrect. + # Fixed by https://github.com/rust-lang/llvm-project/commit/94e2c19f86a699d7a19ff0f4130b696699189c8d. + + lib.optionalString (hostPlatform.isx86_64 && lib.versionOlder rustc.llvm.version "22") '' + substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/mod.rs" \ + --replace-fail \ + '#[cfg(target_arch = "x86_64")]' \ + '#[cfg(any())]' \ + --replace-fail \ + '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \ + '#[cfg(not(target_arch = "aarch64"))]' + + substituteInPlace "$cargoDepsCopy/source-git-0/candle-core-0.11.0/src/quantized/repack.rs" \ + --replace-fail \ + '#[cfg(target_arch = "x86_64")]' \ + '#[cfg(any())]' \ + --replace-fail \ + '#[cfg(not(any(target_arch = "aarch64", target_arch = "x86_64")))]' \ + '#[cfg(not(target_arch = "aarch64"))]' + '' + # Prevent build scripts from attempting to clone cutlass (which would fail in the sandbox anyway). + # Instead, we provide cutlass in buildInputs. + + lib.optionalString cudaSupport '' + substituteInPlace mistralrs-flash-attn/build.rs \ + --replace-fail \ + ".with_cutlass(Some(&cutlass_commit))" \ + "" + + substituteInPlace mistralrs-quant/build.rs \ + --replace-fail \ + "builder = builder.with_cutlass(Some(&cutlass_commit));" \ + "" ''; - cargoHash = "sha256-ZwUCzbRpDgT7KwsT9kPGsGp4iU/0I+lrMFqM3UCwkYw="; + cargoHash = "sha256-TULJ3mEAWp1ktPDPeBbUJGHhsEuo5T2qh3/JpS+8+ds="; nativeBuildInputs = [ pkg-config @@ -116,11 +150,14 @@ rustPlatform.buildRustPackage (finalAttrs: { openssl ] ++ lib.optionals cudaSupport [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas cudaPackages.libcurand + + # For compiling kernels + cudaPackages.cutlass ] ++ lib.optionals mklSupport [ mkl ]; diff --git a/pkgs/by-name/mi/mistral-vibe/package.nix b/pkgs/by-name/mi/mistral-vibe/package.nix index 25e74941caae..36c6cea6a2e8 100644 --- a/pkgs/by-name/mi/mistral-vibe/package.nix +++ b/pkgs/by-name/mi/mistral-vibe/package.nix @@ -1,34 +1,19 @@ { lib, stdenv, - python3, + python3Packages, fetchFromGitHub, # tests + gitMinimal, uv, versionCheckHook, writableTmpDirAsHomeHook, }: -let - python = python3.override { - packageOverrides = _final: prev: { - # Many tests fail with the current version of opentelemetry we have in nixpkgs - # vibe.acp.exceptions.InternalError: module '...' has no attribute 'GEN_AI_PROVIDER_NAME' - opentelemetry-api = prev.opentelemetry-api.overridePythonAttrs (old: rec { - version = "1.40.0"; - src = old.src.override { - tag = "v${version}"; - hash = "sha256-1KVy9s+zjlB4w7E45PMCWRxPus24bgBmmM3k2R9d+Jg="; - }; - }); - }; - }; - python3Packages = python.pkgs; -in python3Packages.buildPythonApplication (finalAttrs: { pname = "mistral-vibe"; - version = "2.15.0"; + version = "2.19.0"; pyproject = true; __structuredAttrs = true; @@ -36,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "mistralai"; repo = "mistral-vibe"; tag = "v${finalAttrs.version}"; - hash = "sha256-UGi20sH/w5Yv6d89c8/1+ly3xssqnjhLug8Mvb62kK0="; + hash = "sha256-PODG/SQsZsixBz/j+k8ALBhXS1fPg3v/o6TXkTyzSIQ="; }; build-system = with python3Packages; [ @@ -118,6 +103,7 @@ python3Packages.buildPythonApplication (finalAttrs: { requests rich rpds-py + sentry-sdk six smmap sounddevice @@ -148,6 +134,8 @@ python3Packages.buildPythonApplication (finalAttrs: { pythonImportsCheck = [ "vibe" ]; nativeCheckInputs = [ + # vibe.core.agent_loop.TeleportError: Teleport requires git to be installed. + gitMinimal python3Packages.pytest-asyncio python3Packages.pytest-textual-snapshot python3Packages.pytest-xdist @@ -161,6 +149,13 @@ python3Packages.buildPythonApplication (finalAttrs: { versionCheckKeepEnvironment = [ "HOME" ]; disabledTests = [ + # vibe is spawned in a sub-process and fails to import `mcp` + # ModuleNotFoundError: No module named 'mcp' + "TestMCPConnectionPoolIntegration" + + # AssertionError: assert '32:2617357:1782120467963161870:7' != '32:2617357:1782120467963161870:7' + "test_changes_when_file_changes" + # vibe.core.llm.exceptions.BackendError: LLM backend error [mock-provider] # reason: [SSL: CERTIFICATE_VERIFY_FAILED] certificate verify failed: Missing Authority Key Identifier (_ssl.c:1032) "test_generic_backend_streaming_uses_ssl_cert_file" diff --git a/pkgs/by-name/mi/mitm6/package.nix b/pkgs/by-name/mi/mitm6/package.nix index 980bc703f4ab..849e4c2cb122 100644 --- a/pkgs/by-name/mi/mitm6/package.nix +++ b/pkgs/by-name/mi/mitm6/package.nix @@ -4,20 +4,19 @@ python3, }: -python3.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication (finalAttrs: { pname = "mitm6"; version = "0.3.0"; pyproject = true; src = fetchPypi { - inherit pname version; + inherit (finalAttrs) pname version; hash = "sha256-g+eFcJdgP7CQ6ntN17guJa4LdkGIb91mr/NKRPIukP8="; }; build-system = with python3.pkgs; [ setuptools ]; dependencies = with python3.pkgs; [ - future netifaces scapy twisted @@ -35,4 +34,4 @@ python3.pkgs.buildPythonApplication rec { maintainers = with lib.maintainers; [ fab ]; mainProgram = "mitm6"; }; -} +}) diff --git a/pkgs/by-name/mi/mitra/package.nix b/pkgs/by-name/mi/mitra/package.nix index 0e147c1981dd..f0bf3130d2a5 100644 --- a/pkgs/by-name/mi/mitra/package.nix +++ b/pkgs/by-name/mi/mitra/package.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mitra"; - version = "4.17.0"; + version = "5.6.0"; src = fetchFromCodeberg { owner = "silverpill"; repo = "mitra"; rev = "v${finalAttrs.version}"; - hash = "sha256-ysV0r0K+2ivnDg/GuqwK5HWa4/jQtopXqS9g/9wWrOw="; + hash = "sha256-1G1XHLCdeETSqltrYxfxQCL4q1x7L2sqr9C2VOB9ecs="; }; - cargoHash = "sha256-RDMLfg+KsvfXDjsCzCn53kebBRN8/6er/LsS/BzoeU0="; + cargoHash = "sha256-VGJ1ObOe/QQzSwRov06hkf9zkrmSmODiJUkhC2+Bcrk="; # require running database doCheck = false; diff --git a/pkgs/by-name/mi/mixing-station/package.nix b/pkgs/by-name/mi/mixing-station/package.nix index e2becb6acfc6..e7e650bb7afe 100644 --- a/pkgs/by-name/mi/mixing-station/package.nix +++ b/pkgs/by-name/mi/mixing-station/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mixing-station"; - version = "2.9.3"; + version = "3.0.1"; src = fetchzip { url = "https://mixingstation.app/backend/api/web/download/archive/mixing-station-pc/update/${finalAttrs.version}"; name = "mixing-station-${finalAttrs.version}.zip"; extension = "zip"; - hash = "sha256-efY+zvX2cN+yFm1xxpvsZAiMhtNW/S9g2hgLnYUYd4I="; + hash = "sha256-WpjBqiYVuqIuDiigX2lg81I02qad/vZudqdWUe2h5Sw="; stripRoot = false; }; diff --git a/pkgs/by-name/mi/mixxc/package.nix b/pkgs/by-name/mi/mixxc/package.nix index 7e302d0369f8..d84b7b683227 100644 --- a/pkgs/by-name/mi/mixxc/package.nix +++ b/pkgs/by-name/mi/mixxc/package.nix @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Minimalistic and customizable volume mixer"; homepage = "https://github.com/Elvyria/mixxc"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ daru-san ]; mainProgram = "mixxc"; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mk/mkfontscale/package.nix b/pkgs/by-name/mk/mkfontscale/package.nix index 4b3e08ccd754..cd05454e56a0 100644 --- a/pkgs/by-name/mk/mkfontscale/package.nix +++ b/pkgs/by-name/mk/mkfontscale/package.nix @@ -11,11 +11,11 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mkfontscale"; - version = "1.2.3"; + version = "1.2.4"; src = fetchurl { url = "mirror://xorg/individual/app/mkfontscale-${finalAttrs.version}.tar.xz"; - hash = "sha256-KSHNw0TxrO4EvNbqHilWXBMIJjAG4TSp7jjPnJ1v514="; + hash = "sha256-oBSSoXqbbA7j+S7leIUOMFMVufKY2l8AahzUtR2wGl4="; }; strictDeps = true; diff --git a/pkgs/by-name/mk/mkl/package.nix b/pkgs/by-name/mk/mkl/package.nix index f9e1dda4e7ab..0b8dd5091d61 100644 --- a/pkgs/by-name/mk/mkl/package.nix +++ b/pkgs/by-name/mk/mkl/package.nix @@ -8,6 +8,11 @@ _7zz, cctools, validatePkgConfig, + # sets MKL_NUM_THREADS for packages + # invoking mkl during checkPhase/installCheckPhase to + # avoid overloading builders with excessive parallelism + # See also: https://www.intel.com/content/www/us/en/docs/onemkl/developer-guide-linux/2023-0/mkl-domain-num-threads.html + checkPhaseThreadLimitHook, enableStatic ? stdenv.hostPlatform.isStatic, }: @@ -86,6 +91,10 @@ stdenvNoCC.mkDerivation ( [ rpmextract ] ); + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + buildPhase = if stdenvNoCC.hostPlatform.isDarwin then '' @@ -210,7 +219,6 @@ stdenvNoCC.mkDerivation ( license = lib.licenses.issl; platforms = [ "x86_64-linux" - "x86_64-darwin" ]; }; } diff --git a/pkgs/by-name/mk/mkroot-utils/package.nix b/pkgs/by-name/mk/mkroot-utils/package.nix new file mode 100644 index 000000000000..dcc13d4285a5 --- /dev/null +++ b/pkgs/by-name/mk/mkroot-utils/package.nix @@ -0,0 +1,49 @@ +{ + busybox, + cmake, + fakeroot, + fetchFromGitLab, + gitUpdater, + lib, + python3, + stdenv, +}: +stdenv.mkDerivation (finalAttrs: { + pname = "mkroot-utils"; + version = "0.5.3"; + + src = fetchFromGitLab { + owner = "arpa2"; + repo = "mkroot-utils"; + tag = "v${finalAttrs.version}"; + hash = "sha256-BT0OSK6QzxCegj8cXQcBbdfxoj+GxfGfDkyry0JN4Jo="; + }; + + __structuredAttrs = true; + strictDeps = true; + + nativeBuildInputs = [ + cmake + python3 + ]; + + prePatch = '' + substituteInPlace CMakeLists.txt flash/flash.c pico/picoget.c --replace-fail '/bin/ash' '${lib.getExe' busybox "ash"}' + patchShebangs test + ''; + + nativeCheckInputs = [ fakeroot ]; + + doCheck = true; + + passthru.updateScript = gitUpdater { + rev-prefix = "v"; + }; + + meta = { + description = "Simple utilities to extend RunC and \"mkroot\""; + homepage = "https://gitlab.com/arpa2/mkroot-utils"; + license = lib.licenses.bsd2; + teams = with lib.teams; [ ngi ]; + }; +}) diff --git a/pkgs/by-name/mk/mkspiffs/presets.nix b/pkgs/by-name/mk/mkspiffs/presets.nix index 4bd747c06298..87bd4bb4cb4d 100644 --- a/pkgs/by-name/mk/mkspiffs/presets.nix +++ b/pkgs/by-name/mk/mkspiffs/presets.nix @@ -7,8 +7,10 @@ lib.mapAttrs name: { CPPFLAGS }: mkspiffs.overrideAttrs { - inherit CPPFLAGS; - BUILD_CONFIG_NAME = "-${name}"; + env = { + CPPFLAGS = toString CPPFLAGS; + BUILD_CONFIG_NAME = "-${name}"; + }; } ) { diff --git a/pkgs/by-name/mk/mkvtoolnix/package.nix b/pkgs/by-name/mk/mkvtoolnix/package.nix index f596eea0c2cd..2419af49df28 100644 --- a/pkgs/by-name/mk/mkvtoolnix/package.nix +++ b/pkgs/by-name/mk/mkvtoolnix/package.nix @@ -49,13 +49,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mkvtoolnix"; - version = "99.0"; + version = "100.0"; src = fetchFromCodeberg { owner = "mbunkus"; repo = "mkvtoolnix"; tag = "release-${finalAttrs.version}"; - hash = "sha256-re4z0ZseuOP/P1HW3qdWLIo+YhLlSRBuqefewRm6KEI="; + hash = "sha256-85mL3/x7SoTgOxU/YCFh58vcGzHLG3qPbbG4MD5dB9o="; }; passthru = { @@ -98,10 +98,13 @@ stdenv.mkDerivation (finalAttrs: { ++ optionals withGUI [ cmark ] ++ optionals stdenv.hostPlatform.isLinux [ qt6.qtwayland ]; - # autoupdate is not needed but it silences a ton of pointless warnings postPatch = '' + # autoupdate is not needed but it silences a ton of pointless warnings patchShebangs . > /dev/null autoupdate configure.ac ac/*.m4 + + # fix unit tests with GUI disabled + sed -i '5i$gtest_apps.delete("gui") if !$build_mkvtoolnix_gui' rake.d/gtest.rb ''; configureFlags = [ diff --git a/pkgs/by-name/ml/mlib/package.nix b/pkgs/by-name/ml/mlib/package.nix index 8f1240d42ef0..5557ec7557a9 100644 --- a/pkgs/by-name/ml/mlib/package.nix +++ b/pkgs/by-name/ml/mlib/package.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlib"; - version = "0.8.0"; + version = "0.8.2"; src = fetchFromGitHub { owner = "P-p-H-d"; repo = "mlib"; rev = "V${finalAttrs.version}"; - hash = "sha256-l91UGIxCd6868F21jHTEQd6CgKtuUigxgZJTTnuVPwo="; + hash = "sha256-kJYQL1rTcnuFtcqREhi+PCeitV4s+TLGSPciUZDuny0="; }; makeFlags = [ diff --git a/pkgs/by-name/ml/mlkit/package.nix b/pkgs/by-name/ml/mlkit/package.nix index 68fe4302198d..d845f8d4696a 100644 --- a/pkgs/by-name/ml/mlkit/package.nix +++ b/pkgs/by-name/ml/mlkit/package.nix @@ -27,11 +27,13 @@ stdenv.mkDerivation (finalAttrs: { "mlkit_libs" "smltojs" "smltojs_basislibs" + "barry" ]; installTargets = [ "install" "install_smltojs" + "install_barry" ]; doCheck = true; @@ -46,6 +48,8 @@ stdenv.mkDerivation (finalAttrs: { make -C test_dev test echo ==== Running MLKit test suite: test_prof ==== make -C test_dev test_prof + echo ==== Running Barry test suite ==== + make -C test/barry runHook postCheck ''; @@ -54,7 +58,9 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://elsman.com/mlkit/"; changelog = "https://github.com/melsman/mlkit/blob/v${finalAttrs.version}/NEWS.md"; license = lib.licenses.gpl2Plus; - platforms = lib.platforms.unix; + platforms = [ + "x86_64-linux" + ]; maintainers = with lib.maintainers; [ athas ]; }; }) diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 99c8b2f995f6..4d07ef764a36 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -1,4 +1,5 @@ { + alsa-lib, config, lib, stdenv, @@ -8,16 +9,23 @@ which, ffmpeg, fftw, + fontconfig, frei0r, libdv, + libebur128, + libexif, libjack2, libsamplerate, + libspatialaudio, libvorbis, libxml2, libx11, + lilv, makeWrapper, movit, opencv4, + pango, + rnnoise, rtaudio, rubberband, sox, @@ -44,13 +52,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mlt"; - version = "7.38.0"; + version = "7.40.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; tag = "v${finalAttrs.version}"; - hash = "sha256-tZWkgDffNZwJgfrFQNKfS+QzpcjaM0SEBbyxrVBqubc="; + hash = "sha256-rw1jnQJzbtpGsIe/AFMiy7k/3X0vkfkY3rG4E419aVM="; # The submodule contains glaxnimate code, since MLT uses internally some functions defined in glaxnimate. # Since glaxnimate is not available as a library upstream, we cannot remove for now this dependency on # submodules until upstream exports glaxnimate as a library: https://gitlab.com/mattbas/glaxnimate/-/issues/545 @@ -74,21 +82,31 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ gdk-pixbuf - (opencv4.override { inherit ffmpeg; }) + (opencv4.override { ffmpeg-headless = ffmpeg; }) ffmpeg fftw + fontconfig frei0r libdv + libebur128 + libexif libjack2 libsamplerate + libspatialaudio libvorbis libxml2 + lilv movit + pango + rnnoise rtaudio rubberband sox vid-stab ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ + alsa-lib + ] ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart ] @@ -134,7 +152,7 @@ stdenv.mkDerivation (finalAttrs: { postFixup = '' substituteInPlace "$dev"/lib/pkgconfig/mlt-framework-7.pc \ - --replace '=''${prefix}//' '=/' + --replace-fail '=''${prefix}//' '=/' ''; passthru = { diff --git a/pkgs/by-name/mm/mmdoc/package.nix b/pkgs/by-name/mm/mmdoc/package.nix index dd09c19978ec..c9e678bdb646 100644 --- a/pkgs/by-name/mm/mmdoc/package.nix +++ b/pkgs/by-name/mm/mmdoc/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mmdoc"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "ryantm"; repo = "mmdoc"; rev = finalAttrs.version; - hash = "sha256-NS8i5xvCwq0pSdfxnaxnpuwmDAkfH6Tkc4N2F6aGvWY="; + hash = "sha256-GxGYW10GZvDzeeKy9U9iyGvfN3IM/A/pnQivx8xXhHI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mm/mmj2/package.nix b/pkgs/by-name/mm/mmj2/package.nix index c9d760c6757b..84c06933408d 100644 --- a/pkgs/by-name/mm/mmj2/package.nix +++ b/pkgs/by-name/mm/mmj2/package.nix @@ -25,7 +25,7 @@ maven.buildMavenPackage { hash = "sha256-WYBrLY04+bJGzjRMs8LgHnI6lMRhQKyz15DIoLeiE2s="; }; - mvnHash = "sha256-fu/q6CTvSllrfgnKNX6aIuPO65H/q0IPCHFuWmOFOvM="; + mvnHash = "sha256-MTI393L/t9AXYbE9hvkIQ28WzYmjt9B22XbFSlLQQUk="; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/mm/mmseqs2/package.nix b/pkgs/by-name/mm/mmseqs2/package.nix index 51680a5818d5..0c01238ae534 100644 --- a/pkgs/by-name/mm/mmseqs2/package.nix +++ b/pkgs/by-name/mm/mmseqs2/package.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional enableMpi mpi ++ lib.optionals cudaSupport [ cudaPackages.cuda_cudart - cudaPackages.cuda_cccl + cudaPackages.cccl ]; postInstall = '' diff --git a/pkgs/by-name/mo/mo-viewer/package.nix b/pkgs/by-name/mo/mo-viewer/package.nix new file mode 100644 index 000000000000..2f50164949f6 --- /dev/null +++ b/pkgs/by-name/mo/mo-viewer/package.nix @@ -0,0 +1,103 @@ +{ + lib, + stdenvNoCC, + buildGoModule, + fetchFromGitHub, + fetchPnpmDeps, + nodejs, + pnpm_10, + jq, + pnpmConfigHook, + installShellFiles, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + pname = "mo-viewer"; + version = "1.6.3"; + + src = fetchFromGitHub { + owner = "k1LoW"; + repo = "mo"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DbcktOAdcg/v5q3gYgxMvSHVtwXODz9xHoPqiiWBaP4="; + }; + + frontend = stdenvNoCC.mkDerivation (finalFrontendAttrs: { + pname = "${finalAttrs.pname}-frontend"; + inherit (finalAttrs) version src; + + pnpmRoot = "internal/frontend"; + + pnpmDeps = fetchPnpmDeps { + inherit (finalFrontendAttrs) pname version src; + sourceRoot = "${finalFrontendAttrs.src.name}/internal/frontend"; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-thlwYvB7y6RFwLknbQt5evF4xQVzllrQqVYDdKSbEUM="; + }; + + nativeBuildInputs = [ + nodejs + pnpm_10 + pnpmConfigHook + jq + ]; + + postPatch = '' + jq 'del(.pnpm.executionEnv)' internal/frontend/package.json > internal/frontend/package.json.tmp + mv internal/frontend/package.json.tmp internal/frontend/package.json + ''; + + buildPhase = '' + runHook preBuild + pnpm -C internal/frontend run build + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + cp -r internal/static/dist $out + runHook postInstall + ''; + }); + + vendorHash = "sha256-rmtJswO3DWWxpb2uk91aIatc7ugNmsqzwlEeKdX7ITE="; + + preBuild = '' + cp -r ${finalAttrs.frontend} internal/static/dist + ''; + + env.CGO_ENABLED = 0; + + ldflags = [ + "-s" + "-w" + "-X github.com/k1LoW/mo/version.Revision=v${finalAttrs.version}" + ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = lib.optionalString (stdenvNoCC.buildPlatform.canExecute stdenvNoCC.hostPlatform) '' + installShellCompletion --cmd 'mo' \ + --bash <("$out/bin/mo" completion bash) \ + --zsh <("$out/bin/mo" completion zsh) \ + --fish <("$out/bin/mo" completion fish) + ''; + + doCheck = !stdenvNoCC.hostPlatform.isDarwin; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + versionCheckProgramArg = "--version"; + + __structuredAttrs = true; + + meta = { + homepage = "https://github.com/k1LoW/mo"; + description = "Markdown viewer that opens .md files in a browser"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ ryota2357 ]; + mainProgram = "mo"; + }; +}) diff --git a/pkgs/by-name/mo/mocha/package.nix b/pkgs/by-name/mo/mocha/package.nix index 04dcea632516..bacd076a1675 100644 --- a/pkgs/by-name/mo/mocha/package.nix +++ b/pkgs/by-name/mo/mocha/package.nix @@ -7,16 +7,16 @@ buildNpmPackage (finalAttrs: { pname = "mocha"; - version = "11.7.6"; + version = "11.7.7"; src = fetchFromGitHub { owner = "mochajs"; repo = "mocha"; tag = "v${finalAttrs.version}"; - hash = "sha256-pY6LYMitbhOfjNf00UuUbLgdZii7Nr/8/SlBgM5pYMI="; + hash = "sha256-U05dHIIk9MwMY2mV9WZZl2ibS0e35tkJg/EV3EHa6C4="; }; - npmDepsHash = "sha256-1uisNcDlv/EY+Mq24rM7BgA8GREKKvxX/gHt8dHlX2Q="; + npmDepsHash = "sha256-crMuMnLJXVSzDMiZDtWXVW0x4XtZ4QXkK7qL90/kkHA="; postInstall = '' # Installed only for backwards compat, but should just be removed. diff --git a/pkgs/by-name/mo/mochi/package.nix b/pkgs/by-name/mo/mochi/package.nix index 8eb6000d6abd..c513e7211733 100644 --- a/pkgs/by-name/mo/mochi/package.nix +++ b/pkgs/by-name/mo/mochi/package.nix @@ -12,14 +12,14 @@ let pname = "mochi"; - version = "1.21.14"; + version = "1.21.17"; linux = appimageTools.wrapType2 rec { inherit pname version meta; src = fetchurl { url = "https://download.mochi.cards/releases/Mochi-${version}.AppImage"; - hash = "sha256-+iMT8xofQB2m1V4rNZHR6loRfxNGgcptD3FPlFXC5Mw="; + hash = "sha256-QYBh9ZvmJse3ZimvpU+9ky6ml0pCSZ3mVrYtWtMQGA0="; }; appimageContents = appimageTools.extractType2 { inherit pname version src; }; @@ -41,12 +41,8 @@ let inherit pname version meta; src = fetchurl { - url = "https://download.mochi.cards/releases/Mochi-${version}${lib.optionalString stdenv.hostPlatform.isAarch64 "-arm64"}.dmg"; - hash = - if stdenv.hostPlatform.isAarch64 then - "sha256-/ML5jWTBVLzitZDaBoU6sVJ0iNmq0jjMIV33yLnX1io=" - else - "sha256-vldyC/VkHf+BofpKvOxzCTM8F77k2aX9CxFP+frKvKc="; + url = "https://download.mochi.cards/releases/Mochi-${version}-arm64.dmg"; + hash = "sha256-2NADaVzkibWjxBymeF1McGEQH6xHaqDMBg080kCI0F8="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/mochi/update.sh b/pkgs/by-name/mo/mochi/update.sh index cc6e20044d54..64c69ee0f4a9 100755 --- a/pkgs/by-name/mo/mochi/update.sh +++ b/pkgs/by-name/mo/mochi/update.sh @@ -17,10 +17,8 @@ fi # Update version and hash for x86_64-linux (AppImage) update-source-version mochi "$latestVersion" --system=x86_64-linux -# Update hashes for darwin systems -for system in x86_64-darwin aarch64-darwin; do - url=$(nix-instantiate --eval --json -E "with import ./. { system = \"$system\"; }; mochi.src.url" | tr -d '"') - hash=$(nix-prefetch-url "$url") - sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") - update-source-version mochi "$latestVersion" "$sriHash" --system="$system" --ignore-same-version -done +# Update hash for aarch64-darwin +url=$(nix-instantiate --eval --json -E "with import ./. { system = \"aarch64-darwin\"; }; mochi.src.url" | tr -d '"') +hash=$(nix-prefetch-url "$url") +sriHash=$(nix --extra-experimental-features nix-command hash convert --hash-algo sha256 --to sri "$hash") +update-source-version mochi "$latestVersion" "$sriHash" --system=aarch64-darwin --ignore-same-version diff --git a/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix b/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix index 8619b9741a68..2c1ff97c83bf 100644 --- a/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix +++ b/pkgs/by-name/mo/mod-arpeggiator-lv2/package.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { version = "0-unstable-2021-11-09"; src = fetchFromGitHub { - owner = "moddevices"; + owner = "mod-audio"; repo = "mod-arpeggiator-lv2"; rev = "82f3d9f159ce216454656a8782362c3d5ed48bed"; sha256 = "sha256-1KiWMTVTTf1/iR4AzJ1Oe0mOrWN5edsZN0tQMidgnRA="; @@ -25,7 +25,7 @@ stdenv.mkDerivation { meta = { description = "LV2 arpeggiator"; - homepage = "https://github.com/moddevices/mod-arpeggiator-lv2"; + homepage = "https://github.com/mod-audio/mod-arpeggiator-lv2"; license = lib.licenses.gpl2Plus; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; diff --git a/pkgs/by-name/mo/mod-distortion/package.nix b/pkgs/by-name/mo/mod-distortion/package.nix index 0ca62124c43e..2a0f02e94f76 100644 --- a/pkgs/by-name/mo/mod-distortion/package.nix +++ b/pkgs/by-name/mo/mod-distortion/package.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { version = "0-unstable-2016-08-19"; src = fetchFromGitHub { - owner = "portalmod"; + owner = "mod-audio"; repo = "mod-distortion"; rev = "e672d5feb9d631798e3d56eb96e8958c3d2c6821"; sha256 = "005wdkbhn9dgjqv019cwnziqg86yryc5vh7j5qayrzh9v446dw34"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { installFlags = [ "INSTALL_PATH=$(out)/lib/lv2" ]; meta = { - homepage = "https://github.com/portalmod/mod-distortion"; + homepage = "https://github.com/mod-audio/mod-distortion"; description = "Analog distortion emulation lv2 plugins"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; diff --git a/pkgs/by-name/mo/modal/package.nix b/pkgs/by-name/mo/modal/package.nix new file mode 100644 index 000000000000..40f1008f2f06 --- /dev/null +++ b/pkgs/by-name/mo/modal/package.nix @@ -0,0 +1 @@ +{ python3Packages }: with python3Packages; toPythonApplication modal diff --git a/pkgs/by-name/mo/modctl/package.nix b/pkgs/by-name/mo/modctl/package.nix new file mode 100644 index 000000000000..c910dd3112ad --- /dev/null +++ b/pkgs/by-name/mo/modctl/package.nix @@ -0,0 +1,56 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, +}: + +buildGoModule (finalAttrs: { + __structuredAttrs = true; + pname = "modctl"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "modelpack"; + repo = "modctl"; + tag = "v${finalAttrs.version}"; + hash = "sha256-A7s2jM+hR5WgeiWzPjjfS/AJy35x6kzewIucz713zLc="; + }; + + vendorHash = "sha256-S1ygAZO3bTFi/3pwmNYE7P/Vqg7AVHpH5YRJ3yzzvyo="; + + ldflags = [ + "-s" + "-X github.com/modelpack/modctl/pkg/version.GitVersion=v${finalAttrs.version}" + ]; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + # modctl's cobra commands invoke config.NewRoot(), which uses + # os/user.Current() to find the home directory. On darwin os/user + # bypasses $HOME and resolves it via getpwuid (returning /var/empty, + # not writable), so the install check fails. versionCheckHook only + # accepts a single argument, so wrap the binary and point + # --log-dir/--storage-dir at TMPDIR to keep the check working on all + # platforms. + preVersionCheck = '' + wrapper="$NIX_BUILD_TOP/modctl-version-check" + cat > "$wrapper" < 0 )); do + case "$1" in + -I) + shift + args+=("--exclude=$1") + ;; + *) + args+=("$1") + ;; + esac + shift + done + + exec ${lib.getExe' coreutils "du"} "''${args[@]}" + ''; +in +buildGoModule (finalAttrs: { + pname = "mole-cleaner"; + version = "1.46.0"; + + src = fetchFromGitHub { + owner = "tw93"; + repo = "Mole"; + tag = "V${finalAttrs.version}"; + hash = "sha256-rIoVXEz4K0RFb1ir1gRCyDw5euNwQvLS0GwBsJhuApE="; + }; + + vendorHash = "sha256-hLFlAy4AE1eNOxd4d75Mbo3ZKlwvNK7QV2DNVPd7NHc="; + + __structuredAttrs = true; + + nativeBuildInputs = [ + makeWrapper + ]; + + nativeInstallCheckInputs = [ + versionCheckHook + writableTmpDirAsHomeHook + coreutils + gawk + ]; + + buildPhase = '' + runHook preBuild + go build -p "$NIX_BUILD_CORES" -o analyze ./cmd/analyze + go build -p "$NIX_BUILD_CORES" -o status ./cmd/status + runHook postBuild + ''; + + installPhase = '' + runHook preInstall + + install -Dm755 mole $out/libexec/mole/mole + cp -r bin lib $out/libexec/mole/ + + install -Dm755 analyze $out/libexec/mole/bin/analyze-go + install -Dm755 status $out/libexec/mole/bin/status-go + + patchShebangs $out/libexec/mole + + substituteInPlace $out/libexec/mole/mole \ + --replace-fail 'update_message="$(read_update_message_cache "$msg_cache")"' 'update_message=""' + + mkdir -p $out/libexec/mole/nix-bin + ln -s ${lib.getExe' coreutils "timeout"} $out/libexec/mole/nix-bin/timeout + + makeWrapper $out/libexec/mole/mole $out/bin/mo \ + --run ' + case "$1" in + update|remove) + echo "mo $1 is unsupported for Nix-installed Mole; update or remove it through your Nix profile or configuration." >&2 + exit 1 + ;; + esac + export PATH=${ + lib.makeBinPath [ + fd + ] + }:'"$out"'/libexec/mole/nix-bin:/usr/bin:/bin:''${PATH} + ' + + runHook postInstall + ''; + + checkPhase = '' + runHook preCheck + # Keep buildGoModule's test behavior: tests can rely on their source paths. + export GOFLAGS="''${GOFLAGS//-trimpath/}" + mkdir -p "$TMPDIR/mole-test-bin" + ln -s ${duForTests} "$TMPDIR/mole-test-bin/du" + PATH="$TMPDIR/mole-test-bin:$PATH" go test ./... + runHook postCheck + ''; + + doInstallCheck = true; + versionCheckKeepEnvironment = "HOME PATH"; + versionCheckProgram = "${placeholder "out"}/bin/mo"; + versionCheckProgramArg = "--version"; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/mo --help > /dev/null + test -w "$HOME" + test ! -e $out/bin/mole + runHook postInstallCheck + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ "--version-regex=^V(.*)$" ]; + }; + + meta = { + description = "CLI tool for cleaning and optimizing macOS systems"; + homepage = "https://github.com/tw93/Mole"; + changelog = "https://github.com/tw93/Mole/releases/tag/V${finalAttrs.version}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ IanHollow ]; + mainProgram = "mo"; + platforms = lib.platforms.darwin; + }; +}) diff --git a/pkgs/by-name/mo/mole/package.nix b/pkgs/by-name/mo/mole/package.nix index f704747b45ad..cee2fd9ac470 100644 --- a/pkgs/by-name/mo/mole/package.nix +++ b/pkgs/by-name/mo/mole/package.nix @@ -27,7 +27,7 @@ buildGoModule (finalAttrs: { meta = { description = "CLI application to create SSH tunnels"; homepage = "https://github.com/davrodpin/mole"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; broken = stdenv.hostPlatform.isDarwin; # build fails with go > 1.17 mainProgram = "mole"; diff --git a/pkgs/by-name/mo/molotov/package.nix b/pkgs/by-name/mo/molotov/package.nix index c7c018ec04db..39453f9aa5ec 100644 --- a/pkgs/by-name/mo/molotov/package.nix +++ b/pkgs/by-name/mo/molotov/package.nix @@ -26,7 +26,7 @@ appimageTools.wrapType2 { meta = { description = "French TV service"; homepage = "https://www.molotov.tv/"; - license = with lib.licenses; [ unfree ]; + license = lib.licenses.unfree; maintainers = with lib.maintainers; [ apeyroux ]; platforms = [ "x86_64-linux" ]; mainProgram = "molotov"; diff --git a/pkgs/by-name/mo/mona-sans/package.nix b/pkgs/by-name/mo/mona-sans/package.nix index d8cd9f825040..409276105da9 100644 --- a/pkgs/by-name/mo/mona-sans/package.nix +++ b/pkgs/by-name/mo/mona-sans/package.nix @@ -7,7 +7,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "mona-sans"; - version = "2.0.23"; + version = "2.0.27"; outputs = [ "out" @@ -15,10 +15,10 @@ stdenvNoCC.mkDerivation (finalAttrs: { ]; src = fetchFromGitHub { - rev = finalAttrs.version; owner = "github"; repo = "mona-sans"; - sha256 = "sha256-VBbn59v1EqP2cEDqna5vSz/uSgFHmF97bsAHyOBbRt0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-P5Dy38iS0Cly+Rcjg3EQSZozvdfsXwa6yz+IdgrSq4M="; }; nativeBuildInputs = [ installFonts ]; diff --git a/pkgs/by-name/mo/monero-cli/package.nix b/pkgs/by-name/mo/monero-cli/package.nix index e53a3932694e..1373f0892267 100644 --- a/pkgs/by-name/mo/monero-cli/package.nix +++ b/pkgs/by-name/mo/monero-cli/package.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "monero-cli"; - version = "0.18.5.0"; + version = "0.18.5.1"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero"; rev = "v${version}"; - hash = "sha256-clw+7mZenWp58iA7fuEp4BPFH3KUwL53cC4IChIVh7w="; + hash = "sha256-RxuhR+GH4Y5kSzNxsqJklRWMbq1K82K3A2V+6JqYR98="; }; patches = [ diff --git a/pkgs/by-name/mo/monero-gui/package.nix b/pkgs/by-name/mo/monero-gui/package.nix index 6b5d85f65dde..d23e85658c1c 100644 --- a/pkgs/by-name/mo/monero-gui/package.nix +++ b/pkgs/by-name/mo/monero-gui/package.nix @@ -27,13 +27,13 @@ stdenv.mkDerivation rec { pname = "monero-gui"; - version = "0.18.5.0"; + version = "0.18.5.2"; src = fetchFromGitHub { owner = "monero-project"; repo = "monero-gui"; rev = "v${version}"; - hash = "sha256-uBZMBQ6Co1+H8DsyeL1vbjtVlKyIkJopKxHxr24BZv0="; + hash = "sha256-2FlenQtrsoHmRTfU+KhWtg3eVPzz9ktQ3dnOlWhOPC8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/monetdb/package.nix b/pkgs/by-name/mo/monetdb/package.nix index 57a28d4d86e4..69f84d2b5138 100644 --- a/pkgs/by-name/mo/monetdb/package.nix +++ b/pkgs/by-name/mo/monetdb/package.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monetdb"; - version = "11.55.3"; + version = "11.55.5"; src = fetchurl { url = "https://dev.monetdb.org/downloads/sources/archive/MonetDB-${finalAttrs.version}.tar.bz2"; - hash = "sha256-40FFpQgu6GPoy2HpEyOmX6+79F9ROaORmPtrXtKaZ5A="; + hash = "sha256-u/Jukp09g8i/zcUA0vFqmTMvX4XcNPs/gIRInvZSHj0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mo/mongocxx/package.nix b/pkgs/by-name/mo/mongocxx/package.nix index 911ec75b40ad..1e7a68ee21ba 100644 --- a/pkgs/by-name/mo/mongocxx/package.nix +++ b/pkgs/by-name/mo/mongocxx/package.nix @@ -59,6 +59,5 @@ stdenv.mkDerivation (finalAttrs: { "libbsoncxx" ]; platforms = lib.platforms.all; - badPlatforms = [ "x86_64-darwin" ]; # needs sdk >= 10.14 }; }) diff --git a/pkgs/by-name/mo/mongodb-ce/package.nix b/pkgs/by-name/mo/mongodb-ce/package.nix index 4fb2618f35b5..f7f763729501 100644 --- a/pkgs/by-name/mo/mongodb-ce/package.nix +++ b/pkgs/by-name/mo/mongodb-ce/package.nix @@ -17,7 +17,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "mongodb-ce"; - version = "8.2.7"; + version = "8.2.11"; + __structuredAttrs = true; + strictDeps = true; src = finalAttrs.passthru.sources.${stdenv.hostPlatform.system} @@ -49,23 +51,24 @@ stdenv.mkDerivation (finalAttrs: { nativeInstallCheckInputs = [ versionCheckHook ]; versionCheckProgram = "${placeholder "out"}/bin/mongod"; + # Apple's LibreSSL tries to read this while running `mongod --version` + sandboxProfile = lib.optionalString stdenv.hostPlatform.isDarwin '' + (allow file-read* (literal "/private/etc/ssl/openssl.cnf")) + ''; + passthru = { sources = { "x86_64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-x86_64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-GYyWeVSoRXgrlQqx7R2chxH3+5S4ewbTefWJR9S2Frs="; + hash = "sha256-sqFkZ19eYZHQFwVX2zwaKaYXisvoqN25+8DFbyGU2H4="; }; "aarch64-linux" = fetchurl { url = "https://fastdl.mongodb.org/linux/mongodb-linux-aarch64-ubuntu2404-${finalAttrs.version}.tgz"; - hash = "sha256-HTErVesWEWDjheedELdDOwlMrDvhV3JdVGtV3RuSeBI="; - }; - "x86_64-darwin" = fetchurl { - url = "https://fastdl.mongodb.org/osx/mongodb-macos-x86_64-${finalAttrs.version}.tgz"; - hash = "sha256-DeD/v+NP2b8BTReV80+Lz0O9t6e3O9+52sJmTK5NtVY="; + hash = "sha256-5AX8pb1jInbQTuE0RqpqqcRXon6wKwdvoDCNDF70krE="; }; "aarch64-darwin" = fetchurl { url = "https://fastdl.mongodb.org/osx/mongodb-macos-arm64-${finalAttrs.version}.tgz"; - hash = "sha256-d8uulXczpq7ZEDmDsbb3o9kaZJ1IYzZ6MkgBLkNU4Mo="; + hash = "sha256-M3/x/d2rVKUmIZBQ9hVuT6W9ajZy/Ut5+8aDeXF+HwY="; }; }; updateScript = @@ -113,7 +116,7 @@ stdenv.mkDerivation (finalAttrs: { changelog = "https://www.mongodb.com/docs/upcoming/release-notes/8.2/"; description = "MongoDB is a general purpose, document-based, distributed database"; homepage = "https://www.mongodb.com/"; - license = with lib.licenses; [ sspl ]; + license = lib.licenses.sspl; longDescription = '' MongoDB CE (Community Edition) is a general purpose, document-based, distributed database. It is designed to be flexible and easy to use, with the ability to store data of any structure. diff --git a/pkgs/by-name/mo/mongodb-compass/package.nix b/pkgs/by-name/mo/mongodb-compass/package.nix index 32d614997e6c..a1789c333cfc 100644 --- a/pkgs/by-name/mo/mongodb-compass/package.nix +++ b/pkgs/by-name/mo/mongodb-compass/package.nix @@ -52,7 +52,7 @@ let pname = "mongodb-compass"; - version = "1.49.8"; + version = "1.49.10"; selectSystem = attrs: @@ -62,14 +62,12 @@ let url = "https://downloads.mongodb.com/compass/${ selectSystem { x86_64-linux = "mongodb-compass_${version}_amd64.deb"; - x86_64-darwin = "mongodb-compass-${version}-darwin-x64.zip"; aarch64-darwin = "mongodb-compass-${version}-darwin-arm64.zip"; } }"; hash = selectSystem { - x86_64-linux = "sha256-5SmMFzQploo1EkXYmLDL4XdM+vKlIWkaIh1fFrIgrqY="; - x86_64-darwin = "sha256-2GgyiH7Bhm1MbjmgMvo8CuLQEsVCZkALiy1mtH/Zl1Q="; - aarch64-darwin = "sha256-a1nWzTR1dZhm/rVURl0kK2qTyHEnAZeQKiYKzRO6MqY="; + x86_64-linux = "sha256-faD8sIbnho5urBWE0btcmD7tXT8eQCNyJYzpIyI+bA4="; + aarch64-darwin = "sha256-HGOJPYC4+CgLQQ3BNUTNZUln5oqPkC8ewHft99LCZQ8="; }; }; @@ -197,7 +195,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "x86_64-linux" "aarch64-darwin" - "x86_64-darwin" ]; }; }) diff --git a/pkgs/by-name/mo/mongosh/package.nix b/pkgs/by-name/mo/mongosh/package.nix index fea7fd4338a7..70b9ea6b0735 100644 --- a/pkgs/by-name/mo/mongosh/package.nix +++ b/pkgs/by-name/mo/mongosh/package.nix @@ -2,21 +2,21 @@ lib, buildNpmPackage, fetchFromGitHub, - nodejs_22, + nodejs_24, }: -buildNpmPackage.override { nodejs = nodejs_22; } (finalAttrs: { +buildNpmPackage.override { nodejs = nodejs_24; } (finalAttrs: { pname = "mongosh"; - version = "2.8.3"; + version = "2.9.2"; src = fetchFromGitHub { owner = "mongodb-js"; repo = "mongosh"; tag = "v${finalAttrs.version}"; - hash = "sha256-CHHGQYJBv1sVo2LT9jxx+c15TU8ecG9R5DVQOA9yG+A="; + hash = "sha256-mwc9Mv8BJgI/7DzUH6QwHsWzgAquB8ehmnElM5+mYuI="; }; - npmDepsHash = "sha256-FlVKJqXiDW3FdBrm2lN2vw+xFkvm7J1FgCEI6rFfR4o="; + npmDepsHash = "sha256-xI+6a0sMuZmij46N5aqsprLLiVaSZifGW8tMq189fww="; patches = [ ./disable-telemetry.patch diff --git a/pkgs/by-name/mo/monkeys-audio/package.nix b/pkgs/by-name/mo/monkeys-audio/package.nix index 2d7bf79c6796..696a05b02521 100644 --- a/pkgs/by-name/mo/monkeys-audio/package.nix +++ b/pkgs/by-name/mo/monkeys-audio/package.nix @@ -6,12 +6,12 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "13.03"; + version = "13.19"; pname = "monkeys-audio"; src = fetchzip { url = "https://monkeysaudio.com/files/MAC_${builtins.concatStringsSep "" (lib.strings.splitString "." finalAttrs.version)}_SDK.zip"; - hash = "sha256-cZc6UtoZVEL3aWXPzLjfKshsr78V7y8X0Dw6qvJcVco="; + hash = "sha256-i2FNQB6ZMt2ZnWjVr3UDSqxHav/MAKuDwC+h+gXW/Ik="; stripRoot = false; }; diff --git a/pkgs/by-name/mo/mono_repo/package.nix b/pkgs/by-name/mo/mono_repo/package.nix index 922db42dc289..1a59bdb618d9 100644 --- a/pkgs/by-name/mo/mono_repo/package.nix +++ b/pkgs/by-name/mo/mono_repo/package.nix @@ -15,7 +15,7 @@ buildDartApplication (finalAttrs: { # Fetch the whole monorepo src = fetchFromGitHub { owner = "google"; - repo = "mono_repo"; + repo = "mono_repo.dart"; tag = "mono_repo-v${finalAttrs.version}"; hash = "sha256-2/YJ2S3I9K5Xzje787HdJ/KxfbiBEGKU8feuHnOizn8="; }; diff --git a/pkgs/by-name/mo/monocypher/package.nix b/pkgs/by-name/mo/monocypher/package.nix index f2df4a3d8770..c5b559f60aaf 100644 --- a/pkgs/by-name/mo/monocypher/package.nix +++ b/pkgs/by-name/mo/monocypher/package.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "monocypher"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "https://monocypher.org/download/monocypher-${finalAttrs.version}.tar.gz"; - hash = "sha256-ONBxeXOMDJBnfbo863p7hJa8/qdYuhpT6AP+0wrgh5w="; + hash = "sha256-jMm8NBpmJJAW25vXDpFC2NCu+ZRZc3RLGsBdvFXY7mY="; }; installFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/by-name/mo/monodraw/package.nix b/pkgs/by-name/mo/monodraw/package.nix index 3a80b9f382bf..386fe0127ef7 100644 --- a/pkgs/by-name/mo/monodraw/package.nix +++ b/pkgs/by-name/mo/monodraw/package.nix @@ -69,7 +69,6 @@ stdenvNoCC.mkDerivation (finalAttrs: { license = lib.licenses.unfree; maintainers = with lib.maintainers; [ delafthi ]; platforms = [ - "x86_64-darwin" "aarch64-darwin" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; diff --git a/pkgs/by-name/mo/monsoon/package.nix b/pkgs/by-name/mo/monsoon/package.nix index 8fc3576649c7..31491e9d175c 100644 --- a/pkgs/by-name/mo/monsoon/package.nix +++ b/pkgs/by-name/mo/monsoon/package.nix @@ -3,12 +3,16 @@ stdenv, buildGoModule, fetchFromGitHub, + versionCheckHook, + nix-update-script, }: buildGoModule (finalAttrs: { pname = "monsoon"; version = "0.10.1"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "RedTeamPentesting"; repo = "monsoon"; @@ -18,19 +22,32 @@ buildGoModule (finalAttrs: { vendorHash = "sha256-hGEUO1sl8IKXo4rkS81Wlf7187lu2PrSujNlGNTLwmE="; + ldflags = [ + "-s" + "-X=main.version=v${finalAttrs.version}" + ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + versionCheckProgramArg = [ "version" ]; + # Tests fails on darwin doCheck = !stdenv.hostPlatform.isDarwin; + passthru.updateScript = nix-update-script { }; + meta = { description = "Fast HTTP enumerator"; - mainProgram = "monsoon"; longDescription = '' A fast HTTP enumerator that allows you to execute a large number of HTTP requests, filter the responses and display them in real-time. ''; homepage = "https://github.com/RedTeamPentesting/monsoon"; - changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/RedTeamPentesting/monsoon/releases/tag/v${finalAttrs.src.tag}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; + mainProgram = "monsoon"; }; }) diff --git a/pkgs/by-name/mo/moon/package.nix b/pkgs/by-name/mo/moon/package.nix index 42d00115174e..0c405a7c3b3b 100644 --- a/pkgs/by-name/mo/moon/package.nix +++ b/pkgs/by-name/mo/moon/package.nix @@ -5,6 +5,7 @@ fetchFromGitHub, openssl, pkg-config, + protobuf, versionCheckHook, nix-update-script, installShellFiles, @@ -14,16 +15,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "moon"; - version = "1.41.8"; + version = "2.3.2"; src = fetchFromGitHub { owner = "moonrepo"; repo = "moon"; tag = "v${finalAttrs.version}"; - hash = "sha256-KPK1XE18A8vh5FlGIPizxWmEVPkJHcy6fvtFsOQlhok="; + hash = "sha256-Nc3J6s6+Go73lOnveH7agT80y9PVqLZw+x22vvi2mcg="; }; - cargoHash = "sha256-U3Hq5zy1dvG/sJA08bBi2mwMbTP2E5LLIpx0rMq2U1A="; + cargoHash = "sha256-+pmn9+7VNQyggoTmlhZ7s9vTnhSDWp5rqnFFbyLAfMk="; env = { RUSTFLAGS = "-C strip=symbols"; @@ -33,6 +34,7 @@ rustPlatform.buildRustPackage (finalAttrs: { buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config + protobuf installShellFiles writableTmpDirAsHomeHook ]; diff --git a/pkgs/by-name/mo/moonlight/package.nix b/pkgs/by-name/mo/moonlight/package.nix index 2ffba6b8cdb1..9cf4cb77ed4d 100644 --- a/pkgs/by-name/mo/moonlight/package.nix +++ b/pkgs/by-name/mo/moonlight/package.nix @@ -17,13 +17,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "moonlight"; - version = "2026.5.2"; + version = "2026.7.0"; src = fetchFromGitHub { owner = "moonlight-mod"; repo = "moonlight"; tag = "v${finalAttrs.version}"; - hash = "sha256-eTya6Y7dw/otqohgYZudkqrcI50740jFUTe4Lyd6GKc="; + hash = "sha256-c6F/HGxdpNeKYFwaeyQsa4rtfXnd++Xa3hIdgN2oPwA="; }; nativeBuildInputs = [ @@ -86,7 +86,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.lgpl3; maintainers = with lib.maintainers; [ ilys - FlameFlag + _4evy isabelroses ]; }; diff --git a/pkgs/by-name/mo/moonshine/package.nix b/pkgs/by-name/mo/moonshine/package.nix new file mode 100644 index 000000000000..c0d792c09e22 --- /dev/null +++ b/pkgs/by-name/mo/moonshine/package.nix @@ -0,0 +1,125 @@ +{ + cmake, + fetchFromGitHub, + pkg-config, + lib, + libevdev, + libgbm, + libGL, + libopus, + libx11, + libxkbcommon, + libxres, + nix-update-script, + rustPlatform, + versionCheckHook, + vulkan-loader, + wayland, +}: + +let + # Fetch the C++ sources of inputtino explicitly since the inputtino-sys crate requires them to be present. + # Revision matches Cargo.lock + inputtino-src = fetchFromGitHub { + owner = "games-on-whales"; + repo = "inputtino"; + rev = "f4ce2b0df536ef309e9ff318f75b460f7097d7c1"; + hash = "sha256-mAAXbIK7aNSLyN7OZX9YeesMvT6OZmT9uAx0md6pyRM="; + }; +in +rustPlatform.buildRustPackage (finalAttrs: { + pname = "moonshine"; + version = "0.13.5"; + + src = fetchFromGitHub { + owner = "hgaiser"; + repo = "moonshine"; + tag = "v${finalAttrs.version}"; + hash = "sha256-DwRUVMAm4fSqZu6jECeasiRpnwBt7thWkXzztNRIjcs="; + }; + + __structuredAttrs = true; + strictDeps = true; + + cargoHash = "sha256-M/VNPnccqK3koa0TeMd+tml79O7BKLxHmrGcGPemGhI="; + + # Build Moonshine binary and Vulkan layer + cargoBuildFlags = [ + "-p" + "moonshine" + "-p" + "moonshine-wsi" + ]; + + nativeBuildInputs = [ + pkg-config + cmake + rustPlatform.bindgenHook + ]; + + buildInputs = [ + libevdev + libgbm + libopus + libxkbcommon + wayland + ]; + + # Patch build.rs from inputtino-sys with the C++ inputtino sources. + # Also drop the unneeded libc++ dependency. + postPatch = '' + grep -q 'inputtino#${inputtino-src.rev}' Cargo.lock || { + echo "ERROR: inputtino revision needs update (must match Cargo.lock)" + exit 1 + } + + substituteInPlace $cargoDepsCopy/*/inputtino-sys-*/build.rs \ + --replace-fail 'PathBuf::from("../../../")' 'PathBuf::from("${inputtino-src}")' \ + --replace-fail 'println!("cargo:rustc-link-lib=c++");' "" + ''; + + postInstall = '' + # Setup implicit Vulkan layer manifest as required by Moonshine + install -d "$out/share/vulkan/implicit_layer.d" + substitute dist/VkLayer_moonshine_wsi.json \ + "$out/share/vulkan/implicit_layer.d/VkLayer_moonshine_wsi.json" \ + --replace-fail /usr/lib/moonshine/vulkan-layers/libmoonshine_wsi.so \ + "$out/lib/libmoonshine_wsi.so" + + # udev rules for input + install -Dm644 dist/60-moonshine.rules "$out/lib/udev/rules.d/60-moonshine.rules" + ''; + + postFixup = '' + patchelf --add-rpath ${ + lib.makeLibraryPath [ + libGL + vulkan-loader + # Required by Steam focus protocol (x11_focus.rs) + libx11 + libxres + ] + } "$out/bin/moonshine" + ''; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + # NOTE: If upstream bumps inputtino, this must be manually updated above + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Headless streaming server for Moonlight clients"; + longDescription = '' + Moonshine lets you stream games from your PC to any device running Moonlight. + Your keyboard, mouse, and controller inputs are sent back to the host so you + can play games remotely as if you were sitting in front of it. + ''; + homepage = "https://github.com/hgaiser/moonshine"; + changelog = "https://github.com/hgaiser/moonshine/releases/tag/v${finalAttrs.version}"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ neobrain ]; + mainProgram = "moonshine"; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/mo/moor/package.nix b/pkgs/by-name/mo/moor/package.nix index 844a230753a3..60d6404b252b 100644 --- a/pkgs/by-name/mo/moor/package.nix +++ b/pkgs/by-name/mo/moor/package.nix @@ -10,13 +10,13 @@ buildGoModule (finalAttrs: { pname = "moor"; - version = "2.15.0"; + version = "2.15.1"; src = fetchFromGitHub { owner = "walles"; repo = "moor"; tag = "v${finalAttrs.version}"; - hash = "sha256-TUMv7+8RUHzNTydUE+Tqihn7VD0QXUdegsU3elGAQG4="; + hash = "sha256-AaoEG7N6N1OmJFlDRW1GhonKEQBaYKKYax/ahdEhtnU="; }; vendorHash = "sha256-vf0hdrNy8HrQBtZZKwmbWOVn2TB6tV4qdews8Enjwao="; diff --git a/pkgs/by-name/mo/mopac/package.nix b/pkgs/by-name/mo/mopac/package.nix index c5e5dacccb9b..c70b46ded59c 100644 --- a/pkgs/by-name/mo/mopac/package.nix +++ b/pkgs/by-name/mo/mopac/package.nix @@ -39,10 +39,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - preCheck = '' - export OMP_NUM_THREADS=2 - ''; - meta = { description = "Semiempirical quantum chemistry"; homepage = "https://github.com/openmopac/mopac"; diff --git a/pkgs/by-name/mo/morewaita-icon-theme/package.nix b/pkgs/by-name/mo/morewaita-icon-theme/package.nix index 82413b29852c..0cc65fc43082 100644 --- a/pkgs/by-name/mo/morewaita-icon-theme/package.nix +++ b/pkgs/by-name/mo/morewaita-icon-theme/package.nix @@ -46,7 +46,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "Adwaita style extra icons theme for Gnome Shell"; homepage = "https://github.com/somepaulo/MoreWaita"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; platforms = lib.platforms.linux; maintainers = with lib.maintainers; [ pkosel diff --git a/pkgs/by-name/mo/mos/package.nix b/pkgs/by-name/mo/mos/package.nix index deaae5b146e1..2ed11eaf8ba9 100644 --- a/pkgs/by-name/mo/mos/package.nix +++ b/pkgs/by-name/mo/mos/package.nix @@ -3,15 +3,14 @@ stdenvNoCC, fetchurl, unzip, - nix-update-script, }: stdenvNoCC.mkDerivation (finalAttrs: { pname = "mos"; - version = "4.2.0"; + version = "4.2.1"; src = fetchurl { - url = "https://github.com/Caldis/Mos/releases/download/${finalAttrs.version}/Mos.Versions.${finalAttrs.version}-20260505.1.zip"; - hash = "sha256-SswAG7V+7LbAbPcHwS4Kr+0TFg6XWhYTEK7lVC3lYCQ="; + url = "https://github.com/Caldis/Mos/releases/download/${finalAttrs.version}/Mos.Versions.${finalAttrs.version}-20260531.1.zip"; + hash = "sha256-LqaelvCS5E2tqTpVvaHN2rMynFJ7vV8G4A37eOlTlgo="; }; sourceRoot = "."; diff --git a/pkgs/by-name/mo/mosdepth/package.nix b/pkgs/by-name/mo/mosdepth/package.nix index b7064c65e635..2750e21a8a04 100644 --- a/pkgs/by-name/mo/mosdepth/package.nix +++ b/pkgs/by-name/mo/mosdepth/package.nix @@ -9,8 +9,6 @@ buildNimPackage (finalAttrs: { pname = "mosdepth"; version = "0.3.13"; - requiredNimVersion = 1; - src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; diff --git a/pkgs/by-name/mo/moshi/package.nix b/pkgs/by-name/mo/moshi/package.nix index 9b4b90df7da5..2e269857d4f8 100644 --- a/pkgs/by-name/mo/moshi/package.nix +++ b/pkgs/by-name/mo/moshi/package.nix @@ -83,7 +83,7 @@ rustPlatform.buildRustPackage (finalAttrs: { alsa-lib ] ++ lib.optionals config.cudaSupport [ - cudaPackages.cuda_cccl + cudaPackages.cccl cudaPackages.cuda_cudart cudaPackages.cuda_nvrtc cudaPackages.libcublas @@ -129,7 +129,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/kyutai-labs/moshi"; # The rust implementation is licensed under Apache # https://github.com/kyutai-labs/moshi/tree/main/rust#license - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.all; mainProgram = "moshi-cli"; diff --git a/pkgs/by-name/mo/mosquitto/package.nix b/pkgs/by-name/mo/mosquitto/package.nix index b295de57ed23..56621743f089 100644 --- a/pkgs/by-name/mo/mosquitto/package.nix +++ b/pkgs/by-name/mo/mosquitto/package.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "WITH_BUNDLED_DEPS" false) (lib.cmakeBool "WITH_WEBSOCKETS" true) (lib.cmakeBool "WITH_SYSTEMD" withSystemd) - (lib.cmakeBool "WITH_TESTS" finalAttrs.doCheck) + (lib.cmakeBool "WITH_TESTS" finalAttrs.finalPackage.doCheck) ]; postFixup = '' diff --git a/pkgs/by-name/mo/motif/package.nix b/pkgs/by-name/mo/motif/package.nix index e26a574a4372..13fb70496167 100644 --- a/pkgs/by-name/mo/motif/package.nix +++ b/pkgs/by-name/mo/motif/package.nix @@ -144,7 +144,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://motif.ics.com"; description = "Unix standard widget-toolkit and window-manager"; platforms = lib.platforms.unix; - license = with lib.licenses; [ lgpl21Plus ]; + license = lib.licenses.lgpl21Plus; maintainers = with lib.maintainers; [ qyliss ]; broken = demoSupport && stdenv.cc.isClang && lib.versionAtLeast stdenv.cc.version "16"; }; diff --git a/pkgs/by-name/mo/motioneye/package.nix b/pkgs/by-name/mo/motioneye/package.nix index 7a5ee72311ef..a947a722d8c1 100644 --- a/pkgs/by-name/mo/motioneye/package.nix +++ b/pkgs/by-name/mo/motioneye/package.nix @@ -2,31 +2,21 @@ lib, python3Packages, fetchFromGitHub, - fetchpatch, + versionCheckHook, }: python3Packages.buildPythonApplication rec { pname = "motioneye"; - version = "0.43.1"; + version = "0.44.0"; pyproject = true; src = fetchFromGitHub { owner = "motioneye-project"; repo = "motioneye"; tag = version; - hash = "sha256-ckOgYmOP5irjNutcC3FMZPBexn/CldG0UtFZ+tPYNJ4="; + hash = "sha256-4sXttSSkmMgsoZb7PXEXXh8KNORTSmqq4lYp3JBDmPo="; }; - patches = [ - # fix pytest - # https://github.com/motioneye-project/motioneye/pull/3271 - (fetchpatch { - url = "https://github.com/motioneye-project/motioneye/commit/41c0727e2872af1b758743c41b529e76dcac6f84.patch"; - hash = "sha256-0zDveoAN1T0SuCob0U/9GEGTh7pj2CXH/j4YrjO0VE0="; - includes = [ "conftest.py" ]; - }) - ]; - build-system = with python3Packages; [ setuptools ]; @@ -38,16 +28,24 @@ python3Packages.buildPythonApplication rec { pillow pycurl tornado + argon2-cffi ]; nativeCheckInputs = with python3Packages; [ pytestCheckHook ]; + nativeInstallCheckInputs = [ + versionCheckHook + ]; + pythonImportsCheck = [ "motioneye" ]; + versionCheckProgram = "${placeholder "out"}/bin/meyectl"; + versionCheckProgramArg = "-v"; + meta = { description = "Web frontend for the motion daemon"; homepage = "https://github.com/motioneye-project/motioneye"; diff --git a/pkgs/by-name/mo/motrix-next/package.nix b/pkgs/by-name/mo/motrix-next/package.nix index 0f9b3e7fc9fc..6ff993c596ba 100644 --- a/pkgs/by-name/mo/motrix-next/package.nix +++ b/pkgs/by-name/mo/motrix-next/package.nix @@ -25,16 +25,16 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "motrix-next"; - version = "3.9.3"; + version = "3.9.6"; src = fetchFromGitHub { owner = "AnInsomniacy"; repo = "motrix-next"; tag = "v${finalAttrs.version}"; - hash = "sha256-TK3M9fL+g1F9vFibZL4TXYCBeID1uz6+gRPtOxAAmLs="; + hash = "sha256-ynLi+biCdjU7EOq556YuFonghWaxDV7UtHWiKImq7WE="; }; - cargoHash = "sha256-IUAoV6PAW4ae0BMBYfdfdezJXyOzaqKtPlqkSVCaqJk="; + cargoHash = "sha256-c17GTD9Wcy9LYLfBcwECNS1Tek5hTWPmie2lXtrbtFc="; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) @@ -43,7 +43,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src ; inherit pnpm; - hash = "sha256-lpb98qIA6DZLLfUoiv0gAvMWS6QYvbL6zW0z75tcDCM="; + hash = "sha256-WAuHoLAnFLP6i+rJSegt/hI6sb1SDhm7LWgsup70o9E="; fetcherVersion = 3; }; diff --git a/pkgs/by-name/mo/motus/package.nix b/pkgs/by-name/mo/motus/package.nix index e9d99d833707..994896a26dcf 100644 --- a/pkgs/by-name/mo/motus/package.nix +++ b/pkgs/by-name/mo/motus/package.nix @@ -13,23 +13,16 @@ rustPlatform.buildRustPackage (finalAttrs: { __structuredAttrs = true; pname = "motus"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "oleiade"; repo = "motus"; tag = "v${finalAttrs.version}"; - hash = "sha256-lMNXg6YYTxAycxOiVtBGrSHpccLwerIQcY25K/NkqMo="; + hash = "sha256-7lFKlU9+/NvJi9NsVpve3IvzpS8OVHaH9cs/WRGjBV8="; }; - cargoHash = "sha256-6MKEHnB2MJVB4cNvz3JYlhuzxhzsA+Pq5OkpLNoAEyU="; - - # The CLI crate version was not bumped to match the v0.4.0 release tag: - # https://github.com/oleiade/motus/issues/58 - postPatch = '' - substituteInPlace crates/motus-cli/src/main.rs \ - --replace-fail '#[command(version = "0.3.1")]' '#[command(version = "${finalAttrs.version}")]' - ''; + cargoHash = "sha256-0qK3omTkzVxkjFn2fIowl+sFmjF/hSHAROyge5CDdFg="; buildInputs = lib.optionals (withClipboard && stdenv.hostPlatform.isLinux) [ libxcb ]; diff --git a/pkgs/by-name/mo/mousam/package.nix b/pkgs/by-name/mo/mousam/package.nix index 264d5dd5657c..95be139e716b 100644 --- a/pkgs/by-name/mo/mousam/package.nix +++ b/pkgs/by-name/mo/mousam/package.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mousam"; - version = "1.4.2"; + version = "2.0.2"; # built with meson, not a python format pyproject = false; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "amit9838"; repo = "mousam"; tag = "v${finalAttrs.version}"; - hash = "sha256-V2R5XfkuaJ4fjgOhoTNZVk4FqKlCJqum7A2NsPISgM8="; + hash = "sha256-3x4bi3P8zw+A+MUaBd4ByESrzCEP21Qa9CLaUYGARew="; }; nativeBuildInputs = [ @@ -51,7 +51,7 @@ python3Packages.buildPythonApplication (finalAttrs: { meta = { description = "Beautiful and lightweight weather app based on Python and GTK4"; homepage = "https://amit9838.github.io/mousam"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; mainProgram = "mousam"; maintainers = with lib.maintainers; [ aleksana ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules b/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules deleted file mode 100644 index 7d07d034c0fb..000000000000 --- a/pkgs/by-name/mo/mouse-actions-gui/80-mouse-actions.rules +++ /dev/null @@ -1,2 +0,0 @@ -KERNEL=="uinput", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput" -KERNEL=="/dev/input/event*", SUBSYSTEM=="misc", TAG+="uaccess", OPTIONS+="static_node=uinput" diff --git a/pkgs/by-name/mo/mouse-actions-gui/package.nix b/pkgs/by-name/mo/mouse-actions-gui/package.nix deleted file mode 100644 index 0c284d120cce..000000000000 --- a/pkgs/by-name/mo/mouse-actions-gui/package.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ - lib, - fetchFromGitHub, - - npmHooks, - fetchNpmDeps, - nodejs, - - rustPlatform, - cargo-tauri_1, - - pkg-config, - wrapGAppsHook3, - libxtst, - libevdev, - udevCheckHook, - gtk3, - libsoup_2_4, -}: - -rustPlatform.buildRustPackage rec { - pname = "mouse-actions-gui"; - version = "0.4.5"; - - src = fetchFromGitHub { - owner = "jersou"; - repo = "mouse-actions"; - tag = "v${version}"; - hash = "sha256-44F4CdsDHuN2FuijnpfmoFy4a/eAbYOoBYijl9mOctg="; - }; - - sourceRoot = "${src.name}/config-editor"; - - nativeBuildInputs = [ - npmHooks.npmConfigHook - nodejs - cargo-tauri_1.hook - pkg-config - wrapGAppsHook3 - udevCheckHook - ]; - - buildInputs = [ - # Base deps - libxtst - libevdev - - # Tauri deps - gtk3 - libsoup_2_4 - # webkitgtk_4_0 - ]; - - npmDeps = fetchNpmDeps { - inherit src sourceRoot; - hash = "sha256-amDTYAvEoDHb7+dg39+lUne0dv0M9vVe1vHoXk2agZA="; - }; - - cargoRoot = "src-tauri"; - buildAndTestSubdir = cargoRoot; - - cargoHash = "sha256-G5PQWPcPOVhq11BQIplbB3mLAGFCVm+vQ4eM4/5MFwI="; - - doInstallCheck = true; - - postInstall = '' - install -Dm644 ${./80-mouse-actions.rules} $out/etc/udev/rules.d/80-mouse-actions.rules - ''; - - meta = { - # webkitgtk_4_0 was removed - broken = true; - changelog = "https://github.com/jersou/mouse-actions/blob/${src.rev}/CHANGELOG.md"; - description = "Mouse event based command executor, a mix between Easystroke and Comiz edge commands"; - homepage = "https://github.com/jersou/mouse-actions"; - license = lib.licenses.mit; - mainProgram = "mouse-actions-gui"; - maintainers = with lib.maintainers; [ tomasajt ]; - platforms = lib.platforms.linux; - }; -} diff --git a/pkgs/by-name/mo/mousecape/package.nix b/pkgs/by-name/mo/mousecape/package.nix index c1ba12f3557a..1f907b93bf39 100644 --- a/pkgs/by-name/mo/mousecape/package.nix +++ b/pkgs/by-name/mo/mousecape/package.nix @@ -26,7 +26,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { description = "Cursor manager for macOS built using private, nonintrusive CoreGraphics APIs"; homepage = "https://github.com/alexzielenski/Mousecape"; license = lib.licenses.free; - maintainers = with lib.maintainers; [ FlameFlag ]; + maintainers = with lib.maintainers; [ _4evy ]; platforms = lib.platforms.darwin; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; }; diff --git a/pkgs/by-name/mo/mouser/package.nix b/pkgs/by-name/mo/mouser/package.nix index 8c32ba61577e..e51d8b9c2544 100644 --- a/pkgs/by-name/mo/mouser/package.nix +++ b/pkgs/by-name/mo/mouser/package.nix @@ -12,7 +12,7 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "mouser"; - version = "3.6.0"; + version = "3.7.0"; pyproject = false; __structuredAttrs = true; @@ -21,7 +21,7 @@ python3Packages.buildPythonApplication (finalAttrs: { owner = "TomBadash"; repo = "Mouser"; tag = "v${finalAttrs.version}"; - hash = "sha256-ESfkpswENa91wL1WSfDL/Wpu4sjhT8qibJ0wsEYHX+0="; + hash = "sha256-Pjcx7YChgu7R8Kdv8fOJcxq98nwh/izpjbOO+4/cdk4="; }; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ @@ -39,6 +39,14 @@ python3Packages.buildPythonApplication (finalAttrs: { [ evdev ] + ) + ++ lib.optionals stdenv.hostPlatform.isDarwin ( + with python3Packages; + [ + pyobjc-core + pyobjc-framework-Cocoa + pyobjc-framework-Quartz + ] ); installPhase = '' @@ -52,6 +60,31 @@ python3Packages.buildPythonApplication (finalAttrs: { install -Dm444 packaging/linux/69-mouser-logitech.rules \ -t $out/lib/udev/rules.d '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + appBundle="$out/Applications/Mouser.app" + mkdir -p "$appBundle/Contents/MacOS" "$appBundle/Contents/Resources" + install -Dm644 images/AppIcon.icns "$appBundle/Contents/Resources/AppIcon.icns" + + cat > "$appBundle/Contents/Info.plist" <<'EOF' + + + + + CFBundleNameMouser + CFBundleDisplayNameMouser + CFBundleExecutableMouser + CFBundleIdentifierio.github.tombadash.mouser + CFBundleIconFileAppIcon + CFBundleShortVersionString${finalAttrs.version} + CFBundleVersion${finalAttrs.version} + CFBundlePackageTypeAPPL + NSHighResolutionCapable + LSUIElement + LSMinimumSystemVersion12.0 + + + EOF + '' + '' runHook postInstall ''; @@ -70,6 +103,9 @@ python3Packages.buildPythonApplication (finalAttrs: { '' + '' --add-flags "$out/share/mouser/main_qml.py" + '' + + lib.optionalString stdenv.hostPlatform.isDarwin '' + makeWrapper $out/bin/mouser $out/Applications/Mouser.app/Contents/MacOS/Mouser ''; desktopItems = lib.optionals stdenv.hostPlatform.isLinux [ diff --git a/pkgs/by-name/mo/mov-cli/package.nix b/pkgs/by-name/mo/mov-cli/package.nix index 6c7167681675..4460f24724e3 100644 --- a/pkgs/by-name/mo/mov-cli/package.nix +++ b/pkgs/by-name/mo/mov-cli/package.nix @@ -61,7 +61,7 @@ python3.pkgs.buildPythonPackage (finalAttrs: { meta = { homepage = "https://github.com/mov-cli/mov-cli"; description = "Cli tool to browse and watch movies"; - license = with lib.licenses; [ gpl3Only ]; + license = lib.licenses.gpl3Only; mainProgram = "mov-cli"; maintainers = with lib.maintainers; [ baitinq ]; }; diff --git a/pkgs/by-name/mo/movim/package.nix b/pkgs/by-name/mo/movim/package.nix index 066e3dba1e06..4784439df727 100644 --- a/pkgs/by-name/mo/movim/package.nix +++ b/pkgs/by-name/mo/movim/package.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, - fetchpatch2, writeShellScript, dash, + gitMinimal, php, phpCfg ? null, withPostgreSQL ? true, # “strongly recommended” according to docs @@ -45,23 +45,15 @@ let in php.buildComposerProject2 (finalAttrs: { pname = "movim"; - version = "0.33.1"; + version = "0.34.1"; src = fetchFromGitHub { owner = "movim"; repo = "movim"; tag = "v${finalAttrs.version}"; - hash = "sha256-TQ8PLmz9hn+OFfIF5cckv5gGhID7vuA5O1xVJ6PSPVA="; + hash = "sha256-2RWTx/mhMAi13v7BUfJmGvkPc4iqKdVR0B5rCbD5YaQ="; }; - patches = [ - # Removes debug var_dump that was accidentally left in - (fetchpatch2 { - url = "https://github.com/movim/movim/commit/239bd099711d196df574106155374f301f2c9531.patch"; - hash = "sha256-tLWUOKTJDFE9obrnghG/S8FHJY0rcWlueWncHVdi0Jk="; - }) - ]; - php = php.buildEnv ( { extensions = ( @@ -97,7 +89,26 @@ php.buildComposerProject2 (finalAttrs: { ++ lib.optional minify.style.enable lightningcss ++ lib.optional minify.svg.enable scour; - vendorHash = "sha256-iy869AKgn/ZL1jYFvqvYkfr4lv5J4l2W6glGqZvJLhE="; + # Composer ≥2.8 defaults preferred-install to + # dist only (not auto), which prevents fallback + # to git clone when dist downloads fail (such as + # MS GitHub’s codeload.* in the build sandbox). + composerVendor = php.mkComposerVendor { + inherit (finalAttrs) + pname + src + version + vendorHash + php + ; + + postPatch = '' + composer config preferred-install auto + ''; + nativeBuildInputs = [ gitMinimal ]; + }; + + vendorHash = "sha256-hSXi1jKilsfhe5P7ElGydxu6uxOpYNeRhHlZGzgkUXw="; postPatch = '' # Our modules are already wrapped, removes missing *.so warnings; diff --git a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix index 0486eb081bc2..7ed7ef095446 100644 --- a/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-neologd/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from mecab-ipadic-NEologd for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-neologd"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix index 749fab6a8b55..f7eccc0b4062 100644 --- a/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix +++ b/pkgs/by-name/mo/mozcdic-ut-sudachidict/package.nix @@ -34,7 +34,7 @@ stdenvNoCC.mkDerivation { meta = { description = "Dictionary converted from SudachiDict for Mozc"; homepage = "https://github.com/utuhiro78/mozcdic-ut-sudachidict"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ pineapplehunter ]; platforms = lib.platforms.all; # this does not need to be separately built diff --git a/pkgs/by-name/mo/mozillavpn/package.nix b/pkgs/by-name/mo/mozillavpn/package.nix index 8a52f0140f41..1b8102686852 100644 --- a/pkgs/by-name/mo/mozillavpn/package.nix +++ b/pkgs/by-name/mo/mozillavpn/package.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mozillavpn"; - version = "2.37.0"; + version = "2.38.0"; src = fetchFromGitHub { owner = "mozilla-mobile"; repo = "mozilla-vpn-client"; tag = "v${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-2u0q/N78hrjj1XVD69hMkLPVYxfgn8LVoFLjsprDOX8="; + hash = "sha256-IaMmW9ODlac/7Kqp9tEalVvLkUHaK786+HnTOqWVAk8="; }; patches = [ ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) src patches; - hash = "sha256-uJdgsN/se3Dq5RbtZ/FGtDGD+yXtQzCFvbPZngifeJc="; + hash = "sha256-Y4Y2ZZh9Kdj6zZCHgvLNdfB0ehaF5nDJSOjTLelmYrE="; }; buildInputs = [ diff --git a/pkgs/by-name/mo/mozo/package.nix b/pkgs/by-name/mo/mozo/package.nix index f90066f4e1fe..c6c23e26894a 100644 --- a/pkgs/by-name/mo/mozo/package.nix +++ b/pkgs/by-name/mo/mozo/package.nix @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication rec { description = "MATE Desktop menu editor"; mainProgram = "mozo"; homepage = "https://github.com/mate-desktop/mozo"; - license = with lib.licenses; [ lgpl2Plus ]; + license = lib.licenses.lgpl2Plus; platforms = lib.platforms.unix; teams = [ lib.teams.mate ]; }; diff --git a/pkgs/by-name/mp/mpb/package.nix b/pkgs/by-name/mp/mpb/package.nix index eb001a94446d..f92f7bfeeadf 100644 --- a/pkgs/by-name/mp/mpb/package.nix +++ b/pkgs/by-name/mp/mpb/package.nix @@ -59,8 +59,6 @@ stdenv.mkDerivation (finalAttrs: { doCheck = true; - preCheck = "export OMP_NUM_THREADS=2"; - meta = { description = "MIT Photonic-Bands: computation of photonic band structures in periodic media"; homepage = "https://mpb.readthedocs.io/en/latest/"; diff --git a/pkgs/by-name/mp/mpc-qt/package.nix b/pkgs/by-name/mp/mpc-qt/package.nix index b650f73842c4..d1c9a889cf71 100644 --- a/pkgs/by-name/mp/mpc-qt/package.nix +++ b/pkgs/by-name/mp/mpc-qt/package.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mpc-qt"; - version = "26.01"; + version = "26.07"; src = fetchFromGitHub { owner = "mpc-qt"; repo = "mpc-qt"; tag = "v${finalAttrs.version}"; - hash = "sha256-tgCdPzolUlp3Cy1ZbDlMQvl/4WcTl86QTZ8F18f0JME="; + hash = "sha256-1tm/Sw/6szY4k2ObFnOsXfffIJ31eokjqkOt90DquWE="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mp/mpd/package.nix b/pkgs/by-name/mp/mpd/package.nix index 2a0e460b1d2d..5250f5a7ea36 100644 --- a/pkgs/by-name/mp/mpd/package.nix +++ b/pkgs/by-name/mp/mpd/package.nix @@ -197,13 +197,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mpd"; - version = "0.24.12"; + version = "0.24.13"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-CYwpPKFTW7engtPJoUqIWWn6YhmoSRjiew6n0tAZSmE="; + sha256 = "sha256-ZcSMd+PhO8sWGA96GtwM3ykPS//8SpqDh9lLh3unB8Q="; }; buildInputs = [ diff --git a/pkgs/by-name/mp/mpdris2-rs/package.nix b/pkgs/by-name/mp/mpdris2-rs/package.nix index 2387720718ac..c48926b8b352 100644 --- a/pkgs/by-name/mp/mpdris2-rs/package.nix +++ b/pkgs/by-name/mp/mpdris2-rs/package.nix @@ -6,15 +6,15 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "mpdris2-rs"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "szclsya"; repo = "mpdris2-rs"; tag = "v${finalAttrs.version}"; - hash = "sha256-oiyqK7vj41d9bsXBtenc477SOrVHRkXpFljkN8MjdQg="; + hash = "sha256-VcBmo8zpgxowAZyHpe5EVQ/e6zuCYw21Xws0Yf5EZEo="; }; - cargoHash = "sha256-xdgUKU9YiaC3o1uH38ZjvQgR78B/1LqTPis4+XqinQ8="; + cargoHash = "sha256-1Syt8lP/3Efr1A/LuV+k6aMuxDg+AWDg4HPTDFP/UW0="; postPatch = '' substituteInPlace misc/mpdris2-rs.service --replace-fail "/usr/local" "$out" diff --git a/pkgs/by-name/mp/mpdris2/package.nix b/pkgs/by-name/mp/mpdris2/package.nix index bb1f9cca323c..8cccd6c2fba1 100644 --- a/pkgs/by-name/mp/mpdris2/package.nix +++ b/pkgs/by-name/mp/mpdris2/package.nix @@ -42,7 +42,7 @@ python3Packages.buildPythonApplication (finalAttrs: { dependencies = with python3Packages; [ dbus-python - mpd2 + python-mpd2 mutagen pygobject3 ]; diff --git a/pkgs/applications/audio/mpg123/default.nix b/pkgs/by-name/mp/mpg123/package.nix similarity index 93% rename from pkgs/applications/audio/mpg123/default.nix rename to pkgs/by-name/mp/mpg123/package.nix index df13df07a978..ba833af09dc8 100644 --- a/pkgs/applications/audio/mpg123/default.nix +++ b/pkgs/by-name/mp/mpg123/package.nix @@ -11,7 +11,7 @@ libpulseaudio, withCoreAudio ? stdenv.hostPlatform.isDarwin, withJack ? stdenv.hostPlatform.isUnix, - jack, + libjack2, withConplay ? !stdenv.hostPlatform.isWindows, perl, writeScript, @@ -21,11 +21,11 @@ assert withConplay -> !libOnly; stdenv.mkDerivation (finalAttrs: { pname = "${lib.optionalString libOnly "lib"}mpg123"; - version = "1.33.4"; + version = "1.33.6"; src = fetchurl { url = "mirror://sourceforge/mpg123/mpg123-${finalAttrs.version}.tar.bz2"; - hash = "sha256-OujJ/4Cpe/wOIuifvNdGh+yk/B2zFbEmB/J/ActaR9k="; + hash = "sha256-kpp8GLpmK4knrtTeIprZroqytIBt0PMLkBE+sbTiGVo="; }; outputs = [ @@ -45,7 +45,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withPulse [ libpulseaudio ] ++ lib.optionals withCoreAudio [ ] - ++ lib.optionals withJack [ jack ] + ++ lib.optionals withJack [ libjack2 ] ); configureFlags = @@ -96,7 +96,7 @@ stdenv.mkDerivation (finalAttrs: { description = "Fast console MPEG Audio Player and decoder library"; homepage = "https://mpg123.org"; license = lib.licenses.lgpl21Only; - maintainers = with lib.maintainers; [ ftrvxmtrx ]; + maintainers = [ ]; platforms = lib.platforms.all; }; }) diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh index be2203951c0f..139dc932366f 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/mpi-check-hook.sh @@ -72,8 +72,5 @@ setupMpiCheck() { export HWLOC_XMLFILE="@topology@" ;; esac - - # Limit number of OpenMP threads. Default is "all cores". - export OMP_NUM_THREADS=1 } diff --git a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix index e5bdc817379d..8fc6081e2e14 100644 --- a/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix +++ b/pkgs/by-name/mp/mpiCheckPhaseHook/package.nix @@ -1,8 +1,8 @@ { lib, - callPackage, makeSetupHook, stdenv, + checkPhaseThreadLimitHook, }: makeSetupHook { @@ -13,5 +13,9 @@ makeSetupHook { topology = ./topology.xml; }; + propagatedNativeBuildInputs = [ + checkPhaseThreadLimitHook + ]; + meta.license = lib.licenses.mit; } ./mpi-check-hook.sh diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/by-name/mp/mplayer/package.nix similarity index 85% rename from pkgs/applications/video/mplayer/default.nix rename to pkgs/by-name/mp/mplayer/package.nix index ad384520cefe..10172d1fe98e 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/by-name/mp/mplayer/package.nix @@ -8,63 +8,63 @@ freetype, yasm, ffmpeg_7, - aalibSupport ? true, + aalibSupport ? config.mplayer.aalibSupport or true, aalib, - fontconfigSupport ? true, + fontconfigSupport ? config.mplayer.fontconfigSupport or true, fontconfig, freefont_ttf, - fribidiSupport ? true, + fribidiSupport ? config.mplayer.fribidiSupport or true, fribidi, - x11Support ? true, + x11Support ? config.mplayer.x11Support or true, libx11, libxext, libGLU, libGL, - xineramaSupport ? true, + xineramaSupport ? config.mplayer.xineramaSupport or true, libxinerama, - xvSupport ? true, + xvSupport ? config.mplayer.xvSupport or true, libxv, - alsaSupport ? stdenv.hostPlatform.isLinux, + alsaSupport ? !stdenv.hostPlatform.isDarwin, alsa-lib, - screenSaverSupport ? true, + screenSaverSupport ? config.mplayer.screenSaverSupport or true, libxscrnsaver, - vdpauSupport ? false, + vdpauSupport ? config.mplayer.vdpauSupport or false, libvdpau, cddaSupport ? !stdenv.hostPlatform.isDarwin, cdparanoia, dvdnavSupport ? !stdenv.hostPlatform.isDarwin, - libdvdnav, - dvdreadSupport ? true, + libdvdnav_4_2_1, + dvdreadSupport ? config.mplayer.dvdreadSupport or true, libdvdread, - bluraySupport ? true, + bluraySupport ? config.mplayer.bluraySupport or true, libbluray, - amrSupport ? false, + amrSupport ? config.mplayer.amrSupport or false, amrnb, amrwb, - cacaSupport ? true, + cacaSupport ? config.mplayer.cacaSupport or true, libcaca, - lameSupport ? true, + lameSupport ? config.mplayer.lameSupport or true, lame, - speexSupport ? true, + speexSupport ? config.mplayer.speexSupport or true, speex, - theoraSupport ? true, + theoraSupport ? config.mplayer.theoraSupport or true, libtheora, - x264Support ? false, + x264Support ? config.mplayer.x264Support or false, x264, - jackaudioSupport ? false, + jackaudioSupport ? config.mplayer.jackaudioSupport or false, libjack2, pulseSupport ? config.pulseaudio or false, libpulseaudio, - bs2bSupport ? false, + bs2bSupport ? config.mplayer.bs2bSupport or false, libbs2b, - v4lSupport ? false, + v4lSupport ? config.mplayer.v4lSupport or false, libv4l, # For screenshots - libpngSupport ? true, + libpngSupport ? config.mplayer.libpngSupport or true, libpng, - libjpegSupport ? true, + libjpegSupport ? config.mplayer.libjpegSupport or true, libjpeg, - useUnfreeCodecs ? false, + useUnfreeCodecs ? config.mplayer.useUnfreeCodecs or false, buildPackages, versionCheckHook, }: @@ -161,7 +161,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional theoraSupport libtheora ++ lib.optional cacaSupport libcaca ++ lib.optional xineramaSupport libxinerama - ++ lib.optional dvdnavSupport libdvdnav + ++ lib.optional dvdnavSupport libdvdnav_4_2_1 ++ lib.optional dvdreadSupport libdvdread ++ lib.optional bluraySupport libbluray ++ lib.optional cddaSupport cdparanoia @@ -300,7 +300,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; diff --git a/pkgs/by-name/mp/mpop/package.nix b/pkgs/by-name/mp/mpop/package.nix index 2109293a91ea..d713707fefd5 100644 --- a/pkgs/by-name/mp/mpop/package.nix +++ b/pkgs/by-name/mp/mpop/package.nix @@ -5,7 +5,7 @@ gnutls, openssl, gsasl, - libidn, + libidn2, pkg-config, nlsSupport ? true, idnSupport ? true, @@ -20,11 +20,11 @@ assert lib.assertOneOf "sslLibrary" sslLibrary [ stdenv.mkDerivation (finalAttrs: { pname = "mpop"; - version = "1.4.21"; + version = "1.4.22"; src = fetchurl { url = "https://marlam.de/mpop/releases/mpop-${finalAttrs.version}.tar.xz"; - sha256 = "sha256-TKDR4NATZv4+DPSQ2I0VTfURJ4+1lWOHE748pnVmWFU="; + sha256 = "sha256-LNZKnCmlreNCkjDHBhDKS26jBfvCZPaWG12Fp6jOzUs="; }; nativeBuildInputs = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = lib.optional gsaslSupport gsasl - ++ lib.optional idnSupport libidn + ++ lib.optional idnSupport libidn2 ++ lib.optional (sslLibrary == "gnutls") gnutls ++ lib.optional (sslLibrary == "openssl") openssl; diff --git a/pkgs/by-name/mp/mprime/package.nix b/pkgs/by-name/mp/mprime/package.nix index e3ac811c35e9..e059e845eff1 100644 --- a/pkgs/by-name/mp/mprime/package.nix +++ b/pkgs/by-name/mp/mprime/package.nix @@ -15,7 +15,6 @@ let { x86_64-linux = "linux64"; i686-linux = "linux"; - x86_64-darwin = "macosx64"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -23,7 +22,6 @@ let { x86_64-linux = "make64"; i686-linux = "makefile"; - x86_64-darwin = "makemac"; } ."${stdenv.hostPlatform.system}" or throwSystem; @@ -111,7 +109,6 @@ stdenv.mkDerivation (finalAttrs: { platforms = [ "i686-linux" "x86_64-linux" - "x86_64-darwin" ]; maintainers = with lib.maintainers; [ dstremur ]; mainProgram = "mprime"; diff --git a/pkgs/by-name/mp/mprisence/package.nix b/pkgs/by-name/mp/mprisence/package.nix index c0578c7915c9..d9a5afc0e987 100644 --- a/pkgs/by-name/mp/mprisence/package.nix +++ b/pkgs/by-name/mp/mprisence/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "mprisence"; - version = "1.6.0"; + version = "1.7.0"; src = fetchFromGitHub { owner = "lazykern"; repo = "mprisence"; tag = "v${finalAttrs.version}"; - hash = "sha256-8w4k+l0uqIFgIVBuK0H/Mhvwp2HHEzvKmExkTiRUmEM="; + hash = "sha256-Ss6RXxtpSI3jfq5CAwRLE0XA3tFkIBI+JMyUov2DSpM="; }; - cargoHash = "sha256-PcQc7LpQqnTiAfTL+E67Ibbsw5UI7j0YICiHpxWrrj8="; + cargoHash = "sha256-AKj+DibLyoWUw+082m5wMVnZAY4Kmf3+daRJDGeLKtc="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/mp/mprocs/package.nix b/pkgs/by-name/mp/mprocs/package.nix index 0b7893c892eb..5df76666705f 100644 --- a/pkgs/by-name/mp/mprocs/package.nix +++ b/pkgs/by-name/mp/mprocs/package.nix @@ -13,7 +13,7 @@ rustPlatform.buildRustPackage (finalAttrs: { src = fetchFromGitHub { owner = "pvolok"; - repo = "mprocs"; + repo = "dekit"; tag = "v${finalAttrs.version}"; hash = "sha256-fh294Re4gEveWgX29m0SXdI8hwuiXuniTq7pVZ464ws="; }; @@ -31,8 +31,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "TUI tool to run multiple commands in parallel and show the output of each command separately"; - homepage = "https://github.com/pvolok/mprocs"; - changelog = "https://github.com/pvolok/mprocs/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/pvolok/dekit"; + changelog = "https://github.com/pvolok/dekit/releases/tag/v${finalAttrs.version}"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ GaetanLepage ]; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mp/mptcpd/package.nix b/pkgs/by-name/mp/mptcpd/package.nix index eee2d99f7ad9..f3225ab96190 100644 --- a/pkgs/by-name/mp/mptcpd/package.nix +++ b/pkgs/by-name/mp/mptcpd/package.nix @@ -47,9 +47,15 @@ stdenv.mkDerivation (finalAttrs: { postConfigure = "doxygen -u"; configureFlags = [ + "--sysconfdir=/etc" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" ]; + installFlags = [ + # The NixOS module generates /etc/mptcpd/mptcpd.conf declaratively. + "pkgsysconfdir=$out/etc/mptcpd" + ]; + # fix: 'Fontconfig error: Cannot load default config file: No such file: (null)' env.FONTCONFIG_FILE = "${fontconfig.out}/etc/fonts/fonts.conf"; diff --git a/pkgs/by-name/mp/mpv-unwrapped/package.nix b/pkgs/by-name/mp/mpv-unwrapped/package.nix index 85293e0b650d..f2451827fdc9 100644 --- a/pkgs/by-name/mp/mpv-unwrapped/package.nix +++ b/pkgs/by-name/mp/mpv-unwrapped/package.nix @@ -21,7 +21,6 @@ libarchive, libass, libbluray, - libbs2b, libcaca, libcdio, libcdio-paranoia, @@ -66,7 +65,6 @@ alsaSupport ? stdenv.hostPlatform.isLinux, archiveSupport ? true, bluraySupport ? true, - bs2bSupport ? true, cacaSupport ? true, cddaSupport ? false, cmsSupport ? true, @@ -180,7 +178,6 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals alsaSupport [ alsa-lib ] ++ lib.optionals archiveSupport [ libarchive ] ++ lib.optionals bluraySupport [ libbluray ] - ++ lib.optionals bs2bSupport [ libbs2b ] ++ lib.optionals cacaSupport [ libcaca ] ++ lib.optionals cddaSupport [ libcdio @@ -304,10 +301,6 @@ stdenv.mkDerivation (finalAttrs: { vapoursynth ; - # Should be removed in the future. These can't be added to `pkgs/top-level/aliases.nix`. - scripts = throw "'mpv-unwrapped.scripts' has been removed. Please use 'mpvScripts' instead."; # Added 2025-12-29 - wrapper = throw "'mpv-unwrapped.wrapper' has been removed. Please use 'mpv.override' instead."; # Added 2025-12-29 - tests = { inherit (nixosTests) mpv; diff --git a/pkgs/by-name/mp/mpv/package.nix b/pkgs/by-name/mp/mpv/package.nix index d08eaaae4562..7d709571efb3 100644 --- a/pkgs/by-name/mp/mpv/package.nix +++ b/pkgs/by-name/mp/mpv/package.nix @@ -117,8 +117,12 @@ symlinkJoin { passthru.tests.mpv-scripts-should-not-collide = buildEnv { name = "mpv-scripts-env"; paths = lib.pipe mpvScripts [ + # filters "throw" aliases + (lib.filterAttrs (key: script: (builtins.tryEval (lib.isDerivation script)).success)) # filters "override" "overrideDerivation" "recurseForDerivations" (lib.filterAttrs (key: script: lib.isDerivation script)) + # filters mpv scripts that opt out of this check + (lib.filterAttrs (key: script: !(script.passthru.dontCollideCheck or false))) # replaces unfree and meta.broken scripts with decent placeholders (lib.mapAttrsToList ( key: script: diff --git a/pkgs/by-name/mp/mpv/scripts/manga-reader.nix b/pkgs/by-name/mp/mpv/scripts/manga-reader.nix index 7a892438aed6..2b820ee39b35 100644 --- a/pkgs/by-name/mp/mpv/scripts/manga-reader.nix +++ b/pkgs/by-name/mp/mpv/scripts/manga-reader.nix @@ -8,12 +8,12 @@ buildLua { pname = "manga-reader"; - version = "0-unstable-2026-03-03"; + version = "0-unstable-2026-06-23"; src = fetchFromGitHub { owner = "Dudemanguy"; repo = "mpv-manga-reader"; - rev = "2e8c21a82eb5fbe0b6feb64375e396d27bd8d5fa"; - hash = "sha256-Q6ekBvGsHSiZtO9QYnv5zAoAdkqrcFvmSJQsjVTuwSg="; + rev = "0551b033ac22b97298d94e480216748f68786b9f"; + hash = "sha256-TmRWBKgTlgOszOI1CLHveGMNH23UHSvbijz8wC4M/mM="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix index 1e7e4b731c39..362031f19db3 100644 --- a/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix +++ b/pkgs/by-name/mp/mpv/scripts/modernx-zydezu.nix @@ -4,6 +4,7 @@ fetchFromGitHub, installFonts, makeFontsConf, + mpvScripts, nix-update-script, }: buildLua (finalAttrs: { @@ -30,6 +31,9 @@ buildLua (finalAttrs: { passthru.updateScript = nix-update-script { }; + # FIXME?: collides with mpvScripts.modernx + passthru.dontCollideCheck = lib.hasAttr "modernx" mpvScripts; + meta = { description = "Modern OSC UI replacement for MPV that retains the functionality of the default OSC"; changelog = "https://github.com/zydezu/ModernX/releases/tag/${finalAttrs.version}"; diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix index fe8908ba09d3..974a1a7125ad 100644 --- a/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix +++ b/pkgs/by-name/mp/mpv/scripts/mpv-osc-tethys.nix @@ -2,6 +2,7 @@ lib, buildLua, fetchFromGitHub, + mpvScripts, }: buildLua (finalAttrs: { pname = "mpv-osc-tethys"; @@ -11,6 +12,9 @@ buildLua (finalAttrs: { extraScriptsToCopy = [ "mpv_thumbnail_script_server.lua" ]; extraScriptsToLoad = [ "mpv_thumbnail_script_server.lua" ]; + # FIXME?: collides with mpvScripts.thumbnail, this one yields since it is unfree + passthru.dontCollideCheck = lib.hasAttr "thumbnail" mpvScripts; + src = fetchFromGitHub { owner = "Zren"; repo = "mpv-osc-tethys"; diff --git a/pkgs/by-name/mp/mpv/scripts/mpv-sub-select.nix b/pkgs/by-name/mp/mpv/scripts/mpv-sub-select.nix new file mode 100644 index 000000000000..9b7570e52c8d --- /dev/null +++ b/pkgs/by-name/mp/mpv/scripts/mpv-sub-select.nix @@ -0,0 +1,39 @@ +{ + lib, + buildLua, + fetchFromGitHub, + nix-update-script, +}: + +buildLua (finalAttrs: { + pname = "mpv-sub-select"; + version = "0-unstable-2025-04-04"; + + scriptPath = "sub-select.lua"; + src = fetchFromGitHub { + owner = "CogentRedTester"; + repo = "mpv-sub-select"; + rev = "26d24a0fd1d69988eaedda6056a2c87d0a55b6cb"; + hash = "sha256-+eVga4b7KIBnfrtmlgq/0HNjQVS3SK6YWVXCPvOeOOc="; + }; + + postPatch = '' + # changes default sub-select.json search location + substituteInPlace sub-select.lua \ + --replace-fail '~~/script-opts' '${placeholder "out"}/share/mpv/script-opts' + ''; + + postInstall = '' + mkdir '${placeholder "out"}/share/mpv/script-opts' + cp sub-select.json '${placeholder "out"}/share/mpv/script-opts' + ''; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "An advanced conditional subtitle track selector for mpv player"; + homepage = "https://github.com/CogentRedTester/mpv-sub-select"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lovistovis ]; + }; +}) diff --git a/pkgs/by-name/mp/mpv/scripts/thumbfast-vanilla-osc.nix b/pkgs/by-name/mp/mpv/scripts/thumbfast-vanilla-osc.nix new file mode 100644 index 000000000000..3754fc9920d6 --- /dev/null +++ b/pkgs/by-name/mp/mpv/scripts/thumbfast-vanilla-osc.nix @@ -0,0 +1,29 @@ +{ + lib, + fetchFromGitHub, + unstableGitUpdater, + buildLua, +}: + +buildLua { + pname = "thumbfast-vanilla-osc"; + version = "0-unstable-2025-02-04"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "thumbfast"; + rev = "9d78edc167553ccea6290832982d0bc15838b4ac"; + hash = "sha256-AG3w5B8lBcSXV4cbvX3nQ9hri/895xDbTsdaqF+RL64="; + }; + passthru.updateScript = unstableGitUpdater { branch = "vanilla-osc"; }; + + scriptPath = "player/lua/osc.lua"; + + meta = { + description = "Modified version of the vanilla UI with thumbfast support"; + homepage = "https://github.com/po5/thumbfast"; + # License not stated explicitly, but is a derivative of https://github.com/mpv-player/mpv/blob/master/player/lua/osc.lua + license = lib.licenses.lgpl21Plus; + maintainers = with lib.maintainers; [ coca ]; + }; +} diff --git a/pkgs/by-name/mp/mpv/scripts/thumbfast.nix b/pkgs/by-name/mp/mpv/scripts/thumbfast.nix index 5dd0fc8c673c..3166faf04e7c 100644 --- a/pkgs/by-name/mp/mpv/scripts/thumbfast.nix +++ b/pkgs/by-name/mp/mpv/scripts/thumbfast.nix @@ -8,13 +8,13 @@ buildLua { pname = "mpv-thumbfast"; - version = "0-unstable-2025-02-04"; + version = "0-unstable-2026-06-28"; src = fetchFromGitHub { owner = "po5"; repo = "thumbfast"; - rev = "9deb0733c4e36938cf90e42ddfb7a19a8b2f4641"; - hash = "sha256-avG1CRBrs0UM4HcFMUVAQyOtcIFkZ/H+PbjZJKU7o2A="; + rev = "0f711de3138c9bd6718209d819ac54022c23ded2"; + hash = "sha256-LVeEtzOMVSgBqN9z6VQLZnxXfrOUoQPOWazVXmj3ZFY="; }; passthru.updateScript = unstableGitUpdater { }; diff --git a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix index 42358a60e6e4..cef4666be274 100644 --- a/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix +++ b/pkgs/by-name/mp/mpv/scripts/twitch-chat.nix @@ -7,13 +7,13 @@ }: buildLua { pname = "twitch-chat"; - version = "0-unstable-2025-05-15"; + version = "0-unstable-2026-07-02"; src = fetchFromGitHub { owner = "CrendKing"; repo = "mpv-twitch-chat"; - rev = "4d88ac12c843da0e916b0ed1df4d087a3418501b"; - hash = "sha256-owU0F976K4CX0kKYoRbdtz/sqCvd8kw2LqItEgY25gE="; + rev = "72d97a02fae1045dedc44979e60403a198bbef1c"; + hash = "sha256-PaPCAmvARbRrL+NY+CcJGiQRO+Ahjo0o5vz1av3h2Ds="; postFetch = "rm $out/screenshot.webp"; }; diff --git a/pkgs/by-name/mp/mpv/scripts/videoclip.nix b/pkgs/by-name/mp/mpv/scripts/videoclip.nix index 762bc7400eca..ee75757f57e8 100644 --- a/pkgs/by-name/mp/mpv/scripts/videoclip.nix +++ b/pkgs/by-name/mp/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0.2-unstable-2026-05-31"; + version = "0.2-unstable-2026-07-07"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "d9a3e0966b238b824b86767956eb44a11ac367c6"; - hash = "sha256-NZaflGehxoIf9eY3/p9WrKXXQj3x6GDZ6iMLeu5BhPc="; + rev = "979bae398da7ccd70cb2fb305c371b7af9259b10"; + hash = "sha256-k3fxSeAjRZg4J5x5IQhKGYtUqfBE4heR1KNurGTElGs="; }; patchPhase = '' diff --git a/pkgs/by-name/mq/mqattack/package.nix b/pkgs/by-name/mq/mqattack/package.nix new file mode 100644 index 000000000000..bbfe3f465a6a --- /dev/null +++ b/pkgs/by-name/mq/mqattack/package.nix @@ -0,0 +1,38 @@ +{ + lib, + rustPlatform, + fetchFromGitHub, + nix-update-script, + versionCheckHook, +}: + +rustPlatform.buildRustPackage (finalAttrs: { + pname = "mqattack"; + version = "0.1.2"; + + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "affolter-engineering"; + repo = "mqattack"; + tag = finalAttrs.version; + hash = "sha256-kUZatTjjpBpyrZ//JHDSki6oXVGunH0thgY0+q3wFyM="; + }; + + cargoHash = "sha256-V1RKag4AZhYaTY9vzt56F19qMAAt3BTdAliu1uKbVwQ="; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + doInstallCheck = true; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "MQTT penetration testing tool"; + homepage = "https://github.com/affolter-engineering/mqattack"; + changelog = "https://github.com/affolter-engineering/mqattack/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fab ]; + mainProgram = "mqattack"; + }; +}) diff --git a/pkgs/by-name/mq/mqtt-explorer/package.nix b/pkgs/by-name/mq/mqtt-explorer/package.nix index 1f09774684f6..8471ece5d4a7 100644 --- a/pkgs/by-name/mq/mqtt-explorer/package.nix +++ b/pkgs/by-name/mq/mqtt-explorer/package.nix @@ -56,12 +56,6 @@ stdenv.mkDerivation rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = "1"; - # disable code signing on macos - # https://github.com/electron-userland/electron-builder/blob/77f977435c99247d5db395895618b150f5006e8f/docs/code-signing.md#how-to-disable-code-signing-during-the-build-process-on-macos - postConfigure = lib.optionalString stdenv.hostPlatform.isDarwin '' - export CSC_IDENTITY_AUTO_DISCOVERY=false - ''; - configurePhase = '' runHook preConfigure @@ -100,7 +94,9 @@ stdenv.mkDerivation rec { yarn --offline run electron-builder --dir \ -c.electronDist="$electron_dist" \ - -c.electronVersion=${electron.version} + -c.electronVersion=${electron.version} \ + -c.mac.identity=null + # ^ disable code signing on macos runHook postBuild ''; diff --git a/pkgs/by-name/mq/mqtt-exporter/package.nix b/pkgs/by-name/mq/mqtt-exporter/package.nix index cee141656e8b..5ccf8c0798fa 100644 --- a/pkgs/by-name/mq/mqtt-exporter/package.nix +++ b/pkgs/by-name/mq/mqtt-exporter/package.nix @@ -23,6 +23,8 @@ python3.pkgs.buildPythonApplication (finalAttrs: { prometheus-client ]; + pythonRelaxDeps = [ "prometheus-client" ]; + nativeCheckInputs = with python3.pkgs; [ pytest-mock pytestCheckHook diff --git a/pkgs/by-name/ms/msedgedriver/package.nix b/pkgs/by-name/ms/msedgedriver/package.nix index 053d4e347fac..eb5f3eb3ff4d 100644 --- a/pkgs/by-name/ms/msedgedriver/package.nix +++ b/pkgs/by-name/ms/msedgedriver/package.nix @@ -11,11 +11,11 @@ stdenvNoCC.mkDerivation (finalAttrs: { pname = "msedgedriver"; - version = "149.0.4022.52"; + version = "150.0.4078.83"; src = fetchzip { url = "https://msedgedriver.microsoft.com/${finalAttrs.version}/edgedriver_linux64.zip"; - hash = "sha256-GLPkBOlXDTpjYrrc9odDeHXXZ8vLPiw06v1bIN1zOpo="; + hash = "sha256-hmzL3ucHgKxPT1/WwqfWUWndSMUEf7n0Z0Wh9Rgm/MU="; stripRoot = false; }; diff --git a/pkgs/by-name/ms/msedit/package.nix b/pkgs/by-name/ms/msedit/package.nix index 12a301fc8170..e92a75b23d58 100644 --- a/pkgs/by-name/ms/msedit/package.nix +++ b/pkgs/by-name/ms/msedit/package.nix @@ -5,20 +5,20 @@ fetchFromGitHub, versionCheckHook, nix-update-script, - icu, + icu76, }: rustPlatform.buildRustPackage (finalAttrs: { pname = "msedit"; - version = "1.2.1"; + version = "2.0.0"; src = fetchFromGitHub { owner = "microsoft"; repo = "edit"; tag = "v${finalAttrs.version}"; - hash = "sha256-Sb73awgdajBKKW0QIpmKF6g9mIIS/1f0a6D/jQulnUM="; + hash = "sha256-9HoK5i0IimujfTQxDplBNJRO7qmD/S+SnLLnR95RHiQ="; }; - cargoHash = "sha256-U8U70nzTmpY6r8J661EJ4CGjx6vWrGovu5m25dvz5sY="; + cargoHash = "sha256-r7AR6Mf13UUeooPV5/8gyp7HvmOeSaOJNotWWqU10SQ="; # Requires nightly features env = { @@ -30,17 +30,24 @@ rustPlatform.buildRustPackage (finalAttrs: { "-headerpad_max_install_names" ] ); + } + // lib.optionalAttrs stdenv.hostPlatform.isLinux { + # https://github.com/microsoft/edit/releases/tag/v2.0.0 + # see section 'Additonal notes to Building & Packaging + EDIT_CFG_ICUUC_SONAME = "${lib.getLib icu76}/lib/libicuuc.so.76"; + EDIT_CFG_ICUI18N_SONAME = "${lib.getLib icu76}/lib/libicui18n.so.76"; + EDIT_CFG_ICU_RENAMING_VERSION = 76; }; buildInputs = [ - icu + icu76 ]; # https://github.com/microsoft/edit/blob/f8bea2be191d00baa2a4551817541ea3f8c5b03e/src/icu.rs#L834 # Required for Ctrl+F searching to work postFixup = let - rpathAppend = lib.makeLibraryPath [ icu ]; + rpathAppend = lib.makeLibraryPath [ icu76 ]; in lib.optionalString stdenv.hostPlatform.isElf '' patchelf $out/bin/edit \ diff --git a/pkgs/by-name/ms/msgpack-cxx/package.nix b/pkgs/by-name/ms/msgpack-cxx/package.nix index 02789eb707ae..0954f22c251d 100644 --- a/pkgs/by-name/ms/msgpack-cxx/package.nix +++ b/pkgs/by-name/ms/msgpack-cxx/package.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "msgpack-cxx"; - version = "7.0.0"; + version = "8.0.0"; src = fetchFromGitHub { owner = "msgpack"; repo = "msgpack-c"; tag = "cpp-${finalAttrs.version}"; - hash = "sha256-kg4mpNiigfZ59ZeL8LXEHwtkLU8Po+vgRcUcgTJd+h4="; + hash = "sha256-11eRM63rjmbIi0glwY5dEuKG9wnVOLx8VXb7CXqCbJE="; }; strictDeps = true; diff --git a/pkgs/by-name/ms/msgraph-cli/package.nix b/pkgs/by-name/ms/msgraph-cli/package.nix index 6c166bf6f684..2878fc43cb20 100644 --- a/pkgs/by-name/ms/msgraph-cli/package.nix +++ b/pkgs/by-name/ms/msgraph-cli/package.nix @@ -34,7 +34,6 @@ buildDotnetModule rec { maintainers = with lib.maintainers; [ nazarewk ]; platforms = [ "aarch64-darwin" - "x86_64-darwin" "x86_64-linux" ]; }; diff --git a/pkgs/by-name/ms/msolve/package.nix b/pkgs/by-name/ms/msolve/package.nix index 57afe7d56307..a09e04895b9a 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.5"; + version = "0.10.1"; src = fetchFromGitHub { owner = "algebraic-solving"; repo = "msolve"; tag = "v${finalAttrs.version}"; - hash = "sha256-zty220Elqa8SACM9OlemVNEMbMx9DkhjJjUekZFR67A="; + hash = "sha256-7FQu+7gELvNqDUNotJV70qYnSgsli6+3GgG24Am1vak="; }; postPatch = '' diff --git a/pkgs/by-name/mt/mt32emu-qt/package.nix b/pkgs/by-name/mt/mt32emu-qt/package.nix index b01f64d08d18..e379da4976d4 100644 --- a/pkgs/by-name/mt/mt32emu-qt/package.nix +++ b/pkgs/by-name/mt/mt32emu-qt/package.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mt32emu-qt"; - version = "1.12.1"; + version = "1.12.2"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; tag = "mt32emu_qt_${lib.replaceString "." "_" finalAttrs.version}"; - hash = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do="; + hash = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8="; }; postPatch = @@ -129,7 +129,7 @@ stdenv.mkDerivation (finalAttrs: { synthesis and conversion of pre-recorded SMF files to WAVE making use of the mt32emu library and the Qt framework. ''; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix index 08dcbd2c959a..81af98a1a7b4 100644 --- a/pkgs/by-name/mt/mt32emu-smf2wav/package.nix +++ b/pkgs/by-name/mt/mt32emu-smf2wav/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mt32emu-smf2wav"; - version = "1.9.2"; + version = "1.9.3"; src = fetchFromGitHub { owner = "munt"; repo = "munt"; rev = "mt32emu_smf2wav_${lib.replaceString "." "_" finalAttrs.version}"; - sha256 = "sha256-O9x+uL1QnixXNl/rTCnGwbutoCs6bI8vCmkhAWJW4Do="; + sha256 = "sha256-QuOQvKNCKl/UypTub9FCoYu3HJrMi6LksKPGaQUWfO8="; }; postPatch = @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://munt.sourceforge.net/"; description = "Produces a WAVE file from a Standard MIDI file (SMF)"; mainProgram = "mt32emu-smf2wav"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ OPNA2608 ]; platforms = lib.platforms.all; }; diff --git a/pkgs/by-name/mt/mtail/package.nix b/pkgs/by-name/mt/mtail/package.nix index 262b534718f5..e46d56bd4ca6 100644 --- a/pkgs/by-name/mt/mtail/package.nix +++ b/pkgs/by-name/mt/mtail/package.nix @@ -8,17 +8,17 @@ buildGoModule (finalAttrs: { pname = "mtail"; - version = "3.3.0"; + version = "3.4.4"; src = fetchFromGitHub { owner = "jaqx0r"; repo = "mtail"; rev = "v${finalAttrs.version}"; - hash = "sha256-zJ30T9+Jy1RqUERlkHbY3w2Beuefwd/otwPXnS4oFrU="; + hash = "sha256-uwEx/nhktiThUfV6tvTchEt4/hTpQsN+EXXSqL+Fzio="; }; proxyVendor = true; - vendorHash = "sha256-AXMqLwFcRoFRKrGH8srsH1GjeI25XgjgqrcOpQY3ZbY="; + vendorHash = "sha256-9XEg7Io3yi/6PKgc0oKmTWNYACOLf8FfKM/c15jXOUQ="; nativeBuildInputs = [ gotools # goyacc diff --git a/pkgs/by-name/mu/mu/package.nix b/pkgs/by-name/mu/mu/package.nix index a24e1a861a14..0187936e152d 100644 --- a/pkgs/by-name/mu/mu/package.nix +++ b/pkgs/by-name/mu/mu/package.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mu"; - version = "1.14.1"; + version = "1.14.2"; outputs = [ "out" @@ -30,7 +30,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "djcb"; repo = "mu"; rev = "v${finalAttrs.version}"; - hash = "sha256-P2b0JuzgoZkWXSkJWUrjkcfW9oGVPeH1p/hVKfA9Yjc="; + hash = "sha256-0svY7XhhimIgsYUbHcNT4OCmpmhE4otRxqoasABEIA4="; }; postPatch = '' @@ -71,7 +71,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.strings.mesonEnable "guile" false) (lib.strings.mesonEnable "scm" false) (lib.strings.mesonEnable "readline" false) - (lib.strings.mesonEnable "tests" finalAttrs.doCheck) + (lib.strings.mesonEnable "tests" finalAttrs.finalPackage.doCheck) (lib.strings.mesonOption "lispdir" "${placeholder "mu4e"}/share/emacs/site-lisp") ]; diff --git a/pkgs/by-name/mu/mudlet/package.nix b/pkgs/by-name/mu/mudlet/package.nix index b9bcfd325063..7203a47a2ce6 100644 --- a/pkgs/by-name/mu/mudlet/package.nix +++ b/pkgs/by-name/mu/mudlet/package.nix @@ -38,7 +38,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mudlet"; - version = "4.20.1"; + version = "4.22.0"; __structuredAttrs = true; strictDeps = true; @@ -48,7 +48,7 @@ stdenv.mkDerivation (finalAttrs: { repo = "Mudlet"; rev = "Mudlet-${finalAttrs.version}"; fetchSubmodules = true; - hash = "sha256-o3f2ChQ7COql+WEe2diATx7wIR0fOlxkXcGWlL1AYkE="; + hash = "sha256-on0LBf+FY91R4IEDcEM/at+J07MOStc7V1yT+khxVoM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch b/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch index 010c78da81c5..b6d360c0949f 100644 --- a/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch +++ b/pkgs/by-name/mu/mujoco/mujoco-system-deps-dont-fetch.patch @@ -84,6 +84,15 @@ index d2404bc1..5c7ddaf6 100644 TARGETS ccd EXCLUDE_FROM_ALL +@@ -256,8 +256,6 @@ set(BUILD_TESTS OFF) + set(BUILD_TESTS OFF) + fetchpackage( + PACKAGE_NAME miniz +- GIT_REPO https://github.com/richgel999/miniz.git +- GIT_TAG ${MUJOCO_DEP_VERSION_miniz} + TARGETS miniz + ) + if(_BUILD_TESTS_WAS_DEFINED) @@ -261,10 +241,6 @@ if(MUJOCO_BUILD_TESTS OR MUJOCO_BUILD_STUDIO OR MUJOCO_USE_FILAMENT) absl LIBRARY_NAME diff --git a/pkgs/by-name/mu/mujoco/package.nix b/pkgs/by-name/mu/mujoco/package.nix index 6b2f93e71eae..b437d8e69259 100644 --- a/pkgs/by-name/mu/mujoco/package.nix +++ b/pkgs/by-name/mu/mujoco/package.nix @@ -20,14 +20,14 @@ let abseil-cpp = fetchFromGitHub { owner = "abseil"; repo = "abseil-cpp"; - rev = "255c84dadd029fd8ad25c5efb5933e47beaa00c7"; - hash = "sha256-TJT2Kzc64zI42FAbbGWP3Sshh1dU/D/AtEpgZrrhebg="; + rev = "5650e9cf76d3be4318d5fa3af38ee483ddfd5e4a"; + hash = "sha256-O9ClnGm4WSTX3g1Q2VYTMhUtGG52XBwxzgHtWW9WSG0="; }; benchmark = fetchFromGitHub { owner = "google"; repo = "benchmark"; - rev = "5c55f5d4f45a1b09c5d98aa63a671993ebd42c69"; - hash = "sha256-CChXn58cqam3d6Q61ZJMr5NFq1Ezc5uywA7FSPhk4GI="; + rev = "834a61fc65e8b7885fcf177f1230ae4b897118fa"; + hash = "sha256-V5pVCG5QdFlgBIVKMv4jyTTB22BWfTHD3HolVPDFpgQ="; }; ccd = fetchFromGitHub { owner = "danfis"; @@ -38,8 +38,8 @@ let eigen3 = fetchFromGitLab { owner = "libeigen"; repo = "eigen"; - rev = "75bcd155c40cb48e647c87c3f29052360255bc9e"; - hash = "sha256-ZBm3ac6Kt7gOqNip6PeNNMiOF0fwG+7PJYA47KT0ogI="; + rev = "ea13a98decd497a8c5588fb5de71b57bcf10d864"; + hash = "sha256-v9bNWc9yfK3vG8hYhQ7vkc7DHaoPF6RAKfX9kC0Gw8c="; }; googletest = fetchFromGitHub { owner = "google"; @@ -53,11 +53,17 @@ let rev = "17d08dd26cac4d63f43af217ebd70318bfb8189c"; hash = "sha256-vnw52G0lY68471dzH7NXc++bTbLRsITSxGYXOTicA5w="; }; + miniz = fetchFromGitHub { + owner = "richgel999"; + repo = "miniz"; + rev = "d10b03cc73475af673df40f06e5cefd1d5f940d9"; + hash = "sha256-hRB/0TVVQjr4VwjozfRnYKUJfeqO+1PNfdvP/rrOCR4="; + }; qhull = fetchFromGitHub { owner = "qhull"; repo = "qhull"; - rev = "62ccc56af071eaa478bef6ed41fd7a55d3bb2d80"; - hash = "sha256-kIxHtE0L/axV9WKnQzyFN0mxoIFAI33Z+MP0P/MtQPw="; + rev = "d1c2fc0caa5f644f3a0f220290d4a868c68ed4f6"; + hash = "sha256-enwzl4td3lgYwQ4PXfcONKQrxChnJcvf8ehnJ6vf0yg="; }; tinyobjloader = fetchFromGitHub { owner = "tinyobjloader"; @@ -82,7 +88,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mujoco"; - version = "3.8.1"; + version = "3.10.0"; __structuredAttrs = true; strictDeps = true; @@ -93,7 +99,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "google-deepmind"; repo = "mujoco"; tag = finalAttrs.version; - hash = "sha256-eoZblIIH+tUNKPdVERGh1dE0KoWwMpP0LA6FgcJCiNU="; + hash = "sha256-wNsTTq5z+wKE0rSw2cyY1tJxP5i7LGu05DR7KfZEBtE="; }; patches = [ @@ -128,9 +134,14 @@ stdenv.mkDerivation (finalAttrs: { # Move things into place so that cmake doesn't try downloading dependencies. preConfigure = '' mkdir -p build/_deps - ln -s ${pin.abseil-cpp} build/_deps/abseil-cpp-src ln -s ${pin.benchmark} build/_deps/benchmark-src '' + # mujoco applies a patch on top of abseil-cpp's sources + # https://github.com/google-deepmind/mujoco/blob/3.10.0/cmake/MujocoDependencies.cmake#L299-L300 + + '' + cp -r ${pin.abseil-cpp} build/_deps/abseil-cpp-src + chmod -R +w build/_deps/abseil-cpp-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 + '' @@ -141,6 +152,7 @@ stdenv.mkDerivation (finalAttrs: { 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.miniz} build/_deps/miniz-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 diff --git a/pkgs/by-name/mu/mullvad-browser/package.nix b/pkgs/by-name/mu/mullvad-browser/package.nix index 6f7675405b2e..439f837374a3 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_7 ] ); - version = "15.0.14"; + version = "15.0.19"; 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-E/q2wXeTGcEhiAvUCrFKv34gc4vP4o3ZPjqkcS6Dxgk="; + hash = "sha256-9Vbv7A8JarYtT0Ll1bveQmwif7/IViq6geMxMqeF+S4="; }; }; diff --git a/pkgs/by-name/mu/mullvad-compass/package.nix b/pkgs/by-name/mu/mullvad-compass/package.nix index 6888e00ed773..f4bff4938257 100644 --- a/pkgs/by-name/mu/mullvad-compass/package.nix +++ b/pkgs/by-name/mu/mullvad-compass/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "mullvad-compass"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "Ch00k"; repo = "mullvad-compass"; tag = finalAttrs.version; - hash = "sha256-OhaXabjkimeMXty6msqDJVvnWXu8G6jWz/E2x7ZYrDI="; + hash = "sha256-4Q6Pm20stbuY+KQHhIPGegCIwGiYIagduN//d+CKKXE="; }; vendorHash = "sha256-gEdtoJjCa0nVyi7T4zzv6xUDTQCYFi4ANFaqXGeqcsI="; diff --git a/pkgs/by-name/mu/mullvad-vpn/package.nix b/pkgs/by-name/mu/mullvad-vpn/package.nix index 60e664cdb4b5..c7115f9bfb27 100644 --- a/pkgs/by-name/mu/mullvad-vpn/package.nix +++ b/pkgs/by-name/mu/mullvad-vpn/package.nix @@ -90,14 +90,14 @@ let }; hash = selectSystem { - x86_64-linux = "sha256-ewJ/XxqwVLF3/MsiN+AZ+jQodMr+JmPtpbcdXe6HNPo="; - aarch64-linux = "sha256-hpuLpDA3PMrlOkF172f0PZY+cGe2gBkRTWCwwwYJwQo="; + x86_64-linux = "sha256-OMbuc66AhwaIVgkiooUlttDazGLC5BCTiGPXA46TGso="; + aarch64-linux = "sha256-pEzb21CSPn/ZflzZGTSJI5Hz3Q+ERFILg8q7V89AN1Q="; }; in stdenv.mkDerivation (finalAttrs: { pname = "mullvad-vpn"; - version = "2026.2"; + version = "2026.3"; __structuredAttrs = true; strictDeps = true; diff --git a/pkgs/by-name/mu/multica-cli/package.nix b/pkgs/by-name/mu/multica-cli/package.nix index 2a327d5e0342..b8418c10edba 100644 --- a/pkgs/by-name/mu/multica-cli/package.nix +++ b/pkgs/by-name/mu/multica-cli/package.nix @@ -9,18 +9,18 @@ buildGoModule rec { __structuredAttrs = true; pname = "multica-cli"; - version = "0.3.16"; + version = "0.4.4"; src = fetchFromGitHub { owner = "multica-ai"; repo = "multica"; rev = "v${version}"; - hash = "sha256-hD69SEhZL8TqZEg1/Hu+UDJnCZJsdDs4pai5wzMFq3I="; + hash = "sha256-6weF4ePnwW8p4HVzi9v29PGI2RdI8joea15IzfXiBF0="; }; sourceRoot = "${src.name}/server"; - vendorHash = "sha256-96hxRLb+NBirsAzk80gtFYbSySKKWix/WJFLvokYKmU="; + vendorHash = "sha256-SL//NLuzLV+faAjD7SR9f9j0AaDHel2haZajLJpsj5s="; subPackages = [ "cmd/multica" ]; diff --git a/pkgs/by-name/mu/multicharge/package.nix b/pkgs/by-name/mu/multicharge/package.nix index b4fcbe0cf512..625263e9d163 100644 --- a/pkgs/by-name/mu/multicharge/package.nix +++ b/pkgs/by-name/mu/multicharge/package.nix @@ -25,13 +25,15 @@ assert ( stdenv.mkDerivation (finalAttrs: { pname = "multicharge"; - version = "0.3.1"; + version = "0.5.0"; + __structuredAttrs = true; + strictDeps = true; src = fetchFromGitHub { owner = "grimme-lab"; repo = "multicharge"; - rev = "v${finalAttrs.version}"; - hash = "sha256-8qwM3dpvFoL2WrMWNf14zYtRap0ijdfZ95XaTlkHhqQ="; + tag = "v${finalAttrs.version}"; + hash = "sha256-hswqC+fvC6tuxDpuUgowyqm72ubVikzpR4EzXtTM5cs="; }; patches = [ @@ -48,7 +50,9 @@ stdenv.mkDerivation (finalAttrs: { meson ninja ] - ++ lib.optional (buildType == "cmake") cmake; + ++ lib.optionals (buildType == "cmake") [ + cmake + ]; buildInputs = [ blas @@ -69,10 +73,11 @@ stdenv.mkDerivation (finalAttrs: { postPatch = '' patchShebangs --build config/install-mod.py - ''; - preCheck = '' - export OMP_NUM_THREADS=2 + # custom blas and lapack need to be explicitly found for transitive dependencies + # otherwise CMAKE builds can not proceed. + echo 'set(custom-blas_FOUND TRUE)' >> config/cmake/Findcustom-blas.cmake + echo 'set(custom-lapack_FOUND TRUE)' >> config/cmake/Findcustom-lapack.cmake ''; meta = { @@ -80,6 +85,7 @@ stdenv.mkDerivation (finalAttrs: { mainProgram = "multicharge"; license = lib.licenses.asl20; homepage = "https://github.com/grimme-lab/multicharge"; + changelog = "https://github.com/grimme-lab/multicharge/releases/tag/${finalAttrs.src.tag}"; platforms = lib.platforms.linux; maintainers = [ lib.maintainers.sheepforce ]; }; diff --git a/pkgs/by-name/mu/multimarkdown/package.nix b/pkgs/by-name/mu/multimarkdown/package.nix index 503ab3da9236..249d6ee7b7e3 100644 --- a/pkgs/by-name/mu/multimarkdown/package.nix +++ b/pkgs/by-name/mu/multimarkdown/package.nix @@ -61,7 +61,7 @@ stdenv.mkDerivation (finalAttrs: { - glossary entries (LaTeX only) - document metadata (e.g. title, author, date, etc.) ''; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; platforms = lib.platforms.all; maintainers = [ ]; }; diff --git a/pkgs/by-name/mu/multipart-parser-c/package.nix b/pkgs/by-name/mu/multipart-parser-c/package.nix index 5406e880379e..482167366e09 100644 --- a/pkgs/by-name/mu/multipart-parser-c/package.nix +++ b/pkgs/by-name/mu/multipart-parser-c/package.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { description = "Http multipart parser implemented in C"; homepage = "https://github.com/iafonov/multipart-parser-c"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } diff --git a/pkgs/by-name/mu/multipath-tools/package.nix b/pkgs/by-name/mu/multipath-tools/package.nix index d4ac1953cdc3..3d0a8371226a 100644 --- a/pkgs/by-name/mu/multipath-tools/package.nix +++ b/pkgs/by-name/mu/multipath-tools/package.nix @@ -22,13 +22,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "multipath-tools"; - version = "0.14.1"; + version = "0.14.3"; src = fetchFromGitHub { owner = "opensvc"; repo = "multipath-tools"; tag = finalAttrs.version; - hash = "sha256-fkpBvadQAR+oiFeyar7flwL8N69RoWhwOaiYSwYCbXs="; + hash = "sha256-uppx79+ZWazGM/QQ+8jeTogqXyHosiFfcnH2npiz7W0="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/mu/multiqc/package.nix b/pkgs/by-name/mu/multiqc/package.nix index 320da0f89667..b8acb3350220 100644 --- a/pkgs/by-name/mu/multiqc/package.nix +++ b/pkgs/by-name/mu/multiqc/package.nix @@ -114,7 +114,7 @@ python3Packages.buildPythonApplication (finalAttrs: { ''; homepage = "https://multiqc.info"; changelog = "https://github.com/MultiQC/MultiQC/releases/tag/v${finalAttrs.version}/"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = [ lib.maintainers.apraga ]; mainProgram = "multiqc"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/mu/mumps/package.nix b/pkgs/by-name/mu/mumps/package.nix index be335118508c..f3f7897afb13 100644 --- a/pkgs/by-name/mu/mumps/package.nix +++ b/pkgs/by-name/mu/mumps/package.nix @@ -49,7 +49,7 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "mumps"; - version = "5.9.0"; + version = "5.9.1"; # makeFlags contain space and one should use makeFlagsArray+ # Setting this magic var is an optional solution __structuredAttrs = true; @@ -58,7 +58,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchzip { url = "https://mumps-solver.org/MUMPS_${finalAttrs.version}.tar.gz"; - hash = "sha256-6dytNY5IbuPcOOnCPdE08hNPS09eNrJeoNdJXhLnB5I="; + hash = "sha256-DHuOlExYaksyW9UU23ddz8Jbit7nIkMRaHsBmBE+Py8="; }; postPatch = lib.optionalString stdenv.hostPlatform.isDarwin '' diff --git a/pkgs/by-name/mu/muon/package.nix b/pkgs/by-name/mu/muon/package.nix index dd760d4519f4..f20d61af19b8 100644 --- a/pkgs/by-name/mu/muon/package.nix +++ b/pkgs/by-name/mu/muon/package.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals buildDocs [ scdoc ] - ++ lib.optionals (buildDocs || finalAttrs.doCheck) [ + ++ lib.optionals (buildDocs || finalAttrs.finalPackage.doCheck) [ (python3.withPackages (ps: [ ps.pyyaml ])) ]; @@ -73,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { find subprojects -name "*.py" -exec chmod +x {} \; patchShebangs subprojects '' - + lib.optionalString finalAttrs.doCheck '' + + lib.optionalString finalAttrs.finalPackage.doCheck '' substituteInPlace \ "subprojects/meson-tests/common/14 configure file/test.py.in" \ "subprojects/meson-tests/common/274 customtarget exe for test/generate.py" \ @@ -106,7 +106,7 @@ stdenv.mkDerivation (finalAttrs: { (muonBool "static" stdenv.targetPlatform.isStatic) (muonEnable "man-pages" buildDocs) (muonEnable "meson-docs" buildDocs) - (muonEnable "meson-tests" finalAttrs.doCheck) + (muonEnable "meson-tests" finalAttrs.finalPackage.doCheck) (muonEnable "samurai" embedSamurai) (muonEnable "tracy" false) (muonEnable "website" false) @@ -177,7 +177,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "muon-build"; rev = "db92588773a24f67cda2f331b945825ca3a63fa7"; hash = "sha256-z4Fc1lr/m2MwIwhXJwoFWpzeNg+udzMxuw5Q/zVvpSM="; - passthru.use = finalAttrs.doCheck; + passthru.use = finalAttrs.finalPackage.doCheck; }; }; diff --git a/pkgs/by-name/mu/mupdf/package.nix b/pkgs/by-name/mu/mupdf/package.nix index 341a839549ca..b2a097ef2b8f 100644 --- a/pkgs/by-name/mu/mupdf/package.nix +++ b/pkgs/by-name/mu/mupdf/package.nix @@ -115,7 +115,7 @@ stdenv.mkDerivation rec { ++ lib.optionals (enableCxx || enablePython) [ (python3.pythonOnBuildForHost.withPackages (ps: [ ps.setuptools - ps.libclang + ps.clang ])) ] ++ lib.optionals enablePython [ diff --git a/pkgs/by-name/mu/murmure/package.nix b/pkgs/by-name/mu/murmure/package.nix index 900e2d806e2a..ea98f50f26d3 100644 --- a/pkgs/by-name/mu/murmure/package.nix +++ b/pkgs/by-name/mu/murmure/package.nix @@ -45,7 +45,7 @@ let in rustPlatform.buildRustPackage (finalAttrs: { pname = "murmure"; - version = "1.9.0"; + version = "1.10.1"; __structuredAttrs = true; @@ -53,7 +53,7 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Kieirra"; repo = "murmure"; tag = finalAttrs.version; - hash = "sha256-Yh1XWpwTKrYIPhbOqi0XGfqV+kVB/QVXX4y7Hb+iqrM="; + hash = "sha256-YTfpIkGHD6GPEfuTV1AahC08y4hJ6GSWQ+9C/6bTsJU="; }; # The libappindicator_sys crate loads these libraries at runtime @@ -70,14 +70,14 @@ rustPlatform.buildRustPackage (finalAttrs: { version src ; - fetcherVersion = 3; - hash = "sha256-Jtd+sxpievLyNozMJW6JAHQEKA6UVPvgLEB/3Q2Pl/s="; + fetcherVersion = 4; + hash = "sha256-ixBGVKYAk1FYcAayvKKJMT5v3JLjSK17ds0mrBEj850="; }; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-PRp04YHkifhFY9W03IQDu9Dd8y05zd4d9o8CDySf+Nw="; + cargoHash = "sha256-6G/ZHGjjv1U5MNLo+LAwXoM/nN2aCPOaSTJer7dUv9w="; env.OPENSSL_NO_VENDOR = true; diff --git a/pkgs/by-name/mu/muse-sounds-manager/package.nix b/pkgs/by-name/mu/muse-sounds-manager/package.nix index f7d4af0e6e87..cc85d539d1a3 100644 --- a/pkgs/by-name/mu/muse-sounds-manager/package.nix +++ b/pkgs/by-name/mu/muse-sounds-manager/package.nix @@ -13,30 +13,21 @@ libice, libsm, openssl, - unzip, xdg-utils, - makeWrapper, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "muse-sounds-manager"; - version = "2.1.1.912"; + version = "2.2.1.953"; - # Use web.archive.org since upstream does not provide a stable (versioned) URL. - # To see if there are new versions on the Web Archive, visit - # http://web.archive.org/cdx/search/cdx?url=https://muse-cdn.com/Muse_Sounds_Manager_x64.tar.gz - # then replace the date in the URL below with date when the SHA1 - # changes (currently XF7SCWPIOJ7WVGUVFOKW4UKIQVW4NLFS) and replace - # the version above with the version in the .deb metadata (or in the - # settings of muse-sounds-manager). + # Permalink from https://support.musehub.com/en/articles/15070607-changelog src = fetchurl { - url = "https://web.archive.org/web/20251226185300if_/https://muse-cdn.com/Muse_Sounds_Manager_x64.tar.gz"; - hash = "sha256-fjdurAqOaiw8qUYm7oO8txHCKrrGSvvnmAxLU84IgSw="; + url = "https://muse-cdn.com/muse-sounds-manager/Muse_Sounds_Manager_x64_${finalAttrs.version}.tar.gz"; + hash = "sha256-y7fKHh2pG8uT4p0vq20rsW8bSAp1mepkd2sW/06N3EI="; }; nativeBuildInputs = [ autoPatchelfHook - makeWrapper ]; buildInputs = [ @@ -44,7 +35,7 @@ stdenv.mkDerivation rec { stdenv.cc.cc zlib ] - ++ runtimeDependencies; + ++ finalAttrs.runtimeDependencies; runtimeDependencies = map lib.getLib [ icu @@ -70,8 +61,6 @@ stdenv.mkDerivation rec { postInstall = '' ln -s ${xdg-utils}/bin/xdg-open $out/bin/open - wrapProgram $out/bin/muse-sounds-manager \ - --prefix PATH : ${lib.makeBinPath [ unzip ]} ''; dontStrip = true; @@ -87,4 +76,4 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" ]; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; }; -} +}) diff --git a/pkgs/by-name/mu/musescore-evolution/package.nix b/pkgs/by-name/mu/musescore-evolution/package.nix index 833ca12c694d..67848ea1c03e 100644 --- a/pkgs/by-name/mu/musescore-evolution/package.nix +++ b/pkgs/by-name/mu/musescore-evolution/package.nix @@ -22,67 +22,64 @@ libopus, tinyxml-2, qt5, # Needed for musescore 3.X - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { + __structuredAttrs = true; + pname = "musescore-evolution"; - version = "3.7.0-unstable-2026-03-03"; + version = "3.7.0-unstable-2026-06-30"; src = fetchFromGitHub { owner = "Jojo-Schmitz"; repo = "MuseScore"; - rev = "67504236fa073783f6616545185ec8bde6c22647"; - hash = "sha256-QUUvUkdrJ4iL6cgDob+PdVRZp44kzHeoOi2N0Xb51To="; + rev = "8b07f250f0a657582609a870f27ea4794ec81ff2"; + hash = "sha256-XclDbyopuP4+3tfgsCThxr7QYdKmoaBSfWd+3h8A+6w="; }; patches = [ ./musescore-evolution-pch-fix.patch - (fetchpatch { - url = "https://github.com/Jojo-Schmitz/MuseScore/commit/bbaa38ba2babb339043f87d50cec3240ca49fe0b.patch"; - hash = "sha256-TbbrBo4uWCHeAs0Er3eYL+i0JWafI0zhetLpFjN0xg8="; - }) ]; # From top-level CMakeLists.txt: # - DOWNLOAD_SOUNDFONT defaults ON and tries to fetch from the network. # Download manually at Help > Manage Resources cmakeFlags = [ - "-DDOWNLOAD_SOUNDFONT=OFF" + (lib.cmakeBool "DOWNLOAD_SOUNDFONT" false) ]; qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ libjack2 ] - }" + "--prefix" + "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" + ":" + (lib.makeLibraryPath [ libjack2 ]) ] - ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" + ++ lib.optionals stdenv.hostPlatform.isLinux [ + "--set" + "ALSA_PLUGIN_DIR" + "${alsa-plugins}/lib/alsa-lib" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 - "--set-default QT_QPA_PLATFORM xcb" + "--set-default" + "QT_QPA_PLATFORM" + "xcb" ]; preFixup = '' qtWrapperArgs+=("''${gappsWrapperArgs[@]}") - - # Recreate correct symlinks (let fixupPhase handle compression) - if [ -e "$manDir/mscore-evo.1" ]; then - ln -sf "mscore-evo.1" "$manDir/musescore-evo.1" - fi ''; dontWrapGApps = true; nativeBuildInputs = [ - qt5.wrapQtAppsHook cmake - qt5.qttools - pkg-config ninja + pkg-config + qt5.qttools + qt5.wrapQtAppsHook ] ++ lib.optionals stdenv.hostPlatform.isLinux [ # Since https://github.com/musescore/MuseScore/pull/13847/commits/685ac998 @@ -91,25 +88,25 @@ stdenv.mkDerivation (finalAttrs: { ]; buildInputs = [ - libjack2 + flac freetype lame + libjack2 libogg + libopus + libopusenc libpulseaudio libsndfile libvorbis portaudio portmidi - flac - libopusenc - libopus - tinyxml-2 qt5.qtbase qt5.qtdeclarative + qt5.qtgraphicaleffects + qt5.qtquickcontrols2 qt5.qtsvg qt5.qtxmlpatterns - qt5.qtquickcontrols2 - qt5.qtgraphicaleffects + tinyxml-2 ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib @@ -145,14 +142,18 @@ stdenv.mkDerivation (finalAttrs: { # On Linux, let CMake + wrapQtAppsHook install/wrap "mscore", then rename it # and adjust the .desktop file so it doesn't clash with the main musescore package. postFixup = lib.optionalString stdenv.hostPlatform.isLinux '' + # 1) Rename the binaries mv "$out/bin/mscore" "$out/bin/mscore-evo" + rm "$out/bin/musescore" + ln -s "$out/bin/mscore-evo" "$out/bin/musescore-evolution" # 2) Fix desktop entry to point to mscore-evo and avoid ID clash desktop="$out/share/applications/mscore.desktop" substitute "$desktop" "$out/share/applications/mscore-evo.desktop" \ - --replace "Exec=mscore" "Exec=mscore-evo" \ - --replace "Name=MuseScore 3.7" "Name=MuseScore 3.7 (Evolution)" \ - --replace "Icon=mscore" "Icon=mscore-evo" + --replace-fail "Exec=mscore" "Exec=mscore-evo" \ + --replace-fail "Name=MuseScore 3.7" "Name=MuseScore 3.7 (Evolution)" \ + --replace-fail "Icon=mscore" "Icon=mscore-evo" \ + --replace-fail "StartupWMClass=mscore" "StartupWMClass=MuseScore3" rm $desktop # 3) Rename app icons (apps/) @@ -169,33 +170,29 @@ stdenv.mkDerivation (finalAttrs: { "$out"/share/icons/hicolor/*/mimetypes/application-x-musescore+xml.*; do dir="''${icon%/*}"; base="''${icon##*/}"; ext="''${base##*.}" case "$base" in - application-x-musescore.*) mv "$icon" "$dir/application-x-musescore-evo.$ext" ;; - application-x-musescore+xml.*) mv "$icon" "$dir/application-x-musescore-evo+xml.$ext" ;; + application-x-musescore.*) mv "$icon" "$dir/application-x-musescore-evolution.$ext" ;; + application-x-musescore+xml.*) mv "$icon" "$dir/application-x-musescore-evolution+xml.$ext" ;; esac done # 4) Rename MIME XML and point icons to the new names - mv "$out/share/mime/packages/musescore.xml" "$out/share/mime/packages/musescore-evo.xml" + mv "$out/share/mime/packages/musescore.xml" "$out/share/mime/packages/musescore-evolution.xml" sed -i \ - -e 's|application-x-musescore\(\+xml\)\?|application-x-musescore-evo\1|g' \ + -e 's|application-x-musescore\(\+xml\)\?|application-x-musescore-evolution\1|g' \ -e 's|musescore|mscore-evo|g' \ - "$out/share/mime/packages/musescore-evo.xml" + "$out/share/mime/packages/musescore-evolution.xml" # 5) Rename man pages to match mscore-evo and remove legacy symlinks manDir="$out/share/man/man1" - # Remove all old musescore/mscore symlinks first (gzip may have created them) - find "$manDir" -type l \ - \( -name 'mscore.1*' -o -name 'musescore.1*' \) \ - -exec rm -f {} + + # Fix existing dangling aliases + if [ -f "$manDir/mscore.1.gz" ]; then + mv "$manDir/mscore.1.gz" "$manDir/mscore-evo.1.gz" + fi - # Rename real files - find "$manDir" \( -name 'mscore.1*' -o -name 'musescore.1*' \) -type f | - while IFS= read -r man; do - base="$(basename "$man")" - newname=$(echo "$base" | sed -e 's/^mscore/mscore-evo/' -e 's/^musescore/mscore-evo/') - mv "$man" "$manDir/$newname" - done + # Replace old musescore.1.gz alias + rm -f "$manDir/musescore.1.gz" + ln -s "$manDir/mscore-evo.1.gz" "$manDir/musescore-evolution.1.gz" # 6) Rename AppStream metadata and its IDs meta="$out/share/metainfo/org.musescore.MuseScore.appdata.xml" diff --git a/pkgs/by-name/mu/musescore/package.nix b/pkgs/by-name/mu/musescore/package.nix index 8bf887c07d20..76e90f3b9c30 100644 --- a/pkgs/by-name/mu/musescore/package.nix +++ b/pkgs/by-name/mu/musescore/package.nix @@ -16,7 +16,7 @@ ffmpeg, flac, freetype, - kdePackages, + qt6, lame, libjack2, libogg, @@ -35,64 +35,27 @@ nixosTests, }: -let - # TODO(@doronbehar): Contribute this one day to lib/? See: - # https://discourse.nixos.org/t/rfc-nix-function-that-overrides-a-scope-with-automatic-inheritance-propagation/78025 - overrideScopeFully = - s: scopeOverrideFunc: - let - partiallyOverriddenScope = s.overrideScope scopeOverrideFunc; - directlyOverriddenAttrs = builtins.attrNames (scopeOverrideFunc partiallyOverriddenScope s); - in - builtins.mapAttrs ( - attrName: pkg: - pkg.override ( - lib.pipe directlyOverriddenAttrs [ - (builtins.filter ( - oAttr: - # Don't include in this filter the attribute `attrName` from the - # full scope, if it is already part of the _directly_ overridden - # attributes. - !(builtins.elem attrName directlyOverriddenAttrs) - && pkg ? override - # Continue with the creation of the `.override` arguments only for - # overridden attributes (`oAttr`) which are possible arguments to the - # `.override` function of the `pkg` at hand. - && pkg.override.__functionArgs ? ${oAttr} - )) - # Generate the `.override` argument using the attribute names `aNames` - (aNames: lib.genAttrs aNames (oAttr: partiallyOverriddenScope.${oAttr})) - ] - ) - ) partiallyOverriddenScope; - kdePackages' = overrideScopeFully kdePackages ( - self: super: { - # Fix for: https://github.com/NixOS/nixpkgs/issues/526825 - # reported upstream at: https://github.com/musescore/MuseScore/issues/33015 - qtdeclarative = super.qtdeclarative.overrideAttrs ( - new: old: { - patches = old.patches ++ [ - (fetchpatch { - url = "https://github.com/qt/qtdeclarative/commit/9d4d376726a6ce15c429128dc65b927e411e40da.patch"; - hash = "sha256-XhfliF5wZuN4/E55f8hfipIRjxBe9V7vL1cgn5p4xqA="; - }) - ]; - } - ); - } - ); -in stdenv.mkDerivation (finalAttrs: { pname = "musescore"; - version = "4.7.2"; + version = "4.7.4"; src = fetchFromGitHub { owner = "musescore"; repo = "MuseScore"; tag = "v${finalAttrs.version}"; - hash = "sha256-7oA+cC5/nOEM2zpFgM13zlBIoc3AB//Ovc+dU1c1r6M="; + hash = "sha256-ny6s5hQUxopb6c45KJugYEZULkC8fLP+Au5ghic0KvI="; }; + patches = [ + # Fix for https://github.com/musescore/MuseScore/issues/34091 also reported + # downstream at: https://github.com/NixOS/nixpkgs/issues/540783. PR to + # track: https://github.com/musescore/MuseScore/pull/34204 + (fetchpatch { + url = "https://github.com/musescore/MuseScore/commit/f273501e418842351c4bda10cce32b0e329eaff1.patch"; + hash = "sha256-zrZRzeAHSFGtCuw/o4A3b1Blbo3FxKGxw1UDu9IggzY="; + }) + ]; + cmakeFlags = [ (lib.cmakeFeature "MUSE_APP_BUILD_MODE" "release") # Disable the build and usage of the `/bin/crashpad_handler` utility - it's @@ -122,17 +85,22 @@ stdenv.mkDerivation (finalAttrs: { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. - "--prefix ${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH : ${ - lib.makeLibraryPath [ libjack2 ] - }" + "--prefix" + "${lib.optionalString stdenv.hostPlatform.isDarwin "DY"}LD_LIBRARY_PATH" + ":" + (lib.makeLibraryPath [ libjack2 ]) ] ++ lib.optionals (stdenv.hostPlatform.isLinux) [ - "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" + "--set" + "ALSA_PLUGIN_DIR" + "${alsa-plugins}/lib/alsa-lib" ] ++ lib.optionals (!stdenv.hostPlatform.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 - "--set-default QT_QPA_PLATFORM xcb" + "--set-default" + "QT_QPA_PLATFORM" + "xcb" ]; preFixup = '' @@ -143,8 +111,8 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake - kdePackages'.qttools - kdePackages'.wrapQtAppsHook + qt6.qttools + qt6.wrapQtAppsHook ninja pkg-config ] @@ -157,12 +125,12 @@ stdenv.mkDerivation (finalAttrs: { buildInputs = [ flac freetype - kdePackages'.qt5compat - kdePackages'.qtbase - kdePackages'.qtdeclarative - kdePackages'.qtnetworkauth - kdePackages'.qtscxml - kdePackages'.qtsvg + qt6.qt5compat + qt6.qtbase + qt6.qtdeclarative + qt6.qtnetworkauth + qt6.qtscxml + qt6.qtsvg lame libjack2 libogg @@ -179,7 +147,7 @@ stdenv.mkDerivation (finalAttrs: { ] ++ lib.optionals stdenv.hostPlatform.isLinux [ alsa-lib - kdePackages'.qtwayland + qt6.qtwayland ]; # Put the default, `$prefix/lib` directory to look for ffmpeg shared objects, diff --git a/pkgs/by-name/mu/museum/package.nix b/pkgs/by-name/mu/museum/package.nix index b773050d3020..27b5b1a8fcce 100644 --- a/pkgs/by-name/mu/museum/package.nix +++ b/pkgs/by-name/mu/museum/package.nix @@ -10,17 +10,17 @@ buildGoModule (finalAttrs: { pname = "museum"; - version = "1.3.36"; + version = "1.3.58"; src = fetchFromGitHub { - owner = "ente-io"; + owner = "ente"; repo = "ente"; sparseCheckout = [ "server" ]; tag = "photos-v${finalAttrs.version}"; - hash = "sha256-9MWmJ3QUgS7BToTnSZzTi4ywGW1RtwrCO+9yQJkvejM="; + hash = "sha256-G9T5qsBKzO7bMCf3IexF9YyDeHK+gZI1Unm4pBq69iI="; }; - vendorHash = "sha256-qrcfNacMR2hwdtezwYrYTPpr1ALCwZktSW8UiyzGXjQ="; + vendorHash = "sha256-Ri2hsPkBvAGGbk9vREmkYxY+JX+nv/OfIAkhU2y0xnQ="; sourceRoot = "${finalAttrs.src.name}/server"; @@ -55,8 +55,8 @@ buildGoModule (finalAttrs: { meta = { description = "API server for ente.io"; - homepage = "https://github.com/ente-io/ente/tree/main/server"; - changelog = "https://github.com/ente-io/ente/releases/tag/photos-v${finalAttrs.version}"; + homepage = "https://github.com/ente/ente/tree/main/server"; + changelog = "https://github.com/ente/ente/releases/tag/photos-v${finalAttrs.version}"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ pinpox diff --git a/pkgs/by-name/mu/music-assistant-desktop/package.nix b/pkgs/by-name/mu/music-assistant-desktop/package.nix index 77733a10003b..765490cdff45 100644 --- a/pkgs/by-name/mu/music-assistant-desktop/package.nix +++ b/pkgs/by-name/mu/music-assistant-desktop/package.nix @@ -8,6 +8,8 @@ # nativeBuildInputs cargo-tauri, + jq, + moreutils, nodejs, pkg-config, yarnBuildHook, @@ -30,30 +32,33 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "music-assistant-desktop"; - version = "0.3.9"; + version = "0.5.9"; src = fetchFromGitHub { owner = "music-assistant"; repo = "desktop-app"; tag = finalAttrs.version; - hash = "sha256-fogNPPdbU8ikTxxaGDYsqR6GCcAsc2fS4qapVDkesAQ="; + hash = "sha256-hkG0e/WlnEQXdaYlE9tebzzE63l4RuwCVjHQVTcTo6Y="; }; - # hide update feature + patches = [ + ./remove-updater.diff + ]; + postPatch = '' - substituteInPlace src-tauri/src/lib.rs \ - --replace-fail \ - "let update =" \ - "// let update =" \ - --replace-fail \ - "&update," \ - "// &update," \ + # set version + substituteInPlace package.json src-tauri/tauri.conf.json \ + --replace-fail "0.0.0" "${finalAttrs.version}" + + # disable upstream updater + jq '.plugins.updater.endpoints = [ ] | .bundle.createUpdaterArtifacts = false' src-tauri/tauri.conf.json \ + | sponge src-tauri/tauri.conf.json ''; cargoRoot = "src-tauri"; buildAndTestSubdir = finalAttrs.cargoRoot; - cargoHash = "sha256-xi6Clo8iHg3YFVcWNMFrN2422MZm2BhB9m/etFlyb/4="; + cargoHash = "sha256-AFn2m8eO+U86s6g2LlzBuAsJBesrm3Gncihf+zbPDeE="; yarnOfflineCache = fetchYarnDeps { yarnLock = finalAttrs.src + "/yarn.lock"; @@ -62,6 +67,8 @@ rustPlatform.buildRustPackage (finalAttrs: { nativeBuildInputs = [ cargo-tauri.hook + jq + moreutils nodejs pkg-config yarnBuildHook @@ -100,6 +107,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Official companion desktop app for Music Assistant"; + changelog = "https://github.com/music-assistant/desktop-app/releases/tag/${finalAttrs.src.tag}"; homepage = "https://github.com/music-assistant/desktop-app"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ nim65s ]; diff --git a/pkgs/by-name/mu/music-assistant-desktop/remove-updater.diff b/pkgs/by-name/mu/music-assistant-desktop/remove-updater.diff new file mode 100644 index 000000000000..3847b3da1066 --- /dev/null +++ b/pkgs/by-name/mu/music-assistant-desktop/remove-updater.diff @@ -0,0 +1,32 @@ +diff --git a/src-tauri/src/lib.rs b/src-tauri/src/lib.rs +index 03cac7d..fc69f93 100644 +--- a/src-tauri/src/lib.rs ++++ b/src-tauri/src/lib.rs +@@ -623,7 +623,6 @@ pub fn run() { + MacosLauncher::AppleScript, + None,)) + .plugin(tauri_plugin_clipboard_manager::init()) +- .plugin(tauri_plugin_updater::Builder::new().build()) + .invoke_handler(tauri::generate_handler![ + is_companion_app, + is_desktop_app, +@@ -733,11 +732,6 @@ pub fn run() { + let separator3 = PredefinedMenuItem::separator(app)?; + let settings = + MenuItemBuilder::with_id("settings", i18n::tr("desktop.tray.settings")).build(app)?; +- let update = MenuItemBuilder::with_id( +- "update", +- i18n::tr("desktop.tray.check_for_updates"), +- ) +- .build(app)?; + let relaunch = + MenuItemBuilder::with_id("relaunch", i18n::tr("desktop.tray.relaunch")).build(app)?; + let open_log = MenuItemBuilder::with_id( +@@ -777,7 +771,6 @@ pub fn run() { + &discord_rpc_item, + &separator3, + &settings, +- &update, + &relaunch, + &open_log, + &separator4, diff --git a/pkgs/by-name/mu/music-assistant/disable-default-provider.diff b/pkgs/by-name/mu/music-assistant/disable-default-provider.diff new file mode 100644 index 000000000000..a86aa4175cb7 --- /dev/null +++ b/pkgs/by-name/mu/music-assistant/disable-default-provider.diff @@ -0,0 +1,12 @@ +diff --git a/music_assistant/mass.py b/music_assistant/mass.py +index 752f9e0af..9d7b3a521 100644 +--- a/music_assistant/mass.py ++++ b/music_assistant/mass.py +@@ -923,6 +923,7 @@ async def _load_providers(self) -> None: + changes_made = False + newly_created_defaults: set[str] = set() + for default_provider, require_mdns in DEFAULT_PROVIDERS: ++ continue + if default_provider in default_providers_setup: + # already processed/setup before, skip + continue diff --git a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch index d074e18fa67c..0df4cf58b369 100644 --- a/pkgs/by-name/mu/music-assistant/dont-install-deps.patch +++ b/pkgs/by-name/mu/music-assistant/dont-install-deps.patch @@ -43,7 +43,7 @@ index 0ac8a70f..5d74e25b 100644 """Set up the YTMusic provider.""" logging.getLogger("yt_dlp").setLevel(self.logger.level + 10) - await self._install_packages() - self._cookie = self.config.get_value(CONF_COOKIE) + self._cookie = str(self.config.get_value(CONF_COOKIE)) self._po_token_server_url = ( self.config.get_value(CONF_PO_TOKEN_SERVER_URL) or DEFAULT_PO_TOKEN_SERVER_URL @@ -1103,8 +1102,6 @@ async def _install_packages(self) -> None: diff --git a/pkgs/by-name/mu/music-assistant/frontend.nix b/pkgs/by-name/mu/music-assistant/frontend.nix index ab091182c71e..4f9ca804376c 100644 --- a/pkgs/by-name/mu/music-assistant/frontend.nix +++ b/pkgs/by-name/mu/music-assistant/frontend.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "music-assistant-frontend"; - version = "2.17.146"; + version = "2.17.186.post3"; pyproject = true; src = fetchPypi { pname = "music_assistant_frontend"; inherit version; - hash = "sha256-VU2SXL6SLFiKntmJJtCabBOYOeImYFPHYxvMPmnhmEc="; + hash = "sha256-a+Z2HuUuvkZQragrRP6vlofk6x/xJHWmnZPBa2BHpso="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/mu/music-assistant/package.nix b/pkgs/by-name/mu/music-assistant/package.nix index 1adda47f84a0..11a55d3ed405 100644 --- a/pkgs/by-name/mu/music-assistant/package.nix +++ b/pkgs/by-name/mu/music-assistant/package.nix @@ -6,6 +6,7 @@ ffmpeg_7-headless, nixosTests, replaceVars, + writableTmpDirAsHomeHook, providers ? [ ], }: @@ -15,16 +16,17 @@ let music-assistant-frontend = prev.callPackage ./frontend.nix { }; music-assistant-models = final.music-assistant-models.overridePythonAttrs (oldAttrs: { - version = "1.1.115"; + version = "1.1.129.post1"; src = oldAttrs.src.override { - hash = "sha256-oEXL0B8JNH4PcltpES375ov7QGs+gtYKlMGr1B7BlKY="; + hash = "sha256-86BmUmduNcSbEHxK+/he78b5fAM/XBhnNEc28Uv74GI="; }; }); } ); - providerPackages = (import ./providers.nix).providers; + providersMeta = import ./providers.nix; + providerPackages = providersMeta.providers; providerNames = lib.attrNames providerPackages; providerDependencies = lib.concatMap ( provider: (providerPackages.${provider} pythonPackages) @@ -36,16 +38,17 @@ in assert (lib.elem "ariacast" providers) -> throw "music-assistant: ariacast has not been packaged, yet."; -pythonPackages.buildPythonApplication rec { +pythonPackages.buildPythonApplication (finalAttrs: { pname = "music-assistant"; - version = "2.8.7"; + version = "2.9.9"; pyproject = true; + __structuredAttrs = true; src = fetchFromGitHub { owner = "music-assistant"; repo = "server"; - tag = version; - hash = "sha256-m91q/8XYoZ5Azu79fKD0euRCuf29w3vj5cxdFheDsmI="; + tag = finalAttrs.version; + hash = "sha256-ooe+QW+7S5LCgpin5/2g4L8+UDtr4TGZRpeR5F/tqZo="; }; patches = [ @@ -78,11 +81,15 @@ pythonPackages.buildPythonApplication rec { # ^^^^^^^^^^^^^^^ # E IndexError: tuple index out of range ./fix-webserver-tests-in-sandbox.patch + + # As providers must be configured through the nixos module, there is no gain + # if Music Assistant tries to enable some of them without the proper dependencies. + ./disable-default-provider.diff ]; postPatch = '' substituteInPlace pyproject.toml \ - --replace-fail "0.0.0" "${version}" \ + --replace-fail "0.0.0" "${finalAttrs.version}" \ --replace-fail "==" ">=" rm -rv \ @@ -109,6 +116,7 @@ pythonPackages.buildPythonApplication rec { "mashumaro" "orjson" "xmltodict" + "zeroconf" ]; pythonRemoveDeps = [ @@ -138,7 +146,9 @@ pythonPackages.buildPythonApplication rec { gql ifaddr librosa + markdownify mashumaro + modern-colorthief music-assistant-frontend music-assistant-models mutagen @@ -150,6 +160,8 @@ pythonPackages.buildPythonApplication rec { pyjwt python-slugify shortuuid + torch + torchaudio unidecode xmltodict zeroconf @@ -173,19 +185,38 @@ pythonPackages.buildPythonApplication rec { nativeCheckInputs = with pythonPackages; [ - pytestCheckHook + pytest9_0CheckHook + writableTmpDirAsHomeHook ] - ++ lib.concatAttrValues optional-dependencies - ++ (lib.concatMap (provider: providerPackages.${provider} python.pkgs) [ + ++ lib.concatAttrValues finalAttrs.passthru.optional-dependencies + ++ (lib.concatMap (provider: providerPackages.${provider} pythonPackages) [ + "acoustid_lookup" "audible" "dlna" + "fastmcp_server" "jellyfin" + "mpd" + "msx_bridge" "opensubsonic" "sendspin" + "smart_fades" "snapcast" + "sonic_analysis" + "sonic_similarity" + "sonos_s1" "tidal" + "wiim" + "ytmusic" ]); + preCheck = '' + export NUMBA_CACHE_DIR=$(mktemp -d) + + # required for smart_fades tests + mkdir -p $HOME/.cache/torch/hub/checkpoints/ + cp ${pythonPackages.beat-this.passthru.small0Ckpt} $HOME/.cache/torch/hub/checkpoints/beat_this-small0.ckpt + ''; + disabledTestPaths = [ # no multicast support in build sandbox: # "OSError: [Errno 19] No such device" @@ -193,14 +224,26 @@ pythonPackages.buildPythonApplication rec { # provider is missing dependencies "tests/providers/apple_music" "tests/providers/bandcamp" + "tests/providers/hue_entertainment" "tests/providers/kion_music" "tests/providers/nicovideo" + "tests/providers/qqmusic" + "tests/providers/siriusxm" "tests/providers/yandex_music" + "tests/providers/yandex_ynison" "tests/providers/zvuk_music" # mocking music_assistant.providers.airplay.pairing.AirPlayPairing does not work "tests/providers/airplay/test_player.py::test_start_pairing__pin_decision" ]; + disabledTests = lib.optionals (stdenv.hostPlatform.isLinux && stdenv.hostPlatform.isAarch64) [ + # RuntimeError: failed to initialize QNNPACK + "test_beat_detection" + "test_extended_analysis_fields" + "test_finalize_returns_audio_analysis_data" + "test_finalize_returns_none_on_early_exit" + ]; + pythonImportsCheck = [ "music_assistant" ]; passthru = { @@ -210,12 +253,13 @@ pythonPackages.buildPythonApplication rec { providerPackages providerNames ; + providersBuiltins = providersMeta.builtins; tests = nixosTests.music-assistant; }; meta = { broken = stdenv.hostPlatform.isDarwin; - changelog = "https://github.com/music-assistant/server/releases/tag/${version}"; + changelog = "https://github.com/music-assistant/server/releases/tag/${finalAttrs.src.tag}"; description = "Music Assistant is a music library manager for various music sources which can easily stream to a wide range of supported players"; longDescription = '' Music Assistant is a free, opensource Media library manager that connects to your streaming services and a wide @@ -230,4 +274,4 @@ pythonPackages.buildPythonApplication rec { ]; mainProgram = "mass"; }; -} +}) diff --git a/pkgs/by-name/mu/music-assistant/providers.nix b/pkgs/by-name/mu/music-assistant/providers.nix index 4acb6678c682..9ac2b0a5ec6f 100644 --- a/pkgs/by-name/mu/music-assistant/providers.nix +++ b/pkgs/by-name/mu/music-assistant/providers.nix @@ -1,8 +1,27 @@ # Do not edit manually, run ./update-providers.py { - version = "2.8.7"; + version = "2.9.9"; + builtins = [ + "builtin" + "coverartarchive" + "fanarttv" + "itunes_artwork" + "local_audio" + "loudness_analysis" + "lrclib" + "musicbrainz" + "sendspin" + "sync_group" + "theaudiodb" + "universal_player" + "wikipedia" + ]; providers = { + acoustid_lookup = + ps: with ps; [ + pyacoustid + ]; airplay = ps: with ps; [ srptools @@ -29,8 +48,10 @@ ps: with ps; [ aioaudiobookshelf ]; - bandcamp = ps: [ - ]; # missing bandcamp-async-api + bandcamp = + ps: with ps; [ + bandcamp-async-api + ]; bbc_sounds = ps: with ps; [ pytz @@ -65,6 +86,10 @@ ]; fanarttv = ps: [ ]; + fastmcp_server = + ps: with ps; [ + fastmcp + ]; filesystem_local = ps: [ ]; filesystem_nfs = ps: [ @@ -89,10 +114,14 @@ ps: with ps; [ pyheos ]; + hue_entertainment = ps: [ + ]; # missing hue-entertainment ibroadcast = ps: [ ]; # missing ibroadcastaio internet_archive = ps: [ ]; + itunes_artwork = ps: [ + ]; itunes_podcasts = ps: [ ]; jellyfin = @@ -101,6 +130,8 @@ ]; kion_music = ps: [ ]; # missing yandex-music + lastfm_recommendations = ps: [ + ]; lastfm_scrobble = ps: with ps; [ pylast @@ -109,16 +140,40 @@ ps: with ps; [ liblistenbrainz ]; + local_audio = + ps: with ps; [ + sounddevice + ]; + loudness_analysis = ps: [ + ]; lrclib = ps: [ ]; + motherearthradio = ps: [ + ]; + mpd = + ps: with ps; [ + python-mpd2 + ]; + msx_bridge = + ps: with ps; [ + pydantic + ]; musicbrainz = ps: [ ]; musiccast = ps: with ps; [ aiomusiccast ]; - nicovideo = ps: [ - ]; # missing niconico.py-ma + musicme = ps: [ + ]; + neteasecloudmusic = ps: [ + ]; + nicovideo = + ps: with ps; [ + pydantic + ]; # missing niconico.py-ma + nts = ps: [ + ]; nugs = ps: [ ]; opensubsonic = @@ -147,6 +202,8 @@ ]; qobuz = ps: [ ]; + qqmusic = ps: [ + ]; # missing qqmusic-api-python radiobrowser = ps: with ps; [ radios @@ -158,13 +215,26 @@ async-upnp-client rokuecp ]; + samsung_wam = ps: [ + ]; # missing pywam sendspin = - ps: with ps; [ + ps: + with ps; + [ aiosendspin av - ]; + ] + ++ aiosendspin.optional-dependencies.server; siriusxm = ps: [ ]; # missing sxm + smart_fades = + ps: with ps; [ + beat-this + nnaudio + threadpoolctl + ]; + smart_playlist = ps: [ + ]; snapcast = ps: with ps; [ bidict @@ -173,6 +243,20 @@ ]; somafm = ps: [ ]; + sonic_analysis = + ps: with ps; [ + huggingface-hub + pyyaml + threadpoolctl + torchlibrosa + transformers + ]; + sonic_similarity = + ps: with ps; [ + huggingface-hub + transformers + usearch + ]; sonos = ps: with ps; [ aiosonos @@ -190,10 +274,8 @@ ps: with ps; [ pkce ]; - spotify_connect = - ps: with ps; [ - pkce - ]; + spotify_connect = ps: [ + ]; squeezelite = ps: with ps; [ aioslimproto @@ -220,8 +302,20 @@ ps: with ps; [ aiovban ]; + webdav = ps: [ + ]; + wiim = + ps: with ps; [ + wiim + ]; + wikipedia = ps: [ + ]; yandex_music = ps: [ - ]; # missing yandex-music + ]; # missing yandex-music, ya-passport-auth + yandex_smarthome = ps: [ + ]; # missing ya-passport-auth + yandex_ynison = ps: [ + ]; # missing ya-passport-auth yousee = ps: [ ]; ytmusic = @@ -232,6 +326,7 @@ ytmusicapi ]; # missing deno zvuk_music = ps: [ - ]; # missing zvuk-music + ]; + # missing zvuk-music }; } diff --git a/pkgs/by-name/mu/music-assistant/update-providers.py b/pkgs/by-name/mu/music-assistant/update-providers.py index c464fc1cd5b1..b9273f4280b7 100755 --- a/pkgs/by-name/mu/music-assistant/update-providers.py +++ b/pkgs/by-name/mu/music-assistant/update-providers.py @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#!nix-shell -I nixpkgs=./. -i python3 -p "music-assistant.python.withPackages (ps: music-assistant.dependencies ++ (with ps; [ jinja2 packaging ]))" -p nixfmt pyright ruff isort +#!nix-shell -I nixpkgs=./. -i python3 -p "music-assistant.pythonPackages.python.withPackages (ps: music-assistant.dependencies ++ (with ps; [ jinja2 packaging ]))" -p nixfmt pyright ruff isort import asyncio import json import os.path @@ -24,13 +24,22 @@ TEMPLATE = """# Do not edit manually, run ./update-providers.py { version = "{{ version }}"; + builtins = [ +{%- for builtin in builtins | sort %} + "{{ builtin }}" +{%- endfor %} + ]; providers = { {%- for provider in providers | sort(attribute='domain') %} {{ provider.domain }} = {% if provider.available %}ps: with ps;{% else %}ps:{% endif %} [ {%- for requirement in provider.available | sort %} - {{ requirement }} + {{ requirement }} {%- endfor %} - ];{% if provider.missing %} # missing {{ ", ".join(provider.missing) }}{% endif %} + ] +{%- for requirement in provider.extra_list_deps | sort %} + ++ {{ requirement }} +{%- endfor %} +;{% if provider.missing %} # missing {{ ", ".join(provider.missing) }}{% endif %} {%- endfor %} }; } @@ -50,13 +59,16 @@ ROOT: Final = ( .strip() ) -PACKAGE_SET = "music-assistant.python.pkgs" +PACKAGE_SET = "music-assistant.pythonPackages" PACKAGE_MAP = { "git+https://github.com/MarvinSchenkel/pytube.git": "pytube", } EXTRA_DEPS = { + # Those providers cannot guard pydantic behind TYPE_CHECKING + "msx_bridge": ["pydantic"], + "nicovideo": ["pydantic"], "ytmusic": [ # https://github.com/music-assistant/server/blob/2.5.8/music_assistant/providers/ytmusic/__init__.py#L120 "bgutil-ytdlp-pot-provider", @@ -65,6 +77,11 @@ EXTRA_DEPS = { } +EXTRA_LIST_DEPS = { + "sendspin": ["aiosendspin.optional-dependencies.server"], +} + + def run_sync(cmd: List[str]) -> None: print(f"$ {' '.join(cmd)}") process = run(cmd) @@ -143,7 +160,7 @@ def packageset_attributes(): ROOT, "-qa", "-A", - "music-assistant.python.pkgs", + "music-assistant.pythonPackages", "--arg", "config", "{ allowAliases = false; }", @@ -162,7 +179,7 @@ class NoMatch(Exception): def resolve_package_attribute(package: str) -> str: - pattern = re.compile(rf"^music-assistant\.python\.pkgs\.{package}$", re.I) + pattern = re.compile(rf"^music-assistant\.pythonPackages\.{package}$", re.I) packages = packageset_attributes() matches = [] for attr in packages.keys(): @@ -189,6 +206,7 @@ class Provider: domain: str available: list[str] = field(default_factory=list) missing: list[str] = field(default_factory=list) + extra_list_deps: list[str] = field(default_factory=list) def __eq__(self, other): return self.domain == other.domain @@ -197,12 +215,12 @@ class Provider: return hash(self.domain) -async def resolve_providers(manifests) -> Set: +async def resolve_providers(manifests) -> tuple[Set, Set]: errors = [] providers = set() for manifest in manifests: provider = Provider(manifest.domain) - requirements = manifest.requirements + EXTRA_DEPS.get(manifest.domain, []) + requirements = manifest.requirements for requirement in requirements: # allow substituting requirement specifications that packaging cannot parse if requirement in PACKAGE_MAP: @@ -223,26 +241,37 @@ async def resolve_providers(manifests) -> Set: version = await get_package_version(attr) if version not in requirement.specifier: errors.append(f"{requirement} not satisfied by version {version}") + if manifest.domain in EXTRA_DEPS: + for requirement in EXTRA_DEPS[manifest.domain]: + provider.available.append(requirement) + if manifest.domain in EXTRA_LIST_DEPS: + for requirement in EXTRA_LIST_DEPS[manifest.domain]: + provider.extra_list_deps.append(requirement) providers.add(provider) if errors: print("\n - ", end="") print("\n - ".join(errors)) - return providers + + builtins = {manifest.domain for manifest in manifests if manifest.builtin} + + return providers, builtins -def render(outpath: str, version: str, providers: Set): +def render(outpath: str, version: str, providers: Set, builtins: Set): env = Environment() template = env.from_string(TEMPLATE) - template.stream(version=version, providers=providers).dump(outpath) + template.stream(version=version, providers=providers, builtins=builtins).dump( + outpath + ) async def main(): version: str = cast(str, await Nix.eval("music-assistant.version")) manifests = await get_provider_manifests(version) - providers = await resolve_providers(manifests) + providers, builtins = await resolve_providers(manifests) outpath = os.path.join(ROOT, "pkgs/by-name/mu/music-assistant/providers.nix") - render(outpath, version, providers) + render(outpath, version, providers, builtins) run_sync(["nixfmt", outpath]) diff --git a/pkgs/by-name/mu/musicpresence/package.nix b/pkgs/by-name/mu/musicpresence/package.nix new file mode 100644 index 000000000000..d318a9e80955 --- /dev/null +++ b/pkgs/by-name/mu/musicpresence/package.nix @@ -0,0 +1,77 @@ +{ + lib, + stdenv, + fetchurl, + autoPatchelfHook, + makeWrapper, + libGL, + libxcb, + libx11, + wayland, + fontconfig, + freetype, + libgpg-error, + e2fsprogs, + xkeyboard_config, + qt6, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "musicpresence"; + version = "2.3.6"; + + src = fetchurl { + url = "https://github.com/ungive/discord-music-presence/releases/download/v${finalAttrs.version}/musicpresence-${finalAttrs.version}-linux-x86_64.tar.gz"; + hash = "sha256-w3y1I6nnztEMaihbXIfQqB0ng6s07iA8bqC8PDq+E+I="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + makeWrapper + ]; + + buildInputs = [ + libGL + libxcb + libx11 + wayland + fontconfig + freetype + libgpg-error + e2fsprogs + stdenv.cc.cc.lib + ]; + + dontBuild = true; + dontConfigure = true; + + strictDeps = true; + __structuredAttrs = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + cp -r usr/share $out/ + + makeWrapper $out/share/musicpresence/bin/musicpresence $out/bin/musicpresence \ + --set XKB_CONFIG_ROOT "${xkeyboard_config}/share/X11/xkb" \ + --prefix QT_PLUGIN_PATH : "${qt6.qtwayland}/${qt6.qtbase.qtPluginPrefix}" \ + --unset QT_STYLE_OVERRIDE + + runHook postInstall + ''; + + meta = { + description = "Discord music status that works with any media player"; + homepage = "https://github.com/ungive/discord-music-presence"; + license = lib.licenses.unfree; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + platforms = [ "x86_64-linux" ]; + mainProgram = "musicpresence"; + maintainers = with lib.maintainers; [ + wiyba + nonplay + ]; + }; +}) diff --git a/pkgs/by-name/mu/musl/package.nix b/pkgs/by-name/mu/musl/package.nix index b13ea98e18b7..4e9ce959c31e 100644 --- a/pkgs/by-name/mu/musl/package.nix +++ b/pkgs/by-name/mu/musl/package.nix @@ -98,6 +98,14 @@ stdenv.mkDerivation (finalAttrs: { # drop next release # https://git.musl-libc.org/cgit/musl/commit/?id=fde29c04adbab9d5b081bf6717b5458188647f1c ./stdio-skip-empty-iovec-when-buffering-is-disabled.patch + # Backport addition of statx fields needed by systemd + ./statx.patch + # Backport addition of statx attrs needed by systemd + ./statx-attr.patch + # Backport even more statx stuff for systemd + ./statx-linux-6.11.patch + # Backport addition of renameat2 syscall wrapper needed by systemd + ./renameat2.patch ]; env = { diff --git a/pkgs/by-name/mu/musl/renameat2.patch b/pkgs/by-name/mu/musl/renameat2.patch new file mode 100644 index 000000000000..22416191d20c --- /dev/null +++ b/pkgs/by-name/mu/musl/renameat2.patch @@ -0,0 +1,55 @@ +From 05ce67fea99ca09cd4b6625cff7aec9cc222dd5a Mon Sep 17 00:00:00 2001 +From: Tony Ambardar +Date: Mon, 6 May 2024 20:28:32 -0700 +Subject: add renameat2 linux syscall wrapper + +This syscall is available since Linux 3.15 and also implemented in +glibc from version 2.28. It is commonly used in filesystem or security +contexts. + +Constants RENAME_NOREPLACE, RENAME_EXCHANGE, RENAME_WHITEOUT are +guarded by _GNU_SOURCE as with glibc. +--- + include/stdio.h | 7 +++++++ + src/linux/renameat2.c | 11 +++++++++++ + 2 files changed, 18 insertions(+) + create mode 100644 src/linux/renameat2.c + +diff --git a/include/stdio.h b/include/stdio.h +index cb858618..4ea4c170 100644 +--- a/include/stdio.h ++++ b/include/stdio.h +@@ -158,6 +158,13 @@ char *ctermid(char *); + #define L_ctermid 20 + #endif + ++#if defined(_GNU_SOURCE) ++#define RENAME_NOREPLACE (1 << 0) ++#define RENAME_EXCHANGE (1 << 1) ++#define RENAME_WHITEOUT (1 << 2) ++ ++int renameat2(int, const char *, int, const char *, unsigned); ++#endif + + #if defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ + || defined(_BSD_SOURCE) +diff --git a/src/linux/renameat2.c b/src/linux/renameat2.c +new file mode 100644 +index 00000000..b8060388 +--- /dev/null ++++ b/src/linux/renameat2.c +@@ -0,0 +1,11 @@ ++#define _GNU_SOURCE ++#include ++#include "syscall.h" ++ ++int renameat2(int oldfd, const char *old, int newfd, const char *new, unsigned flags) ++{ ++#ifdef SYS_renameat ++ if (!flags) return syscall(SYS_renameat, oldfd, old, newfd, new); ++#endif ++ return syscall(SYS_renameat2, oldfd, old, newfd, new, flags); ++} +-- +cgit v1.2.1 + diff --git a/pkgs/by-name/mu/musl/statx-attr.patch b/pkgs/by-name/mu/musl/statx-attr.patch new file mode 100644 index 000000000000..50c2a16d433c --- /dev/null +++ b/pkgs/by-name/mu/musl/statx-attr.patch @@ -0,0 +1,35 @@ +From cbf1c7b605d979bb7fdde8b8e6a66acdba18c6b0 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Wed, 24 Apr 2024 13:26:03 -0400 +Subject: add missing STATX_ATTR_* macros omitted when statx was added + +commit b817541f1cfd38e4b81257b3215e276ea9d0fc61 added statx and the +mask constant macros, but not the stx_attributes[_mask] ones. +--- + include/sys/stat.h | 10 ++++++++++ + 1 file changed, 10 insertions(+) + +diff --git a/include/sys/stat.h b/include/sys/stat.h +index 6690192d..57d640d7 100644 +--- a/include/sys/stat.h ++++ b/include/sys/stat.h +@@ -121,6 +121,16 @@ int lchmod(const char *, mode_t); + #define STATX_BTIME 0x800U + #define STATX_ALL 0xfffU + ++#define STATX_ATTR_COMPRESSED 0x4 ++#define STATX_ATTR_IMMUTABLE 0x10 ++#define STATX_ATTR_APPEND 0x20 ++#define STATX_ATTR_NODUMP 0x40 ++#define STATX_ATTR_ENCRYPTED 0x800 ++#define STATX_ATTR_AUTOMOUNT 0x1000 ++#define STATX_ATTR_MOUNT_ROOT 0x2000 ++#define STATX_ATTR_VERITY 0x100000 ++#define STATX_ATTR_DAX 0x200000 ++ + struct statx_timestamp { + int64_t tv_sec; + uint32_t tv_nsec, __pad; +-- +cgit v1.2.1 + diff --git a/pkgs/by-name/mu/musl/statx-linux-6.11.patch b/pkgs/by-name/mu/musl/statx-linux-6.11.patch new file mode 100644 index 000000000000..6e5564a06ef9 --- /dev/null +++ b/pkgs/by-name/mu/musl/statx-linux-6.11.patch @@ -0,0 +1,49 @@ +From fcdff46a3203400e08a2264c34b3c7fb62bf6969 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?J=2E=20Neusch=C3=A4fer?= +Date: Thu, 24 Oct 2024 01:19:30 +0200 +Subject: statx: add Linux 6.11 fields/constants + +As of Linux 6.11, these fields and mask macros have been added to +include/uapi/linux/stat.h. +--- + include/sys/stat.h | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/include/sys/stat.h b/include/sys/stat.h +index c924ce2f..4f7dc2b1 100644 +--- a/include/sys/stat.h ++++ b/include/sys/stat.h +@@ -123,6 +123,8 @@ int lchmod(const char *, mode_t); + #define STATX_MNT_ID 0x1000U + #define STATX_DIOALIGN 0x2000U + #define STATX_MNT_ID_UNIQUE 0x4000U ++#define STATX_SUBVOL 0x8000U ++#define STATX_WRITE_ATOMIC 0x10000U + + #define STATX_ATTR_COMPRESSED 0x4 + #define STATX_ATTR_IMMUTABLE 0x10 +@@ -133,6 +135,7 @@ int lchmod(const char *, mode_t); + #define STATX_ATTR_MOUNT_ROOT 0x2000 + #define STATX_ATTR_VERITY 0x100000 + #define STATX_ATTR_DAX 0x200000 ++#define STATX_ATTR_WRITE_ATOMIC 0x400000 + + struct statx_timestamp { + int64_t tv_sec; +@@ -164,7 +167,12 @@ struct statx { + uint32_t stx_dio_mem_align; + uint32_t stx_dio_offset_align; + uint64_t stx_subvol; +- uint64_t __pad1[11]; ++ uint32_t stx_atomic_write_unit_min; ++ uint32_t stx_atomic_write_unit_max; ++ uint32_t stx_atomic_write_segments_max; ++ uint32_t __pad1[1]; ++ uint64_t __pad2[9]; ++ + }; + + int statx(int, const char *__restrict, int, unsigned, struct statx *__restrict); +-- +cgit v1.2.1 + diff --git a/pkgs/by-name/mu/musl/statx.patch b/pkgs/by-name/mu/musl/statx.patch new file mode 100644 index 000000000000..fd08b5303cbb --- /dev/null +++ b/pkgs/by-name/mu/musl/statx.patch @@ -0,0 +1,39 @@ +From 23ab04a8630225371455d5f4538fd078665bb646 Mon Sep 17 00:00:00 2001 +From: Rich Felker +Date: Fri, 13 Sep 2024 17:21:17 -0400 +Subject: statx: add new struct statx fields and corresponding mask macros + +--- + include/sys/stat.h | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/include/sys/stat.h b/include/sys/stat.h +index 57d640d7..0c10dc21 100644 +--- a/include/sys/stat.h ++++ b/include/sys/stat.h +@@ -120,6 +120,9 @@ int lchmod(const char *, mode_t); + #define STATX_BASIC_STATS 0x7ffU + #define STATX_BTIME 0x800U + #define STATX_ALL 0xfffU ++#define STATX_MNT_ID 0x1000U ++#define STATX_DIOALIGN 0x2000U ++#define STATX_MNT_ID_UNIQUE 0x4000U + + #define STATX_ATTR_COMPRESSED 0x4 + #define STATX_ATTR_IMMUTABLE 0x10 +@@ -157,7 +160,11 @@ struct statx { + uint32_t stx_rdev_minor; + uint32_t stx_dev_major; + uint32_t stx_dev_minor; +- uint64_t __pad1[14]; ++ uint64_t stx_mnt_id; ++ uint32_t stx_dio_mem_align; ++ uint32_t stx_dio_offet_align; ++ uint64_t stx_subvol; ++ uint64_t __pad1[11]; + }; + + int statx(int, const char *__restrict, int, unsigned, struct statx *__restrict); +-- +cgit v1.2.1 + diff --git a/pkgs/by-name/mu/muso/package.nix b/pkgs/by-name/mu/muso/package.nix index 76ec9e605175..727f2725624e 100644 --- a/pkgs/by-name/mu/muso/package.nix +++ b/pkgs/by-name/mu/muso/package.nix @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage { description = "Automatic music sorter (based on ID3 tags)"; mainProgram = "muso"; homepage = "https://github.com/quebin31/muso"; - license = with lib.licenses; [ gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ crertel ]; }; } diff --git a/pkgs/by-name/mu/mustache-go/package.nix b/pkgs/by-name/mu/mustache-go/package.nix index 509484983afa..2e88898d9693 100644 --- a/pkgs/by-name/mu/mustache-go/package.nix +++ b/pkgs/by-name/mu/mustache-go/package.nix @@ -26,7 +26,7 @@ buildGoModule (finalAttrs: { meta = { homepage = "https://github.com/cbroglie/mustache"; description = "Mustache template language in Go"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ Zimmi48 ]; mainProgram = "mustache"; }; diff --git a/pkgs/by-name/mu/mustang-cli/package.nix b/pkgs/by-name/mu/mustang-cli/package.nix index e0a2dfb28658..4809ea3bf584 100644 --- a/pkgs/by-name/mu/mustang-cli/package.nix +++ b/pkgs/by-name/mu/mustang-cli/package.nix @@ -19,20 +19,20 @@ let }; in maven.buildMavenPackage (finalAttrs: { - version = "2.23.1"; + version = "2.24.0"; pname = "mustang-cli"; src = fetchFromGitHub { owner = "ZUGFeRD"; repo = "mustangproject"; tag = "core-${finalAttrs.version}"; - hash = "sha256-HhNcmXXwnR2u1hjSeNYfU+j9EdJ+tbXhgWHj1k4eSuw="; + hash = "sha256-hNsVVG0OJlshv0J8l6TYtoFCaPKVQrv6U8HO/I6whBo="; }; strictDeps = true; __structuredAttrs = true; - mvnHash = "sha256-ekSgGKY3OMFAEM3bNByBXrU3tpbDcbJ0fmCTRz7NIkA="; + mvnHash = "sha256-JjhKHcnLO6OZ6VAI7fFpvS90TK6yOVhX0wk4vrnbFFo="; nativeBuildInputs = [ makeWrapper diff --git a/pkgs/by-name/mu/mutt/package.nix b/pkgs/by-name/mu/mutt/package.nix index 29ef1c0cd5ad..d2a1b3077d98 100644 --- a/pkgs/by-name/mu/mutt/package.nix +++ b/pkgs/by-name/mu/mutt/package.nix @@ -31,7 +31,7 @@ assert gpgmeSupport -> sslSupport; stdenv.mkDerivation rec { pname = "mutt"; - version = "2.3.2"; + version = "2.4.1"; outputs = [ "out" "doc" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://ftp.mutt.org/pub/mutt/${pname}-${version}.tar.gz"; - hash = "sha256-m096RC5BwFd3S6fDb6Qaui7dLnoSqGAx5uuxE7qyx54="; + hash = "sha256-ViQyHwscwe/2yrnvCPJZVP9kxRsz1L87mUhM8e3Yz/8="; }; patches = [ diff --git a/pkgs/by-name/mu/mutter/package.nix b/pkgs/by-name/mu/mutter/package.nix index d6e132537610..88a35c0432be 100644 --- a/pkgs/by-name/mu/mutter/package.nix +++ b/pkgs/by-name/mu/mutter/package.nix @@ -1,5 +1,6 @@ { fetchurl, + fetchpatch, runCommand, lib, stdenv, @@ -72,7 +73,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "mutter"; - version = "50.1"; + version = "50.2"; outputs = [ "out" @@ -83,9 +84,18 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/mutter/${lib.versions.major finalAttrs.version}/mutter-${finalAttrs.version}.tar.xz"; - hash = "sha256-k0RQLORz94h5Xya0X4uP9TwKNrhnRw1wWhGj7gkRAh4="; + hash = "sha256-/ejfinRlAMUfHJJbUeV8PdhwByM771Yweegx9Tv6O1Y="; }; + patches = [ + # mutter 50.2 spams logs, clutter_input_focus_set_cursor_location + # https://gitlab.gnome.org/GNOME/mutter/-/work_items/4840 + (fetchpatch { + url = "https://gitlab.gnome.org/GNOME/mutter/-/commit/f1570318ec3e9a38615eb91708bb71628ab8bcfd.patch"; + hash = "sha256-73GI2DTgoEBUQGa7nTUIur/ZuDHgDu4SwjUWHBRCyuo="; + }) + ]; + mesonFlags = [ "-Degl_device=true" "-Dinstalled_tests=false" # TODO: enable these diff --git a/pkgs/by-name/mv/mvnd/package.nix b/pkgs/by-name/mv/mvnd/package.nix index 86da716dcc62..5249dbb8c8fd 100644 --- a/pkgs/by-name/mv/mvnd/package.nix +++ b/pkgs/by-name/mv/mvnd/package.nix @@ -15,7 +15,6 @@ let platformMap = { aarch64-darwin = "darwin-aarch64"; aarch64-linux = "linux-aarch64"; - x86_64-darwin = "darwin-amd64"; x86_64-linux = "linux-amd64"; }; in diff --git a/pkgs/by-name/mx/mxnet/package.nix b/pkgs/by-name/mx/mxnet/package.nix index fbed8ae66b98..ba12c3ad4642 100644 --- a/pkgs/by-name/mx/mxnet/package.nix +++ b/pkgs/by-name/mx/mxnet/package.nix @@ -26,6 +26,9 @@ stdenv.mkDerivation (finalAttrs: { pname = "mxnet"; version = "1.9.1"; + strictDeps = true; + __structuredAttrs = true; + src = fetchurl { name = "apache-mxnet-src-${finalAttrs.version}-incubating.tar.gz"; url = "mirror://apache/incubator/mxnet/${finalAttrs.version}/apache-mxnet-src-${finalAttrs.version}-incubating.tar.gz"; @@ -50,6 +53,9 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake perl + ] + ++ lib.optionals cudaSupport [ + cudaPackages.cuda_nvcc ]; buildInputs = [ @@ -61,7 +67,7 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optionals cudaSupport [ # needed for OpenCV cmake module - cudaPackages.cudatoolkit + cudaPackages.cuda_cudart ]; cmakeFlags = [ diff --git a/pkgs/by-name/mx/mxt-app/package.nix b/pkgs/by-name/mx/mxt-app/package.nix index b2eea816e245..adaf1bda2bd9 100644 --- a/pkgs/by-name/mx/mxt-app/package.nix +++ b/pkgs/by-name/mx/mxt-app/package.nix @@ -7,14 +7,14 @@ }: stdenv.mkDerivation (finalAttrs: { - version = "1.46"; + version = "1.52"; pname = "mxt-app"; src = fetchFromGitHub { owner = "atmel-maxtouch"; repo = "mxt-app"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-SeP48xdZ43dL28tg7mo8SmObUt3R+8oyETst6yKkhnU="; + sha256 = "sha256-CW2iWkYuI0joTQJXt271XLO70Qq/Yg8eX9f56XnJht8="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/pkgs/by-name/my/mydumper/package.nix b/pkgs/by-name/my/mydumper/package.nix index 7c851c85205a..38212f076f2d 100644 --- a/pkgs/by-name/my/mydumper/package.nix +++ b/pkgs/by-name/my/mydumper/package.nix @@ -22,13 +22,13 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "mydumper"; - version = "1.0.1-3"; + version = "1.0.3-1"; src = fetchFromGitHub { owner = "mydumper"; repo = "mydumper"; tag = "v${finalAttrs.version}"; - hash = "sha256-Hk+GdJH+hH8HUcKKfzP6G0L/jM2DAfZtm+cPqAJAPJ0="; + hash = "sha256-r3f8WBF8pyWnxuqTKfNx3EBiRIP9pHk7dxGMaE7UOW4="; # as of mydumper v0.16.5-1, mydumper extracted its docs into a submodule fetchSubmodules = true; }; diff --git a/pkgs/by-name/my/myks/package.nix b/pkgs/by-name/my/myks/package.nix index 8599049734db..ba43034e958d 100644 --- a/pkgs/by-name/my/myks/package.nix +++ b/pkgs/by-name/my/myks/package.nix @@ -10,16 +10,16 @@ buildGoModule (finalAttrs: { pname = "myks"; - version = "5.13.1"; + version = "5.13.2"; src = fetchFromGitHub { owner = "mykso"; repo = "myks"; tag = "v${finalAttrs.version}"; - hash = "sha256-wnN4CuRqnItEorDDFHzC0eRutcu2fMeVA42U4Y8JnqQ="; + hash = "sha256-Ij1QmMr2JJSjs+5e80RxjZcCKoSqNb9mD+IKtQjX13w="; }; - vendorHash = "sha256-BUMhjjQZFX+AicRKVAKkRwv4hnM8Ph6CxYrTPh+BTPY="; + vendorHash = "sha256-x5yCigeM4ltL1wphW8ufa0WB3nd14AOkXGLggAxKTrs="; subPackages = "."; diff --git a/pkgs/by-name/my/mymake/package.nix b/pkgs/by-name/my/mymake/package.nix index d78ff685fa3e..b99f3a9728e6 100644 --- a/pkgs/by-name/my/mymake/package.nix +++ b/pkgs/by-name/my/mymake/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mymake"; - version = "2.4.3"; + version = "2.4.4"; src = fetchFromGitHub { owner = "fstromback"; repo = "mymake"; tag = "v${finalAttrs.version}"; - hash = "sha256-OjlcQ49jxMMmAhyl8c6lREOwBE63s+DIEf+rFElUsi0="; + hash = "sha256-H7uoTnFtRf0jaqQ+N2IK4I+edx+cK/5wXDG1Orc2XcY="; }; buildPhase = '' diff --git a/pkgs/by-name/my/mympd/package.nix b/pkgs/by-name/my/mympd/package.nix index 2346dc0e24f8..fe7cacc865d3 100644 --- a/pkgs/by-name/my/mympd/package.nix +++ b/pkgs/by-name/my/mympd/package.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mympd"; - version = "25.1.1"; + version = "25.3.0"; src = fetchFromGitHub { owner = "jcorporation"; repo = "myMPD"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-ckGFwnykpmA753bAoCX8ftUEZuxtFlyGTamn4cgK3+A="; + sha256 = "sha256-Mx+UURIJUpIZlLq0FFuvOoUzMHhHryfNxRpNWgrpHTM="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/my/mypaint/package.nix b/pkgs/by-name/my/mypaint/package.nix index 1cc8964da495..c8694de75e96 100644 --- a/pkgs/by-name/my/mypaint/package.nix +++ b/pkgs/by-name/my/mypaint/package.nix @@ -161,6 +161,12 @@ buildPythonApplication (finalAttrs: { runHook postCheck ''; + postInstall = '' + substituteInPlace $out/share/thumbnailers/mypaint-ora.thumbnailer \ + --replace-fail "TryExec=mypaint-ora-thumbnailer" "TryExec=$out/bin/mypaint-ora-thumbnailer" \ + --replace-fail "Exec=mypaint-ora-thumbnailer" "Exec=$out/bin/mypaint-ora-thumbnailer" + ''; + meta = { description = "Graphics application for digital painters"; homepage = "http://mypaint.org/"; diff --git a/pkgs/by-name/my/mysql84/package.nix b/pkgs/by-name/my/mysql84/package.nix index 5eed4c7b57f0..9d5b78c1e168 100644 --- a/pkgs/by-name/my/mysql84/package.nix +++ b/pkgs/by-name/my/mysql84/package.nix @@ -23,15 +23,16 @@ libtirpc, rpcsvc-proto, curl, + nixosTests, }: stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.4.9"; + version = "8.4.10"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-5KqLOeQtH+B48zu9c2lfrCtU28e7E38L2+Y/e+GgLWs="; + hash = "sha256-1XpnMLrvFK4Rj39KbgKEW1tQkzdY32H7BuEE8nzMj5Y="; }; nativeBuildInputs = [ @@ -111,6 +112,14 @@ stdenv.mkDerivation (finalAttrs: { connector-c = finalAttrs.finalPackage; server = finalAttrs.finalPackage; mysqlVersion = lib.versions.majorMinor finalAttrs.version; + tests = { + mysql = + nixosTests.mysql."mysql${lib.versions.major finalAttrs.version}${lib.versions.minor finalAttrs.version}"; + mysql-secure-root-by-default = + nixosTests.mysql-secure-root.secure-by-default."mysql${lib.versions.major finalAttrs.version}${lib.versions.minor finalAttrs.version}"; + mysql-root-can-be-kept-insecure = + nixosTests.mysql-secure-root.can-be-insecure."mysql${lib.versions.major finalAttrs.version}${lib.versions.minor finalAttrs.version}"; + }; }; meta = { diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 99e17b03767c..403f118c7c89 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -59,7 +59,6 @@ stdenv.mkDerivation (finalAttrs: { { x86_64-linux = "sha256-4EQkvsoji9M4VCrdwyHm+ncd4XFjgAf34Kt+YeM3qjs="; aarch64-linux = "sha256-xm4T1BL3AyRsYOERz4LhG4ZJQkSMzspoA+l60OND3E0="; - x86_64-darwin = "sha256-L+zY9O5ridMvZEhGH0R56P3XiDlYF3UrFZwmOYlqxYY="; aarch64-darwin = "sha256-ZUx+jF7IcEbUCnUUeW0uOFgEpO9UIJpP3/VpUJ5ulAM="; } .${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}"); diff --git a/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix b/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix index 06360a9a03f4..6214bb0bee33 100644 --- a/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix +++ b/pkgs/by-name/n8/n8n-nodes-evolution-api/package.nix @@ -4,7 +4,7 @@ fetchFromGitHub, fetchPnpmDeps, nodejs, - pnpm_9, + pnpm_10, pnpmConfigHook, nix-update-script, n8n, @@ -24,14 +24,14 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ nodejs pnpmConfigHook - pnpm_9 + pnpm_10 ]; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; - pnpm = pnpm_9; - fetcherVersion = 3; - hash = "sha256-hMjWFjDhc61HGkQOG/q2EU8pPShUhtHSTe+6wUAa5M4="; + pnpm = pnpm_10; + fetcherVersion = 4; + hash = "sha256-jAHeQHUPUzC4NiKl/h7i8UwStyzw2tCKs42ZkeGZVSw="; }; buildPhase = '' diff --git a/pkgs/by-name/n8/n8n-task-runner-launcher/package.nix b/pkgs/by-name/n8/n8n-task-runner-launcher/package.nix index ca33e97df851..ccf65ad3e035 100644 --- a/pkgs/by-name/n8/n8n-task-runner-launcher/package.nix +++ b/pkgs/by-name/n8/n8n-task-runner-launcher/package.nix @@ -6,13 +6,13 @@ }: buildGoModule (finalAttrs: { pname = "n8n-task-runner-launcher"; - version = "1.4.6"; + version = "1.4.7"; src = fetchFromGitHub { owner = "n8n-io"; repo = "task-runner-launcher"; tag = finalAttrs.version; - hash = "sha256-9XbeAssVQBcAfuiCgLEAX0CkI9u1410PE2HOcrI2Uxs="; + hash = "sha256-URIFMc/VSMuuI4Hi7jB9eFlP4/GjEvDRhoTAjEhT988="; }; vendorHash = "sha256-5dcIELsNFGB5qTmfpY/YRWeN2z9GdanysGw4Lqpfsi0="; diff --git a/pkgs/by-name/n8/n8n/package.nix b/pkgs/by-name/n8/n8n/package.nix index f7027b35b302..cd465d9422de 100644 --- a/pkgs/by-name/n8/n8n/package.nix +++ b/pkgs/by-name/n8/n8n/package.nix @@ -26,20 +26,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "n8n"; - version = "2.23.4"; + version = "2.28.6"; src = fetchFromGitHub { owner = "n8n-io"; repo = "n8n"; tag = "n8n@${finalAttrs.version}"; - hash = "sha256-0LROPZKLKEKHBgV0kWAfataZB2nMzdsmq1WImCA6bgA="; + hash = "sha256-xll2dZon+WyJUXaCoel0htwgOGUqzpZvef/tDLTomZQ="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; pnpm = pnpm_10; fetcherVersion = 3; - hash = "sha256-oqnLywIOhAZr7nmeGvq6k0brcGjHRhR3pVvBQK3Fg0k="; + hash = "sha256-SjmKXjxIuRY1uFbFLTMlXd0WW+3cVfu4TU+NoZtEYSo="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/nagios/package.nix b/pkgs/by-name/na/nagios/package.nix index f453e98744a3..2b4b5fc0f3c4 100644 --- a/pkgs/by-name/na/nagios/package.nix +++ b/pkgs/by-name/na/nagios/package.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nagios"; - version = "4.5.11"; + version = "4.5.13"; src = fetchFromGitHub { owner = "NagiosEnterprises"; repo = "nagioscore"; tag = "nagios-${finalAttrs.version}"; - hash = "sha256-RUiEVCOqEo0+oD6GPl9U3Y4C2Fz4uOGgSaBC+WIkxjs="; + hash = "sha256-6d49LhnerArXM2tTjyEe0/PU/THqxxptaSaBCKJzkiU="; }; patches = [ ./nagios.patch ]; diff --git a/pkgs/by-name/na/nagstamon/package.nix b/pkgs/by-name/na/nagstamon/package.nix index 075bc3c814d6..d7cf37dfea78 100644 --- a/pkgs/by-name/na/nagstamon/package.nix +++ b/pkgs/by-name/na/nagstamon/package.nix @@ -7,14 +7,16 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nagstamon"; - version = "3.16.2"; + version = "3.18.2"; pyproject = true; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "HenriWahl"; repo = "Nagstamon"; tag = "v${finalAttrs.version}"; - hash = "sha256-9w8ux+AeSg0vDhnk28/2eCE2zYLvAjD7mB0pJBMFs2I="; + hash = "sha256-ZA6gxV9zLKZ0g5v8CvnAuiYPhEDByz17kC54Idk9CYM="; }; build-system = with python3Packages; [ setuptools ]; @@ -39,13 +41,16 @@ python3Packages.buildPythonApplication (finalAttrs: { dbus-python keyring lxml + packaging psutil pyqt6 + pyqt6-webengine pysocks python-dateutil requests requests-kerberos setuptools + tzlocal ]; nativeCheckInputs = with python3Packages; [ diff --git a/pkgs/by-name/na/nail-parquet/package.nix b/pkgs/by-name/na/nail-parquet/package.nix index c0e2a035c5e0..3cfebd7c5af6 100644 --- a/pkgs/by-name/na/nail-parquet/package.nix +++ b/pkgs/by-name/na/nail-parquet/package.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nail-parquet"; - version = "1.6.5"; + version = "1.9.0"; src = fetchFromGitHub { owner = "Vitruves"; repo = "nail-parquet"; tag = "v${finalAttrs.version}"; - hash = "sha256-CPiOeaESerQj+nV0hQIGv06/MFP8s7p9olpmhnWpAAg="; + hash = "sha256-IDGVdC4jvDfFTP0N0LAi8MTGdUOCT6A7mKXIz2au6jY="; }; - cargoHash = "sha256-x4BJZcQkisw9hA/TBzSSdkxh7oUNL0OD3H/v67otYj8="; + cargoHash = "sha256-c4yuXCQAlwpDlKURwN51d3AI+m7cUNGRdgl29qgWIvA="; nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ pkg-config diff --git a/pkgs/by-name/na/nak/package.nix b/pkgs/by-name/na/nak/package.nix index edae446443db..780988ffaa4e 100644 --- a/pkgs/by-name/na/nak/package.nix +++ b/pkgs/by-name/na/nak/package.nix @@ -2,22 +2,24 @@ lib, buildGoModule, fetchFromGitHub, + pkg-config, + fuse, versionCheckHook, nix-update-script, }: buildGoModule (finalAttrs: { pname = "nak"; - version = "0.17.4"; + version = "0.20.1"; src = fetchFromGitHub { owner = "fiatjaf"; repo = "nak"; tag = "v${finalAttrs.version}"; - hash = "sha256-rljH4uh8NSvJTwEVvk53oYzE2+U5dHeI9f5YZ75a1KA="; + hash = "sha256-QP2r+Eq0O9cRyF3NLT6s8L1CZqfiRdJ2O+nDfvrO5iI="; }; - vendorHash = "sha256-c1XSy3guyueiCSVRnRYEkFypzGuMj7/7eOYFluFyeG8="; + vendorHash = "sha256-uftDwPMu2pK5wEfMrO6HSRFcvcr+Cst3uQ8cpOMESs4="; ldflags = [ "-s" @@ -25,6 +27,14 @@ buildGoModule (finalAttrs: { "-X main.version=${finalAttrs.version}" ]; + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + fuse + ]; + # Integration tests fail (requires connection to relays) doCheck = false; @@ -36,7 +46,7 @@ buildGoModule (finalAttrs: { meta = { description = "Command-line tool for Nostr things"; homepage = "https://github.com/fiatjaf/nak"; - changelog = "https://github.com/fiatjaf/nak/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/fiatjaf/nak/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.unlicense; maintainers = with lib.maintainers; [ nartsiss ]; mainProgram = "nak"; diff --git a/pkgs/by-name/na/namespace-cli/package.nix b/pkgs/by-name/na/namespace-cli/package.nix index 4fce3c41811b..869a75a62a25 100644 --- a/pkgs/by-name/na/namespace-cli/package.nix +++ b/pkgs/by-name/na/namespace-cli/package.nix @@ -6,16 +6,16 @@ buildGoModule (finalAttrs: { pname = "namespace-cli"; - version = "0.0.520"; + version = "0.0.531"; src = fetchFromGitHub { owner = "namespacelabs"; repo = "foundation"; - rev = "v${finalAttrs.version}"; - hash = "sha256-4qx3FFpdaiRCjzcF6/gnC4MQ9W74A4z1rzvSWS9trx0="; + tag = "v${finalAttrs.version}"; + hash = "sha256-HlCyUwGwc261p2e4DK8J0VEN5EIO1UpbnxQ5f6oxaSs="; }; - vendorHash = "sha256-rLP+djBDM1EJWFfC8s9e34Wz8EUDCzU23iJel5gscUs="; + vendorHash = "sha256-joxaA0x1Ldn82O5k+H9A1rsirBkfpOw+83E4GHCwKb8="; subPackages = [ "cmd/nsc" diff --git a/pkgs/tools/networking/namespaced-openvpn/default.nix b/pkgs/by-name/na/namespaced-openvpn/package.nix similarity index 100% rename from pkgs/tools/networking/namespaced-openvpn/default.nix rename to pkgs/by-name/na/namespaced-openvpn/package.nix diff --git a/pkgs/by-name/na/nano-syntax-highlighting/package.nix b/pkgs/by-name/na/nano-syntax-highlighting/package.nix index 4c0d776c56bb..e104b6af9a86 100644 --- a/pkgs/by-name/na/nano-syntax-highlighting/package.nix +++ b/pkgs/by-name/na/nano-syntax-highlighting/package.nix @@ -10,13 +10,13 @@ }: stdenv.mkDerivation (finalAttrs: rec { pname = "nano-syntax-highlighting"; - version = "2026.05.01"; + version = "2026.07.01"; src = fetchFromGitHub { owner = "galenguyer"; repo = "nano-syntax-highlighting"; tag = version; - hash = "sha256-ipnePkQEDfJ7T3GJ84D6bmo9KZ2AUkJ8aUqH0rPCsps="; + hash = "sha256-tcRNoeg0j/z9wFZjIc1CJXOKieWrvlLq9pblB0kE6yc="; }; dontBuild = true; diff --git a/pkgs/by-name/na/nano/package.nix b/pkgs/by-name/na/nano/package.nix index e4a2d0b1ea96..2e68584027ee 100644 --- a/pkgs/by-name/na/nano/package.nix +++ b/pkgs/by-name/na/nano/package.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "nano"; - version = "9.0"; + version = "9.1"; src = fetchurl { - url = "mirror://gnu/nano/${pname}-${version}.tar.xz"; - hash = "sha256-nzhDdLSWEQoltzrVpf67OEeDxuMYizcGP2d6yQgBP94="; + url = "mirror://gnu/nano/nano-${version}.tar.xz"; + hash = "sha256-X0d2QnTLdTI0nOCqIOwQ8ejoUabp+j62aBLEPRltsEI="; }; nativeBuildInputs = [ texinfo ] ++ lib.optional enableNls gettext; diff --git a/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff new file mode 100644 index 000000000000..ee8d2dcfa412 --- /dev/null +++ b/pkgs/by-name/na/nanoarrow/cpp20-arrow-cpp-fix.diff @@ -0,0 +1,13 @@ +diff --git i/meson.build w/meson.build +index 5c3032d..5ec2e56 100644 +--- i/meson.build ++++ w/meson.build +@@ -22,7 +22,7 @@ project( + version: '0.8.0', + license: 'Apache-2.0', + meson_version: '>=0.58.0', +- default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++17'], ++ default_options: ['c_std=c99', 'warning_level=2', 'cpp_std=c++20'], + ) + + cc = meson.get_compiler('c') diff --git a/pkgs/by-name/na/nanoarrow/package.nix b/pkgs/by-name/na/nanoarrow/package.nix new file mode 100644 index 000000000000..862f2ce0bff3 --- /dev/null +++ b/pkgs/by-name/na/nanoarrow/package.nix @@ -0,0 +1,95 @@ +{ + lib, + stdenv, + fetchFromGitHub, + fetchzip, + + # nativeBuildInputs + meson, + ninja, + pkg-config, + + # buildInputs + arrow-cpp, + gbenchmark, + gtest, + nlohmann_json, + zlib, + zstd, +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "nanoarrow"; + version = "0.8.0"; + __structuredAttrs = true; + strictDeps = true; + + src = fetchFromGitHub { + owner = "apache"; + repo = "arrow-nanoarrow"; + tag = "apache-arrow-nanoarrow-${finalAttrs.version}"; + hash = "sha256-1iLbT1eeyZaoB75uYTgg4qns+C7b4DErqMwJ9nQPRls="; + }; + patches = [ + # Fixes an issue between our `arrow-cpp` and this version of `nanoarrow`. + # Not applicable for upstreaming so it seems. See discussion: + # https://github.com/apache/arrow-nanoarrow/issues/902 + ./cpp20-arrow-cpp-fix.diff + ]; + + nativeBuildInputs = [ + meson + ninja + pkg-config + ]; + + buildInputs = [ + arrow-cpp + gbenchmark + gtest + nlohmann_json + zlib + zstd + ]; + + doCheck = true; + + # Pre-populate the meson subproject with the flatcc source so meson doesn't try to download it. + # The wrap's patch_directory overlay (meson.build) must also be applied. + postPatch = '' + cp -r --no-preserve=mode ${finalAttrs.finalPackage.passthru.flatcc-src} ${finalAttrs.finalPackage.passthru.flatcc-src-dest} + cp subprojects/packagefiles/flatcc/meson.build ${finalAttrs.finalPackage.passthru.flatcc-src-dest}/ + ''; + mesonFlags = [ + # Needed only on Darwin, because otherwise a metal-cpp dependency is + # required. It doesn't hurt to enable it for all platforms, so it'd be + # easier to spot if the option will disappear in the future for instance.. + (lib.mesonOption "metal" "disabled") + ]; + + passthru = { + # Nanoarrow requires a specific post-0.6.1 flatcc commit that adds `_with_size` API variants not + # present in the upstream 0.6.1 release. + flatcc-src = fetchFromGitHub { + owner = "dvidelabs"; + repo = "flatcc"; + rev = "fd3c4ae5cd39f0651eda6a3a1a374278070135d6"; + hash = "sha256-8MqazKuwfFWVJ/yjT5fNrRzexFQ2ky4YTcZqOYjk9Qc="; + }; + flatcc-src-dest = "subprojects/flatcc-${finalAttrs.finalPackage.passthru.flatcc-src.rev}"; + }; + + outputs = [ + "out" + "dev" + ]; + + meta = { + description = "Helpers for Arrow C Data & Arrow C Stream interfaces"; + homepage = "https://github.com/apache/arrow-nanoarrow"; + changelog = "https://github.com/apache/arrow-nanoarrow/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ doronbehar ]; + platforms = lib.platforms.all; + }; +}) diff --git a/pkgs/by-name/na/nanomq/package.nix b/pkgs/by-name/na/nanomq/package.nix index fe21998606af..a4db3b0a08b9 100644 --- a/pkgs/by-name/na/nanomq/package.nix +++ b/pkgs/by-name/na/nanomq/package.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation (finalAttrs: { version = "0.24.11"; src = fetchFromGitHub { - owner = "emqx"; + owner = "nanomq"; repo = "nanomq"; tag = finalAttrs.version; hash = "sha256-I2SLc/KbkBvqbbWuLr8ARmmg4DeE7ZbTqcM1tw8WhwQ="; diff --git a/pkgs/by-name/na/nanopb/python-module.nix b/pkgs/by-name/na/nanopb/python-module.nix index 2240aaca624d..7848b069851c 100644 --- a/pkgs/by-name/na/nanopb/python-module.nix +++ b/pkgs/by-name/na/nanopb/python-module.nix @@ -4,7 +4,7 @@ generator-out, }: python3.pkgs.buildPythonPackage { - pname = "nanopb-python-module"; + pname = "nanopb"; inherit version; src = generator-out; pyproject = true; diff --git a/pkgs/by-name/na/nanosvg/package.nix b/pkgs/by-name/na/nanosvg/package.nix index baf35af4d9bc..0b5517e5535a 100644 --- a/pkgs/by-name/na/nanosvg/package.nix +++ b/pkgs/by-name/na/nanosvg/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation { pname = "nanosvg"; - version = "0-unstable-2026-05-18"; + version = "0-unstable-2026-07-10"; src = fetchFromGitHub { owner = "memononen"; repo = "nanosvg"; - rev = "48120e91e64b2f409ed600cdfd6d790a49ba11ab"; - hash = "sha256-onjmiWQPftr4AWySwJOpMLZ3WQGvUp9wj9isdUyNIPc="; + rev = "239e102ec2c691f2902e20ace2ed36ee4a35cfe6"; + hash = "sha256-Vc0cehgA39WSXFEekVva+0gEARz7QTFc1nK85IQf1KI="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/by-name/na/nasm/package.nix b/pkgs/by-name/na/nasm/package.nix index 5b611b57591c..9babb2241495 100644 --- a/pkgs/by-name/na/nasm/package.nix +++ b/pkgs/by-name/na/nasm/package.nix @@ -9,23 +9,20 @@ stdenv.mkDerivation (finalAttrs: { pname = "nasm"; - version = "3.01"; + version = "3.02"; src = fetchurl { url = "https://www.nasm.us/pub/nasm/releasebuilds/${finalAttrs.version}/nasm-${finalAttrs.version}.tar.xz"; - hash = "sha256-tzJMvobnZ7ZfJvRn7YsSrYDhJOPMuJB2hVyY5Dqe3dQ="; + hash = "sha256-hzNuulO0rP6RdCSrXVANKwBU2fUUjTXCJzzPLPtxLw0="; }; patches = [ - # Backport patches fixing nasm with gcc 15 and musl (and other?) platforms - # https://github.com/netwide-assembler/nasm/issues/169 + # Backport the fix for https://github.com/netwide-assembler/nasm/issues/203 + # buffer overflow. (fetchpatch { - url = "https://github.com/netwide-assembler/nasm/commit/44e89ba9b650b5e1533bca43682e167f51a3511f.patch"; - hash = "sha256-zVeMFhoSY/HGYr4meIWBgt5Unq1fA8lM6h1Cl5fpbxo="; - }) - (fetchpatch { - url = "https://github.com/netwide-assembler/nasm/commit/746e7c9efa37cec9a44d84a1e96b8c38f385cc1f.patch"; - hash = "sha256-aXVS70O/wUkW8xtkwF7uwrQfTgGcNvxHrtGC0sjIPto="; + name = "output-oob-fix.patch"; + url = "https://github.com/netwide-assembler/nasm/commit/8890d723d0aa9ed1a790e2ce1c55eee8dfa0cf94.patch"; + hash = "sha256-m03+bhKTgKlqeRLGZIy6GO5BTPIJ3r398VQrtN4waaw="; }) ]; diff --git a/pkgs/by-name/na/nats-server/package.nix b/pkgs/by-name/na/nats-server/package.nix index 8b1b47de2a4a..c35933178c98 100644 --- a/pkgs/by-name/na/nats-server/package.nix +++ b/pkgs/by-name/na/nats-server/package.nix @@ -7,16 +7,16 @@ buildGoModule (finalAttrs: { pname = "nats-server"; - version = "2.14.2"; + version = "2.14.3"; src = fetchFromGitHub { owner = "nats-io"; repo = "nats-server"; rev = "v${finalAttrs.version}"; - hash = "sha256-XK+Yu1DGmS8F0Sbi3Y6KrGtOw63JzJ1ax5LjoZWCkcY="; + hash = "sha256-139eSr6ECC1vThHbdnDPg8wJS0FJuwDKpm4BupRdjSk="; }; - vendorHash = "sha256-q52NL8I/7xkLb6qeDyv8vTuW0C3CRFuyc6UIPw92uD4="; + vendorHash = "sha256-F7XKN/MMX8FOiRY8gugrKU2j+RQE/vY3eTV7ORVRc2U="; doCheck = false; diff --git a/pkgs/by-name/na/nats-top/package.nix b/pkgs/by-name/na/nats-top/package.nix index 18fdd1b7dd0a..1be44955424d 100644 --- a/pkgs/by-name/na/nats-top/package.nix +++ b/pkgs/by-name/na/nats-top/package.nix @@ -36,7 +36,7 @@ buildGoModule (finalAttrs: { description = "top-like tool for monitoring NATS servers"; homepage = "https://github.com/nats-io/nats-top"; changelog = "https://github.com/nats-io/nats-top/releases/tag/v${finalAttrs.version}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fab ]; mainProgram = "nats-top"; }; diff --git a/pkgs/by-name/na/nautilus/package.nix b/pkgs/by-name/na/nautilus/package.nix index d535f9081431..d210135a1d87 100644 --- a/pkgs/by-name/na/nautilus/package.nix +++ b/pkgs/by-name/na/nautilus/package.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "nautilus"; - version = "50.1"; + version = "50.2.2"; outputs = [ "out" @@ -54,7 +54,7 @@ stdenv.mkDerivation (finalAttrs: { src = fetchurl { url = "mirror://gnome/sources/nautilus/${lib.versions.major finalAttrs.version}/nautilus-${finalAttrs.version}.tar.xz"; - hash = "sha256-1ieTuWWXcbZqa24FK1Iin4aN2+wTiKC2ae7wvSESEu4="; + hash = "sha256-4eKF7930LtMN2lsp9/jSQtq0vBQJqQVIY7NnutSzTVo="; }; patches = [ diff --git a/pkgs/by-name/na/navidrome/package.nix b/pkgs/by-name/na/navidrome/package.nix index 034239e25f58..21c404124953 100644 --- a/pkgs/by-name/na/navidrome/package.nix +++ b/pkgs/by-name/na/navidrome/package.nix @@ -21,23 +21,23 @@ buildGoModule (finalAttrs: { pname = "navidrome"; - version = "0.61.2"; + version = "0.63.2"; src = fetchFromGitHub { owner = "navidrome"; repo = "navidrome"; rev = "v${finalAttrs.version}"; - hash = "sha256-epSgGiDdfNRUaQtWoOd4ADKtF7Ptt3p9UOqsWBzZg7I="; + hash = "sha256-s0Pd6yT9NX2VFSPbLPX6Zqon8Y3qyDPGCKvqHPxcZ88="; }; - vendorHash = "sha256-RmmZudmWBxiw+c9g8KFEX+ALFD0xP/SBsYc6b6RWWO8="; + vendorHash = "sha256-lNjOVrlRD6ptDBpmfGYCN3Vkal9ACciOyS1RANzKYK4="; npmRoot = "ui"; npmDeps = fetchNpmDeps { inherit (finalAttrs) src; sourceRoot = "${finalAttrs.src.name}/ui"; - hash = "sha256-7hy2vLCEicKzjORpJZ0mrRS8PT3GsJ8DWdvj/7SrB70="; + hash = "sha256-uRF9cf6HZE0gyCvGTEZ520d2gMsxmccEYLJBgc47pMg="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix index 07ebe9440af5..1aee85c00051 100644 --- a/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix +++ b/pkgs/by-name/na/navidrome/plugins/discord-rich-presence/package.nix @@ -5,16 +5,16 @@ }: buildNavidromePlugin rec { pname = "discord-rich-presence-plugin"; - version = "1.0.0"; + version = "2.0.0"; src = pkgs.fetchFromGitHub { owner = "navidrome"; repo = "discord-rich-presence-plugin"; tag = "v${version}"; - hash = "sha256-YH1K6uagIloQQ4gdezKMAfx9KbGL9chiTx/i8CiH4io="; + hash = "sha256-j4iGymXH9JstPGdpPl5TFLiH8ShfE46U+BZk1n7a2yQ="; }; - vendorHash = "sha256-M5dI0gNfy2x9IVN1284pdvUaCui0sgxFCC+9weq2ipM="; + vendorHash = "sha256-5ZlqyUa+UcLCBdLQaYAlb818Y8sOENjIFfb2hpRsbpQ="; meta = { description = "Displays your currently playing track in your Discord status"; diff --git a/pkgs/by-name/nb/nbfc-linux/package.nix b/pkgs/by-name/nb/nbfc-linux/package.nix index eaca2a5ef4c0..171b7f779708 100644 --- a/pkgs/by-name/nb/nbfc-linux/package.nix +++ b/pkgs/by-name/nb/nbfc-linux/package.nix @@ -3,38 +3,58 @@ stdenv, fetchFromGitHub, autoreconfHook, + pkg-config, + lua5_4, curl, + libxml2, + openssl, + nix-update-script, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "nbfc-linux"; - version = "0.3.19"; + version = "0.5.2"; src = fetchFromGitHub { owner = "nbfc-linux"; repo = "nbfc-linux"; tag = finalAttrs.version; - hash = "sha256-ARUhm1K3A0bzVRen6VO3KvomkPl1S7vx2+tmg2ZtL8s="; + hash = "sha256-468/dFRjEgyJ0AW98wKq04WKZ4sZyzswBASSF6hyjVY="; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + ]; - buildInputs = [ curl ]; + buildInputs = [ + lua5_4 + curl + libxml2 + openssl + ]; configureFlags = [ - "--prefix=${placeholder "out"}" - "--sysconfdir=${placeholder "out"}/etc" "--bindir=${placeholder "out"}/bin" ]; + passthru.updateScript = nix-update-script { }; + + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + meta = { description = "C port of Stefan Hirschmann's NoteBook FanControl"; longDescription = '' nbfc-linux provides fan control service for notebooks ''; homepage = "https://github.com/nbfc-linux/nbfc-linux"; - license = lib.licenses.gpl3; - maintainers = [ lib.maintainers.Celibistrial ]; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + Celibistrial + bohanubis + ]; mainProgram = "nbfc"; platforms = lib.platforms.linux; }; diff --git a/pkgs/by-name/nb/nbping/package.nix b/pkgs/by-name/nb/nbping/package.nix index da50cdb5eb4c..89a26a72fb64 100644 --- a/pkgs/by-name/nb/nbping/package.nix +++ b/pkgs/by-name/nb/nbping/package.nix @@ -5,24 +5,24 @@ }: let pname = "nbping"; - version = "0.7.0"; + version = "0.7.1"; in rustPlatform.buildRustPackage { inherit pname version; src = fetchFromGitHub { owner = "hanshuaikang"; - repo = "Nping"; + repo = "NBping"; tag = "v${version}"; - hash = "sha256-rGWYvYJs6vkG+HQuT4NJGMUUG9QzIhyJThgDWTC6/JI="; + hash = "sha256-QaJTV5RNvsYuBUPrWcmbBj1QSKtfDNTvHd5fMfuoU3c="; }; - cargoHash = "sha256-6AdqPm07lbMzeqihQC3mCoBYZ1cduGo1rCvYsF+4XL4="; + cargoHash = "sha256-H0FG3BE/iP3knosnUVzJtNXt8hQ9E8Jh/2MTmviNhfA="; meta = { description = "Ping Tool in Rust with Real-Time Data and Visualizations"; - homepage = "https://github.com/hanshuaikang/Nping"; - changelog = "https://github.com/hanshuaikang/Nping/releases/"; + homepage = "https://github.com/hanshuaikang/NBping"; + changelog = "https://github.com/hanshuaikang/NBping/releases/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ luftmensch-luftmensch ]; mainProgram = "nbping"; diff --git a/pkgs/by-name/nb/nbutools/package.nix b/pkgs/by-name/nb/nbutools/package.nix index 0c96e540bea2..e34468024fca 100644 --- a/pkgs/by-name/nb/nbutools/package.nix +++ b/pkgs/by-name/nb/nbutools/package.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication { meta = { description = "Tools for offensive security of NetBackup infrastructures"; homepage = "https://github.com/airbus-seclab/nbutools"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; maintainers = with lib.maintainers; [ fab ]; }; } diff --git a/pkgs/by-name/nc/nchat/package.nix b/pkgs/by-name/nc/nchat/package.nix index 7ad2efcb1d05..7742a5bdcf00 100644 --- a/pkgs/by-name/nc/nchat/package.nix +++ b/pkgs/by-name/nc/nchat/package.nix @@ -17,13 +17,13 @@ }: let - version = "5.15.26"; + version = "5.16.9"; src = fetchFromGitHub { owner = "d99kris"; repo = "nchat"; tag = "v${version}"; - hash = "sha256-SJG+yKYm1T8VjhfTCUzFXwgBClPqa3fqnOUOwDOyRhg="; + hash = "sha256-Hl8LzROGn9oAV9G4hnnvDAltPte+2krEEGPNTmMzUoU="; }; libcgowm = buildGoModule { @@ -31,7 +31,7 @@ let inherit version src; sourceRoot = "${src.name}/lib/wmchat/go"; - vendorHash = "sha256-KMTMxnjz28pVcIDKkJ/l7x3iw5GtEk8LkG4ccgsjdCA="; + vendorHash = "sha256-t7WG9xce1UC5FB6LFIT7Oacc2rO/BqZ/p5JP0AtPDoo="; buildPhase = '' runHook preBuild diff --git a/pkgs/by-name/nd/ndg/package.nix b/pkgs/by-name/nd/ndg/package.nix index ef5c17e03fc1..ecdb4bf013dd 100644 --- a/pkgs/by-name/nd/ndg/package.nix +++ b/pkgs/by-name/nd/ndg/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "ndg"; - version = "2.8.0"; + version = "2.9.0"; __structuredAttrs = true; src = fetchFromGitHub { owner = "feel-co"; repo = "ndg"; tag = "v${finalAttrs.version}"; - hash = "sha256-YIKEyzh0NFQlD0O92LQQNMoVCDwV8yw1Xz0Iu+4ZC5U="; + hash = "sha256-be9NxraQyoB4wLjiPHxpmklfJYuB+Qs/x69P395I1Fk="; }; - cargoHash = "sha256-r4lNSZuGFtNTOkIyd7skdEmA61lfbetI03tIUD+MO+Y="; + cargoHash = "sha256-N0em5kNY94sdPv3Fcpprk09yx1yKo8GZMWND/FJSSIw="; nativeBuildInputs = [ installShellFiles ]; @@ -59,7 +59,7 @@ rustPlatform.buildRustPackage (finalAttrs: { homepage = "https://github.com/feel-co/ndg"; changelog = "https://github.com/feel-co/ndg/blob/v${finalAttrs.version}/CHANGELOG.md"; license = lib.licenses.mpl20; - maintainers = [ lib.teams.feel-co ]; mainProgram = "ndg"; + teams = [ lib.teams.feel-co ]; }; }) diff --git a/pkgs/by-name/nd/ndisc6/package.nix b/pkgs/by-name/nd/ndisc6/package.nix index 8db2d17cac31..6a9f22e6958b 100644 --- a/pkgs/by-name/nd/ndisc6/package.nix +++ b/pkgs/by-name/nd/ndisc6/package.nix @@ -3,19 +3,22 @@ stdenv, fetchurl, perl, + versionCheckHook, }: stdenv.mkDerivation (finalAttrs: { pname = "ndisc6"; - version = "1.0.4"; + version = "1.0.8"; src = fetchurl { - url = "https://www.remlab.net/files/ndisc6/archive/ndisc6-${finalAttrs.version}.tar.bz2"; - sha256 = "07swyar1hl83zxmd7fqwb2q0c0slvrswkcfp3nz5lknrk15dmcdb"; + url = "https://www.remlab.net/files/ndisc6/ndisc6-${finalAttrs.version}.tar.bz2"; + hash = "sha256-Hy+y3BFydwqloJ05c4pE2LdTzF4uJeMGynhoL5/qC08="; }; buildInputs = [ perl ]; + nativeBuildInputs = [ perl ]; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -27,10 +30,16 @@ stdenv.mkDerivation (finalAttrs: { "localstatedir=$(TMPDIR)" ]; + nativeInstallCheckInputs = [ versionCheckHook ]; + doInstallCheck = true; + + __structuredAttrs = true; + strictDeps = true; + meta = { homepage = "https://www.remlab.net/ndisc6/"; description = "Small collection of useful tools for IPv6 networking"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ aiyion ]; platforms = lib.platforms.linux; license = lib.licenses.gpl2Only; }; diff --git a/pkgs/by-name/nd/ndstrim/package.nix b/pkgs/by-name/nd/ndstrim-rs/package.nix similarity index 72% rename from pkgs/by-name/nd/ndstrim/package.nix rename to pkgs/by-name/nd/ndstrim-rs/package.nix index 5a081cc270fd..cb59f36e4b64 100644 --- a/pkgs/by-name/nd/ndstrim/package.nix +++ b/pkgs/by-name/nd/ndstrim-rs/package.nix @@ -5,12 +5,14 @@ }: rustPlatform.buildRustPackage (finalAttrs: { - pname = "ndstrim"; + pname = "ndstrim-rs"; version = "0.2.1"; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "Nemris"; - repo = "ndstrim"; + repo = "ndstrim-rs"; rev = "v${finalAttrs.version}"; hash = "sha256-KgtejBbFg6+klc8OpCs1CIb+7uVPCtP0/EM671vxauk="; }; @@ -19,8 +21,8 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "Trim the excess padding found in Nintendo DS(i) ROMs"; - homepage = "https://github.com/Nemris/ndstrim"; - changelog = "https://github.com/Nemris/ndstrim/blob/${finalAttrs.src.rev}/CHANGELOG.md"; + homepage = "https://github.com/Nemris/ndstrim-rs"; + changelog = "https://github.com/Nemris/ndstrim-rs/blob/${finalAttrs.src.rev}/CHANGELOG.md"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ thiagokokada ]; diff --git a/pkgs/by-name/ne/neard/package.nix b/pkgs/by-name/ne/neard/package.nix index 963168dfd6fc..01b7e8a29e49 100644 --- a/pkgs/by-name/ne/neard/package.nix +++ b/pkgs/by-name/ne/neard/package.nix @@ -13,9 +13,9 @@ python3Packages, }: -stdenv.mkDerivation { +stdenv.mkDerivation (finalAttrs: { pname = "neard"; - version = "0.19-unstable-2024-07-02"; + version = "0.20"; outputs = [ "out" @@ -25,8 +25,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "linux-nfc"; repo = "neard"; - rev = "a0a7d4d677800a39346f0c89d93d0fe43a95efad"; - hash = "sha256-6BgX7cJwxX+1RX3wU+HY/PIBgzomzOKemnl0SDLJNro="; + tag = "v${finalAttrs.version}"; + hash = "sha256-Ty2jXaSuaI+ZuRBSpdh36Yi3V5nd8jGI43Jc9cLkMW4="; }; postPatch = '' @@ -50,7 +50,6 @@ stdenv.mkDerivation { "--enable-tools" "--with-sysconfdir=/etc" "--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system" - "--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user" ]; buildInputs = [ @@ -76,10 +75,11 @@ stdenv.mkDerivation { ''; meta = { + changelog = "https://github.com/linux-nfc/neard/blob/${finalAttrs.src.tag}/ChangeLog"; description = "Near Field Communication manager"; homepage = "https://01.org/linux-nfc"; license = lib.licenses.gpl2Only; maintainers = [ ]; platforms = lib.platforms.unix; }; -} +}) diff --git a/pkgs/by-name/ne/neatvnc/package.nix b/pkgs/by-name/ne/neatvnc/package.nix index 4d0730f08e66..a04d3e9cda22 100644 --- a/pkgs/by-name/ne/neatvnc/package.nix +++ b/pkgs/by-name/ne/neatvnc/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "neatvnc"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "any1"; repo = "neatvnc"; rev = "v${finalAttrs.version}"; - hash = "sha256-yEWNiazRxc8G7ToqOcTtCXEuBCgXO64v31Xx1YeOPCM="; + hash = "sha256-ZQdx3NvoFh+lubF1tglYBeEBb4XpD5I1mN3ufibD+uA="; }; strictDeps = true; diff --git a/pkgs/by-name/ne/nebula-de-esser/package.nix b/pkgs/by-name/ne/nebula-de-esser/package.nix index 80db86f1e337..d9ea155b74eb 100644 --- a/pkgs/by-name/ne/nebula-de-esser/package.nix +++ b/pkgs/by-name/ne/nebula-de-esser/package.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nebula-de-esser"; - version = "3.2.0"; + version = "3.3.0"; src = fetchFromGitHub { owner = "subhankardas15071992-cloud"; repo = "Nebula-De-Esser"; tag = "v${finalAttrs.version}"; - hash = "sha256-N+tVlhGTBRXZDKGRYo2WUamiekTe1FXvpqm34lwu2Z8="; + hash = "sha256-vV7Qc5WxGvb6h3o1CXTLYZzpWSc3ASt8cq3opI3qjEg="; }; - cargoHash = "sha256-+z6oFjmPr2bLf81F4Q3dJC+x+RWeZnnnMHrWLphTsq0="; + cargoHash = "sha256-swhj9JQsDCFYzB/+qKffcdcIOAZ1HXmrgZ/Iy/rxG1M="; __structuredAttrs = true; strictDeps = true; @@ -65,16 +65,12 @@ rustPlatform.buildRustPackage (finalAttrs: { installPhase = '' runHook preInstall - clapDir="${ - if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/CLAP" else "$out/lib/clap" - }" vst3Dir="${ if stdenv.hostPlatform.isDarwin then "$out/Library/Audio/Plug-Ins/VST3" else "$out/lib/vst3" }" - mkdir -p "$clapDir" "$vst3Dir" + mkdir -p "$vst3Dir" - cp -r "target/bundled/Nebula De-Esser.clap" "$clapDir/" cp -r "target/bundled/Nebula De-Esser.vst3" "$vst3Dir/" runHook postInstall diff --git a/pkgs/by-name/ne/nelm/package.nix b/pkgs/by-name/ne/nelm/package.nix index 868f5e3e08b4..3c919c1f0a53 100644 --- a/pkgs/by-name/ne/nelm/package.nix +++ b/pkgs/by-name/ne/nelm/package.nix @@ -9,16 +9,16 @@ }: buildGoModule (finalAttrs: { pname = "nelm"; - version = "1.23.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "werf"; repo = "nelm"; tag = "v${finalAttrs.version}"; - hash = "sha256-tP5NkuKmne+XthBnN36uorwMuM7yuJLvo4zzc1K1JBQ="; + hash = "sha256-b0gO1V7yv8RMjIxwnqFX9CPRcRFm/j8u2PwNzyA7jtc="; }; - vendorHash = "sha256-Ux9fyezBXWVjmpa8WsEHvOUo/pokzFXvdpDAtNh0T/8="; + vendorHash = "sha256-rIiphGjE/a5IwF6Fkk3Ffq36AfEkfAZb12ZljlYP6X4="; subPackages = [ "cmd/nelm" ]; diff --git a/pkgs/by-name/ne/neo-cowsay/package.nix b/pkgs/by-name/ne/neo-cowsay/package.nix index efcb0d4c60b8..209951938481 100644 --- a/pkgs/by-name/ne/neo-cowsay/package.nix +++ b/pkgs/by-name/ne/neo-cowsay/package.nix @@ -15,6 +15,7 @@ buildGoModule (finalAttrs: { hash = "sha256-DmIjqBTIzwkQ8aJ6xCgIwjDtczlTH5AKbPKFUGx3qQ8="; }; + __structuredAttrs = true; vendorHash = "sha256-gBURmodXkod4fukw6LWEY+MBxPcf4vn/f6K78UR77n0="; modRoot = "./cmd"; diff --git a/pkgs/by-name/ne/neo4j/package.nix b/pkgs/by-name/ne/neo4j/package.nix index 4b5da6269d0b..a370884bc3ea 100644 --- a/pkgs/by-name/ne/neo4j/package.nix +++ b/pkgs/by-name/ne/neo4j/package.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "neo4j"; - version = "2026.02.2"; + version = "2026.06.0"; src = fetchurl { url = "https://neo4j.com/artifact.php?name=neo4j-community-${finalAttrs.version}-unix.tar.gz"; - hash = "sha256-TpVibiE0ijAQl5mkRjnCFpvCTifhoTcZcv8lg8PYSTw="; + hash = "sha256-Hc9i5+gDXnFzK4ZTK5+OMhnOiVa9BpQNWgAkaWcnGSo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/by-name/ne/neocmakelsp/package.nix b/pkgs/by-name/ne/neocmakelsp/package.nix index 2f0f1cf79dde..5c9d81724dfc 100644 --- a/pkgs/by-name/ne/neocmakelsp/package.nix +++ b/pkgs/by-name/ne/neocmakelsp/package.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "neocmakelsp"; - version = "0.10.3"; + version = "0.10.4"; src = fetchFromGitHub { - owner = "Decodetalkers"; + owner = "neocmakelsp"; repo = "neocmakelsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-HfoVAUg9StAUXmP66LVRzCj4sd4kl6pCzWUS3lZEKtU="; + hash = "sha256-HTyLLhpCDlWoOHllVsB6V6BGvRpFQgsx7KCOfRq5UhE="; }; - cargoHash = "sha256-yddefmK5ftu1rUpK3QcjocJiWQq5Y9CTJGjn2LbubbU="; + cargoHash = "sha256-PA9KP17l9EVJQn9sUoZ02EZsw3xgiIMidDXk+tYdsIY="; nativeBuildInputs = [ installShellFiles @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage (finalAttrs: { meta = { description = "CMake lsp based on tower-lsp and treesitter"; - homepage = "https://github.com/Decodetalkers/neocmakelsp"; + homepage = "https://github.com/neocmakelsp/neocmakelsp"; license = lib.licenses.mit; platforms = lib.platforms.unix; maintainers = with lib.maintainers; [ diff --git a/pkgs/by-name/ne/neomutt/package.nix b/pkgs/by-name/ne/neomutt/package.nix index 3c885bf3511c..ff97c41d134d 100644 --- a/pkgs/by-name/ne/neomutt/package.nix +++ b/pkgs/by-name/ne/neomutt/package.nix @@ -43,13 +43,13 @@ assert lib.warnIf enableMixmaster stdenv.mkDerivation (finalAttrs: { pname = "neomutt"; - version = "20260105"; + version = "20260616"; src = fetchFromGitHub { owner = "neomutt"; repo = "neomutt"; tag = finalAttrs.version; - hash = "sha256-rdnk1wESnnoaxctkR6WvWpq+DUg86PbH9f1EtpSL5uk="; + hash = "sha256-MRFJ6y2XC3I0/IIWW/J09tW/IZpLcNy7hki0rqOB9RQ="; }; buildInputs = [ diff --git a/pkgs/by-name/ne/neovim-remote/package.nix b/pkgs/by-name/ne/neovim-remote/package.nix index b59e027d1c6c..da9599188336 100644 --- a/pkgs/by-name/ne/neovim-remote/package.nix +++ b/pkgs/by-name/ne/neovim-remote/package.nix @@ -25,6 +25,10 @@ python3.pkgs.buildPythonApplication (finalAttrs: { url = "https://github.com/mhinz/neovim-remote/commit/56d2a4097f4b639a16902390d9bdd8d1350f948c.patch"; hash = "sha256-/PjE+9yfHtOUEp3xBaobzRM8Eo2wqOhnF1Es7SIdxvM="; }) + # Fix nvr --version: replace deprecated pkg_resources with importlib.metadata + # (stdlib since Python 3.8). setuptools was correctly kept in build-system + # only; this avoids adding it as a spurious runtime dependency. + ./use-importlib-metadata.patch ]; build-system = with python3.pkgs; [ setuptools ]; diff --git a/pkgs/by-name/ne/neovim-remote/use-importlib-metadata.patch b/pkgs/by-name/ne/neovim-remote/use-importlib-metadata.patch new file mode 100644 index 000000000000..dd197b1e8d34 --- /dev/null +++ b/pkgs/by-name/ne/neovim-remote/use-importlib-metadata.patch @@ -0,0 +1,20 @@ +Use importlib.metadata instead of pkg_resources for version queries. + +pkg_resources is a legacy setuptools API. importlib.metadata (stdlib since +Python 3.8) is the correct replacement and requires no extra runtime dependency. + +--- a/nvr/nvr.py ++++ b/nvr/nvr.py +@@ -360,10 +360,10 @@ + + + def print_versions(): +- import pkg_resources +- print('nvr ' + pkg_resources.require("neovim-remote")[0].version) +- print('pynvim ' + pkg_resources.require('pynvim')[0].version) +- print('psutil ' + pkg_resources.require('psutil')[0].version) ++ from importlib.metadata import version ++ print('nvr ' + version("neovim-remote")) ++ print('pynvim ' + version('pynvim')) ++ print('psutil ' + version('psutil')) + print('Python ' + sys.version.split('\n')[0]) diff --git a/pkgs/by-name/ne/neovim-unwrapped/package.nix b/pkgs/by-name/ne/neovim-unwrapped/package.nix index bcc15e19bcc7..f0482f3ad3e3 100644 --- a/pkgs/by-name/ne/neovim-unwrapped/package.nix +++ b/pkgs/by-name/ne/neovim-unwrapped/package.nix @@ -11,6 +11,7 @@ unibilium, utf8proc, tree-sitter, + wasmtime_36, fetchurl, buildPackages, treesitter-parsers ? import ./treesitter-parsers.nix { inherit fetchurl; }, @@ -20,16 +21,14 @@ versionCheckHook, nix-update-script, writableTmpDirAsHomeHook, - - # now defaults to false because some tests can be flaky (clipboard etc), see - # also: https://github.com/neovim/neovim/issues/16233 - nodejs ? null, - fish ? null, - python3 ? null, + wasmSupport ? false, }: let lua = if lib.meta.availableOn stdenv.hostPlatform luajit then luajit else lua5_1; + treeSitterForNeovim = tree-sitter.override { + inherit wasmSupport; + }; in stdenv.mkDerivation ( @@ -105,7 +104,7 @@ stdenv.mkDerivation ( in { pname = "neovim-unwrapped"; - version = "0.12.3"; + version = "0.12.4"; __structuredAttrs = true; @@ -113,7 +112,7 @@ stdenv.mkDerivation ( owner = "neovim"; repo = "neovim"; tag = "v${finalAttrs.version}"; - hash = "sha256-JjDU3GZf+wvsMyDjIfu1btTUBkOlpp6E1HFLqBLR9po="; + hash = "sha256-KSLFsrnoEOV712cnUtA8s4EoISp+ON36jslKxSvDthQ="; }; strictDeps = true; @@ -161,10 +160,13 @@ stdenv.mkDerivation ( # and it's definition at: pkgs/development/lua-modules/overrides.nix lua.pkgs.libluv neovimLuaEnv - tree-sitter + treeSitterForNeovim unibilium utf8proc ] + ++ lib.optionals wasmSupport [ + wasmtime_36 + ] ++ lib.optionals (stdenv.hostPlatform.libc != "glibc") [ # Provide libintl for non-glibc platforms gettext @@ -186,29 +188,20 @@ stdenv.mkDerivation ( pkg-config ]; - # extra programs test via `make functionaltest` - nativeCheckInputs = - let - pyEnv = python3.withPackages ( - ps: with ps; [ - pynvim - msgpack - ] - ); - in - [ - fish - nodejs - pyEnv # for src/clint.py - ]; - - # nvim --version output retains compilation flags and references to build tools - postPatch = lib.optionalString (!stdenv.buildPlatform.canExecute stdenv.hostPlatform) '' - sed -i runtime/CMakeLists.txt \ - -e "s|\".*/bin/nvim|\${stdenv.hostPlatform.emulator buildPackages} &|g" - sed -i src/nvim/po/CMakeLists.txt \ - -e "s|\$ 3.2.1 - (fetchpatch { - name = "0001-net-cpp-Look-for-python3-executable-at-configure-time-instead-of-hardcoding-a-path.patch"; - url = "https://gitlab.com/ubports/development/core/lib-cpp/net-cpp/-/commit/811da28f36f34cc2ea32dc96b2c65932d4f954b0.patch"; - hash = "sha256-CC7fEuRNuf5TNEfhFJr9VLWFWfTnFtIvSTUoCcwGe68="; - }) - ]; - strictDeps = true; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netatalk/package.nix b/pkgs/by-name/ne/netatalk/package.nix index fcb58042bb8b..1afd577178aa 100644 --- a/pkgs/by-name/ne/netatalk/package.nix +++ b/pkgs/by-name/ne/netatalk/package.nix @@ -39,11 +39,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "netatalk"; - version = "4.5.0"; + version = "4.5.1"; src = fetchurl { url = "mirror://sourceforge/netatalk/netatalk/netatalk-${finalAttrs.version}.tar.xz"; - hash = "sha256-Ytd/WkkeaQhsFwb/fZ4BaRLg5ItD0MOnrmDDhLbWJbM="; + hash = "sha256-8JHeELDECZbr99ZQLPlHz9h9/hp+YvnZYBMiVXOThSQ="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/netbird-dashboard/package.nix b/pkgs/by-name/ne/netbird-dashboard/package.nix index 4e2109b3553f..2cdfa02f4366 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.39.0"; + version = "2.90.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "dashboard"; rev = "v${version}"; - hash = "sha256-9sSK9RBbe+u/sNt/5nsYJgS8QdBNdHMFUTrSggZiLos="; + hash = "sha256-S/bXB2O5Y+WWDNRtsPrzTSDd5TGpGDxCBCVf3akV8So="; }; - npmDepsHash = "sha256-Ze+1r5Uh+wdm3MuVr93oS2itodx9Zdv+JYO6Uji1saw="; + npmDepsHash = "sha256-A6zXrOPdxLepi7XPn67YsY673iFOAgJqCEynn4SYco8="; npmFlags = [ "--legacy-peer-deps" ]; installPhase = '' diff --git a/pkgs/by-name/ne/netbird/package.nix b/pkgs/by-name/ne/netbird/package.nix index 73b69145645f..5c3638e6d70f 100644 --- a/pkgs/by-name/ne/netbird/package.nix +++ b/pkgs/by-name/ne/netbird/package.nix @@ -73,16 +73,22 @@ let in buildGoModule (finalAttrs: { pname = "netbird-${componentName}"; - version = "0.72.4"; + version = "0.74.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = "netbird"; tag = "v${finalAttrs.version}"; - hash = "sha256-YRXXuaqnQBLODcz/FNpIG9Ht+6VGRknE2Q6Q5ZaAIus="; + hash = "sha256-JXmtoHe0CwO1nKOPi82+cxhJ3tf3XZUCpDstk8U6s94="; }; - vendorHash = "sha256-6FN7l+e75Pw2+v0sktomlck+7daro1i6c4ZV53SRePI="; + overrideModAttrs = final: prev: { + # override output name so that we don't download the same modules every time + # for every component of the monorepo + name = "netbird-${finalAttrs.version}-go-modules"; + }; + + vendorHash = "sha256-5dZu6lmfwaUHusAlFS1qqorFbpa4anCUQDtg4Tv5mxw="; nativeBuildInputs = [ installShellFiles ] ++ lib.optional (componentName == "ui") pkg-config; diff --git a/pkgs/by-name/ne/netbox_4_4/package.nix b/pkgs/by-name/ne/netbox_4_4/package.nix index 66301f779d14..8ee3b56beb30 100644 --- a/pkgs/by-name/ne/netbox_4_4/package.nix +++ b/pkgs/by-name/ne/netbox_4_4/package.nix @@ -66,7 +66,7 @@ py.pkgs.buildPythonApplication rec { social-auth-app-django sorl-thumbnail strawberry-graphql - strawberry-django + strawberry-graphql-django svgwrite tablib @@ -128,7 +128,6 @@ py.pkgs.buildPythonApplication rec { ]; maintainers = with lib.maintainers; [ minijackson - raitobezarius transcaffeine ]; }; diff --git a/pkgs/by-name/ne/netbox_4_5/package.nix b/pkgs/by-name/ne/netbox_4_5/package.nix index 4f8ffa396e77..c0a82ee477e4 100644 --- a/pkgs/by-name/ne/netbox_4_5/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/package.nix @@ -17,14 +17,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "netbox"; - version = "4.5.9"; + version = "4.5.10"; pyproject = false; src = fetchFromGitHub { owner = "netbox-community"; repo = "netbox"; tag = "v${version}"; - hash = "sha256-S8/2ZLYhYKBEpz3EGTyQPAPexX4se3MnmaH5aStVEj0="; + hash = "sha256-ilhjRWoV2Z1e1sAiRT9PEGhhnznkKRp5RnV3lUdnBRQ="; }; patches = [ @@ -73,7 +73,7 @@ py.pkgs.buildPythonApplication rec { social-auth-app-django sorl-thumbnail strawberry-graphql - strawberry-django + strawberry-graphql-django svgwrite tablib @@ -141,7 +141,6 @@ py.pkgs.buildPythonApplication rec { license = lib.licenses.asl20; maintainers = with lib.maintainers; [ minijackson - raitobezarius transcaffeine ]; }; diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix index ab4263a3e576..4e8111659dda 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-contract/package.nix @@ -11,7 +11,7 @@ }: buildPythonPackage (finalAttrs: { pname = "netbox-contract"; - version = "2.4.5"; + version = "2.4.6"; pyproject = true; __structuredAttrs = true; @@ -21,7 +21,7 @@ buildPythonPackage (finalAttrs: { owner = "mlebreuil"; repo = "netbox-contract"; tag = "v${finalAttrs.version}"; - hash = "sha256-+6dw8vPDNItZRfExL0C5ul2XghoToMHotEAH90B3CmE="; + hash = "sha256-e8DYjU2UtlWu044e4b5eJWOA/fXDRKLl5AVtaepG0sg="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix index 6cff03d9b841..987236a2cc56 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-custom-objects/package.nix @@ -9,7 +9,7 @@ buildPythonPackage (finalAttrs: { pname = "netbox-custom-objects"; - version = "0.5.1"; + version = "0.6.0"; pyproject = true; __structuredAttrs = true; @@ -17,7 +17,7 @@ buildPythonPackage (finalAttrs: { owner = "netboxlabs"; repo = "netbox-custom-objects"; tag = "v${finalAttrs.version}"; - hash = "sha256-8PEqt6TpoQ8ncyZPesRos0BQHF3cKIzgoFr56v8UTTY="; + hash = "sha256-HnA2CJL0EOJctQpsu/G+9fULBIa8rrrYNiT0aaDw/rI="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix index e3eb95a6e56f..8a86085099b2 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-dns/package.nix @@ -7,7 +7,7 @@ }: buildPythonPackage (finalAttrs: { pname = "netbox-plugin-dns"; - version = "1.5.9"; + version = "1.5.10"; pyproject = true; __structuredAttrs = true; @@ -15,7 +15,7 @@ buildPythonPackage (finalAttrs: { owner = "peteeckel"; repo = "netbox-plugin-dns"; tag = finalAttrs.version; - hash = "sha256-yWOoYQm5XQs8j2DWs1UAaT9LwI61TKHjfOdjRn6UtJA="; + hash = "sha256-wxTW/qiwp+1CXUeCDJnllEW2oCTjlFVUot7JfWPooaw="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix index 393cf1ab3b6e..3ecc5ebc286e 100644 --- a/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix +++ b/pkgs/by-name/ne/netbox_4_5/plugins/netbox-documents/package.nix @@ -10,7 +10,7 @@ buildPythonPackage (finalAttrs: { pname = "netbox-documents"; - version = "0.8.2"; + version = "0.8.4"; pyproject = true; __structuredAttrs = true; @@ -18,7 +18,7 @@ buildPythonPackage (finalAttrs: { owner = "jasonyates"; repo = "netbox-documents"; tag = "v${finalAttrs.version}"; - hash = "sha256-XFVfNLU9a/0tQAVTrN2B1Oia/isOD8G5BdA3fVUn2sM="; + hash = "sha256-6t7r/98UILL73JT1TwUBAqygQOtOWj1s1bY7IbRcUKQ="; }; build-system = [ setuptools ]; diff --git a/pkgs/by-name/ne/netcdf/package.nix b/pkgs/by-name/ne/netcdf/package.nix index 5722ab150e9c..34e5b3f47459 100644 --- a/pkgs/by-name/ne/netcdf/package.nix +++ b/pkgs/by-name/ne/netcdf/package.nix @@ -20,11 +20,11 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "netcdf" + lib.optionalString mpiSupport "-mpi"; - version = "4.9.3"; + version = "4.10.1"; src = fetchurl { url = "https://downloads.unidata.ucar.edu/netcdf-c/${finalAttrs.version}/netcdf-c-${finalAttrs.version}.tar.gz"; - hash = "sha256-pHQUmETmFEVmZz+s8Jf+olPchDw3vAp9PeBH3Irdpd0="; + hash = "sha256-2ztp/0pe4afXmlw2Zk0hKLdSwmbpZjafz3MR7F+SdWQ="; }; postPatch = '' diff --git a/pkgs/by-name/ne/netfoil/package.nix b/pkgs/by-name/ne/netfoil/package.nix index 5b1450a28aba..f74baf8464d4 100644 --- a/pkgs/by-name/ne/netfoil/package.nix +++ b/pkgs/by-name/ne/netfoil/package.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "netfoil"; - version = "0.4.0"; + version = "0.6.1"; src = fetchFromGitHub { owner = "tinfoil-factory"; repo = "netfoil"; tag = "v${version}"; - hash = "sha256-HWAw3CxuVOinYhcJS5KjkscFURSamsiu4oLNU+z16zc="; + hash = "sha256-WKtyNdb3hwveLpg3vkKFTXceE6b4AjVrzZoj9eEkdx4="; }; __structuredAttrs = true; diff --git a/pkgs/by-name/ne/netgen-vlsi/package.nix b/pkgs/by-name/ne/netgen-vlsi/package.nix index 5c7f3173ff18..bad98953d464 100644 --- a/pkgs/by-name/ne/netgen-vlsi/package.nix +++ b/pkgs/by-name/ne/netgen-vlsi/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "netgen"; - version = "1.5.320"; + version = "1.5.323"; src = fetchFromGitHub { owner = "RTimothyEdwards"; repo = "netgen"; tag = finalAttrs.version; - hash = "sha256-h4SESGTjeD8vtLiLFSkIlnBVQfysQvxWp4E5nS1wu4Y="; + hash = "sha256-L8DJdk5lkb/qh5GbZK9eDNq1eZPEQq4ZZsBQPDJcKJ0="; }; strictDeps = true; diff --git a/pkgs/by-name/ne/netgen/package.nix b/pkgs/by-name/ne/netgen/package.nix index 27095e32a31d..67f9413f273f 100644 --- a/pkgs/by-name/ne/netgen/package.nix +++ b/pkgs/by-name/ne/netgen/package.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "netgen"; - version = "6.2.2505"; + version = "6.2.2605"; src = fetchFromGitHub { owner = "ngsolve"; repo = "netgen"; tag = "v${finalAttrs.version}"; - hash = "sha256-MPnibhDzNjqmpW5C76KdeYoZGfKLU0KJ20EnjrK1S+Y="; + hash = "sha256-067PzJymS6ayVoenaXEdvK3fraLTKPJTC54Aok1UUtg="; }; patches = [ @@ -61,11 +61,6 @@ stdenv.mkDerivation (finalAttrs: { url = "${patchSource}/include_stdlib.patch"; hash = "sha256-W+NgGBuy/UmzVbPTSqR8FRUlyN/9dl9l9e9rxKklmIc="; }) - # Fix build with pybind11 3.x. - (fetchpatch2 { - url = "https://github.com/NGSolve/netgen/commit/ceacae3844ed2f0c48c8b6a3a82904b16c594f41.patch?full_index=1"; - hash = "sha256-uSlkKxuOoUt4n601vadEZogSF47zdWNOIk1Nr9Ra3AU="; - }) ./ensure_python_before_getting_gil.patch ./macos_use_tk_default_color_map.patch ]; @@ -147,6 +142,10 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_UNIT_TESTS" finalAttrs.finalPackage.doInstallCheck) ]; + env.NIX_CFLAGS_COMPILE = lib.optionalString ( + stdenv.hostPlatform.isAarch64 && stdenv.hostPlatform.isLinux + ) "-flax-vector-conversions"; + __darwinAllowLocalNetworking = true; desktopItems = [ diff --git a/pkgs/by-name/ne/nethogs/package.nix b/pkgs/by-name/ne/nethogs/package.nix index 006122654ec5..2fe67b8d5fee 100644 --- a/pkgs/by-name/ne/nethogs/package.nix +++ b/pkgs/by-name/ne/nethogs/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nethogs"; - version = "0.8.8"; + version = "0.9.0"; src = fetchFromGitHub { owner = "raboof"; repo = "nethogs"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-+yVMyGSBIBWYjA9jaGWvrcsNPbJ6S4ax9H1BhWHYUUU="; + sha256 = "sha256-ojbsCoJ8fOaHgm1tWyM59siTDYmCllXOUNqNQJwRhws="; }; buildInputs = [ diff --git a/pkgs/by-name/ne/netpbm/c23.patch b/pkgs/by-name/ne/netpbm/c23.patch deleted file mode 100644 index c7712f0ba230..000000000000 --- a/pkgs/by-name/ne/netpbm/c23.patch +++ /dev/null @@ -1,63 +0,0 @@ -From cde10364f1b59098fa2fbcacbdba88c7bbab4848 Mon Sep 17 00:00:00 2001 -From: Alyssa Ross -Date: Sun, 22 Feb 2026 12:06:15 +0100 -Subject: [PATCH] Remove function declarators without prototypes -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -These are no longer valid in C23 — they prototype the function as -taking no arguments, and now cause compilation errors when building -for non-Glibc systems. - -getenv is part of the C standard, so should be universally present, -and getopt is part of POSIX, so conflicting prototypes should be a -thing of the past. Similar changes have been made in upstream gnulib. ---- - converter/other/fiasco/getopt.c | 3 +-- - converter/other/fiasco/getopt.h | 7 ------- - 2 files changed, 1 insertion(+), 9 deletions(-) - -diff --git a/converter/other/fiasco/getopt.c b/converter/other/fiasco/getopt.c -index 65c206c3..565fac28 100644 ---- a/converter/other/fiasco/getopt.c -+++ b/converter/other/fiasco/getopt.c -@@ -44,6 +44,7 @@ - - #include - #include -+#include - - /* Comment out all this code if we are using the GNU C Library, and are not - actually compiling the library itself. This code is part of the GNU C -@@ -203,8 +204,6 @@ static char *posixly_correct; - /* Avoid depending on library functions or files - whose names are inconsistent. */ - --char *getenv (); -- - static char * - my_index (str, chr) - const char *str; -diff --git a/converter/other/fiasco/getopt.h b/converter/other/fiasco/getopt.h -index 3c735e3d..08138da4 100644 ---- a/converter/other/fiasco/getopt.h -+++ b/converter/other/fiasco/getopt.h -@@ -95,14 +95,7 @@ struct option - #define optional_argument 2 - - #if defined (__STDC__) && __STDC__ --#ifdef __GNU_LIBRARY__ --/* Many other libraries have conflicting prototypes for getopt, with -- differences in the consts, in stdlib.h. To avoid compilation -- errors, only prototype getopt for the GNU C library. */ - extern int getopt (int argc, char *const *argv, const char *shortopts); --#else /* not __GNU_LIBRARY__ */ --extern int getopt (); --#endif /* __GNU_LIBRARY__ */ - extern int getopt_long (int argc, char *const *argv, const char *shortopts, - const struct option *longopts, int *longind); - extern int getopt_long_only (int argc, char *const *argv, --- -2.52.0 - diff --git a/pkgs/by-name/ne/netpbm/package.nix b/pkgs/by-name/ne/netpbm/package.nix index f7841cfe54bf..4d338fb84d4c 100644 --- a/pkgs/by-name/ne/netpbm/package.nix +++ b/pkgs/by-name/ne/netpbm/package.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (finalAttrs: { # Determine version and revision from: # https://sourceforge.net/p/netpbm/code/HEAD/log/?path=/advanced pname = "netpbm"; - version = "11.13.3"; + version = "11.15.1"; outputs = [ "bin" @@ -31,15 +31,10 @@ stdenv.mkDerivation (finalAttrs: { src = fetchsvn { url = "https://svn.code.sf.net/p/netpbm/code/advanced"; - rev = "5164"; - sha256 = "sha256-3teRW9oucwv0+V+eyLVvh8Y2NtrFoyIt1JWoC2gyVgM="; + rev = "5227"; + sha256 = "sha256-Lr02cu7OAPv+wjKjPkA0wyZ0VvurUuCf5IJXjmCAE0I="; }; - patches = [ - # Sent to maintainer 2026-02-22. - ./c23.patch - ]; - nativeBuildInputs = [ pkg-config flex diff --git a/pkgs/by-name/ne/netpeek/package.nix b/pkgs/by-name/ne/netpeek/package.nix index 23564c756a7a..f4442e1908a4 100644 --- a/pkgs/by-name/ne/netpeek/package.nix +++ b/pkgs/by-name/ne/netpeek/package.nix @@ -17,6 +17,8 @@ python3Packages.buildPythonApplication (finalAttrs: { version = "0.2.7"; pyproject = false; + __structuredAttrs = true; + src = fetchFromGitHub { owner = "ZingyTomato"; repo = "NetPeek"; diff --git a/pkgs/by-name/ne/netproc/package.nix b/pkgs/by-name/ne/netproc/package.nix index 598d9992458c..8a87123b641d 100644 --- a/pkgs/by-name/ne/netproc/package.nix +++ b/pkgs/by-name/ne/netproc/package.nix @@ -3,23 +3,26 @@ stdenv, fetchFromGitHub, ncurses, + nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "netproc"; - version = "0.6.6"; + version = "0.6.7"; src = fetchFromGitHub { owner = "berghetti"; repo = "netproc"; rev = finalAttrs.version; - hash = "sha256-OQWlFwCga33rTseLeO8rAd+pkLHbSNf3YI5OSwrdIyk="; + hash = "sha256-EqCyh0WNz7B2B1SFgFQT2MFk8+OVPsy5n3EFt64HJ+E="; }; buildInputs = [ ncurses ]; installFlags = [ "prefix=$(out)" ]; + passthru.updateScript = nix-update-script { }; + meta = { description = "Tool to monitor network traffic based on processes"; homepage = "https://github.com/berghetti/netproc"; diff --git a/pkgs/by-name/ne/netscanner/package.nix b/pkgs/by-name/ne/netscanner/package.nix index 65e946da47fb..e1ea3949e2fc 100644 --- a/pkgs/by-name/ne/netscanner/package.nix +++ b/pkgs/by-name/ne/netscanner/package.nix @@ -8,7 +8,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "netscanner"; - version = "0.6.41"; + version = "0.6.43"; nativeBuildInputs = [ makeWrapper ]; @@ -16,10 +16,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "Chleba"; repo = "netscanner"; tag = "v${finalAttrs.version}"; - hash = "sha256-8Srsts0FDLMT01YW5Guv3r8yx5i5ua7bhAFbQ5BMN74="; + hash = "sha256-LLzv8+wAlZgXrj1Ldc+uGDfhvDYDtRU25R7UbmGb+ok="; }; - cargoHash = "sha256-vlV5SibQlJ/yhJJKweqg6KYinpgZmWUUnyzAS6LBBKw="; + cargoHash = "sha256-47bvcj+0ZRcHjyt0cpZ0PT+NRvYdvBQcTTf9tZHci2Q="; postFixup = '' wrapProgram $out/bin/netscanner \ diff --git a/pkgs/by-name/ne/netsniff-ng/package.nix b/pkgs/by-name/ne/netsniff-ng/package.nix index 8f6438b9adbd..fb8a4014b730 100644 --- a/pkgs/by-name/ne/netsniff-ng/package.nix +++ b/pkgs/by-name/ne/netsniff-ng/package.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation (finalAttrs: { development and analysis, debugging, auditing or network reconnaissance. ''; homepage = "http://netsniff-ng.org/"; - license = with lib.licenses; [ gpl2Only ]; + license = lib.licenses.gpl2Only; platforms = lib.platforms.linux; }; }) diff --git a/pkgs/by-name/ne/netwatch/package.nix b/pkgs/by-name/ne/netwatch/package.nix index ce39b1693811..4a07ac765356 100644 --- a/pkgs/by-name/ne/netwatch/package.nix +++ b/pkgs/by-name/ne/netwatch/package.nix @@ -10,17 +10,17 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "netwatch-tui"; - version = "0.25.5"; + version = "0.26.1"; __structuredAttrs = true; src = fetchFromGitHub { owner = "matthart1983"; repo = "netwatch"; tag = "v${finalAttrs.version}"; - hash = "sha256-JE/jKQVAkHpgI8nwgrJcaynixJX7c4C1Qhe8VULggAE="; + hash = "sha256-gJTJ8Fn/McFdzlITvSrmgnOKu2f+KOeA9KODkAljoV8="; }; - cargoHash = "sha256-W8CSx/MM9M6FoN/LHcV/d3vh27/hysgsPh7eLZVUgjA="; + cargoHash = "sha256-brCc2FjS/GvjCxHZFLFZaSeTIukIAkfGl/gtpmhShls="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/by-name/ne/networkmanager-l2tp/package.nix b/pkgs/by-name/ne/networkmanager-l2tp/package.nix index fdb581dcd5ef..54f2edb95488 100644 --- a/pkgs/by-name/ne/networkmanager-l2tp/package.nix +++ b/pkgs/by-name/ne/networkmanager-l2tp/package.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "nm-l2tp"; - repo = "network-manager-l2tp"; + repo = "NetworkManager-l2tp"; rev = version; hash = "sha256-5EIG/5fexhrcOOQE+31+TJKMtINGVL+EI32m9tEhYVo="; }; @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { meta = { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = "https://github.com/nm-l2tp/network-manager-l2tp"; + homepage = "https://github.com/nm-l2tp/NetworkManager-l2tp"; license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ obadz diff --git a/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch b/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch new file mode 100644 index 000000000000..f7567942d6a8 --- /dev/null +++ b/pkgs/by-name/ne/networkmanager-vpnc/export_nm_vpn_editor_factory_vpnc.patch @@ -0,0 +1,46 @@ +commit 4c9e26cdc9f58f0e35aa345ae3bb643bea139608 +Author: Christian Krause +Date: Tue May 6 00:33:39 2025 +0200 + + Export nm_vpn_editor_factory_vpnc properly + + - commit e2fc231149165cb37a25362b85cbcd58b15a2a11 removed + libnm-glib version + - after that commit, nm_vpn_editor_factory_vpnc was not correctly + exported anymore which caused the settings editor be missing + when adding or editing a vnpc connection in gnome-control-center + - this commit re-adds the removed G_MODULE_EXPORT declaration + +diff --git a/properties/nm-vpnc-editor.c b/properties/nm-vpnc-editor.c +index a06807d..0c8081d 100644 +--- a/properties/nm-vpnc-editor.c ++++ b/properties/nm-vpnc-editor.c +@@ -27,7 +27,6 @@ + #include "nm-default.h" + + #include "nm-vpnc-editor.h" +-#include "nm-vpnc-editor-plugin.h" + + #include + #include +@@ -1130,3 +1129,20 @@ vpnc_editor_interface_init (NMVpnEditorInterface *iface) + iface->get_widget = get_widget; + iface->update_connection = update_connection; + } ++ ++/*****************************************************************************/ ++ ++#ifndef NM_VPN_OLD ++ ++#include "nm-vpnc-editor-plugin.h" ++ ++G_MODULE_EXPORT NMVpnEditor * ++nm_vpn_editor_factory_vpnc (NMVpnEditorPlugin *editor_plugin, ++ NMConnection *connection, ++ GError **error) ++{ ++ g_return_val_if_fail (!error || !*error, NULL); ++ ++ return nm_vpnc_editor_new (connection, error); ++} ++#endif diff --git a/pkgs/by-name/ne/networkmanager-vpnc/package.nix b/pkgs/by-name/ne/networkmanager-vpnc/package.nix index c3ec042cf249..8ddaccc461fc 100644 --- a/pkgs/by-name/ne/networkmanager-vpnc/package.nix +++ b/pkgs/by-name/ne/networkmanager-vpnc/package.nix @@ -1,6 +1,7 @@ { stdenv, lib, + fetchpatch, fetchurl, replaceVars, vpnc, @@ -31,6 +32,8 @@ stdenv.mkDerivation rec { (replaceVars ./fix-paths.patch { inherit vpnc kmod; }) + # https://gitlab.gnome.org/GNOME/NetworkManager-vpnc/-/merge_requests/19 + ./export_nm_vpn_editor_factory_vpnc.patch ]; nativeBuildInputs = [ diff --git a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix index d0bc1b54563b..ee4e267442a0 100644 --- a/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix +++ b/pkgs/by-name/ne/neural-amp-modeler-lv2/package.nix @@ -25,6 +25,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = [ lib.maintainers.viraptor ]; description = "Neural Amp Modeler LV2 plugin implementation"; homepage = finalAttrs.src.meta.homepage; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; }; }) diff --git a/pkgs/by-name/ne/new-session-manager/package.nix b/pkgs/by-name/ne/new-session-manager/package.nix index 748038ca00bd..a0afa1c7fc1b 100644 --- a/pkgs/by-name/ne/new-session-manager/package.nix +++ b/pkgs/by-name/ne/new-session-manager/package.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (finalAttrs: { version = "1.6.1"; src = fetchFromGitHub { - owner = "linuxaudio"; + owner = "jackaudio"; repo = "new-session-manager"; rev = "v${finalAttrs.version}"; sha256 = "sha256-5G2GlBuKjC/r1SMm78JKia7bMA97YcvUR5l6zBucemw="; diff --git a/pkgs/by-name/ne/newelle/package.nix b/pkgs/by-name/ne/newelle/package.nix index 027551626794..a63aee43c276 100644 --- a/pkgs/by-name/ne/newelle/package.nix +++ b/pkgs/by-name/ne/newelle/package.nix @@ -20,7 +20,7 @@ }: let - version = "1.3.7"; + version = "1.4.5"; in python3Packages.buildPythonApplication { pname = "newelle"; @@ -31,7 +31,7 @@ python3Packages.buildPythonApplication { owner = "qwersyk"; repo = "Newelle"; tag = version; - hash = "sha256-Qa1f6lNfKt1hh1gWJ45n9rwjO5lSO2d0tMII27glU/E="; + hash = "sha256-GcNAwrk5y6F0BgRy69nRePkX4WoYviWsB+8X/+N5QwE="; }; postPatch = '' @@ -104,6 +104,8 @@ python3Packages.buildPythonApplication { mainProgram = "newelle"; license = lib.licenses.gpl3Plus; platforms = lib.platforms.linux; - maintainers = [ ]; + maintainers = with lib.maintainers; [ + michaelAllen + ]; }; } diff --git a/pkgs/by-name/ne/newlib/package.nix b/pkgs/by-name/ne/newlib/package.nix index c7b3ccbe8a85..71f98d63ed6e 100644 --- a/pkgs/by-name/ne/newlib/package.nix +++ b/pkgs/by-name/ne/newlib/package.nix @@ -13,26 +13,14 @@ stdenvNoLibc.mkDerivation (finalAttrs: { pname = "newlib"; - version = "4.5.0.20241231"; + version = "4.6.0.20260123"; src = fetchurl { url = "ftp://sourceware.org/pub/newlib/newlib-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-M/EmBeAFSWWZbCXBOCs+RjsK+ReZAB9buMBjDy7IyFI="; + sha256 = "sha256-b/J+O/AiZm9D94AiVb5oDu/3IqwYGxcl0h4ugxhgTuM="; }; - patches = [ - (fetchpatch { - name = "0001-newlib-Fix-mips-libgloss-support.patch"; - url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=8a8fb570d7c5310a03a34b3dd6f9f8bb35ee9f40"; - hash = "sha256-hWS/X0jf/ZFXIR39NvNDVhkR8F81k9UWpsqDhZFxO5o="; - }) - (fetchpatch { - name = "0002-newlib-Fix-i386-libgloss-support.patch"; - url = "https://sourceware.org/git/?p=newlib-cygwin.git;a=patch;h=351842d55ee50fab672818b72f2c6bf3be1772bd;hp=4a1144dc540423b422dbec27eb433bc7dc725ae8"; - hash = "sha256-GMx9nQKJEnXbA5HFczp3xjrrU94j1oXq4lIjEf0um9Y="; - }) - ] - ++ lib.optionals nanoizeNewlib [ + patches = lib.optionals nanoizeNewlib [ # https://bugs.gentoo.org/723756 (fetchpatch { name = "newlib-3.3.0-no-nano-cxx.patch"; @@ -114,6 +102,8 @@ stdenvNoLibc.mkDerivation (finalAttrs: { ); enableParallelBuilding = true; + # install: cannot create regular file '.../powerpc-none-eabi/lib/crt0.o': File exists + enableParallelInstalling = false; dontDisableStatic = true; # apply necessary nano changes from https://developer.arm.com/-/media/Files/downloads/gnu/12.2.rel1/manifest/copy_nano_libraries.sh?rev=4c50be6ccb9c4205a5262a3925317073&hash=1375A7B0A1CD0DB9B9EB0D2B574ADF66 diff --git a/pkgs/by-name/ne/newsboat/package.nix b/pkgs/by-name/ne/newsboat/package.nix index b7e329e7f6ed..f803c4446e68 100644 --- a/pkgs/by-name/ne/newsboat/package.nix +++ b/pkgs/by-name/ne/newsboat/package.nix @@ -17,30 +17,22 @@ libiconv, makeWrapper, nix-update-script, - fetchpatch, }: stdenv.mkDerivation (finalAttrs: { pname = "newsboat"; - version = "2.43"; + version = "2.44"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; tag = "r${finalAttrs.version}"; - hash = "sha256-XnA20uylHoly1P5qpM2JmkkV6C5//Xu5M+CjWwCiI7c="; + hash = "sha256-OV7WpM0NBfqOtFv9Co728UwHut4HhT2u5qgvamy/FAg="; }; - patches = [ - (fetchpatch { - url = "https://github.com/newsboat/newsboat/commit/f7936d13013d33946b28b2ac51f1266423d66b23.patch"; - hash = "sha256-MnL/ylTIJJV1+3I1OxzNWedLUEZ4viuzxXNM63qk1aM="; - }) - ]; - cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-+QyN0YDQmSGVZ2ckLd5SDYRw/wZYFY6GNteeTRrNDcU="; + hash = "sha256-HJZnbQ7TDJ9zg0Rav1PCMEymaYy/mSxnrr2gkv4pTX0="; }; # allow other ncurses versions on Darwin diff --git a/pkgs/by-name/ne/newsflash/package.nix b/pkgs/by-name/ne/newsflash/package.nix index 0398d5db457f..653216ce4624 100644 --- a/pkgs/by-name/ne/newsflash/package.nix +++ b/pkgs/by-name/ne/newsflash/package.nix @@ -18,35 +18,33 @@ gtksourceview5, libadwaita, libglycin, - libseccomp, libxml2, openssl, sqlite, webkitgtk_6_0, glib-networking, - librsvg, gst_all_1, nix-update-script, }: stdenv.mkDerivation (finalAttrs: { pname = "newsflash"; - version = "5.1.0"; + version = "5.2.3"; src = fetchFromGitLab { owner = "news-flash"; repo = "news_flash_gtk"; tag = "v.${finalAttrs.version}"; - hash = "sha256-BfzrnTyMLFiM+aHtrppvl/j/fjB4TbEkbl/yHYOnXa8="; + hash = "sha256-EeB2DNXxvo7biIv426+dkCKbjn2uxyXgvA1FbKevaFQ="; }; cargoDeps = rustPlatform.fetchCargoVendor { inherit (finalAttrs) pname version src; - hash = "sha256-4z2RGelDhi4RmVQ/+Ba340Pm05x4ruaRYAtJ1HuRHqA="; + hash = "sha256-OPxMsNhdMSt8mLhsNIBTjggSL1f3bZMH/5shESDV6yE="; }; postPatch = '' - patchShebangs build-aux/cargo.sh + patchShebangs --build build-aux/cargo.sh meson rewrite kwargs set project / version '${finalAttrs.version}' substituteInPlace src/meson.build --replace-fail \ "'src' / rust_target / 'news_flash_gtk'" \ @@ -79,7 +77,6 @@ stdenv.mkDerivation (finalAttrs: { gtksourceview5 libadwaita libglycin - libseccomp libxml2 openssl sqlite @@ -87,9 +84,6 @@ stdenv.mkDerivation (finalAttrs: { # TLS support for loading external content in webkitgtk WebView glib-networking - - # SVG support for gdk-pixbuf - librsvg ] ++ (with gst_all_1; [ # Audio & video support for webkitgtk WebView diff --git a/pkgs/by-name/ne/nexa/package.nix b/pkgs/by-name/ne/nexa/package.nix index d18777cfcb1b..7478df28e323 100644 --- a/pkgs/by-name/ne/nexa/package.nix +++ b/pkgs/by-name/ne/nexa/package.nix @@ -56,8 +56,8 @@ buildGo125Module (finalAttrs: { version = "0.2.73"; src = fetchFromGitHub { - owner = "NexaAI"; - repo = "nexa-sdk"; + owner = "qualcomm"; + repo = "GenieX"; tag = "v${finalAttrs.version}"; hash = "sha256-JioUguVO2z37BYxkXBlDEswJIh80bpOONG6EVNlq5OA="; }; @@ -199,8 +199,8 @@ buildGo125Module (finalAttrs: { meta = { description = "Nexa AI SDK CLI for model management, inference, and server operations"; - homepage = "https://github.com/NexaAI/nexa-sdk"; - changelog = "https://github.com/NexaAI/nexa-sdk/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/qualcomm/GenieX"; + changelog = "https://github.com/qualcomm/GenieX/releases/tag/v${finalAttrs.version}"; license = lib.licenses.asl20; maintainers = with lib.maintainers; [ mkg20001 ]; mainProgram = "nexa"; diff --git a/pkgs/by-name/ne/nextcloud-client/package.nix b/pkgs/by-name/ne/nextcloud-client/package.nix index 7bf868ad76fb..9ee951d8fa05 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 (finalAttrs: { pname = "nextcloud-client"; - version = "33.0.5"; + version = "33.0.7"; outputs = [ "out" @@ -34,7 +34,7 @@ stdenv.mkDerivation (finalAttrs: { owner = "nextcloud-releases"; repo = "desktop"; tag = "v${finalAttrs.version}"; - hash = "sha256-YRaND3JdZQZGtuNfthliyqcPvpC742h4C6l3HBbYorI="; + hash = "sha256-hfATh24U9o2ZifB1UlLu893aENILb9a/j/IvIytIR5s="; }; patches = [ diff --git a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix index a22fa73bc2dc..26e3f21880b0 100644 --- a/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix +++ b/pkgs/by-name/ne/nextcloud-talk-desktop/package.nix @@ -32,11 +32,11 @@ }: let pname = "nextcloud-talk-desktop"; - version = "2.1.1"; # Ensure both hashes (Linux and Darwin) are updated! + version = "2.2.1"; # Ensure both hashes (Linux and Darwin) are updated! hashes = { - linux = "sha256-s6+p21KLoDvcQz0EgV7WYIwYc9JolZpqkxZ8iIol8Yg="; - darwin = "sha256-rp6+bYb3Y8yEXYUY+cuDo7Lw6cq/EUnPjLIqscKeULc="; + linux = "sha256-AhNHPejdnGmL55/mHGKkDaGWl2fm7uufX4JaB5VSBos="; + darwin = "sha256-TkLAydkedLbi6vqd3kvQNkVnXGSHfF6xTBF3PCOgJ6I="; }; # Only x86_64-linux is supported with Darwin support being universal @@ -62,7 +62,7 @@ let meta = { description = "Nextcloud Talk Desktop Client"; homepage = "https://github.com/nextcloud/talk-desktop"; - changelog = "https://github.com/nextcloud/talk-desktop/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/nextcloud/talk-desktop/blob/v${version}/CHANGELOG.md"; license = lib.licenses.agpl3Only; maintainers = with lib.maintainers; [ kashw2 ]; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; diff --git a/pkgs/by-name/ne/nextflow/deps.json b/pkgs/by-name/ne/nextflow/deps.json index b7a8ac63e5bc..7592fcda63cf 100644 --- a/pkgs/by-name/ne/nextflow/deps.json +++ b/pkgs/by-name/ne/nextflow/deps.json @@ -1,2831 +1,3202 @@ { - "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", - "!version": 1, - "https://plugins.gradle.org/m2": { - "com/fasterxml#oss-parent/55": { - "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" - }, - "com/fasterxml#oss-parent/58": { - "pom": "sha256-VnDmrBxN3MnUE8+HmXpdou+qTSq+Q5Njr57xAqCgnkA=" - }, - "com/fasterxml#oss-parent/61": { - "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" - }, - "com/fasterxml/jackson#jackson-bom/2.17.2": { - "pom": "sha256-H0crC8IATVz0IaxIhxQX+EGJ5481wElxg4f9i0T7nzI=" - }, - "com/fasterxml/jackson#jackson-parent/2.17": { - "pom": "sha256-rubeSpcoOwQOQ/Ta1XXnt0eWzZhNiSdvfsdWc4DIop0=" - }, - "com/fasterxml/woodstox#woodstox-core/7.1.0": { - "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", - "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" - }, - "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/8.3.8": { - "pom": "sha256-NmeaNDsKVsypSJCF8DHTkDXKf/e7cO4Fr3WBdje0JTM=" - }, - "com/gradleup/shadow#shadow-gradle-plugin/8.3.8": { - "jar": "sha256-wnObOTJnIDIJdNZ3yLFhjHyQpUVys/24cdbEDlOEphs=", - "module": "sha256-hfNPgoHsUWqBpvKFhILqz0p9JwuC9j5f42nLT6nVI0A=", - "pom": "sha256-IW0s1jeg6+c7BOanrcW7sXOcuHUg/ER7hQimRaSCgoY=" - }, - "commons-io#commons-io/2.19.0": { - "jar": "sha256-gkJokZtLYvn0DwjFQ4HeWZOwePWGZ+My0XNIrgGdcrk=", - "pom": "sha256-VCt6UC7WGVDRuDEStRsWF9NAfjpN9atWqY12Dg+MWVA=" - }, - "io/nextflow#nextflow-plugin-gradle/1.0.0-beta.10": { - "jar": "sha256-nEdUtHcSIdQf+cG/LYl1rSE0XxJvuyqW9xXEnmTxMC4=", - "module": "sha256-rhT3ohCy/ea82WsWy/Mx0ygZZczhHbVKgLeWTz3n+e0=", - "pom": "sha256-lQ8ap9H3R7rLNACNID1Tar36ijIWXNsytavyRl7U7FA=" - }, - "io/nextflow/nextflow-plugin#io.nextflow.nextflow-plugin.gradle.plugin/1.0.0-beta.10": { - "pom": "sha256-6UkBL1oNz16Z5GBmizDW2bREzOh5fJ2jzb1KQJj4k7U=" - }, - "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { - "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" - }, - "jakarta/platform#jakartaee-api-parent/9.1.0": { - "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" - }, - "org/apache#apache/33": { - "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" - }, - "org/apache/ant#ant-launcher/1.10.15": { - "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", - "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" - }, - "org/apache/ant#ant-parent/1.10.15": { - "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" - }, - "org/apache/ant#ant/1.10.15": { - "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", - "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" - }, - "org/apache/commons#commons-parent/81": { - "pom": "sha256-NI1OfBMb5hFMhUpxnOekQwenw5vTZghJd7JP0prQ7bQ=" - }, - "org/apache/groovy#groovy-bom/4.0.22": { - "module": "sha256-Ul0/SGvArfFvN+YAL9RlqygCpb2l9MZWf778copo5mY=", - "pom": "sha256-Hh9rQiKue/1jMgA+33AgGDWZDb1GEGsWzduopT4832U=" - }, - "org/apache/logging#logging-parent/11.3.0": { - "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" - }, - "org/apache/logging/log4j#log4j-api/2.24.1": { - "jar": "sha256-bne7Ip/I3K8JA4vutekDCyLp4BtRtFiwGDzmaevMku8=", - "pom": "sha256-IzAaISnUEAiZJfSvQa7LUlhKPcxFJoI+EyNOyst+c+M=" - }, - "org/apache/logging/log4j#log4j-bom/2.24.1": { - "pom": "sha256-vGPPsrS5bbS9cwyWLoJPtpKMuEkCwUFuR3q1y3KwsNM=" - }, - "org/apache/logging/log4j#log4j-core/2.24.1": { - "jar": "sha256-ALzziEcsqApocBQYF2O2bXdxd/Isu/F5/WDhsaybybA=", - "pom": "sha256-JyQstBek3xl47t/GlYtFyJgg+WzH9NFtH0gr/CN24M0=" - }, - "org/apache/logging/log4j#log4j/2.24.1": { - "pom": "sha256-+NcAm1Rl2KhT0QuEG8Bve3JnXwza71OoDprNFDMkfto=" - }, - "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { - "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", - "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I=" - }, - "org/apache/maven#maven-api-xml/4.0.0-rc-3": { - "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=", - "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE=" - }, - "org/apache/maven#maven-xml/4.0.0-rc-3": { - "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=", - "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI=" - }, - "org/codehaus/plexus#plexus-utils/4.0.2": { - "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", - "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" - }, - "org/codehaus/plexus#plexus-xml/4.1.0": { - "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=", - "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4=" - }, - "org/codehaus/plexus#plexus/20": { - "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q=" - }, - "org/codehaus/woodstox#stax2-api/4.2.2": { - "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", - "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" - }, - "org/eclipse/ee4j#project/1.0.7": { - "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" - }, - "org/gradle/toolchains#foojay-resolver/1.0.0": { - "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", - "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=", - "pom": "sha256-m8SLSeQi2e2rw5asGNiwQd/CIhLX+ujjVmfShdSBApo=" - }, - "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { - "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" - }, - "org/jdom#jdom2/2.0.6.1": { - "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", - "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" - }, - "org/junit#junit-bom/5.10.3": { - "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", - "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" - }, - "org/junit#junit-bom/5.11.4": { - "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", - "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" - }, - "org/mockito#mockito-bom/4.11.0": { - "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" - }, - "org/ow2#ow2/1.5.1": { - "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" - }, - "org/ow2/asm#asm-commons/9.8": { - "jar": "sha256-MwGhwctMWfzFKSZI2sHXxa7UwPBn376IhzuM3+d0BPQ=", - "pom": "sha256-95PnjwH3A3F9CUcuVs3yEv4piXDIguIRbo5Un7bRQMI=" - }, - "org/ow2/asm#asm-tree/9.8": { - "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", - "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" - }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" - }, - "org/springframework#spring-framework-bom/5.3.39": { - "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", - "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" - }, - "org/vafer#jdependency/2.13": { - "jar": "sha256-FFxghksjansSllUNMaSap1rWEpWBOO4NRxufywu+3T4=", - "pom": "sha256-3Ip1HRudXz2imiihDmKF62+3Q/TW46MleRsZX9B4eXs=" - } - }, - "https://repo.maven.apache.org/maven2": { - "ch/artecat/grengine#grengine/3.0.2": { - "jar": "sha256-vwYoa7L8DR9sh0S4+Dz85Y13U2jMHoeathgL55v2fYE=", - "pom": "sha256-Um5mRoK4WHXHqiRhXGVf7oEhLp8g0gyj3FafXhDTBvU=" - }, - "ch/qos/logback#logback-classic/1.5.20": { - "jar": "sha256-EijbmeGvYC4ZGisUIlLYqvaBKeZDwZ5/khN85fcgmtM=", - "pom": "sha256-s+hotrfIsqgGswDIrsddcCeI/l5lM9P2ljYHmu1bU3c=" - }, - "ch/qos/logback#logback-core/1.5.20": { - "jar": "sha256-Kf4JW7e3+FCQeuw/3etAyNOZ2F5WgOjTUz49pdmq6Rc=", - "pom": "sha256-XFJJldocTKrot6y/aQFin468ltUkfZGw2afuCKsQ7Eo=" - }, - "ch/qos/logback#logback-parent/1.5.20": { - "pom": "sha256-Fwus2jsPfYA9jteOcPEg7Ncmu5qKk8F6MmfzP8HryiA=" - }, - "ch/randelshofer#fastdoubleparser/0.8.0": { - "jar": "sha256-EP4oj9eiza9RdTMrc1Kfmr+P1U3P/zF9aWfAw1/7Ezs=", - "pom": "sha256-VWPl3UuwVHWfD4OFFgbZnSQm11wnNygUAnAF6S0cKqo=" - }, - "com/azure#azure-client-sdk-parent/1.7.0": { - "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo=" - }, - "com/azure#azure-compute-batch/1.0.0-beta.3": { - "jar": "sha256-VyCELrS/QS+UkURzaqLGl0BLbLqrspl0ZEMO6ltCm1k=", - "pom": "sha256-JaE0ZZmVdwt+G5ACniUCL6+uUADtefolwaEbAlaIqLk=" - }, - "com/azure#azure-core-http-netty/1.15.13": { - "pom": "sha256-ZdxNE3CPB4YJkywiM+NxfgQxZtYCe9g08j6VitejPmI=" - }, - "com/azure#azure-core-http-netty/1.16.0": { - "jar": "sha256-P/mGA8rew7yDE/uWU3+8ZBIFQRfb9mtGDJS/O2VsOKo=", - "pom": "sha256-TyYNJVSWYIaloRXaiAhHCjbw1ngEl/xrHVZPHTQ5tOg=" - }, - "com/azure#azure-core/1.55.5": { - "pom": "sha256-IosNnNy9QcY0ddUVqXRJfJeZMKXAeYmZ26pYaLOIlck=" - }, - "com/azure#azure-core/1.56.0": { - "jar": "sha256-+gHCWIBZ78ZRY6F0ZPziZUlGBN614t1IE8by0D6AmjA=", - "pom": "sha256-HRCx/heSvjFk8lwqhfRZKjTi2ATUPMi2FhT6mXyXxis=" - }, - "com/azure#azure-identity/1.17.0": { - "jar": "sha256-ZFE2ofgtPZNdEPZkvpJ8ut4hsmWIMvXRTJZthOhsQ3g=", - "pom": "sha256-FW5W+X3h/lDcwEbDtfiheo5s09M5QtsnxYvTkmQ0lAg=" - }, - "com/azure#azure-json/1.3.0": { - "pom": "sha256-HQXnSpIOfgU1neYJ1fx8aPUFoJjDdk56Tz3Sihc+8TY=" - }, - "com/azure#azure-json/1.5.0": { - "jar": "sha256-ZbHshfXXNCIfECjWDJW/W0U1FXl9araOqMNqby1bxWs=", - "pom": "sha256-mc0IuPRDyV9G1dv9J1o6eaJ/HfyXvnsyhxwsM32H9P8=" - }, - "com/azure#azure-sdk-parent/1.6.0": { - "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY=" - }, - "com/azure#azure-storage-blob/12.31.1": { - "jar": "sha256-b2pVBIn8a3oGR8gn86Zf9r0BfUJ1fwwhiVB8qlDuGlU=", - "pom": "sha256-tNjDGqTXsLR+4fQFNSzYmazbrqkWbzTfmH0yc9VZBgA=" - }, - "com/azure#azure-storage-common/12.30.1": { - "jar": "sha256-cn5boh3pvd5eh4AxPMNxY/G2SDcYX3z4dGe3jM5uMQU=", - "pom": "sha256-ebS/J9zxyXtRm5xtVK4eA23HnHaPJ6uGMZXXytLU2m8=" - }, - "com/azure#azure-storage-internal-avro/12.16.1": { - "jar": "sha256-s8fw6poGOEeaLYuQPZPIWb13a+ta0PECdYZTtoqaDMA=", - "pom": "sha256-kRWaSxF1axeYbf4PU8wBmkfDBEhfbTT6VP2FG4TyuPo=" - }, - "com/azure#azure-xml/1.2.0": { - "jar": "sha256-adlVnFYdMSW/0r+bUkhgHkQpArx1XZNd3j7bqX3A2TE=", - "pom": "sha256-afEjuNP2SbdgPVTzCvnB9Hlje02wa8klDnoDJmk4mE0=" - }, - "com/beust#jcommander/1.35": { - "jar": "sha256-AZwS/sHOXALLq7FQ9qyKhtkqDsyciaVJ5VNyg+hjAAw=", - "pom": "sha256-PO4bOtiorcEiTl3UO/XdpjzdBUA/8zlTDSal/cj2djc=" - }, - "com/esotericsoftware/kryo#kryo/2.24.0": { - "jar": "sha256-flazLGNQWPmqKCD4iRmrcC0CnLzRUoXamZLjbMCuUvI=", - "pom": "sha256-H3LlOjNreSBg0D/fl9vK4POWOn0PgsFQe6uLOc+HsBk=" - }, - "com/fasterxml#oss-parent/41": { - "pom": "sha256-r2UPpN1AC8V2kyC87wjtk4E/NJyr6CE9RprK+72UXYo=" - }, - "com/fasterxml#oss-parent/50": { - "pom": "sha256-9dpV3XuI+xcMRoAdF3dKZS+y9FgftbHQpfyGqhgrhXc=" - }, - "com/fasterxml#oss-parent/55": { - "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" - }, - "com/fasterxml#oss-parent/61": { - "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" - }, - "com/fasterxml#oss-parent/68": { - "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" - }, - "com/fasterxml#oss-parent/69": { - "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" - }, - "com/fasterxml/jackson#jackson-base/2.12.7": { - "pom": "sha256-F55U/ibI1N/pJf7jHUqH0cwl+LfgCUik5laxIp4rdq4=" - }, - "com/fasterxml/jackson#jackson-base/2.15.0": { - "pom": "sha256-UkKWvt4yGFrBEBLwfZJG44wZJTwrUT8c8oeZEho053A=" - }, - "com/fasterxml/jackson#jackson-base/2.18.2": { - "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" - }, - "com/fasterxml/jackson#jackson-base/2.18.4": { - "pom": "sha256-cAbgp7KhM19319LmT3a+o+grNTZ8/69KFogyVsqd1w0=" - }, - "com/fasterxml/jackson#jackson-base/2.18.4.1": { - "pom": "sha256-Es8So+YBhf/M7rxzjPDB+S3TqcU0EKhYzPG8Og3devY=" - }, - "com/fasterxml/jackson#jackson-base/2.19.2": { - "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM=" - }, - "com/fasterxml/jackson#jackson-bom/2.12.7": { - "pom": "sha256-GVVDL22K8ygG2C2CGP7f5L47s+I9WadNgUSf/HS/e9E=" - }, - "com/fasterxml/jackson#jackson-bom/2.15.0": { - "pom": "sha256-4AwuhiKc2Wh5RpGukO7hWwjE1PV0jJs0u0ItcTRG3ZU=" - }, - "com/fasterxml/jackson#jackson-bom/2.18.2": { - "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" - }, - "com/fasterxml/jackson#jackson-bom/2.18.4": { - "pom": "sha256-WgMHkmc66pQWRZE+JenPt9/50Wm4W+fyZUX/p257FL4=" - }, - "com/fasterxml/jackson#jackson-bom/2.18.4.1": { - "pom": "sha256-BfsEEiMCKW6NjmWKzy7/6C7EcXPfnz2Qthwll/irOpU=" - }, - "com/fasterxml/jackson#jackson-bom/2.19.2": { - "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" - }, - "com/fasterxml/jackson#jackson-parent/2.12": { - "pom": "sha256-YqocFnmt4J8XPb8bbDLTXFXnWAAjj9XkjxOqQzfAh1s=" - }, - "com/fasterxml/jackson#jackson-parent/2.15": { - "pom": "sha256-bN+XvGbzifY+NoUNL1UtEhZoj45aWHJ9P2qY7fhnXN4=" - }, - "com/fasterxml/jackson#jackson-parent/2.18.1": { - "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" - }, - "com/fasterxml/jackson#jackson-parent/2.18.3": { - "pom": "sha256-cbZ3DzBN4Os2u5GN1h7kJYXut6nb/dAn7Q6Dfj5J7wM=" - }, - "com/fasterxml/jackson#jackson-parent/2.19.3": { - "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.15.0": { - "jar": "sha256-ka3NPc9f2aFkmZNOdTaiPUVmkqAJPj1P1S8TjDk2NIw=", - "module": "sha256-vxVVouS7PyPbOR/EyN/GFX7GTow3ZYgUSiYPVBst4a4=", - "pom": "sha256-L4FZtEIZb6qg4TdOLSI0tX/uwysnYX+h1/XZqOC+Nyg=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.18.4": { - "jar": "sha256-IWYVYJTNFGOX60gUvRF8q+M1M5DfqJS8wGzkaxW9Qo4=", - "module": "sha256-ndx6EoPSgGmBZ1EyBtRQgkFmj89SYCtDffuoiYS/THU=", - "pom": "sha256-8FrcKhI6pkKnY8YIETvzcbFtkgapEQae8HqCq8RFYfI=" - }, - "com/fasterxml/jackson/core#jackson-annotations/2.19.2": { - "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=", - "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=", - "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck=" - }, - "com/fasterxml/jackson/core#jackson-core/2.15.0": { - "jar": "sha256-W0g/aPqd1qo32jfR953VxLlGQjj08GYKJCy2tccklQw=", - "module": "sha256-7h0Go46NRNgaLmpvVLfYZK5LL/cQ3fWKK9+4kfJxc4E=", - "pom": "sha256-Cjr13zbx8n4XZEgXpiQJuqJYZKNJOj0ogK1wCbDnA64=" - }, - "com/fasterxml/jackson/core#jackson-core/2.18.2": { - "jar": "sha256-2AVK58DRwtL1XSjkYCbr5YkogfP6tfQ5IzGEOBw7Sh8=", - "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", - "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" - }, - "com/fasterxml/jackson/core#jackson-core/2.18.4.1": { - "jar": "sha256-VpNFQ67lSYlsHGZbGlhADsEHZWL7VAf1MnDsr8Egrzo=", - "module": "sha256-PmPibcDI5SxnbI/a/9ojEsXat89bBK67bivQTwb/CJU=", - "pom": "sha256-E30+F51hJim2cNxDMnIpHC7DB+bwcX8/2QdPA6wR8Ak=" - }, - "com/fasterxml/jackson/core#jackson-core/2.19.2": { - "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=", - "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", - "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.12.7.1": { - "module": "sha256-00wrIwGY2LLTmirRRxDWySJxwHhIxDKkDh1HFZSiKaY=", - "pom": "sha256-BXeRSYclRKUn7oo4VYqRcJeVMvSAb0/jz4k6EHaKj7I=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.15.0": { - "jar": "sha256-AMWl1a5xrI6NW42mBoQeIlHIBjVZOctdUcTNxrZEoNw=", - "module": "sha256-oahCNG/envxI3bk4tE8e7r1EaGj1zXAxMmZToTLAb4M=", - "pom": "sha256-jDgNP+PcwpjQKHmKH5Lfwxgk/aBBFEryNi8fzzDueI8=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.18.4": { - "jar": "sha256-RS3P0s84E5AJC34UR50pTRNDIMVcO3REBcInCCeoPAM=", - "module": "sha256-U5Z171Qs1Bl/pFnclDhJvG8E8ro/iPgRCVlgGgF3gEk=", - "pom": "sha256-R/YtxlLdA3x4ZkrDhkb77TmjFPBUreDGIwvTlQ6g4n0=" - }, - "com/fasterxml/jackson/core#jackson-databind/2.19.2": { - "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=", - "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=", - "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.15.0": { - "jar": "sha256-aRoKYF3hXqYQGAMXMxlX/m9+kfRUce5Fy/mDLXQpHDE=", - "module": "sha256-z4AcQvZmQMI/nrPlAwQ+EmW4zSzprJfQx8eKRqYd4rI=", - "pom": "sha256-OZFsgO7zTEIpeuLynhsBGVxtLr3Ycy+5H1u8vMZEReI=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": { - "jar": "sha256-gKIT59mYJEkiq3vPCTjqA+t4aOiOLQWoQHxiKMiFo34=", - "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=", - "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.15.0": { - "pom": "sha256-gSCm1xgjiInHQlDqUjfpdFKrv7YDRzluM4+ReZVKxyY=" - }, - "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": { - "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE=" - }, - "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.4": { - "jar": "sha256-L9iQgUYRZ3MplEHxSuYkd2AP8jNMElQcZUBrmO1+3so=", - "module": "sha256-mZZ0+UAOv+aZc5CZ8JRvqS01fEMfbK0J8ENV4GoohHs=", - "pom": "sha256-Vze35xTRXWHWDqYxhbN++iGMBmI3Hqtf/55fz2t04DM=" - }, - "com/fasterxml/jackson/module#jackson-modules-java8/2.18.4": { - "pom": "sha256-+lYMsFq5xC360Pwo7qeceebhOkZW1qDWMhvLCBZiufU=" - }, - "com/fasterxml/woodstox#woodstox-core/7.1.1": { - "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=", - "pom": "sha256-r7XLRdQcH542dZCd5P7yQr3BzqRHagY0riD016VEM/8=" - }, - "com/github/javaparser#javaparser-core/3.25.8": { - "jar": "sha256-OsLEKiNMHuQ6VbwikRk03dU3u6eJMSZdBy7TTCKwbZY=", - "pom": "sha256-ZRsNqsBbjKdFWa1Clt3OTV2Bs7PVZUdGRHkQshn98VM=" - }, - "com/github/javaparser#javaparser-core/3.27.0": { - "jar": "sha256-EbDe6usp8kluFwTIxvdZPxSQH3JTpnG4G9qlMb6td58=", - "pom": "sha256-+7w+bwFZzG7AyAs45lPr/E74QUMFNE409P12OT7AjRI=" - }, - "com/github/javaparser#javaparser-parent/3.25.8": { - "pom": "sha256-GCe9gajuRIAfZInUHzUEuzXA70ZdsYysmVZ+A40eYes=" - }, - "com/github/javaparser#javaparser-parent/3.27.0": { - "pom": "sha256-Ae6YKwBmOSxr/R93Ldpexywa8FPSPVGkoThVpHjYVy4=" - }, - "com/github/stephenc/jcip#jcip-annotations/1.0-1": { - "jar": "sha256-T8z/g4Kq/FiZYsTtsmL2qlleNPHhHmEFfRxqluj8cyM=", - "pom": "sha256-aMKlqm6PNFdDCT5StbngGQuk1aUhXApZtNfTNkcgjLs=" - }, - "com/github/zafarkhaja#java-semver/0.10.2": { - "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", - "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" - }, - "com/google/analytics#google-analytics-admin-bom/0.61.0": { - "pom": "sha256-wq4RQBHGJHwuilgELwnSqKiatOkUDZpufmhSYDf4KvM=" - }, - "com/google/analytics#google-analytics-data-bom/0.62.0": { - "pom": "sha256-yw55ANhvbwidzGQTZ61PHQf/rV//mrqlEmlA+SW9PW4=" - }, - "com/google/android#annotations/4.1.1.4": { - "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", - "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" - }, - "com/google/api#api-common/2.53.0": { - "pom": "sha256-hfEZR5sbUaSepG31tUNS/Yy4/o/48Q+hmjrpqFebYjs=" - }, - "com/google/api#api-common/2.53.2": { - "jar": "sha256-4CENMaLsJn+izCobN/MnIQ+FLfSUMYAPrHKUs0G2/JU=", - "pom": "sha256-zY6lMlC9ajTIKdpOeMWUkkM8D05z9PcmCsOOx2kCQBM=" - }, - "com/google/api#gapic-generator-java-bom/2.46.1": { - "pom": "sha256-9/mGSetdfnDncY51buuJV9q6mn+HQVp4uTPphYBbiNM=" - }, - "com/google/api#gapic-generator-java-bom/2.62.2": { - "pom": "sha256-D1Geh2DUCJS5+SICW92caXGaTZqQX96LC/SXMyxdnh4=" - }, - "com/google/api#gapic-generator-java-pom-parent/2.46.1": { - "pom": "sha256-dfeNXqh8VLiQOKai5Eh9mxw74pKPUITBQf6mT5YFAVc=" - }, - "com/google/api#gapic-generator-java-pom-parent/2.62.0": { - "pom": "sha256-hX4La1G+GTsAmdgkaHw4PEkrDHiELBL+BF6yssnw+oo=" - }, - "com/google/api#gapic-generator-java-pom-parent/2.62.2": { - "pom": "sha256-FQFAN7P8AmdkPFMhCXyELdPzfXaxEB150t1Dmf5vivI=" - }, - "com/google/api#gax-bom/2.54.1": { - "pom": "sha256-Ta0wBZhRbHtmVZXfDO8YDYtFQKEzh3dP1c1c/TwdRa8=" - }, - "com/google/api#gax-bom/2.70.2": { - "pom": "sha256-wW8Mc06ykkJ7kdjW+QFhlNd/Rm46U7nYC1arLZ+/15w=" - }, - "com/google/api#gax-grpc/2.70.2": { - "jar": "sha256-gx1m8Pr6rwRjpIZKyZIEFWwNENVeLwNqNY8+APuc2hw=", - "pom": "sha256-rtVGX2Pba1T8ScquXTK2g2I0/apHieSAm9tBETRTz7w=" - }, - "com/google/api#gax-httpjson/2.70.2": { - "jar": "sha256-AZUF+aqW1oYqgt93Bm5FIRtvYxUXUuNFgLepoFQP8lI=", - "pom": "sha256-iSg9N0+EBqhQnAgaRi9BnTNF+o3oTkUDVQELxs8P7NI=" - }, - "com/google/api#gax-parent/2.70.2": { - "pom": "sha256-5+fWe+ftguepq2Vx9NrcP6+623fX4EhteY1CTSUrnFE=" - }, - "com/google/api#gax/2.70.2": { - "jar": "sha256-Myy9EAwjRDxgCkc6kiDL0NDRrdGSQObGOjM8JdXUmqo=", - "pom": "sha256-J8MZgeppgVsBi8FXxYcr9brWPybJx6jFGpxHcktdMXY=" - }, - "com/google/api-client#google-api-client-bom/2.7.0": { - "pom": "sha256-Sug+aJgr0KZwuA6s58aUqRWjlP/INJYTh0+es6P+TqE=" - }, - "com/google/api-client#google-api-client-bom/2.7.2": { - "pom": "sha256-o5uDySbr9qL5GIOI3FQpvHQcs90QFld1UyBnGD99M6w=" - }, - "com/google/api-client#google-api-client-parent/2.7.2": { - "pom": "sha256-c4/ewj9isT6dL6Iv8l/LWHyphMWNzKGxWQNL02ibtJM=" - }, - "com/google/api-client#google-api-client/2.7.2": { - "jar": "sha256-Y7dUt8SpI0fEmSxC0pWBL40u1rnodD7bpKjJi5Lpyps=", - "pom": "sha256-PNpCXKfxGpP1wEL2Y3araUAi8orbRfPTXpXhFev9xmk=" - }, - "com/google/api/grpc#gapic-google-cloud-storage-v2/2.58.0": { - "jar": "sha256-8WWx2Y1MM33I2xmy6HV7a5dbMEWAT2woV1SpQ8WEO84=", - "pom": "sha256-B3uoEW906kuQWODLGpySHaBA0ozZN787W3HtGjw21jM=" - }, - "com/google/api/grpc#grpc-google-cloud-storage-v2/2.58.0": { - "jar": "sha256-oUakKX07kNYQW1eblhsbUIZW99cl8aKIpHqqjc30aRg=", - "pom": "sha256-khpimH2+sCRpKlP1M+ATkWG6mnGy1nUtul2CELdRG3c=" - }, - "com/google/api/grpc#proto-google-cloud-batch-v1/0.75.0": { - "jar": "sha256-uNKBZNnvmbh4UpqIpxjGaTU98fBUYcIJJ1Z3qeQMg0g=", - "pom": "sha256-2O0e8ql0uAE3ooDY2/lbGZFLeV896jjiB82vH5KaGlo=" - }, - "com/google/api/grpc#proto-google-cloud-batch-v1alpha/0.75.0": { - "jar": "sha256-7Pb382nt5TdyK6Q1MaJySdpf7wY27HTT0JD4QTHZPZU=", - "pom": "sha256-GDr4lpxovQGSmc5yUcHfuXab21eDdq4ObDLmRCoiTFw=" - }, - "com/google/api/grpc#proto-google-cloud-logging-v2/0.112.5": { - "jar": "sha256-Y1PxRY0KjsCdRv39Se0/Tc0BbkQWL/d9OzI5T0XUAME=", - "pom": "sha256-0LXn+fzUIewgD+F+oeQCT2W4JEJ7hV+jn0uTnszXCtQ=" - }, - "com/google/api/grpc#proto-google-cloud-monitoring-v3/3.52.0": { - "jar": "sha256-gjizIWqln/7tmhV4M9f8yESn3J8QGyPXKPHN7GxcO6I=", - "pom": "sha256-1IuoWjwn4EUdcMNFdUnmGS/UxD2m62KYVQ6ipcmfmRY=" - }, - "com/google/api/grpc#proto-google-cloud-storage-v2/2.58.0": { - "jar": "sha256-hw+13Wytc4kyiEEehgKTc2leDVOOTLx7PqaZk9mlKNI=", - "pom": "sha256-u5AU6JMl7UpX9L11TTUCkhhDm26JIcQY/+b86JpzT4E=" - }, - "com/google/api/grpc#proto-google-common-protos/2.61.2": { - "jar": "sha256-Of1oI/OfoHBbhZljT1/xVio9Trbra1O47+CFY0/O+R8=", - "pom": "sha256-a/bfoVXmGBAKiPTAEyRTMfrXHK0xc3N+/do/ve4rx/k=" - }, - "com/google/api/grpc#proto-google-iam-v1/1.56.2": { - "jar": "sha256-X8aK7KsLipKeiQ+rFWOjEmDYOKlgZBv92ib9okADCOw=", - "pom": "sha256-LOSHcHXWaOr9KEWIL+b1e7w+kS0o0EDbXLuHLYTpuCI=" - }, - "com/google/apis#google-api-services-storage/v1-rev20250815-2.0.0": { - "jar": "sha256-InicqzL3XvCAhRyUH8piRplYPOBpm9aaX9R2Q0GAoXg=", - "pom": "sha256-B22Ub39nC0F0VGIZmpvnB1wg1AqpSnz9wOzoN30GTeI=" - }, - "com/google/area120#google-area120-tables-bom/0.55.0": { - "pom": "sha256-ZFx6lsUt90GXVsDCv3EMJznaLEmWPqmamqMCL7eM7gc=" - }, - "com/google/auth#google-auth-library-bom/1.27.0": { - "pom": "sha256-bddFraNsxQUktQiEGekVGDFBfFD4EIdSJzLka8im+F8=" - }, - "com/google/auth#google-auth-library-bom/1.30.0": { - "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY=" - }, - "com/google/auth#google-auth-library-bom/1.39.1": { - "pom": "sha256-vsMEedqwOZl1J8GsIR3/3EH8iKwvMfE9WEh6+8MwcWE=" - }, - "com/google/auth#google-auth-library-credentials/1.39.1": { - "jar": "sha256-Wpm1xu+XdeLo5BwSQVmlJ7L6tDYUzYb20CH4q48NvFQ=", - "pom": "sha256-KupaibN93YN1GuQk8+iJc6gg8TFRbosjD+arlbpy0CY=" - }, - "com/google/auth#google-auth-library-oauth2-http/1.39.1": { - "jar": "sha256-mJBS2I+IEE5jO/5+FD0D01zqc5tVa5TqM6OR4S+Sf8o=", - "pom": "sha256-+Riak26k0iHVzEZqy0+dsFhyaxTGG5QDGf0OUZ7RCsg=" - }, - "com/google/auth#google-auth-library-parent/1.39.1": { - "pom": "sha256-6LSmQYfU755LRszspO1R5pjbxQiFhxVuLEGrSJDC9MA=" - }, - "com/google/auto/value#auto-value-annotations/1.11.0": { - "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=", - "pom": "sha256-KuwW406j4BFiGgMi9PNvj5v5iLtURitVcJduieoHsSI=" - }, - "com/google/auto/value#auto-value-parent/1.11.0": { - "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0=" - }, - "com/google/cloud#first-party-dependencies/3.36.1": { - "pom": "sha256-U7mHPDg4NPvgRZope9evK7lQ0voUiny3mYciyLHvvec=" - }, - "com/google/cloud#first-party-dependencies/3.52.2": { - "pom": "sha256-8k78G6RoVd0Z5wpzvmhi+IANBC3Gd+r3L317bi0g2to=" - }, - "com/google/cloud#gapic-libraries-bom/1.45.0": { - "pom": "sha256-Am+i8fqvzVf/tXujiZSemz6jPWs8mxXgaPU58zyBnXk=" - }, - "com/google/cloud#google-cloud-accessapproval-bom/2.52.0": { - "pom": "sha256-Iz8bgodBWPRWj/VBr3hvyFS69UPEI+4wVJONtGMBILk=" - }, - "com/google/cloud#google-cloud-advisorynotifications-bom/0.40.0": { - "pom": "sha256-BO8ci00MgOaBoUU9aTncbBIiWNdH8TQKrO/IxzaJjxE=" - }, - "com/google/cloud#google-cloud-aiplatform-bom/3.52.0": { - "pom": "sha256-RGYt8UhafWvi4rJuPwUewyKwoqBII/4AHPlgokBuuzM=" - }, - "com/google/cloud#google-cloud-alloydb-bom/0.40.0": { - "pom": "sha256-qmCEBrbVqJuqQQxKUu5e6HPV4CBEhCqzcjTZzXxpAhM=" - }, - "com/google/cloud#google-cloud-alloydb-connectors-bom/0.29.0": { - "pom": "sha256-zT1gnPtZNQiTWhqgBsXpIMNgwXTGAqZk6DxnZalDWzg=" - }, - "com/google/cloud#google-cloud-analyticshub-bom/0.48.0": { - "pom": "sha256-7skdte7HCIC+P8pDqpteBqVl535DZ4lyPHQJ7H3HPVk=" - }, - "com/google/cloud#google-cloud-api-gateway-bom/2.51.0": { - "pom": "sha256-S6Qq+WjYq7049HwIP9ptcM0ipWIpYf/GjI/+IbM7MCQ=" - }, - "com/google/cloud#google-cloud-apigee-connect-bom/2.51.0": { - "pom": "sha256-AoNqN3Yj9mn6zhXDDHw1tFq/1AjazbiPsDtRK2E6TD4=" - }, - "com/google/cloud#google-cloud-apigee-registry-bom/0.51.0": { - "pom": "sha256-9CUplTFHH2/YqTVTCr4ybZGlG6+JGSk+ifCH42SXFi4=" - }, - "com/google/cloud#google-cloud-apihub-bom/0.4.0": { - "pom": "sha256-XyXGffmnrQIoB3fM2jaNkOylj+bx72/v1vBgyZv4858=" - }, - "com/google/cloud#google-cloud-apikeys-bom/0.49.0": { - "pom": "sha256-3nEwPEKmo5iJoqGOrOi1OGva47z06jnkBlsZyPPuDgI=" - }, - "com/google/cloud#google-cloud-appengine-admin-bom/0.2.0": { - "pom": "sha256-oQA3WIod2WR3WITIOmgYjMBx5Dyri+pXioPIyZBDpIc=" - }, - "com/google/cloud#google-cloud-apphub-bom/0.15.0": { - "pom": "sha256-XgGnZxln201fL7BKBoDL9O0sIWApcVfNlrQNhNd9FFI=" - }, - "com/google/cloud#google-cloud-artifact-registry-bom/1.50.0": { - "pom": "sha256-4lVOfHbkDf9TM3/oVgFW3Hl7m7GYF7NyBOYy8+4Cjpw=" - }, - "com/google/cloud#google-cloud-asset-bom/3.55.0": { - "pom": "sha256-a7fWqIKXFIiuKV6/FYGJDZVhaWkRmDqlmudd/0CNOEU=" - }, - "com/google/cloud#google-cloud-assured-workloads-bom/2.51.0": { - "pom": "sha256-vWZE25krKKRPcYlRI5N07vrhydsQjtE9ISHmXVQNc4M=" - }, - "com/google/cloud#google-cloud-automl-bom/2.51.0": { - "pom": "sha256-1P7d2l6Ai6/WFxQRDzHIvK9KEeWc549hiVWHA1lZuWk=" - }, - "com/google/cloud#google-cloud-backupdr-bom/0.10.0": { - "pom": "sha256-HZPFw1O1jWAQaoV0GjIFAs4GLlsEn+65zjr4uTBCW2M=" - }, - "com/google/cloud#google-cloud-bare-metal-solution-bom/0.51.0": { - "pom": "sha256-3ykJCSGWZSYIqjV2vCbYUrb3QvyXmJ9D1KREdX488zE=" - }, - "com/google/cloud#google-cloud-batch-bom/0.51.0": { - "pom": "sha256-iz7OT/E5WkZoyxJhW4mJzbMNTz8Y1kfNFtuOix5IRfY=" - }, - "com/google/cloud#google-cloud-batch/0.75.0": { - "jar": "sha256-z0JQDVSQaCau+yynwbGk9KyPe0YfcuyJoPp3B4sbtNU=", - "pom": "sha256-9ETg8kQ6AnhGKdQMGz5kgf+BSruXwFw8GAkvIG1rypE=" - }, - "com/google/cloud#google-cloud-beyondcorp-appconnections-bom/0.49.0": { - "pom": "sha256-WlEAyhaAlzbawBsPzn+iBj8GN57euVfCKM6pdcvlAk4=" - }, - "com/google/cloud#google-cloud-beyondcorp-appconnectors-bom/0.49.0": { - "pom": "sha256-c+RB+JfX7F7+q0SkuulhbCCVuLJoXuvcWTXF0oB7zSM=" - }, - "com/google/cloud#google-cloud-beyondcorp-appgateways-bom/0.49.0": { - "pom": "sha256-yhJeJ8jdNFD3+fP45jh8X6QRDGaMM/t0yLSq2O9bgPE=" - }, - "com/google/cloud#google-cloud-beyondcorp-clientconnectorservices-bom/0.49.0": { - "pom": "sha256-82jaJ7KAux0it+cxRn0ZDBCVSHbTqNYT3lh/+0Ti2MQ=" - }, - "com/google/cloud#google-cloud-beyondcorp-clientgateways-bom/0.49.0": { - "pom": "sha256-HtEdPuXeRiBs/seXIGutDgl6+2W6DMMwNqt8h/Rww/8=" - }, - "com/google/cloud#google-cloud-biglake-bom/0.39.0": { - "pom": "sha256-qnCiyinKU8x8+vtwVk1kINhCbdCTJAza/6GYSn3DI4s=" - }, - "com/google/cloud#google-cloud-bigquery-data-exchange-bom/2.46.0": { - "pom": "sha256-wFP2McKJmwbVD13vyUopVOBNolptRScZwjCALaYHWKg=" - }, - "com/google/cloud#google-cloud-bigqueryconnection-bom/2.53.0": { - "pom": "sha256-TgpvPFJvGluM9zlXBFTeLo6UfyNM2bP1X+6rzths9hI=" - }, - "com/google/cloud#google-cloud-bigquerydatapolicy-bom/0.48.0": { - "pom": "sha256-bctTvJw8gLEA8Y4cbFRAvlemWN8PbLQzAxIQzeFybW4=" - }, - "com/google/cloud#google-cloud-bigquerydatatransfer-bom/2.51.0": { - "pom": "sha256-DbwFEbJMCF3oJeBdjcUpCmAP7DNELjg/hyFSDYt8SFg=" - }, - "com/google/cloud#google-cloud-bigquerymigration-bom/0.54.0": { - "pom": "sha256-HDIr4lqjLlOPN3bt45R/6juKQIg4f4ULZ3zLUVeimYg=" - }, - "com/google/cloud#google-cloud-bigqueryreservation-bom/2.52.0": { - "pom": "sha256-/7csBvQsV2EiDxXuQ+T1mUOsTN4sOwfKAy9Wj8v2eO8=" - }, - "com/google/cloud#google-cloud-bigquerystorage-bom/3.9.2": { - "pom": "sha256-oZYenSDgAsQ1G1GrgSKL3u7J1sOMUif6CCg956DJ09c=" - }, - "com/google/cloud#google-cloud-bigtable-bom/2.44.1": { - "pom": "sha256-Z5O6Lc9x1q4uY2TX1PQIOwKOSHDbFpqyIv0w33BI3Bo=" - }, - "com/google/cloud#google-cloud-billing-bom/2.51.0": { - "pom": "sha256-uRzOQTr/5QDE/vo0uaB627QVxSsSM35QCE0nlB9ILIw=" - }, - "com/google/cloud#google-cloud-billingbudgets-bom/2.51.0": { - "pom": "sha256-SmN88r7bWqDNM5CcrF5d11iZoBJzDrE1tNmsEdUj2qc=" - }, - "com/google/cloud#google-cloud-binary-authorization-bom/1.50.0": { - "pom": "sha256-7fLxMCWaSH0aLbKYNRA8ci3hgp3AjXwzPIKzB5fmiYg=" - }, - "com/google/cloud#google-cloud-bom/0.229.0": { - "pom": "sha256-EN9GaNy6nLhcwF6FblvbCgyHWfktIzgFxBV6IFYpPm4=" - }, - "com/google/cloud#google-cloud-build-bom/3.53.0": { - "pom": "sha256-8+eXL6u6bhEyyUg7OKArPNJibMFSm5/HisYtBfdcnyg=" - }, - "com/google/cloud#google-cloud-certificate-manager-bom/0.54.0": { - "pom": "sha256-qT5JxDlBlaZtJYx9/NgRfAzmeZVSRm6vtJiW7TiTRa8=" - }, - "com/google/cloud#google-cloud-channel-bom/3.55.0": { - "pom": "sha256-mk5Wwt61XgJC1KIMiPEuh+anDkC4DU8chqyscbEIAF4=" - }, - "com/google/cloud#google-cloud-chat-bom/0.15.0": { - "pom": "sha256-qj6J1LbN9mNDf6gOoX3E4XCUYmLzRTeCTEPOIS66SPg=" - }, - "com/google/cloud#google-cloud-cloudcommerceconsumerprocurement-bom/0.49.0": { - "pom": "sha256-bjEjGIXtGu53xsDuWo7sSZQY1QB+3CFpZw1SKtMUexM=" - }, - "com/google/cloud#google-cloud-cloudcontrolspartner-bom/0.15.0": { - "pom": "sha256-H9IroQ7gh4CXlZ4PGS5mioccmt0kR6GeepEuwXgQujU=" - }, - "com/google/cloud#google-cloud-cloudquotas-bom/0.19.0": { - "pom": "sha256-3A0u013NLkkCRoGV/bdBtY+QdYm4X4mWq0ZxJ+NrYGc=" - }, - "com/google/cloud#google-cloud-cloudsupport-bom/0.35.0": { - "pom": "sha256-yI0jr+OV9aiW9ZQFVmZ/1Lb3u33ns2Nr6H0bGTqGl/A=" - }, - "com/google/cloud#google-cloud-compute-bom/1.61.0": { - "pom": "sha256-9KfYcSyMN2wKGpwIXsojb7qHtzxVOjHrV85xh5q4vT4=" - }, - "com/google/cloud#google-cloud-confidentialcomputing-bom/0.37.0": { - "pom": "sha256-Pj6kDU/WptwIdRsdaBt+mqXqFwS+oUtMmUEkpMguDLo=" - }, - "com/google/cloud#google-cloud-connectgateway-bom/0.3.0": { - "pom": "sha256-izIPTbj020tPJtsEzDM8RX8yi2UMcdvXubDfCyZR/QQ=" - }, - "com/google/cloud#google-cloud-contact-center-insights-bom/2.51.0": { - "pom": "sha256-Pq1o1Vgi8XjZXO5/LiRX3a6/VGkyzMGfmHoEXSFYPoE=" - }, - "com/google/cloud#google-cloud-container-bom/2.54.0": { - "pom": "sha256-3R5CpX/nAak1XAh451WYsAk7J5PfSY1DfV6m6LYZY0o=" - }, - "com/google/cloud#google-cloud-containeranalysis-bom/2.52.0": { - "pom": "sha256-G6pJ6hAvsLQsXPCbmbs7d4PscpfN2TNvlunY7D9cEWw=" - }, - "com/google/cloud#google-cloud-contentwarehouse-bom/0.47.0": { - "pom": "sha256-veLGCxYuwdNSz9GF40eIKYdEGUUZobdDDpZeyeTXSKE=" - }, - "com/google/cloud#google-cloud-core-bom/2.44.1": { - "pom": "sha256-xwDG9ZxKWYj9E3qy4CNDcsxK6ufU0kxAVw8c/4mBw8s=" - }, - "com/google/cloud#google-cloud-core-bom/2.60.2": { - "pom": "sha256-rjdzsFG9muswE75iM9xh9opFiWhjdh+Ik/dKCW66Qu4=" - }, - "com/google/cloud#google-cloud-core-grpc/2.60.2": { - "jar": "sha256-aJlOC2lGi2AaIbHbtHilhDQWxmxshFvC7bqpEy6zQrQ=", - "pom": "sha256-llMQLS9Z56Et0nKb+vOnUrkKisjK3e5uSb8BR4qsKs8=" - }, - "com/google/cloud#google-cloud-core-http/2.60.2": { - "jar": "sha256-RADmOQjlA2E7ubI0s+hUWsJSyx5hussNFqZ/mN+SgwA=", - "pom": "sha256-e1wBt6oOUgPBVWEAOrqEYBmiaF2WmaL4r1UwLXxkbK8=" - }, - "com/google/cloud#google-cloud-core-parent/2.60.2": { - "pom": "sha256-4dFYw2CKCjeiQJ9YONXhfSvpCuao77ipua9oNSFvlB4=" - }, - "com/google/cloud#google-cloud-core/2.60.2": { - "jar": "sha256-fCxtPGdxdGl4tlfvJreMGEqQeqBorbtannlT5qMs1Ak=", - "pom": "sha256-nM1J8IBkgWNwi3KLR6a87h/NUbfTRZmCvg+6mqivvac=" - }, - "com/google/cloud#google-cloud-data-fusion-bom/1.51.0": { - "pom": "sha256-39TppUS262mFEQ3JGYPgDt3TCRMMc3IjaIPe69EwUBQ=" - }, - "com/google/cloud#google-cloud-datacatalog-bom/1.57.0": { - "pom": "sha256-hQdhVv+g6CpwdsmSKzrAHod2zebqeCfvLyVQ/6T2eJI=" - }, - "com/google/cloud#google-cloud-dataflow-bom/0.55.0": { - "pom": "sha256-q+3ElvQg2SNcwVuzbHFozvNTPaRzs32U3Vjriu03Luw=" - }, - "com/google/cloud#google-cloud-dataform-bom/0.50.0": { - "pom": "sha256-hduSAw5WYHuBDcR0SXc+EGX6qp3EF5Ru/Hhoh4dhayw=" - }, - "com/google/cloud#google-cloud-datalabeling-bom/0.171.0": { - "pom": "sha256-ROcrtqS33r0fmsMBDZNCjdcmgYD3RLdMHMIdXLp/hOU=" - }, - "com/google/cloud#google-cloud-datalineage-bom/0.43.0": { - "pom": "sha256-hQXhbB8gYZz82JjtOsOtvqSq6vBY9FcsD7pmkxtQXY0=" - }, - "com/google/cloud#google-cloud-dataplex-bom/1.49.0": { - "pom": "sha256-o1N4MeE9X7LXVgbFEoF+4dIkO6h+326fvX9RblvrCJs=" - }, - "com/google/cloud#google-cloud-dataproc-bom/4.48.0": { - "pom": "sha256-hNqdy1uk4RvxLRk6rVGTqKjhiazaPcdnLkkJz2q4tT0=" - }, - "com/google/cloud#google-cloud-dataproc-metastore-bom/2.52.0": { - "pom": "sha256-fSB2PJKhavp1cQBJDBud27/9iE5q9D+ge0fdFnXTFfg=" - }, - "com/google/cloud#google-cloud-datastore-bom/2.22.0": { - "pom": "sha256-7WeUuhatgie5MAwDxCYPNBLVT30yxEe1DfUfKDIuZgc=" - }, - "com/google/cloud#google-cloud-datastream-bom/1.50.0": { - "pom": "sha256-/3qYwfkLgAOTFX1YgVvCf9AHQrI0PJtNYJKDTNL5WuA=" - }, - "com/google/cloud#google-cloud-debugger-client-bom/1.51.0": { - "pom": "sha256-/mtoBDuWT3/UQ2Fr9nCfJdmW9x8MQ/3c2i/cxwvtBPY=" - }, - "com/google/cloud#google-cloud-deploy-bom/1.49.0": { - "pom": "sha256-f+mBZv84beZkHgRCDFDx2Qq6rOU0M7uuea4AIcYbR14=" - }, - "com/google/cloud#google-cloud-developerconnect-bom/0.8.0": { - "pom": "sha256-MPivuTFKQS/FeAfU2vjnfo2s2sqHKOtfvs6TfKcN7+0=" - }, - "com/google/cloud#google-cloud-dialogflow-bom/4.57.0": { - "pom": "sha256-yWD0unkPtTaVMMU89+mROdxSYaD1iGA4Q/t5FrtszCE=" - }, - "com/google/cloud#google-cloud-dialogflow-cx-bom/0.62.0": { - "pom": "sha256-PkSlVXON9wT4xa9Amg+WRK2qITpjD47bcLs30hXPDL0=" - }, - "com/google/cloud#google-cloud-discoveryengine-bom/0.47.0": { - "pom": "sha256-kY++GAMwfgbbyKsg+kTByUEohi9ztEjr72CWdhXdyU8=" - }, - "com/google/cloud#google-cloud-distributedcloudedge-bom/0.48.0": { - "pom": "sha256-GiThTUDOxsuV+fyMdSswCZKVGQ2CoWgGK0mSjp4Uffo=" - }, - "com/google/cloud#google-cloud-dlp-bom/3.55.0": { - "pom": "sha256-Cgt3EuqSdaLV2eygwdvxcDUqFl42z5smFNXhzQV+70o=" - }, - "com/google/cloud#google-cloud-dms-bom/2.50.0": { - "pom": "sha256-v9Qs3I+fYHVhSCNmvdXW3MDh8NSX/jRxxdrSDX3avUM=" - }, - "com/google/cloud#google-cloud-document-ai-bom/2.55.0": { - "pom": "sha256-eiCgUKysZCz2i6zkYdmUZuNJrshDYFb2KU4lqUqYRcE=" - }, - "com/google/cloud#google-cloud-domains-bom/1.48.0": { - "pom": "sha256-mAC6F9nWcS7ij2Ls3rEufOM6dlIvg4cfa/RixJ6GPrU=" - }, - "com/google/cloud#google-cloud-edgenetwork-bom/0.19.0": { - "pom": "sha256-sqKNpPZJaYH/lq+GmTRvDhJzSegO4x8az0BXh0J5YwY=" - }, - "com/google/cloud#google-cloud-enterpriseknowledgegraph-bom/0.47.0": { - "pom": "sha256-BCvMvpcPOAdmcX30cHOL8b4uOU7idppEOrBy91T+nkk=" - }, - "com/google/cloud#google-cloud-errorreporting-bom/0.172.0-beta": { - "pom": "sha256-T2zAorqVI7jkeg+GK/5Q9F7J3Cnsv1bTIdCzkrmeQPI=" - }, - "com/google/cloud#google-cloud-essential-contacts-bom/2.51.0": { - "pom": "sha256-2AxitbQrI+Y7q5DE4HM1/hv215eekuK3AbYXaksz4v4=" - }, - "com/google/cloud#google-cloud-eventarc-bom/1.51.0": { - "pom": "sha256-IdtQiZdfvcRMFrzuZf5+xpHA7q5R0iBiEqmz1vQ9sKM=" - }, - "com/google/cloud#google-cloud-eventarc-publishing-bom/0.51.0": { - "pom": "sha256-kmjR/niC6xa5bgewOwi8VCZiASn9U/2/Sg32qbhahaQ=" - }, - "com/google/cloud#google-cloud-filestore-bom/1.52.0": { - "pom": "sha256-EyhbvoBwe1PemHmowTDVUYjNgWPMYVwihtriXfP1Pjk=" - }, - "com/google/cloud#google-cloud-firestore-bom/3.26.5": { - "pom": "sha256-ueMQtaFlxQqBi+Yz9B4G+1aB9zBbogFQ67UIuQzrLnw=" - }, - "com/google/cloud#google-cloud-functions-bom/2.53.0": { - "pom": "sha256-O/CVHCNQ0g9ct8q582VvfA2DR9FVl7xLjTaeeq63kWw=" - }, - "com/google/cloud#google-cloud-gdchardwaremanagement-bom/0.6.0": { - "pom": "sha256-5XCIpC8yeaEq8BCDoSCwyx4RnS4fviOCILImZU8qBHQ=" - }, - "com/google/cloud#google-cloud-gke-backup-bom/0.50.0": { - "pom": "sha256-cfJLQz+7fqXGvO1jjI9JwudmWWP6GTvd8cGLoFydMK8=" - }, - "com/google/cloud#google-cloud-gke-connect-gateway-bom/0.52.0": { - "pom": "sha256-R7P0Vr0Guy2G5GdlpigyzqTiBTedjjunr5RyScSHIDs=" - }, - "com/google/cloud#google-cloud-gke-multi-cloud-bom/0.50.0": { - "pom": "sha256-c/ycuoGSopEjn7xxHqY5hScF77E4TDfhBDl3Q5olris=" - }, - "com/google/cloud#google-cloud-gkehub-bom/1.51.0": { - "pom": "sha256-jVYLK7J970WVY3iTyzpPwo8CwY0G3gbp7QaAMkE1wt4=" - }, - "com/google/cloud#google-cloud-gsuite-addons-bom/2.51.0": { - "pom": "sha256-POPvFUQ2nCE7cji8r44+Llo5YT1Ini4J3zmeA/ZFKzA=" - }, - "com/google/cloud#google-cloud-iamcredentials-bom/2.51.0": { - "pom": "sha256-E+gUc0H64TFowZQpGIA0Or8sncATdZW3vx46n0a23Cw=" - }, - "com/google/cloud#google-cloud-iap-bom/0.7.0": { - "pom": "sha256-BSK9Zoqw20I21PyKOxYR8Dq/9MfAkN1dFlJB9nPn0/k=" - }, - "com/google/cloud#google-cloud-ids-bom/1.50.0": { - "pom": "sha256-zzxmL1wi8KhK+70CouIv/McEEreZfq7ujR/0ATNHnOY=" - }, - "com/google/cloud#google-cloud-infra-manager-bom/0.28.0": { - "pom": "sha256-i8qMac0aTc58jd4TQZ/xb0cs1OiyEXa1+HxBd28IXVQ=" - }, - "com/google/cloud#google-cloud-iot-bom/2.51.0": { - "pom": "sha256-6T8JRjYEuYOzhaBR7WIQ4+dEWPnYF34GKwVe57uGJbs=" - }, - "com/google/cloud#google-cloud-kms-bom/2.54.0": { - "pom": "sha256-VESl5E/4J6XoRkmKCJ5Az0NLevq5rUIjx/SBEcJFckM=" - }, - "com/google/cloud#google-cloud-kmsinventory-bom/0.40.0": { - "pom": "sha256-tcpgRot2CsZKO9hBPPTjUqkRSjEe4rf9ItdPD9CO8Xg=" - }, - "com/google/cloud#google-cloud-language-bom/2.52.0": { - "pom": "sha256-YmFGw1yj63C39RVlcm+THRd1VczxeLDuJXUtkY+B83U=" - }, - "com/google/cloud#google-cloud-life-sciences-bom/0.53.0": { - "pom": "sha256-UJZvLqAuHO6v6B6Y3Pdsr9qzEnvP6TntAtVTz9/5VRU=" - }, - "com/google/cloud#google-cloud-live-stream-bom/0.53.0": { - "pom": "sha256-fBR3DHbfc5KO9qQL4Jz1N/ik18UyoBRQ1TyocNLvNRE=" - }, - "com/google/cloud#google-cloud-logging-bom/3.20.3": { - "pom": "sha256-PcmTjIU7s+0HkKHuNLxyRIzY0C4eeeiimiNruLkfqpU=" - }, - "com/google/cloud#google-cloud-logging/3.23.5": { - "jar": "sha256-u9s+tluPkw2FF0jmlP9fKTzK/J0kBK97XYm2KJtNJ2Q=", - "pom": "sha256-2TktJofiKcNw+cT4b69ijKGR2HqVlWH98pa6cV0Gbvw=" - }, - "com/google/cloud#google-cloud-managed-identities-bom/1.49.0": { - "pom": "sha256-CMRPCoEjfw/xWv/CJQGPuT1sOtJ7wYFUf5X+320RU94=" - }, - "com/google/cloud#google-cloud-managedkafka-bom/0.7.0": { - "pom": "sha256-dt6RbFy0m86/Qk0YJbY1HCL4BnSzTYyztNA4BR8dV10=" - }, - "com/google/cloud#google-cloud-mediatranslation-bom/0.57.0": { - "pom": "sha256-fb4kojKIztb6aUChzVV9guJOiZTYArQ27Iyveu03vcs=" - }, - "com/google/cloud#google-cloud-meet-bom/0.18.0": { - "pom": "sha256-y/+oSfCHxdwWQVERSxohG870ChXTAWsx2Yr3j6Q8l74=" - }, - "com/google/cloud#google-cloud-memcache-bom/2.51.0": { - "pom": "sha256-inDmYYNWpW0Dz+EOp+Y6RRWSCSTd9U84eELh6abmYUs=" - }, - "com/google/cloud#google-cloud-migrationcenter-bom/0.33.0": { - "pom": "sha256-Gou3xu/QM0+YSNwQ/MSLK4LSA52MLmq0kkBz7BB2FpM=" - }, - "com/google/cloud#google-cloud-monitoring-bom/3.52.0": { - "pom": "sha256-N9bYahHduGLAJaYFpyed76dO9gLMfUgJpjlThuGzAmA=" - }, - "com/google/cloud#google-cloud-monitoring-dashboard-bom/2.53.0": { - "pom": "sha256-HjopYQhheGLZR7+0VZNvIIAu9rsrWGgbr41S++H2bmw=" - }, - "com/google/cloud#google-cloud-monitoring-metricsscope-bom/0.45.0": { - "pom": "sha256-Dto1joigVlNVfK/gm/UuqZBs6gX3qt0rvkKCAOMoQQY=" - }, - "com/google/cloud#google-cloud-monitoring/3.52.0": { - "jar": "sha256-lyeqfZTY3QNr/8z5q8XRiXCx5emCeJb5kH90UO0Q9eY=", - "pom": "sha256-Rq2rnp36dCMy2uqXgJ+w+PdRo8H+YNPk+Ad3e3j9Fzg=" - }, - "com/google/cloud#google-cloud-netapp-bom/0.30.0": { - "pom": "sha256-aiyHs19PIUnsriIPeIXo2Te7Mvn32Y95/s94ncK6rgQ=" - }, - "com/google/cloud#google-cloud-network-management-bom/1.52.0": { - "pom": "sha256-GEMhZD9eEo1SKJiRNhv7izR9VcG4MEwjx03Ew5KWFSE=" - }, - "com/google/cloud#google-cloud-network-security-bom/0.54.0": { - "pom": "sha256-rOcbxu6jAKp5ZVw7hoMQrKDnLp85mPNji4F0GfmgkWE=" - }, - "com/google/cloud#google-cloud-networkconnectivity-bom/1.50.0": { - "pom": "sha256-lxVL42U1p8jGB+ZfSoiwKu9UmqPlMI8l1gslukgEcq0=" - }, - "com/google/cloud#google-cloud-networkservices-bom/0.7.0": { - "pom": "sha256-2LI1JuYRYsuwseXGzeO4o9CBP5m1nRzHo9pu5BRxx64=" - }, - "com/google/cloud#google-cloud-nio-parent/0.128.5": { - "pom": "sha256-uxQlV25OShtdE3hEGd+qctiDTtWVCB21HiW0rhPKjVY=" - }, - "com/google/cloud#google-cloud-nio/0.128.5": { - "jar": "sha256-GhmoLCl5j6Ttw5bjlA3KMZuZR6ssGMFldza4tw+2CYY=", - "pom": "sha256-iri0BnAerBs8rym1L/26mixuDP/WHtm6n7fpgivdGPI=" - }, - "com/google/cloud#google-cloud-notebooks-bom/1.49.0": { - "pom": "sha256-tUk/lXzTVuak9no9FWz2nSH/7ATkt/GG7Fbxrq6N2QY=" - }, - "com/google/cloud#google-cloud-optimization-bom/1.49.0": { - "pom": "sha256-lEkqLI6oRnA+pvsDrGAjgbOnuLXZNS6Nt4/olCCpY8A=" - }, - "com/google/cloud#google-cloud-orchestration-airflow-bom/1.51.0": { - "pom": "sha256-XQe2ddKb/rR+l366lAFKKcyQcXm5fSMgCh1M4bbL6+I=" - }, - "com/google/cloud#google-cloud-orgpolicy-bom/2.51.0": { - "pom": "sha256-RtmA+XYlMNe7OFQRaRLTqKRfMcH2y/W4f1V2XLZ8ssU=" - }, - "com/google/cloud#google-cloud-os-config-bom/2.53.0": { - "pom": "sha256-3sP33AhcqtYwaBUFFfvgo3ul3PPCujjuW7kKHE16msw=" - }, - "com/google/cloud#google-cloud-os-login-bom/2.50.0": { - "pom": "sha256-SXV4LPmo51NxM+wCdzMupPIEZQch10aQNmzN60Qq0sc=" - }, - "com/google/cloud#google-cloud-parallelstore-bom/0.14.0": { - "pom": "sha256-MfVm4FACcuAb3iZjTmnB1aUdlmp403S+ke9bqIKAeeI=" - }, - "com/google/cloud#google-cloud-phishingprotection-bom/0.82.0": { - "pom": "sha256-XaGRzaIEMqIAg6McEUUkrCXaji9qr4v4UjPo6KuwG3A=" - }, - "com/google/cloud#google-cloud-policy-troubleshooter-bom/1.50.0": { - "pom": "sha256-hAnS5HsLNnq/sYsuuSx4lOdlqWzoBNc/F8zMgrg0VEQ=" - }, - "com/google/cloud#google-cloud-policysimulator-bom/0.30.0": { - "pom": "sha256-kJrgL5iVA/wAUdls7tUTBYzI+btq60PjXe+KEO23MwQ=" - }, - "com/google/cloud#google-cloud-pom-parent/1.45.0": { - "pom": "sha256-Ts1oA6Llpnvq4MO2zSHDRS7vIObJf9/Ax5xS+qVXONA=" - }, - "com/google/cloud#google-cloud-private-catalog-bom/0.53.0": { - "pom": "sha256-D/9WjWESDmTC1B9fBQjdcE7yNgdyfeplWNwSqGmckZQ=" - }, - "com/google/cloud#google-cloud-privilegedaccessmanager-bom/0.5.0": { - "pom": "sha256-K/d90L5yAi9DyHsEMv81/5P8RDWf4Ob3LtX7+g+0e3g=" - }, - "com/google/cloud#google-cloud-profiler-bom/2.51.0": { - "pom": "sha256-k0yhSixT1uQVEqibjz3A6ISjYnlSWLNJLmuxROe1RSQ=" - }, - "com/google/cloud#google-cloud-publicca-bom/0.48.0": { - "pom": "sha256-ou4gqXgSH3FVq3q135L77NKzXnHFRuXw8GfJuV23VI0=" - }, - "com/google/cloud#google-cloud-pubsub-bom/1.133.0": { - "pom": "sha256-1LI1ysloTkGaLCKkTZ9pni8CY5BnTpJg+2PFluOjb24=" - }, - "com/google/cloud#google-cloud-pubsublite-bom/1.14.3": { - "pom": "sha256-KahxD/HN+HTAUr8tgSGVfsvVN8CdDby0iPzRYWZY9c8=" - }, - "com/google/cloud#google-cloud-rapidmigrationassessment-bom/0.34.0": { - "pom": "sha256-teD6wnn01LtfPPIb0h1BNtzZw1B72SlyklKEpjQOkvQ=" - }, - "com/google/cloud#google-cloud-recaptchaenterprise-bom/3.48.0": { - "pom": "sha256-VcNOo0JUzYJ7SrOPCaZc6IPLzIjsIq+8wKhGA4WvAto=" - }, - "com/google/cloud#google-cloud-recommendations-ai-bom/0.58.0": { - "pom": "sha256-dBcbE3mUIaYrJ2/FJngh1Hy07Sa/5LeNDQiTBkExJ30=" - }, - "com/google/cloud#google-cloud-recommender-bom/2.53.0": { - "pom": "sha256-Nz3H9Rad5PqJXYvOUjiLvXIKE9Bn/oxqYMKRehBpafA=" - }, - "com/google/cloud#google-cloud-redis-bom/2.54.0": { - "pom": "sha256-uEs9tgZsoVfV+N7F6iziKWaPjPIpcF0kt1uPSbzUV6M=" - }, - "com/google/cloud#google-cloud-redis-cluster-bom/0.23.0": { - "pom": "sha256-nkVHcNZZEfAuOOdOurdXOvhddqlgDwCKFEz2KBnT4qU=" - }, - "com/google/cloud#google-cloud-resource-settings-bom/1.51.0": { - "pom": "sha256-2NR5iakHChyjRJ7JGKV4Yvxm8xYRGR/XCG0jpCM5zD0=" - }, - "com/google/cloud#google-cloud-resourcemanager-bom/1.53.0": { - "pom": "sha256-wRm3UC30Jq+6XFJ0H3atIjtidMoZg5ofOjREnG9JPDA=" - }, - "com/google/cloud#google-cloud-retail-bom/2.53.0": { - "pom": "sha256-4Uv0Etw3JLfkFLC5qt1OMxKfyRAATq8wQZ3mg6TGhTs=" - }, - "com/google/cloud#google-cloud-run-bom/0.51.0": { - "pom": "sha256-7UkdabRo1m10h8/kEVvsUtJSXZVWj9uucirQ1c9IVuA=" - }, - "com/google/cloud#google-cloud-scheduler-bom/2.51.0": { - "pom": "sha256-TQTrw1ZM8F84WP5ojV7WND77ellD11l1z8wEgk7UccY=" - }, - "com/google/cloud#google-cloud-secretmanager-bom/2.51.0": { - "pom": "sha256-2K0OfrvTPMO/VP3DtQlAXITSSDO6v/vd1SA5Attsn38=" - }, - "com/google/cloud#google-cloud-securesourcemanager-bom/0.21.0": { - "pom": "sha256-zYD/fg8VkWhne2unckPROFKqApEMPa5uUVsP7xuwWE4=" - }, - "com/google/cloud#google-cloud-security-private-ca-bom/2.53.0": { - "pom": "sha256-04r0UGW8D04aGUNDr7Cy2TTLP2fXUgXZllQ2MKZf948=" - }, - "com/google/cloud#google-cloud-securitycenter-bom/2.59.0": { - "pom": "sha256-mDFdBDT8mqyAqJ4zd1YMBpfddF0Kc3JCbBN3n2W7Nkw=" - }, - "com/google/cloud#google-cloud-securitycenter-settings-bom/0.54.0": { - "pom": "sha256-qbv7qJh5sjJObF12g843OTaohaUIJdhJUZxLxr0rqKc=" - }, - "com/google/cloud#google-cloud-securitycentermanagement-bom/0.19.0": { - "pom": "sha256-66w7rhbOkL8nulTt7AALOXMsnFuOOdJ1CFv8NkUl++Q=" - }, - "com/google/cloud#google-cloud-securityposture-bom/0.16.0": { - "pom": "sha256-PYH19y78NuQ4xuR+1NCdzLiMHg06ryuMsyVqbhO9ogQ=" - }, - "com/google/cloud#google-cloud-service-control-bom/1.51.0": { - "pom": "sha256-13qb2CVfeg8Vk2zQd+/CrzHOLIEEUcOH1yIgzq5z9iI=" - }, - "com/google/cloud#google-cloud-service-management-bom/3.49.0": { - "pom": "sha256-eyEZBnZS8Q4otW2LFZdfZMmOmDHUcb3J0FRHuYksK5g=" - }, - "com/google/cloud#google-cloud-service-usage-bom/2.51.0": { - "pom": "sha256-aDS28cLTlxhW6ng0zoSINU7UzMgeJAJ3qqb0e8TRSCI=" - }, - "com/google/cloud#google-cloud-servicedirectory-bom/2.52.0": { - "pom": "sha256-hyD0HnNrwcTWxAAIeSlT12bdVdiiuHWipBJDEiOz5h4=" - }, - "com/google/cloud#google-cloud-servicehealth-bom/0.18.0": { - "pom": "sha256-UCenUFoMrX4nuStWeqQvhGL8PVt0Wol4kIwnUrcq110=" - }, - "com/google/cloud#google-cloud-shared-config/1.11.2": { - "pom": "sha256-MG0tEyN3xLuJ2RmGD510ihIcIZWvnShsS1HFGq53kXc=" - }, - "com/google/cloud#google-cloud-shared-config/1.16.1": { - "pom": "sha256-MXT7SNiJF6VCBog/zIecRqBBWXJ3Zu240qdJ0SCnnuc=" - }, - "com/google/cloud#google-cloud-shared-dependencies/3.52.2": { - "pom": "sha256-FaM0uZdRhj4VhTnv8RFSuxov+V2oDXZl9ZWQHKTK5GI=" - }, - "com/google/cloud#google-cloud-shell-bom/2.50.0": { - "pom": "sha256-E7kpuJcZExzL0GPIhXUvKRzXv/JDYo0AGIp0fqzH5U8=" - }, - "com/google/cloud#google-cloud-spanner-bom/6.77.0": { - "pom": "sha256-haZFWOA0TH8ZTs7j1x1HZ6unHW9CdI6eZjljxF1/+SU=" - }, - "com/google/cloud#google-cloud-speech-bom/4.46.0": { - "pom": "sha256-Q65BcbGVKm6oP0Yyq8ruuhOdB25yl7viDrdSMAPD65k=" - }, - "com/google/cloud#google-cloud-storage-bom/2.43.1": { - "pom": "sha256-jxpIGh0pazvtPgBWZwPcplLi1CaJ0mcSiMVoYonPUy8=" - }, - "com/google/cloud#google-cloud-storage-parent/2.58.0": { - "pom": "sha256-VB2ZCP/xqMvlW9MxX79sQ7J+2weFxNiVt4tOf3L6tpQ=" - }, - "com/google/cloud#google-cloud-storage-transfer-bom/1.51.0": { - "pom": "sha256-zkWdYU7Kh5jSqUCi4xilXUmRQ6gfjrUP+nJWrJVm7Js=" - }, - "com/google/cloud#google-cloud-storage/2.58.0": { - "jar": "sha256-2yRYJ0gOPdp/8erdCkTeG/IJyXow/Vm3IjVSc22mGJA=", - "pom": "sha256-EIwQOQpTu6N4JbXi3p1yBN+rOaTkBDTSL6ablElUp/U=" - }, - "com/google/cloud#google-cloud-storageinsights-bom/0.36.0": { - "pom": "sha256-hCvCUJQpc/bG+mXcwnGxBXN1Et/EDp5X63o3VpiMQYM=" - }, - "com/google/cloud#google-cloud-talent-bom/2.52.0": { - "pom": "sha256-RRVKVoFFlt5Xs9RkO9ltTvhlN1FHwc1GMwcVLVG7okk=" - }, - "com/google/cloud#google-cloud-tasks-bom/2.51.0": { - "pom": "sha256-tMvGnqtWsp24OFM/0iimvf8KTOzLIQ0kzDzmOjDy6eg=" - }, - "com/google/cloud#google-cloud-telcoautomation-bom/0.21.0": { - "pom": "sha256-iNoPmRWHGp2uSUVDzN7amR67DyglQ4AtCGQ1Gh6HHmU=" - }, - "com/google/cloud#google-cloud-texttospeech-bom/2.52.0": { - "pom": "sha256-KBOd3+BX0y6dpmAkWmIB3HP8Sn/EvoVh9PHv9q3SnN4=" - }, - "com/google/cloud#google-cloud-tpu-bom/2.52.0": { - "pom": "sha256-PQAuQ0CpkSz6b0JdjjYGzLuRJvcGRE9NbxBnTGTbuhA=" - }, - "com/google/cloud#google-cloud-trace-bom/2.51.0": { - "pom": "sha256-A90AgW1xVto8dV5Wu45ay54EPqr/SSLeoRabiAFjNtg=" - }, - "com/google/cloud#google-cloud-translate-bom/2.51.0": { - "pom": "sha256-++A9aASk8agRSLxMwod4POElV6GLfj2aX1hm/c5NVTo=" - }, - "com/google/cloud#google-cloud-vertexai-bom/1.11.0": { - "pom": "sha256-Z4D5LNPmwLl0ympAqmu8EakCGn6rtfKosFBaDaRDVBE=" - }, - "com/google/cloud#google-cloud-video-intelligence-bom/2.50.0": { - "pom": "sha256-pTyme+Usw0nMUJn9LIRVcokRBWxN+nWRGUYubsck+3g=" - }, - "com/google/cloud#google-cloud-video-stitcher-bom/0.51.0": { - "pom": "sha256-fx1qZVF6eWYVgzkODcPjd6g/EY4TtSlY2BpMcJPMh5A=" - }, - "com/google/cloud#google-cloud-video-transcoder-bom/1.50.0": { - "pom": "sha256-6ijSQWYT2Q2be3vqX8wmBadAbEDoqbTiGrKrL94SPZA=" - }, - "com/google/cloud#google-cloud-vision-bom/3.49.0": { - "pom": "sha256-sbFMklQVOHrFo4SlWpvH3QiHXvIxekbLArr9/3pC2Gc=" - }, - "com/google/cloud#google-cloud-visionai-bom/0.8.0": { - "pom": "sha256-Xrw465S5Igyuvjw+lz+3TEIXRePmhfgSgxB0Adh3j/E=" - }, - "com/google/cloud#google-cloud-vmmigration-bom/1.51.0": { - "pom": "sha256-XuLti3/lkz8QDSQb1vbfzzULcaN9u8OXHN4zfHkGvxk=" - }, - "com/google/cloud#google-cloud-vmwareengine-bom/0.45.0": { - "pom": "sha256-aI2AVB0sjqcrVvlv7B504Y9DH0+VoQgtRyuHhZU7ZRE=" - }, - "com/google/cloud#google-cloud-vpcaccess-bom/2.52.0": { - "pom": "sha256-rBDTiHhVrmIh1Vck5unRmRcd50edzTNVQvj3af2hNpQ=" - }, - "com/google/cloud#google-cloud-webrisk-bom/2.50.0": { - "pom": "sha256-NcoNxqToYLGIjgJcd4WdgwgjgQDOlNCmryoMEriq4bs=" - }, - "com/google/cloud#google-cloud-websecurityscanner-bom/2.51.0": { - "pom": "sha256-I4ZHg96YPH2/qrvYo12dMnY6ZgFsxCPCozKdMQNxzZc=" - }, - "com/google/cloud#google-cloud-workflow-executions-bom/2.51.0": { - "pom": "sha256-pamAQsXnQEHFHiQW4ojFl9j3TntBfwgTzSIMB/5lP5w=" - }, - "com/google/cloud#google-cloud-workflows-bom/2.51.0": { - "pom": "sha256-m/49yTrnQk7aEEXU/wVsEenG1+yQ7IZQJR27aQCwk9Q=" - }, - "com/google/cloud#google-cloud-workspaceevents-bom/0.15.0": { - "pom": "sha256-P636O4WYBkZw6nK8RmzopONxlYMOAph4t1iDj8xBrwE=" - }, - "com/google/cloud#google-cloud-workstations-bom/0.39.0": { - "pom": "sha256-NA5Ia32QpMrrN+6FkMGnsW3lvUxZ3nYIcy4Hma1QkE8=" - }, - "com/google/cloud#google-iam-admin-bom/0.2.0": { - "pom": "sha256-zHdylNrsDPDA78uLGe1Ia/lieKDjhpfmizDCZshCPFI=" - }, - "com/google/cloud#google-iam-policy-bom/1.49.0": { - "pom": "sha256-43Z4KwD3KvS1wX+GyN1k0m0+YyBlnkAw9Mtov6FhCZA=" - }, - "com/google/cloud#google-identity-accesscontextmanager-bom/1.52.0": { - "pom": "sha256-4MaAX1TTJ7Zk93NIonDpQs3nNi1uQP8zv/FncQmq5gk=" - }, - "com/google/cloud#libraries-bom/26.48.0": { - "pom": "sha256-kPk5uIDS8oW6IFAX3OWesjV7MBWki0IwzG64J1zgrkE=" - }, - "com/google/cloud#native-image-shared-config/1.11.2": { - "pom": "sha256-8x6Sx5b7G4khrVukZEADTQIxynff4eeFeN3Gi9yM8HI=" - }, - "com/google/cloud#native-image-shared-config/1.15.4": { - "pom": "sha256-D0pPs9aEv607E4QRfyANkO9TkMOiX8H3JRlw4XKlsBU=" - }, - "com/google/cloud#native-image-shared-config/1.16.0": { - "pom": "sha256-oC9dmGuHE9zoAhed38jE3fhUhpEs2ygKmLKmB0KEbiY=" - }, - "com/google/cloud#native-image-shared-config/1.16.1": { - "pom": "sha256-QN9I9Uh8R7+4ROOiTUomQTA/I45yHXU/Ag2WnyteQYc=" - }, - "com/google/cloud#sdk-platform-java-config/3.36.1": { - "pom": "sha256-SV+tM+d6F2fiWBEP/+2tXszCrCkTTl+urAcHlrS06r8=" - }, - "com/google/cloud#sdk-platform-java-config/3.52.2": { - "pom": "sha256-4PRXCq77s+vVCewmhEJStyGftQhVtVnHnvOElNCTwu4=" - }, - "com/google/cloud#third-party-dependencies/3.52.2": { - "pom": "sha256-POagE1Zm9Q2CYM/Q/xWRf1q8ye+YE0kGQ44cKEz6anw=" - }, - "com/google/cloud/opentelemetry#detector-resources-support/0.33.0": { - "jar": "sha256-lLDe8ndUCDzqpntWpNSD0pTp8XBmST3z736B7Fw7ssA=", - "module": "sha256-W/NgcxpRZENfcytG0rsOqSJAflltyrk2IIDCM8505a0=", - "pom": "sha256-e6XRs3D/GK6rCYwwlpR3RY6AIoAeTPNcfhCslx3nb9U=" - }, - "com/google/cloud/opentelemetry#exporter-metrics/0.33.0": { - "jar": "sha256-epq4doOpc1epU4n/POyWhHhWSAdvmxWNRNo77Lk7sDY=", - "module": "sha256-//u9Comol29AnTEaEQomYE0sSJZKm3Cg9fbOtIN5VI8=", - "pom": "sha256-wITQyFceLR6zG0FHp9zhAtdysbEhFclWBWiDLAKx/4Y=" - }, - "com/google/cloud/opentelemetry#shared-resourcemapping/0.33.0": { - "jar": "sha256-7qmj4R23g2JswV3Rg1we0J9TtwofyoxYv3I86BPp+EM=", - "pom": "sha256-r+/RtmgaK0H8QcGz+m9Gm8hUYFONg++kztBmHW0WzoQ=" - }, - "com/google/code/findbugs#jsr305/3.0.2": { - "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", - "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" - }, - "com/google/code/gson#gson-parent/2.12.1": { - "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E=" - }, - "com/google/code/gson#gson-parent/2.13.1": { - "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" - }, - "com/google/code/gson#gson/2.12.1": { - "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=", - "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg=" - }, - "com/google/code/gson#gson/2.13.1": { - "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", - "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" - }, - "com/google/errorprone#error_prone_annotations/2.23.0": { - "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g=" - }, - "com/google/errorprone#error_prone_annotations/2.38.0": { - "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", - "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" - }, - "com/google/errorprone#error_prone_parent/2.23.0": { - "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q=" - }, - "com/google/errorprone#error_prone_parent/2.38.0": { - "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" - }, - "com/google/guava#failureaccess/1.0.2": { - "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", - "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" - }, - "com/google/guava#guava-bom/33.3.0-jre": { - "pom": "sha256-laWAAekZ/CIA9MprzWNEMWfCodzecAguuXQvY5OBooE=" - }, - "com/google/guava#guava-bom/33.4.0-jre": { - "pom": "sha256-OuGXeIQNiENUgMjFC69z6qKi/A8hxzrgkX0A2mU8J1Y=" - }, - "com/google/guava#guava-parent/26.0-android": { - "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" - }, - "com/google/guava#guava-parent/33.0.0-jre": { - "pom": "sha256-BAzIjGgLQT1wup/INxs2CTAhsQmWqjWYYh3nZ9QYIpo=" - }, - "com/google/guava#guava-parent/33.4.0-android": { - "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" - }, - "com/google/guava#guava-parent/33.4.0-jre": { - "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" - }, - "com/google/guava#guava/33.0.0-jre": { - "jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc=", - "module": "sha256-WaLb0FXRuqdi548aW6Orlz7dE/wn3MGHEQXi95f2gtM=", - "pom": "sha256-/XCxTEQZhsIubSLO0ldnh3Vr5JGLFFqKvSI+OoC24y0=" - }, - "com/google/guava#guava/33.4.0-android": { - "module": "sha256-T1fpmXE67O0x+j3jwJSyCTuU9p7+Lcne48VlWKRyZNU=", - "pom": "sha256-6Zh7Tm0QAgNaBekAqosGuEvGpCxoEC6R80cVybIZgO0=" - }, - "com/google/guava#guava/33.4.0-jre": { - "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", - "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", - "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" - }, - "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { - "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", - "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" - }, - "com/google/http-client#google-http-client-apache-v2/1.47.1": { - "jar": "sha256-5qi+KM47jdQpasBXcNnlMnJycvJmako9JWOcyOERV9U=", - "pom": "sha256-oUDD5tJkyEkYDKZq17v99uc70NfacG1uIohgD8kEiQw=" - }, - "com/google/http-client#google-http-client-appengine/1.47.1": { - "jar": "sha256-MzAOjKDIzh02vXdeQUo9yIOqKqbeYErSw9heGKPoBaw=", - "pom": "sha256-Vcy92x1UWKXyHGxZwqeSR3GhGKE2xkjHIlFf112PIvc=" - }, - "com/google/http-client#google-http-client-bom/1.43.3": { - "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk=" - }, - "com/google/http-client#google-http-client-bom/1.45.0": { - "pom": "sha256-0l547zQlDT9uCZ2nchpTdBIFl1pdDvM+JlEGaUIizBk=" - }, - "com/google/http-client#google-http-client-bom/1.45.2": { - "pom": "sha256-9IAlaC2K0ywkfnkpeFtgE1H2O7GchuNpb+BO58k0uSU=" - }, - "com/google/http-client#google-http-client-bom/1.47.0": { - "pom": "sha256-hy8h3uyOjEhdOLtm7csMUAh/pQ9r5tEriFbiSGzSZ1o=" - }, - "com/google/http-client#google-http-client-bom/1.47.1": { - "pom": "sha256-kjw8EOHRLlPjT9Q8bd+vDoN78atgQYWUC5z+9VXlv8k=" - }, - "com/google/http-client#google-http-client-gson/1.47.0": { - "pom": "sha256-jKMHHdE67M/TGKRcLeZjEqqVzneLZzZzuKbr277ES+I=" - }, - "com/google/http-client#google-http-client-gson/1.47.1": { - "jar": "sha256-ZKwrExPcprb8m9FBKKsYZSj+mSsJT1Nx+n+Cju2JA70=", - "pom": "sha256-KXyMpsTRm5hMbiOnL8Tga6UD5uHWGCfU0kMuBd0qFbI=" - }, - "com/google/http-client#google-http-client-jackson2/1.47.1": { - "jar": "sha256-Tn6oIpIhNps6d36ewafhWV4C+hSQ8Jdy0fnikzPG0qw=", - "pom": "sha256-y7OUHZ4yz9cBtyUpZ1TTp6nQQS7iFDVJpBLkP9tydU0=" - }, - "com/google/http-client#google-http-client-parent/1.47.0": { - "pom": "sha256-lbuqSXdGdvc23BNdcWhInDitS+RthBeuSR1LSo6lxU4=" - }, - "com/google/http-client#google-http-client-parent/1.47.1": { - "pom": "sha256-WDGyURO7RiMpM/pUi1U2R3XZ4Qt7m4PdS6IA5MR+y7Y=" - }, - "com/google/http-client#google-http-client/1.47.0": { - "pom": "sha256-/gogglHO9bfFdvHjw1aqllPIU0YBRB8vHrcn4Kbwojw=" - }, - "com/google/http-client#google-http-client/1.47.1": { - "jar": "sha256-IkR/3p8uM+J6I6JZU7HGIurWwFXHYf3mylBXPJRzRXo=", - "pom": "sha256-qafEmqAnaiaQlUzCl5DdWxUvIYqSZtuqhgdDj1TJ30M=" - }, - "com/google/j2objc#j2objc-annotations/2.8": { - "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", - "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" - }, - "com/google/j2objc#j2objc-annotations/3.0.0": { - "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", - "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" - }, - "com/google/oauth-client#google-oauth-client-bom/1.36.0": { - "pom": "sha256-9oGcT6yZOGhd1zog0o0MVkakhmeJsmh0EbavFlPkAcU=" - }, - "com/google/oauth-client#google-oauth-client-bom/1.39.0": { - "pom": "sha256-WS9mnnI73+MyyliL/pNEWufx0e5LffxY7s6kcQjD5F8=" - }, - "com/google/oauth-client#google-oauth-client-parent/1.39.0": { - "pom": "sha256-On5aiLGa/Fe/ifjsMsa5FgXXuUJ32trv/0mZlGPaDqY=" - }, - "com/google/oauth-client#google-oauth-client/1.39.0": { - "jar": "sha256-J/xh7i1SbjPTE1C16jgwkcCHk0XiYfmy5vzJeiDIb4g=", - "pom": "sha256-g5OwQr0u5dv0odPhmmBgyiOiTeRpoM3P9E8kDps4CbU=" - }, - "com/google/protobuf#protobuf-bom/3.25.5": { - "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" - }, - "com/google/protobuf#protobuf-bom/3.25.8": { - "pom": "sha256-/IgVoVEXaDxkJ6Yjcb1wzwBF2imeXHjudf+HUrRibes=" - }, - "com/google/protobuf#protobuf-java-util/3.25.8": { - "jar": "sha256-5xlurvw/ga+hVxghY1x67+KTP0vkqd+eYB+1khS1Amk=", - "pom": "sha256-dqjqWRWcGPmhI1v805FNVsIzsziytZyyjpL6XySe8nw=" - }, - "com/google/protobuf#protobuf-java/3.25.8": { - "jar": "sha256-cr2zLrOMr7fc0ogmLCmjTVfLouGRAa+WhRVbqMClYAg=", - "pom": "sha256-ZzccXrVLysqF7ETFJQTjiz3gUSPumNOx7Z3VNV/p8I0=" - }, - "com/google/protobuf#protobuf-parent/3.25.8": { - "pom": "sha256-wuMl6QySc4t9EQMltSj4pl6/F6ICv2X2/HOAzpzmWGg=" - }, - "com/google/re2j#re2j/1.8": { - "jar": "sha256-e1LHIVbdf5izI3pbNcHTT7o4GyEEjIkgiROtgKRd+9c=", - "pom": "sha256-32JpkzXNRvxGX0wDuMWB09UHeSIS0ntlrbkjtMJ95Oc=" - }, - "com/googlecode/javaewah#JavaEWAH/1.2.3": { - "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", - "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" - }, - "com/microsoft/azure#msal4j-persistence-extension/1.3.0": { - "jar": "sha256-38QcgX+/p2BXr2/+Q3nbympeFrjoffi92iPzcXVsLQk=", - "pom": "sha256-t2KD6r5Mkx+yr6OcEh9HCsHN6HCP0wVbDijqi652t5c=" - }, - "com/microsoft/azure#msal4j/1.22.0": { - "jar": "sha256-xw821jQsiRTelaYyaPZ4nYjY9ml+V+LnmnZwQSiK+dM=", - "pom": "sha256-Yj0IKqefg49F2DzSa9goG+AySql4qOsTdMXPWpKO/XI=" - }, - "com/nimbusds#content-type/2.3": { - "jar": "sha256-YDSXk+AG+6lrUyywwh4Q6Wn+DbjYf5HDuer4K6KZiJU=", - "pom": "sha256-y2nm2hYfflEWaHa29Zkf0TW0axEYwbZRSq7IyyQmt8c=" - }, - "com/nimbusds#lang-tag/1.7": { - "jar": "sha256-6MHFlOJCW9vqLYYN5Vxptp/F1ZRURSRJoPCRPCpbijE=", - "pom": "sha256-gksNfeeCer/GpH5u+UsP+qE4/vOK8IxWon9dOhUiEZ4=" - }, - "com/nimbusds#nimbus-jose-jwt/10.0.2": { - "jar": "sha256-lguXimzWy8MxlkitxzlZeJ9nQqK/Ho3QyEPbyRYkIYo=", - "pom": "sha256-tuvoIAmpoDhuZSzLQ6U/WZeKaWimmwPpv9sffz5CvRI=" - }, - "com/nimbusds#oauth2-oidc-sdk/11.23.1": { - "jar": "sha256-FwMDrsL9OXShTx7clA5A0zSzP6Kpw+IGudKqEtI9VCg=", - "pom": "sha256-/K3T6z/6Ia0IyM6UPDVCMNL7i0vbmsxuoWVmCNFuvf4=" - }, - "com/squareup/moshi#moshi-adapters/1.15.2": { - "jar": "sha256-76kPs0GaWoi9XgKcuv3OzOGBJDCxXLhncPYOrwtFxAk=", - "module": "sha256-Ie51IIERSzYjt/fikzFgt++syc6UfQY4Y+LbGIAx2kQ=", - "pom": "sha256-KBkBfxpRZHeSl+DflvIlDQVin7SG6J4e/ZyT86hlis4=" - }, - "com/squareup/moshi#moshi/1.15.2": { - "jar": "sha256-dn91ksbGHraTVJom0zPBIfU4OCa9KHuJmGeqMm2uVeQ=", - "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", - "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" - }, - "com/squareup/okio#okio-jvm/3.7.0": { - "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", - "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", - "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" - }, - "com/squareup/okio#okio/3.7.0": { - "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", - "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" - }, - "com/sun/activation#all/1.2.0": { - "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" - }, - "com/sun/mail#all/1.4.7": { - "pom": "sha256-WWVyZBVPF2+UWc9Fwk0H9Olm8sXpxRCtoS1lTHxbxU4=" - }, - "com/thoughtworks/qdox#qdox/1.12.1": { - "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=", - "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0=" - }, - "commons-codec#commons-codec/1.10": { - "jar": "sha256-QkHfqU5xHUNfKaRgSj4t5cSqPBZeI70Ga+b8H8QwlWk=", - "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" - }, - "commons-codec#commons-codec/1.15": { - "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" - }, - "commons-codec#commons-codec/1.16.1": { - "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" - }, - "commons-codec#commons-codec/1.17.1": { - "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", - "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" - }, - "commons-codec#commons-codec/1.18.0": { - "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", - "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" - }, - "commons-io#commons-io/2.15.1": { - "jar": "sha256-pYrxLuG2jP0uuwwnyu8WTwhDgaAOyBpIzCdf1+pU4VQ=", - "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" - }, - "commons-io#commons-io/2.16.1": { - "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", - "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" - }, - "commons-lang#commons-lang/2.6": { - "jar": "sha256-UPEbCfh3wpTVbyRGP0fSj5Kc9QRPZIZhwPDPuumi9Jw=", - "pom": "sha256-7Xa4iRwwtWYonHQ2Vvik1DWYaYJDjUDFZ8YmIzJH5xE=" - }, - "commons-logging#commons-logging/1.2": { - "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", - "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" - }, - "dev/failsafe#failsafe/3.1.0": { - "jar": "sha256-/mJlpoO4Zux1Buq2lMZ1nW0jomQXJiEmLHTvWj0rIWA=", - "pom": "sha256-OxdELqAXFh31AS2sAMFjHpMMm96kU30EbvBgx/uJpOE=" - }, - "io/airlift#airbase/77": { - "pom": "sha256-ZXcwMrJ5toeFOqstKYhS2A+hoMdZu1A+ZpDFBWRJR0k=" - }, - "io/grpc#grpc-alts/1.71.0": { - "jar": "sha256-wGcUAavIfPa9bNtYoLrPKa/w63INTQ8yNzwSggjL6P0=", - "pom": "sha256-oF5uGjJbgp5sF6k+dja18KPj7gjFCX8aDMZhVHmwi3U=" - }, - "io/grpc#grpc-api/1.71.0": { - "jar": "sha256-SXcbrSRN4SLwV4DBLz50upowG+El0JQaheZJIS9KigE=", - "pom": "sha256-y2yodovZXx5ncoOO8UGRZ6MY7crTlhWEtb9uj57BF2k=" - }, - "io/grpc#grpc-api/1.75.0": { - "jar": "sha256-fzCWFmkfplXQJRJ2IEntGL9KsrUs7UJMqy9SfQu44/w=", - "pom": "sha256-XHcZeqVh6nLhEEmy2RzpEniJCcL3BOAcr3dYiEXCWu8=" - }, - "io/grpc#grpc-auth/1.71.0": { - "jar": "sha256-GWiIX2A0B1/MSe9mrmzSTX7mpEJDd5sVgt1xWj6E8cQ=", - "pom": "sha256-X35qu+zHZZVGScoV4BLHSgn3rqb55mbDi0rf0zEyfKk=" - }, - "io/grpc#grpc-bom/1.68.0": { - "pom": "sha256-iPNHhiU9KQztR34yUmVYpVaHMjb/2SsNRpTypFqIYD8=" - }, - "io/grpc#grpc-bom/1.71.0": { - "pom": "sha256-2Oprzw2p5GasZTTo1weVTqbIdQBNVAuZlJ64azoxJVs=" - }, - "io/grpc#grpc-context/1.71.0": { - "jar": "sha256-3QSErF0Lr37oEDMVBNxiAse0JryI3OJBAOd/V2kE3VI=", - "pom": "sha256-P1BGN6pujHEFzdGa0rOueRCRW+XbZc3tRlm1KAcLTCk=" - }, - "io/grpc#grpc-context/1.75.0": { - "jar": "sha256-fh3nhH6mIansfLmIqLqpR3SNDq75S/5FfQTZtXEFB58=", - "pom": "sha256-IxAk0c8YIS4MXR2JJG1vJ7DSbOCCJQigNybXgI7wGIE=" - }, - "io/grpc#grpc-core/1.71.0": { - "jar": "sha256-AwmUlMYMuf6lgC67qNdn5EaXBi7AXlIHta6Jfgm9OOk=", - "pom": "sha256-D69QLQW6FQd9FEI2VZJz1C3q3MMT1eaURUpUx1G6qDE=" - }, - "io/grpc#grpc-core/1.75.0": { - "jar": "sha256-8Qzb5Vg3hJTk/8axuzKLihN/MgHUbIsk8BVOueURkaE=", - "pom": "sha256-RZmWbBDGo21dFOCn4LWdqjCZEUv0SsoTsf/OOW4RSxc=" - }, - "io/grpc#grpc-googleapis/1.71.0": { - "jar": "sha256-RCd8zGydO8nNPx4XaJyDFopysTLAD1b5On1uG5mE7l0=", - "pom": "sha256-tUffiT0kx/y+2XGdLlYwvr1htk9lffocL2Yi7FoOx10=" - }, - "io/grpc#grpc-grpclb/1.71.0": { - "jar": "sha256-V4Z6RJZ2aeoqAk7JfzxJepzcfHPQbO4PDhkYXviKOP4=", - "pom": "sha256-YtanuhO8T8QzWBaMHRpia53rOHhy+wq9cPqT1pIRgrY=" - }, - "io/grpc#grpc-inprocess/1.71.0": { - "jar": "sha256-hsfebjjNPqQLNyCgN/WAacZfGl0pGuo3AmHu6/4FV68=", - "pom": "sha256-EPC15IGKnxw6hr7RYUUVbDAP9jlp+kmOiWpR1ulDW2o=" - }, - "io/grpc#grpc-netty-shaded/1.71.0": { - "jar": "sha256-7jdeU0wNY70eklZ2VhAxm5zps5lYjsQI3PHH6nw/Je8=", - "pom": "sha256-bFfV2USot3T9RxfaEXZ+Uz/7bojAgFTxWLVl08Q6THA=" - }, - "io/grpc#grpc-netty-shaded/1.75.0": { - "jar": "sha256-0z1HqXIKOSUSxOTOqhekWKDj7WGI0X6Y1sT68GeTdNc=", - "pom": "sha256-827bYOpjDc1hIJuoHiWbIJYpMzdhUD5mHHXLkJ1CqYY=" - }, - "io/grpc#grpc-opentelemetry/1.71.0": { - "jar": "sha256-BX7xAeMDT3lc3O9V9qlXr/zO0YYyfthg5vynqSGMHBU=", - "pom": "sha256-gCSt7On7R+xMLcG6VOdUxhKazWd+64VDkAlqw6+/87w=" - }, - "io/grpc#grpc-protobuf-lite/1.71.0": { - "jar": "sha256-/62XdAC0lkn6LVQEq6rfymbH5ZVpdPGSQR6JRqEuX1M=", - "pom": "sha256-0OfP9fJMHv9eMTFe17/ADHGLkm+oDJZ/NMMgLUkq1sY=" - }, - "io/grpc#grpc-protobuf/1.71.0": { - "jar": "sha256-froGJfuo4XbA/BuAYQ/CxSwDbZWAX/3T9phaUclo3pQ=", - "pom": "sha256-PBUS4FKMvlRZWySJpqjEODxTlI/pz0BJoFahimLBU80=" - }, - "io/grpc#grpc-rls/1.71.0": { - "jar": "sha256-Akgj01PijYcK/xjIieksrz/1U/MLFxRCXrIfIGHziHY=", - "pom": "sha256-SkvWS5JEDHkk1m/LIEr+hq5REozvWo/llD0QAxXt2QQ=" - }, - "io/grpc#grpc-services/1.71.0": { - "jar": "sha256-6Wa6Bitnkwg6sWPDgQPU/Lxx7Z+R20vYGzD8uXWgqEU=", - "pom": "sha256-LzlFrpxLwu47tP+KCQ0EwjDrLJOAgJMSsV3KoGB7glI=" - }, - "io/grpc#grpc-stub/1.71.0": { - "jar": "sha256-UZEuYSso22XuwDMqi+SUs8VNNH7NLF9qf90suZT6s2A=", - "pom": "sha256-p8mYNe+hiI/3haY5dXizx+Jc0FSPI/Le/HfexnBfN2s=" - }, - "io/grpc#grpc-util/1.71.0": { - "pom": "sha256-ECKf99G40+UKClCMiM6V2Vv08LvIu5fT2I/v1yWNJ1M=" - }, - "io/grpc#grpc-util/1.75.0": { - "jar": "sha256-krWhGV2tTL18QFsBy9n9LbvVSNE9TPq/nS1qN7rUy4E=", - "pom": "sha256-vIY0RvlEF2d8tqwij7kb3D2Cr43SyOpGQ7W1LXVQ/XM=" - }, - "io/grpc#grpc-xds/1.71.0": { - "jar": "sha256-tXC4CAlTFBD5ZcwE4pRm2hwzjaQ021/KopuCLUD+gLU=", - "pom": "sha256-V6N5dNpK5bld8fY5OF5K2mWOEVebED8pP5ENtlgVu2I=" - }, - "io/micronaut#micronaut-aop/4.8.8": { - "jar": "sha256-OShJ/DQ5PvGHMXl1+PtmBpLl4fFRitM6YxKuaFvJaCc=", - "module": "sha256-+Jy8owIT5o0cX37c82zZTqBFolEwxSVz6T9KIOYh2sg=", - "pom": "sha256-OHdbHK+d4CT/y0hK0mfqnQPhuswgpshV5TRRndaw9/4=" - }, - "io/micronaut#micronaut-context-propagation/4.8.8": { - "jar": "sha256-X53ZErPPyQBPYwgKUeKV4GYYveDSGVXJmJdB5olTZos=", - "module": "sha256-mUuhGmSop5QKi60PuNJA0n3BHWXg+Wi0yc/Drciez5c=", - "pom": "sha256-v4qOUUn+x19MJGglX5imhXKUEKQHqEzuvnY379v2yvw=" - }, - "io/micronaut#micronaut-context/4.8.8": { - "jar": "sha256-KfeTb5ITLcXQVH01euZVcWa7lcxSpbLRJyb89swLg7c=", - "module": "sha256-Wh0JaeYvJ3uXAyJrnPDhWNZq0ncvVxz5DvO8ReCQces=", - "pom": "sha256-sjsoDeuKE10ihhYHu3Tjb9DVfgDcMzVwJ5D5hUUAk/4=" - }, - "io/micronaut#micronaut-core-bom/4.8.8": { - "module": "sha256-7K2Oisl/tuag8/vNV9nfHzeyDgs88fgzpycQZHrlwpg=", - "pom": "sha256-k1DjZYl70O6y5IzAHHN33X+DjFYh7XM5NGMo/1KwfMI=" - }, - "io/micronaut#micronaut-core-reactive/4.8.8": { - "jar": "sha256-qYhWyBcg0oUxvvEmnS0116bgXO4boSukkjIN6XHiq2M=", - "module": "sha256-W/0U0roJZp/NrA3F5ZSMku/tPDfFaU2UAtE0vT+z+Q8=", - "pom": "sha256-WYxzfzpfAJFt0R6gSbHJsRlJ55BFJKsihX/cIlzjck0=" - }, - "io/micronaut#micronaut-core/4.8.8": { - "jar": "sha256-Y0GL11NTXqG9HPE0snXoUfUtaKuuZ+kLQaZ/tM9N/UI=", - "module": "sha256-wSXaf5R6rNkysh9fLlP2NBvRZiX3lIjl2r/I93c/vsw=", - "pom": "sha256-aJ86QgAOeMrS//K9GSLhF2rtkcWGN+OtoLNeQh8mXFA=" - }, - "io/micronaut#micronaut-http/4.8.8": { - "jar": "sha256-QyhqCQ7ptruKNFyBrXSjAkAlFW+ZU9HNbuKpAE4l/EU=", - "module": "sha256-gYw6tOkO2v9r5EvR0/ycgMUAqiDndV7wRWJ3t49zb4I=", - "pom": "sha256-B4eAMYSsUclWsWQrPF5NbyRXv2T78AiyK7DllDzC1Gg=" - }, - "io/micronaut#micronaut-inject/4.7.4": { - "module": "sha256-yNeE+H1gwuMxRKfeWBAWzD9gpMi3TnX1RAJaYo41Egc=", - "pom": "sha256-4Vb2KiIMJ+2fJMTtg7kgZAyvG9Rw5NmRgEZLLFPL2gY=" - }, - "io/micronaut#micronaut-inject/4.8.8": { - "jar": "sha256-krDPch9/p1yHZtahdddLClhcDXVyfTG648GkM4mYLO0=", - "module": "sha256-TS8xE3Cg6wPTkoZB7yKsuVJC/TDnRM39DGEO0Jf3Lyc=", - "pom": "sha256-3emUaeKM1VZMuWeIp8WHcfewMrZnoLkXCUC30ExZDk4=" - }, - "io/micronaut#micronaut-jackson-core/4.8.8": { - "jar": "sha256-sT+djfDRme+A/yBeQTXBZ2M4raDsFUtWB2tmOkwNLrI=", - "module": "sha256-gLghtk6AeQ5hWsns706F2C4kRWwipR37+JXLWIBsqJ4=", - "pom": "sha256-noBMIYmHjKm5Tg13vo4JkCarxKIT4HyzrQuMOr201Hs=" - }, - "io/micronaut#micronaut-json-core/4.8.8": { - "jar": "sha256-txKibGglKx9akrik1X587CQyPnE4Q+50PP0WsnIWcAM=", - "module": "sha256-sR/qTRs6dSbzCJw2PD7GbZ6MyVW39sTlXlXiRVQMoxk=", - "pom": "sha256-NQ9sCEHUetrbwJN5/HRBZmKbpuNxOneXYwT+6a9X/D0=" - }, - "io/micronaut/serde#micronaut-serde-api/2.14.1": { - "jar": "sha256-exQ/Eg5MbClkjclZ6VVHtVJsprOFD4YLP0SQYcy3YiU=", - "module": "sha256-4YYZOtTReGYr2mpgjyvSGucuSBa2isuiOofXBSs27qo=", - "pom": "sha256-jyuxO6xTx4LpttaaiGul8m1fXb+ZhZ+RcYqsqGe1qNU=" - }, - "io/micronaut/serde#micronaut-serde-jackson/2.14.1": { - "jar": "sha256-5l4oW2RUD4IYPUK8uDY5MGoSrxI6OQM94m0g1ZutTU0=", - "module": "sha256-qSllGF3NI/EcNI+TcLrB64lS7i5I934pEHqU7+sso7g=", - "pom": "sha256-kYH3vOs9uCIut+6vv7U0yJ+FD44AV0fyiSlENxO1Q48=" - }, - "io/micronaut/serde#micronaut-serde-support/2.14.1": { - "jar": "sha256-Pk4GYyOvOo6GkONfhcPBNhTbe2N3liC5C5JbTJF603c=", - "module": "sha256-4d/4XBnv6zdqqauk1Ve0T8uqGrus8r8FAcha5FJpzn0=", - "pom": "sha256-xtno5rv1PLvkURKoa8j1WI330bgi57pzZl7ljL5CvGo=" - }, - "io/micronaut/sourcegen#micronaut-sourcegen-bom/1.6.2": { - "module": "sha256-qIBIoOacPgVqKBoXOS4woKC2N+9rG8CTKEGPKDolK6g=", - "pom": "sha256-l1kWx5640bz7patrfaDkgia5SEzRHlyB7Cox5S6KtYQ=" - }, - "io/netty#netty-bom/4.1.118.Final": { - "pom": "sha256-kA94/W64xqZ7TJo52eXNlvnsonCxLXCQvFBX7+foKGo=" - }, - "io/netty#netty-buffer/4.1.118.Final": { - "jar": "sha256-DupOhmapY2oociZh2LpfqFZEd+df7G3S/z4yTjYfizw=", - "pom": "sha256-lcvm4+NB7km8/9MlfPePpXheRlt3pzS8/C+TUJ1D/mQ=" - }, - "io/netty#netty-buffer/4.1.125.Final": { - "jar": "sha256-0pFb8JFVLYI8u6keIjSdzqIcjVzJ8vkwi/mp83irfJU=", - "pom": "sha256-2IsFa7cNdTzOW0N58amfo2xY5RE8L3BpapwKQpklQe0=" - }, - "io/netty#netty-codec-dns/4.1.122.Final": { - "jar": "sha256-Un63/Iq+dj0n9PzMMzjmeyDex2s3enL7aCJa0oD03cc=", - "pom": "sha256-kG2oIhPPjhMPEmA3qY09uH5CmC7TdIf6gEJqqaDkOB8=" - }, - "io/netty#netty-codec-http/4.1.118.Final": { - "jar": "sha256-CYIteF6aeUg4Ax3dU0bPQZswwDapgcLid6BivqiEF0s=", - "pom": "sha256-76CmX6G8y9mN0U3vmf2mba6Zn278S2QYgDu1DGcTxxY=" - }, - "io/netty#netty-codec-http/4.1.125.Final": { - "jar": "sha256-F7blgdypse61EJi8KkTPzgk1oC4MtsF75jn4FPXpFqk=", - "pom": "sha256-4/KlYQbH1S3Zk1uP+JQjFAL+n1JvDKBC27pf71b/3c4=" - }, - "io/netty#netty-codec-http2/4.1.118.Final": { - "jar": "sha256-aNoLGjTc6wCm+fb3iPsva3ueStuoxwZYrCvX64mLl64=", - "pom": "sha256-QiRGD2n29nmCxiSg1QPHhqJFARGzGrFcB14LKMlOEf4=" - }, - "io/netty#netty-codec-http2/4.1.125.Final": { - "jar": "sha256-axCn+6zYJhizoN/m+cPh+O2TNm4dbjmGqt8QLfw28/s=", - "pom": "sha256-55sAIA1cvrh16h6xtceFhFpaZEe8sClIqIje1EEopAc=" - }, - "io/netty#netty-codec-socks/4.1.123.Final": { - "jar": "sha256-DiPSm/yOMlx4l8HXWapB/BTQsK7DxoUDkJdyiJxCd5I=", - "pom": "sha256-zwi9uGtBSeiObFryQGNIXg07zC+rPpkNgDJf0UKgx+g=" - }, - "io/netty#netty-codec/4.1.118.Final": { - "jar": "sha256-Sr0hX9HtfOhlCdFpzJy+3lBCF2wmWnmztwYCsBcibD8=", - "pom": "sha256-Dx2BOQ3KRYjYfT/hXYxS8muy6m2AyQq5OpfmTf16HN0=" - }, - "io/netty#netty-codec/4.1.125.Final": { - "jar": "sha256-eDATJ+U1XAN0ar0K8dWZZba/I+HJrFQ2Kt62TgrVJjw=", - "pom": "sha256-Gm+eB4xV3inFREsk2PRF6FChFenut5AXYYosaanciJ4=" - }, - "io/netty#netty-common/4.1.118.Final": { - "jar": "sha256-ZczpAezw+dZZHMd1B3JhSrQBqEQV3JrsnaTQRvD5p3w=", - "pom": "sha256-NCkEFeP3lhsZb3Y3yCphfRA4ESKRsxy7xHIA0doyboI=" - }, - "io/netty#netty-common/4.1.125.Final": { - "jar": "sha256-Nw6C+3oCCx1ihhSLRTx6XiECWbVhb+rHRA/2twidOzQ=", - "pom": "sha256-zGo03wkgxORheIde+lF8/YSl3f9ZvdtpNmUYX3EKK+I=" - }, - "io/netty#netty-handler-proxy/4.1.123.Final": { - "jar": "sha256-VBANpwUrTLPxbIMeor3sQdpGOt+W4NRJT27EAGvAgVQ=", - "pom": "sha256-8ZqRvuLyuvk5O++ONlO3vY02qZa+YsKXS7lIqsXwm2o=" - }, - "io/netty#netty-handler/4.1.118.Final": { - "jar": "sha256-JuP4pehZ/WLPPBPcbXXk4Yh58ACl0K1/WPhnlnXSPa4=", - "pom": "sha256-ZLS1kaxN9OloOj+hf3Pe+3Ya8HLFbcLeQDPhgMVrEEk=" - }, - "io/netty#netty-handler/4.1.125.Final": { - "jar": "sha256-+4jHpoJOpDQB0/BY6Y7jF/p0mW+YXczBuA0m4k2ByX8=", - "pom": "sha256-Kw8qFVwX1QoxSFSaln0rdqiVyqgPerUI6flAGZf/I1Q=" - }, - "io/netty#netty-parent/4.1.118.Final": { - "pom": "sha256-2Wba6618ch37+P7NlPB7Em9vyy0fhbnIeZn9mZ68aMg=" - }, - "io/netty#netty-parent/4.1.122.Final": { - "pom": "sha256-ooWn59SxZ4QSaW11rxZKeQXyheAFR59nMLuPaxM22Io=" - }, - "io/netty#netty-parent/4.1.123.Final": { - "pom": "sha256-a2szsLAf71n43m2o9KLeGZ+KdPfB0UVqJRmnctKkN4M=" - }, - "io/netty#netty-parent/4.1.124.Final": { - "pom": "sha256-9s3Je4JehJc++kAPtKo1YK1lcZkelboCG4BKe49Ee2g=" - }, - "io/netty#netty-parent/4.1.125.Final": { - "pom": "sha256-u6cxeChJHKZSQF/XYHwhgAoT5heDOf9pOHdpqyKnWx4=" - }, - "io/netty#netty-resolver-dns-classes-macos/4.1.122.Final": { - "jar": "sha256-VKBbTlYgaBo7xqezUP5Ty8wK0fBvyu36S3oHJCISnp4=", - "pom": "sha256-qgBIpL3g179kjbMZ8Bx9poRGk7wkLLxjq4NiLFWWlNw=" - }, - "io/netty#netty-resolver-dns-native-macos/4.1.122.Final": { - "pom": "sha256-ekzQ2aMnxblcIaXzVPk9/4rJbzL3oH2oDfrZqtnSJPQ=" - }, - "io/netty#netty-resolver-dns-native-macos/4.1.122.Final/osx-x86_64": { - "jar": "sha256-3Kf5FjQ7Oy9b9XWBxP6p2xnMauk5NgMvrLOdU01qoKE=" - }, - "io/netty#netty-resolver-dns/4.1.122.Final": { - "jar": "sha256-P12aOCvChqYC+3q9NJ8E/TsyzWNEwIpKjLYhLUUDIpQ=", - "pom": "sha256-rIFLP3P6lF9J7x4C5dKJNJYTlRCIBrEzMJ3tiue1bbI=" - }, - "io/netty#netty-resolver/4.1.118.Final": { - "jar": "sha256-MXDCJZcsGLaFDSit1g2xW7KNg8Tj1baGyiIOC9cnPIo=", - "pom": "sha256-hy3L2IIpwukYCjyqdVhMQs7YilFsSaaN2JY3IWSyqU8=" - }, - "io/netty#netty-resolver/4.1.125.Final": { - "jar": "sha256-/QUffI57NqoVrZzmAX0ngTf2hnURXYqUpSyu6+U01gs=", - "pom": "sha256-DJ6dTVCbeW60+RXxT1pH2ubDXhbq5uQxOqL8XKfrxHI=" - }, - "io/netty#netty-tcnative-boringssl-static/2.0.72.Final": { - "jar": "sha256-iq0vQ+P7P5SxyRb9F/P/AqM+hZGD7bvZop0WkW3DhaQ=", - "pom": "sha256-Xz1sXJ823UK/9lTNLTxfZfqVGbv3AsraI3ksu+wK3VM=" - }, - "io/netty#netty-tcnative-classes/2.0.72.Final": { - "jar": "sha256-OWLgGnHuJS3pef0yScXqkGi9fIlV7KvhGfMdOB9hOKM=", - "pom": "sha256-3lZM/Jo7cALLPRCwzCwCKFDLn0qMAOLzxYByYSvYDXQ=" - }, - "io/netty#netty-tcnative-parent/2.0.72.Final": { - "pom": "sha256-5nvGip7I0W0YgSzYPV37qgYozmjytK/FyEQ82Lr/6uU=" - }, - "io/netty#netty-transport-classes-epoll/4.1.118.Final": { - "jar": "sha256-vYbm1B4fYFP5V3kxZVI2JZd4qwRWRuHmqwQVDwcIZPM=", - "pom": "sha256-+WK0V5pL4M1LuiPqia47hODJuNFkhuTB0xE0brb8cx8=" - }, - "io/netty#netty-transport-classes-epoll/4.1.123.Final": { - "jar": "sha256-PbMLuroAT4YiG7JRFo2bu9OO7O+0LHgCucvKYoMx4VY=", - "pom": "sha256-T2u2xsWgvkzEK5P3BFDh4KyhEKAKAoyutmJMcMOLJk4=" - }, - "io/netty#netty-transport-classes-epoll/4.1.124.Final": { - "jar": "sha256-oJjJoJWWHIsRj5NSvyPEQ+DefFPbKvoNsYnXA67VPvg=", - "pom": "sha256-Mq8ZdNiw9tKBEuBW+3XnNlyJ86Gamr2uXMHK7ZkCj0I=" - }, - "io/netty#netty-transport-classes-kqueue/4.1.123.Final": { - "jar": "sha256-y7iahrtrI2i2mjP5RhobYtyISUbK1DiR/ISxcZygiIo=", - "pom": "sha256-x3k1gysKyCTkAI/yCENm+7lZTJnQUIF+wXTamx5eY+4=" - }, - "io/netty#netty-transport-native-epoll/4.1.123.Final": { - "pom": "sha256-5s3KLOAzulU4lfxVw0pdUTBt8gf8t3Fkd1x0XOo14jk=" - }, - "io/netty#netty-transport-native-epoll/4.1.123.Final/linux-x86_64": { - "jar": "sha256-6+pnqTd3/o1NtPWyOhqkUa6hqtdadnpAp1MG4y9nybk=" - }, - "io/netty#netty-transport-native-kqueue/4.1.123.Final": { - "pom": "sha256-XLpsTl8qyZL2UnAksmVu9lj6zWaXr7jbqVs6H1trtTc=" - }, - "io/netty#netty-transport-native-kqueue/4.1.123.Final/osx-x86_64": { - "jar": "sha256-z7MNBfziCQnqrSlR3QcElIXkfH2s2QC6u+4iTFMwjps=" - }, - "io/netty#netty-transport-native-unix-common/4.1.118.Final": { - "jar": "sha256-abFnk9e0HqdqdivSvRRPxPfDnBVqelnr9puutWD7ELc=", - "pom": "sha256-w336RI/aV2410qeIo0appFGBmKzFN1mSJYSruG0h39s=" - }, - "io/netty#netty-transport-native-unix-common/4.1.125.Final": { - "jar": "sha256-aceHT9uZj6nKPQKTQnJyXwgTu1KHGsmM3/3UchLvAgM=", - "pom": "sha256-89qYrvOPcvlm5QACJDx4V2wl8s8n/hktHyNLuA6wjTU=" - }, - "io/netty#netty-transport/4.1.118.Final": { - "jar": "sha256-qzdR5xfa75yNkeTXRyikhzC9hTC3LiRmsiKy6j+wfbk=", - "pom": "sha256-Yh9MVnIgSntDcjl7C/jX5EbNn2YK/8DQM5wFnFAKcDI=" - }, - "io/netty#netty-transport/4.1.125.Final": { - "jar": "sha256-gI3xc6NsbLcVwjJ2hxsoxVni5mtSj/cd4HRSfcXViD8=", - "pom": "sha256-KkK0D2+zWY1dEwb/l1Wxtwt7hgPvtHepy1l7T8SDFi8=" - }, - "io/opencensus#opencensus-api/0.31.1": { - "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", - "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" - }, - "io/opencensus#opencensus-contrib-http-util/0.31.1": { - "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", - "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" - }, - "io/opentelemetry#opentelemetry-api/1.46.0": { - "module": "sha256-9kmUA4aunj400lx4GJzVlpFD1oH/0zw6bpS+YPuPdWA=", - "pom": "sha256-92JLm6s6uZvnazkHWPhnRD4PIuyMrOcEPQwnMBn6e6A=" - }, - "io/opentelemetry#opentelemetry-api/1.47.0": { - "jar": "sha256-ZWbx8RM9YR/06Lj9uOsYV3uXBCViAxU2Pum+Q4Q7FL8=", - "module": "sha256-zCE6CaI+2/bRdOu7k/tl0oCeD8o/m2o0Vbi7a9xE/jQ=", - "pom": "sha256-X2xsLNziNhUfBA1Kmp+OwQW5GV0PFrWu2FVy8wDqyR0=" - }, - "io/opentelemetry#opentelemetry-bom/1.42.1": { - "module": "sha256-x6CaAIZ6RYQfynw4gKTMrZcQtCmpnQEANPmwx6Ah0TY=", - "pom": "sha256-6VMG+3qolqopLeRxMVOcFsH5Hfy5kAHaBsQBJRy+aQU=" - }, - "io/opentelemetry#opentelemetry-bom/1.47.0": { - "module": "sha256-QdK1ilQMmkQ1iAmy1jZIDtR8Alovp77NenjEy3TklL4=", - "pom": "sha256-VcVgSi3oNT9k7MTF1CyPvxARFc+s00QWABnKY468ilc=" - }, - "io/opentelemetry#opentelemetry-context/1.46.0": { - "module": "sha256-dmoi3QWuCzyCFECUXXQ5ymNepgmEUQSOGb4v2qjiudQ=", - "pom": "sha256-Yz5f0RtNHGL6rPmwkSnWZR6xc7tte7cLGpd/BbMHbqM=" - }, - "io/opentelemetry#opentelemetry-context/1.47.0": { - "jar": "sha256-FbT8QjTm3KbVSADVcmlOy9B7pSwV/FsiG02lUXzo2Q0=", - "module": "sha256-M4aB6NwaH2T/tvcHjEa2+WD+lGN5ni3r6+fVjAb8XbM=", - "pom": "sha256-WUMqp3bD8etmBrhU53g1+iPlJBUPfg36PGUQ61ekQsM=" - }, - "io/opentelemetry#opentelemetry-sdk-common/1.47.0": { - "jar": "sha256-fOVWZqyn8uVpele9QTPkUIptxQQWhfLR7zG7FW8y470=", - "module": "sha256-UTVQBeDms9x10AAD5WiWYLl0RnWY0BeMKkIPiEYP4RY=", - "pom": "sha256-oC0PiFTKrt1FtpYiQvoMlcLiyHQn09/2Tq1BbRtki/8=" - }, - "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure-spi/1.47.0": { - "jar": "sha256-lDSNQmPixZxwOWMMrTedlptiZE7Qm2F4+pUpiFWbOWo=", - "module": "sha256-3N9XKqFP5t6A4WAwQ2oJinP2QkFthiWj3nEVYnDRSjs=", - "pom": "sha256-plF5ck0P/omYdHcHsgymV9ryy7Sxui50NPZRwigiBVI=" - }, - "io/opentelemetry#opentelemetry-sdk-logs/1.47.0": { - "jar": "sha256-MCSRmEtj7rr0tYvTrhnSI6VfeQkKPka0BQe0nDy+nMU=", - "module": "sha256-UqusUKgDzmeCylC3jNSp3N2XdLuDex2r+0krC+VlcFI=", - "pom": "sha256-7PivOQuEReJQVhlsvEyp7cvhVhTE6ZNX/+w3MO1kFQM=" - }, - "io/opentelemetry#opentelemetry-sdk-metrics/1.47.0": { - "jar": "sha256-fRRCxcqRa6JRMAUgXTuLm8XcpOKoSGfQVQYCoN/Au6U=", - "module": "sha256-D4yOWdilcPEMEeIWdBtHI3I1Vk4ViPfW+CpZ0k4x/gE=", - "pom": "sha256-NaNBlfW4P8C1sqtXLXb7w82uW4tB1JFElW3hEtUKs7U=" - }, - "io/opentelemetry#opentelemetry-sdk-trace/1.47.0": { - "jar": "sha256-A5UO/V+lonZ2mlk1edj2AnQqXVL5l4VpMm0qn54WJUY=", - "module": "sha256-0xRRzoWYemaAuki9dQE8Zi3bzOZTgkfiv4yO+DRUbrk=", - "pom": "sha256-MWRYfYqVjZcCBXM+5UtUSPI3BiZG92EIm6MB2okL8cY=" - }, - "io/opentelemetry#opentelemetry-sdk/1.47.0": { - "jar": "sha256-SgnrLuSEdplz4UIYo05tpU81lVqgKybcUjiwwu1qgB0=", - "module": "sha256-qwFPvQ5xb7TBKVSBDph10aB49UxQ+Sf8V7mbxrcyVz0=", - "pom": "sha256-p+45CMLHYc+kTjNKxmaG1jqnCCavymtPF6d8Q3p/G1U=" - }, - "io/opentelemetry/contrib#opentelemetry-gcp-resources/1.37.0-alpha": { - "jar": "sha256-97a63fu+V/Dj4ePMCOtou2HCnvbBeJjOfONbHzAp0+Y=", - "module": "sha256-Zs9xxdB5RZ8mZjIqgzyFnYcyuN4qYjaADlBpWAh3UP0=", - "pom": "sha256-VSOOSFJi8/XO2JT/ePGs9pb4FKDkzevoStatP9e4jKA=" - }, - "io/opentelemetry/semconv#opentelemetry-semconv/1.29.0-alpha": { - "jar": "sha256-qV8a7X4/ZDU+xiXG3vcqDKrwa2xTlw9Xj91RPa/Zlf0=", - "module": "sha256-uCvms5s/HXFPu90Te+mLagSeocjD/bPSRP+4YlGYOmg=", - "pom": "sha256-ritWG/POdHQlww2QMVMJt1fV/Qn/GVykQE5XSadm8hs=" - }, - "io/perfmark#perfmark-api/0.27.0": { - "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", - "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", - "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" - }, - "io/projectreactor#reactor-core/3.7.2": { - "jar": "sha256-LAnEmi8c5cZfJzxwyi5750y26u/G5XmSQYzERZR18cw=", - "module": "sha256-PXZUQ95ys7+ZcY71Qzi3mPhP706bIFK4Jy9dQxZqWyU=", - "pom": "sha256-9/N/7my7+Z1dBMeILoCsfjJQ3zZ6IXOLmBMaGH/Dbrs=" - }, - "io/projectreactor#reactor-core/3.7.8": { - "jar": "sha256-RFZ30np7CsPNfNwIIsQnMspQS+6xQ2tdCUPfofKICu4=", - "module": "sha256-aKSkn+BnXkIK5+nsHg7vmAFDt37qtV1QDUJJ70s/9m0=", - "pom": "sha256-fZYT79A+JX6BjmeQD8s+XfWs1aUci7OpljCWP9r22C8=" - }, - "io/projectreactor/netty#reactor-netty-core/1.2.8": { - "jar": "sha256-EI4r0NtPI9odTujsFJ5Ave9xe2UsY1QPJwWEP2bJn2Y=", - "pom": "sha256-fAhjMXSwgf0qk8BeJgYzFDRiTWyUqaiUtal8alkh+Mo=" - }, - "io/projectreactor/netty#reactor-netty-http/1.2.8": { - "jar": "sha256-LjMG7yTKOQd5cbr9LyHB6JD4cD8B6NF0EBNkJBNTBpI=", - "pom": "sha256-3QaHK+DRnrEyDBBYOjXivG5zbujBV9QSZ12SM7MlskU=" - }, - "jakarta/annotation#jakarta.annotation-api/2.1.1": { - "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", - "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" - }, - "jakarta/inject#jakarta.inject-api/2.0.1": { - "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", - "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" - }, - "jakarta/validation#jakarta.validation-api/3.1.0": { - "jar": "sha256-GhhZPYuptIIVykmT5RpEUcgEqC+J6NDUoxpea4cx1Kc=", - "pom": "sha256-sxivh+JwKtsExFPjhWhjzHoJaiXScwtYuewW57D6V/Y=" - }, - "javax/activation#activation/1.1.1": { - "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", - "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" - }, - "javax/activation#javax.activation-api/1.2.0": { - "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", - "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" - }, - "javax/annotation#javax.annotation-api/1.3.2": { - "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", - "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" - }, - "javax/inject#javax.inject/1": { - "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", - "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" - }, - "javax/mail#mail/1.4.7": { - "jar": "sha256-eMM7T3x7YPS2gPLSQFsfBj1xkpzxpPvDKIiDefNl/Ps=", - "pom": "sha256-lhCZpCD2wx3rczQQwKJGLAZpJzI1+ljFcNYay9udjYo=" - }, - "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { - "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" - }, - "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { - "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", - "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" - }, - "jline#jline/2.9": { - "jar": "sha256-GUPYSuoegm2nJOofMGNj4CaR2xzwQWXTOdl7/I/dENs=", - "pom": "sha256-sSn5BHWQUlcnTVgojGe7hlxCmbRIng0S3aehOWSexl0=" - }, - "junit#junit/4.13.2": { - "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", - "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" - }, - "me/sunlan#antlr4-annotations/4.13.2.6": { - "jar": "sha256-/A+BWKC2sp3vqygIty7QNFGRE+hUHTSmKcVjSdhv9w8=", - "pom": "sha256-vYjzUQoU6z1dq2KxCAhse8V2PmgWTnFsHa2UqEJBwGQ=" - }, - "me/sunlan#antlr4-master/4.13.2.6": { - "pom": "sha256-i/eMtBUsNfE/iguUKAEaPk+eqdL1nryxufsdQ1sodVY=" - }, - "me/sunlan#antlr4-runtime/4.13.2.6": { - "jar": "sha256-HJsTQ4TUoSJsG4odK1uNzbZiOzX3VTNItw+tEii+KqE=", - "pom": "sha256-0lJo9t4PkULqUiGbaqVsazQUA+LCJA/6Nb8Oo2TwrLE=" - }, - "me/sunlan#antlr4/4.13.2.6": { - "jar": "sha256-DdxJNw3hXG9h/Wt5R370tjooZM8s0Uw49jP4OZjzmoI=", - "pom": "sha256-G6BKTajloqzwrG7s5N+CKAvNapH0Rwe7C0ucjXP42jI=" - }, - "net/java#jvnet-parent/1": { - "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" - }, - "net/java#jvnet-parent/3": { - "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" - }, - "net/java#jvnet-parent/5": { - "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" - }, - "net/java/dev/jna#jna-platform/5.13.0": { - "jar": "sha256-R017iPbpcAm27B2YwwJN2VwjGHxl2r+8NTMbysPRc90=", - "pom": "sha256-Y7IMivBXyYGW+HieGiGm3d8Cqo84XmsEtLT58N8lcGY=" - }, - "net/java/dev/jna#jna/5.13.0": { - "jar": "sha256-ZtT4GaBipRodVie//CP6xV0Wd/Dgof66FEqr3WcKZLs=", - "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" - }, - "net/minidev#accessors-smart/2.5.2": { - "jar": "sha256-m4p7xDhh1hVsAhFm2UH7fd2+RGPi+l7ogHfksBRSqDY=", - "pom": "sha256-/SIDhF6kN2wTbSdgrqXyBp+W/2gIcaQwhl4CWjD9h5g=" - }, - "net/minidev#json-smart/2.5.2": { - "jar": "sha256-T73tsBBc7cf3ZrlcKX0uiPtqVg2kjzu6oMxTjqi3v3E=", - "pom": "sha256-Qhs8AMg8LTCtjiUHG/qMTPRaxHunWLX0NkYUsKuLoPQ=" - }, - "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { - "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", - "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" - }, - "org/antlr#ST4/4.3.4": { - "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", - "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" - }, - "org/antlr#antlr-master/3.5.3": { - "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" - }, - "org/antlr#antlr-runtime/3.5.3": { - "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", - "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" - }, - "org/apache#apache/13": { - "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" - }, - "org/apache#apache/15": { - "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" - }, - "org/apache#apache/21": { - "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" - }, - "org/apache#apache/23": { - "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" - }, - "org/apache#apache/31": { - "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" - }, - "org/apache#apache/32": { - "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" - }, - "org/apache#apache/33": { - "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" - }, - "org/apache#apache/35": { - "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" - }, - "org/apache#apache/7": { - "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" - }, - "org/apache/ant#ant-antlr/1.10.15": { - "jar": "sha256-YZ42FgnURv5qtn0dRbhlbmhkTL18RbvtXCyIFkCNjdU=", - "pom": "sha256-9wbsXFMyAPbqHbl+TH+kdtny8l0GFi0cqXEGoauExz0=" - }, - "org/apache/ant#ant-junit/1.10.15": { - "jar": "sha256-mkVe60vtwdi81LgJnUsfGPG/G8l3zW44mhBv4M82ZxE=", - "pom": "sha256-XhzWXJvDP0PBC1AL66RHhn1qc3AyvJNlWD0xgQ+O0jQ=" - }, - "org/apache/ant#ant-launcher/1.10.15": { - "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", - "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" - }, - "org/apache/ant#ant-parent/1.10.15": { - "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" - }, - "org/apache/ant#ant/1.10.15": { - "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", - "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" - }, - "org/apache/commons#commons-compress/1.26.1": { - "jar": "sha256-J7tdQPN8O7cgW0oFQCR98FdxXp9su9l9Ymq4tQMYuwQ=", - "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" - }, - "org/apache/commons#commons-compress/1.27.1": { - "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", - "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" - }, - "org/apache/commons#commons-lang3/3.18.0": { - "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=", - "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY=" - }, - "org/apache/commons#commons-parent/17": { - "pom": "sha256-lucYuvU0h07mLOTULeJl8t2s2IORpUDgMNWdmPp8RAg=" - }, - "org/apache/commons#commons-parent/34": { - "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" - }, - "org/apache/commons#commons-parent/35": { - "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" - }, - "org/apache/commons#commons-parent/52": { - "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" - }, - "org/apache/commons#commons-parent/65": { - "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" - }, - "org/apache/commons#commons-parent/66": { - "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" - }, - "org/apache/commons#commons-parent/69": { - "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" - }, - "org/apache/commons#commons-parent/71": { - "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" - }, - "org/apache/commons#commons-parent/72": { - "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" - }, - "org/apache/commons#commons-parent/79": { - "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" - }, - "org/apache/commons#commons-parent/85": { - "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" - }, - "org/apache/groovy#groovy-ant/4.0.28": { - "jar": "sha256-yyzl2mwQtuPWamsL62qQgZzLTlNfQ8SE74uX1jcPA+4=", - "module": "sha256-VBzK9u/LrK7met5HvinmfEF/LSPj/31keFzoTshd4Dk=", - "pom": "sha256-SI4zHHgHItQ+c5yipENmC73OZhHEAuaHfZnvUnliWfc=" - }, - "org/apache/groovy#groovy-astbuilder/4.0.28": { - "jar": "sha256-XQMsJRA/ovk+O8/lPi+y5pbzFAObZCPDi6L8JPhRYB0=", - "module": "sha256-Vjswf+3jL+JljvpgctMyLnrFQ+4jH4FtCpO0S+1jjhE=", - "pom": "sha256-lqMSZtBVNCICH22aVyYJs6rPBPDfnDKJPZaKGSsmVYQ=" - }, - "org/apache/groovy#groovy-bom/4.0.25": { - "module": "sha256-dG8kZ2e5HjnAyjqGJ6sAbrN6UeJ4CZaxfdzYPtbgKAU=", - "pom": "sha256-/Jvxy9DlMd68PjZIc//LIk7Wrvp8bnA8Ze3Uqlsd7ps=" - }, - "org/apache/groovy#groovy-bom/4.0.28": { - "module": "sha256-gw04aMOee7MP9lNeilum3ufZuBujtEuq8Q8VBqcgdFo=", - "pom": "sha256-8wUszlm1mdU2nk/B2fsun6OVqo53K+3C3NeQfNGKPQY=" - }, - "org/apache/groovy#groovy-console/4.0.28": { - "jar": "sha256-JPe8rr2H6wdmQr3wpkyeLA0ilpAeoiXy99tDjs4Ae8k=", - "module": "sha256-tlNMQ+doLUO6r/yMV2T0MgOJtRdIunuIzzx9sth/61Q=", - "pom": "sha256-EXQrc1VzdrHwfe9N/C+Hmjqauub9xOFbpwG2sHDwMGk=" - }, - "org/apache/groovy#groovy-datetime/4.0.28": { - "jar": "sha256-RBAlNLEP3qmFcMRlcITwhLjqmItM3hiBQPAPwGsl3Nc=", - "module": "sha256-TyJOFSawBltLXiGLzw4j/1/i5nnH8IEq9xmXTfAPtEQ=", - "pom": "sha256-OV7HGg5WSk6CEcAiiw7T/oQF17SjuFIGSS3hgInLHX0=" - }, - "org/apache/groovy#groovy-dateutil/4.0.28": { - "jar": "sha256-7WFFWqu8cCx0JQe479oYfC+HW/EQMM9lIfAKxKtA0+E=", - "module": "sha256-ABjvWOw2zcECnmDk4E3skwSbCSP3K1EVtfkvz72LLZM=", - "pom": "sha256-WkTlERyKKoi5GrmY4PNrX82XwHA8lU7UbEoEs9whgf4=" - }, - "org/apache/groovy#groovy-docgenerator/4.0.28": { - "jar": "sha256-Oum7KDuAVjVl5XypTOtVI7IAWo0tYoH8TzSQytu/hmU=", - "module": "sha256-QYwTPeaYaOd/R7s/1RHH5MGZi1lqmHRPFQBYVt0O5F4=", - "pom": "sha256-OktnupWsTUZWW+EDSFW+kHaSuymNHJjYUDN6SYddUZM=" - }, - "org/apache/groovy#groovy-groovydoc/4.0.28": { - "jar": "sha256-uKBIspxWUmM4v+boOGPBJQOCg2fAqW6Omh06nUD2RN8=", - "module": "sha256-lP+YJJv+D/cG9Gbh8/BrxVEEYPaKF6weAKiaza19GgQ=", - "pom": "sha256-i3jgEG5fcBYUsUIbcS9rey3CghTkB6vSlq2616A9uVw=" - }, - "org/apache/groovy#groovy-json/4.0.28": { - "jar": "sha256-7exFyF/4EfmpuqzfWwIONFk6AFWsY8kvvxIzw7LMnMY=", - "module": "sha256-p+XSHYLDIK1lKCUWe6h06ZckfA9EDNC5jeyOrPissAg=", - "pom": "sha256-NNo9+6t0rsGpasUl4x3yaMXf9TOE7LyvCa9LT/eEYp0=" - }, - "org/apache/groovy#groovy-nio/4.0.28": { - "jar": "sha256-4SFIS/nExw60moDL8aF3yR3PBZ8YSIsnt0LGKFAcAvU=", - "module": "sha256-A9HfzieZlxXBTK5rNS3GDBAWLJYOPRneqTOjdzZ+YLA=", - "pom": "sha256-d7GweHpeOunjVSg9lkbuM9JGnjjGO7EF9GHTqUnvZcY=" - }, - "org/apache/groovy#groovy-sql/4.0.28": { - "jar": "sha256-gGKmFwYmyA6XDBWsBaL7FuG74S+BzwU9BQ8RMe1g224=", - "module": "sha256-fN49Z1CYIkl2JQPkSZ5eGy/XeYaiPpRTLNgy7Gk/gp8=", - "pom": "sha256-m46b/+QL3lm8SNnrnx8TClkL64zPkDgX+J3zg7rOnT8=" - }, - "org/apache/groovy#groovy-swing/4.0.28": { - "jar": "sha256-9CoC3I4WPpNfCdrQnFF3/4CUc/jYLwBZs7F405B1UJg=", - "module": "sha256-udDDHWodt1OzELF6fgqoL4Tmvq99UtuOUaOuIRL5rck=", - "pom": "sha256-sc66G2WvxgY642VcCK8zBdoulywXMhoEip6n4tHIBw0=" - }, - "org/apache/groovy#groovy-templates/4.0.28": { - "jar": "sha256-Wmoc4gZAUlXkJ167OvX8vnJMTROw3pjzgjpERBLJDZc=", - "module": "sha256-Xi7G46wLXugLOkGVQpFlZ3//pFpK9OkgBPc9rEbRzFk=", - "pom": "sha256-d8ZKP34+fNZz4hXUuYt0v+YB9Ixb0M+EVXtmcQTC3yo=" - }, - "org/apache/groovy#groovy-test/4.0.28": { - "jar": "sha256-5ApS58kA3/NlVnZqZflLT5H5tDrbc+mUFepSCtRQUKE=", - "module": "sha256-JxCS8CDfuZmJpLXkWv+KZDo2GKsXoAIr5ywKTOSGxPc=", - "pom": "sha256-cqPaDnKJKttk2qC/UgIwNlgzQqizbNQuVc454epLFxI=" - }, - "org/apache/groovy#groovy-xml/4.0.28": { - "jar": "sha256-aNIwqKH3oXHrYM4eX7AFpBlA8nuLQhv1X9vjpcKIjqA=", - "module": "sha256-isVAq7j/VqqL1nobMSa4T5D3qzZjHAJiLk4QqWKcEIA=", - "pom": "sha256-Sl/k7rmpj9nonWaHC+N5Mw+RzzRfBYpr8gnERaqh6gQ=" - }, - "org/apache/groovy#groovy-yaml/4.0.28": { - "jar": "sha256-Bcl7OcGHwX8XmEDihLk9Bm+z8rPjKOmTTriZZKqDZsw=", - "module": "sha256-RUAvnM3WOpsAQbfi7AFxlI0/gKvq+gRpYgNZcutpH4A=", - "pom": "sha256-YJ4C4Q4egLLuldBVWCMw4b1k/5L/KnrAEF1oGb/kJ48=" - }, - "org/apache/groovy#groovy/4.0.28": { - "jar": "sha256-13FkpEq5lIN+Ye7OrWRyG9sXlPorxnBKxv5wzTLvndM=", - "module": "sha256-oel3KLFJBsQZCBy5Qy/WNN5V9X8sTNbeUOkZGZlJImY=", - "pom": "sha256-BNs1k54GZwIIfzU1XJHu8fYfFL3Nqzkn+kVlfyaEFyo=" - }, - "org/apache/httpcomponents#httpclient/4.5.13": { - "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", - "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" - }, - "org/apache/httpcomponents#httpclient/4.5.14": { - "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", - "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5.13": { - "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" - }, - "org/apache/httpcomponents#httpcomponents-client/4.5.14": { - "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" - }, - "org/apache/httpcomponents#httpcomponents-core/4.4.16": { - "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" - }, - "org/apache/httpcomponents#httpcomponents-parent/11": { - "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" - }, - "org/apache/httpcomponents#httpcore/4.4.16": { - "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", - "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" - }, - "org/apache/ivy#ivy/2.5.3": { - "jar": "sha256-lQKqWqvwsUhJJKE+9LXSTxIff5GqtnaPEcydCQbAgDs=", - "pom": "sha256-uwX5Ztsh4F0Rq52AFoUB8Tf0SWsx4PwggFQ0E4q2W1M=" - }, - "org/bouncycastle#bcpkix-jdk18on/1.78.1": { - "jar": "sha256-S0jqCE5SMrnXnryhiHud4DexJJMYB81gcQdIwq7gjMk=", - "pom": "sha256-CVIrr36Zuqk6JRXRbPHLlT+iJ41+PEbIvv8n3AQXKDE=" - }, - "org/bouncycastle#bcprov-ext-jdk18on/1.78.1": { - "pom": "sha256-sSNVJiXCmwp9cnoufesfuCWHyJ8hPPCi9ISliDV45e0=" - }, - "org/bouncycastle#bcprov-jdk18on/1.78.1": { - "jar": "sha256-rdWRXmrPxqtYNuH9il4hxkiFNqjB8h84bus78oC3Atc=", - "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" - }, - "org/bouncycastle#bcutil-jdk18on/1.78.1": { - "jar": "sha256-2fpW+XsPdhzjvI2ddMXXE3qYe/W9Or/hAD+br6RaHS8=", - "pom": "sha256-dB1Vy0XEwsiJtaQ2t0fcIVKSMTLkJr5u9VUA7uf6UxI=" - }, - "org/checkerframework#checker-qual/3.41.0": { - "jar": "sha256-L58kW/aOQlnWEIlPJAbcH2Nj3GOTAr1WboJy5PRUEXI=", - "module": "sha256-s4ZywX9FUnayEO00Av+S3OZmdwsajGEMfMNK1UxTLSA=", - "pom": "sha256-XHOwdwVAhCzwagHSZLu4muXiSGadydqA6GHoIz3UZ1s=" - }, - "org/checkerframework#checker-qual/3.49.0": { - "jar": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4=", - "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=", - "pom": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A=" - }, - "org/codehaus#codehaus-parent/4": { - "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" - }, - "org/codehaus/gpars#gpars/1.2.1": { - "jar": "sha256-+eCL+WTzTRKTREBMAWZiduxDxnBN106NTKMtzR0vtKg=", - "pom": "sha256-QoGa4DFjcSPJS8c9bvANBfh29tSixUiztj722uw4gw4=" - }, - "org/codehaus/jsr166-mirror#jsr166y/1.7.0": { - "jar": "sha256-TU50Uy6BvGpU5MvahlmZ9KspiF6FDwuDXqN0gAuE0LI=", - "pom": "sha256-tmtSb0df2k3Oi5X/8P7ukkqPBZKYwzrgyTS3fYkJBkM=" - }, - "org/codehaus/mojo#animal-sniffer-annotations/1.24": { - "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=", - "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24=" - }, - "org/codehaus/mojo#animal-sniffer-parent/1.24": { - "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ=" - }, - "org/codehaus/mojo#mojo-parent/84": { - "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA=" - }, - "org/codehaus/woodstox#stax2-api/4.2.2": { - "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", - "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" - }, - "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { - "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", - "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" - }, - "org/eclipse/ee4j#project/1.0.6": { - "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" - }, - "org/eclipse/ee4j#project/1.0.7": { - "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" - }, - "org/eclipse/ee4j#project/1.0.9": { - "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" - }, - "org/eclipse/jetty#jetty-bom/9.4.45.v20220203": { - "pom": "sha256-6GaLKkTnymO8Jr36Iyevfj+X9wncvMXnsQnYH+w6VbY=" - }, - "org/eclipse/jgit#org.eclipse.jgit-parent/7.1.1.202505221757-r": { - "pom": "sha256-2MQUVqFpO+cF1ynPPvVBQrmc3OG7tzIZvBNISDKbT5c=" - }, - "org/eclipse/jgit#org.eclipse.jgit/7.1.1.202505221757-r": { - "jar": "sha256-GE1FHjbh9MtQCezVcHaop7S4bZ7bUJAzxz73zLlvwzo=", - "pom": "sha256-7QPmQbCTT0tC1ipIvYphoRdR+uoaYC3vxAGH51L5Twc=" - }, - "org/hamcrest#hamcrest-core/1.3": { - "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", - "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" - }, - "org/hamcrest#hamcrest-parent/1.3": { - "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" - }, - "org/iq80/leveldb#leveldb-api/0.12": { - "jar": "sha256-OvfzUKuBy6mjXL+HTmTJCG/bxUZGQ/2sAKkIu/b1v+0=", - "pom": "sha256-u3YgQdQp1fGrIo2Vdueo9KMJOXPYlp9J9Z60Pt4nEnw=" - }, - "org/iq80/leveldb#leveldb-project/0.12": { - "pom": "sha256-TC30AYOjb6TRMRQAa2se+DwABq6w7TQJOKc7Hu5FKP8=" - }, - "org/iq80/leveldb#leveldb/0.12": { - "jar": "sha256-PBLq+4v/NZ+XrsTXV0SAz8Bug/RHBN4CChwGJ2UbpLY=", - "pom": "sha256-BLLnbGq+AuopCM5vdltp80j3+lq86j5sO0DXWgRuMFM=" - }, - "org/jetbrains#annotations/13.0": { - "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", - "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" - }, - "org/jetbrains/kotlin#kotlin-bom/1.9.25": { - "pom": "sha256-GZrnpYnroWgYRqlUmmlc87CkLB2SEZpQqDD/Erq7oCM=" - }, - "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { - "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", - "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { - "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" - }, - "org/jetbrains/kotlin#kotlin-stdlib/1.9.21": { - "jar": "sha256-O0eTE6tsrqTl4l097oyoDDAsibpz4a9Nr6oQD275KWo=", - "module": "sha256-0wGffw1xkkzkcpjJzEavAkX3UhlxmzXFkV+8x+emk5U=", - "pom": "sha256-yAfZL3xqobZcBs+HIyNjUE5pD8o/PB4nIGYwoTIv1+A=" - }, - "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": { - "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA=" - }, - "org/jsoup#jsoup/1.15.4": { - "jar": "sha256-AGgw0Hl3EECN5VicGNhkNDwO8aOgxgPJyxOMlDtn2aQ=", - "pom": "sha256-chKJC3LAuGDgIlhWvnQT5469Ps0+y4Vn3eaqxic9+4k=" - }, - "org/junit#junit-bom/5.10.0": { - "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", - "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" - }, - "org/junit#junit-bom/5.10.1": { - "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", - "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" - }, - "org/junit#junit-bom/5.10.2": { - "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", - "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" - }, - "org/junit#junit-bom/5.11.0-M2": { - "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", - "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" - }, - "org/junit#junit-bom/5.11.4": { - "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", - "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" - }, - "org/junit#junit-bom/5.13.1": { - "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", - "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" - }, - "org/junit#junit-bom/5.13.4": { - "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", - "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" - }, - "org/junit#junit-bom/5.9.2": { - "module": "sha256-qxN7pajjLJsGa/kSahx23VYUtyS6XAsCVJdyten0zx8=", - "pom": "sha256-LtB9ZYRRMfUzaoZHbJpAVrWdC1i5gVqzZ5uw82819wU=" - }, - "org/mockito#mockito-bom/4.11.0": { - "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" - }, - "org/multiverse#multiverse-core/0.7.0": { - "jar": "sha256-xUOY8CKAVLf65lInQzrp2oflsqluuoJOZqkkkS0Q/FA=", - "pom": "sha256-p7gugArForuaPFPIf328LPcE45XMMnNRC6OAd9PrURQ=" - }, - "org/multiverse#multiverse/0.7.0": { - "pom": "sha256-7eh88cQ59oa9lF8cRiz8//VQg6HnKxjCjmP050MEohg=" - }, - "org/objenesis#objenesis-parent/2.1": { - "pom": "sha256-NDsaMJNBDj+ybGaZhCOrOJw6dEHNGohZvTJ90VtHmqQ=" - }, - "org/objenesis#objenesis/2.1": { - "jar": "sha256-x0MwzGuAbIBP0350SHtP5dfCdQxeFfvG76E73uG974A=", - "pom": "sha256-QFTxhhN+O4SafCPJ6EbNV9ii/jLBfUxivUIFEtdMPT8=" - }, - "org/ow2#ow2/1.5.1": { - "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" - }, - "org/ow2/asm#asm-analysis/9.8": { - "jar": "sha256-5kBzL7zTxicZJaUE8SXjg4Roj037v5LIYi387g0J7bk=", - "pom": "sha256-xXR+JccuGwfVJjx1x4rWGmJt0kWPr8r8I/gdMlPuQu0=" - }, - "org/ow2/asm#asm-tree/9.8": { - "jar": "sha256-FLeIDLfIXu0QHicQQy/D/7gydVMqaolNxMQJXUmtWfE=", - "pom": "sha256-cUnn+qDhkSlvh5ru2SCciULTmPBpjSzKGpxijy4qj3c=" - }, - "org/ow2/asm#asm-util/9.8": { - "jar": "sha256-i6BGDsso/Q4pgOXz7zQzpROkV7wHf4GlO9x1tYegjRU=", - "pom": "sha256-JNCXDhceKRe4Oo8PBdUKHNtcguUIVVtS28ydM2HE8Ow=" - }, - "org/ow2/asm#asm/9.7.1": { - "jar": "sha256-jK3UOsXrbQneBfrsyji5F6BAu5E5x+3rTMgcdAtxMoE=", - "pom": "sha256-cimwOzCnPukQCActnkVppR2FR/roxQ9SeEGu9MGwuqg=" - }, - "org/ow2/asm#asm/9.8": { - "jar": "sha256-h26raoPa7K1cpn65/KuwY8l7WuuM8fynqYns3hdSIFE=", - "pom": "sha256-wTZ8O7OD12Gef3l+ON91E4hfLu8ErntZCPaCImV7W6o=" - }, - "org/pf4j#pf4j-parent/3.12.0": { - "pom": "sha256-CJafObKJ1C3l4L6je+jADJoykGvd2Vhga6YqkP/om/g=" - }, - "org/pf4j#pf4j-update/2.3.0": { - "jar": "sha256-ecnWJAzagsPTHuelcitjWj03rVjBJKTbDd6kAUXDD0U=", - "pom": "sha256-UYnVbbrkEiTpD2l3vGFFOBOlLgvE4ITO6eaa8GUsZFU=" - }, - "org/pf4j#pf4j/3.12.0": { - "jar": "sha256-5K9fDpqbEewYfAhO2BnO3t5/Jwdqxc9qojM+zq21chU=", - "pom": "sha256-+2hRCZ61BSoRaSLHRpvmngj7w5ksF2thr9/gZGOvaYs=" - }, - "org/reactivestreams#reactive-streams/1.0.4": { - "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", - "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" - }, - "org/slf4j#jcl-over-slf4j/2.0.17": { - "jar": "sha256-r/0GdxWJ6/5FS7ETFaT0ZuyqE1uV8+eTlTTPHS/XBkw=", - "pom": "sha256-YaRGiqPB8zyfeSURHybiM5LZ9atx7gy8KHGD/BtSr8U=" - }, - "org/slf4j#jul-to-slf4j/2.0.17": { - "jar": "sha256-p6/NI7nP0UdeVclPlDuAjFkiA15+LCpcZaSHpBBrxTg=", - "pom": "sha256-OMMwoKtfCT5WK1L7Ya7GMK4cH5FAbjz1R3UEXlzPbAM=" - }, - "org/slf4j#log4j-over-slf4j/2.0.17": { - "jar": "sha256-y/MOr5U1ere6v5vhI9qcxwLw/oOyM5K3piWJ1gtYYtE=", - "pom": "sha256-35an+cEk2UwP2EfYccg6PgdGpP+4JxphJ2zPBCrhO6I=" - }, - "org/slf4j#slf4j-api/2.0.17": { - "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", - "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" - }, - "org/slf4j#slf4j-api/2.0.6": { - "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", - "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" - }, - "org/slf4j#slf4j-bom/2.0.17": { - "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" - }, - "org/slf4j#slf4j-parent/2.0.17": { - "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" - }, - "org/slf4j#slf4j-parent/2.0.6": { - "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" - }, - "org/sonatype/oss#oss-parent/3": { - "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4=" - }, - "org/sonatype/oss#oss-parent/5": { - "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" - }, - "org/sonatype/oss#oss-parent/7": { - "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" - }, - "org/sonatype/oss#oss-parent/9": { - "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" - }, - "org/threeten#threetenbp/1.7.0": { - "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", - "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" - }, - "org/yaml#snakeyaml/2.0": { - "jar": "sha256-iAydiW5LdKBsVJwVyklkUBZdaQn6FdfmYr7o9qZtevo=", - "pom": "sha256-Q8dh+StUnIsI+5kggCU+SfCpg+VE7wZjwfT51o61JhY=" - }, - "org/yaml#snakeyaml/2.2": { - "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", - "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" - }, - "org/yaml#snakeyaml/2.4": { - "jar": "sha256-73ea9dKand6MxwzgNB9cb3c14j7f+Whc6qnTU1m3u38=", - "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" - }, - "software/amazon/awssdk#annotations/2.31.64": { - "jar": "sha256-KNzoSALU9sY1VvOyjg5XXPsY9FIQyngw7McPYBhoZp0=", - "pom": "sha256-1K4RlC7AEgmsN/bjvChaCQyxhzi9gRrF0i8mByYrJ5o=" - }, - "software/amazon/awssdk#annotations/2.33.2": { - "jar": "sha256-uqN7yqLGvYj7+3MYVlIiJtjnRFxJegIHMfl1nxHxIJY=", - "pom": "sha256-oFGBHPlrzIOxcRMNjRTsgdDlp0P4E9T4O+LBaumjms8=" - }, - "software/amazon/awssdk#apache-client/2.31.64": { - "jar": "sha256-vhk15U9ETd1SQnoLcPvKLcnrr8tDcFbF1m3f/pqXaI8=", - "pom": "sha256-JXnlLgchEwefQe2t2Ue/784dbHnpjsTJBnar2nmPjio=" - }, - "software/amazon/awssdk#apache-client/2.33.2": { - "jar": "sha256-eBfFgrs+wLqd5yZTG8cYO4ZRRgXKyxes8evYfX8RCA4=", - "pom": "sha256-BUnIGq/AICKK/sA6OtwI14+MefpgShNfdty37/pdTWM=" - }, - "software/amazon/awssdk#arns/2.33.2": { - "jar": "sha256-oy+sU7mhnFEMfyZSDYxWlcynasyiuTNZRvJxaSuKsUI=", - "pom": "sha256-muZb2YxZIVRQAm+AXZ8VJTz9sQrT40uG8EIE91r9E6M=" - }, - "software/amazon/awssdk#auth/2.31.64": { - "jar": "sha256-KdOUKu7xduKxevZq7PWQfRKXTSokJtcmMScB+pr9vwc=", - "pom": "sha256-VfF7eyuqChSjMyiv8irUWIE8hTrX2zvDJXlrXbJRtcE=" - }, - "software/amazon/awssdk#auth/2.33.2": { - "jar": "sha256-reBhMxgfndRqyoTtxboTRPlOVF/c5683N8oEKDK6ci0=", - "pom": "sha256-UZCZg/WpWYSBnVPn6AASivMxgXC6hOxB0zdNlTBFZEQ=" - }, - "software/amazon/awssdk#aws-core/2.31.64": { - "jar": "sha256-6yQ4Rgd160o/DKSrLpYyBAG7Qog39HvBpS1PxTBEZWU=", - "pom": "sha256-Lex7iJ4AH8xOsd+MifQc0e6DPw7iDU/sIULl4xLC6HY=" - }, - "software/amazon/awssdk#aws-core/2.33.2": { - "jar": "sha256-LGJ2xjKpvmNLpM0w1YVZ9c3N7b+JB2efZUC8aN8Pdqw=", - "pom": "sha256-5stO2+2SGoQHIMAEMCy5DCFCqBgRVnW5XyVl9oLsDeo=" - }, - "software/amazon/awssdk#aws-crt-client/2.33.2": { - "jar": "sha256-hr+vxYQo+2NQ4HL4tAzpE1Nt+lNw14ITtYZK0IcelXU=", - "pom": "sha256-TS3bRVP5b4tl93KK0oyqucza6GnowGLd+zbEsmBafCs=" - }, - "software/amazon/awssdk#aws-json-protocol/2.31.64": { - "jar": "sha256-/FNjLM5T+hEZNP4FIwLlPHLrg+C00on/fjUIX9XGoRY=", - "pom": "sha256-vMrMxfHT1v5X/eRg623xK8C3JwxmhkuGOwnqolW8e/8=" - }, - "software/amazon/awssdk#aws-json-protocol/2.33.2": { - "jar": "sha256-Gxt7PWLgfr0IXHfHawPUJcjTzTSq7bR8z6NgGpngDSw=", - "pom": "sha256-miX/D60Wu//rG+Cc4KRu9w/eNUZGUPfpIOozNy/yujI=" - }, - "software/amazon/awssdk#aws-query-protocol/2.33.2": { - "jar": "sha256-Zuk1giL4vy8uOqV/quBw6ipKwsMKFQzqjAQdjofp4TI=", - "pom": "sha256-/jUa/Ay4zr5vz8jYD+IIcgBuZRW/MRKoSM6yeVV7HWg=" - }, - "software/amazon/awssdk#aws-sdk-java-pom/2.31.64": { - "pom": "sha256-EKTzMOznnXS2FAb8C50mFwYiWxnRm8033KeIL5/tZoo=" - }, - "software/amazon/awssdk#aws-sdk-java-pom/2.33.2": { - "pom": "sha256-r89FM0nkK0SNnRDCPy1h9mGw0l1zABpHDVahHhkjwa4=" - }, - "software/amazon/awssdk#aws-xml-protocol/2.33.2": { - "jar": "sha256-f0+e9J0oXhoFXGGbsrC4Qzh4c6KtHsizm/EJL9AvrBo=", - "pom": "sha256-ekz9y9W3qNft7b0qo06Y1UVoVIA8njzb8srQ7017NZ8=" - }, - "software/amazon/awssdk#batch/2.33.2": { - "jar": "sha256-NyjDw+hxanWIYEfqhTsFNmyRMTcXLrLUF16d0K+DAE8=", - "pom": "sha256-/BogoiV5aH2LKGXKSH+ILlIRbAsV5UNKBSOdyX8mK+k=" - }, - "software/amazon/awssdk#bom-internal/2.31.64": { - "pom": "sha256-bRoyIGhsLUhhCFdJ4ibPKJm7yqa9FgmGYie4vCd9CHA=" - }, - "software/amazon/awssdk#bom-internal/2.33.2": { - "pom": "sha256-jEwhx9rjl5OTOsJSP04geFYvJc5yBa7wkdVcqo2FQvQ=" - }, - "software/amazon/awssdk#checksums-spi/2.31.64": { - "jar": "sha256-BUGcmLVtu+tiesrOt1vLJivzKytsgJVCCYv70gQx0WM=", - "pom": "sha256-HbK12LhbUWJ7PvbU4GeQHKrP0j/YAMhfSge9GV+hsOw=" - }, - "software/amazon/awssdk#checksums-spi/2.33.2": { - "jar": "sha256-I38mmjJDwhZrVWJ2TOqERa4mY27pDXukxYSQdWsloIQ=", - "pom": "sha256-YI8pSNSYBa0YmeG491601joyCYOZtZN8/12V4isGDjg=" - }, - "software/amazon/awssdk#checksums/2.31.64": { - "jar": "sha256-bDFa/Ohqy6aP3Xkp4yfVCFSmG5Y0J1NIC4he4bnom78=", - "pom": "sha256-Y4RO6qUJLv0EU8QKupBFWK5ETGyTP1E9eUkV+tSwffY=" - }, - "software/amazon/awssdk#checksums/2.33.2": { - "jar": "sha256-hpMem+OtM4T6Bp5J8SQNT2r9WUJ5xlF12IUygLWF7/4=", - "pom": "sha256-ZASWWe1XRiJ2FS4EksDeTg90OJft0X658f2ma+LrocQ=" - }, - "software/amazon/awssdk#cloudwatchlogs/2.33.2": { - "jar": "sha256-zMvRkztmgA+dS7HGlEE5jCjKSES6HDx88mrZoouIORg=", - "pom": "sha256-I9rp998aKZ8QbXBRXZPKR7szbrnpxKTmOEcCQQCgppY=" - }, - "software/amazon/awssdk#codecommit/2.31.64": { - "jar": "sha256-s6YLXh23kmZCWbHwkTduhfneUxpvbs9z3FxXO5FjKYo=", - "pom": "sha256-2fJ7mg77cQId2hR4jMQPTSIb8ZFzRADcltpOzZGbqhE=" - }, - "software/amazon/awssdk#codecommit/2.33.2": { - "jar": "sha256-ca54dlGcQus6oEcnfy3JtoFeggkk9FDgaiB6Gdce+Cs=", - "pom": "sha256-ATUQjl/EWaXfcJ86Xf1abJXJhEfUlUz05jjiJ3VwS+0=" - }, - "software/amazon/awssdk#core/2.31.64": { - "pom": "sha256-Z+LrTCCszira8lI95jy5v2e7Bxc1Bq1DeIvODAx3Fc4=" - }, - "software/amazon/awssdk#core/2.33.2": { - "pom": "sha256-+MXXmejHJ9Z+dSQ4Jg0P9kh4ih4oEkVl9Ciwt9I26G4=" - }, - "software/amazon/awssdk#crt-core/2.33.2": { - "jar": "sha256-M1Tew/FSMsNccqOHn0nB1ByHyLswa2dpxw4+sHIyRpY=", - "pom": "sha256-5zgmFqX/aNcrux32ksrX9xanREvkLfGrlnBKkxjh2Ds=" - }, - "software/amazon/awssdk#ec2/2.33.2": { - "jar": "sha256-tWqmB/+DxCkyNgo+nMx2n+fidWmB2pEIno5vWBGGiXw=", - "pom": "sha256-zqYgtbwdVSkdQXj/xG7Xf0A+tnIZ4fBA68ahxsDWo1s=" - }, - "software/amazon/awssdk#ecs/2.33.2": { - "jar": "sha256-1nPtw6X1vXlEAJMy6av8yGVFDJT/M6x4+R+kjYtWaHE=", - "pom": "sha256-97yV5N2UvVdhsrl5JjluOcZHGpw27wC34rAvjiVSxc0=" - }, - "software/amazon/awssdk#endpoints-spi/2.31.64": { - "jar": "sha256-pkrKlrVp5rUGNmI3ztveAwGNp//5ExcfKl9muFXkONo=", - "pom": "sha256-UiUWuyr9hsmNtEqTo5dDqnnU/F6G8HwgV7qa3hukabY=" - }, - "software/amazon/awssdk#endpoints-spi/2.33.2": { - "jar": "sha256-TkABHEZI3NjdCQes/gHYn4ynCwPW6wz11G/QRIXgcX0=", - "pom": "sha256-usX8WmHeyCroEmHbG6IY4CN8LlN/SW5Emma64SfpDag=" - }, - "software/amazon/awssdk#http-auth-aws-eventstream/2.31.64": { - "jar": "sha256-/F/EabtBDeZ2nyCMBDpqDOVfzk7k6D/Jl1Cd8dsngaU=", - "pom": "sha256-ZoltDsRmgL7XHLNdekxuH6E6FCsDRiDUGqgVLnijR0U=" - }, - "software/amazon/awssdk#http-auth-aws-eventstream/2.33.2": { - "jar": "sha256-oBBWL0BZysGvwdIG2Zw/OfjUnp69Ru0gbkABq7FsXAc=", - "pom": "sha256-yRow6u0YWdxzHEZuFxc9I5cWE717uazm9h1FqOQrbII=" - }, - "software/amazon/awssdk#http-auth-aws/2.31.64": { - "jar": "sha256-c4xTHcWvaa2zyJ4trrt091bA8Pc5rwV6UQWWUSNkFuM=", - "pom": "sha256-CSFndKpd/Ur36ym4Z0mQCfNzKWZXDZUX/jnagEr6quQ=" - }, - "software/amazon/awssdk#http-auth-aws/2.33.2": { - "jar": "sha256-wXw+bZWLuhjw/fFFyn/r88UvdR/1vIsTFNihdSpEZiE=", - "pom": "sha256-2Fc0iYzgK2Rra82UT0QcfuU0gflkxqgvfBDwefVl8iQ=" - }, - "software/amazon/awssdk#http-auth-spi/2.31.64": { - "jar": "sha256-bqIl8boj99jo6dKkmNYKhdy/XTQ6Sbzn/Sid2FNOzEA=", - "pom": "sha256-PFB3otJM+Nbq8vo/CKvBPTbB4wThs8DO6Y/EPXUz7sU=" - }, - "software/amazon/awssdk#http-auth-spi/2.33.2": { - "jar": "sha256-AW8NcyQYtES0huuxfF4xy3gF6kH83YAV5ed1VAOseGw=", - "pom": "sha256-WRitOIRV2/77wIMnb9mV1xWaQthD6GUBF2YNazQJwwo=" - }, - "software/amazon/awssdk#http-auth/2.31.64": { - "jar": "sha256-yCYnzvnNQlSibRrFQk34k4zycp9RWvh/ncij7TnoGUQ=", - "pom": "sha256-9/XcGk4JSl7cDxtdNd9k9M8nulwIl4zSvs5LTyYxYN8=" - }, - "software/amazon/awssdk#http-auth/2.33.2": { - "jar": "sha256-6VUl8oZxhEuDnrmmehJcEk767S6VlStmZRtwG/c7Pko=", - "pom": "sha256-4KVgEvqYBDH69ndCpVL0WCgi8vT3NciGzwvoWHP17TI=" - }, - "software/amazon/awssdk#http-client-spi/2.31.64": { - "jar": "sha256-glXTUB5xqBzq+EqDAEfwkfrG+EXkkQ/HRjUgG6s5kJA=", - "pom": "sha256-r5GnPP1wV451SaU3BSQfblHZlaQHoCLNB1NS+kVJJTg=" - }, - "software/amazon/awssdk#http-client-spi/2.33.2": { - "jar": "sha256-5gVY0cimjW6WFb3Ax3NZE3b+yQnH3RHZZB4VZWqMp4Y=", - "pom": "sha256-YZlaG7UOCEAXeICzKMD9583c9A/ETfGOsfoxX+wGJy0=" - }, - "software/amazon/awssdk#http-clients/2.31.64": { - "pom": "sha256-6mmjdFyzyoT7DcP8u41SCZFuKKVHVTtvqvaCiERAYLU=" - }, - "software/amazon/awssdk#http-clients/2.33.2": { - "pom": "sha256-pv9dZ1ZuMyYXv+7ZNrvjDjBLmHHXHXTui3gnzrSNgRE=" - }, - "software/amazon/awssdk#iam/2.33.2": { - "jar": "sha256-PlDOORBI6snv3o46jdLPbocQgLvu3rWEii2kUnhcZk4=", - "pom": "sha256-nAhxtX+2/B8dSq859/XVS0xmipyB7PmYuK02UN4Us58=" - }, - "software/amazon/awssdk#identity-spi/2.31.64": { - "jar": "sha256-h03IGzMm7kl0m7okeIk0vlLWD08jSYFKntJzlFXWBsU=", - "pom": "sha256-1ZRtzqvbVNjaSp/RIywWl9OL0gaw4TPzrVbtonnbmgM=" - }, - "software/amazon/awssdk#identity-spi/2.33.2": { - "jar": "sha256-CT6E82sLPwEPVEHN4fDJC/yQoH+/c5cPX8Rba2TtYqE=", - "pom": "sha256-23HnBsmUVDc4OV0pB5WzXwxw7UDqwtho0BgpaLPEfvw=" - }, - "software/amazon/awssdk#json-utils/2.31.64": { - "jar": "sha256-LQVUYlVSRzQe41XJCE4rOKrIDGhsa4qj1zqi61ylTo0=", - "pom": "sha256-Y2gUrUWJm/bJcQ40tz6XYR2syLDLzGvO+80hk7t4AE0=" - }, - "software/amazon/awssdk#json-utils/2.33.2": { - "jar": "sha256-zIIui/wD0gtEgN+Qh3VSfBD/rEeFAicmoUGOCOxr4AY=", - "pom": "sha256-E6lhWcT0IYI2xg92j5HnodXfv+k2KYx6W0bcHCdPCY8=" - }, - "software/amazon/awssdk#metrics-spi/2.31.64": { - "jar": "sha256-RplsbgBgMu8JAGYcyF/sFczWWxvxc9yBw81lxOjBPA8=", - "pom": "sha256-P/aw+/QdkN9XskNP0Xiaa26fSaDdy8lpvTwJ6wrTPnw=" - }, - "software/amazon/awssdk#metrics-spi/2.33.2": { - "jar": "sha256-wssdgFYBFuXglwuMDR/cH8ZISQG0adXSTL0TUtldUpY=", - "pom": "sha256-ilooBEY3Y297ZHuh04bYj3TmyWjkAaqc8hBpF3bmk/Y=" - }, - "software/amazon/awssdk#netty-nio-client/2.31.64": { - "jar": "sha256-Px9yzx5hUkYbLjtWKzx1c5raM2alLO8JmSnNjBLTUrg=", - "pom": "sha256-CCCmqcG1ogYQ7nDTxBp686L7CsaOef3aqpzxtJlv734=" - }, - "software/amazon/awssdk#netty-nio-client/2.33.2": { - "jar": "sha256-Zn+GsbPyHluX1nQb5glfHcWs4u1/Su1wKt1hFcnZ5LI=", - "pom": "sha256-m3dijF55jde9M0QALzemuoF4fkqBimNTHPezng1v5Uo=" - }, - "software/amazon/awssdk#profiles/2.31.64": { - "jar": "sha256-uq31XL4S3NcToG1bZKifJkPACR0fhjy2pEgmQa6bqo4=", - "pom": "sha256-z+x4WDMs/z1DlAQsH+67LYR/78/nTaNSJy+GlS6R9aM=" - }, - "software/amazon/awssdk#profiles/2.33.2": { - "jar": "sha256-lI3oyPB/FYV8DT7l1ktcRZotEjpUUh3d9vfazKwdo6U=", - "pom": "sha256-UM6pAmFoXm5RPDu8O+QO/BNgPQpkf1knmEo5YTGrTx8=" - }, - "software/amazon/awssdk#protocol-core/2.31.64": { - "jar": "sha256-bmrf+hT3WmosRxCvxv9gwWJn1TufZMcjsNw4wT15LOk=", - "pom": "sha256-ty67RqC4GcVUsZC/PE4+Nu3t/qfccAnXVFZHkM0MAfY=" - }, - "software/amazon/awssdk#protocol-core/2.33.2": { - "jar": "sha256-vvV+pM54pIHu1bPIUfI5tlHbX4aykhm8aXPN27sCCWg=", - "pom": "sha256-eRPhrm5f28EyaUWIiLHZmwLKVIlFfdu27n03gIxDjd0=" - }, - "software/amazon/awssdk#protocols/2.31.64": { - "pom": "sha256-ONkRI1Ji2XzHCThAx6ohwzAck6Xdq1IC9Wm0Xs0xHpM=" - }, - "software/amazon/awssdk#protocols/2.33.2": { - "pom": "sha256-rLENGvetyDFxfRBVjViPGg6q+VoghGygK7G5aNWLqd4=" - }, - "software/amazon/awssdk#regions/2.31.64": { - "jar": "sha256-j/fIIvNrHLhW2oxI5aYqf2iORjkof835ZdzCbMg9ebw=", - "pom": "sha256-5/2RREvzNdxZNyzi4KBmhS/FO2UsPyl4Nm03/JR9o4E=" - }, - "software/amazon/awssdk#regions/2.33.2": { - "jar": "sha256-DVgnK2n+i3GXVeouSm5XD1xwkOGZ6Lhm3IV6RVcAX+g=", - "pom": "sha256-YdBu/Odru7UdoNVorhyUhW2Uoh0fpsDYet+NTyGHEMo=" - }, - "software/amazon/awssdk#retries-spi/2.31.64": { - "jar": "sha256-K8ZXF4nnBVYDplJQBqHgm3DgpqeK1CG856XX5XtKIsU=", - "pom": "sha256-a2+51FsQUNP09uqGSrzEeXW7ay7EshTQ7FvvAOmA1l4=" - }, - "software/amazon/awssdk#retries-spi/2.33.2": { - "jar": "sha256-HlKya2k/esWF+7T5oefCCz7f51wk7AqsCoKTlaxYIkU=", - "pom": "sha256-dDv6JPGmNTKg5Xku7syruXp7AiQxTcW8+YZfHZkAaWc=" - }, - "software/amazon/awssdk#retries/2.31.64": { - "jar": "sha256-Zcq+9XHpFE3Cx9wt/AIMrf4ekHg9FS0ae1N/aDeLiQI=", - "pom": "sha256-gVXKAY5FEFEn1BXLA3m1G7/ExLAMIUOVaLAVOc+GdY0=" - }, - "software/amazon/awssdk#retries/2.33.2": { - "jar": "sha256-8lXyMjuTzqdYRNfBQJAzdVG9+tZq0rX506vyAsKPegE=", - "pom": "sha256-0RS9WOU5XHWuDBTpcyeSmKX86O2YRsC9FYMfaLqlrCo=" - }, - "software/amazon/awssdk#s3-transfer-manager/2.33.2": { - "jar": "sha256-eLJus7P8FBThcbwFnypuY70XN9o0Fs2N8FJXPv8AuhM=", - "pom": "sha256-6Af88teAWINA6w+ghKIB8li6S86XCHlqKijEg6tcsWQ=" - }, - "software/amazon/awssdk#s3/2.33.2": { - "jar": "sha256-WB99nH0JnSaAj4g4rmlDo4XwSsgqGs9GHztWLkQLoXA=", - "pom": "sha256-l6ECqtyP0zTIk3b79y4YM/VkF3pbw+rs4HxouI2Pi4U=" - }, - "software/amazon/awssdk#sdk-core/2.31.64": { - "jar": "sha256-8iAVNhxsmP9odaSEXGOZs72GsSIZQmqS/+pivpJhf5g=", - "pom": "sha256-iKAzplw9I7QDRP9LSf8uCOpq8veR+1NU9ipwrllVpxA=" - }, - "software/amazon/awssdk#sdk-core/2.33.2": { - "jar": "sha256-vidvx0AMOjbk5EO3LoQTglmX//S1hOo1fyIzDvmRYsA=", - "pom": "sha256-jB8ed2NOqr2ZARJdbpY3YS2u988YtCy9c7uvT37JOus=" - }, - "software/amazon/awssdk#services/2.31.64": { - "pom": "sha256-EQbUigiGgsoBpb1TefnW+yMxCCYHnq10g2JeEvl5cQg=" - }, - "software/amazon/awssdk#services/2.33.2": { - "pom": "sha256-Q+H8XXA78q0pWO/WQsGE/Soik/b+lpL2Q/yRCRFy3l8=" - }, - "software/amazon/awssdk#ses/2.33.2": { - "jar": "sha256-NXQEVpG1o+vV0kun3IR6CsXCdLiK6hiG9zLgQlhzmzA=", - "pom": "sha256-prewbT5fjOIDBF28SmiICXc5XyYPy0YIDSt0030y3XI=" - }, - "software/amazon/awssdk#sso/2.31.64": { - "jar": "sha256-+Wk5ln3vKxkuRYhbhg7mKfzy5ITMP6FmVL9iiHeU99Q=", - "pom": "sha256-SF/VtAB1BA8u1LbwNNcCSEIvD4k7Dj5ifJwIrfV3tF8=" - }, - "software/amazon/awssdk#sso/2.33.2": { - "jar": "sha256-52/YD1+V2Pln70SwFUNB/buHOmcaFuKl+8xFts1Yy5E=", - "pom": "sha256-Mn1Q8/siKs4JpYHbNB4hmTZqcllid2AfsbbT8G5wjQ4=" - }, - "software/amazon/awssdk#ssooidc/2.31.64": { - "jar": "sha256-F+gEWkWJQcKvoMwd/q6ejD0LHrX5rFcU/MDR/9N5yyI=", - "pom": "sha256-CNbw2EnOnCLfcb8uilTE3ap+41o4+KkZeFiszRsRB3k=" - }, - "software/amazon/awssdk#ssooidc/2.33.2": { - "jar": "sha256-l/dFkHe/4octyQ4jTpTNBvWd3UvtUWr5IDZvO/i8p6s=", - "pom": "sha256-6UWoANAhrYMpCuc+QvMN5KBYSX0Swi0/42fPloNbOuE=" - }, - "software/amazon/awssdk#sts/2.33.2": { - "jar": "sha256-/LHonGN4jlcNe8+y/9F76Ocj9+HBzQQQGGCMXQH/ZRA=", - "pom": "sha256-WICoEW/eGDqvPmm3yjyI4e/QJjsuxX8LQCgs+NiHOqM=" - }, - "software/amazon/awssdk#third-party-jackson-core/2.31.64": { - "jar": "sha256-gVTXDWc3yPO8MrFM6YWonNZCnqizL88ZvJLPCq4TELc=", - "pom": "sha256-aLPi9Jp17ozE5ZZ5gmolJmc/QOHCE9PzbGmjMZIk1+E=" - }, - "software/amazon/awssdk#third-party-jackson-core/2.33.2": { - "jar": "sha256-4viAwLTidG6qOi/vVIhhI0ZYxLKUG/G2/1pn87Z+abw=", - "pom": "sha256-ROvtOPOw5i5St+x3NZoctJ4VTc4fzytOXteDjH184qE=" - }, - "software/amazon/awssdk#third-party/2.31.64": { - "pom": "sha256-W+JQm4Tke3jvHkWXlP6VnjKrx6P6L+8PLX+jzmg7VvI=" - }, - "software/amazon/awssdk#third-party/2.33.2": { - "pom": "sha256-4lRTtdgYIDCy0Y4AAseOvDtC528TnrBwH+LqV10OfAU=" - }, - "software/amazon/awssdk#utils/2.31.64": { - "jar": "sha256-SaKPwNsb6LSjVD+siz1ZvNseu2E2xgxrmvUYqq2oO4I=", - "pom": "sha256-Kr7t3GC6g/uxy6LW0Nllz/rwsKla1Mk513JWE1V69kU=" - }, - "software/amazon/awssdk#utils/2.33.2": { - "jar": "sha256-KNmt4ZRIeparKERWrQL8xVBJLCjfrCnZgqXsbasLMN0=", - "pom": "sha256-lOKJ3o3YjaSgQ0U/5MNULO41sqXpbnmhRq2CNkflR+M=" - }, - "software/amazon/awssdk/crt#aws-crt/0.38.9": { - "jar": "sha256-KLjREWAo5RoH+jMUldqIGFN7kf8MBbAzyid09lleCrw=", - "pom": "sha256-OND6oPodwBZfYBGjBNCXaybOjFfxLLM1oPvfxWYW2dk=" - }, - "software/amazon/eventstream#eventstream/1.0.1": { - "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=", - "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w=" - } - }, - "https://s3-eu-west-1.amazonaws.com/maven.seqera.io/releases": { - "io/seqera#lib-httpx/2.1.0": { - "jar": "sha256-drNuslh7ZOtxXUgHfvnCojWpTLmhJnLrHEi81W3Zrpk=", - "module": "sha256-epgouP6w2w6GYb3p1VXlobA/QUA/gvgrtK5fHDpMxAE=", - "pom": "sha256-ldfgtkaHlCaSwALU1dLRFPxfZdicwusaX3hUFr8I+4I=" - }, - "io/seqera#lib-retry/2.0.0": { - "jar": "sha256-Jsm0RsqaGA4YauDXhCsInpHSXOXRVdbfxB9L7vsb3g4=", - "module": "sha256-/CBYeLHQ3g2HEvvw0qQrLPxNsGwgBOjkHeqPU3nYAoc=", - "pom": "sha256-oWpIkVDCR8ropmv6N6DTZVvnLCXba5Jvrj6NC5xFdr0=" - }, - "io/seqera#lib-trace/0.1.0": { - "jar": "sha256-RKIiVjF8aaA6pr2R5XIsnnP25UW1ndJSFvnlaHPtFVM=", - "module": "sha256-1UOM6CrRnBUS9TBNzvOF6BN0CNQxTLwrz0UlCHh4qSg=", - "pom": "sha256-cuYyaQgZKNkfT205ooyAHiqOy10G3o1yK4LrUwFUnDA=" - }, - "io/seqera#npr-api/0.6.1": { - "jar": "sha256-2UBO8AkeFNemVjBU8TaIWuBndVfZdIuSnwO/Tci2528=", - "module": "sha256-CSGlYH7YXF+hpGl6iJRK2iDWEXzamEmbmhCf/fF7nQU=", - "pom": "sha256-oIzWvfBFywBx0NkaSNc0PM315W+MTRKa6fiCWOvYHIk=" - }, - "io/seqera#wave-api/0.16.0": { - "jar": "sha256-jH2/ZNH2+YfPr0VcnIRlxcnSPRSTz/ZtKMGUh46HJdw=", - "module": "sha256-8uodWFIc2bJtc2fLmZ+3RQret2m2HKIHp4lN/q1Koic=", - "pom": "sha256-4MZ18xPH2wi7LOe4HjV9YG0pe7EQw3hHHun6251lXQw=" - }, - "io/seqera#wave-utils/0.15.1": { - "jar": "sha256-7Njw8cRylU0Nc9Zd0Sbslc0jzpCpKlwB+voA5JJ16ro=", - "module": "sha256-2ZenhaekVOpIfI6YfMxs6mF6vxsNPv83PUIVckvKy10=", - "pom": "sha256-OwIySG46adK+1yYNqR7gTsyj+ccDnW1byKk7HFDu+4U=" - }, - "org/apache/groovy#groovy-bom/4.0.21-patch.2": { - "module": "sha256-A38EDWOFyVE2tpRetXMsRbObHavHanSG0Z+Ea6iUErk=", - "pom": "sha256-DbAn/Ue8d61Hro5LY/gnyZwbDF0bcPTxtdeuSnPDXKk=" - }, - "org/apache/groovy#groovy-console/4.0.21-patch.2": { - "jar": "sha256-5u2tAQZfe46pmvWkePVNScU3uw5u8uFCNdaVeELM5Aw=", - "module": "sha256-Xj/ZsAfVMWDtV72+R3RRdrVKmffOH/1ynAlwj2NwMzU=", - "pom": "sha256-C/44K5FvC04qagEWksqaa2QSKoDucSJGeI7b9O8dal8=" - } - } -} + "!comment": "This is a nixpkgs Gradle dependency lockfile. For more details, refer to the Gradle section in the nixpkgs manual.", + "!version": 1, + "https://plugins.gradle.org/m2": { + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml#oss-parent/68": { + "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.1": { + "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.2": { + "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" + }, + "com/fasterxml/woodstox#woodstox-core/7.1.0": { + "jar": "sha256-gSZpIKHNxHMGqKK0cmyZ7Imz+/McJHDk9eR32dhXyp8=", + "pom": "sha256-+ZXFCx0gl18KjW8OUyK8jRPHiuPcGCcXdoQUlypmzIU=" + }, + "com/gradleup/shadow#com.gradleup.shadow.gradle.plugin/9.3.1": { + "pom": "sha256-yIQ/agfj0unj0+swNOFVvW/ctWE5kEyShO/95R16X6Q=" + }, + "com/gradleup/shadow#shadow-gradle-plugin/9.3.1": { + "jar": "sha256-lGB42YbsVs6P+NAWN9kPcJ8zPVg6tSCq3Y5EnTcE2Gc=", + "module": "sha256-IuNwRjPPGSGbTVGUqNKJDPfPTbctRA5g6BIlcS+na2w=", + "pom": "sha256-nLrNpEyjh3wt54LMo5iIGUYCimh4H/kOypnamAgO/JE=" + }, + "commons-codec#commons-codec/1.20.0": { + "jar": "sha256-avZllfn2p7tYzmZRjWiI1AtUfDZtImLwZnbu4ZUo/2Y=", + "pom": "sha256-r/ZFxYzUGsUYTZds6O443laU2Zq4dk1u5/FPcOrV+Ys=" + }, + "commons-io#commons-io/2.21.0": { + "jar": "sha256-fWQ6Kv6osFi3YqpvuQ5bJW9scpc5+LN4TDNw3cYJ6I0=", + "pom": "sha256-rkd5XnIYA+yP8d7tdL4oqBGgJxO9WjqwrGfCtYy2Nas=" + }, + "io/nextflow#nextflow-plugin-gradle/1.0.0-beta.14": { + "jar": "sha256-sJQ738v+xxka8xYwIC/ahbyjZiMiuIY4W+bDqTxwbdE=", + "module": "sha256-p7Fict1iNNpbtkxCFXJwOdvIf+AGOcmZljEjVRWuI5s=", + "pom": "sha256-G4T1oPFNu4/pUXy2n5iNSpFnCDIjR5kCtFD+sNT0f1E=" + }, + "io/nextflow/nextflow-plugin#io.nextflow.nextflow-plugin.gradle.plugin/1.0.0-beta.14": { + "pom": "sha256-xAw3d/xHFSlQb3MVgmijULVxNaZvuFMiaKMjL+cLtbU=" + }, + "jakarta/platform#jakarta.jakartaee-bom/9.1.0": { + "pom": "sha256-35jgJmIZ/buCVigm15o6IHdqi6Aqp4fw8HZaU4ZUyKQ=" + }, + "jakarta/platform#jakartaee-api-parent/9.1.0": { + "pom": "sha256-p3AsSHAmgCeEtXl7YjMKi41lkr8PRzeyXGel6sgmWcA=" + }, + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" + }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, + "org/apache/commons#commons-parent/91": { + "pom": "sha256-0vi2/UgAtqrxIPWjgibV+dX8bbg3r5ni+bMwZ4aLmHI=" + }, + "org/apache/groovy#groovy-bom/4.0.27": { + "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", + "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" + }, + "org/apache/logging/log4j#log4j-api/2.25.3": { + "jar": "sha256-6IZoKSD6D7nW62OV3LTeCIRD+GRsicXlhG4WjjJ/QG8=", + "module": "sha256-W+T3N0jWz53pXLci63n8rVvCQnk6l4p+cmbyNZGBHAw=", + "pom": "sha256-MoS+ZXOuuDNGz/a3RvoyXSPq3Z0JyOKG7R11kEoS3W4=" + }, + "org/apache/logging/log4j#log4j-bom/2.25.3": { + "pom": "sha256-ZleICHEo/mw6+dAlJEhTKvl4cRdmSB20k5a/AyWibK0=" + }, + "org/apache/logging/log4j#log4j-core/2.25.3": { + "jar": "sha256-Nit/y2W3OqRsxLxTq/TrIW9ESoO10aA3y2/f/wrp8Pk=", + "module": "sha256-ChRnoKtPxLJSc7VVHGCL15UguZ/SgRGgM9M4jwJVYwA=", + "pom": "sha256-ysGDRqDJErAmrVF/SE78POgyZ/LPambKhGmRL/GYaw0=" + }, + "org/apache/logging/log4j#log4j/2.25.3": { + "pom": "sha256-pbdIJFris5b1vKlHpJbtwI29vfeWmuLMsattS0lznn8=" + }, + "org/apache/maven#maven-api-annotations/4.0.0-rc-3": { + "jar": "sha256-XTSQ9yrTp+gr6IsnYp83xZ/SUxuuURw7E4ZkINXYYr0=", + "pom": "sha256-83HUqkRgxMwP4x0W20WC2+eGHvzS5nqvGEPimR8Xx0I=" + }, + "org/apache/maven#maven-api-xml/4.0.0-rc-3": { + "jar": "sha256-8+OzZCNzxp1MdEHUDroHZeHXROmStiGURS9epUUd/bo=", + "pom": "sha256-XxSOOelo08K3a4426hN3mJ8KeetDpqWa5yPZElzLXGE=" + }, + "org/apache/maven#maven-xml/4.0.0-rc-3": { + "jar": "sha256-BjxCTLR/dRZBJdXuolFnuTHdaU40Jo1QJHN050IR3Rk=", + "pom": "sha256-nZZekiyqwDYkl9J7v6UaRI+UydcTYjZnnGhSNwb3KYI=" + }, + "org/codehaus/plexus#plexus-utils/4.0.2": { + "jar": "sha256-iVcnTnX+LCeLFCjdFqDa7uHdOBUstu/4Fhd6wo/Mtpc=", + "pom": "sha256-UVHBO918w6VWlYOn9CZzkvAT/9MRXquNtfht5CCjZq8=" + }, + "org/codehaus/plexus#plexus-xml/4.1.0": { + "jar": "sha256-huan8HSE6LH3r2bZfTujyz1pKlRhtLHQordnDPV0jok=", + "pom": "sha256-uKO6h7WsMXVJUEngIXiIDKJczJ6rGkR9OKGbU3xXgk4=" + }, + "org/codehaus/plexus#plexus/20": { + "pom": "sha256-p7WUsAL8eRczyOlEcNCQRfT9aak61cN1dS8gV/hGM7Q=" + }, + "org/codehaus/woodstox#stax2-api/4.2.2": { + "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", + "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/gradle/toolchains#foojay-resolver/1.0.0": { + "jar": "sha256-eLhqR9/fdpfJvRXaeJg/2A2nJH1uAvwQa98H4DiLYKg=", + "module": "sha256-YZDPDkLmZMEeGsCnhWmasCtUnOo0OSxnnzbYosVQ/Lk=", + "pom": "sha256-m8SLSeQi2e2rw5asGNiwQd/CIhLX+ujjVmfShdSBApo=" + }, + "org/gradle/toolchains/foojay-resolver-convention#org.gradle.toolchains.foojay-resolver-convention.gradle.plugin/1.0.0": { + "pom": "sha256-8TMkmhh1Suah0nAdANhJsa+6ewaD3bX8GxinAHHOwvo=" + }, + "org/jdom#jdom2/2.0.6.1": { + "jar": "sha256-CyD0XjoP2PDRLNxTFrBndukCsTZdsAEYh2+RdcYPMCw=", + "pom": "sha256-VXleEBi4rmR7k3lnz4EKmbCFgsI3TnhzwShzTIyRS/M=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-metadata-jvm/2.3.0": { + "jar": "sha256-DGQgOZHQIy2YnNXjZtYCjSexsIckCBgXi9UMJo7qtW8=", + "pom": "sha256-N51JdplIjLxv11nTN2QrRWLD2lI4g8NMH201PgZZvJc=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/2.3.0": { + "jar": "sha256-iHWHyRcTJQrVL+FK2RZtBCwzg1BJiQ6UN/NV/8WhlbE=", + "module": "sha256-CRCoo7aWD8eSxFxWqR18Oj8mKG8DKVVUtRnP83h1baI=", + "pom": "sha256-TVJW0+SETmVrDKQF9jUNbyF5XCQ3WzRSUmxUZ92ZtaI=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.13.2": { + "module": "sha256-7WfhUiFASsQrXlmBAu33Yt1qlS3JUAHpwMTudKBOgoM=", + "pom": "sha256-Q7EQT7P9TvS3KpdR1B4Jwp8AHIvgD/OXIjjcFppzS0k=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/springframework#spring-framework-bom/5.3.39": { + "module": "sha256-+ItA4qUDM7QLQvGB7uJyt17HXdhmbLFFvZCxW5fhg+M=", + "pom": "sha256-9tSBCT51dny6Gsfh2zj49pLL4+OHRGkzcada6yHGFIs=" + }, + "org/vafer#jdependency/2.14": { + "jar": "sha256-HT3hIYOiqJada8b/Wtdx3l1W0ISXxdk+FopctxDiy/E=", + "pom": "sha256-yGRf/88P5qu8IVS8i/0Jysbgd2M4Kz6cGLXbmR7IFjk=" + } + }, + "https://repo.maven.apache.org/maven2": { + "ch/artecat/grengine#grengine/3.0.2": { + "jar": "sha256-vwYoa7L8DR9sh0S4+Dz85Y13U2jMHoeathgL55v2fYE=", + "pom": "sha256-Um5mRoK4WHXHqiRhXGVf7oEhLp8g0gyj3FafXhDTBvU=" + }, + "ch/qos/logback#logback-classic/1.5.32": { + "jar": "sha256-LUz1ktt4vi3k1hQENML+wXDcsWoJ6Mi3sgfb9eMbhIo=", + "pom": "sha256-0jsnLnBXYPg1cRB2RB5qipsS7QkA4bphigzWvPehYmo=" + }, + "ch/qos/logback#logback-core/1.5.32": { + "jar": "sha256-apBNV3jQ42GpaS+cvmixsGIK4PPtouwu0JECdVvwNsQ=", + "pom": "sha256-Hzk8RBRFhWm1O1LrMpe/6GGwAGb1nW0rq/In62XaP7g=" + }, + "ch/qos/logback#logback-parent/1.5.32": { + "pom": "sha256-Cyy+YG4Jm4sADCr14AeTb7OVXQzl5rsIbamyPUjFa6w=" + }, + "com/amazonaws#aws-java-sdk-bom/1.12.787": { + "pom": "sha256-H2b6NXnEIhZ2U+i0RlfzmF2c7q7EYHkF5ZFj11xuNCA=" + }, + "com/amazonaws#aws-java-sdk-pom/1.12.787": { + "pom": "sha256-PPXBNINi0YCCZ3g42y5VTgdQb1cekeWvsONGGvOAl5A=" + }, + "com/azure#azure-client-sdk-parent/1.7.0": { + "pom": "sha256-wefnVlRCMD/1TD6GNXTreh9pIR2EX6Q1/thCgxNL0Uo=" + }, + "com/azure#azure-compute-batch/1.0.0-beta.3": { + "jar": "sha256-VyCELrS/QS+UkURzaqLGl0BLbLqrspl0ZEMO6ltCm1k=", + "pom": "sha256-JaE0ZZmVdwt+G5ACniUCL6+uUADtefolwaEbAlaIqLk=" + }, + "com/azure#azure-core-http-netty/1.16.5": { + "jar": "sha256-YQkbpWNOcR45ZyHt/MpcZ4K+HB6G8uz4VutXqiAmDAw=", + "pom": "sha256-dsdL+1DPDY42LsYowHt8Mgn181ugX7fJBGnd73eqaGU=" + }, + "com/azure#azure-core/1.58.0": { + "pom": "sha256-IysAv3tYZEKT+6RaAmzhhT4PQHEXe9fgEVswZgZGsS0=" + }, + "com/azure#azure-core/1.58.1": { + "jar": "sha256-ezORJukq95sH/Plv4W+luiooVLuM5+A6xHdrlHT+ffU=", + "pom": "sha256-0a5HoB6JyM8SOJxfJLxAfGX+grgQQGwjaPhm9I8ydfQ=" + }, + "com/azure#azure-identity/1.18.3": { + "jar": "sha256-iKWBuYzXwMfv0jqXfpuswcoZTNtFhnrrBjNyhEnlqJg=", + "pom": "sha256-5neuUtD0ly2XM0Jw1rw8JyUfzChOU50nG68hiUFG9gw=" + }, + "com/azure#azure-json/1.3.0": { + "pom": "sha256-HQXnSpIOfgU1neYJ1fx8aPUFoJjDdk56Tz3Sihc+8TY=" + }, + "com/azure#azure-json/1.5.1": { + "jar": "sha256-utIdXrMG2CuFlRtYodnlAamwmXDkUr7m1NRF/VqRxRk=", + "pom": "sha256-KePq7Rb/8jYzFD5+KwSCz8hTrW/nFVoAJsQyiRf4lJA=" + }, + "com/azure#azure-sdk-bom/1.2.35": { + "pom": "sha256-p7T3bzoYfAXObaWU2WRUyVKkm870C0NgAV+Yow7q7Xs=" + }, + "com/azure#azure-sdk-parent/1.6.0": { + "pom": "sha256-mDP57zl7whd1s4m+gWtWpomRiCIKJa0qQ4mwk2UDnJY=" + }, + "com/azure#azure-storage-blob/12.33.4": { + "jar": "sha256-/GYUNn4m83Q5x0VHNRBwW1fPZn3p5hIJGgVrbLLALec=", + "pom": "sha256-lfZsAxha1B3oO6MocZcAz7zetRxb+J77EZsiD7J3a5Y=" + }, + "com/azure#azure-storage-common/12.32.3": { + "jar": "sha256-OFJpAF5ysinIcFvWzyl2xBTuPy6KuKgeJfTMSAD4Iww=", + "pom": "sha256-crYnKwwFpboyoZ0vUI7xzyhcl+onSKnF3h3MVM9DTkQ=" + }, + "com/azure#azure-storage-internal-avro/12.18.3": { + "jar": "sha256-ZTn/R31W5J/QoITaIfqnYiwZPQK9Wf4CzgabQx/XqCw=", + "pom": "sha256-nRl3kr/HzH0e88E1AKo10FkseE1/dWNv+7XD1fA0kfs=" + }, + "com/azure#azure-xml/1.2.1": { + "jar": "sha256-CLRYSBtlZVRgUhWrCxZfaOYCU1nlK+pHNtAyMo1Aujs=", + "pom": "sha256-U5XwSbFQrISH1c/JOnF4DOHa1keLxBuhFdwhoZwhrnE=" + }, + "com/beust#jcommander/1.35": { + "jar": "sha256-AZwS/sHOXALLq7FQ9qyKhtkqDsyciaVJ5VNyg+hjAAw=", + "pom": "sha256-PO4bOtiorcEiTl3UO/XdpjzdBUA/8zlTDSal/cj2djc=" + }, + "com/esotericsoftware/kryo#kryo/2.24.0": { + "jar": "sha256-flazLGNQWPmqKCD4iRmrcC0CnLzRUoXamZLjbMCuUvI=", + "pom": "sha256-H3LlOjNreSBg0D/fl9vK4POWOn0PgsFQe6uLOc+HsBk=" + }, + "com/ethlo/time#itu/1.10.3": { + "jar": "sha256-I9O6hAldSJpZUkD4kEUIXqUGb7b8HcCRJY1XffnXSrw=", + "pom": "sha256-shihqWmXfQEerG6Ttzo6uwuIQGMK0aHxbr//JOWIbXQ=" + }, + "com/fasterxml#oss-parent/55": { + "pom": "sha256-D14Y8rNev22Dn3/VSZcog/aWwhD5rjIwr9LCC6iGwE0=" + }, + "com/fasterxml#oss-parent/61": { + "pom": "sha256-NklRPPWX6RhtoIVZhqjFQ+Er29gF7e75wSTbVt0DZUQ=" + }, + "com/fasterxml#oss-parent/68": { + "pom": "sha256-Jer9ltriQra1pxCPVbLBQBW4KNqlq+I0KJ/W53Shzlc=" + }, + "com/fasterxml#oss-parent/69": { + "pom": "sha256-OFbVhKqhyOM86UxnJE9x9vcFOKJZ/+jngXYbn6qth18=" + }, + "com/fasterxml#oss-parent/75": { + "pom": "sha256-/LvxwYyQR+aRfThPIGTiG0Klj8hfsFI6ni4BXv98YZ0=" + }, + "com/fasterxml/jackson#jackson-base/2.18.1": { + "pom": "sha256-m612py37mq3jx6MzQ3dUk4bbqlTCFeRYOiUEyIp81K8=" + }, + "com/fasterxml/jackson#jackson-base/2.18.2": { + "pom": "sha256-71dLcvW0iUgET2g3a4dMiK4JoCncjgX2Shwwvftt4Uo=" + }, + "com/fasterxml/jackson#jackson-base/2.18.6": { + "pom": "sha256-Ydhu8jX8pS5r0Rrx3iUblesGnnFv3EYApfGCCR/JFio=" + }, + "com/fasterxml/jackson#jackson-base/2.18.7": { + "pom": "sha256-PeOJ4j2tSOiAR8Ad08n+379Wm40emFt0ywx6j2rYXdM=" + }, + "com/fasterxml/jackson#jackson-base/2.19.2": { + "pom": "sha256-/779Z5U5lKd12QJsscFvkrqB0cHBMX7oorma4AnSYUM=" + }, + "com/fasterxml/jackson#jackson-base/2.21.1": { + "pom": "sha256-YNTrZqAAoz+jfny1HiVQ2r50Z6C4rGCAbX07qXKMzWQ=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.1": { + "pom": "sha256-84SrzK8Mb712GDdi9yVv1nkBLtgdt/KiZofouWWgFKc=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.2": { + "pom": "sha256-UkfNwwFyXT9n9+8EkDconVr3CdaXK89LFwluRUjSlWs=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.6": { + "pom": "sha256-fbs7lCF81wHcG++7BXJKJ2+RdyHaVy6n6fPnmFcnyKs=" + }, + "com/fasterxml/jackson#jackson-bom/2.18.7": { + "pom": "sha256-biUBqcGRVSkvUc0t9Yignpe+Cmompq315hAZyGa7130=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.1": { + "pom": "sha256-um1o7qs6HME6d6it4hl/+aMqoc/+rHKEfUm63YLhuc4=" + }, + "com/fasterxml/jackson#jackson-bom/2.19.2": { + "pom": "sha256-IgBr5w/QGAmemcbCesCYIyDzoPPCzgU8VXA1eaXuowM=" + }, + "com/fasterxml/jackson#jackson-bom/2.21.1": { + "pom": "sha256-jXx43eEPTQjnKWzvCEzzC3etzqejbiPRUgeT/exj/yg=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.1": { + "pom": "sha256-0IIvrBoCJoRLitRFySDEmk9hkWnQmxAQp9/u0ZkQmYw=" + }, + "com/fasterxml/jackson#jackson-parent/2.18.4": { + "pom": "sha256-kW6bv0P8CZQpLz/eLThXZL0hBgxg3/6caVwJGXgIfQA=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.2": { + "pom": "sha256-Y5orY90F2k44EIEwOYXKrfu3rZ+FsdIyBjj2sR8gg2U=" + }, + "com/fasterxml/jackson#jackson-parent/2.19.3": { + "pom": "sha256-I9GGyNjNBgFdAixxDHFUI9Zg1J4pc7FYcLApzCYBhoI=" + }, + "com/fasterxml/jackson#jackson-parent/2.21": { + "pom": "sha256-OFHfYn+utGiHuVYQRjC3Sou7X33iLpdM8VmC4g4Dc94=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.2": { + "module": "sha256-4Ruvm1NubflNqmNaEBPsPgabhmuOES3cKqBEahVQUNw=", + "pom": "sha256-CyvWlOqJJn7qSBJqilskplI0xkM4dULSRGnRlb+6HPg=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.6": { + "jar": "sha256-+s5cN77h8HaPXxmNB3/CnRY77MqV3p4PE5YshNEEdmI=", + "module": "sha256-rGGYvSiw/d8dZMp79PfExCD/X3PHUzBHUccvTFIZNDM=", + "pom": "sha256-dqAQH+z5n889CSDmksHSY+8y49rQFNw7qfLHaeVT2FI=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.18.7": { + "jar": "sha256-TJkuzvNWnnPxnNazvgJxCPtzE5u2fVXRIYrHLpIhnrw=", + "module": "sha256-zzwRWBnQ4snpYXISBFrcMIGiP+hNhR9p6qre0ro7RsI=", + "pom": "sha256-9x9eS6aKmgcms6gjWHiiGUWG0lPNgoHt18/dtLKjJ7g=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.19.2": { + "jar": "sha256-5RZ0OjFtz4PFcv/Jy26MXowTSIDIxRVbAvezTpxdw88=", + "module": "sha256-MZtf0wd2wFk8yNxajX4ITkuQcJpDUGQYQqu9WfyByBU=", + "pom": "sha256-SVAWGuCtZsaze8Ku0S0hxleeF3ltv86Yixm40MIjpck=" + }, + "com/fasterxml/jackson/core#jackson-annotations/2.21": { + "jar": "sha256-U8oIX0oVD3A/SeGqvZNb0DtD4eo9VdE1Q4KSryLO9Ws=", + "module": "sha256-yuj/7OwzKLbsuxOOJ0IY8v4cdymg6CTaVZJogQCVrUQ=", + "pom": "sha256-ccrFOSFR4qUozJoJF58KM0F58FxS+OWWz1jd8Suyfys=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.2": { + "module": "sha256-ynjGBDZ2f8w2zhRrd05PUKnLn2MtExcsRLrojgwDz6I=", + "pom": "sha256-4GWwA50h9N/ORr1DEEx9dtWFa9cy4qqGDMWkonDtct4=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.6": { + "jar": "sha256-5+G/pQ8Keds35qo32xEc8Drr9KSEs1nSESerQ6sjmMY=", + "module": "sha256-KntINUtRJRB3lV5nqOoB+QSeYOFT252KjjSMRczVrMI=", + "pom": "sha256-WCMs2nfJ1v9m0XOqJh/nF+Wf9Z0kHeqROtyqvcw8mwU=" + }, + "com/fasterxml/jackson/core#jackson-core/2.18.7": { + "jar": "sha256-4cV403T1Gaqap0y9wlHGcF/6CKx4+upfo2utIT3jDcg=", + "module": "sha256-HwXTDpW71Vz9Z6EOEdEN21zzWZFnSVD/rnzK8cDMuzI=", + "pom": "sha256-uneHhvS6kpykIcG6nNDy9NGsKlU6PlBCCJvg767XuwQ=" + }, + "com/fasterxml/jackson/core#jackson-core/2.19.2": { + "jar": "sha256-qnfq8pKTqGjEc3IZT3xSh9d9k3CwTqJdP//B5JBLWIA=", + "module": "sha256-Ua8uZ3g6XXJETeajB8jj7ZMAklbNJ+ghkVVZohZcCUI=", + "pom": "sha256-gfatIwlG88U9gYwZ/l7hEcH6MxuRXEvajQGC5rT/1lA=" + }, + "com/fasterxml/jackson/core#jackson-core/2.21.1": { + "jar": "sha256-Ht1fLkncpfjkUZlXwkt7MFC9HH7og5INozz/Ax/x98A=", + "module": "sha256-hP6s5gpMeONzf505lQh56H3rfrhw7P6UmjJFC5V3gv0=", + "pom": "sha256-Dz+1656JcESawMuY4vjntRPS1OxbGk8C4id45Pe6uNc=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.1": { + "module": "sha256-xlQvXTA+kaQo5pElXhDIGcSyGvnsQ+a+Vnq8MSRNIWc=", + "pom": "sha256-09m5HHTeS7LD9bNRhqq1FHFtqh1yEny2DQ0+Uk8xHyI=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.2": { + "module": "sha256-jH2sL3J4GNiEeoKqTqxrAXTXnPBN+Q3iJGBy5t005wA=", + "pom": "sha256-STo9tkR7eo7Ls3JCNMbOZ31y20sE9roAjw6+rqe+Wp0=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.6": { + "jar": "sha256-RdEkc26incN0Fx/BqKmVjg9EQHweCq4Cl9ju4mf7WS4=", + "module": "sha256-l8kL4++imzCrtqJ4F+7hZyi9NBMnUkLKgcbXE2pcsLo=", + "pom": "sha256-4xMXatI4KEmb6K0SFBxy/xM33KR2siCabC7v/5bVn/0=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.18.7": { + "jar": "sha256-qjwDRTT86Wa229cGsfRmuKFcJmEn5aFfllIgkQk9vZs=", + "module": "sha256-m9jqfcF6RZhj7auMIyMjHTV6MbU7I98+kEwujjR1cg8=", + "pom": "sha256-MFCAjiF3Nm02tDTZsWiNBPqUZTE5RxfC4zdt3z3XzUs=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.19.2": { + "jar": "sha256-ChvU6bDWcOYy1A7oxiWtN2IzUC8DwvWIm66pXQJbR6c=", + "module": "sha256-xgFVg0SRj0CDS7bVg4EepsiDvwaigXmkx04voYswbGg=", + "pom": "sha256-2KebdQK2m/JQaEwZCpiCOJImaG1dlikGdW2BzVskO4I=" + }, + "com/fasterxml/jackson/core#jackson-databind/2.21.1": { + "jar": "sha256-sBHrUgLZ7IieJ/HcvfbGPwanbnoWwKGzDGBI1VbJoo4=", + "module": "sha256-N6LHDjuXdNyGqlnQamQn5d51nuOA5m2VK+NLIse5tbM=", + "pom": "sha256-vUgX0LkXlK/29LEWtXa/7ckne+LWxlHJVm9VIiLGpVA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.18.1": { + "module": "sha256-UrS+gVk28LCxFemEH2fzVKHfdc9cVstYdv1F4di9wY8=", + "pom": "sha256-La86jkWx2FZGBtvi5uypyNyPBpaDZYFVuHp9+m4UNcA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.19.2": { + "module": "sha256-bpyu0tDwqryZNnVPNzN+Dxc2MdahWxjE2QRpVtZ1U24=", + "pom": "sha256-1UeZ1Ba/pn91wvGU3IgKE1dPvVXmQCqH45NImPebgM4=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformat-yaml/2.21.1": { + "jar": "sha256-XJT6VdS5O9Tqmsbyz0ko/1CCLRxD5SHnFdOr8jAxoG0=", + "module": "sha256-bNi1yDkDQ3xcbsxUInLMK/FZU518pwTxMUEzFhRyiFk=", + "pom": "sha256-6tuelFBSKzAEqh14/1aYG9Ds/QV2hq1hLR4oH0145nA=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.18.1": { + "pom": "sha256-Y+VP232q/IFacikHs5wV/RBMZqgWU2idGGUON3Jok4o=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.19.2": { + "pom": "sha256-F5LLcfGWGg/nXi21/CckZovisBQX8LzHOee1AOIoFAE=" + }, + "com/fasterxml/jackson/dataformat#jackson-dataformats-text/2.21.1": { + "pom": "sha256-/Evp2+ObbeFuOX8OT27t3OgZYwU4ls/q1cXGbhvx/w0=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.2": { + "module": "sha256-Jd8o9WC1kI6hAYUATV/Bkyk0hHBj5mcpJID2dbOx7eQ=", + "pom": "sha256-FivnrZea9eDHOc1+0BiJ+Br0ggDJ+RJ5lqElrFGzSkc=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.6": { + "jar": "sha256-1gCCHpCwg1NCXT+jHWpeCPOLGQvpPtKECX5vpmysG7Q=", + "module": "sha256-mUAr1k5eYqxK6gnU6K60JHk4wOfg/z8u1MViGa5Uq64=", + "pom": "sha256-rEWZKUsadWhUvM+1YixOsMz6E7dJTWaj1J+lPDVOQN4=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.18.7": { + "jar": "sha256-Kbjx+OBVZTKXsHw4RKBWVBvb9cgZlRdZjZ+m7b78yC4=", + "module": "sha256-Ctt8BfgGbwCg6eqYP54LzVXAEFW1FfhCxjq8dPoX7pg=", + "pom": "sha256-rhZShVwG2f0S/2teBzwE4n4INZQsSkL46LvM7oK0lqo=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.19.2": { + "jar": "sha256-lwn0Pg+lYlYz7mbbbAePsejHygIJJpa6lep4Xb8PpqE=", + "module": "sha256-HNFClAh9xmpIvf8+t1CZyHsK0paspR6AgMuc3yCRF6E=", + "pom": "sha256-sa5Nojzw/imhXWUC4XcpfAssYp3Nlpy2RFfVVLZacS8=" + }, + "com/fasterxml/jackson/datatype#jackson-datatype-jsr310/2.21.1": { + "jar": "sha256-TWM3iwprU3M/CG69MBAjuiEbk4fkF71YSlQAMgzQi40=", + "module": "sha256-gl9IVd1UnY/LbS6pPZd6kdBfjF+70xV/P0P9Iyi7dh4=", + "pom": "sha256-dMXOjKDqCO8xnVps5iQk39nLk9rcAe+YF4c/t/Zpm64=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.2": { + "pom": "sha256-s6z7kQ0CPpOkGZr8zeH/nsX6sMVQ3E+WilBXEXrLCzY=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.6": { + "pom": "sha256-Dp+70l39bUJnqT4o0lF9uGv3hN4Hz86zFM/89dXRXpA=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.18.7": { + "pom": "sha256-9U/17FcRkLaTrz0VPH8PIXYy3KmuXECyQpWDgcR80oA=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.19.2": { + "pom": "sha256-o8wywUW5Yr45UE+FNsrGISTry1rVAy2TC8ck/flOgqQ=" + }, + "com/fasterxml/jackson/module#jackson-modules-java8/2.21.1": { + "pom": "sha256-gN/cby92+kwGXhHcdFMaAkRyRfFBWzoScCgf/NjJK1o=" + }, + "com/fasterxml/woodstox#woodstox-core/7.1.1": { + "jar": "sha256-ArnQIunUdwT/inqFmg2/07KIKoMR63/x4YD3YMzaJxI=", + "pom": "sha256-r7XLRdQcH542dZCd5P7yQr3BzqRHagY0riD016VEM/8=" + }, + "com/github/javaparser#javaparser-core/3.25.8": { + "jar": "sha256-OsLEKiNMHuQ6VbwikRk03dU3u6eJMSZdBy7TTCKwbZY=", + "pom": "sha256-ZRsNqsBbjKdFWa1Clt3OTV2Bs7PVZUdGRHkQshn98VM=" + }, + "com/github/javaparser#javaparser-core/3.28.0": { + "jar": "sha256-04UteEYcAmAuub/BXp/CGtfHZeYBOhttWAml0OfbUwk=", + "pom": "sha256-AT3fG+ys6FufJLgMmS7rbxAh+3V7cL/DTR7DfXhMLXc=" + }, + "com/github/javaparser#javaparser-parent/3.25.8": { + "pom": "sha256-GCe9gajuRIAfZInUHzUEuzXA70ZdsYysmVZ+A40eYes=" + }, + "com/github/javaparser#javaparser-parent/3.28.0": { + "pom": "sha256-+VPXzvj60JpPGaC/ZedxYZK0gm9yV8E5NDpolMyadaI=" + }, + "com/github/zafarkhaja#java-semver/0.10.2": { + "jar": "sha256-qOMuF1ddAYjB8+Lle7ldsJeTiDyIU/3oKLY+yx+Zpjo=", + "pom": "sha256-fwBf8/kA6GlV9aU0tamqjqVLtdYLtgrCN1lVCjZnaDU=" + }, + "com/google/analytics#google-analytics-admin-bom/0.61.0": { + "pom": "sha256-wq4RQBHGJHwuilgELwnSqKiatOkUDZpufmhSYDf4KvM=" + }, + "com/google/analytics#google-analytics-data-bom/0.62.0": { + "pom": "sha256-yw55ANhvbwidzGQTZ61PHQf/rV//mrqlEmlA+SW9PW4=" + }, + "com/google/android#annotations/4.1.1.4": { + "jar": "sha256-unNOHoTAnWFa9qCdMwNLTwRC+Hct7BIO+zdthqVlrhU=", + "pom": "sha256-5LtUdTw2onoOXXAVSlA0/t2P6sQoIpUDS/1IPWx6rng=" + }, + "com/google/api#api-common/2.53.0": { + "pom": "sha256-hfEZR5sbUaSepG31tUNS/Yy4/o/48Q+hmjrpqFebYjs=" + }, + "com/google/api#api-common/2.53.2": { + "jar": "sha256-4CENMaLsJn+izCobN/MnIQ+FLfSUMYAPrHKUs0G2/JU=", + "pom": "sha256-zY6lMlC9ajTIKdpOeMWUkkM8D05z9PcmCsOOx2kCQBM=" + }, + "com/google/api#gapic-generator-java-bom/2.46.1": { + "pom": "sha256-9/mGSetdfnDncY51buuJV9q6mn+HQVp4uTPphYBbiNM=" + }, + "com/google/api#gapic-generator-java-bom/2.62.2": { + "pom": "sha256-D1Geh2DUCJS5+SICW92caXGaTZqQX96LC/SXMyxdnh4=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.46.1": { + "pom": "sha256-dfeNXqh8VLiQOKai5Eh9mxw74pKPUITBQf6mT5YFAVc=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.62.0": { + "pom": "sha256-hX4La1G+GTsAmdgkaHw4PEkrDHiELBL+BF6yssnw+oo=" + }, + "com/google/api#gapic-generator-java-pom-parent/2.62.2": { + "pom": "sha256-FQFAN7P8AmdkPFMhCXyELdPzfXaxEB150t1Dmf5vivI=" + }, + "com/google/api#gax-bom/2.54.1": { + "pom": "sha256-Ta0wBZhRbHtmVZXfDO8YDYtFQKEzh3dP1c1c/TwdRa8=" + }, + "com/google/api#gax-bom/2.70.2": { + "pom": "sha256-wW8Mc06ykkJ7kdjW+QFhlNd/Rm46U7nYC1arLZ+/15w=" + }, + "com/google/api#gax-grpc/2.70.2": { + "jar": "sha256-gx1m8Pr6rwRjpIZKyZIEFWwNENVeLwNqNY8+APuc2hw=", + "pom": "sha256-rtVGX2Pba1T8ScquXTK2g2I0/apHieSAm9tBETRTz7w=" + }, + "com/google/api#gax-httpjson/2.70.2": { + "jar": "sha256-AZUF+aqW1oYqgt93Bm5FIRtvYxUXUuNFgLepoFQP8lI=", + "pom": "sha256-iSg9N0+EBqhQnAgaRi9BnTNF+o3oTkUDVQELxs8P7NI=" + }, + "com/google/api#gax-parent/2.70.2": { + "pom": "sha256-5+fWe+ftguepq2Vx9NrcP6+623fX4EhteY1CTSUrnFE=" + }, + "com/google/api#gax/2.70.2": { + "jar": "sha256-Myy9EAwjRDxgCkc6kiDL0NDRrdGSQObGOjM8JdXUmqo=", + "pom": "sha256-J8MZgeppgVsBi8FXxYcr9brWPybJx6jFGpxHcktdMXY=" + }, + "com/google/api-client#google-api-client-bom/2.7.0": { + "pom": "sha256-Sug+aJgr0KZwuA6s58aUqRWjlP/INJYTh0+es6P+TqE=" + }, + "com/google/api-client#google-api-client-bom/2.7.2": { + "pom": "sha256-o5uDySbr9qL5GIOI3FQpvHQcs90QFld1UyBnGD99M6w=" + }, + "com/google/api-client#google-api-client-parent/2.7.2": { + "pom": "sha256-c4/ewj9isT6dL6Iv8l/LWHyphMWNzKGxWQNL02ibtJM=" + }, + "com/google/api-client#google-api-client/2.7.2": { + "jar": "sha256-Y7dUt8SpI0fEmSxC0pWBL40u1rnodD7bpKjJi5Lpyps=", + "pom": "sha256-PNpCXKfxGpP1wEL2Y3araUAi8orbRfPTXpXhFev9xmk=" + }, + "com/google/api/grpc#gapic-google-cloud-storage-v2/2.58.0": { + "jar": "sha256-8WWx2Y1MM33I2xmy6HV7a5dbMEWAT2woV1SpQ8WEO84=", + "pom": "sha256-B3uoEW906kuQWODLGpySHaBA0ozZN787W3HtGjw21jM=" + }, + "com/google/api/grpc#grpc-google-cloud-storage-v2/2.58.0": { + "jar": "sha256-oUakKX07kNYQW1eblhsbUIZW99cl8aKIpHqqjc30aRg=", + "pom": "sha256-khpimH2+sCRpKlP1M+ATkWG6mnGy1nUtul2CELdRG3c=" + }, + "com/google/api/grpc#proto-google-cloud-batch-v1/0.75.0": { + "jar": "sha256-uNKBZNnvmbh4UpqIpxjGaTU98fBUYcIJJ1Z3qeQMg0g=", + "pom": "sha256-2O0e8ql0uAE3ooDY2/lbGZFLeV896jjiB82vH5KaGlo=" + }, + "com/google/api/grpc#proto-google-cloud-batch-v1alpha/0.75.0": { + "jar": "sha256-7Pb382nt5TdyK6Q1MaJySdpf7wY27HTT0JD4QTHZPZU=", + "pom": "sha256-GDr4lpxovQGSmc5yUcHfuXab21eDdq4ObDLmRCoiTFw=" + }, + "com/google/api/grpc#proto-google-cloud-logging-v2/0.112.5": { + "jar": "sha256-Y1PxRY0KjsCdRv39Se0/Tc0BbkQWL/d9OzI5T0XUAME=", + "pom": "sha256-0LXn+fzUIewgD+F+oeQCT2W4JEJ7hV+jn0uTnszXCtQ=" + }, + "com/google/api/grpc#proto-google-cloud-monitoring-v3/3.52.0": { + "jar": "sha256-gjizIWqln/7tmhV4M9f8yESn3J8QGyPXKPHN7GxcO6I=", + "pom": "sha256-1IuoWjwn4EUdcMNFdUnmGS/UxD2m62KYVQ6ipcmfmRY=" + }, + "com/google/api/grpc#proto-google-cloud-storage-v2/2.58.0": { + "jar": "sha256-hw+13Wytc4kyiEEehgKTc2leDVOOTLx7PqaZk9mlKNI=", + "pom": "sha256-u5AU6JMl7UpX9L11TTUCkhhDm26JIcQY/+b86JpzT4E=" + }, + "com/google/api/grpc#proto-google-common-protos/2.61.2": { + "jar": "sha256-Of1oI/OfoHBbhZljT1/xVio9Trbra1O47+CFY0/O+R8=", + "pom": "sha256-a/bfoVXmGBAKiPTAEyRTMfrXHK0xc3N+/do/ve4rx/k=" + }, + "com/google/api/grpc#proto-google-iam-v1/1.56.2": { + "jar": "sha256-X8aK7KsLipKeiQ+rFWOjEmDYOKlgZBv92ib9okADCOw=", + "pom": "sha256-LOSHcHXWaOr9KEWIL+b1e7w+kS0o0EDbXLuHLYTpuCI=" + }, + "com/google/apis#google-api-services-storage/v1-rev20250815-2.0.0": { + "jar": "sha256-InicqzL3XvCAhRyUH8piRplYPOBpm9aaX9R2Q0GAoXg=", + "pom": "sha256-B22Ub39nC0F0VGIZmpvnB1wg1AqpSnz9wOzoN30GTeI=" + }, + "com/google/area120#google-area120-tables-bom/0.55.0": { + "pom": "sha256-ZFx6lsUt90GXVsDCv3EMJznaLEmWPqmamqMCL7eM7gc=" + }, + "com/google/auth#google-auth-library-bom/1.27.0": { + "pom": "sha256-bddFraNsxQUktQiEGekVGDFBfFD4EIdSJzLka8im+F8=" + }, + "com/google/auth#google-auth-library-bom/1.30.0": { + "pom": "sha256-mSCzPghCOTmuWu2116O+wBWYvyZkSti6bnul2ov3ajY=" + }, + "com/google/auth#google-auth-library-bom/1.39.1": { + "pom": "sha256-vsMEedqwOZl1J8GsIR3/3EH8iKwvMfE9WEh6+8MwcWE=" + }, + "com/google/auth#google-auth-library-credentials/1.39.1": { + "jar": "sha256-Wpm1xu+XdeLo5BwSQVmlJ7L6tDYUzYb20CH4q48NvFQ=", + "pom": "sha256-KupaibN93YN1GuQk8+iJc6gg8TFRbosjD+arlbpy0CY=" + }, + "com/google/auth#google-auth-library-oauth2-http/1.39.1": { + "jar": "sha256-mJBS2I+IEE5jO/5+FD0D01zqc5tVa5TqM6OR4S+Sf8o=", + "pom": "sha256-+Riak26k0iHVzEZqy0+dsFhyaxTGG5QDGf0OUZ7RCsg=" + }, + "com/google/auth#google-auth-library-parent/1.39.1": { + "pom": "sha256-6LSmQYfU755LRszspO1R5pjbxQiFhxVuLEGrSJDC9MA=" + }, + "com/google/auto/value#auto-value-annotations/1.11.0": { + "jar": "sha256-WgVc5CVTM7M0bhqHA9pb+P8ElTIob9zTFxLWJKvhEd0=", + "pom": "sha256-KuwW406j4BFiGgMi9PNvj5v5iLtURitVcJduieoHsSI=" + }, + "com/google/auto/value#auto-value-parent/1.11.0": { + "pom": "sha256-Wg0dcYVS6KRdzOASjRtrliP6lxqCzSRXUyM7pyCMsp0=" + }, + "com/google/cloud#first-party-dependencies/3.36.1": { + "pom": "sha256-U7mHPDg4NPvgRZope9evK7lQ0voUiny3mYciyLHvvec=" + }, + "com/google/cloud#first-party-dependencies/3.52.2": { + "pom": "sha256-8k78G6RoVd0Z5wpzvmhi+IANBC3Gd+r3L317bi0g2to=" + }, + "com/google/cloud#gapic-libraries-bom/1.45.0": { + "pom": "sha256-Am+i8fqvzVf/tXujiZSemz6jPWs8mxXgaPU58zyBnXk=" + }, + "com/google/cloud#google-cloud-accessapproval-bom/2.52.0": { + "pom": "sha256-Iz8bgodBWPRWj/VBr3hvyFS69UPEI+4wVJONtGMBILk=" + }, + "com/google/cloud#google-cloud-advisorynotifications-bom/0.40.0": { + "pom": "sha256-BO8ci00MgOaBoUU9aTncbBIiWNdH8TQKrO/IxzaJjxE=" + }, + "com/google/cloud#google-cloud-aiplatform-bom/3.52.0": { + "pom": "sha256-RGYt8UhafWvi4rJuPwUewyKwoqBII/4AHPlgokBuuzM=" + }, + "com/google/cloud#google-cloud-alloydb-bom/0.40.0": { + "pom": "sha256-qmCEBrbVqJuqQQxKUu5e6HPV4CBEhCqzcjTZzXxpAhM=" + }, + "com/google/cloud#google-cloud-alloydb-connectors-bom/0.29.0": { + "pom": "sha256-zT1gnPtZNQiTWhqgBsXpIMNgwXTGAqZk6DxnZalDWzg=" + }, + "com/google/cloud#google-cloud-analyticshub-bom/0.48.0": { + "pom": "sha256-7skdte7HCIC+P8pDqpteBqVl535DZ4lyPHQJ7H3HPVk=" + }, + "com/google/cloud#google-cloud-api-gateway-bom/2.51.0": { + "pom": "sha256-S6Qq+WjYq7049HwIP9ptcM0ipWIpYf/GjI/+IbM7MCQ=" + }, + "com/google/cloud#google-cloud-apigee-connect-bom/2.51.0": { + "pom": "sha256-AoNqN3Yj9mn6zhXDDHw1tFq/1AjazbiPsDtRK2E6TD4=" + }, + "com/google/cloud#google-cloud-apigee-registry-bom/0.51.0": { + "pom": "sha256-9CUplTFHH2/YqTVTCr4ybZGlG6+JGSk+ifCH42SXFi4=" + }, + "com/google/cloud#google-cloud-apihub-bom/0.4.0": { + "pom": "sha256-XyXGffmnrQIoB3fM2jaNkOylj+bx72/v1vBgyZv4858=" + }, + "com/google/cloud#google-cloud-apikeys-bom/0.49.0": { + "pom": "sha256-3nEwPEKmo5iJoqGOrOi1OGva47z06jnkBlsZyPPuDgI=" + }, + "com/google/cloud#google-cloud-appengine-admin-bom/0.2.0": { + "pom": "sha256-oQA3WIod2WR3WITIOmgYjMBx5Dyri+pXioPIyZBDpIc=" + }, + "com/google/cloud#google-cloud-apphub-bom/0.15.0": { + "pom": "sha256-XgGnZxln201fL7BKBoDL9O0sIWApcVfNlrQNhNd9FFI=" + }, + "com/google/cloud#google-cloud-artifact-registry-bom/1.50.0": { + "pom": "sha256-4lVOfHbkDf9TM3/oVgFW3Hl7m7GYF7NyBOYy8+4Cjpw=" + }, + "com/google/cloud#google-cloud-asset-bom/3.55.0": { + "pom": "sha256-a7fWqIKXFIiuKV6/FYGJDZVhaWkRmDqlmudd/0CNOEU=" + }, + "com/google/cloud#google-cloud-assured-workloads-bom/2.51.0": { + "pom": "sha256-vWZE25krKKRPcYlRI5N07vrhydsQjtE9ISHmXVQNc4M=" + }, + "com/google/cloud#google-cloud-automl-bom/2.51.0": { + "pom": "sha256-1P7d2l6Ai6/WFxQRDzHIvK9KEeWc549hiVWHA1lZuWk=" + }, + "com/google/cloud#google-cloud-backupdr-bom/0.10.0": { + "pom": "sha256-HZPFw1O1jWAQaoV0GjIFAs4GLlsEn+65zjr4uTBCW2M=" + }, + "com/google/cloud#google-cloud-bare-metal-solution-bom/0.51.0": { + "pom": "sha256-3ykJCSGWZSYIqjV2vCbYUrb3QvyXmJ9D1KREdX488zE=" + }, + "com/google/cloud#google-cloud-batch-bom/0.51.0": { + "pom": "sha256-iz7OT/E5WkZoyxJhW4mJzbMNTz8Y1kfNFtuOix5IRfY=" + }, + "com/google/cloud#google-cloud-batch/0.75.0": { + "jar": "sha256-z0JQDVSQaCau+yynwbGk9KyPe0YfcuyJoPp3B4sbtNU=", + "pom": "sha256-9ETg8kQ6AnhGKdQMGz5kgf+BSruXwFw8GAkvIG1rypE=" + }, + "com/google/cloud#google-cloud-beyondcorp-appconnections-bom/0.49.0": { + "pom": "sha256-WlEAyhaAlzbawBsPzn+iBj8GN57euVfCKM6pdcvlAk4=" + }, + "com/google/cloud#google-cloud-beyondcorp-appconnectors-bom/0.49.0": { + "pom": "sha256-c+RB+JfX7F7+q0SkuulhbCCVuLJoXuvcWTXF0oB7zSM=" + }, + "com/google/cloud#google-cloud-beyondcorp-appgateways-bom/0.49.0": { + "pom": "sha256-yhJeJ8jdNFD3+fP45jh8X6QRDGaMM/t0yLSq2O9bgPE=" + }, + "com/google/cloud#google-cloud-beyondcorp-clientconnectorservices-bom/0.49.0": { + "pom": "sha256-82jaJ7KAux0it+cxRn0ZDBCVSHbTqNYT3lh/+0Ti2MQ=" + }, + "com/google/cloud#google-cloud-beyondcorp-clientgateways-bom/0.49.0": { + "pom": "sha256-HtEdPuXeRiBs/seXIGutDgl6+2W6DMMwNqt8h/Rww/8=" + }, + "com/google/cloud#google-cloud-biglake-bom/0.39.0": { + "pom": "sha256-qnCiyinKU8x8+vtwVk1kINhCbdCTJAza/6GYSn3DI4s=" + }, + "com/google/cloud#google-cloud-bigquery-data-exchange-bom/2.46.0": { + "pom": "sha256-wFP2McKJmwbVD13vyUopVOBNolptRScZwjCALaYHWKg=" + }, + "com/google/cloud#google-cloud-bigqueryconnection-bom/2.53.0": { + "pom": "sha256-TgpvPFJvGluM9zlXBFTeLo6UfyNM2bP1X+6rzths9hI=" + }, + "com/google/cloud#google-cloud-bigquerydatapolicy-bom/0.48.0": { + "pom": "sha256-bctTvJw8gLEA8Y4cbFRAvlemWN8PbLQzAxIQzeFybW4=" + }, + "com/google/cloud#google-cloud-bigquerydatatransfer-bom/2.51.0": { + "pom": "sha256-DbwFEbJMCF3oJeBdjcUpCmAP7DNELjg/hyFSDYt8SFg=" + }, + "com/google/cloud#google-cloud-bigquerymigration-bom/0.54.0": { + "pom": "sha256-HDIr4lqjLlOPN3bt45R/6juKQIg4f4ULZ3zLUVeimYg=" + }, + "com/google/cloud#google-cloud-bigqueryreservation-bom/2.52.0": { + "pom": "sha256-/7csBvQsV2EiDxXuQ+T1mUOsTN4sOwfKAy9Wj8v2eO8=" + }, + "com/google/cloud#google-cloud-bigquerystorage-bom/3.9.2": { + "pom": "sha256-oZYenSDgAsQ1G1GrgSKL3u7J1sOMUif6CCg956DJ09c=" + }, + "com/google/cloud#google-cloud-bigtable-bom/2.44.1": { + "pom": "sha256-Z5O6Lc9x1q4uY2TX1PQIOwKOSHDbFpqyIv0w33BI3Bo=" + }, + "com/google/cloud#google-cloud-billing-bom/2.51.0": { + "pom": "sha256-uRzOQTr/5QDE/vo0uaB627QVxSsSM35QCE0nlB9ILIw=" + }, + "com/google/cloud#google-cloud-billingbudgets-bom/2.51.0": { + "pom": "sha256-SmN88r7bWqDNM5CcrF5d11iZoBJzDrE1tNmsEdUj2qc=" + }, + "com/google/cloud#google-cloud-binary-authorization-bom/1.50.0": { + "pom": "sha256-7fLxMCWaSH0aLbKYNRA8ci3hgp3AjXwzPIKzB5fmiYg=" + }, + "com/google/cloud#google-cloud-bom/0.229.0": { + "pom": "sha256-EN9GaNy6nLhcwF6FblvbCgyHWfktIzgFxBV6IFYpPm4=" + }, + "com/google/cloud#google-cloud-build-bom/3.53.0": { + "pom": "sha256-8+eXL6u6bhEyyUg7OKArPNJibMFSm5/HisYtBfdcnyg=" + }, + "com/google/cloud#google-cloud-certificate-manager-bom/0.54.0": { + "pom": "sha256-qT5JxDlBlaZtJYx9/NgRfAzmeZVSRm6vtJiW7TiTRa8=" + }, + "com/google/cloud#google-cloud-channel-bom/3.55.0": { + "pom": "sha256-mk5Wwt61XgJC1KIMiPEuh+anDkC4DU8chqyscbEIAF4=" + }, + "com/google/cloud#google-cloud-chat-bom/0.15.0": { + "pom": "sha256-qj6J1LbN9mNDf6gOoX3E4XCUYmLzRTeCTEPOIS66SPg=" + }, + "com/google/cloud#google-cloud-cloudcommerceconsumerprocurement-bom/0.49.0": { + "pom": "sha256-bjEjGIXtGu53xsDuWo7sSZQY1QB+3CFpZw1SKtMUexM=" + }, + "com/google/cloud#google-cloud-cloudcontrolspartner-bom/0.15.0": { + "pom": "sha256-H9IroQ7gh4CXlZ4PGS5mioccmt0kR6GeepEuwXgQujU=" + }, + "com/google/cloud#google-cloud-cloudquotas-bom/0.19.0": { + "pom": "sha256-3A0u013NLkkCRoGV/bdBtY+QdYm4X4mWq0ZxJ+NrYGc=" + }, + "com/google/cloud#google-cloud-cloudsupport-bom/0.35.0": { + "pom": "sha256-yI0jr+OV9aiW9ZQFVmZ/1Lb3u33ns2Nr6H0bGTqGl/A=" + }, + "com/google/cloud#google-cloud-compute-bom/1.61.0": { + "pom": "sha256-9KfYcSyMN2wKGpwIXsojb7qHtzxVOjHrV85xh5q4vT4=" + }, + "com/google/cloud#google-cloud-confidentialcomputing-bom/0.37.0": { + "pom": "sha256-Pj6kDU/WptwIdRsdaBt+mqXqFwS+oUtMmUEkpMguDLo=" + }, + "com/google/cloud#google-cloud-connectgateway-bom/0.3.0": { + "pom": "sha256-izIPTbj020tPJtsEzDM8RX8yi2UMcdvXubDfCyZR/QQ=" + }, + "com/google/cloud#google-cloud-contact-center-insights-bom/2.51.0": { + "pom": "sha256-Pq1o1Vgi8XjZXO5/LiRX3a6/VGkyzMGfmHoEXSFYPoE=" + }, + "com/google/cloud#google-cloud-container-bom/2.54.0": { + "pom": "sha256-3R5CpX/nAak1XAh451WYsAk7J5PfSY1DfV6m6LYZY0o=" + }, + "com/google/cloud#google-cloud-containeranalysis-bom/2.52.0": { + "pom": "sha256-G6pJ6hAvsLQsXPCbmbs7d4PscpfN2TNvlunY7D9cEWw=" + }, + "com/google/cloud#google-cloud-contentwarehouse-bom/0.47.0": { + "pom": "sha256-veLGCxYuwdNSz9GF40eIKYdEGUUZobdDDpZeyeTXSKE=" + }, + "com/google/cloud#google-cloud-core-bom/2.44.1": { + "pom": "sha256-xwDG9ZxKWYj9E3qy4CNDcsxK6ufU0kxAVw8c/4mBw8s=" + }, + "com/google/cloud#google-cloud-core-bom/2.60.2": { + "pom": "sha256-rjdzsFG9muswE75iM9xh9opFiWhjdh+Ik/dKCW66Qu4=" + }, + "com/google/cloud#google-cloud-core-grpc/2.60.2": { + "jar": "sha256-aJlOC2lGi2AaIbHbtHilhDQWxmxshFvC7bqpEy6zQrQ=", + "pom": "sha256-llMQLS9Z56Et0nKb+vOnUrkKisjK3e5uSb8BR4qsKs8=" + }, + "com/google/cloud#google-cloud-core-http/2.60.2": { + "jar": "sha256-RADmOQjlA2E7ubI0s+hUWsJSyx5hussNFqZ/mN+SgwA=", + "pom": "sha256-e1wBt6oOUgPBVWEAOrqEYBmiaF2WmaL4r1UwLXxkbK8=" + }, + "com/google/cloud#google-cloud-core-parent/2.60.2": { + "pom": "sha256-4dFYw2CKCjeiQJ9YONXhfSvpCuao77ipua9oNSFvlB4=" + }, + "com/google/cloud#google-cloud-core/2.60.2": { + "jar": "sha256-fCxtPGdxdGl4tlfvJreMGEqQeqBorbtannlT5qMs1Ak=", + "pom": "sha256-nM1J8IBkgWNwi3KLR6a87h/NUbfTRZmCvg+6mqivvac=" + }, + "com/google/cloud#google-cloud-data-fusion-bom/1.51.0": { + "pom": "sha256-39TppUS262mFEQ3JGYPgDt3TCRMMc3IjaIPe69EwUBQ=" + }, + "com/google/cloud#google-cloud-datacatalog-bom/1.57.0": { + "pom": "sha256-hQdhVv+g6CpwdsmSKzrAHod2zebqeCfvLyVQ/6T2eJI=" + }, + "com/google/cloud#google-cloud-dataflow-bom/0.55.0": { + "pom": "sha256-q+3ElvQg2SNcwVuzbHFozvNTPaRzs32U3Vjriu03Luw=" + }, + "com/google/cloud#google-cloud-dataform-bom/0.50.0": { + "pom": "sha256-hduSAw5WYHuBDcR0SXc+EGX6qp3EF5Ru/Hhoh4dhayw=" + }, + "com/google/cloud#google-cloud-datalabeling-bom/0.171.0": { + "pom": "sha256-ROcrtqS33r0fmsMBDZNCjdcmgYD3RLdMHMIdXLp/hOU=" + }, + "com/google/cloud#google-cloud-datalineage-bom/0.43.0": { + "pom": "sha256-hQXhbB8gYZz82JjtOsOtvqSq6vBY9FcsD7pmkxtQXY0=" + }, + "com/google/cloud#google-cloud-dataplex-bom/1.49.0": { + "pom": "sha256-o1N4MeE9X7LXVgbFEoF+4dIkO6h+326fvX9RblvrCJs=" + }, + "com/google/cloud#google-cloud-dataproc-bom/4.48.0": { + "pom": "sha256-hNqdy1uk4RvxLRk6rVGTqKjhiazaPcdnLkkJz2q4tT0=" + }, + "com/google/cloud#google-cloud-dataproc-metastore-bom/2.52.0": { + "pom": "sha256-fSB2PJKhavp1cQBJDBud27/9iE5q9D+ge0fdFnXTFfg=" + }, + "com/google/cloud#google-cloud-datastore-bom/2.22.0": { + "pom": "sha256-7WeUuhatgie5MAwDxCYPNBLVT30yxEe1DfUfKDIuZgc=" + }, + "com/google/cloud#google-cloud-datastream-bom/1.50.0": { + "pom": "sha256-/3qYwfkLgAOTFX1YgVvCf9AHQrI0PJtNYJKDTNL5WuA=" + }, + "com/google/cloud#google-cloud-debugger-client-bom/1.51.0": { + "pom": "sha256-/mtoBDuWT3/UQ2Fr9nCfJdmW9x8MQ/3c2i/cxwvtBPY=" + }, + "com/google/cloud#google-cloud-deploy-bom/1.49.0": { + "pom": "sha256-f+mBZv84beZkHgRCDFDx2Qq6rOU0M7uuea4AIcYbR14=" + }, + "com/google/cloud#google-cloud-developerconnect-bom/0.8.0": { + "pom": "sha256-MPivuTFKQS/FeAfU2vjnfo2s2sqHKOtfvs6TfKcN7+0=" + }, + "com/google/cloud#google-cloud-dialogflow-bom/4.57.0": { + "pom": "sha256-yWD0unkPtTaVMMU89+mROdxSYaD1iGA4Q/t5FrtszCE=" + }, + "com/google/cloud#google-cloud-dialogflow-cx-bom/0.62.0": { + "pom": "sha256-PkSlVXON9wT4xa9Amg+WRK2qITpjD47bcLs30hXPDL0=" + }, + "com/google/cloud#google-cloud-discoveryengine-bom/0.47.0": { + "pom": "sha256-kY++GAMwfgbbyKsg+kTByUEohi9ztEjr72CWdhXdyU8=" + }, + "com/google/cloud#google-cloud-distributedcloudedge-bom/0.48.0": { + "pom": "sha256-GiThTUDOxsuV+fyMdSswCZKVGQ2CoWgGK0mSjp4Uffo=" + }, + "com/google/cloud#google-cloud-dlp-bom/3.55.0": { + "pom": "sha256-Cgt3EuqSdaLV2eygwdvxcDUqFl42z5smFNXhzQV+70o=" + }, + "com/google/cloud#google-cloud-dms-bom/2.50.0": { + "pom": "sha256-v9Qs3I+fYHVhSCNmvdXW3MDh8NSX/jRxxdrSDX3avUM=" + }, + "com/google/cloud#google-cloud-document-ai-bom/2.55.0": { + "pom": "sha256-eiCgUKysZCz2i6zkYdmUZuNJrshDYFb2KU4lqUqYRcE=" + }, + "com/google/cloud#google-cloud-domains-bom/1.48.0": { + "pom": "sha256-mAC6F9nWcS7ij2Ls3rEufOM6dlIvg4cfa/RixJ6GPrU=" + }, + "com/google/cloud#google-cloud-edgenetwork-bom/0.19.0": { + "pom": "sha256-sqKNpPZJaYH/lq+GmTRvDhJzSegO4x8az0BXh0J5YwY=" + }, + "com/google/cloud#google-cloud-enterpriseknowledgegraph-bom/0.47.0": { + "pom": "sha256-BCvMvpcPOAdmcX30cHOL8b4uOU7idppEOrBy91T+nkk=" + }, + "com/google/cloud#google-cloud-errorreporting-bom/0.172.0-beta": { + "pom": "sha256-T2zAorqVI7jkeg+GK/5Q9F7J3Cnsv1bTIdCzkrmeQPI=" + }, + "com/google/cloud#google-cloud-essential-contacts-bom/2.51.0": { + "pom": "sha256-2AxitbQrI+Y7q5DE4HM1/hv215eekuK3AbYXaksz4v4=" + }, + "com/google/cloud#google-cloud-eventarc-bom/1.51.0": { + "pom": "sha256-IdtQiZdfvcRMFrzuZf5+xpHA7q5R0iBiEqmz1vQ9sKM=" + }, + "com/google/cloud#google-cloud-eventarc-publishing-bom/0.51.0": { + "pom": "sha256-kmjR/niC6xa5bgewOwi8VCZiASn9U/2/Sg32qbhahaQ=" + }, + "com/google/cloud#google-cloud-filestore-bom/1.52.0": { + "pom": "sha256-EyhbvoBwe1PemHmowTDVUYjNgWPMYVwihtriXfP1Pjk=" + }, + "com/google/cloud#google-cloud-firestore-bom/3.26.5": { + "pom": "sha256-ueMQtaFlxQqBi+Yz9B4G+1aB9zBbogFQ67UIuQzrLnw=" + }, + "com/google/cloud#google-cloud-functions-bom/2.53.0": { + "pom": "sha256-O/CVHCNQ0g9ct8q582VvfA2DR9FVl7xLjTaeeq63kWw=" + }, + "com/google/cloud#google-cloud-gdchardwaremanagement-bom/0.6.0": { + "pom": "sha256-5XCIpC8yeaEq8BCDoSCwyx4RnS4fviOCILImZU8qBHQ=" + }, + "com/google/cloud#google-cloud-gke-backup-bom/0.50.0": { + "pom": "sha256-cfJLQz+7fqXGvO1jjI9JwudmWWP6GTvd8cGLoFydMK8=" + }, + "com/google/cloud#google-cloud-gke-connect-gateway-bom/0.52.0": { + "pom": "sha256-R7P0Vr0Guy2G5GdlpigyzqTiBTedjjunr5RyScSHIDs=" + }, + "com/google/cloud#google-cloud-gke-multi-cloud-bom/0.50.0": { + "pom": "sha256-c/ycuoGSopEjn7xxHqY5hScF77E4TDfhBDl3Q5olris=" + }, + "com/google/cloud#google-cloud-gkehub-bom/1.51.0": { + "pom": "sha256-jVYLK7J970WVY3iTyzpPwo8CwY0G3gbp7QaAMkE1wt4=" + }, + "com/google/cloud#google-cloud-gsuite-addons-bom/2.51.0": { + "pom": "sha256-POPvFUQ2nCE7cji8r44+Llo5YT1Ini4J3zmeA/ZFKzA=" + }, + "com/google/cloud#google-cloud-iamcredentials-bom/2.51.0": { + "pom": "sha256-E+gUc0H64TFowZQpGIA0Or8sncATdZW3vx46n0a23Cw=" + }, + "com/google/cloud#google-cloud-iap-bom/0.7.0": { + "pom": "sha256-BSK9Zoqw20I21PyKOxYR8Dq/9MfAkN1dFlJB9nPn0/k=" + }, + "com/google/cloud#google-cloud-ids-bom/1.50.0": { + "pom": "sha256-zzxmL1wi8KhK+70CouIv/McEEreZfq7ujR/0ATNHnOY=" + }, + "com/google/cloud#google-cloud-infra-manager-bom/0.28.0": { + "pom": "sha256-i8qMac0aTc58jd4TQZ/xb0cs1OiyEXa1+HxBd28IXVQ=" + }, + "com/google/cloud#google-cloud-iot-bom/2.51.0": { + "pom": "sha256-6T8JRjYEuYOzhaBR7WIQ4+dEWPnYF34GKwVe57uGJbs=" + }, + "com/google/cloud#google-cloud-kms-bom/2.54.0": { + "pom": "sha256-VESl5E/4J6XoRkmKCJ5Az0NLevq5rUIjx/SBEcJFckM=" + }, + "com/google/cloud#google-cloud-kmsinventory-bom/0.40.0": { + "pom": "sha256-tcpgRot2CsZKO9hBPPTjUqkRSjEe4rf9ItdPD9CO8Xg=" + }, + "com/google/cloud#google-cloud-language-bom/2.52.0": { + "pom": "sha256-YmFGw1yj63C39RVlcm+THRd1VczxeLDuJXUtkY+B83U=" + }, + "com/google/cloud#google-cloud-life-sciences-bom/0.53.0": { + "pom": "sha256-UJZvLqAuHO6v6B6Y3Pdsr9qzEnvP6TntAtVTz9/5VRU=" + }, + "com/google/cloud#google-cloud-live-stream-bom/0.53.0": { + "pom": "sha256-fBR3DHbfc5KO9qQL4Jz1N/ik18UyoBRQ1TyocNLvNRE=" + }, + "com/google/cloud#google-cloud-logging-bom/3.20.3": { + "pom": "sha256-PcmTjIU7s+0HkKHuNLxyRIzY0C4eeeiimiNruLkfqpU=" + }, + "com/google/cloud#google-cloud-logging/3.23.5": { + "jar": "sha256-u9s+tluPkw2FF0jmlP9fKTzK/J0kBK97XYm2KJtNJ2Q=", + "pom": "sha256-2TktJofiKcNw+cT4b69ijKGR2HqVlWH98pa6cV0Gbvw=" + }, + "com/google/cloud#google-cloud-managed-identities-bom/1.49.0": { + "pom": "sha256-CMRPCoEjfw/xWv/CJQGPuT1sOtJ7wYFUf5X+320RU94=" + }, + "com/google/cloud#google-cloud-managedkafka-bom/0.7.0": { + "pom": "sha256-dt6RbFy0m86/Qk0YJbY1HCL4BnSzTYyztNA4BR8dV10=" + }, + "com/google/cloud#google-cloud-mediatranslation-bom/0.57.0": { + "pom": "sha256-fb4kojKIztb6aUChzVV9guJOiZTYArQ27Iyveu03vcs=" + }, + "com/google/cloud#google-cloud-meet-bom/0.18.0": { + "pom": "sha256-y/+oSfCHxdwWQVERSxohG870ChXTAWsx2Yr3j6Q8l74=" + }, + "com/google/cloud#google-cloud-memcache-bom/2.51.0": { + "pom": "sha256-inDmYYNWpW0Dz+EOp+Y6RRWSCSTd9U84eELh6abmYUs=" + }, + "com/google/cloud#google-cloud-migrationcenter-bom/0.33.0": { + "pom": "sha256-Gou3xu/QM0+YSNwQ/MSLK4LSA52MLmq0kkBz7BB2FpM=" + }, + "com/google/cloud#google-cloud-monitoring-bom/3.52.0": { + "pom": "sha256-N9bYahHduGLAJaYFpyed76dO9gLMfUgJpjlThuGzAmA=" + }, + "com/google/cloud#google-cloud-monitoring-dashboard-bom/2.53.0": { + "pom": "sha256-HjopYQhheGLZR7+0VZNvIIAu9rsrWGgbr41S++H2bmw=" + }, + "com/google/cloud#google-cloud-monitoring-metricsscope-bom/0.45.0": { + "pom": "sha256-Dto1joigVlNVfK/gm/UuqZBs6gX3qt0rvkKCAOMoQQY=" + }, + "com/google/cloud#google-cloud-monitoring/3.52.0": { + "jar": "sha256-lyeqfZTY3QNr/8z5q8XRiXCx5emCeJb5kH90UO0Q9eY=", + "pom": "sha256-Rq2rnp36dCMy2uqXgJ+w+PdRo8H+YNPk+Ad3e3j9Fzg=" + }, + "com/google/cloud#google-cloud-netapp-bom/0.30.0": { + "pom": "sha256-aiyHs19PIUnsriIPeIXo2Te7Mvn32Y95/s94ncK6rgQ=" + }, + "com/google/cloud#google-cloud-network-management-bom/1.52.0": { + "pom": "sha256-GEMhZD9eEo1SKJiRNhv7izR9VcG4MEwjx03Ew5KWFSE=" + }, + "com/google/cloud#google-cloud-network-security-bom/0.54.0": { + "pom": "sha256-rOcbxu6jAKp5ZVw7hoMQrKDnLp85mPNji4F0GfmgkWE=" + }, + "com/google/cloud#google-cloud-networkconnectivity-bom/1.50.0": { + "pom": "sha256-lxVL42U1p8jGB+ZfSoiwKu9UmqPlMI8l1gslukgEcq0=" + }, + "com/google/cloud#google-cloud-networkservices-bom/0.7.0": { + "pom": "sha256-2LI1JuYRYsuwseXGzeO4o9CBP5m1nRzHo9pu5BRxx64=" + }, + "com/google/cloud#google-cloud-nio-parent/0.128.5": { + "pom": "sha256-uxQlV25OShtdE3hEGd+qctiDTtWVCB21HiW0rhPKjVY=" + }, + "com/google/cloud#google-cloud-nio/0.128.5": { + "jar": "sha256-GhmoLCl5j6Ttw5bjlA3KMZuZR6ssGMFldza4tw+2CYY=", + "pom": "sha256-iri0BnAerBs8rym1L/26mixuDP/WHtm6n7fpgivdGPI=" + }, + "com/google/cloud#google-cloud-notebooks-bom/1.49.0": { + "pom": "sha256-tUk/lXzTVuak9no9FWz2nSH/7ATkt/GG7Fbxrq6N2QY=" + }, + "com/google/cloud#google-cloud-optimization-bom/1.49.0": { + "pom": "sha256-lEkqLI6oRnA+pvsDrGAjgbOnuLXZNS6Nt4/olCCpY8A=" + }, + "com/google/cloud#google-cloud-orchestration-airflow-bom/1.51.0": { + "pom": "sha256-XQe2ddKb/rR+l366lAFKKcyQcXm5fSMgCh1M4bbL6+I=" + }, + "com/google/cloud#google-cloud-orgpolicy-bom/2.51.0": { + "pom": "sha256-RtmA+XYlMNe7OFQRaRLTqKRfMcH2y/W4f1V2XLZ8ssU=" + }, + "com/google/cloud#google-cloud-os-config-bom/2.53.0": { + "pom": "sha256-3sP33AhcqtYwaBUFFfvgo3ul3PPCujjuW7kKHE16msw=" + }, + "com/google/cloud#google-cloud-os-login-bom/2.50.0": { + "pom": "sha256-SXV4LPmo51NxM+wCdzMupPIEZQch10aQNmzN60Qq0sc=" + }, + "com/google/cloud#google-cloud-parallelstore-bom/0.14.0": { + "pom": "sha256-MfVm4FACcuAb3iZjTmnB1aUdlmp403S+ke9bqIKAeeI=" + }, + "com/google/cloud#google-cloud-phishingprotection-bom/0.82.0": { + "pom": "sha256-XaGRzaIEMqIAg6McEUUkrCXaji9qr4v4UjPo6KuwG3A=" + }, + "com/google/cloud#google-cloud-policy-troubleshooter-bom/1.50.0": { + "pom": "sha256-hAnS5HsLNnq/sYsuuSx4lOdlqWzoBNc/F8zMgrg0VEQ=" + }, + "com/google/cloud#google-cloud-policysimulator-bom/0.30.0": { + "pom": "sha256-kJrgL5iVA/wAUdls7tUTBYzI+btq60PjXe+KEO23MwQ=" + }, + "com/google/cloud#google-cloud-pom-parent/1.45.0": { + "pom": "sha256-Ts1oA6Llpnvq4MO2zSHDRS7vIObJf9/Ax5xS+qVXONA=" + }, + "com/google/cloud#google-cloud-private-catalog-bom/0.53.0": { + "pom": "sha256-D/9WjWESDmTC1B9fBQjdcE7yNgdyfeplWNwSqGmckZQ=" + }, + "com/google/cloud#google-cloud-privilegedaccessmanager-bom/0.5.0": { + "pom": "sha256-K/d90L5yAi9DyHsEMv81/5P8RDWf4Ob3LtX7+g+0e3g=" + }, + "com/google/cloud#google-cloud-profiler-bom/2.51.0": { + "pom": "sha256-k0yhSixT1uQVEqibjz3A6ISjYnlSWLNJLmuxROe1RSQ=" + }, + "com/google/cloud#google-cloud-publicca-bom/0.48.0": { + "pom": "sha256-ou4gqXgSH3FVq3q135L77NKzXnHFRuXw8GfJuV23VI0=" + }, + "com/google/cloud#google-cloud-pubsub-bom/1.133.0": { + "pom": "sha256-1LI1ysloTkGaLCKkTZ9pni8CY5BnTpJg+2PFluOjb24=" + }, + "com/google/cloud#google-cloud-pubsublite-bom/1.14.3": { + "pom": "sha256-KahxD/HN+HTAUr8tgSGVfsvVN8CdDby0iPzRYWZY9c8=" + }, + "com/google/cloud#google-cloud-rapidmigrationassessment-bom/0.34.0": { + "pom": "sha256-teD6wnn01LtfPPIb0h1BNtzZw1B72SlyklKEpjQOkvQ=" + }, + "com/google/cloud#google-cloud-recaptchaenterprise-bom/3.48.0": { + "pom": "sha256-VcNOo0JUzYJ7SrOPCaZc6IPLzIjsIq+8wKhGA4WvAto=" + }, + "com/google/cloud#google-cloud-recommendations-ai-bom/0.58.0": { + "pom": "sha256-dBcbE3mUIaYrJ2/FJngh1Hy07Sa/5LeNDQiTBkExJ30=" + }, + "com/google/cloud#google-cloud-recommender-bom/2.53.0": { + "pom": "sha256-Nz3H9Rad5PqJXYvOUjiLvXIKE9Bn/oxqYMKRehBpafA=" + }, + "com/google/cloud#google-cloud-redis-bom/2.54.0": { + "pom": "sha256-uEs9tgZsoVfV+N7F6iziKWaPjPIpcF0kt1uPSbzUV6M=" + }, + "com/google/cloud#google-cloud-redis-cluster-bom/0.23.0": { + "pom": "sha256-nkVHcNZZEfAuOOdOurdXOvhddqlgDwCKFEz2KBnT4qU=" + }, + "com/google/cloud#google-cloud-resource-settings-bom/1.51.0": { + "pom": "sha256-2NR5iakHChyjRJ7JGKV4Yvxm8xYRGR/XCG0jpCM5zD0=" + }, + "com/google/cloud#google-cloud-resourcemanager-bom/1.53.0": { + "pom": "sha256-wRm3UC30Jq+6XFJ0H3atIjtidMoZg5ofOjREnG9JPDA=" + }, + "com/google/cloud#google-cloud-retail-bom/2.53.0": { + "pom": "sha256-4Uv0Etw3JLfkFLC5qt1OMxKfyRAATq8wQZ3mg6TGhTs=" + }, + "com/google/cloud#google-cloud-run-bom/0.51.0": { + "pom": "sha256-7UkdabRo1m10h8/kEVvsUtJSXZVWj9uucirQ1c9IVuA=" + }, + "com/google/cloud#google-cloud-scheduler-bom/2.51.0": { + "pom": "sha256-TQTrw1ZM8F84WP5ojV7WND77ellD11l1z8wEgk7UccY=" + }, + "com/google/cloud#google-cloud-secretmanager-bom/2.51.0": { + "pom": "sha256-2K0OfrvTPMO/VP3DtQlAXITSSDO6v/vd1SA5Attsn38=" + }, + "com/google/cloud#google-cloud-securesourcemanager-bom/0.21.0": { + "pom": "sha256-zYD/fg8VkWhne2unckPROFKqApEMPa5uUVsP7xuwWE4=" + }, + "com/google/cloud#google-cloud-security-private-ca-bom/2.53.0": { + "pom": "sha256-04r0UGW8D04aGUNDr7Cy2TTLP2fXUgXZllQ2MKZf948=" + }, + "com/google/cloud#google-cloud-securitycenter-bom/2.59.0": { + "pom": "sha256-mDFdBDT8mqyAqJ4zd1YMBpfddF0Kc3JCbBN3n2W7Nkw=" + }, + "com/google/cloud#google-cloud-securitycenter-settings-bom/0.54.0": { + "pom": "sha256-qbv7qJh5sjJObF12g843OTaohaUIJdhJUZxLxr0rqKc=" + }, + "com/google/cloud#google-cloud-securitycentermanagement-bom/0.19.0": { + "pom": "sha256-66w7rhbOkL8nulTt7AALOXMsnFuOOdJ1CFv8NkUl++Q=" + }, + "com/google/cloud#google-cloud-securityposture-bom/0.16.0": { + "pom": "sha256-PYH19y78NuQ4xuR+1NCdzLiMHg06ryuMsyVqbhO9ogQ=" + }, + "com/google/cloud#google-cloud-service-control-bom/1.51.0": { + "pom": "sha256-13qb2CVfeg8Vk2zQd+/CrzHOLIEEUcOH1yIgzq5z9iI=" + }, + "com/google/cloud#google-cloud-service-management-bom/3.49.0": { + "pom": "sha256-eyEZBnZS8Q4otW2LFZdfZMmOmDHUcb3J0FRHuYksK5g=" + }, + "com/google/cloud#google-cloud-service-usage-bom/2.51.0": { + "pom": "sha256-aDS28cLTlxhW6ng0zoSINU7UzMgeJAJ3qqb0e8TRSCI=" + }, + "com/google/cloud#google-cloud-servicedirectory-bom/2.52.0": { + "pom": "sha256-hyD0HnNrwcTWxAAIeSlT12bdVdiiuHWipBJDEiOz5h4=" + }, + "com/google/cloud#google-cloud-servicehealth-bom/0.18.0": { + "pom": "sha256-UCenUFoMrX4nuStWeqQvhGL8PVt0Wol4kIwnUrcq110=" + }, + "com/google/cloud#google-cloud-shared-config/1.11.2": { + "pom": "sha256-MG0tEyN3xLuJ2RmGD510ihIcIZWvnShsS1HFGq53kXc=" + }, + "com/google/cloud#google-cloud-shared-config/1.16.1": { + "pom": "sha256-MXT7SNiJF6VCBog/zIecRqBBWXJ3Zu240qdJ0SCnnuc=" + }, + "com/google/cloud#google-cloud-shared-dependencies/3.52.2": { + "pom": "sha256-FaM0uZdRhj4VhTnv8RFSuxov+V2oDXZl9ZWQHKTK5GI=" + }, + "com/google/cloud#google-cloud-shell-bom/2.50.0": { + "pom": "sha256-E7kpuJcZExzL0GPIhXUvKRzXv/JDYo0AGIp0fqzH5U8=" + }, + "com/google/cloud#google-cloud-spanner-bom/6.77.0": { + "pom": "sha256-haZFWOA0TH8ZTs7j1x1HZ6unHW9CdI6eZjljxF1/+SU=" + }, + "com/google/cloud#google-cloud-speech-bom/4.46.0": { + "pom": "sha256-Q65BcbGVKm6oP0Yyq8ruuhOdB25yl7viDrdSMAPD65k=" + }, + "com/google/cloud#google-cloud-storage-bom/2.43.1": { + "pom": "sha256-jxpIGh0pazvtPgBWZwPcplLi1CaJ0mcSiMVoYonPUy8=" + }, + "com/google/cloud#google-cloud-storage-parent/2.58.0": { + "pom": "sha256-VB2ZCP/xqMvlW9MxX79sQ7J+2weFxNiVt4tOf3L6tpQ=" + }, + "com/google/cloud#google-cloud-storage-transfer-bom/1.51.0": { + "pom": "sha256-zkWdYU7Kh5jSqUCi4xilXUmRQ6gfjrUP+nJWrJVm7Js=" + }, + "com/google/cloud#google-cloud-storage/2.58.0": { + "jar": "sha256-2yRYJ0gOPdp/8erdCkTeG/IJyXow/Vm3IjVSc22mGJA=", + "pom": "sha256-EIwQOQpTu6N4JbXi3p1yBN+rOaTkBDTSL6ablElUp/U=" + }, + "com/google/cloud#google-cloud-storageinsights-bom/0.36.0": { + "pom": "sha256-hCvCUJQpc/bG+mXcwnGxBXN1Et/EDp5X63o3VpiMQYM=" + }, + "com/google/cloud#google-cloud-talent-bom/2.52.0": { + "pom": "sha256-RRVKVoFFlt5Xs9RkO9ltTvhlN1FHwc1GMwcVLVG7okk=" + }, + "com/google/cloud#google-cloud-tasks-bom/2.51.0": { + "pom": "sha256-tMvGnqtWsp24OFM/0iimvf8KTOzLIQ0kzDzmOjDy6eg=" + }, + "com/google/cloud#google-cloud-telcoautomation-bom/0.21.0": { + "pom": "sha256-iNoPmRWHGp2uSUVDzN7amR67DyglQ4AtCGQ1Gh6HHmU=" + }, + "com/google/cloud#google-cloud-texttospeech-bom/2.52.0": { + "pom": "sha256-KBOd3+BX0y6dpmAkWmIB3HP8Sn/EvoVh9PHv9q3SnN4=" + }, + "com/google/cloud#google-cloud-tpu-bom/2.52.0": { + "pom": "sha256-PQAuQ0CpkSz6b0JdjjYGzLuRJvcGRE9NbxBnTGTbuhA=" + }, + "com/google/cloud#google-cloud-trace-bom/2.51.0": { + "pom": "sha256-A90AgW1xVto8dV5Wu45ay54EPqr/SSLeoRabiAFjNtg=" + }, + "com/google/cloud#google-cloud-translate-bom/2.51.0": { + "pom": "sha256-++A9aASk8agRSLxMwod4POElV6GLfj2aX1hm/c5NVTo=" + }, + "com/google/cloud#google-cloud-vertexai-bom/1.11.0": { + "pom": "sha256-Z4D5LNPmwLl0ympAqmu8EakCGn6rtfKosFBaDaRDVBE=" + }, + "com/google/cloud#google-cloud-video-intelligence-bom/2.50.0": { + "pom": "sha256-pTyme+Usw0nMUJn9LIRVcokRBWxN+nWRGUYubsck+3g=" + }, + "com/google/cloud#google-cloud-video-stitcher-bom/0.51.0": { + "pom": "sha256-fx1qZVF6eWYVgzkODcPjd6g/EY4TtSlY2BpMcJPMh5A=" + }, + "com/google/cloud#google-cloud-video-transcoder-bom/1.50.0": { + "pom": "sha256-6ijSQWYT2Q2be3vqX8wmBadAbEDoqbTiGrKrL94SPZA=" + }, + "com/google/cloud#google-cloud-vision-bom/3.49.0": { + "pom": "sha256-sbFMklQVOHrFo4SlWpvH3QiHXvIxekbLArr9/3pC2Gc=" + }, + "com/google/cloud#google-cloud-visionai-bom/0.8.0": { + "pom": "sha256-Xrw465S5Igyuvjw+lz+3TEIXRePmhfgSgxB0Adh3j/E=" + }, + "com/google/cloud#google-cloud-vmmigration-bom/1.51.0": { + "pom": "sha256-XuLti3/lkz8QDSQb1vbfzzULcaN9u8OXHN4zfHkGvxk=" + }, + "com/google/cloud#google-cloud-vmwareengine-bom/0.45.0": { + "pom": "sha256-aI2AVB0sjqcrVvlv7B504Y9DH0+VoQgtRyuHhZU7ZRE=" + }, + "com/google/cloud#google-cloud-vpcaccess-bom/2.52.0": { + "pom": "sha256-rBDTiHhVrmIh1Vck5unRmRcd50edzTNVQvj3af2hNpQ=" + }, + "com/google/cloud#google-cloud-webrisk-bom/2.50.0": { + "pom": "sha256-NcoNxqToYLGIjgJcd4WdgwgjgQDOlNCmryoMEriq4bs=" + }, + "com/google/cloud#google-cloud-websecurityscanner-bom/2.51.0": { + "pom": "sha256-I4ZHg96YPH2/qrvYo12dMnY6ZgFsxCPCozKdMQNxzZc=" + }, + "com/google/cloud#google-cloud-workflow-executions-bom/2.51.0": { + "pom": "sha256-pamAQsXnQEHFHiQW4ojFl9j3TntBfwgTzSIMB/5lP5w=" + }, + "com/google/cloud#google-cloud-workflows-bom/2.51.0": { + "pom": "sha256-m/49yTrnQk7aEEXU/wVsEenG1+yQ7IZQJR27aQCwk9Q=" + }, + "com/google/cloud#google-cloud-workspaceevents-bom/0.15.0": { + "pom": "sha256-P636O4WYBkZw6nK8RmzopONxlYMOAph4t1iDj8xBrwE=" + }, + "com/google/cloud#google-cloud-workstations-bom/0.39.0": { + "pom": "sha256-NA5Ia32QpMrrN+6FkMGnsW3lvUxZ3nYIcy4Hma1QkE8=" + }, + "com/google/cloud#google-iam-admin-bom/0.2.0": { + "pom": "sha256-zHdylNrsDPDA78uLGe1Ia/lieKDjhpfmizDCZshCPFI=" + }, + "com/google/cloud#google-iam-policy-bom/1.49.0": { + "pom": "sha256-43Z4KwD3KvS1wX+GyN1k0m0+YyBlnkAw9Mtov6FhCZA=" + }, + "com/google/cloud#google-identity-accesscontextmanager-bom/1.52.0": { + "pom": "sha256-4MaAX1TTJ7Zk93NIonDpQs3nNi1uQP8zv/FncQmq5gk=" + }, + "com/google/cloud#libraries-bom/26.48.0": { + "pom": "sha256-kPk5uIDS8oW6IFAX3OWesjV7MBWki0IwzG64J1zgrkE=" + }, + "com/google/cloud#native-image-shared-config/1.11.2": { + "pom": "sha256-8x6Sx5b7G4khrVukZEADTQIxynff4eeFeN3Gi9yM8HI=" + }, + "com/google/cloud#native-image-shared-config/1.15.4": { + "pom": "sha256-D0pPs9aEv607E4QRfyANkO9TkMOiX8H3JRlw4XKlsBU=" + }, + "com/google/cloud#native-image-shared-config/1.16.0": { + "pom": "sha256-oC9dmGuHE9zoAhed38jE3fhUhpEs2ygKmLKmB0KEbiY=" + }, + "com/google/cloud#native-image-shared-config/1.16.1": { + "pom": "sha256-QN9I9Uh8R7+4ROOiTUomQTA/I45yHXU/Ag2WnyteQYc=" + }, + "com/google/cloud#sdk-platform-java-config/3.36.1": { + "pom": "sha256-SV+tM+d6F2fiWBEP/+2tXszCrCkTTl+urAcHlrS06r8=" + }, + "com/google/cloud#sdk-platform-java-config/3.52.2": { + "pom": "sha256-4PRXCq77s+vVCewmhEJStyGftQhVtVnHnvOElNCTwu4=" + }, + "com/google/cloud#third-party-dependencies/3.52.2": { + "pom": "sha256-POagE1Zm9Q2CYM/Q/xWRf1q8ye+YE0kGQ44cKEz6anw=" + }, + "com/google/cloud/opentelemetry#detector-resources-support/0.33.0": { + "jar": "sha256-lLDe8ndUCDzqpntWpNSD0pTp8XBmST3z736B7Fw7ssA=", + "module": "sha256-W/NgcxpRZENfcytG0rsOqSJAflltyrk2IIDCM8505a0=", + "pom": "sha256-e6XRs3D/GK6rCYwwlpR3RY6AIoAeTPNcfhCslx3nb9U=" + }, + "com/google/cloud/opentelemetry#exporter-metrics/0.33.0": { + "jar": "sha256-epq4doOpc1epU4n/POyWhHhWSAdvmxWNRNo77Lk7sDY=", + "module": "sha256-//u9Comol29AnTEaEQomYE0sSJZKm3Cg9fbOtIN5VI8=", + "pom": "sha256-wITQyFceLR6zG0FHp9zhAtdysbEhFclWBWiDLAKx/4Y=" + }, + "com/google/cloud/opentelemetry#shared-resourcemapping/0.33.0": { + "jar": "sha256-7qmj4R23g2JswV3Rg1we0J9TtwofyoxYv3I86BPp+EM=", + "pom": "sha256-r+/RtmgaK0H8QcGz+m9Gm8hUYFONg++kztBmHW0WzoQ=" + }, + "com/google/code/findbugs#jsr305/3.0.2": { + "jar": "sha256-dmrSoHg/JoeWLIrXTO7MOKKLn3Ki0IXuQ4t4E+ko0Mc=", + "pom": "sha256-GYidvfGyVLJgGl7mRbgUepdGRIgil2hMeYr+XWPXjf4=" + }, + "com/google/code/gson#gson-parent/2.10.1": { + "pom": "sha256-QkjgiCQmxhUYI4XWCGw+8yYudplXGJ4pMGKAuFSCuDM=" + }, + "com/google/code/gson#gson-parent/2.12.1": { + "pom": "sha256-yeewt+Mb574iaEl5wGgAHGUssRPE5u2JTjm2Q97gf8E=" + }, + "com/google/code/gson#gson-parent/2.13.1": { + "pom": "sha256-+IEKzlDd/j/ag9ESbeZdmdXSUVoUo2uIvrG5mkdpeDY=" + }, + "com/google/code/gson#gson/2.10.1": { + "jar": "sha256-QkHBSncnw0/uplB+yAExij1KkPBw5FJWgQefuU7kxZM=", + "pom": "sha256-0rEVY09cCF20ucn/wmWOieIx/b++IkISGhzZXU2Ujdc=" + }, + "com/google/code/gson#gson/2.12.1": { + "jar": "sha256-6+4T1ft0d81/HMAQ4MNW34yoBwlxUkjal/eeNcy0++w=", + "pom": "sha256-C1c17IX0UoLx4sdpd5gAQnsVCoFj9AUJOpKAtxyrGXg=" + }, + "com/google/code/gson#gson/2.13.1": { + "jar": "sha256-lIVZQtSZLxEpRtPeHDNOcJI3uBJtgTC/B4B8AYpKISA=", + "pom": "sha256-wPZXItdcDljNGDWzBGBG9ga12mmZBBYfjba3j+ubQBo=" + }, + "com/google/errorprone#error_prone_annotations/2.23.0": { + "pom": "sha256-1auxfyMbY78Ak1j6ZAKBt0SBDLlYflmUl3g0lZwH29g=" + }, + "com/google/errorprone#error_prone_annotations/2.38.0": { + "jar": "sha256-ZmHVM1CQpfxh3YadIJW8bB4hVuOqR6bkq6vfZMmaeIk=", + "pom": "sha256-MAe++K/zro6hLYHD/qy08Vl5ss9cPjj8kYmpjeoUEWc=" + }, + "com/google/errorprone#error_prone_parent/2.23.0": { + "pom": "sha256-9UcKSzEE/jCfvpSoDRbDxU0g90j0xd5PaKQoaI8wy9Q=" + }, + "com/google/errorprone#error_prone_parent/2.38.0": { + "pom": "sha256-5iRYpqPmMIG8fFezwPrJ8E92zjL2BlMttp/is9R7k0w=" + }, + "com/google/guava#failureaccess/1.0.2": { + "jar": "sha256-io+Bz5s1nj9t+mkaHndphcBh7y8iPJssgHU+G0WOgGQ=", + "pom": "sha256-GevG9L207bs9B7bumU+Ea1TvKVWCqbVjRxn/qfMdA7I=" + }, + "com/google/guava#failureaccess/1.0.3": { + "jar": "sha256-y/w5BrGbj1XdfP1t/gqkUy6DQlDX8IC9jSEaPiRrWcs=", + "pom": "sha256-xUvv839tQtQ+FHItVKUiya1R75f8W3knfmKj6/iC87s=" + }, + "com/google/guava#guava-bom/33.3.0-jre": { + "pom": "sha256-laWAAekZ/CIA9MprzWNEMWfCodzecAguuXQvY5OBooE=" + }, + "com/google/guava#guava-bom/33.4.0-jre": { + "pom": "sha256-OuGXeIQNiENUgMjFC69z6qKi/A8hxzrgkX0A2mU8J1Y=" + }, + "com/google/guava#guava-parent/26.0-android": { + "pom": "sha256-+GmKtGypls6InBr8jKTyXrisawNNyJjUWDdCNgAWzAQ=" + }, + "com/google/guava#guava-parent/33.0.0-jre": { + "pom": "sha256-BAzIjGgLQT1wup/INxs2CTAhsQmWqjWYYh3nZ9QYIpo=" + }, + "com/google/guava#guava-parent/33.4.0-android": { + "pom": "sha256-ciDt5hAmWW+8cg7kuTJG+i0U8ygFhTK1nvBT3jl8fYM=" + }, + "com/google/guava#guava-parent/33.4.0-jre": { + "pom": "sha256-Okme00oNnuDxvMOSMAIaHNTi990EJqtoRPWFRl1B3Nc=" + }, + "com/google/guava#guava-parent/33.4.8-jre": { + "pom": "sha256-oDxRmaG+FEQ99/1AuoZzscaq4E3u9miM59Vz6kieOiA=" + }, + "com/google/guava#guava/33.0.0-jre": { + "jar": "sha256-9NhcPk1BFpQzfLhzq+oJskK2ZLsBMyC+YQUyfEWZFTc=", + "module": "sha256-WaLb0FXRuqdi548aW6Orlz7dE/wn3MGHEQXi95f2gtM=", + "pom": "sha256-/XCxTEQZhsIubSLO0ldnh3Vr5JGLFFqKvSI+OoC24y0=" + }, + "com/google/guava#guava/33.4.0-android": { + "module": "sha256-T1fpmXE67O0x+j3jwJSyCTuU9p7+Lcne48VlWKRyZNU=", + "pom": "sha256-6Zh7Tm0QAgNaBekAqosGuEvGpCxoEC6R80cVybIZgO0=" + }, + "com/google/guava#guava/33.4.0-jre": { + "jar": "sha256-uRjJin5E2+lOvZ/j5Azdqttak+anjrYAi0LfI3JB5Tg=", + "module": "sha256-gg6BfobEk6p6/9bLuZHuYJJbbIt0VB90LLIgcPbyBFk=", + "pom": "sha256-+pTbQAIt38d1r57PsTDM5RW5b3QNr4LyCvhG2VBUE0s=" + }, + "com/google/guava#guava/33.4.8-jre": { + "jar": "sha256-89f1f2f9Yi9NRo391pKzpeOQkkbCgBesMmNAXw/mF+0=", + "module": "sha256-WKM1cwMGmiGTDnuf6bhk3ov7i9RgdDPb5IJjRZYgz/w=", + "pom": "sha256-BDZdS27yLIz5NJ/mKAafw+gaLIODUUAu9OlfnnV77rw=" + }, + "com/google/guava#listenablefuture/9999.0-empty-to-avoid-conflict-with-guava": { + "jar": "sha256-s3KgN9QjCqV/vv/e8w/WEj+cDC24XQrO0AyRuXTzP5k=", + "pom": "sha256-GNSx2yYVPU5VB5zh92ux/gXNuGLvmVSojLzE/zi4Z5s=" + }, + "com/google/http-client#google-http-client-apache-v2/1.47.1": { + "jar": "sha256-5qi+KM47jdQpasBXcNnlMnJycvJmako9JWOcyOERV9U=", + "pom": "sha256-oUDD5tJkyEkYDKZq17v99uc70NfacG1uIohgD8kEiQw=" + }, + "com/google/http-client#google-http-client-appengine/1.47.1": { + "jar": "sha256-MzAOjKDIzh02vXdeQUo9yIOqKqbeYErSw9heGKPoBaw=", + "pom": "sha256-Vcy92x1UWKXyHGxZwqeSR3GhGKE2xkjHIlFf112PIvc=" + }, + "com/google/http-client#google-http-client-bom/1.43.3": { + "pom": "sha256-K9C6F9zatcBDtHXQR3XKphHUINxWEIsY402T0nmwJrk=" + }, + "com/google/http-client#google-http-client-bom/1.45.0": { + "pom": "sha256-0l547zQlDT9uCZ2nchpTdBIFl1pdDvM+JlEGaUIizBk=" + }, + "com/google/http-client#google-http-client-bom/1.45.2": { + "pom": "sha256-9IAlaC2K0ywkfnkpeFtgE1H2O7GchuNpb+BO58k0uSU=" + }, + "com/google/http-client#google-http-client-bom/1.47.0": { + "pom": "sha256-hy8h3uyOjEhdOLtm7csMUAh/pQ9r5tEriFbiSGzSZ1o=" + }, + "com/google/http-client#google-http-client-bom/1.47.1": { + "pom": "sha256-kjw8EOHRLlPjT9Q8bd+vDoN78atgQYWUC5z+9VXlv8k=" + }, + "com/google/http-client#google-http-client-gson/1.47.0": { + "pom": "sha256-jKMHHdE67M/TGKRcLeZjEqqVzneLZzZzuKbr277ES+I=" + }, + "com/google/http-client#google-http-client-gson/1.47.1": { + "jar": "sha256-ZKwrExPcprb8m9FBKKsYZSj+mSsJT1Nx+n+Cju2JA70=", + "pom": "sha256-KXyMpsTRm5hMbiOnL8Tga6UD5uHWGCfU0kMuBd0qFbI=" + }, + "com/google/http-client#google-http-client-jackson2/1.47.1": { + "jar": "sha256-Tn6oIpIhNps6d36ewafhWV4C+hSQ8Jdy0fnikzPG0qw=", + "pom": "sha256-y7OUHZ4yz9cBtyUpZ1TTp6nQQS7iFDVJpBLkP9tydU0=" + }, + "com/google/http-client#google-http-client-parent/1.47.0": { + "pom": "sha256-lbuqSXdGdvc23BNdcWhInDitS+RthBeuSR1LSo6lxU4=" + }, + "com/google/http-client#google-http-client-parent/1.47.1": { + "pom": "sha256-WDGyURO7RiMpM/pUi1U2R3XZ4Qt7m4PdS6IA5MR+y7Y=" + }, + "com/google/http-client#google-http-client/1.47.0": { + "pom": "sha256-/gogglHO9bfFdvHjw1aqllPIU0YBRB8vHrcn4Kbwojw=" + }, + "com/google/http-client#google-http-client/1.47.1": { + "jar": "sha256-IkR/3p8uM+J6I6JZU7HGIurWwFXHYf3mylBXPJRzRXo=", + "pom": "sha256-qafEmqAnaiaQlUzCl5DdWxUvIYqSZtuqhgdDj1TJ30M=" + }, + "com/google/j2objc#j2objc-annotations/2.8": { + "jar": "sha256-8CqV+hpele2z7YWf0Pt99wnRIaNSkO/4t03OKrf01u0=", + "pom": "sha256-N/h3mLGDhRE8kYv6nhJ2/lBzXvj6hJtYAMUZ1U2/Efg=" + }, + "com/google/j2objc#j2objc-annotations/3.0.0": { + "jar": "sha256-iCQVc0Z93KRP/U10qgTCu/0Rv3wX4MNCyUyd56cKfGQ=", + "pom": "sha256-I7PQOeForYndEUaY5t1744P0osV3uId9gsc6ZRXnShc=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.36.0": { + "pom": "sha256-9oGcT6yZOGhd1zog0o0MVkakhmeJsmh0EbavFlPkAcU=" + }, + "com/google/oauth-client#google-oauth-client-bom/1.39.0": { + "pom": "sha256-WS9mnnI73+MyyliL/pNEWufx0e5LffxY7s6kcQjD5F8=" + }, + "com/google/oauth-client#google-oauth-client-parent/1.39.0": { + "pom": "sha256-On5aiLGa/Fe/ifjsMsa5FgXXuUJ32trv/0mZlGPaDqY=" + }, + "com/google/oauth-client#google-oauth-client/1.39.0": { + "jar": "sha256-J/xh7i1SbjPTE1C16jgwkcCHk0XiYfmy5vzJeiDIb4g=", + "pom": "sha256-g5OwQr0u5dv0odPhmmBgyiOiTeRpoM3P9E8kDps4CbU=" + }, + "com/google/protobuf#protobuf-bom/3.25.5": { + "pom": "sha256-CA4phBcyOLUOBkwiav/7sbAjNSApXHkKf9PWrkWT8GM=" + }, + "com/google/protobuf#protobuf-bom/3.25.8": { + "pom": "sha256-/IgVoVEXaDxkJ6Yjcb1wzwBF2imeXHjudf+HUrRibes=" + }, + "com/google/protobuf#protobuf-java-util/3.25.8": { + "jar": "sha256-5xlurvw/ga+hVxghY1x67+KTP0vkqd+eYB+1khS1Amk=", + "pom": "sha256-dqjqWRWcGPmhI1v805FNVsIzsziytZyyjpL6XySe8nw=" + }, + "com/google/protobuf#protobuf-java/3.25.8": { + "jar": "sha256-cr2zLrOMr7fc0ogmLCmjTVfLouGRAa+WhRVbqMClYAg=", + "pom": "sha256-ZzccXrVLysqF7ETFJQTjiz3gUSPumNOx7Z3VNV/p8I0=" + }, + "com/google/protobuf#protobuf-parent/3.25.8": { + "pom": "sha256-wuMl6QySc4t9EQMltSj4pl6/F6ICv2X2/HOAzpzmWGg=" + }, + "com/google/re2j#re2j/1.8": { + "jar": "sha256-e1LHIVbdf5izI3pbNcHTT7o4GyEEjIkgiROtgKRd+9c=", + "pom": "sha256-32JpkzXNRvxGX0wDuMWB09UHeSIS0ntlrbkjtMJ95Oc=" + }, + "com/googlecode/javaewah#JavaEWAH/1.2.3": { + "jar": "sha256-1lImlJcTxMYaeE9BxRFn57Axb5N2Q5jrup5DNrPZVMI=", + "pom": "sha256-5O1sZpYgNm+ZOSBln+CsfLyD11PbwNwOseUplzr5byM=" + }, + "com/microsoft/azure#msal4j-persistence-extension/1.3.0": { + "jar": "sha256-38QcgX+/p2BXr2/+Q3nbympeFrjoffi92iPzcXVsLQk=", + "pom": "sha256-t2KD6r5Mkx+yr6OcEh9HCsHN6HCP0wVbDijqi652t5c=" + }, + "com/microsoft/azure#msal4j/1.23.1": { + "jar": "sha256-QU1P48Zse7GnQQFPNS5fCoMpFycD5/uwAg0jKoyDhbE=", + "pom": "sha256-ogTc1j/EeDpCpWKTg63g1z3pdAKXl4Ji6+b/TVEY+SY=" + }, + "com/networknt#json-schema-validator/1.5.6": { + "jar": "sha256-VTFDa5ffqQ00uyrLvmXgVKCiTe0VdgMraE7heXKPhtQ=", + "pom": "sha256-e/wlpTWWxa1g1qLRQ+BPC1weA9u2IGjnpl9q3YiCl5w=" + }, + "com/networknt#json-schema-validator/1.5.7": { + "jar": "sha256-LHHpcNwbZ0mbme+vZZgmlumM7QAoVI1Dv066Bu3Yg08=", + "pom": "sha256-qQU6VxFYaUiNK879i+139s2czA5HL7gDlUXCpFv1VTQ=" + }, + "com/oracle/coherence/ce#coherence-bom/25.03.1": { + "pom": "sha256-8d0wn5MxlwuKd3MVGt5Lx8sesT1fn5OmPtSNTFLZL6I=" + }, + "com/squareup/moshi#moshi-adapters/1.15.2": { + "jar": "sha256-76kPs0GaWoi9XgKcuv3OzOGBJDCxXLhncPYOrwtFxAk=", + "module": "sha256-Ie51IIERSzYjt/fikzFgt++syc6UfQY4Y+LbGIAx2kQ=", + "pom": "sha256-KBkBfxpRZHeSl+DflvIlDQVin7SG6J4e/ZyT86hlis4=" + }, + "com/squareup/moshi#moshi/1.15.2": { + "jar": "sha256-dn91ksbGHraTVJom0zPBIfU4OCa9KHuJmGeqMm2uVeQ=", + "module": "sha256-2VLG3ZGntCbD8KUe3D986zSQrAH/GDAVJ63+x6eDfdk=", + "pom": "sha256-MXodP7cFQDG/6QzKibECSQH9m5/MqZFmws54U7X8e9k=" + }, + "com/squareup/okio#okio-jvm/3.7.0": { + "jar": "sha256-2LNa3Ch2j0OuWv5qfRqiqHi6UeC5ak8wiBHzsfWxPlU=", + "module": "sha256-b64CAbCuSKGWBt4Ab/6YQtjQ/CoeQ04Hhc7Ni3Wr5HQ=", + "pom": "sha256-d07LnSsHlLT7J+eeCHYMpWC39U+qlRm5GDxn/rRfLJc=" + }, + "com/squareup/okio#okio/3.7.0": { + "module": "sha256-88rgCfC2yEL7vFLOd1QsGdGdVu6ZpeVVZH8Lr8nVDPo=", + "pom": "sha256-H2KMRSg726uM4DwHps+3akeLjdrhgL2PNKusJz5Id24=" + }, + "com/sun/activation#all/1.2.0": { + "pom": "sha256-HYUY46x1MqEE5Pe+d97zfJguUwcjxr2z1ncIzOKwwsQ=" + }, + "com/sun/mail#all/1.4.7": { + "pom": "sha256-WWVyZBVPF2+UWc9Fwk0H9Olm8sXpxRCtoS1lTHxbxU4=" + }, + "com/thoughtworks/qdox#qdox/1.12.1": { + "jar": "sha256-IfuiL4MOkmjwfPSrLZnoGBq73LDLke4CKOs8uRjc3R0=", + "pom": "sha256-xSpmFtBO+zDJ7eq57oKwWR5NBNOOAwv4HiUHdlUtIV0=" + }, + "commons-codec#commons-codec/1.10": { + "jar": "sha256-QkHfqU5xHUNfKaRgSj4t5cSqPBZeI70Ga+b8H8QwlWk=", + "pom": "sha256-vbjbcBLREqbj6o/bfFELMA2Z7/CBnSfd26nEM5fqTPs=" + }, + "commons-codec#commons-codec/1.15": { + "pom": "sha256-yG7hmKNaNxVIeGD0Gcv2Qufk2ehxR3eUfb5qTjogq1g=" + }, + "commons-codec#commons-codec/1.16.1": { + "pom": "sha256-uCbd2S+dfMZDcaAvoIMMFU1nyYNw6lSi0ZbnLrWQrSg=" + }, + "commons-codec#commons-codec/1.17.1": { + "jar": "sha256-+fbLED8t3DyZqdgK2irnvwaFER/Wv/zLcgM9HaTm/yM=", + "pom": "sha256-f6DbTYFQ2vkylYuK6onuJKu00Y4jFqXeU1J4/BMVEqA=" + }, + "commons-codec#commons-codec/1.18.0": { + "jar": "sha256-ugBfMEzvkqPe3iSjitWsm4r8zw2PdYOdbBM4Y0z39uQ=", + "pom": "sha256-dLkW2ksDhMYZ5t1MGN7+iqQ4f3lSBSU8+0u7L0WM3c4=" + }, + "commons-io#commons-io/2.15.1": { + "pom": "sha256-Fxoa+CtnWetXQLO4gJrKgBE96vEVMDby9ERZAd/T+R0=" + }, + "commons-io#commons-io/2.16.1": { + "jar": "sha256-9B97qs1xaJZEes6XWGIfYsHGsKkdiazuSI2ib8R3yE8=", + "pom": "sha256-V3fSkiUceJXASkxXAVaD7Ds1OhJIbJs+cXjpsLPDj/8=" + }, + "commons-logging#commons-logging/1.2": { + "jar": "sha256-2t3qHqC+D1aXirMAa4rJKDSv7vvZt+TmMW/KV98PpjY=", + "pom": "sha256-yRq1qlcNhvb9B8wVjsa8LFAIBAKXLukXn+JBAHOfuyA=" + }, + "dev/failsafe#failsafe-parent/3.3.2": { + "pom": "sha256-52onlGrLqFePJthfAjPMDzlGiw58KYXcbXxs4BBVLYQ=" + }, + "dev/failsafe#failsafe/3.3.2": { + "jar": "sha256-LF3Ieabax+o6eynXleJ71JuOeQiwXC8+VgU8GdeYUPU=", + "pom": "sha256-elPaR8MAdPlyXIyfzWg8a/gTZ9QnO9+653PzPDR8aCs=" + }, + "io/airlift#airbase/77": { + "pom": "sha256-ZXcwMrJ5toeFOqstKYhS2A+hoMdZu1A+ZpDFBWRJR0k=" + }, + "io/grpc#grpc-alts/1.71.0": { + "jar": "sha256-wGcUAavIfPa9bNtYoLrPKa/w63INTQ8yNzwSggjL6P0=", + "pom": "sha256-oF5uGjJbgp5sF6k+dja18KPj7gjFCX8aDMZhVHmwi3U=" + }, + "io/grpc#grpc-api/1.71.0": { + "jar": "sha256-SXcbrSRN4SLwV4DBLz50upowG+El0JQaheZJIS9KigE=", + "pom": "sha256-y2yodovZXx5ncoOO8UGRZ6MY7crTlhWEtb9uj57BF2k=" + }, + "io/grpc#grpc-api/1.75.0": { + "jar": "sha256-fzCWFmkfplXQJRJ2IEntGL9KsrUs7UJMqy9SfQu44/w=", + "pom": "sha256-XHcZeqVh6nLhEEmy2RzpEniJCcL3BOAcr3dYiEXCWu8=" + }, + "io/grpc#grpc-auth/1.71.0": { + "jar": "sha256-GWiIX2A0B1/MSe9mrmzSTX7mpEJDd5sVgt1xWj6E8cQ=", + "pom": "sha256-X35qu+zHZZVGScoV4BLHSgn3rqb55mbDi0rf0zEyfKk=" + }, + "io/grpc#grpc-bom/1.68.0": { + "pom": "sha256-iPNHhiU9KQztR34yUmVYpVaHMjb/2SsNRpTypFqIYD8=" + }, + "io/grpc#grpc-bom/1.71.0": { + "pom": "sha256-2Oprzw2p5GasZTTo1weVTqbIdQBNVAuZlJ64azoxJVs=" + }, + "io/grpc#grpc-bom/1.73.0": { + "pom": "sha256-Zti3CCOQrOmWyf4FN1V0R4kIrDg8eRRop/h5wMQvOb8=" + }, + "io/grpc#grpc-context/1.71.0": { + "jar": "sha256-3QSErF0Lr37oEDMVBNxiAse0JryI3OJBAOd/V2kE3VI=", + "pom": "sha256-P1BGN6pujHEFzdGa0rOueRCRW+XbZc3tRlm1KAcLTCk=" + }, + "io/grpc#grpc-context/1.75.0": { + "jar": "sha256-fh3nhH6mIansfLmIqLqpR3SNDq75S/5FfQTZtXEFB58=", + "pom": "sha256-IxAk0c8YIS4MXR2JJG1vJ7DSbOCCJQigNybXgI7wGIE=" + }, + "io/grpc#grpc-core/1.71.0": { + "jar": "sha256-AwmUlMYMuf6lgC67qNdn5EaXBi7AXlIHta6Jfgm9OOk=", + "pom": "sha256-D69QLQW6FQd9FEI2VZJz1C3q3MMT1eaURUpUx1G6qDE=" + }, + "io/grpc#grpc-core/1.75.0": { + "jar": "sha256-8Qzb5Vg3hJTk/8axuzKLihN/MgHUbIsk8BVOueURkaE=", + "pom": "sha256-RZmWbBDGo21dFOCn4LWdqjCZEUv0SsoTsf/OOW4RSxc=" + }, + "io/grpc#grpc-googleapis/1.71.0": { + "jar": "sha256-RCd8zGydO8nNPx4XaJyDFopysTLAD1b5On1uG5mE7l0=", + "pom": "sha256-tUffiT0kx/y+2XGdLlYwvr1htk9lffocL2Yi7FoOx10=" + }, + "io/grpc#grpc-grpclb/1.71.0": { + "jar": "sha256-V4Z6RJZ2aeoqAk7JfzxJepzcfHPQbO4PDhkYXviKOP4=", + "pom": "sha256-YtanuhO8T8QzWBaMHRpia53rOHhy+wq9cPqT1pIRgrY=" + }, + "io/grpc#grpc-inprocess/1.71.0": { + "jar": "sha256-hsfebjjNPqQLNyCgN/WAacZfGl0pGuo3AmHu6/4FV68=", + "pom": "sha256-EPC15IGKnxw6hr7RYUUVbDAP9jlp+kmOiWpR1ulDW2o=" + }, + "io/grpc#grpc-netty-shaded/1.71.0": { + "jar": "sha256-7jdeU0wNY70eklZ2VhAxm5zps5lYjsQI3PHH6nw/Je8=", + "pom": "sha256-bFfV2USot3T9RxfaEXZ+Uz/7bojAgFTxWLVl08Q6THA=" + }, + "io/grpc#grpc-netty-shaded/1.75.0": { + "jar": "sha256-0z1HqXIKOSUSxOTOqhekWKDj7WGI0X6Y1sT68GeTdNc=", + "pom": "sha256-827bYOpjDc1hIJuoHiWbIJYpMzdhUD5mHHXLkJ1CqYY=" + }, + "io/grpc#grpc-opentelemetry/1.71.0": { + "jar": "sha256-BX7xAeMDT3lc3O9V9qlXr/zO0YYyfthg5vynqSGMHBU=", + "pom": "sha256-gCSt7On7R+xMLcG6VOdUxhKazWd+64VDkAlqw6+/87w=" + }, + "io/grpc#grpc-protobuf-lite/1.71.0": { + "jar": "sha256-/62XdAC0lkn6LVQEq6rfymbH5ZVpdPGSQR6JRqEuX1M=", + "pom": "sha256-0OfP9fJMHv9eMTFe17/ADHGLkm+oDJZ/NMMgLUkq1sY=" + }, + "io/grpc#grpc-protobuf/1.71.0": { + "jar": "sha256-froGJfuo4XbA/BuAYQ/CxSwDbZWAX/3T9phaUclo3pQ=", + "pom": "sha256-PBUS4FKMvlRZWySJpqjEODxTlI/pz0BJoFahimLBU80=" + }, + "io/grpc#grpc-rls/1.71.0": { + "jar": "sha256-Akgj01PijYcK/xjIieksrz/1U/MLFxRCXrIfIGHziHY=", + "pom": "sha256-SkvWS5JEDHkk1m/LIEr+hq5REozvWo/llD0QAxXt2QQ=" + }, + "io/grpc#grpc-services/1.71.0": { + "jar": "sha256-6Wa6Bitnkwg6sWPDgQPU/Lxx7Z+R20vYGzD8uXWgqEU=", + "pom": "sha256-LzlFrpxLwu47tP+KCQ0EwjDrLJOAgJMSsV3KoGB7glI=" + }, + "io/grpc#grpc-stub/1.71.0": { + "jar": "sha256-UZEuYSso22XuwDMqi+SUs8VNNH7NLF9qf90suZT6s2A=", + "pom": "sha256-p8mYNe+hiI/3haY5dXizx+Jc0FSPI/Le/HfexnBfN2s=" + }, + "io/grpc#grpc-util/1.71.0": { + "pom": "sha256-ECKf99G40+UKClCMiM6V2Vv08LvIu5fT2I/v1yWNJ1M=" + }, + "io/grpc#grpc-util/1.75.0": { + "jar": "sha256-krWhGV2tTL18QFsBy9n9LbvVSNE9TPq/nS1qN7rUy4E=", + "pom": "sha256-vIY0RvlEF2d8tqwij7kb3D2Cr43SyOpGQ7W1LXVQ/XM=" + }, + "io/grpc#grpc-xds/1.71.0": { + "jar": "sha256-tXC4CAlTFBD5ZcwE4pRm2hwzjaQ021/KopuCLUD+gLU=", + "pom": "sha256-V6N5dNpK5bld8fY5OF5K2mWOEVebED8pP5ENtlgVu2I=" + }, + "io/kotest#kotest-bom/5.9.1": { + "module": "sha256-iV5B8T59Noy4DdSWcxm80aL4SrRdUC2BXhUBw1u2S/Q=", + "pom": "sha256-QUH5XOXBgNuI8BKSsMALFrJf+M40oqmp4j5uOR0o/BY=" + }, + "io/ktor#ktor-bom/2.3.13": { + "module": "sha256-ii03Py+dyhrAo4Um0Kbx0gNZvPKAZzvThEEUDjlBX4Q=", + "pom": "sha256-U22n0DqZ5kRlHujq8RGM9bI5A7dz2Hwni6CIXCJCYVE=" + }, + "io/micrometer#micrometer-bom/1.15.0": { + "pom": "sha256-H+qJzHE6YZj3tiIgvwnpgU5On5PkH+0+HFjs1L3BwYk=" + }, + "io/micronaut#micronaut-core-bom/4.9.11": { + "module": "sha256-7ujJfWwUEGwNnAzuy8vw+u1I9QRR3YIMNWpsLO+2YCA=", + "pom": "sha256-IOmElkusQUFOPwDDDNAm95ze2K9JmamnZiTrm3K6srE=" + }, + "io/micronaut#micronaut-core-bom/4.9.7": { + "module": "sha256-DJzJ8I/CAZ0TRU2dEIFAP882PCJ0qMaazT7rE5Pm3mE=", + "pom": "sha256-oslQCkGxwHBIrlaXy7Bs4nM4Yv3gasDQ8qXw8i/HMHI=" + }, + "io/micronaut#micronaut-core/4.9.1": { + "module": "sha256-Xe0arTP4Ta0NyBZmdCwc1HdOPYV0azZN7hrxaiIC2Uw=", + "pom": "sha256-dDvmBGSqMNaw8OGFudQDf5Yxqr5GYNCcaG2tJD6D4a8=" + }, + "io/micronaut#micronaut-core/4.9.11": { + "jar": "sha256-rm3ReiDBhETQknmJpVaU7q0lDjwt92hGb3Drnse7pFA=", + "module": "sha256-ovFE165r0Im8Hk5g3jxMLh2mbcy3RfOMR+QqalX1vpM=", + "pom": "sha256-z+umEJGwgN97cqFRmmlMW10yapl9rskaoX1iy8VIsDs=" + }, + "io/micronaut#micronaut-core/4.9.7": { + "jar": "sha256-hKIDQBXBA2CMwRkc1gjWUOA/WnS7NHQE9deWzJsHcn4=", + "module": "sha256-Y/qZaZIphV2FDoQxx14I0dhfrD0Vq/kqBwVXqKjErZE=", + "pom": "sha256-2nsUgiEqOJrS1hbgL+nsW7FAsxDkS36VcOlC/ZH2r3M=" + }, + "io/micronaut#micronaut-inject/4.9.11": { + "jar": "sha256-fYYUTxD13ieVGD7uVPj9GHYLATBDI4ZO5FHxdwK6kSo=", + "module": "sha256-fPjBQkjp6dDkz3d1zmBASxD9g45ClHOeGbbA1Bc92eQ=", + "pom": "sha256-n5IUtQgvNaBD0gmOcnjdEOJhf1DIEQI3q2UsTjzzK+E=" + }, + "io/micronaut#micronaut-inject/4.9.7": { + "jar": "sha256-yTIrAlJR+OKpuKeKNjDyxF01sAPZi15a2rh/aNsX68w=", + "module": "sha256-NHGf0PZLEMe7rac3m0MCScfDxDQJQZWV64VVq76+Ah8=", + "pom": "sha256-l1NZDaaytA3Fbq0dRW0VcOyxqrnJeTpoAHYe9NRrs4M=" + }, + "io/micronaut/acme#micronaut-acme-bom/5.5.0": { + "module": "sha256-/2tgK60onFdJh+tj4MOOL0PMGn7FFPLY9s+sh3ZHYy8=", + "pom": "sha256-sW4EzQ7cb4BTeecX4BZG/hmkeU45oxfUsgr5S5XmYEA=" + }, + "io/micronaut/aot#micronaut-aot-bom/2.8.1": { + "module": "sha256-sFRRe5zw7d0O0KDbkQPN/YAvg0XBQtoiL8HPoc4nn14=", + "pom": "sha256-KQMfr4JXG5B05cUhd6nmNPxRZr1PWVDrVo0+w41ywP4=" + }, + "io/micronaut/aws#micronaut-aws-bom/4.11.0": { + "module": "sha256-WroZN3Veow5SBLsIYCV5O/Mb3mb/7zgsQY2K9wvtIQ4=", + "pom": "sha256-BEmN8whtc97I2MFBohMxGhxQrDg+s+Kth+b7eO5kyyo=" + }, + "io/micronaut/azure#micronaut-azure-bom/5.11.0": { + "module": "sha256-A+uhqaaA5sDkdCmjSCWPYnQaI6mA3xsm+ZpISfuqF8Q=", + "pom": "sha256-v7VLb+UX4+UHLIfHNmiEaM0DhmLPQnS8AprmmaXtxO8=" + }, + "io/micronaut/beanvalidation#micronaut-hibernate-validator-bom/4.8.0": { + "module": "sha256-XSbjUhNuryOyrrHHFArMYuVpVd82K+Tj23d2VcQPN70=", + "pom": "sha256-3BZkk5Aztab1Qd0CKevsL5MfkNBc0Whyo2B6rTN/Gsc=" + }, + "io/micronaut/cache#micronaut-cache-bom/5.3.0": { + "module": "sha256-fWgCfqRfXRg8Zv8BnGGxkxqra/2CBh3g7EEW3wIYJuM=", + "pom": "sha256-Vv9QnXLlM/wmXrVCk2Yr0Xi8hw02o0SrdI06gegS0Lg=" + }, + "io/micronaut/cassandra#micronaut-cassandra-bom/6.7.0": { + "module": "sha256-yYtEkEuQ5bdxNQXVUNDJ+/yuHk/YemazM4YnGFqlc8I=", + "pom": "sha256-M3htmjFR2KBgMFDLp4ptDL8/kIRXHWs09d7ujk9ppzI=" + }, + "io/micronaut/chatbots#micronaut-chatbots-bom/1.5.0": { + "module": "sha256-3MD/Qsr5scrlIMbhhS36msrQkkv7oThWB8HU/4HqD4E=", + "pom": "sha256-SZAXyLZbrr7fpWjGLaIGg95xx0HuSFdaOZrJSX0wyjo=" + }, + "io/micronaut/coherence#micronaut-coherence-bom/5.0.6": { + "module": "sha256-g07UXOmCExTeMsQzuRV9CrPYYSbhW/8rSIS0FWKcgs0=", + "pom": "sha256-vCOc4HqAA/2nX7rFSU/psQENgARcwVyeiabJYRGhuwk=" + }, + "io/micronaut/controlpanel#micronaut-control-panel-bom/1.8.0": { + "module": "sha256-9W2wTZ8w9/ebwcDB3q5KzbsYwBGyi1nOqQnqx+U82jk=", + "pom": "sha256-LqQt+In0yctG145vNI37LPLgJ2u1eCM/r02dWQPTMKs=" + }, + "io/micronaut/crac#micronaut-crac-bom/2.7.0": { + "module": "sha256-B/t1apVEvHOKpxU62HY+pLEq0QoKeQRViYng6MUnMXs=", + "pom": "sha256-GtSgbujiH0xNzeF/0YEOg7XuSAYr4KhvqoKYJA6vkgw=" + }, + "io/micronaut/data#micronaut-data-bom/4.13.2": { + "module": "sha256-LKsUIXKUd3a+O+UG2cI5C+Qm3+zZnneioaringDW/cw=", + "pom": "sha256-FVRqVOoCA1Ftto4RU6U+B4vu57rgFXWxOq06uc/PxUE=" + }, + "io/micronaut/discovery#micronaut-discovery-client-bom/4.7.1": { + "module": "sha256-8ThwCAzKkfHhgb+9MKC5DeaSRFnP5jXCKRKBjHbR6GE=", + "pom": "sha256-1lf+YSnbwOtvooiN9h7+aj5tH6ZtarVlD4biCtjvtUs=" + }, + "io/micronaut/eclipsestore#micronaut-eclipsestore-bom/1.10.0": { + "module": "sha256-3nXF9KwYJ5lqbsnKXDKE5A8mnVgZHAFuytd3x/2DuBI=", + "pom": "sha256-aETVxsRkdz2bvmHkt87Cn+86pVwGC3MYdxjpfCOM1TA=" + }, + "io/micronaut/elasticsearch#micronaut-elasticsearch-bom/5.9.0": { + "module": "sha256-lz4RYRaBEq6zJVJS5CrvAqAH7PDKHlWH8nLjUW2pCUQ=", + "pom": "sha256-48YX09XoxmTaqFGjj7zwCLEGc+3d2QAY6DHP456R0F0=" + }, + "io/micronaut/email#micronaut-email-bom/2.9.0": { + "module": "sha256-95gmlTqj31CeBW2YG1A+M9eetVvDoBnlImZfY/52MIc=", + "pom": "sha256-3v0XSDfquc+Avh+Uj+R9WYb9HTF3GjmngolslEvN09U=" + }, + "io/micronaut/flyway#micronaut-flyway-bom/7.8.0": { + "module": "sha256-nYewMpdYaBcGdxyinVMlH8V9x/Ln2LlQcckeskeOkg4=", + "pom": "sha256-4iEO57izlk/avWd6Y0QqGdnVsPzk2a79wKKGAkYaAbI=" + }, + "io/micronaut/gcp#micronaut-gcp-bom/5.12.0": { + "module": "sha256-KXIVrTsooK8fwqqKaMrzT1fA4jsOblnbuaW8pSrnyQU=", + "pom": "sha256-rwZ+cFKzFn4/OcUpyiHe6hONdE5ow/3PaR6iirp8mvQ=" + }, + "io/micronaut/graal-languages#micronaut-graal-languages-bom/1.2.0": { + "module": "sha256-GtBvznpSxhiq7YEdVg2rm+hTLTffe3864rOSXTccXHM=", + "pom": "sha256-Oaf0h2rujXHz25UsXTlqEMiVjIy3NsCaBzVE/H1KgpI=" + }, + "io/micronaut/graphql#micronaut-graphql-bom/4.8.0": { + "module": "sha256-1qJuKjf+hFUd/cG2djC567Q21z7rrC2ZhOYd2gn0LZ0=", + "pom": "sha256-+GwTxVP8WVw5zGQc50KLvjAnQwGtSg/xg9TrYDO4ofQ=" + }, + "io/micronaut/groovy#micronaut-groovy-bom/4.7.0": { + "module": "sha256-L/JA+mk2dNBlRArHOgB7r+dosSg797CSwRlc77bmyD0=", + "pom": "sha256-OoexS67YHhpVR9WeYx2pX00/CtD9FM2yfSl7OZpiTGc=" + }, + "io/micronaut/grpc#micronaut-grpc-bom/4.11.0": { + "module": "sha256-6nj3GEd5ZHDmToz/s+XNpzW4ykMnbL8E8qdiW0Pi5yw=", + "pom": "sha256-SVMLTBHdw+usSuGtkEmPEvvUI78bKBFGodniqYiC30Y=" + }, + "io/micronaut/guice#micronaut-guice-bom/1.2.0": { + "module": "sha256-qgdjYk3yZgI3Gvb9Svi/ZLNrriPKBwqJCvvfNJw5n2U=", + "pom": "sha256-3upYlVSAgzKKSFqAZhwUG3m8zGh6IZIMAKNVQV+MPnE=" + }, + "io/micronaut/guides#micronaut-guides-bom/0.1.0": { + "module": "sha256-ufgY0nIqWFyG7qK0uBTZJWru9m9Of5r96777l1FhQ+0=", + "pom": "sha256-JMByVaCNCknagX2pv/2eUCkn4VSEjZbU42HQ7zfi13A=" + }, + "io/micronaut/jaxrs#micronaut-jaxrs-bom/4.9.1": { + "module": "sha256-KgB0+C0dEPhRF52xJmw841QIfx/n5Tt0ElKlK5yuBZU=", + "pom": "sha256-Nte9lagQ5vdsTsDfqfipqPhiAI+8+CKxu5lCbk0ErMQ=" + }, + "io/micronaut/jms#micronaut-jms-bom/4.3.0": { + "module": "sha256-P3u51tNIYal505S1vvTAe0exAT5UqmXG+ze+L/SCAGo=", + "pom": "sha256-D8btcyFN8BQhOnYiQlZrdI+djLYEJ8luuUy2KhKHKmc=" + }, + "io/micronaut/jmx#micronaut-jmx-bom/4.7.0": { + "module": "sha256-/ZgTV0qXVoNvUEIZ3ZKIrnudM+c1PeXt7Yw4PgaIIxM=", + "pom": "sha256-18g79bRxNePLMjW1wYgWGEXBksroUBgVkN2tXN2Lino=" + }, + "io/micronaut/jsonschema#micronaut-json-schema-bom/1.6.0": { + "module": "sha256-Znna+VPIh5/+Ux8avvH5uO9UZhOs000BAF7bsYqW2kQ=", + "pom": "sha256-QBn/oHDb5gQD9nnkCQenZydtWbEb21ViYhgPAQLbxso=" + }, + "io/micronaut/kafka#micronaut-kafka-bom/5.9.0": { + "module": "sha256-+NNTqkM2ulmrZLH3OEM9i9uiaSFnCoAANXx0TzC3qdo=", + "pom": "sha256-rre+nj1cgOb3e+prV7bia8ygCCt1/5QkiQJSF62DQLQ=" + }, + "io/micronaut/kotlin#micronaut-kotlin-bom/4.7.0": { + "module": "sha256-QT0PaN7mJfx1a4FPNOFogT0Mdbo+k2mW+E9Eq1Eqm0U=", + "pom": "sha256-RDvqA+znY4ervZ0be8kghQwHDSoSMa26fwqMzaGBJpw=" + }, + "io/micronaut/kubernetes#micronaut-kubernetes-bom/7.1.0": { + "module": "sha256-qhbSIu0Xy19J+kmbfUM0PMu/XmYqyTR3cJkFPW+Q6TU=", + "pom": "sha256-3ge9jVN7j3neUkteZA2ADjP79riNvPyxWoVwHOjw6AM=" + }, + "io/micronaut/langchain4j#micronaut-langchain4j-bom/1.0.0": { + "module": "sha256-gAceGZk4KTgBMjmKQ1YvLljuRH3Yi5ljSpkZSdqkn/E=", + "pom": "sha256-Mph93T7SgWOLHODVi5kOGHWI8bLiMlx9c+39ZeJKG/I=" + }, + "io/micronaut/liquibase#micronaut-liquibase-bom/6.8.0": { + "module": "sha256-zo1p+TqtYN2GudTFXcp/nV+V+dcrnkN05DqUhkeoIZI=", + "pom": "sha256-Gx8UtqjK8mkveLGKW5zxuMi1sINx65iEAFnJKmefdwI=" + }, + "io/micronaut/logging#micronaut-logging-bom/1.7.0": { + "module": "sha256-fvCEwbvKO9x90sgb2T3UW4aRntfXWFjEgB/lipOB4ew=", + "pom": "sha256-Mi4Sn52JPZ9ZAXOlF6zfNF9z/U+50/nJ0TQ3KkqBYUA=" + }, + "io/micronaut/micrometer#micronaut-micrometer-bom/5.12.0": { + "module": "sha256-iwHxSQD/PKdeLyPvFl57qojPeAlw5SIJAMx4O3zeP34=", + "pom": "sha256-Zq0B7Tnannnn7Qi5kRt2o1XC4aMeUCMdkS6B66ChFuw=" + }, + "io/micronaut/microstream#micronaut-microstream-bom/2.9.0": { + "module": "sha256-AucOVuUeN6sZgi+3QRrcHnNNxC71VfIGv2sxdWqHSt4=", + "pom": "sha256-N/hAqhEy5zG+28xxHHBW9HtPT6WgpBOMXrpvPFt8xMw=" + }, + "io/micronaut/mongodb#micronaut-mongo-bom/5.7.0": { + "module": "sha256-WWgxpPC44Q/09tYfLV4u3rKt4uqBccvEy00yREdzN2k=", + "pom": "sha256-zztimh8dIEVNtjd03CPVrUptNlSZdXfq1RgsGFOY5VI=" + }, + "io/micronaut/mqtt#micronaut-mqtt-bom/3.7.0": { + "module": "sha256-c28mUcknTkuUv83MTU4Nx0TuFV3ERd2tipI5tf2Dun4=", + "pom": "sha256-wHX4ZZTzO9sBAVkpZz4WzqbBVQu4elsZ2wJdj7jz1Hg=" + }, + "io/micronaut/multitenancy#micronaut-multitenancy-bom/5.7.0": { + "module": "sha256-S6Hf4nIbtrmMi5wcXP9MytwiiPThwHawigSt6wjPMpo=", + "pom": "sha256-q1VNi8NVLRaLF3QaMTdQecURExba1ueFiegNKyKKI5I=" + }, + "io/micronaut/nats#micronaut-nats-bom/4.8.0": { + "module": "sha256-+MR84wggmPrNid8J9sOUsVM14+ZomE2NUNm/hszAfVc=", + "pom": "sha256-3woGLMTtYOM02pmIVXMMP4Gq1RwsETPFw9sTkag9zak=" + }, + "io/micronaut/neo4j#micronaut-neo4j-bom/6.10.0": { + "module": "sha256-ZxYQVk1Qc/D3mer4UnX68bz2hcNUMHkjnkUsf3Dcfg8=", + "pom": "sha256-FzICmDjs2e0NKj0/IdQOApCeyzRf3MvSfJEs+PQNNS4=" + }, + "io/micronaut/objectstorage#micronaut-object-storage-bom/2.9.0": { + "module": "sha256-upK1X0XT9LHj5yfg2gdiF773C/rwvpgZiOphC5KyITw=", + "pom": "sha256-xul5scrADSe64QksGt7A+S8q74IzJH3wq3grq+wVHPM=" + }, + "io/micronaut/openapi#micronaut-openapi-bom/6.17.3": { + "module": "sha256-GOJpQqc6edJ+p30EsOcoAfLiJwoBXh+dVattD8NlhY0=", + "pom": "sha256-hQf8WDnYH8AaCC+5fB5ph2DFk41K6h+0W7aw60bEUqg=" + }, + "io/micronaut/opensearch#micronaut-opensearch-bom/1.6.0": { + "module": "sha256-wY8XmOcq4Bh15SgRrI+fK/V6mW9gmS9ahPpLS2iGEWU=", + "pom": "sha256-iTu0I9zxnrwzfbMsoRno0sDpt4upNEvbXgH/bku54PI=" + }, + "io/micronaut/oraclecloud#micronaut-oraclecloud-bom/5.2.0": { + "module": "sha256-d91MNKxHG+qRRor+m06jQRwQW00pB3C//z5WWBl2/qw=", + "pom": "sha256-irT3I1CLjH/iSkcFXdBidSFwaYgvgskN8mOwm5e+H6Y=" + }, + "io/micronaut/picocli#micronaut-picocli-bom/5.8.0": { + "module": "sha256-ZoFtxsHddlZH+m26CsLazmZBOC/yYVQtc7pZa7nR61g=", + "pom": "sha256-DJlHD3h/B4IYVEOU4Zp32xYnWCZhP29iUooX4TX83p0=" + }, + "io/micronaut/platform#micronaut-platform/4.9.1": { + "module": "sha256-bOnmoEMlEE6aAKOhEfvZMdXeKZNzkwOz13kxo0UWxdA=", + "pom": "sha256-kY/0HpcIbknRR/jOtXuHBk2bKvN+uYzcebq3uuNw8Bs=" + }, + "io/micronaut/problem#micronaut-problem-json-bom/3.8.0": { + "module": "sha256-jbX2sb7eLcDfVmd7f1rQk0nTeVSTou16OpwJweWJZmQ=", + "pom": "sha256-l/nvUN8Be7x4gZerdO+s9fLcPfrpp0b+58Yn+u61fR0=" + }, + "io/micronaut/pulsar#micronaut-pulsar-bom/2.6.0": { + "module": "sha256-+vVYQRzQMd3ATJfci39fLfsRDgskt0oH1WWI+KZtd70=", + "pom": "sha256-rLE7L/VaNXRZMZweALNx3wnN+6fDyHEeT0lxL1kEiwE=" + }, + "io/micronaut/r2dbc#micronaut-r2dbc-bom/6.1.0": { + "module": "sha256-BzIC0YsU4VUTgWaKDTgwWvQnQeb2CEf+OThcvvha84I=", + "pom": "sha256-yr9l9AnqUDYgyXneknAs5mU6KW4ZMwupr1qH13JzHkA=" + }, + "io/micronaut/rabbitmq#micronaut-rabbitmq-bom/4.8.0": { + "module": "sha256-6hKLe8DeSHuwJPRknJ402ZAQt7X9ECsLsV4RUdYvWFg=", + "pom": "sha256-aLN+rGjns7bPLJAsHX13Z6+8f6HhHrbyUz8jN8UUFCI=" + }, + "io/micronaut/reactor#micronaut-reactor-bom/3.8.0": { + "module": "sha256-4FfmWUOxb91H1BPIZnjFOqYGGr5u3Zfbjl3hfNqgDZY=", + "pom": "sha256-R92n2W5gzJq+bxrE5AWcykS519twug7CMZJYhqWCb3w=" + }, + "io/micronaut/redis#micronaut-redis-bom/6.8.0": { + "module": "sha256-Kg/6/sIdD58+JrlxvhE2q1v1KcKeor5WyyE+7ap0zUY=", + "pom": "sha256-32Nt/R9syvxRtvlwp++pwe/O7pljMqlozTqsMMEoe1M=" + }, + "io/micronaut/rss#micronaut-rss-bom/4.7.0": { + "module": "sha256-c3HxzWM1UE62INL/lU2ZV0HnWF2x0XNuiGcUqT4OTZQ=", + "pom": "sha256-jLHxaj+vXHyFLLxepst2ORO5EzBBnplwN8dsZXdzlBc=" + }, + "io/micronaut/rxjava2#micronaut-rxjava2-bom/2.8.0": { + "module": "sha256-qiMaTzwfxXnG1WtilnCm3SDLBuGFbEMBmjNpkVYWQ+c=", + "pom": "sha256-NkN0tHydp+Y+XD0Sq9QIm76mNaBcz+otbRm+RgdLw+4=" + }, + "io/micronaut/rxjava3#micronaut-rxjava3-bom/3.8.0": { + "module": "sha256-7s7JFx664FwouSObV3yUJje3eRts32XnQERctik3hTo=", + "pom": "sha256-dqeWNX1C6s4VcsLJgEoXVQkz38na/bxbG6PW5PMekCQ=" + }, + "io/micronaut/security#micronaut-security-bom/4.13.0": { + "module": "sha256-015UcjZZayj7+EoZ0E+Vm3sLC75D/VBrxHSKWzvyy3o=", + "pom": "sha256-I0icIO/H1oENvcsh/nLA8T9N56frGYJojPuJ7SB5tx8=" + }, + "io/micronaut/serde#micronaut-serde-api/2.16.2": { + "jar": "sha256-MRWwZe1UyXfMlDvSmLMFstETsZngSBcx3QU8tNaTtWg=", + "module": "sha256-BGlcqeyCbh383Jj+yL6+zdGH8MZrfA9Jn1G789pyYJk=", + "pom": "sha256-Z31BeaKSEdYYyWftA0mox/Gqlkd/QF25awoJCb6Bpu4=" + }, + "io/micronaut/serde#micronaut-serde-bom/2.15.0": { + "module": "sha256-Wfwf9QM945oKqyFLGvfdRyweJZvslwMHplCM5p1ul8s=", + "pom": "sha256-B/6XphYDttL3TdLbjrDsW+NhtmguqQfytPOWdxMwOus=" + }, + "io/micronaut/servlet#micronaut-servlet-bom/5.4.0": { + "module": "sha256-EUuGS6wu9K70ij+ydQqZnGdtEm5V97EyjiJFfv1WE64=", + "pom": "sha256-PsUBA0WlOOL2xdMJ7TJHe6DHJXRMd/+TP8Y3gVat1V8=" + }, + "io/micronaut/session#micronaut-session-bom/4.7.0": { + "module": "sha256-XXVC/+czKAbv2IAxxElmtcVeoJLPdAHpLR6ctWUUsf0=", + "pom": "sha256-uLsn9n1A08JFq1J0NrB6CuLiWF12swIlg5TBL3PEMZ4=" + }, + "io/micronaut/sourcegen#micronaut-sourcegen-bom/1.8.2": { + "module": "sha256-PTG+9XtGk7gjhRsugP3ep9pfkzOEqHYamKZ4ip1Yodc=", + "pom": "sha256-M9QNt5RF+xN9+htS9qwAp70tLRTMvHuqVBLrMf6mGps=" + }, + "io/micronaut/spring#micronaut-spring-bom/5.11.0": { + "module": "sha256-/1UvBnFn7+S7TtBLONV/yEdINfhp7/uu5xe2x9bBBWs=", + "pom": "sha256-HzQN5Z4m6YgNKeFrQM2Vd39sapf1dokJtJ+blQO1Oz4=" + }, + "io/micronaut/sql#micronaut-sql-bom/6.2.1": { + "module": "sha256-vYZc2OhtQK5Buy7r9yTVSuyjS+HG7bDA/sBoGVEGi+c=", + "pom": "sha256-bsIX4AtEALUiwPfQDpJHWoDk4WgrjttRjWdGW1lncnw=" + }, + "io/micronaut/test#micronaut-test-bom/4.8.1": { + "module": "sha256-LLhuBqoO7eKKPnm5BU/JJ0ZhOo4ADFAP2tsiY/Y7/bg=", + "pom": "sha256-UNCLYZJuB4LW+JSHwpI7iAN2i69ZdVNIX4NWWZsW8wA=" + }, + "io/micronaut/testresources#micronaut-test-resources-bom/2.9.0": { + "module": "sha256-WSFDcZUiVeC0Yod5LdlBZWfOvUrnbZrLLEp6eOOYJbs=", + "pom": "sha256-65uSbt63/ZeDId9B1gZfZKb1c1hbQSJLxzA5ehhur1k=" + }, + "io/micronaut/toml#micronaut-toml-bom/2.7.0": { + "module": "sha256-nkxR4Q8XJwYwBwlWJbjfPHfPqrE8HhxebeE/AlGtp0Q=", + "pom": "sha256-4+Ffq5BAd8bQxzta1xAbtW5O6j+LHg5JeDglGiAlcis=" + }, + "io/micronaut/tracing#micronaut-tracing-bom/7.1.2": { + "module": "sha256-EHLdMbjl307vW2H/KkaHHiRPjOw0oEjxU0XuEt92f70=", + "pom": "sha256-1uAfVwvz6otT/xy8N87/lIUiEohBUJ75gPIH8tMv7/I=" + }, + "io/micronaut/validation#micronaut-validation-bom/4.10.0": { + "module": "sha256-DJF8ryiffuRbLLWGjHoCSdsYtUQuh7+oFeHv2Y1kxs8=", + "pom": "sha256-iDfzZa3zDXXy+xpfgQlP00uViiUrUOJBl8vS/p2P1Yg=" + }, + "io/micronaut/views#micronaut-views-bom/5.8.0": { + "module": "sha256-pBcFb+BjW/VBKHrXZCm76cAFYafrZugmK9RkIS7iwU4=", + "pom": "sha256-5WBjfj8IEW7pIG3Qpf9zY+yfd7Y0Xmkzm3Nhs1oAJrk=" + }, + "io/micronaut/xml#micronaut-jackson-xml-bom/4.7.0": { + "module": "sha256-F40S1+lUK9whwph7dFsrG8oLjczH0pCZj5FsC6nZARE=", + "pom": "sha256-6lSRTkphZk1NL95TtiYMF35V/4zS2gb4o+OJjzL8Xuo=" + }, + "io/netty#netty-bom/4.2.2.Final": { + "pom": "sha256-Lu86Ht/SGuvTZ9lgvSNBhx7on3Bsksoa37lmT1QFJzs=" + }, + "io/netty#netty-bom/4.2.5.Final": { + "pom": "sha256-REwntKr6HKFh1jlklLmDHOijXygLGk6Ta4kFy1Ck9ko=" + }, + "io/netty#netty-buffer/4.1.135.Final": { + "jar": "sha256-KhlPmfyT0HxNRC0ErHG9LcVtMYjNDkJwzcKpU9GVa/k=", + "pom": "sha256-Po4IRLteQzMLL/EoMkLHHNMIDU+nW8cnWPYK6bBKiyA=" + }, + "io/netty#netty-codec-dns/4.1.135.Final": { + "jar": "sha256-XpltesdZfzaKsRT7uR0WeIkYx+W/FmNFxR5W21TVD9E=", + "pom": "sha256-1eqQayecwttORBHlQS3ziBeJCnImOQSvK0ienaH+VAw=" + }, + "io/netty#netty-codec-http/4.1.135.Final": { + "jar": "sha256-QBhSnT1q7PQES5jHXZqQyRg53fSceqSExayByQoV2gI=", + "pom": "sha256-hOlZqAfGtFbRqWumsKvLWnU+YurAaz7HBRyVlJzvXlo=" + }, + "io/netty#netty-codec-http2/4.1.135.Final": { + "jar": "sha256-qk6Bq1+jt7JD6z6BSqWCqybAc9MbCr/9u1juFQ+knBY=", + "pom": "sha256-4sxOas+0UcZDuiccGI4efeWOS5y8hfxVc0cCVXY2T6c=" + }, + "io/netty#netty-codec-socks/4.1.135.Final": { + "jar": "sha256-7Ho56NfX4iMBQRWgISc/ARw8sej7GHy/uQp0521owlw=", + "pom": "sha256-sMQVsEzcrx3WpHh1+9rVzw/IOwWvCPKxB7FjGqFFhZ0=" + }, + "io/netty#netty-codec/4.1.135.Final": { + "jar": "sha256-clIXEmTbtbuO0453+JZDsx48q8lhROwntogkNdcYph4=", + "pom": "sha256-x/uq9/1cQl4MqmAq3EoVS3GJUGKCXWnXl2a75Rp8o70=" + }, + "io/netty#netty-common/4.1.135.Final": { + "jar": "sha256-JndcqVggcRQDzwZfouwBNKCgT/VBfGiMAjeu5otVg40=", + "pom": "sha256-APj/eo9ZfTQW2BCvLvDOuJvSplN4B4oKFsvZwsYfO+Q=" + }, + "io/netty#netty-handler-proxy/4.1.135.Final": { + "jar": "sha256-dWYQEGMKREaPDoXX7Yvnd5wMsTaf6F0weZztxS6e07c=", + "pom": "sha256-M+J5g74rs1p99adBH2G6vdsCscNQr4gSxiIwM/ooD8k=" + }, + "io/netty#netty-handler/4.1.135.Final": { + "jar": "sha256-JF504EtvTo75iFMVJBLjvxSZzm/PFTKbeYyM42w1N+I=", + "pom": "sha256-t0zG6uHhsCQbYtH8WYxYO75QWDrLsEISqana7sAknnI=" + }, + "io/netty#netty-parent/4.1.135.Final": { + "pom": "sha256-V/uiz0XXFR8AGcEtqX5BRRWpso+vpawzKuQp3GwJAD4=" + }, + "io/netty#netty-resolver-dns-classes-macos/4.1.135.Final": { + "jar": "sha256-SqtJpQfbvkRq0sanWH/mnFEd76bCc84aVZ40WKM3ils=", + "pom": "sha256-0esFvOSx0N/8ckZ3AXkeGXP1P4J3H6vuHabZXPRlXkM=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.135.Final": { + "pom": "sha256-qGdhGNiZV00kPeHzT+yVEt0JmvTLKsat7ikWEi6b/wc=" + }, + "io/netty#netty-resolver-dns-native-macos/4.1.135.Final/osx-x86_64": { + "jar": "sha256-DIb6JzF8QXL/8DoMIChuLGLvnWCtePOJqD7eSKW7VM0=" + }, + "io/netty#netty-resolver-dns/4.1.135.Final": { + "jar": "sha256-yiVYHkzr1VeX7ztNCVO3XfMsGvd/53G5a/qp5wHNt8M=", + "pom": "sha256-jHMY8ZHal4t94Ew9NcnPCbwyy6M9mzUB1zKX4BmRCMI=" + }, + "io/netty#netty-resolver/4.1.135.Final": { + "jar": "sha256-d90DhllltsErnlIb3eyC8DXK6zMVbgnBWCicUJQxhIE=", + "pom": "sha256-RMZCOXM1fpFJek9r2jdSQgaKQDud74N6waCT+GbhXPc=" + }, + "io/netty#netty-tcnative-boringssl-static/2.0.78.Final": { + "jar": "sha256-DiHt4y3nNjr/wq4bxBLtYShTlXxwgdh8pTICgds/ML8=", + "pom": "sha256-JChcO639IBPMDV4LBzbfosc4uHwuqSJeeijDB69x3sU=" + }, + "io/netty#netty-tcnative-classes/2.0.78.Final": { + "jar": "sha256-PKZtjGwPADJC+VTMGCKjJEUQmsJbhYKEC6PY48kvCj4=", + "pom": "sha256-BwzvHgp6NJbcwd6Mf8ABtTWt20rBMyFNB6EwT0twL5A=" + }, + "io/netty#netty-tcnative-parent/2.0.78.Final": { + "pom": "sha256-Qij4fHnqP0q2f2iQtuhXNL7DwAlxDZvn66uZpkSFkcQ=" + }, + "io/netty#netty-transport-classes-epoll/4.1.135.Final": { + "jar": "sha256-nZU3q54VFkyfDcB0iITBSIFKGNeKxt+mXPSz0GBozgE=", + "pom": "sha256-+qQk8SHmoJqjbDtYBfpl/h33nW1L6Zvxt8pDLbCUJa0=" + }, + "io/netty#netty-transport-classes-kqueue/4.1.135.Final": { + "jar": "sha256-sfLDnZv3r07NHrQLa7ksV0FGBiOqvzUd4Wa+7L0Ggn0=", + "pom": "sha256-KUZg1qX9dKFo+TAhn7eZOkBm08K0V3ZyGH/pS5MAG6o=" + }, + "io/netty#netty-transport-native-epoll/4.1.135.Final": { + "pom": "sha256-V3BbVkiiykTCTf8Z7UgkJlVV8Tfn+4+2q4lbNI7LGb8=" + }, + "io/netty#netty-transport-native-epoll/4.1.135.Final/linux-x86_64": { + "jar": "sha256-GKQAY9ozZM//+BxsIJf7bry0XGImTavM5Fqt5P2sMSU=" + }, + "io/netty#netty-transport-native-kqueue/4.1.135.Final": { + "pom": "sha256-u+AVZTiA3AOIHb4/PXMelhfqn4Ac5UIz7xNTFwYYxTM=" + }, + "io/netty#netty-transport-native-kqueue/4.1.135.Final/osx-x86_64": { + "jar": "sha256-QS4Q2u9apGR5hDl/pnKKz4jf/Q1MU62R9IbqZJL48I8=" + }, + "io/netty#netty-transport-native-unix-common/4.1.135.Final": { + "jar": "sha256-p4lQdfESYR0WQKWWwmeKKKq5LVaBwcFHVbEJuJmPmV4=", + "pom": "sha256-b6Ovt4OL+/mLfSCErih4Zc2HDez2eSnVjHk1fROwbQ4=" + }, + "io/netty#netty-transport/4.1.135.Final": { + "jar": "sha256-a95zTR7AcxQu7TGx5ozV1o+/JB4GCzfwehZOXssVYxw=", + "pom": "sha256-uXVK9JgypuamxkfcTZwOjHeVSg1c3zoVHuEjM/ikkHE=" + }, + "io/opencensus#opencensus-api/0.31.1": { + "jar": "sha256-8UdNR/S2sAFVitJ7lS417aXMcUZ4iHf8UpOMbroks4I=", + "pom": "sha256-VW9CfhIJDvs2pgh/dBCr/kXeEBByktlvpj5BdRdOy3Y=" + }, + "io/opencensus#opencensus-contrib-http-util/0.31.1": { + "jar": "sha256-PqmVtVpAaL4imJtwzCmk14jC0yjR1QYTp6mv0T/dLQo=", + "pom": "sha256-6+IsQiIX1mLHzumUdvC1LIBXftRFeGrCmSUb76pMB1s=" + }, + "io/opentelemetry#opentelemetry-api/1.46.0": { + "module": "sha256-9kmUA4aunj400lx4GJzVlpFD1oH/0zw6bpS+YPuPdWA=", + "pom": "sha256-92JLm6s6uZvnazkHWPhnRD4PIuyMrOcEPQwnMBn6e6A=" + }, + "io/opentelemetry#opentelemetry-api/1.47.0": { + "jar": "sha256-ZWbx8RM9YR/06Lj9uOsYV3uXBCViAxU2Pum+Q4Q7FL8=", + "module": "sha256-zCE6CaI+2/bRdOu7k/tl0oCeD8o/m2o0Vbi7a9xE/jQ=", + "pom": "sha256-X2xsLNziNhUfBA1Kmp+OwQW5GV0PFrWu2FVy8wDqyR0=" + }, + "io/opentelemetry#opentelemetry-bom-alpha/1.50.0-alpha": { + "module": "sha256-motyKjX+LhSR/JEgCdMdXZ0XyRe/gYq2eumOKXyfxmg=", + "pom": "sha256-gkb0AxHagYEEX+g3T0Vxm693rCteW2iYa6ljEQi2WIQ=" + }, + "io/opentelemetry#opentelemetry-bom-alpha/1.51.0-alpha": { + "module": "sha256-YjNcP77+MKsLVKmWR0x3CymBt/axy1GivQyeW6REezY=", + "pom": "sha256-ltej3XCTt1hYL4XEE+1wmwmQJw98CkKQGsM6aZHNraw=" + }, + "io/opentelemetry#opentelemetry-bom/1.42.1": { + "module": "sha256-x6CaAIZ6RYQfynw4gKTMrZcQtCmpnQEANPmwx6Ah0TY=", + "pom": "sha256-6VMG+3qolqopLeRxMVOcFsH5Hfy5kAHaBsQBJRy+aQU=" + }, + "io/opentelemetry#opentelemetry-bom/1.47.0": { + "module": "sha256-QdK1ilQMmkQ1iAmy1jZIDtR8Alovp77NenjEy3TklL4=", + "pom": "sha256-VcVgSi3oNT9k7MTF1CyPvxARFc+s00QWABnKY468ilc=" + }, + "io/opentelemetry#opentelemetry-bom/1.49.0": { + "module": "sha256-7YtwXA8nXz623UslqH6t+Wa7cEWeDbC6bVTU2Odqr5E=", + "pom": "sha256-RPy6c5ErlQ0+yIEp444DwYG5dfW17nPXureGaks3bFA=" + }, + "io/opentelemetry#opentelemetry-bom/1.50.0": { + "module": "sha256-X81epaY2CatVv2JSmXVRpxed13JsKI5WgFLb4MZiy5A=", + "pom": "sha256-TIVFAMtOZbbuHdYb1OKsBkaPsYvoifvx3qVqXP/UNBM=" + }, + "io/opentelemetry#opentelemetry-bom/1.51.0": { + "module": "sha256-G2yc8yJUdi30ahrpVXZDYESr0FCpsBVyxCJcjsMiASM=", + "pom": "sha256-+m3pwICuLmOLLl8/l4Xj20QlSlfwKbDKlQ6TmZWY+DA=" + }, + "io/opentelemetry#opentelemetry-context/1.46.0": { + "module": "sha256-dmoi3QWuCzyCFECUXXQ5ymNepgmEUQSOGb4v2qjiudQ=", + "pom": "sha256-Yz5f0RtNHGL6rPmwkSnWZR6xc7tte7cLGpd/BbMHbqM=" + }, + "io/opentelemetry#opentelemetry-context/1.47.0": { + "jar": "sha256-FbT8QjTm3KbVSADVcmlOy9B7pSwV/FsiG02lUXzo2Q0=", + "module": "sha256-M4aB6NwaH2T/tvcHjEa2+WD+lGN5ni3r6+fVjAb8XbM=", + "pom": "sha256-WUMqp3bD8etmBrhU53g1+iPlJBUPfg36PGUQ61ekQsM=" + }, + "io/opentelemetry#opentelemetry-sdk-common/1.47.0": { + "jar": "sha256-fOVWZqyn8uVpele9QTPkUIptxQQWhfLR7zG7FW8y470=", + "module": "sha256-UTVQBeDms9x10AAD5WiWYLl0RnWY0BeMKkIPiEYP4RY=", + "pom": "sha256-oC0PiFTKrt1FtpYiQvoMlcLiyHQn09/2Tq1BbRtki/8=" + }, + "io/opentelemetry#opentelemetry-sdk-extension-autoconfigure-spi/1.47.0": { + "jar": "sha256-lDSNQmPixZxwOWMMrTedlptiZE7Qm2F4+pUpiFWbOWo=", + "module": "sha256-3N9XKqFP5t6A4WAwQ2oJinP2QkFthiWj3nEVYnDRSjs=", + "pom": "sha256-plF5ck0P/omYdHcHsgymV9ryy7Sxui50NPZRwigiBVI=" + }, + "io/opentelemetry#opentelemetry-sdk-logs/1.47.0": { + "jar": "sha256-MCSRmEtj7rr0tYvTrhnSI6VfeQkKPka0BQe0nDy+nMU=", + "module": "sha256-UqusUKgDzmeCylC3jNSp3N2XdLuDex2r+0krC+VlcFI=", + "pom": "sha256-7PivOQuEReJQVhlsvEyp7cvhVhTE6ZNX/+w3MO1kFQM=" + }, + "io/opentelemetry#opentelemetry-sdk-metrics/1.47.0": { + "jar": "sha256-fRRCxcqRa6JRMAUgXTuLm8XcpOKoSGfQVQYCoN/Au6U=", + "module": "sha256-D4yOWdilcPEMEeIWdBtHI3I1Vk4ViPfW+CpZ0k4x/gE=", + "pom": "sha256-NaNBlfW4P8C1sqtXLXb7w82uW4tB1JFElW3hEtUKs7U=" + }, + "io/opentelemetry#opentelemetry-sdk-trace/1.47.0": { + "jar": "sha256-A5UO/V+lonZ2mlk1edj2AnQqXVL5l4VpMm0qn54WJUY=", + "module": "sha256-0xRRzoWYemaAuki9dQE8Zi3bzOZTgkfiv4yO+DRUbrk=", + "pom": "sha256-MWRYfYqVjZcCBXM+5UtUSPI3BiZG92EIm6MB2okL8cY=" + }, + "io/opentelemetry#opentelemetry-sdk/1.47.0": { + "jar": "sha256-SgnrLuSEdplz4UIYo05tpU81lVqgKybcUjiwwu1qgB0=", + "module": "sha256-qwFPvQ5xb7TBKVSBDph10aB49UxQ+Sf8V7mbxrcyVz0=", + "pom": "sha256-p+45CMLHYc+kTjNKxmaG1jqnCCavymtPF6d8Q3p/G1U=" + }, + "io/opentelemetry/contrib#opentelemetry-gcp-resources/1.37.0-alpha": { + "jar": "sha256-97a63fu+V/Dj4ePMCOtou2HCnvbBeJjOfONbHzAp0+Y=", + "module": "sha256-Zs9xxdB5RZ8mZjIqgzyFnYcyuN4qYjaADlBpWAh3UP0=", + "pom": "sha256-VSOOSFJi8/XO2JT/ePGs9pb4FKDkzevoStatP9e4jKA=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-bom-alpha/2.16.0-alpha": { + "module": "sha256-+v1OLPpRPsQoEin6l5DT4MOXC+7ywjDno2EcgNSTVgc=", + "pom": "sha256-hv9xK5DrDj9FGhDIla3coyJn7v/7E4/xmthCnOZI8sM=" + }, + "io/opentelemetry/instrumentation#opentelemetry-instrumentation-bom/2.16.0": { + "module": "sha256-2+z7AbAY8c98jV0i6F2OQ7P2M4z1CtUCUzk830Bxr1g=", + "pom": "sha256-kBWbjAVIrFa3HxGhlIFuENkhVwfTFSJFmCZJej0mqjo=" + }, + "io/opentelemetry/semconv#opentelemetry-semconv/1.29.0-alpha": { + "jar": "sha256-qV8a7X4/ZDU+xiXG3vcqDKrwa2xTlw9Xj91RPa/Zlf0=", + "module": "sha256-uCvms5s/HXFPu90Te+mLagSeocjD/bPSRP+4YlGYOmg=", + "pom": "sha256-ritWG/POdHQlww2QMVMJt1fV/Qn/GVykQE5XSadm8hs=" + }, + "io/perfmark#perfmark-api/0.27.0": { + "jar": "sha256-x7R4UD7FJOVd8ZtCTUbSfIporrgBZk+t1PBptx9S0PY=", + "module": "sha256-n2xOamK43v0UFzrNt9spPQhjU7Ikkj7vYpP1gWGJPMo=", + "pom": "sha256-IsF1wsGCNmdjDITnMiV2f1lwSS2ObL/7gaZXXbpHLSY=" + }, + "io/projectreactor#reactor-bom/2024.0.7": { + "module": "sha256-P2pER1DcqmSrs23UesbzyW6c1A9ioP38l95c4AEzrLw=", + "pom": "sha256-EjnKotXk2wuTByGlj8nLzRPlKKsz79IpkV8jvqHR0mY=" + }, + "io/projectreactor#reactor-core/3.7.18": { + "module": "sha256-E3tvhkfsp/fi9wBZzAfcnrHwR6y/pkPrlav1EmsJzeE=", + "pom": "sha256-H2nFxSACJLIHSH31oWSlX7vplu5eSeEBHUA+UaeWgxA=" + }, + "io/projectreactor#reactor-core/3.7.19": { + "jar": "sha256-UDkMFTIMV4eE9g6p1NP3o+/5upDGVn84xszlyfH2n6o=", + "module": "sha256-ooFyNXJXP1XnEIWxvNNYiKXUyTuzgg4bFpypT3JYg9c=", + "pom": "sha256-bnn1rwwoDX8IQIdhemVKPITmvIhFwkWmx/drASKpPG4=" + }, + "io/projectreactor/netty#reactor-netty-core/1.2.18": { + "jar": "sha256-LR/1UUcQLUKExvnFnAbUKI46WbGSHaAWR/7ySGnP78M=", + "pom": "sha256-c69UZ2D+QaPzvqQapL2IWEpFC0zHOq2tOGVAzun0IQs=" + }, + "io/projectreactor/netty#reactor-netty-http/1.2.18": { + "jar": "sha256-W4QJdB6+f9la5EUZqQEVNS+0v50y8q9XnInacAOw2xA=", + "pom": "sha256-/eO8/sE4iy4ntqyD2Y3x0JNU2WqVxt6gpbaQyDDBOgo=" + }, + "io/rest-assured#rest-assured-bom/5.5.5": { + "pom": "sha256-fhmZS0OoTtf/gNgc9hpHeqAmKEft6XN7hYJnjNT97IY=" + }, + "io/swagger/core/v3#swagger-annotations/2.2.34": { + "jar": "sha256-LOhTXiUqm/djpojfD8Ibkzu5yb1IucgsQ1MOhkojuMA=", + "pom": "sha256-z3WXQdDb0yryotn6THAde/N9PH4TIR7ETLSW7cUXCvg=" + }, + "io/swagger/core/v3#swagger-project/2.2.34": { + "pom": "sha256-7EdV9jOGOs5j4eAQT9A4p8IeRc+6AxdXCLHK1glgI0s=" + }, + "io/zipkin/brave#brave-bom/6.3.0": { + "pom": "sha256-jonvcW3ucph8M7pJub7dVhSRiR5ZrqM6kEz2pPB6t+A=" + }, + "io/zipkin/reporter2#zipkin-reporter-bom/3.5.1": { + "pom": "sha256-j5/3aCMobH1es/BhsFO+pf2CnSVc3dqEm4MfQRZqfZA=" + }, + "jakarta/annotation#jakarta.annotation-api/2.1.1": { + "jar": "sha256-X2X9r0JO7itV4diCupuzdr6T+wmze4CL5uIuiFHJCf4=", + "pom": "sha256-r2UOyh3huYdBAGrNglB+RAjP/t0v7jOg6kY9YVCNt+w=" + }, + "jakarta/inject#jakarta.inject-api/2.0.1": { + "jar": "sha256-99yYBi/M8UEmq7dRtk+rEsMSVm6MvchINZi//OqTr3w=", + "pom": "sha256-5/1yMuljB6V1sklMk2fWjPQ+yYJEqs48zCPhdz/6b9o=" + }, + "jakarta/validation#jakarta.validation-api/3.1.0": { + "jar": "sha256-GhhZPYuptIIVykmT5RpEUcgEqC+J6NDUoxpea4cx1Kc=", + "pom": "sha256-sxivh+JwKtsExFPjhWhjzHoJaiXScwtYuewW57D6V/Y=" + }, + "jakarta/validation#jakarta.validation-api/3.1.1": { + "jar": "sha256-Y84AFWOIw2XzrBvnH8+vEUaC/AxFICC1325+wjbhQqs=", + "pom": "sha256-qxnpAKv5Awo3+DI+Ws66WNQK+I47UqBYuOA95II1ync=" + }, + "javax/activation#activation/1.1.1": { + "jar": "sha256-rkdRIOn82ZtLALODKb1hzcXrdU7uA/5mwB9Q4TdyT5k=", + "pom": "sha256-I4FJ4En7vEM06sjt1ZzKVlp1COKDmEHn02zSaBFY//A=" + }, + "javax/activation#javax.activation-api/1.2.0": { + "jar": "sha256-Q/3vC1ts6zGwQksgi5MMdKtY+sLO63s/b9OuuLXKQ5M=", + "pom": "sha256-2ikm88i+iYZDzBCs3sbeCwNRpX+yc1dw+gF3sGrecbk=" + }, + "javax/annotation#javax.annotation-api/1.3.2": { + "jar": "sha256-4EulGVvNVV3JVlD3zGFNFR5LzVLSmhC4qiGX86uJq5s=", + "pom": "sha256-RqSiUcpAbnjkhT16K66DKChEpJkoUUOe6aHyNxbwa5c=" + }, + "javax/inject#javax.inject/1": { + "jar": "sha256-kcdwRKUMSBY2wy2Rb9ickRinIZU5BFLIEGUID5V95/8=", + "pom": "sha256-lD4SsQBieARjj6KFgFoKt4imgCZlMeZQkh6/5GIai/o=" + }, + "javax/mail#mail/1.4.7": { + "jar": "sha256-eMM7T3x7YPS2gPLSQFsfBj1xkpzxpPvDKIiDefNl/Ps=", + "pom": "sha256-lhCZpCD2wx3rczQQwKJGLAZpJzI1+ljFcNYay9udjYo=" + }, + "javax/xml/bind#jaxb-api-parent/2.4.0-b180830.0359": { + "pom": "sha256-ctEy4shY0iMPFdBI8ek6J5xAxOnshLxW+fLz61r0tLg=" + }, + "javax/xml/bind#jaxb-api/2.4.0-b180830.0359": { + "jar": "sha256-VrnpcCdTdjAHQ1Fi6niAVe/P78hquSDwMsBBHcVHuDY=", + "pom": "sha256-sck/wwHX9f5M3hPRlTKZJR2jfv/8kfUjg1UEw/+HNwc=" + }, + "jline#jline/2.9": { + "jar": "sha256-GUPYSuoegm2nJOofMGNj4CaR2xzwQWXTOdl7/I/dENs=", + "pom": "sha256-sSn5BHWQUlcnTVgojGe7hlxCmbRIng0S3aehOWSexl0=" + }, + "junit#junit/4.13.2": { + "jar": "sha256-jklbY0Rp1k+4rPo0laBly6zIoP/1XOHjEAe+TBbcV9M=", + "pom": "sha256-Vptpd+5GA8llwcRsMFj6bpaSkbAWDraWTdCSzYnq3ZQ=" + }, + "me/sunlan#antlr4-annotations/4.13.2.6": { + "jar": "sha256-/A+BWKC2sp3vqygIty7QNFGRE+hUHTSmKcVjSdhv9w8=", + "pom": "sha256-vYjzUQoU6z1dq2KxCAhse8V2PmgWTnFsHa2UqEJBwGQ=" + }, + "me/sunlan#antlr4-master/4.13.2.6": { + "pom": "sha256-i/eMtBUsNfE/iguUKAEaPk+eqdL1nryxufsdQ1sodVY=" + }, + "me/sunlan#antlr4-runtime/4.13.2.6": { + "jar": "sha256-HJsTQ4TUoSJsG4odK1uNzbZiOzX3VTNItw+tEii+KqE=", + "pom": "sha256-0lJo9t4PkULqUiGbaqVsazQUA+LCJA/6Nb8Oo2TwrLE=" + }, + "me/sunlan#antlr4/4.13.2.6": { + "jar": "sha256-DdxJNw3hXG9h/Wt5R370tjooZM8s0Uw49jP4OZjzmoI=", + "pom": "sha256-G6BKTajloqzwrG7s5N+CKAvNapH0Rwe7C0ucjXP42jI=" + }, + "net/java#jvnet-parent/1": { + "pom": "sha256-KBRAgRJo5l2eJms8yJgpfiFOBPCXQNA4bO60qJI9Y78=" + }, + "net/java#jvnet-parent/3": { + "pom": "sha256-MPV4nvo53b+WCVqto/wSYMRWH68vcUaGcXyy3FBJR1o=" + }, + "net/java#jvnet-parent/5": { + "pom": "sha256-GvaZ+Nndq2f5oNIC+9eRXrA2Klpt/V/8VMr6NGXJywo=" + }, + "net/java/dev/jna#jna-platform/5.17.0": { + "jar": "sha256-t+PUbIe60utAmw5wSRa82BIGFo41cxLf3dDiU2ec2eA=", + "pom": "sha256-CjC3l622giFH75jLJJ7z+/SiQ1QqqGv59C+tnmgwWkQ=" + }, + "net/java/dev/jna#jna/5.13.0": { + "pom": "sha256-9RXCV4F49FJH7Mp6nh2xCVMbHELyQk4lPO6w9rjUI3Q=" + }, + "net/java/dev/jna#jna/5.17.0": { + "jar": "sha256-s6lAjnxR4I7w47/MCPRD9uwPYZG6jNfBjVPSsi5b28A=", + "pom": "sha256-UBoP8F2EpK0Q9t4lvpT0k5i3CjG+jzoO2fTGtE++/uQ=" + }, + "org/abego/treelayout#org.abego.treelayout.core/1.0.3": { + "jar": "sha256-+l4xOVw5wufUasoPgfcgYJMWB7L6Qb02A46yy2+5MyY=", + "pom": "sha256-o7KyI3lDcDVeeSQzrwEvyZNmfAMxviusrYTbwJrOSgw=" + }, + "org/antlr#ST4/4.3.4": { + "jar": "sha256-+SesOExG10n4texolypTrtIeADE1CSmWFu23O/oV/zM=", + "pom": "sha256-nnwfPkiZGUQOjBMInlljcp1bf4D3AjO/uuMJxkmryj4=" + }, + "org/antlr#antlr-master/3.5.3": { + "pom": "sha256-6p43JQ9cTC52tlOL6XtX8zSb2lhe31PzypfiB7OFuJU=" + }, + "org/antlr#antlr-runtime/3.5.3": { + "jar": "sha256-aL+fWjPfyzQDNJXFh+Yja+9ON6pmEpGfWx6EO5Bmn7k=", + "pom": "sha256-EymODgqvr0FP99RAZCfKtuxPv6NkJ/bXEDxDLzLAfSU=" + }, + "org/apache#apache/13": { + "pom": "sha256-/1E9sDYf1BI3vvR4SWi8FarkeNTsCpSW+BEHLMrzhB0=" + }, + "org/apache#apache/15": { + "pom": "sha256-NsLy+XmsZ7RQwMtIDk6br2tA86aB8iupaSKH0ROa1JQ=" + }, + "org/apache#apache/21": { + "pom": "sha256-rxDBCNoBTxfK+se1KytLWjocGCZfoq+XoyXZFDU3s4A=" + }, + "org/apache#apache/23": { + "pom": "sha256-vBBiTgYj82V3+sVjnKKTbTJA7RUvttjVM6tNJwVDSRw=" + }, + "org/apache#apache/27": { + "pom": "sha256-srD8aeIqZQw4kvHDZtdwdvKVdcZzjfTHpwpEhESEzfk=" + }, + "org/apache#apache/30": { + "pom": "sha256-Y91KOTqcDfyzFO/oOHGkHSQ7yNIAy8fy0ZfzDaeCOdg=" + }, + "org/apache#apache/31": { + "pom": "sha256-VV0MnqppwEKv+SSSe5OB6PgXQTbTVe6tRFIkRS5ikcw=" + }, + "org/apache#apache/32": { + "pom": "sha256-z9hywOwn9Trmj0PbwP7N7YrddzB5pTr705DkB7Qs5y8=" + }, + "org/apache#apache/33": { + "pom": "sha256-14vYUkxfg4ChkKZSVoZimpXf5RLfIRETg6bYwJI6RBU=" + }, + "org/apache#apache/35": { + "pom": "sha256-6il9zRFBNui46LYwIw1Sp2wvxp9sXbJdZysYVwAHKLg=" + }, + "org/apache#apache/7": { + "pom": "sha256-E5fOHbQzrcnyI9vwdJbRM2gUSHUfSuKeWPaOePtLbCU=" + }, + "org/apache/ant#ant-antlr/1.10.15": { + "jar": "sha256-YZ42FgnURv5qtn0dRbhlbmhkTL18RbvtXCyIFkCNjdU=", + "pom": "sha256-9wbsXFMyAPbqHbl+TH+kdtny8l0GFi0cqXEGoauExz0=" + }, + "org/apache/ant#ant-junit/1.10.15": { + "jar": "sha256-mkVe60vtwdi81LgJnUsfGPG/G8l3zW44mhBv4M82ZxE=", + "pom": "sha256-XhzWXJvDP0PBC1AL66RHhn1qc3AyvJNlWD0xgQ+O0jQ=" + }, + "org/apache/ant#ant-launcher/1.10.15": { + "jar": "sha256-XIVRmQMHoDIzbZjdrtVJo5ponwfU1Ma5UGAb8is9ahs=", + "pom": "sha256-ea+EKil53F/gAivAc8SYgQ7q2DvGKD7t803E3+MNrJU=" + }, + "org/apache/ant#ant-parent/1.10.15": { + "pom": "sha256-SYhPGHPFEHzCN/QoXER3R5uwgEvwc3OUgBsI114rvrA=" + }, + "org/apache/ant#ant/1.10.15": { + "jar": "sha256-djrNpKaViMnqiBepUoUf8ML8S/+h0IHCVl3EB/KdV5Q=", + "pom": "sha256-R4DmHoeBbu4fIdGE7Jl7Zfk9tfS5BCwXitsp4j50JdY=" + }, + "org/apache/commons#commons-compress/1.26.1": { + "pom": "sha256-X0SKAh2IyW84QN/mGRKNYuXPticSzW5m3KincElFsG4=" + }, + "org/apache/commons#commons-compress/1.27.1": { + "jar": "sha256-KT2A9UtTa3QJXc1+o88KKbv8NAJRkoEzJJX0Qg03DRY=", + "pom": "sha256-34zBqDh9TOhCNjtyCf3G0135djg5/T/KtVig+D+dhBw=" + }, + "org/apache/commons#commons-lang3/3.14.0": { + "pom": "sha256-EQQ4hjutN8KPkGv4cBbjjHqMdYujIeCdEdxaI2Oo554=" + }, + "org/apache/commons#commons-lang3/3.18.0": { + "jar": "sha256-Tu6ujSDAeKu2SwFewVit04OsWBVxzdxFxo8MmuAjByA=", + "pom": "sha256-qiVLNztvbUa8ncqGMxsHKoq4brJeqZIf1Dlhg5LpihY=" + }, + "org/apache/commons#commons-parent/34": { + "pom": "sha256-Oi5p0G1kHR87KTEm3J4uTqZWO/jDbIfgq2+kKS0Et5w=" + }, + "org/apache/commons#commons-parent/35": { + "pom": "sha256-cJihq4M27NTJ3CHLvKyGn4LGb2S4rE95iNQbT8tE5Jo=" + }, + "org/apache/commons#commons-parent/52": { + "pom": "sha256-ddvo806Y5MP/QtquSi+etMvNO18QR9VEYKzpBtu0UC4=" + }, + "org/apache/commons#commons-parent/64": { + "pom": "sha256-bxljiZToNXtO1zRpb5kgV++q+hI1ZzmYEzKZeY4szds=" + }, + "org/apache/commons#commons-parent/65": { + "pom": "sha256-bPNJX8LmrJE6K38uA/tZCPs/Ip+wbTNY3EVnjVrz424=" + }, + "org/apache/commons#commons-parent/66": { + "pom": "sha256-SP1tyEblax9AhmDRY+dTAPnjhLtjvkgqgIKiHXKo25w=" + }, + "org/apache/commons#commons-parent/69": { + "pom": "sha256-1Q2pw5vcqCPWGNG0oDtz8ZZJf8uGFv0NpyfIYjWSqbs=" + }, + "org/apache/commons#commons-parent/71": { + "pom": "sha256-lbe+cPMWrkyiL2+90I3iGC6HzYdKZQ3nw9M4anR6gqM=" + }, + "org/apache/commons#commons-parent/72": { + "pom": "sha256-Q0Xev8dnsa6saKvdcvxn0YtSHUs5A3KhG2P/DFhrIyA=" + }, + "org/apache/commons#commons-parent/79": { + "pom": "sha256-Yo3zAUis08SRz8trc8euS1mJ5VJqsTovQo3qXUrRDXo=" + }, + "org/apache/commons#commons-parent/85": { + "pom": "sha256-0Yn/LAAn6Wu2XTHm8iftKvlmFps2rx6XPdW6CJJtx7U=" + }, + "org/apache/groovy#groovy-ant/4.0.31": { + "jar": "sha256-kDmVfzPIU1VX6TTNhQahO1VC5ZMsNHCqMwCGWdF/oz0=", + "module": "sha256-NxkNUYM4XWqXbR8qWiYTM7wTj+6pYe6HDQXN6Cx3G8E=", + "pom": "sha256-LvzgmtS6OYjNIkmeOOgEaJCgxiS7o7YQz9I6/hce1Rw=" + }, + "org/apache/groovy#groovy-astbuilder/4.0.31": { + "jar": "sha256-UZxWPwwq1K/enUkIVrPLxcT1xlgwFStBN5xGf0j13FA=", + "module": "sha256-o8Fmq7zmqjdtsnnV2qBL5EWWVLE5MAnn2Zhp8lD1MME=", + "pom": "sha256-Zt5k+P+ucA8l7we+6cM2eg/VSuxM8ciNW003hPOCLQ0=" + }, + "org/apache/groovy#groovy-bom/4.0.18": { + "module": "sha256-a0+3O1GC9TMQVmfYE0b4AY3KmZBxGoZnhoqYL6vxug4=", + "pom": "sha256-T9hr3EacyHWrNS0DtdgYwBBdd0C10+UmqRnyQf6YTYw=" + }, + "org/apache/groovy#groovy-bom/4.0.27": { + "module": "sha256-1sIlTINHuEzahMr3SRShh8Lzd+QoTo2Ls/kBUhgQqos=", + "pom": "sha256-qkTrUr/f5h0ns+RQ0rNI2I3qo0N6tNnUmoQJU0j59vs=" + }, + "org/apache/groovy#groovy-bom/4.0.31": { + "module": "sha256-tTtEY1VohufF/ixU8mw1vqG0hmUJhIDetVfr0fH/XHM=", + "pom": "sha256-1M/IWQeCE841jaj0W5wABASzG2a/atcGXDdi8Bj+fiA=" + }, + "org/apache/groovy#groovy-console/4.0.31": { + "jar": "sha256-5Hh4lzN1tlelGF53Tzc7EDs+znRHVO/z39t330VlFUY=", + "module": "sha256-2sDc54WSxTTFchf9Q/1v668fJhmXgCH9e8yR+eaSBdw=", + "pom": "sha256-GmD44Dsp2Wma/yLs3dZ9zLVntm21hWflHIdFBSwYlx8=" + }, + "org/apache/groovy#groovy-datetime/4.0.31": { + "jar": "sha256-csvDJM1BpIGtOzUnOHBe/Z7hYJPqy3te6x7kSO8GLEE=", + "module": "sha256-w6lx26gYafvVcq1cYS+YFvttaGUUK4JdlTdCO4ziHLM=", + "pom": "sha256-j67fp6aL5UK81Nc8R2tbR2M2VjKC1rVpMRF7cb4t5Cg=" + }, + "org/apache/groovy#groovy-dateutil/4.0.31": { + "jar": "sha256-5fDpDSfqVA/tVyFdbPmBmAx/1ZAtU4ECwoCugPIpQJk=", + "module": "sha256-+QwitO/O8KdNObQajkvnPm3YrUiffpAnV81TObiM04Y=", + "pom": "sha256-C/I4Tc+LKwiTCCl7wyWEhb5xxLtO+9W+aHoc0+x7EUs=" + }, + "org/apache/groovy#groovy-docgenerator/4.0.31": { + "jar": "sha256-Ymq1CM0giAk/fWPThVlD2FxTnbvvEIcXmLQk4us8wv0=", + "module": "sha256-rmvvimT4iGZXuW98dVfjpBCh0VwwPH2WcqYxzqzCmmk=", + "pom": "sha256-4vrpeGDJ9c5P6FJWls9cFh/2hnNcrSBpy0VSI6bSVq0=" + }, + "org/apache/groovy#groovy-groovydoc/4.0.31": { + "jar": "sha256-zRqN8+nK9zaqYeGC6W45uvOw+3m7cNrVj08Hmeo+Bpw=", + "module": "sha256-L3N4syQsim2UJY2i0Re3nGQv9JONKbaZwLIGwAhlPMw=", + "pom": "sha256-0jbzgHOQvR4vD35gnOm2aZ57xiZgpHVaCqVywRMIOwU=" + }, + "org/apache/groovy#groovy-json/4.0.31": { + "jar": "sha256-YgCtKCIOYaMhTV8PNW0JLWIIeu0K5lC0E9vIN/g2VTM=", + "module": "sha256-j/gmL/r7lFaozxPzeXNTnFI0rahsjgadYh0Hsw9ZwJs=", + "pom": "sha256-zcp4pvq7TtEcwZfQRcysk61Tp99xjlzW65sSRt8RYic=" + }, + "org/apache/groovy#groovy-nio/4.0.31": { + "jar": "sha256-YJxdF0eETbYaZutO5Zuxza9kyonvbtQOL5yi0KkavtY=", + "module": "sha256-43FOdVdK7NX1ynK5E2fMJket5qQOWlWiMfZEvHcdgtY=", + "pom": "sha256-2vsPd38d8yCaCACQBNZXVi8//Nzn2Xu50Wouyl+wrSo=" + }, + "org/apache/groovy#groovy-sql/4.0.31": { + "jar": "sha256-yu+Ev7ncjP+PPEH2+kDpBexqZ11oHO3/n45VqBiToSo=", + "module": "sha256-KFvc+uZ64t2/nefA1ZSozkxun58nmib4A/VpNg2H0F0=", + "pom": "sha256-S3NAmJwNlNMbPqmA8uxldPpP/7a9ttW7wMdp9qXzR1A=" + }, + "org/apache/groovy#groovy-swing/4.0.31": { + "jar": "sha256-IXhB2mkbOowbAEnNOv2S1wrT8zoLaYADcQ770gcxD/k=", + "module": "sha256-gc2+TXIZEx8Uk4n/5f1o2hL2x5XiKA/VnGKSAXsTZkk=", + "pom": "sha256-vrOC4vDAD/5BkJZcUItCx9h6IhkpDPZREu1ctRZXKIo=" + }, + "org/apache/groovy#groovy-templates/4.0.31": { + "jar": "sha256-9gnPLs5IvLsmzYj2cOKtujTgJXP2AXT5cG1lhVy0FEI=", + "module": "sha256-jyg/bTm6+fMc+6Qox04H2r40tnHJOAtsBcaSN28vtbg=", + "pom": "sha256-f9N8p3zZiJ0cnhaesHJKnTp30XpWMGLsP8f8dv9nVhc=" + }, + "org/apache/groovy#groovy-test/4.0.31": { + "jar": "sha256-81hS0sXdCqjlG8pG95vBc9Fa0h9CFTXQGnJvM3K4oUs=", + "module": "sha256-mr49ojVfBYAg6M6e1bu3zMvZJd5WDB39r9yMBPwSmaA=", + "pom": "sha256-+YdxYP3JJpkpnOuVt6FUfGvEDuNqAx5rPIvVZRyq/0U=" + }, + "org/apache/groovy#groovy-xml/4.0.31": { + "jar": "sha256-xzGckHfjfn987b5nidoHK1rWaYrTioIkK63JB/G/joA=", + "module": "sha256-XwPQ+/MG2tPNeuRo9iP224HVhedAJMq8Y2xvHfHybFk=", + "pom": "sha256-FdHMnSSRf9/Iawc45fptTpPjgl+d6Yo5wgpFtJkP4qw=" + }, + "org/apache/groovy#groovy-yaml/4.0.31": { + "jar": "sha256-LZe1c4JCxWNFPLltIRJHGbBMhQxOpUOdiFOG3STPs6g=", + "module": "sha256-hap3VAs9GnbWuM/hbwcPa67HiCFPfJSLRmekaUqRQtQ=", + "pom": "sha256-tweqOdD8MdRd+JCLTcE0o0n0I63IVwlS/Ik3o0Ermkk=" + }, + "org/apache/groovy#groovy/4.0.31": { + "jar": "sha256-5amX66Ihh0nmhvP+0nnn7d988bt9pHknAvmvrVf0iXg=", + "module": "sha256-JZ14uUikCwHQfbEKodOhonwaGY2po0JdQNY0b2h2voE=", + "pom": "sha256-73/I5prussHU7U3xvNtf2C7PrPn9dXS+4PibmYTXS9o=" + }, + "org/apache/httpcomponents#httpclient/4.5.13": { + "jar": "sha256-b+kCalZsalABYIzz/DIZZkH2weXhmG0QN8zb1fMe90M=", + "pom": "sha256-eOua2nSSn81j0HrcT0kjaEGkXMKdX4F79FgB9RP9fmw=" + }, + "org/apache/httpcomponents#httpclient/4.5.14": { + "jar": "sha256-yLx+HFGm1M5y9A0uu6vxxLaL/nbnMhBLBDgbSTR46dY=", + "pom": "sha256-8YNVr0z4CopO8E69dCpH6Qp+rwgMclsgldvE/F2977c=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.13": { + "pom": "sha256-nLpZTAjbcnHQwg6YRdYiuznmlYORC0Xn1d+C9gWNTdk=" + }, + "org/apache/httpcomponents#httpcomponents-client/4.5.14": { + "pom": "sha256-W60d5PEBRHZZ+J0ImGjMutZKaMxQPS1lQQtR9pBKoGE=" + }, + "org/apache/httpcomponents#httpcomponents-core/4.4.16": { + "pom": "sha256-8tdaLC1COtGFOb8hZW1W+IpAkZRKZi/K8VnVrig9t/c=" + }, + "org/apache/httpcomponents#httpcomponents-parent/11": { + "pom": "sha256-qQH4exFcVQcMfuQ+//Y+IOewLTCvJEOuKSvx9OUy06o=" + }, + "org/apache/httpcomponents#httpcomponents-parent/14": { + "pom": "sha256-Xc62qyBqQZF5Jz8V0NK0cvlHK7t0fGyLfpbar3jMRSc=" + }, + "org/apache/httpcomponents#httpcore/4.4.16": { + "jar": "sha256-bJs90UKgncRo4jrTmq1vdaDyuFElEERp8CblKkdORk8=", + "pom": "sha256-PLrYSbNdrP5s7DGtraLGI8AmwyYRQbDSbux+OZxs1/o=" + }, + "org/apache/httpcomponents/client5#httpclient5-parent/5.6.1": { + "pom": "sha256-iwYOagVFpBhk+yYODDi1pYJhz5EdkSnnxuj2EFgR/UQ=" + }, + "org/apache/httpcomponents/client5#httpclient5/5.6.1": { + "jar": "sha256-Hj2ERMPCd3LkudQqeQ8GszRajs5P0W0AmB8vJGDh53I=", + "pom": "sha256-ZNprKVCwkMApt79AOlzQ2cRzBM6Xo8yQurkcYdDYbLw=" + }, + "org/apache/httpcomponents/core5#httpcore5-h2/5.4": { + "jar": "sha256-Lg9KzhXbLRYJwrBuymAS51gq/kqZrY0VBz9i3Y7bNGA=", + "pom": "sha256-GNM9GMNl0Oe/IlndT+uxN3dcBAhm9KQFcUNRuQNii6o=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.4": { + "pom": "sha256-rjcqE/yM3kQTXmHtjdMLf6i30zy8QJQkZ6eUYz+6owY=" + }, + "org/apache/httpcomponents/core5#httpcore5-parent/5.4.2": { + "pom": "sha256-2O8EAAVlr/rAGbelXeW7fMgqsEAylShe9J9sjCdFr+s=" + }, + "org/apache/httpcomponents/core5#httpcore5/5.4.2": { + "jar": "sha256-fDSiVQbnIHtnSM756RFj7QMIG+6AXO+TDYLh2HYdYvE=", + "pom": "sha256-uXBfphsRBQ4ek1YXTm8JMa8m46qeEFLdPJZbzPW5SaU=" + }, + "org/apache/ivy#ivy/2.5.3": { + "jar": "sha256-lQKqWqvwsUhJJKE+9LXSTxIff5GqtnaPEcydCQbAgDs=", + "pom": "sha256-uwX5Ztsh4F0Rq52AFoUB8Tf0SWsx4PwggFQ0E4q2W1M=" + }, + "org/apache/logging#logging-parent/11.3.0": { + "pom": "sha256-pcmFtW/hxYQzOTtQkabznlufeFGN2PySE0aQWZtk19A=" + }, + "org/apache/logging/log4j#log4j-bom/2.24.3": { + "pom": "sha256-sXq38yj0WGt+cfjJT8NaXaK86AcFpdYwBAIsGSiDNVg=" + }, + "org/bouncycastle#bcpkix-jdk18on/1.84": { + "jar": "sha256-yH8W7Z5exhvJQVHp82RqxE5QzUSBIc6ENn+kt+x+wbs=", + "pom": "sha256-wSge1er48+QFVX56UgXLbzzfdT+E3psagVx16965mSo=" + }, + "org/bouncycastle#bcprov-ext-jdk18on/1.78.1": { + "pom": "sha256-sSNVJiXCmwp9cnoufesfuCWHyJ8hPPCi9ISliDV45e0=" + }, + "org/bouncycastle#bcprov-jdk18on/1.78.1": { + "pom": "sha256-KJEtE5+e7RQcOUNx++W6b//5HnjxycuDSPlEok0gTtI=" + }, + "org/bouncycastle#bcprov-jdk18on/1.84": { + "jar": "sha256-ZNbFphIfzZJxUt0YLL7Tmv4P2mQalw2bzAycsYWLJzE=", + "pom": "sha256-znq7SpG6XSpz/fF6PfR2LjYFoDksx5g+8vGuFs04TMM=" + }, + "org/bouncycastle#bcutil-jdk18on/1.84": { + "jar": "sha256-s3ThaWNCH7nPsBzCDXrY/S+LgYjj7vDsColl4kX3YZo=", + "pom": "sha256-Cwy4GmXuFzfVEoY1Cp5WSJM2uPmQgZj+vQSUJD7qKXg=" + }, + "org/checkerframework#checker-qual/3.41.0": { + "jar": "sha256-L58kW/aOQlnWEIlPJAbcH2Nj3GOTAr1WboJy5PRUEXI=", + "module": "sha256-s4ZywX9FUnayEO00Av+S3OZmdwsajGEMfMNK1UxTLSA=", + "pom": "sha256-XHOwdwVAhCzwagHSZLu4muXiSGadydqA6GHoIz3UZ1s=" + }, + "org/checkerframework#checker-qual/3.49.0": { + "jar": "sha256-i52aNuqvfA/CZQPIPNl9jJwPnikTzCpukqwmxzXU3L4=", + "module": "sha256-YA0Z+9XjfemEh8OYBF4UCmUc9brRx5xcl88MyYRMQuQ=", + "pom": "sha256-yEUftI7+1jgbMpFG1PrvtvTYq/E79XLCaosawoCW54A=" + }, + "org/codehaus#codehaus-parent/4": { + "pom": "sha256-a4cjfejC4XQM+AYnx/POPhXeGTC7JQxVoeypT6PgFN8=" + }, + "org/codehaus/gpars#gpars/1.2.1": { + "jar": "sha256-+eCL+WTzTRKTREBMAWZiduxDxnBN106NTKMtzR0vtKg=", + "pom": "sha256-QoGa4DFjcSPJS8c9bvANBfh29tSixUiztj722uw4gw4=" + }, + "org/codehaus/jsr166-mirror#jsr166y/1.7.0": { + "jar": "sha256-TU50Uy6BvGpU5MvahlmZ9KspiF6FDwuDXqN0gAuE0LI=", + "pom": "sha256-tmtSb0df2k3Oi5X/8P7ukkqPBZKYwzrgyTS3fYkJBkM=" + }, + "org/codehaus/mojo#animal-sniffer-annotations/1.24": { + "jar": "sha256-xyDm5by+ay9I3tdaR7zNt2Pu3nnRQzAQLg01Lj2J7ZI=", + "pom": "sha256-iEhPYKatQjipf+us8rMz6eCMF4uPGAoFo+2/9KOKg24=" + }, + "org/codehaus/mojo#animal-sniffer-parent/1.24": { + "pom": "sha256-Sd2rQ8g2HcLvDB/4fLWQ+nIxcCq59i4m1RLcGKHxzQQ=" + }, + "org/codehaus/mojo#mojo-parent/84": { + "pom": "sha256-L+UQYYsvYPzV8vuCvEssLDRASNdPML5xn8uGgp7orDA=" + }, + "org/codehaus/woodstox#stax2-api/4.2.2": { + "jar": "sha256-phxI1VPvrXi8Af/8SsUovruuZMuuwXCypeOc9h61Gr4=", + "pom": "sha256-TpAuxVb8ZZi0HClS7BVz7cgVA35zMOxJIuq2GUImhuI=" + }, + "org/conscrypt#conscrypt-openjdk-uber/2.5.2": { + "jar": "sha256-6vU32Y4DPQ8EUc0bjMdOAte1XsiC2mPIgGDYBrqJw0g=", + "pom": "sha256-tf1UhzL5MlRdd3iQ65lSIr/oZiMjUb6QgTfjnDxnLYs=" + }, + "org/eclipse/ee4j#project/1.0.6": { + "pom": "sha256-Tn2DKdjafc8wd52CQkG+FF8nEIky9aWiTrkHZ3vI1y0=" + }, + "org/eclipse/ee4j#project/1.0.7": { + "pom": "sha256-IFwDmkLLrjVW776wSkg+s6PPlVC9db+EJg3I8oIY8QU=" + }, + "org/eclipse/ee4j#project/1.0.9": { + "pom": "sha256-glN5k0oc8pJJ80ny0Yra95p7LLLb4jFRiXTh7nCUHBc=" + }, + "org/eclipse/jetty#jetty-bom/12.0.21": { + "pom": "sha256-PxB+Po77Hkr504PmvAZn/jbPVSYAEMIoNDaOga6E0yk=" + }, + "org/eclipse/jetty#jetty-bom/9.4.45.v20220203": { + "pom": "sha256-6GaLKkTnymO8Jr36Iyevfj+X9wncvMXnsQnYH+w6VbY=" + }, + "org/eclipse/jgit#org.eclipse.jgit-parent/7.1.1.202505221757-r": { + "pom": "sha256-2MQUVqFpO+cF1ynPPvVBQrmc3OG7tzIZvBNISDKbT5c=" + }, + "org/eclipse/jgit#org.eclipse.jgit/7.1.1.202505221757-r": { + "jar": "sha256-GE1FHjbh9MtQCezVcHaop7S4bZ7bUJAzxz73zLlvwzo=", + "pom": "sha256-7QPmQbCTT0tC1ipIvYphoRdR+uoaYC3vxAGH51L5Twc=" + }, + "org/hamcrest#hamcrest-core/1.3": { + "jar": "sha256-Zv3vkelzk0jfeglqo4SlaF9Oh1WEzOiThqekclHE2Ok=", + "pom": "sha256-/eOGp5BRc6GxA95quCBydYS1DQ4yKC4nl3h8IKZP+pM=" + }, + "org/hamcrest#hamcrest-parent/1.3": { + "pom": "sha256-bVNflO+2Y722gsnyelAzU5RogAlkK6epZ3UEvBvkEps=" + }, + "org/iq80/leveldb#leveldb-api/0.12": { + "jar": "sha256-OvfzUKuBy6mjXL+HTmTJCG/bxUZGQ/2sAKkIu/b1v+0=", + "pom": "sha256-u3YgQdQp1fGrIo2Vdueo9KMJOXPYlp9J9Z60Pt4nEnw=" + }, + "org/iq80/leveldb#leveldb-project/0.12": { + "pom": "sha256-TC30AYOjb6TRMRQAa2se+DwABq6w7TQJOKc7Hu5FKP8=" + }, + "org/iq80/leveldb#leveldb/0.12": { + "jar": "sha256-PBLq+4v/NZ+XrsTXV0SAz8Bug/RHBN4CChwGJ2UbpLY=", + "pom": "sha256-BLLnbGq+AuopCM5vdltp80j3+lq86j5sO0DXWgRuMFM=" + }, + "org/jdbi#jdbi3-bom/3.49.5": { + "pom": "sha256-C9He725cfwE77DhCCzcRshp3AB93qVzKzRZAkqTicns=" + }, + "org/jetbrains#annotations/13.0": { + "jar": "sha256-rOKhDcji1f00kl7KwD5JiLLA+FFlDJS4zvSbob0RFHg=", + "pom": "sha256-llrrK+3/NpgZvd4b96CzuJuCR91pyIuGN112Fju4w5c=" + }, + "org/jetbrains/kotlin#kotlin-bom/1.9.25": { + "pom": "sha256-GZrnpYnroWgYRqlUmmlc87CkLB2SEZpQqDD/Erq7oCM=" + }, + "org/jetbrains/kotlin#kotlin-stdlib-jdk8/1.8.21": { + "jar": "sha256-PbdSowB08G7mxXmEqm8n2kT00rvH9UQmUfaYjxyyt9c=", + "pom": "sha256-ODnXKNfDCaXDaLAnC0S08ceHj/XKXTKpogT6o0kUWdg=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.8.21": { + "pom": "sha256-/gzZ4yGT5FMzP9Kx9XfmYvtavGkHECu5Z4F7wTEoD9c=" + }, + "org/jetbrains/kotlin#kotlin-stdlib/1.9.21": { + "jar": "sha256-O0eTE6tsrqTl4l097oyoDDAsibpz4a9Nr6oQD275KWo=", + "module": "sha256-0wGffw1xkkzkcpjJzEavAkX3UhlxmzXFkV+8x+emk5U=", + "pom": "sha256-yAfZL3xqobZcBs+HIyNjUE5pD8o/PB4nIGYwoTIv1+A=" + }, + "org/jetbrains/kotlinx#kotlinx-coroutines-bom/1.8.1": { + "pom": "sha256-Vj5Kop+o/gmm4XRtCltRMI98fe3EaNxaDKgQpIWHcDA=" + }, + "org/jsoup#jsoup/1.15.4": { + "jar": "sha256-AGgw0Hl3EECN5VicGNhkNDwO8aOgxgPJyxOMlDtn2aQ=", + "pom": "sha256-chKJC3LAuGDgIlhWvnQT5469Ps0+y4Vn3eaqxic9+4k=" + }, + "org/jsoup#jsoup/1.21.1": { + "jar": "sha256-Q2rfcf6fMm4E/hNM0nhbJh8PS5tgh2rdod47aRlGM5Q=", + "pom": "sha256-bfLYvC7Pvb7O3oW2A4ndn3wfyIQbFjHjXJyEcBjFQ7g=" + }, + "org/jspecify#jspecify/1.0.0": { + "jar": "sha256-H61ua+dVd4Hk0zcp1Jrhzcj92m/kd7sMxozjUer9+6s=", + "module": "sha256-0wfKd6VOGKwe8artTlu+AUvS9J8p4dL4E+R8J4KDGVs=", + "pom": "sha256-zauSmjuVIR9D0gkMXi0N/oRllg43i8MrNYQdqzJEM6Y=" + }, + "org/junit#junit-bom/5.10.0": { + "module": "sha256-6z7mEnYIAQaUqJgFbnQH0RcpYAOrpfXbgB30MLmIf88=", + "pom": "sha256-4AbdiJT5/Ht1/DK7Ev5e2L5lZn1bRU+Z4uC4xbuNMLM=" + }, + "org/junit#junit-bom/5.10.1": { + "module": "sha256-IbCvz//i7LN3D16wCuehn+rulOdx+jkYFzhQ2ueAZ7c=", + "pom": "sha256-IcSwKG9LIAaVd/9LIJeKhcEArIpGtvHIZy+6qzN7w/I=" + }, + "org/junit#junit-bom/5.10.2": { + "module": "sha256-3iOxFLPkEZqP5usXvtWjhSgWaYus5nBxV51tkn67CAo=", + "pom": "sha256-Fp3ZBKSw9lIM/+ZYzGIpK/6fPBSpifqSEgckzeQ6mWg=" + }, + "org/junit#junit-bom/5.10.3": { + "module": "sha256-qnlAydaDEuOdiaZShaqa9F8U2PQ02FDujZPbalbRZ7s=", + "pom": "sha256-EJN9RMQlmEy4c5Il00cS4aMUVkHKk6w/fvGG+iX2urw=" + }, + "org/junit#junit-bom/5.11.0-M2": { + "module": "sha256-hkd6vPSQ1soFmqmXPLEI0ipQb0nRpVabsyzGy/Q8LM4=", + "pom": "sha256-Sj/8Sk7c/sLLXWGZInBqlAcWF5hXGTn4VN/ac+ThfMg=" + }, + "org/junit#junit-bom/5.11.4": { + "module": "sha256-qaTye+lOmbnVcBYtJGqA9obSd9XTGutUgQR89R2vRuQ=", + "pom": "sha256-GdS3R7IEgFMltjNFUylvmGViJ3pKwcteWTpeTE9eQRU=" + }, + "org/junit#junit-bom/5.12.2": { + "module": "sha256-3nCsXZGlJlbYiQptI7ngTZm5mxoEAlMN7K1xvzGyc14=", + "pom": "sha256-zvgP7IZFT2gGv7DfJGabXG8y4styhTnqhZ9H39ybvBc=" + }, + "org/junit#junit-bom/5.13.1": { + "module": "sha256-M8B6uXJHkKblhZugfWkResUwQ5ckVFqBxBeeMnLHXeg=", + "pom": "sha256-+mhFHqgwVy7UP/5R11tqBfel5mWmAqUfSda+AgY6ZfM=" + }, + "org/junit#junit-bom/5.13.3": { + "module": "sha256-XchNdO+YHQI8Y56wy8Sx+e+JEDQofOGxAe/7vA8VNLQ=", + "pom": "sha256-47k+m7iHGWnPEcDo/xD1B4QdsYhcoQV44pCEb2YP1o4=" + }, + "org/junit#junit-bom/5.13.4": { + "module": "sha256-6Vkoj94bGwUNm8CC/HhniRKNpdKFMJFGj8pQQQS99AA=", + "pom": "sha256-16CKmbJQLwu2jNTh+YTwv2kySqogi9D3M2bAP8NUikI=" + }, + "org/junit#junit-bom/5.14.1": { + "module": "sha256-J4rLEczJmYaUIkOG+W+0lBoi7bQstEbJLg8fMwFLa0g=", + "pom": "sha256-AbAd+jZlULQKxXYFSKfXKLYQnRfEUeg4ZNHl4M6GLJQ=" + }, + "org/junit#junit-bom/5.14.2": { + "module": "sha256-XSb0RAOSMm3SSDz0kBQ+6hSV1QlUWaC5ZRp7GzjiTr8=", + "pom": "sha256-7S3MeFW9RgvMyTob8Mli5jtWb/fY8d7Q8fJZO6gYOq8=" + }, + "org/mockito#mockito-bom/4.11.0": { + "pom": "sha256-2FMadGyYj39o7V8YjN6pRQBq6pk+xd+eUk4NJ9YUkdo=" + }, + "org/multiverse#multiverse-core/0.7.0": { + "jar": "sha256-xUOY8CKAVLf65lInQzrp2oflsqluuoJOZqkkkS0Q/FA=", + "pom": "sha256-p7gugArForuaPFPIf328LPcE45XMMnNRC6OAd9PrURQ=" + }, + "org/multiverse#multiverse/0.7.0": { + "pom": "sha256-7eh88cQ59oa9lF8cRiz8//VQg6HnKxjCjmP050MEohg=" + }, + "org/objenesis#objenesis-parent/2.1": { + "pom": "sha256-NDsaMJNBDj+ybGaZhCOrOJw6dEHNGohZvTJ90VtHmqQ=" + }, + "org/objenesis#objenesis/2.1": { + "jar": "sha256-x0MwzGuAbIBP0350SHtP5dfCdQxeFfvG76E73uG974A=", + "pom": "sha256-QFTxhhN+O4SafCPJ6EbNV9ii/jLBfUxivUIFEtdMPT8=" + }, + "org/ow2#ow2/1.5.1": { + "pom": "sha256-Mh3bt+5v5PU96mtM1tt0FU1r+kI5HB92OzYbn0hazwU=" + }, + "org/ow2/asm#asm-analysis/9.9.1": { + "jar": "sha256-YmC//I7ACN0bcTcCx5lOLJTRiKPaW++ehyeKFt9qdSI=", + "pom": "sha256-NiF+gtimATTPIQ+A63bdrllVkcYIXKuBa1qhDOmfy6A=" + }, + "org/ow2/asm#asm-tree/9.9.1": { + "jar": "sha256-DzVVCWtyC4ILusqwtRVYm+4CAL7gmb2hTFYXOK6De6E=", + "pom": "sha256-Z/7kRrpRKHEwBzjw+Vb2GlAKhS9oYf9w8KPHvwwPpAU=" + }, + "org/ow2/asm#asm-util/9.9.1": { + "jar": "sha256-xeu76vaBJq8JS0L6SAD1m8RBOr0C2Vua761yLNJX4gc=", + "pom": "sha256-Unlp0IpNdfm9r5y/ODfphpaimJC8AX2V/Kb/gQ8NcEw=" + }, + "org/ow2/asm#asm/9.9.1": { + "jar": "sha256-bzgoohXJIAWaXvovtVwjPWxU7FytypnOGxvdEAd8fd0=", + "pom": "sha256-rKaN7pui9s2Q/95yjv3H4+v89Z8/Qfv+JI0tAdW4Zq8=" + }, + "org/pf4j#pf4j-parent/3.14.1": { + "pom": "sha256-fg1Zji5UxChrSIdPivbz4HcxU7vsbuyJoIgNBn9JEmM=" + }, + "org/pf4j#pf4j-update/2.3.0": { + "jar": "sha256-ecnWJAzagsPTHuelcitjWj03rVjBJKTbDd6kAUXDD0U=", + "pom": "sha256-UYnVbbrkEiTpD2l3vGFFOBOlLgvE4ITO6eaa8GUsZFU=" + }, + "org/pf4j#pf4j/3.14.1": { + "jar": "sha256-wbGPm+WydcEfJ0RH7nqJ0JvgDN1C3OR15wi1T/zxVjA=", + "pom": "sha256-lcWEOUJxevXN/lGIuY3sADRDnoCXi+DvZ2N+poQVSBg=" + }, + "org/reactivestreams#reactive-streams/1.0.4": { + "jar": "sha256-91yll3ibPaxY9hhXuawuEDSmj6Zy2zUFWo+0UJ4yXyg=", + "pom": "sha256-VLoj2HotQ4VAyZ74eUoIVvxXOiVrSYZ4KDw8Z+8Yrag=" + }, + "org/slf4j#jcl-over-slf4j/2.0.17": { + "jar": "sha256-r/0GdxWJ6/5FS7ETFaT0ZuyqE1uV8+eTlTTPHS/XBkw=", + "pom": "sha256-YaRGiqPB8zyfeSURHybiM5LZ9atx7gy8KHGD/BtSr8U=" + }, + "org/slf4j#jul-to-slf4j/2.0.17": { + "jar": "sha256-p6/NI7nP0UdeVclPlDuAjFkiA15+LCpcZaSHpBBrxTg=", + "pom": "sha256-OMMwoKtfCT5WK1L7Ya7GMK4cH5FAbjz1R3UEXlzPbAM=" + }, + "org/slf4j#log4j-over-slf4j/2.0.17": { + "jar": "sha256-y/MOr5U1ere6v5vhI9qcxwLw/oOyM5K3piWJ1gtYYtE=", + "pom": "sha256-35an+cEk2UwP2EfYccg6PgdGpP+4JxphJ2zPBCrhO6I=" + }, + "org/slf4j#slf4j-api/2.0.17": { + "jar": "sha256-e3UdlSBhlU1av+1xgcH2RdM2CRtnmJFZHWMynGIuuDI=", + "pom": "sha256-FQxAKH987NwhuTgMqsmOkoxPM8Aj22s0jfHFrJdwJr8=" + }, + "org/slf4j#slf4j-api/2.0.6": { + "jar": "sha256-LyqS1BCyaBOdfWO3XtJeIZlc/kEAwZvyNXfP28gHe9o=", + "pom": "sha256-i06GxT0ng2CPGuohPZBsW6xcBDPgCxkjm7FnZLn6NzY=" + }, + "org/slf4j#slf4j-bom/2.0.16": { + "pom": "sha256-BWYEjsglzfKHWGIK9k2eFK44qc2HSN1vr6bfSkGUwnk=" + }, + "org/slf4j#slf4j-bom/2.0.17": { + "pom": "sha256-940ntkK0uIbrg5/BArXNn+fzDzdZn/5oGFvk4WCQMek=" + }, + "org/slf4j#slf4j-jdk-platform-logging/2.0.16": { + "jar": "sha256-u4I0hmamlSWNanqkfxZHBDVfNFKkJmzv3QBuyq36qkU=", + "pom": "sha256-sRuGhP3f0kiJrWScdnyngwYbFrttg6FcOWRQt+qszXY=" + }, + "org/slf4j#slf4j-parent/2.0.16": { + "pom": "sha256-CaC0zIFNcnRhbJsW1MD9mq8ezIEzNN5RMeVHJxsZguU=" + }, + "org/slf4j#slf4j-parent/2.0.17": { + "pom": "sha256-lc1x6FLf2ykSbli3uTnVfsKy5gJDkYUuC1Rd7ggrvzs=" + }, + "org/slf4j#slf4j-parent/2.0.6": { + "pom": "sha256-FIJlDL4x5AjB3IkCHLrh0wRK1KAb+PYro2C2qBOhMSQ=" + }, + "org/sonatype/oss#oss-parent/3": { + "pom": "sha256-DCeIkmfAlGJEYRaZcJPGcVzMAMKzqVTmZDRDDY9Nrt4=" + }, + "org/sonatype/oss#oss-parent/5": { + "pom": "sha256-FnjUEgpYXYpjATGu7ExSTZKDmFg7fqthbufVqH9SDT0=" + }, + "org/sonatype/oss#oss-parent/7": { + "pom": "sha256-tR+IZ8kranIkmVV/w6H96ne9+e9XRyL+kM5DailVlFQ=" + }, + "org/sonatype/oss#oss-parent/9": { + "pom": "sha256-+0AmX5glSCEv+C42LllzKyGH7G8NgBgohcFO8fmCgno=" + }, + "org/spockframework#spock-bom/2.3-groovy-4.0": { + "pom": "sha256-3w9N3zyrKuEDI+h54nquyXSkA6xiitjMsi0T6b9mRBk=" + }, + "org/springframework#spring-framework-bom/6.2.8": { + "module": "sha256-egWtlVb487hBe6li/qSGrQw56xvFDpoi3PGpswUZO0E=", + "pom": "sha256-+68htKdnj1FsxVZ9eEy4qyG7JCbj9NfOx+JqtMqyG2Y=" + }, + "org/testcontainers#testcontainers-bom/1.20.6": { + "pom": "sha256-OKLdmRxz50sJmGQoOqiJ2MNk1pUcrgB4l6vLe+t0APE=" + }, + "org/threeten#threetenbp/1.7.0": { + "jar": "sha256-hXkX0jGaTpLcHF4663Wg2shERe0xXnrD2Cu40rKYl38=", + "pom": "sha256-nLthSu/sbVcp7MrdZMmhnpshg/w6Dgk8APN2rPptC0Q=" + }, + "org/yaml#snakeyaml/2.2": { + "jar": "sha256-FGeTFEiggXaWrigFt7iyC/sIJlK/nE767VKJMNxJOJs=", + "pom": "sha256-6YLq3HiMac8uTeUKn2MrGCwx26UGEoMNNI/EtLqN19Y=" + }, + "org/yaml#snakeyaml/2.4": { + "pom": "sha256-4VSjIxzWzeaKq/J0/RiWTUmpwaX16e079HHprnvfCOY=" + }, + "org/yaml#snakeyaml/2.5": { + "jar": "sha256-5mgqzxrOd1CO8TZJy/T40J0s9UV722HSX/tqwCM9eN0=", + "pom": "sha256-ugGuenRMtS/o7POwI8vDLgzMjGvu+fJt53pHgII5RH0=" + }, + "software/amazon/awssdk#annotations/2.46.8": { + "jar": "sha256-JbIQu2qULihWjPH/6+SkEHlbJvG1T9J7hHlJ0Dj5vU4=", + "pom": "sha256-F5w3qGxWIyV7HrTcBHK20H9GiUipwOSA2h4km00I24Q=" + }, + "software/amazon/awssdk#apache-client/2.46.8": { + "jar": "sha256-FwhWuOCHovA0JYF4/1KyfyJQ3ncc/R2mQzK7nr+KAGI=", + "pom": "sha256-Nok2VDeir1cQZl0vM/gu2JAEvzXRZqa7Nw3gIzOuH9k=" + }, + "software/amazon/awssdk#apache5-client/2.46.8": { + "jar": "sha256-1MozjH/hWoPv4Rm8gJimlcbK1+JZaVtBX4xNWIS/0SQ=", + "pom": "sha256-Q4u13ImxuDx2ImMEsvRldxy7Qz5qpEdJL0NwJekV0Lk=" + }, + "software/amazon/awssdk#arns/2.46.8": { + "jar": "sha256-nvg7J7ry39VT0luEhrJ1+79a7IxZoLZd7roCgY1agI0=", + "pom": "sha256-dNTOmAZBcFNGCK/8Lgmcvh+nDtvNEoxaJnIVCF7EOaY=" + }, + "software/amazon/awssdk#auth/2.46.8": { + "jar": "sha256-zo5ZqyyrNk2GQFSoX+QaE5F0RQbRD3U8E8UawyDhc1s=", + "pom": "sha256-/rnv2lJuFDYyhMqbkslOCMeegZpCQvmxHZxLWHi3pWU=" + }, + "software/amazon/awssdk#aws-core/2.46.8": { + "jar": "sha256-BrSW6EQfxUwCHKOKCsO5imnILr/W2Jpsu5WX81jVV/A=", + "pom": "sha256-Vbdp5BWWFYzaiN/drZDj4val+WREt6Lu8Gn3ow8fkn4=" + }, + "software/amazon/awssdk#aws-crt-client/2.46.8": { + "jar": "sha256-07PYF+OT91QTy2PCDnABf7Sr6bCW9dR3Tys9FOGCj5Q=", + "pom": "sha256-fHtHFQprzSiJ9tQhOvri7l7c6fJDGHvUqDjntRcDS3I=" + }, + "software/amazon/awssdk#aws-json-protocol/2.46.8": { + "jar": "sha256-cKYQTaTnFo2oGdYPzRJZsYJ30DxsQQ2bJAUHvX00u3E=", + "pom": "sha256-GikOqD32YVC1zM1Mlaj7G8/vp3BWbh73nXm8FsmDrgA=" + }, + "software/amazon/awssdk#aws-query-protocol/2.46.8": { + "jar": "sha256-cSC/1jKvA+gxQQ4VluC+sAuQSzJzTP5t2zuyWrtH5/Q=", + "pom": "sha256-jaafXSlhAknXDHgBYjZb9B843uOBQ5h0pQKlIeIzCtM=" + }, + "software/amazon/awssdk#aws-sdk-java-pom/2.31.66": { + "pom": "sha256-lnhpoZRGpSTZNm16fq456whvbgNaLHV7pN8msAGLFpY=" + }, + "software/amazon/awssdk#aws-sdk-java-pom/2.46.8": { + "pom": "sha256-xr/MpgdjOrXMeGKlEKj57I9Ur38UDm095mnn76sVnyE=" + }, + "software/amazon/awssdk#aws-xml-protocol/2.46.8": { + "jar": "sha256-HPimbF9/QUPgxmG/obVqDzYKu2x0sDNi/LAgCjo2FXA=", + "pom": "sha256-T47oCdoo5+MQpO1TwN9MzUaZdpmecSMY4NRy97V8V5A=" + }, + "software/amazon/awssdk#batch/2.46.8": { + "jar": "sha256-jW7OPaifdCHknTAsa63xpkRACeRwb9JdbNTPZBIVZUQ=", + "pom": "sha256-Rb+IirhgiPN/S1Lvk+TDwFj014MRijvOy4R3Jce2jWg=" + }, + "software/amazon/awssdk#bom-internal/2.46.8": { + "pom": "sha256-Beaa7UMKxbBoq/qXw9Vl9LlMFqHCrDFRlF4vPTbCeW4=" + }, + "software/amazon/awssdk#bom/2.31.66": { + "pom": "sha256-C+RbP47w4sUWz4KWoUpSY/7PSkLWkpbLhK+maJnzIHA=" + }, + "software/amazon/awssdk#checksums-spi/2.46.8": { + "jar": "sha256-fAMsFrslPs6hFg2l9dPc8BOyJIeNndQP+7tQNLsmD/Y=", + "pom": "sha256-NWq47rXzMXNGZXno/G1aKyrw8c/K4S96u7WKrp/xrCs=" + }, + "software/amazon/awssdk#checksums/2.46.8": { + "jar": "sha256-ZKojVY26z6uNhpZqUMD146InvcVfD/4OKHcBu/3zj1Y=", + "pom": "sha256-sB3m2xfpxkJG/MOYSnRUko8qzu9Vb/HN2gi21265iq4=" + }, + "software/amazon/awssdk#cloudwatchlogs/2.46.8": { + "jar": "sha256-HD6T+HHL9ecJpkuMEyoI1qMvG9vsOqqYDpLdLMxGw24=", + "pom": "sha256-nb61YEL6kyuccKv4jQIxAPx0h3yiB00F2oany8m4Zag=" + }, + "software/amazon/awssdk#codecommit/2.46.8": { + "jar": "sha256-ct0+NYWyBUOvqNtrRm3HyJ5E1AqYdOXKgCSktbKZ5Nk=", + "pom": "sha256-By6nMKLO2JAAgCDhQ0W/jZiTa6uo+MRSCLDLgd7qr5Q=" + }, + "software/amazon/awssdk#core/2.46.8": { + "pom": "sha256-X7Txn2dzEW9c9Ef5e6DPsDuKn0yCgSI9/LyjBkOCCMw=" + }, + "software/amazon/awssdk#crt-core/2.46.8": { + "jar": "sha256-jenz/N3XR5HZqPXmbmn10YZSA6bePsFQQ8Nycz0Zv9w=", + "pom": "sha256-ASVFN0pKbesTgc01F0geCdN5F89q5patO1VZkhZ5LdE=" + }, + "software/amazon/awssdk#ec2/2.46.8": { + "jar": "sha256-ksYBwJs2LynTlOnRsiXl1awAmP6R/RCbmwDD5wb0ipA=", + "pom": "sha256-x2XyDstj4M5zf0iuC2GLemETDOFVrSjYLwWvV4DID84=" + }, + "software/amazon/awssdk#ecs/2.46.8": { + "jar": "sha256-0CBBB08X3HGnsqZ+RUAYyenaRyoyZbZsfWl71PEeriQ=", + "pom": "sha256-Y0OPd/Octasf1VLyLBRWFJkiXvJeaR8JdVawAob2HAE=" + }, + "software/amazon/awssdk#endpoints-spi/2.46.8": { + "jar": "sha256-i4CJg8QCsGn+nz6RvGFzfo/AHxcVo7g1qlzqeUQZ/AY=", + "pom": "sha256-sfQwuZjE6+qSEwCpgRp0LHY59TPzL+qUnioFLns+HOE=" + }, + "software/amazon/awssdk#http-auth-aws-eventstream/2.46.8": { + "jar": "sha256-GIw6lNQFj7W0NSNKj36Fyx9LKMqKzg1yQEEkWjQNaDg=", + "pom": "sha256-Jg4QxbN57l4oaJJAIccebv6HC3Mz4LvHDssX9SxYZWc=" + }, + "software/amazon/awssdk#http-auth-aws/2.46.8": { + "jar": "sha256-7BT6WGRyPskbEoLjdHi0o1dZ0/vRvcYJg4/3xN8gfWQ=", + "pom": "sha256-xhDxo4tPQVMStYwAos38sp9Yq8D2J+AODmUgtY0jQ1A=" + }, + "software/amazon/awssdk#http-auth-spi/2.46.8": { + "jar": "sha256-iizqovzQ61zWXB200KqkuA0dWIplTLOlvseFLU+ijOg=", + "pom": "sha256-SFrFEQap/QDzzTV0IDt62e3MTZSP1V5fOHMuvV1/A7Y=" + }, + "software/amazon/awssdk#http-auth/2.46.8": { + "jar": "sha256-LHn27iUOzSL7fTzAzTtV6mCFXHqZ0nDqEoueWmytb1Q=", + "pom": "sha256-b7K6FPauzGBRZLUwEC3xJQEgjBN7SRou9g2IL5jtyTg=" + }, + "software/amazon/awssdk#http-client-spi/2.46.8": { + "jar": "sha256-5CVvFkwQQjT7b2aFaMyKuVHJgwNIDEBmjMgrCEArDs0=", + "pom": "sha256-kM+PCMTv9xzpU+cqKK7enJdco7ide1pkm1K1L2ru3no=" + }, + "software/amazon/awssdk#http-clients/2.46.8": { + "pom": "sha256-mrtZn+3M+neKUxCSfkTSPnohQk1A27HA1KpQ2F0PIZ4=" + }, + "software/amazon/awssdk#iam/2.46.8": { + "jar": "sha256-OyZenYt/8m5YZ/JU144dKJPwbv0jI0qLkcboBa8LW1U=", + "pom": "sha256-rp7cCaDpDWZTgNuOF9CYlkLhdW2GJRHtaiHDHcJeqQ4=" + }, + "software/amazon/awssdk#identity-spi/2.46.8": { + "jar": "sha256-M0mfPnOVGTCYAbEvtxSQd8RkCtqraNbB/rQqtmxY14A=", + "pom": "sha256-9c+iRvcD595ILgzvqJJbBLChUmKBkTjAdEj9BaM5rX4=" + }, + "software/amazon/awssdk#json-utils/2.46.8": { + "jar": "sha256-Wby21L6vp0whKUvZ2UPfSRAkPPhgvRn5iSdR5A2VCcY=", + "pom": "sha256-K/bTEvSd28pvwTjnPp9t6WUTUdcpto7IsYeemxPZP2A=" + }, + "software/amazon/awssdk#metrics-spi/2.46.8": { + "jar": "sha256-pJLTZz0BJczJrB/G7NZQ67SHFhcM6ndE7SP9tYjQ5nI=", + "pom": "sha256-t77CvXuAOBPoJccTSSiH4eCHGHXd8efePx01wg2fjT4=" + }, + "software/amazon/awssdk#netty-nio-client/2.46.8": { + "jar": "sha256-cGXz3RbxKRR/r+VHLofVTLzYlGsP9Kh9crjx6t3Qh5E=", + "pom": "sha256-1ZB0PTfAGgpPssSD1fi6FfiH1lVBqccREQTHX2zGiWI=" + }, + "software/amazon/awssdk#profiles/2.46.8": { + "jar": "sha256-vagHhPxHJiyk/TyGPs9OXMgwYwZhaZ4kgjZ9va/SCbk=", + "pom": "sha256-kRhzQcHctaFmtN/qTRCR9BjWx1LehPXrlX850tuQweM=" + }, + "software/amazon/awssdk#protocol-core/2.46.8": { + "jar": "sha256-A/G3vk2CrfkCCa+6tpWe39udRhROgNNd+EqyRg9wEu4=", + "pom": "sha256-HDjXGeN3ecnf+pwPXl266/Vhqbrcf2ZwVcPpUAWWuDg=" + }, + "software/amazon/awssdk#protocols/2.46.8": { + "pom": "sha256-KU+fPQxr02Xg2Zlrx7m+fPJd0drH/wp/GcZY3vjbYmw=" + }, + "software/amazon/awssdk#regions/2.46.8": { + "jar": "sha256-fV808iOtD3PMKcRxq4dL/tLNGkPFgiRR/6gemMR8Mek=", + "pom": "sha256-n009dGB7NIVOqK9kjJ8QT3u18CCU8ryUZoToDMRV/Po=" + }, + "software/amazon/awssdk#retries-spi/2.46.8": { + "jar": "sha256-uJchNxHjnulsiWBkg45i3Aa0mmI+dhJfFb1JbRbab8w=", + "pom": "sha256-6cVkJr60GW72LQfIeelnbFPkv2sAgW1B+fiTi5kxdNs=" + }, + "software/amazon/awssdk#retries/2.46.8": { + "jar": "sha256-Jz4WnxGZJHk8PBhFJj25A7GoZsrY5q0EeylEzVdUs2U=", + "pom": "sha256-DQQsglSeTAh6BUMRftA51hBWBamN4gonD7SD2E0cm3M=" + }, + "software/amazon/awssdk#s3-transfer-manager/2.46.8": { + "jar": "sha256-sM1MI7NanyTelJQGw4fxq8g4te+r2qXpr7vve/WF+zE=", + "pom": "sha256-VVecC5U8SWNggNiRO3fG7pxI8zieJ4P6jTQ5/powvvw=" + }, + "software/amazon/awssdk#s3/2.46.8": { + "jar": "sha256-YpJc18yoiibCY/8MmubCbX+iIeAru4jLCa8H0qilWe4=", + "pom": "sha256-/y8MS3NL6jnkQT1ybAam7YpaGCWurZ3vvuApmkLt/ns=" + }, + "software/amazon/awssdk#sdk-core/2.46.8": { + "jar": "sha256-YHcjR11emmaESCglhChnkoGX27frdQ9YA3s4WbGfyk8=", + "pom": "sha256-4w2lmPVn2slrEwrGqcD/Bi1vyTkO6vPdFS64/sSjXh8=" + }, + "software/amazon/awssdk#services/2.46.8": { + "pom": "sha256-Egc9YtsXua8x3Q15UUEXdpOyV71k9Mg8fnc5pPBQH4I=" + }, + "software/amazon/awssdk#ses/2.46.8": { + "jar": "sha256-lOqd2T4oxRuHuhrODQx2V92oFYvaqQGGJCAY84NN7Rw=", + "pom": "sha256-2Jm0KqqjlR2oxV+XSMXaVAseL0HPRsPkOQFBuy2oU6Y=" + }, + "software/amazon/awssdk#sso/2.46.8": { + "jar": "sha256-SiQeaSL9h1e7LtJ0yqdxeyuXizh7uJ+k2/Q77mOPFo4=", + "pom": "sha256-4v7S5RTgXbM/LNy5zEoFENTo5j8DpZv2NPN04m97vz8=" + }, + "software/amazon/awssdk#ssooidc/2.46.8": { + "jar": "sha256-SG+OtfmGNkRusmOvaDqQ3BvInWZM6Xmi0Gvir+V6jfg=", + "pom": "sha256-6QuwvhxxQPTunjU9Xn4NwBzykMBvdmJh+kUXmcVodHs=" + }, + "software/amazon/awssdk#sts/2.46.8": { + "jar": "sha256-ap7cF+YaUsMgEx2yJ1ivhbx4VucRfOmXiaKhI6vsU/w=", + "pom": "sha256-N1R7wNX1X1w4zBgABo2/f71hJ2fxaUO+76tX4ke5E78=" + }, + "software/amazon/awssdk#third-party-jackson-core/2.46.8": { + "jar": "sha256-i7a0jp1HUvnoRjLtZUFP1aJUMXyHIt1Knb7vssaruYY=", + "pom": "sha256-qTOkOf+K2GC1WBPUUBkqiYbLkJf0rjoBdBjtNrqPfVw=" + }, + "software/amazon/awssdk#third-party/2.46.8": { + "pom": "sha256-epuZQf/R0lf/gPrVioj0vdfyE5xN8Wpoz+JNrySE/sA=" + }, + "software/amazon/awssdk#utils-lite/2.46.8": { + "jar": "sha256-7/WakCSV29rteN/UVKiqEKsJQT8WoSWdfRiy/MnBv74=", + "pom": "sha256-P9KtktqN4//BdzaxlhsYPI74oWKBSa0aDrAz1wTuWWM=" + }, + "software/amazon/awssdk#utils/2.46.8": { + "jar": "sha256-xbS2kCn4x7vODZ7ZA48KZAe3sLqwowpiY3n3tTlu9kM=", + "pom": "sha256-Ctg0eFtYzQgLIkZ8aXZzzdr4VIB34FVrpj5CMtmmU3M=" + }, + "software/amazon/awssdk/crt#aws-crt/0.46.1": { + "jar": "sha256-zucqb6YfLDjHs0G5ABjtPQsqn6FHKGUXbfGH2sdUepM=", + "pom": "sha256-XKGphaAy8NFOKt+oj0C1A/iL7kYkmcr9rW2r52Z/WIY=" + }, + "software/amazon/eventstream#eventstream/1.0.1": { + "jar": "sha256-DDfY5pYRfwLDAhkbgRCw0Osg+kEvzjTDomnsc8Fs6CI=", + "pom": "sha256-+UYMt5Sgp69oJ377V2lWno5mUVJQJ2w35ip+i9SyV8w=" + } + }, + "https://s3-eu-west-1.amazonaws.com/maven.seqera.io": { + "releases/io/seqera#lib-cloudinfo/1.0.0": { + "jar": "sha256-F9ZcGxAIOcD099bjYHD8oO1pf29A6UjyYB3h1eDhzb8=", + "module": "sha256-G1cmvYT3TjYoefFBOG9aRgDrvkW8FcXbRMG0EBJv5kM=", + "pom": "sha256-y8UAkK5QaeHPDN1D81n7peWgdJnL9jJ7i8VBL8IqVrM=" + }, + "releases/io/seqera#lib-httpx/2.3.0": { + "jar": "sha256-gGUxgn1m/xXFAKDbpPgEQU/E9GdECkGk3AOIC0QN/2s=", + "module": "sha256-UfONWzVJ5O9/wzDuDC5lG5e0hlMWSyNSKKKvWGmhA1c=", + "pom": "sha256-kp3zQNQB75G9XTfJ4YM82HfhUbiOnbBgp/FtHldCYY0=" + }, + "releases/io/seqera#lib-lang/1.1.0": { + "jar": "sha256-16lgFS7/libAHnSDvvKYupGuDxKZPy125YIWCY9BEdI=", + "module": "sha256-pXHQpYG30KI7M5aqEUzVOs+YhQxHVbi0zhRnicUTySk=", + "pom": "sha256-GiOxMhiInE+Z87zDkZbvTztJT5kVOjOlRGIEK/i7erg=" + }, + "releases/io/seqera#lib-lang/1.2.0": { + "jar": "sha256-lHqL/W4QXokDcttUE0QSioKH46AkSkXPSb5BsmNb1cE=", + "module": "sha256-dbH9U4E316aC7m16GHXE8lNx8PGcAfIdGKtfLGUDuGw=", + "pom": "sha256-ODiMyvDWmsS2hIqiXOdJbDdkFxJnd7xqStX27PkwREk=" + }, + "releases/io/seqera#lib-platform-oidc/0.1.0": { + "jar": "sha256-hyaGySjxfouPl8OZF0G1ppwyOlFRQV4XylhctHeKKVE=", + "module": "sha256-cXaxHvvucS5I7WFbGBOrAaXz2FHcr9ujtxzkSd7B4gM=", + "pom": "sha256-AeBHRPLZbSSx2z8jHKQ1jQRMgPjLYwnFAAgycBICo3E=" + }, + "releases/io/seqera#lib-retry/2.0.0": { + "module": "sha256-/CBYeLHQ3g2HEvvw0qQrLPxNsGwgBOjkHeqPU3nYAoc=", + "pom": "sha256-oWpIkVDCR8ropmv6N6DTZVvnLCXba5Jvrj6NC5xFdr0=" + }, + "releases/io/seqera#lib-retry/2.1.0": { + "jar": "sha256-rKFkzYa8s64zp1Yaw8yY7Nn6AgTgzBKu3scwk7CLIeo=", + "module": "sha256-yaQ7TyfZ/egklUC3GldS0dDzSEQDa3iVZgOFmboDRXk=", + "pom": "sha256-K63RagkR3kU0/oOMTk0UppUGqeXeY24mSkpvjYV/ELE=" + }, + "releases/io/seqera#lib-serde-gson/1.0.0": { + "jar": "sha256-9dquXvvyIxzfVT52aHyiMWgNmTzWlp7UOfBxF7jwyE4=", + "module": "sha256-8nVk16LeE5+oPvPYb8tDXlhMKpkK8VOyATUhpELBmBw=", + "pom": "sha256-wHMAp1XaH9SMEVcs5UdwqkijnJDw2CiRVKFgDlxqWGQ=" + }, + "releases/io/seqera#lib-serde-jackson/1.0.1": { + "jar": "sha256-bDIujYOpbncMT4B09DGg4586TAWU693jM2I17gL4asM=", + "module": "sha256-rf3ZTiG8Xr5e0CFX/Fg9gPneYtzBMHnLkZJLVtnw+Wg=", + "pom": "sha256-wmOJrt5YXtzudw+dDFSXz3GoTT/ZhKv2nwDaP35W5nM=" + }, + "releases/io/seqera#lib-serde-jackson/1.0.2": { + "jar": "sha256-m2doHxkfW3uYBYymmHIUl7BhHZinloEDaDMNFCOISWs=", + "module": "sha256-+Ggsw3bY94xfXUxfD299bSRmp7OmLFHcA3awDEYWsHE=", + "pom": "sha256-O84WNuDTjv/X6Nz+3PAZyZgja+YLQ/f9EzChjyvW8Sc=" + }, + "releases/io/seqera#lib-serde/1.2.0": { + "jar": "sha256-SkO/x7agWtaaqNkbKxQnGJ04hvg/I4ppei/Jl//7oKA=", + "module": "sha256-826ipGVu/IOkxqFJ8Tdc+a5qwp8DDLQHVk7/DcSdgJk=", + "pom": "sha256-xGa4k71c9F1sQULXMJO4umpDBdA1KSlOQqLYRjjSHls=" + }, + "releases/io/seqera#lib-trace/0.1.0": { + "jar": "sha256-RKIiVjF8aaA6pr2R5XIsnnP25UW1ndJSFvnlaHPtFVM=", + "module": "sha256-1UOM6CrRnBUS9TBNzvOF6BN0CNQxTLwrz0UlCHh4qSg=", + "pom": "sha256-cuYyaQgZKNkfT205ooyAHiqOy10G3o1yK4LrUwFUnDA=" + }, + "releases/io/seqera#lib-util-string/1.0.0": { + "jar": "sha256-UK/DZsoZ7YbbF/YJguYtNYifadrCe7ZYuN0oM/IeloE=", + "module": "sha256-aouYn9PCK4QV+7oanJ8nxcliMPCYAHyLwq+Yn3f8RoM=", + "pom": "sha256-R5TYAccEmlmHc8scxqJMEkjAE4yDpK4WmrFduWzIFkw=" + }, + "releases/io/seqera#npr-api/0.22.0": { + "jar": "sha256-LW3ujH54DcaW43KrQxGCAJTThEyyYkEALrDiRU5B/2g=", + "module": "sha256-lD6L88lWJcSmlDGPt8GnHWHosnwW7u/8+wGHnMEorXo=", + "pom": "sha256-p3NTwIh8HlAjdaN3pCuMWNWOJyFmMFpONJk7FqYktQQ=" + }, + "releases/io/seqera#npr-client/0.22.0": { + "jar": "sha256-coicDV/9qgliIsDZCDlVQIgDfy3luIcNqGVjtpATQEU=", + "module": "sha256-UgLbXzhFstvAYn+6w3tMGRTQRFpsqqMNLAXtRnF82wk=", + "pom": "sha256-8R6f7E5oyteLG5YFAuMuwlOqJOsrT58LNbllrFwpkPE=" + }, + "releases/io/seqera#sched-api/0.63.0": { + "jar": "sha256-sT5JBbZg7tYU6Q5KqINwze7g0BlepgmyWtDqz126DsU=", + "module": "sha256-CbuGZ9d4MQGlYAsjw50p0C7efduUQiaL10b7nlbjaF8=", + "pom": "sha256-4mru9mcpCwQi4/IxkyD/xVEKPz+4eSsEkEM1UBMSGJ0=" + }, + "releases/io/seqera#sched-client/0.63.0": { + "jar": "sha256-kqI1GMRhK/4KsBz6LOa7/W9SaoJxIF0XqULOmCTtvfY=", + "module": "sha256-z15UggQbmBv7vjwXVQDGm+/P4F3b0NrtPvINquT8u8s=", + "pom": "sha256-R9i4+yR37tLCjm3WjrxS3acZpmL1ZabcAOZeKje3sdQ=" + }, + "releases/io/seqera#wave-api/1.31.1": { + "jar": "sha256-zzozc4pUXpNNCLMHUsbtqVSehp6lBrlo6EJXyACeQ/A=", + "module": "sha256-gZ+Pxf12Age3aoRN/cgN98a3O60RcUSTuQ9HAqtEqh8=", + "pom": "sha256-YrWSqRBMLuZvoUzD2UjbDW1qFFskmpkPKqOuq2e1bco=" + }, + "releases/io/seqera#wave-utils/1.31.1": { + "jar": "sha256-img+l9xFiWhSkfJo8oZeRrWq9l9lM3rpYiqdnIzCHIw=", + "module": "sha256-8MtZZooRC+r6yGKCkPiSqhBtyi8hYCF98Tq0dFaX20A=", + "pom": "sha256-cPOvIzN1KISwvKZaGTems1DZcxmfgpHNB40cvDQLxEU=" + }, + "releases/org/apache/groovy#groovy-bom/4.0.21-patch.2": { + "module": "sha256-A38EDWOFyVE2tpRetXMsRbObHavHanSG0Z+Ea6iUErk=", + "pom": "sha256-DbAn/Ue8d61Hro5LY/gnyZwbDF0bcPTxtdeuSnPDXKk=" + }, + "releases/org/apache/groovy#groovy-console/4.0.21-patch.2": { + "jar": "sha256-5u2tAQZfe46pmvWkePVNScU3uw5u8uFCNdaVeELM5Aw=", + "module": "sha256-Xj/ZsAfVMWDtV72+R3RRdrVKmffOH/1ynAlwj2NwMzU=", + "pom": "sha256-C/44K5FvC04qagEWksqaa2QSKoDucSJGeI7b9O8dal8=" + }, + "snapshots/io/seqera#tower-api/1.158.0": { + "jar": "sha256-VEWAxetGqbxAvm0/TVci+zIKAgPBh80deFoqBVBMOOg=", + "module": "sha256-ox0xIsHa3LNPgJxGLEi9elJVO5g9oJSBeqOftP3z7xQ=", + "pom": "sha256-e2Q63xfgww+2E1aBqiKt0BYR98d0DxltnPEnF4pryY0=" + } + } +} \ No newline at end of file diff --git a/pkgs/by-name/ne/nextflow/package.nix b/pkgs/by-name/ne/nextflow/package.nix index 0567008ed940..e801ee4901e9 100644 --- a/pkgs/by-name/ne/nextflow/package.nix +++ b/pkgs/by-name/ne/nextflow/package.nix @@ -20,15 +20,24 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "nextflow"; - version = "25.10.2"; + version = "26.04.4"; + + __structuredAttrs = true; + + # Suggested as an improvement, but currently breaks nix-build -A nextflow.tests + # strictDeps = true; src = fetchFromGitHub { owner = "nextflow-io"; repo = "nextflow"; - rev = "c03082c9b816774c799660d22c2b56d72218fddc"; - hash = "sha256-k8B393GOsU1gs+ZS5x3VZUmz+n8lH8/cmXkpzU301lY="; + tag = "v${finalAttrs.version}"; + hash = "sha256-U0QHIzIbNe9dxqxhGAxJuskR9183UgGgLZQAGB7TKmo="; }; + buildInputs = [ + bash + ]; + nativeBuildInputs = [ makeWrapper gradle @@ -124,6 +133,7 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with lib.maintainers; [ Etjean mulatta + David-Moody ]; mainProgram = "nextflow"; platforms = lib.platforms.unix; diff --git a/pkgs/by-name/ne/nextinspace/package.nix b/pkgs/by-name/ne/nextinspace/package.nix index 7358b27c857c..3dcafacb5b6b 100644 --- a/pkgs/by-name/ne/nextinspace/package.nix +++ b/pkgs/by-name/ne/nextinspace/package.nix @@ -10,7 +10,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { pyproject = true; src = fetchFromGitHub { - owner = "not-stirred"; + owner = "gideonshaked"; repo = "nextinspace"; tag = "v${finalAttrs.version}"; hash = "sha256-oEvRxaxx1pIco2+jm/3HUN0a0nqdo2VosCisM0MWTjU="; diff --git a/pkgs/by-name/ne/nexttrace/package.nix b/pkgs/by-name/ne/nexttrace/package.nix index 80c9b402f2d8..00d5fec04e37 100644 --- a/pkgs/by-name/ne/nexttrace/package.nix +++ b/pkgs/by-name/ne/nexttrace/package.nix @@ -7,15 +7,15 @@ buildGoModule (finalAttrs: { pname = "nexttrace"; - version = "1.7.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "nxtrace"; repo = "NTrace-core"; rev = "v${finalAttrs.version}"; - sha256 = "sha256-5J0P+HlfSt6wd/q7L/+6h7auQQBJkaA1NO053w32S8Y="; + sha256 = "sha256-yjG/nXnZs5ks80Q5Qq9TsN57nuSrPvp/jlYV3FXJqMk="; }; - vendorHash = "sha256-9g0OZczhIhM96eYFyAMxajpIkRgNUkn6QUZtl3O/xSM="; + vendorHash = "sha256-u5UTl3zNlnv0qk/Z60h1csp44ypn1V6i/aAThtTn3eg="; buildInputs = [ libpcap ]; diff --git a/pkgs/by-name/ne/nextvi/package.nix b/pkgs/by-name/ne/nextvi/package.nix index 85e24e8ba24e..16ecd75d1520 100644 --- a/pkgs/by-name/ne/nextvi/package.nix +++ b/pkgs/by-name/ne/nextvi/package.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "nextvi"; - version = "5.3"; + version = "7.0"; src = fetchFromGitHub { owner = "kyx0r"; repo = "nextvi"; tag = finalAttrs.version; - hash = "sha256-06z7zAJ8pRYhGQsNYgfSBDn8UgyGkeqXz6MHY+IaKYU="; + hash = "sha256-corF/cPmkCkpqg2UVLrMHL33pgp3ffBohbQzq95b+Ws="; }; nativeBuildInputs = [ installShellFiles ]; diff --git a/pkgs/by-name/ne/nexusmods-app/package.nix b/pkgs/by-name/ne/nexusmods-app/package.nix index 67f424342b6a..62f7b4fce9e4 100644 --- a/pkgs/by-name/ne/nexusmods-app/package.nix +++ b/pkgs/by-name/ne/nexusmods-app/package.nix @@ -70,7 +70,7 @@ buildDotnetModule (finalAttrs: { substituteInPlace src/NexusMods.Networking.NexusWebApi/NexusMods.Networking.NexusWebApi.csproj \ --replace-fail '$(BaseIntermediateOutputPath)games.json' ${./vendored/games.json} - ${lib.optionalString finalAttrs.doCheck '' + ${lib.optionalString finalAttrs.finalPackage.doCheck '' # For some reason these tests fail (intermittently?) with a zero timestamp touch tests/NexusMods.UI.Tests/WorkspaceSystem/*.verified.png ''} @@ -197,7 +197,7 @@ buildDotnetModule (finalAttrs: { mainProgram = "NexusMods.App"; homepage = "https://github.com/Nexus-Mods/NexusMods.App"; changelog = "https://github.com/Nexus-Mods/NexusMods.App/releases/tag/${finalAttrs.src.tag}"; - license = [ lib.licenses.gpl3Plus ]; + license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ l0b0 MattSturgeon diff --git a/pkgs/by-name/ne/nezha-agent/package.nix b/pkgs/by-name/ne/nezha-agent/package.nix index 2b27bf85d0c6..58537283a5d5 100644 --- a/pkgs/by-name/ne/nezha-agent/package.nix +++ b/pkgs/by-name/ne/nezha-agent/package.nix @@ -8,16 +8,16 @@ }: buildGoModule (finalAttrs: { pname = "nezha-agent"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "nezhahq"; repo = "agent"; tag = "v${finalAttrs.version}"; - hash = "sha256-KaONvjQY204VUppt2h78IE92LP+YJQ128BCuHGgMsBk="; + hash = "sha256-DDmxeWEIEJweqDbCDDTzK99cP28tz5bQpotyDMCTVuk="; }; - vendorHash = "sha256-/pygqSThb3YQ188Ro0vjP4yDN/yfPNRJQWP5FQ7sJ8c="; + vendorHash = "sha256-kYw1XgtlzRSQ0k8XK0lCJ0s2UaevVdmPunb9e7hoc70="; ldflags = [ "-s" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json index d21a47b78e53..24eb5b16fec2 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package-lock.json +++ b/pkgs/by-name/ne/nezha-theme-admin/package-lock.json @@ -8,73 +8,79 @@ "name": "admin-frontend", "version": "0.0.0", "dependencies": { - "@hookform/resolvers": "^5.2.2", - "@radix-ui/react-alert-dialog": "^1.1.15", - "@radix-ui/react-avatar": "^1.1.10", - "@radix-ui/react-checkbox": "^1.3.3", + "@hookform/resolvers": "^5.4.0", + "@radix-ui/react-alert-dialog": "^1.1.18", + "@radix-ui/react-avatar": "^1.2.1", + "@radix-ui/react-checkbox": "^1.3.6", "@radix-ui/react-dialog": "^1.1.15", - "@radix-ui/react-dropdown-menu": "^2.1.16", - "@radix-ui/react-label": "^2.1.7", - "@radix-ui/react-navigation-menu": "^1.2.14", - "@radix-ui/react-popover": "^1.1.15", - "@radix-ui/react-scroll-area": "^1.2.10", - "@radix-ui/react-select": "^2.2.6", - "@radix-ui/react-separator": "^1.1.7", - "@radix-ui/react-slot": "^1.2.3", - "@radix-ui/react-switch": "^1.2.6", - "@radix-ui/react-tabs": "^1.1.13", - "@tailwindcss/postcss": "^4.1.14", + "@radix-ui/react-dropdown-menu": "^2.1.19", + "@radix-ui/react-label": "^2.1.11", + "@radix-ui/react-navigation-menu": "^1.2.17", + "@radix-ui/react-popover": "^1.1.18", + "@radix-ui/react-scroll-area": "^1.2.13", + "@radix-ui/react-select": "^2.3.2", + "@radix-ui/react-separator": "^1.1.11", + "@radix-ui/react-slot": "^1.3.0", + "@radix-ui/react-switch": "^1.3.2", + "@radix-ui/react-tabs": "^1.1.16", + "@tailwindcss/postcss": "^4.3.2", "@tanstack/react-table": "^8.21.3", - "@trivago/prettier-plugin-sort-imports": "^5.2.2", - "@types/luxon": "^3.7.1", - "@xterm/addon-attach": "^0.11.0", - "@xterm/addon-fit": "^0.10.0", - "@xterm/xterm": "^5.5.0", + "@trivago/prettier-plugin-sort-imports": "^6.0.2", + "@types/luxon": "^3.7.2", + "@xterm/addon-attach": "^0.12.0", + "@xterm/addon-fit": "^0.11.0", + "@xterm/xterm": "^6.0.0", "class-variance-authority": "^0.7.1", "clsx": "^2.1.1", "cmdk": "^1.1.1", - "copy-to-clipboard": "^3.3.3", - "date-fns": "^4.1.0", - "framer-motion": "^12.23.22", - "i18next": "^25.5.3", - "i18next-browser-languagedetector": "^8.2.0", + "copy-to-clipboard": "^4.0.2", + "date-fns": "^4.4.0", + "framer-motion": "^12.42.2", + "i18next": "^26.3.4", + "i18next-browser-languagedetector": "^8.2.1", "jotai-zustand": "^0.6.0", - "lucide-react": "^0.545.0", + "lucide-react": "^1.23.0", "luxon": "^3.7.2", "next-themes": "^0.4.6", - "prettier-plugin-tailwindcss": "^0.6.14", - "react": "^19.2.0", - "react-day-picker": "^9.11.1", - "react-dom": "^19.2.0", - "react-hook-form": "^7.71.1", - "react-i18next": "^16.0.0", - "react-router-dom": "^7.9.4", - "react-virtuoso": "^4.14.1", + "prettier-plugin-tailwindcss": "^0.8.0", + "react": "^19.2.7", + "react-day-picker": "^10.0.1", + "react-dom": "^19.2.7", + "react-hook-form": "^7.80.0", + "react-i18next": "^17.0.8", + "react-router-dom": "^7.18.1", + "react-virtuoso": "^4.18.10", + "simple-icons": "^16.24.1", "sonner": "^2.0.7", - "swr": "^2.3.6", - "tailwind-merge": "^3.3.1", + "swr": "^2.4.2", + "tailwind-merge": "^3.6.0", "tailwindcss-animate": "^1.0.7", "vaul": "^1.1.2", - "zod": "^4.1.12", - "zustand": "^5.0.8" + "zod": "^4.4.3", + "zustand": "^5.0.14" }, "devDependencies": { - "@eslint/js": "^9.37.0", - "@types/node": "^24.7.0", - "@types/react": "^19.2.2", + "@eslint/js": "^10.0.1", + "@playwright/test": "^1.61.1", + "@testing-library/dom": "^10.4.1", + "@testing-library/react": "^16.3.2", + "@types/node": "^26.1.0", + "@types/react": "^19.2.17", "@types/react-dom": "^19.2.1", - "@vitejs/plugin-react": "^5.0.4", - "autoprefixer": "^10.4.21", - "eslint": "^9.37.0", - "eslint-plugin-react-hooks": "^7.0.0", - "eslint-plugin-react-refresh": "^0.4.23", - "globals": "^16.4.0", - "postcss": "8.4.24", - "swagger-typescript-api": "^13.2.15", - "tailwindcss": "3.4.19", - "typescript": "~5.9.3", - "typescript-eslint": "^8.46.0", - "vite": "^7.1.9" + "@vitejs/plugin-react": "^6.0.3", + "autoprefixer": "^10.5.2", + "eslint": "^10.6.0", + "eslint-plugin-react-hooks": "^7.1.1", + "eslint-plugin-react-refresh": "^0.5.3", + "globals": "^17.7.0", + "jsdom": "^29.1.1", + "postcss": "8.5.16", + "swagger-typescript-api": "^13.12.4", + "tailwindcss": "4.3.2", + "typescript": "~6.0.3", + "typescript-eslint": "^8.62.1", + "vite": "^8.1.3", + "vitest": "^4.1.9" } }, "node_modules/@alloc/quick-lru": { @@ -89,13 +95,155 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/@babel/code-frame": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.0.tgz", - "integrity": "sha512-9NhCeYjq9+3uxgdtp20LSiJXJvN0FeCtNGpJxuMFZ1Kv3cWUNb6DOhJwUvcVCzKGR66cw4njwM6hrJLqgOwbcw==", + "node_modules/@apidevtools/json-schema-ref-parser": { + "version": "14.0.1", + "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-14.0.1.tgz", + "integrity": "sha512-Oc96zvmxx1fqoSEdUmfmvvb59/KDOnUoJ7s2t7bISyAn0XEz57LCCw8k2Y4Pf3mwKaZLMciESALORLgfe2frCw==", + "dev": true, "license": "MIT", "dependencies": { - "@babel/helper-validator-identifier": "^7.28.5", + "@types/json-schema": "^7.0.15", + "js-yaml": "^4.1.0" + }, + "engines": { + "node": ">= 16" + }, + "funding": { + "url": "https://github.com/sponsors/philsturgeon" + } + }, + "node_modules/@apidevtools/openapi-schemas": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/@apidevtools/openapi-schemas/-/openapi-schemas-2.1.0.tgz", + "integrity": "sha512-Zc1AlqrJlX3SlpupFGpiLi2EbteyP7fXmUOGup6/DnkRgjP9bgMM/ag+n91rsv0U1Gpz0H3VILA/o3bW7Ua6BQ==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=10" + } + }, + "node_modules/@apidevtools/swagger-methods": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz", + "integrity": "sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg==", + "dev": true, + "license": "MIT" + }, + "node_modules/@apidevtools/swagger-parser": { + "version": "12.1.0", + "resolved": "https://registry.npmjs.org/@apidevtools/swagger-parser/-/swagger-parser-12.1.0.tgz", + "integrity": "sha512-e5mJoswsnAX0jG+J09xHFYQXb/bUc5S3pLpMxUuRUA2H8T2kni3yEoyz2R3Dltw5f4A6j6rPNMpWTK+iVDFlng==", + "dev": true, + "license": "MIT", + "dependencies": { + "@apidevtools/json-schema-ref-parser": "14.0.1", + "@apidevtools/openapi-schemas": "^2.1.0", + "@apidevtools/swagger-methods": "^3.0.2", + "ajv": "^8.17.1", + "ajv-draft-04": "^1.0.0", + "call-me-maybe": "^1.0.2" + }, + "peerDependencies": { + "openapi-types": ">=7" + } + }, + "node_modules/@apidevtools/swagger-parser/node_modules/ajv": { + "version": "8.20.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.20.0.tgz", + "integrity": "sha512-Thbli+OlOj+iMPYFBVBfJ3OmCAnaSyNn4M1vz9T6Gka5Jt9ba/HIR56joy65tY6kx/FCF5VXNB819Y7/GUrBGA==", + "dev": true, + "license": "MIT", + "dependencies": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/epoberezkin" + } + }, + "node_modules/@apidevtools/swagger-parser/node_modules/ajv-draft-04": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/ajv-draft-04/-/ajv-draft-04-1.0.0.tgz", + "integrity": "sha512-mv00Te6nmYbRp5DCwclxtt7yV/joXJPGS7nM+97GdxvuttCOfgI3K4U25zboyeX0O+myI8ERluxQe5wljMmVIw==", + "dev": true, + "license": "MIT", + "peerDependencies": { + "ajv": "^8.5.0" + }, + "peerDependenciesMeta": { + "ajv": { + "optional": true + } + } + }, + "node_modules/@apidevtools/swagger-parser/node_modules/json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "license": "MIT" + }, + "node_modules/@asamuzakjp/css-color": { + "version": "5.1.11", + "resolved": "https://registry.npmjs.org/@asamuzakjp/css-color/-/css-color-5.1.11.tgz", + "integrity": "sha512-KVw6qIiCTUQhByfTd78h2yD1/00waTmm9uy/R7Ck/ctUyAPj+AEDLkQIdJW0T8+qGgj3j5bpNKK7Q3G+LedJWg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@asamuzakjp/generational-cache": "^1.0.1", + "@csstools/css-calc": "^3.2.0", + "@csstools/css-color-parser": "^4.1.0", + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-tokenizer": "^4.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, + "node_modules/@asamuzakjp/dom-selector": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/dom-selector/-/dom-selector-7.1.1.tgz", + "integrity": "sha512-67RZDnYRc8H/8MLDgQCDE//zoqVFwajkepHZgmXrbwybzXOEwOWGPYGmALYl9J2DOLfFPPs6kKCqmbzV895hTQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "@asamuzakjp/generational-cache": "^1.0.1", + "@asamuzakjp/nwsapi": "^2.3.9", + "bidi-js": "^1.0.3", + "css-tree": "^3.2.1", + "is-potential-custom-element-name": "^1.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, + "node_modules/@asamuzakjp/generational-cache": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@asamuzakjp/generational-cache/-/generational-cache-1.0.1.tgz", + "integrity": "sha512-wajfB8KqzMCN2KGNFdLkReeHncd0AslUSrvHVvvYWuU8ghncRJoA50kT3zP9MVL0+9g4/67H+cdvBskj9THPzg==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, + "node_modules/@asamuzakjp/nwsapi": { + "version": "2.3.9", + "resolved": "https://registry.npmjs.org/@asamuzakjp/nwsapi/-/nwsapi-2.3.9.tgz", + "integrity": "sha512-n8GuYSrI9bF7FFZ/SjhwevlHc8xaVlb/7HmHelnc/PZXBD2ZR49NnN9sMMuDdEGPeeRQ5d0hqlSlEpgCX3Wl0Q==", + "dev": true, + "license": "MIT" + }, + "node_modules/@babel/code-frame": { + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.29.7.tgz", + "integrity": "sha512-Aup7aUOfpbAUg2ROOJN6Iw5f9DMBlzu0mIkm/malLQFN/YQgO48wCj0Kxa3sEHJvPVFg7siR+qRInwXd2qhQKw==", + "license": "MIT", + "dependencies": { + "@babel/helper-validator-identifier": "^7.29.7", "js-tokens": "^4.0.0", "picocolors": "^1.1.1" }, @@ -104,9 +252,9 @@ } }, "node_modules/@babel/compat-data": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.0.tgz", - "integrity": "sha512-T1NCJqT/j9+cn8fvkt7jtwbLBfLC/1y1c7NtCeXFRgzGTsafi68MRv8yzkYSapBnFA6L3U2VSc02ciDzoAJhJg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.29.7.tgz", + "integrity": "sha512-locTkQyKvwIEgBzVrn8693ebc97F2U8ZHjbXwDXJ5Fn2TCpNwTlKcaKLkdHop5c/icOFE7qt7Q9JC5hnKNa6Gg==", "devOptional": true, "license": "MIT", "engines": { @@ -114,22 +262,21 @@ } }, "node_modules/@babel/core": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.0.tgz", - "integrity": "sha512-CGOfOJqWjg2qW/Mb6zNsDm+u5vFQ8DxXfbM09z69p5Z6+mE1ikP2jUXw+j42Pf1XTYED2Rni5f95npYeuwMDQA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.29.7.tgz", + "integrity": "sha512-RgHBCvtjbOK2gXSNBNIkNoEc9qoVEtau3hj8gEqKQuL3HZAibKarWFEI3Lfm6EYKkLalOh8eSrj9b+ch9H/VBA==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-compilation-targets": "^7.28.6", - "@babel/helper-module-transforms": "^7.28.6", - "@babel/helpers": "^7.28.6", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/traverse": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-compilation-targets": "^7.29.7", + "@babel/helper-module-transforms": "^7.29.7", + "@babel/helpers": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/remapping": "^2.3.5", "convert-source-map": "^2.0.0", "debug": "^4.1.0", @@ -146,13 +293,13 @@ } }, "node_modules/@babel/generator": { - "version": "7.29.1", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.1.tgz", - "integrity": "sha512-qsaF+9Qcm2Qv8SRIMMscAvG4O3lJ0F1GuMo5HR/Bp02LopNgnZBC/EkbevHFeGs4ls/oPz9v+Bsmzbkbe+0dUw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.29.7.tgz", + "integrity": "sha512-DkXD5OJQaAQIdZ1bt3UZdEnHAn9Imd3IVBdX03UFe+ony9Ojw5pzr9YVKGDY1jt+Gcn/FnGkNf8r+Vj5NOJWtQ==", "license": "MIT", "dependencies": { - "@babel/parser": "^7.29.0", - "@babel/types": "^7.29.0", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7", "@jridgewell/gen-mapping": "^0.3.12", "@jridgewell/trace-mapping": "^0.3.28", "jsesc": "^3.0.2" @@ -162,14 +309,14 @@ } }, "node_modules/@babel/helper-compilation-targets": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.28.6.tgz", - "integrity": "sha512-JYtls3hqi15fcx5GaSNL7SCTJ2MNmjrkHXg4FSpOA/grxK8KwyZ5bubHsCq8FXCkua6xhuaaBit+3b7+VZRfcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.29.7.tgz", + "integrity": "sha512-wem6WaBj4NaVYVdNhLPPVacES6ZJ+KBBfSkTMD3YZxbP3rm3Di85tJU5ljaUNhaOynt+Aj0xruhYuzQBt8n71g==", "devOptional": true, "license": "MIT", "dependencies": { - "@babel/compat-data": "^7.28.6", - "@babel/helper-validator-option": "^7.27.1", + "@babel/compat-data": "^7.29.7", + "@babel/helper-validator-option": "^7.29.7", "browserslist": "^4.24.0", "lru-cache": "^5.1.1", "semver": "^6.3.1" @@ -179,38 +326,38 @@ } }, "node_modules/@babel/helper-globals": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.29.7.tgz", + "integrity": "sha512-3nQVUAtvkKH9zahfWgw96Jc/uFOmjACE1kQz82E2lqWmHBgjzbNlsC22nuQTfahmWeQtTq5nQ/4Nnd2A1wj4zA==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-imports": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.28.6.tgz", - "integrity": "sha512-l5XkZK7r7wa9LucGw9LwZyyCUscb4x37JWTPz7swwFE/0FMQAGpiWUZn8u9DzkSBWEcK25jmvubfpw2dnAMdbw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.29.7.tgz", + "integrity": "sha512-ejHwrQQYcm9xnTivShn2IDOlIzInN34AXskvq9QicvCtEzq1Vzclu/tKF8Jq1Cg8JG2GL6/EmjgsCT7lXepE3g==", "devOptional": true, "license": "MIT", "dependencies": { - "@babel/traverse": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/traverse": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-module-transforms": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.6.tgz", - "integrity": "sha512-67oXFAYr2cDLDVGLXTEABjdBJZ6drElUSI7WKp70NrpyISso3plG9SAGEF6y7zbha/wOzUByWWTJvEDVNIUGcA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.29.7.tgz", + "integrity": "sha512-UPUVSyXbOh627KiCIGQSgwWzGeBKLkaJ9PJEdrngIwMSzxLR4jS4+f1f1jb7VzBbg8nFLaYotvVPFCTqdrmTAg==", "devOptional": true, "license": "MIT", "dependencies": { - "@babel/helper-module-imports": "^7.28.6", - "@babel/helper-validator-identifier": "^7.28.5", - "@babel/traverse": "^7.28.6" + "@babel/helper-module-imports": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7", + "@babel/traverse": "^7.29.7" }, "engines": { "node": ">=6.9.0" @@ -219,38 +366,28 @@ "@babel/core": "^7.0.0" } }, - "node_modules/@babel/helper-plugin-utils": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.28.6.tgz", - "integrity": "sha512-S9gzZ/bz83GRysI7gAD4wPT/AI3uCnY+9xn+Mx/KPs2JwHJIz1W8PZkg2cqyt3RNOBM8ejcXhV6y8Og7ly/Dug==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, "node_modules/@babel/helper-string-parser": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.29.7.tgz", + "integrity": "sha512-Pb5ijPrZ89GDH8223L4UP8i6QApWxs04RbPQJTeWDV0/keR2E36MeKnyr6LYmUUvqRRI+Iv87SuF1W6ErINzYw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-identifier": { - "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.29.7.tgz", + "integrity": "sha512-qehxGkRj55h/ff8EMaJ+cYhyaKlHIxqYDn682wQD7RNp9UujOQsHog2uS0r2vzr4pW+sXf90NeeayjcNaX3fFg==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/helper-validator-option": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.29.7.tgz", + "integrity": "sha512-N9ZErrD+yW5geCDtBqnOoxmR8+tNKiGuxKlDpuJxfsqpa2dFcexaziGAE/qoHLiDDreVNMupxGmSoNlyvsA3gw==", "devOptional": true, "license": "MIT", "engines": { @@ -258,26 +395,26 @@ } }, "node_modules/@babel/helpers": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.6.tgz", - "integrity": "sha512-xOBvwq86HHdB7WUDTfKfT/Vuxh7gElQ+Sfti2Cy6yIWNW05P8iUslOVcZ4/sKbE+/jQaukQAdz/gf3724kYdqw==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.29.7.tgz", + "integrity": "sha512-1k2lAGRMfHTcwuNYcCNUmaUffmQv8KWMfh2iJUUeRlwlwH4FdNG7mfPI10NPfLHJFThE4Tyr4mv7kTNZOiPuBg==", "devOptional": true, "license": "MIT", "dependencies": { - "@babel/template": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/parser": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.0.tgz", - "integrity": "sha512-IyDgFV5GeDUVX4YdF/3CPULtVGSXXMLh1xVIgdCgxApktqnQV0r7/8Nqthg+8YLGaAtdyIlo2qIdZrbCv4+7ww==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.29.7.tgz", + "integrity": "sha512-hnORnjP/1P/zFEndoeX+n+t1RwWRJiJpM/jO7FW32Kn9r5+sJB2JWOdYo4L6k78j15eCwY3Gm/7364B1EMwtNg==", "license": "MIT", "dependencies": { - "@babel/types": "^7.29.0" + "@babel/types": "^7.29.7" }, "bin": { "parser": "bin/babel-parser.js" @@ -286,74 +423,41 @@ "node": ">=6.0.0" } }, - "node_modules/@babel/plugin-transform-react-jsx-self": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.27.1.tgz", - "integrity": "sha512-6UzkCs+ejGdZ5mFFC/OCUrv028ab2fp1znZmCZjAOBKiBK2jXD1O+BPSfX8X2qjJ75fZBMSnQn3Rq2mrBJK2mw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, - "node_modules/@babel/plugin-transform-react-jsx-source": { - "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.27.1.tgz", - "integrity": "sha512-zbwoTsBruTeKB9hSq73ha66iFeJHuaFkUbwvqElnygoNbj/jHRsSeokowZFN3CZ64IvEqcmmkVe89OPXc7ldAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@babel/helper-plugin-utils": "^7.27.1" - }, - "engines": { - "node": ">=6.9.0" - }, - "peerDependencies": { - "@babel/core": "^7.0.0-0" - } - }, "node_modules/@babel/runtime": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz", - "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.29.7.tgz", + "integrity": "sha512-Nq8OhGWiZIZGV6hLHoyAKLLcJihP/xFeBMGJoUrxTX2psI8dCifzLhZISFb+VWS3wFMRDmCGw5R+dOySCqPLhw==", "license": "MIT", "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/template": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.28.6.tgz", - "integrity": "sha512-YA6Ma2KsCdGb+WC6UpBVFJGXL58MDA6oyONbjyF/+5sBgxY/dwkhLogbMT2GXXyU84/IhRw/2D1Os1B/giz+BQ==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.29.7.tgz", + "integrity": "sha512-puq+Gf35oI24FeN11LkoUQFqv9uwNeWpxXZi/Ji3rRIoKAzKnxRaZ+Gkj0vKS9ZCiTESfng1N9LyOyXvo+m+Gg==", "license": "MIT", - "peer": true, "dependencies": { - "@babel/code-frame": "^7.28.6", - "@babel/parser": "^7.28.6", - "@babel/types": "^7.28.6" + "@babel/code-frame": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/types": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@babel/traverse": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.0.tgz", - "integrity": "sha512-4HPiQr0X7+waHfyXPZpWPfWL/J7dcN1mx9gL6WdQVMbPnF3+ZhSMs8tCxN7oHddJE9fhNE7+lxdnlyemKfJRuA==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.29.7.tgz", + "integrity": "sha512-EhlfNQtZ+NK22w5BM61ciuiq1m58ed33Wr1Xan//ZRTy6hgjnwyCffRYwzsGXdASJSUJ1guZILsErh1eQcl+zw==", "license": "MIT", "dependencies": { - "@babel/code-frame": "^7.29.0", - "@babel/generator": "^7.29.0", - "@babel/helper-globals": "^7.28.0", - "@babel/parser": "^7.29.0", - "@babel/template": "^7.28.6", - "@babel/types": "^7.29.0", + "@babel/code-frame": "^7.29.7", + "@babel/generator": "^7.29.7", + "@babel/helper-globals": "^7.29.7", + "@babel/parser": "^7.29.7", + "@babel/template": "^7.29.7", + "@babel/types": "^7.29.7", "debug": "^4.3.1" }, "engines": { @@ -361,28 +465,28 @@ } }, "node_modules/@babel/types": { - "version": "7.29.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.0.tgz", - "integrity": "sha512-LwdZHpScM4Qz8Xw2iKSzS+cfglZzJGvofQICy7W7v4caru4EaAmyUuO6BGrbyQ2mYV11W0U8j5mBhd14dd3B0A==", + "version": "7.29.7", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.29.7.tgz", + "integrity": "sha512-4zBIxpPzowiZpusoFkyGVwakdRJUyuH5PxQ/PrqghfdFWWasvnCdPfQXHrenDai+gyLARulZjZowCOj6fjT4pA==", "license": "MIT", "dependencies": { - "@babel/helper-string-parser": "^7.27.1", - "@babel/helper-validator-identifier": "^7.28.5" + "@babel/helper-string-parser": "^7.29.7", + "@babel/helper-validator-identifier": "^7.29.7" }, "engines": { "node": ">=6.9.0" } }, "node_modules/@biomejs/js-api": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-4.0.0.tgz", - "integrity": "sha512-EOArR/6drRzM1/hwOIz1pZw90FL31Ud4Y7hEHGWVtMNmAwS9SrwZ8hMENGlLVXCeGW/kL46p8kX7eO6x9Nmezg==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@biomejs/js-api/-/js-api-6.0.0.tgz", + "integrity": "sha512-8HP7wexjQo5Np1J9h0B2x8L5G0GZpCacgjykxLHtvLPvF0hNqSG754oh8bxo+OSFDpVGMfSjmLO+ZY/5KbfjmQ==", "dev": true, "license": "MIT OR Apache-2.0", "peerDependencies": { - "@biomejs/wasm-bundler": "^2.3.0", - "@biomejs/wasm-nodejs": "^2.3.0", - "@biomejs/wasm-web": "^2.3.0" + "@biomejs/wasm-bundler": "^2.5.0", + "@biomejs/wasm-nodejs": "^2.5.0", + "@biomejs/wasm-web": "^2.5.0" }, "peerDependenciesMeta": { "@biomejs/wasm-bundler": { @@ -397,459 +501,203 @@ } }, "node_modules/@biomejs/wasm-nodejs": { - "version": "2.3.15", - "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.3.15.tgz", - "integrity": "sha512-MGt/D5Y3v2VQuhyGspB+26T1SickuQFC3+HUMe9seMSnDqoNNN4vyZdUoKcORe7DVBcqs9+eBzns15lEkq3AGw==", + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/@biomejs/wasm-nodejs/-/wasm-nodejs-2.5.2.tgz", + "integrity": "sha512-B0r7jLdCmXhq4+jnx1oA0/SChLy5G283r35HJr276T+w6qgqAPAhqfnlKs+UobclAfidNDbfj9ZmcuCijaHDxQ==", "dev": true, - "license": "MIT OR Apache-2.0", - "peer": true + "license": "MIT OR Apache-2.0" + }, + "node_modules/@bramus/specificity": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/@bramus/specificity/-/specificity-2.4.2.tgz", + "integrity": "sha512-ctxtJ/eA+t+6q2++vj5j7FYX3nRu311q1wfYH3xjlLOsczhlhxAg2FWNUXhpGvAw3BWo1xBcvOV6/YLc2r5FJw==", + "dev": true, + "license": "MIT", + "dependencies": { + "css-tree": "^3.0.0" + }, + "bin": { + "specificity": "bin/cli.js" + } + }, + "node_modules/@csstools/color-helpers": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/@csstools/color-helpers/-/color-helpers-6.1.0.tgz", + "integrity": "sha512-064IFJdjTfUqnjpCVpMOdbr8FLQBhinbZj6yRv2An2E41O/pLEXqfFRWqGq/SxlE5PEUYTlvWsG2r8MswAVvkg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "engines": { + "node": ">=20.19.0" + } + }, + "node_modules/@csstools/css-calc": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/@csstools/css-calc/-/css-calc-3.2.1.tgz", + "integrity": "sha512-DtdHlgXh5ZkA43cwBcAm+huzgJiwx3ZTWVjBs94kwz2xKqSimDA3lBgCjphYgwgVUMWatSM0pDd8TILB1yrVVg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=20.19.0" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-tokenizer": "^4.0.0" + } + }, + "node_modules/@csstools/css-color-parser": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@csstools/css-color-parser/-/css-color-parser-4.1.9.tgz", + "integrity": "sha512-paQcIaOO53Rk5+YrBaBjm/SgrV4INImjo2BT1DtQRYr+XeTRbeAYlS+jxXp9drqvKmtFnWRJKIalDLhZZDu42A==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "dependencies": { + "@csstools/color-helpers": "^6.1.0", + "@csstools/css-calc": "^3.2.1" + }, + "engines": { + "node": ">=20.19.0" + }, + "peerDependencies": { + "@csstools/css-parser-algorithms": "^4.0.0", + "@csstools/css-tokenizer": "^4.0.0" + } + }, + "node_modules/@csstools/css-parser-algorithms": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-parser-algorithms/-/css-parser-algorithms-4.0.0.tgz", + "integrity": "sha512-+B87qS7fIG3L5h3qwJ/IFbjoVoOe/bpOdh9hAjXbvx0o8ImEmUsGXN0inFOnk2ChCFgqkkGFQ+TpM5rbhkKe4w==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=20.19.0" + }, + "peerDependencies": { + "@csstools/css-tokenizer": "^4.0.0" + } + }, + "node_modules/@csstools/css-syntax-patches-for-csstree": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@csstools/css-syntax-patches-for-csstree/-/css-syntax-patches-for-csstree-1.1.6.tgz", + "integrity": "sha512-TcJCWFbXLPpJYq6z7bfOyjWYJDiDg2/I4gyUC9pqPNqHFRIey0EB0q0L5cSnQDfWJg8Jd6VadakxdIez/3zkqQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT-0", + "peerDependencies": { + "css-tree": "^3.2.1" + }, + "peerDependenciesMeta": { + "css-tree": { + "optional": true + } + } + }, + "node_modules/@csstools/css-tokenizer": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@csstools/css-tokenizer/-/css-tokenizer-4.0.0.tgz", + "integrity": "sha512-QxULHAm7cNu72w97JUNCBFODFaXpbDg+dP8b/oWFAZ2MTRppA3U00Y2L1HqaS4J6yBqxwa/Y3nMBaxVKbB/NsA==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/csstools" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/csstools" + } + ], + "license": "MIT", + "engines": { + "node": ">=20.19.0" + } }, "node_modules/@date-fns/tz": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.4.1.tgz", - "integrity": "sha512-P5LUNhtbj6YfI3iJjw5EL9eUAG6OitD0W3fWQcpQjDRc/QIsL0tRNuO1PcDvPccWL1fSTXXdE1ds+l95DV/OFA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@date-fns/tz/-/tz-1.5.0.tgz", + "integrity": "sha512-lwYN/vDPeNRULcepoE/LO2Pgx+7/RV+S9ARfbc9lr2DtGkOD7pAiruHvbR1RX3Qyf6ja47EWJDMsNK5vK08DJg==", "license": "MIT" }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.3.tgz", - "integrity": "sha512-9fJMTNFTWZMh5qwrBItuziu834eOCUcEqymSH7pY+zoMVEZg3gcPuBNxH1EvfVYe9h0x/Ptw8KBzv7qxb7l8dg==", - "cpu": [ - "ppc64" - ], + "node_modules/@emnapi/core": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/core/-/core-1.11.1.tgz", + "integrity": "sha512-RSvbQmHzdKzNsLYa/wHrbc3KN4sYLKAdPZxqiM2HATqv/SBk2/ENSHpvXGaLOMcsAyz0poEGqkmmKYG3OWiJEQ==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" + "dependencies": { + "@emnapi/wasi-threads": "1.2.2", + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/android-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.3.tgz", - "integrity": "sha512-i5D1hPY7GIQmXlXhs2w8AWHhenb00+GxjxRncS2ZM7YNVGNfaMxgzSGuO8o8SJzRc/oZwU2bcScvVERk03QhzA==", - "cpu": [ - "arm" - ], + "node_modules/@emnapi/runtime": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/@emnapi/runtime/-/runtime-1.11.1.tgz", + "integrity": "sha512-vgj7R3y3Wgx24IQaGPA/R6YFXLHVMOZ0uVEyIQPaWs+rd1AzfEMXlAC22FYwO1XkKR6NPsq7mUandH8oIRdZFw==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, - "node_modules/@esbuild/android-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.3.tgz", - "integrity": "sha512-YdghPYUmj/FX2SYKJ0OZxf+iaKgMsKHVPF1MAq/P8WirnSpCStzKJFjOjzsW0QQ7oIAiccHdcqjbHmJxRb/dmg==", - "cpu": [ - "arm64" - ], + "node_modules/@emnapi/wasi-threads": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/@emnapi/wasi-threads/-/wasi-threads-1.2.2.tgz", + "integrity": "sha512-c95qOXkHdydNKhscBTebqEC1CVAZpyqOfVfBzQ1qgzyl3gfeldUjIggDbIZgDKsHLgnsM+igH7TJ/eAasaVuMA==", "dev": true, "license": "MIT", "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.3.tgz", - "integrity": "sha512-IN/0BNTkHtk8lkOM8JWAYFg4ORxBkZQf9zXiEOfERX/CzxW3Vg1ewAhU7QSWQpVIzTW+b8Xy+lGzdYXV6UZObQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.3.tgz", - "integrity": "sha512-Re491k7ByTVRy0t3EKWajdLIr0gz2kKKfzafkth4Q8A5n1xTHrkqZgLLjFEHVD+AXdUGgQMq+Godfq45mGpCKg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.3.tgz", - "integrity": "sha512-vHk/hA7/1AckjGzRqi6wbo+jaShzRowYip6rt6q7VYEDX4LEy1pZfDpdxCBnGtl+A5zq8iXDcyuxwtv3hNtHFg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.3.tgz", - "integrity": "sha512-ipTYM2fjt3kQAYOvo6vcxJx3nBYAzPjgTCk7QEgZG8AUO3ydUhvelmhrbOheMnGOlaSFUoHXB6un+A7q4ygY9w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.3.tgz", - "integrity": "sha512-dDk0X87T7mI6U3K9VjWtHOXqwAMJBNN2r7bejDsc+j03SEjtD9HrOl8gVFByeM0aJksoUuUVU9TBaZa2rgj0oA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.3.tgz", - "integrity": "sha512-s6nPv2QkSupJwLYyfS+gwdirm0ukyTFNl3KTgZEAiJDd+iHZcbTPPcWCcRYH+WlNbwChgH2QkE9NSlNrMT8Gfw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.3.tgz", - "integrity": "sha512-sZOuFz/xWnZ4KH3YfFrKCf1WyPZHakVzTiqji3WDc0BCl2kBwiJLCXpzLzUBLgmp4veFZdvN5ChW4Eq/8Fc2Fg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.3.tgz", - "integrity": "sha512-yGlQYjdxtLdh0a3jHjuwOrxQjOZYD/C9PfdbgJJF3TIZWnm/tMd/RcNiLngiu4iwcBAOezdnSLAwQDPqTmtTYg==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.3.tgz", - "integrity": "sha512-WO60Sn8ly3gtzhyjATDgieJNet/KqsDlX5nRC5Y3oTFcS1l0KWba+SEa9Ja1GfDqSF1z6hif/SkpQJbL63cgOA==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.3.tgz", - "integrity": "sha512-APsymYA6sGcZ4pD6k+UxbDjOFSvPWyZhjaiPyl/f79xKxwTnrn5QUnXR5prvetuaSMsb4jgeHewIDCIWljrSxw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.3.tgz", - "integrity": "sha512-eizBnTeBefojtDb9nSh4vvVQ3V9Qf9Df01PfawPcRzJH4gFSgrObw+LveUyDoKU3kxi5+9RJTCWlj4FjYXVPEA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.3.tgz", - "integrity": "sha512-3Emwh0r5wmfm3ssTWRQSyVhbOHvqegUDRd0WhmXKX2mkHJe1SFCMJhagUleMq+Uci34wLSipf8Lagt4LlpRFWQ==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.3.tgz", - "integrity": "sha512-pBHUx9LzXWBc7MFIEEL0yD/ZVtNgLytvx60gES28GcWMqil8ElCYR4kvbV2BDqsHOvVDRrOxGySBM9Fcv744hw==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.27.3.tgz", - "integrity": "sha512-Czi8yzXUWIQYAtL/2y6vogER8pvcsOsk5cpwL4Gk5nJqH5UZiVByIY8Eorm5R13gq+DQKYg0+JyQoytLQas4dA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.3.tgz", - "integrity": "sha512-sDpk0RgmTCR/5HguIZa9n9u+HVKf40fbEUt+iTzSnCaGvY9kFP0YKBWZtJaraonFnqef5SlJ8/TiPAxzyS+UoA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.3.tgz", - "integrity": "sha512-P14lFKJl/DdaE00LItAukUdZO5iqNH7+PjoBm+fLQjtxfcfFE20Xf5CrLsmZdq5LFFZzb5JMZ9grUwvtVYzjiA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.3.tgz", - "integrity": "sha512-AIcMP77AvirGbRl/UZFTq5hjXK+2wC7qFRGoHSDrZ5v5b8DK/GYpXW3CPRL53NkvDqb9D+alBiC/dV0Fb7eJcw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.3.tgz", - "integrity": "sha512-DnW2sRrBzA+YnE70LKqnM3P+z8vehfJWHXECbwBmH/CU51z6FiqTQTHFenPlHmo3a8UgpLyH3PT+87OViOh1AQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.3.tgz", - "integrity": "sha512-NinAEgr/etERPTsZJ7aEZQvvg/A6IsZG/LgZy+81wON2huV7SrK3e63dU0XhyZP4RKGyTm7aOgmQk0bGp0fy2g==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.3.tgz", - "integrity": "sha512-PanZ+nEz+eWoBJ8/f8HKxTTD172SKwdXebZ0ndd953gt1HRBbhMsaNqjTyYLGLPdoWHy4zLU7bDVJztF5f3BHA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.3.tgz", - "integrity": "sha512-B2t59lWWYrbRDw/tjiWOuzSsFh1Y/E95ofKz7rIVYSQkUYBjfSgf6oeYPNWHToFRr2zx52JKApIcAS/D5TUBnA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.3.tgz", - "integrity": "sha512-QLKSFeXNS8+tHW7tZpMtjlNb7HKau0QDpwm49u0vUp9y1WOF+PEzkU84y9GqYaAVW8aH8f3GcBck26jh54cX4Q==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.3.tgz", - "integrity": "sha512-4uJGhsxuptu3OcpVAzli+/gWusVGwZZHTlS63hh++ehExkVT8SgiEf7/uC/PclrPPkLhZqGgCTjd0VWLo6xMqA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" + "dependencies": { + "tslib": "^2.4.0" } }, "node_modules/@eslint-community/eslint-utils": { @@ -895,118 +743,146 @@ } }, "node_modules/@eslint/config-array": { - "version": "0.21.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", - "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", + "version": "0.23.5", + "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz", + "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/object-schema": "^2.1.7", + "@eslint/object-schema": "^3.0.5", "debug": "^4.3.1", - "minimatch": "^3.1.2" + "minimatch": "^10.2.4" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@eslint/config-array/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@eslint/config-array/node_modules/brace-expansion": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/@eslint/config-array/node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.5" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@eslint/config-helpers": { - "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", - "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.6.0.tgz", + "integrity": "sha512-ii6Bw9jJ2zi2cWA2Z+9/QZ/+3DX6kwaV5Q986D/CdP3Lap3w/pgQZ373FV7byY/i7L4IRH/G43I5dz1ClsCbpA==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.17.0" + "@eslint/core": "^1.2.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/core": { - "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", - "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz", + "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==", "dev": true, "license": "Apache-2.0", "dependencies": { "@types/json-schema": "^7.0.15" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - } - }, - "node_modules/@eslint/eslintrc": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.3.tgz", - "integrity": "sha512-Kr+LPIUVKz2qkx1HAMH8q1q6azbqBAsXJUxBl/ODDuVPX45Z9DfwB8tPjTi6nNZ8BuM3nbJxC5zCAg5elnBUTQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "ajv": "^6.12.4", - "debug": "^4.3.2", - "espree": "^10.0.1", - "globals": "^14.0.0", - "ignore": "^5.2.0", - "import-fresh": "^3.2.1", - "js-yaml": "^4.1.1", - "minimatch": "^3.1.2", - "strip-json-comments": "^3.1.1" - }, - "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, - "node_modules/@eslint/eslintrc/node_modules/globals": { - "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/js": { - "version": "9.39.3", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.3.tgz", - "integrity": "sha512-1B1VkCq6FuUNlQvlBYb+1jDu/gV297TIs/OeiaSR9l1H27SVW55ONE1e1Vp16NqP683+xEGzxYtv4XCiDPaQiw==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-10.0.1.tgz", + "integrity": "sha512-zeR9k5pd4gxjZ0abRoIaxdc7I3nDktoXZk2qOv9gCNWx3mVwEn32VRhyLaRsDiJjTs0xq/T8mfPtyuXu7GWBcA==", "dev": true, "license": "MIT", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://eslint.org/donate" + }, + "peerDependencies": { + "eslint": "^10.0.0" + }, + "peerDependenciesMeta": { + "eslint": { + "optional": true + } } }, "node_modules/@eslint/object-schema": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", - "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz", + "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" } }, "node_modules/@eslint/plugin-kit": { - "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", - "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.2.tgz", + "integrity": "sha512-+CNAzxglkrpNf/kKywqQfk74QjtceuOE7Qm+AF8miRvPF/wmmK5+OJOgVh3AVTT3RP2mH3+FOaxlE5v72owk0A==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@eslint/core": "^0.17.0", + "@eslint/core": "^1.2.1", "levn": "^0.4.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" + } + }, + "node_modules/@exodus/bytes": { + "version": "1.15.1", + "resolved": "https://registry.npmjs.org/@exodus/bytes/-/bytes-1.15.1.tgz", + "integrity": "sha512-S6mL0yNB/Abt9Ei4tq8gDhcczc4S3+vQ4ra7vxnAf+YHC02srtqxKKZghx2Dq6p0e66THKwR6r8N6P95wEty7Q==", + "dev": true, + "license": "MIT", + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + }, + "peerDependencies": { + "@noble/hashes": "^1.8.0 || ^2.0.0" + }, + "peerDependenciesMeta": { + "@noble/hashes": { + "optional": true + } } }, "node_modules/@exodus/schemasafe": { @@ -1017,31 +893,31 @@ "license": "MIT" }, "node_modules/@floating-ui/core": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz", - "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==", + "version": "1.7.5", + "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz", + "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==", "license": "MIT", "dependencies": { - "@floating-ui/utils": "^0.2.10" + "@floating-ui/utils": "^0.2.11" } }, "node_modules/@floating-ui/dom": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz", - "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==", + "version": "1.7.6", + "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz", + "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==", "license": "MIT", "dependencies": { - "@floating-ui/core": "^1.7.4", - "@floating-ui/utils": "^0.2.10" + "@floating-ui/core": "^1.7.5", + "@floating-ui/utils": "^0.2.11" } }, "node_modules/@floating-ui/react-dom": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.7.tgz", - "integrity": "sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==", + "version": "2.1.8", + "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz", + "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==", "license": "MIT", "dependencies": { - "@floating-ui/dom": "^1.7.5" + "@floating-ui/dom": "^1.7.6" }, "peerDependencies": { "react": ">=16.8.0", @@ -1049,15 +925,15 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz", - "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==", + "version": "0.2.11", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz", + "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==", "license": "MIT" }, "node_modules/@hookform/resolvers": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.2.2.tgz", - "integrity": "sha512-A/IxlMLShx3KjV/HeTcTfaMxdwy690+L/ZADoeaTltLx+CVuzkeVIPuybK3jrRfw7YZnmdKsVVHAlEPIAEUNlA==", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/@hookform/resolvers/-/resolvers-5.4.0.tgz", + "integrity": "sha512-EIsqr/t/qbinPIhGjMdtvutIN1Kk4uwbROE9/UQ93CAVGR7GkA7Y92+fX80OzXi/OB67jVFYwKGO1WzkxmkFZw==", "license": "MIT", "dependencies": { "@standard-schema/utils": "^0.3.0" @@ -1067,29 +943,43 @@ } }, "node_modules/@humanfs/core": { - "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", + "version": "0.19.2", + "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.2.tgz", + "integrity": "sha512-UhXNm+CFMWcbChXywFwkmhqjs3PRCmcSa/hfBgLIb7oQ5HNb1wS0icWsGtSAUNgefHeI+eBrA8I1fxmbHsGdvA==", "dev": true, "license": "Apache-2.0", + "dependencies": { + "@humanfs/types": "^0.15.0" + }, "engines": { "node": ">=18.18.0" } }, "node_modules/@humanfs/node": { - "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", - "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", + "version": "0.16.8", + "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.8.tgz", + "integrity": "sha512-gE1eQNZ3R++kTzFUpdGlpmy8kDZD/MLyHqDwqjkVQI0JMdI1D51sy1H958PNXYkM2rAac7e5/CnIKZrHtPh3BQ==", "dev": true, "license": "Apache-2.0", "dependencies": { - "@humanfs/core": "^0.19.1", + "@humanfs/core": "^0.19.2", + "@humanfs/types": "^0.15.0", "@humanwhocodes/retry": "^0.4.0" }, "engines": { "node": ">=18.18.0" } }, + "node_modules/@humanfs/types": { + "version": "0.15.0", + "resolved": "https://registry.npmjs.org/@humanfs/types/-/types-0.15.0.tgz", + "integrity": "sha512-ZZ1w0aoQkwuUuC7Yf+7sdeaNfqQiiLcSRbfI08oAxqLtpXQr9AIVX7Ay7HLDuiLYAaFPu8oBYNq/QIi9URHJ3Q==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18.18.0" + } + }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", @@ -1163,65 +1053,74 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@nodelib/fs.scandir": { - "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@napi-rs/wasm-runtime/-/wasm-runtime-1.1.6.tgz", + "integrity": "sha512-ZLv/JdUfkvOy9eCnnBaGfiO+XimbjebAeO+MRQqD/B+FR1tnRN0tpKSJHRbE8sFfS6aqsXZ67TQjfwfsxULVbg==", + "dev": true, "license": "MIT", + "optional": true, "dependencies": { - "@nodelib/fs.stat": "2.0.5", - "run-parallel": "^1.1.9" + "@tybys/wasm-util": "^0.10.3" }, - "engines": { - "node": ">= 8" + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1" } }, - "node_modules/@nodelib/fs.stat": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "node_modules/@oxc-project/types": { + "version": "0.138.0", + "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.138.0.tgz", + "integrity": "sha512-1a7ZKmrRTCoN1XMZ4L0PyyqrMnrNlLyPuOkdSX2MZg7IiIGRUyurNhAm73ptDOraoBcIordsIGKNPKUzy3ZmfA==", + "dev": true, "license": "MIT", - "engines": { - "node": ">= 8" + "funding": { + "url": "https://github.com/sponsors/Boshen" } }, - "node_modules/@nodelib/fs.walk": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", - "license": "MIT", + "node_modules/@playwright/test": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/@playwright/test/-/test-1.61.1.tgz", + "integrity": "sha512-8nKv6+0RJSL9FE4jYOEGXnPeM/Hg12qZpmqzZjRh3qM0Y7c3z1mrOTfFLids72RDQYVh9WpLEfR5WdpNX4fkig==", + "dev": true, + "license": "Apache-2.0", "dependencies": { - "@nodelib/fs.scandir": "2.1.5", - "fastq": "^1.6.0" + "playwright": "1.61.1" + }, + "bin": { + "playwright": "cli.js" }, "engines": { - "node": ">= 8" + "node": ">=18" } }, "node_modules/@radix-ui/number": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.1.tgz", - "integrity": "sha512-MkKCwxlXTgz6CFoJx3pCwn07GKp36+aZyu/u2Ln2VrA5DcdyCZkASEDBTd8x5whTQQL5CiYf4prXKLcgQdv29g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.2.tgz", + "integrity": "sha512-ceTwaxc4I5IOi97DgCotl3pqiyRGvffcc0oOsE2dQYaJOFIDsDt4VWG6xEbg1QePv9QWausCEIppud/tJ1wNig==", "license": "MIT" }, "node_modules/@radix-ui/primitive": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz", - "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.4.tgz", + "integrity": "sha512-7AdCK9PQyiljKoBDbN8OuctCbd/esdwZPQ8RtOE3SsyQtUpiPb+ND75q0jEhC1m1ecBI0MFNeLJvwIh9iKHRcQ==", "license": "MIT" }, "node_modules/@radix-ui/react-alert-dialog": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.15.tgz", - "integrity": "sha512-oTVLkEw5GpdRe29BqJ0LSDFWI3qu0vR1M0mUkOQWDIUnY/QIkLpgDMWuKxP94c2NAC2LGcgVhG1ImF3jkZ5wXw==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-alert-dialog/-/react-alert-dialog-1.1.18.tgz", + "integrity": "sha512-6c2cXpNlAgHDhKguK24XcWHHayMpK+lk7/WwBXBco+ZJ4Dv7xP++GBM280KgTD/HCRu3jSdfe8WQiZssonYaIA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-dialog": "1.1.15", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-dialog": "1.1.18", + "@radix-ui/react-primitive": "2.1.7" }, "peerDependencies": { "@types/react": "*", @@ -1238,31 +1137,13 @@ } } }, - "node_modules/@radix-ui/react-alert-dialog/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-arrow": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.7.tgz", - "integrity": "sha512-F+M1tLhO+mlQaOWspE8Wstg+z6PwxwRd8oQ8IXceWz92kfAmalTRf0EjrouQeo7QssEPfCn05B4Ihs1K9WQ/7w==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.11.tgz", + "integrity": "sha512-Kdil9BB1rIFC/khmf4hC35bn8701AJcizTU7G7cUbEbk5XqqbjDuHW60uUfKqO5WojjZcbAW51Q7P0hRmMLw8A==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.3" + "@radix-ui/react-primitive": "2.1.7" }, "peerDependencies": { "@types/react": "*", @@ -1280,54 +1161,16 @@ } }, "node_modules/@radix-ui/react-avatar": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.1.11.tgz", - "integrity": "sha512-0Qk603AHGV28BOBO34p7IgD5m+V5Sg/YovfayABkoDDBM5d3NCx0Mp4gGrjzLGes1jV5eNOE1r3itqOR33VC6Q==", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-avatar/-/react-avatar-1.2.1.tgz", + "integrity": "sha512-+8PWoLLZv3AVb5m0pvoiOca/bQGzc9vPVb+982HB2x3Un0DpYEPM3zLMl4oqRpBsocJuNqLkiv/HXTnTrlwr4g==", "license": "MIT", "dependencies": { - "@radix-ui/react-context": "1.1.3", - "@radix-ui/react-primitive": "2.1.4", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-is-hydrated": "0.1.0", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-avatar/node_modules/@radix-ui/react-context": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.3.tgz", - "integrity": "sha512-ieIFACdMpYfMEjF0rEf5KLvfVyIkOz6PDGyNnP+u+4xQ6jny3VCgA4OgXOwNx2aUkxn8zx9fiVcM8CfFYv9Lxw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-avatar/node_modules/@radix-ui/react-primitive": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", - "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.4" + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-is-hydrated": "0.1.1", + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1345,19 +1188,19 @@ } }, "node_modules/@radix-ui/react-checkbox": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.3.tgz", - "integrity": "sha512-wBbpv+NQftHDdG86Qc0pIyXk5IR3tM8Vd0nWLKDcX8nNn4nXFOFwsKuqw2okA/1D/mpaAkmuyndrPJTYDNZtFw==", + "version": "1.3.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.3.6.tgz", + "integrity": "sha512-eUEUoGMDpfkgHWSE97ZZaUJtzR1M7EKnNIpD1Q16+8JR9NWghcaqMulx9PuCQ720w0UclfYn6FEbCdd5Hx087g==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-controllable-state": "1.2.2", - "@radix-ui/react-use-previous": "1.1.1", - "@radix-ui/react-use-size": "1.1.1" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-controllable-state": "1.2.3", + "@radix-ui/react-use-previous": "1.1.2", + "@radix-ui/react-use-size": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1375,15 +1218,15 @@ } }, "node_modules/@radix-ui/react-collection": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.7.tgz", - "integrity": "sha512-Fh9rGN0MoI4ZFUNyfFVNU4y9LUz93u9/0K+yLgA2bwRojxM8JU1DyvvMBabnZPBgMWREAJvU2jjVzq+LrFUglw==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.11.tgz", + "integrity": "sha512-djW9+zeg137KQdlPtmE8xnaD+K2rcXXMWFrSg0hsmYZ6HRbdTA7tDHFgpaW9+huWVEu0RCabL+985T4TA0BE7g==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3" + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-slot": "1.3.0" }, "peerDependencies": { "@types/react": "*", @@ -1400,28 +1243,10 @@ } } }, - "node_modules/@radix-ui/react-collection/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", - "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.3.tgz", + "integrity": "sha512-rYOP8OMnuuPMQF1uhPVlGNcCDlkokKqGFE3JcxFViIkAXP7EvFWUliJAstrapypaBLJNHbZL6jGhbVDGTwmVhA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1434,9 +1259,9 @@ } }, "node_modules/@radix-ui/react-context": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", - "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.4.tgz", + "integrity": "sha512-QwH4PO5urrbO+FaGd5Aglg+YJgWTyyuZ3g/6mKvsqraLkglDdckw9JafgL5McL5VEJ6EPNduPaT3ZE9BttDAqg==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1449,25 +1274,25 @@ } }, "node_modules/@radix-ui/react-dialog": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz", - "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.18.tgz", + "integrity": "sha512-apa28mldjMgORmE6g/w3sCcA0Y9UAVeeDVoozN4i7kOw12mLl9RBchfzK3Nn6qxOWjrZhK1Lfy7f07kyzxtnBw==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-focus-guards": "1.1.3", - "@radix-ui/react-focus-scope": "1.1.7", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-portal": "1.1.9", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3", - "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.14", + "@radix-ui/react-focus-guards": "1.1.4", + "@radix-ui/react-focus-scope": "1.1.11", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-portal": "1.1.13", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-slot": "1.3.0", + "@radix-ui/react-use-controllable-state": "1.2.3", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" + "react-remove-scroll": "^2.7.2" }, "peerDependencies": { "@types/react": "*", @@ -1484,28 +1309,10 @@ } } }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-direction": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.1.tgz", - "integrity": "sha512-1UEWRX6jnOA2y4H5WczZ44gOOjTEmlqv1uNW4GAJEO5+bauCBhv8snY65Iw5/VOS/ghKN9gr2KjnLKxrsvoMVw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.2.tgz", + "integrity": "sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1518,16 +1325,16 @@ } }, "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz", - "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.14.tgz", + "integrity": "sha512-4lUhWTWAjbDIqFrAPWJ3WqBOpO5YchVZ88X3nh6H9Lu5AFi5nCUeTPj3D8FSDmabmFeRe9ME0BDA4MwKTha5GQ==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-escape-keydown": "1.1.1" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-effect-event": "0.0.3" }, "peerDependencies": { "@types/react": "*", @@ -1545,18 +1352,18 @@ } }, "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.16.tgz", - "integrity": "sha512-1PLGQEynI/3OX/ftV54COn+3Sud/Mn8vALg2rWnBLnRaGtJDduNW/22XjlGgPdpcIbiQxjKtb7BkcjP00nqfJw==", + "version": "2.1.19", + "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.19.tgz", + "integrity": "sha512-HZccBkbK0LOi8nYKIp5jll/zIRW0cCOmG6WWyqsSpmXCU+ZlcBbTqIwlBvPCu886C5RVu6c/kHV7xSP8IgYNHw==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-menu": "2.1.16", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-controllable-state": "1.2.2" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-menu": "2.1.19", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { "@types/react": "*", @@ -1574,9 +1381,9 @@ } }, "node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz", - "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==", + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.4.tgz", + "integrity": "sha512-cot/aB/mOm0IYVYTTmQcEEK1M48lZWi8FlYe5nDPQQ8NYZUlXEFgncJ9p2Kzer3RKSrY7cTTpEMLZKNo9QoP5Q==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -1589,14 +1396,14 @@ } }, "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz", - "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.11.tgz", + "integrity": "sha512-Mn88Vg2whaRocGJNOH+DKFqYm6ySFPQaiwHNxZPyjn99B52KAEJWWY9NP83+nWdk2HM3rdov+STu9AG471Rt9w==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1" + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1614,12 +1421,12 @@ } }, "node_modules/@radix-ui/react-id": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", - "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.2.tgz", + "integrity": "sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1632,35 +1439,12 @@ } }, "node_modules/@radix-ui/react-label": { - "version": "2.1.8", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.8.tgz", - "integrity": "sha512-FmXs37I6hSBVDlO4y764TNz1rLgKwjJMQ0EGte6F3Cb3f4bIuHB/iLa/8I9VKkmOy+gNHq8rql3j686ACVV21A==", + "version": "2.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.11.tgz", + "integrity": "sha512-3PKvDDxOn62k0oV1n4QtNtD2vpu+zYjXR7ojLBPaO6SPvhy53yg0vAmgNeBQeJW5rV3dffoRG+HYfLBZuzw0CQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.4" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-label/node_modules/@radix-ui/react-primitive": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", - "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.4" + "@radix-ui/react-primitive": "2.1.7" }, "peerDependencies": { "@types/react": "*", @@ -1678,29 +1462,29 @@ } }, "node_modules/@radix-ui/react-menu": { - "version": "2.1.16", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.16.tgz", - "integrity": "sha512-72F2T+PLlphrqLcAotYPp0uJMr5SjP5SL01wfEspJbru5Zs5vQaSHb4VB3ZMJPimgHHCHG7gMOeOB9H3Hdmtxg==", + "version": "2.1.19", + "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.19.tgz", + "integrity": "sha512-Mht9BVd1AIsNFVQr4KG3bIK7XQn5IXF0TL/2ObsrzOdc1loaly/+kBDL5roSCYn8j8XZkvpOD0WYLz2FQtH1Eg==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-collection": "1.1.7", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-focus-guards": "1.1.3", - "@radix-ui/react-focus-scope": "1.1.7", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-popper": "1.2.8", - "@radix-ui/react-portal": "1.1.9", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-roving-focus": "1.1.11", - "@radix-ui/react-slot": "1.2.3", - "@radix-ui/react-use-callback-ref": "1.1.1", + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-collection": "1.1.11", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.14", + "@radix-ui/react-focus-guards": "1.1.4", + "@radix-ui/react-focus-scope": "1.1.11", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-popper": "1.3.2", + "@radix-ui/react-portal": "1.1.13", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-roving-focus": "1.1.14", + "@radix-ui/react-slot": "1.3.0", + "@radix-ui/react-use-callback-ref": "1.1.2", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" + "react-remove-scroll": "^2.7.2" }, "peerDependencies": { "@types/react": "*", @@ -1717,44 +1501,26 @@ } } }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-navigation-menu": { - "version": "1.2.14", - "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.14.tgz", - "integrity": "sha512-YB9mTFQvCOAQMHU+C/jVl96WmuWeltyUEpRJJky51huhds5W2FQr1J8D/16sQlf0ozxkPK8uF3niQMdUwZPv5w==", + "version": "1.2.17", + "resolved": "https://registry.npmjs.org/@radix-ui/react-navigation-menu/-/react-navigation-menu-1.2.17.tgz", + "integrity": "sha512-fYeYQvbeNn5AQk2RBbpO7koLm2YbS00UYxC/IL2sgLlninEH5UNIv+X3E0KJ1Vy4WIo+dhN9w8GNqSHhbHWCIg==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-collection": "1.1.7", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-controllable-state": "1.2.2", - "@radix-ui/react-use-layout-effect": "1.1.1", - "@radix-ui/react-use-previous": "1.1.1", - "@radix-ui/react-visually-hidden": "1.2.3" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-collection": "1.1.11", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.14", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-controllable-state": "1.2.3", + "@radix-ui/react-use-layout-effect": "1.1.2", + "@radix-ui/react-use-previous": "1.1.2", + "@radix-ui/react-visually-hidden": "1.2.7" }, "peerDependencies": { "@types/react": "*", @@ -1772,26 +1538,26 @@ } }, "node_modules/@radix-ui/react-popover": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.15.tgz", - "integrity": "sha512-kr0X2+6Yy/vJzLYJUPCZEc8SfQcf+1COFoAqauJm74umQhta9M7lNJHP7QQS3vkvcGLQUbWpMzwrXYwrYztHKA==", + "version": "1.1.18", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.18.tgz", + "integrity": "sha512-qdXDes+eHlnMUGlBAAAe5EG7oOQvqsXuq4mq585diMudg80iB+jHbsSeG3+Q4eWNsogNyhqU2p/3i+Y0iEepqg==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-focus-guards": "1.1.3", - "@radix-ui/react-focus-scope": "1.1.7", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-popper": "1.2.8", - "@radix-ui/react-portal": "1.1.9", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3", - "@radix-ui/react-use-controllable-state": "1.2.2", + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-dismissable-layer": "1.1.14", + "@radix-ui/react-focus-guards": "1.1.4", + "@radix-ui/react-focus-scope": "1.1.11", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-popper": "1.3.2", + "@radix-ui/react-portal": "1.1.13", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-slot": "1.3.0", + "@radix-ui/react-use-controllable-state": "1.2.3", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" + "react-remove-scroll": "^2.7.2" }, "peerDependencies": { "@types/react": "*", @@ -1808,40 +1574,22 @@ } } }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-popper": { - "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.8.tgz", - "integrity": "sha512-0NJQ4LFFUuWkE7Oxf0htBKS6zLkkjBH+hM1uk7Ng705ReR8m/uelduy1DBo0PyBXPKVnBA6YBlU94MBGXrSBCw==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.3.2.tgz", + "integrity": "sha512-3QXNeMkdshed1MR3LNoiCirBywRFPkD8ETJa/HlPuLwSajaQixf2ro+isoDNJlGABg9ug41XuZpINZJIle4XWg==", "license": "MIT", "dependencies": { "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.7", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.1", - "@radix-ui/react-use-rect": "1.1.1", - "@radix-ui/react-use-size": "1.1.1", - "@radix-ui/rect": "1.1.1" + "@radix-ui/react-arrow": "1.1.11", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.2", + "@radix-ui/react-use-rect": "1.1.2", + "@radix-ui/react-use-size": "1.1.2", + "@radix-ui/rect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1859,13 +1607,13 @@ } }, "node_modules/@radix-ui/react-portal": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz", - "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==", + "version": "1.1.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.13.tgz", + "integrity": "sha512-z3oXfmaHLJTF1wktbjgD6cn9jiEbq3WSondB10LIuIt2m2Ym4iJlrW04/euMwENDdWDdE7z+OuY7Qyp1YpRSwA==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1883,13 +1631,12 @@ } }, "node_modules/@radix-ui/react-presence": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz", - "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==", + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.6.tgz", + "integrity": "sha512-zdTk4PlUO0E18HnZ3wYbW0KkJJxWCdiNYp6g6X1PtONFhxVkg01vliTJAmwIszU6mHiyBOoW9P0rAugl5/hULQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -1907,12 +1654,12 @@ } }, "node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", + "version": "2.1.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.7.tgz", + "integrity": "sha512-bC3NiwsprbxKjuon9l7X6BUTw7FPVzEYaL92MPEY5SCd/9hUTPXVFtVwRix7778wtRsVao+zE062gL79FZleeQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-slot": "1.2.3" + "@radix-ui/react-slot": "1.3.0" }, "peerDependencies": { "@types/react": "*", @@ -1929,39 +1676,21 @@ } } }, - "node_modules/@radix-ui/react-primitive/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.11.tgz", - "integrity": "sha512-7A6S9jSgm/S+7MdtNDSb+IU859vQqJ/QAtcYQcfFC6W8RS4IxIZDldLR0xqCFZ6DCyrQLjLPsxtTNch5jVA4lA==", + "version": "1.1.14", + "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.14.tgz", + "integrity": "sha512-8Qcnx9447tx/aCBgw6Jenfqg4Skq+vqab9mCBmuGNipIS5YXvL275wbKEu7+ICYHIlAPgCduUMJH1XOYewKF6Q==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-collection": "1.1.7", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-controllable-state": "1.2.2" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-collection": "1.1.11", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { "@types/react": "*", @@ -1979,20 +1708,20 @@ } }, "node_modules/@radix-ui/react-scroll-area": { - "version": "1.2.10", - "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.10.tgz", - "integrity": "sha512-tAXIa1g3sM5CGpVT0uIbUx/U3Gs5N8T52IICuCtObaos1S8fzsrPXG5WObkQN3S6NVl6wKgPhAIiBGbWnvc97A==", + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/@radix-ui/react-scroll-area/-/react-scroll-area-1.2.13.tgz", + "integrity": "sha512-7tncSubo2G0UY1e8rk+72qe3XRzrGnOLtZQ1PL1KoBfRUNX0NrJT5akb+0kfwSCc3gVR4wdHqyhAQBDpDNOwDw==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.1", - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/number": "1.1.2", + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2010,32 +1739,33 @@ } }, "node_modules/@radix-ui/react-select": { - "version": "2.2.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.2.6.tgz", - "integrity": "sha512-I30RydO+bnn2PQztvo25tswPH+wFBjehVGtmagkU78yMdwTwVf12wnAOF+AeP8S2N8xD+5UPbGhkUfPyvT+mwQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.3.2.tgz", + "integrity": "sha512-brXD6C/V0fVK0DDbscLVw6LsXrjQ+ay8jdOBaN+tLb4vsHsAMm6Gt6eT77wHX1Eq8GPtD5rJ+RxFtfDozsb4+Q==", "license": "MIT", "dependencies": { - "@radix-ui/number": "1.1.1", - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-collection": "1.1.7", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-focus-guards": "1.1.3", - "@radix-ui/react-focus-scope": "1.1.7", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-popper": "1.2.8", - "@radix-ui/react-portal": "1.1.9", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-controllable-state": "1.2.2", - "@radix-ui/react-use-layout-effect": "1.1.1", - "@radix-ui/react-use-previous": "1.1.1", - "@radix-ui/react-visually-hidden": "1.2.3", + "@radix-ui/number": "1.1.2", + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-collection": "1.1.11", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-dismissable-layer": "1.1.14", + "@radix-ui/react-focus-guards": "1.1.4", + "@radix-ui/react-focus-scope": "1.1.11", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-popper": "1.3.2", + "@radix-ui/react-portal": "1.1.13", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-slot": "1.3.0", + "@radix-ui/react-use-callback-ref": "1.1.2", + "@radix-ui/react-use-controllable-state": "1.2.3", + "@radix-ui/react-use-layout-effect": "1.1.2", + "@radix-ui/react-use-previous": "1.1.2", + "@radix-ui/react-visually-hidden": "1.2.7", "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" + "react-remove-scroll": "^2.7.2" }, "peerDependencies": { "@types/react": "*", @@ -2052,54 +1782,13 @@ } } }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, "node_modules/@radix-ui/react-separator": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.8.tgz", - "integrity": "sha512-sDvqVY4itsKwwSMEe0jtKgfTh+72Sy3gPmQpjqcQneqQ4PFmr/1I0YA+2/puilhggCe2gJcx5EBAYFkWkdpa5g==", + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.11.tgz", + "integrity": "sha512-jRhe86+8PF7VZ1u14eOWVOuh2BuAhALg/FT1VcMC4OHedMTRUazDnDlKTt+yxo5cRNKHMfmvZ4sSQtWDeMV4CQ==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.4" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-separator/node_modules/@radix-ui/react-primitive": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.4.tgz", - "integrity": "sha512-9hQc4+GNVtJAIEPEqlYqW5RiYdrr8ea5XQ0ZOnD6fgru+83kqT15mq2OCcbe8KnjRZl5vF3ks69AKz3kh1jrhg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.4" + "@radix-ui/react-primitive": "2.1.7" }, "peerDependencies": { "@types/react": "*", @@ -2117,12 +1806,12 @@ } }, "node_modules/@radix-ui/react-slot": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.4.tgz", - "integrity": "sha512-Jl+bCv8HxKnlTLVrcDE8zTMJ09R9/ukw4qBs/oZClOfoQk/cOTbDn+NceXfV7j09YPVQUryJPHurafcSg6EVKA==", + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.0.tgz", + "integrity": "sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==", "license": "MIT", "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" + "@radix-ui/react-compose-refs": "1.1.3" }, "peerDependencies": { "@types/react": "*", @@ -2135,18 +1824,18 @@ } }, "node_modules/@radix-ui/react-switch": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.2.6.tgz", - "integrity": "sha512-bByzr1+ep1zk4VubeEVViV592vu2lHE2BZY5OnzehZqOOgogN80+mNtCqPkhn2gklJqOpxWgPoYTSnhBCqpOXQ==", + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.3.2.tgz", + "integrity": "sha512-tgRBI3DdNwAJYE4BBZyZcz/HRRCvAsPkRvG1wvKc+41tBGMxPn/a87T/wikXAvyDypNQ9kaZwHbeZe+veHCGpA==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-controllable-state": "1.2.2", - "@radix-ui/react-use-previous": "1.1.1", - "@radix-ui/react-use-size": "1.1.1" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-compose-refs": "1.1.3", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-use-controllable-state": "1.2.3", + "@radix-ui/react-use-previous": "1.1.2", + "@radix-ui/react-use-size": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2164,19 +1853,19 @@ } }, "node_modules/@radix-ui/react-tabs": { - "version": "1.1.13", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.13.tgz", - "integrity": "sha512-7xdcatg7/U+7+Udyoj2zodtI9H/IIopqo+YOIcZOq1nJwXWBZ9p8xiu5llXlekDbZkca79a/fozEYQXIA4sW6A==", + "version": "1.1.16", + "resolved": "https://registry.npmjs.org/@radix-ui/react-tabs/-/react-tabs-1.1.16.tgz", + "integrity": "sha512-v3Ab2l7z6U7tRB4xA0IyKdq0OsqaO1o9ZjsIEoKKnSZ/l96mZz8aCTX0NCXw+YVHJXr8Km4d+Mn6/Q8YjXa+gw==", "license": "MIT", "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-direction": "1.1.1", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-roving-focus": "1.1.11", - "@radix-ui/react-use-controllable-state": "1.2.2" + "@radix-ui/primitive": "1.1.4", + "@radix-ui/react-context": "1.1.4", + "@radix-ui/react-direction": "1.1.2", + "@radix-ui/react-id": "1.1.2", + "@radix-ui/react-presence": "1.1.6", + "@radix-ui/react-primitive": "2.1.7", + "@radix-ui/react-roving-focus": "1.1.14", + "@radix-ui/react-use-controllable-state": "1.2.3" }, "peerDependencies": { "@types/react": "*", @@ -2194,9 +1883,9 @@ } }, "node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", - "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.2.tgz", + "integrity": "sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2209,13 +1898,13 @@ } }, "node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", - "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.3.tgz", + "integrity": "sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-effect-event": "0.0.2", - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/react-use-effect-event": "0.0.3", + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2228,30 +1917,12 @@ } }, "node_modules/@radix-ui/react-use-effect-event": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", - "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.3.tgz", + "integrity": "sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz", - "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.1" + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2264,13 +1935,10 @@ } }, "node_modules/@radix-ui/react-use-is-hydrated": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.0.tgz", - "integrity": "sha512-U+UORVEq+cTnRIaostJv9AGdV3G6Y+zbVd+12e18jQ5A3c0xL03IhnHuiU4UV69wolOQp5GfR58NW/EgdQhwOA==", + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.1.tgz", + "integrity": "sha512-qwOiz4Tjo8CNnrOLAYUMXeZwDzXgXpvK4TKQPmWLECM9XoWvA6+0Z2/7Ag3A4ivjS4ovbLJPbskkxioFyBhr8A==", "license": "MIT", - "dependencies": { - "use-sync-external-store": "^1.5.0" - }, "peerDependencies": { "@types/react": "*", "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" @@ -2282,9 +1950,9 @@ } }, "node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", - "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz", + "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2297,9 +1965,9 @@ } }, "node_modules/@radix-ui/react-use-previous": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.1.tgz", - "integrity": "sha512-2dHfToCj/pzca2Ck724OZ5L0EVrr3eHRNsG/b3xQJLA2hZpVCS99bLAX+hm1IHXDEnzU6by5z/5MIY794/a8NQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.2.tgz", + "integrity": "sha512-IGBQPtRFdhN6MQ8dbegVmBq1LVZluya3F1jWY+puIcQC3MHctRwTDSBWCkL/3ZcnMJLTMJ++Z+ktmvg0F89iCw==", "license": "MIT", "peerDependencies": { "@types/react": "*", @@ -2312,12 +1980,12 @@ } }, "node_modules/@radix-ui/react-use-rect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.1.tgz", - "integrity": "sha512-QTYuDesS0VtuHNNvMh+CjlKJ4LJickCMUAqjlE3+j8w+RlRpwyX3apEQKGFzbZGdo7XNG1tXa+bQqIE7HIXT2w==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.2.tgz", + "integrity": "sha512-d8a+bBY/FxikNPlgJJoaBHZX+zKVbWHYJGTLnLvveQgFSTntkGdEKv3JDtHrMS0DNYpllz2nRsTLGLKYttbpmw==", "license": "MIT", "dependencies": { - "@radix-ui/rect": "1.1.1" + "@radix-ui/rect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2330,12 +1998,12 @@ } }, "node_modules/@radix-ui/react-use-size": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.1.tgz", - "integrity": "sha512-ewrXRDTAqAXlkl6t/fkXWNAhFX9I+CkKlw6zjEwk86RSPKwZr3xpBRso655aqYafwtnbpHLj6toFzmd6xdVptQ==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.2.tgz", + "integrity": "sha512-giWQp+4mxjBPt4KZ0MmyuykFNWfbDxKt4x+fPkRYmgRFJSbCZFzUglvMb/Kjn38tm10YP4ufiQZDx3zna4LU6w==", "license": "MIT", "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.1" + "@radix-ui/react-use-layout-effect": "1.1.2" }, "peerDependencies": { "@types/react": "*", @@ -2348,12 +2016,12 @@ } }, "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.3.tgz", - "integrity": "sha512-pzJq12tEaaIhqjbzpCuv/OypJY/BPavOofm+dbab+MHLajy277+1lLm6JFcGgF5eskJ6mquGirhXY2GD/8u8Ug==", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.2.7.tgz", + "integrity": "sha512-1wNZBggTDK3GRuuQ6nP4k2yi7a6l7I5qbMPbZcRsrGsGVead/f/d5FhEzUvqFs0bcrDLx7n1zKQ3JvLR6whaaw==", "license": "MIT", "dependencies": { - "@radix-ui/react-primitive": "2.1.3" + "@radix-ui/react-primitive": "2.1.7" }, "peerDependencies": { "@types/react": "*", @@ -2371,36 +2039,15 @@ } }, "node_modules/@radix-ui/rect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz", - "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.2.tgz", + "integrity": "sha512-xnXE7wG13PI+cxieVssYXlQJuYVRhH9NBoxt3KNwzghDIA69GMm7d4wXRouHIYjE+KvS6U/MsMO73NdS2MH9ZA==", "license": "MIT" }, - "node_modules/@rolldown/pluginutils": { - "version": "1.0.0-rc.3", - "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.0-rc.3.tgz", - "integrity": "sha512-eybk3TjzzzV97Dlj5c+XrBFW57eTNhzod66y9HrBlzJ6NsCrWCp/2kaPS3K9wJmurBC0Tdw4yPjXKZqlznim3Q==", - "dev": true, - "license": "MIT" - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.58.0.tgz", - "integrity": "sha512-mr0tmS/4FoVk1cnaeN244A/wjvGDNItZKR8hRhnmCzygyRXYtKF5jVDSIILR1U97CTzAYmbgIj/Dukg62ggG5w==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.58.0.tgz", - "integrity": "sha512-+s++dbp+/RTte62mQD9wLSbiMTV+xr/PeRJEc/sFZFSBRlHPNPVaf5FXlzAL77Mr8FtSfQqCN+I598M8U41ccQ==", + "node_modules/@rolldown/binding-android-arm64": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-android-arm64/-/binding-android-arm64-1.1.4.tgz", + "integrity": "sha512-EZLpf/8y7GXkkra90ML47kzik/GMP3EMcE9bPyHmRfxLC6z9+aW5A8poCsoxjrT5GfEcNAAvWwUHjvP1pUQkfw==", "cpu": [ "arm64" ], @@ -2409,12 +2056,15 @@ "optional": true, "os": [ "android" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.58.0.tgz", - "integrity": "sha512-MFWBwTcYs0jZbINQBXHfSrpSQJq3IUOakcKPzfeSznONop14Pxuqa0Kg19GD0rNBMPQI2tFtu3UzapZpH0Uc1Q==", + "node_modules/@rolldown/binding-darwin-arm64": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-arm64/-/binding-darwin-arm64-1.1.4.tgz", + "integrity": "sha512-aUi+HBvmYb7j8krl1+qJgkG8C17fO79gk3c+jPw4S8glRFc1DTija9S3EyaTSQUm5GJXYKDAsugBEhFHH2vYiQ==", "cpu": [ "arm64" ], @@ -2423,12 +2073,15 @@ "optional": true, "os": [ "darwin" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.58.0.tgz", - "integrity": "sha512-yiKJY7pj9c9JwzuKYLFaDZw5gma3fI9bkPEIyofvVfsPqjCWPglSHdpdwXpKGvDeYDms3Qal8qGMEHZ1M/4Udg==", + "node_modules/@rolldown/binding-darwin-x64": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-darwin-x64/-/binding-darwin-x64-1.1.4.tgz", + "integrity": "sha512-F7hHC3gwY11+vByKPRWqwGbeXWVgKmL+pTGCinaEhdihzBV2aQ0fvZOch9cXYUOKuKKq429HeYXOqQLc7wFCEg==", "cpu": [ "x64" ], @@ -2437,26 +2090,15 @@ "optional": true, "os": [ "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.58.0.tgz", - "integrity": "sha512-x97kCoBh5MOevpn/CNK9W1x8BEzO238541BGWBc315uOlN0AD/ifZ1msg+ZQB05Ux+VF6EcYqpiagfLJ8U3LvQ==", - "cpu": [ - "arm64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.58.0.tgz", - "integrity": "sha512-Aa8jPoZ6IQAG2eIrcXPpjRcMjROMFxCt1UYPZZtCxRV68WkuSigYtQ/7Zwrcr2IvtNJo7T2JfDXyMLxq5L4Jlg==", + "node_modules/@rolldown/binding-freebsd-x64": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-freebsd-x64/-/binding-freebsd-x64-1.1.4.tgz", + "integrity": "sha512-sI5yw+7s92SK6odiEhD5lKCBlWcpjHS5qyqpVQbZAJ0fIzEUXrmbl3DH2ybR3PZogulNJF+COLtmA8hUfvkCCQ==", "cpu": [ "x64" ], @@ -2465,12 +2107,15 @@ "optional": true, "os": [ "freebsd" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.58.0.tgz", - "integrity": "sha512-Ob8YgT5kD/lSIYW2Rcngs5kNB/44Q2RzBSPz9brf2WEtcGR7/f/E9HeHn1wYaAwKBni+bdXEwgHvUd0x12lQSA==", + "node_modules/@rolldown/binding-linux-arm-gnueabihf": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm-gnueabihf/-/binding-linux-arm-gnueabihf-1.1.4.tgz", + "integrity": "sha512-mCi0OKgEieFircrtVYmQAFGszRtMnZ6fpZAXrxanXAu7lqZcsK1E1RAaZNG0uKAnxox3B1f4EyQNnoyMfN1vAA==", "cpu": [ "arm" ], @@ -2479,194 +2124,135 @@ "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.58.0.tgz", - "integrity": "sha512-K+RI5oP1ceqoadvNt1FecL17Qtw/n9BgRSzxif3rTL2QlIu88ccvY+Y9nnHe/cmT5zbH9+bpiJuG1mGHRVwF4Q==", - "cpu": [ - "arm" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.58.0.tgz", - "integrity": "sha512-T+17JAsCKUjmbopcKepJjHWHXSjeW7O5PL7lEFaeQmiVyw4kkc5/lyYKzrv6ElWRX/MrEWfPiJWqbTvfIvjM1Q==", + "node_modules/@rolldown/binding-linux-arm64-gnu": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-gnu/-/binding-linux-arm64-gnu-1.1.4.tgz", + "integrity": "sha512-B9Ial3Kv5sh0SHnB1g/QWcUQCEvCF6QKGAl4zXypYj65mVI+B4AhFBwPtSN7pDrJeIx8Z7zdy4ntx+wQABom7w==", "cpu": [ "arm64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.58.0.tgz", - "integrity": "sha512-cCePktb9+6R9itIJdeCFF9txPU7pQeEHB5AbHu/MKsfH/k70ZtOeq1k4YAtBv9Z7mmKI5/wOLYjQ+B9QdxR6LA==", + "node_modules/@rolldown/binding-linux-arm64-musl": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-arm64-musl/-/binding-linux-arm64-musl-1.1.4.tgz", + "integrity": "sha512-lZVym0PuHE1KZ22gmFTC15lAkrg9iTszR617oYRB/iPY1A56ywoJzVKOJBKaot5RiikCObmur6pogpse3gRcng==", "cpu": [ "arm64" ], "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.58.0.tgz", - "integrity": "sha512-iekUaLkfliAsDl4/xSdoCJ1gnnIXvoNz85C8U8+ZxknM5pBStfZjeXgB8lXobDQvvPRCN8FPmmuTtH+z95HTmg==", - "cpu": [ - "loong64" + "libc": [ + "musl" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.58.0.tgz", - "integrity": "sha512-68ofRgJNl/jYJbxFjCKE7IwhbfxOl1muPN4KbIqAIe32lm22KmU7E8OPvyy68HTNkI2iV/c8y2kSPSm2mW/Q9Q==", - "cpu": [ - "loong64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.58.0.tgz", - "integrity": "sha512-dpz8vT0i+JqUKuSNPCP5SYyIV2Lh0sNL1+FhM7eLC457d5B9/BC3kDPp5BBftMmTNsBarcPcoz5UGSsnCiw4XQ==", + "node_modules/@rolldown/binding-linux-ppc64-gnu": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-ppc64-gnu/-/binding-linux-ppc64-gnu-1.1.4.tgz", + "integrity": "sha512-t2DNiLJWNTbnEHyUzTumldML6ET4/g16467LZoDDJ3tSxGvguL5/NyC2lCsNKuyRycg9XeDQF5SSv+TNOhQEXg==", "cpu": [ "ppc64" ], "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.58.0.tgz", - "integrity": "sha512-4gdkkf9UJ7tafnweBCR/mk4jf3Jfl0cKX9Np80t5i78kjIH0ZdezUv/JDI2VtruE5lunfACqftJ8dIMGN4oHew==", - "cpu": [ - "ppc64" + "libc": [ + "glibc" ], - "dev": true, "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.58.0.tgz", - "integrity": "sha512-YFS4vPnOkDTD/JriUeeZurFYoJhPf9GQQEF/v4lltp3mVcBmnsAdjEWhr2cjUCZzZNzxCG0HZOvJU44UGHSdzw==", - "cpu": [ - "riscv64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.58.0.tgz", - "integrity": "sha512-x2xgZlFne+QVNKV8b4wwaCS8pwq3y14zedZ5DqLzjdRITvreBk//4Knbcvm7+lWmms9V9qFp60MtUd0/t/PXPw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.58.0.tgz", - "integrity": "sha512-jIhrujyn4UnWF8S+DHSkAkDEO3hLX0cjzxJZPLF80xFyzyUIYgSMRcYQ3+uqEoyDD2beGq7Dj7edi8OnJcS/hg==", + "node_modules/@rolldown/binding-linux-s390x-gnu": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-s390x-gnu/-/binding-linux-s390x-gnu-1.1.4.tgz", + "integrity": "sha512-0WIRnL1Uw4BvTZRLQt+PVgo6ZKTJadlC2btP+/EOXv2f/DWbY0rEgl+y834mIVwP1FkTlWVTrGGJXf12lru7EQ==", "cpu": [ "s390x" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.58.0.tgz", - "integrity": "sha512-+410Srdoh78MKSJxTQ+hZ/Mx+ajd6RjjPwBPNd0R3J9FtL6ZA0GqiiyNjCO9In0IzZkCNrpGymSfn+kgyPQocg==", + "node_modules/@rolldown/binding-linux-x64-gnu": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-gnu/-/binding-linux-x64-gnu-1.1.4.tgz", + "integrity": "sha512-JWtGshGfX+oENAKonoNkqEJX+7hC8yfhi9GUyPX1VX4mdh1y5r+ZiJLR5XzAB0aoP6s/PcILsGjKq8O0mm24bw==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.58.0.tgz", - "integrity": "sha512-ZjMyby5SICi227y1MTR3VYBpFTdZs823Rs/hpakufleBoufoOIB6jtm9FEoxn/cgO7l6PM2rCEl5Kre5vX0QrQ==", + "node_modules/@rolldown/binding-linux-x64-musl": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-linux-x64-musl/-/binding-linux-x64-musl-1.1.4.tgz", + "integrity": "sha512-rT6yQcxUuXs4CnbofqwHRRV0iem349rLMYpTjkgQGLjrY4ado/eDzwPZPTCgTOlF6Nkp8NEv70yLMTn6qkWxsQ==", "cpu": [ "x64" ], "dev": true, + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.58.0.tgz", - "integrity": "sha512-ds4iwfYkSQ0k1nb8LTcyXw//ToHOnNTJtceySpL3fa7tc/AsE+UpUFphW126A6fKBGJD5dhRvg8zw1rvoGFxmw==", - "cpu": [ - "x64" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.58.0.tgz", - "integrity": "sha512-fd/zpJniln4ICdPkjWFhZYeY/bpnaN9pGa6ko+5WD38I0tTqk9lXMgXZg09MNdhpARngmxiCg0B0XUamNw/5BQ==", + "node_modules/@rolldown/binding-openharmony-arm64": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-openharmony-arm64/-/binding-openharmony-arm64-1.1.4.tgz", + "integrity": "sha512-KXMGoboq5cyaCQjDA4GLuRiOwBQ0EyFnJoVViLeZ45/3rFItRODEr+NdsBcVpll40hhNArlm/speWGRvj08LzA==", "cpu": [ "arm64" ], @@ -2675,12 +2261,34 @@ "optional": true, "os": [ "openharmony" - ] + ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.58.0.tgz", - "integrity": "sha512-YpG8dUOip7DCz3nr/JUfPbIUo+2d/dy++5bFzgi4ugOGBIox+qMbbqt/JoORwvI/C9Kn2tz6+Bieoqd5+B1CjA==", + "node_modules/@rolldown/binding-wasm32-wasi": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-wasm32-wasi/-/binding-wasm32-wasi-1.1.4.tgz", + "integrity": "sha512-5K83rb36oJiY7BCyE9zLZtGcPV4g5wvq+xwdO0XPIwDVZI8cyB/AUjkNXGb92/rnmezEkjMOpgY61rtwjQtFwg==", + "cpu": [ + "wasm32" + ], + "dev": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/core": "1.11.1", + "@emnapi/runtime": "1.11.1", + "@napi-rs/wasm-runtime": "^1.1.6" + }, + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/binding-win32-arm64-msvc": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-arm64-msvc/-/binding-win32-arm64-msvc-1.1.4.tgz", + "integrity": "sha512-PnWBtw3TV5KOg69HQQDR0mnQuyCmSGR2pAB4DC1rPF808fgKeTUMj2EOEyKATpgiuxuR5APQmiDO7PDgEjTFSA==", "cpu": [ "arm64" ], @@ -2689,26 +2297,15 @@ "optional": true, "os": [ "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.58.0.tgz", - "integrity": "sha512-b9DI8jpFQVh4hIXFr0/+N/TzLdpBIoPzjt0Rt4xJbW3mzguV3mduR9cNgiuFcuL/TeORejJhCWiAXe3E/6PxWA==", - "cpu": [ - "ia32" ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "engines": { + "node": "^20.19.0 || >=22.12.0" + } }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.58.0.tgz", - "integrity": "sha512-CSrVpmoRJFN06LL9xhkitkwUcTZtIotYAF5p6XOR2zW0Zz5mzb3IPpcoPhB02frzMHFNo1reQ9xSF5fFm3hUsQ==", + "node_modules/@rolldown/binding-win32-x64-msvc": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/@rolldown/binding-win32-x64-msvc/-/binding-win32-x64-msvc-1.1.4.tgz", + "integrity": "sha512-M1lpniBePobTfsa7Ks9a199e1akxsXn+GYBUKsEzv3YFzOm1HJAMNwKI3qr0Zq+mxwx9gOZoTdP1yXRYsZUocQ==", "cpu": [ "x64" ], @@ -2717,21 +2314,24 @@ "optional": true, "os": [ "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.58.0.tgz", - "integrity": "sha512-QFsBgQNTnh5K0t/sBsjJLq24YVqEIVkGpfN2VHsnN90soZyhaiA9UUHufcctVNL4ypJY0wrwad0wslx2KJQ1/w==", - "cpu": [ - "x64" ], + "engines": { + "node": "^20.19.0 || >=22.12.0" + } + }, + "node_modules/@rolldown/pluginutils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz", + "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==", "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] + "license": "MIT" + }, + "node_modules/@standard-schema/spec": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@standard-schema/spec/-/spec-1.1.0.tgz", + "integrity": "sha512-l2aFy5jALhniG5HgqrD6jXLi/rUWrKvqN/qJx6yoJsgKhblVd+iqqU4RCXavm/jPityDo5TCvKMnpjKnOriy0w==", + "dev": true, + "license": "MIT" }, "node_modules/@standard-schema/utils": { "version": "0.3.0", @@ -2740,53 +2340,47 @@ "license": "MIT" }, "node_modules/@tailwindcss/node": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.2.0.tgz", - "integrity": "sha512-Yv+fn/o2OmL5fh/Ir62VXItdShnUxfpkMA4Y7jdeC8O81WPB8Kf6TT6GSHvnqgSwDzlB5iT7kDpeXxLsUS0T6Q==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.3.2.tgz", + "integrity": "sha512-yWP/sqEcBLaD8JuA6zNwxoYKr75qxTioYwlRwekj5Jr/I5GXnoJfjetH/psLUIv74cYTH2lBUEzBkinthoYcBg==", "license": "MIT", "dependencies": { "@jridgewell/remapping": "^2.3.5", - "enhanced-resolve": "^5.19.0", - "jiti": "^2.6.1", - "lightningcss": "1.31.1", + "enhanced-resolve": "5.21.6", + "jiti": "^2.7.0", + "lightningcss": "1.32.0", "magic-string": "^0.30.21", "source-map-js": "^1.2.1", - "tailwindcss": "4.2.0" + "tailwindcss": "4.3.2" } }, - "node_modules/@tailwindcss/node/node_modules/tailwindcss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.0.tgz", - "integrity": "sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==", - "license": "MIT" - }, "node_modules/@tailwindcss/oxide": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.2.0.tgz", - "integrity": "sha512-AZqQzADaj742oqn2xjl5JbIOzZB/DGCYF/7bpvhA8KvjUj9HJkag6bBuwZvH1ps6dfgxNHyuJVlzSr2VpMgdTQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.3.2.tgz", + "integrity": "sha512-z8ZgnzX8gdNoWLBLqBPoh/sjnxkwvf9ZuWjnO0l0yIzbLa5/9S+eC5QxGZKRobVHIC3/1BoMWjHblqWjcgFgag==", "license": "MIT", "engines": { "node": ">= 20" }, "optionalDependencies": { - "@tailwindcss/oxide-android-arm64": "4.2.0", - "@tailwindcss/oxide-darwin-arm64": "4.2.0", - "@tailwindcss/oxide-darwin-x64": "4.2.0", - "@tailwindcss/oxide-freebsd-x64": "4.2.0", - "@tailwindcss/oxide-linux-arm-gnueabihf": "4.2.0", - "@tailwindcss/oxide-linux-arm64-gnu": "4.2.0", - "@tailwindcss/oxide-linux-arm64-musl": "4.2.0", - "@tailwindcss/oxide-linux-x64-gnu": "4.2.0", - "@tailwindcss/oxide-linux-x64-musl": "4.2.0", - "@tailwindcss/oxide-wasm32-wasi": "4.2.0", - "@tailwindcss/oxide-win32-arm64-msvc": "4.2.0", - "@tailwindcss/oxide-win32-x64-msvc": "4.2.0" + "@tailwindcss/oxide-android-arm64": "4.3.2", + "@tailwindcss/oxide-darwin-arm64": "4.3.2", + "@tailwindcss/oxide-darwin-x64": "4.3.2", + "@tailwindcss/oxide-freebsd-x64": "4.3.2", + "@tailwindcss/oxide-linux-arm-gnueabihf": "4.3.2", + "@tailwindcss/oxide-linux-arm64-gnu": "4.3.2", + "@tailwindcss/oxide-linux-arm64-musl": "4.3.2", + "@tailwindcss/oxide-linux-x64-gnu": "4.3.2", + "@tailwindcss/oxide-linux-x64-musl": "4.3.2", + "@tailwindcss/oxide-wasm32-wasi": "4.3.2", + "@tailwindcss/oxide-win32-arm64-msvc": "4.3.2", + "@tailwindcss/oxide-win32-x64-msvc": "4.3.2" } }, "node_modules/@tailwindcss/oxide-android-arm64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.2.0.tgz", - "integrity": "sha512-F0QkHAVaW/JNBWl4CEKWdZ9PMb0khw5DCELAOnu+RtjAfx5Zgw+gqCHFvqg3AirU1IAd181fwOtJQ5I8Yx5wtw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.3.2.tgz", + "integrity": "sha512-WHxqIuHpvZ5VtdX6GTl1Ik/Vp2YuN42Et+0CdeaVd/frQ9jAvGmvR8vLT+jk3e8/Q3x8kECB9+R17pgpp2BulA==", "cpu": [ "arm64" ], @@ -2800,9 +2394,9 @@ } }, "node_modules/@tailwindcss/oxide-darwin-arm64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.2.0.tgz", - "integrity": "sha512-I0QylkXsBsJMZ4nkUNSR04p6+UptjcwhcVo3Zu828ikiEqHjVmQL9RuQ6uT/cVIiKpvtVA25msu/eRV97JeNSA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.3.2.tgz", + "integrity": "sha512-GZypeUY/IDJW3877KeM+O67vbXr3MBnbtEL4aYhNErv/JWZhye2vGSWWG9tB6iiqR2MqRNkY8IOUy4NdSZV26w==", "cpu": [ "arm64" ], @@ -2816,9 +2410,9 @@ } }, "node_modules/@tailwindcss/oxide-darwin-x64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.2.0.tgz", - "integrity": "sha512-6TmQIn4p09PBrmnkvbYQ0wbZhLtbaksCDx7Y7R3FYYx0yxNA7xg5KP7dowmQ3d2JVdabIHvs3Hx4K3d5uCf8xg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.3.2.tgz", + "integrity": "sha512-UIIzmefR6KO1sDU7MzRqAxC8iBpft/VhkGjTjnhoS6k7Z3rQ9wEgA1ODSiyH/tcSYssulNm4Ci3hOeK1jH7ccQ==", "cpu": [ "x64" ], @@ -2832,9 +2426,9 @@ } }, "node_modules/@tailwindcss/oxide-freebsd-x64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.2.0.tgz", - "integrity": "sha512-qBudxDvAa2QwGlq9y7VIzhTvp2mLJ6nD/G8/tI70DCDoneaUeLWBJaPcbfzqRIWraj+o969aDQKvKW9dvkUizw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.3.2.tgz", + "integrity": "sha512-GN+uAmcI6DNspnCDwtOAZrTz6oukJnp337qZvxqCGLd3BHBzJpO0ZbTLRvJNdztOeAmTzewewGIMPb0tk2R4WA==", "cpu": [ "x64" ], @@ -2848,9 +2442,9 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.2.0.tgz", - "integrity": "sha512-7XKkitpy5NIjFZNUQPeUyNJNJn1CJeV7rmMR+exHfTuOsg8rxIO9eNV5TSEnqRcaOK77zQpsyUkBWmPy8FgdSg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.3.2.tgz", + "integrity": "sha512-4ABn7qSbdHRwTiDiuWNegCyb5+2FJ4vKIKc3DmKrvAFw7MU1Lm11dIkTPwUaFdTzc7IsOpDbqBrlh0x6y36U/w==", "cpu": [ "arm" ], @@ -2864,12 +2458,15 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.2.0.tgz", - "integrity": "sha512-Mff5a5Q3WoQR01pGU1gr29hHM1N93xYrKkGXfPw/aRtK4bOc331Ho4Tgfsm5WDGvpevqMpdlkCojT3qlCQbCpA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.3.2.tgz", + "integrity": "sha512-wDgEIGwoM8w8pufh9LVt1PahDgNdKXrLC2qfAnV3vAmococ9RWbxeAw4pxPttd/TsJfwjyLf90Dg1y9y8I6Emw==", "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2880,12 +2477,15 @@ } }, "node_modules/@tailwindcss/oxide-linux-arm64-musl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.2.0.tgz", - "integrity": "sha512-XKcSStleEVnbH6W/9DHzZv1YhjE4eSS6zOu2eRtYAIh7aV4o3vIBs+t/B15xlqoxt6ef/0uiqJVB6hkHjWD/0A==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.3.2.tgz", + "integrity": "sha512-J5Nuk0uZQIiMTJj3LEx4sAA9tMFUoXQZFv1J6An+QGYe53HKRJuFDi0rpq/tuouCZeAbOBY3kQ6g8qeD4TUjtA==", "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2896,12 +2496,15 @@ } }, "node_modules/@tailwindcss/oxide-linux-x64-gnu": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.2.0.tgz", - "integrity": "sha512-/hlXCBqn9K6fi7eAM0RsobHwJYa5V/xzWspVTzxnX+Ft9v6n+30Pz8+RxCn7sQL/vRHHLS30iQPrHQunu6/vJA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.3.2.tgz", + "integrity": "sha512-kqCZpSKOBEJO4mz7OqWoofBZeXTAwaVGPj0ErAj7CojmhKpWVWVOnrt9dE8odoIraZq4oj3ausM37kXi+Tow8w==", "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MIT", "optional": true, "os": [ @@ -2912,12 +2515,15 @@ } }, "node_modules/@tailwindcss/oxide-linux-x64-musl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.2.0.tgz", - "integrity": "sha512-lKUaygq4G7sWkhQbfdRRBkaq4LY39IriqBQ+Gk6l5nKq6Ay2M2ZZb1tlIyRNgZKS8cbErTwuYSor0IIULC0SHw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.3.2.tgz", + "integrity": "sha512-cixpqbh2toJDmkuCRI68nXA8ZxNmdK9Y+9v5h3MC3ZQKy/0BO8AWzlkWyRM7JAFSGBlfig4YVTPsK6MVgqz1uw==", "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MIT", "optional": true, "os": [ @@ -2928,9 +2534,9 @@ } }, "node_modules/@tailwindcss/oxide-wasm32-wasi": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.2.0.tgz", - "integrity": "sha512-xuDjhAsFdUuFP5W9Ze4k/o4AskUtI8bcAGU4puTYprr89QaYFmhYOPfP+d1pH+k9ets6RoE23BXZM1X1jJqoyw==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.3.2.tgz", + "integrity": "sha512-4ec2Z/LOmRsAgU23CS4xeJfcJlmRg94A/XrbGRCF1gyU/zdDfRLYDVsS+ynSZCmGNxQ1jQriQOKMQeQxBA3Isw==", "bundleDependencies": [ "@napi-rs/wasm-runtime", "@emnapi/core", @@ -2945,21 +2551,81 @@ "license": "MIT", "optional": true, "dependencies": { - "@emnapi/core": "^1.8.1", - "@emnapi/runtime": "^1.8.1", - "@emnapi/wasi-threads": "^1.1.0", - "@napi-rs/wasm-runtime": "^1.1.1", - "@tybys/wasm-util": "^0.10.1", + "@emnapi/core": "^1.11.1", + "@emnapi/runtime": "^1.11.1", + "@emnapi/wasi-threads": "^1.2.2", + "@napi-rs/wasm-runtime": "^1.1.4", + "@tybys/wasm-util": "^0.10.2", "tslib": "^2.8.1" }, "engines": { "node": ">=14.0.0" } }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": { + "version": "1.11.1", + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@emnapi/wasi-threads": "1.2.2", + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": { + "version": "1.11.1", + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": { + "version": "1.2.2", + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { + "version": "1.1.4", + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "@tybys/wasm-util": "^0.10.1" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/Brooooooklyn" + }, + "peerDependencies": { + "@emnapi/core": "^1.7.1", + "@emnapi/runtime": "^1.7.1" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": { + "version": "0.10.2", + "inBundle": true, + "license": "MIT", + "optional": true, + "dependencies": { + "tslib": "^2.4.0" + } + }, + "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": { + "version": "2.8.1", + "inBundle": true, + "license": "0BSD", + "optional": true + }, "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.2.0.tgz", - "integrity": "sha512-2UU/15y1sWDEDNJXxEIrfWKC2Yb4YgIW5Xz2fKFqGzFWfoMHWFlfa1EJlGO2Xzjkq/tvSarh9ZTjvbxqWvLLXA==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.3.2.tgz", + "integrity": "sha512-Zyr/M0+XcYZu3bZrUytc7TXvrk0ftWfl8gN2MwekNDzhqhKRUucMPSeOzM0o0wH5AWOU49BsKRrfKxI2atCPMQ==", "cpu": [ "arm64" ], @@ -2973,9 +2639,9 @@ } }, "node_modules/@tailwindcss/oxide-win32-x64-msvc": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.2.0.tgz", - "integrity": "sha512-CrFadmFoc+z76EV6LPG1jx6XceDsaCG3lFhyLNo/bV9ByPrE+FnBPckXQVP4XRkN76h3Fjt/a+5Er/oA/nCBvQ==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.3.2.tgz", + "integrity": "sha512-QI9BO7KlNZsp2GuO0jwAAj5jCDABOKXRkCk2XuKTSaNEFSdfzqswYVTtCHBNKHLsqyjFyFkqlDiwkNbTYSssMQ==", "cpu": [ "x64" ], @@ -2989,52 +2655,18 @@ } }, "node_modules/@tailwindcss/postcss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.2.0.tgz", - "integrity": "sha512-u6YBacGpOm/ixPfKqfgrJEjMfrYmPD7gEFRoygS/hnQaRtV0VCBdpkx5Ouw9pnaLRwwlgGCuJw8xLpaR0hOrQg==", + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.3.2.tgz", + "integrity": "sha512-rjVWYCa7Ngbi5AarT6k8TkxUG3Wl1QKzHdIZVsjZSzf36Jmo2IKZt/NHRAwly8oDkbBOH0YTu+CHuf9jPxMc+g==", "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", - "@tailwindcss/node": "4.2.0", - "@tailwindcss/oxide": "4.2.0", - "postcss": "^8.5.6", - "tailwindcss": "4.2.0" + "@tailwindcss/node": "4.3.2", + "@tailwindcss/oxide": "4.3.2", + "postcss": "^8.5.15", + "tailwindcss": "4.3.2" } }, - "node_modules/@tailwindcss/postcss/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/@tailwindcss/postcss/node_modules/tailwindcss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.0.tgz", - "integrity": "sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==", - "license": "MIT" - }, "node_modules/@tanstack/react-table": { "version": "8.21.3", "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.3.tgz", @@ -3068,26 +2700,76 @@ "url": "https://github.com/sponsors/tannerlinsley" } }, - "node_modules/@trivago/prettier-plugin-sort-imports": { - "version": "5.2.2", - "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-5.2.2.tgz", - "integrity": "sha512-fYDQA9e6yTNmA13TLVSA+WMQRc5Bn/c0EUBditUHNfMMxN7M82c38b1kEggVE3pLpZ0FwkwJkUEKMiOi52JXFA==", - "license": "Apache-2.0", - "peer": true, + "node_modules/@testing-library/dom": { + "version": "10.4.1", + "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.4.1.tgz", + "integrity": "sha512-o4PXJQidqJl82ckFaXUeoAW+XysPLauYI43Abki5hABd853iMhitooc6znOnczgbTYmEP6U6/y1ZyKAIsvMKGg==", + "dev": true, + "license": "MIT", "dependencies": { - "@babel/generator": "^7.26.5", - "@babel/parser": "^7.26.7", - "@babel/traverse": "^7.26.7", - "@babel/types": "^7.26.7", - "javascript-natural-sort": "^0.7.1", - "lodash": "^4.17.21" + "@babel/code-frame": "^7.10.4", + "@babel/runtime": "^7.12.5", + "@types/aria-query": "^5.0.1", + "aria-query": "5.3.0", + "dom-accessibility-api": "^0.5.9", + "lz-string": "^1.5.0", + "picocolors": "1.1.1", + "pretty-format": "^27.0.2" }, "engines": { - "node": ">18.12" + "node": ">=18" + } + }, + "node_modules/@testing-library/react": { + "version": "16.3.2", + "resolved": "https://registry.npmjs.org/@testing-library/react/-/react-16.3.2.tgz", + "integrity": "sha512-XU5/SytQM+ykqMnAnvB2umaJNIOsLF3PVv//1Ew4CTcpz0/BRyy/af40qqrt7SjKpDdT1saBMc42CUok5gaw+g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@babel/runtime": "^7.12.5" + }, + "engines": { + "node": ">=18" + }, + "peerDependencies": { + "@testing-library/dom": "^10.0.0", + "@types/react": "^18.0.0 || ^19.0.0", + "@types/react-dom": "^18.0.0 || ^19.0.0", + "react": "^18.0.0 || ^19.0.0", + "react-dom": "^18.0.0 || ^19.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + }, + "@types/react-dom": { + "optional": true + } + } + }, + "node_modules/@trivago/prettier-plugin-sort-imports": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/@trivago/prettier-plugin-sort-imports/-/prettier-plugin-sort-imports-6.0.2.tgz", + "integrity": "sha512-3DgfkukFyC/sE/VuYjaUUWoFfuVjPK55vOFDsxD56XXynFMCZDYFogH2l/hDfOsQAm1myoU/1xByJ3tWqtulXA==", + "license": "Apache-2.0", + "dependencies": { + "@babel/generator": "^7.28.0", + "@babel/parser": "^7.28.0", + "@babel/traverse": "^7.28.0", + "@babel/types": "^7.28.0", + "javascript-natural-sort": "^0.7.1", + "lodash-es": "^4.17.21", + "minimatch": "^9.0.0", + "parse-imports-exports": "^0.2.4" + }, + "engines": { + "node": ">= 20" }, "peerDependencies": { "@vue/compiler-sfc": "3.x", "prettier": "2.x - 3.x", + "prettier-plugin-ember-template-tag": ">= 2.0.0", "prettier-plugin-svelte": "3.x", "svelte": "4.x || 5.x" }, @@ -3095,6 +2777,9 @@ "@vue/compiler-sfc": { "optional": true }, + "prettier-plugin-ember-template-tag": { + "optional": true + }, "prettier-plugin-svelte": { "optional": true }, @@ -3103,55 +2788,53 @@ } } }, - "node_modules/@types/babel__core": { - "version": "7.20.5", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.20.5.tgz", - "integrity": "sha512-qoQprZvz5wQFJwMDqeseRXWv3rqMvhgpbXFfVyWhbx9X47POIA6i/+dXefEmZKoAgOaTdaIgNSMqMIU61yRyzA==", + "node_modules/@tybys/wasm-util": { + "version": "0.10.3", + "resolved": "https://registry.npmjs.org/@tybys/wasm-util/-/wasm-util-0.10.3.tgz", + "integrity": "sha512-F3fo1MYrRJYL3zER0OUOmkutjr1Vp23m7OsSgp7nq4SP6OqX6C/56XFIPAl5bt3zaBRjmW7SGz3u/6LwFpYcOg==", "dev": true, "license": "MIT", + "optional": true, "dependencies": { - "@babel/parser": "^7.20.7", - "@babel/types": "^7.20.7", - "@types/babel__generator": "*", - "@types/babel__template": "*", - "@types/babel__traverse": "*" + "tslib": "^2.4.0" } }, - "node_modules/@types/babel__generator": { - "version": "7.27.0", - "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.27.0.tgz", - "integrity": "sha512-ufFd2Xi92OAVPYsy+P4n7/U7e68fex0+Ee8gSG9KX7eo084CWiQ4sdxktvdl0bOPupXtVJPY19zk6EwWqUQ8lg==", + "node_modules/@types/aria-query": { + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-5.0.4.tgz", + "integrity": "sha512-rfT93uj5s0PRL7EzccGMs3brplhcrghnDoV26NqKhCAS1hVo+WdNsPvE/yb6ilfr5hi2MEk6d5EWJTKdxg8jVw==", + "dev": true, + "license": "MIT" + }, + "node_modules/@types/chai": { + "version": "5.2.3", + "resolved": "https://registry.npmjs.org/@types/chai/-/chai-5.2.3.tgz", + "integrity": "sha512-Mw558oeA9fFbv65/y4mHtXDs9bPnFMZAL/jxdPFUpOHHIXX91mcgEHbS5Lahr+pwZFR8A7GQleRWeI6cGFC2UA==", "dev": true, "license": "MIT", "dependencies": { - "@babel/types": "^7.0.0" + "@types/deep-eql": "*", + "assertion-error": "^2.0.1" } }, - "node_modules/@types/babel__template": { - "version": "7.4.4", - "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.4.tgz", - "integrity": "sha512-h/NUaSyG5EyxBIp8YRxo4RMe2/qQgvyowRwVMzhYhBCONbW8PUsg4lkFMrhgZhUe5z3L3MiLDuvyJ/CaPa2A8A==", + "node_modules/@types/deep-eql": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/@types/deep-eql/-/deep-eql-4.0.2.tgz", + "integrity": "sha512-c9h9dVVMigMPc4bwTvC5dxqtqJZwQPePsWjPlpSOnojbor6pGqdk541lfA7AqFQr5pB1BRdq0juY9db81BwyFw==", "dev": true, - "license": "MIT", - "dependencies": { - "@babel/parser": "^7.1.0", - "@babel/types": "^7.0.0" - } + "license": "MIT" }, - "node_modules/@types/babel__traverse": { - "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.28.0.tgz", - "integrity": "sha512-8PvcXf70gTDZBgt9ptxJ8elBeBjcLOAcOtoO/mPJjtji1+CdGbHgm77om1GrsPxsiE+uXIpNSK64UYaIwQXd4Q==", + "node_modules/@types/esrecurse": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/@types/esrecurse/-/esrecurse-4.3.1.tgz", + "integrity": "sha512-xJBAbDifo5hpffDBuHl0Y8ywswbiAp/Wi7Y/GtAgSlZyIABppyurxVueOPE8LUQOxdlgi6Zqce7uoEpqNTeiUw==", "dev": true, - "license": "MIT", - "dependencies": { - "@babel/types": "^7.28.2" - } + "license": "MIT" }, "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.9.tgz", + "integrity": "sha512-GhdPgy1el4/ImP05X05Uw4cw2/M93BCUmnEvWZNStlCzEKME4Fkk+YpoA5OiHNQmoS7Cafb8Xa3Pya8m1Qrzeg==", "dev": true, "license": "MIT" }, @@ -3163,29 +2846,27 @@ "license": "MIT" }, "node_modules/@types/luxon": { - "version": "3.7.1", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.1.tgz", - "integrity": "sha512-H3iskjFIAn5SlJU7OuxUmTEpebK6TKB8rxZShDslBMZJ5u9S//KM1sbdAisiSrqwLQncVjnpi2OK2J51h+4lsg==", + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.7.2.tgz", + "integrity": "sha512-gW+Oib+vUtGJBtNC8V9Reww0oIpusw+4m81uncg9REGZAJfqOQHfo/nkabnc7w0QReXyPqjrbWMJk6NuAkiX3Q==", "license": "MIT" }, "node_modules/@types/node": { - "version": "24.10.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz", - "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==", + "version": "26.1.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-26.1.0.tgz", + "integrity": "sha512-O0A1G3xPGy4w7AgQdAQYUlQ+BKk2Oovw8eRpofyp5KdBZULnbe+WqaOVNrm705SHphCiG4XHsACrSmPu1f+Kgw==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "undici-types": "~7.16.0" + "undici-types": "~8.3.0" } }, "node_modules/@types/react": { - "version": "19.2.14", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.14.tgz", - "integrity": "sha512-ilcTH/UniCkMdtexkoCN0bI7pMcJDvmQFPvuPvmEaYA/NSfFTAgdUSLAoVjaRJm7+6PvcM+q1zYOwS4wTYMF9w==", + "version": "19.2.17", + "resolved": "https://registry.npmjs.org/@types/react/-/react-19.2.17.tgz", + "integrity": "sha512-MXfmqaVPEVgkBT/aY0aGCkRWWtByiYQXo3xdQ8r5RzuFrPiRn8Gar2tQdXSUQ2GKV3bkXckek89V8wQBY2Q/Aw==", "devOptional": true, "license": "MIT", - "peer": true, "dependencies": { "csstype": "^3.2.2" } @@ -3196,7 +2877,6 @@ "integrity": "sha512-jp2L/eY6fn+KgVVQAOqYItbF0VY/YApe5Mz2F0aykSO8gx31bYCZyvSeYxCHKvzHG5eZjc+zyaS5BrBWya2+kQ==", "devOptional": true, "license": "MIT", - "peer": true, "peerDependencies": { "@types/react": "^19.2.0" } @@ -3208,21 +2888,29 @@ "dev": true, "license": "MIT" }, + "node_modules/@types/trusted-types": { + "version": "2.0.7", + "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", + "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", + "dev": true, + "license": "MIT", + "optional": true + }, "node_modules/@typescript-eslint/eslint-plugin": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.56.0.tgz", - "integrity": "sha512-lRyPDLzNCuae71A3t9NEINBiTn7swyOhvUj3MyUOxb8x6g6vPEFoOU+ZRmGMusNC3X3YMhqMIX7i8ShqhT74Pw==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-8.62.1.tgz", + "integrity": "sha512-4EQM77WgVNxj7OkL/5b/D/xZsw00G577+UriYTC7JF5opcF3T2AuoeY7ueLaZgSVjSgCS6yOAJB5bRGLPSJUzA==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/regexpp": "^4.12.2", - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/type-utils": "8.56.0", - "@typescript-eslint/utils": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/type-utils": "8.62.1", + "@typescript-eslint/utils": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "ignore": "^7.0.5", "natural-compare": "^1.4.0", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3232,9 +2920,9 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "@typescript-eslint/parser": "^8.56.0", + "@typescript-eslint/parser": "^8.62.1", "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/eslint-plugin/node_modules/ignore": { @@ -3248,17 +2936,16 @@ } }, "node_modules/@typescript-eslint/parser": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.56.0.tgz", - "integrity": "sha512-IgSWvLobTDOjnaxAfDTIHaECbkNlAlKv2j5SjpB2v7QHKv1FIfjwMy8FsDbVfDX/KjmCmYICcw7uGaXLhtsLNg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.62.1.tgz", + "integrity": "sha512-sPhE4iHuJDSvoAiec+Ro8JyXw8f0ql13HFR82P99nCm9GwTEKG0KYLvDe6REk8BCXuit6vJAv/Yxg5ABaNS2rA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "debug": "^4.4.3" }, "engines": { @@ -3270,18 +2957,18 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/project-service": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.56.0.tgz", - "integrity": "sha512-M3rnyL1vIQOMeWxTWIW096/TtVP+8W3p/XnaFflhmcFp+U4zlxUxWj4XwNs6HbDeTtN4yun0GNTTDBw/SvufKg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.62.1.tgz", + "integrity": "sha512-yQ3RgY5RkSBpsNS1Bx/JQEcA24FOSdfGktoyprAr5u18390UQdtVcfnEv4nIrIshNnavlVyZBKxQwT1fIAE6cg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/tsconfig-utils": "^8.56.0", - "@typescript-eslint/types": "^8.56.0", + "@typescript-eslint/tsconfig-utils": "^8.62.1", + "@typescript-eslint/types": "^8.62.1", "debug": "^4.4.3" }, "engines": { @@ -3292,18 +2979,18 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/scope-manager": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.56.0.tgz", - "integrity": "sha512-7UiO/XwMHquH+ZzfVCfUNkIXlp/yQjjnlYUyYz7pfvlK3/EyyN6BK+emDmGNyQLBtLGaYrTAI6KOw8tFucWL2w==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.62.1.tgz", + "integrity": "sha512-r4d249KbQ1SFdpeStvob8Ih6aPPIzfqllPVOtvhve6ZcpuVcYo5/7zUWckKpHE7StASX4kTKZTLf0WQm/wPkcg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0" + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3314,9 +3001,9 @@ } }, "node_modules/@typescript-eslint/tsconfig-utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.56.0.tgz", - "integrity": "sha512-bSJoIIt4o3lKXD3xmDh9chZcjCz5Lk8xS7Rxn+6l5/pKrDpkCwtQNQQwZ2qRPk7TkUYhrq3WPIHXOXlbXP0itg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.62.1.tgz", + "integrity": "sha512-xadytJqX9vJVQ2fdQjkcIVigwaOJNWkpjdLt6cEQ+xPnrI1fkp+/jZE/I97k9KUjqtpd25i0HeyZf3T6dutv2g==", "dev": true, "license": "MIT", "engines": { @@ -3327,21 +3014,21 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/type-utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.56.0.tgz", - "integrity": "sha512-qX2L3HWOU2nuDs6GzglBeuFXviDODreS58tLY/BALPC7iu3Fa+J7EOTwnX9PdNBxUI7Uh0ntP0YWGnxCkXzmfA==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-8.62.1.tgz", + "integrity": "sha512-aXM5xlqXiTxPibXB93cLAURfT3rlizf7uMXISCXy66Isr/9hISJx3yDsKl0L7lKa51b8JpFuNKby0/O0pEm9jg==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/utils": "8.56.0", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/utils": "8.62.1", "debug": "^4.4.3", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3352,13 +3039,13 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/types": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.56.0.tgz", - "integrity": "sha512-DBsLPs3GsWhX5HylbP9HNG15U0bnwut55Lx12bHB9MpXxQ+R5GC8MwQe+N1UFXxAeQDvEsEDY6ZYwX03K7Z6HQ==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.62.1.tgz", + "integrity": "sha512-ooCzJFaf+Hg+uG6fA3NRFGuFjlfNlDhBthbv4ZPU/0elCAFUfnyXUvf/WOpHz/jYwSmvU2GkR2LtyUfy1AxZ1Q==", "dev": true, "license": "MIT", "engines": { @@ -3370,21 +3057,21 @@ } }, "node_modules/@typescript-eslint/typescript-estree": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.56.0.tgz", - "integrity": "sha512-ex1nTUMWrseMltXUHmR2GAQ4d+WjkZCT4f+4bVsps8QEdh0vlBsaCokKTPlnqBFqqGaxilDNJG7b8dolW2m43Q==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.62.1.tgz", + "integrity": "sha512-xMcW9oP9u7fAMXYs9A65CVmtLQe2r//oXINHfi8HV+oiqhih17sbLdhXr4540YWlgpDKQdY854OL5ZrdCiQsAA==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/project-service": "8.56.0", - "@typescript-eslint/tsconfig-utils": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/visitor-keys": "8.56.0", + "@typescript-eslint/project-service": "8.62.1", + "@typescript-eslint/tsconfig-utils": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/visitor-keys": "8.62.1", "debug": "^4.4.3", - "minimatch": "^9.0.5", + "minimatch": "^10.2.2", "semver": "^7.7.3", "tinyglobby": "^0.2.15", - "ts-api-utils": "^2.4.0" + "ts-api-utils": "^2.5.0" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3394,39 +3081,52 @@ "url": "https://opencollective.com/typescript-eslint" }, "peerDependencies": { - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/@typescript-eslint/typescript-estree/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/brace-expansion": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0" + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/minimatch": { - "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", "dev": true, - "license": "ISC", + "license": "BlueOak-1.0.0", "dependencies": { - "brace-expansion": "^2.0.1" + "brace-expansion": "^5.0.5" }, "engines": { - "node": ">=16 || 14 >=14.17" + "node": "18 || 20 || >=22" }, "funding": { "url": "https://github.com/sponsors/isaacs" } }, "node_modules/@typescript-eslint/typescript-estree/node_modules/semver": { - "version": "7.7.4", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.4.tgz", - "integrity": "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA==", + "version": "7.8.5", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.8.5.tgz", + "integrity": "sha512-Y7/KDsb8LjooZpwaqGyulO6DQlksgCncchHGk+sZIY4SBvUocMBEFH5Ur1fI4dV+Jvl0w6cjvucaIi40puRioA==", "dev": true, "license": "ISC", "bin": { @@ -3437,16 +3137,16 @@ } }, "node_modules/@typescript-eslint/utils": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.56.0.tgz", - "integrity": "sha512-RZ3Qsmi2nFGsS+n+kjLAYDPVlrzf7UhTffrDIKr+h2yzAlYP/y5ZulU0yeDEPItos2Ph46JAL5P/On3pe7kDIQ==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.62.1.tgz", + "integrity": "sha512-sHtbPfuKNZCG+ih8SyjjucqRntSVmp8XgL5u6o9mAhiSn8ds5o/M/XdM0abweme2Tln3szOstOrZ9OXitvPh0g==", "dev": true, "license": "MIT", "dependencies": { "@eslint-community/eslint-utils": "^4.9.1", - "@typescript-eslint/scope-manager": "8.56.0", - "@typescript-eslint/types": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0" + "@typescript-eslint/scope-manager": "8.62.1", + "@typescript-eslint/types": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -3457,17 +3157,17 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" } }, "node_modules/@typescript-eslint/visitor-keys": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.56.0.tgz", - "integrity": "sha512-q+SL+b+05Ud6LbEE35qe4A99P+htKTKVbyiNEe45eCbJFyh/HVK9QXwlrbz+Q4L8SOW4roxSVwXYj4DMBT7Ieg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.62.1.tgz", + "integrity": "sha512-4g3BLxfdTMy8iZG0MaBkadnlRrCJ74cQiFbyEVMrkwIoqdyaXXQM22cotDvrl4x28wgIZ9rEJRoM+mmhSJpJ1g==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/types": "8.56.0", + "@typescript-eslint/types": "8.62.1", "eslint-visitor-keys": "^5.0.0" }, "engines": { @@ -3478,72 +3178,172 @@ "url": "https://opencollective.com/typescript-eslint" } }, - "node_modules/@typescript-eslint/visitor-keys/node_modules/eslint-visitor-keys": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", - "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": "^20.19.0 || ^22.13.0 || >=24" - }, - "funding": { - "url": "https://opencollective.com/eslint" - } - }, "node_modules/@vitejs/plugin-react": { - "version": "5.1.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-5.1.4.tgz", - "integrity": "sha512-VIcFLdRi/VYRU8OL/puL7QXMYafHmqOnwTZY50U1JPlCNj30PxCMx65c494b1K9be9hX83KVt0+gTEwTWLqToA==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/@vitejs/plugin-react/-/plugin-react-6.0.3.tgz", + "integrity": "sha512-vmFvco5/QuC2f9Oj+wTk0+9XeDFkHxSamwZKYc7MxYwKICfvUvlMhqKI0VuICPltGqh1neqBKDvO4kes1ya8vg==", "dev": true, "license": "MIT", "dependencies": { - "@babel/core": "^7.29.0", - "@babel/plugin-transform-react-jsx-self": "^7.27.1", - "@babel/plugin-transform-react-jsx-source": "^7.27.1", - "@rolldown/pluginutils": "1.0.0-rc.3", - "@types/babel__core": "^7.20.5", - "react-refresh": "^0.18.0" + "@rolldown/pluginutils": "^1.0.1" }, "engines": { "node": "^20.19.0 || >=22.12.0" }, "peerDependencies": { - "vite": "^4.2.0 || ^5.0.0 || ^6.0.0 || ^7.0.0" + "@rolldown/plugin-babel": "^0.1.7 || ^0.2.0", + "babel-plugin-react-compiler": "^1.0.0", + "vite": "^8.0.0" + }, + "peerDependenciesMeta": { + "@rolldown/plugin-babel": { + "optional": true + }, + "babel-plugin-react-compiler": { + "optional": true + } + } + }, + "node_modules/@vitest/expect": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/expect/-/expect-4.1.9.tgz", + "integrity": "sha512-vl/rYsUKcBr3SnQn166+XR5ZQcgMx3DQhFWdfli/cWpLnLUmbxZvyrJZotLFUryib+LtArYMSTJ5RbQ57ZqrlA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@standard-schema/spec": "^1.1.0", + "@types/chai": "^5.2.2", + "@vitest/spy": "4.1.9", + "@vitest/utils": "4.1.9", + "chai": "^6.2.2", + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/mocker": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/mocker/-/mocker-4.1.9.tgz", + "integrity": "sha512-EVkXzBjrPGM+cK8/ANWgBrkUCfJfb38/EfTSO8h7pWvKkyPkpWxvR7BkD2MyItMF62C97zAEoqdpUixwR/e+Rw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/spy": "4.1.9", + "estree-walker": "^3.0.3", + "magic-string": "^0.30.21" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "msw": "^2.4.9", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "msw": { + "optional": true + }, + "vite": { + "optional": true + } + } + }, + "node_modules/@vitest/pretty-format": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/pretty-format/-/pretty-format-4.1.9.tgz", + "integrity": "sha512-s0iufns3iIFitdgm+YR7g1whCAaGtXz459VS9/PqyKDEEFgYIhsHOQmXgIgDuYCt7DeQmiZT0Qe2OA2p4ZPu5A==", + "dev": true, + "license": "MIT", + "dependencies": { + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/runner": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/runner/-/runner-4.1.9.tgz", + "integrity": "sha512-KXLMDtc7oe70+3mJfGrPUWPesswH+3sTxAMAMl8DG7I8IUQT4XW718dY5ID3vPUcmlu27CcKfY4P3h3I29SLJg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/utils": "4.1.9", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/snapshot": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/snapshot/-/snapshot-4.1.9.tgz", + "integrity": "sha512-Jc7RKGNBo8Z28WYIm0Niej4xdSPByRf6mU58VpHQkd6Zh05rlnA+twjbK5HyeIGHxrzsc3mJgS43uM0CZKzaIA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "4.1.9", + "@vitest/utils": "4.1.9", + "magic-string": "^0.30.21", + "pathe": "^2.0.3" + }, + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/spy": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/spy/-/spy-4.1.9.tgz", + "integrity": "sha512-fHpsS6mIi+PiEW+vcRVOMkX1oSaPKne3VOclSFICPcGOmfKgXPU5iAah+wcNcj2xPrCCmfq99IDGf+EojhhvhA==", + "dev": true, + "license": "MIT", + "funding": { + "url": "https://opencollective.com/vitest" + } + }, + "node_modules/@vitest/utils": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/@vitest/utils/-/utils-4.1.9.tgz", + "integrity": "sha512-A51o8ymO5PpqlWNnBP9ZHPXDIpuMtTLlGSjN7la4US+LJzoUMyhwjA5QXlm39JexgwHKW4Xjs8Z2d3dLCXOeuA==", + "dev": true, + "license": "MIT", + "dependencies": { + "@vitest/pretty-format": "4.1.9", + "convert-source-map": "^2.0.0", + "tinyrainbow": "^3.1.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" } }, "node_modules/@xterm/addon-attach": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-attach/-/addon-attach-0.11.0.tgz", - "integrity": "sha512-JboCN0QAY6ZLY/SSB/Zl2cQ5zW1Eh4X3fH7BnuR1NB7xGRhzbqU2Npmpiw/3zFlxDaU88vtKzok44JKi2L2V2Q==", - "license": "MIT", - "peerDependencies": { - "@xterm/xterm": "^5.0.0" - } + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-attach/-/addon-attach-0.12.0.tgz", + "integrity": "sha512-1lxvXM4JYSm60lbFmE8WMOy2oF2ip3Ye8jWorSAmwy7x8FiC53netEJ5RguL8+FSRj79MUQsNCb2hprY2QA2ig==", + "license": "MIT" }, "node_modules/@xterm/addon-fit": { - "version": "0.10.0", - "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.10.0.tgz", - "integrity": "sha512-UFYkDm4HUahf2lnEyHvio51TNGiLK66mqP2JoATy7hRZeXaGMRDr00JiSF7m63vR5WKATF605yEggJKsw0JpMQ==", - "license": "MIT", - "peerDependencies": { - "@xterm/xterm": "^5.0.0" - } + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/@xterm/addon-fit/-/addon-fit-0.11.0.tgz", + "integrity": "sha512-jYcgT6xtVYhnhgxh3QgYDnnNMYTcf8ElbxxFzX0IZo+vabQqSPAjC3c1wJrKB5E19VwQei89QCiZZP86DCPF7g==", + "license": "MIT" }, "node_modules/@xterm/xterm": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-5.5.0.tgz", - "integrity": "sha512-hqJHYaQb5OptNunnyAnkHyM8aCjZ1MEIDTQu1iIbbTD/xops91NB5yq1ZK/dC2JDbVWtF23zUtl9JE2NqwT87A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/@xterm/xterm/-/xterm-6.0.0.tgz", + "integrity": "sha512-TQwDdQGtwwDt+2cgKDLn0IRaSxYu1tSUjgKarSDkUM0ZNiSRXFpjxEsvc/Zgc5kq5omJ+V0a8/kIM2WD3sMOYg==", "license": "MIT", - "peer": true + "workspaces": [ + "addons/*" + ] }, "node_modules/acorn": { - "version": "8.16.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.16.0.tgz", - "integrity": "sha512-UVJyE9MttOsBQIDKw1skb9nAwQuR5wuGD3+82K6JgJlm/Y+KI92oNsMNGZCYdDsVtRHSak0pcV5Dno5+4jh9sw==", + "version": "8.17.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.17.0.tgz", + "integrity": "sha512-xRQbDb9BnwDafYNn6Vwl839DYVjqXYb1XVGtWAZ1kcDc6iwAL4hg3B1dZlRiuENFeO2H53gFG3in621AdERVAg==", "dev": true, "license": "MIT", - "peer": true, "bin": { "acorn": "bin/acorn" }, @@ -3562,9 +3362,9 @@ } }, "node_modules/ajv": { - "version": "6.14.0", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.14.0.tgz", - "integrity": "sha512-IWrosm/yrn43eiKqkfkHis7QioDleaXQHdDVPKg0FSwwd/DuvyX79TZnFOnYpB7dcsFAMmtFztZuXPDvSePkFw==", + "version": "6.15.0", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.15.0.tgz", + "integrity": "sha512-fgFx7Hfoq60ytK2c7DhnF8jIvzYgOMxfugjLOSMHjLIPgenqa7S7oaagATUq99mV6IYvN2tRmC0wnTYX6iPbMw==", "dev": true, "license": "MIT", "dependencies": { @@ -3589,46 +3389,18 @@ } }, "node_modules/ansi-styles": { - "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", "dev": true, "license": "MIT", - "dependencies": { - "color-convert": "^2.0.1" - }, "engines": { - "node": ">=8" + "node": ">=10" }, "funding": { "url": "https://github.com/chalk/ansi-styles?sponsor=1" } }, - "node_modules/any-promise": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", - "license": "MIT" - }, - "node_modules/anymatch": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", - "license": "ISC", - "dependencies": { - "normalize-path": "^3.0.0", - "picomatch": "^2.0.4" - }, - "engines": { - "node": ">= 8" - } - }, - "node_modules/arg": { - "version": "5.0.2", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", - "license": "MIT" - }, "node_modules/argparse": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", @@ -3648,10 +3420,30 @@ "node": ">=10" } }, + "node_modules/aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "dequal": "^2.0.3" + } + }, + "node_modules/assertion-error": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/assertion-error/-/assertion-error-2.0.1.tgz", + "integrity": "sha512-Izi8RQcffqCeNVgFigKli1ssklIbpHnCYc6AknXGYoB6grJqyeby7jv12JUQgmTAnIDnbck1uxksT4dzN3PWBA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12" + } + }, "node_modules/autoprefixer": { - "version": "10.4.24", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.24.tgz", - "integrity": "sha512-uHZg7N9ULTVbutaIsDRoUkoS8/h3bdsmVJYZ5l3wv8Cp/6UIIoRDm90hZ+BwxUj/hGBEzLxdHNSKuFpn8WOyZw==", + "version": "10.5.2", + "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.5.2.tgz", + "integrity": "sha512-rD5t5DwOjJdmSORcTq64j8MawTC+tbQ+HHqjR4NDumamy/ambn1UJrlKL+KdwujWxMkFjPM3pPHOEA9tl4767Q==", "dev": true, "funding": [ { @@ -3669,8 +3461,8 @@ ], "license": "MIT", "dependencies": { - "browserslist": "^4.28.1", - "caniuse-lite": "^1.0.30001766", + "browserslist": "^4.28.4", + "caniuse-lite": "^1.0.30001799", "fraction.js": "^5.3.4", "picocolors": "^1.1.1", "postcss-value-parser": "^4.2.0" @@ -3689,13 +3481,12 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", - "dev": true, "license": "MIT" }, "node_modules/baseline-browser-mapping": { - "version": "2.10.0", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.0.tgz", - "integrity": "sha512-lIyg0szRfYbiy67j9KN8IyeD7q7hcmqnJ1ddWmNt19ItGpNN64mnllmxUNFIOdOm6by97jlL6wfpTTJrmnjWAA==", + "version": "2.10.42", + "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.10.42.tgz", + "integrity": "sha512-c/jurFrDLyui7o1J86yLkRu4LMsTYcBohveus7/I2Hzdn9KIP2bdJPTue/lR1KH46enoPbD77GKeSYNdyPoD3Q==", "devOptional": true, "license": "Apache-2.0", "bin": { @@ -3705,45 +3496,29 @@ "node": ">=6.0.0" } }, - "node_modules/binary-extensions": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/brace-expansion": { - "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", + "node_modules/bidi-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/bidi-js/-/bidi-js-1.0.3.tgz", + "integrity": "sha512-RKshQI1R3YQ+n9YJz2QQ147P66ELpa1FQEg20Dk8oW9t2KgLbpDLLp9aGZ7y8WHSshDknG0bknqGw5/tyCs5tw==", "dev": true, "license": "MIT", "dependencies": { - "balanced-match": "^1.0.0", - "concat-map": "0.0.1" + "require-from-string": "^2.0.2" } }, - "node_modules/braces": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "node_modules/brace-expansion": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.1.tgz", + "integrity": "sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==", "license": "MIT", "dependencies": { - "fill-range": "^7.1.1" - }, - "engines": { - "node": ">=8" + "balanced-match": "^1.0.0" } }, "node_modules/browserslist": { - "version": "4.28.1", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.1.tgz", - "integrity": "sha512-ZC5Bd0LgJXgwGqUknZY/vkUQ04r8NXnJZ3yYi4vDmSiZmC/pdSN0NbNRPxZpbtO4uAfDUAFffO8IZoM3Gj8IkA==", + "version": "4.28.4", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.4.tgz", + "integrity": "sha512-MTc8i/x9jBQd1iMw2CFGS+rwMa07eYjLR0CCTLDACl9xhxy+nIs3KeML/biicXtk9JrZ6dnnTatmc7ErPXIxqw==", "devOptional": true, "funding": [ { @@ -3760,13 +3535,12 @@ } ], "license": "MIT", - "peer": true, "dependencies": { - "baseline-browser-mapping": "^2.9.0", - "caniuse-lite": "^1.0.30001759", - "electron-to-chromium": "^1.5.263", - "node-releases": "^2.0.27", - "update-browserslist-db": "^1.2.0" + "baseline-browser-mapping": "^2.10.38", + "caniuse-lite": "^1.0.30001799", + "electron-to-chromium": "^1.5.376", + "node-releases": "^2.0.48", + "update-browserslist-db": "^1.2.3" }, "bin": { "browserslist": "cli.js" @@ -3776,24 +3550,24 @@ } }, "node_modules/c12": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.3.tgz", - "integrity": "sha512-750hTRvgBy5kcMNPdh95Qo+XUBeGo8C7nsKSmedDmaQI+E0r82DwHeM6vBewDe4rGFbnxoa4V9pw+sPh5+Iz8Q==", + "version": "3.3.4", + "resolved": "https://registry.npmjs.org/c12/-/c12-3.3.4.tgz", + "integrity": "sha512-cM0ApFQSBXuourJejzwv/AuPRvAxordTyParRVcHjjtXirtkzM0uK2L9TTn9s0cXZbG7E55jCivRQzoxYmRAlA==", "dev": true, "license": "MIT", "dependencies": { "chokidar": "^5.0.0", - "confbox": "^0.2.2", - "defu": "^6.1.4", - "dotenv": "^17.2.3", + "confbox": "^0.2.4", + "defu": "^6.1.6", + "dotenv": "^17.3.1", "exsolve": "^1.0.8", - "giget": "^2.0.0", + "giget": "^3.2.0", "jiti": "^2.6.1", "ohash": "^2.0.11", "pathe": "^2.0.3", - "perfect-debounce": "^2.0.0", + "perfect-debounce": "^2.1.0", "pkg-types": "^2.3.0", - "rc9": "^2.1.2" + "rc9": "^3.0.1" }, "peerDependencies": { "magicast": "*" @@ -3811,29 +3585,10 @@ "dev": true, "license": "MIT" }, - "node_modules/callsites": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/camelcase-css": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", - "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, "node_modules/caniuse-lite": { - "version": "1.0.30001770", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001770.tgz", - "integrity": "sha512-x/2CLQ1jHENRbHg5PSId2sXq1CIO1CISvwWAj027ltMVG2UNgW+w9oH2+HzgEIRFembL8bUlXtfbBHR1fCg2xw==", + "version": "1.0.30001800", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001800.tgz", + "integrity": "sha512-MMHtuAz9Ys840zAY5F4k6fV5GaivZ9sPk+nz0mY+GYVzRBnYkN0mpqkSR92oWRQ19yQWo4HvBV/FnC16AJX8MA==", "devOptional": true, "funding": [ { @@ -3851,21 +3606,14 @@ ], "license": "CC-BY-4.0" }, - "node_modules/chalk": { - "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "node_modules/chai": { + "version": "6.2.2", + "resolved": "https://registry.npmjs.org/chai/-/chai-6.2.2.tgz", + "integrity": "sha512-NUPRluOfOiTKBKvWPtSD4PhFvWCqOi0BGStNWs57X9js7XGTprSmFoz5F0tWhR4WPjNeR9jXqdC7/UpSJTnlRg==", "dev": true, "license": "MIT", - "dependencies": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - }, "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/chalk/chalk?sponsor=1" + "node": ">=18" } }, "node_modules/chokidar": { @@ -3885,9 +3633,9 @@ } }, "node_modules/citty": { - "version": "0.2.1", - "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.1.tgz", - "integrity": "sha512-kEV95lFBhQgtogAPlQfJJ0WGVSokvLr/UEoFPiKKOXF7pl98HfUVUD0ejsuTCld/9xH9vogSywZ5KqHzXrZpqg==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/citty/-/citty-0.2.2.tgz", + "integrity": "sha512-+6vJA3L98yv+IdfKGZHBNiGW5KHn22e/JwID0Strsz8h4S/csAu/OuICwxrg44k5MRiZHWIo8XXuJgQTriRP4w==", "dev": true, "license": "MIT" }, @@ -3963,22 +3711,6 @@ "dev": true, "license": "MIT" }, - "node_modules/commander": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, - "node_modules/concat-map": { - "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", - "dev": true, - "license": "MIT" - }, "node_modules/confbox": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.2.4.tgz", @@ -4017,13 +3749,10 @@ } }, "node_modules/copy-to-clipboard": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-3.3.3.tgz", - "integrity": "sha512-2KV8NhB5JqC3ky0r9PMCAZKbUHSwtEo4CwCs0KXgruG43gX5PMqDEBbVU4OUzw2MuAWUfsuFmWvEKG5QRfSnJA==", - "license": "MIT", - "dependencies": { - "toggle-selection": "^1.0.6" - } + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/copy-to-clipboard/-/copy-to-clipboard-4.0.2.tgz", + "integrity": "sha512-gklSft7IuhriZKHKpuoA1fpJSLPNgvUMWMo5BlnzAJm0zNKnznoSv23IjtNqclx8eKi6ZcdvFFzYEER/+U1LoQ==", + "license": "MIT" }, "node_modules/cross-spawn": { "version": "7.0.6", @@ -4040,16 +3769,18 @@ "node": ">= 8" } }, - "node_modules/cssesc": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "node_modules/css-tree": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.2.1.tgz", + "integrity": "sha512-X7sjQzceUhu1u7Y/ylrRZFU2FS6LRiFVp6rKLPg23y3x3c3DOKAwuXGDp+PAGjh6CSnCjYeAul8pcT8bAl+lSA==", + "dev": true, "license": "MIT", - "bin": { - "cssesc": "bin/cssesc" + "dependencies": { + "mdn-data": "2.27.1", + "source-map-js": "^1.2.1" }, "engines": { - "node": ">=4" + "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0" } }, "node_modules/csstype": { @@ -4059,20 +3790,35 @@ "devOptional": true, "license": "MIT" }, + "node_modules/data-urls": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-7.0.0.tgz", + "integrity": "sha512-23XHcCF+coGYevirZceTVD7NdJOqVn+49IHyxgszm+JIiHLoB2TkmPtsYkNWT1pvRSGkc35L6NHs0yHkN2SumA==", + "dev": true, + "license": "MIT", + "dependencies": { + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^16.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, "node_modules/date-fns": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz", - "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==", + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.4.0.tgz", + "integrity": "sha512-+1UMbeh68lH1SegH83CGWwpb6OHHbpSgr3+s5Eww5M4CAgswBpoWS0AjTOfEJ33HiYKz1hdj/KTFprzXHmq/6w==", "license": "MIT", "funding": { "type": "github", "url": "https://github.com/sponsors/kossnocorp" } }, - "node_modules/date-fns-jalali": { - "version": "4.1.0-0", - "resolved": "https://registry.npmjs.org/date-fns-jalali/-/date-fns-jalali-4.1.0-0.tgz", - "integrity": "sha512-hTIP/z+t+qKwBDcmmsnmjWTduxCg+5KfdqWQvb2X/8C9+knYY6epN/pfxdDuyVlSVeFz0sM5eEfwIUQ70U4ckg==", + "node_modules/dayjs": { + "version": "1.11.21", + "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.21.tgz", + "integrity": "sha512-98IT+HOahAisibz/yjKbzuOBwYcjJ7BCLPzARyHiyEBmRz4fatF+KPJszEHXsGYjUG234aH/cOjW1wwTbKUZlA==", + "dev": true, "license": "MIT" }, "node_modules/debug": { @@ -4092,6 +3838,13 @@ } } }, + "node_modules/decimal.js": { + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.6.0.tgz", + "integrity": "sha512-YpgQiITW3JXGntzdUmyUR1V812Hn8T1YVXhCu+wO3OpS4eU9l4YdD3qjyiKdV6mvV29zapkMeD390UVEf2lkUg==", + "dev": true, + "license": "MIT" + }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -4100,9 +3853,9 @@ "license": "MIT" }, "node_modules/defu": { - "version": "6.1.4", - "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.4.tgz", - "integrity": "sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==", + "version": "6.1.7", + "resolved": "https://registry.npmjs.org/defu/-/defu-6.1.7.tgz", + "integrity": "sha512-7z22QmUWiQ/2d0KkdYmANbRUVABpZ9SNYyH5vx6PZ+nE5bcC0l7uFvEfHlyld/HcGBFTL536ClDt3DEcSlEJAQ==", "dev": true, "license": "MIT" }, @@ -4137,22 +3890,27 @@ "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", "license": "MIT" }, - "node_modules/didyoumean": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", - "license": "Apache-2.0" - }, - "node_modules/dlv": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", + "node_modules/dom-accessibility-api": { + "version": "0.5.16", + "resolved": "https://registry.npmjs.org/dom-accessibility-api/-/dom-accessibility-api-0.5.16.tgz", + "integrity": "sha512-X7BJ2yElsnOJ30pZF4uIIDfBEVgF4XEBxL9Bxhy6dnrm5hkzqmsWHGTiHqRiITNhMyFLyAiWndIJP7Z1NTteDg==", + "dev": true, "license": "MIT" }, + "node_modules/dompurify": { + "version": "3.4.11", + "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.4.11.tgz", + "integrity": "sha512-zhlUV12GsaRzMsf9q5M254YhA4+VuF0fG+QFqu6aYpoGlKtz+w8//jBcGVYBgQkR5GHjUomejY84AV+/uPbWdw==", + "dev": true, + "license": "(MPL-2.0 OR Apache-2.0)", + "optionalDependencies": { + "@types/trusted-types": "^2.0.7" + } + }, "node_modules/dotenv": { - "version": "17.3.1", - "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.3.1.tgz", - "integrity": "sha512-IO8C/dzEb6O3F9/twg6ZLXz164a2fhTnEWb95H23Dm4OuN+92NmEAlTrupP9VW6Jm3sO26tQlqyvyi4CsnY9GA==", + "version": "17.4.2", + "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-17.4.2.tgz", + "integrity": "sha512-nI4U3TottKAcAD9LLud4Cb7b2QztQMUEfHbvhTH09bqXTxnSie8WnjPALV/WMCrJZ6UV/qHJ6L03OqO3LcdYZw==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -4163,9 +3921,9 @@ } }, "node_modules/electron-to-chromium": { - "version": "1.5.302", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.302.tgz", - "integrity": "sha512-sM6HAN2LyK82IyPBpznDRqlTQAtuSaO+ShzFiWTvoMJLHyZ+Y39r8VMfHzwbU8MVBzQ4Wdn85+wlZl2TLGIlwg==", + "version": "1.5.387", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.387.tgz", + "integrity": "sha512-TaxwufTFDufvPEoXdhwVrA3UdFWBeWGkYoJ1K8ldF1xe6gKfth6iRNS5lTQ5JPNOHdGQm8PT1QYKUqFLCiUefQ==", "devOptional": true, "license": "ISC" }, @@ -4177,22 +3935,42 @@ "license": "MIT" }, "node_modules/enhanced-resolve": { - "version": "5.19.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz", - "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==", + "version": "5.21.6", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.21.6.tgz", + "integrity": "sha512-aNnGCvbJ/RIyWo1IuhNdVjnNF+EjH9wpzpNHt+ci/m9He9LJvUN8wrCcXjp9cWsGNAuvSpVFTx/vraAFQ8qGjQ==", "license": "MIT", "dependencies": { "graceful-fs": "^4.2.4", - "tapable": "^2.3.0" + "tapable": "^2.3.3" }, "engines": { "node": ">=10.13.0" } }, + "node_modules/entities": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/entities/-/entities-8.0.0.tgz", + "integrity": "sha512-zwfzJecQ/Uej6tusMqwAqU/6KL2XaB2VZ2Jg54Je6ahNBGNH6Ek6g3jjNCF0fG9EWQKGZNddNjU5F1ZQn/sBnA==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=20.19.0" + }, + "funding": { + "url": "https://github.com/fb55/entities?sponsor=1" + } + }, + "node_modules/es-module-lexer": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-2.3.0.tgz", + "integrity": "sha512-KLdwQm2NvGLDkQDCGvmiQrhkd0JbMzXthwQAUgWjQuQdBLFa3eiBP5arXZyA+f8x+x7OXgud6bq2rxjGtHV2tw==", + "dev": true, + "license": "MIT" + }, "node_modules/es-toolkit": { - "version": "1.44.0", - "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.44.0.tgz", - "integrity": "sha512-6penXeZalaV88MM3cGkFZZfOoLGWshWWfdy0tWw/RlVVyhvMaWSBTOvXNeiW3e5FwdS5ePW0LGEu17zT139ktg==", + "version": "1.49.0", + "resolved": "https://registry.npmjs.org/es-toolkit/-/es-toolkit-1.49.0.tgz", + "integrity": "sha512-G5iZ6Pc/FNRY/soKZHC+TxGDD83rHUDXxzaWhGCX44vAv/tMs56WMusnm/KMNK+luUPsgA9U28cGr4RDlSzL2g==", "dev": true, "license": "MIT", "workspaces": [ @@ -4207,48 +3985,6 @@ "dev": true, "license": "MIT" }, - "node_modules/esbuild": { - "version": "0.27.3", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.27.3.tgz", - "integrity": "sha512-8VwMnyGCONIs6cWue2IdpHxHnAjzxnw2Zr7MkVxB2vjmQ2ivqGFb4LEG3SMnv0Gb2F/G/2yA8zUaiL1gywDCCg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.27.3", - "@esbuild/android-arm": "0.27.3", - "@esbuild/android-arm64": "0.27.3", - "@esbuild/android-x64": "0.27.3", - "@esbuild/darwin-arm64": "0.27.3", - "@esbuild/darwin-x64": "0.27.3", - "@esbuild/freebsd-arm64": "0.27.3", - "@esbuild/freebsd-x64": "0.27.3", - "@esbuild/linux-arm": "0.27.3", - "@esbuild/linux-arm64": "0.27.3", - "@esbuild/linux-ia32": "0.27.3", - "@esbuild/linux-loong64": "0.27.3", - "@esbuild/linux-mips64el": "0.27.3", - "@esbuild/linux-ppc64": "0.27.3", - "@esbuild/linux-riscv64": "0.27.3", - "@esbuild/linux-s390x": "0.27.3", - "@esbuild/linux-x64": "0.27.3", - "@esbuild/netbsd-arm64": "0.27.3", - "@esbuild/netbsd-x64": "0.27.3", - "@esbuild/openbsd-arm64": "0.27.3", - "@esbuild/openbsd-x64": "0.27.3", - "@esbuild/openharmony-arm64": "0.27.3", - "@esbuild/sunos-x64": "0.27.3", - "@esbuild/win32-arm64": "0.27.3", - "@esbuild/win32-ia32": "0.27.3", - "@esbuild/win32-x64": "0.27.3" - } - }, "node_modules/escalade": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", @@ -4273,34 +4009,33 @@ } }, "node_modules/eslint": { - "version": "9.39.3", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.3.tgz", - "integrity": "sha512-VmQ+sifHUbI/IcSopBCF/HO3YiHQx/AVd3UVyYL6weuwW+HvON9VYn5l6Zl1WZzPWXPNZrSQpxwkkZ/VuvJZzg==", + "version": "10.6.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.6.0.tgz", + "integrity": "sha512-6lVbcqSodALYo+4ELD0heG6lFiFxnLMuLkiMi2qV8LMp54N8tE8FT1GMH+ev4Ti00nFjNze2+Su6DsV5OQW3Dg==", "dev": true, "license": "MIT", - "peer": true, + "workspaces": [ + "packages/*" + ], "dependencies": { "@eslint-community/eslint-utils": "^4.8.0", - "@eslint-community/regexpp": "^4.12.1", - "@eslint/config-array": "^0.21.1", - "@eslint/config-helpers": "^0.4.2", - "@eslint/core": "^0.17.0", - "@eslint/eslintrc": "^3.3.1", - "@eslint/js": "9.39.3", - "@eslint/plugin-kit": "^0.4.1", + "@eslint-community/regexpp": "^4.12.2", + "@eslint/config-array": "^0.23.5", + "@eslint/config-helpers": "^0.6.0", + "@eslint/core": "^1.2.1", + "@eslint/plugin-kit": "^0.7.2", "@humanfs/node": "^0.16.6", "@humanwhocodes/module-importer": "^1.0.1", "@humanwhocodes/retry": "^0.4.2", "@types/estree": "^1.0.6", - "ajv": "^6.12.4", - "chalk": "^4.0.0", + "ajv": "^6.14.0", "cross-spawn": "^7.0.6", "debug": "^4.3.2", "escape-string-regexp": "^4.0.0", - "eslint-scope": "^8.4.0", - "eslint-visitor-keys": "^4.2.1", - "espree": "^10.4.0", - "esquery": "^1.5.0", + "eslint-scope": "^9.1.2", + "eslint-visitor-keys": "^5.0.1", + "espree": "^11.2.0", + "esquery": "^1.7.0", "esutils": "^2.0.2", "fast-deep-equal": "^3.1.3", "file-entry-cache": "^8.0.0", @@ -4310,8 +4045,7 @@ "imurmurhash": "^0.1.4", "is-glob": "^4.0.0", "json-stable-stringify-without-jsonify": "^1.0.1", - "lodash.merge": "^4.6.2", - "minimatch": "^3.1.2", + "minimatch": "^10.2.4", "natural-compare": "^1.4.0", "optionator": "^0.9.3" }, @@ -4319,7 +4053,7 @@ "eslint": "bin/eslint.js" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://eslint.org/donate" @@ -4334,9 +4068,9 @@ } }, "node_modules/eslint-plugin-react-hooks": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.0.1.tgz", - "integrity": "sha512-O0d0m04evaNzEPoSW+59Mezf8Qt0InfgGIBJnpC0h3NH/WjUAR7BIKUfysC6todmtiZ/A0oUVS8Gce0WhBrHsA==", + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-7.1.1.tgz", + "integrity": "sha512-f2I7Gw6JbvCexzIInuSbZpfdQ44D7iqdWX01FKLvrPgqxoE7oMj8clOfto8U6vYiz4yd5oKu39rRSVOe1zRu0g==", "dev": true, "license": "MIT", "dependencies": { @@ -4350,62 +4084,103 @@ "node": ">=18" }, "peerDependencies": { - "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0" + "eslint": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0-0 || ^9.0.0 || ^10.0.0" } }, "node_modules/eslint-plugin-react-refresh": { - "version": "0.4.26", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.4.26.tgz", - "integrity": "sha512-1RETEylht2O6FM/MvgnyvT+8K21wLqDNg4qD51Zj3guhjt433XbnnkVttHMyaVyAFD03QSV4LPS5iE3VQmO7XQ==", + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-refresh/-/eslint-plugin-react-refresh-0.5.3.tgz", + "integrity": "sha512-5EMmLCV98Pi4o/f/3DP/v/tNqLHMIc9I8LKClNDWhZ9JTho89/kQcitCXQBMG7sAfVRK0Ie3T2EDOzp1YXYiVA==", "dev": true, "license": "MIT", "peerDependencies": { - "eslint": ">=8.40" + "eslint": "^9 || ^10" } }, "node_modules/eslint-scope": { - "version": "8.4.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", - "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", + "version": "9.1.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz", + "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { + "@types/esrecurse": "^4.3.1", + "@types/estree": "^1.0.8", "esrecurse": "^4.3.0", "estraverse": "^5.2.0" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://opencollective.com/eslint" } }, "node_modules/eslint-visitor-keys": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz", + "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==", "dev": true, "license": "Apache-2.0", "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://opencollective.com/eslint" } }, + "node_modules/eslint/node_modules/balanced-match": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz", + "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==", + "dev": true, + "license": "MIT", + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/eslint/node_modules/brace-expansion": { + "version": "5.0.7", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz", + "integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==", + "dev": true, + "license": "MIT", + "dependencies": { + "balanced-match": "^4.0.2" + }, + "engines": { + "node": "18 || 20 || >=22" + } + }, + "node_modules/eslint/node_modules/minimatch": { + "version": "10.2.5", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz", + "integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==", + "dev": true, + "license": "BlueOak-1.0.0", + "dependencies": { + "brace-expansion": "^5.0.5" + }, + "engines": { + "node": "18 || 20 || >=22" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, "node_modules/espree": { - "version": "10.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", - "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz", + "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { - "acorn": "^8.15.0", + "acorn": "^8.16.0", "acorn-jsx": "^5.3.2", - "eslint-visitor-keys": "^4.2.1" + "eslint-visitor-keys": "^5.0.1" }, "engines": { - "node": "^18.18.0 || ^20.9.0 || >=21.1.0" + "node": "^20.19.0 || ^22.13.0 || >=24" }, "funding": { "url": "https://opencollective.com/eslint" @@ -4447,6 +4222,16 @@ "node": ">=4.0" } }, + "node_modules/estree-walker": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-3.0.3.tgz", + "integrity": "sha512-7RUKfXgSMMkzt6ZuXmqapOurLGPPfgj6l9uRZ7lRGolvk0y2yocc35LdcxKC5PQZdn2DMqioAQ2NoWcrTKmm6g==", + "dev": true, + "license": "MIT", + "dependencies": { + "@types/estree": "^1.0.0" + } + }, "node_modules/esutils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", @@ -4470,10 +4255,20 @@ "url": "https://github.com/eta-dev/eta?sponsor=1" } }, + "node_modules/expect-type": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/expect-type/-/expect-type-1.4.0.tgz", + "integrity": "sha512-KfYbmpRm0VbLjEvVa9yGwCi9GI34xvi7A/HXYWQO65CSD2u3MczUJSuwXKFIxlGsgBQizV9q5J9NHj4VG0n+pA==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=12.0.0" + } + }, "node_modules/exsolve": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.0.8.tgz", - "integrity": "sha512-LmDxfWXwcTArk8fUEnOfSZpHOJ6zOMUJKOtFLFqJLoKJetuQG874Uc7/Kki7zFLzYybmZhp1M7+98pfMqeX8yA==", + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.0.tgz", + "integrity": "sha512-D+42+T12DdIlJM3uepa55qGiL3sYdLBOxIl2ifQCzCHz4c7eiolaHsi3BIqEr7JxBzxv2pYZQX9kw16ziMcEmw==", "dev": true, "license": "MIT" }, @@ -4484,34 +4279,6 @@ "dev": true, "license": "MIT" }, - "node_modules/fast-glob": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", - "license": "MIT", - "dependencies": { - "@nodelib/fs.stat": "^2.0.2", - "@nodelib/fs.walk": "^1.2.3", - "glob-parent": "^5.1.2", - "merge2": "^1.3.0", - "micromatch": "^4.0.8" - }, - "engines": { - "node": ">=8.6.0" - } - }, - "node_modules/fast-glob/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -4533,13 +4300,39 @@ "dev": true, "license": "MIT" }, - "node_modules/fastq": { - "version": "1.20.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.20.1.tgz", - "integrity": "sha512-GGToxJ/w1x32s/D2EKND7kTil4n8OVk/9mycTc4VDza13lOvpUZTGX3mFSCtV9ksdGBVzvsyAVLM6mHFThxXxw==", - "license": "ISC", - "dependencies": { - "reusify": "^1.0.4" + "node_modules/fast-uri": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.3.tgz", + "integrity": "sha512-i70LwGWUduXqzicKXWshooq+sWL1K3WUU5rKZNG/0i3a1OSoX3HqhH5WbWwTmqWfor4urUakGPiRQcleRZTwOg==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/fastify" + }, + { + "type": "opencollective", + "url": "https://opencollective.com/fastify" + } + ], + "license": "BSD-3-Clause" + }, + "node_modules/fdir": { + "version": "6.5.0", + "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", + "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=12.0.0" + }, + "peerDependencies": { + "picomatch": "^3 || ^4" + }, + "peerDependenciesMeta": { + "picomatch": { + "optional": true + } } }, "node_modules/file-entry-cache": { @@ -4555,18 +4348,6 @@ "node": ">=16.0.0" } }, - "node_modules/fill-range": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", - "license": "MIT", - "dependencies": { - "to-regex-range": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/find-up": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", @@ -4599,9 +4380,9 @@ } }, "node_modules/flatted": { - "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", + "version": "3.4.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.2.tgz", + "integrity": "sha512-PjDse7RzhcPkIJwy5t7KPWQSZ9cAbzQXcafsetQoD7sOJRQlGikNbx7yZp2OotDnJyrDcbyRq3Ttb18iYOqkxA==", "dev": true, "license": "ISC" }, @@ -4620,13 +4401,13 @@ } }, "node_modules/framer-motion": { - "version": "12.34.3", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.34.3.tgz", - "integrity": "sha512-v81ecyZKYO/DfpTwHivqkxSUBzvceOpoI+wLfgCgoUIKxlFKEXdg0oR9imxwXumT4SFy8vRk9xzJ5l3/Du/55Q==", + "version": "12.42.2", + "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.42.2.tgz", + "integrity": "sha512-5XY9luDiu0oHfHBjpDthFMh0ES+122w6p/papSJBweMkO8Sn+PW2QaEgRblQBpWFnuvZS5qvarpt/hO2pjGmnw==", "license": "MIT", "dependencies": { - "motion-dom": "^12.34.3", - "motion-utils": "^12.29.2", + "motion-dom": "^12.42.2", + "motion-utils": "^12.39.0", "tslib": "^2.4.0" }, "peerDependencies": { @@ -4647,9 +4428,10 @@ } }, "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.2.tgz", + "integrity": "sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==", + "dev": true, "hasInstallScript": true, "license": "MIT", "optional": true, @@ -4660,15 +4442,6 @@ "node": "^8.16.0 || ^10.6.0 || >=11.0.0" } }, - "node_modules/function-bind": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", - "license": "MIT", - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -4699,37 +4472,20 @@ } }, "node_modules/giget": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/giget/-/giget-2.0.0.tgz", - "integrity": "sha512-L5bGsVkxJbJgdnwyuheIunkGatUF/zssUoxxjACCseZYAVbaqdh9Tsmmlkl8vYan09H7sbvKt4pS8GqKLBrEzA==", + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/giget/-/giget-3.3.0.tgz", + "integrity": "sha512-gzi2D96p+AMfDcmJHGDj3KJ9NRiwvlFAU5yfa3ROwWZmFUjX4P43x3BcyRaOMMLto1vUo7C+86+MFhYTl6Ryiw==", "dev": true, "license": "MIT", - "dependencies": { - "citty": "^0.1.6", - "consola": "^3.4.0", - "defu": "^6.1.4", - "node-fetch-native": "^1.6.6", - "nypm": "^0.6.0", - "pathe": "^2.0.3" - }, "bin": { "giget": "dist/cli.mjs" } }, - "node_modules/giget/node_modules/citty": { - "version": "0.1.6", - "resolved": "https://registry.npmjs.org/citty/-/citty-0.1.6.tgz", - "integrity": "sha512-tskPPKEs8D2KPafUypv2gxwJP8h/OaJmC82QQGGDQcHvXX43xF2VDACcJVmZ0EuSxkpO9Kc4MlrA3q0+FG58AQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "consola": "^3.2.3" - } - }, "node_modules/glob-parent": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, "license": "ISC", "dependencies": { "is-glob": "^4.0.3" @@ -4739,9 +4495,9 @@ } }, "node_modules/globals": { - "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", + "version": "17.7.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-17.7.0.tgz", + "integrity": "sha512-Czmyns5dUsq4seFBR/Kdydhmo8y9kC79hiSkPn0YcGtNnYWnrgt0vjrSjx9tspoDGWm2CMarffRuLjM4xUz8xg==", "dev": true, "license": "MIT", "engines": { @@ -4757,28 +4513,6 @@ "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, - "node_modules/has-flag": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - } - }, - "node_modules/hasown": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", - "license": "MIT", - "dependencies": { - "function-bind": "^1.1.2" - }, - "engines": { - "node": ">= 0.4" - } - }, "node_modules/hermes-estree": { "version": "0.25.1", "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz", @@ -4796,6 +4530,19 @@ "hermes-estree": "0.25.1" } }, + "node_modules/html-encoding-sniffer": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-6.0.0.tgz", + "integrity": "sha512-CV9TW3Y3f8/wT0BRFc1/KAVQ3TUHiXmaAb6VW9vtiMFf7SLoMd1PdAc4W3KFOFETBJUb90KatHqlsZMWV+R9Gg==", + "dev": true, + "license": "MIT", + "dependencies": { + "@exodus/bytes": "^1.6.0" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" + } + }, "node_modules/html-parse-stringify": { "version": "3.0.1", "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz", @@ -4813,30 +4560,26 @@ "license": "MIT" }, "node_modules/i18next": { - "version": "25.8.13", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-25.8.13.tgz", - "integrity": "sha512-E0vzjBY1yM+nsFrtgkjLhST2NBkirkvOVoQa0MSldhsuZ3jUge7ZNpuwG0Cfc74zwo5ZwRzg3uOgT+McBn32iA==", + "version": "26.3.4", + "resolved": "https://registry.npmjs.org/i18next/-/i18next-26.3.4.tgz", + "integrity": "sha512-pa7m0d7pBDqGHZxljT+WPFeyFgQ7P7SciPPo1tTqYuO0z4sqADYhwnBESmmGp/wEof1inwdls/k8ZgTg8rxFHA==", "funding": [ { "type": "individual", - "url": "https://locize.com" - }, - { - "type": "individual", - "url": "https://locize.com/i18next.html" + "url": "https://www.locize.com/i18next" }, { "type": "individual", "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" + }, + { + "type": "individual", + "url": "https://www.locize.com" } ], "license": "MIT", - "peer": true, - "dependencies": { - "@babel/runtime": "^7.28.4" - }, "peerDependencies": { - "typescript": "^5" + "typescript": "^5 || ^6" }, "peerDependenciesMeta": { "typescript": { @@ -4863,23 +4606,6 @@ "node": ">= 4" } }, - "node_modules/import-fresh": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "parent-module": "^1.0.0", - "resolve-from": "^4.0.0" - }, - "engines": { - "node": ">=6" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", @@ -4890,37 +4616,11 @@ "node": ">=0.8.19" } }, - "node_modules/is-binary-path": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", - "license": "MIT", - "dependencies": { - "binary-extensions": "^2.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/is-core-module": { - "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", - "license": "MIT", - "dependencies": { - "hasown": "^2.0.2" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=0.10.0" @@ -4940,6 +4640,7 @@ "version": "4.0.3", "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -4948,14 +4649,12 @@ "node": ">=0.10.0" } }, - "node_modules/is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "license": "MIT", - "engines": { - "node": ">=0.12.0" - } + "node_modules/is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true, + "license": "MIT" }, "node_modules/isexe": { "version": "2.0.0", @@ -4971,18 +4670,18 @@ "license": "MIT" }, "node_modules/jiti": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", + "version": "2.7.0", + "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.7.0.tgz", + "integrity": "sha512-AC/7JofJvZGrrneWNaEnJeOLUx+JlGt7tNa0wZiRPT4MY1wmfKjt2+6O2p2uz2+skll8OZZmJMNqeke7kKbNgQ==", "license": "MIT", "bin": { "jiti": "lib/jiti-cli.mjs" } }, "node_modules/jotai": { - "version": "2.18.0", - "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.18.0.tgz", - "integrity": "sha512-XI38kGWAvtxAZ+cwHcTgJsd+kJOJGf3OfL4XYaXWZMZ7IIY8e53abpIHvtVn1eAgJ5dlgwlGFnP4psrZ/vZbtA==", + "version": "2.20.1", + "resolved": "https://registry.npmjs.org/jotai/-/jotai-2.20.1.tgz", + "integrity": "sha512-dnuKfU/GLi8B28RRMjQ3AfoN7kfzP8o41+AX2FmITZqEMY8PHnjABq+VkEooomLwYaGjda+pgy0yFSjaHX/ZPg==", "license": "MIT", "peer": true, "engines": { @@ -5025,10 +4724,20 @@ "license": "MIT" }, "node_modules/js-yaml": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.3.0.tgz", + "integrity": "sha512-1td788aAnnZ5qs7V2QIRl1owjtYpbKt749Y3xauqQgwIIGF/xXWz1wMTEBx5O3LK3lXLVuqXPdPxj2BoFHaW9Q==", "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/puzrin" + }, + { + "type": "github", + "url": "https://github.com/sponsors/nodeca" + } + ], "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -5037,6 +4746,57 @@ "js-yaml": "bin/js-yaml.js" } }, + "node_modules/jsdom": { + "version": "29.1.1", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-29.1.1.tgz", + "integrity": "sha512-ECi4Fi2f7BdJtUKTflYRTiaMxIB0O6zfR1fX0GXpUrf6flp8QIYn1UT20YQqdSOfk2dfkCwS8LAFoJDEppNK5Q==", + "dev": true, + "license": "MIT", + "dependencies": { + "@asamuzakjp/css-color": "^5.1.11", + "@asamuzakjp/dom-selector": "^7.1.1", + "@bramus/specificity": "^2.4.2", + "@csstools/css-syntax-patches-for-csstree": "^1.1.3", + "@exodus/bytes": "^1.15.0", + "css-tree": "^3.2.1", + "data-urls": "^7.0.0", + "decimal.js": "^10.6.0", + "html-encoding-sniffer": "^6.0.0", + "is-potential-custom-element-name": "^1.0.1", + "lru-cache": "^11.3.5", + "parse5": "^8.0.1", + "saxes": "^6.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^6.0.1", + "undici": "^7.25.0", + "w3c-xmlserializer": "^5.0.0", + "webidl-conversions": "^8.0.1", + "whatwg-mimetype": "^5.0.0", + "whatwg-url": "^16.0.1", + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": "^20.19.0 || ^22.13.0 || >=24.0.0" + }, + "peerDependencies": { + "canvas": "^3.0.0" + }, + "peerDependenciesMeta": { + "canvas": { + "optional": true + } + } + }, + "node_modules/jsdom/node_modules/lru-cache": { + "version": "11.5.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.1.tgz", + "integrity": "sha512-RPimw/7aMdv2oqRrxKwvZXcPfwBrn/JZ2xYcY9Hus/6LaS3VOAKVWKWgNLCFSiOm1ESXinjsDlidVU7JlnCN2A==", + "dev": true, + "license": "BlueOak-1.0.0", + "engines": { + "node": "20 || >=22" + } + }, "node_modules/jsesc": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", @@ -5108,9 +4868,9 @@ } }, "node_modules/lightningcss": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.31.1.tgz", - "integrity": "sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.32.0.tgz", + "integrity": "sha512-NXYBzinNrblfraPGyrbPoD19C1h9lfI/1mzgWYvXUTe414Gz/X1FD2XBZSZM7rRTrMA8JL3OtAaGifrIKhQ5yQ==", "license": "MPL-2.0", "dependencies": { "detect-libc": "^2.0.3" @@ -5123,23 +4883,23 @@ "url": "https://opencollective.com/parcel" }, "optionalDependencies": { - "lightningcss-android-arm64": "1.31.1", - "lightningcss-darwin-arm64": "1.31.1", - "lightningcss-darwin-x64": "1.31.1", - "lightningcss-freebsd-x64": "1.31.1", - "lightningcss-linux-arm-gnueabihf": "1.31.1", - "lightningcss-linux-arm64-gnu": "1.31.1", - "lightningcss-linux-arm64-musl": "1.31.1", - "lightningcss-linux-x64-gnu": "1.31.1", - "lightningcss-linux-x64-musl": "1.31.1", - "lightningcss-win32-arm64-msvc": "1.31.1", - "lightningcss-win32-x64-msvc": "1.31.1" + "lightningcss-android-arm64": "1.32.0", + "lightningcss-darwin-arm64": "1.32.0", + "lightningcss-darwin-x64": "1.32.0", + "lightningcss-freebsd-x64": "1.32.0", + "lightningcss-linux-arm-gnueabihf": "1.32.0", + "lightningcss-linux-arm64-gnu": "1.32.0", + "lightningcss-linux-arm64-musl": "1.32.0", + "lightningcss-linux-x64-gnu": "1.32.0", + "lightningcss-linux-x64-musl": "1.32.0", + "lightningcss-win32-arm64-msvc": "1.32.0", + "lightningcss-win32-x64-msvc": "1.32.0" } }, "node_modules/lightningcss-android-arm64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.31.1.tgz", - "integrity": "sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.32.0.tgz", + "integrity": "sha512-YK7/ClTt4kAK0vo6w3X+Pnm0D2cf2vPHbhOXdoNti1Ga0al1P4TBZhwjATvjNwLEBCnKvjJc2jQgHXH0NEwlAg==", "cpu": [ "arm64" ], @@ -5157,9 +4917,9 @@ } }, "node_modules/lightningcss-darwin-arm64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.31.1.tgz", - "integrity": "sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.32.0.tgz", + "integrity": "sha512-RzeG9Ju5bag2Bv1/lwlVJvBE3q6TtXskdZLLCyfg5pt+HLz9BqlICO7LZM7VHNTTn/5PRhHFBSjk5lc4cmscPQ==", "cpu": [ "arm64" ], @@ -5177,9 +4937,9 @@ } }, "node_modules/lightningcss-darwin-x64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.31.1.tgz", - "integrity": "sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.32.0.tgz", + "integrity": "sha512-U+QsBp2m/s2wqpUYT/6wnlagdZbtZdndSmut/NJqlCcMLTWp5muCrID+K5UJ6jqD2BFshejCYXniPDbNh73V8w==", "cpu": [ "x64" ], @@ -5197,9 +4957,9 @@ } }, "node_modules/lightningcss-freebsd-x64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.31.1.tgz", - "integrity": "sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.32.0.tgz", + "integrity": "sha512-JCTigedEksZk3tHTTthnMdVfGf61Fky8Ji2E4YjUTEQX14xiy/lTzXnu1vwiZe3bYe0q+SpsSH/CTeDXK6WHig==", "cpu": [ "x64" ], @@ -5217,9 +4977,9 @@ } }, "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.31.1.tgz", - "integrity": "sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.32.0.tgz", + "integrity": "sha512-x6rnnpRa2GL0zQOkt6rts3YDPzduLpWvwAF6EMhXFVZXD4tPrBkEFqzGowzCsIWsPjqSK+tyNEODUBXeeVHSkw==", "cpu": [ "arm" ], @@ -5237,12 +4997,15 @@ } }, "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.31.1.tgz", - "integrity": "sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.32.0.tgz", + "integrity": "sha512-0nnMyoyOLRJXfbMOilaSRcLH3Jw5z9HDNGfT/gwCPgaDjnx0i8w7vBzFLFR1f6CMLKF8gVbebmkUN3fa/kQJpQ==", "cpu": [ "arm64" ], + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -5257,12 +5020,15 @@ } }, "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.31.1.tgz", - "integrity": "sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.32.0.tgz", + "integrity": "sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==", "cpu": [ "arm64" ], + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -5277,12 +5043,15 @@ } }, "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.31.1.tgz", - "integrity": "sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.32.0.tgz", + "integrity": "sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==", "cpu": [ "x64" ], + "libc": [ + "glibc" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -5297,12 +5066,15 @@ } }, "node_modules/lightningcss-linux-x64-musl": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.31.1.tgz", - "integrity": "sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.32.0.tgz", + "integrity": "sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==", "cpu": [ "x64" ], + "libc": [ + "musl" + ], "license": "MPL-2.0", "optional": true, "os": [ @@ -5317,9 +5089,9 @@ } }, "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.31.1.tgz", - "integrity": "sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.32.0.tgz", + "integrity": "sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==", "cpu": [ "arm64" ], @@ -5337,9 +5109,9 @@ } }, "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.31.1.tgz", - "integrity": "sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==", + "version": "1.32.0", + "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.32.0.tgz", + "integrity": "sha512-Amq9B/SoZYdDi1kFrojnoqPLxYhQ4Wo5XiL8EVJrVsB8ARoC1PWW6VGtT0WKCemjy8aC+louJnjS7U18x3b06Q==", "cpu": [ "x64" ], @@ -5356,24 +5128,6 @@ "url": "https://opencollective.com/parcel" } }, - "node_modules/lilconfig": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", - "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", - "license": "MIT", - "engines": { - "node": ">=14" - }, - "funding": { - "url": "https://github.com/sponsors/antonk52" - } - }, - "node_modules/lines-and-columns": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", - "license": "MIT" - }, "node_modules/locate-path": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", @@ -5390,17 +5144,10 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "license": "MIT" - }, - "node_modules/lodash.merge": { - "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", - "dev": true, + "node_modules/lodash-es": { + "version": "4.18.1", + "resolved": "https://registry.npmjs.org/lodash-es/-/lodash-es-4.18.1.tgz", + "integrity": "sha512-J8xewKD/Gk22OZbhpOVSwcs60zhd95ESDwezOFuA3/099925PdHJ7OFHNTGtajL3AlZkykD32HykiMo+BIBI8A==", "license": "MIT" }, "node_modules/lru-cache": { @@ -5414,9 +5161,9 @@ } }, "node_modules/lucide-react": { - "version": "0.545.0", - "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.545.0.tgz", - "integrity": "sha512-7r1/yUuflQDSt4f1bpn5ZAocyIxcTyVyBBChSVtBKn5M+392cPmI5YJMWOJKk/HUWGm5wg83chlAZtCcGbEZtw==", + "version": "1.23.0", + "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-1.23.0.tgz", + "integrity": "sha512-38BpJcD0JhFosxHApP/BYsBetLpQFRoTRzEzstM/XCc3jsAG7wqaY1lgVwxiUe3xqYE+lNxo2PkCmYwXWrwwIw==", "license": "ISC", "peerDependencies": { "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0" @@ -5431,6 +5178,16 @@ "node": ">=12" } }, + "node_modules/lz-string": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/lz-string/-/lz-string-1.5.0.tgz", + "integrity": "sha512-h5bgJWpxJNswbU7qCrV0tIKQCaS3blPDrqKWx+QxzuzL1zGUzij9XCWLrSLsJPu5t+eWA/ycetzYAO5IOMcWAQ==", + "dev": true, + "license": "MIT", + "bin": { + "lz-string": "bin/bin.js" + } + }, "node_modules/magic-string": { "version": "0.30.21", "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", @@ -5440,54 +5197,41 @@ "@jridgewell/sourcemap-codec": "^1.5.5" } }, - "node_modules/merge2": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", - "license": "MIT", - "engines": { - "node": ">= 8" - } - }, - "node_modules/micromatch": { - "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", - "license": "MIT", - "dependencies": { - "braces": "^3.0.3", - "picomatch": "^2.3.1" - }, - "engines": { - "node": ">=8.6" - } + "node_modules/mdn-data": { + "version": "2.27.1", + "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.27.1.tgz", + "integrity": "sha512-9Yubnt3e8A0OKwxYSXyhLymGW4sCufcLG6VdiDdUGVkPhpqLxlvP5vl1983gQjJl3tqbrM731mjaZaP68AgosQ==", + "dev": true, + "license": "CC0-1.0" }, "node_modules/minimatch": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", - "dev": true, + "version": "9.0.9", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.9.tgz", + "integrity": "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg==", "license": "ISC", "dependencies": { - "brace-expansion": "^1.1.7" + "brace-expansion": "^2.0.2" }, "engines": { - "node": "*" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" } }, "node_modules/motion-dom": { - "version": "12.34.3", - "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.34.3.tgz", - "integrity": "sha512-sYgFe+pR9aIM7o4fhs2aXtOI+oqlUd33N9Yoxcgo1Fv7M20sRkHtCmzE/VRNIcq7uNJ+qio+Xubt1FXH3pQ+eQ==", + "version": "12.42.2", + "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.42.2.tgz", + "integrity": "sha512-5gIMWLp/PycBtJRJWRgjxke5n8dlvkSn2DrYW+tr3XcqAZY1xZh6BJyooJXCM8wdfM7wfMjkBJNLge1CKPUIRA==", "license": "MIT", "dependencies": { - "motion-utils": "^12.29.2" + "motion-utils": "^12.39.0" } }, "node_modules/motion-utils": { - "version": "12.29.2", - "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.29.2.tgz", - "integrity": "sha512-G3kc34H2cX2gI63RqU+cZq+zWRRPSsNIOjpdl9TN4AQwC4sgwYPl/Q/Obf/d53nOm569T0fYK+tcoSV50BWx8A==", + "version": "12.39.0", + "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.39.0.tgz", + "integrity": "sha512-8nadJAJjTtqRkmRF36FoJTrywK9nnFmnPwnSMyxaOCU7GDjN9RTMJIxx9De8ErM+vpPhMccr/6fo5WciyQLnMQ==", "license": "MIT" }, "node_modules/ms": { @@ -5496,21 +5240,10 @@ "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, - "node_modules/mz": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", - "license": "MIT", - "dependencies": { - "any-promise": "^1.0.0", - "object-assign": "^4.0.1", - "thenify-all": "^1.0.0" - } - }, "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", + "version": "3.3.15", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.15.tgz", + "integrity": "sha512-y7Wygv/7mEOvxTuEQDB8StXdMRBWf1kR/tlhAzBRUFkB2jfcLOAxO/SHmOO2zgz1pVgK29/kyupn059/bCHdjA==", "funding": [ { "type": "github", @@ -5576,13 +5309,31 @@ "node": "4.x || >=6.0.0" } }, - "node_modules/node-fetch-native": { - "version": "1.6.7", - "resolved": "https://registry.npmjs.org/node-fetch-native/-/node-fetch-native-1.6.7.tgz", - "integrity": "sha512-g9yhqoedzIUm0nTnTqAQvueMPVOuIY16bqgAJJC8XOOubYFNwz6IER9qs0Gq2Xd0+CecCKFjtdDTMA4u4xG06Q==", + "node_modules/node-fetch/node_modules/tr46": { + "version": "0.0.3", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", + "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true, "license": "MIT" }, + "node_modules/node-fetch/node_modules/webidl-conversions": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", + "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", + "dev": true, + "license": "BSD-2-Clause" + }, + "node_modules/node-fetch/node_modules/whatwg-url": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", + "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "dev": true, + "license": "MIT", + "dependencies": { + "tr46": "~0.0.3", + "webidl-conversions": "^3.0.0" + } + }, "node_modules/node-readfiles": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/node-readfiles/-/node-readfiles-0.2.0.tgz", @@ -5594,35 +5345,11 @@ } }, "node_modules/node-releases": { - "version": "2.0.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", - "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", + "version": "2.0.50", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.50.tgz", + "integrity": "sha512-J6l92tKHX6w8Jy5nO1Vuc01NoIiRGi/d6qBKVxh+IQ8Cr3b6HbVNfKiF8ZpFKufTwpwxMmce2W3iQZ861ZRyTg==", "devOptional": true, - "license": "MIT" - }, - "node_modules/normalize-path": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/nypm": { - "version": "0.6.5", - "resolved": "https://registry.npmjs.org/nypm/-/nypm-0.6.5.tgz", - "integrity": "sha512-K6AJy1GMVyfyMXRVB88700BJqNUkByijGJM8kEHpLdcAt+vSQAVfkWWHYzuRXHSY6xA2sNc5RjTj0p9rE2izVQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "citty": "^0.2.0", - "pathe": "^2.0.3", - "tinyexec": "^1.0.2" - }, - "bin": { - "nypm": "dist/cli.mjs" - }, "engines": { "node": ">=18" } @@ -5653,9 +5380,9 @@ } }, "node_modules/oas-linter/node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { @@ -5683,9 +5410,9 @@ } }, "node_modules/oas-resolver/node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { @@ -5723,31 +5450,27 @@ } }, "node_modules/oas-validator/node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { "node": ">= 6" } }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", + "node_modules/obug": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/obug/-/obug-2.1.3.tgz", + "integrity": "sha512-9miFgM2OFba7hB+pRgvtV84pYTBaoTHohvmIgiRt6dRIzbwEOIaNaP+dIlGs2fNFoB0SeISs0Jz5WFVRid6Xyg==", + "dev": true, + "funding": [ + "https://github.com/sponsors/sxzz", + "https://opencollective.com/debug" + ], "license": "MIT", "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/object-hash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", - "license": "MIT", - "engines": { - "node": ">= 6" + "node": ">=12.20.0" } }, "node_modules/ohash": { @@ -5814,17 +5537,32 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/parent-module": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "node_modules/parse-imports-exports": { + "version": "0.2.4", + "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz", + "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==", + "license": "MIT", + "dependencies": { + "parse-statements": "1.0.11" + } + }, + "node_modules/parse-statements": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz", + "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==", + "license": "MIT" + }, + "node_modules/parse5": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-8.0.1.tgz", + "integrity": "sha512-z1e/HMG90obSGeidlli3hj7cbocou0/wa5HacvI3ASx34PecNjNQeaHNo5WIZpWofN9kgkqV1q5YvXe3F0FoPw==", "dev": true, "license": "MIT", "dependencies": { - "callsites": "^3.0.0" + "entities": "^8.0.0" }, - "engines": { - "node": ">=6" + "funding": { + "url": "https://github.com/inikulin/parse5?sponsor=1" } }, "node_modules/path-exists": { @@ -5847,12 +5585,6 @@ "node": ">=8" } }, - "node_modules/path-parse": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", - "license": "MIT" - }, "node_modules/pathe": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/pathe/-/pathe-2.0.3.tgz", @@ -5874,51 +5606,66 @@ "license": "ISC" }, "node_modules/picomatch": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.5.tgz", + "integrity": "sha512-RvwwcruNjI1ncT5xRakeyS9Lf8lcItv34KD+aif+VH9kduAyfYBipGh12274xtenIPZ119/R9BdTBa8gAwSh0A==", + "dev": true, "license": "MIT", "engines": { - "node": ">=8.6" + "node": ">=12" }, "funding": { "url": "https://github.com/sponsors/jonschlinkert" } }, - "node_modules/pify": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/pirates": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", - "license": "MIT", - "engines": { - "node": ">= 6" - } - }, "node_modules/pkg-types": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.0.tgz", - "integrity": "sha512-SIqCzDRg0s9npO5XQ3tNZioRY1uK06lA41ynBC1YmFTmnY6FjUjVt6s4LoADmwoig1qqD0oK8h1p/8mlMx8Oig==", + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.1.tgz", + "integrity": "sha512-y+ichcgc2LrADuhLNAx8DFjVfgz91pRxfZdI3UDhxHvcVEZsenLO+7XaU5vOp0u/7V/wZ+plyuQxtrDlZJ+yeg==", "dev": true, "license": "MIT", "dependencies": { - "confbox": "^0.2.2", - "exsolve": "^1.0.7", + "confbox": "^0.2.4", + "exsolve": "^1.0.8", "pathe": "^2.0.3" } }, + "node_modules/playwright": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright/-/playwright-1.61.1.tgz", + "integrity": "sha512-DWnY5o3YbLWK4GovuAVwpqL+1VwGNdUGrRr++8j8PtQQzvAVZUIMjKQ90fY689sEJZJBbZVw1rXaOKSTitkzPQ==", + "dev": true, + "license": "Apache-2.0", + "dependencies": { + "playwright-core": "1.61.1" + }, + "bin": { + "playwright": "cli.js" + }, + "engines": { + "node": ">=18" + }, + "optionalDependencies": { + "fsevents": "2.3.2" + } + }, + "node_modules/playwright-core": { + "version": "1.61.1", + "resolved": "https://registry.npmjs.org/playwright-core/-/playwright-core-1.61.1.tgz", + "integrity": "sha512-h7Qlt6m4REp25qvIdvbDtVmD4LqVXfpRxhORv9L0jzETM05p4fuPJ3dKyuSXQxDSbXnmS79HAgi9589lGSpLkg==", + "dev": true, + "license": "Apache-2.0", + "bin": { + "playwright-core": "cli.js" + }, + "engines": { + "node": ">=18" + } + }, "node_modules/postcss": { - "version": "8.4.24", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz", - "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==", + "version": "8.5.16", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.16.tgz", + "integrity": "sha512-vuwillviilfKZsg0VGj5R/YwwcHx4SLsIOI/7K6mQkWx+l5cUHTjj5g0AasTBcyXsbfTgrwsUNmVUb5xVwyPwg==", "funding": [ { "type": "opencollective", @@ -5934,142 +5681,20 @@ } ], "license": "MIT", - "peer": true, "dependencies": { - "nanoid": "^3.3.6", - "picocolors": "^1.0.0", - "source-map-js": "^1.0.2" + "nanoid": "^3.3.12", + "picocolors": "^1.1.1", + "source-map-js": "^1.2.1" }, "engines": { "node": "^10 || ^12 || >=14" } }, - "node_modules/postcss-import": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", - "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", - "license": "MIT", - "dependencies": { - "postcss-value-parser": "^4.0.0", - "read-cache": "^1.0.0", - "resolve": "^1.1.7" - }, - "engines": { - "node": ">=14.0.0" - }, - "peerDependencies": { - "postcss": "^8.0.0" - } - }, - "node_modules/postcss-js": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz", - "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "camelcase-css": "^2.0.1" - }, - "engines": { - "node": "^12 || ^14 || >= 16" - }, - "peerDependencies": { - "postcss": "^8.4.21" - } - }, - "node_modules/postcss-load-config": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz", - "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "lilconfig": "^3.1.1" - }, - "engines": { - "node": ">= 18" - }, - "peerDependencies": { - "jiti": ">=1.21.0", - "postcss": ">=8.0.9", - "tsx": "^4.8.1", - "yaml": "^2.4.2" - }, - "peerDependenciesMeta": { - "jiti": { - "optional": true - }, - "postcss": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { - "optional": true - } - } - }, - "node_modules/postcss-nested": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", - "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "postcss-selector-parser": "^6.1.1" - }, - "engines": { - "node": ">=12.0" - }, - "peerDependencies": { - "postcss": "^8.2.14" - } - }, - "node_modules/postcss-selector-parser": { - "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", - "license": "MIT", - "dependencies": { - "cssesc": "^3.0.0", - "util-deprecate": "^1.0.2" - }, - "engines": { - "node": ">=4" - } - }, "node_modules/postcss-value-parser": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true, "license": "MIT" }, "node_modules/prelude-ls": { @@ -6083,9 +5708,9 @@ } }, "node_modules/prettier": { - "version": "3.8.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.8.1.tgz", - "integrity": "sha512-UOnG6LftzbdaHZcKoPFtOcCKztrQ57WkHDeRD9t/PTQtmT0NHSeWWepj6pS0z/N7+08BHFDQVUrfmfMRcZwbMg==", + "version": "3.9.4", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-3.9.4.tgz", + "integrity": "sha512-yWG/o/4oJfo036EKAfK6ACAoDOfHeRHx4tuxkfBZiauURiaSmYwlpOr5LQqKtIkRD2z1PLteme2WoxEnj4tHTg==", "license": "MIT", "peer": true, "bin": { @@ -6099,12 +5724,12 @@ } }, "node_modules/prettier-plugin-tailwindcss": { - "version": "0.6.14", - "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.6.14.tgz", - "integrity": "sha512-pi2e/+ZygeIqntN+vC573BcW5Cve8zUB0SSAGxqpB4f96boZF4M3phPVoOFCeypwkpRYdi7+jQ5YJJUwrkGUAg==", + "version": "0.8.0", + "resolved": "https://registry.npmjs.org/prettier-plugin-tailwindcss/-/prettier-plugin-tailwindcss-0.8.0.tgz", + "integrity": "sha512-V8ITGH87yuBDF6JpEZTOVlUz/saAwqb8f3HRgUj8Lh+tGCcrmorhsLpYqzygwFwK0PE2Ib6Mv3M7T/uE2tZV1g==", "license": "MIT", "engines": { - "node": ">=14.21.3" + "node": ">=20.19" }, "peerDependencies": { "@ianvs/prettier-plugin-sort-imports": "*", @@ -6117,14 +5742,12 @@ "prettier": "^3.0", "prettier-plugin-astro": "*", "prettier-plugin-css-order": "*", - "prettier-plugin-import-sort": "*", "prettier-plugin-jsdoc": "*", "prettier-plugin-marko": "*", "prettier-plugin-multiline-arrays": "*", "prettier-plugin-organize-attributes": "*", "prettier-plugin-organize-imports": "*", "prettier-plugin-sort-imports": "*", - "prettier-plugin-style-order": "*", "prettier-plugin-svelte": "*" }, "peerDependenciesMeta": { @@ -6155,9 +5778,6 @@ "prettier-plugin-css-order": { "optional": true }, - "prettier-plugin-import-sort": { - "optional": true - }, "prettier-plugin-jsdoc": { "optional": true }, @@ -6176,14 +5796,26 @@ "prettier-plugin-sort-imports": { "optional": true }, - "prettier-plugin-style-order": { - "optional": true - }, "prettier-plugin-svelte": { "optional": true } } }, + "node_modules/pretty-format": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.1.tgz", + "integrity": "sha512-Qb1gy5OrP5+zDf2Bvnzdl3jsTf1qXVMazbvCoKhtKqVs4/YK4ozX4gKQJJVyNe+cajNPn0KoC0MC3FUmaHWEmQ==", + "dev": true, + "license": "MIT", + "dependencies": { + "ansi-regex": "^5.0.1", + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "engines": { + "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" + } + }, "node_modules/punycode": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", @@ -6194,56 +5826,34 @@ "node": ">=6" } }, - "node_modules/queue-microtask": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT" - }, "node_modules/rc9": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/rc9/-/rc9-2.1.2.tgz", - "integrity": "sha512-btXCnMmRIBINM2LDZoEmOogIZU7Qe7zn4BpomSKZ/ykbLObuBdvG+mFq11DL6fjH1DRwHhrlgtYWG96bJiC7Cg==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/rc9/-/rc9-3.0.1.tgz", + "integrity": "sha512-gMDyleLWVE+i6Sgtc0QbbY6pEKqYs97NGi6isHQPqYlLemPoO8dxQ3uGi0f4NiP98c+jMW6cG1Kx9dDwfvqARQ==", "dev": true, "license": "MIT", "dependencies": { - "defu": "^6.1.4", - "destr": "^2.0.3" + "defu": "^6.1.6", + "destr": "^2.0.5" } }, "node_modules/react": { - "version": "19.2.4", - "resolved": "https://registry.npmjs.org/react/-/react-19.2.4.tgz", - "integrity": "sha512-9nfp2hYpCwOjAN+8TZFGhtWEwgvWHXqESH8qT89AT/lWklpLON22Lc8pEtnpsZz7VmawabSU0gCjnj8aC0euHQ==", + "version": "19.2.7", + "resolved": "https://registry.npmjs.org/react/-/react-19.2.7.tgz", + "integrity": "sha512-HNe9WslTbXmFK8o8cmwgAeJFSBvt1bPdHCVKtaaV+WlAN36mpT4hcRpwbf3fY56ar2oIXzsBpOAiIRHAdY0OlQ==", "license": "MIT", - "peer": true, "engines": { "node": ">=0.10.0" } }, "node_modules/react-day-picker": { - "version": "9.13.2", - "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-9.13.2.tgz", - "integrity": "sha512-IMPiXfXVIAuR5Yk58DDPBC8QKClrhdXV+Tr/alBrwrHUw0qDDYB1m5zPNuTnnPIr/gmJ4ChMxmtqPdxm8+R4Eg==", + "version": "10.0.1", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-10.0.1.tgz", + "integrity": "sha512-eNh6BlwcYInWaJtRv18mXQ06Ys/H6rdTZAnTaSdOYJuTpwP1JMCHNd1FDRadA+gbeinq+psdULN5Xnowy9mV8w==", "license": "MIT", "dependencies": { "@date-fns/tz": "^1.4.1", - "date-fns": "^4.1.0", - "date-fns-jalali": "^4.1.0-0" + "date-fns": "^4.1.0" }, "engines": { "node": ">=18" @@ -6253,28 +5863,32 @@ "url": "https://github.com/sponsors/gpbl" }, "peerDependencies": { + "@types/react": ">=16.8.0", "react": ">=16.8.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } } }, "node_modules/react-dom": { - "version": "19.2.4", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.4.tgz", - "integrity": "sha512-AXJdLo8kgMbimY95O2aKQqsz2iWi9jMgKJhRBAxECE4IFxfcazB2LmzloIoibJI3C12IlY20+KFaLv+71bUJeQ==", + "version": "19.2.7", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.2.7.tgz", + "integrity": "sha512-t0BRVXvbiE/o20Hfw669rLbMCDWtYZLvmJigy2f0MxsXF+71pxhR3xOkspmsO8h3ZlNzyibAmtCa3l4lYKk6gQ==", "license": "MIT", - "peer": true, "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { - "react": "^19.2.4" + "react": "^19.2.7" } }, "node_modules/react-hook-form": { - "version": "7.71.2", - "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.71.2.tgz", - "integrity": "sha512-1CHvcDYzuRUNOflt4MOq3ZM46AronNJtQ1S7tnX6YN4y72qhgiUItpacZUAQ0TyWYci3yz1X+rXaSxiuEm86PA==", + "version": "7.81.0", + "resolved": "https://registry.npmjs.org/react-hook-form/-/react-hook-form-7.81.0.tgz", + "integrity": "sha512-ocbmr2p5KBMoAfj4WCUvped33lVi1Kd5DuDUvQDnB6VEAacOjPI/jMbtDdbhco4y9ct4xUuCmMY0b/C9L0QHjw==", "license": "MIT", - "peer": true, "engines": { "node": ">=18.0.0" }, @@ -6287,19 +5901,19 @@ } }, "node_modules/react-i18next": { - "version": "16.5.4", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-16.5.4.tgz", - "integrity": "sha512-6yj+dcfMncEC21QPhOTsW8mOSO+pzFmT6uvU7XXdvM/Cp38zJkmTeMeKmTrmCMD5ToT79FmiE/mRWiYWcJYW4g==", + "version": "17.0.8", + "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-17.0.8.tgz", + "integrity": "sha512-0ooKbGLU8JXhe1zwpQUWIeXSgLPOfwJmgheWRIUpcoA0CpyabpGhayjdG+/eA5esC1AQ8h2jWpXjJfzQzeDOCw==", "license": "MIT", "dependencies": { - "@babel/runtime": "^7.28.4", + "@babel/runtime": "^7.29.2", "html-parse-stringify": "^3.0.1", "use-sync-external-store": "^1.6.0" }, "peerDependencies": { - "i18next": ">= 25.6.2", + "i18next": ">= 26.2.0", "react": ">= 16.8.0", - "typescript": "^5" + "typescript": "^5 || ^6" }, "peerDependenciesMeta": { "react-dom": { @@ -6313,15 +5927,12 @@ } } }, - "node_modules/react-refresh": { - "version": "0.18.0", - "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.18.0.tgz", - "integrity": "sha512-QgT5//D3jfjJb6Gsjxv0Slpj23ip+HtOpnNgnb2S5zU3CB26G/IDPGoy4RJB42wzFE46DRsstbW6tKHoKbhAxw==", + "node_modules/react-is": { + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true, - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } + "license": "MIT" }, "node_modules/react-remove-scroll": { "version": "2.7.2", @@ -6371,9 +5982,9 @@ } }, "node_modules/react-router": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz", - "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==", + "version": "7.18.1", + "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.18.1.tgz", + "integrity": "sha512-GDLgg3i3uM0aeJO3Fm+TCS+sDQ7gu12T6x0qdTEzcwqEfleci7JwugVNIF3U//0FWKnJT7ptG+20B2jfDqnZAg==", "license": "MIT", "dependencies": { "cookie": "^1.0.1", @@ -6393,12 +6004,12 @@ } }, "node_modules/react-router-dom": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.0.tgz", - "integrity": "sha512-5CO/l5Yahi2SKC6rGZ+HDEjpjkGaG/ncEP7eWFTvFxbHP8yeeI0PxTDjimtpXYlR3b3i9/WIL4VJttPrESIf2g==", + "version": "7.18.1", + "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.18.1.tgz", + "integrity": "sha512-KaZh+X/6UtEp28x51AUYZDMg9NGoz2ja3dNHa+ta/tk40vCzKhQ/RypCWBMLbmDr6//E24Vv5uPsrqXFozdkAg==", "license": "MIT", "dependencies": { - "react-router": "7.13.0" + "react-router": "7.18.1" }, "engines": { "node": ">=20.0.0" @@ -6431,24 +6042,15 @@ } }, "node_modules/react-virtuoso": { - "version": "4.18.1", - "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.1.tgz", - "integrity": "sha512-KF474cDwaSb9+SJ380xruBB4P+yGWcVkcu26HtMqYNMTYlYbrNy8vqMkE+GpAApPPufJqgOLMoWMFG/3pJMXUA==", + "version": "4.18.10", + "resolved": "https://registry.npmjs.org/react-virtuoso/-/react-virtuoso-4.18.10.tgz", + "integrity": "sha512-P6GIZ7kWAPOYB2H16yRQNgy+VF9pJOuTFw1EUc1EAtCj5WxVSAF1Sql3x3fbLwaLeBFsiPnu+3U9o6sIOyTdFw==", "license": "MIT", "peerDependencies": { "react": ">=16 || >=17 || >= 18 || >= 19", "react-dom": ">=16 || >=17 || >= 18 || >=19" } }, - "node_modules/read-cache": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", - "license": "MIT", - "dependencies": { - "pify": "^2.3.0" - } - }, "node_modules/readdirp": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.0.0.tgz", @@ -6483,112 +6085,61 @@ "node": ">=0.10.0" } }, - "node_modules/resolve": { - "version": "1.22.11", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", - "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", - "license": "MIT", - "dependencies": { - "is-core-module": "^2.16.1", - "path-parse": "^1.0.7", - "supports-preserve-symlinks-flag": "^1.0.0" - }, - "bin": { - "resolve": "bin/resolve" - }, - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, - "node_modules/resolve-from": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "node_modules/require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, "license": "MIT", "engines": { - "node": ">=4" - } - }, - "node_modules/reusify": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", - "license": "MIT", - "engines": { - "iojs": ">=1.0.0", "node": ">=0.10.0" } }, - "node_modules/rollup": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.58.0.tgz", - "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==", + "node_modules/rolldown": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.1.4.tgz", + "integrity": "sha512-IjZYiLxZwpnhwhdBH2ugdTGVSdhCQUmLxLoqyjiL0JxYjyRst+5a0P3xfrTxJ5F638j4Mvvw5FAX5XE6eHpXbA==", "dev": true, "license": "MIT", "dependencies": { - "@types/estree": "1.0.8" + "@oxc-project/types": "=0.138.0", + "@rolldown/pluginutils": "^1.0.0" }, "bin": { - "rollup": "dist/bin/rollup" + "rolldown": "bin/cli.mjs" }, "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" + "node": "^20.19.0 || >=22.12.0" }, "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.58.0", - "@rollup/rollup-android-arm64": "4.58.0", - "@rollup/rollup-darwin-arm64": "4.58.0", - "@rollup/rollup-darwin-x64": "4.58.0", - "@rollup/rollup-freebsd-arm64": "4.58.0", - "@rollup/rollup-freebsd-x64": "4.58.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.58.0", - "@rollup/rollup-linux-arm-musleabihf": "4.58.0", - "@rollup/rollup-linux-arm64-gnu": "4.58.0", - "@rollup/rollup-linux-arm64-musl": "4.58.0", - "@rollup/rollup-linux-loong64-gnu": "4.58.0", - "@rollup/rollup-linux-loong64-musl": "4.58.0", - "@rollup/rollup-linux-ppc64-gnu": "4.58.0", - "@rollup/rollup-linux-ppc64-musl": "4.58.0", - "@rollup/rollup-linux-riscv64-gnu": "4.58.0", - "@rollup/rollup-linux-riscv64-musl": "4.58.0", - "@rollup/rollup-linux-s390x-gnu": "4.58.0", - "@rollup/rollup-linux-x64-gnu": "4.58.0", - "@rollup/rollup-linux-x64-musl": "4.58.0", - "@rollup/rollup-openbsd-x64": "4.58.0", - "@rollup/rollup-openharmony-arm64": "4.58.0", - "@rollup/rollup-win32-arm64-msvc": "4.58.0", - "@rollup/rollup-win32-ia32-msvc": "4.58.0", - "@rollup/rollup-win32-x64-gnu": "4.58.0", - "@rollup/rollup-win32-x64-msvc": "4.58.0", - "fsevents": "~2.3.2" + "@rolldown/binding-android-arm64": "1.1.4", + "@rolldown/binding-darwin-arm64": "1.1.4", + "@rolldown/binding-darwin-x64": "1.1.4", + "@rolldown/binding-freebsd-x64": "1.1.4", + "@rolldown/binding-linux-arm-gnueabihf": "1.1.4", + "@rolldown/binding-linux-arm64-gnu": "1.1.4", + "@rolldown/binding-linux-arm64-musl": "1.1.4", + "@rolldown/binding-linux-ppc64-gnu": "1.1.4", + "@rolldown/binding-linux-s390x-gnu": "1.1.4", + "@rolldown/binding-linux-x64-gnu": "1.1.4", + "@rolldown/binding-linux-x64-musl": "1.1.4", + "@rolldown/binding-openharmony-arm64": "1.1.4", + "@rolldown/binding-wasm32-wasi": "1.1.4", + "@rolldown/binding-win32-arm64-msvc": "1.1.4", + "@rolldown/binding-win32-x64-msvc": "1.1.4" } }, - "node_modules/run-parallel": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/feross" - }, - { - "type": "patreon", - "url": "https://www.patreon.com/feross" - }, - { - "type": "consulting", - "url": "https://feross.org/support" - } - ], - "license": "MIT", + "node_modules/saxes": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-6.0.0.tgz", + "integrity": "sha512-xAg7SOnEhrm5zI3puOOKyy1OMcMlIJZYNJY7xLBwSze0UjhPLnWfj2GF2EpT0jmzaJKIWKHLsaSSajf35bcYnA==", + "dev": true, + "license": "ISC", "dependencies": { - "queue-microtask": "^1.2.2" + "xmlchars": "^2.2.0" + }, + "engines": { + "node": ">=v12.22.7" } }, "node_modules/scheduler": { @@ -6696,6 +6247,32 @@ "dev": true, "license": "MIT" }, + "node_modules/siginfo": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/siginfo/-/siginfo-2.0.0.tgz", + "integrity": "sha512-ybx0WO1/8bSBLEWXZvEd7gMW3Sn3JFlW3TvX1nREbDLRNQNaeNN8WK0meBwPdAaOI7TtRRRJn/Es1zhrrCHu7g==", + "dev": true, + "license": "ISC" + }, + "node_modules/simple-icons": { + "version": "16.25.0", + "resolved": "https://registry.npmjs.org/simple-icons/-/simple-icons-16.25.0.tgz", + "integrity": "sha512-ReYPfbqjkTBovxjerHw2tf6E1rQdaCqNJKaJbd78Mui8w+78xQlE1aDO/2ekID++n8qa+1t+oaueYLeiSoQsIA==", + "funding": [ + { + "type": "opencollective", + "url": "https://opencollective.com/simple-icons" + }, + { + "type": "github", + "url": "https://github.com/sponsors/simple-icons" + } + ], + "license": "CC0-1.0", + "engines": { + "node": ">=0.12.18" + } + }, "node_modules/sonner": { "version": "2.0.7", "resolved": "https://registry.npmjs.org/sonner/-/sonner-2.0.7.tgz", @@ -6715,6 +6292,20 @@ "node": ">=0.10.0" } }, + "node_modules/stackback": { + "version": "0.0.2", + "resolved": "https://registry.npmjs.org/stackback/-/stackback-0.0.2.tgz", + "integrity": "sha512-1XMJE5fQo1jGH6Y/7ebnwPOBEkIEnT4QF32d5R1+VXdXveM0IBMJt8zfaxX1P3QhVwrYe+576+jkANtSS2mBbw==", + "dev": true, + "license": "MIT" + }, + "node_modules/std-env": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/std-env/-/std-env-4.1.0.tgz", + "integrity": "sha512-Rq7ybcX2RuC55r9oaPVEW7/xu3tj8u4GeBYHBWCychFtzMIr86A7e3PPEBPT37sHStKX3+TiX/Fr/ACmJLVlLQ==", + "dev": true, + "license": "MIT" + }, "node_modules/string-width": { "version": "4.2.3", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", @@ -6743,66 +6334,6 @@ "node": ">=8" } }, - "node_modules/strip-json-comments": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=8" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/sucrase": { - "version": "3.35.1", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz", - "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==", - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.2", - "commander": "^4.0.0", - "lines-and-columns": "^1.1.6", - "mz": "^2.7.0", - "pirates": "^4.0.1", - "tinyglobby": "^0.2.11", - "ts-interface-checker": "^0.1.9" - }, - "bin": { - "sucrase": "bin/sucrase", - "sucrase-node": "bin/sucrase-node" - }, - "engines": { - "node": ">=16 || 14 >=14.17" - } - }, - "node_modules/supports-color": { - "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", - "dev": true, - "license": "MIT", - "dependencies": { - "has-flag": "^4.0.0" - }, - "engines": { - "node": ">=8" - } - }, - "node_modules/supports-preserve-symlinks-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", - "license": "MIT", - "engines": { - "node": ">= 0.4" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/swagger-schema-official": { "version": "2.0.0-bab6bed", "resolved": "https://registry.npmjs.org/swagger-schema-official/-/swagger-schema-official-2.0.0-bab6bed.tgz", @@ -6811,30 +6342,31 @@ "license": "ISC" }, "node_modules/swagger-typescript-api": { - "version": "13.2.18", - "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.2.18.tgz", - "integrity": "sha512-YLcEdW3weYRB1BokCJv8RnxPdPRV36segDLu1kVIn+02S9emDU86CwRuZKmQ3izZRAuWtRYvCzB0p1vwb8mwgw==", + "version": "13.12.4", + "resolved": "https://registry.npmjs.org/swagger-typescript-api/-/swagger-typescript-api-13.12.4.tgz", + "integrity": "sha512-sDhtt0zTibPb3bk8WBMWmgDxVIaD0Juek9lQwQmeND1TdV85UxrjBNkazspEh62x0fAlLvvhDSjW7ZlFNzy59Q==", "dev": true, "license": "MIT", "dependencies": { - "@biomejs/js-api": "4.0.0", - "@biomejs/wasm-nodejs": "2.3.15", + "@apidevtools/swagger-parser": "12.1.0", + "@biomejs/js-api": "6.0.0", + "@biomejs/wasm-nodejs": "2.5.2", "@types/swagger-schema-official": "^2.0.25", - "c12": "^3.3.3", - "citty": "^0.2.1", + "c12": "^3.3.4", + "citty": "^0.2.2", "consola": "^3.4.2", - "es-toolkit": "^1.44.0", + "es-toolkit": "^1.49.0", "eta": "^3.5.0", - "nanoid": "^5.1.6", + "nanoid": "^5.1.16", "openapi-types": "^12.1.3", "swagger-schema-official": "2.0.0-bab6bed", "swagger2openapi": "^7.0.8", - "type-fest": "^5.4.4", - "typescript": "~5.9.3", - "yaml": "^2.8.2" + "type-fest": "^5.7.0", + "typescript": "^6.0.3", + "yaml": "^2.9.0", + "yummies": "7.20.1" }, "bin": { - "sta": "dist/cli.mjs", "swagger-typescript-api": "dist/cli.mjs" }, "engines": { @@ -6842,9 +6374,9 @@ } }, "node_modules/swagger-typescript-api/node_modules/nanoid": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.6.tgz", - "integrity": "sha512-c7+7RQ+dMB5dPwwCp4ee1/iV/q2P6aK1mTZcfr1BTuVlyW9hJYiMPybJCcnBlQtuSmTIWNeazm/zqNoZSSElBg==", + "version": "5.1.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.16.tgz", + "integrity": "sha512-kVrnsrJqMR8+oLJnGEmSWw9BivK5mt7H3FZatVRjrc5wGqFYuBxX1yG7+A7Gi5AefkX6t/oCkizcQgpu0cY1dQ==", "dev": true, "funding": [ { @@ -6889,9 +6421,9 @@ } }, "node_modules/swagger2openapi/node_modules/yaml": { - "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", + "version": "1.10.3", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.3.tgz", + "integrity": "sha512-vIYeF1u3CjlhAFekPPAk2h/Kv4T3mAkMox5OymRiJQB0spDP10LHvt+K7G9Ny6NuuMAb25/6n1qyUjAcGNf/AA==", "dev": true, "license": "ISC", "engines": { @@ -6899,9 +6431,9 @@ } }, "node_modules/swr": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.0.tgz", - "integrity": "sha512-sUlC20T8EOt1pHmDiqueUWMmRRX03W7w5YxovWX7VR2KHEPCTMly85x05vpkP5i6Bu4h44ePSMD9Tc+G2MItFw==", + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/swr/-/swr-2.4.2.tgz", + "integrity": "sha512-ej644Y2bvkIajfR32KGeSSdBXQW+ScjGjkybZgSE7kFpk9eGnV44XY9FJylXi+W75pavSX1PVNB57W5EbhGIYw==", "license": "MIT", "dependencies": { "dequal": "^2.0.3", @@ -6911,6 +6443,13 @@ "react": "^16.11.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, + "node_modules/symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==", + "dev": true, + "license": "MIT" + }, "node_modules/tagged-tag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/tagged-tag/-/tagged-tag-1.0.0.tgz", @@ -6925,9 +6464,9 @@ } }, "node_modules/tailwind-merge": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.5.0.tgz", - "integrity": "sha512-I8K9wewnVDkL1NTGoqWmVEIlUcB9gFriAEkXkfCjX5ib8ezGxtR3xD7iZIxrfArjEsH7F1CHD4RFUtxefdqV/A==", + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-3.6.0.tgz", + "integrity": "sha512-uxL7qAVQriqRQPAyK3pj66VqskWqoZ37PW94jwOTwNfq/z9oyu1V+eqrZqtR2+fCiXdYOZe/Modt8GtvqNzu+w==", "license": "MIT", "funding": { "type": "github", @@ -6935,42 +6474,10 @@ } }, "node_modules/tailwindcss": { - "version": "3.4.19", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.19.tgz", - "integrity": "sha512-3ofp+LL8E+pK/JuPLPggVAIaEuhvIz4qNcf3nA1Xn2o/7fb7s/TYpHhwGDv1ZU3PkBluUVaF8PyCHcm48cKLWQ==", - "license": "MIT", - "peer": true, - "dependencies": { - "@alloc/quick-lru": "^5.2.0", - "arg": "^5.0.2", - "chokidar": "^3.6.0", - "didyoumean": "^1.2.2", - "dlv": "^1.1.3", - "fast-glob": "^3.3.2", - "glob-parent": "^6.0.2", - "is-glob": "^4.0.3", - "jiti": "^1.21.7", - "lilconfig": "^3.1.3", - "micromatch": "^4.0.8", - "normalize-path": "^3.0.0", - "object-hash": "^3.0.0", - "picocolors": "^1.1.1", - "postcss": "^8.4.47", - "postcss-import": "^15.1.0", - "postcss-js": "^4.0.1", - "postcss-load-config": "^4.0.2 || ^5.0 || ^6.0", - "postcss-nested": "^6.2.0", - "postcss-selector-parser": "^6.1.2", - "resolve": "^1.22.8", - "sucrase": "^3.35.0" - }, - "bin": { - "tailwind": "lib/cli.js", - "tailwindcss": "lib/cli.js" - }, - "engines": { - "node": ">=14.0.0" - } + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.3.2.tgz", + "integrity": "sha512-WtctNNSH8A9jlMIqxzuYumOHU5uGZyRv0Q5svQl+oEPy5w84YpBxdb7MdqyiSPQge5jTJ6zFQLq0PFygdccSBA==", + "license": "MIT" }, "node_modules/tailwindcss-animate": { "version": "1.0.7", @@ -6981,95 +6488,10 @@ "tailwindcss": ">=3.0.0 || insiders" } }, - "node_modules/tailwindcss/node_modules/chokidar": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", - "license": "MIT", - "dependencies": { - "anymatch": "~3.1.2", - "braces": "~3.0.2", - "glob-parent": "~5.1.2", - "is-binary-path": "~2.1.0", - "is-glob": "~4.0.1", - "normalize-path": "~3.0.0", - "readdirp": "~3.6.0" - }, - "engines": { - "node": ">= 8.10.0" - }, - "funding": { - "url": "https://paulmillr.com/funding/" - }, - "optionalDependencies": { - "fsevents": "~2.3.2" - } - }, - "node_modules/tailwindcss/node_modules/chokidar/node_modules/glob-parent": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", - "license": "ISC", - "dependencies": { - "is-glob": "^4.0.1" - }, - "engines": { - "node": ">= 6" - } - }, - "node_modules/tailwindcss/node_modules/jiti": { - "version": "1.21.7", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", - "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", - "license": "MIT", - "bin": { - "jiti": "bin/jiti.js" - } - }, - "node_modules/tailwindcss/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/tailwindcss/node_modules/readdirp": { - "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", - "license": "MIT", - "dependencies": { - "picomatch": "^2.2.1" - }, - "engines": { - "node": ">=8.10.0" - } - }, "node_modules/tapable": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", - "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.3.tgz", + "integrity": "sha512-uxc/zpqFg6x7C8vOE7lh6Lbda8eEL9zmVm/PLeTPBRhh1xCgdWaQ+J1CUieGpIfm2HdtsUpRv+HshiasBMcc6A==", "license": "MIT", "engines": { "node": ">=6" @@ -7079,31 +6501,17 @@ "url": "https://opencollective.com/webpack" } }, - "node_modules/thenify": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", - "license": "MIT", - "dependencies": { - "any-promise": "^1.0.0" - } - }, - "node_modules/thenify-all": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", - "license": "MIT", - "dependencies": { - "thenify": ">= 3.1.0 < 4" - }, - "engines": { - "node": ">=0.8" - } + "node_modules/tinybench": { + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/tinybench/-/tinybench-2.9.0.tgz", + "integrity": "sha512-0+DUvqWMValLmha6lr4kD8iAMK1HzV0/aKnCtWb9v9641TnP/MFb7Pc2bxoxQjTXAErryXVgUOfv2YqNllqGeg==", + "dev": true, + "license": "MIT" }, "node_modules/tinyexec": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", - "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.2.4.tgz", + "integrity": "sha512-SHf/r48b7vOrjve9PxJo3MN5v5yuyjHvdUcrQffT3WXMUfnGmHDVbC4k3sHJaJTgZCwpUplIaAo5ANtMyp3YHg==", "dev": true, "license": "MIT", "engines": { @@ -7111,13 +6519,14 @@ } }, "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", + "version": "0.2.17", + "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.17.tgz", + "integrity": "sha512-wXR/dYpcqKmfWpEdZjiKJOwCNFndD0DMnrW/cYjVGttEkBfVgcLFHoNrlj47mjOVic9yyNu65alsgF4NQyTa2g==", + "dev": true, "license": "MIT", "dependencies": { "fdir": "^6.5.0", - "picomatch": "^4.0.3" + "picomatch": "^4.0.4" }, "engines": { "node": ">=12.0.0" @@ -7126,65 +6535,66 @@ "url": "https://github.com/sponsors/SuperchupuDev" } }, - "node_modules/tinyglobby/node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "node_modules/tinyrainbow": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/tinyrainbow/-/tinyrainbow-3.1.0.tgz", + "integrity": "sha512-Bf+ILmBgretUrdJxzXM0SgXLZ3XfiaUuOj/IKQHuTXip+05Xn+uyEYdVg0kYDipTBcLrCVyUzAPz7QmArb0mmw==", + "dev": true, "license": "MIT", "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } + "node": ">=14.0.0" } }, - "node_modules/tinyglobby/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "node_modules/tldts": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/tldts/-/tldts-7.4.6.tgz", + "integrity": "sha512-rbP0Gyx8b3Ae9yO//CU2wbSnQNoQ66m1nJdSbSHmnwKwzkkz/u8mERYU8T2rmlmy+bJvRNn84yNCW8gYqox44Q==", + "dev": true, "license": "MIT", "dependencies": { - "is-number": "^7.0.0" + "tldts-core": "^7.4.6" }, - "engines": { - "node": ">=8.0" + "bin": { + "tldts": "bin/cli.js" } }, - "node_modules/toggle-selection": { - "version": "1.0.6", - "resolved": "https://registry.npmjs.org/toggle-selection/-/toggle-selection-1.0.6.tgz", - "integrity": "sha512-BiZS+C1OS8g/q2RRbJmy59xpyghNBqrr6k5L/uKBGRsTfxmu3ffiRnd8mlGPUVayg8pvfi5urfnu8TU7DVOkLQ==", - "license": "MIT" - }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", + "node_modules/tldts-core": { + "version": "7.4.6", + "resolved": "https://registry.npmjs.org/tldts-core/-/tldts-core-7.4.6.tgz", + "integrity": "sha512-TkQNGJIhlEphpHCjKodMTSe23egUZr/g+flI2qkLgiJ/maAzSgXypSLRTNH3nCmqgayEmtcJBiLcfODSAr1xoA==", "dev": true, "license": "MIT" }, + "node_modules/tough-cookie": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-6.0.1.tgz", + "integrity": "sha512-LktZQb3IeoUWB9lqR5EWTHgW/VTITCXg4D21M+lvybRVdylLrRMnqaIONLVb5mav8vM19m44HIcGq4qASeu2Qw==", + "dev": true, + "license": "BSD-3-Clause", + "dependencies": { + "tldts": "^7.0.5" + }, + "engines": { + "node": ">=16" + } + }, + "node_modules/tr46": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-6.0.0.tgz", + "integrity": "sha512-bLVMLPtstlZ4iMQHpFHTR7GAGj2jxi8Dg0s2h2MafAE4uSWF98FC/3MomU51iQAMf8/qDUbKWf5GxuvvVcXEhw==", + "dev": true, + "license": "MIT", + "dependencies": { + "punycode": "^2.3.1" + }, + "engines": { + "node": ">=20" + } + }, "node_modules/ts-api-utils": { - "version": "2.4.0", - "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.4.0.tgz", - "integrity": "sha512-3TaVTaAv2gTiMB35i3FiGJaRfwb3Pyn/j3m/bfAvGe8FB7CF6u+LMYqYlDh7reQf7UNvoTvdfAqHGmPGOSsPmA==", + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz", + "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==", "dev": true, "license": "MIT", "engines": { @@ -7194,12 +6604,6 @@ "typescript": ">=4.8.4" } }, - "node_modules/ts-interface-checker": { - "version": "0.1.13", - "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", - "license": "Apache-2.0" - }, "node_modules/tslib": { "version": "2.8.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", @@ -7220,9 +6624,9 @@ } }, "node_modules/type-fest": { - "version": "5.4.4", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.4.4.tgz", - "integrity": "sha512-JnTrzGu+zPV3aXIUhnyWJj4z/wigMsdYajGLIYakqyOW1nPllzXEJee0QQbHj+CTIQtXGlAjuK0UY+2xTyjVAw==", + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-5.8.0.tgz", + "integrity": "sha512-YGYEVz3Fm5iy/AybuA0oyNFq7H4CgQNfRp/qfe8nurE1kuCeNm3/vfm9X4Mtl+qLyaKJUh5xrFZwogr41SMjYA==", "dev": true, "license": "(MIT OR CC0-1.0)", "dependencies": { @@ -7236,12 +6640,11 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz", + "integrity": "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==", "devOptional": true, "license": "Apache-2.0", - "peer": true, "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" @@ -7251,16 +6654,16 @@ } }, "node_modules/typescript-eslint": { - "version": "8.56.0", - "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.56.0.tgz", - "integrity": "sha512-c7toRLrotJ9oixgdW7liukZpsnq5CZ7PuKztubGYlNppuTqhIoWfhgHo/7EU0v06gS2l/x0i2NEFK1qMIf0rIg==", + "version": "8.62.1", + "resolved": "https://registry.npmjs.org/typescript-eslint/-/typescript-eslint-8.62.1.tgz", + "integrity": "sha512-vymnnM5g0AKQDSAyfP12nMIBvgwgA42syg74kkuZ4x1VuTzwQKwc5h9rGxeShCjny5o+zWAb6OEoz7XLgrIkIw==", "dev": true, "license": "MIT", "dependencies": { - "@typescript-eslint/eslint-plugin": "8.56.0", - "@typescript-eslint/parser": "8.56.0", - "@typescript-eslint/typescript-estree": "8.56.0", - "@typescript-eslint/utils": "8.56.0" + "@typescript-eslint/eslint-plugin": "8.62.1", + "@typescript-eslint/parser": "8.62.1", + "@typescript-eslint/typescript-estree": "8.62.1", + "@typescript-eslint/utils": "8.62.1" }, "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -7271,13 +6674,23 @@ }, "peerDependencies": { "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0", - "typescript": ">=4.8.4 <6.0.0" + "typescript": ">=4.8.4 <6.1.0" + } + }, + "node_modules/undici": { + "version": "7.28.0", + "resolved": "https://registry.npmjs.org/undici/-/undici-7.28.0.tgz", + "integrity": "sha512-cRZYrTDwWznlnRiPjggAGxZXanty6M8RV1ff8Wm4LWXBp7/IG8v5DnOm74DtUBp9OONpK75YlPnIjQqX0dBDtA==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20.18.1" } }, "node_modules/undici-types": { - "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-8.3.0.tgz", + "integrity": "sha512-j375ScV60dom+YkPFIfTLcOiPxkN/buHz5GobjLhixFuANaNs3C9l4GmrWqejgXWJ7BbJcFYpTEUkS1Ge8bpZQ==", "dev": true, "license": "MIT" }, @@ -7374,12 +6787,6 @@ "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" } }, - "node_modules/util-deprecate": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", - "license": "MIT" - }, "node_modules/vaul": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vaul/-/vaul-1.1.2.tgz", @@ -7394,19 +6801,17 @@ } }, "node_modules/vite": { - "version": "7.3.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-7.3.1.tgz", - "integrity": "sha512-w+N7Hifpc3gRjZ63vYBXA56dvvRlNWRczTdmCBBa+CotUzAPf5b7YMdMR/8CQoeYE5LX3W4wj6RYTgonm1b9DA==", + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/vite/-/vite-8.1.3.tgz", + "integrity": "sha512-Ds+gBRbj0lwRO2Y5hwnUBdxSwlAve9LeRyU4sNnAr0ewW0gWF0n5bgXgUzbgZ49MV9BVUAQUFYVcDUcilUExMA==", "dev": true, "license": "MIT", - "peer": true, "dependencies": { - "esbuild": "^0.27.0", - "fdir": "^6.5.0", - "picomatch": "^4.0.3", - "postcss": "^8.5.6", - "rollup": "^4.43.0", - "tinyglobby": "^0.2.15" + "lightningcss": "^1.32.0", + "picomatch": "^4.0.4", + "postcss": "^8.5.16", + "rolldown": "~1.1.3", + "tinyglobby": "^0.2.17" }, "bin": { "vite": "bin/vite.js" @@ -7422,9 +6827,10 @@ }, "peerDependencies": { "@types/node": "^20.19.0 || >=22.12.0", + "@vitejs/devtools": "^0.3.0", + "esbuild": "^0.27.0 || ^0.28.0", "jiti": ">=1.21.0", "less": "^4.0.0", - "lightningcss": "^1.21.0", "sass": "^1.70.0", "sass-embedded": "^1.70.0", "stylus": ">=0.54.8", @@ -7437,15 +6843,18 @@ "@types/node": { "optional": true }, + "@vitejs/devtools": { + "optional": true + }, + "esbuild": { + "optional": true + }, "jiti": { "optional": true }, "less": { "optional": true }, - "lightningcss": { - "optional": true - }, "sass": { "optional": true }, @@ -7469,65 +6878,109 @@ } } }, - "node_modules/vite/node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", + "node_modules/vite/node_modules/fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", "dev": true, + "hasInstallScript": true, "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/vite/node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/vite/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } + "optional": true, + "os": [ + "darwin" ], + "engines": { + "node": "^8.16.0 || ^10.6.0 || >=11.0.0" + } + }, + "node_modules/vitest": { + "version": "4.1.9", + "resolved": "https://registry.npmjs.org/vitest/-/vitest-4.1.9.tgz", + "integrity": "sha512-nE3/LEyc0z87uHYLZebqCUOaJr2hdtuPp7BQ4BosVFnfltxgAvMG08NyrSGlPpOUWvR27c5flSmYFTNr78L9GQ==", + "dev": true, "license": "MIT", "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" + "@vitest/expect": "4.1.9", + "@vitest/mocker": "4.1.9", + "@vitest/pretty-format": "4.1.9", + "@vitest/runner": "4.1.9", + "@vitest/snapshot": "4.1.9", + "@vitest/spy": "4.1.9", + "@vitest/utils": "4.1.9", + "es-module-lexer": "^2.0.0", + "expect-type": "^1.3.0", + "magic-string": "^0.30.21", + "obug": "^2.1.1", + "pathe": "^2.0.3", + "picomatch": "^4.0.3", + "std-env": "^4.0.0-rc.1", + "tinybench": "^2.9.0", + "tinyexec": "^1.0.2", + "tinyglobby": "^0.2.15", + "tinyrainbow": "^3.1.0", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0", + "why-is-node-running": "^2.3.0" + }, + "bin": { + "vitest": "vitest.mjs" }, "engines": { - "node": "^10 || ^12 || >=14" + "node": "^20.0.0 || ^22.0.0 || >=24.0.0" + }, + "funding": { + "url": "https://opencollective.com/vitest" + }, + "peerDependencies": { + "@edge-runtime/vm": "*", + "@opentelemetry/api": "^1.9.0", + "@types/node": "^20.0.0 || ^22.0.0 || >=24.0.0", + "@vitest/browser-playwright": "4.1.9", + "@vitest/browser-preview": "4.1.9", + "@vitest/browser-webdriverio": "4.1.9", + "@vitest/coverage-istanbul": "4.1.9", + "@vitest/coverage-v8": "4.1.9", + "@vitest/ui": "4.1.9", + "happy-dom": "*", + "jsdom": "*", + "vite": "^6.0.0 || ^7.0.0 || ^8.0.0" + }, + "peerDependenciesMeta": { + "@edge-runtime/vm": { + "optional": true + }, + "@opentelemetry/api": { + "optional": true + }, + "@types/node": { + "optional": true + }, + "@vitest/browser-playwright": { + "optional": true + }, + "@vitest/browser-preview": { + "optional": true + }, + "@vitest/browser-webdriverio": { + "optional": true + }, + "@vitest/coverage-istanbul": { + "optional": true + }, + "@vitest/coverage-v8": { + "optional": true + }, + "@vitest/ui": { + "optional": true + }, + "happy-dom": { + "optional": true + }, + "jsdom": { + "optional": true + }, + "vite": { + "optional": false + } } }, "node_modules/void-elements": { @@ -7539,22 +6992,52 @@ "node": ">=0.10.0" } }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", - "dev": true, - "license": "BSD-2-Clause" - }, - "node_modules/whatwg-url": { + "node_modules/w3c-xmlserializer": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-5.0.0.tgz", + "integrity": "sha512-o8qghlI8NZHU1lLPrpi2+Uq7abh4GGPpYANlalzWxyWteJOCsr/P+oPBA49TOLu5FTZO4d3F9MnWJfiMo4BkmA==", "dev": true, "license": "MIT", "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" + "xml-name-validator": "^5.0.0" + }, + "engines": { + "node": ">=18" + } + }, + "node_modules/webidl-conversions": { + "version": "8.0.1", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-8.0.1.tgz", + "integrity": "sha512-BMhLD/Sw+GbJC21C/UgyaZX41nPt8bUTg+jWyDeg7e7YN4xOM05YPSIXceACnXVtqyEw/LMClUQMtMZ+PGGpqQ==", + "dev": true, + "license": "BSD-2-Clause", + "engines": { + "node": ">=20" + } + }, + "node_modules/whatwg-mimetype": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-5.0.0.tgz", + "integrity": "sha512-sXcNcHOC51uPGF0P/D4NVtrkjSU2fNsm9iog4ZvZJsL3rjoDAzXZhkm2MWt1y+PUdggKAYVoMAIYcs78wJ51Cw==", + "dev": true, + "license": "MIT", + "engines": { + "node": ">=20" + } + }, + "node_modules/whatwg-url": { + "version": "16.0.1", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-16.0.1.tgz", + "integrity": "sha512-1to4zXBxmXHV3IiSSEInrreIlu02vUOvrhxJJH5vcxYTBDAx51cqZiKdyTxlecdKNSjj8EcxGBxNf6Vg+945gw==", + "dev": true, + "license": "MIT", + "dependencies": { + "@exodus/bytes": "^1.11.0", + "tr46": "^6.0.0", + "webidl-conversions": "^8.0.1" + }, + "engines": { + "node": "^20.19.0 || ^22.12.0 || >=24.0.0" } }, "node_modules/which": { @@ -7573,6 +7056,23 @@ "node": ">= 8" } }, + "node_modules/why-is-node-running": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/why-is-node-running/-/why-is-node-running-2.3.0.tgz", + "integrity": "sha512-hUrmaWBdVDcxvYqnyh09zunKzROWjbZTiNy8dBEjkS7ehEDQibXJ7XvlmtbwuTclUiIyN+CyXQD4Vmko8fNm8w==", + "dev": true, + "license": "MIT", + "dependencies": { + "siginfo": "^2.0.0", + "stackback": "0.0.2" + }, + "bin": { + "why-is-node-running": "cli.js" + }, + "engines": { + "node": ">=8" + } + }, "node_modules/word-wrap": { "version": "1.2.5", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", @@ -7601,6 +7101,39 @@ "url": "https://github.com/chalk/wrap-ansi?sponsor=1" } }, + "node_modules/wrap-ansi/node_modules/ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "license": "MIT", + "dependencies": { + "color-convert": "^2.0.1" + }, + "engines": { + "node": ">=8" + }, + "funding": { + "url": "https://github.com/chalk/ansi-styles?sponsor=1" + } + }, + "node_modules/xml-name-validator": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-5.0.0.tgz", + "integrity": "sha512-EvGK8EJ3DhaHfbRlETOWAS5pO9MZITeauHKJyb8wyajUfQUenkIg2MvLDTZ4T/TgIcm3HU0TFBgWWboAZ30UHg==", + "dev": true, + "license": "Apache-2.0", + "engines": { + "node": ">=18" + } + }, + "node_modules/xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==", + "dev": true, + "license": "MIT" + }, "node_modules/y18n": { "version": "5.0.8", "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", @@ -7619,10 +7152,10 @@ "license": "ISC" }, "node_modules/yaml": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.8.2.tgz", - "integrity": "sha512-mplynKqc1C2hTVYxd0PU2xQAc22TI1vShAYGksCCfxbn/dFwnHTNi1bvYsBTkhdUNtGIf5xNOg938rrSSYvS9A==", - "devOptional": true, + "version": "2.9.0", + "resolved": "https://registry.npmjs.org/yaml/-/yaml-2.9.0.tgz", + "integrity": "sha512-2AvhNX3mb8zd6Zy7INTtSpl1F15HW6Wnqj0srWlkKLcpYl/gMIMJiyuGq2KeI2YFxUPjdlB+3Lc10seMLtL4cA==", + "dev": true, "license": "ISC", "bin": { "yaml": "bin.mjs" @@ -7635,9 +7168,9 @@ } }, "node_modules/yargs": { - "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", + "version": "17.7.3", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.3.tgz", + "integrity": "sha512-GZtjxm/J/4TSxuL3FNYjCmLktBTnIw/rVmKSIyKeYAZpmJB2ig9VauCC5xsa82GNKVKDAqpOn3KVzNt0zmrU0g==", "dev": true, "license": "MIT", "dependencies": { @@ -7676,12 +7209,57 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/yummies": { + "version": "7.20.1", + "resolved": "https://registry.npmjs.org/yummies/-/yummies-7.20.1.tgz", + "integrity": "sha512-H/AxRy+SjVlfpeI0TkiVkU/M2n+XpR1XGt5yS5r7GsP9Iz3mr17dbq9DLW18PmMlyKO78+yvH/9Z9VAnVuV3og==", + "dev": true, + "license": "MIT", + "dependencies": { + "class-variance-authority": "^0.7.1", + "clsx": "^2.1.1", + "dayjs": "^1.11.21", + "dompurify": "^3.4.11", + "nanoid": "^5.1.15", + "tailwind-merge": "^3.6.0" + }, + "peerDependencies": { + "mobx": "^6.12.4", + "react": "^18 || ^19" + }, + "peerDependenciesMeta": { + "mobx": { + "optional": true + }, + "react": { + "optional": true + } + } + }, + "node_modules/yummies/node_modules/nanoid": { + "version": "5.1.16", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-5.1.16.tgz", + "integrity": "sha512-kVrnsrJqMR8+oLJnGEmSWw9BivK5mt7H3FZatVRjrc5wGqFYuBxX1yG7+A7Gi5AefkX6t/oCkizcQgpu0cY1dQ==", + "dev": true, + "funding": [ + { + "type": "github", + "url": "https://github.com/sponsors/ai" + } + ], + "license": "MIT", + "bin": { + "nanoid": "bin/nanoid.js" + }, + "engines": { + "node": "^18 || >=20" + } + }, "node_modules/zod": { - "version": "4.3.6", - "resolved": "https://registry.npmjs.org/zod/-/zod-4.3.6.tgz", - "integrity": "sha512-rftlrkhHZOcjDwkGlnUtZZkvaPHCsDATp4pGpuOOMDaTdDDXF91wuVDJoWoPsKX/3YPQ5fHuF3STjcYyKr+Qhg==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/zod/-/zod-4.4.3.tgz", + "integrity": "sha512-ytENFjIJFl2UwYglde2jchW2Hwm4GJFLDiSXWdTrJQBIN9Fcyp7n4DhxJEiWNAJMV1/BqWfW/kkg71UDcHJyTQ==", "license": "MIT", - "peer": true, "funding": { "url": "https://github.com/sponsors/colinhacks" } @@ -7700,9 +7278,9 @@ } }, "node_modules/zustand": { - "version": "5.0.11", - "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.11.tgz", - "integrity": "sha512-fdZY+dk7zn/vbWNCYmzZULHRrss0jx5pPFiOuMZ/5HJN6Yv3u+1Wswy/4MpZEkEGhtNH+pwxZB8OKgUBPzYAGg==", + "version": "5.0.14", + "resolved": "https://registry.npmjs.org/zustand/-/zustand-5.0.14.tgz", + "integrity": "sha512-/8tAspM5LMPr28b3fwLYrtdj77ECpfZviaP75CMTnwO8ISyaE4GDIG/9rDDYq/cH9D2Xw2A2RXglLInmVBQB/g==", "license": "MIT", "engines": { "node": ">=12.20.0" diff --git a/pkgs/by-name/ne/nezha-theme-admin/package.nix b/pkgs/by-name/ne/nezha-theme-admin/package.nix index 05ee39a5814f..1adfb892458a 100644 --- a/pkgs/by-name/ne/nezha-theme-admin/package.nix +++ b/pkgs/by-name/ne/nezha-theme-admin/package.nix @@ -2,26 +2,25 @@ lib, buildNpmPackage, fetchFromGitHub, - nix-update-script, }: buildNpmPackage (finalAttrs: { pname = "nezha-theme-admin"; - version = "2.0.4"; + version = "2.2.5"; src = fetchFromGitHub { owner = "nezhahq"; repo = "admin-frontend"; tag = "v${finalAttrs.version}"; - hash = "sha256-oZFIkeHkuSLlu++FwzCUet7tmBe5zhCP5MGHhU528DA="; + hash = "sha256-LNJgl615mXUxGIwNcvj+0hqyX7Gv6twBEb7aSUR3q2w="; }; - # TODO: Switch to the bun build function once available in nixpkgs + # TODO: Remove after upstream fixes resolved missing. postPatch = '' cp ${./package-lock.json} package-lock.json ''; - npmDepsHash = "sha256-2DkCVefxSfnlJkaEFZrjsWbwzddtqiNg1UUajRG5tLA="; + npmDepsHash = "sha256-5uF2CROi+J0O2vqWOEzobhg2xw8lebksQtx97LyiWxA="; npmPackFlags = [ "--ignore-scripts" ]; npmBuildScript = "build-ignore-error"; @@ -34,7 +33,7 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + passthru.updateScript = ./update.sh; meta = { description = "Nezha monitoring admin frontend"; diff --git a/pkgs/by-name/ne/nezha-theme-admin/update.sh b/pkgs/by-name/ne/nezha-theme-admin/update.sh new file mode 100755 index 000000000000..e947d67ae61a --- /dev/null +++ b/pkgs/by-name/ne/nezha-theme-admin/update.sh @@ -0,0 +1,25 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p nix-update curl nodejs + +set -euo pipefail + +version=$(curl ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} -sL https://api.github.com/repos/nezhahq/admin-frontend/releases/latest | jq -r ".tag_name") +version=${version#v} + +if [[ "$UPDATE_NIX_OLD_VERSION" == "$version" ]]; then + echo "Already up to date!" + exit 0 +fi + +TMPDIR=$(mktemp -d) +trap 'rm -rf -- "${TMPDIR}"' EXIT + +git clone "https://github.com/nezhahq/admin-frontend" -b "v$version" "$TMPDIR/src" +pushd "$TMPDIR/src" +rm package-lock.json +npm install --package-lock-only --ignore-scripts +popd + +cp "$TMPDIR/src/package-lock.json" pkgs/by-name/ne/nezha-theme-admin/ + +nix-update "$UPDATE_NIX_ATTR_PATH" diff --git a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix index 307939677eb6..63453cf78be9 100644 --- a/pkgs/by-name/ne/nezha-theme-nazhua/package.nix +++ b/pkgs/by-name/ne/nezha-theme-nazhua/package.nix @@ -1,38 +1,22 @@ { lib, - stdenvNoCC, + buildNpmPackage, fetchFromGitHub, - yarnConfigHook, - yarnBuildHook, - yarnInstallHook, - fetchYarnDeps, - nodejs, nix-update-script, }: -stdenvNoCC.mkDerivation (finalAttrs: { +buildNpmPackage (finalAttrs: { pname = "nezha-theme-nazhua"; - version = "0.8.0"; + version = "1.2.0"; src = fetchFromGitHub { owner = "hi2shark"; repo = "nazhua"; tag = "v${finalAttrs.version}"; - hash = "sha256-kXiFvVSwOXn/MDwQIBmN+1wp8wO4P9hw1zcYcTBHmXA="; + hash = "sha256-lyrkWJDMMMellM8lIaZMvxXJT54gjjP4gnwxMcytrdA="; }; - yarnOfflineCache = fetchYarnDeps { - yarnLock = finalAttrs.src + "/yarn.lock"; - hash = "sha256-/CQsG3iQdPyKHdApeMzq4w90NsMBdLXUP2lya8vtK5Q="; - }; - - nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook - yarnInstallHook - # Needed for executing package.json scripts - nodejs - ]; + npmDepsHash = "sha256-V+fdXp2QevPRYQQ4j5w9OQro6w3qnyi7imhgzGdUiVs="; # Copied from .github/workflows/release.yml env = { diff --git a/pkgs/by-name/ne/nezha-theme-user/package-lock.json b/pkgs/by-name/ne/nezha-theme-user/package-lock.json deleted file mode 100644 index 06676b4eee51..000000000000 --- a/pkgs/by-name/ne/nezha-theme-user/package-lock.json +++ /dev/null @@ -1,5178 +0,0 @@ -{ - "name": "nazha-dash-v2", - "version": "2.0.1", - "lockfileVersion": 3, - "requires": true, - "packages": { - "": { - "name": "nazha-dash-v2", - "version": "2.0.1", - "dependencies": { - "@fontsource/inter": "5.1.1", - "@heroicons/react": "2.2.0", - "@radix-ui/react-accordion": "1.2.3", - "@radix-ui/react-checkbox": "1.1.4", - "@radix-ui/react-dialog": "^1.1.15", - "@radix-ui/react-dropdown-menu": "2.1.6", - "@radix-ui/react-label": "2.1.2", - "@radix-ui/react-popover": "1.1.6", - "@radix-ui/react-progress": "1.1.2", - "@radix-ui/react-select": "2.1.6", - "@radix-ui/react-separator": "1.1.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-switch": "1.1.3", - "@radix-ui/react-tooltip": "1.1.8", - "@tanstack/react-query": "5.66.7", - "@tanstack/react-query-devtools": "5.66.7", - "@tanstack/react-table": "8.21.2", - "@types/d3-geo": "3.1.0", - "@types/luxon": "3.4.2", - "class-variance-authority": "0.7.1", - "clsx": "2.1.1", - "cmdk": "1.1.1", - "country-flag-icons": "1.5.18", - "d3-geo": "3.1.1", - "dayjs": "1.11.13", - "framer-motion": "12.23.26", - "i18n-iso-countries": "7.14.0", - "i18next": "24.2.2", - "lucide-react": "0.460.0", - "luxon": "3.5.0", - "react": "19.0.0", - "react-dom": "19.0.0", - "react-i18next": "15.4.1", - "react-router-dom": "^7.13.0", - "recharts": "2.15.1", - "sonner": "1.7.4", - "tailwind-merge": "2.6.0", - "tailwindcss-animate": "^1.0.7" - }, - "devDependencies": { - "@biomejs/biome": "2.3.10", - "@tailwindcss/postcss": "^4.1.18", - "@types/node": "22.13.4", - "@types/react": "19.0.10", - "@types/react-dom": "19.0.4", - "@vitejs/plugin-react-swc": "3.8.0", - "globals": "15.15.0", - "postcss": "8.5.3", - "tailwindcss": "^4.1.18", - "typescript": "~5.6.3", - "vite": "6.4.1" - } - }, - "node_modules/@alloc/quick-lru": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/@babel/runtime": { - "version": "7.28.6", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.28.6.tgz", - "integrity": "sha512-05WQkdpL9COIMz4LjTxGpPNCdlpyimKppYNoJ5Di5EUObifl8t4tuLuUBBZEpoLYOmfvIWrsp9fCl0HoPRVTdA==", - "license": "MIT", - "engines": { - "node": ">=6.9.0" - } - }, - "node_modules/@biomejs/biome": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/biome/-/biome-2.3.10.tgz", - "integrity": "sha512-/uWSUd1MHX2fjqNLHNL6zLYWBbrJeG412/8H7ESuK8ewoRoMPUgHDebqKrPTx/5n6f17Xzqc9hdg3MEqA5hXnQ==", - "dev": true, - "license": "MIT OR Apache-2.0", - "bin": { - "biome": "bin/biome" - }, - "engines": { - "node": ">=14.21.3" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/biome" - }, - "optionalDependencies": { - "@biomejs/cli-darwin-arm64": "2.3.10", - "@biomejs/cli-darwin-x64": "2.3.10", - "@biomejs/cli-linux-arm64": "2.3.10", - "@biomejs/cli-linux-arm64-musl": "2.3.10", - "@biomejs/cli-linux-x64": "2.3.10", - "@biomejs/cli-linux-x64-musl": "2.3.10", - "@biomejs/cli-win32-arm64": "2.3.10", - "@biomejs/cli-win32-x64": "2.3.10" - } - }, - "node_modules/@biomejs/cli-darwin-arm64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-arm64/-/cli-darwin-arm64-2.3.10.tgz", - "integrity": "sha512-M6xUjtCVnNGFfK7HMNKa593nb7fwNm43fq1Mt71kpLpb+4mE7odO8W/oWVDyBVO4ackhresy1ZYO7OJcVo/B7w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-darwin-x64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-darwin-x64/-/cli-darwin-x64-2.3.10.tgz", - "integrity": "sha512-Vae7+V6t/Avr8tVbFNjnFSTKZogZHFYl7MMH62P/J1kZtr0tyRQ9Fe0onjqjS2Ek9lmNLmZc/VR5uSekh+p1fg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64/-/cli-linux-arm64-2.3.10.tgz", - "integrity": "sha512-hhPw2V3/EpHKsileVOFynuWiKRgFEV48cLe0eA+G2wO4SzlwEhLEB9LhlSrVeu2mtSn205W283LkX7Fh48CaxA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-arm64-musl": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.3.10.tgz", - "integrity": "sha512-B9DszIHkuKtOH2IFeeVkQmSMVUjss9KtHaNXquYYWCjH8IstNgXgx5B0aSBQNr6mn4RcKKRQZXn9Zu1rM3O0/A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64/-/cli-linux-x64-2.3.10.tgz", - "integrity": "sha512-wwAkWD1MR95u+J4LkWP74/vGz+tRrIQvr8kfMMJY8KOQ8+HMVleREOcPYsQX82S7uueco60L58Wc6M1I9WA9Dw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-linux-x64-musl": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-linux-x64-musl/-/cli-linux-x64-musl-2.3.10.tgz", - "integrity": "sha512-QTfHZQh62SDFdYc2nfmZFuTm5yYb4eO1zwfB+90YxUumRCR171tS1GoTX5OD0wrv4UsziMPmrePMtkTnNyYG3g==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-arm64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-arm64/-/cli-win32-arm64-2.3.10.tgz", - "integrity": "sha512-o7lYc9n+CfRbHvkjPhm8s9FgbKdYZu5HCcGVMItLjz93EhgJ8AM44W+QckDqLA9MKDNFrR8nPbO4b73VC5kGGQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@biomejs/cli-win32-x64": { - "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@biomejs/cli-win32-x64/-/cli-win32-x64-2.3.10.tgz", - "integrity": "sha512-pHEFgq7dUEsKnqG9mx9bXihxGI49X+ar+UBrEIj3Wqj3UCZp1rNgV+OoyjFgcXsjCWpuEAF4VJdkZr3TrWdCbQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT OR Apache-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=14.21.3" - } - }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz", - "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz", - "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz", - "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz", - "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz", - "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz", - "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz", - "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz", - "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz", - "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz", - "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz", - "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz", - "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz", - "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==", - "cpu": [ - "mips64el" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz", - "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz", - "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz", - "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.25.12.tgz", - "integrity": "sha512-uqZMTLr/zR/ed4jIGnwSLkaHmPjOjJvnm6TVVitAa08SLS9Z0VM8wIRx7gWbJB5/J54YuIMInDquWyYvQLZkgw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz", - "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz", - "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz", - "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz", - "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/openharmony-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz", - "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz", - "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz", - "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz", - "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz", - "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=18" - } - }, - "node_modules/@floating-ui/core": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.4.tgz", - "integrity": "sha512-C3HlIdsBxszvm5McXlB8PeOEWfBhcGBTZGkGlWc2U0KFY5IwG5OQEuQ8rq52DZmcHDlPLd+YFBK+cZcytwIFWg==", - "license": "MIT", - "dependencies": { - "@floating-ui/utils": "^0.2.10" - } - }, - "node_modules/@floating-ui/dom": { - "version": "1.7.5", - "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.5.tgz", - "integrity": "sha512-N0bD2kIPInNHUHehXhMke1rBGs1dwqvC9O9KYMyyjK7iXt7GAhnro7UlcuYcGdS/yYOlq0MAVgrow8IbWJwyqg==", - "license": "MIT", - "dependencies": { - "@floating-ui/core": "^1.7.4", - "@floating-ui/utils": "^0.2.10" - } - }, - "node_modules/@floating-ui/react-dom": { - "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.7.tgz", - "integrity": "sha512-0tLRojf/1Go2JgEVm+3Frg9A3IW8bJgKgdO0BN5RkF//ufuz2joZM63Npau2ff3J6lUVYgDSNzNkR+aH3IVfjg==", - "license": "MIT", - "dependencies": { - "@floating-ui/dom": "^1.7.5" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@floating-ui/utils": { - "version": "0.2.10", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.10.tgz", - "integrity": "sha512-aGTxbpbg8/b5JfU1HXSrbH3wXZuLPJcNEcZQFMxLs3oSzgtVu6nFPkbbGGUvBcUjKV2YyB9Wxxabo+HEH9tcRQ==", - "license": "MIT" - }, - "node_modules/@fontsource/inter": { - "version": "5.1.1", - "resolved": "https://registry.npmjs.org/@fontsource/inter/-/inter-5.1.1.tgz", - "integrity": "sha512-weN3E+rq0Xb3Z93VHJ+Rc7WOQX9ETJPTAJ+gDcaMHtjft67L58sfS65rAjC5tZUXQ2FdZ/V1/sSzCwZ6v05kJw==", - "license": "OFL-1.1" - }, - "node_modules/@heroicons/react": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/@heroicons/react/-/react-2.2.0.tgz", - "integrity": "sha512-LMcepvRaS9LYHJGsF0zzmgKCUim/X3N/DQKc4jepAXJ7l8QxJ1PmxJzqplF2Z3FE4PqBAIGyJAQ/w4B5dsqbtQ==", - "license": "MIT", - "peerDependencies": { - "react": ">= 16 || ^19.0.0-rc" - } - }, - "node_modules/@jridgewell/gen-mapping": { - "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.0", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/remapping": { - "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/gen-mapping": "^0.3.5", - "@jridgewell/trace-mapping": "^0.3.24" - } - }, - "node_modules/@jridgewell/resolve-uri": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/@jridgewell/sourcemap-codec": { - "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", - "dev": true, - "license": "MIT" - }, - "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/resolve-uri": "^3.1.0", - "@jridgewell/sourcemap-codec": "^1.4.14" - } - }, - "node_modules/@radix-ui/number": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/number/-/number-1.1.0.tgz", - "integrity": "sha512-V3gRzhVNU1ldS5XhAPTom1fOIo4ccrjjJgmE+LI2h/WaFpHmx0MQApT+KZHnx8abG6Avtfcz4WoEciMnpFT3HQ==", - "license": "MIT" - }, - "node_modules/@radix-ui/primitive": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.1.tgz", - "integrity": "sha512-SJ31y+Q/zAyShtXJc8x83i9TYdbAfHZ++tUZnvjJJqFjzsdUnKsxPL6IEtBlxKkU7yzer//GQtZSV4GbldL3YA==", - "license": "MIT" - }, - "node_modules/@radix-ui/react-accordion": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-accordion/-/react-accordion-1.2.3.tgz", - "integrity": "sha512-RIQ15mrcvqIkDARJeERSuXSry2N8uYnxkdDetpfmalT/+0ntOXLkFOsh9iwlAsCv+qcmhZjbdJogIm6WBa6c4A==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collapsible": "1.1.3", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-arrow": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-arrow/-/react-arrow-1.1.2.tgz", - "integrity": "sha512-G+KcpzXHq24iH0uGG/pF8LyzpFJYGD4RfLjCIBfGdSLXvjLHST31RUiRVrupIBMvIppMgSzQ6l66iAxl03tdlg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-checkbox": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-checkbox/-/react-checkbox-1.1.4.tgz", - "integrity": "sha512-wP0CPAHq+P5I4INKe3hJrIa1WoNqqrejzW+zoU0rOvo1b9gDEJJFl2rYfO1PYJUQCc2H1WZxIJmyv9BS8i5fLw==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-use-size": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-collapsible": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collapsible/-/react-collapsible-1.1.3.tgz", - "integrity": "sha512-jFSerheto1X03MUC0g6R7LedNW9EEGWdg9W1+MlpkMLwGkgkbUXLPBH/KIuWKXUoeYRVY11llqbTBDzuLg7qrw==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-collection": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.2.tgz", - "integrity": "sha512-9z54IEKRxIa9VityapoEYMuByaG42iSy1ZXlY2KcuLSEtq8x4987/N6m15ppoMffgZX72gER2uHe1D9Y6Unlcw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.1.tgz", - "integrity": "sha512-Y9VzoRDSJtgFMUCoiZBDVo084VQ5hfpXxVE+NgkdNsjiDBByiImMZKKhxMwCbdHvhlENG6a833CbFkOQvTricw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-context": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.1.tgz", - "integrity": "sha512-UASk9zi+crv9WteK/NU4PLvOoL3OuE6BWVKNF6hPRBtYBDXQ2u5iu3O59zUlJiTVvkyuycnqrztsHVJwcK9K+Q==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog": { - "version": "1.1.15", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dialog/-/react-dialog-1.1.15.tgz", - "integrity": "sha512-TCglVRtzlffRNxRMEyR36DGBLJpeusFcgMVD9PZEzAKnUs1lKCgX5u9BmC2Yg+LL9MgZDugFFs1Vl+Jp4t/PGw==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-context": "1.1.2", - "@radix-ui/react-dismissable-layer": "1.1.11", - "@radix-ui/react-focus-guards": "1.1.3", - "@radix-ui/react-focus-scope": "1.1.7", - "@radix-ui/react-id": "1.1.1", - "@radix-ui/react-portal": "1.1.9", - "@radix-ui/react-presence": "1.1.5", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-slot": "1.2.3", - "@radix-ui/react-use-controllable-state": "1.2.2", - "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/primitive": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz", - "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==", - "license": "MIT" - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", - "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-context": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.1.2.tgz", - "integrity": "sha512-jCi/QKUM2r1Ju5a3J64TH2A5SpKAgh0LpknyqdQ4m6DCV0xJ2HG1xARRwNGPQfi1SLdLWZ1OJz6F4OMBBNiGJA==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-id": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.1.tgz", - "integrity": "sha512-kGkGegYIdQsOb4XjsfM97rXsiHaBwco+hFI66oO4s9LU+PLAC5oJ7khdOVFxkhsmlbpUqDAvXw11CluXP+jkHg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-presence": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.5.tgz", - "integrity": "sha512-/jfEwNDdQVBCNvjkGit4h6pMOzq8bHkopq458dPt2lMjx+eBQUohZNG9A7DtO/O5ukSbxuaNGXMjHicgwy6rQQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.2.tgz", - "integrity": "sha512-BjasUjixPFdS+NKkypcyyN5Pmg83Olst0+c6vGov0diwTEo6mgdqVR6hxcEgFuh4QrAs7Rc+9KuGJ9TVCj0Zzg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-effect-event": "0.0.2", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dialog/node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", - "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-direction": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.0.tgz", - "integrity": "sha512-BUuBvgThEiAXh2DWu93XsT+a3aWrGqolGlqqw5VU1kG7p/ZH2cuDlM1sRLNnY3QcBS69UIz2mcKhMxDsdewhjg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.11", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.11.tgz", - "integrity": "sha512-Nqcp+t5cTB8BinFkZgXiMJniQH0PsUt2k51FUhbdfeKvc4ACcG2uQniY/8+h1Yv6Kza4Q7lD7PQV0z0oicE0Mg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.3", - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1", - "@radix-ui/react-use-escape-keydown": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/primitive": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.3.tgz", - "integrity": "sha512-JTF99U/6XIjCBo0wqkU5sK10glYe27MRRsfwoiq5zzOEZLHU3A3KCMa5X/azekYRCJ0HlwI0crAXS/5dEHTzDg==", - "license": "MIT" - }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", - "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dismissable-layer/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-dropdown-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dropdown-menu/-/react-dropdown-menu-2.1.6.tgz", - "integrity": "sha512-no3X7V5fD487wab/ZYSHXq3H37u4NVeLDKI/Ks724X/eEFSSEFYZxWgsIlr1UBeEyDaM29HM5x9p1Nv8DuTYPA==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-menu": "2.1.6", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.3.tgz", - "integrity": "sha512-0rFg/Rj2Q62NCm62jZw0QX7a3sz6QCQU0LpZdNrJX8byRGaGVTqbrW9jAoIAHyMQqsNpeZ81YgSizOt5WXq0Pw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.7.tgz", - "integrity": "sha512-t2ODlkXBQyn7jkl6TNaw/MtVEVvIGelJDCG41Okq/KwUsJBwQ4XVZsHAVUkK4mBv3ewiAS3PGuUWuY2BoK4ZUw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2", - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-callback-ref": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", - "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-focus-scope/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-id": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.0.tgz", - "integrity": "sha512-EJUrI8yYh7WOjNOqpoJaf1jlFIH2LvtgAl+YcFqNCa+4hj64ZXmPkAKOFs/ukjz3byN6bdb/AVUqHkI8/uWWMA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-label": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-label/-/react-label-2.1.2.tgz", - "integrity": "sha512-zo1uGMTaNlHehDyFQcDZXRJhUPDuukcnHz0/jnrup0JA6qL+AFpAnty+7VKa9esuU5xTblAZzTGYJKSKaBxBhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-menu/-/react-menu-2.1.6.tgz", - "integrity": "sha512-tBBb5CXDJW3t2mo9WlO7r6GTmWV0F0uzHZVFmlRmYpiSK1CDU5IKojP1pm7oknpBOrFZx/YgBRW9oorPO2S/Lg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-roving-focus": "1.1.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-menu/node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popover/-/react-popover-1.1.6.tgz", - "integrity": "sha512-NQouW0x4/GnkFJ/pRqsIS3rM/k97VzKnVb2jB7Gq7VEGPy5g7uNV1ykySFt7eWSp3i2uSGFwaJcvIRJBAHmmFg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popover/node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popper": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-popper/-/react-popper-1.2.2.tgz", - "integrity": "sha512-Rvqc3nOpwseCyj/rgjlJDYAgyfw7OC1tTkKn2ivhaMGcYt8FSBlahHOZak2i3QwkRXUXgGgzeEe2RuqeEHuHgA==", - "license": "MIT", - "dependencies": { - "@floating-ui/react-dom": "^2.0.0", - "@radix-ui/react-arrow": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-rect": "1.1.0", - "@radix-ui/react-use-size": "1.1.0", - "@radix-ui/rect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-popper/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.9.tgz", - "integrity": "sha512-bpIxvq03if6UNwXZ+HTK71JLh4APvnXntDc6XOX8UVq4XQOVl7lwok0AvIl+b8zgCw3fSaVTZMpAPPagXbKmHQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.1.3", - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-compose-refs": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.2.tgz", - "integrity": "sha512-z4eqJvfiNnFMHIIvXP3CY57y2WJs5g2v3X0zm9mEJkrkNv4rDxu+sg9Jh8EkXyeqBkB7SOcboo9dMVqhyrACIg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-primitive": { - "version": "2.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.3.tgz", - "integrity": "sha512-m9gTwRkhy2lvCPe6QJp4d3G1TYEUHn/FzJUtq9MjH46an1wJU+GdoGC5VLof8RX8Ft/DlpshApkhswDLZzHIcQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.2.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-slot": { - "version": "1.2.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.2.3.tgz", - "integrity": "sha512-aeNmHnBxbi2St0au6VBVC7JXFlhLlOnvIIlePNniyUNAClzmtAUEY8/pBiK3iHjufOlwA+c20/8jngo7xcrg8A==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-portal/node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", - "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-presence": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-presence/-/react-presence-1.1.2.tgz", - "integrity": "sha512-18TFr80t5EVgL9x1SwF/YGtfG+l0BS0PRAlCWBDoBEiDQjeKgnNZRVJp/oVBl24sr3Gbfwc/Qpj4OcWTQMsAEg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-primitive": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.0.2.tgz", - "integrity": "sha512-Ec/0d38EIuvDF+GZjcMU/Ze6MxntVJYO/fRlCPhCaVUyPY9WTalHJw54tp9sXeJo3tlShWpy41vQRgLRGOuz+w==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-slot": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-progress": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-progress/-/react-progress-1.1.2.tgz", - "integrity": "sha512-u1IgJFQ4zNAUTjGdDL5dcl/U8ntOR6jsnhxKb5RKp5Ozwl88xKR9EqRZOe/Mk8tnx0x5tNUe2F+MzsyjqMg0MA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-roving-focus": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.2.tgz", - "integrity": "sha512-zgMQWkNO169GtGqRvYrzb0Zf8NhMHS2DuEB/TiEmVnpr5OqPU3i8lfbxaAmC2J/KYuIQxyoQQ6DxepyXp61/xw==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/@radix-ui/react-select/-/react-select-2.1.6.tgz", - "integrity": "sha512-T6ajELxRvTuAMWH0YmRJ1qez+x4/7Nq7QIx7zJ0VK3qaEWdnWpNbEDnmWldG1zBDwqrLy5aLMUWcoGirVj5kMg==", - "license": "MIT", - "dependencies": { - "@radix-ui/number": "1.1.0", - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-collection": "1.1.2", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-direction": "1.1.0", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-focus-guards": "1.1.1", - "@radix-ui/react-focus-scope": "1.1.2", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-layout-effect": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2", - "aria-hidden": "^1.2.4", - "react-remove-scroll": "^2.6.3" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-focus-guards": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-guards/-/react-focus-guards-1.1.1.tgz", - "integrity": "sha512-pSIwfrT1a6sIoDASCSpFwOasEwKTZWDw/iBdtnqKO7v6FeOzYJ7U53cPzYFVR3geGGXgVHaH+CdngrrAzqUGxg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-focus-scope": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-focus-scope/-/react-focus-scope-1.1.2.tgz", - "integrity": "sha512-zxwE80FCU7lcXUGWkdt6XpTTCKPitG1XKOwViTxHVKIJhZl9MvIl2dVHeZENCWD9+EdWv05wlaEkRXUykU27RA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-select/node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-separator": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.2.tgz", - "integrity": "sha512-oZfHcaAp2Y6KFBX6I5P1u7CQoy4lheCGiYj+pGFrHy8E/VNRb5E39TkTr3JrV520csPBTZjkuKFdEsjS5EUNKQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-slot": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.1.2.tgz", - "integrity": "sha512-YAKxaiGsSQJ38VzKH86/BPRC4rh+b1Jpa+JneA5LRE7skmLPNAyeG8kPJj/oo4STLvlrs8vkf/iYyc3A5stYCQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-switch": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@radix-ui/react-switch/-/react-switch-1.1.3.tgz", - "integrity": "sha512-1nc+vjEOQkJVsJtWPSiISGT6OKm4SiOdjMo+/icLxo2G4vxz1GntC5MzfL4v8ey9OEfw787QCD1y3mUv0NiFEQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-use-previous": "1.1.0", - "@radix-ui/react-use-size": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tooltip": { - "version": "1.1.8", - "resolved": "https://registry.npmjs.org/@radix-ui/react-tooltip/-/react-tooltip-1.1.8.tgz", - "integrity": "sha512-YAA2cu48EkJZdAMHC0dqo9kialOcRStbtiY4nJPaht7Ptrhcvpo+eDChaM6BIs8kL6a8Z5l5poiqLnXcNduOkA==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-context": "1.1.1", - "@radix-ui/react-dismissable-layer": "1.1.5", - "@radix-ui/react-id": "1.1.0", - "@radix-ui/react-popper": "1.2.2", - "@radix-ui/react-portal": "1.1.4", - "@radix-ui/react-presence": "1.1.2", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-slot": "1.1.2", - "@radix-ui/react-use-controllable-state": "1.1.0", - "@radix-ui/react-visually-hidden": "1.1.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-dismissable-layer": { - "version": "1.1.5", - "resolved": "https://registry.npmjs.org/@radix-ui/react-dismissable-layer/-/react-dismissable-layer-1.1.5.tgz", - "integrity": "sha512-E4TywXY6UsXNRhFrECa5HAvE5/4BFcGyfTyK36gP+pAW1ed7UTK4vKwdr53gAJYwqbfCWC6ATvJa3J3R/9+Qrg==", - "license": "MIT", - "dependencies": { - "@radix-ui/primitive": "1.1.1", - "@radix-ui/react-compose-refs": "1.1.1", - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-callback-ref": "1.1.0", - "@radix-ui/react-use-escape-keydown": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-portal": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/@radix-ui/react-portal/-/react-portal-1.1.4.tgz", - "integrity": "sha512-sn2O9k1rPFYVyKd5LAJfo96JlSGVFpa1fS6UuBJfrZadudiw5tAmru+n1x7aMRQ84qDM71Zh1+SzK5QwU0tJfA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2", - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-tooltip/node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.0.tgz", - "integrity": "sha512-L7vwWlR1kTTQ3oh7g1O0CBF3YCyyTj8NmhLR+phShpyA50HCfBFKVJTpshm9PzLiKmehsrQzTYTpX9HvmC9rhw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.1.tgz", - "integrity": "sha512-FkBMwD+qbGQeMu1cOHnuGB6x4yzPjho8ap5WtbEJ26umhgqVXbhekKUQO+hZEL1vU92a3wHwdp0HAcqAUF5iDg==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-controllable-state": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.1.0.tgz", - "integrity": "sha512-MtfMVJiSr2NjzS0Aa90NPTnvTSg6C/JLCV7ma0W6+OMV78vd8OyRpID+Ng9LxzsPbLeuBnWBA1Nq30AtBIDChw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-controllable-state/node_modules/@radix-ui/react-use-callback-ref": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.0.tgz", - "integrity": "sha512-CasTfvsy+frcFkbXtSJ2Zu9JHpN8TYKxkgJGWbjiZhFivxaeW7rMeZt7QELGVLaYVfFMsKHjb7Ak0nMEe+2Vfw==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-effect-event": { - "version": "0.0.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.2.tgz", - "integrity": "sha512-Qp8WbZOBe+blgpuUT+lw2xheLP8q0oatc9UpmiemEICxGvFLYmHm9QowVZGHtJlGbS6A6yJ3iViad/2cVjnOiA==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-effect-event/node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.1.tgz", - "integrity": "sha512-RbJRS4UWQFkzHTTwVymMTUv8EqYhOp8dOOviLj2ugtTiXRaRQS7GLGxZTLL1jWhMeoSCf5zmcZkqTl9IiYfXcQ==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-escape-keydown": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-escape-keydown/-/react-use-escape-keydown-1.1.1.tgz", - "integrity": "sha512-Il0+boE7w/XebUHyBjroE+DbByORGR9KKmITzbR7MyQ4akpORYP/ZmbhAr0DG7RmmBqoOnZdy2QlvajJ2QA59g==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-callback-ref": "1.1.1" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-layout-effect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.0.tgz", - "integrity": "sha512-+FPE0rOdziWSrH9athwI1R0HDVbWlEhd+FR+aSDk4uWGmSJ9Z54sdZVDQPZAinJhJXwfT+qnj969mCsT2gfm5w==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-previous": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-previous/-/react-use-previous-1.1.0.tgz", - "integrity": "sha512-Z/e78qg2YFnnXcW88A4JmTtm4ADckLno6F7OXotmkQfeuCVaKuYzqAATPhVzl3delXE7CxIV8shofPn3jPc5Og==", - "license": "MIT", - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-rect/-/react-use-rect-1.1.0.tgz", - "integrity": "sha512-0Fmkebhr6PiseyZlYAOtLS+nb7jLmpqTrJyv61Pe68MKYW6OWdRE2kI70TaYY27u7H0lajqM3hSMMLFq18Z7nQ==", - "license": "MIT", - "dependencies": { - "@radix-ui/rect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-use-size": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/react-use-size/-/react-use-size-1.1.0.tgz", - "integrity": "sha512-XW3/vWuIXHa+2Uwcc2ABSfcCledmXhhQPlGbfcRXbiUQI5Icjcg19BGCZVKKInYbvUCut/ufbbLLPFC5cbb1hw==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-use-layout-effect": "1.1.0" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/@radix-ui/react-visually-hidden": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@radix-ui/react-visually-hidden/-/react-visually-hidden-1.1.2.tgz", - "integrity": "sha512-1SzA4ns2M1aRlvxErqhLHsBHoS5eI5UUcI2awAMgGUp4LoaoWOKYmvqDY2s/tltuPkh3Yk77YF/r3IRj+Amx4Q==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-primitive": "2.0.2" - }, - "peerDependencies": { - "@types/react": "*", - "@types/react-dom": "*", - "react": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc", - "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - }, - "@types/react-dom": { - "optional": true - } - } - }, - "node_modules/@radix-ui/rect": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.0.tgz", - "integrity": "sha512-A9+lCBZoaMJlVKcRBz2YByCG+Cp2t6nAnMnNba+XiWxnj6r4JUFqfsgwocMBZU9LPtdxC6wB56ySYpc7LQIoJg==", - "license": "MIT" - }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.58.0.tgz", - "integrity": "sha512-mr0tmS/4FoVk1cnaeN244A/wjvGDNItZKR8hRhnmCzygyRXYtKF5jVDSIILR1U97CTzAYmbgIj/Dukg62ggG5w==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.58.0.tgz", - "integrity": "sha512-+s++dbp+/RTte62mQD9wLSbiMTV+xr/PeRJEc/sFZFSBRlHPNPVaf5FXlzAL77Mr8FtSfQqCN+I598M8U41ccQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-darwin-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.58.0.tgz", - "integrity": "sha512-MFWBwTcYs0jZbINQBXHfSrpSQJq3IUOakcKPzfeSznONop14Pxuqa0Kg19GD0rNBMPQI2tFtu3UzapZpH0Uc1Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.58.0.tgz", - "integrity": "sha512-yiKJY7pj9c9JwzuKYLFaDZw5gma3fI9bkPEIyofvVfsPqjCWPglSHdpdwXpKGvDeYDms3Qal8qGMEHZ1M/4Udg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.58.0.tgz", - "integrity": "sha512-x97kCoBh5MOevpn/CNK9W1x8BEzO238541BGWBc315uOlN0AD/ifZ1msg+ZQB05Ux+VF6EcYqpiagfLJ8U3LvQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.58.0.tgz", - "integrity": "sha512-Aa8jPoZ6IQAG2eIrcXPpjRcMjROMFxCt1UYPZZtCxRV68WkuSigYtQ/7Zwrcr2IvtNJo7T2JfDXyMLxq5L4Jlg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.58.0.tgz", - "integrity": "sha512-Ob8YgT5kD/lSIYW2Rcngs5kNB/44Q2RzBSPz9brf2WEtcGR7/f/E9HeHn1wYaAwKBni+bdXEwgHvUd0x12lQSA==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.58.0.tgz", - "integrity": "sha512-K+RI5oP1ceqoadvNt1FecL17Qtw/n9BgRSzxif3rTL2QlIu88ccvY+Y9nnHe/cmT5zbH9+bpiJuG1mGHRVwF4Q==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.58.0.tgz", - "integrity": "sha512-T+17JAsCKUjmbopcKepJjHWHXSjeW7O5PL7lEFaeQmiVyw4kkc5/lyYKzrv6ElWRX/MrEWfPiJWqbTvfIvjM1Q==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.58.0.tgz", - "integrity": "sha512-cCePktb9+6R9itIJdeCFF9txPU7pQeEHB5AbHu/MKsfH/k70ZtOeq1k4YAtBv9Z7mmKI5/wOLYjQ+B9QdxR6LA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.58.0.tgz", - "integrity": "sha512-iekUaLkfliAsDl4/xSdoCJ1gnnIXvoNz85C8U8+ZxknM5pBStfZjeXgB8lXobDQvvPRCN8FPmmuTtH+z95HTmg==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.58.0.tgz", - "integrity": "sha512-68ofRgJNl/jYJbxFjCKE7IwhbfxOl1muPN4KbIqAIe32lm22KmU7E8OPvyy68HTNkI2iV/c8y2kSPSm2mW/Q9Q==", - "cpu": [ - "loong64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.58.0.tgz", - "integrity": "sha512-dpz8vT0i+JqUKuSNPCP5SYyIV2Lh0sNL1+FhM7eLC457d5B9/BC3kDPp5BBftMmTNsBarcPcoz5UGSsnCiw4XQ==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.58.0.tgz", - "integrity": "sha512-4gdkkf9UJ7tafnweBCR/mk4jf3Jfl0cKX9Np80t5i78kjIH0ZdezUv/JDI2VtruE5lunfACqftJ8dIMGN4oHew==", - "cpu": [ - "ppc64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.58.0.tgz", - "integrity": "sha512-YFS4vPnOkDTD/JriUeeZurFYoJhPf9GQQEF/v4lltp3mVcBmnsAdjEWhr2cjUCZzZNzxCG0HZOvJU44UGHSdzw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.58.0.tgz", - "integrity": "sha512-x2xgZlFne+QVNKV8b4wwaCS8pwq3y14zedZ5DqLzjdRITvreBk//4Knbcvm7+lWmms9V9qFp60MtUd0/t/PXPw==", - "cpu": [ - "riscv64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.58.0.tgz", - "integrity": "sha512-jIhrujyn4UnWF8S+DHSkAkDEO3hLX0cjzxJZPLF80xFyzyUIYgSMRcYQ3+uqEoyDD2beGq7Dj7edi8OnJcS/hg==", - "cpu": [ - "s390x" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.58.0.tgz", - "integrity": "sha512-+410Srdoh78MKSJxTQ+hZ/Mx+ajd6RjjPwBPNd0R3J9FtL6ZA0GqiiyNjCO9In0IzZkCNrpGymSfn+kgyPQocg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.58.0.tgz", - "integrity": "sha512-ZjMyby5SICi227y1MTR3VYBpFTdZs823Rs/hpakufleBoufoOIB6jtm9FEoxn/cgO7l6PM2rCEl5Kre5vX0QrQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-openbsd-x64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.58.0.tgz", - "integrity": "sha512-ds4iwfYkSQ0k1nb8LTcyXw//ToHOnNTJtceySpL3fa7tc/AsE+UpUFphW126A6fKBGJD5dhRvg8zw1rvoGFxmw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ] - }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.58.0.tgz", - "integrity": "sha512-fd/zpJniln4ICdPkjWFhZYeY/bpnaN9pGa6ko+5WD38I0tTqk9lXMgXZg09MNdhpARngmxiCg0B0XUamNw/5BQ==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.58.0.tgz", - "integrity": "sha512-YpG8dUOip7DCz3nr/JUfPbIUo+2d/dy++5bFzgi4ugOGBIox+qMbbqt/JoORwvI/C9Kn2tz6+Bieoqd5+B1CjA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.58.0.tgz", - "integrity": "sha512-b9DI8jpFQVh4hIXFr0/+N/TzLdpBIoPzjt0Rt4xJbW3mzguV3mduR9cNgiuFcuL/TeORejJhCWiAXe3E/6PxWA==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.58.0.tgz", - "integrity": "sha512-CSrVpmoRJFN06LL9xhkitkwUcTZtIotYAF5p6XOR2zW0Zz5mzb3IPpcoPhB02frzMHFNo1reQ9xSF5fFm3hUsQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.58.0.tgz", - "integrity": "sha512-QFsBgQNTnh5K0t/sBsjJLq24YVqEIVkGpfN2VHsnN90soZyhaiA9UUHufcctVNL4ypJY0wrwad0wslx2KJQ1/w==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@swc/core": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core/-/core-1.15.11.tgz", - "integrity": "sha512-iLmLTodbYxU39HhMPaMUooPwO/zqJWvsqkrXv1ZI38rMb048p6N7qtAtTp37sw9NzSrvH6oli8EdDygo09IZ/w==", - "dev": true, - "hasInstallScript": true, - "license": "Apache-2.0", - "dependencies": { - "@swc/counter": "^0.1.3", - "@swc/types": "^0.1.25" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/swc" - }, - "optionalDependencies": { - "@swc/core-darwin-arm64": "1.15.11", - "@swc/core-darwin-x64": "1.15.11", - "@swc/core-linux-arm-gnueabihf": "1.15.11", - "@swc/core-linux-arm64-gnu": "1.15.11", - "@swc/core-linux-arm64-musl": "1.15.11", - "@swc/core-linux-x64-gnu": "1.15.11", - "@swc/core-linux-x64-musl": "1.15.11", - "@swc/core-win32-arm64-msvc": "1.15.11", - "@swc/core-win32-ia32-msvc": "1.15.11", - "@swc/core-win32-x64-msvc": "1.15.11" - }, - "peerDependencies": { - "@swc/helpers": ">=0.5.17" - }, - "peerDependenciesMeta": { - "@swc/helpers": { - "optional": true - } - } - }, - "node_modules/@swc/core-darwin-arm64": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-arm64/-/core-darwin-arm64-1.15.11.tgz", - "integrity": "sha512-QoIupRWVH8AF1TgxYyeA5nS18dtqMuxNwchjBIwJo3RdwLEFiJq6onOx9JAxHtuPwUkIVuU2Xbp+jCJ7Vzmgtg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-darwin-x64": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-darwin-x64/-/core-darwin-x64-1.15.11.tgz", - "integrity": "sha512-S52Gu1QtPSfBYDiejlcfp9GlN+NjTZBRRNsz8PNwBgSE626/FUf2PcllVUix7jqkoMC+t0rS8t+2/aSWlMuQtA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-linux-arm-gnueabihf": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm-gnueabihf/-/core-linux-arm-gnueabihf-1.15.11.tgz", - "integrity": "sha512-lXJs8oXo6Z4yCpimpQ8vPeCjkgoHu5NoMvmJZ8qxDyU99KVdg6KwU9H79vzrmB+HfH+dCZ7JGMqMF//f8Cfvdg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "Apache-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-linux-arm64-gnu": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-gnu/-/core-linux-arm64-gnu-1.15.11.tgz", - "integrity": "sha512-chRsz1K52/vj8Mfq/QOugVphlKPWlMh10V99qfH41hbGvwAU6xSPd681upO4bKiOr9+mRIZZW+EfJqY42ZzRyA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-linux-arm64-musl": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-linux-arm64-musl/-/core-linux-arm64-musl-1.15.11.tgz", - "integrity": "sha512-PYftgsTaGnfDK4m6/dty9ryK1FbLk+LosDJ/RJR2nkXGc8rd+WenXIlvHjWULiBVnS1RsjHHOXmTS4nDhe0v0w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-linux-x64-gnu": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-gnu/-/core-linux-x64-gnu-1.15.11.tgz", - "integrity": "sha512-DKtnJKIHiZdARyTKiX7zdRjiDS1KihkQWatQiCHMv+zc2sfwb4Glrodx2VLOX4rsa92NLR0Sw8WLcPEMFY1szQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-linux-x64-musl": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-linux-x64-musl/-/core-linux-x64-musl-1.15.11.tgz", - "integrity": "sha512-mUjjntHj4+8WBaiDe5UwRNHuEzLjIWBTSGTw0JT9+C9/Yyuh4KQqlcEQ3ro6GkHmBGXBFpGIj/o5VMyRWfVfWw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-win32-arm64-msvc": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-win32-arm64-msvc/-/core-win32-arm64-msvc-1.15.11.tgz", - "integrity": "sha512-ZkNNG5zL49YpaFzfl6fskNOSxtcZ5uOYmWBkY4wVAvgbSAQzLRVBp+xArGWh2oXlY/WgL99zQSGTv7RI5E6nzA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-win32-ia32-msvc": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-win32-ia32-msvc/-/core-win32-ia32-msvc-1.15.11.tgz", - "integrity": "sha512-6XnzORkZCQzvTQ6cPrU7iaT9+i145oLwnin8JrfsLG41wl26+5cNQ2XV3zcbrnFEV6esjOceom9YO1w9mGJByw==", - "cpu": [ - "ia32" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/core-win32-x64-msvc": { - "version": "1.15.11", - "resolved": "https://registry.npmjs.org/@swc/core-win32-x64-msvc/-/core-win32-x64-msvc-1.15.11.tgz", - "integrity": "sha512-IQ2n6af7XKLL6P1gIeZACskSxK8jWtoKpJWLZmdXTDj1MGzktUy4i+FvpdtxFmJWNavRWH1VmTr6kAubRDHeKw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "Apache-2.0 AND MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=10" - } - }, - "node_modules/@swc/counter": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@swc/counter/-/counter-0.1.3.tgz", - "integrity": "sha512-e2BR4lsJkkRlKZ/qCHPw9ZaSxc0MVUd7gtbtaB7aMvHeJVYe8sOB8DBZkP2DtISHGSku9sCK6T6cnY0CtXrOCQ==", - "dev": true, - "license": "Apache-2.0" - }, - "node_modules/@swc/types": { - "version": "0.1.25", - "resolved": "https://registry.npmjs.org/@swc/types/-/types-0.1.25.tgz", - "integrity": "sha512-iAoY/qRhNH8a/hBvm3zKj9qQ4oc2+3w1unPJa2XvTK3XjeLXtzcCingVPw/9e5mn1+0yPqxcBGp9Jf0pkfMb1g==", - "dev": true, - "license": "Apache-2.0", - "dependencies": { - "@swc/counter": "^0.1.3" - } - }, - "node_modules/@tailwindcss/node": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/node/-/node-4.2.0.tgz", - "integrity": "sha512-Yv+fn/o2OmL5fh/Ir62VXItdShnUxfpkMA4Y7jdeC8O81WPB8Kf6TT6GSHvnqgSwDzlB5iT7kDpeXxLsUS0T6Q==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/remapping": "^2.3.5", - "enhanced-resolve": "^5.19.0", - "jiti": "^2.6.1", - "lightningcss": "1.31.1", - "magic-string": "^0.30.21", - "source-map-js": "^1.2.1", - "tailwindcss": "4.2.0" - } - }, - "node_modules/@tailwindcss/oxide": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide/-/oxide-4.2.0.tgz", - "integrity": "sha512-AZqQzADaj742oqn2xjl5JbIOzZB/DGCYF/7bpvhA8KvjUj9HJkag6bBuwZvH1ps6dfgxNHyuJVlzSr2VpMgdTQ==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">= 20" - }, - "optionalDependencies": { - "@tailwindcss/oxide-android-arm64": "4.2.0", - "@tailwindcss/oxide-darwin-arm64": "4.2.0", - "@tailwindcss/oxide-darwin-x64": "4.2.0", - "@tailwindcss/oxide-freebsd-x64": "4.2.0", - "@tailwindcss/oxide-linux-arm-gnueabihf": "4.2.0", - "@tailwindcss/oxide-linux-arm64-gnu": "4.2.0", - "@tailwindcss/oxide-linux-arm64-musl": "4.2.0", - "@tailwindcss/oxide-linux-x64-gnu": "4.2.0", - "@tailwindcss/oxide-linux-x64-musl": "4.2.0", - "@tailwindcss/oxide-wasm32-wasi": "4.2.0", - "@tailwindcss/oxide-win32-arm64-msvc": "4.2.0", - "@tailwindcss/oxide-win32-x64-msvc": "4.2.0" - } - }, - "node_modules/@tailwindcss/oxide-android-arm64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-android-arm64/-/oxide-android-arm64-4.2.0.tgz", - "integrity": "sha512-F0QkHAVaW/JNBWl4CEKWdZ9PMb0khw5DCELAOnu+RtjAfx5Zgw+gqCHFvqg3AirU1IAd181fwOtJQ5I8Yx5wtw==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-darwin-arm64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-arm64/-/oxide-darwin-arm64-4.2.0.tgz", - "integrity": "sha512-I0QylkXsBsJMZ4nkUNSR04p6+UptjcwhcVo3Zu828ikiEqHjVmQL9RuQ6uT/cVIiKpvtVA25msu/eRV97JeNSA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-darwin-x64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-darwin-x64/-/oxide-darwin-x64-4.2.0.tgz", - "integrity": "sha512-6TmQIn4p09PBrmnkvbYQ0wbZhLtbaksCDx7Y7R3FYYx0yxNA7xg5KP7dowmQ3d2JVdabIHvs3Hx4K3d5uCf8xg==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-freebsd-x64": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-freebsd-x64/-/oxide-freebsd-x64-4.2.0.tgz", - "integrity": "sha512-qBudxDvAa2QwGlq9y7VIzhTvp2mLJ6nD/G8/tI70DCDoneaUeLWBJaPcbfzqRIWraj+o969aDQKvKW9dvkUizw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm-gnueabihf": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm-gnueabihf/-/oxide-linux-arm-gnueabihf-4.2.0.tgz", - "integrity": "sha512-7XKkitpy5NIjFZNUQPeUyNJNJn1CJeV7rmMR+exHfTuOsg8rxIO9eNV5TSEnqRcaOK77zQpsyUkBWmPy8FgdSg==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-gnu": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-gnu/-/oxide-linux-arm64-gnu-4.2.0.tgz", - "integrity": "sha512-Mff5a5Q3WoQR01pGU1gr29hHM1N93xYrKkGXfPw/aRtK4bOc331Ho4Tgfsm5WDGvpevqMpdlkCojT3qlCQbCpA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-linux-arm64-musl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-arm64-musl/-/oxide-linux-arm64-musl-4.2.0.tgz", - "integrity": "sha512-XKcSStleEVnbH6W/9DHzZv1YhjE4eSS6zOu2eRtYAIh7aV4o3vIBs+t/B15xlqoxt6ef/0uiqJVB6hkHjWD/0A==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-gnu": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-gnu/-/oxide-linux-x64-gnu-4.2.0.tgz", - "integrity": "sha512-/hlXCBqn9K6fi7eAM0RsobHwJYa5V/xzWspVTzxnX+Ft9v6n+30Pz8+RxCn7sQL/vRHHLS30iQPrHQunu6/vJA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-linux-x64-musl": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-linux-x64-musl/-/oxide-linux-x64-musl-4.2.0.tgz", - "integrity": "sha512-lKUaygq4G7sWkhQbfdRRBkaq4LY39IriqBQ+Gk6l5nKq6Ay2M2ZZb1tlIyRNgZKS8cbErTwuYSor0IIULC0SHw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-wasm32-wasi/-/oxide-wasm32-wasi-4.2.0.tgz", - "integrity": "sha512-xuDjhAsFdUuFP5W9Ze4k/o4AskUtI8bcAGU4puTYprr89QaYFmhYOPfP+d1pH+k9ets6RoE23BXZM1X1jJqoyw==", - "bundleDependencies": [ - "@napi-rs/wasm-runtime", - "@emnapi/core", - "@emnapi/runtime", - "@tybys/wasm-util", - "@emnapi/wasi-threads", - "tslib" - ], - "cpu": [ - "wasm32" - ], - "dev": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.8.1", - "@emnapi/runtime": "^1.8.1", - "@emnapi/wasi-threads": "^1.1.0", - "@napi-rs/wasm-runtime": "^1.1.1", - "@tybys/wasm-util": "^0.10.1", - "tslib": "^2.8.1" - }, - "engines": { - "node": ">=14.0.0" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/core": { - "version": "1.8.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/wasi-threads": "1.1.0", - "tslib": "^2.4.0" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/runtime": { - "version": "1.8.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@emnapi/wasi-threads": { - "version": "1.1.0", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@napi-rs/wasm-runtime": { - "version": "1.1.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "@emnapi/core": "^1.7.1", - "@emnapi/runtime": "^1.7.1", - "@tybys/wasm-util": "^0.10.1" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/Brooooooklyn" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/@tybys/wasm-util": { - "version": "0.10.1", - "dev": true, - "inBundle": true, - "license": "MIT", - "optional": true, - "dependencies": { - "tslib": "^2.4.0" - } - }, - "node_modules/@tailwindcss/oxide-wasm32-wasi/node_modules/tslib": { - "version": "2.8.1", - "dev": true, - "inBundle": true, - "license": "0BSD", - "optional": true - }, - "node_modules/@tailwindcss/oxide-win32-arm64-msvc": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-arm64-msvc/-/oxide-win32-arm64-msvc-4.2.0.tgz", - "integrity": "sha512-2UU/15y1sWDEDNJXxEIrfWKC2Yb4YgIW5Xz2fKFqGzFWfoMHWFlfa1EJlGO2Xzjkq/tvSarh9ZTjvbxqWvLLXA==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/oxide-win32-x64-msvc": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/oxide-win32-x64-msvc/-/oxide-win32-x64-msvc-4.2.0.tgz", - "integrity": "sha512-CrFadmFoc+z76EV6LPG1jx6XceDsaCG3lFhyLNo/bV9ByPrE+FnBPckXQVP4XRkN76h3Fjt/a+5Er/oA/nCBvQ==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 20" - } - }, - "node_modules/@tailwindcss/postcss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/@tailwindcss/postcss/-/postcss-4.2.0.tgz", - "integrity": "sha512-u6YBacGpOm/ixPfKqfgrJEjMfrYmPD7gEFRoygS/hnQaRtV0VCBdpkx5Ouw9pnaLRwwlgGCuJw8xLpaR0hOrQg==", - "dev": true, - "license": "MIT", - "dependencies": { - "@alloc/quick-lru": "^5.2.0", - "@tailwindcss/node": "4.2.0", - "@tailwindcss/oxide": "4.2.0", - "postcss": "^8.5.6", - "tailwindcss": "4.2.0" - } - }, - "node_modules/@tailwindcss/postcss/node_modules/postcss": { - "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.11", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/@tanstack/query-core": { - "version": "5.66.4", - "resolved": "https://registry.npmjs.org/@tanstack/query-core/-/query-core-5.66.4.tgz", - "integrity": "sha512-skM/gzNX4shPkqmdTCSoHtJAPMTtmIJNS0hE+xwTTUVYwezArCT34NMermABmBVUg5Ls5aiUXEDXfqwR1oVkcA==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, - "node_modules/@tanstack/query-devtools": { - "version": "5.65.0", - "resolved": "https://registry.npmjs.org/@tanstack/query-devtools/-/query-devtools-5.65.0.tgz", - "integrity": "sha512-g5y7zc07U9D3esMdqUfTEVu9kMHoIaVBsD0+M3LPdAdD710RpTcLiNvJY1JkYXqkq9+NV+CQoemVNpQPBXVsJg==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, - "node_modules/@tanstack/react-query": { - "version": "5.66.7", - "resolved": "https://registry.npmjs.org/@tanstack/react-query/-/react-query-5.66.7.tgz", - "integrity": "sha512-qd3q/tUpF2K1xItfPZddk1k/8pSXnovg41XyCqJgPoyYEirMBtB0sVEVVQ/CsAOngzgWtBPXimVf4q4kM9uO6A==", - "license": "MIT", - "peer": true, - "dependencies": { - "@tanstack/query-core": "5.66.4" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "react": "^18 || ^19" - } - }, - "node_modules/@tanstack/react-query-devtools": { - "version": "5.66.7", - "resolved": "https://registry.npmjs.org/@tanstack/react-query-devtools/-/react-query-devtools-5.66.7.tgz", - "integrity": "sha512-40z4PPkz06tYIF0vwLZZIZfZxKUH4OAaBOR14blCFyYm6hlU6qc+M82mkZ+D00HcEMhV7P4XeJiEuDhFq0q9Qw==", - "license": "MIT", - "dependencies": { - "@tanstack/query-devtools": "5.65.0" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "@tanstack/react-query": "^5.66.7", - "react": "^18 || ^19" - } - }, - "node_modules/@tanstack/react-table": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/react-table/-/react-table-8.21.2.tgz", - "integrity": "sha512-11tNlEDTdIhMJba2RBH+ecJ9l1zgS2kjmexDPAraulc8jeNA4xocSNeyzextT0XJyASil4XsCYlJmf5jEWAtYg==", - "license": "MIT", - "dependencies": { - "@tanstack/table-core": "8.21.2" - }, - "engines": { - "node": ">=12" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - }, - "peerDependencies": { - "react": ">=16.8", - "react-dom": ">=16.8" - } - }, - "node_modules/@tanstack/table-core": { - "version": "8.21.2", - "resolved": "https://registry.npmjs.org/@tanstack/table-core/-/table-core-8.21.2.tgz", - "integrity": "sha512-uvXk/U4cBiFMxt+p9/G7yUWI/UbHYbyghLCjlpWZ3mLeIZiUBSKcUnw9UnKkdRz7Z/N4UBuFLWQdJCjUe7HjvA==", - "license": "MIT", - "engines": { - "node": ">=12" - }, - "funding": { - "type": "github", - "url": "https://github.com/sponsors/tannerlinsley" - } - }, - "node_modules/@types/d3-array": { - "version": "3.2.2", - "resolved": "https://registry.npmjs.org/@types/d3-array/-/d3-array-3.2.2.tgz", - "integrity": "sha512-hOLWVbm7uRza0BYXpIIW5pxfrKe0W+D5lrFiAEYR+pb6w3N2SwSMaJbXdUfSEv+dT4MfHBLtn5js0LAWaO6otw==", - "license": "MIT" - }, - "node_modules/@types/d3-color": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/@types/d3-color/-/d3-color-3.1.3.tgz", - "integrity": "sha512-iO90scth9WAbmgv7ogoq57O9YpKmFBbmoEoCHDB2xMBY0+/KVrqAaCDyCE16dUspeOvIxFFRI+0sEtqDqy2b4A==", - "license": "MIT" - }, - "node_modules/@types/d3-ease": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-ease/-/d3-ease-3.0.2.tgz", - "integrity": "sha512-NcV1JjO5oDzoK26oMzbILE6HW7uVXOHLQvHshBUW4UMdZGfiY6v5BeQwh9a9tCzv+CeefZQHJt5SRgK154RtiA==", - "license": "MIT" - }, - "node_modules/@types/d3-geo": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@types/d3-geo/-/d3-geo-3.1.0.tgz", - "integrity": "sha512-856sckF0oP/diXtS4jNsiQw/UuK5fQG8l/a9VVLeSouf1/PPbBE1i1W852zVwKwYCBkFJJB7nCFTbk6UMEXBOQ==", - "license": "MIT", - "dependencies": { - "@types/geojson": "*" - } - }, - "node_modules/@types/d3-interpolate": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-interpolate/-/d3-interpolate-3.0.4.tgz", - "integrity": "sha512-mgLPETlrpVV1YRJIglr4Ez47g7Yxjl1lj7YKsiMCb27VJH9W8NVM6Bb9d8kkpG/uAQS5AmbA48q2IAolKKo1MA==", - "license": "MIT", - "dependencies": { - "@types/d3-color": "*" - } - }, - "node_modules/@types/d3-path": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@types/d3-path/-/d3-path-3.1.1.tgz", - "integrity": "sha512-VMZBYyQvbGmWyWVea0EHs/BwLgxc+MKi1zLDCONksozI4YJMcTt8ZEuIR4Sb1MMTE8MMW49v0IwI5+b7RmfWlg==", - "license": "MIT" - }, - "node_modules/@types/d3-scale": { - "version": "4.0.9", - "resolved": "https://registry.npmjs.org/@types/d3-scale/-/d3-scale-4.0.9.tgz", - "integrity": "sha512-dLmtwB8zkAeO/juAMfnV+sItKjlsw2lKdZVVy6LRr0cBmegxSABiLEpGVmSJJ8O08i4+sGR6qQtb6WtuwJdvVw==", - "license": "MIT", - "dependencies": { - "@types/d3-time": "*" - } - }, - "node_modules/@types/d3-shape": { - "version": "3.1.8", - "resolved": "https://registry.npmjs.org/@types/d3-shape/-/d3-shape-3.1.8.tgz", - "integrity": "sha512-lae0iWfcDeR7qt7rA88BNiqdvPS5pFVPpo5OfjElwNaT2yyekbM0C9vK+yqBqEmHr6lDkRnYNoTBYlAgJa7a4w==", - "license": "MIT", - "dependencies": { - "@types/d3-path": "*" - } - }, - "node_modules/@types/d3-time": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/d3-time/-/d3-time-3.0.4.tgz", - "integrity": "sha512-yuzZug1nkAAaBlBBikKZTgzCeA+k1uy4ZFwWANOfKw5z5LRhV0gNA7gNkKm7HoK+HRN0wX3EkxGk0fpbWhmB7g==", - "license": "MIT" - }, - "node_modules/@types/d3-timer": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@types/d3-timer/-/d3-timer-3.0.2.tgz", - "integrity": "sha512-Ps3T8E8dZDam6fUyNiMkekK3XUsaUEik+idO9/YjPtfj2qruF8tFBXS7XhtE4iIXBLxhmLjP3SXpLhVf21I9Lw==", - "license": "MIT" - }, - "node_modules/@types/estree": { - "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", - "dev": true, - "license": "MIT" - }, - "node_modules/@types/geojson": { - "version": "7946.0.16", - "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz", - "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==", - "license": "MIT" - }, - "node_modules/@types/luxon": { - "version": "3.4.2", - "resolved": "https://registry.npmjs.org/@types/luxon/-/luxon-3.4.2.tgz", - "integrity": "sha512-TifLZlFudklWlMBfhubvgqTXRzLDI5pCbGa4P8a3wPyUQSW+1xQ5eDsreP9DWHX3tjq1ke96uYG/nwundroWcA==", - "license": "MIT" - }, - "node_modules/@types/node": { - "version": "22.13.4", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.4.tgz", - "integrity": "sha512-ywP2X0DYtX3y08eFVx5fNIw7/uIv8hYUKgXoK8oayJlLnKcRfEYCxWMVE1XagUdVtCJlZT1AU4LXEABW+L1Peg==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "undici-types": "~6.20.0" - } - }, - "node_modules/@types/react": { - "version": "19.0.10", - "resolved": "https://registry.npmjs.org/@types/react/-/react-19.0.10.tgz", - "integrity": "sha512-JuRQ9KXLEjaUNjTWpzuR231Z2WpIwczOkBEIvbHNCzQefFIT0L8IqE6NV6ULLyC1SI/i234JnDoMkfg+RjQj2g==", - "devOptional": true, - "license": "MIT", - "peer": true, - "dependencies": { - "csstype": "^3.0.2" - } - }, - "node_modules/@types/react-dom": { - "version": "19.0.4", - "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-19.0.4.tgz", - "integrity": "sha512-4fSQ8vWFkg+TGhePfUzVmat3eC14TXYSsiiDSLI0dVLsrm9gZFABjPy/Qu6TKgl1tq1Bu1yDsuQgY3A3DOjCcg==", - "devOptional": true, - "license": "MIT", - "peer": true, - "peerDependencies": { - "@types/react": "^19.0.0" - } - }, - "node_modules/@vitejs/plugin-react-swc": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-react-swc/-/plugin-react-swc-3.8.0.tgz", - "integrity": "sha512-T4sHPvS+DIqDP51ifPqa9XIRAz/kIvIi8oXcnOZZgHmMotgmmdxe/DD5tMFlt5nuIRzT0/QuiwmKlH0503Aapw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@swc/core": "^1.10.15" - }, - "peerDependencies": { - "vite": "^4 || ^5 || ^6" - } - }, - "node_modules/aria-hidden": { - "version": "1.2.6", - "resolved": "https://registry.npmjs.org/aria-hidden/-/aria-hidden-1.2.6.tgz", - "integrity": "sha512-ik3ZgC9dY/lYVVM++OISsaYDeg1tb0VtP5uL3ouh1koGOaUMDPpbFIei4JkFimWUFPn90sbMNMXQAIVOlnYKJA==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/class-variance-authority": { - "version": "0.7.1", - "resolved": "https://registry.npmjs.org/class-variance-authority/-/class-variance-authority-0.7.1.tgz", - "integrity": "sha512-Ka+9Trutv7G8M6WT6SeiRWz792K5qEqIGEGzXKhAE6xOWAY6pPH8U+9IY3oCMv6kqTmLsv7Xh/2w2RigkePMsg==", - "license": "Apache-2.0", - "dependencies": { - "clsx": "^2.1.1" - }, - "funding": { - "url": "https://polar.sh/cva" - } - }, - "node_modules/clsx": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/clsx/-/clsx-2.1.1.tgz", - "integrity": "sha512-eYm0QWBtUrBWZWG0d386OGAw16Z995PiOVo2B7bjWSbHedGl5e0ZWaq65kOGgUSNesEIDkB9ISbTg/JK9dhCZA==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/cmdk": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cmdk/-/cmdk-1.1.1.tgz", - "integrity": "sha512-Vsv7kFaXm+ptHDMZ7izaRsP70GgrW9NBNGswt9OZaVBLlE0SNpDq8eu/VGXyF9r7M0azK3Wy7OlYXsuyYLFzHg==", - "license": "MIT", - "dependencies": { - "@radix-ui/react-compose-refs": "^1.1.1", - "@radix-ui/react-dialog": "^1.1.6", - "@radix-ui/react-id": "^1.1.0", - "@radix-ui/react-primitive": "^2.0.2" - }, - "peerDependencies": { - "react": "^18 || ^19 || ^19.0.0-rc", - "react-dom": "^18 || ^19 || ^19.0.0-rc" - } - }, - "node_modules/cookie": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-1.1.1.tgz", - "integrity": "sha512-ei8Aos7ja0weRpFzJnEA9UHJ/7XQmqglbRwnf2ATjcB9Wq874VKH9kfjjirM6UhU2/E5fFYadylyhFldcqSidQ==", - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/country-flag-icons": { - "version": "1.5.18", - "resolved": "https://registry.npmjs.org/country-flag-icons/-/country-flag-icons-1.5.18.tgz", - "integrity": "sha512-z+Uzesi8u8IdkViqqbzzbkf3+a7WJpcET5B7sPwTg7GXqPYpVEgNlZ/FC3l8KO4mEf+mNkmzKLppKTN4PlCJEQ==", - "license": "MIT" - }, - "node_modules/csstype": { - "version": "3.2.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", - "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", - "license": "MIT" - }, - "node_modules/d3-array": { - "version": "3.2.4", - "resolved": "https://registry.npmjs.org/d3-array/-/d3-array-3.2.4.tgz", - "integrity": "sha512-tdQAmyA18i4J7wprpYq8ClcxZy3SC31QMeByyCFyRt7BVHdREQZ5lpzoe5mFEYZUWe+oq8HBvk9JjpibyEV4Jg==", - "license": "ISC", - "dependencies": { - "internmap": "1 - 2" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-color": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-color/-/d3-color-3.1.0.tgz", - "integrity": "sha512-zg/chbXyeBtMQ1LbD/WSoW2DpC3I0mpmPdW+ynRTj/x2DAWYrIY7qeZIHidozwV24m4iavr15lNwIwLxRmOxhA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-ease": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-ease/-/d3-ease-3.0.1.tgz", - "integrity": "sha512-wR/XK3D3XcLIZwpbvQwQ5fK+8Ykds1ip7A2Txe0yxncXSdq1L9skcG7blcedkOX+ZcgxGAmLX1FrRGbADwzi0w==", - "license": "BSD-3-Clause", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-format": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/d3-format/-/d3-format-3.1.2.tgz", - "integrity": "sha512-AJDdYOdnyRDV5b6ArilzCPPwc1ejkHcoyFarqlPqT7zRYjhavcT3uSrqcMvsgh2CgoPbK3RCwyHaVyxYcP2Arg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-geo": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/d3-geo/-/d3-geo-3.1.1.tgz", - "integrity": "sha512-637ln3gXKXOwhalDzinUgY83KzNWZRKbYubaG+fGVuc/dxO64RRljtCTnf5ecMyE1RIdtqpkVcq0IbtU2S8j2Q==", - "license": "ISC", - "dependencies": { - "d3-array": "2.5.0 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-interpolate": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-interpolate/-/d3-interpolate-3.0.1.tgz", - "integrity": "sha512-3bYs1rOD33uo8aqJfKP3JWPAibgw8Zm2+L9vBKEHJ2Rg+viTR7o5Mmv5mZcieN+FRYaAOWX5SJATX6k1PWz72g==", - "license": "ISC", - "dependencies": { - "d3-color": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-path": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-path/-/d3-path-3.1.0.tgz", - "integrity": "sha512-p3KP5HCf/bvjBSSKuXid6Zqijx7wIfNW+J/maPs+iwR35at5JCbLUT0LzF1cnjbCHWhqzQTIN2Jpe8pRebIEFQ==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-scale": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/d3-scale/-/d3-scale-4.0.2.tgz", - "integrity": "sha512-GZW464g1SH7ag3Y7hXjf8RoUuAFIqklOAq3MRl4OaWabTFJY9PN/E1YklhXLh+OQ3fM9yS2nOkCoS+WLZ6kvxQ==", - "license": "ISC", - "dependencies": { - "d3-array": "2.10.0 - 3", - "d3-format": "1 - 3", - "d3-interpolate": "1.2.0 - 3", - "d3-time": "2.1.1 - 3", - "d3-time-format": "2 - 4" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-shape": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/d3-shape/-/d3-shape-3.2.0.tgz", - "integrity": "sha512-SaLBuwGm3MOViRq2ABk3eLoxwZELpH6zhl3FbAoJ7Vm1gofKx6El1Ib5z23NUEhF9AsGl7y+dzLe5Cw2AArGTA==", - "license": "ISC", - "dependencies": { - "d3-path": "^3.1.0" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/d3-time/-/d3-time-3.1.0.tgz", - "integrity": "sha512-VqKjzBLejbSMT4IgbmVgDjpkYrNWUYJnbCGo874u7MMKIWsILRX+OpX/gTk8MqjpT1A/c6HY2dCA77ZN0lkQ2Q==", - "license": "ISC", - "dependencies": { - "d3-array": "2 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-time-format": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/d3-time-format/-/d3-time-format-4.1.0.tgz", - "integrity": "sha512-dJxPBlzC7NugB2PDLwo9Q8JiTR3M3e4/XANkreKSUxF8vvXKqm1Yfq4Q5dl8budlunRVlUUaDUgFt7eA8D6NLg==", - "license": "ISC", - "dependencies": { - "d3-time": "1 - 3" - }, - "engines": { - "node": ">=12" - } - }, - "node_modules/d3-timer": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/d3-timer/-/d3-timer-3.0.1.tgz", - "integrity": "sha512-ndfJ/JxxMd3nw31uyKoY2naivF+r29V+Lc0svZxe1JvvIRmi8hUsrMvdOwgS1o6uBHmiz91geQ0ylPP0aj1VUA==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/dayjs": { - "version": "1.11.13", - "resolved": "https://registry.npmjs.org/dayjs/-/dayjs-1.11.13.tgz", - "integrity": "sha512-oaMBel6gjolK862uaPQOVTA7q3TZhuSvuMQAAglQDOWYO9A91IrAOUJEyKVlqJlHE0vq5p5UXxzdPfMH/x6xNg==", - "license": "MIT" - }, - "node_modules/decimal.js-light": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/decimal.js-light/-/decimal.js-light-2.5.1.tgz", - "integrity": "sha512-qIMFpTMZmny+MMIitAB6D7iVPEorVw6YQRWkvarTkT4tBeSLLiHzcwj6q0MmYSFCiVpiqPJTJEYIrpcPzVEIvg==", - "license": "MIT" - }, - "node_modules/detect-libc": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", - "dev": true, - "license": "Apache-2.0", - "engines": { - "node": ">=8" - } - }, - "node_modules/detect-node-es": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/detect-node-es/-/detect-node-es-1.1.0.tgz", - "integrity": "sha512-ypdmJU/TbBby2Dxibuv7ZLW3Bs1QEmM7nHjEANfohJLvE0XVujisn1qPJcZxg+qDucsr+bP6fLD1rPS3AhJ7EQ==", - "license": "MIT" - }, - "node_modules/diacritics": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/diacritics/-/diacritics-1.3.0.tgz", - "integrity": "sha512-wlwEkqcsaxvPJML+rDh/2iS824jbREk6DUMUKkEaSlxdYHeS43cClJtsWglvw2RfeXGm6ohKDqsXteJ5sP5enA==", - "license": "MIT" - }, - "node_modules/dom-helpers": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", - "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.8.7", - "csstype": "^3.0.2" - } - }, - "node_modules/enhanced-resolve": { - "version": "5.19.0", - "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.19.0.tgz", - "integrity": "sha512-phv3E1Xl4tQOShqSte26C7Fl84EwUdZsyOuSSk9qtAGyyQs2s3jJzComh+Abf4g187lUUAvH+H26omrqia2aGg==", - "dev": true, - "license": "MIT", - "dependencies": { - "graceful-fs": "^4.2.4", - "tapable": "^2.3.0" - }, - "engines": { - "node": ">=10.13.0" - } - }, - "node_modules/esbuild": { - "version": "0.25.12", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.25.12.tgz", - "integrity": "sha512-bbPBYYrtZbkt6Os6FiTLCTFxvq4tt3JKall1vRwshA3fdVztsLAatFaZobhkBC8/BrPetoa0oksYoKXoG4ryJg==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "bin": { - "esbuild": "bin/esbuild" - }, - "engines": { - "node": ">=18" - }, - "optionalDependencies": { - "@esbuild/aix-ppc64": "0.25.12", - "@esbuild/android-arm": "0.25.12", - "@esbuild/android-arm64": "0.25.12", - "@esbuild/android-x64": "0.25.12", - "@esbuild/darwin-arm64": "0.25.12", - "@esbuild/darwin-x64": "0.25.12", - "@esbuild/freebsd-arm64": "0.25.12", - "@esbuild/freebsd-x64": "0.25.12", - "@esbuild/linux-arm": "0.25.12", - "@esbuild/linux-arm64": "0.25.12", - "@esbuild/linux-ia32": "0.25.12", - "@esbuild/linux-loong64": "0.25.12", - "@esbuild/linux-mips64el": "0.25.12", - "@esbuild/linux-ppc64": "0.25.12", - "@esbuild/linux-riscv64": "0.25.12", - "@esbuild/linux-s390x": "0.25.12", - "@esbuild/linux-x64": "0.25.12", - "@esbuild/netbsd-arm64": "0.25.12", - "@esbuild/netbsd-x64": "0.25.12", - "@esbuild/openbsd-arm64": "0.25.12", - "@esbuild/openbsd-x64": "0.25.12", - "@esbuild/openharmony-arm64": "0.25.12", - "@esbuild/sunos-x64": "0.25.12", - "@esbuild/win32-arm64": "0.25.12", - "@esbuild/win32-ia32": "0.25.12", - "@esbuild/win32-x64": "0.25.12" - } - }, - "node_modules/eventemitter3": { - "version": "4.0.7", - "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz", - "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", - "license": "MIT" - }, - "node_modules/fast-equals": { - "version": "5.4.0", - "resolved": "https://registry.npmjs.org/fast-equals/-/fast-equals-5.4.0.tgz", - "integrity": "sha512-jt2DW/aNFNwke7AUd+Z+e6pz39KO5rzdbbFCg2sGafS4mk13MI7Z8O5z9cADNn5lhGODIgLwug6TZO2ctf7kcw==", - "license": "MIT", - "engines": { - "node": ">=6.0.0" - } - }, - "node_modules/fdir": { - "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=12.0.0" - }, - "peerDependencies": { - "picomatch": "^3 || ^4" - }, - "peerDependenciesMeta": { - "picomatch": { - "optional": true - } - } - }, - "node_modules/framer-motion": { - "version": "12.23.26", - "resolved": "https://registry.npmjs.org/framer-motion/-/framer-motion-12.23.26.tgz", - "integrity": "sha512-cPcIhgR42xBn1Uj+PzOyheMtZ73H927+uWPDVhUMqxy8UHt6Okavb6xIz9J/phFUHUj0OncR6UvMfJTXoc/LKA==", - "license": "MIT", - "dependencies": { - "motion-dom": "^12.23.23", - "motion-utils": "^12.23.6", - "tslib": "^2.4.0" - }, - "peerDependencies": { - "@emotion/is-prop-valid": "*", - "react": "^18.0.0 || ^19.0.0", - "react-dom": "^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@emotion/is-prop-valid": { - "optional": true - }, - "react": { - "optional": true - }, - "react-dom": { - "optional": true - } - } - }, - "node_modules/fsevents": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "dev": true, - "hasInstallScript": true, - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": "^8.16.0 || ^10.6.0 || >=11.0.0" - } - }, - "node_modules/get-nonce": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-nonce/-/get-nonce-1.0.1.tgz", - "integrity": "sha512-FJhYRoDaiatfEkUK8HKlicmu/3SGFD51q3itKDGoSTysQJBnfOcxU5GxnhE1E6soB76MbT0MBtnKJuXyAx+96Q==", - "license": "MIT", - "engines": { - "node": ">=6" - } - }, - "node_modules/globals": { - "version": "15.15.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz", - "integrity": "sha512-7ACyT3wmyp3I61S4fG682L0VA2RGD9otkqGJIwNUMF1SWUombIIk+af1unuDYgMm082aHYwD+mzJvv9Iu8dsgg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=18" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, - "node_modules/graceful-fs": { - "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", - "dev": true, - "license": "ISC" - }, - "node_modules/html-parse-stringify": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz", - "integrity": "sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg==", - "license": "MIT", - "dependencies": { - "void-elements": "3.1.0" - } - }, - "node_modules/i18n-iso-countries": { - "version": "7.14.0", - "resolved": "https://registry.npmjs.org/i18n-iso-countries/-/i18n-iso-countries-7.14.0.tgz", - "integrity": "sha512-nXHJZYtNrfsi1UQbyRqm3Gou431elgLjKl//CYlnBGt5aTWdRPH1PiS2T/p/n8Q8LnqYqzQJik3Q7mkwvLokeg==", - "license": "MIT", - "dependencies": { - "diacritics": "1.3.0" - }, - "engines": { - "node": ">= 12" - } - }, - "node_modules/i18next": { - "version": "24.2.2", - "resolved": "https://registry.npmjs.org/i18next/-/i18next-24.2.2.tgz", - "integrity": "sha512-NE6i86lBCKRYZa5TaUDkU5S4HFgLIEJRLr3Whf2psgaxBleQ2LC1YW1Vc+SCgkAW7VEzndT6al6+CzegSUHcTQ==", - "funding": [ - { - "type": "individual", - "url": "https://locize.com" - }, - { - "type": "individual", - "url": "https://locize.com/i18next.html" - }, - { - "type": "individual", - "url": "https://www.i18next.com/how-to/faq#i18next-is-awesome.-how-can-i-support-the-project" - } - ], - "license": "MIT", - "peer": true, - "dependencies": { - "@babel/runtime": "^7.23.2" - }, - "peerDependencies": { - "typescript": "^5" - }, - "peerDependenciesMeta": { - "typescript": { - "optional": true - } - } - }, - "node_modules/internmap": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/internmap/-/internmap-2.0.3.tgz", - "integrity": "sha512-5Hh7Y1wQbvY5ooGgPbDaL5iYLAPzMTUrjMulskHLH6wnv/A+1q5rgEaiuqEjB+oxGXIVZs1FF+R/KPN3ZSQYYg==", - "license": "ISC", - "engines": { - "node": ">=12" - } - }, - "node_modules/jiti": { - "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", - "dev": true, - "license": "MIT", - "bin": { - "jiti": "lib/jiti-cli.mjs" - } - }, - "node_modules/js-tokens": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", - "license": "MIT" - }, - "node_modules/lightningcss": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.31.1.tgz", - "integrity": "sha512-l51N2r93WmGUye3WuFoN5k10zyvrVs0qfKBhyC5ogUQ6Ew6JUSswh78mbSO+IU3nTWsyOArqPCcShdQSadghBQ==", - "dev": true, - "license": "MPL-2.0", - "dependencies": { - "detect-libc": "^2.0.3" - }, - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - }, - "optionalDependencies": { - "lightningcss-android-arm64": "1.31.1", - "lightningcss-darwin-arm64": "1.31.1", - "lightningcss-darwin-x64": "1.31.1", - "lightningcss-freebsd-x64": "1.31.1", - "lightningcss-linux-arm-gnueabihf": "1.31.1", - "lightningcss-linux-arm64-gnu": "1.31.1", - "lightningcss-linux-arm64-musl": "1.31.1", - "lightningcss-linux-x64-gnu": "1.31.1", - "lightningcss-linux-x64-musl": "1.31.1", - "lightningcss-win32-arm64-msvc": "1.31.1", - "lightningcss-win32-x64-msvc": "1.31.1" - } - }, - "node_modules/lightningcss-android-arm64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-android-arm64/-/lightningcss-android-arm64-1.31.1.tgz", - "integrity": "sha512-HXJF3x8w9nQ4jbXRiNppBCqeZPIAfUo8zE/kOEGbW5NZvGc/K7nMxbhIr+YlFlHW5mpbg/YFPdbnCh1wAXCKFg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-arm64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.31.1.tgz", - "integrity": "sha512-02uTEqf3vIfNMq3h/z2cJfcOXnQ0GRwQrkmPafhueLb2h7mqEidiCzkE4gBMEH65abHRiQvhdcQ+aP0D0g67sg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-darwin-x64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.31.1.tgz", - "integrity": "sha512-1ObhyoCY+tGxtsz1lSx5NXCj3nirk0Y0kB/g8B8DT+sSx4G9djitg9ejFnjb3gJNWo7qXH4DIy2SUHvpoFwfTA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-freebsd-x64": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.31.1.tgz", - "integrity": "sha512-1RINmQKAItO6ISxYgPwszQE1BrsVU5aB45ho6O42mu96UiZBxEXsuQ7cJW4zs4CEodPUioj/QrXW1r9pLUM74A==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm-gnueabihf": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.31.1.tgz", - "integrity": "sha512-OOCm2//MZJ87CdDK62rZIu+aw9gBv4azMJuA8/KB74wmfS3lnC4yoPHm0uXZ/dvNNHmnZnB8XLAZzObeG0nS1g==", - "cpu": [ - "arm" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-gnu": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.31.1.tgz", - "integrity": "sha512-WKyLWztD71rTnou4xAD5kQT+982wvca7E6QoLpoawZ1gP9JM0GJj4Tp5jMUh9B3AitHbRZ2/H3W5xQmdEOUlLg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-arm64-musl": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.31.1.tgz", - "integrity": "sha512-mVZ7Pg2zIbe3XlNbZJdjs86YViQFoJSpc41CbVmKBPiGmC4YrfeOyz65ms2qpAobVd7WQsbW4PdsSJEMymyIMg==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-gnu": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.31.1.tgz", - "integrity": "sha512-xGlFWRMl+0KvUhgySdIaReQdB4FNudfUTARn7q0hh/V67PVGCs3ADFjw+6++kG1RNd0zdGRlEKa+T13/tQjPMA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-linux-x64-musl": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.31.1.tgz", - "integrity": "sha512-eowF8PrKHw9LpoZii5tdZwnBcYDxRw2rRCyvAXLi34iyeYfqCQNA9rmUM0ce62NlPhCvof1+9ivRaTY6pSKDaA==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-arm64-msvc": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.31.1.tgz", - "integrity": "sha512-aJReEbSEQzx1uBlQizAOBSjcmr9dCdL3XuC/6HLXAxmtErsj2ICo5yYggg1qOODQMtnjNQv2UHb9NpOuFtYe4w==", - "cpu": [ - "arm64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lightningcss-win32-x64-msvc": { - "version": "1.31.1", - "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.31.1.tgz", - "integrity": "sha512-I9aiFrbd7oYHwlnQDqr1Roz+fTz61oDDJX7n9tYF9FJymH1cIN1DtKw3iYt6b8WZgEjoNwVSncwF4wx/ZedMhw==", - "cpu": [ - "x64" - ], - "dev": true, - "license": "MPL-2.0", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">= 12.0.0" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/parcel" - } - }, - "node_modules/lodash": { - "version": "4.17.23", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.23.tgz", - "integrity": "sha512-LgVTMpQtIopCi79SJeDiP0TfWi5CNEc/L/aRdTh3yIvmZXTnheWpKjSZhnvMl8iXbC1tFg9gdHHDMLoV7CnG+w==", - "license": "MIT" - }, - "node_modules/loose-envify": { - "version": "1.4.0", - "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", - "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", - "license": "MIT", - "dependencies": { - "js-tokens": "^3.0.0 || ^4.0.0" - }, - "bin": { - "loose-envify": "cli.js" - } - }, - "node_modules/lucide-react": { - "version": "0.460.0", - "resolved": "https://registry.npmjs.org/lucide-react/-/lucide-react-0.460.0.tgz", - "integrity": "sha512-BVtq/DykVeIvRTJvRAgCsOwaGL8Un3Bxh8MbDxMhEWlZay3T4IpEKDEpwt5KZ0KJMHzgm6jrltxlT5eXOWXDHg==", - "license": "ISC", - "peerDependencies": { - "react": "^16.5.1 || ^17.0.0 || ^18.0.0 || ^19.0.0-rc" - } - }, - "node_modules/luxon": { - "version": "3.5.0", - "resolved": "https://registry.npmjs.org/luxon/-/luxon-3.5.0.tgz", - "integrity": "sha512-rh+Zjr6DNfUYR3bPwJEnuwDdqMbxZW7LOQfUN4B54+Cl+0o5zaU9RJ6bcidfDtC1cWCZXQ+nvX8bf6bAji37QQ==", - "license": "MIT", - "engines": { - "node": ">=12" - } - }, - "node_modules/magic-string": { - "version": "0.30.21", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", - "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "@jridgewell/sourcemap-codec": "^1.5.5" - } - }, - "node_modules/motion-dom": { - "version": "12.34.3", - "resolved": "https://registry.npmjs.org/motion-dom/-/motion-dom-12.34.3.tgz", - "integrity": "sha512-sYgFe+pR9aIM7o4fhs2aXtOI+oqlUd33N9Yoxcgo1Fv7M20sRkHtCmzE/VRNIcq7uNJ+qio+Xubt1FXH3pQ+eQ==", - "license": "MIT", - "dependencies": { - "motion-utils": "^12.29.2" - } - }, - "node_modules/motion-utils": { - "version": "12.29.2", - "resolved": "https://registry.npmjs.org/motion-utils/-/motion-utils-12.29.2.tgz", - "integrity": "sha512-G3kc34H2cX2gI63RqU+cZq+zWRRPSsNIOjpdl9TN4AQwC4sgwYPl/Q/Obf/d53nOm569T0fYK+tcoSV50BWx8A==", - "license": "MIT" - }, - "node_modules/nanoid": { - "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", - "dev": true, - "funding": [ - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "bin": { - "nanoid": "bin/nanoid.cjs" - }, - "engines": { - "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1" - } - }, - "node_modules/object-assign": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/picocolors": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", - "dev": true, - "license": "ISC" - }, - "node_modules/picomatch": { - "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", - "dev": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=12" - }, - "funding": { - "url": "https://github.com/sponsors/jonschlinkert" - } - }, - "node_modules/postcss": { - "version": "8.5.3", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.3.tgz", - "integrity": "sha512-dle9A3yYxlBSrt8Fu+IpjGT8SY8hN0mlaA6GY8t0P5PjIOZemULz/E2Bnm/2dcUOena75OTNkHI76uZBNUUq3A==", - "dev": true, - "funding": [ - { - "type": "opencollective", - "url": "https://opencollective.com/postcss/" - }, - { - "type": "tidelift", - "url": "https://tidelift.com/funding/github/npm/postcss" - }, - { - "type": "github", - "url": "https://github.com/sponsors/ai" - } - ], - "license": "MIT", - "dependencies": { - "nanoid": "^3.3.8", - "picocolors": "^1.1.1", - "source-map-js": "^1.2.1" - }, - "engines": { - "node": "^10 || ^12 || >=14" - } - }, - "node_modules/prop-types": { - "version": "15.8.1", - "resolved": "https://registry.npmjs.org/prop-types/-/prop-types-15.8.1.tgz", - "integrity": "sha512-oj87CgZICdulUohogVAR7AjlC0327U4el4L6eAvOqCeudMDVU0NThNaV+b9Df4dXgSP1gXMTnPdhfe/2qDH5cg==", - "license": "MIT", - "dependencies": { - "loose-envify": "^1.4.0", - "object-assign": "^4.1.1", - "react-is": "^16.13.1" - } - }, - "node_modules/prop-types/node_modules/react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", - "license": "MIT" - }, - "node_modules/react": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/react/-/react-19.0.0.tgz", - "integrity": "sha512-V8AVnmPIICiWpGfm6GLzCR/W5FXLchHop40W4nXBmdlEceh16rCN8O8LNWm5bh5XUX91fh7KpA+W0TgMKmgTpQ==", - "license": "MIT", - "peer": true, - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/react-dom": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0.tgz", - "integrity": "sha512-4GV5sHFG0e/0AD4X+ySy6UJd3jVl1iNsNHdpad0qhABJ11twS3TTBnseqsKurKcsNqCEFeGL3uLpVChpIO3QfQ==", - "license": "MIT", - "peer": true, - "dependencies": { - "scheduler": "^0.25.0" - }, - "peerDependencies": { - "react": "^19.0.0" - } - }, - "node_modules/react-i18next": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/react-i18next/-/react-i18next-15.4.1.tgz", - "integrity": "sha512-ahGab+IaSgZmNPYXdV1n+OYky95TGpFwnKRflX/16dY04DsYYKHtVLjeny7sBSCREEcoMbAgSkFiGLF5g5Oofw==", - "license": "MIT", - "dependencies": { - "@babel/runtime": "^7.25.0", - "html-parse-stringify": "^3.0.1" - }, - "peerDependencies": { - "i18next": ">= 23.2.3", - "react": ">= 16.8.0" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, - "node_modules/react-is": { - "version": "18.3.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.3.1.tgz", - "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", - "license": "MIT" - }, - "node_modules/react-remove-scroll": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/react-remove-scroll/-/react-remove-scroll-2.7.2.tgz", - "integrity": "sha512-Iqb9NjCCTt6Hf+vOdNIZGdTiH1QSqr27H/Ek9sv/a97gfueI/5h1s3yRi1nngzMUaOOToin5dI1dXKdXiF+u0Q==", - "license": "MIT", - "dependencies": { - "react-remove-scroll-bar": "^2.3.7", - "react-style-singleton": "^2.2.3", - "tslib": "^2.1.0", - "use-callback-ref": "^1.3.3", - "use-sidecar": "^1.1.3" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/react-remove-scroll-bar": { - "version": "2.3.8", - "resolved": "https://registry.npmjs.org/react-remove-scroll-bar/-/react-remove-scroll-bar-2.3.8.tgz", - "integrity": "sha512-9r+yi9+mgU33AKcj6IbT9oRCO78WriSj6t/cF8DWBZJ9aOGPOTEDvdUDz1FwKim7QXWwmHqtdHnRJfhAxEG46Q==", - "license": "MIT", - "dependencies": { - "react-style-singleton": "^2.2.2", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/react-router": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/react-router/-/react-router-7.13.0.tgz", - "integrity": "sha512-PZgus8ETambRT17BUm/LL8lX3Of+oiLaPuVTRH3l1eLvSPpKO3AvhAEb5N7ihAFZQrYDqkvvWfFh9p0z9VsjLw==", - "license": "MIT", - "dependencies": { - "cookie": "^1.0.1", - "set-cookie-parser": "^2.6.0" - }, - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - } - } - }, - "node_modules/react-router-dom": { - "version": "7.13.0", - "resolved": "https://registry.npmjs.org/react-router-dom/-/react-router-dom-7.13.0.tgz", - "integrity": "sha512-5CO/l5Yahi2SKC6rGZ+HDEjpjkGaG/ncEP7eWFTvFxbHP8yeeI0PxTDjimtpXYlR3b3i9/WIL4VJttPrESIf2g==", - "license": "MIT", - "dependencies": { - "react-router": "7.13.0" - }, - "engines": { - "node": ">=20.0.0" - }, - "peerDependencies": { - "react": ">=18", - "react-dom": ">=18" - } - }, - "node_modules/react-smooth": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/react-smooth/-/react-smooth-4.0.4.tgz", - "integrity": "sha512-gnGKTpYwqL0Iii09gHobNolvX4Kiq4PKx6eWBCYYix+8cdw+cGo3do906l1NBPKkSWx1DghC1dlWG9L2uGd61Q==", - "license": "MIT", - "dependencies": { - "fast-equals": "^5.0.1", - "prop-types": "^15.8.1", - "react-transition-group": "^4.4.5" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" - } - }, - "node_modules/react-style-singleton": { - "version": "2.2.3", - "resolved": "https://registry.npmjs.org/react-style-singleton/-/react-style-singleton-2.2.3.tgz", - "integrity": "sha512-b6jSvxvVnyptAiLjbkWLE/lOnR4lfTtDAl+eUC7RZy+QQWc6wRzIV2CE6xBuMmDxc2qIihtDCZD5NPOFl7fRBQ==", - "license": "MIT", - "dependencies": { - "get-nonce": "^1.0.0", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/react-transition-group": { - "version": "4.4.5", - "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.5.tgz", - "integrity": "sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g==", - "license": "BSD-3-Clause", - "dependencies": { - "@babel/runtime": "^7.5.5", - "dom-helpers": "^5.0.1", - "loose-envify": "^1.4.0", - "prop-types": "^15.6.2" - }, - "peerDependencies": { - "react": ">=16.6.0", - "react-dom": ">=16.6.0" - } - }, - "node_modules/recharts": { - "version": "2.15.1", - "resolved": "https://registry.npmjs.org/recharts/-/recharts-2.15.1.tgz", - "integrity": "sha512-v8PUTUlyiDe56qUj82w/EDVuzEFXwEHp9/xOowGAZwfLjB9uAy3GllQVIYMWF6nU+qibx85WF75zD7AjqoT54Q==", - "license": "MIT", - "dependencies": { - "clsx": "^2.0.0", - "eventemitter3": "^4.0.1", - "lodash": "^4.17.21", - "react-is": "^18.3.1", - "react-smooth": "^4.0.4", - "recharts-scale": "^0.4.4", - "tiny-invariant": "^1.3.1", - "victory-vendor": "^36.6.8" - }, - "engines": { - "node": ">=14" - }, - "peerDependencies": { - "react": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0", - "react-dom": "^16.0.0 || ^17.0.0 || ^18.0.0 || ^19.0.0" - } - }, - "node_modules/recharts-scale": { - "version": "0.4.5", - "resolved": "https://registry.npmjs.org/recharts-scale/-/recharts-scale-0.4.5.tgz", - "integrity": "sha512-kivNFO+0OcUNu7jQquLXAxz1FIwZj8nrj+YkOKc5694NbjCvcT6aSZiIzNzd2Kul4o4rTto8QVR9lMNtxD4G1w==", - "license": "MIT", - "dependencies": { - "decimal.js-light": "^2.4.1" - } - }, - "node_modules/rollup": { - "version": "4.58.0", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.58.0.tgz", - "integrity": "sha512-wbT0mBmWbIvvq8NeEYWWvevvxnOyhKChir47S66WCxw1SXqhw7ssIYejnQEVt7XYQpsj2y8F9PM+Cr3SNEa0gw==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/estree": "1.0.8" - }, - "bin": { - "rollup": "dist/bin/rollup" - }, - "engines": { - "node": ">=18.0.0", - "npm": ">=8.0.0" - }, - "optionalDependencies": { - "@rollup/rollup-android-arm-eabi": "4.58.0", - "@rollup/rollup-android-arm64": "4.58.0", - "@rollup/rollup-darwin-arm64": "4.58.0", - "@rollup/rollup-darwin-x64": "4.58.0", - "@rollup/rollup-freebsd-arm64": "4.58.0", - "@rollup/rollup-freebsd-x64": "4.58.0", - "@rollup/rollup-linux-arm-gnueabihf": "4.58.0", - "@rollup/rollup-linux-arm-musleabihf": "4.58.0", - "@rollup/rollup-linux-arm64-gnu": "4.58.0", - "@rollup/rollup-linux-arm64-musl": "4.58.0", - "@rollup/rollup-linux-loong64-gnu": "4.58.0", - "@rollup/rollup-linux-loong64-musl": "4.58.0", - "@rollup/rollup-linux-ppc64-gnu": "4.58.0", - "@rollup/rollup-linux-ppc64-musl": "4.58.0", - "@rollup/rollup-linux-riscv64-gnu": "4.58.0", - "@rollup/rollup-linux-riscv64-musl": "4.58.0", - "@rollup/rollup-linux-s390x-gnu": "4.58.0", - "@rollup/rollup-linux-x64-gnu": "4.58.0", - "@rollup/rollup-linux-x64-musl": "4.58.0", - "@rollup/rollup-openbsd-x64": "4.58.0", - "@rollup/rollup-openharmony-arm64": "4.58.0", - "@rollup/rollup-win32-arm64-msvc": "4.58.0", - "@rollup/rollup-win32-ia32-msvc": "4.58.0", - "@rollup/rollup-win32-x64-gnu": "4.58.0", - "@rollup/rollup-win32-x64-msvc": "4.58.0", - "fsevents": "~2.3.2" - } - }, - "node_modules/scheduler": { - "version": "0.25.0", - "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0.tgz", - "integrity": "sha512-xFVuu11jh+xcO7JOAGJNOXld8/TcEHK/4CituBUeUb5hqxJLj9YuemAEuvm9gQ/+pgXYfbQuqAkiYu+u7YEsNA==", - "license": "MIT" - }, - "node_modules/set-cookie-parser": { - "version": "2.7.2", - "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.2.tgz", - "integrity": "sha512-oeM1lpU/UvhTxw+g3cIfxXHyJRc/uidd3yK1P242gzHds0udQBYzs3y8j4gCCW+ZJ7ad0yctld8RYO+bdurlvw==", - "license": "MIT" - }, - "node_modules/sonner": { - "version": "1.7.4", - "resolved": "https://registry.npmjs.org/sonner/-/sonner-1.7.4.tgz", - "integrity": "sha512-DIS8z4PfJRbIyfVFDVnK9rO3eYDtse4Omcm6bt0oEr5/jtLgysmjuBl1frJ9E/EQZrFmKx2A8m/s5s9CRXIzhw==", - "license": "MIT", - "peerDependencies": { - "react": "^18.0.0 || ^19.0.0 || ^19.0.0-rc", - "react-dom": "^18.0.0 || ^19.0.0 || ^19.0.0-rc" - } - }, - "node_modules/source-map-js": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", - "dev": true, - "license": "BSD-3-Clause", - "engines": { - "node": ">=0.10.0" - } - }, - "node_modules/tailwind-merge": { - "version": "2.6.0", - "resolved": "https://registry.npmjs.org/tailwind-merge/-/tailwind-merge-2.6.0.tgz", - "integrity": "sha512-P+Vu1qXfzediirmHOC3xKGAYeZtPcV9g76X+xg2FD4tYgR71ewMA35Y3sCz3zhiN/dwefRpJX0yBcgwi1fXNQA==", - "license": "MIT", - "funding": { - "type": "github", - "url": "https://github.com/sponsors/dcastil" - } - }, - "node_modules/tailwindcss": { - "version": "4.2.0", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-4.2.0.tgz", - "integrity": "sha512-yYzTZ4++b7fNYxFfpnberEEKu43w44aqDMNM9MHMmcKuCH7lL8jJ4yJ7LGHv7rSwiqM0nkiobF9I6cLlpS2P7Q==", - "license": "MIT", - "peer": true - }, - "node_modules/tailwindcss-animate": { - "version": "1.0.7", - "resolved": "https://registry.npmjs.org/tailwindcss-animate/-/tailwindcss-animate-1.0.7.tgz", - "integrity": "sha512-bl6mpH3T7I3UFxuvDEXLxy/VuFxBk5bbzplh7tXI68mwMokNYd1t9qPBHlnyTwfa4JGC4zP516I1hYYtQ/vspA==", - "license": "MIT", - "peerDependencies": { - "tailwindcss": ">=3.0.0 || insiders" - } - }, - "node_modules/tapable": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.3.0.tgz", - "integrity": "sha512-g9ljZiwki/LfxmQADO3dEY1CbpmXT5Hm2fJ+QaGKwSXUylMybePR7/67YW7jOrrvjEgL1Fmz5kzyAjWVWLlucg==", - "dev": true, - "license": "MIT", - "engines": { - "node": ">=6" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/webpack" - } - }, - "node_modules/tiny-invariant": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/tiny-invariant/-/tiny-invariant-1.3.3.tgz", - "integrity": "sha512-+FbBPE1o9QAYvviau/qC5SE3caw21q3xkvWKBtja5vgqOWIHHJ3ioaq1VPfn/Szqctz2bU/oYeKd9/z5BL+PVg==", - "license": "MIT" - }, - "node_modules/tinyglobby": { - "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", - "dev": true, - "license": "MIT", - "dependencies": { - "fdir": "^6.5.0", - "picomatch": "^4.0.3" - }, - "engines": { - "node": ">=12.0.0" - }, - "funding": { - "url": "https://github.com/sponsors/SuperchupuDev" - } - }, - "node_modules/tslib": { - "version": "2.8.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz", - "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w==", - "license": "0BSD" - }, - "node_modules/typescript": { - "version": "5.6.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.6.3.tgz", - "integrity": "sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==", - "devOptional": true, - "license": "Apache-2.0", - "peer": true, - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, - "node_modules/undici-types": { - "version": "6.20.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.20.0.tgz", - "integrity": "sha512-Ny6QZ2Nju20vw1SRHe3d9jVu6gJ+4e3+MMpqu7pqE5HT6WsTSlce++GQmK5UXS8mzV8DSYHrQH+Xrf2jVcuKNg==", - "dev": true, - "license": "MIT" - }, - "node_modules/use-callback-ref": { - "version": "1.3.3", - "resolved": "https://registry.npmjs.org/use-callback-ref/-/use-callback-ref-1.3.3.tgz", - "integrity": "sha512-jQL3lRnocaFtu3V00JToYz/4QkNWswxijDaCVNZRiRTO3HQDLsdu1ZtmIUvV4yPp+rvWm5j0y0TG/S61cuijTg==", - "license": "MIT", - "dependencies": { - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/use-sidecar": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/use-sidecar/-/use-sidecar-1.1.3.tgz", - "integrity": "sha512-Fedw0aZvkhynoPYlA5WXrMCAMm+nSWdZt6lzJQ7Ok8S6Q+VsHmHpRWndVRJ8Be0ZbkfPc5LRYH+5XrzXcEeLRQ==", - "license": "MIT", - "dependencies": { - "detect-node-es": "^1.1.0", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - }, - "peerDependencies": { - "@types/react": "*", - "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0 || ^19.0.0-rc" - }, - "peerDependenciesMeta": { - "@types/react": { - "optional": true - } - } - }, - "node_modules/victory-vendor": { - "version": "36.9.2", - "resolved": "https://registry.npmjs.org/victory-vendor/-/victory-vendor-36.9.2.tgz", - "integrity": "sha512-PnpQQMuxlwYdocC8fIJqVXvkeViHYzotI+NJrCuav0ZYFoq912ZHBk3mCeuj+5/VpodOjPe1z0Fk2ihgzlXqjQ==", - "license": "MIT AND ISC", - "dependencies": { - "@types/d3-array": "^3.0.3", - "@types/d3-ease": "^3.0.0", - "@types/d3-interpolate": "^3.0.1", - "@types/d3-scale": "^4.0.2", - "@types/d3-shape": "^3.1.0", - "@types/d3-time": "^3.0.0", - "@types/d3-timer": "^3.0.0", - "d3-array": "^3.1.6", - "d3-ease": "^3.0.1", - "d3-interpolate": "^3.0.1", - "d3-scale": "^4.0.2", - "d3-shape": "^3.1.0", - "d3-time": "^3.0.0", - "d3-timer": "^3.0.1" - } - }, - "node_modules/vite": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/vite/-/vite-6.4.1.tgz", - "integrity": "sha512-+Oxm7q9hDoLMyJOYfUYBuHQo+dkAloi33apOPP56pzj+vsdJDzr+j1NISE5pyaAuKL4A3UD34qd0lx5+kfKp2g==", - "dev": true, - "license": "MIT", - "peer": true, - "dependencies": { - "esbuild": "^0.25.0", - "fdir": "^6.4.4", - "picomatch": "^4.0.2", - "postcss": "^8.5.3", - "rollup": "^4.34.9", - "tinyglobby": "^0.2.13" - }, - "bin": { - "vite": "bin/vite.js" - }, - "engines": { - "node": "^18.0.0 || ^20.0.0 || >=22.0.0" - }, - "funding": { - "url": "https://github.com/vitejs/vite?sponsor=1" - }, - "optionalDependencies": { - "fsevents": "~2.3.3" - }, - "peerDependencies": { - "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0", - "jiti": ">=1.21.0", - "less": "*", - "lightningcss": "^1.21.0", - "sass": "*", - "sass-embedded": "*", - "stylus": "*", - "sugarss": "*", - "terser": "^5.16.0", - "tsx": "^4.8.1", - "yaml": "^2.4.2" - }, - "peerDependenciesMeta": { - "@types/node": { - "optional": true - }, - "jiti": { - "optional": true - }, - "less": { - "optional": true - }, - "lightningcss": { - "optional": true - }, - "sass": { - "optional": true - }, - "sass-embedded": { - "optional": true - }, - "stylus": { - "optional": true - }, - "sugarss": { - "optional": true - }, - "terser": { - "optional": true - }, - "tsx": { - "optional": true - }, - "yaml": { - "optional": true - } - } - }, - "node_modules/void-elements": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz", - "integrity": "sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w==", - "license": "MIT", - "engines": { - "node": ">=0.10.0" - } - } - } -} diff --git a/pkgs/by-name/ne/nezha-theme-user/package.nix b/pkgs/by-name/ne/nezha-theme-user/package.nix index 90665ff1c9d0..291081db0722 100644 --- a/pkgs/by-name/ne/nezha-theme-user/package.nix +++ b/pkgs/by-name/ne/nezha-theme-user/package.nix @@ -2,36 +2,44 @@ lib, buildNpmPackage, fetchFromGitHub, + fetchPnpmDeps, + pnpmConfigHook, + pnpm_11, nix-update-script, }: +let + pnpm = pnpm_11; +in buildNpmPackage (finalAttrs: { pname = "nezha-theme-user"; - version = "2.0.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "hamster1963"; - repo = "nezha-dash-v1"; + repo = "nezha-dash-v2"; tag = "v${finalAttrs.version}"; - hash = "sha256-3zaA3T4zW18caOQe5DBF8Zsms3cjks3Ywyfkyk6N2N0="; + hash = "sha256-n1q9mjheW2J500mEPhBaGHuMAEVtddxXCyLC+Au/8Ts="; }; - # TODO: Switch to the bun build function once available in nixpkgs postPatch = '' - cp ${./package-lock.json} package-lock.json - # We cannot directly get the git commit hash from the tarball substituteInPlace vite.config.ts \ - --replace-fail 'git rev-parse --short HEAD' 'echo refs/tags/v${finalAttrs.version}' + --replace-fail 'git rev-parse --short HEAD' 'echo ${finalAttrs.src.rev}' substituteInPlace src/components/Footer.tsx \ --replace-fail '/commit/' '/tree/' ''; - npmDepsHash = "sha256-hjVvp2dWBHqXrq/7+kLDmcUUrV15ln/8tNNqDmJ/Sh4="; + nativeBuildInputs = [ pnpm ]; - npmPackFlags = [ "--ignore-scripts" ]; - - npmFlags = [ "--legacy-peer-deps" ]; + npmDeps = null; + pnpmDeps = fetchPnpmDeps { + inherit (finalAttrs) pname version src; + inherit pnpm; + fetcherVersion = 4; + hash = "sha256-OPI4xMOJA5TJ1XAAFqawXPUQePgNKe2ES+g2MsIstFo="; + }; + npmConfigHook = pnpmConfigHook; dontNpmInstall = true; installPhase = '' @@ -42,13 +50,13 @@ buildNpmPackage (finalAttrs: { runHook postInstall ''; - passthru.updateScript = nix-update-script { extraArgs = [ "--generate-lockfile" ]; }; + passthru.updateScript = nix-update-script { }; meta = { description = "Nezha monitoring user frontend based on next.js"; - changelog = "https://github.com/hamster1963/nezha-dash-v1/releases/tag/v${finalAttrs.version}"; - homepage = "https://github.com/hamster1963/nezha-dash-v1"; - license = lib.licenses.apsl20; + changelog = "https://github.com/hamster1963/nezha-dash-v2/releases/tag/v${finalAttrs.version}"; + homepage = "https://github.com/hamster1963/nezha-dash-v2"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ moraxyc ]; }; }) diff --git a/pkgs/by-name/ne/nezha/package.nix b/pkgs/by-name/ne/nezha/package.nix index 88070b405075..5daa8fd5d48c 100644 --- a/pkgs/by-name/ne/nezha/package.nix +++ b/pkgs/by-name/ne/nezha/package.nix @@ -7,6 +7,7 @@ dbip-country-lite, formats, nix-update-script, + nixosTests, nezha-theme-admin, nezha-theme-user, withThemes ? [ ], @@ -48,13 +49,13 @@ let in buildGoModule (finalAttrs: { pname = "nezha"; - version = "2.2.2"; + version = "2.3.0"; src = fetchFromGitHub { owner = "nezhahq"; repo = "nezha"; tag = "v${finalAttrs.version}"; - hash = "sha256-40GirWaa03sX5UNL0ZI8qcFqYV2ZuRniWofKluKeW+0="; + hash = "sha256-wlGDNsh67pAuPPgae56bXrtDsgwuviLxiaZ6CrOi3go="; }; proxyVendor = true; @@ -94,13 +95,14 @@ buildGoModule (finalAttrs: { GOROOT=''${GOROOT-$(go env GOROOT)} swag init --pd -d cmd/dashboard -g main.go -o cmd/dashboard/docs ''; - vendorHash = "sha256-rYzkaJqk5r31Uagn1FRFDeICUeK392o1fyP6IBk9zgk="; + vendorHash = "sha256-U2rZVluYM+XcI8e9TBXAlb9sKz4IL+FMEj1CTDcH6qM="; ldflags = [ "-s" "-X github.com/nezhahq/nezha/service/singleton.Version=${finalAttrs.version}" ]; + __darwinAllowLocalNetworking = true; # TestOptionalAuth_PATWithoutScopeIsDenied checkFlags = "-skip=^TestSplitDomainSOA$"; postInstall = '' @@ -113,6 +115,9 @@ buildGoModule (finalAttrs: { passthru = { updateScript = nix-update-script { }; + tests = { + inherit (nixosTests) nezha; + }; }; meta = { diff --git a/pkgs/by-name/nf/nfft/package.nix b/pkgs/by-name/nf/nfft/package.nix index 64e26c829f7b..941f1881df57 100644 --- a/pkgs/by-name/nf/nfft/package.nix +++ b/pkgs/by-name/nf/nfft/package.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation (finalAttrs: { env.NIX_CFLAGS_COMPILE = "-Wno-error=incompatible-pointer-types"; - enableParalleBuilding = true; + enableParallelBuilding = true; buildInputs = lib.optionals stdenv.cc.isClang [ llvmPackages.openmp ]; diff --git a/pkgs/by-name/nf/nflz/package.nix b/pkgs/by-name/nf/nflz/package.nix index 43196b9c0ff2..09f11ba1de8b 100644 --- a/pkgs/by-name/nf/nflz/package.nix +++ b/pkgs/by-name/nf/nflz/package.nix @@ -29,7 +29,7 @@ rustPlatform.buildRustPackage (finalAttrs: { belong to a set of ordered files. An example are photos from a camera. ''; homepage = "https://github.com/phip1611/nflz"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ phip1611 ]; mainProgram = "nflz"; }; diff --git a/pkgs/by-name/nf/nfpm/package.nix b/pkgs/by-name/nf/nfpm/package.nix index 65647d437442..1fab8eb455e6 100644 --- a/pkgs/by-name/nf/nfpm/package.nix +++ b/pkgs/by-name/nf/nfpm/package.nix @@ -9,16 +9,16 @@ buildGoModule (finalAttrs: { pname = "nfpm"; - version = "2.46.3"; + version = "2.47.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = "nfpm"; rev = "v${finalAttrs.version}"; - hash = "sha256-BdiBEYCO8+YDFI4jKjRBaXtR/XutgBIzJA1xERRtE0U="; + hash = "sha256-khdD5wrTP7YSqnV5qhyvIIbOtx//eE+wgDu5y7pQ+NY="; }; - vendorHash = "sha256-cDl/vdnklQJQpSrDHDrC2+K7YiBqPOY3Mv5ApOc63Cw="; + vendorHash = "sha256-BXbT/WpLsythZc3JsMIjXlB+SbWv0HBS7tPRS1/tk4w="; ldflags = [ "-s" @@ -49,7 +49,7 @@ buildGoModule (finalAttrs: { techknowlogick caarlos0 ]; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; mainProgram = "nfpm"; }; }) diff --git a/pkgs/by-name/nf/nfs-ganesha/package.nix b/pkgs/by-name/nf/nfs-ganesha/package.nix index fc3d82e0767f..d71cff7a9742 100644 --- a/pkgs/by-name/nf/nfs-ganesha/package.nix +++ b/pkgs/by-name/nf/nfs-ganesha/package.nix @@ -21,11 +21,13 @@ ceph, useDbus ? true, dbus, + rdma-core, + openssl, }: stdenv.mkDerivation (finalAttrs: { pname = "nfs-ganesha"; - version = "9.14"; + version = "11.1"; outputs = [ "out" @@ -37,7 +39,8 @@ stdenv.mkDerivation (finalAttrs: { owner = "nfs-ganesha"; repo = "nfs-ganesha"; tag = "V${finalAttrs.version}"; - hash = "sha256-aeZDXr6vUFyFhVQO31ttZ04W8KP8iKN0u17McULtQUM="; + hash = "sha256-1l1l8wkGp0N0bYXzhF6IqGm8oGVh6523Jfpq8VucHQs="; + fetchSubmodules = true; }; patches = lib.optional useDbus ./allow-bypassing-dbus-pkg-config-test.patch; @@ -54,6 +57,9 @@ stdenv.mkDerivation (finalAttrs: { "-DCMAKE_BUILD_WITH_INSTALL_RPATH=ON" "-DUSE_MAN_PAGE=ON" "-DUSE_MONITORING=ON" + "-DUSE_NFS_RDMA=ON" + "-DUSE_TLS=ON" + "-DUSE_QOS=ON" ] ++ lib.optionals useCeph [ "-DUSE_RADOS_RECOV=ON" @@ -90,6 +96,8 @@ stdenv.mkDerivation (finalAttrs: { liburcu nfs-utils prometheus-cpp-lite + rdma-core + openssl ] ++ lib.optional useCeph ceph; diff --git a/pkgs/by-name/ng/nghttp3/package.nix b/pkgs/by-name/ng/nghttp3/package.nix index 720cf47f0dd8..852ebfce6194 100644 --- a/pkgs/by-name/ng/nghttp3/package.nix +++ b/pkgs/by-name/ng/nghttp3/package.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nghttp3"; - version = "1.15.0"; + version = "1.16.0"; src = fetchurl { url = "https://github.com/ngtcp2/nghttp3/releases/download/v${finalAttrs.version}/nghttp3-${finalAttrs.version}.tar.bz2"; - hash = "sha256-xsSRpSgEgUCY5EZjDm78RZr8DT2nlS/+bL3As/mbK2I="; + hash = "sha256-IsBpidVL0mbUpx817vGS1JuJBlWfFqQfO4gssCNhdGM="; }; outputs = [ diff --git a/pkgs/by-name/ng/ngrep/package.nix b/pkgs/by-name/ng/ngrep/package.nix index f0968740595b..0ea285cab87b 100644 --- a/pkgs/by-name/ng/ngrep/package.nix +++ b/pkgs/by-name/ng/ngrep/package.nix @@ -47,12 +47,10 @@ stdenv.mkDerivation (finalAttrs: { more common packet sniffing tools, such as tcpdump and snoop. ''; homepage = "https://github.com/jpr5/ngrep/"; - license = { - shortName = "ngrep"; # BSD-style, see README.md and LICENSE - url = "https://github.com/jpr5/ngrep/blob/master/LICENSE"; - free = true; - redistributable = true; - }; + license = lib.licenses.AND [ + lib.licenses.ngrep + lib.licenses.bsd3 + ]; platforms = with lib.platforms; linux ++ darwin; maintainers = [ lib.maintainers.bjornfor ]; mainProgram = "ngrep"; diff --git a/pkgs/by-name/nh/nh-unwrapped/package.nix b/pkgs/by-name/nh/nh-unwrapped/package.nix index 16210de364d4..9248f024bf81 100644 --- a/pkgs/by-name/nh/nh-unwrapped/package.nix +++ b/pkgs/by-name/nh/nh-unwrapped/package.nix @@ -11,12 +11,12 @@ }: rustPlatform.buildRustPackage (finalAttrs: { pname = "nh-unwrapped"; - version = "4.3.2"; + version = "4.4.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nh"; tag = "v${finalAttrs.version}"; - hash = "sha256-TSXa6nL2TpOfDCsZIGCFAMbkQy2Z40gam7JrxBy5FGY="; + hash = "sha256-4B/32NPGtc07kuT/zTeIrQjxCdiLRN8tmQHahwq/R7g="; }; strictDeps = true; @@ -100,7 +100,7 @@ rustPlatform.buildRustPackage (finalAttrs: { rm $out/bin/xtask ''; - cargoHash = "sha256-ZR8vvG2mXrGg6GeyP7C0uWhPW6cp2QPYj2cOJUSyeAs="; + cargoHash = "sha256-pGtYqdAszaHpQ8eoh15S8hB6kO6iqB7O1p+fZUbwxuU="; passthru.updateScript = nix-update-script { }; diff --git a/pkgs/by-name/ni/ni/package.nix b/pkgs/by-name/ni/ni/package.nix index e885f5a3703b..aea8ee845a8e 100644 --- a/pkgs/by-name/ni/ni/package.nix +++ b/pkgs/by-name/ni/ni/package.nix @@ -15,20 +15,20 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "ni"; - version = "30.1.0"; + version = "30.3.0"; src = fetchFromGitHub { owner = "antfu-collective"; repo = "ni"; tag = "v${finalAttrs.version}"; - hash = "sha256-mBKSnnmvlZOwU+6MQrg8S8iCea2PGAsHa+A4lseLYyw="; + hash = "sha256-bcljQAlwE4VrVp+lJEf/MdHBesudgHDlXVzZygeLyqg="; }; pnpmDeps = fetchPnpmDeps { inherit (finalAttrs) pname version src; inherit pnpm; fetcherVersion = 3; - hash = "sha256-I/jf6nlsKQFrYLO15f+CWdPPdEpVDDMBQodLsbG4sqw="; + hash = "sha256-QzILjHzJKOoE7FP4tWaktVRq3b62Suu/kTP0jKQOoU8="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nickel/package.nix b/pkgs/by-name/ni/nickel/package.nix index becfec74d3fd..e0f52def68a3 100644 --- a/pkgs/by-name/ni/nickel/package.nix +++ b/pkgs/by-name/ni/nickel/package.nix @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage (finalAttrs: { ]; buildInputs = lib.optionals enableNixImport [ - nixVersions.nix_2_28 + nixVersions.nix_2_31 boost ]; @@ -70,6 +70,12 @@ rustPlatform.buildRustPackage (finalAttrs: { "--exclude=py-nickel" ]; + checkFlags = lib.optionals enableNixImport [ + # libnixmain from Nix >= 2.31 tries to create /nix/var/nix/profiles on + # initialisation, which is rejected by the build sandbox. + "--skip=stdin_format::evaluates_nix_from_stdin" + ]; + postInstall = '' mkdir -p $nls/bin mv $out/bin/nls $nls/bin/nls diff --git a/pkgs/by-name/ni/niks3/package.nix b/pkgs/by-name/ni/niks3/package.nix index c085fd2fa609..1f8479fdbbcf 100644 --- a/pkgs/by-name/ni/niks3/package.nix +++ b/pkgs/by-name/ni/niks3/package.nix @@ -8,19 +8,20 @@ buildGoModule (finalAttrs: { pname = "niks3"; - version = "1.6.1"; + version = "1.7.0"; src = fetchFromGitHub { owner = "Mic92"; repo = "niks3"; tag = "v${finalAttrs.version}"; - hash = "sha256-/JsYspjkvMXmtcHjZ9o4+rznCuI5RxruJ228TQN5slY="; + hash = "sha256-+Aj5ca1iUqbDW9MjFGoGoylnVjcMQLlT/OlH2yMrg/I="; }; - vendorHash = "sha256-dxNk5DWBMyahl36RARCu/JfrpQ6RFATKEuDLEhea5RQ="; + vendorHash = "sha256-zYGAd2N3qGavAlT4MggSME7r04kAVn19N7Nh0L0DK5k="; subPackages = [ "cmd/niks3" + "cmd/niks3-hook" "cmd/niks3-server" ]; diff --git a/pkgs/by-name/ni/nil/package.nix b/pkgs/by-name/ni/nil/package.nix index 1cb2324dae1f..1df0684af385 100644 --- a/pkgs/by-name/ni/nil/package.nix +++ b/pkgs/by-name/ni/nil/package.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nil"; - version = "2025-06-13"; + version = "2026-07-23"; src = fetchFromGitHub { owner = "oxalica"; repo = "nil"; rev = finalAttrs.version; - hash = "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c="; + hash = "sha256-upJVI2pq9sOKgF2AILt8l6O4/3GNcMtT/s0rmnbO5UA="; }; - cargoHash = "sha256-OZIajxv8xNfCGalVw/FUAwWdQzPqfGuDoeRg2E2RR7s="; + cargoHash = "sha256-ZyTrxGX0mRdskxp4o5ssDCyZzNn36rIgP9fDaA1fDws="; nativeBuildInputs = [ nix ]; diff --git a/pkgs/by-name/ni/nile/package.nix b/pkgs/by-name/ni/nile/package.nix index d7c22df3f02f..8afc79a11894 100644 --- a/pkgs/by-name/ni/nile/package.nix +++ b/pkgs/by-name/ni/nile/package.nix @@ -7,14 +7,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nile"; - version = "1.1.2"; + version = "1.2.0"; pyproject = true; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; tag = "v${finalAttrs.version}"; - hash = "sha256-/C4b8wPKWHGgiheuAN7AvU+KcD5aj5i6KzgFSdTIkNI="; + hash = "sha256-tzf3sqD7P32AXzZu/WDauOSsEe/xhCh6x4KGQ1YnJqw="; }; build-system = with python3Packages; [ setuptools ]; @@ -50,6 +50,6 @@ python3Packages.buildPythonApplication (finalAttrs: { changelog = "https://github.com/imLinguin/nile/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; mainProgram = "nile"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ theobori ]; }; }) diff --git a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch b/pkgs/by-name/ni/nim-1_0/nim.cfg.patch deleted file mode 100644 index 7195132e52f6..000000000000 --- a/pkgs/by-name/ni/nim-1_0/nim.cfg.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/config/nim.cfg b/config/nim.cfg -index 3b964d124..850ed0ed9 100644 ---- a/config/nim.cfg -+++ b/config/nim.cfg -@@ -8,26 +8,12 @@ - # Environment variables can be accessed like so: - # gcc.path %= "$CC_PATH" - --cc = gcc -- - # additional options always passed to the compiler: - --parallel_build: "0" # 0 to auto-detect number of processors - - hint[LineTooLong]=off - #hint[XDeclaredButNotUsed]=off - --# Examples of how to setup a cross-compiler: -- --# Cross-compiling for Raspberry Pi. --# (This compiler is available in gcc-arm-linux-gnueabihf package on Ubuntu) --arm.linux.gcc.exe = "arm-linux-gnueabihf-gcc" --arm.linux.gcc.linkerexe = "arm-linux-gnueabihf-gcc" -- --# For OpenWRT, you will also need to adjust PATH to point to your toolchain. --mips.linux.gcc.exe = "mips-openwrt-linux-gcc" --mips.linux.gcc.linkerexe = "mips-openwrt-linux-gcc" -- -- - path="$lib/deprecated/core" - path="$lib/deprecated/pure" - path="$lib/pure/collections" diff --git a/pkgs/by-name/ni/nim-1_0/package.nix b/pkgs/by-name/ni/nim-1_0/package.nix deleted file mode 100644 index 63df8623109e..000000000000 --- a/pkgs/by-name/ni/nim-1_0/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nim-unwrapped-1, - nim, -}: - -nim.passthru.wrapNim { - nimUnwrapped = nim-unwrapped-1; - patches = [ ./nim.cfg.patch ]; -} diff --git a/pkgs/by-name/ni/nim-2_0/package.nix b/pkgs/by-name/ni/nim-2_0/package.nix deleted file mode 100644 index 841bd71ec3e9..000000000000 --- a/pkgs/by-name/ni/nim-2_0/package.nix +++ /dev/null @@ -1,9 +0,0 @@ -{ - nim-unwrapped-2_0, - nim-2_2, -}: - -nim-2_2.passthru.wrapNim { - nimUnwrapped = nim-unwrapped-2_0; - inherit (nim-2_2) patches; -} diff --git a/pkgs/by-name/ni/nim-atlas/package.nix b/pkgs/by-name/ni/nim-atlas/package.nix index 4c8d92b3e095..bc35b46ba46d 100644 --- a/pkgs/by-name/ni/nim-atlas/package.nix +++ b/pkgs/by-name/ni/nim-atlas/package.nix @@ -23,7 +23,7 @@ buildNimPackage ( meta = final.src.meta // { description = "Nim package cloner"; mainProgram = "atlas"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; }; } ) diff --git a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch b/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch deleted file mode 100644 index dc6bcebfaba1..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-1_0/extra-mangling.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/compiler/modulepaths.nim b/compiler/modulepaths.nim -index fa8fab08a..63b0cb44d 100644 ---- a/compiler/modulepaths.nim -+++ b/compiler/modulepaths.nim -@@ -73,6 +73,17 @@ proc checkModuleName*(conf: ConfigRef; n: PNode; doLocalError=true): FileIndex = - else: - result = fileInfoIdx(conf, fullPath) - -+proc rot13(result: var string) = -+ # don't mangle .nim -+ let finalIdx = -+ if result.endsWith(".nim"): result.len - 4 -+ else: result.len -+ for i, c in result[0.. 0: -- result.add "(" -+ result.add ":" - addInt(result, line) - if col > 0: -- result.add ", " -+ result.add ":" - addInt(result, col) -- result.add ")" diff --git a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix b/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix deleted file mode 100644 index e459351c676d..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-2_0/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - fetchurl, - nim-unwrapped-1, - nim-unwrapped-2_2, -}: - -nim-unwrapped-2_2.overrideAttrs ( - finalAttrs: previousAttrs: { - version = "2.0.16"; - src = fetchurl { - url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-sucMbAEbVQcJMJCoiH+iUncyCP0EfuOPhWLiVp5cN4o="; - }; - patches = lib.lists.unique ( - builtins.filter ( - p: - builtins.elem (baseNameOf p) [ - "NIM_CONFIG_DIR.patch" - "nixbuild.patch" - "extra-mangling.patch" - "openssl.patch" - ] - ) (nim-unwrapped-1.patches ++ nim-unwrapped-2_2.patches) - ); - } -) diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch b/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch deleted file mode 100644 index cf384c95d5f6..000000000000 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/extra-mangling-2.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/compiler/modulegraphs.nim b/compiler/modulegraphs.nim -index 77762d23a..59dd8903a 100644 ---- a/compiler/modulegraphs.nim -+++ b/compiler/modulegraphs.nim -@@ -503,7 +503,11 @@ proc uniqueModuleName*(conf: ConfigRef; m: PSym): string = - for i in 0..= 1.1.0 return OPENSSL_init_ssl(0.uint64, 0.uint8) - proc TLS_method*(): PSSL_METHOD {.cdecl, dynlib: DLLSSLName, importc.} -+ proc TLS_method*(): PSSL_METHOD {.cdecl, gimportc.} ++ proc TLS_method*(): PSSL_METHOD {.cdecl, importc.} proc SSLv23_method*(): PSSL_METHOD = TLS_method() - proc OpenSSL_version_num(): culong {.cdecl, dynlib: DLLUtilName, importc.} -+ proc OpenSSL_version_num(): culong {.cdecl, gimportc.} ++ proc OpenSSL_version_num(): culong {.cdecl, importc.} proc getOpenSSLVersion*(): culong = ## Return OpenSSL version as unsigned long @@ -71,13 +71,13 @@ index e659746ee..dfb2d3cf2 100644 when defined(libressl) or defined(openssl10): - proc SSL_state(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_state(ssl: SslPtr): cint {.cdecl, gimportc.} ++ proc SSL_state(ssl: SslPtr): cint {.cdecl, importc.} proc SSL_in_init*(ssl: SslPtr): cint {.inline.} = SSL_state(ssl) and SSL_ST_INIT else: - proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, dynlib: DLLSSLName, importc.} - proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, dynlib: DLLSSLName, importc.} -+ proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, gimportc.} ++ proc SSL_in_init*(ssl: SslPtr): cint {.cdecl, importc.} + proc SSL_CTX_set_ciphersuites*(ctx: SslCtx, str: cstring): cint {.cdecl, importc.} template OpenSSL_add_all_algorithms*() = discard @@ -89,7 +89,7 @@ index e659746ee..dfb2d3cf2 100644 + proc SSLv23_client_method*(): PSSL_METHOD {.cdecl, importc.} + proc SSLv2_method*(): PSSL_METHOD {.cdecl, importc.} + proc SSLv3_method*(): PSSL_METHOD {.cdecl, importc.} -+ proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, gimportc.} ++ proc CRYPTO_set_mem_functions(a,b,c: pointer){.cdecl, importc.} else: # Here we're trying to stay compatible between openssl versions. Some diff --git a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix b/pkgs/by-name/ni/nim-unwrapped/package.nix similarity index 91% rename from pkgs/by-name/ni/nim-unwrapped-2_2/package.nix rename to pkgs/by-name/ni/nim-unwrapped/package.nix index 6a3c02fe4485..d22fa8a7e090 100644 --- a/pkgs/by-name/ni/nim-unwrapped-2_2/package.nix +++ b/pkgs/by-name/ni/nim-unwrapped/package.nix @@ -13,12 +13,12 @@ }: stdenv.mkDerivation (finalAttrs: { pname = "nim-unwrapped"; - version = "2.2.4"; + version = "2.2.10"; strictDeps = true; src = fetchurl { url = "https://nim-lang.org/download/nim-${finalAttrs.version}.tar.xz"; - hash = "sha256-+CtBl1D8zlYfP4l6BIaxgBhoRddvtdmfJIzhZhCBicc="; + hash = "sha256-eVe37QBCBrzxC8xPO0dEFTh45i8kMVUqmo6dP0Do1dU="; }; buildInputs = [ @@ -36,7 +36,7 @@ stdenv.mkDerivation (finalAttrs: { ./nixbuild.patch # Load libraries at runtime by absolute path - ./extra-mangling-2.patch + ./extra-mangling.patch # Mangle store paths of modules to prevent runtime dependence. ./openssl.patch @@ -49,6 +49,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "nim-bootstrap"; inherit (finalAttrs) version src preBuild; enableParallelBuilding = true; + buildPhase = '' + runHook preBuild + ./build.sh + runHook postBuild + ''; installPhase = '' runHook preInstall install -Dt $out/bin bin/nim @@ -67,9 +72,7 @@ stdenv.mkDerivation (finalAttrs: { "--cpu:${stdenv.hostPlatform.nim.cpu}" "--os:${stdenv.hostPlatform.nim.os}" "-d:release" - "-d:useGnuReadline" - ] - ++ lib.optional (stdenv.hostPlatform.isDarwin || stdenv.hostPlatform.isLinux) "-d:nativeStacktrace"; + ]; preBuild = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) '' substituteInPlace makefile \ diff --git a/pkgs/by-name/ni/nim-2_2/nim2.cfg.patch b/pkgs/by-name/ni/nim/nim2.cfg.patch similarity index 100% rename from pkgs/by-name/ni/nim-2_2/nim2.cfg.patch rename to pkgs/by-name/ni/nim/nim2.cfg.patch diff --git a/pkgs/by-name/ni/nim-2_2/package.nix b/pkgs/by-name/ni/nim/package.nix similarity index 94% rename from pkgs/by-name/ni/nim-2_2/package.nix rename to pkgs/by-name/ni/nim/package.nix index 350d235887b9..38e8dcc47f20 100644 --- a/pkgs/by-name/ni/nim-2_2/package.nix +++ b/pkgs/by-name/ni/nim/package.nix @@ -8,7 +8,7 @@ makeWrapper, openssl, pcre, - nim-unwrapped-2_2 ? buildPackages.nim-unwrapped-2_2, + nim-unwrapped ? buildPackages.nim-unwrapped, }: let @@ -18,7 +18,7 @@ let targetPlatformConfig = stdenv.targetPlatform.config; in stdenv.mkDerivation (finalAttrs: { - name = "${targetPlatformConfig}-nim-wrapper-${nimUnwrapped.version}"; + pname = "${targetPlatformConfig}-nim-wrapper"; inherit (nimUnwrapped) version; preferLocalBuild = true; strictDeps = true; @@ -86,7 +86,7 @@ let runHook postBuild ''; - wrapperArgs = lib.optionals (!(stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)) [ + wrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ buildPackages.gdb ]}:${placeholder "out"}/bin" # Used by nim-gdb @@ -148,6 +148,6 @@ let }); in wrapNim { - nimUnwrapped = nim-unwrapped-2_2; + nimUnwrapped = nim-unwrapped; patches = [ ./nim2.cfg.patch ]; } diff --git a/pkgs/by-name/ni/nim_lk/nil.patch b/pkgs/by-name/ni/nim_lk/nil.patch new file mode 100644 index 000000000000..3f50a480c44b --- /dev/null +++ b/pkgs/by-name/ni/nim_lk/nil.patch @@ -0,0 +1,13 @@ +diff --git a/src/nim_lk.nim b/src/nim_lk.nim +index 09ced9d..45c5ddc 100644 +--- a/src/nim_lk.nim ++++ b/src/nim_lk.nim +@@ -573,7 +573,7 @@ proc update(bom: JsonNode; bomRef: string; byName: bool): bool = + let comp = bom.getComponent(bomRef, byName) + assert not comp.isNil + var bomRef = comp{"bom-ref"}.getStr +- assert not bomRef.isNil ++ assert bomRef != "" + var suitableRefFound = false + let extRefs = comp{"externalReferences"} + for extRef in extRefs.elems: diff --git a/pkgs/by-name/ni/nim_lk/package.nix b/pkgs/by-name/ni/nim_lk/package.nix index 99e921819f17..e08ad1d06ad9 100644 --- a/pkgs/by-name/ni/nim_lk/package.nix +++ b/pkgs/by-name/ni/nim_lk/package.nix @@ -23,6 +23,10 @@ buildNimSbom (finalAttrs: { buildInputs = [ openssl ]; nativeBuildInputs = [ makeWrapper ]; + patches = [ + ./nil.patch + ]; + postFixup = '' wrapProgram $out/bin/nim_lk \ --suffix PATH : ${ diff --git a/pkgs/by-name/ni/nimdow/package.nix b/pkgs/by-name/ni/nimdow/package.nix index 4e11d9a0d11d..475a5b7061d0 100644 --- a/pkgs/by-name/ni/nimdow/package.nix +++ b/pkgs/by-name/ni/nimdow/package.nix @@ -46,7 +46,7 @@ buildNimPackage (finalAttrs: { finalAttrs.src.meta // { description = "Nim based tiling window manager"; platforms = lib.platforms.linux; - license = [ lib.licenses.gpl2 ]; + license = lib.licenses.gpl2; maintainers = [ lib.maintainers.marcusramberg ]; mainProgram = "nimdow"; }; diff --git a/pkgs/by-name/ni/nimlsp/package.nix b/pkgs/by-name/ni/nimlsp/package.nix index 1e01f33bb859..3e24052375e6 100644 --- a/pkgs/by-name/ni/nimlsp/package.nix +++ b/pkgs/by-name/ni/nimlsp/package.nix @@ -3,25 +3,17 @@ buildNimPackage, fetchFromGitHub, srcOnly, - nim-2_0, - nim-unwrapped-2_0, + nim-unwrapped, }: - -let - buildNimPackage' = buildNimPackage.override { - # Do not build with Nim-2.2.x. - nim2 = nim-2_0; - }; -in -buildNimPackage' (finalAttrs: { +buildNimPackage (finalAttrs: { pname = "nimlsp"; - version = "0.4.6"; + version = "0.4.7"; src = fetchFromGitHub { owner = "PMunch"; repo = "nimlsp"; rev = "v${finalAttrs.version}"; - hash = "sha256-MCtpCx8jMQp0VXuMowh69d1DQreU5cDftBf0lww7PUM="; + hash = "sha256-jUNW+tukZXv41HTWP2F2BdEn7nesFXVg2TffKPWfSss="; }; lockFile = ./lock.json; @@ -40,7 +32,7 @@ buildNimPackage' (finalAttrs: { nimFlags = [ "--threads:on" - "-d:explicitSourcePath=${srcOnly nim-unwrapped-2_0}" + "-d:explicitSourcePath=${srcOnly nim-unwrapped}" "-d:tempDir=/tmp" ]; diff --git a/pkgs/by-name/ni/nimmm/package.nix b/pkgs/by-name/ni/nimmm/package.nix index f1e261d043c7..13ec62b3043f 100644 --- a/pkgs/by-name/ni/nimmm/package.nix +++ b/pkgs/by-name/ni/nimmm/package.nix @@ -3,7 +3,6 @@ buildNimPackage, fetchFromGitHub, termbox, - pcre, }: buildNimPackage (finalAttrs: { diff --git a/pkgs/by-name/ni/ninjabrain-bot/package.nix b/pkgs/by-name/ni/ninjabrain-bot/package.nix new file mode 100644 index 000000000000..655bedd3eb0b --- /dev/null +++ b/pkgs/by-name/ni/ninjabrain-bot/package.nix @@ -0,0 +1,122 @@ +{ + lib, + stdenv, + fetchFromGitHub, + maven, + makeWrapper, + copyDesktopItems, + makeDesktopItem, + jre, + libxkbcommon, + libx11, + libxcb, + libxinerama, + libxt, + libxtst, + nix-update-script, +}: +let + linuxNativeLibraries = [ + libxkbcommon + libx11 + libxcb + libxinerama + libxt + libxtst + ]; +in +maven.buildMavenPackage (finalAttrs: { + pname = "ninjabrain-bot"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "Ninjabrain1"; + repo = "Ninjabrain-Bot"; + tag = finalAttrs.version; + hash = "sha256-uOUPho4UCZxeTtCU4XHJsTR6HuXAnKXd3jk/tSRd4Yc="; + }; + strictDeps = true; + __structuredAttrs = true; + + # CI=true skips upstream display-dependent tests; the rest of the suite still runs. + env.CI = "true"; + + mvnFetchExtraArgs = { + env.CI = "true"; + }; + + mvnParameters = "assembly:single"; + mvnHash = "sha256-EZqijVMLPsZJUZA6pLL1Z5HqSeXSFo82XYRIazVweYw="; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + installPhase = '' + runHook preInstall + + install -Dm444 target/ninjabrainbot-${finalAttrs.version}-jar-with-dependencies.jar $out/share/java/ninjabrain-bot.jar + + install -Dm644 src/main/resources/icon.png $out/share/icons/hicolor/640x640/apps/ninjabrain-bot.png + + # Swing text rendering varies outside full desktop environments. + makeWrapperArgs=( + --add-flags "-Dawt.useSystemAAFontSettings=on" + --add-flags "-Dswing.aatext=true" + --add-flags "-jar $out/share/java/ninjabrain-bot.jar" + ) + + ${lib.optionalString stdenv.hostPlatform.isLinux '' + makeWrapperArgs+=( + --prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath linuxNativeLibraries} + ) + ''} + + makeWrapper ${lib.getExe jre} $out/bin/ninjabrain-bot "''${makeWrapperArgs[@]}" + + runHook postInstall + ''; + + desktopItems = [ + (makeDesktopItem { + name = "ninjabrain-bot"; + desktopName = "Ninjabrain Bot"; + comment = "Stronghold calculator for Minecraft speedrunning"; + type = "Application"; + exec = "ninjabrain-bot"; + icon = "ninjabrain-bot"; + categories = [ + "Game" + "Utility" + ]; + keywords = [ + "minecraft" + "speedrun" + "stronghold" + "mcsr" + ]; + }) + ]; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Stronghold calculator for Minecraft speedrunning"; + homepage = "https://github.com/Ninjabrain1/Ninjabrain-Bot"; + changelog = "https://github.com/Ninjabrain1/Ninjabrain-Bot/releases/tag/${finalAttrs.src.tag}"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ + nyxar77 + Misaka13514 + ]; + mainProgram = "ninjabrain-bot"; + # Match platforms with bundled JNativeHook libraries and JRE support + platforms = [ + "x86_64-linux" + "aarch64-linux" + "x86_64-darwin" + "aarch64-darwin" + ]; + }; +}) diff --git a/pkgs/by-name/ni/ninjas2/package.nix b/pkgs/by-name/ni/ninjas2/package.nix index 149a6c2c02e7..eb5d27294012 100644 --- a/pkgs/by-name/ni/ninjas2/package.nix +++ b/pkgs/by-name/ni/ninjas2/package.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation (finalAttrs: { meta = { homepage = "https://github.com/clearly-broken-software/ninjas2"; description = "Sample slicer plugin for LV2, VST, and jack standalone"; - license = with lib.licenses; [ gpl3 ]; + license = lib.licenses.gpl3; maintainers = [ lib.maintainers.magnetophon ]; platforms = lib.platforms.linux; mainProgram = "ninjas2"; diff --git a/pkgs/by-name/ni/nirius/package.nix b/pkgs/by-name/ni/nirius/package.nix index cb6cfce27403..54d73db369bb 100644 --- a/pkgs/by-name/ni/nirius/package.nix +++ b/pkgs/by-name/ni/nirius/package.nix @@ -6,16 +6,16 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nirius"; - version = "0.7.1"; + version = "0.8.0"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "nirius"; rev = "nirius-${finalAttrs.version}"; - hash = "sha256-+OPJODiZs3+d3W8vnLCbza4axgIu6WBeC2j+JLN/Zgg="; + hash = "sha256-hLrGdeRDhNC7xyG0IIQN1A+O8WzqIZqIRZ04fkLfANs="; }; - cargoHash = "sha256-lxyChCuo6ZtZ6Sd50xn2KyY7JTf3KCobZnI0AsM3CUE="; + cargoHash = "sha256-3d/U5xsOPV5XzZuLNvkV4BYCfzrpFCol5p8Ras3eCn8="; meta = { description = "Utility commands for the niri wayland compositor"; diff --git a/pkgs/tools/security/nitrokey-app2/default.nix b/pkgs/by-name/ni/nitrokey-app2/package.nix similarity index 100% rename from pkgs/tools/security/nitrokey-app2/default.nix rename to pkgs/by-name/ni/nitrokey-app2/package.nix diff --git a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix index ee66ef3a3618..5bb74b7f114d 100644 --- a/pkgs/by-name/ni/nitrokey-udev-rules/package.nix +++ b/pkgs/by-name/ni/nitrokey-udev-rules/package.nix @@ -39,7 +39,7 @@ stdenvNoCC.mkDerivation (finalAttrs: { meta = { description = "udev rules for Nitrokey devices"; homepage = "https://github.com/Nitrokey/nitrokey-udev-rules"; - license = [ lib.licenses.cc0 ]; + license = lib.licenses.cc0; maintainers = with lib.maintainers; [ robinkrahl ]; diff --git a/pkgs/by-name/ni/nitter/lock.json b/pkgs/by-name/ni/nitter/lock.json index 6d33994b513b..7a5340b86800 100644 --- a/pkgs/by-name/ni/nitter/lock.json +++ b/pkgs/by-name/ni/nitter/lock.json @@ -3,36 +3,157 @@ { "method": "fetchzip", "packages": [ - "asynctools" + "jester" ], - "path": "/nix/store/ahig7j046p8mc01jgidvvvba0afccilr-source", - "rev": "pr_fix_compilation", - "sha256": "0lip4qzc49ffa9byx65n7pmsy020a589vhnly373xrfhk2zw9jmd", + "path": "/nix/store/4dxbw27sjzks7j13gdbprhskmdjylscg-source", + "ref": "v0.6.0", + "rev": "2dfac077170c62cd6ffc73e3dcfa29d29c641dcf", + "sha256": "0d35mbx1bgjfmrv8j1qph56law74wzjp3qvr2d0qj9x9d1cddz0p", "srcDir": "", - "url": "https://github.com/timotheecour/asynctools/archive/pr_fix_compilation.tar.gz" + "url": "https://github.com/dom96/jester/archive/2dfac077170c62cd6ffc73e3dcfa29d29c641dcf.tar.gz" }, { "method": "fetchzip", "packages": [ - "dotenv" + "karax" ], - "path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source", - "ref": "2.0.2", - "rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1", - "sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc", + "path": "/nix/store/7wwwlplx2r1pra2yci8ld4kg6s4ckyhm-source", + "ref": "1.5.0", + "rev": "a1eaaa87af756c21db4524c38cad4a004218f740", + "sha256": "1xy3cq1z93x8hpf8c5xarg53vhhscgs4d7aq5x2j3c7hnlcr7kak", + "srcDir": "", + "url": "https://github.com/karaxnim/karax/archive/a1eaaa87af756c21db4524c38cad4a004218f740.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "sass" + ], + "path": "/nix/store/d2yidyfsqd850ijxkf3yisp0x61a0crw-source", + "ref": "v0.2.0", + "rev": "70af832b6eb37b148b0dbbc51085a73163c20041", + "sha256": "1xkjygniwpbpqzy2w5w9773jv40dklpwhcc003hbf2rn2ghpvgqw", "srcDir": "src", - "url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz" + "url": "https://github.com/dom96/sass/archive/70af832b6eb37b148b0dbbc51085a73163c20041.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "nimcrypto" + ], + "path": "/nix/store/f2xp1v0vnplwfjnk8nqsi7gd9pnb9gcv-source", + "ref": "v0.7.3^{}", + "rev": "b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08", + "sha256": "1v4rz42lwcazs6isi3kmjylkisr84mh0kgmlqycx4i885dn3g0l4", + "srcDir": "", + "url": "https://github.com/cheatfate/nimcrypto/archive/b3dbc9c4d08e58c5b7bfad6dc7ef2ee52f2f4c08.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "markdown" + ], + "path": "/nix/store/3ha9jx6zafxb338r5xi1bydxnjsjppl5-source", + "ref": "v0.8.8", + "rev": "5a7a7bafd1da23b25332316a7b888e6586f4177a", + "sha256": "10b3jmq9dhyfkj3r0jwk9zigrn048jb7xwh7vkbqar5wgfgmqljr", + "srcDir": "src", + "url": "https://github.com/soasme/nim-markdown/archive/5a7a7bafd1da23b25332316a7b888e6586f4177a.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "packedjson" + ], + "path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source", + "rev": "9e6fbb6", + "sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j", + "srcDir": "", + "url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "supersnappy" + ], + "path": "/nix/store/v2i65kqvcgcqmlqllx8gb9ipmaqvwisr-source", + "ref": "2.1.4", + "rev": "4fed6553d539cbbfb17ab5fea16a58b4f1916e7d", + "sha256": "1a55c0v2zy4hgzckaj1bb1q9a5vgxrclrr7zqgbrlg78c7il5inf", + "srcDir": "src", + "url": "https://github.com/guzba/supersnappy/archive/4fed6553d539cbbfb17ab5fea16a58b4f1916e7d.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "redpool" + ], + "path": "/nix/store/gwh94rsq3viiy85rzk00xiyfg671ig5d-source", + "ref": "v0.2.2", + "rev": "fc7869f83d168e6ca1413fe97873140fd5805183", + "sha256": "1nvcicdkxpixmzx68bf8f7abjz3n3p5rs3lzf0qh4ggr1y4w7sfm", + "srcDir": "src", + "url": "https://github.com/zedeus/redpool/archive/fc7869f83d168e6ca1413fe97873140fd5805183.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "redis" + ], + "path": "/nix/store/d2ccdhm958z9rzampbi2din88753sbia-source", + "ref": "v0.4.1", + "rev": "a533ab242510e893f75cd8a7c9fac24a6243ec3d", + "sha256": "1d0aqfzbsl164lhh3fgk8kzmzz6sg96szzlhgqdaazmyzhg7mhz7", + "srcDir": "src", + "url": "https://github.com/zedeus/redis/archive/a533ab242510e893f75cd8a7c9fac24a6243ec3d.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "zippy" + ], + "path": "/nix/store/y7jw44rcmvhwbwd02qh6d6mnrg4xk00v-source", + "ref": "0.10.19", + "rev": "bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f", + "sha256": "0vk10ap93jqrmzxjjnwm1w45x7fvbihxjqc92nb1ic2y9x33i5v3", + "srcDir": "src", + "url": "https://github.com/guzba/zippy/archive/bcb8c1e1be6abb0a0e35a3c6040cdd9391cc993f.tar.gz" }, { "method": "fetchzip", "packages": [ "flatty" ], - "path": "/nix/store/21380smf8kyxzc4zf0qjsjx0dp5lv5rj-source", - "rev": "e668085", - "sha256": "0886lk20rg1pq56jsz1jjd8vrdz46lgdaxvp97az06mcawhbabbz", + "path": "/nix/store/8lxcz0fmm6myip77ka4sn3fms3m502gd-source", + "ref": "0.4.0", + "rev": "c7091b096bcf275f47b666ef74bce73eda187ee3", + "sha256": "1j56hhf4g5b2sm6190lxlr0qih0mdszk0d39ii79hpyzk787a6dy", "srcDir": "src", - "url": "https://github.com/treeform/flatty/archive/e668085.tar.gz" + "url": "https://github.com/treeform/flatty/archive/c7091b096bcf275f47b666ef74bce73eda187ee3.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "jsony" + ], + "path": "/nix/store/p34ky5dizbgjilm7g4yfqggz45pdgf2n-source", + "ref": "1.1.6", + "rev": "bb647e1ca21af25ffdc423bcb96feeeeae963ca2", + "sha256": "0f7mp9hf673y14dj84ysdw5xbciqkwx0mn9c12zn105mcmn1f8mm", + "srcDir": "src", + "url": "https://github.com/treeform/jsony/archive/bb647e1ca21af25ffdc423bcb96feeeeae963ca2.tar.gz" + }, + { + "method": "fetchzip", + "packages": [ + "oauth" + ], + "path": "/nix/store/bqfq4db6nwycmkdrql9igsbrayqsw3g2-source", + "ref": "v0.11", + "rev": "ec2e058fc46f04deaf3cb55eca32b3b83c614953", + "sha256": "1wv8v4xid64z0wbb814n31gf3c6dzlqr3b83b5ls0kqby73krlsm", + "srcDir": "src", + "url": "https://github.com/CORDEA/oauth/archive/ec2e058fc46f04deaf3cb55eca32b3b83c614953.tar.gz" }, { "method": "fetchzip", @@ -49,123 +170,26 @@ { "method": "fetchzip", "packages": [ - "jester" + "ws" ], - "path": "/nix/store/jz86cks97is931hwsq5wf35kjwfypp6x-source", - "rev": "baca3f", - "sha256": "0i8rxsbp5yd9dasis650vqppika43mzfsls4fc7cz8k5j8xpd6zc", - "srcDir": "", - "url": "https://github.com/dom96/jester/archive/baca3f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "jsony" - ], - "path": "/nix/store/l84av0wdc0s4r4alsvkaxcxhpd6j4bzg-source", - "rev": "1de1f08", - "sha256": "0rj205cs3v6g80h8ys9flbdq4wyd1csmkwdxv0lz21972zcsrcfh", + "path": "/nix/store/h214k8m5qdw6ajh45f2wjzld856qcvc6-source", + "ref": "0.6.0", + "rev": "c9c0c7b51e2e83cc9305a895a0b144a297b4bea8", + "sha256": "0x1jahhx0wcfay79v0xqddyadf5ckcilhv25cq1g6rarshcg1zvd", "srcDir": "src", - "url": "https://github.com/treeform/jsony/archive/1de1f08.tar.gz" + "url": "https://github.com/treeform/ws/archive/c9c0c7b51e2e83cc9305a895a0b144a297b4bea8.tar.gz" }, { "method": "fetchzip", "packages": [ - "karax" + "dotenv" ], - "path": "/nix/store/5vghbi3cfpf7zvbkn0mk9chrf0rsx4yf-source", - "rev": "5cf360c", - "sha256": "1fh0jcjlw0vfqmr5dmhk436g569qvcpml9f981x28wmvm1511z2c", - "srcDir": "", - "url": "https://github.com/karaxnim/karax/archive/5cf360c.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "markdown" - ], - "path": "/nix/store/6jpq2dp02mhjl8pkxzs0a1sjvgyg5h1r-source", - "rev": "158efe3", - "sha256": "1701q0i8yd9rrjraf5fzgcvilwnwgw3wyzzfwpr2drmn3x9pd8fj", + "path": "/nix/store/jkf2p6sp0506crd1awpq2x98m527v4mb-source", + "ref": "2.0.2", + "rev": "19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1", + "sha256": "0dk0ixgpxmaz2kf12a3fvzdaknn38qnwgdhp7yag0m5fbhhz2kjc", "srcDir": "src", - "url": "https://github.com/soasme/nim-markdown/archive/158efe3.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "nimcrypto" - ], - "path": "/nix/store/zyr8zwh7vaiycn1s4r8cxwc71f2k5l0h-source", - "rev": "a079df9", - "sha256": "1dmdmgb6b9m5f8dyxk781nnd61dsk3hdxqks7idk9ncnpj9fng65", - "srcDir": "", - "url": "https://github.com/cheatfate/nimcrypto/archive/a079df9.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "oauth" - ], - "path": "/nix/store/bwmrrzs6xpwizmww35461x3lqpgd0942-source", - "rev": "b8c163b", - "sha256": "0k5slyzjngbdr6g0b0dykhqmaf8r8n2klbkg2gpid4ckm8hg62v5", - "srcDir": "src", - "url": "https://github.com/CORDEA/oauth/archive/b8c163b.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "packedjson" - ], - "path": "/nix/store/c6wn9azj0kyvl818a40hzqzis0im8gnb-source", - "rev": "9e6fbb6", - "sha256": "09yxshkfpacgl6x8f77snjcwz37r519vh7rrnqrnh5npvgk3h24j", - "srcDir": "", - "url": "https://github.com/Araq/packedjson/archive/9e6fbb6.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redis" - ], - "path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source", - "rev": "d0a0e6f", - "sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f", - "srcDir": "src", - "url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redis" - ], - "path": "/nix/store/x6l3kz5950fb3d0pr5hmldh0xqkqrl62-source", - "rev": "d0a0e6f", - "sha256": "166kzflb3wgwvqnv9flyynp8b35xby617lxmk0yas8i4m6vjl00f", - "srcDir": "src", - "url": "https://github.com/zedeus/redis/archive/d0a0e6f.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "redpool" - ], - "path": "/nix/store/pkwc61k47vzvxfdhsckbyx52rrbav0gz-source", - "rev": "8b7c1db", - "sha256": "10xh5fhwnahnq1nf6j69vvnbi55kixa0ari630gr6cdx80arvbs6", - "srcDir": "src", - "url": "https://github.com/zedeus/redpool/archive/8b7c1db.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "sass" - ], - "path": "/nix/store/2nk90ab1k14px5zi8jwa30x8b8sfnbnm-source", - "rev": "7dfdd03", - "sha256": "19d78787k97l5cis81800hxa9qjr0yzjshlzdp727gh6pn8kc8fj", - "srcDir": "src", - "url": "https://github.com/dom96/sass/archive/7dfdd03.tar.gz" + "url": "https://github.com/euantorano/dotenv.nim/archive/19bb965ef04f57128f4f4ea2e690ff9f7d6a81b1.tar.gz" }, { "method": "fetchzip", @@ -182,36 +206,13 @@ { "method": "fetchzip", "packages": [ - "supersnappy" + "asynctools" ], - "path": "/nix/store/kibhdjpd3mvn9adsp67amj35a7zrnk6y-source", - "rev": "6c94198", - "sha256": "0gxy7ijm4d2i4dkb64wwq51gns0i2d3d3rrd9cra7fyiahaph4xi", - "srcDir": "src", - "url": "https://github.com/guzba/supersnappy/archive/6c94198.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "ws" - ], - "path": "/nix/store/zd51j4dphs6h1hyhdbzdv840c8813ai8-source", - "ref": "0.5.0", - "rev": "9536bf99ddf5948db221ccb7bb3663aa238a8e21", - "sha256": "0j8z9jlvzb1h60v7rryvh2wx6vg99lra6i62whf3fknc53l641fz", - "srcDir": "src", - "url": "https://github.com/treeform/ws/archive/9536bf99ddf5948db221ccb7bb3663aa238a8e21.tar.gz" - }, - { - "method": "fetchzip", - "packages": [ - "zippy" - ], - "path": "/nix/store/lhkc989wrk27wwglrxs0ahhxp2c650y5-source", - "rev": "ca5989a", - "sha256": "0rk31ispck48ilvzs0lxpp7z6y238a7d7dh7lmlfwi5i7hx13la6", - "srcDir": "src", - "url": "https://github.com/guzba/zippy/archive/ca5989a.tar.gz" + "path": "/nix/store/qdiiihi53gmbwbj06qa16p8qpks9lvw7-source", + "rev": "0e6bdc3ed5bae8c7cc9", + "sha256": "111dzyvqlg1r1jngcz3d9px8kfbxpcdi8phs26bxkmbxzjkwrmmv", + "srcDir": "", + "url": "https://github.com/cheatfate/asynctools/archive/0e6bdc3ed5bae8c7cc9.tar.gz" } ] } diff --git a/pkgs/by-name/ni/nitter/package.nix b/pkgs/by-name/ni/nitter/package.nix index 91fb44d61a3e..07f8a4888d06 100644 --- a/pkgs/by-name/ni/nitter/package.nix +++ b/pkgs/by-name/ni/nitter/package.nix @@ -10,13 +10,13 @@ buildNimPackage ( finalAttrs: prevAttrs: { pname = "nitter"; - version = "0-unstable-2026-01-29"; + version = "0-unstable-2026-06-16"; src = fetchFromGitHub { owner = "zedeus"; repo = "nitter"; - rev = "a45227b8835719dfb443600052d69374db8b515c"; - hash = "sha256-e6u+CBdOoxLnxC4L1vE7XFr7YlXQ379Ow+khohSXNpg="; + rev = "35882ed88d422b1355b66a1ff8c1144bffdc7bdf"; + hash = "sha256-U3FDhTZIcTDNKbSjrb0F9+Y5Q6GHLmGnmwXoZ5XfATc="; }; lockFile = ./lock.json; diff --git a/pkgs/by-name/ni/nix-auth/package.nix b/pkgs/by-name/ni/nix-auth/package.nix new file mode 100644 index 000000000000..2b75b21afbf5 --- /dev/null +++ b/pkgs/by-name/ni/nix-auth/package.nix @@ -0,0 +1,44 @@ +{ + lib, + buildGoModule, + fetchFromGitHub, + versionCheckHook, + nix-update-script, +}: + +buildGoModule (finalAttrs: { + pname = "nix-auth"; + version = "0.1.0"; + __structuredAttrs = true; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "nix-auth"; + tag = "v${finalAttrs.version}"; + hash = "sha256-epsg+elWnZoPjFV/hc113j+JGuxL/ggcEmJJv+Niajo="; + }; + + vendorHash = "sha256-5X+GG5h9rZTLhDvL6m9LrU5WGT5Ev+aXZ+5ffksBIM8="; + + ldflags = [ + "-s" + "-w" + "-X=github.com/numtide/nix-auth/internal/version.Version=${finalAttrs.version}" + ]; + + __darwinAllowLocalNetworking = true; + + doInstallCheck = true; + nativeInstallCheckInputs = [ versionCheckHook ]; + versionCheckProgramArg = "version"; + + passthru.updateScript = nix-update-script { }; + + meta = { + description = "Nix access-token management tool"; + homepage = "https://github.com/numtide/nix-auth"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ Br1ght0ne ]; + mainProgram = "nix-auth"; + }; +}) diff --git a/pkgs/by-name/ni/nix-fast-build/package.nix b/pkgs/by-name/ni/nix-fast-build/package.nix index 18d123687326..3b9efeba41d8 100644 --- a/pkgs/by-name/ni/nix-fast-build/package.nix +++ b/pkgs/by-name/ni/nix-fast-build/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nix-fast-build"; - version = "1.5.0"; + version = "1.6.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-fast-build"; tag = finalAttrs.version; - hash = "sha256-8csvAFJtFzA/9hX3C784sMlaQME40LQmWI2V+YzCNhc="; + hash = "sha256-PMBbenLBvn/0pSFOhwPVn171Vw7kU5YmBUNDhxllZ7c="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ni/nix-index-unwrapped/package.nix b/pkgs/by-name/ni/nix-index-unwrapped/package.nix index 060f79e0ff17..347e5703ba98 100644 --- a/pkgs/by-name/ni/nix-index-unwrapped/package.nix +++ b/pkgs/by-name/ni/nix-index-unwrapped/package.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nix-index"; - version = "0.1.10"; + version = "0.1.11"; __structuredAttrs = true; @@ -19,10 +19,10 @@ rustPlatform.buildRustPackage (finalAttrs: { owner = "nix-community"; repo = "nix-index"; tag = "v${finalAttrs.version}"; - hash = "sha256-IBVI/4hwq84/vZx7Kr/Ci/P/CzPTsn1/oiCIF2vPHXg="; + hash = "sha256-yl/acohrgP0C5w4eozNcWcpCGhmMMjFbzgHsKwXKw00="; }; - cargoHash = "sha256-9xzC5PE2nyEtbhWGagCX2yZ0/tfo2v3fatnNU+GdVH8="; + cargoHash = "sha256-EJbNptLskphe+xfI8oQ0DVUx6y4dO52eeuPiG6FSQbI="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "Files database for nixpkgs"; homepage = "https://github.com/nix-community/nix-index"; changelog = "https://github.com/nix-community/nix-index/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = with lib.licenses; [ bsd3 ]; + license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ bennofs ncfavier diff --git a/pkgs/by-name/ni/nix-inspect/package.nix b/pkgs/by-name/ni/nix-inspect/package.nix index 838cdda8bec7..f1563fca7d59 100644 --- a/pkgs/by-name/ni/nix-inspect/package.nix +++ b/pkgs/by-name/ni/nix-inspect/package.nix @@ -12,7 +12,7 @@ fetchpatch2, }: let - nixComponents = nixVersions.nixComponents_2_30; + nixComponents = nixVersions.nixComponents_2_31; src = fetchFromGitHub { owner = "bluskript"; repo = "nix-inspect"; diff --git a/pkgs/by-name/ni/nix-playground/package.nix b/pkgs/by-name/ni/nix-playground/package.nix index b816714ee882..8beb4f1a4438 100644 --- a/pkgs/by-name/ni/nix-playground/package.nix +++ b/pkgs/by-name/ni/nix-playground/package.nix @@ -47,7 +47,7 @@ python3.pkgs.buildPythonApplication (finalAttrs: { mainProgram = "np"; homepage = "https://github.com/LaunchPlatform/nix-playground"; changelog = "https://github.com/LaunchPlatform/nix-playground/releases/tag/${finalAttrs.src.tag}"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ fangpen ]; }; }) diff --git a/pkgs/by-name/ni/nix-plugins/package.nix b/pkgs/by-name/ni/nix-plugins/package.nix index c889a9cbd29b..adf934991061 100644 --- a/pkgs/by-name/ni/nix-plugins/package.nix +++ b/pkgs/by-name/ni/nix-plugins/package.nix @@ -3,7 +3,7 @@ stdenv, fetchFromGitHub, nixVersions, - nixComponents ? nixVersions.nixComponents_2_30, + nixComponents ? nixVersions.nixComponents_2_31, cmake, pkg-config, boost, diff --git a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix index dfb27ae232a6..f0f85837d794 100644 --- a/pkgs/by-name/ni/nix-query-tree-viewer/package.nix +++ b/pkgs/by-name/ni/nix-query-tree-viewer/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "GTK viewer for the output of `nix store --query --tree`"; mainProgram = "nix-query-tree-viewer"; homepage = "https://github.com/cdepillabout/nix-query-tree-viewer"; - license = with lib.licenses; [ mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ cdepillabout ]; platforms = lib.platforms.unix; }; diff --git a/pkgs/by-name/ni/nix-scheduler-hook/package.nix b/pkgs/by-name/ni/nix-scheduler-hook/package.nix index 8b4f065cbb98..8cb88e08183a 100644 --- a/pkgs/by-name/ni/nix-scheduler-hook/package.nix +++ b/pkgs/by-name/ni/nix-scheduler-hook/package.nix @@ -34,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "nix-scheduler-hook"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromCodeberg { owner = "lisanna"; repo = "nix-scheduler-hook"; tag = "v${version}"; - hash = "sha256-r8ybbPxQK+ohsaz4+brrsivj77fCqrrHPskfyrp6R2A="; + hash = "sha256-QMenfkNvn6bBGdu+d6i533/CkHNS7Tmr40cgl/ks5dk="; }; sourceRoot = "source/src"; diff --git a/pkgs/by-name/ni/nix-search-tv/package.nix b/pkgs/by-name/ni/nix-search-tv/package.nix index 4535ad698c38..e6e647eed359 100644 --- a/pkgs/by-name/ni/nix-search-tv/package.nix +++ b/pkgs/by-name/ni/nix-search-tv/package.nix @@ -7,13 +7,14 @@ buildGoModule (finalAttrs: { pname = "nix-search-tv"; - version = "2.2.7"; + version = "2.2.8"; + __structuredAttrs = true; src = fetchFromGitHub { owner = "3timeslazy"; repo = "nix-search-tv"; tag = "v${finalAttrs.version}"; - hash = "sha256-vWKMGj2fBUbsAvwoYjgT+L4hH0A96u4rDOaT0wnj7iw="; + hash = "sha256-TbNpfJOL0IM+ElXYXherSeUT+qswxH8eY/tvCZyKAZg="; }; vendorHash = "sha256-SSKDo4A8Nhvylghrw6d7CdHpZ7jObEr5V3r0Y9cH80Y="; @@ -33,7 +34,7 @@ buildGoModule (finalAttrs: { meta = { description = "Fuzzy search for Nix packages"; homepage = "https://github.com/3timeslazy/nix-search-tv"; - changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/v${finalAttrs.version}"; + changelog = "https://github.com/3timeslazy/nix-search-tv/releases/tag/${finalAttrs.src.tag}"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ GaetanLepage ]; mainProgram = "nix-search-tv"; diff --git a/pkgs/by-name/ni/nix-unit/package.nix b/pkgs/by-name/ni/nix-unit/package.nix index 0007f3ff469e..1b9afcebbb79 100644 --- a/pkgs/by-name/ni/nix-unit/package.nix +++ b/pkgs/by-name/ni/nix-unit/package.nix @@ -17,17 +17,17 @@ let # We pin the nix version to a known working one here as upgrades can likely break the build. # Since the nix language is rather stable we don't always need to have the latest and greatest for unit tests # On each update of nix unit we should re-evaluate what version we need. - nixComponents = nixVersions.nixComponents_2_34; + nixComponents = nixVersions.nixComponents_2_35; in stdenv.mkDerivation (finalAttrs: { pname = "nix-unit"; - version = "2.34.0"; + version = "2.35.1"; src = fetchFromGitHub { owner = "nix-community"; repo = "nix-unit"; rev = "v${finalAttrs.version}"; - hash = "sha256-vZfRXBDC9FTO2Vpz8TroVMqOYqp+hcVk6Nwx6+kRN1Q="; + hash = "sha256-jZ6YOb5L7FShPUcq63qDKT3W83mVzAaM2y1V4CLcdq8="; }; buildInputs = [ diff --git a/pkgs/by-name/ni/nix-update/package.nix b/pkgs/by-name/ni/nix-update/package.nix index 7e054548f497..57ea5587e53a 100644 --- a/pkgs/by-name/ni/nix-update/package.nix +++ b/pkgs/by-name/ni/nix-update/package.nix @@ -11,14 +11,14 @@ python3Packages.buildPythonApplication (finalAttrs: { pname = "nix-update"; - version = "1.15.1"; + version = "1.16.0"; pyproject = true; src = fetchFromGitHub { owner = "Mic92"; repo = "nix-update"; tag = "v${finalAttrs.version}"; - hash = "sha256-z7xXzpwsXY1x/xKeM7l2mN8dHFTp8qfgs/5xVsKjHr8="; + hash = "sha256-LT66e5NtAJRp0E8QXKeePdTCNpH+CMvJNF1ayzBr4rw="; }; build-system = [ python3Packages.setuptools ]; diff --git a/pkgs/by-name/ni/nix-visualize/package.nix b/pkgs/by-name/ni/nix-visualize/package.nix index c031036333ca..c81babd85732 100644 --- a/pkgs/by-name/ni/nix-visualize/package.nix +++ b/pkgs/by-name/ni/nix-visualize/package.nix @@ -39,7 +39,7 @@ python3Packages.buildPythonApplication { description = "Generate dependency graphs of a given nix package"; mainProgram = "nix-visualize"; homepage = "https://github.com/craigmbooth/nix-visualize"; - license = with lib.licenses; [ asl20 ]; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ henrirosten ]; }; } diff --git a/pkgs/by-name/ni/nix-your-shell/package.nix b/pkgs/by-name/ni/nix-your-shell/package.nix index da3cc7c51d86..3dedca30b6e2 100644 --- a/pkgs/by-name/ni/nix-your-shell/package.nix +++ b/pkgs/by-name/ni/nix-your-shell/package.nix @@ -33,7 +33,7 @@ rustPlatform.buildRustPackage (finalAttrs: { description = "`nix` and `nix-shell` wrapper for shells other than `bash`"; homepage = "https://github.com/MercuryTechnologies/nix-your-shell"; changelog = "https://github.com/MercuryTechnologies/nix-your-shell/releases/tag/v${finalAttrs.version}"; - license = [ lib.licenses.mit ]; + license = lib.licenses.mit; maintainers = with lib.maintainers; [ _9999years ]; }; }) diff --git a/pkgs/by-name/ni/nixbang/package.nix b/pkgs/by-name/ni/nixbang/package.nix deleted file mode 100644 index c9523899a724..000000000000 --- a/pkgs/by-name/ni/nixbang/package.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ - lib, - python3Packages, - fetchFromGitHub, -}: - -python3Packages.buildPythonApplication rec { - pname = "nixbang"; - version = "0.1.2"; - format = "setuptools"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "madjar"; - repo = "nixbang"; - rev = version; - sha256 = "1kzk53ry60i814wa6n9y2ni0bcxhbi9p8gdv10b974gf23mhi8vc"; - }; - - meta = { - homepage = "https://github.com/madjar/nixbang"; - description = "Special shebang to run scripts in a nix-shell"; - mainProgram = "nixbang"; - maintainers = [ lib.maintainers.madjar ]; - platforms = lib.platforms.all; - }; -} diff --git a/pkgs/by-name/ni/nixbit/package.nix b/pkgs/by-name/ni/nixbit/package.nix index d3a8517f7c2b..b2fdf1f561c9 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.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "pbek"; repo = "nixbit"; tag = "v${finalAttrs.version}"; - hash = "sha256-7SM6GvNqg7vdoYjE7bpWrIQwyBrpOaez8IQeDDGw/qA="; + hash = "sha256-ft+R5+j2QXo9rYMDGMKGXbA7aBRTLnRCuDh8vFswKSI="; }; nativeBuildInputs = [ diff --git a/pkgs/by-name/ni/nixdoc/package.nix b/pkgs/by-name/ni/nixdoc/package.nix index 3d6c90120f14..081c924166da 100644 --- a/pkgs/by-name/ni/nixdoc/package.nix +++ b/pkgs/by-name/ni/nixdoc/package.nix @@ -6,22 +6,22 @@ rustPlatform.buildRustPackage (finalAttrs: { pname = "nixdoc"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "nix-community"; repo = "nixdoc"; tag = "v${finalAttrs.version}"; - hash = "sha256-7UOjmW8Ef4mEvj7SINaKWh2ZuyNMVEXB82mtuZTQiPA="; + hash = "sha256-FW8yZLO+hVDn2vs4pEUfjMM/5P508WKCLxd4AozLElk="; }; - cargoHash = "sha256-Aw794yhIET8/pnlQiK2xKVbYC/Kd5MExvFTwkv4LLTc="; + cargoHash = "sha256-pV/KEg3/UaT7bbgtRgjZZGq+RVyN1xY28YqzfslYoQo="; meta = { description = "Generate documentation for Nix functions"; mainProgram = "nixdoc"; homepage = "https://github.com/nix-community/nixdoc"; - license = [ lib.licenses.gpl3 ]; + license = lib.licenses.gpl3; maintainers = with lib.maintainers; [ infinisil hsjobeki diff --git a/pkgs/by-name/ni/nixfmt-tree/package.nix b/pkgs/by-name/ni/nixfmt-tree/package.nix index 2d5c3a7f1422..fd6a2de90225 100644 --- a/pkgs/by-name/ni/nixfmt-tree/package.nix +++ b/pkgs/by-name/ni/nixfmt-tree/package.nix @@ -54,7 +54,7 @@ let '' allRuntimeInputs; }; in -treefmtWithConfig.overrideAttrs { +treefmtWithConfig.overrideAttrs (prevAttrs: { meta = { mainProgram = "treefmt"; description = "Official Nix formatter zero-setup starter using treefmt"; @@ -118,63 +118,65 @@ treefmtWithConfig.overrideAttrs { platforms = lib.platforms.all; }; - passthru.tests.simple = - runCommand "nixfmt-tree-test-simple" - { - nativeBuildInputs = [ - git - nixfmt-tree - writableTmpDirAsHomeHook - ]; - } - '' - git config --global user.email "nix-builder@nixos.org" - git config --global user.name "Nix Builder" + passthru = prevAttrs.passthru // { + tests.simple = + runCommand "nixfmt-tree-test-simple" + { + nativeBuildInputs = [ + git + nixfmt-tree + writableTmpDirAsHomeHook + ]; + } + '' + git config --global user.email "nix-builder@nixos.org" + git config --global user.name "Nix Builder" - cat > unformatted.nix < unformatted.nix < formatted.nix < formatted.nix < Result<()> { - let toplevel = find_toplevel_in_prefix(SYSROOT_PATH)?; + let init_in_sysroot = + find_init_in_prefix(SYSROOT_PATH).context("Failed to find init in sysroot")?; + + // A non-NixOS init= (e.g. init=/bin/sh) has no etc metadata image. Skip + // without creating the symlinks: the etc-overlay mounts are gated on them + // and so skip too, and initrd-init switches root to the init directly. + let Ok(toplevel) = verify_init_is_nixos(SYSROOT_PATH, &init_in_sysroot) else { + log::info!( + "{} is not a NixOS system - not setting up the etc overlay.", + init_in_sysroot.display() + ); + return Ok(()); + }; + let config = Config::from_toplevel(&toplevel, SYSROOT_PATH)?; let basedir = config diff --git a/pkgs/by-name/ni/nixos-init/src/lib.rs b/pkgs/by-name/ni/nixos-init/src/lib.rs index c781757c9b82..bbb4abdb829b 100644 --- a/pkgs/by-name/ni/nixos-init/src/lib.rs +++ b/pkgs/by-name/ni/nixos-init/src/lib.rs @@ -27,16 +27,6 @@ pub use crate::{ pub const SYSROOT_PATH: &str = "/sysroot"; -/// Find the path to the toplevel closure of the system in a prefix. -/// -/// Uses the `init=` parameter on the kernel command-line. -/// -/// Returns the relative path of the init to the prefix, e.g. without the `/sysroot` prefix. -pub fn find_toplevel_in_prefix(prefix: &str) -> Result { - let init_in_sysroot = find_init_in_prefix(prefix)?; - verify_init_is_nixos(prefix, init_in_sysroot) -} - /// Verify that an init path is inside a `NixOS` toplevel directory. /// /// If the path is verified, returns the path to the toplevel. @@ -87,20 +77,16 @@ pub fn find_init_in_prefix(prefix: &str) -> Result { } /// Extract the value of the `init` parameter from the given kernel `cmdline`. +/// +/// If `init=` appears multiple times the last one wins, matching the kernel. +/// This is what makes appending `init=/bin/sh` at the boot prompt work even +/// though the boot entry already has an `init=`. fn extract_init(cmdline: &str) -> Result { - let init_params: Vec<&str> = cmdline + let init = cmdline .split_ascii_whitespace() - .filter(|p| p.starts_with("init=")) - .collect(); - - if init_params.len() != 1 { - bail!("Expected exactly one init param on kernel cmdline: {cmdline}") - } - - let init = init_params - .first() - .and_then(|s| s.split('=').next_back()) - .context("Failed to extract init path from kernel cmdline: {cmdline}")?; + .filter_map(|p| p.strip_prefix("init=")) + .next_back() + .with_context(|| format!("No init= parameter on kernel cmdline: {cmdline}"))?; Ok(PathBuf::from(init)) } @@ -129,4 +115,25 @@ mod tests { Ok(()) } + + #[test] + fn test_extract_init_single() { + assert_eq!( + extract_init("root=fstab init=/nix/store/xxx-nixos/init quiet").unwrap(), + PathBuf::from("/nix/store/xxx-nixos/init") + ); + } + + #[test] + fn test_extract_init_last_wins() { + assert_eq!( + extract_init("init=/nix/store/xxx-nixos/init init=/bin/sh").unwrap(), + PathBuf::from("/bin/sh") + ); + } + + #[test] + fn test_extract_init_missing() { + assert!(extract_init("root=fstab quiet").is_err()); + } } diff --git a/pkgs/by-name/ni/nixos-option/package.nix b/pkgs/by-name/ni/nixos-option/package.nix index cd936c7380a6..fce09f3ff798 100644 --- a/pkgs/by-name/ni/nixos-option/package.nix +++ b/pkgs/by-name/ni/nixos-option/package.nix @@ -13,7 +13,8 @@ }: stdenvNoCC.mkDerivation { - name = "nixos-option"; + pname = "nixos-option"; + version = lib.trivial.release; src = ./nixos-option.sh; diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd index 218eaa8d395f..305c39a2c2ac 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd +++ b/pkgs/by-name/ni/nixos-rebuild-ng/nixos-rebuild.8.scd @@ -379,6 +379,11 @@ NIX_PATH NIX_SSHOPTS Additional options to be passed to ssh on the command line. +NIXOS_REBUILD_SSH_DEFAULT_OPTS + Replaces the built-in default ssh options (connection sharing via a + private _ControlMaster_ that is closed on exit). If empty, no + default options are added. + NIX_SUDOOPTS Additional options to be passed to sudo on the command line. diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py index db0fe7a4ec5c..230e51c56e44 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/__init__.py @@ -240,7 +240,7 @@ def parse_args( } ) - if args.help or args.action is None: + if args.help: if WITH_SHELL_FILES: r = run(["man", "8", EXECUTABLE], check=False) parser.exit(r.returncode) @@ -248,6 +248,11 @@ def parse_args( parser.print_help() parser.exit() + if args.action is None: + parser.error( + f"No valid subcommands. Type {parser.prog} --help for more information" + ) + def parser_warn(msg: str) -> None: print(f"{parser.prog}: warning: {msg}", file=sys.stderr) 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 4fbe7fbe2b9d..5a4be4d1a557 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 @@ -26,7 +26,7 @@ from .models import ( Profile, Remote, ) -from .process import SSH_DEFAULT_OPTS, run_wrapper +from .process import run_wrapper, ssh_default_opts from .utils import Args, dict_to_flags FLAKE_FLAGS: Final = ["--extra-experimental-features", "nix-command flakes"] @@ -193,7 +193,7 @@ def copy_closure( Also supports copying a closure from a remote to another remote.""" sshopts = os.getenv("NIX_SSHOPTS", "") - env = {"NIX_SSHOPTS": " ".join(filter(lambda x: x, [sshopts, *SSH_DEFAULT_OPTS]))} + env = {"NIX_SSHOPTS": " ".join(filter(lambda x: x, [sshopts, *ssh_default_opts()]))} def nix_copy_closure(host: Remote, to: bool) -> None: run_wrapper( diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py index d848709ef8f1..3ae6afa9c68c 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/process.py @@ -25,12 +25,20 @@ SSH_DEFAULT_OPTS: Final = [ "-o", "ControlMaster=auto", "-o", - f"ControlPath={tmpdir.TMPDIR_PATH / 'ssh-%C'}", + f"ControlPath={tmpdir.SSH_CONTROL_PATH}", "-o", "ControlPersist=60", ] +def ssh_default_opts() -> list[str]: + "Default ssh options appended after NIX_SSHOPTS." + env = os.getenv("NIXOS_REBUILD_SSH_DEFAULT_OPTS") + if env is None: + return SSH_DEFAULT_OPTS + return shlex.split(env) + + @dataclass(frozen=True) class Remote: host: str @@ -133,7 +141,7 @@ def run_wrapper( ssh_args: list[Arg] = [ "ssh", *remote.opts, - *SSH_DEFAULT_OPTS, + *ssh_default_opts(), remote.ssh_host(), "--", *[_quote_remote_arg(a) for a in remote_run_args], @@ -282,7 +290,7 @@ def _kill_long_running_ssh_process(args: Args, remote: Remote) -> None: [ "ssh", *remote.opts, - *SSH_DEFAULT_OPTS, + *ssh_default_opts(), remote.ssh_host(), "--", "pkill", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py index 9db6e310a4d2..1df30dcad7eb 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/nixos_rebuild/tmpdir.py @@ -1,38 +1,86 @@ import logging +import os from pathlib import Path -from tempfile import TemporaryDirectory, gettempdir +from tempfile import TemporaryDirectory from typing import Final logger: Final = logging.getLogger(__name__) +# The Linux kernel hardcodes a limit of 108 bytes for Unix sockets [0], +# but that includes one NULL byte at the very end, so the logical max +# length is 107 bytes. +# [0]: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/tree/include/uapi/linux/un.h?h=v6.18.37#n7 +LINUX_MAX_SOCKET_LENGTH: Final = 107 -# Very long tmp dirs lead to "too long for Unix domain socket" -# SSH ControlPath errors. Especially macOS sets long TMPDIR paths. -# This is also required for Linux, if the user tries to build -# from inside a shell using `--target-host`, which will cause -# ssh to fail with "ControlPath too long" +# OpenSSH expands %C to `conn_hash_hex` [0], +# which is the result of calling `ssh_connection_hash` [1], +# which computes a sha1 digest [2], +# which is 20 bytes long [3]. +# which gets hex encoded [4] to double that length [5]. # -# The constant is based on a worst case example FQDN, e.g.: -# `ec2-123-123-123-123.ap-southeast-2.compute.amazonaws.com` (56 bytes). -# The `ControlPath` can maximum be 108 bytes. Given the prefix -# that is used for the tempdir, ie. `nixos-rebuild.47i6dz8c` (22 bytes), -# we have 30 bytes left to work with. -# This should be fine for the usual temp folders: -# /tmp/tmp.7hBqN2Fm5H (19) -# /var/tmp/tmp.7hBqN2Fm5H (23) -# /run/user/1000/tmp.7hBqN2Fm5H (29) +# [0]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/sshconnect.h#L70 +# [1]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/ssh.c#L1464-L1465 +# [2]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/readconf.c#L345 +# [3]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/openbsd-compat/sha1.h#L15 +# [4]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/readconf.c#L360 +# [5]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/misc.c#L1627 +OPENSSH_PERCENT_C_LENGTH: Final = 40 + +# OpenSSH adds a suffix to the given control path [0]. +# There's 1 character for a `.` separator, followed by 16 random characters [1]. +# [0]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/mux.c#L1348 +# [1]: https://github.com/openssh/openssh-portable/blob/V_10_3_P1/mux.c#L1324 +OPENSSH_CONTROL_PATH_SUFFIX_LENGTH: Final = 1 + 16 + +# Carefully compute a maximum allowed length for a tmpdir, otherwise ssh crashes with errors like this: +# > unix_listener: path "/home/runner/work/_temp/nixos-rebuild.aw8hzmq7/ssh-ea7c10de83787b1dec3f06ef20ee26b38c6bb0a5.x9MDykk4gmASsl3R" +# > too long for Unix domain socket +# +# The full path to our tmpdir must be short enough for the resulting Unix domain +# sockets that OpenSSH creates to fit within `LINUX_MAX_SOCKET_LENGTH`. +# It's common for system configured temp dirs to be more +# than a few characters: +# - macOS sets long TMPDIR paths. +# - Nix dev shells set a longer TMPDIR +# - GitHub actions set TMPDIR to something like `/home/runner/work/_temp`. +# +# Breaking down the socket path into its component pieces: +# +# /home/runner/work/_temp/nixos-rebuild.aw8hzmq7/ssh-ea7c10de83787b1dec3f06ef20ee26b38c6bb0a5.x9MDykk4gmASsl3R +# |-------------- TMPDIR ----------------------|^|----------------- ssh-%C -----------------||---------------| +# | | +# Note the path separator character. OPENSSH_CONTROL_PATH_SUFFIX_LENGTH +# +MAX_TMPDIR_LENGTH: Final = ( + LINUX_MAX_SOCKET_LENGTH + - 1 # Path separator between tmpdir and the socket name. + # Keep the following in sync with `SSH_CONTROL_PATH`. + - len("ssh-") + - OPENSSH_PERCENT_C_LENGTH + - OPENSSH_CONTROL_PATH_SUFFIX_LENGTH +) + + def make_tmpdir() -> TemporaryDirectory[str]: - tmp = gettempdir() - if len(tmp) >= 30: + prefix = "nixos-rebuild." + tmpdir = TemporaryDirectory(prefix=prefix) + if len(os.fsencode(tmpdir.name)) > MAX_TMPDIR_LENGTH: + short_tmpdir = TemporaryDirectory(prefix=prefix, dir="/tmp") logger.debug( - "tempdir '%s' exceeds 30 bytes limit, defaulting to /tmp instead", - tmp, + "tempdir '%s' exceeds %s bytes limit, defaulting to '%s' instead", + tmpdir, + MAX_TMPDIR_LENGTH, + short_tmpdir, ) - return TemporaryDirectory(prefix="nixos-rebuild.", dir="/tmp") + tmpdir.cleanup() + return short_tmpdir - return TemporaryDirectory(prefix="nixos-rebuild.") + return tmpdir TMPDIR: Final = make_tmpdir() TMPDIR_PATH: Final = Path(TMPDIR.name) + +# Keep this in sync with `MAX_TMPDIR_LENGTH`! +SSH_CONTROL_PATH: Final = str(TMPDIR_PATH / "ssh-%C") 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 1cdccc9a874e..848a09bb742b 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 @@ -275,6 +275,17 @@ def test_copy_closure(monkeypatch: MonkeyPatch) -> None: }, ) + # NIXOS_REBUILD_SSH_DEFAULT_OPTS replaces the ControlMaster defaults + monkeypatch.setenv("NIX_SSHOPTS", "-oControlPath=/run/user/1000/%C") + monkeypatch.setenv("NIXOS_REBUILD_SSH_DEFAULT_OPTS", "") + with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: + n.copy_closure(closure, target_host) + mock_run.assert_called_with( + ["nix-copy-closure", "--to", "user@target.host", closure], + append_local_env={"NIX_SSHOPTS": "-oControlPath=/run/user/1000/%C"}, + ) + monkeypatch.delenv("NIXOS_REBUILD_SSH_DEFAULT_OPTS") + monkeypatch.setenv("NIX_SSHOPTS", "--ssh build-target-opt") env = {"NIX_SSHOPTS": " ".join(["--ssh build-target-opt", *p.SSH_DEFAULT_OPTS])} with patch(get_qualified_name(n.run_wrapper, n), autospec=True) as mock_run: diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py index 2abdd26ebe07..c8f1ec9126e9 100644 --- a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_process.py @@ -234,6 +234,52 @@ def test_remote_from_name(monkeypatch: MonkeyPatch) -> None: ) +def test_ssh_default_opts(monkeypatch: MonkeyPatch) -> None: + monkeypatch.delenv("NIXOS_REBUILD_SSH_DEFAULT_OPTS", raising=False) + assert p.ssh_default_opts() == p.SSH_DEFAULT_OPTS + + monkeypatch.setenv( + "NIXOS_REBUILD_SSH_DEFAULT_OPTS", "-o ControlPath=/run/user/1000/%C" + ) + assert p.ssh_default_opts() == ["-o", "ControlPath=/run/user/1000/%C"] + + monkeypatch.setenv("NIXOS_REBUILD_SSH_DEFAULT_OPTS", "") + assert p.ssh_default_opts() == [] + + +@patch.dict( + p.os.environ, + {"PATH": "/path/to/bin", "NIXOS_REBUILD_SSH_DEFAULT_OPTS": ""}, + clear=True, +) +@patch("subprocess.run", autospec=True) +def test_run_wrapper_ssh_default_opts_override(mock_run: Any) -> None: + p.run_wrapper( + ["test"], + check=True, + remote=m.Remote("user@localhost", ["-p", "2222"], "ssh"), + ) + mock_run.assert_called_with( + [ + "ssh", + "-p", + "2222", + "user@localhost", + "--", + "/bin/sh", + "-c", + """'exec /usr/bin/env -i PATH="${PATH-}" "$@"'""", + "sh", + "test", + ], + check=True, + text=True, + errors="surrogateescape", + env=None, + input=None, + ) + + def test_ssh_host() -> None: ssh_remotes = { "user@[fe80::1%25eth0]": "user@fe80::1%eth0", diff --git a/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py new file mode 100644 index 000000000000..51c2956bb5c1 --- /dev/null +++ b/pkgs/by-name/ni/nixos-rebuild-ng/src/tests/test_tmpdir.py @@ -0,0 +1,50 @@ +import contextlib +import os +import tempfile +import typing +from pathlib import Path + +from nixos_rebuild.tmpdir import MAX_TMPDIR_LENGTH, make_tmpdir + + +@contextlib.contextmanager +def tempfile_tempdir(path: str) -> typing.Generator[None]: + Path(path).mkdir(exist_ok=True) + og_tmpdir = tempfile.tempdir + try: + tempfile.tempdir = path + assert tempfile.gettempdir() == path + yield + finally: + tempfile.tempdir = og_tmpdir + + +def test_make_tmpdir() -> None: + def assert_tmpdir(tmp: Path) -> None: + assert tmp.exists() + assert tmp.is_dir() + assert len(os.fsencode(str(tmp))) <= MAX_TMPDIR_LENGTH + + # Basic test: whatever the default system temp dir happens to be. + tmpdir = make_tmpdir() + tmp = Path(tmpdir.name) + + assert_tmpdir(tmp) + + # Test with a short system temp dir. We should use it unmodified. + short_tempdir = "/tmp/not-too-long" + with tempfile_tempdir(short_tempdir): + tmpdir = make_tmpdir() + tmp = Path(tmpdir.name) + + assert tmp.parent == Path(short_tempdir) + assert_tmpdir(tmp) + + # Test with a long system temp dir. We should ignore + # it and fall back to something short enough for OpenSSH to + # create sockets in. + with tempfile_tempdir("/tmp/long" + ("g" * MAX_TMPDIR_LENGTH)): + tmpdir = make_tmpdir() + tmp = Path(tmpdir.name) + + assert_tmpdir(tmp) diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py index 7f31d0be44ae..05dc5b33a774 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/commonmark.py @@ -3,6 +3,7 @@ from dataclasses import dataclass from typing import cast, Optional from .md import md_escape, md_make_code, Renderer +from .types import AdmonitionStyle from markdown_it.token import Token @@ -20,12 +21,16 @@ class Par: class CommonMarkRenderer(Renderer): __output__ = "commonmark" + _admonition_style: AdmonitionStyle + _div_fence_sizes: list[int] _parstack: list[Par] _link_stack: list[str] _list_stack: list[List] - def __init__(self, manpage_urls: Mapping[str, str]): + def __init__(self, manpage_urls: Mapping[str, str], admonition_style: AdmonitionStyle = AdmonitionStyle.PLAIN): super().__init__(manpage_urls) + self._admonition_style = admonition_style + self._div_fence_sizes = [ ] self._parstack = [ Par("") ] self._link_stack = [] self._list_stack = [] @@ -43,12 +48,46 @@ class CommonMarkRenderer(Renderer): self._parstack[-1].continuing = True return result - def _admonition_open(self, kind: str) -> str: + def _fenced_div_open(self, classes: Sequence[str] = ()) -> str: + fence_size = ( + self._div_fence_sizes[-1] + 1 + if self._div_fence_sizes + else 3 + ) + fence = ":" * fence_size + class_refs = [f".{c}" for c in classes] + annotation = (" {" + " ".join(class_refs) + "}") if classes else "" pbreak = self._maybe_parbreak() - self._enter_block("") - return f"{pbreak}**{kind}:** " + self._div_fence_sizes.append(fence_size) + return f"{pbreak}{fence}{annotation}" + def _fenced_div_close(self) -> str: + fence_size = self._div_fence_sizes.pop() + fence = ":" * fence_size + pbreak = self._maybe_parbreak() + return f"{pbreak}{fence}" + + def _admonition_open(self, kind: str) -> str: + match self._admonition_style: + case AdmonitionStyle.PLAIN: + pbreak = self._maybe_parbreak() + self._enter_block("") + return f"{pbreak}**{kind}:** " + case AdmonitionStyle.GFM: + pbreak = self._maybe_parbreak() + lbreak = self._break() + self._enter_block("> ") + return f"{pbreak}> [!{kind}]{lbreak}> " + case AdmonitionStyle.PANDOC: + return self._fenced_div_open(classes=[kind.lower()]) + def _admonition_close(self) -> str: - self._leave_block() + match self._admonition_style: + case AdmonitionStyle.PLAIN: + self._leave_block() + case AdmonitionStyle.GFM: + self._leave_block() + case AdmonitionStyle.PANDOC: + return self._fenced_div_close() return "" def _indent_raw(self, s: str) -> str: diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py index 3e4ff1aedb7a..5944431d4680 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/html.py @@ -1,12 +1,13 @@ from collections.abc import Mapping, Sequence -from typing import cast, Optional, NamedTuple - from html import escape +from typing import NamedTuple, Optional, cast + from markdown_it.token import Token from .manual_structure import XrefTarget from .md import Renderer + class UnresolvedXrefError(Exception): pass @@ -17,9 +18,6 @@ class Heading(NamedTuple): # special handling for part content: whether partinfo div was already closed from # elsewhere or still needs closing. partintro_closed: bool - # tocs are generated when the heading opens, but have to be emitted into the file - # after the heading titlepage (and maybe partinfo) has been closed. - toc_fragment: str _bullet_list_styles = [ 'disc', 'circle', 'square' ] _ordered_list_styles = [ '1', 'a', 'i', 'A', 'I' ] @@ -29,7 +27,6 @@ class HTMLRenderer(Renderer): _headings: list[Heading] _attrspans: list[str] - _hlevel_offset: int = 0 _bullet_list_nesting: int = 0 _ordered_list_nesting: int = 0 @@ -185,8 +182,7 @@ class HTMLRenderer(Renderer): anchor = f'id="{escape(anchor, True)}"' result = self._close_headings(hlevel) tag = self._heading_tag(token, tokens, i) - toc_fragment = self._build_toc(tokens, i) - self._headings.append(Heading(tag, hlevel, htag, tag != 'part', toc_fragment)) + self._headings.append(Heading(tag, hlevel, htag, tag != 'part')) return ( f'{result}' f'
' @@ -205,8 +201,6 @@ class HTMLRenderer(Renderer): ) if heading.container_tag == 'part': result += '
' - else: - result += heading.toc_fragment return result def ordered_list_open(self, token: Token, tokens: Sequence[Token], i: int) -> str: extra = 'compact' if token.meta.get('compact', False) else '' @@ -329,14 +323,14 @@ class HTMLRenderer(Renderer): ) def _make_hN(self, level: int) -> tuple[str, str]: - return f"h{min(6, max(1, level + self._hlevel_offset))}", "" + return f"h{min(6, max(1, level))}", "" def _maybe_close_partintro(self) -> str: if self._headings: heading = self._headings[-1] if heading.container_tag == 'part' and not heading.partintro_closed: self._headings[-1] = heading._replace(partintro_closed=True) - return heading.toc_fragment + "
" + return "
" return "" def _close_headings(self, level: Optional[int]) -> str: @@ -349,5 +343,3 @@ class HTMLRenderer(Renderer): def _heading_tag(self, token: Token, tokens: Sequence[Token], i: int) -> str: return "section" - def _build_toc(self, tokens: Sequence[Token], i: int) -> str: - return "" diff --git a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py index 5b3c30ee1da4..c6c2e087cd0d 100644 --- a/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py +++ b/pkgs/by-name/ni/nixos-render-docs/src/nixos_render_docs/manual.py @@ -4,21 +4,29 @@ import html import json import re import xml.sax.saxutils as xml - from abc import abstractmethod from collections.abc import Mapping, Sequence from pathlib import Path -from typing import Any, Callable, cast, ClassVar, Generic, get_args, NamedTuple +from typing import Any, Callable, ClassVar, Generic, NamedTuple, cast, get_args from markdown_it.token import Token from . import md, options from .html import HTMLRenderer, UnresolvedXrefError -from .manual_structure import check_structure, FragmentType, is_include, make_xml_id, TocEntry, TocEntryType, XrefTarget +from .manual_structure import ( + FragmentType, + TocEntry, + TocEntryType, + XrefTarget, + check_structure, + is_include, + make_xml_id, +) from .md import Converter, Renderer from .redirects import Redirects from .src_error import SrcError + class BaseConverter(Converter[md.TR], Generic[md.TR]): # per-converter configuration for ns:arg=value arguments to include blocks, following # the include type. html converters need something like this to support chunking, or @@ -253,13 +261,12 @@ class HTMLParameters(NamedTuple): generator: str stylesheets: Sequence[str] scripts: Sequence[str] - # number of levels in the rendered table of contents. tables are prepended to - # the content they apply to (entire document / document chunk / top-level section - # of a chapter), setting a depth of 0 omits the respective table. - toc_depth: int - chunk_toc_depth: int - section_toc_depth: int + # structural depth of the navigation sidebar tree + sidebar_depth: int media_dir: Path + sidebar_open: frozenset[str] = frozenset() + header: Path | None = None + no_navheader: bool = False class ManualHTMLRenderer(RendererMixin, HTMLRenderer): _base_path: Path @@ -289,14 +296,13 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): target_path.write_bytes(content) return f"./{self._html_params.media_dir}/{target_name}" - def _push(self, tag: str, hlevel_offset: int) -> Any: - result = (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset, self._in_dir) - self._hlevel_offset += hlevel_offset + def _push(self, tag: str) -> Any: + result = (self._toplevel_tag, self._headings, self._attrspans, self._in_dir) self._toplevel_tag, self._headings, self._attrspans = tag, [], [] return result def _pop(self, state: Any) -> None: - (self._toplevel_tag, self._headings, self._attrspans, self._hlevel_offset, self._in_dir) = state + (self._toplevel_tag, self._headings, self._attrspans, self._in_dir) = state def _render_book(self, tokens: Sequence[Token]) -> str: assert tokens[4].children @@ -307,7 +313,7 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): toc = TocEntry.of(tokens[0]) return "\n".join([ - self._file_header(toc), + self._file_header(toc, sidebar=self._build_sidebar(toc)), '
', '
', '
', @@ -316,13 +322,12 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): '
', "
", '
', - self._build_toc(tokens, 0), super(HTMLRenderer, self).render(tokens[6:]), '
', self._file_footer(toc), ]) - def _file_header(self, toc: TocEntry) -> str: + def _file_header(self, toc: TocEntry, sidebar: str = "") -> str: prev_link, up_link, next_link = "", "", "" prev_a, next_a, parent_title = "", "", " " nav_html = "" @@ -341,7 +346,8 @@ class ManualHTMLRenderer(RendererMixin, HTMLRenderer): if toc.next: next_link = f'' next_a = f'
Next' - if toc.prev or toc.parent or toc.next: + # nav_header is not disabled + if not self._html_params.no_navheader and (toc.prev or toc.parent or toc.next): nav_html = "\n".join([ '